diff --git a/package.json b/package.json
index c273bc834..21c6ec39f 100644
--- a/package.json
+++ b/package.json
@@ -10,6 +10,7 @@
   },
   "homepage": "https://github.com/wger-project/wger",
   "dependencies": {
+    "htmx.org": "^2.0.3",
     "bootstrap": "5.3.3",
     "components-font-awesome": "5.9.0",
     "datatables.net-bs5": "^2.1.8",
diff --git a/wger/__init__.py b/wger/__init__.py
index 1b7c47e90..67e1eade4 100644
--- a/wger/__init__.py
+++ b/wger/__init__.py
@@ -8,10 +8,9 @@
 # Local
 from .celery_configuration import app
 
-
 MIN_APP_VERSION = (1, 7, 4, 'final', 1)
 
-VERSION = (2, 3, 0, 'alpha', 2)
+VERSION = (2, 3, 0, 'alpha', 3)
 RELEASE = True
 
 
diff --git a/wger/core/static/js/wger-core.js b/wger/core/static/js/wger-core.js
index 877f01d70..d6daf501a 100644
--- a/wger/core/static/js/wger-core.js
+++ b/wger/core/static/js/wger-core.js
@@ -15,44 +15,6 @@
  */
 'use strict';
 
-/*
- AJAX related functions
-
- See https://docs.djangoproject.com/en/dev/ref/contrib/csrf/#ajax for
- more information
- */
-function getCookie(name) {
-  var cookie;
-  var cookies;
-  var cookieValue = null;
-  var loopCounter;
-  if (document.cookie && document.cookie !== '') {
-    cookies = document.cookie.split(';');
-    for (loopCounter = 0; loopCounter < cookies.length; loopCounter++) {
-      cookie = jQuery.trim(cookies[loopCounter]);
-      // Does this cookie string begin with the name we want?
-      if (cookie.substring(0, name.length + 1) === (name + '=')) {
-        cookieValue = decodeURIComponent(cookie.substring(name.length + 1));
-        break;
-      }
-    }
-  }
-  return cookieValue;
-}
-
-function csrfSafeMethod(method) {
-  // These HTTP methods do not require CSRF protection
-  return (/^(GET|HEAD|OPTIONS|TRACE)$/.test(method));
-}
-
-$.ajaxSetup({
-  crossDomain: false, // obviates need for sameOrigin test
-  beforeSend: function (xhr, settings) {
-    if (!csrfSafeMethod(settings.type)) {
-      xhr.setRequestHeader('X-CSRFToken', getCookie('csrftoken'));
-    }
-  }
-});
 
 function getCurrentLanguage() {
   // Returns a short name, like 'en' or 'de'
@@ -60,154 +22,6 @@ function getCurrentLanguage() {
 }
 
 
-/*
- Open a modal dialog for form editing
- */
-function modalDialogFormEdit() {
-  var $submit;
-  var $form;
-  $form = $('#ajax-info-content').find('form');
-  $submit = $($form).find('#form-save');
-
-  $submit.click(function (e) {
-    var formData;
-    var formAction;
-    e.preventDefault();
-    formAction = $form.attr('action');
-    formData = $form.serialize();
-
-    // Unbind all click elements, so the form doesn't get submitted twice
-    // if the user clicks 2 times on the button (while there is already a request
-    // happening in the background)
-    $submit.off();
-
-    // Show a loader while we fetch the real page
-    $form.html('<div style="text-align:center;">' +
-      '<img src="/static/images/loader.svg" ' +
-      'width="48" ' +
-      'height="48"> ' +
-      '</div>');
-    $('#ajax-info-title').html('Processing'); // TODO: translate this
-
-    // OK, we did the POST, what do we do with the result?
-    $.ajax({
-      type: 'POST',
-      url: formAction,
-      data: formData,
-      beforeSend: function (jqXHR) {
-        // Send a custom header so django's messages are not displayed in the next
-        // request which will be not be displayed to the user, but on the next one
-        // that will
-        jqXHR.setRequestHeader('X-wger-no-messages', '1');
-      },
-      success: function (data, textStatus, jqXHR) {
-        var url = jqXHR.getResponseHeader('X-wger-redirect');
-        if (url) {
-          window.location.href = url;
-          /*
-           if(document.URL.indexOf(url)) {
-           history.pushState({}, "", url);
-           }
-           */
-        } else if ($(data).find('form .has-error').length > 0) {
-          // we must do the same with the new form as before, binding the click-event,
-          // checking for errors etc, so it calls itself here again.
-          $form.html($(data).find('form').html());
-          $('#ajax-info-title').html($(data).find('#page-title').html());
-          modalDialogFormEdit();
-        } else {
-          console.log('No X-wger-redirect found but also no .has-error!');
-          $('#wger-ajax-info').modal('hide');
-          $form.html(data);
-        }
-
-        // Call other custom initialisation functions
-        // (e.g. if the form as an autocompleter, it has to be initialised again)
-        if (typeof wgerCustomModalInit !== 'undefined') {
-          wgerCustomModalInit(); // eslint-disable-line no-undef
-        }
-
-        if (typeof wgerCustomPageInit !== 'undefined') {
-          wgerCustomPageInit(); // eslint-disable-line no-undef
-        }
-      },
-      error: function (jqXHR) {
-        // console.log(errorThrown); // INTERNAL SERVER ERROR
-        $('#ajax-info-content').html(jqXHR.responseText);
-      }
-    });
-  });
-}
-
-function wgerFormModalDialog() {
-  var $wgerModalDialog;
-  $wgerModalDialog = $('.wger-modal-dialog');
-  // Unbind all other click events so we don't do this more than once
-  $wgerModalDialog.off();
-
-  // Load the edit dialog when the user clicks on an edit link
-  $wgerModalDialog.click(function (e) {
-    var $ajaxInfoContent;
-    var targetUrl;
-    e.preventDefault();
-    targetUrl = $(this).attr('href');
-
-    // It's not possible to have more than one modal open at any time, so close them
-    $('.modal').modal('hide');
-
-    // Show a loader while we fetch the real page
-    $ajaxInfoContent = $('#ajax-info-content');
-    $ajaxInfoContent.html('<div style="text-align:center;">' +
-      '<img src="/static/images/loader.svg" ' +
-      'width="48" ' +
-      'height="48"> ' +
-      '</div>');
-    $('#ajax-info-title').html('Loading...');
-    $('#wger-ajax-info').modal('show');
-
-    $ajaxInfoContent.load(targetUrl + ' .wger-form',
-      function (responseText, textStatus, XMLHttpRequest) {
-        var $ajaxInfoTitle;
-        var modalTitle;
-        $ajaxInfoTitle = $('#ajax-info-title');
-        if (textStatus === 'error') {
-          $ajaxInfoTitle.html('Sorry but an error occured');
-          $('#ajax-info-content').html(XMLHttpRequest.status + ' ' + XMLHttpRequest.statusText);
-        }
-
-        // Call other custom initialisation functions
-        // (e.g. if the form as an autocompleter, it has to be initialised again)
-        if (typeof wgerCustomModalInit !== 'undefined') {
-          // Function is defined in templates. Eslint doesn't check the templates resulting in a
-          // un-def error message.
-          wgerCustomModalInit(); // eslint-disable-line no-undef
-        }
-
-        // Set the new title
-        modalTitle = '';
-        if ($(responseText).find('#page-title').length > 0) {
-          // Complete HTML page
-          modalTitle = $(responseText).find('#page-title').html();
-        } else {
-          // Page fragment
-          modalTitle = $(responseText).filter('#page-title').html();
-        }
-        $ajaxInfoTitle.html(modalTitle);
-
-        // If there is a form in the modal dialog (there usually is) prevent the submit
-        // button from submitting it and do it here with an AJAX request. If there
-        // are errors (there is an element with the class 'ym-error' in the result)
-        // reload the content back into the dialog so the user can correct the entries.
-        // If there isn't assume all was saved correctly and load that result into the
-        // page's main DIV (#main-content). All this must be done like this because there
-        // doesn't seem to be any reliable and easy way to detect redirects with AJAX.
-        if ($(responseText).find('.wger-form').length > 0) {
-          modalDialogFormEdit();
-        }
-      });
-  });
-}
-
 /*
  Returns a random hex string. This is useful, e.g. to add a unique ID to generated
  HTML elements
@@ -223,8 +37,8 @@ function getRandomHex() {
  Template-like function that adds form elements to the ajax exercise selection in the edit set page
  */
 function addExercise(exercise) {
-  var $exerciseSearchLog;
-  var resultDiv;
+  let $exerciseSearchLog;
+  let resultDiv;
   resultDiv = '<div id="DIV-ID" class="ajax-exercise-select">\n' +
     '  <a href="#" ' +
     'data-role="button" ' +
@@ -248,15 +62,15 @@ function addExercise(exercise) {
 }
 
 function getExerciseFormset(baseId) {
-  var formsetUrl;
-  var setValue;
+  let formsetUrl;
+  let setValue;
   setValue = $('#id_sets').val();
   if (setValue && parseInt(setValue, 10) && baseId && parseInt(baseId, 10)) {
     formsetUrl = '/' + getCurrentLanguage() +
       '/routine/set/get-formset/' + baseId + '/' + setValue;
 
     $.get(formsetUrl, function (data) {
-      var $formsets;
+      let $formsets;
       $formsets = $('#formsets');
       $formsets.append(data);
       $('#exercise-search-log').scrollTop(0);
@@ -269,13 +83,13 @@ function getExerciseFormset(baseId) {
  Updates all exercise formsets, e.g. when the number of sets changed
  */
 function updateAllExerciseFormset() {
-  var setValue;
+  let setValue;
   setValue = $('#id_sets').val();
   if (setValue && parseInt(setValue, 10)) {
     $.each($('#exercise-search-log').find('input'), function (index, value) {
-      var promise;
-      var exerciseId;
-      var formsetUrl;
+      let promise;
+      let exerciseId;
+      let formsetUrl;
       exerciseId = value.value;
       promise = $().promise();
       if (exerciseId && parseInt(exerciseId, 10)) {
@@ -284,7 +98,7 @@ function updateAllExerciseFormset() {
           'get-formset/' + exerciseId + '/' + setValue;
         promise.done(function () {
           promise = $.get(formsetUrl, function (data) {
-            var $formsets;
+            let $formsets;
             $('#formset-base-' + exerciseId).remove();
             $formsets = $('#formsets');
             $formsets.append(data);
@@ -303,7 +117,7 @@ function updateAllExerciseFormset() {
  */
 function initRemoveExerciseFormset() {
   $('.ajax-exercise-select a').click(function (e) {
-    var baseId;
+    let baseId;
     e.preventDefault();
     baseId = $(this).parent('div').find('input').val();
     $('#formset-base-' + baseId).remove();
@@ -352,9 +166,9 @@ function wgerInitEditSet() {
 
   // Mobile select box
   $('#id_exercise_list').change(function () {
-    var $idExerciseList;
-    var baseId;
-    var exerciseName;
+    let $idExerciseList;
+    let baseId;
+    let exerciseName;
     $idExerciseList = $('#id_exercise_list');
     baseId = $idExerciseList.val();
     exerciseName = $idExerciseList.find(':selected').text();
@@ -385,10 +199,10 @@ function wgerInitEditSet() {
   $('#id_categories_list').on('change', function () {
     // Remember to filter by exercise language
     $.get('/api/v2/language/?short_name=' + getCurrentLanguage(), function (data) {
-      var filter;
-      var baseUrl;
-      var categoryPk;
-      var languagePk;
+      let filter;
+      let baseUrl;
+      let categoryPk;
+      let languagePk;
       languagePk = data.results[0].id;
       categoryPk = $('#id_categories_list').val();
       baseUrl = '/api/v2/exercise/';
@@ -401,7 +215,7 @@ function wgerInitEditSet() {
       $.get(baseUrl + filter, function (exerciseData) {
         // Sort the results by name, at the moment it's not possible
         // to search and sort the API at the same time
-        var $idExerciseList;
+        let $idExerciseList;
         exerciseData.results.sort(function (a, b) {
           if (a.name < b.name) {
             return -1;
@@ -428,28 +242,6 @@ function wgerInitEditSet() {
   });
 }
 
-/*
- Helper function to load the target of a link into the main-content DIV (the main left colum)
- */
-function wgerLoadMaincontent() {
-  $('.load-maincontent').click(function (e) {
-    var targetUrl;
-    e.preventDefault();
-    targetUrl = $(this).attr('href');
-
-    $.get(targetUrl, function (data) {
-      var currentUrl;
-      // Load the data
-      $('#main-content').html($(data).find('#main-content').html());
-
-      // Update the browser's history
-      currentUrl = $(data).find('#current-url').data('currentUrl');
-      history.pushState({}, '', currentUrl);
-
-      wgerLoadMaincontent();
-    });
-  });
-}
 
 /*
  Helper function used in the workout log dialog to fetch existing workout sessions through the
@@ -457,7 +249,7 @@ function wgerLoadMaincontent() {
  */
 function wgerGetWorkoutSession() {
   $('#id_date').on('change', function () {
-    var date = $('#id_date').val();
+    let date = $('#id_date').val();
     if (date) {
       $.get('/api/v2/workoutsession/?date=' + date, function (data) {
         if (data.results.length === 1) {
@@ -479,14 +271,14 @@ function wgerGetWorkoutSession() {
 $(document).ready(function () {
   // Handle the workout PDF download options for workouts
   $('#download-pdf-button').click(function (e) {
-    var targetUrl;
-    var token;
-    var uid;
-    var workoutId;
-    var downloadComments;
-    var downloadImages;
-    var downloadType;
-    var downloadInfo;
+    let targetUrl;
+    let token;
+    let uid;
+    let workoutId;
+    let downloadComments;
+    let downloadImages;
+    let downloadType;
+    let downloadInfo;
     e.preventDefault();
 
     downloadInfo = $('#pdf-download-info');
@@ -511,14 +303,14 @@ $(document).ready(function () {
 
   // Handle the workout PDF download options for schedules
   $('#download-pdf-button-schedule').click(function (e) {
-    var targetUrl;
-    var token;
-    var uid;
-    var scheduleId;
-    var downloadComments;
-    var downloadImages;
-    var downloadType;
-    var downloadInfo;
+    let targetUrl;
+    let token;
+    let uid;
+    let scheduleId;
+    let downloadComments;
+    let downloadImages;
+    let downloadType;
+    let downloadInfo;
     e.preventDefault();
 
     downloadInfo = $('#pdf-download-info');
diff --git a/wger/core/templates/delete.html b/wger/core/templates/delete.html
index dca8d784b..d2a4b9e21 100644
--- a/wger/core/templates/delete.html
+++ b/wger/core/templates/delete.html
@@ -1,23 +1,10 @@
-{% extends extend_template %}
 {% load i18n crispy_forms_tags %}
 
-<!--
-        Title
--->
-{% block title %}{{title}}{% endblock %}
+<h4>{{ title }}</h4>
+<p>{% translate "Are you sure you want to delete this? This action cannot be undone." %}</p>
+{% if delete_message %}
+    <p>{{ delete_message }}</p>
+{% endif %}
+{% crispy form %}
 
 
-<!--
-        Main Content
--->
-{% block content %}
-    <div class="wger-form">
-    <p>{% translate "Are you sure you want to delete this? This action cannot be undone." %}</p>
-    {% if delete_message %}
-        <p>{{ delete_message }}</p>
-    {% endif %}
-    {% crispy form %}
-    </div>
-
-{% endblock %}
-
diff --git a/wger/core/templates/form.html b/wger/core/templates/form.html
index 14a0ad784..7990ecdc3 100644
--- a/wger/core/templates/form.html
+++ b/wger/core/templates/form.html
@@ -1,29 +1,4 @@
-{% extends extend_template %}
-{% load i18n static crispy_forms_tags %}
+{% load crispy_forms_tags %}
 
-{% block header %}
-    {{ form.media }}
-    {% if custom_js %}
-        <script type="text/javascript">
-        $(document).ready(function() {
-            {{custom_js|safe}}
-        });
-        </script>
-    {% endif %}
-{% endblock %}
-
-{% block title %}{{title}}{% endblock %}
-
-{% block content %}
-    {% if form %}
-        {% crispy form %}
-    {% else %}
-        Looks like you clicked on an invalid link. Please try again.
-    {% endif %}
-{% endblock %}
-
-
-<!--
-        Side bar
--->
-{% block sidebar %}{% if sidebar %}{% include sidebar %}{% endif %}{% endblock %}
+<h4>{{ title }}</h4>
+{% crispy form %}
diff --git a/wger/core/templates/form_content.html b/wger/core/templates/form_content.html
new file mode 100644
index 000000000..195a85b24
--- /dev/null
+++ b/wger/core/templates/form_content.html
@@ -0,0 +1,29 @@
+{% extends 'base.html' %}
+{% load i18n static crispy_forms_tags %}
+
+{% block header %}
+    {{ form.media }}
+    {% if custom_js %}
+        <script type="text/javascript">
+            $(document).ready(function () {
+                {{ custom_js|safe }}
+            });
+        </script>
+    {% endif %}
+{% endblock %}
+
+{% block title %}{{ title }}{% endblock %}
+
+{% block content %}
+    {% if form %}
+        {% crispy form %}
+    {% else %}
+        Looks like you clicked on an invalid link. Please try again.
+    {% endif %}
+{% endblock %}
+
+
+<!--
+        Sidebar
+-->
+{% block sidebar %}{% if sidebar %}{% include sidebar %}{% endif %}{% endblock %}
diff --git a/wger/core/templates/language/overview.html b/wger/core/templates/language/overview.html
index 8ba52b0d2..82c9ca5b0 100644
--- a/wger/core/templates/language/overview.html
+++ b/wger/core/templates/language/overview.html
@@ -31,7 +31,6 @@
 {# Options #}
 {#         #}
 {% block options %}
-    <a href="{% url 'core:language:add' %}" class="btn btn-success btn-sm wger-modal-dialog">
-        {% translate "Add" %}
-    </a>
+    {% translate 'Add' as text %}
+    {% modal_link url="core:language:add" text=text %}
 {% endblock %}
diff --git a/wger/core/templates/language/view.html b/wger/core/templates/language/view.html
index 1c3a6af60..06b3aa7b8 100644
--- a/wger/core/templates/language/view.html
+++ b/wger/core/templates/language/view.html
@@ -61,17 +61,15 @@
                 {% translate "Options" %}
             </button>
             <div class="dropdown-menu">
-                <a href="{% url 'core:language:edit' view_language.id %}"
-                   class="wger-modal-dialog dropdown-item">
-                    <span class="{% fa_class 'edit' %}"></span>
-                    {% translate "Edit" %}
-                </a>
+                {% translate 'Edit' as text %}
+                {% url 'core:language:edit' view_language.id as url %}
+                {% modal_link url=url text=text css_class="dropdown-item" %}
+
                 <div role="separator" class="dropdown-divider"></div>
-                <a href="{% url 'core:language:delete' view_language.id %}"
-                   class="wger-modal-dialog dropdown-item">
-                    <span class="{% fa_class 'trash' %}"></span>
-                    {% translate "Delete" %}
-                </a>
+
+                {% translate 'Delete' as text %}
+                {% url 'core:language:delete' view_language.id as url %}
+                {% modal_link url=url text=text css_class="dropdown-item" %}
             </div>
         </div>
     </div>
diff --git a/wger/core/templates/license/list.html b/wger/core/templates/license/list.html
index 1cc0c8847..a7438821a 100644
--- a/wger/core/templates/license/list.html
+++ b/wger/core/templates/license/list.html
@@ -9,14 +9,18 @@
         {% for license in license_list %}
             <li class="list-group-item list-group-item-action">
                 <div class="btn-group float-end">
-                    <button type="button" class="btn btn-dark dropdown-toggle btn-sm" data-bs-toggle="dropdown">
+                    <button type="button" class="btn btn-dark dropdown-toggle btn-sm"
+                            data-bs-toggle="dropdown">
                         <span class="{% fa_class 'cog' %}"></span>
                     </button>
                     <div class="dropdown-menu" role="menu">
-                        <a href="{% url 'core:license:edit' license.id %}"
-                           class="dropdown-item wger-modal-dialog">{% translate 'Edit' %}</a>
-                        <a href="{% url 'core:license:delete' license.id %}"
-                           class="dropdown-item wger-modal-dialog">{% translate 'Delete' %}</a>
+                        {% translate 'Edit' as text %}
+                        {% url 'core:license:edit' license.id as url %}
+                        {% modal_link url=url text=text css_class='dropdown-item' %}
+
+                        {% translate 'Delete' as text %}
+                        {% url 'core:license:delete' license.id as url %}
+                        {% modal_link url=url text=text css_class='dropdown-item' %}
                     </div>
                 </div>
                 {{ license }}
@@ -36,8 +40,7 @@
 {#         #}
 {% block options %}
     {% if perms.core.add_license %}
-        <a href="{% url 'core:license:add' %}" class="btn btn-success btn-sm wger-modal-dialog">
-            {% translate "Add" %}
-        </a>
+        {% translate 'Add' as text %}
+        {% modal_link url='core:license:add' text=text %}
     {% endif %}
 {% endblock %}
diff --git a/wger/core/templates/misc/license/list.html b/wger/core/templates/misc/license/list.html
deleted file mode 100644
index 0840c99ee..000000000
--- a/wger/core/templates/misc/license/list.html
+++ /dev/null
@@ -1,50 +0,0 @@
-% extends "base.html" %}
-{% load i18n static wger_extras %}
-
-{% block title %}{% translate "License list" %}{% endblock %}
-
-
-{% block content %}
-    <ul class="list-group">
-        {% for license in license_list %}
-            <li class="list-group-item ">
-                <div class="btn-group float-end">
-                    <button type="button" class="btn btn-light dropdown-toggle btn-sm" data-bs-toggle="dropdown">
-                        <span class="{% fa_class 'cog' %}"></span>
-                    </button>
-                    <ul class="dropdown-menu" role="menu">
-                        <li>
-                            <a href="{% url 'core:license:edit' license.id %}"
-                               class="wger-modal-dialog">{% translate 'Edit' %}</a>
-                        </li>
-                        <li>
-                            <a href="{% url 'core:license:delete' license.id %}"
-                               class="wger-modal-dialog">{% translate 'Delete' %}</a>
-                        </li>
-                    </ul>
-                </div>
-                {{ license }}
-            </li>
-            {% empty %}
-            <li class="list-group-item">
-                {% translate "Nothing found" %}
-            </li>
-        {% endfor %}
-    </ul>
-{% endblock %}
-
-
-
-
-{% block sidebar %}
-    {% if perms.core.add_license %}
-        <p>
-            <a href="{% url 'core:license:add' %}" class="btn btn-success btn-sm wger-modal-dialog">
-                {% translate "Add" %}
-            </a>
-        </p>
-
-        <p>{% blocktranslate %}If a license has been localized, e.g. the Creative Commons
-            licenses for the different countries, add them as separate entries here.{% endblocktranslate %}</p>
-    {% endif %}
-{% endblock %}
diff --git a/wger/core/templates/navigation.html b/wger/core/templates/navigation.html
index 14eefac3a..a8a9eaa6e 100644
--- a/wger/core/templates/navigation.html
+++ b/wger/core/templates/navigation.html
@@ -175,7 +175,8 @@
                                 </a>
                             </li>
                             <li>
-                                <a class="dropdown-item" href="{% url 'nutrition:ingredient:list' %}">
+                                <a class="dropdown-item"
+                                   href="{% url 'nutrition:ingredient:list' %}">
                                     {% translate "Ingredient overview" %}
                                 </a>
                             </li>
@@ -183,7 +184,8 @@
                                 <li class="dropdown-divider"></li>
                                 <li class="dropdown-header">{% translate "Administration" %}</li>
                                 <li>
-                                    <a class="dropdown-item" href="{% url 'nutrition:weight_unit:list' %}">
+                                    <a class="dropdown-item"
+                                       href="{% url 'nutrition:weight_unit:list' %}">
                                         {% translate "Ingredient weight units" %}
                                     </a>
                                 </li>
@@ -211,11 +213,8 @@
                                     </a>
                                 </li>
                                 <li>
-                                    <a class="dropdown-item"
-                                       href="{% url 'weight:add' %}"
-                                       rel="nofollow">
-                                        {% translate "Add weight entry" %}
-                                    </a>
+                                    {% translate 'Add weight entry' as text %}
+                                    {% modal_link url='weight:add' text=text css_class='dropdown-item' %}
                                 </li>
                             </ul>
                         </li>
diff --git a/wger/core/templates/repetition_unit/list.html b/wger/core/templates/repetition_unit/list.html
index 484ceb1df..a4f32e1c7 100644
--- a/wger/core/templates/repetition_unit/list.html
+++ b/wger/core/templates/repetition_unit/list.html
@@ -10,14 +10,18 @@
             <li class="list-group-item list-group-item-action">
                 {% if unit.id != 1 and unit.id != 2 %}
                     <div class="btn-group float-end">
-                        <button type="button" class="btn btn-dark dropdown-toggle btn-sm" data-bs-toggle="dropdown">
+                        <button type="button" class="btn btn-dark dropdown-toggle btn-sm"
+                                data-bs-toggle="dropdown">
                             <span class="{% fa_class 'cog' %}"></span>
                         </button>
                         <ul class="dropdown-menu" role="menu">
-                            <a href="{% url 'core:repetition-unit:edit' unit.id %}"
-                               class="wger-modal-dialog dropdown-item">{% translate 'Edit' %}</a>
-                            <a href="{% url 'core:repetition-unit:delete' unit.id %}"
-                               class="wger-modal-dialog dropdown-item">{% translate 'Delete' %}</a>
+                            {% translate 'Edit' as text %}
+                            {% url 'core:repetition-unit:edit' unit.id as url %}
+                            {% modal_link url=url text=text css_class='dropdown-item' %}
+
+                            {% translate 'Delete' as text %}
+                            {% url 'core:repetition-unit:delete' unit.id as url %}
+                            {% modal_link url=url text=text css_class='dropdown-item' %}
                         </ul>
                     </div>
                 {% endif %}
@@ -39,8 +43,7 @@
 {#         #}
 {% block options %}
     {% if perms.core.add_license %}
-        <a href="{% url 'core:repetition-unit:add' %}" class="btn btn-success btn-sm wger-modal-dialog">
-            {% translate "Add" %}
-        </a>
+        {% translate 'Add' as text %}
+        {% modal_link url='core:repetition-unit:add' text=text %}
     {% endif %}
 {% endblock %}
diff --git a/wger/core/templates/tags/modal_link.html b/wger/core/templates/tags/modal_link.html
new file mode 100644
index 000000000..529dd6e44
--- /dev/null
+++ b/wger/core/templates/tags/modal_link.html
@@ -0,0 +1,12 @@
+{% load static i18n %}
+
+<a
+    href="{{ url }}"
+    class="{{ css_class }}"
+    hx-get="{{ url }}"
+    hx-target="#ajax-info-content"
+    data-bs-toggle="modal"
+    data-bs-target="#wger-ajax-info"
+>
+    {{ text }}
+</a>
diff --git a/wger/core/templates/template.html b/wger/core/templates/template.html
index c47702e64..4b370adb9 100644
--- a/wger/core/templates/template.html
+++ b/wger/core/templates/template.html
@@ -68,6 +68,7 @@
         <script src="{% static 'yarn/jquery/dist/jquery.js' %}"></script>
         <script src="{% static 'yarn/bootstrap/dist/js/bootstrap.bundle.min.js' %}"></script>
         <script src="{% static 'yarn/d3/dist/d3.js' %}"></script>
+        <script src="{% static 'yarn/htmx.org/dist/htmx.min.js' %}"></script>
         <script src="{% static 'yarn/popper.js/dist/umd/popper.js' %}"></script>
         <script src="{% static 'yarn/devbridge-autocomplete/dist/jquery.autocomplete.min.js' %}">
         </script>
@@ -87,12 +88,6 @@
             if (typeof wgerCustomPageInit !== "undefined") {
                 wgerCustomPageInit();
             }
-
-            // Init the modal dialog for editing forms
-            wgerFormModalDialog();
-
-            // Initialise the hook to reload the main-content
-            wgerLoadMaincontent();
         });
     </script>
 
@@ -115,7 +110,6 @@
             <div class="modal-dialog modal-lg">
                 <div class="modal-content">
                     <div class="modal-header">
-                        <h4 class="modal-title" id="ajax-info-title">Modal title</h4>
                         <button type="button" class="btn-close" data-bs-dismiss="modal"
                                 aria-label="Close"></button>
                     </div>
diff --git a/wger/core/templates/user/delete_account.html b/wger/core/templates/user/delete_account.html
index af6a5ebd7..3998d7566 100644
--- a/wger/core/templates/user/delete_account.html
+++ b/wger/core/templates/user/delete_account.html
@@ -1,15 +1,7 @@
-{% extends "base.html" %}
 {% load i18n static wger_extras crispy_forms_tags %}
 
-{% block title %}{% translate "Delete account" %}{% endblock %}
+<h4>{% translate "Delete account" %}</h4>
 
-
-{% block header %}
-{% endblock %}
-
-{% block content %}
-
-<div class="wger-form">
     <div class="card bg-light">
         <div class="card-header">
             <h4 class="card-title">
@@ -26,9 +18,3 @@ and can't be undone. {% endblocktranslate %}{% endwith %}</p>
     </div>
     <div class="mt-2"></div>
     {% crispy form %}
-</div>
-{% endblock %}
-
-
-{% block sidebar %}
-{% endblock %}
diff --git a/wger/core/templates/user/overview.html b/wger/core/templates/user/overview.html
index b21b7099c..8d5e80c20 100644
--- a/wger/core/templates/user/overview.html
+++ b/wger/core/templates/user/overview.html
@@ -201,20 +201,38 @@
         {% translate "Actions" %} <span class="caret"></span>
     </button>
     <div class="dropdown-menu" role="menu">
-        <a href="{% url 'core:user:edit' current_user.pk %}" class="wger-modal-dialog dropdown-item">{% translate "Edit"%}</a>
+        {% translate 'Edit' as text %}
+        {% url 'core:user:edit' current_user.pk as url %}
+        {% modal_link url=url text=text css_class='dropdown-item' %}
+
         <div class="dropdown-divider"></div>
             {% if current_user.is_active %}
-            <a href="{% url 'core:user:deactivate' current_user.pk %}" class="dropdown-item">{% translate "Deactivate user"%}</a>
-        {% else %}
-            <a href="{% url 'core:user:activate' current_user.pk %}" class="dropdown-item">{% translate "Activate user"%}</a>
-        {% endif %}
-        <a data-url="{% url 'gym:gym:reset-user-password' current_user.pk %}" data-bs-toggle="modal" data-bs-target="#confirmation-modal" class="dropdown-item">{% translate "Reset user password" %}</a>
+                {% translate 'Deactivate user' as text %}
+                {% url 'core:user:deactivate' current_user.pk as url %}
+                {% modal_link url=url text=text css_class='dropdown-item' %}
+            {% else %}
+                {% translate 'Activate user' as text %}
+                {% url 'core:user:activate' current_user.pk as url %}
+                {% modal_link url=url text=text css_class='dropdown-item' %}
+            {% endif %}
+        <a
+            data-url="{% url 'gym:gym:reset-user-password' current_user.pk %}"
+            data-bs-toggle="modal" 
+            data-bs-target="#confirmation-modal"
+            class="dropdown-item">
+            {% translate "Reset user password" %}
+        </a>
         {% if perms.gym.manage_gym or perms.gym.manage_gyms %}
         {% if current_user.userprofile.gym %}
-            <a href="{% url 'gym:gym:edit-user-permission' current_user.pk %}" class="wger-modal-dialog dropdown-item">{% translate "Roles"%}</a>
+            {% translate 'Roles' as text %}
+            {% url 'gym:gym:edit-user-permission' current_user.pk as url %}
+            {% modal_link url=url text=text css_class='dropdown-item' %}
         {% endif %}
         {% endif %}
-        <a href="{% url 'core:user:delete' current_user.pk %}" class="wger-modal-dialog dropdown-item">{% translate "Delete"%}</a>
+
+        {% translate 'Delete' as text %}
+        {% url 'core:user:delete' current_user.pk as url %}
+        {% modal_link url=url text=text css_class='dropdown-item' %}
     </div>
 </div>
 
@@ -362,7 +380,10 @@
     </button>
     <div class="dropdown-menu" role="menu">
         <a href="{% url 'gym:admin_note:list' current_user.pk %}" class="dropdown-item">{% translate "Overview" %}</a>
-        <a href="{% url 'gym:admin_note:add' current_user.pk %}" class="wger-modal-dialog dropdown-item">{% translate "Add"%}</a>
+
+        {% translate 'Add' as text %}
+        {% url 'gym:admin_note:add' current_user.pk as url %}
+        {% modal_link url=url text=text css_class='dropdown-item' %}
     </div>
 </div>
 
@@ -442,7 +463,10 @@
         {% translate "Actions" %} <span class="caret"></span>
     </button>
     <div class="dropdown-menu" role="menu">
-        <a href="{% url 'gym:user_config:edit' current_user.gymuserconfig.pk %}" class="wger-modal-dialog dropdown-item">{% translate "Edit"%}</a>
+
+        {% translate 'Edit' as text %}
+        {% url 'gym:user_config:edit' current_user.gymuserconfig.pk %}
+        {% modal_link url=url text=text css_class='dropdown-item' %}
     </div>
 </div>
 {% endif %}
diff --git a/wger/core/templates/user/preferences.html b/wger/core/templates/user/preferences.html
index 826302c19..fea172542 100644
--- a/wger/core/templates/user/preferences.html
+++ b/wger/core/templates/user/preferences.html
@@ -27,7 +27,9 @@
         </p>
     {% endif %}
     <p>
-        <small class="text-muted">{% translate "You need to verify your email to contribute exercises" %}</small>
+        <small class="text-muted">
+            {% translate "You need to verify your email to contribute exercises" %}
+        </small>
     </p>
 {% endblock %}
 
@@ -39,8 +41,11 @@
 {% block options %}
     <div class="btn-group">
         <div class="btn-group" role="group">
-            <button type="button" class="btn btn-primary btn-sm dropdown-toggle" data-bs-toggle="dropdown"
-                    aria-haspopup="true" aria-expanded="false">
+            <button type="button" 
+                    class="btn btn-primary btn-sm dropdown-toggle"
+                    data-bs-toggle="dropdown"
+                    aria-haspopup="true" 
+                    aria-expanded="false">
                 <span class="{% fa_class 'cog' %}"></span>
                 {% translate "Options" %}
             </button>
@@ -54,10 +59,8 @@
                     {% translate "API key" %}
                 </a>
                 <div role="separator" class="dropdown-divider"></div>
-                <a href="{% url 'core:user:delete' %}" class="wger-modal-dialog dropdown-item">
-                    <span class="{% fa_class 'trash' %}"></span>
-                    {% translate "Delete account" %}
-                </a>
+                {% translate 'Delete account' as text %}
+                {% modal_link url='core:user:delete' text=text css_class='dropdown-item' %}
             </div>
         </div>
     </div>
diff --git a/wger/core/templates/weight_unit/list.html b/wger/core/templates/weight_unit/list.html
index 55347a618..a1486ee6b 100644
--- a/wger/core/templates/weight_unit/list.html
+++ b/wger/core/templates/weight_unit/list.html
@@ -10,14 +10,18 @@
             <li class="list-group-item list-group-item-action">
                 {% if unit.id != 1 and unit.id != 2 %}
                     <div class="btn-group float-end">
-                        <button type="button" class="btn btn-dark dropdown-toggle btn-sm" data-bs-toggle="dropdown">
+                        <button type="button" class="btn btn-dark dropdown-toggle btn-sm"
+                                data-bs-toggle="dropdown">
                             <span class="{% fa_class 'cog' %}"></span>
                         </button>
                         <div class="dropdown-menu" role="menu">
-                            <a href="{% url 'core:weight-unit:edit' unit.id %}"
-                               class="wger-modal-dialog dropdown-item">{% translate 'Edit' %}</a>
-                            <a href="{% url 'core:weight-unit:delete' unit.id %}"
-                               class="wger-modal-dialog dropdown-item">{% translate 'Delete' %}</a>
+                            {% translate 'Edit' as text %}
+                            {% url 'core:weight-unit:edit' unit.id as url %}
+                            {% modal_link url=url text=text css_class='dropdown-item' %}
+
+                            {% translate 'Delete' as text %}
+                            {% url 'core:weight-unit:delete' unit.id as url %}
+                            {% modal_link url=url text=text css_class='dropdown-item' %}
                         </div>
                     </div>
                 {% endif %}
@@ -39,8 +43,7 @@
 {#         #}
 {% block options %}
     {% if perms.core.add_license %}
-        <a href="{% url 'core:weight-unit:add' %}" class="btn btn-success btn-sm wger-modal-dialog">
-            {% translate "Add" %}
-        </a>
+        {% translate 'Add' as text %}
+        {% modal_link url='core:weight-unit:add' text=text %}
     {% endif %}
 {% endblock %}
diff --git a/wger/core/templatetags/wger_extras.py b/wger/core/templatetags/wger_extras.py
index 1711294c9..e1fc622a2 100644
--- a/wger/core/templatetags/wger_extras.py
+++ b/wger/core/templatetags/wger_extras.py
@@ -26,6 +26,7 @@ from django.utils.translation import (
     pgettext,
 )
 
+from wger.core.tests.base_testcase import get_reverse
 # wger
 from wger.manager.models import Day
 from wger.utils.constants import (
@@ -34,7 +35,6 @@ from wger.utils.constants import (
 )
 from wger.utils.language import get_language_data
 
-
 register = template.Library()
 
 
@@ -177,6 +177,11 @@ def fa_class(class_name='', icon_type='fas', fixed_width=True):
     return mark_safe(css)
 
 
+@register.inclusion_tag('tags/modal_link.html')
+def modal_link(url: str, text: str, css_class='btn btn-success btn-sm'):
+    return {'url': get_reverse(url), 'text': text, 'css_class': css_class}
+
+
 @register.simple_tag
 def trans_weight_unit(unit, user=None):
     """
diff --git a/wger/core/views/user.py b/wger/core/views/user.py
index dda9f59f9..143b08167 100644
--- a/wger/core/views/user.py
+++ b/wger/core/views/user.py
@@ -104,7 +104,6 @@ from wger.utils.generic_views import (
 from wger.utils.language import load_language
 from wger.weight.models import WeightEntry
 
-
 logger = logging.getLogger(__name__)
 
 
@@ -297,7 +296,7 @@ def registration(request):
     template_data['form'] = form
     template_data['title'] = _('Register')
 
-    return render(request, 'form.html', template_data)
+    return render(request, 'form_content.html', template_data)
 
 
 @login_required
@@ -549,8 +548,8 @@ class UserDetailView(LoginRequiredMixin, WgerMultiplePermissionRequiredMixin, De
             )
         context['workouts'] = out
         context['weight_entries'] = WeightEntry.objects.filter(user=self.object).order_by('-date')[
-            :5
-        ]
+                                    :5
+                                    ]
         context['nutrition_plans'] = NutritionPlan.objects.filter(user=self.object).order_by(
             '-creation_date'
         )[:5]
@@ -606,7 +605,7 @@ class UserListView(LoginRequiredMixin, PermissionRequiredMixin, ListView):
 
 
 class WgerPasswordChangeView(PasswordChangeView):
-    template_name = 'form.html'
+    template_name = 'form_content.html'
     success_url = reverse_lazy('core:user:preferences')
     title = gettext_lazy('Change password')
 
@@ -627,7 +626,7 @@ class WgerPasswordChangeView(PasswordChangeView):
 
 
 class WgerPasswordResetView(PasswordResetView):
-    template_name = 'form.html'
+    template_name = 'form_content.html'
     email_template_name = 'registration/password_reset_email.html'
     success_url = reverse_lazy('core:user:password_reset_done')
     from_email = settings.WGER_SETTINGS['EMAIL_FROM']
@@ -641,7 +640,7 @@ class WgerPasswordResetView(PasswordResetView):
 
 
 class WgerPasswordResetConfirmView(PasswordResetConfirmView):
-    template_name = 'form.html'
+    template_name = 'form_content.html'
     success_url = reverse_lazy('core:user:login')
 
     def get_form(self, form_class=None):
diff --git a/wger/exercises/templates/categories/admin-overview.html b/wger/exercises/templates/categories/admin-overview.html
index e253d8bee..df61c874d 100644
--- a/wger/exercises/templates/categories/admin-overview.html
+++ b/wger/exercises/templates/categories/admin-overview.html
@@ -9,14 +9,18 @@
         {% for category in exercisecategory_list %}
             <li class="list-group-item list-group-item-action">
                 <div class="btn-group float-end">
-                    <button type="button" class="btn btn-dark dropdown-toggle btn-sm" data-bs-toggle="dropdown">
+                    <button type="button" class="btn btn-dark dropdown-toggle btn-sm"
+                            data-bs-toggle="dropdown">
                         <span class="{% fa_class 'cog' %}"></span>
                     </button>
                     <div class="dropdown-menu dropdown-menu-right" role="menu">
-                        <a href="{% url 'exercise:category:edit' category.id %}"
-                           class="wger-modal-dialog dropdown-item">{% translate 'Edit' %}</a>
-                        <a href="{% url 'exercise:category:delete' category.id %}"
-                           class="wger-modal-dialog dropdown-item">{% translate 'Delete' %}</a>
+                        {% translate 'Edit' as text %}
+                        {% url 'exercise:category:edit' category.id as url %}
+                        {% modal_link url=url text=text css_class='dropdown-item' %}
+
+                        {% translate 'Delete' as text %}
+                        {% url 'exercise:category:delete' category.id as url %}
+                        {% modal_link url=url text=text css_class='dropdown-item' %}
                     </div>
                 </div>
                 {{ category }}
@@ -32,11 +36,8 @@
 
 
 {% block options %}
-    {% if perms.exercises.add_exercisecategory %}
-        <p>
-            <a href="{% url 'exercise:category:add' %}" class="btn btn-success btn-sm wger-modal-dialog">
-                {% translate "Add" %}
-            </a>
-        </p>
-    {% endif %}
+{% if perms.exercises.add_exercisecategory %}
+    {% translate 'Add' as text %}
+    {% modal_link url='exercise:category:add' text=text %}
+{% endif %}
 {% endblock %}
diff --git a/wger/exercises/templates/equipment/admin-overview.html b/wger/exercises/templates/equipment/admin-overview.html
index b107b7fb4..8c61bd765 100644
--- a/wger/exercises/templates/equipment/admin-overview.html
+++ b/wger/exercises/templates/equipment/admin-overview.html
@@ -9,14 +9,18 @@
         {% for equipment in equipment_list %}
             <li class="list-group-item list-group-item-action">
                 <div class="btn-group float-end">
-                    <button type="button" class="btn btn-dark dropdown-toggle btn-sm" data-bs-toggle="dropdown">
+                    <button type="button" class="btn btn-dark dropdown-toggle btn-sm"
+                            data-bs-toggle="dropdown">
                         <span class="{% fa_class 'cog' %}"></span>
                     </button>
                     <div class="dropdown-menu dropdown-menu-right" role="menu">
-                        <a href="{% url 'exercise:equipment:edit' equipment.id %}"
-                           class="wger-modal-dialog dropdown-item">{% translate 'Edit' %}</a>
-                        <a href="{% url 'exercise:equipment:delete' equipment.id %}"
-                           class="wger-modal-dialog dropdown-item">{% translate 'Delete' %}</a>
+                        {% translate 'Edit' as text %}
+                        {% url 'exercise:equipment:edit' equipment.id as url %}
+                        {% modal_link url=url text=text css_class='dropdown-item' %}
+
+                        {% translate 'Delete' as text %}
+                        {% url 'exercise:equipment:delete' equipment.id as url %}
+                        {% modal_link url=url text=text css_class='dropdown-item' %}
                     </div>
                 </div>
                 {{ equipment.name }}
@@ -30,14 +34,9 @@
 {% endblock %}
 
 
-
-
-{% block sidebar %}
+{% block options %}
     {% if perms.exercises.add_equipment %}
-        <p>
-            <a href="{% url 'exercise:equipment:add' %}" class="btn btn-success btn-sm wger-modal-dialog">
-                {% translate "Add new equipment" %}
-            </a>
-        </p>
+        {% translate 'Add' as text %}
+        {% modal_link url='exercise:equipment:add' text=text %}
     {% endif %}
 {% endblock %}
diff --git a/wger/exercises/templates/muscles/admin-overview.html b/wger/exercises/templates/muscles/admin-overview.html
index b84370747..5c34f51ee 100644
--- a/wger/exercises/templates/muscles/admin-overview.html
+++ b/wger/exercises/templates/muscles/admin-overview.html
@@ -13,10 +13,13 @@
                         <span class="{% fa_class 'cog' %}"></span>
                     </button>
                     <div class="dropdown-menu dropdown-menu-right" role="menu">
-                        <a href="{% url 'exercise:muscle:edit' muscle.id %}"
-                           class="wger-modal-dialog dropdown-item">{% translate 'Edit' %}</a>
-                        <a href="{% url 'exercise:muscle:delete' muscle.id %}"
-                           class="wger-modal-dialog dropdown-item">{% translate 'Delete' %}</a>
+                        {% translate 'Edit' as text %}
+                        {% url 'exercise:muscle:edit' muscle.id as url %}
+                        {% modal_link url=url text=text css_class='dropdown-item' %}
+                        
+                        {% translate 'Delete' as text %}
+                        {% url 'exercise:muscle:delete' muscle.id as url %}
+                        {% modal_link url=url text=text css_class='dropdown-item' %}
                     </div>
                 </div>
                 {{ muscle }}
@@ -34,8 +37,7 @@
 
 {% block options %}
     {% if perms.exercises.add_equipment %}
-        <a href="{% url 'exercise:muscle:add' %}" class="btn btn-success btn-sm wger-modal-dialog">
-            {% translate "Add muscle" %}
-        </a>
+        {% translate 'Add' as text %}
+        {% modal_link url='exercise:muscle:add' text=text %}
     {% endif %}
 {% endblock %}
diff --git a/wger/gym/templates/admin_notes/list.html b/wger/gym/templates/admin_notes/list.html
index cd8f86b10..7b983e334 100644
--- a/wger/gym/templates/admin_notes/list.html
+++ b/wger/gym/templates/admin_notes/list.html
@@ -22,29 +22,27 @@
         {% for note in adminusernote_list %}
             <li class="list-group-item ">
                 <div class="btn-group float-end">
-                    <button type="button" class="btn btn-light dropdown-toggle btn-sm" data-bs-toggle="dropdown">
+                    <button type="button" class="btn btn-light dropdown-toggle btn-sm"
+                            data-bs-toggle="dropdown">
                         <span class="{% fa_class 'cog' %}"></span>
                     </button>
-                    <ul class="dropdown-menu" role="menu">
+                    <div class="dropdown-menu" role="menu">
                         {% if perms.gym.change_adminusernote %}
-                            <li>
-                                <a href="{% url 'gym:admin_note:edit' note.pk %}" class="wger-modal-dialog">
-                                    {% translate 'Edit' %}
-                                </a>
-                            </li>
+                            {% translate 'Edit' as text %}
+                            {% url 'gym:admin_note:edit' note.pk as url %}
+                            {% modal_link url=url text=text css_class='dropdown-item' %}
                         {% endif %}
 
                         {% if perms.gym.delete_adminusernote %}
-                            <li>
-                                <a href="{% url 'gym:admin_note:delete' note.pk %}" class="wger-modal-dialog">
-                                    {% translate 'Delete' %}
-                                </a>
-                            <li>
+                            {% translate 'Delete' as text %}
+                            {% url 'gym:admin_note:delete' note.pk as url %}
+                            {% modal_link url=url text=text css_class='dropdown-item' %}
                         {% endif %}
-                    </ul>
+                    </div>
                 </div>
 
-                <h4 class="list-group-item-heading">{{ note.timestamp_created }} - {{ note.user|format_username }}</h4>
+                <h4 class="list-group-item-heading">{{ note.timestamp_created }}
+                    - {{ note.user|format_username }}</h4>
                 <p class="list-group-item-text">{{ note.note }}</p>
             </li>
             {% empty %}
@@ -62,9 +60,9 @@
 {# Options #}
 {#         #}
 {% block options %}
-    {% if perms.gym.add_adminusernote %}
-        <a href="{% url 'gym:admin_note:add' member.pk %}" class="wger-modal-dialog btn btn-success btn-sm">
-            {% translate "Add" %}
-        </a>
-    {% endif %}
+{% if perms.gym.add_adminusernote %}
+    {% translate 'Add' as text %}
+    {% url 'gym:admin_note:add' member.pk as url %}
+    {% modal_link url=url text=text %}
+{% endif %}
 {% endblock %}
diff --git a/wger/gym/templates/contract/list.html b/wger/gym/templates/contract/list.html
index caeee2299..bcf466bb0 100644
--- a/wger/gym/templates/contract/list.html
+++ b/wger/gym/templates/contract/list.html
@@ -21,24 +21,21 @@
         {% for contract in contract_list %}
             <li class="list-group-item list-group-item-action">
                 <div class="btn-group float-end">
-                    <button type="button" class="btn btn-dark dropdown-toggle btn-sm" data-bs-toggle="dropdown">
+                    <button type="button" class="btn btn-dark dropdown-toggle btn-sm"
+                            data-bs-toggle="dropdown">
                         <span class="{% fa_class 'cog' %}"></span>
                     </button>
-                    <ul class="dropdown-menu" role="menu">
+                    <div class="dropdown-menu" role="menu">
                         {% if perms.gym.change_contract %}
-                            <li>
-                                <a href="{% url 'gym:contract:edit' contract.pk %}">
-                                    {% translate 'Edit' %}
-                                </a>
-                            </li>
-                            <li>
-                                <a href="{% url 'gym:contract:view' contract.pk %}">
-                                    {% translate 'Show' %}
-                                </a>
-                            </li>
-                        {% endif %}
+                            {% translate 'Edit' as text %}
+                            {% url 'gym:contract:edit' contract.pk as url %}
+                            {% modal_link url=url text=text css_class='dropdown-item' %}
 
-                    </ul>
+                            {% translate 'Show' as text %}
+                            {% url 'gym:contract:view' contract.pk as url %}
+                            {% modal_link url=url text=text css_class='dropdown-item' %}
+                        {% endif %}
+                    </div>
                 </div>
 
 
@@ -69,6 +66,7 @@
 {# Options #}
 {#         #}
 {% block options %}
-    <a href="{% url 'gym:contract:add' member.pk %}"
-       class="wger-modal-dialog btn btn-sm btn-success">{% translate "Add" %}</a>
+    {% translate 'Add' as text %}
+    {% url 'gym:contract:add' member.pk as url %}
+    {% modal_link url=url text=text %}
 {% endblock %}
diff --git a/wger/gym/templates/contract/view.html b/wger/gym/templates/contract/view.html
index c9ea6aaab..e197a93b3 100644
--- a/wger/gym/templates/contract/view.html
+++ b/wger/gym/templates/contract/view.html
@@ -102,7 +102,8 @@
 
 
 
-{% block sidebar %}
-    <h4>{% translate 'Options' %}</h4>
-    <a href="{% url 'gym:contract:edit' object.pk %}" class="wger-modal-dialog">{% translate 'Edit' %}</a>
+{% block options %}
+    {% translate 'Edit' as text %}
+    {% url 'gym:contract:edit' object.pk as url %}
+    {% modal_link url=url text=text %}
 {% endblock %}
diff --git a/wger/gym/templates/contract_option/list.html b/wger/gym/templates/contract_option/list.html
index e916fc5cc..ac3c4df93 100644
--- a/wger/gym/templates/contract_option/list.html
+++ b/wger/gym/templates/contract_option/list.html
@@ -24,26 +24,20 @@
                     <button type="button" class="btn btn-dark dropdown-toggle btn-sm" data-bs-toggle="dropdown">
                         <span class="{% fa_class 'cog' %}"></span>
                     </button>
-                    <ul class="dropdown-menu" role="menu">
+                    <div class="dropdown-menu" role="menu">
                         {% if perms.gym.change_contracttype %}
-                            <li>
-                                <a href="{% url 'gym:contract-option:edit' option.pk %}"
-                                   class="wger-modal-dialog dropdown-item">
-                                    {% translate 'Edit' %}
-                                </a>
-                            </li>
+                            {% translate 'Edit' as text %}
+                            {% url 'gym:contract-option:edit' option.pk as url %}
+                            {% modal_link url=url text=text css_class='dropdown-item' %}
                         {% endif %}
 
                         {% if perms.gym.delete_contracttype %}
-                            <li>
-                                <a href="{% url 'gym:contract-option:delete' option.pk %}"
-                                   class="wger-modal-dialog dropdown-item">
-                                    {% translate 'Delete' %}
-                                </a>
-                            </li>
+                            {% translate 'Delete' as text %}
+                            {% url 'gym:contract-option:delete' option.pk as url %}
+                            {% modal_link url=url text=text css_class='dropdown-item' %}
                         {% endif %}
 
-                    </ul>
+                    </div>
                 </div>
 
 
@@ -68,7 +62,7 @@
 {# Options #}
 {#         #}
 {% block options %}
-    <a href="{% url 'gym:contract-option:add' gym.id %}" class="wger-modal-dialog btn btn-sm btn-success">
-        {% translate "Add" %}
-    </a>
+    {% translate 'Add' as text %}
+    {% url 'gym:contract-option:add' gym.id  as url %}
+    {% modal_link url=url text=text %}
 {% endblock %}
diff --git a/wger/gym/templates/contract_type/list.html b/wger/gym/templates/contract_type/list.html
index c23481e57..6b059a38b 100644
--- a/wger/gym/templates/contract_type/list.html
+++ b/wger/gym/templates/contract_type/list.html
@@ -21,29 +21,23 @@
         {% for contract_type in contracttype_list %}
             <li class="list-group-item list-group-item-action">
                 <div class="btn-group float-end">
-                    <button type="button" class="btn btn-dark dropdown-toggle btn-sm" data-bs-toggle="dropdown">
+                    <button type="button" class="btn btn-dark dropdown-toggle btn-sm"
+                            data-bs-toggle="dropdown">
                         <span class="{% fa_class 'cog' %}"></span>
                     </button>
-                    <ul class="dropdown-menu" role="menu">
+                    <div class="dropdown-menu" role="menu">
                         {% if perms.gym.change_contracttype %}
-                            <li>
-                                <a href="{% url 'gym:contract_type:edit' contract_type.pk %}"
-                                   class="wger-modal-dialog dropdown-item">
-                                    {% translate 'Edit' %}
-                                </a>
-                            </li>
+                            {% translate 'Edit' as text %}
+                            {% url 'gym:contract_type:edit' contract_type.pk as url %}
+                            {% modal_link url=url text=text css_class='dropdown-item' %}
                         {% endif %}
 
                         {% if perms.gym.delete_contracttype %}
-                            <li>
-                                <a href="{% url 'gym:contract_type:delete' contract_type.pk %}"
-                                   class="wger-modal-dialog dropdown-item">
-                                    {% translate 'Delete' %}
-                                </a>
-                            </li>
+                            {% translate 'Delete' as text %}
+                            {% url 'gym:contract_type:delete' contract_type.pk as url %}
+                            {% modal_link url=url text=text css_class='dropdown-item' %}
                         {% endif %}
-
-                    </ul>
+                    </div>
                 </div>
 
 
@@ -51,7 +45,8 @@
                     {{ contract_type.name }}
                 </h4>
 
-                <p class="list-group-item-text" style="white-space: pre-line;">{{ contract_type.description }}</p>
+                <p class="list-group-item-text"
+                   style="white-space: pre-line;">{{ contract_type.description }}</p>
             </li>
             {% empty %}
             <li class="list-group-item">
@@ -68,7 +63,7 @@
 {# Options #}
 {#         #}
 {% block options %}
-    <a href="{% url 'gym:contract_type:add' gym.id %}" class="wger-modal-dialog btn btn-sm btn-success">
-        {% translate "Add" %}
-    </a>
+    {% translate 'Add' as text %}
+    {% url 'gym:contract_type:add' gym.id as url %}
+    {% modal_link url=url text=text %}
 {% endblock %}
diff --git a/wger/gym/templates/document/list.html b/wger/gym/templates/document/list.html
index 6a8ee80a3..0b13422c9 100644
--- a/wger/gym/templates/document/list.html
+++ b/wger/gym/templates/document/list.html
@@ -22,32 +22,32 @@
         {% for document in userdocument_list %}
             <li class="list-group-item ">
                 <div class="btn-group float-end">
-                    <button type="button" class="btn btn-light dropdown-toggle btn-sm" data-bs-toggle="dropdown">
+                    <button type="button" class="btn btn-light dropdown-toggle btn-sm"
+                            data-bs-toggle="dropdown">
                         <span class="{% fa_class 'cog' %}"></span>
                     </button>
                     <ul class="dropdown-menu" role="menu">
                         <li>
-                            <a href="{{ document.document.url }}" download="{{ document.original_name }}">
-                                <span class="glyphicon glyphicon-download"></span>
+                            <a href="{{ document.document.url }}"
+                               download="{{ document.original_name }}" class="dropdown-item">
                                 {% translate 'Download' %}
                             </a>
                         </li>
                         {% if perms.gym.change_userdocument %}
                             <li>
-                                <a href="{% url 'gym:document:edit' document.pk %}">
-                                    {% translate 'Edit' %}
-                                </a>
+                                {% translate 'Edit' as text %}
+                                {% url 'gym:document:edit' document.pk as url %}
+                                {% modal_link url=url text=text css_class='dropdown-item' %}
                             </li>
                         {% endif %}
 
                         {% if perms.gym.delete_userdocument %}
                             <li>
-                                <a href="{% url 'gym:document:delete' document.pk %}" class="wger-modal-dialog">
-                                    {% translate 'Delete' %}
-                                </a>
+                                {% translate 'Delete' as text %}
+                                {% url 'gym:document:delete' document.pk as url %}
+                                {% modal_link url=url text=text css_class='dropdown-item' %}
                             </li>
                         {% endif %}
-
                     </ul>
                 </div>
 
@@ -75,8 +75,8 @@
 {#         #}
 {% block options %}
     {% if perms.gym.add_userdocument %}
-        <a href="{% url 'gym:document:add' member.pk %}" class="btn btn-sm btn-success">
-            {% translate "Add" %}
-        </a>
+        {% translate 'Add' as text %}
+        {% url 'gym:document:add' member.pk as url %}
+        {% modal_link url=url text=text %}
     {% endif %}
 {% endblock %}
diff --git a/wger/gym/templates/gym/list.html b/wger/gym/templates/gym/list.html
index 36fad3c14..0dae93ff8 100644
--- a/wger/gym/templates/gym/list.html
+++ b/wger/gym/templates/gym/list.html
@@ -16,10 +16,13 @@
                         <span class="{% fa_class 'cog' %}"></span>
                     </button>
                     <div class="dropdown-menu dropdown-menu-right" role="menu">
-                        <a href="{% url 'gym:gym:edit' gym.id %}"
-                           class="wger-modal-dialog dropdown-item">{% translate 'Edit' %}</a>
-                        <a href="{% url 'gym:gym:delete' gym.id %}"
-                           class="wger-modal-dialog dropdown-item">{% translate 'Delete' %}</a>
+                        {% translate 'Edit' as text %}
+                        {% url 'gym:gym:edit' gym.id as url %}
+                        {% modal_link url=url text=text css_class='dropdown-item' %}
+
+                        {% translate 'Delete' as text %}
+                        {% url 'gym:gym:delete' gym.id as url %}
+                        {% modal_link url=url text=text css_class='dropdown-item' %}
                     </div>
                 </div>
                 <a href="{% url 'gym:gym:user-list' gym.pk %}">{{ gym }}</a>
@@ -42,8 +45,8 @@
                 {% translate "Actions" %} <span class="caret"></span>
             </button>
             <div class="dropdown-menu" role="menu">
-                <a href="{% url 'config:gym_config:edit' %}"
-                   class="wger-modal-dialog dropdown-item">{% translate "Edit" %}</a>
+                {% translate 'Edit' as text %}
+                {% modal_link url='config:gym_config:edit' text=text css_class='dropdown-item' %}
             </div>
         </div>
     {% endif %}
@@ -62,9 +65,8 @@
 {# Options #}
 {#         #}
 {% block options %}
-    {% if perms.gym.add_gym %}
-        <a href="{% url 'gym:gym:add' %}" class="btn btn-success btn-sm wger-modal-dialog">
-            {% translate "Add new gym" %}
-        </a>
-    {% endif %}
+{% if perms.gym.add_gym %}
+    {% translate 'Add new gym' as text %}
+    {% modal_link url='gym:gym:add' text=text  %}
+{% endif %}
 {% endblock %}
diff --git a/wger/gym/templates/gym/member_list.html b/wger/gym/templates/gym/member_list.html
index f1472df5f..948be3660 100644
--- a/wger/gym/templates/gym/member_list.html
+++ b/wger/gym/templates/gym/member_list.html
@@ -58,7 +58,14 @@
 
     {% if perms.gym.manage_gym or perms.gym.manage_gyms %}
     <td style="text-align: right;">
-        <a href="{% url 'gym:gym:edit-user-permission' current_user.obj.pk %}" class="btn btn-light btn-sm wger-modal-dialog">
+        <a
+            href="{% url 'gym:gym:edit-user-permission' current_user.obj.pk %}"
+            class="btn btn-light btn-sm "
+            hx-get="{% url 'gym:gym:edit-user-permission' current_user.obj.pk %}"
+            hx-target="#ajax-info-content"
+            data-bs-toggle="modal"
+            data-bs-target="#wger-ajax-info"
+        >
             <span class="{% fa_class 'cog' %}"></span>
         </a>
     </td>
@@ -84,8 +91,13 @@
         {% translate "Actions" %} <span class="caret"></span>
     </a>
     <div class="dropdown-menu dropdown-menu-right" role="menu">
-        <a href="{% url 'gym:gym:edit' gym.id %}" class="dropdown-item wger-modal-dialog">{% translate "Edit"%}</a>
-        <a href="{% url 'gym:export:users' gym.id %}" class="dropdown-item">{% translate "Export"%}</a>
+        {% translate 'Edit' as text %}
+        {% url 'gym:gym:edit' gym.id as url %}
+        {% modal_link url=url text=text css_class='dropdown-item' %}
+
+        {% translate 'Export' as text %}
+        {% url 'gym:export:users' gym.id as url %}
+        {% modal_link url=url text=text css_class='dropdown-item' %}
     </div>
 </div>
 {% endif %}
@@ -137,7 +149,9 @@
         {% translate "Actions" %} <span class="caret"></span>
     </a>
     <div class="dropdown-menu dropdown-menu-right">
-        <a href="{% url 'gym:config:edit' gym.config.id %}" class="wger-modal-dialog dropdown-item">{% translate "Edit"%}</a>
+        {% translate 'Edit' as text %}
+        {% url 'gym:config:edit' gym.config.id as url %}
+        {% modal_link url=url text=text css_class='dropdown-item' %}
     </div>
 </div>
 {% endif %}
@@ -173,7 +187,9 @@
             {% translate "Actions" %} <span class="caret"></span>
         </a>
         <div class="dropdown-menu dropdown-menu-right" role="menu">
-            <a href="{% url 'gym:admin_config:edit' user.gymadminconfig.id %}" class="dropdown-item wger-modal-dialog">{% translate "Edit"%}</a>
+            {% translate 'Edit' as text %}
+            {% url 'gym:admin_config:edit' user.gymadminconfig.id as url %}
+            {% modal_link url=url text=text css_class='dropdown-item' %}
         </div>
     </div>
 </div>
@@ -208,7 +224,10 @@
     </a>
     <div class="dropdown-menu dropdown-menu-right" role="menu">
         <a href="{% url 'gym:contract_type:list' gym.id %}" class="dropdown-item">{% translate "Overview" %}</a>
-        <a href="{% url 'gym:contract_type:add' gym.id %}" class="dropdown-item wger-modal-dialog">{% translate "Add" %}</a>
+
+        {% translate 'Add' as text %}
+        {% url 'gym:contract_type:add' gym.id as url %}
+        {% modal_link url=url text=text css_class='dropdown-item' %}
     </div>
 </div>
 
@@ -241,7 +260,10 @@
     </button>
     <div class="dropdown-menu dropdown-menu-right" role="menu">
         <a href="{% url 'gym:contract-option:list' gym.id %}" class="dropdown-item">{% translate "Overview" %}</a>
-        <a href="{% url 'gym:contract-option:add' gym.id %}" class="dropdown-item wger-modal-dialog">{% translate "Add" %}</a>
+
+        {% translate 'Add' as text %}
+        {% url 'gym:contract-option:add' gym.id as url %}
+        {% modal_link url=url text=text css_class='dropdown-item' %}
     </div>
 </div>
 
@@ -311,8 +333,8 @@
 {#         #}
 {% block options %}
 {% if perms.gym.manage_gym or perms.gym.manage_gyms %}
-    <a href="{% url 'gym:gym:add-user' gym.pk %}" class="btn btn-success btn-sm wger-modal-dialog">
-        {% translate "Add member" %}
-    </a>
+    {% translate 'Add member' as text %}
+    {% url 'gym:gym:add-user' gym.pk as url %}
+    {% modal_link url=url text=text  %}
 {% endif %}
 {% endblock %}
diff --git a/wger/locale/ar_SA/LC_MESSAGES/django.po b/wger/locale/ar_SA/LC_MESSAGES/django.po
index 885cf7668..079137bb1 100644
--- a/wger/locale/ar_SA/LC_MESSAGES/django.po
+++ b/wger/locale/ar_SA/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: wger Workout Manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-07-14 15:59+0200\n"
+"POT-Creation-Date: 2024-11-14 13:09+0100\n"
 "PO-Revision-Date: 2023-06-24 20:53+0000\n"
 "Last-Translator: SlyBat <aw9gm3@gmail.com>\n"
 "Language-Team: Arabic (Saudi Arabia) <https://hosted.weblate.org/projects/"
@@ -21,7 +21,7 @@ msgstr ""
 "&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
 "X-Generator: Weblate 4.18.1\n"
 
-#: config/models/gym_config.py:46 gym/templates/gym/list.html:53
+#: config/models/gym_config.py:46 gym/templates/gym/list.html:56
 msgid "Default gym"
 msgstr "الجيم الافتراضي"
 
@@ -34,28 +34,28 @@ msgstr ""
 "المستخدمين المسجلين الجدد في هذه الصالة الرياضية وتحديث جميع المستخدمين "
 "الحاليين بدون صالة رياضية."
 
-#: config/views/gym_config.py:42 core/templates/language/view.html:67
-#: core/templates/license/list.html:17 core/templates/misc/license/list.html:18
+#: config/views/gym_config.py:42 core/templates/language/view.html:64
+#: core/templates/license/list.html:17
 #: core/templates/repetition_unit/list.html:18
-#: core/templates/tags/render_day.html:39
-#: core/templates/tags/render_day.html:75 core/templates/user/overview.html:204
-#: core/templates/user/overview.html:445
+#: core/templates/user/overview.html:204 core/templates/user/overview.html:467
 #: core/templates/weight_unit/list.html:18
 #: exercises/templates/categories/admin-overview.html:17
 #: exercises/templates/equipment/admin-overview.html:17
-#: exercises/templates/muscles/admin-overview.html:17
-#: gallery/views/images.py:98 gym/templates/admin_notes/list.html:32
-#: gym/templates/contract/list.html:31 gym/templates/contract/view.html:107
-#: gym/templates/contract_option/list.html:32
-#: gym/templates/contract_type/list.html:32 gym/templates/document/list.html:38
-#: gym/templates/gym/list.html:20 gym/templates/gym/list.html:46
-#: gym/templates/gym/member_list.html:87 gym/templates/gym/member_list.html:140
-#: gym/templates/gym/member_list.html:176
-#: manager/templates/calendar/day.html:68
-#: manager/templates/calendar/month.html:85
-#: manager/templates/calendar/partial_overview_table.html:18
-#: manager/templates/schedule/view.html:118
-#: nutrition/templates/ingredient/view.html:165
+#: exercises/templates/muscles/admin-overview.html:16
+#: gallery/views/images.py:98 gym/templates/admin_notes/list.html:31
+#: gym/templates/contract/list.html:30 gym/templates/contract/view.html:106
+#: gym/templates/contract_option/list.html:29
+#: gym/templates/contract_type/list.html:30 gym/templates/document/list.html:38
+#: gym/templates/gym/list.html:19 gym/templates/gym/list.html:48
+#: gym/templates/gym/member_list.html:94 gym/templates/gym/member_list.html:152
+#: gym/templates/gym/member_list.html:190
+#: manager/templates/calendar/day.html:67
+#: manager/templates/calendar/month.html:84
+#: manager/templates/calendar/partial_overview_table.html:16
+#: manager/templates/schedule/view.html:318
+#: manager/templates/workout/view.html:181
+#: nutrition/templates/ingredient/view.html:164
+#: nutrition/templates/ingredient/view.html:209
 #: nutrition/templates/units/list.html:19
 msgid "Edit"
 msgstr "تعديل"
@@ -91,8 +91,8 @@ msgstr "جدول تماريني الرائع"
 msgid "Empty placeholder schedule"
 msgstr "حامل جدول فارغ"
 
-#: core/forms.py:69 core/templates/navigation.html:285
-#: core/templates/navigation.html:291 core/templates/user/login.html:4
+#: core/forms.py:69 core/templates/navigation.html:284
+#: core/templates/navigation.html:290 core/templates/user/login.html:4
 #: software/templates/features.html:82 software/templates/features.html:427
 msgid "Login"
 msgstr "تسجيل الدخول"
@@ -102,14 +102,14 @@ msgstr "تسجيل الدخول"
 msgid "First name"
 msgstr "الاسم الاول"
 
-#: core/forms.py:109 core/forms.py:215 core/templates/user/overview.html:266
+#: core/forms.py:109 core/forms.py:215 core/templates/user/overview.html:284
 #: gym/views/export.py:62 gym/views/gym.py:217
 msgid "Last name"
 msgstr "الاسم الاخير"
 
-#: core/forms.py:111 core/forms.py:180 core/templates/user/overview.html:270
+#: core/forms.py:111 core/forms.py:180 core/templates/user/overview.html:288
 #: gym/models/contract.py:256 gym/models/gym.py:58
-#: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:104
+#: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:116
 #: gym/templates/gym/new_user.html:30 gym/views/export.py:60
 #: mailer/templates/mailer/gym/form.html:4
 #: mailer/templates/mailer/gym/overview.html:4
@@ -138,8 +138,8 @@ msgstr "تنبيهات و اشعارات التدريب"
 msgid "Other settings"
 msgstr "أعدادات اخرى"
 
-#: core/forms.py:174 core/views/user.py:624 core/views/user.py:639
-#: core/views/user.py:651 gym/forms.py:73 manager/templates/log/add.html:65
+#: core/forms.py:174 core/views/user.py:623 core/views/user.py:638
+#: core/views/user.py:650 gym/forms.py:73 manager/templates/log/add.html:65
 #: manager/templates/set/add.html:70 manager/views/workout.py:203
 #: utils/generic_views.py:143
 msgid "Save"
@@ -162,26 +162,25 @@ msgstr "كلمة السر"
 msgid "Please enter your current password."
 msgstr "الرجاء ادخال كلمة المرور الحالية."
 
-#: core/forms.py:242 core/templates/language/view.html:73
-#: core/templates/license/list.html:19 core/templates/misc/license/list.html:22
-#: core/templates/repetition_unit/list.html:20
-#: core/templates/tags/render_day.html:45
-#: core/templates/tags/render_day.html:81 core/templates/user/overview.html:217
-#: core/templates/weight_unit/list.html:20
-#: exercises/templates/categories/admin-overview.html:19
-#: exercises/templates/equipment/admin-overview.html:19
-#: exercises/templates/muscles/admin-overview.html:19
-#: gym/templates/admin_notes/list.html:40
-#: gym/templates/contract_option/list.html:41
-#: gym/templates/contract_type/list.html:41 gym/templates/document/list.html:46
-#: gym/templates/gym/list.html:22 manager/templates/calendar/day.html:73
-#: manager/templates/calendar/month.html:89
-#: manager/templates/calendar/partial_overview_table.html:23
-#: manager/templates/schedule/view.html:122
-#: manager/templates/workout/view.html:188
-#: nutrition/templates/ingredient/view.html:166
+#: core/forms.py:242 core/templates/language/view.html:70
+#: core/templates/license/list.html:21
+#: core/templates/repetition_unit/list.html:22
+#: core/templates/user/overview.html:233
+#: core/templates/weight_unit/list.html:22
+#: exercises/templates/categories/admin-overview.html:21
+#: exercises/templates/equipment/admin-overview.html:21
+#: exercises/templates/muscles/admin-overview.html:20
+#: gym/templates/admin_notes/list.html:37
+#: gym/templates/contract_option/list.html:35
+#: gym/templates/contract_type/list.html:36 gym/templates/document/list.html:46
+#: gym/templates/gym/list.html:23 manager/templates/calendar/day.html:73
+#: manager/templates/calendar/month.html:88
+#: manager/templates/calendar/partial_overview_table.html:22
+#: manager/templates/schedule/view.html:324
+#: manager/templates/workout/view.html:202
+#: nutrition/templates/ingredient/view.html:168
 #: nutrition/templates/ingredient/view.html:215
-#: nutrition/templates/units/list.html:22
+#: nutrition/templates/units/list.html:25
 msgid "Delete"
 msgstr "حذف"
 
@@ -193,9 +192,9 @@ msgstr "الرمز غير صحيح"
 msgid "The form is secured with reCAPTCHA"
 msgstr ""
 
-#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:285
-#: core/templates/navigation.html:297 core/templates/template.html:149
-#: core/templates/user/login.html:20 core/views/user.py:298
+#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:284
+#: core/templates/navigation.html:296 core/templates/template.html:151
+#: core/templates/user/login.html:20 core/views/user.py:297
 #: software/templates/features.html:87 software/templates/features.html:422
 msgid "Register"
 msgstr "التسجيل"
@@ -430,18 +429,18 @@ msgid "The sum of all hours has to be 24"
 msgstr ""
 
 #: core/models/rep_unit.py:36 core/models/weight_unit.py:36
-#: core/templates/user/overview.html:262 core/views/user.py:599
+#: core/templates/user/overview.html:280 core/views/user.py:598
 #: exercises/models/category.py:29 exercises/models/equipment.py:29
 #: exercises/models/exercise.py:59 exercises/models/muscle.py:36
 #: gym/models/contract.py:52 gym/models/contract.py:103 gym/models/gym.py:46
 #: gym/models/user_document.py:84 gym/templates/contract/view.html:50
-#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:96
+#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:108
 #: gym/views/gym.py:158 manager/models/schedule.py:55
 #: manager/models/workout.py:57 measurements/models/category.py:36
 #: nutrition/models/ingredient.py:111
-#: nutrition/models/ingredient_category.py:27 nutrition/models/meal.py:67
+#: nutrition/models/ingredient_category.py:27 nutrition/models/meal.py:65
 #: nutrition/models/weight_unit.py:38
-#: nutrition/templates/ingredient/view.html:152
+#: nutrition/templates/ingredient/view.html:151
 msgid "Name"
 msgstr ""
 
@@ -486,7 +485,7 @@ msgstr ""
 msgid "Back to \"%(target)s\""
 msgstr ""
 
-#: core/templates/delete.html:15
+#: core/templates/delete.html:4
 msgid "Are you sure you want to delete this? This action cannot be undone."
 msgstr ""
 
@@ -540,7 +539,7 @@ msgstr ""
 msgid "Dashboard"
 msgstr ""
 
-#: core/templates/language/overview.html:4 core/templates/navigation.html:345
+#: core/templates/language/overview.html:4 core/templates/navigation.html:344
 msgid "Languages"
 msgstr "اللغات"
 
@@ -550,80 +549,73 @@ msgstr "لم يتم العثور على شيء."
 
 #: core/templates/language/overview.html:22
 #: manager/templates/calendar/month.html:132
-#: manager/templates/schedule/overview.html:28
-#: manager/templates/schedule/view.html:144
+#: manager/templates/schedule/view.html:154
 #: manager/templates/workout/overview.html:28
 #: nutrition/templates/ingredient/overview.html:38
 #, fuzzy
 msgid "Add one now."
 msgstr "أضف واحدة الآن."
 
-#: core/templates/language/overview.html:35 core/templates/license/list.html:40
-#: core/templates/misc/license/list.html:43
-#: core/templates/repetition_unit/list.html:43
-#: core/templates/user/overview.html:326 core/templates/user/overview.html:365
-#: core/templates/user/overview.html:401
-#: core/templates/weight_unit/list.html:43 core/views/languages.py:74
+#: core/templates/language/overview.html:34 core/templates/license/list.html:43
+#: core/templates/repetition_unit/list.html:46
+#: core/templates/user/overview.html:344 core/templates/user/overview.html:384
+#: core/templates/user/overview.html:422
+#: core/templates/weight_unit/list.html:46 core/views/languages.py:74
 #: core/views/license.py:66 core/views/repetition_units.py:66
 #: core/views/weight_units.py:66
-#: exercises/templates/categories/admin-overview.html:38
-#: gallery/views/images.py:63 gym/templates/admin_notes/list.html:67
-#: gym/templates/contract/list.html:73
-#: gym/templates/contract_option/list.html:72
-#: gym/templates/contract_type/list.html:72 gym/templates/document/list.html:79
-#: gym/templates/gym/member_list.html:211
-#: gym/templates/gym/member_list.html:244
-#: gym/templates/gym/member_list.html:281
+#: exercises/templates/categories/admin-overview.html:40
+#: exercises/templates/equipment/admin-overview.html:39
+#: exercises/templates/muscles/admin-overview.html:40
+#: gallery/views/images.py:63 gym/templates/admin_notes/list.html:64
+#: gym/templates/contract/list.html:69
+#: gym/templates/contract_option/list.html:65
+#: gym/templates/contract_type/list.html:66 gym/templates/document/list.html:78
+#: gym/templates/gym/member_list.html:228
+#: gym/templates/gym/member_list.html:264
+#: gym/templates/gym/member_list.html:303
 #: mailer/templates/mailer/gym/overview.html:43
+#: nutrition/templates/ingredient/overview.html:60
 msgid "Add"
 msgstr "اضف"
 
 #: core/templates/language/view.html:61 core/templates/user/api_key.html:44
-#: core/templates/user/preferences.html:45 gym/models/contract.py:203
-#: gym/templates/contract/view.html:41 gym/templates/contract/view.html:106
-#: gym/templates/gym/member_list.html:248
-#: manager/templates/schedule/view.html:285
-#: manager/templates/workout/view.html:163
-#: nutrition/templates/ingredient/view.html:202
+#: core/templates/user/preferences.html:50 gym/models/contract.py:203
+#: gym/templates/contract/view.html:41 gym/templates/gym/member_list.html:270
+#: manager/templates/schedule/view.html:304
+#: manager/templates/workout/view.html:177
+#: nutrition/templates/ingredient/view.html:206
 msgid "Options"
 msgstr "الخيارات"
 
-#: core/templates/license/list.html:4 core/templates/misc/license/list.html:4
+#: core/templates/license/list.html:4
 msgid "License list"
 msgstr ""
 
-#: core/templates/license/list.html:26 core/templates/misc/license/list.html:30
-#: core/templates/repetition_unit/list.html:28
+#: core/templates/license/list.html:30
+#: core/templates/repetition_unit/list.html:32
 #: core/templates/user/overview.html:104 core/templates/user/overview.html:136
-#: core/templates/user/overview.html:185 core/templates/user/overview.html:347
-#: core/templates/user/overview.html:383 core/templates/user/overview.html:427
-#: core/templates/weight_unit/list.html:28
-#: exercises/templates/categories/admin-overview.html:26
-#: exercises/templates/equipment/admin-overview.html:26
-#: exercises/templates/muscles/admin-overview.html:26
-#: gym/templates/admin_notes/list.html:52 gym/templates/contract/list.html:60
-#: gym/templates/contract_option/list.html:58
-#: gym/templates/contract_type/list.html:58 gym/templates/document/list.html:64
-#: gym/templates/gym/list.html:29 gym/templates/gym/member_list.html:229
-#: gym/templates/gym/member_list.html:262
-#: gym/templates/gym/member_list.html:299
+#: core/templates/user/overview.html:185 core/templates/user/overview.html:365
+#: core/templates/user/overview.html:404 core/templates/user/overview.html:448
+#: core/templates/weight_unit/list.html:32
+#: exercises/templates/categories/admin-overview.html:30
+#: exercises/templates/equipment/admin-overview.html:30
+#: exercises/templates/muscles/admin-overview.html:29
+#: gym/templates/admin_notes/list.html:50 gym/templates/contract/list.html:57
+#: gym/templates/contract_option/list.html:52
+#: gym/templates/contract_type/list.html:53 gym/templates/document/list.html:64
+#: gym/templates/gym/list.html:32 gym/templates/gym/member_list.html:248
+#: gym/templates/gym/member_list.html:284
+#: gym/templates/gym/member_list.html:321
 #: mailer/templates/mailer/gym/overview.html:30
-#: manager/templates/calendar/day.html:87
-#: nutrition/templates/units/list.html:29
+#: manager/templates/calendar/day.html:88
+#: nutrition/templates/units/list.html:34
 msgid "Nothing found"
 msgstr ""
 
-#: core/templates/misc/about.html:4 core/templates/template.html:175
+#: core/templates/misc/about.html:4 core/templates/template.html:188
 msgid "Imprint"
 msgstr ""
 
-#: core/templates/misc/license/list.html:47
-msgid ""
-"If a license has been localized, e.g. the Creative Commons\n"
-"            licenses for the different countries, add them as separate "
-"entries here."
-msgstr ""
-
 #: core/templates/navigation.html:28 software/templates/features.html:437
 msgid "Training"
 msgstr ""
@@ -668,8 +660,8 @@ msgstr ""
 msgid "Exercises"
 msgstr "تمارين"
 
-#: core/templates/navigation.html:111 core/templates/navigation.html:184
-#: core/templates/navigation.html:340
+#: core/templates/navigation.html:111 core/templates/navigation.html:185
+#: core/templates/navigation.html:339
 msgid "Administration"
 msgstr ""
 
@@ -708,87 +700,87 @@ msgstr ""
 msgid "Daily calories calculator"
 msgstr ""
 
-#: core/templates/navigation.html:179
+#: core/templates/navigation.html:180
 #: nutrition/templates/ingredient/overview.html:10
 msgid "Ingredient overview"
 msgstr ""
 
-#: core/templates/navigation.html:187 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:189 nutrition/templates/units/list.html:6
 msgid "Ingredient weight units"
 msgstr ""
 
-#: core/templates/navigation.html:203 software/templates/features.html:442
+#: core/templates/navigation.html:205 software/templates/features.html:442
 msgid "Body weight"
 msgstr ""
 
-#: core/templates/navigation.html:210 core/templates/user/overview.html:114
+#: core/templates/navigation.html:212 core/templates/user/overview.html:114
 msgid "Weight overview"
 msgstr ""
 
-#: core/templates/navigation.html:217 weight/views.py:65
+#: core/templates/navigation.html:216 weight/views.py:65
 msgid "Add weight entry"
 msgstr ""
 
-#: core/templates/navigation.html:231
+#: core/templates/navigation.html:230
 msgid "About this software"
 msgstr ""
 
-#: core/templates/navigation.html:237 software/templates/about_us.html:5
+#: core/templates/navigation.html:236 software/templates/about_us.html:5
 msgid "About us"
 msgstr ""
 
-#: core/templates/navigation.html:243 software/templates/features.html:507
+#: core/templates/navigation.html:242 software/templates/features.html:507
 msgid "REST API"
 msgstr ""
 
-#: core/templates/navigation.html:249 utils/models.py:45
+#: core/templates/navigation.html:248 utils/models.py:45
 msgid "License"
 msgstr ""
 
-#: core/templates/navigation.html:255
+#: core/templates/navigation.html:254
 msgid "Developer documentation"
 msgstr ""
 
-#: core/templates/navigation.html:262
+#: core/templates/navigation.html:261
 msgid "Get the code"
 msgstr ""
 
-#: core/templates/navigation.html:269 core/templates/template.html:214
+#: core/templates/navigation.html:268 core/templates/template.html:227
 #: software/templates/features.html:582
 msgid "Translate"
 msgstr ""
 
-#: core/templates/navigation.html:303 core/templates/user/login.html:28
+#: core/templates/navigation.html:302 core/templates/user/login.html:28
 msgid "Reset password"
 msgstr ""
 
-#: core/templates/navigation.html:321
+#: core/templates/navigation.html:320
 msgid "My preferences"
 msgstr ""
 
-#: core/templates/navigation.html:330
+#: core/templates/navigation.html:329
 msgid "Logout"
 msgstr ""
 
-#: core/templates/navigation.html:353
+#: core/templates/navigation.html:352
 msgid "Licenses"
 msgstr ""
 
-#: core/templates/navigation.html:361
+#: core/templates/navigation.html:360
 #: core/templates/repetition_unit/list.html:4
 msgid "Repetition units"
 msgstr ""
 
-#: core/templates/navigation.html:369 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:368 core/templates/weight_unit/list.html:4
 #: nutrition/templates/ingredient/view.html:141
 msgid "Weight units"
 msgstr ""
 
-#: core/templates/navigation.html:377 core/templates/user/list.html:4
+#: core/templates/navigation.html:376 core/templates/user/list.html:4
 msgid "User list"
 msgstr ""
 
-#: core/templates/navigation.html:383
+#: core/templates/navigation.html:382
 msgid "Gyms"
 msgstr ""
 
@@ -847,55 +839,28 @@ msgstr ""
 msgid "next"
 msgstr ""
 
-#: core/templates/tags/render_day.html:34
-msgid "Add weight log"
+#: core/templates/tags/render_day.html:44
+msgid "Placeholder image for translation"
 msgstr ""
 
-#: core/templates/tags/render_day.html:116
-msgid "Placeholder image for exercise"
-msgstr ""
-
-#: core/templates/tags/render_day.html:133
-msgid "This exercise has no repetitions."
-msgstr ""
-
-#: core/templates/tags/render_day.html:136
-msgid "Edit them now."
-msgstr ""
-
-#: core/templates/tags/render_day.html:162
-msgid "Add exercises to this workout day"
-msgstr ""
-
-#: core/templates/tags/render_weight_log.html:17 manager/helpers.py:86
-#: manager/models/setting.py:72 manager/templates/set/formset.html:9
-msgid "Reps"
-msgstr ""
-
-#: core/templates/tags/render_weight_log.html:30 manager/forms.py:191
-#: manager/models/log.py:103 manager/models/setting.py:102
-#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
-msgid "RiR"
-msgstr ""
-
-#: core/templates/template.html:122 manager/templates/calendar/month.html:138
-#: manager/templates/schedule/view.html:248
-#: manager/templates/schedule/view.html:269
-#: manager/templates/workout/view.html:84
-#: manager/templates/workout/view.html:137
+#: core/templates/template.html:124 manager/templates/calendar/month.html:138
+#: manager/templates/schedule/view.html:262
+#: manager/templates/schedule/view.html:287
+#: manager/templates/workout/view.html:89
+#: manager/templates/workout/view.html:149
 msgid "Close"
 msgstr ""
 
-#: core/templates/template.html:138
+#: core/templates/template.html:140
 msgid ""
 "You are using a guest account, data entered will be deleted after a week."
 msgstr ""
 
-#: core/templates/template.html:143
+#: core/templates/template.html:145
 msgid "Create some demo entries"
 msgstr ""
 
-#: core/templates/template.html:180 software/templates/features.html:547
+#: core/templates/template.html:193 software/templates/features.html:547
 #: software/templates/tos.html:7
 msgid "Terms of service"
 msgstr ""
@@ -904,7 +869,7 @@ msgstr ""
 msgid "Features"
 msgstr ""
 
-#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:54
+#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:59
 msgid "API key"
 msgstr ""
 
@@ -943,17 +908,17 @@ msgstr ""
 msgid "Documentation"
 msgstr ""
 
-#: core/templates/user/delete_account.html:4
-#: core/templates/user/preferences.html:59
+#: core/templates/user/delete_account.html:3
+#: core/templates/user/preferences.html:62
 msgid "Delete account"
 msgstr ""
 
-#: core/templates/user/delete_account.html:17
+#: core/templates/user/delete_account.html:9
 #: exercises/templates/history/overview.html:93
 msgid "Are you sure?"
 msgstr ""
 
-#: core/templates/user/delete_account.html:22
+#: core/templates/user/delete_account.html:14
 #, python-format
 msgid ""
 "This action will delete the user account \"%(username)s\".\n"
@@ -972,22 +937,22 @@ msgstr ""
 
 #: core/templates/user/overview.html:25 core/templates/user/overview.html:68
 #: core/templates/user/overview.html:112 core/templates/user/overview.html:144
-#: core/templates/user/overview.html:330 core/templates/user/overview.html:369
-#: core/templates/user/overview.html:405
+#: core/templates/user/overview.html:348 core/templates/user/overview.html:390
+#: core/templates/user/overview.html:426
 #, python-format
 msgid "last %(number)s"
 msgstr ""
 
 #: core/templates/user/overview.html:27 core/templates/user/overview.html:146
-#: core/templates/user/overview.html:325 core/templates/user/overview.html:364
-#: core/templates/user/overview.html:400 gym/templates/gym/member_list.html:210
-#: gym/templates/gym/member_list.html:243
-#: gym/templates/gym/member_list.html:280
+#: core/templates/user/overview.html:343 core/templates/user/overview.html:382
+#: core/templates/user/overview.html:421 gym/templates/gym/member_list.html:226
+#: gym/templates/gym/member_list.html:262
+#: gym/templates/gym/member_list.html:302
 msgid "Overview"
 msgstr ""
 
 #: core/templates/user/overview.html:28
-#: manager/templates/schedule/view.html:163
+#: manager/templates/schedule/view.html:172
 #: manager/templates/workout/overview.html:39 manager/views/schedule_step.py:60
 msgid "Add workout"
 msgstr ""
@@ -1019,38 +984,36 @@ msgstr ""
 msgid "Number of logs (days)"
 msgstr ""
 
-#: core/templates/user/overview.html:37 core/views/user.py:600
+#: core/templates/user/overview.html:37 core/views/user.py:599
 #: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:158
 msgid "Last activity"
 msgstr ""
 
 #: core/templates/user/overview.html:58
 #: manager/templates/calendar/month.html:128
-#: manager/templates/schedule/view.html:144
 #: manager/templates/workout/overview.html:28
 msgid "No workouts found."
 msgstr ""
 
 #: core/templates/user/overview.html:68 manager/forms.py:280
-#: manager/templates/workout/view.html:106
+#: manager/templates/workout/view.html:114
 msgid "Log"
 msgstr ""
 
 #: core/templates/user/overview.html:77 manager/models/session.py:83
-#: manager/templates/calendar/partial_overview_table.html:52
+#: manager/templates/calendar/partial_overview_table.html:54
 msgid "General impression"
 msgstr ""
 
-#: core/templates/user/overview.html:78 core/templates/user/overview.html:369
+#: core/templates/user/overview.html:78 core/templates/user/overview.html:390
 #: manager/models/session.py:73
-#: manager/templates/calendar/partial_overview_table.html:56
-#: manager/templates/workout/log.html:89
+#: manager/templates/calendar/partial_overview_table.html:58
 msgid "Notes"
 msgstr ""
 
 #: core/templates/user/overview.html:79
 #: exercises/templates/history/overview.html:30
-#: manager/templates/calendar/partial_overview_table.html:42
+#: manager/templates/calendar/partial_overview_table.html:44
 msgid "Time"
 msgstr ""
 
@@ -1088,122 +1051,122 @@ msgstr ""
 msgid "kcal"
 msgstr ""
 
-#: core/templates/user/overview.html:201 core/templates/user/overview.html:322
-#: core/templates/user/overview.html:361 core/templates/user/overview.html:397
-#: core/templates/user/overview.html:442 gym/templates/gym/list.html:42
-#: gym/templates/gym/member_list.html:84 gym/templates/gym/member_list.html:137
-#: gym/templates/gym/member_list.html:173
-#: gym/templates/gym/member_list.html:207
-#: gym/templates/gym/member_list.html:240
-#: gym/templates/gym/member_list.html:277
-#: manager/templates/schedule/view.html:100
+#: core/templates/user/overview.html:201 core/templates/user/overview.html:340
+#: core/templates/user/overview.html:379 core/templates/user/overview.html:418
+#: core/templates/user/overview.html:463 gym/templates/gym/list.html:45
+#: gym/templates/gym/member_list.html:91 gym/templates/gym/member_list.html:149
+#: gym/templates/gym/member_list.html:187
+#: gym/templates/gym/member_list.html:223
+#: gym/templates/gym/member_list.html:259
+#: gym/templates/gym/member_list.html:299
+#: manager/templates/schedule/view.html:99
 msgid "Actions"
 msgstr ""
 
-#: core/templates/user/overview.html:207
+#: core/templates/user/overview.html:210
 msgid "Deactivate user"
 msgstr ""
 
-#: core/templates/user/overview.html:209
+#: core/templates/user/overview.html:214
 msgid "Activate user"
 msgstr ""
 
-#: core/templates/user/overview.html:211
+#: core/templates/user/overview.html:223
 msgid "Reset user password"
 msgstr ""
 
-#: core/templates/user/overview.html:214 gym/templates/gym/member_list.html:30
+#: core/templates/user/overview.html:227 gym/templates/gym/member_list.html:30
 msgid "Roles"
 msgstr ""
 
-#: core/templates/user/overview.html:225
+#: core/templates/user/overview.html:243
 msgid "Password reset confirmation"
 msgstr ""
 
-#: core/templates/user/overview.html:229
+#: core/templates/user/overview.html:247
 msgid "Do you really want to change this user&#39;s password?"
 msgstr ""
 
-#: core/templates/user/overview.html:232
+#: core/templates/user/overview.html:250
 #: exercises/templates/history/overview.html:106
 msgid "No"
 msgstr ""
 
-#: core/templates/user/overview.html:233
+#: core/templates/user/overview.html:251
 #: exercises/templates/history/overview.html:99
 msgid "Yes"
 msgstr ""
 
-#: core/templates/user/overview.html:254 gym/templates/gym/member_list.html:93
+#: core/templates/user/overview.html:272 gym/templates/gym/member_list.html:105
 msgid "Details"
 msgstr ""
 
-#: core/templates/user/overview.html:258 gym/views/export.py:57
-#: manager/helpers.py:86 manager/templates/schedule/view.html:98
+#: core/templates/user/overview.html:276 gym/views/export.py:57
+#: manager/helpers.py:86 manager/templates/schedule/view.html:97
 msgid "Nr."
 msgstr ""
 
-#: core/templates/user/overview.html:280 gym/models/contract.py:287
+#: core/templates/user/overview.html:298 gym/models/contract.py:287
 #: gym/models/gym.py:50 gym/templates/contract/view.html:75
-#: gym/templates/gym/member_list.html:100 gym/views/export.py:68
+#: gym/templates/gym/member_list.html:112 gym/views/export.py:68
 msgid "Phone"
 msgstr ""
 
-#: core/templates/user/overview.html:284 gym/templates/contract/view.html:87
-#: gym/templates/gym/member_list.html:118
+#: core/templates/user/overview.html:302 gym/templates/contract/view.html:87
+#: gym/templates/gym/member_list.html:130
 msgid "Address"
 msgstr ""
 
-#: core/templates/user/overview.html:295
+#: core/templates/user/overview.html:313
 msgid "Registered"
 msgstr ""
 
-#: core/templates/user/overview.html:299
+#: core/templates/user/overview.html:317
 msgid "Last login"
 msgstr ""
 
-#: core/templates/user/overview.html:304
+#: core/templates/user/overview.html:322
 msgid "Status"
 msgstr ""
 
-#: core/templates/user/overview.html:307
+#: core/templates/user/overview.html:325
 msgid "Active"
 msgstr ""
 
-#: core/templates/user/overview.html:309
+#: core/templates/user/overview.html:327
 msgid "Inactive"
 msgstr ""
 
-#: core/templates/user/overview.html:330 gym/templates/contract/list.html:4
-#: gym/templates/gym/member_list.html:202
+#: core/templates/user/overview.html:348 gym/templates/contract/list.html:4
+#: gym/templates/gym/member_list.html:218
 msgid "Contracts"
 msgstr ""
 
-#: core/templates/user/overview.html:405 gym/templates/document/list.html:4
+#: core/templates/user/overview.html:426 gym/templates/document/list.html:4
 msgid "Documents"
 msgstr ""
 
-#: core/templates/user/overview.html:412 gym/templates/document/list.html:32
-#: manager/forms.py:292 manager/templates/workout/view.html:132
+#: core/templates/user/overview.html:433 gym/templates/document/list.html:33
+#: manager/forms.py:292 manager/templates/workout/view.html:143
 msgid "Download"
 msgstr ""
 
-#: core/templates/user/overview.html:450 gym/views/admin_config.py:44
+#: core/templates/user/overview.html:474 gym/views/admin_config.py:44
 #: gym/views/admin_config.py:58 gym/views/user_config.py:46
 #, fuzzy
 msgid "Configuration"
 msgstr "إعدادات"
 
-#: core/templates/user/overview.html:453 gym/models/user_config.py:92
+#: core/templates/user/overview.html:477 gym/models/user_config.py:92
 msgid "Include in inactive overview"
 msgstr ""
 
-#: core/templates/user/overview.html:486
+#: core/templates/user/overview.html:510
 #, python-format
 msgid "Admin login is only available for users in %(gym_name)s"
 msgstr ""
 
-#: core/templates/user/overview.html:490
+#: core/templates/user/overview.html:514
 msgid "Log in as this user"
 msgstr ""
 
@@ -1223,19 +1186,19 @@ msgstr ""
 msgid "Send verification email"
 msgstr ""
 
-#: core/templates/user/preferences.html:30
+#: core/templates/user/preferences.html:31
 msgid "You need to verify your email to contribute exercises"
 msgstr ""
 
-#: core/templates/user/preferences.html:50 core/views/user.py:611
+#: core/templates/user/preferences.html:55 core/views/user.py:610
 msgid "Change password"
 msgstr ""
 
-#: core/templatetags/wger_extras.py:205 i18n.tpl:37
+#: core/templatetags/wger_extras.py:197 i18n.tpl:37
 msgid "kg"
 msgstr ""
 
-#: core/templatetags/wger_extras.py:207
+#: core/templatetags/wger_extras.py:199
 #: nutrition/templates/ingredient/view.html:60
 #: nutrition/templates/ingredient/view.html:66
 #: nutrition/templates/ingredient/view.html:73
@@ -1247,11 +1210,11 @@ msgctxt "weight unit, i.e. grams"
 msgid "g"
 msgstr ""
 
-#: core/templatetags/wger_extras.py:210 i18n.tpl:38
+#: core/templatetags/wger_extras.py:202 i18n.tpl:38
 msgid "lb"
 msgstr ""
 
-#: core/templatetags/wger_extras.py:212
+#: core/templatetags/wger_extras.py:204
 msgctxt "weight unit, i.e. ounces"
 msgid "oz"
 msgstr ""
@@ -1278,13 +1241,13 @@ msgid "Delete {0}?"
 msgstr ""
 
 #: core/views/languages.py:111 core/views/license.py:85
-#: core/views/repetition_units.py:86 core/views/user.py:474
+#: core/views/repetition_units.py:86 core/views/user.py:473
 #: core/views/weight_units.py:86 exercises/views/categories.py:98
 #: exercises/views/equipment.py:81 exercises/views/muscles.py:87
 #: gym/views/admin_notes.py:161 gym/views/config.py:68
 #: gym/views/contract.py:186 gym/views/contract_option.py:123
 #: gym/views/contract_type.py:123 gym/views/document.py:171
-#: gym/views/gym.py:463 manager/views/day.py:100 manager/views/schedule.py:333
+#: gym/views/gym.py:463 manager/views/day.py:96 manager/views/schedule.py:333
 #: manager/views/workout.py:267 nutrition/views/ingredient.py:145
 #: nutrition/views/unit.py:143
 #, python-brace-format
@@ -1310,48 +1273,48 @@ msgstr ""
 msgid "Your feedback was successfully sent. Thank you!"
 msgstr ""
 
-#: core/views/user.py:156
+#: core/views/user.py:155
 #, python-brace-format
 msgid "Account \"{0}\" was successfully deleted"
 msgstr ""
 
-#: core/views/user.py:292
+#: core/views/user.py:291
 msgid "You were successfully registered"
 msgstr ""
 
-#: core/views/user.py:351
+#: core/views/user.py:350
 msgid "Settings successfully updated"
 msgstr ""
 
-#: core/views/user.py:390
+#: core/views/user.py:389
 msgid "The user was successfully deactivated"
 msgstr ""
 
-#: core/views/user.py:427
+#: core/views/user.py:426
 msgid "The user was successfully activated"
 msgstr ""
 
-#: core/views/user.py:442
+#: core/views/user.py:441
 msgid "Edit user"
 msgstr ""
 
-#: core/views/user.py:597 gym/templates/gym/member_list.html:26
+#: core/views/user.py:596 gym/templates/gym/member_list.html:26
 #: gym/views/gym.py:158
 msgid "ID"
 msgstr ""
 
-#: core/views/user.py:598 gym/forms.py:95 gym/templates/contract/view.html:55
+#: core/views/user.py:597 gym/forms.py:95 gym/templates/contract/view.html:55
 #: gym/templates/gym/member_list.html:27 gym/views/export.py:59
 #: gym/views/gym.py:158 gym/views/gym.py:217
 msgid "Username"
 msgstr ""
 
-#: core/views/user.py:601 gym/templates/gym/new_user.html:34
+#: core/views/user.py:600 gym/templates/gym/new_user.html:34
 #: gym/views/export.py:58 gym/views/gym.py:217
 msgid "Gym"
 msgstr ""
 
-#: core/views/user.py:660
+#: core/views/user.py:659
 #, python-format
 msgid "A verification email was sent to %(email)s"
 msgstr ""
@@ -1501,11 +1464,6 @@ msgstr ""
 msgid "Equipment list"
 msgstr ""
 
-#: exercises/templates/equipment/admin-overview.html:39
-#: exercises/views/equipment.py:92
-msgid "Add new equipment"
-msgstr ""
-
 #: exercises/templates/history/overview.html:11
 msgid "Exercise admin history"
 msgstr ""
@@ -1555,11 +1513,6 @@ msgstr ""
 msgid "Muscle overview"
 msgstr ""
 
-#: exercises/templates/muscles/admin-overview.html:38
-#: exercises/views/muscles.py:68
-msgid "Add muscle"
-msgstr ""
-
 #: exercises/views/categories.py:72
 msgid "Add category"
 msgstr ""
@@ -1568,6 +1521,10 @@ msgstr ""
 msgid "This will also delete all exercises in this category."
 msgstr ""
 
+#: exercises/views/equipment.py:92
+msgid "Add new equipment"
+msgstr ""
+
 #: exercises/views/equipment.py:104 exercises/views/equipment.py:115
 msgid "Delete equipment?"
 msgstr ""
@@ -1576,6 +1533,10 @@ msgstr ""
 msgid "This will delete the exercise from all workouts."
 msgstr ""
 
+#: exercises/views/muscles.py:68
+msgid "Add muscle"
+msgstr ""
+
 #: gallery/templates/images/overview.html:62
 msgid "Add image"
 msgstr ""
@@ -1661,7 +1622,7 @@ msgid "Contract is active"
 msgstr ""
 
 #: gym/models/contract.py:237 gym/templates/contract/view.html:69
-#: manager/models/schedule.py:61 manager/templates/schedule/view.html:67
+#: manager/models/schedule.py:61 manager/templates/schedule/view.html:66
 msgid "Start date"
 msgstr ""
 
@@ -1697,7 +1658,7 @@ msgstr ""
 msgid "Admin: can administrate the different gyms"
 msgstr ""
 
-#: gym/models/gym.py:65 gym/templates/gym/member_list.html:114
+#: gym/models/gym.py:65 gym/templates/gym/member_list.html:126
 msgid "Owner"
 msgstr ""
 
@@ -1707,7 +1668,7 @@ msgid ""
 "considered inactive"
 msgstr ""
 
-#: gym/models/gym_config.py:56 gym/templates/gym/member_list.html:152
+#: gym/models/gym_config.py:56 gym/templates/gym/member_list.html:166
 msgid "Show name in header"
 msgstr ""
 
@@ -1720,7 +1681,7 @@ msgstr ""
 msgid "Configuration for {self.gym.name}"
 msgstr ""
 
-#: gym/models/user_config.py:65 gym/templates/gym/member_list.html:184
+#: gym/models/user_config.py:65 gym/templates/gym/member_list.html:200
 msgid "Overview of inactive members"
 msgstr ""
 
@@ -1744,7 +1705,7 @@ msgstr ""
 msgid "User notes"
 msgstr ""
 
-#: gym/templates/contract/list.html:36
+#: gym/templates/contract/list.html:34
 msgid "Show"
 msgstr "العرض"
 
@@ -1770,11 +1731,11 @@ msgstr ""
 msgid "Gym list"
 msgstr ""
 
-#: gym/templates/gym/list.html:50
+#: gym/templates/gym/list.html:53
 msgid "Global gym configuration"
 msgstr ""
 
-#: gym/templates/gym/list.html:67 gym/views/gym.py:171
+#: gym/templates/gym/list.html:69 gym/views/gym.py:171
 msgid "Add new gym"
 msgstr ""
 
@@ -1786,43 +1747,43 @@ msgstr ""
 msgid "Gym manager"
 msgstr ""
 
-#: gym/templates/gym/member_list.html:69
+#: gym/templates/gym/member_list.html:76
 msgid "This gym has no administrators or trainers"
 msgstr ""
 
-#: gym/templates/gym/member_list.html:88
+#: gym/templates/gym/member_list.html:98
 msgid "Export"
 msgstr ""
 
-#: gym/templates/gym/member_list.html:125
+#: gym/templates/gym/member_list.html:137
 msgid "Members"
 msgstr ""
 
-#: gym/templates/gym/member_list.html:145
+#: gym/templates/gym/member_list.html:159
 msgid "Gym configuration"
 msgstr ""
 
-#: gym/templates/gym/member_list.html:148
+#: gym/templates/gym/member_list.html:162
 msgid "Inactive members"
 msgstr ""
 
-#: gym/templates/gym/member_list.html:149
+#: gym/templates/gym/member_list.html:163
 msgid "weeks"
 msgstr ""
 
-#: gym/templates/gym/member_list.html:181
+#: gym/templates/gym/member_list.html:197
 msgid "My configuration"
 msgstr ""
 
-#: gym/templates/gym/member_list.html:215
+#: gym/templates/gym/member_list.html:234
 msgid "Types"
 msgstr ""
 
-#: gym/templates/gym/member_list.html:285
+#: gym/templates/gym/member_list.html:307
 msgid "Emails"
 msgstr ""
 
-#: gym/templates/gym/member_list.html:315
+#: gym/templates/gym/member_list.html:336
 msgid "Add member"
 msgstr ""
 
@@ -2107,28 +2068,38 @@ msgstr ""
 msgid "Unit"
 msgstr ""
 
+#: manager/forms.py:191 manager/models/log.py:103 manager/models/setting.py:102
+#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
+msgid "RiR"
+msgstr ""
+
 #: manager/forms.py:279
 msgid "Type"
 msgstr ""
 
-#: manager/forms.py:280 manager/templates/workout/view.html:113
+#: manager/forms.py:280 manager/templates/workout/view.html:122
 msgid "Table"
 msgstr ""
 
-#: manager/forms.py:282 manager/templates/workout/view.html:119
+#: manager/forms.py:282 manager/templates/workout/view.html:129
 msgid "with images"
 msgstr ""
 
-#: manager/forms.py:283 manager/templates/workout/view.html:125
+#: manager/forms.py:283 manager/templates/workout/view.html:136
 msgid "with comments"
 msgstr ""
 
+#: manager/helpers.py:86 manager/models/setting.py:72
+#: manager/templates/set/formset.html:9
+msgid "Reps"
+msgstr ""
+
 #: manager/management/commands/email-reminders.py:121
 msgid "Workout will expire soon"
 msgstr ""
 
 #: manager/models/day.py:34 manager/models/log.py:58
-#: manager/models/session.py:60 manager/templates/schedule/view.html:102
+#: manager/models/session.py:60 manager/templates/schedule/view.html:101
 #: manager/templates/workout/view.html:9 manager/templates/workout/view.html:17
 #: manager/views/pdf.py:85 manager/views/pdf.py:161
 #: manager/views/schedule.py:151 manager/views/schedule.py:221
@@ -2149,7 +2120,7 @@ msgstr ""
 msgid "Name or short description of the schedule. For example 'Program XYZ'."
 msgstr ""
 
-#: manager/models/schedule.py:65 manager/templates/schedule/view.html:71
+#: manager/models/schedule.py:65 manager/templates/schedule/view.html:70
 msgid "Schedule active"
 msgstr ""
 
@@ -2160,7 +2131,7 @@ msgid ""
 "inactive"
 msgstr ""
 
-#: manager/models/schedule.py:77 manager/templates/schedule/view.html:81
+#: manager/models/schedule.py:77 manager/templates/schedule/view.html:80
 msgid "Is a loop"
 msgstr ""
 
@@ -2179,7 +2150,7 @@ msgid "The duration in weeks"
 msgstr ""
 
 #: manager/models/schedule_step.py:64 manager/models/set.py:53
-#: manager/models/setting.py:113 nutrition/models/meal.py:55
+#: manager/models/setting.py:113 nutrition/models/meal.py:53
 #: nutrition/models/meal_item.py:66
 msgid "Order"
 msgstr ""
@@ -2311,7 +2282,7 @@ msgstr ""
 msgid "Workout session"
 msgstr ""
 
-#: manager/templates/calendar/partial_overview_table.html:27
+#: manager/templates/calendar/partial_overview_table.html:26
 msgid "Delete with logs"
 msgstr ""
 
@@ -2331,21 +2302,26 @@ msgid ""
 "will simply be edited. Weight entries are always added."
 msgstr ""
 
-#: manager/templates/schedule/overview.html:5
+#: manager/templates/schedule/overview.html:4
 msgid "Your schedules"
 msgstr ""
 
 #: manager/templates/schedule/overview.html:19
-#: manager/templates/schedule/view.html:131
-#: manager/templates/schedule/view.html:183
+#: manager/templates/schedule/view.html:143
+#: manager/templates/schedule/view.html:193
 #: manager/templates/workout/overview.html:16
 msgid "active"
 msgstr ""
 
-#: manager/templates/schedule/overview.html:28
+#: manager/templates/schedule/overview.html:27
 msgid "No schedules found."
 msgstr ""
 
+#: manager/templates/schedule/overview.html:28
+#, fuzzy
+msgid "Add one now"
+msgstr "أضف واحدة الآن."
+
 #: manager/templates/schedule/overview.html:36
 msgid ""
 "Schedules are collections of workouts that you do in\n"
@@ -2358,10 +2334,11 @@ msgid ""
 "        before jumping to the next. It is also possible to create a loop, so "
 "you\n"
 "        always do the same workouts in succession, e.g. A > B > C > A > B > "
-"C and so on."
+"C and so\n"
+"        on."
 msgstr ""
 
-#: manager/templates/schedule/overview.html:43
+#: manager/templates/schedule/overview.html:44
 msgid ""
 "The currently active schedule will remain active (and be\n"
 "        shown e.g. in your dashboard) till it reaches the last workout or "
@@ -2377,25 +2354,25 @@ msgstr ""
 msgid "Schedule"
 msgstr ""
 
-#: manager/templates/schedule/view.html:85
+#: manager/templates/schedule/view.html:84
 msgid ""
 "This schedule is a loop and will go through the workouts above till you "
 "deactivate it"
 msgstr ""
 
-#: manager/templates/schedule/view.html:103
+#: manager/templates/schedule/view.html:102
 msgid "Weeks"
 msgstr ""
 
-#: manager/templates/schedule/view.html:115
+#: manager/templates/schedule/view.html:114
 msgid "Move me"
 msgstr ""
 
-#: manager/templates/schedule/view.html:156
+#: manager/templates/schedule/view.html:168
 msgid "Start schedule"
 msgstr ""
 
-#: manager/templates/schedule/view.html:187
+#: manager/templates/schedule/view.html:197
 #, python-format
 msgid ""
 "%(weeks)s Week\n"
@@ -2410,11 +2387,11 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: manager/templates/schedule/view.html:221
+#: manager/templates/schedule/view.html:231
 msgid "Adding workouts"
 msgstr ""
 
-#: manager/templates/schedule/view.html:223
+#: manager/templates/schedule/view.html:233
 msgid ""
 "Add as many workouts to the schedule as you want. You can\n"
 "            edit the order by dragging and dropping them. It's also possible "
@@ -2422,44 +2399,37 @@ msgid ""
 "            than once."
 msgstr ""
 
-#: manager/templates/schedule/view.html:232
-#: manager/templates/schedule/view.html:243
-#: manager/templates/schedule/view.html:290
+#: manager/templates/schedule/view.html:242
+#: manager/templates/schedule/view.html:256
+#: manager/templates/schedule/view.html:310
 #: manager/templates/workout/view.html:69
-#: manager/templates/workout/view.html:79
-#: manager/templates/workout/view.html:178
+#: manager/templates/workout/view.html:83
+#: manager/templates/workout/view.html:192
 msgid "Export calendar file"
 msgstr ""
 
-#: manager/templates/schedule/view.html:236
+#: manager/templates/schedule/view.html:248
 msgid "Export this schedule as a calendar file."
 msgstr ""
 
-#: manager/templates/schedule/view.html:237
-#: manager/templates/workout/view.html:74
+#: manager/templates/schedule/view.html:249
+#: manager/templates/workout/view.html:76
 msgid ""
 "You can then import the file it into your calendar\n"
 "                        application for example google calendar, outlook or "
 "iCal. This will create\n"
 "                        an appointment for each training day with the "
-"appropriate exercises."
+"appropriate\n"
+"                        exercises."
 msgstr ""
 
-#: manager/templates/schedule/view.html:258
-#: manager/templates/schedule/view.html:294
-#: manager/templates/workout/view.html:94
-#: manager/templates/workout/view.html:174
+#: manager/templates/schedule/view.html:272
+#: manager/templates/schedule/view.html:315
+#: manager/templates/workout/view.html:99
+#: manager/templates/workout/view.html:188
 msgid "Download as PDF"
 msgstr ""
 
-#: manager/templates/schedule/view.html:299
-msgid "Edit schedule"
-msgstr ""
-
-#: manager/templates/schedule/view.html:304
-msgid "Delete schedule"
-msgstr ""
-
 #: manager/templates/set/add.html:9
 #, python-format
 msgid "Add exercises to day \"%(day_name)s\""
@@ -2524,47 +2494,6 @@ msgid ""
 "You will regularly receive such reminders till you enter your current weight."
 msgstr ""
 
-#: manager/templates/workout/log.html:10 manager/templates/workout/log.html:11
-msgid "Weight log"
-msgstr ""
-
-#: manager/templates/workout/log.html:29
-msgid "Weight log for workout"
-msgstr ""
-
-#: manager/templates/workout/log.html:49
-msgid "Add weight log to this day"
-msgstr ""
-
-#: manager/templates/workout/log.html:69
-msgid "No weight entries here."
-msgstr ""
-
-#: manager/templates/workout/log.html:77
-msgid "No exercises for this day."
-msgstr ""
-
-#: manager/templates/workout/log.html:90
-msgid ""
-"This page shows the weight logs belonging to this workout\n"
-"only. Click on an exercise to see all the historical data for\n"
-"it."
-msgstr ""
-
-#: manager/templates/workout/log.html:94
-msgid ""
-"If on a single day there is more than one entry with the\n"
-"same number of repetitions, but different weights, only the entry with the\n"
-"higher weight is shown in the diagram."
-msgstr ""
-
-#: manager/templates/workout/log.html:98
-msgid ""
-"Note that only entries with a weight unit (kg or lb) and\n"
-"repetitions are charted, other combinations such as time or until failure\n"
-"are ignored here."
-msgstr ""
-
 #: manager/templates/workout/overview.html:25
 msgid "No templates found."
 msgstr ""
@@ -2600,27 +2529,23 @@ msgstr ""
 msgid "Set the repetitions for each set"
 msgstr ""
 
-#: manager/templates/workout/view.html:73
+#: manager/templates/workout/view.html:75
 msgid "Export this workout as a calendar file."
 msgstr ""
 
-#: manager/templates/workout/view.html:144
+#: manager/templates/workout/view.html:156
 msgid "Logs"
 msgstr ""
 
-#: manager/templates/workout/view.html:146
+#: manager/templates/workout/view.html:159
 msgid "View logs"
 msgstr ""
 
-#: manager/templates/workout/view.html:169 manager/views/schedule_step.py:99
-msgid "Edit workout"
-msgstr ""
-
-#: manager/templates/workout/view.html:182 manager/views/workout.py:281
+#: manager/templates/workout/view.html:195 manager/views/workout.py:281
 msgid "Mark as template"
 msgstr ""
 
-#: manager/views/day.py:109
+#: manager/views/day.py:105
 msgid "Add workout day"
 msgstr ""
 
@@ -2637,6 +2562,10 @@ msgstr ""
 msgid "Create schedule"
 msgstr ""
 
+#: manager/views/schedule_step.py:99
+msgid "Edit workout"
+msgstr ""
+
 #: manager/views/workout.py:209
 msgid "Copy workout"
 msgstr ""
@@ -2758,7 +2687,7 @@ msgstr ""
 msgid "Unit amount, e.g. \"1 Cup\" or \"1/2 spoon\""
 msgstr ""
 
-#: nutrition/models/log.py:52 nutrition/models/meal.py:50
+#: nutrition/models/log.py:52 nutrition/models/meal.py:48
 #: nutrition/models/meal_item.py:48 nutrition/models/plan.py:108
 msgid "Nutrition plan"
 msgstr ""
@@ -2771,11 +2700,11 @@ msgstr ""
 msgid "Date and Time (Approx.)"
 msgstr ""
 
-#: nutrition/models/meal.py:62
+#: nutrition/models/meal.py:60
 msgid "Time (approx)"
 msgstr ""
 
-#: nutrition/models/meal.py:69
+#: nutrition/models/meal.py:67
 msgid ""
 "Give meals a textual description / name such as \"Breakfast\" or \"after "
 "workout\""
@@ -2894,10 +2823,6 @@ msgstr ""
 msgid "Search"
 msgstr ""
 
-#: nutrition/templates/ingredient/overview.html:62
-msgid "Add ingredient"
-msgstr ""
-
 #: nutrition/templates/ingredient/view.html:45 nutrition/views/plan.py:229
 msgid "Macronutrients"
 msgstr ""
@@ -2917,20 +2842,11 @@ msgstr ""
 msgid "Others"
 msgstr ""
 
-#: nutrition/templates/ingredient/view.html:144
-#: nutrition/templates/units/list.html:46 nutrition/views/unit.py:86
+#: nutrition/templates/ingredient/view.html:143
+#: nutrition/templates/units/list.html:50 nutrition/views/unit.py:86
 msgid "Add new weight unit"
 msgstr ""
 
-#: nutrition/templates/ingredient/view.html:206
-#: nutrition/templates/ingredient/view.html:209
-msgid "Edit ingredient"
-msgstr ""
-
-#: nutrition/templates/ingredient/view.html:213
-msgid "Delete ingredient"
-msgstr ""
-
 #: nutrition/templates/rate/form.html:25
 msgid "Basal metabolic rate"
 msgstr ""
diff --git a/wger/locale/bg/LC_MESSAGES/django.po b/wger/locale/bg/LC_MESSAGES/django.po
index 22b010e59..c40e1ce7c 100644
--- a/wger/locale/bg/LC_MESSAGES/django.po
+++ b/wger/locale/bg/LC_MESSAGES/django.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: wger Workout Manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-07-14 15:59+0200\n"
+"POT-Creation-Date: 2024-11-14 13:09+0100\n"
 "PO-Revision-Date: 2021-04-15 07:27+0000\n"
 "Last-Translator: Allan Nordhøy <epost@anotheragency.no>\n"
 "Language-Team: Bulgarian <https://hosted.weblate.org/projects/wger/web/bg/>\n"
@@ -22,7 +22,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.6-dev\n"
 
-#: config/models/gym_config.py:46 gym/templates/gym/list.html:53
+#: config/models/gym_config.py:46 gym/templates/gym/list.html:56
 msgid "Default gym"
 msgstr ""
 
@@ -32,28 +32,28 @@ msgid ""
 "registered users to this gym and update all existing users without a gym."
 msgstr ""
 
-#: config/views/gym_config.py:42 core/templates/language/view.html:67
-#: core/templates/license/list.html:17 core/templates/misc/license/list.html:18
+#: config/views/gym_config.py:42 core/templates/language/view.html:64
+#: core/templates/license/list.html:17
 #: core/templates/repetition_unit/list.html:18
-#: core/templates/tags/render_day.html:39
-#: core/templates/tags/render_day.html:75 core/templates/user/overview.html:204
-#: core/templates/user/overview.html:445
+#: core/templates/user/overview.html:204 core/templates/user/overview.html:467
 #: core/templates/weight_unit/list.html:18
 #: exercises/templates/categories/admin-overview.html:17
 #: exercises/templates/equipment/admin-overview.html:17
-#: exercises/templates/muscles/admin-overview.html:17
-#: gallery/views/images.py:98 gym/templates/admin_notes/list.html:32
-#: gym/templates/contract/list.html:31 gym/templates/contract/view.html:107
-#: gym/templates/contract_option/list.html:32
-#: gym/templates/contract_type/list.html:32 gym/templates/document/list.html:38
-#: gym/templates/gym/list.html:20 gym/templates/gym/list.html:46
-#: gym/templates/gym/member_list.html:87 gym/templates/gym/member_list.html:140
-#: gym/templates/gym/member_list.html:176
-#: manager/templates/calendar/day.html:68
-#: manager/templates/calendar/month.html:85
-#: manager/templates/calendar/partial_overview_table.html:18
-#: manager/templates/schedule/view.html:118
-#: nutrition/templates/ingredient/view.html:165
+#: exercises/templates/muscles/admin-overview.html:16
+#: gallery/views/images.py:98 gym/templates/admin_notes/list.html:31
+#: gym/templates/contract/list.html:30 gym/templates/contract/view.html:106
+#: gym/templates/contract_option/list.html:29
+#: gym/templates/contract_type/list.html:30 gym/templates/document/list.html:38
+#: gym/templates/gym/list.html:19 gym/templates/gym/list.html:48
+#: gym/templates/gym/member_list.html:94 gym/templates/gym/member_list.html:152
+#: gym/templates/gym/member_list.html:190
+#: manager/templates/calendar/day.html:67
+#: manager/templates/calendar/month.html:84
+#: manager/templates/calendar/partial_overview_table.html:16
+#: manager/templates/schedule/view.html:318
+#: manager/templates/workout/view.html:181
+#: nutrition/templates/ingredient/view.html:164
+#: nutrition/templates/ingredient/view.html:209
 #: nutrition/templates/units/list.html:19
 msgid "Edit"
 msgstr "Поправи"
@@ -89,8 +89,8 @@ msgstr "Моята готина тренировъчна схема"
 msgid "Empty placeholder schedule"
 msgstr "Празно място за тренировъчен план"
 
-#: core/forms.py:69 core/templates/navigation.html:285
-#: core/templates/navigation.html:291 core/templates/user/login.html:4
+#: core/forms.py:69 core/templates/navigation.html:284
+#: core/templates/navigation.html:290 core/templates/user/login.html:4
 #: software/templates/features.html:82 software/templates/features.html:427
 msgid "Login"
 msgstr "Вход"
@@ -100,14 +100,14 @@ msgstr "Вход"
 msgid "First name"
 msgstr ""
 
-#: core/forms.py:109 core/forms.py:215 core/templates/user/overview.html:266
+#: core/forms.py:109 core/forms.py:215 core/templates/user/overview.html:284
 #: gym/views/export.py:62 gym/views/gym.py:217
 msgid "Last name"
 msgstr ""
 
-#: core/forms.py:111 core/forms.py:180 core/templates/user/overview.html:270
+#: core/forms.py:111 core/forms.py:180 core/templates/user/overview.html:288
 #: gym/models/contract.py:256 gym/models/gym.py:58
-#: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:104
+#: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:116
 #: gym/templates/gym/new_user.html:30 gym/views/export.py:60
 #: mailer/templates/mailer/gym/form.html:4
 #: mailer/templates/mailer/gym/overview.html:4
@@ -136,8 +136,8 @@ msgstr ""
 msgid "Other settings"
 msgstr ""
 
-#: core/forms.py:174 core/views/user.py:624 core/views/user.py:639
-#: core/views/user.py:651 gym/forms.py:73 manager/templates/log/add.html:65
+#: core/forms.py:174 core/views/user.py:623 core/views/user.py:638
+#: core/views/user.py:650 gym/forms.py:73 manager/templates/log/add.html:65
 #: manager/templates/set/add.html:70 manager/views/workout.py:203
 #: utils/generic_views.py:143
 msgid "Save"
@@ -162,26 +162,25 @@ msgstr ""
 msgid "Please enter your current password."
 msgstr ""
 
-#: core/forms.py:242 core/templates/language/view.html:73
-#: core/templates/license/list.html:19 core/templates/misc/license/list.html:22
-#: core/templates/repetition_unit/list.html:20
-#: core/templates/tags/render_day.html:45
-#: core/templates/tags/render_day.html:81 core/templates/user/overview.html:217
-#: core/templates/weight_unit/list.html:20
-#: exercises/templates/categories/admin-overview.html:19
-#: exercises/templates/equipment/admin-overview.html:19
-#: exercises/templates/muscles/admin-overview.html:19
-#: gym/templates/admin_notes/list.html:40
-#: gym/templates/contract_option/list.html:41
-#: gym/templates/contract_type/list.html:41 gym/templates/document/list.html:46
-#: gym/templates/gym/list.html:22 manager/templates/calendar/day.html:73
-#: manager/templates/calendar/month.html:89
-#: manager/templates/calendar/partial_overview_table.html:23
-#: manager/templates/schedule/view.html:122
-#: manager/templates/workout/view.html:188
-#: nutrition/templates/ingredient/view.html:166
+#: core/forms.py:242 core/templates/language/view.html:70
+#: core/templates/license/list.html:21
+#: core/templates/repetition_unit/list.html:22
+#: core/templates/user/overview.html:233
+#: core/templates/weight_unit/list.html:22
+#: exercises/templates/categories/admin-overview.html:21
+#: exercises/templates/equipment/admin-overview.html:21
+#: exercises/templates/muscles/admin-overview.html:20
+#: gym/templates/admin_notes/list.html:37
+#: gym/templates/contract_option/list.html:35
+#: gym/templates/contract_type/list.html:36 gym/templates/document/list.html:46
+#: gym/templates/gym/list.html:23 manager/templates/calendar/day.html:73
+#: manager/templates/calendar/month.html:88
+#: manager/templates/calendar/partial_overview_table.html:22
+#: manager/templates/schedule/view.html:324
+#: manager/templates/workout/view.html:202
+#: nutrition/templates/ingredient/view.html:168
 #: nutrition/templates/ingredient/view.html:215
-#: nutrition/templates/units/list.html:22
+#: nutrition/templates/units/list.html:25
 msgid "Delete"
 msgstr "Изтрии"
 
@@ -193,9 +192,9 @@ msgstr ""
 msgid "The form is secured with reCAPTCHA"
 msgstr ""
 
-#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:285
-#: core/templates/navigation.html:297 core/templates/template.html:149
-#: core/templates/user/login.html:20 core/views/user.py:298
+#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:284
+#: core/templates/navigation.html:296 core/templates/template.html:151
+#: core/templates/user/login.html:20 core/views/user.py:297
 #: software/templates/features.html:87 software/templates/features.html:422
 msgid "Register"
 msgstr "Регистрация"
@@ -437,18 +436,18 @@ msgid "The sum of all hours has to be 24"
 msgstr ""
 
 #: core/models/rep_unit.py:36 core/models/weight_unit.py:36
-#: core/templates/user/overview.html:262 core/views/user.py:599
+#: core/templates/user/overview.html:280 core/views/user.py:598
 #: exercises/models/category.py:29 exercises/models/equipment.py:29
 #: exercises/models/exercise.py:59 exercises/models/muscle.py:36
 #: gym/models/contract.py:52 gym/models/contract.py:103 gym/models/gym.py:46
 #: gym/models/user_document.py:84 gym/templates/contract/view.html:50
-#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:96
+#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:108
 #: gym/views/gym.py:158 manager/models/schedule.py:55
 #: manager/models/workout.py:57 measurements/models/category.py:36
 #: nutrition/models/ingredient.py:111
-#: nutrition/models/ingredient_category.py:27 nutrition/models/meal.py:67
+#: nutrition/models/ingredient_category.py:27 nutrition/models/meal.py:65
 #: nutrition/models/weight_unit.py:38
-#: nutrition/templates/ingredient/view.html:152
+#: nutrition/templates/ingredient/view.html:151
 msgid "Name"
 msgstr "Име"
 
@@ -493,7 +492,7 @@ msgstr ""
 msgid "Back to \"%(target)s\""
 msgstr ""
 
-#: core/templates/delete.html:15
+#: core/templates/delete.html:4
 msgid "Are you sure you want to delete this? This action cannot be undone."
 msgstr "Сигурен ли си, че искаш да изтриеш това? Това действие е невъзвратимо!"
 
@@ -549,7 +548,7 @@ msgstr ""
 msgid "Dashboard"
 msgstr "Табло"
 
-#: core/templates/language/overview.html:4 core/templates/navigation.html:345
+#: core/templates/language/overview.html:4 core/templates/navigation.html:344
 msgid "Languages"
 msgstr ""
 
@@ -559,79 +558,72 @@ msgstr ""
 
 #: core/templates/language/overview.html:22
 #: manager/templates/calendar/month.html:132
-#: manager/templates/schedule/overview.html:28
-#: manager/templates/schedule/view.html:144
+#: manager/templates/schedule/view.html:154
 #: manager/templates/workout/overview.html:28
 #: nutrition/templates/ingredient/overview.html:38
 msgid "Add one now."
 msgstr "Добави сега."
 
-#: core/templates/language/overview.html:35 core/templates/license/list.html:40
-#: core/templates/misc/license/list.html:43
-#: core/templates/repetition_unit/list.html:43
-#: core/templates/user/overview.html:326 core/templates/user/overview.html:365
-#: core/templates/user/overview.html:401
-#: core/templates/weight_unit/list.html:43 core/views/languages.py:74
+#: core/templates/language/overview.html:34 core/templates/license/list.html:43
+#: core/templates/repetition_unit/list.html:46
+#: core/templates/user/overview.html:344 core/templates/user/overview.html:384
+#: core/templates/user/overview.html:422
+#: core/templates/weight_unit/list.html:46 core/views/languages.py:74
 #: core/views/license.py:66 core/views/repetition_units.py:66
 #: core/views/weight_units.py:66
-#: exercises/templates/categories/admin-overview.html:38
-#: gallery/views/images.py:63 gym/templates/admin_notes/list.html:67
-#: gym/templates/contract/list.html:73
-#: gym/templates/contract_option/list.html:72
-#: gym/templates/contract_type/list.html:72 gym/templates/document/list.html:79
-#: gym/templates/gym/member_list.html:211
-#: gym/templates/gym/member_list.html:244
-#: gym/templates/gym/member_list.html:281
+#: exercises/templates/categories/admin-overview.html:40
+#: exercises/templates/equipment/admin-overview.html:39
+#: exercises/templates/muscles/admin-overview.html:40
+#: gallery/views/images.py:63 gym/templates/admin_notes/list.html:64
+#: gym/templates/contract/list.html:69
+#: gym/templates/contract_option/list.html:65
+#: gym/templates/contract_type/list.html:66 gym/templates/document/list.html:78
+#: gym/templates/gym/member_list.html:228
+#: gym/templates/gym/member_list.html:264
+#: gym/templates/gym/member_list.html:303
 #: mailer/templates/mailer/gym/overview.html:43
+#: nutrition/templates/ingredient/overview.html:60
 msgid "Add"
 msgstr "Добави"
 
 #: core/templates/language/view.html:61 core/templates/user/api_key.html:44
-#: core/templates/user/preferences.html:45 gym/models/contract.py:203
-#: gym/templates/contract/view.html:41 gym/templates/contract/view.html:106
-#: gym/templates/gym/member_list.html:248
-#: manager/templates/schedule/view.html:285
-#: manager/templates/workout/view.html:163
-#: nutrition/templates/ingredient/view.html:202
+#: core/templates/user/preferences.html:50 gym/models/contract.py:203
+#: gym/templates/contract/view.html:41 gym/templates/gym/member_list.html:270
+#: manager/templates/schedule/view.html:304
+#: manager/templates/workout/view.html:177
+#: nutrition/templates/ingredient/view.html:206
 msgid "Options"
 msgstr "Опции"
 
-#: core/templates/license/list.html:4 core/templates/misc/license/list.html:4
+#: core/templates/license/list.html:4
 msgid "License list"
 msgstr ""
 
-#: core/templates/license/list.html:26 core/templates/misc/license/list.html:30
-#: core/templates/repetition_unit/list.html:28
+#: core/templates/license/list.html:30
+#: core/templates/repetition_unit/list.html:32
 #: core/templates/user/overview.html:104 core/templates/user/overview.html:136
-#: core/templates/user/overview.html:185 core/templates/user/overview.html:347
-#: core/templates/user/overview.html:383 core/templates/user/overview.html:427
-#: core/templates/weight_unit/list.html:28
-#: exercises/templates/categories/admin-overview.html:26
-#: exercises/templates/equipment/admin-overview.html:26
-#: exercises/templates/muscles/admin-overview.html:26
-#: gym/templates/admin_notes/list.html:52 gym/templates/contract/list.html:60
-#: gym/templates/contract_option/list.html:58
-#: gym/templates/contract_type/list.html:58 gym/templates/document/list.html:64
-#: gym/templates/gym/list.html:29 gym/templates/gym/member_list.html:229
-#: gym/templates/gym/member_list.html:262
-#: gym/templates/gym/member_list.html:299
+#: core/templates/user/overview.html:185 core/templates/user/overview.html:365
+#: core/templates/user/overview.html:404 core/templates/user/overview.html:448
+#: core/templates/weight_unit/list.html:32
+#: exercises/templates/categories/admin-overview.html:30
+#: exercises/templates/equipment/admin-overview.html:30
+#: exercises/templates/muscles/admin-overview.html:29
+#: gym/templates/admin_notes/list.html:50 gym/templates/contract/list.html:57
+#: gym/templates/contract_option/list.html:52
+#: gym/templates/contract_type/list.html:53 gym/templates/document/list.html:64
+#: gym/templates/gym/list.html:32 gym/templates/gym/member_list.html:248
+#: gym/templates/gym/member_list.html:284
+#: gym/templates/gym/member_list.html:321
 #: mailer/templates/mailer/gym/overview.html:30
-#: manager/templates/calendar/day.html:87
-#: nutrition/templates/units/list.html:29
+#: manager/templates/calendar/day.html:88
+#: nutrition/templates/units/list.html:34
 msgid "Nothing found"
 msgstr ""
 
-#: core/templates/misc/about.html:4 core/templates/template.html:175
+#: core/templates/misc/about.html:4 core/templates/template.html:188
 msgid "Imprint"
 msgstr ""
 
-#: core/templates/misc/license/list.html:47
-msgid ""
-"If a license has been localized, e.g. the Creative Commons\n"
-"            licenses for the different countries, add them as separate "
-"entries here."
-msgstr ""
-
 #: core/templates/navigation.html:28 software/templates/features.html:437
 msgid "Training"
 msgstr "Тренировка"
@@ -682,8 +674,8 @@ msgstr ""
 msgid "Exercises"
 msgstr "Упражнения"
 
-#: core/templates/navigation.html:111 core/templates/navigation.html:184
-#: core/templates/navigation.html:340
+#: core/templates/navigation.html:111 core/templates/navigation.html:185
+#: core/templates/navigation.html:339
 msgid "Administration"
 msgstr "Администрация"
 
@@ -722,87 +714,87 @@ msgstr ""
 msgid "Daily calories calculator"
 msgstr ""
 
-#: core/templates/navigation.html:179
+#: core/templates/navigation.html:180
 #: nutrition/templates/ingredient/overview.html:10
 msgid "Ingredient overview"
 msgstr "Преглед на съставките"
 
-#: core/templates/navigation.html:187 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:189 nutrition/templates/units/list.html:6
 msgid "Ingredient weight units"
 msgstr "Единици за тежест на съставки"
 
-#: core/templates/navigation.html:203 software/templates/features.html:442
+#: core/templates/navigation.html:205 software/templates/features.html:442
 msgid "Body weight"
 msgstr ""
 
-#: core/templates/navigation.html:210 core/templates/user/overview.html:114
+#: core/templates/navigation.html:212 core/templates/user/overview.html:114
 msgid "Weight overview"
 msgstr "Преглед на тегло"
 
-#: core/templates/navigation.html:217 weight/views.py:65
+#: core/templates/navigation.html:216 weight/views.py:65
 msgid "Add weight entry"
 msgstr "Добави тегло"
 
-#: core/templates/navigation.html:231
+#: core/templates/navigation.html:230
 msgid "About this software"
 msgstr "Относно този код"
 
-#: core/templates/navigation.html:237 software/templates/about_us.html:5
+#: core/templates/navigation.html:236 software/templates/about_us.html:5
 msgid "About us"
 msgstr "За нас"
 
-#: core/templates/navigation.html:243 software/templates/features.html:507
+#: core/templates/navigation.html:242 software/templates/features.html:507
 msgid "REST API"
 msgstr ""
 
-#: core/templates/navigation.html:249 utils/models.py:45
+#: core/templates/navigation.html:248 utils/models.py:45
 msgid "License"
 msgstr "Лиценз"
 
-#: core/templates/navigation.html:255
+#: core/templates/navigation.html:254
 msgid "Developer documentation"
 msgstr ""
 
-#: core/templates/navigation.html:262
+#: core/templates/navigation.html:261
 msgid "Get the code"
 msgstr "Грабни кода"
 
-#: core/templates/navigation.html:269 core/templates/template.html:214
+#: core/templates/navigation.html:268 core/templates/template.html:227
 #: software/templates/features.html:582
 msgid "Translate"
 msgstr "Преведи"
 
-#: core/templates/navigation.html:303 core/templates/user/login.html:28
+#: core/templates/navigation.html:302 core/templates/user/login.html:28
 msgid "Reset password"
 msgstr "Промени парола"
 
-#: core/templates/navigation.html:321
+#: core/templates/navigation.html:320
 msgid "My preferences"
 msgstr "Моите преференции"
 
-#: core/templates/navigation.html:330
+#: core/templates/navigation.html:329
 msgid "Logout"
 msgstr "Изход"
 
-#: core/templates/navigation.html:353
+#: core/templates/navigation.html:352
 msgid "Licenses"
 msgstr ""
 
-#: core/templates/navigation.html:361
+#: core/templates/navigation.html:360
 #: core/templates/repetition_unit/list.html:4
 msgid "Repetition units"
 msgstr ""
 
-#: core/templates/navigation.html:369 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:368 core/templates/weight_unit/list.html:4
 #: nutrition/templates/ingredient/view.html:141
 msgid "Weight units"
 msgstr "Единици за тегло"
 
-#: core/templates/navigation.html:377 core/templates/user/list.html:4
+#: core/templates/navigation.html:376 core/templates/user/list.html:4
 msgid "User list"
 msgstr ""
 
-#: core/templates/navigation.html:383
+#: core/templates/navigation.html:382
 msgid "Gyms"
 msgstr ""
 
@@ -865,57 +857,30 @@ msgstr "предишно"
 msgid "next"
 msgstr "следващо"
 
-#: core/templates/tags/render_day.html:34
-msgid "Add weight log"
+#: core/templates/tags/render_day.html:44
+msgid "Placeholder image for translation"
 msgstr ""
 
-#: core/templates/tags/render_day.html:116
-msgid "Placeholder image for exercise"
-msgstr ""
-
-#: core/templates/tags/render_day.html:133
-msgid "This exercise has no repetitions."
-msgstr "Това упражнение няма повторения."
-
-#: core/templates/tags/render_day.html:136
-msgid "Edit them now."
-msgstr "Поправи сега."
-
-#: core/templates/tags/render_day.html:162
-msgid "Add exercises to this workout day"
-msgstr "Добави упражнения за този тренировъчен ден"
-
-#: core/templates/tags/render_weight_log.html:17 manager/helpers.py:86
-#: manager/models/setting.py:72 manager/templates/set/formset.html:9
-msgid "Reps"
-msgstr "Повторения"
-
-#: core/templates/tags/render_weight_log.html:30 manager/forms.py:191
-#: manager/models/log.py:103 manager/models/setting.py:102
-#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
-msgid "RiR"
-msgstr ""
-
-#: core/templates/template.html:122 manager/templates/calendar/month.html:138
-#: manager/templates/schedule/view.html:248
-#: manager/templates/schedule/view.html:269
-#: manager/templates/workout/view.html:84
-#: manager/templates/workout/view.html:137
+#: core/templates/template.html:124 manager/templates/calendar/month.html:138
+#: manager/templates/schedule/view.html:262
+#: manager/templates/schedule/view.html:287
+#: manager/templates/workout/view.html:89
+#: manager/templates/workout/view.html:149
 msgid "Close"
 msgstr ""
 
-#: core/templates/template.html:138
+#: core/templates/template.html:140
 msgid ""
 "You are using a guest account, data entered will be deleted after a week."
 msgstr ""
 "Вие сте влезли като гост и всички данни, които добавяте ще бъдат изтрити "
 "след една седмица."
 
-#: core/templates/template.html:143
+#: core/templates/template.html:145
 msgid "Create some demo entries"
 msgstr "Направи демонстративни попълнения"
 
-#: core/templates/template.html:180 software/templates/features.html:547
+#: core/templates/template.html:193 software/templates/features.html:547
 #: software/templates/tos.html:7
 msgid "Terms of service"
 msgstr ""
@@ -924,7 +889,7 @@ msgstr ""
 msgid "Features"
 msgstr "Особености"
 
-#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:54
+#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:59
 msgid "API key"
 msgstr ""
 
@@ -963,17 +928,17 @@ msgstr ""
 msgid "Documentation"
 msgstr ""
 
-#: core/templates/user/delete_account.html:4
-#: core/templates/user/preferences.html:59
+#: core/templates/user/delete_account.html:3
+#: core/templates/user/preferences.html:62
 msgid "Delete account"
 msgstr ""
 
-#: core/templates/user/delete_account.html:17
+#: core/templates/user/delete_account.html:9
 #: exercises/templates/history/overview.html:93
 msgid "Are you sure?"
 msgstr ""
 
-#: core/templates/user/delete_account.html:22
+#: core/templates/user/delete_account.html:14
 #, python-format
 msgid ""
 "This action will delete the user account \"%(username)s\".\n"
@@ -992,22 +957,22 @@ msgstr "Забравена парола?"
 
 #: core/templates/user/overview.html:25 core/templates/user/overview.html:68
 #: core/templates/user/overview.html:112 core/templates/user/overview.html:144
-#: core/templates/user/overview.html:330 core/templates/user/overview.html:369
-#: core/templates/user/overview.html:405
+#: core/templates/user/overview.html:348 core/templates/user/overview.html:390
+#: core/templates/user/overview.html:426
 #, python-format
 msgid "last %(number)s"
 msgstr ""
 
 #: core/templates/user/overview.html:27 core/templates/user/overview.html:146
-#: core/templates/user/overview.html:325 core/templates/user/overview.html:364
-#: core/templates/user/overview.html:400 gym/templates/gym/member_list.html:210
-#: gym/templates/gym/member_list.html:243
-#: gym/templates/gym/member_list.html:280
+#: core/templates/user/overview.html:343 core/templates/user/overview.html:382
+#: core/templates/user/overview.html:421 gym/templates/gym/member_list.html:226
+#: gym/templates/gym/member_list.html:262
+#: gym/templates/gym/member_list.html:302
 msgid "Overview"
 msgstr "Преглед"
 
 #: core/templates/user/overview.html:28
-#: manager/templates/schedule/view.html:163
+#: manager/templates/schedule/view.html:172
 #: manager/templates/workout/overview.html:39 manager/views/schedule_step.py:60
 msgid "Add workout"
 msgstr "Добави упражнение"
@@ -1039,38 +1004,36 @@ msgstr "Описание"
 msgid "Number of logs (days)"
 msgstr ""
 
-#: core/templates/user/overview.html:37 core/views/user.py:600
+#: core/templates/user/overview.html:37 core/views/user.py:599
 #: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:158
 msgid "Last activity"
 msgstr ""
 
 #: core/templates/user/overview.html:58
 #: manager/templates/calendar/month.html:128
-#: manager/templates/schedule/view.html:144
 #: manager/templates/workout/overview.html:28
 msgid "No workouts found."
 msgstr "Не са намерени тренировки."
 
 #: core/templates/user/overview.html:68 manager/forms.py:280
-#: manager/templates/workout/view.html:106
+#: manager/templates/workout/view.html:114
 msgid "Log"
 msgstr ""
 
 #: core/templates/user/overview.html:77 manager/models/session.py:83
-#: manager/templates/calendar/partial_overview_table.html:52
+#: manager/templates/calendar/partial_overview_table.html:54
 msgid "General impression"
 msgstr ""
 
-#: core/templates/user/overview.html:78 core/templates/user/overview.html:369
+#: core/templates/user/overview.html:78 core/templates/user/overview.html:390
 #: manager/models/session.py:73
-#: manager/templates/calendar/partial_overview_table.html:56
-#: manager/templates/workout/log.html:89
+#: manager/templates/calendar/partial_overview_table.html:58
 msgid "Notes"
 msgstr "Бележки"
 
 #: core/templates/user/overview.html:79
 #: exercises/templates/history/overview.html:30
-#: manager/templates/calendar/partial_overview_table.html:42
+#: manager/templates/calendar/partial_overview_table.html:44
 msgid "Time"
 msgstr ""
 
@@ -1108,121 +1071,121 @@ msgstr "Мазнини"
 msgid "kcal"
 msgstr ""
 
-#: core/templates/user/overview.html:201 core/templates/user/overview.html:322
-#: core/templates/user/overview.html:361 core/templates/user/overview.html:397
-#: core/templates/user/overview.html:442 gym/templates/gym/list.html:42
-#: gym/templates/gym/member_list.html:84 gym/templates/gym/member_list.html:137
-#: gym/templates/gym/member_list.html:173
-#: gym/templates/gym/member_list.html:207
-#: gym/templates/gym/member_list.html:240
-#: gym/templates/gym/member_list.html:277
-#: manager/templates/schedule/view.html:100
+#: core/templates/user/overview.html:201 core/templates/user/overview.html:340
+#: core/templates/user/overview.html:379 core/templates/user/overview.html:418
+#: core/templates/user/overview.html:463 gym/templates/gym/list.html:45
+#: gym/templates/gym/member_list.html:91 gym/templates/gym/member_list.html:149
+#: gym/templates/gym/member_list.html:187
+#: gym/templates/gym/member_list.html:223
+#: gym/templates/gym/member_list.html:259
+#: gym/templates/gym/member_list.html:299
+#: manager/templates/schedule/view.html:99
 msgid "Actions"
 msgstr "Действия"
 
-#: core/templates/user/overview.html:207
+#: core/templates/user/overview.html:210
 msgid "Deactivate user"
 msgstr ""
 
-#: core/templates/user/overview.html:209
+#: core/templates/user/overview.html:214
 msgid "Activate user"
 msgstr ""
 
-#: core/templates/user/overview.html:211
+#: core/templates/user/overview.html:223
 msgid "Reset user password"
 msgstr ""
 
-#: core/templates/user/overview.html:214 gym/templates/gym/member_list.html:30
+#: core/templates/user/overview.html:227 gym/templates/gym/member_list.html:30
 msgid "Roles"
 msgstr ""
 
-#: core/templates/user/overview.html:225
+#: core/templates/user/overview.html:243
 msgid "Password reset confirmation"
 msgstr "Потвърждение за нулиране на паролата"
 
-#: core/templates/user/overview.html:229
+#: core/templates/user/overview.html:247
 msgid "Do you really want to change this user&#39;s password?"
 msgstr ""
 
-#: core/templates/user/overview.html:232
+#: core/templates/user/overview.html:250
 #: exercises/templates/history/overview.html:106
 msgid "No"
 msgstr ""
 
-#: core/templates/user/overview.html:233
+#: core/templates/user/overview.html:251
 #: exercises/templates/history/overview.html:99
 msgid "Yes"
 msgstr ""
 
-#: core/templates/user/overview.html:254 gym/templates/gym/member_list.html:93
+#: core/templates/user/overview.html:272 gym/templates/gym/member_list.html:105
 msgid "Details"
 msgstr ""
 
-#: core/templates/user/overview.html:258 gym/views/export.py:57
-#: manager/helpers.py:86 manager/templates/schedule/view.html:98
+#: core/templates/user/overview.html:276 gym/views/export.py:57
+#: manager/helpers.py:86 manager/templates/schedule/view.html:97
 msgid "Nr."
 msgstr "№"
 
-#: core/templates/user/overview.html:280 gym/models/contract.py:287
+#: core/templates/user/overview.html:298 gym/models/contract.py:287
 #: gym/models/gym.py:50 gym/templates/contract/view.html:75
-#: gym/templates/gym/member_list.html:100 gym/views/export.py:68
+#: gym/templates/gym/member_list.html:112 gym/views/export.py:68
 msgid "Phone"
 msgstr ""
 
-#: core/templates/user/overview.html:284 gym/templates/contract/view.html:87
-#: gym/templates/gym/member_list.html:118
+#: core/templates/user/overview.html:302 gym/templates/contract/view.html:87
+#: gym/templates/gym/member_list.html:130
 msgid "Address"
 msgstr ""
 
-#: core/templates/user/overview.html:295
+#: core/templates/user/overview.html:313
 msgid "Registered"
 msgstr ""
 
-#: core/templates/user/overview.html:299
+#: core/templates/user/overview.html:317
 msgid "Last login"
 msgstr ""
 
-#: core/templates/user/overview.html:304
+#: core/templates/user/overview.html:322
 msgid "Status"
 msgstr ""
 
-#: core/templates/user/overview.html:307
+#: core/templates/user/overview.html:325
 msgid "Active"
 msgstr ""
 
-#: core/templates/user/overview.html:309
+#: core/templates/user/overview.html:327
 msgid "Inactive"
 msgstr ""
 
-#: core/templates/user/overview.html:330 gym/templates/contract/list.html:4
-#: gym/templates/gym/member_list.html:202
+#: core/templates/user/overview.html:348 gym/templates/contract/list.html:4
+#: gym/templates/gym/member_list.html:218
 msgid "Contracts"
 msgstr ""
 
-#: core/templates/user/overview.html:405 gym/templates/document/list.html:4
+#: core/templates/user/overview.html:426 gym/templates/document/list.html:4
 msgid "Documents"
 msgstr ""
 
-#: core/templates/user/overview.html:412 gym/templates/document/list.html:32
-#: manager/forms.py:292 manager/templates/workout/view.html:132
+#: core/templates/user/overview.html:433 gym/templates/document/list.html:33
+#: manager/forms.py:292 manager/templates/workout/view.html:143
 msgid "Download"
 msgstr ""
 
-#: core/templates/user/overview.html:450 gym/views/admin_config.py:44
+#: core/templates/user/overview.html:474 gym/views/admin_config.py:44
 #: gym/views/admin_config.py:58 gym/views/user_config.py:46
 msgid "Configuration"
 msgstr ""
 
-#: core/templates/user/overview.html:453 gym/models/user_config.py:92
+#: core/templates/user/overview.html:477 gym/models/user_config.py:92
 msgid "Include in inactive overview"
 msgstr ""
 
-#: core/templates/user/overview.html:486
+#: core/templates/user/overview.html:510
 #, python-format
 msgid "Admin login is only available for users in %(gym_name)s"
 msgstr ""
 
-#: core/templates/user/overview.html:490
+#: core/templates/user/overview.html:514
 msgid "Log in as this user"
 msgstr ""
 
@@ -1242,19 +1205,19 @@ msgstr ""
 msgid "Send verification email"
 msgstr ""
 
-#: core/templates/user/preferences.html:30
+#: core/templates/user/preferences.html:31
 msgid "You need to verify your email to contribute exercises"
 msgstr ""
 
-#: core/templates/user/preferences.html:50 core/views/user.py:611
+#: core/templates/user/preferences.html:55 core/views/user.py:610
 msgid "Change password"
 msgstr "Смени парола"
 
-#: core/templatetags/wger_extras.py:205 i18n.tpl:37
+#: core/templatetags/wger_extras.py:197 i18n.tpl:37
 msgid "kg"
 msgstr ""
 
-#: core/templatetags/wger_extras.py:207
+#: core/templatetags/wger_extras.py:199
 #: nutrition/templates/ingredient/view.html:60
 #: nutrition/templates/ingredient/view.html:66
 #: nutrition/templates/ingredient/view.html:73
@@ -1266,11 +1229,11 @@ msgctxt "weight unit, i.e. grams"
 msgid "g"
 msgstr ""
 
-#: core/templatetags/wger_extras.py:210 i18n.tpl:38
+#: core/templatetags/wger_extras.py:202 i18n.tpl:38
 msgid "lb"
 msgstr ""
 
-#: core/templatetags/wger_extras.py:212
+#: core/templatetags/wger_extras.py:204
 msgctxt "weight unit, i.e. ounces"
 msgid "oz"
 msgstr ""
@@ -1297,13 +1260,13 @@ msgid "Delete {0}?"
 msgstr ""
 
 #: core/views/languages.py:111 core/views/license.py:85
-#: core/views/repetition_units.py:86 core/views/user.py:474
+#: core/views/repetition_units.py:86 core/views/user.py:473
 #: core/views/weight_units.py:86 exercises/views/categories.py:98
 #: exercises/views/equipment.py:81 exercises/views/muscles.py:87
 #: gym/views/admin_notes.py:161 gym/views/config.py:68
 #: gym/views/contract.py:186 gym/views/contract_option.py:123
 #: gym/views/contract_type.py:123 gym/views/document.py:171
-#: gym/views/gym.py:463 manager/views/day.py:100 manager/views/schedule.py:333
+#: gym/views/gym.py:463 manager/views/day.py:96 manager/views/schedule.py:333
 #: manager/views/workout.py:267 nutrition/views/ingredient.py:145
 #: nutrition/views/unit.py:143
 #, python-brace-format
@@ -1333,48 +1296,48 @@ msgstr ""
 msgid "Your feedback was successfully sent. Thank you!"
 msgstr "Вашият съвет/коментар бе изпратен успешно. Благодарим ви!"
 
-#: core/views/user.py:156
+#: core/views/user.py:155
 #, python-brace-format
 msgid "Account \"{0}\" was successfully deleted"
 msgstr ""
 
-#: core/views/user.py:292
+#: core/views/user.py:291
 msgid "You were successfully registered"
 msgstr "Вие се регистрирахте успешно"
 
-#: core/views/user.py:351
+#: core/views/user.py:350
 msgid "Settings successfully updated"
 msgstr "Настройките бяха успешно обновени"
 
-#: core/views/user.py:390
+#: core/views/user.py:389
 msgid "The user was successfully deactivated"
 msgstr ""
 
-#: core/views/user.py:427
+#: core/views/user.py:426
 msgid "The user was successfully activated"
 msgstr ""
 
-#: core/views/user.py:442
+#: core/views/user.py:441
 msgid "Edit user"
 msgstr ""
 
-#: core/views/user.py:597 gym/templates/gym/member_list.html:26
+#: core/views/user.py:596 gym/templates/gym/member_list.html:26
 #: gym/views/gym.py:158
 msgid "ID"
 msgstr ""
 
-#: core/views/user.py:598 gym/forms.py:95 gym/templates/contract/view.html:55
+#: core/views/user.py:597 gym/forms.py:95 gym/templates/contract/view.html:55
 #: gym/templates/gym/member_list.html:27 gym/views/export.py:59
 #: gym/views/gym.py:158 gym/views/gym.py:217
 msgid "Username"
 msgstr ""
 
-#: core/views/user.py:601 gym/templates/gym/new_user.html:34
+#: core/views/user.py:600 gym/templates/gym/new_user.html:34
 #: gym/views/export.py:58 gym/views/gym.py:217
 msgid "Gym"
 msgstr ""
 
-#: core/views/user.py:660
+#: core/views/user.py:659
 #, python-format
 msgid "A verification email was sent to %(email)s"
 msgstr ""
@@ -1534,11 +1497,6 @@ msgstr ""
 msgid "Equipment list"
 msgstr ""
 
-#: exercises/templates/equipment/admin-overview.html:39
-#: exercises/views/equipment.py:92
-msgid "Add new equipment"
-msgstr ""
-
 #: exercises/templates/history/overview.html:11
 #, fuzzy
 #| msgid "Exercise day"
@@ -1592,11 +1550,6 @@ msgstr ""
 msgid "Muscle overview"
 msgstr "Преглед на мускулите"
 
-#: exercises/templates/muscles/admin-overview.html:38
-#: exercises/views/muscles.py:68
-msgid "Add muscle"
-msgstr "Добави мускул"
-
 #: exercises/views/categories.py:72
 msgid "Add category"
 msgstr "Добави категория"
@@ -1605,6 +1558,10 @@ msgstr "Добави категория"
 msgid "This will also delete all exercises in this category."
 msgstr "Това също ще изтрие всички упражнения в тази категория."
 
+#: exercises/views/equipment.py:92
+msgid "Add new equipment"
+msgstr ""
+
 #: exercises/views/equipment.py:104 exercises/views/equipment.py:115
 msgid "Delete equipment?"
 msgstr ""
@@ -1613,6 +1570,10 @@ msgstr ""
 msgid "This will delete the exercise from all workouts."
 msgstr "Това ще изтрие упражнението от всички тренировки."
 
+#: exercises/views/muscles.py:68
+msgid "Add muscle"
+msgstr "Добави мускул"
+
 #: gallery/templates/images/overview.html:62
 #, fuzzy
 #| msgid "Add muscle"
@@ -1700,7 +1661,7 @@ msgid "Contract is active"
 msgstr ""
 
 #: gym/models/contract.py:237 gym/templates/contract/view.html:69
-#: manager/models/schedule.py:61 manager/templates/schedule/view.html:67
+#: manager/models/schedule.py:61 manager/templates/schedule/view.html:66
 msgid "Start date"
 msgstr "Начална дата"
 
@@ -1736,7 +1697,7 @@ msgstr ""
 msgid "Admin: can administrate the different gyms"
 msgstr ""
 
-#: gym/models/gym.py:65 gym/templates/gym/member_list.html:114
+#: gym/models/gym.py:65 gym/templates/gym/member_list.html:126
 msgid "Owner"
 msgstr ""
 
@@ -1746,7 +1707,7 @@ msgid ""
 "considered inactive"
 msgstr ""
 
-#: gym/models/gym_config.py:56 gym/templates/gym/member_list.html:152
+#: gym/models/gym_config.py:56 gym/templates/gym/member_list.html:166
 msgid "Show name in header"
 msgstr ""
 
@@ -1759,7 +1720,7 @@ msgstr ""
 msgid "Configuration for {self.gym.name}"
 msgstr ""
 
-#: gym/models/user_config.py:65 gym/templates/gym/member_list.html:184
+#: gym/models/user_config.py:65 gym/templates/gym/member_list.html:200
 msgid "Overview of inactive members"
 msgstr ""
 
@@ -1783,7 +1744,7 @@ msgstr ""
 msgid "User notes"
 msgstr ""
 
-#: gym/templates/contract/list.html:36
+#: gym/templates/contract/list.html:34
 msgid "Show"
 msgstr ""
 
@@ -1809,11 +1770,11 @@ msgstr ""
 msgid "Gym list"
 msgstr ""
 
-#: gym/templates/gym/list.html:50
+#: gym/templates/gym/list.html:53
 msgid "Global gym configuration"
 msgstr ""
 
-#: gym/templates/gym/list.html:67 gym/views/gym.py:171
+#: gym/templates/gym/list.html:69 gym/views/gym.py:171
 msgid "Add new gym"
 msgstr ""
 
@@ -1825,43 +1786,43 @@ msgstr ""
 msgid "Gym manager"
 msgstr ""
 
-#: gym/templates/gym/member_list.html:69
+#: gym/templates/gym/member_list.html:76
 msgid "This gym has no administrators or trainers"
 msgstr ""
 
-#: gym/templates/gym/member_list.html:88
+#: gym/templates/gym/member_list.html:98
 msgid "Export"
 msgstr ""
 
-#: gym/templates/gym/member_list.html:125
+#: gym/templates/gym/member_list.html:137
 msgid "Members"
 msgstr ""
 
-#: gym/templates/gym/member_list.html:145
+#: gym/templates/gym/member_list.html:159
 msgid "Gym configuration"
 msgstr ""
 
-#: gym/templates/gym/member_list.html:148
+#: gym/templates/gym/member_list.html:162
 msgid "Inactive members"
 msgstr ""
 
-#: gym/templates/gym/member_list.html:149
+#: gym/templates/gym/member_list.html:163
 msgid "weeks"
 msgstr ""
 
-#: gym/templates/gym/member_list.html:181
+#: gym/templates/gym/member_list.html:197
 msgid "My configuration"
 msgstr ""
 
-#: gym/templates/gym/member_list.html:215
+#: gym/templates/gym/member_list.html:234
 msgid "Types"
 msgstr ""
 
-#: gym/templates/gym/member_list.html:285
+#: gym/templates/gym/member_list.html:307
 msgid "Emails"
 msgstr ""
 
-#: gym/templates/gym/member_list.html:315
+#: gym/templates/gym/member_list.html:336
 msgid "Add member"
 msgstr ""
 
@@ -2158,28 +2119,38 @@ msgstr "Също използвай съставки на Английски"
 msgid "Unit"
 msgstr ""
 
+#: manager/forms.py:191 manager/models/log.py:103 manager/models/setting.py:102
+#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
+msgid "RiR"
+msgstr ""
+
 #: manager/forms.py:279
 msgid "Type"
 msgstr ""
 
-#: manager/forms.py:280 manager/templates/workout/view.html:113
+#: manager/forms.py:280 manager/templates/workout/view.html:122
 msgid "Table"
 msgstr ""
 
-#: manager/forms.py:282 manager/templates/workout/view.html:119
+#: manager/forms.py:282 manager/templates/workout/view.html:129
 msgid "with images"
 msgstr ""
 
-#: manager/forms.py:283 manager/templates/workout/view.html:125
+#: manager/forms.py:283 manager/templates/workout/view.html:136
 msgid "with comments"
 msgstr ""
 
+#: manager/helpers.py:86 manager/models/setting.py:72
+#: manager/templates/set/formset.html:9
+msgid "Reps"
+msgstr "Повторения"
+
 #: manager/management/commands/email-reminders.py:121
 msgid "Workout will expire soon"
 msgstr ""
 
 #: manager/models/day.py:34 manager/models/log.py:58
-#: manager/models/session.py:60 manager/templates/schedule/view.html:102
+#: manager/models/session.py:60 manager/templates/schedule/view.html:101
 #: manager/templates/workout/view.html:9 manager/templates/workout/view.html:17
 #: manager/views/pdf.py:85 manager/views/pdf.py:161
 #: manager/views/schedule.py:151 manager/views/schedule.py:221
@@ -2201,7 +2172,7 @@ msgid "Name or short description of the schedule. For example 'Program XYZ'."
 msgstr ""
 "Име или кратко описание на тренировъчната схема. Например \"Схема XYZ\"."
 
-#: manager/models/schedule.py:65 manager/templates/schedule/view.html:71
+#: manager/models/schedule.py:65 manager/templates/schedule/view.html:70
 msgid "Schedule active"
 msgstr "Схемата е активна"
 
@@ -2215,7 +2186,7 @@ msgstr ""
 "(например, ще бъде показан на таблото ви). Всички други графици ще бъдат "
 "маркирани като неактивни."
 
-#: manager/models/schedule.py:77 manager/templates/schedule/view.html:81
+#: manager/models/schedule.py:77 manager/templates/schedule/view.html:80
 msgid "Is a loop"
 msgstr ""
 
@@ -2236,7 +2207,7 @@ msgid "The duration in weeks"
 msgstr "Времетраене в седмици"
 
 #: manager/models/schedule_step.py:64 manager/models/set.py:53
-#: manager/models/setting.py:113 nutrition/models/meal.py:55
+#: manager/models/setting.py:113 nutrition/models/meal.py:53
 #: nutrition/models/meal_item.py:66
 msgid "Order"
 msgstr "Ред"
@@ -2370,7 +2341,7 @@ msgstr ""
 msgid "Workout session"
 msgstr ""
 
-#: manager/templates/calendar/partial_overview_table.html:27
+#: manager/templates/calendar/partial_overview_table.html:26
 msgid "Delete with logs"
 msgstr ""
 
@@ -2390,21 +2361,27 @@ msgid ""
 "will simply be edited. Weight entries are always added."
 msgstr ""
 
-#: manager/templates/schedule/overview.html:5
+#: manager/templates/schedule/overview.html:4
 msgid "Your schedules"
 msgstr "Твоите графици"
 
 #: manager/templates/schedule/overview.html:19
-#: manager/templates/schedule/view.html:131
-#: manager/templates/schedule/view.html:183
+#: manager/templates/schedule/view.html:143
+#: manager/templates/schedule/view.html:193
 #: manager/templates/workout/overview.html:16
 msgid "active"
 msgstr "активен"
 
-#: manager/templates/schedule/overview.html:28
+#: manager/templates/schedule/overview.html:27
 msgid "No schedules found."
 msgstr "Няма намерени графици."
 
+#: manager/templates/schedule/overview.html:28
+#, fuzzy
+#| msgid "Add one now."
+msgid "Add one now"
+msgstr "Добави сега."
+
 #: manager/templates/schedule/overview.html:36
 #, fuzzy
 #| msgid ""
@@ -2429,14 +2406,15 @@ msgid ""
 "        before jumping to the next. It is also possible to create a loop, so "
 "you\n"
 "        always do the same workouts in succession, e.g. A > B > C > A > B > "
-"C and so on."
+"C and so\n"
+"        on."
 msgstr ""
 "Можеш да уточниш колко дълга желаеш да е всяка тренировка\n"
 "преди да продължиш към следващата. Също така е възможно да повтаряш "
 "циклично\n"
 "същите тренировки, например A > B > C > A > B > C и т.н."
 
-#: manager/templates/schedule/overview.html:43
+#: manager/templates/schedule/overview.html:44
 #, fuzzy
 #| msgid ""
 #| "The currently active schedule will remain active (and be\n"
@@ -2461,25 +2439,25 @@ msgstr "Добави график"
 msgid "Schedule"
 msgstr ""
 
-#: manager/templates/schedule/view.html:85
+#: manager/templates/schedule/view.html:84
 msgid ""
 "This schedule is a loop and will go through the workouts above till you "
 "deactivate it"
 msgstr "Този график е повтарящ се докато не го деактивираш."
 
-#: manager/templates/schedule/view.html:103
+#: manager/templates/schedule/view.html:102
 msgid "Weeks"
 msgstr "Седмици"
 
-#: manager/templates/schedule/view.html:115
+#: manager/templates/schedule/view.html:114
 msgid "Move me"
 msgstr "Премести ме"
 
-#: manager/templates/schedule/view.html:156
+#: manager/templates/schedule/view.html:168
 msgid "Start schedule"
 msgstr ""
 
-#: manager/templates/schedule/view.html:187
+#: manager/templates/schedule/view.html:197
 #, python-format
 msgid ""
 "%(weeks)s Week\n"
@@ -2490,11 +2468,11 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: manager/templates/schedule/view.html:221
+#: manager/templates/schedule/view.html:231
 msgid "Adding workouts"
 msgstr "Добавяне на тренировки"
 
-#: manager/templates/schedule/view.html:223
+#: manager/templates/schedule/view.html:233
 msgid ""
 "Add as many workouts to the schedule as you want. You can\n"
 "            edit the order by dragging and dropping them. It's also possible "
@@ -2502,44 +2480,37 @@ msgid ""
 "            than once."
 msgstr ""
 
-#: manager/templates/schedule/view.html:232
-#: manager/templates/schedule/view.html:243
-#: manager/templates/schedule/view.html:290
+#: manager/templates/schedule/view.html:242
+#: manager/templates/schedule/view.html:256
+#: manager/templates/schedule/view.html:310
 #: manager/templates/workout/view.html:69
-#: manager/templates/workout/view.html:79
-#: manager/templates/workout/view.html:178
+#: manager/templates/workout/view.html:83
+#: manager/templates/workout/view.html:192
 msgid "Export calendar file"
 msgstr ""
 
-#: manager/templates/schedule/view.html:236
+#: manager/templates/schedule/view.html:248
 msgid "Export this schedule as a calendar file."
 msgstr ""
 
-#: manager/templates/schedule/view.html:237
-#: manager/templates/workout/view.html:74
+#: manager/templates/schedule/view.html:249
+#: manager/templates/workout/view.html:76
 msgid ""
 "You can then import the file it into your calendar\n"
 "                        application for example google calendar, outlook or "
 "iCal. This will create\n"
 "                        an appointment for each training day with the "
-"appropriate exercises."
+"appropriate\n"
+"                        exercises."
 msgstr ""
 
-#: manager/templates/schedule/view.html:258
-#: manager/templates/schedule/view.html:294
-#: manager/templates/workout/view.html:94
-#: manager/templates/workout/view.html:174
+#: manager/templates/schedule/view.html:272
+#: manager/templates/schedule/view.html:315
+#: manager/templates/workout/view.html:99
+#: manager/templates/workout/view.html:188
 msgid "Download as PDF"
 msgstr "Свали като PDF"
 
-#: manager/templates/schedule/view.html:299
-msgid "Edit schedule"
-msgstr "Промени график"
-
-#: manager/templates/schedule/view.html:304
-msgid "Delete schedule"
-msgstr "Изтрий график"
-
 #: manager/templates/set/add.html:9
 #, python-format
 msgid "Add exercises to day \"%(day_name)s\""
@@ -2604,55 +2575,6 @@ msgid ""
 "You will regularly receive such reminders till you enter your current weight."
 msgstr ""
 
-#: manager/templates/workout/log.html:10 manager/templates/workout/log.html:11
-msgid "Weight log"
-msgstr "Запис на тегло"
-
-#: manager/templates/workout/log.html:29
-msgid "Weight log for workout"
-msgstr "Запис за тежести на тренировка"
-
-#: manager/templates/workout/log.html:49
-msgid "Add weight log to this day"
-msgstr "Добави данни за тежест от деня"
-
-#: manager/templates/workout/log.html:69
-msgid "No weight entries here."
-msgstr "Няма попълнения за тегло тук."
-
-#: manager/templates/workout/log.html:77
-msgid "No exercises for this day."
-msgstr "Няма упражнения за деня."
-
-#: manager/templates/workout/log.html:90
-msgid ""
-"This page shows the weight logs belonging to this workout\n"
-"only. Click on an exercise to see all the historical data for\n"
-"it."
-msgstr ""
-"Тази страница показва дневниците за записите за тежести принадлежащи към "
-"тази тренировка\n"
-"само. Кликнете върху дадено упражнение за да видите всичките исторически "
-"данни\n"
-"за него."
-
-#: manager/templates/workout/log.html:94
-msgid ""
-"If on a single day there is more than one entry with the\n"
-"same number of repetitions, but different weights, only the entry with the\n"
-"higher weight is shown in the diagram."
-msgstr ""
-"Ако за едни ден има повече от едно попълнение с същия брой\n"
-"повтерения, но различни тежести, само попълнението с по-\n"
-"голямата тежест е показано на диаграмата."
-
-#: manager/templates/workout/log.html:98
-msgid ""
-"Note that only entries with a weight unit (kg or lb) and\n"
-"repetitions are charted, other combinations such as time or until failure\n"
-"are ignored here."
-msgstr ""
-
 #: manager/templates/workout/overview.html:25
 #, fuzzy
 #| msgid "No schedules found."
@@ -2696,27 +2618,23 @@ msgstr ""
 msgid "Set the repetitions for each set"
 msgstr "Задайте повторения за всяка серия"
 
-#: manager/templates/workout/view.html:73
+#: manager/templates/workout/view.html:75
 msgid "Export this workout as a calendar file."
 msgstr ""
 
-#: manager/templates/workout/view.html:144
+#: manager/templates/workout/view.html:156
 msgid "Logs"
 msgstr ""
 
-#: manager/templates/workout/view.html:146
+#: manager/templates/workout/view.html:159
 msgid "View logs"
 msgstr ""
 
-#: manager/templates/workout/view.html:169 manager/views/schedule_step.py:99
-msgid "Edit workout"
-msgstr "Редактирай тренировката"
-
-#: manager/templates/workout/view.html:182 manager/views/workout.py:281
+#: manager/templates/workout/view.html:195 manager/views/workout.py:281
 msgid "Mark as template"
 msgstr ""
 
-#: manager/views/day.py:109
+#: manager/views/day.py:105
 msgid "Add workout day"
 msgstr "Добави тренировъчен ден"
 
@@ -2733,6 +2651,10 @@ msgstr "Тренировка за %s"
 msgid "Create schedule"
 msgstr "Направи график"
 
+#: manager/views/schedule_step.py:99
+msgid "Edit workout"
+msgstr "Редактирай тренировката"
+
 #: manager/views/workout.py:209
 msgid "Copy workout"
 msgstr "Копирай тренировка"
@@ -2860,7 +2782,7 @@ msgstr ""
 msgid "Unit amount, e.g. \"1 Cup\" or \"1/2 spoon\""
 msgstr "Единица количество, напр. \"1 Чаша\" или \"1/2 лъжица\""
 
-#: nutrition/models/log.py:52 nutrition/models/meal.py:50
+#: nutrition/models/log.py:52 nutrition/models/meal.py:48
 #: nutrition/models/meal_item.py:48 nutrition/models/plan.py:108
 msgid "Nutrition plan"
 msgstr "План за хранене"
@@ -2875,11 +2797,11 @@ msgstr "Ядене"
 msgid "Date and Time (Approx.)"
 msgstr "Време (приблизително)"
 
-#: nutrition/models/meal.py:62
+#: nutrition/models/meal.py:60
 msgid "Time (approx)"
 msgstr "Време (приблизително)"
 
-#: nutrition/models/meal.py:69
+#: nutrition/models/meal.py:67
 msgid ""
 "Give meals a textual description / name such as \"Breakfast\" or \"after "
 "workout\""
@@ -3008,10 +2930,6 @@ msgstr "Няма съставки."
 msgid "Search"
 msgstr "Търси"
 
-#: nutrition/templates/ingredient/overview.html:62
-msgid "Add ingredient"
-msgstr "Добави съставка"
-
 #: nutrition/templates/ingredient/view.html:45 nutrition/views/plan.py:229
 msgid "Macronutrients"
 msgstr "Макронутриенти"
@@ -3031,20 +2949,11 @@ msgstr "Не е налично"
 msgid "Others"
 msgstr "Други"
 
-#: nutrition/templates/ingredient/view.html:144
-#: nutrition/templates/units/list.html:46 nutrition/views/unit.py:86
+#: nutrition/templates/ingredient/view.html:143
+#: nutrition/templates/units/list.html:50 nutrition/views/unit.py:86
 msgid "Add new weight unit"
 msgstr "Добави нова единица за тегло"
 
-#: nutrition/templates/ingredient/view.html:206
-#: nutrition/templates/ingredient/view.html:209
-msgid "Edit ingredient"
-msgstr "Промени съставка"
-
-#: nutrition/templates/ingredient/view.html:213
-msgid "Delete ingredient"
-msgstr "Изтрий съставка"
-
 #: nutrition/templates/rate/form.html:25
 msgid "Basal metabolic rate"
 msgstr ""
@@ -3631,6 +3540,66 @@ msgstr ""
 msgid "Delete weight entry for the %s"
 msgstr ""
 
+#~ msgid "This exercise has no repetitions."
+#~ msgstr "Това упражнение няма повторения."
+
+#~ msgid "Edit them now."
+#~ msgstr "Поправи сега."
+
+#~ msgid "Add exercises to this workout day"
+#~ msgstr "Добави упражнения за този тренировъчен ден"
+
+#~ msgid "Edit schedule"
+#~ msgstr "Промени график"
+
+#~ msgid "Delete schedule"
+#~ msgstr "Изтрий график"
+
+#~ msgid "Weight log"
+#~ msgstr "Запис на тегло"
+
+#~ msgid "Weight log for workout"
+#~ msgstr "Запис за тежести на тренировка"
+
+#~ msgid "Add weight log to this day"
+#~ msgstr "Добави данни за тежест от деня"
+
+#~ msgid "No weight entries here."
+#~ msgstr "Няма попълнения за тегло тук."
+
+#~ msgid "No exercises for this day."
+#~ msgstr "Няма упражнения за деня."
+
+#~ msgid ""
+#~ "This page shows the weight logs belonging to this workout\n"
+#~ "only. Click on an exercise to see all the historical data for\n"
+#~ "it."
+#~ msgstr ""
+#~ "Тази страница показва дневниците за записите за тежести принадлежащи към "
+#~ "тази тренировка\n"
+#~ "само. Кликнете върху дадено упражнение за да видите всичките исторически "
+#~ "данни\n"
+#~ "за него."
+
+#~ msgid ""
+#~ "If on a single day there is more than one entry with the\n"
+#~ "same number of repetitions, but different weights, only the entry with "
+#~ "the\n"
+#~ "higher weight is shown in the diagram."
+#~ msgstr ""
+#~ "Ако за едни ден има повече от едно попълнение с същия брой\n"
+#~ "повтерения, но различни тежести, само попълнението с по-\n"
+#~ "голямата тежест е показано на диаграмата."
+
+#~ msgid "Add ingredient"
+#~ msgstr "Добави съставка"
+
+#~ msgid "Edit ingredient"
+#~ msgstr "Промени съставка"
+
+#~ msgid "Delete ingredient"
+#~ msgstr "Изтрий съставка"
+
 #~ msgid "Ingredients pending review"
 #~ msgstr "Съставки без преглед"
 
diff --git a/wger/locale/ca/LC_MESSAGES/django.po b/wger/locale/ca/LC_MESSAGES/django.po
index 4f40861a3..5d1127c1d 100644
--- a/wger/locale/ca/LC_MESSAGES/django.po
+++ b/wger/locale/ca/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-07-14 15:59+0200\n"
+"POT-Creation-Date: 2024-11-14 13:09+0100\n"
 "PO-Revision-Date: 2024-08-04 23:09+0000\n"
 "Last-Translator: Zixu Sun <zixu233@gmail.com>\n"
 "Language-Team: Catalan <https://hosted.weblate.org/projects/wger/web/ca/>\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 5.7-dev\n"
 
-#: config/models/gym_config.py:46 gym/templates/gym/list.html:53
+#: config/models/gym_config.py:46 gym/templates/gym/list.html:56
 msgid "Default gym"
 msgstr "Gimnàs per defecte"
 
@@ -31,28 +31,28 @@ msgstr ""
 "tot nou usuari que es registri a dit gimnàs i actualitzarà tots els usuaris "
 "existents que no en tinguin."
 
-#: config/views/gym_config.py:42 core/templates/language/view.html:67
-#: core/templates/license/list.html:17 core/templates/misc/license/list.html:18
+#: config/views/gym_config.py:42 core/templates/language/view.html:64
+#: core/templates/license/list.html:17
 #: core/templates/repetition_unit/list.html:18
-#: core/templates/tags/render_day.html:39
-#: core/templates/tags/render_day.html:75 core/templates/user/overview.html:204
-#: core/templates/user/overview.html:445
+#: core/templates/user/overview.html:204 core/templates/user/overview.html:467
 #: core/templates/weight_unit/list.html:18
 #: exercises/templates/categories/admin-overview.html:17
 #: exercises/templates/equipment/admin-overview.html:17
-#: exercises/templates/muscles/admin-overview.html:17
-#: gallery/views/images.py:98 gym/templates/admin_notes/list.html:32
-#: gym/templates/contract/list.html:31 gym/templates/contract/view.html:107
-#: gym/templates/contract_option/list.html:32
-#: gym/templates/contract_type/list.html:32 gym/templates/document/list.html:38
-#: gym/templates/gym/list.html:20 gym/templates/gym/list.html:46
-#: gym/templates/gym/member_list.html:87 gym/templates/gym/member_list.html:140
-#: gym/templates/gym/member_list.html:176
-#: manager/templates/calendar/day.html:68
-#: manager/templates/calendar/month.html:85
-#: manager/templates/calendar/partial_overview_table.html:18
-#: manager/templates/schedule/view.html:118
-#: nutrition/templates/ingredient/view.html:165
+#: exercises/templates/muscles/admin-overview.html:16
+#: gallery/views/images.py:98 gym/templates/admin_notes/list.html:31
+#: gym/templates/contract/list.html:30 gym/templates/contract/view.html:106
+#: gym/templates/contract_option/list.html:29
+#: gym/templates/contract_type/list.html:30 gym/templates/document/list.html:38
+#: gym/templates/gym/list.html:19 gym/templates/gym/list.html:48
+#: gym/templates/gym/member_list.html:94 gym/templates/gym/member_list.html:152
+#: gym/templates/gym/member_list.html:190
+#: manager/templates/calendar/day.html:67
+#: manager/templates/calendar/month.html:84
+#: manager/templates/calendar/partial_overview_table.html:16
+#: manager/templates/schedule/view.html:318
+#: manager/templates/workout/view.html:181
+#: nutrition/templates/ingredient/view.html:164
+#: nutrition/templates/ingredient/view.html:209
 #: nutrition/templates/units/list.html:19
 msgid "Edit"
 msgstr "Edita"
@@ -88,8 +88,8 @@ msgstr "El meu programa d'entrenament xamós"
 msgid "Empty placeholder schedule"
 msgstr "Programa buit per a reservar l'espai"
 
-#: core/forms.py:69 core/templates/navigation.html:285
-#: core/templates/navigation.html:291 core/templates/user/login.html:4
+#: core/forms.py:69 core/templates/navigation.html:284
+#: core/templates/navigation.html:290 core/templates/user/login.html:4
 #: software/templates/features.html:82 software/templates/features.html:427
 msgid "Login"
 msgstr "Accedeix"
@@ -99,14 +99,14 @@ msgstr "Accedeix"
 msgid "First name"
 msgstr "Nom"
 
-#: core/forms.py:109 core/forms.py:215 core/templates/user/overview.html:266
+#: core/forms.py:109 core/forms.py:215 core/templates/user/overview.html:284
 #: gym/views/export.py:62 gym/views/gym.py:217
 msgid "Last name"
 msgstr "Cognom"
 
-#: core/forms.py:111 core/forms.py:180 core/templates/user/overview.html:270
+#: core/forms.py:111 core/forms.py:180 core/templates/user/overview.html:288
 #: gym/models/contract.py:256 gym/models/gym.py:58
-#: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:104
+#: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:116
 #: gym/templates/gym/new_user.html:30 gym/views/export.py:60
 #: mailer/templates/mailer/gym/form.html:4
 #: mailer/templates/mailer/gym/overview.html:4
@@ -137,8 +137,8 @@ msgstr "Recordatoris d'entrenament"
 msgid "Other settings"
 msgstr "Altres configuracions"
 
-#: core/forms.py:174 core/views/user.py:624 core/views/user.py:639
-#: core/views/user.py:651 gym/forms.py:73 manager/templates/log/add.html:65
+#: core/forms.py:174 core/views/user.py:623 core/views/user.py:638
+#: core/views/user.py:650 gym/forms.py:73 manager/templates/log/add.html:65
 #: manager/templates/set/add.html:70 manager/views/workout.py:203
 #: utils/generic_views.py:143
 msgid "Save"
@@ -163,26 +163,25 @@ msgstr "Contrasenya"
 msgid "Please enter your current password."
 msgstr "Introduïu la contrasenya actual."
 
-#: core/forms.py:242 core/templates/language/view.html:73
-#: core/templates/license/list.html:19 core/templates/misc/license/list.html:22
-#: core/templates/repetition_unit/list.html:20
-#: core/templates/tags/render_day.html:45
-#: core/templates/tags/render_day.html:81 core/templates/user/overview.html:217
-#: core/templates/weight_unit/list.html:20
-#: exercises/templates/categories/admin-overview.html:19
-#: exercises/templates/equipment/admin-overview.html:19
-#: exercises/templates/muscles/admin-overview.html:19
-#: gym/templates/admin_notes/list.html:40
-#: gym/templates/contract_option/list.html:41
-#: gym/templates/contract_type/list.html:41 gym/templates/document/list.html:46
-#: gym/templates/gym/list.html:22 manager/templates/calendar/day.html:73
-#: manager/templates/calendar/month.html:89
-#: manager/templates/calendar/partial_overview_table.html:23
-#: manager/templates/schedule/view.html:122
-#: manager/templates/workout/view.html:188
-#: nutrition/templates/ingredient/view.html:166
+#: core/forms.py:242 core/templates/language/view.html:70
+#: core/templates/license/list.html:21
+#: core/templates/repetition_unit/list.html:22
+#: core/templates/user/overview.html:233
+#: core/templates/weight_unit/list.html:22
+#: exercises/templates/categories/admin-overview.html:21
+#: exercises/templates/equipment/admin-overview.html:21
+#: exercises/templates/muscles/admin-overview.html:20
+#: gym/templates/admin_notes/list.html:37
+#: gym/templates/contract_option/list.html:35
+#: gym/templates/contract_type/list.html:36 gym/templates/document/list.html:46
+#: gym/templates/gym/list.html:23 manager/templates/calendar/day.html:73
+#: manager/templates/calendar/month.html:88
+#: manager/templates/calendar/partial_overview_table.html:22
+#: manager/templates/schedule/view.html:324
+#: manager/templates/workout/view.html:202
+#: nutrition/templates/ingredient/view.html:168
 #: nutrition/templates/ingredient/view.html:215
-#: nutrition/templates/units/list.html:22
+#: nutrition/templates/units/list.html:25
 msgid "Delete"
 msgstr "Esborra"
 
@@ -194,9 +193,9 @@ msgstr "Contrasenya invàlida"
 msgid "The form is secured with reCAPTCHA"
 msgstr "El formulari està protegit amb reCAPTCHA"
 
-#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:285
-#: core/templates/navigation.html:297 core/templates/template.html:149
-#: core/templates/user/login.html:20 core/views/user.py:298
+#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:284
+#: core/templates/navigation.html:296 core/templates/template.html:151
+#: core/templates/user/login.html:20 core/views/user.py:297
 #: software/templates/features.html:87 software/templates/features.html:422
 msgid "Register"
 msgstr "Enregistreu-vos"
@@ -452,18 +451,18 @@ msgid "The sum of all hours has to be 24"
 msgstr "La suma de totes les hores ha de ser 24"
 
 #: core/models/rep_unit.py:36 core/models/weight_unit.py:36
-#: core/templates/user/overview.html:262 core/views/user.py:599
+#: core/templates/user/overview.html:280 core/views/user.py:598
 #: exercises/models/category.py:29 exercises/models/equipment.py:29
 #: exercises/models/exercise.py:59 exercises/models/muscle.py:36
 #: gym/models/contract.py:52 gym/models/contract.py:103 gym/models/gym.py:46
 #: gym/models/user_document.py:84 gym/templates/contract/view.html:50
-#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:96
+#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:108
 #: gym/views/gym.py:158 manager/models/schedule.py:55
 #: manager/models/workout.py:57 measurements/models/category.py:36
 #: nutrition/models/ingredient.py:111
-#: nutrition/models/ingredient_category.py:27 nutrition/models/meal.py:67
+#: nutrition/models/ingredient_category.py:27 nutrition/models/meal.py:65
 #: nutrition/models/weight_unit.py:38
-#: nutrition/templates/ingredient/view.html:152
+#: nutrition/templates/ingredient/view.html:151
 msgid "Name"
 msgstr "Nom"
 
@@ -493,10 +492,10 @@ msgid ""
 "refreshing your browser and if that doesn't help, please try again at a "
 "later time. If the problem persists, you can seek help in ways listed below:"
 msgstr ""
-"S'ha produït un error al servidor mentre s'estava processant la vostra sol·"
-"licitud. Proveu d'actualitzar el navegador i, si això no funciona, torneu-ho "
-"a intentar més tard. Si el problema persisteix, podeu buscar ajuda de les "
-"maneres que s'indiquen a continuació:"
+"S'ha produït un error al servidor mentre s'estava processant la vostra "
+"sol·licitud. Proveu d'actualitzar el navegador i, si això no funciona, "
+"torneu-ho a intentar més tard. Si el problema persisteix, podeu buscar ajuda "
+"de les maneres que s'indiquen a continuació:"
 
 #: core/templates/base.html:10 core/templates/base_wide.html:7
 #, fuzzy, python-format
@@ -521,7 +520,7 @@ msgstr ""
 msgid "Back to \"%(target)s\""
 msgstr "Enrere a \"%(target)s\""
 
-#: core/templates/delete.html:15
+#: core/templates/delete.html:4
 msgid "Are you sure you want to delete this? This action cannot be undone."
 msgstr "Esteu segur que voleu esborrar això? Aquesta acció no es pot desfer."
 
@@ -575,7 +574,7 @@ msgstr ""
 msgid "Dashboard"
 msgstr "Consola"
 
-#: core/templates/language/overview.html:4 core/templates/navigation.html:345
+#: core/templates/language/overview.html:4 core/templates/navigation.html:344
 msgid "Languages"
 msgstr "Llengües"
 
@@ -585,85 +584,72 @@ msgstr "No s'ha trobat res."
 
 #: core/templates/language/overview.html:22
 #: manager/templates/calendar/month.html:132
-#: manager/templates/schedule/overview.html:28
-#: manager/templates/schedule/view.html:144
+#: manager/templates/schedule/view.html:154
 #: manager/templates/workout/overview.html:28
 #: nutrition/templates/ingredient/overview.html:38
 msgid "Add one now."
 msgstr "Afegeix-ne un ara."
 
-#: core/templates/language/overview.html:35 core/templates/license/list.html:40
-#: core/templates/misc/license/list.html:43
-#: core/templates/repetition_unit/list.html:43
-#: core/templates/user/overview.html:326 core/templates/user/overview.html:365
-#: core/templates/user/overview.html:401
-#: core/templates/weight_unit/list.html:43 core/views/languages.py:74
+#: core/templates/language/overview.html:34 core/templates/license/list.html:43
+#: core/templates/repetition_unit/list.html:46
+#: core/templates/user/overview.html:344 core/templates/user/overview.html:384
+#: core/templates/user/overview.html:422
+#: core/templates/weight_unit/list.html:46 core/views/languages.py:74
 #: core/views/license.py:66 core/views/repetition_units.py:66
 #: core/views/weight_units.py:66
-#: exercises/templates/categories/admin-overview.html:38
-#: gallery/views/images.py:63 gym/templates/admin_notes/list.html:67
-#: gym/templates/contract/list.html:73
-#: gym/templates/contract_option/list.html:72
-#: gym/templates/contract_type/list.html:72 gym/templates/document/list.html:79
-#: gym/templates/gym/member_list.html:211
-#: gym/templates/gym/member_list.html:244
-#: gym/templates/gym/member_list.html:281
+#: exercises/templates/categories/admin-overview.html:40
+#: exercises/templates/equipment/admin-overview.html:39
+#: exercises/templates/muscles/admin-overview.html:40
+#: gallery/views/images.py:63 gym/templates/admin_notes/list.html:64
+#: gym/templates/contract/list.html:69
+#: gym/templates/contract_option/list.html:65
+#: gym/templates/contract_type/list.html:66 gym/templates/document/list.html:78
+#: gym/templates/gym/member_list.html:228
+#: gym/templates/gym/member_list.html:264
+#: gym/templates/gym/member_list.html:303
 #: mailer/templates/mailer/gym/overview.html:43
+#: nutrition/templates/ingredient/overview.html:60
 msgid "Add"
 msgstr "Afegeix"
 
 #: core/templates/language/view.html:61 core/templates/user/api_key.html:44
-#: core/templates/user/preferences.html:45 gym/models/contract.py:203
-#: gym/templates/contract/view.html:41 gym/templates/contract/view.html:106
-#: gym/templates/gym/member_list.html:248
-#: manager/templates/schedule/view.html:285
-#: manager/templates/workout/view.html:163
-#: nutrition/templates/ingredient/view.html:202
+#: core/templates/user/preferences.html:50 gym/models/contract.py:203
+#: gym/templates/contract/view.html:41 gym/templates/gym/member_list.html:270
+#: manager/templates/schedule/view.html:304
+#: manager/templates/workout/view.html:177
+#: nutrition/templates/ingredient/view.html:206
 msgid "Options"
 msgstr "Opcions"
 
-#: core/templates/license/list.html:4 core/templates/misc/license/list.html:4
+#: core/templates/license/list.html:4
 msgid "License list"
 msgstr "Llista de llicències"
 
-#: core/templates/license/list.html:26 core/templates/misc/license/list.html:30
-#: core/templates/repetition_unit/list.html:28
+#: core/templates/license/list.html:30
+#: core/templates/repetition_unit/list.html:32
 #: core/templates/user/overview.html:104 core/templates/user/overview.html:136
-#: core/templates/user/overview.html:185 core/templates/user/overview.html:347
-#: core/templates/user/overview.html:383 core/templates/user/overview.html:427
-#: core/templates/weight_unit/list.html:28
-#: exercises/templates/categories/admin-overview.html:26
-#: exercises/templates/equipment/admin-overview.html:26
-#: exercises/templates/muscles/admin-overview.html:26
-#: gym/templates/admin_notes/list.html:52 gym/templates/contract/list.html:60
-#: gym/templates/contract_option/list.html:58
-#: gym/templates/contract_type/list.html:58 gym/templates/document/list.html:64
-#: gym/templates/gym/list.html:29 gym/templates/gym/member_list.html:229
-#: gym/templates/gym/member_list.html:262
-#: gym/templates/gym/member_list.html:299
+#: core/templates/user/overview.html:185 core/templates/user/overview.html:365
+#: core/templates/user/overview.html:404 core/templates/user/overview.html:448
+#: core/templates/weight_unit/list.html:32
+#: exercises/templates/categories/admin-overview.html:30
+#: exercises/templates/equipment/admin-overview.html:30
+#: exercises/templates/muscles/admin-overview.html:29
+#: gym/templates/admin_notes/list.html:50 gym/templates/contract/list.html:57
+#: gym/templates/contract_option/list.html:52
+#: gym/templates/contract_type/list.html:53 gym/templates/document/list.html:64
+#: gym/templates/gym/list.html:32 gym/templates/gym/member_list.html:248
+#: gym/templates/gym/member_list.html:284
+#: gym/templates/gym/member_list.html:321
 #: mailer/templates/mailer/gym/overview.html:30
-#: manager/templates/calendar/day.html:87
-#: nutrition/templates/units/list.html:29
+#: manager/templates/calendar/day.html:88
+#: nutrition/templates/units/list.html:34
 msgid "Nothing found"
 msgstr "No s'ha trobat res"
 
-#: core/templates/misc/about.html:4 core/templates/template.html:175
+#: core/templates/misc/about.html:4 core/templates/template.html:188
 msgid "Imprint"
 msgstr "Colofó"
 
-#: core/templates/misc/license/list.html:47
-#, fuzzy
-#| msgid ""
-#| "If a license has been localized, e.g. the Creative Commons\n"
-#| "licenses for the different countries, add them as separate entries here."
-msgid ""
-"If a license has been localized, e.g. the Creative Commons\n"
-"            licenses for the different countries, add them as separate "
-"entries here."
-msgstr ""
-"Si una llicència està localitzada, p. e. les llicències Creative Commons\n"
-"per a diferents països, afegiu-les aquí com a entrades separades."
-
 #: core/templates/navigation.html:28 software/templates/features.html:437
 msgid "Training"
 msgstr "Entrenament"
@@ -708,8 +694,8 @@ msgstr "Plantilles públiques"
 msgid "Exercises"
 msgstr "Exercicis"
 
-#: core/templates/navigation.html:111 core/templates/navigation.html:184
-#: core/templates/navigation.html:340
+#: core/templates/navigation.html:111 core/templates/navigation.html:185
+#: core/templates/navigation.html:339
 msgid "Administration"
 msgstr "Administració"
 
@@ -748,87 +734,87 @@ msgstr "Calculadora de l'IMC"
 msgid "Daily calories calculator"
 msgstr "Calculadora de calories diàries"
 
-#: core/templates/navigation.html:179
+#: core/templates/navigation.html:180
 #: nutrition/templates/ingredient/overview.html:10
 msgid "Ingredient overview"
 msgstr "Ingredients en un cop d'ull"
 
-#: core/templates/navigation.html:187 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:189 nutrition/templates/units/list.html:6
 msgid "Ingredient weight units"
 msgstr "Unitats de pes dels ingredients"
 
-#: core/templates/navigation.html:203 software/templates/features.html:442
+#: core/templates/navigation.html:205 software/templates/features.html:442
 msgid "Body weight"
 msgstr "Pes corporal"
 
-#: core/templates/navigation.html:210 core/templates/user/overview.html:114
+#: core/templates/navigation.html:212 core/templates/user/overview.html:114
 msgid "Weight overview"
 msgstr "El pes en un cop d'ull"
 
-#: core/templates/navigation.html:217 weight/views.py:65
+#: core/templates/navigation.html:216 weight/views.py:65
 msgid "Add weight entry"
 msgstr "Afegeix entrada de pes"
 
-#: core/templates/navigation.html:231
+#: core/templates/navigation.html:230
 msgid "About this software"
 msgstr "Quant a aquest programari"
 
-#: core/templates/navigation.html:237 software/templates/about_us.html:5
+#: core/templates/navigation.html:236 software/templates/about_us.html:5
 msgid "About us"
 msgstr "Quant a nosaltres"
 
-#: core/templates/navigation.html:243 software/templates/features.html:507
+#: core/templates/navigation.html:242 software/templates/features.html:507
 msgid "REST API"
 msgstr "API REST"
 
-#: core/templates/navigation.html:249 utils/models.py:45
+#: core/templates/navigation.html:248 utils/models.py:45
 msgid "License"
 msgstr "Llicència"
 
-#: core/templates/navigation.html:255
+#: core/templates/navigation.html:254
 msgid "Developer documentation"
 msgstr "Documentació per a desenvolupadors"
 
-#: core/templates/navigation.html:262
+#: core/templates/navigation.html:261
 msgid "Get the code"
 msgstr "Obteniu el codi font"
 
-#: core/templates/navigation.html:269 core/templates/template.html:214
+#: core/templates/navigation.html:268 core/templates/template.html:227
 #: software/templates/features.html:582
 msgid "Translate"
 msgstr "Traduïu"
 
-#: core/templates/navigation.html:303 core/templates/user/login.html:28
+#: core/templates/navigation.html:302 core/templates/user/login.html:28
 msgid "Reset password"
 msgstr "Reinicialitza la contrasenya"
 
-#: core/templates/navigation.html:321
+#: core/templates/navigation.html:320
 msgid "My preferences"
 msgstr "Les meves preferències"
 
-#: core/templates/navigation.html:330
+#: core/templates/navigation.html:329
 msgid "Logout"
 msgstr "Surt"
 
-#: core/templates/navigation.html:353
+#: core/templates/navigation.html:352
 msgid "Licenses"
 msgstr "Llicències"
 
-#: core/templates/navigation.html:361
+#: core/templates/navigation.html:360
 #: core/templates/repetition_unit/list.html:4
 msgid "Repetition units"
 msgstr "Unitats de repetició"
 
-#: core/templates/navigation.html:369 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:368 core/templates/weight_unit/list.html:4
 #: nutrition/templates/ingredient/view.html:141
 msgid "Weight units"
 msgstr "Unitats de pes"
 
-#: core/templates/navigation.html:377 core/templates/user/list.html:4
+#: core/templates/navigation.html:376 core/templates/user/list.html:4
 msgid "User list"
 msgstr "Llista d'usuaris"
 
-#: core/templates/navigation.html:383
+#: core/templates/navigation.html:382
 msgid "Gyms"
 msgstr "Gimnasos"
 
@@ -891,57 +877,32 @@ msgstr "enrere"
 msgid "next"
 msgstr "següent"
 
-#: core/templates/tags/render_day.html:34
-msgid "Add weight log"
-msgstr "Afegeix registre de pes"
-
-#: core/templates/tags/render_day.html:116
-msgid "Placeholder image for exercise"
+#: core/templates/tags/render_day.html:44
+#, fuzzy
+#| msgid "Placeholder image for exercise"
+msgid "Placeholder image for translation"
 msgstr "Imatge provisional per al vostre exercici"
 
-#: core/templates/tags/render_day.html:133
-msgid "This exercise has no repetitions."
-msgstr "Aquest exercici no té repeticions."
-
-#: core/templates/tags/render_day.html:136
-msgid "Edit them now."
-msgstr "Edita-les."
-
-#: core/templates/tags/render_day.html:162
-msgid "Add exercises to this workout day"
-msgstr "Afegeix exercicis a aquest dia d'entrenament"
-
-#: core/templates/tags/render_weight_log.html:17 manager/helpers.py:86
-#: manager/models/setting.py:72 manager/templates/set/formset.html:9
-msgid "Reps"
-msgstr "Repeticions"
-
-#: core/templates/tags/render_weight_log.html:30 manager/forms.py:191
-#: manager/models/log.py:103 manager/models/setting.py:102
-#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
-msgid "RiR"
-msgstr "RER"
-
-#: core/templates/template.html:122 manager/templates/calendar/month.html:138
-#: manager/templates/schedule/view.html:248
-#: manager/templates/schedule/view.html:269
-#: manager/templates/workout/view.html:84
-#: manager/templates/workout/view.html:137
+#: core/templates/template.html:124 manager/templates/calendar/month.html:138
+#: manager/templates/schedule/view.html:262
+#: manager/templates/schedule/view.html:287
+#: manager/templates/workout/view.html:89
+#: manager/templates/workout/view.html:149
 msgid "Close"
 msgstr "Tanca"
 
-#: core/templates/template.html:138
+#: core/templates/template.html:140
 msgid ""
 "You are using a guest account, data entered will be deleted after a week."
 msgstr ""
 "Esteu usant un compte de convidat, les dades introduïdes s'esborraran "
 "passada una setmana."
 
-#: core/templates/template.html:143
+#: core/templates/template.html:145
 msgid "Create some demo entries"
 msgstr "Crea algunes entrades de mostra"
 
-#: core/templates/template.html:180 software/templates/features.html:547
+#: core/templates/template.html:193 software/templates/features.html:547
 #: software/templates/tos.html:7
 msgid "Terms of service"
 msgstr "Condicions del servei"
@@ -950,7 +911,7 @@ msgstr "Condicions del servei"
 msgid "Features"
 msgstr "Funcions"
 
-#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:54
+#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:59
 msgid "API key"
 msgstr "Clau API"
 
@@ -995,17 +956,17 @@ msgstr "Genera una nova clau API"
 msgid "Documentation"
 msgstr "Documentació"
 
-#: core/templates/user/delete_account.html:4
-#: core/templates/user/preferences.html:59
+#: core/templates/user/delete_account.html:3
+#: core/templates/user/preferences.html:62
 msgid "Delete account"
 msgstr "Cancel·la el compte"
 
-#: core/templates/user/delete_account.html:17
+#: core/templates/user/delete_account.html:9
 #: exercises/templates/history/overview.html:93
 msgid "Are you sure?"
 msgstr "Esteu segur?"
 
-#: core/templates/user/delete_account.html:22
+#: core/templates/user/delete_account.html:14
 #, python-format
 msgid ""
 "This action will delete the user account \"%(username)s\".\n"
@@ -1028,22 +989,22 @@ msgstr "Contrasenya oblidada?"
 
 #: core/templates/user/overview.html:25 core/templates/user/overview.html:68
 #: core/templates/user/overview.html:112 core/templates/user/overview.html:144
-#: core/templates/user/overview.html:330 core/templates/user/overview.html:369
-#: core/templates/user/overview.html:405
+#: core/templates/user/overview.html:348 core/templates/user/overview.html:390
+#: core/templates/user/overview.html:426
 #, python-format
 msgid "last %(number)s"
 msgstr "darrers %(number)s"
 
 #: core/templates/user/overview.html:27 core/templates/user/overview.html:146
-#: core/templates/user/overview.html:325 core/templates/user/overview.html:364
-#: core/templates/user/overview.html:400 gym/templates/gym/member_list.html:210
-#: gym/templates/gym/member_list.html:243
-#: gym/templates/gym/member_list.html:280
+#: core/templates/user/overview.html:343 core/templates/user/overview.html:382
+#: core/templates/user/overview.html:421 gym/templates/gym/member_list.html:226
+#: gym/templates/gym/member_list.html:262
+#: gym/templates/gym/member_list.html:302
 msgid "Overview"
 msgstr "Visió general"
 
 #: core/templates/user/overview.html:28
-#: manager/templates/schedule/view.html:163
+#: manager/templates/schedule/view.html:172
 #: manager/templates/workout/overview.html:39 manager/views/schedule_step.py:60
 msgid "Add workout"
 msgstr "Afegeix entrenament"
@@ -1075,38 +1036,36 @@ msgstr "Descripció"
 msgid "Number of logs (days)"
 msgstr "Nombre de registres (dies)"
 
-#: core/templates/user/overview.html:37 core/views/user.py:600
+#: core/templates/user/overview.html:37 core/views/user.py:599
 #: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:158
 msgid "Last activity"
 msgstr "Darrera activitat"
 
 #: core/templates/user/overview.html:58
 #: manager/templates/calendar/month.html:128
-#: manager/templates/schedule/view.html:144
 #: manager/templates/workout/overview.html:28
 msgid "No workouts found."
 msgstr "No s'han trobat entrenaments."
 
 #: core/templates/user/overview.html:68 manager/forms.py:280
-#: manager/templates/workout/view.html:106
+#: manager/templates/workout/view.html:114
 msgid "Log"
 msgstr "Registre"
 
 #: core/templates/user/overview.html:77 manager/models/session.py:83
-#: manager/templates/calendar/partial_overview_table.html:52
+#: manager/templates/calendar/partial_overview_table.html:54
 msgid "General impression"
 msgstr "Impressió general"
 
-#: core/templates/user/overview.html:78 core/templates/user/overview.html:369
+#: core/templates/user/overview.html:78 core/templates/user/overview.html:390
 #: manager/models/session.py:73
-#: manager/templates/calendar/partial_overview_table.html:56
-#: manager/templates/workout/log.html:89
+#: manager/templates/calendar/partial_overview_table.html:58
 msgid "Notes"
 msgstr "Notes"
 
 #: core/templates/user/overview.html:79
 #: exercises/templates/history/overview.html:30
-#: manager/templates/calendar/partial_overview_table.html:42
+#: manager/templates/calendar/partial_overview_table.html:44
 msgid "Time"
 msgstr "Temps"
 
@@ -1144,123 +1103,123 @@ msgstr "Greix"
 msgid "kcal"
 msgstr "kcal"
 
-#: core/templates/user/overview.html:201 core/templates/user/overview.html:322
-#: core/templates/user/overview.html:361 core/templates/user/overview.html:397
-#: core/templates/user/overview.html:442 gym/templates/gym/list.html:42
-#: gym/templates/gym/member_list.html:84 gym/templates/gym/member_list.html:137
-#: gym/templates/gym/member_list.html:173
-#: gym/templates/gym/member_list.html:207
-#: gym/templates/gym/member_list.html:240
-#: gym/templates/gym/member_list.html:277
-#: manager/templates/schedule/view.html:100
+#: core/templates/user/overview.html:201 core/templates/user/overview.html:340
+#: core/templates/user/overview.html:379 core/templates/user/overview.html:418
+#: core/templates/user/overview.html:463 gym/templates/gym/list.html:45
+#: gym/templates/gym/member_list.html:91 gym/templates/gym/member_list.html:149
+#: gym/templates/gym/member_list.html:187
+#: gym/templates/gym/member_list.html:223
+#: gym/templates/gym/member_list.html:259
+#: gym/templates/gym/member_list.html:299
+#: manager/templates/schedule/view.html:99
 msgid "Actions"
 msgstr "Accions"
 
-#: core/templates/user/overview.html:207
+#: core/templates/user/overview.html:210
 msgid "Deactivate user"
 msgstr "Desactiva l'usuari"
 
-#: core/templates/user/overview.html:209
+#: core/templates/user/overview.html:214
 msgid "Activate user"
 msgstr "Activa l'usuari"
 
-#: core/templates/user/overview.html:211
+#: core/templates/user/overview.html:223
 msgid "Reset user password"
 msgstr "Reinicialitza contrasenya de l'usuari"
 
-#: core/templates/user/overview.html:214 gym/templates/gym/member_list.html:30
+#: core/templates/user/overview.html:227 gym/templates/gym/member_list.html:30
 msgid "Roles"
 msgstr "Rols"
 
-#: core/templates/user/overview.html:225
+#: core/templates/user/overview.html:243
 msgid "Password reset confirmation"
 msgstr "Confirmació de reinicialització de la contrasenya"
 
-#: core/templates/user/overview.html:229
+#: core/templates/user/overview.html:247
 msgid "Do you really want to change this user&#39;s password?"
 msgstr "Voleu canviar la contrasenya d'aquest usuari?"
 
-#: core/templates/user/overview.html:232
+#: core/templates/user/overview.html:250
 #: exercises/templates/history/overview.html:106
 msgid "No"
 msgstr "No"
 
-#: core/templates/user/overview.html:233
+#: core/templates/user/overview.html:251
 #: exercises/templates/history/overview.html:99
 msgid "Yes"
 msgstr "Sí"
 
-#: core/templates/user/overview.html:254 gym/templates/gym/member_list.html:93
+#: core/templates/user/overview.html:272 gym/templates/gym/member_list.html:105
 msgid "Details"
 msgstr "Detalls"
 
-#: core/templates/user/overview.html:258 gym/views/export.py:57
-#: manager/helpers.py:86 manager/templates/schedule/view.html:98
+#: core/templates/user/overview.html:276 gym/views/export.py:57
+#: manager/helpers.py:86 manager/templates/schedule/view.html:97
 msgid "Nr."
 msgstr "Núm."
 
-#: core/templates/user/overview.html:280 gym/models/contract.py:287
+#: core/templates/user/overview.html:298 gym/models/contract.py:287
 #: gym/models/gym.py:50 gym/templates/contract/view.html:75
-#: gym/templates/gym/member_list.html:100 gym/views/export.py:68
+#: gym/templates/gym/member_list.html:112 gym/views/export.py:68
 msgid "Phone"
 msgstr "Telèfon"
 
-#: core/templates/user/overview.html:284 gym/templates/contract/view.html:87
-#: gym/templates/gym/member_list.html:118
+#: core/templates/user/overview.html:302 gym/templates/contract/view.html:87
+#: gym/templates/gym/member_list.html:130
 msgid "Address"
 msgstr "Adreça"
 
-#: core/templates/user/overview.html:295
+#: core/templates/user/overview.html:313
 msgid "Registered"
 msgstr "Registrat"
 
-#: core/templates/user/overview.html:299
+#: core/templates/user/overview.html:317
 msgid "Last login"
 msgstr "Darrera connexió"
 
-#: core/templates/user/overview.html:304
+#: core/templates/user/overview.html:322
 msgid "Status"
 msgstr "Estat"
 
-#: core/templates/user/overview.html:307
+#: core/templates/user/overview.html:325
 msgid "Active"
 msgstr "Actiu"
 
-#: core/templates/user/overview.html:309
+#: core/templates/user/overview.html:327
 msgid "Inactive"
 msgstr "Inactiu"
 
-#: core/templates/user/overview.html:330 gym/templates/contract/list.html:4
-#: gym/templates/gym/member_list.html:202
+#: core/templates/user/overview.html:348 gym/templates/contract/list.html:4
+#: gym/templates/gym/member_list.html:218
 msgid "Contracts"
 msgstr "Contractes"
 
-#: core/templates/user/overview.html:405 gym/templates/document/list.html:4
+#: core/templates/user/overview.html:426 gym/templates/document/list.html:4
 msgid "Documents"
 msgstr "Documents"
 
-#: core/templates/user/overview.html:412 gym/templates/document/list.html:32
-#: manager/forms.py:292 manager/templates/workout/view.html:132
+#: core/templates/user/overview.html:433 gym/templates/document/list.html:33
+#: manager/forms.py:292 manager/templates/workout/view.html:143
 msgid "Download"
 msgstr "Descarrega"
 
-#: core/templates/user/overview.html:450 gym/views/admin_config.py:44
+#: core/templates/user/overview.html:474 gym/views/admin_config.py:44
 #: gym/views/admin_config.py:58 gym/views/user_config.py:46
 msgid "Configuration"
 msgstr "Configuració"
 
-#: core/templates/user/overview.html:453 gym/models/user_config.py:92
+#: core/templates/user/overview.html:477 gym/models/user_config.py:92
 msgid "Include in inactive overview"
 msgstr "Inclou a la vista general d'inactius"
 
-#: core/templates/user/overview.html:486
+#: core/templates/user/overview.html:510
 #, python-format
 msgid "Admin login is only available for users in %(gym_name)s"
 msgstr ""
 "La connexió com a administrador només està disponible per a usuaris de "
 "%(gym_name)s"
 
-#: core/templates/user/overview.html:490
+#: core/templates/user/overview.html:514
 msgid "Log in as this user"
 msgstr "Connecta amb aquest compte"
 
@@ -1282,19 +1241,19 @@ msgstr ""
 msgid "Send verification email"
 msgstr ""
 
-#: core/templates/user/preferences.html:30
+#: core/templates/user/preferences.html:31
 msgid "You need to verify your email to contribute exercises"
 msgstr ""
 
-#: core/templates/user/preferences.html:50 core/views/user.py:611
+#: core/templates/user/preferences.html:55 core/views/user.py:610
 msgid "Change password"
 msgstr "Canvia la contrasenya"
 
-#: core/templatetags/wger_extras.py:205 i18n.tpl:37
+#: core/templatetags/wger_extras.py:197 i18n.tpl:37
 msgid "kg"
 msgstr "kg"
 
-#: core/templatetags/wger_extras.py:207
+#: core/templatetags/wger_extras.py:199
 #: nutrition/templates/ingredient/view.html:60
 #: nutrition/templates/ingredient/view.html:66
 #: nutrition/templates/ingredient/view.html:73
@@ -1306,11 +1265,11 @@ msgctxt "weight unit, i.e. grams"
 msgid "g"
 msgstr "g"
 
-#: core/templatetags/wger_extras.py:210 i18n.tpl:38
+#: core/templatetags/wger_extras.py:202 i18n.tpl:38
 msgid "lb"
 msgstr "lb"
 
-#: core/templatetags/wger_extras.py:212
+#: core/templatetags/wger_extras.py:204
 msgctxt "weight unit, i.e. ounces"
 msgid "oz"
 msgstr "oz"
@@ -1337,13 +1296,13 @@ msgid "Delete {0}?"
 msgstr "Esborrar {0}?"
 
 #: core/views/languages.py:111 core/views/license.py:85
-#: core/views/repetition_units.py:86 core/views/user.py:474
+#: core/views/repetition_units.py:86 core/views/user.py:473
 #: core/views/weight_units.py:86 exercises/views/categories.py:98
 #: exercises/views/equipment.py:81 exercises/views/muscles.py:87
 #: gym/views/admin_notes.py:161 gym/views/config.py:68
 #: gym/views/contract.py:186 gym/views/contract_option.py:123
 #: gym/views/contract_type.py:123 gym/views/document.py:171
-#: gym/views/gym.py:463 manager/views/day.py:100 manager/views/schedule.py:333
+#: gym/views/gym.py:463 manager/views/day.py:96 manager/views/schedule.py:333
 #: manager/views/workout.py:267 nutrition/views/ingredient.py:145
 #: nutrition/views/unit.py:143
 #, python-brace-format
@@ -1372,48 +1331,48 @@ msgstr "Envia"
 msgid "Your feedback was successfully sent. Thank you!"
 msgstr "Els vostres comentaris s'han enviat amb èxit. Gràcies!"
 
-#: core/views/user.py:156
+#: core/views/user.py:155
 #, python-brace-format
 msgid "Account \"{0}\" was successfully deleted"
 msgstr "El compte «{0}» s'ha esborrat amb èxit"
 
-#: core/views/user.py:292
+#: core/views/user.py:291
 msgid "You were successfully registered"
 msgstr "Us heu registrat amb èxit"
 
-#: core/views/user.py:351
+#: core/views/user.py:350
 msgid "Settings successfully updated"
 msgstr "Opcions actualitzades amb èxit"
 
-#: core/views/user.py:390
+#: core/views/user.py:389
 msgid "The user was successfully deactivated"
 msgstr "S'ha desactivat l'usuari amb èxit"
 
-#: core/views/user.py:427
+#: core/views/user.py:426
 msgid "The user was successfully activated"
 msgstr "S'ha activat l'usuari amb èxit"
 
-#: core/views/user.py:442
+#: core/views/user.py:441
 msgid "Edit user"
 msgstr "Edita l'usuari"
 
-#: core/views/user.py:597 gym/templates/gym/member_list.html:26
+#: core/views/user.py:596 gym/templates/gym/member_list.html:26
 #: gym/views/gym.py:158
 msgid "ID"
 msgstr "ID"
 
-#: core/views/user.py:598 gym/forms.py:95 gym/templates/contract/view.html:55
+#: core/views/user.py:597 gym/forms.py:95 gym/templates/contract/view.html:55
 #: gym/templates/gym/member_list.html:27 gym/views/export.py:59
 #: gym/views/gym.py:158 gym/views/gym.py:217
 msgid "Username"
 msgstr "Nom d'usuari"
 
-#: core/views/user.py:601 gym/templates/gym/new_user.html:34
+#: core/views/user.py:600 gym/templates/gym/new_user.html:34
 #: gym/views/export.py:58 gym/views/gym.py:217
 msgid "Gym"
 msgstr "Gimnàs"
 
-#: core/views/user.py:660
+#: core/views/user.py:659
 #, python-format
 msgid "A verification email was sent to %(email)s"
 msgstr ""
@@ -1576,11 +1535,6 @@ msgstr ""
 msgid "Equipment list"
 msgstr "Llista d'equipaments"
 
-#: exercises/templates/equipment/admin-overview.html:39
-#: exercises/views/equipment.py:92
-msgid "Add new equipment"
-msgstr "Afegeix un nou equipament"
-
 #: exercises/templates/history/overview.html:11
 #, fuzzy
 #| msgid "Exercise day"
@@ -1639,11 +1593,6 @@ msgstr ""
 msgid "Muscle overview"
 msgstr "Vista general del músculs"
 
-#: exercises/templates/muscles/admin-overview.html:38
-#: exercises/views/muscles.py:68
-msgid "Add muscle"
-msgstr "Afegeix múscul"
-
 #: exercises/views/categories.py:72
 msgid "Add category"
 msgstr "Afegeix categoria"
@@ -1652,6 +1601,10 @@ msgstr "Afegeix categoria"
 msgid "This will also delete all exercises in this category."
 msgstr "Això també esborrarà tots els exercicis d'aquesta categoria."
 
+#: exercises/views/equipment.py:92
+msgid "Add new equipment"
+msgstr "Afegeix un nou equipament"
+
 #: exercises/views/equipment.py:104 exercises/views/equipment.py:115
 msgid "Delete equipment?"
 msgstr "Voleu esborrar l'equipament?"
@@ -1660,6 +1613,10 @@ msgstr "Voleu esborrar l'equipament?"
 msgid "This will delete the exercise from all workouts."
 msgstr "Això esborrarà l'exercici de tots els entrenaments."
 
+#: exercises/views/muscles.py:68
+msgid "Add muscle"
+msgstr "Afegeix múscul"
+
 #: gallery/templates/images/overview.html:62
 msgid "Add image"
 msgstr "Afegeix imatge"
@@ -1745,7 +1702,7 @@ msgid "Contract is active"
 msgstr "El contracte és actiu"
 
 #: gym/models/contract.py:237 gym/templates/contract/view.html:69
-#: manager/models/schedule.py:61 manager/templates/schedule/view.html:67
+#: manager/models/schedule.py:61 manager/templates/schedule/view.html:66
 msgid "Start date"
 msgstr "Data d'inici"
 
@@ -1781,7 +1738,7 @@ msgstr "Administrador: pot gestionar els usuaris per a un donat gimnàs"
 msgid "Admin: can administrate the different gyms"
 msgstr "Director: pot gestionar els diversos gimnasos"
 
-#: gym/models/gym.py:65 gym/templates/gym/member_list.html:114
+#: gym/models/gym.py:65 gym/templates/gym/member_list.html:126
 msgid "Owner"
 msgstr "Propietari"
 
@@ -1793,7 +1750,7 @@ msgstr ""
 "Nombre de setmanes des de la darrera connexió d'un usuari per a què es "
 "consideri inactiu"
 
-#: gym/models/gym_config.py:56 gym/templates/gym/member_list.html:152
+#: gym/models/gym_config.py:56 gym/templates/gym/member_list.html:166
 msgid "Show name in header"
 msgstr "Mostra el nom a la capçalera"
 
@@ -1807,7 +1764,7 @@ msgstr "Mostra el nom del gimnàs a la capçalera del web"
 msgid "Configuration for {self.gym.name}"
 msgstr "Configuració per a {}"
 
-#: gym/models/user_config.py:65 gym/templates/gym/member_list.html:184
+#: gym/models/user_config.py:65 gym/templates/gym/member_list.html:200
 msgid "Overview of inactive members"
 msgstr "Vista general de membres inactius"
 
@@ -1831,7 +1788,7 @@ msgstr "S'usarà el nom del fitxer si no es facilita una altra cosa"
 msgid "User notes"
 msgstr "Notes de l'usuari"
 
-#: gym/templates/contract/list.html:36
+#: gym/templates/contract/list.html:34
 msgid "Show"
 msgstr "Mostra"
 
@@ -1859,11 +1816,11 @@ msgstr ""
 msgid "Gym list"
 msgstr "Llista de gimnasos"
 
-#: gym/templates/gym/list.html:50
+#: gym/templates/gym/list.html:53
 msgid "Global gym configuration"
 msgstr "Configuració global de gimnasos"
 
-#: gym/templates/gym/list.html:67 gym/views/gym.py:171
+#: gym/templates/gym/list.html:69 gym/views/gym.py:171
 msgid "Add new gym"
 msgstr "Afegeix un nou gimnàs"
 
@@ -1875,43 +1832,43 @@ msgstr "Administradors i entrenadors"
 msgid "Gym manager"
 msgstr "Director del gimnàs"
 
-#: gym/templates/gym/member_list.html:69
+#: gym/templates/gym/member_list.html:76
 msgid "This gym has no administrators or trainers"
 msgstr "Aquest gimnàs no té administradors ni entrenadors"
 
-#: gym/templates/gym/member_list.html:88
+#: gym/templates/gym/member_list.html:98
 msgid "Export"
 msgstr "Exporta"
 
-#: gym/templates/gym/member_list.html:125
+#: gym/templates/gym/member_list.html:137
 msgid "Members"
 msgstr "Membres"
 
-#: gym/templates/gym/member_list.html:145
+#: gym/templates/gym/member_list.html:159
 msgid "Gym configuration"
 msgstr "Configuració del gimnàs"
 
-#: gym/templates/gym/member_list.html:148
+#: gym/templates/gym/member_list.html:162
 msgid "Inactive members"
 msgstr "Membres inactius"
 
-#: gym/templates/gym/member_list.html:149
+#: gym/templates/gym/member_list.html:163
 msgid "weeks"
 msgstr "setmanes"
 
-#: gym/templates/gym/member_list.html:181
+#: gym/templates/gym/member_list.html:197
 msgid "My configuration"
 msgstr "La meva configuració"
 
-#: gym/templates/gym/member_list.html:215
+#: gym/templates/gym/member_list.html:234
 msgid "Types"
 msgstr "Tipus"
 
-#: gym/templates/gym/member_list.html:285
+#: gym/templates/gym/member_list.html:307
 msgid "Emails"
 msgstr "Adreces electròniques"
 
-#: gym/templates/gym/member_list.html:315
+#: gym/templates/gym/member_list.html:336
 msgid "Add member"
 msgstr "Afegeix un membre"
 
@@ -2214,28 +2171,38 @@ msgstr "Usa també ingredients en anglès"
 msgid "Unit"
 msgstr "Unitat"
 
+#: manager/forms.py:191 manager/models/log.py:103 manager/models/setting.py:102
+#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
+msgid "RiR"
+msgstr "RER"
+
 #: manager/forms.py:279
 msgid "Type"
 msgstr "Tipus"
 
-#: manager/forms.py:280 manager/templates/workout/view.html:113
+#: manager/forms.py:280 manager/templates/workout/view.html:122
 msgid "Table"
 msgstr "Taula"
 
-#: manager/forms.py:282 manager/templates/workout/view.html:119
+#: manager/forms.py:282 manager/templates/workout/view.html:129
 msgid "with images"
 msgstr "amb imatges"
 
-#: manager/forms.py:283 manager/templates/workout/view.html:125
+#: manager/forms.py:283 manager/templates/workout/view.html:136
 msgid "with comments"
 msgstr "amb comentaris"
 
+#: manager/helpers.py:86 manager/models/setting.py:72
+#: manager/templates/set/formset.html:9
+msgid "Reps"
+msgstr "Repeticions"
+
 #: manager/management/commands/email-reminders.py:121
 msgid "Workout will expire soon"
 msgstr "L'entrenament caducarà aviat"
 
 #: manager/models/day.py:34 manager/models/log.py:58
-#: manager/models/session.py:60 manager/templates/schedule/view.html:102
+#: manager/models/session.py:60 manager/templates/schedule/view.html:101
 #: manager/templates/workout/view.html:9 manager/templates/workout/view.html:17
 #: manager/views/pdf.py:85 manager/views/pdf.py:161
 #: manager/views/schedule.py:151 manager/views/schedule.py:221
@@ -2258,7 +2225,7 @@ msgstr "Dia"
 msgid "Name or short description of the schedule. For example 'Program XYZ'."
 msgstr "Nom o breu descripció del programa. Per exemple «Programa XYZ»."
 
-#: manager/models/schedule.py:65 manager/templates/schedule/view.html:71
+#: manager/models/schedule.py:65 manager/templates/schedule/view.html:70
 msgid "Schedule active"
 msgstr "Programa actiu"
 
@@ -2272,7 +2239,7 @@ msgstr ""
 "mostrarà p. e. a la vostra consola). Tots els altres programes es marcaran "
 "com a inactius"
 
-#: manager/models/schedule.py:77 manager/templates/schedule/view.html:81
+#: manager/models/schedule.py:77 manager/templates/schedule/view.html:80
 msgid "Is a loop"
 msgstr "És un cicle"
 
@@ -2293,7 +2260,7 @@ msgid "The duration in weeks"
 msgstr "La duració en setmanes"
 
 #: manager/models/schedule_step.py:64 manager/models/set.py:53
-#: manager/models/setting.py:113 nutrition/models/meal.py:55
+#: manager/models/setting.py:113 nutrition/models/meal.py:53
 #: nutrition/models/meal_item.py:66
 msgid "Order"
 msgstr "Ordre"
@@ -2433,7 +2400,7 @@ msgstr "Vista general del registre"
 msgid "Workout session"
 msgstr "Sessió d'entrenament"
 
-#: manager/templates/calendar/partial_overview_table.html:27
+#: manager/templates/calendar/partial_overview_table.html:26
 msgid "Delete with logs"
 msgstr "Esborra amb registres"
 
@@ -2456,21 +2423,27 @@ msgstr ""
 "si no n'hi ha una per la data seleccionada. Si n'hi ha una, simplement\n"
 "s'editarà. Els registres d'entrenament s'afegeixen sempre."
 
-#: manager/templates/schedule/overview.html:5
+#: manager/templates/schedule/overview.html:4
 msgid "Your schedules"
 msgstr "Els vostres programes"
 
 #: manager/templates/schedule/overview.html:19
-#: manager/templates/schedule/view.html:131
-#: manager/templates/schedule/view.html:183
+#: manager/templates/schedule/view.html:143
+#: manager/templates/schedule/view.html:193
 #: manager/templates/workout/overview.html:16
 msgid "active"
 msgstr "actiu"
 
-#: manager/templates/schedule/overview.html:28
+#: manager/templates/schedule/overview.html:27
 msgid "No schedules found."
 msgstr "No s'han trobat programes."
 
+#: manager/templates/schedule/overview.html:28
+#, fuzzy
+#| msgid "Add one now."
+msgid "Add one now"
+msgstr "Afegeix-ne un ara."
+
 #: manager/templates/schedule/overview.html:36
 #, fuzzy
 #| msgid ""
@@ -2495,13 +2468,14 @@ msgid ""
 "        before jumping to the next. It is also possible to create a loop, so "
 "you\n"
 "        always do the same workouts in succession, e.g. A > B > C > A > B > "
-"C and so on."
+"C and so\n"
+"        on."
 msgstr ""
 "Podeu indicar quant de temps voleu fer cada entrenament abans de saltar\n"
 "al següent. També és possible crear un bucle per tal de fer els mateixos\n"
 "entrenaments en successió, p. e. A > B > C > A > B > C etcètera."
 
-#: manager/templates/schedule/overview.html:43
+#: manager/templates/schedule/overview.html:44
 #, fuzzy
 #| msgid ""
 #| "The currently active schedule will remain active (and be\n"
@@ -2526,7 +2500,7 @@ msgstr "Afegeix programa"
 msgid "Schedule"
 msgstr "Programa"
 
-#: manager/templates/schedule/view.html:85
+#: manager/templates/schedule/view.html:84
 msgid ""
 "This schedule is a loop and will go through the workouts above till you "
 "deactivate it"
@@ -2534,19 +2508,19 @@ msgstr ""
 "Aquest programa és un bucle i repetirà els entrenaments de més amunt fins "
 "que no el desactiveu"
 
-#: manager/templates/schedule/view.html:103
+#: manager/templates/schedule/view.html:102
 msgid "Weeks"
 msgstr "Setmanes"
 
-#: manager/templates/schedule/view.html:115
+#: manager/templates/schedule/view.html:114
 msgid "Move me"
 msgstr "Mou-me"
 
-#: manager/templates/schedule/view.html:156
+#: manager/templates/schedule/view.html:168
 msgid "Start schedule"
 msgstr "Inicia programa"
 
-#: manager/templates/schedule/view.html:187
+#: manager/templates/schedule/view.html:197
 #, fuzzy, python-format
 #| msgid ""
 #| "%(weeks)s Week\n"
@@ -2567,11 +2541,11 @@ msgstr[1] ""
 "%(weeks)s setmanes\n"
 "                    "
 
-#: manager/templates/schedule/view.html:221
+#: manager/templates/schedule/view.html:231
 msgid "Adding workouts"
 msgstr "Afegeix entrenaments"
 
-#: manager/templates/schedule/view.html:223
+#: manager/templates/schedule/view.html:233
 #, fuzzy
 #| msgid ""
 #| "Add as many workouts to the schedule as you want. You can\n"
@@ -2588,21 +2562,21 @@ msgstr ""
 "arrossegant-los i deixant-los anar. També és possible afegir un\n"
 "entrenament més d'un cop."
 
-#: manager/templates/schedule/view.html:232
-#: manager/templates/schedule/view.html:243
-#: manager/templates/schedule/view.html:290
+#: manager/templates/schedule/view.html:242
+#: manager/templates/schedule/view.html:256
+#: manager/templates/schedule/view.html:310
 #: manager/templates/workout/view.html:69
-#: manager/templates/workout/view.html:79
-#: manager/templates/workout/view.html:178
+#: manager/templates/workout/view.html:83
+#: manager/templates/workout/view.html:192
 msgid "Export calendar file"
 msgstr "Exporta fitxer de calendari"
 
-#: manager/templates/schedule/view.html:236
+#: manager/templates/schedule/view.html:248
 msgid "Export this schedule as a calendar file."
 msgstr "Exporta aquest programa com a fitxer de calendari."
 
-#: manager/templates/schedule/view.html:237
-#: manager/templates/workout/view.html:74
+#: manager/templates/schedule/view.html:249
+#: manager/templates/workout/view.html:76
 #, fuzzy
 #| msgid ""
 #| "You can then import the file it into your calendar\n"
@@ -2614,27 +2588,20 @@ msgid ""
 "                        application for example google calendar, outlook or "
 "iCal. This will create\n"
 "                        an appointment for each training day with the "
-"appropriate exercises."
+"appropriate\n"
+"                        exercises."
 msgstr ""
 "Així podeu importar el fitxer a la vostra aplicació de\n"
 "calendari, p .e. Google Calendar, Outlook o iCal. Això crearà\n"
 "una cita per a cada dia d'entrenament amb els exercicis pertinents."
 
-#: manager/templates/schedule/view.html:258
-#: manager/templates/schedule/view.html:294
-#: manager/templates/workout/view.html:94
-#: manager/templates/workout/view.html:174
+#: manager/templates/schedule/view.html:272
+#: manager/templates/schedule/view.html:315
+#: manager/templates/workout/view.html:99
+#: manager/templates/workout/view.html:188
 msgid "Download as PDF"
 msgstr "Descarrega com a PDF"
 
-#: manager/templates/schedule/view.html:299
-msgid "Edit schedule"
-msgstr "Edita programa"
-
-#: manager/templates/schedule/view.html:304
-msgid "Delete schedule"
-msgstr "Esborra programa"
-
 #: manager/templates/set/add.html:9
 #, python-format
 msgid "Add exercises to day \"%(day_name)s\""
@@ -2711,56 +2678,6 @@ msgstr ""
 "Rebreu aquests recordatoris regularment fins que hagueu introduït el vostre "
 "pes actual."
 
-#: manager/templates/workout/log.html:10 manager/templates/workout/log.html:11
-msgid "Weight log"
-msgstr "Registre del pes"
-
-#: manager/templates/workout/log.html:29
-msgid "Weight log for workout"
-msgstr "Registre d'entrenament"
-
-#: manager/templates/workout/log.html:49
-msgid "Add weight log to this day"
-msgstr "Afegeix entrada al registre d'aquest dia"
-
-#: manager/templates/workout/log.html:69
-msgid "No weight entries here."
-msgstr "No hi ha entrades del registre aquí."
-
-#: manager/templates/workout/log.html:77
-msgid "No exercises for this day."
-msgstr "No hi ha exercicis per a aquest dia."
-
-#: manager/templates/workout/log.html:90
-msgid ""
-"This page shows the weight logs belonging to this workout\n"
-"only. Click on an exercise to see all the historical data for\n"
-"it."
-msgstr ""
-"Aquesta pàgina mostra els registres corresponents només a aquest\n"
-"entrenament. Feu clic a un exercici per a veure'n l'històric\n"
-"de dades."
-
-#: manager/templates/workout/log.html:94
-msgid ""
-"If on a single day there is more than one entry with the\n"
-"same number of repetitions, but different weights, only the entry with the\n"
-"higher weight is shown in the diagram."
-msgstr ""
-"Si a un dia concret hi ha més d'una entrada amb el mateix nombre de\n"
-"repeticions però diferents pesos, només es mostrarà al diagrama\n"
-"l'entrada amb el pes més alt."
-
-#: manager/templates/workout/log.html:98
-msgid ""
-"Note that only entries with a weight unit (kg or lb) and\n"
-"repetitions are charted, other combinations such as time or until failure\n"
-"are ignored here."
-msgstr ""
-"Teniu en compte que només es tracen al diagrama les entrades\n"
-"amb unitats (kg o lb) i repeticions, altres combinacions com ara temps\n"
-"o fins la fallida s'ignoraran aquí."
-
 #: manager/templates/workout/overview.html:25
 msgid "No templates found."
 msgstr "No s'han trobat plantilles."
@@ -2798,27 +2715,23 @@ msgstr "Afegeix sèries d'entrenament als dies"
 msgid "Set the repetitions for each set"
 msgstr "Defineix les repeticions per a cada sèrie"
 
-#: manager/templates/workout/view.html:73
+#: manager/templates/workout/view.html:75
 msgid "Export this workout as a calendar file."
 msgstr "Exporta aquest pla d'entrenament com a fitxer de calendari."
 
-#: manager/templates/workout/view.html:144
+#: manager/templates/workout/view.html:156
 msgid "Logs"
 msgstr "Registres"
 
-#: manager/templates/workout/view.html:146
+#: manager/templates/workout/view.html:159
 msgid "View logs"
 msgstr "Veure registres"
 
-#: manager/templates/workout/view.html:169 manager/views/schedule_step.py:99
-msgid "Edit workout"
-msgstr "Edita el pla d'entrenament"
-
-#: manager/templates/workout/view.html:182 manager/views/workout.py:281
+#: manager/templates/workout/view.html:195 manager/views/workout.py:281
 msgid "Mark as template"
 msgstr "Marca com a plantilla"
 
-#: manager/views/day.py:109
+#: manager/views/day.py:105
 msgid "Add workout day"
 msgstr "Afegeix dis d'entrenament"
 
@@ -2835,6 +2748,10 @@ msgstr "Pla d'entrenament per a %s"
 msgid "Create schedule"
 msgstr "Crea un programa"
 
+#: manager/views/schedule_step.py:99
+msgid "Edit workout"
+msgstr "Edita el pla d'entrenament"
+
 #: manager/views/workout.py:209
 msgid "Copy workout"
 msgstr "Copia pla d'entrenament"
@@ -2964,7 +2881,7 @@ msgstr ""
 msgid "Unit amount, e.g. \"1 Cup\" or \"1/2 spoon\""
 msgstr ""
 
-#: nutrition/models/log.py:52 nutrition/models/meal.py:50
+#: nutrition/models/log.py:52 nutrition/models/meal.py:48
 #: nutrition/models/meal_item.py:48 nutrition/models/plan.py:108
 msgid "Nutrition plan"
 msgstr "Pla nutricional"
@@ -2977,11 +2894,11 @@ msgstr ""
 msgid "Date and Time (Approx.)"
 msgstr ""
 
-#: nutrition/models/meal.py:62
+#: nutrition/models/meal.py:60
 msgid "Time (approx)"
 msgstr ""
 
-#: nutrition/models/meal.py:69
+#: nutrition/models/meal.py:67
 msgid ""
 "Give meals a textual description / name such as \"Breakfast\" or \"after "
 "workout\""
@@ -3100,10 +3017,6 @@ msgstr ""
 msgid "Search"
 msgstr "Cerca"
 
-#: nutrition/templates/ingredient/overview.html:62
-msgid "Add ingredient"
-msgstr ""
-
 #: nutrition/templates/ingredient/view.html:45 nutrition/views/plan.py:229
 msgid "Macronutrients"
 msgstr ""
@@ -3123,20 +3036,11 @@ msgstr ""
 msgid "Others"
 msgstr ""
 
-#: nutrition/templates/ingredient/view.html:144
-#: nutrition/templates/units/list.html:46 nutrition/views/unit.py:86
+#: nutrition/templates/ingredient/view.html:143
+#: nutrition/templates/units/list.html:50 nutrition/views/unit.py:86
 msgid "Add new weight unit"
 msgstr ""
 
-#: nutrition/templates/ingredient/view.html:206
-#: nutrition/templates/ingredient/view.html:209
-msgid "Edit ingredient"
-msgstr ""
-
-#: nutrition/templates/ingredient/view.html:213
-msgid "Delete ingredient"
-msgstr ""
-
 #: nutrition/templates/rate/form.html:25
 msgid "Basal metabolic rate"
 msgstr ""
@@ -3717,6 +3621,80 @@ msgstr ""
 msgid "Delete weight entry for the %s"
 msgstr ""
 
+#, fuzzy
+#~| msgid ""
+#~| "If a license has been localized, e.g. the Creative Commons\n"
+#~| "licenses for the different countries, add them as separate entries here."
+#~ msgid ""
+#~ "If a license has been localized, e.g. the Creative Commons\n"
+#~ "            licenses for the different countries, add them as separate "
+#~ "entries here."
+#~ msgstr ""
+#~ "Si una llicència està localitzada, p. e. les llicències Creative Commons\n"
+#~ "per a diferents països, afegiu-les aquí com a entrades separades."
+
+#~ msgid "Add weight log"
+#~ msgstr "Afegeix registre de pes"
+
+#~ msgid "This exercise has no repetitions."
+#~ msgstr "Aquest exercici no té repeticions."
+
+#~ msgid "Edit them now."
+#~ msgstr "Edita-les."
+
+#~ msgid "Add exercises to this workout day"
+#~ msgstr "Afegeix exercicis a aquest dia d'entrenament"
+
+#~ msgid "Edit schedule"
+#~ msgstr "Edita programa"
+
+#~ msgid "Delete schedule"
+#~ msgstr "Esborra programa"
+
+#~ msgid "Weight log"
+#~ msgstr "Registre del pes"
+
+#~ msgid "Weight log for workout"
+#~ msgstr "Registre d'entrenament"
+
+#~ msgid "Add weight log to this day"
+#~ msgstr "Afegeix entrada al registre d'aquest dia"
+
+#~ msgid "No weight entries here."
+#~ msgstr "No hi ha entrades del registre aquí."
+
+#~ msgid "No exercises for this day."
+#~ msgstr "No hi ha exercicis per a aquest dia."
+
+#~ msgid ""
+#~ "This page shows the weight logs belonging to this workout\n"
+#~ "only. Click on an exercise to see all the historical data for\n"
+#~ "it."
+#~ msgstr ""
+#~ "Aquesta pàgina mostra els registres corresponents només a aquest\n"
+#~ "entrenament. Feu clic a un exercici per a veure'n l'històric\n"
+#~ "de dades."
+
+#~ msgid ""
+#~ "If on a single day there is more than one entry with the\n"
+#~ "same number of repetitions, but different weights, only the entry with "
+#~ "the\n"
+#~ "higher weight is shown in the diagram."
+#~ msgstr ""
+#~ "Si a un dia concret hi ha més d'una entrada amb el mateix nombre de\n"
+#~ "repeticions però diferents pesos, només es mostrarà al diagrama\n"
+#~ "l'entrada amb el pes més alt."
+
+#~ msgid ""
+#~ "Note that only entries with a weight unit (kg or lb) and\n"
+#~ "repetitions are charted, other combinations such as time or until "
+#~ "failure\n"
+#~ "are ignored here."
+#~ msgstr ""
+#~ "Teniu en compte que només es tracen al diagrama les entrades\n"
+#~ "amb unitats (kg o lb) i repeticions, altres combinacions com ara temps\n"
+#~ "o fins la fallida s'ignoraran aquí."
+
 #~ msgid "Ingredients pending review"
 #~ msgstr "Ingredients pendents de revisar"
 
diff --git a/wger/locale/cs/LC_MESSAGES/django.po b/wger/locale/cs/LC_MESSAGES/django.po
index d4b9a82dd..133c48021 100644
--- a/wger/locale/cs/LC_MESSAGES/django.po
+++ b/wger/locale/cs/LC_MESSAGES/django.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: wger Workout Manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-07-14 15:59+0200\n"
+"POT-Creation-Date: 2024-11-14 13:09+0100\n"
 "PO-Revision-Date: 2024-02-21 11:02+0000\n"
 "Last-Translator: Fjuro <fjuro@alius.cz>\n"
 "Language-Team: Czech <https://hosted.weblate.org/projects/wger/web/cs/>\n"
@@ -25,7 +25,7 @@ msgstr ""
 "<= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
 "X-Generator: Weblate 5.5-dev\n"
 
-#: config/models/gym_config.py:46 gym/templates/gym/list.html:53
+#: config/models/gym_config.py:46 gym/templates/gym/list.html:56
 msgid "Default gym"
 msgstr "Základní posilovna"
 
@@ -38,28 +38,28 @@ msgstr ""
 "všem nově registrovaným uživatelům a uživatelům, kteří nemají posilovnu "
 "zvolenou."
 
-#: config/views/gym_config.py:42 core/templates/language/view.html:67
-#: core/templates/license/list.html:17 core/templates/misc/license/list.html:18
+#: config/views/gym_config.py:42 core/templates/language/view.html:64
+#: core/templates/license/list.html:17
 #: core/templates/repetition_unit/list.html:18
-#: core/templates/tags/render_day.html:39
-#: core/templates/tags/render_day.html:75 core/templates/user/overview.html:204
-#: core/templates/user/overview.html:445
+#: core/templates/user/overview.html:204 core/templates/user/overview.html:467
 #: core/templates/weight_unit/list.html:18
 #: exercises/templates/categories/admin-overview.html:17
 #: exercises/templates/equipment/admin-overview.html:17
-#: exercises/templates/muscles/admin-overview.html:17
-#: gallery/views/images.py:98 gym/templates/admin_notes/list.html:32
-#: gym/templates/contract/list.html:31 gym/templates/contract/view.html:107
-#: gym/templates/contract_option/list.html:32
-#: gym/templates/contract_type/list.html:32 gym/templates/document/list.html:38
-#: gym/templates/gym/list.html:20 gym/templates/gym/list.html:46
-#: gym/templates/gym/member_list.html:87 gym/templates/gym/member_list.html:140
-#: gym/templates/gym/member_list.html:176
-#: manager/templates/calendar/day.html:68
-#: manager/templates/calendar/month.html:85
-#: manager/templates/calendar/partial_overview_table.html:18
-#: manager/templates/schedule/view.html:118
-#: nutrition/templates/ingredient/view.html:165
+#: exercises/templates/muscles/admin-overview.html:16
+#: gallery/views/images.py:98 gym/templates/admin_notes/list.html:31
+#: gym/templates/contract/list.html:30 gym/templates/contract/view.html:106
+#: gym/templates/contract_option/list.html:29
+#: gym/templates/contract_type/list.html:30 gym/templates/document/list.html:38
+#: gym/templates/gym/list.html:19 gym/templates/gym/list.html:48
+#: gym/templates/gym/member_list.html:94 gym/templates/gym/member_list.html:152
+#: gym/templates/gym/member_list.html:190
+#: manager/templates/calendar/day.html:67
+#: manager/templates/calendar/month.html:84
+#: manager/templates/calendar/partial_overview_table.html:16
+#: manager/templates/schedule/view.html:318
+#: manager/templates/workout/view.html:181
+#: nutrition/templates/ingredient/view.html:164
+#: nutrition/templates/ingredient/view.html:209
 #: nutrition/templates/units/list.html:19
 msgid "Edit"
 msgstr "Upravit"
@@ -93,8 +93,8 @@ msgstr "Můj suprový tréninkový rozvrh"
 msgid "Empty placeholder schedule"
 msgstr "Prázdný ukázkový rozvrh"
 
-#: core/forms.py:69 core/templates/navigation.html:285
-#: core/templates/navigation.html:291 core/templates/user/login.html:4
+#: core/forms.py:69 core/templates/navigation.html:284
+#: core/templates/navigation.html:290 core/templates/user/login.html:4
 #: software/templates/features.html:82 software/templates/features.html:427
 msgid "Login"
 msgstr "Přihlášení"
@@ -104,14 +104,14 @@ msgstr "Přihlášení"
 msgid "First name"
 msgstr "Jméno"
 
-#: core/forms.py:109 core/forms.py:215 core/templates/user/overview.html:266
+#: core/forms.py:109 core/forms.py:215 core/templates/user/overview.html:284
 #: gym/views/export.py:62 gym/views/gym.py:217
 msgid "Last name"
 msgstr "Příjmení"
 
-#: core/forms.py:111 core/forms.py:180 core/templates/user/overview.html:270
+#: core/forms.py:111 core/forms.py:180 core/templates/user/overview.html:288
 #: gym/models/contract.py:256 gym/models/gym.py:58
-#: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:104
+#: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:116
 #: gym/templates/gym/new_user.html:30 gym/views/export.py:60
 #: mailer/templates/mailer/gym/form.html:4
 #: mailer/templates/mailer/gym/overview.html:4
@@ -140,8 +140,8 @@ msgstr "Připomenutí tréninku"
 msgid "Other settings"
 msgstr "Další nastavení"
 
-#: core/forms.py:174 core/views/user.py:624 core/views/user.py:639
-#: core/views/user.py:651 gym/forms.py:73 manager/templates/log/add.html:65
+#: core/forms.py:174 core/views/user.py:623 core/views/user.py:638
+#: core/views/user.py:650 gym/forms.py:73 manager/templates/log/add.html:65
 #: manager/templates/set/add.html:70 manager/views/workout.py:203
 #: utils/generic_views.py:143
 msgid "Save"
@@ -164,26 +164,25 @@ msgstr "Heslo"
 msgid "Please enter your current password."
 msgstr "Zadejte prosím vaše současné heslo."
 
-#: core/forms.py:242 core/templates/language/view.html:73
-#: core/templates/license/list.html:19 core/templates/misc/license/list.html:22
-#: core/templates/repetition_unit/list.html:20
-#: core/templates/tags/render_day.html:45
-#: core/templates/tags/render_day.html:81 core/templates/user/overview.html:217
-#: core/templates/weight_unit/list.html:20
-#: exercises/templates/categories/admin-overview.html:19
-#: exercises/templates/equipment/admin-overview.html:19
-#: exercises/templates/muscles/admin-overview.html:19
-#: gym/templates/admin_notes/list.html:40
-#: gym/templates/contract_option/list.html:41
-#: gym/templates/contract_type/list.html:41 gym/templates/document/list.html:46
-#: gym/templates/gym/list.html:22 manager/templates/calendar/day.html:73
-#: manager/templates/calendar/month.html:89
-#: manager/templates/calendar/partial_overview_table.html:23
-#: manager/templates/schedule/view.html:122
-#: manager/templates/workout/view.html:188
-#: nutrition/templates/ingredient/view.html:166
+#: core/forms.py:242 core/templates/language/view.html:70
+#: core/templates/license/list.html:21
+#: core/templates/repetition_unit/list.html:22
+#: core/templates/user/overview.html:233
+#: core/templates/weight_unit/list.html:22
+#: exercises/templates/categories/admin-overview.html:21
+#: exercises/templates/equipment/admin-overview.html:21
+#: exercises/templates/muscles/admin-overview.html:20
+#: gym/templates/admin_notes/list.html:37
+#: gym/templates/contract_option/list.html:35
+#: gym/templates/contract_type/list.html:36 gym/templates/document/list.html:46
+#: gym/templates/gym/list.html:23 manager/templates/calendar/day.html:73
+#: manager/templates/calendar/month.html:88
+#: manager/templates/calendar/partial_overview_table.html:22
+#: manager/templates/schedule/view.html:324
+#: manager/templates/workout/view.html:202
+#: nutrition/templates/ingredient/view.html:168
 #: nutrition/templates/ingredient/view.html:215
-#: nutrition/templates/units/list.html:22
+#: nutrition/templates/units/list.html:25
 msgid "Delete"
 msgstr "Smazat"
 
@@ -195,9 +194,9 @@ msgstr "Chybné heslo"
 msgid "The form is secured with reCAPTCHA"
 msgstr "Zabezpečeno službou reCAPTCHA"
 
-#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:285
-#: core/templates/navigation.html:297 core/templates/template.html:149
-#: core/templates/user/login.html:20 core/views/user.py:298
+#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:284
+#: core/templates/navigation.html:296 core/templates/template.html:151
+#: core/templates/user/login.html:20 core/views/user.py:297
 #: software/templates/features.html:87 software/templates/features.html:422
 msgid "Register"
 msgstr "Registrace"
@@ -450,18 +449,18 @@ msgid "The sum of all hours has to be 24"
 msgstr "Součet všech hodin musí být 24"
 
 #: core/models/rep_unit.py:36 core/models/weight_unit.py:36
-#: core/templates/user/overview.html:262 core/views/user.py:599
+#: core/templates/user/overview.html:280 core/views/user.py:598
 #: exercises/models/category.py:29 exercises/models/equipment.py:29
 #: exercises/models/exercise.py:59 exercises/models/muscle.py:36
 #: gym/models/contract.py:52 gym/models/contract.py:103 gym/models/gym.py:46
 #: gym/models/user_document.py:84 gym/templates/contract/view.html:50
-#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:96
+#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:108
 #: gym/views/gym.py:158 manager/models/schedule.py:55
 #: manager/models/workout.py:57 measurements/models/category.py:36
 #: nutrition/models/ingredient.py:111
-#: nutrition/models/ingredient_category.py:27 nutrition/models/meal.py:67
+#: nutrition/models/ingredient_category.py:27 nutrition/models/meal.py:65
 #: nutrition/models/weight_unit.py:38
-#: nutrition/templates/ingredient/view.html:152
+#: nutrition/templates/ingredient/view.html:151
 msgid "Name"
 msgstr "Název"
 
@@ -513,7 +512,7 @@ msgstr ""
 msgid "Back to \"%(target)s\""
 msgstr "Zpět na \"%(target)s\""
 
-#: core/templates/delete.html:15
+#: core/templates/delete.html:4
 msgid "Are you sure you want to delete this? This action cannot be undone."
 msgstr "Jsi si jistý, že to chceš smazat? Tuhle akci už nejde pak odvolat."
 
@@ -565,7 +564,7 @@ msgstr "Pro potvrzení e-mailu klikněte na následující odkaz: %(link)s"
 msgid "Dashboard"
 msgstr "Nástěnka"
 
-#: core/templates/language/overview.html:4 core/templates/navigation.html:345
+#: core/templates/language/overview.html:4 core/templates/navigation.html:344
 msgid "Languages"
 msgstr "Jazyky"
 
@@ -575,82 +574,72 @@ msgstr "Nic nenalezeno."
 
 #: core/templates/language/overview.html:22
 #: manager/templates/calendar/month.html:132
-#: manager/templates/schedule/overview.html:28
-#: manager/templates/schedule/view.html:144
+#: manager/templates/schedule/view.html:154
 #: manager/templates/workout/overview.html:28
 #: nutrition/templates/ingredient/overview.html:38
 msgid "Add one now."
 msgstr "Přidat nyní."
 
-#: core/templates/language/overview.html:35 core/templates/license/list.html:40
-#: core/templates/misc/license/list.html:43
-#: core/templates/repetition_unit/list.html:43
-#: core/templates/user/overview.html:326 core/templates/user/overview.html:365
-#: core/templates/user/overview.html:401
-#: core/templates/weight_unit/list.html:43 core/views/languages.py:74
+#: core/templates/language/overview.html:34 core/templates/license/list.html:43
+#: core/templates/repetition_unit/list.html:46
+#: core/templates/user/overview.html:344 core/templates/user/overview.html:384
+#: core/templates/user/overview.html:422
+#: core/templates/weight_unit/list.html:46 core/views/languages.py:74
 #: core/views/license.py:66 core/views/repetition_units.py:66
 #: core/views/weight_units.py:66
-#: exercises/templates/categories/admin-overview.html:38
-#: gallery/views/images.py:63 gym/templates/admin_notes/list.html:67
-#: gym/templates/contract/list.html:73
-#: gym/templates/contract_option/list.html:72
-#: gym/templates/contract_type/list.html:72 gym/templates/document/list.html:79
-#: gym/templates/gym/member_list.html:211
-#: gym/templates/gym/member_list.html:244
-#: gym/templates/gym/member_list.html:281
+#: exercises/templates/categories/admin-overview.html:40
+#: exercises/templates/equipment/admin-overview.html:39
+#: exercises/templates/muscles/admin-overview.html:40
+#: gallery/views/images.py:63 gym/templates/admin_notes/list.html:64
+#: gym/templates/contract/list.html:69
+#: gym/templates/contract_option/list.html:65
+#: gym/templates/contract_type/list.html:66 gym/templates/document/list.html:78
+#: gym/templates/gym/member_list.html:228
+#: gym/templates/gym/member_list.html:264
+#: gym/templates/gym/member_list.html:303
 #: mailer/templates/mailer/gym/overview.html:43
+#: nutrition/templates/ingredient/overview.html:60
 msgid "Add"
 msgstr "Přidat"
 
 #: core/templates/language/view.html:61 core/templates/user/api_key.html:44
-#: core/templates/user/preferences.html:45 gym/models/contract.py:203
-#: gym/templates/contract/view.html:41 gym/templates/contract/view.html:106
-#: gym/templates/gym/member_list.html:248
-#: manager/templates/schedule/view.html:285
-#: manager/templates/workout/view.html:163
-#: nutrition/templates/ingredient/view.html:202
+#: core/templates/user/preferences.html:50 gym/models/contract.py:203
+#: gym/templates/contract/view.html:41 gym/templates/gym/member_list.html:270
+#: manager/templates/schedule/view.html:304
+#: manager/templates/workout/view.html:177
+#: nutrition/templates/ingredient/view.html:206
 msgid "Options"
 msgstr "Nastavení"
 
-#: core/templates/license/list.html:4 core/templates/misc/license/list.html:4
+#: core/templates/license/list.html:4
 msgid "License list"
 msgstr "Seznam licencí"
 
-#: core/templates/license/list.html:26 core/templates/misc/license/list.html:30
-#: core/templates/repetition_unit/list.html:28
+#: core/templates/license/list.html:30
+#: core/templates/repetition_unit/list.html:32
 #: core/templates/user/overview.html:104 core/templates/user/overview.html:136
-#: core/templates/user/overview.html:185 core/templates/user/overview.html:347
-#: core/templates/user/overview.html:383 core/templates/user/overview.html:427
-#: core/templates/weight_unit/list.html:28
-#: exercises/templates/categories/admin-overview.html:26
-#: exercises/templates/equipment/admin-overview.html:26
-#: exercises/templates/muscles/admin-overview.html:26
-#: gym/templates/admin_notes/list.html:52 gym/templates/contract/list.html:60
-#: gym/templates/contract_option/list.html:58
-#: gym/templates/contract_type/list.html:58 gym/templates/document/list.html:64
-#: gym/templates/gym/list.html:29 gym/templates/gym/member_list.html:229
-#: gym/templates/gym/member_list.html:262
-#: gym/templates/gym/member_list.html:299
+#: core/templates/user/overview.html:185 core/templates/user/overview.html:365
+#: core/templates/user/overview.html:404 core/templates/user/overview.html:448
+#: core/templates/weight_unit/list.html:32
+#: exercises/templates/categories/admin-overview.html:30
+#: exercises/templates/equipment/admin-overview.html:30
+#: exercises/templates/muscles/admin-overview.html:29
+#: gym/templates/admin_notes/list.html:50 gym/templates/contract/list.html:57
+#: gym/templates/contract_option/list.html:52
+#: gym/templates/contract_type/list.html:53 gym/templates/document/list.html:64
+#: gym/templates/gym/list.html:32 gym/templates/gym/member_list.html:248
+#: gym/templates/gym/member_list.html:284
+#: gym/templates/gym/member_list.html:321
 #: mailer/templates/mailer/gym/overview.html:30
-#: manager/templates/calendar/day.html:87
-#: nutrition/templates/units/list.html:29
+#: manager/templates/calendar/day.html:88
+#: nutrition/templates/units/list.html:34
 msgid "Nothing found"
 msgstr "Nic nenalezeno"
 
-#: core/templates/misc/about.html:4 core/templates/template.html:175
+#: core/templates/misc/about.html:4 core/templates/template.html:188
 msgid "Imprint"
 msgstr "Tiráž"
 
-#: core/templates/misc/license/list.html:47
-msgid ""
-"If a license has been localized, e.g. the Creative Commons\n"
-"            licenses for the different countries, add them as separate "
-"entries here."
-msgstr ""
-"Pokud je licence, například Creative Commons\n"
-"            přeložena do různých jazyků, přidejte je sem jako jednotlivé "
-"položky."
-
 #: core/templates/navigation.html:28 software/templates/features.html:437
 msgid "Training"
 msgstr "Trénink"
@@ -695,8 +684,8 @@ msgstr "Veřejné šablony"
 msgid "Exercises"
 msgstr "Cviky"
 
-#: core/templates/navigation.html:111 core/templates/navigation.html:184
-#: core/templates/navigation.html:340
+#: core/templates/navigation.html:111 core/templates/navigation.html:185
+#: core/templates/navigation.html:339
 msgid "Administration"
 msgstr "Administrace"
 
@@ -733,87 +722,87 @@ msgstr "Kalkulačka BMI"
 msgid "Daily calories calculator"
 msgstr "Kalkulačka denních kalorii"
 
-#: core/templates/navigation.html:179
+#: core/templates/navigation.html:180
 #: nutrition/templates/ingredient/overview.html:10
 msgid "Ingredient overview"
 msgstr "Přehled jídel"
 
-#: core/templates/navigation.html:187 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:189 nutrition/templates/units/list.html:6
 msgid "Ingredient weight units"
 msgstr "Jednotka váhy položek"
 
-#: core/templates/navigation.html:203 software/templates/features.html:442
+#: core/templates/navigation.html:205 software/templates/features.html:442
 msgid "Body weight"
 msgstr "Tělesná hmotnost"
 
-#: core/templates/navigation.html:210 core/templates/user/overview.html:114
+#: core/templates/navigation.html:212 core/templates/user/overview.html:114
 msgid "Weight overview"
 msgstr "Přehled váhy"
 
-#: core/templates/navigation.html:217 weight/views.py:65
+#: core/templates/navigation.html:216 weight/views.py:65
 msgid "Add weight entry"
 msgstr "Zaznamenat váhu"
 
-#: core/templates/navigation.html:231
+#: core/templates/navigation.html:230
 msgid "About this software"
 msgstr "O aplikaci"
 
-#: core/templates/navigation.html:237 software/templates/about_us.html:5
+#: core/templates/navigation.html:236 software/templates/about_us.html:5
 msgid "About us"
 msgstr "O nás"
 
-#: core/templates/navigation.html:243 software/templates/features.html:507
+#: core/templates/navigation.html:242 software/templates/features.html:507
 msgid "REST API"
 msgstr "REST API"
 
-#: core/templates/navigation.html:249 utils/models.py:45
+#: core/templates/navigation.html:248 utils/models.py:45
 msgid "License"
 msgstr "Licence"
 
-#: core/templates/navigation.html:255
+#: core/templates/navigation.html:254
 msgid "Developer documentation"
 msgstr "Dokumentace vývojáře"
 
-#: core/templates/navigation.html:262
+#: core/templates/navigation.html:261
 msgid "Get the code"
 msgstr "Získejte kód"
 
-#: core/templates/navigation.html:269 core/templates/template.html:214
+#: core/templates/navigation.html:268 core/templates/template.html:227
 #: software/templates/features.html:582
 msgid "Translate"
 msgstr "Překlad"
 
-#: core/templates/navigation.html:303 core/templates/user/login.html:28
+#: core/templates/navigation.html:302 core/templates/user/login.html:28
 msgid "Reset password"
 msgstr "Reset hesla"
 
-#: core/templates/navigation.html:321
+#: core/templates/navigation.html:320
 msgid "My preferences"
 msgstr "Má nastavení"
 
-#: core/templates/navigation.html:330
+#: core/templates/navigation.html:329
 msgid "Logout"
 msgstr "Odhlásit"
 
-#: core/templates/navigation.html:353
+#: core/templates/navigation.html:352
 msgid "Licenses"
 msgstr "Licence"
 
-#: core/templates/navigation.html:361
+#: core/templates/navigation.html:360
 #: core/templates/repetition_unit/list.html:4
 msgid "Repetition units"
 msgstr "Opakující jednotky"
 
-#: core/templates/navigation.html:369 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:368 core/templates/weight_unit/list.html:4
 #: nutrition/templates/ingredient/view.html:141
 msgid "Weight units"
 msgstr "Jednotka hmostnosti"
 
-#: core/templates/navigation.html:377 core/templates/user/list.html:4
+#: core/templates/navigation.html:376 core/templates/user/list.html:4
 msgid "User list"
 msgstr "Uživatelský seznam"
 
-#: core/templates/navigation.html:383
+#: core/templates/navigation.html:382
 msgid "Gyms"
 msgstr "Posilovny"
 
@@ -877,55 +866,30 @@ msgstr "předchozí"
 msgid "next"
 msgstr "další"
 
-#: core/templates/tags/render_day.html:34
-msgid "Add weight log"
-msgstr "Přidat záznam váhy"
-
-#: core/templates/tags/render_day.html:116
-msgid "Placeholder image for exercise"
+#: core/templates/tags/render_day.html:44
+#, fuzzy
+#| msgid "Placeholder image for exercise"
+msgid "Placeholder image for translation"
 msgstr "Ukázkový obrázek pro cvik"
 
-#: core/templates/tags/render_day.html:133
-msgid "This exercise has no repetitions."
-msgstr "Tento cvik je bez opakování."
-
-#: core/templates/tags/render_day.html:136
-msgid "Edit them now."
-msgstr "Upravit je teď."
-
-#: core/templates/tags/render_day.html:162
-msgid "Add exercises to this workout day"
-msgstr "Přidat k tomuto dni cviky"
-
-#: core/templates/tags/render_weight_log.html:17 manager/helpers.py:86
-#: manager/models/setting.py:72 manager/templates/set/formset.html:9
-msgid "Reps"
-msgstr "Opakování"
-
-#: core/templates/tags/render_weight_log.html:30 manager/forms.py:191
-#: manager/models/log.py:103 manager/models/setting.py:102
-#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
-msgid "RiR"
-msgstr "OvR"
-
-#: core/templates/template.html:122 manager/templates/calendar/month.html:138
-#: manager/templates/schedule/view.html:248
-#: manager/templates/schedule/view.html:269
-#: manager/templates/workout/view.html:84
-#: manager/templates/workout/view.html:137
+#: core/templates/template.html:124 manager/templates/calendar/month.html:138
+#: manager/templates/schedule/view.html:262
+#: manager/templates/schedule/view.html:287
+#: manager/templates/workout/view.html:89
+#: manager/templates/workout/view.html:149
 msgid "Close"
 msgstr "Zavřít"
 
-#: core/templates/template.html:138
+#: core/templates/template.html:140
 msgid ""
 "You are using a guest account, data entered will be deleted after a week."
 msgstr "Využíváte testovací účet. Data zde vložená budou po týdnu smazána."
 
-#: core/templates/template.html:143
+#: core/templates/template.html:145
 msgid "Create some demo entries"
 msgstr "Vytvořit nějaké testovací potraviny"
 
-#: core/templates/template.html:180 software/templates/features.html:547
+#: core/templates/template.html:193 software/templates/features.html:547
 #: software/templates/tos.html:7
 msgid "Terms of service"
 msgstr "Podmínky služby"
@@ -934,7 +898,7 @@ msgstr "Podmínky služby"
 msgid "Features"
 msgstr "Funkce"
 
-#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:54
+#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:59
 msgid "API key"
 msgstr "Klíč API"
 
@@ -978,17 +942,17 @@ msgstr "Vytvořit nový API klíč"
 msgid "Documentation"
 msgstr "Dokumentace"
 
-#: core/templates/user/delete_account.html:4
-#: core/templates/user/preferences.html:59
+#: core/templates/user/delete_account.html:3
+#: core/templates/user/preferences.html:62
 msgid "Delete account"
 msgstr "Smazání účtu"
 
-#: core/templates/user/delete_account.html:17
+#: core/templates/user/delete_account.html:9
 #: exercises/templates/history/overview.html:93
 msgid "Are you sure?"
 msgstr "Jste si jistý?"
 
-#: core/templates/user/delete_account.html:22
+#: core/templates/user/delete_account.html:14
 #, python-format
 msgid ""
 "This action will delete the user account \"%(username)s\".\n"
@@ -1010,22 +974,22 @@ msgstr "Zapomenuté heslo?"
 
 #: core/templates/user/overview.html:25 core/templates/user/overview.html:68
 #: core/templates/user/overview.html:112 core/templates/user/overview.html:144
-#: core/templates/user/overview.html:330 core/templates/user/overview.html:369
-#: core/templates/user/overview.html:405
+#: core/templates/user/overview.html:348 core/templates/user/overview.html:390
+#: core/templates/user/overview.html:426
 #, python-format
 msgid "last %(number)s"
 msgstr "poslední %(number)s"
 
 #: core/templates/user/overview.html:27 core/templates/user/overview.html:146
-#: core/templates/user/overview.html:325 core/templates/user/overview.html:364
-#: core/templates/user/overview.html:400 gym/templates/gym/member_list.html:210
-#: gym/templates/gym/member_list.html:243
-#: gym/templates/gym/member_list.html:280
+#: core/templates/user/overview.html:343 core/templates/user/overview.html:382
+#: core/templates/user/overview.html:421 gym/templates/gym/member_list.html:226
+#: gym/templates/gym/member_list.html:262
+#: gym/templates/gym/member_list.html:302
 msgid "Overview"
 msgstr "Přehled"
 
 #: core/templates/user/overview.html:28
-#: manager/templates/schedule/view.html:163
+#: manager/templates/schedule/view.html:172
 #: manager/templates/workout/overview.html:39 manager/views/schedule_step.py:60
 msgid "Add workout"
 msgstr "Přidat trénink"
@@ -1057,38 +1021,36 @@ msgstr "Popis"
 msgid "Number of logs (days)"
 msgstr "Počet záznamů (za den)"
 
-#: core/templates/user/overview.html:37 core/views/user.py:600
+#: core/templates/user/overview.html:37 core/views/user.py:599
 #: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:158
 msgid "Last activity"
 msgstr "Poslední aktivita"
 
 #: core/templates/user/overview.html:58
 #: manager/templates/calendar/month.html:128
-#: manager/templates/schedule/view.html:144
 #: manager/templates/workout/overview.html:28
 msgid "No workouts found."
 msgstr "Nenalezeny žádné tréninky."
 
 #: core/templates/user/overview.html:68 manager/forms.py:280
-#: manager/templates/workout/view.html:106
+#: manager/templates/workout/view.html:114
 msgid "Log"
 msgstr "Záznam"
 
 #: core/templates/user/overview.html:77 manager/models/session.py:83
-#: manager/templates/calendar/partial_overview_table.html:52
+#: manager/templates/calendar/partial_overview_table.html:54
 msgid "General impression"
 msgstr "Celkový dojem"
 
-#: core/templates/user/overview.html:78 core/templates/user/overview.html:369
+#: core/templates/user/overview.html:78 core/templates/user/overview.html:390
 #: manager/models/session.py:73
-#: manager/templates/calendar/partial_overview_table.html:56
-#: manager/templates/workout/log.html:89
+#: manager/templates/calendar/partial_overview_table.html:58
 msgid "Notes"
 msgstr "Poznámky"
 
 #: core/templates/user/overview.html:79
 #: exercises/templates/history/overview.html:30
-#: manager/templates/calendar/partial_overview_table.html:42
+#: manager/templates/calendar/partial_overview_table.html:44
 msgid "Time"
 msgstr "Čas"
 
@@ -1126,121 +1088,121 @@ msgstr "Tuky"
 msgid "kcal"
 msgstr "kcal"
 
-#: core/templates/user/overview.html:201 core/templates/user/overview.html:322
-#: core/templates/user/overview.html:361 core/templates/user/overview.html:397
-#: core/templates/user/overview.html:442 gym/templates/gym/list.html:42
-#: gym/templates/gym/member_list.html:84 gym/templates/gym/member_list.html:137
-#: gym/templates/gym/member_list.html:173
-#: gym/templates/gym/member_list.html:207
-#: gym/templates/gym/member_list.html:240
-#: gym/templates/gym/member_list.html:277
-#: manager/templates/schedule/view.html:100
+#: core/templates/user/overview.html:201 core/templates/user/overview.html:340
+#: core/templates/user/overview.html:379 core/templates/user/overview.html:418
+#: core/templates/user/overview.html:463 gym/templates/gym/list.html:45
+#: gym/templates/gym/member_list.html:91 gym/templates/gym/member_list.html:149
+#: gym/templates/gym/member_list.html:187
+#: gym/templates/gym/member_list.html:223
+#: gym/templates/gym/member_list.html:259
+#: gym/templates/gym/member_list.html:299
+#: manager/templates/schedule/view.html:99
 msgid "Actions"
 msgstr "Akce"
 
-#: core/templates/user/overview.html:207
+#: core/templates/user/overview.html:210
 msgid "Deactivate user"
 msgstr "Deaktivovat uživatele"
 
-#: core/templates/user/overview.html:209
+#: core/templates/user/overview.html:214
 msgid "Activate user"
 msgstr "Aktivovat uživatele"
 
-#: core/templates/user/overview.html:211
+#: core/templates/user/overview.html:223
 msgid "Reset user password"
 msgstr "Reset hesla"
 
-#: core/templates/user/overview.html:214 gym/templates/gym/member_list.html:30
+#: core/templates/user/overview.html:227 gym/templates/gym/member_list.html:30
 msgid "Roles"
 msgstr "Role"
 
-#: core/templates/user/overview.html:225
+#: core/templates/user/overview.html:243
 msgid "Password reset confirmation"
 msgstr "Potvrzení obnovy hesla"
 
-#: core/templates/user/overview.html:229
+#: core/templates/user/overview.html:247
 msgid "Do you really want to change this user&#39;s password?"
 msgstr "Opravdu chcete změnit těmto uživatelům&#39;s hesla?"
 
-#: core/templates/user/overview.html:232
+#: core/templates/user/overview.html:250
 #: exercises/templates/history/overview.html:106
 msgid "No"
 msgstr "Ne"
 
-#: core/templates/user/overview.html:233
+#: core/templates/user/overview.html:251
 #: exercises/templates/history/overview.html:99
 msgid "Yes"
 msgstr "Ano"
 
-#: core/templates/user/overview.html:254 gym/templates/gym/member_list.html:93
+#: core/templates/user/overview.html:272 gym/templates/gym/member_list.html:105
 msgid "Details"
 msgstr "Podrobnosti"
 
-#: core/templates/user/overview.html:258 gym/views/export.py:57
-#: manager/helpers.py:86 manager/templates/schedule/view.html:98
+#: core/templates/user/overview.html:276 gym/views/export.py:57
+#: manager/helpers.py:86 manager/templates/schedule/view.html:97
 msgid "Nr."
 msgstr "Č."
 
-#: core/templates/user/overview.html:280 gym/models/contract.py:287
+#: core/templates/user/overview.html:298 gym/models/contract.py:287
 #: gym/models/gym.py:50 gym/templates/contract/view.html:75
-#: gym/templates/gym/member_list.html:100 gym/views/export.py:68
+#: gym/templates/gym/member_list.html:112 gym/views/export.py:68
 msgid "Phone"
 msgstr "Telefon"
 
-#: core/templates/user/overview.html:284 gym/templates/contract/view.html:87
-#: gym/templates/gym/member_list.html:118
+#: core/templates/user/overview.html:302 gym/templates/contract/view.html:87
+#: gym/templates/gym/member_list.html:130
 msgid "Address"
 msgstr "Adresa"
 
-#: core/templates/user/overview.html:295
+#: core/templates/user/overview.html:313
 msgid "Registered"
 msgstr "Registrován"
 
-#: core/templates/user/overview.html:299
+#: core/templates/user/overview.html:317
 msgid "Last login"
 msgstr "Poslední příhlášení"
 
-#: core/templates/user/overview.html:304
+#: core/templates/user/overview.html:322
 msgid "Status"
 msgstr "Stavy"
 
-#: core/templates/user/overview.html:307
+#: core/templates/user/overview.html:325
 msgid "Active"
 msgstr "Aktivní"
 
-#: core/templates/user/overview.html:309
+#: core/templates/user/overview.html:327
 msgid "Inactive"
 msgstr "Neaktivní"
 
-#: core/templates/user/overview.html:330 gym/templates/contract/list.html:4
-#: gym/templates/gym/member_list.html:202
+#: core/templates/user/overview.html:348 gym/templates/contract/list.html:4
+#: gym/templates/gym/member_list.html:218
 msgid "Contracts"
 msgstr "Zakázky"
 
-#: core/templates/user/overview.html:405 gym/templates/document/list.html:4
+#: core/templates/user/overview.html:426 gym/templates/document/list.html:4
 msgid "Documents"
 msgstr "Dokumenty"
 
-#: core/templates/user/overview.html:412 gym/templates/document/list.html:32
-#: manager/forms.py:292 manager/templates/workout/view.html:132
+#: core/templates/user/overview.html:433 gym/templates/document/list.html:33
+#: manager/forms.py:292 manager/templates/workout/view.html:143
 msgid "Download"
 msgstr "Stáhnout"
 
-#: core/templates/user/overview.html:450 gym/views/admin_config.py:44
+#: core/templates/user/overview.html:474 gym/views/admin_config.py:44
 #: gym/views/admin_config.py:58 gym/views/user_config.py:46
 msgid "Configuration"
 msgstr "Konfigurace"
 
-#: core/templates/user/overview.html:453 gym/models/user_config.py:92
+#: core/templates/user/overview.html:477 gym/models/user_config.py:92
 msgid "Include in inactive overview"
 msgstr "Zahrnout v přehledu neaktivních"
 
-#: core/templates/user/overview.html:486
+#: core/templates/user/overview.html:510
 #, python-format
 msgid "Admin login is only available for users in %(gym_name)s"
 msgstr "Admin přihlášení je povoleno pouze pro uživatele v %(gym_name)s"
 
-#: core/templates/user/overview.html:490
+#: core/templates/user/overview.html:514
 msgid "Log in as this user"
 msgstr "Přihlásit se jako tento uživatel"
 
@@ -1260,19 +1222,19 @@ msgstr "Neověřený email"
 msgid "Send verification email"
 msgstr "Odeslat ověřovací email"
 
-#: core/templates/user/preferences.html:30
+#: core/templates/user/preferences.html:31
 msgid "You need to verify your email to contribute exercises"
 msgstr "Abyste mohli přidávat cvičení, musíte ověřit svůj email"
 
-#: core/templates/user/preferences.html:50 core/views/user.py:611
+#: core/templates/user/preferences.html:55 core/views/user.py:610
 msgid "Change password"
 msgstr "Změna hesla"
 
-#: core/templatetags/wger_extras.py:205 i18n.tpl:37
+#: core/templatetags/wger_extras.py:197 i18n.tpl:37
 msgid "kg"
 msgstr "kg"
 
-#: core/templatetags/wger_extras.py:207
+#: core/templatetags/wger_extras.py:199
 #: nutrition/templates/ingredient/view.html:60
 #: nutrition/templates/ingredient/view.html:66
 #: nutrition/templates/ingredient/view.html:73
@@ -1284,11 +1246,11 @@ msgctxt "weight unit, i.e. grams"
 msgid "g"
 msgstr "g"
 
-#: core/templatetags/wger_extras.py:210 i18n.tpl:38
+#: core/templatetags/wger_extras.py:202 i18n.tpl:38
 msgid "lb"
 msgstr "lb"
 
-#: core/templatetags/wger_extras.py:212
+#: core/templatetags/wger_extras.py:204
 msgctxt "weight unit, i.e. ounces"
 msgid "oz"
 msgstr "oz"
@@ -1315,13 +1277,13 @@ msgid "Delete {0}?"
 msgstr "Smazat {0}?"
 
 #: core/views/languages.py:111 core/views/license.py:85
-#: core/views/repetition_units.py:86 core/views/user.py:474
+#: core/views/repetition_units.py:86 core/views/user.py:473
 #: core/views/weight_units.py:86 exercises/views/categories.py:98
 #: exercises/views/equipment.py:81 exercises/views/muscles.py:87
 #: gym/views/admin_notes.py:161 gym/views/config.py:68
 #: gym/views/contract.py:186 gym/views/contract_option.py:123
 #: gym/views/contract_type.py:123 gym/views/document.py:171
-#: gym/views/gym.py:463 manager/views/day.py:100 manager/views/schedule.py:333
+#: gym/views/gym.py:463 manager/views/day.py:96 manager/views/schedule.py:333
 #: manager/views/workout.py:267 nutrition/views/ingredient.py:145
 #: nutrition/views/unit.py:143
 #, python-brace-format
@@ -1350,48 +1312,48 @@ msgstr "Zaslat"
 msgid "Your feedback was successfully sent. Thank you!"
 msgstr "Vaše zpětná vazba byla zaslána. Děkujeme!"
 
-#: core/views/user.py:156
+#: core/views/user.py:155
 #, python-brace-format
 msgid "Account \"{0}\" was successfully deleted"
 msgstr "Účet \"{0}\" byl smazán"
 
-#: core/views/user.py:292
+#: core/views/user.py:291
 msgid "You were successfully registered"
 msgstr "Byl jste úspěšně zaregistrován"
 
-#: core/views/user.py:351
+#: core/views/user.py:350
 msgid "Settings successfully updated"
 msgstr "Nastavení bylo aktualizováno"
 
-#: core/views/user.py:390
+#: core/views/user.py:389
 msgid "The user was successfully deactivated"
 msgstr "Uživatel byl deaktivován"
 
-#: core/views/user.py:427
+#: core/views/user.py:426
 msgid "The user was successfully activated"
 msgstr "Uživatel byl aktivován"
 
-#: core/views/user.py:442
+#: core/views/user.py:441
 msgid "Edit user"
 msgstr "Upravit uživatele"
 
-#: core/views/user.py:597 gym/templates/gym/member_list.html:26
+#: core/views/user.py:596 gym/templates/gym/member_list.html:26
 #: gym/views/gym.py:158
 msgid "ID"
 msgstr "ID"
 
-#: core/views/user.py:598 gym/forms.py:95 gym/templates/contract/view.html:55
+#: core/views/user.py:597 gym/forms.py:95 gym/templates/contract/view.html:55
 #: gym/templates/gym/member_list.html:27 gym/views/export.py:59
 #: gym/views/gym.py:158 gym/views/gym.py:217
 msgid "Username"
 msgstr "Uživatel"
 
-#: core/views/user.py:601 gym/templates/gym/new_user.html:34
+#: core/views/user.py:600 gym/templates/gym/new_user.html:34
 #: gym/views/export.py:58 gym/views/gym.py:217
 msgid "Gym"
 msgstr "Posilovna"
 
-#: core/views/user.py:660
+#: core/views/user.py:659
 #, python-format
 msgid "A verification email was sent to %(email)s"
 msgstr "Ověřovací e-mail byl zaslán na %(email)s"
@@ -1544,11 +1506,6 @@ msgstr "Kodek, dlouhý název"
 msgid "Equipment list"
 msgstr "Seznam nářadí"
 
-#: exercises/templates/equipment/admin-overview.html:39
-#: exercises/views/equipment.py:92
-msgid "Add new equipment"
-msgstr "Přidat nové nářadí"
-
 #: exercises/templates/history/overview.html:11
 msgid "Exercise admin history"
 msgstr "Administrativní historie cvičení"
@@ -1596,11 +1553,6 @@ msgstr "Zvrátit změny"
 msgid "Muscle overview"
 msgstr "Přehled svalů"
 
-#: exercises/templates/muscles/admin-overview.html:38
-#: exercises/views/muscles.py:68
-msgid "Add muscle"
-msgstr "Přidat sval"
-
 #: exercises/views/categories.py:72
 msgid "Add category"
 msgstr "Přidat kategorie"
@@ -1609,6 +1561,10 @@ msgstr "Přidat kategorie"
 msgid "This will also delete all exercises in this category."
 msgstr "Budou také smazány všechny cviky v této kategorii."
 
+#: exercises/views/equipment.py:92
+msgid "Add new equipment"
+msgstr "Přidat nové nářadí"
+
 #: exercises/views/equipment.py:104 exercises/views/equipment.py:115
 msgid "Delete equipment?"
 msgstr "Smazat nářadí?"
@@ -1617,6 +1573,10 @@ msgstr "Smazat nářadí?"
 msgid "This will delete the exercise from all workouts."
 msgstr "To smaže všechny cviky ze všech tréninků."
 
+#: exercises/views/muscles.py:68
+msgid "Add muscle"
+msgstr "Přidat sval"
+
 #: gallery/templates/images/overview.html:62
 msgid "Add image"
 msgstr "Přidat obrázek"
@@ -1703,7 +1663,7 @@ msgid "Contract is active"
 msgstr "Zakázka je aktivní"
 
 #: gym/models/contract.py:237 gym/templates/contract/view.html:69
-#: manager/models/schedule.py:61 manager/templates/schedule/view.html:67
+#: manager/models/schedule.py:61 manager/templates/schedule/view.html:66
 msgid "Start date"
 msgstr "Datum začátku"
 
@@ -1739,7 +1699,7 @@ msgstr "Admin: může spravovat uživatelé posilovny"
 msgid "Admin: can administrate the different gyms"
 msgstr "Admin: může spravovat rozdílné posilovny"
 
-#: gym/models/gym.py:65 gym/templates/gym/member_list.html:114
+#: gym/models/gym.py:65 gym/templates/gym/member_list.html:126
 msgid "Owner"
 msgstr "Zákazník"
 
@@ -1751,7 +1711,7 @@ msgstr ""
 "Počet týdnů od posledního přihlášení uživatele, kdy bude považován za "
 "neaktivního"
 
-#: gym/models/gym_config.py:56 gym/templates/gym/member_list.html:152
+#: gym/models/gym_config.py:56 gym/templates/gym/member_list.html:166
 msgid "Show name in header"
 msgstr "Zobrazit jméno v hlavičce"
 
@@ -1764,7 +1724,7 @@ msgstr "Zobrazit název tělocvičny v hlavičce stránky"
 msgid "Configuration for {self.gym.name}"
 msgstr "Nastavení pro {self.gym.name}"
 
-#: gym/models/user_config.py:65 gym/templates/gym/member_list.html:184
+#: gym/models/user_config.py:65 gym/templates/gym/member_list.html:200
 msgid "Overview of inactive members"
 msgstr "Přehled neaktivních uživatelů"
 
@@ -1788,7 +1748,7 @@ msgstr "Bude použit název souboru, pokud neuvedete jinak"
 msgid "User notes"
 msgstr "Uživatelské poznámky"
 
-#: gym/templates/contract/list.html:36
+#: gym/templates/contract/list.html:34
 msgid "Show"
 msgstr "Zobrazit"
 
@@ -1816,11 +1776,11 @@ msgstr ""
 msgid "Gym list"
 msgstr "Seznam posiloven"
 
-#: gym/templates/gym/list.html:50
+#: gym/templates/gym/list.html:53
 msgid "Global gym configuration"
 msgstr "Základní nastavení posilovny"
 
-#: gym/templates/gym/list.html:67 gym/views/gym.py:171
+#: gym/templates/gym/list.html:69 gym/views/gym.py:171
 msgid "Add new gym"
 msgstr "Přidat novou posilovnu"
 
@@ -1832,43 +1792,43 @@ msgstr "Administrátoři a trenéři"
 msgid "Gym manager"
 msgstr "Vedoucí posilovny"
 
-#: gym/templates/gym/member_list.html:69
+#: gym/templates/gym/member_list.html:76
 msgid "This gym has no administrators or trainers"
 msgstr "Posilovna nemá administrátory nebo trénéry"
 
-#: gym/templates/gym/member_list.html:88
+#: gym/templates/gym/member_list.html:98
 msgid "Export"
 msgstr "Export"
 
-#: gym/templates/gym/member_list.html:125
+#: gym/templates/gym/member_list.html:137
 msgid "Members"
 msgstr "Členové"
 
-#: gym/templates/gym/member_list.html:145
+#: gym/templates/gym/member_list.html:159
 msgid "Gym configuration"
 msgstr "Nastavení posilovny"
 
-#: gym/templates/gym/member_list.html:148
+#: gym/templates/gym/member_list.html:162
 msgid "Inactive members"
 msgstr "Neaktivní čleonové"
 
-#: gym/templates/gym/member_list.html:149
+#: gym/templates/gym/member_list.html:163
 msgid "weeks"
 msgstr "výkendů"
 
-#: gym/templates/gym/member_list.html:181
+#: gym/templates/gym/member_list.html:197
 msgid "My configuration"
 msgstr "Má nastavení"
 
-#: gym/templates/gym/member_list.html:215
+#: gym/templates/gym/member_list.html:234
 msgid "Types"
 msgstr "Typy"
 
-#: gym/templates/gym/member_list.html:285
+#: gym/templates/gym/member_list.html:307
 msgid "Emails"
 msgstr "Emaily"
 
-#: gym/templates/gym/member_list.html:315
+#: gym/templates/gym/member_list.html:336
 msgid "Add member"
 msgstr "Přidat uživatele"
 
@@ -2164,28 +2124,38 @@ msgstr "Také hledat názvy v angličtině"
 msgid "Unit"
 msgstr "Jednotka"
 
+#: manager/forms.py:191 manager/models/log.py:103 manager/models/setting.py:102
+#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
+msgid "RiR"
+msgstr "OvR"
+
 #: manager/forms.py:279
 msgid "Type"
 msgstr "Typ"
 
-#: manager/forms.py:280 manager/templates/workout/view.html:113
+#: manager/forms.py:280 manager/templates/workout/view.html:122
 msgid "Table"
 msgstr "Tabulka"
 
-#: manager/forms.py:282 manager/templates/workout/view.html:119
+#: manager/forms.py:282 manager/templates/workout/view.html:129
 msgid "with images"
 msgstr "s obrázky"
 
-#: manager/forms.py:283 manager/templates/workout/view.html:125
+#: manager/forms.py:283 manager/templates/workout/view.html:136
 msgid "with comments"
 msgstr "s komentáři"
 
+#: manager/helpers.py:86 manager/models/setting.py:72
+#: manager/templates/set/formset.html:9
+msgid "Reps"
+msgstr "Opakování"
+
 #: manager/management/commands/email-reminders.py:121
 msgid "Workout will expire soon"
 msgstr "Trénink bude brzy expirovat"
 
 #: manager/models/day.py:34 manager/models/log.py:58
-#: manager/models/session.py:60 manager/templates/schedule/view.html:102
+#: manager/models/session.py:60 manager/templates/schedule/view.html:101
 #: manager/templates/workout/view.html:9 manager/templates/workout/view.html:17
 #: manager/views/pdf.py:85 manager/views/pdf.py:161
 #: manager/views/schedule.py:151 manager/views/schedule.py:221
@@ -2208,7 +2178,7 @@ msgstr "Dny"
 msgid "Name or short description of the schedule. For example 'Program XYZ'."
 msgstr "Jméno, nebo krátký popis plánu. Například 'Program XYZ'."
 
-#: manager/models/schedule.py:65 manager/templates/schedule/view.html:71
+#: manager/models/schedule.py:65 manager/templates/schedule/view.html:70
 msgid "Schedule active"
 msgstr "Rozvrh je aktivní"
 
@@ -2222,7 +2192,7 @@ msgstr ""
 "(bude zobrazen např. na nástěnce). Všechny ostatní rozvrhy budou označeny "
 "jako neaktivní"
 
-#: manager/models/schedule.py:77 manager/templates/schedule/view.html:81
+#: manager/models/schedule.py:77 manager/templates/schedule/view.html:80
 msgid "Is a loop"
 msgstr "Opakující se"
 
@@ -2243,7 +2213,7 @@ msgid "The duration in weeks"
 msgstr "Trvání v týdnech"
 
 #: manager/models/schedule_step.py:64 manager/models/set.py:53
-#: manager/models/setting.py:113 nutrition/models/meal.py:55
+#: manager/models/setting.py:113 nutrition/models/meal.py:53
 #: nutrition/models/meal_item.py:66
 msgid "Order"
 msgstr "Řazení"
@@ -2384,7 +2354,7 @@ msgstr "Záznam přehledu"
 msgid "Workout session"
 msgstr "Tréninková relace"
 
-#: manager/templates/calendar/partial_overview_table.html:27
+#: manager/templates/calendar/partial_overview_table.html:26
 msgid "Delete with logs"
 msgstr "Smazat se záznamy"
 
@@ -2407,21 +2377,27 @@ msgstr ""
 "vytvořeny pokud již jeden z nich není dostupný pro dané datum. Pokud\n"
 "ano, můžete je jednoduše upravovat. Hmotnosti závaží jsou vždy přidány."
 
-#: manager/templates/schedule/overview.html:5
+#: manager/templates/schedule/overview.html:4
 msgid "Your schedules"
 msgstr "Tvé rozvrhy"
 
 #: manager/templates/schedule/overview.html:19
-#: manager/templates/schedule/view.html:131
-#: manager/templates/schedule/view.html:183
+#: manager/templates/schedule/view.html:143
+#: manager/templates/schedule/view.html:193
 #: manager/templates/workout/overview.html:16
 msgid "active"
 msgstr "aktivní"
 
-#: manager/templates/schedule/overview.html:28
+#: manager/templates/schedule/overview.html:27
 msgid "No schedules found."
 msgstr "Nenalezeny žádné rozvrhy."
 
+#: manager/templates/schedule/overview.html:28
+#, fuzzy
+#| msgid "Add one now."
+msgid "Add one now"
+msgstr "Přidat nyní."
+
 #: manager/templates/schedule/overview.html:36
 msgid ""
 "Schedules are collections of workouts that you do in\n"
@@ -2431,19 +2407,27 @@ msgstr ""
 "        v posloupnosti."
 
 #: manager/templates/schedule/overview.html:39
+#, fuzzy
+#| msgid ""
+#| "You can indicate how long you want to do each workout\n"
+#| "        before jumping to the next. It is also possible to create a loop, "
+#| "so you\n"
+#| "        always do the same workouts in succession, e.g. A > B > C > A > B "
+#| "> C and so on."
 msgid ""
 "You can indicate how long you want to do each workout\n"
 "        before jumping to the next. It is also possible to create a loop, so "
 "you\n"
 "        always do the same workouts in succession, e.g. A > B > C > A > B > "
-"C and so on."
+"C and so\n"
+"        on."
 msgstr ""
 "Můžete uvést, jak dlouho chcete aby trval váš trénink\n"
 "        před přechodem na další. Můžete také vytvořit opakování, takže\n"
 "        vždy budete provádět stejné tréninky za sebou, např. A > B > C > A > "
 "B > C a tak dále."
 
-#: manager/templates/schedule/overview.html:43
+#: manager/templates/schedule/overview.html:44
 msgid ""
 "The currently active schedule will remain active (and be\n"
 "        shown e.g. in your dashboard) till it reaches the last workout or "
@@ -2462,7 +2446,7 @@ msgstr "Přidat rozvrh"
 msgid "Schedule"
 msgstr "Rozvrh"
 
-#: manager/templates/schedule/view.html:85
+#: manager/templates/schedule/view.html:84
 msgid ""
 "This schedule is a loop and will go through the workouts above till you "
 "deactivate it"
@@ -2470,19 +2454,19 @@ msgstr ""
 "Tento rozvrh je opakujicí se a bude procházet výše uvedené tréninky, pokud "
 "jej nevypnete"
 
-#: manager/templates/schedule/view.html:103
+#: manager/templates/schedule/view.html:102
 msgid "Weeks"
 msgstr "Týdny"
 
-#: manager/templates/schedule/view.html:115
+#: manager/templates/schedule/view.html:114
 msgid "Move me"
 msgstr "Přesuň mě"
 
-#: manager/templates/schedule/view.html:156
+#: manager/templates/schedule/view.html:168
 msgid "Start schedule"
 msgstr "Začít rozvrh"
 
-#: manager/templates/schedule/view.html:187
+#: manager/templates/schedule/view.html:197
 #, python-format
 msgid ""
 "%(weeks)s Week\n"
@@ -2503,11 +2487,11 @@ msgstr[3] ""
 "%(weeks)s týdnů\n"
 "                                "
 
-#: manager/templates/schedule/view.html:221
+#: manager/templates/schedule/view.html:231
 msgid "Adding workouts"
 msgstr "Přidat tréninky"
 
-#: manager/templates/schedule/view.html:223
+#: manager/templates/schedule/view.html:233
 msgid ""
 "Add as many workouts to the schedule as you want. You can\n"
 "            edit the order by dragging and dropping them. It's also possible "
@@ -2519,27 +2503,35 @@ msgstr ""
 "trénink více\n"
 "            než jednou."
 
-#: manager/templates/schedule/view.html:232
-#: manager/templates/schedule/view.html:243
-#: manager/templates/schedule/view.html:290
+#: manager/templates/schedule/view.html:242
+#: manager/templates/schedule/view.html:256
+#: manager/templates/schedule/view.html:310
 #: manager/templates/workout/view.html:69
-#: manager/templates/workout/view.html:79
-#: manager/templates/workout/view.html:178
+#: manager/templates/workout/view.html:83
+#: manager/templates/workout/view.html:192
 msgid "Export calendar file"
 msgstr "Exportovat kalendářový soubor"
 
-#: manager/templates/schedule/view.html:236
+#: manager/templates/schedule/view.html:248
 msgid "Export this schedule as a calendar file."
 msgstr "Exportovat rozvrh jako kalendářový soubor."
 
-#: manager/templates/schedule/view.html:237
-#: manager/templates/workout/view.html:74
+#: manager/templates/schedule/view.html:249
+#: manager/templates/workout/view.html:76
+#, fuzzy
+#| msgid ""
+#| "You can then import the file it into your calendar\n"
+#| "                        application for example google calendar, outlook "
+#| "or iCal. This will create\n"
+#| "                        an appointment for each training day with the "
+#| "appropriate exercises."
 msgid ""
 "You can then import the file it into your calendar\n"
 "                        application for example google calendar, outlook or "
 "iCal. This will create\n"
 "                        an appointment for each training day with the "
-"appropriate exercises."
+"appropriate\n"
+"                        exercises."
 msgstr ""
 "Soubor můžete importovat do vašeho kalendáře,\n"
 "                        například do Kalendáře Google, Outlooku nebo iCal. "
@@ -2547,21 +2539,13 @@ msgstr ""
 "                        tím událost pro každý tréninkový den s "
 "odpovídajícími cvičeními."
 
-#: manager/templates/schedule/view.html:258
-#: manager/templates/schedule/view.html:294
-#: manager/templates/workout/view.html:94
-#: manager/templates/workout/view.html:174
+#: manager/templates/schedule/view.html:272
+#: manager/templates/schedule/view.html:315
+#: manager/templates/workout/view.html:99
+#: manager/templates/workout/view.html:188
 msgid "Download as PDF"
 msgstr "Stáhnout jako PDF"
 
-#: manager/templates/schedule/view.html:299
-msgid "Edit schedule"
-msgstr "Upravit rozvrh"
-
-#: manager/templates/schedule/view.html:304
-msgid "Delete schedule"
-msgstr "Smazat rozvrh"
-
 #: manager/templates/set/add.html:9
 #, python-format
 msgid "Add exercises to day \"%(day_name)s\""
@@ -2640,55 +2624,6 @@ msgid ""
 msgstr ""
 "Pravidelná upozornění vám budou zasílána, dokud nezadáte aktuální hmotnost."
 
-#: manager/templates/workout/log.html:10 manager/templates/workout/log.html:11
-msgid "Weight log"
-msgstr "Záznam váhy"
-
-#: manager/templates/workout/log.html:29
-msgid "Weight log for workout"
-msgstr "Záznam váhy pro trénink"
-
-#: manager/templates/workout/log.html:49
-msgid "Add weight log to this day"
-msgstr "Přidejte záznam váhy pro tento den"
-
-#: manager/templates/workout/log.html:69
-msgid "No weight entries here."
-msgstr "Nebyla zde vložena váha."
-
-#: manager/templates/workout/log.html:77
-msgid "No exercises for this day."
-msgstr "Pro tento den nejsou žádné cviky."
-
-#: manager/templates/workout/log.html:90
-msgid ""
-"This page shows the weight logs belonging to this workout\n"
-"only. Click on an exercise to see all the historical data for\n"
-"it."
-msgstr ""
-"Tato stránka zobrazuje pouze záznamy váhy, které patří k tomuto tréninku.\n"
-"Pokud chcete vidět všechny záznamy, musíte kliknout na konkrétní cvik."
-
-#: manager/templates/workout/log.html:94
-msgid ""
-"If on a single day there is more than one entry with the\n"
-"same number of repetitions, but different weights, only the entry with the\n"
-"higher weight is shown in the diagram."
-msgstr ""
-"Pokud je v jednom dni více záznamů se\n"
-"stejným číslem opakování, ale jinými váhami, bude v grafu zobrazen\n"
-"pouze záznam s vyšší váhou."
-
-#: manager/templates/workout/log.html:98
-msgid ""
-"Note that only entries with a weight unit (kg or lb) and\n"
-"repetitions are charted, other combinations such as time or until failure\n"
-"are ignored here."
-msgstr ""
-"Jsou zaznamenány pouze záznamy s jednotkou váhy (kg nebo lb)\n"
-"a opakování, jiné kombinace jako čas nebo selhání jsou\n"
-"zde ignorovány."
-
 #: manager/templates/workout/overview.html:25
 msgid "No templates found."
 msgstr "Nenalezeny žádné šablony."
@@ -2726,27 +2661,23 @@ msgstr "Přidat tréninkové série pro dny"
 msgid "Set the repetitions for each set"
 msgstr "Nastavte opakování pro každou sérii"
 
-#: manager/templates/workout/view.html:73
+#: manager/templates/workout/view.html:75
 msgid "Export this workout as a calendar file."
 msgstr "Exportovat trénink jako calendářový soubor."
 
-#: manager/templates/workout/view.html:144
+#: manager/templates/workout/view.html:156
 msgid "Logs"
 msgstr "Záznamy"
 
-#: manager/templates/workout/view.html:146
+#: manager/templates/workout/view.html:159
 msgid "View logs"
 msgstr "Zobrazit záznamy"
 
-#: manager/templates/workout/view.html:169 manager/views/schedule_step.py:99
-msgid "Edit workout"
-msgstr "Upravit trénink"
-
-#: manager/templates/workout/view.html:182 manager/views/workout.py:281
+#: manager/templates/workout/view.html:195 manager/views/workout.py:281
 msgid "Mark as template"
 msgstr "Označit jako šablonu"
 
-#: manager/views/day.py:109
+#: manager/views/day.py:105
 msgid "Add workout day"
 msgstr "Přidat tréninkový den"
 
@@ -2763,6 +2694,10 @@ msgstr "Trénink pro %s"
 msgid "Create schedule"
 msgstr "Vytvořit rozvrh"
 
+#: manager/views/schedule_step.py:99
+msgid "Edit workout"
+msgstr "Upravit trénink"
+
 #: manager/views/workout.py:209
 msgid "Copy workout"
 msgstr "Kopírovat trénink"
@@ -2886,7 +2821,7 @@ msgstr "Množství v gramech"
 msgid "Unit amount, e.g. \"1 Cup\" or \"1/2 spoon\""
 msgstr "Jednotka množství, např. \"1 pohár\" nebo \"1/2 lžíce\""
 
-#: nutrition/models/log.py:52 nutrition/models/meal.py:50
+#: nutrition/models/log.py:52 nutrition/models/meal.py:48
 #: nutrition/models/meal_item.py:48 nutrition/models/plan.py:108
 msgid "Nutrition plan"
 msgstr "Nutriční plán"
@@ -2899,11 +2834,11 @@ msgstr "Jídlo"
 msgid "Date and Time (Approx.)"
 msgstr "Datum a čas (přibližně)"
 
-#: nutrition/models/meal.py:62
+#: nutrition/models/meal.py:60
 msgid "Time (approx)"
 msgstr "Čas (cca)"
 
-#: nutrition/models/meal.py:69
+#: nutrition/models/meal.py:67
 msgid ""
 "Give meals a textual description / name such as \"Breakfast\" or \"after "
 "workout\""
@@ -3043,10 +2978,6 @@ msgstr "Bez položek."
 msgid "Search"
 msgstr "Vyhledat"
 
-#: nutrition/templates/ingredient/overview.html:62
-msgid "Add ingredient"
-msgstr "Přidat položku"
-
 #: nutrition/templates/ingredient/view.html:45 nutrition/views/plan.py:229
 msgid "Macronutrients"
 msgstr "Makroživiny"
@@ -3066,20 +2997,11 @@ msgstr "neuvedeno"
 msgid "Others"
 msgstr "Další"
 
-#: nutrition/templates/ingredient/view.html:144
-#: nutrition/templates/units/list.html:46 nutrition/views/unit.py:86
+#: nutrition/templates/ingredient/view.html:143
+#: nutrition/templates/units/list.html:50 nutrition/views/unit.py:86
 msgid "Add new weight unit"
 msgstr "Přidejte novou jednotku hmostnosti"
 
-#: nutrition/templates/ingredient/view.html:206
-#: nutrition/templates/ingredient/view.html:209
-msgid "Edit ingredient"
-msgstr "Upravit ingredience"
-
-#: nutrition/templates/ingredient/view.html:213
-msgid "Delete ingredient"
-msgstr "Smazat ingredience"
-
 #: nutrition/templates/rate/form.html:25
 msgid "Basal metabolic rate"
 msgstr "Hodnota Bazálního metabolismu"
@@ -3719,6 +3641,86 @@ msgstr "Úspěšně smazáno."
 msgid "Delete weight entry for the %s"
 msgstr "Vymazat záznam váhy pro %s"
 
+#~ msgid ""
+#~ "If a license has been localized, e.g. the Creative Commons\n"
+#~ "            licenses for the different countries, add them as separate "
+#~ "entries here."
+#~ msgstr ""
+#~ "Pokud je licence, například Creative Commons\n"
+#~ "            přeložena do různých jazyků, přidejte je sem jako jednotlivé "
+#~ "položky."
+
+#~ msgid "Add weight log"
+#~ msgstr "Přidat záznam váhy"
+
+#~ msgid "This exercise has no repetitions."
+#~ msgstr "Tento cvik je bez opakování."
+
+#~ msgid "Edit them now."
+#~ msgstr "Upravit je teď."
+
+#~ msgid "Add exercises to this workout day"
+#~ msgstr "Přidat k tomuto dni cviky"
+
+#~ msgid "Edit schedule"
+#~ msgstr "Upravit rozvrh"
+
+#~ msgid "Delete schedule"
+#~ msgstr "Smazat rozvrh"
+
+#~ msgid "Weight log"
+#~ msgstr "Záznam váhy"
+
+#~ msgid "Weight log for workout"
+#~ msgstr "Záznam váhy pro trénink"
+
+#~ msgid "Add weight log to this day"
+#~ msgstr "Přidejte záznam váhy pro tento den"
+
+#~ msgid "No weight entries here."
+#~ msgstr "Nebyla zde vložena váha."
+
+#~ msgid "No exercises for this day."
+#~ msgstr "Pro tento den nejsou žádné cviky."
+
+#~ msgid ""
+#~ "This page shows the weight logs belonging to this workout\n"
+#~ "only. Click on an exercise to see all the historical data for\n"
+#~ "it."
+#~ msgstr ""
+#~ "Tato stránka zobrazuje pouze záznamy váhy, které patří k tomuto "
+#~ "tréninku.\n"
+#~ "Pokud chcete vidět všechny záznamy, musíte kliknout na konkrétní cvik."
+
+#~ msgid ""
+#~ "If on a single day there is more than one entry with the\n"
+#~ "same number of repetitions, but different weights, only the entry with "
+#~ "the\n"
+#~ "higher weight is shown in the diagram."
+#~ msgstr ""
+#~ "Pokud je v jednom dni více záznamů se\n"
+#~ "stejným číslem opakování, ale jinými váhami, bude v grafu zobrazen\n"
+#~ "pouze záznam s vyšší váhou."
+
+#~ msgid ""
+#~ "Note that only entries with a weight unit (kg or lb) and\n"
+#~ "repetitions are charted, other combinations such as time or until "
+#~ "failure\n"
+#~ "are ignored here."
+#~ msgstr ""
+#~ "Jsou zaznamenány pouze záznamy s jednotkou váhy (kg nebo lb)\n"
+#~ "a opakování, jiné kombinace jako čas nebo selhání jsou\n"
+#~ "zde ignorovány."
+
+#~ msgid "Add ingredient"
+#~ msgstr "Přidat položku"
+
+#~ msgid "Edit ingredient"
+#~ msgstr "Upravit ingredience"
+
+#~ msgid "Delete ingredient"
+#~ msgstr "Smazat ingredience"
+
 #~ msgid "Ingredients pending review"
 #~ msgstr "Potraviny čekající na kontrolu"
 
diff --git a/wger/locale/da/LC_MESSAGES/django.po b/wger/locale/da/LC_MESSAGES/django.po
index 7cb79498c..f2fcc14ee 100644
--- a/wger/locale/da/LC_MESSAGES/django.po
+++ b/wger/locale/da/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: wger Workout Manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-07-14 15:59+0200\n"
+"POT-Creation-Date: 2024-11-14 13:09+0100\n"
 "PO-Revision-Date: 2023-07-09 18:48+0000\n"
 "Last-Translator: Tomasz Cielecki <tomasz@ostebaronen.dk>\n"
 "Language-Team: Danish <https://hosted.weblate.org/projects/wger/web/da/>\n"
@@ -20,7 +20,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 5.0-dev\n"
 
-#: config/models/gym_config.py:46 gym/templates/gym/list.html:53
+#: config/models/gym_config.py:46 gym/templates/gym/list.html:56
 msgid "Default gym"
 msgstr "Standard fitnesscenter"
 
@@ -33,28 +33,28 @@ msgstr ""
 "tilknyttet dette fitnesscenter, og allerede eksisterende brugere der ikke er "
 "tilknyttet et center vil tilknyttes dette."
 
-#: config/views/gym_config.py:42 core/templates/language/view.html:67
-#: core/templates/license/list.html:17 core/templates/misc/license/list.html:18
+#: config/views/gym_config.py:42 core/templates/language/view.html:64
+#: core/templates/license/list.html:17
 #: core/templates/repetition_unit/list.html:18
-#: core/templates/tags/render_day.html:39
-#: core/templates/tags/render_day.html:75 core/templates/user/overview.html:204
-#: core/templates/user/overview.html:445
+#: core/templates/user/overview.html:204 core/templates/user/overview.html:467
 #: core/templates/weight_unit/list.html:18
 #: exercises/templates/categories/admin-overview.html:17
 #: exercises/templates/equipment/admin-overview.html:17
-#: exercises/templates/muscles/admin-overview.html:17
-#: gallery/views/images.py:98 gym/templates/admin_notes/list.html:32
-#: gym/templates/contract/list.html:31 gym/templates/contract/view.html:107
-#: gym/templates/contract_option/list.html:32
-#: gym/templates/contract_type/list.html:32 gym/templates/document/list.html:38
-#: gym/templates/gym/list.html:20 gym/templates/gym/list.html:46
-#: gym/templates/gym/member_list.html:87 gym/templates/gym/member_list.html:140
-#: gym/templates/gym/member_list.html:176
-#: manager/templates/calendar/day.html:68
-#: manager/templates/calendar/month.html:85
-#: manager/templates/calendar/partial_overview_table.html:18
-#: manager/templates/schedule/view.html:118
-#: nutrition/templates/ingredient/view.html:165
+#: exercises/templates/muscles/admin-overview.html:16
+#: gallery/views/images.py:98 gym/templates/admin_notes/list.html:31
+#: gym/templates/contract/list.html:30 gym/templates/contract/view.html:106
+#: gym/templates/contract_option/list.html:29
+#: gym/templates/contract_type/list.html:30 gym/templates/document/list.html:38
+#: gym/templates/gym/list.html:19 gym/templates/gym/list.html:48
+#: gym/templates/gym/member_list.html:94 gym/templates/gym/member_list.html:152
+#: gym/templates/gym/member_list.html:190
+#: manager/templates/calendar/day.html:67
+#: manager/templates/calendar/month.html:84
+#: manager/templates/calendar/partial_overview_table.html:16
+#: manager/templates/schedule/view.html:318
+#: manager/templates/workout/view.html:181
+#: nutrition/templates/ingredient/view.html:164
+#: nutrition/templates/ingredient/view.html:209
 #: nutrition/templates/units/list.html:19
 msgid "Edit"
 msgstr "Rediger"
@@ -90,8 +90,8 @@ msgstr "Min seje trænings-plan"
 msgid "Empty placeholder schedule"
 msgstr "Tom plan"
 
-#: core/forms.py:69 core/templates/navigation.html:285
-#: core/templates/navigation.html:291 core/templates/user/login.html:4
+#: core/forms.py:69 core/templates/navigation.html:284
+#: core/templates/navigation.html:290 core/templates/user/login.html:4
 #: software/templates/features.html:82 software/templates/features.html:427
 msgid "Login"
 msgstr "Login"
@@ -101,14 +101,14 @@ msgstr "Login"
 msgid "First name"
 msgstr "Fornavn"
 
-#: core/forms.py:109 core/forms.py:215 core/templates/user/overview.html:266
+#: core/forms.py:109 core/forms.py:215 core/templates/user/overview.html:284
 #: gym/views/export.py:62 gym/views/gym.py:217
 msgid "Last name"
 msgstr "Efternavn"
 
-#: core/forms.py:111 core/forms.py:180 core/templates/user/overview.html:270
+#: core/forms.py:111 core/forms.py:180 core/templates/user/overview.html:288
 #: gym/models/contract.py:256 gym/models/gym.py:58
-#: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:104
+#: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:116
 #: gym/templates/gym/new_user.html:30 gym/views/export.py:60
 #: mailer/templates/mailer/gym/form.html:4
 #: mailer/templates/mailer/gym/overview.html:4
@@ -139,8 +139,8 @@ msgstr "Træningspåmindelser"
 msgid "Other settings"
 msgstr "Andre indstillinger"
 
-#: core/forms.py:174 core/views/user.py:624 core/views/user.py:639
-#: core/views/user.py:651 gym/forms.py:73 manager/templates/log/add.html:65
+#: core/forms.py:174 core/views/user.py:623 core/views/user.py:638
+#: core/views/user.py:650 gym/forms.py:73 manager/templates/log/add.html:65
 #: manager/templates/set/add.html:70 manager/views/workout.py:203
 #: utils/generic_views.py:143
 msgid "Save"
@@ -163,26 +163,25 @@ msgstr "Kodeord"
 msgid "Please enter your current password."
 msgstr "Indtast venligst dit nuværende kodeord."
 
-#: core/forms.py:242 core/templates/language/view.html:73
-#: core/templates/license/list.html:19 core/templates/misc/license/list.html:22
-#: core/templates/repetition_unit/list.html:20
-#: core/templates/tags/render_day.html:45
-#: core/templates/tags/render_day.html:81 core/templates/user/overview.html:217
-#: core/templates/weight_unit/list.html:20
-#: exercises/templates/categories/admin-overview.html:19
-#: exercises/templates/equipment/admin-overview.html:19
-#: exercises/templates/muscles/admin-overview.html:19
-#: gym/templates/admin_notes/list.html:40
-#: gym/templates/contract_option/list.html:41
-#: gym/templates/contract_type/list.html:41 gym/templates/document/list.html:46
-#: gym/templates/gym/list.html:22 manager/templates/calendar/day.html:73
-#: manager/templates/calendar/month.html:89
-#: manager/templates/calendar/partial_overview_table.html:23
-#: manager/templates/schedule/view.html:122
-#: manager/templates/workout/view.html:188
-#: nutrition/templates/ingredient/view.html:166
+#: core/forms.py:242 core/templates/language/view.html:70
+#: core/templates/license/list.html:21
+#: core/templates/repetition_unit/list.html:22
+#: core/templates/user/overview.html:233
+#: core/templates/weight_unit/list.html:22
+#: exercises/templates/categories/admin-overview.html:21
+#: exercises/templates/equipment/admin-overview.html:21
+#: exercises/templates/muscles/admin-overview.html:20
+#: gym/templates/admin_notes/list.html:37
+#: gym/templates/contract_option/list.html:35
+#: gym/templates/contract_type/list.html:36 gym/templates/document/list.html:46
+#: gym/templates/gym/list.html:23 manager/templates/calendar/day.html:73
+#: manager/templates/calendar/month.html:88
+#: manager/templates/calendar/partial_overview_table.html:22
+#: manager/templates/schedule/view.html:324
+#: manager/templates/workout/view.html:202
+#: nutrition/templates/ingredient/view.html:168
 #: nutrition/templates/ingredient/view.html:215
-#: nutrition/templates/units/list.html:22
+#: nutrition/templates/units/list.html:25
 msgid "Delete"
 msgstr "Slet"
 
@@ -194,9 +193,9 @@ msgstr "Ukorrekt kodeord"
 msgid "The form is secured with reCAPTCHA"
 msgstr "Denne formular er sikret med reCAPTCHA"
 
-#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:285
-#: core/templates/navigation.html:297 core/templates/template.html:149
-#: core/templates/user/login.html:20 core/views/user.py:298
+#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:284
+#: core/templates/navigation.html:296 core/templates/template.html:151
+#: core/templates/user/login.html:20 core/views/user.py:297
 #: software/templates/features.html:87 software/templates/features.html:422
 msgid "Register"
 msgstr "Registrer"
@@ -451,18 +450,18 @@ msgid "The sum of all hours has to be 24"
 msgstr "Summen af alle timer skal være 24"
 
 #: core/models/rep_unit.py:36 core/models/weight_unit.py:36
-#: core/templates/user/overview.html:262 core/views/user.py:599
+#: core/templates/user/overview.html:280 core/views/user.py:598
 #: exercises/models/category.py:29 exercises/models/equipment.py:29
 #: exercises/models/exercise.py:59 exercises/models/muscle.py:36
 #: gym/models/contract.py:52 gym/models/contract.py:103 gym/models/gym.py:46
 #: gym/models/user_document.py:84 gym/templates/contract/view.html:50
-#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:96
+#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:108
 #: gym/views/gym.py:158 manager/models/schedule.py:55
 #: manager/models/workout.py:57 measurements/models/category.py:36
 #: nutrition/models/ingredient.py:111
-#: nutrition/models/ingredient_category.py:27 nutrition/models/meal.py:67
+#: nutrition/models/ingredient_category.py:27 nutrition/models/meal.py:65
 #: nutrition/models/weight_unit.py:38
-#: nutrition/templates/ingredient/view.html:152
+#: nutrition/templates/ingredient/view.html:151
 msgid "Name"
 msgstr "Navn"
 
@@ -511,7 +510,7 @@ msgstr ""
 msgid "Back to \"%(target)s\""
 msgstr "TIlbage til \"%(target)s\""
 
-#: core/templates/delete.html:15
+#: core/templates/delete.html:4
 msgid "Are you sure you want to delete this? This action cannot be undone."
 msgstr "Er du sikker på at du vil slette dette? Handlingen kan ikke fortrydes."
 
@@ -565,7 +564,7 @@ msgstr "Klik venligst følgende link for at bekræfte din email: %(link)s"
 msgid "Dashboard"
 msgstr "Instrumentbrættet"
 
-#: core/templates/language/overview.html:4 core/templates/navigation.html:345
+#: core/templates/language/overview.html:4 core/templates/navigation.html:344
 msgid "Languages"
 msgstr "Sprog"
 
@@ -575,81 +574,72 @@ msgstr "Intet fundet."
 
 #: core/templates/language/overview.html:22
 #: manager/templates/calendar/month.html:132
-#: manager/templates/schedule/overview.html:28
-#: manager/templates/schedule/view.html:144
+#: manager/templates/schedule/view.html:154
 #: manager/templates/workout/overview.html:28
 #: nutrition/templates/ingredient/overview.html:38
 msgid "Add one now."
 msgstr "Tilføj en ny."
 
-#: core/templates/language/overview.html:35 core/templates/license/list.html:40
-#: core/templates/misc/license/list.html:43
-#: core/templates/repetition_unit/list.html:43
-#: core/templates/user/overview.html:326 core/templates/user/overview.html:365
-#: core/templates/user/overview.html:401
-#: core/templates/weight_unit/list.html:43 core/views/languages.py:74
+#: core/templates/language/overview.html:34 core/templates/license/list.html:43
+#: core/templates/repetition_unit/list.html:46
+#: core/templates/user/overview.html:344 core/templates/user/overview.html:384
+#: core/templates/user/overview.html:422
+#: core/templates/weight_unit/list.html:46 core/views/languages.py:74
 #: core/views/license.py:66 core/views/repetition_units.py:66
 #: core/views/weight_units.py:66
-#: exercises/templates/categories/admin-overview.html:38
-#: gallery/views/images.py:63 gym/templates/admin_notes/list.html:67
-#: gym/templates/contract/list.html:73
-#: gym/templates/contract_option/list.html:72
-#: gym/templates/contract_type/list.html:72 gym/templates/document/list.html:79
-#: gym/templates/gym/member_list.html:211
-#: gym/templates/gym/member_list.html:244
-#: gym/templates/gym/member_list.html:281
+#: exercises/templates/categories/admin-overview.html:40
+#: exercises/templates/equipment/admin-overview.html:39
+#: exercises/templates/muscles/admin-overview.html:40
+#: gallery/views/images.py:63 gym/templates/admin_notes/list.html:64
+#: gym/templates/contract/list.html:69
+#: gym/templates/contract_option/list.html:65
+#: gym/templates/contract_type/list.html:66 gym/templates/document/list.html:78
+#: gym/templates/gym/member_list.html:228
+#: gym/templates/gym/member_list.html:264
+#: gym/templates/gym/member_list.html:303
 #: mailer/templates/mailer/gym/overview.html:43
+#: nutrition/templates/ingredient/overview.html:60
 msgid "Add"
 msgstr "Tilføj"
 
 #: core/templates/language/view.html:61 core/templates/user/api_key.html:44
-#: core/templates/user/preferences.html:45 gym/models/contract.py:203
-#: gym/templates/contract/view.html:41 gym/templates/contract/view.html:106
-#: gym/templates/gym/member_list.html:248
-#: manager/templates/schedule/view.html:285
-#: manager/templates/workout/view.html:163
-#: nutrition/templates/ingredient/view.html:202
+#: core/templates/user/preferences.html:50 gym/models/contract.py:203
+#: gym/templates/contract/view.html:41 gym/templates/gym/member_list.html:270
+#: manager/templates/schedule/view.html:304
+#: manager/templates/workout/view.html:177
+#: nutrition/templates/ingredient/view.html:206
 msgid "Options"
 msgstr "Indstillinger"
 
-#: core/templates/license/list.html:4 core/templates/misc/license/list.html:4
+#: core/templates/license/list.html:4
 msgid "License list"
 msgstr "Licens liste"
 
-#: core/templates/license/list.html:26 core/templates/misc/license/list.html:30
-#: core/templates/repetition_unit/list.html:28
+#: core/templates/license/list.html:30
+#: core/templates/repetition_unit/list.html:32
 #: core/templates/user/overview.html:104 core/templates/user/overview.html:136
-#: core/templates/user/overview.html:185 core/templates/user/overview.html:347
-#: core/templates/user/overview.html:383 core/templates/user/overview.html:427
-#: core/templates/weight_unit/list.html:28
-#: exercises/templates/categories/admin-overview.html:26
-#: exercises/templates/equipment/admin-overview.html:26
-#: exercises/templates/muscles/admin-overview.html:26
-#: gym/templates/admin_notes/list.html:52 gym/templates/contract/list.html:60
-#: gym/templates/contract_option/list.html:58
-#: gym/templates/contract_type/list.html:58 gym/templates/document/list.html:64
-#: gym/templates/gym/list.html:29 gym/templates/gym/member_list.html:229
-#: gym/templates/gym/member_list.html:262
-#: gym/templates/gym/member_list.html:299
+#: core/templates/user/overview.html:185 core/templates/user/overview.html:365
+#: core/templates/user/overview.html:404 core/templates/user/overview.html:448
+#: core/templates/weight_unit/list.html:32
+#: exercises/templates/categories/admin-overview.html:30
+#: exercises/templates/equipment/admin-overview.html:30
+#: exercises/templates/muscles/admin-overview.html:29
+#: gym/templates/admin_notes/list.html:50 gym/templates/contract/list.html:57
+#: gym/templates/contract_option/list.html:52
+#: gym/templates/contract_type/list.html:53 gym/templates/document/list.html:64
+#: gym/templates/gym/list.html:32 gym/templates/gym/member_list.html:248
+#: gym/templates/gym/member_list.html:284
+#: gym/templates/gym/member_list.html:321
 #: mailer/templates/mailer/gym/overview.html:30
-#: manager/templates/calendar/day.html:87
-#: nutrition/templates/units/list.html:29
+#: manager/templates/calendar/day.html:88
+#: nutrition/templates/units/list.html:34
 msgid "Nothing found"
 msgstr "Ingenting fundet"
 
-#: core/templates/misc/about.html:4 core/templates/template.html:175
+#: core/templates/misc/about.html:4 core/templates/template.html:188
 msgid "Imprint"
 msgstr "Aftryk"
 
-#: core/templates/misc/license/list.html:47
-msgid ""
-"If a license has been localized, e.g. the Creative Commons\n"
-"            licenses for the different countries, add them as separate "
-"entries here."
-msgstr ""
-"Hvis in licens er fundet, f.eks. en Creative Commons\n"
-"            licens for et land, tilføj dem som seperate poster her."
-
 #: core/templates/navigation.html:28 software/templates/features.html:437
 msgid "Training"
 msgstr "Træning"
@@ -694,8 +684,8 @@ msgstr "Offentlige skabeloner"
 msgid "Exercises"
 msgstr "Øvelser"
 
-#: core/templates/navigation.html:111 core/templates/navigation.html:184
-#: core/templates/navigation.html:340
+#: core/templates/navigation.html:111 core/templates/navigation.html:185
+#: core/templates/navigation.html:339
 msgid "Administration"
 msgstr "Administration"
 
@@ -732,87 +722,87 @@ msgstr "BMI lommeregner"
 msgid "Daily calories calculator"
 msgstr "Daglige kalorier lommeregner"
 
-#: core/templates/navigation.html:179
+#: core/templates/navigation.html:180
 #: nutrition/templates/ingredient/overview.html:10
 msgid "Ingredient overview"
 msgstr "Ingrediensoversigt"
 
-#: core/templates/navigation.html:187 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:189 nutrition/templates/units/list.html:6
 msgid "Ingredient weight units"
 msgstr "Ingrediens vægtenheder"
 
-#: core/templates/navigation.html:203 software/templates/features.html:442
+#: core/templates/navigation.html:205 software/templates/features.html:442
 msgid "Body weight"
 msgstr "Kropsvægt"
 
-#: core/templates/navigation.html:210 core/templates/user/overview.html:114
+#: core/templates/navigation.html:212 core/templates/user/overview.html:114
 msgid "Weight overview"
 msgstr "Vægt oversigt"
 
-#: core/templates/navigation.html:217 weight/views.py:65
+#: core/templates/navigation.html:216 weight/views.py:65
 msgid "Add weight entry"
 msgstr "Tilføj vægtpost"
 
-#: core/templates/navigation.html:231
+#: core/templates/navigation.html:230
 msgid "About this software"
 msgstr "Om denne software"
 
-#: core/templates/navigation.html:237 software/templates/about_us.html:5
+#: core/templates/navigation.html:236 software/templates/about_us.html:5
 msgid "About us"
 msgstr "Om os"
 
-#: core/templates/navigation.html:243 software/templates/features.html:507
+#: core/templates/navigation.html:242 software/templates/features.html:507
 msgid "REST API"
 msgstr "REST API"
 
-#: core/templates/navigation.html:249 utils/models.py:45
+#: core/templates/navigation.html:248 utils/models.py:45
 msgid "License"
 msgstr "Licens"
 
-#: core/templates/navigation.html:255
+#: core/templates/navigation.html:254
 msgid "Developer documentation"
 msgstr "Udviklerdokumentation"
 
-#: core/templates/navigation.html:262
+#: core/templates/navigation.html:261
 msgid "Get the code"
 msgstr "Hent koden"
 
-#: core/templates/navigation.html:269 core/templates/template.html:214
+#: core/templates/navigation.html:268 core/templates/template.html:227
 #: software/templates/features.html:582
 msgid "Translate"
 msgstr "Oversæt"
 
-#: core/templates/navigation.html:303 core/templates/user/login.html:28
+#: core/templates/navigation.html:302 core/templates/user/login.html:28
 msgid "Reset password"
 msgstr "Nulstil kodeord"
 
-#: core/templates/navigation.html:321
+#: core/templates/navigation.html:320
 msgid "My preferences"
 msgstr "Mine indstillinger"
 
-#: core/templates/navigation.html:330
+#: core/templates/navigation.html:329
 msgid "Logout"
 msgstr "Log ud"
 
-#: core/templates/navigation.html:353
+#: core/templates/navigation.html:352
 msgid "Licenses"
 msgstr "Licenser"
 
-#: core/templates/navigation.html:361
+#: core/templates/navigation.html:360
 #: core/templates/repetition_unit/list.html:4
 msgid "Repetition units"
 msgstr "Gentagelsesenheder"
 
-#: core/templates/navigation.html:369 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:368 core/templates/weight_unit/list.html:4
 #: nutrition/templates/ingredient/view.html:141
 msgid "Weight units"
 msgstr "Vægtenheder"
 
-#: core/templates/navigation.html:377 core/templates/user/list.html:4
+#: core/templates/navigation.html:376 core/templates/user/list.html:4
 msgid "User list"
 msgstr "Brugerliste"
 
-#: core/templates/navigation.html:383
+#: core/templates/navigation.html:382
 msgid "Gyms"
 msgstr "Fitnescentre"
 
@@ -875,56 +865,31 @@ msgstr "forrige"
 msgid "next"
 msgstr "næste"
 
-#: core/templates/tags/render_day.html:34
-msgid "Add weight log"
-msgstr "Tilføj vægtlog"
-
-#: core/templates/tags/render_day.html:116
-msgid "Placeholder image for exercise"
+#: core/templates/tags/render_day.html:44
+#, fuzzy
+#| msgid "Placeholder image for exercise"
+msgid "Placeholder image for translation"
 msgstr "Pladsholderbillede for øvelse"
 
-#: core/templates/tags/render_day.html:133
-msgid "This exercise has no repetitions."
-msgstr "Denne øvelse har ingen repetitioner."
-
-#: core/templates/tags/render_day.html:136
-msgid "Edit them now."
-msgstr "Rediger dem nu."
-
-#: core/templates/tags/render_day.html:162
-msgid "Add exercises to this workout day"
-msgstr "Tilføj øvelser til denne træningsdag"
-
-#: core/templates/tags/render_weight_log.html:17 manager/helpers.py:86
-#: manager/models/setting.py:72 manager/templates/set/formset.html:9
-msgid "Reps"
-msgstr "Repetitioner"
-
-#: core/templates/tags/render_weight_log.html:30 manager/forms.py:191
-#: manager/models/log.py:103 manager/models/setting.py:102
-#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
-msgid "RiR"
-msgstr ""
-
-#: core/templates/template.html:122 manager/templates/calendar/month.html:138
-#: manager/templates/schedule/view.html:248
-#: manager/templates/schedule/view.html:269
-#: manager/templates/workout/view.html:84
-#: manager/templates/workout/view.html:137
+#: core/templates/template.html:124 manager/templates/calendar/month.html:138
+#: manager/templates/schedule/view.html:262
+#: manager/templates/schedule/view.html:287
+#: manager/templates/workout/view.html:89
+#: manager/templates/workout/view.html:149
 msgid "Close"
 msgstr "Luk"
 
-#: core/templates/template.html:138
+#: core/templates/template.html:140
 msgid ""
 "You are using a guest account, data entered will be deleted after a week."
 msgstr ""
 "Du bruger en gæstekonto, date indtastet vil blive slettet efter en uge."
 
-#: core/templates/template.html:143
+#: core/templates/template.html:145
 msgid "Create some demo entries"
 msgstr "Indtast nogle demo-poster"
 
-#: core/templates/template.html:180 software/templates/features.html:547
+#: core/templates/template.html:193 software/templates/features.html:547
 #: software/templates/tos.html:7
 msgid "Terms of service"
 msgstr "Vilkår for brug"
@@ -933,7 +898,7 @@ msgstr "Vilkår for brug"
 msgid "Features"
 msgstr "Funktioner"
 
-#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:54
+#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:59
 msgid "API key"
 msgstr "API nøgle"
 
@@ -977,17 +942,17 @@ msgstr "Lav en ny API nøgle"
 msgid "Documentation"
 msgstr "Dokumentation"
 
-#: core/templates/user/delete_account.html:4
-#: core/templates/user/preferences.html:59
+#: core/templates/user/delete_account.html:3
+#: core/templates/user/preferences.html:62
 msgid "Delete account"
 msgstr "Slet konto"
 
-#: core/templates/user/delete_account.html:17
+#: core/templates/user/delete_account.html:9
 #: exercises/templates/history/overview.html:93
 msgid "Are you sure?"
 msgstr "Er du sikker?"
 
-#: core/templates/user/delete_account.html:22
+#: core/templates/user/delete_account.html:14
 #, python-format
 msgid ""
 "This action will delete the user account \"%(username)s\".\n"
@@ -1010,22 +975,22 @@ msgstr "Glemt kodeord?"
 
 #: core/templates/user/overview.html:25 core/templates/user/overview.html:68
 #: core/templates/user/overview.html:112 core/templates/user/overview.html:144
-#: core/templates/user/overview.html:330 core/templates/user/overview.html:369
-#: core/templates/user/overview.html:405
+#: core/templates/user/overview.html:348 core/templates/user/overview.html:390
+#: core/templates/user/overview.html:426
 #, python-format
 msgid "last %(number)s"
 msgstr "sidste %(number)s"
 
 #: core/templates/user/overview.html:27 core/templates/user/overview.html:146
-#: core/templates/user/overview.html:325 core/templates/user/overview.html:364
-#: core/templates/user/overview.html:400 gym/templates/gym/member_list.html:210
-#: gym/templates/gym/member_list.html:243
-#: gym/templates/gym/member_list.html:280
+#: core/templates/user/overview.html:343 core/templates/user/overview.html:382
+#: core/templates/user/overview.html:421 gym/templates/gym/member_list.html:226
+#: gym/templates/gym/member_list.html:262
+#: gym/templates/gym/member_list.html:302
 msgid "Overview"
 msgstr "Oversigt"
 
 #: core/templates/user/overview.html:28
-#: manager/templates/schedule/view.html:163
+#: manager/templates/schedule/view.html:172
 #: manager/templates/workout/overview.html:39 manager/views/schedule_step.py:60
 msgid "Add workout"
 msgstr "Tilføj træning"
@@ -1057,38 +1022,36 @@ msgstr "Beskrivelse"
 msgid "Number of logs (days)"
 msgstr "Antal logs (dage)"
 
-#: core/templates/user/overview.html:37 core/views/user.py:600
+#: core/templates/user/overview.html:37 core/views/user.py:599
 #: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:158
 msgid "Last activity"
 msgstr "Sidste aktivitet"
 
 #: core/templates/user/overview.html:58
 #: manager/templates/calendar/month.html:128
-#: manager/templates/schedule/view.html:144
 #: manager/templates/workout/overview.html:28
 msgid "No workouts found."
 msgstr "Ingen træninger fundet."
 
 #: core/templates/user/overview.html:68 manager/forms.py:280
-#: manager/templates/workout/view.html:106
+#: manager/templates/workout/view.html:114
 msgid "Log"
 msgstr "Log"
 
 #: core/templates/user/overview.html:77 manager/models/session.py:83
-#: manager/templates/calendar/partial_overview_table.html:52
+#: manager/templates/calendar/partial_overview_table.html:54
 msgid "General impression"
 msgstr "Generelt indtryk"
 
-#: core/templates/user/overview.html:78 core/templates/user/overview.html:369
+#: core/templates/user/overview.html:78 core/templates/user/overview.html:390
 #: manager/models/session.py:73
-#: manager/templates/calendar/partial_overview_table.html:56
-#: manager/templates/workout/log.html:89
+#: manager/templates/calendar/partial_overview_table.html:58
 msgid "Notes"
 msgstr "Noter"
 
 #: core/templates/user/overview.html:79
 #: exercises/templates/history/overview.html:30
-#: manager/templates/calendar/partial_overview_table.html:42
+#: manager/templates/calendar/partial_overview_table.html:44
 msgid "Time"
 msgstr "Tid"
 
@@ -1126,121 +1089,121 @@ msgstr "Fedt"
 msgid "kcal"
 msgstr "kcal"
 
-#: core/templates/user/overview.html:201 core/templates/user/overview.html:322
-#: core/templates/user/overview.html:361 core/templates/user/overview.html:397
-#: core/templates/user/overview.html:442 gym/templates/gym/list.html:42
-#: gym/templates/gym/member_list.html:84 gym/templates/gym/member_list.html:137
-#: gym/templates/gym/member_list.html:173
-#: gym/templates/gym/member_list.html:207
-#: gym/templates/gym/member_list.html:240
-#: gym/templates/gym/member_list.html:277
-#: manager/templates/schedule/view.html:100
+#: core/templates/user/overview.html:201 core/templates/user/overview.html:340
+#: core/templates/user/overview.html:379 core/templates/user/overview.html:418
+#: core/templates/user/overview.html:463 gym/templates/gym/list.html:45
+#: gym/templates/gym/member_list.html:91 gym/templates/gym/member_list.html:149
+#: gym/templates/gym/member_list.html:187
+#: gym/templates/gym/member_list.html:223
+#: gym/templates/gym/member_list.html:259
+#: gym/templates/gym/member_list.html:299
+#: manager/templates/schedule/view.html:99
 msgid "Actions"
 msgstr "Handlinger"
 
-#: core/templates/user/overview.html:207
+#: core/templates/user/overview.html:210
 msgid "Deactivate user"
 msgstr "Deaktiver bruger"
 
-#: core/templates/user/overview.html:209
+#: core/templates/user/overview.html:214
 msgid "Activate user"
 msgstr "Aktiver bruger"
 
-#: core/templates/user/overview.html:211
+#: core/templates/user/overview.html:223
 msgid "Reset user password"
 msgstr "Nulstil brugerens kodeord"
 
-#: core/templates/user/overview.html:214 gym/templates/gym/member_list.html:30
+#: core/templates/user/overview.html:227 gym/templates/gym/member_list.html:30
 msgid "Roles"
 msgstr "Roller"
 
-#: core/templates/user/overview.html:225
+#: core/templates/user/overview.html:243
 msgid "Password reset confirmation"
 msgstr "Bekræft nulstilling af kodeord"
 
-#: core/templates/user/overview.html:229
+#: core/templates/user/overview.html:247
 msgid "Do you really want to change this user&#39;s password?"
 msgstr "Vil du virkelig ændre denne brugers kodeord?"
 
-#: core/templates/user/overview.html:232
+#: core/templates/user/overview.html:250
 #: exercises/templates/history/overview.html:106
 msgid "No"
 msgstr "Nej"
 
-#: core/templates/user/overview.html:233
+#: core/templates/user/overview.html:251
 #: exercises/templates/history/overview.html:99
 msgid "Yes"
 msgstr "Ja"
 
-#: core/templates/user/overview.html:254 gym/templates/gym/member_list.html:93
+#: core/templates/user/overview.html:272 gym/templates/gym/member_list.html:105
 msgid "Details"
 msgstr "Detaljer"
 
-#: core/templates/user/overview.html:258 gym/views/export.py:57
-#: manager/helpers.py:86 manager/templates/schedule/view.html:98
+#: core/templates/user/overview.html:276 gym/views/export.py:57
+#: manager/helpers.py:86 manager/templates/schedule/view.html:97
 msgid "Nr."
 msgstr "Nr."
 
-#: core/templates/user/overview.html:280 gym/models/contract.py:287
+#: core/templates/user/overview.html:298 gym/models/contract.py:287
 #: gym/models/gym.py:50 gym/templates/contract/view.html:75
-#: gym/templates/gym/member_list.html:100 gym/views/export.py:68
+#: gym/templates/gym/member_list.html:112 gym/views/export.py:68
 msgid "Phone"
 msgstr "Telefon"
 
-#: core/templates/user/overview.html:284 gym/templates/contract/view.html:87
-#: gym/templates/gym/member_list.html:118
+#: core/templates/user/overview.html:302 gym/templates/contract/view.html:87
+#: gym/templates/gym/member_list.html:130
 msgid "Address"
 msgstr "Adresse"
 
-#: core/templates/user/overview.html:295
+#: core/templates/user/overview.html:313
 msgid "Registered"
 msgstr "Registreret"
 
-#: core/templates/user/overview.html:299
+#: core/templates/user/overview.html:317
 msgid "Last login"
 msgstr "Sidste login"
 
-#: core/templates/user/overview.html:304
+#: core/templates/user/overview.html:322
 msgid "Status"
 msgstr "Status"
 
-#: core/templates/user/overview.html:307
+#: core/templates/user/overview.html:325
 msgid "Active"
 msgstr "Aktiv"
 
-#: core/templates/user/overview.html:309
+#: core/templates/user/overview.html:327
 msgid "Inactive"
 msgstr "Inaktiv"
 
-#: core/templates/user/overview.html:330 gym/templates/contract/list.html:4
-#: gym/templates/gym/member_list.html:202
+#: core/templates/user/overview.html:348 gym/templates/contract/list.html:4
+#: gym/templates/gym/member_list.html:218
 msgid "Contracts"
 msgstr "Kontrakter"
 
-#: core/templates/user/overview.html:405 gym/templates/document/list.html:4
+#: core/templates/user/overview.html:426 gym/templates/document/list.html:4
 msgid "Documents"
 msgstr "Dokumenter"
 
-#: core/templates/user/overview.html:412 gym/templates/document/list.html:32
-#: manager/forms.py:292 manager/templates/workout/view.html:132
+#: core/templates/user/overview.html:433 gym/templates/document/list.html:33
+#: manager/forms.py:292 manager/templates/workout/view.html:143
 msgid "Download"
 msgstr ""
 
-#: core/templates/user/overview.html:450 gym/views/admin_config.py:44
+#: core/templates/user/overview.html:474 gym/views/admin_config.py:44
 #: gym/views/admin_config.py:58 gym/views/user_config.py:46
 msgid "Configuration"
 msgstr "Konfiguration"
 
-#: core/templates/user/overview.html:453 gym/models/user_config.py:92
+#: core/templates/user/overview.html:477 gym/models/user_config.py:92
 msgid "Include in inactive overview"
 msgstr "Inkluder i inaktiv oversigt"
 
-#: core/templates/user/overview.html:486
+#: core/templates/user/overview.html:510
 #, python-format
 msgid "Admin login is only available for users in %(gym_name)s"
 msgstr "Administratorlogin er kun tilgængeligt for brugere i %(gym_name)s"
 
-#: core/templates/user/overview.html:490
+#: core/templates/user/overview.html:514
 msgid "Log in as this user"
 msgstr "Log ind som bruger"
 
@@ -1260,19 +1223,19 @@ msgstr "Email ikke bekræftet"
 msgid "Send verification email"
 msgstr "Send bekræftelsesemail"
 
-#: core/templates/user/preferences.html:30
+#: core/templates/user/preferences.html:31
 msgid "You need to verify your email to contribute exercises"
 msgstr "Du skal bekræfte din email for at tilføje øvelser"
 
-#: core/templates/user/preferences.html:50 core/views/user.py:611
+#: core/templates/user/preferences.html:55 core/views/user.py:610
 msgid "Change password"
 msgstr "Ændre kodeord"
 
-#: core/templatetags/wger_extras.py:205 i18n.tpl:37
+#: core/templatetags/wger_extras.py:197 i18n.tpl:37
 msgid "kg"
 msgstr "kg"
 
-#: core/templatetags/wger_extras.py:207
+#: core/templatetags/wger_extras.py:199
 #: nutrition/templates/ingredient/view.html:60
 #: nutrition/templates/ingredient/view.html:66
 #: nutrition/templates/ingredient/view.html:73
@@ -1284,11 +1247,11 @@ msgctxt "weight unit, i.e. grams"
 msgid "g"
 msgstr "g"
 
-#: core/templatetags/wger_extras.py:210 i18n.tpl:38
+#: core/templatetags/wger_extras.py:202 i18n.tpl:38
 msgid "lb"
 msgstr "lb"
 
-#: core/templatetags/wger_extras.py:212
+#: core/templatetags/wger_extras.py:204
 msgctxt "weight unit, i.e. ounces"
 msgid "oz"
 msgstr "oz"
@@ -1315,13 +1278,13 @@ msgid "Delete {0}?"
 msgstr "Slet {0}?"
 
 #: core/views/languages.py:111 core/views/license.py:85
-#: core/views/repetition_units.py:86 core/views/user.py:474
+#: core/views/repetition_units.py:86 core/views/user.py:473
 #: core/views/weight_units.py:86 exercises/views/categories.py:98
 #: exercises/views/equipment.py:81 exercises/views/muscles.py:87
 #: gym/views/admin_notes.py:161 gym/views/config.py:68
 #: gym/views/contract.py:186 gym/views/contract_option.py:123
 #: gym/views/contract_type.py:123 gym/views/document.py:171
-#: gym/views/gym.py:463 manager/views/day.py:100 manager/views/schedule.py:333
+#: gym/views/gym.py:463 manager/views/day.py:96 manager/views/schedule.py:333
 #: manager/views/workout.py:267 nutrition/views/ingredient.py:145
 #: nutrition/views/unit.py:143
 #, python-brace-format
@@ -1350,48 +1313,48 @@ msgstr "Indsend"
 msgid "Your feedback was successfully sent. Thank you!"
 msgstr "Din feedback blev sendt. Tak!"
 
-#: core/views/user.py:156
+#: core/views/user.py:155
 #, python-brace-format
 msgid "Account \"{0}\" was successfully deleted"
 msgstr "Kontoen \"{0}\" blev slettet"
 
-#: core/views/user.py:292
+#: core/views/user.py:291
 msgid "You were successfully registered"
 msgstr "Du er nu registreret"
 
-#: core/views/user.py:351
+#: core/views/user.py:350
 msgid "Settings successfully updated"
 msgstr "Indstillinger opdateret"
 
-#: core/views/user.py:390
+#: core/views/user.py:389
 msgid "The user was successfully deactivated"
 msgstr "Brugeren blev deaktiveret"
 
-#: core/views/user.py:427
+#: core/views/user.py:426
 msgid "The user was successfully activated"
 msgstr "Brugeren blev aktiveret"
 
-#: core/views/user.py:442
+#: core/views/user.py:441
 msgid "Edit user"
 msgstr "Rediger bruger"
 
-#: core/views/user.py:597 gym/templates/gym/member_list.html:26
+#: core/views/user.py:596 gym/templates/gym/member_list.html:26
 #: gym/views/gym.py:158
 msgid "ID"
 msgstr ""
 
-#: core/views/user.py:598 gym/forms.py:95 gym/templates/contract/view.html:55
+#: core/views/user.py:597 gym/forms.py:95 gym/templates/contract/view.html:55
 #: gym/templates/gym/member_list.html:27 gym/views/export.py:59
 #: gym/views/gym.py:158 gym/views/gym.py:217
 msgid "Username"
 msgstr "Brugernavn"
 
-#: core/views/user.py:601 gym/templates/gym/new_user.html:34
+#: core/views/user.py:600 gym/templates/gym/new_user.html:34
 #: gym/views/export.py:58 gym/views/gym.py:217
 msgid "Gym"
 msgstr "Fitnescenter"
 
-#: core/views/user.py:660
+#: core/views/user.py:659
 #, python-format
 msgid "A verification email was sent to %(email)s"
 msgstr "En bekræftelsesemail blev sendt til %(email)s"
@@ -1544,11 +1507,6 @@ msgstr "Codec, langt navn"
 msgid "Equipment list"
 msgstr "Udstyrsliste"
 
-#: exercises/templates/equipment/admin-overview.html:39
-#: exercises/views/equipment.py:92
-msgid "Add new equipment"
-msgstr "Tilføj nyt udstyr"
-
 #: exercises/templates/history/overview.html:11
 msgid "Exercise admin history"
 msgstr "Øvelses administrator historik"
@@ -1598,11 +1556,6 @@ msgstr "Fortryd ændringer"
 msgid "Muscle overview"
 msgstr "Muskeloversigt"
 
-#: exercises/templates/muscles/admin-overview.html:38
-#: exercises/views/muscles.py:68
-msgid "Add muscle"
-msgstr "Tilføj muskler"
-
 #: exercises/views/categories.py:72
 msgid "Add category"
 msgstr "Tilføj kategori"
@@ -1611,6 +1564,10 @@ msgstr "Tilføj kategori"
 msgid "This will also delete all exercises in this category."
 msgstr "Dette vil også slette alle øvelser i denne kategori."
 
+#: exercises/views/equipment.py:92
+msgid "Add new equipment"
+msgstr "Tilføj nyt udstyr"
+
 #: exercises/views/equipment.py:104 exercises/views/equipment.py:115
 msgid "Delete equipment?"
 msgstr "Slet udstyr?"
@@ -1619,6 +1576,10 @@ msgstr "Slet udstyr?"
 msgid "This will delete the exercise from all workouts."
 msgstr "Dette vil slette øvelsen fra alle træninger."
 
+#: exercises/views/muscles.py:68
+msgid "Add muscle"
+msgstr "Tilføj muskler"
+
 #: gallery/templates/images/overview.html:62
 msgid "Add image"
 msgstr "Tilføj billede"
@@ -1704,7 +1665,7 @@ msgid "Contract is active"
 msgstr "Kontrakten er aktiv"
 
 #: gym/models/contract.py:237 gym/templates/contract/view.html:69
-#: manager/models/schedule.py:61 manager/templates/schedule/view.html:67
+#: manager/models/schedule.py:61 manager/templates/schedule/view.html:66
 msgid "Start date"
 msgstr "Startdato"
 
@@ -1741,7 +1702,7 @@ msgstr "Administrator: kan administrere brugere i et fitnescenter"
 msgid "Admin: can administrate the different gyms"
 msgstr "Administrator: kan administrere forskellige fitnescentre"
 
-#: gym/models/gym.py:65 gym/templates/gym/member_list.html:114
+#: gym/models/gym.py:65 gym/templates/gym/member_list.html:126
 msgid "Owner"
 msgstr "Ejer"
 
@@ -1753,7 +1714,7 @@ msgstr ""
 "Antal uger, siden sidste gang brugeren har vist sig, for at brugeren "
 "betragtes som inaktiv"
 
-#: gym/models/gym_config.py:56 gym/templates/gym/member_list.html:152
+#: gym/models/gym_config.py:56 gym/templates/gym/member_list.html:166
 msgid "Show name in header"
 msgstr "Vis navn i overskriften"
 
@@ -1767,7 +1728,7 @@ msgstr "Vis navnet på fitnescentret i sidens overskrift"
 msgid "Configuration for {self.gym.name}"
 msgstr "Konfiguration for {}"
 
-#: gym/models/user_config.py:65 gym/templates/gym/member_list.html:184
+#: gym/models/user_config.py:65 gym/templates/gym/member_list.html:200
 msgid "Overview of inactive members"
 msgstr "Oversigt over inaktive medlemmer"
 
@@ -1791,7 +1752,7 @@ msgstr "Bruger filnavn hvis intet andet er angivet"
 msgid "User notes"
 msgstr "Brugernoter"
 
-#: gym/templates/contract/list.html:36
+#: gym/templates/contract/list.html:34
 msgid "Show"
 msgstr "Vis"
 
@@ -1818,11 +1779,11 @@ msgstr ""
 msgid "Gym list"
 msgstr "Fitnescenterliste"
 
-#: gym/templates/gym/list.html:50
+#: gym/templates/gym/list.html:53
 msgid "Global gym configuration"
 msgstr "Global fitnescenter konfiguration"
 
-#: gym/templates/gym/list.html:67 gym/views/gym.py:171
+#: gym/templates/gym/list.html:69 gym/views/gym.py:171
 msgid "Add new gym"
 msgstr "Tiføj nyt fitnescenter"
 
@@ -1834,43 +1795,43 @@ msgstr "Administratorer og trænere"
 msgid "Gym manager"
 msgstr "Fitnescenter leder"
 
-#: gym/templates/gym/member_list.html:69
+#: gym/templates/gym/member_list.html:76
 msgid "This gym has no administrators or trainers"
 msgstr "Dette fitnescenter har ingen administratorer eller trænere"
 
-#: gym/templates/gym/member_list.html:88
+#: gym/templates/gym/member_list.html:98
 msgid "Export"
 msgstr "Eksporter"
 
-#: gym/templates/gym/member_list.html:125
+#: gym/templates/gym/member_list.html:137
 msgid "Members"
 msgstr "Medlemmer"
 
-#: gym/templates/gym/member_list.html:145
+#: gym/templates/gym/member_list.html:159
 msgid "Gym configuration"
 msgstr "Fitnescenterkonfiguration"
 
-#: gym/templates/gym/member_list.html:148
+#: gym/templates/gym/member_list.html:162
 msgid "Inactive members"
 msgstr "Inaktive medlemmer"
 
-#: gym/templates/gym/member_list.html:149
+#: gym/templates/gym/member_list.html:163
 msgid "weeks"
 msgstr "uger"
 
-#: gym/templates/gym/member_list.html:181
+#: gym/templates/gym/member_list.html:197
 msgid "My configuration"
 msgstr "Min konfiguration"
 
-#: gym/templates/gym/member_list.html:215
+#: gym/templates/gym/member_list.html:234
 msgid "Types"
 msgstr "Typer"
 
-#: gym/templates/gym/member_list.html:285
+#: gym/templates/gym/member_list.html:307
 msgid "Emails"
 msgstr "Emails"
 
-#: gym/templates/gym/member_list.html:315
+#: gym/templates/gym/member_list.html:336
 msgid "Add member"
 msgstr "Tilføj medlem"
 
@@ -2166,28 +2127,38 @@ msgstr "Søg også navne på Engelsk"
 msgid "Unit"
 msgstr "Enhed"
 
+#: manager/forms.py:191 manager/models/log.py:103 manager/models/setting.py:102
+#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
+msgid "RiR"
+msgstr ""
+
 #: manager/forms.py:279
 msgid "Type"
 msgstr ""
 
-#: manager/forms.py:280 manager/templates/workout/view.html:113
+#: manager/forms.py:280 manager/templates/workout/view.html:122
 msgid "Table"
 msgstr "Tabel"
 
-#: manager/forms.py:282 manager/templates/workout/view.html:119
+#: manager/forms.py:282 manager/templates/workout/view.html:129
 msgid "with images"
 msgstr "med billeder"
 
-#: manager/forms.py:283 manager/templates/workout/view.html:125
+#: manager/forms.py:283 manager/templates/workout/view.html:136
 msgid "with comments"
 msgstr "med kommentarer"
 
+#: manager/helpers.py:86 manager/models/setting.py:72
+#: manager/templates/set/formset.html:9
+msgid "Reps"
+msgstr "Repetitioner"
+
 #: manager/management/commands/email-reminders.py:121
 msgid "Workout will expire soon"
 msgstr "Træning vil udløbe snart"
 
 #: manager/models/day.py:34 manager/models/log.py:58
-#: manager/models/session.py:60 manager/templates/schedule/view.html:102
+#: manager/models/session.py:60 manager/templates/schedule/view.html:101
 #: manager/templates/workout/view.html:9 manager/templates/workout/view.html:17
 #: manager/views/pdf.py:85 manager/views/pdf.py:161
 #: manager/views/schedule.py:151 manager/views/schedule.py:221
@@ -2210,7 +2181,7 @@ msgstr "Dag"
 msgid "Name or short description of the schedule. For example 'Program XYZ'."
 msgstr "Navn eller kort beskrivelse af skema. For eksempel 'Program XYZ'."
 
-#: manager/models/schedule.py:65 manager/templates/schedule/view.html:71
+#: manager/models/schedule.py:65 manager/templates/schedule/view.html:70
 msgid "Schedule active"
 msgstr "Skema aktivt"
 
@@ -2224,7 +2195,7 @@ msgstr ""
 "blive vis f.eks. på dit dashboard). Alle andre skemaer vil blive markerede "
 "inaktive"
 
-#: manager/models/schedule.py:77 manager/templates/schedule/view.html:81
+#: manager/models/schedule.py:77 manager/templates/schedule/view.html:80
 msgid "Is a loop"
 msgstr "Er en sløjfe"
 
@@ -2245,7 +2216,7 @@ msgid "The duration in weeks"
 msgstr "Varighed i uger"
 
 #: manager/models/schedule_step.py:64 manager/models/set.py:53
-#: manager/models/setting.py:113 nutrition/models/meal.py:55
+#: manager/models/setting.py:113 nutrition/models/meal.py:53
 #: nutrition/models/meal_item.py:66
 msgid "Order"
 msgstr "Orden"
@@ -2384,7 +2355,7 @@ msgstr "Logoversigt"
 msgid "Workout session"
 msgstr "Træningssession"
 
-#: manager/templates/calendar/partial_overview_table.html:27
+#: manager/templates/calendar/partial_overview_table.html:26
 msgid "Delete with logs"
 msgstr "Slet med logs"
 
@@ -2408,21 +2379,27 @@ msgstr ""
 "er\n"
 "vil den blive redigeret. Vægtposter vil altid blive tilføjet."
 
-#: manager/templates/schedule/overview.html:5
+#: manager/templates/schedule/overview.html:4
 msgid "Your schedules"
 msgstr "Dine skemaer"
 
 #: manager/templates/schedule/overview.html:19
-#: manager/templates/schedule/view.html:131
-#: manager/templates/schedule/view.html:183
+#: manager/templates/schedule/view.html:143
+#: manager/templates/schedule/view.html:193
 #: manager/templates/workout/overview.html:16
 msgid "active"
 msgstr "aktive"
 
-#: manager/templates/schedule/overview.html:28
+#: manager/templates/schedule/overview.html:27
 msgid "No schedules found."
 msgstr "Ingen skemaer fundet."
 
+#: manager/templates/schedule/overview.html:28
+#, fuzzy
+#| msgid "Add one now."
+msgid "Add one now"
+msgstr "Tilføj en ny."
+
 #: manager/templates/schedule/overview.html:36
 msgid ""
 "Schedules are collections of workouts that you do in\n"
@@ -2432,12 +2409,20 @@ msgstr ""
 "        rækkefølge."
 
 #: manager/templates/schedule/overview.html:39
+#, fuzzy
+#| msgid ""
+#| "You can indicate how long you want to do each workout\n"
+#| "        before jumping to the next. It is also possible to create a loop, "
+#| "so you\n"
+#| "        always do the same workouts in succession, e.g. A > B > C > A > B "
+#| "> C and so on."
 msgid ""
 "You can indicate how long you want to do each workout\n"
 "        before jumping to the next. It is also possible to create a loop, so "
 "you\n"
 "        always do the same workouts in succession, e.g. A > B > C > A > B > "
-"C and so on."
+"C and so\n"
+"        on."
 msgstr ""
 "Du kan indikere hvor lang tid du vil lave en træning\n"
 "        for du fortsætter til den næste. Det er også muligt at lave en "
@@ -2445,7 +2430,7 @@ msgstr ""
 "        altid laver de samme træninger i rækkefølge, f.eks. A > B > C > A > "
 "B > C og så videre."
 
-#: manager/templates/schedule/overview.html:43
+#: manager/templates/schedule/overview.html:44
 msgid ""
 "The currently active schedule will remain active (and be\n"
 "        shown e.g. in your dashboard) till it reaches the last workout or "
@@ -2465,7 +2450,7 @@ msgstr "Tilføj skema"
 msgid "Schedule"
 msgstr "Skema"
 
-#: manager/templates/schedule/view.html:85
+#: manager/templates/schedule/view.html:84
 msgid ""
 "This schedule is a loop and will go through the workouts above till you "
 "deactivate it"
@@ -2473,19 +2458,19 @@ msgstr ""
 "Dette skema er en sløjfe og vil gå igennem træningerne ovenfor indtil du "
 "deaktiverer det"
 
-#: manager/templates/schedule/view.html:103
+#: manager/templates/schedule/view.html:102
 msgid "Weeks"
 msgstr "Uger"
 
-#: manager/templates/schedule/view.html:115
+#: manager/templates/schedule/view.html:114
 msgid "Move me"
 msgstr "Flyt mig"
 
-#: manager/templates/schedule/view.html:156
+#: manager/templates/schedule/view.html:168
 msgid "Start schedule"
 msgstr "Start skema"
 
-#: manager/templates/schedule/view.html:187
+#: manager/templates/schedule/view.html:197
 #, python-format
 msgid ""
 "%(weeks)s Week\n"
@@ -2500,11 +2485,11 @@ msgstr[1] ""
 "%(weeks)s Uger\n"
 "                                "
 
-#: manager/templates/schedule/view.html:221
+#: manager/templates/schedule/view.html:231
 msgid "Adding workouts"
 msgstr "Tilføj træninger"
 
-#: manager/templates/schedule/view.html:223
+#: manager/templates/schedule/view.html:233
 msgid ""
 "Add as many workouts to the schedule as you want. You can\n"
 "            edit the order by dragging and dropping them. It's also possible "
@@ -2516,48 +2501,48 @@ msgstr ""
 "muligt at tilføje en træning mere\n"
 "            end en gang."
 
-#: manager/templates/schedule/view.html:232
-#: manager/templates/schedule/view.html:243
-#: manager/templates/schedule/view.html:290
+#: manager/templates/schedule/view.html:242
+#: manager/templates/schedule/view.html:256
+#: manager/templates/schedule/view.html:310
 #: manager/templates/workout/view.html:69
-#: manager/templates/workout/view.html:79
-#: manager/templates/workout/view.html:178
+#: manager/templates/workout/view.html:83
+#: manager/templates/workout/view.html:192
 msgid "Export calendar file"
 msgstr "Eksporter kalenderfil"
 
-#: manager/templates/schedule/view.html:236
+#: manager/templates/schedule/view.html:248
 msgid "Export this schedule as a calendar file."
 msgstr "Eksporter dette skema som kalenderfil."
 
-#: manager/templates/schedule/view.html:237
-#: manager/templates/workout/view.html:74
+#: manager/templates/schedule/view.html:249
+#: manager/templates/workout/view.html:76
+#, fuzzy
+#| msgid ""
+#| "You can then import the file it into your calendar\n"
+#| "                        application for example google calendar, outlook "
+#| "or iCal. This will create\n"
+#| "                        an appointment for each training day with the "
+#| "appropriate exercises."
 msgid ""
 "You can then import the file it into your calendar\n"
 "                        application for example google calendar, outlook or "
 "iCal. This will create\n"
 "                        an appointment for each training day with the "
-"appropriate exercises."
+"appropriate\n"
+"                        exercises."
 msgstr ""
 "Du kan importere filen i din kalenderapplikation\n"
 "                        for eksempel Google Calendar, Outlook eller iCal. "
 "Dette vil oprette\n"
 "                        en aftale for hver træningsdag med øvelser."
 
-#: manager/templates/schedule/view.html:258
-#: manager/templates/schedule/view.html:294
-#: manager/templates/workout/view.html:94
-#: manager/templates/workout/view.html:174
+#: manager/templates/schedule/view.html:272
+#: manager/templates/schedule/view.html:315
+#: manager/templates/workout/view.html:99
+#: manager/templates/workout/view.html:188
 msgid "Download as PDF"
 msgstr "Hent som PDF"
 
-#: manager/templates/schedule/view.html:299
-msgid "Edit schedule"
-msgstr "Rediger skema"
-
-#: manager/templates/schedule/view.html:304
-msgid "Delete schedule"
-msgstr "Slet skema"
-
 #: manager/templates/set/add.html:9
 #, python-format
 msgid "Add exercises to day \"%(day_name)s\""
@@ -2626,47 +2611,6 @@ msgid ""
 "You will regularly receive such reminders till you enter your current weight."
 msgstr ""
 
-#: manager/templates/workout/log.html:10 manager/templates/workout/log.html:11
-msgid "Weight log"
-msgstr ""
-
-#: manager/templates/workout/log.html:29
-msgid "Weight log for workout"
-msgstr ""
-
-#: manager/templates/workout/log.html:49
-msgid "Add weight log to this day"
-msgstr ""
-
-#: manager/templates/workout/log.html:69
-msgid "No weight entries here."
-msgstr ""
-
-#: manager/templates/workout/log.html:77
-msgid "No exercises for this day."
-msgstr ""
-
-#: manager/templates/workout/log.html:90
-msgid ""
-"This page shows the weight logs belonging to this workout\n"
-"only. Click on an exercise to see all the historical data for\n"
-"it."
-msgstr ""
-
-#: manager/templates/workout/log.html:94
-msgid ""
-"If on a single day there is more than one entry with the\n"
-"same number of repetitions, but different weights, only the entry with the\n"
-"higher weight is shown in the diagram."
-msgstr ""
-
-#: manager/templates/workout/log.html:98
-msgid ""
-"Note that only entries with a weight unit (kg or lb) and\n"
-"repetitions are charted, other combinations such as time or until failure\n"
-"are ignored here."
-msgstr ""
-
 #: manager/templates/workout/overview.html:25
 #, fuzzy
 #| msgid "Nothing found."
@@ -2706,27 +2650,23 @@ msgstr ""
 msgid "Set the repetitions for each set"
 msgstr ""
 
-#: manager/templates/workout/view.html:73
+#: manager/templates/workout/view.html:75
 msgid "Export this workout as a calendar file."
 msgstr ""
 
-#: manager/templates/workout/view.html:144
+#: manager/templates/workout/view.html:156
 msgid "Logs"
 msgstr ""
 
-#: manager/templates/workout/view.html:146
+#: manager/templates/workout/view.html:159
 msgid "View logs"
 msgstr ""
 
-#: manager/templates/workout/view.html:169 manager/views/schedule_step.py:99
-msgid "Edit workout"
-msgstr ""
-
-#: manager/templates/workout/view.html:182 manager/views/workout.py:281
+#: manager/templates/workout/view.html:195 manager/views/workout.py:281
 msgid "Mark as template"
 msgstr ""
 
-#: manager/views/day.py:109
+#: manager/views/day.py:105
 msgid "Add workout day"
 msgstr ""
 
@@ -2743,6 +2683,10 @@ msgstr ""
 msgid "Create schedule"
 msgstr ""
 
+#: manager/views/schedule_step.py:99
+msgid "Edit workout"
+msgstr ""
+
 #: manager/views/workout.py:209
 msgid "Copy workout"
 msgstr ""
@@ -2864,7 +2808,7 @@ msgstr ""
 msgid "Unit amount, e.g. \"1 Cup\" or \"1/2 spoon\""
 msgstr ""
 
-#: nutrition/models/log.py:52 nutrition/models/meal.py:50
+#: nutrition/models/log.py:52 nutrition/models/meal.py:48
 #: nutrition/models/meal_item.py:48 nutrition/models/plan.py:108
 msgid "Nutrition plan"
 msgstr "Ernæringsplan"
@@ -2877,11 +2821,11 @@ msgstr ""
 msgid "Date and Time (Approx.)"
 msgstr ""
 
-#: nutrition/models/meal.py:62
+#: nutrition/models/meal.py:60
 msgid "Time (approx)"
 msgstr ""
 
-#: nutrition/models/meal.py:69
+#: nutrition/models/meal.py:67
 msgid ""
 "Give meals a textual description / name such as \"Breakfast\" or \"after "
 "workout\""
@@ -3000,10 +2944,6 @@ msgstr ""
 msgid "Search"
 msgstr ""
 
-#: nutrition/templates/ingredient/overview.html:62
-msgid "Add ingredient"
-msgstr ""
-
 #: nutrition/templates/ingredient/view.html:45 nutrition/views/plan.py:229
 msgid "Macronutrients"
 msgstr ""
@@ -3023,20 +2963,11 @@ msgstr ""
 msgid "Others"
 msgstr ""
 
-#: nutrition/templates/ingredient/view.html:144
-#: nutrition/templates/units/list.html:46 nutrition/views/unit.py:86
+#: nutrition/templates/ingredient/view.html:143
+#: nutrition/templates/units/list.html:50 nutrition/views/unit.py:86
 msgid "Add new weight unit"
 msgstr ""
 
-#: nutrition/templates/ingredient/view.html:206
-#: nutrition/templates/ingredient/view.html:209
-msgid "Edit ingredient"
-msgstr ""
-
-#: nutrition/templates/ingredient/view.html:213
-msgid "Delete ingredient"
-msgstr ""
-
 #: nutrition/templates/rate/form.html:25
 msgid "Basal metabolic rate"
 msgstr ""
@@ -3601,6 +3532,32 @@ msgstr ""
 msgid "Delete weight entry for the %s"
 msgstr ""
 
+#~ msgid ""
+#~ "If a license has been localized, e.g. the Creative Commons\n"
+#~ "            licenses for the different countries, add them as separate "
+#~ "entries here."
+#~ msgstr ""
+#~ "Hvis in licens er fundet, f.eks. en Creative Commons\n"
+#~ "            licens for et land, tilføj dem som seperate poster her."
+
+#~ msgid "Add weight log"
+#~ msgstr "Tilføj vægtlog"
+
+#~ msgid "This exercise has no repetitions."
+#~ msgstr "Denne øvelse har ingen repetitioner."
+
+#~ msgid "Edit them now."
+#~ msgstr "Rediger dem nu."
+
+#~ msgid "Add exercises to this workout day"
+#~ msgstr "Tilføj øvelser til denne træningsdag"
+
+#~ msgid "Edit schedule"
+#~ msgstr "Rediger skema"
+
+#~ msgid "Delete schedule"
+#~ msgstr "Slet skema"
+
 #~ msgid "Ingredients pending review"
 #~ msgstr "Ingredienser afventer gennemgang"
 
diff --git a/wger/locale/de/LC_MESSAGES/django.po b/wger/locale/de/LC_MESSAGES/django.po
index 46e242048..1bc83a2b3 100644
--- a/wger/locale/de/LC_MESSAGES/django.po
+++ b/wger/locale/de/LC_MESSAGES/django.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: wger Workout Manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-07-14 15:59+0200\n"
+"POT-Creation-Date: 2024-11-14 13:09+0100\n"
 "PO-Revision-Date: 2024-10-08 16:16+0000\n"
 "Last-Translator: kvnrmnn <kvnrmnn@proton.me>\n"
 "Language-Team: German <https://hosted.weblate.org/projects/wger/web/de/>\n"
@@ -22,7 +22,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 5.8-dev\n"
 
-#: config/models/gym_config.py:46 gym/templates/gym/list.html:53
+#: config/models/gym_config.py:46 gym/templates/gym/list.html:56
 msgid "Default gym"
 msgstr "Standard Studio"
 
@@ -35,28 +35,28 @@ msgstr ""
 "registrierten Benutzer diesem Studio zuweisen und alle Anwender ohne ein "
 "Studio aktualisieren."
 
-#: config/views/gym_config.py:42 core/templates/language/view.html:67
-#: core/templates/license/list.html:17 core/templates/misc/license/list.html:18
+#: config/views/gym_config.py:42 core/templates/language/view.html:64
+#: core/templates/license/list.html:17
 #: core/templates/repetition_unit/list.html:18
-#: core/templates/tags/render_day.html:39
-#: core/templates/tags/render_day.html:75 core/templates/user/overview.html:204
-#: core/templates/user/overview.html:445
+#: core/templates/user/overview.html:204 core/templates/user/overview.html:467
 #: core/templates/weight_unit/list.html:18
 #: exercises/templates/categories/admin-overview.html:17
 #: exercises/templates/equipment/admin-overview.html:17
-#: exercises/templates/muscles/admin-overview.html:17
-#: gallery/views/images.py:98 gym/templates/admin_notes/list.html:32
-#: gym/templates/contract/list.html:31 gym/templates/contract/view.html:107
-#: gym/templates/contract_option/list.html:32
-#: gym/templates/contract_type/list.html:32 gym/templates/document/list.html:38
-#: gym/templates/gym/list.html:20 gym/templates/gym/list.html:46
-#: gym/templates/gym/member_list.html:87 gym/templates/gym/member_list.html:140
-#: gym/templates/gym/member_list.html:176
-#: manager/templates/calendar/day.html:68
-#: manager/templates/calendar/month.html:85
-#: manager/templates/calendar/partial_overview_table.html:18
-#: manager/templates/schedule/view.html:118
-#: nutrition/templates/ingredient/view.html:165
+#: exercises/templates/muscles/admin-overview.html:16
+#: gallery/views/images.py:98 gym/templates/admin_notes/list.html:31
+#: gym/templates/contract/list.html:30 gym/templates/contract/view.html:106
+#: gym/templates/contract_option/list.html:29
+#: gym/templates/contract_type/list.html:30 gym/templates/document/list.html:38
+#: gym/templates/gym/list.html:19 gym/templates/gym/list.html:48
+#: gym/templates/gym/member_list.html:94 gym/templates/gym/member_list.html:152
+#: gym/templates/gym/member_list.html:190
+#: manager/templates/calendar/day.html:67
+#: manager/templates/calendar/month.html:84
+#: manager/templates/calendar/partial_overview_table.html:16
+#: manager/templates/schedule/view.html:318
+#: manager/templates/workout/view.html:181
+#: nutrition/templates/ingredient/view.html:164
+#: nutrition/templates/ingredient/view.html:209
 #: nutrition/templates/units/list.html:19
 msgid "Edit"
 msgstr "Bearbeiten"
@@ -90,8 +90,8 @@ msgstr "Mein cooler Zeitplan"
 msgid "Empty placeholder schedule"
 msgstr "Leerer Platzhalter Zeitplan"
 
-#: core/forms.py:69 core/templates/navigation.html:285
-#: core/templates/navigation.html:291 core/templates/user/login.html:4
+#: core/forms.py:69 core/templates/navigation.html:284
+#: core/templates/navigation.html:290 core/templates/user/login.html:4
 #: software/templates/features.html:82 software/templates/features.html:427
 msgid "Login"
 msgstr "Anmelden"
@@ -101,14 +101,14 @@ msgstr "Anmelden"
 msgid "First name"
 msgstr "Vorname"
 
-#: core/forms.py:109 core/forms.py:215 core/templates/user/overview.html:266
+#: core/forms.py:109 core/forms.py:215 core/templates/user/overview.html:284
 #: gym/views/export.py:62 gym/views/gym.py:217
 msgid "Last name"
 msgstr "Nachname"
 
-#: core/forms.py:111 core/forms.py:180 core/templates/user/overview.html:270
+#: core/forms.py:111 core/forms.py:180 core/templates/user/overview.html:288
 #: gym/models/contract.py:256 gym/models/gym.py:58
-#: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:104
+#: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:116
 #: gym/templates/gym/new_user.html:30 gym/views/export.py:60
 #: mailer/templates/mailer/gym/form.html:4
 #: mailer/templates/mailer/gym/overview.html:4
@@ -139,8 +139,8 @@ msgstr "Trainingsplanerinnerungen"
 msgid "Other settings"
 msgstr "Andere Einstellungen"
 
-#: core/forms.py:174 core/views/user.py:624 core/views/user.py:639
-#: core/views/user.py:651 gym/forms.py:73 manager/templates/log/add.html:65
+#: core/forms.py:174 core/views/user.py:623 core/views/user.py:638
+#: core/views/user.py:650 gym/forms.py:73 manager/templates/log/add.html:65
 #: manager/templates/set/add.html:70 manager/views/workout.py:203
 #: utils/generic_views.py:143
 msgid "Save"
@@ -165,26 +165,25 @@ msgstr "Passwort"
 msgid "Please enter your current password."
 msgstr "Bitte dein aktuelles Passwort eingeben."
 
-#: core/forms.py:242 core/templates/language/view.html:73
-#: core/templates/license/list.html:19 core/templates/misc/license/list.html:22
-#: core/templates/repetition_unit/list.html:20
-#: core/templates/tags/render_day.html:45
-#: core/templates/tags/render_day.html:81 core/templates/user/overview.html:217
-#: core/templates/weight_unit/list.html:20
-#: exercises/templates/categories/admin-overview.html:19
-#: exercises/templates/equipment/admin-overview.html:19
-#: exercises/templates/muscles/admin-overview.html:19
-#: gym/templates/admin_notes/list.html:40
-#: gym/templates/contract_option/list.html:41
-#: gym/templates/contract_type/list.html:41 gym/templates/document/list.html:46
-#: gym/templates/gym/list.html:22 manager/templates/calendar/day.html:73
-#: manager/templates/calendar/month.html:89
-#: manager/templates/calendar/partial_overview_table.html:23
-#: manager/templates/schedule/view.html:122
-#: manager/templates/workout/view.html:188
-#: nutrition/templates/ingredient/view.html:166
+#: core/forms.py:242 core/templates/language/view.html:70
+#: core/templates/license/list.html:21
+#: core/templates/repetition_unit/list.html:22
+#: core/templates/user/overview.html:233
+#: core/templates/weight_unit/list.html:22
+#: exercises/templates/categories/admin-overview.html:21
+#: exercises/templates/equipment/admin-overview.html:21
+#: exercises/templates/muscles/admin-overview.html:20
+#: gym/templates/admin_notes/list.html:37
+#: gym/templates/contract_option/list.html:35
+#: gym/templates/contract_type/list.html:36 gym/templates/document/list.html:46
+#: gym/templates/gym/list.html:23 manager/templates/calendar/day.html:73
+#: manager/templates/calendar/month.html:88
+#: manager/templates/calendar/partial_overview_table.html:22
+#: manager/templates/schedule/view.html:324
+#: manager/templates/workout/view.html:202
+#: nutrition/templates/ingredient/view.html:168
 #: nutrition/templates/ingredient/view.html:215
-#: nutrition/templates/units/list.html:22
+#: nutrition/templates/units/list.html:25
 msgid "Delete"
 msgstr "Löschen"
 
@@ -196,9 +195,9 @@ msgstr "Ungültiges Passwort"
 msgid "The form is secured with reCAPTCHA"
 msgstr "Das Formular ist mit reCaptcha gesichert"
 
-#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:285
-#: core/templates/navigation.html:297 core/templates/template.html:149
-#: core/templates/user/login.html:20 core/views/user.py:298
+#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:284
+#: core/templates/navigation.html:296 core/templates/template.html:151
+#: core/templates/user/login.html:20 core/views/user.py:297
 #: software/templates/features.html:87 software/templates/features.html:422
 msgid "Register"
 msgstr "Registrieren"
@@ -452,18 +451,18 @@ msgid "The sum of all hours has to be 24"
 msgstr "Die Summe aller Stunden muss 24 sein"
 
 #: core/models/rep_unit.py:36 core/models/weight_unit.py:36
-#: core/templates/user/overview.html:262 core/views/user.py:599
+#: core/templates/user/overview.html:280 core/views/user.py:598
 #: exercises/models/category.py:29 exercises/models/equipment.py:29
 #: exercises/models/exercise.py:59 exercises/models/muscle.py:36
 #: gym/models/contract.py:52 gym/models/contract.py:103 gym/models/gym.py:46
 #: gym/models/user_document.py:84 gym/templates/contract/view.html:50
-#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:96
+#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:108
 #: gym/views/gym.py:158 manager/models/schedule.py:55
 #: manager/models/workout.py:57 measurements/models/category.py:36
 #: nutrition/models/ingredient.py:111
-#: nutrition/models/ingredient_category.py:27 nutrition/models/meal.py:67
+#: nutrition/models/ingredient_category.py:27 nutrition/models/meal.py:65
 #: nutrition/models/weight_unit.py:38
-#: nutrition/templates/ingredient/view.html:152
+#: nutrition/templates/ingredient/view.html:151
 msgid "Name"
 msgstr "Name"
 
@@ -516,7 +515,7 @@ msgstr ""
 msgid "Back to \"%(target)s\""
 msgstr "Zurück zu „%(target)s“"
 
-#: core/templates/delete.html:15
+#: core/templates/delete.html:4
 msgid "Are you sure you want to delete this? This action cannot be undone."
 msgstr ""
 "Bist du sicher, dass du das löschen willst? Diese Aktion kann nicht "
@@ -574,7 +573,7 @@ msgstr ""
 msgid "Dashboard"
 msgstr "Übersicht"
 
-#: core/templates/language/overview.html:4 core/templates/navigation.html:345
+#: core/templates/language/overview.html:4 core/templates/navigation.html:344
 msgid "Languages"
 msgstr "Sprachen"
 
@@ -584,81 +583,72 @@ msgstr "Nichts gefunden."
 
 #: core/templates/language/overview.html:22
 #: manager/templates/calendar/month.html:132
-#: manager/templates/schedule/overview.html:28
-#: manager/templates/schedule/view.html:144
+#: manager/templates/schedule/view.html:154
 #: manager/templates/workout/overview.html:28
 #: nutrition/templates/ingredient/overview.html:38
 msgid "Add one now."
 msgstr "Jetzt hinzufügen."
 
-#: core/templates/language/overview.html:35 core/templates/license/list.html:40
-#: core/templates/misc/license/list.html:43
-#: core/templates/repetition_unit/list.html:43
-#: core/templates/user/overview.html:326 core/templates/user/overview.html:365
-#: core/templates/user/overview.html:401
-#: core/templates/weight_unit/list.html:43 core/views/languages.py:74
+#: core/templates/language/overview.html:34 core/templates/license/list.html:43
+#: core/templates/repetition_unit/list.html:46
+#: core/templates/user/overview.html:344 core/templates/user/overview.html:384
+#: core/templates/user/overview.html:422
+#: core/templates/weight_unit/list.html:46 core/views/languages.py:74
 #: core/views/license.py:66 core/views/repetition_units.py:66
 #: core/views/weight_units.py:66
-#: exercises/templates/categories/admin-overview.html:38
-#: gallery/views/images.py:63 gym/templates/admin_notes/list.html:67
-#: gym/templates/contract/list.html:73
-#: gym/templates/contract_option/list.html:72
-#: gym/templates/contract_type/list.html:72 gym/templates/document/list.html:79
-#: gym/templates/gym/member_list.html:211
-#: gym/templates/gym/member_list.html:244
-#: gym/templates/gym/member_list.html:281
+#: exercises/templates/categories/admin-overview.html:40
+#: exercises/templates/equipment/admin-overview.html:39
+#: exercises/templates/muscles/admin-overview.html:40
+#: gallery/views/images.py:63 gym/templates/admin_notes/list.html:64
+#: gym/templates/contract/list.html:69
+#: gym/templates/contract_option/list.html:65
+#: gym/templates/contract_type/list.html:66 gym/templates/document/list.html:78
+#: gym/templates/gym/member_list.html:228
+#: gym/templates/gym/member_list.html:264
+#: gym/templates/gym/member_list.html:303
 #: mailer/templates/mailer/gym/overview.html:43
+#: nutrition/templates/ingredient/overview.html:60
 msgid "Add"
 msgstr "Hinzufügen"
 
 #: core/templates/language/view.html:61 core/templates/user/api_key.html:44
-#: core/templates/user/preferences.html:45 gym/models/contract.py:203
-#: gym/templates/contract/view.html:41 gym/templates/contract/view.html:106
-#: gym/templates/gym/member_list.html:248
-#: manager/templates/schedule/view.html:285
-#: manager/templates/workout/view.html:163
-#: nutrition/templates/ingredient/view.html:202
+#: core/templates/user/preferences.html:50 gym/models/contract.py:203
+#: gym/templates/contract/view.html:41 gym/templates/gym/member_list.html:270
+#: manager/templates/schedule/view.html:304
+#: manager/templates/workout/view.html:177
+#: nutrition/templates/ingredient/view.html:206
 msgid "Options"
 msgstr "Optionen"
 
-#: core/templates/license/list.html:4 core/templates/misc/license/list.html:4
+#: core/templates/license/list.html:4
 msgid "License list"
 msgstr "Lizenzliste"
 
-#: core/templates/license/list.html:26 core/templates/misc/license/list.html:30
-#: core/templates/repetition_unit/list.html:28
+#: core/templates/license/list.html:30
+#: core/templates/repetition_unit/list.html:32
 #: core/templates/user/overview.html:104 core/templates/user/overview.html:136
-#: core/templates/user/overview.html:185 core/templates/user/overview.html:347
-#: core/templates/user/overview.html:383 core/templates/user/overview.html:427
-#: core/templates/weight_unit/list.html:28
-#: exercises/templates/categories/admin-overview.html:26
-#: exercises/templates/equipment/admin-overview.html:26
-#: exercises/templates/muscles/admin-overview.html:26
-#: gym/templates/admin_notes/list.html:52 gym/templates/contract/list.html:60
-#: gym/templates/contract_option/list.html:58
-#: gym/templates/contract_type/list.html:58 gym/templates/document/list.html:64
-#: gym/templates/gym/list.html:29 gym/templates/gym/member_list.html:229
-#: gym/templates/gym/member_list.html:262
-#: gym/templates/gym/member_list.html:299
+#: core/templates/user/overview.html:185 core/templates/user/overview.html:365
+#: core/templates/user/overview.html:404 core/templates/user/overview.html:448
+#: core/templates/weight_unit/list.html:32
+#: exercises/templates/categories/admin-overview.html:30
+#: exercises/templates/equipment/admin-overview.html:30
+#: exercises/templates/muscles/admin-overview.html:29
+#: gym/templates/admin_notes/list.html:50 gym/templates/contract/list.html:57
+#: gym/templates/contract_option/list.html:52
+#: gym/templates/contract_type/list.html:53 gym/templates/document/list.html:64
+#: gym/templates/gym/list.html:32 gym/templates/gym/member_list.html:248
+#: gym/templates/gym/member_list.html:284
+#: gym/templates/gym/member_list.html:321
 #: mailer/templates/mailer/gym/overview.html:30
-#: manager/templates/calendar/day.html:87
-#: nutrition/templates/units/list.html:29
+#: manager/templates/calendar/day.html:88
+#: nutrition/templates/units/list.html:34
 msgid "Nothing found"
 msgstr "Nichts gefunden"
 
-#: core/templates/misc/about.html:4 core/templates/template.html:175
+#: core/templates/misc/about.html:4 core/templates/template.html:188
 msgid "Imprint"
 msgstr "Impressum"
 
-#: core/templates/misc/license/list.html:47
-msgid ""
-"If a license has been localized, e.g. the Creative Commons\n"
-"            licenses for the different countries, add them as separate "
-"entries here."
-msgstr ""
-"Wenn eine Lizenz lokalisiert wurde wie z.B. die Creative Commons Lizenzen\n"
-"für die verschiedenen Länder, füge sie einzeln hinzu."
-
 #: core/templates/navigation.html:28 software/templates/features.html:437
 msgid "Training"
 msgstr "Training"
@@ -703,8 +693,8 @@ msgstr "Öffentliche Vorlagen"
 msgid "Exercises"
 msgstr "Übungen"
 
-#: core/templates/navigation.html:111 core/templates/navigation.html:184
-#: core/templates/navigation.html:340
+#: core/templates/navigation.html:111 core/templates/navigation.html:185
+#: core/templates/navigation.html:339
 msgid "Administration"
 msgstr "Administration"
 
@@ -741,87 +731,87 @@ msgstr "BMI-Rechner"
 msgid "Daily calories calculator"
 msgstr "Kalorienrechner"
 
-#: core/templates/navigation.html:179
+#: core/templates/navigation.html:180
 #: nutrition/templates/ingredient/overview.html:10
 msgid "Ingredient overview"
 msgstr "Zutatenübersicht"
 
-#: core/templates/navigation.html:187 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:189 nutrition/templates/units/list.html:6
 msgid "Ingredient weight units"
 msgstr "Gewichtseinheiten für Zutaten"
 
-#: core/templates/navigation.html:203 software/templates/features.html:442
+#: core/templates/navigation.html:205 software/templates/features.html:442
 msgid "Body weight"
 msgstr "Körpergewicht"
 
-#: core/templates/navigation.html:210 core/templates/user/overview.html:114
+#: core/templates/navigation.html:212 core/templates/user/overview.html:114
 msgid "Weight overview"
 msgstr "Gewichtsübersicht"
 
-#: core/templates/navigation.html:217 weight/views.py:65
+#: core/templates/navigation.html:216 weight/views.py:65
 msgid "Add weight entry"
 msgstr "Gewichtseintrag hinzufügen"
 
-#: core/templates/navigation.html:231
+#: core/templates/navigation.html:230
 msgid "About this software"
 msgstr "Über diese Software"
 
-#: core/templates/navigation.html:237 software/templates/about_us.html:5
+#: core/templates/navigation.html:236 software/templates/about_us.html:5
 msgid "About us"
 msgstr "Über uns"
 
-#: core/templates/navigation.html:243 software/templates/features.html:507
+#: core/templates/navigation.html:242 software/templates/features.html:507
 msgid "REST API"
 msgstr "REST API"
 
-#: core/templates/navigation.html:249 utils/models.py:45
+#: core/templates/navigation.html:248 utils/models.py:45
 msgid "License"
 msgstr "Lizenz"
 
-#: core/templates/navigation.html:255
+#: core/templates/navigation.html:254
 msgid "Developer documentation"
 msgstr "Entwickler-Dokumentation"
 
-#: core/templates/navigation.html:262
+#: core/templates/navigation.html:261
 msgid "Get the code"
 msgstr "Quellcode"
 
-#: core/templates/navigation.html:269 core/templates/template.html:214
+#: core/templates/navigation.html:268 core/templates/template.html:227
 #: software/templates/features.html:582
 msgid "Translate"
 msgstr "Übersetze"
 
-#: core/templates/navigation.html:303 core/templates/user/login.html:28
+#: core/templates/navigation.html:302 core/templates/user/login.html:28
 msgid "Reset password"
 msgstr "Passwort zurücketzen"
 
-#: core/templates/navigation.html:321
+#: core/templates/navigation.html:320
 msgid "My preferences"
 msgstr "Meine Einstellungen"
 
-#: core/templates/navigation.html:330
+#: core/templates/navigation.html:329
 msgid "Logout"
 msgstr "Abmelden"
 
-#: core/templates/navigation.html:353
+#: core/templates/navigation.html:352
 msgid "Licenses"
 msgstr "Lizenzen"
 
-#: core/templates/navigation.html:361
+#: core/templates/navigation.html:360
 #: core/templates/repetition_unit/list.html:4
 msgid "Repetition units"
 msgstr "Wiederholungs-Einheiten"
 
-#: core/templates/navigation.html:369 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:368 core/templates/weight_unit/list.html:4
 #: nutrition/templates/ingredient/view.html:141
 msgid "Weight units"
 msgstr "Gewichtseinheiten"
 
-#: core/templates/navigation.html:377 core/templates/user/list.html:4
+#: core/templates/navigation.html:376 core/templates/user/list.html:4
 msgid "User list"
 msgstr "Benutzerliste"
 
-#: core/templates/navigation.html:383
+#: core/templates/navigation.html:382
 msgid "Gyms"
 msgstr "Studios"
 
@@ -884,57 +874,32 @@ msgstr "zurück"
 msgid "next"
 msgstr "vor"
 
-#: core/templates/tags/render_day.html:34
-msgid "Add weight log"
-msgstr "Gewichtslog hinzufügen"
-
-#: core/templates/tags/render_day.html:116
-msgid "Placeholder image for exercise"
+#: core/templates/tags/render_day.html:44
+#, fuzzy
+#| msgid "Placeholder image for exercise"
+msgid "Placeholder image for translation"
 msgstr "Platzhalter-Bild für Übung"
 
-#: core/templates/tags/render_day.html:133
-msgid "This exercise has no repetitions."
-msgstr "Diese Übung hat keine Wiederholungen."
-
-#: core/templates/tags/render_day.html:136
-msgid "Edit them now."
-msgstr "Jetzt bearbeiten."
-
-#: core/templates/tags/render_day.html:162
-msgid "Add exercises to this workout day"
-msgstr "Übungen zu diesem Trainingstag hinzufügen"
-
-#: core/templates/tags/render_weight_log.html:17 manager/helpers.py:86
-#: manager/models/setting.py:72 manager/templates/set/formset.html:9
-msgid "Reps"
-msgstr "Wdh."
-
-#: core/templates/tags/render_weight_log.html:30 manager/forms.py:191
-#: manager/models/log.py:103 manager/models/setting.py:102
-#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
-msgid "RiR"
-msgstr "RiR"
-
-#: core/templates/template.html:122 manager/templates/calendar/month.html:138
-#: manager/templates/schedule/view.html:248
-#: manager/templates/schedule/view.html:269
-#: manager/templates/workout/view.html:84
-#: manager/templates/workout/view.html:137
+#: core/templates/template.html:124 manager/templates/calendar/month.html:138
+#: manager/templates/schedule/view.html:262
+#: manager/templates/schedule/view.html:287
+#: manager/templates/workout/view.html:89
+#: manager/templates/workout/view.html:149
 msgid "Close"
 msgstr "Schließen"
 
-#: core/templates/template.html:138
+#: core/templates/template.html:140
 msgid ""
 "You are using a guest account, data entered will be deleted after a week."
 msgstr ""
 "Du benutzt einen Gastzugang, eingegebene Daten werden nach einer Woche "
 "gelöscht."
 
-#: core/templates/template.html:143
+#: core/templates/template.html:145
 msgid "Create some demo entries"
 msgstr "Beispieldaten erstellen"
 
-#: core/templates/template.html:180 software/templates/features.html:547
+#: core/templates/template.html:193 software/templates/features.html:547
 #: software/templates/tos.html:7
 msgid "Terms of service"
 msgstr "Allgemeine Nutzungsbedingungen"
@@ -943,7 +908,7 @@ msgstr "Allgemeine Nutzungsbedingungen"
 msgid "Features"
 msgstr "Funktionen"
 
-#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:54
+#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:59
 msgid "API key"
 msgstr "API-Schlüssel"
 
@@ -989,17 +954,17 @@ msgstr "Generiere einen neuen API-Schlüssel"
 msgid "Documentation"
 msgstr "Dokumentation"
 
-#: core/templates/user/delete_account.html:4
-#: core/templates/user/preferences.html:59
+#: core/templates/user/delete_account.html:3
+#: core/templates/user/preferences.html:62
 msgid "Delete account"
 msgstr "Konto löschen"
 
-#: core/templates/user/delete_account.html:17
+#: core/templates/user/delete_account.html:9
 #: exercises/templates/history/overview.html:93
 msgid "Are you sure?"
 msgstr "Bist du sicher?"
 
-#: core/templates/user/delete_account.html:22
+#: core/templates/user/delete_account.html:14
 #, python-format
 msgid ""
 "This action will delete the user account \"%(username)s\".\n"
@@ -1022,22 +987,22 @@ msgstr "Passwort vergessen?"
 
 #: core/templates/user/overview.html:25 core/templates/user/overview.html:68
 #: core/templates/user/overview.html:112 core/templates/user/overview.html:144
-#: core/templates/user/overview.html:330 core/templates/user/overview.html:369
-#: core/templates/user/overview.html:405
+#: core/templates/user/overview.html:348 core/templates/user/overview.html:390
+#: core/templates/user/overview.html:426
 #, python-format
 msgid "last %(number)s"
 msgstr "letzte %(number)s"
 
 #: core/templates/user/overview.html:27 core/templates/user/overview.html:146
-#: core/templates/user/overview.html:325 core/templates/user/overview.html:364
-#: core/templates/user/overview.html:400 gym/templates/gym/member_list.html:210
-#: gym/templates/gym/member_list.html:243
-#: gym/templates/gym/member_list.html:280
+#: core/templates/user/overview.html:343 core/templates/user/overview.html:382
+#: core/templates/user/overview.html:421 gym/templates/gym/member_list.html:226
+#: gym/templates/gym/member_list.html:262
+#: gym/templates/gym/member_list.html:302
 msgid "Overview"
 msgstr "Übersicht"
 
 #: core/templates/user/overview.html:28
-#: manager/templates/schedule/view.html:163
+#: manager/templates/schedule/view.html:172
 #: manager/templates/workout/overview.html:39 manager/views/schedule_step.py:60
 msgid "Add workout"
 msgstr "Trainingsplan hinzufügen"
@@ -1069,38 +1034,36 @@ msgstr "Beschreibung"
 msgid "Number of logs (days)"
 msgstr "Anzahl der Protokolle (Tage)"
 
-#: core/templates/user/overview.html:37 core/views/user.py:600
+#: core/templates/user/overview.html:37 core/views/user.py:599
 #: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:158
 msgid "Last activity"
 msgstr "Letzte Aktivität"
 
 #: core/templates/user/overview.html:58
 #: manager/templates/calendar/month.html:128
-#: manager/templates/schedule/view.html:144
 #: manager/templates/workout/overview.html:28
 msgid "No workouts found."
 msgstr "Keine Trainingspläne gefunden."
 
 #: core/templates/user/overview.html:68 manager/forms.py:280
-#: manager/templates/workout/view.html:106
+#: manager/templates/workout/view.html:114
 msgid "Log"
 msgstr "Tagebucheintrag"
 
 #: core/templates/user/overview.html:77 manager/models/session.py:83
-#: manager/templates/calendar/partial_overview_table.html:52
+#: manager/templates/calendar/partial_overview_table.html:54
 msgid "General impression"
 msgstr "Allgemeiner Eindruck"
 
-#: core/templates/user/overview.html:78 core/templates/user/overview.html:369
+#: core/templates/user/overview.html:78 core/templates/user/overview.html:390
 #: manager/models/session.py:73
-#: manager/templates/calendar/partial_overview_table.html:56
-#: manager/templates/workout/log.html:89
+#: manager/templates/calendar/partial_overview_table.html:58
 msgid "Notes"
 msgstr "Notizen"
 
 #: core/templates/user/overview.html:79
 #: exercises/templates/history/overview.html:30
-#: manager/templates/calendar/partial_overview_table.html:42
+#: manager/templates/calendar/partial_overview_table.html:44
 msgid "Time"
 msgstr "Zeit"
 
@@ -1138,121 +1101,121 @@ msgstr "Fett"
 msgid "kcal"
 msgstr "kcal"
 
-#: core/templates/user/overview.html:201 core/templates/user/overview.html:322
-#: core/templates/user/overview.html:361 core/templates/user/overview.html:397
-#: core/templates/user/overview.html:442 gym/templates/gym/list.html:42
-#: gym/templates/gym/member_list.html:84 gym/templates/gym/member_list.html:137
-#: gym/templates/gym/member_list.html:173
-#: gym/templates/gym/member_list.html:207
-#: gym/templates/gym/member_list.html:240
-#: gym/templates/gym/member_list.html:277
-#: manager/templates/schedule/view.html:100
+#: core/templates/user/overview.html:201 core/templates/user/overview.html:340
+#: core/templates/user/overview.html:379 core/templates/user/overview.html:418
+#: core/templates/user/overview.html:463 gym/templates/gym/list.html:45
+#: gym/templates/gym/member_list.html:91 gym/templates/gym/member_list.html:149
+#: gym/templates/gym/member_list.html:187
+#: gym/templates/gym/member_list.html:223
+#: gym/templates/gym/member_list.html:259
+#: gym/templates/gym/member_list.html:299
+#: manager/templates/schedule/view.html:99
 msgid "Actions"
 msgstr "Aktionen"
 
-#: core/templates/user/overview.html:207
+#: core/templates/user/overview.html:210
 msgid "Deactivate user"
 msgstr "Benutzer deaktivieren"
 
-#: core/templates/user/overview.html:209
+#: core/templates/user/overview.html:214
 msgid "Activate user"
 msgstr "Benutzer aktivieren"
 
-#: core/templates/user/overview.html:211
+#: core/templates/user/overview.html:223
 msgid "Reset user password"
 msgstr "Benutzerpasswort zurücksetzen"
 
-#: core/templates/user/overview.html:214 gym/templates/gym/member_list.html:30
+#: core/templates/user/overview.html:227 gym/templates/gym/member_list.html:30
 msgid "Roles"
 msgstr "Rollen"
 
-#: core/templates/user/overview.html:225
+#: core/templates/user/overview.html:243
 msgid "Password reset confirmation"
 msgstr "Zurücksetzen des Passworts bestätigen"
 
-#: core/templates/user/overview.html:229
+#: core/templates/user/overview.html:247
 msgid "Do you really want to change this user&#39;s password?"
 msgstr "Möchtest du wirklich das Passwort vom diesem Benutzer zurücksetzen?"
 
-#: core/templates/user/overview.html:232
+#: core/templates/user/overview.html:250
 #: exercises/templates/history/overview.html:106
 msgid "No"
 msgstr "Nein"
 
-#: core/templates/user/overview.html:233
+#: core/templates/user/overview.html:251
 #: exercises/templates/history/overview.html:99
 msgid "Yes"
 msgstr "Ja"
 
-#: core/templates/user/overview.html:254 gym/templates/gym/member_list.html:93
+#: core/templates/user/overview.html:272 gym/templates/gym/member_list.html:105
 msgid "Details"
 msgstr "Details"
 
-#: core/templates/user/overview.html:258 gym/views/export.py:57
-#: manager/helpers.py:86 manager/templates/schedule/view.html:98
+#: core/templates/user/overview.html:276 gym/views/export.py:57
+#: manager/helpers.py:86 manager/templates/schedule/view.html:97
 msgid "Nr."
 msgstr "Nr."
 
-#: core/templates/user/overview.html:280 gym/models/contract.py:287
+#: core/templates/user/overview.html:298 gym/models/contract.py:287
 #: gym/models/gym.py:50 gym/templates/contract/view.html:75
-#: gym/templates/gym/member_list.html:100 gym/views/export.py:68
+#: gym/templates/gym/member_list.html:112 gym/views/export.py:68
 msgid "Phone"
 msgstr "Telefon"
 
-#: core/templates/user/overview.html:284 gym/templates/contract/view.html:87
-#: gym/templates/gym/member_list.html:118
+#: core/templates/user/overview.html:302 gym/templates/contract/view.html:87
+#: gym/templates/gym/member_list.html:130
 msgid "Address"
 msgstr "Adresse"
 
-#: core/templates/user/overview.html:295
+#: core/templates/user/overview.html:313
 msgid "Registered"
 msgstr "Registriert"
 
-#: core/templates/user/overview.html:299
+#: core/templates/user/overview.html:317
 msgid "Last login"
 msgstr "Letzter Login"
 
-#: core/templates/user/overview.html:304
+#: core/templates/user/overview.html:322
 msgid "Status"
 msgstr "Status"
 
-#: core/templates/user/overview.html:307
+#: core/templates/user/overview.html:325
 msgid "Active"
 msgstr "Aktiv"
 
-#: core/templates/user/overview.html:309
+#: core/templates/user/overview.html:327
 msgid "Inactive"
 msgstr "Inaktiv"
 
-#: core/templates/user/overview.html:330 gym/templates/contract/list.html:4
-#: gym/templates/gym/member_list.html:202
+#: core/templates/user/overview.html:348 gym/templates/contract/list.html:4
+#: gym/templates/gym/member_list.html:218
 msgid "Contracts"
 msgstr "Verträge"
 
-#: core/templates/user/overview.html:405 gym/templates/document/list.html:4
+#: core/templates/user/overview.html:426 gym/templates/document/list.html:4
 msgid "Documents"
 msgstr "Dokumente"
 
-#: core/templates/user/overview.html:412 gym/templates/document/list.html:32
-#: manager/forms.py:292 manager/templates/workout/view.html:132
+#: core/templates/user/overview.html:433 gym/templates/document/list.html:33
+#: manager/forms.py:292 manager/templates/workout/view.html:143
 msgid "Download"
 msgstr "Runterladen"
 
-#: core/templates/user/overview.html:450 gym/views/admin_config.py:44
+#: core/templates/user/overview.html:474 gym/views/admin_config.py:44
 #: gym/views/admin_config.py:58 gym/views/user_config.py:46
 msgid "Configuration"
 msgstr "Konfiguration"
 
-#: core/templates/user/overview.html:453 gym/models/user_config.py:92
+#: core/templates/user/overview.html:477 gym/models/user_config.py:92
 msgid "Include in inactive overview"
 msgstr "In Inaktivübersicht aufnehmen"
 
-#: core/templates/user/overview.html:486
+#: core/templates/user/overview.html:510
 #, python-format
 msgid "Admin login is only available for users in %(gym_name)s"
 msgstr "Admin-Login ist nur für Benutzer in %(gym_name)s verfügbar"
 
-#: core/templates/user/overview.html:490
+#: core/templates/user/overview.html:514
 msgid "Log in as this user"
 msgstr "Als diesen Benutzer einloggen"
 
@@ -1272,19 +1235,19 @@ msgstr "Nicht verifizierte E-Mail-Adresse"
 msgid "Send verification email"
 msgstr "Sende Bestätigungs-E-Mail"
 
-#: core/templates/user/preferences.html:30
+#: core/templates/user/preferences.html:31
 msgid "You need to verify your email to contribute exercises"
 msgstr "Du musst deine E-Mail-Adresse bestätigen, um Übungen beizutragen"
 
-#: core/templates/user/preferences.html:50 core/views/user.py:611
+#: core/templates/user/preferences.html:55 core/views/user.py:610
 msgid "Change password"
 msgstr "Passwort ändern"
 
-#: core/templatetags/wger_extras.py:205 i18n.tpl:37
+#: core/templatetags/wger_extras.py:197 i18n.tpl:37
 msgid "kg"
 msgstr "kg"
 
-#: core/templatetags/wger_extras.py:207
+#: core/templatetags/wger_extras.py:199
 #: nutrition/templates/ingredient/view.html:60
 #: nutrition/templates/ingredient/view.html:66
 #: nutrition/templates/ingredient/view.html:73
@@ -1296,11 +1259,11 @@ msgctxt "weight unit, i.e. grams"
 msgid "g"
 msgstr "g"
 
-#: core/templatetags/wger_extras.py:210 i18n.tpl:38
+#: core/templatetags/wger_extras.py:202 i18n.tpl:38
 msgid "lb"
 msgstr "lb"
 
-#: core/templatetags/wger_extras.py:212
+#: core/templatetags/wger_extras.py:204
 msgctxt "weight unit, i.e. ounces"
 msgid "oz"
 msgstr "oz"
@@ -1327,13 +1290,13 @@ msgid "Delete {0}?"
 msgstr "{0} löschen?"
 
 #: core/views/languages.py:111 core/views/license.py:85
-#: core/views/repetition_units.py:86 core/views/user.py:474
+#: core/views/repetition_units.py:86 core/views/user.py:473
 #: core/views/weight_units.py:86 exercises/views/categories.py:98
 #: exercises/views/equipment.py:81 exercises/views/muscles.py:87
 #: gym/views/admin_notes.py:161 gym/views/config.py:68
 #: gym/views/contract.py:186 gym/views/contract_option.py:123
 #: gym/views/contract_type.py:123 gym/views/document.py:171
-#: gym/views/gym.py:463 manager/views/day.py:100 manager/views/schedule.py:333
+#: gym/views/gym.py:463 manager/views/day.py:96 manager/views/schedule.py:333
 #: manager/views/workout.py:267 nutrition/views/ingredient.py:145
 #: nutrition/views/unit.py:143
 #, python-brace-format
@@ -1363,48 +1326,48 @@ msgstr "Abschicken"
 msgid "Your feedback was successfully sent. Thank you!"
 msgstr "Dein Feedback wurde erfolgeich versendet. Danke!"
 
-#: core/views/user.py:156
+#: core/views/user.py:155
 #, python-brace-format
 msgid "Account \"{0}\" was successfully deleted"
 msgstr "Konto „{0}“ wurde erfolgreich gelöscht"
 
-#: core/views/user.py:292
+#: core/views/user.py:291
 msgid "You were successfully registered"
 msgstr "Du hast dich erfolgreich registriert"
 
-#: core/views/user.py:351
+#: core/views/user.py:350
 msgid "Settings successfully updated"
 msgstr "Einstellungen erfolgreich aktualisiert"
 
-#: core/views/user.py:390
+#: core/views/user.py:389
 msgid "The user was successfully deactivated"
 msgstr "Der Benutzer wurde erfolgreich deaktiviert"
 
-#: core/views/user.py:427
+#: core/views/user.py:426
 msgid "The user was successfully activated"
 msgstr "Der Benutzer wurde erfolgreich aktiviert"
 
-#: core/views/user.py:442
+#: core/views/user.py:441
 msgid "Edit user"
 msgstr "Benutzer bearbeiten"
 
-#: core/views/user.py:597 gym/templates/gym/member_list.html:26
+#: core/views/user.py:596 gym/templates/gym/member_list.html:26
 #: gym/views/gym.py:158
 msgid "ID"
 msgstr "ID"
 
-#: core/views/user.py:598 gym/forms.py:95 gym/templates/contract/view.html:55
+#: core/views/user.py:597 gym/forms.py:95 gym/templates/contract/view.html:55
 #: gym/templates/gym/member_list.html:27 gym/views/export.py:59
 #: gym/views/gym.py:158 gym/views/gym.py:217
 msgid "Username"
 msgstr "Benutzername"
 
-#: core/views/user.py:601 gym/templates/gym/new_user.html:34
+#: core/views/user.py:600 gym/templates/gym/new_user.html:34
 #: gym/views/export.py:58 gym/views/gym.py:217
 msgid "Gym"
 msgstr "Studio"
 
-#: core/views/user.py:660
+#: core/views/user.py:659
 #, python-format
 msgid "A verification email was sent to %(email)s"
 msgstr "Eine Bestätigungs-E-Mail wurde an %(email)s gesendet"
@@ -1558,11 +1521,6 @@ msgstr "Codec, langer Name"
 msgid "Equipment list"
 msgstr "Geräteliste"
 
-#: exercises/templates/equipment/admin-overview.html:39
-#: exercises/views/equipment.py:92
-msgid "Add new equipment"
-msgstr "Neues Gerät hinzufügen"
-
 #: exercises/templates/history/overview.html:11
 msgid "Exercise admin history"
 msgstr "Verwaltungsverlauf ausüben"
@@ -1610,11 +1568,6 @@ msgstr "Änderungen rückgängig machen"
 msgid "Muscle overview"
 msgstr "Muskelübersicht"
 
-#: exercises/templates/muscles/admin-overview.html:38
-#: exercises/views/muscles.py:68
-msgid "Add muscle"
-msgstr "Muskel hinzufügen"
-
 #: exercises/views/categories.py:72
 msgid "Add category"
 msgstr "Kategorie hinzufügen"
@@ -1623,6 +1576,10 @@ msgstr "Kategorie hinzufügen"
 msgid "This will also delete all exercises in this category."
 msgstr "Das wird auch alle Übungen in der Kategorie löschen."
 
+#: exercises/views/equipment.py:92
+msgid "Add new equipment"
+msgstr "Neues Gerät hinzufügen"
+
 #: exercises/views/equipment.py:104 exercises/views/equipment.py:115
 msgid "Delete equipment?"
 msgstr "Gerät löschen?"
@@ -1632,6 +1589,10 @@ msgid "This will delete the exercise from all workouts."
 msgstr ""
 "Das Löschen der Übung wird sie auch aus allen Trainingsplänen entfernen."
 
+#: exercises/views/muscles.py:68
+msgid "Add muscle"
+msgstr "Muskel hinzufügen"
+
 #: gallery/templates/images/overview.html:62
 msgid "Add image"
 msgstr "Bild hinzufügen"
@@ -1719,7 +1680,7 @@ msgid "Contract is active"
 msgstr "Vertrag ist aktiv"
 
 #: gym/models/contract.py:237 gym/templates/contract/view.html:69
-#: manager/models/schedule.py:61 manager/templates/schedule/view.html:67
+#: manager/models/schedule.py:61 manager/templates/schedule/view.html:66
 msgid "Start date"
 msgstr "Startdatum"
 
@@ -1755,7 +1716,7 @@ msgstr "Administrator: kann die Nutzer für ein Studio verwalten"
 msgid "Admin: can administrate the different gyms"
 msgstr "Administrator: kann die verschiedenen Studios verwalten"
 
-#: gym/models/gym.py:65 gym/templates/gym/member_list.html:114
+#: gym/models/gym.py:65 gym/templates/gym/member_list.html:126
 msgid "Owner"
 msgstr "Eigentümer"
 
@@ -1767,7 +1728,7 @@ msgstr ""
 "Anzahl der Wochen seit dem letzten Login damit ein Benutzer als inaktiv "
 "betrachtet wird"
 
-#: gym/models/gym_config.py:56 gym/templates/gym/member_list.html:152
+#: gym/models/gym_config.py:56 gym/templates/gym/member_list.html:166
 msgid "Show name in header"
 msgstr "Name in der Kopfzeile anzeigen"
 
@@ -1780,7 +1741,7 @@ msgstr "Den Namen des Fitnessstudios in der Kopfzeile der Website anzeigen"
 msgid "Configuration for {self.gym.name}"
 msgstr "Konfiguration für {self.gym.name}"
 
-#: gym/models/user_config.py:65 gym/templates/gym/member_list.html:184
+#: gym/models/user_config.py:65 gym/templates/gym/member_list.html:200
 msgid "Overview of inactive members"
 msgstr "Übersicht der inaktiven Mitglieder"
 
@@ -1804,7 +1765,7 @@ msgstr "Werde Dateinamen benutzen falls nichts angegeben"
 msgid "User notes"
 msgstr "Benutzernotizen"
 
-#: gym/templates/contract/list.html:36
+#: gym/templates/contract/list.html:34
 msgid "Show"
 msgstr "Anzeigen"
 
@@ -1832,11 +1793,11 @@ msgstr ""
 msgid "Gym list"
 msgstr "Studioliste"
 
-#: gym/templates/gym/list.html:50
+#: gym/templates/gym/list.html:53
 msgid "Global gym configuration"
 msgstr "Globale Studiokonfiguration"
 
-#: gym/templates/gym/list.html:67 gym/views/gym.py:171
+#: gym/templates/gym/list.html:69 gym/views/gym.py:171
 msgid "Add new gym"
 msgstr "Studio hinzufügen"
 
@@ -1848,43 +1809,43 @@ msgstr "Administratoren und Trainer"
 msgid "Gym manager"
 msgstr "Studiomanager"
 
-#: gym/templates/gym/member_list.html:69
+#: gym/templates/gym/member_list.html:76
 msgid "This gym has no administrators or trainers"
 msgstr "Dieses Studio hat keine Administratoren oder Trainer"
 
-#: gym/templates/gym/member_list.html:88
+#: gym/templates/gym/member_list.html:98
 msgid "Export"
 msgstr "Exportieren"
 
-#: gym/templates/gym/member_list.html:125
+#: gym/templates/gym/member_list.html:137
 msgid "Members"
 msgstr "Mitglieder"
 
-#: gym/templates/gym/member_list.html:145
+#: gym/templates/gym/member_list.html:159
 msgid "Gym configuration"
 msgstr "Studiokonfiguration"
 
-#: gym/templates/gym/member_list.html:148
+#: gym/templates/gym/member_list.html:162
 msgid "Inactive members"
 msgstr "Inaktive Mitglieder"
 
-#: gym/templates/gym/member_list.html:149
+#: gym/templates/gym/member_list.html:163
 msgid "weeks"
 msgstr "Wochen"
 
-#: gym/templates/gym/member_list.html:181
+#: gym/templates/gym/member_list.html:197
 msgid "My configuration"
 msgstr "Meine Konfiguration"
 
-#: gym/templates/gym/member_list.html:215
+#: gym/templates/gym/member_list.html:234
 msgid "Types"
 msgstr "Typen"
 
-#: gym/templates/gym/member_list.html:285
+#: gym/templates/gym/member_list.html:307
 msgid "Emails"
 msgstr "E-Mails"
 
-#: gym/templates/gym/member_list.html:315
+#: gym/templates/gym/member_list.html:336
 msgid "Add member"
 msgstr "Mitglied hinzufügen"
 
@@ -2180,28 +2141,38 @@ msgstr "Auch Zutaten auf Englisch suchen"
 msgid "Unit"
 msgstr "Einheit"
 
+#: manager/forms.py:191 manager/models/log.py:103 manager/models/setting.py:102
+#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
+msgid "RiR"
+msgstr "RiR"
+
 #: manager/forms.py:279
 msgid "Type"
 msgstr "Typ"
 
-#: manager/forms.py:280 manager/templates/workout/view.html:113
+#: manager/forms.py:280 manager/templates/workout/view.html:122
 msgid "Table"
 msgstr "Tabelle"
 
-#: manager/forms.py:282 manager/templates/workout/view.html:119
+#: manager/forms.py:282 manager/templates/workout/view.html:129
 msgid "with images"
 msgstr "mit Bilder"
 
-#: manager/forms.py:283 manager/templates/workout/view.html:125
+#: manager/forms.py:283 manager/templates/workout/view.html:136
 msgid "with comments"
 msgstr "mit Kommentare"
 
+#: manager/helpers.py:86 manager/models/setting.py:72
+#: manager/templates/set/formset.html:9
+msgid "Reps"
+msgstr "Wdh."
+
 #: manager/management/commands/email-reminders.py:121
 msgid "Workout will expire soon"
 msgstr "Trainingsplan wird bald auslaufen"
 
 #: manager/models/day.py:34 manager/models/log.py:58
-#: manager/models/session.py:60 manager/templates/schedule/view.html:102
+#: manager/models/session.py:60 manager/templates/schedule/view.html:101
 #: manager/templates/workout/view.html:9 manager/templates/workout/view.html:17
 #: manager/views/pdf.py:85 manager/views/pdf.py:161
 #: manager/views/schedule.py:151 manager/views/schedule.py:221
@@ -2225,7 +2196,7 @@ msgid "Name or short description of the schedule. For example 'Program XYZ'."
 msgstr ""
 "Name oder kurze Beschreibung des Zeitplans. Zum Beispiel 'Programm XYZ'."
 
-#: manager/models/schedule.py:65 manager/templates/schedule/view.html:71
+#: manager/models/schedule.py:65 manager/templates/schedule/view.html:70
 msgid "Schedule active"
 msgstr "Zeitplan aktiv"
 
@@ -2239,7 +2210,7 @@ msgstr ""
 "dann z.B. auf der Statseite angezeigt). Alle andere Zeitpläne werden dann "
 "deaktiviert"
 
-#: manager/models/schedule.py:77 manager/templates/schedule/view.html:81
+#: manager/models/schedule.py:77 manager/templates/schedule/view.html:80
 msgid "Is a loop"
 msgstr "Ist eine Schleife"
 
@@ -2260,7 +2231,7 @@ msgid "The duration in weeks"
 msgstr "Die Dauer in Wochen"
 
 #: manager/models/schedule_step.py:64 manager/models/set.py:53
-#: manager/models/setting.py:113 nutrition/models/meal.py:55
+#: manager/models/setting.py:113 nutrition/models/meal.py:53
 #: nutrition/models/meal_item.py:66
 msgid "Order"
 msgstr "Reihenfolge"
@@ -2403,7 +2374,7 @@ msgstr "Eintragübersicht"
 msgid "Workout session"
 msgstr "Trainingseinheit"
 
-#: manager/templates/calendar/partial_overview_table.html:27
+#: manager/templates/calendar/partial_overview_table.html:26
 msgid "Delete with logs"
 msgstr "Mit Logeinträge löschen"
 
@@ -2426,21 +2397,27 @@ msgstr ""
 "wenn es noch keine gibt für das angegebene Datum. Wenn es bereits\n"
 "eine gibt, wird diese bearbeitet. Gewichtseinträge werden immer hinzugefügt."
 
-#: manager/templates/schedule/overview.html:5
+#: manager/templates/schedule/overview.html:4
 msgid "Your schedules"
 msgstr "Deine Zeitpläne"
 
 #: manager/templates/schedule/overview.html:19
-#: manager/templates/schedule/view.html:131
-#: manager/templates/schedule/view.html:183
+#: manager/templates/schedule/view.html:143
+#: manager/templates/schedule/view.html:193
 #: manager/templates/workout/overview.html:16
 msgid "active"
 msgstr "Aktiv"
 
-#: manager/templates/schedule/overview.html:28
+#: manager/templates/schedule/overview.html:27
 msgid "No schedules found."
 msgstr "Keine Zeitpläne gefunden."
 
+#: manager/templates/schedule/overview.html:28
+#, fuzzy
+#| msgid "Add one now."
+msgid "Add one now"
+msgstr "Jetzt hinzufügen."
+
 #: manager/templates/schedule/overview.html:36
 msgid ""
 "Schedules are collections of workouts that you do in\n"
@@ -2450,19 +2427,27 @@ msgstr ""
 "hintereinander durchführst."
 
 #: manager/templates/schedule/overview.html:39
+#, fuzzy
+#| msgid ""
+#| "You can indicate how long you want to do each workout\n"
+#| "        before jumping to the next. It is also possible to create a loop, "
+#| "so you\n"
+#| "        always do the same workouts in succession, e.g. A > B > C > A > B "
+#| "> C and so on."
 msgid ""
 "You can indicate how long you want to do each workout\n"
 "        before jumping to the next. It is also possible to create a loop, so "
 "you\n"
 "        always do the same workouts in succession, e.g. A > B > C > A > B > "
-"C and so on."
+"C and so\n"
+"        on."
 msgstr ""
 "Du kannst angeben wie lange du die einzelnen Trainingspläne\n"
 "machst bevor du zum nächsten springst. Es ist auch möglich eine\n"
 "Schleife zu bilden, wenn du immer dieselben Traininspläne machen \n"
 "willst, z.B. A > B > C > A > B > C usw."
 
-#: manager/templates/schedule/overview.html:43
+#: manager/templates/schedule/overview.html:44
 msgid ""
 "The currently active schedule will remain active (and be\n"
 "        shown e.g. in your dashboard) till it reaches the last workout or "
@@ -2482,7 +2467,7 @@ msgstr "Zeitplan hinzufügen"
 msgid "Schedule"
 msgstr "Zeitplan"
 
-#: manager/templates/schedule/view.html:85
+#: manager/templates/schedule/view.html:84
 msgid ""
 "This schedule is a loop and will go through the workouts above till you "
 "deactivate it"
@@ -2490,19 +2475,19 @@ msgstr ""
 "Dieser Zeitplan ist eine Schleife und wird durch die Trainingspläne gehen\n"
 "bist du ihn deaktivierst"
 
-#: manager/templates/schedule/view.html:103
+#: manager/templates/schedule/view.html:102
 msgid "Weeks"
 msgstr "Wochen"
 
-#: manager/templates/schedule/view.html:115
+#: manager/templates/schedule/view.html:114
 msgid "Move me"
 msgstr "Bewege mich"
 
-#: manager/templates/schedule/view.html:156
+#: manager/templates/schedule/view.html:168
 msgid "Start schedule"
 msgstr "Zeitplan starten"
 
-#: manager/templates/schedule/view.html:187
+#: manager/templates/schedule/view.html:197
 #, python-format
 msgid ""
 "%(weeks)s Week\n"
@@ -2517,11 +2502,11 @@ msgstr[1] ""
 "%(weeks)s Wochen\n"
 "                                "
 
-#: manager/templates/schedule/view.html:221
+#: manager/templates/schedule/view.html:231
 msgid "Adding workouts"
 msgstr "Trainingspläne hinzufügen"
 
-#: manager/templates/schedule/view.html:223
+#: manager/templates/schedule/view.html:233
 msgid ""
 "Add as many workouts to the schedule as you want. You can\n"
 "            edit the order by dragging and dropping them. It's also possible "
@@ -2533,48 +2518,48 @@ msgstr ""
 "auch möglich, ein Workout \n"
 "mehrmals hinzuzufügen."
 
-#: manager/templates/schedule/view.html:232
-#: manager/templates/schedule/view.html:243
-#: manager/templates/schedule/view.html:290
+#: manager/templates/schedule/view.html:242
+#: manager/templates/schedule/view.html:256
+#: manager/templates/schedule/view.html:310
 #: manager/templates/workout/view.html:69
-#: manager/templates/workout/view.html:79
-#: manager/templates/workout/view.html:178
+#: manager/templates/workout/view.html:83
+#: manager/templates/workout/view.html:192
 msgid "Export calendar file"
 msgstr "Kalender exportieren"
 
-#: manager/templates/schedule/view.html:236
+#: manager/templates/schedule/view.html:248
 msgid "Export this schedule as a calendar file."
 msgstr "Diesen Zeitplan als Kalenderdatei exportieren."
 
-#: manager/templates/schedule/view.html:237
-#: manager/templates/workout/view.html:74
+#: manager/templates/schedule/view.html:249
+#: manager/templates/workout/view.html:76
+#, fuzzy
+#| msgid ""
+#| "You can then import the file it into your calendar\n"
+#| "                        application for example google calendar, outlook "
+#| "or iCal. This will create\n"
+#| "                        an appointment for each training day with the "
+#| "appropriate exercises."
 msgid ""
 "You can then import the file it into your calendar\n"
 "                        application for example google calendar, outlook or "
 "iCal. This will create\n"
 "                        an appointment for each training day with the "
-"appropriate exercises."
+"appropriate\n"
+"                        exercises."
 msgstr ""
 "Du kannst die Datei dann in deine Kalenderanwendung importieren, \n"
 "zum Beispiel Google Kalender, Outlook oder iCal. \n"
 "Dadurch wird für jeden Trainingstag ein Termin mit den entsprechenden "
 "Übungen erstellt."
 
-#: manager/templates/schedule/view.html:258
-#: manager/templates/schedule/view.html:294
-#: manager/templates/workout/view.html:94
-#: manager/templates/workout/view.html:174
+#: manager/templates/schedule/view.html:272
+#: manager/templates/schedule/view.html:315
+#: manager/templates/workout/view.html:99
+#: manager/templates/workout/view.html:188
 msgid "Download as PDF"
 msgstr "Als PDF runterladen"
 
-#: manager/templates/schedule/view.html:299
-msgid "Edit schedule"
-msgstr "Zeitplan bearbeiten"
-
-#: manager/templates/schedule/view.html:304
-msgid "Delete schedule"
-msgstr "Zeitplan löschen"
-
 #: manager/templates/set/add.html:9
 #, python-format
 msgid "Add exercises to day \"%(day_name)s\""
@@ -2656,59 +2641,6 @@ msgstr ""
 "Du erhält regelmäßig solche Erinnerungen, bis du dein aktuelles Gewicht "
 "eingibst."
 
-#: manager/templates/workout/log.html:10 manager/templates/workout/log.html:11
-msgid "Weight log"
-msgstr "Gewichtslog"
-
-#: manager/templates/workout/log.html:29
-msgid "Weight log for workout"
-msgstr "Gewichtslog für Trainigsplan"
-
-#: manager/templates/workout/log.html:49
-msgid "Add weight log to this day"
-msgstr "Logbucheintrag zu diesem Tag hinzufügen"
-
-#: manager/templates/workout/log.html:69
-msgid "No weight entries here."
-msgstr "Keine Gewichtseinträge gefunden."
-
-#: manager/templates/workout/log.html:77
-msgid "No exercises for this day."
-msgstr "Keine Übungen für diesen Tag."
-
-#: manager/templates/workout/log.html:90
-msgid ""
-"This page shows the weight logs belonging to this workout\n"
-"only. Click on an exercise to see all the historical data for\n"
-"it."
-msgstr ""
-"Diese Seite zeigt nur die Gewichtseinträge für die Übungen \n"
-"in diesem Trainingsplan. Klicke auf eine Übung um die komplette Historie "
-"zu \n"
-"sehen."
-
-#: manager/templates/workout/log.html:94
-msgid ""
-"If on a single day there is more than one entry with the\n"
-"same number of repetitions, but different weights, only the entry with the\n"
-"higher weight is shown in the diagram."
-msgstr ""
-"Falls an einem Tag es mehr als ein Eintrag gibt mit der \n"
-"selben Anzahl an Wiederholungen, aber verschiedene Gewichte, wird nur der "
-"Eintrag mit dem \n"
-"höheren Gewicht in das Diagramm eingefügt."
-
-#: manager/templates/workout/log.html:98
-msgid ""
-"Note that only entries with a weight unit (kg or lb) and\n"
-"repetitions are charted, other combinations such as time or until failure\n"
-"are ignored here."
-msgstr ""
-"Beachte, dass nur Einträge mit einer Gewichtseinheit (kg oder lb) und \n"
-"Wiederholungen gezeichnet werden, andere Kombinationen wie Zeit oder bis zum "
-"Ausfall \n"
-"werden hier ignoriert."
-
 #: manager/templates/workout/overview.html:25
 msgid "No templates found."
 msgstr "Keine Vorlagen gefunden."
@@ -2746,27 +2678,23 @@ msgstr "Sätze zu den Tagen hinzufügen"
 msgid "Set the repetitions for each set"
 msgstr "Wiederholungen für den Satz eingeben"
 
-#: manager/templates/workout/view.html:73
+#: manager/templates/workout/view.html:75
 msgid "Export this workout as a calendar file."
 msgstr "Diesen Trainingsplan als Kalenderdatei exportieren."
 
-#: manager/templates/workout/view.html:144
+#: manager/templates/workout/view.html:156
 msgid "Logs"
 msgstr "Tagebucheintrag"
 
-#: manager/templates/workout/view.html:146
+#: manager/templates/workout/view.html:159
 msgid "View logs"
 msgstr "Logs anzeigen"
 
-#: manager/templates/workout/view.html:169 manager/views/schedule_step.py:99
-msgid "Edit workout"
-msgstr "Trainingsplan bearbeiten"
-
-#: manager/templates/workout/view.html:182 manager/views/workout.py:281
+#: manager/templates/workout/view.html:195 manager/views/workout.py:281
 msgid "Mark as template"
 msgstr "Als Vorlage markieren"
 
-#: manager/views/day.py:109
+#: manager/views/day.py:105
 msgid "Add workout day"
 msgstr "Trainingstag hinzufügen"
 
@@ -2783,6 +2711,10 @@ msgstr "Trainingsplan für %s"
 msgid "Create schedule"
 msgstr "Zeitplan erstellen"
 
+#: manager/views/schedule_step.py:99
+msgid "Edit workout"
+msgstr "Trainingsplan bearbeiten"
+
 #: manager/views/workout.py:209
 msgid "Copy workout"
 msgstr "Trainingsplan kopieren"
@@ -2906,7 +2838,7 @@ msgstr "Menge in Gramm"
 msgid "Unit amount, e.g. \"1 Cup\" or \"1/2 spoon\""
 msgstr "Menge der Einheit, z.B. „1 Tasse“ or „1/2 Löffel“"
 
-#: nutrition/models/log.py:52 nutrition/models/meal.py:50
+#: nutrition/models/log.py:52 nutrition/models/meal.py:48
 #: nutrition/models/meal_item.py:48 nutrition/models/plan.py:108
 msgid "Nutrition plan"
 msgstr "Ernährungsplan"
@@ -2919,11 +2851,11 @@ msgstr "Mahlzeit"
 msgid "Date and Time (Approx.)"
 msgstr "Uhrzeit und Datum (ca.)"
 
-#: nutrition/models/meal.py:62
+#: nutrition/models/meal.py:60
 msgid "Time (approx)"
 msgstr "Uhrzeit (ca.)"
 
-#: nutrition/models/meal.py:69
+#: nutrition/models/meal.py:67
 msgid ""
 "Give meals a textual description / name such as \"Breakfast\" or \"after "
 "workout\""
@@ -3063,10 +2995,6 @@ msgstr "Keine Zutaten."
 msgid "Search"
 msgstr "Suchen"
 
-#: nutrition/templates/ingredient/overview.html:62
-msgid "Add ingredient"
-msgstr "Zutat hinzufügen"
-
 #: nutrition/templates/ingredient/view.html:45 nutrition/views/plan.py:229
 msgid "Macronutrients"
 msgstr "Makronährstoffe"
@@ -3086,20 +3014,11 @@ msgstr "k.A."
 msgid "Others"
 msgstr "Andere"
 
-#: nutrition/templates/ingredient/view.html:144
-#: nutrition/templates/units/list.html:46 nutrition/views/unit.py:86
+#: nutrition/templates/ingredient/view.html:143
+#: nutrition/templates/units/list.html:50 nutrition/views/unit.py:86
 msgid "Add new weight unit"
 msgstr "Gewichtseinheit hinzufügen"
 
-#: nutrition/templates/ingredient/view.html:206
-#: nutrition/templates/ingredient/view.html:209
-msgid "Edit ingredient"
-msgstr "Zutat bearbeiten"
-
-#: nutrition/templates/ingredient/view.html:213
-msgid "Delete ingredient"
-msgstr "Zutat entfernen"
-
 #: nutrition/templates/rate/form.html:25
 msgid "Basal metabolic rate"
 msgstr "Grundumsatz"
@@ -3743,6 +3662,89 @@ msgstr "Erfolgreich gelöscht."
 msgid "Delete weight entry for the %s"
 msgstr "Gewichtseintrag für den %s löschen"
 
+#~ msgid ""
+#~ "If a license has been localized, e.g. the Creative Commons\n"
+#~ "            licenses for the different countries, add them as separate "
+#~ "entries here."
+#~ msgstr ""
+#~ "Wenn eine Lizenz lokalisiert wurde wie z.B. die Creative Commons "
+#~ "Lizenzen\n"
+#~ "für die verschiedenen Länder, füge sie einzeln hinzu."
+
+#~ msgid "Add weight log"
+#~ msgstr "Gewichtslog hinzufügen"
+
+#~ msgid "This exercise has no repetitions."
+#~ msgstr "Diese Übung hat keine Wiederholungen."
+
+#~ msgid "Edit them now."
+#~ msgstr "Jetzt bearbeiten."
+
+#~ msgid "Add exercises to this workout day"
+#~ msgstr "Übungen zu diesem Trainingstag hinzufügen"
+
+#~ msgid "Edit schedule"
+#~ msgstr "Zeitplan bearbeiten"
+
+#~ msgid "Delete schedule"
+#~ msgstr "Zeitplan löschen"
+
+#~ msgid "Weight log"
+#~ msgstr "Gewichtslog"
+
+#~ msgid "Weight log for workout"
+#~ msgstr "Gewichtslog für Trainigsplan"
+
+#~ msgid "Add weight log to this day"
+#~ msgstr "Logbucheintrag zu diesem Tag hinzufügen"
+
+#~ msgid "No weight entries here."
+#~ msgstr "Keine Gewichtseinträge gefunden."
+
+#~ msgid "No exercises for this day."
+#~ msgstr "Keine Übungen für diesen Tag."
+
+#~ msgid ""
+#~ "This page shows the weight logs belonging to this workout\n"
+#~ "only. Click on an exercise to see all the historical data for\n"
+#~ "it."
+#~ msgstr ""
+#~ "Diese Seite zeigt nur die Gewichtseinträge für die Übungen \n"
+#~ "in diesem Trainingsplan. Klicke auf eine Übung um die komplette Historie "
+#~ "zu \n"
+#~ "sehen."
+
+#~ msgid ""
+#~ "If on a single day there is more than one entry with the\n"
+#~ "same number of repetitions, but different weights, only the entry with "
+#~ "the\n"
+#~ "higher weight is shown in the diagram."
+#~ msgstr ""
+#~ "Falls an einem Tag es mehr als ein Eintrag gibt mit der \n"
+#~ "selben Anzahl an Wiederholungen, aber verschiedene Gewichte, wird nur der "
+#~ "Eintrag mit dem \n"
+#~ "höheren Gewicht in das Diagramm eingefügt."
+
+#~ msgid ""
+#~ "Note that only entries with a weight unit (kg or lb) and\n"
+#~ "repetitions are charted, other combinations such as time or until "
+#~ "failure\n"
+#~ "are ignored here."
+#~ msgstr ""
+#~ "Beachte, dass nur Einträge mit einer Gewichtseinheit (kg oder lb) und \n"
+#~ "Wiederholungen gezeichnet werden, andere Kombinationen wie Zeit oder bis "
+#~ "zum Ausfall \n"
+#~ "werden hier ignoriert."
+
+#~ msgid "Add ingredient"
+#~ msgstr "Zutat hinzufügen"
+
+#~ msgid "Edit ingredient"
+#~ msgstr "Zutat bearbeiten"
+
+#~ msgid "Delete ingredient"
+#~ msgstr "Zutat entfernen"
+
 #~ msgid "Ingredients pending review"
 #~ msgstr "Zutaten ohne Freigabe"
 
diff --git a/wger/locale/el/LC_MESSAGES/django.po b/wger/locale/el/LC_MESSAGES/django.po
index 57fae44dc..0e46be97b 100644
--- a/wger/locale/el/LC_MESSAGES/django.po
+++ b/wger/locale/el/LC_MESSAGES/django.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: wger Workout Manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-07-14 15:59+0200\n"
+"POT-Creation-Date: 2024-11-14 13:09+0100\n"
 "PO-Revision-Date: 2023-10-01 07:01+0000\n"
 "Last-Translator: Antonis-geo <antgeoath@csd.auth.gr>\n"
 "Language-Team: Greek <https://hosted.weblate.org/projects/wger/web/el/>\n"
@@ -21,7 +21,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 5.1-dev\n"
 
-#: config/models/gym_config.py:46 gym/templates/gym/list.html:53
+#: config/models/gym_config.py:46 gym/templates/gym/list.html:56
 msgid "Default gym"
 msgstr "Προεπιλεγμένο γυμναστήριο"
 
@@ -34,28 +34,28 @@ msgstr ""
 "νέα εγγεγραμμένα μέλη και θα ενημερώσει τα υπάρχοντα μέλη που δεν έχουν "
 "γυμναστήριο."
 
-#: config/views/gym_config.py:42 core/templates/language/view.html:67
-#: core/templates/license/list.html:17 core/templates/misc/license/list.html:18
+#: config/views/gym_config.py:42 core/templates/language/view.html:64
+#: core/templates/license/list.html:17
 #: core/templates/repetition_unit/list.html:18
-#: core/templates/tags/render_day.html:39
-#: core/templates/tags/render_day.html:75 core/templates/user/overview.html:204
-#: core/templates/user/overview.html:445
+#: core/templates/user/overview.html:204 core/templates/user/overview.html:467
 #: core/templates/weight_unit/list.html:18
 #: exercises/templates/categories/admin-overview.html:17
 #: exercises/templates/equipment/admin-overview.html:17
-#: exercises/templates/muscles/admin-overview.html:17
-#: gallery/views/images.py:98 gym/templates/admin_notes/list.html:32
-#: gym/templates/contract/list.html:31 gym/templates/contract/view.html:107
-#: gym/templates/contract_option/list.html:32
-#: gym/templates/contract_type/list.html:32 gym/templates/document/list.html:38
-#: gym/templates/gym/list.html:20 gym/templates/gym/list.html:46
-#: gym/templates/gym/member_list.html:87 gym/templates/gym/member_list.html:140
-#: gym/templates/gym/member_list.html:176
-#: manager/templates/calendar/day.html:68
-#: manager/templates/calendar/month.html:85
-#: manager/templates/calendar/partial_overview_table.html:18
-#: manager/templates/schedule/view.html:118
-#: nutrition/templates/ingredient/view.html:165
+#: exercises/templates/muscles/admin-overview.html:16
+#: gallery/views/images.py:98 gym/templates/admin_notes/list.html:31
+#: gym/templates/contract/list.html:30 gym/templates/contract/view.html:106
+#: gym/templates/contract_option/list.html:29
+#: gym/templates/contract_type/list.html:30 gym/templates/document/list.html:38
+#: gym/templates/gym/list.html:19 gym/templates/gym/list.html:48
+#: gym/templates/gym/member_list.html:94 gym/templates/gym/member_list.html:152
+#: gym/templates/gym/member_list.html:190
+#: manager/templates/calendar/day.html:67
+#: manager/templates/calendar/month.html:84
+#: manager/templates/calendar/partial_overview_table.html:16
+#: manager/templates/schedule/view.html:318
+#: manager/templates/workout/view.html:181
+#: nutrition/templates/ingredient/view.html:164
+#: nutrition/templates/ingredient/view.html:209
 #: nutrition/templates/units/list.html:19
 msgid "Edit"
 msgstr "Επεξεργασία"
@@ -89,8 +89,8 @@ msgstr "Το τέλειο πρόγραμμα γυμναστικής μου"
 msgid "Empty placeholder schedule"
 msgstr "Άδειο placeholder ημερολογίου"
 
-#: core/forms.py:69 core/templates/navigation.html:285
-#: core/templates/navigation.html:291 core/templates/user/login.html:4
+#: core/forms.py:69 core/templates/navigation.html:284
+#: core/templates/navigation.html:290 core/templates/user/login.html:4
 #: software/templates/features.html:82 software/templates/features.html:427
 msgid "Login"
 msgstr "Σύνδεση"
@@ -100,14 +100,14 @@ msgstr "Σύνδεση"
 msgid "First name"
 msgstr "Όνομα"
 
-#: core/forms.py:109 core/forms.py:215 core/templates/user/overview.html:266
+#: core/forms.py:109 core/forms.py:215 core/templates/user/overview.html:284
 #: gym/views/export.py:62 gym/views/gym.py:217
 msgid "Last name"
 msgstr "Επίθετο"
 
-#: core/forms.py:111 core/forms.py:180 core/templates/user/overview.html:270
+#: core/forms.py:111 core/forms.py:180 core/templates/user/overview.html:288
 #: gym/models/contract.py:256 gym/models/gym.py:58
-#: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:104
+#: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:116
 #: gym/templates/gym/new_user.html:30 gym/views/export.py:60
 #: mailer/templates/mailer/gym/form.html:4
 #: mailer/templates/mailer/gym/overview.html:4
@@ -138,8 +138,8 @@ msgstr "Υπενθύμιση προπόνησης"
 msgid "Other settings"
 msgstr "Άλλες ρυθμίσεις"
 
-#: core/forms.py:174 core/views/user.py:624 core/views/user.py:639
-#: core/views/user.py:651 gym/forms.py:73 manager/templates/log/add.html:65
+#: core/forms.py:174 core/views/user.py:623 core/views/user.py:638
+#: core/views/user.py:650 gym/forms.py:73 manager/templates/log/add.html:65
 #: manager/templates/set/add.html:70 manager/views/workout.py:203
 #: utils/generic_views.py:143
 msgid "Save"
@@ -164,26 +164,25 @@ msgstr "Κωδικός"
 msgid "Please enter your current password."
 msgstr "Παρακαλώ πληκτρολογήστε τον τρέχων κωδικό σας."
 
-#: core/forms.py:242 core/templates/language/view.html:73
-#: core/templates/license/list.html:19 core/templates/misc/license/list.html:22
-#: core/templates/repetition_unit/list.html:20
-#: core/templates/tags/render_day.html:45
-#: core/templates/tags/render_day.html:81 core/templates/user/overview.html:217
-#: core/templates/weight_unit/list.html:20
-#: exercises/templates/categories/admin-overview.html:19
-#: exercises/templates/equipment/admin-overview.html:19
-#: exercises/templates/muscles/admin-overview.html:19
-#: gym/templates/admin_notes/list.html:40
-#: gym/templates/contract_option/list.html:41
-#: gym/templates/contract_type/list.html:41 gym/templates/document/list.html:46
-#: gym/templates/gym/list.html:22 manager/templates/calendar/day.html:73
-#: manager/templates/calendar/month.html:89
-#: manager/templates/calendar/partial_overview_table.html:23
-#: manager/templates/schedule/view.html:122
-#: manager/templates/workout/view.html:188
-#: nutrition/templates/ingredient/view.html:166
+#: core/forms.py:242 core/templates/language/view.html:70
+#: core/templates/license/list.html:21
+#: core/templates/repetition_unit/list.html:22
+#: core/templates/user/overview.html:233
+#: core/templates/weight_unit/list.html:22
+#: exercises/templates/categories/admin-overview.html:21
+#: exercises/templates/equipment/admin-overview.html:21
+#: exercises/templates/muscles/admin-overview.html:20
+#: gym/templates/admin_notes/list.html:37
+#: gym/templates/contract_option/list.html:35
+#: gym/templates/contract_type/list.html:36 gym/templates/document/list.html:46
+#: gym/templates/gym/list.html:23 manager/templates/calendar/day.html:73
+#: manager/templates/calendar/month.html:88
+#: manager/templates/calendar/partial_overview_table.html:22
+#: manager/templates/schedule/view.html:324
+#: manager/templates/workout/view.html:202
+#: nutrition/templates/ingredient/view.html:168
 #: nutrition/templates/ingredient/view.html:215
-#: nutrition/templates/units/list.html:22
+#: nutrition/templates/units/list.html:25
 msgid "Delete"
 msgstr "Διαγραφή"
 
@@ -195,9 +194,9 @@ msgstr "Λάθος κωδικός"
 msgid "The form is secured with reCAPTCHA"
 msgstr "Η φόρμα είναι ασφαλισμένη με reCAPTCHA"
 
-#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:285
-#: core/templates/navigation.html:297 core/templates/template.html:149
-#: core/templates/user/login.html:20 core/views/user.py:298
+#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:284
+#: core/templates/navigation.html:296 core/templates/template.html:151
+#: core/templates/user/login.html:20 core/views/user.py:297
 #: software/templates/features.html:87 software/templates/features.html:422
 msgid "Register"
 msgstr "Εγγραφή"
@@ -454,18 +453,18 @@ msgid "The sum of all hours has to be 24"
 msgstr "Το σύνολο όλων των ωρών θα πρέπει να είναι 24"
 
 #: core/models/rep_unit.py:36 core/models/weight_unit.py:36
-#: core/templates/user/overview.html:262 core/views/user.py:599
+#: core/templates/user/overview.html:280 core/views/user.py:598
 #: exercises/models/category.py:29 exercises/models/equipment.py:29
 #: exercises/models/exercise.py:59 exercises/models/muscle.py:36
 #: gym/models/contract.py:52 gym/models/contract.py:103 gym/models/gym.py:46
 #: gym/models/user_document.py:84 gym/templates/contract/view.html:50
-#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:96
+#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:108
 #: gym/views/gym.py:158 manager/models/schedule.py:55
 #: manager/models/workout.py:57 measurements/models/category.py:36
 #: nutrition/models/ingredient.py:111
-#: nutrition/models/ingredient_category.py:27 nutrition/models/meal.py:67
+#: nutrition/models/ingredient_category.py:27 nutrition/models/meal.py:65
 #: nutrition/models/weight_unit.py:38
-#: nutrition/templates/ingredient/view.html:152
+#: nutrition/templates/ingredient/view.html:151
 msgid "Name"
 msgstr "Όνομα"
 
@@ -514,7 +513,7 @@ msgstr ""
 msgid "Back to \"%(target)s\""
 msgstr "Πίσω στο \"%(target)s\""
 
-#: core/templates/delete.html:15
+#: core/templates/delete.html:4
 msgid "Are you sure you want to delete this? This action cannot be undone."
 msgstr ""
 "Θέλετε σίγουρα να διαγράψετε αυτό; Αυτή η ενέργεια δεν μπορεί να αναιρεθεί."
@@ -572,7 +571,7 @@ msgstr ""
 msgid "Dashboard"
 msgstr "Πίνακας Ελέγχου"
 
-#: core/templates/language/overview.html:4 core/templates/navigation.html:345
+#: core/templates/language/overview.html:4 core/templates/navigation.html:344
 msgid "Languages"
 msgstr "Γλώσσες"
 
@@ -582,81 +581,72 @@ msgstr "Δεν βρέθηκε τίποτα."
 
 #: core/templates/language/overview.html:22
 #: manager/templates/calendar/month.html:132
-#: manager/templates/schedule/overview.html:28
-#: manager/templates/schedule/view.html:144
+#: manager/templates/schedule/view.html:154
 #: manager/templates/workout/overview.html:28
 #: nutrition/templates/ingredient/overview.html:38
 msgid "Add one now."
 msgstr "Προσθήκη τώρα."
 
-#: core/templates/language/overview.html:35 core/templates/license/list.html:40
-#: core/templates/misc/license/list.html:43
-#: core/templates/repetition_unit/list.html:43
-#: core/templates/user/overview.html:326 core/templates/user/overview.html:365
-#: core/templates/user/overview.html:401
-#: core/templates/weight_unit/list.html:43 core/views/languages.py:74
+#: core/templates/language/overview.html:34 core/templates/license/list.html:43
+#: core/templates/repetition_unit/list.html:46
+#: core/templates/user/overview.html:344 core/templates/user/overview.html:384
+#: core/templates/user/overview.html:422
+#: core/templates/weight_unit/list.html:46 core/views/languages.py:74
 #: core/views/license.py:66 core/views/repetition_units.py:66
 #: core/views/weight_units.py:66
-#: exercises/templates/categories/admin-overview.html:38
-#: gallery/views/images.py:63 gym/templates/admin_notes/list.html:67
-#: gym/templates/contract/list.html:73
-#: gym/templates/contract_option/list.html:72
-#: gym/templates/contract_type/list.html:72 gym/templates/document/list.html:79
-#: gym/templates/gym/member_list.html:211
-#: gym/templates/gym/member_list.html:244
-#: gym/templates/gym/member_list.html:281
+#: exercises/templates/categories/admin-overview.html:40
+#: exercises/templates/equipment/admin-overview.html:39
+#: exercises/templates/muscles/admin-overview.html:40
+#: gallery/views/images.py:63 gym/templates/admin_notes/list.html:64
+#: gym/templates/contract/list.html:69
+#: gym/templates/contract_option/list.html:65
+#: gym/templates/contract_type/list.html:66 gym/templates/document/list.html:78
+#: gym/templates/gym/member_list.html:228
+#: gym/templates/gym/member_list.html:264
+#: gym/templates/gym/member_list.html:303
 #: mailer/templates/mailer/gym/overview.html:43
+#: nutrition/templates/ingredient/overview.html:60
 msgid "Add"
 msgstr "Προσθήκη"
 
 #: core/templates/language/view.html:61 core/templates/user/api_key.html:44
-#: core/templates/user/preferences.html:45 gym/models/contract.py:203
-#: gym/templates/contract/view.html:41 gym/templates/contract/view.html:106
-#: gym/templates/gym/member_list.html:248
-#: manager/templates/schedule/view.html:285
-#: manager/templates/workout/view.html:163
-#: nutrition/templates/ingredient/view.html:202
+#: core/templates/user/preferences.html:50 gym/models/contract.py:203
+#: gym/templates/contract/view.html:41 gym/templates/gym/member_list.html:270
+#: manager/templates/schedule/view.html:304
+#: manager/templates/workout/view.html:177
+#: nutrition/templates/ingredient/view.html:206
 msgid "Options"
 msgstr "Επιλογές"
 
-#: core/templates/license/list.html:4 core/templates/misc/license/list.html:4
+#: core/templates/license/list.html:4
 msgid "License list"
 msgstr "Λίστα αδειών"
 
-#: core/templates/license/list.html:26 core/templates/misc/license/list.html:30
-#: core/templates/repetition_unit/list.html:28
+#: core/templates/license/list.html:30
+#: core/templates/repetition_unit/list.html:32
 #: core/templates/user/overview.html:104 core/templates/user/overview.html:136
-#: core/templates/user/overview.html:185 core/templates/user/overview.html:347
-#: core/templates/user/overview.html:383 core/templates/user/overview.html:427
-#: core/templates/weight_unit/list.html:28
-#: exercises/templates/categories/admin-overview.html:26
-#: exercises/templates/equipment/admin-overview.html:26
-#: exercises/templates/muscles/admin-overview.html:26
-#: gym/templates/admin_notes/list.html:52 gym/templates/contract/list.html:60
-#: gym/templates/contract_option/list.html:58
-#: gym/templates/contract_type/list.html:58 gym/templates/document/list.html:64
-#: gym/templates/gym/list.html:29 gym/templates/gym/member_list.html:229
-#: gym/templates/gym/member_list.html:262
-#: gym/templates/gym/member_list.html:299
+#: core/templates/user/overview.html:185 core/templates/user/overview.html:365
+#: core/templates/user/overview.html:404 core/templates/user/overview.html:448
+#: core/templates/weight_unit/list.html:32
+#: exercises/templates/categories/admin-overview.html:30
+#: exercises/templates/equipment/admin-overview.html:30
+#: exercises/templates/muscles/admin-overview.html:29
+#: gym/templates/admin_notes/list.html:50 gym/templates/contract/list.html:57
+#: gym/templates/contract_option/list.html:52
+#: gym/templates/contract_type/list.html:53 gym/templates/document/list.html:64
+#: gym/templates/gym/list.html:32 gym/templates/gym/member_list.html:248
+#: gym/templates/gym/member_list.html:284
+#: gym/templates/gym/member_list.html:321
 #: mailer/templates/mailer/gym/overview.html:30
-#: manager/templates/calendar/day.html:87
-#: nutrition/templates/units/list.html:29
+#: manager/templates/calendar/day.html:88
+#: nutrition/templates/units/list.html:34
 msgid "Nothing found"
 msgstr "Δεν βρέθηκε τίποτα"
 
-#: core/templates/misc/about.html:4 core/templates/template.html:175
+#: core/templates/misc/about.html:4 core/templates/template.html:188
 msgid "Imprint"
 msgstr "Εκτύπωση"
 
-#: core/templates/misc/license/list.html:47
-msgid ""
-"If a license has been localized, e.g. the Creative Commons\n"
-"            licenses for the different countries, add them as separate "
-"entries here."
-msgstr ""
-"Εάν μια άδεια έχει εντοπιστεί, π.χ. τις άδειες Creative Commons\n"
-"για τις διάφορες χώρες, προσθέστε τις ως ξεχωριστές εγγραφές εδώ."
-
 #: core/templates/navigation.html:28 software/templates/features.html:437
 msgid "Training"
 msgstr "Εξάσκηση"
@@ -703,8 +693,8 @@ msgstr "Δημόσια υποδείγματα"
 msgid "Exercises"
 msgstr "Ασκήσεις"
 
-#: core/templates/navigation.html:111 core/templates/navigation.html:184
-#: core/templates/navigation.html:340
+#: core/templates/navigation.html:111 core/templates/navigation.html:185
+#: core/templates/navigation.html:339
 msgid "Administration"
 msgstr "Διαχείριση"
 
@@ -741,87 +731,87 @@ msgstr "Υπολογιστής BMI"
 msgid "Daily calories calculator"
 msgstr "Υπολογιστής ημερήσιων θερμίδων"
 
-#: core/templates/navigation.html:179
+#: core/templates/navigation.html:180
 #: nutrition/templates/ingredient/overview.html:10
 msgid "Ingredient overview"
 msgstr "Επισκόπηση συστατικών"
 
-#: core/templates/navigation.html:187 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:189 nutrition/templates/units/list.html:6
 msgid "Ingredient weight units"
 msgstr "Μονάδες βάρους συστατικών"
 
-#: core/templates/navigation.html:203 software/templates/features.html:442
+#: core/templates/navigation.html:205 software/templates/features.html:442
 msgid "Body weight"
 msgstr "Σωματικό βάρος"
 
-#: core/templates/navigation.html:210 core/templates/user/overview.html:114
+#: core/templates/navigation.html:212 core/templates/user/overview.html:114
 msgid "Weight overview"
 msgstr "Επισκόπηση βάρους"
 
-#: core/templates/navigation.html:217 weight/views.py:65
+#: core/templates/navigation.html:216 weight/views.py:65
 msgid "Add weight entry"
 msgstr "Νέα εγγραφή βάρους"
 
-#: core/templates/navigation.html:231
+#: core/templates/navigation.html:230
 msgid "About this software"
 msgstr "Σχετικά"
 
-#: core/templates/navigation.html:237 software/templates/about_us.html:5
+#: core/templates/navigation.html:236 software/templates/about_us.html:5
 msgid "About us"
 msgstr "Σχετικά με μας"
 
-#: core/templates/navigation.html:243 software/templates/features.html:507
+#: core/templates/navigation.html:242 software/templates/features.html:507
 msgid "REST API"
 msgstr "REST API"
 
-#: core/templates/navigation.html:249 utils/models.py:45
+#: core/templates/navigation.html:248 utils/models.py:45
 msgid "License"
 msgstr "Άδεια"
 
-#: core/templates/navigation.html:255
+#: core/templates/navigation.html:254
 msgid "Developer documentation"
 msgstr "Τεκμηρίωση προγραμματιστή"
 
-#: core/templates/navigation.html:262
+#: core/templates/navigation.html:261
 msgid "Get the code"
 msgstr "Κατεβάστε τον κώδικα"
 
-#: core/templates/navigation.html:269 core/templates/template.html:214
+#: core/templates/navigation.html:268 core/templates/template.html:227
 #: software/templates/features.html:582
 msgid "Translate"
 msgstr "Μετάφραση"
 
-#: core/templates/navigation.html:303 core/templates/user/login.html:28
+#: core/templates/navigation.html:302 core/templates/user/login.html:28
 msgid "Reset password"
 msgstr "Επαναφορά κωδικού"
 
-#: core/templates/navigation.html:321
+#: core/templates/navigation.html:320
 msgid "My preferences"
 msgstr "Οι προτιμήσεις μου"
 
-#: core/templates/navigation.html:330
+#: core/templates/navigation.html:329
 msgid "Logout"
 msgstr "Έξοδος"
 
-#: core/templates/navigation.html:353
+#: core/templates/navigation.html:352
 msgid "Licenses"
 msgstr "Άδειες"
 
-#: core/templates/navigation.html:361
+#: core/templates/navigation.html:360
 #: core/templates/repetition_unit/list.html:4
 msgid "Repetition units"
 msgstr "Μονάδες επανάληψης"
 
-#: core/templates/navigation.html:369 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:368 core/templates/weight_unit/list.html:4
 #: nutrition/templates/ingredient/view.html:141
 msgid "Weight units"
 msgstr "Μονάδες βάρους"
 
-#: core/templates/navigation.html:377 core/templates/user/list.html:4
+#: core/templates/navigation.html:376 core/templates/user/list.html:4
 msgid "User list"
 msgstr "Λίστα χρήστη"
 
-#: core/templates/navigation.html:383
+#: core/templates/navigation.html:382
 msgid "Gyms"
 msgstr "Γυμναστήρια"
 
@@ -887,57 +877,32 @@ msgstr "προηγούμενο"
 msgid "next"
 msgstr "επόμενο"
 
-#: core/templates/tags/render_day.html:34
-msgid "Add weight log"
-msgstr "Προσθέστε αρχείο καταγραφής βάρους"
-
-#: core/templates/tags/render_day.html:116
-msgid "Placeholder image for exercise"
+#: core/templates/tags/render_day.html:44
+#, fuzzy
+#| msgid "Placeholder image for exercise"
+msgid "Placeholder image for translation"
 msgstr "Εικονίδιο placeholder για άσκηση"
 
-#: core/templates/tags/render_day.html:133
-msgid "This exercise has no repetitions."
-msgstr "Αυτή η άσκηση δεν έχει επαναλήψεις."
-
-#: core/templates/tags/render_day.html:136
-msgid "Edit them now."
-msgstr "Επεξεργαστείτε τώρα."
-
-#: core/templates/tags/render_day.html:162
-msgid "Add exercises to this workout day"
-msgstr "Προσθέστε ασκήσεις για την προπόνηση σε αυτήν την μέρα"
-
-#: core/templates/tags/render_weight_log.html:17 manager/helpers.py:86
-#: manager/models/setting.py:72 manager/templates/set/formset.html:9
-msgid "Reps"
-msgstr "Επαναλήψεις"
-
-#: core/templates/tags/render_weight_log.html:30 manager/forms.py:191
-#: manager/models/log.py:103 manager/models/setting.py:102
-#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
-msgid "RiR"
-msgstr "Απόθεμα Επαναλήψεων"
-
-#: core/templates/template.html:122 manager/templates/calendar/month.html:138
-#: manager/templates/schedule/view.html:248
-#: manager/templates/schedule/view.html:269
-#: manager/templates/workout/view.html:84
-#: manager/templates/workout/view.html:137
+#: core/templates/template.html:124 manager/templates/calendar/month.html:138
+#: manager/templates/schedule/view.html:262
+#: manager/templates/schedule/view.html:287
+#: manager/templates/workout/view.html:89
+#: manager/templates/workout/view.html:149
 msgid "Close"
 msgstr "Κλείσιμο"
 
-#: core/templates/template.html:138
+#: core/templates/template.html:140
 msgid ""
 "You are using a guest account, data entered will be deleted after a week."
 msgstr ""
 "Χρησιμοποιείτε έναν λογαριασμό επισκέπτη. Τα δεδομένα που εισάγετε θα "
 "διαγραφούν σε μία εβδομάδα."
 
-#: core/templates/template.html:143
+#: core/templates/template.html:145
 msgid "Create some demo entries"
 msgstr "Δημιουργήστε μερικές δοκιμαστικές εγγραφές"
 
-#: core/templates/template.html:180 software/templates/features.html:547
+#: core/templates/template.html:193 software/templates/features.html:547
 #: software/templates/tos.html:7
 msgid "Terms of service"
 msgstr "Όροι χρήσης"
@@ -946,7 +911,7 @@ msgstr "Όροι χρήσης"
 msgid "Features"
 msgstr "Δυνατότητες"
 
-#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:54
+#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:59
 msgid "API key"
 msgstr "Κλειδί API"
 
@@ -991,17 +956,17 @@ msgstr "Δημιουργία νέου API κλειδιού"
 msgid "Documentation"
 msgstr "Βιβλιογραφία"
 
-#: core/templates/user/delete_account.html:4
-#: core/templates/user/preferences.html:59
+#: core/templates/user/delete_account.html:3
+#: core/templates/user/preferences.html:62
 msgid "Delete account"
 msgstr "Διαγραφή λογαριασμού"
 
-#: core/templates/user/delete_account.html:17
+#: core/templates/user/delete_account.html:9
 #: exercises/templates/history/overview.html:93
 msgid "Are you sure?"
 msgstr "Σίγουρα;"
 
-#: core/templates/user/delete_account.html:22
+#: core/templates/user/delete_account.html:14
 #, python-format
 msgid ""
 "This action will delete the user account \"%(username)s\".\n"
@@ -1024,22 +989,22 @@ msgstr "Ξεχάσατε τον κωδικό σας;"
 
 #: core/templates/user/overview.html:25 core/templates/user/overview.html:68
 #: core/templates/user/overview.html:112 core/templates/user/overview.html:144
-#: core/templates/user/overview.html:330 core/templates/user/overview.html:369
-#: core/templates/user/overview.html:405
+#: core/templates/user/overview.html:348 core/templates/user/overview.html:390
+#: core/templates/user/overview.html:426
 #, python-format
 msgid "last %(number)s"
 msgstr "τελευταίο %(number)s"
 
 #: core/templates/user/overview.html:27 core/templates/user/overview.html:146
-#: core/templates/user/overview.html:325 core/templates/user/overview.html:364
-#: core/templates/user/overview.html:400 gym/templates/gym/member_list.html:210
-#: gym/templates/gym/member_list.html:243
-#: gym/templates/gym/member_list.html:280
+#: core/templates/user/overview.html:343 core/templates/user/overview.html:382
+#: core/templates/user/overview.html:421 gym/templates/gym/member_list.html:226
+#: gym/templates/gym/member_list.html:262
+#: gym/templates/gym/member_list.html:302
 msgid "Overview"
 msgstr "Έπισκόπηση"
 
 #: core/templates/user/overview.html:28
-#: manager/templates/schedule/view.html:163
+#: manager/templates/schedule/view.html:172
 #: manager/templates/workout/overview.html:39 manager/views/schedule_step.py:60
 msgid "Add workout"
 msgstr "Νέα προπόνηση"
@@ -1071,38 +1036,36 @@ msgstr "Περιγραφή"
 msgid "Number of logs (days)"
 msgstr "Αριθμός ιστορικών (ημέρες)"
 
-#: core/templates/user/overview.html:37 core/views/user.py:600
+#: core/templates/user/overview.html:37 core/views/user.py:599
 #: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:158
 msgid "Last activity"
 msgstr "Τελευταία δραστηριότητα"
 
 #: core/templates/user/overview.html:58
 #: manager/templates/calendar/month.html:128
-#: manager/templates/schedule/view.html:144
 #: manager/templates/workout/overview.html:28
 msgid "No workouts found."
 msgstr "Δεν βρέθηκαν προπονήσεις."
 
 #: core/templates/user/overview.html:68 manager/forms.py:280
-#: manager/templates/workout/view.html:106
+#: manager/templates/workout/view.html:114
 msgid "Log"
 msgstr "Ιστορικό"
 
 #: core/templates/user/overview.html:77 manager/models/session.py:83
-#: manager/templates/calendar/partial_overview_table.html:52
+#: manager/templates/calendar/partial_overview_table.html:54
 msgid "General impression"
 msgstr "Γενική εικόνα"
 
-#: core/templates/user/overview.html:78 core/templates/user/overview.html:369
+#: core/templates/user/overview.html:78 core/templates/user/overview.html:390
 #: manager/models/session.py:73
-#: manager/templates/calendar/partial_overview_table.html:56
-#: manager/templates/workout/log.html:89
+#: manager/templates/calendar/partial_overview_table.html:58
 msgid "Notes"
 msgstr "Σημειώσεις"
 
 #: core/templates/user/overview.html:79
 #: exercises/templates/history/overview.html:30
-#: manager/templates/calendar/partial_overview_table.html:42
+#: manager/templates/calendar/partial_overview_table.html:44
 msgid "Time"
 msgstr "Ώρα"
 
@@ -1140,121 +1103,121 @@ msgstr "Λιπαρή ύλη"
 msgid "kcal"
 msgstr "kcal"
 
-#: core/templates/user/overview.html:201 core/templates/user/overview.html:322
-#: core/templates/user/overview.html:361 core/templates/user/overview.html:397
-#: core/templates/user/overview.html:442 gym/templates/gym/list.html:42
-#: gym/templates/gym/member_list.html:84 gym/templates/gym/member_list.html:137
-#: gym/templates/gym/member_list.html:173
-#: gym/templates/gym/member_list.html:207
-#: gym/templates/gym/member_list.html:240
-#: gym/templates/gym/member_list.html:277
-#: manager/templates/schedule/view.html:100
+#: core/templates/user/overview.html:201 core/templates/user/overview.html:340
+#: core/templates/user/overview.html:379 core/templates/user/overview.html:418
+#: core/templates/user/overview.html:463 gym/templates/gym/list.html:45
+#: gym/templates/gym/member_list.html:91 gym/templates/gym/member_list.html:149
+#: gym/templates/gym/member_list.html:187
+#: gym/templates/gym/member_list.html:223
+#: gym/templates/gym/member_list.html:259
+#: gym/templates/gym/member_list.html:299
+#: manager/templates/schedule/view.html:99
 msgid "Actions"
 msgstr "Ενέργειες"
 
-#: core/templates/user/overview.html:207
+#: core/templates/user/overview.html:210
 msgid "Deactivate user"
 msgstr "Απενεργοποίηση χρήστη"
 
-#: core/templates/user/overview.html:209
+#: core/templates/user/overview.html:214
 msgid "Activate user"
 msgstr "Ενεργοποίηση χρήστη"
 
-#: core/templates/user/overview.html:211
+#: core/templates/user/overview.html:223
 msgid "Reset user password"
 msgstr "Επαναφορά κωδικού πρόσβασης χρήστη"
 
-#: core/templates/user/overview.html:214 gym/templates/gym/member_list.html:30
+#: core/templates/user/overview.html:227 gym/templates/gym/member_list.html:30
 msgid "Roles"
 msgstr "Ρόλοι"
 
-#: core/templates/user/overview.html:225
+#: core/templates/user/overview.html:243
 msgid "Password reset confirmation"
 msgstr "Επιβεβαίωση αλλαγής κωδικού"
 
-#: core/templates/user/overview.html:229
+#: core/templates/user/overview.html:247
 msgid "Do you really want to change this user&#39;s password?"
 msgstr "Θέλετε πραγματικά να αλλάξετε τον κωδικό πρόσβασης αυτού του χρήστη;"
 
-#: core/templates/user/overview.html:232
+#: core/templates/user/overview.html:250
 #: exercises/templates/history/overview.html:106
 msgid "No"
 msgstr "Οχι"
 
-#: core/templates/user/overview.html:233
+#: core/templates/user/overview.html:251
 #: exercises/templates/history/overview.html:99
 msgid "Yes"
 msgstr "Ναι"
 
-#: core/templates/user/overview.html:254 gym/templates/gym/member_list.html:93
+#: core/templates/user/overview.html:272 gym/templates/gym/member_list.html:105
 msgid "Details"
 msgstr "Λεπτομέρειες"
 
-#: core/templates/user/overview.html:258 gym/views/export.py:57
-#: manager/helpers.py:86 manager/templates/schedule/view.html:98
+#: core/templates/user/overview.html:276 gym/views/export.py:57
+#: manager/helpers.py:86 manager/templates/schedule/view.html:97
 msgid "Nr."
 msgstr "Νο."
 
-#: core/templates/user/overview.html:280 gym/models/contract.py:287
+#: core/templates/user/overview.html:298 gym/models/contract.py:287
 #: gym/models/gym.py:50 gym/templates/contract/view.html:75
-#: gym/templates/gym/member_list.html:100 gym/views/export.py:68
+#: gym/templates/gym/member_list.html:112 gym/views/export.py:68
 msgid "Phone"
 msgstr "Τηλέφωνο"
 
-#: core/templates/user/overview.html:284 gym/templates/contract/view.html:87
-#: gym/templates/gym/member_list.html:118
+#: core/templates/user/overview.html:302 gym/templates/contract/view.html:87
+#: gym/templates/gym/member_list.html:130
 msgid "Address"
 msgstr "Διεύθυνση"
 
-#: core/templates/user/overview.html:295
+#: core/templates/user/overview.html:313
 msgid "Registered"
 msgstr "Εγγεγραμμένοι"
 
-#: core/templates/user/overview.html:299
+#: core/templates/user/overview.html:317
 msgid "Last login"
 msgstr "Τελευταία είσοδος"
 
-#: core/templates/user/overview.html:304
+#: core/templates/user/overview.html:322
 msgid "Status"
 msgstr "Κατάσταση"
 
-#: core/templates/user/overview.html:307
+#: core/templates/user/overview.html:325
 msgid "Active"
 msgstr "Ενεργό"
 
-#: core/templates/user/overview.html:309
+#: core/templates/user/overview.html:327
 msgid "Inactive"
 msgstr "Ανενεργό"
 
-#: core/templates/user/overview.html:330 gym/templates/contract/list.html:4
-#: gym/templates/gym/member_list.html:202
+#: core/templates/user/overview.html:348 gym/templates/contract/list.html:4
+#: gym/templates/gym/member_list.html:218
 msgid "Contracts"
 msgstr "Συμβόλαια"
 
-#: core/templates/user/overview.html:405 gym/templates/document/list.html:4
+#: core/templates/user/overview.html:426 gym/templates/document/list.html:4
 msgid "Documents"
 msgstr "Έγγραφα"
 
-#: core/templates/user/overview.html:412 gym/templates/document/list.html:32
-#: manager/forms.py:292 manager/templates/workout/view.html:132
+#: core/templates/user/overview.html:433 gym/templates/document/list.html:33
+#: manager/forms.py:292 manager/templates/workout/view.html:143
 msgid "Download"
 msgstr "Μεταφόρτωση"
 
-#: core/templates/user/overview.html:450 gym/views/admin_config.py:44
+#: core/templates/user/overview.html:474 gym/views/admin_config.py:44
 #: gym/views/admin_config.py:58 gym/views/user_config.py:46
 msgid "Configuration"
 msgstr "Παραμετροποίηση"
 
-#: core/templates/user/overview.html:453 gym/models/user_config.py:92
+#: core/templates/user/overview.html:477 gym/models/user_config.py:92
 msgid "Include in inactive overview"
 msgstr "Να συμπεριλαμβάνεται στην μη ενεργή επισκόπηση"
 
-#: core/templates/user/overview.html:486
+#: core/templates/user/overview.html:510
 #, python-format
 msgid "Admin login is only available for users in %(gym_name)s"
 msgstr "Η σύνδεση διαχειριστή είναι διαθέσιμη μόνο για χρήστες σε%(gym_name)s"
 
-#: core/templates/user/overview.html:490
+#: core/templates/user/overview.html:514
 msgid "Log in as this user"
 msgstr "Είσοδος ως αυτόν τον χρήστη"
 
@@ -1274,19 +1237,19 @@ msgstr "Μη επαληθευμένο ηλεκτρονικό ταχυδρομε
 msgid "Send verification email"
 msgstr "Στείλτε μήνυμα ηλεκτρονικού ταχυδρομείου επαλήθευσης"
 
-#: core/templates/user/preferences.html:30
+#: core/templates/user/preferences.html:31
 msgid "You need to verify your email to contribute exercises"
 msgstr "Πρέπει να επαληθεύσετε το email σας για να συνεισφέρετε σε ασκήσεις"
 
-#: core/templates/user/preferences.html:50 core/views/user.py:611
+#: core/templates/user/preferences.html:55 core/views/user.py:610
 msgid "Change password"
 msgstr "Αλλάξτε κωδικό"
 
-#: core/templatetags/wger_extras.py:205 i18n.tpl:37
+#: core/templatetags/wger_extras.py:197 i18n.tpl:37
 msgid "kg"
 msgstr "kg"
 
-#: core/templatetags/wger_extras.py:207
+#: core/templatetags/wger_extras.py:199
 #: nutrition/templates/ingredient/view.html:60
 #: nutrition/templates/ingredient/view.html:66
 #: nutrition/templates/ingredient/view.html:73
@@ -1298,11 +1261,11 @@ msgctxt "weight unit, i.e. grams"
 msgid "g"
 msgstr "γρ"
 
-#: core/templatetags/wger_extras.py:210 i18n.tpl:38
+#: core/templatetags/wger_extras.py:202 i18n.tpl:38
 msgid "lb"
 msgstr "lb"
 
-#: core/templatetags/wger_extras.py:212
+#: core/templatetags/wger_extras.py:204
 msgctxt "weight unit, i.e. ounces"
 msgid "oz"
 msgstr "oz"
@@ -1329,13 +1292,13 @@ msgid "Delete {0}?"
 msgstr "Διαγραφή {0};"
 
 #: core/views/languages.py:111 core/views/license.py:85
-#: core/views/repetition_units.py:86 core/views/user.py:474
+#: core/views/repetition_units.py:86 core/views/user.py:473
 #: core/views/weight_units.py:86 exercises/views/categories.py:98
 #: exercises/views/equipment.py:81 exercises/views/muscles.py:87
 #: gym/views/admin_notes.py:161 gym/views/config.py:68
 #: gym/views/contract.py:186 gym/views/contract_option.py:123
 #: gym/views/contract_type.py:123 gym/views/document.py:171
-#: gym/views/gym.py:463 manager/views/day.py:100 manager/views/schedule.py:333
+#: gym/views/gym.py:463 manager/views/day.py:96 manager/views/schedule.py:333
 #: manager/views/workout.py:267 nutrition/views/ingredient.py:145
 #: nutrition/views/unit.py:143
 #, python-brace-format
@@ -1365,48 +1328,48 @@ msgstr "Υποβολή"
 msgid "Your feedback was successfully sent. Thank you!"
 msgstr "Η αναπληροφόρηση σας αποστάλθηκε με επιτυχία. Ευχαριστούμε!"
 
-#: core/views/user.py:156
+#: core/views/user.py:155
 #, python-brace-format
 msgid "Account \"{0}\" was successfully deleted"
 msgstr "Ο λογαριασμός \"{0}\" διαγράφηκε με επιτυχία"
 
-#: core/views/user.py:292
+#: core/views/user.py:291
 msgid "You were successfully registered"
 msgstr "Εγγραφήκατε με επιτυχία"
 
-#: core/views/user.py:351
+#: core/views/user.py:350
 msgid "Settings successfully updated"
 msgstr "Οι ρυθμίσεις ανανεώθηκαν με επιτυχία"
 
-#: core/views/user.py:390
+#: core/views/user.py:389
 msgid "The user was successfully deactivated"
 msgstr "Ο χρήστης απενεργοποιήθηκε με επιτυχία"
 
-#: core/views/user.py:427
+#: core/views/user.py:426
 msgid "The user was successfully activated"
 msgstr "Ο χρήστης ενεργοποιήθηκε με επιτυχία"
 
-#: core/views/user.py:442
+#: core/views/user.py:441
 msgid "Edit user"
 msgstr "Επεξεργασία χρήστη"
 
-#: core/views/user.py:597 gym/templates/gym/member_list.html:26
+#: core/views/user.py:596 gym/templates/gym/member_list.html:26
 #: gym/views/gym.py:158
 msgid "ID"
 msgstr "ID"
 
-#: core/views/user.py:598 gym/forms.py:95 gym/templates/contract/view.html:55
+#: core/views/user.py:597 gym/forms.py:95 gym/templates/contract/view.html:55
 #: gym/templates/gym/member_list.html:27 gym/views/export.py:59
 #: gym/views/gym.py:158 gym/views/gym.py:217
 msgid "Username"
 msgstr "Όνομα χρήστη"
 
-#: core/views/user.py:601 gym/templates/gym/new_user.html:34
+#: core/views/user.py:600 gym/templates/gym/new_user.html:34
 #: gym/views/export.py:58 gym/views/gym.py:217
 msgid "Gym"
 msgstr "Γυμναστήριο"
 
-#: core/views/user.py:660
+#: core/views/user.py:659
 #, python-format
 msgid "A verification email was sent to %(email)s"
 msgstr "Ένα μήνυμα ηλεκτρονικού ταχυδρομείου επαλήθευσης εστάλη στον%(email)s"
@@ -1559,11 +1522,6 @@ msgstr "Codec, μακρύ όνομα"
 msgid "Equipment list"
 msgstr "Λίστα οργάνων"
 
-#: exercises/templates/equipment/admin-overview.html:39
-#: exercises/views/equipment.py:92
-msgid "Add new equipment"
-msgstr "Νέο όργανο"
-
 #: exercises/templates/history/overview.html:11
 msgid "Exercise admin history"
 msgstr "Άσκηση ιστορικό διαχειριστή"
@@ -1611,11 +1569,6 @@ msgstr "Αναίρεση αλλαγών"
 msgid "Muscle overview"
 msgstr "Επισκόπηση μυών"
 
-#: exercises/templates/muscles/admin-overview.html:38
-#: exercises/views/muscles.py:68
-msgid "Add muscle"
-msgstr "Νέος μύς"
-
 #: exercises/views/categories.py:72
 msgid "Add category"
 msgstr "Νέα κατηγορία"
@@ -1625,6 +1578,10 @@ msgid "This will also delete all exercises in this category."
 msgstr ""
 "Αυτή η λειτουργία θα διαγράψει όλες τις ασκήσεις σε αυτήν την κατηγορία."
 
+#: exercises/views/equipment.py:92
+msgid "Add new equipment"
+msgstr "Νέο όργανο"
+
 #: exercises/views/equipment.py:104 exercises/views/equipment.py:115
 msgid "Delete equipment?"
 msgstr "Διαγραφή εξοπλισμού;"
@@ -1633,6 +1590,10 @@ msgstr "Διαγραφή εξοπλισμού;"
 msgid "This will delete the exercise from all workouts."
 msgstr "Αυτή η λειτουργία θα διαγράψει την άσκηση απο όλες τις προπονήσεις."
 
+#: exercises/views/muscles.py:68
+msgid "Add muscle"
+msgstr "Νέος μύς"
+
 #: gallery/templates/images/overview.html:62
 msgid "Add image"
 msgstr "Προσθέστε εικόνα"
@@ -1721,7 +1682,7 @@ msgid "Contract is active"
 msgstr "Το συμβόλαιο είναι ενεργό"
 
 #: gym/models/contract.py:237 gym/templates/contract/view.html:69
-#: manager/models/schedule.py:61 manager/templates/schedule/view.html:67
+#: manager/models/schedule.py:61 manager/templates/schedule/view.html:66
 msgid "Start date"
 msgstr "Ημερομηνία έναρξης"
 
@@ -1757,7 +1718,7 @@ msgstr "Διαχειριστής: μπορεί να διαχειριστεί τ
 msgid "Admin: can administrate the different gyms"
 msgstr "Διαχειριστής: μπορεί να διαχειρίζεται τα διάφορα γυμναστήρια"
 
-#: gym/models/gym.py:65 gym/templates/gym/member_list.html:114
+#: gym/models/gym.py:65 gym/templates/gym/member_list.html:126
 msgid "Owner"
 msgstr "Κάτοχος"
 
@@ -1768,7 +1729,7 @@ msgid ""
 msgstr ""
 "Αριθμός εβδομάδων που κάποιος χρήστης συνδέθηκε ώστε να θεωρηθεί ανενεργός"
 
-#: gym/models/gym_config.py:56 gym/templates/gym/member_list.html:152
+#: gym/models/gym_config.py:56 gym/templates/gym/member_list.html:166
 msgid "Show name in header"
 msgstr "Εμφάνιση ονόματος στην επικεφαλίδα"
 
@@ -1782,7 +1743,7 @@ msgstr "Εμφάνιση του ονόματος του γυμναστηρίου
 msgid "Configuration for {self.gym.name}"
 msgstr "Παραμετροποίηση για {}"
 
-#: gym/models/user_config.py:65 gym/templates/gym/member_list.html:184
+#: gym/models/user_config.py:65 gym/templates/gym/member_list.html:200
 msgid "Overview of inactive members"
 msgstr "Επισκόπηση των ανενεργών μελών"
 
@@ -1806,7 +1767,7 @@ msgstr "Χρήση του ονόματος αρχείου αν δεν παρασ
 msgid "User notes"
 msgstr "Σημειώσεις χρήστη"
 
-#: gym/templates/contract/list.html:36
+#: gym/templates/contract/list.html:34
 msgid "Show"
 msgstr "Εμφάνιση"
 
@@ -1834,11 +1795,11 @@ msgstr ""
 msgid "Gym list"
 msgstr "Λίστα γυμναστηρίων"
 
-#: gym/templates/gym/list.html:50
+#: gym/templates/gym/list.html:53
 msgid "Global gym configuration"
 msgstr "Καθολική παραμετροποίηση γυμναστηρίου"
 
-#: gym/templates/gym/list.html:67 gym/views/gym.py:171
+#: gym/templates/gym/list.html:69 gym/views/gym.py:171
 msgid "Add new gym"
 msgstr "Νέο γυμναστήριο"
 
@@ -1850,43 +1811,43 @@ msgstr "Διαχειριστές και γυμναστές"
 msgid "Gym manager"
 msgstr "Διευθυντής γυμναστηρίου"
 
-#: gym/templates/gym/member_list.html:69
+#: gym/templates/gym/member_list.html:76
 msgid "This gym has no administrators or trainers"
 msgstr "Αυτό το γυμναστήριο δεν έχει διαχειριστές ή προπονητές"
 
-#: gym/templates/gym/member_list.html:88
+#: gym/templates/gym/member_list.html:98
 msgid "Export"
 msgstr "Εξαγωγή"
 
-#: gym/templates/gym/member_list.html:125
+#: gym/templates/gym/member_list.html:137
 msgid "Members"
 msgstr "Μέλη"
 
-#: gym/templates/gym/member_list.html:145
+#: gym/templates/gym/member_list.html:159
 msgid "Gym configuration"
 msgstr "Παραμετροποίηση γυμναστηρίου"
 
-#: gym/templates/gym/member_list.html:148
+#: gym/templates/gym/member_list.html:162
 msgid "Inactive members"
 msgstr "Ανενεργά μέλη"
 
-#: gym/templates/gym/member_list.html:149
+#: gym/templates/gym/member_list.html:163
 msgid "weeks"
 msgstr "εβδομάδες"
 
-#: gym/templates/gym/member_list.html:181
+#: gym/templates/gym/member_list.html:197
 msgid "My configuration"
 msgstr "Οι ρυθμίσεις μου"
 
-#: gym/templates/gym/member_list.html:215
+#: gym/templates/gym/member_list.html:234
 msgid "Types"
 msgstr "Είδη"
 
-#: gym/templates/gym/member_list.html:285
+#: gym/templates/gym/member_list.html:307
 msgid "Emails"
 msgstr "Μηνύματα ηλεκτρονικού ταχυδρομείου"
 
-#: gym/templates/gym/member_list.html:315
+#: gym/templates/gym/member_list.html:336
 msgid "Add member"
 msgstr "Νέο μέλος"
 
@@ -2185,28 +2146,38 @@ msgstr "Αναζητήστε επίσης ονόματα στα αγγλικά"
 msgid "Unit"
 msgstr "Μονάδα"
 
+#: manager/forms.py:191 manager/models/log.py:103 manager/models/setting.py:102
+#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
+msgid "RiR"
+msgstr "Απόθεμα Επαναλήψεων"
+
 #: manager/forms.py:279
 msgid "Type"
 msgstr "Είδος"
 
-#: manager/forms.py:280 manager/templates/workout/view.html:113
+#: manager/forms.py:280 manager/templates/workout/view.html:122
 msgid "Table"
 msgstr "Πίνακας"
 
-#: manager/forms.py:282 manager/templates/workout/view.html:119
+#: manager/forms.py:282 manager/templates/workout/view.html:129
 msgid "with images"
 msgstr "με εικόνες"
 
-#: manager/forms.py:283 manager/templates/workout/view.html:125
+#: manager/forms.py:283 manager/templates/workout/view.html:136
 msgid "with comments"
 msgstr "με σχόλια"
 
+#: manager/helpers.py:86 manager/models/setting.py:72
+#: manager/templates/set/formset.html:9
+msgid "Reps"
+msgstr "Επαναλήψεις"
+
 #: manager/management/commands/email-reminders.py:121
 msgid "Workout will expire soon"
 msgstr "Η προπόνηση θα λήξει σε λίγο"
 
 #: manager/models/day.py:34 manager/models/log.py:58
-#: manager/models/session.py:60 manager/templates/schedule/view.html:102
+#: manager/models/session.py:60 manager/templates/schedule/view.html:101
 #: manager/templates/workout/view.html:9 manager/templates/workout/view.html:17
 #: manager/views/pdf.py:85 manager/views/pdf.py:161
 #: manager/views/schedule.py:151 manager/views/schedule.py:221
@@ -2231,7 +2202,7 @@ msgstr ""
 "Ονομασία ή μικρή περιγραφή του προγράμματος. Για παράδειγμα \"Πρόγραμμα "
 "XYZ\"."
 
-#: manager/models/schedule.py:65 manager/templates/schedule/view.html:71
+#: manager/models/schedule.py:65 manager/templates/schedule/view.html:70
 msgid "Schedule active"
 msgstr "Πρόγραμμα ενεργό"
 
@@ -2245,7 +2216,7 @@ msgstr ""
 "(θα εμφανίζεται π.χ. στον πίνακα ελέγχου). Όλα τα υπόλοιπα προγράμματα θα "
 "χαρακτηριστούν ώς μή ενεργά μετά"
 
-#: manager/models/schedule.py:77 manager/templates/schedule/view.html:81
+#: manager/models/schedule.py:77 manager/templates/schedule/view.html:80
 msgid "Is a loop"
 msgstr "Είναι μία επανάληψη"
 
@@ -2266,7 +2237,7 @@ msgid "The duration in weeks"
 msgstr "Η διάρκεια σε εβδομάδες"
 
 #: manager/models/schedule_step.py:64 manager/models/set.py:53
-#: manager/models/setting.py:113 nutrition/models/meal.py:55
+#: manager/models/setting.py:113 nutrition/models/meal.py:53
 #: nutrition/models/meal_item.py:66
 msgid "Order"
 msgstr "Διάταξη"
@@ -2411,7 +2382,7 @@ msgstr "Επισκόπηση ιστορικού"
 msgid "Workout session"
 msgstr "Συνεδρία προπόνησης"
 
-#: manager/templates/calendar/partial_overview_table.html:27
+#: manager/templates/calendar/partial_overview_table.html:26
 msgid "Delete with logs"
 msgstr "Διαγραφή με αρχεία καταγραφής"
 
@@ -2435,21 +2406,27 @@ msgstr ""
 "υπάρχει τότε απλά θα την επεξεργαστείτε. Οι εγγραφές βάρους πάντα "
 "προστίθενται."
 
-#: manager/templates/schedule/overview.html:5
+#: manager/templates/schedule/overview.html:4
 msgid "Your schedules"
 msgstr "Τα προγράμματα σας"
 
 #: manager/templates/schedule/overview.html:19
-#: manager/templates/schedule/view.html:131
-#: manager/templates/schedule/view.html:183
+#: manager/templates/schedule/view.html:143
+#: manager/templates/schedule/view.html:193
 #: manager/templates/workout/overview.html:16
 msgid "active"
 msgstr "ενεργό"
 
-#: manager/templates/schedule/overview.html:28
+#: manager/templates/schedule/overview.html:27
 msgid "No schedules found."
 msgstr "Δεν βρέθηκαν προγράμματα."
 
+#: manager/templates/schedule/overview.html:28
+#, fuzzy
+#| msgid "Add one now."
+msgid "Add one now"
+msgstr "Προσθήκη τώρα."
+
 #: manager/templates/schedule/overview.html:36
 msgid ""
 "Schedules are collections of workouts that you do in\n"
@@ -2459,12 +2436,20 @@ msgstr ""
 "\tδιαδοχικά."
 
 #: manager/templates/schedule/overview.html:39
+#, fuzzy
+#| msgid ""
+#| "You can indicate how long you want to do each workout\n"
+#| "        before jumping to the next. It is also possible to create a loop, "
+#| "so you\n"
+#| "        always do the same workouts in succession, e.g. A > B > C > A > B "
+#| "> C and so on."
 msgid ""
 "You can indicate how long you want to do each workout\n"
 "        before jumping to the next. It is also possible to create a loop, so "
 "you\n"
 "        always do the same workouts in succession, e.g. A > B > C > A > B > "
-"C and so on."
+"C and so\n"
+"        on."
 msgstr ""
 "Μπορείτε να υποδείξετε, πόσο θέλετε να κάνετε κάθε προπόνηση\n"
 "\tπριν μεταπηδήσετε στην επόμενη. Είναι δυνατό να δημιουργηθεί ένας βρόγχος, "
@@ -2472,7 +2457,7 @@ msgstr ""
 "\tνα κάνετε πάντα τις ίδιες προπονήσεις διαδοχικά, π.χ. Α > Β > Γ >Α>Β>Γ κ.ο."
 "κ."
 
-#: manager/templates/schedule/overview.html:43
+#: manager/templates/schedule/overview.html:44
 msgid ""
 "The currently active schedule will remain active (and be\n"
 "        shown e.g. in your dashboard) till it reaches the last workout or "
@@ -2492,7 +2477,7 @@ msgstr "Νέο πρόγραμμα"
 msgid "Schedule"
 msgstr "Πρόγραμμα"
 
-#: manager/templates/schedule/view.html:85
+#: manager/templates/schedule/view.html:84
 msgid ""
 "This schedule is a loop and will go through the workouts above till you "
 "deactivate it"
@@ -2500,19 +2485,19 @@ msgstr ""
 "Αυτό το πρόγραμμα είναι σε βρόγχο και θα περάσει απο όλες τις προπονήσεις "
 "μέχρι να το απενεργοποιήσετε"
 
-#: manager/templates/schedule/view.html:103
+#: manager/templates/schedule/view.html:102
 msgid "Weeks"
 msgstr "Εβδομάδες"
 
-#: manager/templates/schedule/view.html:115
+#: manager/templates/schedule/view.html:114
 msgid "Move me"
 msgstr "Μετακίνησε με"
 
-#: manager/templates/schedule/view.html:156
+#: manager/templates/schedule/view.html:168
 msgid "Start schedule"
 msgstr "Έναρξη προγράμματος"
 
-#: manager/templates/schedule/view.html:187
+#: manager/templates/schedule/view.html:197
 #, python-format
 msgid ""
 "%(weeks)s Week\n"
@@ -2527,11 +2512,11 @@ msgstr[1] ""
 "%(weeks)s Εβδομάδες\n"
 "                                "
 
-#: manager/templates/schedule/view.html:221
+#: manager/templates/schedule/view.html:231
 msgid "Adding workouts"
 msgstr "Πρόσθεση προπονήσεων"
 
-#: manager/templates/schedule/view.html:223
+#: manager/templates/schedule/view.html:233
 msgid ""
 "Add as many workouts to the schedule as you want. You can\n"
 "            edit the order by dragging and dropping them. It's also possible "
@@ -2543,48 +2528,48 @@ msgstr ""
 "επίσης δυνατό να προσθέσετε μία προπόνηση περισσοτερο\n"
 "\tαπό μία φορά."
 
-#: manager/templates/schedule/view.html:232
-#: manager/templates/schedule/view.html:243
-#: manager/templates/schedule/view.html:290
+#: manager/templates/schedule/view.html:242
+#: manager/templates/schedule/view.html:256
+#: manager/templates/schedule/view.html:310
 #: manager/templates/workout/view.html:69
-#: manager/templates/workout/view.html:79
-#: manager/templates/workout/view.html:178
+#: manager/templates/workout/view.html:83
+#: manager/templates/workout/view.html:192
 msgid "Export calendar file"
 msgstr "Εξαγωγή αρχείου ημερολογίου"
 
-#: manager/templates/schedule/view.html:236
+#: manager/templates/schedule/view.html:248
 msgid "Export this schedule as a calendar file."
 msgstr "Εξαγωγή του προγράμματος ως αρχείο ημερολογίου."
 
-#: manager/templates/schedule/view.html:237
-#: manager/templates/workout/view.html:74
+#: manager/templates/schedule/view.html:249
+#: manager/templates/workout/view.html:76
+#, fuzzy
+#| msgid ""
+#| "You can then import the file it into your calendar\n"
+#| "                        application for example google calendar, outlook "
+#| "or iCal. This will create\n"
+#| "                        an appointment for each training day with the "
+#| "appropriate exercises."
 msgid ""
 "You can then import the file it into your calendar\n"
 "                        application for example google calendar, outlook or "
 "iCal. This will create\n"
 "                        an appointment for each training day with the "
-"appropriate exercises."
+"appropriate\n"
+"                        exercises."
 msgstr ""
 "Στη συνέχεια, μπορείτε να εισαγάγετε το αρχείο στην εφαρμογή\n"
 "\tημερολογίου για παράδειγμα ημερολόγιο google, outlook ή iCal. Αυτό θα "
 "δημιουργήσει\n"
 "\tραντεβού για κάθε προπονητική μέρα με τις κατάλληλες ασκήσεις."
 
-#: manager/templates/schedule/view.html:258
-#: manager/templates/schedule/view.html:294
-#: manager/templates/workout/view.html:94
-#: manager/templates/workout/view.html:174
+#: manager/templates/schedule/view.html:272
+#: manager/templates/schedule/view.html:315
+#: manager/templates/workout/view.html:99
+#: manager/templates/workout/view.html:188
 msgid "Download as PDF"
 msgstr "Αποθήκευση ώς PDF"
 
-#: manager/templates/schedule/view.html:299
-msgid "Edit schedule"
-msgstr "Επεξεργασία προγράμματος"
-
-#: manager/templates/schedule/view.html:304
-msgid "Delete schedule"
-msgstr "Διαγραφή προγράμματος"
-
 #: manager/templates/set/add.html:9
 #, python-format
 msgid "Add exercises to day \"%(day_name)s\""
@@ -2667,58 +2652,6 @@ msgstr ""
 "Θα λαμβάνετε τακτικά τέτοιες υπενθυμίσεις μέχρι να εισαγάγετε το τρέχον "
 "βάρος σας."
 
-#: manager/templates/workout/log.html:10 manager/templates/workout/log.html:11
-msgid "Weight log"
-msgstr "Εγγραφή βάρους"
-
-#: manager/templates/workout/log.html:29
-msgid "Weight log for workout"
-msgstr "Εγγραφή βάρους για προπόνηση"
-
-#: manager/templates/workout/log.html:49
-msgid "Add weight log to this day"
-msgstr "Προσθέστε νέα εγγραφή βάρους για αυτήν την μέρα"
-
-#: manager/templates/workout/log.html:69
-msgid "No weight entries here."
-msgstr "Δεν υπάρχουν εγγραφές βάρους εδώ."
-
-#: manager/templates/workout/log.html:77
-msgid "No exercises for this day."
-msgstr "Δεν υπάρχουν ασκήσεις για αυτήν την μέρα."
-
-#: manager/templates/workout/log.html:90
-msgid ""
-"This page shows the weight logs belonging to this workout\n"
-"only. Click on an exercise to see all the historical data for\n"
-"it."
-msgstr ""
-"Αυτή η σελίδα εμφανίζει τις καταγραφές βάρους που ανήκουν σε αυτήν την "
-"προπόνηση\n"
-"μόνο. Επιλέξτε μια άσκηση για να δείτε τα ιστορικά δεδομένα για\n"
-"αυτήν."
-
-#: manager/templates/workout/log.html:94
-msgid ""
-"If on a single day there is more than one entry with the\n"
-"same number of repetitions, but different weights, only the entry with the\n"
-"higher weight is shown in the diagram."
-msgstr ""
-"Αν σε μια μέρα υπάρχουν περισσότερες απο μία εγγραφές με τους \n"
-"ίδιους αριθμούς επαναλήψεων, αλλα διαφορετικών βαρών, μόνο η \n"
-"εγγραφή με το μεγαλύτερο βάρος θα εμφανιστεί στο διάγραμμα."
-
-#: manager/templates/workout/log.html:98
-msgid ""
-"Note that only entries with a weight unit (kg or lb) and\n"
-"repetitions are charted, other combinations such as time or until failure\n"
-"are ignored here."
-msgstr ""
-"Σημειώστε ότι μόνο καταχωρήσεις με μονάδα βάρους (kg ή lb) και\n"
-"επαναλήψεις καταγράφονται σε διάγραμμα , άλλοι συνδυασμοί όπως χρόνος ή "
-"μέχρι αποτυχίας\n"
-"αγνοούνται εδώ."
-
 #: manager/templates/workout/overview.html:25
 msgid "No templates found."
 msgstr "Δεν βρέθηκαν υποδείγματα."
@@ -2756,27 +2689,23 @@ msgstr "Προσθήκη σετ προπονήσεων στις μέρες"
 msgid "Set the repetitions for each set"
 msgstr "Ρύθμιση των επαναλήψεων για κάθε σετ"
 
-#: manager/templates/workout/view.html:73
+#: manager/templates/workout/view.html:75
 msgid "Export this workout as a calendar file."
 msgstr "Εξαγωγή αυτής της προπόνησης σε αρχείο ημερολογίου."
 
-#: manager/templates/workout/view.html:144
+#: manager/templates/workout/view.html:156
 msgid "Logs"
 msgstr "Καταγραφές"
 
-#: manager/templates/workout/view.html:146
+#: manager/templates/workout/view.html:159
 msgid "View logs"
 msgstr "Προβολή αρχείων καταγραφής"
 
-#: manager/templates/workout/view.html:169 manager/views/schedule_step.py:99
-msgid "Edit workout"
-msgstr "Επεξεργασία προπόνησης"
-
-#: manager/templates/workout/view.html:182 manager/views/workout.py:281
+#: manager/templates/workout/view.html:195 manager/views/workout.py:281
 msgid "Mark as template"
 msgstr "Σημειώστε ως υπόδειγμα"
 
-#: manager/views/day.py:109
+#: manager/views/day.py:105
 msgid "Add workout day"
 msgstr "Προσθήκη ημέρας προπόνησης"
 
@@ -2793,6 +2722,10 @@ msgstr "Προπόνηση για %s"
 msgid "Create schedule"
 msgstr "Δημιουργία προγράμματος"
 
+#: manager/views/schedule_step.py:99
+msgid "Edit workout"
+msgstr "Επεξεργασία προπόνησης"
+
 #: manager/views/workout.py:209
 msgid "Copy workout"
 msgstr "Αντιγραφή προπόνησης"
@@ -2917,7 +2850,7 @@ msgstr "Ποσότητα σε γραμμάρια"
 msgid "Unit amount, e.g. \"1 Cup\" or \"1/2 spoon\""
 msgstr "Μονάδα ποσότητας, π.χ. \"1 Φλιτζάνι\" ή \"1/2 κουτάλι\""
 
-#: nutrition/models/log.py:52 nutrition/models/meal.py:50
+#: nutrition/models/log.py:52 nutrition/models/meal.py:48
 #: nutrition/models/meal_item.py:48 nutrition/models/plan.py:108
 msgid "Nutrition plan"
 msgstr "Πρόγραμμα διατροφής"
@@ -2930,11 +2863,11 @@ msgstr "Γεύμα"
 msgid "Date and Time (Approx.)"
 msgstr "Ημερομηνία και ώρα (περίπου)"
 
-#: nutrition/models/meal.py:62
+#: nutrition/models/meal.py:60
 msgid "Time (approx)"
 msgstr "Ώρα (περίπου)"
 
-#: nutrition/models/meal.py:69
+#: nutrition/models/meal.py:67
 msgid ""
 "Give meals a textual description / name such as \"Breakfast\" or \"after "
 "workout\""
@@ -3079,10 +3012,6 @@ msgstr "Δεν υπάρχουν συστατικά."
 msgid "Search"
 msgstr "Εύρεση"
 
-#: nutrition/templates/ingredient/overview.html:62
-msgid "Add ingredient"
-msgstr "Προσθήκη συστατικών"
-
 #: nutrition/templates/ingredient/view.html:45 nutrition/views/plan.py:229
 msgid "Macronutrients"
 msgstr "Θρεπτικά στοιχεία"
@@ -3102,20 +3031,11 @@ msgstr "Μη διαθέσιμο"
 msgid "Others"
 msgstr "Άλλα"
 
-#: nutrition/templates/ingredient/view.html:144
-#: nutrition/templates/units/list.html:46 nutrition/views/unit.py:86
+#: nutrition/templates/ingredient/view.html:143
+#: nutrition/templates/units/list.html:50 nutrition/views/unit.py:86
 msgid "Add new weight unit"
 msgstr "Προσθήκη νέας μονάδας βάρους"
 
-#: nutrition/templates/ingredient/view.html:206
-#: nutrition/templates/ingredient/view.html:209
-msgid "Edit ingredient"
-msgstr "Επεξεργασία συστατικού"
-
-#: nutrition/templates/ingredient/view.html:213
-msgid "Delete ingredient"
-msgstr "Διαγραφή συστατικού"
-
 #: nutrition/templates/rate/form.html:25
 msgid "Basal metabolic rate"
 msgstr "Βασικός μεταβολικός ρυθμός"
@@ -3783,6 +3703,87 @@ msgstr "Διαγράφηκε με επιτυχία."
 msgid "Delete weight entry for the %s"
 msgstr "Διαγραφή καταχώρισης βάρους για το %s"
 
+#~ msgid ""
+#~ "If a license has been localized, e.g. the Creative Commons\n"
+#~ "            licenses for the different countries, add them as separate "
+#~ "entries here."
+#~ msgstr ""
+#~ "Εάν μια άδεια έχει εντοπιστεί, π.χ. τις άδειες Creative Commons\n"
+#~ "για τις διάφορες χώρες, προσθέστε τις ως ξεχωριστές εγγραφές εδώ."
+
+#~ msgid "Add weight log"
+#~ msgstr "Προσθέστε αρχείο καταγραφής βάρους"
+
+#~ msgid "This exercise has no repetitions."
+#~ msgstr "Αυτή η άσκηση δεν έχει επαναλήψεις."
+
+#~ msgid "Edit them now."
+#~ msgstr "Επεξεργαστείτε τώρα."
+
+#~ msgid "Add exercises to this workout day"
+#~ msgstr "Προσθέστε ασκήσεις για την προπόνηση σε αυτήν την μέρα"
+
+#~ msgid "Edit schedule"
+#~ msgstr "Επεξεργασία προγράμματος"
+
+#~ msgid "Delete schedule"
+#~ msgstr "Διαγραφή προγράμματος"
+
+#~ msgid "Weight log"
+#~ msgstr "Εγγραφή βάρους"
+
+#~ msgid "Weight log for workout"
+#~ msgstr "Εγγραφή βάρους για προπόνηση"
+
+#~ msgid "Add weight log to this day"
+#~ msgstr "Προσθέστε νέα εγγραφή βάρους για αυτήν την μέρα"
+
+#~ msgid "No weight entries here."
+#~ msgstr "Δεν υπάρχουν εγγραφές βάρους εδώ."
+
+#~ msgid "No exercises for this day."
+#~ msgstr "Δεν υπάρχουν ασκήσεις για αυτήν την μέρα."
+
+#~ msgid ""
+#~ "This page shows the weight logs belonging to this workout\n"
+#~ "only. Click on an exercise to see all the historical data for\n"
+#~ "it."
+#~ msgstr ""
+#~ "Αυτή η σελίδα εμφανίζει τις καταγραφές βάρους που ανήκουν σε αυτήν την "
+#~ "προπόνηση\n"
+#~ "μόνο. Επιλέξτε μια άσκηση για να δείτε τα ιστορικά δεδομένα για\n"
+#~ "αυτήν."
+
+#~ msgid ""
+#~ "If on a single day there is more than one entry with the\n"
+#~ "same number of repetitions, but different weights, only the entry with "
+#~ "the\n"
+#~ "higher weight is shown in the diagram."
+#~ msgstr ""
+#~ "Αν σε μια μέρα υπάρχουν περισσότερες απο μία εγγραφές με τους \n"
+#~ "ίδιους αριθμούς επαναλήψεων, αλλα διαφορετικών βαρών, μόνο η \n"
+#~ "εγγραφή με το μεγαλύτερο βάρος θα εμφανιστεί στο διάγραμμα."
+
+#~ msgid ""
+#~ "Note that only entries with a weight unit (kg or lb) and\n"
+#~ "repetitions are charted, other combinations such as time or until "
+#~ "failure\n"
+#~ "are ignored here."
+#~ msgstr ""
+#~ "Σημειώστε ότι μόνο καταχωρήσεις με μονάδα βάρους (kg ή lb) και\n"
+#~ "επαναλήψεις καταγράφονται σε διάγραμμα , άλλοι συνδυασμοί όπως χρόνος ή "
+#~ "μέχρι αποτυχίας\n"
+#~ "αγνοούνται εδώ."
+
+#~ msgid "Add ingredient"
+#~ msgstr "Προσθήκη συστατικών"
+
+#~ msgid "Edit ingredient"
+#~ msgstr "Επεξεργασία συστατικού"
+
+#~ msgid "Delete ingredient"
+#~ msgstr "Διαγραφή συστατικού"
+
 #~ msgid "Ingredients pending review"
 #~ msgstr "Συστατικά που αναμένουν εξέταση"
 
diff --git a/wger/locale/es/LC_MESSAGES/django.po b/wger/locale/es/LC_MESSAGES/django.po
index 598fb244f..18963bd4d 100644
--- a/wger/locale/es/LC_MESSAGES/django.po
+++ b/wger/locale/es/LC_MESSAGES/django.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: wger Workout Manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-07-14 15:49+0200\n"
+"POT-Creation-Date: 2024-11-14 13:09+0100\n"
 "PO-Revision-Date: 2024-07-23 11:09+0000\n"
 "Last-Translator: gallegonovato <fran-carro@hotmail.es>\n"
 "Language-Team: Spanish <https://hosted.weblate.org/projects/wger/web/es/>\n"
@@ -26,7 +26,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 5.7-dev\n"
 
-#: config/models/gym_config.py:46 gym/templates/gym/list.html:53
+#: config/models/gym_config.py:46 gym/templates/gym/list.html:56
 msgid "Default gym"
 msgstr "Gimnasio predeterminado"
 
@@ -39,28 +39,28 @@ msgstr ""
 "todos los nuevos usuarios registrados a este gimnasio y actualizará todos "
 "los usuarios existentes sin gimnasio."
 
-#: config/views/gym_config.py:42 core/templates/language/view.html:67
-#: core/templates/license/list.html:17 core/templates/misc/license/list.html:18
+#: config/views/gym_config.py:42 core/templates/language/view.html:64
+#: core/templates/license/list.html:17
 #: core/templates/repetition_unit/list.html:18
-#: core/templates/tags/render_day.html:39
-#: core/templates/tags/render_day.html:75 core/templates/user/overview.html:204
-#: core/templates/user/overview.html:445
+#: core/templates/user/overview.html:204 core/templates/user/overview.html:467
 #: core/templates/weight_unit/list.html:18
 #: exercises/templates/categories/admin-overview.html:17
 #: exercises/templates/equipment/admin-overview.html:17
-#: exercises/templates/muscles/admin-overview.html:17
-#: gallery/views/images.py:98 gym/templates/admin_notes/list.html:32
-#: gym/templates/contract/list.html:31 gym/templates/contract/view.html:107
-#: gym/templates/contract_option/list.html:32
-#: gym/templates/contract_type/list.html:32 gym/templates/document/list.html:38
-#: gym/templates/gym/list.html:20 gym/templates/gym/list.html:46
-#: gym/templates/gym/member_list.html:87 gym/templates/gym/member_list.html:140
-#: gym/templates/gym/member_list.html:176
-#: manager/templates/calendar/day.html:68
-#: manager/templates/calendar/month.html:85
-#: manager/templates/calendar/partial_overview_table.html:18
-#: manager/templates/schedule/view.html:118
-#: nutrition/templates/ingredient/view.html:165
+#: exercises/templates/muscles/admin-overview.html:16
+#: gallery/views/images.py:98 gym/templates/admin_notes/list.html:31
+#: gym/templates/contract/list.html:30 gym/templates/contract/view.html:106
+#: gym/templates/contract_option/list.html:29
+#: gym/templates/contract_type/list.html:30 gym/templates/document/list.html:38
+#: gym/templates/gym/list.html:19 gym/templates/gym/list.html:48
+#: gym/templates/gym/member_list.html:94 gym/templates/gym/member_list.html:152
+#: gym/templates/gym/member_list.html:190
+#: manager/templates/calendar/day.html:67
+#: manager/templates/calendar/month.html:84
+#: manager/templates/calendar/partial_overview_table.html:16
+#: manager/templates/schedule/view.html:318
+#: manager/templates/workout/view.html:181
+#: nutrition/templates/ingredient/view.html:164
+#: nutrition/templates/ingredient/view.html:209
 #: nutrition/templates/units/list.html:19
 msgid "Edit"
 msgstr "Editar"
@@ -94,8 +94,8 @@ msgstr "Mi programa de rutinas"
 msgid "Empty placeholder schedule"
 msgstr "Programación de marcador posición vacía"
 
-#: core/forms.py:69 core/templates/navigation.html:285
-#: core/templates/navigation.html:291 core/templates/user/login.html:4
+#: core/forms.py:69 core/templates/navigation.html:284
+#: core/templates/navigation.html:290 core/templates/user/login.html:4
 #: software/templates/features.html:82 software/templates/features.html:427
 msgid "Login"
 msgstr "Ingresar"
@@ -105,14 +105,14 @@ msgstr "Ingresar"
 msgid "First name"
 msgstr "Nombre"
 
-#: core/forms.py:109 core/forms.py:215 core/templates/user/overview.html:266
+#: core/forms.py:109 core/forms.py:215 core/templates/user/overview.html:284
 #: gym/views/export.py:62 gym/views/gym.py:217
 msgid "Last name"
 msgstr "Apellido"
 
-#: core/forms.py:111 core/forms.py:180 core/templates/user/overview.html:270
+#: core/forms.py:111 core/forms.py:180 core/templates/user/overview.html:288
 #: gym/models/contract.py:256 gym/models/gym.py:58
-#: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:104
+#: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:116
 #: gym/templates/gym/new_user.html:30 gym/views/export.py:60
 #: mailer/templates/mailer/gym/form.html:4
 #: mailer/templates/mailer/gym/overview.html:4
@@ -143,8 +143,8 @@ msgstr "Recordatorios de entrenamiento"
 msgid "Other settings"
 msgstr "Otras configuraciones"
 
-#: core/forms.py:174 core/views/user.py:624 core/views/user.py:639
-#: core/views/user.py:651 gym/forms.py:73 manager/templates/log/add.html:65
+#: core/forms.py:174 core/views/user.py:623 core/views/user.py:638
+#: core/views/user.py:650 gym/forms.py:73 manager/templates/log/add.html:65
 #: manager/templates/set/add.html:70 manager/views/workout.py:203
 #: utils/generic_views.py:143
 msgid "Save"
@@ -169,26 +169,25 @@ msgstr "Contraseña"
 msgid "Please enter your current password."
 msgstr "Por favor, ingrese su contraseña actual."
 
-#: core/forms.py:242 core/templates/language/view.html:73
-#: core/templates/license/list.html:19 core/templates/misc/license/list.html:22
-#: core/templates/repetition_unit/list.html:20
-#: core/templates/tags/render_day.html:45
-#: core/templates/tags/render_day.html:81 core/templates/user/overview.html:217
-#: core/templates/weight_unit/list.html:20
-#: exercises/templates/categories/admin-overview.html:19
-#: exercises/templates/equipment/admin-overview.html:19
-#: exercises/templates/muscles/admin-overview.html:19
-#: gym/templates/admin_notes/list.html:40
-#: gym/templates/contract_option/list.html:41
-#: gym/templates/contract_type/list.html:41 gym/templates/document/list.html:46
-#: gym/templates/gym/list.html:22 manager/templates/calendar/day.html:73
-#: manager/templates/calendar/month.html:89
-#: manager/templates/calendar/partial_overview_table.html:23
-#: manager/templates/schedule/view.html:122
-#: manager/templates/workout/view.html:188
-#: nutrition/templates/ingredient/view.html:166
+#: core/forms.py:242 core/templates/language/view.html:70
+#: core/templates/license/list.html:21
+#: core/templates/repetition_unit/list.html:22
+#: core/templates/user/overview.html:233
+#: core/templates/weight_unit/list.html:22
+#: exercises/templates/categories/admin-overview.html:21
+#: exercises/templates/equipment/admin-overview.html:21
+#: exercises/templates/muscles/admin-overview.html:20
+#: gym/templates/admin_notes/list.html:37
+#: gym/templates/contract_option/list.html:35
+#: gym/templates/contract_type/list.html:36 gym/templates/document/list.html:46
+#: gym/templates/gym/list.html:23 manager/templates/calendar/day.html:73
+#: manager/templates/calendar/month.html:88
+#: manager/templates/calendar/partial_overview_table.html:22
+#: manager/templates/schedule/view.html:324
+#: manager/templates/workout/view.html:202
+#: nutrition/templates/ingredient/view.html:168
 #: nutrition/templates/ingredient/view.html:215
-#: nutrition/templates/units/list.html:22
+#: nutrition/templates/units/list.html:25
 msgid "Delete"
 msgstr "Borrar"
 
@@ -200,9 +199,9 @@ msgstr "Contraseña incorrecta"
 msgid "The form is secured with reCAPTCHA"
 msgstr "El Formulario está asegurado por recaptcha"
 
-#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:285
-#: core/templates/navigation.html:297 core/templates/template.html:149
-#: core/templates/user/login.html:20 core/views/user.py:298
+#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:284
+#: core/templates/navigation.html:296 core/templates/template.html:151
+#: core/templates/user/login.html:20 core/views/user.py:297
 #: software/templates/features.html:87 software/templates/features.html:422
 msgid "Register"
 msgstr "Registrarse"
@@ -459,18 +458,18 @@ msgid "The sum of all hours has to be 24"
 msgstr "La suma de todas las horas tiene que ser 24"
 
 #: core/models/rep_unit.py:36 core/models/weight_unit.py:36
-#: core/templates/user/overview.html:262 core/views/user.py:599
+#: core/templates/user/overview.html:280 core/views/user.py:598
 #: exercises/models/category.py:29 exercises/models/equipment.py:29
 #: exercises/models/exercise.py:59 exercises/models/muscle.py:36
 #: gym/models/contract.py:52 gym/models/contract.py:103 gym/models/gym.py:46
 #: gym/models/user_document.py:84 gym/templates/contract/view.html:50
-#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:96
+#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:108
 #: gym/views/gym.py:158 manager/models/schedule.py:55
 #: manager/models/workout.py:57 measurements/models/category.py:36
 #: nutrition/models/ingredient.py:111
-#: nutrition/models/ingredient_category.py:27 nutrition/models/meal.py:67
+#: nutrition/models/ingredient_category.py:27 nutrition/models/meal.py:65
 #: nutrition/models/weight_unit.py:38
-#: nutrition/templates/ingredient/view.html:152
+#: nutrition/templates/ingredient/view.html:151
 msgid "Name"
 msgstr "Nombre"
 
@@ -523,7 +522,7 @@ msgstr ""
 msgid "Back to \"%(target)s\""
 msgstr "Volver a \"%(target)s\""
 
-#: core/templates/delete.html:15
+#: core/templates/delete.html:4
 msgid "Are you sure you want to delete this? This action cannot be undone."
 msgstr ""
 "¿Estás seguro de que quieres borrar esto? Esta acción no se puede deshacer."
@@ -579,7 +578,7 @@ msgstr ""
 msgid "Dashboard"
 msgstr "Escritorio"
 
-#: core/templates/language/overview.html:4 core/templates/navigation.html:345
+#: core/templates/language/overview.html:4 core/templates/navigation.html:344
 msgid "Languages"
 msgstr "Idiomas"
 
@@ -589,82 +588,72 @@ msgstr "No se ha encontrado nada."
 
 #: core/templates/language/overview.html:22
 #: manager/templates/calendar/month.html:132
-#: manager/templates/schedule/overview.html:28
-#: manager/templates/schedule/view.html:144
+#: manager/templates/schedule/view.html:154
 #: manager/templates/workout/overview.html:28
 #: nutrition/templates/ingredient/overview.html:38
 msgid "Add one now."
 msgstr "Añadir ahora."
 
-#: core/templates/language/overview.html:35 core/templates/license/list.html:40
-#: core/templates/misc/license/list.html:43
-#: core/templates/repetition_unit/list.html:43
-#: core/templates/user/overview.html:326 core/templates/user/overview.html:365
-#: core/templates/user/overview.html:401
-#: core/templates/weight_unit/list.html:43 core/views/languages.py:74
+#: core/templates/language/overview.html:34 core/templates/license/list.html:43
+#: core/templates/repetition_unit/list.html:46
+#: core/templates/user/overview.html:344 core/templates/user/overview.html:384
+#: core/templates/user/overview.html:422
+#: core/templates/weight_unit/list.html:46 core/views/languages.py:74
 #: core/views/license.py:66 core/views/repetition_units.py:66
 #: core/views/weight_units.py:66
-#: exercises/templates/categories/admin-overview.html:38
-#: gallery/views/images.py:63 gym/templates/admin_notes/list.html:67
-#: gym/templates/contract/list.html:73
-#: gym/templates/contract_option/list.html:72
-#: gym/templates/contract_type/list.html:72 gym/templates/document/list.html:79
-#: gym/templates/gym/member_list.html:211
-#: gym/templates/gym/member_list.html:244
-#: gym/templates/gym/member_list.html:281
+#: exercises/templates/categories/admin-overview.html:40
+#: exercises/templates/equipment/admin-overview.html:39
+#: exercises/templates/muscles/admin-overview.html:40
+#: gallery/views/images.py:63 gym/templates/admin_notes/list.html:64
+#: gym/templates/contract/list.html:69
+#: gym/templates/contract_option/list.html:65
+#: gym/templates/contract_type/list.html:66 gym/templates/document/list.html:78
+#: gym/templates/gym/member_list.html:228
+#: gym/templates/gym/member_list.html:264
+#: gym/templates/gym/member_list.html:303
 #: mailer/templates/mailer/gym/overview.html:43
+#: nutrition/templates/ingredient/overview.html:60
 msgid "Add"
 msgstr "Añadir"
 
 #: core/templates/language/view.html:61 core/templates/user/api_key.html:44
-#: core/templates/user/preferences.html:45 gym/models/contract.py:203
-#: gym/templates/contract/view.html:41 gym/templates/contract/view.html:106
-#: gym/templates/gym/member_list.html:248
-#: manager/templates/schedule/view.html:285
-#: manager/templates/workout/view.html:163
-#: nutrition/templates/ingredient/view.html:202
+#: core/templates/user/preferences.html:50 gym/models/contract.py:203
+#: gym/templates/contract/view.html:41 gym/templates/gym/member_list.html:270
+#: manager/templates/schedule/view.html:304
+#: manager/templates/workout/view.html:177
+#: nutrition/templates/ingredient/view.html:206
 msgid "Options"
 msgstr "Opciones"
 
-#: core/templates/license/list.html:4 core/templates/misc/license/list.html:4
+#: core/templates/license/list.html:4
 msgid "License list"
 msgstr "Listado de licencias"
 
-#: core/templates/license/list.html:26 core/templates/misc/license/list.html:30
-#: core/templates/repetition_unit/list.html:28
+#: core/templates/license/list.html:30
+#: core/templates/repetition_unit/list.html:32
 #: core/templates/user/overview.html:104 core/templates/user/overview.html:136
-#: core/templates/user/overview.html:185 core/templates/user/overview.html:347
-#: core/templates/user/overview.html:383 core/templates/user/overview.html:427
-#: core/templates/weight_unit/list.html:28
-#: exercises/templates/categories/admin-overview.html:26
-#: exercises/templates/equipment/admin-overview.html:26
-#: exercises/templates/muscles/admin-overview.html:26
-#: gym/templates/admin_notes/list.html:52 gym/templates/contract/list.html:60
-#: gym/templates/contract_option/list.html:58
-#: gym/templates/contract_type/list.html:58 gym/templates/document/list.html:64
-#: gym/templates/gym/list.html:29 gym/templates/gym/member_list.html:229
-#: gym/templates/gym/member_list.html:262
-#: gym/templates/gym/member_list.html:299
+#: core/templates/user/overview.html:185 core/templates/user/overview.html:365
+#: core/templates/user/overview.html:404 core/templates/user/overview.html:448
+#: core/templates/weight_unit/list.html:32
+#: exercises/templates/categories/admin-overview.html:30
+#: exercises/templates/equipment/admin-overview.html:30
+#: exercises/templates/muscles/admin-overview.html:29
+#: gym/templates/admin_notes/list.html:50 gym/templates/contract/list.html:57
+#: gym/templates/contract_option/list.html:52
+#: gym/templates/contract_type/list.html:53 gym/templates/document/list.html:64
+#: gym/templates/gym/list.html:32 gym/templates/gym/member_list.html:248
+#: gym/templates/gym/member_list.html:284
+#: gym/templates/gym/member_list.html:321
 #: mailer/templates/mailer/gym/overview.html:30
-#: manager/templates/calendar/day.html:87
-#: nutrition/templates/units/list.html:29
+#: manager/templates/calendar/day.html:88
+#: nutrition/templates/units/list.html:34
 msgid "Nothing found"
 msgstr "No se ha encontrado nada"
 
-#: core/templates/misc/about.html:4 core/templates/template.html:175
+#: core/templates/misc/about.html:4 core/templates/template.html:188
 msgid "Imprint"
 msgstr "Imprimir"
 
-#: core/templates/misc/license/list.html:47
-msgid ""
-"If a license has been localized, e.g. the Creative Commons\n"
-"            licenses for the different countries, add them as separate "
-"entries here."
-msgstr ""
-"Si la licencia ha sido localizada, como por ejemplo las licencias \n"
-"                            Creative Commons para los diferentes países, "
-"agrégalas como entradas separadas aquí."
-
 #: core/templates/navigation.html:28 software/templates/features.html:437
 msgid "Training"
 msgstr "Entrenamiento"
@@ -709,8 +698,8 @@ msgstr "Plantillas públicas"
 msgid "Exercises"
 msgstr "Ejercicios"
 
-#: core/templates/navigation.html:111 core/templates/navigation.html:184
-#: core/templates/navigation.html:340
+#: core/templates/navigation.html:111 core/templates/navigation.html:185
+#: core/templates/navigation.html:339
 msgid "Administration"
 msgstr "Administración"
 
@@ -747,87 +736,87 @@ msgstr "Calculadora de IMC"
 msgid "Daily calories calculator"
 msgstr "Caluladora de calorias diarias"
 
-#: core/templates/navigation.html:179
+#: core/templates/navigation.html:180
 #: nutrition/templates/ingredient/overview.html:10
 msgid "Ingredient overview"
 msgstr "Índice de ingredientes"
 
-#: core/templates/navigation.html:187 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:189 nutrition/templates/units/list.html:6
 msgid "Ingredient weight units"
 msgstr "Unidades de peso de los ingredientes"
 
-#: core/templates/navigation.html:203 software/templates/features.html:442
+#: core/templates/navigation.html:205 software/templates/features.html:442
 msgid "Body weight"
 msgstr "Peso corporal"
 
-#: core/templates/navigation.html:210 core/templates/user/overview.html:114
+#: core/templates/navigation.html:212 core/templates/user/overview.html:114
 msgid "Weight overview"
 msgstr "Índice de peso"
 
-#: core/templates/navigation.html:217 weight/views.py:65
+#: core/templates/navigation.html:216 weight/views.py:65
 msgid "Add weight entry"
 msgstr "Añadir entrada de peso"
 
-#: core/templates/navigation.html:231
+#: core/templates/navigation.html:230
 msgid "About this software"
 msgstr "Sobre este programa"
 
-#: core/templates/navigation.html:237 software/templates/about_us.html:5
+#: core/templates/navigation.html:236 software/templates/about_us.html:5
 msgid "About us"
 msgstr "Sobre nosotros"
 
-#: core/templates/navigation.html:243 software/templates/features.html:507
+#: core/templates/navigation.html:242 software/templates/features.html:507
 msgid "REST API"
 msgstr "REST API"
 
-#: core/templates/navigation.html:249 utils/models.py:45
+#: core/templates/navigation.html:248 utils/models.py:45
 msgid "License"
 msgstr "Licencia"
 
-#: core/templates/navigation.html:255
+#: core/templates/navigation.html:254
 msgid "Developer documentation"
 msgstr "Documentación para desarrolladores"
 
-#: core/templates/navigation.html:262
+#: core/templates/navigation.html:261
 msgid "Get the code"
 msgstr "Código fuente"
 
-#: core/templates/navigation.html:269 core/templates/template.html:214
+#: core/templates/navigation.html:268 core/templates/template.html:227
 #: software/templates/features.html:582
 msgid "Translate"
 msgstr "Traduce"
 
-#: core/templates/navigation.html:303 core/templates/user/login.html:28
+#: core/templates/navigation.html:302 core/templates/user/login.html:28
 msgid "Reset password"
 msgstr "Restablecer la contraseña"
 
-#: core/templates/navigation.html:321
+#: core/templates/navigation.html:320
 msgid "My preferences"
 msgstr "Mis preferencias"
 
-#: core/templates/navigation.html:330
+#: core/templates/navigation.html:329
 msgid "Logout"
 msgstr "Cerrar sesión"
 
-#: core/templates/navigation.html:353
+#: core/templates/navigation.html:352
 msgid "Licenses"
 msgstr "Licencias"
 
-#: core/templates/navigation.html:361
+#: core/templates/navigation.html:360
 #: core/templates/repetition_unit/list.html:4
 msgid "Repetition units"
 msgstr "Unidades de repetición"
 
-#: core/templates/navigation.html:369 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:368 core/templates/weight_unit/list.html:4
 #: nutrition/templates/ingredient/view.html:141
 msgid "Weight units"
 msgstr "Unidades de peso"
 
-#: core/templates/navigation.html:377 core/templates/user/list.html:4
+#: core/templates/navigation.html:376 core/templates/user/list.html:4
 msgid "User list"
 msgstr "Lista de usuarios"
 
-#: core/templates/navigation.html:383
+#: core/templates/navigation.html:382
 msgid "Gyms"
 msgstr "Gimnasios"
 
@@ -893,57 +882,32 @@ msgstr "anterior"
 msgid "next"
 msgstr "próximo"
 
-#: core/templates/tags/render_day.html:34
-msgid "Add weight log"
-msgstr "Añader registro de peso"
-
-#: core/templates/tags/render_day.html:116
-msgid "Placeholder image for exercise"
+#: core/templates/tags/render_day.html:44
+#, fuzzy
+#| msgid "Placeholder image for exercise"
+msgid "Placeholder image for translation"
 msgstr "Marcador de imagen para ejercicio"
 
-#: core/templates/tags/render_day.html:133
-msgid "This exercise has no repetitions."
-msgstr "Este ejercicio no tiene repeticiones."
-
-#: core/templates/tags/render_day.html:136
-msgid "Edit them now."
-msgstr "Editar ahora."
-
-#: core/templates/tags/render_day.html:162
-msgid "Add exercises to this workout day"
-msgstr "Añadir ejercicios a este dia"
-
-#: core/templates/tags/render_weight_log.html:17 manager/helpers.py:86
-#: manager/models/setting.py:72 manager/templates/set/formset.html:9
-msgid "Reps"
-msgstr "Repeticiones"
-
-#: core/templates/tags/render_weight_log.html:30 manager/forms.py:191
-#: manager/models/log.py:103 manager/models/setting.py:102
-#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
-msgid "RiR"
-msgstr "ReR"
-
-#: core/templates/template.html:122 manager/templates/calendar/month.html:138
-#: manager/templates/schedule/view.html:248
-#: manager/templates/schedule/view.html:269
-#: manager/templates/workout/view.html:84
-#: manager/templates/workout/view.html:137
+#: core/templates/template.html:124 manager/templates/calendar/month.html:138
+#: manager/templates/schedule/view.html:262
+#: manager/templates/schedule/view.html:287
+#: manager/templates/workout/view.html:89
+#: manager/templates/workout/view.html:149
 msgid "Close"
 msgstr "Cerrar"
 
-#: core/templates/template.html:138
+#: core/templates/template.html:140
 msgid ""
 "You are using a guest account, data entered will be deleted after a week."
 msgstr ""
 "Estás usando una cuenta de invitado, los datos que introduzcas se borrarán "
 "en una semana."
 
-#: core/templates/template.html:143
+#: core/templates/template.html:145
 msgid "Create some demo entries"
 msgstr "Crear datos de ejemplo"
 
-#: core/templates/template.html:180 software/templates/features.html:547
+#: core/templates/template.html:193 software/templates/features.html:547
 #: software/templates/tos.html:7
 msgid "Terms of service"
 msgstr "Términos de servicio"
@@ -952,7 +916,7 @@ msgstr "Términos de servicio"
 msgid "Features"
 msgstr "Funciones"
 
-#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:54
+#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:59
 msgid "API key"
 msgstr "LLave de API"
 
@@ -996,17 +960,17 @@ msgstr "Generar una nueva llave de API"
 msgid "Documentation"
 msgstr "Documentación"
 
-#: core/templates/user/delete_account.html:4
-#: core/templates/user/preferences.html:59
+#: core/templates/user/delete_account.html:3
+#: core/templates/user/preferences.html:62
 msgid "Delete account"
 msgstr "Eliminar cuenta"
 
-#: core/templates/user/delete_account.html:17
+#: core/templates/user/delete_account.html:9
 #: exercises/templates/history/overview.html:93
 msgid "Are you sure?"
 msgstr "¿Estas seguro?"
 
-#: core/templates/user/delete_account.html:22
+#: core/templates/user/delete_account.html:14
 #, python-format
 msgid ""
 "This action will delete the user account \"%(username)s\".\n"
@@ -1029,22 +993,22 @@ msgstr "¿Olvidaste tu contraseña?"
 
 #: core/templates/user/overview.html:25 core/templates/user/overview.html:68
 #: core/templates/user/overview.html:112 core/templates/user/overview.html:144
-#: core/templates/user/overview.html:330 core/templates/user/overview.html:369
-#: core/templates/user/overview.html:405
+#: core/templates/user/overview.html:348 core/templates/user/overview.html:390
+#: core/templates/user/overview.html:426
 #, python-format
 msgid "last %(number)s"
 msgstr "últimos %(number)s"
 
 #: core/templates/user/overview.html:27 core/templates/user/overview.html:146
-#: core/templates/user/overview.html:325 core/templates/user/overview.html:364
-#: core/templates/user/overview.html:400 gym/templates/gym/member_list.html:210
-#: gym/templates/gym/member_list.html:243
-#: gym/templates/gym/member_list.html:280
+#: core/templates/user/overview.html:343 core/templates/user/overview.html:382
+#: core/templates/user/overview.html:421 gym/templates/gym/member_list.html:226
+#: gym/templates/gym/member_list.html:262
+#: gym/templates/gym/member_list.html:302
 msgid "Overview"
 msgstr "Resumen"
 
 #: core/templates/user/overview.html:28
-#: manager/templates/schedule/view.html:163
+#: manager/templates/schedule/view.html:172
 #: manager/templates/workout/overview.html:39 manager/views/schedule_step.py:60
 msgid "Add workout"
 msgstr "Añadir rutina"
@@ -1076,38 +1040,36 @@ msgstr "Descripción"
 msgid "Number of logs (days)"
 msgstr "Número de registros (días)"
 
-#: core/templates/user/overview.html:37 core/views/user.py:600
+#: core/templates/user/overview.html:37 core/views/user.py:599
 #: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:158
 msgid "Last activity"
 msgstr "Última actividad"
 
 #: core/templates/user/overview.html:58
 #: manager/templates/calendar/month.html:128
-#: manager/templates/schedule/view.html:144
 #: manager/templates/workout/overview.html:28
 msgid "No workouts found."
 msgstr "No se han encontrado rutinas."
 
 #: core/templates/user/overview.html:68 manager/forms.py:280
-#: manager/templates/workout/view.html:106
+#: manager/templates/workout/view.html:114
 msgid "Log"
 msgstr "Registro"
 
 #: core/templates/user/overview.html:77 manager/models/session.py:83
-#: manager/templates/calendar/partial_overview_table.html:52
+#: manager/templates/calendar/partial_overview_table.html:54
 msgid "General impression"
 msgstr "Impresión general"
 
-#: core/templates/user/overview.html:78 core/templates/user/overview.html:369
+#: core/templates/user/overview.html:78 core/templates/user/overview.html:390
 #: manager/models/session.py:73
-#: manager/templates/calendar/partial_overview_table.html:56
-#: manager/templates/workout/log.html:89
+#: manager/templates/calendar/partial_overview_table.html:58
 msgid "Notes"
 msgstr "Notas"
 
 #: core/templates/user/overview.html:79
 #: exercises/templates/history/overview.html:30
-#: manager/templates/calendar/partial_overview_table.html:42
+#: manager/templates/calendar/partial_overview_table.html:44
 msgid "Time"
 msgstr "Tiempo"
 
@@ -1145,123 +1107,123 @@ msgstr "Grasa"
 msgid "kcal"
 msgstr "kcal"
 
-#: core/templates/user/overview.html:201 core/templates/user/overview.html:322
-#: core/templates/user/overview.html:361 core/templates/user/overview.html:397
-#: core/templates/user/overview.html:442 gym/templates/gym/list.html:42
-#: gym/templates/gym/member_list.html:84 gym/templates/gym/member_list.html:137
-#: gym/templates/gym/member_list.html:173
-#: gym/templates/gym/member_list.html:207
-#: gym/templates/gym/member_list.html:240
-#: gym/templates/gym/member_list.html:277
-#: manager/templates/schedule/view.html:100
+#: core/templates/user/overview.html:201 core/templates/user/overview.html:340
+#: core/templates/user/overview.html:379 core/templates/user/overview.html:418
+#: core/templates/user/overview.html:463 gym/templates/gym/list.html:45
+#: gym/templates/gym/member_list.html:91 gym/templates/gym/member_list.html:149
+#: gym/templates/gym/member_list.html:187
+#: gym/templates/gym/member_list.html:223
+#: gym/templates/gym/member_list.html:259
+#: gym/templates/gym/member_list.html:299
+#: manager/templates/schedule/view.html:99
 msgid "Actions"
 msgstr "Acciones"
 
-#: core/templates/user/overview.html:207
+#: core/templates/user/overview.html:210
 msgid "Deactivate user"
 msgstr "Desactivar usuario"
 
-#: core/templates/user/overview.html:209
+#: core/templates/user/overview.html:214
 msgid "Activate user"
 msgstr "Activar usuario"
 
-#: core/templates/user/overview.html:211
+#: core/templates/user/overview.html:223
 msgid "Reset user password"
 msgstr "Restablecer la contraseña del usuario"
 
-#: core/templates/user/overview.html:214 gym/templates/gym/member_list.html:30
+#: core/templates/user/overview.html:227 gym/templates/gym/member_list.html:30
 msgid "Roles"
 msgstr "Roles"
 
-#: core/templates/user/overview.html:225
+#: core/templates/user/overview.html:243
 msgid "Password reset confirmation"
 msgstr "Confirmación de restablecimiento de contraseña"
 
-#: core/templates/user/overview.html:229
+#: core/templates/user/overview.html:247
 msgid "Do you really want to change this user&#39;s password?"
 msgstr "¿Realmente quieres cambiar la contraseña de este usuario?"
 
-#: core/templates/user/overview.html:232
+#: core/templates/user/overview.html:250
 #: exercises/templates/history/overview.html:106
 msgid "No"
 msgstr "No"
 
-#: core/templates/user/overview.html:233
+#: core/templates/user/overview.html:251
 #: exercises/templates/history/overview.html:99
 msgid "Yes"
 msgstr "Sí"
 
-#: core/templates/user/overview.html:254 gym/templates/gym/member_list.html:93
+#: core/templates/user/overview.html:272 gym/templates/gym/member_list.html:105
 msgid "Details"
 msgstr "Detalles"
 
-#: core/templates/user/overview.html:258 gym/views/export.py:57
-#: manager/helpers.py:86 manager/templates/schedule/view.html:98
+#: core/templates/user/overview.html:276 gym/views/export.py:57
+#: manager/helpers.py:86 manager/templates/schedule/view.html:97
 msgid "Nr."
 msgstr "Nr."
 
-#: core/templates/user/overview.html:280 gym/models/contract.py:287
+#: core/templates/user/overview.html:298 gym/models/contract.py:287
 #: gym/models/gym.py:50 gym/templates/contract/view.html:75
-#: gym/templates/gym/member_list.html:100 gym/views/export.py:68
+#: gym/templates/gym/member_list.html:112 gym/views/export.py:68
 msgid "Phone"
 msgstr "Teléfono"
 
-#: core/templates/user/overview.html:284 gym/templates/contract/view.html:87
-#: gym/templates/gym/member_list.html:118
+#: core/templates/user/overview.html:302 gym/templates/contract/view.html:87
+#: gym/templates/gym/member_list.html:130
 msgid "Address"
 msgstr "Dirección"
 
-#: core/templates/user/overview.html:295
+#: core/templates/user/overview.html:313
 msgid "Registered"
 msgstr "Registrado"
 
-#: core/templates/user/overview.html:299
+#: core/templates/user/overview.html:317
 msgid "Last login"
 msgstr "Último inicio de sesión"
 
-#: core/templates/user/overview.html:304
+#: core/templates/user/overview.html:322
 msgid "Status"
 msgstr "Estado"
 
-#: core/templates/user/overview.html:307
+#: core/templates/user/overview.html:325
 msgid "Active"
 msgstr "Activo"
 
-#: core/templates/user/overview.html:309
+#: core/templates/user/overview.html:327
 msgid "Inactive"
 msgstr "Inactivo"
 
-#: core/templates/user/overview.html:330 gym/templates/contract/list.html:4
-#: gym/templates/gym/member_list.html:202
+#: core/templates/user/overview.html:348 gym/templates/contract/list.html:4
+#: gym/templates/gym/member_list.html:218
 msgid "Contracts"
 msgstr "Contratos"
 
-#: core/templates/user/overview.html:405 gym/templates/document/list.html:4
+#: core/templates/user/overview.html:426 gym/templates/document/list.html:4
 msgid "Documents"
 msgstr "Documentos"
 
-#: core/templates/user/overview.html:412 gym/templates/document/list.html:32
-#: manager/forms.py:292 manager/templates/workout/view.html:132
+#: core/templates/user/overview.html:433 gym/templates/document/list.html:33
+#: manager/forms.py:292 manager/templates/workout/view.html:143
 msgid "Download"
 msgstr "Bajar"
 
-#: core/templates/user/overview.html:450 gym/views/admin_config.py:44
+#: core/templates/user/overview.html:474 gym/views/admin_config.py:44
 #: gym/views/admin_config.py:58 gym/views/user_config.py:46
 msgid "Configuration"
 msgstr "Configuración"
 
-#: core/templates/user/overview.html:453 gym/models/user_config.py:92
+#: core/templates/user/overview.html:477 gym/models/user_config.py:92
 msgid "Include in inactive overview"
 msgstr "Incluir en lista de inactivos"
 
-#: core/templates/user/overview.html:486
+#: core/templates/user/overview.html:510
 #, python-format
 msgid "Admin login is only available for users in %(gym_name)s"
 msgstr ""
 "El inicio de sesión de administrador solo está disponible para usuarios en "
 "%(gym_name)s"
 
-#: core/templates/user/overview.html:490
+#: core/templates/user/overview.html:514
 msgid "Log in as this user"
 msgstr "Inicia sesión como este usuario"
 
@@ -1281,20 +1243,20 @@ msgstr "Correo electrónico no verificado"
 msgid "Send verification email"
 msgstr "Envía un correo electronico de verificación"
 
-#: core/templates/user/preferences.html:30
+#: core/templates/user/preferences.html:31
 msgid "You need to verify your email to contribute exercises"
 msgstr ""
 "Necesitas verificar tu correo electrónico para contribuir con ejercicios"
 
-#: core/templates/user/preferences.html:50 core/views/user.py:611
+#: core/templates/user/preferences.html:55 core/views/user.py:610
 msgid "Change password"
 msgstr "Cambiar contraseña"
 
-#: core/templatetags/wger_extras.py:205 i18n.tpl:37
+#: core/templatetags/wger_extras.py:197 i18n.tpl:37
 msgid "kg"
 msgstr "kg"
 
-#: core/templatetags/wger_extras.py:207
+#: core/templatetags/wger_extras.py:199
 #: nutrition/templates/ingredient/view.html:60
 #: nutrition/templates/ingredient/view.html:66
 #: nutrition/templates/ingredient/view.html:73
@@ -1306,11 +1268,11 @@ msgctxt "weight unit, i.e. grams"
 msgid "g"
 msgstr "g"
 
-#: core/templatetags/wger_extras.py:210 i18n.tpl:38
+#: core/templatetags/wger_extras.py:202 i18n.tpl:38
 msgid "lb"
 msgstr "lb"
 
-#: core/templatetags/wger_extras.py:212
+#: core/templatetags/wger_extras.py:204
 msgctxt "weight unit, i.e. ounces"
 msgid "oz"
 msgstr "oz"
@@ -1337,13 +1299,13 @@ msgid "Delete {0}?"
 msgstr "¿Borrar {0}?"
 
 #: core/views/languages.py:111 core/views/license.py:85
-#: core/views/repetition_units.py:86 core/views/user.py:474
+#: core/views/repetition_units.py:86 core/views/user.py:473
 #: core/views/weight_units.py:86 exercises/views/categories.py:98
 #: exercises/views/equipment.py:81 exercises/views/muscles.py:87
 #: gym/views/admin_notes.py:161 gym/views/config.py:68
 #: gym/views/contract.py:186 gym/views/contract_option.py:123
 #: gym/views/contract_type.py:123 gym/views/document.py:171
-#: gym/views/gym.py:463 manager/views/day.py:100 manager/views/schedule.py:333
+#: gym/views/gym.py:463 manager/views/day.py:96 manager/views/schedule.py:333
 #: manager/views/workout.py:267 nutrition/views/ingredient.py:145
 #: nutrition/views/unit.py:143
 #, python-brace-format
@@ -1372,48 +1334,48 @@ msgstr "Enviar"
 msgid "Your feedback was successfully sent. Thank you!"
 msgstr "Tu comentario ha sido enviado con éxito, ¡gracias!"
 
-#: core/views/user.py:156
+#: core/views/user.py:155
 #, python-brace-format
 msgid "Account \"{0}\" was successfully deleted"
 msgstr "La cuenta \"{0}\" ha sido borrada con éxito"
 
-#: core/views/user.py:292
+#: core/views/user.py:291
 msgid "You were successfully registered"
 msgstr "Te has registrado con éxito"
 
-#: core/views/user.py:351
+#: core/views/user.py:350
 msgid "Settings successfully updated"
 msgstr "Preferecias actualizadas con éxito"
 
-#: core/views/user.py:390
+#: core/views/user.py:389
 msgid "The user was successfully deactivated"
 msgstr "El usuario ha sido desactivado con éxito"
 
-#: core/views/user.py:427
+#: core/views/user.py:426
 msgid "The user was successfully activated"
 msgstr "El usuario ha sido activado con éxito"
 
-#: core/views/user.py:442
+#: core/views/user.py:441
 msgid "Edit user"
 msgstr "Editar usuario"
 
-#: core/views/user.py:597 gym/templates/gym/member_list.html:26
+#: core/views/user.py:596 gym/templates/gym/member_list.html:26
 #: gym/views/gym.py:158
 msgid "ID"
 msgstr "ID"
 
-#: core/views/user.py:598 gym/forms.py:95 gym/templates/contract/view.html:55
+#: core/views/user.py:597 gym/forms.py:95 gym/templates/contract/view.html:55
 #: gym/templates/gym/member_list.html:27 gym/views/export.py:59
 #: gym/views/gym.py:158 gym/views/gym.py:217
 msgid "Username"
 msgstr "Nombre de usuario"
 
-#: core/views/user.py:601 gym/templates/gym/new_user.html:34
+#: core/views/user.py:600 gym/templates/gym/new_user.html:34
 #: gym/views/export.py:58 gym/views/gym.py:217
 msgid "Gym"
 msgstr "Gimnasio"
 
-#: core/views/user.py:660
+#: core/views/user.py:659
 #, python-format
 msgid "A verification email was sent to %(email)s"
 msgstr "Se envió un correo electrónico de verificación a %(email)s"
@@ -1566,11 +1528,6 @@ msgstr "Códec, nombre largo"
 msgid "Equipment list"
 msgstr "Lista de equipos"
 
-#: exercises/templates/equipment/admin-overview.html:39
-#: exercises/views/equipment.py:92
-msgid "Add new equipment"
-msgstr "Agregar nuevo equipo"
-
 #: exercises/templates/history/overview.html:11
 msgid "Exercise admin history"
 msgstr "Historial de administración de ejercicios"
@@ -1618,11 +1575,6 @@ msgstr "Revertir cambios"
 msgid "Muscle overview"
 msgstr "Índice de músculos"
 
-#: exercises/templates/muscles/admin-overview.html:38
-#: exercises/views/muscles.py:68
-msgid "Add muscle"
-msgstr "Añadir músculo"
-
 #: exercises/views/categories.py:72
 msgid "Add category"
 msgstr "Añadir categoría"
@@ -1631,6 +1583,10 @@ msgstr "Añadir categoría"
 msgid "This will also delete all exercises in this category."
 msgstr "Esto también borrará todos los ejercicios en esta categoría."
 
+#: exercises/views/equipment.py:92
+msgid "Add new equipment"
+msgstr "Agregar nuevo equipo"
+
 #: exercises/views/equipment.py:104 exercises/views/equipment.py:115
 msgid "Delete equipment?"
 msgstr "¿Borrar equipo?"
@@ -1639,6 +1595,10 @@ msgstr "¿Borrar equipo?"
 msgid "This will delete the exercise from all workouts."
 msgstr "Esto también borrará el ejercicio de todas las rutinas."
 
+#: exercises/views/muscles.py:68
+msgid "Add muscle"
+msgstr "Añadir músculo"
+
 #: gallery/templates/images/overview.html:62
 msgid "Add image"
 msgstr "Añadir imagen"
@@ -1725,7 +1685,7 @@ msgid "Contract is active"
 msgstr "Contrato está activo"
 
 #: gym/models/contract.py:237 gym/templates/contract/view.html:69
-#: manager/models/schedule.py:61 manager/templates/schedule/view.html:67
+#: manager/models/schedule.py:61 manager/templates/schedule/view.html:66
 msgid "Start date"
 msgstr "Fecha de comienzo"
 
@@ -1761,7 +1721,7 @@ msgstr "Administrador: puede gestionar los usuarios de un gimnasio"
 msgid "Admin: can administrate the different gyms"
 msgstr "Administrador: puede administrar los diferentes gimnasios"
 
-#: gym/models/gym.py:65 gym/templates/gym/member_list.html:114
+#: gym/models/gym.py:65 gym/templates/gym/member_list.html:126
 msgid "Owner"
 msgstr "Propietario"
 
@@ -1773,7 +1733,7 @@ msgstr ""
 "Número de semanas desde la última vez que un usuario registrara su presencia "
 "para ser considerado como inactivo"
 
-#: gym/models/gym_config.py:56 gym/templates/gym/member_list.html:152
+#: gym/models/gym_config.py:56 gym/templates/gym/member_list.html:166
 msgid "Show name in header"
 msgstr "Mostrar nombre en la cabecera"
 
@@ -1786,7 +1746,7 @@ msgstr "Mostrar el nombre del gimnasio en la cabecera"
 msgid "Configuration for {self.gym.name}"
 msgstr "Configuración para {self.gym.name}"
 
-#: gym/models/user_config.py:65 gym/templates/gym/member_list.html:184
+#: gym/models/user_config.py:65 gym/templates/gym/member_list.html:200
 msgid "Overview of inactive members"
 msgstr "Resumen de miembros inactivos"
 
@@ -1810,7 +1770,7 @@ msgstr "Se usará el nombre del fichero si no se introduce nada"
 msgid "User notes"
 msgstr "Notas de usuario"
 
-#: gym/templates/contract/list.html:36
+#: gym/templates/contract/list.html:34
 msgid "Show"
 msgstr "Mostrar"
 
@@ -1838,11 +1798,11 @@ msgstr ""
 msgid "Gym list"
 msgstr "Lista de gimnasios"
 
-#: gym/templates/gym/list.html:50
+#: gym/templates/gym/list.html:53
 msgid "Global gym configuration"
 msgstr "Configuración global de gimnasio"
 
-#: gym/templates/gym/list.html:67 gym/views/gym.py:171
+#: gym/templates/gym/list.html:69 gym/views/gym.py:171
 msgid "Add new gym"
 msgstr "Añadir nuevo gimnasio"
 
@@ -1854,43 +1814,43 @@ msgstr "Administradores y entrenadores"
 msgid "Gym manager"
 msgstr "Gestor de gimnasio"
 
-#: gym/templates/gym/member_list.html:69
+#: gym/templates/gym/member_list.html:76
 msgid "This gym has no administrators or trainers"
 msgstr "Este gimnasio no tiene administradores o entrenadores"
 
-#: gym/templates/gym/member_list.html:88
+#: gym/templates/gym/member_list.html:98
 msgid "Export"
 msgstr "Exportar"
 
-#: gym/templates/gym/member_list.html:125
+#: gym/templates/gym/member_list.html:137
 msgid "Members"
 msgstr "Miembros"
 
-#: gym/templates/gym/member_list.html:145
+#: gym/templates/gym/member_list.html:159
 msgid "Gym configuration"
 msgstr "Configuración del gimnasio"
 
-#: gym/templates/gym/member_list.html:148
+#: gym/templates/gym/member_list.html:162
 msgid "Inactive members"
 msgstr "Miembros inactivos"
 
-#: gym/templates/gym/member_list.html:149
+#: gym/templates/gym/member_list.html:163
 msgid "weeks"
 msgstr "semanas"
 
-#: gym/templates/gym/member_list.html:181
+#: gym/templates/gym/member_list.html:197
 msgid "My configuration"
 msgstr "Mi configuración"
 
-#: gym/templates/gym/member_list.html:215
+#: gym/templates/gym/member_list.html:234
 msgid "Types"
 msgstr "Tipos"
 
-#: gym/templates/gym/member_list.html:285
+#: gym/templates/gym/member_list.html:307
 msgid "Emails"
 msgstr "Emails"
 
-#: gym/templates/gym/member_list.html:315
+#: gym/templates/gym/member_list.html:336
 msgid "Add member"
 msgstr "Añadir miembro"
 
@@ -2187,28 +2147,38 @@ msgstr "Busque también los nombres en inglés"
 msgid "Unit"
 msgstr "Unidad"
 
+#: manager/forms.py:191 manager/models/log.py:103 manager/models/setting.py:102
+#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
+msgid "RiR"
+msgstr "ReR"
+
 #: manager/forms.py:279
 msgid "Type"
 msgstr "Tipo"
 
-#: manager/forms.py:280 manager/templates/workout/view.html:113
+#: manager/forms.py:280 manager/templates/workout/view.html:122
 msgid "Table"
 msgstr "Tabla"
 
-#: manager/forms.py:282 manager/templates/workout/view.html:119
+#: manager/forms.py:282 manager/templates/workout/view.html:129
 msgid "with images"
 msgstr "con imágenes"
 
-#: manager/forms.py:283 manager/templates/workout/view.html:125
+#: manager/forms.py:283 manager/templates/workout/view.html:136
 msgid "with comments"
 msgstr "con comentarios"
 
+#: manager/helpers.py:86 manager/models/setting.py:72
+#: manager/templates/set/formset.html:9
+msgid "Reps"
+msgstr "Repeticiones"
+
 #: manager/management/commands/email-reminders.py:121
 msgid "Workout will expire soon"
 msgstr "Rutina expirará pronto"
 
 #: manager/models/day.py:34 manager/models/log.py:58
-#: manager/models/session.py:60 manager/templates/schedule/view.html:102
+#: manager/models/session.py:60 manager/templates/schedule/view.html:101
 #: manager/templates/workout/view.html:9 manager/templates/workout/view.html:17
 #: manager/views/pdf.py:85 manager/views/pdf.py:161
 #: manager/views/schedule.py:151 manager/views/schedule.py:221
@@ -2231,7 +2201,7 @@ msgstr "Día"
 msgid "Name or short description of the schedule. For example 'Program XYZ'."
 msgstr "Nombre o descripción corta del programa. Por ejemplo 'Programa XYZ'."
 
-#: manager/models/schedule.py:65 manager/templates/schedule/view.html:71
+#: manager/models/schedule.py:65 manager/templates/schedule/view.html:70
 msgid "Schedule active"
 msgstr "Programa activo"
 
@@ -2244,7 +2214,7 @@ msgstr ""
 "Activa si quieres marcar este programa como activo (será mostrado p.ej. en "
 "tu panel de control). Otros programas se marcarán como inactivos"
 
-#: manager/models/schedule.py:77 manager/templates/schedule/view.html:81
+#: manager/models/schedule.py:77 manager/templates/schedule/view.html:80
 msgid "Is a loop"
 msgstr "Se repite"
 
@@ -2264,7 +2234,7 @@ msgid "The duration in weeks"
 msgstr "La duración, en semanas"
 
 #: manager/models/schedule_step.py:64 manager/models/set.py:53
-#: manager/models/setting.py:113 nutrition/models/meal.py:55
+#: manager/models/setting.py:113 nutrition/models/meal.py:53
 #: nutrition/models/meal_item.py:66
 msgid "Order"
 msgstr "Orden"
@@ -2408,7 +2378,7 @@ msgstr "Resumen del registro"
 msgid "Workout session"
 msgstr "Session de entrenamiento"
 
-#: manager/templates/calendar/partial_overview_table.html:27
+#: manager/templates/calendar/partial_overview_table.html:26
 msgid "Delete with logs"
 msgstr "Eliminar con registros"
 
@@ -2431,21 +2401,27 @@ msgstr ""
 "si no existe ya una para la fecha seleccionada. Si la hay, simplemente\n"
 "se editará. Las entradas se peso siempre se añadirán."
 
-#: manager/templates/schedule/overview.html:5
+#: manager/templates/schedule/overview.html:4
 msgid "Your schedules"
 msgstr "Tus programas"
 
 #: manager/templates/schedule/overview.html:19
-#: manager/templates/schedule/view.html:131
-#: manager/templates/schedule/view.html:183
+#: manager/templates/schedule/view.html:143
+#: manager/templates/schedule/view.html:193
 #: manager/templates/workout/overview.html:16
 msgid "active"
 msgstr "activo"
 
-#: manager/templates/schedule/overview.html:28
+#: manager/templates/schedule/overview.html:27
 msgid "No schedules found."
 msgstr "No se han encontrado programas."
 
+#: manager/templates/schedule/overview.html:28
+#, fuzzy
+#| msgid "Add one now."
+msgid "Add one now"
+msgstr "Añadir ahora."
+
 #: manager/templates/schedule/overview.html:36
 msgid ""
 "Schedules are collections of workouts that you do in\n"
@@ -2455,12 +2431,20 @@ msgstr ""
 "                  sucesión."
 
 #: manager/templates/schedule/overview.html:39
+#, fuzzy
+#| msgid ""
+#| "You can indicate how long you want to do each workout\n"
+#| "        before jumping to the next. It is also possible to create a loop, "
+#| "so you\n"
+#| "        always do the same workouts in succession, e.g. A > B > C > A > B "
+#| "> C and so on."
 msgid ""
 "You can indicate how long you want to do each workout\n"
 "        before jumping to the next. It is also possible to create a loop, so "
 "you\n"
 "        always do the same workouts in succession, e.g. A > B > C > A > B > "
-"C and so on."
+"C and so\n"
+"        on."
 msgstr ""
 "Puedes indicar cuánto tiempo quieres hacer cada rutina \n"
 "                   antes de saltar a la siguiente. También puedes crear un "
@@ -2468,7 +2452,7 @@ msgstr ""
 "                   poder hacer siempre las mismas rutinas en sucesión, p.ej. "
 "A > B > C > A > B > C, etc."
 
-#: manager/templates/schedule/overview.html:43
+#: manager/templates/schedule/overview.html:44
 msgid ""
 "The currently active schedule will remain active (and be\n"
 "        shown e.g. in your dashboard) till it reaches the last workout or "
@@ -2487,26 +2471,26 @@ msgstr "Añadir programa"
 msgid "Schedule"
 msgstr "Calendario"
 
-#: manager/templates/schedule/view.html:85
+#: manager/templates/schedule/view.html:84
 msgid ""
 "This schedule is a loop and will go through the workouts above till you "
 "deactivate it"
 msgstr ""
 "Este programa es un bucle y pasará por las rutinas hasta que lo desactives"
 
-#: manager/templates/schedule/view.html:103
+#: manager/templates/schedule/view.html:102
 msgid "Weeks"
 msgstr "Semanas"
 
-#: manager/templates/schedule/view.html:115
+#: manager/templates/schedule/view.html:114
 msgid "Move me"
 msgstr "Arrástrame"
 
-#: manager/templates/schedule/view.html:156
+#: manager/templates/schedule/view.html:168
 msgid "Start schedule"
 msgstr "Iniciar programa"
 
-#: manager/templates/schedule/view.html:187
+#: manager/templates/schedule/view.html:197
 #, python-format
 msgid ""
 "%(weeks)s Week\n"
@@ -2521,11 +2505,11 @@ msgstr[1] ""
 "%(weeks)s Semanas\n"
 "                                "
 
-#: manager/templates/schedule/view.html:221
+#: manager/templates/schedule/view.html:231
 msgid "Adding workouts"
 msgstr "Añadir rutinas"
 
-#: manager/templates/schedule/view.html:223
+#: manager/templates/schedule/view.html:233
 msgid ""
 "Add as many workouts to the schedule as you want. You can\n"
 "            edit the order by dragging and dropping them. It's also possible "
@@ -2537,47 +2521,47 @@ msgstr ""
 "añadir el mismo ejercicio más\n"
 "de una vez."
 
-#: manager/templates/schedule/view.html:232
-#: manager/templates/schedule/view.html:243
-#: manager/templates/schedule/view.html:290
+#: manager/templates/schedule/view.html:242
+#: manager/templates/schedule/view.html:256
+#: manager/templates/schedule/view.html:310
 #: manager/templates/workout/view.html:69
-#: manager/templates/workout/view.html:79
-#: manager/templates/workout/view.html:178
+#: manager/templates/workout/view.html:83
+#: manager/templates/workout/view.html:192
 msgid "Export calendar file"
 msgstr "Exportar como archivo calendario"
 
-#: manager/templates/schedule/view.html:236
+#: manager/templates/schedule/view.html:248
 msgid "Export this schedule as a calendar file."
 msgstr "Expora este programa como archivo de calendario."
 
-#: manager/templates/schedule/view.html:237
-#: manager/templates/workout/view.html:74
+#: manager/templates/schedule/view.html:249
+#: manager/templates/workout/view.html:76
+#, fuzzy
+#| msgid ""
+#| "You can then import the file it into your calendar\n"
+#| "                        application for example google calendar, outlook "
+#| "or iCal. This will create\n"
+#| "                        an appointment for each training day with the "
+#| "appropriate exercises."
 msgid ""
 "You can then import the file it into your calendar\n"
 "                        application for example google calendar, outlook or "
 "iCal. This will create\n"
 "                        an appointment for each training day with the "
-"appropriate exercises."
+"appropriate\n"
+"                        exercises."
 msgstr ""
 "Podrás importar el archivo en tu aplicación de calendario, como por ejemplo\n"
 "Google Calendar, Outlook o iCal. Esto creará una entrada para cada día\n"
 "de entrenamiento con los respectivos ejercicios."
 
-#: manager/templates/schedule/view.html:258
-#: manager/templates/schedule/view.html:294
-#: manager/templates/workout/view.html:94
-#: manager/templates/workout/view.html:174
+#: manager/templates/schedule/view.html:272
+#: manager/templates/schedule/view.html:315
+#: manager/templates/workout/view.html:99
+#: manager/templates/workout/view.html:188
 msgid "Download as PDF"
 msgstr "Bajar como PDF"
 
-#: manager/templates/schedule/view.html:299
-msgid "Edit schedule"
-msgstr "Editar programa"
-
-#: manager/templates/schedule/view.html:304
-msgid "Delete schedule"
-msgstr "Borrar programa"
-
 #: manager/templates/set/add.html:9
 #, python-format
 msgid "Add exercises to day \"%(day_name)s\""
@@ -2656,56 +2640,6 @@ msgid ""
 msgstr ""
 "Recibirás regularmente estor recordatorios hasta que ingreses tu peso actual."
 
-#: manager/templates/workout/log.html:10 manager/templates/workout/log.html:11
-msgid "Weight log"
-msgstr "Registro de peso"
-
-#: manager/templates/workout/log.html:29
-msgid "Weight log for workout"
-msgstr "Registro de peso para rutina"
-
-#: manager/templates/workout/log.html:49
-msgid "Add weight log to this day"
-msgstr "Agregar un registro de peso a este día"
-
-#: manager/templates/workout/log.html:69
-msgid "No weight entries here."
-msgstr "No hay registro de peso."
-
-#: manager/templates/workout/log.html:77
-msgid "No exercises for this day."
-msgstr "No hay ejercicios para este día."
-
-#: manager/templates/workout/log.html:90
-msgid ""
-"This page shows the weight logs belonging to this workout\n"
-"only. Click on an exercise to see all the historical data for\n"
-"it."
-msgstr ""
-"Esta página muestra los registros de peso que pertenecen a esta rutina\n"
-"solamente. Haz click en un ejercicio para ver todos los datos históricos."
-
-#: manager/templates/workout/log.html:94
-msgid ""
-"If on a single day there is more than one entry with the\n"
-"same number of repetitions, but different weights, only the entry with the\n"
-"higher weight is shown in the diagram."
-msgstr ""
-"Si en un solo día, hay más de una entrada con el mismo \n"
-"número de repeticiones, pero diferentes pesos, solamente la entrada con el\n"
-"peso más alto se muestra en el diagrama."
-
-#: manager/templates/workout/log.html:98
-msgid ""
-"Note that only entries with a weight unit (kg or lb) and\n"
-"repetitions are charted, other combinations such as time or until failure\n"
-"are ignored here."
-msgstr ""
-"Tenga en cuenta que solo las entradas con una unidad de peso (kg o lb) y\n"
-"se grafican las repeticiones, otras combinaciones como el tiempo o hasta el "
-"fallo\n"
-"se ignoran aquí."
-
 #: manager/templates/workout/overview.html:25
 msgid "No templates found."
 msgstr "No se han encontrado plantillas."
@@ -2743,27 +2677,23 @@ msgstr "Añadir conjunto de rutinas a días"
 msgid "Set the repetitions for each set"
 msgstr "Pon las repeticiones para cada serie"
 
-#: manager/templates/workout/view.html:73
+#: manager/templates/workout/view.html:75
 msgid "Export this workout as a calendar file."
 msgstr "Exportar esta rutina como archivo de calendario."
 
-#: manager/templates/workout/view.html:144
+#: manager/templates/workout/view.html:156
 msgid "Logs"
 msgstr "Registro"
 
-#: manager/templates/workout/view.html:146
+#: manager/templates/workout/view.html:159
 msgid "View logs"
 msgstr "Ver registro de peso"
 
-#: manager/templates/workout/view.html:169 manager/views/schedule_step.py:99
-msgid "Edit workout"
-msgstr "Editar rutina"
-
-#: manager/templates/workout/view.html:182 manager/views/workout.py:281
+#: manager/templates/workout/view.html:195 manager/views/workout.py:281
 msgid "Mark as template"
 msgstr "Marcar como plantilla"
 
-#: manager/views/day.py:109
+#: manager/views/day.py:105
 msgid "Add workout day"
 msgstr "Añadir día de entrenamiento"
 
@@ -2780,6 +2710,10 @@ msgstr "Rutina para %s"
 msgid "Create schedule"
 msgstr "Crear programa"
 
+#: manager/views/schedule_step.py:99
+msgid "Edit workout"
+msgstr "Editar rutina"
+
 #: manager/views/workout.py:209
 msgid "Copy workout"
 msgstr "Copiar rutina"
@@ -2903,7 +2837,7 @@ msgstr "Cantidad en gramos"
 msgid "Unit amount, e.g. \"1 Cup\" or \"1/2 spoon\""
 msgstr "Unidad, p.ej. \"1 taza\" o \"1/2 cuchara\""
 
-#: nutrition/models/log.py:52 nutrition/models/meal.py:50
+#: nutrition/models/log.py:52 nutrition/models/meal.py:48
 #: nutrition/models/meal_item.py:48 nutrition/models/plan.py:108
 msgid "Nutrition plan"
 msgstr "Plan nutricional"
@@ -2916,11 +2850,11 @@ msgstr "Comida"
 msgid "Date and Time (Approx.)"
 msgstr "Fecha y Hora (aprox.)"
 
-#: nutrition/models/meal.py:62
+#: nutrition/models/meal.py:60
 msgid "Time (approx)"
 msgstr "Hora (aprox.)"
 
-#: nutrition/models/meal.py:69
+#: nutrition/models/meal.py:67
 msgid ""
 "Give meals a textual description / name such as \"Breakfast\" or \"after "
 "workout\""
@@ -3058,10 +2992,6 @@ msgstr "No hay ingredientes."
 msgid "Search"
 msgstr "Buscar"
 
-#: nutrition/templates/ingredient/overview.html:62
-msgid "Add ingredient"
-msgstr "Añadir ingrediente"
-
 #: nutrition/templates/ingredient/view.html:45 nutrition/views/plan.py:229
 msgid "Macronutrients"
 msgstr "Macronutrientes"
@@ -3081,20 +3011,11 @@ msgstr "n.d."
 msgid "Others"
 msgstr "Otros"
 
-#: nutrition/templates/ingredient/view.html:144
-#: nutrition/templates/units/list.html:46 nutrition/views/unit.py:86
+#: nutrition/templates/ingredient/view.html:143
+#: nutrition/templates/units/list.html:50 nutrition/views/unit.py:86
 msgid "Add new weight unit"
 msgstr "Añadir nueva unidad de peso"
 
-#: nutrition/templates/ingredient/view.html:206
-#: nutrition/templates/ingredient/view.html:209
-msgid "Edit ingredient"
-msgstr "Editar ingrediente"
-
-#: nutrition/templates/ingredient/view.html:213
-msgid "Delete ingredient"
-msgstr "Borrar ingrediente"
-
 #: nutrition/templates/rate/form.html:25
 msgid "Basal metabolic rate"
 msgstr "Metabolismo basal"
@@ -3308,7 +3229,7 @@ msgstr ""
 msgid "Our goal"
 msgstr "Nuestro objetivo"
 
-#: software/templates/about_us.html:62
+#: software/templates/about_us.html:71
 msgid ""
 "The goal is to build an awesome\n"
 "                and flexible fitness manager, along with a comprehensive and "
@@ -3736,6 +3657,87 @@ msgstr "Borrado con éxito."
 msgid "Delete weight entry for the %s"
 msgstr "Eliminar la entrada de peso para el %s"
 
+#~ msgid ""
+#~ "If a license has been localized, e.g. the Creative Commons\n"
+#~ "            licenses for the different countries, add them as separate "
+#~ "entries here."
+#~ msgstr ""
+#~ "Si la licencia ha sido localizada, como por ejemplo las licencias \n"
+#~ "                            Creative Commons para los diferentes países, "
+#~ "agrégalas como entradas separadas aquí."
+
+#~ msgid "Add weight log"
+#~ msgstr "Añader registro de peso"
+
+#~ msgid "This exercise has no repetitions."
+#~ msgstr "Este ejercicio no tiene repeticiones."
+
+#~ msgid "Edit them now."
+#~ msgstr "Editar ahora."
+
+#~ msgid "Add exercises to this workout day"
+#~ msgstr "Añadir ejercicios a este dia"
+
+#~ msgid "Edit schedule"
+#~ msgstr "Editar programa"
+
+#~ msgid "Delete schedule"
+#~ msgstr "Borrar programa"
+
+#~ msgid "Weight log"
+#~ msgstr "Registro de peso"
+
+#~ msgid "Weight log for workout"
+#~ msgstr "Registro de peso para rutina"
+
+#~ msgid "Add weight log to this day"
+#~ msgstr "Agregar un registro de peso a este día"
+
+#~ msgid "No weight entries here."
+#~ msgstr "No hay registro de peso."
+
+#~ msgid "No exercises for this day."
+#~ msgstr "No hay ejercicios para este día."
+
+#~ msgid ""
+#~ "This page shows the weight logs belonging to this workout\n"
+#~ "only. Click on an exercise to see all the historical data for\n"
+#~ "it."
+#~ msgstr ""
+#~ "Esta página muestra los registros de peso que pertenecen a esta rutina\n"
+#~ "solamente. Haz click en un ejercicio para ver todos los datos históricos."
+
+#~ msgid ""
+#~ "If on a single day there is more than one entry with the\n"
+#~ "same number of repetitions, but different weights, only the entry with "
+#~ "the\n"
+#~ "higher weight is shown in the diagram."
+#~ msgstr ""
+#~ "Si en un solo día, hay más de una entrada con el mismo \n"
+#~ "número de repeticiones, pero diferentes pesos, solamente la entrada con "
+#~ "el\n"
+#~ "peso más alto se muestra en el diagrama."
+
+#~ msgid ""
+#~ "Note that only entries with a weight unit (kg or lb) and\n"
+#~ "repetitions are charted, other combinations such as time or until "
+#~ "failure\n"
+#~ "are ignored here."
+#~ msgstr ""
+#~ "Tenga en cuenta que solo las entradas con una unidad de peso (kg o lb) y\n"
+#~ "se grafican las repeticiones, otras combinaciones como el tiempo o hasta "
+#~ "el fallo\n"
+#~ "se ignoran aquí."
+
+#~ msgid "Add ingredient"
+#~ msgstr "Añadir ingrediente"
+
+#~ msgid "Edit ingredient"
+#~ msgstr "Editar ingrediente"
+
+#~ msgid "Delete ingredient"
+#~ msgstr "Borrar ingrediente"
+
 #~ msgid "Ingredients pending review"
 #~ msgstr "Ingredientes esperando revisión"
 
diff --git a/wger/locale/fa/LC_MESSAGES/django.po b/wger/locale/fa/LC_MESSAGES/django.po
index 2e2d40cbf..88a5a99f3 100644
--- a/wger/locale/fa/LC_MESSAGES/django.po
+++ b/wger/locale/fa/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: wger Workout Manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-07-14 15:59+0200\n"
+"POT-Creation-Date: 2024-11-14 13:09+0100\n"
 "PO-Revision-Date: 2024-09-15 10:09+0000\n"
 "Last-Translator: m93n pk <mohsen.k9731@gmail.com>\n"
 "Language-Team: Persian <https://hosted.weblate.org/projects/wger/web/fa/>\n"
@@ -19,7 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 "X-Generator: Weblate 5.8-dev\n"
 
-#: config/models/gym_config.py:46 gym/templates/gym/list.html:53
+#: config/models/gym_config.py:46 gym/templates/gym/list.html:56
 msgid "Default gym"
 msgstr "باشگاه پیش فرض"
 
@@ -32,28 +32,28 @@ msgstr ""
 "کاربران جدید و کاربران قدیدمی که باشگاه پیش فرض ندارند به این باشگاه اضافه "
 "میشوند."
 
-#: config/views/gym_config.py:42 core/templates/language/view.html:67
-#: core/templates/license/list.html:17 core/templates/misc/license/list.html:18
+#: config/views/gym_config.py:42 core/templates/language/view.html:64
+#: core/templates/license/list.html:17
 #: core/templates/repetition_unit/list.html:18
-#: core/templates/tags/render_day.html:39
-#: core/templates/tags/render_day.html:75 core/templates/user/overview.html:204
-#: core/templates/user/overview.html:445
+#: core/templates/user/overview.html:204 core/templates/user/overview.html:467
 #: core/templates/weight_unit/list.html:18
 #: exercises/templates/categories/admin-overview.html:17
 #: exercises/templates/equipment/admin-overview.html:17
-#: exercises/templates/muscles/admin-overview.html:17
-#: gallery/views/images.py:98 gym/templates/admin_notes/list.html:32
-#: gym/templates/contract/list.html:31 gym/templates/contract/view.html:107
-#: gym/templates/contract_option/list.html:32
-#: gym/templates/contract_type/list.html:32 gym/templates/document/list.html:38
-#: gym/templates/gym/list.html:20 gym/templates/gym/list.html:46
-#: gym/templates/gym/member_list.html:87 gym/templates/gym/member_list.html:140
-#: gym/templates/gym/member_list.html:176
-#: manager/templates/calendar/day.html:68
-#: manager/templates/calendar/month.html:85
-#: manager/templates/calendar/partial_overview_table.html:18
-#: manager/templates/schedule/view.html:118
-#: nutrition/templates/ingredient/view.html:165
+#: exercises/templates/muscles/admin-overview.html:16
+#: gallery/views/images.py:98 gym/templates/admin_notes/list.html:31
+#: gym/templates/contract/list.html:30 gym/templates/contract/view.html:106
+#: gym/templates/contract_option/list.html:29
+#: gym/templates/contract_type/list.html:30 gym/templates/document/list.html:38
+#: gym/templates/gym/list.html:19 gym/templates/gym/list.html:48
+#: gym/templates/gym/member_list.html:94 gym/templates/gym/member_list.html:152
+#: gym/templates/gym/member_list.html:190
+#: manager/templates/calendar/day.html:67
+#: manager/templates/calendar/month.html:84
+#: manager/templates/calendar/partial_overview_table.html:16
+#: manager/templates/schedule/view.html:318
+#: manager/templates/workout/view.html:181
+#: nutrition/templates/ingredient/view.html:164
+#: nutrition/templates/ingredient/view.html:209
 #: nutrition/templates/units/list.html:19
 msgid "Edit"
 msgstr "ویرایش"
@@ -89,8 +89,8 @@ msgstr "برنامه تمرینی جالب من"
 msgid "Empty placeholder schedule"
 msgstr "برنامه خالی"
 
-#: core/forms.py:69 core/templates/navigation.html:285
-#: core/templates/navigation.html:291 core/templates/user/login.html:4
+#: core/forms.py:69 core/templates/navigation.html:284
+#: core/templates/navigation.html:290 core/templates/user/login.html:4
 #: software/templates/features.html:82 software/templates/features.html:427
 msgid "Login"
 msgstr "ورود"
@@ -100,14 +100,14 @@ msgstr "ورود"
 msgid "First name"
 msgstr "نام"
 
-#: core/forms.py:109 core/forms.py:215 core/templates/user/overview.html:266
+#: core/forms.py:109 core/forms.py:215 core/templates/user/overview.html:284
 #: gym/views/export.py:62 gym/views/gym.py:217
 msgid "Last name"
 msgstr "نام خانوادگی"
 
-#: core/forms.py:111 core/forms.py:180 core/templates/user/overview.html:270
+#: core/forms.py:111 core/forms.py:180 core/templates/user/overview.html:288
 #: gym/models/contract.py:256 gym/models/gym.py:58
-#: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:104
+#: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:116
 #: gym/templates/gym/new_user.html:30 gym/views/export.py:60
 #: mailer/templates/mailer/gym/form.html:4
 #: mailer/templates/mailer/gym/overview.html:4
@@ -137,8 +137,8 @@ msgstr "یاداوری تمرین"
 msgid "Other settings"
 msgstr "تنظیمات دیگر"
 
-#: core/forms.py:174 core/views/user.py:624 core/views/user.py:639
-#: core/views/user.py:651 gym/forms.py:73 manager/templates/log/add.html:65
+#: core/forms.py:174 core/views/user.py:623 core/views/user.py:638
+#: core/views/user.py:650 gym/forms.py:73 manager/templates/log/add.html:65
 #: manager/templates/set/add.html:70 manager/views/workout.py:203
 #: utils/generic_views.py:143
 msgid "Save"
@@ -163,26 +163,25 @@ msgstr "پسورد"
 msgid "Please enter your current password."
 msgstr "لطفا رمز عبور فعلی خود را وارد کنید."
 
-#: core/forms.py:242 core/templates/language/view.html:73
-#: core/templates/license/list.html:19 core/templates/misc/license/list.html:22
-#: core/templates/repetition_unit/list.html:20
-#: core/templates/tags/render_day.html:45
-#: core/templates/tags/render_day.html:81 core/templates/user/overview.html:217
-#: core/templates/weight_unit/list.html:20
-#: exercises/templates/categories/admin-overview.html:19
-#: exercises/templates/equipment/admin-overview.html:19
-#: exercises/templates/muscles/admin-overview.html:19
-#: gym/templates/admin_notes/list.html:40
-#: gym/templates/contract_option/list.html:41
-#: gym/templates/contract_type/list.html:41 gym/templates/document/list.html:46
-#: gym/templates/gym/list.html:22 manager/templates/calendar/day.html:73
-#: manager/templates/calendar/month.html:89
-#: manager/templates/calendar/partial_overview_table.html:23
-#: manager/templates/schedule/view.html:122
-#: manager/templates/workout/view.html:188
-#: nutrition/templates/ingredient/view.html:166
+#: core/forms.py:242 core/templates/language/view.html:70
+#: core/templates/license/list.html:21
+#: core/templates/repetition_unit/list.html:22
+#: core/templates/user/overview.html:233
+#: core/templates/weight_unit/list.html:22
+#: exercises/templates/categories/admin-overview.html:21
+#: exercises/templates/equipment/admin-overview.html:21
+#: exercises/templates/muscles/admin-overview.html:20
+#: gym/templates/admin_notes/list.html:37
+#: gym/templates/contract_option/list.html:35
+#: gym/templates/contract_type/list.html:36 gym/templates/document/list.html:46
+#: gym/templates/gym/list.html:23 manager/templates/calendar/day.html:73
+#: manager/templates/calendar/month.html:88
+#: manager/templates/calendar/partial_overview_table.html:22
+#: manager/templates/schedule/view.html:324
+#: manager/templates/workout/view.html:202
+#: nutrition/templates/ingredient/view.html:168
 #: nutrition/templates/ingredient/view.html:215
-#: nutrition/templates/units/list.html:22
+#: nutrition/templates/units/list.html:25
 msgid "Delete"
 msgstr "حذف"
 
@@ -194,9 +193,9 @@ msgstr "رمز نامعتبر"
 msgid "The form is secured with reCAPTCHA"
 msgstr "این فرم با ریکپچا امن شده است"
 
-#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:285
-#: core/templates/navigation.html:297 core/templates/template.html:149
-#: core/templates/user/login.html:20 core/views/user.py:298
+#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:284
+#: core/templates/navigation.html:296 core/templates/template.html:151
+#: core/templates/user/login.html:20 core/views/user.py:297
 #: software/templates/features.html:87 software/templates/features.html:422
 msgid "Register"
 msgstr "ثبت"
@@ -448,18 +447,18 @@ msgid "The sum of all hours has to be 24"
 msgstr "مجموع تمام ساعت ها باید 24 باشد"
 
 #: core/models/rep_unit.py:36 core/models/weight_unit.py:36
-#: core/templates/user/overview.html:262 core/views/user.py:599
+#: core/templates/user/overview.html:280 core/views/user.py:598
 #: exercises/models/category.py:29 exercises/models/equipment.py:29
 #: exercises/models/exercise.py:59 exercises/models/muscle.py:36
 #: gym/models/contract.py:52 gym/models/contract.py:103 gym/models/gym.py:46
 #: gym/models/user_document.py:84 gym/templates/contract/view.html:50
-#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:96
+#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:108
 #: gym/views/gym.py:158 manager/models/schedule.py:55
 #: manager/models/workout.py:57 measurements/models/category.py:36
 #: nutrition/models/ingredient.py:111
-#: nutrition/models/ingredient_category.py:27 nutrition/models/meal.py:67
+#: nutrition/models/ingredient_category.py:27 nutrition/models/meal.py:65
 #: nutrition/models/weight_unit.py:38
-#: nutrition/templates/ingredient/view.html:152
+#: nutrition/templates/ingredient/view.html:151
 msgid "Name"
 msgstr "نام"
 
@@ -507,7 +506,7 @@ msgstr ""
 msgid "Back to \"%(target)s\""
 msgstr "بازگشت به \"%(target)s\""
 
-#: core/templates/delete.html:15
+#: core/templates/delete.html:4
 msgid "Are you sure you want to delete this? This action cannot be undone."
 msgstr ""
 "آیا مطمئن هستید که میخواهید این کار را انجام دهید؟ بعد پاک کردن قابل برگشت "
@@ -565,7 +564,7 @@ msgstr ""
 msgid "Dashboard"
 msgstr "داشبورد"
 
-#: core/templates/language/overview.html:4 core/templates/navigation.html:345
+#: core/templates/language/overview.html:4 core/templates/navigation.html:344
 msgid "Languages"
 msgstr "زبان ها"
 
@@ -575,82 +574,72 @@ msgstr "چیزی یافت نشد!"
 
 #: core/templates/language/overview.html:22
 #: manager/templates/calendar/month.html:132
-#: manager/templates/schedule/overview.html:28
-#: manager/templates/schedule/view.html:144
+#: manager/templates/schedule/view.html:154
 #: manager/templates/workout/overview.html:28
 #: nutrition/templates/ingredient/overview.html:38
 msgid "Add one now."
 msgstr "اضافه کن"
 
-#: core/templates/language/overview.html:35 core/templates/license/list.html:40
-#: core/templates/misc/license/list.html:43
-#: core/templates/repetition_unit/list.html:43
-#: core/templates/user/overview.html:326 core/templates/user/overview.html:365
-#: core/templates/user/overview.html:401
-#: core/templates/weight_unit/list.html:43 core/views/languages.py:74
+#: core/templates/language/overview.html:34 core/templates/license/list.html:43
+#: core/templates/repetition_unit/list.html:46
+#: core/templates/user/overview.html:344 core/templates/user/overview.html:384
+#: core/templates/user/overview.html:422
+#: core/templates/weight_unit/list.html:46 core/views/languages.py:74
 #: core/views/license.py:66 core/views/repetition_units.py:66
 #: core/views/weight_units.py:66
-#: exercises/templates/categories/admin-overview.html:38
-#: gallery/views/images.py:63 gym/templates/admin_notes/list.html:67
-#: gym/templates/contract/list.html:73
-#: gym/templates/contract_option/list.html:72
-#: gym/templates/contract_type/list.html:72 gym/templates/document/list.html:79
-#: gym/templates/gym/member_list.html:211
-#: gym/templates/gym/member_list.html:244
-#: gym/templates/gym/member_list.html:281
+#: exercises/templates/categories/admin-overview.html:40
+#: exercises/templates/equipment/admin-overview.html:39
+#: exercises/templates/muscles/admin-overview.html:40
+#: gallery/views/images.py:63 gym/templates/admin_notes/list.html:64
+#: gym/templates/contract/list.html:69
+#: gym/templates/contract_option/list.html:65
+#: gym/templates/contract_type/list.html:66 gym/templates/document/list.html:78
+#: gym/templates/gym/member_list.html:228
+#: gym/templates/gym/member_list.html:264
+#: gym/templates/gym/member_list.html:303
 #: mailer/templates/mailer/gym/overview.html:43
+#: nutrition/templates/ingredient/overview.html:60
 msgid "Add"
 msgstr "اضافه کردن"
 
 #: core/templates/language/view.html:61 core/templates/user/api_key.html:44
-#: core/templates/user/preferences.html:45 gym/models/contract.py:203
-#: gym/templates/contract/view.html:41 gym/templates/contract/view.html:106
-#: gym/templates/gym/member_list.html:248
-#: manager/templates/schedule/view.html:285
-#: manager/templates/workout/view.html:163
-#: nutrition/templates/ingredient/view.html:202
+#: core/templates/user/preferences.html:50 gym/models/contract.py:203
+#: gym/templates/contract/view.html:41 gym/templates/gym/member_list.html:270
+#: manager/templates/schedule/view.html:304
+#: manager/templates/workout/view.html:177
+#: nutrition/templates/ingredient/view.html:206
 msgid "Options"
 msgstr "امکانات"
 
-#: core/templates/license/list.html:4 core/templates/misc/license/list.html:4
+#: core/templates/license/list.html:4
 msgid "License list"
 msgstr "لیست مجوز ها"
 
-#: core/templates/license/list.html:26 core/templates/misc/license/list.html:30
-#: core/templates/repetition_unit/list.html:28
+#: core/templates/license/list.html:30
+#: core/templates/repetition_unit/list.html:32
 #: core/templates/user/overview.html:104 core/templates/user/overview.html:136
-#: core/templates/user/overview.html:185 core/templates/user/overview.html:347
-#: core/templates/user/overview.html:383 core/templates/user/overview.html:427
-#: core/templates/weight_unit/list.html:28
-#: exercises/templates/categories/admin-overview.html:26
-#: exercises/templates/equipment/admin-overview.html:26
-#: exercises/templates/muscles/admin-overview.html:26
-#: gym/templates/admin_notes/list.html:52 gym/templates/contract/list.html:60
-#: gym/templates/contract_option/list.html:58
-#: gym/templates/contract_type/list.html:58 gym/templates/document/list.html:64
-#: gym/templates/gym/list.html:29 gym/templates/gym/member_list.html:229
-#: gym/templates/gym/member_list.html:262
-#: gym/templates/gym/member_list.html:299
+#: core/templates/user/overview.html:185 core/templates/user/overview.html:365
+#: core/templates/user/overview.html:404 core/templates/user/overview.html:448
+#: core/templates/weight_unit/list.html:32
+#: exercises/templates/categories/admin-overview.html:30
+#: exercises/templates/equipment/admin-overview.html:30
+#: exercises/templates/muscles/admin-overview.html:29
+#: gym/templates/admin_notes/list.html:50 gym/templates/contract/list.html:57
+#: gym/templates/contract_option/list.html:52
+#: gym/templates/contract_type/list.html:53 gym/templates/document/list.html:64
+#: gym/templates/gym/list.html:32 gym/templates/gym/member_list.html:248
+#: gym/templates/gym/member_list.html:284
+#: gym/templates/gym/member_list.html:321
 #: mailer/templates/mailer/gym/overview.html:30
-#: manager/templates/calendar/day.html:87
-#: nutrition/templates/units/list.html:29
+#: manager/templates/calendar/day.html:88
+#: nutrition/templates/units/list.html:34
 msgid "Nothing found"
 msgstr "چیزی یافت نشد"
 
-#: core/templates/misc/about.html:4 core/templates/template.html:175
+#: core/templates/misc/about.html:4 core/templates/template.html:188
 msgid "Imprint"
 msgstr ""
 
-#: core/templates/misc/license/list.html:47
-#, fuzzy
-msgid ""
-"If a license has been localized, e.g. the Creative Commons\n"
-"            licenses for the different countries, add them as separate "
-"entries here."
-msgstr ""
-"اگریک مجوز محلی شده باشد , به عنوان مثال مجوزهای عوام خلاق برای کشورهای "
-"مختلف ,ان ها را در اینجا به عنوان ورودی ها جدا اضافه کنید"
-
 #: core/templates/navigation.html:28 software/templates/features.html:437
 msgid "Training"
 msgstr ""
@@ -697,8 +686,8 @@ msgstr ""
 msgid "Exercises"
 msgstr "تمرینات"
 
-#: core/templates/navigation.html:111 core/templates/navigation.html:184
-#: core/templates/navigation.html:340
+#: core/templates/navigation.html:111 core/templates/navigation.html:185
+#: core/templates/navigation.html:339
 msgid "Administration"
 msgstr ""
 
@@ -737,87 +726,87 @@ msgstr ""
 msgid "Daily calories calculator"
 msgstr ""
 
-#: core/templates/navigation.html:179
+#: core/templates/navigation.html:180
 #: nutrition/templates/ingredient/overview.html:10
 msgid "Ingredient overview"
 msgstr ""
 
-#: core/templates/navigation.html:187 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:189 nutrition/templates/units/list.html:6
 msgid "Ingredient weight units"
 msgstr ""
 
-#: core/templates/navigation.html:203 software/templates/features.html:442
+#: core/templates/navigation.html:205 software/templates/features.html:442
 msgid "Body weight"
 msgstr ""
 
-#: core/templates/navigation.html:210 core/templates/user/overview.html:114
+#: core/templates/navigation.html:212 core/templates/user/overview.html:114
 msgid "Weight overview"
 msgstr "بازنگری وزن "
 
-#: core/templates/navigation.html:217 weight/views.py:65
+#: core/templates/navigation.html:216 weight/views.py:65
 msgid "Add weight entry"
 msgstr "وزن را وارد کنید"
 
-#: core/templates/navigation.html:231
+#: core/templates/navigation.html:230
 msgid "About this software"
 msgstr ""
 
-#: core/templates/navigation.html:237 software/templates/about_us.html:5
+#: core/templates/navigation.html:236 software/templates/about_us.html:5
 msgid "About us"
 msgstr "درباره ما"
 
-#: core/templates/navigation.html:243 software/templates/features.html:507
+#: core/templates/navigation.html:242 software/templates/features.html:507
 msgid "REST API"
 msgstr ""
 
-#: core/templates/navigation.html:249 utils/models.py:45
+#: core/templates/navigation.html:248 utils/models.py:45
 msgid "License"
 msgstr ""
 
-#: core/templates/navigation.html:255
+#: core/templates/navigation.html:254
 msgid "Developer documentation"
 msgstr ""
 
-#: core/templates/navigation.html:262
+#: core/templates/navigation.html:261
 msgid "Get the code"
 msgstr ""
 
-#: core/templates/navigation.html:269 core/templates/template.html:214
+#: core/templates/navigation.html:268 core/templates/template.html:227
 #: software/templates/features.html:582
 msgid "Translate"
 msgstr ""
 
-#: core/templates/navigation.html:303 core/templates/user/login.html:28
+#: core/templates/navigation.html:302 core/templates/user/login.html:28
 msgid "Reset password"
 msgstr ""
 
-#: core/templates/navigation.html:321
+#: core/templates/navigation.html:320
 msgid "My preferences"
 msgstr ""
 
-#: core/templates/navigation.html:330
+#: core/templates/navigation.html:329
 msgid "Logout"
 msgstr ""
 
-#: core/templates/navigation.html:353
+#: core/templates/navigation.html:352
 msgid "Licenses"
 msgstr ""
 
-#: core/templates/navigation.html:361
+#: core/templates/navigation.html:360
 #: core/templates/repetition_unit/list.html:4
 msgid "Repetition units"
 msgstr ""
 
-#: core/templates/navigation.html:369 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:368 core/templates/weight_unit/list.html:4
 #: nutrition/templates/ingredient/view.html:141
 msgid "Weight units"
 msgstr ""
 
-#: core/templates/navigation.html:377 core/templates/user/list.html:4
+#: core/templates/navigation.html:376 core/templates/user/list.html:4
 msgid "User list"
 msgstr ""
 
-#: core/templates/navigation.html:383
+#: core/templates/navigation.html:382
 msgid "Gyms"
 msgstr ""
 
@@ -878,55 +867,28 @@ msgstr ""
 msgid "next"
 msgstr ""
 
-#: core/templates/tags/render_day.html:34
-msgid "Add weight log"
+#: core/templates/tags/render_day.html:44
+msgid "Placeholder image for translation"
 msgstr ""
 
-#: core/templates/tags/render_day.html:116
-msgid "Placeholder image for exercise"
-msgstr ""
-
-#: core/templates/tags/render_day.html:133
-msgid "This exercise has no repetitions."
-msgstr ""
-
-#: core/templates/tags/render_day.html:136
-msgid "Edit them now."
-msgstr ""
-
-#: core/templates/tags/render_day.html:162
-msgid "Add exercises to this workout day"
-msgstr ""
-
-#: core/templates/tags/render_weight_log.html:17 manager/helpers.py:86
-#: manager/models/setting.py:72 manager/templates/set/formset.html:9
-msgid "Reps"
-msgstr ""
-
-#: core/templates/tags/render_weight_log.html:30 manager/forms.py:191
-#: manager/models/log.py:103 manager/models/setting.py:102
-#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
-msgid "RiR"
-msgstr ""
-
-#: core/templates/template.html:122 manager/templates/calendar/month.html:138
-#: manager/templates/schedule/view.html:248
-#: manager/templates/schedule/view.html:269
-#: manager/templates/workout/view.html:84
-#: manager/templates/workout/view.html:137
+#: core/templates/template.html:124 manager/templates/calendar/month.html:138
+#: manager/templates/schedule/view.html:262
+#: manager/templates/schedule/view.html:287
+#: manager/templates/workout/view.html:89
+#: manager/templates/workout/view.html:149
 msgid "Close"
 msgstr "بستن"
 
-#: core/templates/template.html:138
+#: core/templates/template.html:140
 msgid ""
 "You are using a guest account, data entered will be deleted after a week."
 msgstr ""
 
-#: core/templates/template.html:143
+#: core/templates/template.html:145
 msgid "Create some demo entries"
 msgstr "چند نمونه پر کنید"
 
-#: core/templates/template.html:180 software/templates/features.html:547
+#: core/templates/template.html:193 software/templates/features.html:547
 #: software/templates/tos.html:7
 msgid "Terms of service"
 msgstr ""
@@ -935,7 +897,7 @@ msgstr ""
 msgid "Features"
 msgstr "امکانات"
 
-#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:54
+#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:59
 msgid "API key"
 msgstr ""
 
@@ -974,17 +936,17 @@ msgstr ""
 msgid "Documentation"
 msgstr ""
 
-#: core/templates/user/delete_account.html:4
-#: core/templates/user/preferences.html:59
+#: core/templates/user/delete_account.html:3
+#: core/templates/user/preferences.html:62
 msgid "Delete account"
 msgstr ""
 
-#: core/templates/user/delete_account.html:17
+#: core/templates/user/delete_account.html:9
 #: exercises/templates/history/overview.html:93
 msgid "Are you sure?"
 msgstr ""
 
-#: core/templates/user/delete_account.html:22
+#: core/templates/user/delete_account.html:14
 #, python-format
 msgid ""
 "This action will delete the user account \"%(username)s\".\n"
@@ -1003,22 +965,22 @@ msgstr ""
 
 #: core/templates/user/overview.html:25 core/templates/user/overview.html:68
 #: core/templates/user/overview.html:112 core/templates/user/overview.html:144
-#: core/templates/user/overview.html:330 core/templates/user/overview.html:369
-#: core/templates/user/overview.html:405
+#: core/templates/user/overview.html:348 core/templates/user/overview.html:390
+#: core/templates/user/overview.html:426
 #, python-format
 msgid "last %(number)s"
 msgstr ""
 
 #: core/templates/user/overview.html:27 core/templates/user/overview.html:146
-#: core/templates/user/overview.html:325 core/templates/user/overview.html:364
-#: core/templates/user/overview.html:400 gym/templates/gym/member_list.html:210
-#: gym/templates/gym/member_list.html:243
-#: gym/templates/gym/member_list.html:280
+#: core/templates/user/overview.html:343 core/templates/user/overview.html:382
+#: core/templates/user/overview.html:421 gym/templates/gym/member_list.html:226
+#: gym/templates/gym/member_list.html:262
+#: gym/templates/gym/member_list.html:302
 msgid "Overview"
 msgstr "بازنگری"
 
 #: core/templates/user/overview.html:28
-#: manager/templates/schedule/view.html:163
+#: manager/templates/schedule/view.html:172
 #: manager/templates/workout/overview.html:39 manager/views/schedule_step.py:60
 msgid "Add workout"
 msgstr ""
@@ -1050,38 +1012,36 @@ msgstr ""
 msgid "Number of logs (days)"
 msgstr ""
 
-#: core/templates/user/overview.html:37 core/views/user.py:600
+#: core/templates/user/overview.html:37 core/views/user.py:599
 #: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:158
 msgid "Last activity"
 msgstr ""
 
 #: core/templates/user/overview.html:58
 #: manager/templates/calendar/month.html:128
-#: manager/templates/schedule/view.html:144
 #: manager/templates/workout/overview.html:28
 msgid "No workouts found."
 msgstr "تمرین یافت نشد"
 
 #: core/templates/user/overview.html:68 manager/forms.py:280
-#: manager/templates/workout/view.html:106
+#: manager/templates/workout/view.html:114
 msgid "Log"
 msgstr ""
 
 #: core/templates/user/overview.html:77 manager/models/session.py:83
-#: manager/templates/calendar/partial_overview_table.html:52
+#: manager/templates/calendar/partial_overview_table.html:54
 msgid "General impression"
 msgstr ""
 
-#: core/templates/user/overview.html:78 core/templates/user/overview.html:369
+#: core/templates/user/overview.html:78 core/templates/user/overview.html:390
 #: manager/models/session.py:73
-#: manager/templates/calendar/partial_overview_table.html:56
-#: manager/templates/workout/log.html:89
+#: manager/templates/calendar/partial_overview_table.html:58
 msgid "Notes"
 msgstr ""
 
 #: core/templates/user/overview.html:79
 #: exercises/templates/history/overview.html:30
-#: manager/templates/calendar/partial_overview_table.html:42
+#: manager/templates/calendar/partial_overview_table.html:44
 msgid "Time"
 msgstr ""
 
@@ -1119,121 +1079,121 @@ msgstr "چربی"
 msgid "kcal"
 msgstr "کیلو کالری"
 
-#: core/templates/user/overview.html:201 core/templates/user/overview.html:322
-#: core/templates/user/overview.html:361 core/templates/user/overview.html:397
-#: core/templates/user/overview.html:442 gym/templates/gym/list.html:42
-#: gym/templates/gym/member_list.html:84 gym/templates/gym/member_list.html:137
-#: gym/templates/gym/member_list.html:173
-#: gym/templates/gym/member_list.html:207
-#: gym/templates/gym/member_list.html:240
-#: gym/templates/gym/member_list.html:277
-#: manager/templates/schedule/view.html:100
+#: core/templates/user/overview.html:201 core/templates/user/overview.html:340
+#: core/templates/user/overview.html:379 core/templates/user/overview.html:418
+#: core/templates/user/overview.html:463 gym/templates/gym/list.html:45
+#: gym/templates/gym/member_list.html:91 gym/templates/gym/member_list.html:149
+#: gym/templates/gym/member_list.html:187
+#: gym/templates/gym/member_list.html:223
+#: gym/templates/gym/member_list.html:259
+#: gym/templates/gym/member_list.html:299
+#: manager/templates/schedule/view.html:99
 msgid "Actions"
 msgstr ""
 
-#: core/templates/user/overview.html:207
+#: core/templates/user/overview.html:210
 msgid "Deactivate user"
 msgstr ""
 
-#: core/templates/user/overview.html:209
+#: core/templates/user/overview.html:214
 msgid "Activate user"
 msgstr ""
 
-#: core/templates/user/overview.html:211
+#: core/templates/user/overview.html:223
 msgid "Reset user password"
 msgstr ""
 
-#: core/templates/user/overview.html:214 gym/templates/gym/member_list.html:30
+#: core/templates/user/overview.html:227 gym/templates/gym/member_list.html:30
 msgid "Roles"
 msgstr ""
 
-#: core/templates/user/overview.html:225
+#: core/templates/user/overview.html:243
 msgid "Password reset confirmation"
 msgstr ""
 
-#: core/templates/user/overview.html:229
+#: core/templates/user/overview.html:247
 msgid "Do you really want to change this user&#39;s password?"
 msgstr ""
 
-#: core/templates/user/overview.html:232
+#: core/templates/user/overview.html:250
 #: exercises/templates/history/overview.html:106
 msgid "No"
 msgstr ""
 
-#: core/templates/user/overview.html:233
+#: core/templates/user/overview.html:251
 #: exercises/templates/history/overview.html:99
 msgid "Yes"
 msgstr ""
 
-#: core/templates/user/overview.html:254 gym/templates/gym/member_list.html:93
+#: core/templates/user/overview.html:272 gym/templates/gym/member_list.html:105
 msgid "Details"
 msgstr ""
 
-#: core/templates/user/overview.html:258 gym/views/export.py:57
-#: manager/helpers.py:86 manager/templates/schedule/view.html:98
+#: core/templates/user/overview.html:276 gym/views/export.py:57
+#: manager/helpers.py:86 manager/templates/schedule/view.html:97
 msgid "Nr."
 msgstr ""
 
-#: core/templates/user/overview.html:280 gym/models/contract.py:287
+#: core/templates/user/overview.html:298 gym/models/contract.py:287
 #: gym/models/gym.py:50 gym/templates/contract/view.html:75
-#: gym/templates/gym/member_list.html:100 gym/views/export.py:68
+#: gym/templates/gym/member_list.html:112 gym/views/export.py:68
 msgid "Phone"
 msgstr ""
 
-#: core/templates/user/overview.html:284 gym/templates/contract/view.html:87
-#: gym/templates/gym/member_list.html:118
+#: core/templates/user/overview.html:302 gym/templates/contract/view.html:87
+#: gym/templates/gym/member_list.html:130
 msgid "Address"
 msgstr ""
 
-#: core/templates/user/overview.html:295
+#: core/templates/user/overview.html:313
 msgid "Registered"
 msgstr ""
 
-#: core/templates/user/overview.html:299
+#: core/templates/user/overview.html:317
 msgid "Last login"
 msgstr ""
 
-#: core/templates/user/overview.html:304
+#: core/templates/user/overview.html:322
 msgid "Status"
 msgstr ""
 
-#: core/templates/user/overview.html:307
+#: core/templates/user/overview.html:325
 msgid "Active"
 msgstr ""
 
-#: core/templates/user/overview.html:309
+#: core/templates/user/overview.html:327
 msgid "Inactive"
 msgstr ""
 
-#: core/templates/user/overview.html:330 gym/templates/contract/list.html:4
-#: gym/templates/gym/member_list.html:202
+#: core/templates/user/overview.html:348 gym/templates/contract/list.html:4
+#: gym/templates/gym/member_list.html:218
 msgid "Contracts"
 msgstr ""
 
-#: core/templates/user/overview.html:405 gym/templates/document/list.html:4
+#: core/templates/user/overview.html:426 gym/templates/document/list.html:4
 msgid "Documents"
 msgstr ""
 
-#: core/templates/user/overview.html:412 gym/templates/document/list.html:32
-#: manager/forms.py:292 manager/templates/workout/view.html:132
+#: core/templates/user/overview.html:433 gym/templates/document/list.html:33
+#: manager/forms.py:292 manager/templates/workout/view.html:143
 msgid "Download"
 msgstr ""
 
-#: core/templates/user/overview.html:450 gym/views/admin_config.py:44
+#: core/templates/user/overview.html:474 gym/views/admin_config.py:44
 #: gym/views/admin_config.py:58 gym/views/user_config.py:46
 msgid "Configuration"
 msgstr "تنظیمات"
 
-#: core/templates/user/overview.html:453 gym/models/user_config.py:92
+#: core/templates/user/overview.html:477 gym/models/user_config.py:92
 msgid "Include in inactive overview"
 msgstr ""
 
-#: core/templates/user/overview.html:486
+#: core/templates/user/overview.html:510
 #, python-format
 msgid "Admin login is only available for users in %(gym_name)s"
 msgstr ""
 
-#: core/templates/user/overview.html:490
+#: core/templates/user/overview.html:514
 msgid "Log in as this user"
 msgstr ""
 
@@ -1253,19 +1213,19 @@ msgstr ""
 msgid "Send verification email"
 msgstr ""
 
-#: core/templates/user/preferences.html:30
+#: core/templates/user/preferences.html:31
 msgid "You need to verify your email to contribute exercises"
 msgstr ""
 
-#: core/templates/user/preferences.html:50 core/views/user.py:611
+#: core/templates/user/preferences.html:55 core/views/user.py:610
 msgid "Change password"
 msgstr ""
 
-#: core/templatetags/wger_extras.py:205 i18n.tpl:37
+#: core/templatetags/wger_extras.py:197 i18n.tpl:37
 msgid "kg"
 msgstr ""
 
-#: core/templatetags/wger_extras.py:207
+#: core/templatetags/wger_extras.py:199
 #: nutrition/templates/ingredient/view.html:60
 #: nutrition/templates/ingredient/view.html:66
 #: nutrition/templates/ingredient/view.html:73
@@ -1277,11 +1237,11 @@ msgctxt "weight unit, i.e. grams"
 msgid "g"
 msgstr ""
 
-#: core/templatetags/wger_extras.py:210 i18n.tpl:38
+#: core/templatetags/wger_extras.py:202 i18n.tpl:38
 msgid "lb"
 msgstr ""
 
-#: core/templatetags/wger_extras.py:212
+#: core/templatetags/wger_extras.py:204
 msgctxt "weight unit, i.e. ounces"
 msgid "oz"
 msgstr ""
@@ -1308,13 +1268,13 @@ msgid "Delete {0}?"
 msgstr ""
 
 #: core/views/languages.py:111 core/views/license.py:85
-#: core/views/repetition_units.py:86 core/views/user.py:474
+#: core/views/repetition_units.py:86 core/views/user.py:473
 #: core/views/weight_units.py:86 exercises/views/categories.py:98
 #: exercises/views/equipment.py:81 exercises/views/muscles.py:87
 #: gym/views/admin_notes.py:161 gym/views/config.py:68
 #: gym/views/contract.py:186 gym/views/contract_option.py:123
 #: gym/views/contract_type.py:123 gym/views/document.py:171
-#: gym/views/gym.py:463 manager/views/day.py:100 manager/views/schedule.py:333
+#: gym/views/gym.py:463 manager/views/day.py:96 manager/views/schedule.py:333
 #: manager/views/workout.py:267 nutrition/views/ingredient.py:145
 #: nutrition/views/unit.py:143
 #, python-brace-format
@@ -1340,48 +1300,48 @@ msgstr ""
 msgid "Your feedback was successfully sent. Thank you!"
 msgstr ""
 
-#: core/views/user.py:156
+#: core/views/user.py:155
 #, python-brace-format
 msgid "Account \"{0}\" was successfully deleted"
 msgstr ""
 
-#: core/views/user.py:292
+#: core/views/user.py:291
 msgid "You were successfully registered"
 msgstr ""
 
-#: core/views/user.py:351
+#: core/views/user.py:350
 msgid "Settings successfully updated"
 msgstr ""
 
-#: core/views/user.py:390
+#: core/views/user.py:389
 msgid "The user was successfully deactivated"
 msgstr ""
 
-#: core/views/user.py:427
+#: core/views/user.py:426
 msgid "The user was successfully activated"
 msgstr ""
 
-#: core/views/user.py:442
+#: core/views/user.py:441
 msgid "Edit user"
 msgstr ""
 
-#: core/views/user.py:597 gym/templates/gym/member_list.html:26
+#: core/views/user.py:596 gym/templates/gym/member_list.html:26
 #: gym/views/gym.py:158
 msgid "ID"
 msgstr ""
 
-#: core/views/user.py:598 gym/forms.py:95 gym/templates/contract/view.html:55
+#: core/views/user.py:597 gym/forms.py:95 gym/templates/contract/view.html:55
 #: gym/templates/gym/member_list.html:27 gym/views/export.py:59
 #: gym/views/gym.py:158 gym/views/gym.py:217
 msgid "Username"
 msgstr ""
 
-#: core/views/user.py:601 gym/templates/gym/new_user.html:34
+#: core/views/user.py:600 gym/templates/gym/new_user.html:34
 #: gym/views/export.py:58 gym/views/gym.py:217
 msgid "Gym"
 msgstr ""
 
-#: core/views/user.py:660
+#: core/views/user.py:659
 #, python-format
 msgid "A verification email was sent to %(email)s"
 msgstr ""
@@ -1535,11 +1495,6 @@ msgstr ""
 msgid "Equipment list"
 msgstr ""
 
-#: exercises/templates/equipment/admin-overview.html:39
-#: exercises/views/equipment.py:92
-msgid "Add new equipment"
-msgstr ""
-
 #: exercises/templates/history/overview.html:11
 msgid "Exercise admin history"
 msgstr ""
@@ -1589,11 +1544,6 @@ msgstr ""
 msgid "Muscle overview"
 msgstr "بررسی عضله"
 
-#: exercises/templates/muscles/admin-overview.html:38
-#: exercises/views/muscles.py:68
-msgid "Add muscle"
-msgstr ""
-
 #: exercises/views/categories.py:72
 msgid "Add category"
 msgstr ""
@@ -1602,6 +1552,10 @@ msgstr ""
 msgid "This will also delete all exercises in this category."
 msgstr ""
 
+#: exercises/views/equipment.py:92
+msgid "Add new equipment"
+msgstr ""
+
 #: exercises/views/equipment.py:104 exercises/views/equipment.py:115
 msgid "Delete equipment?"
 msgstr ""
@@ -1610,6 +1564,10 @@ msgstr ""
 msgid "This will delete the exercise from all workouts."
 msgstr ""
 
+#: exercises/views/muscles.py:68
+msgid "Add muscle"
+msgstr ""
+
 #: gallery/templates/images/overview.html:62
 msgid "Add image"
 msgstr ""
@@ -1695,7 +1653,7 @@ msgid "Contract is active"
 msgstr ""
 
 #: gym/models/contract.py:237 gym/templates/contract/view.html:69
-#: manager/models/schedule.py:61 manager/templates/schedule/view.html:67
+#: manager/models/schedule.py:61 manager/templates/schedule/view.html:66
 msgid "Start date"
 msgstr ""
 
@@ -1731,7 +1689,7 @@ msgstr ""
 msgid "Admin: can administrate the different gyms"
 msgstr ""
 
-#: gym/models/gym.py:65 gym/templates/gym/member_list.html:114
+#: gym/models/gym.py:65 gym/templates/gym/member_list.html:126
 msgid "Owner"
 msgstr ""
 
@@ -1741,7 +1699,7 @@ msgid ""
 "considered inactive"
 msgstr ""
 
-#: gym/models/gym_config.py:56 gym/templates/gym/member_list.html:152
+#: gym/models/gym_config.py:56 gym/templates/gym/member_list.html:166
 msgid "Show name in header"
 msgstr ""
 
@@ -1754,7 +1712,7 @@ msgstr ""
 msgid "Configuration for {self.gym.name}"
 msgstr ""
 
-#: gym/models/user_config.py:65 gym/templates/gym/member_list.html:184
+#: gym/models/user_config.py:65 gym/templates/gym/member_list.html:200
 msgid "Overview of inactive members"
 msgstr ""
 
@@ -1778,7 +1736,7 @@ msgstr ""
 msgid "User notes"
 msgstr ""
 
-#: gym/templates/contract/list.html:36
+#: gym/templates/contract/list.html:34
 msgid "Show"
 msgstr "نمایش"
 
@@ -1804,11 +1762,11 @@ msgstr ""
 msgid "Gym list"
 msgstr ""
 
-#: gym/templates/gym/list.html:50
+#: gym/templates/gym/list.html:53
 msgid "Global gym configuration"
 msgstr ""
 
-#: gym/templates/gym/list.html:67 gym/views/gym.py:171
+#: gym/templates/gym/list.html:69 gym/views/gym.py:171
 msgid "Add new gym"
 msgstr ""
 
@@ -1820,43 +1778,43 @@ msgstr ""
 msgid "Gym manager"
 msgstr ""
 
-#: gym/templates/gym/member_list.html:69
+#: gym/templates/gym/member_list.html:76
 msgid "This gym has no administrators or trainers"
 msgstr ""
 
-#: gym/templates/gym/member_list.html:88
+#: gym/templates/gym/member_list.html:98
 msgid "Export"
 msgstr ""
 
-#: gym/templates/gym/member_list.html:125
+#: gym/templates/gym/member_list.html:137
 msgid "Members"
 msgstr ""
 
-#: gym/templates/gym/member_list.html:145
+#: gym/templates/gym/member_list.html:159
 msgid "Gym configuration"
 msgstr ""
 
-#: gym/templates/gym/member_list.html:148
+#: gym/templates/gym/member_list.html:162
 msgid "Inactive members"
 msgstr ""
 
-#: gym/templates/gym/member_list.html:149
+#: gym/templates/gym/member_list.html:163
 msgid "weeks"
 msgstr ""
 
-#: gym/templates/gym/member_list.html:181
+#: gym/templates/gym/member_list.html:197
 msgid "My configuration"
 msgstr ""
 
-#: gym/templates/gym/member_list.html:215
+#: gym/templates/gym/member_list.html:234
 msgid "Types"
 msgstr ""
 
-#: gym/templates/gym/member_list.html:285
+#: gym/templates/gym/member_list.html:307
 msgid "Emails"
 msgstr ""
 
-#: gym/templates/gym/member_list.html:315
+#: gym/templates/gym/member_list.html:336
 msgid "Add member"
 msgstr ""
 
@@ -2151,28 +2109,38 @@ msgstr "همچنین عناصر مورد نیاز را به انگلیسی نم
 msgid "Unit"
 msgstr ""
 
+#: manager/forms.py:191 manager/models/log.py:103 manager/models/setting.py:102
+#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
+msgid "RiR"
+msgstr ""
+
 #: manager/forms.py:279
 msgid "Type"
 msgstr ""
 
-#: manager/forms.py:280 manager/templates/workout/view.html:113
+#: manager/forms.py:280 manager/templates/workout/view.html:122
 msgid "Table"
 msgstr ""
 
-#: manager/forms.py:282 manager/templates/workout/view.html:119
+#: manager/forms.py:282 manager/templates/workout/view.html:129
 msgid "with images"
 msgstr ""
 
-#: manager/forms.py:283 manager/templates/workout/view.html:125
+#: manager/forms.py:283 manager/templates/workout/view.html:136
 msgid "with comments"
 msgstr ""
 
+#: manager/helpers.py:86 manager/models/setting.py:72
+#: manager/templates/set/formset.html:9
+msgid "Reps"
+msgstr ""
+
 #: manager/management/commands/email-reminders.py:121
 msgid "Workout will expire soon"
 msgstr ""
 
 #: manager/models/day.py:34 manager/models/log.py:58
-#: manager/models/session.py:60 manager/templates/schedule/view.html:102
+#: manager/models/session.py:60 manager/templates/schedule/view.html:101
 #: manager/templates/workout/view.html:9 manager/templates/workout/view.html:17
 #: manager/views/pdf.py:85 manager/views/pdf.py:161
 #: manager/views/schedule.py:151 manager/views/schedule.py:221
@@ -2193,7 +2161,7 @@ msgstr ""
 msgid "Name or short description of the schedule. For example 'Program XYZ'."
 msgstr ""
 
-#: manager/models/schedule.py:65 manager/templates/schedule/view.html:71
+#: manager/models/schedule.py:65 manager/templates/schedule/view.html:70
 msgid "Schedule active"
 msgstr ""
 
@@ -2204,7 +2172,7 @@ msgid ""
 "inactive"
 msgstr ""
 
-#: manager/models/schedule.py:77 manager/templates/schedule/view.html:81
+#: manager/models/schedule.py:77 manager/templates/schedule/view.html:80
 msgid "Is a loop"
 msgstr ""
 
@@ -2223,7 +2191,7 @@ msgid "The duration in weeks"
 msgstr ""
 
 #: manager/models/schedule_step.py:64 manager/models/set.py:53
-#: manager/models/setting.py:113 nutrition/models/meal.py:55
+#: manager/models/setting.py:113 nutrition/models/meal.py:53
 #: nutrition/models/meal_item.py:66
 msgid "Order"
 msgstr ""
@@ -2357,7 +2325,7 @@ msgstr ""
 msgid "Workout session"
 msgstr ""
 
-#: manager/templates/calendar/partial_overview_table.html:27
+#: manager/templates/calendar/partial_overview_table.html:26
 msgid "Delete with logs"
 msgstr ""
 
@@ -2377,21 +2345,27 @@ msgid ""
 "will simply be edited. Weight entries are always added."
 msgstr ""
 
-#: manager/templates/schedule/overview.html:5
+#: manager/templates/schedule/overview.html:4
 msgid "Your schedules"
 msgstr ""
 
 #: manager/templates/schedule/overview.html:19
-#: manager/templates/schedule/view.html:131
-#: manager/templates/schedule/view.html:183
+#: manager/templates/schedule/view.html:143
+#: manager/templates/schedule/view.html:193
 #: manager/templates/workout/overview.html:16
 msgid "active"
 msgstr ""
 
-#: manager/templates/schedule/overview.html:28
+#: manager/templates/schedule/overview.html:27
 msgid "No schedules found."
 msgstr ""
 
+#: manager/templates/schedule/overview.html:28
+#, fuzzy
+#| msgid "Add one now."
+msgid "Add one now"
+msgstr "اضافه کن"
+
 #: manager/templates/schedule/overview.html:36
 msgid ""
 "Schedules are collections of workouts that you do in\n"
@@ -2404,10 +2378,11 @@ msgid ""
 "        before jumping to the next. It is also possible to create a loop, so "
 "you\n"
 "        always do the same workouts in succession, e.g. A > B > C > A > B > "
-"C and so on."
+"C and so\n"
+"        on."
 msgstr ""
 
-#: manager/templates/schedule/overview.html:43
+#: manager/templates/schedule/overview.html:44
 msgid ""
 "The currently active schedule will remain active (and be\n"
 "        shown e.g. in your dashboard) till it reaches the last workout or "
@@ -2423,25 +2398,25 @@ msgstr ""
 msgid "Schedule"
 msgstr ""
 
-#: manager/templates/schedule/view.html:85
+#: manager/templates/schedule/view.html:84
 msgid ""
 "This schedule is a loop and will go through the workouts above till you "
 "deactivate it"
 msgstr ""
 
-#: manager/templates/schedule/view.html:103
+#: manager/templates/schedule/view.html:102
 msgid "Weeks"
 msgstr ""
 
-#: manager/templates/schedule/view.html:115
+#: manager/templates/schedule/view.html:114
 msgid "Move me"
 msgstr ""
 
-#: manager/templates/schedule/view.html:156
+#: manager/templates/schedule/view.html:168
 msgid "Start schedule"
 msgstr ""
 
-#: manager/templates/schedule/view.html:187
+#: manager/templates/schedule/view.html:197
 #, python-format
 msgid ""
 "%(weeks)s Week\n"
@@ -2452,11 +2427,11 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: manager/templates/schedule/view.html:221
+#: manager/templates/schedule/view.html:231
 msgid "Adding workouts"
 msgstr ""
 
-#: manager/templates/schedule/view.html:223
+#: manager/templates/schedule/view.html:233
 msgid ""
 "Add as many workouts to the schedule as you want. You can\n"
 "            edit the order by dragging and dropping them. It's also possible "
@@ -2464,44 +2439,37 @@ msgid ""
 "            than once."
 msgstr ""
 
-#: manager/templates/schedule/view.html:232
-#: manager/templates/schedule/view.html:243
-#: manager/templates/schedule/view.html:290
+#: manager/templates/schedule/view.html:242
+#: manager/templates/schedule/view.html:256
+#: manager/templates/schedule/view.html:310
 #: manager/templates/workout/view.html:69
-#: manager/templates/workout/view.html:79
-#: manager/templates/workout/view.html:178
+#: manager/templates/workout/view.html:83
+#: manager/templates/workout/view.html:192
 msgid "Export calendar file"
 msgstr ""
 
-#: manager/templates/schedule/view.html:236
+#: manager/templates/schedule/view.html:248
 msgid "Export this schedule as a calendar file."
 msgstr ""
 
-#: manager/templates/schedule/view.html:237
-#: manager/templates/workout/view.html:74
+#: manager/templates/schedule/view.html:249
+#: manager/templates/workout/view.html:76
 msgid ""
 "You can then import the file it into your calendar\n"
 "                        application for example google calendar, outlook or "
 "iCal. This will create\n"
 "                        an appointment for each training day with the "
-"appropriate exercises."
+"appropriate\n"
+"                        exercises."
 msgstr ""
 
-#: manager/templates/schedule/view.html:258
-#: manager/templates/schedule/view.html:294
-#: manager/templates/workout/view.html:94
-#: manager/templates/workout/view.html:174
+#: manager/templates/schedule/view.html:272
+#: manager/templates/schedule/view.html:315
+#: manager/templates/workout/view.html:99
+#: manager/templates/workout/view.html:188
 msgid "Download as PDF"
 msgstr ""
 
-#: manager/templates/schedule/view.html:299
-msgid "Edit schedule"
-msgstr ""
-
-#: manager/templates/schedule/view.html:304
-msgid "Delete schedule"
-msgstr ""
-
 #: manager/templates/set/add.html:9
 #, python-format
 msgid "Add exercises to day \"%(day_name)s\""
@@ -2566,47 +2534,6 @@ msgid ""
 "You will regularly receive such reminders till you enter your current weight."
 msgstr ""
 
-#: manager/templates/workout/log.html:10 manager/templates/workout/log.html:11
-msgid "Weight log"
-msgstr ""
-
-#: manager/templates/workout/log.html:29
-msgid "Weight log for workout"
-msgstr ""
-
-#: manager/templates/workout/log.html:49
-msgid "Add weight log to this day"
-msgstr ""
-
-#: manager/templates/workout/log.html:69
-msgid "No weight entries here."
-msgstr ""
-
-#: manager/templates/workout/log.html:77
-msgid "No exercises for this day."
-msgstr ""
-
-#: manager/templates/workout/log.html:90
-msgid ""
-"This page shows the weight logs belonging to this workout\n"
-"only. Click on an exercise to see all the historical data for\n"
-"it."
-msgstr ""
-
-#: manager/templates/workout/log.html:94
-msgid ""
-"If on a single day there is more than one entry with the\n"
-"same number of repetitions, but different weights, only the entry with the\n"
-"higher weight is shown in the diagram."
-msgstr ""
-
-#: manager/templates/workout/log.html:98
-msgid ""
-"Note that only entries with a weight unit (kg or lb) and\n"
-"repetitions are charted, other combinations such as time or until failure\n"
-"are ignored here."
-msgstr ""
-
 #: manager/templates/workout/overview.html:25
 #, fuzzy
 #| msgid "No workouts found."
@@ -2648,27 +2575,23 @@ msgstr ""
 msgid "Set the repetitions for each set"
 msgstr ""
 
-#: manager/templates/workout/view.html:73
+#: manager/templates/workout/view.html:75
 msgid "Export this workout as a calendar file."
 msgstr ""
 
-#: manager/templates/workout/view.html:144
+#: manager/templates/workout/view.html:156
 msgid "Logs"
 msgstr ""
 
-#: manager/templates/workout/view.html:146
+#: manager/templates/workout/view.html:159
 msgid "View logs"
 msgstr ""
 
-#: manager/templates/workout/view.html:169 manager/views/schedule_step.py:99
-msgid "Edit workout"
-msgstr ""
-
-#: manager/templates/workout/view.html:182 manager/views/workout.py:281
+#: manager/templates/workout/view.html:195 manager/views/workout.py:281
 msgid "Mark as template"
 msgstr ""
 
-#: manager/views/day.py:109
+#: manager/views/day.py:105
 msgid "Add workout day"
 msgstr ""
 
@@ -2685,6 +2608,10 @@ msgstr ""
 msgid "Create schedule"
 msgstr ""
 
+#: manager/views/schedule_step.py:99
+msgid "Edit workout"
+msgstr ""
+
 #: manager/views/workout.py:209
 msgid "Copy workout"
 msgstr ""
@@ -2812,7 +2739,7 @@ msgstr ""
 msgid "Unit amount, e.g. \"1 Cup\" or \"1/2 spoon\""
 msgstr ""
 
-#: nutrition/models/log.py:52 nutrition/models/meal.py:50
+#: nutrition/models/log.py:52 nutrition/models/meal.py:48
 #: nutrition/models/meal_item.py:48 nutrition/models/plan.py:108
 msgid "Nutrition plan"
 msgstr "برنامه غذایی"
@@ -2825,11 +2752,11 @@ msgstr ""
 msgid "Date and Time (Approx.)"
 msgstr ""
 
-#: nutrition/models/meal.py:62
+#: nutrition/models/meal.py:60
 msgid "Time (approx)"
 msgstr ""
 
-#: nutrition/models/meal.py:69
+#: nutrition/models/meal.py:67
 msgid ""
 "Give meals a textual description / name such as \"Breakfast\" or \"after "
 "workout\""
@@ -2948,10 +2875,6 @@ msgstr ""
 msgid "Search"
 msgstr ""
 
-#: nutrition/templates/ingredient/overview.html:62
-msgid "Add ingredient"
-msgstr ""
-
 #: nutrition/templates/ingredient/view.html:45 nutrition/views/plan.py:229
 msgid "Macronutrients"
 msgstr ""
@@ -2971,20 +2894,11 @@ msgstr ""
 msgid "Others"
 msgstr ""
 
-#: nutrition/templates/ingredient/view.html:144
-#: nutrition/templates/units/list.html:46 nutrition/views/unit.py:86
+#: nutrition/templates/ingredient/view.html:143
+#: nutrition/templates/units/list.html:50 nutrition/views/unit.py:86
 msgid "Add new weight unit"
 msgstr ""
 
-#: nutrition/templates/ingredient/view.html:206
-#: nutrition/templates/ingredient/view.html:209
-msgid "Edit ingredient"
-msgstr ""
-
-#: nutrition/templates/ingredient/view.html:213
-msgid "Delete ingredient"
-msgstr ""
-
 #: nutrition/templates/rate/form.html:25
 msgid "Basal metabolic rate"
 msgstr ""
@@ -3549,6 +3463,15 @@ msgstr ""
 msgid "Delete weight entry for the %s"
 msgstr ""
 
+#, fuzzy
+#~ msgid ""
+#~ "If a license has been localized, e.g. the Creative Commons\n"
+#~ "            licenses for the different countries, add them as separate "
+#~ "entries here."
+#~ msgstr ""
+#~ "اگریک مجوز محلی شده باشد , به عنوان مثال مجوزهای عوام خلاق برای کشورهای "
+#~ "مختلف ,ان ها را در اینجا به عنوان ورودی ها جدا اضافه کنید"
+
 #, fuzzy
 #~| msgid "About us"
 #~ msgid "About"
diff --git a/wger/locale/fi/LC_MESSAGES/django.po b/wger/locale/fi/LC_MESSAGES/django.po
index d8dfc5e9c..dea1351cd 100644
--- a/wger/locale/fi/LC_MESSAGES/django.po
+++ b/wger/locale/fi/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: wger Workout Manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-07-14 15:59+0200\n"
+"POT-Creation-Date: 2024-11-14 13:09+0100\n"
 "PO-Revision-Date: 2022-08-31 10:16+0000\n"
 "Last-Translator: Juuso Haapanen <juuso@haapanen.biz>\n"
 "Language-Team: Finnish <https://hosted.weblate.org/projects/wger/web/fi/>\n"
@@ -20,7 +20,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.14.1-dev\n"
 
-#: config/models/gym_config.py:46 gym/templates/gym/list.html:53
+#: config/models/gym_config.py:46 gym/templates/gym/list.html:56
 msgid "Default gym"
 msgstr "Oletussali"
 
@@ -32,28 +32,28 @@ msgstr ""
 "Valitse oletussali tälle asennukselle. Tämä sali asetetaan kaikille uusille "
 "käyttäjille ja päivitetään niille käyttäjille joilta sali vielä puuttuu."
 
-#: config/views/gym_config.py:42 core/templates/language/view.html:67
-#: core/templates/license/list.html:17 core/templates/misc/license/list.html:18
+#: config/views/gym_config.py:42 core/templates/language/view.html:64
+#: core/templates/license/list.html:17
 #: core/templates/repetition_unit/list.html:18
-#: core/templates/tags/render_day.html:39
-#: core/templates/tags/render_day.html:75 core/templates/user/overview.html:204
-#: core/templates/user/overview.html:445
+#: core/templates/user/overview.html:204 core/templates/user/overview.html:467
 #: core/templates/weight_unit/list.html:18
 #: exercises/templates/categories/admin-overview.html:17
 #: exercises/templates/equipment/admin-overview.html:17
-#: exercises/templates/muscles/admin-overview.html:17
-#: gallery/views/images.py:98 gym/templates/admin_notes/list.html:32
-#: gym/templates/contract/list.html:31 gym/templates/contract/view.html:107
-#: gym/templates/contract_option/list.html:32
-#: gym/templates/contract_type/list.html:32 gym/templates/document/list.html:38
-#: gym/templates/gym/list.html:20 gym/templates/gym/list.html:46
-#: gym/templates/gym/member_list.html:87 gym/templates/gym/member_list.html:140
-#: gym/templates/gym/member_list.html:176
-#: manager/templates/calendar/day.html:68
-#: manager/templates/calendar/month.html:85
-#: manager/templates/calendar/partial_overview_table.html:18
-#: manager/templates/schedule/view.html:118
-#: nutrition/templates/ingredient/view.html:165
+#: exercises/templates/muscles/admin-overview.html:16
+#: gallery/views/images.py:98 gym/templates/admin_notes/list.html:31
+#: gym/templates/contract/list.html:30 gym/templates/contract/view.html:106
+#: gym/templates/contract_option/list.html:29
+#: gym/templates/contract_type/list.html:30 gym/templates/document/list.html:38
+#: gym/templates/gym/list.html:19 gym/templates/gym/list.html:48
+#: gym/templates/gym/member_list.html:94 gym/templates/gym/member_list.html:152
+#: gym/templates/gym/member_list.html:190
+#: manager/templates/calendar/day.html:67
+#: manager/templates/calendar/month.html:84
+#: manager/templates/calendar/partial_overview_table.html:16
+#: manager/templates/schedule/view.html:318
+#: manager/templates/workout/view.html:181
+#: nutrition/templates/ingredient/view.html:164
+#: nutrition/templates/ingredient/view.html:209
 #: nutrition/templates/units/list.html:19
 msgid "Edit"
 msgstr "Muokkaa"
@@ -89,8 +89,8 @@ msgstr "Minun hieno harjoitusohjelmani"
 msgid "Empty placeholder schedule"
 msgstr "Tyhjä tilanvaraaja-aikataulu"
 
-#: core/forms.py:69 core/templates/navigation.html:285
-#: core/templates/navigation.html:291 core/templates/user/login.html:4
+#: core/forms.py:69 core/templates/navigation.html:284
+#: core/templates/navigation.html:290 core/templates/user/login.html:4
 #: software/templates/features.html:82 software/templates/features.html:427
 msgid "Login"
 msgstr "Kirjaudu sisään"
@@ -100,14 +100,14 @@ msgstr "Kirjaudu sisään"
 msgid "First name"
 msgstr "Etunimi"
 
-#: core/forms.py:109 core/forms.py:215 core/templates/user/overview.html:266
+#: core/forms.py:109 core/forms.py:215 core/templates/user/overview.html:284
 #: gym/views/export.py:62 gym/views/gym.py:217
 msgid "Last name"
 msgstr "Sukunimi"
 
-#: core/forms.py:111 core/forms.py:180 core/templates/user/overview.html:270
+#: core/forms.py:111 core/forms.py:180 core/templates/user/overview.html:288
 #: gym/models/contract.py:256 gym/models/gym.py:58
-#: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:104
+#: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:116
 #: gym/templates/gym/new_user.html:30 gym/views/export.py:60
 #: mailer/templates/mailer/gym/form.html:4
 #: mailer/templates/mailer/gym/overview.html:4
@@ -140,8 +140,8 @@ msgstr "Harjoitusmuistutukset"
 msgid "Other settings"
 msgstr "Muut asetukset"
 
-#: core/forms.py:174 core/views/user.py:624 core/views/user.py:639
-#: core/views/user.py:651 gym/forms.py:73 manager/templates/log/add.html:65
+#: core/forms.py:174 core/views/user.py:623 core/views/user.py:638
+#: core/views/user.py:650 gym/forms.py:73 manager/templates/log/add.html:65
 #: manager/templates/set/add.html:70 manager/views/workout.py:203
 #: utils/generic_views.py:143
 msgid "Save"
@@ -168,26 +168,25 @@ msgstr "Salasana"
 msgid "Please enter your current password."
 msgstr "Anna nykyinen salasanasi."
 
-#: core/forms.py:242 core/templates/language/view.html:73
-#: core/templates/license/list.html:19 core/templates/misc/license/list.html:22
-#: core/templates/repetition_unit/list.html:20
-#: core/templates/tags/render_day.html:45
-#: core/templates/tags/render_day.html:81 core/templates/user/overview.html:217
-#: core/templates/weight_unit/list.html:20
-#: exercises/templates/categories/admin-overview.html:19
-#: exercises/templates/equipment/admin-overview.html:19
-#: exercises/templates/muscles/admin-overview.html:19
-#: gym/templates/admin_notes/list.html:40
-#: gym/templates/contract_option/list.html:41
-#: gym/templates/contract_type/list.html:41 gym/templates/document/list.html:46
-#: gym/templates/gym/list.html:22 manager/templates/calendar/day.html:73
-#: manager/templates/calendar/month.html:89
-#: manager/templates/calendar/partial_overview_table.html:23
-#: manager/templates/schedule/view.html:122
-#: manager/templates/workout/view.html:188
-#: nutrition/templates/ingredient/view.html:166
+#: core/forms.py:242 core/templates/language/view.html:70
+#: core/templates/license/list.html:21
+#: core/templates/repetition_unit/list.html:22
+#: core/templates/user/overview.html:233
+#: core/templates/weight_unit/list.html:22
+#: exercises/templates/categories/admin-overview.html:21
+#: exercises/templates/equipment/admin-overview.html:21
+#: exercises/templates/muscles/admin-overview.html:20
+#: gym/templates/admin_notes/list.html:37
+#: gym/templates/contract_option/list.html:35
+#: gym/templates/contract_type/list.html:36 gym/templates/document/list.html:46
+#: gym/templates/gym/list.html:23 manager/templates/calendar/day.html:73
+#: manager/templates/calendar/month.html:88
+#: manager/templates/calendar/partial_overview_table.html:22
+#: manager/templates/schedule/view.html:324
+#: manager/templates/workout/view.html:202
+#: nutrition/templates/ingredient/view.html:168
 #: nutrition/templates/ingredient/view.html:215
-#: nutrition/templates/units/list.html:22
+#: nutrition/templates/units/list.html:25
 msgid "Delete"
 msgstr "Poista"
 
@@ -199,9 +198,9 @@ msgstr "Väärä salasana"
 msgid "The form is secured with reCAPTCHA"
 msgstr "Lomake on suojattu reCAPTCHA:lla"
 
-#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:285
-#: core/templates/navigation.html:297 core/templates/template.html:149
-#: core/templates/user/login.html:20 core/views/user.py:298
+#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:284
+#: core/templates/navigation.html:296 core/templates/template.html:151
+#: core/templates/user/login.html:20 core/views/user.py:297
 #: software/templates/features.html:87 software/templates/features.html:422
 msgid "Register"
 msgstr "Rekisteröidy"
@@ -447,18 +446,18 @@ msgid "The sum of all hours has to be 24"
 msgstr "Tuntien summa tarvitsee olla 24"
 
 #: core/models/rep_unit.py:36 core/models/weight_unit.py:36
-#: core/templates/user/overview.html:262 core/views/user.py:599
+#: core/templates/user/overview.html:280 core/views/user.py:598
 #: exercises/models/category.py:29 exercises/models/equipment.py:29
 #: exercises/models/exercise.py:59 exercises/models/muscle.py:36
 #: gym/models/contract.py:52 gym/models/contract.py:103 gym/models/gym.py:46
 #: gym/models/user_document.py:84 gym/templates/contract/view.html:50
-#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:96
+#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:108
 #: gym/views/gym.py:158 manager/models/schedule.py:55
 #: manager/models/workout.py:57 measurements/models/category.py:36
 #: nutrition/models/ingredient.py:111
-#: nutrition/models/ingredient_category.py:27 nutrition/models/meal.py:67
+#: nutrition/models/ingredient_category.py:27 nutrition/models/meal.py:65
 #: nutrition/models/weight_unit.py:38
-#: nutrition/templates/ingredient/view.html:152
+#: nutrition/templates/ingredient/view.html:151
 msgid "Name"
 msgstr "Nimi"
 
@@ -504,7 +503,7 @@ msgstr ""
 msgid "Back to \"%(target)s\""
 msgstr ""
 
-#: core/templates/delete.html:15
+#: core/templates/delete.html:4
 #, fuzzy
 msgid "Are you sure you want to delete this? This action cannot be undone."
 msgstr "Oletko varma, että haluat poistaa tämän? Toimintoa ei voi perua."
@@ -561,7 +560,7 @@ msgstr ""
 msgid "Dashboard"
 msgstr ""
 
-#: core/templates/language/overview.html:4 core/templates/navigation.html:345
+#: core/templates/language/overview.html:4 core/templates/navigation.html:344
 msgid "Languages"
 msgstr "Kielet"
 
@@ -571,79 +570,72 @@ msgstr "Mitään ei löytynyt."
 
 #: core/templates/language/overview.html:22
 #: manager/templates/calendar/month.html:132
-#: manager/templates/schedule/overview.html:28
-#: manager/templates/schedule/view.html:144
+#: manager/templates/schedule/view.html:154
 #: manager/templates/workout/overview.html:28
 #: nutrition/templates/ingredient/overview.html:38
 msgid "Add one now."
 msgstr ""
 
-#: core/templates/language/overview.html:35 core/templates/license/list.html:40
-#: core/templates/misc/license/list.html:43
-#: core/templates/repetition_unit/list.html:43
-#: core/templates/user/overview.html:326 core/templates/user/overview.html:365
-#: core/templates/user/overview.html:401
-#: core/templates/weight_unit/list.html:43 core/views/languages.py:74
+#: core/templates/language/overview.html:34 core/templates/license/list.html:43
+#: core/templates/repetition_unit/list.html:46
+#: core/templates/user/overview.html:344 core/templates/user/overview.html:384
+#: core/templates/user/overview.html:422
+#: core/templates/weight_unit/list.html:46 core/views/languages.py:74
 #: core/views/license.py:66 core/views/repetition_units.py:66
 #: core/views/weight_units.py:66
-#: exercises/templates/categories/admin-overview.html:38
-#: gallery/views/images.py:63 gym/templates/admin_notes/list.html:67
-#: gym/templates/contract/list.html:73
-#: gym/templates/contract_option/list.html:72
-#: gym/templates/contract_type/list.html:72 gym/templates/document/list.html:79
-#: gym/templates/gym/member_list.html:211
-#: gym/templates/gym/member_list.html:244
-#: gym/templates/gym/member_list.html:281
+#: exercises/templates/categories/admin-overview.html:40
+#: exercises/templates/equipment/admin-overview.html:39
+#: exercises/templates/muscles/admin-overview.html:40
+#: gallery/views/images.py:63 gym/templates/admin_notes/list.html:64
+#: gym/templates/contract/list.html:69
+#: gym/templates/contract_option/list.html:65
+#: gym/templates/contract_type/list.html:66 gym/templates/document/list.html:78
+#: gym/templates/gym/member_list.html:228
+#: gym/templates/gym/member_list.html:264
+#: gym/templates/gym/member_list.html:303
 #: mailer/templates/mailer/gym/overview.html:43
+#: nutrition/templates/ingredient/overview.html:60
 msgid "Add"
 msgstr "Lisää"
 
 #: core/templates/language/view.html:61 core/templates/user/api_key.html:44
-#: core/templates/user/preferences.html:45 gym/models/contract.py:203
-#: gym/templates/contract/view.html:41 gym/templates/contract/view.html:106
-#: gym/templates/gym/member_list.html:248
-#: manager/templates/schedule/view.html:285
-#: manager/templates/workout/view.html:163
-#: nutrition/templates/ingredient/view.html:202
+#: core/templates/user/preferences.html:50 gym/models/contract.py:203
+#: gym/templates/contract/view.html:41 gym/templates/gym/member_list.html:270
+#: manager/templates/schedule/view.html:304
+#: manager/templates/workout/view.html:177
+#: nutrition/templates/ingredient/view.html:206
 msgid "Options"
 msgstr "Asetukset"
 
-#: core/templates/license/list.html:4 core/templates/misc/license/list.html:4
+#: core/templates/license/list.html:4
 msgid "License list"
 msgstr ""
 
-#: core/templates/license/list.html:26 core/templates/misc/license/list.html:30
-#: core/templates/repetition_unit/list.html:28
+#: core/templates/license/list.html:30
+#: core/templates/repetition_unit/list.html:32
 #: core/templates/user/overview.html:104 core/templates/user/overview.html:136
-#: core/templates/user/overview.html:185 core/templates/user/overview.html:347
-#: core/templates/user/overview.html:383 core/templates/user/overview.html:427
-#: core/templates/weight_unit/list.html:28
-#: exercises/templates/categories/admin-overview.html:26
-#: exercises/templates/equipment/admin-overview.html:26
-#: exercises/templates/muscles/admin-overview.html:26
-#: gym/templates/admin_notes/list.html:52 gym/templates/contract/list.html:60
-#: gym/templates/contract_option/list.html:58
-#: gym/templates/contract_type/list.html:58 gym/templates/document/list.html:64
-#: gym/templates/gym/list.html:29 gym/templates/gym/member_list.html:229
-#: gym/templates/gym/member_list.html:262
-#: gym/templates/gym/member_list.html:299
+#: core/templates/user/overview.html:185 core/templates/user/overview.html:365
+#: core/templates/user/overview.html:404 core/templates/user/overview.html:448
+#: core/templates/weight_unit/list.html:32
+#: exercises/templates/categories/admin-overview.html:30
+#: exercises/templates/equipment/admin-overview.html:30
+#: exercises/templates/muscles/admin-overview.html:29
+#: gym/templates/admin_notes/list.html:50 gym/templates/contract/list.html:57
+#: gym/templates/contract_option/list.html:52
+#: gym/templates/contract_type/list.html:53 gym/templates/document/list.html:64
+#: gym/templates/gym/list.html:32 gym/templates/gym/member_list.html:248
+#: gym/templates/gym/member_list.html:284
+#: gym/templates/gym/member_list.html:321
 #: mailer/templates/mailer/gym/overview.html:30
-#: manager/templates/calendar/day.html:87
-#: nutrition/templates/units/list.html:29
+#: manager/templates/calendar/day.html:88
+#: nutrition/templates/units/list.html:34
 msgid "Nothing found"
 msgstr ""
 
-#: core/templates/misc/about.html:4 core/templates/template.html:175
+#: core/templates/misc/about.html:4 core/templates/template.html:188
 msgid "Imprint"
 msgstr ""
 
-#: core/templates/misc/license/list.html:47
-msgid ""
-"If a license has been localized, e.g. the Creative Commons\n"
-"            licenses for the different countries, add them as separate "
-"entries here."
-msgstr ""
-
 #: core/templates/navigation.html:28 software/templates/features.html:437
 msgid "Training"
 msgstr ""
@@ -688,8 +680,8 @@ msgstr ""
 msgid "Exercises"
 msgstr "Harjoitukset"
 
-#: core/templates/navigation.html:111 core/templates/navigation.html:184
-#: core/templates/navigation.html:340
+#: core/templates/navigation.html:111 core/templates/navigation.html:185
+#: core/templates/navigation.html:339
 msgid "Administration"
 msgstr ""
 
@@ -728,87 +720,87 @@ msgstr "Painoindeksilaskuri"
 msgid "Daily calories calculator"
 msgstr ""
 
-#: core/templates/navigation.html:179
+#: core/templates/navigation.html:180
 #: nutrition/templates/ingredient/overview.html:10
 msgid "Ingredient overview"
 msgstr ""
 
-#: core/templates/navigation.html:187 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:189 nutrition/templates/units/list.html:6
 msgid "Ingredient weight units"
 msgstr ""
 
-#: core/templates/navigation.html:203 software/templates/features.html:442
+#: core/templates/navigation.html:205 software/templates/features.html:442
 msgid "Body weight"
 msgstr ""
 
-#: core/templates/navigation.html:210 core/templates/user/overview.html:114
+#: core/templates/navigation.html:212 core/templates/user/overview.html:114
 msgid "Weight overview"
 msgstr ""
 
-#: core/templates/navigation.html:217 weight/views.py:65
+#: core/templates/navigation.html:216 weight/views.py:65
 msgid "Add weight entry"
 msgstr ""
 
-#: core/templates/navigation.html:231
+#: core/templates/navigation.html:230
 msgid "About this software"
 msgstr ""
 
-#: core/templates/navigation.html:237 software/templates/about_us.html:5
+#: core/templates/navigation.html:236 software/templates/about_us.html:5
 msgid "About us"
 msgstr "Meistä"
 
-#: core/templates/navigation.html:243 software/templates/features.html:507
+#: core/templates/navigation.html:242 software/templates/features.html:507
 msgid "REST API"
 msgstr ""
 
-#: core/templates/navigation.html:249 utils/models.py:45
+#: core/templates/navigation.html:248 utils/models.py:45
 msgid "License"
 msgstr ""
 
-#: core/templates/navigation.html:255
+#: core/templates/navigation.html:254
 msgid "Developer documentation"
 msgstr ""
 
-#: core/templates/navigation.html:262
+#: core/templates/navigation.html:261
 msgid "Get the code"
 msgstr ""
 
-#: core/templates/navigation.html:269 core/templates/template.html:214
+#: core/templates/navigation.html:268 core/templates/template.html:227
 #: software/templates/features.html:582
 msgid "Translate"
 msgstr ""
 
-#: core/templates/navigation.html:303 core/templates/user/login.html:28
+#: core/templates/navigation.html:302 core/templates/user/login.html:28
 msgid "Reset password"
 msgstr ""
 
-#: core/templates/navigation.html:321
+#: core/templates/navigation.html:320
 msgid "My preferences"
 msgstr ""
 
-#: core/templates/navigation.html:330
+#: core/templates/navigation.html:329
 msgid "Logout"
 msgstr ""
 
-#: core/templates/navigation.html:353
+#: core/templates/navigation.html:352
 msgid "Licenses"
 msgstr ""
 
-#: core/templates/navigation.html:361
+#: core/templates/navigation.html:360
 #: core/templates/repetition_unit/list.html:4
 msgid "Repetition units"
 msgstr ""
 
-#: core/templates/navigation.html:369 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:368 core/templates/weight_unit/list.html:4
 #: nutrition/templates/ingredient/view.html:141
 msgid "Weight units"
 msgstr ""
 
-#: core/templates/navigation.html:377 core/templates/user/list.html:4
+#: core/templates/navigation.html:376 core/templates/user/list.html:4
 msgid "User list"
 msgstr ""
 
-#: core/templates/navigation.html:383
+#: core/templates/navigation.html:382
 msgid "Gyms"
 msgstr ""
 
@@ -867,55 +859,28 @@ msgstr "edellinen"
 msgid "next"
 msgstr "seuraava"
 
-#: core/templates/tags/render_day.html:34
-msgid "Add weight log"
+#: core/templates/tags/render_day.html:44
+msgid "Placeholder image for translation"
 msgstr ""
 
-#: core/templates/tags/render_day.html:116
-msgid "Placeholder image for exercise"
-msgstr ""
-
-#: core/templates/tags/render_day.html:133
-msgid "This exercise has no repetitions."
-msgstr ""
-
-#: core/templates/tags/render_day.html:136
-msgid "Edit them now."
-msgstr ""
-
-#: core/templates/tags/render_day.html:162
-msgid "Add exercises to this workout day"
-msgstr ""
-
-#: core/templates/tags/render_weight_log.html:17 manager/helpers.py:86
-#: manager/models/setting.py:72 manager/templates/set/formset.html:9
-msgid "Reps"
-msgstr "Toistot"
-
-#: core/templates/tags/render_weight_log.html:30 manager/forms.py:191
-#: manager/models/log.py:103 manager/models/setting.py:102
-#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
-msgid "RiR"
-msgstr ""
-
-#: core/templates/template.html:122 manager/templates/calendar/month.html:138
-#: manager/templates/schedule/view.html:248
-#: manager/templates/schedule/view.html:269
-#: manager/templates/workout/view.html:84
-#: manager/templates/workout/view.html:137
+#: core/templates/template.html:124 manager/templates/calendar/month.html:138
+#: manager/templates/schedule/view.html:262
+#: manager/templates/schedule/view.html:287
+#: manager/templates/workout/view.html:89
+#: manager/templates/workout/view.html:149
 msgid "Close"
 msgstr ""
 
-#: core/templates/template.html:138
+#: core/templates/template.html:140
 msgid ""
 "You are using a guest account, data entered will be deleted after a week."
 msgstr ""
 
-#: core/templates/template.html:143
+#: core/templates/template.html:145
 msgid "Create some demo entries"
 msgstr ""
 
-#: core/templates/template.html:180 software/templates/features.html:547
+#: core/templates/template.html:193 software/templates/features.html:547
 #: software/templates/tos.html:7
 msgid "Terms of service"
 msgstr "Käyttöehdot"
@@ -924,7 +889,7 @@ msgstr "Käyttöehdot"
 msgid "Features"
 msgstr ""
 
-#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:54
+#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:59
 msgid "API key"
 msgstr ""
 
@@ -963,17 +928,17 @@ msgstr ""
 msgid "Documentation"
 msgstr ""
 
-#: core/templates/user/delete_account.html:4
-#: core/templates/user/preferences.html:59
+#: core/templates/user/delete_account.html:3
+#: core/templates/user/preferences.html:62
 msgid "Delete account"
 msgstr ""
 
-#: core/templates/user/delete_account.html:17
+#: core/templates/user/delete_account.html:9
 #: exercises/templates/history/overview.html:93
 msgid "Are you sure?"
 msgstr "Oletko varma?"
 
-#: core/templates/user/delete_account.html:22
+#: core/templates/user/delete_account.html:14
 #, python-format
 msgid ""
 "This action will delete the user account \"%(username)s\".\n"
@@ -992,22 +957,22 @@ msgstr ""
 
 #: core/templates/user/overview.html:25 core/templates/user/overview.html:68
 #: core/templates/user/overview.html:112 core/templates/user/overview.html:144
-#: core/templates/user/overview.html:330 core/templates/user/overview.html:369
-#: core/templates/user/overview.html:405
+#: core/templates/user/overview.html:348 core/templates/user/overview.html:390
+#: core/templates/user/overview.html:426
 #, python-format
 msgid "last %(number)s"
 msgstr ""
 
 #: core/templates/user/overview.html:27 core/templates/user/overview.html:146
-#: core/templates/user/overview.html:325 core/templates/user/overview.html:364
-#: core/templates/user/overview.html:400 gym/templates/gym/member_list.html:210
-#: gym/templates/gym/member_list.html:243
-#: gym/templates/gym/member_list.html:280
+#: core/templates/user/overview.html:343 core/templates/user/overview.html:382
+#: core/templates/user/overview.html:421 gym/templates/gym/member_list.html:226
+#: gym/templates/gym/member_list.html:262
+#: gym/templates/gym/member_list.html:302
 msgid "Overview"
 msgstr ""
 
 #: core/templates/user/overview.html:28
-#: manager/templates/schedule/view.html:163
+#: manager/templates/schedule/view.html:172
 #: manager/templates/workout/overview.html:39 manager/views/schedule_step.py:60
 msgid "Add workout"
 msgstr ""
@@ -1039,38 +1004,36 @@ msgstr ""
 msgid "Number of logs (days)"
 msgstr ""
 
-#: core/templates/user/overview.html:37 core/views/user.py:600
+#: core/templates/user/overview.html:37 core/views/user.py:599
 #: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:158
 msgid "Last activity"
 msgstr ""
 
 #: core/templates/user/overview.html:58
 #: manager/templates/calendar/month.html:128
-#: manager/templates/schedule/view.html:144
 #: manager/templates/workout/overview.html:28
 msgid "No workouts found."
 msgstr ""
 
 #: core/templates/user/overview.html:68 manager/forms.py:280
-#: manager/templates/workout/view.html:106
+#: manager/templates/workout/view.html:114
 msgid "Log"
 msgstr ""
 
 #: core/templates/user/overview.html:77 manager/models/session.py:83
-#: manager/templates/calendar/partial_overview_table.html:52
+#: manager/templates/calendar/partial_overview_table.html:54
 msgid "General impression"
 msgstr ""
 
-#: core/templates/user/overview.html:78 core/templates/user/overview.html:369
+#: core/templates/user/overview.html:78 core/templates/user/overview.html:390
 #: manager/models/session.py:73
-#: manager/templates/calendar/partial_overview_table.html:56
-#: manager/templates/workout/log.html:89
+#: manager/templates/calendar/partial_overview_table.html:58
 msgid "Notes"
 msgstr ""
 
 #: core/templates/user/overview.html:79
 #: exercises/templates/history/overview.html:30
-#: manager/templates/calendar/partial_overview_table.html:42
+#: manager/templates/calendar/partial_overview_table.html:44
 msgid "Time"
 msgstr ""
 
@@ -1108,121 +1071,121 @@ msgstr ""
 msgid "kcal"
 msgstr "kcal"
 
-#: core/templates/user/overview.html:201 core/templates/user/overview.html:322
-#: core/templates/user/overview.html:361 core/templates/user/overview.html:397
-#: core/templates/user/overview.html:442 gym/templates/gym/list.html:42
-#: gym/templates/gym/member_list.html:84 gym/templates/gym/member_list.html:137
-#: gym/templates/gym/member_list.html:173
-#: gym/templates/gym/member_list.html:207
-#: gym/templates/gym/member_list.html:240
-#: gym/templates/gym/member_list.html:277
-#: manager/templates/schedule/view.html:100
+#: core/templates/user/overview.html:201 core/templates/user/overview.html:340
+#: core/templates/user/overview.html:379 core/templates/user/overview.html:418
+#: core/templates/user/overview.html:463 gym/templates/gym/list.html:45
+#: gym/templates/gym/member_list.html:91 gym/templates/gym/member_list.html:149
+#: gym/templates/gym/member_list.html:187
+#: gym/templates/gym/member_list.html:223
+#: gym/templates/gym/member_list.html:259
+#: gym/templates/gym/member_list.html:299
+#: manager/templates/schedule/view.html:99
 msgid "Actions"
 msgstr ""
 
-#: core/templates/user/overview.html:207
+#: core/templates/user/overview.html:210
 msgid "Deactivate user"
 msgstr ""
 
-#: core/templates/user/overview.html:209
+#: core/templates/user/overview.html:214
 msgid "Activate user"
 msgstr ""
 
-#: core/templates/user/overview.html:211
+#: core/templates/user/overview.html:223
 msgid "Reset user password"
 msgstr ""
 
-#: core/templates/user/overview.html:214 gym/templates/gym/member_list.html:30
+#: core/templates/user/overview.html:227 gym/templates/gym/member_list.html:30
 msgid "Roles"
 msgstr ""
 
-#: core/templates/user/overview.html:225
+#: core/templates/user/overview.html:243
 msgid "Password reset confirmation"
 msgstr ""
 
-#: core/templates/user/overview.html:229
+#: core/templates/user/overview.html:247
 msgid "Do you really want to change this user&#39;s password?"
 msgstr ""
 
-#: core/templates/user/overview.html:232
+#: core/templates/user/overview.html:250
 #: exercises/templates/history/overview.html:106
 msgid "No"
 msgstr ""
 
-#: core/templates/user/overview.html:233
+#: core/templates/user/overview.html:251
 #: exercises/templates/history/overview.html:99
 msgid "Yes"
 msgstr ""
 
-#: core/templates/user/overview.html:254 gym/templates/gym/member_list.html:93
+#: core/templates/user/overview.html:272 gym/templates/gym/member_list.html:105
 msgid "Details"
 msgstr ""
 
-#: core/templates/user/overview.html:258 gym/views/export.py:57
-#: manager/helpers.py:86 manager/templates/schedule/view.html:98
+#: core/templates/user/overview.html:276 gym/views/export.py:57
+#: manager/helpers.py:86 manager/templates/schedule/view.html:97
 msgid "Nr."
 msgstr ""
 
-#: core/templates/user/overview.html:280 gym/models/contract.py:287
+#: core/templates/user/overview.html:298 gym/models/contract.py:287
 #: gym/models/gym.py:50 gym/templates/contract/view.html:75
-#: gym/templates/gym/member_list.html:100 gym/views/export.py:68
+#: gym/templates/gym/member_list.html:112 gym/views/export.py:68
 msgid "Phone"
 msgstr "Puhelin"
 
-#: core/templates/user/overview.html:284 gym/templates/contract/view.html:87
-#: gym/templates/gym/member_list.html:118
+#: core/templates/user/overview.html:302 gym/templates/contract/view.html:87
+#: gym/templates/gym/member_list.html:130
 msgid "Address"
 msgstr "Osoite"
 
-#: core/templates/user/overview.html:295
+#: core/templates/user/overview.html:313
 msgid "Registered"
 msgstr ""
 
-#: core/templates/user/overview.html:299
+#: core/templates/user/overview.html:317
 msgid "Last login"
 msgstr ""
 
-#: core/templates/user/overview.html:304
+#: core/templates/user/overview.html:322
 msgid "Status"
 msgstr ""
 
-#: core/templates/user/overview.html:307
+#: core/templates/user/overview.html:325
 msgid "Active"
 msgstr ""
 
-#: core/templates/user/overview.html:309
+#: core/templates/user/overview.html:327
 msgid "Inactive"
 msgstr ""
 
-#: core/templates/user/overview.html:330 gym/templates/contract/list.html:4
-#: gym/templates/gym/member_list.html:202
+#: core/templates/user/overview.html:348 gym/templates/contract/list.html:4
+#: gym/templates/gym/member_list.html:218
 msgid "Contracts"
 msgstr ""
 
-#: core/templates/user/overview.html:405 gym/templates/document/list.html:4
+#: core/templates/user/overview.html:426 gym/templates/document/list.html:4
 msgid "Documents"
 msgstr ""
 
-#: core/templates/user/overview.html:412 gym/templates/document/list.html:32
-#: manager/forms.py:292 manager/templates/workout/view.html:132
+#: core/templates/user/overview.html:433 gym/templates/document/list.html:33
+#: manager/forms.py:292 manager/templates/workout/view.html:143
 msgid "Download"
 msgstr ""
 
-#: core/templates/user/overview.html:450 gym/views/admin_config.py:44
+#: core/templates/user/overview.html:474 gym/views/admin_config.py:44
 #: gym/views/admin_config.py:58 gym/views/user_config.py:46
 msgid "Configuration"
 msgstr "Asetukset"
 
-#: core/templates/user/overview.html:453 gym/models/user_config.py:92
+#: core/templates/user/overview.html:477 gym/models/user_config.py:92
 msgid "Include in inactive overview"
 msgstr ""
 
-#: core/templates/user/overview.html:486
+#: core/templates/user/overview.html:510
 #, python-format
 msgid "Admin login is only available for users in %(gym_name)s"
 msgstr ""
 
-#: core/templates/user/overview.html:490
+#: core/templates/user/overview.html:514
 msgid "Log in as this user"
 msgstr ""
 
@@ -1242,19 +1205,19 @@ msgstr ""
 msgid "Send verification email"
 msgstr ""
 
-#: core/templates/user/preferences.html:30
+#: core/templates/user/preferences.html:31
 msgid "You need to verify your email to contribute exercises"
 msgstr ""
 
-#: core/templates/user/preferences.html:50 core/views/user.py:611
+#: core/templates/user/preferences.html:55 core/views/user.py:610
 msgid "Change password"
 msgstr ""
 
-#: core/templatetags/wger_extras.py:205 i18n.tpl:37
+#: core/templatetags/wger_extras.py:197 i18n.tpl:37
 msgid "kg"
 msgstr "kg"
 
-#: core/templatetags/wger_extras.py:207
+#: core/templatetags/wger_extras.py:199
 #: nutrition/templates/ingredient/view.html:60
 #: nutrition/templates/ingredient/view.html:66
 #: nutrition/templates/ingredient/view.html:73
@@ -1266,11 +1229,11 @@ msgctxt "weight unit, i.e. grams"
 msgid "g"
 msgstr "g"
 
-#: core/templatetags/wger_extras.py:210 i18n.tpl:38
+#: core/templatetags/wger_extras.py:202 i18n.tpl:38
 msgid "lb"
 msgstr ""
 
-#: core/templatetags/wger_extras.py:212
+#: core/templatetags/wger_extras.py:204
 msgctxt "weight unit, i.e. ounces"
 msgid "oz"
 msgstr ""
@@ -1297,13 +1260,13 @@ msgid "Delete {0}?"
 msgstr "Poista {0}?"
 
 #: core/views/languages.py:111 core/views/license.py:85
-#: core/views/repetition_units.py:86 core/views/user.py:474
+#: core/views/repetition_units.py:86 core/views/user.py:473
 #: core/views/weight_units.py:86 exercises/views/categories.py:98
 #: exercises/views/equipment.py:81 exercises/views/muscles.py:87
 #: gym/views/admin_notes.py:161 gym/views/config.py:68
 #: gym/views/contract.py:186 gym/views/contract_option.py:123
 #: gym/views/contract_type.py:123 gym/views/document.py:171
-#: gym/views/gym.py:463 manager/views/day.py:100 manager/views/schedule.py:333
+#: gym/views/gym.py:463 manager/views/day.py:96 manager/views/schedule.py:333
 #: manager/views/workout.py:267 nutrition/views/ingredient.py:145
 #: nutrition/views/unit.py:143
 #, python-brace-format
@@ -1329,48 +1292,48 @@ msgstr ""
 msgid "Your feedback was successfully sent. Thank you!"
 msgstr ""
 
-#: core/views/user.py:156
+#: core/views/user.py:155
 #, python-brace-format
 msgid "Account \"{0}\" was successfully deleted"
 msgstr ""
 
-#: core/views/user.py:292
+#: core/views/user.py:291
 msgid "You were successfully registered"
 msgstr ""
 
-#: core/views/user.py:351
+#: core/views/user.py:350
 msgid "Settings successfully updated"
 msgstr ""
 
-#: core/views/user.py:390
+#: core/views/user.py:389
 msgid "The user was successfully deactivated"
 msgstr ""
 
-#: core/views/user.py:427
+#: core/views/user.py:426
 msgid "The user was successfully activated"
 msgstr ""
 
-#: core/views/user.py:442
+#: core/views/user.py:441
 msgid "Edit user"
 msgstr ""
 
-#: core/views/user.py:597 gym/templates/gym/member_list.html:26
+#: core/views/user.py:596 gym/templates/gym/member_list.html:26
 #: gym/views/gym.py:158
 msgid "ID"
 msgstr ""
 
-#: core/views/user.py:598 gym/forms.py:95 gym/templates/contract/view.html:55
+#: core/views/user.py:597 gym/forms.py:95 gym/templates/contract/view.html:55
 #: gym/templates/gym/member_list.html:27 gym/views/export.py:59
 #: gym/views/gym.py:158 gym/views/gym.py:217
 msgid "Username"
 msgstr ""
 
-#: core/views/user.py:601 gym/templates/gym/new_user.html:34
+#: core/views/user.py:600 gym/templates/gym/new_user.html:34
 #: gym/views/export.py:58 gym/views/gym.py:217
 msgid "Gym"
 msgstr ""
 
-#: core/views/user.py:660
+#: core/views/user.py:659
 #, python-format
 msgid "A verification email was sent to %(email)s"
 msgstr ""
@@ -1522,11 +1485,6 @@ msgstr ""
 msgid "Equipment list"
 msgstr ""
 
-#: exercises/templates/equipment/admin-overview.html:39
-#: exercises/views/equipment.py:92
-msgid "Add new equipment"
-msgstr ""
-
 #: exercises/templates/history/overview.html:11
 msgid "Exercise admin history"
 msgstr ""
@@ -1576,11 +1534,6 @@ msgstr ""
 msgid "Muscle overview"
 msgstr ""
 
-#: exercises/templates/muscles/admin-overview.html:38
-#: exercises/views/muscles.py:68
-msgid "Add muscle"
-msgstr ""
-
 #: exercises/views/categories.py:72
 msgid "Add category"
 msgstr ""
@@ -1589,6 +1542,10 @@ msgstr ""
 msgid "This will also delete all exercises in this category."
 msgstr ""
 
+#: exercises/views/equipment.py:92
+msgid "Add new equipment"
+msgstr ""
+
 #: exercises/views/equipment.py:104 exercises/views/equipment.py:115
 msgid "Delete equipment?"
 msgstr ""
@@ -1597,6 +1554,10 @@ msgstr ""
 msgid "This will delete the exercise from all workouts."
 msgstr ""
 
+#: exercises/views/muscles.py:68
+msgid "Add muscle"
+msgstr ""
+
 #: gallery/templates/images/overview.html:62
 msgid "Add image"
 msgstr ""
@@ -1682,7 +1643,7 @@ msgid "Contract is active"
 msgstr ""
 
 #: gym/models/contract.py:237 gym/templates/contract/view.html:69
-#: manager/models/schedule.py:61 manager/templates/schedule/view.html:67
+#: manager/models/schedule.py:61 manager/templates/schedule/view.html:66
 msgid "Start date"
 msgstr ""
 
@@ -1718,7 +1679,7 @@ msgstr ""
 msgid "Admin: can administrate the different gyms"
 msgstr ""
 
-#: gym/models/gym.py:65 gym/templates/gym/member_list.html:114
+#: gym/models/gym.py:65 gym/templates/gym/member_list.html:126
 msgid "Owner"
 msgstr ""
 
@@ -1728,7 +1689,7 @@ msgid ""
 "considered inactive"
 msgstr ""
 
-#: gym/models/gym_config.py:56 gym/templates/gym/member_list.html:152
+#: gym/models/gym_config.py:56 gym/templates/gym/member_list.html:166
 msgid "Show name in header"
 msgstr ""
 
@@ -1741,7 +1702,7 @@ msgstr ""
 msgid "Configuration for {self.gym.name}"
 msgstr ""
 
-#: gym/models/user_config.py:65 gym/templates/gym/member_list.html:184
+#: gym/models/user_config.py:65 gym/templates/gym/member_list.html:200
 msgid "Overview of inactive members"
 msgstr ""
 
@@ -1765,7 +1726,7 @@ msgstr ""
 msgid "User notes"
 msgstr ""
 
-#: gym/templates/contract/list.html:36
+#: gym/templates/contract/list.html:34
 msgid "Show"
 msgstr "Näytä"
 
@@ -1791,11 +1752,11 @@ msgstr ""
 msgid "Gym list"
 msgstr ""
 
-#: gym/templates/gym/list.html:50
+#: gym/templates/gym/list.html:53
 msgid "Global gym configuration"
 msgstr ""
 
-#: gym/templates/gym/list.html:67 gym/views/gym.py:171
+#: gym/templates/gym/list.html:69 gym/views/gym.py:171
 msgid "Add new gym"
 msgstr ""
 
@@ -1807,43 +1768,43 @@ msgstr ""
 msgid "Gym manager"
 msgstr ""
 
-#: gym/templates/gym/member_list.html:69
+#: gym/templates/gym/member_list.html:76
 msgid "This gym has no administrators or trainers"
 msgstr ""
 
-#: gym/templates/gym/member_list.html:88
+#: gym/templates/gym/member_list.html:98
 msgid "Export"
 msgstr ""
 
-#: gym/templates/gym/member_list.html:125
+#: gym/templates/gym/member_list.html:137
 msgid "Members"
 msgstr ""
 
-#: gym/templates/gym/member_list.html:145
+#: gym/templates/gym/member_list.html:159
 msgid "Gym configuration"
 msgstr ""
 
-#: gym/templates/gym/member_list.html:148
+#: gym/templates/gym/member_list.html:162
 msgid "Inactive members"
 msgstr ""
 
-#: gym/templates/gym/member_list.html:149
+#: gym/templates/gym/member_list.html:163
 msgid "weeks"
 msgstr ""
 
-#: gym/templates/gym/member_list.html:181
+#: gym/templates/gym/member_list.html:197
 msgid "My configuration"
 msgstr ""
 
-#: gym/templates/gym/member_list.html:215
+#: gym/templates/gym/member_list.html:234
 msgid "Types"
 msgstr ""
 
-#: gym/templates/gym/member_list.html:285
+#: gym/templates/gym/member_list.html:307
 msgid "Emails"
 msgstr ""
 
-#: gym/templates/gym/member_list.html:315
+#: gym/templates/gym/member_list.html:336
 msgid "Add member"
 msgstr ""
 
@@ -2132,28 +2093,38 @@ msgstr "Näytä raaka-aineet myös englanniksi"
 msgid "Unit"
 msgstr ""
 
+#: manager/forms.py:191 manager/models/log.py:103 manager/models/setting.py:102
+#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
+msgid "RiR"
+msgstr ""
+
 #: manager/forms.py:279
 msgid "Type"
 msgstr ""
 
-#: manager/forms.py:280 manager/templates/workout/view.html:113
+#: manager/forms.py:280 manager/templates/workout/view.html:122
 msgid "Table"
 msgstr ""
 
-#: manager/forms.py:282 manager/templates/workout/view.html:119
+#: manager/forms.py:282 manager/templates/workout/view.html:129
 msgid "with images"
 msgstr ""
 
-#: manager/forms.py:283 manager/templates/workout/view.html:125
+#: manager/forms.py:283 manager/templates/workout/view.html:136
 msgid "with comments"
 msgstr ""
 
+#: manager/helpers.py:86 manager/models/setting.py:72
+#: manager/templates/set/formset.html:9
+msgid "Reps"
+msgstr "Toistot"
+
 #: manager/management/commands/email-reminders.py:121
 msgid "Workout will expire soon"
 msgstr ""
 
 #: manager/models/day.py:34 manager/models/log.py:58
-#: manager/models/session.py:60 manager/templates/schedule/view.html:102
+#: manager/models/session.py:60 manager/templates/schedule/view.html:101
 #: manager/templates/workout/view.html:9 manager/templates/workout/view.html:17
 #: manager/views/pdf.py:85 manager/views/pdf.py:161
 #: manager/views/schedule.py:151 manager/views/schedule.py:221
@@ -2174,7 +2145,7 @@ msgstr ""
 msgid "Name or short description of the schedule. For example 'Program XYZ'."
 msgstr ""
 
-#: manager/models/schedule.py:65 manager/templates/schedule/view.html:71
+#: manager/models/schedule.py:65 manager/templates/schedule/view.html:70
 msgid "Schedule active"
 msgstr ""
 
@@ -2185,7 +2156,7 @@ msgid ""
 "inactive"
 msgstr ""
 
-#: manager/models/schedule.py:77 manager/templates/schedule/view.html:81
+#: manager/models/schedule.py:77 manager/templates/schedule/view.html:80
 msgid "Is a loop"
 msgstr ""
 
@@ -2204,7 +2175,7 @@ msgid "The duration in weeks"
 msgstr ""
 
 #: manager/models/schedule_step.py:64 manager/models/set.py:53
-#: manager/models/setting.py:113 nutrition/models/meal.py:55
+#: manager/models/setting.py:113 nutrition/models/meal.py:53
 #: nutrition/models/meal_item.py:66
 msgid "Order"
 msgstr ""
@@ -2336,7 +2307,7 @@ msgstr ""
 msgid "Workout session"
 msgstr ""
 
-#: manager/templates/calendar/partial_overview_table.html:27
+#: manager/templates/calendar/partial_overview_table.html:26
 msgid "Delete with logs"
 msgstr ""
 
@@ -2356,21 +2327,25 @@ msgid ""
 "will simply be edited. Weight entries are always added."
 msgstr ""
 
-#: manager/templates/schedule/overview.html:5
+#: manager/templates/schedule/overview.html:4
 msgid "Your schedules"
 msgstr ""
 
 #: manager/templates/schedule/overview.html:19
-#: manager/templates/schedule/view.html:131
-#: manager/templates/schedule/view.html:183
+#: manager/templates/schedule/view.html:143
+#: manager/templates/schedule/view.html:193
 #: manager/templates/workout/overview.html:16
 msgid "active"
 msgstr ""
 
-#: manager/templates/schedule/overview.html:28
+#: manager/templates/schedule/overview.html:27
 msgid "No schedules found."
 msgstr ""
 
+#: manager/templates/schedule/overview.html:28
+msgid "Add one now"
+msgstr ""
+
 #: manager/templates/schedule/overview.html:36
 msgid ""
 "Schedules are collections of workouts that you do in\n"
@@ -2383,10 +2358,11 @@ msgid ""
 "        before jumping to the next. It is also possible to create a loop, so "
 "you\n"
 "        always do the same workouts in succession, e.g. A > B > C > A > B > "
-"C and so on."
+"C and so\n"
+"        on."
 msgstr ""
 
-#: manager/templates/schedule/overview.html:43
+#: manager/templates/schedule/overview.html:44
 msgid ""
 "The currently active schedule will remain active (and be\n"
 "        shown e.g. in your dashboard) till it reaches the last workout or "
@@ -2402,25 +2378,25 @@ msgstr ""
 msgid "Schedule"
 msgstr ""
 
-#: manager/templates/schedule/view.html:85
+#: manager/templates/schedule/view.html:84
 msgid ""
 "This schedule is a loop and will go through the workouts above till you "
 "deactivate it"
 msgstr ""
 
-#: manager/templates/schedule/view.html:103
+#: manager/templates/schedule/view.html:102
 msgid "Weeks"
 msgstr ""
 
-#: manager/templates/schedule/view.html:115
+#: manager/templates/schedule/view.html:114
 msgid "Move me"
 msgstr ""
 
-#: manager/templates/schedule/view.html:156
+#: manager/templates/schedule/view.html:168
 msgid "Start schedule"
 msgstr ""
 
-#: manager/templates/schedule/view.html:187
+#: manager/templates/schedule/view.html:197
 #, python-format
 msgid ""
 "%(weeks)s Week\n"
@@ -2431,11 +2407,11 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: manager/templates/schedule/view.html:221
+#: manager/templates/schedule/view.html:231
 msgid "Adding workouts"
 msgstr ""
 
-#: manager/templates/schedule/view.html:223
+#: manager/templates/schedule/view.html:233
 msgid ""
 "Add as many workouts to the schedule as you want. You can\n"
 "            edit the order by dragging and dropping them. It's also possible "
@@ -2443,44 +2419,37 @@ msgid ""
 "            than once."
 msgstr ""
 
-#: manager/templates/schedule/view.html:232
-#: manager/templates/schedule/view.html:243
-#: manager/templates/schedule/view.html:290
+#: manager/templates/schedule/view.html:242
+#: manager/templates/schedule/view.html:256
+#: manager/templates/schedule/view.html:310
 #: manager/templates/workout/view.html:69
-#: manager/templates/workout/view.html:79
-#: manager/templates/workout/view.html:178
+#: manager/templates/workout/view.html:83
+#: manager/templates/workout/view.html:192
 msgid "Export calendar file"
 msgstr ""
 
-#: manager/templates/schedule/view.html:236
+#: manager/templates/schedule/view.html:248
 msgid "Export this schedule as a calendar file."
 msgstr ""
 
-#: manager/templates/schedule/view.html:237
-#: manager/templates/workout/view.html:74
+#: manager/templates/schedule/view.html:249
+#: manager/templates/workout/view.html:76
 msgid ""
 "You can then import the file it into your calendar\n"
 "                        application for example google calendar, outlook or "
 "iCal. This will create\n"
 "                        an appointment for each training day with the "
-"appropriate exercises."
+"appropriate\n"
+"                        exercises."
 msgstr ""
 
-#: manager/templates/schedule/view.html:258
-#: manager/templates/schedule/view.html:294
-#: manager/templates/workout/view.html:94
-#: manager/templates/workout/view.html:174
+#: manager/templates/schedule/view.html:272
+#: manager/templates/schedule/view.html:315
+#: manager/templates/workout/view.html:99
+#: manager/templates/workout/view.html:188
 msgid "Download as PDF"
 msgstr "Lataa PDF:nä"
 
-#: manager/templates/schedule/view.html:299
-msgid "Edit schedule"
-msgstr ""
-
-#: manager/templates/schedule/view.html:304
-msgid "Delete schedule"
-msgstr ""
-
 #: manager/templates/set/add.html:9
 #, python-format
 msgid "Add exercises to day \"%(day_name)s\""
@@ -2545,47 +2514,6 @@ msgid ""
 "You will regularly receive such reminders till you enter your current weight."
 msgstr ""
 
-#: manager/templates/workout/log.html:10 manager/templates/workout/log.html:11
-msgid "Weight log"
-msgstr ""
-
-#: manager/templates/workout/log.html:29
-msgid "Weight log for workout"
-msgstr ""
-
-#: manager/templates/workout/log.html:49
-msgid "Add weight log to this day"
-msgstr ""
-
-#: manager/templates/workout/log.html:69
-msgid "No weight entries here."
-msgstr ""
-
-#: manager/templates/workout/log.html:77
-msgid "No exercises for this day."
-msgstr ""
-
-#: manager/templates/workout/log.html:90
-msgid ""
-"This page shows the weight logs belonging to this workout\n"
-"only. Click on an exercise to see all the historical data for\n"
-"it."
-msgstr ""
-
-#: manager/templates/workout/log.html:94
-msgid ""
-"If on a single day there is more than one entry with the\n"
-"same number of repetitions, but different weights, only the entry with the\n"
-"higher weight is shown in the diagram."
-msgstr ""
-
-#: manager/templates/workout/log.html:98
-msgid ""
-"Note that only entries with a weight unit (kg or lb) and\n"
-"repetitions are charted, other combinations such as time or until failure\n"
-"are ignored here."
-msgstr ""
-
 #: manager/templates/workout/overview.html:25
 #, fuzzy
 #| msgid "Nothing found."
@@ -2625,27 +2553,23 @@ msgstr ""
 msgid "Set the repetitions for each set"
 msgstr ""
 
-#: manager/templates/workout/view.html:73
+#: manager/templates/workout/view.html:75
 msgid "Export this workout as a calendar file."
 msgstr ""
 
-#: manager/templates/workout/view.html:144
+#: manager/templates/workout/view.html:156
 msgid "Logs"
 msgstr ""
 
-#: manager/templates/workout/view.html:146
+#: manager/templates/workout/view.html:159
 msgid "View logs"
 msgstr ""
 
-#: manager/templates/workout/view.html:169 manager/views/schedule_step.py:99
-msgid "Edit workout"
-msgstr ""
-
-#: manager/templates/workout/view.html:182 manager/views/workout.py:281
+#: manager/templates/workout/view.html:195 manager/views/workout.py:281
 msgid "Mark as template"
 msgstr ""
 
-#: manager/views/day.py:109
+#: manager/views/day.py:105
 msgid "Add workout day"
 msgstr ""
 
@@ -2662,6 +2586,10 @@ msgstr ""
 msgid "Create schedule"
 msgstr ""
 
+#: manager/views/schedule_step.py:99
+msgid "Edit workout"
+msgstr ""
+
 #: manager/views/workout.py:209
 msgid "Copy workout"
 msgstr ""
@@ -2789,7 +2717,7 @@ msgstr ""
 msgid "Unit amount, e.g. \"1 Cup\" or \"1/2 spoon\""
 msgstr ""
 
-#: nutrition/models/log.py:52 nutrition/models/meal.py:50
+#: nutrition/models/log.py:52 nutrition/models/meal.py:48
 #: nutrition/models/meal_item.py:48 nutrition/models/plan.py:108
 msgid "Nutrition plan"
 msgstr ""
@@ -2802,11 +2730,11 @@ msgstr ""
 msgid "Date and Time (Approx.)"
 msgstr ""
 
-#: nutrition/models/meal.py:62
+#: nutrition/models/meal.py:60
 msgid "Time (approx)"
 msgstr ""
 
-#: nutrition/models/meal.py:69
+#: nutrition/models/meal.py:67
 msgid ""
 "Give meals a textual description / name such as \"Breakfast\" or \"after "
 "workout\""
@@ -2929,10 +2857,6 @@ msgstr ""
 msgid "Search"
 msgstr ""
 
-#: nutrition/templates/ingredient/overview.html:62
-msgid "Add ingredient"
-msgstr ""
-
 #: nutrition/templates/ingredient/view.html:45 nutrition/views/plan.py:229
 msgid "Macronutrients"
 msgstr ""
@@ -2952,20 +2876,11 @@ msgstr ""
 msgid "Others"
 msgstr ""
 
-#: nutrition/templates/ingredient/view.html:144
-#: nutrition/templates/units/list.html:46 nutrition/views/unit.py:86
+#: nutrition/templates/ingredient/view.html:143
+#: nutrition/templates/units/list.html:50 nutrition/views/unit.py:86
 msgid "Add new weight unit"
 msgstr ""
 
-#: nutrition/templates/ingredient/view.html:206
-#: nutrition/templates/ingredient/view.html:209
-msgid "Edit ingredient"
-msgstr ""
-
-#: nutrition/templates/ingredient/view.html:213
-msgid "Delete ingredient"
-msgstr ""
-
 #: nutrition/templates/rate/form.html:25
 msgid "Basal metabolic rate"
 msgstr ""
diff --git a/wger/locale/fr/LC_MESSAGES/django.po b/wger/locale/fr/LC_MESSAGES/django.po
index 40418d1e5..08ea0b795 100644
--- a/wger/locale/fr/LC_MESSAGES/django.po
+++ b/wger/locale/fr/LC_MESSAGES/django.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: wger Workout Manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-07-14 15:59+0200\n"
+"POT-Creation-Date: 2024-11-14 13:09+0100\n"
 "PO-Revision-Date: 2024-09-29 10:15+0000\n"
 "Last-Translator: MrSniikyz <babygeek83bis@gmail.com>\n"
 "Language-Team: French <https://hosted.weblate.org/projects/wger/web/fr/>\n"
@@ -32,7 +32,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 "X-Generator: Weblate 5.8-dev\n"
 
-#: config/models/gym_config.py:46 gym/templates/gym/list.html:53
+#: config/models/gym_config.py:46 gym/templates/gym/list.html:56
 msgid "Default gym"
 msgstr "Salle de sport par défaut"
 
@@ -45,28 +45,28 @@ msgstr ""
 "assigner à chaque utilisateur non enregistré ainsi qu'aux utilisateurs sans "
 "activités."
 
-#: config/views/gym_config.py:42 core/templates/language/view.html:67
-#: core/templates/license/list.html:17 core/templates/misc/license/list.html:18
+#: config/views/gym_config.py:42 core/templates/language/view.html:64
+#: core/templates/license/list.html:17
 #: core/templates/repetition_unit/list.html:18
-#: core/templates/tags/render_day.html:39
-#: core/templates/tags/render_day.html:75 core/templates/user/overview.html:204
-#: core/templates/user/overview.html:445
+#: core/templates/user/overview.html:204 core/templates/user/overview.html:467
 #: core/templates/weight_unit/list.html:18
 #: exercises/templates/categories/admin-overview.html:17
 #: exercises/templates/equipment/admin-overview.html:17
-#: exercises/templates/muscles/admin-overview.html:17
-#: gallery/views/images.py:98 gym/templates/admin_notes/list.html:32
-#: gym/templates/contract/list.html:31 gym/templates/contract/view.html:107
-#: gym/templates/contract_option/list.html:32
-#: gym/templates/contract_type/list.html:32 gym/templates/document/list.html:38
-#: gym/templates/gym/list.html:20 gym/templates/gym/list.html:46
-#: gym/templates/gym/member_list.html:87 gym/templates/gym/member_list.html:140
-#: gym/templates/gym/member_list.html:176
-#: manager/templates/calendar/day.html:68
-#: manager/templates/calendar/month.html:85
-#: manager/templates/calendar/partial_overview_table.html:18
-#: manager/templates/schedule/view.html:118
-#: nutrition/templates/ingredient/view.html:165
+#: exercises/templates/muscles/admin-overview.html:16
+#: gallery/views/images.py:98 gym/templates/admin_notes/list.html:31
+#: gym/templates/contract/list.html:30 gym/templates/contract/view.html:106
+#: gym/templates/contract_option/list.html:29
+#: gym/templates/contract_type/list.html:30 gym/templates/document/list.html:38
+#: gym/templates/gym/list.html:19 gym/templates/gym/list.html:48
+#: gym/templates/gym/member_list.html:94 gym/templates/gym/member_list.html:152
+#: gym/templates/gym/member_list.html:190
+#: manager/templates/calendar/day.html:67
+#: manager/templates/calendar/month.html:84
+#: manager/templates/calendar/partial_overview_table.html:16
+#: manager/templates/schedule/view.html:318
+#: manager/templates/workout/view.html:181
+#: nutrition/templates/ingredient/view.html:164
+#: nutrition/templates/ingredient/view.html:209
 #: nutrition/templates/units/list.html:19
 msgid "Edit"
 msgstr "Modifier"
@@ -100,8 +100,8 @@ msgstr "Mon programme d’entraînement"
 msgid "Empty placeholder schedule"
 msgstr "Programme vide de démonstration"
 
-#: core/forms.py:69 core/templates/navigation.html:285
-#: core/templates/navigation.html:291 core/templates/user/login.html:4
+#: core/forms.py:69 core/templates/navigation.html:284
+#: core/templates/navigation.html:290 core/templates/user/login.html:4
 #: software/templates/features.html:82 software/templates/features.html:427
 msgid "Login"
 msgstr "Se connecter"
@@ -111,14 +111,14 @@ msgstr "Se connecter"
 msgid "First name"
 msgstr "Prénom"
 
-#: core/forms.py:109 core/forms.py:215 core/templates/user/overview.html:266
+#: core/forms.py:109 core/forms.py:215 core/templates/user/overview.html:284
 #: gym/views/export.py:62 gym/views/gym.py:217
 msgid "Last name"
 msgstr "Nom"
 
-#: core/forms.py:111 core/forms.py:180 core/templates/user/overview.html:270
+#: core/forms.py:111 core/forms.py:180 core/templates/user/overview.html:288
 #: gym/models/contract.py:256 gym/models/gym.py:58
-#: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:104
+#: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:116
 #: gym/templates/gym/new_user.html:30 gym/views/export.py:60
 #: mailer/templates/mailer/gym/form.html:4
 #: mailer/templates/mailer/gym/overview.html:4
@@ -149,8 +149,8 @@ msgstr "Rappels d’entraînement"
 msgid "Other settings"
 msgstr "Autres paramètres"
 
-#: core/forms.py:174 core/views/user.py:624 core/views/user.py:639
-#: core/views/user.py:651 gym/forms.py:73 manager/templates/log/add.html:65
+#: core/forms.py:174 core/views/user.py:623 core/views/user.py:638
+#: core/views/user.py:650 gym/forms.py:73 manager/templates/log/add.html:65
 #: manager/templates/set/add.html:70 manager/views/workout.py:203
 #: utils/generic_views.py:143
 msgid "Save"
@@ -175,26 +175,25 @@ msgstr "Mot de passe"
 msgid "Please enter your current password."
 msgstr "Veuillez entrer votre mot de passe actuel."
 
-#: core/forms.py:242 core/templates/language/view.html:73
-#: core/templates/license/list.html:19 core/templates/misc/license/list.html:22
-#: core/templates/repetition_unit/list.html:20
-#: core/templates/tags/render_day.html:45
-#: core/templates/tags/render_day.html:81 core/templates/user/overview.html:217
-#: core/templates/weight_unit/list.html:20
-#: exercises/templates/categories/admin-overview.html:19
-#: exercises/templates/equipment/admin-overview.html:19
-#: exercises/templates/muscles/admin-overview.html:19
-#: gym/templates/admin_notes/list.html:40
-#: gym/templates/contract_option/list.html:41
-#: gym/templates/contract_type/list.html:41 gym/templates/document/list.html:46
-#: gym/templates/gym/list.html:22 manager/templates/calendar/day.html:73
-#: manager/templates/calendar/month.html:89
-#: manager/templates/calendar/partial_overview_table.html:23
-#: manager/templates/schedule/view.html:122
-#: manager/templates/workout/view.html:188
-#: nutrition/templates/ingredient/view.html:166
+#: core/forms.py:242 core/templates/language/view.html:70
+#: core/templates/license/list.html:21
+#: core/templates/repetition_unit/list.html:22
+#: core/templates/user/overview.html:233
+#: core/templates/weight_unit/list.html:22
+#: exercises/templates/categories/admin-overview.html:21
+#: exercises/templates/equipment/admin-overview.html:21
+#: exercises/templates/muscles/admin-overview.html:20
+#: gym/templates/admin_notes/list.html:37
+#: gym/templates/contract_option/list.html:35
+#: gym/templates/contract_type/list.html:36 gym/templates/document/list.html:46
+#: gym/templates/gym/list.html:23 manager/templates/calendar/day.html:73
+#: manager/templates/calendar/month.html:88
+#: manager/templates/calendar/partial_overview_table.html:22
+#: manager/templates/schedule/view.html:324
+#: manager/templates/workout/view.html:202
+#: nutrition/templates/ingredient/view.html:168
 #: nutrition/templates/ingredient/view.html:215
-#: nutrition/templates/units/list.html:22
+#: nutrition/templates/units/list.html:25
 msgid "Delete"
 msgstr "Supprimer"
 
@@ -206,9 +205,9 @@ msgstr "Mot de passe invalide"
 msgid "The form is secured with reCAPTCHA"
 msgstr "Le formulaire est sécurisé avec reCAPTCHA"
 
-#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:285
-#: core/templates/navigation.html:297 core/templates/template.html:149
-#: core/templates/user/login.html:20 core/views/user.py:298
+#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:284
+#: core/templates/navigation.html:296 core/templates/template.html:151
+#: core/templates/user/login.html:20 core/views/user.py:297
 #: software/templates/features.html:87 software/templates/features.html:422
 msgid "Register"
 msgstr "S’inscrire"
@@ -463,18 +462,18 @@ msgid "The sum of all hours has to be 24"
 msgstr "La somme des heures doit être de 24"
 
 #: core/models/rep_unit.py:36 core/models/weight_unit.py:36
-#: core/templates/user/overview.html:262 core/views/user.py:599
+#: core/templates/user/overview.html:280 core/views/user.py:598
 #: exercises/models/category.py:29 exercises/models/equipment.py:29
 #: exercises/models/exercise.py:59 exercises/models/muscle.py:36
 #: gym/models/contract.py:52 gym/models/contract.py:103 gym/models/gym.py:46
 #: gym/models/user_document.py:84 gym/templates/contract/view.html:50
-#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:96
+#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:108
 #: gym/views/gym.py:158 manager/models/schedule.py:55
 #: manager/models/workout.py:57 measurements/models/category.py:36
 #: nutrition/models/ingredient.py:111
-#: nutrition/models/ingredient_category.py:27 nutrition/models/meal.py:67
+#: nutrition/models/ingredient_category.py:27 nutrition/models/meal.py:65
 #: nutrition/models/weight_unit.py:38
-#: nutrition/templates/ingredient/view.html:152
+#: nutrition/templates/ingredient/view.html:151
 msgid "Name"
 msgstr "Nom"
 
@@ -527,7 +526,7 @@ msgstr ""
 msgid "Back to \"%(target)s\""
 msgstr "Retour vers « %(target)s »"
 
-#: core/templates/delete.html:15
+#: core/templates/delete.html:4
 msgid "Are you sure you want to delete this? This action cannot be undone."
 msgstr "Êtes-vous sûr·e de vouloir supprimer ceci ? C’est irréversible."
 
@@ -581,7 +580,7 @@ msgstr ""
 msgid "Dashboard"
 msgstr "Tableau de bord"
 
-#: core/templates/language/overview.html:4 core/templates/navigation.html:345
+#: core/templates/language/overview.html:4 core/templates/navigation.html:344
 msgid "Languages"
 msgstr "Langues"
 
@@ -591,81 +590,72 @@ msgstr "Rien trouvé."
 
 #: core/templates/language/overview.html:22
 #: manager/templates/calendar/month.html:132
-#: manager/templates/schedule/overview.html:28
-#: manager/templates/schedule/view.html:144
+#: manager/templates/schedule/view.html:154
 #: manager/templates/workout/overview.html:28
 #: nutrition/templates/ingredient/overview.html:38
 msgid "Add one now."
 msgstr "En ajouter une."
 
-#: core/templates/language/overview.html:35 core/templates/license/list.html:40
-#: core/templates/misc/license/list.html:43
-#: core/templates/repetition_unit/list.html:43
-#: core/templates/user/overview.html:326 core/templates/user/overview.html:365
-#: core/templates/user/overview.html:401
-#: core/templates/weight_unit/list.html:43 core/views/languages.py:74
+#: core/templates/language/overview.html:34 core/templates/license/list.html:43
+#: core/templates/repetition_unit/list.html:46
+#: core/templates/user/overview.html:344 core/templates/user/overview.html:384
+#: core/templates/user/overview.html:422
+#: core/templates/weight_unit/list.html:46 core/views/languages.py:74
 #: core/views/license.py:66 core/views/repetition_units.py:66
 #: core/views/weight_units.py:66
-#: exercises/templates/categories/admin-overview.html:38
-#: gallery/views/images.py:63 gym/templates/admin_notes/list.html:67
-#: gym/templates/contract/list.html:73
-#: gym/templates/contract_option/list.html:72
-#: gym/templates/contract_type/list.html:72 gym/templates/document/list.html:79
-#: gym/templates/gym/member_list.html:211
-#: gym/templates/gym/member_list.html:244
-#: gym/templates/gym/member_list.html:281
+#: exercises/templates/categories/admin-overview.html:40
+#: exercises/templates/equipment/admin-overview.html:39
+#: exercises/templates/muscles/admin-overview.html:40
+#: gallery/views/images.py:63 gym/templates/admin_notes/list.html:64
+#: gym/templates/contract/list.html:69
+#: gym/templates/contract_option/list.html:65
+#: gym/templates/contract_type/list.html:66 gym/templates/document/list.html:78
+#: gym/templates/gym/member_list.html:228
+#: gym/templates/gym/member_list.html:264
+#: gym/templates/gym/member_list.html:303
 #: mailer/templates/mailer/gym/overview.html:43
+#: nutrition/templates/ingredient/overview.html:60
 msgid "Add"
 msgstr "Ajouter"
 
 #: core/templates/language/view.html:61 core/templates/user/api_key.html:44
-#: core/templates/user/preferences.html:45 gym/models/contract.py:203
-#: gym/templates/contract/view.html:41 gym/templates/contract/view.html:106
-#: gym/templates/gym/member_list.html:248
-#: manager/templates/schedule/view.html:285
-#: manager/templates/workout/view.html:163
-#: nutrition/templates/ingredient/view.html:202
+#: core/templates/user/preferences.html:50 gym/models/contract.py:203
+#: gym/templates/contract/view.html:41 gym/templates/gym/member_list.html:270
+#: manager/templates/schedule/view.html:304
+#: manager/templates/workout/view.html:177
+#: nutrition/templates/ingredient/view.html:206
 msgid "Options"
 msgstr "Options"
 
-#: core/templates/license/list.html:4 core/templates/misc/license/list.html:4
+#: core/templates/license/list.html:4
 msgid "License list"
 msgstr "Liste des licences"
 
-#: core/templates/license/list.html:26 core/templates/misc/license/list.html:30
-#: core/templates/repetition_unit/list.html:28
+#: core/templates/license/list.html:30
+#: core/templates/repetition_unit/list.html:32
 #: core/templates/user/overview.html:104 core/templates/user/overview.html:136
-#: core/templates/user/overview.html:185 core/templates/user/overview.html:347
-#: core/templates/user/overview.html:383 core/templates/user/overview.html:427
-#: core/templates/weight_unit/list.html:28
-#: exercises/templates/categories/admin-overview.html:26
-#: exercises/templates/equipment/admin-overview.html:26
-#: exercises/templates/muscles/admin-overview.html:26
-#: gym/templates/admin_notes/list.html:52 gym/templates/contract/list.html:60
-#: gym/templates/contract_option/list.html:58
-#: gym/templates/contract_type/list.html:58 gym/templates/document/list.html:64
-#: gym/templates/gym/list.html:29 gym/templates/gym/member_list.html:229
-#: gym/templates/gym/member_list.html:262
-#: gym/templates/gym/member_list.html:299
+#: core/templates/user/overview.html:185 core/templates/user/overview.html:365
+#: core/templates/user/overview.html:404 core/templates/user/overview.html:448
+#: core/templates/weight_unit/list.html:32
+#: exercises/templates/categories/admin-overview.html:30
+#: exercises/templates/equipment/admin-overview.html:30
+#: exercises/templates/muscles/admin-overview.html:29
+#: gym/templates/admin_notes/list.html:50 gym/templates/contract/list.html:57
+#: gym/templates/contract_option/list.html:52
+#: gym/templates/contract_type/list.html:53 gym/templates/document/list.html:64
+#: gym/templates/gym/list.html:32 gym/templates/gym/member_list.html:248
+#: gym/templates/gym/member_list.html:284
+#: gym/templates/gym/member_list.html:321
 #: mailer/templates/mailer/gym/overview.html:30
-#: manager/templates/calendar/day.html:87
-#: nutrition/templates/units/list.html:29
+#: manager/templates/calendar/day.html:88
+#: nutrition/templates/units/list.html:34
 msgid "Nothing found"
 msgstr "Rien trouvé"
 
-#: core/templates/misc/about.html:4 core/templates/template.html:175
+#: core/templates/misc/about.html:4 core/templates/template.html:188
 msgid "Imprint"
 msgstr "Informations légales"
 
-#: core/templates/misc/license/list.html:47
-msgid ""
-"If a license has been localized, e.g. the Creative Commons\n"
-"            licenses for the different countries, add them as separate "
-"entries here."
-msgstr ""
-"Si une licence a été localisée, par exemple les licences Creative Commons\n"
-"pour les différents pays, ajoutez-les comme des entrées distinctes ici."
-
 #: core/templates/navigation.html:28 software/templates/features.html:437
 msgid "Training"
 msgstr "Formation"
@@ -710,8 +700,8 @@ msgstr "Modèles publics"
 msgid "Exercises"
 msgstr "Exercices"
 
-#: core/templates/navigation.html:111 core/templates/navigation.html:184
-#: core/templates/navigation.html:340
+#: core/templates/navigation.html:111 core/templates/navigation.html:185
+#: core/templates/navigation.html:339
 msgid "Administration"
 msgstr "Administration"
 
@@ -748,87 +738,87 @@ msgstr "Calculateur d’IMC"
 msgid "Daily calories calculator"
 msgstr "Calculateur de calories quotidiennes"
 
-#: core/templates/navigation.html:179
+#: core/templates/navigation.html:180
 #: nutrition/templates/ingredient/overview.html:10
 msgid "Ingredient overview"
 msgstr "Aperçu ingrédients"
 
-#: core/templates/navigation.html:187 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:189 nutrition/templates/units/list.html:6
 msgid "Ingredient weight units"
 msgstr "Unité de poids des ingrédients"
 
-#: core/templates/navigation.html:203 software/templates/features.html:442
+#: core/templates/navigation.html:205 software/templates/features.html:442
 msgid "Body weight"
 msgstr "Poids corporel"
 
-#: core/templates/navigation.html:210 core/templates/user/overview.html:114
+#: core/templates/navigation.html:212 core/templates/user/overview.html:114
 msgid "Weight overview"
 msgstr "Aperçu poids"
 
-#: core/templates/navigation.html:217 weight/views.py:65
+#: core/templates/navigation.html:216 weight/views.py:65
 msgid "Add weight entry"
 msgstr "Ajouter une entrée"
 
-#: core/templates/navigation.html:231
+#: core/templates/navigation.html:230
 msgid "About this software"
 msgstr "À propos de ce logiciel"
 
-#: core/templates/navigation.html:237 software/templates/about_us.html:5
+#: core/templates/navigation.html:236 software/templates/about_us.html:5
 msgid "About us"
 msgstr "À propos de nous"
 
-#: core/templates/navigation.html:243 software/templates/features.html:507
+#: core/templates/navigation.html:242 software/templates/features.html:507
 msgid "REST API"
 msgstr "API REST"
 
-#: core/templates/navigation.html:249 utils/models.py:45
+#: core/templates/navigation.html:248 utils/models.py:45
 msgid "License"
 msgstr "Licence"
 
-#: core/templates/navigation.html:255
+#: core/templates/navigation.html:254
 msgid "Developer documentation"
 msgstr "Documentation du développeur"
 
-#: core/templates/navigation.html:262
+#: core/templates/navigation.html:261
 msgid "Get the code"
 msgstr "Récupérer le code"
 
-#: core/templates/navigation.html:269 core/templates/template.html:214
+#: core/templates/navigation.html:268 core/templates/template.html:227
 #: software/templates/features.html:582
 msgid "Translate"
 msgstr "Traduire"
 
-#: core/templates/navigation.html:303 core/templates/user/login.html:28
+#: core/templates/navigation.html:302 core/templates/user/login.html:28
 msgid "Reset password"
 msgstr "Réinitialiser le mot de passe"
 
-#: core/templates/navigation.html:321
+#: core/templates/navigation.html:320
 msgid "My preferences"
 msgstr "Mes préférences"
 
-#: core/templates/navigation.html:330
+#: core/templates/navigation.html:329
 msgid "Logout"
 msgstr "Se déconnecter"
 
-#: core/templates/navigation.html:353
+#: core/templates/navigation.html:352
 msgid "Licenses"
 msgstr "Licences"
 
-#: core/templates/navigation.html:361
+#: core/templates/navigation.html:360
 #: core/templates/repetition_unit/list.html:4
 msgid "Repetition units"
 msgstr "Unités de répétition"
 
-#: core/templates/navigation.html:369 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:368 core/templates/weight_unit/list.html:4
 #: nutrition/templates/ingredient/view.html:141
 msgid "Weight units"
 msgstr "Unité de poids"
 
-#: core/templates/navigation.html:377 core/templates/user/list.html:4
+#: core/templates/navigation.html:376 core/templates/user/list.html:4
 msgid "User list"
 msgstr "Liste des utilisateurs"
 
-#: core/templates/navigation.html:383
+#: core/templates/navigation.html:382
 msgid "Gyms"
 msgstr "Activités"
 
@@ -894,57 +884,32 @@ msgstr "précédent"
 msgid "next"
 msgstr "suivant"
 
-#: core/templates/tags/render_day.html:34
-msgid "Add weight log"
-msgstr "Ajouter un journal de poids"
-
-#: core/templates/tags/render_day.html:116
-msgid "Placeholder image for exercise"
+#: core/templates/tags/render_day.html:44
+#, fuzzy
+#| msgid "Placeholder image for exercise"
+msgid "Placeholder image for translation"
 msgstr "Espace réservé pour l'image de l'exercice"
 
-#: core/templates/tags/render_day.html:133
-msgid "This exercise has no repetitions."
-msgstr "Cet exercice n'a pas de répétition."
-
-#: core/templates/tags/render_day.html:136
-msgid "Edit them now."
-msgstr "Modifiez-les maintenant."
-
-#: core/templates/tags/render_day.html:162
-msgid "Add exercises to this workout day"
-msgstr "Ajouter des exercices à cette séance"
-
-#: core/templates/tags/render_weight_log.html:17 manager/helpers.py:86
-#: manager/models/setting.py:72 manager/templates/set/formset.html:9
-msgid "Reps"
-msgstr "Reps"
-
-#: core/templates/tags/render_weight_log.html:30 manager/forms.py:191
-#: manager/models/log.py:103 manager/models/setting.py:102
-#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
-msgid "RiR"
-msgstr "ReR"
-
-#: core/templates/template.html:122 manager/templates/calendar/month.html:138
-#: manager/templates/schedule/view.html:248
-#: manager/templates/schedule/view.html:269
-#: manager/templates/workout/view.html:84
-#: manager/templates/workout/view.html:137
+#: core/templates/template.html:124 manager/templates/calendar/month.html:138
+#: manager/templates/schedule/view.html:262
+#: manager/templates/schedule/view.html:287
+#: manager/templates/workout/view.html:89
+#: manager/templates/workout/view.html:149
 msgid "Close"
 msgstr "Fermer"
 
-#: core/templates/template.html:138
+#: core/templates/template.html:140
 msgid ""
 "You are using a guest account, data entered will be deleted after a week."
 msgstr ""
 "Vous utilisez un compte invité, les données rentrées seront effacées après "
 "une semaine."
 
-#: core/templates/template.html:143
+#: core/templates/template.html:145
 msgid "Create some demo entries"
 msgstr "Créer des entrées de démo"
 
-#: core/templates/template.html:180 software/templates/features.html:547
+#: core/templates/template.html:193 software/templates/features.html:547
 #: software/templates/tos.html:7
 msgid "Terms of service"
 msgstr "Conditions d’utilisation"
@@ -953,7 +918,7 @@ msgstr "Conditions d’utilisation"
 msgid "Features"
 msgstr "Fonctionnalités"
 
-#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:54
+#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:59
 msgid "API key"
 msgstr "Clé API"
 
@@ -999,17 +964,17 @@ msgstr "Générer votre nouvelle clé API"
 msgid "Documentation"
 msgstr "Documentation"
 
-#: core/templates/user/delete_account.html:4
-#: core/templates/user/preferences.html:59
+#: core/templates/user/delete_account.html:3
+#: core/templates/user/preferences.html:62
 msgid "Delete account"
 msgstr "Supprimer votre compte"
 
-#: core/templates/user/delete_account.html:17
+#: core/templates/user/delete_account.html:9
 #: exercises/templates/history/overview.html:93
 msgid "Are you sure?"
 msgstr "Êtes-vous sûr·e ?"
 
-#: core/templates/user/delete_account.html:22
+#: core/templates/user/delete_account.html:14
 #, python-format
 msgid ""
 "This action will delete the user account \"%(username)s\".\n"
@@ -1032,22 +997,22 @@ msgstr "Mot de passe oublié ?"
 
 #: core/templates/user/overview.html:25 core/templates/user/overview.html:68
 #: core/templates/user/overview.html:112 core/templates/user/overview.html:144
-#: core/templates/user/overview.html:330 core/templates/user/overview.html:369
-#: core/templates/user/overview.html:405
+#: core/templates/user/overview.html:348 core/templates/user/overview.html:390
+#: core/templates/user/overview.html:426
 #, python-format
 msgid "last %(number)s"
 msgstr "dernier %(number)s"
 
 #: core/templates/user/overview.html:27 core/templates/user/overview.html:146
-#: core/templates/user/overview.html:325 core/templates/user/overview.html:364
-#: core/templates/user/overview.html:400 gym/templates/gym/member_list.html:210
-#: gym/templates/gym/member_list.html:243
-#: gym/templates/gym/member_list.html:280
+#: core/templates/user/overview.html:343 core/templates/user/overview.html:382
+#: core/templates/user/overview.html:421 gym/templates/gym/member_list.html:226
+#: gym/templates/gym/member_list.html:262
+#: gym/templates/gym/member_list.html:302
 msgid "Overview"
 msgstr "Aperçu"
 
 #: core/templates/user/overview.html:28
-#: manager/templates/schedule/view.html:163
+#: manager/templates/schedule/view.html:172
 #: manager/templates/workout/overview.html:39 manager/views/schedule_step.py:60
 msgid "Add workout"
 msgstr "Ajouter une séance"
@@ -1079,38 +1044,36 @@ msgstr "Description"
 msgid "Number of logs (days)"
 msgstr "Nombre de journaux (jours)"
 
-#: core/templates/user/overview.html:37 core/views/user.py:600
+#: core/templates/user/overview.html:37 core/views/user.py:599
 #: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:158
 msgid "Last activity"
 msgstr "Dernière activité"
 
 #: core/templates/user/overview.html:58
 #: manager/templates/calendar/month.html:128
-#: manager/templates/schedule/view.html:144
 #: manager/templates/workout/overview.html:28
 msgid "No workouts found."
 msgstr "Pas de séance trouvée."
 
 #: core/templates/user/overview.html:68 manager/forms.py:280
-#: manager/templates/workout/view.html:106
+#: manager/templates/workout/view.html:114
 msgid "Log"
 msgstr "Journal"
 
 #: core/templates/user/overview.html:77 manager/models/session.py:83
-#: manager/templates/calendar/partial_overview_table.html:52
+#: manager/templates/calendar/partial_overview_table.html:54
 msgid "General impression"
 msgstr "Impression générale"
 
-#: core/templates/user/overview.html:78 core/templates/user/overview.html:369
+#: core/templates/user/overview.html:78 core/templates/user/overview.html:390
 #: manager/models/session.py:73
-#: manager/templates/calendar/partial_overview_table.html:56
-#: manager/templates/workout/log.html:89
+#: manager/templates/calendar/partial_overview_table.html:58
 msgid "Notes"
 msgstr "Notes"
 
 #: core/templates/user/overview.html:79
 #: exercises/templates/history/overview.html:30
-#: manager/templates/calendar/partial_overview_table.html:42
+#: manager/templates/calendar/partial_overview_table.html:44
 msgid "Time"
 msgstr "Temps"
 
@@ -1148,123 +1111,123 @@ msgstr "Lipides"
 msgid "kcal"
 msgstr "kcal"
 
-#: core/templates/user/overview.html:201 core/templates/user/overview.html:322
-#: core/templates/user/overview.html:361 core/templates/user/overview.html:397
-#: core/templates/user/overview.html:442 gym/templates/gym/list.html:42
-#: gym/templates/gym/member_list.html:84 gym/templates/gym/member_list.html:137
-#: gym/templates/gym/member_list.html:173
-#: gym/templates/gym/member_list.html:207
-#: gym/templates/gym/member_list.html:240
-#: gym/templates/gym/member_list.html:277
-#: manager/templates/schedule/view.html:100
+#: core/templates/user/overview.html:201 core/templates/user/overview.html:340
+#: core/templates/user/overview.html:379 core/templates/user/overview.html:418
+#: core/templates/user/overview.html:463 gym/templates/gym/list.html:45
+#: gym/templates/gym/member_list.html:91 gym/templates/gym/member_list.html:149
+#: gym/templates/gym/member_list.html:187
+#: gym/templates/gym/member_list.html:223
+#: gym/templates/gym/member_list.html:259
+#: gym/templates/gym/member_list.html:299
+#: manager/templates/schedule/view.html:99
 msgid "Actions"
 msgstr "Actions"
 
-#: core/templates/user/overview.html:207
+#: core/templates/user/overview.html:210
 msgid "Deactivate user"
 msgstr "Désactiver l'utilisateur"
 
-#: core/templates/user/overview.html:209
+#: core/templates/user/overview.html:214
 msgid "Activate user"
 msgstr "Activer l'utilisateur"
 
-#: core/templates/user/overview.html:211
+#: core/templates/user/overview.html:223
 msgid "Reset user password"
 msgstr "Réinitialiser le mot de passe utilisateur"
 
-#: core/templates/user/overview.html:214 gym/templates/gym/member_list.html:30
+#: core/templates/user/overview.html:227 gym/templates/gym/member_list.html:30
 msgid "Roles"
 msgstr "Rôles"
 
-#: core/templates/user/overview.html:225
+#: core/templates/user/overview.html:243
 msgid "Password reset confirmation"
 msgstr "Confirmation de mot de passe réinitialisé"
 
-#: core/templates/user/overview.html:229
+#: core/templates/user/overview.html:247
 msgid "Do you really want to change this user&#39;s password?"
 msgstr "Voulez-vous vraiment changer ce mot de passe utilisateur&#39;s ?"
 
-#: core/templates/user/overview.html:232
+#: core/templates/user/overview.html:250
 #: exercises/templates/history/overview.html:106
 msgid "No"
 msgstr "Non"
 
-#: core/templates/user/overview.html:233
+#: core/templates/user/overview.html:251
 #: exercises/templates/history/overview.html:99
 msgid "Yes"
 msgstr "Oui"
 
-#: core/templates/user/overview.html:254 gym/templates/gym/member_list.html:93
+#: core/templates/user/overview.html:272 gym/templates/gym/member_list.html:105
 msgid "Details"
 msgstr "Détails"
 
-#: core/templates/user/overview.html:258 gym/views/export.py:57
-#: manager/helpers.py:86 manager/templates/schedule/view.html:98
+#: core/templates/user/overview.html:276 gym/views/export.py:57
+#: manager/helpers.py:86 manager/templates/schedule/view.html:97
 msgid "Nr."
 msgstr "N°"
 
-#: core/templates/user/overview.html:280 gym/models/contract.py:287
+#: core/templates/user/overview.html:298 gym/models/contract.py:287
 #: gym/models/gym.py:50 gym/templates/contract/view.html:75
-#: gym/templates/gym/member_list.html:100 gym/views/export.py:68
+#: gym/templates/gym/member_list.html:112 gym/views/export.py:68
 msgid "Phone"
 msgstr "Téléphone"
 
-#: core/templates/user/overview.html:284 gym/templates/contract/view.html:87
-#: gym/templates/gym/member_list.html:118
+#: core/templates/user/overview.html:302 gym/templates/contract/view.html:87
+#: gym/templates/gym/member_list.html:130
 msgid "Address"
 msgstr "Adresse"
 
-#: core/templates/user/overview.html:295
+#: core/templates/user/overview.html:313
 msgid "Registered"
 msgstr "Enregistré"
 
-#: core/templates/user/overview.html:299
+#: core/templates/user/overview.html:317
 msgid "Last login"
 msgstr "Dernière connexion"
 
-#: core/templates/user/overview.html:304
+#: core/templates/user/overview.html:322
 msgid "Status"
 msgstr "Statut"
 
-#: core/templates/user/overview.html:307
+#: core/templates/user/overview.html:325
 msgid "Active"
 msgstr "Actif"
 
-#: core/templates/user/overview.html:309
+#: core/templates/user/overview.html:327
 msgid "Inactive"
 msgstr "Inactifs"
 
-#: core/templates/user/overview.html:330 gym/templates/contract/list.html:4
-#: gym/templates/gym/member_list.html:202
+#: core/templates/user/overview.html:348 gym/templates/contract/list.html:4
+#: gym/templates/gym/member_list.html:218
 msgid "Contracts"
 msgstr "Contrats"
 
-#: core/templates/user/overview.html:405 gym/templates/document/list.html:4
+#: core/templates/user/overview.html:426 gym/templates/document/list.html:4
 msgid "Documents"
 msgstr "Documents"
 
-#: core/templates/user/overview.html:412 gym/templates/document/list.html:32
-#: manager/forms.py:292 manager/templates/workout/view.html:132
+#: core/templates/user/overview.html:433 gym/templates/document/list.html:33
+#: manager/forms.py:292 manager/templates/workout/view.html:143
 msgid "Download"
 msgstr "Télécharger"
 
-#: core/templates/user/overview.html:450 gym/views/admin_config.py:44
+#: core/templates/user/overview.html:474 gym/views/admin_config.py:44
 #: gym/views/admin_config.py:58 gym/views/user_config.py:46
 msgid "Configuration"
 msgstr "Configuration"
 
-#: core/templates/user/overview.html:453 gym/models/user_config.py:92
+#: core/templates/user/overview.html:477 gym/models/user_config.py:92
 msgid "Include in inactive overview"
 msgstr "Inclure dans un aperçu inactif"
 
-#: core/templates/user/overview.html:486
+#: core/templates/user/overview.html:510
 #, python-format
 msgid "Admin login is only available for users in %(gym_name)s"
 msgstr ""
 "La connexion Admin est uniquement disponible pour les utilisateurs de "
 "%(gym_name)s"
 
-#: core/templates/user/overview.html:490
+#: core/templates/user/overview.html:514
 msgid "Log in as this user"
 msgstr "Connectez-vous en tant que cet utilisateur"
 
@@ -1284,19 +1247,19 @@ msgstr "Email non vérifié"
 msgid "Send verification email"
 msgstr "Envoyer un email de vérification"
 
-#: core/templates/user/preferences.html:30
+#: core/templates/user/preferences.html:31
 msgid "You need to verify your email to contribute exercises"
 msgstr "Vous devez vérifier votre email pour contribuer aux exercices"
 
-#: core/templates/user/preferences.html:50 core/views/user.py:611
+#: core/templates/user/preferences.html:55 core/views/user.py:610
 msgid "Change password"
 msgstr "Changer le mot de passe"
 
-#: core/templatetags/wger_extras.py:205 i18n.tpl:37
+#: core/templatetags/wger_extras.py:197 i18n.tpl:37
 msgid "kg"
 msgstr "kg"
 
-#: core/templatetags/wger_extras.py:207
+#: core/templatetags/wger_extras.py:199
 #: nutrition/templates/ingredient/view.html:60
 #: nutrition/templates/ingredient/view.html:66
 #: nutrition/templates/ingredient/view.html:73
@@ -1308,11 +1271,11 @@ msgctxt "weight unit, i.e. grams"
 msgid "g"
 msgstr "g"
 
-#: core/templatetags/wger_extras.py:210 i18n.tpl:38
+#: core/templatetags/wger_extras.py:202 i18n.tpl:38
 msgid "lb"
 msgstr "lb"
 
-#: core/templatetags/wger_extras.py:212
+#: core/templatetags/wger_extras.py:204
 msgctxt "weight unit, i.e. ounces"
 msgid "oz"
 msgstr "oz"
@@ -1339,13 +1302,13 @@ msgid "Delete {0}?"
 msgstr "Supprimer {0} ?"
 
 #: core/views/languages.py:111 core/views/license.py:85
-#: core/views/repetition_units.py:86 core/views/user.py:474
+#: core/views/repetition_units.py:86 core/views/user.py:473
 #: core/views/weight_units.py:86 exercises/views/categories.py:98
 #: exercises/views/equipment.py:81 exercises/views/muscles.py:87
 #: gym/views/admin_notes.py:161 gym/views/config.py:68
 #: gym/views/contract.py:186 gym/views/contract_option.py:123
 #: gym/views/contract_type.py:123 gym/views/document.py:171
-#: gym/views/gym.py:463 manager/views/day.py:100 manager/views/schedule.py:333
+#: gym/views/gym.py:463 manager/views/day.py:96 manager/views/schedule.py:333
 #: manager/views/workout.py:267 nutrition/views/ingredient.py:145
 #: nutrition/views/unit.py:143
 #, python-brace-format
@@ -1375,48 +1338,48 @@ msgstr "Envoyer"
 msgid "Your feedback was successfully sent. Thank you!"
 msgstr "Votrecommentaire a été envoyé avec succès. Merci !"
 
-#: core/views/user.py:156
+#: core/views/user.py:155
 #, python-brace-format
 msgid "Account \"{0}\" was successfully deleted"
 msgstr "Le compte « {0} » a été supprimé avec succès"
 
-#: core/views/user.py:292
+#: core/views/user.py:291
 msgid "You were successfully registered"
 msgstr "Vous avez été enregistré·e avec succès"
 
-#: core/views/user.py:351
+#: core/views/user.py:350
 msgid "Settings successfully updated"
 msgstr "Paramètres mis à jour"
 
-#: core/views/user.py:390
+#: core/views/user.py:389
 msgid "The user was successfully deactivated"
 msgstr "L'utilisateur a été correctement désactivé"
 
-#: core/views/user.py:427
+#: core/views/user.py:426
 msgid "The user was successfully activated"
 msgstr "L'utilisateur a été activé avec succès"
 
-#: core/views/user.py:442
+#: core/views/user.py:441
 msgid "Edit user"
 msgstr "Modifier l’utilisateur"
 
-#: core/views/user.py:597 gym/templates/gym/member_list.html:26
+#: core/views/user.py:596 gym/templates/gym/member_list.html:26
 #: gym/views/gym.py:158
 msgid "ID"
 msgstr "ID"
 
-#: core/views/user.py:598 gym/forms.py:95 gym/templates/contract/view.html:55
+#: core/views/user.py:597 gym/forms.py:95 gym/templates/contract/view.html:55
 #: gym/templates/gym/member_list.html:27 gym/views/export.py:59
 #: gym/views/gym.py:158 gym/views/gym.py:217
 msgid "Username"
 msgstr "Nom d’utilisateur"
 
-#: core/views/user.py:601 gym/templates/gym/new_user.html:34
+#: core/views/user.py:600 gym/templates/gym/new_user.html:34
 #: gym/views/export.py:58 gym/views/gym.py:217
 msgid "Gym"
 msgstr "Activités"
 
-#: core/views/user.py:660
+#: core/views/user.py:659
 #, python-format
 msgid "A verification email was sent to %(email)s"
 msgstr "Un email de vérification a été envoyé à %(email)s"
@@ -1569,11 +1532,6 @@ msgstr "Codec, nom long"
 msgid "Equipment list"
 msgstr "Liste d'équipement"
 
-#: exercises/templates/equipment/admin-overview.html:39
-#: exercises/views/equipment.py:92
-msgid "Add new equipment"
-msgstr "Ajouter de nouveaux équipements"
-
 #: exercises/templates/history/overview.html:11
 msgid "Exercise admin history"
 msgstr "Historique d'exercice admin"
@@ -1621,11 +1579,6 @@ msgstr "Annuler les modifications"
 msgid "Muscle overview"
 msgstr "Résumé du muscle"
 
-#: exercises/templates/muscles/admin-overview.html:38
-#: exercises/views/muscles.py:68
-msgid "Add muscle"
-msgstr "Ajouter un muscle"
-
 #: exercises/views/categories.py:72
 msgid "Add category"
 msgstr "Ajouter catégorie"
@@ -1634,6 +1587,10 @@ msgstr "Ajouter catégorie"
 msgid "This will also delete all exercises in this category."
 msgstr "Ceci supprimera également tous les exercices de la catégorie."
 
+#: exercises/views/equipment.py:92
+msgid "Add new equipment"
+msgstr "Ajouter de nouveaux équipements"
+
 #: exercises/views/equipment.py:104 exercises/views/equipment.py:115
 msgid "Delete equipment?"
 msgstr "Supprimer équipement ?"
@@ -1642,6 +1599,10 @@ msgstr "Supprimer équipement ?"
 msgid "This will delete the exercise from all workouts."
 msgstr "Ceci supprimera l'exercice de toutes les séances."
 
+#: exercises/views/muscles.py:68
+msgid "Add muscle"
+msgstr "Ajouter un muscle"
+
 #: gallery/templates/images/overview.html:62
 msgid "Add image"
 msgstr "Ajouter une image"
@@ -1731,7 +1692,7 @@ msgid "Contract is active"
 msgstr "Le contrat est actif"
 
 #: gym/models/contract.py:237 gym/templates/contract/view.html:69
-#: manager/models/schedule.py:61 manager/templates/schedule/view.html:67
+#: manager/models/schedule.py:61 manager/templates/schedule/view.html:66
 msgid "Start date"
 msgstr "Date de début"
 
@@ -1767,7 +1728,7 @@ msgstr "Administrateur : peur gérer les utilisateurs d'une salle de sport"
 msgid "Admin: can administrate the different gyms"
 msgstr "Administrateur : peut gérer les différentes salles de sport"
 
-#: gym/models/gym.py:65 gym/templates/gym/member_list.html:114
+#: gym/models/gym.py:65 gym/templates/gym/member_list.html:126
 msgid "Owner"
 msgstr "Propriétaire"
 
@@ -1779,7 +1740,7 @@ msgstr ""
 "Nombre de semaines depuis la dernière fois qu’un utilisateur s’est connecté "
 "pour le considérer comme inactif"
 
-#: gym/models/gym_config.py:56 gym/templates/gym/member_list.html:152
+#: gym/models/gym_config.py:56 gym/templates/gym/member_list.html:166
 msgid "Show name in header"
 msgstr "Afficher le nom dans l’en-tête"
 
@@ -1792,7 +1753,7 @@ msgstr "Afficher le nom de la salle de sport dans l’en-tête du site"
 msgid "Configuration for {self.gym.name}"
 msgstr "Configuration pour {self.gym.name}"
 
-#: gym/models/user_config.py:65 gym/templates/gym/member_list.html:184
+#: gym/models/user_config.py:65 gym/templates/gym/member_list.html:200
 msgid "Overview of inactive members"
 msgstr "Vue d’ensemble des membres inactifs"
 
@@ -1817,7 +1778,7 @@ msgstr "Utilisera le nom du fichier si rien n'est renseigné"
 msgid "User notes"
 msgstr "Notes de l'utilisateur"
 
-#: gym/templates/contract/list.html:36
+#: gym/templates/contract/list.html:34
 msgid "Show"
 msgstr "Afficher"
 
@@ -1845,11 +1806,11 @@ msgstr ""
 msgid "Gym list"
 msgstr "Liste d’activités"
 
-#: gym/templates/gym/list.html:50
+#: gym/templates/gym/list.html:53
 msgid "Global gym configuration"
 msgstr "Configuration globale"
 
-#: gym/templates/gym/list.html:67 gym/views/gym.py:171
+#: gym/templates/gym/list.html:69 gym/views/gym.py:171
 msgid "Add new gym"
 msgstr "Ajouter une nouvelle activité"
 
@@ -1861,43 +1822,43 @@ msgstr "Administrateurs et entraîneurs"
 msgid "Gym manager"
 msgstr "Gestionnaire d’activités"
 
-#: gym/templates/gym/member_list.html:69
+#: gym/templates/gym/member_list.html:76
 msgid "This gym has no administrators or trainers"
 msgstr "La salle de sport n’a pas d’administrateurs ou d’entraîneurs"
 
-#: gym/templates/gym/member_list.html:88
+#: gym/templates/gym/member_list.html:98
 msgid "Export"
 msgstr "Exporter"
 
-#: gym/templates/gym/member_list.html:125
+#: gym/templates/gym/member_list.html:137
 msgid "Members"
 msgstr "Membres"
 
-#: gym/templates/gym/member_list.html:145
+#: gym/templates/gym/member_list.html:159
 msgid "Gym configuration"
 msgstr "Configuration d’activités"
 
-#: gym/templates/gym/member_list.html:148
+#: gym/templates/gym/member_list.html:162
 msgid "Inactive members"
 msgstr "Membres inactifs"
 
-#: gym/templates/gym/member_list.html:149
+#: gym/templates/gym/member_list.html:163
 msgid "weeks"
 msgstr "semaines"
 
-#: gym/templates/gym/member_list.html:181
+#: gym/templates/gym/member_list.html:197
 msgid "My configuration"
 msgstr "Ma configuration"
 
-#: gym/templates/gym/member_list.html:215
+#: gym/templates/gym/member_list.html:234
 msgid "Types"
 msgstr "Types"
 
-#: gym/templates/gym/member_list.html:285
+#: gym/templates/gym/member_list.html:307
 msgid "Emails"
 msgstr "Courriels"
 
-#: gym/templates/gym/member_list.html:315
+#: gym/templates/gym/member_list.html:336
 msgid "Add member"
 msgstr "Ajouter un membre"
 
@@ -2196,28 +2157,38 @@ msgstr "Chercher aussi le nom des ingrédients en anglais"
 msgid "Unit"
 msgstr "Unité"
 
+#: manager/forms.py:191 manager/models/log.py:103 manager/models/setting.py:102
+#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
+msgid "RiR"
+msgstr "ReR"
+
 #: manager/forms.py:279
 msgid "Type"
 msgstr "Type"
 
-#: manager/forms.py:280 manager/templates/workout/view.html:113
+#: manager/forms.py:280 manager/templates/workout/view.html:122
 msgid "Table"
 msgstr "Tableau"
 
-#: manager/forms.py:282 manager/templates/workout/view.html:119
+#: manager/forms.py:282 manager/templates/workout/view.html:129
 msgid "with images"
 msgstr "avec des images"
 
-#: manager/forms.py:283 manager/templates/workout/view.html:125
+#: manager/forms.py:283 manager/templates/workout/view.html:136
 msgid "with comments"
 msgstr "avec commentaires"
 
+#: manager/helpers.py:86 manager/models/setting.py:72
+#: manager/templates/set/formset.html:9
+msgid "Reps"
+msgstr "Reps"
+
 #: manager/management/commands/email-reminders.py:121
 msgid "Workout will expire soon"
 msgstr "L’entraînement va bientôt expirer"
 
 #: manager/models/day.py:34 manager/models/log.py:58
-#: manager/models/session.py:60 manager/templates/schedule/view.html:102
+#: manager/models/session.py:60 manager/templates/schedule/view.html:101
 #: manager/templates/workout/view.html:9 manager/templates/workout/view.html:17
 #: manager/views/pdf.py:85 manager/views/pdf.py:161
 #: manager/views/schedule.py:151 manager/views/schedule.py:221
@@ -2241,7 +2212,7 @@ msgid "Name or short description of the schedule. For example 'Program XYZ'."
 msgstr ""
 "Nom ou courte description du programme. Par exemple : « Programme XYZ »."
 
-#: manager/models/schedule.py:65 manager/templates/schedule/view.html:71
+#: manager/models/schedule.py:65 manager/templates/schedule/view.html:70
 msgid "Schedule active"
 msgstr "Programme actif"
 
@@ -2255,7 +2226,7 @@ msgstr ""
 "montré, notamment sur le tableau de bord). Tous les autres programmes seront "
 "marqués comme inactifs"
 
-#: manager/models/schedule.py:77 manager/templates/schedule/view.html:81
+#: manager/models/schedule.py:77 manager/templates/schedule/view.html:80
 msgid "Is a loop"
 msgstr "Est une boucle"
 
@@ -2276,7 +2247,7 @@ msgid "The duration in weeks"
 msgstr "Durée en semaines"
 
 #: manager/models/schedule_step.py:64 manager/models/set.py:53
-#: manager/models/setting.py:113 nutrition/models/meal.py:55
+#: manager/models/setting.py:113 nutrition/models/meal.py:53
 #: nutrition/models/meal_item.py:66
 msgid "Order"
 msgstr "Ordre"
@@ -2417,7 +2388,7 @@ msgstr "Vue d'ensemble des journaux"
 msgid "Workout session"
 msgstr "Séance d'entraînement"
 
-#: manager/templates/calendar/partial_overview_table.html:27
+#: manager/templates/calendar/partial_overview_table.html:26
 msgid "Delete with logs"
 msgstr "Supprimer avec les journaux"
 
@@ -2441,21 +2412,27 @@ msgstr ""
 "existe,\n"
 "elle sera simplement modifiée. Les entrées de poids sont toujours ajoutées."
 
-#: manager/templates/schedule/overview.html:5
+#: manager/templates/schedule/overview.html:4
 msgid "Your schedules"
 msgstr "Vos programmes"
 
 #: manager/templates/schedule/overview.html:19
-#: manager/templates/schedule/view.html:131
-#: manager/templates/schedule/view.html:183
+#: manager/templates/schedule/view.html:143
+#: manager/templates/schedule/view.html:193
 #: manager/templates/workout/overview.html:16
 msgid "active"
 msgstr "actif"
 
-#: manager/templates/schedule/overview.html:28
+#: manager/templates/schedule/overview.html:27
 msgid "No schedules found."
 msgstr "Aucun programme trouvé."
 
+#: manager/templates/schedule/overview.html:28
+#, fuzzy
+#| msgid "Add one now."
+msgid "Add one now"
+msgstr "En ajouter une."
+
 #: manager/templates/schedule/overview.html:36
 msgid ""
 "Schedules are collections of workouts that you do in\n"
@@ -2465,12 +2442,20 @@ msgstr ""
 "les uns après les autres."
 
 #: manager/templates/schedule/overview.html:39
+#, fuzzy
+#| msgid ""
+#| "You can indicate how long you want to do each workout\n"
+#| "        before jumping to the next. It is also possible to create a loop, "
+#| "so you\n"
+#| "        always do the same workouts in succession, e.g. A > B > C > A > B "
+#| "> C and so on."
 msgid ""
 "You can indicate how long you want to do each workout\n"
 "        before jumping to the next. It is also possible to create a loop, so "
 "you\n"
 "        always do the same workouts in succession, e.g. A > B > C > A > B > "
-"C and so on."
+"C and so\n"
+"        on."
 msgstr ""
 "Vous pouvez indiquer combien de temps vous voulez faire chaque séance\n"
 "avant de passer à la suivante. Il est également possible de créer une "
@@ -2478,7 +2463,7 @@ msgstr ""
 "pour faire toujours les mêmes entraînements en succession, par exemple A > B "
 "> C > A > B > C etc."
 
-#: manager/templates/schedule/overview.html:43
+#: manager/templates/schedule/overview.html:44
 msgid ""
 "The currently active schedule will remain active (and be\n"
 "        shown e.g. in your dashboard) till it reaches the last workout or "
@@ -2498,7 +2483,7 @@ msgstr "Ajouter un programme"
 msgid "Schedule"
 msgstr "Programme"
 
-#: manager/templates/schedule/view.html:85
+#: manager/templates/schedule/view.html:84
 msgid ""
 "This schedule is a loop and will go through the workouts above till you "
 "deactivate it"
@@ -2506,19 +2491,19 @@ msgstr ""
 "Ce programme est une boucle et passera par toutes séances jusqu'à ce que "
 "vous l’arrêtiez"
 
-#: manager/templates/schedule/view.html:103
+#: manager/templates/schedule/view.html:102
 msgid "Weeks"
 msgstr "Semaines"
 
-#: manager/templates/schedule/view.html:115
+#: manager/templates/schedule/view.html:114
 msgid "Move me"
 msgstr "Déplacez-moi"
 
-#: manager/templates/schedule/view.html:156
+#: manager/templates/schedule/view.html:168
 msgid "Start schedule"
 msgstr "Démarrer le programme"
 
-#: manager/templates/schedule/view.html:187
+#: manager/templates/schedule/view.html:197
 #, python-format
 msgid ""
 "%(weeks)s Week\n"
@@ -2533,11 +2518,11 @@ msgstr[1] ""
 "%(weeks)s semaines\n"
 "                                "
 
-#: manager/templates/schedule/view.html:221
+#: manager/templates/schedule/view.html:231
 msgid "Adding workouts"
 msgstr "Ajout de séances"
 
-#: manager/templates/schedule/view.html:223
+#: manager/templates/schedule/view.html:233
 msgid ""
 "Add as many workouts to the schedule as you want. You can\n"
 "            edit the order by dragging and dropping them. It's also possible "
@@ -2549,48 +2534,48 @@ msgstr ""
 "Vous pouvez changer l’ordre par glisser-déposer.\n"
 "C’est également possible d’ajouter une séance plus d’une fois."
 
-#: manager/templates/schedule/view.html:232
-#: manager/templates/schedule/view.html:243
-#: manager/templates/schedule/view.html:290
+#: manager/templates/schedule/view.html:242
+#: manager/templates/schedule/view.html:256
+#: manager/templates/schedule/view.html:310
 #: manager/templates/workout/view.html:69
-#: manager/templates/workout/view.html:79
-#: manager/templates/workout/view.html:178
+#: manager/templates/workout/view.html:83
+#: manager/templates/workout/view.html:192
 msgid "Export calendar file"
 msgstr "Exporter en tant que fichier calendrier"
 
-#: manager/templates/schedule/view.html:236
+#: manager/templates/schedule/view.html:248
 msgid "Export this schedule as a calendar file."
 msgstr "Exporter ce programme dans un fichier de calendrier."
 
-#: manager/templates/schedule/view.html:237
-#: manager/templates/workout/view.html:74
+#: manager/templates/schedule/view.html:249
+#: manager/templates/workout/view.html:76
+#, fuzzy
+#| msgid ""
+#| "You can then import the file it into your calendar\n"
+#| "                        application for example google calendar, outlook "
+#| "or iCal. This will create\n"
+#| "                        an appointment for each training day with the "
+#| "appropriate exercises."
 msgid ""
 "You can then import the file it into your calendar\n"
 "                        application for example google calendar, outlook or "
 "iCal. This will create\n"
 "                        an appointment for each training day with the "
-"appropriate exercises."
+"appropriate\n"
+"                        exercises."
 msgstr ""
 "Vous pouvez ensuite importer le fichier dans votre application de "
 "calendrier,\n"
 "par exemple Google Agenda, Outlook ou iCal. Ceci va créer un rendez-vous\n"
 "pour chaque jour d'entraînement avec les exercices appropriés."
 
-#: manager/templates/schedule/view.html:258
-#: manager/templates/schedule/view.html:294
-#: manager/templates/workout/view.html:94
-#: manager/templates/workout/view.html:174
+#: manager/templates/schedule/view.html:272
+#: manager/templates/schedule/view.html:315
+#: manager/templates/workout/view.html:99
+#: manager/templates/workout/view.html:188
 msgid "Download as PDF"
 msgstr "Télécharger au format PDF"
 
-#: manager/templates/schedule/view.html:299
-msgid "Edit schedule"
-msgstr "Modifier le programme"
-
-#: manager/templates/schedule/view.html:304
-msgid "Delete schedule"
-msgstr "Supprimer le programme"
-
 #: manager/templates/set/add.html:9
 #, python-format
 msgid "Add exercises to day \"%(day_name)s\""
@@ -2672,59 +2657,6 @@ msgstr ""
 "Vous allez régulièrement recevoir ces rappels jusqu'à ce que vous entrez "
 "votre poids actuel."
 
-#: manager/templates/workout/log.html:10 manager/templates/workout/log.html:11
-msgid "Weight log"
-msgstr "Journal de pesée"
-
-#: manager/templates/workout/log.html:29
-msgid "Weight log for workout"
-msgstr "Journal de poids pour la séance"
-
-#: manager/templates/workout/log.html:49
-msgid "Add weight log to this day"
-msgstr "Ajouter un journal de poids à ce jour"
-
-#: manager/templates/workout/log.html:69
-msgid "No weight entries here."
-msgstr "Aucune entrée de poids ici."
-
-#: manager/templates/workout/log.html:77
-msgid "No exercises for this day."
-msgstr "Aucun exercice pour cette journée."
-
-#: manager/templates/workout/log.html:90
-msgid ""
-"This page shows the weight logs belonging to this workout\n"
-"only. Click on an exercise to see all the historical data for\n"
-"it."
-msgstr ""
-"Cette page affiche les journaux poids appartenant à cette séance "
-"d’entraînement\n"
-"seulement. Cliquez sur un exercice pour voir toutes les données historiques "
-"pour\n"
-"elle."
-
-#: manager/templates/workout/log.html:94
-msgid ""
-"If on a single day there is more than one entry with the\n"
-"same number of repetitions, but different weights, only the entry with the\n"
-"higher weight is shown in the diagram."
-msgstr ""
-"Si sur une seule journée, il y a plus d’une entrée avec le\n"
-"même nombre de répétitions, mais de poids différents, seul l’entrée avec le\n"
-"poids le plus élevé est indiquée sur le diagramme."
-
-#: manager/templates/workout/log.html:98
-msgid ""
-"Note that only entries with a weight unit (kg or lb) and\n"
-"repetitions are charted, other combinations such as time or until failure\n"
-"are ignored here."
-msgstr ""
-"Notez que seules les écritures avec une unité de poids (kg ou lb) et\n"
-"les répétitions sont cartographiées, d’autres combinaisons comme le temps ou "
-"jusqu'à l'échec\n"
-"sont ignorés ici."
-
 #: manager/templates/workout/overview.html:25
 msgid "No templates found."
 msgstr "Aucun modèle n'a été trouvé."
@@ -2761,27 +2693,23 @@ msgstr "Ajouter des entraînements aux jours"
 msgid "Set the repetitions for each set"
 msgstr "Définir les répétitions pour chaque série"
 
-#: manager/templates/workout/view.html:73
+#: manager/templates/workout/view.html:75
 msgid "Export this workout as a calendar file."
 msgstr "Exporter cette séance en un fichier de calendrier."
 
-#: manager/templates/workout/view.html:144
+#: manager/templates/workout/view.html:156
 msgid "Logs"
 msgstr "Journaux"
 
-#: manager/templates/workout/view.html:146
+#: manager/templates/workout/view.html:159
 msgid "View logs"
 msgstr "Voir les journaux"
 
-#: manager/templates/workout/view.html:169 manager/views/schedule_step.py:99
-msgid "Edit workout"
-msgstr "Modifier la séance"
-
-#: manager/templates/workout/view.html:182 manager/views/workout.py:281
+#: manager/templates/workout/view.html:195 manager/views/workout.py:281
 msgid "Mark as template"
 msgstr "Marquer comme modèle"
 
-#: manager/views/day.py:109
+#: manager/views/day.py:105
 msgid "Add workout day"
 msgstr "Ajouter un jour d'entrainement"
 
@@ -2798,6 +2726,10 @@ msgstr "Séance pour %s"
 msgid "Create schedule"
 msgstr "Créer un programme"
 
+#: manager/views/schedule_step.py:99
+msgid "Edit workout"
+msgstr "Modifier la séance"
+
 #: manager/views/workout.py:209
 msgid "Copy workout"
 msgstr "Copier une séance"
@@ -2922,7 +2854,7 @@ msgstr "Quantité en grammes"
 msgid "Unit amount, e.g. \"1 Cup\" or \"1/2 spoon\""
 msgstr "Quantité, par exemple « 1 tasse » ou « 1/2 cuillère »"
 
-#: nutrition/models/log.py:52 nutrition/models/meal.py:50
+#: nutrition/models/log.py:52 nutrition/models/meal.py:48
 #: nutrition/models/meal_item.py:48 nutrition/models/plan.py:108
 msgid "Nutrition plan"
 msgstr "Plan de nutrition"
@@ -2935,11 +2867,11 @@ msgstr "Repas"
 msgid "Date and Time (Approx.)"
 msgstr "Date et heure (Approx.)"
 
-#: nutrition/models/meal.py:62
+#: nutrition/models/meal.py:60
 msgid "Time (approx)"
 msgstr "Temps (approx.)"
 
-#: nutrition/models/meal.py:69
+#: nutrition/models/meal.py:67
 msgid ""
 "Give meals a textual description / name such as \"Breakfast\" or \"after "
 "workout\""
@@ -3084,10 +3016,6 @@ msgstr "Aucun ingrédient."
 msgid "Search"
 msgstr "Recherche"
 
-#: nutrition/templates/ingredient/overview.html:62
-msgid "Add ingredient"
-msgstr "Ajouter un ingrédient"
-
 #: nutrition/templates/ingredient/view.html:45 nutrition/views/plan.py:229
 msgid "Macronutrients"
 msgstr "Macronutriments"
@@ -3107,20 +3035,11 @@ msgstr "n.A."
 msgid "Others"
 msgstr "Autres"
 
-#: nutrition/templates/ingredient/view.html:144
-#: nutrition/templates/units/list.html:46 nutrition/views/unit.py:86
+#: nutrition/templates/ingredient/view.html:143
+#: nutrition/templates/units/list.html:50 nutrition/views/unit.py:86
 msgid "Add new weight unit"
 msgstr "Ajouter une nouvelle unité de poids"
 
-#: nutrition/templates/ingredient/view.html:206
-#: nutrition/templates/ingredient/view.html:209
-msgid "Edit ingredient"
-msgstr "Modifier l’ingrédient"
-
-#: nutrition/templates/ingredient/view.html:213
-msgid "Delete ingredient"
-msgstr "Supprimer l'ingrédient"
-
 #: nutrition/templates/rate/form.html:25
 msgid "Basal metabolic rate"
 msgstr "Taux métabolique basal"
@@ -3770,6 +3689,90 @@ msgstr "Supprimé avec succès."
 msgid "Delete weight entry for the %s"
 msgstr "Supprimer l’entrée de poids pour le %s"
 
+#~ msgid ""
+#~ "If a license has been localized, e.g. the Creative Commons\n"
+#~ "            licenses for the different countries, add them as separate "
+#~ "entries here."
+#~ msgstr ""
+#~ "Si une licence a été localisée, par exemple les licences Creative "
+#~ "Commons\n"
+#~ "pour les différents pays, ajoutez-les comme des entrées distinctes ici."
+
+#~ msgid "Add weight log"
+#~ msgstr "Ajouter un journal de poids"
+
+#~ msgid "This exercise has no repetitions."
+#~ msgstr "Cet exercice n'a pas de répétition."
+
+#~ msgid "Edit them now."
+#~ msgstr "Modifiez-les maintenant."
+
+#~ msgid "Add exercises to this workout day"
+#~ msgstr "Ajouter des exercices à cette séance"
+
+#~ msgid "Edit schedule"
+#~ msgstr "Modifier le programme"
+
+#~ msgid "Delete schedule"
+#~ msgstr "Supprimer le programme"
+
+#~ msgid "Weight log"
+#~ msgstr "Journal de pesée"
+
+#~ msgid "Weight log for workout"
+#~ msgstr "Journal de poids pour la séance"
+
+#~ msgid "Add weight log to this day"
+#~ msgstr "Ajouter un journal de poids à ce jour"
+
+#~ msgid "No weight entries here."
+#~ msgstr "Aucune entrée de poids ici."
+
+#~ msgid "No exercises for this day."
+#~ msgstr "Aucun exercice pour cette journée."
+
+#~ msgid ""
+#~ "This page shows the weight logs belonging to this workout\n"
+#~ "only. Click on an exercise to see all the historical data for\n"
+#~ "it."
+#~ msgstr ""
+#~ "Cette page affiche les journaux poids appartenant à cette séance "
+#~ "d’entraînement\n"
+#~ "seulement. Cliquez sur un exercice pour voir toutes les données "
+#~ "historiques pour\n"
+#~ "elle."
+
+#~ msgid ""
+#~ "If on a single day there is more than one entry with the\n"
+#~ "same number of repetitions, but different weights, only the entry with "
+#~ "the\n"
+#~ "higher weight is shown in the diagram."
+#~ msgstr ""
+#~ "Si sur une seule journée, il y a plus d’une entrée avec le\n"
+#~ "même nombre de répétitions, mais de poids différents, seul l’entrée avec "
+#~ "le\n"
+#~ "poids le plus élevé est indiquée sur le diagramme."
+
+#~ msgid ""
+#~ "Note that only entries with a weight unit (kg or lb) and\n"
+#~ "repetitions are charted, other combinations such as time or until "
+#~ "failure\n"
+#~ "are ignored here."
+#~ msgstr ""
+#~ "Notez que seules les écritures avec une unité de poids (kg ou lb) et\n"
+#~ "les répétitions sont cartographiées, d’autres combinaisons comme le temps "
+#~ "ou jusqu'à l'échec\n"
+#~ "sont ignorés ici."
+
+#~ msgid "Add ingredient"
+#~ msgstr "Ajouter un ingrédient"
+
+#~ msgid "Edit ingredient"
+#~ msgstr "Modifier l’ingrédient"
+
+#~ msgid "Delete ingredient"
+#~ msgstr "Supprimer l'ingrédient"
+
 #~ msgid "Ingredients pending review"
 #~ msgstr "Ingrédients en attente d'examen"
 
diff --git a/wger/locale/he/LC_MESSAGES/django.po b/wger/locale/he/LC_MESSAGES/django.po
index ecb8b160e..b9326fe15 100644
--- a/wger/locale/he/LC_MESSAGES/django.po
+++ b/wger/locale/he/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-07-14 15:59+0200\n"
+"POT-Creation-Date: 2024-11-14 13:09+0100\n"
 "PO-Revision-Date: 2024-05-24 13:09+0000\n"
 "Last-Translator: Tsz Hong CHAN <tomyan112@yahoo.com.hk>\n"
 "Language-Team: Hebrew <https://hosted.weblate.org/projects/wger/web/he/>\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Weblate 5.6-dev\n"
 
-#: config/models/gym_config.py:46 gym/templates/gym/list.html:53
+#: config/models/gym_config.py:46 gym/templates/gym/list.html:56
 msgid "Default gym"
 msgstr ""
 
@@ -28,28 +28,28 @@ msgid ""
 "registered users to this gym and update all existing users without a gym."
 msgstr ""
 
-#: config/views/gym_config.py:42 core/templates/language/view.html:67
-#: core/templates/license/list.html:17 core/templates/misc/license/list.html:18
+#: config/views/gym_config.py:42 core/templates/language/view.html:64
+#: core/templates/license/list.html:17
 #: core/templates/repetition_unit/list.html:18
-#: core/templates/tags/render_day.html:39
-#: core/templates/tags/render_day.html:75 core/templates/user/overview.html:204
-#: core/templates/user/overview.html:445
+#: core/templates/user/overview.html:204 core/templates/user/overview.html:467
 #: core/templates/weight_unit/list.html:18
 #: exercises/templates/categories/admin-overview.html:17
 #: exercises/templates/equipment/admin-overview.html:17
-#: exercises/templates/muscles/admin-overview.html:17
-#: gallery/views/images.py:98 gym/templates/admin_notes/list.html:32
-#: gym/templates/contract/list.html:31 gym/templates/contract/view.html:107
-#: gym/templates/contract_option/list.html:32
-#: gym/templates/contract_type/list.html:32 gym/templates/document/list.html:38
-#: gym/templates/gym/list.html:20 gym/templates/gym/list.html:46
-#: gym/templates/gym/member_list.html:87 gym/templates/gym/member_list.html:140
-#: gym/templates/gym/member_list.html:176
-#: manager/templates/calendar/day.html:68
-#: manager/templates/calendar/month.html:85
-#: manager/templates/calendar/partial_overview_table.html:18
-#: manager/templates/schedule/view.html:118
-#: nutrition/templates/ingredient/view.html:165
+#: exercises/templates/muscles/admin-overview.html:16
+#: gallery/views/images.py:98 gym/templates/admin_notes/list.html:31
+#: gym/templates/contract/list.html:30 gym/templates/contract/view.html:106
+#: gym/templates/contract_option/list.html:29
+#: gym/templates/contract_type/list.html:30 gym/templates/document/list.html:38
+#: gym/templates/gym/list.html:19 gym/templates/gym/list.html:48
+#: gym/templates/gym/member_list.html:94 gym/templates/gym/member_list.html:152
+#: gym/templates/gym/member_list.html:190
+#: manager/templates/calendar/day.html:67
+#: manager/templates/calendar/month.html:84
+#: manager/templates/calendar/partial_overview_table.html:16
+#: manager/templates/schedule/view.html:318
+#: manager/templates/workout/view.html:181
+#: nutrition/templates/ingredient/view.html:164
+#: nutrition/templates/ingredient/view.html:209
 #: nutrition/templates/units/list.html:19
 msgid "Edit"
 msgstr ""
@@ -83,8 +83,8 @@ msgstr ""
 msgid "Empty placeholder schedule"
 msgstr ""
 
-#: core/forms.py:69 core/templates/navigation.html:285
-#: core/templates/navigation.html:291 core/templates/user/login.html:4
+#: core/forms.py:69 core/templates/navigation.html:284
+#: core/templates/navigation.html:290 core/templates/user/login.html:4
 #: software/templates/features.html:82 software/templates/features.html:427
 msgid "Login"
 msgstr ""
@@ -94,14 +94,14 @@ msgstr ""
 msgid "First name"
 msgstr ""
 
-#: core/forms.py:109 core/forms.py:215 core/templates/user/overview.html:266
+#: core/forms.py:109 core/forms.py:215 core/templates/user/overview.html:284
 #: gym/views/export.py:62 gym/views/gym.py:217
 msgid "Last name"
 msgstr ""
 
-#: core/forms.py:111 core/forms.py:180 core/templates/user/overview.html:270
+#: core/forms.py:111 core/forms.py:180 core/templates/user/overview.html:288
 #: gym/models/contract.py:256 gym/models/gym.py:58
-#: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:104
+#: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:116
 #: gym/templates/gym/new_user.html:30 gym/views/export.py:60
 #: mailer/templates/mailer/gym/form.html:4
 #: mailer/templates/mailer/gym/overview.html:4
@@ -130,8 +130,8 @@ msgstr ""
 msgid "Other settings"
 msgstr ""
 
-#: core/forms.py:174 core/views/user.py:624 core/views/user.py:639
-#: core/views/user.py:651 gym/forms.py:73 manager/templates/log/add.html:65
+#: core/forms.py:174 core/views/user.py:623 core/views/user.py:638
+#: core/views/user.py:650 gym/forms.py:73 manager/templates/log/add.html:65
 #: manager/templates/set/add.html:70 manager/views/workout.py:203
 #: utils/generic_views.py:143
 msgid "Save"
@@ -154,26 +154,25 @@ msgstr ""
 msgid "Please enter your current password."
 msgstr ""
 
-#: core/forms.py:242 core/templates/language/view.html:73
-#: core/templates/license/list.html:19 core/templates/misc/license/list.html:22
-#: core/templates/repetition_unit/list.html:20
-#: core/templates/tags/render_day.html:45
-#: core/templates/tags/render_day.html:81 core/templates/user/overview.html:217
-#: core/templates/weight_unit/list.html:20
-#: exercises/templates/categories/admin-overview.html:19
-#: exercises/templates/equipment/admin-overview.html:19
-#: exercises/templates/muscles/admin-overview.html:19
-#: gym/templates/admin_notes/list.html:40
-#: gym/templates/contract_option/list.html:41
-#: gym/templates/contract_type/list.html:41 gym/templates/document/list.html:46
-#: gym/templates/gym/list.html:22 manager/templates/calendar/day.html:73
-#: manager/templates/calendar/month.html:89
-#: manager/templates/calendar/partial_overview_table.html:23
-#: manager/templates/schedule/view.html:122
-#: manager/templates/workout/view.html:188
-#: nutrition/templates/ingredient/view.html:166
+#: core/forms.py:242 core/templates/language/view.html:70
+#: core/templates/license/list.html:21
+#: core/templates/repetition_unit/list.html:22
+#: core/templates/user/overview.html:233
+#: core/templates/weight_unit/list.html:22
+#: exercises/templates/categories/admin-overview.html:21
+#: exercises/templates/equipment/admin-overview.html:21
+#: exercises/templates/muscles/admin-overview.html:20
+#: gym/templates/admin_notes/list.html:37
+#: gym/templates/contract_option/list.html:35
+#: gym/templates/contract_type/list.html:36 gym/templates/document/list.html:46
+#: gym/templates/gym/list.html:23 manager/templates/calendar/day.html:73
+#: manager/templates/calendar/month.html:88
+#: manager/templates/calendar/partial_overview_table.html:22
+#: manager/templates/schedule/view.html:324
+#: manager/templates/workout/view.html:202
+#: nutrition/templates/ingredient/view.html:168
 #: nutrition/templates/ingredient/view.html:215
-#: nutrition/templates/units/list.html:22
+#: nutrition/templates/units/list.html:25
 msgid "Delete"
 msgstr ""
 
@@ -185,9 +184,9 @@ msgstr ""
 msgid "The form is secured with reCAPTCHA"
 msgstr ""
 
-#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:285
-#: core/templates/navigation.html:297 core/templates/template.html:149
-#: core/templates/user/login.html:20 core/views/user.py:298
+#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:284
+#: core/templates/navigation.html:296 core/templates/template.html:151
+#: core/templates/user/login.html:20 core/views/user.py:297
 #: software/templates/features.html:87 software/templates/features.html:422
 msgid "Register"
 msgstr ""
@@ -420,18 +419,18 @@ msgid "The sum of all hours has to be 24"
 msgstr ""
 
 #: core/models/rep_unit.py:36 core/models/weight_unit.py:36
-#: core/templates/user/overview.html:262 core/views/user.py:599
+#: core/templates/user/overview.html:280 core/views/user.py:598
 #: exercises/models/category.py:29 exercises/models/equipment.py:29
 #: exercises/models/exercise.py:59 exercises/models/muscle.py:36
 #: gym/models/contract.py:52 gym/models/contract.py:103 gym/models/gym.py:46
 #: gym/models/user_document.py:84 gym/templates/contract/view.html:50
-#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:96
+#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:108
 #: gym/views/gym.py:158 manager/models/schedule.py:55
 #: manager/models/workout.py:57 measurements/models/category.py:36
 #: nutrition/models/ingredient.py:111
-#: nutrition/models/ingredient_category.py:27 nutrition/models/meal.py:67
+#: nutrition/models/ingredient_category.py:27 nutrition/models/meal.py:65
 #: nutrition/models/weight_unit.py:38
-#: nutrition/templates/ingredient/view.html:152
+#: nutrition/templates/ingredient/view.html:151
 msgid "Name"
 msgstr ""
 
@@ -476,7 +475,7 @@ msgstr ""
 msgid "Back to \"%(target)s\""
 msgstr ""
 
-#: core/templates/delete.html:15
+#: core/templates/delete.html:4
 msgid "Are you sure you want to delete this? This action cannot be undone."
 msgstr ""
 
@@ -528,7 +527,7 @@ msgstr ""
 msgid "Dashboard"
 msgstr ""
 
-#: core/templates/language/overview.html:4 core/templates/navigation.html:345
+#: core/templates/language/overview.html:4 core/templates/navigation.html:344
 msgid "Languages"
 msgstr ""
 
@@ -538,79 +537,72 @@ msgstr ""
 
 #: core/templates/language/overview.html:22
 #: manager/templates/calendar/month.html:132
-#: manager/templates/schedule/overview.html:28
-#: manager/templates/schedule/view.html:144
+#: manager/templates/schedule/view.html:154
 #: manager/templates/workout/overview.html:28
 #: nutrition/templates/ingredient/overview.html:38
 msgid "Add one now."
 msgstr ""
 
-#: core/templates/language/overview.html:35 core/templates/license/list.html:40
-#: core/templates/misc/license/list.html:43
-#: core/templates/repetition_unit/list.html:43
-#: core/templates/user/overview.html:326 core/templates/user/overview.html:365
-#: core/templates/user/overview.html:401
-#: core/templates/weight_unit/list.html:43 core/views/languages.py:74
+#: core/templates/language/overview.html:34 core/templates/license/list.html:43
+#: core/templates/repetition_unit/list.html:46
+#: core/templates/user/overview.html:344 core/templates/user/overview.html:384
+#: core/templates/user/overview.html:422
+#: core/templates/weight_unit/list.html:46 core/views/languages.py:74
 #: core/views/license.py:66 core/views/repetition_units.py:66
 #: core/views/weight_units.py:66
-#: exercises/templates/categories/admin-overview.html:38
-#: gallery/views/images.py:63 gym/templates/admin_notes/list.html:67
-#: gym/templates/contract/list.html:73
-#: gym/templates/contract_option/list.html:72
-#: gym/templates/contract_type/list.html:72 gym/templates/document/list.html:79
-#: gym/templates/gym/member_list.html:211
-#: gym/templates/gym/member_list.html:244
-#: gym/templates/gym/member_list.html:281
+#: exercises/templates/categories/admin-overview.html:40
+#: exercises/templates/equipment/admin-overview.html:39
+#: exercises/templates/muscles/admin-overview.html:40
+#: gallery/views/images.py:63 gym/templates/admin_notes/list.html:64
+#: gym/templates/contract/list.html:69
+#: gym/templates/contract_option/list.html:65
+#: gym/templates/contract_type/list.html:66 gym/templates/document/list.html:78
+#: gym/templates/gym/member_list.html:228
+#: gym/templates/gym/member_list.html:264
+#: gym/templates/gym/member_list.html:303
 #: mailer/templates/mailer/gym/overview.html:43
+#: nutrition/templates/ingredient/overview.html:60
 msgid "Add"
 msgstr ""
 
 #: core/templates/language/view.html:61 core/templates/user/api_key.html:44
-#: core/templates/user/preferences.html:45 gym/models/contract.py:203
-#: gym/templates/contract/view.html:41 gym/templates/contract/view.html:106
-#: gym/templates/gym/member_list.html:248
-#: manager/templates/schedule/view.html:285
-#: manager/templates/workout/view.html:163
-#: nutrition/templates/ingredient/view.html:202
+#: core/templates/user/preferences.html:50 gym/models/contract.py:203
+#: gym/templates/contract/view.html:41 gym/templates/gym/member_list.html:270
+#: manager/templates/schedule/view.html:304
+#: manager/templates/workout/view.html:177
+#: nutrition/templates/ingredient/view.html:206
 msgid "Options"
 msgstr ""
 
-#: core/templates/license/list.html:4 core/templates/misc/license/list.html:4
+#: core/templates/license/list.html:4
 msgid "License list"
 msgstr ""
 
-#: core/templates/license/list.html:26 core/templates/misc/license/list.html:30
-#: core/templates/repetition_unit/list.html:28
+#: core/templates/license/list.html:30
+#: core/templates/repetition_unit/list.html:32
 #: core/templates/user/overview.html:104 core/templates/user/overview.html:136
-#: core/templates/user/overview.html:185 core/templates/user/overview.html:347
-#: core/templates/user/overview.html:383 core/templates/user/overview.html:427
-#: core/templates/weight_unit/list.html:28
-#: exercises/templates/categories/admin-overview.html:26
-#: exercises/templates/equipment/admin-overview.html:26
-#: exercises/templates/muscles/admin-overview.html:26
-#: gym/templates/admin_notes/list.html:52 gym/templates/contract/list.html:60
-#: gym/templates/contract_option/list.html:58
-#: gym/templates/contract_type/list.html:58 gym/templates/document/list.html:64
-#: gym/templates/gym/list.html:29 gym/templates/gym/member_list.html:229
-#: gym/templates/gym/member_list.html:262
-#: gym/templates/gym/member_list.html:299
+#: core/templates/user/overview.html:185 core/templates/user/overview.html:365
+#: core/templates/user/overview.html:404 core/templates/user/overview.html:448
+#: core/templates/weight_unit/list.html:32
+#: exercises/templates/categories/admin-overview.html:30
+#: exercises/templates/equipment/admin-overview.html:30
+#: exercises/templates/muscles/admin-overview.html:29
+#: gym/templates/admin_notes/list.html:50 gym/templates/contract/list.html:57
+#: gym/templates/contract_option/list.html:52
+#: gym/templates/contract_type/list.html:53 gym/templates/document/list.html:64
+#: gym/templates/gym/list.html:32 gym/templates/gym/member_list.html:248
+#: gym/templates/gym/member_list.html:284
+#: gym/templates/gym/member_list.html:321
 #: mailer/templates/mailer/gym/overview.html:30
-#: manager/templates/calendar/day.html:87
-#: nutrition/templates/units/list.html:29
+#: manager/templates/calendar/day.html:88
+#: nutrition/templates/units/list.html:34
 msgid "Nothing found"
 msgstr ""
 
-#: core/templates/misc/about.html:4 core/templates/template.html:175
+#: core/templates/misc/about.html:4 core/templates/template.html:188
 msgid "Imprint"
 msgstr ""
 
-#: core/templates/misc/license/list.html:47
-msgid ""
-"If a license has been localized, e.g. the Creative Commons\n"
-"            licenses for the different countries, add them as separate "
-"entries here."
-msgstr ""
-
 #: core/templates/navigation.html:28 software/templates/features.html:437
 msgid "Training"
 msgstr ""
@@ -655,8 +647,8 @@ msgstr ""
 msgid "Exercises"
 msgstr ""
 
-#: core/templates/navigation.html:111 core/templates/navigation.html:184
-#: core/templates/navigation.html:340
+#: core/templates/navigation.html:111 core/templates/navigation.html:185
+#: core/templates/navigation.html:339
 msgid "Administration"
 msgstr ""
 
@@ -693,87 +685,87 @@ msgstr ""
 msgid "Daily calories calculator"
 msgstr ""
 
-#: core/templates/navigation.html:179
+#: core/templates/navigation.html:180
 #: nutrition/templates/ingredient/overview.html:10
 msgid "Ingredient overview"
 msgstr ""
 
-#: core/templates/navigation.html:187 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:189 nutrition/templates/units/list.html:6
 msgid "Ingredient weight units"
 msgstr ""
 
-#: core/templates/navigation.html:203 software/templates/features.html:442
+#: core/templates/navigation.html:205 software/templates/features.html:442
 msgid "Body weight"
 msgstr ""
 
-#: core/templates/navigation.html:210 core/templates/user/overview.html:114
+#: core/templates/navigation.html:212 core/templates/user/overview.html:114
 msgid "Weight overview"
 msgstr ""
 
-#: core/templates/navigation.html:217 weight/views.py:65
+#: core/templates/navigation.html:216 weight/views.py:65
 msgid "Add weight entry"
 msgstr ""
 
-#: core/templates/navigation.html:231
+#: core/templates/navigation.html:230
 msgid "About this software"
 msgstr ""
 
-#: core/templates/navigation.html:237 software/templates/about_us.html:5
+#: core/templates/navigation.html:236 software/templates/about_us.html:5
 msgid "About us"
 msgstr ""
 
-#: core/templates/navigation.html:243 software/templates/features.html:507
+#: core/templates/navigation.html:242 software/templates/features.html:507
 msgid "REST API"
 msgstr ""
 
-#: core/templates/navigation.html:249 utils/models.py:45
+#: core/templates/navigation.html:248 utils/models.py:45
 msgid "License"
 msgstr ""
 
-#: core/templates/navigation.html:255
+#: core/templates/navigation.html:254
 msgid "Developer documentation"
 msgstr ""
 
-#: core/templates/navigation.html:262
+#: core/templates/navigation.html:261
 msgid "Get the code"
 msgstr ""
 
-#: core/templates/navigation.html:269 core/templates/template.html:214
+#: core/templates/navigation.html:268 core/templates/template.html:227
 #: software/templates/features.html:582
 msgid "Translate"
 msgstr ""
 
-#: core/templates/navigation.html:303 core/templates/user/login.html:28
+#: core/templates/navigation.html:302 core/templates/user/login.html:28
 msgid "Reset password"
 msgstr ""
 
-#: core/templates/navigation.html:321
+#: core/templates/navigation.html:320
 msgid "My preferences"
 msgstr ""
 
-#: core/templates/navigation.html:330
+#: core/templates/navigation.html:329
 msgid "Logout"
 msgstr ""
 
-#: core/templates/navigation.html:353
+#: core/templates/navigation.html:352
 msgid "Licenses"
 msgstr ""
 
-#: core/templates/navigation.html:361
+#: core/templates/navigation.html:360
 #: core/templates/repetition_unit/list.html:4
 msgid "Repetition units"
 msgstr ""
 
-#: core/templates/navigation.html:369 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:368 core/templates/weight_unit/list.html:4
 #: nutrition/templates/ingredient/view.html:141
 msgid "Weight units"
 msgstr ""
 
-#: core/templates/navigation.html:377 core/templates/user/list.html:4
+#: core/templates/navigation.html:376 core/templates/user/list.html:4
 msgid "User list"
 msgstr ""
 
-#: core/templates/navigation.html:383
+#: core/templates/navigation.html:382
 msgid "Gyms"
 msgstr ""
 
@@ -832,55 +824,28 @@ msgstr ""
 msgid "next"
 msgstr ""
 
-#: core/templates/tags/render_day.html:34
-msgid "Add weight log"
+#: core/templates/tags/render_day.html:44
+msgid "Placeholder image for translation"
 msgstr ""
 
-#: core/templates/tags/render_day.html:116
-msgid "Placeholder image for exercise"
-msgstr ""
-
-#: core/templates/tags/render_day.html:133
-msgid "This exercise has no repetitions."
-msgstr ""
-
-#: core/templates/tags/render_day.html:136
-msgid "Edit them now."
-msgstr ""
-
-#: core/templates/tags/render_day.html:162
-msgid "Add exercises to this workout day"
-msgstr ""
-
-#: core/templates/tags/render_weight_log.html:17 manager/helpers.py:86
-#: manager/models/setting.py:72 manager/templates/set/formset.html:9
-msgid "Reps"
-msgstr ""
-
-#: core/templates/tags/render_weight_log.html:30 manager/forms.py:191
-#: manager/models/log.py:103 manager/models/setting.py:102
-#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
-msgid "RiR"
-msgstr ""
-
-#: core/templates/template.html:122 manager/templates/calendar/month.html:138
-#: manager/templates/schedule/view.html:248
-#: manager/templates/schedule/view.html:269
-#: manager/templates/workout/view.html:84
-#: manager/templates/workout/view.html:137
+#: core/templates/template.html:124 manager/templates/calendar/month.html:138
+#: manager/templates/schedule/view.html:262
+#: manager/templates/schedule/view.html:287
+#: manager/templates/workout/view.html:89
+#: manager/templates/workout/view.html:149
 msgid "Close"
 msgstr ""
 
-#: core/templates/template.html:138
+#: core/templates/template.html:140
 msgid ""
 "You are using a guest account, data entered will be deleted after a week."
 msgstr ""
 
-#: core/templates/template.html:143
+#: core/templates/template.html:145
 msgid "Create some demo entries"
 msgstr ""
 
-#: core/templates/template.html:180 software/templates/features.html:547
+#: core/templates/template.html:193 software/templates/features.html:547
 #: software/templates/tos.html:7
 msgid "Terms of service"
 msgstr ""
@@ -889,7 +854,7 @@ msgstr ""
 msgid "Features"
 msgstr ""
 
-#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:54
+#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:59
 msgid "API key"
 msgstr ""
 
@@ -928,17 +893,17 @@ msgstr ""
 msgid "Documentation"
 msgstr ""
 
-#: core/templates/user/delete_account.html:4
-#: core/templates/user/preferences.html:59
+#: core/templates/user/delete_account.html:3
+#: core/templates/user/preferences.html:62
 msgid "Delete account"
 msgstr ""
 
-#: core/templates/user/delete_account.html:17
+#: core/templates/user/delete_account.html:9
 #: exercises/templates/history/overview.html:93
 msgid "Are you sure?"
 msgstr ""
 
-#: core/templates/user/delete_account.html:22
+#: core/templates/user/delete_account.html:14
 #, python-format
 msgid ""
 "This action will delete the user account \"%(username)s\".\n"
@@ -957,22 +922,22 @@ msgstr ""
 
 #: core/templates/user/overview.html:25 core/templates/user/overview.html:68
 #: core/templates/user/overview.html:112 core/templates/user/overview.html:144
-#: core/templates/user/overview.html:330 core/templates/user/overview.html:369
-#: core/templates/user/overview.html:405
+#: core/templates/user/overview.html:348 core/templates/user/overview.html:390
+#: core/templates/user/overview.html:426
 #, python-format
 msgid "last %(number)s"
 msgstr ""
 
 #: core/templates/user/overview.html:27 core/templates/user/overview.html:146
-#: core/templates/user/overview.html:325 core/templates/user/overview.html:364
-#: core/templates/user/overview.html:400 gym/templates/gym/member_list.html:210
-#: gym/templates/gym/member_list.html:243
-#: gym/templates/gym/member_list.html:280
+#: core/templates/user/overview.html:343 core/templates/user/overview.html:382
+#: core/templates/user/overview.html:421 gym/templates/gym/member_list.html:226
+#: gym/templates/gym/member_list.html:262
+#: gym/templates/gym/member_list.html:302
 msgid "Overview"
 msgstr ""
 
 #: core/templates/user/overview.html:28
-#: manager/templates/schedule/view.html:163
+#: manager/templates/schedule/view.html:172
 #: manager/templates/workout/overview.html:39 manager/views/schedule_step.py:60
 msgid "Add workout"
 msgstr ""
@@ -1004,38 +969,36 @@ msgstr ""
 msgid "Number of logs (days)"
 msgstr ""
 
-#: core/templates/user/overview.html:37 core/views/user.py:600
+#: core/templates/user/overview.html:37 core/views/user.py:599
 #: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:158
 msgid "Last activity"
 msgstr ""
 
 #: core/templates/user/overview.html:58
 #: manager/templates/calendar/month.html:128
-#: manager/templates/schedule/view.html:144
 #: manager/templates/workout/overview.html:28
 msgid "No workouts found."
 msgstr ""
 
 #: core/templates/user/overview.html:68 manager/forms.py:280
-#: manager/templates/workout/view.html:106
+#: manager/templates/workout/view.html:114
 msgid "Log"
 msgstr ""
 
 #: core/templates/user/overview.html:77 manager/models/session.py:83
-#: manager/templates/calendar/partial_overview_table.html:52
+#: manager/templates/calendar/partial_overview_table.html:54
 msgid "General impression"
 msgstr ""
 
-#: core/templates/user/overview.html:78 core/templates/user/overview.html:369
+#: core/templates/user/overview.html:78 core/templates/user/overview.html:390
 #: manager/models/session.py:73
-#: manager/templates/calendar/partial_overview_table.html:56
-#: manager/templates/workout/log.html:89
+#: manager/templates/calendar/partial_overview_table.html:58
 msgid "Notes"
 msgstr ""
 
 #: core/templates/user/overview.html:79
 #: exercises/templates/history/overview.html:30
-#: manager/templates/calendar/partial_overview_table.html:42
+#: manager/templates/calendar/partial_overview_table.html:44
 msgid "Time"
 msgstr ""
 
@@ -1073,121 +1036,121 @@ msgstr ""
 msgid "kcal"
 msgstr ""
 
-#: core/templates/user/overview.html:201 core/templates/user/overview.html:322
-#: core/templates/user/overview.html:361 core/templates/user/overview.html:397
-#: core/templates/user/overview.html:442 gym/templates/gym/list.html:42
-#: gym/templates/gym/member_list.html:84 gym/templates/gym/member_list.html:137
-#: gym/templates/gym/member_list.html:173
-#: gym/templates/gym/member_list.html:207
-#: gym/templates/gym/member_list.html:240
-#: gym/templates/gym/member_list.html:277
-#: manager/templates/schedule/view.html:100
+#: core/templates/user/overview.html:201 core/templates/user/overview.html:340
+#: core/templates/user/overview.html:379 core/templates/user/overview.html:418
+#: core/templates/user/overview.html:463 gym/templates/gym/list.html:45
+#: gym/templates/gym/member_list.html:91 gym/templates/gym/member_list.html:149
+#: gym/templates/gym/member_list.html:187
+#: gym/templates/gym/member_list.html:223
+#: gym/templates/gym/member_list.html:259
+#: gym/templates/gym/member_list.html:299
+#: manager/templates/schedule/view.html:99
 msgid "Actions"
 msgstr ""
 
-#: core/templates/user/overview.html:207
+#: core/templates/user/overview.html:210
 msgid "Deactivate user"
 msgstr ""
 
-#: core/templates/user/overview.html:209
+#: core/templates/user/overview.html:214
 msgid "Activate user"
 msgstr ""
 
-#: core/templates/user/overview.html:211
+#: core/templates/user/overview.html:223
 msgid "Reset user password"
 msgstr ""
 
-#: core/templates/user/overview.html:214 gym/templates/gym/member_list.html:30
+#: core/templates/user/overview.html:227 gym/templates/gym/member_list.html:30
 msgid "Roles"
 msgstr ""
 
-#: core/templates/user/overview.html:225
+#: core/templates/user/overview.html:243
 msgid "Password reset confirmation"
 msgstr ""
 
-#: core/templates/user/overview.html:229
+#: core/templates/user/overview.html:247
 msgid "Do you really want to change this user&#39;s password?"
 msgstr ""
 
-#: core/templates/user/overview.html:232
+#: core/templates/user/overview.html:250
 #: exercises/templates/history/overview.html:106
 msgid "No"
 msgstr ""
 
-#: core/templates/user/overview.html:233
+#: core/templates/user/overview.html:251
 #: exercises/templates/history/overview.html:99
 msgid "Yes"
 msgstr ""
 
-#: core/templates/user/overview.html:254 gym/templates/gym/member_list.html:93
+#: core/templates/user/overview.html:272 gym/templates/gym/member_list.html:105
 msgid "Details"
 msgstr ""
 
-#: core/templates/user/overview.html:258 gym/views/export.py:57
-#: manager/helpers.py:86 manager/templates/schedule/view.html:98
+#: core/templates/user/overview.html:276 gym/views/export.py:57
+#: manager/helpers.py:86 manager/templates/schedule/view.html:97
 msgid "Nr."
 msgstr ""
 
-#: core/templates/user/overview.html:280 gym/models/contract.py:287
+#: core/templates/user/overview.html:298 gym/models/contract.py:287
 #: gym/models/gym.py:50 gym/templates/contract/view.html:75
-#: gym/templates/gym/member_list.html:100 gym/views/export.py:68
+#: gym/templates/gym/member_list.html:112 gym/views/export.py:68
 msgid "Phone"
 msgstr ""
 
-#: core/templates/user/overview.html:284 gym/templates/contract/view.html:87
-#: gym/templates/gym/member_list.html:118
+#: core/templates/user/overview.html:302 gym/templates/contract/view.html:87
+#: gym/templates/gym/member_list.html:130
 msgid "Address"
 msgstr ""
 
-#: core/templates/user/overview.html:295
+#: core/templates/user/overview.html:313
 msgid "Registered"
 msgstr ""
 
-#: core/templates/user/overview.html:299
+#: core/templates/user/overview.html:317
 msgid "Last login"
 msgstr ""
 
-#: core/templates/user/overview.html:304
+#: core/templates/user/overview.html:322
 msgid "Status"
 msgstr ""
 
-#: core/templates/user/overview.html:307
+#: core/templates/user/overview.html:325
 msgid "Active"
 msgstr ""
 
-#: core/templates/user/overview.html:309
+#: core/templates/user/overview.html:327
 msgid "Inactive"
 msgstr ""
 
-#: core/templates/user/overview.html:330 gym/templates/contract/list.html:4
-#: gym/templates/gym/member_list.html:202
+#: core/templates/user/overview.html:348 gym/templates/contract/list.html:4
+#: gym/templates/gym/member_list.html:218
 msgid "Contracts"
 msgstr ""
 
-#: core/templates/user/overview.html:405 gym/templates/document/list.html:4
+#: core/templates/user/overview.html:426 gym/templates/document/list.html:4
 msgid "Documents"
 msgstr ""
 
-#: core/templates/user/overview.html:412 gym/templates/document/list.html:32
-#: manager/forms.py:292 manager/templates/workout/view.html:132
+#: core/templates/user/overview.html:433 gym/templates/document/list.html:33
+#: manager/forms.py:292 manager/templates/workout/view.html:143
 msgid "Download"
 msgstr "הורדה"
 
-#: core/templates/user/overview.html:450 gym/views/admin_config.py:44
+#: core/templates/user/overview.html:474 gym/views/admin_config.py:44
 #: gym/views/admin_config.py:58 gym/views/user_config.py:46
 msgid "Configuration"
 msgstr ""
 
-#: core/templates/user/overview.html:453 gym/models/user_config.py:92
+#: core/templates/user/overview.html:477 gym/models/user_config.py:92
 msgid "Include in inactive overview"
 msgstr ""
 
-#: core/templates/user/overview.html:486
+#: core/templates/user/overview.html:510
 #, python-format
 msgid "Admin login is only available for users in %(gym_name)s"
 msgstr ""
 
-#: core/templates/user/overview.html:490
+#: core/templates/user/overview.html:514
 msgid "Log in as this user"
 msgstr ""
 
@@ -1207,19 +1170,19 @@ msgstr ""
 msgid "Send verification email"
 msgstr ""
 
-#: core/templates/user/preferences.html:30
+#: core/templates/user/preferences.html:31
 msgid "You need to verify your email to contribute exercises"
 msgstr ""
 
-#: core/templates/user/preferences.html:50 core/views/user.py:611
+#: core/templates/user/preferences.html:55 core/views/user.py:610
 msgid "Change password"
 msgstr ""
 
-#: core/templatetags/wger_extras.py:205 i18n.tpl:37
+#: core/templatetags/wger_extras.py:197 i18n.tpl:37
 msgid "kg"
 msgstr ""
 
-#: core/templatetags/wger_extras.py:207
+#: core/templatetags/wger_extras.py:199
 #: nutrition/templates/ingredient/view.html:60
 #: nutrition/templates/ingredient/view.html:66
 #: nutrition/templates/ingredient/view.html:73
@@ -1231,11 +1194,11 @@ msgctxt "weight unit, i.e. grams"
 msgid "g"
 msgstr ""
 
-#: core/templatetags/wger_extras.py:210 i18n.tpl:38
+#: core/templatetags/wger_extras.py:202 i18n.tpl:38
 msgid "lb"
 msgstr ""
 
-#: core/templatetags/wger_extras.py:212
+#: core/templatetags/wger_extras.py:204
 msgctxt "weight unit, i.e. ounces"
 msgid "oz"
 msgstr ""
@@ -1262,13 +1225,13 @@ msgid "Delete {0}?"
 msgstr ""
 
 #: core/views/languages.py:111 core/views/license.py:85
-#: core/views/repetition_units.py:86 core/views/user.py:474
+#: core/views/repetition_units.py:86 core/views/user.py:473
 #: core/views/weight_units.py:86 exercises/views/categories.py:98
 #: exercises/views/equipment.py:81 exercises/views/muscles.py:87
 #: gym/views/admin_notes.py:161 gym/views/config.py:68
 #: gym/views/contract.py:186 gym/views/contract_option.py:123
 #: gym/views/contract_type.py:123 gym/views/document.py:171
-#: gym/views/gym.py:463 manager/views/day.py:100 manager/views/schedule.py:333
+#: gym/views/gym.py:463 manager/views/day.py:96 manager/views/schedule.py:333
 #: manager/views/workout.py:267 nutrition/views/ingredient.py:145
 #: nutrition/views/unit.py:143
 #, python-brace-format
@@ -1294,48 +1257,48 @@ msgstr ""
 msgid "Your feedback was successfully sent. Thank you!"
 msgstr ""
 
-#: core/views/user.py:156
+#: core/views/user.py:155
 #, python-brace-format
 msgid "Account \"{0}\" was successfully deleted"
 msgstr ""
 
-#: core/views/user.py:292
+#: core/views/user.py:291
 msgid "You were successfully registered"
 msgstr ""
 
-#: core/views/user.py:351
+#: core/views/user.py:350
 msgid "Settings successfully updated"
 msgstr ""
 
-#: core/views/user.py:390
+#: core/views/user.py:389
 msgid "The user was successfully deactivated"
 msgstr ""
 
-#: core/views/user.py:427
+#: core/views/user.py:426
 msgid "The user was successfully activated"
 msgstr ""
 
-#: core/views/user.py:442
+#: core/views/user.py:441
 msgid "Edit user"
 msgstr ""
 
-#: core/views/user.py:597 gym/templates/gym/member_list.html:26
+#: core/views/user.py:596 gym/templates/gym/member_list.html:26
 #: gym/views/gym.py:158
 msgid "ID"
 msgstr ""
 
-#: core/views/user.py:598 gym/forms.py:95 gym/templates/contract/view.html:55
+#: core/views/user.py:597 gym/forms.py:95 gym/templates/contract/view.html:55
 #: gym/templates/gym/member_list.html:27 gym/views/export.py:59
 #: gym/views/gym.py:158 gym/views/gym.py:217
 msgid "Username"
 msgstr ""
 
-#: core/views/user.py:601 gym/templates/gym/new_user.html:34
+#: core/views/user.py:600 gym/templates/gym/new_user.html:34
 #: gym/views/export.py:58 gym/views/gym.py:217
 msgid "Gym"
 msgstr ""
 
-#: core/views/user.py:660
+#: core/views/user.py:659
 #, python-format
 msgid "A verification email was sent to %(email)s"
 msgstr ""
@@ -1485,11 +1448,6 @@ msgstr ""
 msgid "Equipment list"
 msgstr ""
 
-#: exercises/templates/equipment/admin-overview.html:39
-#: exercises/views/equipment.py:92
-msgid "Add new equipment"
-msgstr ""
-
 #: exercises/templates/history/overview.html:11
 msgid "Exercise admin history"
 msgstr ""
@@ -1537,11 +1495,6 @@ msgstr ""
 msgid "Muscle overview"
 msgstr ""
 
-#: exercises/templates/muscles/admin-overview.html:38
-#: exercises/views/muscles.py:68
-msgid "Add muscle"
-msgstr ""
-
 #: exercises/views/categories.py:72
 msgid "Add category"
 msgstr ""
@@ -1550,6 +1503,10 @@ msgstr ""
 msgid "This will also delete all exercises in this category."
 msgstr ""
 
+#: exercises/views/equipment.py:92
+msgid "Add new equipment"
+msgstr ""
+
 #: exercises/views/equipment.py:104 exercises/views/equipment.py:115
 msgid "Delete equipment?"
 msgstr ""
@@ -1558,6 +1515,10 @@ msgstr ""
 msgid "This will delete the exercise from all workouts."
 msgstr ""
 
+#: exercises/views/muscles.py:68
+msgid "Add muscle"
+msgstr ""
+
 #: gallery/templates/images/overview.html:62
 msgid "Add image"
 msgstr ""
@@ -1643,7 +1604,7 @@ msgid "Contract is active"
 msgstr ""
 
 #: gym/models/contract.py:237 gym/templates/contract/view.html:69
-#: manager/models/schedule.py:61 manager/templates/schedule/view.html:67
+#: manager/models/schedule.py:61 manager/templates/schedule/view.html:66
 msgid "Start date"
 msgstr ""
 
@@ -1679,7 +1640,7 @@ msgstr ""
 msgid "Admin: can administrate the different gyms"
 msgstr ""
 
-#: gym/models/gym.py:65 gym/templates/gym/member_list.html:114
+#: gym/models/gym.py:65 gym/templates/gym/member_list.html:126
 msgid "Owner"
 msgstr ""
 
@@ -1689,7 +1650,7 @@ msgid ""
 "considered inactive"
 msgstr ""
 
-#: gym/models/gym_config.py:56 gym/templates/gym/member_list.html:152
+#: gym/models/gym_config.py:56 gym/templates/gym/member_list.html:166
 msgid "Show name in header"
 msgstr ""
 
@@ -1702,7 +1663,7 @@ msgstr ""
 msgid "Configuration for {self.gym.name}"
 msgstr ""
 
-#: gym/models/user_config.py:65 gym/templates/gym/member_list.html:184
+#: gym/models/user_config.py:65 gym/templates/gym/member_list.html:200
 msgid "Overview of inactive members"
 msgstr ""
 
@@ -1726,7 +1687,7 @@ msgstr ""
 msgid "User notes"
 msgstr ""
 
-#: gym/templates/contract/list.html:36
+#: gym/templates/contract/list.html:34
 msgid "Show"
 msgstr ""
 
@@ -1752,11 +1713,11 @@ msgstr ""
 msgid "Gym list"
 msgstr ""
 
-#: gym/templates/gym/list.html:50
+#: gym/templates/gym/list.html:53
 msgid "Global gym configuration"
 msgstr ""
 
-#: gym/templates/gym/list.html:67 gym/views/gym.py:171
+#: gym/templates/gym/list.html:69 gym/views/gym.py:171
 msgid "Add new gym"
 msgstr ""
 
@@ -1768,43 +1729,43 @@ msgstr ""
 msgid "Gym manager"
 msgstr ""
 
-#: gym/templates/gym/member_list.html:69
+#: gym/templates/gym/member_list.html:76
 msgid "This gym has no administrators or trainers"
 msgstr ""
 
-#: gym/templates/gym/member_list.html:88
+#: gym/templates/gym/member_list.html:98
 msgid "Export"
 msgstr ""
 
-#: gym/templates/gym/member_list.html:125
+#: gym/templates/gym/member_list.html:137
 msgid "Members"
 msgstr ""
 
-#: gym/templates/gym/member_list.html:145
+#: gym/templates/gym/member_list.html:159
 msgid "Gym configuration"
 msgstr ""
 
-#: gym/templates/gym/member_list.html:148
+#: gym/templates/gym/member_list.html:162
 msgid "Inactive members"
 msgstr ""
 
-#: gym/templates/gym/member_list.html:149
+#: gym/templates/gym/member_list.html:163
 msgid "weeks"
 msgstr ""
 
-#: gym/templates/gym/member_list.html:181
+#: gym/templates/gym/member_list.html:197
 msgid "My configuration"
 msgstr ""
 
-#: gym/templates/gym/member_list.html:215
+#: gym/templates/gym/member_list.html:234
 msgid "Types"
 msgstr ""
 
-#: gym/templates/gym/member_list.html:285
+#: gym/templates/gym/member_list.html:307
 msgid "Emails"
 msgstr ""
 
-#: gym/templates/gym/member_list.html:315
+#: gym/templates/gym/member_list.html:336
 msgid "Add member"
 msgstr ""
 
@@ -2089,28 +2050,38 @@ msgstr ""
 msgid "Unit"
 msgstr ""
 
+#: manager/forms.py:191 manager/models/log.py:103 manager/models/setting.py:102
+#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
+msgid "RiR"
+msgstr ""
+
 #: manager/forms.py:279
 msgid "Type"
 msgstr ""
 
-#: manager/forms.py:280 manager/templates/workout/view.html:113
+#: manager/forms.py:280 manager/templates/workout/view.html:122
 msgid "Table"
 msgstr ""
 
-#: manager/forms.py:282 manager/templates/workout/view.html:119
+#: manager/forms.py:282 manager/templates/workout/view.html:129
 msgid "with images"
 msgstr ""
 
-#: manager/forms.py:283 manager/templates/workout/view.html:125
+#: manager/forms.py:283 manager/templates/workout/view.html:136
 msgid "with comments"
 msgstr ""
 
+#: manager/helpers.py:86 manager/models/setting.py:72
+#: manager/templates/set/formset.html:9
+msgid "Reps"
+msgstr ""
+
 #: manager/management/commands/email-reminders.py:121
 msgid "Workout will expire soon"
 msgstr ""
 
 #: manager/models/day.py:34 manager/models/log.py:58
-#: manager/models/session.py:60 manager/templates/schedule/view.html:102
+#: manager/models/session.py:60 manager/templates/schedule/view.html:101
 #: manager/templates/workout/view.html:9 manager/templates/workout/view.html:17
 #: manager/views/pdf.py:85 manager/views/pdf.py:161
 #: manager/views/schedule.py:151 manager/views/schedule.py:221
@@ -2131,7 +2102,7 @@ msgstr ""
 msgid "Name or short description of the schedule. For example 'Program XYZ'."
 msgstr ""
 
-#: manager/models/schedule.py:65 manager/templates/schedule/view.html:71
+#: manager/models/schedule.py:65 manager/templates/schedule/view.html:70
 msgid "Schedule active"
 msgstr ""
 
@@ -2142,7 +2113,7 @@ msgid ""
 "inactive"
 msgstr ""
 
-#: manager/models/schedule.py:77 manager/templates/schedule/view.html:81
+#: manager/models/schedule.py:77 manager/templates/schedule/view.html:80
 msgid "Is a loop"
 msgstr ""
 
@@ -2161,7 +2132,7 @@ msgid "The duration in weeks"
 msgstr ""
 
 #: manager/models/schedule_step.py:64 manager/models/set.py:53
-#: manager/models/setting.py:113 nutrition/models/meal.py:55
+#: manager/models/setting.py:113 nutrition/models/meal.py:53
 #: nutrition/models/meal_item.py:66
 msgid "Order"
 msgstr ""
@@ -2293,7 +2264,7 @@ msgstr ""
 msgid "Workout session"
 msgstr ""
 
-#: manager/templates/calendar/partial_overview_table.html:27
+#: manager/templates/calendar/partial_overview_table.html:26
 msgid "Delete with logs"
 msgstr ""
 
@@ -2313,21 +2284,25 @@ msgid ""
 "will simply be edited. Weight entries are always added."
 msgstr ""
 
-#: manager/templates/schedule/overview.html:5
+#: manager/templates/schedule/overview.html:4
 msgid "Your schedules"
 msgstr ""
 
 #: manager/templates/schedule/overview.html:19
-#: manager/templates/schedule/view.html:131
-#: manager/templates/schedule/view.html:183
+#: manager/templates/schedule/view.html:143
+#: manager/templates/schedule/view.html:193
 #: manager/templates/workout/overview.html:16
 msgid "active"
 msgstr ""
 
-#: manager/templates/schedule/overview.html:28
+#: manager/templates/schedule/overview.html:27
 msgid "No schedules found."
 msgstr ""
 
+#: manager/templates/schedule/overview.html:28
+msgid "Add one now"
+msgstr ""
+
 #: manager/templates/schedule/overview.html:36
 msgid ""
 "Schedules are collections of workouts that you do in\n"
@@ -2340,10 +2315,11 @@ msgid ""
 "        before jumping to the next. It is also possible to create a loop, so "
 "you\n"
 "        always do the same workouts in succession, e.g. A > B > C > A > B > "
-"C and so on."
+"C and so\n"
+"        on."
 msgstr ""
 
-#: manager/templates/schedule/overview.html:43
+#: manager/templates/schedule/overview.html:44
 msgid ""
 "The currently active schedule will remain active (and be\n"
 "        shown e.g. in your dashboard) till it reaches the last workout or "
@@ -2359,25 +2335,25 @@ msgstr ""
 msgid "Schedule"
 msgstr ""
 
-#: manager/templates/schedule/view.html:85
+#: manager/templates/schedule/view.html:84
 msgid ""
 "This schedule is a loop and will go through the workouts above till you "
 "deactivate it"
 msgstr ""
 
-#: manager/templates/schedule/view.html:103
+#: manager/templates/schedule/view.html:102
 msgid "Weeks"
 msgstr ""
 
-#: manager/templates/schedule/view.html:115
+#: manager/templates/schedule/view.html:114
 msgid "Move me"
 msgstr ""
 
-#: manager/templates/schedule/view.html:156
+#: manager/templates/schedule/view.html:168
 msgid "Start schedule"
 msgstr ""
 
-#: manager/templates/schedule/view.html:187
+#: manager/templates/schedule/view.html:197
 #, python-format
 msgid ""
 "%(weeks)s Week\n"
@@ -2388,11 +2364,11 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: manager/templates/schedule/view.html:221
+#: manager/templates/schedule/view.html:231
 msgid "Adding workouts"
 msgstr ""
 
-#: manager/templates/schedule/view.html:223
+#: manager/templates/schedule/view.html:233
 msgid ""
 "Add as many workouts to the schedule as you want. You can\n"
 "            edit the order by dragging and dropping them. It's also possible "
@@ -2400,44 +2376,37 @@ msgid ""
 "            than once."
 msgstr ""
 
-#: manager/templates/schedule/view.html:232
-#: manager/templates/schedule/view.html:243
-#: manager/templates/schedule/view.html:290
+#: manager/templates/schedule/view.html:242
+#: manager/templates/schedule/view.html:256
+#: manager/templates/schedule/view.html:310
 #: manager/templates/workout/view.html:69
-#: manager/templates/workout/view.html:79
-#: manager/templates/workout/view.html:178
+#: manager/templates/workout/view.html:83
+#: manager/templates/workout/view.html:192
 msgid "Export calendar file"
 msgstr ""
 
-#: manager/templates/schedule/view.html:236
+#: manager/templates/schedule/view.html:248
 msgid "Export this schedule as a calendar file."
 msgstr ""
 
-#: manager/templates/schedule/view.html:237
-#: manager/templates/workout/view.html:74
+#: manager/templates/schedule/view.html:249
+#: manager/templates/workout/view.html:76
 msgid ""
 "You can then import the file it into your calendar\n"
 "                        application for example google calendar, outlook or "
 "iCal. This will create\n"
 "                        an appointment for each training day with the "
-"appropriate exercises."
+"appropriate\n"
+"                        exercises."
 msgstr ""
 
-#: manager/templates/schedule/view.html:258
-#: manager/templates/schedule/view.html:294
-#: manager/templates/workout/view.html:94
-#: manager/templates/workout/view.html:174
+#: manager/templates/schedule/view.html:272
+#: manager/templates/schedule/view.html:315
+#: manager/templates/workout/view.html:99
+#: manager/templates/workout/view.html:188
 msgid "Download as PDF"
 msgstr ""
 
-#: manager/templates/schedule/view.html:299
-msgid "Edit schedule"
-msgstr ""
-
-#: manager/templates/schedule/view.html:304
-msgid "Delete schedule"
-msgstr ""
-
 #: manager/templates/set/add.html:9
 #, python-format
 msgid "Add exercises to day \"%(day_name)s\""
@@ -2502,47 +2471,6 @@ msgid ""
 "You will regularly receive such reminders till you enter your current weight."
 msgstr ""
 
-#: manager/templates/workout/log.html:10 manager/templates/workout/log.html:11
-msgid "Weight log"
-msgstr ""
-
-#: manager/templates/workout/log.html:29
-msgid "Weight log for workout"
-msgstr ""
-
-#: manager/templates/workout/log.html:49
-msgid "Add weight log to this day"
-msgstr ""
-
-#: manager/templates/workout/log.html:69
-msgid "No weight entries here."
-msgstr ""
-
-#: manager/templates/workout/log.html:77
-msgid "No exercises for this day."
-msgstr ""
-
-#: manager/templates/workout/log.html:90
-msgid ""
-"This page shows the weight logs belonging to this workout\n"
-"only. Click on an exercise to see all the historical data for\n"
-"it."
-msgstr ""
-
-#: manager/templates/workout/log.html:94
-msgid ""
-"If on a single day there is more than one entry with the\n"
-"same number of repetitions, but different weights, only the entry with the\n"
-"higher weight is shown in the diagram."
-msgstr ""
-
-#: manager/templates/workout/log.html:98
-msgid ""
-"Note that only entries with a weight unit (kg or lb) and\n"
-"repetitions are charted, other combinations such as time or until failure\n"
-"are ignored here."
-msgstr ""
-
 #: manager/templates/workout/overview.html:25
 msgid "No templates found."
 msgstr ""
@@ -2578,27 +2506,23 @@ msgstr ""
 msgid "Set the repetitions for each set"
 msgstr ""
 
-#: manager/templates/workout/view.html:73
+#: manager/templates/workout/view.html:75
 msgid "Export this workout as a calendar file."
 msgstr ""
 
-#: manager/templates/workout/view.html:144
+#: manager/templates/workout/view.html:156
 msgid "Logs"
 msgstr ""
 
-#: manager/templates/workout/view.html:146
+#: manager/templates/workout/view.html:159
 msgid "View logs"
 msgstr ""
 
-#: manager/templates/workout/view.html:169 manager/views/schedule_step.py:99
-msgid "Edit workout"
-msgstr ""
-
-#: manager/templates/workout/view.html:182 manager/views/workout.py:281
+#: manager/templates/workout/view.html:195 manager/views/workout.py:281
 msgid "Mark as template"
 msgstr ""
 
-#: manager/views/day.py:109
+#: manager/views/day.py:105
 msgid "Add workout day"
 msgstr ""
 
@@ -2615,6 +2539,10 @@ msgstr ""
 msgid "Create schedule"
 msgstr ""
 
+#: manager/views/schedule_step.py:99
+msgid "Edit workout"
+msgstr ""
+
 #: manager/views/workout.py:209
 msgid "Copy workout"
 msgstr ""
@@ -2736,7 +2664,7 @@ msgstr ""
 msgid "Unit amount, e.g. \"1 Cup\" or \"1/2 spoon\""
 msgstr ""
 
-#: nutrition/models/log.py:52 nutrition/models/meal.py:50
+#: nutrition/models/log.py:52 nutrition/models/meal.py:48
 #: nutrition/models/meal_item.py:48 nutrition/models/plan.py:108
 msgid "Nutrition plan"
 msgstr ""
@@ -2749,11 +2677,11 @@ msgstr ""
 msgid "Date and Time (Approx.)"
 msgstr ""
 
-#: nutrition/models/meal.py:62
+#: nutrition/models/meal.py:60
 msgid "Time (approx)"
 msgstr ""
 
-#: nutrition/models/meal.py:69
+#: nutrition/models/meal.py:67
 msgid ""
 "Give meals a textual description / name such as \"Breakfast\" or \"after "
 "workout\""
@@ -2872,10 +2800,6 @@ msgstr ""
 msgid "Search"
 msgstr ""
 
-#: nutrition/templates/ingredient/overview.html:62
-msgid "Add ingredient"
-msgstr ""
-
 #: nutrition/templates/ingredient/view.html:45 nutrition/views/plan.py:229
 msgid "Macronutrients"
 msgstr ""
@@ -2895,20 +2819,11 @@ msgstr ""
 msgid "Others"
 msgstr ""
 
-#: nutrition/templates/ingredient/view.html:144
-#: nutrition/templates/units/list.html:46 nutrition/views/unit.py:86
+#: nutrition/templates/ingredient/view.html:143
+#: nutrition/templates/units/list.html:50 nutrition/views/unit.py:86
 msgid "Add new weight unit"
 msgstr ""
 
-#: nutrition/templates/ingredient/view.html:206
-#: nutrition/templates/ingredient/view.html:209
-msgid "Edit ingredient"
-msgstr ""
-
-#: nutrition/templates/ingredient/view.html:213
-msgid "Delete ingredient"
-msgstr ""
-
 #: nutrition/templates/rate/form.html:25
 msgid "Basal metabolic rate"
 msgstr ""
diff --git a/wger/locale/hi/LC_MESSAGES/django.po b/wger/locale/hi/LC_MESSAGES/django.po
index e11f2dbdf..0d6b7fce7 100644
--- a/wger/locale/hi/LC_MESSAGES/django.po
+++ b/wger/locale/hi/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-07-14 15:59+0200\n"
+"POT-Creation-Date: 2024-11-14 13:09+0100\n"
 "PO-Revision-Date: 2024-10-04 07:15+0000\n"
 "Last-Translator: Ritik Sharma <pandatritik47@gmail.com>\n"
 "Language-Team: Hindi <https://hosted.weblate.org/projects/wger/web/hi/>\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 5.8-dev\n"
 
-#: config/models/gym_config.py:46 gym/templates/gym/list.html:53
+#: config/models/gym_config.py:46 gym/templates/gym/list.html:56
 msgid "Default gym"
 msgstr "डिफ़ॉल्ट जिम"
 
@@ -27,31 +27,31 @@ msgid ""
 "Select the default gym for this installation. This will assign all new "
 "registered users to this gym and update all existing users without a gym."
 msgstr ""
-"इस इंस्टॉलेशन के लिए डिफ़ॉल्ट जिम चुनें। यह सभी नए पंजीकृत उपयोगकर्ताओं को इस जिम को असाइन करेगा और बिना जि"
-"म वाले सभी मौजूदा उपयोगकर्ताओं को अपडेट करेगा।"
+"इस इंस्टॉलेशन के लिए डिफ़ॉल्ट जिम चुनें। यह सभी नए पंजीकृत उपयोगकर्ताओं को इस जिम को "
+"असाइन करेगा और बिना जिम वाले सभी मौजूदा उपयोगकर्ताओं को अपडेट करेगा।"
 
-#: config/views/gym_config.py:42 core/templates/language/view.html:67
-#: core/templates/license/list.html:17 core/templates/misc/license/list.html:18
+#: config/views/gym_config.py:42 core/templates/language/view.html:64
+#: core/templates/license/list.html:17
 #: core/templates/repetition_unit/list.html:18
-#: core/templates/tags/render_day.html:39
-#: core/templates/tags/render_day.html:75 core/templates/user/overview.html:204
-#: core/templates/user/overview.html:445
+#: core/templates/user/overview.html:204 core/templates/user/overview.html:467
 #: core/templates/weight_unit/list.html:18
 #: exercises/templates/categories/admin-overview.html:17
 #: exercises/templates/equipment/admin-overview.html:17
-#: exercises/templates/muscles/admin-overview.html:17
-#: gallery/views/images.py:98 gym/templates/admin_notes/list.html:32
-#: gym/templates/contract/list.html:31 gym/templates/contract/view.html:107
-#: gym/templates/contract_option/list.html:32
-#: gym/templates/contract_type/list.html:32 gym/templates/document/list.html:38
-#: gym/templates/gym/list.html:20 gym/templates/gym/list.html:46
-#: gym/templates/gym/member_list.html:87 gym/templates/gym/member_list.html:140
-#: gym/templates/gym/member_list.html:176
-#: manager/templates/calendar/day.html:68
-#: manager/templates/calendar/month.html:85
-#: manager/templates/calendar/partial_overview_table.html:18
-#: manager/templates/schedule/view.html:118
-#: nutrition/templates/ingredient/view.html:165
+#: exercises/templates/muscles/admin-overview.html:16
+#: gallery/views/images.py:98 gym/templates/admin_notes/list.html:31
+#: gym/templates/contract/list.html:30 gym/templates/contract/view.html:106
+#: gym/templates/contract_option/list.html:29
+#: gym/templates/contract_type/list.html:30 gym/templates/document/list.html:38
+#: gym/templates/gym/list.html:19 gym/templates/gym/list.html:48
+#: gym/templates/gym/member_list.html:94 gym/templates/gym/member_list.html:152
+#: gym/templates/gym/member_list.html:190
+#: manager/templates/calendar/day.html:67
+#: manager/templates/calendar/month.html:84
+#: manager/templates/calendar/partial_overview_table.html:16
+#: manager/templates/schedule/view.html:318
+#: manager/templates/workout/view.html:181
+#: nutrition/templates/ingredient/view.html:164
+#: nutrition/templates/ingredient/view.html:209
 #: nutrition/templates/units/list.html:19
 msgid "Edit"
 msgstr "संपादन"
@@ -85,8 +85,8 @@ msgstr "मेरा शानदार वर्कआउट शेड्यू
 msgid "Empty placeholder schedule"
 msgstr ""
 
-#: core/forms.py:69 core/templates/navigation.html:285
-#: core/templates/navigation.html:291 core/templates/user/login.html:4
+#: core/forms.py:69 core/templates/navigation.html:284
+#: core/templates/navigation.html:290 core/templates/user/login.html:4
 #: software/templates/features.html:82 software/templates/features.html:427
 msgid "Login"
 msgstr ""
@@ -96,14 +96,14 @@ msgstr ""
 msgid "First name"
 msgstr ""
 
-#: core/forms.py:109 core/forms.py:215 core/templates/user/overview.html:266
+#: core/forms.py:109 core/forms.py:215 core/templates/user/overview.html:284
 #: gym/views/export.py:62 gym/views/gym.py:217
 msgid "Last name"
 msgstr ""
 
-#: core/forms.py:111 core/forms.py:180 core/templates/user/overview.html:270
+#: core/forms.py:111 core/forms.py:180 core/templates/user/overview.html:288
 #: gym/models/contract.py:256 gym/models/gym.py:58
-#: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:104
+#: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:116
 #: gym/templates/gym/new_user.html:30 gym/views/export.py:60
 #: mailer/templates/mailer/gym/form.html:4
 #: mailer/templates/mailer/gym/overview.html:4
@@ -132,8 +132,8 @@ msgstr ""
 msgid "Other settings"
 msgstr ""
 
-#: core/forms.py:174 core/views/user.py:624 core/views/user.py:639
-#: core/views/user.py:651 gym/forms.py:73 manager/templates/log/add.html:65
+#: core/forms.py:174 core/views/user.py:623 core/views/user.py:638
+#: core/views/user.py:650 gym/forms.py:73 manager/templates/log/add.html:65
 #: manager/templates/set/add.html:70 manager/views/workout.py:203
 #: utils/generic_views.py:143
 msgid "Save"
@@ -156,26 +156,25 @@ msgstr ""
 msgid "Please enter your current password."
 msgstr ""
 
-#: core/forms.py:242 core/templates/language/view.html:73
-#: core/templates/license/list.html:19 core/templates/misc/license/list.html:22
-#: core/templates/repetition_unit/list.html:20
-#: core/templates/tags/render_day.html:45
-#: core/templates/tags/render_day.html:81 core/templates/user/overview.html:217
-#: core/templates/weight_unit/list.html:20
-#: exercises/templates/categories/admin-overview.html:19
-#: exercises/templates/equipment/admin-overview.html:19
-#: exercises/templates/muscles/admin-overview.html:19
-#: gym/templates/admin_notes/list.html:40
-#: gym/templates/contract_option/list.html:41
-#: gym/templates/contract_type/list.html:41 gym/templates/document/list.html:46
-#: gym/templates/gym/list.html:22 manager/templates/calendar/day.html:73
-#: manager/templates/calendar/month.html:89
-#: manager/templates/calendar/partial_overview_table.html:23
-#: manager/templates/schedule/view.html:122
-#: manager/templates/workout/view.html:188
-#: nutrition/templates/ingredient/view.html:166
+#: core/forms.py:242 core/templates/language/view.html:70
+#: core/templates/license/list.html:21
+#: core/templates/repetition_unit/list.html:22
+#: core/templates/user/overview.html:233
+#: core/templates/weight_unit/list.html:22
+#: exercises/templates/categories/admin-overview.html:21
+#: exercises/templates/equipment/admin-overview.html:21
+#: exercises/templates/muscles/admin-overview.html:20
+#: gym/templates/admin_notes/list.html:37
+#: gym/templates/contract_option/list.html:35
+#: gym/templates/contract_type/list.html:36 gym/templates/document/list.html:46
+#: gym/templates/gym/list.html:23 manager/templates/calendar/day.html:73
+#: manager/templates/calendar/month.html:88
+#: manager/templates/calendar/partial_overview_table.html:22
+#: manager/templates/schedule/view.html:324
+#: manager/templates/workout/view.html:202
+#: nutrition/templates/ingredient/view.html:168
 #: nutrition/templates/ingredient/view.html:215
-#: nutrition/templates/units/list.html:22
+#: nutrition/templates/units/list.html:25
 msgid "Delete"
 msgstr "मिटादे"
 
@@ -187,9 +186,9 @@ msgstr ""
 msgid "The form is secured with reCAPTCHA"
 msgstr ""
 
-#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:285
-#: core/templates/navigation.html:297 core/templates/template.html:149
-#: core/templates/user/login.html:20 core/views/user.py:298
+#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:284
+#: core/templates/navigation.html:296 core/templates/template.html:151
+#: core/templates/user/login.html:20 core/views/user.py:297
 #: software/templates/features.html:87 software/templates/features.html:422
 msgid "Register"
 msgstr ""
@@ -422,18 +421,18 @@ msgid "The sum of all hours has to be 24"
 msgstr ""
 
 #: core/models/rep_unit.py:36 core/models/weight_unit.py:36
-#: core/templates/user/overview.html:262 core/views/user.py:599
+#: core/templates/user/overview.html:280 core/views/user.py:598
 #: exercises/models/category.py:29 exercises/models/equipment.py:29
 #: exercises/models/exercise.py:59 exercises/models/muscle.py:36
 #: gym/models/contract.py:52 gym/models/contract.py:103 gym/models/gym.py:46
 #: gym/models/user_document.py:84 gym/templates/contract/view.html:50
-#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:96
+#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:108
 #: gym/views/gym.py:158 manager/models/schedule.py:55
 #: manager/models/workout.py:57 measurements/models/category.py:36
 #: nutrition/models/ingredient.py:111
-#: nutrition/models/ingredient_category.py:27 nutrition/models/meal.py:67
+#: nutrition/models/ingredient_category.py:27 nutrition/models/meal.py:65
 #: nutrition/models/weight_unit.py:38
-#: nutrition/templates/ingredient/view.html:152
+#: nutrition/templates/ingredient/view.html:151
 msgid "Name"
 msgstr ""
 
@@ -478,7 +477,7 @@ msgstr ""
 msgid "Back to \"%(target)s\""
 msgstr ""
 
-#: core/templates/delete.html:15
+#: core/templates/delete.html:4
 msgid "Are you sure you want to delete this? This action cannot be undone."
 msgstr ""
 
@@ -530,7 +529,7 @@ msgstr ""
 msgid "Dashboard"
 msgstr ""
 
-#: core/templates/language/overview.html:4 core/templates/navigation.html:345
+#: core/templates/language/overview.html:4 core/templates/navigation.html:344
 msgid "Languages"
 msgstr "भाषाएँ"
 
@@ -540,79 +539,72 @@ msgstr "कुछ नहीं मिला"
 
 #: core/templates/language/overview.html:22
 #: manager/templates/calendar/month.html:132
-#: manager/templates/schedule/overview.html:28
-#: manager/templates/schedule/view.html:144
+#: manager/templates/schedule/view.html:154
 #: manager/templates/workout/overview.html:28
 #: nutrition/templates/ingredient/overview.html:38
 msgid "Add one now."
 msgstr "एक नया जोड़ें |"
 
-#: core/templates/language/overview.html:35 core/templates/license/list.html:40
-#: core/templates/misc/license/list.html:43
-#: core/templates/repetition_unit/list.html:43
-#: core/templates/user/overview.html:326 core/templates/user/overview.html:365
-#: core/templates/user/overview.html:401
-#: core/templates/weight_unit/list.html:43 core/views/languages.py:74
+#: core/templates/language/overview.html:34 core/templates/license/list.html:43
+#: core/templates/repetition_unit/list.html:46
+#: core/templates/user/overview.html:344 core/templates/user/overview.html:384
+#: core/templates/user/overview.html:422
+#: core/templates/weight_unit/list.html:46 core/views/languages.py:74
 #: core/views/license.py:66 core/views/repetition_units.py:66
 #: core/views/weight_units.py:66
-#: exercises/templates/categories/admin-overview.html:38
-#: gallery/views/images.py:63 gym/templates/admin_notes/list.html:67
-#: gym/templates/contract/list.html:73
-#: gym/templates/contract_option/list.html:72
-#: gym/templates/contract_type/list.html:72 gym/templates/document/list.html:79
-#: gym/templates/gym/member_list.html:211
-#: gym/templates/gym/member_list.html:244
-#: gym/templates/gym/member_list.html:281
+#: exercises/templates/categories/admin-overview.html:40
+#: exercises/templates/equipment/admin-overview.html:39
+#: exercises/templates/muscles/admin-overview.html:40
+#: gallery/views/images.py:63 gym/templates/admin_notes/list.html:64
+#: gym/templates/contract/list.html:69
+#: gym/templates/contract_option/list.html:65
+#: gym/templates/contract_type/list.html:66 gym/templates/document/list.html:78
+#: gym/templates/gym/member_list.html:228
+#: gym/templates/gym/member_list.html:264
+#: gym/templates/gym/member_list.html:303
 #: mailer/templates/mailer/gym/overview.html:43
+#: nutrition/templates/ingredient/overview.html:60
 msgid "Add"
 msgstr "जोड़ें"
 
 #: core/templates/language/view.html:61 core/templates/user/api_key.html:44
-#: core/templates/user/preferences.html:45 gym/models/contract.py:203
-#: gym/templates/contract/view.html:41 gym/templates/contract/view.html:106
-#: gym/templates/gym/member_list.html:248
-#: manager/templates/schedule/view.html:285
-#: manager/templates/workout/view.html:163
-#: nutrition/templates/ingredient/view.html:202
+#: core/templates/user/preferences.html:50 gym/models/contract.py:203
+#: gym/templates/contract/view.html:41 gym/templates/gym/member_list.html:270
+#: manager/templates/schedule/view.html:304
+#: manager/templates/workout/view.html:177
+#: nutrition/templates/ingredient/view.html:206
 msgid "Options"
 msgstr ""
 
-#: core/templates/license/list.html:4 core/templates/misc/license/list.html:4
+#: core/templates/license/list.html:4
 msgid "License list"
 msgstr ""
 
-#: core/templates/license/list.html:26 core/templates/misc/license/list.html:30
-#: core/templates/repetition_unit/list.html:28
+#: core/templates/license/list.html:30
+#: core/templates/repetition_unit/list.html:32
 #: core/templates/user/overview.html:104 core/templates/user/overview.html:136
-#: core/templates/user/overview.html:185 core/templates/user/overview.html:347
-#: core/templates/user/overview.html:383 core/templates/user/overview.html:427
-#: core/templates/weight_unit/list.html:28
-#: exercises/templates/categories/admin-overview.html:26
-#: exercises/templates/equipment/admin-overview.html:26
-#: exercises/templates/muscles/admin-overview.html:26
-#: gym/templates/admin_notes/list.html:52 gym/templates/contract/list.html:60
-#: gym/templates/contract_option/list.html:58
-#: gym/templates/contract_type/list.html:58 gym/templates/document/list.html:64
-#: gym/templates/gym/list.html:29 gym/templates/gym/member_list.html:229
-#: gym/templates/gym/member_list.html:262
-#: gym/templates/gym/member_list.html:299
+#: core/templates/user/overview.html:185 core/templates/user/overview.html:365
+#: core/templates/user/overview.html:404 core/templates/user/overview.html:448
+#: core/templates/weight_unit/list.html:32
+#: exercises/templates/categories/admin-overview.html:30
+#: exercises/templates/equipment/admin-overview.html:30
+#: exercises/templates/muscles/admin-overview.html:29
+#: gym/templates/admin_notes/list.html:50 gym/templates/contract/list.html:57
+#: gym/templates/contract_option/list.html:52
+#: gym/templates/contract_type/list.html:53 gym/templates/document/list.html:64
+#: gym/templates/gym/list.html:32 gym/templates/gym/member_list.html:248
+#: gym/templates/gym/member_list.html:284
+#: gym/templates/gym/member_list.html:321
 #: mailer/templates/mailer/gym/overview.html:30
-#: manager/templates/calendar/day.html:87
-#: nutrition/templates/units/list.html:29
+#: manager/templates/calendar/day.html:88
+#: nutrition/templates/units/list.html:34
 msgid "Nothing found"
 msgstr ""
 
-#: core/templates/misc/about.html:4 core/templates/template.html:175
+#: core/templates/misc/about.html:4 core/templates/template.html:188
 msgid "Imprint"
 msgstr ""
 
-#: core/templates/misc/license/list.html:47
-msgid ""
-"If a license has been localized, e.g. the Creative Commons\n"
-"            licenses for the different countries, add them as separate "
-"entries here."
-msgstr ""
-
 #: core/templates/navigation.html:28 software/templates/features.html:437
 msgid "Training"
 msgstr ""
@@ -657,8 +649,8 @@ msgstr ""
 msgid "Exercises"
 msgstr "व्यायाम"
 
-#: core/templates/navigation.html:111 core/templates/navigation.html:184
-#: core/templates/navigation.html:340
+#: core/templates/navigation.html:111 core/templates/navigation.html:185
+#: core/templates/navigation.html:339
 msgid "Administration"
 msgstr ""
 
@@ -697,87 +689,87 @@ msgstr ""
 msgid "Daily calories calculator"
 msgstr ""
 
-#: core/templates/navigation.html:179
+#: core/templates/navigation.html:180
 #: nutrition/templates/ingredient/overview.html:10
 msgid "Ingredient overview"
 msgstr ""
 
-#: core/templates/navigation.html:187 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:189 nutrition/templates/units/list.html:6
 msgid "Ingredient weight units"
 msgstr ""
 
-#: core/templates/navigation.html:203 software/templates/features.html:442
+#: core/templates/navigation.html:205 software/templates/features.html:442
 msgid "Body weight"
 msgstr ""
 
-#: core/templates/navigation.html:210 core/templates/user/overview.html:114
+#: core/templates/navigation.html:212 core/templates/user/overview.html:114
 msgid "Weight overview"
 msgstr ""
 
-#: core/templates/navigation.html:217 weight/views.py:65
+#: core/templates/navigation.html:216 weight/views.py:65
 msgid "Add weight entry"
 msgstr ""
 
-#: core/templates/navigation.html:231
+#: core/templates/navigation.html:230
 msgid "About this software"
 msgstr ""
 
-#: core/templates/navigation.html:237 software/templates/about_us.html:5
+#: core/templates/navigation.html:236 software/templates/about_us.html:5
 msgid "About us"
 msgstr ""
 
-#: core/templates/navigation.html:243 software/templates/features.html:507
+#: core/templates/navigation.html:242 software/templates/features.html:507
 msgid "REST API"
 msgstr ""
 
-#: core/templates/navigation.html:249 utils/models.py:45
+#: core/templates/navigation.html:248 utils/models.py:45
 msgid "License"
 msgstr ""
 
-#: core/templates/navigation.html:255
+#: core/templates/navigation.html:254
 msgid "Developer documentation"
 msgstr ""
 
-#: core/templates/navigation.html:262
+#: core/templates/navigation.html:261
 msgid "Get the code"
 msgstr ""
 
-#: core/templates/navigation.html:269 core/templates/template.html:214
+#: core/templates/navigation.html:268 core/templates/template.html:227
 #: software/templates/features.html:582
 msgid "Translate"
 msgstr ""
 
-#: core/templates/navigation.html:303 core/templates/user/login.html:28
+#: core/templates/navigation.html:302 core/templates/user/login.html:28
 msgid "Reset password"
 msgstr ""
 
-#: core/templates/navigation.html:321
+#: core/templates/navigation.html:320
 msgid "My preferences"
 msgstr ""
 
-#: core/templates/navigation.html:330
+#: core/templates/navigation.html:329
 msgid "Logout"
 msgstr ""
 
-#: core/templates/navigation.html:353
+#: core/templates/navigation.html:352
 msgid "Licenses"
 msgstr ""
 
-#: core/templates/navigation.html:361
+#: core/templates/navigation.html:360
 #: core/templates/repetition_unit/list.html:4
 msgid "Repetition units"
 msgstr ""
 
-#: core/templates/navigation.html:369 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:368 core/templates/weight_unit/list.html:4
 #: nutrition/templates/ingredient/view.html:141
 msgid "Weight units"
 msgstr ""
 
-#: core/templates/navigation.html:377 core/templates/user/list.html:4
+#: core/templates/navigation.html:376 core/templates/user/list.html:4
 msgid "User list"
 msgstr ""
 
-#: core/templates/navigation.html:383
+#: core/templates/navigation.html:382
 msgid "Gyms"
 msgstr ""
 
@@ -836,55 +828,28 @@ msgstr ""
 msgid "next"
 msgstr ""
 
-#: core/templates/tags/render_day.html:34
-msgid "Add weight log"
+#: core/templates/tags/render_day.html:44
+msgid "Placeholder image for translation"
 msgstr ""
 
-#: core/templates/tags/render_day.html:116
-msgid "Placeholder image for exercise"
-msgstr ""
-
-#: core/templates/tags/render_day.html:133
-msgid "This exercise has no repetitions."
-msgstr ""
-
-#: core/templates/tags/render_day.html:136
-msgid "Edit them now."
-msgstr ""
-
-#: core/templates/tags/render_day.html:162
-msgid "Add exercises to this workout day"
-msgstr ""
-
-#: core/templates/tags/render_weight_log.html:17 manager/helpers.py:86
-#: manager/models/setting.py:72 manager/templates/set/formset.html:9
-msgid "Reps"
-msgstr ""
-
-#: core/templates/tags/render_weight_log.html:30 manager/forms.py:191
-#: manager/models/log.py:103 manager/models/setting.py:102
-#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
-msgid "RiR"
-msgstr ""
-
-#: core/templates/template.html:122 manager/templates/calendar/month.html:138
-#: manager/templates/schedule/view.html:248
-#: manager/templates/schedule/view.html:269
-#: manager/templates/workout/view.html:84
-#: manager/templates/workout/view.html:137
+#: core/templates/template.html:124 manager/templates/calendar/month.html:138
+#: manager/templates/schedule/view.html:262
+#: manager/templates/schedule/view.html:287
+#: manager/templates/workout/view.html:89
+#: manager/templates/workout/view.html:149
 msgid "Close"
 msgstr ""
 
-#: core/templates/template.html:138
+#: core/templates/template.html:140
 msgid ""
 "You are using a guest account, data entered will be deleted after a week."
 msgstr ""
 
-#: core/templates/template.html:143
+#: core/templates/template.html:145
 msgid "Create some demo entries"
 msgstr ""
 
-#: core/templates/template.html:180 software/templates/features.html:547
+#: core/templates/template.html:193 software/templates/features.html:547
 #: software/templates/tos.html:7
 msgid "Terms of service"
 msgstr ""
@@ -893,7 +858,7 @@ msgstr ""
 msgid "Features"
 msgstr ""
 
-#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:54
+#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:59
 msgid "API key"
 msgstr ""
 
@@ -932,17 +897,17 @@ msgstr ""
 msgid "Documentation"
 msgstr ""
 
-#: core/templates/user/delete_account.html:4
-#: core/templates/user/preferences.html:59
+#: core/templates/user/delete_account.html:3
+#: core/templates/user/preferences.html:62
 msgid "Delete account"
 msgstr ""
 
-#: core/templates/user/delete_account.html:17
+#: core/templates/user/delete_account.html:9
 #: exercises/templates/history/overview.html:93
 msgid "Are you sure?"
 msgstr ""
 
-#: core/templates/user/delete_account.html:22
+#: core/templates/user/delete_account.html:14
 #, python-format
 msgid ""
 "This action will delete the user account \"%(username)s\".\n"
@@ -961,22 +926,22 @@ msgstr ""
 
 #: core/templates/user/overview.html:25 core/templates/user/overview.html:68
 #: core/templates/user/overview.html:112 core/templates/user/overview.html:144
-#: core/templates/user/overview.html:330 core/templates/user/overview.html:369
-#: core/templates/user/overview.html:405
+#: core/templates/user/overview.html:348 core/templates/user/overview.html:390
+#: core/templates/user/overview.html:426
 #, python-format
 msgid "last %(number)s"
 msgstr ""
 
 #: core/templates/user/overview.html:27 core/templates/user/overview.html:146
-#: core/templates/user/overview.html:325 core/templates/user/overview.html:364
-#: core/templates/user/overview.html:400 gym/templates/gym/member_list.html:210
-#: gym/templates/gym/member_list.html:243
-#: gym/templates/gym/member_list.html:280
+#: core/templates/user/overview.html:343 core/templates/user/overview.html:382
+#: core/templates/user/overview.html:421 gym/templates/gym/member_list.html:226
+#: gym/templates/gym/member_list.html:262
+#: gym/templates/gym/member_list.html:302
 msgid "Overview"
 msgstr ""
 
 #: core/templates/user/overview.html:28
-#: manager/templates/schedule/view.html:163
+#: manager/templates/schedule/view.html:172
 #: manager/templates/workout/overview.html:39 manager/views/schedule_step.py:60
 msgid "Add workout"
 msgstr ""
@@ -1008,38 +973,36 @@ msgstr ""
 msgid "Number of logs (days)"
 msgstr ""
 
-#: core/templates/user/overview.html:37 core/views/user.py:600
+#: core/templates/user/overview.html:37 core/views/user.py:599
 #: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:158
 msgid "Last activity"
 msgstr ""
 
 #: core/templates/user/overview.html:58
 #: manager/templates/calendar/month.html:128
-#: manager/templates/schedule/view.html:144
 #: manager/templates/workout/overview.html:28
 msgid "No workouts found."
 msgstr ""
 
 #: core/templates/user/overview.html:68 manager/forms.py:280
-#: manager/templates/workout/view.html:106
+#: manager/templates/workout/view.html:114
 msgid "Log"
 msgstr ""
 
 #: core/templates/user/overview.html:77 manager/models/session.py:83
-#: manager/templates/calendar/partial_overview_table.html:52
+#: manager/templates/calendar/partial_overview_table.html:54
 msgid "General impression"
 msgstr ""
 
-#: core/templates/user/overview.html:78 core/templates/user/overview.html:369
+#: core/templates/user/overview.html:78 core/templates/user/overview.html:390
 #: manager/models/session.py:73
-#: manager/templates/calendar/partial_overview_table.html:56
-#: manager/templates/workout/log.html:89
+#: manager/templates/calendar/partial_overview_table.html:58
 msgid "Notes"
 msgstr ""
 
 #: core/templates/user/overview.html:79
 #: exercises/templates/history/overview.html:30
-#: manager/templates/calendar/partial_overview_table.html:42
+#: manager/templates/calendar/partial_overview_table.html:44
 msgid "Time"
 msgstr ""
 
@@ -1077,121 +1040,121 @@ msgstr ""
 msgid "kcal"
 msgstr ""
 
-#: core/templates/user/overview.html:201 core/templates/user/overview.html:322
-#: core/templates/user/overview.html:361 core/templates/user/overview.html:397
-#: core/templates/user/overview.html:442 gym/templates/gym/list.html:42
-#: gym/templates/gym/member_list.html:84 gym/templates/gym/member_list.html:137
-#: gym/templates/gym/member_list.html:173
-#: gym/templates/gym/member_list.html:207
-#: gym/templates/gym/member_list.html:240
-#: gym/templates/gym/member_list.html:277
-#: manager/templates/schedule/view.html:100
+#: core/templates/user/overview.html:201 core/templates/user/overview.html:340
+#: core/templates/user/overview.html:379 core/templates/user/overview.html:418
+#: core/templates/user/overview.html:463 gym/templates/gym/list.html:45
+#: gym/templates/gym/member_list.html:91 gym/templates/gym/member_list.html:149
+#: gym/templates/gym/member_list.html:187
+#: gym/templates/gym/member_list.html:223
+#: gym/templates/gym/member_list.html:259
+#: gym/templates/gym/member_list.html:299
+#: manager/templates/schedule/view.html:99
 msgid "Actions"
 msgstr ""
 
-#: core/templates/user/overview.html:207
+#: core/templates/user/overview.html:210
 msgid "Deactivate user"
 msgstr ""
 
-#: core/templates/user/overview.html:209
+#: core/templates/user/overview.html:214
 msgid "Activate user"
 msgstr ""
 
-#: core/templates/user/overview.html:211
+#: core/templates/user/overview.html:223
 msgid "Reset user password"
 msgstr ""
 
-#: core/templates/user/overview.html:214 gym/templates/gym/member_list.html:30
+#: core/templates/user/overview.html:227 gym/templates/gym/member_list.html:30
 msgid "Roles"
 msgstr ""
 
-#: core/templates/user/overview.html:225
+#: core/templates/user/overview.html:243
 msgid "Password reset confirmation"
 msgstr ""
 
-#: core/templates/user/overview.html:229
+#: core/templates/user/overview.html:247
 msgid "Do you really want to change this user&#39;s password?"
 msgstr ""
 
-#: core/templates/user/overview.html:232
+#: core/templates/user/overview.html:250
 #: exercises/templates/history/overview.html:106
 msgid "No"
 msgstr ""
 
-#: core/templates/user/overview.html:233
+#: core/templates/user/overview.html:251
 #: exercises/templates/history/overview.html:99
 msgid "Yes"
 msgstr ""
 
-#: core/templates/user/overview.html:254 gym/templates/gym/member_list.html:93
+#: core/templates/user/overview.html:272 gym/templates/gym/member_list.html:105
 msgid "Details"
 msgstr ""
 
-#: core/templates/user/overview.html:258 gym/views/export.py:57
-#: manager/helpers.py:86 manager/templates/schedule/view.html:98
+#: core/templates/user/overview.html:276 gym/views/export.py:57
+#: manager/helpers.py:86 manager/templates/schedule/view.html:97
 msgid "Nr."
 msgstr ""
 
-#: core/templates/user/overview.html:280 gym/models/contract.py:287
+#: core/templates/user/overview.html:298 gym/models/contract.py:287
 #: gym/models/gym.py:50 gym/templates/contract/view.html:75
-#: gym/templates/gym/member_list.html:100 gym/views/export.py:68
+#: gym/templates/gym/member_list.html:112 gym/views/export.py:68
 msgid "Phone"
 msgstr ""
 
-#: core/templates/user/overview.html:284 gym/templates/contract/view.html:87
-#: gym/templates/gym/member_list.html:118
+#: core/templates/user/overview.html:302 gym/templates/contract/view.html:87
+#: gym/templates/gym/member_list.html:130
 msgid "Address"
 msgstr ""
 
-#: core/templates/user/overview.html:295
+#: core/templates/user/overview.html:313
 msgid "Registered"
 msgstr ""
 
-#: core/templates/user/overview.html:299
+#: core/templates/user/overview.html:317
 msgid "Last login"
 msgstr ""
 
-#: core/templates/user/overview.html:304
+#: core/templates/user/overview.html:322
 msgid "Status"
 msgstr ""
 
-#: core/templates/user/overview.html:307
+#: core/templates/user/overview.html:325
 msgid "Active"
 msgstr ""
 
-#: core/templates/user/overview.html:309
+#: core/templates/user/overview.html:327
 msgid "Inactive"
 msgstr ""
 
-#: core/templates/user/overview.html:330 gym/templates/contract/list.html:4
-#: gym/templates/gym/member_list.html:202
+#: core/templates/user/overview.html:348 gym/templates/contract/list.html:4
+#: gym/templates/gym/member_list.html:218
 msgid "Contracts"
 msgstr ""
 
-#: core/templates/user/overview.html:405 gym/templates/document/list.html:4
+#: core/templates/user/overview.html:426 gym/templates/document/list.html:4
 msgid "Documents"
 msgstr ""
 
-#: core/templates/user/overview.html:412 gym/templates/document/list.html:32
-#: manager/forms.py:292 manager/templates/workout/view.html:132
+#: core/templates/user/overview.html:433 gym/templates/document/list.html:33
+#: manager/forms.py:292 manager/templates/workout/view.html:143
 msgid "Download"
 msgstr ""
 
-#: core/templates/user/overview.html:450 gym/views/admin_config.py:44
+#: core/templates/user/overview.html:474 gym/views/admin_config.py:44
 #: gym/views/admin_config.py:58 gym/views/user_config.py:46
 msgid "Configuration"
 msgstr ""
 
-#: core/templates/user/overview.html:453 gym/models/user_config.py:92
+#: core/templates/user/overview.html:477 gym/models/user_config.py:92
 msgid "Include in inactive overview"
 msgstr ""
 
-#: core/templates/user/overview.html:486
+#: core/templates/user/overview.html:510
 #, python-format
 msgid "Admin login is only available for users in %(gym_name)s"
 msgstr ""
 
-#: core/templates/user/overview.html:490
+#: core/templates/user/overview.html:514
 msgid "Log in as this user"
 msgstr ""
 
@@ -1211,19 +1174,19 @@ msgstr ""
 msgid "Send verification email"
 msgstr ""
 
-#: core/templates/user/preferences.html:30
+#: core/templates/user/preferences.html:31
 msgid "You need to verify your email to contribute exercises"
 msgstr ""
 
-#: core/templates/user/preferences.html:50 core/views/user.py:611
+#: core/templates/user/preferences.html:55 core/views/user.py:610
 msgid "Change password"
 msgstr ""
 
-#: core/templatetags/wger_extras.py:205 i18n.tpl:37
+#: core/templatetags/wger_extras.py:197 i18n.tpl:37
 msgid "kg"
 msgstr ""
 
-#: core/templatetags/wger_extras.py:207
+#: core/templatetags/wger_extras.py:199
 #: nutrition/templates/ingredient/view.html:60
 #: nutrition/templates/ingredient/view.html:66
 #: nutrition/templates/ingredient/view.html:73
@@ -1235,11 +1198,11 @@ msgctxt "weight unit, i.e. grams"
 msgid "g"
 msgstr ""
 
-#: core/templatetags/wger_extras.py:210 i18n.tpl:38
+#: core/templatetags/wger_extras.py:202 i18n.tpl:38
 msgid "lb"
 msgstr ""
 
-#: core/templatetags/wger_extras.py:212
+#: core/templatetags/wger_extras.py:204
 msgctxt "weight unit, i.e. ounces"
 msgid "oz"
 msgstr ""
@@ -1266,13 +1229,13 @@ msgid "Delete {0}?"
 msgstr ""
 
 #: core/views/languages.py:111 core/views/license.py:85
-#: core/views/repetition_units.py:86 core/views/user.py:474
+#: core/views/repetition_units.py:86 core/views/user.py:473
 #: core/views/weight_units.py:86 exercises/views/categories.py:98
 #: exercises/views/equipment.py:81 exercises/views/muscles.py:87
 #: gym/views/admin_notes.py:161 gym/views/config.py:68
 #: gym/views/contract.py:186 gym/views/contract_option.py:123
 #: gym/views/contract_type.py:123 gym/views/document.py:171
-#: gym/views/gym.py:463 manager/views/day.py:100 manager/views/schedule.py:333
+#: gym/views/gym.py:463 manager/views/day.py:96 manager/views/schedule.py:333
 #: manager/views/workout.py:267 nutrition/views/ingredient.py:145
 #: nutrition/views/unit.py:143
 #, python-brace-format
@@ -1298,48 +1261,48 @@ msgstr ""
 msgid "Your feedback was successfully sent. Thank you!"
 msgstr ""
 
-#: core/views/user.py:156
+#: core/views/user.py:155
 #, python-brace-format
 msgid "Account \"{0}\" was successfully deleted"
 msgstr ""
 
-#: core/views/user.py:292
+#: core/views/user.py:291
 msgid "You were successfully registered"
 msgstr ""
 
-#: core/views/user.py:351
+#: core/views/user.py:350
 msgid "Settings successfully updated"
 msgstr ""
 
-#: core/views/user.py:390
+#: core/views/user.py:389
 msgid "The user was successfully deactivated"
 msgstr ""
 
-#: core/views/user.py:427
+#: core/views/user.py:426
 msgid "The user was successfully activated"
 msgstr ""
 
-#: core/views/user.py:442
+#: core/views/user.py:441
 msgid "Edit user"
 msgstr ""
 
-#: core/views/user.py:597 gym/templates/gym/member_list.html:26
+#: core/views/user.py:596 gym/templates/gym/member_list.html:26
 #: gym/views/gym.py:158
 msgid "ID"
 msgstr ""
 
-#: core/views/user.py:598 gym/forms.py:95 gym/templates/contract/view.html:55
+#: core/views/user.py:597 gym/forms.py:95 gym/templates/contract/view.html:55
 #: gym/templates/gym/member_list.html:27 gym/views/export.py:59
 #: gym/views/gym.py:158 gym/views/gym.py:217
 msgid "Username"
 msgstr ""
 
-#: core/views/user.py:601 gym/templates/gym/new_user.html:34
+#: core/views/user.py:600 gym/templates/gym/new_user.html:34
 #: gym/views/export.py:58 gym/views/gym.py:217
 msgid "Gym"
 msgstr ""
 
-#: core/views/user.py:660
+#: core/views/user.py:659
 #, python-format
 msgid "A verification email was sent to %(email)s"
 msgstr ""
@@ -1489,11 +1452,6 @@ msgstr ""
 msgid "Equipment list"
 msgstr ""
 
-#: exercises/templates/equipment/admin-overview.html:39
-#: exercises/views/equipment.py:92
-msgid "Add new equipment"
-msgstr ""
-
 #: exercises/templates/history/overview.html:11
 msgid "Exercise admin history"
 msgstr ""
@@ -1541,11 +1499,6 @@ msgstr ""
 msgid "Muscle overview"
 msgstr ""
 
-#: exercises/templates/muscles/admin-overview.html:38
-#: exercises/views/muscles.py:68
-msgid "Add muscle"
-msgstr ""
-
 #: exercises/views/categories.py:72
 msgid "Add category"
 msgstr ""
@@ -1554,6 +1507,10 @@ msgstr ""
 msgid "This will also delete all exercises in this category."
 msgstr ""
 
+#: exercises/views/equipment.py:92
+msgid "Add new equipment"
+msgstr ""
+
 #: exercises/views/equipment.py:104 exercises/views/equipment.py:115
 msgid "Delete equipment?"
 msgstr ""
@@ -1562,6 +1519,10 @@ msgstr ""
 msgid "This will delete the exercise from all workouts."
 msgstr ""
 
+#: exercises/views/muscles.py:68
+msgid "Add muscle"
+msgstr ""
+
 #: gallery/templates/images/overview.html:62
 msgid "Add image"
 msgstr ""
@@ -1647,7 +1608,7 @@ msgid "Contract is active"
 msgstr ""
 
 #: gym/models/contract.py:237 gym/templates/contract/view.html:69
-#: manager/models/schedule.py:61 manager/templates/schedule/view.html:67
+#: manager/models/schedule.py:61 manager/templates/schedule/view.html:66
 msgid "Start date"
 msgstr ""
 
@@ -1683,7 +1644,7 @@ msgstr ""
 msgid "Admin: can administrate the different gyms"
 msgstr ""
 
-#: gym/models/gym.py:65 gym/templates/gym/member_list.html:114
+#: gym/models/gym.py:65 gym/templates/gym/member_list.html:126
 msgid "Owner"
 msgstr ""
 
@@ -1693,7 +1654,7 @@ msgid ""
 "considered inactive"
 msgstr ""
 
-#: gym/models/gym_config.py:56 gym/templates/gym/member_list.html:152
+#: gym/models/gym_config.py:56 gym/templates/gym/member_list.html:166
 msgid "Show name in header"
 msgstr ""
 
@@ -1706,7 +1667,7 @@ msgstr ""
 msgid "Configuration for {self.gym.name}"
 msgstr ""
 
-#: gym/models/user_config.py:65 gym/templates/gym/member_list.html:184
+#: gym/models/user_config.py:65 gym/templates/gym/member_list.html:200
 msgid "Overview of inactive members"
 msgstr ""
 
@@ -1730,7 +1691,7 @@ msgstr ""
 msgid "User notes"
 msgstr ""
 
-#: gym/templates/contract/list.html:36
+#: gym/templates/contract/list.html:34
 msgid "Show"
 msgstr ""
 
@@ -1756,11 +1717,11 @@ msgstr ""
 msgid "Gym list"
 msgstr ""
 
-#: gym/templates/gym/list.html:50
+#: gym/templates/gym/list.html:53
 msgid "Global gym configuration"
 msgstr ""
 
-#: gym/templates/gym/list.html:67 gym/views/gym.py:171
+#: gym/templates/gym/list.html:69 gym/views/gym.py:171
 msgid "Add new gym"
 msgstr ""
 
@@ -1772,43 +1733,43 @@ msgstr ""
 msgid "Gym manager"
 msgstr ""
 
-#: gym/templates/gym/member_list.html:69
+#: gym/templates/gym/member_list.html:76
 msgid "This gym has no administrators or trainers"
 msgstr ""
 
-#: gym/templates/gym/member_list.html:88
+#: gym/templates/gym/member_list.html:98
 msgid "Export"
 msgstr ""
 
-#: gym/templates/gym/member_list.html:125
+#: gym/templates/gym/member_list.html:137
 msgid "Members"
 msgstr ""
 
-#: gym/templates/gym/member_list.html:145
+#: gym/templates/gym/member_list.html:159
 msgid "Gym configuration"
 msgstr ""
 
-#: gym/templates/gym/member_list.html:148
+#: gym/templates/gym/member_list.html:162
 msgid "Inactive members"
 msgstr ""
 
-#: gym/templates/gym/member_list.html:149
+#: gym/templates/gym/member_list.html:163
 msgid "weeks"
 msgstr ""
 
-#: gym/templates/gym/member_list.html:181
+#: gym/templates/gym/member_list.html:197
 msgid "My configuration"
 msgstr ""
 
-#: gym/templates/gym/member_list.html:215
+#: gym/templates/gym/member_list.html:234
 msgid "Types"
 msgstr ""
 
-#: gym/templates/gym/member_list.html:285
+#: gym/templates/gym/member_list.html:307
 msgid "Emails"
 msgstr ""
 
-#: gym/templates/gym/member_list.html:315
+#: gym/templates/gym/member_list.html:336
 msgid "Add member"
 msgstr ""
 
@@ -2093,28 +2054,38 @@ msgstr ""
 msgid "Unit"
 msgstr ""
 
+#: manager/forms.py:191 manager/models/log.py:103 manager/models/setting.py:102
+#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
+msgid "RiR"
+msgstr ""
+
 #: manager/forms.py:279
 msgid "Type"
 msgstr ""
 
-#: manager/forms.py:280 manager/templates/workout/view.html:113
+#: manager/forms.py:280 manager/templates/workout/view.html:122
 msgid "Table"
 msgstr ""
 
-#: manager/forms.py:282 manager/templates/workout/view.html:119
+#: manager/forms.py:282 manager/templates/workout/view.html:129
 msgid "with images"
 msgstr ""
 
-#: manager/forms.py:283 manager/templates/workout/view.html:125
+#: manager/forms.py:283 manager/templates/workout/view.html:136
 msgid "with comments"
 msgstr ""
 
+#: manager/helpers.py:86 manager/models/setting.py:72
+#: manager/templates/set/formset.html:9
+msgid "Reps"
+msgstr ""
+
 #: manager/management/commands/email-reminders.py:121
 msgid "Workout will expire soon"
 msgstr ""
 
 #: manager/models/day.py:34 manager/models/log.py:58
-#: manager/models/session.py:60 manager/templates/schedule/view.html:102
+#: manager/models/session.py:60 manager/templates/schedule/view.html:101
 #: manager/templates/workout/view.html:9 manager/templates/workout/view.html:17
 #: manager/views/pdf.py:85 manager/views/pdf.py:161
 #: manager/views/schedule.py:151 manager/views/schedule.py:221
@@ -2135,7 +2106,7 @@ msgstr ""
 msgid "Name or short description of the schedule. For example 'Program XYZ'."
 msgstr ""
 
-#: manager/models/schedule.py:65 manager/templates/schedule/view.html:71
+#: manager/models/schedule.py:65 manager/templates/schedule/view.html:70
 msgid "Schedule active"
 msgstr ""
 
@@ -2146,7 +2117,7 @@ msgid ""
 "inactive"
 msgstr ""
 
-#: manager/models/schedule.py:77 manager/templates/schedule/view.html:81
+#: manager/models/schedule.py:77 manager/templates/schedule/view.html:80
 msgid "Is a loop"
 msgstr ""
 
@@ -2165,7 +2136,7 @@ msgid "The duration in weeks"
 msgstr ""
 
 #: manager/models/schedule_step.py:64 manager/models/set.py:53
-#: manager/models/setting.py:113 nutrition/models/meal.py:55
+#: manager/models/setting.py:113 nutrition/models/meal.py:53
 #: nutrition/models/meal_item.py:66
 msgid "Order"
 msgstr ""
@@ -2297,7 +2268,7 @@ msgstr ""
 msgid "Workout session"
 msgstr ""
 
-#: manager/templates/calendar/partial_overview_table.html:27
+#: manager/templates/calendar/partial_overview_table.html:26
 msgid "Delete with logs"
 msgstr ""
 
@@ -2317,21 +2288,27 @@ msgid ""
 "will simply be edited. Weight entries are always added."
 msgstr ""
 
-#: manager/templates/schedule/overview.html:5
+#: manager/templates/schedule/overview.html:4
 msgid "Your schedules"
 msgstr ""
 
 #: manager/templates/schedule/overview.html:19
-#: manager/templates/schedule/view.html:131
-#: manager/templates/schedule/view.html:183
+#: manager/templates/schedule/view.html:143
+#: manager/templates/schedule/view.html:193
 #: manager/templates/workout/overview.html:16
 msgid "active"
 msgstr ""
 
-#: manager/templates/schedule/overview.html:28
+#: manager/templates/schedule/overview.html:27
 msgid "No schedules found."
 msgstr ""
 
+#: manager/templates/schedule/overview.html:28
+#, fuzzy
+#| msgid "Add one now."
+msgid "Add one now"
+msgstr "एक नया जोड़ें |"
+
 #: manager/templates/schedule/overview.html:36
 msgid ""
 "Schedules are collections of workouts that you do in\n"
@@ -2344,10 +2321,11 @@ msgid ""
 "        before jumping to the next. It is also possible to create a loop, so "
 "you\n"
 "        always do the same workouts in succession, e.g. A > B > C > A > B > "
-"C and so on."
+"C and so\n"
+"        on."
 msgstr ""
 
-#: manager/templates/schedule/overview.html:43
+#: manager/templates/schedule/overview.html:44
 msgid ""
 "The currently active schedule will remain active (and be\n"
 "        shown e.g. in your dashboard) till it reaches the last workout or "
@@ -2363,25 +2341,25 @@ msgstr ""
 msgid "Schedule"
 msgstr ""
 
-#: manager/templates/schedule/view.html:85
+#: manager/templates/schedule/view.html:84
 msgid ""
 "This schedule is a loop and will go through the workouts above till you "
 "deactivate it"
 msgstr ""
 
-#: manager/templates/schedule/view.html:103
+#: manager/templates/schedule/view.html:102
 msgid "Weeks"
 msgstr ""
 
-#: manager/templates/schedule/view.html:115
+#: manager/templates/schedule/view.html:114
 msgid "Move me"
 msgstr ""
 
-#: manager/templates/schedule/view.html:156
+#: manager/templates/schedule/view.html:168
 msgid "Start schedule"
 msgstr ""
 
-#: manager/templates/schedule/view.html:187
+#: manager/templates/schedule/view.html:197
 #, python-format
 msgid ""
 "%(weeks)s Week\n"
@@ -2392,11 +2370,11 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: manager/templates/schedule/view.html:221
+#: manager/templates/schedule/view.html:231
 msgid "Adding workouts"
 msgstr ""
 
-#: manager/templates/schedule/view.html:223
+#: manager/templates/schedule/view.html:233
 msgid ""
 "Add as many workouts to the schedule as you want. You can\n"
 "            edit the order by dragging and dropping them. It's also possible "
@@ -2404,44 +2382,37 @@ msgid ""
 "            than once."
 msgstr ""
 
-#: manager/templates/schedule/view.html:232
-#: manager/templates/schedule/view.html:243
-#: manager/templates/schedule/view.html:290
+#: manager/templates/schedule/view.html:242
+#: manager/templates/schedule/view.html:256
+#: manager/templates/schedule/view.html:310
 #: manager/templates/workout/view.html:69
-#: manager/templates/workout/view.html:79
-#: manager/templates/workout/view.html:178
+#: manager/templates/workout/view.html:83
+#: manager/templates/workout/view.html:192
 msgid "Export calendar file"
 msgstr ""
 
-#: manager/templates/schedule/view.html:236
+#: manager/templates/schedule/view.html:248
 msgid "Export this schedule as a calendar file."
 msgstr ""
 
-#: manager/templates/schedule/view.html:237
-#: manager/templates/workout/view.html:74
+#: manager/templates/schedule/view.html:249
+#: manager/templates/workout/view.html:76
 msgid ""
 "You can then import the file it into your calendar\n"
 "                        application for example google calendar, outlook or "
 "iCal. This will create\n"
 "                        an appointment for each training day with the "
-"appropriate exercises."
+"appropriate\n"
+"                        exercises."
 msgstr ""
 
-#: manager/templates/schedule/view.html:258
-#: manager/templates/schedule/view.html:294
-#: manager/templates/workout/view.html:94
-#: manager/templates/workout/view.html:174
+#: manager/templates/schedule/view.html:272
+#: manager/templates/schedule/view.html:315
+#: manager/templates/workout/view.html:99
+#: manager/templates/workout/view.html:188
 msgid "Download as PDF"
 msgstr ""
 
-#: manager/templates/schedule/view.html:299
-msgid "Edit schedule"
-msgstr ""
-
-#: manager/templates/schedule/view.html:304
-msgid "Delete schedule"
-msgstr ""
-
 #: manager/templates/set/add.html:9
 #, python-format
 msgid "Add exercises to day \"%(day_name)s\""
@@ -2506,47 +2477,6 @@ msgid ""
 "You will regularly receive such reminders till you enter your current weight."
 msgstr ""
 
-#: manager/templates/workout/log.html:10 manager/templates/workout/log.html:11
-msgid "Weight log"
-msgstr ""
-
-#: manager/templates/workout/log.html:29
-msgid "Weight log for workout"
-msgstr ""
-
-#: manager/templates/workout/log.html:49
-msgid "Add weight log to this day"
-msgstr ""
-
-#: manager/templates/workout/log.html:69
-msgid "No weight entries here."
-msgstr ""
-
-#: manager/templates/workout/log.html:77
-msgid "No exercises for this day."
-msgstr ""
-
-#: manager/templates/workout/log.html:90
-msgid ""
-"This page shows the weight logs belonging to this workout\n"
-"only. Click on an exercise to see all the historical data for\n"
-"it."
-msgstr ""
-
-#: manager/templates/workout/log.html:94
-msgid ""
-"If on a single day there is more than one entry with the\n"
-"same number of repetitions, but different weights, only the entry with the\n"
-"higher weight is shown in the diagram."
-msgstr ""
-
-#: manager/templates/workout/log.html:98
-msgid ""
-"Note that only entries with a weight unit (kg or lb) and\n"
-"repetitions are charted, other combinations such as time or until failure\n"
-"are ignored here."
-msgstr ""
-
 #: manager/templates/workout/overview.html:25
 msgid "No templates found."
 msgstr ""
@@ -2582,27 +2512,23 @@ msgstr ""
 msgid "Set the repetitions for each set"
 msgstr ""
 
-#: manager/templates/workout/view.html:73
+#: manager/templates/workout/view.html:75
 msgid "Export this workout as a calendar file."
 msgstr ""
 
-#: manager/templates/workout/view.html:144
+#: manager/templates/workout/view.html:156
 msgid "Logs"
 msgstr ""
 
-#: manager/templates/workout/view.html:146
+#: manager/templates/workout/view.html:159
 msgid "View logs"
 msgstr ""
 
-#: manager/templates/workout/view.html:169 manager/views/schedule_step.py:99
-msgid "Edit workout"
-msgstr ""
-
-#: manager/templates/workout/view.html:182 manager/views/workout.py:281
+#: manager/templates/workout/view.html:195 manager/views/workout.py:281
 msgid "Mark as template"
 msgstr ""
 
-#: manager/views/day.py:109
+#: manager/views/day.py:105
 msgid "Add workout day"
 msgstr ""
 
@@ -2619,6 +2545,10 @@ msgstr ""
 msgid "Create schedule"
 msgstr ""
 
+#: manager/views/schedule_step.py:99
+msgid "Edit workout"
+msgstr ""
+
 #: manager/views/workout.py:209
 msgid "Copy workout"
 msgstr ""
@@ -2740,7 +2670,7 @@ msgstr ""
 msgid "Unit amount, e.g. \"1 Cup\" or \"1/2 spoon\""
 msgstr ""
 
-#: nutrition/models/log.py:52 nutrition/models/meal.py:50
+#: nutrition/models/log.py:52 nutrition/models/meal.py:48
 #: nutrition/models/meal_item.py:48 nutrition/models/plan.py:108
 msgid "Nutrition plan"
 msgstr ""
@@ -2753,11 +2683,11 @@ msgstr ""
 msgid "Date and Time (Approx.)"
 msgstr ""
 
-#: nutrition/models/meal.py:62
+#: nutrition/models/meal.py:60
 msgid "Time (approx)"
 msgstr ""
 
-#: nutrition/models/meal.py:69
+#: nutrition/models/meal.py:67
 msgid ""
 "Give meals a textual description / name such as \"Breakfast\" or \"after "
 "workout\""
@@ -2876,10 +2806,6 @@ msgstr ""
 msgid "Search"
 msgstr ""
 
-#: nutrition/templates/ingredient/overview.html:62
-msgid "Add ingredient"
-msgstr ""
-
 #: nutrition/templates/ingredient/view.html:45 nutrition/views/plan.py:229
 msgid "Macronutrients"
 msgstr ""
@@ -2899,20 +2825,11 @@ msgstr ""
 msgid "Others"
 msgstr ""
 
-#: nutrition/templates/ingredient/view.html:144
-#: nutrition/templates/units/list.html:46 nutrition/views/unit.py:86
+#: nutrition/templates/ingredient/view.html:143
+#: nutrition/templates/units/list.html:50 nutrition/views/unit.py:86
 msgid "Add new weight unit"
 msgstr ""
 
-#: nutrition/templates/ingredient/view.html:206
-#: nutrition/templates/ingredient/view.html:209
-msgid "Edit ingredient"
-msgstr ""
-
-#: nutrition/templates/ingredient/view.html:213
-msgid "Delete ingredient"
-msgstr ""
-
 #: nutrition/templates/rate/form.html:25
 msgid "Basal metabolic rate"
 msgstr ""
diff --git a/wger/locale/hr/LC_MESSAGES/django.po b/wger/locale/hr/LC_MESSAGES/django.po
index 00292094f..7b9145ea1 100644
--- a/wger/locale/hr/LC_MESSAGES/django.po
+++ b/wger/locale/hr/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-07-14 15:49+0200\n"
+"POT-Creation-Date: 2024-11-14 13:09+0100\n"
 "PO-Revision-Date: 2024-07-31 17:09+0000\n"
 "Last-Translator: Milo Ivir <mail@milotype.de>\n"
 "Language-Team: Croatian <https://hosted.weblate.org/projects/wger/web/hr/>\n"
@@ -19,7 +19,7 @@ msgstr ""
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Weblate 5.7-dev\n"
 
-#: config/models/gym_config.py:46 gym/templates/gym/list.html:53
+#: config/models/gym_config.py:46 gym/templates/gym/list.html:56
 msgid "Default gym"
 msgstr "Standardna teretana"
 
@@ -32,28 +32,28 @@ msgstr ""
 "registrirane korisnike ovoj teretani i aktualizirati sve postojeće korisnike "
 "bez teretane."
 
-#: config/views/gym_config.py:42 core/templates/language/view.html:67
-#: core/templates/license/list.html:17 core/templates/misc/license/list.html:18
+#: config/views/gym_config.py:42 core/templates/language/view.html:64
+#: core/templates/license/list.html:17
 #: core/templates/repetition_unit/list.html:18
-#: core/templates/tags/render_day.html:39
-#: core/templates/tags/render_day.html:75 core/templates/user/overview.html:204
-#: core/templates/user/overview.html:445
+#: core/templates/user/overview.html:204 core/templates/user/overview.html:467
 #: core/templates/weight_unit/list.html:18
 #: exercises/templates/categories/admin-overview.html:17
 #: exercises/templates/equipment/admin-overview.html:17
-#: exercises/templates/muscles/admin-overview.html:17
-#: gallery/views/images.py:98 gym/templates/admin_notes/list.html:32
-#: gym/templates/contract/list.html:31 gym/templates/contract/view.html:107
-#: gym/templates/contract_option/list.html:32
-#: gym/templates/contract_type/list.html:32 gym/templates/document/list.html:38
-#: gym/templates/gym/list.html:20 gym/templates/gym/list.html:46
-#: gym/templates/gym/member_list.html:87 gym/templates/gym/member_list.html:140
-#: gym/templates/gym/member_list.html:176
-#: manager/templates/calendar/day.html:68
-#: manager/templates/calendar/month.html:85
-#: manager/templates/calendar/partial_overview_table.html:18
-#: manager/templates/schedule/view.html:118
-#: nutrition/templates/ingredient/view.html:165
+#: exercises/templates/muscles/admin-overview.html:16
+#: gallery/views/images.py:98 gym/templates/admin_notes/list.html:31
+#: gym/templates/contract/list.html:30 gym/templates/contract/view.html:106
+#: gym/templates/contract_option/list.html:29
+#: gym/templates/contract_type/list.html:30 gym/templates/document/list.html:38
+#: gym/templates/gym/list.html:19 gym/templates/gym/list.html:48
+#: gym/templates/gym/member_list.html:94 gym/templates/gym/member_list.html:152
+#: gym/templates/gym/member_list.html:190
+#: manager/templates/calendar/day.html:67
+#: manager/templates/calendar/month.html:84
+#: manager/templates/calendar/partial_overview_table.html:16
+#: manager/templates/schedule/view.html:318
+#: manager/templates/workout/view.html:181
+#: nutrition/templates/ingredient/view.html:164
+#: nutrition/templates/ingredient/view.html:209
 #: nutrition/templates/units/list.html:19
 msgid "Edit"
 msgstr "Uredi"
@@ -87,8 +87,8 @@ msgstr "Moj raspored treninga"
 msgid "Empty placeholder schedule"
 msgstr "Prazan primjer rasporeda"
 
-#: core/forms.py:69 core/templates/navigation.html:285
-#: core/templates/navigation.html:291 core/templates/user/login.html:4
+#: core/forms.py:69 core/templates/navigation.html:284
+#: core/templates/navigation.html:290 core/templates/user/login.html:4
 #: software/templates/features.html:82 software/templates/features.html:427
 msgid "Login"
 msgstr "Prijava"
@@ -98,14 +98,14 @@ msgstr "Prijava"
 msgid "First name"
 msgstr "Ime"
 
-#: core/forms.py:109 core/forms.py:215 core/templates/user/overview.html:266
+#: core/forms.py:109 core/forms.py:215 core/templates/user/overview.html:284
 #: gym/views/export.py:62 gym/views/gym.py:217
 msgid "Last name"
 msgstr "Prezime"
 
-#: core/forms.py:111 core/forms.py:180 core/templates/user/overview.html:270
+#: core/forms.py:111 core/forms.py:180 core/templates/user/overview.html:288
 #: gym/models/contract.py:256 gym/models/gym.py:58
-#: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:104
+#: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:116
 #: gym/templates/gym/new_user.html:30 gym/views/export.py:60
 #: mailer/templates/mailer/gym/form.html:4
 #: mailer/templates/mailer/gym/overview.html:4
@@ -135,8 +135,8 @@ msgstr "Podsjetitelji za treninge"
 msgid "Other settings"
 msgstr "Druge postavke"
 
-#: core/forms.py:174 core/views/user.py:624 core/views/user.py:639
-#: core/views/user.py:651 gym/forms.py:73 manager/templates/log/add.html:65
+#: core/forms.py:174 core/views/user.py:623 core/views/user.py:638
+#: core/views/user.py:650 gym/forms.py:73 manager/templates/log/add.html:65
 #: manager/templates/set/add.html:70 manager/views/workout.py:203
 #: utils/generic_views.py:143
 msgid "Save"
@@ -160,26 +160,25 @@ msgstr "Lozinka"
 msgid "Please enter your current password."
 msgstr "Upiši svoju aktualnu lozinku."
 
-#: core/forms.py:242 core/templates/language/view.html:73
-#: core/templates/license/list.html:19 core/templates/misc/license/list.html:22
-#: core/templates/repetition_unit/list.html:20
-#: core/templates/tags/render_day.html:45
-#: core/templates/tags/render_day.html:81 core/templates/user/overview.html:217
-#: core/templates/weight_unit/list.html:20
-#: exercises/templates/categories/admin-overview.html:19
-#: exercises/templates/equipment/admin-overview.html:19
-#: exercises/templates/muscles/admin-overview.html:19
-#: gym/templates/admin_notes/list.html:40
-#: gym/templates/contract_option/list.html:41
-#: gym/templates/contract_type/list.html:41 gym/templates/document/list.html:46
-#: gym/templates/gym/list.html:22 manager/templates/calendar/day.html:73
-#: manager/templates/calendar/month.html:89
-#: manager/templates/calendar/partial_overview_table.html:23
-#: manager/templates/schedule/view.html:122
-#: manager/templates/workout/view.html:188
-#: nutrition/templates/ingredient/view.html:166
+#: core/forms.py:242 core/templates/language/view.html:70
+#: core/templates/license/list.html:21
+#: core/templates/repetition_unit/list.html:22
+#: core/templates/user/overview.html:233
+#: core/templates/weight_unit/list.html:22
+#: exercises/templates/categories/admin-overview.html:21
+#: exercises/templates/equipment/admin-overview.html:21
+#: exercises/templates/muscles/admin-overview.html:20
+#: gym/templates/admin_notes/list.html:37
+#: gym/templates/contract_option/list.html:35
+#: gym/templates/contract_type/list.html:36 gym/templates/document/list.html:46
+#: gym/templates/gym/list.html:23 manager/templates/calendar/day.html:73
+#: manager/templates/calendar/month.html:88
+#: manager/templates/calendar/partial_overview_table.html:22
+#: manager/templates/schedule/view.html:324
+#: manager/templates/workout/view.html:202
+#: nutrition/templates/ingredient/view.html:168
 #: nutrition/templates/ingredient/view.html:215
-#: nutrition/templates/units/list.html:22
+#: nutrition/templates/units/list.html:25
 msgid "Delete"
 msgstr "Izbriši"
 
@@ -191,9 +190,9 @@ msgstr "Neispravna lozinka"
 msgid "The form is secured with reCAPTCHA"
 msgstr "Obrazac je zaštićen pomoću reCAPTCHA"
 
-#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:285
-#: core/templates/navigation.html:297 core/templates/template.html:149
-#: core/templates/user/login.html:20 core/views/user.py:298
+#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:284
+#: core/templates/navigation.html:296 core/templates/template.html:151
+#: core/templates/user/login.html:20 core/views/user.py:297
 #: software/templates/features.html:87 software/templates/features.html:422
 msgid "Register"
 msgstr "Registracija"
@@ -441,18 +440,18 @@ msgid "The sum of all hours has to be 24"
 msgstr "Zbroj svih sati mora biti 24"
 
 #: core/models/rep_unit.py:36 core/models/weight_unit.py:36
-#: core/templates/user/overview.html:262 core/views/user.py:599
+#: core/templates/user/overview.html:280 core/views/user.py:598
 #: exercises/models/category.py:29 exercises/models/equipment.py:29
 #: exercises/models/exercise.py:59 exercises/models/muscle.py:36
 #: gym/models/contract.py:52 gym/models/contract.py:103 gym/models/gym.py:46
 #: gym/models/user_document.py:84 gym/templates/contract/view.html:50
-#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:96
+#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:108
 #: gym/views/gym.py:158 manager/models/schedule.py:55
 #: manager/models/workout.py:57 measurements/models/category.py:36
 #: nutrition/models/ingredient.py:111
-#: nutrition/models/ingredient_category.py:27 nutrition/models/meal.py:67
+#: nutrition/models/ingredient_category.py:27 nutrition/models/meal.py:65
 #: nutrition/models/weight_unit.py:38
-#: nutrition/templates/ingredient/view.html:152
+#: nutrition/templates/ingredient/view.html:151
 msgid "Name"
 msgstr "Ime"
 
@@ -504,7 +503,7 @@ msgstr ""
 msgid "Back to \"%(target)s\""
 msgstr "Natrag na „%(target)s”"
 
-#: core/templates/delete.html:15
+#: core/templates/delete.html:4
 msgid "Are you sure you want to delete this? This action cannot be undone."
 msgstr "Stvarno želiš ovo izbrisati? Ova je nepovratna radnja."
 
@@ -558,7 +557,7 @@ msgstr ""
 msgid "Dashboard"
 msgstr "Kontrolna ploča"
 
-#: core/templates/language/overview.html:4 core/templates/navigation.html:345
+#: core/templates/language/overview.html:4 core/templates/navigation.html:344
 msgid "Languages"
 msgstr "Jezici"
 
@@ -568,81 +567,72 @@ msgstr "Ništa nije pronađeno."
 
 #: core/templates/language/overview.html:22
 #: manager/templates/calendar/month.html:132
-#: manager/templates/schedule/overview.html:28
-#: manager/templates/schedule/view.html:144
+#: manager/templates/schedule/view.html:154
 #: manager/templates/workout/overview.html:28
 #: nutrition/templates/ingredient/overview.html:38
 msgid "Add one now."
 msgstr "Dodaj jedan sada."
 
-#: core/templates/language/overview.html:35 core/templates/license/list.html:40
-#: core/templates/misc/license/list.html:43
-#: core/templates/repetition_unit/list.html:43
-#: core/templates/user/overview.html:326 core/templates/user/overview.html:365
-#: core/templates/user/overview.html:401
-#: core/templates/weight_unit/list.html:43 core/views/languages.py:74
+#: core/templates/language/overview.html:34 core/templates/license/list.html:43
+#: core/templates/repetition_unit/list.html:46
+#: core/templates/user/overview.html:344 core/templates/user/overview.html:384
+#: core/templates/user/overview.html:422
+#: core/templates/weight_unit/list.html:46 core/views/languages.py:74
 #: core/views/license.py:66 core/views/repetition_units.py:66
 #: core/views/weight_units.py:66
-#: exercises/templates/categories/admin-overview.html:38
-#: gallery/views/images.py:63 gym/templates/admin_notes/list.html:67
-#: gym/templates/contract/list.html:73
-#: gym/templates/contract_option/list.html:72
-#: gym/templates/contract_type/list.html:72 gym/templates/document/list.html:79
-#: gym/templates/gym/member_list.html:211
-#: gym/templates/gym/member_list.html:244
-#: gym/templates/gym/member_list.html:281
+#: exercises/templates/categories/admin-overview.html:40
+#: exercises/templates/equipment/admin-overview.html:39
+#: exercises/templates/muscles/admin-overview.html:40
+#: gallery/views/images.py:63 gym/templates/admin_notes/list.html:64
+#: gym/templates/contract/list.html:69
+#: gym/templates/contract_option/list.html:65
+#: gym/templates/contract_type/list.html:66 gym/templates/document/list.html:78
+#: gym/templates/gym/member_list.html:228
+#: gym/templates/gym/member_list.html:264
+#: gym/templates/gym/member_list.html:303
 #: mailer/templates/mailer/gym/overview.html:43
+#: nutrition/templates/ingredient/overview.html:60
 msgid "Add"
 msgstr "Dodaj"
 
 #: core/templates/language/view.html:61 core/templates/user/api_key.html:44
-#: core/templates/user/preferences.html:45 gym/models/contract.py:203
-#: gym/templates/contract/view.html:41 gym/templates/contract/view.html:106
-#: gym/templates/gym/member_list.html:248
-#: manager/templates/schedule/view.html:285
-#: manager/templates/workout/view.html:163
-#: nutrition/templates/ingredient/view.html:202
+#: core/templates/user/preferences.html:50 gym/models/contract.py:203
+#: gym/templates/contract/view.html:41 gym/templates/gym/member_list.html:270
+#: manager/templates/schedule/view.html:304
+#: manager/templates/workout/view.html:177
+#: nutrition/templates/ingredient/view.html:206
 msgid "Options"
 msgstr "Opcije"
 
-#: core/templates/license/list.html:4 core/templates/misc/license/list.html:4
+#: core/templates/license/list.html:4
 msgid "License list"
 msgstr "Popis licenca"
 
-#: core/templates/license/list.html:26 core/templates/misc/license/list.html:30
-#: core/templates/repetition_unit/list.html:28
+#: core/templates/license/list.html:30
+#: core/templates/repetition_unit/list.html:32
 #: core/templates/user/overview.html:104 core/templates/user/overview.html:136
-#: core/templates/user/overview.html:185 core/templates/user/overview.html:347
-#: core/templates/user/overview.html:383 core/templates/user/overview.html:427
-#: core/templates/weight_unit/list.html:28
-#: exercises/templates/categories/admin-overview.html:26
-#: exercises/templates/equipment/admin-overview.html:26
-#: exercises/templates/muscles/admin-overview.html:26
-#: gym/templates/admin_notes/list.html:52 gym/templates/contract/list.html:60
-#: gym/templates/contract_option/list.html:58
-#: gym/templates/contract_type/list.html:58 gym/templates/document/list.html:64
-#: gym/templates/gym/list.html:29 gym/templates/gym/member_list.html:229
-#: gym/templates/gym/member_list.html:262
-#: gym/templates/gym/member_list.html:299
+#: core/templates/user/overview.html:185 core/templates/user/overview.html:365
+#: core/templates/user/overview.html:404 core/templates/user/overview.html:448
+#: core/templates/weight_unit/list.html:32
+#: exercises/templates/categories/admin-overview.html:30
+#: exercises/templates/equipment/admin-overview.html:30
+#: exercises/templates/muscles/admin-overview.html:29
+#: gym/templates/admin_notes/list.html:50 gym/templates/contract/list.html:57
+#: gym/templates/contract_option/list.html:52
+#: gym/templates/contract_type/list.html:53 gym/templates/document/list.html:64
+#: gym/templates/gym/list.html:32 gym/templates/gym/member_list.html:248
+#: gym/templates/gym/member_list.html:284
+#: gym/templates/gym/member_list.html:321
 #: mailer/templates/mailer/gym/overview.html:30
-#: manager/templates/calendar/day.html:87
-#: nutrition/templates/units/list.html:29
+#: manager/templates/calendar/day.html:88
+#: nutrition/templates/units/list.html:34
 msgid "Nothing found"
 msgstr "Ništa nije pronađeno"
 
-#: core/templates/misc/about.html:4 core/templates/template.html:175
+#: core/templates/misc/about.html:4 core/templates/template.html:188
 msgid "Imprint"
 msgstr "Impresum"
 
-#: core/templates/misc/license/list.html:47
-msgid ""
-"If a license has been localized, e.g. the Creative Commons\n"
-"            licenses for the different countries, add them as separate "
-"entries here."
-msgstr ""
-"Ako je licenca lokalizirana, npr. Creative Commons\n"
-"            licence za različite zemlje, dodaj ih kao zasebne unose ovdje."
-
 #: core/templates/navigation.html:28 software/templates/features.html:437
 msgid "Training"
 msgstr "Treniranje"
@@ -687,8 +677,8 @@ msgstr "Javni predlošci"
 msgid "Exercises"
 msgstr "Vježbe"
 
-#: core/templates/navigation.html:111 core/templates/navigation.html:184
-#: core/templates/navigation.html:340
+#: core/templates/navigation.html:111 core/templates/navigation.html:185
+#: core/templates/navigation.html:339
 msgid "Administration"
 msgstr "Administracija"
 
@@ -725,87 +715,87 @@ msgstr "Kalkulator indeksa tjelesne mase"
 msgid "Daily calories calculator"
 msgstr "Kalkulator dnevnih kalorija"
 
-#: core/templates/navigation.html:179
+#: core/templates/navigation.html:180
 #: nutrition/templates/ingredient/overview.html:10
 msgid "Ingredient overview"
 msgstr "Pregled sastojaka"
 
-#: core/templates/navigation.html:187 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:189 nutrition/templates/units/list.html:6
 msgid "Ingredient weight units"
 msgstr "Jedinica težine sastojka"
 
-#: core/templates/navigation.html:203 software/templates/features.html:442
+#: core/templates/navigation.html:205 software/templates/features.html:442
 msgid "Body weight"
 msgstr "Tjelesna težina"
 
-#: core/templates/navigation.html:210 core/templates/user/overview.html:114
+#: core/templates/navigation.html:212 core/templates/user/overview.html:114
 msgid "Weight overview"
 msgstr "Pregled težine"
 
-#: core/templates/navigation.html:217 weight/views.py:65
+#: core/templates/navigation.html:216 weight/views.py:65
 msgid "Add weight entry"
 msgstr "Dodaj unos težine"
 
-#: core/templates/navigation.html:231
+#: core/templates/navigation.html:230
 msgid "About this software"
 msgstr "O ovom softveru"
 
-#: core/templates/navigation.html:237 software/templates/about_us.html:5
+#: core/templates/navigation.html:236 software/templates/about_us.html:5
 msgid "About us"
 msgstr "O nama"
 
-#: core/templates/navigation.html:243 software/templates/features.html:507
+#: core/templates/navigation.html:242 software/templates/features.html:507
 msgid "REST API"
 msgstr "REST API"
 
-#: core/templates/navigation.html:249 utils/models.py:45
+#: core/templates/navigation.html:248 utils/models.py:45
 msgid "License"
 msgstr "Licenca"
 
-#: core/templates/navigation.html:255
+#: core/templates/navigation.html:254
 msgid "Developer documentation"
 msgstr "Dokumentacija za programere"
 
-#: core/templates/navigation.html:262
+#: core/templates/navigation.html:261
 msgid "Get the code"
 msgstr "Nabavi kôd"
 
-#: core/templates/navigation.html:269 core/templates/template.html:214
+#: core/templates/navigation.html:268 core/templates/template.html:227
 #: software/templates/features.html:582
 msgid "Translate"
 msgstr "Prevodi"
 
-#: core/templates/navigation.html:303 core/templates/user/login.html:28
+#: core/templates/navigation.html:302 core/templates/user/login.html:28
 msgid "Reset password"
 msgstr "Obnovi lozinku"
 
-#: core/templates/navigation.html:321
+#: core/templates/navigation.html:320
 msgid "My preferences"
 msgstr "Moje postavke"
 
-#: core/templates/navigation.html:330
+#: core/templates/navigation.html:329
 msgid "Logout"
 msgstr "Odjava"
 
-#: core/templates/navigation.html:353
+#: core/templates/navigation.html:352
 msgid "Licenses"
 msgstr "Licence"
 
-#: core/templates/navigation.html:361
+#: core/templates/navigation.html:360
 #: core/templates/repetition_unit/list.html:4
 msgid "Repetition units"
 msgstr "Jedinice ponavljanja"
 
-#: core/templates/navigation.html:369 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:368 core/templates/weight_unit/list.html:4
 #: nutrition/templates/ingredient/view.html:141
 msgid "Weight units"
 msgstr "Jedinice težine"
 
-#: core/templates/navigation.html:377 core/templates/user/list.html:4
+#: core/templates/navigation.html:376 core/templates/user/list.html:4
 msgid "User list"
 msgstr "Popis korisnika"
 
-#: core/templates/navigation.html:383
+#: core/templates/navigation.html:382
 msgid "Gyms"
 msgstr "Teretane"
 
@@ -868,56 +858,31 @@ msgstr "prethodno"
 msgid "next"
 msgstr "dalje"
 
-#: core/templates/tags/render_day.html:34
-msgid "Add weight log"
-msgstr "Dodaj zapis težine"
-
-#: core/templates/tags/render_day.html:116
-msgid "Placeholder image for exercise"
+#: core/templates/tags/render_day.html:44
+#, fuzzy
+#| msgid "Placeholder image for exercise"
+msgid "Placeholder image for translation"
 msgstr "Primjer slike za vježbu"
 
-#: core/templates/tags/render_day.html:133
-msgid "This exercise has no repetitions."
-msgstr "Ova vježba nema ponavljanja."
-
-#: core/templates/tags/render_day.html:136
-msgid "Edit them now."
-msgstr "Uredi ih sada."
-
-#: core/templates/tags/render_day.html:162
-msgid "Add exercises to this workout day"
-msgstr "Dodaj vježbe za ovaj dan treninga"
-
-#: core/templates/tags/render_weight_log.html:17 manager/helpers.py:86
-#: manager/models/setting.py:72 manager/templates/set/formset.html:9
-msgid "Reps"
-msgstr "Ponavljanja"
-
-#: core/templates/tags/render_weight_log.html:30 manager/forms.py:191
-#: manager/models/log.py:103 manager/models/setting.py:102
-#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
-msgid "RiR"
-msgstr "PUR"
-
-#: core/templates/template.html:122 manager/templates/calendar/month.html:138
-#: manager/templates/schedule/view.html:248
-#: manager/templates/schedule/view.html:269
-#: manager/templates/workout/view.html:84
-#: manager/templates/workout/view.html:137
+#: core/templates/template.html:124 manager/templates/calendar/month.html:138
+#: manager/templates/schedule/view.html:262
+#: manager/templates/schedule/view.html:287
+#: manager/templates/workout/view.html:89
+#: manager/templates/workout/view.html:149
 msgid "Close"
 msgstr "Zatvori"
 
-#: core/templates/template.html:138
+#: core/templates/template.html:140
 msgid ""
 "You are using a guest account, data entered will be deleted after a week."
 msgstr ""
 "Koristiš račun gosta, upisani podaci će se izbrisati nakon tjedan dana."
 
-#: core/templates/template.html:143
+#: core/templates/template.html:145
 msgid "Create some demo entries"
 msgstr "Stvori neke demo snimke"
 
-#: core/templates/template.html:180 software/templates/features.html:547
+#: core/templates/template.html:193 software/templates/features.html:547
 #: software/templates/tos.html:7
 msgid "Terms of service"
 msgstr "Uvjeti usluge"
@@ -926,7 +891,7 @@ msgstr "Uvjeti usluge"
 msgid "Features"
 msgstr "Značajke"
 
-#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:54
+#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:59
 msgid "API key"
 msgstr "API ključ"
 
@@ -970,17 +935,17 @@ msgstr "Generiraj novi API ključ"
 msgid "Documentation"
 msgstr "Dokumentacija"
 
-#: core/templates/user/delete_account.html:4
-#: core/templates/user/preferences.html:59
+#: core/templates/user/delete_account.html:3
+#: core/templates/user/preferences.html:62
 msgid "Delete account"
 msgstr "Izbriši račun"
 
-#: core/templates/user/delete_account.html:17
+#: core/templates/user/delete_account.html:9
 #: exercises/templates/history/overview.html:93
 msgid "Are you sure?"
 msgstr "Jesi li siguran/na?"
 
-#: core/templates/user/delete_account.html:22
+#: core/templates/user/delete_account.html:14
 #, python-format
 msgid ""
 "This action will delete the user account \"%(username)s\".\n"
@@ -1003,22 +968,22 @@ msgstr "Zaboravio/la si lozinku?"
 
 #: core/templates/user/overview.html:25 core/templates/user/overview.html:68
 #: core/templates/user/overview.html:112 core/templates/user/overview.html:144
-#: core/templates/user/overview.html:330 core/templates/user/overview.html:369
-#: core/templates/user/overview.html:405
+#: core/templates/user/overview.html:348 core/templates/user/overview.html:390
+#: core/templates/user/overview.html:426
 #, python-format
 msgid "last %(number)s"
 msgstr "zadnjih %(number)s"
 
 #: core/templates/user/overview.html:27 core/templates/user/overview.html:146
-#: core/templates/user/overview.html:325 core/templates/user/overview.html:364
-#: core/templates/user/overview.html:400 gym/templates/gym/member_list.html:210
-#: gym/templates/gym/member_list.html:243
-#: gym/templates/gym/member_list.html:280
+#: core/templates/user/overview.html:343 core/templates/user/overview.html:382
+#: core/templates/user/overview.html:421 gym/templates/gym/member_list.html:226
+#: gym/templates/gym/member_list.html:262
+#: gym/templates/gym/member_list.html:302
 msgid "Overview"
 msgstr "Pregled"
 
 #: core/templates/user/overview.html:28
-#: manager/templates/schedule/view.html:163
+#: manager/templates/schedule/view.html:172
 #: manager/templates/workout/overview.html:39 manager/views/schedule_step.py:60
 msgid "Add workout"
 msgstr "Dodaj trening"
@@ -1050,38 +1015,36 @@ msgstr "Opis"
 msgid "Number of logs (days)"
 msgstr "Broj zapisa (u danima)"
 
-#: core/templates/user/overview.html:37 core/views/user.py:600
+#: core/templates/user/overview.html:37 core/views/user.py:599
 #: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:158
 msgid "Last activity"
 msgstr "Zadnja aktivnost"
 
 #: core/templates/user/overview.html:58
 #: manager/templates/calendar/month.html:128
-#: manager/templates/schedule/view.html:144
 #: manager/templates/workout/overview.html:28
 msgid "No workouts found."
 msgstr "Nije pronađen nijedan trening."
 
 #: core/templates/user/overview.html:68 manager/forms.py:280
-#: manager/templates/workout/view.html:106
+#: manager/templates/workout/view.html:114
 msgid "Log"
 msgstr "Zapis"
 
 #: core/templates/user/overview.html:77 manager/models/session.py:83
-#: manager/templates/calendar/partial_overview_table.html:52
+#: manager/templates/calendar/partial_overview_table.html:54
 msgid "General impression"
 msgstr "Opći dojam"
 
-#: core/templates/user/overview.html:78 core/templates/user/overview.html:369
+#: core/templates/user/overview.html:78 core/templates/user/overview.html:390
 #: manager/models/session.py:73
-#: manager/templates/calendar/partial_overview_table.html:56
-#: manager/templates/workout/log.html:89
+#: manager/templates/calendar/partial_overview_table.html:58
 msgid "Notes"
 msgstr "Bilješke"
 
 #: core/templates/user/overview.html:79
 #: exercises/templates/history/overview.html:30
-#: manager/templates/calendar/partial_overview_table.html:42
+#: manager/templates/calendar/partial_overview_table.html:44
 msgid "Time"
 msgstr "Vrijeme"
 
@@ -1119,121 +1082,121 @@ msgstr "Mast"
 msgid "kcal"
 msgstr "kcal"
 
-#: core/templates/user/overview.html:201 core/templates/user/overview.html:322
-#: core/templates/user/overview.html:361 core/templates/user/overview.html:397
-#: core/templates/user/overview.html:442 gym/templates/gym/list.html:42
-#: gym/templates/gym/member_list.html:84 gym/templates/gym/member_list.html:137
-#: gym/templates/gym/member_list.html:173
-#: gym/templates/gym/member_list.html:207
-#: gym/templates/gym/member_list.html:240
-#: gym/templates/gym/member_list.html:277
-#: manager/templates/schedule/view.html:100
+#: core/templates/user/overview.html:201 core/templates/user/overview.html:340
+#: core/templates/user/overview.html:379 core/templates/user/overview.html:418
+#: core/templates/user/overview.html:463 gym/templates/gym/list.html:45
+#: gym/templates/gym/member_list.html:91 gym/templates/gym/member_list.html:149
+#: gym/templates/gym/member_list.html:187
+#: gym/templates/gym/member_list.html:223
+#: gym/templates/gym/member_list.html:259
+#: gym/templates/gym/member_list.html:299
+#: manager/templates/schedule/view.html:99
 msgid "Actions"
 msgstr "Radnje"
 
-#: core/templates/user/overview.html:207
+#: core/templates/user/overview.html:210
 msgid "Deactivate user"
 msgstr "Deaktiviraj korisnika"
 
-#: core/templates/user/overview.html:209
+#: core/templates/user/overview.html:214
 msgid "Activate user"
 msgstr "Aktiviraj korisnika"
 
-#: core/templates/user/overview.html:211
+#: core/templates/user/overview.html:223
 msgid "Reset user password"
 msgstr "Obnovi korisničku lozinku"
 
-#: core/templates/user/overview.html:214 gym/templates/gym/member_list.html:30
+#: core/templates/user/overview.html:227 gym/templates/gym/member_list.html:30
 msgid "Roles"
 msgstr "Uloge"
 
-#: core/templates/user/overview.html:225
+#: core/templates/user/overview.html:243
 msgid "Password reset confirmation"
 msgstr "Potvrda obnavljanja lozinke"
 
-#: core/templates/user/overview.html:229
+#: core/templates/user/overview.html:247
 msgid "Do you really want to change this user&#39;s password?"
 msgstr "Stvarno želiš promijeniti lozinku ovog korisnika?"
 
-#: core/templates/user/overview.html:232
+#: core/templates/user/overview.html:250
 #: exercises/templates/history/overview.html:106
 msgid "No"
 msgstr "Ne"
 
-#: core/templates/user/overview.html:233
+#: core/templates/user/overview.html:251
 #: exercises/templates/history/overview.html:99
 msgid "Yes"
 msgstr "Da"
 
-#: core/templates/user/overview.html:254 gym/templates/gym/member_list.html:93
+#: core/templates/user/overview.html:272 gym/templates/gym/member_list.html:105
 msgid "Details"
 msgstr "Detalji"
 
-#: core/templates/user/overview.html:258 gym/views/export.py:57
-#: manager/helpers.py:86 manager/templates/schedule/view.html:98
+#: core/templates/user/overview.html:276 gym/views/export.py:57
+#: manager/helpers.py:86 manager/templates/schedule/view.html:97
 msgid "Nr."
 msgstr "Br."
 
-#: core/templates/user/overview.html:280 gym/models/contract.py:287
+#: core/templates/user/overview.html:298 gym/models/contract.py:287
 #: gym/models/gym.py:50 gym/templates/contract/view.html:75
-#: gym/templates/gym/member_list.html:100 gym/views/export.py:68
+#: gym/templates/gym/member_list.html:112 gym/views/export.py:68
 msgid "Phone"
 msgstr "Telefon"
 
-#: core/templates/user/overview.html:284 gym/templates/contract/view.html:87
-#: gym/templates/gym/member_list.html:118
+#: core/templates/user/overview.html:302 gym/templates/contract/view.html:87
+#: gym/templates/gym/member_list.html:130
 msgid "Address"
 msgstr "Adresa"
 
-#: core/templates/user/overview.html:295
+#: core/templates/user/overview.html:313
 msgid "Registered"
 msgstr "Registriran"
 
-#: core/templates/user/overview.html:299
+#: core/templates/user/overview.html:317
 msgid "Last login"
 msgstr "Zadnja prijava"
 
-#: core/templates/user/overview.html:304
+#: core/templates/user/overview.html:322
 msgid "Status"
 msgstr "Stanje"
 
-#: core/templates/user/overview.html:307
+#: core/templates/user/overview.html:325
 msgid "Active"
 msgstr "Aktivno"
 
-#: core/templates/user/overview.html:309
+#: core/templates/user/overview.html:327
 msgid "Inactive"
 msgstr "Neaktivno"
 
-#: core/templates/user/overview.html:330 gym/templates/contract/list.html:4
-#: gym/templates/gym/member_list.html:202
+#: core/templates/user/overview.html:348 gym/templates/contract/list.html:4
+#: gym/templates/gym/member_list.html:218
 msgid "Contracts"
 msgstr "Ugovori"
 
-#: core/templates/user/overview.html:405 gym/templates/document/list.html:4
+#: core/templates/user/overview.html:426 gym/templates/document/list.html:4
 msgid "Documents"
 msgstr "Dokumenti"
 
-#: core/templates/user/overview.html:412 gym/templates/document/list.html:32
-#: manager/forms.py:292 manager/templates/workout/view.html:132
+#: core/templates/user/overview.html:433 gym/templates/document/list.html:33
+#: manager/forms.py:292 manager/templates/workout/view.html:143
 msgid "Download"
 msgstr "Preuzimanje"
 
-#: core/templates/user/overview.html:450 gym/views/admin_config.py:44
+#: core/templates/user/overview.html:474 gym/views/admin_config.py:44
 #: gym/views/admin_config.py:58 gym/views/user_config.py:46
 msgid "Configuration"
 msgstr "Konfiguracija"
 
-#: core/templates/user/overview.html:453 gym/models/user_config.py:92
+#: core/templates/user/overview.html:477 gym/models/user_config.py:92
 msgid "Include in inactive overview"
 msgstr "Uključi u neaktivni pregled"
 
-#: core/templates/user/overview.html:486
+#: core/templates/user/overview.html:510
 #, python-format
 msgid "Admin login is only available for users in %(gym_name)s"
 msgstr "Administratorska prijava je dostupna samo korisnicima u %(gym_name)s"
 
-#: core/templates/user/overview.html:490
+#: core/templates/user/overview.html:514
 msgid "Log in as this user"
 msgstr "Prijavi se kao ovaj korisnik"
 
@@ -1253,19 +1216,19 @@ msgstr "Neovjerena e-mail adresa"
 msgid "Send verification email"
 msgstr "Pošalji e-mail za ovjeru"
 
-#: core/templates/user/preferences.html:30
+#: core/templates/user/preferences.html:31
 msgid "You need to verify your email to contribute exercises"
 msgstr "Za dodavanje vježbi moraš ovjeriti tvoju e-mail adresu"
 
-#: core/templates/user/preferences.html:50 core/views/user.py:611
+#: core/templates/user/preferences.html:55 core/views/user.py:610
 msgid "Change password"
 msgstr "Promjeni lozinku"
 
-#: core/templatetags/wger_extras.py:205 i18n.tpl:37
+#: core/templatetags/wger_extras.py:197 i18n.tpl:37
 msgid "kg"
 msgstr "kg"
 
-#: core/templatetags/wger_extras.py:207
+#: core/templatetags/wger_extras.py:199
 #: nutrition/templates/ingredient/view.html:60
 #: nutrition/templates/ingredient/view.html:66
 #: nutrition/templates/ingredient/view.html:73
@@ -1277,11 +1240,11 @@ msgctxt "weight unit, i.e. grams"
 msgid "g"
 msgstr "g"
 
-#: core/templatetags/wger_extras.py:210 i18n.tpl:38
+#: core/templatetags/wger_extras.py:202 i18n.tpl:38
 msgid "lb"
 msgstr "funta"
 
-#: core/templatetags/wger_extras.py:212
+#: core/templatetags/wger_extras.py:204
 msgctxt "weight unit, i.e. ounces"
 msgid "oz"
 msgstr "unca"
@@ -1308,13 +1271,13 @@ msgid "Delete {0}?"
 msgstr "Izbrisati {0}?"
 
 #: core/views/languages.py:111 core/views/license.py:85
-#: core/views/repetition_units.py:86 core/views/user.py:474
+#: core/views/repetition_units.py:86 core/views/user.py:473
 #: core/views/weight_units.py:86 exercises/views/categories.py:98
 #: exercises/views/equipment.py:81 exercises/views/muscles.py:87
 #: gym/views/admin_notes.py:161 gym/views/config.py:68
 #: gym/views/contract.py:186 gym/views/contract_option.py:123
 #: gym/views/contract_type.py:123 gym/views/document.py:171
-#: gym/views/gym.py:463 manager/views/day.py:100 manager/views/schedule.py:333
+#: gym/views/gym.py:463 manager/views/day.py:96 manager/views/schedule.py:333
 #: manager/views/workout.py:267 nutrition/views/ingredient.py:145
 #: nutrition/views/unit.py:143
 #, python-brace-format
@@ -1343,48 +1306,48 @@ msgstr "Pošalji"
 msgid "Your feedback was successfully sent. Thank you!"
 msgstr "Tvoje povratne informacije su uspješno poslane. Hvala!"
 
-#: core/views/user.py:156
+#: core/views/user.py:155
 #, python-brace-format
 msgid "Account \"{0}\" was successfully deleted"
 msgstr "Račun „{0}” je uspješno izbrisan"
 
-#: core/views/user.py:292
+#: core/views/user.py:291
 msgid "You were successfully registered"
 msgstr "Uspješno si registriran/a"
 
-#: core/views/user.py:351
+#: core/views/user.py:350
 msgid "Settings successfully updated"
 msgstr "Postavke su uspješno aktualizirane"
 
-#: core/views/user.py:390
+#: core/views/user.py:389
 msgid "The user was successfully deactivated"
 msgstr "Korisnik je uspješno deaktiviran"
 
-#: core/views/user.py:427
+#: core/views/user.py:426
 msgid "The user was successfully activated"
 msgstr "Korisnik je uspješno aktiviran"
 
-#: core/views/user.py:442
+#: core/views/user.py:441
 msgid "Edit user"
 msgstr "Uredi korisnika"
 
-#: core/views/user.py:597 gym/templates/gym/member_list.html:26
+#: core/views/user.py:596 gym/templates/gym/member_list.html:26
 #: gym/views/gym.py:158
 msgid "ID"
 msgstr "ID"
 
-#: core/views/user.py:598 gym/forms.py:95 gym/templates/contract/view.html:55
+#: core/views/user.py:597 gym/forms.py:95 gym/templates/contract/view.html:55
 #: gym/templates/gym/member_list.html:27 gym/views/export.py:59
 #: gym/views/gym.py:158 gym/views/gym.py:217
 msgid "Username"
 msgstr "Korisničko ime"
 
-#: core/views/user.py:601 gym/templates/gym/new_user.html:34
+#: core/views/user.py:600 gym/templates/gym/new_user.html:34
 #: gym/views/export.py:58 gym/views/gym.py:217
 msgid "Gym"
 msgstr "Teretana"
 
-#: core/views/user.py:660
+#: core/views/user.py:659
 #, python-format
 msgid "A verification email was sent to %(email)s"
 msgstr "E-mail za ovjeru je poslan na %(email)s"
@@ -1536,11 +1499,6 @@ msgstr "Kodek, dugo ime"
 msgid "Equipment list"
 msgstr "Popis opreme"
 
-#: exercises/templates/equipment/admin-overview.html:39
-#: exercises/views/equipment.py:92
-msgid "Add new equipment"
-msgstr "Dodaj novu opremu"
-
 #: exercises/templates/history/overview.html:11
 msgid "Exercise admin history"
 msgstr "Povijest administratora vježbe"
@@ -1588,11 +1546,6 @@ msgstr "Obnovi promjene"
 msgid "Muscle overview"
 msgstr "Pregled mičića"
 
-#: exercises/templates/muscles/admin-overview.html:38
-#: exercises/views/muscles.py:68
-msgid "Add muscle"
-msgstr "Dodaj mičić"
-
 #: exercises/views/categories.py:72
 msgid "Add category"
 msgstr "Dodaj kategoriju"
@@ -1601,6 +1554,10 @@ msgstr "Dodaj kategoriju"
 msgid "This will also delete all exercises in this category."
 msgstr "Ovo će također izbrisati sve vježbe u ovoj kategoriji."
 
+#: exercises/views/equipment.py:92
+msgid "Add new equipment"
+msgstr "Dodaj novu opremu"
+
 #: exercises/views/equipment.py:104 exercises/views/equipment.py:115
 msgid "Delete equipment?"
 msgstr "Izbrisati opremu?"
@@ -1609,6 +1566,10 @@ msgstr "Izbrisati opremu?"
 msgid "This will delete the exercise from all workouts."
 msgstr "Ovo že izbrisati vježbu iz svih treninga."
 
+#: exercises/views/muscles.py:68
+msgid "Add muscle"
+msgstr "Dodaj mičić"
+
 #: gallery/templates/images/overview.html:62
 msgid "Add image"
 msgstr "Dodaj sliku"
@@ -1696,7 +1657,7 @@ msgid "Contract is active"
 msgstr "Ugovor je aktivan"
 
 #: gym/models/contract.py:237 gym/templates/contract/view.html:69
-#: manager/models/schedule.py:61 manager/templates/schedule/view.html:67
+#: manager/models/schedule.py:61 manager/templates/schedule/view.html:66
 msgid "Start date"
 msgstr "Datum početka"
 
@@ -1732,7 +1693,7 @@ msgstr "Administrator: može upravljati korisnicima za teretanu"
 msgid "Admin: can administrate the different gyms"
 msgstr "Administrator: može administrirati razne teretane"
 
-#: gym/models/gym.py:65 gym/templates/gym/member_list.html:114
+#: gym/models/gym.py:65 gym/templates/gym/member_list.html:126
 msgid "Owner"
 msgstr "Vlasnik"
 
@@ -1742,7 +1703,7 @@ msgid ""
 "considered inactive"
 msgstr "Broj tjedana od zadnje korisničke prijave da bi se smatrao neaktivnim"
 
-#: gym/models/gym_config.py:56 gym/templates/gym/member_list.html:152
+#: gym/models/gym_config.py:56 gym/templates/gym/member_list.html:166
 msgid "Show name in header"
 msgstr "Prikaži ime u zaglavlju"
 
@@ -1755,7 +1716,7 @@ msgstr "Prikaži ime teretane u zaglavlju web stranice"
 msgid "Configuration for {self.gym.name}"
 msgstr "Konfiguracija za {self.gym.name}"
 
-#: gym/models/user_config.py:65 gym/templates/gym/member_list.html:184
+#: gym/models/user_config.py:65 gym/templates/gym/member_list.html:200
 msgid "Overview of inactive members"
 msgstr "Pregled neaktivnih članova"
 
@@ -1779,7 +1740,7 @@ msgstr "Koristit će se ime datoteke ako ništa nije navedeno"
 msgid "User notes"
 msgstr "Korisničke bilješke"
 
-#: gym/templates/contract/list.html:36
+#: gym/templates/contract/list.html:34
 msgid "Show"
 msgstr "Prikaži"
 
@@ -1805,11 +1766,11 @@ msgstr "Sljedeći korisnici nisu posjetili teretanu u zadnjih %(weeks)s tjedna"
 msgid "Gym list"
 msgstr "Popis teretana"
 
-#: gym/templates/gym/list.html:50
+#: gym/templates/gym/list.html:53
 msgid "Global gym configuration"
 msgstr "Globalna konfiguracija teretane"
 
-#: gym/templates/gym/list.html:67 gym/views/gym.py:171
+#: gym/templates/gym/list.html:69 gym/views/gym.py:171
 msgid "Add new gym"
 msgstr "Dodaj novu teretanu"
 
@@ -1821,43 +1782,43 @@ msgstr "Administratori i treneri"
 msgid "Gym manager"
 msgstr "Menadžer teretane"
 
-#: gym/templates/gym/member_list.html:69
+#: gym/templates/gym/member_list.html:76
 msgid "This gym has no administrators or trainers"
 msgstr "Ova teretana nema administratora ili trenera"
 
-#: gym/templates/gym/member_list.html:88
+#: gym/templates/gym/member_list.html:98
 msgid "Export"
 msgstr "Izvoz"
 
-#: gym/templates/gym/member_list.html:125
+#: gym/templates/gym/member_list.html:137
 msgid "Members"
 msgstr "Članovi"
 
-#: gym/templates/gym/member_list.html:145
+#: gym/templates/gym/member_list.html:159
 msgid "Gym configuration"
 msgstr "Konfiguracija teretane"
 
-#: gym/templates/gym/member_list.html:148
+#: gym/templates/gym/member_list.html:162
 msgid "Inactive members"
 msgstr "Neaktivni članovi"
 
-#: gym/templates/gym/member_list.html:149
+#: gym/templates/gym/member_list.html:163
 msgid "weeks"
 msgstr "tjedni"
 
-#: gym/templates/gym/member_list.html:181
+#: gym/templates/gym/member_list.html:197
 msgid "My configuration"
 msgstr "Moja konfiguracija"
 
-#: gym/templates/gym/member_list.html:215
+#: gym/templates/gym/member_list.html:234
 msgid "Types"
 msgstr "Vrste"
 
-#: gym/templates/gym/member_list.html:285
+#: gym/templates/gym/member_list.html:307
 msgid "Emails"
 msgstr "E-mail adrese"
 
-#: gym/templates/gym/member_list.html:315
+#: gym/templates/gym/member_list.html:336
 msgid "Add member"
 msgstr "Dodaj člana"
 
@@ -2152,28 +2113,38 @@ msgstr "Također traži imena na engleskom jeziku"
 msgid "Unit"
 msgstr "Jedinica"
 
+#: manager/forms.py:191 manager/models/log.py:103 manager/models/setting.py:102
+#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
+msgid "RiR"
+msgstr "PUR"
+
 #: manager/forms.py:279
 msgid "Type"
 msgstr "Vrsta"
 
-#: manager/forms.py:280 manager/templates/workout/view.html:113
+#: manager/forms.py:280 manager/templates/workout/view.html:122
 msgid "Table"
 msgstr "Tablica"
 
-#: manager/forms.py:282 manager/templates/workout/view.html:119
+#: manager/forms.py:282 manager/templates/workout/view.html:129
 msgid "with images"
 msgstr "sa slikama"
 
-#: manager/forms.py:283 manager/templates/workout/view.html:125
+#: manager/forms.py:283 manager/templates/workout/view.html:136
 msgid "with comments"
 msgstr "s komentarima"
 
+#: manager/helpers.py:86 manager/models/setting.py:72
+#: manager/templates/set/formset.html:9
+msgid "Reps"
+msgstr "Ponavljanja"
+
 #: manager/management/commands/email-reminders.py:121
 msgid "Workout will expire soon"
 msgstr "Trening će uskoro isteći"
 
 #: manager/models/day.py:34 manager/models/log.py:58
-#: manager/models/session.py:60 manager/templates/schedule/view.html:102
+#: manager/models/session.py:60 manager/templates/schedule/view.html:101
 #: manager/templates/workout/view.html:9 manager/templates/workout/view.html:17
 #: manager/views/pdf.py:85 manager/views/pdf.py:161
 #: manager/views/schedule.py:151 manager/views/schedule.py:221
@@ -2196,7 +2167,7 @@ msgstr "Dan"
 msgid "Name or short description of the schedule. For example 'Program XYZ'."
 msgstr "Ime ili kratak opis rasporeda. Na primjer „Program XYZ”."
 
-#: manager/models/schedule.py:65 manager/templates/schedule/view.html:71
+#: manager/models/schedule.py:65 manager/templates/schedule/view.html:70
 msgid "Schedule active"
 msgstr "Raspored je aktivan"
 
@@ -2210,7 +2181,7 @@ msgstr ""
 "se npr. na tvojoj kontrolnoj ploči). Svi ostali rasporedi će se tada "
 "označiti kao neaktivni"
 
-#: manager/models/schedule.py:77 manager/templates/schedule/view.html:81
+#: manager/models/schedule.py:77 manager/templates/schedule/view.html:80
 msgid "Is a loop"
 msgstr "Petlja"
 
@@ -2231,7 +2202,7 @@ msgid "The duration in weeks"
 msgstr "Trajanje u tjednima"
 
 #: manager/models/schedule_step.py:64 manager/models/set.py:53
-#: manager/models/setting.py:113 nutrition/models/meal.py:55
+#: manager/models/setting.py:113 nutrition/models/meal.py:53
 #: nutrition/models/meal_item.py:66
 msgid "Order"
 msgstr "Redoslijed"
@@ -2370,7 +2341,7 @@ msgstr "Pregled zapisa"
 msgid "Workout session"
 msgstr "Sesija treninga"
 
-#: manager/templates/calendar/partial_overview_table.html:27
+#: manager/templates/calendar/partial_overview_table.html:26
 msgid "Delete with logs"
 msgstr "Izbriži sa zapisima"
 
@@ -2393,21 +2364,27 @@ msgstr ""
 "ako za odabrani datum još ne postoji. Ako postoji, jednostavno\n"
 "će se urediti. Unosi težine se uvijek dodaju."
 
-#: manager/templates/schedule/overview.html:5
+#: manager/templates/schedule/overview.html:4
 msgid "Your schedules"
 msgstr "Tvoji rasporedi"
 
 #: manager/templates/schedule/overview.html:19
-#: manager/templates/schedule/view.html:131
-#: manager/templates/schedule/view.html:183
+#: manager/templates/schedule/view.html:143
+#: manager/templates/schedule/view.html:193
 #: manager/templates/workout/overview.html:16
 msgid "active"
 msgstr "aktivni"
 
-#: manager/templates/schedule/overview.html:28
+#: manager/templates/schedule/overview.html:27
 msgid "No schedules found."
 msgstr "Nijedan raspored nije pronađen."
 
+#: manager/templates/schedule/overview.html:28
+#, fuzzy
+#| msgid "Add one now."
+msgid "Add one now"
+msgstr "Dodaj jedan sada."
+
 #: manager/templates/schedule/overview.html:36
 msgid ""
 "Schedules are collections of workouts that you do in\n"
@@ -2417,19 +2394,27 @@ msgstr ""
 "        u nizu."
 
 #: manager/templates/schedule/overview.html:39
+#, fuzzy
+#| msgid ""
+#| "You can indicate how long you want to do each workout\n"
+#| "        before jumping to the next. It is also possible to create a loop, "
+#| "so you\n"
+#| "        always do the same workouts in succession, e.g. A > B > C > A > B "
+#| "> C and so on."
 msgid ""
 "You can indicate how long you want to do each workout\n"
 "        before jumping to the next. It is also possible to create a loop, so "
 "you\n"
 "        always do the same workouts in succession, e.g. A > B > C > A > B > "
-"C and so on."
+"C and so\n"
+"        on."
 msgstr ""
 "Možeš označiti vrijeme za svaki trening prije nego što\n"
 "        prijeđeš na sljedeći. Također je moguće napraviti petlju, tako da\n"
 "        uvijek obavljaš iste treninge u nizu, npr. A > B > C > A > B > C i "
 "tako dalje."
 
-#: manager/templates/schedule/overview.html:43
+#: manager/templates/schedule/overview.html:44
 msgid ""
 "The currently active schedule will remain active (and be\n"
 "        shown e.g. in your dashboard) till it reaches the last workout or "
@@ -2448,7 +2433,7 @@ msgstr "Dodaj raspored"
 msgid "Schedule"
 msgstr "Raspored"
 
-#: manager/templates/schedule/view.html:85
+#: manager/templates/schedule/view.html:84
 msgid ""
 "This schedule is a loop and will go through the workouts above till you "
 "deactivate it"
@@ -2456,19 +2441,19 @@ msgstr ""
 "Ovaj raspored je petlja i prolazit će kroz gore navedene treninge sve dok ga "
 "ne deaktiviraš"
 
-#: manager/templates/schedule/view.html:103
+#: manager/templates/schedule/view.html:102
 msgid "Weeks"
 msgstr "Tjedni"
 
-#: manager/templates/schedule/view.html:115
+#: manager/templates/schedule/view.html:114
 msgid "Move me"
 msgstr "Pomakni me"
 
-#: manager/templates/schedule/view.html:156
+#: manager/templates/schedule/view.html:168
 msgid "Start schedule"
 msgstr "Pokreni raspored"
 
-#: manager/templates/schedule/view.html:187
+#: manager/templates/schedule/view.html:197
 #, python-format
 msgid ""
 "%(weeks)s Week\n"
@@ -2486,11 +2471,11 @@ msgstr[2] ""
 "%(weeks)s tjedana\n"
 "                                "
 
-#: manager/templates/schedule/view.html:221
+#: manager/templates/schedule/view.html:231
 msgid "Adding workouts"
 msgstr "Dodavanje treninga"
 
-#: manager/templates/schedule/view.html:223
+#: manager/templates/schedule/view.html:233
 msgid ""
 "Add as many workouts to the schedule as you want. You can\n"
 "            edit the order by dragging and dropping them. It's also possible "
@@ -2502,27 +2487,35 @@ msgstr ""
 "dodati i\n"
 "             više puta."
 
-#: manager/templates/schedule/view.html:232
-#: manager/templates/schedule/view.html:243
-#: manager/templates/schedule/view.html:290
+#: manager/templates/schedule/view.html:242
+#: manager/templates/schedule/view.html:256
+#: manager/templates/schedule/view.html:310
 #: manager/templates/workout/view.html:69
-#: manager/templates/workout/view.html:79
-#: manager/templates/workout/view.html:178
+#: manager/templates/workout/view.html:83
+#: manager/templates/workout/view.html:192
 msgid "Export calendar file"
 msgstr "Izvezi datoteku kalendara"
 
-#: manager/templates/schedule/view.html:236
+#: manager/templates/schedule/view.html:248
 msgid "Export this schedule as a calendar file."
 msgstr "Izvezi ovaj raspored kao datoteku kalendara."
 
-#: manager/templates/schedule/view.html:237
-#: manager/templates/workout/view.html:74
+#: manager/templates/schedule/view.html:249
+#: manager/templates/workout/view.html:76
+#, fuzzy
+#| msgid ""
+#| "You can then import the file it into your calendar\n"
+#| "                        application for example google calendar, outlook "
+#| "or iCal. This will create\n"
+#| "                        an appointment for each training day with the "
+#| "appropriate exercises."
 msgid ""
 "You can then import the file it into your calendar\n"
 "                        application for example google calendar, outlook or "
 "iCal. This will create\n"
 "                        an appointment for each training day with the "
-"appropriate exercises."
+"appropriate\n"
+"                        exercises."
 msgstr ""
 "Zatim možeš uvesti datoteku u svoju aplikaciju\n"
 "                        kalendara, na primjer google kalendar, outlook ili "
@@ -2530,21 +2523,13 @@ msgstr ""
 "                        termin za svaki dan treninga s odgovarajućim "
 "vježbama."
 
-#: manager/templates/schedule/view.html:258
-#: manager/templates/schedule/view.html:294
-#: manager/templates/workout/view.html:94
-#: manager/templates/workout/view.html:174
+#: manager/templates/schedule/view.html:272
+#: manager/templates/schedule/view.html:315
+#: manager/templates/workout/view.html:99
+#: manager/templates/workout/view.html:188
 msgid "Download as PDF"
 msgstr "Preuzmi kao PDF"
 
-#: manager/templates/schedule/view.html:299
-msgid "Edit schedule"
-msgstr "Uredi raspored"
-
-#: manager/templates/schedule/view.html:304
-msgid "Delete schedule"
-msgstr "Izbriši raspored"
-
 #: manager/templates/set/add.html:9
 #, python-format
 msgid "Add exercises to day \"%(day_name)s\""
@@ -2620,56 +2605,6 @@ msgid ""
 "You will regularly receive such reminders till you enter your current weight."
 msgstr "Takve podsjetnike ćeš primati sve dok ne uneseš svoju aktualnu težinu."
 
-#: manager/templates/workout/log.html:10 manager/templates/workout/log.html:11
-msgid "Weight log"
-msgstr "Zapis težine"
-
-#: manager/templates/workout/log.html:29
-msgid "Weight log for workout"
-msgstr "Zapis težine za trening"
-
-#: manager/templates/workout/log.html:49
-msgid "Add weight log to this day"
-msgstr "Dodaj zapis težine za ovaj dan"
-
-#: manager/templates/workout/log.html:69
-msgid "No weight entries here."
-msgstr "Nema unose težine."
-
-#: manager/templates/workout/log.html:77
-msgid "No exercises for this day."
-msgstr "Nema vježbi za ovaj dan."
-
-#: manager/templates/workout/log.html:90
-msgid ""
-"This page shows the weight logs belonging to this workout\n"
-"only. Click on an exercise to see all the historical data for\n"
-"it."
-msgstr ""
-"Ova stranica prikazuje zapise težine koji pripadaju samo\n"
-"ovoj vježbi. Pritisni na vježbu za prikaz povijesnih\n"
-"podataka vježbe."
-
-#: manager/templates/workout/log.html:94
-msgid ""
-"If on a single day there is more than one entry with the\n"
-"same number of repetitions, but different weights, only the entry with the\n"
-"higher weight is shown in the diagram."
-msgstr ""
-"Ako u jednom danu postoji više od jednog unosa s istim\n"
-"brojem ponavljanja, ali različitim težinama, u dijagramu se prikazuje samo\n"
-"unos s većom težinom."
-
-#: manager/templates/workout/log.html:98
-msgid ""
-"Note that only entries with a weight unit (kg or lb) and\n"
-"repetitions are charted, other combinations such as time or until failure\n"
-"are ignored here."
-msgstr ""
-"Napomena: prikazuju se samo unosi s jedinicom težine (kg ili lb) i\n"
-"ponavljanja, druge kombinacije kao što su vrijeme ili do neuspjeha se\n"
-"ovdje zanemaruju."
-
 #: manager/templates/workout/overview.html:25
 msgid "No templates found."
 msgstr "Nije pronađen nijedan predložak."
@@ -2705,27 +2640,23 @@ msgstr "Dodaj setove treninga danima"
 msgid "Set the repetitions for each set"
 msgstr "Postavi broj ponavljanja za svaki set"
 
-#: manager/templates/workout/view.html:73
+#: manager/templates/workout/view.html:75
 msgid "Export this workout as a calendar file."
 msgstr "Izvezi ovaj traning kao datoteku kalendara."
 
-#: manager/templates/workout/view.html:144
+#: manager/templates/workout/view.html:156
 msgid "Logs"
 msgstr "Zapisi"
 
-#: manager/templates/workout/view.html:146
+#: manager/templates/workout/view.html:159
 msgid "View logs"
 msgstr "Pogledaj zapise"
 
-#: manager/templates/workout/view.html:169 manager/views/schedule_step.py:99
-msgid "Edit workout"
-msgstr "Uredi trening"
-
-#: manager/templates/workout/view.html:182 manager/views/workout.py:281
+#: manager/templates/workout/view.html:195 manager/views/workout.py:281
 msgid "Mark as template"
 msgstr "Označi kao predložak"
 
-#: manager/views/day.py:109
+#: manager/views/day.py:105
 msgid "Add workout day"
 msgstr "Dodaj dan treninga"
 
@@ -2742,6 +2673,10 @@ msgstr "Trening za %s"
 msgid "Create schedule"
 msgstr "Stvori raspored"
 
+#: manager/views/schedule_step.py:99
+msgid "Edit workout"
+msgstr "Uredi trening"
+
 #: manager/views/workout.py:209
 msgid "Copy workout"
 msgstr "Kopiraj trening"
@@ -2865,7 +2800,7 @@ msgstr "Količina u gramima"
 msgid "Unit amount, e.g. \"1 Cup\" or \"1/2 spoon\""
 msgstr "Jedinica količine, npr. „1 šalica” ili „1/2 žlice”"
 
-#: nutrition/models/log.py:52 nutrition/models/meal.py:50
+#: nutrition/models/log.py:52 nutrition/models/meal.py:48
 #: nutrition/models/meal_item.py:48 nutrition/models/plan.py:108
 msgid "Nutrition plan"
 msgstr "Plan prehrane"
@@ -2878,11 +2813,11 @@ msgstr "Obrok"
 msgid "Date and Time (Approx.)"
 msgstr "Datum i vrijeme (otprilike)"
 
-#: nutrition/models/meal.py:62
+#: nutrition/models/meal.py:60
 msgid "Time (approx)"
 msgstr "Vrijeme (otprilike)"
 
-#: nutrition/models/meal.py:69
+#: nutrition/models/meal.py:67
 msgid ""
 "Give meals a textual description / name such as \"Breakfast\" or \"after "
 "workout\""
@@ -3018,10 +2953,6 @@ msgstr "Nema satojaka."
 msgid "Search"
 msgstr "Traži"
 
-#: nutrition/templates/ingredient/overview.html:62
-msgid "Add ingredient"
-msgstr "Dodaj sastojak"
-
 #: nutrition/templates/ingredient/view.html:45 nutrition/views/plan.py:229
 msgid "Macronutrients"
 msgstr "Makronutrijenti"
@@ -3041,20 +2972,11 @@ msgstr "--"
 msgid "Others"
 msgstr "Drugi"
 
-#: nutrition/templates/ingredient/view.html:144
-#: nutrition/templates/units/list.html:46 nutrition/views/unit.py:86
+#: nutrition/templates/ingredient/view.html:143
+#: nutrition/templates/units/list.html:50 nutrition/views/unit.py:86
 msgid "Add new weight unit"
 msgstr "Dodaj novu jedinicu težine"
 
-#: nutrition/templates/ingredient/view.html:206
-#: nutrition/templates/ingredient/view.html:209
-msgid "Edit ingredient"
-msgstr "Uredi sastojak"
-
-#: nutrition/templates/ingredient/view.html:213
-msgid "Delete ingredient"
-msgstr "Izbriši sastojak"
-
 #: nutrition/templates/rate/form.html:25
 msgid "Basal metabolic rate"
 msgstr "Osnovna potreba metabolizma"
@@ -3265,7 +3187,7 @@ msgstr ""
 msgid "Our goal"
 msgstr "Naš cilj"
 
-#: software/templates/about_us.html:62
+#: software/templates/about_us.html:71
 msgid ""
 "The goal is to build an awesome\n"
 "                and flexible fitness manager, along with a comprehensive and "
@@ -3686,6 +3608,86 @@ msgstr "Uspješno izbrisano."
 msgid "Delete weight entry for the %s"
 msgstr "Izbriši unos težine za %s"
 
+#~ msgid ""
+#~ "If a license has been localized, e.g. the Creative Commons\n"
+#~ "            licenses for the different countries, add them as separate "
+#~ "entries here."
+#~ msgstr ""
+#~ "Ako je licenca lokalizirana, npr. Creative Commons\n"
+#~ "            licence za različite zemlje, dodaj ih kao zasebne unose ovdje."
+
+#~ msgid "Add weight log"
+#~ msgstr "Dodaj zapis težine"
+
+#~ msgid "This exercise has no repetitions."
+#~ msgstr "Ova vježba nema ponavljanja."
+
+#~ msgid "Edit them now."
+#~ msgstr "Uredi ih sada."
+
+#~ msgid "Add exercises to this workout day"
+#~ msgstr "Dodaj vježbe za ovaj dan treninga"
+
+#~ msgid "Edit schedule"
+#~ msgstr "Uredi raspored"
+
+#~ msgid "Delete schedule"
+#~ msgstr "Izbriši raspored"
+
+#~ msgid "Weight log"
+#~ msgstr "Zapis težine"
+
+#~ msgid "Weight log for workout"
+#~ msgstr "Zapis težine za trening"
+
+#~ msgid "Add weight log to this day"
+#~ msgstr "Dodaj zapis težine za ovaj dan"
+
+#~ msgid "No weight entries here."
+#~ msgstr "Nema unose težine."
+
+#~ msgid "No exercises for this day."
+#~ msgstr "Nema vježbi za ovaj dan."
+
+#~ msgid ""
+#~ "This page shows the weight logs belonging to this workout\n"
+#~ "only. Click on an exercise to see all the historical data for\n"
+#~ "it."
+#~ msgstr ""
+#~ "Ova stranica prikazuje zapise težine koji pripadaju samo\n"
+#~ "ovoj vježbi. Pritisni na vježbu za prikaz povijesnih\n"
+#~ "podataka vježbe."
+
+#~ msgid ""
+#~ "If on a single day there is more than one entry with the\n"
+#~ "same number of repetitions, but different weights, only the entry with "
+#~ "the\n"
+#~ "higher weight is shown in the diagram."
+#~ msgstr ""
+#~ "Ako u jednom danu postoji više od jednog unosa s istim\n"
+#~ "brojem ponavljanja, ali različitim težinama, u dijagramu se prikazuje "
+#~ "samo\n"
+#~ "unos s većom težinom."
+
+#~ msgid ""
+#~ "Note that only entries with a weight unit (kg or lb) and\n"
+#~ "repetitions are charted, other combinations such as time or until "
+#~ "failure\n"
+#~ "are ignored here."
+#~ msgstr ""
+#~ "Napomena: prikazuju se samo unosi s jedinicom težine (kg ili lb) i\n"
+#~ "ponavljanja, druge kombinacije kao što su vrijeme ili do neuspjeha se\n"
+#~ "ovdje zanemaruju."
+
+#~ msgid "Add ingredient"
+#~ msgstr "Dodaj sastojak"
+
+#~ msgid "Edit ingredient"
+#~ msgstr "Uredi sastojak"
+
+#~ msgid "Delete ingredient"
+#~ msgstr "Izbriši sastojak"
+
 #~ msgid "Ingredients pending review"
 #~ msgstr "Još nepregledani sastojci"
 
diff --git a/wger/locale/hu/LC_MESSAGES/django.po b/wger/locale/hu/LC_MESSAGES/django.po
index 248356b18..d33272baf 100644
--- a/wger/locale/hu/LC_MESSAGES/django.po
+++ b/wger/locale/hu/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: wger Workout Manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-07-14 15:59+0200\n"
+"POT-Creation-Date: 2024-11-14 13:09+0100\n"
 "PO-Revision-Date: 2023-12-29 22:12+0000\n"
 "Last-Translator: Adam Cool <anthony.kek21@gmail.com>\n"
 "Language-Team: Hungarian <https://hosted.weblate.org/projects/wger/web/hu/>\n"
@@ -20,7 +20,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 5.4-dev\n"
 
-#: config/models/gym_config.py:46 gym/templates/gym/list.html:53
+#: config/models/gym_config.py:46 gym/templates/gym/list.html:56
 msgid "Default gym"
 msgstr "Alapértelmezett edzőterem"
 
@@ -33,28 +33,28 @@ msgstr ""
 "hozzárendeli az összes újonnan regisztrált felhasználót ehhez az "
 "edzőteremhez, és frissíti az összes meglévő edzőterem nélküli felhasználót."
 
-#: config/views/gym_config.py:42 core/templates/language/view.html:67
-#: core/templates/license/list.html:17 core/templates/misc/license/list.html:18
+#: config/views/gym_config.py:42 core/templates/language/view.html:64
+#: core/templates/license/list.html:17
 #: core/templates/repetition_unit/list.html:18
-#: core/templates/tags/render_day.html:39
-#: core/templates/tags/render_day.html:75 core/templates/user/overview.html:204
-#: core/templates/user/overview.html:445
+#: core/templates/user/overview.html:204 core/templates/user/overview.html:467
 #: core/templates/weight_unit/list.html:18
 #: exercises/templates/categories/admin-overview.html:17
 #: exercises/templates/equipment/admin-overview.html:17
-#: exercises/templates/muscles/admin-overview.html:17
-#: gallery/views/images.py:98 gym/templates/admin_notes/list.html:32
-#: gym/templates/contract/list.html:31 gym/templates/contract/view.html:107
-#: gym/templates/contract_option/list.html:32
-#: gym/templates/contract_type/list.html:32 gym/templates/document/list.html:38
-#: gym/templates/gym/list.html:20 gym/templates/gym/list.html:46
-#: gym/templates/gym/member_list.html:87 gym/templates/gym/member_list.html:140
-#: gym/templates/gym/member_list.html:176
-#: manager/templates/calendar/day.html:68
-#: manager/templates/calendar/month.html:85
-#: manager/templates/calendar/partial_overview_table.html:18
-#: manager/templates/schedule/view.html:118
-#: nutrition/templates/ingredient/view.html:165
+#: exercises/templates/muscles/admin-overview.html:16
+#: gallery/views/images.py:98 gym/templates/admin_notes/list.html:31
+#: gym/templates/contract/list.html:30 gym/templates/contract/view.html:106
+#: gym/templates/contract_option/list.html:29
+#: gym/templates/contract_type/list.html:30 gym/templates/document/list.html:38
+#: gym/templates/gym/list.html:19 gym/templates/gym/list.html:48
+#: gym/templates/gym/member_list.html:94 gym/templates/gym/member_list.html:152
+#: gym/templates/gym/member_list.html:190
+#: manager/templates/calendar/day.html:67
+#: manager/templates/calendar/month.html:84
+#: manager/templates/calendar/partial_overview_table.html:16
+#: manager/templates/schedule/view.html:318
+#: manager/templates/workout/view.html:181
+#: nutrition/templates/ingredient/view.html:164
+#: nutrition/templates/ingredient/view.html:209
 #: nutrition/templates/units/list.html:19
 msgid "Edit"
 msgstr "Módosítás"
@@ -90,8 +90,8 @@ msgstr "Az én király edzés ütemtervem"
 msgid "Empty placeholder schedule"
 msgstr "Üres helyfoglaló ütemterv"
 
-#: core/forms.py:69 core/templates/navigation.html:285
-#: core/templates/navigation.html:291 core/templates/user/login.html:4
+#: core/forms.py:69 core/templates/navigation.html:284
+#: core/templates/navigation.html:290 core/templates/user/login.html:4
 #: software/templates/features.html:82 software/templates/features.html:427
 msgid "Login"
 msgstr "Bejelentkezés"
@@ -101,14 +101,14 @@ msgstr "Bejelentkezés"
 msgid "First name"
 msgstr "Keresztnév"
 
-#: core/forms.py:109 core/forms.py:215 core/templates/user/overview.html:266
+#: core/forms.py:109 core/forms.py:215 core/templates/user/overview.html:284
 #: gym/views/export.py:62 gym/views/gym.py:217
 msgid "Last name"
 msgstr "Vezetéknév"
 
-#: core/forms.py:111 core/forms.py:180 core/templates/user/overview.html:270
+#: core/forms.py:111 core/forms.py:180 core/templates/user/overview.html:288
 #: gym/models/contract.py:256 gym/models/gym.py:58
-#: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:104
+#: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:116
 #: gym/templates/gym/new_user.html:30 gym/views/export.py:60
 #: mailer/templates/mailer/gym/form.html:4
 #: mailer/templates/mailer/gym/overview.html:4
@@ -138,8 +138,8 @@ msgstr "Edzés emlékeztetők"
 msgid "Other settings"
 msgstr "Egyéb beállítások"
 
-#: core/forms.py:174 core/views/user.py:624 core/views/user.py:639
-#: core/views/user.py:651 gym/forms.py:73 manager/templates/log/add.html:65
+#: core/forms.py:174 core/views/user.py:623 core/views/user.py:638
+#: core/views/user.py:650 gym/forms.py:73 manager/templates/log/add.html:65
 #: manager/templates/set/add.html:70 manager/views/workout.py:203
 #: utils/generic_views.py:143
 msgid "Save"
@@ -163,26 +163,25 @@ msgstr "Jelszó"
 msgid "Please enter your current password."
 msgstr "Kérlek írd be a jelenlegi jelszavad."
 
-#: core/forms.py:242 core/templates/language/view.html:73
-#: core/templates/license/list.html:19 core/templates/misc/license/list.html:22
-#: core/templates/repetition_unit/list.html:20
-#: core/templates/tags/render_day.html:45
-#: core/templates/tags/render_day.html:81 core/templates/user/overview.html:217
-#: core/templates/weight_unit/list.html:20
-#: exercises/templates/categories/admin-overview.html:19
-#: exercises/templates/equipment/admin-overview.html:19
-#: exercises/templates/muscles/admin-overview.html:19
-#: gym/templates/admin_notes/list.html:40
-#: gym/templates/contract_option/list.html:41
-#: gym/templates/contract_type/list.html:41 gym/templates/document/list.html:46
-#: gym/templates/gym/list.html:22 manager/templates/calendar/day.html:73
-#: manager/templates/calendar/month.html:89
-#: manager/templates/calendar/partial_overview_table.html:23
-#: manager/templates/schedule/view.html:122
-#: manager/templates/workout/view.html:188
-#: nutrition/templates/ingredient/view.html:166
+#: core/forms.py:242 core/templates/language/view.html:70
+#: core/templates/license/list.html:21
+#: core/templates/repetition_unit/list.html:22
+#: core/templates/user/overview.html:233
+#: core/templates/weight_unit/list.html:22
+#: exercises/templates/categories/admin-overview.html:21
+#: exercises/templates/equipment/admin-overview.html:21
+#: exercises/templates/muscles/admin-overview.html:20
+#: gym/templates/admin_notes/list.html:37
+#: gym/templates/contract_option/list.html:35
+#: gym/templates/contract_type/list.html:36 gym/templates/document/list.html:46
+#: gym/templates/gym/list.html:23 manager/templates/calendar/day.html:73
+#: manager/templates/calendar/month.html:88
+#: manager/templates/calendar/partial_overview_table.html:22
+#: manager/templates/schedule/view.html:324
+#: manager/templates/workout/view.html:202
+#: nutrition/templates/ingredient/view.html:168
 #: nutrition/templates/ingredient/view.html:215
-#: nutrition/templates/units/list.html:22
+#: nutrition/templates/units/list.html:25
 msgid "Delete"
 msgstr "Törlés"
 
@@ -194,9 +193,9 @@ msgstr "Érvénytelen jelszó"
 msgid "The form is secured with reCAPTCHA"
 msgstr "Ez az űrlap reCAPTCHA-val van biztosítva"
 
-#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:285
-#: core/templates/navigation.html:297 core/templates/template.html:149
-#: core/templates/user/login.html:20 core/views/user.py:298
+#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:284
+#: core/templates/navigation.html:296 core/templates/template.html:151
+#: core/templates/user/login.html:20 core/views/user.py:297
 #: software/templates/features.html:87 software/templates/features.html:422
 msgid "Register"
 msgstr "Regisztráció"
@@ -436,18 +435,18 @@ msgid "The sum of all hours has to be 24"
 msgstr "Az órák összegének meg kell egyeznie 24-el"
 
 #: core/models/rep_unit.py:36 core/models/weight_unit.py:36
-#: core/templates/user/overview.html:262 core/views/user.py:599
+#: core/templates/user/overview.html:280 core/views/user.py:598
 #: exercises/models/category.py:29 exercises/models/equipment.py:29
 #: exercises/models/exercise.py:59 exercises/models/muscle.py:36
 #: gym/models/contract.py:52 gym/models/contract.py:103 gym/models/gym.py:46
 #: gym/models/user_document.py:84 gym/templates/contract/view.html:50
-#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:96
+#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:108
 #: gym/views/gym.py:158 manager/models/schedule.py:55
 #: manager/models/workout.py:57 measurements/models/category.py:36
 #: nutrition/models/ingredient.py:111
-#: nutrition/models/ingredient_category.py:27 nutrition/models/meal.py:67
+#: nutrition/models/ingredient_category.py:27 nutrition/models/meal.py:65
 #: nutrition/models/weight_unit.py:38
-#: nutrition/templates/ingredient/view.html:152
+#: nutrition/templates/ingredient/view.html:151
 msgid "Name"
 msgstr "Név"
 
@@ -492,7 +491,7 @@ msgstr ""
 msgid "Back to \"%(target)s\""
 msgstr "Vissza \"%(target)s\""
 
-#: core/templates/delete.html:15
+#: core/templates/delete.html:4
 msgid "Are you sure you want to delete this? This action cannot be undone."
 msgstr "Biztosan törölni akarod? Ez a művelet nem visszavonható."
 
@@ -548,7 +547,7 @@ msgstr ""
 msgid "Dashboard"
 msgstr "Irányítópult"
 
-#: core/templates/language/overview.html:4 core/templates/navigation.html:345
+#: core/templates/language/overview.html:4 core/templates/navigation.html:344
 msgid "Languages"
 msgstr "Nyelvek"
 
@@ -558,79 +557,72 @@ msgstr "Nincs találat."
 
 #: core/templates/language/overview.html:22
 #: manager/templates/calendar/month.html:132
-#: manager/templates/schedule/overview.html:28
-#: manager/templates/schedule/view.html:144
+#: manager/templates/schedule/view.html:154
 #: manager/templates/workout/overview.html:28
 #: nutrition/templates/ingredient/overview.html:38
 msgid "Add one now."
 msgstr "Adj hozzá egyet most."
 
-#: core/templates/language/overview.html:35 core/templates/license/list.html:40
-#: core/templates/misc/license/list.html:43
-#: core/templates/repetition_unit/list.html:43
-#: core/templates/user/overview.html:326 core/templates/user/overview.html:365
-#: core/templates/user/overview.html:401
-#: core/templates/weight_unit/list.html:43 core/views/languages.py:74
+#: core/templates/language/overview.html:34 core/templates/license/list.html:43
+#: core/templates/repetition_unit/list.html:46
+#: core/templates/user/overview.html:344 core/templates/user/overview.html:384
+#: core/templates/user/overview.html:422
+#: core/templates/weight_unit/list.html:46 core/views/languages.py:74
 #: core/views/license.py:66 core/views/repetition_units.py:66
 #: core/views/weight_units.py:66
-#: exercises/templates/categories/admin-overview.html:38
-#: gallery/views/images.py:63 gym/templates/admin_notes/list.html:67
-#: gym/templates/contract/list.html:73
-#: gym/templates/contract_option/list.html:72
-#: gym/templates/contract_type/list.html:72 gym/templates/document/list.html:79
-#: gym/templates/gym/member_list.html:211
-#: gym/templates/gym/member_list.html:244
-#: gym/templates/gym/member_list.html:281
+#: exercises/templates/categories/admin-overview.html:40
+#: exercises/templates/equipment/admin-overview.html:39
+#: exercises/templates/muscles/admin-overview.html:40
+#: gallery/views/images.py:63 gym/templates/admin_notes/list.html:64
+#: gym/templates/contract/list.html:69
+#: gym/templates/contract_option/list.html:65
+#: gym/templates/contract_type/list.html:66 gym/templates/document/list.html:78
+#: gym/templates/gym/member_list.html:228
+#: gym/templates/gym/member_list.html:264
+#: gym/templates/gym/member_list.html:303
 #: mailer/templates/mailer/gym/overview.html:43
+#: nutrition/templates/ingredient/overview.html:60
 msgid "Add"
 msgstr "Hozzáadás"
 
 #: core/templates/language/view.html:61 core/templates/user/api_key.html:44
-#: core/templates/user/preferences.html:45 gym/models/contract.py:203
-#: gym/templates/contract/view.html:41 gym/templates/contract/view.html:106
-#: gym/templates/gym/member_list.html:248
-#: manager/templates/schedule/view.html:285
-#: manager/templates/workout/view.html:163
-#: nutrition/templates/ingredient/view.html:202
+#: core/templates/user/preferences.html:50 gym/models/contract.py:203
+#: gym/templates/contract/view.html:41 gym/templates/gym/member_list.html:270
+#: manager/templates/schedule/view.html:304
+#: manager/templates/workout/view.html:177
+#: nutrition/templates/ingredient/view.html:206
 msgid "Options"
 msgstr "Beállítások"
 
-#: core/templates/license/list.html:4 core/templates/misc/license/list.html:4
+#: core/templates/license/list.html:4
 msgid "License list"
 msgstr "Licenc lista"
 
-#: core/templates/license/list.html:26 core/templates/misc/license/list.html:30
-#: core/templates/repetition_unit/list.html:28
+#: core/templates/license/list.html:30
+#: core/templates/repetition_unit/list.html:32
 #: core/templates/user/overview.html:104 core/templates/user/overview.html:136
-#: core/templates/user/overview.html:185 core/templates/user/overview.html:347
-#: core/templates/user/overview.html:383 core/templates/user/overview.html:427
-#: core/templates/weight_unit/list.html:28
-#: exercises/templates/categories/admin-overview.html:26
-#: exercises/templates/equipment/admin-overview.html:26
-#: exercises/templates/muscles/admin-overview.html:26
-#: gym/templates/admin_notes/list.html:52 gym/templates/contract/list.html:60
-#: gym/templates/contract_option/list.html:58
-#: gym/templates/contract_type/list.html:58 gym/templates/document/list.html:64
-#: gym/templates/gym/list.html:29 gym/templates/gym/member_list.html:229
-#: gym/templates/gym/member_list.html:262
-#: gym/templates/gym/member_list.html:299
+#: core/templates/user/overview.html:185 core/templates/user/overview.html:365
+#: core/templates/user/overview.html:404 core/templates/user/overview.html:448
+#: core/templates/weight_unit/list.html:32
+#: exercises/templates/categories/admin-overview.html:30
+#: exercises/templates/equipment/admin-overview.html:30
+#: exercises/templates/muscles/admin-overview.html:29
+#: gym/templates/admin_notes/list.html:50 gym/templates/contract/list.html:57
+#: gym/templates/contract_option/list.html:52
+#: gym/templates/contract_type/list.html:53 gym/templates/document/list.html:64
+#: gym/templates/gym/list.html:32 gym/templates/gym/member_list.html:248
+#: gym/templates/gym/member_list.html:284
+#: gym/templates/gym/member_list.html:321
 #: mailer/templates/mailer/gym/overview.html:30
-#: manager/templates/calendar/day.html:87
-#: nutrition/templates/units/list.html:29
+#: manager/templates/calendar/day.html:88
+#: nutrition/templates/units/list.html:34
 msgid "Nothing found"
 msgstr "Nincs találat"
 
-#: core/templates/misc/about.html:4 core/templates/template.html:175
+#: core/templates/misc/about.html:4 core/templates/template.html:188
 msgid "Imprint"
 msgstr ""
 
-#: core/templates/misc/license/list.html:47
-msgid ""
-"If a license has been localized, e.g. the Creative Commons\n"
-"            licenses for the different countries, add them as separate "
-"entries here."
-msgstr ""
-
 #: core/templates/navigation.html:28 software/templates/features.html:437
 msgid "Training"
 msgstr ""
@@ -679,8 +671,8 @@ msgstr ""
 msgid "Exercises"
 msgstr "Gyakorlatok"
 
-#: core/templates/navigation.html:111 core/templates/navigation.html:184
-#: core/templates/navigation.html:340
+#: core/templates/navigation.html:111 core/templates/navigation.html:185
+#: core/templates/navigation.html:339
 msgid "Administration"
 msgstr "Adminisztráció"
 
@@ -719,87 +711,87 @@ msgstr "BMI kalkulátor"
 msgid "Daily calories calculator"
 msgstr "Napi kalória kalkulátor"
 
-#: core/templates/navigation.html:179
+#: core/templates/navigation.html:180
 #: nutrition/templates/ingredient/overview.html:10
 msgid "Ingredient overview"
 msgstr "Összetevő áttekintés"
 
-#: core/templates/navigation.html:187 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:189 nutrition/templates/units/list.html:6
 msgid "Ingredient weight units"
 msgstr "Összetevő súly egységek"
 
-#: core/templates/navigation.html:203 software/templates/features.html:442
+#: core/templates/navigation.html:205 software/templates/features.html:442
 msgid "Body weight"
 msgstr ""
 
-#: core/templates/navigation.html:210 core/templates/user/overview.html:114
+#: core/templates/navigation.html:212 core/templates/user/overview.html:114
 msgid "Weight overview"
 msgstr "Súly áttekintés"
 
-#: core/templates/navigation.html:217 weight/views.py:65
+#: core/templates/navigation.html:216 weight/views.py:65
 msgid "Add weight entry"
 msgstr "Új súly bejegyzés hozzáadása"
 
-#: core/templates/navigation.html:231
+#: core/templates/navigation.html:230
 msgid "About this software"
 msgstr "Erről a szoftverről"
 
-#: core/templates/navigation.html:237 software/templates/about_us.html:5
+#: core/templates/navigation.html:236 software/templates/about_us.html:5
 msgid "About us"
 msgstr "Rólunk"
 
-#: core/templates/navigation.html:243 software/templates/features.html:507
+#: core/templates/navigation.html:242 software/templates/features.html:507
 msgid "REST API"
 msgstr "REST API"
 
-#: core/templates/navigation.html:249 utils/models.py:45
+#: core/templates/navigation.html:248 utils/models.py:45
 msgid "License"
 msgstr "Licenc"
 
-#: core/templates/navigation.html:255
+#: core/templates/navigation.html:254
 msgid "Developer documentation"
 msgstr ""
 
-#: core/templates/navigation.html:262
+#: core/templates/navigation.html:261
 msgid "Get the code"
 msgstr "Szerezd meg a kódot"
 
-#: core/templates/navigation.html:269 core/templates/template.html:214
+#: core/templates/navigation.html:268 core/templates/template.html:227
 #: software/templates/features.html:582
 msgid "Translate"
 msgstr "Lefordítás"
 
-#: core/templates/navigation.html:303 core/templates/user/login.html:28
+#: core/templates/navigation.html:302 core/templates/user/login.html:28
 msgid "Reset password"
 msgstr "Új jelszó igénylése"
 
-#: core/templates/navigation.html:321
+#: core/templates/navigation.html:320
 msgid "My preferences"
 msgstr "Beállításaim"
 
-#: core/templates/navigation.html:330
+#: core/templates/navigation.html:329
 msgid "Logout"
 msgstr "Kijelentkezés"
 
-#: core/templates/navigation.html:353
+#: core/templates/navigation.html:352
 msgid "Licenses"
 msgstr "Licencek"
 
-#: core/templates/navigation.html:361
+#: core/templates/navigation.html:360
 #: core/templates/repetition_unit/list.html:4
 msgid "Repetition units"
 msgstr ""
 
-#: core/templates/navigation.html:369 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:368 core/templates/weight_unit/list.html:4
 #: nutrition/templates/ingredient/view.html:141
 msgid "Weight units"
 msgstr ""
 
-#: core/templates/navigation.html:377 core/templates/user/list.html:4
+#: core/templates/navigation.html:376 core/templates/user/list.html:4
 msgid "User list"
 msgstr ""
 
-#: core/templates/navigation.html:383
+#: core/templates/navigation.html:382
 msgid "Gyms"
 msgstr "Edzőtermek"
 
@@ -858,57 +850,32 @@ msgstr "előző"
 msgid "next"
 msgstr "következő"
 
-#: core/templates/tags/render_day.html:34
-msgid "Add weight log"
-msgstr ""
-
-#: core/templates/tags/render_day.html:116
-msgid "Placeholder image for exercise"
+#: core/templates/tags/render_day.html:44
+#, fuzzy
+#| msgid "Placeholder image for exercise"
+msgid "Placeholder image for translation"
 msgstr "Helyfoglaló kép a gyakorlathoz"
 
-#: core/templates/tags/render_day.html:133
-msgid "This exercise has no repetitions."
-msgstr "A gyakorlatnak nincsenek ismétlései."
-
-#: core/templates/tags/render_day.html:136
-msgid "Edit them now."
-msgstr ""
-
-#: core/templates/tags/render_day.html:162
-msgid "Add exercises to this workout day"
-msgstr "Gyakorlat hozzáadása ehhez az edzés naphoz"
-
-#: core/templates/tags/render_weight_log.html:17 manager/helpers.py:86
-#: manager/models/setting.py:72 manager/templates/set/formset.html:9
-msgid "Reps"
-msgstr "Ismétlés"
-
-#: core/templates/tags/render_weight_log.html:30 manager/forms.py:191
-#: manager/models/log.py:103 manager/models/setting.py:102
-#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
-msgid "RiR"
-msgstr ""
-
-#: core/templates/template.html:122 manager/templates/calendar/month.html:138
-#: manager/templates/schedule/view.html:248
-#: manager/templates/schedule/view.html:269
-#: manager/templates/workout/view.html:84
-#: manager/templates/workout/view.html:137
+#: core/templates/template.html:124 manager/templates/calendar/month.html:138
+#: manager/templates/schedule/view.html:262
+#: manager/templates/schedule/view.html:287
+#: manager/templates/workout/view.html:89
+#: manager/templates/workout/view.html:149
 msgid "Close"
 msgstr "Bezárás"
 
-#: core/templates/template.html:138
+#: core/templates/template.html:140
 msgid ""
 "You are using a guest account, data entered will be deleted after a week."
 msgstr ""
 "Vendég hozzáférést használsz. A használat során bevitt adatok egy hét után "
 "törlésre kerülnek."
 
-#: core/templates/template.html:143
+#: core/templates/template.html:145
 msgid "Create some demo entries"
 msgstr "Készíts egy pár demó bejegyzést"
 
-#: core/templates/template.html:180 software/templates/features.html:547
+#: core/templates/template.html:193 software/templates/features.html:547
 #: software/templates/tos.html:7
 msgid "Terms of service"
 msgstr ""
@@ -917,7 +884,7 @@ msgstr ""
 msgid "Features"
 msgstr "Funkciók"
 
-#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:54
+#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:59
 msgid "API key"
 msgstr "API kulcs"
 
@@ -956,17 +923,17 @@ msgstr "Új API kulcs generálása"
 msgid "Documentation"
 msgstr "Dokumentáció"
 
-#: core/templates/user/delete_account.html:4
-#: core/templates/user/preferences.html:59
+#: core/templates/user/delete_account.html:3
+#: core/templates/user/preferences.html:62
 msgid "Delete account"
 msgstr "Fiók törlése"
 
-#: core/templates/user/delete_account.html:17
+#: core/templates/user/delete_account.html:9
 #: exercises/templates/history/overview.html:93
 msgid "Are you sure?"
 msgstr "Biztos vagy benne?"
 
-#: core/templates/user/delete_account.html:22
+#: core/templates/user/delete_account.html:14
 #, python-format
 msgid ""
 "This action will delete the user account \"%(username)s\".\n"
@@ -985,22 +952,22 @@ msgstr "Elfelejtett jelszó?"
 
 #: core/templates/user/overview.html:25 core/templates/user/overview.html:68
 #: core/templates/user/overview.html:112 core/templates/user/overview.html:144
-#: core/templates/user/overview.html:330 core/templates/user/overview.html:369
-#: core/templates/user/overview.html:405
+#: core/templates/user/overview.html:348 core/templates/user/overview.html:390
+#: core/templates/user/overview.html:426
 #, python-format
 msgid "last %(number)s"
 msgstr "utolsó %(number)s"
 
 #: core/templates/user/overview.html:27 core/templates/user/overview.html:146
-#: core/templates/user/overview.html:325 core/templates/user/overview.html:364
-#: core/templates/user/overview.html:400 gym/templates/gym/member_list.html:210
-#: gym/templates/gym/member_list.html:243
-#: gym/templates/gym/member_list.html:280
+#: core/templates/user/overview.html:343 core/templates/user/overview.html:382
+#: core/templates/user/overview.html:421 gym/templates/gym/member_list.html:226
+#: gym/templates/gym/member_list.html:262
+#: gym/templates/gym/member_list.html:302
 msgid "Overview"
 msgstr "Áttekintés"
 
 #: core/templates/user/overview.html:28
-#: manager/templates/schedule/view.html:163
+#: manager/templates/schedule/view.html:172
 #: manager/templates/workout/overview.html:39 manager/views/schedule_step.py:60
 msgid "Add workout"
 msgstr "Edzés hozzáadása"
@@ -1032,38 +999,36 @@ msgstr "Leírás"
 msgid "Number of logs (days)"
 msgstr "Bejegyzések száma (napok)"
 
-#: core/templates/user/overview.html:37 core/views/user.py:600
+#: core/templates/user/overview.html:37 core/views/user.py:599
 #: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:158
 msgid "Last activity"
 msgstr "Utolsó tevékenység"
 
 #: core/templates/user/overview.html:58
 #: manager/templates/calendar/month.html:128
-#: manager/templates/schedule/view.html:144
 #: manager/templates/workout/overview.html:28
 msgid "No workouts found."
 msgstr "Nem található edzés."
 
 #: core/templates/user/overview.html:68 manager/forms.py:280
-#: manager/templates/workout/view.html:106
+#: manager/templates/workout/view.html:114
 msgid "Log"
 msgstr "Bejegyzések"
 
 #: core/templates/user/overview.html:77 manager/models/session.py:83
-#: manager/templates/calendar/partial_overview_table.html:52
+#: manager/templates/calendar/partial_overview_table.html:54
 msgid "General impression"
 msgstr "Általános benyomás"
 
-#: core/templates/user/overview.html:78 core/templates/user/overview.html:369
+#: core/templates/user/overview.html:78 core/templates/user/overview.html:390
 #: manager/models/session.py:73
-#: manager/templates/calendar/partial_overview_table.html:56
-#: manager/templates/workout/log.html:89
+#: manager/templates/calendar/partial_overview_table.html:58
 msgid "Notes"
 msgstr "Megjegyzések"
 
 #: core/templates/user/overview.html:79
 #: exercises/templates/history/overview.html:30
-#: manager/templates/calendar/partial_overview_table.html:42
+#: manager/templates/calendar/partial_overview_table.html:44
 msgid "Time"
 msgstr "Idő"
 
@@ -1101,121 +1066,121 @@ msgstr "Zsír"
 msgid "kcal"
 msgstr "kcal"
 
-#: core/templates/user/overview.html:201 core/templates/user/overview.html:322
-#: core/templates/user/overview.html:361 core/templates/user/overview.html:397
-#: core/templates/user/overview.html:442 gym/templates/gym/list.html:42
-#: gym/templates/gym/member_list.html:84 gym/templates/gym/member_list.html:137
-#: gym/templates/gym/member_list.html:173
-#: gym/templates/gym/member_list.html:207
-#: gym/templates/gym/member_list.html:240
-#: gym/templates/gym/member_list.html:277
-#: manager/templates/schedule/view.html:100
+#: core/templates/user/overview.html:201 core/templates/user/overview.html:340
+#: core/templates/user/overview.html:379 core/templates/user/overview.html:418
+#: core/templates/user/overview.html:463 gym/templates/gym/list.html:45
+#: gym/templates/gym/member_list.html:91 gym/templates/gym/member_list.html:149
+#: gym/templates/gym/member_list.html:187
+#: gym/templates/gym/member_list.html:223
+#: gym/templates/gym/member_list.html:259
+#: gym/templates/gym/member_list.html:299
+#: manager/templates/schedule/view.html:99
 msgid "Actions"
 msgstr "Műveletek"
 
-#: core/templates/user/overview.html:207
+#: core/templates/user/overview.html:210
 msgid "Deactivate user"
 msgstr "Felhasználó deaktiviálása"
 
-#: core/templates/user/overview.html:209
+#: core/templates/user/overview.html:214
 msgid "Activate user"
 msgstr "Felhasználó aktiválása"
 
-#: core/templates/user/overview.html:211
+#: core/templates/user/overview.html:223
 msgid "Reset user password"
 msgstr ""
 
-#: core/templates/user/overview.html:214 gym/templates/gym/member_list.html:30
+#: core/templates/user/overview.html:227 gym/templates/gym/member_list.html:30
 msgid "Roles"
 msgstr "Szerepek"
 
-#: core/templates/user/overview.html:225
+#: core/templates/user/overview.html:243
 msgid "Password reset confirmation"
 msgstr "Jelszó igénylés megerősítése"
 
-#: core/templates/user/overview.html:229
+#: core/templates/user/overview.html:247
 msgid "Do you really want to change this user&#39;s password?"
 msgstr ""
 
-#: core/templates/user/overview.html:232
+#: core/templates/user/overview.html:250
 #: exercises/templates/history/overview.html:106
 msgid "No"
 msgstr ""
 
-#: core/templates/user/overview.html:233
+#: core/templates/user/overview.html:251
 #: exercises/templates/history/overview.html:99
 msgid "Yes"
 msgstr ""
 
-#: core/templates/user/overview.html:254 gym/templates/gym/member_list.html:93
+#: core/templates/user/overview.html:272 gym/templates/gym/member_list.html:105
 msgid "Details"
 msgstr "Részletek"
 
-#: core/templates/user/overview.html:258 gym/views/export.py:57
-#: manager/helpers.py:86 manager/templates/schedule/view.html:98
+#: core/templates/user/overview.html:276 gym/views/export.py:57
+#: manager/helpers.py:86 manager/templates/schedule/view.html:97
 msgid "Nr."
 msgstr "sz."
 
-#: core/templates/user/overview.html:280 gym/models/contract.py:287
+#: core/templates/user/overview.html:298 gym/models/contract.py:287
 #: gym/models/gym.py:50 gym/templates/contract/view.html:75
-#: gym/templates/gym/member_list.html:100 gym/views/export.py:68
+#: gym/templates/gym/member_list.html:112 gym/views/export.py:68
 msgid "Phone"
 msgstr "Telefon"
 
-#: core/templates/user/overview.html:284 gym/templates/contract/view.html:87
-#: gym/templates/gym/member_list.html:118
+#: core/templates/user/overview.html:302 gym/templates/contract/view.html:87
+#: gym/templates/gym/member_list.html:130
 msgid "Address"
 msgstr "Cím"
 
-#: core/templates/user/overview.html:295
+#: core/templates/user/overview.html:313
 msgid "Registered"
 msgstr "Regisztrálva"
 
-#: core/templates/user/overview.html:299
+#: core/templates/user/overview.html:317
 msgid "Last login"
 msgstr "Utolsó bejelentkezés"
 
-#: core/templates/user/overview.html:304
+#: core/templates/user/overview.html:322
 msgid "Status"
 msgstr "Státusz"
 
-#: core/templates/user/overview.html:307
+#: core/templates/user/overview.html:325
 msgid "Active"
 msgstr "Aktív"
 
-#: core/templates/user/overview.html:309
+#: core/templates/user/overview.html:327
 msgid "Inactive"
 msgstr "Inaktív"
 
-#: core/templates/user/overview.html:330 gym/templates/contract/list.html:4
-#: gym/templates/gym/member_list.html:202
+#: core/templates/user/overview.html:348 gym/templates/contract/list.html:4
+#: gym/templates/gym/member_list.html:218
 msgid "Contracts"
 msgstr ""
 
-#: core/templates/user/overview.html:405 gym/templates/document/list.html:4
+#: core/templates/user/overview.html:426 gym/templates/document/list.html:4
 msgid "Documents"
 msgstr "Dokumentumok"
 
-#: core/templates/user/overview.html:412 gym/templates/document/list.html:32
-#: manager/forms.py:292 manager/templates/workout/view.html:132
+#: core/templates/user/overview.html:433 gym/templates/document/list.html:33
+#: manager/forms.py:292 manager/templates/workout/view.html:143
 msgid "Download"
 msgstr "Letöltés"
 
-#: core/templates/user/overview.html:450 gym/views/admin_config.py:44
+#: core/templates/user/overview.html:474 gym/views/admin_config.py:44
 #: gym/views/admin_config.py:58 gym/views/user_config.py:46
 msgid "Configuration"
 msgstr "Beállítás"
 
-#: core/templates/user/overview.html:453 gym/models/user_config.py:92
+#: core/templates/user/overview.html:477 gym/models/user_config.py:92
 msgid "Include in inactive overview"
 msgstr ""
 
-#: core/templates/user/overview.html:486
+#: core/templates/user/overview.html:510
 #, python-format
 msgid "Admin login is only available for users in %(gym_name)s"
 msgstr ""
 
-#: core/templates/user/overview.html:490
+#: core/templates/user/overview.html:514
 msgid "Log in as this user"
 msgstr "Bejelentkezés mint ez a felhasználó"
 
@@ -1235,19 +1200,19 @@ msgstr ""
 msgid "Send verification email"
 msgstr ""
 
-#: core/templates/user/preferences.html:30
+#: core/templates/user/preferences.html:31
 msgid "You need to verify your email to contribute exercises"
 msgstr ""
 
-#: core/templates/user/preferences.html:50 core/views/user.py:611
+#: core/templates/user/preferences.html:55 core/views/user.py:610
 msgid "Change password"
 msgstr "Jelszó megváltoztatása"
 
-#: core/templatetags/wger_extras.py:205 i18n.tpl:37
+#: core/templatetags/wger_extras.py:197 i18n.tpl:37
 msgid "kg"
 msgstr "kg"
 
-#: core/templatetags/wger_extras.py:207
+#: core/templatetags/wger_extras.py:199
 #: nutrition/templates/ingredient/view.html:60
 #: nutrition/templates/ingredient/view.html:66
 #: nutrition/templates/ingredient/view.html:73
@@ -1259,11 +1224,11 @@ msgctxt "weight unit, i.e. grams"
 msgid "g"
 msgstr "g"
 
-#: core/templatetags/wger_extras.py:210 i18n.tpl:38
+#: core/templatetags/wger_extras.py:202 i18n.tpl:38
 msgid "lb"
 msgstr ""
 
-#: core/templatetags/wger_extras.py:212
+#: core/templatetags/wger_extras.py:204
 msgctxt "weight unit, i.e. ounces"
 msgid "oz"
 msgstr ""
@@ -1290,13 +1255,13 @@ msgid "Delete {0}?"
 msgstr "Töröljem {0}?"
 
 #: core/views/languages.py:111 core/views/license.py:85
-#: core/views/repetition_units.py:86 core/views/user.py:474
+#: core/views/repetition_units.py:86 core/views/user.py:473
 #: core/views/weight_units.py:86 exercises/views/categories.py:98
 #: exercises/views/equipment.py:81 exercises/views/muscles.py:87
 #: gym/views/admin_notes.py:161 gym/views/config.py:68
 #: gym/views/contract.py:186 gym/views/contract_option.py:123
 #: gym/views/contract_type.py:123 gym/views/document.py:171
-#: gym/views/gym.py:463 manager/views/day.py:100 manager/views/schedule.py:333
+#: gym/views/gym.py:463 manager/views/day.py:96 manager/views/schedule.py:333
 #: manager/views/workout.py:267 nutrition/views/ingredient.py:145
 #: nutrition/views/unit.py:143
 #, python-brace-format
@@ -1322,48 +1287,48 @@ msgstr ""
 msgid "Your feedback was successfully sent. Thank you!"
 msgstr "A visszajelzésed sikeresen elküldtük. Köszönjük!"
 
-#: core/views/user.py:156
+#: core/views/user.py:155
 #, python-brace-format
 msgid "Account \"{0}\" was successfully deleted"
 msgstr "A \"{0}\" fiók sikeresen törölve"
 
-#: core/views/user.py:292
+#: core/views/user.py:291
 msgid "You were successfully registered"
 msgstr "Sikeresen regisztráltál"
 
-#: core/views/user.py:351
+#: core/views/user.py:350
 msgid "Settings successfully updated"
 msgstr "Beállítások sikeresen frissítve"
 
-#: core/views/user.py:390
+#: core/views/user.py:389
 msgid "The user was successfully deactivated"
 msgstr "A felhasználó sikeresen deaktiválva"
 
-#: core/views/user.py:427
+#: core/views/user.py:426
 msgid "The user was successfully activated"
 msgstr "A felhasználó sikeresen aktiválva"
 
-#: core/views/user.py:442
+#: core/views/user.py:441
 msgid "Edit user"
 msgstr "Felhasználó módosítása"
 
-#: core/views/user.py:597 gym/templates/gym/member_list.html:26
+#: core/views/user.py:596 gym/templates/gym/member_list.html:26
 #: gym/views/gym.py:158
 msgid "ID"
 msgstr "ID"
 
-#: core/views/user.py:598 gym/forms.py:95 gym/templates/contract/view.html:55
+#: core/views/user.py:597 gym/forms.py:95 gym/templates/contract/view.html:55
 #: gym/templates/gym/member_list.html:27 gym/views/export.py:59
 #: gym/views/gym.py:158 gym/views/gym.py:217
 msgid "Username"
 msgstr "Felhasználónév"
 
-#: core/views/user.py:601 gym/templates/gym/new_user.html:34
+#: core/views/user.py:600 gym/templates/gym/new_user.html:34
 #: gym/views/export.py:58 gym/views/gym.py:217
 msgid "Gym"
 msgstr "Edzőterem"
 
-#: core/views/user.py:660
+#: core/views/user.py:659
 #, python-format
 msgid "A verification email was sent to %(email)s"
 msgstr ""
@@ -1519,11 +1484,6 @@ msgstr ""
 msgid "Equipment list"
 msgstr "Felszerelés lista"
 
-#: exercises/templates/equipment/admin-overview.html:39
-#: exercises/views/equipment.py:92
-msgid "Add new equipment"
-msgstr "Új felszerelés hozzáadása"
-
 #: exercises/templates/history/overview.html:11
 #, fuzzy
 #| msgid "Exercise Categories"
@@ -1577,11 +1537,6 @@ msgstr ""
 msgid "Muscle overview"
 msgstr "Izom áttekintés"
 
-#: exercises/templates/muscles/admin-overview.html:38
-#: exercises/views/muscles.py:68
-msgid "Add muscle"
-msgstr "Izom hozzáadása"
-
 #: exercises/views/categories.py:72
 msgid "Add category"
 msgstr "Kategória hozzáadása"
@@ -1590,6 +1545,10 @@ msgstr "Kategória hozzáadása"
 msgid "This will also delete all exercises in this category."
 msgstr "Ez a művelet az összes a kategóriában lévő gyakorlatot törölni fogja."
 
+#: exercises/views/equipment.py:92
+msgid "Add new equipment"
+msgstr "Új felszerelés hozzáadása"
+
 #: exercises/views/equipment.py:104 exercises/views/equipment.py:115
 msgid "Delete equipment?"
 msgstr "Felszerelés törlése?"
@@ -1598,6 +1557,10 @@ msgstr "Felszerelés törlése?"
 msgid "This will delete the exercise from all workouts."
 msgstr "Ez a művelet törölni fogja az edzésben lévő összes gyakorlatot."
 
+#: exercises/views/muscles.py:68
+msgid "Add muscle"
+msgstr "Izom hozzáadása"
+
 #: gallery/templates/images/overview.html:62
 #, fuzzy
 #| msgid "Add new image"
@@ -1687,7 +1650,7 @@ msgid "Contract is active"
 msgstr ""
 
 #: gym/models/contract.py:237 gym/templates/contract/view.html:69
-#: manager/models/schedule.py:61 manager/templates/schedule/view.html:67
+#: manager/models/schedule.py:61 manager/templates/schedule/view.html:66
 msgid "Start date"
 msgstr "Kezdés dátuma"
 
@@ -1723,7 +1686,7 @@ msgstr ""
 msgid "Admin: can administrate the different gyms"
 msgstr ""
 
-#: gym/models/gym.py:65 gym/templates/gym/member_list.html:114
+#: gym/models/gym.py:65 gym/templates/gym/member_list.html:126
 msgid "Owner"
 msgstr "Tulajdonos"
 
@@ -1733,7 +1696,7 @@ msgid ""
 "considered inactive"
 msgstr ""
 
-#: gym/models/gym_config.py:56 gym/templates/gym/member_list.html:152
+#: gym/models/gym_config.py:56 gym/templates/gym/member_list.html:166
 msgid "Show name in header"
 msgstr ""
 
@@ -1747,7 +1710,7 @@ msgstr ""
 msgid "Configuration for {self.gym.name}"
 msgstr "{} beállításai"
 
-#: gym/models/user_config.py:65 gym/templates/gym/member_list.html:184
+#: gym/models/user_config.py:65 gym/templates/gym/member_list.html:200
 msgid "Overview of inactive members"
 msgstr ""
 
@@ -1771,7 +1734,7 @@ msgstr ""
 msgid "User notes"
 msgstr "Felhasználói megjegyzések"
 
-#: gym/templates/contract/list.html:36
+#: gym/templates/contract/list.html:34
 msgid "Show"
 msgstr "Megmutat"
 
@@ -1797,11 +1760,11 @@ msgstr ""
 msgid "Gym list"
 msgstr "Edzőterem lista"
 
-#: gym/templates/gym/list.html:50
+#: gym/templates/gym/list.html:53
 msgid "Global gym configuration"
 msgstr "Globális edzőterem beállítás"
 
-#: gym/templates/gym/list.html:67 gym/views/gym.py:171
+#: gym/templates/gym/list.html:69 gym/views/gym.py:171
 msgid "Add new gym"
 msgstr "Új edzőterem hozzáadása"
 
@@ -1813,43 +1776,43 @@ msgstr "Adminisztrátorok és edzők"
 msgid "Gym manager"
 msgstr "Edzőterem menedzser"
 
-#: gym/templates/gym/member_list.html:69
+#: gym/templates/gym/member_list.html:76
 msgid "This gym has no administrators or trainers"
 msgstr ""
 
-#: gym/templates/gym/member_list.html:88
+#: gym/templates/gym/member_list.html:98
 msgid "Export"
 msgstr ""
 
-#: gym/templates/gym/member_list.html:125
+#: gym/templates/gym/member_list.html:137
 msgid "Members"
 msgstr "Tagok"
 
-#: gym/templates/gym/member_list.html:145
+#: gym/templates/gym/member_list.html:159
 msgid "Gym configuration"
 msgstr "Edzőterem beállítás"
 
-#: gym/templates/gym/member_list.html:148
+#: gym/templates/gym/member_list.html:162
 msgid "Inactive members"
 msgstr "Inaktív tagok"
 
-#: gym/templates/gym/member_list.html:149
+#: gym/templates/gym/member_list.html:163
 msgid "weeks"
 msgstr "hetek"
 
-#: gym/templates/gym/member_list.html:181
+#: gym/templates/gym/member_list.html:197
 msgid "My configuration"
 msgstr "Saját beállítás"
 
-#: gym/templates/gym/member_list.html:215
+#: gym/templates/gym/member_list.html:234
 msgid "Types"
 msgstr ""
 
-#: gym/templates/gym/member_list.html:285
+#: gym/templates/gym/member_list.html:307
 msgid "Emails"
 msgstr ""
 
-#: gym/templates/gym/member_list.html:315
+#: gym/templates/gym/member_list.html:336
 msgid "Add member"
 msgstr "Tag hozzáadása"
 
@@ -2142,28 +2105,38 @@ msgstr "Használjon hozzávalókat Angolul is"
 msgid "Unit"
 msgstr ""
 
+#: manager/forms.py:191 manager/models/log.py:103 manager/models/setting.py:102
+#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
+msgid "RiR"
+msgstr ""
+
 #: manager/forms.py:279
 msgid "Type"
 msgstr ""
 
-#: manager/forms.py:280 manager/templates/workout/view.html:113
+#: manager/forms.py:280 manager/templates/workout/view.html:122
 msgid "Table"
 msgstr ""
 
-#: manager/forms.py:282 manager/templates/workout/view.html:119
+#: manager/forms.py:282 manager/templates/workout/view.html:129
 msgid "with images"
 msgstr ""
 
-#: manager/forms.py:283 manager/templates/workout/view.html:125
+#: manager/forms.py:283 manager/templates/workout/view.html:136
 msgid "with comments"
 msgstr ""
 
+#: manager/helpers.py:86 manager/models/setting.py:72
+#: manager/templates/set/formset.html:9
+msgid "Reps"
+msgstr "Ismétlés"
+
 #: manager/management/commands/email-reminders.py:121
 msgid "Workout will expire soon"
 msgstr ""
 
 #: manager/models/day.py:34 manager/models/log.py:58
-#: manager/models/session.py:60 manager/templates/schedule/view.html:102
+#: manager/models/session.py:60 manager/templates/schedule/view.html:101
 #: manager/templates/workout/view.html:9 manager/templates/workout/view.html:17
 #: manager/views/pdf.py:85 manager/views/pdf.py:161
 #: manager/views/schedule.py:151 manager/views/schedule.py:221
@@ -2184,7 +2157,7 @@ msgstr "Nap"
 msgid "Name or short description of the schedule. For example 'Program XYZ'."
 msgstr ""
 
-#: manager/models/schedule.py:65 manager/templates/schedule/view.html:71
+#: manager/models/schedule.py:65 manager/templates/schedule/view.html:70
 msgid "Schedule active"
 msgstr ""
 
@@ -2195,7 +2168,7 @@ msgid ""
 "inactive"
 msgstr ""
 
-#: manager/models/schedule.py:77 manager/templates/schedule/view.html:81
+#: manager/models/schedule.py:77 manager/templates/schedule/view.html:80
 msgid "Is a loop"
 msgstr ""
 
@@ -2214,7 +2187,7 @@ msgid "The duration in weeks"
 msgstr "Az időtartam hetekben"
 
 #: manager/models/schedule_step.py:64 manager/models/set.py:53
-#: manager/models/setting.py:113 nutrition/models/meal.py:55
+#: manager/models/setting.py:113 nutrition/models/meal.py:53
 #: nutrition/models/meal_item.py:66
 msgid "Order"
 msgstr "Sorrend"
@@ -2348,7 +2321,7 @@ msgstr ""
 msgid "Workout session"
 msgstr ""
 
-#: manager/templates/calendar/partial_overview_table.html:27
+#: manager/templates/calendar/partial_overview_table.html:26
 msgid "Delete with logs"
 msgstr ""
 
@@ -2368,21 +2341,27 @@ msgid ""
 "will simply be edited. Weight entries are always added."
 msgstr ""
 
-#: manager/templates/schedule/overview.html:5
+#: manager/templates/schedule/overview.html:4
 msgid "Your schedules"
 msgstr "Ütemterveid"
 
 #: manager/templates/schedule/overview.html:19
-#: manager/templates/schedule/view.html:131
-#: manager/templates/schedule/view.html:183
+#: manager/templates/schedule/view.html:143
+#: manager/templates/schedule/view.html:193
 #: manager/templates/workout/overview.html:16
 msgid "active"
 msgstr "aktív"
 
-#: manager/templates/schedule/overview.html:28
+#: manager/templates/schedule/overview.html:27
 msgid "No schedules found."
 msgstr "Nem található ütemterv."
 
+#: manager/templates/schedule/overview.html:28
+#, fuzzy
+#| msgid "Add one now."
+msgid "Add one now"
+msgstr "Adj hozzá egyet most."
+
 #: manager/templates/schedule/overview.html:36
 msgid ""
 "Schedules are collections of workouts that you do in\n"
@@ -2395,10 +2374,11 @@ msgid ""
 "        before jumping to the next. It is also possible to create a loop, so "
 "you\n"
 "        always do the same workouts in succession, e.g. A > B > C > A > B > "
-"C and so on."
+"C and so\n"
+"        on."
 msgstr ""
 
-#: manager/templates/schedule/overview.html:43
+#: manager/templates/schedule/overview.html:44
 msgid ""
 "The currently active schedule will remain active (and be\n"
 "        shown e.g. in your dashboard) till it reaches the last workout or "
@@ -2414,25 +2394,25 @@ msgstr "Ütemterv hozzáadása"
 msgid "Schedule"
 msgstr "ütemterv"
 
-#: manager/templates/schedule/view.html:85
+#: manager/templates/schedule/view.html:84
 msgid ""
 "This schedule is a loop and will go through the workouts above till you "
 "deactivate it"
 msgstr ""
 
-#: manager/templates/schedule/view.html:103
+#: manager/templates/schedule/view.html:102
 msgid "Weeks"
 msgstr "Hetek"
 
-#: manager/templates/schedule/view.html:115
+#: manager/templates/schedule/view.html:114
 msgid "Move me"
 msgstr ""
 
-#: manager/templates/schedule/view.html:156
+#: manager/templates/schedule/view.html:168
 msgid "Start schedule"
 msgstr "Ütemterv indítása"
 
-#: manager/templates/schedule/view.html:187
+#: manager/templates/schedule/view.html:197
 #, python-format
 msgid ""
 "%(weeks)s Week\n"
@@ -2443,11 +2423,11 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: manager/templates/schedule/view.html:221
+#: manager/templates/schedule/view.html:231
 msgid "Adding workouts"
 msgstr "Edzések hozzáadása"
 
-#: manager/templates/schedule/view.html:223
+#: manager/templates/schedule/view.html:233
 msgid ""
 "Add as many workouts to the schedule as you want. You can\n"
 "            edit the order by dragging and dropping them. It's also possible "
@@ -2455,44 +2435,37 @@ msgid ""
 "            than once."
 msgstr ""
 
-#: manager/templates/schedule/view.html:232
-#: manager/templates/schedule/view.html:243
-#: manager/templates/schedule/view.html:290
+#: manager/templates/schedule/view.html:242
+#: manager/templates/schedule/view.html:256
+#: manager/templates/schedule/view.html:310
 #: manager/templates/workout/view.html:69
-#: manager/templates/workout/view.html:79
-#: manager/templates/workout/view.html:178
+#: manager/templates/workout/view.html:83
+#: manager/templates/workout/view.html:192
 msgid "Export calendar file"
 msgstr "Calendar fájl exportálása"
 
-#: manager/templates/schedule/view.html:236
+#: manager/templates/schedule/view.html:248
 msgid "Export this schedule as a calendar file."
 msgstr "Az ütemterv exportálása calendar fájlként."
 
-#: manager/templates/schedule/view.html:237
-#: manager/templates/workout/view.html:74
+#: manager/templates/schedule/view.html:249
+#: manager/templates/workout/view.html:76
 msgid ""
 "You can then import the file it into your calendar\n"
 "                        application for example google calendar, outlook or "
 "iCal. This will create\n"
 "                        an appointment for each training day with the "
-"appropriate exercises."
+"appropriate\n"
+"                        exercises."
 msgstr ""
 
-#: manager/templates/schedule/view.html:258
-#: manager/templates/schedule/view.html:294
-#: manager/templates/workout/view.html:94
-#: manager/templates/workout/view.html:174
+#: manager/templates/schedule/view.html:272
+#: manager/templates/schedule/view.html:315
+#: manager/templates/workout/view.html:99
+#: manager/templates/workout/view.html:188
 msgid "Download as PDF"
 msgstr "PDF letöltése"
 
-#: manager/templates/schedule/view.html:299
-msgid "Edit schedule"
-msgstr "Ütemterv szerkesztése"
-
-#: manager/templates/schedule/view.html:304
-msgid "Delete schedule"
-msgstr "Ütemterv törlése"
-
 #: manager/templates/set/add.html:9
 #, python-format
 msgid "Add exercises to day \"%(day_name)s\""
@@ -2557,47 +2530,6 @@ msgid ""
 "You will regularly receive such reminders till you enter your current weight."
 msgstr ""
 
-#: manager/templates/workout/log.html:10 manager/templates/workout/log.html:11
-msgid "Weight log"
-msgstr "Testsúly napló"
-
-#: manager/templates/workout/log.html:29
-msgid "Weight log for workout"
-msgstr ""
-
-#: manager/templates/workout/log.html:49
-msgid "Add weight log to this day"
-msgstr "Testsúly bejegyzés hozzáadása ehhez a naphoz"
-
-#: manager/templates/workout/log.html:69
-msgid "No weight entries here."
-msgstr ""
-
-#: manager/templates/workout/log.html:77
-msgid "No exercises for this day."
-msgstr ""
-
-#: manager/templates/workout/log.html:90
-msgid ""
-"This page shows the weight logs belonging to this workout\n"
-"only. Click on an exercise to see all the historical data for\n"
-"it."
-msgstr ""
-
-#: manager/templates/workout/log.html:94
-msgid ""
-"If on a single day there is more than one entry with the\n"
-"same number of repetitions, but different weights, only the entry with the\n"
-"higher weight is shown in the diagram."
-msgstr ""
-
-#: manager/templates/workout/log.html:98
-msgid ""
-"Note that only entries with a weight unit (kg or lb) and\n"
-"repetitions are charted, other combinations such as time or until failure\n"
-"are ignored here."
-msgstr ""
-
 #: manager/templates/workout/overview.html:25
 #, fuzzy
 #| msgid "No schedules found."
@@ -2637,27 +2569,23 @@ msgstr ""
 msgid "Set the repetitions for each set"
 msgstr ""
 
-#: manager/templates/workout/view.html:73
+#: manager/templates/workout/view.html:75
 msgid "Export this workout as a calendar file."
 msgstr ""
 
-#: manager/templates/workout/view.html:144
+#: manager/templates/workout/view.html:156
 msgid "Logs"
 msgstr ""
 
-#: manager/templates/workout/view.html:146
+#: manager/templates/workout/view.html:159
 msgid "View logs"
 msgstr ""
 
-#: manager/templates/workout/view.html:169 manager/views/schedule_step.py:99
-msgid "Edit workout"
-msgstr "Edzés módosítása"
-
-#: manager/templates/workout/view.html:182 manager/views/workout.py:281
+#: manager/templates/workout/view.html:195 manager/views/workout.py:281
 msgid "Mark as template"
 msgstr ""
 
-#: manager/views/day.py:109
+#: manager/views/day.py:105
 msgid "Add workout day"
 msgstr ""
 
@@ -2674,6 +2602,10 @@ msgstr ""
 msgid "Create schedule"
 msgstr "Ütemterv létrehozása"
 
+#: manager/views/schedule_step.py:99
+msgid "Edit workout"
+msgstr "Edzés módosítása"
+
 #: manager/views/workout.py:209
 msgid "Copy workout"
 msgstr "Edzés másolása"
@@ -2801,7 +2733,7 @@ msgstr ""
 msgid "Unit amount, e.g. \"1 Cup\" or \"1/2 spoon\""
 msgstr ""
 
-#: nutrition/models/log.py:52 nutrition/models/meal.py:50
+#: nutrition/models/log.py:52 nutrition/models/meal.py:48
 #: nutrition/models/meal_item.py:48 nutrition/models/plan.py:108
 msgid "Nutrition plan"
 msgstr "Táplálkozási terv"
@@ -2814,11 +2746,11 @@ msgstr ""
 msgid "Date and Time (Approx.)"
 msgstr ""
 
-#: nutrition/models/meal.py:62
+#: nutrition/models/meal.py:60
 msgid "Time (approx)"
 msgstr ""
 
-#: nutrition/models/meal.py:69
+#: nutrition/models/meal.py:67
 msgid ""
 "Give meals a textual description / name such as \"Breakfast\" or \"after "
 "workout\""
@@ -2937,10 +2869,6 @@ msgstr "Nincs összetevő."
 msgid "Search"
 msgstr "Keresés"
 
-#: nutrition/templates/ingredient/overview.html:62
-msgid "Add ingredient"
-msgstr "Összetevő hozzáadása"
-
 #: nutrition/templates/ingredient/view.html:45 nutrition/views/plan.py:229
 msgid "Macronutrients"
 msgstr ""
@@ -2960,20 +2888,11 @@ msgstr ""
 msgid "Others"
 msgstr ""
 
-#: nutrition/templates/ingredient/view.html:144
-#: nutrition/templates/units/list.html:46 nutrition/views/unit.py:86
+#: nutrition/templates/ingredient/view.html:143
+#: nutrition/templates/units/list.html:50 nutrition/views/unit.py:86
 msgid "Add new weight unit"
 msgstr ""
 
-#: nutrition/templates/ingredient/view.html:206
-#: nutrition/templates/ingredient/view.html:209
-msgid "Edit ingredient"
-msgstr ""
-
-#: nutrition/templates/ingredient/view.html:213
-msgid "Delete ingredient"
-msgstr ""
-
 #: nutrition/templates/rate/form.html:25
 msgid "Basal metabolic rate"
 msgstr ""
@@ -3552,6 +3471,27 @@ msgstr ""
 msgid "Delete weight entry for the %s"
 msgstr ""
 
+#~ msgid "This exercise has no repetitions."
+#~ msgstr "A gyakorlatnak nincsenek ismétlései."
+
+#~ msgid "Add exercises to this workout day"
+#~ msgstr "Gyakorlat hozzáadása ehhez az edzés naphoz"
+
+#~ msgid "Edit schedule"
+#~ msgstr "Ütemterv szerkesztése"
+
+#~ msgid "Delete schedule"
+#~ msgstr "Ütemterv törlése"
+
+#~ msgid "Weight log"
+#~ msgstr "Testsúly napló"
+
+#~ msgid "Add weight log to this day"
+#~ msgstr "Testsúly bejegyzés hozzáadása ehhez a naphoz"
+
+#~ msgid "Add ingredient"
+#~ msgstr "Összetevő hozzáadása"
+
 #~ msgid "Ingredients pending review"
 #~ msgstr "Ellenőrzésre váró összetevők"
 
diff --git a/wger/locale/it/LC_MESSAGES/django.po b/wger/locale/it/LC_MESSAGES/django.po
index dde92693d..5e64c7bc3 100644
--- a/wger/locale/it/LC_MESSAGES/django.po
+++ b/wger/locale/it/LC_MESSAGES/django.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: wger Workout Manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-07-14 15:59+0200\n"
+"POT-Creation-Date: 2024-11-14 13:09+0100\n"
 "PO-Revision-Date: 2024-04-05 23:01+0000\n"
 "Last-Translator: Federico Pierantoni <federico.pieranton@gmail.com>\n"
 "Language-Team: Italian <https://hosted.weblate.org/projects/wger/web/it/>\n"
@@ -26,7 +26,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 5.5-dev\n"
 
-#: config/models/gym_config.py:46 gym/templates/gym/list.html:53
+#: config/models/gym_config.py:46 gym/templates/gym/list.html:56
 msgid "Default gym"
 msgstr "Palestra Predefinita"
 
@@ -39,28 +39,28 @@ msgstr ""
 "sarà assegnata a tutti i nuovi utenti e a tutti gli utenti già registrati "
 "che non ne hanno una."
 
-#: config/views/gym_config.py:42 core/templates/language/view.html:67
-#: core/templates/license/list.html:17 core/templates/misc/license/list.html:18
+#: config/views/gym_config.py:42 core/templates/language/view.html:64
+#: core/templates/license/list.html:17
 #: core/templates/repetition_unit/list.html:18
-#: core/templates/tags/render_day.html:39
-#: core/templates/tags/render_day.html:75 core/templates/user/overview.html:204
-#: core/templates/user/overview.html:445
+#: core/templates/user/overview.html:204 core/templates/user/overview.html:467
 #: core/templates/weight_unit/list.html:18
 #: exercises/templates/categories/admin-overview.html:17
 #: exercises/templates/equipment/admin-overview.html:17
-#: exercises/templates/muscles/admin-overview.html:17
-#: gallery/views/images.py:98 gym/templates/admin_notes/list.html:32
-#: gym/templates/contract/list.html:31 gym/templates/contract/view.html:107
-#: gym/templates/contract_option/list.html:32
-#: gym/templates/contract_type/list.html:32 gym/templates/document/list.html:38
-#: gym/templates/gym/list.html:20 gym/templates/gym/list.html:46
-#: gym/templates/gym/member_list.html:87 gym/templates/gym/member_list.html:140
-#: gym/templates/gym/member_list.html:176
-#: manager/templates/calendar/day.html:68
-#: manager/templates/calendar/month.html:85
-#: manager/templates/calendar/partial_overview_table.html:18
-#: manager/templates/schedule/view.html:118
-#: nutrition/templates/ingredient/view.html:165
+#: exercises/templates/muscles/admin-overview.html:16
+#: gallery/views/images.py:98 gym/templates/admin_notes/list.html:31
+#: gym/templates/contract/list.html:30 gym/templates/contract/view.html:106
+#: gym/templates/contract_option/list.html:29
+#: gym/templates/contract_type/list.html:30 gym/templates/document/list.html:38
+#: gym/templates/gym/list.html:19 gym/templates/gym/list.html:48
+#: gym/templates/gym/member_list.html:94 gym/templates/gym/member_list.html:152
+#: gym/templates/gym/member_list.html:190
+#: manager/templates/calendar/day.html:67
+#: manager/templates/calendar/month.html:84
+#: manager/templates/calendar/partial_overview_table.html:16
+#: manager/templates/schedule/view.html:318
+#: manager/templates/workout/view.html:181
+#: nutrition/templates/ingredient/view.html:164
+#: nutrition/templates/ingredient/view.html:209
 #: nutrition/templates/units/list.html:19
 msgid "Edit"
 msgstr "Modifica"
@@ -94,8 +94,8 @@ msgstr "Il mio programma di allenamento"
 msgid "Empty placeholder schedule"
 msgstr "Programma segnaposto vuoto"
 
-#: core/forms.py:69 core/templates/navigation.html:285
-#: core/templates/navigation.html:291 core/templates/user/login.html:4
+#: core/forms.py:69 core/templates/navigation.html:284
+#: core/templates/navigation.html:290 core/templates/user/login.html:4
 #: software/templates/features.html:82 software/templates/features.html:427
 msgid "Login"
 msgstr "Entra"
@@ -105,14 +105,14 @@ msgstr "Entra"
 msgid "First name"
 msgstr "Nome"
 
-#: core/forms.py:109 core/forms.py:215 core/templates/user/overview.html:266
+#: core/forms.py:109 core/forms.py:215 core/templates/user/overview.html:284
 #: gym/views/export.py:62 gym/views/gym.py:217
 msgid "Last name"
 msgstr "Cognome"
 
-#: core/forms.py:111 core/forms.py:180 core/templates/user/overview.html:270
+#: core/forms.py:111 core/forms.py:180 core/templates/user/overview.html:288
 #: gym/models/contract.py:256 gym/models/gym.py:58
-#: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:104
+#: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:116
 #: gym/templates/gym/new_user.html:30 gym/views/export.py:60
 #: mailer/templates/mailer/gym/form.html:4
 #: mailer/templates/mailer/gym/overview.html:4
@@ -143,8 +143,8 @@ msgstr "Promemoria allenamento"
 msgid "Other settings"
 msgstr "Altre impostazioni"
 
-#: core/forms.py:174 core/views/user.py:624 core/views/user.py:639
-#: core/views/user.py:651 gym/forms.py:73 manager/templates/log/add.html:65
+#: core/forms.py:174 core/views/user.py:623 core/views/user.py:638
+#: core/views/user.py:650 gym/forms.py:73 manager/templates/log/add.html:65
 #: manager/templates/set/add.html:70 manager/views/workout.py:203
 #: utils/generic_views.py:143
 msgid "Save"
@@ -169,26 +169,25 @@ msgstr "Password"
 msgid "Please enter your current password."
 msgstr "Si prega di inserire la tua password attuale."
 
-#: core/forms.py:242 core/templates/language/view.html:73
-#: core/templates/license/list.html:19 core/templates/misc/license/list.html:22
-#: core/templates/repetition_unit/list.html:20
-#: core/templates/tags/render_day.html:45
-#: core/templates/tags/render_day.html:81 core/templates/user/overview.html:217
-#: core/templates/weight_unit/list.html:20
-#: exercises/templates/categories/admin-overview.html:19
-#: exercises/templates/equipment/admin-overview.html:19
-#: exercises/templates/muscles/admin-overview.html:19
-#: gym/templates/admin_notes/list.html:40
-#: gym/templates/contract_option/list.html:41
-#: gym/templates/contract_type/list.html:41 gym/templates/document/list.html:46
-#: gym/templates/gym/list.html:22 manager/templates/calendar/day.html:73
-#: manager/templates/calendar/month.html:89
-#: manager/templates/calendar/partial_overview_table.html:23
-#: manager/templates/schedule/view.html:122
-#: manager/templates/workout/view.html:188
-#: nutrition/templates/ingredient/view.html:166
+#: core/forms.py:242 core/templates/language/view.html:70
+#: core/templates/license/list.html:21
+#: core/templates/repetition_unit/list.html:22
+#: core/templates/user/overview.html:233
+#: core/templates/weight_unit/list.html:22
+#: exercises/templates/categories/admin-overview.html:21
+#: exercises/templates/equipment/admin-overview.html:21
+#: exercises/templates/muscles/admin-overview.html:20
+#: gym/templates/admin_notes/list.html:37
+#: gym/templates/contract_option/list.html:35
+#: gym/templates/contract_type/list.html:36 gym/templates/document/list.html:46
+#: gym/templates/gym/list.html:23 manager/templates/calendar/day.html:73
+#: manager/templates/calendar/month.html:88
+#: manager/templates/calendar/partial_overview_table.html:22
+#: manager/templates/schedule/view.html:324
+#: manager/templates/workout/view.html:202
+#: nutrition/templates/ingredient/view.html:168
 #: nutrition/templates/ingredient/view.html:215
-#: nutrition/templates/units/list.html:22
+#: nutrition/templates/units/list.html:25
 msgid "Delete"
 msgstr "Elimina"
 
@@ -200,9 +199,9 @@ msgstr "Password non valida"
 msgid "The form is secured with reCAPTCHA"
 msgstr "Questo modulo è protetto con reCAPTCHA"
 
-#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:285
-#: core/templates/navigation.html:297 core/templates/template.html:149
-#: core/templates/user/login.html:20 core/views/user.py:298
+#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:284
+#: core/templates/navigation.html:296 core/templates/template.html:151
+#: core/templates/user/login.html:20 core/views/user.py:297
 #: software/templates/features.html:87 software/templates/features.html:422
 msgid "Register"
 msgstr "Registrati"
@@ -460,18 +459,18 @@ msgid "The sum of all hours has to be 24"
 msgstr "La somma di tutte le ore deve essere 24"
 
 #: core/models/rep_unit.py:36 core/models/weight_unit.py:36
-#: core/templates/user/overview.html:262 core/views/user.py:599
+#: core/templates/user/overview.html:280 core/views/user.py:598
 #: exercises/models/category.py:29 exercises/models/equipment.py:29
 #: exercises/models/exercise.py:59 exercises/models/muscle.py:36
 #: gym/models/contract.py:52 gym/models/contract.py:103 gym/models/gym.py:46
 #: gym/models/user_document.py:84 gym/templates/contract/view.html:50
-#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:96
+#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:108
 #: gym/views/gym.py:158 manager/models/schedule.py:55
 #: manager/models/workout.py:57 measurements/models/category.py:36
 #: nutrition/models/ingredient.py:111
-#: nutrition/models/ingredient_category.py:27 nutrition/models/meal.py:67
+#: nutrition/models/ingredient_category.py:27 nutrition/models/meal.py:65
 #: nutrition/models/weight_unit.py:38
-#: nutrition/templates/ingredient/view.html:152
+#: nutrition/templates/ingredient/view.html:151
 msgid "Name"
 msgstr "Nome"
 
@@ -524,7 +523,7 @@ msgstr ""
 msgid "Back to \"%(target)s\""
 msgstr "Ritorna a «%(target)s»"
 
-#: core/templates/delete.html:15
+#: core/templates/delete.html:4
 msgid "Are you sure you want to delete this? This action cannot be undone."
 msgstr "Sei sicuro/a di volerlo eliminare? Questa azione sarà permanente."
 
@@ -577,7 +576,7 @@ msgstr "Clicca sul seguente link per confermare la tua email: %(link)s"
 msgid "Dashboard"
 msgstr "Pagina principale"
 
-#: core/templates/language/overview.html:4 core/templates/navigation.html:345
+#: core/templates/language/overview.html:4 core/templates/navigation.html:344
 msgid "Languages"
 msgstr "Lingue"
 
@@ -587,81 +586,72 @@ msgstr "Nessun risultato."
 
 #: core/templates/language/overview.html:22
 #: manager/templates/calendar/month.html:132
-#: manager/templates/schedule/overview.html:28
-#: manager/templates/schedule/view.html:144
+#: manager/templates/schedule/view.html:154
 #: manager/templates/workout/overview.html:28
 #: nutrition/templates/ingredient/overview.html:38
 msgid "Add one now."
 msgstr "Aggiungine uno adesso."
 
-#: core/templates/language/overview.html:35 core/templates/license/list.html:40
-#: core/templates/misc/license/list.html:43
-#: core/templates/repetition_unit/list.html:43
-#: core/templates/user/overview.html:326 core/templates/user/overview.html:365
-#: core/templates/user/overview.html:401
-#: core/templates/weight_unit/list.html:43 core/views/languages.py:74
+#: core/templates/language/overview.html:34 core/templates/license/list.html:43
+#: core/templates/repetition_unit/list.html:46
+#: core/templates/user/overview.html:344 core/templates/user/overview.html:384
+#: core/templates/user/overview.html:422
+#: core/templates/weight_unit/list.html:46 core/views/languages.py:74
 #: core/views/license.py:66 core/views/repetition_units.py:66
 #: core/views/weight_units.py:66
-#: exercises/templates/categories/admin-overview.html:38
-#: gallery/views/images.py:63 gym/templates/admin_notes/list.html:67
-#: gym/templates/contract/list.html:73
-#: gym/templates/contract_option/list.html:72
-#: gym/templates/contract_type/list.html:72 gym/templates/document/list.html:79
-#: gym/templates/gym/member_list.html:211
-#: gym/templates/gym/member_list.html:244
-#: gym/templates/gym/member_list.html:281
+#: exercises/templates/categories/admin-overview.html:40
+#: exercises/templates/equipment/admin-overview.html:39
+#: exercises/templates/muscles/admin-overview.html:40
+#: gallery/views/images.py:63 gym/templates/admin_notes/list.html:64
+#: gym/templates/contract/list.html:69
+#: gym/templates/contract_option/list.html:65
+#: gym/templates/contract_type/list.html:66 gym/templates/document/list.html:78
+#: gym/templates/gym/member_list.html:228
+#: gym/templates/gym/member_list.html:264
+#: gym/templates/gym/member_list.html:303
 #: mailer/templates/mailer/gym/overview.html:43
+#: nutrition/templates/ingredient/overview.html:60
 msgid "Add"
 msgstr "Aggiungi"
 
 #: core/templates/language/view.html:61 core/templates/user/api_key.html:44
-#: core/templates/user/preferences.html:45 gym/models/contract.py:203
-#: gym/templates/contract/view.html:41 gym/templates/contract/view.html:106
-#: gym/templates/gym/member_list.html:248
-#: manager/templates/schedule/view.html:285
-#: manager/templates/workout/view.html:163
-#: nutrition/templates/ingredient/view.html:202
+#: core/templates/user/preferences.html:50 gym/models/contract.py:203
+#: gym/templates/contract/view.html:41 gym/templates/gym/member_list.html:270
+#: manager/templates/schedule/view.html:304
+#: manager/templates/workout/view.html:177
+#: nutrition/templates/ingredient/view.html:206
 msgid "Options"
 msgstr "Opzioni"
 
-#: core/templates/license/list.html:4 core/templates/misc/license/list.html:4
+#: core/templates/license/list.html:4
 msgid "License list"
 msgstr "Elenco delle licenze"
 
-#: core/templates/license/list.html:26 core/templates/misc/license/list.html:30
-#: core/templates/repetition_unit/list.html:28
+#: core/templates/license/list.html:30
+#: core/templates/repetition_unit/list.html:32
 #: core/templates/user/overview.html:104 core/templates/user/overview.html:136
-#: core/templates/user/overview.html:185 core/templates/user/overview.html:347
-#: core/templates/user/overview.html:383 core/templates/user/overview.html:427
-#: core/templates/weight_unit/list.html:28
-#: exercises/templates/categories/admin-overview.html:26
-#: exercises/templates/equipment/admin-overview.html:26
-#: exercises/templates/muscles/admin-overview.html:26
-#: gym/templates/admin_notes/list.html:52 gym/templates/contract/list.html:60
-#: gym/templates/contract_option/list.html:58
-#: gym/templates/contract_type/list.html:58 gym/templates/document/list.html:64
-#: gym/templates/gym/list.html:29 gym/templates/gym/member_list.html:229
-#: gym/templates/gym/member_list.html:262
-#: gym/templates/gym/member_list.html:299
+#: core/templates/user/overview.html:185 core/templates/user/overview.html:365
+#: core/templates/user/overview.html:404 core/templates/user/overview.html:448
+#: core/templates/weight_unit/list.html:32
+#: exercises/templates/categories/admin-overview.html:30
+#: exercises/templates/equipment/admin-overview.html:30
+#: exercises/templates/muscles/admin-overview.html:29
+#: gym/templates/admin_notes/list.html:50 gym/templates/contract/list.html:57
+#: gym/templates/contract_option/list.html:52
+#: gym/templates/contract_type/list.html:53 gym/templates/document/list.html:64
+#: gym/templates/gym/list.html:32 gym/templates/gym/member_list.html:248
+#: gym/templates/gym/member_list.html:284
+#: gym/templates/gym/member_list.html:321
 #: mailer/templates/mailer/gym/overview.html:30
-#: manager/templates/calendar/day.html:87
-#: nutrition/templates/units/list.html:29
+#: manager/templates/calendar/day.html:88
+#: nutrition/templates/units/list.html:34
 msgid "Nothing found"
 msgstr "Trovato niente"
 
-#: core/templates/misc/about.html:4 core/templates/template.html:175
+#: core/templates/misc/about.html:4 core/templates/template.html:188
 msgid "Imprint"
 msgstr "Impressum"
 
-#: core/templates/misc/license/list.html:47
-msgid ""
-"If a license has been localized, e.g. the Creative Commons\n"
-"            licenses for the different countries, add them as separate "
-"entries here."
-msgstr ""
-"Se una licenza è stata localizzata, ad es. le licenze Creative Commons\n"
-"            per i diversi paesi, aggiungile qui come voci separate."
-
 #: core/templates/navigation.html:28 software/templates/features.html:437
 msgid "Training"
 msgstr "Allenamento"
@@ -706,8 +696,8 @@ msgstr "Modelli pubblici"
 msgid "Exercises"
 msgstr "Esercizi"
 
-#: core/templates/navigation.html:111 core/templates/navigation.html:184
-#: core/templates/navigation.html:340
+#: core/templates/navigation.html:111 core/templates/navigation.html:185
+#: core/templates/navigation.html:339
 msgid "Administration"
 msgstr "Amministrazione"
 
@@ -744,87 +734,87 @@ msgstr "Calcolatore IMC"
 msgid "Daily calories calculator"
 msgstr "Calcolo calorie giornaliere"
 
-#: core/templates/navigation.html:179
+#: core/templates/navigation.html:180
 #: nutrition/templates/ingredient/overview.html:10
 msgid "Ingredient overview"
 msgstr "Panoramica alimenti"
 
-#: core/templates/navigation.html:187 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:189 nutrition/templates/units/list.html:6
 msgid "Ingredient weight units"
 msgstr "Unità di peso ingrediente"
 
-#: core/templates/navigation.html:203 software/templates/features.html:442
+#: core/templates/navigation.html:205 software/templates/features.html:442
 msgid "Body weight"
 msgstr "Peso corporeo"
 
-#: core/templates/navigation.html:210 core/templates/user/overview.html:114
+#: core/templates/navigation.html:212 core/templates/user/overview.html:114
 msgid "Weight overview"
 msgstr "Panoramica peso corporeo"
 
-#: core/templates/navigation.html:217 weight/views.py:65
+#: core/templates/navigation.html:216 weight/views.py:65
 msgid "Add weight entry"
 msgstr "Aggiungi peso corporeo"
 
-#: core/templates/navigation.html:231
+#: core/templates/navigation.html:230
 msgid "About this software"
 msgstr "Informazioni su questo software"
 
-#: core/templates/navigation.html:237 software/templates/about_us.html:5
+#: core/templates/navigation.html:236 software/templates/about_us.html:5
 msgid "About us"
 msgstr "Chi siamo"
 
-#: core/templates/navigation.html:243 software/templates/features.html:507
+#: core/templates/navigation.html:242 software/templates/features.html:507
 msgid "REST API"
 msgstr "REST API"
 
-#: core/templates/navigation.html:249 utils/models.py:45
+#: core/templates/navigation.html:248 utils/models.py:45
 msgid "License"
 msgstr "Licenza"
 
-#: core/templates/navigation.html:255
+#: core/templates/navigation.html:254
 msgid "Developer documentation"
 msgstr "Documentazione dello sviluppatore"
 
-#: core/templates/navigation.html:262
+#: core/templates/navigation.html:261
 msgid "Get the code"
 msgstr "Ottieni il codice"
 
-#: core/templates/navigation.html:269 core/templates/template.html:214
+#: core/templates/navigation.html:268 core/templates/template.html:227
 #: software/templates/features.html:582
 msgid "Translate"
 msgstr "Traduci"
 
-#: core/templates/navigation.html:303 core/templates/user/login.html:28
+#: core/templates/navigation.html:302 core/templates/user/login.html:28
 msgid "Reset password"
 msgstr "Reimposta la password"
 
-#: core/templates/navigation.html:321
+#: core/templates/navigation.html:320
 msgid "My preferences"
 msgstr "Preferenze"
 
-#: core/templates/navigation.html:330
+#: core/templates/navigation.html:329
 msgid "Logout"
 msgstr "Esci"
 
-#: core/templates/navigation.html:353
+#: core/templates/navigation.html:352
 msgid "Licenses"
 msgstr "Licenza"
 
-#: core/templates/navigation.html:361
+#: core/templates/navigation.html:360
 #: core/templates/repetition_unit/list.html:4
 msgid "Repetition units"
 msgstr "Unità di ripetizione"
 
-#: core/templates/navigation.html:369 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:368 core/templates/weight_unit/list.html:4
 #: nutrition/templates/ingredient/view.html:141
 msgid "Weight units"
 msgstr "Unità peso"
 
-#: core/templates/navigation.html:377 core/templates/user/list.html:4
+#: core/templates/navigation.html:376 core/templates/user/list.html:4
 msgid "User list"
 msgstr "Lista utenti"
 
-#: core/templates/navigation.html:383
+#: core/templates/navigation.html:382
 msgid "Gyms"
 msgstr "Palestre"
 
@@ -888,57 +878,32 @@ msgstr "precedente"
 msgid "next"
 msgstr "successivo"
 
-#: core/templates/tags/render_day.html:34
-msgid "Add weight log"
-msgstr "Aggiungi record peso"
-
-#: core/templates/tags/render_day.html:116
-msgid "Placeholder image for exercise"
+#: core/templates/tags/render_day.html:44
+#, fuzzy
+#| msgid "Placeholder image for exercise"
+msgid "Placeholder image for translation"
 msgstr "Immagine segnaposto per l'esercizio"
 
-#: core/templates/tags/render_day.html:133
-msgid "This exercise has no repetitions."
-msgstr "Questo esercizio non ha ripetizioni."
-
-#: core/templates/tags/render_day.html:136
-msgid "Edit them now."
-msgstr "Modificali ora."
-
-#: core/templates/tags/render_day.html:162
-msgid "Add exercises to this workout day"
-msgstr "Aggiungi esercizi per questo giorno di allenamento"
-
-#: core/templates/tags/render_weight_log.html:17 manager/helpers.py:86
-#: manager/models/setting.py:72 manager/templates/set/formset.html:9
-msgid "Reps"
-msgstr "Ripetizioni"
-
-#: core/templates/tags/render_weight_log.html:30 manager/forms.py:191
-#: manager/models/log.py:103 manager/models/setting.py:102
-#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
-msgid "RiR"
-msgstr "RiR"
-
-#: core/templates/template.html:122 manager/templates/calendar/month.html:138
-#: manager/templates/schedule/view.html:248
-#: manager/templates/schedule/view.html:269
-#: manager/templates/workout/view.html:84
-#: manager/templates/workout/view.html:137
+#: core/templates/template.html:124 manager/templates/calendar/month.html:138
+#: manager/templates/schedule/view.html:262
+#: manager/templates/schedule/view.html:287
+#: manager/templates/workout/view.html:89
+#: manager/templates/workout/view.html:149
 msgid "Close"
 msgstr "Chiudi"
 
-#: core/templates/template.html:138
+#: core/templates/template.html:140
 msgid ""
 "You are using a guest account, data entered will be deleted after a week."
 msgstr ""
 "Stai usando un account ospite, i dati inseriti verranno cancellati dopo una "
 "settimana."
 
-#: core/templates/template.html:143
+#: core/templates/template.html:145
 msgid "Create some demo entries"
 msgstr "Crea alcune voci demo"
 
-#: core/templates/template.html:180 software/templates/features.html:547
+#: core/templates/template.html:193 software/templates/features.html:547
 #: software/templates/tos.html:7
 msgid "Terms of service"
 msgstr "Termini di servizio"
@@ -947,7 +912,7 @@ msgstr "Termini di servizio"
 msgid "Features"
 msgstr "Caratteristiche"
 
-#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:54
+#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:59
 msgid "API key"
 msgstr "Chiave API"
 
@@ -992,17 +957,17 @@ msgstr "Genera una nuova chiave API"
 msgid "Documentation"
 msgstr "Documentazione"
 
-#: core/templates/user/delete_account.html:4
-#: core/templates/user/preferences.html:59
+#: core/templates/user/delete_account.html:3
+#: core/templates/user/preferences.html:62
 msgid "Delete account"
 msgstr "Cancella account"
 
-#: core/templates/user/delete_account.html:17
+#: core/templates/user/delete_account.html:9
 #: exercises/templates/history/overview.html:93
 msgid "Are you sure?"
 msgstr "Sei sicuro/a?"
 
-#: core/templates/user/delete_account.html:22
+#: core/templates/user/delete_account.html:14
 #, python-format
 msgid ""
 "This action will delete the user account \"%(username)s\".\n"
@@ -1025,22 +990,22 @@ msgstr "Password dimenticata?"
 
 #: core/templates/user/overview.html:25 core/templates/user/overview.html:68
 #: core/templates/user/overview.html:112 core/templates/user/overview.html:144
-#: core/templates/user/overview.html:330 core/templates/user/overview.html:369
-#: core/templates/user/overview.html:405
+#: core/templates/user/overview.html:348 core/templates/user/overview.html:390
+#: core/templates/user/overview.html:426
 #, python-format
 msgid "last %(number)s"
 msgstr "ultimo %(number)s"
 
 #: core/templates/user/overview.html:27 core/templates/user/overview.html:146
-#: core/templates/user/overview.html:325 core/templates/user/overview.html:364
-#: core/templates/user/overview.html:400 gym/templates/gym/member_list.html:210
-#: gym/templates/gym/member_list.html:243
-#: gym/templates/gym/member_list.html:280
+#: core/templates/user/overview.html:343 core/templates/user/overview.html:382
+#: core/templates/user/overview.html:421 gym/templates/gym/member_list.html:226
+#: gym/templates/gym/member_list.html:262
+#: gym/templates/gym/member_list.html:302
 msgid "Overview"
 msgstr "Panoramica"
 
 #: core/templates/user/overview.html:28
-#: manager/templates/schedule/view.html:163
+#: manager/templates/schedule/view.html:172
 #: manager/templates/workout/overview.html:39 manager/views/schedule_step.py:60
 msgid "Add workout"
 msgstr "Aggiungi allenamento"
@@ -1072,38 +1037,36 @@ msgstr "Descrizione"
 msgid "Number of logs (days)"
 msgstr "Numero di registri (giorni)"
 
-#: core/templates/user/overview.html:37 core/views/user.py:600
+#: core/templates/user/overview.html:37 core/views/user.py:599
 #: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:158
 msgid "Last activity"
 msgstr "Ultima attività"
 
 #: core/templates/user/overview.html:58
 #: manager/templates/calendar/month.html:128
-#: manager/templates/schedule/view.html:144
 #: manager/templates/workout/overview.html:28
 msgid "No workouts found."
 msgstr "Nessun allenamento trovato."
 
 #: core/templates/user/overview.html:68 manager/forms.py:280
-#: manager/templates/workout/view.html:106
+#: manager/templates/workout/view.html:114
 msgid "Log"
 msgstr "Diario"
 
 #: core/templates/user/overview.html:77 manager/models/session.py:83
-#: manager/templates/calendar/partial_overview_table.html:52
+#: manager/templates/calendar/partial_overview_table.html:54
 msgid "General impression"
 msgstr "Impressioni generali"
 
-#: core/templates/user/overview.html:78 core/templates/user/overview.html:369
+#: core/templates/user/overview.html:78 core/templates/user/overview.html:390
 #: manager/models/session.py:73
-#: manager/templates/calendar/partial_overview_table.html:56
-#: manager/templates/workout/log.html:89
+#: manager/templates/calendar/partial_overview_table.html:58
 msgid "Notes"
 msgstr "Note"
 
 #: core/templates/user/overview.html:79
 #: exercises/templates/history/overview.html:30
-#: manager/templates/calendar/partial_overview_table.html:42
+#: manager/templates/calendar/partial_overview_table.html:44
 msgid "Time"
 msgstr "Tempo"
 
@@ -1141,121 +1104,121 @@ msgstr "Grassi"
 msgid "kcal"
 msgstr "kcal"
 
-#: core/templates/user/overview.html:201 core/templates/user/overview.html:322
-#: core/templates/user/overview.html:361 core/templates/user/overview.html:397
-#: core/templates/user/overview.html:442 gym/templates/gym/list.html:42
-#: gym/templates/gym/member_list.html:84 gym/templates/gym/member_list.html:137
-#: gym/templates/gym/member_list.html:173
-#: gym/templates/gym/member_list.html:207
-#: gym/templates/gym/member_list.html:240
-#: gym/templates/gym/member_list.html:277
-#: manager/templates/schedule/view.html:100
+#: core/templates/user/overview.html:201 core/templates/user/overview.html:340
+#: core/templates/user/overview.html:379 core/templates/user/overview.html:418
+#: core/templates/user/overview.html:463 gym/templates/gym/list.html:45
+#: gym/templates/gym/member_list.html:91 gym/templates/gym/member_list.html:149
+#: gym/templates/gym/member_list.html:187
+#: gym/templates/gym/member_list.html:223
+#: gym/templates/gym/member_list.html:259
+#: gym/templates/gym/member_list.html:299
+#: manager/templates/schedule/view.html:99
 msgid "Actions"
 msgstr "Azioni"
 
-#: core/templates/user/overview.html:207
+#: core/templates/user/overview.html:210
 msgid "Deactivate user"
 msgstr "Disattiva utente"
 
-#: core/templates/user/overview.html:209
+#: core/templates/user/overview.html:214
 msgid "Activate user"
 msgstr "Attiva utente"
 
-#: core/templates/user/overview.html:211
+#: core/templates/user/overview.html:223
 msgid "Reset user password"
 msgstr "Reset password utente"
 
-#: core/templates/user/overview.html:214 gym/templates/gym/member_list.html:30
+#: core/templates/user/overview.html:227 gym/templates/gym/member_list.html:30
 msgid "Roles"
 msgstr "Ruoli"
 
-#: core/templates/user/overview.html:225
+#: core/templates/user/overview.html:243
 msgid "Password reset confirmation"
 msgstr "Reset password confermato"
 
-#: core/templates/user/overview.html:229
+#: core/templates/user/overview.html:247
 msgid "Do you really want to change this user&#39;s password?"
 msgstr "Vuoi veramente cambiare la password di questo user&#39;s?"
 
-#: core/templates/user/overview.html:232
+#: core/templates/user/overview.html:250
 #: exercises/templates/history/overview.html:106
 msgid "No"
 msgstr "No"
 
-#: core/templates/user/overview.html:233
+#: core/templates/user/overview.html:251
 #: exercises/templates/history/overview.html:99
 msgid "Yes"
 msgstr "Si"
 
-#: core/templates/user/overview.html:254 gym/templates/gym/member_list.html:93
+#: core/templates/user/overview.html:272 gym/templates/gym/member_list.html:105
 msgid "Details"
 msgstr "Dettagli"
 
-#: core/templates/user/overview.html:258 gym/views/export.py:57
-#: manager/helpers.py:86 manager/templates/schedule/view.html:98
+#: core/templates/user/overview.html:276 gym/views/export.py:57
+#: manager/helpers.py:86 manager/templates/schedule/view.html:97
 msgid "Nr."
 msgstr "Numero"
 
-#: core/templates/user/overview.html:280 gym/models/contract.py:287
+#: core/templates/user/overview.html:298 gym/models/contract.py:287
 #: gym/models/gym.py:50 gym/templates/contract/view.html:75
-#: gym/templates/gym/member_list.html:100 gym/views/export.py:68
+#: gym/templates/gym/member_list.html:112 gym/views/export.py:68
 msgid "Phone"
 msgstr "Numero"
 
-#: core/templates/user/overview.html:284 gym/templates/contract/view.html:87
-#: gym/templates/gym/member_list.html:118
+#: core/templates/user/overview.html:302 gym/templates/contract/view.html:87
+#: gym/templates/gym/member_list.html:130
 msgid "Address"
 msgstr "Via"
 
-#: core/templates/user/overview.html:295
+#: core/templates/user/overview.html:313
 msgid "Registered"
 msgstr "Registrato"
 
-#: core/templates/user/overview.html:299
+#: core/templates/user/overview.html:317
 msgid "Last login"
 msgstr "Ultimo login"
 
-#: core/templates/user/overview.html:304
+#: core/templates/user/overview.html:322
 msgid "Status"
 msgstr "Stato"
 
-#: core/templates/user/overview.html:307
+#: core/templates/user/overview.html:325
 msgid "Active"
 msgstr "Attivo"
 
-#: core/templates/user/overview.html:309
+#: core/templates/user/overview.html:327
 msgid "Inactive"
 msgstr "Inattivo"
 
-#: core/templates/user/overview.html:330 gym/templates/contract/list.html:4
-#: gym/templates/gym/member_list.html:202
+#: core/templates/user/overview.html:348 gym/templates/contract/list.html:4
+#: gym/templates/gym/member_list.html:218
 msgid "Contracts"
 msgstr "Contratti"
 
-#: core/templates/user/overview.html:405 gym/templates/document/list.html:4
+#: core/templates/user/overview.html:426 gym/templates/document/list.html:4
 msgid "Documents"
 msgstr "Documenti"
 
-#: core/templates/user/overview.html:412 gym/templates/document/list.html:32
-#: manager/forms.py:292 manager/templates/workout/view.html:132
+#: core/templates/user/overview.html:433 gym/templates/document/list.html:33
+#: manager/forms.py:292 manager/templates/workout/view.html:143
 msgid "Download"
 msgstr "Scarica"
 
-#: core/templates/user/overview.html:450 gym/views/admin_config.py:44
+#: core/templates/user/overview.html:474 gym/views/admin_config.py:44
 #: gym/views/admin_config.py:58 gym/views/user_config.py:46
 msgid "Configuration"
 msgstr "Configurazione"
 
-#: core/templates/user/overview.html:453 gym/models/user_config.py:92
+#: core/templates/user/overview.html:477 gym/models/user_config.py:92
 msgid "Include in inactive overview"
 msgstr "Includi in una panoramica inattiva"
 
-#: core/templates/user/overview.html:486
+#: core/templates/user/overview.html:510
 #, python-format
 msgid "Admin login is only available for users in %(gym_name)s"
 msgstr "Accesso amministratore disponibile per %(gym_name)s"
 
-#: core/templates/user/overview.html:490
+#: core/templates/user/overview.html:514
 msgid "Log in as this user"
 msgstr "Entra come questo utente"
 
@@ -1275,19 +1238,19 @@ msgstr "Email non verificata"
 msgid "Send verification email"
 msgstr "Invia email di verifica"
 
-#: core/templates/user/preferences.html:30
+#: core/templates/user/preferences.html:31
 msgid "You need to verify your email to contribute exercises"
 msgstr "Devi confermare l'email per contribuire agli esercizi"
 
-#: core/templates/user/preferences.html:50 core/views/user.py:611
+#: core/templates/user/preferences.html:55 core/views/user.py:610
 msgid "Change password"
 msgstr "Cambia la password"
 
-#: core/templatetags/wger_extras.py:205 i18n.tpl:37
+#: core/templatetags/wger_extras.py:197 i18n.tpl:37
 msgid "kg"
 msgstr "kg"
 
-#: core/templatetags/wger_extras.py:207
+#: core/templatetags/wger_extras.py:199
 #: nutrition/templates/ingredient/view.html:60
 #: nutrition/templates/ingredient/view.html:66
 #: nutrition/templates/ingredient/view.html:73
@@ -1299,11 +1262,11 @@ msgctxt "weight unit, i.e. grams"
 msgid "g"
 msgstr "g"
 
-#: core/templatetags/wger_extras.py:210 i18n.tpl:38
+#: core/templatetags/wger_extras.py:202 i18n.tpl:38
 msgid "lb"
 msgstr "lb"
 
-#: core/templatetags/wger_extras.py:212
+#: core/templatetags/wger_extras.py:204
 msgctxt "weight unit, i.e. ounces"
 msgid "oz"
 msgstr "oz"
@@ -1330,13 +1293,13 @@ msgid "Delete {0}?"
 msgstr "Eliminare {0}?"
 
 #: core/views/languages.py:111 core/views/license.py:85
-#: core/views/repetition_units.py:86 core/views/user.py:474
+#: core/views/repetition_units.py:86 core/views/user.py:473
 #: core/views/weight_units.py:86 exercises/views/categories.py:98
 #: exercises/views/equipment.py:81 exercises/views/muscles.py:87
 #: gym/views/admin_notes.py:161 gym/views/config.py:68
 #: gym/views/contract.py:186 gym/views/contract_option.py:123
 #: gym/views/contract_type.py:123 gym/views/document.py:171
-#: gym/views/gym.py:463 manager/views/day.py:100 manager/views/schedule.py:333
+#: gym/views/gym.py:463 manager/views/day.py:96 manager/views/schedule.py:333
 #: manager/views/workout.py:267 nutrition/views/ingredient.py:145
 #: nutrition/views/unit.py:143
 #, python-brace-format
@@ -1366,48 +1329,48 @@ msgstr "Invia"
 msgid "Your feedback was successfully sent. Thank you!"
 msgstr "Il tuo commento è stato mandato con successo. Grazie!"
 
-#: core/views/user.py:156
+#: core/views/user.py:155
 #, python-brace-format
 msgid "Account \"{0}\" was successfully deleted"
 msgstr "L'account «{0}» è stato eliminato con successo"
 
-#: core/views/user.py:292
+#: core/views/user.py:291
 msgid "You were successfully registered"
 msgstr "Ti sei registrato/a con successo"
 
-#: core/views/user.py:351
+#: core/views/user.py:350
 msgid "Settings successfully updated"
 msgstr "Impostazioni aggiornate con successo"
 
-#: core/views/user.py:390
+#: core/views/user.py:389
 msgid "The user was successfully deactivated"
 msgstr "Utente è stato disattivato con successo"
 
-#: core/views/user.py:427
+#: core/views/user.py:426
 msgid "The user was successfully activated"
 msgstr "Utente è stato attivato con successo"
 
-#: core/views/user.py:442
+#: core/views/user.py:441
 msgid "Edit user"
 msgstr "Modifica utente"
 
-#: core/views/user.py:597 gym/templates/gym/member_list.html:26
+#: core/views/user.py:596 gym/templates/gym/member_list.html:26
 #: gym/views/gym.py:158
 msgid "ID"
 msgstr "ID"
 
-#: core/views/user.py:598 gym/forms.py:95 gym/templates/contract/view.html:55
+#: core/views/user.py:597 gym/forms.py:95 gym/templates/contract/view.html:55
 #: gym/templates/gym/member_list.html:27 gym/views/export.py:59
 #: gym/views/gym.py:158 gym/views/gym.py:217
 msgid "Username"
 msgstr "Nome utente"
 
-#: core/views/user.py:601 gym/templates/gym/new_user.html:34
+#: core/views/user.py:600 gym/templates/gym/new_user.html:34
 #: gym/views/export.py:58 gym/views/gym.py:217
 msgid "Gym"
 msgstr "Palestra"
 
-#: core/views/user.py:660
+#: core/views/user.py:659
 #, python-format
 msgid "A verification email was sent to %(email)s"
 msgstr "Un'email di verifica è stata inviata a %(email)s"
@@ -1560,11 +1523,6 @@ msgstr "Codec, nome completo"
 msgid "Equipment list"
 msgstr "Lista attrezzatura"
 
-#: exercises/templates/equipment/admin-overview.html:39
-#: exercises/views/equipment.py:92
-msgid "Add new equipment"
-msgstr "Aggiungi nuova attrezzatura"
-
 #: exercises/templates/history/overview.html:11
 msgid "Exercise admin history"
 msgstr "Storico allenamenti admin"
@@ -1612,11 +1570,6 @@ msgstr "Ripristina cambiamenti"
 msgid "Muscle overview"
 msgstr "Prospetto dei muscoli"
 
-#: exercises/templates/muscles/admin-overview.html:38
-#: exercises/views/muscles.py:68
-msgid "Add muscle"
-msgstr "Aggiungi muscolo"
-
 #: exercises/views/categories.py:72
 msgid "Add category"
 msgstr "Aggiungi categoria"
@@ -1625,6 +1578,10 @@ msgstr "Aggiungi categoria"
 msgid "This will also delete all exercises in this category."
 msgstr "Saranno cancellati tutti gli esercizi della categoria."
 
+#: exercises/views/equipment.py:92
+msgid "Add new equipment"
+msgstr "Aggiungi nuova attrezzatura"
+
 #: exercises/views/equipment.py:104 exercises/views/equipment.py:115
 msgid "Delete equipment?"
 msgstr "Cancella attrezzatura?"
@@ -1633,6 +1590,10 @@ msgstr "Cancella attrezzatura?"
 msgid "This will delete the exercise from all workouts."
 msgstr "L'esercizio sarà eliminato da tutti gli allenamenti."
 
+#: exercises/views/muscles.py:68
+msgid "Add muscle"
+msgstr "Aggiungi muscolo"
+
 #: gallery/templates/images/overview.html:62
 msgid "Add image"
 msgstr "Aggiungi immagine"
@@ -1718,7 +1679,7 @@ msgid "Contract is active"
 msgstr "Contratto è attivo"
 
 #: gym/models/contract.py:237 gym/templates/contract/view.html:69
-#: manager/models/schedule.py:61 manager/templates/schedule/view.html:67
+#: manager/models/schedule.py:61 manager/templates/schedule/view.html:66
 msgid "Start date"
 msgstr "Data di partenza"
 
@@ -1754,7 +1715,7 @@ msgstr "Amministratore: può gestire gli utenti per una palestra"
 msgid "Admin: can administrate the different gyms"
 msgstr "Amministratore: puoi amministrare le diverse palestre"
 
-#: gym/models/gym.py:65 gym/templates/gym/member_list.html:114
+#: gym/models/gym.py:65 gym/templates/gym/member_list.html:126
 msgid "Owner"
 msgstr "Proprietario"
 
@@ -1766,7 +1727,7 @@ msgstr ""
 "Numero di settimane dall'ultima volta in cui un utente ha registrato la sua "
 "presenza per essere considerato inattivo"
 
-#: gym/models/gym_config.py:56 gym/templates/gym/member_list.html:152
+#: gym/models/gym_config.py:56 gym/templates/gym/member_list.html:166
 msgid "Show name in header"
 msgstr "Mostra nome nell'intestazione"
 
@@ -1779,7 +1740,7 @@ msgstr "Mostra il nome della palestra nell'intestazione del sito"
 msgid "Configuration for {self.gym.name}"
 msgstr "Configurazione per {self.gym.name}"
 
-#: gym/models/user_config.py:65 gym/templates/gym/member_list.html:184
+#: gym/models/user_config.py:65 gym/templates/gym/member_list.html:200
 msgid "Overview of inactive members"
 msgstr "Panoramica dei membri inattivi"
 
@@ -1803,7 +1764,7 @@ msgstr "Userà il nome del file se non viene fornito nulla"
 msgid "User notes"
 msgstr "Note utente"
 
-#: gym/templates/contract/list.html:36
+#: gym/templates/contract/list.html:34
 msgid "Show"
 msgstr "Mostra"
 
@@ -1831,11 +1792,11 @@ msgstr ""
 msgid "Gym list"
 msgstr "Lista palestre"
 
-#: gym/templates/gym/list.html:50
+#: gym/templates/gym/list.html:53
 msgid "Global gym configuration"
 msgstr "Configurazione globale"
 
-#: gym/templates/gym/list.html:67 gym/views/gym.py:171
+#: gym/templates/gym/list.html:69 gym/views/gym.py:171
 msgid "Add new gym"
 msgstr "Aggiungi nuova palestra"
 
@@ -1847,43 +1808,43 @@ msgstr "Amministratori e istruttori"
 msgid "Gym manager"
 msgstr "Responsabile della palestra"
 
-#: gym/templates/gym/member_list.html:69
+#: gym/templates/gym/member_list.html:76
 msgid "This gym has no administrators or trainers"
 msgstr "Questa palestra non ha amministratori o allenatori"
 
-#: gym/templates/gym/member_list.html:88
+#: gym/templates/gym/member_list.html:98
 msgid "Export"
 msgstr "Esporta"
 
-#: gym/templates/gym/member_list.html:125
+#: gym/templates/gym/member_list.html:137
 msgid "Members"
 msgstr "Membri"
 
-#: gym/templates/gym/member_list.html:145
+#: gym/templates/gym/member_list.html:159
 msgid "Gym configuration"
 msgstr "Configurazione della palestra"
 
-#: gym/templates/gym/member_list.html:148
+#: gym/templates/gym/member_list.html:162
 msgid "Inactive members"
 msgstr "Membri inattivi"
 
-#: gym/templates/gym/member_list.html:149
+#: gym/templates/gym/member_list.html:163
 msgid "weeks"
 msgstr "settimane"
 
-#: gym/templates/gym/member_list.html:181
+#: gym/templates/gym/member_list.html:197
 msgid "My configuration"
 msgstr "La mia configurazione"
 
-#: gym/templates/gym/member_list.html:215
+#: gym/templates/gym/member_list.html:234
 msgid "Types"
 msgstr "Tipi"
 
-#: gym/templates/gym/member_list.html:285
+#: gym/templates/gym/member_list.html:307
 msgid "Emails"
 msgstr "E-mail"
 
-#: gym/templates/gym/member_list.html:315
+#: gym/templates/gym/member_list.html:336
 msgid "Add member"
 msgstr "Aggiungi membro"
 
@@ -2178,28 +2139,38 @@ msgstr "Usa anche i nomi in inglese"
 msgid "Unit"
 msgstr "Unità"
 
+#: manager/forms.py:191 manager/models/log.py:103 manager/models/setting.py:102
+#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
+msgid "RiR"
+msgstr "RiR"
+
 #: manager/forms.py:279
 msgid "Type"
 msgstr "Tipo"
 
-#: manager/forms.py:280 manager/templates/workout/view.html:113
+#: manager/forms.py:280 manager/templates/workout/view.html:122
 msgid "Table"
 msgstr "Tabella"
 
-#: manager/forms.py:282 manager/templates/workout/view.html:119
+#: manager/forms.py:282 manager/templates/workout/view.html:129
 msgid "with images"
 msgstr "con immagini"
 
-#: manager/forms.py:283 manager/templates/workout/view.html:125
+#: manager/forms.py:283 manager/templates/workout/view.html:136
 msgid "with comments"
 msgstr "con commenti"
 
+#: manager/helpers.py:86 manager/models/setting.py:72
+#: manager/templates/set/formset.html:9
+msgid "Reps"
+msgstr "Ripetizioni"
+
 #: manager/management/commands/email-reminders.py:121
 msgid "Workout will expire soon"
 msgstr "L'allenamento scadrà presto"
 
 #: manager/models/day.py:34 manager/models/log.py:58
-#: manager/models/session.py:60 manager/templates/schedule/view.html:102
+#: manager/models/session.py:60 manager/templates/schedule/view.html:101
 #: manager/templates/workout/view.html:9 manager/templates/workout/view.html:17
 #: manager/views/pdf.py:85 manager/views/pdf.py:161
 #: manager/views/schedule.py:151 manager/views/schedule.py:221
@@ -2223,7 +2194,7 @@ msgid "Name or short description of the schedule. For example 'Program XYZ'."
 msgstr ""
 "Nome o breve descrizione della programmazione. Per esempio «Programma XYZ»."
 
-#: manager/models/schedule.py:65 manager/templates/schedule/view.html:71
+#: manager/models/schedule.py:65 manager/templates/schedule/view.html:70
 msgid "Schedule active"
 msgstr "Programmazione attiva"
 
@@ -2237,7 +2208,7 @@ msgstr ""
 "mostrata ad esempio sul tuo cruscotto. Tutte le altre programmazioni sarà "
 "poste a non attive"
 
-#: manager/models/schedule.py:77 manager/templates/schedule/view.html:81
+#: manager/models/schedule.py:77 manager/templates/schedule/view.html:80
 msgid "Is a loop"
 msgstr "È un ciclo"
 
@@ -2258,7 +2229,7 @@ msgid "The duration in weeks"
 msgstr "Durata in settimane"
 
 #: manager/models/schedule_step.py:64 manager/models/set.py:53
-#: manager/models/setting.py:113 nutrition/models/meal.py:55
+#: manager/models/setting.py:113 nutrition/models/meal.py:53
 #: nutrition/models/meal_item.py:66
 msgid "Order"
 msgstr "Ordine"
@@ -2402,7 +2373,7 @@ msgstr "Panoramica del registro"
 msgid "Workout session"
 msgstr "Sessione di allenamento"
 
-#: manager/templates/calendar/partial_overview_table.html:27
+#: manager/templates/calendar/partial_overview_table.html:26
 msgid "Delete with logs"
 msgstr "Elimina con i registri"
 
@@ -2425,21 +2396,27 @@ msgstr ""
 "creata se non ce n'è già una per la data selezionata. Se c'è,\n"
 "sarà semplicemente modificata. Le voci di peso vengono sempre aggiunte."
 
-#: manager/templates/schedule/overview.html:5
+#: manager/templates/schedule/overview.html:4
 msgid "Your schedules"
 msgstr "Le tue programmazioni"
 
 #: manager/templates/schedule/overview.html:19
-#: manager/templates/schedule/view.html:131
-#: manager/templates/schedule/view.html:183
+#: manager/templates/schedule/view.html:143
+#: manager/templates/schedule/view.html:193
 #: manager/templates/workout/overview.html:16
 msgid "active"
 msgstr "attivo"
 
-#: manager/templates/schedule/overview.html:28
+#: manager/templates/schedule/overview.html:27
 msgid "No schedules found."
 msgstr "Nessuna programmazione trovata."
 
+#: manager/templates/schedule/overview.html:28
+#, fuzzy
+#| msgid "Add one now."
+msgid "Add one now"
+msgstr "Aggiungine uno adesso."
+
 #: manager/templates/schedule/overview.html:36
 msgid ""
 "Schedules are collections of workouts that you do in\n"
@@ -2449,19 +2426,27 @@ msgstr ""
 "successione."
 
 #: manager/templates/schedule/overview.html:39
+#, fuzzy
+#| msgid ""
+#| "You can indicate how long you want to do each workout\n"
+#| "        before jumping to the next. It is also possible to create a loop, "
+#| "so you\n"
+#| "        always do the same workouts in succession, e.g. A > B > C > A > B "
+#| "> C and so on."
 msgid ""
 "You can indicate how long you want to do each workout\n"
 "        before jumping to the next. It is also possible to create a loop, so "
 "you\n"
 "        always do the same workouts in succession, e.g. A > B > C > A > B > "
-"C and so on."
+"C and so\n"
+"        on."
 msgstr ""
 "Puoi indicare per quanto tempo vuoi fare ogni allenamento\n"
 "prima di saltare al prossimo. È anche possibile creare un ciclo, in modo da "
 "fare\n"
 "gli stessi allenamenti in successione, ad es. A> B> C> A> B> C e così via."
 
-#: manager/templates/schedule/overview.html:43
+#: manager/templates/schedule/overview.html:44
 msgid ""
 "The currently active schedule will remain active (and be\n"
 "        shown e.g. in your dashboard) till it reaches the last workout or "
@@ -2481,7 +2466,7 @@ msgstr "Aggiungi programmazione"
 msgid "Schedule"
 msgstr "Programmazione"
 
-#: manager/templates/schedule/view.html:85
+#: manager/templates/schedule/view.html:84
 msgid ""
 "This schedule is a loop and will go through the workouts above till you "
 "deactivate it"
@@ -2489,19 +2474,19 @@ msgstr ""
 "Questo programma è un ciclo e passerà attraverso gli allenamenti che vedi "
 "sopra fino a quando non lo disattivi"
 
-#: manager/templates/schedule/view.html:103
+#: manager/templates/schedule/view.html:102
 msgid "Weeks"
 msgstr "Settimane"
 
-#: manager/templates/schedule/view.html:115
+#: manager/templates/schedule/view.html:114
 msgid "Move me"
 msgstr "Spostami"
 
-#: manager/templates/schedule/view.html:156
+#: manager/templates/schedule/view.html:168
 msgid "Start schedule"
 msgstr "Inizia programmazione"
 
-#: manager/templates/schedule/view.html:187
+#: manager/templates/schedule/view.html:197
 #, python-format
 msgid ""
 "%(weeks)s Week\n"
@@ -2516,11 +2501,11 @@ msgstr[1] ""
 "Settimane %(weeks)s\n"
 "                                "
 
-#: manager/templates/schedule/view.html:221
+#: manager/templates/schedule/view.html:231
 msgid "Adding workouts"
 msgstr "Aggiungi allenamenti"
 
-#: manager/templates/schedule/view.html:223
+#: manager/templates/schedule/view.html:233
 msgid ""
 "Add as many workouts to the schedule as you want. You can\n"
 "            edit the order by dragging and dropping them. It's also possible "
@@ -2532,27 +2517,35 @@ msgstr ""
 "possibile aggiungere un allenamento più\n"
 "            di una volta."
 
-#: manager/templates/schedule/view.html:232
-#: manager/templates/schedule/view.html:243
-#: manager/templates/schedule/view.html:290
+#: manager/templates/schedule/view.html:242
+#: manager/templates/schedule/view.html:256
+#: manager/templates/schedule/view.html:310
 #: manager/templates/workout/view.html:69
-#: manager/templates/workout/view.html:79
-#: manager/templates/workout/view.html:178
+#: manager/templates/workout/view.html:83
+#: manager/templates/workout/view.html:192
 msgid "Export calendar file"
 msgstr "Esporta il file del calendario"
 
-#: manager/templates/schedule/view.html:236
+#: manager/templates/schedule/view.html:248
 msgid "Export this schedule as a calendar file."
 msgstr "Esporta questo programma come un file di calendario."
 
-#: manager/templates/schedule/view.html:237
-#: manager/templates/workout/view.html:74
+#: manager/templates/schedule/view.html:249
+#: manager/templates/workout/view.html:76
+#, fuzzy
+#| msgid ""
+#| "You can then import the file it into your calendar\n"
+#| "                        application for example google calendar, outlook "
+#| "or iCal. This will create\n"
+#| "                        an appointment for each training day with the "
+#| "appropriate exercises."
 msgid ""
 "You can then import the file it into your calendar\n"
 "                        application for example google calendar, outlook or "
 "iCal. This will create\n"
 "                        an appointment for each training day with the "
-"appropriate exercises."
+"appropriate\n"
+"                        exercises."
 msgstr ""
 "Puoi quindi importare il file nella tua applicazione di calendario\n"
 "                        come ad esempio google calendar, outlook o iCal. "
@@ -2560,21 +2553,13 @@ msgstr ""
 "                        un appuntamento per ogni giorno di allenamento con "
 "gli esercizi appropriati."
 
-#: manager/templates/schedule/view.html:258
-#: manager/templates/schedule/view.html:294
-#: manager/templates/workout/view.html:94
-#: manager/templates/workout/view.html:174
+#: manager/templates/schedule/view.html:272
+#: manager/templates/schedule/view.html:315
+#: manager/templates/workout/view.html:99
+#: manager/templates/workout/view.html:188
 msgid "Download as PDF"
 msgstr "Scarica come PDF"
 
-#: manager/templates/schedule/view.html:299
-msgid "Edit schedule"
-msgstr "Modifica programma"
-
-#: manager/templates/schedule/view.html:304
-msgid "Delete schedule"
-msgstr "Elimina programma"
-
 #: manager/templates/set/add.html:9
 #, python-format
 msgid "Add exercises to day \"%(day_name)s\""
@@ -2656,57 +2641,6 @@ msgid ""
 msgstr ""
 "Riceverai regolarmente tali promemoria finché non inserisci il peso corrente."
 
-#: manager/templates/workout/log.html:10 manager/templates/workout/log.html:11
-msgid "Weight log"
-msgstr "Diario dei pesi"
-
-#: manager/templates/workout/log.html:29
-msgid "Weight log for workout"
-msgstr "Registro di peso per allenamento"
-
-#: manager/templates/workout/log.html:49
-msgid "Add weight log to this day"
-msgstr "Aggiungi peso registrato di oggi"
-
-#: manager/templates/workout/log.html:69
-msgid "No weight entries here."
-msgstr "Nessuna voce di peso qui."
-
-#: manager/templates/workout/log.html:77
-msgid "No exercises for this day."
-msgstr "Nessun esercizio per questo giorno."
-
-#: manager/templates/workout/log.html:90
-msgid ""
-"This page shows the weight logs belonging to this workout\n"
-"only. Click on an exercise to see all the historical data for\n"
-"it."
-msgstr ""
-"Questa pagina mostra i registri del peso che appartengono solo a questo\n"
-"allenamento. \n"
-"Fai clic su un esercizio per visualizzare tutti i dati storici."
-
-#: manager/templates/workout/log.html:94
-msgid ""
-"If on a single day there is more than one entry with the\n"
-"same number of repetitions, but different weights, only the entry with the\n"
-"higher weight is shown in the diagram."
-msgstr ""
-"Se in un solo giorno c'è più di una voce con lo\n"
-"stesso numero di ripetizioni, ma diversi pesi, solo la voce con il\n"
-" peso più elevato sarà mostrato nel diagramma."
-
-#: manager/templates/workout/log.html:98
-msgid ""
-"Note that only entries with a weight unit (kg or lb) and\n"
-"repetitions are charted, other combinations such as time or until failure\n"
-"are ignored here."
-msgstr ""
-"Si noti che solo le voci con un'unità di peso (kg o lb) e\n"
-"le ripetizioni sono tracciate, altre combinazioni come il tempo o fino al "
-"fallimento\n"
-"sono ignorati qui."
-
 #: manager/templates/workout/overview.html:25
 msgid "No templates found."
 msgstr "Nessun modello trovato."
@@ -2744,27 +2678,23 @@ msgstr "Aggiungi set allenamento a giorni"
 msgid "Set the repetitions for each set"
 msgstr "Imposta le ripetizioni per ciascun set"
 
-#: manager/templates/workout/view.html:73
+#: manager/templates/workout/view.html:75
 msgid "Export this workout as a calendar file."
 msgstr "Esporta questo allenamento come un file di calendario."
 
-#: manager/templates/workout/view.html:144
+#: manager/templates/workout/view.html:156
 msgid "Logs"
 msgstr "Records"
 
-#: manager/templates/workout/view.html:146
+#: manager/templates/workout/view.html:159
 msgid "View logs"
 msgstr "Guarda records"
 
-#: manager/templates/workout/view.html:169 manager/views/schedule_step.py:99
-msgid "Edit workout"
-msgstr "Modifica allenamento"
-
-#: manager/templates/workout/view.html:182 manager/views/workout.py:281
+#: manager/templates/workout/view.html:195 manager/views/workout.py:281
 msgid "Mark as template"
 msgstr "Contrassegna come modello"
 
-#: manager/views/day.py:109
+#: manager/views/day.py:105
 msgid "Add workout day"
 msgstr "Aggiungi giorno di allenamento"
 
@@ -2781,6 +2711,10 @@ msgstr "Allenamento per %s"
 msgid "Create schedule"
 msgstr "Crea programmazione"
 
+#: manager/views/schedule_step.py:99
+msgid "Edit workout"
+msgstr "Modifica allenamento"
+
 #: manager/views/workout.py:209
 msgid "Copy workout"
 msgstr "Copia allenamento"
@@ -2904,7 +2838,7 @@ msgstr "Quantità in grammi"
 msgid "Unit amount, e.g. \"1 Cup\" or \"1/2 spoon\""
 msgstr "Importo unitario, ad es. «1 tazza» o «1/2 cucchiaio»"
 
-#: nutrition/models/log.py:52 nutrition/models/meal.py:50
+#: nutrition/models/log.py:52 nutrition/models/meal.py:48
 #: nutrition/models/meal_item.py:48 nutrition/models/plan.py:108
 msgid "Nutrition plan"
 msgstr "Piano nutrizionale"
@@ -2917,11 +2851,11 @@ msgstr "Pasto"
 msgid "Date and Time (Approx.)"
 msgstr "Data e Ora (Approssimative)"
 
-#: nutrition/models/meal.py:62
+#: nutrition/models/meal.py:60
 msgid "Time (approx)"
 msgstr "Orario (approssimativo)"
 
-#: nutrition/models/meal.py:69
+#: nutrition/models/meal.py:67
 msgid ""
 "Give meals a textual description / name such as \"Breakfast\" or \"after "
 "workout\""
@@ -3066,10 +3000,6 @@ msgstr "Nessun ingrediente."
 msgid "Search"
 msgstr "Ricerca"
 
-#: nutrition/templates/ingredient/overview.html:62
-msgid "Add ingredient"
-msgstr "Aggiungi ingrediente"
-
 #: nutrition/templates/ingredient/view.html:45 nutrition/views/plan.py:229
 msgid "Macronutrients"
 msgstr "Macronutrienti"
@@ -3089,20 +3019,11 @@ msgstr "n.D."
 msgid "Others"
 msgstr "Altri"
 
-#: nutrition/templates/ingredient/view.html:144
-#: nutrition/templates/units/list.html:46 nutrition/views/unit.py:86
+#: nutrition/templates/ingredient/view.html:143
+#: nutrition/templates/units/list.html:50 nutrition/views/unit.py:86
 msgid "Add new weight unit"
 msgstr "Aggiungi una nuova unità di peso"
 
-#: nutrition/templates/ingredient/view.html:206
-#: nutrition/templates/ingredient/view.html:209
-msgid "Edit ingredient"
-msgstr "Modifica ingrediente"
-
-#: nutrition/templates/ingredient/view.html:213
-msgid "Delete ingredient"
-msgstr "Cancella ingrediente"
-
 #: nutrition/templates/rate/form.html:25
 msgid "Basal metabolic rate"
 msgstr "Metabolismo basale"
@@ -3753,6 +3674,86 @@ msgstr "Cancellato con successo."
 msgid "Delete weight entry for the %s"
 msgstr "Cancellato il peso inserito di %s"
 
+#~ msgid ""
+#~ "If a license has been localized, e.g. the Creative Commons\n"
+#~ "            licenses for the different countries, add them as separate "
+#~ "entries here."
+#~ msgstr ""
+#~ "Se una licenza è stata localizzata, ad es. le licenze Creative Commons\n"
+#~ "            per i diversi paesi, aggiungile qui come voci separate."
+
+#~ msgid "Add weight log"
+#~ msgstr "Aggiungi record peso"
+
+#~ msgid "This exercise has no repetitions."
+#~ msgstr "Questo esercizio non ha ripetizioni."
+
+#~ msgid "Edit them now."
+#~ msgstr "Modificali ora."
+
+#~ msgid "Add exercises to this workout day"
+#~ msgstr "Aggiungi esercizi per questo giorno di allenamento"
+
+#~ msgid "Edit schedule"
+#~ msgstr "Modifica programma"
+
+#~ msgid "Delete schedule"
+#~ msgstr "Elimina programma"
+
+#~ msgid "Weight log"
+#~ msgstr "Diario dei pesi"
+
+#~ msgid "Weight log for workout"
+#~ msgstr "Registro di peso per allenamento"
+
+#~ msgid "Add weight log to this day"
+#~ msgstr "Aggiungi peso registrato di oggi"
+
+#~ msgid "No weight entries here."
+#~ msgstr "Nessuna voce di peso qui."
+
+#~ msgid "No exercises for this day."
+#~ msgstr "Nessun esercizio per questo giorno."
+
+#~ msgid ""
+#~ "This page shows the weight logs belonging to this workout\n"
+#~ "only. Click on an exercise to see all the historical data for\n"
+#~ "it."
+#~ msgstr ""
+#~ "Questa pagina mostra i registri del peso che appartengono solo a questo\n"
+#~ "allenamento. \n"
+#~ "Fai clic su un esercizio per visualizzare tutti i dati storici."
+
+#~ msgid ""
+#~ "If on a single day there is more than one entry with the\n"
+#~ "same number of repetitions, but different weights, only the entry with "
+#~ "the\n"
+#~ "higher weight is shown in the diagram."
+#~ msgstr ""
+#~ "Se in un solo giorno c'è più di una voce con lo\n"
+#~ "stesso numero di ripetizioni, ma diversi pesi, solo la voce con il\n"
+#~ " peso più elevato sarà mostrato nel diagramma."
+
+#~ msgid ""
+#~ "Note that only entries with a weight unit (kg or lb) and\n"
+#~ "repetitions are charted, other combinations such as time or until "
+#~ "failure\n"
+#~ "are ignored here."
+#~ msgstr ""
+#~ "Si noti che solo le voci con un'unità di peso (kg o lb) e\n"
+#~ "le ripetizioni sono tracciate, altre combinazioni come il tempo o fino al "
+#~ "fallimento\n"
+#~ "sono ignorati qui."
+
+#~ msgid "Add ingredient"
+#~ msgstr "Aggiungi ingrediente"
+
+#~ msgid "Edit ingredient"
+#~ msgstr "Modifica ingrediente"
+
+#~ msgid "Delete ingredient"
+#~ msgstr "Cancella ingrediente"
+
 #~ msgid "Ingredients pending review"
 #~ msgstr "Ingredienti in attesa di revisione"
 
diff --git a/wger/locale/ja/LC_MESSAGES/django.po b/wger/locale/ja/LC_MESSAGES/django.po
index fb02d5d61..e9ee3ef07 100644
--- a/wger/locale/ja/LC_MESSAGES/django.po
+++ b/wger/locale/ja/LC_MESSAGES/django.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: wger Workout Manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-07-14 15:59+0200\n"
+"POT-Creation-Date: 2024-11-14 13:09+0100\n"
 "PO-Revision-Date: 2023-12-27 14:07+0000\n"
 "Last-Translator: sasukeiscool <jaflagasd@gmail.com>\n"
 "Language-Team: Japanese <https://hosted.weblate.org/projects/wger/web/ja/>\n"
@@ -22,7 +22,7 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Weblate 5.4-dev\n"
 
-#: config/models/gym_config.py:46 gym/templates/gym/list.html:53
+#: config/models/gym_config.py:46 gym/templates/gym/list.html:56
 msgid "Default gym"
 msgstr "デフォルトジム"
 
@@ -32,28 +32,28 @@ msgid ""
 "registered users to this gym and update all existing users without a gym."
 msgstr ""
 
-#: config/views/gym_config.py:42 core/templates/language/view.html:67
-#: core/templates/license/list.html:17 core/templates/misc/license/list.html:18
+#: config/views/gym_config.py:42 core/templates/language/view.html:64
+#: core/templates/license/list.html:17
 #: core/templates/repetition_unit/list.html:18
-#: core/templates/tags/render_day.html:39
-#: core/templates/tags/render_day.html:75 core/templates/user/overview.html:204
-#: core/templates/user/overview.html:445
+#: core/templates/user/overview.html:204 core/templates/user/overview.html:467
 #: core/templates/weight_unit/list.html:18
 #: exercises/templates/categories/admin-overview.html:17
 #: exercises/templates/equipment/admin-overview.html:17
-#: exercises/templates/muscles/admin-overview.html:17
-#: gallery/views/images.py:98 gym/templates/admin_notes/list.html:32
-#: gym/templates/contract/list.html:31 gym/templates/contract/view.html:107
-#: gym/templates/contract_option/list.html:32
-#: gym/templates/contract_type/list.html:32 gym/templates/document/list.html:38
-#: gym/templates/gym/list.html:20 gym/templates/gym/list.html:46
-#: gym/templates/gym/member_list.html:87 gym/templates/gym/member_list.html:140
-#: gym/templates/gym/member_list.html:176
-#: manager/templates/calendar/day.html:68
-#: manager/templates/calendar/month.html:85
-#: manager/templates/calendar/partial_overview_table.html:18
-#: manager/templates/schedule/view.html:118
-#: nutrition/templates/ingredient/view.html:165
+#: exercises/templates/muscles/admin-overview.html:16
+#: gallery/views/images.py:98 gym/templates/admin_notes/list.html:31
+#: gym/templates/contract/list.html:30 gym/templates/contract/view.html:106
+#: gym/templates/contract_option/list.html:29
+#: gym/templates/contract_type/list.html:30 gym/templates/document/list.html:38
+#: gym/templates/gym/list.html:19 gym/templates/gym/list.html:48
+#: gym/templates/gym/member_list.html:94 gym/templates/gym/member_list.html:152
+#: gym/templates/gym/member_list.html:190
+#: manager/templates/calendar/day.html:67
+#: manager/templates/calendar/month.html:84
+#: manager/templates/calendar/partial_overview_table.html:16
+#: manager/templates/schedule/view.html:318
+#: manager/templates/workout/view.html:181
+#: nutrition/templates/ingredient/view.html:164
+#: nutrition/templates/ingredient/view.html:209
 #: nutrition/templates/units/list.html:19
 msgid "Edit"
 msgstr "編集"
@@ -87,8 +87,8 @@ msgstr ""
 msgid "Empty placeholder schedule"
 msgstr ""
 
-#: core/forms.py:69 core/templates/navigation.html:285
-#: core/templates/navigation.html:291 core/templates/user/login.html:4
+#: core/forms.py:69 core/templates/navigation.html:284
+#: core/templates/navigation.html:290 core/templates/user/login.html:4
 #: software/templates/features.html:82 software/templates/features.html:427
 msgid "Login"
 msgstr "ログイン"
@@ -98,14 +98,14 @@ msgstr "ログイン"
 msgid "First name"
 msgstr "名前"
 
-#: core/forms.py:109 core/forms.py:215 core/templates/user/overview.html:266
+#: core/forms.py:109 core/forms.py:215 core/templates/user/overview.html:284
 #: gym/views/export.py:62 gym/views/gym.py:217
 msgid "Last name"
 msgstr "姓"
 
-#: core/forms.py:111 core/forms.py:180 core/templates/user/overview.html:270
+#: core/forms.py:111 core/forms.py:180 core/templates/user/overview.html:288
 #: gym/models/contract.py:256 gym/models/gym.py:58
-#: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:104
+#: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:116
 #: gym/templates/gym/new_user.html:30 gym/views/export.py:60
 #: mailer/templates/mailer/gym/form.html:4
 #: mailer/templates/mailer/gym/overview.html:4
@@ -134,8 +134,8 @@ msgstr ""
 msgid "Other settings"
 msgstr "その他の設定"
 
-#: core/forms.py:174 core/views/user.py:624 core/views/user.py:639
-#: core/views/user.py:651 gym/forms.py:73 manager/templates/log/add.html:65
+#: core/forms.py:174 core/views/user.py:623 core/views/user.py:638
+#: core/views/user.py:650 gym/forms.py:73 manager/templates/log/add.html:65
 #: manager/templates/set/add.html:70 manager/views/workout.py:203
 #: utils/generic_views.py:143
 msgid "Save"
@@ -160,26 +160,25 @@ msgstr "パスワード"
 msgid "Please enter your current password."
 msgstr "現在のパスワードを入力してください。"
 
-#: core/forms.py:242 core/templates/language/view.html:73
-#: core/templates/license/list.html:19 core/templates/misc/license/list.html:22
-#: core/templates/repetition_unit/list.html:20
-#: core/templates/tags/render_day.html:45
-#: core/templates/tags/render_day.html:81 core/templates/user/overview.html:217
-#: core/templates/weight_unit/list.html:20
-#: exercises/templates/categories/admin-overview.html:19
-#: exercises/templates/equipment/admin-overview.html:19
-#: exercises/templates/muscles/admin-overview.html:19
-#: gym/templates/admin_notes/list.html:40
-#: gym/templates/contract_option/list.html:41
-#: gym/templates/contract_type/list.html:41 gym/templates/document/list.html:46
-#: gym/templates/gym/list.html:22 manager/templates/calendar/day.html:73
-#: manager/templates/calendar/month.html:89
-#: manager/templates/calendar/partial_overview_table.html:23
-#: manager/templates/schedule/view.html:122
-#: manager/templates/workout/view.html:188
-#: nutrition/templates/ingredient/view.html:166
+#: core/forms.py:242 core/templates/language/view.html:70
+#: core/templates/license/list.html:21
+#: core/templates/repetition_unit/list.html:22
+#: core/templates/user/overview.html:233
+#: core/templates/weight_unit/list.html:22
+#: exercises/templates/categories/admin-overview.html:21
+#: exercises/templates/equipment/admin-overview.html:21
+#: exercises/templates/muscles/admin-overview.html:20
+#: gym/templates/admin_notes/list.html:37
+#: gym/templates/contract_option/list.html:35
+#: gym/templates/contract_type/list.html:36 gym/templates/document/list.html:46
+#: gym/templates/gym/list.html:23 manager/templates/calendar/day.html:73
+#: manager/templates/calendar/month.html:88
+#: manager/templates/calendar/partial_overview_table.html:22
+#: manager/templates/schedule/view.html:324
+#: manager/templates/workout/view.html:202
+#: nutrition/templates/ingredient/view.html:168
 #: nutrition/templates/ingredient/view.html:215
-#: nutrition/templates/units/list.html:22
+#: nutrition/templates/units/list.html:25
 msgid "Delete"
 msgstr "削除"
 
@@ -191,9 +190,9 @@ msgstr "パスワードは無効です。"
 msgid "The form is secured with reCAPTCHA"
 msgstr ""
 
-#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:285
-#: core/templates/navigation.html:297 core/templates/template.html:149
-#: core/templates/user/login.html:20 core/views/user.py:298
+#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:284
+#: core/templates/navigation.html:296 core/templates/template.html:151
+#: core/templates/user/login.html:20 core/views/user.py:297
 #: software/templates/features.html:87 software/templates/features.html:422
 msgid "Register"
 msgstr "登録"
@@ -428,18 +427,18 @@ msgid "The sum of all hours has to be 24"
 msgstr ""
 
 #: core/models/rep_unit.py:36 core/models/weight_unit.py:36
-#: core/templates/user/overview.html:262 core/views/user.py:599
+#: core/templates/user/overview.html:280 core/views/user.py:598
 #: exercises/models/category.py:29 exercises/models/equipment.py:29
 #: exercises/models/exercise.py:59 exercises/models/muscle.py:36
 #: gym/models/contract.py:52 gym/models/contract.py:103 gym/models/gym.py:46
 #: gym/models/user_document.py:84 gym/templates/contract/view.html:50
-#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:96
+#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:108
 #: gym/views/gym.py:158 manager/models/schedule.py:55
 #: manager/models/workout.py:57 measurements/models/category.py:36
 #: nutrition/models/ingredient.py:111
-#: nutrition/models/ingredient_category.py:27 nutrition/models/meal.py:67
+#: nutrition/models/ingredient_category.py:27 nutrition/models/meal.py:65
 #: nutrition/models/weight_unit.py:38
-#: nutrition/templates/ingredient/view.html:152
+#: nutrition/templates/ingredient/view.html:151
 msgid "Name"
 msgstr ""
 
@@ -484,7 +483,7 @@ msgstr ""
 msgid "Back to \"%(target)s\""
 msgstr ""
 
-#: core/templates/delete.html:15
+#: core/templates/delete.html:4
 msgid "Are you sure you want to delete this? This action cannot be undone."
 msgstr ""
 
@@ -540,7 +539,7 @@ msgstr ""
 msgid "Dashboard"
 msgstr "ダッシュボード"
 
-#: core/templates/language/overview.html:4 core/templates/navigation.html:345
+#: core/templates/language/overview.html:4 core/templates/navigation.html:344
 msgid "Languages"
 msgstr "言語"
 
@@ -550,79 +549,72 @@ msgstr ""
 
 #: core/templates/language/overview.html:22
 #: manager/templates/calendar/month.html:132
-#: manager/templates/schedule/overview.html:28
-#: manager/templates/schedule/view.html:144
+#: manager/templates/schedule/view.html:154
 #: manager/templates/workout/overview.html:28
 #: nutrition/templates/ingredient/overview.html:38
 msgid "Add one now."
 msgstr "今すぐ追加する"
 
-#: core/templates/language/overview.html:35 core/templates/license/list.html:40
-#: core/templates/misc/license/list.html:43
-#: core/templates/repetition_unit/list.html:43
-#: core/templates/user/overview.html:326 core/templates/user/overview.html:365
-#: core/templates/user/overview.html:401
-#: core/templates/weight_unit/list.html:43 core/views/languages.py:74
+#: core/templates/language/overview.html:34 core/templates/license/list.html:43
+#: core/templates/repetition_unit/list.html:46
+#: core/templates/user/overview.html:344 core/templates/user/overview.html:384
+#: core/templates/user/overview.html:422
+#: core/templates/weight_unit/list.html:46 core/views/languages.py:74
 #: core/views/license.py:66 core/views/repetition_units.py:66
 #: core/views/weight_units.py:66
-#: exercises/templates/categories/admin-overview.html:38
-#: gallery/views/images.py:63 gym/templates/admin_notes/list.html:67
-#: gym/templates/contract/list.html:73
-#: gym/templates/contract_option/list.html:72
-#: gym/templates/contract_type/list.html:72 gym/templates/document/list.html:79
-#: gym/templates/gym/member_list.html:211
-#: gym/templates/gym/member_list.html:244
-#: gym/templates/gym/member_list.html:281
+#: exercises/templates/categories/admin-overview.html:40
+#: exercises/templates/equipment/admin-overview.html:39
+#: exercises/templates/muscles/admin-overview.html:40
+#: gallery/views/images.py:63 gym/templates/admin_notes/list.html:64
+#: gym/templates/contract/list.html:69
+#: gym/templates/contract_option/list.html:65
+#: gym/templates/contract_type/list.html:66 gym/templates/document/list.html:78
+#: gym/templates/gym/member_list.html:228
+#: gym/templates/gym/member_list.html:264
+#: gym/templates/gym/member_list.html:303
 #: mailer/templates/mailer/gym/overview.html:43
+#: nutrition/templates/ingredient/overview.html:60
 msgid "Add"
 msgstr "追加"
 
 #: core/templates/language/view.html:61 core/templates/user/api_key.html:44
-#: core/templates/user/preferences.html:45 gym/models/contract.py:203
-#: gym/templates/contract/view.html:41 gym/templates/contract/view.html:106
-#: gym/templates/gym/member_list.html:248
-#: manager/templates/schedule/view.html:285
-#: manager/templates/workout/view.html:163
-#: nutrition/templates/ingredient/view.html:202
+#: core/templates/user/preferences.html:50 gym/models/contract.py:203
+#: gym/templates/contract/view.html:41 gym/templates/gym/member_list.html:270
+#: manager/templates/schedule/view.html:304
+#: manager/templates/workout/view.html:177
+#: nutrition/templates/ingredient/view.html:206
 msgid "Options"
 msgstr "オプション"
 
-#: core/templates/license/list.html:4 core/templates/misc/license/list.html:4
+#: core/templates/license/list.html:4
 msgid "License list"
 msgstr ""
 
-#: core/templates/license/list.html:26 core/templates/misc/license/list.html:30
-#: core/templates/repetition_unit/list.html:28
+#: core/templates/license/list.html:30
+#: core/templates/repetition_unit/list.html:32
 #: core/templates/user/overview.html:104 core/templates/user/overview.html:136
-#: core/templates/user/overview.html:185 core/templates/user/overview.html:347
-#: core/templates/user/overview.html:383 core/templates/user/overview.html:427
-#: core/templates/weight_unit/list.html:28
-#: exercises/templates/categories/admin-overview.html:26
-#: exercises/templates/equipment/admin-overview.html:26
-#: exercises/templates/muscles/admin-overview.html:26
-#: gym/templates/admin_notes/list.html:52 gym/templates/contract/list.html:60
-#: gym/templates/contract_option/list.html:58
-#: gym/templates/contract_type/list.html:58 gym/templates/document/list.html:64
-#: gym/templates/gym/list.html:29 gym/templates/gym/member_list.html:229
-#: gym/templates/gym/member_list.html:262
-#: gym/templates/gym/member_list.html:299
+#: core/templates/user/overview.html:185 core/templates/user/overview.html:365
+#: core/templates/user/overview.html:404 core/templates/user/overview.html:448
+#: core/templates/weight_unit/list.html:32
+#: exercises/templates/categories/admin-overview.html:30
+#: exercises/templates/equipment/admin-overview.html:30
+#: exercises/templates/muscles/admin-overview.html:29
+#: gym/templates/admin_notes/list.html:50 gym/templates/contract/list.html:57
+#: gym/templates/contract_option/list.html:52
+#: gym/templates/contract_type/list.html:53 gym/templates/document/list.html:64
+#: gym/templates/gym/list.html:32 gym/templates/gym/member_list.html:248
+#: gym/templates/gym/member_list.html:284
+#: gym/templates/gym/member_list.html:321
 #: mailer/templates/mailer/gym/overview.html:30
-#: manager/templates/calendar/day.html:87
-#: nutrition/templates/units/list.html:29
+#: manager/templates/calendar/day.html:88
+#: nutrition/templates/units/list.html:34
 msgid "Nothing found"
 msgstr ""
 
-#: core/templates/misc/about.html:4 core/templates/template.html:175
+#: core/templates/misc/about.html:4 core/templates/template.html:188
 msgid "Imprint"
 msgstr ""
 
-#: core/templates/misc/license/list.html:47
-msgid ""
-"If a license has been localized, e.g. the Creative Commons\n"
-"            licenses for the different countries, add them as separate "
-"entries here."
-msgstr ""
-
 #: core/templates/navigation.html:28 software/templates/features.html:437
 msgid "Training"
 msgstr ""
@@ -667,8 +659,8 @@ msgstr ""
 msgid "Exercises"
 msgstr "運動"
 
-#: core/templates/navigation.html:111 core/templates/navigation.html:184
-#: core/templates/navigation.html:340
+#: core/templates/navigation.html:111 core/templates/navigation.html:185
+#: core/templates/navigation.html:339
 msgid "Administration"
 msgstr ""
 
@@ -707,87 +699,87 @@ msgstr "BMI計算"
 msgid "Daily calories calculator"
 msgstr ""
 
-#: core/templates/navigation.html:179
+#: core/templates/navigation.html:180
 #: nutrition/templates/ingredient/overview.html:10
 msgid "Ingredient overview"
 msgstr ""
 
-#: core/templates/navigation.html:187 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:189 nutrition/templates/units/list.html:6
 msgid "Ingredient weight units"
 msgstr ""
 
-#: core/templates/navigation.html:203 software/templates/features.html:442
+#: core/templates/navigation.html:205 software/templates/features.html:442
 msgid "Body weight"
 msgstr ""
 
-#: core/templates/navigation.html:210 core/templates/user/overview.html:114
+#: core/templates/navigation.html:212 core/templates/user/overview.html:114
 msgid "Weight overview"
 msgstr ""
 
-#: core/templates/navigation.html:217 weight/views.py:65
+#: core/templates/navigation.html:216 weight/views.py:65
 msgid "Add weight entry"
 msgstr ""
 
-#: core/templates/navigation.html:231
+#: core/templates/navigation.html:230
 msgid "About this software"
 msgstr ""
 
-#: core/templates/navigation.html:237 software/templates/about_us.html:5
+#: core/templates/navigation.html:236 software/templates/about_us.html:5
 msgid "About us"
 msgstr ""
 
-#: core/templates/navigation.html:243 software/templates/features.html:507
+#: core/templates/navigation.html:242 software/templates/features.html:507
 msgid "REST API"
 msgstr ""
 
-#: core/templates/navigation.html:249 utils/models.py:45
+#: core/templates/navigation.html:248 utils/models.py:45
 msgid "License"
 msgstr "ライセンス"
 
-#: core/templates/navigation.html:255
+#: core/templates/navigation.html:254
 msgid "Developer documentation"
 msgstr ""
 
-#: core/templates/navigation.html:262
+#: core/templates/navigation.html:261
 msgid "Get the code"
 msgstr ""
 
-#: core/templates/navigation.html:269 core/templates/template.html:214
+#: core/templates/navigation.html:268 core/templates/template.html:227
 #: software/templates/features.html:582
 msgid "Translate"
 msgstr "翻訳"
 
-#: core/templates/navigation.html:303 core/templates/user/login.html:28
+#: core/templates/navigation.html:302 core/templates/user/login.html:28
 msgid "Reset password"
 msgstr "パスワード再設定"
 
-#: core/templates/navigation.html:321
+#: core/templates/navigation.html:320
 msgid "My preferences"
 msgstr ""
 
-#: core/templates/navigation.html:330
+#: core/templates/navigation.html:329
 msgid "Logout"
 msgstr "ロッグアウト"
 
-#: core/templates/navigation.html:353
+#: core/templates/navigation.html:352
 msgid "Licenses"
 msgstr ""
 
-#: core/templates/navigation.html:361
+#: core/templates/navigation.html:360
 #: core/templates/repetition_unit/list.html:4
 msgid "Repetition units"
 msgstr ""
 
-#: core/templates/navigation.html:369 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:368 core/templates/weight_unit/list.html:4
 #: nutrition/templates/ingredient/view.html:141
 msgid "Weight units"
 msgstr ""
 
-#: core/templates/navigation.html:377 core/templates/user/list.html:4
+#: core/templates/navigation.html:376 core/templates/user/list.html:4
 msgid "User list"
 msgstr ""
 
-#: core/templates/navigation.html:383
+#: core/templates/navigation.html:382
 msgid "Gyms"
 msgstr ""
 
@@ -846,55 +838,28 @@ msgstr ""
 msgid "next"
 msgstr ""
 
-#: core/templates/tags/render_day.html:34
-msgid "Add weight log"
+#: core/templates/tags/render_day.html:44
+msgid "Placeholder image for translation"
 msgstr ""
 
-#: core/templates/tags/render_day.html:116
-msgid "Placeholder image for exercise"
-msgstr ""
-
-#: core/templates/tags/render_day.html:133
-msgid "This exercise has no repetitions."
-msgstr ""
-
-#: core/templates/tags/render_day.html:136
-msgid "Edit them now."
-msgstr ""
-
-#: core/templates/tags/render_day.html:162
-msgid "Add exercises to this workout day"
-msgstr ""
-
-#: core/templates/tags/render_weight_log.html:17 manager/helpers.py:86
-#: manager/models/setting.py:72 manager/templates/set/formset.html:9
-msgid "Reps"
-msgstr "回"
-
-#: core/templates/tags/render_weight_log.html:30 manager/forms.py:191
-#: manager/models/log.py:103 manager/models/setting.py:102
-#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
-msgid "RiR"
-msgstr ""
-
-#: core/templates/template.html:122 manager/templates/calendar/month.html:138
-#: manager/templates/schedule/view.html:248
-#: manager/templates/schedule/view.html:269
-#: manager/templates/workout/view.html:84
-#: manager/templates/workout/view.html:137
+#: core/templates/template.html:124 manager/templates/calendar/month.html:138
+#: manager/templates/schedule/view.html:262
+#: manager/templates/schedule/view.html:287
+#: manager/templates/workout/view.html:89
+#: manager/templates/workout/view.html:149
 msgid "Close"
 msgstr "閉じる"
 
-#: core/templates/template.html:138
+#: core/templates/template.html:140
 msgid ""
 "You are using a guest account, data entered will be deleted after a week."
 msgstr ""
 
-#: core/templates/template.html:143
+#: core/templates/template.html:145
 msgid "Create some demo entries"
 msgstr ""
 
-#: core/templates/template.html:180 software/templates/features.html:547
+#: core/templates/template.html:193 software/templates/features.html:547
 #: software/templates/tos.html:7
 msgid "Terms of service"
 msgstr "使用条件"
@@ -903,7 +868,7 @@ msgstr "使用条件"
 msgid "Features"
 msgstr ""
 
-#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:54
+#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:59
 msgid "API key"
 msgstr "APIキー"
 
@@ -942,17 +907,17 @@ msgstr ""
 msgid "Documentation"
 msgstr ""
 
-#: core/templates/user/delete_account.html:4
-#: core/templates/user/preferences.html:59
+#: core/templates/user/delete_account.html:3
+#: core/templates/user/preferences.html:62
 msgid "Delete account"
 msgstr ""
 
-#: core/templates/user/delete_account.html:17
+#: core/templates/user/delete_account.html:9
 #: exercises/templates/history/overview.html:93
 msgid "Are you sure?"
 msgstr ""
 
-#: core/templates/user/delete_account.html:22
+#: core/templates/user/delete_account.html:14
 #, python-format
 msgid ""
 "This action will delete the user account \"%(username)s\".\n"
@@ -971,22 +936,22 @@ msgstr ""
 
 #: core/templates/user/overview.html:25 core/templates/user/overview.html:68
 #: core/templates/user/overview.html:112 core/templates/user/overview.html:144
-#: core/templates/user/overview.html:330 core/templates/user/overview.html:369
-#: core/templates/user/overview.html:405
+#: core/templates/user/overview.html:348 core/templates/user/overview.html:390
+#: core/templates/user/overview.html:426
 #, python-format
 msgid "last %(number)s"
 msgstr ""
 
 #: core/templates/user/overview.html:27 core/templates/user/overview.html:146
-#: core/templates/user/overview.html:325 core/templates/user/overview.html:364
-#: core/templates/user/overview.html:400 gym/templates/gym/member_list.html:210
-#: gym/templates/gym/member_list.html:243
-#: gym/templates/gym/member_list.html:280
+#: core/templates/user/overview.html:343 core/templates/user/overview.html:382
+#: core/templates/user/overview.html:421 gym/templates/gym/member_list.html:226
+#: gym/templates/gym/member_list.html:262
+#: gym/templates/gym/member_list.html:302
 msgid "Overview"
 msgstr ""
 
 #: core/templates/user/overview.html:28
-#: manager/templates/schedule/view.html:163
+#: manager/templates/schedule/view.html:172
 #: manager/templates/workout/overview.html:39 manager/views/schedule_step.py:60
 msgid "Add workout"
 msgstr "ワークアウトを追加する"
@@ -1018,38 +983,36 @@ msgstr ""
 msgid "Number of logs (days)"
 msgstr ""
 
-#: core/templates/user/overview.html:37 core/views/user.py:600
+#: core/templates/user/overview.html:37 core/views/user.py:599
 #: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:158
 msgid "Last activity"
 msgstr ""
 
 #: core/templates/user/overview.html:58
 #: manager/templates/calendar/month.html:128
-#: manager/templates/schedule/view.html:144
 #: manager/templates/workout/overview.html:28
 msgid "No workouts found."
 msgstr ""
 
 #: core/templates/user/overview.html:68 manager/forms.py:280
-#: manager/templates/workout/view.html:106
+#: manager/templates/workout/view.html:114
 msgid "Log"
 msgstr ""
 
 #: core/templates/user/overview.html:77 manager/models/session.py:83
-#: manager/templates/calendar/partial_overview_table.html:52
+#: manager/templates/calendar/partial_overview_table.html:54
 msgid "General impression"
 msgstr ""
 
-#: core/templates/user/overview.html:78 core/templates/user/overview.html:369
+#: core/templates/user/overview.html:78 core/templates/user/overview.html:390
 #: manager/models/session.py:73
-#: manager/templates/calendar/partial_overview_table.html:56
-#: manager/templates/workout/log.html:89
+#: manager/templates/calendar/partial_overview_table.html:58
 msgid "Notes"
 msgstr ""
 
 #: core/templates/user/overview.html:79
 #: exercises/templates/history/overview.html:30
-#: manager/templates/calendar/partial_overview_table.html:42
+#: manager/templates/calendar/partial_overview_table.html:44
 msgid "Time"
 msgstr ""
 
@@ -1087,121 +1050,121 @@ msgstr "脂肪質"
 msgid "kcal"
 msgstr "kcal"
 
-#: core/templates/user/overview.html:201 core/templates/user/overview.html:322
-#: core/templates/user/overview.html:361 core/templates/user/overview.html:397
-#: core/templates/user/overview.html:442 gym/templates/gym/list.html:42
-#: gym/templates/gym/member_list.html:84 gym/templates/gym/member_list.html:137
-#: gym/templates/gym/member_list.html:173
-#: gym/templates/gym/member_list.html:207
-#: gym/templates/gym/member_list.html:240
-#: gym/templates/gym/member_list.html:277
-#: manager/templates/schedule/view.html:100
+#: core/templates/user/overview.html:201 core/templates/user/overview.html:340
+#: core/templates/user/overview.html:379 core/templates/user/overview.html:418
+#: core/templates/user/overview.html:463 gym/templates/gym/list.html:45
+#: gym/templates/gym/member_list.html:91 gym/templates/gym/member_list.html:149
+#: gym/templates/gym/member_list.html:187
+#: gym/templates/gym/member_list.html:223
+#: gym/templates/gym/member_list.html:259
+#: gym/templates/gym/member_list.html:299
+#: manager/templates/schedule/view.html:99
 msgid "Actions"
 msgstr ""
 
-#: core/templates/user/overview.html:207
+#: core/templates/user/overview.html:210
 msgid "Deactivate user"
 msgstr ""
 
-#: core/templates/user/overview.html:209
+#: core/templates/user/overview.html:214
 msgid "Activate user"
 msgstr ""
 
-#: core/templates/user/overview.html:211
+#: core/templates/user/overview.html:223
 msgid "Reset user password"
 msgstr ""
 
-#: core/templates/user/overview.html:214 gym/templates/gym/member_list.html:30
+#: core/templates/user/overview.html:227 gym/templates/gym/member_list.html:30
 msgid "Roles"
 msgstr ""
 
-#: core/templates/user/overview.html:225
+#: core/templates/user/overview.html:243
 msgid "Password reset confirmation"
 msgstr ""
 
-#: core/templates/user/overview.html:229
+#: core/templates/user/overview.html:247
 msgid "Do you really want to change this user&#39;s password?"
 msgstr ""
 
-#: core/templates/user/overview.html:232
+#: core/templates/user/overview.html:250
 #: exercises/templates/history/overview.html:106
 msgid "No"
 msgstr ""
 
-#: core/templates/user/overview.html:233
+#: core/templates/user/overview.html:251
 #: exercises/templates/history/overview.html:99
 msgid "Yes"
 msgstr ""
 
-#: core/templates/user/overview.html:254 gym/templates/gym/member_list.html:93
+#: core/templates/user/overview.html:272 gym/templates/gym/member_list.html:105
 msgid "Details"
 msgstr ""
 
-#: core/templates/user/overview.html:258 gym/views/export.py:57
-#: manager/helpers.py:86 manager/templates/schedule/view.html:98
+#: core/templates/user/overview.html:276 gym/views/export.py:57
+#: manager/helpers.py:86 manager/templates/schedule/view.html:97
 msgid "Nr."
 msgstr ""
 
-#: core/templates/user/overview.html:280 gym/models/contract.py:287
+#: core/templates/user/overview.html:298 gym/models/contract.py:287
 #: gym/models/gym.py:50 gym/templates/contract/view.html:75
-#: gym/templates/gym/member_list.html:100 gym/views/export.py:68
+#: gym/templates/gym/member_list.html:112 gym/views/export.py:68
 msgid "Phone"
 msgstr ""
 
-#: core/templates/user/overview.html:284 gym/templates/contract/view.html:87
-#: gym/templates/gym/member_list.html:118
+#: core/templates/user/overview.html:302 gym/templates/contract/view.html:87
+#: gym/templates/gym/member_list.html:130
 msgid "Address"
 msgstr ""
 
-#: core/templates/user/overview.html:295
+#: core/templates/user/overview.html:313
 msgid "Registered"
 msgstr ""
 
-#: core/templates/user/overview.html:299
+#: core/templates/user/overview.html:317
 msgid "Last login"
 msgstr ""
 
-#: core/templates/user/overview.html:304
+#: core/templates/user/overview.html:322
 msgid "Status"
 msgstr ""
 
-#: core/templates/user/overview.html:307
+#: core/templates/user/overview.html:325
 msgid "Active"
 msgstr ""
 
-#: core/templates/user/overview.html:309
+#: core/templates/user/overview.html:327
 msgid "Inactive"
 msgstr ""
 
-#: core/templates/user/overview.html:330 gym/templates/contract/list.html:4
-#: gym/templates/gym/member_list.html:202
+#: core/templates/user/overview.html:348 gym/templates/contract/list.html:4
+#: gym/templates/gym/member_list.html:218
 msgid "Contracts"
 msgstr ""
 
-#: core/templates/user/overview.html:405 gym/templates/document/list.html:4
+#: core/templates/user/overview.html:426 gym/templates/document/list.html:4
 msgid "Documents"
 msgstr ""
 
-#: core/templates/user/overview.html:412 gym/templates/document/list.html:32
-#: manager/forms.py:292 manager/templates/workout/view.html:132
+#: core/templates/user/overview.html:433 gym/templates/document/list.html:33
+#: manager/forms.py:292 manager/templates/workout/view.html:143
 msgid "Download"
 msgstr "ダウンロード"
 
-#: core/templates/user/overview.html:450 gym/views/admin_config.py:44
+#: core/templates/user/overview.html:474 gym/views/admin_config.py:44
 #: gym/views/admin_config.py:58 gym/views/user_config.py:46
 msgid "Configuration"
 msgstr "設定"
 
-#: core/templates/user/overview.html:453 gym/models/user_config.py:92
+#: core/templates/user/overview.html:477 gym/models/user_config.py:92
 msgid "Include in inactive overview"
 msgstr ""
 
-#: core/templates/user/overview.html:486
+#: core/templates/user/overview.html:510
 #, python-format
 msgid "Admin login is only available for users in %(gym_name)s"
 msgstr ""
 
-#: core/templates/user/overview.html:490
+#: core/templates/user/overview.html:514
 msgid "Log in as this user"
 msgstr ""
 
@@ -1221,19 +1184,19 @@ msgstr ""
 msgid "Send verification email"
 msgstr ""
 
-#: core/templates/user/preferences.html:30
+#: core/templates/user/preferences.html:31
 msgid "You need to verify your email to contribute exercises"
 msgstr ""
 
-#: core/templates/user/preferences.html:50 core/views/user.py:611
+#: core/templates/user/preferences.html:55 core/views/user.py:610
 msgid "Change password"
 msgstr ""
 
-#: core/templatetags/wger_extras.py:205 i18n.tpl:37
+#: core/templatetags/wger_extras.py:197 i18n.tpl:37
 msgid "kg"
 msgstr "kg"
 
-#: core/templatetags/wger_extras.py:207
+#: core/templatetags/wger_extras.py:199
 #: nutrition/templates/ingredient/view.html:60
 #: nutrition/templates/ingredient/view.html:66
 #: nutrition/templates/ingredient/view.html:73
@@ -1245,11 +1208,11 @@ msgctxt "weight unit, i.e. grams"
 msgid "g"
 msgstr "g"
 
-#: core/templatetags/wger_extras.py:210 i18n.tpl:38
+#: core/templatetags/wger_extras.py:202 i18n.tpl:38
 msgid "lb"
 msgstr "lb"
 
-#: core/templatetags/wger_extras.py:212
+#: core/templatetags/wger_extras.py:204
 msgctxt "weight unit, i.e. ounces"
 msgid "oz"
 msgstr "oz"
@@ -1276,13 +1239,13 @@ msgid "Delete {0}?"
 msgstr ""
 
 #: core/views/languages.py:111 core/views/license.py:85
-#: core/views/repetition_units.py:86 core/views/user.py:474
+#: core/views/repetition_units.py:86 core/views/user.py:473
 #: core/views/weight_units.py:86 exercises/views/categories.py:98
 #: exercises/views/equipment.py:81 exercises/views/muscles.py:87
 #: gym/views/admin_notes.py:161 gym/views/config.py:68
 #: gym/views/contract.py:186 gym/views/contract_option.py:123
 #: gym/views/contract_type.py:123 gym/views/document.py:171
-#: gym/views/gym.py:463 manager/views/day.py:100 manager/views/schedule.py:333
+#: gym/views/gym.py:463 manager/views/day.py:96 manager/views/schedule.py:333
 #: manager/views/workout.py:267 nutrition/views/ingredient.py:145
 #: nutrition/views/unit.py:143
 #, python-brace-format
@@ -1308,48 +1271,48 @@ msgstr ""
 msgid "Your feedback was successfully sent. Thank you!"
 msgstr ""
 
-#: core/views/user.py:156
+#: core/views/user.py:155
 #, python-brace-format
 msgid "Account \"{0}\" was successfully deleted"
 msgstr ""
 
-#: core/views/user.py:292
+#: core/views/user.py:291
 msgid "You were successfully registered"
 msgstr ""
 
-#: core/views/user.py:351
+#: core/views/user.py:350
 msgid "Settings successfully updated"
 msgstr ""
 
-#: core/views/user.py:390
+#: core/views/user.py:389
 msgid "The user was successfully deactivated"
 msgstr ""
 
-#: core/views/user.py:427
+#: core/views/user.py:426
 msgid "The user was successfully activated"
 msgstr ""
 
-#: core/views/user.py:442
+#: core/views/user.py:441
 msgid "Edit user"
 msgstr ""
 
-#: core/views/user.py:597 gym/templates/gym/member_list.html:26
+#: core/views/user.py:596 gym/templates/gym/member_list.html:26
 #: gym/views/gym.py:158
 msgid "ID"
 msgstr ""
 
-#: core/views/user.py:598 gym/forms.py:95 gym/templates/contract/view.html:55
+#: core/views/user.py:597 gym/forms.py:95 gym/templates/contract/view.html:55
 #: gym/templates/gym/member_list.html:27 gym/views/export.py:59
 #: gym/views/gym.py:158 gym/views/gym.py:217
 msgid "Username"
 msgstr ""
 
-#: core/views/user.py:601 gym/templates/gym/new_user.html:34
+#: core/views/user.py:600 gym/templates/gym/new_user.html:34
 #: gym/views/export.py:58 gym/views/gym.py:217
 msgid "Gym"
 msgstr ""
 
-#: core/views/user.py:660
+#: core/views/user.py:659
 #, python-format
 msgid "A verification email was sent to %(email)s"
 msgstr ""
@@ -1501,11 +1464,6 @@ msgstr ""
 msgid "Equipment list"
 msgstr ""
 
-#: exercises/templates/equipment/admin-overview.html:39
-#: exercises/views/equipment.py:92
-msgid "Add new equipment"
-msgstr ""
-
 #: exercises/templates/history/overview.html:11
 msgid "Exercise admin history"
 msgstr ""
@@ -1555,11 +1513,6 @@ msgstr ""
 msgid "Muscle overview"
 msgstr ""
 
-#: exercises/templates/muscles/admin-overview.html:38
-#: exercises/views/muscles.py:68
-msgid "Add muscle"
-msgstr ""
-
 #: exercises/views/categories.py:72
 msgid "Add category"
 msgstr ""
@@ -1568,6 +1521,10 @@ msgstr ""
 msgid "This will also delete all exercises in this category."
 msgstr ""
 
+#: exercises/views/equipment.py:92
+msgid "Add new equipment"
+msgstr ""
+
 #: exercises/views/equipment.py:104 exercises/views/equipment.py:115
 msgid "Delete equipment?"
 msgstr ""
@@ -1576,6 +1533,10 @@ msgstr ""
 msgid "This will delete the exercise from all workouts."
 msgstr ""
 
+#: exercises/views/muscles.py:68
+msgid "Add muscle"
+msgstr ""
+
 #: gallery/templates/images/overview.html:62
 #, fuzzy
 #| msgid "Add member"
@@ -1663,7 +1624,7 @@ msgid "Contract is active"
 msgstr ""
 
 #: gym/models/contract.py:237 gym/templates/contract/view.html:69
-#: manager/models/schedule.py:61 manager/templates/schedule/view.html:67
+#: manager/models/schedule.py:61 manager/templates/schedule/view.html:66
 msgid "Start date"
 msgstr ""
 
@@ -1699,7 +1660,7 @@ msgstr ""
 msgid "Admin: can administrate the different gyms"
 msgstr ""
 
-#: gym/models/gym.py:65 gym/templates/gym/member_list.html:114
+#: gym/models/gym.py:65 gym/templates/gym/member_list.html:126
 msgid "Owner"
 msgstr ""
 
@@ -1709,7 +1670,7 @@ msgid ""
 "considered inactive"
 msgstr ""
 
-#: gym/models/gym_config.py:56 gym/templates/gym/member_list.html:152
+#: gym/models/gym_config.py:56 gym/templates/gym/member_list.html:166
 msgid "Show name in header"
 msgstr ""
 
@@ -1722,7 +1683,7 @@ msgstr ""
 msgid "Configuration for {self.gym.name}"
 msgstr ""
 
-#: gym/models/user_config.py:65 gym/templates/gym/member_list.html:184
+#: gym/models/user_config.py:65 gym/templates/gym/member_list.html:200
 msgid "Overview of inactive members"
 msgstr ""
 
@@ -1746,7 +1707,7 @@ msgstr ""
 msgid "User notes"
 msgstr ""
 
-#: gym/templates/contract/list.html:36
+#: gym/templates/contract/list.html:34
 msgid "Show"
 msgstr "表示"
 
@@ -1772,11 +1733,11 @@ msgstr ""
 msgid "Gym list"
 msgstr ""
 
-#: gym/templates/gym/list.html:50
+#: gym/templates/gym/list.html:53
 msgid "Global gym configuration"
 msgstr ""
 
-#: gym/templates/gym/list.html:67 gym/views/gym.py:171
+#: gym/templates/gym/list.html:69 gym/views/gym.py:171
 msgid "Add new gym"
 msgstr ""
 
@@ -1788,43 +1749,43 @@ msgstr ""
 msgid "Gym manager"
 msgstr ""
 
-#: gym/templates/gym/member_list.html:69
+#: gym/templates/gym/member_list.html:76
 msgid "This gym has no administrators or trainers"
 msgstr ""
 
-#: gym/templates/gym/member_list.html:88
+#: gym/templates/gym/member_list.html:98
 msgid "Export"
 msgstr "エクスポート"
 
-#: gym/templates/gym/member_list.html:125
+#: gym/templates/gym/member_list.html:137
 msgid "Members"
 msgstr "メンバー"
 
-#: gym/templates/gym/member_list.html:145
+#: gym/templates/gym/member_list.html:159
 msgid "Gym configuration"
 msgstr ""
 
-#: gym/templates/gym/member_list.html:148
+#: gym/templates/gym/member_list.html:162
 msgid "Inactive members"
 msgstr ""
 
-#: gym/templates/gym/member_list.html:149
+#: gym/templates/gym/member_list.html:163
 msgid "weeks"
 msgstr ""
 
-#: gym/templates/gym/member_list.html:181
+#: gym/templates/gym/member_list.html:197
 msgid "My configuration"
 msgstr ""
 
-#: gym/templates/gym/member_list.html:215
+#: gym/templates/gym/member_list.html:234
 msgid "Types"
 msgstr ""
 
-#: gym/templates/gym/member_list.html:285
+#: gym/templates/gym/member_list.html:307
 msgid "Emails"
 msgstr ""
 
-#: gym/templates/gym/member_list.html:315
+#: gym/templates/gym/member_list.html:336
 msgid "Add member"
 msgstr "メンバーを追加"
 
@@ -2117,28 +2078,38 @@ msgstr ""
 msgid "Unit"
 msgstr "単位"
 
+#: manager/forms.py:191 manager/models/log.py:103 manager/models/setting.py:102
+#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
+msgid "RiR"
+msgstr ""
+
 #: manager/forms.py:279
 msgid "Type"
 msgstr ""
 
-#: manager/forms.py:280 manager/templates/workout/view.html:113
+#: manager/forms.py:280 manager/templates/workout/view.html:122
 msgid "Table"
 msgstr ""
 
-#: manager/forms.py:282 manager/templates/workout/view.html:119
+#: manager/forms.py:282 manager/templates/workout/view.html:129
 msgid "with images"
 msgstr ""
 
-#: manager/forms.py:283 manager/templates/workout/view.html:125
+#: manager/forms.py:283 manager/templates/workout/view.html:136
 msgid "with comments"
 msgstr ""
 
+#: manager/helpers.py:86 manager/models/setting.py:72
+#: manager/templates/set/formset.html:9
+msgid "Reps"
+msgstr "回"
+
 #: manager/management/commands/email-reminders.py:121
 msgid "Workout will expire soon"
 msgstr ""
 
 #: manager/models/day.py:34 manager/models/log.py:58
-#: manager/models/session.py:60 manager/templates/schedule/view.html:102
+#: manager/models/session.py:60 manager/templates/schedule/view.html:101
 #: manager/templates/workout/view.html:9 manager/templates/workout/view.html:17
 #: manager/views/pdf.py:85 manager/views/pdf.py:161
 #: manager/views/schedule.py:151 manager/views/schedule.py:221
@@ -2159,7 +2130,7 @@ msgstr ""
 msgid "Name or short description of the schedule. For example 'Program XYZ'."
 msgstr ""
 
-#: manager/models/schedule.py:65 manager/templates/schedule/view.html:71
+#: manager/models/schedule.py:65 manager/templates/schedule/view.html:70
 msgid "Schedule active"
 msgstr ""
 
@@ -2170,7 +2141,7 @@ msgid ""
 "inactive"
 msgstr ""
 
-#: manager/models/schedule.py:77 manager/templates/schedule/view.html:81
+#: manager/models/schedule.py:77 manager/templates/schedule/view.html:80
 msgid "Is a loop"
 msgstr ""
 
@@ -2189,7 +2160,7 @@ msgid "The duration in weeks"
 msgstr ""
 
 #: manager/models/schedule_step.py:64 manager/models/set.py:53
-#: manager/models/setting.py:113 nutrition/models/meal.py:55
+#: manager/models/setting.py:113 nutrition/models/meal.py:53
 #: nutrition/models/meal_item.py:66
 msgid "Order"
 msgstr ""
@@ -2321,7 +2292,7 @@ msgstr ""
 msgid "Workout session"
 msgstr ""
 
-#: manager/templates/calendar/partial_overview_table.html:27
+#: manager/templates/calendar/partial_overview_table.html:26
 msgid "Delete with logs"
 msgstr ""
 
@@ -2341,21 +2312,27 @@ msgid ""
 "will simply be edited. Weight entries are always added."
 msgstr ""
 
-#: manager/templates/schedule/overview.html:5
+#: manager/templates/schedule/overview.html:4
 msgid "Your schedules"
 msgstr ""
 
 #: manager/templates/schedule/overview.html:19
-#: manager/templates/schedule/view.html:131
-#: manager/templates/schedule/view.html:183
+#: manager/templates/schedule/view.html:143
+#: manager/templates/schedule/view.html:193
 #: manager/templates/workout/overview.html:16
 msgid "active"
 msgstr ""
 
-#: manager/templates/schedule/overview.html:28
+#: manager/templates/schedule/overview.html:27
 msgid "No schedules found."
 msgstr ""
 
+#: manager/templates/schedule/overview.html:28
+#, fuzzy
+#| msgid "Add one now."
+msgid "Add one now"
+msgstr "今すぐ追加する"
+
 #: manager/templates/schedule/overview.html:36
 msgid ""
 "Schedules are collections of workouts that you do in\n"
@@ -2368,10 +2345,11 @@ msgid ""
 "        before jumping to the next. It is also possible to create a loop, so "
 "you\n"
 "        always do the same workouts in succession, e.g. A > B > C > A > B > "
-"C and so on."
+"C and so\n"
+"        on."
 msgstr ""
 
-#: manager/templates/schedule/overview.html:43
+#: manager/templates/schedule/overview.html:44
 msgid ""
 "The currently active schedule will remain active (and be\n"
 "        shown e.g. in your dashboard) till it reaches the last workout or "
@@ -2387,25 +2365,25 @@ msgstr ""
 msgid "Schedule"
 msgstr "スケジュール"
 
-#: manager/templates/schedule/view.html:85
+#: manager/templates/schedule/view.html:84
 msgid ""
 "This schedule is a loop and will go through the workouts above till you "
 "deactivate it"
 msgstr ""
 
-#: manager/templates/schedule/view.html:103
+#: manager/templates/schedule/view.html:102
 msgid "Weeks"
 msgstr ""
 
-#: manager/templates/schedule/view.html:115
+#: manager/templates/schedule/view.html:114
 msgid "Move me"
 msgstr ""
 
-#: manager/templates/schedule/view.html:156
+#: manager/templates/schedule/view.html:168
 msgid "Start schedule"
 msgstr ""
 
-#: manager/templates/schedule/view.html:187
+#: manager/templates/schedule/view.html:197
 #, python-format
 msgid ""
 "%(weeks)s Week\n"
@@ -2415,11 +2393,11 @@ msgid_plural ""
 "                                "
 msgstr[0] ""
 
-#: manager/templates/schedule/view.html:221
+#: manager/templates/schedule/view.html:231
 msgid "Adding workouts"
 msgstr ""
 
-#: manager/templates/schedule/view.html:223
+#: manager/templates/schedule/view.html:233
 msgid ""
 "Add as many workouts to the schedule as you want. You can\n"
 "            edit the order by dragging and dropping them. It's also possible "
@@ -2427,44 +2405,37 @@ msgid ""
 "            than once."
 msgstr ""
 
-#: manager/templates/schedule/view.html:232
-#: manager/templates/schedule/view.html:243
-#: manager/templates/schedule/view.html:290
+#: manager/templates/schedule/view.html:242
+#: manager/templates/schedule/view.html:256
+#: manager/templates/schedule/view.html:310
 #: manager/templates/workout/view.html:69
-#: manager/templates/workout/view.html:79
-#: manager/templates/workout/view.html:178
+#: manager/templates/workout/view.html:83
+#: manager/templates/workout/view.html:192
 msgid "Export calendar file"
 msgstr ""
 
-#: manager/templates/schedule/view.html:236
+#: manager/templates/schedule/view.html:248
 msgid "Export this schedule as a calendar file."
 msgstr ""
 
-#: manager/templates/schedule/view.html:237
-#: manager/templates/workout/view.html:74
+#: manager/templates/schedule/view.html:249
+#: manager/templates/workout/view.html:76
 msgid ""
 "You can then import the file it into your calendar\n"
 "                        application for example google calendar, outlook or "
 "iCal. This will create\n"
 "                        an appointment for each training day with the "
-"appropriate exercises."
+"appropriate\n"
+"                        exercises."
 msgstr ""
 
-#: manager/templates/schedule/view.html:258
-#: manager/templates/schedule/view.html:294
-#: manager/templates/workout/view.html:94
-#: manager/templates/workout/view.html:174
+#: manager/templates/schedule/view.html:272
+#: manager/templates/schedule/view.html:315
+#: manager/templates/workout/view.html:99
+#: manager/templates/workout/view.html:188
 msgid "Download as PDF"
 msgstr ""
 
-#: manager/templates/schedule/view.html:299
-msgid "Edit schedule"
-msgstr ""
-
-#: manager/templates/schedule/view.html:304
-msgid "Delete schedule"
-msgstr ""
-
 #: manager/templates/set/add.html:9
 #, python-format
 msgid "Add exercises to day \"%(day_name)s\""
@@ -2529,47 +2500,6 @@ msgid ""
 "You will regularly receive such reminders till you enter your current weight."
 msgstr ""
 
-#: manager/templates/workout/log.html:10 manager/templates/workout/log.html:11
-msgid "Weight log"
-msgstr ""
-
-#: manager/templates/workout/log.html:29
-msgid "Weight log for workout"
-msgstr ""
-
-#: manager/templates/workout/log.html:49
-msgid "Add weight log to this day"
-msgstr ""
-
-#: manager/templates/workout/log.html:69
-msgid "No weight entries here."
-msgstr ""
-
-#: manager/templates/workout/log.html:77
-msgid "No exercises for this day."
-msgstr ""
-
-#: manager/templates/workout/log.html:90
-msgid ""
-"This page shows the weight logs belonging to this workout\n"
-"only. Click on an exercise to see all the historical data for\n"
-"it."
-msgstr ""
-
-#: manager/templates/workout/log.html:94
-msgid ""
-"If on a single day there is more than one entry with the\n"
-"same number of repetitions, but different weights, only the entry with the\n"
-"higher weight is shown in the diagram."
-msgstr ""
-
-#: manager/templates/workout/log.html:98
-msgid ""
-"Note that only entries with a weight unit (kg or lb) and\n"
-"repetitions are charted, other combinations such as time or until failure\n"
-"are ignored here."
-msgstr ""
-
 #: manager/templates/workout/overview.html:25
 msgid "No templates found."
 msgstr ""
@@ -2607,27 +2537,23 @@ msgstr ""
 msgid "Set the repetitions for each set"
 msgstr ""
 
-#: manager/templates/workout/view.html:73
+#: manager/templates/workout/view.html:75
 msgid "Export this workout as a calendar file."
 msgstr ""
 
-#: manager/templates/workout/view.html:144
+#: manager/templates/workout/view.html:156
 msgid "Logs"
 msgstr ""
 
-#: manager/templates/workout/view.html:146
+#: manager/templates/workout/view.html:159
 msgid "View logs"
 msgstr ""
 
-#: manager/templates/workout/view.html:169 manager/views/schedule_step.py:99
-msgid "Edit workout"
-msgstr ""
-
-#: manager/templates/workout/view.html:182 manager/views/workout.py:281
+#: manager/templates/workout/view.html:195 manager/views/workout.py:281
 msgid "Mark as template"
 msgstr ""
 
-#: manager/views/day.py:109
+#: manager/views/day.py:105
 msgid "Add workout day"
 msgstr ""
 
@@ -2644,6 +2570,10 @@ msgstr ""
 msgid "Create schedule"
 msgstr ""
 
+#: manager/views/schedule_step.py:99
+msgid "Edit workout"
+msgstr ""
+
 #: manager/views/workout.py:209
 msgid "Copy workout"
 msgstr ""
@@ -2771,7 +2701,7 @@ msgstr ""
 msgid "Unit amount, e.g. \"1 Cup\" or \"1/2 spoon\""
 msgstr ""
 
-#: nutrition/models/log.py:52 nutrition/models/meal.py:50
+#: nutrition/models/log.py:52 nutrition/models/meal.py:48
 #: nutrition/models/meal_item.py:48 nutrition/models/plan.py:108
 msgid "Nutrition plan"
 msgstr ""
@@ -2784,11 +2714,11 @@ msgstr ""
 msgid "Date and Time (Approx.)"
 msgstr ""
 
-#: nutrition/models/meal.py:62
+#: nutrition/models/meal.py:60
 msgid "Time (approx)"
 msgstr ""
 
-#: nutrition/models/meal.py:69
+#: nutrition/models/meal.py:67
 msgid ""
 "Give meals a textual description / name such as \"Breakfast\" or \"after "
 "workout\""
@@ -2907,10 +2837,6 @@ msgstr ""
 msgid "Search"
 msgstr ""
 
-#: nutrition/templates/ingredient/overview.html:62
-msgid "Add ingredient"
-msgstr ""
-
 #: nutrition/templates/ingredient/view.html:45 nutrition/views/plan.py:229
 msgid "Macronutrients"
 msgstr ""
@@ -2930,20 +2856,11 @@ msgstr ""
 msgid "Others"
 msgstr ""
 
-#: nutrition/templates/ingredient/view.html:144
-#: nutrition/templates/units/list.html:46 nutrition/views/unit.py:86
+#: nutrition/templates/ingredient/view.html:143
+#: nutrition/templates/units/list.html:50 nutrition/views/unit.py:86
 msgid "Add new weight unit"
 msgstr ""
 
-#: nutrition/templates/ingredient/view.html:206
-#: nutrition/templates/ingredient/view.html:209
-msgid "Edit ingredient"
-msgstr ""
-
-#: nutrition/templates/ingredient/view.html:213
-msgid "Delete ingredient"
-msgstr ""
-
 #: nutrition/templates/rate/form.html:25
 msgid "Basal metabolic rate"
 msgstr ""
diff --git a/wger/locale/ko/LC_MESSAGES/django.po b/wger/locale/ko/LC_MESSAGES/django.po
index 603b3475b..3ab9f2943 100644
--- a/wger/locale/ko/LC_MESSAGES/django.po
+++ b/wger/locale/ko/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: wger Workout Manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-07-14 15:59+0200\n"
+"POT-Creation-Date: 2024-11-14 13:09+0100\n"
 "PO-Revision-Date: 2022-01-21 19:55+0000\n"
 "Last-Translator: namong79 <airmedic79@naver.com>\n"
 "Language-Team: Korean <https://hosted.weblate.org/projects/wger/web/ko/>\n"
@@ -19,7 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Weblate 4.11-dev\n"
 
-#: config/models/gym_config.py:46 gym/templates/gym/list.html:53
+#: config/models/gym_config.py:46 gym/templates/gym/list.html:56
 msgid "Default gym"
 msgstr "기본 Gym"
 
@@ -31,28 +31,28 @@ msgstr ""
 "이 설치에 대한 기본 Gym을 선택하십시오. 새로 등록된 모든 사용자가 이 Gym에 할"
 "당되고, Gym이 없는 모든 기존 사용자가 업데이트됩니다."
 
-#: config/views/gym_config.py:42 core/templates/language/view.html:67
-#: core/templates/license/list.html:17 core/templates/misc/license/list.html:18
+#: config/views/gym_config.py:42 core/templates/language/view.html:64
+#: core/templates/license/list.html:17
 #: core/templates/repetition_unit/list.html:18
-#: core/templates/tags/render_day.html:39
-#: core/templates/tags/render_day.html:75 core/templates/user/overview.html:204
-#: core/templates/user/overview.html:445
+#: core/templates/user/overview.html:204 core/templates/user/overview.html:467
 #: core/templates/weight_unit/list.html:18
 #: exercises/templates/categories/admin-overview.html:17
 #: exercises/templates/equipment/admin-overview.html:17
-#: exercises/templates/muscles/admin-overview.html:17
-#: gallery/views/images.py:98 gym/templates/admin_notes/list.html:32
-#: gym/templates/contract/list.html:31 gym/templates/contract/view.html:107
-#: gym/templates/contract_option/list.html:32
-#: gym/templates/contract_type/list.html:32 gym/templates/document/list.html:38
-#: gym/templates/gym/list.html:20 gym/templates/gym/list.html:46
-#: gym/templates/gym/member_list.html:87 gym/templates/gym/member_list.html:140
-#: gym/templates/gym/member_list.html:176
-#: manager/templates/calendar/day.html:68
-#: manager/templates/calendar/month.html:85
-#: manager/templates/calendar/partial_overview_table.html:18
-#: manager/templates/schedule/view.html:118
-#: nutrition/templates/ingredient/view.html:165
+#: exercises/templates/muscles/admin-overview.html:16
+#: gallery/views/images.py:98 gym/templates/admin_notes/list.html:31
+#: gym/templates/contract/list.html:30 gym/templates/contract/view.html:106
+#: gym/templates/contract_option/list.html:29
+#: gym/templates/contract_type/list.html:30 gym/templates/document/list.html:38
+#: gym/templates/gym/list.html:19 gym/templates/gym/list.html:48
+#: gym/templates/gym/member_list.html:94 gym/templates/gym/member_list.html:152
+#: gym/templates/gym/member_list.html:190
+#: manager/templates/calendar/day.html:67
+#: manager/templates/calendar/month.html:84
+#: manager/templates/calendar/partial_overview_table.html:16
+#: manager/templates/schedule/view.html:318
+#: manager/templates/workout/view.html:181
+#: nutrition/templates/ingredient/view.html:164
+#: nutrition/templates/ingredient/view.html:209
 #: nutrition/templates/units/list.html:19
 msgid "Edit"
 msgstr "수정"
@@ -88,8 +88,8 @@ msgstr ""
 msgid "Empty placeholder schedule"
 msgstr ""
 
-#: core/forms.py:69 core/templates/navigation.html:285
-#: core/templates/navigation.html:291 core/templates/user/login.html:4
+#: core/forms.py:69 core/templates/navigation.html:284
+#: core/templates/navigation.html:290 core/templates/user/login.html:4
 #: software/templates/features.html:82 software/templates/features.html:427
 msgid "Login"
 msgstr "로그인"
@@ -99,14 +99,14 @@ msgstr "로그인"
 msgid "First name"
 msgstr "이름"
 
-#: core/forms.py:109 core/forms.py:215 core/templates/user/overview.html:266
+#: core/forms.py:109 core/forms.py:215 core/templates/user/overview.html:284
 #: gym/views/export.py:62 gym/views/gym.py:217
 msgid "Last name"
 msgstr "성"
 
-#: core/forms.py:111 core/forms.py:180 core/templates/user/overview.html:270
+#: core/forms.py:111 core/forms.py:180 core/templates/user/overview.html:288
 #: gym/models/contract.py:256 gym/models/gym.py:58
-#: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:104
+#: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:116
 #: gym/templates/gym/new_user.html:30 gym/views/export.py:60
 #: mailer/templates/mailer/gym/form.html:4
 #: mailer/templates/mailer/gym/overview.html:4
@@ -137,8 +137,8 @@ msgstr "Workout 리마인더"
 msgid "Other settings"
 msgstr "기타 설정"
 
-#: core/forms.py:174 core/views/user.py:624 core/views/user.py:639
-#: core/views/user.py:651 gym/forms.py:73 manager/templates/log/add.html:65
+#: core/forms.py:174 core/views/user.py:623 core/views/user.py:638
+#: core/views/user.py:650 gym/forms.py:73 manager/templates/log/add.html:65
 #: manager/templates/set/add.html:70 manager/views/workout.py:203
 #: utils/generic_views.py:143
 msgid "Save"
@@ -163,26 +163,25 @@ msgstr "비밀번호"
 msgid "Please enter your current password."
 msgstr "현재 비밀번호를 입력해주세요."
 
-#: core/forms.py:242 core/templates/language/view.html:73
-#: core/templates/license/list.html:19 core/templates/misc/license/list.html:22
-#: core/templates/repetition_unit/list.html:20
-#: core/templates/tags/render_day.html:45
-#: core/templates/tags/render_day.html:81 core/templates/user/overview.html:217
-#: core/templates/weight_unit/list.html:20
-#: exercises/templates/categories/admin-overview.html:19
-#: exercises/templates/equipment/admin-overview.html:19
-#: exercises/templates/muscles/admin-overview.html:19
-#: gym/templates/admin_notes/list.html:40
-#: gym/templates/contract_option/list.html:41
-#: gym/templates/contract_type/list.html:41 gym/templates/document/list.html:46
-#: gym/templates/gym/list.html:22 manager/templates/calendar/day.html:73
-#: manager/templates/calendar/month.html:89
-#: manager/templates/calendar/partial_overview_table.html:23
-#: manager/templates/schedule/view.html:122
-#: manager/templates/workout/view.html:188
-#: nutrition/templates/ingredient/view.html:166
+#: core/forms.py:242 core/templates/language/view.html:70
+#: core/templates/license/list.html:21
+#: core/templates/repetition_unit/list.html:22
+#: core/templates/user/overview.html:233
+#: core/templates/weight_unit/list.html:22
+#: exercises/templates/categories/admin-overview.html:21
+#: exercises/templates/equipment/admin-overview.html:21
+#: exercises/templates/muscles/admin-overview.html:20
+#: gym/templates/admin_notes/list.html:37
+#: gym/templates/contract_option/list.html:35
+#: gym/templates/contract_type/list.html:36 gym/templates/document/list.html:46
+#: gym/templates/gym/list.html:23 manager/templates/calendar/day.html:73
+#: manager/templates/calendar/month.html:88
+#: manager/templates/calendar/partial_overview_table.html:22
+#: manager/templates/schedule/view.html:324
+#: manager/templates/workout/view.html:202
+#: nutrition/templates/ingredient/view.html:168
 #: nutrition/templates/ingredient/view.html:215
-#: nutrition/templates/units/list.html:22
+#: nutrition/templates/units/list.html:25
 msgid "Delete"
 msgstr "삭제"
 
@@ -194,9 +193,9 @@ msgstr "유효하지 않은 비밀번호"
 msgid "The form is secured with reCAPTCHA"
 msgstr ""
 
-#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:285
-#: core/templates/navigation.html:297 core/templates/template.html:149
-#: core/templates/user/login.html:20 core/views/user.py:298
+#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:284
+#: core/templates/navigation.html:296 core/templates/template.html:151
+#: core/templates/user/login.html:20 core/views/user.py:297
 #: software/templates/features.html:87 software/templates/features.html:422
 msgid "Register"
 msgstr "등록"
@@ -433,18 +432,18 @@ msgid "The sum of all hours has to be 24"
 msgstr ""
 
 #: core/models/rep_unit.py:36 core/models/weight_unit.py:36
-#: core/templates/user/overview.html:262 core/views/user.py:599
+#: core/templates/user/overview.html:280 core/views/user.py:598
 #: exercises/models/category.py:29 exercises/models/equipment.py:29
 #: exercises/models/exercise.py:59 exercises/models/muscle.py:36
 #: gym/models/contract.py:52 gym/models/contract.py:103 gym/models/gym.py:46
 #: gym/models/user_document.py:84 gym/templates/contract/view.html:50
-#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:96
+#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:108
 #: gym/views/gym.py:158 manager/models/schedule.py:55
 #: manager/models/workout.py:57 measurements/models/category.py:36
 #: nutrition/models/ingredient.py:111
-#: nutrition/models/ingredient_category.py:27 nutrition/models/meal.py:67
+#: nutrition/models/ingredient_category.py:27 nutrition/models/meal.py:65
 #: nutrition/models/weight_unit.py:38
-#: nutrition/templates/ingredient/view.html:152
+#: nutrition/templates/ingredient/view.html:151
 msgid "Name"
 msgstr ""
 
@@ -489,7 +488,7 @@ msgstr ""
 msgid "Back to \"%(target)s\""
 msgstr ""
 
-#: core/templates/delete.html:15
+#: core/templates/delete.html:4
 msgid "Are you sure you want to delete this? This action cannot be undone."
 msgstr ""
 
@@ -546,7 +545,7 @@ msgstr ""
 msgid "Dashboard"
 msgstr "대시보드"
 
-#: core/templates/language/overview.html:4 core/templates/navigation.html:345
+#: core/templates/language/overview.html:4 core/templates/navigation.html:344
 msgid "Languages"
 msgstr "언어"
 
@@ -556,79 +555,72 @@ msgstr "찾을 수 없음."
 
 #: core/templates/language/overview.html:22
 #: manager/templates/calendar/month.html:132
-#: manager/templates/schedule/overview.html:28
-#: manager/templates/schedule/view.html:144
+#: manager/templates/schedule/view.html:154
 #: manager/templates/workout/overview.html:28
 #: nutrition/templates/ingredient/overview.html:38
 msgid "Add one now."
 msgstr "추가하세요."
 
-#: core/templates/language/overview.html:35 core/templates/license/list.html:40
-#: core/templates/misc/license/list.html:43
-#: core/templates/repetition_unit/list.html:43
-#: core/templates/user/overview.html:326 core/templates/user/overview.html:365
-#: core/templates/user/overview.html:401
-#: core/templates/weight_unit/list.html:43 core/views/languages.py:74
+#: core/templates/language/overview.html:34 core/templates/license/list.html:43
+#: core/templates/repetition_unit/list.html:46
+#: core/templates/user/overview.html:344 core/templates/user/overview.html:384
+#: core/templates/user/overview.html:422
+#: core/templates/weight_unit/list.html:46 core/views/languages.py:74
 #: core/views/license.py:66 core/views/repetition_units.py:66
 #: core/views/weight_units.py:66
-#: exercises/templates/categories/admin-overview.html:38
-#: gallery/views/images.py:63 gym/templates/admin_notes/list.html:67
-#: gym/templates/contract/list.html:73
-#: gym/templates/contract_option/list.html:72
-#: gym/templates/contract_type/list.html:72 gym/templates/document/list.html:79
-#: gym/templates/gym/member_list.html:211
-#: gym/templates/gym/member_list.html:244
-#: gym/templates/gym/member_list.html:281
+#: exercises/templates/categories/admin-overview.html:40
+#: exercises/templates/equipment/admin-overview.html:39
+#: exercises/templates/muscles/admin-overview.html:40
+#: gallery/views/images.py:63 gym/templates/admin_notes/list.html:64
+#: gym/templates/contract/list.html:69
+#: gym/templates/contract_option/list.html:65
+#: gym/templates/contract_type/list.html:66 gym/templates/document/list.html:78
+#: gym/templates/gym/member_list.html:228
+#: gym/templates/gym/member_list.html:264
+#: gym/templates/gym/member_list.html:303
 #: mailer/templates/mailer/gym/overview.html:43
+#: nutrition/templates/ingredient/overview.html:60
 msgid "Add"
 msgstr "추가"
 
 #: core/templates/language/view.html:61 core/templates/user/api_key.html:44
-#: core/templates/user/preferences.html:45 gym/models/contract.py:203
-#: gym/templates/contract/view.html:41 gym/templates/contract/view.html:106
-#: gym/templates/gym/member_list.html:248
-#: manager/templates/schedule/view.html:285
-#: manager/templates/workout/view.html:163
-#: nutrition/templates/ingredient/view.html:202
+#: core/templates/user/preferences.html:50 gym/models/contract.py:203
+#: gym/templates/contract/view.html:41 gym/templates/gym/member_list.html:270
+#: manager/templates/schedule/view.html:304
+#: manager/templates/workout/view.html:177
+#: nutrition/templates/ingredient/view.html:206
 msgid "Options"
 msgstr "옵션"
 
-#: core/templates/license/list.html:4 core/templates/misc/license/list.html:4
+#: core/templates/license/list.html:4
 msgid "License list"
 msgstr "라이센스 리스트"
 
-#: core/templates/license/list.html:26 core/templates/misc/license/list.html:30
-#: core/templates/repetition_unit/list.html:28
+#: core/templates/license/list.html:30
+#: core/templates/repetition_unit/list.html:32
 #: core/templates/user/overview.html:104 core/templates/user/overview.html:136
-#: core/templates/user/overview.html:185 core/templates/user/overview.html:347
-#: core/templates/user/overview.html:383 core/templates/user/overview.html:427
-#: core/templates/weight_unit/list.html:28
-#: exercises/templates/categories/admin-overview.html:26
-#: exercises/templates/equipment/admin-overview.html:26
-#: exercises/templates/muscles/admin-overview.html:26
-#: gym/templates/admin_notes/list.html:52 gym/templates/contract/list.html:60
-#: gym/templates/contract_option/list.html:58
-#: gym/templates/contract_type/list.html:58 gym/templates/document/list.html:64
-#: gym/templates/gym/list.html:29 gym/templates/gym/member_list.html:229
-#: gym/templates/gym/member_list.html:262
-#: gym/templates/gym/member_list.html:299
+#: core/templates/user/overview.html:185 core/templates/user/overview.html:365
+#: core/templates/user/overview.html:404 core/templates/user/overview.html:448
+#: core/templates/weight_unit/list.html:32
+#: exercises/templates/categories/admin-overview.html:30
+#: exercises/templates/equipment/admin-overview.html:30
+#: exercises/templates/muscles/admin-overview.html:29
+#: gym/templates/admin_notes/list.html:50 gym/templates/contract/list.html:57
+#: gym/templates/contract_option/list.html:52
+#: gym/templates/contract_type/list.html:53 gym/templates/document/list.html:64
+#: gym/templates/gym/list.html:32 gym/templates/gym/member_list.html:248
+#: gym/templates/gym/member_list.html:284
+#: gym/templates/gym/member_list.html:321
 #: mailer/templates/mailer/gym/overview.html:30
-#: manager/templates/calendar/day.html:87
-#: nutrition/templates/units/list.html:29
+#: manager/templates/calendar/day.html:88
+#: nutrition/templates/units/list.html:34
 msgid "Nothing found"
 msgstr ""
 
-#: core/templates/misc/about.html:4 core/templates/template.html:175
+#: core/templates/misc/about.html:4 core/templates/template.html:188
 msgid "Imprint"
 msgstr ""
 
-#: core/templates/misc/license/list.html:47
-msgid ""
-"If a license has been localized, e.g. the Creative Commons\n"
-"            licenses for the different countries, add them as separate "
-"entries here."
-msgstr ""
-
 #: core/templates/navigation.html:28 software/templates/features.html:437
 msgid "Training"
 msgstr "Training"
@@ -677,8 +669,8 @@ msgstr ""
 msgid "Exercises"
 msgstr "운동"
 
-#: core/templates/navigation.html:111 core/templates/navigation.html:184
-#: core/templates/navigation.html:340
+#: core/templates/navigation.html:111 core/templates/navigation.html:185
+#: core/templates/navigation.html:339
 msgid "Administration"
 msgstr ""
 
@@ -717,87 +709,87 @@ msgstr ""
 msgid "Daily calories calculator"
 msgstr ""
 
-#: core/templates/navigation.html:179
+#: core/templates/navigation.html:180
 #: nutrition/templates/ingredient/overview.html:10
 msgid "Ingredient overview"
 msgstr ""
 
-#: core/templates/navigation.html:187 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:189 nutrition/templates/units/list.html:6
 msgid "Ingredient weight units"
 msgstr ""
 
-#: core/templates/navigation.html:203 software/templates/features.html:442
+#: core/templates/navigation.html:205 software/templates/features.html:442
 msgid "Body weight"
 msgstr "체중"
 
-#: core/templates/navigation.html:210 core/templates/user/overview.html:114
+#: core/templates/navigation.html:212 core/templates/user/overview.html:114
 msgid "Weight overview"
 msgstr "체중 개요"
 
-#: core/templates/navigation.html:217 weight/views.py:65
+#: core/templates/navigation.html:216 weight/views.py:65
 msgid "Add weight entry"
 msgstr "체중 기록 추가"
 
-#: core/templates/navigation.html:231
+#: core/templates/navigation.html:230
 msgid "About this software"
 msgstr ""
 
-#: core/templates/navigation.html:237 software/templates/about_us.html:5
+#: core/templates/navigation.html:236 software/templates/about_us.html:5
 msgid "About us"
 msgstr ""
 
-#: core/templates/navigation.html:243 software/templates/features.html:507
+#: core/templates/navigation.html:242 software/templates/features.html:507
 msgid "REST API"
 msgstr ""
 
-#: core/templates/navigation.html:249 utils/models.py:45
+#: core/templates/navigation.html:248 utils/models.py:45
 msgid "License"
 msgstr ""
 
-#: core/templates/navigation.html:255
+#: core/templates/navigation.html:254
 msgid "Developer documentation"
 msgstr ""
 
-#: core/templates/navigation.html:262
+#: core/templates/navigation.html:261
 msgid "Get the code"
 msgstr ""
 
-#: core/templates/navigation.html:269 core/templates/template.html:214
+#: core/templates/navigation.html:268 core/templates/template.html:227
 #: software/templates/features.html:582
 msgid "Translate"
 msgstr ""
 
-#: core/templates/navigation.html:303 core/templates/user/login.html:28
+#: core/templates/navigation.html:302 core/templates/user/login.html:28
 msgid "Reset password"
 msgstr ""
 
-#: core/templates/navigation.html:321
+#: core/templates/navigation.html:320
 msgid "My preferences"
 msgstr "내 환경설정"
 
-#: core/templates/navigation.html:330
+#: core/templates/navigation.html:329
 msgid "Logout"
 msgstr "로그아웃"
 
-#: core/templates/navigation.html:353
+#: core/templates/navigation.html:352
 msgid "Licenses"
 msgstr ""
 
-#: core/templates/navigation.html:361
+#: core/templates/navigation.html:360
 #: core/templates/repetition_unit/list.html:4
 msgid "Repetition units"
 msgstr ""
 
-#: core/templates/navigation.html:369 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:368 core/templates/weight_unit/list.html:4
 #: nutrition/templates/ingredient/view.html:141
 msgid "Weight units"
 msgstr "무게 단위"
 
-#: core/templates/navigation.html:377 core/templates/user/list.html:4
+#: core/templates/navigation.html:376 core/templates/user/list.html:4
 msgid "User list"
 msgstr "사용자 리스트"
 
-#: core/templates/navigation.html:383
+#: core/templates/navigation.html:382
 msgid "Gyms"
 msgstr "Gyms"
 
@@ -856,55 +848,28 @@ msgstr ""
 msgid "next"
 msgstr ""
 
-#: core/templates/tags/render_day.html:34
-msgid "Add weight log"
-msgstr "체중 기록 추가"
-
-#: core/templates/tags/render_day.html:116
-msgid "Placeholder image for exercise"
+#: core/templates/tags/render_day.html:44
+msgid "Placeholder image for translation"
 msgstr ""
 
-#: core/templates/tags/render_day.html:133
-msgid "This exercise has no repetitions."
-msgstr ""
-
-#: core/templates/tags/render_day.html:136
-msgid "Edit them now."
-msgstr ""
-
-#: core/templates/tags/render_day.html:162
-msgid "Add exercises to this workout day"
-msgstr ""
-
-#: core/templates/tags/render_weight_log.html:17 manager/helpers.py:86
-#: manager/models/setting.py:72 manager/templates/set/formset.html:9
-msgid "Reps"
-msgstr ""
-
-#: core/templates/tags/render_weight_log.html:30 manager/forms.py:191
-#: manager/models/log.py:103 manager/models/setting.py:102
-#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
-msgid "RiR"
-msgstr ""
-
-#: core/templates/template.html:122 manager/templates/calendar/month.html:138
-#: manager/templates/schedule/view.html:248
-#: manager/templates/schedule/view.html:269
-#: manager/templates/workout/view.html:84
-#: manager/templates/workout/view.html:137
+#: core/templates/template.html:124 manager/templates/calendar/month.html:138
+#: manager/templates/schedule/view.html:262
+#: manager/templates/schedule/view.html:287
+#: manager/templates/workout/view.html:89
+#: manager/templates/workout/view.html:149
 msgid "Close"
 msgstr ""
 
-#: core/templates/template.html:138
+#: core/templates/template.html:140
 msgid ""
 "You are using a guest account, data entered will be deleted after a week."
 msgstr ""
 
-#: core/templates/template.html:143
+#: core/templates/template.html:145
 msgid "Create some demo entries"
 msgstr ""
 
-#: core/templates/template.html:180 software/templates/features.html:547
+#: core/templates/template.html:193 software/templates/features.html:547
 #: software/templates/tos.html:7
 msgid "Terms of service"
 msgstr ""
@@ -913,7 +878,7 @@ msgstr ""
 msgid "Features"
 msgstr ""
 
-#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:54
+#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:59
 msgid "API key"
 msgstr ""
 
@@ -952,17 +917,17 @@ msgstr ""
 msgid "Documentation"
 msgstr ""
 
-#: core/templates/user/delete_account.html:4
-#: core/templates/user/preferences.html:59
+#: core/templates/user/delete_account.html:3
+#: core/templates/user/preferences.html:62
 msgid "Delete account"
 msgstr ""
 
-#: core/templates/user/delete_account.html:17
+#: core/templates/user/delete_account.html:9
 #: exercises/templates/history/overview.html:93
 msgid "Are you sure?"
 msgstr ""
 
-#: core/templates/user/delete_account.html:22
+#: core/templates/user/delete_account.html:14
 #, python-format
 msgid ""
 "This action will delete the user account \"%(username)s\".\n"
@@ -984,22 +949,22 @@ msgstr ""
 
 #: core/templates/user/overview.html:25 core/templates/user/overview.html:68
 #: core/templates/user/overview.html:112 core/templates/user/overview.html:144
-#: core/templates/user/overview.html:330 core/templates/user/overview.html:369
-#: core/templates/user/overview.html:405
+#: core/templates/user/overview.html:348 core/templates/user/overview.html:390
+#: core/templates/user/overview.html:426
 #, python-format
 msgid "last %(number)s"
 msgstr ""
 
 #: core/templates/user/overview.html:27 core/templates/user/overview.html:146
-#: core/templates/user/overview.html:325 core/templates/user/overview.html:364
-#: core/templates/user/overview.html:400 gym/templates/gym/member_list.html:210
-#: gym/templates/gym/member_list.html:243
-#: gym/templates/gym/member_list.html:280
+#: core/templates/user/overview.html:343 core/templates/user/overview.html:382
+#: core/templates/user/overview.html:421 gym/templates/gym/member_list.html:226
+#: gym/templates/gym/member_list.html:262
+#: gym/templates/gym/member_list.html:302
 msgid "Overview"
 msgstr ""
 
 #: core/templates/user/overview.html:28
-#: manager/templates/schedule/view.html:163
+#: manager/templates/schedule/view.html:172
 #: manager/templates/workout/overview.html:39 manager/views/schedule_step.py:60
 msgid "Add workout"
 msgstr "Workout 추가"
@@ -1031,38 +996,36 @@ msgstr ""
 msgid "Number of logs (days)"
 msgstr ""
 
-#: core/templates/user/overview.html:37 core/views/user.py:600
+#: core/templates/user/overview.html:37 core/views/user.py:599
 #: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:158
 msgid "Last activity"
 msgstr "최종 활동"
 
 #: core/templates/user/overview.html:58
 #: manager/templates/calendar/month.html:128
-#: manager/templates/schedule/view.html:144
 #: manager/templates/workout/overview.html:28
 msgid "No workouts found."
 msgstr "Workout을 찾을 수 없음."
 
 #: core/templates/user/overview.html:68 manager/forms.py:280
-#: manager/templates/workout/view.html:106
+#: manager/templates/workout/view.html:114
 msgid "Log"
 msgstr ""
 
 #: core/templates/user/overview.html:77 manager/models/session.py:83
-#: manager/templates/calendar/partial_overview_table.html:52
+#: manager/templates/calendar/partial_overview_table.html:54
 msgid "General impression"
 msgstr ""
 
-#: core/templates/user/overview.html:78 core/templates/user/overview.html:369
+#: core/templates/user/overview.html:78 core/templates/user/overview.html:390
 #: manager/models/session.py:73
-#: manager/templates/calendar/partial_overview_table.html:56
-#: manager/templates/workout/log.html:89
+#: manager/templates/calendar/partial_overview_table.html:58
 msgid "Notes"
 msgstr ""
 
 #: core/templates/user/overview.html:79
 #: exercises/templates/history/overview.html:30
-#: manager/templates/calendar/partial_overview_table.html:42
+#: manager/templates/calendar/partial_overview_table.html:44
 msgid "Time"
 msgstr ""
 
@@ -1100,121 +1063,121 @@ msgstr ""
 msgid "kcal"
 msgstr ""
 
-#: core/templates/user/overview.html:201 core/templates/user/overview.html:322
-#: core/templates/user/overview.html:361 core/templates/user/overview.html:397
-#: core/templates/user/overview.html:442 gym/templates/gym/list.html:42
-#: gym/templates/gym/member_list.html:84 gym/templates/gym/member_list.html:137
-#: gym/templates/gym/member_list.html:173
-#: gym/templates/gym/member_list.html:207
-#: gym/templates/gym/member_list.html:240
-#: gym/templates/gym/member_list.html:277
-#: manager/templates/schedule/view.html:100
+#: core/templates/user/overview.html:201 core/templates/user/overview.html:340
+#: core/templates/user/overview.html:379 core/templates/user/overview.html:418
+#: core/templates/user/overview.html:463 gym/templates/gym/list.html:45
+#: gym/templates/gym/member_list.html:91 gym/templates/gym/member_list.html:149
+#: gym/templates/gym/member_list.html:187
+#: gym/templates/gym/member_list.html:223
+#: gym/templates/gym/member_list.html:259
+#: gym/templates/gym/member_list.html:299
+#: manager/templates/schedule/view.html:99
 msgid "Actions"
 msgstr "Actions"
 
-#: core/templates/user/overview.html:207
+#: core/templates/user/overview.html:210
 msgid "Deactivate user"
 msgstr ""
 
-#: core/templates/user/overview.html:209
+#: core/templates/user/overview.html:214
 msgid "Activate user"
 msgstr ""
 
-#: core/templates/user/overview.html:211
+#: core/templates/user/overview.html:223
 msgid "Reset user password"
 msgstr ""
 
-#: core/templates/user/overview.html:214 gym/templates/gym/member_list.html:30
+#: core/templates/user/overview.html:227 gym/templates/gym/member_list.html:30
 msgid "Roles"
 msgstr ""
 
-#: core/templates/user/overview.html:225
+#: core/templates/user/overview.html:243
 msgid "Password reset confirmation"
 msgstr ""
 
-#: core/templates/user/overview.html:229
+#: core/templates/user/overview.html:247
 msgid "Do you really want to change this user&#39;s password?"
 msgstr ""
 
-#: core/templates/user/overview.html:232
+#: core/templates/user/overview.html:250
 #: exercises/templates/history/overview.html:106
 msgid "No"
 msgstr ""
 
-#: core/templates/user/overview.html:233
+#: core/templates/user/overview.html:251
 #: exercises/templates/history/overview.html:99
 msgid "Yes"
 msgstr ""
 
-#: core/templates/user/overview.html:254 gym/templates/gym/member_list.html:93
+#: core/templates/user/overview.html:272 gym/templates/gym/member_list.html:105
 msgid "Details"
 msgstr "세부정보"
 
-#: core/templates/user/overview.html:258 gym/views/export.py:57
-#: manager/helpers.py:86 manager/templates/schedule/view.html:98
+#: core/templates/user/overview.html:276 gym/views/export.py:57
+#: manager/helpers.py:86 manager/templates/schedule/view.html:97
 msgid "Nr."
 msgstr ""
 
-#: core/templates/user/overview.html:280 gym/models/contract.py:287
+#: core/templates/user/overview.html:298 gym/models/contract.py:287
 #: gym/models/gym.py:50 gym/templates/contract/view.html:75
-#: gym/templates/gym/member_list.html:100 gym/views/export.py:68
+#: gym/templates/gym/member_list.html:112 gym/views/export.py:68
 msgid "Phone"
 msgstr ""
 
-#: core/templates/user/overview.html:284 gym/templates/contract/view.html:87
-#: gym/templates/gym/member_list.html:118
+#: core/templates/user/overview.html:302 gym/templates/contract/view.html:87
+#: gym/templates/gym/member_list.html:130
 msgid "Address"
 msgstr "주소"
 
-#: core/templates/user/overview.html:295
+#: core/templates/user/overview.html:313
 msgid "Registered"
 msgstr ""
 
-#: core/templates/user/overview.html:299
+#: core/templates/user/overview.html:317
 msgid "Last login"
 msgstr "최종 로그인"
 
-#: core/templates/user/overview.html:304
+#: core/templates/user/overview.html:322
 msgid "Status"
 msgstr ""
 
-#: core/templates/user/overview.html:307
+#: core/templates/user/overview.html:325
 msgid "Active"
 msgstr ""
 
-#: core/templates/user/overview.html:309
+#: core/templates/user/overview.html:327
 msgid "Inactive"
 msgstr ""
 
-#: core/templates/user/overview.html:330 gym/templates/contract/list.html:4
-#: gym/templates/gym/member_list.html:202
+#: core/templates/user/overview.html:348 gym/templates/contract/list.html:4
+#: gym/templates/gym/member_list.html:218
 msgid "Contracts"
 msgstr ""
 
-#: core/templates/user/overview.html:405 gym/templates/document/list.html:4
+#: core/templates/user/overview.html:426 gym/templates/document/list.html:4
 msgid "Documents"
 msgstr ""
 
-#: core/templates/user/overview.html:412 gym/templates/document/list.html:32
-#: manager/forms.py:292 manager/templates/workout/view.html:132
+#: core/templates/user/overview.html:433 gym/templates/document/list.html:33
+#: manager/forms.py:292 manager/templates/workout/view.html:143
 msgid "Download"
 msgstr ""
 
-#: core/templates/user/overview.html:450 gym/views/admin_config.py:44
+#: core/templates/user/overview.html:474 gym/views/admin_config.py:44
 #: gym/views/admin_config.py:58 gym/views/user_config.py:46
 msgid "Configuration"
 msgstr "설정"
 
-#: core/templates/user/overview.html:453 gym/models/user_config.py:92
+#: core/templates/user/overview.html:477 gym/models/user_config.py:92
 msgid "Include in inactive overview"
 msgstr ""
 
-#: core/templates/user/overview.html:486
+#: core/templates/user/overview.html:510
 #, python-format
 msgid "Admin login is only available for users in %(gym_name)s"
 msgstr ""
 
-#: core/templates/user/overview.html:490
+#: core/templates/user/overview.html:514
 msgid "Log in as this user"
 msgstr ""
 
@@ -1236,19 +1199,19 @@ msgstr ""
 msgid "Send verification email"
 msgstr ""
 
-#: core/templates/user/preferences.html:30
+#: core/templates/user/preferences.html:31
 msgid "You need to verify your email to contribute exercises"
 msgstr ""
 
-#: core/templates/user/preferences.html:50 core/views/user.py:611
+#: core/templates/user/preferences.html:55 core/views/user.py:610
 msgid "Change password"
 msgstr ""
 
-#: core/templatetags/wger_extras.py:205 i18n.tpl:37
+#: core/templatetags/wger_extras.py:197 i18n.tpl:37
 msgid "kg"
 msgstr ""
 
-#: core/templatetags/wger_extras.py:207
+#: core/templatetags/wger_extras.py:199
 #: nutrition/templates/ingredient/view.html:60
 #: nutrition/templates/ingredient/view.html:66
 #: nutrition/templates/ingredient/view.html:73
@@ -1260,11 +1223,11 @@ msgctxt "weight unit, i.e. grams"
 msgid "g"
 msgstr ""
 
-#: core/templatetags/wger_extras.py:210 i18n.tpl:38
+#: core/templatetags/wger_extras.py:202 i18n.tpl:38
 msgid "lb"
 msgstr ""
 
-#: core/templatetags/wger_extras.py:212
+#: core/templatetags/wger_extras.py:204
 msgctxt "weight unit, i.e. ounces"
 msgid "oz"
 msgstr ""
@@ -1291,13 +1254,13 @@ msgid "Delete {0}?"
 msgstr ""
 
 #: core/views/languages.py:111 core/views/license.py:85
-#: core/views/repetition_units.py:86 core/views/user.py:474
+#: core/views/repetition_units.py:86 core/views/user.py:473
 #: core/views/weight_units.py:86 exercises/views/categories.py:98
 #: exercises/views/equipment.py:81 exercises/views/muscles.py:87
 #: gym/views/admin_notes.py:161 gym/views/config.py:68
 #: gym/views/contract.py:186 gym/views/contract_option.py:123
 #: gym/views/contract_type.py:123 gym/views/document.py:171
-#: gym/views/gym.py:463 manager/views/day.py:100 manager/views/schedule.py:333
+#: gym/views/gym.py:463 manager/views/day.py:96 manager/views/schedule.py:333
 #: manager/views/workout.py:267 nutrition/views/ingredient.py:145
 #: nutrition/views/unit.py:143
 #, python-brace-format
@@ -1323,48 +1286,48 @@ msgstr ""
 msgid "Your feedback was successfully sent. Thank you!"
 msgstr ""
 
-#: core/views/user.py:156
+#: core/views/user.py:155
 #, python-brace-format
 msgid "Account \"{0}\" was successfully deleted"
 msgstr ""
 
-#: core/views/user.py:292
+#: core/views/user.py:291
 msgid "You were successfully registered"
 msgstr ""
 
-#: core/views/user.py:351
+#: core/views/user.py:350
 msgid "Settings successfully updated"
 msgstr "설정이 업데이트 되었습니다."
 
-#: core/views/user.py:390
+#: core/views/user.py:389
 msgid "The user was successfully deactivated"
 msgstr ""
 
-#: core/views/user.py:427
+#: core/views/user.py:426
 msgid "The user was successfully activated"
 msgstr ""
 
-#: core/views/user.py:442
+#: core/views/user.py:441
 msgid "Edit user"
 msgstr ""
 
-#: core/views/user.py:597 gym/templates/gym/member_list.html:26
+#: core/views/user.py:596 gym/templates/gym/member_list.html:26
 #: gym/views/gym.py:158
 msgid "ID"
 msgstr ""
 
-#: core/views/user.py:598 gym/forms.py:95 gym/templates/contract/view.html:55
+#: core/views/user.py:597 gym/forms.py:95 gym/templates/contract/view.html:55
 #: gym/templates/gym/member_list.html:27 gym/views/export.py:59
 #: gym/views/gym.py:158 gym/views/gym.py:217
 msgid "Username"
 msgstr "사용자이름"
 
-#: core/views/user.py:601 gym/templates/gym/new_user.html:34
+#: core/views/user.py:600 gym/templates/gym/new_user.html:34
 #: gym/views/export.py:58 gym/views/gym.py:217
 msgid "Gym"
 msgstr "Gym"
 
-#: core/views/user.py:660
+#: core/views/user.py:659
 #, python-format
 msgid "A verification email was sent to %(email)s"
 msgstr ""
@@ -1520,11 +1483,6 @@ msgstr ""
 msgid "Equipment list"
 msgstr "장비 리스트"
 
-#: exercises/templates/equipment/admin-overview.html:39
-#: exercises/views/equipment.py:92
-msgid "Add new equipment"
-msgstr "새 장비 추가"
-
 #: exercises/templates/history/overview.html:11
 #, fuzzy
 #| msgid "Exercise day"
@@ -1576,11 +1534,6 @@ msgstr ""
 msgid "Muscle overview"
 msgstr ""
 
-#: exercises/templates/muscles/admin-overview.html:38
-#: exercises/views/muscles.py:68
-msgid "Add muscle"
-msgstr "근육 추가"
-
 #: exercises/views/categories.py:72
 msgid "Add category"
 msgstr "카테고리 추가"
@@ -1589,6 +1542,10 @@ msgstr "카테고리 추가"
 msgid "This will also delete all exercises in this category."
 msgstr ""
 
+#: exercises/views/equipment.py:92
+msgid "Add new equipment"
+msgstr "새 장비 추가"
+
 #: exercises/views/equipment.py:104 exercises/views/equipment.py:115
 msgid "Delete equipment?"
 msgstr ""
@@ -1597,6 +1554,10 @@ msgstr ""
 msgid "This will delete the exercise from all workouts."
 msgstr ""
 
+#: exercises/views/muscles.py:68
+msgid "Add muscle"
+msgstr "근육 추가"
+
 #: gallery/templates/images/overview.html:62
 #, fuzzy
 #| msgid "Add new image"
@@ -1684,7 +1645,7 @@ msgid "Contract is active"
 msgstr ""
 
 #: gym/models/contract.py:237 gym/templates/contract/view.html:69
-#: manager/models/schedule.py:61 manager/templates/schedule/view.html:67
+#: manager/models/schedule.py:61 manager/templates/schedule/view.html:66
 msgid "Start date"
 msgstr "시작 날짜"
 
@@ -1720,7 +1681,7 @@ msgstr "Admin : Gym 사용자를 관리할 수 있습니다."
 msgid "Admin: can administrate the different gyms"
 msgstr "Admin : 다른 Gym을 관리할 수 있습니다."
 
-#: gym/models/gym.py:65 gym/templates/gym/member_list.html:114
+#: gym/models/gym.py:65 gym/templates/gym/member_list.html:126
 msgid "Owner"
 msgstr ""
 
@@ -1730,7 +1691,7 @@ msgid ""
 "considered inactive"
 msgstr ""
 
-#: gym/models/gym_config.py:56 gym/templates/gym/member_list.html:152
+#: gym/models/gym_config.py:56 gym/templates/gym/member_list.html:166
 msgid "Show name in header"
 msgstr ""
 
@@ -1743,7 +1704,7 @@ msgstr "Site Header에 Gym 이름 표시"
 msgid "Configuration for {self.gym.name}"
 msgstr ""
 
-#: gym/models/user_config.py:65 gym/templates/gym/member_list.html:184
+#: gym/models/user_config.py:65 gym/templates/gym/member_list.html:200
 msgid "Overview of inactive members"
 msgstr ""
 
@@ -1767,7 +1728,7 @@ msgstr ""
 msgid "User notes"
 msgstr ""
 
-#: gym/templates/contract/list.html:36
+#: gym/templates/contract/list.html:34
 msgid "Show"
 msgstr "보기"
 
@@ -1793,11 +1754,11 @@ msgstr "다음 사용자는 지난 %(weeks)s주 동안 체육관을 방문하지
 msgid "Gym list"
 msgstr "Gym 리스트"
 
-#: gym/templates/gym/list.html:50
+#: gym/templates/gym/list.html:53
 msgid "Global gym configuration"
 msgstr ""
 
-#: gym/templates/gym/list.html:67 gym/views/gym.py:171
+#: gym/templates/gym/list.html:69 gym/views/gym.py:171
 msgid "Add new gym"
 msgstr "새 Gym 추가"
 
@@ -1809,43 +1770,43 @@ msgstr "관리자와 트레이너"
 msgid "Gym manager"
 msgstr ""
 
-#: gym/templates/gym/member_list.html:69
+#: gym/templates/gym/member_list.html:76
 msgid "This gym has no administrators or trainers"
 msgstr "이 Gym은 관리자와 트레이너가 없습니다."
 
-#: gym/templates/gym/member_list.html:88
+#: gym/templates/gym/member_list.html:98
 msgid "Export"
 msgstr "내보내기"
 
-#: gym/templates/gym/member_list.html:125
+#: gym/templates/gym/member_list.html:137
 msgid "Members"
 msgstr ""
 
-#: gym/templates/gym/member_list.html:145
+#: gym/templates/gym/member_list.html:159
 msgid "Gym configuration"
 msgstr ""
 
-#: gym/templates/gym/member_list.html:148
+#: gym/templates/gym/member_list.html:162
 msgid "Inactive members"
 msgstr ""
 
-#: gym/templates/gym/member_list.html:149
+#: gym/templates/gym/member_list.html:163
 msgid "weeks"
 msgstr ""
 
-#: gym/templates/gym/member_list.html:181
+#: gym/templates/gym/member_list.html:197
 msgid "My configuration"
 msgstr ""
 
-#: gym/templates/gym/member_list.html:215
+#: gym/templates/gym/member_list.html:234
 msgid "Types"
 msgstr ""
 
-#: gym/templates/gym/member_list.html:285
+#: gym/templates/gym/member_list.html:307
 msgid "Emails"
 msgstr "이메일"
 
-#: gym/templates/gym/member_list.html:315
+#: gym/templates/gym/member_list.html:336
 msgid "Add member"
 msgstr "멤버 추가"
 
@@ -2143,28 +2104,38 @@ msgstr ""
 msgid "Unit"
 msgstr ""
 
+#: manager/forms.py:191 manager/models/log.py:103 manager/models/setting.py:102
+#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
+msgid "RiR"
+msgstr ""
+
 #: manager/forms.py:279
 msgid "Type"
 msgstr ""
 
-#: manager/forms.py:280 manager/templates/workout/view.html:113
+#: manager/forms.py:280 manager/templates/workout/view.html:122
 msgid "Table"
 msgstr ""
 
-#: manager/forms.py:282 manager/templates/workout/view.html:119
+#: manager/forms.py:282 manager/templates/workout/view.html:129
 msgid "with images"
 msgstr ""
 
-#: manager/forms.py:283 manager/templates/workout/view.html:125
+#: manager/forms.py:283 manager/templates/workout/view.html:136
 msgid "with comments"
 msgstr ""
 
+#: manager/helpers.py:86 manager/models/setting.py:72
+#: manager/templates/set/formset.html:9
+msgid "Reps"
+msgstr ""
+
 #: manager/management/commands/email-reminders.py:121
 msgid "Workout will expire soon"
 msgstr ""
 
 #: manager/models/day.py:34 manager/models/log.py:58
-#: manager/models/session.py:60 manager/templates/schedule/view.html:102
+#: manager/models/session.py:60 manager/templates/schedule/view.html:101
 #: manager/templates/workout/view.html:9 manager/templates/workout/view.html:17
 #: manager/views/pdf.py:85 manager/views/pdf.py:161
 #: manager/views/schedule.py:151 manager/views/schedule.py:221
@@ -2185,7 +2156,7 @@ msgstr "일"
 msgid "Name or short description of the schedule. For example 'Program XYZ'."
 msgstr ""
 
-#: manager/models/schedule.py:65 manager/templates/schedule/view.html:71
+#: manager/models/schedule.py:65 manager/templates/schedule/view.html:70
 msgid "Schedule active"
 msgstr "일정 활성화"
 
@@ -2196,7 +2167,7 @@ msgid ""
 "inactive"
 msgstr ""
 
-#: manager/models/schedule.py:77 manager/templates/schedule/view.html:81
+#: manager/models/schedule.py:77 manager/templates/schedule/view.html:80
 msgid "Is a loop"
 msgstr ""
 
@@ -2215,7 +2186,7 @@ msgid "The duration in weeks"
 msgstr ""
 
 #: manager/models/schedule_step.py:64 manager/models/set.py:53
-#: manager/models/setting.py:113 nutrition/models/meal.py:55
+#: manager/models/setting.py:113 nutrition/models/meal.py:53
 #: nutrition/models/meal_item.py:66
 msgid "Order"
 msgstr ""
@@ -2351,7 +2322,7 @@ msgstr ""
 msgid "Workout session"
 msgstr ""
 
-#: manager/templates/calendar/partial_overview_table.html:27
+#: manager/templates/calendar/partial_overview_table.html:26
 msgid "Delete with logs"
 msgstr ""
 
@@ -2371,21 +2342,27 @@ msgid ""
 "will simply be edited. Weight entries are always added."
 msgstr ""
 
-#: manager/templates/schedule/overview.html:5
+#: manager/templates/schedule/overview.html:4
 msgid "Your schedules"
 msgstr "일정"
 
 #: manager/templates/schedule/overview.html:19
-#: manager/templates/schedule/view.html:131
-#: manager/templates/schedule/view.html:183
+#: manager/templates/schedule/view.html:143
+#: manager/templates/schedule/view.html:193
 #: manager/templates/workout/overview.html:16
 msgid "active"
 msgstr ""
 
-#: manager/templates/schedule/overview.html:28
+#: manager/templates/schedule/overview.html:27
 msgid "No schedules found."
 msgstr "일정이 없습니다."
 
+#: manager/templates/schedule/overview.html:28
+#, fuzzy
+#| msgid "Add one now."
+msgid "Add one now"
+msgstr "추가하세요."
+
 #: manager/templates/schedule/overview.html:36
 #, fuzzy
 #| msgid ""
@@ -2408,14 +2385,15 @@ msgid ""
 "        before jumping to the next. It is also possible to create a loop, so "
 "you\n"
 "        always do the same workouts in succession, e.g. A > B > C > A > B > "
-"C and so on."
+"C and so\n"
+"        on."
 msgstr ""
 "다음으로 이동하기 전에 각 Workout을 얼마나 오래 할 것인지 표시할 수 있습니"
 "다. \n"
 "루프를 만들 수 있으므로 항상 동일한 운동을 연속적으로 수행합니다. \n"
 "e.g. A> B> C> A> B> C 등등."
 
-#: manager/templates/schedule/overview.html:43
+#: manager/templates/schedule/overview.html:44
 #, fuzzy
 #| msgid ""
 #| "The currently active schedule will remain active (and be\n"
@@ -2440,25 +2418,25 @@ msgstr "일정 추가"
 msgid "Schedule"
 msgstr "일정"
 
-#: manager/templates/schedule/view.html:85
+#: manager/templates/schedule/view.html:84
 msgid ""
 "This schedule is a loop and will go through the workouts above till you "
 "deactivate it"
 msgstr ""
 
-#: manager/templates/schedule/view.html:103
+#: manager/templates/schedule/view.html:102
 msgid "Weeks"
 msgstr ""
 
-#: manager/templates/schedule/view.html:115
+#: manager/templates/schedule/view.html:114
 msgid "Move me"
 msgstr ""
 
-#: manager/templates/schedule/view.html:156
+#: manager/templates/schedule/view.html:168
 msgid "Start schedule"
 msgstr "일정 시작"
 
-#: manager/templates/schedule/view.html:187
+#: manager/templates/schedule/view.html:197
 #, python-format
 msgid ""
 "%(weeks)s Week\n"
@@ -2468,11 +2446,11 @@ msgid_plural ""
 "                                "
 msgstr[0] ""
 
-#: manager/templates/schedule/view.html:221
+#: manager/templates/schedule/view.html:231
 msgid "Adding workouts"
 msgstr ""
 
-#: manager/templates/schedule/view.html:223
+#: manager/templates/schedule/view.html:233
 msgid ""
 "Add as many workouts to the schedule as you want. You can\n"
 "            edit the order by dragging and dropping them. It's also possible "
@@ -2480,44 +2458,37 @@ msgid ""
 "            than once."
 msgstr ""
 
-#: manager/templates/schedule/view.html:232
-#: manager/templates/schedule/view.html:243
-#: manager/templates/schedule/view.html:290
+#: manager/templates/schedule/view.html:242
+#: manager/templates/schedule/view.html:256
+#: manager/templates/schedule/view.html:310
 #: manager/templates/workout/view.html:69
-#: manager/templates/workout/view.html:79
-#: manager/templates/workout/view.html:178
+#: manager/templates/workout/view.html:83
+#: manager/templates/workout/view.html:192
 msgid "Export calendar file"
 msgstr "달력 파일 내보내기"
 
-#: manager/templates/schedule/view.html:236
+#: manager/templates/schedule/view.html:248
 msgid "Export this schedule as a calendar file."
 msgstr "이 일정을 달력 파일로 내보내기"
 
-#: manager/templates/schedule/view.html:237
-#: manager/templates/workout/view.html:74
+#: manager/templates/schedule/view.html:249
+#: manager/templates/workout/view.html:76
 msgid ""
 "You can then import the file it into your calendar\n"
 "                        application for example google calendar, outlook or "
 "iCal. This will create\n"
 "                        an appointment for each training day with the "
-"appropriate exercises."
+"appropriate\n"
+"                        exercises."
 msgstr ""
 
-#: manager/templates/schedule/view.html:258
-#: manager/templates/schedule/view.html:294
-#: manager/templates/workout/view.html:94
-#: manager/templates/workout/view.html:174
+#: manager/templates/schedule/view.html:272
+#: manager/templates/schedule/view.html:315
+#: manager/templates/workout/view.html:99
+#: manager/templates/workout/view.html:188
 msgid "Download as PDF"
 msgstr ""
 
-#: manager/templates/schedule/view.html:299
-msgid "Edit schedule"
-msgstr "일정 수정"
-
-#: manager/templates/schedule/view.html:304
-msgid "Delete schedule"
-msgstr "일정 삭제"
-
 #: manager/templates/set/add.html:9
 #, python-format
 msgid "Add exercises to day \"%(day_name)s\""
@@ -2582,49 +2553,6 @@ msgid ""
 "You will regularly receive such reminders till you enter your current weight."
 msgstr ""
 
-#: manager/templates/workout/log.html:10 manager/templates/workout/log.html:11
-msgid "Weight log"
-msgstr ""
-
-#: manager/templates/workout/log.html:29
-msgid "Weight log for workout"
-msgstr ""
-
-#: manager/templates/workout/log.html:49
-msgid "Add weight log to this day"
-msgstr "운동 로그 추가하기"
-
-#: manager/templates/workout/log.html:69
-msgid "No weight entries here."
-msgstr ""
-
-#: manager/templates/workout/log.html:77
-msgid "No exercises for this day."
-msgstr ""
-
-#: manager/templates/workout/log.html:90
-msgid ""
-"This page shows the weight logs belonging to this workout\n"
-"only. Click on an exercise to see all the historical data for\n"
-"it."
-msgstr ""
-
-#: manager/templates/workout/log.html:94
-msgid ""
-"If on a single day there is more than one entry with the\n"
-"same number of repetitions, but different weights, only the entry with the\n"
-"higher weight is shown in the diagram."
-msgstr ""
-
-#: manager/templates/workout/log.html:98
-msgid ""
-"Note that only entries with a weight unit (kg or lb) and\n"
-"repetitions are charted, other combinations such as time or until failure\n"
-"are ignored here."
-msgstr ""
-"무게 단위 (kg 또는 lb)와 반복이 있는 항목만 차트로 표시되며,\n"
-"시간 또는 실패 전까지의 항목은 무시됩니다."
-
 #: manager/templates/workout/overview.html:25
 #, fuzzy
 #| msgid "No schedules found."
@@ -2664,27 +2592,23 @@ msgstr ""
 msgid "Set the repetitions for each set"
 msgstr ""
 
-#: manager/templates/workout/view.html:73
+#: manager/templates/workout/view.html:75
 msgid "Export this workout as a calendar file."
 msgstr "이 Workout을 달력파일로 내보내기"
 
-#: manager/templates/workout/view.html:144
+#: manager/templates/workout/view.html:156
 msgid "Logs"
 msgstr ""
 
-#: manager/templates/workout/view.html:146
+#: manager/templates/workout/view.html:159
 msgid "View logs"
 msgstr ""
 
-#: manager/templates/workout/view.html:169 manager/views/schedule_step.py:99
-msgid "Edit workout"
-msgstr ""
-
-#: manager/templates/workout/view.html:182 manager/views/workout.py:281
+#: manager/templates/workout/view.html:195 manager/views/workout.py:281
 msgid "Mark as template"
 msgstr ""
 
-#: manager/views/day.py:109
+#: manager/views/day.py:105
 msgid "Add workout day"
 msgstr ""
 
@@ -2701,6 +2625,10 @@ msgstr ""
 msgid "Create schedule"
 msgstr "일정 생성"
 
+#: manager/views/schedule_step.py:99
+msgid "Edit workout"
+msgstr ""
+
 #: manager/views/workout.py:209
 msgid "Copy workout"
 msgstr ""
@@ -2828,7 +2756,7 @@ msgstr ""
 msgid "Unit amount, e.g. \"1 Cup\" or \"1/2 spoon\""
 msgstr ""
 
-#: nutrition/models/log.py:52 nutrition/models/meal.py:50
+#: nutrition/models/log.py:52 nutrition/models/meal.py:48
 #: nutrition/models/meal_item.py:48 nutrition/models/plan.py:108
 msgid "Nutrition plan"
 msgstr ""
@@ -2841,11 +2769,11 @@ msgstr ""
 msgid "Date and Time (Approx.)"
 msgstr ""
 
-#: nutrition/models/meal.py:62
+#: nutrition/models/meal.py:60
 msgid "Time (approx)"
 msgstr ""
 
-#: nutrition/models/meal.py:69
+#: nutrition/models/meal.py:67
 msgid ""
 "Give meals a textual description / name such as \"Breakfast\" or \"after "
 "workout\""
@@ -2968,10 +2896,6 @@ msgstr ""
 msgid "Search"
 msgstr ""
 
-#: nutrition/templates/ingredient/overview.html:62
-msgid "Add ingredient"
-msgstr ""
-
 #: nutrition/templates/ingredient/view.html:45 nutrition/views/plan.py:229
 msgid "Macronutrients"
 msgstr ""
@@ -2991,20 +2915,11 @@ msgstr ""
 msgid "Others"
 msgstr ""
 
-#: nutrition/templates/ingredient/view.html:144
-#: nutrition/templates/units/list.html:46 nutrition/views/unit.py:86
+#: nutrition/templates/ingredient/view.html:143
+#: nutrition/templates/units/list.html:50 nutrition/views/unit.py:86
 msgid "Add new weight unit"
 msgstr ""
 
-#: nutrition/templates/ingredient/view.html:206
-#: nutrition/templates/ingredient/view.html:209
-msgid "Edit ingredient"
-msgstr ""
-
-#: nutrition/templates/ingredient/view.html:213
-msgid "Delete ingredient"
-msgstr ""
-
 #: nutrition/templates/rate/form.html:25
 msgid "Basal metabolic rate"
 msgstr ""
@@ -3573,6 +3488,27 @@ msgstr "삭제되었습니다."
 msgid "Delete weight entry for the %s"
 msgstr ""
 
+#~ msgid "Add weight log"
+#~ msgstr "체중 기록 추가"
+
+#~ msgid "Edit schedule"
+#~ msgstr "일정 수정"
+
+#~ msgid "Delete schedule"
+#~ msgstr "일정 삭제"
+
+#~ msgid "Add weight log to this day"
+#~ msgstr "운동 로그 추가하기"
+
+#~ msgid ""
+#~ "Note that only entries with a weight unit (kg or lb) and\n"
+#~ "repetitions are charted, other combinations such as time or until "
+#~ "failure\n"
+#~ "are ignored here."
+#~ msgstr ""
+#~ "무게 단위 (kg 또는 lb)와 반복이 있는 항목만 차트로 표시되며,\n"
+#~ "시간 또는 실패 전까지의 항목은 무시됩니다."
+
 #~ msgid "Submission date"
 #~ msgstr "제출일"
 
diff --git a/wger/locale/nl/LC_MESSAGES/django.po b/wger/locale/nl/LC_MESSAGES/django.po
index 895da3c02..3224b1f8f 100644
--- a/wger/locale/nl/LC_MESSAGES/django.po
+++ b/wger/locale/nl/LC_MESSAGES/django.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: wger Workout Manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-07-14 15:59+0200\n"
+"POT-Creation-Date: 2024-11-14 13:09+0100\n"
 "PO-Revision-Date: 2024-05-29 22:09+0000\n"
 "Last-Translator: SilverServerT <silver@silverserver.nl>\n"
 "Language-Team: Dutch <https://hosted.weblate.org/projects/wger/web/nl/>\n"
@@ -25,7 +25,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 5.6-dev\n"
 
-#: config/models/gym_config.py:46 gym/templates/gym/list.html:53
+#: config/models/gym_config.py:46 gym/templates/gym/list.html:56
 msgid "Default gym"
 msgstr "Standaard sportschool"
 
@@ -38,28 +38,28 @@ msgstr ""
 "nieuwe geregistreerde gebruikers aan deze sportschool toevoegen en alle "
 "bestaande gebruikers zonder sportschool bijwerken."
 
-#: config/views/gym_config.py:42 core/templates/language/view.html:67
-#: core/templates/license/list.html:17 core/templates/misc/license/list.html:18
+#: config/views/gym_config.py:42 core/templates/language/view.html:64
+#: core/templates/license/list.html:17
 #: core/templates/repetition_unit/list.html:18
-#: core/templates/tags/render_day.html:39
-#: core/templates/tags/render_day.html:75 core/templates/user/overview.html:204
-#: core/templates/user/overview.html:445
+#: core/templates/user/overview.html:204 core/templates/user/overview.html:467
 #: core/templates/weight_unit/list.html:18
 #: exercises/templates/categories/admin-overview.html:17
 #: exercises/templates/equipment/admin-overview.html:17
-#: exercises/templates/muscles/admin-overview.html:17
-#: gallery/views/images.py:98 gym/templates/admin_notes/list.html:32
-#: gym/templates/contract/list.html:31 gym/templates/contract/view.html:107
-#: gym/templates/contract_option/list.html:32
-#: gym/templates/contract_type/list.html:32 gym/templates/document/list.html:38
-#: gym/templates/gym/list.html:20 gym/templates/gym/list.html:46
-#: gym/templates/gym/member_list.html:87 gym/templates/gym/member_list.html:140
-#: gym/templates/gym/member_list.html:176
-#: manager/templates/calendar/day.html:68
-#: manager/templates/calendar/month.html:85
-#: manager/templates/calendar/partial_overview_table.html:18
-#: manager/templates/schedule/view.html:118
-#: nutrition/templates/ingredient/view.html:165
+#: exercises/templates/muscles/admin-overview.html:16
+#: gallery/views/images.py:98 gym/templates/admin_notes/list.html:31
+#: gym/templates/contract/list.html:30 gym/templates/contract/view.html:106
+#: gym/templates/contract_option/list.html:29
+#: gym/templates/contract_type/list.html:30 gym/templates/document/list.html:38
+#: gym/templates/gym/list.html:19 gym/templates/gym/list.html:48
+#: gym/templates/gym/member_list.html:94 gym/templates/gym/member_list.html:152
+#: gym/templates/gym/member_list.html:190
+#: manager/templates/calendar/day.html:67
+#: manager/templates/calendar/month.html:84
+#: manager/templates/calendar/partial_overview_table.html:16
+#: manager/templates/schedule/view.html:318
+#: manager/templates/workout/view.html:181
+#: nutrition/templates/ingredient/view.html:164
+#: nutrition/templates/ingredient/view.html:209
 #: nutrition/templates/units/list.html:19
 msgid "Edit"
 msgstr "Bewerk"
@@ -94,8 +94,8 @@ msgstr "Mijn hip workoutschema"
 msgid "Empty placeholder schedule"
 msgstr "Leeg tijdelijk schema"
 
-#: core/forms.py:69 core/templates/navigation.html:285
-#: core/templates/navigation.html:291 core/templates/user/login.html:4
+#: core/forms.py:69 core/templates/navigation.html:284
+#: core/templates/navigation.html:290 core/templates/user/login.html:4
 #: software/templates/features.html:82 software/templates/features.html:427
 msgid "Login"
 msgstr "Aanmelden"
@@ -105,14 +105,14 @@ msgstr "Aanmelden"
 msgid "First name"
 msgstr "Voornaam"
 
-#: core/forms.py:109 core/forms.py:215 core/templates/user/overview.html:266
+#: core/forms.py:109 core/forms.py:215 core/templates/user/overview.html:284
 #: gym/views/export.py:62 gym/views/gym.py:217
 msgid "Last name"
 msgstr "Achternaam"
 
-#: core/forms.py:111 core/forms.py:180 core/templates/user/overview.html:270
+#: core/forms.py:111 core/forms.py:180 core/templates/user/overview.html:288
 #: gym/models/contract.py:256 gym/models/gym.py:58
-#: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:104
+#: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:116
 #: gym/templates/gym/new_user.html:30 gym/views/export.py:60
 #: mailer/templates/mailer/gym/form.html:4
 #: mailer/templates/mailer/gym/overview.html:4
@@ -143,8 +143,8 @@ msgstr "Workout-herinneringen"
 msgid "Other settings"
 msgstr "Overige instellingen"
 
-#: core/forms.py:174 core/views/user.py:624 core/views/user.py:639
-#: core/views/user.py:651 gym/forms.py:73 manager/templates/log/add.html:65
+#: core/forms.py:174 core/views/user.py:623 core/views/user.py:638
+#: core/views/user.py:650 gym/forms.py:73 manager/templates/log/add.html:65
 #: manager/templates/set/add.html:70 manager/views/workout.py:203
 #: utils/generic_views.py:143
 msgid "Save"
@@ -169,26 +169,25 @@ msgstr "Wachtwoord"
 msgid "Please enter your current password."
 msgstr "Gelieve je huidige wachtwoord in te geven."
 
-#: core/forms.py:242 core/templates/language/view.html:73
-#: core/templates/license/list.html:19 core/templates/misc/license/list.html:22
-#: core/templates/repetition_unit/list.html:20
-#: core/templates/tags/render_day.html:45
-#: core/templates/tags/render_day.html:81 core/templates/user/overview.html:217
-#: core/templates/weight_unit/list.html:20
-#: exercises/templates/categories/admin-overview.html:19
-#: exercises/templates/equipment/admin-overview.html:19
-#: exercises/templates/muscles/admin-overview.html:19
-#: gym/templates/admin_notes/list.html:40
-#: gym/templates/contract_option/list.html:41
-#: gym/templates/contract_type/list.html:41 gym/templates/document/list.html:46
-#: gym/templates/gym/list.html:22 manager/templates/calendar/day.html:73
-#: manager/templates/calendar/month.html:89
-#: manager/templates/calendar/partial_overview_table.html:23
-#: manager/templates/schedule/view.html:122
-#: manager/templates/workout/view.html:188
-#: nutrition/templates/ingredient/view.html:166
+#: core/forms.py:242 core/templates/language/view.html:70
+#: core/templates/license/list.html:21
+#: core/templates/repetition_unit/list.html:22
+#: core/templates/user/overview.html:233
+#: core/templates/weight_unit/list.html:22
+#: exercises/templates/categories/admin-overview.html:21
+#: exercises/templates/equipment/admin-overview.html:21
+#: exercises/templates/muscles/admin-overview.html:20
+#: gym/templates/admin_notes/list.html:37
+#: gym/templates/contract_option/list.html:35
+#: gym/templates/contract_type/list.html:36 gym/templates/document/list.html:46
+#: gym/templates/gym/list.html:23 manager/templates/calendar/day.html:73
+#: manager/templates/calendar/month.html:88
+#: manager/templates/calendar/partial_overview_table.html:22
+#: manager/templates/schedule/view.html:324
+#: manager/templates/workout/view.html:202
+#: nutrition/templates/ingredient/view.html:168
 #: nutrition/templates/ingredient/view.html:215
-#: nutrition/templates/units/list.html:22
+#: nutrition/templates/units/list.html:25
 msgid "Delete"
 msgstr "Verwijder"
 
@@ -200,9 +199,9 @@ msgstr "Ongeldig wachtwoord"
 msgid "The form is secured with reCAPTCHA"
 msgstr "Dit formulier is beveiligd met reCAPTCHA"
 
-#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:285
-#: core/templates/navigation.html:297 core/templates/template.html:149
-#: core/templates/user/login.html:20 core/views/user.py:298
+#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:284
+#: core/templates/navigation.html:296 core/templates/template.html:151
+#: core/templates/user/login.html:20 core/views/user.py:297
 #: software/templates/features.html:87 software/templates/features.html:422
 msgid "Register"
 msgstr "Registreer"
@@ -457,18 +456,18 @@ msgid "The sum of all hours has to be 24"
 msgstr "Het toaal van alle uren moet 24 zijn"
 
 #: core/models/rep_unit.py:36 core/models/weight_unit.py:36
-#: core/templates/user/overview.html:262 core/views/user.py:599
+#: core/templates/user/overview.html:280 core/views/user.py:598
 #: exercises/models/category.py:29 exercises/models/equipment.py:29
 #: exercises/models/exercise.py:59 exercises/models/muscle.py:36
 #: gym/models/contract.py:52 gym/models/contract.py:103 gym/models/gym.py:46
 #: gym/models/user_document.py:84 gym/templates/contract/view.html:50
-#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:96
+#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:108
 #: gym/views/gym.py:158 manager/models/schedule.py:55
 #: manager/models/workout.py:57 measurements/models/category.py:36
 #: nutrition/models/ingredient.py:111
-#: nutrition/models/ingredient_category.py:27 nutrition/models/meal.py:67
+#: nutrition/models/ingredient_category.py:27 nutrition/models/meal.py:65
 #: nutrition/models/weight_unit.py:38
-#: nutrition/templates/ingredient/view.html:152
+#: nutrition/templates/ingredient/view.html:151
 msgid "Name"
 msgstr "Naam"
 
@@ -520,7 +519,7 @@ msgstr ""
 msgid "Back to \"%(target)s\""
 msgstr "Terug naar \"%(target)s\""
 
-#: core/templates/delete.html:15
+#: core/templates/delete.html:4
 msgid "Are you sure you want to delete this? This action cannot be undone."
 msgstr ""
 "Weet je zeker dit je d wil verwijderen? Deze actie kan niet ongedaan worden "
@@ -574,7 +573,7 @@ msgstr "Aub, klik op de volgende link om je email te bevestigen %(link)s"
 msgid "Dashboard"
 msgstr "Dashboard"
 
-#: core/templates/language/overview.html:4 core/templates/navigation.html:345
+#: core/templates/language/overview.html:4 core/templates/navigation.html:344
 msgid "Languages"
 msgstr "Talen"
 
@@ -584,83 +583,72 @@ msgstr "Niets gevonden."
 
 #: core/templates/language/overview.html:22
 #: manager/templates/calendar/month.html:132
-#: manager/templates/schedule/overview.html:28
-#: manager/templates/schedule/view.html:144
+#: manager/templates/schedule/view.html:154
 #: manager/templates/workout/overview.html:28
 #: nutrition/templates/ingredient/overview.html:38
 msgid "Add one now."
 msgstr "Voeg er een toe."
 
-#: core/templates/language/overview.html:35 core/templates/license/list.html:40
-#: core/templates/misc/license/list.html:43
-#: core/templates/repetition_unit/list.html:43
-#: core/templates/user/overview.html:326 core/templates/user/overview.html:365
-#: core/templates/user/overview.html:401
-#: core/templates/weight_unit/list.html:43 core/views/languages.py:74
+#: core/templates/language/overview.html:34 core/templates/license/list.html:43
+#: core/templates/repetition_unit/list.html:46
+#: core/templates/user/overview.html:344 core/templates/user/overview.html:384
+#: core/templates/user/overview.html:422
+#: core/templates/weight_unit/list.html:46 core/views/languages.py:74
 #: core/views/license.py:66 core/views/repetition_units.py:66
 #: core/views/weight_units.py:66
-#: exercises/templates/categories/admin-overview.html:38
-#: gallery/views/images.py:63 gym/templates/admin_notes/list.html:67
-#: gym/templates/contract/list.html:73
-#: gym/templates/contract_option/list.html:72
-#: gym/templates/contract_type/list.html:72 gym/templates/document/list.html:79
-#: gym/templates/gym/member_list.html:211
-#: gym/templates/gym/member_list.html:244
-#: gym/templates/gym/member_list.html:281
+#: exercises/templates/categories/admin-overview.html:40
+#: exercises/templates/equipment/admin-overview.html:39
+#: exercises/templates/muscles/admin-overview.html:40
+#: gallery/views/images.py:63 gym/templates/admin_notes/list.html:64
+#: gym/templates/contract/list.html:69
+#: gym/templates/contract_option/list.html:65
+#: gym/templates/contract_type/list.html:66 gym/templates/document/list.html:78
+#: gym/templates/gym/member_list.html:228
+#: gym/templates/gym/member_list.html:264
+#: gym/templates/gym/member_list.html:303
 #: mailer/templates/mailer/gym/overview.html:43
+#: nutrition/templates/ingredient/overview.html:60
 msgid "Add"
 msgstr "Aanmaken"
 
 #: core/templates/language/view.html:61 core/templates/user/api_key.html:44
-#: core/templates/user/preferences.html:45 gym/models/contract.py:203
-#: gym/templates/contract/view.html:41 gym/templates/contract/view.html:106
-#: gym/templates/gym/member_list.html:248
-#: manager/templates/schedule/view.html:285
-#: manager/templates/workout/view.html:163
-#: nutrition/templates/ingredient/view.html:202
+#: core/templates/user/preferences.html:50 gym/models/contract.py:203
+#: gym/templates/contract/view.html:41 gym/templates/gym/member_list.html:270
+#: manager/templates/schedule/view.html:304
+#: manager/templates/workout/view.html:177
+#: nutrition/templates/ingredient/view.html:206
 msgid "Options"
 msgstr "Opties"
 
-#: core/templates/license/list.html:4 core/templates/misc/license/list.html:4
+#: core/templates/license/list.html:4
 msgid "License list"
 msgstr "Licentielijst"
 
-#: core/templates/license/list.html:26 core/templates/misc/license/list.html:30
-#: core/templates/repetition_unit/list.html:28
+#: core/templates/license/list.html:30
+#: core/templates/repetition_unit/list.html:32
 #: core/templates/user/overview.html:104 core/templates/user/overview.html:136
-#: core/templates/user/overview.html:185 core/templates/user/overview.html:347
-#: core/templates/user/overview.html:383 core/templates/user/overview.html:427
-#: core/templates/weight_unit/list.html:28
-#: exercises/templates/categories/admin-overview.html:26
-#: exercises/templates/equipment/admin-overview.html:26
-#: exercises/templates/muscles/admin-overview.html:26
-#: gym/templates/admin_notes/list.html:52 gym/templates/contract/list.html:60
-#: gym/templates/contract_option/list.html:58
-#: gym/templates/contract_type/list.html:58 gym/templates/document/list.html:64
-#: gym/templates/gym/list.html:29 gym/templates/gym/member_list.html:229
-#: gym/templates/gym/member_list.html:262
-#: gym/templates/gym/member_list.html:299
+#: core/templates/user/overview.html:185 core/templates/user/overview.html:365
+#: core/templates/user/overview.html:404 core/templates/user/overview.html:448
+#: core/templates/weight_unit/list.html:32
+#: exercises/templates/categories/admin-overview.html:30
+#: exercises/templates/equipment/admin-overview.html:30
+#: exercises/templates/muscles/admin-overview.html:29
+#: gym/templates/admin_notes/list.html:50 gym/templates/contract/list.html:57
+#: gym/templates/contract_option/list.html:52
+#: gym/templates/contract_type/list.html:53 gym/templates/document/list.html:64
+#: gym/templates/gym/list.html:32 gym/templates/gym/member_list.html:248
+#: gym/templates/gym/member_list.html:284
+#: gym/templates/gym/member_list.html:321
 #: mailer/templates/mailer/gym/overview.html:30
-#: manager/templates/calendar/day.html:87
-#: nutrition/templates/units/list.html:29
+#: manager/templates/calendar/day.html:88
+#: nutrition/templates/units/list.html:34
 msgid "Nothing found"
 msgstr "Niets gevonden"
 
-#: core/templates/misc/about.html:4 core/templates/template.html:175
+#: core/templates/misc/about.html:4 core/templates/template.html:188
 msgid "Imprint"
 msgstr "Afdruk"
 
-#: core/templates/misc/license/list.html:47
-#, fuzzy
-msgid ""
-"If a license has been localized, e.g. the Creative Commons\n"
-"            licenses for the different countries, add them as separate "
-"entries here."
-msgstr ""
-"Als een licentie werd gelokaliseerd, zoals bvb. de Creative Commons\n"
-"licenties voor verschillende landen, voeg ze ze dan hier toe als aparte "
-"ingaven."
-
 #: core/templates/navigation.html:28 software/templates/features.html:437
 msgid "Training"
 msgstr "Training"
@@ -705,8 +693,8 @@ msgstr "Publieke schemas"
 msgid "Exercises"
 msgstr "Oefeningen"
 
-#: core/templates/navigation.html:111 core/templates/navigation.html:184
-#: core/templates/navigation.html:340
+#: core/templates/navigation.html:111 core/templates/navigation.html:185
+#: core/templates/navigation.html:339
 msgid "Administration"
 msgstr "Administratie"
 
@@ -744,87 +732,87 @@ msgstr "BMI-calculator"
 msgid "Daily calories calculator"
 msgstr "Dagelijkse calorieëncalculator"
 
-#: core/templates/navigation.html:179
+#: core/templates/navigation.html:180
 #: nutrition/templates/ingredient/overview.html:10
 msgid "Ingredient overview"
 msgstr "Ingrediëntenoverzicht"
 
-#: core/templates/navigation.html:187 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:189 nutrition/templates/units/list.html:6
 msgid "Ingredient weight units"
 msgstr "Gewichteenheden ingrediënt"
 
-#: core/templates/navigation.html:203 software/templates/features.html:442
+#: core/templates/navigation.html:205 software/templates/features.html:442
 msgid "Body weight"
 msgstr "Lichaamsgewicht"
 
-#: core/templates/navigation.html:210 core/templates/user/overview.html:114
+#: core/templates/navigation.html:212 core/templates/user/overview.html:114
 msgid "Weight overview"
 msgstr "Gewichtsoverzicht"
 
-#: core/templates/navigation.html:217 weight/views.py:65
+#: core/templates/navigation.html:216 weight/views.py:65
 msgid "Add weight entry"
 msgstr "Voeg gewichtmeting toe"
 
-#: core/templates/navigation.html:231
+#: core/templates/navigation.html:230
 msgid "About this software"
 msgstr "Over deze software"
 
-#: core/templates/navigation.html:237 software/templates/about_us.html:5
+#: core/templates/navigation.html:236 software/templates/about_us.html:5
 msgid "About us"
 msgstr "Over ons"
 
-#: core/templates/navigation.html:243 software/templates/features.html:507
+#: core/templates/navigation.html:242 software/templates/features.html:507
 msgid "REST API"
 msgstr "REST API"
 
-#: core/templates/navigation.html:249 utils/models.py:45
+#: core/templates/navigation.html:248 utils/models.py:45
 msgid "License"
 msgstr "Licentie"
 
-#: core/templates/navigation.html:255
+#: core/templates/navigation.html:254
 msgid "Developer documentation"
 msgstr "Developer documentatie"
 
-#: core/templates/navigation.html:262
+#: core/templates/navigation.html:261
 msgid "Get the code"
 msgstr "Download de code"
 
-#: core/templates/navigation.html:269 core/templates/template.html:214
+#: core/templates/navigation.html:268 core/templates/template.html:227
 #: software/templates/features.html:582
 msgid "Translate"
 msgstr "Vertaal"
 
-#: core/templates/navigation.html:303 core/templates/user/login.html:28
+#: core/templates/navigation.html:302 core/templates/user/login.html:28
 msgid "Reset password"
 msgstr "Reset wachtwoord"
 
-#: core/templates/navigation.html:321
+#: core/templates/navigation.html:320
 msgid "My preferences"
 msgstr "Mijn voorkeuren"
 
-#: core/templates/navigation.html:330
+#: core/templates/navigation.html:329
 msgid "Logout"
 msgstr "Afmelden"
 
-#: core/templates/navigation.html:353
+#: core/templates/navigation.html:352
 msgid "Licenses"
 msgstr "Licenties"
 
-#: core/templates/navigation.html:361
+#: core/templates/navigation.html:360
 #: core/templates/repetition_unit/list.html:4
 msgid "Repetition units"
 msgstr "Herhalingen"
 
-#: core/templates/navigation.html:369 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:368 core/templates/weight_unit/list.html:4
 #: nutrition/templates/ingredient/view.html:141
 msgid "Weight units"
 msgstr "Gewichteenheden"
 
-#: core/templates/navigation.html:377 core/templates/user/list.html:4
+#: core/templates/navigation.html:376 core/templates/user/list.html:4
 msgid "User list"
 msgstr "Gebruikerslijst"
 
-#: core/templates/navigation.html:383
+#: core/templates/navigation.html:382
 msgid "Gyms"
 msgstr "Gyms"
 
@@ -888,56 +876,31 @@ msgstr "vorige"
 msgid "next"
 msgstr "volgende"
 
-#: core/templates/tags/render_day.html:34
-msgid "Add weight log"
-msgstr "Voeg gewichtlog toe"
-
-#: core/templates/tags/render_day.html:116
-msgid "Placeholder image for exercise"
+#: core/templates/tags/render_day.html:44
+#, fuzzy
+#| msgid "Placeholder image for exercise"
+msgid "Placeholder image for translation"
 msgstr "Aanduiding afbeelding voor oefening"
 
-#: core/templates/tags/render_day.html:133
-msgid "This exercise has no repetitions."
-msgstr "Deze oefening heeft geen herhalingen."
-
-#: core/templates/tags/render_day.html:136
-msgid "Edit them now."
-msgstr "Bewerk ze nu."
-
-#: core/templates/tags/render_day.html:162
-msgid "Add exercises to this workout day"
-msgstr "Oefeningen toevoegen aan deze workout-dag."
-
-#: core/templates/tags/render_weight_log.html:17 manager/helpers.py:86
-#: manager/models/setting.py:72 manager/templates/set/formset.html:9
-msgid "Reps"
-msgstr "Herhalingen"
-
-#: core/templates/tags/render_weight_log.html:30 manager/forms.py:191
-#: manager/models/log.py:103 manager/models/setting.py:102
-#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
-msgid "RiR"
-msgstr "RiR"
-
-#: core/templates/template.html:122 manager/templates/calendar/month.html:138
-#: manager/templates/schedule/view.html:248
-#: manager/templates/schedule/view.html:269
-#: manager/templates/workout/view.html:84
-#: manager/templates/workout/view.html:137
+#: core/templates/template.html:124 manager/templates/calendar/month.html:138
+#: manager/templates/schedule/view.html:262
+#: manager/templates/schedule/view.html:287
+#: manager/templates/workout/view.html:89
+#: manager/templates/workout/view.html:149
 msgid "Close"
 msgstr "Sluit"
 
-#: core/templates/template.html:138
+#: core/templates/template.html:140
 msgid ""
 "You are using a guest account, data entered will be deleted after a week."
 msgstr ""
 "Je gebruikt een gastaccount, ingevoerde data wordt verwijderd na een week."
 
-#: core/templates/template.html:143
+#: core/templates/template.html:145
 msgid "Create some demo entries"
 msgstr "Maak wat demo-ingaven aan"
 
-#: core/templates/template.html:180 software/templates/features.html:547
+#: core/templates/template.html:193 software/templates/features.html:547
 #: software/templates/tos.html:7
 msgid "Terms of service"
 msgstr "Algemene voorwaarden"
@@ -946,7 +909,7 @@ msgstr "Algemene voorwaarden"
 msgid "Features"
 msgstr "Functies"
 
-#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:54
+#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:59
 msgid "API key"
 msgstr "API sleutel"
 
@@ -991,17 +954,17 @@ msgstr "Genereer nieuwe API-sleutel"
 msgid "Documentation"
 msgstr "Documentatie"
 
-#: core/templates/user/delete_account.html:4
-#: core/templates/user/preferences.html:59
+#: core/templates/user/delete_account.html:3
+#: core/templates/user/preferences.html:62
 msgid "Delete account"
 msgstr "Verwijder account"
 
-#: core/templates/user/delete_account.html:17
+#: core/templates/user/delete_account.html:9
 #: exercises/templates/history/overview.html:93
 msgid "Are you sure?"
 msgstr "Ben je zeker?"
 
-#: core/templates/user/delete_account.html:22
+#: core/templates/user/delete_account.html:14
 #, python-format
 msgid ""
 "This action will delete the user account \"%(username)s\".\n"
@@ -1022,22 +985,22 @@ msgstr "Wachtwoord vergeten?"
 
 #: core/templates/user/overview.html:25 core/templates/user/overview.html:68
 #: core/templates/user/overview.html:112 core/templates/user/overview.html:144
-#: core/templates/user/overview.html:330 core/templates/user/overview.html:369
-#: core/templates/user/overview.html:405
+#: core/templates/user/overview.html:348 core/templates/user/overview.html:390
+#: core/templates/user/overview.html:426
 #, python-format
 msgid "last %(number)s"
 msgstr "laatste %(number)s"
 
 #: core/templates/user/overview.html:27 core/templates/user/overview.html:146
-#: core/templates/user/overview.html:325 core/templates/user/overview.html:364
-#: core/templates/user/overview.html:400 gym/templates/gym/member_list.html:210
-#: gym/templates/gym/member_list.html:243
-#: gym/templates/gym/member_list.html:280
+#: core/templates/user/overview.html:343 core/templates/user/overview.html:382
+#: core/templates/user/overview.html:421 gym/templates/gym/member_list.html:226
+#: gym/templates/gym/member_list.html:262
+#: gym/templates/gym/member_list.html:302
 msgid "Overview"
 msgstr "Overzicht"
 
 #: core/templates/user/overview.html:28
-#: manager/templates/schedule/view.html:163
+#: manager/templates/schedule/view.html:172
 #: manager/templates/workout/overview.html:39 manager/views/schedule_step.py:60
 msgid "Add workout"
 msgstr "Workout toevoegen"
@@ -1069,38 +1032,36 @@ msgstr "Beschrijving"
 msgid "Number of logs (days)"
 msgstr "Aantal logs (dagen)"
 
-#: core/templates/user/overview.html:37 core/views/user.py:600
+#: core/templates/user/overview.html:37 core/views/user.py:599
 #: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:158
 msgid "Last activity"
 msgstr "Laatste activiteit"
 
 #: core/templates/user/overview.html:58
 #: manager/templates/calendar/month.html:128
-#: manager/templates/schedule/view.html:144
 #: manager/templates/workout/overview.html:28
 msgid "No workouts found."
 msgstr "Geen workouts gevonden."
 
 #: core/templates/user/overview.html:68 manager/forms.py:280
-#: manager/templates/workout/view.html:106
+#: manager/templates/workout/view.html:114
 msgid "Log"
 msgstr "Log"
 
 #: core/templates/user/overview.html:77 manager/models/session.py:83
-#: manager/templates/calendar/partial_overview_table.html:52
+#: manager/templates/calendar/partial_overview_table.html:54
 msgid "General impression"
 msgstr "Algemene indruk"
 
-#: core/templates/user/overview.html:78 core/templates/user/overview.html:369
+#: core/templates/user/overview.html:78 core/templates/user/overview.html:390
 #: manager/models/session.py:73
-#: manager/templates/calendar/partial_overview_table.html:56
-#: manager/templates/workout/log.html:89
+#: manager/templates/calendar/partial_overview_table.html:58
 msgid "Notes"
 msgstr "Notities"
 
 #: core/templates/user/overview.html:79
 #: exercises/templates/history/overview.html:30
-#: manager/templates/calendar/partial_overview_table.html:42
+#: manager/templates/calendar/partial_overview_table.html:44
 msgid "Time"
 msgstr "Tijd"
 
@@ -1138,121 +1099,121 @@ msgstr "Vet"
 msgid "kcal"
 msgstr "kcal"
 
-#: core/templates/user/overview.html:201 core/templates/user/overview.html:322
-#: core/templates/user/overview.html:361 core/templates/user/overview.html:397
-#: core/templates/user/overview.html:442 gym/templates/gym/list.html:42
-#: gym/templates/gym/member_list.html:84 gym/templates/gym/member_list.html:137
-#: gym/templates/gym/member_list.html:173
-#: gym/templates/gym/member_list.html:207
-#: gym/templates/gym/member_list.html:240
-#: gym/templates/gym/member_list.html:277
-#: manager/templates/schedule/view.html:100
+#: core/templates/user/overview.html:201 core/templates/user/overview.html:340
+#: core/templates/user/overview.html:379 core/templates/user/overview.html:418
+#: core/templates/user/overview.html:463 gym/templates/gym/list.html:45
+#: gym/templates/gym/member_list.html:91 gym/templates/gym/member_list.html:149
+#: gym/templates/gym/member_list.html:187
+#: gym/templates/gym/member_list.html:223
+#: gym/templates/gym/member_list.html:259
+#: gym/templates/gym/member_list.html:299
+#: manager/templates/schedule/view.html:99
 msgid "Actions"
 msgstr "Acties"
 
-#: core/templates/user/overview.html:207
+#: core/templates/user/overview.html:210
 msgid "Deactivate user"
 msgstr "Gebruiker deactiveren"
 
-#: core/templates/user/overview.html:209
+#: core/templates/user/overview.html:214
 msgid "Activate user"
 msgstr "Activeer gebruiker"
 
-#: core/templates/user/overview.html:211
+#: core/templates/user/overview.html:223
 msgid "Reset user password"
 msgstr "Reset gebruikers wachtwoord"
 
-#: core/templates/user/overview.html:214 gym/templates/gym/member_list.html:30
+#: core/templates/user/overview.html:227 gym/templates/gym/member_list.html:30
 msgid "Roles"
 msgstr "Rollen"
 
-#: core/templates/user/overview.html:225
+#: core/templates/user/overview.html:243
 msgid "Password reset confirmation"
 msgstr "Bevestiging wachtwoord-reset"
 
-#: core/templates/user/overview.html:229
+#: core/templates/user/overview.html:247
 msgid "Do you really want to change this user&#39;s password?"
 msgstr "Weet je zeker dat je het wachtwoord van deze gebruiker wilt wijzigen?"
 
-#: core/templates/user/overview.html:232
+#: core/templates/user/overview.html:250
 #: exercises/templates/history/overview.html:106
 msgid "No"
 msgstr "Nee"
 
-#: core/templates/user/overview.html:233
+#: core/templates/user/overview.html:251
 #: exercises/templates/history/overview.html:99
 msgid "Yes"
 msgstr "Ja"
 
-#: core/templates/user/overview.html:254 gym/templates/gym/member_list.html:93
+#: core/templates/user/overview.html:272 gym/templates/gym/member_list.html:105
 msgid "Details"
 msgstr "Details"
 
-#: core/templates/user/overview.html:258 gym/views/export.py:57
-#: manager/helpers.py:86 manager/templates/schedule/view.html:98
+#: core/templates/user/overview.html:276 gym/views/export.py:57
+#: manager/helpers.py:86 manager/templates/schedule/view.html:97
 msgid "Nr."
 msgstr "Nr."
 
-#: core/templates/user/overview.html:280 gym/models/contract.py:287
+#: core/templates/user/overview.html:298 gym/models/contract.py:287
 #: gym/models/gym.py:50 gym/templates/contract/view.html:75
-#: gym/templates/gym/member_list.html:100 gym/views/export.py:68
+#: gym/templates/gym/member_list.html:112 gym/views/export.py:68
 msgid "Phone"
 msgstr "Telefoon"
 
-#: core/templates/user/overview.html:284 gym/templates/contract/view.html:87
-#: gym/templates/gym/member_list.html:118
+#: core/templates/user/overview.html:302 gym/templates/contract/view.html:87
+#: gym/templates/gym/member_list.html:130
 msgid "Address"
 msgstr "Adres"
 
-#: core/templates/user/overview.html:295
+#: core/templates/user/overview.html:313
 msgid "Registered"
 msgstr "Geregistreerd"
 
-#: core/templates/user/overview.html:299
+#: core/templates/user/overview.html:317
 msgid "Last login"
 msgstr "Laatste aanmelding"
 
-#: core/templates/user/overview.html:304
+#: core/templates/user/overview.html:322
 msgid "Status"
 msgstr "Status"
 
-#: core/templates/user/overview.html:307
+#: core/templates/user/overview.html:325
 msgid "Active"
 msgstr "Actief"
 
-#: core/templates/user/overview.html:309
+#: core/templates/user/overview.html:327
 msgid "Inactive"
 msgstr "Inactief"
 
-#: core/templates/user/overview.html:330 gym/templates/contract/list.html:4
-#: gym/templates/gym/member_list.html:202
+#: core/templates/user/overview.html:348 gym/templates/contract/list.html:4
+#: gym/templates/gym/member_list.html:218
 msgid "Contracts"
 msgstr "Contracten"
 
-#: core/templates/user/overview.html:405 gym/templates/document/list.html:4
+#: core/templates/user/overview.html:426 gym/templates/document/list.html:4
 msgid "Documents"
 msgstr "Documenten"
 
-#: core/templates/user/overview.html:412 gym/templates/document/list.html:32
-#: manager/forms.py:292 manager/templates/workout/view.html:132
+#: core/templates/user/overview.html:433 gym/templates/document/list.html:33
+#: manager/forms.py:292 manager/templates/workout/view.html:143
 msgid "Download"
 msgstr "Download"
 
-#: core/templates/user/overview.html:450 gym/views/admin_config.py:44
+#: core/templates/user/overview.html:474 gym/views/admin_config.py:44
 #: gym/views/admin_config.py:58 gym/views/user_config.py:46
 msgid "Configuration"
 msgstr "Configuratie"
 
-#: core/templates/user/overview.html:453 gym/models/user_config.py:92
+#: core/templates/user/overview.html:477 gym/models/user_config.py:92
 msgid "Include in inactive overview"
 msgstr "Opnemen in inactief overzicht"
 
-#: core/templates/user/overview.html:486
+#: core/templates/user/overview.html:510
 #, python-format
 msgid "Admin login is only available for users in %(gym_name)s"
 msgstr "Inloggen voor beheerders is enkel beschikbaar in %(gym_name)s"
 
-#: core/templates/user/overview.html:490
+#: core/templates/user/overview.html:514
 msgid "Log in as this user"
 msgstr "Aanmelden als deze gebruiker"
 
@@ -1272,19 +1233,19 @@ msgstr "Onbevestigde email"
 msgid "Send verification email"
 msgstr "Verstuur bevestigingsemail"
 
-#: core/templates/user/preferences.html:30
+#: core/templates/user/preferences.html:31
 msgid "You need to verify your email to contribute exercises"
 msgstr "Je moet jouw email bevestigen om bij te dragen aan oefeningen"
 
-#: core/templates/user/preferences.html:50 core/views/user.py:611
+#: core/templates/user/preferences.html:55 core/views/user.py:610
 msgid "Change password"
 msgstr "Verander wachtwoord"
 
-#: core/templatetags/wger_extras.py:205 i18n.tpl:37
+#: core/templatetags/wger_extras.py:197 i18n.tpl:37
 msgid "kg"
 msgstr "kg"
 
-#: core/templatetags/wger_extras.py:207
+#: core/templatetags/wger_extras.py:199
 #: nutrition/templates/ingredient/view.html:60
 #: nutrition/templates/ingredient/view.html:66
 #: nutrition/templates/ingredient/view.html:73
@@ -1296,11 +1257,11 @@ msgctxt "weight unit, i.e. grams"
 msgid "g"
 msgstr "g"
 
-#: core/templatetags/wger_extras.py:210 i18n.tpl:38
+#: core/templatetags/wger_extras.py:202 i18n.tpl:38
 msgid "lb"
 msgstr "lb"
 
-#: core/templatetags/wger_extras.py:212
+#: core/templatetags/wger_extras.py:204
 msgctxt "weight unit, i.e. ounces"
 msgid "oz"
 msgstr "oz"
@@ -1327,13 +1288,13 @@ msgid "Delete {0}?"
 msgstr "Verwijder {0}?"
 
 #: core/views/languages.py:111 core/views/license.py:85
-#: core/views/repetition_units.py:86 core/views/user.py:474
+#: core/views/repetition_units.py:86 core/views/user.py:473
 #: core/views/weight_units.py:86 exercises/views/categories.py:98
 #: exercises/views/equipment.py:81 exercises/views/muscles.py:87
 #: gym/views/admin_notes.py:161 gym/views/config.py:68
 #: gym/views/contract.py:186 gym/views/contract_option.py:123
 #: gym/views/contract_type.py:123 gym/views/document.py:171
-#: gym/views/gym.py:463 manager/views/day.py:100 manager/views/schedule.py:333
+#: gym/views/gym.py:463 manager/views/day.py:96 manager/views/schedule.py:333
 #: manager/views/workout.py:267 nutrition/views/ingredient.py:145
 #: nutrition/views/unit.py:143
 #, python-brace-format
@@ -1362,48 +1323,48 @@ msgstr "Insturen"
 msgid "Your feedback was successfully sent. Thank you!"
 msgstr "Je feedback werd met succes verzonden. Bedankt!"
 
-#: core/views/user.py:156
+#: core/views/user.py:155
 #, python-brace-format
 msgid "Account \"{0}\" was successfully deleted"
 msgstr "Account \"{0}\" werd met succes verwijderd"
 
-#: core/views/user.py:292
+#: core/views/user.py:291
 msgid "You were successfully registered"
 msgstr "Je bent met succes geregistreerd"
 
-#: core/views/user.py:351
+#: core/views/user.py:350
 msgid "Settings successfully updated"
 msgstr "Instellingen met succes aangepast"
 
-#: core/views/user.py:390
+#: core/views/user.py:389
 msgid "The user was successfully deactivated"
 msgstr "De gebruiker werd met succes gedeactiveerd"
 
-#: core/views/user.py:427
+#: core/views/user.py:426
 msgid "The user was successfully activated"
 msgstr "De gebruiker werd met succes geactiveerd"
 
-#: core/views/user.py:442
+#: core/views/user.py:441
 msgid "Edit user"
 msgstr "Bewerk gebruiker"
 
-#: core/views/user.py:597 gym/templates/gym/member_list.html:26
+#: core/views/user.py:596 gym/templates/gym/member_list.html:26
 #: gym/views/gym.py:158
 msgid "ID"
 msgstr "ID"
 
-#: core/views/user.py:598 gym/forms.py:95 gym/templates/contract/view.html:55
+#: core/views/user.py:597 gym/forms.py:95 gym/templates/contract/view.html:55
 #: gym/templates/gym/member_list.html:27 gym/views/export.py:59
 #: gym/views/gym.py:158 gym/views/gym.py:217
 msgid "Username"
 msgstr "Gebruikersnaam"
 
-#: core/views/user.py:601 gym/templates/gym/new_user.html:34
+#: core/views/user.py:600 gym/templates/gym/new_user.html:34
 #: gym/views/export.py:58 gym/views/gym.py:217
 msgid "Gym"
 msgstr "Gym"
 
-#: core/views/user.py:660
+#: core/views/user.py:659
 #, python-format
 msgid "A verification email was sent to %(email)s"
 msgstr "Een bevestigingsmail is verstuurd naar %(email)s"
@@ -1558,11 +1519,6 @@ msgstr "Codec, lange naam"
 msgid "Equipment list"
 msgstr "Materiaallijst"
 
-#: exercises/templates/equipment/admin-overview.html:39
-#: exercises/views/equipment.py:92
-msgid "Add new equipment"
-msgstr "Materiaal toevoegen"
-
 #: exercises/templates/history/overview.html:11
 #, fuzzy
 msgid "Exercise admin history"
@@ -1613,11 +1569,6 @@ msgstr "Draai veranderingen terug"
 msgid "Muscle overview"
 msgstr "Spieroverzicht"
 
-#: exercises/templates/muscles/admin-overview.html:38
-#: exercises/views/muscles.py:68
-msgid "Add muscle"
-msgstr "Creëer spier"
-
 #: exercises/views/categories.py:72
 msgid "Add category"
 msgstr "Creëer categorie"
@@ -1626,6 +1577,10 @@ msgstr "Creëer categorie"
 msgid "This will also delete all exercises in this category."
 msgstr "Dit zal ook alle oefeningen in deze categorie verwijderen."
 
+#: exercises/views/equipment.py:92
+msgid "Add new equipment"
+msgstr "Materiaal toevoegen"
+
 #: exercises/views/equipment.py:104 exercises/views/equipment.py:115
 msgid "Delete equipment?"
 msgstr "Materiaal verwijderen?"
@@ -1634,6 +1589,10 @@ msgstr "Materiaal verwijderen?"
 msgid "This will delete the exercise from all workouts."
 msgstr "Dit zal de oefening van alle workouts verwijderen."
 
+#: exercises/views/muscles.py:68
+msgid "Add muscle"
+msgstr "Creëer spier"
+
 #: gallery/templates/images/overview.html:62
 #, fuzzy
 msgid "Add image"
@@ -1721,7 +1680,7 @@ msgid "Contract is active"
 msgstr "Contract is actief"
 
 #: gym/models/contract.py:237 gym/templates/contract/view.html:69
-#: manager/models/schedule.py:61 manager/templates/schedule/view.html:67
+#: manager/models/schedule.py:61 manager/templates/schedule/view.html:66
 msgid "Start date"
 msgstr "Startdatum"
 
@@ -1757,7 +1716,7 @@ msgstr "Beheerder: kan gebruikers van een gym beheren"
 msgid "Admin: can administrate the different gyms"
 msgstr "Beheerder: kan de verschillende gyms beheren"
 
-#: gym/models/gym.py:65 gym/templates/gym/member_list.html:114
+#: gym/models/gym.py:65 gym/templates/gym/member_list.html:126
 msgid "Owner"
 msgstr "Eigenaar"
 
@@ -1769,7 +1728,7 @@ msgstr ""
 "Aantal weken sinds een gebruiker voor het laatst zijn aanwezigheid logde "
 "vooraleer als inactief beschouwd te worden"
 
-#: gym/models/gym_config.py:56 gym/templates/gym/member_list.html:152
+#: gym/models/gym_config.py:56 gym/templates/gym/member_list.html:166
 msgid "Show name in header"
 msgstr "Toon naam in hoofding"
 
@@ -1782,7 +1741,7 @@ msgstr "Toon de naam van de gym in de hoofding van de site"
 msgid "Configuration for {self.gym.name}"
 msgstr "Configuratie voor {self.gym.name}"
 
-#: gym/models/user_config.py:65 gym/templates/gym/member_list.html:184
+#: gym/models/user_config.py:65 gym/templates/gym/member_list.html:200
 msgid "Overview of inactive members"
 msgstr "Overzicht van inactieve leden"
 
@@ -1806,7 +1765,7 @@ msgstr "Zal bestandsnaam gebruiken indien niets voorzien"
 msgid "User notes"
 msgstr "Gebruikersnotities"
 
-#: gym/templates/contract/list.html:36
+#: gym/templates/contract/list.html:34
 msgid "Show"
 msgstr "Toon"
 
@@ -1832,11 +1791,11 @@ msgstr "De volgende gebruikers hebben in de laatste %(weeks)s geen gym bezocht"
 msgid "Gym list"
 msgstr "Gym-lijst"
 
-#: gym/templates/gym/list.html:50
+#: gym/templates/gym/list.html:53
 msgid "Global gym configuration"
 msgstr "Globale gym-configuratie"
 
-#: gym/templates/gym/list.html:67 gym/views/gym.py:171
+#: gym/templates/gym/list.html:69 gym/views/gym.py:171
 msgid "Add new gym"
 msgstr "Nieuwe gym toevoegen"
 
@@ -1848,43 +1807,43 @@ msgstr "Beheerders en trainers"
 msgid "Gym manager"
 msgstr "Gym-beheerder"
 
-#: gym/templates/gym/member_list.html:69
+#: gym/templates/gym/member_list.html:76
 msgid "This gym has no administrators or trainers"
 msgstr "Deze gym heeft geen beheerders of trainers"
 
-#: gym/templates/gym/member_list.html:88
+#: gym/templates/gym/member_list.html:98
 msgid "Export"
 msgstr "Exporteer"
 
-#: gym/templates/gym/member_list.html:125
+#: gym/templates/gym/member_list.html:137
 msgid "Members"
 msgstr "Leden"
 
-#: gym/templates/gym/member_list.html:145
+#: gym/templates/gym/member_list.html:159
 msgid "Gym configuration"
 msgstr "Gym-configuratie"
 
-#: gym/templates/gym/member_list.html:148
+#: gym/templates/gym/member_list.html:162
 msgid "Inactive members"
 msgstr "Inactieve leden"
 
-#: gym/templates/gym/member_list.html:149
+#: gym/templates/gym/member_list.html:163
 msgid "weeks"
 msgstr "weken"
 
-#: gym/templates/gym/member_list.html:181
+#: gym/templates/gym/member_list.html:197
 msgid "My configuration"
 msgstr "Mijn configuratie"
 
-#: gym/templates/gym/member_list.html:215
+#: gym/templates/gym/member_list.html:234
 msgid "Types"
 msgstr "Types"
 
-#: gym/templates/gym/member_list.html:285
+#: gym/templates/gym/member_list.html:307
 msgid "Emails"
 msgstr "E-mails"
 
-#: gym/templates/gym/member_list.html:315
+#: gym/templates/gym/member_list.html:336
 msgid "Add member"
 msgstr "Lid toevoegen"
 
@@ -2181,28 +2140,38 @@ msgstr "Zoek ook in Engelse namen"
 msgid "Unit"
 msgstr "Eenheid"
 
+#: manager/forms.py:191 manager/models/log.py:103 manager/models/setting.py:102
+#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
+msgid "RiR"
+msgstr "RiR"
+
 #: manager/forms.py:279
 msgid "Type"
 msgstr "Type"
 
-#: manager/forms.py:280 manager/templates/workout/view.html:113
+#: manager/forms.py:280 manager/templates/workout/view.html:122
 msgid "Table"
 msgstr "Tabel"
 
-#: manager/forms.py:282 manager/templates/workout/view.html:119
+#: manager/forms.py:282 manager/templates/workout/view.html:129
 msgid "with images"
 msgstr "met afbeelding"
 
-#: manager/forms.py:283 manager/templates/workout/view.html:125
+#: manager/forms.py:283 manager/templates/workout/view.html:136
 msgid "with comments"
 msgstr "met reacties"
 
+#: manager/helpers.py:86 manager/models/setting.py:72
+#: manager/templates/set/formset.html:9
+msgid "Reps"
+msgstr "Herhalingen"
+
 #: manager/management/commands/email-reminders.py:121
 msgid "Workout will expire soon"
 msgstr "Workout zal spoedig vervallen"
 
 #: manager/models/day.py:34 manager/models/log.py:58
-#: manager/models/session.py:60 manager/templates/schedule/view.html:102
+#: manager/models/session.py:60 manager/templates/schedule/view.html:101
 #: manager/templates/workout/view.html:9 manager/templates/workout/view.html:17
 #: manager/views/pdf.py:85 manager/views/pdf.py:161
 #: manager/views/schedule.py:151 manager/views/schedule.py:221
@@ -2226,7 +2195,7 @@ msgid "Name or short description of the schedule. For example 'Program XYZ'."
 msgstr ""
 "Naam of korte beschrijving van het schema. Bijvoorbeeld \"Programma X\"."
 
-#: manager/models/schedule.py:65 manager/templates/schedule/view.html:71
+#: manager/models/schedule.py:65 manager/templates/schedule/view.html:70
 msgid "Schedule active"
 msgstr "Schema actief"
 
@@ -2240,7 +2209,7 @@ msgstr ""
 "op o.a. je dashboard). Alle andere schema's zullen dan worden gemarkeerd als "
 "inactief."
 
-#: manager/models/schedule.py:77 manager/templates/schedule/view.html:81
+#: manager/models/schedule.py:77 manager/templates/schedule/view.html:80
 msgid "Is a loop"
 msgstr "Is een herhaling"
 
@@ -2261,7 +2230,7 @@ msgid "The duration in weeks"
 msgstr "De duurtijd in weken"
 
 #: manager/models/schedule_step.py:64 manager/models/set.py:53
-#: manager/models/setting.py:113 nutrition/models/meal.py:55
+#: manager/models/setting.py:113 nutrition/models/meal.py:53
 #: nutrition/models/meal_item.py:66
 msgid "Order"
 msgstr "Volgorde"
@@ -2403,7 +2372,7 @@ msgstr "Logoverzicht"
 msgid "Workout session"
 msgstr "Trainingssessie"
 
-#: manager/templates/calendar/partial_overview_table.html:27
+#: manager/templates/calendar/partial_overview_table.html:26
 msgid "Delete with logs"
 msgstr ""
 
@@ -2427,21 +2396,27 @@ msgstr ""
 "Als er een is, zal deze worden bewerkt. Gewichtingaven worden altijd "
 "toegevoegd."
 
-#: manager/templates/schedule/overview.html:5
+#: manager/templates/schedule/overview.html:4
 msgid "Your schedules"
 msgstr "Je schema's"
 
 #: manager/templates/schedule/overview.html:19
-#: manager/templates/schedule/view.html:131
-#: manager/templates/schedule/view.html:183
+#: manager/templates/schedule/view.html:143
+#: manager/templates/schedule/view.html:193
 #: manager/templates/workout/overview.html:16
 msgid "active"
 msgstr "Actief"
 
-#: manager/templates/schedule/overview.html:28
+#: manager/templates/schedule/overview.html:27
 msgid "No schedules found."
 msgstr "Geen schema's gevonden."
 
+#: manager/templates/schedule/overview.html:28
+#, fuzzy
+#| msgid "Add one now."
+msgid "Add one now"
+msgstr "Voeg er een toe."
+
 #: manager/templates/schedule/overview.html:36
 msgid ""
 "Schedules are collections of workouts that you do in\n"
@@ -2451,19 +2426,27 @@ msgstr ""
 "na elkaar uitvoert."
 
 #: manager/templates/schedule/overview.html:39
+#, fuzzy
+#| msgid ""
+#| "You can indicate how long you want to do each workout\n"
+#| "        before jumping to the next. It is also possible to create a loop, "
+#| "so you\n"
+#| "        always do the same workouts in succession, e.g. A > B > C > A > B "
+#| "> C and so on."
 msgid ""
 "You can indicate how long you want to do each workout\n"
 "        before jumping to the next. It is also possible to create a loop, so "
 "you\n"
 "        always do the same workouts in succession, e.g. A > B > C > A > B > "
-"C and so on."
+"C and so\n"
+"        on."
 msgstr ""
 "Je kan aangeven hoe lang je elke workout wil doen\n"
 "alvorens naar de volgende te gaan. het is ook mogelijk een lus te creëren, "
 "zodat\n"
 "je altijd dezelfde workouits na elkaar doet. Bvb. A > B > C > A > B > C enz."
 
-#: manager/templates/schedule/overview.html:43
+#: manager/templates/schedule/overview.html:44
 #, fuzzy
 msgid ""
 "The currently active schedule will remain active (and be\n"
@@ -2483,7 +2466,7 @@ msgstr "Schema toevoegen"
 msgid "Schedule"
 msgstr "Planning"
 
-#: manager/templates/schedule/view.html:85
+#: manager/templates/schedule/view.html:84
 msgid ""
 "This schedule is a loop and will go through the workouts above till you "
 "deactivate it"
@@ -2491,19 +2474,19 @@ msgstr ""
 "Dit schema is een lus en zal door de workouts hierboven gaan totdat je het "
 "deactiveert."
 
-#: manager/templates/schedule/view.html:103
+#: manager/templates/schedule/view.html:102
 msgid "Weeks"
 msgstr "Weken"
 
-#: manager/templates/schedule/view.html:115
+#: manager/templates/schedule/view.html:114
 msgid "Move me"
 msgstr "Verplaats me"
 
-#: manager/templates/schedule/view.html:156
+#: manager/templates/schedule/view.html:168
 msgid "Start schedule"
 msgstr "Start schema"
 
-#: manager/templates/schedule/view.html:187
+#: manager/templates/schedule/view.html:197
 #, python-format
 msgid ""
 "%(weeks)s Week\n"
@@ -2518,11 +2501,11 @@ msgstr[1] ""
 "%(weeks)s Weken\n"
 "                                "
 
-#: manager/templates/schedule/view.html:221
+#: manager/templates/schedule/view.html:231
 msgid "Adding workouts"
 msgstr "Workouts toevoegen"
 
-#: manager/templates/schedule/view.html:223
+#: manager/templates/schedule/view.html:233
 msgid ""
 "Add as many workouts to the schedule as you want. You can\n"
 "            edit the order by dragging and dropping them. It's also possible "
@@ -2530,48 +2513,41 @@ msgid ""
 "            than once."
 msgstr ""
 
-#: manager/templates/schedule/view.html:232
-#: manager/templates/schedule/view.html:243
-#: manager/templates/schedule/view.html:290
+#: manager/templates/schedule/view.html:242
+#: manager/templates/schedule/view.html:256
+#: manager/templates/schedule/view.html:310
 #: manager/templates/workout/view.html:69
-#: manager/templates/workout/view.html:79
-#: manager/templates/workout/view.html:178
+#: manager/templates/workout/view.html:83
+#: manager/templates/workout/view.html:192
 msgid "Export calendar file"
 msgstr "Exporteer kalenderbestand"
 
-#: manager/templates/schedule/view.html:236
+#: manager/templates/schedule/view.html:248
 msgid "Export this schedule as a calendar file."
 msgstr "Exporteer dit schema als een kalenderbestand."
 
-#: manager/templates/schedule/view.html:237
-#: manager/templates/workout/view.html:74
+#: manager/templates/schedule/view.html:249
+#: manager/templates/workout/view.html:76
 #, fuzzy
 msgid ""
 "You can then import the file it into your calendar\n"
 "                        application for example google calendar, outlook or "
 "iCal. This will create\n"
 "                        an appointment for each training day with the "
-"appropriate exercises."
+"appropriate\n"
+"                        exercises."
 msgstr ""
 "Hierna kan je het bestand importeren in je kalender-applicatie, bijvoorbeeld "
 "Google Calendar, Outlook of iCal. Dit zal een afspraak creëren op elke "
 "trainingdag met de geschikte oefeningen."
 
-#: manager/templates/schedule/view.html:258
-#: manager/templates/schedule/view.html:294
-#: manager/templates/workout/view.html:94
-#: manager/templates/workout/view.html:174
+#: manager/templates/schedule/view.html:272
+#: manager/templates/schedule/view.html:315
+#: manager/templates/workout/view.html:99
+#: manager/templates/workout/view.html:188
 msgid "Download as PDF"
 msgstr "Download als PDF"
 
-#: manager/templates/schedule/view.html:299
-msgid "Edit schedule"
-msgstr "Bewerk schema"
-
-#: manager/templates/schedule/view.html:304
-msgid "Delete schedule"
-msgstr "Verwijder schema"
-
 #: manager/templates/set/add.html:9
 #, python-format
 msgid "Add exercises to day \"%(day_name)s\""
@@ -2644,53 +2620,6 @@ msgid ""
 "You will regularly receive such reminders till you enter your current weight."
 msgstr ""
 
-#: manager/templates/workout/log.html:10 manager/templates/workout/log.html:11
-msgid "Weight log"
-msgstr "Gewichtlog"
-
-#: manager/templates/workout/log.html:29
-msgid "Weight log for workout"
-msgstr "Gewichtlog voor workout"
-
-#: manager/templates/workout/log.html:49
-msgid "Add weight log to this day"
-msgstr "Voeg gewichtslog toe aan deze dag"
-
-#: manager/templates/workout/log.html:69
-msgid "No weight entries here."
-msgstr "Geen gewichtingaven hier."
-
-#: manager/templates/workout/log.html:77
-msgid "No exercises for this day."
-msgstr "Geen oefeningen voor deze dag."
-
-#: manager/templates/workout/log.html:90
-msgid ""
-"This page shows the weight logs belonging to this workout\n"
-"only. Click on an exercise to see all the historical data for\n"
-"it."
-msgstr ""
-"Deze pagina toont enkel de gewichtingaven behorende aan \n"
-"deze workout. Klik op een oefening om alle historische data\n"
-"ervoor te zien."
-
-#: manager/templates/workout/log.html:94
-msgid ""
-"If on a single day there is more than one entry with the\n"
-"same number of repetitions, but different weights, only the entry with the\n"
-"higher weight is shown in the diagram."
-msgstr ""
-"Als er op eenzelfde dag meer dan één ingave is met \n"
-"hetzelfde aantal herhalingen, maar verschillende gewichten, zal enkel \n"
-"de ingave met het grotere gewicht getoond worden in de grafiek."
-
-#: manager/templates/workout/log.html:98
-msgid ""
-"Note that only entries with a weight unit (kg or lb) and\n"
-"repetitions are charted, other combinations such as time or until failure\n"
-"are ignored here."
-msgstr ""
-
 #: manager/templates/workout/overview.html:25
 #, fuzzy
 msgid "No templates found."
@@ -2731,27 +2660,23 @@ msgstr "Voeg workout-sets toe aan daen"
 msgid "Set the repetitions for each set"
 msgstr "Stel de herhalingen in voor elke set"
 
-#: manager/templates/workout/view.html:73
+#: manager/templates/workout/view.html:75
 msgid "Export this workout as a calendar file."
 msgstr "Exporteer deze workout als kalenderbestand"
 
-#: manager/templates/workout/view.html:144
+#: manager/templates/workout/view.html:156
 msgid "Logs"
 msgstr "Logs"
 
-#: manager/templates/workout/view.html:146
+#: manager/templates/workout/view.html:159
 msgid "View logs"
 msgstr "Bekijk logs"
 
-#: manager/templates/workout/view.html:169 manager/views/schedule_step.py:99
-msgid "Edit workout"
-msgstr "Bewerk workout"
-
-#: manager/templates/workout/view.html:182 manager/views/workout.py:281
+#: manager/templates/workout/view.html:195 manager/views/workout.py:281
 msgid "Mark as template"
 msgstr ""
 
-#: manager/views/day.py:109
+#: manager/views/day.py:105
 msgid "Add workout day"
 msgstr "Voeg workout-dag toe"
 
@@ -2768,6 +2693,10 @@ msgstr "Workout voor %s"
 msgid "Create schedule"
 msgstr "Schema aanmaken"
 
+#: manager/views/schedule_step.py:99
+msgid "Edit workout"
+msgstr "Bewerk workout"
+
 #: manager/views/workout.py:209
 msgid "Copy workout"
 msgstr "Kopieer workout"
@@ -2894,7 +2823,7 @@ msgstr "Hoeveelheid in grammen"
 msgid "Unit amount, e.g. \"1 Cup\" or \"1/2 spoon\""
 msgstr "Eenheidshoeveelheid, bvb. \"1 kopje\" of \"1/2 lepel\""
 
-#: nutrition/models/log.py:52 nutrition/models/meal.py:50
+#: nutrition/models/log.py:52 nutrition/models/meal.py:48
 #: nutrition/models/meal_item.py:48 nutrition/models/plan.py:108
 msgid "Nutrition plan"
 msgstr "Voedingsplan"
@@ -2908,11 +2837,11 @@ msgstr "Maaltijd"
 msgid "Date and Time (Approx.)"
 msgstr "Tijd (ongeveer)"
 
-#: nutrition/models/meal.py:62
+#: nutrition/models/meal.py:60
 msgid "Time (approx)"
 msgstr "Tijd (ongeveer)"
 
-#: nutrition/models/meal.py:69
+#: nutrition/models/meal.py:67
 msgid ""
 "Give meals a textual description / name such as \"Breakfast\" or \"after "
 "workout\""
@@ -3053,10 +2982,6 @@ msgstr "Geen ingrediënten."
 msgid "Search"
 msgstr "Zoek"
 
-#: nutrition/templates/ingredient/overview.html:62
-msgid "Add ingredient"
-msgstr "Ingrediënt toevoegen"
-
 #: nutrition/templates/ingredient/view.html:45 nutrition/views/plan.py:229
 msgid "Macronutrients"
 msgstr "Macrovoedingstoffen"
@@ -3076,20 +3001,11 @@ msgstr "Nvt."
 msgid "Others"
 msgstr "Anderen"
 
-#: nutrition/templates/ingredient/view.html:144
-#: nutrition/templates/units/list.html:46 nutrition/views/unit.py:86
+#: nutrition/templates/ingredient/view.html:143
+#: nutrition/templates/units/list.html:50 nutrition/views/unit.py:86
 msgid "Add new weight unit"
 msgstr "Voeg gewichteenheid toe"
 
-#: nutrition/templates/ingredient/view.html:206
-#: nutrition/templates/ingredient/view.html:209
-msgid "Edit ingredient"
-msgstr "Bewerk ingrediënt"
-
-#: nutrition/templates/ingredient/view.html:213
-msgid "Delete ingredient"
-msgstr "Verwijder ingrediënt"
-
 #: nutrition/templates/rate/form.html:25
 msgid "Basal metabolic rate"
 msgstr "Basaal metabolisme"
@@ -3705,6 +3621,77 @@ msgstr "Met succes verwijderd."
 msgid "Delete weight entry for the %s"
 msgstr "Verwijder gewichtsingave voor de %s"
 
+#, fuzzy
+#~ msgid ""
+#~ "If a license has been localized, e.g. the Creative Commons\n"
+#~ "            licenses for the different countries, add them as separate "
+#~ "entries here."
+#~ msgstr ""
+#~ "Als een licentie werd gelokaliseerd, zoals bvb. de Creative Commons\n"
+#~ "licenties voor verschillende landen, voeg ze ze dan hier toe als aparte "
+#~ "ingaven."
+
+#~ msgid "Add weight log"
+#~ msgstr "Voeg gewichtlog toe"
+
+#~ msgid "This exercise has no repetitions."
+#~ msgstr "Deze oefening heeft geen herhalingen."
+
+#~ msgid "Edit them now."
+#~ msgstr "Bewerk ze nu."
+
+#~ msgid "Add exercises to this workout day"
+#~ msgstr "Oefeningen toevoegen aan deze workout-dag."
+
+#~ msgid "Edit schedule"
+#~ msgstr "Bewerk schema"
+
+#~ msgid "Delete schedule"
+#~ msgstr "Verwijder schema"
+
+#~ msgid "Weight log"
+#~ msgstr "Gewichtlog"
+
+#~ msgid "Weight log for workout"
+#~ msgstr "Gewichtlog voor workout"
+
+#~ msgid "Add weight log to this day"
+#~ msgstr "Voeg gewichtslog toe aan deze dag"
+
+#~ msgid "No weight entries here."
+#~ msgstr "Geen gewichtingaven hier."
+
+#~ msgid "No exercises for this day."
+#~ msgstr "Geen oefeningen voor deze dag."
+
+#~ msgid ""
+#~ "This page shows the weight logs belonging to this workout\n"
+#~ "only. Click on an exercise to see all the historical data for\n"
+#~ "it."
+#~ msgstr ""
+#~ "Deze pagina toont enkel de gewichtingaven behorende aan \n"
+#~ "deze workout. Klik op een oefening om alle historische data\n"
+#~ "ervoor te zien."
+
+#~ msgid ""
+#~ "If on a single day there is more than one entry with the\n"
+#~ "same number of repetitions, but different weights, only the entry with "
+#~ "the\n"
+#~ "higher weight is shown in the diagram."
+#~ msgstr ""
+#~ "Als er op eenzelfde dag meer dan één ingave is met \n"
+#~ "hetzelfde aantal herhalingen, maar verschillende gewichten, zal enkel \n"
+#~ "de ingave met het grotere gewicht getoond worden in de grafiek."
+
+#~ msgid "Add ingredient"
+#~ msgstr "Ingrediënt toevoegen"
+
+#~ msgid "Edit ingredient"
+#~ msgstr "Bewerk ingrediënt"
+
+#~ msgid "Delete ingredient"
+#~ msgstr "Verwijder ingrediënt"
+
 #~ msgid "Ingredients pending review"
 #~ msgstr "Ingrediënten in overweging"
 
diff --git a/wger/locale/no/LC_MESSAGES/django.po b/wger/locale/no/LC_MESSAGES/django.po
index bd29241b7..e02641a07 100644
--- a/wger/locale/no/LC_MESSAGES/django.po
+++ b/wger/locale/no/LC_MESSAGES/django.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: wger Workout Manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-07-14 15:59+0200\n"
+"POT-Creation-Date: 2024-11-14 13:09+0100\n"
 "PO-Revision-Date: 2024-08-20 18:09+0000\n"
 "Last-Translator: GS Bacon <gs@gsvoren.no>\n"
 "Language-Team: Norwegian Bokmål <https://hosted.weblate.org/projects/wger/"
@@ -23,7 +23,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 5.7\n"
 
-#: config/models/gym_config.py:46 gym/templates/gym/list.html:53
+#: config/models/gym_config.py:46 gym/templates/gym/list.html:56
 msgid "Default gym"
 msgstr "Standard gym"
 
@@ -37,28 +37,28 @@ msgstr ""
 "brukere som ikke er tildelt et treningsstudio vil også bli tildelt dette "
 "treningsstudioet."
 
-#: config/views/gym_config.py:42 core/templates/language/view.html:67
-#: core/templates/license/list.html:17 core/templates/misc/license/list.html:18
+#: config/views/gym_config.py:42 core/templates/language/view.html:64
+#: core/templates/license/list.html:17
 #: core/templates/repetition_unit/list.html:18
-#: core/templates/tags/render_day.html:39
-#: core/templates/tags/render_day.html:75 core/templates/user/overview.html:204
-#: core/templates/user/overview.html:445
+#: core/templates/user/overview.html:204 core/templates/user/overview.html:467
 #: core/templates/weight_unit/list.html:18
 #: exercises/templates/categories/admin-overview.html:17
 #: exercises/templates/equipment/admin-overview.html:17
-#: exercises/templates/muscles/admin-overview.html:17
-#: gallery/views/images.py:98 gym/templates/admin_notes/list.html:32
-#: gym/templates/contract/list.html:31 gym/templates/contract/view.html:107
-#: gym/templates/contract_option/list.html:32
-#: gym/templates/contract_type/list.html:32 gym/templates/document/list.html:38
-#: gym/templates/gym/list.html:20 gym/templates/gym/list.html:46
-#: gym/templates/gym/member_list.html:87 gym/templates/gym/member_list.html:140
-#: gym/templates/gym/member_list.html:176
-#: manager/templates/calendar/day.html:68
-#: manager/templates/calendar/month.html:85
-#: manager/templates/calendar/partial_overview_table.html:18
-#: manager/templates/schedule/view.html:118
-#: nutrition/templates/ingredient/view.html:165
+#: exercises/templates/muscles/admin-overview.html:16
+#: gallery/views/images.py:98 gym/templates/admin_notes/list.html:31
+#: gym/templates/contract/list.html:30 gym/templates/contract/view.html:106
+#: gym/templates/contract_option/list.html:29
+#: gym/templates/contract_type/list.html:30 gym/templates/document/list.html:38
+#: gym/templates/gym/list.html:19 gym/templates/gym/list.html:48
+#: gym/templates/gym/member_list.html:94 gym/templates/gym/member_list.html:152
+#: gym/templates/gym/member_list.html:190
+#: manager/templates/calendar/day.html:67
+#: manager/templates/calendar/month.html:84
+#: manager/templates/calendar/partial_overview_table.html:16
+#: manager/templates/schedule/view.html:318
+#: manager/templates/workout/view.html:181
+#: nutrition/templates/ingredient/view.html:164
+#: nutrition/templates/ingredient/view.html:209
 #: nutrition/templates/units/list.html:19
 msgid "Edit"
 msgstr "Rediger"
@@ -92,8 +92,8 @@ msgstr "Mitt kule treningsprogram"
 msgid "Empty placeholder schedule"
 msgstr "Tom plassholder for timeplanen"
 
-#: core/forms.py:69 core/templates/navigation.html:285
-#: core/templates/navigation.html:291 core/templates/user/login.html:4
+#: core/forms.py:69 core/templates/navigation.html:284
+#: core/templates/navigation.html:290 core/templates/user/login.html:4
 #: software/templates/features.html:82 software/templates/features.html:427
 msgid "Login"
 msgstr "Logg inn"
@@ -103,14 +103,14 @@ msgstr "Logg inn"
 msgid "First name"
 msgstr "Fornavn"
 
-#: core/forms.py:109 core/forms.py:215 core/templates/user/overview.html:266
+#: core/forms.py:109 core/forms.py:215 core/templates/user/overview.html:284
 #: gym/views/export.py:62 gym/views/gym.py:217
 msgid "Last name"
 msgstr "Etternavn"
 
-#: core/forms.py:111 core/forms.py:180 core/templates/user/overview.html:270
+#: core/forms.py:111 core/forms.py:180 core/templates/user/overview.html:288
 #: gym/models/contract.py:256 gym/models/gym.py:58
-#: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:104
+#: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:116
 #: gym/templates/gym/new_user.html:30 gym/views/export.py:60
 #: mailer/templates/mailer/gym/form.html:4
 #: mailer/templates/mailer/gym/overview.html:4
@@ -139,8 +139,8 @@ msgstr "Treningsvarsler"
 msgid "Other settings"
 msgstr "Andre innstillinger"
 
-#: core/forms.py:174 core/views/user.py:624 core/views/user.py:639
-#: core/views/user.py:651 gym/forms.py:73 manager/templates/log/add.html:65
+#: core/forms.py:174 core/views/user.py:623 core/views/user.py:638
+#: core/views/user.py:650 gym/forms.py:73 manager/templates/log/add.html:65
 #: manager/templates/set/add.html:70 manager/views/workout.py:203
 #: utils/generic_views.py:143
 msgid "Save"
@@ -163,26 +163,25 @@ msgstr "Passord"
 msgid "Please enter your current password."
 msgstr "Skriv inn ditt nåværende passord."
 
-#: core/forms.py:242 core/templates/language/view.html:73
-#: core/templates/license/list.html:19 core/templates/misc/license/list.html:22
-#: core/templates/repetition_unit/list.html:20
-#: core/templates/tags/render_day.html:45
-#: core/templates/tags/render_day.html:81 core/templates/user/overview.html:217
-#: core/templates/weight_unit/list.html:20
-#: exercises/templates/categories/admin-overview.html:19
-#: exercises/templates/equipment/admin-overview.html:19
-#: exercises/templates/muscles/admin-overview.html:19
-#: gym/templates/admin_notes/list.html:40
-#: gym/templates/contract_option/list.html:41
-#: gym/templates/contract_type/list.html:41 gym/templates/document/list.html:46
-#: gym/templates/gym/list.html:22 manager/templates/calendar/day.html:73
-#: manager/templates/calendar/month.html:89
-#: manager/templates/calendar/partial_overview_table.html:23
-#: manager/templates/schedule/view.html:122
-#: manager/templates/workout/view.html:188
-#: nutrition/templates/ingredient/view.html:166
+#: core/forms.py:242 core/templates/language/view.html:70
+#: core/templates/license/list.html:21
+#: core/templates/repetition_unit/list.html:22
+#: core/templates/user/overview.html:233
+#: core/templates/weight_unit/list.html:22
+#: exercises/templates/categories/admin-overview.html:21
+#: exercises/templates/equipment/admin-overview.html:21
+#: exercises/templates/muscles/admin-overview.html:20
+#: gym/templates/admin_notes/list.html:37
+#: gym/templates/contract_option/list.html:35
+#: gym/templates/contract_type/list.html:36 gym/templates/document/list.html:46
+#: gym/templates/gym/list.html:23 manager/templates/calendar/day.html:73
+#: manager/templates/calendar/month.html:88
+#: manager/templates/calendar/partial_overview_table.html:22
+#: manager/templates/schedule/view.html:324
+#: manager/templates/workout/view.html:202
+#: nutrition/templates/ingredient/view.html:168
 #: nutrition/templates/ingredient/view.html:215
-#: nutrition/templates/units/list.html:22
+#: nutrition/templates/units/list.html:25
 msgid "Delete"
 msgstr "Slett"
 
@@ -194,9 +193,9 @@ msgstr "Ugyldig passord"
 msgid "The form is secured with reCAPTCHA"
 msgstr "Skjemaet er sikret med reCAPTCHA"
 
-#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:285
-#: core/templates/navigation.html:297 core/templates/template.html:149
-#: core/templates/user/login.html:20 core/views/user.py:298
+#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:284
+#: core/templates/navigation.html:296 core/templates/template.html:151
+#: core/templates/user/login.html:20 core/views/user.py:297
 #: software/templates/features.html:87 software/templates/features.html:422
 msgid "Register"
 msgstr "Registrer"
@@ -446,18 +445,18 @@ msgid "The sum of all hours has to be 24"
 msgstr "Summen av antall timer må bli 24"
 
 #: core/models/rep_unit.py:36 core/models/weight_unit.py:36
-#: core/templates/user/overview.html:262 core/views/user.py:599
+#: core/templates/user/overview.html:280 core/views/user.py:598
 #: exercises/models/category.py:29 exercises/models/equipment.py:29
 #: exercises/models/exercise.py:59 exercises/models/muscle.py:36
 #: gym/models/contract.py:52 gym/models/contract.py:103 gym/models/gym.py:46
 #: gym/models/user_document.py:84 gym/templates/contract/view.html:50
-#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:96
+#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:108
 #: gym/views/gym.py:158 manager/models/schedule.py:55
 #: manager/models/workout.py:57 measurements/models/category.py:36
 #: nutrition/models/ingredient.py:111
-#: nutrition/models/ingredient_category.py:27 nutrition/models/meal.py:67
+#: nutrition/models/ingredient_category.py:27 nutrition/models/meal.py:65
 #: nutrition/models/weight_unit.py:38
-#: nutrition/templates/ingredient/view.html:152
+#: nutrition/templates/ingredient/view.html:151
 msgid "Name"
 msgstr "Navn"
 
@@ -510,7 +509,7 @@ msgstr ""
 msgid "Back to \"%(target)s\""
 msgstr "Tilbake til \"%(target)s\""
 
-#: core/templates/delete.html:15
+#: core/templates/delete.html:4
 msgid "Are you sure you want to delete this? This action cannot be undone."
 msgstr ""
 "Er du sikker på at du vil slette dette? Denne handlingen kan ikke angres."
@@ -563,7 +562,7 @@ msgstr ""
 msgid "Dashboard"
 msgstr "Dashboard"
 
-#: core/templates/language/overview.html:4 core/templates/navigation.html:345
+#: core/templates/language/overview.html:4 core/templates/navigation.html:344
 msgid "Languages"
 msgstr "Språk"
 
@@ -573,85 +572,72 @@ msgstr "Resultatløst."
 
 #: core/templates/language/overview.html:22
 #: manager/templates/calendar/month.html:132
-#: manager/templates/schedule/overview.html:28
-#: manager/templates/schedule/view.html:144
+#: manager/templates/schedule/view.html:154
 #: manager/templates/workout/overview.html:28
 #: nutrition/templates/ingredient/overview.html:38
 msgid "Add one now."
 msgstr "Legg til en nå."
 
-#: core/templates/language/overview.html:35 core/templates/license/list.html:40
-#: core/templates/misc/license/list.html:43
-#: core/templates/repetition_unit/list.html:43
-#: core/templates/user/overview.html:326 core/templates/user/overview.html:365
-#: core/templates/user/overview.html:401
-#: core/templates/weight_unit/list.html:43 core/views/languages.py:74
+#: core/templates/language/overview.html:34 core/templates/license/list.html:43
+#: core/templates/repetition_unit/list.html:46
+#: core/templates/user/overview.html:344 core/templates/user/overview.html:384
+#: core/templates/user/overview.html:422
+#: core/templates/weight_unit/list.html:46 core/views/languages.py:74
 #: core/views/license.py:66 core/views/repetition_units.py:66
 #: core/views/weight_units.py:66
-#: exercises/templates/categories/admin-overview.html:38
-#: gallery/views/images.py:63 gym/templates/admin_notes/list.html:67
-#: gym/templates/contract/list.html:73
-#: gym/templates/contract_option/list.html:72
-#: gym/templates/contract_type/list.html:72 gym/templates/document/list.html:79
-#: gym/templates/gym/member_list.html:211
-#: gym/templates/gym/member_list.html:244
-#: gym/templates/gym/member_list.html:281
+#: exercises/templates/categories/admin-overview.html:40
+#: exercises/templates/equipment/admin-overview.html:39
+#: exercises/templates/muscles/admin-overview.html:40
+#: gallery/views/images.py:63 gym/templates/admin_notes/list.html:64
+#: gym/templates/contract/list.html:69
+#: gym/templates/contract_option/list.html:65
+#: gym/templates/contract_type/list.html:66 gym/templates/document/list.html:78
+#: gym/templates/gym/member_list.html:228
+#: gym/templates/gym/member_list.html:264
+#: gym/templates/gym/member_list.html:303
 #: mailer/templates/mailer/gym/overview.html:43
+#: nutrition/templates/ingredient/overview.html:60
 msgid "Add"
 msgstr "Legg til"
 
 #: core/templates/language/view.html:61 core/templates/user/api_key.html:44
-#: core/templates/user/preferences.html:45 gym/models/contract.py:203
-#: gym/templates/contract/view.html:41 gym/templates/contract/view.html:106
-#: gym/templates/gym/member_list.html:248
-#: manager/templates/schedule/view.html:285
-#: manager/templates/workout/view.html:163
-#: nutrition/templates/ingredient/view.html:202
+#: core/templates/user/preferences.html:50 gym/models/contract.py:203
+#: gym/templates/contract/view.html:41 gym/templates/gym/member_list.html:270
+#: manager/templates/schedule/view.html:304
+#: manager/templates/workout/view.html:177
+#: nutrition/templates/ingredient/view.html:206
 msgid "Options"
 msgstr "Alternativer"
 
-#: core/templates/license/list.html:4 core/templates/misc/license/list.html:4
+#: core/templates/license/list.html:4
 msgid "License list"
 msgstr "Lisensliste"
 
-#: core/templates/license/list.html:26 core/templates/misc/license/list.html:30
-#: core/templates/repetition_unit/list.html:28
+#: core/templates/license/list.html:30
+#: core/templates/repetition_unit/list.html:32
 #: core/templates/user/overview.html:104 core/templates/user/overview.html:136
-#: core/templates/user/overview.html:185 core/templates/user/overview.html:347
-#: core/templates/user/overview.html:383 core/templates/user/overview.html:427
-#: core/templates/weight_unit/list.html:28
-#: exercises/templates/categories/admin-overview.html:26
-#: exercises/templates/equipment/admin-overview.html:26
-#: exercises/templates/muscles/admin-overview.html:26
-#: gym/templates/admin_notes/list.html:52 gym/templates/contract/list.html:60
-#: gym/templates/contract_option/list.html:58
-#: gym/templates/contract_type/list.html:58 gym/templates/document/list.html:64
-#: gym/templates/gym/list.html:29 gym/templates/gym/member_list.html:229
-#: gym/templates/gym/member_list.html:262
-#: gym/templates/gym/member_list.html:299
+#: core/templates/user/overview.html:185 core/templates/user/overview.html:365
+#: core/templates/user/overview.html:404 core/templates/user/overview.html:448
+#: core/templates/weight_unit/list.html:32
+#: exercises/templates/categories/admin-overview.html:30
+#: exercises/templates/equipment/admin-overview.html:30
+#: exercises/templates/muscles/admin-overview.html:29
+#: gym/templates/admin_notes/list.html:50 gym/templates/contract/list.html:57
+#: gym/templates/contract_option/list.html:52
+#: gym/templates/contract_type/list.html:53 gym/templates/document/list.html:64
+#: gym/templates/gym/list.html:32 gym/templates/gym/member_list.html:248
+#: gym/templates/gym/member_list.html:284
+#: gym/templates/gym/member_list.html:321
 #: mailer/templates/mailer/gym/overview.html:30
-#: manager/templates/calendar/day.html:87
-#: nutrition/templates/units/list.html:29
+#: manager/templates/calendar/day.html:88
+#: nutrition/templates/units/list.html:34
 msgid "Nothing found"
 msgstr "Ingenting funnet"
 
-#: core/templates/misc/about.html:4 core/templates/template.html:175
+#: core/templates/misc/about.html:4 core/templates/template.html:188
 msgid "Imprint"
 msgstr "Inntrykk"
 
-#: core/templates/misc/license/list.html:47
-#, fuzzy
-#| msgid ""
-#| "If a license has been localized, e.g. the Creative Commons\n"
-#| "licenses for the different countries, add them as separate entries here."
-msgid ""
-"If a license has been localized, e.g. the Creative Commons\n"
-"            licenses for the different countries, add them as separate "
-"entries here."
-msgstr ""
-"Hvis en lisens er en lokal lisens, feks Creative Commons\n"
-"lisenser for de ulike landene, legges dem til som separate oppføringer her."
-
 #: core/templates/navigation.html:28 software/templates/features.html:437
 msgid "Training"
 msgstr "Trening"
@@ -702,8 +688,8 @@ msgstr "Offentlige maler"
 msgid "Exercises"
 msgstr "Øvelser"
 
-#: core/templates/navigation.html:111 core/templates/navigation.html:184
-#: core/templates/navigation.html:340
+#: core/templates/navigation.html:111 core/templates/navigation.html:185
+#: core/templates/navigation.html:339
 msgid "Administration"
 msgstr "Administrasjon"
 
@@ -742,87 +728,87 @@ msgstr "BMI-kalkulator"
 msgid "Daily calories calculator"
 msgstr "Daglig kalorikalkulator"
 
-#: core/templates/navigation.html:179
+#: core/templates/navigation.html:180
 #: nutrition/templates/ingredient/overview.html:10
 msgid "Ingredient overview"
 msgstr "Ingrediensoversikt"
 
-#: core/templates/navigation.html:187 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:189 nutrition/templates/units/list.html:6
 msgid "Ingredient weight units"
 msgstr "Vektenheter for ingredienser"
 
-#: core/templates/navigation.html:203 software/templates/features.html:442
+#: core/templates/navigation.html:205 software/templates/features.html:442
 msgid "Body weight"
 msgstr "Kropsvekt"
 
-#: core/templates/navigation.html:210 core/templates/user/overview.html:114
+#: core/templates/navigation.html:212 core/templates/user/overview.html:114
 msgid "Weight overview"
 msgstr "Vektoversikt"
 
-#: core/templates/navigation.html:217 weight/views.py:65
+#: core/templates/navigation.html:216 weight/views.py:65
 msgid "Add weight entry"
 msgstr "Legg til vekt"
 
-#: core/templates/navigation.html:231
+#: core/templates/navigation.html:230
 msgid "About this software"
 msgstr "Om denne programvaren"
 
-#: core/templates/navigation.html:237 software/templates/about_us.html:5
+#: core/templates/navigation.html:236 software/templates/about_us.html:5
 msgid "About us"
 msgstr "Om oss"
 
-#: core/templates/navigation.html:243 software/templates/features.html:507
+#: core/templates/navigation.html:242 software/templates/features.html:507
 msgid "REST API"
 msgstr "REST API"
 
-#: core/templates/navigation.html:249 utils/models.py:45
+#: core/templates/navigation.html:248 utils/models.py:45
 msgid "License"
 msgstr "Lisens"
 
-#: core/templates/navigation.html:255
+#: core/templates/navigation.html:254
 msgid "Developer documentation"
 msgstr "Utvikler dokumentasjon"
 
-#: core/templates/navigation.html:262
+#: core/templates/navigation.html:261
 msgid "Get the code"
 msgstr "Få koden"
 
-#: core/templates/navigation.html:269 core/templates/template.html:214
+#: core/templates/navigation.html:268 core/templates/template.html:227
 #: software/templates/features.html:582
 msgid "Translate"
 msgstr "Oversett"
 
-#: core/templates/navigation.html:303 core/templates/user/login.html:28
+#: core/templates/navigation.html:302 core/templates/user/login.html:28
 msgid "Reset password"
 msgstr "Tilbakestill passord"
 
-#: core/templates/navigation.html:321
+#: core/templates/navigation.html:320
 msgid "My preferences"
 msgstr "Mine innstillinger"
 
-#: core/templates/navigation.html:330
+#: core/templates/navigation.html:329
 msgid "Logout"
 msgstr "Logg ut"
 
-#: core/templates/navigation.html:353
+#: core/templates/navigation.html:352
 msgid "Licenses"
 msgstr "Lisenser"
 
-#: core/templates/navigation.html:361
+#: core/templates/navigation.html:360
 #: core/templates/repetition_unit/list.html:4
 msgid "Repetition units"
 msgstr "Repetisjonsenheter"
 
-#: core/templates/navigation.html:369 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:368 core/templates/weight_unit/list.html:4
 #: nutrition/templates/ingredient/view.html:141
 msgid "Weight units"
 msgstr "Vektenheter"
 
-#: core/templates/navigation.html:377 core/templates/user/list.html:4
+#: core/templates/navigation.html:376 core/templates/user/list.html:4
 msgid "User list"
 msgstr "Brukerliste"
 
-#: core/templates/navigation.html:383
+#: core/templates/navigation.html:382
 msgid "Gyms"
 msgstr "Treningsstudioer"
 
@@ -885,55 +871,30 @@ msgstr "forrige"
 msgid "next"
 msgstr "neste"
 
-#: core/templates/tags/render_day.html:34
-msgid "Add weight log"
-msgstr "Legg til vektlogg"
-
-#: core/templates/tags/render_day.html:116
-msgid "Placeholder image for exercise"
+#: core/templates/tags/render_day.html:44
+#, fuzzy
+#| msgid "Placeholder image for exercise"
+msgid "Placeholder image for translation"
 msgstr "Plassholder for bilde for øvelsen"
 
-#: core/templates/tags/render_day.html:133
-msgid "This exercise has no repetitions."
-msgstr "Denne øvelsen har ingen repetisjoner."
-
-#: core/templates/tags/render_day.html:136
-msgid "Edit them now."
-msgstr "Rediger dem nå."
-
-#: core/templates/tags/render_day.html:162
-msgid "Add exercises to this workout day"
-msgstr "Legg til øvelser for denne treningsdagen"
-
-#: core/templates/tags/render_weight_log.html:17 manager/helpers.py:86
-#: manager/models/setting.py:72 manager/templates/set/formset.html:9
-msgid "Reps"
-msgstr "Repetisjoner"
-
-#: core/templates/tags/render_weight_log.html:30 manager/forms.py:191
-#: manager/models/log.py:103 manager/models/setting.py:102
-#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
-msgid "RiR"
-msgstr "RiR"
-
-#: core/templates/template.html:122 manager/templates/calendar/month.html:138
-#: manager/templates/schedule/view.html:248
-#: manager/templates/schedule/view.html:269
-#: manager/templates/workout/view.html:84
-#: manager/templates/workout/view.html:137
+#: core/templates/template.html:124 manager/templates/calendar/month.html:138
+#: manager/templates/schedule/view.html:262
+#: manager/templates/schedule/view.html:287
+#: manager/templates/workout/view.html:89
+#: manager/templates/workout/view.html:149
 msgid "Close"
 msgstr "Lukk"
 
-#: core/templates/template.html:138
+#: core/templates/template.html:140
 msgid ""
 "You are using a guest account, data entered will be deleted after a week."
 msgstr "Du bruker en gjestekonto, data du fyller ut vil slettes etter en uke."
 
-#: core/templates/template.html:143
+#: core/templates/template.html:145
 msgid "Create some demo entries"
 msgstr "Lag noen demo oppføringer"
 
-#: core/templates/template.html:180 software/templates/features.html:547
+#: core/templates/template.html:193 software/templates/features.html:547
 #: software/templates/tos.html:7
 msgid "Terms of service"
 msgstr "Vilkår for bruk"
@@ -942,7 +903,7 @@ msgstr "Vilkår for bruk"
 msgid "Features"
 msgstr "Funksjoner"
 
-#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:54
+#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:59
 msgid "API key"
 msgstr "API kode"
 
@@ -987,17 +948,17 @@ msgstr "Generer ny API kode"
 msgid "Documentation"
 msgstr "Dokumentasjon"
 
-#: core/templates/user/delete_account.html:4
-#: core/templates/user/preferences.html:59
+#: core/templates/user/delete_account.html:3
+#: core/templates/user/preferences.html:62
 msgid "Delete account"
 msgstr "Slett konto"
 
-#: core/templates/user/delete_account.html:17
+#: core/templates/user/delete_account.html:9
 #: exercises/templates/history/overview.html:93
 msgid "Are you sure?"
 msgstr "Er du sikker?"
 
-#: core/templates/user/delete_account.html:22
+#: core/templates/user/delete_account.html:14
 #, python-format
 msgid ""
 "This action will delete the user account \"%(username)s\".\n"
@@ -1019,22 +980,22 @@ msgstr "Glemt passord?"
 
 #: core/templates/user/overview.html:25 core/templates/user/overview.html:68
 #: core/templates/user/overview.html:112 core/templates/user/overview.html:144
-#: core/templates/user/overview.html:330 core/templates/user/overview.html:369
-#: core/templates/user/overview.html:405
+#: core/templates/user/overview.html:348 core/templates/user/overview.html:390
+#: core/templates/user/overview.html:426
 #, python-format
 msgid "last %(number)s"
 msgstr "sist %(number)s"
 
 #: core/templates/user/overview.html:27 core/templates/user/overview.html:146
-#: core/templates/user/overview.html:325 core/templates/user/overview.html:364
-#: core/templates/user/overview.html:400 gym/templates/gym/member_list.html:210
-#: gym/templates/gym/member_list.html:243
-#: gym/templates/gym/member_list.html:280
+#: core/templates/user/overview.html:343 core/templates/user/overview.html:382
+#: core/templates/user/overview.html:421 gym/templates/gym/member_list.html:226
+#: gym/templates/gym/member_list.html:262
+#: gym/templates/gym/member_list.html:302
 msgid "Overview"
 msgstr "Oversikt"
 
 #: core/templates/user/overview.html:28
-#: manager/templates/schedule/view.html:163
+#: manager/templates/schedule/view.html:172
 #: manager/templates/workout/overview.html:39 manager/views/schedule_step.py:60
 msgid "Add workout"
 msgstr "Legg til treningsøkt"
@@ -1066,38 +1027,36 @@ msgstr "Beskrivelse"
 msgid "Number of logs (days)"
 msgstr "Antall logger (dager)"
 
-#: core/templates/user/overview.html:37 core/views/user.py:600
+#: core/templates/user/overview.html:37 core/views/user.py:599
 #: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:158
 msgid "Last activity"
 msgstr "Siste aktivitet"
 
 #: core/templates/user/overview.html:58
 #: manager/templates/calendar/month.html:128
-#: manager/templates/schedule/view.html:144
 #: manager/templates/workout/overview.html:28
 msgid "No workouts found."
 msgstr "Ingen treningsøkter funnet."
 
 #: core/templates/user/overview.html:68 manager/forms.py:280
-#: manager/templates/workout/view.html:106
+#: manager/templates/workout/view.html:114
 msgid "Log"
 msgstr "Logg"
 
 #: core/templates/user/overview.html:77 manager/models/session.py:83
-#: manager/templates/calendar/partial_overview_table.html:52
+#: manager/templates/calendar/partial_overview_table.html:54
 msgid "General impression"
 msgstr "Generelt inntrykk"
 
-#: core/templates/user/overview.html:78 core/templates/user/overview.html:369
+#: core/templates/user/overview.html:78 core/templates/user/overview.html:390
 #: manager/models/session.py:73
-#: manager/templates/calendar/partial_overview_table.html:56
-#: manager/templates/workout/log.html:89
+#: manager/templates/calendar/partial_overview_table.html:58
 msgid "Notes"
 msgstr "Notater"
 
 #: core/templates/user/overview.html:79
 #: exercises/templates/history/overview.html:30
-#: manager/templates/calendar/partial_overview_table.html:42
+#: manager/templates/calendar/partial_overview_table.html:44
 msgid "Time"
 msgstr "Tid"
 
@@ -1135,121 +1094,121 @@ msgstr "Fett"
 msgid "kcal"
 msgstr "kcal"
 
-#: core/templates/user/overview.html:201 core/templates/user/overview.html:322
-#: core/templates/user/overview.html:361 core/templates/user/overview.html:397
-#: core/templates/user/overview.html:442 gym/templates/gym/list.html:42
-#: gym/templates/gym/member_list.html:84 gym/templates/gym/member_list.html:137
-#: gym/templates/gym/member_list.html:173
-#: gym/templates/gym/member_list.html:207
-#: gym/templates/gym/member_list.html:240
-#: gym/templates/gym/member_list.html:277
-#: manager/templates/schedule/view.html:100
+#: core/templates/user/overview.html:201 core/templates/user/overview.html:340
+#: core/templates/user/overview.html:379 core/templates/user/overview.html:418
+#: core/templates/user/overview.html:463 gym/templates/gym/list.html:45
+#: gym/templates/gym/member_list.html:91 gym/templates/gym/member_list.html:149
+#: gym/templates/gym/member_list.html:187
+#: gym/templates/gym/member_list.html:223
+#: gym/templates/gym/member_list.html:259
+#: gym/templates/gym/member_list.html:299
+#: manager/templates/schedule/view.html:99
 msgid "Actions"
 msgstr "Handlinger"
 
-#: core/templates/user/overview.html:207
+#: core/templates/user/overview.html:210
 msgid "Deactivate user"
 msgstr "Deaktiver bruker"
 
-#: core/templates/user/overview.html:209
+#: core/templates/user/overview.html:214
 msgid "Activate user"
 msgstr "Aktiver bruker"
 
-#: core/templates/user/overview.html:211
+#: core/templates/user/overview.html:223
 msgid "Reset user password"
 msgstr "Tilbakestill brukerpassord"
 
-#: core/templates/user/overview.html:214 gym/templates/gym/member_list.html:30
+#: core/templates/user/overview.html:227 gym/templates/gym/member_list.html:30
 msgid "Roles"
 msgstr "Roller"
 
-#: core/templates/user/overview.html:225
+#: core/templates/user/overview.html:243
 msgid "Password reset confirmation"
 msgstr "Bekreftelse av tilbakestilling av passord"
 
-#: core/templates/user/overview.html:229
+#: core/templates/user/overview.html:247
 msgid "Do you really want to change this user&#39;s password?"
 msgstr "Vil du virkelig endre denne brukeren&#39;s passord?"
 
-#: core/templates/user/overview.html:232
+#: core/templates/user/overview.html:250
 #: exercises/templates/history/overview.html:106
 msgid "No"
 msgstr "Nei"
 
-#: core/templates/user/overview.html:233
+#: core/templates/user/overview.html:251
 #: exercises/templates/history/overview.html:99
 msgid "Yes"
 msgstr "Ja"
 
-#: core/templates/user/overview.html:254 gym/templates/gym/member_list.html:93
+#: core/templates/user/overview.html:272 gym/templates/gym/member_list.html:105
 msgid "Details"
 msgstr "Detaljer"
 
-#: core/templates/user/overview.html:258 gym/views/export.py:57
-#: manager/helpers.py:86 manager/templates/schedule/view.html:98
+#: core/templates/user/overview.html:276 gym/views/export.py:57
+#: manager/helpers.py:86 manager/templates/schedule/view.html:97
 msgid "Nr."
 msgstr "Nr."
 
-#: core/templates/user/overview.html:280 gym/models/contract.py:287
+#: core/templates/user/overview.html:298 gym/models/contract.py:287
 #: gym/models/gym.py:50 gym/templates/contract/view.html:75
-#: gym/templates/gym/member_list.html:100 gym/views/export.py:68
+#: gym/templates/gym/member_list.html:112 gym/views/export.py:68
 msgid "Phone"
 msgstr "Telefon"
 
-#: core/templates/user/overview.html:284 gym/templates/contract/view.html:87
-#: gym/templates/gym/member_list.html:118
+#: core/templates/user/overview.html:302 gym/templates/contract/view.html:87
+#: gym/templates/gym/member_list.html:130
 msgid "Address"
 msgstr "Adresse"
 
-#: core/templates/user/overview.html:295
+#: core/templates/user/overview.html:313
 msgid "Registered"
 msgstr "Registrert"
 
-#: core/templates/user/overview.html:299
+#: core/templates/user/overview.html:317
 msgid "Last login"
 msgstr "Sist innlogget"
 
-#: core/templates/user/overview.html:304
+#: core/templates/user/overview.html:322
 msgid "Status"
 msgstr "Status"
 
-#: core/templates/user/overview.html:307
+#: core/templates/user/overview.html:325
 msgid "Active"
 msgstr "Aktiv"
 
-#: core/templates/user/overview.html:309
+#: core/templates/user/overview.html:327
 msgid "Inactive"
 msgstr "Inaktiv"
 
-#: core/templates/user/overview.html:330 gym/templates/contract/list.html:4
-#: gym/templates/gym/member_list.html:202
+#: core/templates/user/overview.html:348 gym/templates/contract/list.html:4
+#: gym/templates/gym/member_list.html:218
 msgid "Contracts"
 msgstr "Kontrakter"
 
-#: core/templates/user/overview.html:405 gym/templates/document/list.html:4
+#: core/templates/user/overview.html:426 gym/templates/document/list.html:4
 msgid "Documents"
 msgstr "Dokumenter"
 
-#: core/templates/user/overview.html:412 gym/templates/document/list.html:32
-#: manager/forms.py:292 manager/templates/workout/view.html:132
+#: core/templates/user/overview.html:433 gym/templates/document/list.html:33
+#: manager/forms.py:292 manager/templates/workout/view.html:143
 msgid "Download"
 msgstr "Last ned"
 
-#: core/templates/user/overview.html:450 gym/views/admin_config.py:44
+#: core/templates/user/overview.html:474 gym/views/admin_config.py:44
 #: gym/views/admin_config.py:58 gym/views/user_config.py:46
 msgid "Configuration"
 msgstr "Konfiguarsjon"
 
-#: core/templates/user/overview.html:453 gym/models/user_config.py:92
+#: core/templates/user/overview.html:477 gym/models/user_config.py:92
 msgid "Include in inactive overview"
 msgstr "Inkluder i inaktiv oversikt"
 
-#: core/templates/user/overview.html:486
+#: core/templates/user/overview.html:510
 #, python-format
 msgid "Admin login is only available for users in %(gym_name)s"
 msgstr "Administratorinnlogging er kun tilgjengelig for brukere i %(gym_name)s"
 
-#: core/templates/user/overview.html:490
+#: core/templates/user/overview.html:514
 msgid "Log in as this user"
 msgstr "Logg inn som denne brukeren"
 
@@ -1271,19 +1230,19 @@ msgstr ""
 msgid "Send verification email"
 msgstr ""
 
-#: core/templates/user/preferences.html:30
+#: core/templates/user/preferences.html:31
 msgid "You need to verify your email to contribute exercises"
 msgstr ""
 
-#: core/templates/user/preferences.html:50 core/views/user.py:611
+#: core/templates/user/preferences.html:55 core/views/user.py:610
 msgid "Change password"
 msgstr "Endre passord"
 
-#: core/templatetags/wger_extras.py:205 i18n.tpl:37
+#: core/templatetags/wger_extras.py:197 i18n.tpl:37
 msgid "kg"
 msgstr "kg"
 
-#: core/templatetags/wger_extras.py:207
+#: core/templatetags/wger_extras.py:199
 #: nutrition/templates/ingredient/view.html:60
 #: nutrition/templates/ingredient/view.html:66
 #: nutrition/templates/ingredient/view.html:73
@@ -1295,11 +1254,11 @@ msgctxt "weight unit, i.e. grams"
 msgid "g"
 msgstr "g"
 
-#: core/templatetags/wger_extras.py:210 i18n.tpl:38
+#: core/templatetags/wger_extras.py:202 i18n.tpl:38
 msgid "lb"
 msgstr "lb"
 
-#: core/templatetags/wger_extras.py:212
+#: core/templatetags/wger_extras.py:204
 msgctxt "weight unit, i.e. ounces"
 msgid "oz"
 msgstr "oz"
@@ -1326,13 +1285,13 @@ msgid "Delete {0}?"
 msgstr "Slett {0}?"
 
 #: core/views/languages.py:111 core/views/license.py:85
-#: core/views/repetition_units.py:86 core/views/user.py:474
+#: core/views/repetition_units.py:86 core/views/user.py:473
 #: core/views/weight_units.py:86 exercises/views/categories.py:98
 #: exercises/views/equipment.py:81 exercises/views/muscles.py:87
 #: gym/views/admin_notes.py:161 gym/views/config.py:68
 #: gym/views/contract.py:186 gym/views/contract_option.py:123
 #: gym/views/contract_type.py:123 gym/views/document.py:171
-#: gym/views/gym.py:463 manager/views/day.py:100 manager/views/schedule.py:333
+#: gym/views/gym.py:463 manager/views/day.py:96 manager/views/schedule.py:333
 #: manager/views/workout.py:267 nutrition/views/ingredient.py:145
 #: nutrition/views/unit.py:143
 #, python-brace-format
@@ -1361,48 +1320,48 @@ msgstr "Send"
 msgid "Your feedback was successfully sent. Thank you!"
 msgstr "Din tilbakemelding har blitt sendt. Takk!"
 
-#: core/views/user.py:156
+#: core/views/user.py:155
 #, python-brace-format
 msgid "Account \"{0}\" was successfully deleted"
 msgstr "Slettingen av konto \"{0}\" var vellykket"
 
-#: core/views/user.py:292
+#: core/views/user.py:291
 msgid "You were successfully registered"
 msgstr "Din registrering var vellykket"
 
-#: core/views/user.py:351
+#: core/views/user.py:350
 msgid "Settings successfully updated"
 msgstr "Innstillinger ble vellykket oppdatert"
 
-#: core/views/user.py:390
+#: core/views/user.py:389
 msgid "The user was successfully deactivated"
 msgstr "Brukeren ble vellykket deaktivert"
 
-#: core/views/user.py:427
+#: core/views/user.py:426
 msgid "The user was successfully activated"
 msgstr "Brukeren ble vellykket aktivert"
 
-#: core/views/user.py:442
+#: core/views/user.py:441
 msgid "Edit user"
 msgstr "Rediger bruker"
 
-#: core/views/user.py:597 gym/templates/gym/member_list.html:26
+#: core/views/user.py:596 gym/templates/gym/member_list.html:26
 #: gym/views/gym.py:158
 msgid "ID"
 msgstr "ID"
 
-#: core/views/user.py:598 gym/forms.py:95 gym/templates/contract/view.html:55
+#: core/views/user.py:597 gym/forms.py:95 gym/templates/contract/view.html:55
 #: gym/templates/gym/member_list.html:27 gym/views/export.py:59
 #: gym/views/gym.py:158 gym/views/gym.py:217
 msgid "Username"
 msgstr "Brukernavn"
 
-#: core/views/user.py:601 gym/templates/gym/new_user.html:34
+#: core/views/user.py:600 gym/templates/gym/new_user.html:34
 #: gym/views/export.py:58 gym/views/gym.py:217
 msgid "Gym"
 msgstr "treningsstudio"
 
-#: core/views/user.py:660
+#: core/views/user.py:659
 #, python-format
 msgid "A verification email was sent to %(email)s"
 msgstr ""
@@ -1569,11 +1528,6 @@ msgstr ""
 msgid "Equipment list"
 msgstr "Utstyrsliste"
 
-#: exercises/templates/equipment/admin-overview.html:39
-#: exercises/views/equipment.py:92
-msgid "Add new equipment"
-msgstr "Legg til nytt utstyr"
-
 #: exercises/templates/history/overview.html:11
 #, fuzzy
 #| msgid "Exercise day"
@@ -1633,11 +1587,6 @@ msgstr ""
 msgid "Muscle overview"
 msgstr "Muskeloversikt"
 
-#: exercises/templates/muscles/admin-overview.html:38
-#: exercises/views/muscles.py:68
-msgid "Add muscle"
-msgstr "Legg til muskel"
-
 #: exercises/views/categories.py:72
 msgid "Add category"
 msgstr "Legg til kategori"
@@ -1646,6 +1595,10 @@ msgstr "Legg til kategori"
 msgid "This will also delete all exercises in this category."
 msgstr "Dette vil også slette alle øvelsene i denne kategorien."
 
+#: exercises/views/equipment.py:92
+msgid "Add new equipment"
+msgstr "Legg til nytt utstyr"
+
 #: exercises/views/equipment.py:104 exercises/views/equipment.py:115
 msgid "Delete equipment?"
 msgstr "Slett utstyr?"
@@ -1654,6 +1607,10 @@ msgstr "Slett utstyr?"
 msgid "This will delete the exercise from all workouts."
 msgstr "Dette vil slette øvelsen fra alle treningsøktene."
 
+#: exercises/views/muscles.py:68
+msgid "Add muscle"
+msgstr "Legg til muskel"
+
 #: gallery/templates/images/overview.html:62
 msgid "Add image"
 msgstr "Legg til bilde"
@@ -1739,7 +1696,7 @@ msgid "Contract is active"
 msgstr "Kontrakten er aktiv"
 
 #: gym/models/contract.py:237 gym/templates/contract/view.html:69
-#: manager/models/schedule.py:61 manager/templates/schedule/view.html:67
+#: manager/models/schedule.py:61 manager/templates/schedule/view.html:66
 msgid "Start date"
 msgstr "Startdato"
 
@@ -1775,7 +1732,7 @@ msgstr "Admin: kan administrere brukere for et treningsstudio"
 msgid "Admin: can administrate the different gyms"
 msgstr "Admin: kan administrere de forskjellige treningssentre"
 
-#: gym/models/gym.py:65 gym/templates/gym/member_list.html:114
+#: gym/models/gym.py:65 gym/templates/gym/member_list.html:126
 msgid "Owner"
 msgstr "Eier"
 
@@ -1787,7 +1744,7 @@ msgstr ""
 "Antall uker siden forrige gang en bruker logget hans tilstedeværelse for å "
 "bli betraktet som inaktiv"
 
-#: gym/models/gym_config.py:56 gym/templates/gym/member_list.html:152
+#: gym/models/gym_config.py:56 gym/templates/gym/member_list.html:166
 msgid "Show name in header"
 msgstr "Vis navn i topptekst"
 
@@ -1801,7 +1758,7 @@ msgstr "Vis navnet på treningsstudioet i sideoverskriften"
 msgid "Configuration for {self.gym.name}"
 msgstr "Konfigurasjon for {}"
 
-#: gym/models/user_config.py:65 gym/templates/gym/member_list.html:184
+#: gym/models/user_config.py:65 gym/templates/gym/member_list.html:200
 msgid "Overview of inactive members"
 msgstr "Oversikt over inaktive medlemmer"
 
@@ -1825,7 +1782,7 @@ msgstr "Vil bruke filnavn om ingen ting annet er angitt"
 msgid "User notes"
 msgstr "Bruker notater"
 
-#: gym/templates/contract/list.html:36
+#: gym/templates/contract/list.html:34
 msgid "Show"
 msgstr "Vis"
 
@@ -1852,11 +1809,11 @@ msgstr ""
 msgid "Gym list"
 msgstr "Liste over alle treningsstudio"
 
-#: gym/templates/gym/list.html:50
+#: gym/templates/gym/list.html:53
 msgid "Global gym configuration"
 msgstr "Globale innstillinger for treningsstudio"
 
-#: gym/templates/gym/list.html:67 gym/views/gym.py:171
+#: gym/templates/gym/list.html:69 gym/views/gym.py:171
 msgid "Add new gym"
 msgstr "Legg til et nytt treningstudio"
 
@@ -1868,43 +1825,43 @@ msgstr "Administratorer og trenere"
 msgid "Gym manager"
 msgstr "Treningsleder"
 
-#: gym/templates/gym/member_list.html:69
+#: gym/templates/gym/member_list.html:76
 msgid "This gym has no administrators or trainers"
 msgstr "Dette treningsstudioet har ingen administratorer eller trenere"
 
-#: gym/templates/gym/member_list.html:88
+#: gym/templates/gym/member_list.html:98
 msgid "Export"
 msgstr "Eksporter"
 
-#: gym/templates/gym/member_list.html:125
+#: gym/templates/gym/member_list.html:137
 msgid "Members"
 msgstr "Medlemmer"
 
-#: gym/templates/gym/member_list.html:145
+#: gym/templates/gym/member_list.html:159
 msgid "Gym configuration"
 msgstr "Innstillinger for treningsstudio"
 
-#: gym/templates/gym/member_list.html:148
+#: gym/templates/gym/member_list.html:162
 msgid "Inactive members"
 msgstr "Inaktive brukere"
 
-#: gym/templates/gym/member_list.html:149
+#: gym/templates/gym/member_list.html:163
 msgid "weeks"
 msgstr "uker"
 
-#: gym/templates/gym/member_list.html:181
+#: gym/templates/gym/member_list.html:197
 msgid "My configuration"
 msgstr "Mine innstillinger"
 
-#: gym/templates/gym/member_list.html:215
+#: gym/templates/gym/member_list.html:234
 msgid "Types"
 msgstr "Typer"
 
-#: gym/templates/gym/member_list.html:285
+#: gym/templates/gym/member_list.html:307
 msgid "Emails"
 msgstr "E-poster"
 
-#: gym/templates/gym/member_list.html:315
+#: gym/templates/gym/member_list.html:336
 msgid "Add member"
 msgstr "Legg til medlem"
 
@@ -2213,28 +2170,38 @@ msgstr "Bruk også ingredienser på engelsk"
 msgid "Unit"
 msgstr "Enhet"
 
+#: manager/forms.py:191 manager/models/log.py:103 manager/models/setting.py:102
+#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
+msgid "RiR"
+msgstr "RiR"
+
 #: manager/forms.py:279
 msgid "Type"
 msgstr "Type"
 
-#: manager/forms.py:280 manager/templates/workout/view.html:113
+#: manager/forms.py:280 manager/templates/workout/view.html:122
 msgid "Table"
 msgstr "Tabell"
 
-#: manager/forms.py:282 manager/templates/workout/view.html:119
+#: manager/forms.py:282 manager/templates/workout/view.html:129
 msgid "with images"
 msgstr "med bilder"
 
-#: manager/forms.py:283 manager/templates/workout/view.html:125
+#: manager/forms.py:283 manager/templates/workout/view.html:136
 msgid "with comments"
 msgstr "med kommentarer"
 
+#: manager/helpers.py:86 manager/models/setting.py:72
+#: manager/templates/set/formset.html:9
+msgid "Reps"
+msgstr "Repetisjoner"
+
 #: manager/management/commands/email-reminders.py:121
 msgid "Workout will expire soon"
 msgstr "Treningen vil utløpe snart"
 
 #: manager/models/day.py:34 manager/models/log.py:58
-#: manager/models/session.py:60 manager/templates/schedule/view.html:102
+#: manager/models/session.py:60 manager/templates/schedule/view.html:101
 #: manager/templates/workout/view.html:9 manager/templates/workout/view.html:17
 #: manager/views/pdf.py:85 manager/views/pdf.py:161
 #: manager/views/schedule.py:151 manager/views/schedule.py:221
@@ -2257,7 +2224,7 @@ msgstr "Dag"
 msgid "Name or short description of the schedule. For example 'Program XYZ'."
 msgstr "Navn eller kort beskrivelse av planen. For eksempel \"Program XYZ\"."
 
-#: manager/models/schedule.py:65 manager/templates/schedule/view.html:71
+#: manager/models/schedule.py:65 manager/templates/schedule/view.html:70
 msgid "Schedule active"
 msgstr "Timeplan aktiv"
 
@@ -2271,7 +2238,7 @@ msgstr ""
 "vist for eksempel på dashbordet ). Alle andre timeplaner vil da bli merket "
 "som inaktiv"
 
-#: manager/models/schedule.py:77 manager/templates/schedule/view.html:81
+#: manager/models/schedule.py:77 manager/templates/schedule/view.html:80
 msgid "Is a loop"
 msgstr "Går i loop"
 
@@ -2292,7 +2259,7 @@ msgid "The duration in weeks"
 msgstr "Varigheten i uker"
 
 #: manager/models/schedule_step.py:64 manager/models/set.py:53
-#: manager/models/setting.py:113 nutrition/models/meal.py:55
+#: manager/models/setting.py:113 nutrition/models/meal.py:53
 #: nutrition/models/meal_item.py:66
 msgid "Order"
 msgstr "Rekkefølge"
@@ -2430,7 +2397,7 @@ msgstr "Logg oversikt"
 msgid "Workout session"
 msgstr "Treningsøkt"
 
-#: manager/templates/calendar/partial_overview_table.html:27
+#: manager/templates/calendar/partial_overview_table.html:26
 msgid "Delete with logs"
 msgstr "Slett med logger"
 
@@ -2454,21 +2421,27 @@ msgstr ""
 "er,\n"
 "vil den bli redigert. Vekt oppføringene er alltid lagt til."
 
-#: manager/templates/schedule/overview.html:5
+#: manager/templates/schedule/overview.html:4
 msgid "Your schedules"
 msgstr "Dine timeplaner"
 
 #: manager/templates/schedule/overview.html:19
-#: manager/templates/schedule/view.html:131
-#: manager/templates/schedule/view.html:183
+#: manager/templates/schedule/view.html:143
+#: manager/templates/schedule/view.html:193
 #: manager/templates/workout/overview.html:16
 msgid "active"
 msgstr "aktiv"
 
-#: manager/templates/schedule/overview.html:28
+#: manager/templates/schedule/overview.html:27
 msgid "No schedules found."
 msgstr "Ingen timeplaner funnet."
 
+#: manager/templates/schedule/overview.html:28
+#, fuzzy
+#| msgid "Add one now."
+msgid "Add one now"
+msgstr "Legg til en nå."
+
 #: manager/templates/schedule/overview.html:36
 #, fuzzy
 #| msgid ""
@@ -2493,14 +2466,15 @@ msgid ""
 "        before jumping to the next. It is also possible to create a loop, so "
 "you\n"
 "        always do the same workouts in succession, e.g. A > B > C > A > B > "
-"C and so on."
+"C and so\n"
+"        on."
 msgstr ""
 "Du kan angi hvor lenge du ønsker å gjøre hver trening\n"
 "før du hopper til neste. Det er også mulig å lage en løkke, så\n"
 "alltid gjøre de samme treningsøktene på rad, f.eks A> B> C> A> B> C og så "
 "videre."
 
-#: manager/templates/schedule/overview.html:43
+#: manager/templates/schedule/overview.html:44
 #, fuzzy
 #| msgid ""
 #| "The currently active schedule will remain active (and be\n"
@@ -2525,7 +2499,7 @@ msgstr "Legg til timeplan"
 msgid "Schedule"
 msgstr "Timeplan"
 
-#: manager/templates/schedule/view.html:85
+#: manager/templates/schedule/view.html:84
 msgid ""
 "This schedule is a loop and will go through the workouts above till you "
 "deactivate it"
@@ -2533,19 +2507,19 @@ msgstr ""
 "Denne timeplanen er en loop, og vil gå gjennom treningsøktene ovenfor til du "
 "deaktivere den"
 
-#: manager/templates/schedule/view.html:103
+#: manager/templates/schedule/view.html:102
 msgid "Weeks"
 msgstr "Uker"
 
-#: manager/templates/schedule/view.html:115
+#: manager/templates/schedule/view.html:114
 msgid "Move me"
 msgstr "Flytt meg"
 
-#: manager/templates/schedule/view.html:156
+#: manager/templates/schedule/view.html:168
 msgid "Start schedule"
 msgstr "Start timeplan"
 
-#: manager/templates/schedule/view.html:187
+#: manager/templates/schedule/view.html:197
 #, fuzzy, python-format
 #| msgid ""
 #| "%(weeks)s Week\n"
@@ -2566,11 +2540,11 @@ msgstr[1] ""
 "%(weeks)s Uker\n"
 "                    "
 
-#: manager/templates/schedule/view.html:221
+#: manager/templates/schedule/view.html:231
 msgid "Adding workouts"
 msgstr "Legger til treningsøkter"
 
-#: manager/templates/schedule/view.html:223
+#: manager/templates/schedule/view.html:233
 #, fuzzy
 #| msgid ""
 #| "Add as many workouts to the schedule as you want. You can\n"
@@ -2588,21 +2562,21 @@ msgstr ""
 "en treningsøkt mer\n"
 "enn én gang."
 
-#: manager/templates/schedule/view.html:232
-#: manager/templates/schedule/view.html:243
-#: manager/templates/schedule/view.html:290
+#: manager/templates/schedule/view.html:242
+#: manager/templates/schedule/view.html:256
+#: manager/templates/schedule/view.html:310
 #: manager/templates/workout/view.html:69
-#: manager/templates/workout/view.html:79
-#: manager/templates/workout/view.html:178
+#: manager/templates/workout/view.html:83
+#: manager/templates/workout/view.html:192
 msgid "Export calendar file"
 msgstr "Eksporter kalender fil"
 
-#: manager/templates/schedule/view.html:236
+#: manager/templates/schedule/view.html:248
 msgid "Export this schedule as a calendar file."
 msgstr "Eksporter denne timeplanen som kalenderfil."
 
-#: manager/templates/schedule/view.html:237
-#: manager/templates/workout/view.html:74
+#: manager/templates/schedule/view.html:249
+#: manager/templates/workout/view.html:76
 #, fuzzy
 #| msgid ""
 #| "You can then import the file it into your calendar\n"
@@ -2614,27 +2588,20 @@ msgid ""
 "                        application for example google calendar, outlook or "
 "iCal. This will create\n"
 "                        an appointment for each training day with the "
-"appropriate exercises."
+"appropriate\n"
+"                        exercises."
 msgstr ""
 "Du kan deretter importere denne filen inn i kalenderen din,\n"
 "for eksempel Google Kalender, Outlook eller iCal. Dette vil skape\n"
 "en avtale for hver treningsdag med riktige øvelser."
 
-#: manager/templates/schedule/view.html:258
-#: manager/templates/schedule/view.html:294
-#: manager/templates/workout/view.html:94
-#: manager/templates/workout/view.html:174
+#: manager/templates/schedule/view.html:272
+#: manager/templates/schedule/view.html:315
+#: manager/templates/workout/view.html:99
+#: manager/templates/workout/view.html:188
 msgid "Download as PDF"
 msgstr "Last ned som PDF"
 
-#: manager/templates/schedule/view.html:299
-msgid "Edit schedule"
-msgstr "Endre timeplan"
-
-#: manager/templates/schedule/view.html:304
-msgid "Delete schedule"
-msgstr "Slett timeplan"
-
 #: manager/templates/set/add.html:9
 #, python-format
 msgid "Add exercises to day \"%(day_name)s\""
@@ -2712,56 +2679,6 @@ msgid ""
 msgstr ""
 "Du vil jevnlig motta slike påminnelser til du skriver inn din nåværende vekt."
 
-#: manager/templates/workout/log.html:10 manager/templates/workout/log.html:11
-msgid "Weight log"
-msgstr "Vektlogg"
-
-#: manager/templates/workout/log.html:29
-msgid "Weight log for workout"
-msgstr "Vektlogg for denne treningsøkten"
-
-#: manager/templates/workout/log.html:49
-msgid "Add weight log to this day"
-msgstr "Legg til vektlogg for denne dagen"
-
-#: manager/templates/workout/log.html:69
-msgid "No weight entries here."
-msgstr "Ingen vektoppføring her."
-
-#: manager/templates/workout/log.html:77
-msgid "No exercises for this day."
-msgstr "Ingen øvelser for denne dagen."
-
-#: manager/templates/workout/log.html:90
-msgid ""
-"This page shows the weight logs belonging to this workout\n"
-"only. Click on an exercise to see all the historical data for\n"
-"it."
-msgstr ""
-"Denne siden viser vekt loggene som kun tilhører denne treningsøkten\n"
-"Klikk på en øvelse for å se alle de historiske \n"
-"data."
-
-#: manager/templates/workout/log.html:94
-msgid ""
-"If on a single day there is more than one entry with the\n"
-"same number of repetitions, but different weights, only the entry with the\n"
-"higher weight is shown in the diagram."
-msgstr ""
-"Hvis på en enkelt dag det er mer enn én oppføring med\n"
-"samme antall repetisjoner, men forskjellige vekter, vil kun oppføringen med\n"
-"høyere vekt er vist vises i diagrammet."
-
-#: manager/templates/workout/log.html:98
-msgid ""
-"Note that only entries with a weight unit (kg or lb) and\n"
-"repetitions are charted, other combinations such as time or until failure\n"
-"are ignored here."
-msgstr ""
-"Merk at bare oppføringer med en vektenhet (kg eller lb) og\n"
-"gjentakelser er kartlagt, andre kombinasjoner som tid eller til utmattelse\n"
-"blir ignorert her."
-
 #: manager/templates/workout/overview.html:25
 msgid "No templates found."
 msgstr "Fant ingen maler."
@@ -2797,27 +2714,23 @@ msgstr "Legg til treningssett til dager"
 msgid "Set the repetitions for each set"
 msgstr "Sett repetisjoner for hvert sett"
 
-#: manager/templates/workout/view.html:73
+#: manager/templates/workout/view.html:75
 msgid "Export this workout as a calendar file."
 msgstr "Eksporter denne treningsøkten som kalenderfil."
 
-#: manager/templates/workout/view.html:144
+#: manager/templates/workout/view.html:156
 msgid "Logs"
 msgstr "Logg"
 
-#: manager/templates/workout/view.html:146
+#: manager/templates/workout/view.html:159
 msgid "View logs"
 msgstr "Vis logger"
 
-#: manager/templates/workout/view.html:169 manager/views/schedule_step.py:99
-msgid "Edit workout"
-msgstr "Endre treningsøkt"
-
-#: manager/templates/workout/view.html:182 manager/views/workout.py:281
+#: manager/templates/workout/view.html:195 manager/views/workout.py:281
 msgid "Mark as template"
 msgstr "Marker som mal"
 
-#: manager/views/day.py:109
+#: manager/views/day.py:105
 msgid "Add workout day"
 msgstr "Legg til treningsdag"
 
@@ -2834,6 +2747,10 @@ msgstr "Treningsøkt for %s"
 msgid "Create schedule"
 msgstr "Opprett timeplan"
 
+#: manager/views/schedule_step.py:99
+msgid "Edit workout"
+msgstr "Endre treningsøkt"
+
 #: manager/views/workout.py:209
 msgid "Copy workout"
 msgstr "Kopier treningsøkt"
@@ -2964,7 +2881,7 @@ msgstr "Mengde i gram"
 msgid "Unit amount, e.g. \"1 Cup\" or \"1/2 spoon\""
 msgstr "Enhetsmengde , f.eks \"1 kopp\" eller \"1/2 skje\""
 
-#: nutrition/models/log.py:52 nutrition/models/meal.py:50
+#: nutrition/models/log.py:52 nutrition/models/meal.py:48
 #: nutrition/models/meal_item.py:48 nutrition/models/plan.py:108
 msgid "Nutrition plan"
 msgstr "Ernæringsplan"
@@ -2979,11 +2896,11 @@ msgstr "Måltid"
 msgid "Date and Time (Approx.)"
 msgstr "Tid (ca)"
 
-#: nutrition/models/meal.py:62
+#: nutrition/models/meal.py:60
 msgid "Time (approx)"
 msgstr "Tid (ca)"
 
-#: nutrition/models/meal.py:69
+#: nutrition/models/meal.py:67
 msgid ""
 "Give meals a textual description / name such as \"Breakfast\" or \"after "
 "workout\""
@@ -3121,10 +3038,6 @@ msgstr "Ingen ingredienser."
 msgid "Search"
 msgstr "Søk"
 
-#: nutrition/templates/ingredient/overview.html:62
-msgid "Add ingredient"
-msgstr "Legg til ingrediens"
-
 #: nutrition/templates/ingredient/view.html:45 nutrition/views/plan.py:229
 msgid "Macronutrients"
 msgstr "Makronæringsstoffer"
@@ -3144,20 +3057,11 @@ msgstr "n.A."
 msgid "Others"
 msgstr "Andre"
 
-#: nutrition/templates/ingredient/view.html:144
-#: nutrition/templates/units/list.html:46 nutrition/views/unit.py:86
+#: nutrition/templates/ingredient/view.html:143
+#: nutrition/templates/units/list.html:50 nutrition/views/unit.py:86
 msgid "Add new weight unit"
 msgstr "Legg til vekt enhet"
 
-#: nutrition/templates/ingredient/view.html:206
-#: nutrition/templates/ingredient/view.html:209
-msgid "Edit ingredient"
-msgstr "Endre ingrediens"
-
-#: nutrition/templates/ingredient/view.html:213
-msgid "Delete ingredient"
-msgstr "Slett ingrediens"
-
 #: nutrition/templates/rate/form.html:25
 msgid "Basal metabolic rate"
 msgstr "Basal metabolic rate"
@@ -3811,6 +3715,92 @@ msgstr "Slettet."
 msgid "Delete weight entry for the %s"
 msgstr "Slett vektoppføring for %s"
 
+#, fuzzy
+#~| msgid ""
+#~| "If a license has been localized, e.g. the Creative Commons\n"
+#~| "licenses for the different countries, add them as separate entries here."
+#~ msgid ""
+#~ "If a license has been localized, e.g. the Creative Commons\n"
+#~ "            licenses for the different countries, add them as separate "
+#~ "entries here."
+#~ msgstr ""
+#~ "Hvis en lisens er en lokal lisens, feks Creative Commons\n"
+#~ "lisenser for de ulike landene, legges dem til som separate oppføringer "
+#~ "her."
+
+#~ msgid "Add weight log"
+#~ msgstr "Legg til vektlogg"
+
+#~ msgid "This exercise has no repetitions."
+#~ msgstr "Denne øvelsen har ingen repetisjoner."
+
+#~ msgid "Edit them now."
+#~ msgstr "Rediger dem nå."
+
+#~ msgid "Add exercises to this workout day"
+#~ msgstr "Legg til øvelser for denne treningsdagen"
+
+#~ msgid "Edit schedule"
+#~ msgstr "Endre timeplan"
+
+#~ msgid "Delete schedule"
+#~ msgstr "Slett timeplan"
+
+#~ msgid "Weight log"
+#~ msgstr "Vektlogg"
+
+#~ msgid "Weight log for workout"
+#~ msgstr "Vektlogg for denne treningsøkten"
+
+#~ msgid "Add weight log to this day"
+#~ msgstr "Legg til vektlogg for denne dagen"
+
+#~ msgid "No weight entries here."
+#~ msgstr "Ingen vektoppføring her."
+
+#~ msgid "No exercises for this day."
+#~ msgstr "Ingen øvelser for denne dagen."
+
+#~ msgid ""
+#~ "This page shows the weight logs belonging to this workout\n"
+#~ "only. Click on an exercise to see all the historical data for\n"
+#~ "it."
+#~ msgstr ""
+#~ "Denne siden viser vekt loggene som kun tilhører denne treningsøkten\n"
+#~ "Klikk på en øvelse for å se alle de historiske \n"
+#~ "data."
+
+#~ msgid ""
+#~ "If on a single day there is more than one entry with the\n"
+#~ "same number of repetitions, but different weights, only the entry with "
+#~ "the\n"
+#~ "higher weight is shown in the diagram."
+#~ msgstr ""
+#~ "Hvis på en enkelt dag det er mer enn én oppføring med\n"
+#~ "samme antall repetisjoner, men forskjellige vekter, vil kun oppføringen "
+#~ "med\n"
+#~ "høyere vekt er vist vises i diagrammet."
+
+#~ msgid ""
+#~ "Note that only entries with a weight unit (kg or lb) and\n"
+#~ "repetitions are charted, other combinations such as time or until "
+#~ "failure\n"
+#~ "are ignored here."
+#~ msgstr ""
+#~ "Merk at bare oppføringer med en vektenhet (kg eller lb) og\n"
+#~ "gjentakelser er kartlagt, andre kombinasjoner som tid eller til "
+#~ "utmattelse\n"
+#~ "blir ignorert her."
+
+#~ msgid "Add ingredient"
+#~ msgstr "Legg til ingrediens"
+
+#~ msgid "Edit ingredient"
+#~ msgstr "Endre ingrediens"
+
+#~ msgid "Delete ingredient"
+#~ msgstr "Slett ingrediens"
+
 #~ msgid "Ingredients pending review"
 #~ msgstr "Ingredienser som venter på godkjenning"
 
diff --git a/wger/locale/os/LC_MESSAGES/django.po b/wger/locale/os/LC_MESSAGES/django.po
index 04006e0c5..9d2a60e7a 100644
--- a/wger/locale/os/LC_MESSAGES/django.po
+++ b/wger/locale/os/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: wger Workout Manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-07-14 15:59+0200\n"
+"POT-Creation-Date: 2024-11-14 13:09+0100\n"
 "PO-Revision-Date: 2021-04-11 18:54+0000\n"
 "Last-Translator: rge <roland@geider.net>\n"
 "Language-Team: Ossetic (http://www.transifex.com/rge/wger-workout-manager/"
@@ -19,7 +19,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: config/models/gym_config.py:46 gym/templates/gym/list.html:53
+#: config/models/gym_config.py:46 gym/templates/gym/list.html:56
 msgid "Default gym"
 msgstr ""
 
@@ -29,28 +29,28 @@ msgid ""
 "registered users to this gym and update all existing users without a gym."
 msgstr ""
 
-#: config/views/gym_config.py:42 core/templates/language/view.html:67
-#: core/templates/license/list.html:17 core/templates/misc/license/list.html:18
+#: config/views/gym_config.py:42 core/templates/language/view.html:64
+#: core/templates/license/list.html:17
 #: core/templates/repetition_unit/list.html:18
-#: core/templates/tags/render_day.html:39
-#: core/templates/tags/render_day.html:75 core/templates/user/overview.html:204
-#: core/templates/user/overview.html:445
+#: core/templates/user/overview.html:204 core/templates/user/overview.html:467
 #: core/templates/weight_unit/list.html:18
 #: exercises/templates/categories/admin-overview.html:17
 #: exercises/templates/equipment/admin-overview.html:17
-#: exercises/templates/muscles/admin-overview.html:17
-#: gallery/views/images.py:98 gym/templates/admin_notes/list.html:32
-#: gym/templates/contract/list.html:31 gym/templates/contract/view.html:107
-#: gym/templates/contract_option/list.html:32
-#: gym/templates/contract_type/list.html:32 gym/templates/document/list.html:38
-#: gym/templates/gym/list.html:20 gym/templates/gym/list.html:46
-#: gym/templates/gym/member_list.html:87 gym/templates/gym/member_list.html:140
-#: gym/templates/gym/member_list.html:176
-#: manager/templates/calendar/day.html:68
-#: manager/templates/calendar/month.html:85
-#: manager/templates/calendar/partial_overview_table.html:18
-#: manager/templates/schedule/view.html:118
-#: nutrition/templates/ingredient/view.html:165
+#: exercises/templates/muscles/admin-overview.html:16
+#: gallery/views/images.py:98 gym/templates/admin_notes/list.html:31
+#: gym/templates/contract/list.html:30 gym/templates/contract/view.html:106
+#: gym/templates/contract_option/list.html:29
+#: gym/templates/contract_type/list.html:30 gym/templates/document/list.html:38
+#: gym/templates/gym/list.html:19 gym/templates/gym/list.html:48
+#: gym/templates/gym/member_list.html:94 gym/templates/gym/member_list.html:152
+#: gym/templates/gym/member_list.html:190
+#: manager/templates/calendar/day.html:67
+#: manager/templates/calendar/month.html:84
+#: manager/templates/calendar/partial_overview_table.html:16
+#: manager/templates/schedule/view.html:318
+#: manager/templates/workout/view.html:181
+#: nutrition/templates/ingredient/view.html:164
+#: nutrition/templates/ingredient/view.html:209
 #: nutrition/templates/units/list.html:19
 msgid "Edit"
 msgstr "Ивын"
@@ -84,8 +84,8 @@ msgstr ""
 msgid "Empty placeholder schedule"
 msgstr ""
 
-#: core/forms.py:69 core/templates/navigation.html:285
-#: core/templates/navigation.html:291 core/templates/user/login.html:4
+#: core/forms.py:69 core/templates/navigation.html:284
+#: core/templates/navigation.html:290 core/templates/user/login.html:4
 #: software/templates/features.html:82 software/templates/features.html:427
 msgid "Login"
 msgstr ""
@@ -95,14 +95,14 @@ msgstr ""
 msgid "First name"
 msgstr ""
 
-#: core/forms.py:109 core/forms.py:215 core/templates/user/overview.html:266
+#: core/forms.py:109 core/forms.py:215 core/templates/user/overview.html:284
 #: gym/views/export.py:62 gym/views/gym.py:217
 msgid "Last name"
 msgstr ""
 
-#: core/forms.py:111 core/forms.py:180 core/templates/user/overview.html:270
+#: core/forms.py:111 core/forms.py:180 core/templates/user/overview.html:288
 #: gym/models/contract.py:256 gym/models/gym.py:58
-#: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:104
+#: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:116
 #: gym/templates/gym/new_user.html:30 gym/views/export.py:60
 #: mailer/templates/mailer/gym/form.html:4
 #: mailer/templates/mailer/gym/overview.html:4
@@ -131,8 +131,8 @@ msgstr ""
 msgid "Other settings"
 msgstr ""
 
-#: core/forms.py:174 core/views/user.py:624 core/views/user.py:639
-#: core/views/user.py:651 gym/forms.py:73 manager/templates/log/add.html:65
+#: core/forms.py:174 core/views/user.py:623 core/views/user.py:638
+#: core/views/user.py:650 gym/forms.py:73 manager/templates/log/add.html:65
 #: manager/templates/set/add.html:70 manager/views/workout.py:203
 #: utils/generic_views.py:143
 msgid "Save"
@@ -155,26 +155,25 @@ msgstr ""
 msgid "Please enter your current password."
 msgstr ""
 
-#: core/forms.py:242 core/templates/language/view.html:73
-#: core/templates/license/list.html:19 core/templates/misc/license/list.html:22
-#: core/templates/repetition_unit/list.html:20
-#: core/templates/tags/render_day.html:45
-#: core/templates/tags/render_day.html:81 core/templates/user/overview.html:217
-#: core/templates/weight_unit/list.html:20
-#: exercises/templates/categories/admin-overview.html:19
-#: exercises/templates/equipment/admin-overview.html:19
-#: exercises/templates/muscles/admin-overview.html:19
-#: gym/templates/admin_notes/list.html:40
-#: gym/templates/contract_option/list.html:41
-#: gym/templates/contract_type/list.html:41 gym/templates/document/list.html:46
-#: gym/templates/gym/list.html:22 manager/templates/calendar/day.html:73
-#: manager/templates/calendar/month.html:89
-#: manager/templates/calendar/partial_overview_table.html:23
-#: manager/templates/schedule/view.html:122
-#: manager/templates/workout/view.html:188
-#: nutrition/templates/ingredient/view.html:166
+#: core/forms.py:242 core/templates/language/view.html:70
+#: core/templates/license/list.html:21
+#: core/templates/repetition_unit/list.html:22
+#: core/templates/user/overview.html:233
+#: core/templates/weight_unit/list.html:22
+#: exercises/templates/categories/admin-overview.html:21
+#: exercises/templates/equipment/admin-overview.html:21
+#: exercises/templates/muscles/admin-overview.html:20
+#: gym/templates/admin_notes/list.html:37
+#: gym/templates/contract_option/list.html:35
+#: gym/templates/contract_type/list.html:36 gym/templates/document/list.html:46
+#: gym/templates/gym/list.html:23 manager/templates/calendar/day.html:73
+#: manager/templates/calendar/month.html:88
+#: manager/templates/calendar/partial_overview_table.html:22
+#: manager/templates/schedule/view.html:324
+#: manager/templates/workout/view.html:202
+#: nutrition/templates/ingredient/view.html:168
 #: nutrition/templates/ingredient/view.html:215
-#: nutrition/templates/units/list.html:22
+#: nutrition/templates/units/list.html:25
 msgid "Delete"
 msgstr "Схафын"
 
@@ -186,9 +185,9 @@ msgstr ""
 msgid "The form is secured with reCAPTCHA"
 msgstr ""
 
-#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:285
-#: core/templates/navigation.html:297 core/templates/template.html:149
-#: core/templates/user/login.html:20 core/views/user.py:298
+#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:284
+#: core/templates/navigation.html:296 core/templates/template.html:151
+#: core/templates/user/login.html:20 core/views/user.py:297
 #: software/templates/features.html:87 software/templates/features.html:422
 msgid "Register"
 msgstr ""
@@ -423,18 +422,18 @@ msgid "The sum of all hours has to be 24"
 msgstr ""
 
 #: core/models/rep_unit.py:36 core/models/weight_unit.py:36
-#: core/templates/user/overview.html:262 core/views/user.py:599
+#: core/templates/user/overview.html:280 core/views/user.py:598
 #: exercises/models/category.py:29 exercises/models/equipment.py:29
 #: exercises/models/exercise.py:59 exercises/models/muscle.py:36
 #: gym/models/contract.py:52 gym/models/contract.py:103 gym/models/gym.py:46
 #: gym/models/user_document.py:84 gym/templates/contract/view.html:50
-#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:96
+#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:108
 #: gym/views/gym.py:158 manager/models/schedule.py:55
 #: manager/models/workout.py:57 measurements/models/category.py:36
 #: nutrition/models/ingredient.py:111
-#: nutrition/models/ingredient_category.py:27 nutrition/models/meal.py:67
+#: nutrition/models/ingredient_category.py:27 nutrition/models/meal.py:65
 #: nutrition/models/weight_unit.py:38
-#: nutrition/templates/ingredient/view.html:152
+#: nutrition/templates/ingredient/view.html:151
 msgid "Name"
 msgstr "Ном"
 
@@ -479,7 +478,7 @@ msgstr ""
 msgid "Back to \"%(target)s\""
 msgstr ""
 
-#: core/templates/delete.html:15
+#: core/templates/delete.html:4
 msgid "Are you sure you want to delete this? This action cannot be undone."
 msgstr ""
 
@@ -535,7 +534,7 @@ msgstr ""
 msgid "Dashboard"
 msgstr ""
 
-#: core/templates/language/overview.html:4 core/templates/navigation.html:345
+#: core/templates/language/overview.html:4 core/templates/navigation.html:344
 msgid "Languages"
 msgstr ""
 
@@ -545,79 +544,72 @@ msgstr ""
 
 #: core/templates/language/overview.html:22
 #: manager/templates/calendar/month.html:132
-#: manager/templates/schedule/overview.html:28
-#: manager/templates/schedule/view.html:144
+#: manager/templates/schedule/view.html:154
 #: manager/templates/workout/overview.html:28
 #: nutrition/templates/ingredient/overview.html:38
 msgid "Add one now."
 msgstr ""
 
-#: core/templates/language/overview.html:35 core/templates/license/list.html:40
-#: core/templates/misc/license/list.html:43
-#: core/templates/repetition_unit/list.html:43
-#: core/templates/user/overview.html:326 core/templates/user/overview.html:365
-#: core/templates/user/overview.html:401
-#: core/templates/weight_unit/list.html:43 core/views/languages.py:74
+#: core/templates/language/overview.html:34 core/templates/license/list.html:43
+#: core/templates/repetition_unit/list.html:46
+#: core/templates/user/overview.html:344 core/templates/user/overview.html:384
+#: core/templates/user/overview.html:422
+#: core/templates/weight_unit/list.html:46 core/views/languages.py:74
 #: core/views/license.py:66 core/views/repetition_units.py:66
 #: core/views/weight_units.py:66
-#: exercises/templates/categories/admin-overview.html:38
-#: gallery/views/images.py:63 gym/templates/admin_notes/list.html:67
-#: gym/templates/contract/list.html:73
-#: gym/templates/contract_option/list.html:72
-#: gym/templates/contract_type/list.html:72 gym/templates/document/list.html:79
-#: gym/templates/gym/member_list.html:211
-#: gym/templates/gym/member_list.html:244
-#: gym/templates/gym/member_list.html:281
+#: exercises/templates/categories/admin-overview.html:40
+#: exercises/templates/equipment/admin-overview.html:39
+#: exercises/templates/muscles/admin-overview.html:40
+#: gallery/views/images.py:63 gym/templates/admin_notes/list.html:64
+#: gym/templates/contract/list.html:69
+#: gym/templates/contract_option/list.html:65
+#: gym/templates/contract_type/list.html:66 gym/templates/document/list.html:78
+#: gym/templates/gym/member_list.html:228
+#: gym/templates/gym/member_list.html:264
+#: gym/templates/gym/member_list.html:303
 #: mailer/templates/mailer/gym/overview.html:43
+#: nutrition/templates/ingredient/overview.html:60
 msgid "Add"
 msgstr "Бафтауын"
 
 #: core/templates/language/view.html:61 core/templates/user/api_key.html:44
-#: core/templates/user/preferences.html:45 gym/models/contract.py:203
-#: gym/templates/contract/view.html:41 gym/templates/contract/view.html:106
-#: gym/templates/gym/member_list.html:248
-#: manager/templates/schedule/view.html:285
-#: manager/templates/workout/view.html:163
-#: nutrition/templates/ingredient/view.html:202
+#: core/templates/user/preferences.html:50 gym/models/contract.py:203
+#: gym/templates/contract/view.html:41 gym/templates/gym/member_list.html:270
+#: manager/templates/schedule/view.html:304
+#: manager/templates/workout/view.html:177
+#: nutrition/templates/ingredient/view.html:206
 msgid "Options"
 msgstr "Фадӕттӕ"
 
-#: core/templates/license/list.html:4 core/templates/misc/license/list.html:4
+#: core/templates/license/list.html:4
 msgid "License list"
 msgstr ""
 
-#: core/templates/license/list.html:26 core/templates/misc/license/list.html:30
-#: core/templates/repetition_unit/list.html:28
+#: core/templates/license/list.html:30
+#: core/templates/repetition_unit/list.html:32
 #: core/templates/user/overview.html:104 core/templates/user/overview.html:136
-#: core/templates/user/overview.html:185 core/templates/user/overview.html:347
-#: core/templates/user/overview.html:383 core/templates/user/overview.html:427
-#: core/templates/weight_unit/list.html:28
-#: exercises/templates/categories/admin-overview.html:26
-#: exercises/templates/equipment/admin-overview.html:26
-#: exercises/templates/muscles/admin-overview.html:26
-#: gym/templates/admin_notes/list.html:52 gym/templates/contract/list.html:60
-#: gym/templates/contract_option/list.html:58
-#: gym/templates/contract_type/list.html:58 gym/templates/document/list.html:64
-#: gym/templates/gym/list.html:29 gym/templates/gym/member_list.html:229
-#: gym/templates/gym/member_list.html:262
-#: gym/templates/gym/member_list.html:299
+#: core/templates/user/overview.html:185 core/templates/user/overview.html:365
+#: core/templates/user/overview.html:404 core/templates/user/overview.html:448
+#: core/templates/weight_unit/list.html:32
+#: exercises/templates/categories/admin-overview.html:30
+#: exercises/templates/equipment/admin-overview.html:30
+#: exercises/templates/muscles/admin-overview.html:29
+#: gym/templates/admin_notes/list.html:50 gym/templates/contract/list.html:57
+#: gym/templates/contract_option/list.html:52
+#: gym/templates/contract_type/list.html:53 gym/templates/document/list.html:64
+#: gym/templates/gym/list.html:32 gym/templates/gym/member_list.html:248
+#: gym/templates/gym/member_list.html:284
+#: gym/templates/gym/member_list.html:321
 #: mailer/templates/mailer/gym/overview.html:30
-#: manager/templates/calendar/day.html:87
-#: nutrition/templates/units/list.html:29
+#: manager/templates/calendar/day.html:88
+#: nutrition/templates/units/list.html:34
 msgid "Nothing found"
 msgstr ""
 
-#: core/templates/misc/about.html:4 core/templates/template.html:175
+#: core/templates/misc/about.html:4 core/templates/template.html:188
 msgid "Imprint"
 msgstr ""
 
-#: core/templates/misc/license/list.html:47
-msgid ""
-"If a license has been localized, e.g. the Creative Commons\n"
-"            licenses for the different countries, add them as separate "
-"entries here."
-msgstr ""
-
 #: core/templates/navigation.html:28 software/templates/features.html:437
 msgid "Training"
 msgstr "Фӕлтӕрд"
@@ -662,8 +654,8 @@ msgstr ""
 msgid "Exercises"
 msgstr "Фӕлтӕрӕнтӕ"
 
-#: core/templates/navigation.html:111 core/templates/navigation.html:184
-#: core/templates/navigation.html:340
+#: core/templates/navigation.html:111 core/templates/navigation.html:185
+#: core/templates/navigation.html:339
 msgid "Administration"
 msgstr "Администраци"
 
@@ -702,87 +694,87 @@ msgstr ""
 msgid "Daily calories calculator"
 msgstr ""
 
-#: core/templates/navigation.html:179
+#: core/templates/navigation.html:180
 #: nutrition/templates/ingredient/overview.html:10
 msgid "Ingredient overview"
 msgstr ""
 
-#: core/templates/navigation.html:187 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:189 nutrition/templates/units/list.html:6
 msgid "Ingredient weight units"
 msgstr ""
 
-#: core/templates/navigation.html:203 software/templates/features.html:442
+#: core/templates/navigation.html:205 software/templates/features.html:442
 msgid "Body weight"
 msgstr ""
 
-#: core/templates/navigation.html:210 core/templates/user/overview.html:114
+#: core/templates/navigation.html:212 core/templates/user/overview.html:114
 msgid "Weight overview"
 msgstr ""
 
-#: core/templates/navigation.html:217 weight/views.py:65
+#: core/templates/navigation.html:216 weight/views.py:65
 msgid "Add weight entry"
 msgstr ""
 
-#: core/templates/navigation.html:231
+#: core/templates/navigation.html:230
 msgid "About this software"
 msgstr ""
 
-#: core/templates/navigation.html:237 software/templates/about_us.html:5
+#: core/templates/navigation.html:236 software/templates/about_us.html:5
 msgid "About us"
 msgstr ""
 
-#: core/templates/navigation.html:243 software/templates/features.html:507
+#: core/templates/navigation.html:242 software/templates/features.html:507
 msgid "REST API"
 msgstr ""
 
-#: core/templates/navigation.html:249 utils/models.py:45
+#: core/templates/navigation.html:248 utils/models.py:45
 msgid "License"
 msgstr ""
 
-#: core/templates/navigation.html:255
+#: core/templates/navigation.html:254
 msgid "Developer documentation"
 msgstr ""
 
-#: core/templates/navigation.html:262
+#: core/templates/navigation.html:261
 msgid "Get the code"
 msgstr ""
 
-#: core/templates/navigation.html:269 core/templates/template.html:214
+#: core/templates/navigation.html:268 core/templates/template.html:227
 #: software/templates/features.html:582
 msgid "Translate"
 msgstr ""
 
-#: core/templates/navigation.html:303 core/templates/user/login.html:28
+#: core/templates/navigation.html:302 core/templates/user/login.html:28
 msgid "Reset password"
 msgstr ""
 
-#: core/templates/navigation.html:321
+#: core/templates/navigation.html:320
 msgid "My preferences"
 msgstr ""
 
-#: core/templates/navigation.html:330
+#: core/templates/navigation.html:329
 msgid "Logout"
 msgstr ""
 
-#: core/templates/navigation.html:353
+#: core/templates/navigation.html:352
 msgid "Licenses"
 msgstr ""
 
-#: core/templates/navigation.html:361
+#: core/templates/navigation.html:360
 #: core/templates/repetition_unit/list.html:4
 msgid "Repetition units"
 msgstr ""
 
-#: core/templates/navigation.html:369 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:368 core/templates/weight_unit/list.html:4
 #: nutrition/templates/ingredient/view.html:141
 msgid "Weight units"
 msgstr ""
 
-#: core/templates/navigation.html:377 core/templates/user/list.html:4
+#: core/templates/navigation.html:376 core/templates/user/list.html:4
 msgid "User list"
 msgstr ""
 
-#: core/templates/navigation.html:383
+#: core/templates/navigation.html:382
 msgid "Gyms"
 msgstr ""
 
@@ -841,55 +833,28 @@ msgstr ""
 msgid "next"
 msgstr ""
 
-#: core/templates/tags/render_day.html:34
-msgid "Add weight log"
+#: core/templates/tags/render_day.html:44
+msgid "Placeholder image for translation"
 msgstr ""
 
-#: core/templates/tags/render_day.html:116
-msgid "Placeholder image for exercise"
-msgstr ""
-
-#: core/templates/tags/render_day.html:133
-msgid "This exercise has no repetitions."
-msgstr ""
-
-#: core/templates/tags/render_day.html:136
-msgid "Edit them now."
-msgstr ""
-
-#: core/templates/tags/render_day.html:162
-msgid "Add exercises to this workout day"
-msgstr ""
-
-#: core/templates/tags/render_weight_log.html:17 manager/helpers.py:86
-#: manager/models/setting.py:72 manager/templates/set/formset.html:9
-msgid "Reps"
-msgstr ""
-
-#: core/templates/tags/render_weight_log.html:30 manager/forms.py:191
-#: manager/models/log.py:103 manager/models/setting.py:102
-#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
-msgid "RiR"
-msgstr ""
-
-#: core/templates/template.html:122 manager/templates/calendar/month.html:138
-#: manager/templates/schedule/view.html:248
-#: manager/templates/schedule/view.html:269
-#: manager/templates/workout/view.html:84
-#: manager/templates/workout/view.html:137
+#: core/templates/template.html:124 manager/templates/calendar/month.html:138
+#: manager/templates/schedule/view.html:262
+#: manager/templates/schedule/view.html:287
+#: manager/templates/workout/view.html:89
+#: manager/templates/workout/view.html:149
 msgid "Close"
 msgstr ""
 
-#: core/templates/template.html:138
+#: core/templates/template.html:140
 msgid ""
 "You are using a guest account, data entered will be deleted after a week."
 msgstr ""
 
-#: core/templates/template.html:143
+#: core/templates/template.html:145
 msgid "Create some demo entries"
 msgstr ""
 
-#: core/templates/template.html:180 software/templates/features.html:547
+#: core/templates/template.html:193 software/templates/features.html:547
 #: software/templates/tos.html:7
 msgid "Terms of service"
 msgstr ""
@@ -898,7 +863,7 @@ msgstr ""
 msgid "Features"
 msgstr ""
 
-#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:54
+#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:59
 msgid "API key"
 msgstr ""
 
@@ -937,17 +902,17 @@ msgstr ""
 msgid "Documentation"
 msgstr ""
 
-#: core/templates/user/delete_account.html:4
-#: core/templates/user/preferences.html:59
+#: core/templates/user/delete_account.html:3
+#: core/templates/user/preferences.html:62
 msgid "Delete account"
 msgstr ""
 
-#: core/templates/user/delete_account.html:17
+#: core/templates/user/delete_account.html:9
 #: exercises/templates/history/overview.html:93
 msgid "Are you sure?"
 msgstr ""
 
-#: core/templates/user/delete_account.html:22
+#: core/templates/user/delete_account.html:14
 #, python-format
 msgid ""
 "This action will delete the user account \"%(username)s\".\n"
@@ -966,22 +931,22 @@ msgstr ""
 
 #: core/templates/user/overview.html:25 core/templates/user/overview.html:68
 #: core/templates/user/overview.html:112 core/templates/user/overview.html:144
-#: core/templates/user/overview.html:330 core/templates/user/overview.html:369
-#: core/templates/user/overview.html:405
+#: core/templates/user/overview.html:348 core/templates/user/overview.html:390
+#: core/templates/user/overview.html:426
 #, python-format
 msgid "last %(number)s"
 msgstr ""
 
 #: core/templates/user/overview.html:27 core/templates/user/overview.html:146
-#: core/templates/user/overview.html:325 core/templates/user/overview.html:364
-#: core/templates/user/overview.html:400 gym/templates/gym/member_list.html:210
-#: gym/templates/gym/member_list.html:243
-#: gym/templates/gym/member_list.html:280
+#: core/templates/user/overview.html:343 core/templates/user/overview.html:382
+#: core/templates/user/overview.html:421 gym/templates/gym/member_list.html:226
+#: gym/templates/gym/member_list.html:262
+#: gym/templates/gym/member_list.html:302
 msgid "Overview"
 msgstr ""
 
 #: core/templates/user/overview.html:28
-#: manager/templates/schedule/view.html:163
+#: manager/templates/schedule/view.html:172
 #: manager/templates/workout/overview.html:39 manager/views/schedule_step.py:60
 msgid "Add workout"
 msgstr ""
@@ -1013,38 +978,36 @@ msgstr "Ӕмбарынгӕнӕн"
 msgid "Number of logs (days)"
 msgstr ""
 
-#: core/templates/user/overview.html:37 core/views/user.py:600
+#: core/templates/user/overview.html:37 core/views/user.py:599
 #: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:158
 msgid "Last activity"
 msgstr ""
 
 #: core/templates/user/overview.html:58
 #: manager/templates/calendar/month.html:128
-#: manager/templates/schedule/view.html:144
 #: manager/templates/workout/overview.html:28
 msgid "No workouts found."
 msgstr ""
 
 #: core/templates/user/overview.html:68 manager/forms.py:280
-#: manager/templates/workout/view.html:106
+#: manager/templates/workout/view.html:114
 msgid "Log"
 msgstr ""
 
 #: core/templates/user/overview.html:77 manager/models/session.py:83
-#: manager/templates/calendar/partial_overview_table.html:52
+#: manager/templates/calendar/partial_overview_table.html:54
 msgid "General impression"
 msgstr ""
 
-#: core/templates/user/overview.html:78 core/templates/user/overview.html:369
+#: core/templates/user/overview.html:78 core/templates/user/overview.html:390
 #: manager/models/session.py:73
-#: manager/templates/calendar/partial_overview_table.html:56
-#: manager/templates/workout/log.html:89
+#: manager/templates/calendar/partial_overview_table.html:58
 msgid "Notes"
 msgstr ""
 
 #: core/templates/user/overview.html:79
 #: exercises/templates/history/overview.html:30
-#: manager/templates/calendar/partial_overview_table.html:42
+#: manager/templates/calendar/partial_overview_table.html:44
 msgid "Time"
 msgstr ""
 
@@ -1082,121 +1045,121 @@ msgstr ""
 msgid "kcal"
 msgstr ""
 
-#: core/templates/user/overview.html:201 core/templates/user/overview.html:322
-#: core/templates/user/overview.html:361 core/templates/user/overview.html:397
-#: core/templates/user/overview.html:442 gym/templates/gym/list.html:42
-#: gym/templates/gym/member_list.html:84 gym/templates/gym/member_list.html:137
-#: gym/templates/gym/member_list.html:173
-#: gym/templates/gym/member_list.html:207
-#: gym/templates/gym/member_list.html:240
-#: gym/templates/gym/member_list.html:277
-#: manager/templates/schedule/view.html:100
+#: core/templates/user/overview.html:201 core/templates/user/overview.html:340
+#: core/templates/user/overview.html:379 core/templates/user/overview.html:418
+#: core/templates/user/overview.html:463 gym/templates/gym/list.html:45
+#: gym/templates/gym/member_list.html:91 gym/templates/gym/member_list.html:149
+#: gym/templates/gym/member_list.html:187
+#: gym/templates/gym/member_list.html:223
+#: gym/templates/gym/member_list.html:259
+#: gym/templates/gym/member_list.html:299
+#: manager/templates/schedule/view.html:99
 msgid "Actions"
 msgstr ""
 
-#: core/templates/user/overview.html:207
+#: core/templates/user/overview.html:210
 msgid "Deactivate user"
 msgstr ""
 
-#: core/templates/user/overview.html:209
+#: core/templates/user/overview.html:214
 msgid "Activate user"
 msgstr ""
 
-#: core/templates/user/overview.html:211
+#: core/templates/user/overview.html:223
 msgid "Reset user password"
 msgstr ""
 
-#: core/templates/user/overview.html:214 gym/templates/gym/member_list.html:30
+#: core/templates/user/overview.html:227 gym/templates/gym/member_list.html:30
 msgid "Roles"
 msgstr ""
 
-#: core/templates/user/overview.html:225
+#: core/templates/user/overview.html:243
 msgid "Password reset confirmation"
 msgstr ""
 
-#: core/templates/user/overview.html:229
+#: core/templates/user/overview.html:247
 msgid "Do you really want to change this user&#39;s password?"
 msgstr ""
 
-#: core/templates/user/overview.html:232
+#: core/templates/user/overview.html:250
 #: exercises/templates/history/overview.html:106
 msgid "No"
 msgstr ""
 
-#: core/templates/user/overview.html:233
+#: core/templates/user/overview.html:251
 #: exercises/templates/history/overview.html:99
 msgid "Yes"
 msgstr ""
 
-#: core/templates/user/overview.html:254 gym/templates/gym/member_list.html:93
+#: core/templates/user/overview.html:272 gym/templates/gym/member_list.html:105
 msgid "Details"
 msgstr ""
 
-#: core/templates/user/overview.html:258 gym/views/export.py:57
-#: manager/helpers.py:86 manager/templates/schedule/view.html:98
+#: core/templates/user/overview.html:276 gym/views/export.py:57
+#: manager/helpers.py:86 manager/templates/schedule/view.html:97
 msgid "Nr."
 msgstr "Н."
 
-#: core/templates/user/overview.html:280 gym/models/contract.py:287
+#: core/templates/user/overview.html:298 gym/models/contract.py:287
 #: gym/models/gym.py:50 gym/templates/contract/view.html:75
-#: gym/templates/gym/member_list.html:100 gym/views/export.py:68
+#: gym/templates/gym/member_list.html:112 gym/views/export.py:68
 msgid "Phone"
 msgstr ""
 
-#: core/templates/user/overview.html:284 gym/templates/contract/view.html:87
-#: gym/templates/gym/member_list.html:118
+#: core/templates/user/overview.html:302 gym/templates/contract/view.html:87
+#: gym/templates/gym/member_list.html:130
 msgid "Address"
 msgstr ""
 
-#: core/templates/user/overview.html:295
+#: core/templates/user/overview.html:313
 msgid "Registered"
 msgstr ""
 
-#: core/templates/user/overview.html:299
+#: core/templates/user/overview.html:317
 msgid "Last login"
 msgstr ""
 
-#: core/templates/user/overview.html:304
+#: core/templates/user/overview.html:322
 msgid "Status"
 msgstr ""
 
-#: core/templates/user/overview.html:307
+#: core/templates/user/overview.html:325
 msgid "Active"
 msgstr ""
 
-#: core/templates/user/overview.html:309
+#: core/templates/user/overview.html:327
 msgid "Inactive"
 msgstr ""
 
-#: core/templates/user/overview.html:330 gym/templates/contract/list.html:4
-#: gym/templates/gym/member_list.html:202
+#: core/templates/user/overview.html:348 gym/templates/contract/list.html:4
+#: gym/templates/gym/member_list.html:218
 msgid "Contracts"
 msgstr ""
 
-#: core/templates/user/overview.html:405 gym/templates/document/list.html:4
+#: core/templates/user/overview.html:426 gym/templates/document/list.html:4
 msgid "Documents"
 msgstr ""
 
-#: core/templates/user/overview.html:412 gym/templates/document/list.html:32
-#: manager/forms.py:292 manager/templates/workout/view.html:132
+#: core/templates/user/overview.html:433 gym/templates/document/list.html:33
+#: manager/forms.py:292 manager/templates/workout/view.html:143
 msgid "Download"
 msgstr ""
 
-#: core/templates/user/overview.html:450 gym/views/admin_config.py:44
+#: core/templates/user/overview.html:474 gym/views/admin_config.py:44
 #: gym/views/admin_config.py:58 gym/views/user_config.py:46
 msgid "Configuration"
 msgstr ""
 
-#: core/templates/user/overview.html:453 gym/models/user_config.py:92
+#: core/templates/user/overview.html:477 gym/models/user_config.py:92
 msgid "Include in inactive overview"
 msgstr ""
 
-#: core/templates/user/overview.html:486
+#: core/templates/user/overview.html:510
 #, python-format
 msgid "Admin login is only available for users in %(gym_name)s"
 msgstr ""
 
-#: core/templates/user/overview.html:490
+#: core/templates/user/overview.html:514
 msgid "Log in as this user"
 msgstr ""
 
@@ -1216,19 +1179,19 @@ msgstr ""
 msgid "Send verification email"
 msgstr ""
 
-#: core/templates/user/preferences.html:30
+#: core/templates/user/preferences.html:31
 msgid "You need to verify your email to contribute exercises"
 msgstr ""
 
-#: core/templates/user/preferences.html:50 core/views/user.py:611
+#: core/templates/user/preferences.html:55 core/views/user.py:610
 msgid "Change password"
 msgstr ""
 
-#: core/templatetags/wger_extras.py:205 i18n.tpl:37
+#: core/templatetags/wger_extras.py:197 i18n.tpl:37
 msgid "kg"
 msgstr ""
 
-#: core/templatetags/wger_extras.py:207
+#: core/templatetags/wger_extras.py:199
 #: nutrition/templates/ingredient/view.html:60
 #: nutrition/templates/ingredient/view.html:66
 #: nutrition/templates/ingredient/view.html:73
@@ -1240,11 +1203,11 @@ msgctxt "weight unit, i.e. grams"
 msgid "g"
 msgstr ""
 
-#: core/templatetags/wger_extras.py:210 i18n.tpl:38
+#: core/templatetags/wger_extras.py:202 i18n.tpl:38
 msgid "lb"
 msgstr ""
 
-#: core/templatetags/wger_extras.py:212
+#: core/templatetags/wger_extras.py:204
 msgctxt "weight unit, i.e. ounces"
 msgid "oz"
 msgstr ""
@@ -1271,13 +1234,13 @@ msgid "Delete {0}?"
 msgstr ""
 
 #: core/views/languages.py:111 core/views/license.py:85
-#: core/views/repetition_units.py:86 core/views/user.py:474
+#: core/views/repetition_units.py:86 core/views/user.py:473
 #: core/views/weight_units.py:86 exercises/views/categories.py:98
 #: exercises/views/equipment.py:81 exercises/views/muscles.py:87
 #: gym/views/admin_notes.py:161 gym/views/config.py:68
 #: gym/views/contract.py:186 gym/views/contract_option.py:123
 #: gym/views/contract_type.py:123 gym/views/document.py:171
-#: gym/views/gym.py:463 manager/views/day.py:100 manager/views/schedule.py:333
+#: gym/views/gym.py:463 manager/views/day.py:96 manager/views/schedule.py:333
 #: manager/views/workout.py:267 nutrition/views/ingredient.py:145
 #: nutrition/views/unit.py:143
 #, python-brace-format
@@ -1303,48 +1266,48 @@ msgstr ""
 msgid "Your feedback was successfully sent. Thank you!"
 msgstr ""
 
-#: core/views/user.py:156
+#: core/views/user.py:155
 #, python-brace-format
 msgid "Account \"{0}\" was successfully deleted"
 msgstr ""
 
-#: core/views/user.py:292
+#: core/views/user.py:291
 msgid "You were successfully registered"
 msgstr ""
 
-#: core/views/user.py:351
+#: core/views/user.py:350
 msgid "Settings successfully updated"
 msgstr ""
 
-#: core/views/user.py:390
+#: core/views/user.py:389
 msgid "The user was successfully deactivated"
 msgstr ""
 
-#: core/views/user.py:427
+#: core/views/user.py:426
 msgid "The user was successfully activated"
 msgstr ""
 
-#: core/views/user.py:442
+#: core/views/user.py:441
 msgid "Edit user"
 msgstr ""
 
-#: core/views/user.py:597 gym/templates/gym/member_list.html:26
+#: core/views/user.py:596 gym/templates/gym/member_list.html:26
 #: gym/views/gym.py:158
 msgid "ID"
 msgstr ""
 
-#: core/views/user.py:598 gym/forms.py:95 gym/templates/contract/view.html:55
+#: core/views/user.py:597 gym/forms.py:95 gym/templates/contract/view.html:55
 #: gym/templates/gym/member_list.html:27 gym/views/export.py:59
 #: gym/views/gym.py:158 gym/views/gym.py:217
 msgid "Username"
 msgstr ""
 
-#: core/views/user.py:601 gym/templates/gym/new_user.html:34
+#: core/views/user.py:600 gym/templates/gym/new_user.html:34
 #: gym/views/export.py:58 gym/views/gym.py:217
 msgid "Gym"
 msgstr ""
 
-#: core/views/user.py:660
+#: core/views/user.py:659
 #, python-format
 msgid "A verification email was sent to %(email)s"
 msgstr ""
@@ -1498,11 +1461,6 @@ msgstr ""
 msgid "Equipment list"
 msgstr ""
 
-#: exercises/templates/equipment/admin-overview.html:39
-#: exercises/views/equipment.py:92
-msgid "Add new equipment"
-msgstr ""
-
 #: exercises/templates/history/overview.html:11
 #, fuzzy
 #| msgid "Exercise Categories"
@@ -1554,11 +1512,6 @@ msgstr ""
 msgid "Muscle overview"
 msgstr ""
 
-#: exercises/templates/muscles/admin-overview.html:38
-#: exercises/views/muscles.py:68
-msgid "Add muscle"
-msgstr "Мускул бафтауын"
-
 #: exercises/views/categories.py:72
 msgid "Add category"
 msgstr "Ӕмбырд бафтауын"
@@ -1567,6 +1520,10 @@ msgstr "Ӕмбырд бафтауын"
 msgid "This will also delete all exercises in this category."
 msgstr ""
 
+#: exercises/views/equipment.py:92
+msgid "Add new equipment"
+msgstr ""
+
 #: exercises/views/equipment.py:104 exercises/views/equipment.py:115
 msgid "Delete equipment?"
 msgstr ""
@@ -1575,6 +1532,10 @@ msgstr ""
 msgid "This will delete the exercise from all workouts."
 msgstr ""
 
+#: exercises/views/muscles.py:68
+msgid "Add muscle"
+msgstr "Мускул бафтауын"
+
 #: gallery/templates/images/overview.html:62
 #, fuzzy
 #| msgid "Add muscle"
@@ -1662,7 +1623,7 @@ msgid "Contract is active"
 msgstr ""
 
 #: gym/models/contract.py:237 gym/templates/contract/view.html:69
-#: manager/models/schedule.py:61 manager/templates/schedule/view.html:67
+#: manager/models/schedule.py:61 manager/templates/schedule/view.html:66
 msgid "Start date"
 msgstr ""
 
@@ -1698,7 +1659,7 @@ msgstr ""
 msgid "Admin: can administrate the different gyms"
 msgstr ""
 
-#: gym/models/gym.py:65 gym/templates/gym/member_list.html:114
+#: gym/models/gym.py:65 gym/templates/gym/member_list.html:126
 msgid "Owner"
 msgstr ""
 
@@ -1708,7 +1669,7 @@ msgid ""
 "considered inactive"
 msgstr ""
 
-#: gym/models/gym_config.py:56 gym/templates/gym/member_list.html:152
+#: gym/models/gym_config.py:56 gym/templates/gym/member_list.html:166
 msgid "Show name in header"
 msgstr ""
 
@@ -1721,7 +1682,7 @@ msgstr ""
 msgid "Configuration for {self.gym.name}"
 msgstr ""
 
-#: gym/models/user_config.py:65 gym/templates/gym/member_list.html:184
+#: gym/models/user_config.py:65 gym/templates/gym/member_list.html:200
 msgid "Overview of inactive members"
 msgstr ""
 
@@ -1745,7 +1706,7 @@ msgstr ""
 msgid "User notes"
 msgstr ""
 
-#: gym/templates/contract/list.html:36
+#: gym/templates/contract/list.html:34
 msgid "Show"
 msgstr ""
 
@@ -1771,11 +1732,11 @@ msgstr ""
 msgid "Gym list"
 msgstr ""
 
-#: gym/templates/gym/list.html:50
+#: gym/templates/gym/list.html:53
 msgid "Global gym configuration"
 msgstr ""
 
-#: gym/templates/gym/list.html:67 gym/views/gym.py:171
+#: gym/templates/gym/list.html:69 gym/views/gym.py:171
 msgid "Add new gym"
 msgstr ""
 
@@ -1787,43 +1748,43 @@ msgstr ""
 msgid "Gym manager"
 msgstr ""
 
-#: gym/templates/gym/member_list.html:69
+#: gym/templates/gym/member_list.html:76
 msgid "This gym has no administrators or trainers"
 msgstr ""
 
-#: gym/templates/gym/member_list.html:88
+#: gym/templates/gym/member_list.html:98
 msgid "Export"
 msgstr ""
 
-#: gym/templates/gym/member_list.html:125
+#: gym/templates/gym/member_list.html:137
 msgid "Members"
 msgstr ""
 
-#: gym/templates/gym/member_list.html:145
+#: gym/templates/gym/member_list.html:159
 msgid "Gym configuration"
 msgstr ""
 
-#: gym/templates/gym/member_list.html:148
+#: gym/templates/gym/member_list.html:162
 msgid "Inactive members"
 msgstr ""
 
-#: gym/templates/gym/member_list.html:149
+#: gym/templates/gym/member_list.html:163
 msgid "weeks"
 msgstr ""
 
-#: gym/templates/gym/member_list.html:181
+#: gym/templates/gym/member_list.html:197
 msgid "My configuration"
 msgstr ""
 
-#: gym/templates/gym/member_list.html:215
+#: gym/templates/gym/member_list.html:234
 msgid "Types"
 msgstr ""
 
-#: gym/templates/gym/member_list.html:285
+#: gym/templates/gym/member_list.html:307
 msgid "Emails"
 msgstr ""
 
-#: gym/templates/gym/member_list.html:315
+#: gym/templates/gym/member_list.html:336
 msgid "Add member"
 msgstr ""
 
@@ -2108,28 +2069,38 @@ msgstr ""
 msgid "Unit"
 msgstr ""
 
+#: manager/forms.py:191 manager/models/log.py:103 manager/models/setting.py:102
+#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
+msgid "RiR"
+msgstr ""
+
 #: manager/forms.py:279
 msgid "Type"
 msgstr ""
 
-#: manager/forms.py:280 manager/templates/workout/view.html:113
+#: manager/forms.py:280 manager/templates/workout/view.html:122
 msgid "Table"
 msgstr ""
 
-#: manager/forms.py:282 manager/templates/workout/view.html:119
+#: manager/forms.py:282 manager/templates/workout/view.html:129
 msgid "with images"
 msgstr ""
 
-#: manager/forms.py:283 manager/templates/workout/view.html:125
+#: manager/forms.py:283 manager/templates/workout/view.html:136
 msgid "with comments"
 msgstr ""
 
+#: manager/helpers.py:86 manager/models/setting.py:72
+#: manager/templates/set/formset.html:9
+msgid "Reps"
+msgstr ""
+
 #: manager/management/commands/email-reminders.py:121
 msgid "Workout will expire soon"
 msgstr ""
 
 #: manager/models/day.py:34 manager/models/log.py:58
-#: manager/models/session.py:60 manager/templates/schedule/view.html:102
+#: manager/models/session.py:60 manager/templates/schedule/view.html:101
 #: manager/templates/workout/view.html:9 manager/templates/workout/view.html:17
 #: manager/views/pdf.py:85 manager/views/pdf.py:161
 #: manager/views/schedule.py:151 manager/views/schedule.py:221
@@ -2150,7 +2121,7 @@ msgstr ""
 msgid "Name or short description of the schedule. For example 'Program XYZ'."
 msgstr ""
 
-#: manager/models/schedule.py:65 manager/templates/schedule/view.html:71
+#: manager/models/schedule.py:65 manager/templates/schedule/view.html:70
 msgid "Schedule active"
 msgstr ""
 
@@ -2161,7 +2132,7 @@ msgid ""
 "inactive"
 msgstr ""
 
-#: manager/models/schedule.py:77 manager/templates/schedule/view.html:81
+#: manager/models/schedule.py:77 manager/templates/schedule/view.html:80
 msgid "Is a loop"
 msgstr ""
 
@@ -2180,7 +2151,7 @@ msgid "The duration in weeks"
 msgstr ""
 
 #: manager/models/schedule_step.py:64 manager/models/set.py:53
-#: manager/models/setting.py:113 nutrition/models/meal.py:55
+#: manager/models/setting.py:113 nutrition/models/meal.py:53
 #: nutrition/models/meal_item.py:66
 msgid "Order"
 msgstr ""
@@ -2312,7 +2283,7 @@ msgstr ""
 msgid "Workout session"
 msgstr ""
 
-#: manager/templates/calendar/partial_overview_table.html:27
+#: manager/templates/calendar/partial_overview_table.html:26
 msgid "Delete with logs"
 msgstr ""
 
@@ -2332,21 +2303,27 @@ msgid ""
 "will simply be edited. Weight entries are always added."
 msgstr ""
 
-#: manager/templates/schedule/overview.html:5
+#: manager/templates/schedule/overview.html:4
 msgid "Your schedules"
 msgstr ""
 
 #: manager/templates/schedule/overview.html:19
-#: manager/templates/schedule/view.html:131
-#: manager/templates/schedule/view.html:183
+#: manager/templates/schedule/view.html:143
+#: manager/templates/schedule/view.html:193
 #: manager/templates/workout/overview.html:16
 msgid "active"
 msgstr ""
 
-#: manager/templates/schedule/overview.html:28
+#: manager/templates/schedule/overview.html:27
 msgid "No schedules found."
 msgstr ""
 
+#: manager/templates/schedule/overview.html:28
+#, fuzzy
+#| msgid "Add new exercise"
+msgid "Add one now"
+msgstr "Ног фӕлтӕрӕн бафтауын"
+
 #: manager/templates/schedule/overview.html:36
 msgid ""
 "Schedules are collections of workouts that you do in\n"
@@ -2359,10 +2336,11 @@ msgid ""
 "        before jumping to the next. It is also possible to create a loop, so "
 "you\n"
 "        always do the same workouts in succession, e.g. A > B > C > A > B > "
-"C and so on."
+"C and so\n"
+"        on."
 msgstr ""
 
-#: manager/templates/schedule/overview.html:43
+#: manager/templates/schedule/overview.html:44
 msgid ""
 "The currently active schedule will remain active (and be\n"
 "        shown e.g. in your dashboard) till it reaches the last workout or "
@@ -2378,25 +2356,25 @@ msgstr ""
 msgid "Schedule"
 msgstr ""
 
-#: manager/templates/schedule/view.html:85
+#: manager/templates/schedule/view.html:84
 msgid ""
 "This schedule is a loop and will go through the workouts above till you "
 "deactivate it"
 msgstr ""
 
-#: manager/templates/schedule/view.html:103
+#: manager/templates/schedule/view.html:102
 msgid "Weeks"
 msgstr ""
 
-#: manager/templates/schedule/view.html:115
+#: manager/templates/schedule/view.html:114
 msgid "Move me"
 msgstr ""
 
-#: manager/templates/schedule/view.html:156
+#: manager/templates/schedule/view.html:168
 msgid "Start schedule"
 msgstr ""
 
-#: manager/templates/schedule/view.html:187
+#: manager/templates/schedule/view.html:197
 #, python-format
 msgid ""
 "%(weeks)s Week\n"
@@ -2407,11 +2385,11 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: manager/templates/schedule/view.html:221
+#: manager/templates/schedule/view.html:231
 msgid "Adding workouts"
 msgstr ""
 
-#: manager/templates/schedule/view.html:223
+#: manager/templates/schedule/view.html:233
 msgid ""
 "Add as many workouts to the schedule as you want. You can\n"
 "            edit the order by dragging and dropping them. It's also possible "
@@ -2419,44 +2397,37 @@ msgid ""
 "            than once."
 msgstr ""
 
-#: manager/templates/schedule/view.html:232
-#: manager/templates/schedule/view.html:243
-#: manager/templates/schedule/view.html:290
+#: manager/templates/schedule/view.html:242
+#: manager/templates/schedule/view.html:256
+#: manager/templates/schedule/view.html:310
 #: manager/templates/workout/view.html:69
-#: manager/templates/workout/view.html:79
-#: manager/templates/workout/view.html:178
+#: manager/templates/workout/view.html:83
+#: manager/templates/workout/view.html:192
 msgid "Export calendar file"
 msgstr ""
 
-#: manager/templates/schedule/view.html:236
+#: manager/templates/schedule/view.html:248
 msgid "Export this schedule as a calendar file."
 msgstr ""
 
-#: manager/templates/schedule/view.html:237
-#: manager/templates/workout/view.html:74
+#: manager/templates/schedule/view.html:249
+#: manager/templates/workout/view.html:76
 msgid ""
 "You can then import the file it into your calendar\n"
 "                        application for example google calendar, outlook or "
 "iCal. This will create\n"
 "                        an appointment for each training day with the "
-"appropriate exercises."
+"appropriate\n"
+"                        exercises."
 msgstr ""
 
-#: manager/templates/schedule/view.html:258
-#: manager/templates/schedule/view.html:294
-#: manager/templates/workout/view.html:94
-#: manager/templates/workout/view.html:174
+#: manager/templates/schedule/view.html:272
+#: manager/templates/schedule/view.html:315
+#: manager/templates/workout/view.html:99
+#: manager/templates/workout/view.html:188
 msgid "Download as PDF"
 msgstr ""
 
-#: manager/templates/schedule/view.html:299
-msgid "Edit schedule"
-msgstr ""
-
-#: manager/templates/schedule/view.html:304
-msgid "Delete schedule"
-msgstr ""
-
 #: manager/templates/set/add.html:9
 #, python-format
 msgid "Add exercises to day \"%(day_name)s\""
@@ -2521,47 +2492,6 @@ msgid ""
 "You will regularly receive such reminders till you enter your current weight."
 msgstr ""
 
-#: manager/templates/workout/log.html:10 manager/templates/workout/log.html:11
-msgid "Weight log"
-msgstr ""
-
-#: manager/templates/workout/log.html:29
-msgid "Weight log for workout"
-msgstr ""
-
-#: manager/templates/workout/log.html:49
-msgid "Add weight log to this day"
-msgstr ""
-
-#: manager/templates/workout/log.html:69
-msgid "No weight entries here."
-msgstr ""
-
-#: manager/templates/workout/log.html:77
-msgid "No exercises for this day."
-msgstr ""
-
-#: manager/templates/workout/log.html:90
-msgid ""
-"This page shows the weight logs belonging to this workout\n"
-"only. Click on an exercise to see all the historical data for\n"
-"it."
-msgstr ""
-
-#: manager/templates/workout/log.html:94
-msgid ""
-"If on a single day there is more than one entry with the\n"
-"same number of repetitions, but different weights, only the entry with the\n"
-"higher weight is shown in the diagram."
-msgstr ""
-
-#: manager/templates/workout/log.html:98
-msgid ""
-"Note that only entries with a weight unit (kg or lb) and\n"
-"repetitions are charted, other combinations such as time or until failure\n"
-"are ignored here."
-msgstr ""
-
 #: manager/templates/workout/overview.html:25
 msgid "No templates found."
 msgstr ""
@@ -2597,27 +2527,23 @@ msgstr ""
 msgid "Set the repetitions for each set"
 msgstr ""
 
-#: manager/templates/workout/view.html:73
+#: manager/templates/workout/view.html:75
 msgid "Export this workout as a calendar file."
 msgstr ""
 
-#: manager/templates/workout/view.html:144
+#: manager/templates/workout/view.html:156
 msgid "Logs"
 msgstr ""
 
-#: manager/templates/workout/view.html:146
+#: manager/templates/workout/view.html:159
 msgid "View logs"
 msgstr ""
 
-#: manager/templates/workout/view.html:169 manager/views/schedule_step.py:99
-msgid "Edit workout"
-msgstr ""
-
-#: manager/templates/workout/view.html:182 manager/views/workout.py:281
+#: manager/templates/workout/view.html:195 manager/views/workout.py:281
 msgid "Mark as template"
 msgstr ""
 
-#: manager/views/day.py:109
+#: manager/views/day.py:105
 msgid "Add workout day"
 msgstr ""
 
@@ -2634,6 +2560,10 @@ msgstr ""
 msgid "Create schedule"
 msgstr ""
 
+#: manager/views/schedule_step.py:99
+msgid "Edit workout"
+msgstr ""
+
 #: manager/views/workout.py:209
 msgid "Copy workout"
 msgstr ""
@@ -2755,7 +2685,7 @@ msgstr ""
 msgid "Unit amount, e.g. \"1 Cup\" or \"1/2 spoon\""
 msgstr ""
 
-#: nutrition/models/log.py:52 nutrition/models/meal.py:50
+#: nutrition/models/log.py:52 nutrition/models/meal.py:48
 #: nutrition/models/meal_item.py:48 nutrition/models/plan.py:108
 msgid "Nutrition plan"
 msgstr ""
@@ -2768,11 +2698,11 @@ msgstr ""
 msgid "Date and Time (Approx.)"
 msgstr ""
 
-#: nutrition/models/meal.py:62
+#: nutrition/models/meal.py:60
 msgid "Time (approx)"
 msgstr ""
 
-#: nutrition/models/meal.py:69
+#: nutrition/models/meal.py:67
 msgid ""
 "Give meals a textual description / name such as \"Breakfast\" or \"after "
 "workout\""
@@ -2891,10 +2821,6 @@ msgstr ""
 msgid "Search"
 msgstr "Агурын"
 
-#: nutrition/templates/ingredient/overview.html:62
-msgid "Add ingredient"
-msgstr ""
-
 #: nutrition/templates/ingredient/view.html:45 nutrition/views/plan.py:229
 msgid "Macronutrients"
 msgstr ""
@@ -2914,20 +2840,11 @@ msgstr ""
 msgid "Others"
 msgstr ""
 
-#: nutrition/templates/ingredient/view.html:144
-#: nutrition/templates/units/list.html:46 nutrition/views/unit.py:86
+#: nutrition/templates/ingredient/view.html:143
+#: nutrition/templates/units/list.html:50 nutrition/views/unit.py:86
 msgid "Add new weight unit"
 msgstr ""
 
-#: nutrition/templates/ingredient/view.html:206
-#: nutrition/templates/ingredient/view.html:209
-msgid "Edit ingredient"
-msgstr ""
-
-#: nutrition/templates/ingredient/view.html:213
-msgid "Delete ingredient"
-msgstr ""
-
 #: nutrition/templates/rate/form.html:25
 msgid "Basal metabolic rate"
 msgstr ""
@@ -3511,11 +3428,6 @@ msgstr ""
 #~ msgid "Use link to create one"
 #~ msgstr "Спайда кӕн ӕрвитӕнӕй, цӕмӕй дзы саразай"
 
-#, fuzzy
-#~| msgid "Add new exercise"
-#~ msgid "Add new video"
-#~ msgstr "Ног фӕлтӕрӕн бафтауын"
-
 #~ msgid "Comments for this exercise"
 #~ msgstr "Ацы фӕлтӕрӕны тыххӕй хъуыдытӕ"
 
diff --git a/wger/locale/pl/LC_MESSAGES/django.po b/wger/locale/pl/LC_MESSAGES/django.po
index 2c52d93c4..bc2a8311a 100644
--- a/wger/locale/pl/LC_MESSAGES/django.po
+++ b/wger/locale/pl/LC_MESSAGES/django.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: wger Workout Manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-07-14 15:59+0200\n"
+"POT-Creation-Date: 2024-11-14 13:09+0100\n"
 "PO-Revision-Date: 2024-08-15 15:09+0000\n"
 "Last-Translator: Dawid Panyło <wampir5000@o2.pl>\n"
 "Language-Team: Polish <https://hosted.weblate.org/projects/wger/web/pl/>\n"
@@ -22,12 +22,12 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && ("
-"n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && "
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && "
+"(n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && "
 "n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 "X-Generator: Weblate 5.7\n"
 
-#: config/models/gym_config.py:46 gym/templates/gym/list.html:53
+#: config/models/gym_config.py:46 gym/templates/gym/list.html:56
 msgid "Default gym"
 msgstr "Domyślna siłownia"
 
@@ -40,28 +40,28 @@ msgstr ""
 "przypisywani wszyscy nowi użytkownicy oraz obecni użytkownicy bez określonej "
 "siłowni."
 
-#: config/views/gym_config.py:42 core/templates/language/view.html:67
-#: core/templates/license/list.html:17 core/templates/misc/license/list.html:18
+#: config/views/gym_config.py:42 core/templates/language/view.html:64
+#: core/templates/license/list.html:17
 #: core/templates/repetition_unit/list.html:18
-#: core/templates/tags/render_day.html:39
-#: core/templates/tags/render_day.html:75 core/templates/user/overview.html:204
-#: core/templates/user/overview.html:445
+#: core/templates/user/overview.html:204 core/templates/user/overview.html:467
 #: core/templates/weight_unit/list.html:18
 #: exercises/templates/categories/admin-overview.html:17
 #: exercises/templates/equipment/admin-overview.html:17
-#: exercises/templates/muscles/admin-overview.html:17
-#: gallery/views/images.py:98 gym/templates/admin_notes/list.html:32
-#: gym/templates/contract/list.html:31 gym/templates/contract/view.html:107
-#: gym/templates/contract_option/list.html:32
-#: gym/templates/contract_type/list.html:32 gym/templates/document/list.html:38
-#: gym/templates/gym/list.html:20 gym/templates/gym/list.html:46
-#: gym/templates/gym/member_list.html:87 gym/templates/gym/member_list.html:140
-#: gym/templates/gym/member_list.html:176
-#: manager/templates/calendar/day.html:68
-#: manager/templates/calendar/month.html:85
-#: manager/templates/calendar/partial_overview_table.html:18
-#: manager/templates/schedule/view.html:118
-#: nutrition/templates/ingredient/view.html:165
+#: exercises/templates/muscles/admin-overview.html:16
+#: gallery/views/images.py:98 gym/templates/admin_notes/list.html:31
+#: gym/templates/contract/list.html:30 gym/templates/contract/view.html:106
+#: gym/templates/contract_option/list.html:29
+#: gym/templates/contract_type/list.html:30 gym/templates/document/list.html:38
+#: gym/templates/gym/list.html:19 gym/templates/gym/list.html:48
+#: gym/templates/gym/member_list.html:94 gym/templates/gym/member_list.html:152
+#: gym/templates/gym/member_list.html:190
+#: manager/templates/calendar/day.html:67
+#: manager/templates/calendar/month.html:84
+#: manager/templates/calendar/partial_overview_table.html:16
+#: manager/templates/schedule/view.html:318
+#: manager/templates/workout/view.html:181
+#: nutrition/templates/ingredient/view.html:164
+#: nutrition/templates/ingredient/view.html:209
 #: nutrition/templates/units/list.html:19
 msgid "Edit"
 msgstr "Edytuj"
@@ -95,8 +95,8 @@ msgstr "Mój fajny harmonogram treningu"
 msgid "Empty placeholder schedule"
 msgstr "Pusty zapychacz harmonogramu"
 
-#: core/forms.py:69 core/templates/navigation.html:285
-#: core/templates/navigation.html:291 core/templates/user/login.html:4
+#: core/forms.py:69 core/templates/navigation.html:284
+#: core/templates/navigation.html:290 core/templates/user/login.html:4
 #: software/templates/features.html:82 software/templates/features.html:427
 msgid "Login"
 msgstr "Zaloguj"
@@ -106,14 +106,14 @@ msgstr "Zaloguj"
 msgid "First name"
 msgstr "Imię"
 
-#: core/forms.py:109 core/forms.py:215 core/templates/user/overview.html:266
+#: core/forms.py:109 core/forms.py:215 core/templates/user/overview.html:284
 #: gym/views/export.py:62 gym/views/gym.py:217
 msgid "Last name"
 msgstr "Nazwisko"
 
-#: core/forms.py:111 core/forms.py:180 core/templates/user/overview.html:270
+#: core/forms.py:111 core/forms.py:180 core/templates/user/overview.html:288
 #: gym/models/contract.py:256 gym/models/gym.py:58
-#: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:104
+#: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:116
 #: gym/templates/gym/new_user.html:30 gym/views/export.py:60
 #: mailer/templates/mailer/gym/form.html:4
 #: mailer/templates/mailer/gym/overview.html:4
@@ -142,8 +142,8 @@ msgstr "Przypomnienia treningowe"
 msgid "Other settings"
 msgstr "Inne ustawienia"
 
-#: core/forms.py:174 core/views/user.py:624 core/views/user.py:639
-#: core/views/user.py:651 gym/forms.py:73 manager/templates/log/add.html:65
+#: core/forms.py:174 core/views/user.py:623 core/views/user.py:638
+#: core/views/user.py:650 gym/forms.py:73 manager/templates/log/add.html:65
 #: manager/templates/set/add.html:70 manager/views/workout.py:203
 #: utils/generic_views.py:143
 msgid "Save"
@@ -166,26 +166,25 @@ msgstr "Hasło"
 msgid "Please enter your current password."
 msgstr "Wprowadź swoje aktualne hasło."
 
-#: core/forms.py:242 core/templates/language/view.html:73
-#: core/templates/license/list.html:19 core/templates/misc/license/list.html:22
-#: core/templates/repetition_unit/list.html:20
-#: core/templates/tags/render_day.html:45
-#: core/templates/tags/render_day.html:81 core/templates/user/overview.html:217
-#: core/templates/weight_unit/list.html:20
-#: exercises/templates/categories/admin-overview.html:19
-#: exercises/templates/equipment/admin-overview.html:19
-#: exercises/templates/muscles/admin-overview.html:19
-#: gym/templates/admin_notes/list.html:40
-#: gym/templates/contract_option/list.html:41
-#: gym/templates/contract_type/list.html:41 gym/templates/document/list.html:46
-#: gym/templates/gym/list.html:22 manager/templates/calendar/day.html:73
-#: manager/templates/calendar/month.html:89
-#: manager/templates/calendar/partial_overview_table.html:23
-#: manager/templates/schedule/view.html:122
-#: manager/templates/workout/view.html:188
-#: nutrition/templates/ingredient/view.html:166
+#: core/forms.py:242 core/templates/language/view.html:70
+#: core/templates/license/list.html:21
+#: core/templates/repetition_unit/list.html:22
+#: core/templates/user/overview.html:233
+#: core/templates/weight_unit/list.html:22
+#: exercises/templates/categories/admin-overview.html:21
+#: exercises/templates/equipment/admin-overview.html:21
+#: exercises/templates/muscles/admin-overview.html:20
+#: gym/templates/admin_notes/list.html:37
+#: gym/templates/contract_option/list.html:35
+#: gym/templates/contract_type/list.html:36 gym/templates/document/list.html:46
+#: gym/templates/gym/list.html:23 manager/templates/calendar/day.html:73
+#: manager/templates/calendar/month.html:88
+#: manager/templates/calendar/partial_overview_table.html:22
+#: manager/templates/schedule/view.html:324
+#: manager/templates/workout/view.html:202
+#: nutrition/templates/ingredient/view.html:168
 #: nutrition/templates/ingredient/view.html:215
-#: nutrition/templates/units/list.html:22
+#: nutrition/templates/units/list.html:25
 msgid "Delete"
 msgstr "Usuń"
 
@@ -197,9 +196,9 @@ msgstr "Hasło nieprawidłowe"
 msgid "The form is secured with reCAPTCHA"
 msgstr "Formularz jest chroniony przez reCaptcha"
 
-#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:285
-#: core/templates/navigation.html:297 core/templates/template.html:149
-#: core/templates/user/login.html:20 core/views/user.py:298
+#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:284
+#: core/templates/navigation.html:296 core/templates/template.html:151
+#: core/templates/user/login.html:20 core/views/user.py:297
 #: software/templates/features.html:87 software/templates/features.html:422
 msgid "Register"
 msgstr "Zarejestruj"
@@ -449,18 +448,18 @@ msgid "The sum of all hours has to be 24"
 msgstr "Godziny muszą sumować się do wartości 24"
 
 #: core/models/rep_unit.py:36 core/models/weight_unit.py:36
-#: core/templates/user/overview.html:262 core/views/user.py:599
+#: core/templates/user/overview.html:280 core/views/user.py:598
 #: exercises/models/category.py:29 exercises/models/equipment.py:29
 #: exercises/models/exercise.py:59 exercises/models/muscle.py:36
 #: gym/models/contract.py:52 gym/models/contract.py:103 gym/models/gym.py:46
 #: gym/models/user_document.py:84 gym/templates/contract/view.html:50
-#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:96
+#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:108
 #: gym/views/gym.py:158 manager/models/schedule.py:55
 #: manager/models/workout.py:57 measurements/models/category.py:36
 #: nutrition/models/ingredient.py:111
-#: nutrition/models/ingredient_category.py:27 nutrition/models/meal.py:67
+#: nutrition/models/ingredient_category.py:27 nutrition/models/meal.py:65
 #: nutrition/models/weight_unit.py:38
-#: nutrition/templates/ingredient/view.html:152
+#: nutrition/templates/ingredient/view.html:151
 msgid "Name"
 msgstr "Nazwa"
 
@@ -513,7 +512,7 @@ msgstr ""
 msgid "Back to \"%(target)s\""
 msgstr "Wróć do \"%(target)s\""
 
-#: core/templates/delete.html:15
+#: core/templates/delete.html:4
 msgid "Are you sure you want to delete this? This action cannot be undone."
 msgstr "Czy na pewno chcesz to usunąć? Tej czynności nie będzie można cofnąć."
 
@@ -565,7 +564,7 @@ msgstr "Kliknij poniższy link, aby potwierdzić swój adres e-mail: %(link)s"
 msgid "Dashboard"
 msgstr "Pulpit"
 
-#: core/templates/language/overview.html:4 core/templates/navigation.html:345
+#: core/templates/language/overview.html:4 core/templates/navigation.html:344
 msgid "Languages"
 msgstr "Języki"
 
@@ -575,81 +574,72 @@ msgstr "Nie znaleziono."
 
 #: core/templates/language/overview.html:22
 #: manager/templates/calendar/month.html:132
-#: manager/templates/schedule/overview.html:28
-#: manager/templates/schedule/view.html:144
+#: manager/templates/schedule/view.html:154
 #: manager/templates/workout/overview.html:28
 #: nutrition/templates/ingredient/overview.html:38
 msgid "Add one now."
 msgstr "Dodaj jeden teraz."
 
-#: core/templates/language/overview.html:35 core/templates/license/list.html:40
-#: core/templates/misc/license/list.html:43
-#: core/templates/repetition_unit/list.html:43
-#: core/templates/user/overview.html:326 core/templates/user/overview.html:365
-#: core/templates/user/overview.html:401
-#: core/templates/weight_unit/list.html:43 core/views/languages.py:74
+#: core/templates/language/overview.html:34 core/templates/license/list.html:43
+#: core/templates/repetition_unit/list.html:46
+#: core/templates/user/overview.html:344 core/templates/user/overview.html:384
+#: core/templates/user/overview.html:422
+#: core/templates/weight_unit/list.html:46 core/views/languages.py:74
 #: core/views/license.py:66 core/views/repetition_units.py:66
 #: core/views/weight_units.py:66
-#: exercises/templates/categories/admin-overview.html:38
-#: gallery/views/images.py:63 gym/templates/admin_notes/list.html:67
-#: gym/templates/contract/list.html:73
-#: gym/templates/contract_option/list.html:72
-#: gym/templates/contract_type/list.html:72 gym/templates/document/list.html:79
-#: gym/templates/gym/member_list.html:211
-#: gym/templates/gym/member_list.html:244
-#: gym/templates/gym/member_list.html:281
+#: exercises/templates/categories/admin-overview.html:40
+#: exercises/templates/equipment/admin-overview.html:39
+#: exercises/templates/muscles/admin-overview.html:40
+#: gallery/views/images.py:63 gym/templates/admin_notes/list.html:64
+#: gym/templates/contract/list.html:69
+#: gym/templates/contract_option/list.html:65
+#: gym/templates/contract_type/list.html:66 gym/templates/document/list.html:78
+#: gym/templates/gym/member_list.html:228
+#: gym/templates/gym/member_list.html:264
+#: gym/templates/gym/member_list.html:303
 #: mailer/templates/mailer/gym/overview.html:43
+#: nutrition/templates/ingredient/overview.html:60
 msgid "Add"
 msgstr "Dodaj"
 
 #: core/templates/language/view.html:61 core/templates/user/api_key.html:44
-#: core/templates/user/preferences.html:45 gym/models/contract.py:203
-#: gym/templates/contract/view.html:41 gym/templates/contract/view.html:106
-#: gym/templates/gym/member_list.html:248
-#: manager/templates/schedule/view.html:285
-#: manager/templates/workout/view.html:163
-#: nutrition/templates/ingredient/view.html:202
+#: core/templates/user/preferences.html:50 gym/models/contract.py:203
+#: gym/templates/contract/view.html:41 gym/templates/gym/member_list.html:270
+#: manager/templates/schedule/view.html:304
+#: manager/templates/workout/view.html:177
+#: nutrition/templates/ingredient/view.html:206
 msgid "Options"
 msgstr "Opcje"
 
-#: core/templates/license/list.html:4 core/templates/misc/license/list.html:4
+#: core/templates/license/list.html:4
 msgid "License list"
 msgstr "Lista licencji"
 
-#: core/templates/license/list.html:26 core/templates/misc/license/list.html:30
-#: core/templates/repetition_unit/list.html:28
+#: core/templates/license/list.html:30
+#: core/templates/repetition_unit/list.html:32
 #: core/templates/user/overview.html:104 core/templates/user/overview.html:136
-#: core/templates/user/overview.html:185 core/templates/user/overview.html:347
-#: core/templates/user/overview.html:383 core/templates/user/overview.html:427
-#: core/templates/weight_unit/list.html:28
-#: exercises/templates/categories/admin-overview.html:26
-#: exercises/templates/equipment/admin-overview.html:26
-#: exercises/templates/muscles/admin-overview.html:26
-#: gym/templates/admin_notes/list.html:52 gym/templates/contract/list.html:60
-#: gym/templates/contract_option/list.html:58
-#: gym/templates/contract_type/list.html:58 gym/templates/document/list.html:64
-#: gym/templates/gym/list.html:29 gym/templates/gym/member_list.html:229
-#: gym/templates/gym/member_list.html:262
-#: gym/templates/gym/member_list.html:299
+#: core/templates/user/overview.html:185 core/templates/user/overview.html:365
+#: core/templates/user/overview.html:404 core/templates/user/overview.html:448
+#: core/templates/weight_unit/list.html:32
+#: exercises/templates/categories/admin-overview.html:30
+#: exercises/templates/equipment/admin-overview.html:30
+#: exercises/templates/muscles/admin-overview.html:29
+#: gym/templates/admin_notes/list.html:50 gym/templates/contract/list.html:57
+#: gym/templates/contract_option/list.html:52
+#: gym/templates/contract_type/list.html:53 gym/templates/document/list.html:64
+#: gym/templates/gym/list.html:32 gym/templates/gym/member_list.html:248
+#: gym/templates/gym/member_list.html:284
+#: gym/templates/gym/member_list.html:321
 #: mailer/templates/mailer/gym/overview.html:30
-#: manager/templates/calendar/day.html:87
-#: nutrition/templates/units/list.html:29
+#: manager/templates/calendar/day.html:88
+#: nutrition/templates/units/list.html:34
 msgid "Nothing found"
 msgstr "Nic nie znaleziono"
 
-#: core/templates/misc/about.html:4 core/templates/template.html:175
+#: core/templates/misc/about.html:4 core/templates/template.html:188
 msgid "Imprint"
 msgstr "Odcisk"
 
-#: core/templates/misc/license/list.html:47
-msgid ""
-"If a license has been localized, e.g. the Creative Commons\n"
-"            licenses for the different countries, add them as separate "
-"entries here."
-msgstr ""
-"Jeżeli licencje zostały przetłumaczone, np. licencja Creative Commons\n"
-"            dla różnych krajów, dodaj je tutaj jako osobne wpisy."
-
 #: core/templates/navigation.html:28 software/templates/features.html:437
 msgid "Training"
 msgstr "Trening"
@@ -694,8 +684,8 @@ msgstr "Publiczne szablony"
 msgid "Exercises"
 msgstr "Ćwiczenia"
 
-#: core/templates/navigation.html:111 core/templates/navigation.html:184
-#: core/templates/navigation.html:340
+#: core/templates/navigation.html:111 core/templates/navigation.html:185
+#: core/templates/navigation.html:339
 msgid "Administration"
 msgstr "Zarządzanie"
 
@@ -732,87 +722,87 @@ msgstr "Kalkulator BMI"
 msgid "Daily calories calculator"
 msgstr "Kalkulator dziennych kalorii"
 
-#: core/templates/navigation.html:179
+#: core/templates/navigation.html:180
 #: nutrition/templates/ingredient/overview.html:10
 msgid "Ingredient overview"
 msgstr "Rozpiska składników"
 
-#: core/templates/navigation.html:187 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:189 nutrition/templates/units/list.html:6
 msgid "Ingredient weight units"
 msgstr "Jednostka wagowa składników"
 
-#: core/templates/navigation.html:203 software/templates/features.html:442
+#: core/templates/navigation.html:205 software/templates/features.html:442
 msgid "Body weight"
 msgstr "Waga ciała"
 
-#: core/templates/navigation.html:210 core/templates/user/overview.html:114
+#: core/templates/navigation.html:212 core/templates/user/overview.html:114
 msgid "Weight overview"
 msgstr "Wykres masy ciała"
 
-#: core/templates/navigation.html:217 weight/views.py:65
+#: core/templates/navigation.html:216 weight/views.py:65
 msgid "Add weight entry"
 msgstr "Dodaj aktualną wagę"
 
-#: core/templates/navigation.html:231
+#: core/templates/navigation.html:230
 msgid "About this software"
 msgstr "O tym programie"
 
-#: core/templates/navigation.html:237 software/templates/about_us.html:5
+#: core/templates/navigation.html:236 software/templates/about_us.html:5
 msgid "About us"
 msgstr "O nas"
 
-#: core/templates/navigation.html:243 software/templates/features.html:507
+#: core/templates/navigation.html:242 software/templates/features.html:507
 msgid "REST API"
 msgstr "REST API"
 
-#: core/templates/navigation.html:249 utils/models.py:45
+#: core/templates/navigation.html:248 utils/models.py:45
 msgid "License"
 msgstr "Licencja"
 
-#: core/templates/navigation.html:255
+#: core/templates/navigation.html:254
 msgid "Developer documentation"
 msgstr "Dokumentacja"
 
-#: core/templates/navigation.html:262
+#: core/templates/navigation.html:261
 msgid "Get the code"
 msgstr "Pobierz kod źródłowy"
 
-#: core/templates/navigation.html:269 core/templates/template.html:214
+#: core/templates/navigation.html:268 core/templates/template.html:227
 #: software/templates/features.html:582
 msgid "Translate"
 msgstr "Tłumacz"
 
-#: core/templates/navigation.html:303 core/templates/user/login.html:28
+#: core/templates/navigation.html:302 core/templates/user/login.html:28
 msgid "Reset password"
 msgstr "Resetuj hasło"
 
-#: core/templates/navigation.html:321
+#: core/templates/navigation.html:320
 msgid "My preferences"
 msgstr "Moje preferencje"
 
-#: core/templates/navigation.html:330
+#: core/templates/navigation.html:329
 msgid "Logout"
 msgstr "Wyloguj"
 
-#: core/templates/navigation.html:353
+#: core/templates/navigation.html:352
 msgid "Licenses"
 msgstr "Licencje"
 
-#: core/templates/navigation.html:361
+#: core/templates/navigation.html:360
 #: core/templates/repetition_unit/list.html:4
 msgid "Repetition units"
 msgstr "Jednostki potwórzeń"
 
-#: core/templates/navigation.html:369 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:368 core/templates/weight_unit/list.html:4
 #: nutrition/templates/ingredient/view.html:141
 msgid "Weight units"
 msgstr "Jednostki wagi"
 
-#: core/templates/navigation.html:377 core/templates/user/list.html:4
+#: core/templates/navigation.html:376 core/templates/user/list.html:4
 msgid "User list"
 msgstr "Lista użytkowników"
 
-#: core/templates/navigation.html:383
+#: core/templates/navigation.html:382
 msgid "Gyms"
 msgstr "Siłownie"
 
@@ -875,57 +865,32 @@ msgstr "poprzednie"
 msgid "next"
 msgstr "następne"
 
-#: core/templates/tags/render_day.html:34
-msgid "Add weight log"
-msgstr "Dodaj wpis dot. wagi"
-
-#: core/templates/tags/render_day.html:116
-msgid "Placeholder image for exercise"
+#: core/templates/tags/render_day.html:44
+#, fuzzy
+#| msgid "Placeholder image for exercise"
+msgid "Placeholder image for translation"
 msgstr "Zapychacz obrazka dla ćwiczenia"
 
-#: core/templates/tags/render_day.html:133
-msgid "This exercise has no repetitions."
-msgstr "To ćwiczenie nie ma powtórzeń."
-
-#: core/templates/tags/render_day.html:136
-msgid "Edit them now."
-msgstr "Edytuj je teraz."
-
-#: core/templates/tags/render_day.html:162
-msgid "Add exercises to this workout day"
-msgstr "Dodaj ćwiczenia do tego dnia treningowego"
-
-#: core/templates/tags/render_weight_log.html:17 manager/helpers.py:86
-#: manager/models/setting.py:72 manager/templates/set/formset.html:9
-msgid "Reps"
-msgstr "Powtórzenia"
-
-#: core/templates/tags/render_weight_log.html:30 manager/forms.py:191
-#: manager/models/log.py:103 manager/models/setting.py:102
-#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
-msgid "RiR"
-msgstr "Liczba powtórzeń w rezerwie"
-
-#: core/templates/template.html:122 manager/templates/calendar/month.html:138
-#: manager/templates/schedule/view.html:248
-#: manager/templates/schedule/view.html:269
-#: manager/templates/workout/view.html:84
-#: manager/templates/workout/view.html:137
+#: core/templates/template.html:124 manager/templates/calendar/month.html:138
+#: manager/templates/schedule/view.html:262
+#: manager/templates/schedule/view.html:287
+#: manager/templates/workout/view.html:89
+#: manager/templates/workout/view.html:149
 msgid "Close"
 msgstr "Zamknij"
 
-#: core/templates/template.html:138
+#: core/templates/template.html:140
 msgid ""
 "You are using a guest account, data entered will be deleted after a week."
 msgstr ""
 "Korzystasz z konta gościa, dane wpisane w tym trybie będą skasowane po "
 "tygodniu."
 
-#: core/templates/template.html:143
+#: core/templates/template.html:145
 msgid "Create some demo entries"
 msgstr "Utwórz kilka przykładowych wpisów"
 
-#: core/templates/template.html:180 software/templates/features.html:547
+#: core/templates/template.html:193 software/templates/features.html:547
 #: software/templates/tos.html:7
 msgid "Terms of service"
 msgstr "Warunki świadczenia usługi"
@@ -934,7 +899,7 @@ msgstr "Warunki świadczenia usługi"
 msgid "Features"
 msgstr "Cechy"
 
-#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:54
+#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:59
 msgid "API key"
 msgstr "Klucz API"
 
@@ -978,17 +943,17 @@ msgstr "Generuj nowy klucz API"
 msgid "Documentation"
 msgstr "Dokumentacja"
 
-#: core/templates/user/delete_account.html:4
-#: core/templates/user/preferences.html:59
+#: core/templates/user/delete_account.html:3
+#: core/templates/user/preferences.html:62
 msgid "Delete account"
 msgstr "Usuń konto"
 
-#: core/templates/user/delete_account.html:17
+#: core/templates/user/delete_account.html:9
 #: exercises/templates/history/overview.html:93
 msgid "Are you sure?"
 msgstr "Czy na pewno?"
 
-#: core/templates/user/delete_account.html:22
+#: core/templates/user/delete_account.html:14
 #, python-format
 msgid ""
 "This action will delete the user account \"%(username)s\".\n"
@@ -1010,22 +975,22 @@ msgstr "Zapomniałeś hasła?"
 
 #: core/templates/user/overview.html:25 core/templates/user/overview.html:68
 #: core/templates/user/overview.html:112 core/templates/user/overview.html:144
-#: core/templates/user/overview.html:330 core/templates/user/overview.html:369
-#: core/templates/user/overview.html:405
+#: core/templates/user/overview.html:348 core/templates/user/overview.html:390
+#: core/templates/user/overview.html:426
 #, python-format
 msgid "last %(number)s"
 msgstr "ostatnie %(number)s"
 
 #: core/templates/user/overview.html:27 core/templates/user/overview.html:146
-#: core/templates/user/overview.html:325 core/templates/user/overview.html:364
-#: core/templates/user/overview.html:400 gym/templates/gym/member_list.html:210
-#: gym/templates/gym/member_list.html:243
-#: gym/templates/gym/member_list.html:280
+#: core/templates/user/overview.html:343 core/templates/user/overview.html:382
+#: core/templates/user/overview.html:421 gym/templates/gym/member_list.html:226
+#: gym/templates/gym/member_list.html:262
+#: gym/templates/gym/member_list.html:302
 msgid "Overview"
 msgstr "Podsumowanie"
 
 #: core/templates/user/overview.html:28
-#: manager/templates/schedule/view.html:163
+#: manager/templates/schedule/view.html:172
 #: manager/templates/workout/overview.html:39 manager/views/schedule_step.py:60
 msgid "Add workout"
 msgstr "Dodaj trening"
@@ -1057,38 +1022,36 @@ msgstr "Opis"
 msgid "Number of logs (days)"
 msgstr "Liczba logów (dni)"
 
-#: core/templates/user/overview.html:37 core/views/user.py:600
+#: core/templates/user/overview.html:37 core/views/user.py:599
 #: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:158
 msgid "Last activity"
 msgstr "Ostatnia aktywność"
 
 #: core/templates/user/overview.html:58
 #: manager/templates/calendar/month.html:128
-#: manager/templates/schedule/view.html:144
 #: manager/templates/workout/overview.html:28
 msgid "No workouts found."
 msgstr "Nie znaleziono treningu."
 
 #: core/templates/user/overview.html:68 manager/forms.py:280
-#: manager/templates/workout/view.html:106
+#: manager/templates/workout/view.html:114
 msgid "Log"
 msgstr "Log"
 
 #: core/templates/user/overview.html:77 manager/models/session.py:83
-#: manager/templates/calendar/partial_overview_table.html:52
+#: manager/templates/calendar/partial_overview_table.html:54
 msgid "General impression"
 msgstr "Ogólna ocena"
 
-#: core/templates/user/overview.html:78 core/templates/user/overview.html:369
+#: core/templates/user/overview.html:78 core/templates/user/overview.html:390
 #: manager/models/session.py:73
-#: manager/templates/calendar/partial_overview_table.html:56
-#: manager/templates/workout/log.html:89
+#: manager/templates/calendar/partial_overview_table.html:58
 msgid "Notes"
 msgstr "Notatki"
 
 #: core/templates/user/overview.html:79
 #: exercises/templates/history/overview.html:30
-#: manager/templates/calendar/partial_overview_table.html:42
+#: manager/templates/calendar/partial_overview_table.html:44
 msgid "Time"
 msgstr "Czas"
 
@@ -1126,123 +1089,123 @@ msgstr "Tłuszcz"
 msgid "kcal"
 msgstr "kcal"
 
-#: core/templates/user/overview.html:201 core/templates/user/overview.html:322
-#: core/templates/user/overview.html:361 core/templates/user/overview.html:397
-#: core/templates/user/overview.html:442 gym/templates/gym/list.html:42
-#: gym/templates/gym/member_list.html:84 gym/templates/gym/member_list.html:137
-#: gym/templates/gym/member_list.html:173
-#: gym/templates/gym/member_list.html:207
-#: gym/templates/gym/member_list.html:240
-#: gym/templates/gym/member_list.html:277
-#: manager/templates/schedule/view.html:100
+#: core/templates/user/overview.html:201 core/templates/user/overview.html:340
+#: core/templates/user/overview.html:379 core/templates/user/overview.html:418
+#: core/templates/user/overview.html:463 gym/templates/gym/list.html:45
+#: gym/templates/gym/member_list.html:91 gym/templates/gym/member_list.html:149
+#: gym/templates/gym/member_list.html:187
+#: gym/templates/gym/member_list.html:223
+#: gym/templates/gym/member_list.html:259
+#: gym/templates/gym/member_list.html:299
+#: manager/templates/schedule/view.html:99
 msgid "Actions"
 msgstr "Akcje"
 
-#: core/templates/user/overview.html:207
+#: core/templates/user/overview.html:210
 msgid "Deactivate user"
 msgstr "Deaktywuj użytkownika"
 
-#: core/templates/user/overview.html:209
+#: core/templates/user/overview.html:214
 msgid "Activate user"
 msgstr "Aktywuj użytkownika"
 
-#: core/templates/user/overview.html:211
+#: core/templates/user/overview.html:223
 msgid "Reset user password"
 msgstr "Resetuj hasło użytkownika"
 
-#: core/templates/user/overview.html:214 gym/templates/gym/member_list.html:30
+#: core/templates/user/overview.html:227 gym/templates/gym/member_list.html:30
 msgid "Roles"
 msgstr "Role"
 
-#: core/templates/user/overview.html:225
+#: core/templates/user/overview.html:243
 msgid "Password reset confirmation"
 msgstr "Potwierdzenie resetu hasła"
 
-#: core/templates/user/overview.html:229
+#: core/templates/user/overview.html:247
 msgid "Do you really want to change this user&#39;s password?"
 msgstr "Czy naprawdę chcesz zmienić hasło tego użytkownika?"
 
-#: core/templates/user/overview.html:232
+#: core/templates/user/overview.html:250
 #: exercises/templates/history/overview.html:106
 msgid "No"
 msgstr "Nie"
 
-#: core/templates/user/overview.html:233
+#: core/templates/user/overview.html:251
 #: exercises/templates/history/overview.html:99
 msgid "Yes"
 msgstr "Tak"
 
-#: core/templates/user/overview.html:254 gym/templates/gym/member_list.html:93
+#: core/templates/user/overview.html:272 gym/templates/gym/member_list.html:105
 msgid "Details"
 msgstr "Szczegóły"
 
-#: core/templates/user/overview.html:258 gym/views/export.py:57
-#: manager/helpers.py:86 manager/templates/schedule/view.html:98
+#: core/templates/user/overview.html:276 gym/views/export.py:57
+#: manager/helpers.py:86 manager/templates/schedule/view.html:97
 msgid "Nr."
 msgstr "Nr."
 
-#: core/templates/user/overview.html:280 gym/models/contract.py:287
+#: core/templates/user/overview.html:298 gym/models/contract.py:287
 #: gym/models/gym.py:50 gym/templates/contract/view.html:75
-#: gym/templates/gym/member_list.html:100 gym/views/export.py:68
+#: gym/templates/gym/member_list.html:112 gym/views/export.py:68
 msgid "Phone"
 msgstr "Telefon"
 
-#: core/templates/user/overview.html:284 gym/templates/contract/view.html:87
-#: gym/templates/gym/member_list.html:118
+#: core/templates/user/overview.html:302 gym/templates/contract/view.html:87
+#: gym/templates/gym/member_list.html:130
 msgid "Address"
 msgstr "Adres"
 
-#: core/templates/user/overview.html:295
+#: core/templates/user/overview.html:313
 msgid "Registered"
 msgstr "Zarejestrowano"
 
-#: core/templates/user/overview.html:299
+#: core/templates/user/overview.html:317
 msgid "Last login"
 msgstr "Zalogowany ostatnio"
 
-#: core/templates/user/overview.html:304
+#: core/templates/user/overview.html:322
 msgid "Status"
 msgstr "Status"
 
-#: core/templates/user/overview.html:307
+#: core/templates/user/overview.html:325
 msgid "Active"
 msgstr "Aktywny"
 
-#: core/templates/user/overview.html:309
+#: core/templates/user/overview.html:327
 msgid "Inactive"
 msgstr "Nieaktywny"
 
-#: core/templates/user/overview.html:330 gym/templates/contract/list.html:4
-#: gym/templates/gym/member_list.html:202
+#: core/templates/user/overview.html:348 gym/templates/contract/list.html:4
+#: gym/templates/gym/member_list.html:218
 msgid "Contracts"
 msgstr "Kontrakty"
 
-#: core/templates/user/overview.html:405 gym/templates/document/list.html:4
+#: core/templates/user/overview.html:426 gym/templates/document/list.html:4
 msgid "Documents"
 msgstr "Dokumenty"
 
-#: core/templates/user/overview.html:412 gym/templates/document/list.html:32
-#: manager/forms.py:292 manager/templates/workout/view.html:132
+#: core/templates/user/overview.html:433 gym/templates/document/list.html:33
+#: manager/forms.py:292 manager/templates/workout/view.html:143
 msgid "Download"
 msgstr "Pobierz"
 
-#: core/templates/user/overview.html:450 gym/views/admin_config.py:44
+#: core/templates/user/overview.html:474 gym/views/admin_config.py:44
 #: gym/views/admin_config.py:58 gym/views/user_config.py:46
 msgid "Configuration"
 msgstr "Konfiguracja"
 
-#: core/templates/user/overview.html:453 gym/models/user_config.py:92
+#: core/templates/user/overview.html:477 gym/models/user_config.py:92
 msgid "Include in inactive overview"
 msgstr "Uwzględnij w podglądzie nieaktywnych"
 
-#: core/templates/user/overview.html:486
+#: core/templates/user/overview.html:510
 #, python-format
 msgid "Admin login is only available for users in %(gym_name)s"
 msgstr ""
 "Logowanie jako administrator dostępne jest tylko dla użytkowników w "
 "%(gym_name)s"
 
-#: core/templates/user/overview.html:490
+#: core/templates/user/overview.html:514
 msgid "Log in as this user"
 msgstr "Zaloguj się jako ten użytkownik"
 
@@ -1262,19 +1225,19 @@ msgstr "Niezweryfikowany adres e-mail"
 msgid "Send verification email"
 msgstr "Wyślij email weryfikacyjny"
 
-#: core/templates/user/preferences.html:30
+#: core/templates/user/preferences.html:31
 msgid "You need to verify your email to contribute exercises"
 msgstr "Aby przesyłać ćwiczenia, musisz zweryfikować swój adres e-mail"
 
-#: core/templates/user/preferences.html:50 core/views/user.py:611
+#: core/templates/user/preferences.html:55 core/views/user.py:610
 msgid "Change password"
 msgstr "Zmień hasło"
 
-#: core/templatetags/wger_extras.py:205 i18n.tpl:37
+#: core/templatetags/wger_extras.py:197 i18n.tpl:37
 msgid "kg"
 msgstr "kg"
 
-#: core/templatetags/wger_extras.py:207
+#: core/templatetags/wger_extras.py:199
 #: nutrition/templates/ingredient/view.html:60
 #: nutrition/templates/ingredient/view.html:66
 #: nutrition/templates/ingredient/view.html:73
@@ -1286,11 +1249,11 @@ msgctxt "weight unit, i.e. grams"
 msgid "g"
 msgstr "g"
 
-#: core/templatetags/wger_extras.py:210 i18n.tpl:38
+#: core/templatetags/wger_extras.py:202 i18n.tpl:38
 msgid "lb"
 msgstr "lb"
 
-#: core/templatetags/wger_extras.py:212
+#: core/templatetags/wger_extras.py:204
 msgctxt "weight unit, i.e. ounces"
 msgid "oz"
 msgstr "oz"
@@ -1317,13 +1280,13 @@ msgid "Delete {0}?"
 msgstr "Usunąć {0}?"
 
 #: core/views/languages.py:111 core/views/license.py:85
-#: core/views/repetition_units.py:86 core/views/user.py:474
+#: core/views/repetition_units.py:86 core/views/user.py:473
 #: core/views/weight_units.py:86 exercises/views/categories.py:98
 #: exercises/views/equipment.py:81 exercises/views/muscles.py:87
 #: gym/views/admin_notes.py:161 gym/views/config.py:68
 #: gym/views/contract.py:186 gym/views/contract_option.py:123
 #: gym/views/contract_type.py:123 gym/views/document.py:171
-#: gym/views/gym.py:463 manager/views/day.py:100 manager/views/schedule.py:333
+#: gym/views/gym.py:463 manager/views/day.py:96 manager/views/schedule.py:333
 #: manager/views/workout.py:267 nutrition/views/ingredient.py:145
 #: nutrition/views/unit.py:143
 #, python-brace-format
@@ -1352,48 +1315,48 @@ msgstr "Zapisz"
 msgid "Your feedback was successfully sent. Thank you!"
 msgstr "Twoja opinia została poprawnie wysłana. Dziękujemy!"
 
-#: core/views/user.py:156
+#: core/views/user.py:155
 #, python-brace-format
 msgid "Account \"{0}\" was successfully deleted"
 msgstr "Konto \"{0}\" zostało poprawnie skasowane"
 
-#: core/views/user.py:292
+#: core/views/user.py:291
 msgid "You were successfully registered"
 msgstr "Zostałeś poprawnie zarejestrowany"
 
-#: core/views/user.py:351
+#: core/views/user.py:350
 msgid "Settings successfully updated"
 msgstr "Ustawienia pomyślnie zaktualizowane"
 
-#: core/views/user.py:390
+#: core/views/user.py:389
 msgid "The user was successfully deactivated"
 msgstr "Użytkownik pomyślnie zdezaktywowany"
 
-#: core/views/user.py:427
+#: core/views/user.py:426
 msgid "The user was successfully activated"
 msgstr "Użytkownik pomyślnie aktywowany"
 
-#: core/views/user.py:442
+#: core/views/user.py:441
 msgid "Edit user"
 msgstr "Edytuj użytkownika"
 
-#: core/views/user.py:597 gym/templates/gym/member_list.html:26
+#: core/views/user.py:596 gym/templates/gym/member_list.html:26
 #: gym/views/gym.py:158
 msgid "ID"
 msgstr "ID"
 
-#: core/views/user.py:598 gym/forms.py:95 gym/templates/contract/view.html:55
+#: core/views/user.py:597 gym/forms.py:95 gym/templates/contract/view.html:55
 #: gym/templates/gym/member_list.html:27 gym/views/export.py:59
 #: gym/views/gym.py:158 gym/views/gym.py:217
 msgid "Username"
 msgstr "Nazwa użytkownika"
 
-#: core/views/user.py:601 gym/templates/gym/new_user.html:34
+#: core/views/user.py:600 gym/templates/gym/new_user.html:34
 #: gym/views/export.py:58 gym/views/gym.py:217
 msgid "Gym"
 msgstr "Siłownia"
 
-#: core/views/user.py:660
+#: core/views/user.py:659
 #, python-format
 msgid "A verification email was sent to %(email)s"
 msgstr "E-mail weryfikacyjny został wysłany na adres %(email)s"
@@ -1546,11 +1509,6 @@ msgstr "Kod, długa nazwa"
 msgid "Equipment list"
 msgstr "Lista sprzętu"
 
-#: exercises/templates/equipment/admin-overview.html:39
-#: exercises/views/equipment.py:92
-msgid "Add new equipment"
-msgstr "Dodaj nowy sprzęt"
-
 #: exercises/templates/history/overview.html:11
 msgid "Exercise admin history"
 msgstr "Historia administratora ćwiczeń"
@@ -1598,11 +1556,6 @@ msgstr "Przywróć zmiany"
 msgid "Muscle overview"
 msgstr "Rozpiska mieśni"
 
-#: exercises/templates/muscles/admin-overview.html:38
-#: exercises/views/muscles.py:68
-msgid "Add muscle"
-msgstr "Dodaj mięsień"
-
 #: exercises/views/categories.py:72
 msgid "Add category"
 msgstr "Dodaj kategorię"
@@ -1611,6 +1564,10 @@ msgstr "Dodaj kategorię"
 msgid "This will also delete all exercises in this category."
 msgstr "To również usunie ćwiczenia w tej kategorii."
 
+#: exercises/views/equipment.py:92
+msgid "Add new equipment"
+msgstr "Dodaj nowy sprzęt"
+
 #: exercises/views/equipment.py:104 exercises/views/equipment.py:115
 msgid "Delete equipment?"
 msgstr "Usunąć sprzęt?"
@@ -1619,6 +1576,10 @@ msgstr "Usunąć sprzęt?"
 msgid "This will delete the exercise from all workouts."
 msgstr "To usunie ćwiczenie ze wszystkich treningów."
 
+#: exercises/views/muscles.py:68
+msgid "Add muscle"
+msgstr "Dodaj mięsień"
+
 #: gallery/templates/images/overview.html:62
 msgid "Add image"
 msgstr "Dodaj obraz"
@@ -1704,7 +1665,7 @@ msgid "Contract is active"
 msgstr "Kontrakt jest aktywny"
 
 #: gym/models/contract.py:237 gym/templates/contract/view.html:69
-#: manager/models/schedule.py:61 manager/templates/schedule/view.html:67
+#: manager/models/schedule.py:61 manager/templates/schedule/view.html:66
 msgid "Start date"
 msgstr "Data rozpoczęcia"
 
@@ -1740,7 +1701,7 @@ msgstr "Zarządca: może zarządzać członkami siłowni"
 msgid "Admin: can administrate the different gyms"
 msgstr "Zarządca: może zarządzać innymi siłowniami"
 
-#: gym/models/gym.py:65 gym/templates/gym/member_list.html:114
+#: gym/models/gym.py:65 gym/templates/gym/member_list.html:126
 msgid "Owner"
 msgstr "Właściciel"
 
@@ -1752,7 +1713,7 @@ msgstr ""
 "Ilość tygodni od ostatniego zalogowania, po których użytkownik jest uznawany "
 "za nieaktywnego"
 
-#: gym/models/gym_config.py:56 gym/templates/gym/member_list.html:152
+#: gym/models/gym_config.py:56 gym/templates/gym/member_list.html:166
 msgid "Show name in header"
 msgstr "Pokaż imię w nagłówku"
 
@@ -1765,7 +1726,7 @@ msgstr "Pokaż nazwę sali treningowej w nagłówku strony"
 msgid "Configuration for {self.gym.name}"
 msgstr "Konfiguracja dla {self.gym.name}"
 
-#: gym/models/user_config.py:65 gym/templates/gym/member_list.html:184
+#: gym/models/user_config.py:65 gym/templates/gym/member_list.html:200
 msgid "Overview of inactive members"
 msgstr "Rozpiska nieaktywnych członków"
 
@@ -1789,7 +1750,7 @@ msgstr "Użyje nazwy pliku jeżeli nic nie zostanie wpisane"
 msgid "User notes"
 msgstr "Notatki użytkownika"
 
-#: gym/templates/contract/list.html:36
+#: gym/templates/contract/list.html:34
 msgid "Show"
 msgstr "Pokaż"
 
@@ -1816,11 +1777,11 @@ msgstr ""
 msgid "Gym list"
 msgstr "Lista siłowni"
 
-#: gym/templates/gym/list.html:50
+#: gym/templates/gym/list.html:53
 msgid "Global gym configuration"
 msgstr "Globalna konfiguracja siłowni"
 
-#: gym/templates/gym/list.html:67 gym/views/gym.py:171
+#: gym/templates/gym/list.html:69 gym/views/gym.py:171
 msgid "Add new gym"
 msgstr "Dodaj nową siłownię"
 
@@ -1832,43 +1793,43 @@ msgstr "Zarządcy i trenerzy"
 msgid "Gym manager"
 msgstr "Menadżer siłowni"
 
-#: gym/templates/gym/member_list.html:69
+#: gym/templates/gym/member_list.html:76
 msgid "This gym has no administrators or trainers"
 msgstr "Ta siłownia nie ma żadnych zarządcow ani trenerów"
 
-#: gym/templates/gym/member_list.html:88
+#: gym/templates/gym/member_list.html:98
 msgid "Export"
 msgstr "Eksportuj"
 
-#: gym/templates/gym/member_list.html:125
+#: gym/templates/gym/member_list.html:137
 msgid "Members"
 msgstr "Członkowie"
 
-#: gym/templates/gym/member_list.html:145
+#: gym/templates/gym/member_list.html:159
 msgid "Gym configuration"
 msgstr "Konfiguracja siłowni"
 
-#: gym/templates/gym/member_list.html:148
+#: gym/templates/gym/member_list.html:162
 msgid "Inactive members"
 msgstr "Nieaktywni członkowie"
 
-#: gym/templates/gym/member_list.html:149
+#: gym/templates/gym/member_list.html:163
 msgid "weeks"
 msgstr "tygodnie"
 
-#: gym/templates/gym/member_list.html:181
+#: gym/templates/gym/member_list.html:197
 msgid "My configuration"
 msgstr "Moja konfiguracja"
 
-#: gym/templates/gym/member_list.html:215
+#: gym/templates/gym/member_list.html:234
 msgid "Types"
 msgstr "Typy"
 
-#: gym/templates/gym/member_list.html:285
+#: gym/templates/gym/member_list.html:307
 msgid "Emails"
 msgstr "Emaile"
 
-#: gym/templates/gym/member_list.html:315
+#: gym/templates/gym/member_list.html:336
 msgid "Add member"
 msgstr "Dodaj członka"
 
@@ -2162,28 +2123,38 @@ msgstr "Szukaj również w języku angielskim"
 msgid "Unit"
 msgstr "Jednostka"
 
+#: manager/forms.py:191 manager/models/log.py:103 manager/models/setting.py:102
+#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
+msgid "RiR"
+msgstr "Liczba powtórzeń w rezerwie"
+
 #: manager/forms.py:279
 msgid "Type"
 msgstr "Typ"
 
-#: manager/forms.py:280 manager/templates/workout/view.html:113
+#: manager/forms.py:280 manager/templates/workout/view.html:122
 msgid "Table"
 msgstr "Tabela"
 
-#: manager/forms.py:282 manager/templates/workout/view.html:119
+#: manager/forms.py:282 manager/templates/workout/view.html:129
 msgid "with images"
 msgstr "z obrazami"
 
-#: manager/forms.py:283 manager/templates/workout/view.html:125
+#: manager/forms.py:283 manager/templates/workout/view.html:136
 msgid "with comments"
 msgstr "z komentarzami"
 
+#: manager/helpers.py:86 manager/models/setting.py:72
+#: manager/templates/set/formset.html:9
+msgid "Reps"
+msgstr "Powtórzenia"
+
 #: manager/management/commands/email-reminders.py:121
 msgid "Workout will expire soon"
 msgstr "Trening wkrótce wygaśnie"
 
 #: manager/models/day.py:34 manager/models/log.py:58
-#: manager/models/session.py:60 manager/templates/schedule/view.html:102
+#: manager/models/session.py:60 manager/templates/schedule/view.html:101
 #: manager/templates/workout/view.html:9 manager/templates/workout/view.html:17
 #: manager/views/pdf.py:85 manager/views/pdf.py:161
 #: manager/views/schedule.py:151 manager/views/schedule.py:221
@@ -2206,7 +2177,7 @@ msgstr "Dzień"
 msgid "Name or short description of the schedule. For example 'Program XYZ'."
 msgstr "Nazwa bądź krótki opis harmonogramu. Przykładowo \"Program XYZ\"."
 
-#: manager/models/schedule.py:65 manager/templates/schedule/view.html:71
+#: manager/models/schedule.py:65 manager/templates/schedule/view.html:70
 msgid "Schedule active"
 msgstr "Aktywny harmonogram"
 
@@ -2220,7 +2191,7 @@ msgstr ""
 "odzwierciedlone w kokpicie). Inne harmonogramy zostaną oznaczone jako "
 "nieaktywne"
 
-#: manager/models/schedule.py:77 manager/templates/schedule/view.html:81
+#: manager/models/schedule.py:77 manager/templates/schedule/view.html:80
 msgid "Is a loop"
 msgstr "Zapętlone"
 
@@ -2240,7 +2211,7 @@ msgid "The duration in weeks"
 msgstr "Czas trwania w tygodniach"
 
 #: manager/models/schedule_step.py:64 manager/models/set.py:53
-#: manager/models/setting.py:113 nutrition/models/meal.py:55
+#: manager/models/setting.py:113 nutrition/models/meal.py:53
 #: nutrition/models/meal_item.py:66
 msgid "Order"
 msgstr "Kolejność"
@@ -2380,7 +2351,7 @@ msgstr "Rozpiska logów"
 msgid "Workout session"
 msgstr "Sesja treningowa"
 
-#: manager/templates/calendar/partial_overview_table.html:27
+#: manager/templates/calendar/partial_overview_table.html:26
 msgid "Delete with logs"
 msgstr "Usuń z logami"
 
@@ -2404,21 +2375,27 @@ msgstr ""
 "przypadku,\n"
 "trening będzie edytowany. Wartości ciężarów są zawsze dodawane."
 
-#: manager/templates/schedule/overview.html:5
+#: manager/templates/schedule/overview.html:4
 msgid "Your schedules"
 msgstr "Twoje harmonogramy"
 
 #: manager/templates/schedule/overview.html:19
-#: manager/templates/schedule/view.html:131
-#: manager/templates/schedule/view.html:183
+#: manager/templates/schedule/view.html:143
+#: manager/templates/schedule/view.html:193
 #: manager/templates/workout/overview.html:16
 msgid "active"
 msgstr "aktywny"
 
-#: manager/templates/schedule/overview.html:28
+#: manager/templates/schedule/overview.html:27
 msgid "No schedules found."
 msgstr "Nie znaleziono harmonogramów."
 
+#: manager/templates/schedule/overview.html:28
+#, fuzzy
+#| msgid "Add one now."
+msgid "Add one now"
+msgstr "Dodaj jeden teraz."
+
 #: manager/templates/schedule/overview.html:36
 msgid ""
 "Schedules are collections of workouts that you do in\n"
@@ -2428,12 +2405,20 @@ msgstr ""
 "       określonej kolejności."
 
 #: manager/templates/schedule/overview.html:39
+#, fuzzy
+#| msgid ""
+#| "You can indicate how long you want to do each workout\n"
+#| "        before jumping to the next. It is also possible to create a loop, "
+#| "so you\n"
+#| "        always do the same workouts in succession, e.g. A > B > C > A > B "
+#| "> C and so on."
 msgid ""
 "You can indicate how long you want to do each workout\n"
 "        before jumping to the next. It is also possible to create a loop, so "
 "you\n"
 "        always do the same workouts in succession, e.g. A > B > C > A > B > "
-"C and so on."
+"C and so\n"
+"        on."
 msgstr ""
 "Możesz ustalić jak długo chcesz wykonywać dany trening\n"
 "                przed przejściem do następnego. Można także zapętlać "
@@ -2441,7 +2426,7 @@ msgstr ""
 "                będziesz mógł wykonywać te same treningi w danej kolejności, "
 "np. A > B > C > A > B > C itd."
 
-#: manager/templates/schedule/overview.html:43
+#: manager/templates/schedule/overview.html:44
 msgid ""
 "The currently active schedule will remain active (and be\n"
 "        shown e.g. in your dashboard) till it reaches the last workout or "
@@ -2461,7 +2446,7 @@ msgstr "Dodaj hamonogram"
 msgid "Schedule"
 msgstr "Harmonogram"
 
-#: manager/templates/schedule/view.html:85
+#: manager/templates/schedule/view.html:84
 msgid ""
 "This schedule is a loop and will go through the workouts above till you "
 "deactivate it"
@@ -2469,19 +2454,19 @@ msgstr ""
 "Ten harmonogram jest zapętlony i będzie przechodził przez treningi aż do "
 "jego dezaktywacji"
 
-#: manager/templates/schedule/view.html:103
+#: manager/templates/schedule/view.html:102
 msgid "Weeks"
 msgstr "Tygodnie"
 
-#: manager/templates/schedule/view.html:115
+#: manager/templates/schedule/view.html:114
 msgid "Move me"
 msgstr "Przesuń mnie"
 
-#: manager/templates/schedule/view.html:156
+#: manager/templates/schedule/view.html:168
 msgid "Start schedule"
 msgstr "Rozpocznij harmonogram"
 
-#: manager/templates/schedule/view.html:187
+#: manager/templates/schedule/view.html:197
 #, python-format
 msgid ""
 "%(weeks)s Week\n"
@@ -2502,11 +2487,11 @@ msgstr[3] ""
 "%(weeks)s tygodni\n"
 "                                "
 
-#: manager/templates/schedule/view.html:221
+#: manager/templates/schedule/view.html:231
 msgid "Adding workouts"
 msgstr "Dodawanie treningów"
 
-#: manager/templates/schedule/view.html:223
+#: manager/templates/schedule/view.html:233
 msgid ""
 "Add as many workouts to the schedule as you want. You can\n"
 "            edit the order by dragging and dropping them. It's also possible "
@@ -2518,48 +2503,48 @@ msgstr ""
 "dodać\n"
 "            wielokrotnie."
 
-#: manager/templates/schedule/view.html:232
-#: manager/templates/schedule/view.html:243
-#: manager/templates/schedule/view.html:290
+#: manager/templates/schedule/view.html:242
+#: manager/templates/schedule/view.html:256
+#: manager/templates/schedule/view.html:310
 #: manager/templates/workout/view.html:69
-#: manager/templates/workout/view.html:79
-#: manager/templates/workout/view.html:178
+#: manager/templates/workout/view.html:83
+#: manager/templates/workout/view.html:192
 msgid "Export calendar file"
 msgstr "Eksportuj plik kalendarza"
 
-#: manager/templates/schedule/view.html:236
+#: manager/templates/schedule/view.html:248
 msgid "Export this schedule as a calendar file."
 msgstr "Eksportuj ten harmonogram jako plik kalendarza."
 
-#: manager/templates/schedule/view.html:237
-#: manager/templates/workout/view.html:74
+#: manager/templates/schedule/view.html:249
+#: manager/templates/workout/view.html:76
+#, fuzzy
+#| msgid ""
+#| "You can then import the file it into your calendar\n"
+#| "                        application for example google calendar, outlook "
+#| "or iCal. This will create\n"
+#| "                        an appointment for each training day with the "
+#| "appropriate exercises."
 msgid ""
 "You can then import the file it into your calendar\n"
 "                        application for example google calendar, outlook or "
 "iCal. This will create\n"
 "                        an appointment for each training day with the "
-"appropriate exercises."
+"appropriate\n"
+"                        exercises."
 msgstr ""
 "Możesz później importować plik do swojego kalendarza,\n"
 "                        np. Google Calendar, Outlook albo iCal. To stworzy\n"
 "                        wydarzenie dla każdego treningu, z odpowiednimi "
 "ćwiczeniami."
 
-#: manager/templates/schedule/view.html:258
-#: manager/templates/schedule/view.html:294
-#: manager/templates/workout/view.html:94
-#: manager/templates/workout/view.html:174
+#: manager/templates/schedule/view.html:272
+#: manager/templates/schedule/view.html:315
+#: manager/templates/workout/view.html:99
+#: manager/templates/workout/view.html:188
 msgid "Download as PDF"
 msgstr "Pobierz jako PDF"
 
-#: manager/templates/schedule/view.html:299
-msgid "Edit schedule"
-msgstr "Edytuj harmonogram"
-
-#: manager/templates/schedule/view.html:304
-msgid "Delete schedule"
-msgstr "Usuń harmonogram"
-
 #: manager/templates/set/add.html:9
 #, python-format
 msgid "Add exercises to day \"%(day_name)s\""
@@ -2638,57 +2623,6 @@ msgid ""
 msgstr ""
 "Zawsze będziesz widział te powiadomienia, dopóki nie wpiszesz aktualnej wagi."
 
-#: manager/templates/workout/log.html:10 manager/templates/workout/log.html:11
-msgid "Weight log"
-msgstr "Wartości ciężarów"
-
-#: manager/templates/workout/log.html:29
-msgid "Weight log for workout"
-msgstr "Wartości ciężarów podczas treningu"
-
-#: manager/templates/workout/log.html:49
-msgid "Add weight log to this day"
-msgstr "Dodaj wartości ciężarów do tego dnia"
-
-#: manager/templates/workout/log.html:69
-msgid "No weight entries here."
-msgstr "Brak aktualnych wag."
-
-#: manager/templates/workout/log.html:77
-msgid "No exercises for this day."
-msgstr "Brak ćwiczeń tego dnia."
-
-#: manager/templates/workout/log.html:90
-msgid ""
-"This page shows the weight logs belonging to this workout\n"
-"only. Click on an exercise to see all the historical data for\n"
-"it."
-msgstr ""
-"Ta strona pokazuje wartości ciężarów przynależące tylko do tego treningu.\n"
-"Kliknij na ćwiczenie, by zobaczyć jego\n"
-"historię."
-
-#: manager/templates/workout/log.html:94
-msgid ""
-"If on a single day there is more than one entry with the\n"
-"same number of repetitions, but different weights, only the entry with the\n"
-"higher weight is shown in the diagram."
-msgstr ""
-"Jeżeli danego dnia jest więcej niż jeden wpis z\n"
-"taką samą liczbą powtórzeń, ale innymi ciężarami, tylko wpis z\n"
-"większymi ciężarami będzie pokazywany na diagramie."
-
-#: manager/templates/workout/log.html:98
-msgid ""
-"Note that only entries with a weight unit (kg or lb) and\n"
-"repetitions are charted, other combinations such as time or until failure\n"
-"are ignored here."
-msgstr ""
-"Pamiętaj, że tylko wpisy z wpisanym ciężarem (kilogramy lub funty) i\n"
-"powtórzenia są pokazywane na wykresach, inne, takie jak długość trwania "
-"ćwiczenia lub ćwiczenia wykonywane do porażki\n"
-"są ignorowane."
-
 #: manager/templates/workout/overview.html:25
 msgid "No templates found."
 msgstr "Nie znaleziono szablonów."
@@ -2725,27 +2659,23 @@ msgstr "Dodaj zestawy treningów do dni"
 msgid "Set the repetitions for each set"
 msgstr "Ustaw powtórzenia dla każdej serii"
 
-#: manager/templates/workout/view.html:73
+#: manager/templates/workout/view.html:75
 msgid "Export this workout as a calendar file."
 msgstr "Eksportuj trening jako plik kalendarza."
 
-#: manager/templates/workout/view.html:144
+#: manager/templates/workout/view.html:156
 msgid "Logs"
 msgstr "Wpisy"
 
-#: manager/templates/workout/view.html:146
+#: manager/templates/workout/view.html:159
 msgid "View logs"
 msgstr "Pokaż wpisy"
 
-#: manager/templates/workout/view.html:169 manager/views/schedule_step.py:99
-msgid "Edit workout"
-msgstr "Edytuj trening"
-
-#: manager/templates/workout/view.html:182 manager/views/workout.py:281
+#: manager/templates/workout/view.html:195 manager/views/workout.py:281
 msgid "Mark as template"
 msgstr "Oznacz jako szablon"
 
-#: manager/views/day.py:109
+#: manager/views/day.py:105
 msgid "Add workout day"
 msgstr "Dodaj dzień treningowy"
 
@@ -2762,6 +2692,10 @@ msgstr "Trening dla %s"
 msgid "Create schedule"
 msgstr "Utwórz harmonogram"
 
+#: manager/views/schedule_step.py:99
+msgid "Edit workout"
+msgstr "Edytuj trening"
+
 #: manager/views/workout.py:209
 msgid "Copy workout"
 msgstr "Kopiuj trening"
@@ -2887,7 +2821,7 @@ msgstr "Ilość w gramach"
 msgid "Unit amount, e.g. \"1 Cup\" or \"1/2 spoon\""
 msgstr "Jednostka ilości, np. \"1 kubek\" lub \"1/2 łyżki\""
 
-#: nutrition/models/log.py:52 nutrition/models/meal.py:50
+#: nutrition/models/log.py:52 nutrition/models/meal.py:48
 #: nutrition/models/meal_item.py:48 nutrition/models/plan.py:108
 msgid "Nutrition plan"
 msgstr "Plan żywienia"
@@ -2900,11 +2834,11 @@ msgstr "Posiłek"
 msgid "Date and Time (Approx.)"
 msgstr "Data oraz czas (przybliżony)"
 
-#: nutrition/models/meal.py:62
+#: nutrition/models/meal.py:60
 msgid "Time (approx)"
 msgstr "Czas (przybliżony)"
 
-#: nutrition/models/meal.py:69
+#: nutrition/models/meal.py:67
 msgid ""
 "Give meals a textual description / name such as \"Breakfast\" or \"after "
 "workout\""
@@ -3041,10 +2975,6 @@ msgstr "Brak składników."
 msgid "Search"
 msgstr "Szukaj"
 
-#: nutrition/templates/ingredient/overview.html:62
-msgid "Add ingredient"
-msgstr "Dodaj składnik"
-
 #: nutrition/templates/ingredient/view.html:45 nutrition/views/plan.py:229
 msgid "Macronutrients"
 msgstr "Makroelementy"
@@ -3064,20 +2994,11 @@ msgstr "N/A"
 msgid "Others"
 msgstr "Inne"
 
-#: nutrition/templates/ingredient/view.html:144
-#: nutrition/templates/units/list.html:46 nutrition/views/unit.py:86
+#: nutrition/templates/ingredient/view.html:143
+#: nutrition/templates/units/list.html:50 nutrition/views/unit.py:86
 msgid "Add new weight unit"
 msgstr "Dodaj nową jednostkę wagi"
 
-#: nutrition/templates/ingredient/view.html:206
-#: nutrition/templates/ingredient/view.html:209
-msgid "Edit ingredient"
-msgstr "Edytuj składnik"
-
-#: nutrition/templates/ingredient/view.html:213
-msgid "Delete ingredient"
-msgstr "Usuń składnik"
-
 #: nutrition/templates/rate/form.html:25
 msgid "Basal metabolic rate"
 msgstr "Podstawowy współczynnik metaboliczny"
@@ -3723,6 +3644,87 @@ msgstr "Usunięto."
 msgid "Delete weight entry for the %s"
 msgstr "Usuń wpis wagi dla %s"
 
+#~ msgid ""
+#~ "If a license has been localized, e.g. the Creative Commons\n"
+#~ "            licenses for the different countries, add them as separate "
+#~ "entries here."
+#~ msgstr ""
+#~ "Jeżeli licencje zostały przetłumaczone, np. licencja Creative Commons\n"
+#~ "            dla różnych krajów, dodaj je tutaj jako osobne wpisy."
+
+#~ msgid "Add weight log"
+#~ msgstr "Dodaj wpis dot. wagi"
+
+#~ msgid "This exercise has no repetitions."
+#~ msgstr "To ćwiczenie nie ma powtórzeń."
+
+#~ msgid "Edit them now."
+#~ msgstr "Edytuj je teraz."
+
+#~ msgid "Add exercises to this workout day"
+#~ msgstr "Dodaj ćwiczenia do tego dnia treningowego"
+
+#~ msgid "Edit schedule"
+#~ msgstr "Edytuj harmonogram"
+
+#~ msgid "Delete schedule"
+#~ msgstr "Usuń harmonogram"
+
+#~ msgid "Weight log"
+#~ msgstr "Wartości ciężarów"
+
+#~ msgid "Weight log for workout"
+#~ msgstr "Wartości ciężarów podczas treningu"
+
+#~ msgid "Add weight log to this day"
+#~ msgstr "Dodaj wartości ciężarów do tego dnia"
+
+#~ msgid "No weight entries here."
+#~ msgstr "Brak aktualnych wag."
+
+#~ msgid "No exercises for this day."
+#~ msgstr "Brak ćwiczeń tego dnia."
+
+#~ msgid ""
+#~ "This page shows the weight logs belonging to this workout\n"
+#~ "only. Click on an exercise to see all the historical data for\n"
+#~ "it."
+#~ msgstr ""
+#~ "Ta strona pokazuje wartości ciężarów przynależące tylko do tego "
+#~ "treningu.\n"
+#~ "Kliknij na ćwiczenie, by zobaczyć jego\n"
+#~ "historię."
+
+#~ msgid ""
+#~ "If on a single day there is more than one entry with the\n"
+#~ "same number of repetitions, but different weights, only the entry with "
+#~ "the\n"
+#~ "higher weight is shown in the diagram."
+#~ msgstr ""
+#~ "Jeżeli danego dnia jest więcej niż jeden wpis z\n"
+#~ "taką samą liczbą powtórzeń, ale innymi ciężarami, tylko wpis z\n"
+#~ "większymi ciężarami będzie pokazywany na diagramie."
+
+#~ msgid ""
+#~ "Note that only entries with a weight unit (kg or lb) and\n"
+#~ "repetitions are charted, other combinations such as time or until "
+#~ "failure\n"
+#~ "are ignored here."
+#~ msgstr ""
+#~ "Pamiętaj, że tylko wpisy z wpisanym ciężarem (kilogramy lub funty) i\n"
+#~ "powtórzenia są pokazywane na wykresach, inne, takie jak długość trwania "
+#~ "ćwiczenia lub ćwiczenia wykonywane do porażki\n"
+#~ "są ignorowane."
+
+#~ msgid "Add ingredient"
+#~ msgstr "Dodaj składnik"
+
+#~ msgid "Edit ingredient"
+#~ msgstr "Edytuj składnik"
+
+#~ msgid "Delete ingredient"
+#~ msgstr "Usuń składnik"
+
 #~ msgid "Ingredients pending review"
 #~ msgstr "Składniki oczekujące na akceptację"
 
diff --git a/wger/locale/pt/LC_MESSAGES/django.po b/wger/locale/pt/LC_MESSAGES/django.po
index 54664137f..14328e147 100644
--- a/wger/locale/pt/LC_MESSAGES/django.po
+++ b/wger/locale/pt/LC_MESSAGES/django.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: wger Workout Manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-07-14 15:59+0200\n"
+"POT-Creation-Date: 2024-11-14 13:09+0100\n"
 "PO-Revision-Date: 2024-03-23 17:01+0000\n"
 "Last-Translator: Wilton Rodrigues <wiltonf.rodrigues@gmail.com>\n"
 "Language-Team: Portuguese <https://hosted.weblate.org/projects/wger/web/pt/"
@@ -27,7 +27,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 "X-Generator: Weblate 5.5-dev\n"
 
-#: config/models/gym_config.py:46 gym/templates/gym/list.html:53
+#: config/models/gym_config.py:46 gym/templates/gym/list.html:56
 msgid "Default gym"
 msgstr "Academia principal"
 
@@ -39,28 +39,28 @@ msgstr ""
 "Selecione a academia principal para essa instalação. Isto atribuirá todos os "
 "novos utilizadores registados e os utilizadores sem academia à essa academia."
 
-#: config/views/gym_config.py:42 core/templates/language/view.html:67
-#: core/templates/license/list.html:17 core/templates/misc/license/list.html:18
+#: config/views/gym_config.py:42 core/templates/language/view.html:64
+#: core/templates/license/list.html:17
 #: core/templates/repetition_unit/list.html:18
-#: core/templates/tags/render_day.html:39
-#: core/templates/tags/render_day.html:75 core/templates/user/overview.html:204
-#: core/templates/user/overview.html:445
+#: core/templates/user/overview.html:204 core/templates/user/overview.html:467
 #: core/templates/weight_unit/list.html:18
 #: exercises/templates/categories/admin-overview.html:17
 #: exercises/templates/equipment/admin-overview.html:17
-#: exercises/templates/muscles/admin-overview.html:17
-#: gallery/views/images.py:98 gym/templates/admin_notes/list.html:32
-#: gym/templates/contract/list.html:31 gym/templates/contract/view.html:107
-#: gym/templates/contract_option/list.html:32
-#: gym/templates/contract_type/list.html:32 gym/templates/document/list.html:38
-#: gym/templates/gym/list.html:20 gym/templates/gym/list.html:46
-#: gym/templates/gym/member_list.html:87 gym/templates/gym/member_list.html:140
-#: gym/templates/gym/member_list.html:176
-#: manager/templates/calendar/day.html:68
-#: manager/templates/calendar/month.html:85
-#: manager/templates/calendar/partial_overview_table.html:18
-#: manager/templates/schedule/view.html:118
-#: nutrition/templates/ingredient/view.html:165
+#: exercises/templates/muscles/admin-overview.html:16
+#: gallery/views/images.py:98 gym/templates/admin_notes/list.html:31
+#: gym/templates/contract/list.html:30 gym/templates/contract/view.html:106
+#: gym/templates/contract_option/list.html:29
+#: gym/templates/contract_type/list.html:30 gym/templates/document/list.html:38
+#: gym/templates/gym/list.html:19 gym/templates/gym/list.html:48
+#: gym/templates/gym/member_list.html:94 gym/templates/gym/member_list.html:152
+#: gym/templates/gym/member_list.html:190
+#: manager/templates/calendar/day.html:67
+#: manager/templates/calendar/month.html:84
+#: manager/templates/calendar/partial_overview_table.html:16
+#: manager/templates/schedule/view.html:318
+#: manager/templates/workout/view.html:181
+#: nutrition/templates/ingredient/view.html:164
+#: nutrition/templates/ingredient/view.html:209
 #: nutrition/templates/units/list.html:19
 msgid "Edit"
 msgstr "Editar"
@@ -94,8 +94,8 @@ msgstr "Minha agenda de treino"
 msgid "Empty placeholder schedule"
 msgstr "Agenda de espaço reservado vazia"
 
-#: core/forms.py:69 core/templates/navigation.html:285
-#: core/templates/navigation.html:291 core/templates/user/login.html:4
+#: core/forms.py:69 core/templates/navigation.html:284
+#: core/templates/navigation.html:290 core/templates/user/login.html:4
 #: software/templates/features.html:82 software/templates/features.html:427
 msgid "Login"
 msgstr "Login"
@@ -105,14 +105,14 @@ msgstr "Login"
 msgid "First name"
 msgstr "Primeiro nome"
 
-#: core/forms.py:109 core/forms.py:215 core/templates/user/overview.html:266
+#: core/forms.py:109 core/forms.py:215 core/templates/user/overview.html:284
 #: gym/views/export.py:62 gym/views/gym.py:217
 msgid "Last name"
 msgstr "Último nome"
 
-#: core/forms.py:111 core/forms.py:180 core/templates/user/overview.html:270
+#: core/forms.py:111 core/forms.py:180 core/templates/user/overview.html:288
 #: gym/models/contract.py:256 gym/models/gym.py:58
-#: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:104
+#: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:116
 #: gym/templates/gym/new_user.html:30 gym/views/export.py:60
 #: mailer/templates/mailer/gym/form.html:4
 #: mailer/templates/mailer/gym/overview.html:4
@@ -142,8 +142,8 @@ msgstr "Lembretes de treino"
 msgid "Other settings"
 msgstr "Outras configurações"
 
-#: core/forms.py:174 core/views/user.py:624 core/views/user.py:639
-#: core/views/user.py:651 gym/forms.py:73 manager/templates/log/add.html:65
+#: core/forms.py:174 core/views/user.py:623 core/views/user.py:638
+#: core/views/user.py:650 gym/forms.py:73 manager/templates/log/add.html:65
 #: manager/templates/set/add.html:70 manager/views/workout.py:203
 #: utils/generic_views.py:143
 msgid "Save"
@@ -167,26 +167,25 @@ msgstr "Senha"
 msgid "Please enter your current password."
 msgstr "Por favor informe a sua senha atual."
 
-#: core/forms.py:242 core/templates/language/view.html:73
-#: core/templates/license/list.html:19 core/templates/misc/license/list.html:22
-#: core/templates/repetition_unit/list.html:20
-#: core/templates/tags/render_day.html:45
-#: core/templates/tags/render_day.html:81 core/templates/user/overview.html:217
-#: core/templates/weight_unit/list.html:20
-#: exercises/templates/categories/admin-overview.html:19
-#: exercises/templates/equipment/admin-overview.html:19
-#: exercises/templates/muscles/admin-overview.html:19
-#: gym/templates/admin_notes/list.html:40
-#: gym/templates/contract_option/list.html:41
-#: gym/templates/contract_type/list.html:41 gym/templates/document/list.html:46
-#: gym/templates/gym/list.html:22 manager/templates/calendar/day.html:73
-#: manager/templates/calendar/month.html:89
-#: manager/templates/calendar/partial_overview_table.html:23
-#: manager/templates/schedule/view.html:122
-#: manager/templates/workout/view.html:188
-#: nutrition/templates/ingredient/view.html:166
+#: core/forms.py:242 core/templates/language/view.html:70
+#: core/templates/license/list.html:21
+#: core/templates/repetition_unit/list.html:22
+#: core/templates/user/overview.html:233
+#: core/templates/weight_unit/list.html:22
+#: exercises/templates/categories/admin-overview.html:21
+#: exercises/templates/equipment/admin-overview.html:21
+#: exercises/templates/muscles/admin-overview.html:20
+#: gym/templates/admin_notes/list.html:37
+#: gym/templates/contract_option/list.html:35
+#: gym/templates/contract_type/list.html:36 gym/templates/document/list.html:46
+#: gym/templates/gym/list.html:23 manager/templates/calendar/day.html:73
+#: manager/templates/calendar/month.html:88
+#: manager/templates/calendar/partial_overview_table.html:22
+#: manager/templates/schedule/view.html:324
+#: manager/templates/workout/view.html:202
+#: nutrition/templates/ingredient/view.html:168
 #: nutrition/templates/ingredient/view.html:215
-#: nutrition/templates/units/list.html:22
+#: nutrition/templates/units/list.html:25
 msgid "Delete"
 msgstr "Remover"
 
@@ -198,9 +197,9 @@ msgstr "Senha inválida"
 msgid "The form is secured with reCAPTCHA"
 msgstr "O formulário está seguro com o reCAPTCHA"
 
-#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:285
-#: core/templates/navigation.html:297 core/templates/template.html:149
-#: core/templates/user/login.html:20 core/views/user.py:298
+#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:284
+#: core/templates/navigation.html:296 core/templates/template.html:151
+#: core/templates/user/login.html:20 core/views/user.py:297
 #: software/templates/features.html:87 software/templates/features.html:422
 msgid "Register"
 msgstr "Cadastro"
@@ -453,18 +452,18 @@ msgid "The sum of all hours has to be 24"
 msgstr "A soma de todas as horas deve ser 24"
 
 #: core/models/rep_unit.py:36 core/models/weight_unit.py:36
-#: core/templates/user/overview.html:262 core/views/user.py:599
+#: core/templates/user/overview.html:280 core/views/user.py:598
 #: exercises/models/category.py:29 exercises/models/equipment.py:29
 #: exercises/models/exercise.py:59 exercises/models/muscle.py:36
 #: gym/models/contract.py:52 gym/models/contract.py:103 gym/models/gym.py:46
 #: gym/models/user_document.py:84 gym/templates/contract/view.html:50
-#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:96
+#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:108
 #: gym/views/gym.py:158 manager/models/schedule.py:55
 #: manager/models/workout.py:57 measurements/models/category.py:36
 #: nutrition/models/ingredient.py:111
-#: nutrition/models/ingredient_category.py:27 nutrition/models/meal.py:67
+#: nutrition/models/ingredient_category.py:27 nutrition/models/meal.py:65
 #: nutrition/models/weight_unit.py:38
-#: nutrition/templates/ingredient/view.html:152
+#: nutrition/templates/ingredient/view.html:151
 msgid "Name"
 msgstr "Nome"
 
@@ -516,7 +515,7 @@ msgstr ""
 msgid "Back to \"%(target)s\""
 msgstr "Voltar a \"%(target)s\""
 
-#: core/templates/delete.html:15
+#: core/templates/delete.html:4
 msgid "Are you sure you want to delete this? This action cannot be undone."
 msgstr ""
 "Você tem certeza que quer remover isto? Esta ação não pode ser desfeita."
@@ -569,7 +568,7 @@ msgstr "Clique no seguinte link para confirmar seu e-mail: %(link)s"
 msgid "Dashboard"
 msgstr "Painel"
 
-#: core/templates/language/overview.html:4 core/templates/navigation.html:345
+#: core/templates/language/overview.html:4 core/templates/navigation.html:344
 msgid "Languages"
 msgstr "Idiomas"
 
@@ -579,82 +578,72 @@ msgstr "Não encontrado."
 
 #: core/templates/language/overview.html:22
 #: manager/templates/calendar/month.html:132
-#: manager/templates/schedule/overview.html:28
-#: manager/templates/schedule/view.html:144
+#: manager/templates/schedule/view.html:154
 #: manager/templates/workout/overview.html:28
 #: nutrition/templates/ingredient/overview.html:38
 msgid "Add one now."
 msgstr "Adicionar um agora."
 
-#: core/templates/language/overview.html:35 core/templates/license/list.html:40
-#: core/templates/misc/license/list.html:43
-#: core/templates/repetition_unit/list.html:43
-#: core/templates/user/overview.html:326 core/templates/user/overview.html:365
-#: core/templates/user/overview.html:401
-#: core/templates/weight_unit/list.html:43 core/views/languages.py:74
+#: core/templates/language/overview.html:34 core/templates/license/list.html:43
+#: core/templates/repetition_unit/list.html:46
+#: core/templates/user/overview.html:344 core/templates/user/overview.html:384
+#: core/templates/user/overview.html:422
+#: core/templates/weight_unit/list.html:46 core/views/languages.py:74
 #: core/views/license.py:66 core/views/repetition_units.py:66
 #: core/views/weight_units.py:66
-#: exercises/templates/categories/admin-overview.html:38
-#: gallery/views/images.py:63 gym/templates/admin_notes/list.html:67
-#: gym/templates/contract/list.html:73
-#: gym/templates/contract_option/list.html:72
-#: gym/templates/contract_type/list.html:72 gym/templates/document/list.html:79
-#: gym/templates/gym/member_list.html:211
-#: gym/templates/gym/member_list.html:244
-#: gym/templates/gym/member_list.html:281
+#: exercises/templates/categories/admin-overview.html:40
+#: exercises/templates/equipment/admin-overview.html:39
+#: exercises/templates/muscles/admin-overview.html:40
+#: gallery/views/images.py:63 gym/templates/admin_notes/list.html:64
+#: gym/templates/contract/list.html:69
+#: gym/templates/contract_option/list.html:65
+#: gym/templates/contract_type/list.html:66 gym/templates/document/list.html:78
+#: gym/templates/gym/member_list.html:228
+#: gym/templates/gym/member_list.html:264
+#: gym/templates/gym/member_list.html:303
 #: mailer/templates/mailer/gym/overview.html:43
+#: nutrition/templates/ingredient/overview.html:60
 msgid "Add"
 msgstr "Adicionar"
 
 #: core/templates/language/view.html:61 core/templates/user/api_key.html:44
-#: core/templates/user/preferences.html:45 gym/models/contract.py:203
-#: gym/templates/contract/view.html:41 gym/templates/contract/view.html:106
-#: gym/templates/gym/member_list.html:248
-#: manager/templates/schedule/view.html:285
-#: manager/templates/workout/view.html:163
-#: nutrition/templates/ingredient/view.html:202
+#: core/templates/user/preferences.html:50 gym/models/contract.py:203
+#: gym/templates/contract/view.html:41 gym/templates/gym/member_list.html:270
+#: manager/templates/schedule/view.html:304
+#: manager/templates/workout/view.html:177
+#: nutrition/templates/ingredient/view.html:206
 msgid "Options"
 msgstr "Opções"
 
-#: core/templates/license/list.html:4 core/templates/misc/license/list.html:4
+#: core/templates/license/list.html:4
 msgid "License list"
 msgstr "Lista de licença"
 
-#: core/templates/license/list.html:26 core/templates/misc/license/list.html:30
-#: core/templates/repetition_unit/list.html:28
+#: core/templates/license/list.html:30
+#: core/templates/repetition_unit/list.html:32
 #: core/templates/user/overview.html:104 core/templates/user/overview.html:136
-#: core/templates/user/overview.html:185 core/templates/user/overview.html:347
-#: core/templates/user/overview.html:383 core/templates/user/overview.html:427
-#: core/templates/weight_unit/list.html:28
-#: exercises/templates/categories/admin-overview.html:26
-#: exercises/templates/equipment/admin-overview.html:26
-#: exercises/templates/muscles/admin-overview.html:26
-#: gym/templates/admin_notes/list.html:52 gym/templates/contract/list.html:60
-#: gym/templates/contract_option/list.html:58
-#: gym/templates/contract_type/list.html:58 gym/templates/document/list.html:64
-#: gym/templates/gym/list.html:29 gym/templates/gym/member_list.html:229
-#: gym/templates/gym/member_list.html:262
-#: gym/templates/gym/member_list.html:299
+#: core/templates/user/overview.html:185 core/templates/user/overview.html:365
+#: core/templates/user/overview.html:404 core/templates/user/overview.html:448
+#: core/templates/weight_unit/list.html:32
+#: exercises/templates/categories/admin-overview.html:30
+#: exercises/templates/equipment/admin-overview.html:30
+#: exercises/templates/muscles/admin-overview.html:29
+#: gym/templates/admin_notes/list.html:50 gym/templates/contract/list.html:57
+#: gym/templates/contract_option/list.html:52
+#: gym/templates/contract_type/list.html:53 gym/templates/document/list.html:64
+#: gym/templates/gym/list.html:32 gym/templates/gym/member_list.html:248
+#: gym/templates/gym/member_list.html:284
+#: gym/templates/gym/member_list.html:321
 #: mailer/templates/mailer/gym/overview.html:30
-#: manager/templates/calendar/day.html:87
-#: nutrition/templates/units/list.html:29
+#: manager/templates/calendar/day.html:88
+#: nutrition/templates/units/list.html:34
 msgid "Nothing found"
 msgstr "Nada encontrado"
 
-#: core/templates/misc/about.html:4 core/templates/template.html:175
+#: core/templates/misc/about.html:4 core/templates/template.html:188
 msgid "Imprint"
 msgstr "Imprimir"
 
-#: core/templates/misc/license/list.html:47
-msgid ""
-"If a license has been localized, e.g. the Creative Commons\n"
-"            licenses for the different countries, add them as separate "
-"entries here."
-msgstr ""
-"Se uma licença for dependente da localização, como as licenças Creative\n"
-"             Commons para os differentes países, adicione-as como entradas "
-"separadas aqui."
-
 #: core/templates/navigation.html:28 software/templates/features.html:437
 msgid "Training"
 msgstr "Treinamento"
@@ -699,8 +688,8 @@ msgstr "Modelos públicos"
 msgid "Exercises"
 msgstr "Exercícios"
 
-#: core/templates/navigation.html:111 core/templates/navigation.html:184
-#: core/templates/navigation.html:340
+#: core/templates/navigation.html:111 core/templates/navigation.html:185
+#: core/templates/navigation.html:339
 msgid "Administration"
 msgstr "Administração"
 
@@ -737,87 +726,87 @@ msgstr "Calculadora IMC"
 msgid "Daily calories calculator"
 msgstr "Calculador de calorias diárias"
 
-#: core/templates/navigation.html:179
+#: core/templates/navigation.html:180
 #: nutrition/templates/ingredient/overview.html:10
 msgid "Ingredient overview"
 msgstr "Visão geral do ingrediente"
 
-#: core/templates/navigation.html:187 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:189 nutrition/templates/units/list.html:6
 msgid "Ingredient weight units"
 msgstr "Unidade de peso dos ingredientes"
 
-#: core/templates/navigation.html:203 software/templates/features.html:442
+#: core/templates/navigation.html:205 software/templates/features.html:442
 msgid "Body weight"
 msgstr "Peso Corporal"
 
-#: core/templates/navigation.html:210 core/templates/user/overview.html:114
+#: core/templates/navigation.html:212 core/templates/user/overview.html:114
 msgid "Weight overview"
 msgstr "Visão geral do peso"
 
-#: core/templates/navigation.html:217 weight/views.py:65
+#: core/templates/navigation.html:216 weight/views.py:65
 msgid "Add weight entry"
 msgstr "Adicionar uma entrada para peso"
 
-#: core/templates/navigation.html:231
+#: core/templates/navigation.html:230
 msgid "About this software"
 msgstr "Sobre este software"
 
-#: core/templates/navigation.html:237 software/templates/about_us.html:5
+#: core/templates/navigation.html:236 software/templates/about_us.html:5
 msgid "About us"
 msgstr "Sobre nós"
 
-#: core/templates/navigation.html:243 software/templates/features.html:507
+#: core/templates/navigation.html:242 software/templates/features.html:507
 msgid "REST API"
 msgstr "API REST"
 
-#: core/templates/navigation.html:249 utils/models.py:45
+#: core/templates/navigation.html:248 utils/models.py:45
 msgid "License"
 msgstr "Licença"
 
-#: core/templates/navigation.html:255
+#: core/templates/navigation.html:254
 msgid "Developer documentation"
 msgstr "Documentação do desenvolvedor"
 
-#: core/templates/navigation.html:262
+#: core/templates/navigation.html:261
 msgid "Get the code"
 msgstr "Obtenha o código fonte"
 
-#: core/templates/navigation.html:269 core/templates/template.html:214
+#: core/templates/navigation.html:268 core/templates/template.html:227
 #: software/templates/features.html:582
 msgid "Translate"
 msgstr "Traduzir"
 
-#: core/templates/navigation.html:303 core/templates/user/login.html:28
+#: core/templates/navigation.html:302 core/templates/user/login.html:28
 msgid "Reset password"
 msgstr "Redefinr a senha"
 
-#: core/templates/navigation.html:321
+#: core/templates/navigation.html:320
 msgid "My preferences"
 msgstr "Minhas preferências"
 
-#: core/templates/navigation.html:330
+#: core/templates/navigation.html:329
 msgid "Logout"
 msgstr "Sair"
 
-#: core/templates/navigation.html:353
+#: core/templates/navigation.html:352
 msgid "Licenses"
 msgstr "Licenças"
 
-#: core/templates/navigation.html:361
+#: core/templates/navigation.html:360
 #: core/templates/repetition_unit/list.html:4
 msgid "Repetition units"
 msgstr "Unidades de repetição"
 
-#: core/templates/navigation.html:369 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:368 core/templates/weight_unit/list.html:4
 #: nutrition/templates/ingredient/view.html:141
 msgid "Weight units"
 msgstr "Unidade de peso"
 
-#: core/templates/navigation.html:377 core/templates/user/list.html:4
+#: core/templates/navigation.html:376 core/templates/user/list.html:4
 msgid "User list"
 msgstr "Lista de utilizadores"
 
-#: core/templates/navigation.html:383
+#: core/templates/navigation.html:382
 msgid "Gyms"
 msgstr "Academias"
 
@@ -880,57 +869,32 @@ msgstr "Anterior"
 msgid "next"
 msgstr "Próximo"
 
-#: core/templates/tags/render_day.html:34
-msgid "Add weight log"
-msgstr "Registrar peso"
-
-#: core/templates/tags/render_day.html:116
-msgid "Placeholder image for exercise"
+#: core/templates/tags/render_day.html:44
+#, fuzzy
+#| msgid "Placeholder image for exercise"
+msgid "Placeholder image for translation"
 msgstr "Espaço reservado para imagem do exercício"
 
-#: core/templates/tags/render_day.html:133
-msgid "This exercise has no repetitions."
-msgstr "Este exercício não possui repetições."
-
-#: core/templates/tags/render_day.html:136
-msgid "Edit them now."
-msgstr "Edite-os agora."
-
-#: core/templates/tags/render_day.html:162
-msgid "Add exercises to this workout day"
-msgstr "Adicione exercícios para este dia de treino"
-
-#: core/templates/tags/render_weight_log.html:17 manager/helpers.py:86
-#: manager/models/setting.py:72 manager/templates/set/formset.html:9
-msgid "Reps"
-msgstr "Repetições"
-
-#: core/templates/tags/render_weight_log.html:30 manager/forms.py:191
-#: manager/models/log.py:103 manager/models/setting.py:102
-#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
-msgid "RiR"
-msgstr "ReR"
-
-#: core/templates/template.html:122 manager/templates/calendar/month.html:138
-#: manager/templates/schedule/view.html:248
-#: manager/templates/schedule/view.html:269
-#: manager/templates/workout/view.html:84
-#: manager/templates/workout/view.html:137
+#: core/templates/template.html:124 manager/templates/calendar/month.html:138
+#: manager/templates/schedule/view.html:262
+#: manager/templates/schedule/view.html:287
+#: manager/templates/workout/view.html:89
+#: manager/templates/workout/view.html:149
 msgid "Close"
 msgstr "Fechar"
 
-#: core/templates/template.html:138
+#: core/templates/template.html:140
 msgid ""
 "You are using a guest account, data entered will be deleted after a week."
 msgstr ""
 "Você está usando uma conta de convidado, todos os dados cadastrados serão "
 "apagados depois de uma semana."
 
-#: core/templates/template.html:143
+#: core/templates/template.html:145
 msgid "Create some demo entries"
 msgstr "Crie alguns registros de demonstração"
 
-#: core/templates/template.html:180 software/templates/features.html:547
+#: core/templates/template.html:193 software/templates/features.html:547
 #: software/templates/tos.html:7
 msgid "Terms of service"
 msgstr "Termos de uso"
@@ -939,7 +903,7 @@ msgstr "Termos de uso"
 msgid "Features"
 msgstr "Funcionalidades"
 
-#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:54
+#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:59
 msgid "API key"
 msgstr "API key"
 
@@ -984,17 +948,17 @@ msgstr "Gerar nova API Key"
 msgid "Documentation"
 msgstr "Documentação"
 
-#: core/templates/user/delete_account.html:4
-#: core/templates/user/preferences.html:59
+#: core/templates/user/delete_account.html:3
+#: core/templates/user/preferences.html:62
 msgid "Delete account"
 msgstr "Apagar conta"
 
-#: core/templates/user/delete_account.html:17
+#: core/templates/user/delete_account.html:9
 #: exercises/templates/history/overview.html:93
 msgid "Are you sure?"
 msgstr "Você tem certeza?"
 
-#: core/templates/user/delete_account.html:22
+#: core/templates/user/delete_account.html:14
 #, python-format
 msgid ""
 "This action will delete the user account \"%(username)s\".\n"
@@ -1017,22 +981,22 @@ msgstr "Esqueceu a senha?"
 
 #: core/templates/user/overview.html:25 core/templates/user/overview.html:68
 #: core/templates/user/overview.html:112 core/templates/user/overview.html:144
-#: core/templates/user/overview.html:330 core/templates/user/overview.html:369
-#: core/templates/user/overview.html:405
+#: core/templates/user/overview.html:348 core/templates/user/overview.html:390
+#: core/templates/user/overview.html:426
 #, python-format
 msgid "last %(number)s"
 msgstr "último %(number)s"
 
 #: core/templates/user/overview.html:27 core/templates/user/overview.html:146
-#: core/templates/user/overview.html:325 core/templates/user/overview.html:364
-#: core/templates/user/overview.html:400 gym/templates/gym/member_list.html:210
-#: gym/templates/gym/member_list.html:243
-#: gym/templates/gym/member_list.html:280
+#: core/templates/user/overview.html:343 core/templates/user/overview.html:382
+#: core/templates/user/overview.html:421 gym/templates/gym/member_list.html:226
+#: gym/templates/gym/member_list.html:262
+#: gym/templates/gym/member_list.html:302
 msgid "Overview"
 msgstr "Visão geral"
 
 #: core/templates/user/overview.html:28
-#: manager/templates/schedule/view.html:163
+#: manager/templates/schedule/view.html:172
 #: manager/templates/workout/overview.html:39 manager/views/schedule_step.py:60
 msgid "Add workout"
 msgstr "Adicionar treino"
@@ -1064,38 +1028,36 @@ msgstr "descrição"
 msgid "Number of logs (days)"
 msgstr "Número de registros (dias)"
 
-#: core/templates/user/overview.html:37 core/views/user.py:600
+#: core/templates/user/overview.html:37 core/views/user.py:599
 #: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:158
 msgid "Last activity"
 msgstr "Última atividade"
 
 #: core/templates/user/overview.html:58
 #: manager/templates/calendar/month.html:128
-#: manager/templates/schedule/view.html:144
 #: manager/templates/workout/overview.html:28
 msgid "No workouts found."
 msgstr "Nenhum treino encontrado."
 
 #: core/templates/user/overview.html:68 manager/forms.py:280
-#: manager/templates/workout/view.html:106
+#: manager/templates/workout/view.html:114
 msgid "Log"
 msgstr "Log"
 
 #: core/templates/user/overview.html:77 manager/models/session.py:83
-#: manager/templates/calendar/partial_overview_table.html:52
+#: manager/templates/calendar/partial_overview_table.html:54
 msgid "General impression"
 msgstr "Impressão geral"
 
-#: core/templates/user/overview.html:78 core/templates/user/overview.html:369
+#: core/templates/user/overview.html:78 core/templates/user/overview.html:390
 #: manager/models/session.py:73
-#: manager/templates/calendar/partial_overview_table.html:56
-#: manager/templates/workout/log.html:89
+#: manager/templates/calendar/partial_overview_table.html:58
 msgid "Notes"
 msgstr "Notas"
 
 #: core/templates/user/overview.html:79
 #: exercises/templates/history/overview.html:30
-#: manager/templates/calendar/partial_overview_table.html:42
+#: manager/templates/calendar/partial_overview_table.html:44
 msgid "Time"
 msgstr "Tempo"
 
@@ -1133,122 +1095,122 @@ msgstr "Gordura"
 msgid "kcal"
 msgstr "kcal"
 
-#: core/templates/user/overview.html:201 core/templates/user/overview.html:322
-#: core/templates/user/overview.html:361 core/templates/user/overview.html:397
-#: core/templates/user/overview.html:442 gym/templates/gym/list.html:42
-#: gym/templates/gym/member_list.html:84 gym/templates/gym/member_list.html:137
-#: gym/templates/gym/member_list.html:173
-#: gym/templates/gym/member_list.html:207
-#: gym/templates/gym/member_list.html:240
-#: gym/templates/gym/member_list.html:277
-#: manager/templates/schedule/view.html:100
+#: core/templates/user/overview.html:201 core/templates/user/overview.html:340
+#: core/templates/user/overview.html:379 core/templates/user/overview.html:418
+#: core/templates/user/overview.html:463 gym/templates/gym/list.html:45
+#: gym/templates/gym/member_list.html:91 gym/templates/gym/member_list.html:149
+#: gym/templates/gym/member_list.html:187
+#: gym/templates/gym/member_list.html:223
+#: gym/templates/gym/member_list.html:259
+#: gym/templates/gym/member_list.html:299
+#: manager/templates/schedule/view.html:99
 msgid "Actions"
 msgstr "Ações"
 
-#: core/templates/user/overview.html:207
+#: core/templates/user/overview.html:210
 msgid "Deactivate user"
 msgstr "Utilizador desativado"
 
-#: core/templates/user/overview.html:209
+#: core/templates/user/overview.html:214
 msgid "Activate user"
 msgstr "Utilizador ativo"
 
-#: core/templates/user/overview.html:211
+#: core/templates/user/overview.html:223
 msgid "Reset user password"
 msgstr "Redefinir a senha de utilizador"
 
-#: core/templates/user/overview.html:214 gym/templates/gym/member_list.html:30
+#: core/templates/user/overview.html:227 gym/templates/gym/member_list.html:30
 msgid "Roles"
 msgstr "Papéis"
 
-#: core/templates/user/overview.html:225
+#: core/templates/user/overview.html:243
 msgid "Password reset confirmation"
 msgstr "Confirmação de redefinição da palavra-passe"
 
-#: core/templates/user/overview.html:229
+#: core/templates/user/overview.html:247
 msgid "Do you really want to change this user&#39;s password?"
 msgstr "Você realmente deseja alterar a senha deste utilizador&#39; ?"
 
-#: core/templates/user/overview.html:232
+#: core/templates/user/overview.html:250
 #: exercises/templates/history/overview.html:106
 msgid "No"
 msgstr "Não"
 
-#: core/templates/user/overview.html:233
+#: core/templates/user/overview.html:251
 #: exercises/templates/history/overview.html:99
 msgid "Yes"
 msgstr "Sim"
 
-#: core/templates/user/overview.html:254 gym/templates/gym/member_list.html:93
+#: core/templates/user/overview.html:272 gym/templates/gym/member_list.html:105
 msgid "Details"
 msgstr "Detalhes"
 
-#: core/templates/user/overview.html:258 gym/views/export.py:57
-#: manager/helpers.py:86 manager/templates/schedule/view.html:98
+#: core/templates/user/overview.html:276 gym/views/export.py:57
+#: manager/helpers.py:86 manager/templates/schedule/view.html:97
 msgid "Nr."
 msgstr "Nr."
 
-#: core/templates/user/overview.html:280 gym/models/contract.py:287
+#: core/templates/user/overview.html:298 gym/models/contract.py:287
 #: gym/models/gym.py:50 gym/templates/contract/view.html:75
-#: gym/templates/gym/member_list.html:100 gym/views/export.py:68
+#: gym/templates/gym/member_list.html:112 gym/views/export.py:68
 msgid "Phone"
 msgstr "Telefone"
 
-#: core/templates/user/overview.html:284 gym/templates/contract/view.html:87
-#: gym/templates/gym/member_list.html:118
+#: core/templates/user/overview.html:302 gym/templates/contract/view.html:87
+#: gym/templates/gym/member_list.html:130
 msgid "Address"
 msgstr "Endereço"
 
-#: core/templates/user/overview.html:295
+#: core/templates/user/overview.html:313
 msgid "Registered"
 msgstr "Registrado"
 
-#: core/templates/user/overview.html:299
+#: core/templates/user/overview.html:317
 msgid "Last login"
 msgstr "Último Login"
 
-#: core/templates/user/overview.html:304
+#: core/templates/user/overview.html:322
 msgid "Status"
 msgstr "Estado"
 
-#: core/templates/user/overview.html:307
+#: core/templates/user/overview.html:325
 msgid "Active"
 msgstr "Ativo"
 
-#: core/templates/user/overview.html:309
+#: core/templates/user/overview.html:327
 msgid "Inactive"
 msgstr "Inativo"
 
-#: core/templates/user/overview.html:330 gym/templates/contract/list.html:4
-#: gym/templates/gym/member_list.html:202
+#: core/templates/user/overview.html:348 gym/templates/contract/list.html:4
+#: gym/templates/gym/member_list.html:218
 msgid "Contracts"
 msgstr "Contratos"
 
-#: core/templates/user/overview.html:405 gym/templates/document/list.html:4
+#: core/templates/user/overview.html:426 gym/templates/document/list.html:4
 msgid "Documents"
 msgstr "Documentos"
 
-#: core/templates/user/overview.html:412 gym/templates/document/list.html:32
-#: manager/forms.py:292 manager/templates/workout/view.html:132
+#: core/templates/user/overview.html:433 gym/templates/document/list.html:33
+#: manager/forms.py:292 manager/templates/workout/view.html:143
 msgid "Download"
 msgstr "Descarregar"
 
-#: core/templates/user/overview.html:450 gym/views/admin_config.py:44
+#: core/templates/user/overview.html:474 gym/views/admin_config.py:44
 #: gym/views/admin_config.py:58 gym/views/user_config.py:46
 msgid "Configuration"
 msgstr "Configuração"
 
-#: core/templates/user/overview.html:453 gym/models/user_config.py:92
+#: core/templates/user/overview.html:477 gym/models/user_config.py:92
 msgid "Include in inactive overview"
 msgstr "Incluir na visão geral inativa"
 
-#: core/templates/user/overview.html:486
+#: core/templates/user/overview.html:510
 #, python-format
 msgid "Admin login is only available for users in %(gym_name)s"
 msgstr ""
 "O login de administrador está disponível apenas para usuários no %(gym_name)s"
 
-#: core/templates/user/overview.html:490
+#: core/templates/user/overview.html:514
 msgid "Log in as this user"
 msgstr "Logado como este utilizador"
 
@@ -1268,19 +1230,19 @@ msgstr "E-mail não verificado"
 msgid "Send verification email"
 msgstr "Enviar e-mail de verificação"
 
-#: core/templates/user/preferences.html:30
+#: core/templates/user/preferences.html:31
 msgid "You need to verify your email to contribute exercises"
 msgstr "É preciso verificar seu e-mail para contribuir com exercícios"
 
-#: core/templates/user/preferences.html:50 core/views/user.py:611
+#: core/templates/user/preferences.html:55 core/views/user.py:610
 msgid "Change password"
 msgstr "Mudar senha"
 
-#: core/templatetags/wger_extras.py:205 i18n.tpl:37
+#: core/templatetags/wger_extras.py:197 i18n.tpl:37
 msgid "kg"
 msgstr "kg"
 
-#: core/templatetags/wger_extras.py:207
+#: core/templatetags/wger_extras.py:199
 #: nutrition/templates/ingredient/view.html:60
 #: nutrition/templates/ingredient/view.html:66
 #: nutrition/templates/ingredient/view.html:73
@@ -1292,11 +1254,11 @@ msgctxt "weight unit, i.e. grams"
 msgid "g"
 msgstr "g"
 
-#: core/templatetags/wger_extras.py:210 i18n.tpl:38
+#: core/templatetags/wger_extras.py:202 i18n.tpl:38
 msgid "lb"
 msgstr "lb"
 
-#: core/templatetags/wger_extras.py:212
+#: core/templatetags/wger_extras.py:204
 msgctxt "weight unit, i.e. ounces"
 msgid "oz"
 msgstr "oz"
@@ -1323,13 +1285,13 @@ msgid "Delete {0}?"
 msgstr "Remover {0}?"
 
 #: core/views/languages.py:111 core/views/license.py:85
-#: core/views/repetition_units.py:86 core/views/user.py:474
+#: core/views/repetition_units.py:86 core/views/user.py:473
 #: core/views/weight_units.py:86 exercises/views/categories.py:98
 #: exercises/views/equipment.py:81 exercises/views/muscles.py:87
 #: gym/views/admin_notes.py:161 gym/views/config.py:68
 #: gym/views/contract.py:186 gym/views/contract_option.py:123
 #: gym/views/contract_type.py:123 gym/views/document.py:171
-#: gym/views/gym.py:463 manager/views/day.py:100 manager/views/schedule.py:333
+#: gym/views/gym.py:463 manager/views/day.py:96 manager/views/schedule.py:333
 #: manager/views/workout.py:267 nutrition/views/ingredient.py:145
 #: nutrition/views/unit.py:143
 #, python-brace-format
@@ -1358,48 +1320,48 @@ msgstr "Submeter"
 msgid "Your feedback was successfully sent. Thank you!"
 msgstr "O seu feedback foi enviado com sucesso. Obrigado!"
 
-#: core/views/user.py:156
+#: core/views/user.py:155
 #, python-brace-format
 msgid "Account \"{0}\" was successfully deleted"
 msgstr "Conta \"{0}\" deletada com sucesso"
 
-#: core/views/user.py:292
+#: core/views/user.py:291
 msgid "You were successfully registered"
 msgstr "Você foi registrado com sucesso"
 
-#: core/views/user.py:351
+#: core/views/user.py:350
 msgid "Settings successfully updated"
 msgstr "Configurações atualizadas com sucesso"
 
-#: core/views/user.py:390
+#: core/views/user.py:389
 msgid "The user was successfully deactivated"
 msgstr "O utilizador foi desativado com sucesso"
 
-#: core/views/user.py:427
+#: core/views/user.py:426
 msgid "The user was successfully activated"
 msgstr "O utilizador foi ativado com sucesso"
 
-#: core/views/user.py:442
+#: core/views/user.py:441
 msgid "Edit user"
 msgstr "Editar utilizador"
 
-#: core/views/user.py:597 gym/templates/gym/member_list.html:26
+#: core/views/user.py:596 gym/templates/gym/member_list.html:26
 #: gym/views/gym.py:158
 msgid "ID"
 msgstr "Identificação"
 
-#: core/views/user.py:598 gym/forms.py:95 gym/templates/contract/view.html:55
+#: core/views/user.py:597 gym/forms.py:95 gym/templates/contract/view.html:55
 #: gym/templates/gym/member_list.html:27 gym/views/export.py:59
 #: gym/views/gym.py:158 gym/views/gym.py:217
 msgid "Username"
 msgstr "utilizador"
 
-#: core/views/user.py:601 gym/templates/gym/new_user.html:34
+#: core/views/user.py:600 gym/templates/gym/new_user.html:34
 #: gym/views/export.py:58 gym/views/gym.py:217
 msgid "Gym"
 msgstr "Academia"
 
-#: core/views/user.py:660
+#: core/views/user.py:659
 #, python-format
 msgid "A verification email was sent to %(email)s"
 msgstr "Um e-mail de verificação foi enviado para %(email)s"
@@ -1552,11 +1514,6 @@ msgstr "Codec, nome longo"
 msgid "Equipment list"
 msgstr "Lista de equipamento"
 
-#: exercises/templates/equipment/admin-overview.html:39
-#: exercises/views/equipment.py:92
-msgid "Add new equipment"
-msgstr "Adicionar novo equipamento"
-
 #: exercises/templates/history/overview.html:11
 msgid "Exercise admin history"
 msgstr "Histórico de administração do exercício"
@@ -1604,11 +1561,6 @@ msgstr "Reverter alterações"
 msgid "Muscle overview"
 msgstr "Visão geral do músculo"
 
-#: exercises/templates/muscles/admin-overview.html:38
-#: exercises/views/muscles.py:68
-msgid "Add muscle"
-msgstr "Adicionar músculo"
-
 #: exercises/views/categories.py:72
 msgid "Add category"
 msgstr "Adicionar categoria"
@@ -1617,6 +1569,10 @@ msgstr "Adicionar categoria"
 msgid "This will also delete all exercises in this category."
 msgstr "Isto irá, também, apagar todos os exercícios nesta categoria."
 
+#: exercises/views/equipment.py:92
+msgid "Add new equipment"
+msgstr "Adicionar novo equipamento"
+
 #: exercises/views/equipment.py:104 exercises/views/equipment.py:115
 msgid "Delete equipment?"
 msgstr "Apagar equipamento?"
@@ -1625,6 +1581,10 @@ msgstr "Apagar equipamento?"
 msgid "This will delete the exercise from all workouts."
 msgstr "Isto irá apagar o exercício de todos os treinos."
 
+#: exercises/views/muscles.py:68
+msgid "Add muscle"
+msgstr "Adicionar músculo"
+
 #: gallery/templates/images/overview.html:62
 msgid "Add image"
 msgstr "Adicionar imagem"
@@ -1711,7 +1671,7 @@ msgid "Contract is active"
 msgstr "Contrato está ativo"
 
 #: gym/models/contract.py:237 gym/templates/contract/view.html:69
-#: manager/models/schedule.py:61 manager/templates/schedule/view.html:67
+#: manager/models/schedule.py:61 manager/templates/schedule/view.html:66
 msgid "Start date"
 msgstr "Data início"
 
@@ -1747,7 +1707,7 @@ msgstr "Admin: pode gerir utilizadores por academia"
 msgid "Admin: can administrate the different gyms"
 msgstr "Admin: pode administrar academias diferentes"
 
-#: gym/models/gym.py:65 gym/templates/gym/member_list.html:114
+#: gym/models/gym.py:65 gym/templates/gym/member_list.html:126
 msgid "Owner"
 msgstr "Dono"
 
@@ -1759,7 +1719,7 @@ msgstr ""
 "Número de semanas desde a última vez que um utilizador registrou a sua "
 "presença para ser considerado inativo"
 
-#: gym/models/gym_config.py:56 gym/templates/gym/member_list.html:152
+#: gym/models/gym_config.py:56 gym/templates/gym/member_list.html:166
 msgid "Show name in header"
 msgstr "Mostrar o nome no cabeçalho"
 
@@ -1772,7 +1732,7 @@ msgstr "Mostre o nome da academia no cabeçalho do site"
 msgid "Configuration for {self.gym.name}"
 msgstr "Configuração para {self.gym.name}"
 
-#: gym/models/user_config.py:65 gym/templates/gym/member_list.html:184
+#: gym/models/user_config.py:65 gym/templates/gym/member_list.html:200
 msgid "Overview of inactive members"
 msgstr "Visão geral dos membros inativos"
 
@@ -1796,7 +1756,7 @@ msgstr "Será usado o nome do ficheiro se nada for informado"
 msgid "User notes"
 msgstr "Notas de utilizador"
 
-#: gym/templates/contract/list.html:36
+#: gym/templates/contract/list.html:34
 msgid "Show"
 msgstr "Mostrar"
 
@@ -1824,11 +1784,11 @@ msgstr ""
 msgid "Gym list"
 msgstr "Lista da academia"
 
-#: gym/templates/gym/list.html:50
+#: gym/templates/gym/list.html:53
 msgid "Global gym configuration"
 msgstr "Configução global da academia"
 
-#: gym/templates/gym/list.html:67 gym/views/gym.py:171
+#: gym/templates/gym/list.html:69 gym/views/gym.py:171
 msgid "Add new gym"
 msgstr "Adicionar nova academia"
 
@@ -1840,43 +1800,43 @@ msgstr "Administradores e treinadores"
 msgid "Gym manager"
 msgstr "Gestor da academia"
 
-#: gym/templates/gym/member_list.html:69
+#: gym/templates/gym/member_list.html:76
 msgid "This gym has no administrators or trainers"
 msgstr "Essa academia não possui administradores ou professores"
 
-#: gym/templates/gym/member_list.html:88
+#: gym/templates/gym/member_list.html:98
 msgid "Export"
 msgstr "Exportar"
 
-#: gym/templates/gym/member_list.html:125
+#: gym/templates/gym/member_list.html:137
 msgid "Members"
 msgstr "Membros"
 
-#: gym/templates/gym/member_list.html:145
+#: gym/templates/gym/member_list.html:159
 msgid "Gym configuration"
 msgstr "Configuração da academia"
 
-#: gym/templates/gym/member_list.html:148
+#: gym/templates/gym/member_list.html:162
 msgid "Inactive members"
 msgstr "Membros inativos"
 
-#: gym/templates/gym/member_list.html:149
+#: gym/templates/gym/member_list.html:163
 msgid "weeks"
 msgstr "semanas"
 
-#: gym/templates/gym/member_list.html:181
+#: gym/templates/gym/member_list.html:197
 msgid "My configuration"
 msgstr "Minha configuração"
 
-#: gym/templates/gym/member_list.html:215
+#: gym/templates/gym/member_list.html:234
 msgid "Types"
 msgstr "Tipos"
 
-#: gym/templates/gym/member_list.html:285
+#: gym/templates/gym/member_list.html:307
 msgid "Emails"
 msgstr "E-mails"
 
-#: gym/templates/gym/member_list.html:315
+#: gym/templates/gym/member_list.html:336
 msgid "Add member"
 msgstr "Adicionar membro"
 
@@ -2173,28 +2133,38 @@ msgstr "Também buscar nomes em inglês"
 msgid "Unit"
 msgstr "Unidade"
 
+#: manager/forms.py:191 manager/models/log.py:103 manager/models/setting.py:102
+#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
+msgid "RiR"
+msgstr "ReR"
+
 #: manager/forms.py:279
 msgid "Type"
 msgstr "Tipo"
 
-#: manager/forms.py:280 manager/templates/workout/view.html:113
+#: manager/forms.py:280 manager/templates/workout/view.html:122
 msgid "Table"
 msgstr "Tabela"
 
-#: manager/forms.py:282 manager/templates/workout/view.html:119
+#: manager/forms.py:282 manager/templates/workout/view.html:129
 msgid "with images"
 msgstr "com imagens"
 
-#: manager/forms.py:283 manager/templates/workout/view.html:125
+#: manager/forms.py:283 manager/templates/workout/view.html:136
 msgid "with comments"
 msgstr "com comentários"
 
+#: manager/helpers.py:86 manager/models/setting.py:72
+#: manager/templates/set/formset.html:9
+msgid "Reps"
+msgstr "Repetições"
+
 #: manager/management/commands/email-reminders.py:121
 msgid "Workout will expire soon"
 msgstr "Treino irá expirar logo"
 
 #: manager/models/day.py:34 manager/models/log.py:58
-#: manager/models/session.py:60 manager/templates/schedule/view.html:102
+#: manager/models/session.py:60 manager/templates/schedule/view.html:101
 #: manager/templates/workout/view.html:9 manager/templates/workout/view.html:17
 #: manager/views/pdf.py:85 manager/views/pdf.py:161
 #: manager/views/schedule.py:151 manager/views/schedule.py:221
@@ -2217,7 +2187,7 @@ msgstr "Dia"
 msgid "Name or short description of the schedule. For example 'Program XYZ'."
 msgstr "Nome ou descrição curta da agenda. Por exemplo 'Programa XYZ'."
 
-#: manager/models/schedule.py:65 manager/templates/schedule/view.html:71
+#: manager/models/schedule.py:65 manager/templates/schedule/view.html:70
 msgid "Schedule active"
 msgstr "Agenda ativa"
 
@@ -2231,7 +2201,7 @@ msgstr ""
 "exercício (irá ser mostrada, por exemplo, na busca). A primeira imagem é "
 "automaticamente marcada pelo sistema"
 
-#: manager/models/schedule.py:77 manager/templates/schedule/view.html:81
+#: manager/models/schedule.py:77 manager/templates/schedule/view.html:80
 msgid "Is a loop"
 msgstr "É um loop"
 
@@ -2252,7 +2222,7 @@ msgid "The duration in weeks"
 msgstr "A duração em semanas"
 
 #: manager/models/schedule_step.py:64 manager/models/set.py:53
-#: manager/models/setting.py:113 nutrition/models/meal.py:55
+#: manager/models/setting.py:113 nutrition/models/meal.py:53
 #: nutrition/models/meal_item.py:66
 msgid "Order"
 msgstr "Ordem"
@@ -2394,7 +2364,7 @@ msgstr "Visão geral do Log"
 msgid "Workout session"
 msgstr "Sessão de Treinos"
 
-#: manager/templates/calendar/partial_overview_table.html:27
+#: manager/templates/calendar/partial_overview_table.html:26
 msgid "Delete with logs"
 msgstr "Apagar com Logs"
 
@@ -2417,21 +2387,27 @@ msgstr ""
 "criada se ainda não há uma para data selecionada. Se houver, \n"
 "será simplismente editada. Registros de peso serão sempre adicionados."
 
-#: manager/templates/schedule/overview.html:5
+#: manager/templates/schedule/overview.html:4
 msgid "Your schedules"
 msgstr "Seus horários"
 
 #: manager/templates/schedule/overview.html:19
-#: manager/templates/schedule/view.html:131
-#: manager/templates/schedule/view.html:183
+#: manager/templates/schedule/view.html:143
+#: manager/templates/schedule/view.html:193
 #: manager/templates/workout/overview.html:16
 msgid "active"
 msgstr "ativo"
 
-#: manager/templates/schedule/overview.html:28
+#: manager/templates/schedule/overview.html:27
 msgid "No schedules found."
 msgstr "Nenhum horário encontrado."
 
+#: manager/templates/schedule/overview.html:28
+#, fuzzy
+#| msgid "Add one now."
+msgid "Add one now"
+msgstr "Adicionar um agora."
+
 #: manager/templates/schedule/overview.html:36
 msgid ""
 "Schedules are collections of workouts that you do in\n"
@@ -2441,12 +2417,20 @@ msgstr ""
 "        sequência."
 
 #: manager/templates/schedule/overview.html:39
+#, fuzzy
+#| msgid ""
+#| "You can indicate how long you want to do each workout\n"
+#| "        before jumping to the next. It is also possible to create a loop, "
+#| "so you\n"
+#| "        always do the same workouts in succession, e.g. A > B > C > A > B "
+#| "> C and so on."
 msgid ""
 "You can indicate how long you want to do each workout\n"
 "        before jumping to the next. It is also possible to create a loop, so "
 "you\n"
 "        always do the same workouts in succession, e.g. A > B > C > A > B > "
-"C and so on."
+"C and so\n"
+"        on."
 msgstr ""
 "Você pode indicar por quanto tempo quer fazer cada treino\n"
 "        antes de pular para o próximo. Também é possível criar um loop, para "
@@ -2454,7 +2438,7 @@ msgstr ""
 "        sempre faça os mesmos treinos em sequência, p. ex. A > B > C > A > B "
 "> C e assim por diante."
 
-#: manager/templates/schedule/overview.html:43
+#: manager/templates/schedule/overview.html:44
 msgid ""
 "The currently active schedule will remain active (and be\n"
 "        shown e.g. in your dashboard) till it reaches the last workout or "
@@ -2474,7 +2458,7 @@ msgstr "Adicionar cronograma"
 msgid "Schedule"
 msgstr "Agendar"
 
-#: manager/templates/schedule/view.html:85
+#: manager/templates/schedule/view.html:84
 msgid ""
 "This schedule is a loop and will go through the workouts above till you "
 "deactivate it"
@@ -2482,19 +2466,19 @@ msgstr ""
 "Este cronograma é um laço de repetição e irá percorrer os treinos acima até "
 "que você desative-o"
 
-#: manager/templates/schedule/view.html:103
+#: manager/templates/schedule/view.html:102
 msgid "Weeks"
 msgstr "Semanas"
 
-#: manager/templates/schedule/view.html:115
+#: manager/templates/schedule/view.html:114
 msgid "Move me"
 msgstr "Me mova"
 
-#: manager/templates/schedule/view.html:156
+#: manager/templates/schedule/view.html:168
 msgid "Start schedule"
 msgstr "Começar um cronograma"
 
-#: manager/templates/schedule/view.html:187
+#: manager/templates/schedule/view.html:197
 #, python-format
 msgid ""
 "%(weeks)s Week\n"
@@ -2509,11 +2493,11 @@ msgstr[1] ""
 "%(weeks)s Semanas\n"
 "                                "
 
-#: manager/templates/schedule/view.html:221
+#: manager/templates/schedule/view.html:231
 msgid "Adding workouts"
 msgstr "Adicionando treinos"
 
-#: manager/templates/schedule/view.html:223
+#: manager/templates/schedule/view.html:233
 msgid ""
 "Add as many workouts to the schedule as you want. You can\n"
 "            edit the order by dragging and dropping them. It's also possible "
@@ -2525,27 +2509,35 @@ msgstr ""
 "adicionar um treino mais\n"
 "            que uma vez."
 
-#: manager/templates/schedule/view.html:232
-#: manager/templates/schedule/view.html:243
-#: manager/templates/schedule/view.html:290
+#: manager/templates/schedule/view.html:242
+#: manager/templates/schedule/view.html:256
+#: manager/templates/schedule/view.html:310
 #: manager/templates/workout/view.html:69
-#: manager/templates/workout/view.html:79
-#: manager/templates/workout/view.html:178
+#: manager/templates/workout/view.html:83
+#: manager/templates/workout/view.html:192
 msgid "Export calendar file"
 msgstr "Exportar ficheiro de calendário"
 
-#: manager/templates/schedule/view.html:236
+#: manager/templates/schedule/view.html:248
 msgid "Export this schedule as a calendar file."
 msgstr "Exporte este cronograma com um ficheiro de calendário."
 
-#: manager/templates/schedule/view.html:237
-#: manager/templates/workout/view.html:74
+#: manager/templates/schedule/view.html:249
+#: manager/templates/workout/view.html:76
+#, fuzzy
+#| msgid ""
+#| "You can then import the file it into your calendar\n"
+#| "                        application for example google calendar, outlook "
+#| "or iCal. This will create\n"
+#| "                        an appointment for each training day with the "
+#| "appropriate exercises."
 msgid ""
 "You can then import the file it into your calendar\n"
 "                        application for example google calendar, outlook or "
 "iCal. This will create\n"
 "                        an appointment for each training day with the "
-"appropriate exercises."
+"appropriate\n"
+"                        exercises."
 msgstr ""
 "Pode então importar o arquivo na sua aplicação\n"
 "                        de calendário, como, por exemplo o Google Calendar, "
@@ -2553,21 +2545,13 @@ msgstr ""
 "                        um evento para cada dia de treino, com os exercícios "
 "apropriados."
 
-#: manager/templates/schedule/view.html:258
-#: manager/templates/schedule/view.html:294
-#: manager/templates/workout/view.html:94
-#: manager/templates/workout/view.html:174
+#: manager/templates/schedule/view.html:272
+#: manager/templates/schedule/view.html:315
+#: manager/templates/workout/view.html:99
+#: manager/templates/workout/view.html:188
 msgid "Download as PDF"
 msgstr "Baixe como PDF"
 
-#: manager/templates/schedule/view.html:299
-msgid "Edit schedule"
-msgstr "Editar cronograma"
-
-#: manager/templates/schedule/view.html:304
-msgid "Delete schedule"
-msgstr "Apagar cronograma"
-
 #: manager/templates/set/add.html:9
 #, python-format
 msgid "Add exercises to day \"%(day_name)s\""
@@ -2645,55 +2629,6 @@ msgid ""
 "You will regularly receive such reminders till you enter your current weight."
 msgstr "Você receberá esses lembretes até que indique a sua massa atual."
 
-#: manager/templates/workout/log.html:10 manager/templates/workout/log.html:11
-msgid "Weight log"
-msgstr "Log de peso"
-
-#: manager/templates/workout/log.html:29
-msgid "Weight log for workout"
-msgstr "Registro de peso para o treino"
-
-#: manager/templates/workout/log.html:49
-msgid "Add weight log to this day"
-msgstr "Adicionar registro de peso à este dia"
-
-#: manager/templates/workout/log.html:69
-msgid "No weight entries here."
-msgstr "Nenhum registro de peso aqui."
-
-#: manager/templates/workout/log.html:77
-msgid "No exercises for this day."
-msgstr "Nenhum exercício para este dia."
-
-#: manager/templates/workout/log.html:90
-msgid ""
-"This page shows the weight logs belonging to this workout\n"
-"only. Click on an exercise to see all the historical data for\n"
-"it."
-msgstr ""
-"Esta página mostra o log de peso referente a este treino\n"
-"somente. Clique num exercício para ver todo o histórico\n"
-"dele."
-
-#: manager/templates/workout/log.html:94
-msgid ""
-"If on a single day there is more than one entry with the\n"
-"same number of repetitions, but different weights, only the entry with the\n"
-"higher weight is shown in the diagram."
-msgstr ""
-"Se num dia houver mais que um registo com o\n"
-"mesmo número de repetições, mas com diferentes pesos, somente o registo\n"
-"com o maior peso é mostrado no diagrama."
-
-#: manager/templates/workout/log.html:98
-msgid ""
-"Note that only entries with a weight unit (kg or lb) and\n"
-"repetitions are charted, other combinations such as time or until failure\n"
-"are ignored here."
-msgstr ""
-"Note que somente as entradas com uma unidade de peso (kg ou lb) erepetições "
-"são traçadas, outras combinações como tempo ou até falharsão ignoradas aqui."
-
 #: manager/templates/workout/overview.html:25
 msgid "No templates found."
 msgstr "Nenhum template encontrado."
@@ -2731,27 +2666,23 @@ msgstr "Adicionar conjunto de treinos aos dias"
 msgid "Set the repetitions for each set"
 msgstr "Defina a repetição para cada conjunto"
 
-#: manager/templates/workout/view.html:73
+#: manager/templates/workout/view.html:75
 msgid "Export this workout as a calendar file."
 msgstr "Exporte este treino como um ficheiro de calendário."
 
-#: manager/templates/workout/view.html:144
+#: manager/templates/workout/view.html:156
 msgid "Logs"
 msgstr "registros"
 
-#: manager/templates/workout/view.html:146
+#: manager/templates/workout/view.html:159
 msgid "View logs"
 msgstr "Ver registros"
 
-#: manager/templates/workout/view.html:169 manager/views/schedule_step.py:99
-msgid "Edit workout"
-msgstr "Edite treino"
-
-#: manager/templates/workout/view.html:182 manager/views/workout.py:281
+#: manager/templates/workout/view.html:195 manager/views/workout.py:281
 msgid "Mark as template"
 msgstr "Marcar como modelo"
 
-#: manager/views/day.py:109
+#: manager/views/day.py:105
 msgid "Add workout day"
 msgstr "Adicione dia de treino"
 
@@ -2768,6 +2699,10 @@ msgstr "Treino para %s"
 msgid "Create schedule"
 msgstr "Criar cronograma"
 
+#: manager/views/schedule_step.py:99
+msgid "Edit workout"
+msgstr "Edite treino"
+
 #: manager/views/workout.py:209
 msgid "Copy workout"
 msgstr "Copiar treino"
@@ -2891,7 +2826,7 @@ msgstr "total em gramas"
 msgid "Unit amount, e.g. \"1 Cup\" or \"1/2 spoon\""
 msgstr "Unidade para quantidade, ex. \"1 xícara\" ou \"1/2 colher\""
 
-#: nutrition/models/log.py:52 nutrition/models/meal.py:50
+#: nutrition/models/log.py:52 nutrition/models/meal.py:48
 #: nutrition/models/meal_item.py:48 nutrition/models/plan.py:108
 msgid "Nutrition plan"
 msgstr "Plano de nutrição"
@@ -2904,11 +2839,11 @@ msgstr "Refeição"
 msgid "Date and Time (Approx.)"
 msgstr "Data e Hora (aprox.)"
 
-#: nutrition/models/meal.py:62
+#: nutrition/models/meal.py:60
 msgid "Time (approx)"
 msgstr "Tempo (aproximado)"
 
-#: nutrition/models/meal.py:69
+#: nutrition/models/meal.py:67
 msgid ""
 "Give meals a textual description / name such as \"Breakfast\" or \"after "
 "workout\""
@@ -3051,10 +2986,6 @@ msgstr "Nenhum ingrediente."
 msgid "Search"
 msgstr "Pesquisa"
 
-#: nutrition/templates/ingredient/overview.html:62
-msgid "Add ingredient"
-msgstr "Adicione um ingrediente"
-
 #: nutrition/templates/ingredient/view.html:45 nutrition/views/plan.py:229
 msgid "Macronutrients"
 msgstr "Macronutrientes"
@@ -3074,20 +3005,11 @@ msgstr "n.d."
 msgid "Others"
 msgstr "Outros"
 
-#: nutrition/templates/ingredient/view.html:144
-#: nutrition/templates/units/list.html:46 nutrition/views/unit.py:86
+#: nutrition/templates/ingredient/view.html:143
+#: nutrition/templates/units/list.html:50 nutrition/views/unit.py:86
 msgid "Add new weight unit"
 msgstr "Adicione nova unidade de peso"
 
-#: nutrition/templates/ingredient/view.html:206
-#: nutrition/templates/ingredient/view.html:209
-msgid "Edit ingredient"
-msgstr "Edite ingrediente"
-
-#: nutrition/templates/ingredient/view.html:213
-msgid "Delete ingredient"
-msgstr "Apagar ingrediente"
-
 #: nutrition/templates/rate/form.html:25
 msgid "Basal metabolic rate"
 msgstr "Taxa metabólica basal"
@@ -3735,6 +3657,86 @@ msgstr "Excluído com sucesso."
 msgid "Delete weight entry for the %s"
 msgstr "Excluir entrada de peso para %s"
 
+#~ msgid ""
+#~ "If a license has been localized, e.g. the Creative Commons\n"
+#~ "            licenses for the different countries, add them as separate "
+#~ "entries here."
+#~ msgstr ""
+#~ "Se uma licença for dependente da localização, como as licenças Creative\n"
+#~ "             Commons para os differentes países, adicione-as como "
+#~ "entradas separadas aqui."
+
+#~ msgid "Add weight log"
+#~ msgstr "Registrar peso"
+
+#~ msgid "This exercise has no repetitions."
+#~ msgstr "Este exercício não possui repetições."
+
+#~ msgid "Edit them now."
+#~ msgstr "Edite-os agora."
+
+#~ msgid "Add exercises to this workout day"
+#~ msgstr "Adicione exercícios para este dia de treino"
+
+#~ msgid "Edit schedule"
+#~ msgstr "Editar cronograma"
+
+#~ msgid "Delete schedule"
+#~ msgstr "Apagar cronograma"
+
+#~ msgid "Weight log"
+#~ msgstr "Log de peso"
+
+#~ msgid "Weight log for workout"
+#~ msgstr "Registro de peso para o treino"
+
+#~ msgid "Add weight log to this day"
+#~ msgstr "Adicionar registro de peso à este dia"
+
+#~ msgid "No weight entries here."
+#~ msgstr "Nenhum registro de peso aqui."
+
+#~ msgid "No exercises for this day."
+#~ msgstr "Nenhum exercício para este dia."
+
+#~ msgid ""
+#~ "This page shows the weight logs belonging to this workout\n"
+#~ "only. Click on an exercise to see all the historical data for\n"
+#~ "it."
+#~ msgstr ""
+#~ "Esta página mostra o log de peso referente a este treino\n"
+#~ "somente. Clique num exercício para ver todo o histórico\n"
+#~ "dele."
+
+#~ msgid ""
+#~ "If on a single day there is more than one entry with the\n"
+#~ "same number of repetitions, but different weights, only the entry with "
+#~ "the\n"
+#~ "higher weight is shown in the diagram."
+#~ msgstr ""
+#~ "Se num dia houver mais que um registo com o\n"
+#~ "mesmo número de repetições, mas com diferentes pesos, somente o registo\n"
+#~ "com o maior peso é mostrado no diagrama."
+
+#~ msgid ""
+#~ "Note that only entries with a weight unit (kg or lb) and\n"
+#~ "repetitions are charted, other combinations such as time or until "
+#~ "failure\n"
+#~ "are ignored here."
+#~ msgstr ""
+#~ "Note que somente as entradas com uma unidade de peso (kg ou lb) "
+#~ "erepetições são traçadas, outras combinações como tempo ou até falharsão "
+#~ "ignoradas aqui."
+
+#~ msgid "Add ingredient"
+#~ msgstr "Adicione um ingrediente"
+
+#~ msgid "Edit ingredient"
+#~ msgstr "Edite ingrediente"
+
+#~ msgid "Delete ingredient"
+#~ msgstr "Apagar ingrediente"
+
 #~ msgid "Ingredients pending review"
 #~ msgstr "Ingredientes pendendo revisão"
 
diff --git a/wger/locale/ro/LC_MESSAGES/django.po b/wger/locale/ro/LC_MESSAGES/django.po
index 32a002051..2c5746317 100644
--- a/wger/locale/ro/LC_MESSAGES/django.po
+++ b/wger/locale/ro/LC_MESSAGES/django.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: wger Workout Manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-07-14 15:59+0200\n"
+"POT-Creation-Date: 2024-11-14 13:09+0100\n"
 "PO-Revision-Date: 2023-11-24 01:08+0000\n"
 "Last-Translator: dimii27 <dimitrieietcu@gmail.com>\n"
 "Language-Team: Romanian <https://hosted.weblate.org/projects/wger/web/ro/>\n"
@@ -23,7 +23,7 @@ msgstr ""
 "20)) ? 1 : 2;\n"
 "X-Generator: Weblate 5.2.1-rc\n"
 
-#: config/models/gym_config.py:46 gym/templates/gym/list.html:53
+#: config/models/gym_config.py:46 gym/templates/gym/list.html:56
 msgid "Default gym"
 msgstr "Sala implicită"
 
@@ -36,28 +36,28 @@ msgstr ""
 "utilizatorii noi înregistrați la această sală și va actualiza toți "
 "utilizatorii existenți fără o sală."
 
-#: config/views/gym_config.py:42 core/templates/language/view.html:67
-#: core/templates/license/list.html:17 core/templates/misc/license/list.html:18
+#: config/views/gym_config.py:42 core/templates/language/view.html:64
+#: core/templates/license/list.html:17
 #: core/templates/repetition_unit/list.html:18
-#: core/templates/tags/render_day.html:39
-#: core/templates/tags/render_day.html:75 core/templates/user/overview.html:204
-#: core/templates/user/overview.html:445
+#: core/templates/user/overview.html:204 core/templates/user/overview.html:467
 #: core/templates/weight_unit/list.html:18
 #: exercises/templates/categories/admin-overview.html:17
 #: exercises/templates/equipment/admin-overview.html:17
-#: exercises/templates/muscles/admin-overview.html:17
-#: gallery/views/images.py:98 gym/templates/admin_notes/list.html:32
-#: gym/templates/contract/list.html:31 gym/templates/contract/view.html:107
-#: gym/templates/contract_option/list.html:32
-#: gym/templates/contract_type/list.html:32 gym/templates/document/list.html:38
-#: gym/templates/gym/list.html:20 gym/templates/gym/list.html:46
-#: gym/templates/gym/member_list.html:87 gym/templates/gym/member_list.html:140
-#: gym/templates/gym/member_list.html:176
-#: manager/templates/calendar/day.html:68
-#: manager/templates/calendar/month.html:85
-#: manager/templates/calendar/partial_overview_table.html:18
-#: manager/templates/schedule/view.html:118
-#: nutrition/templates/ingredient/view.html:165
+#: exercises/templates/muscles/admin-overview.html:16
+#: gallery/views/images.py:98 gym/templates/admin_notes/list.html:31
+#: gym/templates/contract/list.html:30 gym/templates/contract/view.html:106
+#: gym/templates/contract_option/list.html:29
+#: gym/templates/contract_type/list.html:30 gym/templates/document/list.html:38
+#: gym/templates/gym/list.html:19 gym/templates/gym/list.html:48
+#: gym/templates/gym/member_list.html:94 gym/templates/gym/member_list.html:152
+#: gym/templates/gym/member_list.html:190
+#: manager/templates/calendar/day.html:67
+#: manager/templates/calendar/month.html:84
+#: manager/templates/calendar/partial_overview_table.html:16
+#: manager/templates/schedule/view.html:318
+#: manager/templates/workout/view.html:181
+#: nutrition/templates/ingredient/view.html:164
+#: nutrition/templates/ingredient/view.html:209
 #: nutrition/templates/units/list.html:19
 msgid "Edit"
 msgstr "Editare"
@@ -92,8 +92,8 @@ msgstr "Programul meu cool de antrenament"
 msgid "Empty placeholder schedule"
 msgstr "Program substituent gol"
 
-#: core/forms.py:69 core/templates/navigation.html:285
-#: core/templates/navigation.html:291 core/templates/user/login.html:4
+#: core/forms.py:69 core/templates/navigation.html:284
+#: core/templates/navigation.html:290 core/templates/user/login.html:4
 #: software/templates/features.html:82 software/templates/features.html:427
 msgid "Login"
 msgstr "Login"
@@ -103,14 +103,14 @@ msgstr "Login"
 msgid "First name"
 msgstr "Prenume"
 
-#: core/forms.py:109 core/forms.py:215 core/templates/user/overview.html:266
+#: core/forms.py:109 core/forms.py:215 core/templates/user/overview.html:284
 #: gym/views/export.py:62 gym/views/gym.py:217
 msgid "Last name"
 msgstr "Nume"
 
-#: core/forms.py:111 core/forms.py:180 core/templates/user/overview.html:270
+#: core/forms.py:111 core/forms.py:180 core/templates/user/overview.html:288
 #: gym/models/contract.py:256 gym/models/gym.py:58
-#: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:104
+#: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:116
 #: gym/templates/gym/new_user.html:30 gym/views/export.py:60
 #: mailer/templates/mailer/gym/form.html:4
 #: mailer/templates/mailer/gym/overview.html:4
@@ -141,8 +141,8 @@ msgstr "Mementouri de antrenament"
 msgid "Other settings"
 msgstr "Alte setari"
 
-#: core/forms.py:174 core/views/user.py:624 core/views/user.py:639
-#: core/views/user.py:651 gym/forms.py:73 manager/templates/log/add.html:65
+#: core/forms.py:174 core/views/user.py:623 core/views/user.py:638
+#: core/views/user.py:650 gym/forms.py:73 manager/templates/log/add.html:65
 #: manager/templates/set/add.html:70 manager/views/workout.py:203
 #: utils/generic_views.py:143
 msgid "Save"
@@ -167,26 +167,25 @@ msgstr "Parola"
 msgid "Please enter your current password."
 msgstr "Te rog introdu parola curentă"
 
-#: core/forms.py:242 core/templates/language/view.html:73
-#: core/templates/license/list.html:19 core/templates/misc/license/list.html:22
-#: core/templates/repetition_unit/list.html:20
-#: core/templates/tags/render_day.html:45
-#: core/templates/tags/render_day.html:81 core/templates/user/overview.html:217
-#: core/templates/weight_unit/list.html:20
-#: exercises/templates/categories/admin-overview.html:19
-#: exercises/templates/equipment/admin-overview.html:19
-#: exercises/templates/muscles/admin-overview.html:19
-#: gym/templates/admin_notes/list.html:40
-#: gym/templates/contract_option/list.html:41
-#: gym/templates/contract_type/list.html:41 gym/templates/document/list.html:46
-#: gym/templates/gym/list.html:22 manager/templates/calendar/day.html:73
-#: manager/templates/calendar/month.html:89
-#: manager/templates/calendar/partial_overview_table.html:23
-#: manager/templates/schedule/view.html:122
-#: manager/templates/workout/view.html:188
-#: nutrition/templates/ingredient/view.html:166
+#: core/forms.py:242 core/templates/language/view.html:70
+#: core/templates/license/list.html:21
+#: core/templates/repetition_unit/list.html:22
+#: core/templates/user/overview.html:233
+#: core/templates/weight_unit/list.html:22
+#: exercises/templates/categories/admin-overview.html:21
+#: exercises/templates/equipment/admin-overview.html:21
+#: exercises/templates/muscles/admin-overview.html:20
+#: gym/templates/admin_notes/list.html:37
+#: gym/templates/contract_option/list.html:35
+#: gym/templates/contract_type/list.html:36 gym/templates/document/list.html:46
+#: gym/templates/gym/list.html:23 manager/templates/calendar/day.html:73
+#: manager/templates/calendar/month.html:88
+#: manager/templates/calendar/partial_overview_table.html:22
+#: manager/templates/schedule/view.html:324
+#: manager/templates/workout/view.html:202
+#: nutrition/templates/ingredient/view.html:168
 #: nutrition/templates/ingredient/view.html:215
-#: nutrition/templates/units/list.html:22
+#: nutrition/templates/units/list.html:25
 msgid "Delete"
 msgstr "Ștergere"
 
@@ -198,9 +197,9 @@ msgstr "Parola incorectă"
 msgid "The form is secured with reCAPTCHA"
 msgstr "Acest formular este securizat cu reCAPTCHA"
 
-#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:285
-#: core/templates/navigation.html:297 core/templates/template.html:149
-#: core/templates/user/login.html:20 core/views/user.py:298
+#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:284
+#: core/templates/navigation.html:296 core/templates/template.html:151
+#: core/templates/user/login.html:20 core/views/user.py:297
 #: software/templates/features.html:87 software/templates/features.html:422
 msgid "Register"
 msgstr "Inregistreaza-te"
@@ -452,18 +451,18 @@ msgid "The sum of all hours has to be 24"
 msgstr ""
 
 #: core/models/rep_unit.py:36 core/models/weight_unit.py:36
-#: core/templates/user/overview.html:262 core/views/user.py:599
+#: core/templates/user/overview.html:280 core/views/user.py:598
 #: exercises/models/category.py:29 exercises/models/equipment.py:29
 #: exercises/models/exercise.py:59 exercises/models/muscle.py:36
 #: gym/models/contract.py:52 gym/models/contract.py:103 gym/models/gym.py:46
 #: gym/models/user_document.py:84 gym/templates/contract/view.html:50
-#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:96
+#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:108
 #: gym/views/gym.py:158 manager/models/schedule.py:55
 #: manager/models/workout.py:57 measurements/models/category.py:36
 #: nutrition/models/ingredient.py:111
-#: nutrition/models/ingredient_category.py:27 nutrition/models/meal.py:67
+#: nutrition/models/ingredient_category.py:27 nutrition/models/meal.py:65
 #: nutrition/models/weight_unit.py:38
-#: nutrition/templates/ingredient/view.html:152
+#: nutrition/templates/ingredient/view.html:151
 msgid "Name"
 msgstr "Numele"
 
@@ -508,7 +507,7 @@ msgstr ""
 msgid "Back to \"%(target)s\""
 msgstr ""
 
-#: core/templates/delete.html:15
+#: core/templates/delete.html:4
 msgid "Are you sure you want to delete this? This action cannot be undone."
 msgstr ""
 
@@ -564,7 +563,7 @@ msgstr ""
 msgid "Dashboard"
 msgstr ""
 
-#: core/templates/language/overview.html:4 core/templates/navigation.html:345
+#: core/templates/language/overview.html:4 core/templates/navigation.html:344
 msgid "Languages"
 msgstr "Limbi"
 
@@ -574,79 +573,72 @@ msgstr ""
 
 #: core/templates/language/overview.html:22
 #: manager/templates/calendar/month.html:132
-#: manager/templates/schedule/overview.html:28
-#: manager/templates/schedule/view.html:144
+#: manager/templates/schedule/view.html:154
 #: manager/templates/workout/overview.html:28
 #: nutrition/templates/ingredient/overview.html:38
 msgid "Add one now."
 msgstr ""
 
-#: core/templates/language/overview.html:35 core/templates/license/list.html:40
-#: core/templates/misc/license/list.html:43
-#: core/templates/repetition_unit/list.html:43
-#: core/templates/user/overview.html:326 core/templates/user/overview.html:365
-#: core/templates/user/overview.html:401
-#: core/templates/weight_unit/list.html:43 core/views/languages.py:74
+#: core/templates/language/overview.html:34 core/templates/license/list.html:43
+#: core/templates/repetition_unit/list.html:46
+#: core/templates/user/overview.html:344 core/templates/user/overview.html:384
+#: core/templates/user/overview.html:422
+#: core/templates/weight_unit/list.html:46 core/views/languages.py:74
 #: core/views/license.py:66 core/views/repetition_units.py:66
 #: core/views/weight_units.py:66
-#: exercises/templates/categories/admin-overview.html:38
-#: gallery/views/images.py:63 gym/templates/admin_notes/list.html:67
-#: gym/templates/contract/list.html:73
-#: gym/templates/contract_option/list.html:72
-#: gym/templates/contract_type/list.html:72 gym/templates/document/list.html:79
-#: gym/templates/gym/member_list.html:211
-#: gym/templates/gym/member_list.html:244
-#: gym/templates/gym/member_list.html:281
+#: exercises/templates/categories/admin-overview.html:40
+#: exercises/templates/equipment/admin-overview.html:39
+#: exercises/templates/muscles/admin-overview.html:40
+#: gallery/views/images.py:63 gym/templates/admin_notes/list.html:64
+#: gym/templates/contract/list.html:69
+#: gym/templates/contract_option/list.html:65
+#: gym/templates/contract_type/list.html:66 gym/templates/document/list.html:78
+#: gym/templates/gym/member_list.html:228
+#: gym/templates/gym/member_list.html:264
+#: gym/templates/gym/member_list.html:303
 #: mailer/templates/mailer/gym/overview.html:43
+#: nutrition/templates/ingredient/overview.html:60
 msgid "Add"
 msgstr "Adăugare"
 
 #: core/templates/language/view.html:61 core/templates/user/api_key.html:44
-#: core/templates/user/preferences.html:45 gym/models/contract.py:203
-#: gym/templates/contract/view.html:41 gym/templates/contract/view.html:106
-#: gym/templates/gym/member_list.html:248
-#: manager/templates/schedule/view.html:285
-#: manager/templates/workout/view.html:163
-#: nutrition/templates/ingredient/view.html:202
+#: core/templates/user/preferences.html:50 gym/models/contract.py:203
+#: gym/templates/contract/view.html:41 gym/templates/gym/member_list.html:270
+#: manager/templates/schedule/view.html:304
+#: manager/templates/workout/view.html:177
+#: nutrition/templates/ingredient/view.html:206
 msgid "Options"
 msgstr "Opțiuni"
 
-#: core/templates/license/list.html:4 core/templates/misc/license/list.html:4
+#: core/templates/license/list.html:4
 msgid "License list"
 msgstr ""
 
-#: core/templates/license/list.html:26 core/templates/misc/license/list.html:30
-#: core/templates/repetition_unit/list.html:28
+#: core/templates/license/list.html:30
+#: core/templates/repetition_unit/list.html:32
 #: core/templates/user/overview.html:104 core/templates/user/overview.html:136
-#: core/templates/user/overview.html:185 core/templates/user/overview.html:347
-#: core/templates/user/overview.html:383 core/templates/user/overview.html:427
-#: core/templates/weight_unit/list.html:28
-#: exercises/templates/categories/admin-overview.html:26
-#: exercises/templates/equipment/admin-overview.html:26
-#: exercises/templates/muscles/admin-overview.html:26
-#: gym/templates/admin_notes/list.html:52 gym/templates/contract/list.html:60
-#: gym/templates/contract_option/list.html:58
-#: gym/templates/contract_type/list.html:58 gym/templates/document/list.html:64
-#: gym/templates/gym/list.html:29 gym/templates/gym/member_list.html:229
-#: gym/templates/gym/member_list.html:262
-#: gym/templates/gym/member_list.html:299
+#: core/templates/user/overview.html:185 core/templates/user/overview.html:365
+#: core/templates/user/overview.html:404 core/templates/user/overview.html:448
+#: core/templates/weight_unit/list.html:32
+#: exercises/templates/categories/admin-overview.html:30
+#: exercises/templates/equipment/admin-overview.html:30
+#: exercises/templates/muscles/admin-overview.html:29
+#: gym/templates/admin_notes/list.html:50 gym/templates/contract/list.html:57
+#: gym/templates/contract_option/list.html:52
+#: gym/templates/contract_type/list.html:53 gym/templates/document/list.html:64
+#: gym/templates/gym/list.html:32 gym/templates/gym/member_list.html:248
+#: gym/templates/gym/member_list.html:284
+#: gym/templates/gym/member_list.html:321
 #: mailer/templates/mailer/gym/overview.html:30
-#: manager/templates/calendar/day.html:87
-#: nutrition/templates/units/list.html:29
+#: manager/templates/calendar/day.html:88
+#: nutrition/templates/units/list.html:34
 msgid "Nothing found"
 msgstr ""
 
-#: core/templates/misc/about.html:4 core/templates/template.html:175
+#: core/templates/misc/about.html:4 core/templates/template.html:188
 msgid "Imprint"
 msgstr ""
 
-#: core/templates/misc/license/list.html:47
-msgid ""
-"If a license has been localized, e.g. the Creative Commons\n"
-"            licenses for the different countries, add them as separate "
-"entries here."
-msgstr ""
-
 #: core/templates/navigation.html:28 software/templates/features.html:437
 msgid "Training"
 msgstr "Antrenament"
@@ -693,8 +685,8 @@ msgstr ""
 msgid "Exercises"
 msgstr "Exerciții"
 
-#: core/templates/navigation.html:111 core/templates/navigation.html:184
-#: core/templates/navigation.html:340
+#: core/templates/navigation.html:111 core/templates/navigation.html:185
+#: core/templates/navigation.html:339
 msgid "Administration"
 msgstr "Administrație"
 
@@ -733,87 +725,87 @@ msgstr ""
 msgid "Daily calories calculator"
 msgstr ""
 
-#: core/templates/navigation.html:179
+#: core/templates/navigation.html:180
 #: nutrition/templates/ingredient/overview.html:10
 msgid "Ingredient overview"
 msgstr ""
 
-#: core/templates/navigation.html:187 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:189 nutrition/templates/units/list.html:6
 msgid "Ingredient weight units"
 msgstr ""
 
-#: core/templates/navigation.html:203 software/templates/features.html:442
+#: core/templates/navigation.html:205 software/templates/features.html:442
 msgid "Body weight"
 msgstr ""
 
-#: core/templates/navigation.html:210 core/templates/user/overview.html:114
+#: core/templates/navigation.html:212 core/templates/user/overview.html:114
 msgid "Weight overview"
 msgstr ""
 
-#: core/templates/navigation.html:217 weight/views.py:65
+#: core/templates/navigation.html:216 weight/views.py:65
 msgid "Add weight entry"
 msgstr ""
 
-#: core/templates/navigation.html:231
+#: core/templates/navigation.html:230
 msgid "About this software"
 msgstr ""
 
-#: core/templates/navigation.html:237 software/templates/about_us.html:5
+#: core/templates/navigation.html:236 software/templates/about_us.html:5
 msgid "About us"
 msgstr ""
 
-#: core/templates/navigation.html:243 software/templates/features.html:507
+#: core/templates/navigation.html:242 software/templates/features.html:507
 msgid "REST API"
 msgstr ""
 
-#: core/templates/navigation.html:249 utils/models.py:45
+#: core/templates/navigation.html:248 utils/models.py:45
 msgid "License"
 msgstr ""
 
-#: core/templates/navigation.html:255
+#: core/templates/navigation.html:254
 msgid "Developer documentation"
 msgstr ""
 
-#: core/templates/navigation.html:262
+#: core/templates/navigation.html:261
 msgid "Get the code"
 msgstr ""
 
-#: core/templates/navigation.html:269 core/templates/template.html:214
+#: core/templates/navigation.html:268 core/templates/template.html:227
 #: software/templates/features.html:582
 msgid "Translate"
 msgstr ""
 
-#: core/templates/navigation.html:303 core/templates/user/login.html:28
+#: core/templates/navigation.html:302 core/templates/user/login.html:28
 msgid "Reset password"
 msgstr ""
 
-#: core/templates/navigation.html:321
+#: core/templates/navigation.html:320
 msgid "My preferences"
 msgstr ""
 
-#: core/templates/navigation.html:330
+#: core/templates/navigation.html:329
 msgid "Logout"
 msgstr ""
 
-#: core/templates/navigation.html:353
+#: core/templates/navigation.html:352
 msgid "Licenses"
 msgstr ""
 
-#: core/templates/navigation.html:361
+#: core/templates/navigation.html:360
 #: core/templates/repetition_unit/list.html:4
 msgid "Repetition units"
 msgstr ""
 
-#: core/templates/navigation.html:369 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:368 core/templates/weight_unit/list.html:4
 #: nutrition/templates/ingredient/view.html:141
 msgid "Weight units"
 msgstr ""
 
-#: core/templates/navigation.html:377 core/templates/user/list.html:4
+#: core/templates/navigation.html:376 core/templates/user/list.html:4
 msgid "User list"
 msgstr ""
 
-#: core/templates/navigation.html:383
+#: core/templates/navigation.html:382
 msgid "Gyms"
 msgstr ""
 
@@ -874,55 +866,28 @@ msgstr ""
 msgid "next"
 msgstr ""
 
-#: core/templates/tags/render_day.html:34
-msgid "Add weight log"
+#: core/templates/tags/render_day.html:44
+msgid "Placeholder image for translation"
 msgstr ""
 
-#: core/templates/tags/render_day.html:116
-msgid "Placeholder image for exercise"
-msgstr ""
-
-#: core/templates/tags/render_day.html:133
-msgid "This exercise has no repetitions."
-msgstr ""
-
-#: core/templates/tags/render_day.html:136
-msgid "Edit them now."
-msgstr ""
-
-#: core/templates/tags/render_day.html:162
-msgid "Add exercises to this workout day"
-msgstr ""
-
-#: core/templates/tags/render_weight_log.html:17 manager/helpers.py:86
-#: manager/models/setting.py:72 manager/templates/set/formset.html:9
-msgid "Reps"
-msgstr ""
-
-#: core/templates/tags/render_weight_log.html:30 manager/forms.py:191
-#: manager/models/log.py:103 manager/models/setting.py:102
-#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
-msgid "RiR"
-msgstr ""
-
-#: core/templates/template.html:122 manager/templates/calendar/month.html:138
-#: manager/templates/schedule/view.html:248
-#: manager/templates/schedule/view.html:269
-#: manager/templates/workout/view.html:84
-#: manager/templates/workout/view.html:137
+#: core/templates/template.html:124 manager/templates/calendar/month.html:138
+#: manager/templates/schedule/view.html:262
+#: manager/templates/schedule/view.html:287
+#: manager/templates/workout/view.html:89
+#: manager/templates/workout/view.html:149
 msgid "Close"
 msgstr ""
 
-#: core/templates/template.html:138
+#: core/templates/template.html:140
 msgid ""
 "You are using a guest account, data entered will be deleted after a week."
 msgstr ""
 
-#: core/templates/template.html:143
+#: core/templates/template.html:145
 msgid "Create some demo entries"
 msgstr ""
 
-#: core/templates/template.html:180 software/templates/features.html:547
+#: core/templates/template.html:193 software/templates/features.html:547
 #: software/templates/tos.html:7
 msgid "Terms of service"
 msgstr ""
@@ -931,7 +896,7 @@ msgstr ""
 msgid "Features"
 msgstr ""
 
-#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:54
+#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:59
 msgid "API key"
 msgstr ""
 
@@ -970,17 +935,17 @@ msgstr ""
 msgid "Documentation"
 msgstr ""
 
-#: core/templates/user/delete_account.html:4
-#: core/templates/user/preferences.html:59
+#: core/templates/user/delete_account.html:3
+#: core/templates/user/preferences.html:62
 msgid "Delete account"
 msgstr ""
 
-#: core/templates/user/delete_account.html:17
+#: core/templates/user/delete_account.html:9
 #: exercises/templates/history/overview.html:93
 msgid "Are you sure?"
 msgstr ""
 
-#: core/templates/user/delete_account.html:22
+#: core/templates/user/delete_account.html:14
 #, python-format
 msgid ""
 "This action will delete the user account \"%(username)s\".\n"
@@ -999,22 +964,22 @@ msgstr ""
 
 #: core/templates/user/overview.html:25 core/templates/user/overview.html:68
 #: core/templates/user/overview.html:112 core/templates/user/overview.html:144
-#: core/templates/user/overview.html:330 core/templates/user/overview.html:369
-#: core/templates/user/overview.html:405
+#: core/templates/user/overview.html:348 core/templates/user/overview.html:390
+#: core/templates/user/overview.html:426
 #, python-format
 msgid "last %(number)s"
 msgstr ""
 
 #: core/templates/user/overview.html:27 core/templates/user/overview.html:146
-#: core/templates/user/overview.html:325 core/templates/user/overview.html:364
-#: core/templates/user/overview.html:400 gym/templates/gym/member_list.html:210
-#: gym/templates/gym/member_list.html:243
-#: gym/templates/gym/member_list.html:280
+#: core/templates/user/overview.html:343 core/templates/user/overview.html:382
+#: core/templates/user/overview.html:421 gym/templates/gym/member_list.html:226
+#: gym/templates/gym/member_list.html:262
+#: gym/templates/gym/member_list.html:302
 msgid "Overview"
 msgstr ""
 
 #: core/templates/user/overview.html:28
-#: manager/templates/schedule/view.html:163
+#: manager/templates/schedule/view.html:172
 #: manager/templates/workout/overview.html:39 manager/views/schedule_step.py:60
 msgid "Add workout"
 msgstr ""
@@ -1046,38 +1011,36 @@ msgstr "Descriere"
 msgid "Number of logs (days)"
 msgstr ""
 
-#: core/templates/user/overview.html:37 core/views/user.py:600
+#: core/templates/user/overview.html:37 core/views/user.py:599
 #: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:158
 msgid "Last activity"
 msgstr ""
 
 #: core/templates/user/overview.html:58
 #: manager/templates/calendar/month.html:128
-#: manager/templates/schedule/view.html:144
 #: manager/templates/workout/overview.html:28
 msgid "No workouts found."
 msgstr ""
 
 #: core/templates/user/overview.html:68 manager/forms.py:280
-#: manager/templates/workout/view.html:106
+#: manager/templates/workout/view.html:114
 msgid "Log"
 msgstr ""
 
 #: core/templates/user/overview.html:77 manager/models/session.py:83
-#: manager/templates/calendar/partial_overview_table.html:52
+#: manager/templates/calendar/partial_overview_table.html:54
 msgid "General impression"
 msgstr ""
 
-#: core/templates/user/overview.html:78 core/templates/user/overview.html:369
+#: core/templates/user/overview.html:78 core/templates/user/overview.html:390
 #: manager/models/session.py:73
-#: manager/templates/calendar/partial_overview_table.html:56
-#: manager/templates/workout/log.html:89
+#: manager/templates/calendar/partial_overview_table.html:58
 msgid "Notes"
 msgstr ""
 
 #: core/templates/user/overview.html:79
 #: exercises/templates/history/overview.html:30
-#: manager/templates/calendar/partial_overview_table.html:42
+#: manager/templates/calendar/partial_overview_table.html:44
 msgid "Time"
 msgstr ""
 
@@ -1115,121 +1078,121 @@ msgstr ""
 msgid "kcal"
 msgstr ""
 
-#: core/templates/user/overview.html:201 core/templates/user/overview.html:322
-#: core/templates/user/overview.html:361 core/templates/user/overview.html:397
-#: core/templates/user/overview.html:442 gym/templates/gym/list.html:42
-#: gym/templates/gym/member_list.html:84 gym/templates/gym/member_list.html:137
-#: gym/templates/gym/member_list.html:173
-#: gym/templates/gym/member_list.html:207
-#: gym/templates/gym/member_list.html:240
-#: gym/templates/gym/member_list.html:277
-#: manager/templates/schedule/view.html:100
+#: core/templates/user/overview.html:201 core/templates/user/overview.html:340
+#: core/templates/user/overview.html:379 core/templates/user/overview.html:418
+#: core/templates/user/overview.html:463 gym/templates/gym/list.html:45
+#: gym/templates/gym/member_list.html:91 gym/templates/gym/member_list.html:149
+#: gym/templates/gym/member_list.html:187
+#: gym/templates/gym/member_list.html:223
+#: gym/templates/gym/member_list.html:259
+#: gym/templates/gym/member_list.html:299
+#: manager/templates/schedule/view.html:99
 msgid "Actions"
 msgstr ""
 
-#: core/templates/user/overview.html:207
+#: core/templates/user/overview.html:210
 msgid "Deactivate user"
 msgstr ""
 
-#: core/templates/user/overview.html:209
+#: core/templates/user/overview.html:214
 msgid "Activate user"
 msgstr ""
 
-#: core/templates/user/overview.html:211
+#: core/templates/user/overview.html:223
 msgid "Reset user password"
 msgstr ""
 
-#: core/templates/user/overview.html:214 gym/templates/gym/member_list.html:30
+#: core/templates/user/overview.html:227 gym/templates/gym/member_list.html:30
 msgid "Roles"
 msgstr ""
 
-#: core/templates/user/overview.html:225
+#: core/templates/user/overview.html:243
 msgid "Password reset confirmation"
 msgstr "Confirmare resetare parolă"
 
-#: core/templates/user/overview.html:229
+#: core/templates/user/overview.html:247
 msgid "Do you really want to change this user&#39;s password?"
 msgstr ""
 
-#: core/templates/user/overview.html:232
+#: core/templates/user/overview.html:250
 #: exercises/templates/history/overview.html:106
 msgid "No"
 msgstr ""
 
-#: core/templates/user/overview.html:233
+#: core/templates/user/overview.html:251
 #: exercises/templates/history/overview.html:99
 msgid "Yes"
 msgstr ""
 
-#: core/templates/user/overview.html:254 gym/templates/gym/member_list.html:93
+#: core/templates/user/overview.html:272 gym/templates/gym/member_list.html:105
 msgid "Details"
 msgstr ""
 
-#: core/templates/user/overview.html:258 gym/views/export.py:57
-#: manager/helpers.py:86 manager/templates/schedule/view.html:98
+#: core/templates/user/overview.html:276 gym/views/export.py:57
+#: manager/helpers.py:86 manager/templates/schedule/view.html:97
 msgid "Nr."
 msgstr "Nr."
 
-#: core/templates/user/overview.html:280 gym/models/contract.py:287
+#: core/templates/user/overview.html:298 gym/models/contract.py:287
 #: gym/models/gym.py:50 gym/templates/contract/view.html:75
-#: gym/templates/gym/member_list.html:100 gym/views/export.py:68
+#: gym/templates/gym/member_list.html:112 gym/views/export.py:68
 msgid "Phone"
 msgstr ""
 
-#: core/templates/user/overview.html:284 gym/templates/contract/view.html:87
-#: gym/templates/gym/member_list.html:118
+#: core/templates/user/overview.html:302 gym/templates/contract/view.html:87
+#: gym/templates/gym/member_list.html:130
 msgid "Address"
 msgstr ""
 
-#: core/templates/user/overview.html:295
+#: core/templates/user/overview.html:313
 msgid "Registered"
 msgstr ""
 
-#: core/templates/user/overview.html:299
+#: core/templates/user/overview.html:317
 msgid "Last login"
 msgstr ""
 
-#: core/templates/user/overview.html:304
+#: core/templates/user/overview.html:322
 msgid "Status"
 msgstr ""
 
-#: core/templates/user/overview.html:307
+#: core/templates/user/overview.html:325
 msgid "Active"
 msgstr ""
 
-#: core/templates/user/overview.html:309
+#: core/templates/user/overview.html:327
 msgid "Inactive"
 msgstr ""
 
-#: core/templates/user/overview.html:330 gym/templates/contract/list.html:4
-#: gym/templates/gym/member_list.html:202
+#: core/templates/user/overview.html:348 gym/templates/contract/list.html:4
+#: gym/templates/gym/member_list.html:218
 msgid "Contracts"
 msgstr ""
 
-#: core/templates/user/overview.html:405 gym/templates/document/list.html:4
+#: core/templates/user/overview.html:426 gym/templates/document/list.html:4
 msgid "Documents"
 msgstr ""
 
-#: core/templates/user/overview.html:412 gym/templates/document/list.html:32
-#: manager/forms.py:292 manager/templates/workout/view.html:132
+#: core/templates/user/overview.html:433 gym/templates/document/list.html:33
+#: manager/forms.py:292 manager/templates/workout/view.html:143
 msgid "Download"
 msgstr ""
 
-#: core/templates/user/overview.html:450 gym/views/admin_config.py:44
+#: core/templates/user/overview.html:474 gym/views/admin_config.py:44
 #: gym/views/admin_config.py:58 gym/views/user_config.py:46
 msgid "Configuration"
 msgstr ""
 
-#: core/templates/user/overview.html:453 gym/models/user_config.py:92
+#: core/templates/user/overview.html:477 gym/models/user_config.py:92
 msgid "Include in inactive overview"
 msgstr ""
 
-#: core/templates/user/overview.html:486
+#: core/templates/user/overview.html:510
 #, python-format
 msgid "Admin login is only available for users in %(gym_name)s"
 msgstr ""
 
-#: core/templates/user/overview.html:490
+#: core/templates/user/overview.html:514
 msgid "Log in as this user"
 msgstr ""
 
@@ -1249,19 +1212,19 @@ msgstr ""
 msgid "Send verification email"
 msgstr ""
 
-#: core/templates/user/preferences.html:30
+#: core/templates/user/preferences.html:31
 msgid "You need to verify your email to contribute exercises"
 msgstr ""
 
-#: core/templates/user/preferences.html:50 core/views/user.py:611
+#: core/templates/user/preferences.html:55 core/views/user.py:610
 msgid "Change password"
 msgstr ""
 
-#: core/templatetags/wger_extras.py:205 i18n.tpl:37
+#: core/templatetags/wger_extras.py:197 i18n.tpl:37
 msgid "kg"
 msgstr ""
 
-#: core/templatetags/wger_extras.py:207
+#: core/templatetags/wger_extras.py:199
 #: nutrition/templates/ingredient/view.html:60
 #: nutrition/templates/ingredient/view.html:66
 #: nutrition/templates/ingredient/view.html:73
@@ -1273,11 +1236,11 @@ msgctxt "weight unit, i.e. grams"
 msgid "g"
 msgstr ""
 
-#: core/templatetags/wger_extras.py:210 i18n.tpl:38
+#: core/templatetags/wger_extras.py:202 i18n.tpl:38
 msgid "lb"
 msgstr ""
 
-#: core/templatetags/wger_extras.py:212
+#: core/templatetags/wger_extras.py:204
 msgctxt "weight unit, i.e. ounces"
 msgid "oz"
 msgstr ""
@@ -1304,13 +1267,13 @@ msgid "Delete {0}?"
 msgstr "Ștergere {0}?"
 
 #: core/views/languages.py:111 core/views/license.py:85
-#: core/views/repetition_units.py:86 core/views/user.py:474
+#: core/views/repetition_units.py:86 core/views/user.py:473
 #: core/views/weight_units.py:86 exercises/views/categories.py:98
 #: exercises/views/equipment.py:81 exercises/views/muscles.py:87
 #: gym/views/admin_notes.py:161 gym/views/config.py:68
 #: gym/views/contract.py:186 gym/views/contract_option.py:123
 #: gym/views/contract_type.py:123 gym/views/document.py:171
-#: gym/views/gym.py:463 manager/views/day.py:100 manager/views/schedule.py:333
+#: gym/views/gym.py:463 manager/views/day.py:96 manager/views/schedule.py:333
 #: manager/views/workout.py:267 nutrition/views/ingredient.py:145
 #: nutrition/views/unit.py:143
 #, python-brace-format
@@ -1336,48 +1299,48 @@ msgstr ""
 msgid "Your feedback was successfully sent. Thank you!"
 msgstr ""
 
-#: core/views/user.py:156
+#: core/views/user.py:155
 #, python-brace-format
 msgid "Account \"{0}\" was successfully deleted"
 msgstr ""
 
-#: core/views/user.py:292
+#: core/views/user.py:291
 msgid "You were successfully registered"
 msgstr ""
 
-#: core/views/user.py:351
+#: core/views/user.py:350
 msgid "Settings successfully updated"
 msgstr ""
 
-#: core/views/user.py:390
+#: core/views/user.py:389
 msgid "The user was successfully deactivated"
 msgstr ""
 
-#: core/views/user.py:427
+#: core/views/user.py:426
 msgid "The user was successfully activated"
 msgstr ""
 
-#: core/views/user.py:442
+#: core/views/user.py:441
 msgid "Edit user"
 msgstr ""
 
-#: core/views/user.py:597 gym/templates/gym/member_list.html:26
+#: core/views/user.py:596 gym/templates/gym/member_list.html:26
 #: gym/views/gym.py:158
 msgid "ID"
 msgstr ""
 
-#: core/views/user.py:598 gym/forms.py:95 gym/templates/contract/view.html:55
+#: core/views/user.py:597 gym/forms.py:95 gym/templates/contract/view.html:55
 #: gym/templates/gym/member_list.html:27 gym/views/export.py:59
 #: gym/views/gym.py:158 gym/views/gym.py:217
 msgid "Username"
 msgstr ""
 
-#: core/views/user.py:601 gym/templates/gym/new_user.html:34
+#: core/views/user.py:600 gym/templates/gym/new_user.html:34
 #: gym/views/export.py:58 gym/views/gym.py:217
 msgid "Gym"
 msgstr ""
 
-#: core/views/user.py:660
+#: core/views/user.py:659
 #, python-format
 msgid "A verification email was sent to %(email)s"
 msgstr ""
@@ -1535,11 +1498,6 @@ msgstr ""
 msgid "Equipment list"
 msgstr ""
 
-#: exercises/templates/equipment/admin-overview.html:39
-#: exercises/views/equipment.py:92
-msgid "Add new equipment"
-msgstr ""
-
 #: exercises/templates/history/overview.html:11
 #, fuzzy
 #| msgid "Exercise Categories"
@@ -1594,11 +1552,6 @@ msgstr ""
 msgid "Muscle overview"
 msgstr "Prezentarea generală de muschi"
 
-#: exercises/templates/muscles/admin-overview.html:38
-#: exercises/views/muscles.py:68
-msgid "Add muscle"
-msgstr "Adaugă un mușchi"
-
 #: exercises/views/categories.py:72
 msgid "Add category"
 msgstr "Adăugați categoria"
@@ -1607,6 +1560,10 @@ msgstr "Adăugați categoria"
 msgid "This will also delete all exercises in this category."
 msgstr ""
 
+#: exercises/views/equipment.py:92
+msgid "Add new equipment"
+msgstr ""
+
 #: exercises/views/equipment.py:104 exercises/views/equipment.py:115
 msgid "Delete equipment?"
 msgstr ""
@@ -1615,6 +1572,10 @@ msgstr ""
 msgid "This will delete the exercise from all workouts."
 msgstr ""
 
+#: exercises/views/muscles.py:68
+msgid "Add muscle"
+msgstr "Adaugă un mușchi"
+
 #: gallery/templates/images/overview.html:62
 #, fuzzy
 #| msgid "Add muscle"
@@ -1702,7 +1663,7 @@ msgid "Contract is active"
 msgstr ""
 
 #: gym/models/contract.py:237 gym/templates/contract/view.html:69
-#: manager/models/schedule.py:61 manager/templates/schedule/view.html:67
+#: manager/models/schedule.py:61 manager/templates/schedule/view.html:66
 msgid "Start date"
 msgstr ""
 
@@ -1738,7 +1699,7 @@ msgstr ""
 msgid "Admin: can administrate the different gyms"
 msgstr ""
 
-#: gym/models/gym.py:65 gym/templates/gym/member_list.html:114
+#: gym/models/gym.py:65 gym/templates/gym/member_list.html:126
 msgid "Owner"
 msgstr ""
 
@@ -1748,7 +1709,7 @@ msgid ""
 "considered inactive"
 msgstr ""
 
-#: gym/models/gym_config.py:56 gym/templates/gym/member_list.html:152
+#: gym/models/gym_config.py:56 gym/templates/gym/member_list.html:166
 msgid "Show name in header"
 msgstr ""
 
@@ -1761,7 +1722,7 @@ msgstr ""
 msgid "Configuration for {self.gym.name}"
 msgstr ""
 
-#: gym/models/user_config.py:65 gym/templates/gym/member_list.html:184
+#: gym/models/user_config.py:65 gym/templates/gym/member_list.html:200
 msgid "Overview of inactive members"
 msgstr ""
 
@@ -1785,7 +1746,7 @@ msgstr ""
 msgid "User notes"
 msgstr ""
 
-#: gym/templates/contract/list.html:36
+#: gym/templates/contract/list.html:34
 msgid "Show"
 msgstr ""
 
@@ -1811,11 +1772,11 @@ msgstr ""
 msgid "Gym list"
 msgstr ""
 
-#: gym/templates/gym/list.html:50
+#: gym/templates/gym/list.html:53
 msgid "Global gym configuration"
 msgstr ""
 
-#: gym/templates/gym/list.html:67 gym/views/gym.py:171
+#: gym/templates/gym/list.html:69 gym/views/gym.py:171
 msgid "Add new gym"
 msgstr ""
 
@@ -1827,43 +1788,43 @@ msgstr ""
 msgid "Gym manager"
 msgstr ""
 
-#: gym/templates/gym/member_list.html:69
+#: gym/templates/gym/member_list.html:76
 msgid "This gym has no administrators or trainers"
 msgstr ""
 
-#: gym/templates/gym/member_list.html:88
+#: gym/templates/gym/member_list.html:98
 msgid "Export"
 msgstr ""
 
-#: gym/templates/gym/member_list.html:125
+#: gym/templates/gym/member_list.html:137
 msgid "Members"
 msgstr ""
 
-#: gym/templates/gym/member_list.html:145
+#: gym/templates/gym/member_list.html:159
 msgid "Gym configuration"
 msgstr ""
 
-#: gym/templates/gym/member_list.html:148
+#: gym/templates/gym/member_list.html:162
 msgid "Inactive members"
 msgstr ""
 
-#: gym/templates/gym/member_list.html:149
+#: gym/templates/gym/member_list.html:163
 msgid "weeks"
 msgstr ""
 
-#: gym/templates/gym/member_list.html:181
+#: gym/templates/gym/member_list.html:197
 msgid "My configuration"
 msgstr ""
 
-#: gym/templates/gym/member_list.html:215
+#: gym/templates/gym/member_list.html:234
 msgid "Types"
 msgstr ""
 
-#: gym/templates/gym/member_list.html:285
+#: gym/templates/gym/member_list.html:307
 msgid "Emails"
 msgstr ""
 
-#: gym/templates/gym/member_list.html:315
+#: gym/templates/gym/member_list.html:336
 msgid "Add member"
 msgstr ""
 
@@ -2160,28 +2121,38 @@ msgstr "Folosește și ingrediente din limba Engleză"
 msgid "Unit"
 msgstr ""
 
+#: manager/forms.py:191 manager/models/log.py:103 manager/models/setting.py:102
+#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
+msgid "RiR"
+msgstr ""
+
 #: manager/forms.py:279
 msgid "Type"
 msgstr ""
 
-#: manager/forms.py:280 manager/templates/workout/view.html:113
+#: manager/forms.py:280 manager/templates/workout/view.html:122
 msgid "Table"
 msgstr ""
 
-#: manager/forms.py:282 manager/templates/workout/view.html:119
+#: manager/forms.py:282 manager/templates/workout/view.html:129
 msgid "with images"
 msgstr ""
 
-#: manager/forms.py:283 manager/templates/workout/view.html:125
+#: manager/forms.py:283 manager/templates/workout/view.html:136
 msgid "with comments"
 msgstr ""
 
+#: manager/helpers.py:86 manager/models/setting.py:72
+#: manager/templates/set/formset.html:9
+msgid "Reps"
+msgstr ""
+
 #: manager/management/commands/email-reminders.py:121
 msgid "Workout will expire soon"
 msgstr ""
 
 #: manager/models/day.py:34 manager/models/log.py:58
-#: manager/models/session.py:60 manager/templates/schedule/view.html:102
+#: manager/models/session.py:60 manager/templates/schedule/view.html:101
 #: manager/templates/workout/view.html:9 manager/templates/workout/view.html:17
 #: manager/views/pdf.py:85 manager/views/pdf.py:161
 #: manager/views/schedule.py:151 manager/views/schedule.py:221
@@ -2202,7 +2173,7 @@ msgstr ""
 msgid "Name or short description of the schedule. For example 'Program XYZ'."
 msgstr ""
 
-#: manager/models/schedule.py:65 manager/templates/schedule/view.html:71
+#: manager/models/schedule.py:65 manager/templates/schedule/view.html:70
 msgid "Schedule active"
 msgstr ""
 
@@ -2213,7 +2184,7 @@ msgid ""
 "inactive"
 msgstr ""
 
-#: manager/models/schedule.py:77 manager/templates/schedule/view.html:81
+#: manager/models/schedule.py:77 manager/templates/schedule/view.html:80
 msgid "Is a loop"
 msgstr ""
 
@@ -2232,7 +2203,7 @@ msgid "The duration in weeks"
 msgstr ""
 
 #: manager/models/schedule_step.py:64 manager/models/set.py:53
-#: manager/models/setting.py:113 nutrition/models/meal.py:55
+#: manager/models/setting.py:113 nutrition/models/meal.py:53
 #: nutrition/models/meal_item.py:66
 msgid "Order"
 msgstr ""
@@ -2366,7 +2337,7 @@ msgstr ""
 msgid "Workout session"
 msgstr ""
 
-#: manager/templates/calendar/partial_overview_table.html:27
+#: manager/templates/calendar/partial_overview_table.html:26
 msgid "Delete with logs"
 msgstr ""
 
@@ -2386,21 +2357,27 @@ msgid ""
 "will simply be edited. Weight entries are always added."
 msgstr ""
 
-#: manager/templates/schedule/overview.html:5
+#: manager/templates/schedule/overview.html:4
 msgid "Your schedules"
 msgstr ""
 
 #: manager/templates/schedule/overview.html:19
-#: manager/templates/schedule/view.html:131
-#: manager/templates/schedule/view.html:183
+#: manager/templates/schedule/view.html:143
+#: manager/templates/schedule/view.html:193
 #: manager/templates/workout/overview.html:16
 msgid "active"
 msgstr ""
 
-#: manager/templates/schedule/overview.html:28
+#: manager/templates/schedule/overview.html:27
 msgid "No schedules found."
 msgstr ""
 
+#: manager/templates/schedule/overview.html:28
+#, fuzzy
+#| msgid "Add new exercise"
+msgid "Add one now"
+msgstr "Adăugați un exercițiu nou"
+
 #: manager/templates/schedule/overview.html:36
 msgid ""
 "Schedules are collections of workouts that you do in\n"
@@ -2413,10 +2390,11 @@ msgid ""
 "        before jumping to the next. It is also possible to create a loop, so "
 "you\n"
 "        always do the same workouts in succession, e.g. A > B > C > A > B > "
-"C and so on."
+"C and so\n"
+"        on."
 msgstr ""
 
-#: manager/templates/schedule/overview.html:43
+#: manager/templates/schedule/overview.html:44
 msgid ""
 "The currently active schedule will remain active (and be\n"
 "        shown e.g. in your dashboard) till it reaches the last workout or "
@@ -2432,25 +2410,25 @@ msgstr ""
 msgid "Schedule"
 msgstr ""
 
-#: manager/templates/schedule/view.html:85
+#: manager/templates/schedule/view.html:84
 msgid ""
 "This schedule is a loop and will go through the workouts above till you "
 "deactivate it"
 msgstr ""
 
-#: manager/templates/schedule/view.html:103
+#: manager/templates/schedule/view.html:102
 msgid "Weeks"
 msgstr ""
 
-#: manager/templates/schedule/view.html:115
+#: manager/templates/schedule/view.html:114
 msgid "Move me"
 msgstr ""
 
-#: manager/templates/schedule/view.html:156
+#: manager/templates/schedule/view.html:168
 msgid "Start schedule"
 msgstr ""
 
-#: manager/templates/schedule/view.html:187
+#: manager/templates/schedule/view.html:197
 #, python-format
 msgid ""
 "%(weeks)s Week\n"
@@ -2462,11 +2440,11 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: manager/templates/schedule/view.html:221
+#: manager/templates/schedule/view.html:231
 msgid "Adding workouts"
 msgstr ""
 
-#: manager/templates/schedule/view.html:223
+#: manager/templates/schedule/view.html:233
 msgid ""
 "Add as many workouts to the schedule as you want. You can\n"
 "            edit the order by dragging and dropping them. It's also possible "
@@ -2474,44 +2452,37 @@ msgid ""
 "            than once."
 msgstr ""
 
-#: manager/templates/schedule/view.html:232
-#: manager/templates/schedule/view.html:243
-#: manager/templates/schedule/view.html:290
+#: manager/templates/schedule/view.html:242
+#: manager/templates/schedule/view.html:256
+#: manager/templates/schedule/view.html:310
 #: manager/templates/workout/view.html:69
-#: manager/templates/workout/view.html:79
-#: manager/templates/workout/view.html:178
+#: manager/templates/workout/view.html:83
+#: manager/templates/workout/view.html:192
 msgid "Export calendar file"
 msgstr ""
 
-#: manager/templates/schedule/view.html:236
+#: manager/templates/schedule/view.html:248
 msgid "Export this schedule as a calendar file."
 msgstr ""
 
-#: manager/templates/schedule/view.html:237
-#: manager/templates/workout/view.html:74
+#: manager/templates/schedule/view.html:249
+#: manager/templates/workout/view.html:76
 msgid ""
 "You can then import the file it into your calendar\n"
 "                        application for example google calendar, outlook or "
 "iCal. This will create\n"
 "                        an appointment for each training day with the "
-"appropriate exercises."
+"appropriate\n"
+"                        exercises."
 msgstr ""
 
-#: manager/templates/schedule/view.html:258
-#: manager/templates/schedule/view.html:294
-#: manager/templates/workout/view.html:94
-#: manager/templates/workout/view.html:174
+#: manager/templates/schedule/view.html:272
+#: manager/templates/schedule/view.html:315
+#: manager/templates/workout/view.html:99
+#: manager/templates/workout/view.html:188
 msgid "Download as PDF"
 msgstr ""
 
-#: manager/templates/schedule/view.html:299
-msgid "Edit schedule"
-msgstr ""
-
-#: manager/templates/schedule/view.html:304
-msgid "Delete schedule"
-msgstr ""
-
 #: manager/templates/set/add.html:9
 #, python-format
 msgid "Add exercises to day \"%(day_name)s\""
@@ -2576,47 +2547,6 @@ msgid ""
 "You will regularly receive such reminders till you enter your current weight."
 msgstr ""
 
-#: manager/templates/workout/log.html:10 manager/templates/workout/log.html:11
-msgid "Weight log"
-msgstr "Jurnalul de greutate"
-
-#: manager/templates/workout/log.html:29
-msgid "Weight log for workout"
-msgstr ""
-
-#: manager/templates/workout/log.html:49
-msgid "Add weight log to this day"
-msgstr ""
-
-#: manager/templates/workout/log.html:69
-msgid "No weight entries here."
-msgstr ""
-
-#: manager/templates/workout/log.html:77
-msgid "No exercises for this day."
-msgstr ""
-
-#: manager/templates/workout/log.html:90
-msgid ""
-"This page shows the weight logs belonging to this workout\n"
-"only. Click on an exercise to see all the historical data for\n"
-"it."
-msgstr ""
-
-#: manager/templates/workout/log.html:94
-msgid ""
-"If on a single day there is more than one entry with the\n"
-"same number of repetitions, but different weights, only the entry with the\n"
-"higher weight is shown in the diagram."
-msgstr ""
-
-#: manager/templates/workout/log.html:98
-msgid ""
-"Note that only entries with a weight unit (kg or lb) and\n"
-"repetitions are charted, other combinations such as time or until failure\n"
-"are ignored here."
-msgstr ""
-
 #: manager/templates/workout/overview.html:25
 msgid "No templates found."
 msgstr ""
@@ -2652,27 +2582,23 @@ msgstr ""
 msgid "Set the repetitions for each set"
 msgstr ""
 
-#: manager/templates/workout/view.html:73
+#: manager/templates/workout/view.html:75
 msgid "Export this workout as a calendar file."
 msgstr ""
 
-#: manager/templates/workout/view.html:144
+#: manager/templates/workout/view.html:156
 msgid "Logs"
 msgstr ""
 
-#: manager/templates/workout/view.html:146
+#: manager/templates/workout/view.html:159
 msgid "View logs"
 msgstr ""
 
-#: manager/templates/workout/view.html:169 manager/views/schedule_step.py:99
-msgid "Edit workout"
-msgstr ""
-
-#: manager/templates/workout/view.html:182 manager/views/workout.py:281
+#: manager/templates/workout/view.html:195 manager/views/workout.py:281
 msgid "Mark as template"
 msgstr ""
 
-#: manager/views/day.py:109
+#: manager/views/day.py:105
 msgid "Add workout day"
 msgstr ""
 
@@ -2689,6 +2615,10 @@ msgstr ""
 msgid "Create schedule"
 msgstr ""
 
+#: manager/views/schedule_step.py:99
+msgid "Edit workout"
+msgstr ""
+
 #: manager/views/workout.py:209
 msgid "Copy workout"
 msgstr ""
@@ -2816,7 +2746,7 @@ msgstr ""
 msgid "Unit amount, e.g. \"1 Cup\" or \"1/2 spoon\""
 msgstr ""
 
-#: nutrition/models/log.py:52 nutrition/models/meal.py:50
+#: nutrition/models/log.py:52 nutrition/models/meal.py:48
 #: nutrition/models/meal_item.py:48 nutrition/models/plan.py:108
 msgid "Nutrition plan"
 msgstr ""
@@ -2829,11 +2759,11 @@ msgstr ""
 msgid "Date and Time (Approx.)"
 msgstr ""
 
-#: nutrition/models/meal.py:62
+#: nutrition/models/meal.py:60
 msgid "Time (approx)"
 msgstr ""
 
-#: nutrition/models/meal.py:69
+#: nutrition/models/meal.py:67
 msgid ""
 "Give meals a textual description / name such as \"Breakfast\" or \"after "
 "workout\""
@@ -2957,10 +2887,6 @@ msgstr ""
 msgid "Search"
 msgstr "Căutare"
 
-#: nutrition/templates/ingredient/overview.html:62
-msgid "Add ingredient"
-msgstr ""
-
 #: nutrition/templates/ingredient/view.html:45 nutrition/views/plan.py:229
 msgid "Macronutrients"
 msgstr ""
@@ -2980,20 +2906,11 @@ msgstr ""
 msgid "Others"
 msgstr ""
 
-#: nutrition/templates/ingredient/view.html:144
-#: nutrition/templates/units/list.html:46 nutrition/views/unit.py:86
+#: nutrition/templates/ingredient/view.html:143
+#: nutrition/templates/units/list.html:50 nutrition/views/unit.py:86
 msgid "Add new weight unit"
 msgstr ""
 
-#: nutrition/templates/ingredient/view.html:206
-#: nutrition/templates/ingredient/view.html:209
-msgid "Edit ingredient"
-msgstr ""
-
-#: nutrition/templates/ingredient/view.html:213
-msgid "Delete ingredient"
-msgstr ""
-
 #: nutrition/templates/rate/form.html:25
 msgid "Basal metabolic rate"
 msgstr ""
@@ -3560,6 +3477,9 @@ msgstr "Șters cu succes."
 msgid "Delete weight entry for the %s"
 msgstr "Ștergeți greutatea pentru %s"
 
+#~ msgid "Weight log"
+#~ msgstr "Jurnalul de greutate"
+
 #~ msgid "Submission date"
 #~ msgstr "Data depunerii"
 
@@ -3626,11 +3546,6 @@ msgstr "Ștergeți greutatea pentru %s"
 #~ msgstr ""
 #~ "Până atunci el nu va fi indicat in prezentarea generală sau in căutare."
 
-#, fuzzy
-#~| msgid "Add new exercise"
-#~ msgid "Add new video"
-#~ msgstr "Adăugați un exercițiu nou"
-
 #~ msgid "Comments for this exercise"
 #~ msgstr "Comentarii pentru acest exercițiu"
 
diff --git a/wger/locale/ru/LC_MESSAGES/django.po b/wger/locale/ru/LC_MESSAGES/django.po
index 041e40ef6..10cef3f90 100644
--- a/wger/locale/ru/LC_MESSAGES/django.po
+++ b/wger/locale/ru/LC_MESSAGES/django.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: wger Workout Manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-07-14 15:59+0200\n"
+"POT-Creation-Date: 2024-11-14 13:09+0100\n"
 "PO-Revision-Date: 2022-05-24 21:14+0000\n"
 "Last-Translator: Konstantin <konstantin.photo@gmx.com>\n"
 "Language-Team: Russian <https://hosted.weblate.org/projects/wger/web/ru/>\n"
@@ -27,7 +27,7 @@ msgstr ""
 "(n%100>=11 && n%100<=14)? 2 : 3);\n"
 "X-Generator: Weblate 4.13-dev\n"
 
-#: config/models/gym_config.py:46 gym/templates/gym/list.html:53
+#: config/models/gym_config.py:46 gym/templates/gym/list.html:56
 msgid "Default gym"
 msgstr "Главный тренажерный зал"
 
@@ -40,28 +40,28 @@ msgstr ""
 "новых зарегистрированных пользователей в этот спортзал и обновит всех "
 "существующих пользователей без тренажерный зала."
 
-#: config/views/gym_config.py:42 core/templates/language/view.html:67
-#: core/templates/license/list.html:17 core/templates/misc/license/list.html:18
+#: config/views/gym_config.py:42 core/templates/language/view.html:64
+#: core/templates/license/list.html:17
 #: core/templates/repetition_unit/list.html:18
-#: core/templates/tags/render_day.html:39
-#: core/templates/tags/render_day.html:75 core/templates/user/overview.html:204
-#: core/templates/user/overview.html:445
+#: core/templates/user/overview.html:204 core/templates/user/overview.html:467
 #: core/templates/weight_unit/list.html:18
 #: exercises/templates/categories/admin-overview.html:17
 #: exercises/templates/equipment/admin-overview.html:17
-#: exercises/templates/muscles/admin-overview.html:17
-#: gallery/views/images.py:98 gym/templates/admin_notes/list.html:32
-#: gym/templates/contract/list.html:31 gym/templates/contract/view.html:107
-#: gym/templates/contract_option/list.html:32
-#: gym/templates/contract_type/list.html:32 gym/templates/document/list.html:38
-#: gym/templates/gym/list.html:20 gym/templates/gym/list.html:46
-#: gym/templates/gym/member_list.html:87 gym/templates/gym/member_list.html:140
-#: gym/templates/gym/member_list.html:176
-#: manager/templates/calendar/day.html:68
-#: manager/templates/calendar/month.html:85
-#: manager/templates/calendar/partial_overview_table.html:18
-#: manager/templates/schedule/view.html:118
-#: nutrition/templates/ingredient/view.html:165
+#: exercises/templates/muscles/admin-overview.html:16
+#: gallery/views/images.py:98 gym/templates/admin_notes/list.html:31
+#: gym/templates/contract/list.html:30 gym/templates/contract/view.html:106
+#: gym/templates/contract_option/list.html:29
+#: gym/templates/contract_type/list.html:30 gym/templates/document/list.html:38
+#: gym/templates/gym/list.html:19 gym/templates/gym/list.html:48
+#: gym/templates/gym/member_list.html:94 gym/templates/gym/member_list.html:152
+#: gym/templates/gym/member_list.html:190
+#: manager/templates/calendar/day.html:67
+#: manager/templates/calendar/month.html:84
+#: manager/templates/calendar/partial_overview_table.html:16
+#: manager/templates/schedule/view.html:318
+#: manager/templates/workout/view.html:181
+#: nutrition/templates/ingredient/view.html:164
+#: nutrition/templates/ingredient/view.html:209
 #: nutrition/templates/units/list.html:19
 msgid "Edit"
 msgstr "Редактировать"
@@ -97,8 +97,8 @@ msgstr "Моя прикольная программа тренировки"
 msgid "Empty placeholder schedule"
 msgstr "Пустая программа-«заполнитель»"
 
-#: core/forms.py:69 core/templates/navigation.html:285
-#: core/templates/navigation.html:291 core/templates/user/login.html:4
+#: core/forms.py:69 core/templates/navigation.html:284
+#: core/templates/navigation.html:290 core/templates/user/login.html:4
 #: software/templates/features.html:82 software/templates/features.html:427
 msgid "Login"
 msgstr "Войти"
@@ -108,14 +108,14 @@ msgstr "Войти"
 msgid "First name"
 msgstr "Имя"
 
-#: core/forms.py:109 core/forms.py:215 core/templates/user/overview.html:266
+#: core/forms.py:109 core/forms.py:215 core/templates/user/overview.html:284
 #: gym/views/export.py:62 gym/views/gym.py:217
 msgid "Last name"
 msgstr "Фамилия"
 
-#: core/forms.py:111 core/forms.py:180 core/templates/user/overview.html:270
+#: core/forms.py:111 core/forms.py:180 core/templates/user/overview.html:288
 #: gym/models/contract.py:256 gym/models/gym.py:58
-#: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:104
+#: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:116
 #: gym/templates/gym/new_user.html:30 gym/views/export.py:60
 #: mailer/templates/mailer/gym/form.html:4
 #: mailer/templates/mailer/gym/overview.html:4
@@ -144,8 +144,8 @@ msgstr "Напоминания тренировок"
 msgid "Other settings"
 msgstr "Другие настройки"
 
-#: core/forms.py:174 core/views/user.py:624 core/views/user.py:639
-#: core/views/user.py:651 gym/forms.py:73 manager/templates/log/add.html:65
+#: core/forms.py:174 core/views/user.py:623 core/views/user.py:638
+#: core/views/user.py:650 gym/forms.py:73 manager/templates/log/add.html:65
 #: manager/templates/set/add.html:70 manager/views/workout.py:203
 #: utils/generic_views.py:143
 msgid "Save"
@@ -170,26 +170,25 @@ msgstr "Пароль"
 msgid "Please enter your current password."
 msgstr "Пожалуйста, введите ваш пароль."
 
-#: core/forms.py:242 core/templates/language/view.html:73
-#: core/templates/license/list.html:19 core/templates/misc/license/list.html:22
-#: core/templates/repetition_unit/list.html:20
-#: core/templates/tags/render_day.html:45
-#: core/templates/tags/render_day.html:81 core/templates/user/overview.html:217
-#: core/templates/weight_unit/list.html:20
-#: exercises/templates/categories/admin-overview.html:19
-#: exercises/templates/equipment/admin-overview.html:19
-#: exercises/templates/muscles/admin-overview.html:19
-#: gym/templates/admin_notes/list.html:40
-#: gym/templates/contract_option/list.html:41
-#: gym/templates/contract_type/list.html:41 gym/templates/document/list.html:46
-#: gym/templates/gym/list.html:22 manager/templates/calendar/day.html:73
-#: manager/templates/calendar/month.html:89
-#: manager/templates/calendar/partial_overview_table.html:23
-#: manager/templates/schedule/view.html:122
-#: manager/templates/workout/view.html:188
-#: nutrition/templates/ingredient/view.html:166
+#: core/forms.py:242 core/templates/language/view.html:70
+#: core/templates/license/list.html:21
+#: core/templates/repetition_unit/list.html:22
+#: core/templates/user/overview.html:233
+#: core/templates/weight_unit/list.html:22
+#: exercises/templates/categories/admin-overview.html:21
+#: exercises/templates/equipment/admin-overview.html:21
+#: exercises/templates/muscles/admin-overview.html:20
+#: gym/templates/admin_notes/list.html:37
+#: gym/templates/contract_option/list.html:35
+#: gym/templates/contract_type/list.html:36 gym/templates/document/list.html:46
+#: gym/templates/gym/list.html:23 manager/templates/calendar/day.html:73
+#: manager/templates/calendar/month.html:88
+#: manager/templates/calendar/partial_overview_table.html:22
+#: manager/templates/schedule/view.html:324
+#: manager/templates/workout/view.html:202
+#: nutrition/templates/ingredient/view.html:168
 #: nutrition/templates/ingredient/view.html:215
-#: nutrition/templates/units/list.html:22
+#: nutrition/templates/units/list.html:25
 msgid "Delete"
 msgstr "Удалить"
 
@@ -201,9 +200,9 @@ msgstr "Неверный пароль"
 msgid "The form is secured with reCAPTCHA"
 msgstr "Данная форма защищена reCAPTCHA"
 
-#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:285
-#: core/templates/navigation.html:297 core/templates/template.html:149
-#: core/templates/user/login.html:20 core/views/user.py:298
+#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:284
+#: core/templates/navigation.html:296 core/templates/template.html:151
+#: core/templates/user/login.html:20 core/views/user.py:297
 #: software/templates/features.html:87 software/templates/features.html:422
 msgid "Register"
 msgstr "Зарегистрироваться"
@@ -458,18 +457,18 @@ msgid "The sum of all hours has to be 24"
 msgstr "Сумма всех часов должна быть 24"
 
 #: core/models/rep_unit.py:36 core/models/weight_unit.py:36
-#: core/templates/user/overview.html:262 core/views/user.py:599
+#: core/templates/user/overview.html:280 core/views/user.py:598
 #: exercises/models/category.py:29 exercises/models/equipment.py:29
 #: exercises/models/exercise.py:59 exercises/models/muscle.py:36
 #: gym/models/contract.py:52 gym/models/contract.py:103 gym/models/gym.py:46
 #: gym/models/user_document.py:84 gym/templates/contract/view.html:50
-#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:96
+#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:108
 #: gym/views/gym.py:158 manager/models/schedule.py:55
 #: manager/models/workout.py:57 measurements/models/category.py:36
 #: nutrition/models/ingredient.py:111
-#: nutrition/models/ingredient_category.py:27 nutrition/models/meal.py:67
+#: nutrition/models/ingredient_category.py:27 nutrition/models/meal.py:65
 #: nutrition/models/weight_unit.py:38
-#: nutrition/templates/ingredient/view.html:152
+#: nutrition/templates/ingredient/view.html:151
 msgid "Name"
 msgstr "Имя"
 
@@ -523,7 +522,7 @@ msgstr ""
 msgid "Back to \"%(target)s\""
 msgstr "Вернуться к \"%(target)s\""
 
-#: core/templates/delete.html:15
+#: core/templates/delete.html:4
 msgid "Are you sure you want to delete this? This action cannot be undone."
 msgstr "Вы уверены что хотите это удалить? Это действие необратимо."
 
@@ -580,7 +579,7 @@ msgstr ""
 msgid "Dashboard"
 msgstr "Панель управления"
 
-#: core/templates/language/overview.html:4 core/templates/navigation.html:345
+#: core/templates/language/overview.html:4 core/templates/navigation.html:344
 msgid "Languages"
 msgstr "Языки"
 
@@ -590,85 +589,72 @@ msgstr "Ничего не найдено."
 
 #: core/templates/language/overview.html:22
 #: manager/templates/calendar/month.html:132
-#: manager/templates/schedule/overview.html:28
-#: manager/templates/schedule/view.html:144
+#: manager/templates/schedule/view.html:154
 #: manager/templates/workout/overview.html:28
 #: nutrition/templates/ingredient/overview.html:38
 msgid "Add one now."
 msgstr "Добавить одну сейчас."
 
-#: core/templates/language/overview.html:35 core/templates/license/list.html:40
-#: core/templates/misc/license/list.html:43
-#: core/templates/repetition_unit/list.html:43
-#: core/templates/user/overview.html:326 core/templates/user/overview.html:365
-#: core/templates/user/overview.html:401
-#: core/templates/weight_unit/list.html:43 core/views/languages.py:74
+#: core/templates/language/overview.html:34 core/templates/license/list.html:43
+#: core/templates/repetition_unit/list.html:46
+#: core/templates/user/overview.html:344 core/templates/user/overview.html:384
+#: core/templates/user/overview.html:422
+#: core/templates/weight_unit/list.html:46 core/views/languages.py:74
 #: core/views/license.py:66 core/views/repetition_units.py:66
 #: core/views/weight_units.py:66
-#: exercises/templates/categories/admin-overview.html:38
-#: gallery/views/images.py:63 gym/templates/admin_notes/list.html:67
-#: gym/templates/contract/list.html:73
-#: gym/templates/contract_option/list.html:72
-#: gym/templates/contract_type/list.html:72 gym/templates/document/list.html:79
-#: gym/templates/gym/member_list.html:211
-#: gym/templates/gym/member_list.html:244
-#: gym/templates/gym/member_list.html:281
+#: exercises/templates/categories/admin-overview.html:40
+#: exercises/templates/equipment/admin-overview.html:39
+#: exercises/templates/muscles/admin-overview.html:40
+#: gallery/views/images.py:63 gym/templates/admin_notes/list.html:64
+#: gym/templates/contract/list.html:69
+#: gym/templates/contract_option/list.html:65
+#: gym/templates/contract_type/list.html:66 gym/templates/document/list.html:78
+#: gym/templates/gym/member_list.html:228
+#: gym/templates/gym/member_list.html:264
+#: gym/templates/gym/member_list.html:303
 #: mailer/templates/mailer/gym/overview.html:43
+#: nutrition/templates/ingredient/overview.html:60
 msgid "Add"
 msgstr "Добавить"
 
 #: core/templates/language/view.html:61 core/templates/user/api_key.html:44
-#: core/templates/user/preferences.html:45 gym/models/contract.py:203
-#: gym/templates/contract/view.html:41 gym/templates/contract/view.html:106
-#: gym/templates/gym/member_list.html:248
-#: manager/templates/schedule/view.html:285
-#: manager/templates/workout/view.html:163
-#: nutrition/templates/ingredient/view.html:202
+#: core/templates/user/preferences.html:50 gym/models/contract.py:203
+#: gym/templates/contract/view.html:41 gym/templates/gym/member_list.html:270
+#: manager/templates/schedule/view.html:304
+#: manager/templates/workout/view.html:177
+#: nutrition/templates/ingredient/view.html:206
 msgid "Options"
 msgstr "Опции"
 
-#: core/templates/license/list.html:4 core/templates/misc/license/list.html:4
+#: core/templates/license/list.html:4
 msgid "License list"
 msgstr "Список лицензий"
 
-#: core/templates/license/list.html:26 core/templates/misc/license/list.html:30
-#: core/templates/repetition_unit/list.html:28
+#: core/templates/license/list.html:30
+#: core/templates/repetition_unit/list.html:32
 #: core/templates/user/overview.html:104 core/templates/user/overview.html:136
-#: core/templates/user/overview.html:185 core/templates/user/overview.html:347
-#: core/templates/user/overview.html:383 core/templates/user/overview.html:427
-#: core/templates/weight_unit/list.html:28
-#: exercises/templates/categories/admin-overview.html:26
-#: exercises/templates/equipment/admin-overview.html:26
-#: exercises/templates/muscles/admin-overview.html:26
-#: gym/templates/admin_notes/list.html:52 gym/templates/contract/list.html:60
-#: gym/templates/contract_option/list.html:58
-#: gym/templates/contract_type/list.html:58 gym/templates/document/list.html:64
-#: gym/templates/gym/list.html:29 gym/templates/gym/member_list.html:229
-#: gym/templates/gym/member_list.html:262
-#: gym/templates/gym/member_list.html:299
+#: core/templates/user/overview.html:185 core/templates/user/overview.html:365
+#: core/templates/user/overview.html:404 core/templates/user/overview.html:448
+#: core/templates/weight_unit/list.html:32
+#: exercises/templates/categories/admin-overview.html:30
+#: exercises/templates/equipment/admin-overview.html:30
+#: exercises/templates/muscles/admin-overview.html:29
+#: gym/templates/admin_notes/list.html:50 gym/templates/contract/list.html:57
+#: gym/templates/contract_option/list.html:52
+#: gym/templates/contract_type/list.html:53 gym/templates/document/list.html:64
+#: gym/templates/gym/list.html:32 gym/templates/gym/member_list.html:248
+#: gym/templates/gym/member_list.html:284
+#: gym/templates/gym/member_list.html:321
 #: mailer/templates/mailer/gym/overview.html:30
-#: manager/templates/calendar/day.html:87
-#: nutrition/templates/units/list.html:29
+#: manager/templates/calendar/day.html:88
+#: nutrition/templates/units/list.html:34
 msgid "Nothing found"
 msgstr "Ничего не найдено"
 
-#: core/templates/misc/about.html:4 core/templates/template.html:175
+#: core/templates/misc/about.html:4 core/templates/template.html:188
 msgid "Imprint"
 msgstr "Отпечаток"
 
-#: core/templates/misc/license/list.html:47
-#, fuzzy
-#| msgid ""
-#| "If a license has been localized, e.g. the Creative Commons\n"
-#| "licenses for the different countries, add them as separate entries here."
-msgid ""
-"If a license has been localized, e.g. the Creative Commons\n"
-"            licenses for the different countries, add them as separate "
-"entries here."
-msgstr ""
-"Если лицензии были локализованы, например лицензии\n"
-"Creative Commons для разных стран, добавьте их здесь отдельно."
-
 #: core/templates/navigation.html:28 software/templates/features.html:437
 msgid "Training"
 msgstr "Тренировка"
@@ -715,8 +701,8 @@ msgstr "Общедоступные шаблоны"
 msgid "Exercises"
 msgstr "Упражнения"
 
-#: core/templates/navigation.html:111 core/templates/navigation.html:184
-#: core/templates/navigation.html:340
+#: core/templates/navigation.html:111 core/templates/navigation.html:185
+#: core/templates/navigation.html:339
 msgid "Administration"
 msgstr "Администрация"
 
@@ -755,87 +741,87 @@ msgstr "Калькулятор индекса массы тела"
 msgid "Daily calories calculator"
 msgstr "Калькулятор ежедневных калорий"
 
-#: core/templates/navigation.html:179
+#: core/templates/navigation.html:180
 #: nutrition/templates/ingredient/overview.html:10
 msgid "Ingredient overview"
 msgstr "Обзор ингредиентов"
 
-#: core/templates/navigation.html:187 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:189 nutrition/templates/units/list.html:6
 msgid "Ingredient weight units"
 msgstr "Единицы веса ингредиентов"
 
-#: core/templates/navigation.html:203 software/templates/features.html:442
+#: core/templates/navigation.html:205 software/templates/features.html:442
 msgid "Body weight"
 msgstr "Вес тела"
 
-#: core/templates/navigation.html:210 core/templates/user/overview.html:114
+#: core/templates/navigation.html:212 core/templates/user/overview.html:114
 msgid "Weight overview"
 msgstr "Обзор веса"
 
-#: core/templates/navigation.html:217 weight/views.py:65
+#: core/templates/navigation.html:216 weight/views.py:65
 msgid "Add weight entry"
 msgstr "Добавить запись веса"
 
-#: core/templates/navigation.html:231
+#: core/templates/navigation.html:230
 msgid "About this software"
 msgstr "Об этой программе"
 
-#: core/templates/navigation.html:237 software/templates/about_us.html:5
+#: core/templates/navigation.html:236 software/templates/about_us.html:5
 msgid "About us"
 msgstr "О нас"
 
-#: core/templates/navigation.html:243 software/templates/features.html:507
+#: core/templates/navigation.html:242 software/templates/features.html:507
 msgid "REST API"
 msgstr "REST API"
 
-#: core/templates/navigation.html:249 utils/models.py:45
+#: core/templates/navigation.html:248 utils/models.py:45
 msgid "License"
 msgstr "Лицензия"
 
-#: core/templates/navigation.html:255
+#: core/templates/navigation.html:254
 msgid "Developer documentation"
 msgstr "Документация для разработчиков"
 
-#: core/templates/navigation.html:262
+#: core/templates/navigation.html:261
 msgid "Get the code"
 msgstr "Получить код"
 
-#: core/templates/navigation.html:269 core/templates/template.html:214
+#: core/templates/navigation.html:268 core/templates/template.html:227
 #: software/templates/features.html:582
 msgid "Translate"
 msgstr "Перевести"
 
-#: core/templates/navigation.html:303 core/templates/user/login.html:28
+#: core/templates/navigation.html:302 core/templates/user/login.html:28
 msgid "Reset password"
 msgstr "Восстановить пароль"
 
-#: core/templates/navigation.html:321
+#: core/templates/navigation.html:320
 msgid "My preferences"
 msgstr "Мои настройки"
 
-#: core/templates/navigation.html:330
+#: core/templates/navigation.html:329
 msgid "Logout"
 msgstr "Выйти"
 
-#: core/templates/navigation.html:353
+#: core/templates/navigation.html:352
 msgid "Licenses"
 msgstr "Лицензии"
 
-#: core/templates/navigation.html:361
+#: core/templates/navigation.html:360
 #: core/templates/repetition_unit/list.html:4
 msgid "Repetition units"
 msgstr "Единицы повторения"
 
-#: core/templates/navigation.html:369 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:368 core/templates/weight_unit/list.html:4
 #: nutrition/templates/ingredient/view.html:141
 msgid "Weight units"
 msgstr "Единицы веса"
 
-#: core/templates/navigation.html:377 core/templates/user/list.html:4
+#: core/templates/navigation.html:376 core/templates/user/list.html:4
 msgid "User list"
 msgstr "Список пользователей"
 
-#: core/templates/navigation.html:383
+#: core/templates/navigation.html:382
 msgid "Gyms"
 msgstr "Тренажерные залы"
 
@@ -898,58 +884,32 @@ msgstr "предыдущий"
 msgid "next"
 msgstr "следующий"
 
-#: core/templates/tags/render_day.html:34
-msgid "Add weight log"
-msgstr "Добавить журнал веса"
-
-#: core/templates/tags/render_day.html:116
-msgid "Placeholder image for exercise"
+#: core/templates/tags/render_day.html:44
+#, fuzzy
+#| msgid "Placeholder image for exercise"
+msgid "Placeholder image for translation"
 msgstr "Заполнитель изображения для упражнения"
 
-#: core/templates/tags/render_day.html:133
-msgid "This exercise has no repetitions."
-msgstr "Это упражнение не имеет повторений."
-
-#: core/templates/tags/render_day.html:136
-msgid "Edit them now."
-msgstr "Измените их сейчас."
-
-#: core/templates/tags/render_day.html:162
-msgid "Add exercises to this workout day"
-msgstr "Добавить упражнения к этому тренировочному дню"
-
-#: core/templates/tags/render_weight_log.html:17 manager/helpers.py:86
-#: manager/models/setting.py:72 manager/templates/set/formset.html:9
-msgid "Reps"
-msgstr "Повтор"
-
-#: core/templates/tags/render_weight_log.html:30 manager/forms.py:191
-#: manager/models/log.py:103 manager/models/setting.py:102
-#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
-#, fuzzy
-msgid "RiR"
-msgstr "ПвЗ"
-
-#: core/templates/template.html:122 manager/templates/calendar/month.html:138
-#: manager/templates/schedule/view.html:248
-#: manager/templates/schedule/view.html:269
-#: manager/templates/workout/view.html:84
-#: manager/templates/workout/view.html:137
+#: core/templates/template.html:124 manager/templates/calendar/month.html:138
+#: manager/templates/schedule/view.html:262
+#: manager/templates/schedule/view.html:287
+#: manager/templates/workout/view.html:89
+#: manager/templates/workout/view.html:149
 msgid "Close"
 msgstr "Закрыть"
 
-#: core/templates/template.html:138
+#: core/templates/template.html:140
 msgid ""
 "You are using a guest account, data entered will be deleted after a week."
 msgstr ""
 "Вы используете аккаунт для гостей, введенные данные будут удалены через "
 "неделю."
 
-#: core/templates/template.html:143
+#: core/templates/template.html:145
 msgid "Create some demo entries"
 msgstr "Создайте демо-записи"
 
-#: core/templates/template.html:180 software/templates/features.html:547
+#: core/templates/template.html:193 software/templates/features.html:547
 #: software/templates/tos.html:7
 msgid "Terms of service"
 msgstr "Условия обслуживания"
@@ -958,7 +918,7 @@ msgstr "Условия обслуживания"
 msgid "Features"
 msgstr "Особенности"
 
-#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:54
+#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:59
 msgid "API key"
 msgstr "Ключ API"
 
@@ -1003,17 +963,17 @@ msgstr "Сгенерировать новый API ключ"
 msgid "Documentation"
 msgstr "Документация"
 
-#: core/templates/user/delete_account.html:4
-#: core/templates/user/preferences.html:59
+#: core/templates/user/delete_account.html:3
+#: core/templates/user/preferences.html:62
 msgid "Delete account"
 msgstr "Удалить аккаунт"
 
-#: core/templates/user/delete_account.html:17
+#: core/templates/user/delete_account.html:9
 #: exercises/templates/history/overview.html:93
 msgid "Are you sure?"
 msgstr "Вы уверены?"
 
-#: core/templates/user/delete_account.html:22
+#: core/templates/user/delete_account.html:14
 #, python-format
 msgid ""
 "This action will delete the user account \"%(username)s\".\n"
@@ -1037,22 +997,22 @@ msgstr "Забыли пароль?"
 
 #: core/templates/user/overview.html:25 core/templates/user/overview.html:68
 #: core/templates/user/overview.html:112 core/templates/user/overview.html:144
-#: core/templates/user/overview.html:330 core/templates/user/overview.html:369
-#: core/templates/user/overview.html:405
+#: core/templates/user/overview.html:348 core/templates/user/overview.html:390
+#: core/templates/user/overview.html:426
 #, python-format
 msgid "last %(number)s"
 msgstr "Последние %(number)s"
 
 #: core/templates/user/overview.html:27 core/templates/user/overview.html:146
-#: core/templates/user/overview.html:325 core/templates/user/overview.html:364
-#: core/templates/user/overview.html:400 gym/templates/gym/member_list.html:210
-#: gym/templates/gym/member_list.html:243
-#: gym/templates/gym/member_list.html:280
+#: core/templates/user/overview.html:343 core/templates/user/overview.html:382
+#: core/templates/user/overview.html:421 gym/templates/gym/member_list.html:226
+#: gym/templates/gym/member_list.html:262
+#: gym/templates/gym/member_list.html:302
 msgid "Overview"
 msgstr "Обзор"
 
 #: core/templates/user/overview.html:28
-#: manager/templates/schedule/view.html:163
+#: manager/templates/schedule/view.html:172
 #: manager/templates/workout/overview.html:39 manager/views/schedule_step.py:60
 msgid "Add workout"
 msgstr "Добавить тренировку"
@@ -1084,38 +1044,36 @@ msgstr "Описание"
 msgid "Number of logs (days)"
 msgstr "Количество записей (дней)"
 
-#: core/templates/user/overview.html:37 core/views/user.py:600
+#: core/templates/user/overview.html:37 core/views/user.py:599
 #: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:158
 msgid "Last activity"
 msgstr "Последние действия"
 
 #: core/templates/user/overview.html:58
 #: manager/templates/calendar/month.html:128
-#: manager/templates/schedule/view.html:144
 #: manager/templates/workout/overview.html:28
 msgid "No workouts found."
 msgstr "Тренировок не найдено."
 
 #: core/templates/user/overview.html:68 manager/forms.py:280
-#: manager/templates/workout/view.html:106
+#: manager/templates/workout/view.html:114
 msgid "Log"
 msgstr "Журнал"
 
 #: core/templates/user/overview.html:77 manager/models/session.py:83
-#: manager/templates/calendar/partial_overview_table.html:52
+#: manager/templates/calendar/partial_overview_table.html:54
 msgid "General impression"
 msgstr "Общее впечатление"
 
-#: core/templates/user/overview.html:78 core/templates/user/overview.html:369
+#: core/templates/user/overview.html:78 core/templates/user/overview.html:390
 #: manager/models/session.py:73
-#: manager/templates/calendar/partial_overview_table.html:56
-#: manager/templates/workout/log.html:89
+#: manager/templates/calendar/partial_overview_table.html:58
 msgid "Notes"
 msgstr "Заметки"
 
 #: core/templates/user/overview.html:79
 #: exercises/templates/history/overview.html:30
-#: manager/templates/calendar/partial_overview_table.html:42
+#: manager/templates/calendar/partial_overview_table.html:44
 msgid "Time"
 msgstr "Время"
 
@@ -1153,121 +1111,121 @@ msgstr "Жиры"
 msgid "kcal"
 msgstr "ккал"
 
-#: core/templates/user/overview.html:201 core/templates/user/overview.html:322
-#: core/templates/user/overview.html:361 core/templates/user/overview.html:397
-#: core/templates/user/overview.html:442 gym/templates/gym/list.html:42
-#: gym/templates/gym/member_list.html:84 gym/templates/gym/member_list.html:137
-#: gym/templates/gym/member_list.html:173
-#: gym/templates/gym/member_list.html:207
-#: gym/templates/gym/member_list.html:240
-#: gym/templates/gym/member_list.html:277
-#: manager/templates/schedule/view.html:100
+#: core/templates/user/overview.html:201 core/templates/user/overview.html:340
+#: core/templates/user/overview.html:379 core/templates/user/overview.html:418
+#: core/templates/user/overview.html:463 gym/templates/gym/list.html:45
+#: gym/templates/gym/member_list.html:91 gym/templates/gym/member_list.html:149
+#: gym/templates/gym/member_list.html:187
+#: gym/templates/gym/member_list.html:223
+#: gym/templates/gym/member_list.html:259
+#: gym/templates/gym/member_list.html:299
+#: manager/templates/schedule/view.html:99
 msgid "Actions"
 msgstr "Действия"
 
-#: core/templates/user/overview.html:207
+#: core/templates/user/overview.html:210
 msgid "Deactivate user"
 msgstr "Деактивировать пользователя"
 
-#: core/templates/user/overview.html:209
+#: core/templates/user/overview.html:214
 msgid "Activate user"
 msgstr "Активировать пользователя"
 
-#: core/templates/user/overview.html:211
+#: core/templates/user/overview.html:223
 msgid "Reset user password"
 msgstr "Сброс пароля пользователя"
 
-#: core/templates/user/overview.html:214 gym/templates/gym/member_list.html:30
+#: core/templates/user/overview.html:227 gym/templates/gym/member_list.html:30
 msgid "Roles"
 msgstr "Роли"
 
-#: core/templates/user/overview.html:225
+#: core/templates/user/overview.html:243
 msgid "Password reset confirmation"
 msgstr "Подтверждение восстановления пароля"
 
-#: core/templates/user/overview.html:229
+#: core/templates/user/overview.html:247
 msgid "Do you really want to change this user&#39;s password?"
 msgstr "Вы действительно хотите изменить пароль этого пользователя?"
 
-#: core/templates/user/overview.html:232
+#: core/templates/user/overview.html:250
 #: exercises/templates/history/overview.html:106
 msgid "No"
 msgstr "Нет"
 
-#: core/templates/user/overview.html:233
+#: core/templates/user/overview.html:251
 #: exercises/templates/history/overview.html:99
 msgid "Yes"
 msgstr "Да"
 
-#: core/templates/user/overview.html:254 gym/templates/gym/member_list.html:93
+#: core/templates/user/overview.html:272 gym/templates/gym/member_list.html:105
 msgid "Details"
 msgstr "Детали"
 
-#: core/templates/user/overview.html:258 gym/views/export.py:57
-#: manager/helpers.py:86 manager/templates/schedule/view.html:98
+#: core/templates/user/overview.html:276 gym/views/export.py:57
+#: manager/helpers.py:86 manager/templates/schedule/view.html:97
 msgid "Nr."
 msgstr "№"
 
-#: core/templates/user/overview.html:280 gym/models/contract.py:287
+#: core/templates/user/overview.html:298 gym/models/contract.py:287
 #: gym/models/gym.py:50 gym/templates/contract/view.html:75
-#: gym/templates/gym/member_list.html:100 gym/views/export.py:68
+#: gym/templates/gym/member_list.html:112 gym/views/export.py:68
 msgid "Phone"
 msgstr "Телефон"
 
-#: core/templates/user/overview.html:284 gym/templates/contract/view.html:87
-#: gym/templates/gym/member_list.html:118
+#: core/templates/user/overview.html:302 gym/templates/contract/view.html:87
+#: gym/templates/gym/member_list.html:130
 msgid "Address"
 msgstr "Адрес"
 
-#: core/templates/user/overview.html:295
+#: core/templates/user/overview.html:313
 msgid "Registered"
 msgstr "Зарегистрировано"
 
-#: core/templates/user/overview.html:299
+#: core/templates/user/overview.html:317
 msgid "Last login"
 msgstr "Последний вход"
 
-#: core/templates/user/overview.html:304
+#: core/templates/user/overview.html:322
 msgid "Status"
 msgstr "Статус"
 
-#: core/templates/user/overview.html:307
+#: core/templates/user/overview.html:325
 msgid "Active"
 msgstr "Активные"
 
-#: core/templates/user/overview.html:309
+#: core/templates/user/overview.html:327
 msgid "Inactive"
 msgstr "Неактивные"
 
-#: core/templates/user/overview.html:330 gym/templates/contract/list.html:4
-#: gym/templates/gym/member_list.html:202
+#: core/templates/user/overview.html:348 gym/templates/contract/list.html:4
+#: gym/templates/gym/member_list.html:218
 msgid "Contracts"
 msgstr "Контакты"
 
-#: core/templates/user/overview.html:405 gym/templates/document/list.html:4
+#: core/templates/user/overview.html:426 gym/templates/document/list.html:4
 msgid "Documents"
 msgstr "Документы"
 
-#: core/templates/user/overview.html:412 gym/templates/document/list.html:32
-#: manager/forms.py:292 manager/templates/workout/view.html:132
+#: core/templates/user/overview.html:433 gym/templates/document/list.html:33
+#: manager/forms.py:292 manager/templates/workout/view.html:143
 msgid "Download"
 msgstr "Загрузка"
 
-#: core/templates/user/overview.html:450 gym/views/admin_config.py:44
+#: core/templates/user/overview.html:474 gym/views/admin_config.py:44
 #: gym/views/admin_config.py:58 gym/views/user_config.py:46
 msgid "Configuration"
 msgstr "Конфигурация"
 
-#: core/templates/user/overview.html:453 gym/models/user_config.py:92
+#: core/templates/user/overview.html:477 gym/models/user_config.py:92
 msgid "Include in inactive overview"
 msgstr "Включить в обзор неактивных"
 
-#: core/templates/user/overview.html:486
+#: core/templates/user/overview.html:510
 #, python-format
 msgid "Admin login is only available for users in %(gym_name)s"
 msgstr "Вход администратора доступен только для пользователей в %(gym_name)s"
 
-#: core/templates/user/overview.html:490
+#: core/templates/user/overview.html:514
 msgid "Log in as this user"
 msgstr "Войти в систему как этот пользователь"
 
@@ -1289,19 +1247,19 @@ msgstr ""
 msgid "Send verification email"
 msgstr ""
 
-#: core/templates/user/preferences.html:30
+#: core/templates/user/preferences.html:31
 msgid "You need to verify your email to contribute exercises"
 msgstr ""
 
-#: core/templates/user/preferences.html:50 core/views/user.py:611
+#: core/templates/user/preferences.html:55 core/views/user.py:610
 msgid "Change password"
 msgstr "Изменить"
 
-#: core/templatetags/wger_extras.py:205 i18n.tpl:37
+#: core/templatetags/wger_extras.py:197 i18n.tpl:37
 msgid "kg"
 msgstr "кг"
 
-#: core/templatetags/wger_extras.py:207
+#: core/templatetags/wger_extras.py:199
 #: nutrition/templates/ingredient/view.html:60
 #: nutrition/templates/ingredient/view.html:66
 #: nutrition/templates/ingredient/view.html:73
@@ -1313,11 +1271,11 @@ msgctxt "weight unit, i.e. grams"
 msgid "g"
 msgstr "г"
 
-#: core/templatetags/wger_extras.py:210 i18n.tpl:38
+#: core/templatetags/wger_extras.py:202 i18n.tpl:38
 msgid "lb"
 msgstr "lb"
 
-#: core/templatetags/wger_extras.py:212
+#: core/templatetags/wger_extras.py:204
 msgctxt "weight unit, i.e. ounces"
 msgid "oz"
 msgstr "oz"
@@ -1344,13 +1302,13 @@ msgid "Delete {0}?"
 msgstr "Удалить {0}?"
 
 #: core/views/languages.py:111 core/views/license.py:85
-#: core/views/repetition_units.py:86 core/views/user.py:474
+#: core/views/repetition_units.py:86 core/views/user.py:473
 #: core/views/weight_units.py:86 exercises/views/categories.py:98
 #: exercises/views/equipment.py:81 exercises/views/muscles.py:87
 #: gym/views/admin_notes.py:161 gym/views/config.py:68
 #: gym/views/contract.py:186 gym/views/contract_option.py:123
 #: gym/views/contract_type.py:123 gym/views/document.py:171
-#: gym/views/gym.py:463 manager/views/day.py:100 manager/views/schedule.py:333
+#: gym/views/gym.py:463 manager/views/day.py:96 manager/views/schedule.py:333
 #: manager/views/workout.py:267 nutrition/views/ingredient.py:145
 #: nutrition/views/unit.py:143
 #, python-brace-format
@@ -1379,48 +1337,48 @@ msgstr "Отправить"
 msgid "Your feedback was successfully sent. Thank you!"
 msgstr "Ваш отзыв был успешно отправлен. Спасибо!"
 
-#: core/views/user.py:156
+#: core/views/user.py:155
 #, python-brace-format
 msgid "Account \"{0}\" was successfully deleted"
 msgstr "Аккаунт \"{0}\" успешно удален"
 
-#: core/views/user.py:292
+#: core/views/user.py:291
 msgid "You were successfully registered"
 msgstr "Вы были успешно зарегистрированы"
 
-#: core/views/user.py:351
+#: core/views/user.py:350
 msgid "Settings successfully updated"
 msgstr "Настройки успешно обновлены"
 
-#: core/views/user.py:390
+#: core/views/user.py:389
 msgid "The user was successfully deactivated"
 msgstr "Пользователь был успешно отключен"
 
-#: core/views/user.py:427
+#: core/views/user.py:426
 msgid "The user was successfully activated"
 msgstr "Пользователь был успешно активирован"
 
-#: core/views/user.py:442
+#: core/views/user.py:441
 msgid "Edit user"
 msgstr "Редактирование пользователя"
 
-#: core/views/user.py:597 gym/templates/gym/member_list.html:26
+#: core/views/user.py:596 gym/templates/gym/member_list.html:26
 #: gym/views/gym.py:158
 msgid "ID"
 msgstr "Идентификация"
 
-#: core/views/user.py:598 gym/forms.py:95 gym/templates/contract/view.html:55
+#: core/views/user.py:597 gym/forms.py:95 gym/templates/contract/view.html:55
 #: gym/templates/gym/member_list.html:27 gym/views/export.py:59
 #: gym/views/gym.py:158 gym/views/gym.py:217
 msgid "Username"
 msgstr "Имя пользователя"
 
-#: core/views/user.py:601 gym/templates/gym/new_user.html:34
+#: core/views/user.py:600 gym/templates/gym/new_user.html:34
 #: gym/views/export.py:58 gym/views/gym.py:217
 msgid "Gym"
 msgstr "Тренажерный зал"
 
-#: core/views/user.py:660
+#: core/views/user.py:659
 #, python-format
 msgid "A verification email was sent to %(email)s"
 msgstr ""
@@ -1580,11 +1538,6 @@ msgstr "Кодек, длинное название"
 msgid "Equipment list"
 msgstr "Перечень оборудования"
 
-#: exercises/templates/equipment/admin-overview.html:39
-#: exercises/views/equipment.py:92
-msgid "Add new equipment"
-msgstr "Добавить новое оборудование"
-
 #: exercises/templates/history/overview.html:11
 #, fuzzy
 #| msgid "Exercise day"
@@ -1644,11 +1597,6 @@ msgstr ""
 msgid "Muscle overview"
 msgstr "Обзор мыщц"
 
-#: exercises/templates/muscles/admin-overview.html:38
-#: exercises/views/muscles.py:68
-msgid "Add muscle"
-msgstr "Добавить мышцу"
-
 #: exercises/views/categories.py:72
 msgid "Add category"
 msgstr "Добавить категорию"
@@ -1657,6 +1605,10 @@ msgstr "Добавить категорию"
 msgid "This will also delete all exercises in this category."
 msgstr "Это также удалит все упражнения в этой категории."
 
+#: exercises/views/equipment.py:92
+msgid "Add new equipment"
+msgstr "Добавить новое оборудование"
+
 #: exercises/views/equipment.py:104 exercises/views/equipment.py:115
 msgid "Delete equipment?"
 msgstr "Удалить оборудование?"
@@ -1665,6 +1617,10 @@ msgstr "Удалить оборудование?"
 msgid "This will delete the exercise from all workouts."
 msgstr "Это удалит упражнение из всех тренировок."
 
+#: exercises/views/muscles.py:68
+msgid "Add muscle"
+msgstr "Добавить мышцу"
+
 #: gallery/templates/images/overview.html:62
 msgid "Add image"
 msgstr "Добавить изображение"
@@ -1752,7 +1708,7 @@ msgid "Contract is active"
 msgstr "Контракт активен"
 
 #: gym/models/contract.py:237 gym/templates/contract/view.html:69
-#: manager/models/schedule.py:61 manager/templates/schedule/view.html:67
+#: manager/models/schedule.py:61 manager/templates/schedule/view.html:66
 msgid "Start date"
 msgstr "Дата начала"
 
@@ -1788,7 +1744,7 @@ msgstr "Администратор: может управлять пользов
 msgid "Admin: can administrate the different gyms"
 msgstr "Администратор: может управлять различными залами"
 
-#: gym/models/gym.py:65 gym/templates/gym/member_list.html:114
+#: gym/models/gym.py:65 gym/templates/gym/member_list.html:126
 msgid "Owner"
 msgstr "Владелец"
 
@@ -1800,7 +1756,7 @@ msgstr ""
 "Количество недель отсутствия пользователя, по истечению которых его "
 "присутствие будет считаться неактивным"
 
-#: gym/models/gym_config.py:56 gym/templates/gym/member_list.html:152
+#: gym/models/gym_config.py:56 gym/templates/gym/member_list.html:166
 msgid "Show name in header"
 msgstr "Показывать имя в заголовке"
 
@@ -1814,7 +1770,7 @@ msgstr "Показывать название зала в шапке сайта"
 msgid "Configuration for {self.gym.name}"
 msgstr "Конфигурация для {}"
 
-#: gym/models/user_config.py:65 gym/templates/gym/member_list.html:184
+#: gym/models/user_config.py:65 gym/templates/gym/member_list.html:200
 msgid "Overview of inactive members"
 msgstr "Обзор неактивных членов"
 
@@ -1838,7 +1794,7 @@ msgstr "Будет использоваться имя файла, если ни
 msgid "User notes"
 msgstr "Заметки пользователя"
 
-#: gym/templates/contract/list.html:36
+#: gym/templates/contract/list.html:34
 msgid "Show"
 msgstr "Показать"
 
@@ -1866,11 +1822,11 @@ msgstr ""
 msgid "Gym list"
 msgstr "Список тренажерного зала"
 
-#: gym/templates/gym/list.html:50
+#: gym/templates/gym/list.html:53
 msgid "Global gym configuration"
 msgstr "Глобальная настройка тренажерного зала"
 
-#: gym/templates/gym/list.html:67 gym/views/gym.py:171
+#: gym/templates/gym/list.html:69 gym/views/gym.py:171
 msgid "Add new gym"
 msgstr "Добавить новый тренажерный зал"
 
@@ -1882,43 +1838,43 @@ msgstr "Администраторы и тренеры"
 msgid "Gym manager"
 msgstr "Менеджер тренажерного зала"
 
-#: gym/templates/gym/member_list.html:69
+#: gym/templates/gym/member_list.html:76
 msgid "This gym has no administrators or trainers"
 msgstr "Этот зал не имеет администраторов или тренеров"
 
-#: gym/templates/gym/member_list.html:88
+#: gym/templates/gym/member_list.html:98
 msgid "Export"
 msgstr "Экспорт"
 
-#: gym/templates/gym/member_list.html:125
+#: gym/templates/gym/member_list.html:137
 msgid "Members"
 msgstr "Члены"
 
-#: gym/templates/gym/member_list.html:145
+#: gym/templates/gym/member_list.html:159
 msgid "Gym configuration"
 msgstr "Конфигурация тренажерного зала"
 
-#: gym/templates/gym/member_list.html:148
+#: gym/templates/gym/member_list.html:162
 msgid "Inactive members"
 msgstr "Неактивные члены"
 
-#: gym/templates/gym/member_list.html:149
+#: gym/templates/gym/member_list.html:163
 msgid "weeks"
 msgstr "недели"
 
-#: gym/templates/gym/member_list.html:181
+#: gym/templates/gym/member_list.html:197
 msgid "My configuration"
 msgstr "Моя настройка"
 
-#: gym/templates/gym/member_list.html:215
+#: gym/templates/gym/member_list.html:234
 msgid "Types"
 msgstr "Типы"
 
-#: gym/templates/gym/member_list.html:285
+#: gym/templates/gym/member_list.html:307
 msgid "Emails"
 msgstr "Электронные почты"
 
-#: gym/templates/gym/member_list.html:315
+#: gym/templates/gym/member_list.html:336
 msgid "Add member"
 msgstr "Добавить члена"
 
@@ -2227,28 +2183,39 @@ msgstr "Компоненты также на английском языке"
 msgid "Unit"
 msgstr "Секция"
 
+#: manager/forms.py:191 manager/models/log.py:103 manager/models/setting.py:102
+#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
+#, fuzzy
+msgid "RiR"
+msgstr "ПвЗ"
+
 #: manager/forms.py:279
 msgid "Type"
 msgstr "Тип"
 
-#: manager/forms.py:280 manager/templates/workout/view.html:113
+#: manager/forms.py:280 manager/templates/workout/view.html:122
 msgid "Table"
 msgstr "Таблица"
 
-#: manager/forms.py:282 manager/templates/workout/view.html:119
+#: manager/forms.py:282 manager/templates/workout/view.html:129
 msgid "with images"
 msgstr "с изображениями"
 
-#: manager/forms.py:283 manager/templates/workout/view.html:125
+#: manager/forms.py:283 manager/templates/workout/view.html:136
 msgid "with comments"
 msgstr "с комментариями"
 
+#: manager/helpers.py:86 manager/models/setting.py:72
+#: manager/templates/set/formset.html:9
+msgid "Reps"
+msgstr "Повтор"
+
 #: manager/management/commands/email-reminders.py:121
 msgid "Workout will expire soon"
 msgstr "Срок этой тренировки скоро истечет"
 
 #: manager/models/day.py:34 manager/models/log.py:58
-#: manager/models/session.py:60 manager/templates/schedule/view.html:102
+#: manager/models/session.py:60 manager/templates/schedule/view.html:101
 #: manager/templates/workout/view.html:9 manager/templates/workout/view.html:17
 #: manager/views/pdf.py:85 manager/views/pdf.py:161
 #: manager/views/schedule.py:151 manager/views/schedule.py:221
@@ -2271,7 +2238,7 @@ msgstr "День"
 msgid "Name or short description of the schedule. For example 'Program XYZ'."
 msgstr "Название или короткое описание программы. Например 'Программа XYZ'."
 
-#: manager/models/schedule.py:65 manager/templates/schedule/view.html:71
+#: manager/models/schedule.py:65 manager/templates/schedule/view.html:70
 msgid "Schedule active"
 msgstr "Программа активна"
 
@@ -2285,7 +2252,7 @@ msgstr ""
 "показана, например, на вашей панели инструментов). Все остальные программы "
 "будут помечены как неактивные"
 
-#: manager/models/schedule.py:77 manager/templates/schedule/view.html:81
+#: manager/models/schedule.py:77 manager/templates/schedule/view.html:80
 msgid "Is a loop"
 msgstr "Является циклом"
 
@@ -2306,7 +2273,7 @@ msgid "The duration in weeks"
 msgstr "Длительность в неделях"
 
 #: manager/models/schedule_step.py:64 manager/models/set.py:53
-#: manager/models/setting.py:113 nutrition/models/meal.py:55
+#: manager/models/setting.py:113 nutrition/models/meal.py:53
 #: nutrition/models/meal_item.py:66
 msgid "Order"
 msgstr "Порядок"
@@ -2445,7 +2412,7 @@ msgstr "Обзор журналов"
 msgid "Workout session"
 msgstr "Тренировка"
 
-#: manager/templates/calendar/partial_overview_table.html:27
+#: manager/templates/calendar/partial_overview_table.html:26
 msgid "Delete with logs"
 msgstr "Удалить с журналами"
 
@@ -2468,21 +2435,27 @@ msgstr ""
 "выбранной даты уже не существует один. Если есть, он просто будет "
 "редактироваться. Записи весов всегда добавляются."
 
-#: manager/templates/schedule/overview.html:5
+#: manager/templates/schedule/overview.html:4
 msgid "Your schedules"
 msgstr "Ваши программы"
 
 #: manager/templates/schedule/overview.html:19
-#: manager/templates/schedule/view.html:131
-#: manager/templates/schedule/view.html:183
+#: manager/templates/schedule/view.html:143
+#: manager/templates/schedule/view.html:193
 #: manager/templates/workout/overview.html:16
 msgid "active"
 msgstr "активные"
 
-#: manager/templates/schedule/overview.html:28
+#: manager/templates/schedule/overview.html:27
 msgid "No schedules found."
 msgstr "Программ не найдено."
 
+#: manager/templates/schedule/overview.html:28
+#, fuzzy
+#| msgid "Add one now."
+msgid "Add one now"
+msgstr "Добавить одну сейчас."
+
 #: manager/templates/schedule/overview.html:36
 #, fuzzy
 #| msgid ""
@@ -2505,13 +2478,14 @@ msgid ""
 "        before jumping to the next. It is also possible to create a loop, so "
 "you\n"
 "        always do the same workouts in succession, e.g. A > B > C > A > B > "
-"C and so on."
+"C and so\n"
+"        on."
 msgstr ""
 "Вы можете указать продолжительность каждой тренировки, перед тем как перейти "
 "к следующей. Также можно создать цикл, для того, чтобы выполнять одинаковые "
 "тренировки подряд, например A > B > C > A > B > C и т.д."
 
-#: manager/templates/schedule/overview.html:43
+#: manager/templates/schedule/overview.html:44
 #, fuzzy
 #| msgid ""
 #| "The currently active schedule will remain active (and be\n"
@@ -2536,7 +2510,7 @@ msgstr "Добавить тренировку"
 msgid "Schedule"
 msgstr "Программа"
 
-#: manager/templates/schedule/view.html:85
+#: manager/templates/schedule/view.html:84
 msgid ""
 "This schedule is a loop and will go through the workouts above till you "
 "deactivate it"
@@ -2544,19 +2518,19 @@ msgstr ""
 "Это программа - бесконечный цикл и будет повторяться до тех пор, пока Вы ее "
 "не отключите"
 
-#: manager/templates/schedule/view.html:103
+#: manager/templates/schedule/view.html:102
 msgid "Weeks"
 msgstr "Недели"
 
-#: manager/templates/schedule/view.html:115
+#: manager/templates/schedule/view.html:114
 msgid "Move me"
 msgstr "Переместите меня"
 
-#: manager/templates/schedule/view.html:156
+#: manager/templates/schedule/view.html:168
 msgid "Start schedule"
 msgstr "Начать программу тренировок"
 
-#: manager/templates/schedule/view.html:187
+#: manager/templates/schedule/view.html:197
 #, fuzzy, python-format
 #| msgid ""
 #| "%(weeks)s Week\n"
@@ -2583,11 +2557,11 @@ msgstr[3] ""
 "%(weeks)s Недель\n"
 "                    "
 
-#: manager/templates/schedule/view.html:221
+#: manager/templates/schedule/view.html:231
 msgid "Adding workouts"
 msgstr "Добавляю тренировки"
 
-#: manager/templates/schedule/view.html:223
+#: manager/templates/schedule/view.html:233
 #, fuzzy
 #| msgid ""
 #| "Add as many workouts to the schedule as you want. You can\n"
@@ -2604,21 +2578,21 @@ msgstr ""
 "изменить порядок, перетаскивая их. Также можно добавлять одну тренировку "
 "несколько раз."
 
-#: manager/templates/schedule/view.html:232
-#: manager/templates/schedule/view.html:243
-#: manager/templates/schedule/view.html:290
+#: manager/templates/schedule/view.html:242
+#: manager/templates/schedule/view.html:256
+#: manager/templates/schedule/view.html:310
 #: manager/templates/workout/view.html:69
-#: manager/templates/workout/view.html:79
-#: manager/templates/workout/view.html:178
+#: manager/templates/workout/view.html:83
+#: manager/templates/workout/view.html:192
 msgid "Export calendar file"
 msgstr "Экспортировать файл календаря"
 
-#: manager/templates/schedule/view.html:236
+#: manager/templates/schedule/view.html:248
 msgid "Export this schedule as a calendar file."
 msgstr "Экспортируйте расписание в файл календаря."
 
-#: manager/templates/schedule/view.html:237
-#: manager/templates/workout/view.html:74
+#: manager/templates/schedule/view.html:249
+#: manager/templates/workout/view.html:76
 #, fuzzy
 #| msgid ""
 #| "You can then import the file it into your calendar\n"
@@ -2630,27 +2604,20 @@ msgid ""
 "                        application for example google calendar, outlook or "
 "iCal. This will create\n"
 "                        an appointment for each training day with the "
-"appropriate exercises."
+"appropriate\n"
+"                        exercises."
 msgstr ""
 "Этот файл можно затем импортировать в приложение Календарь, например google "
 "календарь, outlook или iCal. Это позволит создать расписание на каждый "
 "тренировочный день с соответствующими упражнениями."
 
-#: manager/templates/schedule/view.html:258
-#: manager/templates/schedule/view.html:294
-#: manager/templates/workout/view.html:94
-#: manager/templates/workout/view.html:174
+#: manager/templates/schedule/view.html:272
+#: manager/templates/schedule/view.html:315
+#: manager/templates/workout/view.html:99
+#: manager/templates/workout/view.html:188
 msgid "Download as PDF"
 msgstr "Скачать в формате PDF"
 
-#: manager/templates/schedule/view.html:299
-msgid "Edit schedule"
-msgstr "Отредактировать программу"
-
-#: manager/templates/schedule/view.html:304
-msgid "Delete schedule"
-msgstr "Удалить программу"
-
 #: manager/templates/set/add.html:9
 #, python-format
 msgid "Add exercises to day \"%(day_name)s\""
@@ -2728,56 +2695,6 @@ msgstr ""
 "Вы будете регулярно получать такие напоминания, пока не укажете свой текущий "
 "вес."
 
-#: manager/templates/workout/log.html:10 manager/templates/workout/log.html:11
-msgid "Weight log"
-msgstr "Регистрация веса"
-
-#: manager/templates/workout/log.html:29
-msgid "Weight log for workout"
-msgstr "Регистрация веса для тренировки"
-
-#: manager/templates/workout/log.html:49
-msgid "Add weight log to this day"
-msgstr "Добавить запись веса к этому дню"
-
-#: manager/templates/workout/log.html:69
-msgid "No weight entries here."
-msgstr "Здесь нет записей веса."
-
-#: manager/templates/workout/log.html:77
-msgid "No exercises for this day."
-msgstr "Для этого дня упражнений нет."
-
-#: manager/templates/workout/log.html:90
-msgid ""
-"This page shows the weight logs belonging to this workout\n"
-"only. Click on an exercise to see all the historical data for\n"
-"it."
-msgstr ""
-"Эта страница показывает журнал веса только для этой тренировки. Нажмите на "
-"упражнение для показа его предыдущих данных."
-
-#: manager/templates/workout/log.html:94
-msgid ""
-"If on a single day there is more than one entry with the\n"
-"same number of repetitions, but different weights, only the entry with the\n"
-"higher weight is shown in the diagram."
-msgstr ""
-"Если на один день приходится больше одной записи с одинаковым количеством "
-"повторений, но разными тяжестями, то на графике будет показана только запись "
-"с большим весом."
-
-#: manager/templates/workout/log.html:98
-msgid ""
-"Note that only entries with a weight unit (kg or lb) and\n"
-"repetitions are charted, other combinations such as time or until failure\n"
-"are ignored here."
-msgstr ""
-"Обратите внимание, что только записи с единицей веса (кг или фунт) и\n"
-"повторений отображаются на графике. Другие комбинации, такие как время или "
-"до отказа\n"
-"игнорируются."
-
 #: manager/templates/workout/overview.html:25
 msgid "No templates found."
 msgstr "Шаблоны не найдены."
@@ -2815,27 +2732,23 @@ msgstr "Добавить наборы подходов к тренировочн
 msgid "Set the repetitions for each set"
 msgstr "Установить повторения к каждому подходу"
 
-#: manager/templates/workout/view.html:73
+#: manager/templates/workout/view.html:75
 msgid "Export this workout as a calendar file."
 msgstr "Экспортировать тренировку в формате календаря."
 
-#: manager/templates/workout/view.html:144
+#: manager/templates/workout/view.html:156
 msgid "Logs"
 msgstr "Журналы"
 
-#: manager/templates/workout/view.html:146
+#: manager/templates/workout/view.html:159
 msgid "View logs"
 msgstr "Просмотр журналов"
 
-#: manager/templates/workout/view.html:169 manager/views/schedule_step.py:99
-msgid "Edit workout"
-msgstr "Изменить тренировку"
-
-#: manager/templates/workout/view.html:182 manager/views/workout.py:281
+#: manager/templates/workout/view.html:195 manager/views/workout.py:281
 msgid "Mark as template"
 msgstr "Пометить как шаблон"
 
-#: manager/views/day.py:109
+#: manager/views/day.py:105
 msgid "Add workout day"
 msgstr "Добавить тренировочный день"
 
@@ -2852,6 +2765,10 @@ msgstr "Тренировка для %s"
 msgid "Create schedule"
 msgstr "Создать программу"
 
+#: manager/views/schedule_step.py:99
+msgid "Edit workout"
+msgstr "Изменить тренировку"
+
 #: manager/views/workout.py:209
 msgid "Copy workout"
 msgstr "Копировать тренировку"
@@ -2982,7 +2899,7 @@ msgstr "Количество в граммах"
 msgid "Unit amount, e.g. \"1 Cup\" or \"1/2 spoon\""
 msgstr "Единица измерения количества, например \"1 чашка\" или \"1/2 ложки\""
 
-#: nutrition/models/log.py:52 nutrition/models/meal.py:50
+#: nutrition/models/log.py:52 nutrition/models/meal.py:48
 #: nutrition/models/meal_item.py:48 nutrition/models/plan.py:108
 msgid "Nutrition plan"
 msgstr "Программа питания"
@@ -2997,11 +2914,11 @@ msgstr "Прием пищи"
 msgid "Date and Time (Approx.)"
 msgstr "Время (приблизительно)"
 
-#: nutrition/models/meal.py:62
+#: nutrition/models/meal.py:60
 msgid "Time (approx)"
 msgstr "Время (приблизительно)"
 
-#: nutrition/models/meal.py:69
+#: nutrition/models/meal.py:67
 msgid ""
 "Give meals a textual description / name such as \"Breakfast\" or \"after "
 "workout\""
@@ -3137,10 +3054,6 @@ msgstr "Ингредиентов нет."
 msgid "Search"
 msgstr "Поиск"
 
-#: nutrition/templates/ingredient/overview.html:62
-msgid "Add ingredient"
-msgstr "Добавить ингредиент"
-
 #: nutrition/templates/ingredient/view.html:45 nutrition/views/plan.py:229
 msgid "Macronutrients"
 msgstr "Макронутриенты"
@@ -3160,20 +3073,11 @@ msgstr "не имеется в наличии"
 msgid "Others"
 msgstr "Другие"
 
-#: nutrition/templates/ingredient/view.html:144
-#: nutrition/templates/units/list.html:46 nutrition/views/unit.py:86
+#: nutrition/templates/ingredient/view.html:143
+#: nutrition/templates/units/list.html:50 nutrition/views/unit.py:86
 msgid "Add new weight unit"
 msgstr "Добавить новую единицу веса"
 
-#: nutrition/templates/ingredient/view.html:206
-#: nutrition/templates/ingredient/view.html:209
-msgid "Edit ingredient"
-msgstr "Изменить ингредиент"
-
-#: nutrition/templates/ingredient/view.html:213
-msgid "Delete ingredient"
-msgstr "Удалить ингредиент"
-
 #: nutrition/templates/rate/form.html:25
 msgid "Basal metabolic rate"
 msgstr "Уровень базального метаболизма"
@@ -3830,6 +3734,89 @@ msgstr "Успешно удалено."
 msgid "Delete weight entry for the %s"
 msgstr "Удалить запись о весе для %s"
 
+#, fuzzy
+#~| msgid ""
+#~| "If a license has been localized, e.g. the Creative Commons\n"
+#~| "licenses for the different countries, add them as separate entries here."
+#~ msgid ""
+#~ "If a license has been localized, e.g. the Creative Commons\n"
+#~ "            licenses for the different countries, add them as separate "
+#~ "entries here."
+#~ msgstr ""
+#~ "Если лицензии были локализованы, например лицензии\n"
+#~ "Creative Commons для разных стран, добавьте их здесь отдельно."
+
+#~ msgid "Add weight log"
+#~ msgstr "Добавить журнал веса"
+
+#~ msgid "This exercise has no repetitions."
+#~ msgstr "Это упражнение не имеет повторений."
+
+#~ msgid "Edit them now."
+#~ msgstr "Измените их сейчас."
+
+#~ msgid "Add exercises to this workout day"
+#~ msgstr "Добавить упражнения к этому тренировочному дню"
+
+#~ msgid "Edit schedule"
+#~ msgstr "Отредактировать программу"
+
+#~ msgid "Delete schedule"
+#~ msgstr "Удалить программу"
+
+#~ msgid "Weight log"
+#~ msgstr "Регистрация веса"
+
+#~ msgid "Weight log for workout"
+#~ msgstr "Регистрация веса для тренировки"
+
+#~ msgid "Add weight log to this day"
+#~ msgstr "Добавить запись веса к этому дню"
+
+#~ msgid "No weight entries here."
+#~ msgstr "Здесь нет записей веса."
+
+#~ msgid "No exercises for this day."
+#~ msgstr "Для этого дня упражнений нет."
+
+#~ msgid ""
+#~ "This page shows the weight logs belonging to this workout\n"
+#~ "only. Click on an exercise to see all the historical data for\n"
+#~ "it."
+#~ msgstr ""
+#~ "Эта страница показывает журнал веса только для этой тренировки. Нажмите "
+#~ "на упражнение для показа его предыдущих данных."
+
+#~ msgid ""
+#~ "If on a single day there is more than one entry with the\n"
+#~ "same number of repetitions, but different weights, only the entry with "
+#~ "the\n"
+#~ "higher weight is shown in the diagram."
+#~ msgstr ""
+#~ "Если на один день приходится больше одной записи с одинаковым количеством "
+#~ "повторений, но разными тяжестями, то на графике будет показана только "
+#~ "запись с большим весом."
+
+#~ msgid ""
+#~ "Note that only entries with a weight unit (kg or lb) and\n"
+#~ "repetitions are charted, other combinations such as time or until "
+#~ "failure\n"
+#~ "are ignored here."
+#~ msgstr ""
+#~ "Обратите внимание, что только записи с единицей веса (кг или фунт) и\n"
+#~ "повторений отображаются на графике. Другие комбинации, такие как время "
+#~ "или до отказа\n"
+#~ "игнорируются."
+
+#~ msgid "Add ingredient"
+#~ msgstr "Добавить ингредиент"
+
+#~ msgid "Edit ingredient"
+#~ msgstr "Изменить ингредиент"
+
+#~ msgid "Delete ingredient"
+#~ msgstr "Удалить ингредиент"
+
 #~ msgid "Ingredients pending review"
 #~ msgstr "Ингредиенты ожидающие рассмотрения"
 
diff --git a/wger/locale/sv/LC_MESSAGES/django.po b/wger/locale/sv/LC_MESSAGES/django.po
index a080d8d32..da8c89385 100644
--- a/wger/locale/sv/LC_MESSAGES/django.po
+++ b/wger/locale/sv/LC_MESSAGES/django.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: wger Workout Manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-07-14 15:59+0200\n"
+"POT-Creation-Date: 2024-11-14 13:09+0100\n"
 "PO-Revision-Date: 2023-01-18 17:47+0000\n"
 "Last-Translator: tygyh <jonis9898@hotmail.com>\n"
 "Language-Team: Swedish <https://hosted.weblate.org/projects/wger/web/sv/>\n"
@@ -22,7 +22,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.15.1-dev\n"
 
-#: config/models/gym_config.py:46 gym/templates/gym/list.html:53
+#: config/models/gym_config.py:46 gym/templates/gym/list.html:56
 msgid "Default gym"
 msgstr "Standard gym"
 
@@ -35,28 +35,28 @@ msgstr ""
 "alla nya registrerade användare här gym och uppdatera alla befintliga "
 "användare utan ett gym."
 
-#: config/views/gym_config.py:42 core/templates/language/view.html:67
-#: core/templates/license/list.html:17 core/templates/misc/license/list.html:18
+#: config/views/gym_config.py:42 core/templates/language/view.html:64
+#: core/templates/license/list.html:17
 #: core/templates/repetition_unit/list.html:18
-#: core/templates/tags/render_day.html:39
-#: core/templates/tags/render_day.html:75 core/templates/user/overview.html:204
-#: core/templates/user/overview.html:445
+#: core/templates/user/overview.html:204 core/templates/user/overview.html:467
 #: core/templates/weight_unit/list.html:18
 #: exercises/templates/categories/admin-overview.html:17
 #: exercises/templates/equipment/admin-overview.html:17
-#: exercises/templates/muscles/admin-overview.html:17
-#: gallery/views/images.py:98 gym/templates/admin_notes/list.html:32
-#: gym/templates/contract/list.html:31 gym/templates/contract/view.html:107
-#: gym/templates/contract_option/list.html:32
-#: gym/templates/contract_type/list.html:32 gym/templates/document/list.html:38
-#: gym/templates/gym/list.html:20 gym/templates/gym/list.html:46
-#: gym/templates/gym/member_list.html:87 gym/templates/gym/member_list.html:140
-#: gym/templates/gym/member_list.html:176
-#: manager/templates/calendar/day.html:68
-#: manager/templates/calendar/month.html:85
-#: manager/templates/calendar/partial_overview_table.html:18
-#: manager/templates/schedule/view.html:118
-#: nutrition/templates/ingredient/view.html:165
+#: exercises/templates/muscles/admin-overview.html:16
+#: gallery/views/images.py:98 gym/templates/admin_notes/list.html:31
+#: gym/templates/contract/list.html:30 gym/templates/contract/view.html:106
+#: gym/templates/contract_option/list.html:29
+#: gym/templates/contract_type/list.html:30 gym/templates/document/list.html:38
+#: gym/templates/gym/list.html:19 gym/templates/gym/list.html:48
+#: gym/templates/gym/member_list.html:94 gym/templates/gym/member_list.html:152
+#: gym/templates/gym/member_list.html:190
+#: manager/templates/calendar/day.html:67
+#: manager/templates/calendar/month.html:84
+#: manager/templates/calendar/partial_overview_table.html:16
+#: manager/templates/schedule/view.html:318
+#: manager/templates/workout/view.html:181
+#: nutrition/templates/ingredient/view.html:164
+#: nutrition/templates/ingredient/view.html:209
 #: nutrition/templates/units/list.html:19
 msgid "Edit"
 msgstr "Redigera"
@@ -92,8 +92,8 @@ msgstr "Mitt coola träningsschema"
 msgid "Empty placeholder schedule"
 msgstr "Tom platshållarschema"
 
-#: core/forms.py:69 core/templates/navigation.html:285
-#: core/templates/navigation.html:291 core/templates/user/login.html:4
+#: core/forms.py:69 core/templates/navigation.html:284
+#: core/templates/navigation.html:290 core/templates/user/login.html:4
 #: software/templates/features.html:82 software/templates/features.html:427
 msgid "Login"
 msgstr "Logga in"
@@ -103,14 +103,14 @@ msgstr "Logga in"
 msgid "First name"
 msgstr "Förnamn"
 
-#: core/forms.py:109 core/forms.py:215 core/templates/user/overview.html:266
+#: core/forms.py:109 core/forms.py:215 core/templates/user/overview.html:284
 #: gym/views/export.py:62 gym/views/gym.py:217
 msgid "Last name"
 msgstr "Efternamn"
 
-#: core/forms.py:111 core/forms.py:180 core/templates/user/overview.html:270
+#: core/forms.py:111 core/forms.py:180 core/templates/user/overview.html:288
 #: gym/models/contract.py:256 gym/models/gym.py:58
-#: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:104
+#: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:116
 #: gym/templates/gym/new_user.html:30 gym/views/export.py:60
 #: mailer/templates/mailer/gym/form.html:4
 #: mailer/templates/mailer/gym/overview.html:4
@@ -140,8 +140,8 @@ msgstr "Träningspåminnelser"
 msgid "Other settings"
 msgstr "Andra inställningar"
 
-#: core/forms.py:174 core/views/user.py:624 core/views/user.py:639
-#: core/views/user.py:651 gym/forms.py:73 manager/templates/log/add.html:65
+#: core/forms.py:174 core/views/user.py:623 core/views/user.py:638
+#: core/views/user.py:650 gym/forms.py:73 manager/templates/log/add.html:65
 #: manager/templates/set/add.html:70 manager/views/workout.py:203
 #: utils/generic_views.py:143
 msgid "Save"
@@ -165,26 +165,25 @@ msgstr "Lösenord"
 msgid "Please enter your current password."
 msgstr "Vänligen ange ditt nuvarande lösenord."
 
-#: core/forms.py:242 core/templates/language/view.html:73
-#: core/templates/license/list.html:19 core/templates/misc/license/list.html:22
-#: core/templates/repetition_unit/list.html:20
-#: core/templates/tags/render_day.html:45
-#: core/templates/tags/render_day.html:81 core/templates/user/overview.html:217
-#: core/templates/weight_unit/list.html:20
-#: exercises/templates/categories/admin-overview.html:19
-#: exercises/templates/equipment/admin-overview.html:19
-#: exercises/templates/muscles/admin-overview.html:19
-#: gym/templates/admin_notes/list.html:40
-#: gym/templates/contract_option/list.html:41
-#: gym/templates/contract_type/list.html:41 gym/templates/document/list.html:46
-#: gym/templates/gym/list.html:22 manager/templates/calendar/day.html:73
-#: manager/templates/calendar/month.html:89
-#: manager/templates/calendar/partial_overview_table.html:23
-#: manager/templates/schedule/view.html:122
-#: manager/templates/workout/view.html:188
-#: nutrition/templates/ingredient/view.html:166
+#: core/forms.py:242 core/templates/language/view.html:70
+#: core/templates/license/list.html:21
+#: core/templates/repetition_unit/list.html:22
+#: core/templates/user/overview.html:233
+#: core/templates/weight_unit/list.html:22
+#: exercises/templates/categories/admin-overview.html:21
+#: exercises/templates/equipment/admin-overview.html:21
+#: exercises/templates/muscles/admin-overview.html:20
+#: gym/templates/admin_notes/list.html:37
+#: gym/templates/contract_option/list.html:35
+#: gym/templates/contract_type/list.html:36 gym/templates/document/list.html:46
+#: gym/templates/gym/list.html:23 manager/templates/calendar/day.html:73
+#: manager/templates/calendar/month.html:88
+#: manager/templates/calendar/partial_overview_table.html:22
+#: manager/templates/schedule/view.html:324
+#: manager/templates/workout/view.html:202
+#: nutrition/templates/ingredient/view.html:168
 #: nutrition/templates/ingredient/view.html:215
-#: nutrition/templates/units/list.html:22
+#: nutrition/templates/units/list.html:25
 msgid "Delete"
 msgstr "Ta bort"
 
@@ -196,9 +195,9 @@ msgstr "Ogiltigt lösenord"
 msgid "The form is secured with reCAPTCHA"
 msgstr "Formuläret är säkrat med reCAPTCHA"
 
-#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:285
-#: core/templates/navigation.html:297 core/templates/template.html:149
-#: core/templates/user/login.html:20 core/views/user.py:298
+#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:284
+#: core/templates/navigation.html:296 core/templates/template.html:151
+#: core/templates/user/login.html:20 core/views/user.py:297
 #: software/templates/features.html:87 software/templates/features.html:422
 msgid "Register"
 msgstr "Registrera dig"
@@ -447,18 +446,18 @@ msgid "The sum of all hours has to be 24"
 msgstr "Summan av alla timmar måste vara 24"
 
 #: core/models/rep_unit.py:36 core/models/weight_unit.py:36
-#: core/templates/user/overview.html:262 core/views/user.py:599
+#: core/templates/user/overview.html:280 core/views/user.py:598
 #: exercises/models/category.py:29 exercises/models/equipment.py:29
 #: exercises/models/exercise.py:59 exercises/models/muscle.py:36
 #: gym/models/contract.py:52 gym/models/contract.py:103 gym/models/gym.py:46
 #: gym/models/user_document.py:84 gym/templates/contract/view.html:50
-#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:96
+#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:108
 #: gym/views/gym.py:158 manager/models/schedule.py:55
 #: manager/models/workout.py:57 measurements/models/category.py:36
 #: nutrition/models/ingredient.py:111
-#: nutrition/models/ingredient_category.py:27 nutrition/models/meal.py:67
+#: nutrition/models/ingredient_category.py:27 nutrition/models/meal.py:65
 #: nutrition/models/weight_unit.py:38
-#: nutrition/templates/ingredient/view.html:152
+#: nutrition/templates/ingredient/view.html:151
 msgid "Name"
 msgstr "Namn"
 
@@ -503,7 +502,7 @@ msgstr ""
 msgid "Back to \"%(target)s\""
 msgstr "Tillbaka till \"%(target)s\""
 
-#: core/templates/delete.html:15
+#: core/templates/delete.html:4
 msgid "Are you sure you want to delete this? This action cannot be undone."
 msgstr ""
 "Är du säkes på att du vill ta bort detta? Denna handilng kan ej ångras."
@@ -561,7 +560,7 @@ msgstr ""
 msgid "Dashboard"
 msgstr "Instrumentpanel"
 
-#: core/templates/language/overview.html:4 core/templates/navigation.html:345
+#: core/templates/language/overview.html:4 core/templates/navigation.html:344
 msgid "Languages"
 msgstr "Språk"
 
@@ -571,85 +570,72 @@ msgstr "Ingenting hittades"
 
 #: core/templates/language/overview.html:22
 #: manager/templates/calendar/month.html:132
-#: manager/templates/schedule/overview.html:28
-#: manager/templates/schedule/view.html:144
+#: manager/templates/schedule/view.html:154
 #: manager/templates/workout/overview.html:28
 #: nutrition/templates/ingredient/overview.html:38
 msgid "Add one now."
 msgstr "Lägg till ett nu."
 
-#: core/templates/language/overview.html:35 core/templates/license/list.html:40
-#: core/templates/misc/license/list.html:43
-#: core/templates/repetition_unit/list.html:43
-#: core/templates/user/overview.html:326 core/templates/user/overview.html:365
-#: core/templates/user/overview.html:401
-#: core/templates/weight_unit/list.html:43 core/views/languages.py:74
+#: core/templates/language/overview.html:34 core/templates/license/list.html:43
+#: core/templates/repetition_unit/list.html:46
+#: core/templates/user/overview.html:344 core/templates/user/overview.html:384
+#: core/templates/user/overview.html:422
+#: core/templates/weight_unit/list.html:46 core/views/languages.py:74
 #: core/views/license.py:66 core/views/repetition_units.py:66
 #: core/views/weight_units.py:66
-#: exercises/templates/categories/admin-overview.html:38
-#: gallery/views/images.py:63 gym/templates/admin_notes/list.html:67
-#: gym/templates/contract/list.html:73
-#: gym/templates/contract_option/list.html:72
-#: gym/templates/contract_type/list.html:72 gym/templates/document/list.html:79
-#: gym/templates/gym/member_list.html:211
-#: gym/templates/gym/member_list.html:244
-#: gym/templates/gym/member_list.html:281
+#: exercises/templates/categories/admin-overview.html:40
+#: exercises/templates/equipment/admin-overview.html:39
+#: exercises/templates/muscles/admin-overview.html:40
+#: gallery/views/images.py:63 gym/templates/admin_notes/list.html:64
+#: gym/templates/contract/list.html:69
+#: gym/templates/contract_option/list.html:65
+#: gym/templates/contract_type/list.html:66 gym/templates/document/list.html:78
+#: gym/templates/gym/member_list.html:228
+#: gym/templates/gym/member_list.html:264
+#: gym/templates/gym/member_list.html:303
 #: mailer/templates/mailer/gym/overview.html:43
+#: nutrition/templates/ingredient/overview.html:60
 msgid "Add"
 msgstr "Lägg till"
 
 #: core/templates/language/view.html:61 core/templates/user/api_key.html:44
-#: core/templates/user/preferences.html:45 gym/models/contract.py:203
-#: gym/templates/contract/view.html:41 gym/templates/contract/view.html:106
-#: gym/templates/gym/member_list.html:248
-#: manager/templates/schedule/view.html:285
-#: manager/templates/workout/view.html:163
-#: nutrition/templates/ingredient/view.html:202
+#: core/templates/user/preferences.html:50 gym/models/contract.py:203
+#: gym/templates/contract/view.html:41 gym/templates/gym/member_list.html:270
+#: manager/templates/schedule/view.html:304
+#: manager/templates/workout/view.html:177
+#: nutrition/templates/ingredient/view.html:206
 msgid "Options"
 msgstr "Alternativ"
 
-#: core/templates/license/list.html:4 core/templates/misc/license/list.html:4
+#: core/templates/license/list.html:4
 msgid "License list"
 msgstr "Licens lista"
 
-#: core/templates/license/list.html:26 core/templates/misc/license/list.html:30
-#: core/templates/repetition_unit/list.html:28
+#: core/templates/license/list.html:30
+#: core/templates/repetition_unit/list.html:32
 #: core/templates/user/overview.html:104 core/templates/user/overview.html:136
-#: core/templates/user/overview.html:185 core/templates/user/overview.html:347
-#: core/templates/user/overview.html:383 core/templates/user/overview.html:427
-#: core/templates/weight_unit/list.html:28
-#: exercises/templates/categories/admin-overview.html:26
-#: exercises/templates/equipment/admin-overview.html:26
-#: exercises/templates/muscles/admin-overview.html:26
-#: gym/templates/admin_notes/list.html:52 gym/templates/contract/list.html:60
-#: gym/templates/contract_option/list.html:58
-#: gym/templates/contract_type/list.html:58 gym/templates/document/list.html:64
-#: gym/templates/gym/list.html:29 gym/templates/gym/member_list.html:229
-#: gym/templates/gym/member_list.html:262
-#: gym/templates/gym/member_list.html:299
+#: core/templates/user/overview.html:185 core/templates/user/overview.html:365
+#: core/templates/user/overview.html:404 core/templates/user/overview.html:448
+#: core/templates/weight_unit/list.html:32
+#: exercises/templates/categories/admin-overview.html:30
+#: exercises/templates/equipment/admin-overview.html:30
+#: exercises/templates/muscles/admin-overview.html:29
+#: gym/templates/admin_notes/list.html:50 gym/templates/contract/list.html:57
+#: gym/templates/contract_option/list.html:52
+#: gym/templates/contract_type/list.html:53 gym/templates/document/list.html:64
+#: gym/templates/gym/list.html:32 gym/templates/gym/member_list.html:248
+#: gym/templates/gym/member_list.html:284
+#: gym/templates/gym/member_list.html:321
 #: mailer/templates/mailer/gym/overview.html:30
-#: manager/templates/calendar/day.html:87
-#: nutrition/templates/units/list.html:29
+#: manager/templates/calendar/day.html:88
+#: nutrition/templates/units/list.html:34
 msgid "Nothing found"
 msgstr "Ingenting hittades"
 
-#: core/templates/misc/about.html:4 core/templates/template.html:175
+#: core/templates/misc/about.html:4 core/templates/template.html:188
 msgid "Imprint"
 msgstr ""
 
-#: core/templates/misc/license/list.html:47
-#, fuzzy
-#| msgid ""
-#| "If a license has been localized, e.g. the Creative Commons\n"
-#| "licenses for the different countries, add them as separate entries here."
-msgid ""
-"If a license has been localized, e.g. the Creative Commons\n"
-"            licenses for the different countries, add them as separate "
-"entries here."
-msgstr ""
-"Om en licens har lokaliserats, t. ex. de landsspecifika Creative Commons "
-"licenserna, lägg till dessa som separata ingångar här."
-
 #: core/templates/navigation.html:28 software/templates/features.html:437
 msgid "Training"
 msgstr ""
@@ -698,8 +684,8 @@ msgstr "Publika mallar"
 msgid "Exercises"
 msgstr "Övningar"
 
-#: core/templates/navigation.html:111 core/templates/navigation.html:184
-#: core/templates/navigation.html:340
+#: core/templates/navigation.html:111 core/templates/navigation.html:185
+#: core/templates/navigation.html:339
 msgid "Administration"
 msgstr "Administration"
 
@@ -738,87 +724,87 @@ msgstr "BMI-kalkylator"
 msgid "Daily calories calculator"
 msgstr "Dagliga-kalorier-kalkylator"
 
-#: core/templates/navigation.html:179
+#: core/templates/navigation.html:180
 #: nutrition/templates/ingredient/overview.html:10
 msgid "Ingredient overview"
 msgstr "Ingrediensöversikt"
 
-#: core/templates/navigation.html:187 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:189 nutrition/templates/units/list.html:6
 msgid "Ingredient weight units"
 msgstr "Ingrediens viktenheter"
 
-#: core/templates/navigation.html:203 software/templates/features.html:442
+#: core/templates/navigation.html:205 software/templates/features.html:442
 msgid "Body weight"
 msgstr ""
 
-#: core/templates/navigation.html:210 core/templates/user/overview.html:114
+#: core/templates/navigation.html:212 core/templates/user/overview.html:114
 msgid "Weight overview"
 msgstr "Viktöversikt"
 
-#: core/templates/navigation.html:217 weight/views.py:65
+#: core/templates/navigation.html:216 weight/views.py:65
 msgid "Add weight entry"
 msgstr "Lägg till vikt"
 
-#: core/templates/navigation.html:231
+#: core/templates/navigation.html:230
 msgid "About this software"
 msgstr "Om programvaran"
 
-#: core/templates/navigation.html:237 software/templates/about_us.html:5
+#: core/templates/navigation.html:236 software/templates/about_us.html:5
 msgid "About us"
 msgstr "Om oss"
 
-#: core/templates/navigation.html:243 software/templates/features.html:507
+#: core/templates/navigation.html:242 software/templates/features.html:507
 msgid "REST API"
 msgstr "REST API"
 
-#: core/templates/navigation.html:249 utils/models.py:45
+#: core/templates/navigation.html:248 utils/models.py:45
 msgid "License"
 msgstr "Licens"
 
-#: core/templates/navigation.html:255
+#: core/templates/navigation.html:254
 msgid "Developer documentation"
 msgstr "Dokument för utvecklare"
 
-#: core/templates/navigation.html:262
+#: core/templates/navigation.html:261
 msgid "Get the code"
 msgstr "Hämta koden"
 
-#: core/templates/navigation.html:269 core/templates/template.html:214
+#: core/templates/navigation.html:268 core/templates/template.html:227
 #: software/templates/features.html:582
 msgid "Translate"
 msgstr "Översätt"
 
-#: core/templates/navigation.html:303 core/templates/user/login.html:28
+#: core/templates/navigation.html:302 core/templates/user/login.html:28
 msgid "Reset password"
 msgstr "Återställ lösenord"
 
-#: core/templates/navigation.html:321
+#: core/templates/navigation.html:320
 msgid "My preferences"
 msgstr "Mina preferenser"
 
-#: core/templates/navigation.html:330
+#: core/templates/navigation.html:329
 msgid "Logout"
 msgstr "Logga ut"
 
-#: core/templates/navigation.html:353
+#: core/templates/navigation.html:352
 msgid "Licenses"
 msgstr "Licenser"
 
-#: core/templates/navigation.html:361
+#: core/templates/navigation.html:360
 #: core/templates/repetition_unit/list.html:4
 msgid "Repetition units"
 msgstr "Repetitioner"
 
-#: core/templates/navigation.html:369 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:368 core/templates/weight_unit/list.html:4
 #: nutrition/templates/ingredient/view.html:141
 msgid "Weight units"
 msgstr "Viktenheter"
 
-#: core/templates/navigation.html:377 core/templates/user/list.html:4
+#: core/templates/navigation.html:376 core/templates/user/list.html:4
 msgid "User list"
 msgstr "Användarlista"
 
-#: core/templates/navigation.html:383
+#: core/templates/navigation.html:382
 msgid "Gyms"
 msgstr "Gym"
 
@@ -881,55 +867,30 @@ msgstr "tidigare"
 msgid "next"
 msgstr "nästa"
 
-#: core/templates/tags/render_day.html:34
-msgid "Add weight log"
-msgstr ""
-
-#: core/templates/tags/render_day.html:116
-msgid "Placeholder image for exercise"
+#: core/templates/tags/render_day.html:44
+#, fuzzy
+#| msgid "Placeholder image for exercise"
+msgid "Placeholder image for translation"
 msgstr "Platshållarbild för övning"
 
-#: core/templates/tags/render_day.html:133
-msgid "This exercise has no repetitions."
-msgstr "Denna övning har inga upprepningar."
-
-#: core/templates/tags/render_day.html:136
-msgid "Edit them now."
-msgstr "Redigera dom nu."
-
-#: core/templates/tags/render_day.html:162
-msgid "Add exercises to this workout day"
-msgstr "Lägg till övningar i denna träningsdag"
-
-#: core/templates/tags/render_weight_log.html:17 manager/helpers.py:86
-#: manager/models/setting.py:72 manager/templates/set/formset.html:9
-msgid "Reps"
-msgstr "Reps"
-
-#: core/templates/tags/render_weight_log.html:30 manager/forms.py:191
-#: manager/models/log.py:103 manager/models/setting.py:102
-#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
-msgid "RiR"
-msgstr ""
-
-#: core/templates/template.html:122 manager/templates/calendar/month.html:138
-#: manager/templates/schedule/view.html:248
-#: manager/templates/schedule/view.html:269
-#: manager/templates/workout/view.html:84
-#: manager/templates/workout/view.html:137
+#: core/templates/template.html:124 manager/templates/calendar/month.html:138
+#: manager/templates/schedule/view.html:262
+#: manager/templates/schedule/view.html:287
+#: manager/templates/workout/view.html:89
+#: manager/templates/workout/view.html:149
 msgid "Close"
 msgstr "Stäng"
 
-#: core/templates/template.html:138
+#: core/templates/template.html:140
 msgid ""
 "You are using a guest account, data entered will be deleted after a week."
 msgstr "Du använder ett gästkonto, data som anges tas bort efter en vecka."
 
-#: core/templates/template.html:143
+#: core/templates/template.html:145
 msgid "Create some demo entries"
 msgstr "Skapa några demoposter"
 
-#: core/templates/template.html:180 software/templates/features.html:547
+#: core/templates/template.html:193 software/templates/features.html:547
 #: software/templates/tos.html:7
 msgid "Terms of service"
 msgstr "Villkor för tjänsten"
@@ -938,7 +899,7 @@ msgstr "Villkor för tjänsten"
 msgid "Features"
 msgstr "Funktioner"
 
-#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:54
+#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:59
 msgid "API key"
 msgstr "API key"
 
@@ -981,17 +942,17 @@ msgstr "Generera nya API key"
 msgid "Documentation"
 msgstr "Dokumentation"
 
-#: core/templates/user/delete_account.html:4
-#: core/templates/user/preferences.html:59
+#: core/templates/user/delete_account.html:3
+#: core/templates/user/preferences.html:62
 msgid "Delete account"
 msgstr "Ta bort konto"
 
-#: core/templates/user/delete_account.html:17
+#: core/templates/user/delete_account.html:9
 #: exercises/templates/history/overview.html:93
 msgid "Are you sure?"
 msgstr "Är du säker?"
 
-#: core/templates/user/delete_account.html:22
+#: core/templates/user/delete_account.html:14
 #, python-format
 msgid ""
 "This action will delete the user account \"%(username)s\".\n"
@@ -1014,22 +975,22 @@ msgstr "Glömt ditt lösenord?"
 
 #: core/templates/user/overview.html:25 core/templates/user/overview.html:68
 #: core/templates/user/overview.html:112 core/templates/user/overview.html:144
-#: core/templates/user/overview.html:330 core/templates/user/overview.html:369
-#: core/templates/user/overview.html:405
+#: core/templates/user/overview.html:348 core/templates/user/overview.html:390
+#: core/templates/user/overview.html:426
 #, python-format
 msgid "last %(number)s"
 msgstr "sista %(number)s"
 
 #: core/templates/user/overview.html:27 core/templates/user/overview.html:146
-#: core/templates/user/overview.html:325 core/templates/user/overview.html:364
-#: core/templates/user/overview.html:400 gym/templates/gym/member_list.html:210
-#: gym/templates/gym/member_list.html:243
-#: gym/templates/gym/member_list.html:280
+#: core/templates/user/overview.html:343 core/templates/user/overview.html:382
+#: core/templates/user/overview.html:421 gym/templates/gym/member_list.html:226
+#: gym/templates/gym/member_list.html:262
+#: gym/templates/gym/member_list.html:302
 msgid "Overview"
 msgstr "Överblick"
 
 #: core/templates/user/overview.html:28
-#: manager/templates/schedule/view.html:163
+#: manager/templates/schedule/view.html:172
 #: manager/templates/workout/overview.html:39 manager/views/schedule_step.py:60
 msgid "Add workout"
 msgstr "Lägg till träningspass"
@@ -1061,38 +1022,36 @@ msgstr "Beskrivning"
 msgid "Number of logs (days)"
 msgstr "Antal loggar (dagar)"
 
-#: core/templates/user/overview.html:37 core/views/user.py:600
+#: core/templates/user/overview.html:37 core/views/user.py:599
 #: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:158
 msgid "Last activity"
 msgstr "Senaste aktiviteten"
 
 #: core/templates/user/overview.html:58
 #: manager/templates/calendar/month.html:128
-#: manager/templates/schedule/view.html:144
 #: manager/templates/workout/overview.html:28
 msgid "No workouts found."
 msgstr "Inga träningspass hittade."
 
 #: core/templates/user/overview.html:68 manager/forms.py:280
-#: manager/templates/workout/view.html:106
+#: manager/templates/workout/view.html:114
 msgid "Log"
 msgstr "Log"
 
 #: core/templates/user/overview.html:77 manager/models/session.py:83
-#: manager/templates/calendar/partial_overview_table.html:52
+#: manager/templates/calendar/partial_overview_table.html:54
 msgid "General impression"
 msgstr "Generellt intryck"
 
-#: core/templates/user/overview.html:78 core/templates/user/overview.html:369
+#: core/templates/user/overview.html:78 core/templates/user/overview.html:390
 #: manager/models/session.py:73
-#: manager/templates/calendar/partial_overview_table.html:56
-#: manager/templates/workout/log.html:89
+#: manager/templates/calendar/partial_overview_table.html:58
 msgid "Notes"
 msgstr "Anteckningar"
 
 #: core/templates/user/overview.html:79
 #: exercises/templates/history/overview.html:30
-#: manager/templates/calendar/partial_overview_table.html:42
+#: manager/templates/calendar/partial_overview_table.html:44
 msgid "Time"
 msgstr "Tid"
 
@@ -1130,121 +1089,121 @@ msgstr "Fett"
 msgid "kcal"
 msgstr "kcal"
 
-#: core/templates/user/overview.html:201 core/templates/user/overview.html:322
-#: core/templates/user/overview.html:361 core/templates/user/overview.html:397
-#: core/templates/user/overview.html:442 gym/templates/gym/list.html:42
-#: gym/templates/gym/member_list.html:84 gym/templates/gym/member_list.html:137
-#: gym/templates/gym/member_list.html:173
-#: gym/templates/gym/member_list.html:207
-#: gym/templates/gym/member_list.html:240
-#: gym/templates/gym/member_list.html:277
-#: manager/templates/schedule/view.html:100
+#: core/templates/user/overview.html:201 core/templates/user/overview.html:340
+#: core/templates/user/overview.html:379 core/templates/user/overview.html:418
+#: core/templates/user/overview.html:463 gym/templates/gym/list.html:45
+#: gym/templates/gym/member_list.html:91 gym/templates/gym/member_list.html:149
+#: gym/templates/gym/member_list.html:187
+#: gym/templates/gym/member_list.html:223
+#: gym/templates/gym/member_list.html:259
+#: gym/templates/gym/member_list.html:299
+#: manager/templates/schedule/view.html:99
 msgid "Actions"
 msgstr "Åtgärder"
 
-#: core/templates/user/overview.html:207
+#: core/templates/user/overview.html:210
 msgid "Deactivate user"
 msgstr "Inaktivera användare"
 
-#: core/templates/user/overview.html:209
+#: core/templates/user/overview.html:214
 msgid "Activate user"
 msgstr "Aktivera användare"
 
-#: core/templates/user/overview.html:211
+#: core/templates/user/overview.html:223
 msgid "Reset user password"
 msgstr "Återställ användarlösenord"
 
-#: core/templates/user/overview.html:214 gym/templates/gym/member_list.html:30
+#: core/templates/user/overview.html:227 gym/templates/gym/member_list.html:30
 msgid "Roles"
 msgstr "Roller"
 
-#: core/templates/user/overview.html:225
+#: core/templates/user/overview.html:243
 msgid "Password reset confirmation"
 msgstr "Lösenordsåterställningsbekräftelse"
 
-#: core/templates/user/overview.html:229
+#: core/templates/user/overview.html:247
 msgid "Do you really want to change this user&#39;s password?"
 msgstr "Vill du verkligen ändra denna användares lösenord?"
 
-#: core/templates/user/overview.html:232
+#: core/templates/user/overview.html:250
 #: exercises/templates/history/overview.html:106
 msgid "No"
 msgstr "Nej"
 
-#: core/templates/user/overview.html:233
+#: core/templates/user/overview.html:251
 #: exercises/templates/history/overview.html:99
 msgid "Yes"
 msgstr "Ja"
 
-#: core/templates/user/overview.html:254 gym/templates/gym/member_list.html:93
+#: core/templates/user/overview.html:272 gym/templates/gym/member_list.html:105
 msgid "Details"
 msgstr "Detaljer"
 
-#: core/templates/user/overview.html:258 gym/views/export.py:57
-#: manager/helpers.py:86 manager/templates/schedule/view.html:98
+#: core/templates/user/overview.html:276 gym/views/export.py:57
+#: manager/helpers.py:86 manager/templates/schedule/view.html:97
 msgid "Nr."
 msgstr "Nr."
 
-#: core/templates/user/overview.html:280 gym/models/contract.py:287
+#: core/templates/user/overview.html:298 gym/models/contract.py:287
 #: gym/models/gym.py:50 gym/templates/contract/view.html:75
-#: gym/templates/gym/member_list.html:100 gym/views/export.py:68
+#: gym/templates/gym/member_list.html:112 gym/views/export.py:68
 msgid "Phone"
 msgstr "Telefon"
 
-#: core/templates/user/overview.html:284 gym/templates/contract/view.html:87
-#: gym/templates/gym/member_list.html:118
+#: core/templates/user/overview.html:302 gym/templates/contract/view.html:87
+#: gym/templates/gym/member_list.html:130
 msgid "Address"
 msgstr "Adress"
 
-#: core/templates/user/overview.html:295
+#: core/templates/user/overview.html:313
 msgid "Registered"
 msgstr "Registrerad"
 
-#: core/templates/user/overview.html:299
+#: core/templates/user/overview.html:317
 msgid "Last login"
 msgstr "Senaste inloggning"
 
-#: core/templates/user/overview.html:304
+#: core/templates/user/overview.html:322
 msgid "Status"
 msgstr "Status"
 
-#: core/templates/user/overview.html:307
+#: core/templates/user/overview.html:325
 msgid "Active"
 msgstr "Aktiv"
 
-#: core/templates/user/overview.html:309
+#: core/templates/user/overview.html:327
 msgid "Inactive"
 msgstr "Inaktiv"
 
-#: core/templates/user/overview.html:330 gym/templates/contract/list.html:4
-#: gym/templates/gym/member_list.html:202
+#: core/templates/user/overview.html:348 gym/templates/contract/list.html:4
+#: gym/templates/gym/member_list.html:218
 msgid "Contracts"
 msgstr "Kontrakt"
 
-#: core/templates/user/overview.html:405 gym/templates/document/list.html:4
+#: core/templates/user/overview.html:426 gym/templates/document/list.html:4
 msgid "Documents"
 msgstr "Dokument"
 
-#: core/templates/user/overview.html:412 gym/templates/document/list.html:32
-#: manager/forms.py:292 manager/templates/workout/view.html:132
+#: core/templates/user/overview.html:433 gym/templates/document/list.html:33
+#: manager/forms.py:292 manager/templates/workout/view.html:143
 msgid "Download"
 msgstr "Hämta"
 
-#: core/templates/user/overview.html:450 gym/views/admin_config.py:44
+#: core/templates/user/overview.html:474 gym/views/admin_config.py:44
 #: gym/views/admin_config.py:58 gym/views/user_config.py:46
 msgid "Configuration"
 msgstr "Konfiguration"
 
-#: core/templates/user/overview.html:453 gym/models/user_config.py:92
+#: core/templates/user/overview.html:477 gym/models/user_config.py:92
 msgid "Include in inactive overview"
 msgstr "Inkludera i inaktiv överblick"
 
-#: core/templates/user/overview.html:486
+#: core/templates/user/overview.html:510
 #, python-format
 msgid "Admin login is only available for users in %(gym_name)s"
 msgstr "Admininloggning är bara tillgängligt för använder i %(gym_name)s"
 
-#: core/templates/user/overview.html:490
+#: core/templates/user/overview.html:514
 msgid "Log in as this user"
 msgstr "Logga in som denna användare"
 
@@ -1264,19 +1223,19 @@ msgstr ""
 msgid "Send verification email"
 msgstr ""
 
-#: core/templates/user/preferences.html:30
+#: core/templates/user/preferences.html:31
 msgid "You need to verify your email to contribute exercises"
 msgstr ""
 
-#: core/templates/user/preferences.html:50 core/views/user.py:611
+#: core/templates/user/preferences.html:55 core/views/user.py:610
 msgid "Change password"
 msgstr "Ändra lösenord"
 
-#: core/templatetags/wger_extras.py:205 i18n.tpl:37
+#: core/templatetags/wger_extras.py:197 i18n.tpl:37
 msgid "kg"
 msgstr "kg"
 
-#: core/templatetags/wger_extras.py:207
+#: core/templatetags/wger_extras.py:199
 #: nutrition/templates/ingredient/view.html:60
 #: nutrition/templates/ingredient/view.html:66
 #: nutrition/templates/ingredient/view.html:73
@@ -1288,11 +1247,11 @@ msgctxt "weight unit, i.e. grams"
 msgid "g"
 msgstr "g"
 
-#: core/templatetags/wger_extras.py:210 i18n.tpl:38
+#: core/templatetags/wger_extras.py:202 i18n.tpl:38
 msgid "lb"
 msgstr "lb"
 
-#: core/templatetags/wger_extras.py:212
+#: core/templatetags/wger_extras.py:204
 msgctxt "weight unit, i.e. ounces"
 msgid "oz"
 msgstr "oz"
@@ -1319,13 +1278,13 @@ msgid "Delete {0}?"
 msgstr "Ta bort {0}?"
 
 #: core/views/languages.py:111 core/views/license.py:85
-#: core/views/repetition_units.py:86 core/views/user.py:474
+#: core/views/repetition_units.py:86 core/views/user.py:473
 #: core/views/weight_units.py:86 exercises/views/categories.py:98
 #: exercises/views/equipment.py:81 exercises/views/muscles.py:87
 #: gym/views/admin_notes.py:161 gym/views/config.py:68
 #: gym/views/contract.py:186 gym/views/contract_option.py:123
 #: gym/views/contract_type.py:123 gym/views/document.py:171
-#: gym/views/gym.py:463 manager/views/day.py:100 manager/views/schedule.py:333
+#: gym/views/gym.py:463 manager/views/day.py:96 manager/views/schedule.py:333
 #: manager/views/workout.py:267 nutrition/views/ingredient.py:145
 #: nutrition/views/unit.py:143
 #, python-brace-format
@@ -1354,48 +1313,48 @@ msgstr "Ladda upp"
 msgid "Your feedback was successfully sent. Thank you!"
 msgstr "Din feedback skickades. Tack!"
 
-#: core/views/user.py:156
+#: core/views/user.py:155
 #, python-brace-format
 msgid "Account \"{0}\" was successfully deleted"
 msgstr "Konto \"{0}\" är nu borttaget"
 
-#: core/views/user.py:292
+#: core/views/user.py:291
 msgid "You were successfully registered"
 msgstr "Du är nu registrerad"
 
-#: core/views/user.py:351
+#: core/views/user.py:350
 msgid "Settings successfully updated"
 msgstr "Inställningar uppdaterade"
 
-#: core/views/user.py:390
+#: core/views/user.py:389
 msgid "The user was successfully deactivated"
 msgstr "Användaren har nu tagits bort"
 
-#: core/views/user.py:427
+#: core/views/user.py:426
 msgid "The user was successfully activated"
 msgstr "Användaren har nu aktiverats"
 
-#: core/views/user.py:442
+#: core/views/user.py:441
 msgid "Edit user"
 msgstr "Redigera användare"
 
-#: core/views/user.py:597 gym/templates/gym/member_list.html:26
+#: core/views/user.py:596 gym/templates/gym/member_list.html:26
 #: gym/views/gym.py:158
 msgid "ID"
 msgstr "ID"
 
-#: core/views/user.py:598 gym/forms.py:95 gym/templates/contract/view.html:55
+#: core/views/user.py:597 gym/forms.py:95 gym/templates/contract/view.html:55
 #: gym/templates/gym/member_list.html:27 gym/views/export.py:59
 #: gym/views/gym.py:158 gym/views/gym.py:217
 msgid "Username"
 msgstr "Användarnamn"
 
-#: core/views/user.py:601 gym/templates/gym/new_user.html:34
+#: core/views/user.py:600 gym/templates/gym/new_user.html:34
 #: gym/views/export.py:58 gym/views/gym.py:217
 msgid "Gym"
 msgstr "Gym"
 
-#: core/views/user.py:660
+#: core/views/user.py:659
 #, python-format
 msgid "A verification email was sent to %(email)s"
 msgstr ""
@@ -1560,11 +1519,6 @@ msgstr ""
 msgid "Equipment list"
 msgstr "Utrustningslista"
 
-#: exercises/templates/equipment/admin-overview.html:39
-#: exercises/views/equipment.py:92
-msgid "Add new equipment"
-msgstr "Lägg till ny utrustning"
-
 #: exercises/templates/history/overview.html:11
 #, fuzzy
 #| msgid "Exercise day"
@@ -1622,11 +1576,6 @@ msgstr ""
 msgid "Muscle overview"
 msgstr "Muskelöversikt"
 
-#: exercises/templates/muscles/admin-overview.html:38
-#: exercises/views/muscles.py:68
-msgid "Add muscle"
-msgstr "Lägg till muskel"
-
 #: exercises/views/categories.py:72
 msgid "Add category"
 msgstr "Lägg till kategori"
@@ -1635,6 +1584,10 @@ msgstr "Lägg till kategori"
 msgid "This will also delete all exercises in this category."
 msgstr "Detta tar också bort alla övningar i denna kategori."
 
+#: exercises/views/equipment.py:92
+msgid "Add new equipment"
+msgstr "Lägg till ny utrustning"
+
 #: exercises/views/equipment.py:104 exercises/views/equipment.py:115
 msgid "Delete equipment?"
 msgstr "Ta bort utrustning?"
@@ -1643,6 +1596,10 @@ msgstr "Ta bort utrustning?"
 msgid "This will delete the exercise from all workouts."
 msgstr "Detta kommer att radera övningen från alla pass."
 
+#: exercises/views/muscles.py:68
+msgid "Add muscle"
+msgstr "Lägg till muskel"
+
 #: gallery/templates/images/overview.html:62
 #, fuzzy
 #| msgid "Add new image"
@@ -1733,7 +1690,7 @@ msgid "Contract is active"
 msgstr "Kontraktet är aktiv"
 
 #: gym/models/contract.py:237 gym/templates/contract/view.html:69
-#: manager/models/schedule.py:61 manager/templates/schedule/view.html:67
+#: manager/models/schedule.py:61 manager/templates/schedule/view.html:66
 msgid "Start date"
 msgstr "Startdatum"
 
@@ -1769,7 +1726,7 @@ msgstr "Admin: Kan administrera gymanvändare"
 msgid "Admin: can administrate the different gyms"
 msgstr "Admin: Kan administrera olika gym"
 
-#: gym/models/gym.py:65 gym/templates/gym/member_list.html:114
+#: gym/models/gym.py:65 gym/templates/gym/member_list.html:126
 msgid "Owner"
 msgstr "Ägare"
 
@@ -1781,7 +1738,7 @@ msgstr ""
 "Antal veckor sedan senaste gången en användare loggat sin närvaro för att "
 "anses vara inaktiv"
 
-#: gym/models/gym_config.py:56 gym/templates/gym/member_list.html:152
+#: gym/models/gym_config.py:56 gym/templates/gym/member_list.html:166
 msgid "Show name in header"
 msgstr ""
 
@@ -1795,7 +1752,7 @@ msgstr ""
 msgid "Configuration for {self.gym.name}"
 msgstr "Konfiguration för {}"
 
-#: gym/models/user_config.py:65 gym/templates/gym/member_list.html:184
+#: gym/models/user_config.py:65 gym/templates/gym/member_list.html:200
 msgid "Overview of inactive members"
 msgstr "Överblick över inaktiva användare"
 
@@ -1819,7 +1776,7 @@ msgstr "Kommer att använda filnamn om ingenting anges"
 msgid "User notes"
 msgstr "Användaranteckningar"
 
-#: gym/templates/contract/list.html:36
+#: gym/templates/contract/list.html:34
 msgid "Show"
 msgstr "Visa"
 
@@ -1845,11 +1802,11 @@ msgstr "Följande användare har inte besökt gymmet de sista %(weeks)s veckorna
 msgid "Gym list"
 msgstr "Gymlista"
 
-#: gym/templates/gym/list.html:50
+#: gym/templates/gym/list.html:53
 msgid "Global gym configuration"
 msgstr "Global gymkonfiguration"
 
-#: gym/templates/gym/list.html:67 gym/views/gym.py:171
+#: gym/templates/gym/list.html:69 gym/views/gym.py:171
 msgid "Add new gym"
 msgstr "Lägg till nytt gym"
 
@@ -1861,43 +1818,43 @@ msgstr "Administratörer och tränare"
 msgid "Gym manager"
 msgstr "Gymmanager"
 
-#: gym/templates/gym/member_list.html:69
+#: gym/templates/gym/member_list.html:76
 msgid "This gym has no administrators or trainers"
 msgstr "Detta gym har inga administratörer eller tränare"
 
-#: gym/templates/gym/member_list.html:88
+#: gym/templates/gym/member_list.html:98
 msgid "Export"
 msgstr "Exportera"
 
-#: gym/templates/gym/member_list.html:125
+#: gym/templates/gym/member_list.html:137
 msgid "Members"
 msgstr "Medlemmar"
 
-#: gym/templates/gym/member_list.html:145
+#: gym/templates/gym/member_list.html:159
 msgid "Gym configuration"
 msgstr "Gymkonfiguration"
 
-#: gym/templates/gym/member_list.html:148
+#: gym/templates/gym/member_list.html:162
 msgid "Inactive members"
 msgstr "Inaktiva medlemmar"
 
-#: gym/templates/gym/member_list.html:149
+#: gym/templates/gym/member_list.html:163
 msgid "weeks"
 msgstr "veckor"
 
-#: gym/templates/gym/member_list.html:181
+#: gym/templates/gym/member_list.html:197
 msgid "My configuration"
 msgstr "Min konfiguration"
 
-#: gym/templates/gym/member_list.html:215
+#: gym/templates/gym/member_list.html:234
 msgid "Types"
 msgstr "Typer"
 
-#: gym/templates/gym/member_list.html:285
+#: gym/templates/gym/member_list.html:307
 msgid "Emails"
 msgstr "E-postmeddelanden"
 
-#: gym/templates/gym/member_list.html:315
+#: gym/templates/gym/member_list.html:336
 msgid "Add member"
 msgstr "Lägg till medlem"
 
@@ -2205,28 +2162,38 @@ msgstr "Också använda ingredienser i Svenska"
 msgid "Unit"
 msgstr "Enhet"
 
+#: manager/forms.py:191 manager/models/log.py:103 manager/models/setting.py:102
+#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
+msgid "RiR"
+msgstr ""
+
 #: manager/forms.py:279
 msgid "Type"
 msgstr "Typ"
 
-#: manager/forms.py:280 manager/templates/workout/view.html:113
+#: manager/forms.py:280 manager/templates/workout/view.html:122
 msgid "Table"
 msgstr "Tabell"
 
-#: manager/forms.py:282 manager/templates/workout/view.html:119
+#: manager/forms.py:282 manager/templates/workout/view.html:129
 msgid "with images"
 msgstr "med bilder"
 
-#: manager/forms.py:283 manager/templates/workout/view.html:125
+#: manager/forms.py:283 manager/templates/workout/view.html:136
 msgid "with comments"
 msgstr "med kommentarer"
 
+#: manager/helpers.py:86 manager/models/setting.py:72
+#: manager/templates/set/formset.html:9
+msgid "Reps"
+msgstr "Reps"
+
 #: manager/management/commands/email-reminders.py:121
 msgid "Workout will expire soon"
 msgstr "Träningspass snart löper ut"
 
 #: manager/models/day.py:34 manager/models/log.py:58
-#: manager/models/session.py:60 manager/templates/schedule/view.html:102
+#: manager/models/session.py:60 manager/templates/schedule/view.html:101
 #: manager/templates/workout/view.html:9 manager/templates/workout/view.html:17
 #: manager/views/pdf.py:85 manager/views/pdf.py:161
 #: manager/views/schedule.py:151 manager/views/schedule.py:221
@@ -2249,7 +2216,7 @@ msgstr "Dag"
 msgid "Name or short description of the schedule. For example 'Program XYZ'."
 msgstr "Namn eller en kort beskrivning av schemat. Till exempel 'Program XYZ'."
 
-#: manager/models/schedule.py:65 manager/templates/schedule/view.html:71
+#: manager/models/schedule.py:65 manager/templates/schedule/view.html:70
 msgid "Schedule active"
 msgstr "Schema aktivt"
 
@@ -2263,7 +2230,7 @@ msgstr ""
 "exempel på instrumentpanelen). Alla andra scheman kommer då att markeras som "
 "inaktiva"
 
-#: manager/models/schedule.py:77 manager/templates/schedule/view.html:81
+#: manager/models/schedule.py:77 manager/templates/schedule/view.html:80
 msgid "Is a loop"
 msgstr "Är en loop"
 
@@ -2284,7 +2251,7 @@ msgid "The duration in weeks"
 msgstr "Varaktighet i veckor"
 
 #: manager/models/schedule_step.py:64 manager/models/set.py:53
-#: manager/models/setting.py:113 nutrition/models/meal.py:55
+#: manager/models/setting.py:113 nutrition/models/meal.py:53
 #: nutrition/models/meal_item.py:66
 msgid "Order"
 msgstr "Ordning"
@@ -2419,7 +2386,7 @@ msgstr "Loggöversikt"
 msgid "Workout session"
 msgstr "Träningssession"
 
-#: manager/templates/calendar/partial_overview_table.html:27
+#: manager/templates/calendar/partial_overview_table.html:26
 msgid "Delete with logs"
 msgstr "Ta bort tillsammans med loggar"
 
@@ -2442,21 +2409,27 @@ msgstr ""
 "inte redan finns en för valt datum. Om det finns en kommer den helt enkelt "
 "redigeras. Viktinträden läggs alltid till."
 
-#: manager/templates/schedule/overview.html:5
+#: manager/templates/schedule/overview.html:4
 msgid "Your schedules"
 msgstr "Dina scheman"
 
 #: manager/templates/schedule/overview.html:19
-#: manager/templates/schedule/view.html:131
-#: manager/templates/schedule/view.html:183
+#: manager/templates/schedule/view.html:143
+#: manager/templates/schedule/view.html:193
 #: manager/templates/workout/overview.html:16
 msgid "active"
 msgstr "aktiv"
 
-#: manager/templates/schedule/overview.html:28
+#: manager/templates/schedule/overview.html:27
 msgid "No schedules found."
 msgstr "Inga träningspass hittade."
 
+#: manager/templates/schedule/overview.html:28
+#, fuzzy
+#| msgid "Add one now."
+msgid "Add one now"
+msgstr "Lägg till ett nu."
+
 #: manager/templates/schedule/overview.html:36
 #, fuzzy
 #| msgid ""
@@ -2479,13 +2452,14 @@ msgid ""
 "        before jumping to the next. It is also possible to create a loop, so "
 "you\n"
 "        always do the same workouts in succession, e.g. A > B > C > A > B > "
-"C and so on."
+"C and so\n"
+"        on."
 msgstr ""
 "Du kan ange hur länge du vill göra varje träningspass innan går vidare till "
 "nästa. Det är också möjligt att skapa en loop så att du alltid gör pass i "
 "samma ordning, t.ex. A > B > C > A > B > C och så vidare."
 
-#: manager/templates/schedule/overview.html:43
+#: manager/templates/schedule/overview.html:44
 #, fuzzy
 #| msgid ""
 #| "The currently active schedule will remain active (and be\n"
@@ -2510,7 +2484,7 @@ msgstr "Lägg till schema"
 msgid "Schedule"
 msgstr "Schema"
 
-#: manager/templates/schedule/view.html:85
+#: manager/templates/schedule/view.html:84
 msgid ""
 "This schedule is a loop and will go through the workouts above till you "
 "deactivate it"
@@ -2518,19 +2492,19 @@ msgstr ""
 "Detta schema är en loop och kommer att gå igenom de pass ovan tills du "
 "avaktiverar den"
 
-#: manager/templates/schedule/view.html:103
+#: manager/templates/schedule/view.html:102
 msgid "Weeks"
 msgstr "Veckor"
 
-#: manager/templates/schedule/view.html:115
+#: manager/templates/schedule/view.html:114
 msgid "Move me"
 msgstr "Flytta mig"
 
-#: manager/templates/schedule/view.html:156
+#: manager/templates/schedule/view.html:168
 msgid "Start schedule"
 msgstr "Starta schema"
 
-#: manager/templates/schedule/view.html:187
+#: manager/templates/schedule/view.html:197
 #, python-format
 msgid ""
 "%(weeks)s Week\n"
@@ -2541,11 +2515,11 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: manager/templates/schedule/view.html:221
+#: manager/templates/schedule/view.html:231
 msgid "Adding workouts"
 msgstr "Lägga till träningspass"
 
-#: manager/templates/schedule/view.html:223
+#: manager/templates/schedule/view.html:233
 #, fuzzy
 #| msgid ""
 #| "Add as many workouts to the schedule as you want. You can\n"
@@ -2562,21 +2536,21 @@ msgstr ""
 "genom att dra och släppa dem. Det är också möjligt att lägga till en övning "
 "mer än en gång."
 
-#: manager/templates/schedule/view.html:232
-#: manager/templates/schedule/view.html:243
-#: manager/templates/schedule/view.html:290
+#: manager/templates/schedule/view.html:242
+#: manager/templates/schedule/view.html:256
+#: manager/templates/schedule/view.html:310
 #: manager/templates/workout/view.html:69
-#: manager/templates/workout/view.html:79
-#: manager/templates/workout/view.html:178
+#: manager/templates/workout/view.html:83
+#: manager/templates/workout/view.html:192
 msgid "Export calendar file"
 msgstr "Exportera kalenderfil"
 
-#: manager/templates/schedule/view.html:236
+#: manager/templates/schedule/view.html:248
 msgid "Export this schedule as a calendar file."
 msgstr "Exportera detta schema som en kalenderfil."
 
-#: manager/templates/schedule/view.html:237
-#: manager/templates/workout/view.html:74
+#: manager/templates/schedule/view.html:249
+#: manager/templates/workout/view.html:76
 #, fuzzy
 #| msgid ""
 #| "You can then import the file it into your calendar\n"
@@ -2588,27 +2562,20 @@ msgid ""
 "                        application for example google calendar, outlook or "
 "iCal. This will create\n"
 "                        an appointment for each training day with the "
-"appropriate exercises."
+"appropriate\n"
+"                        exercises."
 msgstr ""
 "Du kan sedan importera filen till din kalenderapplikation, t.ex. Google "
 "calendar, Outlook eller iCal. Detta kommer skapa ett \"möte\" för varje "
 "träningsdag med övningar inkluderade."
 
-#: manager/templates/schedule/view.html:258
-#: manager/templates/schedule/view.html:294
-#: manager/templates/workout/view.html:94
-#: manager/templates/workout/view.html:174
+#: manager/templates/schedule/view.html:272
+#: manager/templates/schedule/view.html:315
+#: manager/templates/workout/view.html:99
+#: manager/templates/workout/view.html:188
 msgid "Download as PDF"
 msgstr "Ladda ner som PDF"
 
-#: manager/templates/schedule/view.html:299
-msgid "Edit schedule"
-msgstr "Redigera schema"
-
-#: manager/templates/schedule/view.html:304
-msgid "Delete schedule"
-msgstr "Ta bort schema"
-
 #: manager/templates/set/add.html:9
 #, python-format
 msgid "Add exercises to day \"%(day_name)s\""
@@ -2687,53 +2654,6 @@ msgstr ""
 "Du kommes regelbundet få sådana påminnelser tills du anger din nuvarande "
 "vikt."
 
-#: manager/templates/workout/log.html:10 manager/templates/workout/log.html:11
-msgid "Weight log"
-msgstr "Viktlogg"
-
-#: manager/templates/workout/log.html:29
-msgid "Weight log for workout"
-msgstr "Viktlogg för träningspass"
-
-#: manager/templates/workout/log.html:49
-msgid "Add weight log to this day"
-msgstr "Lägg till viktlogg till denna dag"
-
-#: manager/templates/workout/log.html:69
-msgid "No weight entries here."
-msgstr "Ingen viktinträden här."
-
-#: manager/templates/workout/log.html:77
-msgid "No exercises for this day."
-msgstr "Inga övningar för denna dag."
-
-#: manager/templates/workout/log.html:90
-msgid ""
-"This page shows the weight logs belonging to this workout\n"
-"only. Click on an exercise to see all the historical data for\n"
-"it."
-msgstr ""
-"Den här sidan visar viktloggarna som endast hörtill detta träningspass. "
-"Klicka på en övning att se all historik för den."
-
-#: manager/templates/workout/log.html:94
-msgid ""
-"If on a single day there is more than one entry with the\n"
-"same number of repetitions, but different weights, only the entry with the\n"
-"higher weight is shown in the diagram."
-msgstr ""
-"Om det finns mer än ett inträde med samma antal repetitioner, men olika "
-"vikter på en enda dag, visas endast inträdet med högre vikt i diagrammet."
-
-#: manager/templates/workout/log.html:98
-msgid ""
-"Note that only entries with a weight unit (kg or lb) and\n"
-"repetitions are charted, other combinations such as time or until failure\n"
-"are ignored here."
-msgstr ""
-"Notera att endast inmatningar av viktenheter (kg eller lb) och repetitioner "
-"är kartlagda, andra kombinationer som tid är ignorerade här."
-
 #: manager/templates/workout/overview.html:25
 #, fuzzy
 #| msgid "No schedules found."
@@ -2776,27 +2696,23 @@ msgstr "Lägg till träningsset till dagar"
 msgid "Set the repetitions for each set"
 msgstr "Ange repetitioner för varje set"
 
-#: manager/templates/workout/view.html:73
+#: manager/templates/workout/view.html:75
 msgid "Export this workout as a calendar file."
 msgstr "Exportera detta träningspass som en kalenderfil."
 
-#: manager/templates/workout/view.html:144
+#: manager/templates/workout/view.html:156
 msgid "Logs"
 msgstr ""
 
-#: manager/templates/workout/view.html:146
+#: manager/templates/workout/view.html:159
 msgid "View logs"
 msgstr ""
 
-#: manager/templates/workout/view.html:169 manager/views/schedule_step.py:99
-msgid "Edit workout"
-msgstr "Redigera träningspass"
-
-#: manager/templates/workout/view.html:182 manager/views/workout.py:281
+#: manager/templates/workout/view.html:195 manager/views/workout.py:281
 msgid "Mark as template"
 msgstr ""
 
-#: manager/views/day.py:109
+#: manager/views/day.py:105
 msgid "Add workout day"
 msgstr "Lägg till träningsdag"
 
@@ -2813,6 +2729,10 @@ msgstr "Träning för %s"
 msgid "Create schedule"
 msgstr "Skapa schema"
 
+#: manager/views/schedule_step.py:99
+msgid "Edit workout"
+msgstr "Redigera träningspass"
+
 #: manager/views/workout.py:209
 msgid "Copy workout"
 msgstr "Kopiera träningspass"
@@ -2942,7 +2862,7 @@ msgstr "Mängd i gram"
 msgid "Unit amount, e.g. \"1 Cup\" or \"1/2 spoon\""
 msgstr "Enhetsmängd (e.g. \"1 DL\" eller \"1/2 tesked\")"
 
-#: nutrition/models/log.py:52 nutrition/models/meal.py:50
+#: nutrition/models/log.py:52 nutrition/models/meal.py:48
 #: nutrition/models/meal_item.py:48 nutrition/models/plan.py:108
 msgid "Nutrition plan"
 msgstr "Kostplan"
@@ -2957,11 +2877,11 @@ msgstr "Måltid"
 msgid "Date and Time (Approx.)"
 msgstr "Tid (ca)"
 
-#: nutrition/models/meal.py:62
+#: nutrition/models/meal.py:60
 msgid "Time (approx)"
 msgstr "Tid (ca)"
 
-#: nutrition/models/meal.py:69
+#: nutrition/models/meal.py:67
 msgid ""
 "Give meals a textual description / name such as \"Breakfast\" or \"after "
 "workout\""
@@ -3095,10 +3015,6 @@ msgstr "Inga ingredienser."
 msgid "Search"
 msgstr "Sök"
 
-#: nutrition/templates/ingredient/overview.html:62
-msgid "Add ingredient"
-msgstr "Lägg till ingrediens"
-
 #: nutrition/templates/ingredient/view.html:45 nutrition/views/plan.py:229
 msgid "Macronutrients"
 msgstr "Makronäringsämnen"
@@ -3118,20 +3034,11 @@ msgstr "n.A."
 msgid "Others"
 msgstr "Andra"
 
-#: nutrition/templates/ingredient/view.html:144
-#: nutrition/templates/units/list.html:46 nutrition/views/unit.py:86
+#: nutrition/templates/ingredient/view.html:143
+#: nutrition/templates/units/list.html:50 nutrition/views/unit.py:86
 msgid "Add new weight unit"
 msgstr "Lägg till ny viktenhet"
 
-#: nutrition/templates/ingredient/view.html:206
-#: nutrition/templates/ingredient/view.html:209
-msgid "Edit ingredient"
-msgstr "Redigera ingrediens"
-
-#: nutrition/templates/ingredient/view.html:213
-msgid "Delete ingredient"
-msgstr "Ta bort ingrediens"
-
 #: nutrition/templates/rate/form.html:25
 msgid "Basal metabolic rate"
 msgstr "Basal ämnesomsättning"
@@ -3771,6 +3678,83 @@ msgstr ""
 msgid "Delete weight entry for the %s"
 msgstr ""
 
+#, fuzzy
+#~| msgid ""
+#~| "If a license has been localized, e.g. the Creative Commons\n"
+#~| "licenses for the different countries, add them as separate entries here."
+#~ msgid ""
+#~ "If a license has been localized, e.g. the Creative Commons\n"
+#~ "            licenses for the different countries, add them as separate "
+#~ "entries here."
+#~ msgstr ""
+#~ "Om en licens har lokaliserats, t. ex. de landsspecifika Creative Commons "
+#~ "licenserna, lägg till dessa som separata ingångar här."
+
+#~ msgid "This exercise has no repetitions."
+#~ msgstr "Denna övning har inga upprepningar."
+
+#~ msgid "Edit them now."
+#~ msgstr "Redigera dom nu."
+
+#~ msgid "Add exercises to this workout day"
+#~ msgstr "Lägg till övningar i denna träningsdag"
+
+#~ msgid "Edit schedule"
+#~ msgstr "Redigera schema"
+
+#~ msgid "Delete schedule"
+#~ msgstr "Ta bort schema"
+
+#~ msgid "Weight log"
+#~ msgstr "Viktlogg"
+
+#~ msgid "Weight log for workout"
+#~ msgstr "Viktlogg för träningspass"
+
+#~ msgid "Add weight log to this day"
+#~ msgstr "Lägg till viktlogg till denna dag"
+
+#~ msgid "No weight entries here."
+#~ msgstr "Ingen viktinträden här."
+
+#~ msgid "No exercises for this day."
+#~ msgstr "Inga övningar för denna dag."
+
+#~ msgid ""
+#~ "This page shows the weight logs belonging to this workout\n"
+#~ "only. Click on an exercise to see all the historical data for\n"
+#~ "it."
+#~ msgstr ""
+#~ "Den här sidan visar viktloggarna som endast hörtill detta träningspass. "
+#~ "Klicka på en övning att se all historik för den."
+
+#~ msgid ""
+#~ "If on a single day there is more than one entry with the\n"
+#~ "same number of repetitions, but different weights, only the entry with "
+#~ "the\n"
+#~ "higher weight is shown in the diagram."
+#~ msgstr ""
+#~ "Om det finns mer än ett inträde med samma antal repetitioner, men olika "
+#~ "vikter på en enda dag, visas endast inträdet med högre vikt i diagrammet."
+
+#~ msgid ""
+#~ "Note that only entries with a weight unit (kg or lb) and\n"
+#~ "repetitions are charted, other combinations such as time or until "
+#~ "failure\n"
+#~ "are ignored here."
+#~ msgstr ""
+#~ "Notera att endast inmatningar av viktenheter (kg eller lb) och "
+#~ "repetitioner är kartlagda, andra kombinationer som tid är ignorerade här."
+
+#~ msgid "Add ingredient"
+#~ msgstr "Lägg till ingrediens"
+
+#~ msgid "Edit ingredient"
+#~ msgstr "Redigera ingrediens"
+
+#~ msgid "Delete ingredient"
+#~ msgstr "Ta bort ingrediens"
+
 #~ msgid "Ingredients pending review"
 #~ msgstr "Ingredienser i avvaktan på översyn"
 
diff --git a/wger/locale/tr/LC_MESSAGES/django.po b/wger/locale/tr/LC_MESSAGES/django.po
index b22674d57..c839866ab 100644
--- a/wger/locale/tr/LC_MESSAGES/django.po
+++ b/wger/locale/tr/LC_MESSAGES/django.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: wger Workout Manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-07-14 15:49+0200\n"
+"POT-Creation-Date: 2024-11-14 13:09+0100\n"
 "PO-Revision-Date: 2024-07-20 17:09+0000\n"
 "Last-Translator: Oğuz Ersen <oguz@ersen.moe>\n"
 "Language-Team: Turkish <https://hosted.weblate.org/projects/wger/web/tr/>\n"
@@ -21,7 +21,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 "X-Generator: Weblate 5.7-dev\n"
 
-#: config/models/gym_config.py:46 gym/templates/gym/list.html:53
+#: config/models/gym_config.py:46 gym/templates/gym/list.html:56
 msgid "Default gym"
 msgstr "Varsayılan spor salonu"
 
@@ -34,28 +34,28 @@ msgstr ""
 "kullanıcıları bu spor salonuna atayacak ve spor salonu olmayan tüm mevcut "
 "kullanıcıları güncelleyecektir."
 
-#: config/views/gym_config.py:42 core/templates/language/view.html:67
-#: core/templates/license/list.html:17 core/templates/misc/license/list.html:18
+#: config/views/gym_config.py:42 core/templates/language/view.html:64
+#: core/templates/license/list.html:17
 #: core/templates/repetition_unit/list.html:18
-#: core/templates/tags/render_day.html:39
-#: core/templates/tags/render_day.html:75 core/templates/user/overview.html:204
-#: core/templates/user/overview.html:445
+#: core/templates/user/overview.html:204 core/templates/user/overview.html:467
 #: core/templates/weight_unit/list.html:18
 #: exercises/templates/categories/admin-overview.html:17
 #: exercises/templates/equipment/admin-overview.html:17
-#: exercises/templates/muscles/admin-overview.html:17
-#: gallery/views/images.py:98 gym/templates/admin_notes/list.html:32
-#: gym/templates/contract/list.html:31 gym/templates/contract/view.html:107
-#: gym/templates/contract_option/list.html:32
-#: gym/templates/contract_type/list.html:32 gym/templates/document/list.html:38
-#: gym/templates/gym/list.html:20 gym/templates/gym/list.html:46
-#: gym/templates/gym/member_list.html:87 gym/templates/gym/member_list.html:140
-#: gym/templates/gym/member_list.html:176
-#: manager/templates/calendar/day.html:68
-#: manager/templates/calendar/month.html:85
-#: manager/templates/calendar/partial_overview_table.html:18
-#: manager/templates/schedule/view.html:118
-#: nutrition/templates/ingredient/view.html:165
+#: exercises/templates/muscles/admin-overview.html:16
+#: gallery/views/images.py:98 gym/templates/admin_notes/list.html:31
+#: gym/templates/contract/list.html:30 gym/templates/contract/view.html:106
+#: gym/templates/contract_option/list.html:29
+#: gym/templates/contract_type/list.html:30 gym/templates/document/list.html:38
+#: gym/templates/gym/list.html:19 gym/templates/gym/list.html:48
+#: gym/templates/gym/member_list.html:94 gym/templates/gym/member_list.html:152
+#: gym/templates/gym/member_list.html:190
+#: manager/templates/calendar/day.html:67
+#: manager/templates/calendar/month.html:84
+#: manager/templates/calendar/partial_overview_table.html:16
+#: manager/templates/schedule/view.html:318
+#: manager/templates/workout/view.html:181
+#: nutrition/templates/ingredient/view.html:164
+#: nutrition/templates/ingredient/view.html:209
 #: nutrition/templates/units/list.html:19
 msgid "Edit"
 msgstr "Düzenle"
@@ -89,8 +89,8 @@ msgstr "Harika antrenman programım"
 msgid "Empty placeholder schedule"
 msgstr "Yer tutucu planı boş"
 
-#: core/forms.py:69 core/templates/navigation.html:285
-#: core/templates/navigation.html:291 core/templates/user/login.html:4
+#: core/forms.py:69 core/templates/navigation.html:284
+#: core/templates/navigation.html:290 core/templates/user/login.html:4
 #: software/templates/features.html:82 software/templates/features.html:427
 msgid "Login"
 msgstr "Oturum aç"
@@ -100,14 +100,14 @@ msgstr "Oturum aç"
 msgid "First name"
 msgstr "İsim"
 
-#: core/forms.py:109 core/forms.py:215 core/templates/user/overview.html:266
+#: core/forms.py:109 core/forms.py:215 core/templates/user/overview.html:284
 #: gym/views/export.py:62 gym/views/gym.py:217
 msgid "Last name"
 msgstr "Soyisim"
 
-#: core/forms.py:111 core/forms.py:180 core/templates/user/overview.html:270
+#: core/forms.py:111 core/forms.py:180 core/templates/user/overview.html:288
 #: gym/models/contract.py:256 gym/models/gym.py:58
-#: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:104
+#: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:116
 #: gym/templates/gym/new_user.html:30 gym/views/export.py:60
 #: mailer/templates/mailer/gym/form.html:4
 #: mailer/templates/mailer/gym/overview.html:4
@@ -138,8 +138,8 @@ msgstr "Antrenman hatırlatıcıları"
 msgid "Other settings"
 msgstr "Diğer ayarlar"
 
-#: core/forms.py:174 core/views/user.py:624 core/views/user.py:639
-#: core/views/user.py:651 gym/forms.py:73 manager/templates/log/add.html:65
+#: core/forms.py:174 core/views/user.py:623 core/views/user.py:638
+#: core/views/user.py:650 gym/forms.py:73 manager/templates/log/add.html:65
 #: manager/templates/set/add.html:70 manager/views/workout.py:203
 #: utils/generic_views.py:143
 msgid "Save"
@@ -164,26 +164,25 @@ msgstr "Parola"
 msgid "Please enter your current password."
 msgstr "Lütfen geçerli parolanızı girin."
 
-#: core/forms.py:242 core/templates/language/view.html:73
-#: core/templates/license/list.html:19 core/templates/misc/license/list.html:22
-#: core/templates/repetition_unit/list.html:20
-#: core/templates/tags/render_day.html:45
-#: core/templates/tags/render_day.html:81 core/templates/user/overview.html:217
-#: core/templates/weight_unit/list.html:20
-#: exercises/templates/categories/admin-overview.html:19
-#: exercises/templates/equipment/admin-overview.html:19
-#: exercises/templates/muscles/admin-overview.html:19
-#: gym/templates/admin_notes/list.html:40
-#: gym/templates/contract_option/list.html:41
-#: gym/templates/contract_type/list.html:41 gym/templates/document/list.html:46
-#: gym/templates/gym/list.html:22 manager/templates/calendar/day.html:73
-#: manager/templates/calendar/month.html:89
-#: manager/templates/calendar/partial_overview_table.html:23
-#: manager/templates/schedule/view.html:122
-#: manager/templates/workout/view.html:188
-#: nutrition/templates/ingredient/view.html:166
+#: core/forms.py:242 core/templates/language/view.html:70
+#: core/templates/license/list.html:21
+#: core/templates/repetition_unit/list.html:22
+#: core/templates/user/overview.html:233
+#: core/templates/weight_unit/list.html:22
+#: exercises/templates/categories/admin-overview.html:21
+#: exercises/templates/equipment/admin-overview.html:21
+#: exercises/templates/muscles/admin-overview.html:20
+#: gym/templates/admin_notes/list.html:37
+#: gym/templates/contract_option/list.html:35
+#: gym/templates/contract_type/list.html:36 gym/templates/document/list.html:46
+#: gym/templates/gym/list.html:23 manager/templates/calendar/day.html:73
+#: manager/templates/calendar/month.html:88
+#: manager/templates/calendar/partial_overview_table.html:22
+#: manager/templates/schedule/view.html:324
+#: manager/templates/workout/view.html:202
+#: nutrition/templates/ingredient/view.html:168
 #: nutrition/templates/ingredient/view.html:215
-#: nutrition/templates/units/list.html:22
+#: nutrition/templates/units/list.html:25
 msgid "Delete"
 msgstr "Sil"
 
@@ -195,9 +194,9 @@ msgstr "Geçersiz parola"
 msgid "The form is secured with reCAPTCHA"
 msgstr "Form reCAPTCHA ile güvence altına alındı"
 
-#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:285
-#: core/templates/navigation.html:297 core/templates/template.html:149
-#: core/templates/user/login.html:20 core/views/user.py:298
+#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:284
+#: core/templates/navigation.html:296 core/templates/template.html:151
+#: core/templates/user/login.html:20 core/views/user.py:297
 #: software/templates/features.html:87 software/templates/features.html:422
 msgid "Register"
 msgstr "Kayıt ol"
@@ -447,18 +446,18 @@ msgid "The sum of all hours has to be 24"
 msgstr "Tüm saatlerin toplamı 24 olmalıdır"
 
 #: core/models/rep_unit.py:36 core/models/weight_unit.py:36
-#: core/templates/user/overview.html:262 core/views/user.py:599
+#: core/templates/user/overview.html:280 core/views/user.py:598
 #: exercises/models/category.py:29 exercises/models/equipment.py:29
 #: exercises/models/exercise.py:59 exercises/models/muscle.py:36
 #: gym/models/contract.py:52 gym/models/contract.py:103 gym/models/gym.py:46
 #: gym/models/user_document.py:84 gym/templates/contract/view.html:50
-#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:96
+#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:108
 #: gym/views/gym.py:158 manager/models/schedule.py:55
 #: manager/models/workout.py:57 measurements/models/category.py:36
 #: nutrition/models/ingredient.py:111
-#: nutrition/models/ingredient_category.py:27 nutrition/models/meal.py:67
+#: nutrition/models/ingredient_category.py:27 nutrition/models/meal.py:65
 #: nutrition/models/weight_unit.py:38
-#: nutrition/templates/ingredient/view.html:152
+#: nutrition/templates/ingredient/view.html:151
 msgid "Name"
 msgstr "İsim"
 
@@ -510,7 +509,7 @@ msgstr ""
 msgid "Back to \"%(target)s\""
 msgstr "\"%(target)s\" sayfasına geri dön"
 
-#: core/templates/delete.html:15
+#: core/templates/delete.html:4
 msgid "Are you sure you want to delete this? This action cannot be undone."
 msgstr "Bunu silmek istediğinizden emin misiniz? Bu eylem geri alınamaz."
 
@@ -564,7 +563,7 @@ msgstr "E-posta adresinizi doğrulamak için lütfen tıklayın: %(link)s"
 msgid "Dashboard"
 msgstr "Gösterge Paneli"
 
-#: core/templates/language/overview.html:4 core/templates/navigation.html:345
+#: core/templates/language/overview.html:4 core/templates/navigation.html:344
 msgid "Languages"
 msgstr "Diller"
 
@@ -574,82 +573,72 @@ msgstr "Bulunamadı."
 
 #: core/templates/language/overview.html:22
 #: manager/templates/calendar/month.html:132
-#: manager/templates/schedule/overview.html:28
-#: manager/templates/schedule/view.html:144
+#: manager/templates/schedule/view.html:154
 #: manager/templates/workout/overview.html:28
 #: nutrition/templates/ingredient/overview.html:38
 msgid "Add one now."
 msgstr "Yeni ekle."
 
-#: core/templates/language/overview.html:35 core/templates/license/list.html:40
-#: core/templates/misc/license/list.html:43
-#: core/templates/repetition_unit/list.html:43
-#: core/templates/user/overview.html:326 core/templates/user/overview.html:365
-#: core/templates/user/overview.html:401
-#: core/templates/weight_unit/list.html:43 core/views/languages.py:74
+#: core/templates/language/overview.html:34 core/templates/license/list.html:43
+#: core/templates/repetition_unit/list.html:46
+#: core/templates/user/overview.html:344 core/templates/user/overview.html:384
+#: core/templates/user/overview.html:422
+#: core/templates/weight_unit/list.html:46 core/views/languages.py:74
 #: core/views/license.py:66 core/views/repetition_units.py:66
 #: core/views/weight_units.py:66
-#: exercises/templates/categories/admin-overview.html:38
-#: gallery/views/images.py:63 gym/templates/admin_notes/list.html:67
-#: gym/templates/contract/list.html:73
-#: gym/templates/contract_option/list.html:72
-#: gym/templates/contract_type/list.html:72 gym/templates/document/list.html:79
-#: gym/templates/gym/member_list.html:211
-#: gym/templates/gym/member_list.html:244
-#: gym/templates/gym/member_list.html:281
+#: exercises/templates/categories/admin-overview.html:40
+#: exercises/templates/equipment/admin-overview.html:39
+#: exercises/templates/muscles/admin-overview.html:40
+#: gallery/views/images.py:63 gym/templates/admin_notes/list.html:64
+#: gym/templates/contract/list.html:69
+#: gym/templates/contract_option/list.html:65
+#: gym/templates/contract_type/list.html:66 gym/templates/document/list.html:78
+#: gym/templates/gym/member_list.html:228
+#: gym/templates/gym/member_list.html:264
+#: gym/templates/gym/member_list.html:303
 #: mailer/templates/mailer/gym/overview.html:43
+#: nutrition/templates/ingredient/overview.html:60
 msgid "Add"
 msgstr "Ekle"
 
 #: core/templates/language/view.html:61 core/templates/user/api_key.html:44
-#: core/templates/user/preferences.html:45 gym/models/contract.py:203
-#: gym/templates/contract/view.html:41 gym/templates/contract/view.html:106
-#: gym/templates/gym/member_list.html:248
-#: manager/templates/schedule/view.html:285
-#: manager/templates/workout/view.html:163
-#: nutrition/templates/ingredient/view.html:202
+#: core/templates/user/preferences.html:50 gym/models/contract.py:203
+#: gym/templates/contract/view.html:41 gym/templates/gym/member_list.html:270
+#: manager/templates/schedule/view.html:304
+#: manager/templates/workout/view.html:177
+#: nutrition/templates/ingredient/view.html:206
 msgid "Options"
 msgstr "Seçenekler"
 
-#: core/templates/license/list.html:4 core/templates/misc/license/list.html:4
+#: core/templates/license/list.html:4
 msgid "License list"
 msgstr "Lisans listesi"
 
-#: core/templates/license/list.html:26 core/templates/misc/license/list.html:30
-#: core/templates/repetition_unit/list.html:28
+#: core/templates/license/list.html:30
+#: core/templates/repetition_unit/list.html:32
 #: core/templates/user/overview.html:104 core/templates/user/overview.html:136
-#: core/templates/user/overview.html:185 core/templates/user/overview.html:347
-#: core/templates/user/overview.html:383 core/templates/user/overview.html:427
-#: core/templates/weight_unit/list.html:28
-#: exercises/templates/categories/admin-overview.html:26
-#: exercises/templates/equipment/admin-overview.html:26
-#: exercises/templates/muscles/admin-overview.html:26
-#: gym/templates/admin_notes/list.html:52 gym/templates/contract/list.html:60
-#: gym/templates/contract_option/list.html:58
-#: gym/templates/contract_type/list.html:58 gym/templates/document/list.html:64
-#: gym/templates/gym/list.html:29 gym/templates/gym/member_list.html:229
-#: gym/templates/gym/member_list.html:262
-#: gym/templates/gym/member_list.html:299
+#: core/templates/user/overview.html:185 core/templates/user/overview.html:365
+#: core/templates/user/overview.html:404 core/templates/user/overview.html:448
+#: core/templates/weight_unit/list.html:32
+#: exercises/templates/categories/admin-overview.html:30
+#: exercises/templates/equipment/admin-overview.html:30
+#: exercises/templates/muscles/admin-overview.html:29
+#: gym/templates/admin_notes/list.html:50 gym/templates/contract/list.html:57
+#: gym/templates/contract_option/list.html:52
+#: gym/templates/contract_type/list.html:53 gym/templates/document/list.html:64
+#: gym/templates/gym/list.html:32 gym/templates/gym/member_list.html:248
+#: gym/templates/gym/member_list.html:284
+#: gym/templates/gym/member_list.html:321
 #: mailer/templates/mailer/gym/overview.html:30
-#: manager/templates/calendar/day.html:87
-#: nutrition/templates/units/list.html:29
+#: manager/templates/calendar/day.html:88
+#: nutrition/templates/units/list.html:34
 msgid "Nothing found"
 msgstr "Hiçbir şey Bulunamadı"
 
-#: core/templates/misc/about.html:4 core/templates/template.html:175
+#: core/templates/misc/about.html:4 core/templates/template.html:188
 msgid "Imprint"
 msgstr "Künye"
 
-#: core/templates/misc/license/list.html:47
-msgid ""
-"If a license has been localized, e.g. the Creative Commons\n"
-"            licenses for the different countries, add them as separate "
-"entries here."
-msgstr ""
-"Bir lisans yerelleştirilmişse, örneğin farklı ülkeler için\n"
-"            Creative Commons lisansları, onları buraya ayrı girişler olarak "
-"ekleyin."
-
 #: core/templates/navigation.html:28 software/templates/features.html:437
 msgid "Training"
 msgstr "Eğitim"
@@ -694,8 +683,8 @@ msgstr "Herkese açık şablonlar"
 msgid "Exercises"
 msgstr "Egzersizler"
 
-#: core/templates/navigation.html:111 core/templates/navigation.html:184
-#: core/templates/navigation.html:340
+#: core/templates/navigation.html:111 core/templates/navigation.html:185
+#: core/templates/navigation.html:339
 msgid "Administration"
 msgstr "Yönetim"
 
@@ -732,87 +721,87 @@ msgstr "BMI hesaplayıcı"
 msgid "Daily calories calculator"
 msgstr "Günlük kalori hesaplayıcı"
 
-#: core/templates/navigation.html:179
+#: core/templates/navigation.html:180
 #: nutrition/templates/ingredient/overview.html:10
 msgid "Ingredient overview"
 msgstr "İçeriğe genel bakış"
 
-#: core/templates/navigation.html:187 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:189 nutrition/templates/units/list.html:6
 msgid "Ingredient weight units"
 msgstr "İçerik ağırlık birimleri"
 
-#: core/templates/navigation.html:203 software/templates/features.html:442
+#: core/templates/navigation.html:205 software/templates/features.html:442
 msgid "Body weight"
 msgstr "Vücut ağırlığı"
 
-#: core/templates/navigation.html:210 core/templates/user/overview.html:114
+#: core/templates/navigation.html:212 core/templates/user/overview.html:114
 msgid "Weight overview"
 msgstr "Ağırlığa genel bakış"
 
-#: core/templates/navigation.html:217 weight/views.py:65
+#: core/templates/navigation.html:216 weight/views.py:65
 msgid "Add weight entry"
 msgstr "Kilo girişi ekleyin"
 
-#: core/templates/navigation.html:231
+#: core/templates/navigation.html:230
 msgid "About this software"
 msgstr "Bu yazılım hakkında"
 
-#: core/templates/navigation.html:237 software/templates/about_us.html:5
+#: core/templates/navigation.html:236 software/templates/about_us.html:5
 msgid "About us"
 msgstr "Hakkımızda"
 
-#: core/templates/navigation.html:243 software/templates/features.html:507
+#: core/templates/navigation.html:242 software/templates/features.html:507
 msgid "REST API"
 msgstr "REST API"
 
-#: core/templates/navigation.html:249 utils/models.py:45
+#: core/templates/navigation.html:248 utils/models.py:45
 msgid "License"
 msgstr "Lisans"
 
-#: core/templates/navigation.html:255
+#: core/templates/navigation.html:254
 msgid "Developer documentation"
 msgstr "Geliştirici belgeleri"
 
-#: core/templates/navigation.html:262
+#: core/templates/navigation.html:261
 msgid "Get the code"
 msgstr "Kodu alın"
 
-#: core/templates/navigation.html:269 core/templates/template.html:214
+#: core/templates/navigation.html:268 core/templates/template.html:227
 #: software/templates/features.html:582
 msgid "Translate"
 msgstr "Çevir"
 
-#: core/templates/navigation.html:303 core/templates/user/login.html:28
+#: core/templates/navigation.html:302 core/templates/user/login.html:28
 msgid "Reset password"
 msgstr "Parolayı sıfırla"
 
-#: core/templates/navigation.html:321
+#: core/templates/navigation.html:320
 msgid "My preferences"
 msgstr "Benim tercihlerim"
 
-#: core/templates/navigation.html:330
+#: core/templates/navigation.html:329
 msgid "Logout"
 msgstr "Çıkış"
 
-#: core/templates/navigation.html:353
+#: core/templates/navigation.html:352
 msgid "Licenses"
 msgstr "Lisanslar"
 
-#: core/templates/navigation.html:361
+#: core/templates/navigation.html:360
 #: core/templates/repetition_unit/list.html:4
 msgid "Repetition units"
 msgstr "Tekrarlama birimleri"
 
-#: core/templates/navigation.html:369 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:368 core/templates/weight_unit/list.html:4
 #: nutrition/templates/ingredient/view.html:141
 msgid "Weight units"
 msgstr "Ağırlık birimleri"
 
-#: core/templates/navigation.html:377 core/templates/user/list.html:4
+#: core/templates/navigation.html:376 core/templates/user/list.html:4
 msgid "User list"
 msgstr "Kullanıcı listesi"
 
-#: core/templates/navigation.html:383
+#: core/templates/navigation.html:382
 msgid "Gyms"
 msgstr "Spor salonları"
 
@@ -875,56 +864,31 @@ msgstr "önceki"
 msgid "next"
 msgstr "Sonraki"
 
-#: core/templates/tags/render_day.html:34
-msgid "Add weight log"
-msgstr "Kilo günlüğü ekle"
-
-#: core/templates/tags/render_day.html:116
-msgid "Placeholder image for exercise"
+#: core/templates/tags/render_day.html:44
+#, fuzzy
+#| msgid "Placeholder image for exercise"
+msgid "Placeholder image for translation"
 msgstr "Egzersiz için yer tutucu resmi"
 
-#: core/templates/tags/render_day.html:133
-msgid "This exercise has no repetitions."
-msgstr "Bu egzersizin tekrarı yoktur."
-
-#: core/templates/tags/render_day.html:136
-msgid "Edit them now."
-msgstr "Şimdi düzenleyin."
-
-#: core/templates/tags/render_day.html:162
-msgid "Add exercises to this workout day"
-msgstr "Bu antrenman gününe egzersiz ekleyin"
-
-#: core/templates/tags/render_weight_log.html:17 manager/helpers.py:86
-#: manager/models/setting.py:72 manager/templates/set/formset.html:9
-msgid "Reps"
-msgstr "Temsilciler"
-
-#: core/templates/tags/render_weight_log.html:30 manager/forms.py:191
-#: manager/models/log.py:103 manager/models/setting.py:102
-#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
-msgid "RiR"
-msgstr "RiR"
-
-#: core/templates/template.html:122 manager/templates/calendar/month.html:138
-#: manager/templates/schedule/view.html:248
-#: manager/templates/schedule/view.html:269
-#: manager/templates/workout/view.html:84
-#: manager/templates/workout/view.html:137
+#: core/templates/template.html:124 manager/templates/calendar/month.html:138
+#: manager/templates/schedule/view.html:262
+#: manager/templates/schedule/view.html:287
+#: manager/templates/workout/view.html:89
+#: manager/templates/workout/view.html:149
 msgid "Close"
 msgstr "Kapat"
 
-#: core/templates/template.html:138
+#: core/templates/template.html:140
 msgid ""
 "You are using a guest account, data entered will be deleted after a week."
 msgstr ""
 "Misafir hesabı kullanıyorsunuz, girilen veriler bir hafta sonra silinecek."
 
-#: core/templates/template.html:143
+#: core/templates/template.html:145
 msgid "Create some demo entries"
 msgstr "Bazı demo girişleri oluşturun"
 
-#: core/templates/template.html:180 software/templates/features.html:547
+#: core/templates/template.html:193 software/templates/features.html:547
 #: software/templates/tos.html:7
 msgid "Terms of service"
 msgstr "Kullanım Şartları"
@@ -933,7 +897,7 @@ msgstr "Kullanım Şartları"
 msgid "Features"
 msgstr "Özellikleri"
 
-#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:54
+#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:59
 msgid "API key"
 msgstr "API anahtarı"
 
@@ -978,17 +942,17 @@ msgstr "Yeni API anahtarı oluşturun"
 msgid "Documentation"
 msgstr "Dokümantasyon"
 
-#: core/templates/user/delete_account.html:4
-#: core/templates/user/preferences.html:59
+#: core/templates/user/delete_account.html:3
+#: core/templates/user/preferences.html:62
 msgid "Delete account"
 msgstr "Hesabı sil"
 
-#: core/templates/user/delete_account.html:17
+#: core/templates/user/delete_account.html:9
 #: exercises/templates/history/overview.html:93
 msgid "Are you sure?"
 msgstr "Emin misiniz?"
 
-#: core/templates/user/delete_account.html:22
+#: core/templates/user/delete_account.html:14
 #, python-format
 msgid ""
 "This action will delete the user account \"%(username)s\".\n"
@@ -1011,22 +975,22 @@ msgstr "Parolanızı mı unuttunuz?"
 
 #: core/templates/user/overview.html:25 core/templates/user/overview.html:68
 #: core/templates/user/overview.html:112 core/templates/user/overview.html:144
-#: core/templates/user/overview.html:330 core/templates/user/overview.html:369
-#: core/templates/user/overview.html:405
+#: core/templates/user/overview.html:348 core/templates/user/overview.html:390
+#: core/templates/user/overview.html:426
 #, python-format
 msgid "last %(number)s"
 msgstr "son %(number)s"
 
 #: core/templates/user/overview.html:27 core/templates/user/overview.html:146
-#: core/templates/user/overview.html:325 core/templates/user/overview.html:364
-#: core/templates/user/overview.html:400 gym/templates/gym/member_list.html:210
-#: gym/templates/gym/member_list.html:243
-#: gym/templates/gym/member_list.html:280
+#: core/templates/user/overview.html:343 core/templates/user/overview.html:382
+#: core/templates/user/overview.html:421 gym/templates/gym/member_list.html:226
+#: gym/templates/gym/member_list.html:262
+#: gym/templates/gym/member_list.html:302
 msgid "Overview"
 msgstr "Genel Bakış"
 
 #: core/templates/user/overview.html:28
-#: manager/templates/schedule/view.html:163
+#: manager/templates/schedule/view.html:172
 #: manager/templates/workout/overview.html:39 manager/views/schedule_step.py:60
 msgid "Add workout"
 msgstr "Antrenman ekle"
@@ -1058,38 +1022,36 @@ msgstr "Açıklama"
 msgid "Number of logs (days)"
 msgstr "Günlük sayısı (gün)"
 
-#: core/templates/user/overview.html:37 core/views/user.py:600
+#: core/templates/user/overview.html:37 core/views/user.py:599
 #: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:158
 msgid "Last activity"
 msgstr "Son Aktivite"
 
 #: core/templates/user/overview.html:58
 #: manager/templates/calendar/month.html:128
-#: manager/templates/schedule/view.html:144
 #: manager/templates/workout/overview.html:28
 msgid "No workouts found."
 msgstr "Antrenman bulunamadı."
 
 #: core/templates/user/overview.html:68 manager/forms.py:280
-#: manager/templates/workout/view.html:106
+#: manager/templates/workout/view.html:114
 msgid "Log"
 msgstr "Kayıt"
 
 #: core/templates/user/overview.html:77 manager/models/session.py:83
-#: manager/templates/calendar/partial_overview_table.html:52
+#: manager/templates/calendar/partial_overview_table.html:54
 msgid "General impression"
 msgstr "Genel izlenim"
 
-#: core/templates/user/overview.html:78 core/templates/user/overview.html:369
+#: core/templates/user/overview.html:78 core/templates/user/overview.html:390
 #: manager/models/session.py:73
-#: manager/templates/calendar/partial_overview_table.html:56
-#: manager/templates/workout/log.html:89
+#: manager/templates/calendar/partial_overview_table.html:58
 msgid "Notes"
 msgstr "Notlar"
 
 #: core/templates/user/overview.html:79
 #: exercises/templates/history/overview.html:30
-#: manager/templates/calendar/partial_overview_table.html:42
+#: manager/templates/calendar/partial_overview_table.html:44
 msgid "Time"
 msgstr "Zaman"
 
@@ -1127,123 +1089,123 @@ msgstr "Yağ"
 msgid "kcal"
 msgstr "kilokalori"
 
-#: core/templates/user/overview.html:201 core/templates/user/overview.html:322
-#: core/templates/user/overview.html:361 core/templates/user/overview.html:397
-#: core/templates/user/overview.html:442 gym/templates/gym/list.html:42
-#: gym/templates/gym/member_list.html:84 gym/templates/gym/member_list.html:137
-#: gym/templates/gym/member_list.html:173
-#: gym/templates/gym/member_list.html:207
-#: gym/templates/gym/member_list.html:240
-#: gym/templates/gym/member_list.html:277
-#: manager/templates/schedule/view.html:100
+#: core/templates/user/overview.html:201 core/templates/user/overview.html:340
+#: core/templates/user/overview.html:379 core/templates/user/overview.html:418
+#: core/templates/user/overview.html:463 gym/templates/gym/list.html:45
+#: gym/templates/gym/member_list.html:91 gym/templates/gym/member_list.html:149
+#: gym/templates/gym/member_list.html:187
+#: gym/templates/gym/member_list.html:223
+#: gym/templates/gym/member_list.html:259
+#: gym/templates/gym/member_list.html:299
+#: manager/templates/schedule/view.html:99
 msgid "Actions"
 msgstr "Hareketler"
 
-#: core/templates/user/overview.html:207
+#: core/templates/user/overview.html:210
 msgid "Deactivate user"
 msgstr "Kullanıcıyı devre dışı bırak"
 
-#: core/templates/user/overview.html:209
+#: core/templates/user/overview.html:214
 msgid "Activate user"
 msgstr "Kullanıcıyı etkinleştir"
 
-#: core/templates/user/overview.html:211
+#: core/templates/user/overview.html:223
 msgid "Reset user password"
 msgstr "Kullanıcı parolasını sıfırla"
 
-#: core/templates/user/overview.html:214 gym/templates/gym/member_list.html:30
+#: core/templates/user/overview.html:227 gym/templates/gym/member_list.html:30
 msgid "Roles"
 msgstr "Roller"
 
-#: core/templates/user/overview.html:225
+#: core/templates/user/overview.html:243
 msgid "Password reset confirmation"
 msgstr "Parola sıfırlama onayı"
 
-#: core/templates/user/overview.html:229
+#: core/templates/user/overview.html:247
 msgid "Do you really want to change this user&#39;s password?"
 msgstr "Bu kullanıcının parolasını gerçekten değiştirmek istiyor musunuz?"
 
-#: core/templates/user/overview.html:232
+#: core/templates/user/overview.html:250
 #: exercises/templates/history/overview.html:106
 msgid "No"
 msgstr "Hayır"
 
-#: core/templates/user/overview.html:233
+#: core/templates/user/overview.html:251
 #: exercises/templates/history/overview.html:99
 msgid "Yes"
 msgstr "Evet"
 
-#: core/templates/user/overview.html:254 gym/templates/gym/member_list.html:93
+#: core/templates/user/overview.html:272 gym/templates/gym/member_list.html:105
 msgid "Details"
 msgstr "Detaylar"
 
-#: core/templates/user/overview.html:258 gym/views/export.py:57
-#: manager/helpers.py:86 manager/templates/schedule/view.html:98
+#: core/templates/user/overview.html:276 gym/views/export.py:57
+#: manager/helpers.py:86 manager/templates/schedule/view.html:97
 msgid "Nr."
 msgstr "Nr."
 
-#: core/templates/user/overview.html:280 gym/models/contract.py:287
+#: core/templates/user/overview.html:298 gym/models/contract.py:287
 #: gym/models/gym.py:50 gym/templates/contract/view.html:75
-#: gym/templates/gym/member_list.html:100 gym/views/export.py:68
+#: gym/templates/gym/member_list.html:112 gym/views/export.py:68
 msgid "Phone"
 msgstr "Telefon"
 
-#: core/templates/user/overview.html:284 gym/templates/contract/view.html:87
-#: gym/templates/gym/member_list.html:118
+#: core/templates/user/overview.html:302 gym/templates/contract/view.html:87
+#: gym/templates/gym/member_list.html:130
 msgid "Address"
 msgstr "Adres"
 
-#: core/templates/user/overview.html:295
+#: core/templates/user/overview.html:313
 msgid "Registered"
 msgstr "Kayıtlı"
 
-#: core/templates/user/overview.html:299
+#: core/templates/user/overview.html:317
 msgid "Last login"
 msgstr "Son giriş"
 
-#: core/templates/user/overview.html:304
+#: core/templates/user/overview.html:322
 msgid "Status"
 msgstr "Durum"
 
-#: core/templates/user/overview.html:307
+#: core/templates/user/overview.html:325
 msgid "Active"
 msgstr "Aktif"
 
-#: core/templates/user/overview.html:309
+#: core/templates/user/overview.html:327
 msgid "Inactive"
 msgstr "Etkin değil"
 
-#: core/templates/user/overview.html:330 gym/templates/contract/list.html:4
-#: gym/templates/gym/member_list.html:202
+#: core/templates/user/overview.html:348 gym/templates/contract/list.html:4
+#: gym/templates/gym/member_list.html:218
 msgid "Contracts"
 msgstr "Sözleşmeler"
 
-#: core/templates/user/overview.html:405 gym/templates/document/list.html:4
+#: core/templates/user/overview.html:426 gym/templates/document/list.html:4
 msgid "Documents"
 msgstr "Belgeler"
 
-#: core/templates/user/overview.html:412 gym/templates/document/list.html:32
-#: manager/forms.py:292 manager/templates/workout/view.html:132
+#: core/templates/user/overview.html:433 gym/templates/document/list.html:33
+#: manager/forms.py:292 manager/templates/workout/view.html:143
 msgid "Download"
 msgstr "İndir"
 
-#: core/templates/user/overview.html:450 gym/views/admin_config.py:44
+#: core/templates/user/overview.html:474 gym/views/admin_config.py:44
 #: gym/views/admin_config.py:58 gym/views/user_config.py:46
 msgid "Configuration"
 msgstr "Yapılandırma"
 
-#: core/templates/user/overview.html:453 gym/models/user_config.py:92
+#: core/templates/user/overview.html:477 gym/models/user_config.py:92
 msgid "Include in inactive overview"
 msgstr "Etkin olmayan genel bakışa ekle"
 
-#: core/templates/user/overview.html:486
+#: core/templates/user/overview.html:510
 #, python-format
 msgid "Admin login is only available for users in %(gym_name)s"
 msgstr ""
 "Yönetici oturumu yalnızca %(gym_name)s içindeki kullanıcılar tarafından "
 "kullanılabilir"
 
-#: core/templates/user/overview.html:490
+#: core/templates/user/overview.html:514
 msgid "Log in as this user"
 msgstr "Bu kullanıcı olarak oturum açın"
 
@@ -1263,20 +1225,20 @@ msgstr "Doğrulanmamış e-posta adresi"
 msgid "Send verification email"
 msgstr "Doğrulama e-postası gönder"
 
-#: core/templates/user/preferences.html:30
+#: core/templates/user/preferences.html:31
 msgid "You need to verify your email to contribute exercises"
 msgstr ""
 "Egzersizlere katkıda bulunmak için e-posta adresinizi doğrulamanız gerekiyor"
 
-#: core/templates/user/preferences.html:50 core/views/user.py:611
+#: core/templates/user/preferences.html:55 core/views/user.py:610
 msgid "Change password"
 msgstr "Parola değiştir"
 
-#: core/templatetags/wger_extras.py:205 i18n.tpl:37
+#: core/templatetags/wger_extras.py:197 i18n.tpl:37
 msgid "kg"
 msgstr "kilogram"
 
-#: core/templatetags/wger_extras.py:207
+#: core/templatetags/wger_extras.py:199
 #: nutrition/templates/ingredient/view.html:60
 #: nutrition/templates/ingredient/view.html:66
 #: nutrition/templates/ingredient/view.html:73
@@ -1288,11 +1250,11 @@ msgctxt "weight unit, i.e. grams"
 msgid "g"
 msgstr "g"
 
-#: core/templatetags/wger_extras.py:210 i18n.tpl:38
+#: core/templatetags/wger_extras.py:202 i18n.tpl:38
 msgid "lb"
 msgstr "1 pound = 0.45 kg"
 
-#: core/templatetags/wger_extras.py:212
+#: core/templatetags/wger_extras.py:204
 msgctxt "weight unit, i.e. ounces"
 msgid "oz"
 msgstr "oz"
@@ -1319,13 +1281,13 @@ msgid "Delete {0}?"
 msgstr "{0} silinsin mi?"
 
 #: core/views/languages.py:111 core/views/license.py:85
-#: core/views/repetition_units.py:86 core/views/user.py:474
+#: core/views/repetition_units.py:86 core/views/user.py:473
 #: core/views/weight_units.py:86 exercises/views/categories.py:98
 #: exercises/views/equipment.py:81 exercises/views/muscles.py:87
 #: gym/views/admin_notes.py:161 gym/views/config.py:68
 #: gym/views/contract.py:186 gym/views/contract_option.py:123
 #: gym/views/contract_type.py:123 gym/views/document.py:171
-#: gym/views/gym.py:463 manager/views/day.py:100 manager/views/schedule.py:333
+#: gym/views/gym.py:463 manager/views/day.py:96 manager/views/schedule.py:333
 #: manager/views/workout.py:267 nutrition/views/ingredient.py:145
 #: nutrition/views/unit.py:143
 #, python-brace-format
@@ -1354,48 +1316,48 @@ msgstr "Sunmak"
 msgid "Your feedback was successfully sent. Thank you!"
 msgstr "Geri bildiriminiz başarıyla gönderildi. Teşekkür ederim!"
 
-#: core/views/user.py:156
+#: core/views/user.py:155
 #, python-brace-format
 msgid "Account \"{0}\" was successfully deleted"
 msgstr "\"{0}\" hesabı başarıyla silindi"
 
-#: core/views/user.py:292
+#: core/views/user.py:291
 msgid "You were successfully registered"
 msgstr "Başarıyla kaydoldunuz"
 
-#: core/views/user.py:351
+#: core/views/user.py:350
 msgid "Settings successfully updated"
 msgstr "Ayarlar başarıyla güncellendi"
 
-#: core/views/user.py:390
+#: core/views/user.py:389
 msgid "The user was successfully deactivated"
 msgstr "Kullanıcı başarıyla devre dışı bırakıldı"
 
-#: core/views/user.py:427
+#: core/views/user.py:426
 msgid "The user was successfully activated"
 msgstr "Kullanıcı başarıyla etkinleştirildi"
 
-#: core/views/user.py:442
+#: core/views/user.py:441
 msgid "Edit user"
 msgstr "Kullanıcıyı düzenle"
 
-#: core/views/user.py:597 gym/templates/gym/member_list.html:26
+#: core/views/user.py:596 gym/templates/gym/member_list.html:26
 #: gym/views/gym.py:158
 msgid "ID"
 msgstr "İD"
 
-#: core/views/user.py:598 gym/forms.py:95 gym/templates/contract/view.html:55
+#: core/views/user.py:597 gym/forms.py:95 gym/templates/contract/view.html:55
 #: gym/templates/gym/member_list.html:27 gym/views/export.py:59
 #: gym/views/gym.py:158 gym/views/gym.py:217
 msgid "Username"
 msgstr "Kullanıcı adı"
 
-#: core/views/user.py:601 gym/templates/gym/new_user.html:34
+#: core/views/user.py:600 gym/templates/gym/new_user.html:34
 #: gym/views/export.py:58 gym/views/gym.py:217
 msgid "Gym"
 msgstr "Jimnastik"
 
-#: core/views/user.py:660
+#: core/views/user.py:659
 #, python-format
 msgid "A verification email was sent to %(email)s"
 msgstr "%(email)s adresine bir doğrulama e-postası gönderildi"
@@ -1548,11 +1510,6 @@ msgstr "Kodek, uzun ad"
 msgid "Equipment list"
 msgstr "Ekipman listesi"
 
-#: exercises/templates/equipment/admin-overview.html:39
-#: exercises/views/equipment.py:92
-msgid "Add new equipment"
-msgstr "Yeni ekipman ekle"
-
 #: exercises/templates/history/overview.html:11
 msgid "Exercise admin history"
 msgstr "Egzersiz yönetici geçmişi"
@@ -1600,11 +1557,6 @@ msgstr "Değişiklikleri geri al"
 msgid "Muscle overview"
 msgstr "Kaslara genel bakış"
 
-#: exercises/templates/muscles/admin-overview.html:38
-#: exercises/views/muscles.py:68
-msgid "Add muscle"
-msgstr "Kas ekleyin"
-
 #: exercises/views/categories.py:72
 msgid "Add category"
 msgstr "Kategori ekle"
@@ -1613,6 +1565,10 @@ msgstr "Kategori ekle"
 msgid "This will also delete all exercises in this category."
 msgstr "Bu aynı zamanda bu kategorideki tüm alıştırmaları da silecektir."
 
+#: exercises/views/equipment.py:92
+msgid "Add new equipment"
+msgstr "Yeni ekipman ekle"
+
 #: exercises/views/equipment.py:104 exercises/views/equipment.py:115
 msgid "Delete equipment?"
 msgstr "Ekipman silinsin mi?"
@@ -1621,6 +1577,10 @@ msgstr "Ekipman silinsin mi?"
 msgid "This will delete the exercise from all workouts."
 msgstr "Bu, egzersizi tüm egzersiz programlarından silecektir."
 
+#: exercises/views/muscles.py:68
+msgid "Add muscle"
+msgstr "Kas ekleyin"
+
 #: gallery/templates/images/overview.html:62
 msgid "Add image"
 msgstr "Resim ekle"
@@ -1709,7 +1669,7 @@ msgid "Contract is active"
 msgstr "Sözleşme aktif"
 
 #: gym/models/contract.py:237 gym/templates/contract/view.html:69
-#: manager/models/schedule.py:61 manager/templates/schedule/view.html:67
+#: manager/models/schedule.py:61 manager/templates/schedule/view.html:66
 msgid "Start date"
 msgstr "Başlangıç tarihi"
 
@@ -1745,7 +1705,7 @@ msgstr "Yönetici: bir spor salonu için kullanıcıları yönetebilir"
 msgid "Admin: can administrate the different gyms"
 msgstr "Yönetici: farklı spor salonlarını yönetebilir"
 
-#: gym/models/gym.py:65 gym/templates/gym/member_list.html:114
+#: gym/models/gym.py:65 gym/templates/gym/member_list.html:126
 msgid "Owner"
 msgstr "Sahip"
 
@@ -1757,7 +1717,7 @@ msgstr ""
 "Bir kullanıcının aktif olmadığını düşünmek için varlığını son kez oturum "
 "açmasından bu yana geçen hafta sayısı"
 
-#: gym/models/gym_config.py:56 gym/templates/gym/member_list.html:152
+#: gym/models/gym_config.py:56 gym/templates/gym/member_list.html:166
 msgid "Show name in header"
 msgstr "Adı başlıkta göster"
 
@@ -1770,7 +1730,7 @@ msgstr "Site başlığında spor salonunun adını gösterin"
 msgid "Configuration for {self.gym.name}"
 msgstr "{self.gym.name} için yapılandırma"
 
-#: gym/models/user_config.py:65 gym/templates/gym/member_list.html:184
+#: gym/models/user_config.py:65 gym/templates/gym/member_list.html:200
 msgid "Overview of inactive members"
 msgstr "Etkin olmayan üyelere genel bakış"
 
@@ -1794,7 +1754,7 @@ msgstr "Hiçbir şey sağlanmazsa dosya adını kullanacak"
 msgid "User notes"
 msgstr "Kullanıcı notları"
 
-#: gym/templates/contract/list.html:36
+#: gym/templates/contract/list.html:34
 msgid "Show"
 msgstr "Göster"
 
@@ -1822,11 +1782,11 @@ msgstr ""
 msgid "Gym list"
 msgstr "Spor listesi"
 
-#: gym/templates/gym/list.html:50
+#: gym/templates/gym/list.html:53
 msgid "Global gym configuration"
 msgstr "Global spor salonu yapılandırması"
 
-#: gym/templates/gym/list.html:67 gym/views/gym.py:171
+#: gym/templates/gym/list.html:69 gym/views/gym.py:171
 msgid "Add new gym"
 msgstr "Yeni spor salonu ekle"
 
@@ -1838,43 +1798,43 @@ msgstr "Yöneticiler ve eğitmenler"
 msgid "Gym manager"
 msgstr "Spor salonu yöneticisi"
 
-#: gym/templates/gym/member_list.html:69
+#: gym/templates/gym/member_list.html:76
 msgid "This gym has no administrators or trainers"
 msgstr "Bu spor salonunun yöneticisi veya eğitmeni yok"
 
-#: gym/templates/gym/member_list.html:88
+#: gym/templates/gym/member_list.html:98
 msgid "Export"
 msgstr "Dışa çıkar"
 
-#: gym/templates/gym/member_list.html:125
+#: gym/templates/gym/member_list.html:137
 msgid "Members"
 msgstr "Üyeler"
 
-#: gym/templates/gym/member_list.html:145
+#: gym/templates/gym/member_list.html:159
 msgid "Gym configuration"
 msgstr "Spor salonu yapılandırması"
 
-#: gym/templates/gym/member_list.html:148
+#: gym/templates/gym/member_list.html:162
 msgid "Inactive members"
 msgstr "Etkin olmayan üyeler"
 
-#: gym/templates/gym/member_list.html:149
+#: gym/templates/gym/member_list.html:163
 msgid "weeks"
 msgstr "haftalar"
 
-#: gym/templates/gym/member_list.html:181
+#: gym/templates/gym/member_list.html:197
 msgid "My configuration"
 msgstr "Yapılandırmam"
 
-#: gym/templates/gym/member_list.html:215
+#: gym/templates/gym/member_list.html:234
 msgid "Types"
 msgstr "Türler"
 
-#: gym/templates/gym/member_list.html:285
+#: gym/templates/gym/member_list.html:307
 msgid "Emails"
 msgstr "E-postalar"
 
-#: gym/templates/gym/member_list.html:315
+#: gym/templates/gym/member_list.html:336
 msgid "Add member"
 msgstr "Üye ekle"
 
@@ -2171,28 +2131,38 @@ msgstr "Ayrıca İngilizce adları da arayın"
 msgid "Unit"
 msgstr "Birim"
 
+#: manager/forms.py:191 manager/models/log.py:103 manager/models/setting.py:102
+#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
+msgid "RiR"
+msgstr "RiR"
+
 #: manager/forms.py:279
 msgid "Type"
 msgstr "Tür"
 
-#: manager/forms.py:280 manager/templates/workout/view.html:113
+#: manager/forms.py:280 manager/templates/workout/view.html:122
 msgid "Table"
 msgstr "Tablo"
 
-#: manager/forms.py:282 manager/templates/workout/view.html:119
+#: manager/forms.py:282 manager/templates/workout/view.html:129
 msgid "with images"
 msgstr "resimlerle"
 
-#: manager/forms.py:283 manager/templates/workout/view.html:125
+#: manager/forms.py:283 manager/templates/workout/view.html:136
 msgid "with comments"
 msgstr "yorumlarla"
 
+#: manager/helpers.py:86 manager/models/setting.py:72
+#: manager/templates/set/formset.html:9
+msgid "Reps"
+msgstr "Temsilciler"
+
 #: manager/management/commands/email-reminders.py:121
 msgid "Workout will expire soon"
 msgstr "Antrenman yakında sona erecek"
 
 #: manager/models/day.py:34 manager/models/log.py:58
-#: manager/models/session.py:60 manager/templates/schedule/view.html:102
+#: manager/models/session.py:60 manager/templates/schedule/view.html:101
 #: manager/templates/workout/view.html:9 manager/templates/workout/view.html:17
 #: manager/views/pdf.py:85 manager/views/pdf.py:161
 #: manager/views/schedule.py:151 manager/views/schedule.py:221
@@ -2215,7 +2185,7 @@ msgstr "Gün"
 msgid "Name or short description of the schedule. For example 'Program XYZ'."
 msgstr "Programın adı veya kısa açıklaması. Örneğin 'XYZ Programı'."
 
-#: manager/models/schedule.py:65 manager/templates/schedule/view.html:71
+#: manager/models/schedule.py:65 manager/templates/schedule/view.html:70
 msgid "Schedule active"
 msgstr "Etkin program"
 
@@ -2229,7 +2199,7 @@ msgstr ""
 "işaretleyin (örneğin, kontrol panelinizde gösterilecektir). Diğer tüm "
 "programlar devre dışı olarak işaretlenecektir"
 
-#: manager/models/schedule.py:77 manager/templates/schedule/view.html:81
+#: manager/models/schedule.py:77 manager/templates/schedule/view.html:80
 msgid "Is a loop"
 msgstr "Bir döngü"
 
@@ -2250,7 +2220,7 @@ msgid "The duration in weeks"
 msgstr "Hafta cinsinden süre"
 
 #: manager/models/schedule_step.py:64 manager/models/set.py:53
-#: manager/models/setting.py:113 nutrition/models/meal.py:55
+#: manager/models/setting.py:113 nutrition/models/meal.py:53
 #: nutrition/models/meal_item.py:66
 msgid "Order"
 msgstr "Sipariş"
@@ -2394,7 +2364,7 @@ msgstr "Günlüğe genel bakış"
 msgid "Workout session"
 msgstr "Egzersiz seansı"
 
-#: manager/templates/calendar/partial_overview_table.html:27
+#: manager/templates/calendar/partial_overview_table.html:26
 msgid "Delete with logs"
 msgstr "Günlüklerle sil"
 
@@ -2417,21 +2387,27 @@ msgstr ""
 "seçilen tarih için zaten yoksa oluşturulabilir. Varsa\n"
 "basitçe düzenlenecektir. Ağırlık girişleri her zaman eklenir."
 
-#: manager/templates/schedule/overview.html:5
+#: manager/templates/schedule/overview.html:4
 msgid "Your schedules"
 msgstr "Programlarınız"
 
 #: manager/templates/schedule/overview.html:19
-#: manager/templates/schedule/view.html:131
-#: manager/templates/schedule/view.html:183
+#: manager/templates/schedule/view.html:143
+#: manager/templates/schedule/view.html:193
 #: manager/templates/workout/overview.html:16
 msgid "active"
 msgstr "aktif"
 
-#: manager/templates/schedule/overview.html:28
+#: manager/templates/schedule/overview.html:27
 msgid "No schedules found."
 msgstr "Program bulunamadı."
 
+#: manager/templates/schedule/overview.html:28
+#, fuzzy
+#| msgid "Add one now."
+msgid "Add one now"
+msgstr "Yeni ekle."
+
 #: manager/templates/schedule/overview.html:36
 msgid ""
 "Schedules are collections of workouts that you do in\n"
@@ -2441,12 +2417,20 @@ msgstr ""
 "        birleşimidir."
 
 #: manager/templates/schedule/overview.html:39
+#, fuzzy
+#| msgid ""
+#| "You can indicate how long you want to do each workout\n"
+#| "        before jumping to the next. It is also possible to create a loop, "
+#| "so you\n"
+#| "        always do the same workouts in succession, e.g. A > B > C > A > B "
+#| "> C and so on."
 msgid ""
 "You can indicate how long you want to do each workout\n"
 "        before jumping to the next. It is also possible to create a loop, so "
 "you\n"
 "        always do the same workouts in succession, e.g. A > B > C > A > B > "
-"C and so on."
+"C and so\n"
+"        on."
 msgstr ""
 "Bir sonrakine geçmeden önce her bir antrenmanı ne kadar\n"
 "        süreyle yapmak istediğinizi belirtebilirsiniz. Bir döngü de "
@@ -2454,7 +2438,7 @@ msgstr ""
 "        böylece her zaman aynı antrenmanları arka arkaya yaparsınız, örneğin "
 "A > B > C > A > B > C vb."
 
-#: manager/templates/schedule/overview.html:43
+#: manager/templates/schedule/overview.html:44
 msgid ""
 "The currently active schedule will remain active (and be\n"
 "        shown e.g. in your dashboard) till it reaches the last workout or "
@@ -2474,7 +2458,7 @@ msgstr "Program ekle"
 msgid "Schedule"
 msgstr "Program"
 
-#: manager/templates/schedule/view.html:85
+#: manager/templates/schedule/view.html:84
 msgid ""
 "This schedule is a loop and will go through the workouts above till you "
 "deactivate it"
@@ -2482,19 +2466,19 @@ msgstr ""
 "Bu program bir döngüdür ve siz devre dışı bırakana kadar yukarıdaki "
 "antrenmanlardan geçecektir"
 
-#: manager/templates/schedule/view.html:103
+#: manager/templates/schedule/view.html:102
 msgid "Weeks"
 msgstr "Haftalar"
 
-#: manager/templates/schedule/view.html:115
+#: manager/templates/schedule/view.html:114
 msgid "Move me"
 msgstr "Beni hareket ettir"
 
-#: manager/templates/schedule/view.html:156
+#: manager/templates/schedule/view.html:168
 msgid "Start schedule"
 msgstr "Programı başlat"
 
-#: manager/templates/schedule/view.html:187
+#: manager/templates/schedule/view.html:197
 #, python-format
 msgid ""
 "%(weeks)s Week\n"
@@ -2509,11 +2493,11 @@ msgstr[1] ""
 "%(weeks)s Hafta\n"
 "                                "
 
-#: manager/templates/schedule/view.html:221
+#: manager/templates/schedule/view.html:231
 msgid "Adding workouts"
 msgstr "Antrenman ekleme"
 
-#: manager/templates/schedule/view.html:223
+#: manager/templates/schedule/view.html:233
 msgid ""
 "Add as many workouts to the schedule as you want. You can\n"
 "            edit the order by dragging and dropping them. It's also possible "
@@ -2525,48 +2509,48 @@ msgstr ""
 "fazla kez de\n"
 "            ekleyebilirsiniz."
 
-#: manager/templates/schedule/view.html:232
-#: manager/templates/schedule/view.html:243
-#: manager/templates/schedule/view.html:290
+#: manager/templates/schedule/view.html:242
+#: manager/templates/schedule/view.html:256
+#: manager/templates/schedule/view.html:310
 #: manager/templates/workout/view.html:69
-#: manager/templates/workout/view.html:79
-#: manager/templates/workout/view.html:178
+#: manager/templates/workout/view.html:83
+#: manager/templates/workout/view.html:192
 msgid "Export calendar file"
 msgstr "Takvim dosyasını dışa aktar"
 
-#: manager/templates/schedule/view.html:236
+#: manager/templates/schedule/view.html:248
 msgid "Export this schedule as a calendar file."
 msgstr "Bu programı bir takvim dosyası olarak dışa aktarın."
 
-#: manager/templates/schedule/view.html:237
-#: manager/templates/workout/view.html:74
+#: manager/templates/schedule/view.html:249
+#: manager/templates/workout/view.html:76
+#, fuzzy
+#| msgid ""
+#| "You can then import the file it into your calendar\n"
+#| "                        application for example google calendar, outlook "
+#| "or iCal. This will create\n"
+#| "                        an appointment for each training day with the "
+#| "appropriate exercises."
 msgid ""
 "You can then import the file it into your calendar\n"
 "                        application for example google calendar, outlook or "
 "iCal. This will create\n"
 "                        an appointment for each training day with the "
-"appropriate exercises."
+"appropriate\n"
+"                        exercises."
 msgstr ""
 "Daha sonra dosyayı takvim uygulamanıza aktarabilirsiniz,\n"
 "                        örneğin google takvim, outlook veya iCal. Bu, her "
 "eğitim günü için uygun\n"
 "                        egzersizlerle birlikte bir randevu oluşturacaktır."
 
-#: manager/templates/schedule/view.html:258
-#: manager/templates/schedule/view.html:294
-#: manager/templates/workout/view.html:94
-#: manager/templates/workout/view.html:174
+#: manager/templates/schedule/view.html:272
+#: manager/templates/schedule/view.html:315
+#: manager/templates/workout/view.html:99
+#: manager/templates/workout/view.html:188
 msgid "Download as PDF"
 msgstr "PDF olarak indir"
 
-#: manager/templates/schedule/view.html:299
-msgid "Edit schedule"
-msgstr "Programı düzenle"
-
-#: manager/templates/schedule/view.html:304
-msgid "Delete schedule"
-msgstr "Programı sil"
-
 #: manager/templates/set/add.html:9
 #, python-format
 msgid "Add exercises to day \"%(day_name)s\""
@@ -2646,57 +2630,6 @@ msgstr ""
 "Mevcut kilonuzu girene kadar düzenli olarak bu tür hatırlatıcılar "
 "alacaksınız."
 
-#: manager/templates/workout/log.html:10 manager/templates/workout/log.html:11
-msgid "Weight log"
-msgstr "Ağırlık günlüğü"
-
-#: manager/templates/workout/log.html:29
-msgid "Weight log for workout"
-msgstr "Egzersiz için ağırlık günlüğü"
-
-#: manager/templates/workout/log.html:49
-msgid "Add weight log to this day"
-msgstr "Bu güne kilo günlüğü ekleyin"
-
-#: manager/templates/workout/log.html:69
-msgid "No weight entries here."
-msgstr "Burada ağırlık girişi yok."
-
-#: manager/templates/workout/log.html:77
-msgid "No exercises for this day."
-msgstr "Bu gün için egzersiz yok."
-
-#: manager/templates/workout/log.html:90
-msgid ""
-"This page shows the weight logs belonging to this workout\n"
-"only. Click on an exercise to see all the historical data for\n"
-"it."
-msgstr ""
-"Bu sayfa, bu antrenmana ait ağırlık günlüklerini gösterir.\n"
-"bir tek. İle ilgili tüm geçmiş verileri görmek için bir alıştırmayı "
-"tıklayın.\n"
-"o."
-
-#: manager/templates/workout/log.html:94
-msgid ""
-"If on a single day there is more than one entry with the\n"
-"same number of repetitions, but different weights, only the entry with the\n"
-"higher weight is shown in the diagram."
-msgstr ""
-"Tek bir günde birden fazla giriş varsa\n"
-"aynı sayıda tekrar, ancak farklı ağırlıklar, yalnızca\n"
-"diyagramda daha yüksek ağırlık gösterilmiştir."
-
-#: manager/templates/workout/log.html:98
-msgid ""
-"Note that only entries with a weight unit (kg or lb) and\n"
-"repetitions are charted, other combinations such as time or until failure\n"
-"are ignored here."
-msgstr ""
-"Yalnızca ağırlık birimi (kg veya lb) olan girişlerin ve\n"
-"tekrarlar, zaman gibi diğer kombinasyonlar veya başarısızlığa kadar\n"
-"burada göz ardı edilir."
-
 #: manager/templates/workout/overview.html:25
 msgid "No templates found."
 msgstr "Şablon bulunamadı."
@@ -2734,27 +2667,23 @@ msgstr "Günlere antrenman setleri ekle"
 msgid "Set the repetitions for each set"
 msgstr "Her set için tekrarları ayarlayın"
 
-#: manager/templates/workout/view.html:73
+#: manager/templates/workout/view.html:75
 msgid "Export this workout as a calendar file."
 msgstr "Bu antrenmanı bir takvim dosyası olarak dışa aktarın."
 
-#: manager/templates/workout/view.html:144
+#: manager/templates/workout/view.html:156
 msgid "Logs"
 msgstr "Kütükler"
 
-#: manager/templates/workout/view.html:146
+#: manager/templates/workout/view.html:159
 msgid "View logs"
 msgstr "Günlükleri görüntüle"
 
-#: manager/templates/workout/view.html:169 manager/views/schedule_step.py:99
-msgid "Edit workout"
-msgstr "Antrenmanı düzenle"
-
-#: manager/templates/workout/view.html:182 manager/views/workout.py:281
+#: manager/templates/workout/view.html:195 manager/views/workout.py:281
 msgid "Mark as template"
 msgstr "Şablon olarak işaretle"
 
-#: manager/views/day.py:109
+#: manager/views/day.py:105
 msgid "Add workout day"
 msgstr "Egzersiz günü ekle"
 
@@ -2771,6 +2700,10 @@ msgstr "%s için egzersiz"
 msgid "Create schedule"
 msgstr "Program oluştur"
 
+#: manager/views/schedule_step.py:99
+msgid "Edit workout"
+msgstr "Antrenmanı düzenle"
+
 #: manager/views/workout.py:209
 msgid "Copy workout"
 msgstr "Antrenmanı kopyala"
@@ -2893,7 +2826,7 @@ msgstr "Gram cinsinden miktar"
 msgid "Unit amount, e.g. \"1 Cup\" or \"1/2 spoon\""
 msgstr "Birim miktar, ör. \"1 Fincan\" veya \"1/2 kaşık\""
 
-#: nutrition/models/log.py:52 nutrition/models/meal.py:50
+#: nutrition/models/log.py:52 nutrition/models/meal.py:48
 #: nutrition/models/meal_item.py:48 nutrition/models/plan.py:108
 msgid "Nutrition plan"
 msgstr "Beslenme planı"
@@ -2906,11 +2839,11 @@ msgstr "Yemek"
 msgid "Date and Time (Approx.)"
 msgstr "Tarih ve Saat (Yaklaşık)"
 
-#: nutrition/models/meal.py:62
+#: nutrition/models/meal.py:60
 msgid "Time (approx)"
 msgstr "Zaman (yaklaşık)"
 
-#: nutrition/models/meal.py:69
+#: nutrition/models/meal.py:67
 msgid ""
 "Give meals a textual description / name such as \"Breakfast\" or \"after "
 "workout\""
@@ -3054,10 +2987,6 @@ msgstr "İçerik yok."
 msgid "Search"
 msgstr "Ara"
 
-#: nutrition/templates/ingredient/overview.html:62
-msgid "Add ingredient"
-msgstr "İçerik ekleyin"
-
 #: nutrition/templates/ingredient/view.html:45 nutrition/views/plan.py:229
 msgid "Macronutrients"
 msgstr "Makrobesinler"
@@ -3077,20 +3006,11 @@ msgstr "n.A."
 msgid "Others"
 msgstr "Diğerleri"
 
-#: nutrition/templates/ingredient/view.html:144
-#: nutrition/templates/units/list.html:46 nutrition/views/unit.py:86
+#: nutrition/templates/ingredient/view.html:143
+#: nutrition/templates/units/list.html:50 nutrition/views/unit.py:86
 msgid "Add new weight unit"
 msgstr "Yeni ağırlık birimi ekle"
 
-#: nutrition/templates/ingredient/view.html:206
-#: nutrition/templates/ingredient/view.html:209
-msgid "Edit ingredient"
-msgstr "Malzemeyi düzenleyin"
-
-#: nutrition/templates/ingredient/view.html:213
-msgid "Delete ingredient"
-msgstr "Malzemeyi sil"
-
 #: nutrition/templates/rate/form.html:25
 msgid "Basal metabolic rate"
 msgstr "Bazal metabolik oran"
@@ -3303,7 +3223,7 @@ msgstr ""
 msgid "Our goal"
 msgstr "Hedefimiz"
 
-#: software/templates/about_us.html:62
+#: software/templates/about_us.html:71
 msgid ""
 "The goal is to build an awesome\n"
 "                and flexible fitness manager, along with a comprehensive and "
@@ -3736,6 +3656,87 @@ msgstr "Başarıyla silindi."
 msgid "Delete weight entry for the %s"
 msgstr "%s için ağırlık girişini silin"
 
+#~ msgid ""
+#~ "If a license has been localized, e.g. the Creative Commons\n"
+#~ "            licenses for the different countries, add them as separate "
+#~ "entries here."
+#~ msgstr ""
+#~ "Bir lisans yerelleştirilmişse, örneğin farklı ülkeler için\n"
+#~ "            Creative Commons lisansları, onları buraya ayrı girişler "
+#~ "olarak ekleyin."
+
+#~ msgid "Add weight log"
+#~ msgstr "Kilo günlüğü ekle"
+
+#~ msgid "This exercise has no repetitions."
+#~ msgstr "Bu egzersizin tekrarı yoktur."
+
+#~ msgid "Edit them now."
+#~ msgstr "Şimdi düzenleyin."
+
+#~ msgid "Add exercises to this workout day"
+#~ msgstr "Bu antrenman gününe egzersiz ekleyin"
+
+#~ msgid "Edit schedule"
+#~ msgstr "Programı düzenle"
+
+#~ msgid "Delete schedule"
+#~ msgstr "Programı sil"
+
+#~ msgid "Weight log"
+#~ msgstr "Ağırlık günlüğü"
+
+#~ msgid "Weight log for workout"
+#~ msgstr "Egzersiz için ağırlık günlüğü"
+
+#~ msgid "Add weight log to this day"
+#~ msgstr "Bu güne kilo günlüğü ekleyin"
+
+#~ msgid "No weight entries here."
+#~ msgstr "Burada ağırlık girişi yok."
+
+#~ msgid "No exercises for this day."
+#~ msgstr "Bu gün için egzersiz yok."
+
+#~ msgid ""
+#~ "This page shows the weight logs belonging to this workout\n"
+#~ "only. Click on an exercise to see all the historical data for\n"
+#~ "it."
+#~ msgstr ""
+#~ "Bu sayfa, bu antrenmana ait ağırlık günlüklerini gösterir.\n"
+#~ "bir tek. İle ilgili tüm geçmiş verileri görmek için bir alıştırmayı "
+#~ "tıklayın.\n"
+#~ "o."
+
+#~ msgid ""
+#~ "If on a single day there is more than one entry with the\n"
+#~ "same number of repetitions, but different weights, only the entry with "
+#~ "the\n"
+#~ "higher weight is shown in the diagram."
+#~ msgstr ""
+#~ "Tek bir günde birden fazla giriş varsa\n"
+#~ "aynı sayıda tekrar, ancak farklı ağırlıklar, yalnızca\n"
+#~ "diyagramda daha yüksek ağırlık gösterilmiştir."
+
+#~ msgid ""
+#~ "Note that only entries with a weight unit (kg or lb) and\n"
+#~ "repetitions are charted, other combinations such as time or until "
+#~ "failure\n"
+#~ "are ignored here."
+#~ msgstr ""
+#~ "Yalnızca ağırlık birimi (kg veya lb) olan girişlerin ve\n"
+#~ "tekrarlar, zaman gibi diğer kombinasyonlar veya başarısızlığa kadar\n"
+#~ "burada göz ardı edilir."
+
+#~ msgid "Add ingredient"
+#~ msgstr "İçerik ekleyin"
+
+#~ msgid "Edit ingredient"
+#~ msgstr "Malzemeyi düzenleyin"
+
+#~ msgid "Delete ingredient"
+#~ msgstr "Malzemeyi sil"
+
 #~ msgid "Ingredients pending review"
 #~ msgstr "İncelenmeyi bekleyen malzemeler"
 
diff --git a/wger/locale/uk/LC_MESSAGES/django.po b/wger/locale/uk/LC_MESSAGES/django.po
index 50ecef86f..3d1e16374 100644
--- a/wger/locale/uk/LC_MESSAGES/django.po
+++ b/wger/locale/uk/LC_MESSAGES/django.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: wger Workout Manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-07-14 15:59+0200\n"
+"POT-Creation-Date: 2024-11-14 13:09+0100\n"
 "PO-Revision-Date: 2024-08-26 12:09+0000\n"
 "Last-Translator: kvinto <badsystem@ukr.net>\n"
 "Language-Team: Ukrainian <https://hosted.weblate.org/projects/wger/web/uk/>\n"
@@ -20,13 +20,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n % 10 == 1 && n % 100 != 11 "
-"? 0 : n % 1 == 0 && n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 12 || n % 100 > "
-"14) ? 1 : n % 1 == 0 && (n % 10 ==0 || (n % 10 >=5 && n % 10 <=9) || (n % "
-"100 >=11 && n % 100 <=14 )) ? 2: 3);\n"
+"Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n % 10 == 1 && n % 100 != "
+"11 ? 0 : n % 1 == 0 && n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 12 || n % "
+"100 > 14) ? 1 : n % 1 == 0 && (n % 10 ==0 || (n % 10 >=5 && n % 10 <=9) || "
+"(n % 100 >=11 && n % 100 <=14 )) ? 2: 3);\n"
 "X-Generator: Weblate 5.7.1-dev\n"
 
-#: config/models/gym_config.py:46 gym/templates/gym/list.html:53
+#: config/models/gym_config.py:46 gym/templates/gym/list.html:56
 msgid "Default gym"
 msgstr "Тренажерний зал за замовчуванням"
 
@@ -39,28 +39,28 @@ msgstr ""
 "призначений всім новим зареєстрованим користувачам і для всіх існуючих "
 "користувачів без тренажерного залу."
 
-#: config/views/gym_config.py:42 core/templates/language/view.html:67
-#: core/templates/license/list.html:17 core/templates/misc/license/list.html:18
+#: config/views/gym_config.py:42 core/templates/language/view.html:64
+#: core/templates/license/list.html:17
 #: core/templates/repetition_unit/list.html:18
-#: core/templates/tags/render_day.html:39
-#: core/templates/tags/render_day.html:75 core/templates/user/overview.html:204
-#: core/templates/user/overview.html:445
+#: core/templates/user/overview.html:204 core/templates/user/overview.html:467
 #: core/templates/weight_unit/list.html:18
 #: exercises/templates/categories/admin-overview.html:17
 #: exercises/templates/equipment/admin-overview.html:17
-#: exercises/templates/muscles/admin-overview.html:17
-#: gallery/views/images.py:98 gym/templates/admin_notes/list.html:32
-#: gym/templates/contract/list.html:31 gym/templates/contract/view.html:107
-#: gym/templates/contract_option/list.html:32
-#: gym/templates/contract_type/list.html:32 gym/templates/document/list.html:38
-#: gym/templates/gym/list.html:20 gym/templates/gym/list.html:46
-#: gym/templates/gym/member_list.html:87 gym/templates/gym/member_list.html:140
-#: gym/templates/gym/member_list.html:176
-#: manager/templates/calendar/day.html:68
-#: manager/templates/calendar/month.html:85
-#: manager/templates/calendar/partial_overview_table.html:18
-#: manager/templates/schedule/view.html:118
-#: nutrition/templates/ingredient/view.html:165
+#: exercises/templates/muscles/admin-overview.html:16
+#: gallery/views/images.py:98 gym/templates/admin_notes/list.html:31
+#: gym/templates/contract/list.html:30 gym/templates/contract/view.html:106
+#: gym/templates/contract_option/list.html:29
+#: gym/templates/contract_type/list.html:30 gym/templates/document/list.html:38
+#: gym/templates/gym/list.html:19 gym/templates/gym/list.html:48
+#: gym/templates/gym/member_list.html:94 gym/templates/gym/member_list.html:152
+#: gym/templates/gym/member_list.html:190
+#: manager/templates/calendar/day.html:67
+#: manager/templates/calendar/month.html:84
+#: manager/templates/calendar/partial_overview_table.html:16
+#: manager/templates/schedule/view.html:318
+#: manager/templates/workout/view.html:181
+#: nutrition/templates/ingredient/view.html:164
+#: nutrition/templates/ingredient/view.html:209
 #: nutrition/templates/units/list.html:19
 msgid "Edit"
 msgstr "Змінити"
@@ -94,8 +94,8 @@ msgstr "Моя класна програграма тренувань"
 msgid "Empty placeholder schedule"
 msgstr "Порожня програма-заповнювач"
 
-#: core/forms.py:69 core/templates/navigation.html:285
-#: core/templates/navigation.html:291 core/templates/user/login.html:4
+#: core/forms.py:69 core/templates/navigation.html:284
+#: core/templates/navigation.html:290 core/templates/user/login.html:4
 #: software/templates/features.html:82 software/templates/features.html:427
 msgid "Login"
 msgstr "Вхід"
@@ -105,14 +105,14 @@ msgstr "Вхід"
 msgid "First name"
 msgstr "Ім'я"
 
-#: core/forms.py:109 core/forms.py:215 core/templates/user/overview.html:266
+#: core/forms.py:109 core/forms.py:215 core/templates/user/overview.html:284
 #: gym/views/export.py:62 gym/views/gym.py:217
 msgid "Last name"
 msgstr "Прізвище"
 
-#: core/forms.py:111 core/forms.py:180 core/templates/user/overview.html:270
+#: core/forms.py:111 core/forms.py:180 core/templates/user/overview.html:288
 #: gym/models/contract.py:256 gym/models/gym.py:58
-#: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:104
+#: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:116
 #: gym/templates/gym/new_user.html:30 gym/views/export.py:60
 #: mailer/templates/mailer/gym/form.html:4
 #: mailer/templates/mailer/gym/overview.html:4
@@ -143,8 +143,8 @@ msgstr "Нагадування про тренування"
 msgid "Other settings"
 msgstr "Інші параметри"
 
-#: core/forms.py:174 core/views/user.py:624 core/views/user.py:639
-#: core/views/user.py:651 gym/forms.py:73 manager/templates/log/add.html:65
+#: core/forms.py:174 core/views/user.py:623 core/views/user.py:638
+#: core/views/user.py:650 gym/forms.py:73 manager/templates/log/add.html:65
 #: manager/templates/set/add.html:70 manager/views/workout.py:203
 #: utils/generic_views.py:143
 msgid "Save"
@@ -169,26 +169,25 @@ msgstr "Пароль"
 msgid "Please enter your current password."
 msgstr "Введіть свій поточний пароль."
 
-#: core/forms.py:242 core/templates/language/view.html:73
-#: core/templates/license/list.html:19 core/templates/misc/license/list.html:22
-#: core/templates/repetition_unit/list.html:20
-#: core/templates/tags/render_day.html:45
-#: core/templates/tags/render_day.html:81 core/templates/user/overview.html:217
-#: core/templates/weight_unit/list.html:20
-#: exercises/templates/categories/admin-overview.html:19
-#: exercises/templates/equipment/admin-overview.html:19
-#: exercises/templates/muscles/admin-overview.html:19
-#: gym/templates/admin_notes/list.html:40
-#: gym/templates/contract_option/list.html:41
-#: gym/templates/contract_type/list.html:41 gym/templates/document/list.html:46
-#: gym/templates/gym/list.html:22 manager/templates/calendar/day.html:73
-#: manager/templates/calendar/month.html:89
-#: manager/templates/calendar/partial_overview_table.html:23
-#: manager/templates/schedule/view.html:122
-#: manager/templates/workout/view.html:188
-#: nutrition/templates/ingredient/view.html:166
+#: core/forms.py:242 core/templates/language/view.html:70
+#: core/templates/license/list.html:21
+#: core/templates/repetition_unit/list.html:22
+#: core/templates/user/overview.html:233
+#: core/templates/weight_unit/list.html:22
+#: exercises/templates/categories/admin-overview.html:21
+#: exercises/templates/equipment/admin-overview.html:21
+#: exercises/templates/muscles/admin-overview.html:20
+#: gym/templates/admin_notes/list.html:37
+#: gym/templates/contract_option/list.html:35
+#: gym/templates/contract_type/list.html:36 gym/templates/document/list.html:46
+#: gym/templates/gym/list.html:23 manager/templates/calendar/day.html:73
+#: manager/templates/calendar/month.html:88
+#: manager/templates/calendar/partial_overview_table.html:22
+#: manager/templates/schedule/view.html:324
+#: manager/templates/workout/view.html:202
+#: nutrition/templates/ingredient/view.html:168
 #: nutrition/templates/ingredient/view.html:215
-#: nutrition/templates/units/list.html:22
+#: nutrition/templates/units/list.html:25
 msgid "Delete"
 msgstr "Вилучити"
 
@@ -200,9 +199,9 @@ msgstr "Неправильний пароль"
 msgid "The form is secured with reCAPTCHA"
 msgstr "Форма захищена reCAPTCHA"
 
-#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:285
-#: core/templates/navigation.html:297 core/templates/template.html:149
-#: core/templates/user/login.html:20 core/views/user.py:298
+#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:284
+#: core/templates/navigation.html:296 core/templates/template.html:151
+#: core/templates/user/login.html:20 core/views/user.py:297
 #: software/templates/features.html:87 software/templates/features.html:422
 msgid "Register"
 msgstr "Зареєструватись"
@@ -451,18 +450,18 @@ msgid "The sum of all hours has to be 24"
 msgstr "Сума всіх годин повинна дорівнювати 24"
 
 #: core/models/rep_unit.py:36 core/models/weight_unit.py:36
-#: core/templates/user/overview.html:262 core/views/user.py:599
+#: core/templates/user/overview.html:280 core/views/user.py:598
 #: exercises/models/category.py:29 exercises/models/equipment.py:29
 #: exercises/models/exercise.py:59 exercises/models/muscle.py:36
 #: gym/models/contract.py:52 gym/models/contract.py:103 gym/models/gym.py:46
 #: gym/models/user_document.py:84 gym/templates/contract/view.html:50
-#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:96
+#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:108
 #: gym/views/gym.py:158 manager/models/schedule.py:55
 #: manager/models/workout.py:57 measurements/models/category.py:36
 #: nutrition/models/ingredient.py:111
-#: nutrition/models/ingredient_category.py:27 nutrition/models/meal.py:67
+#: nutrition/models/ingredient_category.py:27 nutrition/models/meal.py:65
 #: nutrition/models/weight_unit.py:38
-#: nutrition/templates/ingredient/view.html:152
+#: nutrition/templates/ingredient/view.html:151
 msgid "Name"
 msgstr "Ім'я"
 
@@ -514,7 +513,7 @@ msgstr ""
 msgid "Back to \"%(target)s\""
 msgstr "Назад до \"%(target)s\""
 
-#: core/templates/delete.html:15
+#: core/templates/delete.html:4
 msgid "Are you sure you want to delete this? This action cannot be undone."
 msgstr "Ви дійсно хочете вилучити це? Цю дію неможливо скасувати."
 
@@ -570,7 +569,7 @@ msgstr ""
 msgid "Dashboard"
 msgstr "Панель"
 
-#: core/templates/language/overview.html:4 core/templates/navigation.html:345
+#: core/templates/language/overview.html:4 core/templates/navigation.html:344
 msgid "Languages"
 msgstr "Мови"
 
@@ -580,81 +579,72 @@ msgstr "Нічого не знайдено."
 
 #: core/templates/language/overview.html:22
 #: manager/templates/calendar/month.html:132
-#: manager/templates/schedule/overview.html:28
-#: manager/templates/schedule/view.html:144
+#: manager/templates/schedule/view.html:154
 #: manager/templates/workout/overview.html:28
 #: nutrition/templates/ingredient/overview.html:38
 msgid "Add one now."
 msgstr "Додати зараз."
 
-#: core/templates/language/overview.html:35 core/templates/license/list.html:40
-#: core/templates/misc/license/list.html:43
-#: core/templates/repetition_unit/list.html:43
-#: core/templates/user/overview.html:326 core/templates/user/overview.html:365
-#: core/templates/user/overview.html:401
-#: core/templates/weight_unit/list.html:43 core/views/languages.py:74
+#: core/templates/language/overview.html:34 core/templates/license/list.html:43
+#: core/templates/repetition_unit/list.html:46
+#: core/templates/user/overview.html:344 core/templates/user/overview.html:384
+#: core/templates/user/overview.html:422
+#: core/templates/weight_unit/list.html:46 core/views/languages.py:74
 #: core/views/license.py:66 core/views/repetition_units.py:66
 #: core/views/weight_units.py:66
-#: exercises/templates/categories/admin-overview.html:38
-#: gallery/views/images.py:63 gym/templates/admin_notes/list.html:67
-#: gym/templates/contract/list.html:73
-#: gym/templates/contract_option/list.html:72
-#: gym/templates/contract_type/list.html:72 gym/templates/document/list.html:79
-#: gym/templates/gym/member_list.html:211
-#: gym/templates/gym/member_list.html:244
-#: gym/templates/gym/member_list.html:281
+#: exercises/templates/categories/admin-overview.html:40
+#: exercises/templates/equipment/admin-overview.html:39
+#: exercises/templates/muscles/admin-overview.html:40
+#: gallery/views/images.py:63 gym/templates/admin_notes/list.html:64
+#: gym/templates/contract/list.html:69
+#: gym/templates/contract_option/list.html:65
+#: gym/templates/contract_type/list.html:66 gym/templates/document/list.html:78
+#: gym/templates/gym/member_list.html:228
+#: gym/templates/gym/member_list.html:264
+#: gym/templates/gym/member_list.html:303
 #: mailer/templates/mailer/gym/overview.html:43
+#: nutrition/templates/ingredient/overview.html:60
 msgid "Add"
 msgstr "Додати"
 
 #: core/templates/language/view.html:61 core/templates/user/api_key.html:44
-#: core/templates/user/preferences.html:45 gym/models/contract.py:203
-#: gym/templates/contract/view.html:41 gym/templates/contract/view.html:106
-#: gym/templates/gym/member_list.html:248
-#: manager/templates/schedule/view.html:285
-#: manager/templates/workout/view.html:163
-#: nutrition/templates/ingredient/view.html:202
+#: core/templates/user/preferences.html:50 gym/models/contract.py:203
+#: gym/templates/contract/view.html:41 gym/templates/gym/member_list.html:270
+#: manager/templates/schedule/view.html:304
+#: manager/templates/workout/view.html:177
+#: nutrition/templates/ingredient/view.html:206
 msgid "Options"
 msgstr "Параметри"
 
-#: core/templates/license/list.html:4 core/templates/misc/license/list.html:4
+#: core/templates/license/list.html:4
 msgid "License list"
 msgstr "Список ліцензій"
 
-#: core/templates/license/list.html:26 core/templates/misc/license/list.html:30
-#: core/templates/repetition_unit/list.html:28
+#: core/templates/license/list.html:30
+#: core/templates/repetition_unit/list.html:32
 #: core/templates/user/overview.html:104 core/templates/user/overview.html:136
-#: core/templates/user/overview.html:185 core/templates/user/overview.html:347
-#: core/templates/user/overview.html:383 core/templates/user/overview.html:427
-#: core/templates/weight_unit/list.html:28
-#: exercises/templates/categories/admin-overview.html:26
-#: exercises/templates/equipment/admin-overview.html:26
-#: exercises/templates/muscles/admin-overview.html:26
-#: gym/templates/admin_notes/list.html:52 gym/templates/contract/list.html:60
-#: gym/templates/contract_option/list.html:58
-#: gym/templates/contract_type/list.html:58 gym/templates/document/list.html:64
-#: gym/templates/gym/list.html:29 gym/templates/gym/member_list.html:229
-#: gym/templates/gym/member_list.html:262
-#: gym/templates/gym/member_list.html:299
+#: core/templates/user/overview.html:185 core/templates/user/overview.html:365
+#: core/templates/user/overview.html:404 core/templates/user/overview.html:448
+#: core/templates/weight_unit/list.html:32
+#: exercises/templates/categories/admin-overview.html:30
+#: exercises/templates/equipment/admin-overview.html:30
+#: exercises/templates/muscles/admin-overview.html:29
+#: gym/templates/admin_notes/list.html:50 gym/templates/contract/list.html:57
+#: gym/templates/contract_option/list.html:52
+#: gym/templates/contract_type/list.html:53 gym/templates/document/list.html:64
+#: gym/templates/gym/list.html:32 gym/templates/gym/member_list.html:248
+#: gym/templates/gym/member_list.html:284
+#: gym/templates/gym/member_list.html:321
 #: mailer/templates/mailer/gym/overview.html:30
-#: manager/templates/calendar/day.html:87
-#: nutrition/templates/units/list.html:29
+#: manager/templates/calendar/day.html:88
+#: nutrition/templates/units/list.html:34
 msgid "Nothing found"
 msgstr "Нічого не знайдено"
 
-#: core/templates/misc/about.html:4 core/templates/template.html:175
+#: core/templates/misc/about.html:4 core/templates/template.html:188
 msgid "Imprint"
 msgstr "Відбиток"
 
-#: core/templates/misc/license/list.html:47
-msgid ""
-"If a license has been localized, e.g. the Creative Commons\n"
-"            licenses for the different countries, add them as separate "
-"entries here."
-msgstr ""
-"Якщо ліцензія була локалізована, наприклад, як ліцензії\n"
-"Creative Commons для різних країн, додайте їх як окремі записи."
-
 #: core/templates/navigation.html:28 software/templates/features.html:437
 msgid "Training"
 msgstr "Тренування"
@@ -699,8 +689,8 @@ msgstr "Загальнодоступні шаблони"
 msgid "Exercises"
 msgstr "Вправи"
 
-#: core/templates/navigation.html:111 core/templates/navigation.html:184
-#: core/templates/navigation.html:340
+#: core/templates/navigation.html:111 core/templates/navigation.html:185
+#: core/templates/navigation.html:339
 msgid "Administration"
 msgstr "Адміністрація"
 
@@ -737,87 +727,87 @@ msgstr "Калькулятор індексу маси тіла"
 msgid "Daily calories calculator"
 msgstr "Калькулятор щоденних калорій"
 
-#: core/templates/navigation.html:179
+#: core/templates/navigation.html:180
 #: nutrition/templates/ingredient/overview.html:10
 msgid "Ingredient overview"
 msgstr "Огляд інгредієнтів"
 
-#: core/templates/navigation.html:187 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:189 nutrition/templates/units/list.html:6
 msgid "Ingredient weight units"
 msgstr "Одиниці ваги інгредієнтів"
 
-#: core/templates/navigation.html:203 software/templates/features.html:442
+#: core/templates/navigation.html:205 software/templates/features.html:442
 msgid "Body weight"
 msgstr "Вага тіла"
 
-#: core/templates/navigation.html:210 core/templates/user/overview.html:114
+#: core/templates/navigation.html:212 core/templates/user/overview.html:114
 msgid "Weight overview"
 msgstr "Огляд ваги"
 
-#: core/templates/navigation.html:217 weight/views.py:65
+#: core/templates/navigation.html:216 weight/views.py:65
 msgid "Add weight entry"
 msgstr "Додати запис ваги"
 
-#: core/templates/navigation.html:231
+#: core/templates/navigation.html:230
 msgid "About this software"
 msgstr "Про це програмне забезпечення"
 
-#: core/templates/navigation.html:237 software/templates/about_us.html:5
+#: core/templates/navigation.html:236 software/templates/about_us.html:5
 msgid "About us"
 msgstr "Про нас"
 
-#: core/templates/navigation.html:243 software/templates/features.html:507
+#: core/templates/navigation.html:242 software/templates/features.html:507
 msgid "REST API"
 msgstr "REST API"
 
-#: core/templates/navigation.html:249 utils/models.py:45
+#: core/templates/navigation.html:248 utils/models.py:45
 msgid "License"
 msgstr "Ліцензія"
 
-#: core/templates/navigation.html:255
+#: core/templates/navigation.html:254
 msgid "Developer documentation"
 msgstr "Документація для розробників"
 
-#: core/templates/navigation.html:262
+#: core/templates/navigation.html:261
 msgid "Get the code"
 msgstr "Отримати код"
 
-#: core/templates/navigation.html:269 core/templates/template.html:214
+#: core/templates/navigation.html:268 core/templates/template.html:227
 #: software/templates/features.html:582
 msgid "Translate"
 msgstr "Перекласти"
 
-#: core/templates/navigation.html:303 core/templates/user/login.html:28
+#: core/templates/navigation.html:302 core/templates/user/login.html:28
 msgid "Reset password"
 msgstr "Скинути пароль"
 
-#: core/templates/navigation.html:321
+#: core/templates/navigation.html:320
 msgid "My preferences"
 msgstr "Мої налаштування"
 
-#: core/templates/navigation.html:330
+#: core/templates/navigation.html:329
 msgid "Logout"
 msgstr "Вийти"
 
-#: core/templates/navigation.html:353
+#: core/templates/navigation.html:352
 msgid "Licenses"
 msgstr "Ліцензії"
 
-#: core/templates/navigation.html:361
+#: core/templates/navigation.html:360
 #: core/templates/repetition_unit/list.html:4
 msgid "Repetition units"
 msgstr "Одиниці повторень"
 
-#: core/templates/navigation.html:369 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:368 core/templates/weight_unit/list.html:4
 #: nutrition/templates/ingredient/view.html:141
 msgid "Weight units"
 msgstr "Одиниця ваги"
 
-#: core/templates/navigation.html:377 core/templates/user/list.html:4
+#: core/templates/navigation.html:376 core/templates/user/list.html:4
 msgid "User list"
 msgstr "Список користувачів"
 
-#: core/templates/navigation.html:383
+#: core/templates/navigation.html:382
 msgid "Gyms"
 msgstr "Тренажерні зали"
 
@@ -880,57 +870,32 @@ msgstr "назад"
 msgid "next"
 msgstr "вперед"
 
-#: core/templates/tags/render_day.html:34
-msgid "Add weight log"
-msgstr "Додати журнал ваги"
-
-#: core/templates/tags/render_day.html:116
-msgid "Placeholder image for exercise"
+#: core/templates/tags/render_day.html:44
+#, fuzzy
+#| msgid "Placeholder image for exercise"
+msgid "Placeholder image for translation"
 msgstr "Заповнювач зображення для вправи"
 
-#: core/templates/tags/render_day.html:133
-msgid "This exercise has no repetitions."
-msgstr "Ця вправа не має повторів."
-
-#: core/templates/tags/render_day.html:136
-msgid "Edit them now."
-msgstr "Редагувати їх зараз."
-
-#: core/templates/tags/render_day.html:162
-msgid "Add exercises to this workout day"
-msgstr "Додати вправи до цього дня тренування"
-
-#: core/templates/tags/render_weight_log.html:17 manager/helpers.py:86
-#: manager/models/setting.py:72 manager/templates/set/formset.html:9
-msgid "Reps"
-msgstr "Повтори"
-
-#: core/templates/tags/render_weight_log.html:30 manager/forms.py:191
-#: manager/models/log.py:103 manager/models/setting.py:102
-#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
-msgid "RiR"
-msgstr "Повторів можете зробити"
-
-#: core/templates/template.html:122 manager/templates/calendar/month.html:138
-#: manager/templates/schedule/view.html:248
-#: manager/templates/schedule/view.html:269
-#: manager/templates/workout/view.html:84
-#: manager/templates/workout/view.html:137
+#: core/templates/template.html:124 manager/templates/calendar/month.html:138
+#: manager/templates/schedule/view.html:262
+#: manager/templates/schedule/view.html:287
+#: manager/templates/workout/view.html:89
+#: manager/templates/workout/view.html:149
 msgid "Close"
 msgstr "Закрити"
 
-#: core/templates/template.html:138
+#: core/templates/template.html:140
 msgid ""
 "You are using a guest account, data entered will be deleted after a week."
 msgstr ""
 "Ви використовуєте обліковий запис гостя, введені дані будуть видалені через "
 "тиждень."
 
-#: core/templates/template.html:143
+#: core/templates/template.html:145
 msgid "Create some demo entries"
 msgstr "Створіть деякі демонстраційні записи"
 
-#: core/templates/template.html:180 software/templates/features.html:547
+#: core/templates/template.html:193 software/templates/features.html:547
 #: software/templates/tos.html:7
 msgid "Terms of service"
 msgstr "Умови надання послуг"
@@ -939,7 +904,7 @@ msgstr "Умови надання послуг"
 msgid "Features"
 msgstr "Особливості"
 
-#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:54
+#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:59
 msgid "API key"
 msgstr "Ключ API"
 
@@ -985,17 +950,17 @@ msgstr "Згенерувати новий ключ API"
 msgid "Documentation"
 msgstr "Документація"
 
-#: core/templates/user/delete_account.html:4
-#: core/templates/user/preferences.html:59
+#: core/templates/user/delete_account.html:3
+#: core/templates/user/preferences.html:62
 msgid "Delete account"
 msgstr "Видалити обліковий запис"
 
-#: core/templates/user/delete_account.html:17
+#: core/templates/user/delete_account.html:9
 #: exercises/templates/history/overview.html:93
 msgid "Are you sure?"
 msgstr "Ви впевнені?"
 
-#: core/templates/user/delete_account.html:22
+#: core/templates/user/delete_account.html:14
 #, python-format
 msgid ""
 "This action will delete the user account \"%(username)s\".\n"
@@ -1018,22 +983,22 @@ msgstr "Забули пароль?"
 
 #: core/templates/user/overview.html:25 core/templates/user/overview.html:68
 #: core/templates/user/overview.html:112 core/templates/user/overview.html:144
-#: core/templates/user/overview.html:330 core/templates/user/overview.html:369
-#: core/templates/user/overview.html:405
+#: core/templates/user/overview.html:348 core/templates/user/overview.html:390
+#: core/templates/user/overview.html:426
 #, python-format
 msgid "last %(number)s"
 msgstr "останні %(number)s"
 
 #: core/templates/user/overview.html:27 core/templates/user/overview.html:146
-#: core/templates/user/overview.html:325 core/templates/user/overview.html:364
-#: core/templates/user/overview.html:400 gym/templates/gym/member_list.html:210
-#: gym/templates/gym/member_list.html:243
-#: gym/templates/gym/member_list.html:280
+#: core/templates/user/overview.html:343 core/templates/user/overview.html:382
+#: core/templates/user/overview.html:421 gym/templates/gym/member_list.html:226
+#: gym/templates/gym/member_list.html:262
+#: gym/templates/gym/member_list.html:302
 msgid "Overview"
 msgstr "Огляд"
 
 #: core/templates/user/overview.html:28
-#: manager/templates/schedule/view.html:163
+#: manager/templates/schedule/view.html:172
 #: manager/templates/workout/overview.html:39 manager/views/schedule_step.py:60
 msgid "Add workout"
 msgstr "Додати тренування"
@@ -1065,38 +1030,36 @@ msgstr "Опис"
 msgid "Number of logs (days)"
 msgstr "Кількість записів (днів)"
 
-#: core/templates/user/overview.html:37 core/views/user.py:600
+#: core/templates/user/overview.html:37 core/views/user.py:599
 #: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:158
 msgid "Last activity"
 msgstr "Остання активність"
 
 #: core/templates/user/overview.html:58
 #: manager/templates/calendar/month.html:128
-#: manager/templates/schedule/view.html:144
 #: manager/templates/workout/overview.html:28
 msgid "No workouts found."
 msgstr "Не знайдено жодних тренувань."
 
 #: core/templates/user/overview.html:68 manager/forms.py:280
-#: manager/templates/workout/view.html:106
+#: manager/templates/workout/view.html:114
 msgid "Log"
 msgstr "Журнал"
 
 #: core/templates/user/overview.html:77 manager/models/session.py:83
-#: manager/templates/calendar/partial_overview_table.html:52
+#: manager/templates/calendar/partial_overview_table.html:54
 msgid "General impression"
 msgstr "Загальне враження"
 
-#: core/templates/user/overview.html:78 core/templates/user/overview.html:369
+#: core/templates/user/overview.html:78 core/templates/user/overview.html:390
 #: manager/models/session.py:73
-#: manager/templates/calendar/partial_overview_table.html:56
-#: manager/templates/workout/log.html:89
+#: manager/templates/calendar/partial_overview_table.html:58
 msgid "Notes"
 msgstr "Примітки"
 
 #: core/templates/user/overview.html:79
 #: exercises/templates/history/overview.html:30
-#: manager/templates/calendar/partial_overview_table.html:42
+#: manager/templates/calendar/partial_overview_table.html:44
 msgid "Time"
 msgstr "Час"
 
@@ -1134,121 +1097,121 @@ msgstr "Жири"
 msgid "kcal"
 msgstr "ккал"
 
-#: core/templates/user/overview.html:201 core/templates/user/overview.html:322
-#: core/templates/user/overview.html:361 core/templates/user/overview.html:397
-#: core/templates/user/overview.html:442 gym/templates/gym/list.html:42
-#: gym/templates/gym/member_list.html:84 gym/templates/gym/member_list.html:137
-#: gym/templates/gym/member_list.html:173
-#: gym/templates/gym/member_list.html:207
-#: gym/templates/gym/member_list.html:240
-#: gym/templates/gym/member_list.html:277
-#: manager/templates/schedule/view.html:100
+#: core/templates/user/overview.html:201 core/templates/user/overview.html:340
+#: core/templates/user/overview.html:379 core/templates/user/overview.html:418
+#: core/templates/user/overview.html:463 gym/templates/gym/list.html:45
+#: gym/templates/gym/member_list.html:91 gym/templates/gym/member_list.html:149
+#: gym/templates/gym/member_list.html:187
+#: gym/templates/gym/member_list.html:223
+#: gym/templates/gym/member_list.html:259
+#: gym/templates/gym/member_list.html:299
+#: manager/templates/schedule/view.html:99
 msgid "Actions"
 msgstr "Дії"
 
-#: core/templates/user/overview.html:207
+#: core/templates/user/overview.html:210
 msgid "Deactivate user"
 msgstr "Деактивувати користувача"
 
-#: core/templates/user/overview.html:209
+#: core/templates/user/overview.html:214
 msgid "Activate user"
 msgstr "Активувати користувача"
 
-#: core/templates/user/overview.html:211
+#: core/templates/user/overview.html:223
 msgid "Reset user password"
 msgstr "Скинути пароль користувача"
 
-#: core/templates/user/overview.html:214 gym/templates/gym/member_list.html:30
+#: core/templates/user/overview.html:227 gym/templates/gym/member_list.html:30
 msgid "Roles"
 msgstr "Ролі"
 
-#: core/templates/user/overview.html:225
+#: core/templates/user/overview.html:243
 msgid "Password reset confirmation"
 msgstr "Підтвердження відновлення пароля"
 
-#: core/templates/user/overview.html:229
+#: core/templates/user/overview.html:247
 msgid "Do you really want to change this user&#39;s password?"
 msgstr "Ви дійсно бажаєте змінити пароль цього користувача?"
 
-#: core/templates/user/overview.html:232
+#: core/templates/user/overview.html:250
 #: exercises/templates/history/overview.html:106
 msgid "No"
 msgstr "Ні"
 
-#: core/templates/user/overview.html:233
+#: core/templates/user/overview.html:251
 #: exercises/templates/history/overview.html:99
 msgid "Yes"
 msgstr "Так"
 
-#: core/templates/user/overview.html:254 gym/templates/gym/member_list.html:93
+#: core/templates/user/overview.html:272 gym/templates/gym/member_list.html:105
 msgid "Details"
 msgstr "Деталі"
 
-#: core/templates/user/overview.html:258 gym/views/export.py:57
-#: manager/helpers.py:86 manager/templates/schedule/view.html:98
+#: core/templates/user/overview.html:276 gym/views/export.py:57
+#: manager/helpers.py:86 manager/templates/schedule/view.html:97
 msgid "Nr."
 msgstr "№"
 
-#: core/templates/user/overview.html:280 gym/models/contract.py:287
+#: core/templates/user/overview.html:298 gym/models/contract.py:287
 #: gym/models/gym.py:50 gym/templates/contract/view.html:75
-#: gym/templates/gym/member_list.html:100 gym/views/export.py:68
+#: gym/templates/gym/member_list.html:112 gym/views/export.py:68
 msgid "Phone"
 msgstr "Телефон"
 
-#: core/templates/user/overview.html:284 gym/templates/contract/view.html:87
-#: gym/templates/gym/member_list.html:118
+#: core/templates/user/overview.html:302 gym/templates/contract/view.html:87
+#: gym/templates/gym/member_list.html:130
 msgid "Address"
 msgstr "Адреса"
 
-#: core/templates/user/overview.html:295
+#: core/templates/user/overview.html:313
 msgid "Registered"
 msgstr "Зареєстрований"
 
-#: core/templates/user/overview.html:299
+#: core/templates/user/overview.html:317
 msgid "Last login"
 msgstr "Останній вхід"
 
-#: core/templates/user/overview.html:304
+#: core/templates/user/overview.html:322
 msgid "Status"
 msgstr "Статус"
 
-#: core/templates/user/overview.html:307
+#: core/templates/user/overview.html:325
 msgid "Active"
 msgstr "Активний"
 
-#: core/templates/user/overview.html:309
+#: core/templates/user/overview.html:327
 msgid "Inactive"
 msgstr "Неактивний"
 
-#: core/templates/user/overview.html:330 gym/templates/contract/list.html:4
-#: gym/templates/gym/member_list.html:202
+#: core/templates/user/overview.html:348 gym/templates/contract/list.html:4
+#: gym/templates/gym/member_list.html:218
 msgid "Contracts"
 msgstr "Контракти"
 
-#: core/templates/user/overview.html:405 gym/templates/document/list.html:4
+#: core/templates/user/overview.html:426 gym/templates/document/list.html:4
 msgid "Documents"
 msgstr "Документи"
 
-#: core/templates/user/overview.html:412 gym/templates/document/list.html:32
-#: manager/forms.py:292 manager/templates/workout/view.html:132
+#: core/templates/user/overview.html:433 gym/templates/document/list.html:33
+#: manager/forms.py:292 manager/templates/workout/view.html:143
 msgid "Download"
 msgstr "Завантажити"
 
-#: core/templates/user/overview.html:450 gym/views/admin_config.py:44
+#: core/templates/user/overview.html:474 gym/views/admin_config.py:44
 #: gym/views/admin_config.py:58 gym/views/user_config.py:46
 msgid "Configuration"
 msgstr "Конфігурація"
 
-#: core/templates/user/overview.html:453 gym/models/user_config.py:92
+#: core/templates/user/overview.html:477 gym/models/user_config.py:92
 msgid "Include in inactive overview"
 msgstr "Включити в огляд неактивних"
 
-#: core/templates/user/overview.html:486
+#: core/templates/user/overview.html:510
 #, python-format
 msgid "Admin login is only available for users in %(gym_name)s"
 msgstr "Вхід адміністратора доступний лише для користувачів у %(gym_name)s"
 
-#: core/templates/user/overview.html:490
+#: core/templates/user/overview.html:514
 msgid "Log in as this user"
 msgstr "Увійти як цей користувач"
 
@@ -1268,19 +1231,19 @@ msgstr "Непідтверджена електронна пошта"
 msgid "Send verification email"
 msgstr "Надіслати електронний лист для підтвердження"
 
-#: core/templates/user/preferences.html:30
+#: core/templates/user/preferences.html:31
 msgid "You need to verify your email to contribute exercises"
 msgstr "Вам необхідно підтвердити свою електронну пошту, щоб надсилати вправи"
 
-#: core/templates/user/preferences.html:50 core/views/user.py:611
+#: core/templates/user/preferences.html:55 core/views/user.py:610
 msgid "Change password"
 msgstr "Змінити пароль"
 
-#: core/templatetags/wger_extras.py:205 i18n.tpl:37
+#: core/templatetags/wger_extras.py:197 i18n.tpl:37
 msgid "kg"
 msgstr "кг"
 
-#: core/templatetags/wger_extras.py:207
+#: core/templatetags/wger_extras.py:199
 #: nutrition/templates/ingredient/view.html:60
 #: nutrition/templates/ingredient/view.html:66
 #: nutrition/templates/ingredient/view.html:73
@@ -1292,11 +1255,11 @@ msgctxt "weight unit, i.e. grams"
 msgid "g"
 msgstr "г"
 
-#: core/templatetags/wger_extras.py:210 i18n.tpl:38
+#: core/templatetags/wger_extras.py:202 i18n.tpl:38
 msgid "lb"
 msgstr "фунт"
 
-#: core/templatetags/wger_extras.py:212
+#: core/templatetags/wger_extras.py:204
 msgctxt "weight unit, i.e. ounces"
 msgid "oz"
 msgstr "унцій"
@@ -1323,13 +1286,13 @@ msgid "Delete {0}?"
 msgstr "Вилучити {0}?"
 
 #: core/views/languages.py:111 core/views/license.py:85
-#: core/views/repetition_units.py:86 core/views/user.py:474
+#: core/views/repetition_units.py:86 core/views/user.py:473
 #: core/views/weight_units.py:86 exercises/views/categories.py:98
 #: exercises/views/equipment.py:81 exercises/views/muscles.py:87
 #: gym/views/admin_notes.py:161 gym/views/config.py:68
 #: gym/views/contract.py:186 gym/views/contract_option.py:123
 #: gym/views/contract_type.py:123 gym/views/document.py:171
-#: gym/views/gym.py:463 manager/views/day.py:100 manager/views/schedule.py:333
+#: gym/views/gym.py:463 manager/views/day.py:96 manager/views/schedule.py:333
 #: manager/views/workout.py:267 nutrition/views/ingredient.py:145
 #: nutrition/views/unit.py:143
 #, python-brace-format
@@ -1358,48 +1321,48 @@ msgstr "Надіслати"
 msgid "Your feedback was successfully sent. Thank you!"
 msgstr "Ваш відгук успішно надіслано. Дякуємо!"
 
-#: core/views/user.py:156
+#: core/views/user.py:155
 #, python-brace-format
 msgid "Account \"{0}\" was successfully deleted"
 msgstr "Обліковий запис \"{0}\" успішно видалено"
 
-#: core/views/user.py:292
+#: core/views/user.py:291
 msgid "You were successfully registered"
 msgstr "Ви успішно зареєстровані"
 
-#: core/views/user.py:351
+#: core/views/user.py:350
 msgid "Settings successfully updated"
 msgstr "Налаштування успішно оновлено"
 
-#: core/views/user.py:390
+#: core/views/user.py:389
 msgid "The user was successfully deactivated"
 msgstr "Користувач був успішно деактивований"
 
-#: core/views/user.py:427
+#: core/views/user.py:426
 msgid "The user was successfully activated"
 msgstr "Користувач успішно активований"
 
-#: core/views/user.py:442
+#: core/views/user.py:441
 msgid "Edit user"
 msgstr "Редагувати користувача"
 
-#: core/views/user.py:597 gym/templates/gym/member_list.html:26
+#: core/views/user.py:596 gym/templates/gym/member_list.html:26
 #: gym/views/gym.py:158
 msgid "ID"
 msgstr "ID"
 
-#: core/views/user.py:598 gym/forms.py:95 gym/templates/contract/view.html:55
+#: core/views/user.py:597 gym/forms.py:95 gym/templates/contract/view.html:55
 #: gym/templates/gym/member_list.html:27 gym/views/export.py:59
 #: gym/views/gym.py:158 gym/views/gym.py:217
 msgid "Username"
 msgstr "Ім'я користувача"
 
-#: core/views/user.py:601 gym/templates/gym/new_user.html:34
+#: core/views/user.py:600 gym/templates/gym/new_user.html:34
 #: gym/views/export.py:58 gym/views/gym.py:217
 msgid "Gym"
 msgstr "Тренажерний зал"
 
-#: core/views/user.py:660
+#: core/views/user.py:659
 #, python-format
 msgid "A verification email was sent to %(email)s"
 msgstr "Підтверджувальний лист було надіслано на електронну адресу %(email)s"
@@ -1552,11 +1515,6 @@ msgstr "Кодек, довга назва"
 msgid "Equipment list"
 msgstr "Список обладнання"
 
-#: exercises/templates/equipment/admin-overview.html:39
-#: exercises/views/equipment.py:92
-msgid "Add new equipment"
-msgstr "Додайте нове обладнання"
-
 #: exercises/templates/history/overview.html:11
 msgid "Exercise admin history"
 msgstr "Історія адміністрування вправ"
@@ -1604,11 +1562,6 @@ msgstr "Повернення змін"
 msgid "Muscle overview"
 msgstr "Огляд м'язів"
 
-#: exercises/templates/muscles/admin-overview.html:38
-#: exercises/views/muscles.py:68
-msgid "Add muscle"
-msgstr "Додати м'язи"
-
 #: exercises/views/categories.py:72
 msgid "Add category"
 msgstr "Додати категорію"
@@ -1617,6 +1570,10 @@ msgstr "Додати категорію"
 msgid "This will also delete all exercises in this category."
 msgstr "Також буде видалено всі вправи цієї категорії."
 
+#: exercises/views/equipment.py:92
+msgid "Add new equipment"
+msgstr "Додайте нове обладнання"
+
 #: exercises/views/equipment.py:104 exercises/views/equipment.py:115
 msgid "Delete equipment?"
 msgstr "Видалити обладнання?"
@@ -1625,6 +1582,10 @@ msgstr "Видалити обладнання?"
 msgid "This will delete the exercise from all workouts."
 msgstr "Це призведе до видалення вправи з усіх тренувань."
 
+#: exercises/views/muscles.py:68
+msgid "Add muscle"
+msgstr "Додати м'язи"
+
 #: gallery/templates/images/overview.html:62
 msgid "Add image"
 msgstr "Додати зображення"
@@ -1710,7 +1671,7 @@ msgid "Contract is active"
 msgstr "Контракт активний"
 
 #: gym/models/contract.py:237 gym/templates/contract/view.html:69
-#: manager/models/schedule.py:61 manager/templates/schedule/view.html:67
+#: manager/models/schedule.py:61 manager/templates/schedule/view.html:66
 msgid "Start date"
 msgstr "Дата початку"
 
@@ -1746,7 +1707,7 @@ msgstr "Адміністратор: може керувати користува
 msgid "Admin: can administrate the different gyms"
 msgstr "Адміністратор: може керувати різними залами"
 
-#: gym/models/gym.py:65 gym/templates/gym/member_list.html:114
+#: gym/models/gym.py:65 gym/templates/gym/member_list.html:126
 msgid "Owner"
 msgstr "Власник"
 
@@ -1758,7 +1719,7 @@ msgstr ""
 "Кількість тижнів відсутності користувача, по закінченню яких його "
 "присутність буде вважатися неактивною"
 
-#: gym/models/gym_config.py:56 gym/templates/gym/member_list.html:152
+#: gym/models/gym_config.py:56 gym/templates/gym/member_list.html:166
 msgid "Show name in header"
 msgstr "Показувати назву в заголовку"
 
@@ -1771,7 +1732,7 @@ msgstr "Показати назву тренажерного залу в заг
 msgid "Configuration for {self.gym.name}"
 msgstr "Конфігурація для {self.gym.name}"
 
-#: gym/models/user_config.py:65 gym/templates/gym/member_list.html:184
+#: gym/models/user_config.py:65 gym/templates/gym/member_list.html:200
 msgid "Overview of inactive members"
 msgstr "Огляд неактивних членів"
 
@@ -1795,7 +1756,7 @@ msgstr "Якщо нічого не вказано, буде використан
 msgid "User notes"
 msgstr "Примітки користувача"
 
-#: gym/templates/contract/list.html:36
+#: gym/templates/contract/list.html:34
 msgid "Show"
 msgstr "Показати"
 
@@ -1823,11 +1784,11 @@ msgstr ""
 msgid "Gym list"
 msgstr "Список тренажерних залів"
 
-#: gym/templates/gym/list.html:50
+#: gym/templates/gym/list.html:53
 msgid "Global gym configuration"
 msgstr "Глобальна конфігурація тренажерного залу"
 
-#: gym/templates/gym/list.html:67 gym/views/gym.py:171
+#: gym/templates/gym/list.html:69 gym/views/gym.py:171
 msgid "Add new gym"
 msgstr "Додати новий тренажерний зал"
 
@@ -1839,43 +1800,43 @@ msgstr "Адміністратори і тренери"
 msgid "Gym manager"
 msgstr "Менеджер тренажерного залу"
 
-#: gym/templates/gym/member_list.html:69
+#: gym/templates/gym/member_list.html:76
 msgid "This gym has no administrators or trainers"
 msgstr "У цьому тренажерному залі немає адміністраторів чи тренерів"
 
-#: gym/templates/gym/member_list.html:88
+#: gym/templates/gym/member_list.html:98
 msgid "Export"
 msgstr "Експортувати"
 
-#: gym/templates/gym/member_list.html:125
+#: gym/templates/gym/member_list.html:137
 msgid "Members"
 msgstr "Учасники"
 
-#: gym/templates/gym/member_list.html:145
+#: gym/templates/gym/member_list.html:159
 msgid "Gym configuration"
 msgstr "Конфігурація тренажерного залу"
 
-#: gym/templates/gym/member_list.html:148
+#: gym/templates/gym/member_list.html:162
 msgid "Inactive members"
 msgstr "Неактивні учасники"
 
-#: gym/templates/gym/member_list.html:149
+#: gym/templates/gym/member_list.html:163
 msgid "weeks"
 msgstr "тижні"
 
-#: gym/templates/gym/member_list.html:181
+#: gym/templates/gym/member_list.html:197
 msgid "My configuration"
 msgstr "Моя конфігурація"
 
-#: gym/templates/gym/member_list.html:215
+#: gym/templates/gym/member_list.html:234
 msgid "Types"
 msgstr "Типи"
 
-#: gym/templates/gym/member_list.html:285
+#: gym/templates/gym/member_list.html:307
 msgid "Emails"
 msgstr "Електронні листи"
 
-#: gym/templates/gym/member_list.html:315
+#: gym/templates/gym/member_list.html:336
 msgid "Add member"
 msgstr "Додати учасника"
 
@@ -2170,28 +2131,38 @@ msgstr "Також шукайте імена англійською мовою"
 msgid "Unit"
 msgstr "Одиниця"
 
+#: manager/forms.py:191 manager/models/log.py:103 manager/models/setting.py:102
+#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
+msgid "RiR"
+msgstr "Повторів можете зробити"
+
 #: manager/forms.py:279
 msgid "Type"
 msgstr "Тип"
 
-#: manager/forms.py:280 manager/templates/workout/view.html:113
+#: manager/forms.py:280 manager/templates/workout/view.html:122
 msgid "Table"
 msgstr "Таблиця"
 
-#: manager/forms.py:282 manager/templates/workout/view.html:119
+#: manager/forms.py:282 manager/templates/workout/view.html:129
 msgid "with images"
 msgstr "із зображеннями"
 
-#: manager/forms.py:283 manager/templates/workout/view.html:125
+#: manager/forms.py:283 manager/templates/workout/view.html:136
 msgid "with comments"
 msgstr "з коментарями"
 
+#: manager/helpers.py:86 manager/models/setting.py:72
+#: manager/templates/set/formset.html:9
+msgid "Reps"
+msgstr "Повтори"
+
 #: manager/management/commands/email-reminders.py:121
 msgid "Workout will expire soon"
 msgstr "Тренування скоро завершиться"
 
 #: manager/models/day.py:34 manager/models/log.py:58
-#: manager/models/session.py:60 manager/templates/schedule/view.html:102
+#: manager/models/session.py:60 manager/templates/schedule/view.html:101
 #: manager/templates/workout/view.html:9 manager/templates/workout/view.html:17
 #: manager/views/pdf.py:85 manager/views/pdf.py:161
 #: manager/views/schedule.py:151 manager/views/schedule.py:221
@@ -2214,7 +2185,7 @@ msgstr "День"
 msgid "Name or short description of the schedule. For example 'Program XYZ'."
 msgstr "Назва або короткий опис програми. Наприклад 'Програма XYZ'."
 
-#: manager/models/schedule.py:65 manager/templates/schedule/view.html:71
+#: manager/models/schedule.py:65 manager/templates/schedule/view.html:70
 msgid "Schedule active"
 msgstr "Програма активна"
 
@@ -2228,7 +2199,7 @@ msgstr ""
 "(відображатиметься, наприклад, на інформаційній панелі). Всі інші програми "
 "будуть позначені як неактивні"
 
-#: manager/models/schedule.py:77 manager/templates/schedule/view.html:81
+#: manager/models/schedule.py:77 manager/templates/schedule/view.html:80
 msgid "Is a loop"
 msgstr "Є циклом"
 
@@ -2249,7 +2220,7 @@ msgid "The duration in weeks"
 msgstr "Тривалість в тижнях"
 
 #: manager/models/schedule_step.py:64 manager/models/set.py:53
-#: manager/models/setting.py:113 nutrition/models/meal.py:55
+#: manager/models/setting.py:113 nutrition/models/meal.py:53
 #: nutrition/models/meal_item.py:66
 msgid "Order"
 msgstr "Порядок"
@@ -2389,7 +2360,7 @@ msgstr "Огляд журналів"
 msgid "Workout session"
 msgstr "Тренування"
 
-#: manager/templates/calendar/partial_overview_table.html:27
+#: manager/templates/calendar/partial_overview_table.html:26
 msgid "Delete with logs"
 msgstr "Видалити з журналами"
 
@@ -2412,21 +2383,27 @@ msgstr ""
 "для обраної дати ще не існує такого. Якщо вже існує, він просто буде\n"
 "редагуватись. Записи ваг завжди будуть додаватись."
 
-#: manager/templates/schedule/overview.html:5
+#: manager/templates/schedule/overview.html:4
 msgid "Your schedules"
 msgstr "Ваші програми"
 
 #: manager/templates/schedule/overview.html:19
-#: manager/templates/schedule/view.html:131
-#: manager/templates/schedule/view.html:183
+#: manager/templates/schedule/view.html:143
+#: manager/templates/schedule/view.html:193
 #: manager/templates/workout/overview.html:16
 msgid "active"
 msgstr "активні"
 
-#: manager/templates/schedule/overview.html:28
+#: manager/templates/schedule/overview.html:27
 msgid "No schedules found."
 msgstr "Програм не знайдено."
 
+#: manager/templates/schedule/overview.html:28
+#, fuzzy
+#| msgid "Add one now."
+msgid "Add one now"
+msgstr "Додати зараз."
+
 #: manager/templates/schedule/overview.html:36
 msgid ""
 "Schedules are collections of workouts that you do in\n"
@@ -2436,12 +2413,20 @@ msgstr ""
 "по порядку."
 
 #: manager/templates/schedule/overview.html:39
+#, fuzzy
+#| msgid ""
+#| "You can indicate how long you want to do each workout\n"
+#| "        before jumping to the next. It is also possible to create a loop, "
+#| "so you\n"
+#| "        always do the same workouts in succession, e.g. A > B > C > A > B "
+#| "> C and so on."
 msgid ""
 "You can indicate how long you want to do each workout\n"
 "        before jumping to the next. It is also possible to create a loop, so "
 "you\n"
 "        always do the same workouts in succession, e.g. A > B > C > A > B > "
-"C and so on."
+"C and so\n"
+"        on."
 msgstr ""
 "Ви можете вказати тривалість кожного тренування,\n"
 "        перед тим як перейти до наступного. Також можна створити цикл, для "
@@ -2449,7 +2434,7 @@ msgstr ""
 "        щоб виконувати однакові тренування поспіль, наприклад A> B> C> A> B> "
 "C і т.д."
 
-#: manager/templates/schedule/overview.html:43
+#: manager/templates/schedule/overview.html:44
 msgid ""
 "The currently active schedule will remain active (and be\n"
 "        shown e.g. in your dashboard) till it reaches the last workout or "
@@ -2469,7 +2454,7 @@ msgstr "Додати програму"
 msgid "Schedule"
 msgstr "Програма"
 
-#: manager/templates/schedule/view.html:85
+#: manager/templates/schedule/view.html:84
 msgid ""
 "This schedule is a loop and will go through the workouts above till you "
 "deactivate it"
@@ -2477,19 +2462,19 @@ msgstr ""
 "Ця програма є циклом і буде повторюватись до тих пір, поки ви не деактивуєте "
 "її"
 
-#: manager/templates/schedule/view.html:103
+#: manager/templates/schedule/view.html:102
 msgid "Weeks"
 msgstr "Тижні"
 
-#: manager/templates/schedule/view.html:115
+#: manager/templates/schedule/view.html:114
 msgid "Move me"
 msgstr "Перемістіть мене"
 
-#: manager/templates/schedule/view.html:156
+#: manager/templates/schedule/view.html:168
 msgid "Start schedule"
 msgstr "Почати програму"
 
-#: manager/templates/schedule/view.html:187
+#: manager/templates/schedule/view.html:197
 #, python-format
 msgid ""
 "%(weeks)s Week\n"
@@ -2510,11 +2495,11 @@ msgstr[3] ""
 "%(weeks)s Тижні\n"
 "                                "
 
-#: manager/templates/schedule/view.html:221
+#: manager/templates/schedule/view.html:231
 msgid "Adding workouts"
 msgstr "Додавання тренувань"
 
-#: manager/templates/schedule/view.html:223
+#: manager/templates/schedule/view.html:233
 msgid ""
 "Add as many workouts to the schedule as you want. You can\n"
 "            edit the order by dragging and dropping them. It's also possible "
@@ -2525,47 +2510,47 @@ msgstr ""
 "змінити порядок, перетягнувши їх. Також можна додати одне тренування\n"
 "більш ніж один раз."
 
-#: manager/templates/schedule/view.html:232
-#: manager/templates/schedule/view.html:243
-#: manager/templates/schedule/view.html:290
+#: manager/templates/schedule/view.html:242
+#: manager/templates/schedule/view.html:256
+#: manager/templates/schedule/view.html:310
 #: manager/templates/workout/view.html:69
-#: manager/templates/workout/view.html:79
-#: manager/templates/workout/view.html:178
+#: manager/templates/workout/view.html:83
+#: manager/templates/workout/view.html:192
 msgid "Export calendar file"
 msgstr "Експортувати файл календаря"
 
-#: manager/templates/schedule/view.html:236
+#: manager/templates/schedule/view.html:248
 msgid "Export this schedule as a calendar file."
 msgstr "Експортувати цю програму в файл календаря."
 
-#: manager/templates/schedule/view.html:237
-#: manager/templates/workout/view.html:74
+#: manager/templates/schedule/view.html:249
+#: manager/templates/workout/view.html:76
+#, fuzzy
+#| msgid ""
+#| "You can then import the file it into your calendar\n"
+#| "                        application for example google calendar, outlook "
+#| "or iCal. This will create\n"
+#| "                        an appointment for each training day with the "
+#| "appropriate exercises."
 msgid ""
 "You can then import the file it into your calendar\n"
 "                        application for example google calendar, outlook or "
 "iCal. This will create\n"
 "                        an appointment for each training day with the "
-"appropriate exercises."
+"appropriate\n"
+"                        exercises."
 msgstr ""
 "Цей файл можна потім імпортувати в календар застосунку, наприклад\n"
 "google календар, outlook або iCal. Це дозволить створити розклад на\n"
 "кожен тренувальний день з відповідними вправами."
 
-#: manager/templates/schedule/view.html:258
-#: manager/templates/schedule/view.html:294
-#: manager/templates/workout/view.html:94
-#: manager/templates/workout/view.html:174
+#: manager/templates/schedule/view.html:272
+#: manager/templates/schedule/view.html:315
+#: manager/templates/workout/view.html:99
+#: manager/templates/workout/view.html:188
 msgid "Download as PDF"
 msgstr "Завантажити як PDF"
 
-#: manager/templates/schedule/view.html:299
-msgid "Edit schedule"
-msgstr "Редагувати програму"
-
-#: manager/templates/schedule/view.html:304
-msgid "Delete schedule"
-msgstr "Видалити програму"
-
 #: manager/templates/set/add.html:9
 #, python-format
 msgid "Add exercises to day \"%(day_name)s\""
@@ -2645,56 +2630,6 @@ msgstr ""
 "Ви будете регулярно отримувати такі нагадування, поки не введете поточну "
 "вагу."
 
-#: manager/templates/workout/log.html:10 manager/templates/workout/log.html:11
-msgid "Weight log"
-msgstr "Журнал ваги"
-
-#: manager/templates/workout/log.html:29
-msgid "Weight log for workout"
-msgstr "Журнал ваги для тренування"
-
-#: manager/templates/workout/log.html:49
-msgid "Add weight log to this day"
-msgstr "Додати запис ваги до цього дня"
-
-#: manager/templates/workout/log.html:69
-msgid "No weight entries here."
-msgstr "Тут немає записів ваги."
-
-#: manager/templates/workout/log.html:77
-msgid "No exercises for this day."
-msgstr "Немає вправ для цього дня."
-
-#: manager/templates/workout/log.html:90
-msgid ""
-"This page shows the weight logs belonging to this workout\n"
-"only. Click on an exercise to see all the historical data for\n"
-"it."
-msgstr ""
-"На цій сторінці показані журнали ваги, що належать тільки\n"
-"до цього тренування. Натисніть на вправу, щоб побачити всі\n"
-"історичні дані."
-
-#: manager/templates/workout/log.html:94
-msgid ""
-"If on a single day there is more than one entry with the\n"
-"same number of repetitions, but different weights, only the entry with the\n"
-"higher weight is shown in the diagram."
-msgstr ""
-"Якщо на один день припадає більше одного запису з однаковою кількістю\n"
-"повторень, але різними вагами, то на графіку буде показано тільки запис\n"
-"з більшою вагою."
-
-#: manager/templates/workout/log.html:98
-msgid ""
-"Note that only entries with a weight unit (kg or lb) and\n"
-"repetitions are charted, other combinations such as time or until failure\n"
-"are ignored here."
-msgstr ""
-"Запримітьте, що на графіку відображаються тільки\n"
-"записи з одиницями ваги (кг або lb) і повтореннями. Інші комбінації,\n"
-"такі як час або \"до відмови\", тут ігноруються."
-
 #: manager/templates/workout/overview.html:25
 msgid "No templates found."
 msgstr "Шаблонів не знайдено."
@@ -2731,27 +2666,23 @@ msgstr "Додати набори підходів до тренувальних
 msgid "Set the repetitions for each set"
 msgstr "Встановити повторення для кожного підходу"
 
-#: manager/templates/workout/view.html:73
+#: manager/templates/workout/view.html:75
 msgid "Export this workout as a calendar file."
 msgstr "Експорт цього тренування у файлі календаря."
 
-#: manager/templates/workout/view.html:144
+#: manager/templates/workout/view.html:156
 msgid "Logs"
 msgstr "Журнали"
 
-#: manager/templates/workout/view.html:146
+#: manager/templates/workout/view.html:159
 msgid "View logs"
 msgstr "Перегляд журналів"
 
-#: manager/templates/workout/view.html:169 manager/views/schedule_step.py:99
-msgid "Edit workout"
-msgstr "Змінити тренування"
-
-#: manager/templates/workout/view.html:182 manager/views/workout.py:281
+#: manager/templates/workout/view.html:195 manager/views/workout.py:281
 msgid "Mark as template"
 msgstr "Позначити як шаблон"
 
-#: manager/views/day.py:109
+#: manager/views/day.py:105
 msgid "Add workout day"
 msgstr "Додати день тренування"
 
@@ -2768,6 +2699,10 @@ msgstr "Тренування для %s"
 msgid "Create schedule"
 msgstr "Створити програму"
 
+#: manager/views/schedule_step.py:99
+msgid "Edit workout"
+msgstr "Змінити тренування"
+
 #: manager/views/workout.py:209
 msgid "Copy workout"
 msgstr "Копіювати тренування"
@@ -2891,7 +2826,7 @@ msgstr "Кількість в грамах"
 msgid "Unit amount, e.g. \"1 Cup\" or \"1/2 spoon\""
 msgstr "Одиниця кількісті, напр. \"1 чашка\" або \"1/2 ложки\""
 
-#: nutrition/models/log.py:52 nutrition/models/meal.py:50
+#: nutrition/models/log.py:52 nutrition/models/meal.py:48
 #: nutrition/models/meal_item.py:48 nutrition/models/plan.py:108
 msgid "Nutrition plan"
 msgstr "План харчування"
@@ -2904,11 +2839,11 @@ msgstr "Приймання їжі"
 msgid "Date and Time (Approx.)"
 msgstr "Дата і час (приблизно)"
 
-#: nutrition/models/meal.py:62
+#: nutrition/models/meal.py:60
 msgid "Time (approx)"
 msgstr "Час (приблизно)"
 
-#: nutrition/models/meal.py:69
+#: nutrition/models/meal.py:67
 msgid ""
 "Give meals a textual description / name such as \"Breakfast\" or \"after "
 "workout\""
@@ -3048,10 +2983,6 @@ msgstr "Немає інгредієнтів."
 msgid "Search"
 msgstr "Пошук"
 
-#: nutrition/templates/ingredient/overview.html:62
-msgid "Add ingredient"
-msgstr "Додати інгредієнт"
-
 #: nutrition/templates/ingredient/view.html:45 nutrition/views/plan.py:229
 msgid "Macronutrients"
 msgstr "Макроелементи"
@@ -3071,20 +3002,11 @@ msgstr "немає в наявності"
 msgid "Others"
 msgstr "Інші"
 
-#: nutrition/templates/ingredient/view.html:144
-#: nutrition/templates/units/list.html:46 nutrition/views/unit.py:86
+#: nutrition/templates/ingredient/view.html:143
+#: nutrition/templates/units/list.html:50 nutrition/views/unit.py:86
 msgid "Add new weight unit"
 msgstr "Додати нову одиницю ваги"
 
-#: nutrition/templates/ingredient/view.html:206
-#: nutrition/templates/ingredient/view.html:209
-msgid "Edit ingredient"
-msgstr "Редагувати інгредієнт"
-
-#: nutrition/templates/ingredient/view.html:213
-msgid "Delete ingredient"
-msgstr "Видалити інгредієнт"
-
 #: nutrition/templates/rate/form.html:25
 msgid "Basal metabolic rate"
 msgstr "Базальний рівень метаболізму"
@@ -3732,6 +3654,85 @@ msgstr "Успішно видалено."
 msgid "Delete weight entry for the %s"
 msgstr "Видалити запис ваги для %s"
 
+#~ msgid ""
+#~ "If a license has been localized, e.g. the Creative Commons\n"
+#~ "            licenses for the different countries, add them as separate "
+#~ "entries here."
+#~ msgstr ""
+#~ "Якщо ліцензія була локалізована, наприклад, як ліцензії\n"
+#~ "Creative Commons для різних країн, додайте їх як окремі записи."
+
+#~ msgid "Add weight log"
+#~ msgstr "Додати журнал ваги"
+
+#~ msgid "This exercise has no repetitions."
+#~ msgstr "Ця вправа не має повторів."
+
+#~ msgid "Edit them now."
+#~ msgstr "Редагувати їх зараз."
+
+#~ msgid "Add exercises to this workout day"
+#~ msgstr "Додати вправи до цього дня тренування"
+
+#~ msgid "Edit schedule"
+#~ msgstr "Редагувати програму"
+
+#~ msgid "Delete schedule"
+#~ msgstr "Видалити програму"
+
+#~ msgid "Weight log"
+#~ msgstr "Журнал ваги"
+
+#~ msgid "Weight log for workout"
+#~ msgstr "Журнал ваги для тренування"
+
+#~ msgid "Add weight log to this day"
+#~ msgstr "Додати запис ваги до цього дня"
+
+#~ msgid "No weight entries here."
+#~ msgstr "Тут немає записів ваги."
+
+#~ msgid "No exercises for this day."
+#~ msgstr "Немає вправ для цього дня."
+
+#~ msgid ""
+#~ "This page shows the weight logs belonging to this workout\n"
+#~ "only. Click on an exercise to see all the historical data for\n"
+#~ "it."
+#~ msgstr ""
+#~ "На цій сторінці показані журнали ваги, що належать тільки\n"
+#~ "до цього тренування. Натисніть на вправу, щоб побачити всі\n"
+#~ "історичні дані."
+
+#~ msgid ""
+#~ "If on a single day there is more than one entry with the\n"
+#~ "same number of repetitions, but different weights, only the entry with "
+#~ "the\n"
+#~ "higher weight is shown in the diagram."
+#~ msgstr ""
+#~ "Якщо на один день припадає більше одного запису з однаковою кількістю\n"
+#~ "повторень, але різними вагами, то на графіку буде показано тільки запис\n"
+#~ "з більшою вагою."
+
+#~ msgid ""
+#~ "Note that only entries with a weight unit (kg or lb) and\n"
+#~ "repetitions are charted, other combinations such as time or until "
+#~ "failure\n"
+#~ "are ignored here."
+#~ msgstr ""
+#~ "Запримітьте, що на графіку відображаються тільки\n"
+#~ "записи з одиницями ваги (кг або lb) і повтореннями. Інші комбінації,\n"
+#~ "такі як час або \"до відмови\", тут ігноруються."
+
+#~ msgid "Add ingredient"
+#~ msgstr "Додати інгредієнт"
+
+#~ msgid "Edit ingredient"
+#~ msgstr "Редагувати інгредієнт"
+
+#~ msgid "Delete ingredient"
+#~ msgstr "Видалити інгредієнт"
+
 #~ msgid "Ingredients pending review"
 #~ msgstr "Інгредієнти, що очікують розгляду"
 
diff --git a/wger/locale/zh_CN/LC_MESSAGES/django.po b/wger/locale/zh_CN/LC_MESSAGES/django.po
index 162f07d9d..3f0102ebd 100644
--- a/wger/locale/zh_CN/LC_MESSAGES/django.po
+++ b/wger/locale/zh_CN/LC_MESSAGES/django.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: wger Workout Manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-07-14 15:59+0200\n"
+"POT-Creation-Date: 2024-11-14 13:09+0100\n"
 "PO-Revision-Date: 2024-06-05 08:09+0000\n"
 "Last-Translator: Yi-Han Hsiung <hsiungyi@oregonstate.edu>\n"
 "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/"
@@ -26,7 +26,7 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Weblate 5.6-dev\n"
 
-#: config/models/gym_config.py:46 gym/templates/gym/list.html:53
+#: config/models/gym_config.py:46 gym/templates/gym/list.html:56
 msgid "Default gym"
 msgstr "默认健身房"
 
@@ -38,28 +38,28 @@ msgstr ""
 "选择默认健身房。所有新注册用户及没有添加健身房的已注册用户会加入此默认健身"
 "房。"
 
-#: config/views/gym_config.py:42 core/templates/language/view.html:67
-#: core/templates/license/list.html:17 core/templates/misc/license/list.html:18
+#: config/views/gym_config.py:42 core/templates/language/view.html:64
+#: core/templates/license/list.html:17
 #: core/templates/repetition_unit/list.html:18
-#: core/templates/tags/render_day.html:39
-#: core/templates/tags/render_day.html:75 core/templates/user/overview.html:204
-#: core/templates/user/overview.html:445
+#: core/templates/user/overview.html:204 core/templates/user/overview.html:467
 #: core/templates/weight_unit/list.html:18
 #: exercises/templates/categories/admin-overview.html:17
 #: exercises/templates/equipment/admin-overview.html:17
-#: exercises/templates/muscles/admin-overview.html:17
-#: gallery/views/images.py:98 gym/templates/admin_notes/list.html:32
-#: gym/templates/contract/list.html:31 gym/templates/contract/view.html:107
-#: gym/templates/contract_option/list.html:32
-#: gym/templates/contract_type/list.html:32 gym/templates/document/list.html:38
-#: gym/templates/gym/list.html:20 gym/templates/gym/list.html:46
-#: gym/templates/gym/member_list.html:87 gym/templates/gym/member_list.html:140
-#: gym/templates/gym/member_list.html:176
-#: manager/templates/calendar/day.html:68
-#: manager/templates/calendar/month.html:85
-#: manager/templates/calendar/partial_overview_table.html:18
-#: manager/templates/schedule/view.html:118
-#: nutrition/templates/ingredient/view.html:165
+#: exercises/templates/muscles/admin-overview.html:16
+#: gallery/views/images.py:98 gym/templates/admin_notes/list.html:31
+#: gym/templates/contract/list.html:30 gym/templates/contract/view.html:106
+#: gym/templates/contract_option/list.html:29
+#: gym/templates/contract_type/list.html:30 gym/templates/document/list.html:38
+#: gym/templates/gym/list.html:19 gym/templates/gym/list.html:48
+#: gym/templates/gym/member_list.html:94 gym/templates/gym/member_list.html:152
+#: gym/templates/gym/member_list.html:190
+#: manager/templates/calendar/day.html:67
+#: manager/templates/calendar/month.html:84
+#: manager/templates/calendar/partial_overview_table.html:16
+#: manager/templates/schedule/view.html:318
+#: manager/templates/workout/view.html:181
+#: nutrition/templates/ingredient/view.html:164
+#: nutrition/templates/ingredient/view.html:209
 #: nutrition/templates/units/list.html:19
 msgid "Edit"
 msgstr "编辑"
@@ -93,8 +93,8 @@ msgstr "我酷酷的健身日程"
 msgid "Empty placeholder schedule"
 msgstr "空的时间表"
 
-#: core/forms.py:69 core/templates/navigation.html:285
-#: core/templates/navigation.html:291 core/templates/user/login.html:4
+#: core/forms.py:69 core/templates/navigation.html:284
+#: core/templates/navigation.html:290 core/templates/user/login.html:4
 #: software/templates/features.html:82 software/templates/features.html:427
 msgid "Login"
 msgstr "登录"
@@ -104,14 +104,14 @@ msgstr "登录"
 msgid "First name"
 msgstr "名字"
 
-#: core/forms.py:109 core/forms.py:215 core/templates/user/overview.html:266
+#: core/forms.py:109 core/forms.py:215 core/templates/user/overview.html:284
 #: gym/views/export.py:62 gym/views/gym.py:217
 msgid "Last name"
 msgstr "姓氏"
 
-#: core/forms.py:111 core/forms.py:180 core/templates/user/overview.html:270
+#: core/forms.py:111 core/forms.py:180 core/templates/user/overview.html:288
 #: gym/models/contract.py:256 gym/models/gym.py:58
-#: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:104
+#: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:116
 #: gym/templates/gym/new_user.html:30 gym/views/export.py:60
 #: mailer/templates/mailer/gym/form.html:4
 #: mailer/templates/mailer/gym/overview.html:4
@@ -140,8 +140,8 @@ msgstr "健身提醒"
 msgid "Other settings"
 msgstr "其它设置"
 
-#: core/forms.py:174 core/views/user.py:624 core/views/user.py:639
-#: core/views/user.py:651 gym/forms.py:73 manager/templates/log/add.html:65
+#: core/forms.py:174 core/views/user.py:623 core/views/user.py:638
+#: core/views/user.py:650 gym/forms.py:73 manager/templates/log/add.html:65
 #: manager/templates/set/add.html:70 manager/views/workout.py:203
 #: utils/generic_views.py:143
 msgid "Save"
@@ -164,26 +164,25 @@ msgstr "密码"
 msgid "Please enter your current password."
 msgstr "请输入你的原密码。"
 
-#: core/forms.py:242 core/templates/language/view.html:73
-#: core/templates/license/list.html:19 core/templates/misc/license/list.html:22
-#: core/templates/repetition_unit/list.html:20
-#: core/templates/tags/render_day.html:45
-#: core/templates/tags/render_day.html:81 core/templates/user/overview.html:217
-#: core/templates/weight_unit/list.html:20
-#: exercises/templates/categories/admin-overview.html:19
-#: exercises/templates/equipment/admin-overview.html:19
-#: exercises/templates/muscles/admin-overview.html:19
-#: gym/templates/admin_notes/list.html:40
-#: gym/templates/contract_option/list.html:41
-#: gym/templates/contract_type/list.html:41 gym/templates/document/list.html:46
-#: gym/templates/gym/list.html:22 manager/templates/calendar/day.html:73
-#: manager/templates/calendar/month.html:89
-#: manager/templates/calendar/partial_overview_table.html:23
-#: manager/templates/schedule/view.html:122
-#: manager/templates/workout/view.html:188
-#: nutrition/templates/ingredient/view.html:166
+#: core/forms.py:242 core/templates/language/view.html:70
+#: core/templates/license/list.html:21
+#: core/templates/repetition_unit/list.html:22
+#: core/templates/user/overview.html:233
+#: core/templates/weight_unit/list.html:22
+#: exercises/templates/categories/admin-overview.html:21
+#: exercises/templates/equipment/admin-overview.html:21
+#: exercises/templates/muscles/admin-overview.html:20
+#: gym/templates/admin_notes/list.html:37
+#: gym/templates/contract_option/list.html:35
+#: gym/templates/contract_type/list.html:36 gym/templates/document/list.html:46
+#: gym/templates/gym/list.html:23 manager/templates/calendar/day.html:73
+#: manager/templates/calendar/month.html:88
+#: manager/templates/calendar/partial_overview_table.html:22
+#: manager/templates/schedule/view.html:324
+#: manager/templates/workout/view.html:202
+#: nutrition/templates/ingredient/view.html:168
 #: nutrition/templates/ingredient/view.html:215
-#: nutrition/templates/units/list.html:22
+#: nutrition/templates/units/list.html:25
 msgid "Delete"
 msgstr "删除"
 
@@ -195,9 +194,9 @@ msgstr "密码无效"
 msgid "The form is secured with reCAPTCHA"
 msgstr "该表格由 reCAPTCHA 保护"
 
-#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:285
-#: core/templates/navigation.html:297 core/templates/template.html:149
-#: core/templates/user/login.html:20 core/views/user.py:298
+#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:284
+#: core/templates/navigation.html:296 core/templates/template.html:151
+#: core/templates/user/login.html:20 core/views/user.py:297
 #: software/templates/features.html:87 software/templates/features.html:422
 msgid "Register"
 msgstr "注册"
@@ -444,18 +443,18 @@ msgid "The sum of all hours has to be 24"
 msgstr "所有时长的和应该是24"
 
 #: core/models/rep_unit.py:36 core/models/weight_unit.py:36
-#: core/templates/user/overview.html:262 core/views/user.py:599
+#: core/templates/user/overview.html:280 core/views/user.py:598
 #: exercises/models/category.py:29 exercises/models/equipment.py:29
 #: exercises/models/exercise.py:59 exercises/models/muscle.py:36
 #: gym/models/contract.py:52 gym/models/contract.py:103 gym/models/gym.py:46
 #: gym/models/user_document.py:84 gym/templates/contract/view.html:50
-#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:96
+#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:108
 #: gym/views/gym.py:158 manager/models/schedule.py:55
 #: manager/models/workout.py:57 measurements/models/category.py:36
 #: nutrition/models/ingredient.py:111
-#: nutrition/models/ingredient_category.py:27 nutrition/models/meal.py:67
+#: nutrition/models/ingredient_category.py:27 nutrition/models/meal.py:65
 #: nutrition/models/weight_unit.py:38
-#: nutrition/templates/ingredient/view.html:152
+#: nutrition/templates/ingredient/view.html:151
 msgid "Name"
 msgstr "名称"
 
@@ -505,7 +504,7 @@ msgstr ""
 msgid "Back to \"%(target)s\""
 msgstr "返回到\"%(target)s\""
 
-#: core/templates/delete.html:15
+#: core/templates/delete.html:4
 msgid "Are you sure you want to delete this? This action cannot be undone."
 msgstr "你确定要删除这条记录？删除动作是不可撤销的。"
 
@@ -559,7 +558,7 @@ msgstr ""
 msgid "Dashboard"
 msgstr "管理面板"
 
-#: core/templates/language/overview.html:4 core/templates/navigation.html:345
+#: core/templates/language/overview.html:4 core/templates/navigation.html:344
 msgid "Languages"
 msgstr "语言"
 
@@ -569,81 +568,72 @@ msgstr "未找到匹配项。"
 
 #: core/templates/language/overview.html:22
 #: manager/templates/calendar/month.html:132
-#: manager/templates/schedule/overview.html:28
-#: manager/templates/schedule/view.html:144
+#: manager/templates/schedule/view.html:154
 #: manager/templates/workout/overview.html:28
 #: nutrition/templates/ingredient/overview.html:38
 msgid "Add one now."
 msgstr "现在就新增一个。"
 
-#: core/templates/language/overview.html:35 core/templates/license/list.html:40
-#: core/templates/misc/license/list.html:43
-#: core/templates/repetition_unit/list.html:43
-#: core/templates/user/overview.html:326 core/templates/user/overview.html:365
-#: core/templates/user/overview.html:401
-#: core/templates/weight_unit/list.html:43 core/views/languages.py:74
+#: core/templates/language/overview.html:34 core/templates/license/list.html:43
+#: core/templates/repetition_unit/list.html:46
+#: core/templates/user/overview.html:344 core/templates/user/overview.html:384
+#: core/templates/user/overview.html:422
+#: core/templates/weight_unit/list.html:46 core/views/languages.py:74
 #: core/views/license.py:66 core/views/repetition_units.py:66
 #: core/views/weight_units.py:66
-#: exercises/templates/categories/admin-overview.html:38
-#: gallery/views/images.py:63 gym/templates/admin_notes/list.html:67
-#: gym/templates/contract/list.html:73
-#: gym/templates/contract_option/list.html:72
-#: gym/templates/contract_type/list.html:72 gym/templates/document/list.html:79
-#: gym/templates/gym/member_list.html:211
-#: gym/templates/gym/member_list.html:244
-#: gym/templates/gym/member_list.html:281
+#: exercises/templates/categories/admin-overview.html:40
+#: exercises/templates/equipment/admin-overview.html:39
+#: exercises/templates/muscles/admin-overview.html:40
+#: gallery/views/images.py:63 gym/templates/admin_notes/list.html:64
+#: gym/templates/contract/list.html:69
+#: gym/templates/contract_option/list.html:65
+#: gym/templates/contract_type/list.html:66 gym/templates/document/list.html:78
+#: gym/templates/gym/member_list.html:228
+#: gym/templates/gym/member_list.html:264
+#: gym/templates/gym/member_list.html:303
 #: mailer/templates/mailer/gym/overview.html:43
+#: nutrition/templates/ingredient/overview.html:60
 msgid "Add"
 msgstr "新增"
 
 #: core/templates/language/view.html:61 core/templates/user/api_key.html:44
-#: core/templates/user/preferences.html:45 gym/models/contract.py:203
-#: gym/templates/contract/view.html:41 gym/templates/contract/view.html:106
-#: gym/templates/gym/member_list.html:248
-#: manager/templates/schedule/view.html:285
-#: manager/templates/workout/view.html:163
-#: nutrition/templates/ingredient/view.html:202
+#: core/templates/user/preferences.html:50 gym/models/contract.py:203
+#: gym/templates/contract/view.html:41 gym/templates/gym/member_list.html:270
+#: manager/templates/schedule/view.html:304
+#: manager/templates/workout/view.html:177
+#: nutrition/templates/ingredient/view.html:206
 msgid "Options"
 msgstr "选项"
 
-#: core/templates/license/list.html:4 core/templates/misc/license/list.html:4
+#: core/templates/license/list.html:4
 msgid "License list"
 msgstr "许可协议列表"
 
-#: core/templates/license/list.html:26 core/templates/misc/license/list.html:30
-#: core/templates/repetition_unit/list.html:28
+#: core/templates/license/list.html:30
+#: core/templates/repetition_unit/list.html:32
 #: core/templates/user/overview.html:104 core/templates/user/overview.html:136
-#: core/templates/user/overview.html:185 core/templates/user/overview.html:347
-#: core/templates/user/overview.html:383 core/templates/user/overview.html:427
-#: core/templates/weight_unit/list.html:28
-#: exercises/templates/categories/admin-overview.html:26
-#: exercises/templates/equipment/admin-overview.html:26
-#: exercises/templates/muscles/admin-overview.html:26
-#: gym/templates/admin_notes/list.html:52 gym/templates/contract/list.html:60
-#: gym/templates/contract_option/list.html:58
-#: gym/templates/contract_type/list.html:58 gym/templates/document/list.html:64
-#: gym/templates/gym/list.html:29 gym/templates/gym/member_list.html:229
-#: gym/templates/gym/member_list.html:262
-#: gym/templates/gym/member_list.html:299
+#: core/templates/user/overview.html:185 core/templates/user/overview.html:365
+#: core/templates/user/overview.html:404 core/templates/user/overview.html:448
+#: core/templates/weight_unit/list.html:32
+#: exercises/templates/categories/admin-overview.html:30
+#: exercises/templates/equipment/admin-overview.html:30
+#: exercises/templates/muscles/admin-overview.html:29
+#: gym/templates/admin_notes/list.html:50 gym/templates/contract/list.html:57
+#: gym/templates/contract_option/list.html:52
+#: gym/templates/contract_type/list.html:53 gym/templates/document/list.html:64
+#: gym/templates/gym/list.html:32 gym/templates/gym/member_list.html:248
+#: gym/templates/gym/member_list.html:284
+#: gym/templates/gym/member_list.html:321
 #: mailer/templates/mailer/gym/overview.html:30
-#: manager/templates/calendar/day.html:87
-#: nutrition/templates/units/list.html:29
+#: manager/templates/calendar/day.html:88
+#: nutrition/templates/units/list.html:34
 msgid "Nothing found"
 msgstr "没有找到任何内容"
 
-#: core/templates/misc/about.html:4 core/templates/template.html:175
+#: core/templates/misc/about.html:4 core/templates/template.html:188
 msgid "Imprint"
 msgstr "版本说明"
 
-#: core/templates/misc/license/list.html:47
-msgid ""
-"If a license has been localized, e.g. the Creative Commons\n"
-"            licenses for the different countries, add them as separate "
-"entries here."
-msgstr ""
-"如果一个许可证已经本地化，例如，不同国家的 \"知识共享 \"\n"
-"许可证，请将它们作为单独的条目添加到这里。"
-
 #: core/templates/navigation.html:28 software/templates/features.html:437
 msgid "Training"
 msgstr "训练"
@@ -688,8 +678,8 @@ msgstr "公共模板"
 msgid "Exercises"
 msgstr "练习"
 
-#: core/templates/navigation.html:111 core/templates/navigation.html:184
-#: core/templates/navigation.html:340
+#: core/templates/navigation.html:111 core/templates/navigation.html:185
+#: core/templates/navigation.html:339
 msgid "Administration"
 msgstr "管理"
 
@@ -726,87 +716,87 @@ msgstr "体重指数计算器"
 msgid "Daily calories calculator"
 msgstr "每日卡路里计算器"
 
-#: core/templates/navigation.html:179
+#: core/templates/navigation.html:180
 #: nutrition/templates/ingredient/overview.html:10
 msgid "Ingredient overview"
 msgstr "食谱总览"
 
-#: core/templates/navigation.html:187 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:189 nutrition/templates/units/list.html:6
 msgid "Ingredient weight units"
 msgstr "食谱计量单位"
 
-#: core/templates/navigation.html:203 software/templates/features.html:442
+#: core/templates/navigation.html:205 software/templates/features.html:442
 msgid "Body weight"
 msgstr "体重"
 
-#: core/templates/navigation.html:210 core/templates/user/overview.html:114
+#: core/templates/navigation.html:212 core/templates/user/overview.html:114
 msgid "Weight overview"
 msgstr "体重总览"
 
-#: core/templates/navigation.html:217 weight/views.py:65
+#: core/templates/navigation.html:216 weight/views.py:65
 msgid "Add weight entry"
 msgstr "新增体重记录"
 
-#: core/templates/navigation.html:231
+#: core/templates/navigation.html:230
 msgid "About this software"
 msgstr "关于软件"
 
-#: core/templates/navigation.html:237 software/templates/about_us.html:5
+#: core/templates/navigation.html:236 software/templates/about_us.html:5
 msgid "About us"
 msgstr "关于我们"
 
-#: core/templates/navigation.html:243 software/templates/features.html:507
+#: core/templates/navigation.html:242 software/templates/features.html:507
 msgid "REST API"
 msgstr "REST API"
 
-#: core/templates/navigation.html:249 utils/models.py:45
+#: core/templates/navigation.html:248 utils/models.py:45
 msgid "License"
 msgstr "许可协议"
 
-#: core/templates/navigation.html:255
+#: core/templates/navigation.html:254
 msgid "Developer documentation"
 msgstr "开发者文档"
 
-#: core/templates/navigation.html:262
+#: core/templates/navigation.html:261
 msgid "Get the code"
 msgstr "获取源码"
 
-#: core/templates/navigation.html:269 core/templates/template.html:214
+#: core/templates/navigation.html:268 core/templates/template.html:227
 #: software/templates/features.html:582
 msgid "Translate"
 msgstr "翻译"
 
-#: core/templates/navigation.html:303 core/templates/user/login.html:28
+#: core/templates/navigation.html:302 core/templates/user/login.html:28
 msgid "Reset password"
 msgstr "重设密码"
 
-#: core/templates/navigation.html:321
+#: core/templates/navigation.html:320
 msgid "My preferences"
 msgstr "我的首选项"
 
-#: core/templates/navigation.html:330
+#: core/templates/navigation.html:329
 msgid "Logout"
 msgstr "退出"
 
-#: core/templates/navigation.html:353
+#: core/templates/navigation.html:352
 msgid "Licenses"
 msgstr "许可协议"
 
-#: core/templates/navigation.html:361
+#: core/templates/navigation.html:360
 #: core/templates/repetition_unit/list.html:4
 msgid "Repetition units"
 msgstr "重复单元"
 
-#: core/templates/navigation.html:369 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:368 core/templates/weight_unit/list.html:4
 #: nutrition/templates/ingredient/view.html:141
 msgid "Weight units"
 msgstr "重量单位"
 
-#: core/templates/navigation.html:377 core/templates/user/list.html:4
+#: core/templates/navigation.html:376 core/templates/user/list.html:4
 msgid "User list"
 msgstr "用户列表"
 
-#: core/templates/navigation.html:383
+#: core/templates/navigation.html:382
 msgid "Gyms"
 msgstr "健身房"
 
@@ -867,55 +857,30 @@ msgstr "前一页"
 msgid "next"
 msgstr "后一页"
 
-#: core/templates/tags/render_day.html:34
-msgid "Add weight log"
-msgstr "新增体重记录"
-
-#: core/templates/tags/render_day.html:116
-msgid "Placeholder image for exercise"
+#: core/templates/tags/render_day.html:44
+#, fuzzy
+#| msgid "Placeholder image for exercise"
+msgid "Placeholder image for translation"
 msgstr "健身图片占位符"
 
-#: core/templates/tags/render_day.html:133
-msgid "This exercise has no repetitions."
-msgstr "这个健身项目没有重复次数."
-
-#: core/templates/tags/render_day.html:136
-msgid "Edit them now."
-msgstr "现在编辑它们."
-
-#: core/templates/tags/render_day.html:162
-msgid "Add exercises to this workout day"
-msgstr "新增健身项目到这个健身日"
-
-#: core/templates/tags/render_weight_log.html:17 manager/helpers.py:86
-#: manager/models/setting.py:72 manager/templates/set/formset.html:9
-msgid "Reps"
-msgstr "重复次数"
-
-#: core/templates/tags/render_weight_log.html:30 manager/forms.py:191
-#: manager/models/log.py:103 manager/models/setting.py:102
-#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
-msgid "RiR"
-msgstr "力竭之前的剩余次数"
-
-#: core/templates/template.html:122 manager/templates/calendar/month.html:138
-#: manager/templates/schedule/view.html:248
-#: manager/templates/schedule/view.html:269
-#: manager/templates/workout/view.html:84
-#: manager/templates/workout/view.html:137
+#: core/templates/template.html:124 manager/templates/calendar/month.html:138
+#: manager/templates/schedule/view.html:262
+#: manager/templates/schedule/view.html:287
+#: manager/templates/workout/view.html:89
+#: manager/templates/workout/view.html:149
 msgid "Close"
 msgstr "关闭"
 
-#: core/templates/template.html:138
+#: core/templates/template.html:140
 msgid ""
 "You are using a guest account, data entered will be deleted after a week."
 msgstr "你正在以访客模式浏览,输入的数据会在一周后删除."
 
-#: core/templates/template.html:143
+#: core/templates/template.html:145
 msgid "Create some demo entries"
 msgstr "创建一些示例项"
 
-#: core/templates/template.html:180 software/templates/features.html:547
+#: core/templates/template.html:193 software/templates/features.html:547
 #: software/templates/tos.html:7
 msgid "Terms of service"
 msgstr "服务条款"
@@ -924,7 +889,7 @@ msgstr "服务条款"
 msgid "Features"
 msgstr "特色"
 
-#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:54
+#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:59
 msgid "API key"
 msgstr "API密钥"
 
@@ -967,17 +932,17 @@ msgstr "生成一个新的API密钥"
 msgid "Documentation"
 msgstr "文档"
 
-#: core/templates/user/delete_account.html:4
-#: core/templates/user/preferences.html:59
+#: core/templates/user/delete_account.html:3
+#: core/templates/user/preferences.html:62
 msgid "Delete account"
 msgstr "删除账户"
 
-#: core/templates/user/delete_account.html:17
+#: core/templates/user/delete_account.html:9
 #: exercises/templates/history/overview.html:93
 msgid "Are you sure?"
 msgstr "你确定吗？"
 
-#: core/templates/user/delete_account.html:22
+#: core/templates/user/delete_account.html:14
 #, python-format
 msgid ""
 "This action will delete the user account \"%(username)s\".\n"
@@ -999,22 +964,22 @@ msgstr "忘记密码？"
 
 #: core/templates/user/overview.html:25 core/templates/user/overview.html:68
 #: core/templates/user/overview.html:112 core/templates/user/overview.html:144
-#: core/templates/user/overview.html:330 core/templates/user/overview.html:369
-#: core/templates/user/overview.html:405
+#: core/templates/user/overview.html:348 core/templates/user/overview.html:390
+#: core/templates/user/overview.html:426
 #, python-format
 msgid "last %(number)s"
 msgstr "最后%(number)s"
 
 #: core/templates/user/overview.html:27 core/templates/user/overview.html:146
-#: core/templates/user/overview.html:325 core/templates/user/overview.html:364
-#: core/templates/user/overview.html:400 gym/templates/gym/member_list.html:210
-#: gym/templates/gym/member_list.html:243
-#: gym/templates/gym/member_list.html:280
+#: core/templates/user/overview.html:343 core/templates/user/overview.html:382
+#: core/templates/user/overview.html:421 gym/templates/gym/member_list.html:226
+#: gym/templates/gym/member_list.html:262
+#: gym/templates/gym/member_list.html:302
 msgid "Overview"
 msgstr "总览"
 
 #: core/templates/user/overview.html:28
-#: manager/templates/schedule/view.html:163
+#: manager/templates/schedule/view.html:172
 #: manager/templates/workout/overview.html:39 manager/views/schedule_step.py:60
 msgid "Add workout"
 msgstr "新增健身"
@@ -1046,38 +1011,36 @@ msgstr "目标"
 msgid "Number of logs (days)"
 msgstr "日志数（天）"
 
-#: core/templates/user/overview.html:37 core/views/user.py:600
+#: core/templates/user/overview.html:37 core/views/user.py:599
 #: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:158
 msgid "Last activity"
 msgstr "最后一次活动"
 
 #: core/templates/user/overview.html:58
 #: manager/templates/calendar/month.html:128
-#: manager/templates/schedule/view.html:144
 #: manager/templates/workout/overview.html:28
 msgid "No workouts found."
 msgstr "没有健身记录。"
 
 #: core/templates/user/overview.html:68 manager/forms.py:280
-#: manager/templates/workout/view.html:106
+#: manager/templates/workout/view.html:114
 msgid "Log"
 msgstr "日志"
 
 #: core/templates/user/overview.html:77 manager/models/session.py:83
-#: manager/templates/calendar/partial_overview_table.html:52
+#: manager/templates/calendar/partial_overview_table.html:54
 msgid "General impression"
 msgstr "总体印象"
 
-#: core/templates/user/overview.html:78 core/templates/user/overview.html:369
+#: core/templates/user/overview.html:78 core/templates/user/overview.html:390
 #: manager/models/session.py:73
-#: manager/templates/calendar/partial_overview_table.html:56
-#: manager/templates/workout/log.html:89
+#: manager/templates/calendar/partial_overview_table.html:58
 msgid "Notes"
 msgstr "备注"
 
 #: core/templates/user/overview.html:79
 #: exercises/templates/history/overview.html:30
-#: manager/templates/calendar/partial_overview_table.html:42
+#: manager/templates/calendar/partial_overview_table.html:44
 msgid "Time"
 msgstr "时间"
 
@@ -1115,121 +1078,121 @@ msgstr "脂肪"
 msgid "kcal"
 msgstr "大卡"
 
-#: core/templates/user/overview.html:201 core/templates/user/overview.html:322
-#: core/templates/user/overview.html:361 core/templates/user/overview.html:397
-#: core/templates/user/overview.html:442 gym/templates/gym/list.html:42
-#: gym/templates/gym/member_list.html:84 gym/templates/gym/member_list.html:137
-#: gym/templates/gym/member_list.html:173
-#: gym/templates/gym/member_list.html:207
-#: gym/templates/gym/member_list.html:240
-#: gym/templates/gym/member_list.html:277
-#: manager/templates/schedule/view.html:100
+#: core/templates/user/overview.html:201 core/templates/user/overview.html:340
+#: core/templates/user/overview.html:379 core/templates/user/overview.html:418
+#: core/templates/user/overview.html:463 gym/templates/gym/list.html:45
+#: gym/templates/gym/member_list.html:91 gym/templates/gym/member_list.html:149
+#: gym/templates/gym/member_list.html:187
+#: gym/templates/gym/member_list.html:223
+#: gym/templates/gym/member_list.html:259
+#: gym/templates/gym/member_list.html:299
+#: manager/templates/schedule/view.html:99
 msgid "Actions"
 msgstr "操作"
 
-#: core/templates/user/overview.html:207
+#: core/templates/user/overview.html:210
 msgid "Deactivate user"
 msgstr "非活跃用户"
 
-#: core/templates/user/overview.html:209
+#: core/templates/user/overview.html:214
 msgid "Activate user"
 msgstr "活跃用户"
 
-#: core/templates/user/overview.html:211
+#: core/templates/user/overview.html:223
 msgid "Reset user password"
 msgstr "重置用户密码"
 
-#: core/templates/user/overview.html:214 gym/templates/gym/member_list.html:30
+#: core/templates/user/overview.html:227 gym/templates/gym/member_list.html:30
 msgid "Roles"
 msgstr "角色"
 
-#: core/templates/user/overview.html:225
+#: core/templates/user/overview.html:243
 msgid "Password reset confirmation"
 msgstr "密码重置确认"
 
-#: core/templates/user/overview.html:229
+#: core/templates/user/overview.html:247
 msgid "Do you really want to change this user&#39;s password?"
 msgstr "真的要修改用户&#39;的密码？"
 
-#: core/templates/user/overview.html:232
+#: core/templates/user/overview.html:250
 #: exercises/templates/history/overview.html:106
 msgid "No"
 msgstr "否"
 
-#: core/templates/user/overview.html:233
+#: core/templates/user/overview.html:251
 #: exercises/templates/history/overview.html:99
 msgid "Yes"
 msgstr "是"
 
-#: core/templates/user/overview.html:254 gym/templates/gym/member_list.html:93
+#: core/templates/user/overview.html:272 gym/templates/gym/member_list.html:105
 msgid "Details"
 msgstr "详细"
 
-#: core/templates/user/overview.html:258 gym/views/export.py:57
-#: manager/helpers.py:86 manager/templates/schedule/view.html:98
+#: core/templates/user/overview.html:276 gym/views/export.py:57
+#: manager/helpers.py:86 manager/templates/schedule/view.html:97
 msgid "Nr."
 msgstr "序号"
 
-#: core/templates/user/overview.html:280 gym/models/contract.py:287
+#: core/templates/user/overview.html:298 gym/models/contract.py:287
 #: gym/models/gym.py:50 gym/templates/contract/view.html:75
-#: gym/templates/gym/member_list.html:100 gym/views/export.py:68
+#: gym/templates/gym/member_list.html:112 gym/views/export.py:68
 msgid "Phone"
 msgstr "手机"
 
-#: core/templates/user/overview.html:284 gym/templates/contract/view.html:87
-#: gym/templates/gym/member_list.html:118
+#: core/templates/user/overview.html:302 gym/templates/contract/view.html:87
+#: gym/templates/gym/member_list.html:130
 msgid "Address"
 msgstr "地址"
 
-#: core/templates/user/overview.html:295
+#: core/templates/user/overview.html:313
 msgid "Registered"
 msgstr "注册时间"
 
-#: core/templates/user/overview.html:299
+#: core/templates/user/overview.html:317
 msgid "Last login"
 msgstr "最后登录"
 
-#: core/templates/user/overview.html:304
+#: core/templates/user/overview.html:322
 msgid "Status"
 msgstr "状态"
 
-#: core/templates/user/overview.html:307
+#: core/templates/user/overview.html:325
 msgid "Active"
 msgstr "活跃"
 
-#: core/templates/user/overview.html:309
+#: core/templates/user/overview.html:327
 msgid "Inactive"
 msgstr "非活跃"
 
-#: core/templates/user/overview.html:330 gym/templates/contract/list.html:4
-#: gym/templates/gym/member_list.html:202
+#: core/templates/user/overview.html:348 gym/templates/contract/list.html:4
+#: gym/templates/gym/member_list.html:218
 msgid "Contracts"
 msgstr "合同"
 
-#: core/templates/user/overview.html:405 gym/templates/document/list.html:4
+#: core/templates/user/overview.html:426 gym/templates/document/list.html:4
 msgid "Documents"
 msgstr "文档"
 
-#: core/templates/user/overview.html:412 gym/templates/document/list.html:32
-#: manager/forms.py:292 manager/templates/workout/view.html:132
+#: core/templates/user/overview.html:433 gym/templates/document/list.html:33
+#: manager/forms.py:292 manager/templates/workout/view.html:143
 msgid "Download"
 msgstr "下载"
 
-#: core/templates/user/overview.html:450 gym/views/admin_config.py:44
+#: core/templates/user/overview.html:474 gym/views/admin_config.py:44
 #: gym/views/admin_config.py:58 gym/views/user_config.py:46
 msgid "Configuration"
 msgstr "配置"
 
-#: core/templates/user/overview.html:453 gym/models/user_config.py:92
+#: core/templates/user/overview.html:477 gym/models/user_config.py:92
 msgid "Include in inactive overview"
 msgstr "包含在非活动概览中"
 
-#: core/templates/user/overview.html:486
+#: core/templates/user/overview.html:510
 #, python-format
 msgid "Admin login is only available for users in %(gym_name)s"
 msgstr "管理员登录权限只对%(gym_name)s的用户开放"
 
-#: core/templates/user/overview.html:490
+#: core/templates/user/overview.html:514
 msgid "Log in as this user"
 msgstr "以该用户登录"
 
@@ -1249,19 +1212,19 @@ msgstr "未验证的邮箱"
 msgid "Send verification email"
 msgstr "发送验证邮件"
 
-#: core/templates/user/preferences.html:30
+#: core/templates/user/preferences.html:31
 msgid "You need to verify your email to contribute exercises"
 msgstr "您需要验证您的邮箱来添加锻炼项目"
 
-#: core/templates/user/preferences.html:50 core/views/user.py:611
+#: core/templates/user/preferences.html:55 core/views/user.py:610
 msgid "Change password"
 msgstr "修改密码"
 
-#: core/templatetags/wger_extras.py:205 i18n.tpl:37
+#: core/templatetags/wger_extras.py:197 i18n.tpl:37
 msgid "kg"
 msgstr "千克"
 
-#: core/templatetags/wger_extras.py:207
+#: core/templatetags/wger_extras.py:199
 #: nutrition/templates/ingredient/view.html:60
 #: nutrition/templates/ingredient/view.html:66
 #: nutrition/templates/ingredient/view.html:73
@@ -1273,11 +1236,11 @@ msgctxt "weight unit, i.e. grams"
 msgid "g"
 msgstr "克"
 
-#: core/templatetags/wger_extras.py:210 i18n.tpl:38
+#: core/templatetags/wger_extras.py:202 i18n.tpl:38
 msgid "lb"
 msgstr "磅"
 
-#: core/templatetags/wger_extras.py:212
+#: core/templatetags/wger_extras.py:204
 msgctxt "weight unit, i.e. ounces"
 msgid "oz"
 msgstr "盎司"
@@ -1304,13 +1267,13 @@ msgid "Delete {0}?"
 msgstr "删除 {0}?"
 
 #: core/views/languages.py:111 core/views/license.py:85
-#: core/views/repetition_units.py:86 core/views/user.py:474
+#: core/views/repetition_units.py:86 core/views/user.py:473
 #: core/views/weight_units.py:86 exercises/views/categories.py:98
 #: exercises/views/equipment.py:81 exercises/views/muscles.py:87
 #: gym/views/admin_notes.py:161 gym/views/config.py:68
 #: gym/views/contract.py:186 gym/views/contract_option.py:123
 #: gym/views/contract_type.py:123 gym/views/document.py:171
-#: gym/views/gym.py:463 manager/views/day.py:100 manager/views/schedule.py:333
+#: gym/views/gym.py:463 manager/views/day.py:96 manager/views/schedule.py:333
 #: manager/views/workout.py:267 nutrition/views/ingredient.py:145
 #: nutrition/views/unit.py:143
 #, python-brace-format
@@ -1339,48 +1302,48 @@ msgstr "提交"
 msgid "Your feedback was successfully sent. Thank you!"
 msgstr "你的反馈已经成功发送.非常感谢!"
 
-#: core/views/user.py:156
+#: core/views/user.py:155
 #, python-brace-format
 msgid "Account \"{0}\" was successfully deleted"
 msgstr "账户\"{0}\"已经被成功删除"
 
-#: core/views/user.py:292
+#: core/views/user.py:291
 msgid "You were successfully registered"
 msgstr "你已成功注册"
 
-#: core/views/user.py:351
+#: core/views/user.py:350
 msgid "Settings successfully updated"
 msgstr "设置更新成功"
 
-#: core/views/user.py:390
+#: core/views/user.py:389
 msgid "The user was successfully deactivated"
 msgstr "该用户已经被成功置为非活跃"
 
-#: core/views/user.py:427
+#: core/views/user.py:426
 msgid "The user was successfully activated"
 msgstr "该用户已经被成功置为活跃"
 
-#: core/views/user.py:442
+#: core/views/user.py:441
 msgid "Edit user"
 msgstr "编辑用户"
 
-#: core/views/user.py:597 gym/templates/gym/member_list.html:26
+#: core/views/user.py:596 gym/templates/gym/member_list.html:26
 #: gym/views/gym.py:158
 msgid "ID"
 msgstr "ID"
 
-#: core/views/user.py:598 gym/forms.py:95 gym/templates/contract/view.html:55
+#: core/views/user.py:597 gym/forms.py:95 gym/templates/contract/view.html:55
 #: gym/templates/gym/member_list.html:27 gym/views/export.py:59
 #: gym/views/gym.py:158 gym/views/gym.py:217
 msgid "Username"
 msgstr "用户名"
 
-#: core/views/user.py:601 gym/templates/gym/new_user.html:34
+#: core/views/user.py:600 gym/templates/gym/new_user.html:34
 #: gym/views/export.py:58 gym/views/gym.py:217
 msgid "Gym"
 msgstr "健身房"
 
-#: core/views/user.py:660
+#: core/views/user.py:659
 #, python-format
 msgid "A verification email was sent to %(email)s"
 msgstr "一封验证邮箱已发送至 %(email)s"
@@ -1532,11 +1495,6 @@ msgstr "编解码器的全称"
 msgid "Equipment list"
 msgstr "器材列表"
 
-#: exercises/templates/equipment/admin-overview.html:39
-#: exercises/views/equipment.py:92
-msgid "Add new equipment"
-msgstr "新增器材"
-
 #: exercises/templates/history/overview.html:11
 #, fuzzy
 #| msgid "Exercise day"
@@ -1590,11 +1548,6 @@ msgstr "还原更改"
 msgid "Muscle overview"
 msgstr "肌肉总览"
 
-#: exercises/templates/muscles/admin-overview.html:38
-#: exercises/views/muscles.py:68
-msgid "Add muscle"
-msgstr "新增肌肉"
-
 #: exercises/views/categories.py:72
 msgid "Add category"
 msgstr "新增类别"
@@ -1603,6 +1556,10 @@ msgstr "新增类别"
 msgid "This will also delete all exercises in this category."
 msgstr "这也会删除该类别下的所有健身项目."
 
+#: exercises/views/equipment.py:92
+msgid "Add new equipment"
+msgstr "新增器材"
+
 #: exercises/views/equipment.py:104 exercises/views/equipment.py:115
 msgid "Delete equipment?"
 msgstr "删除器材?"
@@ -1611,6 +1568,10 @@ msgstr "删除器材?"
 msgid "This will delete the exercise from all workouts."
 msgstr "这会从所有的健身中删除该健身项目."
 
+#: exercises/views/muscles.py:68
+msgid "Add muscle"
+msgstr "新增肌肉"
+
 #: gallery/templates/images/overview.html:62
 msgid "Add image"
 msgstr "添加图片"
@@ -1696,7 +1657,7 @@ msgid "Contract is active"
 msgstr "合同已激活"
 
 #: gym/models/contract.py:237 gym/templates/contract/view.html:69
-#: manager/models/schedule.py:61 manager/templates/schedule/view.html:67
+#: manager/models/schedule.py:61 manager/templates/schedule/view.html:66
 msgid "Start date"
 msgstr "开始时间"
 
@@ -1732,7 +1693,7 @@ msgstr "管理员:可以管理健身房的用户"
 msgid "Admin: can administrate the different gyms"
 msgstr "管理员:可以管理不同的健身房"
 
-#: gym/models/gym.py:65 gym/templates/gym/member_list.html:114
+#: gym/models/gym.py:65 gym/templates/gym/member_list.html:126
 msgid "Owner"
 msgstr "所有者"
 
@@ -1742,7 +1703,7 @@ msgid ""
 "considered inactive"
 msgstr "周数,设定一个用户最后一次上传他的表现所过的周数来认定为非活跃"
 
-#: gym/models/gym_config.py:56 gym/templates/gym/member_list.html:152
+#: gym/models/gym_config.py:56 gym/templates/gym/member_list.html:166
 msgid "Show name in header"
 msgstr "在标题中显示名称"
 
@@ -1756,7 +1717,7 @@ msgstr "在网站标题中显示健身房的名称"
 msgid "Configuration for {self.gym.name}"
 msgstr "{}的配置"
 
-#: gym/models/user_config.py:65 gym/templates/gym/member_list.html:184
+#: gym/models/user_config.py:65 gym/templates/gym/member_list.html:200
 msgid "Overview of inactive members"
 msgstr "非活跃会员的总览"
 
@@ -1780,7 +1741,7 @@ msgstr "如果什么都不填写将使用文件名"
 msgid "User notes"
 msgstr "用户备注"
 
-#: gym/templates/contract/list.html:36
+#: gym/templates/contract/list.html:34
 msgid "Show"
 msgstr "展示"
 
@@ -1806,11 +1767,11 @@ msgstr "下面的用户在过去的%(weeks)s 周内没有访问健身房"
 msgid "Gym list"
 msgstr "健身房列表"
 
-#: gym/templates/gym/list.html:50
+#: gym/templates/gym/list.html:53
 msgid "Global gym configuration"
 msgstr "健身房全局配置"
 
-#: gym/templates/gym/list.html:67 gym/views/gym.py:171
+#: gym/templates/gym/list.html:69 gym/views/gym.py:171
 msgid "Add new gym"
 msgstr "新增健身房"
 
@@ -1822,43 +1783,43 @@ msgstr "管理员和教练员"
 msgid "Gym manager"
 msgstr "健身房经理"
 
-#: gym/templates/gym/member_list.html:69
+#: gym/templates/gym/member_list.html:76
 msgid "This gym has no administrators or trainers"
 msgstr "这个健身房没有管理员或者教练员"
 
-#: gym/templates/gym/member_list.html:88
+#: gym/templates/gym/member_list.html:98
 msgid "Export"
 msgstr "导出"
 
-#: gym/templates/gym/member_list.html:125
+#: gym/templates/gym/member_list.html:137
 msgid "Members"
 msgstr "会员数"
 
-#: gym/templates/gym/member_list.html:145
+#: gym/templates/gym/member_list.html:159
 msgid "Gym configuration"
 msgstr "健身房配置"
 
-#: gym/templates/gym/member_list.html:148
+#: gym/templates/gym/member_list.html:162
 msgid "Inactive members"
 msgstr "非活跃会员"
 
-#: gym/templates/gym/member_list.html:149
+#: gym/templates/gym/member_list.html:163
 msgid "weeks"
 msgstr "周"
 
-#: gym/templates/gym/member_list.html:181
+#: gym/templates/gym/member_list.html:197
 msgid "My configuration"
 msgstr "我的配置"
 
-#: gym/templates/gym/member_list.html:215
+#: gym/templates/gym/member_list.html:234
 msgid "Types"
 msgstr "类型"
 
-#: gym/templates/gym/member_list.html:285
+#: gym/templates/gym/member_list.html:307
 msgid "Emails"
 msgstr "邮件"
 
-#: gym/templates/gym/member_list.html:315
+#: gym/templates/gym/member_list.html:336
 msgid "Add member"
 msgstr "新增会员"
 
@@ -2151,28 +2112,38 @@ msgstr "使用食谱时用英文显示"
 msgid "Unit"
 msgstr "单元"
 
+#: manager/forms.py:191 manager/models/log.py:103 manager/models/setting.py:102
+#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
+msgid "RiR"
+msgstr "力竭之前的剩余次数"
+
 #: manager/forms.py:279
 msgid "Type"
 msgstr "类型"
 
-#: manager/forms.py:280 manager/templates/workout/view.html:113
+#: manager/forms.py:280 manager/templates/workout/view.html:122
 msgid "Table"
 msgstr "表格"
 
-#: manager/forms.py:282 manager/templates/workout/view.html:119
+#: manager/forms.py:282 manager/templates/workout/view.html:129
 msgid "with images"
 msgstr "带有图片"
 
-#: manager/forms.py:283 manager/templates/workout/view.html:125
+#: manager/forms.py:283 manager/templates/workout/view.html:136
 msgid "with comments"
 msgstr "带有评论"
 
+#: manager/helpers.py:86 manager/models/setting.py:72
+#: manager/templates/set/formset.html:9
+msgid "Reps"
+msgstr "重复次数"
+
 #: manager/management/commands/email-reminders.py:121
 msgid "Workout will expire soon"
 msgstr "安排的健身很快就要过期了"
 
 #: manager/models/day.py:34 manager/models/log.py:58
-#: manager/models/session.py:60 manager/templates/schedule/view.html:102
+#: manager/models/session.py:60 manager/templates/schedule/view.html:101
 #: manager/templates/workout/view.html:9 manager/templates/workout/view.html:17
 #: manager/views/pdf.py:85 manager/views/pdf.py:161
 #: manager/views/schedule.py:151 manager/views/schedule.py:221
@@ -2194,7 +2165,7 @@ msgstr "天"
 msgid "Name or short description of the schedule. For example 'Program XYZ'."
 msgstr "日程的名称或者简短描述,像'某某某训练日程'"
 
-#: manager/models/schedule.py:65 manager/templates/schedule/view.html:71
+#: manager/models/schedule.py:65 manager/templates/schedule/view.html:70
 msgid "Schedule active"
 msgstr "日程活跃"
 
@@ -2207,7 +2178,7 @@ msgstr ""
 "勾选方格,如果你想把这个日程设置为活跃日程(会在管理面板等地方显示).然后,其他的"
 "日程会被自动标记为非活跃."
 
-#: manager/models/schedule.py:77 manager/templates/schedule/view.html:81
+#: manager/models/schedule.py:77 manager/templates/schedule/view.html:80
 msgid "Is a loop"
 msgstr "是一个循环"
 
@@ -2226,7 +2197,7 @@ msgid "The duration in weeks"
 msgstr "每周持续时间"
 
 #: manager/models/schedule_step.py:64 manager/models/set.py:53
-#: manager/models/setting.py:113 nutrition/models/meal.py:55
+#: manager/models/setting.py:113 nutrition/models/meal.py:53
 #: nutrition/models/meal_item.py:66
 msgid "Order"
 msgstr "順序"
@@ -2362,7 +2333,7 @@ msgstr "日志概述"
 msgid "Workout session"
 msgstr "锻炼课程"
 
-#: manager/templates/calendar/partial_overview_table.html:27
+#: manager/templates/calendar/partial_overview_table.html:26
 msgid "Delete with logs"
 msgstr "删除日志"
 
@@ -2385,21 +2356,27 @@ msgstr ""
 "则将创建一个新的锻炼课程。如果已经存在，\n"
 "则将对其进行编辑。始终会添加体重条目。"
 
-#: manager/templates/schedule/overview.html:5
+#: manager/templates/schedule/overview.html:4
 msgid "Your schedules"
 msgstr "你的日程安排"
 
 #: manager/templates/schedule/overview.html:19
-#: manager/templates/schedule/view.html:131
-#: manager/templates/schedule/view.html:183
+#: manager/templates/schedule/view.html:143
+#: manager/templates/schedule/view.html:193
 #: manager/templates/workout/overview.html:16
 msgid "active"
 msgstr "活跃"
 
-#: manager/templates/schedule/overview.html:28
+#: manager/templates/schedule/overview.html:27
 msgid "No schedules found."
 msgstr "未找到任何时刻表。"
 
+#: manager/templates/schedule/overview.html:28
+#, fuzzy
+#| msgid "Add one now."
+msgid "Add one now"
+msgstr "现在就新增一个。"
+
 #: manager/templates/schedule/overview.html:36
 msgid ""
 "Schedules are collections of workouts that you do in\n"
@@ -2409,18 +2386,26 @@ msgstr ""
 "        集合。"
 
 #: manager/templates/schedule/overview.html:39
+#, fuzzy
+#| msgid ""
+#| "You can indicate how long you want to do each workout\n"
+#| "        before jumping to the next. It is also possible to create a loop, "
+#| "so you\n"
+#| "        always do the same workouts in succession, e.g. A > B > C > A > B "
+#| "> C and so on."
 msgid ""
 "You can indicate how long you want to do each workout\n"
 "        before jumping to the next. It is also possible to create a loop, so "
 "you\n"
 "        always do the same workouts in succession, e.g. A > B > C > A > B > "
-"C and so on."
+"C and so\n"
+"        on."
 msgstr ""
 "您可以指定每次锻炼的时间，然后再跳到下一个锻炼。\n"
 "        也可以创建一个循环，这样您总是连续进行相同的锻炼，\n"
 "        例如 A > B > C > A > B > C 等等。"
 
-#: manager/templates/schedule/overview.html:43
+#: manager/templates/schedule/overview.html:44
 msgid ""
 "The currently active schedule will remain active (and be\n"
 "        shown e.g. in your dashboard) till it reaches the last workout or "
@@ -2439,25 +2424,25 @@ msgstr "添加行程"
 msgid "Schedule"
 msgstr "行程表"
 
-#: manager/templates/schedule/view.html:85
+#: manager/templates/schedule/view.html:84
 msgid ""
 "This schedule is a loop and will go through the workouts above till you "
 "deactivate it"
 msgstr "此计划是一个循环，将执行上述锻炼，直到你停用它"
 
-#: manager/templates/schedule/view.html:103
+#: manager/templates/schedule/view.html:102
 msgid "Weeks"
 msgstr "周数"
 
-#: manager/templates/schedule/view.html:115
+#: manager/templates/schedule/view.html:114
 msgid "Move me"
 msgstr "移开我"
 
-#: manager/templates/schedule/view.html:156
+#: manager/templates/schedule/view.html:168
 msgid "Start schedule"
 msgstr "开始日程"
 
-#: manager/templates/schedule/view.html:187
+#: manager/templates/schedule/view.html:197
 #, python-format
 msgid ""
 "%(weeks)s Week\n"
@@ -2467,11 +2452,11 @@ msgid_plural ""
 "                                "
 msgstr[0] ""
 
-#: manager/templates/schedule/view.html:221
+#: manager/templates/schedule/view.html:231
 msgid "Adding workouts"
 msgstr "新增健身中"
 
-#: manager/templates/schedule/view.html:223
+#: manager/templates/schedule/view.html:233
 msgid ""
 "Add as many workouts to the schedule as you want. You can\n"
 "            edit the order by dragging and dropping them. It's also possible "
@@ -2479,44 +2464,37 @@ msgid ""
 "            than once."
 msgstr ""
 
-#: manager/templates/schedule/view.html:232
-#: manager/templates/schedule/view.html:243
-#: manager/templates/schedule/view.html:290
+#: manager/templates/schedule/view.html:242
+#: manager/templates/schedule/view.html:256
+#: manager/templates/schedule/view.html:310
 #: manager/templates/workout/view.html:69
-#: manager/templates/workout/view.html:79
-#: manager/templates/workout/view.html:178
+#: manager/templates/workout/view.html:83
+#: manager/templates/workout/view.html:192
 msgid "Export calendar file"
 msgstr "导出日历文件"
 
-#: manager/templates/schedule/view.html:236
+#: manager/templates/schedule/view.html:248
 msgid "Export this schedule as a calendar file."
 msgstr "将此日程表导出为日历文件。"
 
-#: manager/templates/schedule/view.html:237
-#: manager/templates/workout/view.html:74
+#: manager/templates/schedule/view.html:249
+#: manager/templates/workout/view.html:76
 msgid ""
 "You can then import the file it into your calendar\n"
 "                        application for example google calendar, outlook or "
 "iCal. This will create\n"
 "                        an appointment for each training day with the "
-"appropriate exercises."
+"appropriate\n"
+"                        exercises."
 msgstr ""
 
-#: manager/templates/schedule/view.html:258
-#: manager/templates/schedule/view.html:294
-#: manager/templates/workout/view.html:94
-#: manager/templates/workout/view.html:174
+#: manager/templates/schedule/view.html:272
+#: manager/templates/schedule/view.html:315
+#: manager/templates/workout/view.html:99
+#: manager/templates/workout/view.html:188
 msgid "Download as PDF"
 msgstr "下载为PDF"
 
-#: manager/templates/schedule/view.html:299
-msgid "Edit schedule"
-msgstr ""
-
-#: manager/templates/schedule/view.html:304
-msgid "Delete schedule"
-msgstr ""
-
 #: manager/templates/set/add.html:9
 #, python-format
 msgid "Add exercises to day \"%(day_name)s\""
@@ -2581,47 +2559,6 @@ msgid ""
 "You will regularly receive such reminders till you enter your current weight."
 msgstr ""
 
-#: manager/templates/workout/log.html:10 manager/templates/workout/log.html:11
-msgid "Weight log"
-msgstr "体重日志"
-
-#: manager/templates/workout/log.html:29
-msgid "Weight log for workout"
-msgstr "健身的体重日志"
-
-#: manager/templates/workout/log.html:49
-msgid "Add weight log to this day"
-msgstr "添加体重日志到该训练日"
-
-#: manager/templates/workout/log.html:69
-msgid "No weight entries here."
-msgstr ""
-
-#: manager/templates/workout/log.html:77
-msgid "No exercises for this day."
-msgstr ""
-
-#: manager/templates/workout/log.html:90
-msgid ""
-"This page shows the weight logs belonging to this workout\n"
-"only. Click on an exercise to see all the historical data for\n"
-"it."
-msgstr ""
-
-#: manager/templates/workout/log.html:94
-msgid ""
-"If on a single day there is more than one entry with the\n"
-"same number of repetitions, but different weights, only the entry with the\n"
-"higher weight is shown in the diagram."
-msgstr ""
-
-#: manager/templates/workout/log.html:98
-msgid ""
-"Note that only entries with a weight unit (kg or lb) and\n"
-"repetitions are charted, other combinations such as time or until failure\n"
-"are ignored here."
-msgstr ""
-
 #: manager/templates/workout/overview.html:25
 msgid "No templates found."
 msgstr "没有健身模板。"
@@ -2657,27 +2594,23 @@ msgstr "新增健身项目组到健身日"
 msgid "Set the repetitions for each set"
 msgstr ""
 
-#: manager/templates/workout/view.html:73
+#: manager/templates/workout/view.html:75
 msgid "Export this workout as a calendar file."
 msgstr ""
 
-#: manager/templates/workout/view.html:144
+#: manager/templates/workout/view.html:156
 msgid "Logs"
 msgstr ""
 
-#: manager/templates/workout/view.html:146
+#: manager/templates/workout/view.html:159
 msgid "View logs"
 msgstr ""
 
-#: manager/templates/workout/view.html:169 manager/views/schedule_step.py:99
-msgid "Edit workout"
-msgstr "编辑健身"
-
-#: manager/templates/workout/view.html:182 manager/views/workout.py:281
+#: manager/templates/workout/view.html:195 manager/views/workout.py:281
 msgid "Mark as template"
 msgstr ""
 
-#: manager/views/day.py:109
+#: manager/views/day.py:105
 msgid "Add workout day"
 msgstr "新增健身日"
 
@@ -2694,6 +2627,10 @@ msgstr ""
 msgid "Create schedule"
 msgstr ""
 
+#: manager/views/schedule_step.py:99
+msgid "Edit workout"
+msgstr "编辑健身"
+
 #: manager/views/workout.py:209
 msgid "Copy workout"
 msgstr "拷贝健身"
@@ -2821,7 +2758,7 @@ msgstr ""
 msgid "Unit amount, e.g. \"1 Cup\" or \"1/2 spoon\""
 msgstr ""
 
-#: nutrition/models/log.py:52 nutrition/models/meal.py:50
+#: nutrition/models/log.py:52 nutrition/models/meal.py:48
 #: nutrition/models/meal_item.py:48 nutrition/models/plan.py:108
 msgid "Nutrition plan"
 msgstr "营养计划"
@@ -2834,11 +2771,11 @@ msgstr ""
 msgid "Date and Time (Approx.)"
 msgstr ""
 
-#: nutrition/models/meal.py:62
+#: nutrition/models/meal.py:60
 msgid "Time (approx)"
 msgstr ""
 
-#: nutrition/models/meal.py:69
+#: nutrition/models/meal.py:67
 msgid ""
 "Give meals a textual description / name such as \"Breakfast\" or \"after "
 "workout\""
@@ -2960,10 +2897,6 @@ msgstr ""
 msgid "Search"
 msgstr "搜索"
 
-#: nutrition/templates/ingredient/overview.html:62
-msgid "Add ingredient"
-msgstr "新增食谱"
-
 #: nutrition/templates/ingredient/view.html:45 nutrition/views/plan.py:229
 msgid "Macronutrients"
 msgstr "常量营养物"
@@ -2983,20 +2916,11 @@ msgstr ""
 msgid "Others"
 msgstr "其它"
 
-#: nutrition/templates/ingredient/view.html:144
-#: nutrition/templates/units/list.html:46 nutrition/views/unit.py:86
+#: nutrition/templates/ingredient/view.html:143
+#: nutrition/templates/units/list.html:50 nutrition/views/unit.py:86
 msgid "Add new weight unit"
 msgstr "新增计量单位"
 
-#: nutrition/templates/ingredient/view.html:206
-#: nutrition/templates/ingredient/view.html:209
-msgid "Edit ingredient"
-msgstr "编辑食谱"
-
-#: nutrition/templates/ingredient/view.html:213
-msgid "Delete ingredient"
-msgstr "删除食谱"
-
 #: nutrition/templates/rate/form.html:25
 msgid "Basal metabolic rate"
 msgstr "基础代谢率"
@@ -3620,6 +3544,44 @@ msgstr "已成功删除。"
 msgid "Delete weight entry for the %s"
 msgstr "删除 %s 的体重条目"
 
+#~ msgid ""
+#~ "If a license has been localized, e.g. the Creative Commons\n"
+#~ "            licenses for the different countries, add them as separate "
+#~ "entries here."
+#~ msgstr ""
+#~ "如果一个许可证已经本地化，例如，不同国家的 \"知识共享 \"\n"
+#~ "许可证，请将它们作为单独的条目添加到这里。"
+
+#~ msgid "Add weight log"
+#~ msgstr "新增体重记录"
+
+#~ msgid "This exercise has no repetitions."
+#~ msgstr "这个健身项目没有重复次数."
+
+#~ msgid "Edit them now."
+#~ msgstr "现在编辑它们."
+
+#~ msgid "Add exercises to this workout day"
+#~ msgstr "新增健身项目到这个健身日"
+
+#~ msgid "Weight log"
+#~ msgstr "体重日志"
+
+#~ msgid "Weight log for workout"
+#~ msgstr "健身的体重日志"
+
+#~ msgid "Add weight log to this day"
+#~ msgstr "添加体重日志到该训练日"
+
+#~ msgid "Add ingredient"
+#~ msgstr "新增食谱"
+
+#~ msgid "Edit ingredient"
+#~ msgstr "编辑食谱"
+
+#~ msgid "Delete ingredient"
+#~ msgstr "删除食谱"
+
 #~ msgid "Ingredients pending review"
 #~ msgstr "食谱审核"
 
diff --git a/wger/manager/templates/calendar/day.html b/wger/manager/templates/calendar/day.html
index bac14ecd5..f46fef71e 100644
--- a/wger/manager/templates/calendar/day.html
+++ b/wger/manager/templates/calendar/day.html
@@ -59,19 +59,20 @@
                                 {% if is_owner %}
                                     <span class="dropdown">
                                         <div class="float-end">
-                                            <button type="button" class="btn btn-link dropdown-toggle btn-sm"
+                                            <button type="button"
+                                                    class="btn btn-link dropdown-toggle btn-sm"
                                                     data-bs-toggle="dropdown">
                                             </button>
                                             <div class="dropdown-menu">
-                                                <a href="{% url 'manager:log:edit' log.pk %}"
-                                                   class="wger-modal-dialog dropdown-item">
-                                                    {% translate 'Edit' %}
-                                                </a>
+                                                {% translate 'Edit' as text %}
+                                                {% url 'manager:log:edit' log.pk as url %}
+                                                {% modal_link url=url text=text css_class='dropdown-item' %}
+
                                                 <div class="dropdown-divider"></div>
-                                                <a href="{% url 'manager:log:delete' log.pk %}"
-                                                   class="wger-modal-dialog dropdown-item">
-                                                    {% translate 'Delete' %}
-                                                </a>
+
+                                                {% translate 'Delete' as text %}
+                                                {% url 'manager:log:delete' log.pk as url %}
+                                                {% modal_link url=url text=text css_class='dropdown-item' %}
                                             </div>
                                         </div>
                                     </span>
diff --git a/wger/manager/templates/calendar/month.html b/wger/manager/templates/calendar/month.html
index 2e046e40c..17e4f3e21 100644
--- a/wger/manager/templates/calendar/month.html
+++ b/wger/manager/templates/calendar/month.html
@@ -81,13 +81,13 @@ $(document).ready(function() {
                                         <button type="button" class="btn btn-link dropdown-toggle btn-sm" data-bs-toggle="dropdown">
                                         </button>
                                         <div class="dropdown-menu dropdown-menu-right" role="menu">
-                                            <a href="{% url 'manager:log:edit' log.pk %}" class="wger-modal-dialog dropdown-item">
-                                                {% translate 'Edit' %}
-                                            </a>
-                                            <div class="dropdown-divider"></div>
-                                            <a href="{% url 'manager:log:delete' log.pk %}" class="wger-modal-dialog dropdown-item">
-                                                {% translate 'Delete' %}
-                                            </a>
+                                            {% translate 'Edit' as text %}
+                                            {% url 'manager:log:edit' log.pk as url %}
+                                            {% modal_link url=url text=text css_class='dropdown-item' %}
+
+                                            {% translate 'Delete' as text %}
+                                            {% url 'manager:log:delete' log.pk as url %}
+                                            {% modal_link url=url text=text css_class='dropdown-item' %}
                                         </div>
                                     </div>
                                 {% endif %}
diff --git a/wger/manager/templates/calendar/partial_overview_table.html b/wger/manager/templates/calendar/partial_overview_table.html
index f821848ef..1d4a5c219 100644
--- a/wger/manager/templates/calendar/partial_overview_table.html
+++ b/wger/manager/templates/calendar/partial_overview_table.html
@@ -13,24 +13,26 @@
                         <span class="caret"></span>
                     </button>
                     <div class="dropdown-menu">
-                        <a href="{% url 'manager:session:edit' value.session.pk %}" class="wger-modal-dialog dropdown-item">
-                            <span class="{% fa_class 'edit-o' %}"></span>
-                            {% translate "Edit" %}
-                        </a>
+                        {% translate 'Edit' as text %}
+                        {% url 'manager:session:edit' value.session.pk as url %}
+                        {% modal_link url=url text=text css_class='dropdown-item' %}
+
                         <div class="dropdown-divider"></div>
-                        <a href="{% url 'manager:session:delete' value.session.pk %}" class="wger-modal-dialog dropdown-item">
-                            <span class="{% fa_class 'trash' %}"></span>
-                            {% translate "Delete" %}
-                        </a>
-                        <a href="{% url 'manager:session:delete' value.session.pk 'logs' %}" class="wger-modal-dialog dropdown-item">
-                            <span class="{% fa_class 'trash' %}"></span>
-                            {% translate "Delete with logs" %}
-                        </a>
+
+                        {% translate 'Delete' as text %}
+                        {% url 'manager:session:delete' value.session.pk as url %}
+                        {% modal_link url=url text=text css_class='dropdown-item' %}
+
+                        {% translate 'Delete with logs' as text %}
+                        {% url 'manager:session:delete' value.session.pk 'logs' as url %}
+                        {% modal_link url=url text=text css_class='dropdown-item' %}
                     </div>
                 </div>
             </div>
         {% else %}
-            <a href="{% url 'manager:session:add' value.workout.id date|date:'Y' date|date:'m' date|date:'d' %}" class="btn btn-light btn-block wger-modal-dialog">{% translate "Add workout impression" %}</a>
+            {% translate 'Add workout impression' as text %}
+            {% url 'manager:session:add' value.workout.id date|date:'Y' date|date:'m' date|date:'d' as url %}
+            {% modal_link url=url text=text css_class='dropdown-item' %}
         {% endif %}
     {% endif %}
 </div>
diff --git a/wger/manager/templates/schedule/overview.html b/wger/manager/templates/schedule/overview.html
index 03afdfe3d..321c695e4 100644
--- a/wger/manager/templates/schedule/overview.html
+++ b/wger/manager/templates/schedule/overview.html
@@ -1,6 +1,5 @@
 {% extends "base.html" %}
-{% load i18n %}
-{% load static %}
+{% load i18n static wger_extras %}
 
 {% block title %}{% translate "Your schedules" %}{% endblock %}
 
@@ -11,7 +10,8 @@
 {% block content %}
     <div class="list-group">
         {% for schedule in schedules %}
-            <a href="{% url 'manager:schedule:view' schedule.id %}" class="list-group-item list-group-item-action">
+            <a href="{% url 'manager:schedule:view' schedule.id %}"
+               class="list-group-item list-group-item-action">
                 <span class="glyphicon glyphicon-chevron-right float-end"></span>
 
                 {% if schedule.is_active %}
@@ -24,9 +24,9 @@
                 <p class="list-group-item-text">{{ schedule.start_date }}</p>
             </a>
             {% empty %}
-            <a href="{% url 'manager:schedule:add' %}" class="list-group-item list-group-item-action wger-modal-dialog">
-                {% translate "No schedules found." %}<br>{% translate "Add one now." %}
-            </a>
+            {% translate "No schedules found." %}
+            {% translate 'Add one now' as text %}
+            {% modal_link url='manager:schedule:add' text=text css_class='dropdown-item' %}
         {% endfor %}
     </div>
 {% endblock %}
@@ -38,7 +38,8 @@
 
     <p>{% blocktranslate %}You can indicate how long you want to do each workout
         before jumping to the next. It is also possible to create a loop, so you
-        always do the same workouts in succession, e.g. A > B > C > A > B > C and so on.{% endblocktranslate %}</p>
+        always do the same workouts in succession, e.g. A > B > C > A > B > C and so
+        on.{% endblocktranslate %}</p>
 
     <p>{% blocktranslate %}The currently active schedule will remain active (and be
         shown e.g. in your dashboard) till it reaches the last workout or till you
@@ -47,7 +48,6 @@
 
 
 {% block options %}
-    <a href="{% url 'manager:schedule:add' %}" class="btn btn-success btn-sm wger-modal-dialog">
-        {% translate "Add schedule" %}
-    </a>
+    {% translate 'Add schedule' as text %}
+    {% modal_link url='manager:schedule:add' text=text %}
 {% endblock %}
diff --git a/wger/manager/templates/schedule/view.html b/wger/manager/templates/schedule/view.html
index 959111422..ce80e30e2 100644
--- a/wger/manager/templates/schedule/view.html
+++ b/wger/manager/templates/schedule/view.html
@@ -65,16 +65,29 @@
                     </td>
                     {% if is_owner %}
                         <td style="min-width: 6em;">
-            <span class="editoptions">
-                 <a href="{% url 'manager:step:edit' step.id %}"
-                    title="{% translate 'Edit' %}"
-                    class="wger-modal-dialog">
-                    <span class="{% fa_class 'edit' %}"></span></a>
-                <a href="{% url 'manager:step:delete' step.id %}"
-                   title="{% translate 'Delete' %}"
-                   class="wger-modal-dialog">
-                    <span class="{% fa_class 'trash' %}"></span></a>
-            </span>
+                            <span class="editoptions">
+                                <a
+                                    href="{% url 'manager:step:edit' step.id %}"
+                                    class="{{ css_class }}"
+                                    hx-get="{% url 'manager:step:edit' step.id %}"
+                                    hx-target="#ajax-info-content"
+                                    data-bs-toggle="modal"
+                                    data-bs-target="#wger-ajax-info"
+                                >
+                                    <span class="{% fa_class 'edit' %}"></span>
+                                </a>
+
+                                <a
+                                    href="{% url 'manager:step:delete' step.id %}"
+                                    class="{{ css_class }}"
+                                    hx-get="{% url 'manager:step:delete' step.id %}"
+                                    hx-target="#ajax-info-content"
+                                    data-bs-toggle="modal"
+                                    data-bs-target="#wger-ajax-info"
+                                >
+                                    <span class="{% fa_class 'trash' %}"></span>
+                                </a>
+                            </span>
                         </td>
                     {% endif %}
                     <td>
@@ -91,10 +104,9 @@
                 {% if is_owner %}
                     <tr>
                         <td colspan="4">
-                            <a href="{% url 'manager:step:add' schedule.id %}"
-                               class="wger-modal-dialog btn btn-block btn-light">
-                                {% translate "No workouts found." %} {% translate "Add one now." %}
-                            </a>
+                            {% translate 'Add one now.' as text %}
+                            {% url 'manager:step:add' schedule.id as url %}
+                            {% modal_link url=url text=text css_class='dropdown-item' %}
                         </td>
                     </tr>
                 {% endif %}
@@ -103,17 +115,16 @@
                 <tr>
                     <td colspan="4">
                         {% if not schedule.is_active %}
-                            <a href="{% url 'manager:schedule:start' schedule.pk %}" class="btn btn-success btn-sm">
+                            <a href="{% url 'manager:schedule:start' schedule.pk %}"
+                               class="btn btn-success btn-sm">
                                 <span class="{% fa_class 'play' %}"></span>
                                 {% translate "Start schedule" %}
                             </a>
                         {% endif %}
 
-                        <a href="{% url 'manager:step:add' schedule.id %}"
-                           class="wger-modal-dialog btn btn-light btn-sm">
-                            <span class="{% fa_class 'plus' %}"></span>
-                            {% translate "Add workout" %}
-                        </a>
+                        {% translate 'Add workout' as text %}
+                        {% url 'manager:step:add' schedule.id as url %}
+                        {% modal_link url=url text=text css_class='btn btn-light btn-sm' %}
                     </td>
                     <td colspan="2">
                     </td>
@@ -182,13 +193,16 @@
             <div class="modal-content">
                 <div class="modal-header">
                     <h4 class="modal-title">{% translate "Export calendar file" %}</h4>
-                    <button type="button" class="close" data-bs-dismiss="modal" aria-hidden="true">&times;</button>
+                    <button type="button" class="close" data-bs-dismiss="modal" aria-hidden="true">
+                        &times;
+                    </button>
                 </div>
                 <div class="modal-body">
                     <p>{% translate "Export this schedule as a calendar file." %}</p>
                     <p>{% blocktranslate %}You can then import the file it into your calendar
                         application for example google calendar, outlook or iCal. This will create
-                        an appointment for each training day with the appropriate exercises.{% endblocktranslate %}</p>
+                        an appointment for each training day with the appropriate
+                        exercises.{% endblocktranslate %}</p>
                     <p>
                         <a href="{% url 'manager:schedule:ical' schedule.id uid token %}"
                            class="btn btn-block btn-light">
@@ -197,7 +211,8 @@
                     </p>
                 </div>
                 <div class="modal-footer">
-                    <button type="button" class="btn btn-light" data-bs-dismiss="modal">{% translate "Close" %}</button>
+                    <button type="button" class="btn btn-light"
+                            data-bs-dismiss="modal">{% translate "Close" %}</button>
                 </div>
             </div>
         </div>
@@ -208,17 +223,21 @@
             <div class="modal-content">
                 <div class="modal-header">
                     <h4 class="modal-title">{% translate "Download as PDF" %}</h4>
-                    <button type="button" class="close" data-bs-dismiss="modal" aria-hidden="true">&times;</button>
+                    <button type="button" class="close" data-bs-dismiss="modal" aria-hidden="true">
+                        &times;
+                    </button>
                 </div>
                 <div class="modal-body">
                     <form class="wger-form">
                         {% crispy download_form %}
-                        <div id="pdf-download-info" data-schedule-id="{{ schedule.id|unlocalize }}" data-uid="{{ uid }}"
+                        <div id="pdf-download-info" data-schedule-id="{{ schedule.id|unlocalize }}"
+                             data-uid="{{ uid }}"
                              data-token="{{ token }}"></div>
                     </form>
                 </div>
                 <div class="modal-footer">
-                    <button type="button" class="btn btn-light" data-bs-dismiss="modal">{% translate "Close" %}</button>
+                    <button type="button" class="btn btn-light"
+                            data-bs-dismiss="modal">{% translate "Close" %}</button>
                 </div>
             </div>
         </div>
@@ -231,30 +250,33 @@
 {% block options %}
     <div class="btn-group">
         <div class="btn-group">
-            <button type="button" class="btn btn-primary btn-sm dropdown-toggle" data-bs-toggle="dropdown"
+            <button type="button" class="btn btn-primary btn-sm dropdown-toggle"
+                    data-bs-toggle="dropdown"
                     aria-haspopup="true" aria-expanded="false">
                 <span class="{% fa_class 'cog' %}"></span>
                 {% translate "Options" %}
             </button>
             <div class="dropdown-menu">
-                <a href="#" data-bs-toggle="modal" data-bs-target="#export-ical-popup" class="dropdown-item">
+                <a href="#" data-bs-toggle="modal" data-bs-target="#export-ical-popup"
+                   class="dropdown-item">
                     <span class="{% fa_class 'calendar' %}"></span>
                     {% translate "Export calendar file" %}
                 </a>
-                <a data-bs-toggle="modal" data-bs-target="#download-pdf-popup" class="dropdown-item">
+                <a data-bs-toggle="modal" data-bs-target="#download-pdf-popup"
+                   class="dropdown-item">
                     <span class="{% fa_class 'download' %}"></span>
                     {% translate "Download as PDF" %}
                 </a>
                 {% if is_owner %}
-                    <a href="{% url 'manager:schedule:edit' schedule.id %}" class="wger-modal-dialog dropdown-item">
-                        <span class="{% fa_class 'edit' %}"></span>
-                        {% translate "Edit schedule" %}
-                    </a>
+                    {% translate 'Edit' as text %}
+                    {% url 'manager:schedule:edit' schedule.id as url %}
+                    {% modal_link url=url text=text css_class='dropdown-item' %}
+
                     <div role="separator" class="dropdown-divider"></div>
-                    <a href="{% url 'manager:schedule:delete' schedule.id %}" class="wger-modal-dialog dropdown-item">
-                        <span class="{% fa_class 'trash' %}"></span>
-                        {% translate "Delete schedule" %}
-                    </a>
+
+                    {% translate 'Delete' as text %}
+                    {% url 'manager:schedule:delete' schedule.id as url %}
+                    {% modal_link url=url text=text css_class='dropdown-item' %}
                 {% endif %}
             </div>
         </div>
diff --git a/wger/manager/templates/set/add.html b/wger/manager/templates/set/add.html
index 4b2ae04e1..75073a26f 100644
--- a/wger/manager/templates/set/add.html
+++ b/wger/manager/templates/set/add.html
@@ -1,4 +1,4 @@
-{% extends extend_template %}
+{% extends 'base_empty.html' %}
 {% load i18n static crispy_forms_tags %}
 
 
diff --git a/wger/manager/templates/workout/view.html b/wger/manager/templates/workout/view.html
index 11fa48209..496fbaf03 100644
--- a/wger/manager/templates/workout/view.html
+++ b/wger/manager/templates/workout/view.html
@@ -67,21 +67,26 @@
             <div class="modal-content">
                 <div class="modal-header">
                     <h4 class="modal-title">{% translate "Export calendar file" %}</h4>
-                    <button type="button" class="close" data-bs-dismiss="modal" aria-hidden="true">&times;</button>
+                    <button type="button" class="close" data-bs-dismiss="modal" aria-hidden="true">
+                        &times;
+                    </button>
                 </div>
                 <div class="modal-body">
                     <p>{% translate "Export this workout as a calendar file." %}</p>
                     <p>{% blocktranslate %}You can then import the file it into your calendar
                         application for example google calendar, outlook or iCal. This will create
-                        an appointment for each training day with the appropriate exercises.{% endblocktranslate %}</p>
+                        an appointment for each training day with the appropriate
+                        exercises.{% endblocktranslate %}</p>
                     <p>
-                        <a href="{% url 'manager:workout:ical' workout.id uid token %}" class="btn btn-block btn-light">
+                        <a href="{% url 'manager:workout:ical' workout.id uid token %}"
+                           class="btn btn-block btn-light">
                             {% translate "Export calendar file" %}
                         </a>
                     </p>
                 </div>
                 <div class="modal-footer">
-                    <button type="button" class="btn btn-light" data-bs-dismiss="modal">{% translate "Close" %}</button>
+                    <button type="button" class="btn btn-light"
+                            data-bs-dismiss="modal">{% translate "Close" %}</button>
                 </div>
             </div>
         </div>
@@ -92,35 +97,41 @@
             <div class="modal-content">
                 <div class="modal-header">
                     <h4 class="modal-title">{% translate "Download as PDF" %}</h4>
-                    <button type="button" class="close float-end" data-bs-dismiss="modal" aria-hidden="true">&times;
+                    <button type="button" class="close float-end" data-bs-dismiss="modal"
+                            aria-hidden="true">&times;
                     </button>
                 </div>
                 <div class="modal-body">
                     <form class="wger-form">
-                        <div id="pdf-download-info" data-workout-id="{{ workout.id|unlocalize }}" data-uid="{{ uid }}"
+                        <div id="pdf-download-info" data-workout-id="{{ workout.id|unlocalize }}"
+                             data-uid="{{ uid }}"
                              data-token="{{ token }}"></div>
                         <div class="form-group form-check-inline">
-                            <input type="radio" name="pdf_type" class="form-check-input" id="id_type_log" value="log"
+                            <input type="radio" name="pdf_type" class="form-check-input"
+                                   id="id_type_log" value="log"
                                    checked>
                             <label class="form-check-label" for="id_type_log">
                                 {% translate "Log" %}
                             </label>
                         </div>
                         <div class="form-group form-check-inline">
-                            <input type="radio" name="pdf_type" id="id_type_table" class="form-check-input"
+                            <input type="radio" name="pdf_type" id="id_type_table"
+                                   class="form-check-input"
                                    value="table">
                             <label class="form-check-label" for="id_type_table">
                                 {% translate "Table" %}
                             </label>
                         </div>
                         <div class="form-group form-check">
-                            <input type="checkbox" class="form-check-input" name="images" id="id_images" checked>
+                            <input type="checkbox" class="form-check-input" name="images"
+                                   id="id_images" checked>
                             <label for="id_images" class="form-check-label">
                                 {% translate "with images" %}
                             </label>
                         </div>
                         <div class="form-group form-check">
-                            <input type="checkbox" class="form-check-input" name="comments" id="id_comments" checked>
+                            <input type="checkbox" class="form-check-input" name="comments"
+                                   id="id_comments" checked>
                             <label for="id_comments" class="form-check-label">
                                 {% translate "with comments" %}
                             </label>
@@ -134,7 +145,8 @@
                     </p>
                 </div>
                 <div class="modal-footer">
-                    <button type="button" class="btn btn-light" data-bs-dismiss="modal">{% translate "Close" %}</button>
+                    <button type="button" class="btn btn-light"
+                            data-bs-dismiss="modal">{% translate "Close" %}</button>
                 </div>
             </div>
         </div>
@@ -143,7 +155,8 @@
     {% if workout.canonical_representation.day_list %}
         <h4>{% translate "Logs" %}</h4>
         <p>
-            <a class="btn btn-primary btn-sm" href="{% url 'manager:log:log' workout.id %}">{% translate 'View logs' %}</a>
+            <a class="btn btn-primary btn-sm"
+               href="{% url 'manager:log:log' workout.id %}">{% translate 'View logs' %}</a>
         </p>
     {% endif %}
 
@@ -157,19 +170,20 @@
 {% block options %}
     <div class="btn-group" role="group">
         <div class="btn-group" role="group">
-            <button id="btnGroupWorkout" type="button" class="btn btn-primary btn-sm dropdown-toggle"
+            <button id="btnGroupWorkout" type="button"
+                    class="btn btn-primary btn-sm dropdown-toggle"
                     data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                 <span class="{% fa_class 'cog' %}"></span>
                 {% translate "Options" %}
             </button>
             <div class="dropdown-menu" aria-labelledby="btnGroupWorkout">
                 {% if is_owner %}
-                    <a href="{% url 'manager:workout:edit' workout.id %}" class="dropdown-item wger-modal-dialog">
-                        <span class="{% fa_class 'edit' %}"></span>
-                        {% translate "Edit workout" %}
-                    </a>
+                    {% translate 'Edit' as text %}
+                    {% url 'manager:workout:edit' workout.id as url %}
+                    {% modal_link url=url text=text css_class='dropdown-item' %}
                 {% endif %}
-                <a class="dropdown-item" data-bs-toggle="modal" data-bs-target="#download-pdf-popup">
+                <a class="dropdown-item" data-bs-toggle="modal"
+                   data-bs-target="#download-pdf-popup">
                     <span class="{% fa_class 'download' %}"></span>
                     {% translate "Download as PDF" %}
                 </a>
@@ -177,16 +191,17 @@
                     <span class="{% fa_class 'calendar' %}"></span>
                     {% translate "Export calendar file" %}
                 </a>
-                <a href="{% url 'manager:workout:make-template' workout.id %}" class="dropdown-item wger-modal-dialog">
-                    <span class="{% fa_class 'clone' %}"></span>
-                    {% translate "Mark as template" %}
-                </a>
+
+                {% translate 'Mark as template' as text %}
+                {% url 'manager:workout:make-template' workout.id as url %}
+                {% modal_link url=url text=text css_class='dropdown-item' %}
+
                 {% if is_owner %}
                     <div class="dropdown-divider"></div>
-                    <a href="{% url 'manager:workout:delete' workout.id %}" class="dropdown-item wger-modal-dialog">
-                        <span class="{% fa_class 'trash' %}"></span>
-                        {% translate "Delete" %}
-                    </a>
+
+                    {% translate 'Delete' as text %}
+                    {% url 'manager:workout:delete' workout.id as url %}
+                    {% modal_link url=url text=text css_class='dropdown-item' %}
                 {% endif %}
             </div>
         </div>
diff --git a/wger/manager/views/day.py b/wger/manager/views/day.py
index 56d8cd71a..ad56fb8ba 100644
--- a/wger/manager/views/day.py
+++ b/wger/manager/views/day.py
@@ -41,7 +41,6 @@ from wger.manager.models import (
 )
 from wger.utils.generic_views import WgerFormMixin
 
-
 logger = logging.getLogger(__name__)
 
 
@@ -105,6 +104,7 @@ class DayCreateView(DayView, CreateView):
 
     title = gettext_lazy('Add workout day')
     owner_object = {'pk': 'workout_pk', 'class': Workout}
+    template_name = 'form_content.html'
 
     def form_valid(self, form):
         """
diff --git a/wger/nutrition/templates/ingredient/overview.html b/wger/nutrition/templates/ingredient/overview.html
index 1e2733de3..dc3a67b07 100644
--- a/wger/nutrition/templates/ingredient/overview.html
+++ b/wger/nutrition/templates/ingredient/overview.html
@@ -41,8 +41,8 @@
     {% endif %}
 
 
-     <div style="padding-top:3em;"></div> 
-     {% pagination paginator page_obj %} 
+    <div style="padding-top:3em;"></div>
+    {% pagination paginator page_obj %}
 {% endblock %}
 
 {% block sidebar %}
@@ -56,10 +56,8 @@
 {# Options #}
 {#         #}
 {% block options %}
-    {% if perms.nutrition.add_ingredient and  user.is_authenticated and not user.userprofile.is_temporary %}
-        <a href="{% url 'nutrition:ingredient:add' %}"
-           class="btn btn-success btn-sm">
-            {% translate "Add ingredient" %}
-        </a>
+    {% if perms.nutrition.add_ingredient %}
+        {% translate 'Add' as text %}
+        {% modal_link url='nutrition:ingredient:add' text=text %}
     {% endif %}
 {% endblock %}
diff --git a/wger/nutrition/templates/ingredient/view.html b/wger/nutrition/templates/ingredient/view.html
index 65c2a8b1f..7cf64dfe8 100644
--- a/wger/nutrition/templates/ingredient/view.html
+++ b/wger/nutrition/templates/ingredient/view.html
@@ -139,11 +139,10 @@ $(document).ready(function() {
 
 {% if perms.nutrition.delete_ingredient %}
 <h4>{% translate "Weight units" %}</h4>
-<p>
-    <a href="{% url 'nutrition:unit_ingredient:add' ingredient.id %}" class="btn btn-success btn-sm wger-modal-dialog">
-        {% translate "Add new weight unit" %}
-    </a>
-</p>
+
+{% translate 'Add new weight unit' as text %}
+{% url 'nutrition:unit_ingredient:add' ingredient.id as url %}
+{% modal_link url=url text=text  %}
 
 {% if ingredient.ingredientweightunit_set.exists %}
     <table class="table">
@@ -162,8 +161,13 @@ $(document).ready(function() {
                         <span class="{% fa_class 'cog' %}"></span>
                     </button>
                     <div class="dropdown-menu dropdown-menu-right" role="menu">
-                        <a href="{% url 'nutrition:unit_ingredient:edit' unit.id %}" class="wger-modal-dialog dropdown-item">{% translate 'Edit' %}</a>
-                        <a href="{% url 'nutrition:unit_ingredient:delete' unit.id %}" class="wger-modal-dialog dropdown-item">{% translate 'Delete' %}</a>
+                        {% translate 'Edit' as text %}
+                        {% url 'nutrition:unit_ingredient:edit' unit.id as url %}
+                        {% modal_link url=url text=text css_class='dropdown-item' %}
+
+                        {% translate 'Delete' as text %}
+                        {% url 'nutrition:unit_ingredient:delete' unit.id as url %}
+                        {% modal_link url=url text=text css_class='dropdown-item' %}
                     </div>
                 </div>
             </td>
@@ -202,17 +206,15 @@ $(document).ready(function() {
             {% translate "Options" %}
         </button>
         <div class="dropdown-menu">
-            <a href="{% url 'nutrition:ingredient:edit' ingredient.id %}"
-               title="{% translate 'Edit ingredient' %}"
-               class="dropdown-item">
-                <span class="{% fa_class 'edit' %}"></span>
-                {% translate 'Edit ingredient' %}
-            </a>
+            {% translate 'Edit' as text %}
+            {% url 'nutrition:ingredient:edit' ingredient.id as url %}
+            {% modal_link url=url text=text css_class='dropdown-item' %}
+
             <div role="separator" class="dropdown-divider"></div>
-            <a href="{% url 'nutrition:ingredient:delete' ingredient.id %}"
-               title="{% translate 'Delete ingredient' %}" class="wger-modal-dialog dropdown-item" >
-                <span class="{% fa_class 'trash' %}"></span>
-                {% translate 'Delete' %}
+
+            {% translate 'Delete' as text %}
+            {% url 'nutrition:ingredient:delete' ingredient.id as url %}
+            {% modal_link url=url text=text css_class='dropdown-item' %}
             </a>
         </div>
     </div>
diff --git a/wger/nutrition/templates/units/list.html b/wger/nutrition/templates/units/list.html
index 475518856..2dbc3fc32 100644
--- a/wger/nutrition/templates/units/list.html
+++ b/wger/nutrition/templates/units/list.html
@@ -11,15 +11,20 @@
         {% for unit in unit_list %}
             <li class="list-group-item ">
                 <div class="btn-group float-end">
-                    <button type="button" class="btn btn-light dropdown-toggle btn-sm" data-bs-toggle="dropdown">
+                    <button type="button" class="btn btn-light dropdown-toggle btn-sm"
+                            data-bs-toggle="dropdown">
                         <span class="{% fa_class 'cog' %}"></span>
                     </button>
                     <div class="dropdown-menu dropdown-menu-right" role="menu">
-                        <a href="{% url 'nutrition:weight_unit:edit' unit.id %}"
-                           class="wger-modal-dialog dropdown-item">{% translate 'Edit' %}</a>
+                        {% translate 'Edit' as text %}
+                        {% url 'nutrition:weight_unit:edit' unit.id as url %}
+                        {% modal_link url=url text=text css_class='dropdown-item' %}
+
                         <div class="dropdown-divider"></div>
-                        <a href="{% url 'nutrition:weight_unit:delete' unit.id %}"
-                           class="wger-modal-dialog dropdown-item">{% translate 'Delete' %}</a>
+
+                        {% translate 'Delete' as text %}
+                        {% url 'nutrition:weight_unit:delete' unit.id as url %}
+                        {% modal_link url=url text=text css_class='dropdown-item' %}
                     </div>
                 </div>
                 {{ unit.name }}
@@ -42,7 +47,6 @@
 {# Options #}
 {#         #}
 {% block options %}
-    <a href="{% url 'nutrition:weight_unit:add' %}" class="btn btn-success btn-sm wger-modal-dialog">
-        {% translate "Add new weight unit" %}
-    </a>
+    {% translate 'Add new weight unit' as text %}
+    {% modal_link url='nutrition:weight_unit:add' text=text %}
 {% endblock %}
diff --git a/wger/nutrition/tests/test_ingredient.py b/wger/nutrition/tests/test_ingredient.py
index 5176d1749..aab26eb2e 100644
--- a/wger/nutrition/tests/test_ingredient.py
+++ b/wger/nutrition/tests/test_ingredient.py
@@ -205,11 +205,11 @@ class IngredientDetailTestCase(WgerTestCase):
 
         # Only authorized users see the edit links
         if editor:
-            self.assertContains(response, 'Edit ingredient')
-            self.assertContains(response, 'Delete ingredient')
+            self.assertContains(response, 'Edit')
+            self.assertContains(response, 'Delete')
         else:
-            self.assertNotContains(response, 'Edit ingredient')
-            self.assertNotContains(response, 'Delete ingredient')
+            self.assertNotContains(response, 'Edit')
+            self.assertNotContains(response, 'Delete')
 
         # Non-existent ingredients throw a 404.
         response = self.client.get(reverse('nutrition:ingredient:view', kwargs={'pk': 42}))
@@ -249,8 +249,7 @@ class IngredientSearchTestCase(WgerTestCase):
         Helper function
         """
 
-        kwargs = {'HTTP_X_REQUESTED_WITH': 'XMLHttpRequest'}
-        response = self.client.get(reverse('ingredient-search'), {'term': 'test'}, **kwargs)
+        response = self.client.get(reverse('ingredient-search'), {'term': 'test'})
         self.assertEqual(response.status_code, 200)
         result = json.loads(response.content.decode('utf8'))
         self.assertEqual(len(result['suggestions']), 2)
diff --git a/wger/utils/context_processor.py b/wger/utils/context_processor.py
index 81cb46aff..737f20929 100644
--- a/wger/utils/context_processor.py
+++ b/wger/utils/context_processor.py
@@ -30,7 +30,6 @@ def processor(request):
     full_path = request.get_full_path()
     i18n_path = {}
     static_path = static('images/logos/logo-social.png')
-    is_ajax = request.META.get('HTTP_X_REQUESTED_WITH') == 'XMLHttpRequest'
 
     for lang in settings.AVAILABLE_LANGUAGES:
         i18n_path[lang[0]] = '/{0}/{1}'.format(lang[0], '/'.join(full_path.split('/')[2:]))
@@ -72,9 +71,6 @@ def processor(request):
 
         # current gym, if available
         'custom_header': get_custom_header(request),
-
-        # Template to extend in forms, kinda ugly but will be removed in the future
-        'extend_template': 'base_empty.html' if is_ajax else 'base.html',
     }
     # yapf: enable