Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Commit dummy i18n file and update translation files

Roland Geider6660366004c9
diff --git a/.gitignore b/.gitignore
index 4582d5859..c5123877e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -67,9 +67,6 @@ node_modules
venv
venv-wget
-# Dummy file for translations
-/wger/i18n.tpl
-
# Will need to copy this file to react repo though
/wger/i18n.tsx
diff --git a/wger/locale/ar_SA/LC_MESSAGES/django.po b/wger/locale/ar_SA/LC_MESSAGES/django.po
index 97b768674..8f604a519 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: 2022-02-15 14:51+0100\n"
+"POT-Creation-Date: 2022-05-14 12:01+0200\n"
"PO-Revision-Date: 2021-09-13 21:39+0000\n"
"Last-Translator: My Google <[email protected]>\n"
"Language-Team: Arabic (Saudi Arabia) <https://hosted.weblate.org/projects/"
@@ -44,7 +44,7 @@ msgstr "تمارين"
msgid "Ingredients"
msgstr "مقادير"
-#: config/templates/language/overview.html:4 core/templates/navigation.html:228
+#: config/templates/language/overview.html:4 core/templates/navigation.html:226
msgid "Languages"
msgstr "اللغات"
@@ -224,8 +224,8 @@ msgstr ""
msgid "Empty placeholder schedule"
msgstr ""
-#: core/forms.py:61 core/templates/navigation.html:190
-#: core/templates/navigation.html:194 core/templates/user/login.html:4
+#: core/forms.py:61 core/templates/navigation.html:188
+#: core/templates/navigation.html:192 core/templates/user/login.html:4
#: software/templates/features.html:43
msgid "Login"
msgstr ""
@@ -298,8 +298,8 @@ msgstr ""
msgid "The form is secured with reCAPTCHA"
msgstr ""
-#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:190
-#: core/templates/navigation.html:195 core/templates/template.html:150
+#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:188
+#: core/templates/navigation.html:193 core/templates/template.html:149
#: core/templates/user/login.html:20 core/views/user.py:293
#: software/templates/features.html:38
msgid "Register"
@@ -599,7 +599,7 @@ msgstr ""
#: core/templates/index.html:33 core/templates/index.html:73
#: core/templates/misc/fragments/shariff_modal.html:29
-#: core/templates/template.html:125 manager/templates/calendar/month.html:138
+#: core/templates/template.html:124 manager/templates/calendar/month.html:138
#: manager/templates/schedule/view.html:246
#: manager/templates/schedule/view.html:266
#: manager/templates/workout/view.html:132
@@ -731,7 +731,7 @@ msgstr ""
msgid "Weight"
msgstr ""
-#: core/templates/index.html:210 core/templates/navigation.html:97
+#: core/templates/index.html:210 core/templates/navigation.html:135
#: weight/views.py:70
msgid "Add weight entry"
msgstr ""
@@ -763,8 +763,8 @@ msgstr ""
msgid "Nothing found"
msgstr ""
-#: core/templates/misc/about.html:4 core/templates/template.html:175
-#: core/templates/template_features.html:118
+#: core/templates/misc/about.html:4 core/templates/template.html:174
+#: core/templates/template_features.html:117
#: core/templates/template_no_context.html:88
msgid "Imprint"
msgstr ""
@@ -846,13 +846,13 @@ msgstr ""
#: exercises/templates/equipment/overview.html:113
#: exercises/templates/exercise/overview.html:112
#: exercises/templates/exercise/overview.html:116
-#: exercises/templates/muscles/overview.html:108
#: exercises/templates/muscles/overview.html:112
+#: exercises/templates/muscles/overview.html:116
msgid "Add new exercise"
msgstr ""
-#: core/templates/navigation.html:75 core/templates/navigation.html:134
-#: core/templates/navigation.html:226
+#: core/templates/navigation.html:75 core/templates/navigation.html:116
+#: core/templates/navigation.html:224
msgid "Administration"
msgstr ""
@@ -875,106 +875,106 @@ msgstr ""
msgid "Categories"
msgstr ""
-#: core/templates/navigation.html:94
-msgid "Body weight"
-msgstr ""
-
-#: core/templates/navigation.html:96 core/templates/user/overview.html:114
-#: weight/templates/overview.html:7
-msgid "Weight overview"
-msgstr ""
-
-#: core/templates/navigation.html:111 software/templates/features.html:87
+#: core/templates/navigation.html:93 software/templates/features.html:87
msgid "Nutrition"
msgstr ""
-#: core/templates/navigation.html:117 core/templates/user/overview.html:144
+#: core/templates/navigation.html:99 core/templates/user/overview.html:144
msgid "Nutrition plans"
msgstr ""
-#: core/templates/navigation.html:123 nutrition/templates/bmi/form.html:50
+#: core/templates/navigation.html:105 nutrition/templates/bmi/form.html:50
msgid "BMI calculator"
msgstr ""
-#: core/templates/navigation.html:129 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:111 nutrition/templates/rate/form.html:17
msgid "Daily calories calculator"
msgstr ""
-#: core/templates/navigation.html:131
+#: core/templates/navigation.html:113
#: nutrition/templates/ingredient/overview.html:29
msgid "Ingredient overview"
msgstr ""
-#: core/templates/navigation.html:135 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:117 nutrition/templates/units/list.html:6
msgid "Ingredient weight units"
msgstr ""
-#: core/templates/navigation.html:136
+#: core/templates/navigation.html:118
#: nutrition/templates/ingredient/pending.html:6
msgid "Ingredients pending review"
msgstr ""
-#: core/templates/navigation.html:149
+#: core/templates/navigation.html:132
+msgid "Body weight"
+msgstr ""
+
+#: core/templates/navigation.html:134 core/templates/user/overview.html:114
+#: weight/templates/overview.html:7
+msgid "Weight overview"
+msgstr ""
+
+#: core/templates/navigation.html:147
msgid "About this software"
msgstr ""
-#: core/templates/navigation.html:151 core/templates/template_features.html:83
+#: core/templates/navigation.html:149 core/templates/template_features.html:82
#: software/templates/about_us.html:5
msgid "About us"
msgstr ""
-#: core/templates/navigation.html:153 software/templates/features.html:209
+#: core/templates/navigation.html:151 software/templates/features.html:209
msgid "REST API"
msgstr ""
-#: core/templates/navigation.html:157 utils/models.py:40
+#: core/templates/navigation.html:155 utils/models.py:40
msgid "License"
msgstr ""
-#: core/templates/navigation.html:163
+#: core/templates/navigation.html:161
msgid "Developer documentation"
msgstr ""
-#: core/templates/navigation.html:169
+#: core/templates/navigation.html:167
msgid "Get the code"
msgstr ""
-#: core/templates/navigation.html:175 core/templates/template.html:205
-#: core/templates/template_features.html:100
+#: core/templates/navigation.html:173 core/templates/template.html:204
+#: core/templates/template_features.html:99
msgid "Translate"
msgstr ""
-#: core/templates/navigation.html:196 core/templates/user/login.html:28
+#: core/templates/navigation.html:194 core/templates/user/login.html:28
msgid "Reset password"
msgstr ""
-#: core/templates/navigation.html:209
+#: core/templates/navigation.html:207
msgid "My preferences"
msgstr ""
-#: core/templates/navigation.html:216
+#: core/templates/navigation.html:214
msgid "Logout"
msgstr ""
-#: core/templates/navigation.html:231
+#: core/templates/navigation.html:229
msgid "Licenses"
msgstr ""
-#: core/templates/navigation.html:234
+#: core/templates/navigation.html:232
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr ""
-#: core/templates/navigation.html:237 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:235 core/templates/weight_unit/list.html:4
#: nutrition/templates/ingredient/view.html:174
msgid "Weight units"
msgstr ""
-#: core/templates/navigation.html:240 core/templates/user/list.html:4
+#: core/templates/navigation.html:238 core/templates/user/list.html:4
msgid "User list"
msgstr ""
-#: core/templates/navigation.html:241
+#: core/templates/navigation.html:239
msgid "Gyms"
msgstr ""
@@ -1052,7 +1052,7 @@ msgstr ""
#: core/templates/tags/render_day.html:114
#: exercises/templates/equipment/overview.html:59
#: exercises/templates/exercise/overview.html:63
-#: exercises/templates/muscles/overview.html:61
+#: exercises/templates/muscles/overview.html:65
msgid "Placeholder image for exercise"
msgstr ""
@@ -1079,21 +1079,21 @@ msgstr ""
msgid "RiR"
msgstr ""
-#: core/templates/template.html:140
+#: core/templates/template.html:139
msgid ""
"You are using a guest account, data entered will be deleted after a week."
msgstr ""
-#: core/templates/template.html:144
+#: core/templates/template.html:143
msgid "Create some demo entries"
msgstr ""
-#: core/templates/template.html:176 core/templates/template_features.html:122
+#: core/templates/template.html:175 core/templates/template_features.html:121
#: core/templates/template_no_context.html:89 software/templates/tos.html:7
msgid "Terms of service"
msgstr ""
-#: core/templates/template_features.html:62 software/templates/features.html:9
+#: core/templates/template_features.html:61 software/templates/features.html:9
#: software/templates/features.html:120
msgid "Features"
msgstr ""
@@ -1503,7 +1503,7 @@ msgstr ""
#: exercises/models/base.py:64 exercises/templates/equipment/overview.html:71
#: exercises/templates/exercise/overview.html:76
#: exercises/templates/exercise/view.html:268
-#: exercises/templates/muscles/overview.html:73
+#: exercises/templates/muscles/overview.html:77
msgid "Secondary muscles"
msgstr ""
@@ -1515,9 +1515,9 @@ msgstr ""
msgid "Exercise Categories"
msgstr ""
-#: exercises/models/comment.py:34 exercises/models/image.py:75
-#: exercises/models/video.py:82 manager/forms.py:165 manager/helpers.py:89
-#: manager/models/log.py:51
+#: exercises/models/comment.py:34 exercises/models/exercise_alias.py:32
+#: exercises/models/image.py:75 exercises/models/video.py:82
+#: manager/forms.py:165 manager/helpers.py:89 manager/models/log.py:51
msgid "Exercise"
msgstr ""
@@ -1543,6 +1543,10 @@ msgstr ""
msgid "The user {0} submitted a new exercise \"{1}\"."
msgstr ""
+#: exercises/models/exercise_alias.py:35
+msgid "Alias for an exercise"
+msgstr ""
+
#: exercises/models/image.py:59
msgid "Line"
msgstr ""
@@ -1599,6 +1603,14 @@ msgstr ""
msgid "In latin, e.g. \"Pectoralis major\""
msgstr ""
+#: exercises/models/muscle.py:47
+msgid "Alternative name"
+msgstr ""
+
+#: exercises/models/muscle.py:48
+msgid "A more basic name for the muscle"
+msgstr ""
+
#: exercises/models/video.py:41
msgid "Maximum file size is 100MB."
msgstr ""
@@ -1659,7 +1671,7 @@ msgstr ""
#: exercises/templates/equipment/overview.html:69
#: exercises/templates/exercise/overview.html:74
#: exercises/templates/exercise/view.html:264
-#: exercises/templates/muscles/overview.html:71
+#: exercises/templates/muscles/overview.html:75
msgid "Main muscles"
msgstr ""
@@ -1682,7 +1694,7 @@ msgstr ""
#: exercises/templates/equipment/overview.html:115
#: exercises/templates/exercise/overview.html:118
-#: exercises/templates/muscles/overview.html:114
+#: exercises/templates/muscles/overview.html:118
#: nutrition/templates/ingredient/overview.html:85
msgid "Only registered users can do this"
msgstr ""
@@ -1860,7 +1872,7 @@ msgstr ""
msgid "Add muscle"
msgstr ""
-#: exercises/templates/muscles/overview.html:81
+#: exercises/templates/muscles/overview.html:85
msgid ""
"No exercises for this muscle. Add or edit an exercise and set the muscle."
msgstr ""
@@ -2226,7 +2238,7 @@ msgstr ""
msgid "Edit gym"
msgstr ""
-#: i18n.tpl:2
+#: i18n.tpl:2 i18n.tpl:28
msgid "Abs"
msgstr ""
@@ -2238,11 +2250,11 @@ msgstr ""
msgid "Back"
msgstr ""
-#: i18n.tpl:5
+#: i18n.tpl:5 i18n.tpl:23
msgid "Calves"
msgstr ""
-#: i18n.tpl:6
+#: i18n.tpl:6 i18n.tpl:26
msgid "Chest"
msgstr ""
@@ -2250,7 +2262,7 @@ msgstr ""
msgid "Legs"
msgstr ""
-#: i18n.tpl:8
+#: i18n.tpl:8 i18n.tpl:19
msgid "Shoulders"
msgstr ""
@@ -2279,11 +2291,11 @@ msgid "Kettlebell"
msgstr ""
#: i18n.tpl:15
-msgid "none (bodyweight exercise)"
+msgid "Pull-up bar"
msgstr ""
#: i18n.tpl:16
-msgid "Pull-up bar"
+msgid "SZ-Bar"
msgstr ""
#: i18n.tpl:17
@@ -2291,95 +2303,59 @@ msgid "Swiss Ball"
msgstr ""
#: i18n.tpl:18
-msgid "SZ-Bar"
-msgstr ""
-
-#: i18n.tpl:19
-msgid "Anterior deltoid"
+msgid "none (bodyweight exercise)"
msgstr ""
#: i18n.tpl:20
-msgid "Biceps brachii"
+msgid "Biceps"
msgstr ""
#: i18n.tpl:21
-msgid "Biceps femoris"
+msgid "Hamstrings"
msgstr ""
#: i18n.tpl:22
-msgid "Brachialis"
-msgstr ""
-
-#: i18n.tpl:23
-msgid "Gastrocnemius"
+msgid "Lower back"
msgstr ""
#: i18n.tpl:24
-msgid "Gluteus maximus"
+msgid "Glutes"
msgstr ""
#: i18n.tpl:25
-msgid "Latissimus dorsi"
-msgstr ""
-
-#: i18n.tpl:26
-msgid "Obliquus externus abdominis"
+msgid "Lats"
msgstr ""
#: i18n.tpl:27
-msgid "Pectoralis major"
-msgstr ""
-
-#: i18n.tpl:28
-msgid "Quadriceps femoris"
+msgid "Quads"
msgstr ""
#: i18n.tpl:29
-msgid "Rectus abdominis"
+msgid "Triceps"
msgstr ""
#: i18n.tpl:30
-msgid "Serratus anterior"
-msgstr ""
-
-#: i18n.tpl:31
-msgid "Soleus"
-msgstr ""
-
-#: i18n.tpl:32
-msgid "Trapezius"
-msgstr ""
-
-#: i18n.tpl:33
-msgid "Triceps brachii"
-msgstr ""
-
-#: i18n.tpl:34
msgid "Kilometers"
msgstr ""
-#: i18n.tpl:35
-msgid "Max Reps"
-msgstr ""
-
-#: i18n.tpl:36
+#: i18n.tpl:31
msgid "Miles"
msgstr ""
-#: i18n.tpl:37
+#: i18n.tpl:32
msgid "Minutes"
msgstr ""
-#: i18n.tpl:38 manager/forms.py:169 manager/models/log.py:71
+#: i18n.tpl:33 manager/forms.py:169 manager/models/log.py:71
#: manager/templates/set/add.html:53
msgid "Repetitions"
msgstr ""
-#: i18n.tpl:39
+#: i18n.tpl:34
msgid "Seconds"
msgstr ""
-#: i18n.tpl:40
+#: i18n.tpl:35
msgid "Until Failure"
msgstr ""
diff --git a/wger/locale/bg/LC_MESSAGES/django.mo b/wger/locale/bg/LC_MESSAGES/django.mo
index 7e041851a..af2f57bad 100644
Binary files a/wger/locale/bg/LC_MESSAGES/django.mo and b/wger/locale/bg/LC_MESSAGES/django.mo differ
diff --git a/wger/locale/bg/LC_MESSAGES/django.po b/wger/locale/bg/LC_MESSAGES/django.po
index 4fb199441..2dd78152b 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: 2022-02-15 14:51+0100\n"
+"POT-Creation-Date: 2022-05-14 12:01+0200\n"
"PO-Revision-Date: 2021-04-15 07:27+0000\n"
"Last-Translator: Allan Nordhøy <[email protected]>\n"
"Language-Team: Bulgarian <https://hosted.weblate.org/projects/wger/web/bg/>\n"
@@ -42,7 +42,7 @@ msgstr "Упражнения"
msgid "Ingredients"
msgstr ""
-#: config/templates/language/overview.html:4 core/templates/navigation.html:228
+#: config/templates/language/overview.html:4 core/templates/navigation.html:226
msgid "Languages"
msgstr ""
@@ -214,8 +214,8 @@ msgstr "Моята готина тренировъчна схема"
msgid "Empty placeholder schedule"
msgstr "Празно място за тренировъчен план"
-#: core/forms.py:61 core/templates/navigation.html:190
-#: core/templates/navigation.html:194 core/templates/user/login.html:4
+#: core/forms.py:61 core/templates/navigation.html:188
+#: core/templates/navigation.html:192 core/templates/user/login.html:4
#: software/templates/features.html:43
msgid "Login"
msgstr "Вход"
@@ -290,8 +290,8 @@ msgstr ""
msgid "The form is secured with reCAPTCHA"
msgstr ""
-#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:190
-#: core/templates/navigation.html:195 core/templates/template.html:150
+#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:188
+#: core/templates/navigation.html:193 core/templates/template.html:149
#: core/templates/user/login.html:20 core/views/user.py:293
#: software/templates/features.html:38
msgid "Register"
@@ -598,7 +598,7 @@ msgstr ""
#: core/templates/index.html:33 core/templates/index.html:73
#: core/templates/misc/fragments/shariff_modal.html:29
-#: core/templates/template.html:125 manager/templates/calendar/month.html:138
+#: core/templates/template.html:124 manager/templates/calendar/month.html:138
#: manager/templates/schedule/view.html:246
#: manager/templates/schedule/view.html:266
#: manager/templates/workout/view.html:132
@@ -730,7 +730,7 @@ msgstr "Няма план за хранене"
msgid "Weight"
msgstr "Тегло"
-#: core/templates/index.html:210 core/templates/navigation.html:97
+#: core/templates/index.html:210 core/templates/navigation.html:135
#: weight/views.py:70
msgid "Add weight entry"
msgstr "Добави тегло"
@@ -762,8 +762,8 @@ msgstr ""
msgid "Nothing found"
msgstr ""
-#: core/templates/misc/about.html:4 core/templates/template.html:175
-#: core/templates/template_features.html:118
+#: core/templates/misc/about.html:4 core/templates/template.html:174
+#: core/templates/template_features.html:117
#: core/templates/template_no_context.html:88
msgid "Imprint"
msgstr ""
@@ -849,13 +849,13 @@ msgstr ""
#: exercises/templates/equipment/overview.html:113
#: exercises/templates/exercise/overview.html:112
#: exercises/templates/exercise/overview.html:116
-#: exercises/templates/muscles/overview.html:108
#: exercises/templates/muscles/overview.html:112
+#: exercises/templates/muscles/overview.html:116
msgid "Add new exercise"
msgstr "Добави ново упражнение"
-#: core/templates/navigation.html:75 core/templates/navigation.html:134
-#: core/templates/navigation.html:226
+#: core/templates/navigation.html:75 core/templates/navigation.html:116
+#: core/templates/navigation.html:224
msgid "Administration"
msgstr "Администрация"
@@ -878,106 +878,106 @@ msgstr "Мускули"
msgid "Categories"
msgstr ""
-#: core/templates/navigation.html:94
-msgid "Body weight"
-msgstr ""
-
-#: core/templates/navigation.html:96 core/templates/user/overview.html:114
-#: weight/templates/overview.html:7
-msgid "Weight overview"
-msgstr "Преглед на тегло"
-
-#: core/templates/navigation.html:111 software/templates/features.html:87
+#: core/templates/navigation.html:93 software/templates/features.html:87
msgid "Nutrition"
msgstr "Хранене"
-#: core/templates/navigation.html:117 core/templates/user/overview.html:144
+#: core/templates/navigation.html:99 core/templates/user/overview.html:144
msgid "Nutrition plans"
msgstr "План за хранене"
-#: core/templates/navigation.html:123 nutrition/templates/bmi/form.html:50
+#: core/templates/navigation.html:105 nutrition/templates/bmi/form.html:50
msgid "BMI calculator"
msgstr ""
-#: core/templates/navigation.html:129 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:111 nutrition/templates/rate/form.html:17
msgid "Daily calories calculator"
msgstr ""
-#: core/templates/navigation.html:131
+#: core/templates/navigation.html:113
#: nutrition/templates/ingredient/overview.html:29
msgid "Ingredient overview"
msgstr "Преглед на съставките"
-#: core/templates/navigation.html:135 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:117 nutrition/templates/units/list.html:6
msgid "Ingredient weight units"
msgstr "Единици за тежест на съставки"
-#: core/templates/navigation.html:136
+#: core/templates/navigation.html:118
#: nutrition/templates/ingredient/pending.html:6
msgid "Ingredients pending review"
msgstr "Съставки без преглед"
-#: core/templates/navigation.html:149
+#: core/templates/navigation.html:132
+msgid "Body weight"
+msgstr ""
+
+#: core/templates/navigation.html:134 core/templates/user/overview.html:114
+#: weight/templates/overview.html:7
+msgid "Weight overview"
+msgstr "Преглед на тегло"
+
+#: core/templates/navigation.html:147
msgid "About this software"
msgstr "Относно този код"
-#: core/templates/navigation.html:151 core/templates/template_features.html:83
+#: core/templates/navigation.html:149 core/templates/template_features.html:82
#: software/templates/about_us.html:5
msgid "About us"
msgstr "За нас"
-#: core/templates/navigation.html:153 software/templates/features.html:209
+#: core/templates/navigation.html:151 software/templates/features.html:209
msgid "REST API"
msgstr ""
-#: core/templates/navigation.html:157 utils/models.py:40
+#: core/templates/navigation.html:155 utils/models.py:40
msgid "License"
msgstr "Лиценз"
-#: core/templates/navigation.html:163
+#: core/templates/navigation.html:161
msgid "Developer documentation"
msgstr ""
-#: core/templates/navigation.html:169
+#: core/templates/navigation.html:167
msgid "Get the code"
msgstr "Грабни кода"
-#: core/templates/navigation.html:175 core/templates/template.html:205
-#: core/templates/template_features.html:100
+#: core/templates/navigation.html:173 core/templates/template.html:204
+#: core/templates/template_features.html:99
msgid "Translate"
msgstr "Преведи"
-#: core/templates/navigation.html:196 core/templates/user/login.html:28
+#: core/templates/navigation.html:194 core/templates/user/login.html:28
msgid "Reset password"
msgstr "Промени парола"
-#: core/templates/navigation.html:209
+#: core/templates/navigation.html:207
msgid "My preferences"
msgstr "Моите преференции"
-#: core/templates/navigation.html:216
+#: core/templates/navigation.html:214
msgid "Logout"
msgstr "Изход"
-#: core/templates/navigation.html:231
+#: core/templates/navigation.html:229
msgid "Licenses"
msgstr ""
-#: core/templates/navigation.html:234
+#: core/templates/navigation.html:232
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr ""
-#: core/templates/navigation.html:237 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:235 core/templates/weight_unit/list.html:4
#: nutrition/templates/ingredient/view.html:174
msgid "Weight units"
msgstr "Единици за тегло"
-#: core/templates/navigation.html:240 core/templates/user/list.html:4
+#: core/templates/navigation.html:238 core/templates/user/list.html:4
msgid "User list"
msgstr ""
-#: core/templates/navigation.html:241
+#: core/templates/navigation.html:239
msgid "Gyms"
msgstr ""
@@ -1059,7 +1059,7 @@ msgstr ""
#: core/templates/tags/render_day.html:114
#: exercises/templates/equipment/overview.html:59
#: exercises/templates/exercise/overview.html:63
-#: exercises/templates/muscles/overview.html:61
+#: exercises/templates/muscles/overview.html:65
msgid "Placeholder image for exercise"
msgstr ""
@@ -1086,23 +1086,23 @@ msgstr "Повторения"
msgid "RiR"
msgstr ""
-#: core/templates/template.html:140
+#: core/templates/template.html:139
msgid ""
"You are using a guest account, data entered will be deleted after a week."
msgstr ""
"Вие сте влезли като гост и всички данни, които добавяте ще бъдат изтрити "
"след една седмица."
-#: core/templates/template.html:144
+#: core/templates/template.html:143
msgid "Create some demo entries"
msgstr "Направи демонстративни попълнения"
-#: core/templates/template.html:176 core/templates/template_features.html:122
+#: core/templates/template.html:175 core/templates/template_features.html:121
#: core/templates/template_no_context.html:89 software/templates/tos.html:7
msgid "Terms of service"
msgstr ""
-#: core/templates/template_features.html:62 software/templates/features.html:9
+#: core/templates/template_features.html:61 software/templates/features.html:9
#: software/templates/features.html:120
msgid "Features"
msgstr "Особености"
@@ -1516,7 +1516,7 @@ msgstr "Основни мускули"
#: exercises/models/base.py:64 exercises/templates/equipment/overview.html:71
#: exercises/templates/exercise/overview.html:76
#: exercises/templates/exercise/view.html:268
-#: exercises/templates/muscles/overview.html:73
+#: exercises/templates/muscles/overview.html:77
msgid "Secondary muscles"
msgstr "Второстепенни мускули"
@@ -1528,9 +1528,9 @@ msgstr ""
msgid "Exercise Categories"
msgstr "Категории на упражнения"
-#: exercises/models/comment.py:34 exercises/models/image.py:75
-#: exercises/models/video.py:82 manager/forms.py:165 manager/helpers.py:89
-#: manager/models/log.py:51
+#: exercises/models/comment.py:34 exercises/models/exercise_alias.py:32
+#: exercises/models/image.py:75 exercises/models/video.py:82
+#: manager/forms.py:165 manager/helpers.py:89 manager/models/log.py:51
msgid "Exercise"
msgstr "Упражнение"
@@ -1556,6 +1556,12 @@ msgstr "Ново упражнение добавено от потребител
msgid "The user {0} submitted a new exercise \"{1}\"."
msgstr "Потребителя {0} предостави ново упражнение \"{1}\"."
+#: exercises/models/exercise_alias.py:35
+#, fuzzy
+#| msgid "Add new exercise"
+msgid "Alias for an exercise"
+msgstr "Добави ново упражнение"
+
#: exercises/models/image.py:59
msgid "Line"
msgstr ""
@@ -1614,6 +1620,16 @@ msgstr ""
msgid "In latin, e.g. \"Pectoralis major\""
msgstr ""
+#: exercises/models/muscle.py:47
+#, fuzzy
+#| msgid "exercise name"
+msgid "Alternative name"
+msgstr "име на упражнение"
+
+#: exercises/models/muscle.py:48
+msgid "A more basic name for the muscle"
+msgstr ""
+
#: exercises/models/video.py:41
msgid "Maximum file size is 100MB."
msgstr ""
@@ -1678,7 +1694,7 @@ msgstr ""
#: exercises/templates/equipment/overview.html:69
#: exercises/templates/exercise/overview.html:74
#: exercises/templates/exercise/view.html:264
-#: exercises/templates/muscles/overview.html:71
+#: exercises/templates/muscles/overview.html:75
msgid "Main muscles"
msgstr "Основни мускули"
@@ -1701,7 +1717,7 @@ msgstr "име на упражнение"
#: exercises/templates/equipment/overview.html:115
#: exercises/templates/exercise/overview.html:118
-#: exercises/templates/muscles/overview.html:114
+#: exercises/templates/muscles/overview.html:118
#: nutrition/templates/ingredient/overview.html:85
msgid "Only registered users can do this"
msgstr "Само за регистрирани потребители"
@@ -1888,7 +1904,7 @@ msgstr "Преглед на мускулите"
msgid "Add muscle"
msgstr "Добави мускул"
-#: exercises/templates/muscles/overview.html:81
+#: exercises/templates/muscles/overview.html:85
msgid ""
"No exercises for this muscle. Add or edit an exercise and set the muscle."
msgstr ""
@@ -2256,7 +2272,7 @@ msgstr ""
msgid "Edit gym"
msgstr ""
-#: i18n.tpl:2
+#: i18n.tpl:2 i18n.tpl:28
msgid "Abs"
msgstr ""
@@ -2268,11 +2284,11 @@ msgstr ""
msgid "Back"
msgstr "Назад"
-#: i18n.tpl:5
+#: i18n.tpl:5 i18n.tpl:23
msgid "Calves"
msgstr ""
-#: i18n.tpl:6
+#: i18n.tpl:6 i18n.tpl:26
msgid "Chest"
msgstr ""
@@ -2280,7 +2296,7 @@ msgstr ""
msgid "Legs"
msgstr ""
-#: i18n.tpl:8
+#: i18n.tpl:8 i18n.tpl:19
msgid "Shoulders"
msgstr ""
@@ -2309,11 +2325,11 @@ msgid "Kettlebell"
msgstr ""
#: i18n.tpl:15
-msgid "none (bodyweight exercise)"
+msgid "Pull-up bar"
msgstr ""
#: i18n.tpl:16
-msgid "Pull-up bar"
+msgid "SZ-Bar"
msgstr ""
#: i18n.tpl:17
@@ -2321,97 +2337,59 @@ msgid "Swiss Ball"
msgstr ""
#: i18n.tpl:18
-msgid "SZ-Bar"
-msgstr ""
-
-#: i18n.tpl:19
-msgid "Anterior deltoid"
+msgid "none (bodyweight exercise)"
msgstr ""
#: i18n.tpl:20
-msgid "Biceps brachii"
+msgid "Biceps"
msgstr ""
#: i18n.tpl:21
-msgid "Biceps femoris"
+msgid "Hamstrings"
msgstr ""
#: i18n.tpl:22
-msgid "Brachialis"
-msgstr ""
-
-#: i18n.tpl:23
-msgid "Gastrocnemius"
+msgid "Lower back"
msgstr ""
#: i18n.tpl:24
-msgid "Gluteus maximus"
+msgid "Glutes"
msgstr ""
#: i18n.tpl:25
-msgid "Latissimus dorsi"
-msgstr ""
-
-#: i18n.tpl:26
-msgid "Obliquus externus abdominis"
+msgid "Lats"
msgstr ""
#: i18n.tpl:27
-msgid "Pectoralis major"
-msgstr ""
-
-#: i18n.tpl:28
-msgid "Quadriceps femoris"
+msgid "Quads"
msgstr ""
#: i18n.tpl:29
-msgid "Rectus abdominis"
+msgid "Triceps"
msgstr ""
#: i18n.tpl:30
-msgid "Serratus anterior"
-msgstr ""
-
-#: i18n.tpl:31
-msgid "Soleus"
-msgstr ""
-
-#: i18n.tpl:32
-msgid "Trapezius"
-msgstr ""
-
-#: i18n.tpl:33
-msgid "Triceps brachii"
-msgstr ""
-
-#: i18n.tpl:34
msgid "Kilometers"
msgstr ""
-#: i18n.tpl:35
-#, fuzzy
-#| msgid "Reps"
-msgid "Max Reps"
-msgstr "Повторения"
-
-#: i18n.tpl:36
+#: i18n.tpl:31
msgid "Miles"
msgstr ""
-#: i18n.tpl:37
+#: i18n.tpl:32
msgid "Minutes"
msgstr ""
-#: i18n.tpl:38 manager/forms.py:169 manager/models/log.py:71
+#: i18n.tpl:33 manager/forms.py:169 manager/models/log.py:71
#: manager/templates/set/add.html:53
msgid "Repetitions"
msgstr "Повторения"
-#: i18n.tpl:39
+#: i18n.tpl:34
msgid "Seconds"
msgstr ""
-#: i18n.tpl:40
+#: i18n.tpl:35
msgid "Until Failure"
msgstr ""
@@ -3960,6 +3938,11 @@ msgstr ""
msgid "Delete weight entry for the %s"
msgstr ""
+#, fuzzy
+#~| msgid "Reps"
+#~ msgid "Max Reps"
+#~ msgstr "Повторения"
+
#~ msgid "Your current weight is: "
#~ msgstr "Текущото ви тегло е:"
diff --git a/wger/locale/ca/LC_MESSAGES/django.po b/wger/locale/ca/LC_MESSAGES/django.po
index 9e8967042..13c59815c 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: 2022-02-15 14:51+0100\n"
+"POT-Creation-Date: 2022-05-14 12:01+0200\n"
"PO-Revision-Date: 2022-02-08 01:58+0000\n"
"Last-Translator: guillem <[email protected]>\n"
"Language-Team: Catalan <https://hosted.weblate.org/projects/wger/web/ca/>\n"
@@ -41,7 +41,7 @@ msgstr "Exercicis"
msgid "Ingredients"
msgstr "Ingredients"
-#: config/templates/language/overview.html:4 core/templates/navigation.html:228
+#: config/templates/language/overview.html:4 core/templates/navigation.html:226
msgid "Languages"
msgstr "Llengües"
@@ -217,8 +217,8 @@ msgstr "El meu programa d'entrenament xamós"
msgid "Empty placeholder schedule"
msgstr "Programa buit per a reservar l'espai"
-#: core/forms.py:61 core/templates/navigation.html:190
-#: core/templates/navigation.html:194 core/templates/user/login.html:4
+#: core/forms.py:61 core/templates/navigation.html:188
+#: core/templates/navigation.html:192 core/templates/user/login.html:4
#: software/templates/features.html:43
msgid "Login"
msgstr "Accedeix"
@@ -295,8 +295,8 @@ msgstr "Contrasenya invàlida"
msgid "The form is secured with reCAPTCHA"
msgstr "El formulari està protegit amb reCAPTCHA"
-#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:190
-#: core/templates/navigation.html:195 core/templates/template.html:150
+#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:188
+#: core/templates/navigation.html:193 core/templates/template.html:149
#: core/templates/user/login.html:20 core/views/user.py:293
#: software/templates/features.html:38
msgid "Register"
@@ -623,7 +623,7 @@ msgstr ""
#: core/templates/index.html:33 core/templates/index.html:73
#: core/templates/misc/fragments/shariff_modal.html:29
-#: core/templates/template.html:125 manager/templates/calendar/month.html:138
+#: core/templates/template.html:124 manager/templates/calendar/month.html:138
#: manager/templates/schedule/view.html:246
#: manager/templates/schedule/view.html:266
#: manager/templates/workout/view.html:132
@@ -760,7 +760,7 @@ msgstr "No s'han trobat plans nutricionals."
msgid "Weight"
msgstr "Pes"
-#: core/templates/index.html:210 core/templates/navigation.html:97
+#: core/templates/index.html:210 core/templates/navigation.html:135
#: weight/views.py:70
msgid "Add weight entry"
msgstr "Afegeix entrada de pes"
@@ -792,8 +792,8 @@ msgstr "Llista de llicències"
msgid "Nothing found"
msgstr "No s'ha trobat res"
-#: core/templates/misc/about.html:4 core/templates/template.html:175
-#: core/templates/template_features.html:118
+#: core/templates/misc/about.html:4 core/templates/template.html:174
+#: core/templates/template_features.html:117
#: core/templates/template_no_context.html:88
msgid "Imprint"
msgstr "Colofó"
@@ -878,13 +878,13 @@ msgstr "per equipament"
#: exercises/templates/equipment/overview.html:113
#: exercises/templates/exercise/overview.html:112
#: exercises/templates/exercise/overview.html:116
-#: exercises/templates/muscles/overview.html:108
#: exercises/templates/muscles/overview.html:112
+#: exercises/templates/muscles/overview.html:116
msgid "Add new exercise"
msgstr "Afegeix un nou exercici"
-#: core/templates/navigation.html:75 core/templates/navigation.html:134
-#: core/templates/navigation.html:226
+#: core/templates/navigation.html:75 core/templates/navigation.html:116
+#: core/templates/navigation.html:224
msgid "Administration"
msgstr "Administració"
@@ -907,106 +907,106 @@ msgstr "Músculs"
msgid "Categories"
msgstr "Categories"
-#: core/templates/navigation.html:94
-msgid "Body weight"
-msgstr "Pes corporal"
-
-#: core/templates/navigation.html:96 core/templates/user/overview.html:114
-#: weight/templates/overview.html:7
-msgid "Weight overview"
-msgstr "El pes en un cop d'ull"
-
-#: core/templates/navigation.html:111 software/templates/features.html:87
+#: core/templates/navigation.html:93 software/templates/features.html:87
msgid "Nutrition"
msgstr "Nutrició"
-#: core/templates/navigation.html:117 core/templates/user/overview.html:144
+#: core/templates/navigation.html:99 core/templates/user/overview.html:144
msgid "Nutrition plans"
msgstr "Plans de nutrició"
-#: core/templates/navigation.html:123 nutrition/templates/bmi/form.html:50
+#: core/templates/navigation.html:105 nutrition/templates/bmi/form.html:50
msgid "BMI calculator"
msgstr "Calculadora de l'IMC"
-#: core/templates/navigation.html:129 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:111 nutrition/templates/rate/form.html:17
msgid "Daily calories calculator"
msgstr "Calculadora de calories diàries"
-#: core/templates/navigation.html:131
+#: core/templates/navigation.html:113
#: nutrition/templates/ingredient/overview.html:29
msgid "Ingredient overview"
msgstr "Ingredients en un cop d'ull"
-#: core/templates/navigation.html:135 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:117 nutrition/templates/units/list.html:6
msgid "Ingredient weight units"
msgstr "Unitats de pes dels ingredients"
-#: core/templates/navigation.html:136
+#: core/templates/navigation.html:118
#: nutrition/templates/ingredient/pending.html:6
msgid "Ingredients pending review"
msgstr "Ingredients pendents de revisar"
-#: core/templates/navigation.html:149
+#: core/templates/navigation.html:132
+msgid "Body weight"
+msgstr "Pes corporal"
+
+#: core/templates/navigation.html:134 core/templates/user/overview.html:114
+#: weight/templates/overview.html:7
+msgid "Weight overview"
+msgstr "El pes en un cop d'ull"
+
+#: core/templates/navigation.html:147
msgid "About this software"
msgstr "Quant a aquest programari"
-#: core/templates/navigation.html:151 core/templates/template_features.html:83
+#: core/templates/navigation.html:149 core/templates/template_features.html:82
#: software/templates/about_us.html:5
msgid "About us"
msgstr "Quant a nosaltres"
-#: core/templates/navigation.html:153 software/templates/features.html:209
+#: core/templates/navigation.html:151 software/templates/features.html:209
msgid "REST API"
msgstr "API REST"
-#: core/templates/navigation.html:157 utils/models.py:40
+#: core/templates/navigation.html:155 utils/models.py:40
msgid "License"
msgstr "Llicència"
-#: core/templates/navigation.html:163
+#: core/templates/navigation.html:161
msgid "Developer documentation"
msgstr "Documentació per a desenvolupadors"
-#: core/templates/navigation.html:169
+#: core/templates/navigation.html:167
msgid "Get the code"
msgstr "Obteniu el codi font"
-#: core/templates/navigation.html:175 core/templates/template.html:205
-#: core/templates/template_features.html:100
+#: core/templates/navigation.html:173 core/templates/template.html:204
+#: core/templates/template_features.html:99
msgid "Translate"
msgstr "Traduïu"
-#: core/templates/navigation.html:196 core/templates/user/login.html:28
+#: core/templates/navigation.html:194 core/templates/user/login.html:28
msgid "Reset password"
msgstr "Reinicialitza la contrasenya"
-#: core/templates/navigation.html:209
+#: core/templates/navigation.html:207
msgid "My preferences"
msgstr "Les meves preferències"
-#: core/templates/navigation.html:216
+#: core/templates/navigation.html:214
msgid "Logout"
msgstr "Surt"
-#: core/templates/navigation.html:231
+#: core/templates/navigation.html:229
msgid "Licenses"
msgstr "Llicències"
-#: core/templates/navigation.html:234
+#: core/templates/navigation.html:232
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr "Unitats de repetició"
-#: core/templates/navigation.html:237 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:235 core/templates/weight_unit/list.html:4
#: nutrition/templates/ingredient/view.html:174
msgid "Weight units"
msgstr "Unitats de pes"
-#: core/templates/navigation.html:240 core/templates/user/list.html:4
+#: core/templates/navigation.html:238 core/templates/user/list.html:4
msgid "User list"
msgstr "Llista d'usuaris"
-#: core/templates/navigation.html:241
+#: core/templates/navigation.html:239
msgid "Gyms"
msgstr "Gimnasos"
@@ -1088,7 +1088,7 @@ msgstr "Afegeix registre de pes"
#: core/templates/tags/render_day.html:114
#: exercises/templates/equipment/overview.html:59
#: exercises/templates/exercise/overview.html:63
-#: exercises/templates/muscles/overview.html:61
+#: exercises/templates/muscles/overview.html:65
msgid "Placeholder image for exercise"
msgstr "Imatge provisional per al vostre exercici"
@@ -1115,23 +1115,23 @@ msgstr "Repeticions"
msgid "RiR"
msgstr "RER"
-#: core/templates/template.html:140
+#: core/templates/template.html:139
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:144
+#: core/templates/template.html:143
msgid "Create some demo entries"
msgstr "Crea algunes entrades de mostra"
-#: core/templates/template.html:176 core/templates/template_features.html:122
+#: core/templates/template.html:175 core/templates/template_features.html:121
#: core/templates/template_no_context.html:89 software/templates/tos.html:7
msgid "Terms of service"
msgstr "Condicions del servei"
-#: core/templates/template_features.html:62 software/templates/features.html:9
+#: core/templates/template_features.html:61 software/templates/features.html:9
#: software/templates/features.html:120
msgid "Features"
msgstr "Funcions"
@@ -1556,7 +1556,7 @@ msgstr "Músculs primaris"
#: exercises/models/base.py:64 exercises/templates/equipment/overview.html:71
#: exercises/templates/exercise/overview.html:76
#: exercises/templates/exercise/view.html:268
-#: exercises/templates/muscles/overview.html:73
+#: exercises/templates/muscles/overview.html:77
msgid "Secondary muscles"
msgstr "Músculs secundaris"
@@ -1568,9 +1568,9 @@ msgstr "Variacions"
msgid "Exercise Categories"
msgstr "Categories d'exercicis"
-#: exercises/models/comment.py:34 exercises/models/image.py:75
-#: exercises/models/video.py:82 manager/forms.py:165 manager/helpers.py:89
-#: manager/models/log.py:51
+#: exercises/models/comment.py:34 exercises/models/exercise_alias.py:32
+#: exercises/models/image.py:75 exercises/models/video.py:82
+#: manager/forms.py:165 manager/helpers.py:89 manager/models/log.py:51
msgid "Exercise"
msgstr "Exercici"
@@ -1596,6 +1596,12 @@ msgstr "Nou exercici proposat per un usuari"
msgid "The user {0} submitted a new exercise \"{1}\"."
msgstr "L'usuari {0} ha proposat un nou exercici «{1}»."
+#: exercises/models/exercise_alias.py:35
+#, fuzzy
+#| msgid "Correcting an exercise"
+msgid "Alias for an exercise"
+msgstr "Corregint un exercici"
+
#: exercises/models/image.py:59
msgid "Line"
msgstr "Lineal"
@@ -1655,6 +1661,16 @@ msgstr "L'usuari {0} ha proposat una nova imatge «{1}» per a l'exercici {2}."
msgid "In latin, e.g. \"Pectoralis major\""
msgstr "En llatí, p. e. «Pectoralis major»"
+#: exercises/models/muscle.py:47
+#, fuzzy
+#| msgid "exercise name"
+msgid "Alternative name"
+msgstr "nom de l'exercici"
+
+#: exercises/models/muscle.py:48
+msgid "A more basic name for the muscle"
+msgstr ""
+
#: exercises/models/video.py:41
msgid "Maximum file size is 100MB."
msgstr ""
@@ -1721,7 +1737,7 @@ msgstr "Vista general d'equipaments"
#: exercises/templates/equipment/overview.html:69
#: exercises/templates/exercise/overview.html:74
#: exercises/templates/exercise/view.html:264
-#: exercises/templates/muscles/overview.html:71
+#: exercises/templates/muscles/overview.html:75
msgid "Main muscles"
msgstr "Músculs principals"
@@ -1746,7 +1762,7 @@ msgstr "nom de l'exercici"
#: exercises/templates/equipment/overview.html:115
#: exercises/templates/exercise/overview.html:118
-#: exercises/templates/muscles/overview.html:114
+#: exercises/templates/muscles/overview.html:118
#: nutrition/templates/ingredient/overview.html:85
msgid "Only registered users can do this"
msgstr "Només els usuaris registrats poden fer això"
@@ -1941,7 +1957,7 @@ msgstr "Vista general del músculs"
msgid "Add muscle"
msgstr "Afegeix múscul"
-#: exercises/templates/muscles/overview.html:81
+#: exercises/templates/muscles/overview.html:85
msgid ""
"No exercises for this muscle. Add or edit an exercise and set the muscle."
msgstr ""
@@ -2320,7 +2336,7 @@ msgstr "Afegeix usuari al gimnàs"
msgid "Edit gym"
msgstr "Edita el gimnàs"
-#: i18n.tpl:2
+#: i18n.tpl:2 i18n.tpl:28
msgid "Abs"
msgstr ""
@@ -2332,11 +2348,11 @@ msgstr ""
msgid "Back"
msgstr ""
-#: i18n.tpl:5
+#: i18n.tpl:5 i18n.tpl:23
msgid "Calves"
msgstr ""
-#: i18n.tpl:6
+#: i18n.tpl:6 i18n.tpl:26
msgid "Chest"
msgstr ""
@@ -2344,7 +2360,7 @@ msgstr ""
msgid "Legs"
msgstr ""
-#: i18n.tpl:8
+#: i18n.tpl:8 i18n.tpl:19
msgid "Shoulders"
msgstr ""
@@ -2375,11 +2391,11 @@ msgid "Kettlebell"
msgstr ""
#: i18n.tpl:15
-msgid "none (bodyweight exercise)"
+msgid "Pull-up bar"
msgstr ""
#: i18n.tpl:16
-msgid "Pull-up bar"
+msgid "SZ-Bar"
msgstr ""
#: i18n.tpl:17
@@ -2387,99 +2403,59 @@ msgid "Swiss Ball"
msgstr ""
#: i18n.tpl:18
-msgid "SZ-Bar"
-msgstr ""
-
-#: i18n.tpl:19
-msgid "Anterior deltoid"
+msgid "none (bodyweight exercise)"
msgstr ""
#: i18n.tpl:20
-msgid "Biceps brachii"
+msgid "Biceps"
msgstr ""
#: i18n.tpl:21
-msgid "Biceps femoris"
+msgid "Hamstrings"
msgstr ""
#: i18n.tpl:22
-msgid "Brachialis"
-msgstr ""
-
-#: i18n.tpl:23
-msgid "Gastrocnemius"
+msgid "Lower back"
msgstr ""
#: i18n.tpl:24
-msgid "Gluteus maximus"
+msgid "Glutes"
msgstr ""
#: i18n.tpl:25
-msgid "Latissimus dorsi"
-msgstr ""
-
-#: i18n.tpl:26
-msgid "Obliquus externus abdominis"
+msgid "Lats"
msgstr ""
#: i18n.tpl:27
-#, fuzzy
-#| msgid "In latin, e.g. \"Pectoralis major\""
-msgid "Pectoralis major"
-msgstr "En llatí, p. e. «Pectoralis major»"
-
-#: i18n.tpl:28
-msgid "Quadriceps femoris"
+msgid "Quads"
msgstr ""
#: i18n.tpl:29
-msgid "Rectus abdominis"
+msgid "Triceps"
msgstr ""
#: i18n.tpl:30
-msgid "Serratus anterior"
-msgstr ""
-
-#: i18n.tpl:31
-msgid "Soleus"
-msgstr ""
-
-#: i18n.tpl:32
-msgid "Trapezius"
-msgstr ""
-
-#: i18n.tpl:33
-msgid "Triceps brachii"
-msgstr ""
-
-#: i18n.tpl:34
msgid "Kilometers"
msgstr ""
-#: i18n.tpl:35
-#, fuzzy
-#| msgid "Reps"
-msgid "Max Reps"
-msgstr "Repeticions"
-
-#: i18n.tpl:36
+#: i18n.tpl:31
msgid "Miles"
msgstr ""
-#: i18n.tpl:37
+#: i18n.tpl:32
msgid "Minutes"
msgstr ""
-#: i18n.tpl:38 manager/forms.py:169 manager/models/log.py:71
+#: i18n.tpl:33 manager/forms.py:169 manager/models/log.py:71
#: manager/templates/set/add.html:53
msgid "Repetitions"
msgstr "Repeticions"
-#: i18n.tpl:39
+#: i18n.tpl:34
msgid "Seconds"
msgstr ""
-#: i18n.tpl:40
+#: i18n.tpl:35
msgid "Until Failure"
msgstr ""
@@ -4033,5 +4009,15 @@ msgstr ""
msgid "Delete weight entry for the %s"
msgstr ""
+#, fuzzy
+#~| msgid "In latin, e.g. \"Pectoralis major\""
+#~ msgid "Pectoralis major"
+#~ msgstr "En llatí, p. e. «Pectoralis major»"
+
+#, fuzzy
+#~| msgid "Reps"
+#~ msgid "Max Reps"
+#~ msgstr "Repeticions"
+
#~ msgid "Your current weight is: "
#~ msgstr "El vostre pes actual es: "
diff --git a/wger/locale/cs/LC_MESSAGES/django.po b/wger/locale/cs/LC_MESSAGES/django.po
index 973f8e87a..ce231f392 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: 2022-02-15 14:51+0100\n"
+"POT-Creation-Date: 2022-05-14 12:01+0200\n"
"PO-Revision-Date: 2021-04-15 07:27+0000\n"
"Last-Translator: Zrnek <[email protected]>\n"
"Language-Team: Czech <https://hosted.weblate.org/projects/wger/web/cs/>\n"
@@ -48,7 +48,7 @@ msgstr "Cviky"
msgid "Ingredients"
msgstr "Potraviny"
-#: config/templates/language/overview.html:4 core/templates/navigation.html:228
+#: config/templates/language/overview.html:4 core/templates/navigation.html:226
msgid "Languages"
msgstr "Jazyky"
@@ -224,8 +224,8 @@ msgstr "Můj suprový tréninkový rozvrh"
msgid "Empty placeholder schedule"
msgstr "Prázdný ukázkový rozvrh"
-#: core/forms.py:61 core/templates/navigation.html:190
-#: core/templates/navigation.html:194 core/templates/user/login.html:4
+#: core/forms.py:61 core/templates/navigation.html:188
+#: core/templates/navigation.html:192 core/templates/user/login.html:4
#: software/templates/features.html:43
msgid "Login"
msgstr "Přihlášení"
@@ -304,8 +304,8 @@ msgstr "Chybné heslo"
msgid "The form is secured with reCAPTCHA"
msgstr "Zabezpečeno reCaptcha"
-#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:190
-#: core/templates/navigation.html:195 core/templates/template.html:150
+#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:188
+#: core/templates/navigation.html:193 core/templates/template.html:149
#: core/templates/user/login.html:20 core/views/user.py:293
#: software/templates/features.html:38
msgid "Register"
@@ -630,7 +630,7 @@ msgstr ""
#: core/templates/index.html:33 core/templates/index.html:73
#: core/templates/misc/fragments/shariff_modal.html:29
-#: core/templates/template.html:125 manager/templates/calendar/month.html:138
+#: core/templates/template.html:124 manager/templates/calendar/month.html:138
#: manager/templates/schedule/view.html:246
#: manager/templates/schedule/view.html:266
#: manager/templates/workout/view.html:132
@@ -766,7 +766,7 @@ msgstr "Žádný nutriční plán."
msgid "Weight"
msgstr "Váha"
-#: core/templates/index.html:210 core/templates/navigation.html:97
+#: core/templates/index.html:210 core/templates/navigation.html:135
#: weight/views.py:70
msgid "Add weight entry"
msgstr "Zaznamenat váhu"
@@ -798,8 +798,8 @@ msgstr "Seznam licencí"
msgid "Nothing found"
msgstr "Nic nenalezeno"
-#: core/templates/misc/about.html:4 core/templates/template.html:175
-#: core/templates/template_features.html:118
+#: core/templates/misc/about.html:4 core/templates/template.html:174
+#: core/templates/template_features.html:117
#: core/templates/template_no_context.html:88
msgid "Imprint"
msgstr ""
@@ -889,13 +889,13 @@ msgstr "podle nářadí"
#: exercises/templates/equipment/overview.html:113
#: exercises/templates/exercise/overview.html:112
#: exercises/templates/exercise/overview.html:116
-#: exercises/templates/muscles/overview.html:108
#: exercises/templates/muscles/overview.html:112
+#: exercises/templates/muscles/overview.html:116
msgid "Add new exercise"
msgstr "Přidat nový cvik"
-#: core/templates/navigation.html:75 core/templates/navigation.html:134
-#: core/templates/navigation.html:226
+#: core/templates/navigation.html:75 core/templates/navigation.html:116
+#: core/templates/navigation.html:224
msgid "Administration"
msgstr "Administrace"
@@ -918,106 +918,106 @@ msgstr "Svaly"
msgid "Categories"
msgstr "Kategorie"
-#: core/templates/navigation.html:94
-msgid "Body weight"
-msgstr "Tělesná hmotnost"
-
-#: core/templates/navigation.html:96 core/templates/user/overview.html:114
-#: weight/templates/overview.html:7
-msgid "Weight overview"
-msgstr "Přehled váhy"
-
-#: core/templates/navigation.html:111 software/templates/features.html:87
+#: core/templates/navigation.html:93 software/templates/features.html:87
msgid "Nutrition"
msgstr "Výživa"
-#: core/templates/navigation.html:117 core/templates/user/overview.html:144
+#: core/templates/navigation.html:99 core/templates/user/overview.html:144
msgid "Nutrition plans"
msgstr "Nutriční plány"
-#: core/templates/navigation.html:123 nutrition/templates/bmi/form.html:50
+#: core/templates/navigation.html:105 nutrition/templates/bmi/form.html:50
msgid "BMI calculator"
msgstr "Kalkulačka BMI"
-#: core/templates/navigation.html:129 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:111 nutrition/templates/rate/form.html:17
msgid "Daily calories calculator"
msgstr "Kalkulačka denních kalorii"
-#: core/templates/navigation.html:131
+#: core/templates/navigation.html:113
#: nutrition/templates/ingredient/overview.html:29
msgid "Ingredient overview"
msgstr "Přehled jídel"
-#: core/templates/navigation.html:135 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:117 nutrition/templates/units/list.html:6
msgid "Ingredient weight units"
msgstr "Jednotka váhy položek"
-#: core/templates/navigation.html:136
+#: core/templates/navigation.html:118
#: nutrition/templates/ingredient/pending.html:6
msgid "Ingredients pending review"
msgstr "Potraviny čekající na kontrolu"
-#: core/templates/navigation.html:149
+#: core/templates/navigation.html:132
+msgid "Body weight"
+msgstr "Tělesná hmotnost"
+
+#: core/templates/navigation.html:134 core/templates/user/overview.html:114
+#: weight/templates/overview.html:7
+msgid "Weight overview"
+msgstr "Přehled váhy"
+
+#: core/templates/navigation.html:147
msgid "About this software"
msgstr "O programu"
-#: core/templates/navigation.html:151 core/templates/template_features.html:83
+#: core/templates/navigation.html:149 core/templates/template_features.html:82
#: software/templates/about_us.html:5
msgid "About us"
msgstr "O nás"
-#: core/templates/navigation.html:153 software/templates/features.html:209
+#: core/templates/navigation.html:151 software/templates/features.html:209
msgid "REST API"
msgstr "REST API"
-#: core/templates/navigation.html:157 utils/models.py:40
+#: core/templates/navigation.html:155 utils/models.py:40
msgid "License"
msgstr "Licence"
-#: core/templates/navigation.html:163
+#: core/templates/navigation.html:161
msgid "Developer documentation"
msgstr "Dokumentace vývojáře"
-#: core/templates/navigation.html:169
+#: core/templates/navigation.html:167
msgid "Get the code"
msgstr "Získat kód."
-#: core/templates/navigation.html:175 core/templates/template.html:205
-#: core/templates/template_features.html:100
+#: core/templates/navigation.html:173 core/templates/template.html:204
+#: core/templates/template_features.html:99
msgid "Translate"
msgstr "Překlad"
-#: core/templates/navigation.html:196 core/templates/user/login.html:28
+#: core/templates/navigation.html:194 core/templates/user/login.html:28
msgid "Reset password"
msgstr "Reset hesla"
-#: core/templates/navigation.html:209
+#: core/templates/navigation.html:207
msgid "My preferences"
msgstr "Má nastavení"
-#: core/templates/navigation.html:216
+#: core/templates/navigation.html:214
msgid "Logout"
msgstr "Odhlásit"
-#: core/templates/navigation.html:231
+#: core/templates/navigation.html:229
msgid "Licenses"
msgstr "Licence"
-#: core/templates/navigation.html:234
+#: core/templates/navigation.html:232
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr "Opakující jednotky"
-#: core/templates/navigation.html:237 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:235 core/templates/weight_unit/list.html:4
#: nutrition/templates/ingredient/view.html:174
msgid "Weight units"
msgstr "Jednotka hmostnosti"
-#: core/templates/navigation.html:240 core/templates/user/list.html:4
+#: core/templates/navigation.html:238 core/templates/user/list.html:4
msgid "User list"
msgstr "Uživatelský seznam"
-#: core/templates/navigation.html:241
+#: core/templates/navigation.html:239
msgid "Gyms"
msgstr "Posilovny"
@@ -1100,7 +1100,7 @@ msgstr "Přidat záznam váhy"
#: core/templates/tags/render_day.html:114
#: exercises/templates/equipment/overview.html:59
#: exercises/templates/exercise/overview.html:63
-#: exercises/templates/muscles/overview.html:61
+#: exercises/templates/muscles/overview.html:65
msgid "Placeholder image for exercise"
msgstr "Ukázkový obrázek pro cvik"
@@ -1127,21 +1127,21 @@ msgstr "Opakování"
msgid "RiR"
msgstr "RiR"
-#: core/templates/template.html:140
+#: core/templates/template.html:139
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:144
+#: core/templates/template.html:143
msgid "Create some demo entries"
msgstr "Vytvořit nějaké testovací potraviny"
-#: core/templates/template.html:176 core/templates/template_features.html:122
+#: core/templates/template.html:175 core/templates/template_features.html:121
#: core/templates/template_no_context.html:89 software/templates/tos.html:7
msgid "Terms of service"
msgstr "Obecná pravidla."
-#: core/templates/template_features.html:62 software/templates/features.html:9
+#: core/templates/template_features.html:61 software/templates/features.html:9
#: software/templates/features.html:120
msgid "Features"
msgstr "Funkce"
@@ -1563,7 +1563,7 @@ msgstr "Hlavní svaly"
#: exercises/models/base.py:64 exercises/templates/equipment/overview.html:71
#: exercises/templates/exercise/overview.html:76
#: exercises/templates/exercise/view.html:268
-#: exercises/templates/muscles/overview.html:73
+#: exercises/templates/muscles/overview.html:77
msgid "Secondary muscles"
msgstr "Vedlejší svaly"
@@ -1575,9 +1575,9 @@ msgstr "Variace"
msgid "Exercise Categories"
msgstr "Kategorie cviků"
-#: exercises/models/comment.py:34 exercises/models/image.py:75
-#: exercises/models/video.py:82 manager/forms.py:165 manager/helpers.py:89
-#: manager/models/log.py:51
+#: exercises/models/comment.py:34 exercises/models/exercise_alias.py:32
+#: exercises/models/image.py:75 exercises/models/video.py:82
+#: manager/forms.py:165 manager/helpers.py:89 manager/models/log.py:51
msgid "Exercise"
msgstr "Cvik"
@@ -1603,6 +1603,12 @@ msgstr "Uživatel zaslal nový cvik"
msgid "The user {0} submitted a new exercise \"{1}\"."
msgstr "Uživatel {0} zaslal nový cvik \"{1}\"."
+#: exercises/models/exercise_alias.py:35
+#, fuzzy
+#| msgid "Correcting an exercise"
+msgid "Alias for an exercise"
+msgstr "Oprava cviku"
+
#: exercises/models/image.py:59
msgid "Line"
msgstr ""
@@ -1664,6 +1670,16 @@ msgstr "Uživatel {0} zaslal nový obrázek \"{1}\" ke cviku {2}."
msgid "In latin, e.g. \"Pectoralis major\""
msgstr "v latině, např. \"Pectoralis major\""
+#: exercises/models/muscle.py:47
+#, fuzzy
+#| msgid "exercise name"
+msgid "Alternative name"
+msgstr "jméno cviku"
+
+#: exercises/models/muscle.py:48
+msgid "A more basic name for the muscle"
+msgstr ""
+
#: exercises/models/video.py:41
msgid "Maximum file size is 100MB."
msgstr ""
@@ -1732,7 +1748,7 @@ msgstr "Přehled přístrojů"
#: exercises/templates/equipment/overview.html:69
#: exercises/templates/exercise/overview.html:74
#: exercises/templates/exercise/view.html:264
-#: exercises/templates/muscles/overview.html:71
+#: exercises/templates/muscles/overview.html:75
msgid "Main muscles"
msgstr "Hlavní svaly"
@@ -1757,7 +1773,7 @@ msgstr "jméno cviku"
#: exercises/templates/equipment/overview.html:115
#: exercises/templates/exercise/overview.html:118
-#: exercises/templates/muscles/overview.html:114
+#: exercises/templates/muscles/overview.html:118
#: nutrition/templates/ingredient/overview.html:85
msgid "Only registered users can do this"
msgstr "Tohle je jen pro registrované uživatele"
@@ -1950,7 +1966,7 @@ msgstr "Přehled svalů"
msgid "Add muscle"
msgstr "Přidat sval"
-#: exercises/templates/muscles/overview.html:81
+#: exercises/templates/muscles/overview.html:85
msgid ""
"No exercises for this muscle. Add or edit an exercise and set the muscle."
msgstr ""
@@ -2332,7 +2348,7 @@ msgstr "Přidat uživatele do posilovny"
msgid "Edit gym"
msgstr "Upravit posilovnu"
-#: i18n.tpl:2
+#: i18n.tpl:2 i18n.tpl:28
msgid "Abs"
msgstr "Břicho"
@@ -2344,11 +2360,11 @@ msgstr "Paže"
msgid "Back"
msgstr "Záda"
-#: i18n.tpl:5
+#: i18n.tpl:5 i18n.tpl:23
msgid "Calves"
msgstr "Lýtko"
-#: i18n.tpl:6
+#: i18n.tpl:6 i18n.tpl:26
msgid "Chest"
msgstr "Prsa"
@@ -2356,7 +2372,7 @@ msgstr "Prsa"
msgid "Legs"
msgstr "Nohy"
-#: i18n.tpl:8
+#: i18n.tpl:8 i18n.tpl:19
msgid "Shoulders"
msgstr "Ramena"
@@ -2385,109 +2401,77 @@ msgid "Kettlebell"
msgstr "Kettlebell"
#: i18n.tpl:15
-msgid "none (bodyweight exercise)"
-msgstr "nic (cvičení s tělesnou váhou)"
-
-#: i18n.tpl:16
msgid "Pull-up bar"
msgstr "Hrazda"
+#: i18n.tpl:16
+msgid "SZ-Bar"
+msgstr "SZ-Bar"
+
#: i18n.tpl:17
msgid "Swiss Ball"
msgstr "Gymnastický míč"
#: i18n.tpl:18
-msgid "SZ-Bar"
-msgstr "SZ-Bar"
-
-#: i18n.tpl:19
-msgid "Anterior deltoid"
-msgstr "Přední deltový sval"
+msgid "none (bodyweight exercise)"
+msgstr "nic (cvičení s tělesnou váhou)"
#: i18n.tpl:20
-msgid "Biceps brachii"
+#, fuzzy
+#| msgid "Biceps brachii"
+msgid "Biceps"
msgstr "Dvouhlasý sval pažní"
#: i18n.tpl:21
-msgid "Biceps femoris"
-msgstr "Dvouhlavý sval stehenní"
+msgid "Hamstrings"
+msgstr ""
#: i18n.tpl:22
-msgid "Brachialis"
-msgstr "Hluboký sval paže"
-
-#: i18n.tpl:23
-msgid "Gastrocnemius"
-msgstr "Lýtkový"
+msgid "Lower back"
+msgstr ""
#: i18n.tpl:24
-msgid "Gluteus maximus"
-msgstr "Velký hýžďový sval"
+#, fuzzy
+#| msgid "Minutes"
+msgid "Glutes"
+msgstr "Minuty"
#: i18n.tpl:25
-msgid "Latissimus dorsi"
-msgstr "Široký sval zádový"
-
-#: i18n.tpl:26
-msgid "Obliquus externus abdominis"
-msgstr "Vnější šikmý sval"
+msgid "Lats"
+msgstr ""
#: i18n.tpl:27
-msgid "Pectoralis major"
-msgstr "Hlavní prsní"
-
-#: i18n.tpl:28
-msgid "Quadriceps femoris"
-msgstr "Čtyřhlavý sval stehenní"
+msgid "Quads"
+msgstr ""
#: i18n.tpl:29
-msgid "Rectus abdominis"
-msgstr "Přímý sval břišní"
-
-#: i18n.tpl:30
-msgid "Serratus anterior"
-msgstr "Pilovitý sval přední"
-
-#: i18n.tpl:31
-msgid "Soleus"
-msgstr "Hluboký sval lýtka"
-
-#: i18n.tpl:32
-msgid "Trapezius"
-msgstr "Zádový sval"
-
-#: i18n.tpl:33
-msgid "Triceps brachii"
+#, fuzzy
+#| msgid "Triceps brachii"
+msgid "Triceps"
msgstr "Trojhlavý sval pažní"
-#: i18n.tpl:34
+#: i18n.tpl:30
msgid "Kilometers"
msgstr "Kilometry"
-#: i18n.tpl:35
-#, fuzzy
-#| msgid "Reps"
-msgid "Max Reps"
-msgstr "Opakování"
-
-#: i18n.tpl:36
+#: i18n.tpl:31
msgid "Miles"
msgstr "Míle"
-#: i18n.tpl:37
+#: i18n.tpl:32
msgid "Minutes"
msgstr "Minuty"
-#: i18n.tpl:38 manager/forms.py:169 manager/models/log.py:71
+#: i18n.tpl:33 manager/forms.py:169 manager/models/log.py:71
#: manager/templates/set/add.html:53
msgid "Repetitions"
msgstr "Opakování"
-#: i18n.tpl:39
+#: i18n.tpl:34
msgid "Seconds"
msgstr "Sekundy"
-#: i18n.tpl:40
+#: i18n.tpl:35
msgid "Until Failure"
msgstr "Do Selhání"
@@ -4156,6 +4140,50 @@ msgstr "Úspěšně smazáno."
msgid "Delete weight entry for the %s"
msgstr "Vymazat záznam váhy pro %s"
+#~ msgid "Anterior deltoid"
+#~ msgstr "Přední deltový sval"
+
+#~ msgid "Biceps femoris"
+#~ msgstr "Dvouhlavý sval stehenní"
+
+#~ msgid "Brachialis"
+#~ msgstr "Hluboký sval paže"
+
+#~ msgid "Gastrocnemius"
+#~ msgstr "Lýtkový"
+
+#~ msgid "Gluteus maximus"
+#~ msgstr "Velký hýžďový sval"
+
+#~ msgid "Latissimus dorsi"
+#~ msgstr "Široký sval zádový"
+
+#~ msgid "Obliquus externus abdominis"
+#~ msgstr "Vnější šikmý sval"
+
+#~ msgid "Pectoralis major"
+#~ msgstr "Hlavní prsní"
+
+#~ msgid "Quadriceps femoris"
+#~ msgstr "Čtyřhlavý sval stehenní"
+
+#~ msgid "Rectus abdominis"
+#~ msgstr "Přímý sval břišní"
+
+#~ msgid "Serratus anterior"
+#~ msgstr "Pilovitý sval přední"
+
+#~ msgid "Soleus"
+#~ msgstr "Hluboký sval lýtka"
+
+#~ msgid "Trapezius"
+#~ msgstr "Zádový sval"
+
+#, fuzzy
+#~| msgid "Reps"
+#~ msgid "Max Reps"
+#~ msgstr "Opakování"
+
#~ msgid "Your current weight is: "
#~ msgstr "Nyní vážíte:"
diff --git a/wger/locale/da/LC_MESSAGES/django.po b/wger/locale/da/LC_MESSAGES/django.po
index 36a2167ab..28fad89ba 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: 2022-02-15 14:51+0100\n"
+"POT-Creation-Date: 2022-05-14 12:01+0200\n"
"PO-Revision-Date: 2021-10-14 06:50+0000\n"
"Last-Translator: Roland Geider <[email protected]>\n"
"Language-Team: Danish <https://hosted.weblate.org/projects/wger/web/da/>\n"
@@ -43,7 +43,7 @@ msgstr "Øvelser"
msgid "Ingredients"
msgstr "Ingredienser"
-#: config/templates/language/overview.html:4 core/templates/navigation.html:228
+#: config/templates/language/overview.html:4 core/templates/navigation.html:226
msgid "Languages"
msgstr "Sprog"
@@ -219,8 +219,8 @@ msgstr "Min seje trænings-plan"
msgid "Empty placeholder schedule"
msgstr "Tom plan"
-#: core/forms.py:61 core/templates/navigation.html:190
-#: core/templates/navigation.html:194 core/templates/user/login.html:4
+#: core/forms.py:61 core/templates/navigation.html:188
+#: core/templates/navigation.html:192 core/templates/user/login.html:4
#: software/templates/features.html:43
msgid "Login"
msgstr ""
@@ -295,8 +295,8 @@ msgstr "Ukorrekt kodeord"
msgid "The form is secured with reCAPTCHA"
msgstr "Denne formular er sikret med reCAPTCHA"
-#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:190
-#: core/templates/navigation.html:195 core/templates/template.html:150
+#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:188
+#: core/templates/navigation.html:193 core/templates/template.html:149
#: core/templates/user/login.html:20 core/views/user.py:293
#: software/templates/features.html:38
msgid "Register"
@@ -598,7 +598,7 @@ msgstr ""
#: core/templates/index.html:33 core/templates/index.html:73
#: core/templates/misc/fragments/shariff_modal.html:29
-#: core/templates/template.html:125 manager/templates/calendar/month.html:138
+#: core/templates/template.html:124 manager/templates/calendar/month.html:138
#: manager/templates/schedule/view.html:246
#: manager/templates/schedule/view.html:266
#: manager/templates/workout/view.html:132
@@ -730,7 +730,7 @@ msgstr ""
msgid "Weight"
msgstr ""
-#: core/templates/index.html:210 core/templates/navigation.html:97
+#: core/templates/index.html:210 core/templates/navigation.html:135
#: weight/views.py:70
msgid "Add weight entry"
msgstr ""
@@ -762,8 +762,8 @@ msgstr ""
msgid "Nothing found"
msgstr ""
-#: core/templates/misc/about.html:4 core/templates/template.html:175
-#: core/templates/template_features.html:118
+#: core/templates/misc/about.html:4 core/templates/template.html:174
+#: core/templates/template_features.html:117
#: core/templates/template_no_context.html:88
msgid "Imprint"
msgstr ""
@@ -845,13 +845,13 @@ msgstr ""
#: exercises/templates/equipment/overview.html:113
#: exercises/templates/exercise/overview.html:112
#: exercises/templates/exercise/overview.html:116
-#: exercises/templates/muscles/overview.html:108
#: exercises/templates/muscles/overview.html:112
+#: exercises/templates/muscles/overview.html:116
msgid "Add new exercise"
msgstr ""
-#: core/templates/navigation.html:75 core/templates/navigation.html:134
-#: core/templates/navigation.html:226
+#: core/templates/navigation.html:75 core/templates/navigation.html:116
+#: core/templates/navigation.html:224
msgid "Administration"
msgstr ""
@@ -874,106 +874,106 @@ msgstr ""
msgid "Categories"
msgstr ""
-#: core/templates/navigation.html:94
-msgid "Body weight"
-msgstr ""
-
-#: core/templates/navigation.html:96 core/templates/user/overview.html:114
-#: weight/templates/overview.html:7
-msgid "Weight overview"
-msgstr ""
-
-#: core/templates/navigation.html:111 software/templates/features.html:87
+#: core/templates/navigation.html:93 software/templates/features.html:87
msgid "Nutrition"
msgstr ""
-#: core/templates/navigation.html:117 core/templates/user/overview.html:144
+#: core/templates/navigation.html:99 core/templates/user/overview.html:144
msgid "Nutrition plans"
msgstr ""
-#: core/templates/navigation.html:123 nutrition/templates/bmi/form.html:50
+#: core/templates/navigation.html:105 nutrition/templates/bmi/form.html:50
msgid "BMI calculator"
msgstr ""
-#: core/templates/navigation.html:129 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:111 nutrition/templates/rate/form.html:17
msgid "Daily calories calculator"
msgstr ""
-#: core/templates/navigation.html:131
+#: core/templates/navigation.html:113
#: nutrition/templates/ingredient/overview.html:29
msgid "Ingredient overview"
msgstr ""
-#: core/templates/navigation.html:135 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:117 nutrition/templates/units/list.html:6
msgid "Ingredient weight units"
msgstr ""
-#: core/templates/navigation.html:136
+#: core/templates/navigation.html:118
#: nutrition/templates/ingredient/pending.html:6
msgid "Ingredients pending review"
msgstr ""
-#: core/templates/navigation.html:149
+#: core/templates/navigation.html:132
+msgid "Body weight"
+msgstr ""
+
+#: core/templates/navigation.html:134 core/templates/user/overview.html:114
+#: weight/templates/overview.html:7
+msgid "Weight overview"
+msgstr ""
+
+#: core/templates/navigation.html:147
msgid "About this software"
msgstr ""
-#: core/templates/navigation.html:151 core/templates/template_features.html:83
+#: core/templates/navigation.html:149 core/templates/template_features.html:82
#: software/templates/about_us.html:5
msgid "About us"
msgstr ""
-#: core/templates/navigation.html:153 software/templates/features.html:209
+#: core/templates/navigation.html:151 software/templates/features.html:209
msgid "REST API"
msgstr ""
-#: core/templates/navigation.html:157 utils/models.py:40
+#: core/templates/navigation.html:155 utils/models.py:40
msgid "License"
msgstr ""
-#: core/templates/navigation.html:163
+#: core/templates/navigation.html:161
msgid "Developer documentation"
msgstr ""
-#: core/templates/navigation.html:169
+#: core/templates/navigation.html:167
msgid "Get the code"
msgstr ""
-#: core/templates/navigation.html:175 core/templates/template.html:205
-#: core/templates/template_features.html:100
+#: core/templates/navigation.html:173 core/templates/template.html:204
+#: core/templates/template_features.html:99
msgid "Translate"
msgstr ""
-#: core/templates/navigation.html:196 core/templates/user/login.html:28
+#: core/templates/navigation.html:194 core/templates/user/login.html:28
msgid "Reset password"
msgstr ""
-#: core/templates/navigation.html:209
+#: core/templates/navigation.html:207
msgid "My preferences"
msgstr ""
-#: core/templates/navigation.html:216
+#: core/templates/navigation.html:214
msgid "Logout"
msgstr ""
-#: core/templates/navigation.html:231
+#: core/templates/navigation.html:229
msgid "Licenses"
msgstr ""
-#: core/templates/navigation.html:234
+#: core/templates/navigation.html:232
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr ""
-#: core/templates/navigation.html:237 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:235 core/templates/weight_unit/list.html:4
#: nutrition/templates/ingredient/view.html:174
msgid "Weight units"
msgstr ""
-#: core/templates/navigation.html:240 core/templates/user/list.html:4
+#: core/templates/navigation.html:238 core/templates/user/list.html:4
msgid "User list"
msgstr ""
-#: core/templates/navigation.html:241
+#: core/templates/navigation.html:239
msgid "Gyms"
msgstr ""
@@ -1051,7 +1051,7 @@ msgstr ""
#: core/templates/tags/render_day.html:114
#: exercises/templates/equipment/overview.html:59
#: exercises/templates/exercise/overview.html:63
-#: exercises/templates/muscles/overview.html:61
+#: exercises/templates/muscles/overview.html:65
msgid "Placeholder image for exercise"
msgstr ""
@@ -1078,21 +1078,21 @@ msgstr ""
msgid "RiR"
msgstr ""
-#: core/templates/template.html:140
+#: core/templates/template.html:139
msgid ""
"You are using a guest account, data entered will be deleted after a week."
msgstr ""
-#: core/templates/template.html:144
+#: core/templates/template.html:143
msgid "Create some demo entries"
msgstr ""
-#: core/templates/template.html:176 core/templates/template_features.html:122
+#: core/templates/template.html:175 core/templates/template_features.html:121
#: core/templates/template_no_context.html:89 software/templates/tos.html:7
msgid "Terms of service"
msgstr ""
-#: core/templates/template_features.html:62 software/templates/features.html:9
+#: core/templates/template_features.html:61 software/templates/features.html:9
#: software/templates/features.html:120
msgid "Features"
msgstr ""
@@ -1502,7 +1502,7 @@ msgstr ""
#: exercises/models/base.py:64 exercises/templates/equipment/overview.html:71
#: exercises/templates/exercise/overview.html:76
#: exercises/templates/exercise/view.html:268
-#: exercises/templates/muscles/overview.html:73
+#: exercises/templates/muscles/overview.html:77
msgid "Secondary muscles"
msgstr ""
@@ -1514,9 +1514,9 @@ msgstr ""
msgid "Exercise Categories"
msgstr ""
-#: exercises/models/comment.py:34 exercises/models/image.py:75
-#: exercises/models/video.py:82 manager/forms.py:165 manager/helpers.py:89
-#: manager/models/log.py:51
+#: exercises/models/comment.py:34 exercises/models/exercise_alias.py:32
+#: exercises/models/image.py:75 exercises/models/video.py:82
+#: manager/forms.py:165 manager/helpers.py:89 manager/models/log.py:51
msgid "Exercise"
msgstr ""
@@ -1542,6 +1542,10 @@ msgstr ""
msgid "The user {0} submitted a new exercise \"{1}\"."
msgstr ""
+#: exercises/models/exercise_alias.py:35
+msgid "Alias for an exercise"
+msgstr ""
+
#: exercises/models/image.py:59
msgid "Line"
msgstr ""
@@ -1598,6 +1602,14 @@ msgstr ""
msgid "In latin, e.g. \"Pectoralis major\""
msgstr ""
+#: exercises/models/muscle.py:47
+msgid "Alternative name"
+msgstr ""
+
+#: exercises/models/muscle.py:48
+msgid "A more basic name for the muscle"
+msgstr ""
+
#: exercises/models/video.py:41
msgid "Maximum file size is 100MB."
msgstr ""
@@ -1658,7 +1670,7 @@ msgstr ""
#: exercises/templates/equipment/overview.html:69
#: exercises/templates/exercise/overview.html:74
#: exercises/templates/exercise/view.html:264
-#: exercises/templates/muscles/overview.html:71
+#: exercises/templates/muscles/overview.html:75
msgid "Main muscles"
msgstr ""
@@ -1681,7 +1693,7 @@ msgstr ""
#: exercises/templates/equipment/overview.html:115
#: exercises/templates/exercise/overview.html:118
-#: exercises/templates/muscles/overview.html:114
+#: exercises/templates/muscles/overview.html:118
#: nutrition/templates/ingredient/overview.html:85
msgid "Only registered users can do this"
msgstr ""
@@ -1860,7 +1872,7 @@ msgstr ""
msgid "Add muscle"
msgstr ""
-#: exercises/templates/muscles/overview.html:81
+#: exercises/templates/muscles/overview.html:85
msgid ""
"No exercises for this muscle. Add or edit an exercise and set the muscle."
msgstr ""
@@ -2226,7 +2238,7 @@ msgstr ""
msgid "Edit gym"
msgstr ""
-#: i18n.tpl:2
+#: i18n.tpl:2 i18n.tpl:28
msgid "Abs"
msgstr ""
@@ -2238,11 +2250,11 @@ msgstr ""
msgid "Back"
msgstr ""
-#: i18n.tpl:5
+#: i18n.tpl:5 i18n.tpl:23
msgid "Calves"
msgstr ""
-#: i18n.tpl:6
+#: i18n.tpl:6 i18n.tpl:26
msgid "Chest"
msgstr ""
@@ -2250,7 +2262,7 @@ msgstr ""
msgid "Legs"
msgstr ""
-#: i18n.tpl:8
+#: i18n.tpl:8 i18n.tpl:19
msgid "Shoulders"
msgstr ""
@@ -2279,11 +2291,11 @@ msgid "Kettlebell"
msgstr ""
#: i18n.tpl:15
-msgid "none (bodyweight exercise)"
+msgid "Pull-up bar"
msgstr ""
#: i18n.tpl:16
-msgid "Pull-up bar"
+msgid "SZ-Bar"
msgstr ""
#: i18n.tpl:17
@@ -2291,95 +2303,59 @@ msgid "Swiss Ball"
msgstr ""
#: i18n.tpl:18
-msgid "SZ-Bar"
-msgstr ""
-
-#: i18n.tpl:19
-msgid "Anterior deltoid"
+msgid "none (bodyweight exercise)"
msgstr ""
#: i18n.tpl:20
-msgid "Biceps brachii"
+msgid "Biceps"
msgstr ""
#: i18n.tpl:21
-msgid "Biceps femoris"
+msgid "Hamstrings"
msgstr ""
#: i18n.tpl:22
-msgid "Brachialis"
-msgstr ""
-
-#: i18n.tpl:23
-msgid "Gastrocnemius"
+msgid "Lower back"
msgstr ""
#: i18n.tpl:24
-msgid "Gluteus maximus"
+msgid "Glutes"
msgstr ""
#: i18n.tpl:25
-msgid "Latissimus dorsi"
-msgstr ""
-
-#: i18n.tpl:26
-msgid "Obliquus externus abdominis"
+msgid "Lats"
msgstr ""
#: i18n.tpl:27
-msgid "Pectoralis major"
-msgstr ""
-
-#: i18n.tpl:28
-msgid "Quadriceps femoris"
+msgid "Quads"
msgstr ""
#: i18n.tpl:29
-msgid "Rectus abdominis"
+msgid "Triceps"
msgstr ""
#: i18n.tpl:30
-msgid "Serratus anterior"
-msgstr ""
-
-#: i18n.tpl:31
-msgid "Soleus"
-msgstr ""
-
-#: i18n.tpl:32
-msgid "Trapezius"
-msgstr ""
-
-#: i18n.tpl:33
-msgid "Triceps brachii"
-msgstr ""
-
-#: i18n.tpl:34
msgid "Kilometers"
msgstr ""
-#: i18n.tpl:35
-msgid "Max Reps"
-msgstr ""
-
-#: i18n.tpl:36
+#: i18n.tpl:31
msgid "Miles"
msgstr ""
-#: i18n.tpl:37
+#: i18n.tpl:32
msgid "Minutes"
msgstr ""
-#: i18n.tpl:38 manager/forms.py:169 manager/models/log.py:71
+#: i18n.tpl:33 manager/forms.py:169 manager/models/log.py:71
#: manager/templates/set/add.html:53
msgid "Repetitions"
msgstr ""
-#: i18n.tpl:39
+#: i18n.tpl:34
msgid "Seconds"
msgstr ""
-#: i18n.tpl:40
+#: i18n.tpl:35
msgid "Until Failure"
msgstr ""
diff --git a/wger/locale/de/LC_MESSAGES/django.mo b/wger/locale/de/LC_MESSAGES/django.mo
index 8e1957a36..6abf7dc0d 100644
Binary files a/wger/locale/de/LC_MESSAGES/django.mo and b/wger/locale/de/LC_MESSAGES/django.mo differ
diff --git a/wger/locale/de/LC_MESSAGES/django.po b/wger/locale/de/LC_MESSAGES/django.po
index 335471f44..06d0cf8a8 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: 2022-02-15 14:51+0100\n"
+"POT-Creation-Date: 2022-05-14 12:01+0200\n"
"PO-Revision-Date: 2022-02-25 20:58+0000\n"
"Last-Translator: Roland Geider <[email protected]>\n"
"Language-Team: German <https://hosted.weblate.org/projects/wger/web/de/>\n"
@@ -45,7 +45,7 @@ msgstr "Übungen"
msgid "Ingredients"
msgstr "Zutaten"
-#: config/templates/language/overview.html:4 core/templates/navigation.html:228
+#: config/templates/language/overview.html:4 core/templates/navigation.html:226
msgid "Languages"
msgstr "Sprachen"
@@ -222,8 +222,8 @@ msgstr "Mein cooler Zeitplan"
msgid "Empty placeholder schedule"
msgstr "Leerer Platzhalter Zeitplan"
-#: core/forms.py:61 core/templates/navigation.html:190
-#: core/templates/navigation.html:194 core/templates/user/login.html:4
+#: core/forms.py:61 core/templates/navigation.html:188
+#: core/templates/navigation.html:192 core/templates/user/login.html:4
#: software/templates/features.html:43
msgid "Login"
msgstr "Anmelden"
@@ -300,8 +300,8 @@ msgstr "Ungültiges Passwort"
msgid "The form is secured with reCAPTCHA"
msgstr "Das Formular ist mit reCaptcha gesichert"
-#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:190
-#: core/templates/navigation.html:195 core/templates/template.html:150
+#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:188
+#: core/templates/navigation.html:193 core/templates/template.html:149
#: core/templates/user/login.html:20 core/views/user.py:293
#: software/templates/features.html:38
msgid "Register"
@@ -628,7 +628,7 @@ msgstr ""
#: core/templates/index.html:33 core/templates/index.html:73
#: core/templates/misc/fragments/shariff_modal.html:29
-#: core/templates/template.html:125 manager/templates/calendar/month.html:138
+#: core/templates/template.html:124 manager/templates/calendar/month.html:138
#: manager/templates/schedule/view.html:246
#: manager/templates/schedule/view.html:266
#: manager/templates/workout/view.html:132
@@ -766,7 +766,7 @@ msgstr "Keine Ernährungspläne."
msgid "Weight"
msgstr "Gewicht"
-#: core/templates/index.html:210 core/templates/navigation.html:97
+#: core/templates/index.html:210 core/templates/navigation.html:135
#: weight/views.py:70
msgid "Add weight entry"
msgstr "Gewichtseintrag hinzufügen"
@@ -798,8 +798,8 @@ msgstr "Lizenzliste"
msgid "Nothing found"
msgstr "Nichts gefunden"
-#: core/templates/misc/about.html:4 core/templates/template.html:175
-#: core/templates/template_features.html:118
+#: core/templates/misc/about.html:4 core/templates/template.html:174
+#: core/templates/template_features.html:117
#: core/templates/template_no_context.html:88
msgid "Imprint"
msgstr "Impressum"
@@ -885,13 +885,13 @@ msgstr "nach Ausrüstung"
#: exercises/templates/equipment/overview.html:113
#: exercises/templates/exercise/overview.html:112
#: exercises/templates/exercise/overview.html:116
-#: exercises/templates/muscles/overview.html:108
#: exercises/templates/muscles/overview.html:112
+#: exercises/templates/muscles/overview.html:116
msgid "Add new exercise"
msgstr "Neue Übung hinzufügen"
-#: core/templates/navigation.html:75 core/templates/navigation.html:134
-#: core/templates/navigation.html:226
+#: core/templates/navigation.html:75 core/templates/navigation.html:116
+#: core/templates/navigation.html:224
msgid "Administration"
msgstr "Administration"
@@ -914,106 +914,106 @@ msgstr "Muskeln"
msgid "Categories"
msgstr "Kategorien"
-#: core/templates/navigation.html:94
-msgid "Body weight"
-msgstr "Körpergewicht"
-
-#: core/templates/navigation.html:96 core/templates/user/overview.html:114
-#: weight/templates/overview.html:7
-msgid "Weight overview"
-msgstr "Gewichtsübersicht"
-
-#: core/templates/navigation.html:111 software/templates/features.html:87
+#: core/templates/navigation.html:93 software/templates/features.html:87
msgid "Nutrition"
msgstr "Ernährung"
-#: core/templates/navigation.html:117 core/templates/user/overview.html:144
+#: core/templates/navigation.html:99 core/templates/user/overview.html:144
msgid "Nutrition plans"
msgstr "Ernährungspläne"
-#: core/templates/navigation.html:123 nutrition/templates/bmi/form.html:50
+#: core/templates/navigation.html:105 nutrition/templates/bmi/form.html:50
msgid "BMI calculator"
msgstr "BMI-Rechner"
-#: core/templates/navigation.html:129 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:111 nutrition/templates/rate/form.html:17
msgid "Daily calories calculator"
msgstr "Kalorienrechner"
-#: core/templates/navigation.html:131
+#: core/templates/navigation.html:113
#: nutrition/templates/ingredient/overview.html:29
msgid "Ingredient overview"
msgstr "Zutatenübersicht"
-#: core/templates/navigation.html:135 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:117 nutrition/templates/units/list.html:6
msgid "Ingredient weight units"
msgstr "Gewichtseinheiten für Zutaten"
-#: core/templates/navigation.html:136
+#: core/templates/navigation.html:118
#: nutrition/templates/ingredient/pending.html:6
msgid "Ingredients pending review"
msgstr "Zutaten ohne Freigabe"
-#: core/templates/navigation.html:149
+#: core/templates/navigation.html:132
+msgid "Body weight"
+msgstr "Körpergewicht"
+
+#: core/templates/navigation.html:134 core/templates/user/overview.html:114
+#: weight/templates/overview.html:7
+msgid "Weight overview"
+msgstr "Gewichtsübersicht"
+
+#: core/templates/navigation.html:147
msgid "About this software"
msgstr "Über diese Software"
-#: core/templates/navigation.html:151 core/templates/template_features.html:83
+#: core/templates/navigation.html:149 core/templates/template_features.html:82
#: software/templates/about_us.html:5
msgid "About us"
msgstr "Über uns"
-#: core/templates/navigation.html:153 software/templates/features.html:209
+#: core/templates/navigation.html:151 software/templates/features.html:209
msgid "REST API"
msgstr "REST API"
-#: core/templates/navigation.html:157 utils/models.py:40
+#: core/templates/navigation.html:155 utils/models.py:40
msgid "License"
msgstr "Lizenz"
-#: core/templates/navigation.html:163
+#: core/templates/navigation.html:161
msgid "Developer documentation"
msgstr "Entwickler-Dokumentation"
-#: core/templates/navigation.html:169
+#: core/templates/navigation.html:167
msgid "Get the code"
msgstr "Quellcode"
-#: core/templates/navigation.html:175 core/templates/template.html:205
-#: core/templates/template_features.html:100
+#: core/templates/navigation.html:173 core/templates/template.html:204
+#: core/templates/template_features.html:99
msgid "Translate"
msgstr "Übersetze"
-#: core/templates/navigation.html:196 core/templates/user/login.html:28
+#: core/templates/navigation.html:194 core/templates/user/login.html:28
msgid "Reset password"
msgstr "Passwort zurücketzen"
-#: core/templates/navigation.html:209
+#: core/templates/navigation.html:207
msgid "My preferences"
msgstr "Meine Einstellungen"
-#: core/templates/navigation.html:216
+#: core/templates/navigation.html:214
msgid "Logout"
msgstr "Abmelden"
-#: core/templates/navigation.html:231
+#: core/templates/navigation.html:229
msgid "Licenses"
msgstr "Lizenzen"
-#: core/templates/navigation.html:234
+#: core/templates/navigation.html:232
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr "Wiederholungs-Einheiten"
-#: core/templates/navigation.html:237 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:235 core/templates/weight_unit/list.html:4
#: nutrition/templates/ingredient/view.html:174
msgid "Weight units"
msgstr "Gewichtseinheiten"
-#: core/templates/navigation.html:240 core/templates/user/list.html:4
+#: core/templates/navigation.html:238 core/templates/user/list.html:4
msgid "User list"
msgstr "Benutzerliste"
-#: core/templates/navigation.html:241
+#: core/templates/navigation.html:239
msgid "Gyms"
msgstr "Studios"
@@ -1095,7 +1095,7 @@ msgstr "Gewichtslog hinzufügen"
#: core/templates/tags/render_day.html:114
#: exercises/templates/equipment/overview.html:59
#: exercises/templates/exercise/overview.html:63
-#: exercises/templates/muscles/overview.html:61
+#: exercises/templates/muscles/overview.html:65
msgid "Placeholder image for exercise"
msgstr "Platzhalter-Bild für Übung"
@@ -1122,23 +1122,23 @@ msgstr "Wdh."
msgid "RiR"
msgstr "RiR"
-#: core/templates/template.html:140
+#: core/templates/template.html:139
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:144
+#: core/templates/template.html:143
msgid "Create some demo entries"
msgstr "Beispieldaten erstellen"
-#: core/templates/template.html:176 core/templates/template_features.html:122
+#: core/templates/template.html:175 core/templates/template_features.html:121
#: core/templates/template_no_context.html:89 software/templates/tos.html:7
msgid "Terms of service"
msgstr "Allgemeine Nutzungsbedingungen"
-#: core/templates/template_features.html:62 software/templates/features.html:9
+#: core/templates/template_features.html:61 software/templates/features.html:9
#: software/templates/features.html:120
msgid "Features"
msgstr "Funktionen"
@@ -1561,7 +1561,7 @@ msgstr "Primärmuskeln"
#: exercises/models/base.py:64 exercises/templates/equipment/overview.html:71
#: exercises/templates/exercise/overview.html:76
#: exercises/templates/exercise/view.html:268
-#: exercises/templates/muscles/overview.html:73
+#: exercises/templates/muscles/overview.html:77
msgid "Secondary muscles"
msgstr "Sekundärmuskeln"
@@ -1573,9 +1573,9 @@ msgstr "Variationen"
msgid "Exercise Categories"
msgstr "Kategorie Übung"
-#: exercises/models/comment.py:34 exercises/models/image.py:75
-#: exercises/models/video.py:82 manager/forms.py:165 manager/helpers.py:89
-#: manager/models/log.py:51
+#: exercises/models/comment.py:34 exercises/models/exercise_alias.py:32
+#: exercises/models/image.py:75 exercises/models/video.py:82
+#: manager/forms.py:165 manager/helpers.py:89 manager/models/log.py:51
msgid "Exercise"
msgstr "Übung"
@@ -1601,6 +1601,12 @@ msgstr "Neue eingereichte Übung"
msgid "The user {0} submitted a new exercise \"{1}\"."
msgstr "Der Benutzer {0} hat die Übung „{1}“ eingereicht."
+#: exercises/models/exercise_alias.py:35
+#, fuzzy
+#| msgid "Correcting an exercise"
+msgid "Alias for an exercise"
+msgstr "Eine Übung korrigieren"
+
#: exercises/models/image.py:59
msgid "Line"
msgstr "Linie"
@@ -1664,6 +1670,16 @@ msgstr ""
msgid "In latin, e.g. \"Pectoralis major\""
msgstr "Auf latein, z.B. „Pectoralis major“"
+#: exercises/models/muscle.py:47
+#, fuzzy
+#| msgid "exercise name"
+msgid "Alternative name"
+msgstr "Übung"
+
+#: exercises/models/muscle.py:48
+msgid "A more basic name for the muscle"
+msgstr ""
+
#: exercises/models/video.py:41
msgid "Maximum file size is 100MB."
msgstr "Die maximale Dateigröße beträgt 100 MB."
@@ -1732,7 +1748,7 @@ msgstr "Geräteübersicht"
#: exercises/templates/equipment/overview.html:69
#: exercises/templates/exercise/overview.html:74
#: exercises/templates/exercise/view.html:264
-#: exercises/templates/muscles/overview.html:71
+#: exercises/templates/muscles/overview.html:75
msgid "Main muscles"
msgstr "Hauptmuskeln"
@@ -1757,7 +1773,7 @@ msgstr "Übung"
#: exercises/templates/equipment/overview.html:115
#: exercises/templates/exercise/overview.html:118
-#: exercises/templates/muscles/overview.html:114
+#: exercises/templates/muscles/overview.html:118
#: nutrition/templates/ingredient/overview.html:85
msgid "Only registered users can do this"
msgstr "Nur registrierte Benutzer dürfen das"
@@ -1953,7 +1969,7 @@ msgstr "Muskelübersicht"
msgid "Add muscle"
msgstr "Muskel hinzufügen"
-#: exercises/templates/muscles/overview.html:81
+#: exercises/templates/muscles/overview.html:85
msgid ""
"No exercises for this muscle. Add or edit an exercise and set the muscle."
msgstr ""
@@ -2335,7 +2351,7 @@ msgstr "Benutzer zu Studio hinzufügen"
msgid "Edit gym"
msgstr "Studio bearbeiten"
-#: i18n.tpl:2
+#: i18n.tpl:2 i18n.tpl:28
msgid "Abs"
msgstr "Bauch"
@@ -2347,11 +2363,11 @@ msgstr "Arme"
msgid "Back"
msgstr "Rücken"
-#: i18n.tpl:5
+#: i18n.tpl:5 i18n.tpl:23
msgid "Calves"
msgstr "Waden"
-#: i18n.tpl:6
+#: i18n.tpl:6 i18n.tpl:26
msgid "Chest"
msgstr "Brust"
@@ -2359,7 +2375,7 @@ msgstr "Brust"
msgid "Legs"
msgstr "Beine"
-#: i18n.tpl:8
+#: i18n.tpl:8 i18n.tpl:19
msgid "Shoulders"
msgstr "Schultern"
@@ -2388,107 +2404,77 @@ msgid "Kettlebell"
msgstr "Kugelhantel"
#: i18n.tpl:15
-msgid "none (bodyweight exercise)"
-msgstr "keine (Körpergewichtübung)"
-
-#: i18n.tpl:16
msgid "Pull-up bar"
msgstr "Klimmzugstange"
+#: i18n.tpl:16
+msgid "SZ-Bar"
+msgstr "ß-Stange"
+
#: i18n.tpl:17
msgid "Swiss Ball"
msgstr "Swissball"
#: i18n.tpl:18
-msgid "SZ-Bar"
-msgstr "ß-Stange"
-
-#: i18n.tpl:19
-msgid "Anterior deltoid"
-msgstr "Anterior deltoid"
+msgid "none (bodyweight exercise)"
+msgstr "keine (Körpergewichtübung)"
#: i18n.tpl:20
-msgid "Biceps brachii"
+#, fuzzy
+#| msgid "Biceps brachii"
+msgid "Biceps"
msgstr "Armbeuger"
#: i18n.tpl:21
-msgid "Biceps femoris"
-msgstr "Beinbeuger"
+msgid "Hamstrings"
+msgstr ""
#: i18n.tpl:22
-msgid "Brachialis"
-msgstr "Oberarmmuskel"
-
-#: i18n.tpl:23
-msgid "Gastrocnemius"
-msgstr "Waden"
+msgid "Lower back"
+msgstr ""
#: i18n.tpl:24
-msgid "Gluteus maximus"
-msgstr "Po"
+#, fuzzy
+#| msgid "Minutes"
+msgid "Glutes"
+msgstr "Minuten"
#: i18n.tpl:25
-msgid "Latissimus dorsi"
-msgstr "breiter Rückenmuskel"
-
-#: i18n.tpl:26
-msgid "Obliquus externus abdominis"
-msgstr "schräger Bauchmuske"
+msgid "Lats"
+msgstr ""
#: i18n.tpl:27
-msgid "Pectoralis major"
-msgstr "Brustmuskel"
-
-#: i18n.tpl:28
-msgid "Quadriceps femoris"
-msgstr "Oberschenkelstrecker"
+msgid "Quads"
+msgstr ""
#: i18n.tpl:29
-msgid "Rectus abdominis"
-msgstr "Bauchmuskel"
-
-#: i18n.tpl:30
-msgid "Serratus anterior"
-msgstr "Serratus anterior"
-
-#: i18n.tpl:31
-msgid "Soleus"
-msgstr "Soleus"
-
-#: i18n.tpl:32
-msgid "Trapezius"
-msgstr "Trapezius"
-
-#: i18n.tpl:33
-msgid "Triceps brachii"
+#, fuzzy
+#| msgid "Triceps brachii"
+msgid "Triceps"
msgstr "Armstrecker"
-#: i18n.tpl:34
+#: i18n.tpl:30
msgid "Kilometers"
msgstr "Kilometer"
-#: i18n.tpl:35
-msgid "Max Reps"
-msgstr "Max. Wdh."
-
-#: i18n.tpl:36
+#: i18n.tpl:31
msgid "Miles"
msgstr "Meilen"
-#: i18n.tpl:37
+#: i18n.tpl:32
msgid "Minutes"
msgstr "Minuten"
-#: i18n.tpl:38 manager/forms.py:169 manager/models/log.py:71
+#: i18n.tpl:33 manager/forms.py:169 manager/models/log.py:71
#: manager/templates/set/add.html:53
msgid "Repetitions"
msgstr "Wiederholungen"
-#: i18n.tpl:39
+#: i18n.tpl:34
msgid "Seconds"
msgstr "Sekunden"
-#: i18n.tpl:40
+#: i18n.tpl:35
msgid "Until Failure"
msgstr "Bis zum Muskelversagen"
@@ -4179,6 +4165,48 @@ msgstr "Erfolgreich gelöscht."
msgid "Delete weight entry for the %s"
msgstr "Gewichtseintrag für den %s löschen"
+#~ msgid "Anterior deltoid"
+#~ msgstr "Anterior deltoid"
+
+#~ msgid "Biceps femoris"
+#~ msgstr "Beinbeuger"
+
+#~ msgid "Brachialis"
+#~ msgstr "Oberarmmuskel"
+
+#~ msgid "Gastrocnemius"
+#~ msgstr "Waden"
+
+#~ msgid "Gluteus maximus"
+#~ msgstr "Po"
+
+#~ msgid "Latissimus dorsi"
+#~ msgstr "breiter Rückenmuskel"
+
+#~ msgid "Obliquus externus abdominis"
+#~ msgstr "schräger Bauchmuske"
+
+#~ msgid "Pectoralis major"
+#~ msgstr "Brustmuskel"
+
+#~ msgid "Quadriceps femoris"
+#~ msgstr "Oberschenkelstrecker"
+
+#~ msgid "Rectus abdominis"
+#~ msgstr "Bauchmuskel"
+
+#~ msgid "Serratus anterior"
+#~ msgstr "Serratus anterior"
+
+#~ msgid "Soleus"
+#~ msgstr "Soleus"
+
+#~ msgid "Trapezius"
+#~ msgstr "Trapezius"
+
+#~ msgid "Max Reps"
+#~ msgstr "Max. Wdh."
+
#~ msgid "Your current weight is: "
#~ msgstr "Dein aktuelles Gewicht ist: "
diff --git a/wger/locale/el/LC_MESSAGES/django.po b/wger/locale/el/LC_MESSAGES/django.po
index adbfb3ccf..b8624f748 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: 2022-02-15 14:51+0100\n"
+"POT-Creation-Date: 2022-05-14 12:01+0200\n"
"PO-Revision-Date: 2021-04-17 13:26+0000\n"
"Last-Translator: Eugenia Russell <[email protected]>\n"
"Language-Team: Greek <https://hosted.weblate.org/projects/wger/web/el/>\n"
@@ -44,7 +44,7 @@ msgstr "Ασκήσεις"
msgid "Ingredients"
msgstr "Συστατικά"
-#: config/templates/language/overview.html:4 core/templates/navigation.html:228
+#: config/templates/language/overview.html:4 core/templates/navigation.html:226
msgid "Languages"
msgstr "Γλώσσες"
@@ -221,8 +221,8 @@ msgstr "Το τέλειο πρόγραμμα γυμναστικής μου"
msgid "Empty placeholder schedule"
msgstr "Άδειο placeholder ημερολογίου"
-#: core/forms.py:61 core/templates/navigation.html:190
-#: core/templates/navigation.html:194 core/templates/user/login.html:4
+#: core/forms.py:61 core/templates/navigation.html:188
+#: core/templates/navigation.html:192 core/templates/user/login.html:4
#: software/templates/features.html:43
msgid "Login"
msgstr "Σύνδεση"
@@ -303,8 +303,8 @@ msgstr "Λάθος κωδικός"
msgid "The form is secured with reCAPTCHA"
msgstr ""
-#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:190
-#: core/templates/navigation.html:195 core/templates/template.html:150
+#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:188
+#: core/templates/navigation.html:193 core/templates/template.html:149
#: core/templates/user/login.html:20 core/views/user.py:293
#: software/templates/features.html:38
msgid "Register"
@@ -620,7 +620,7 @@ msgstr ""
#: core/templates/index.html:33 core/templates/index.html:73
#: core/templates/misc/fragments/shariff_modal.html:29
-#: core/templates/template.html:125 manager/templates/calendar/month.html:138
+#: core/templates/template.html:124 manager/templates/calendar/month.html:138
#: manager/templates/schedule/view.html:246
#: manager/templates/schedule/view.html:266
#: manager/templates/workout/view.html:132
@@ -752,7 +752,7 @@ msgstr "Κανένα πρόγραμμα διατροφής."
msgid "Weight"
msgstr "Βάρος"
-#: core/templates/index.html:210 core/templates/navigation.html:97
+#: core/templates/index.html:210 core/templates/navigation.html:135
#: weight/views.py:70
msgid "Add weight entry"
msgstr "Νέα εγγραφή βάρους"
@@ -784,8 +784,8 @@ msgstr "Λίστα αδειών"
msgid "Nothing found"
msgstr "Δεν βρέθηκε τίποτα"
-#: core/templates/misc/about.html:4 core/templates/template.html:175
-#: core/templates/template_features.html:118
+#: core/templates/misc/about.html:4 core/templates/template.html:174
+#: core/templates/template_features.html:117
#: core/templates/template_no_context.html:88
msgid "Imprint"
msgstr ""
@@ -871,13 +871,13 @@ msgstr ""
#: exercises/templates/equipment/overview.html:113
#: exercises/templates/exercise/overview.html:112
#: exercises/templates/exercise/overview.html:116
-#: exercises/templates/muscles/overview.html:108
#: exercises/templates/muscles/overview.html:112
+#: exercises/templates/muscles/overview.html:116
msgid "Add new exercise"
msgstr "Νέα άσκηση"
-#: core/templates/navigation.html:75 core/templates/navigation.html:134
-#: core/templates/navigation.html:226
+#: core/templates/navigation.html:75 core/templates/navigation.html:116
+#: core/templates/navigation.html:224
msgid "Administration"
msgstr "Διαχείριση"
@@ -900,106 +900,106 @@ msgstr "Μύες"
msgid "Categories"
msgstr "Κατηγορίες"
-#: core/templates/navigation.html:94
-msgid "Body weight"
-msgstr ""
-
-#: core/templates/navigation.html:96 core/templates/user/overview.html:114
-#: weight/templates/overview.html:7
-msgid "Weight overview"
-msgstr "Επισκόπηση βάρους"
-
-#: core/templates/navigation.html:111 software/templates/features.html:87
+#: core/templates/navigation.html:93 software/templates/features.html:87
msgid "Nutrition"
msgstr "Διατροφή"
-#: core/templates/navigation.html:117 core/templates/user/overview.html:144
+#: core/templates/navigation.html:99 core/templates/user/overview.html:144
msgid "Nutrition plans"
msgstr "Προγράμματα διατροφής"
-#: core/templates/navigation.html:123 nutrition/templates/bmi/form.html:50
+#: core/templates/navigation.html:105 nutrition/templates/bmi/form.html:50
msgid "BMI calculator"
msgstr "Υπολογιστής BMI"
-#: core/templates/navigation.html:129 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:111 nutrition/templates/rate/form.html:17
msgid "Daily calories calculator"
msgstr "Υπολογιστής ημερήσιων θερμίδων"
-#: core/templates/navigation.html:131
+#: core/templates/navigation.html:113
#: nutrition/templates/ingredient/overview.html:29
msgid "Ingredient overview"
msgstr "Επισκόπηση συστατικών"
-#: core/templates/navigation.html:135 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:117 nutrition/templates/units/list.html:6
msgid "Ingredient weight units"
msgstr "Μονάδες βάρους συστατικών"
-#: core/templates/navigation.html:136
+#: core/templates/navigation.html:118
#: nutrition/templates/ingredient/pending.html:6
msgid "Ingredients pending review"
msgstr "Συστατικά που αναμένουν εξέταση"
-#: core/templates/navigation.html:149
+#: core/templates/navigation.html:132
+msgid "Body weight"
+msgstr ""
+
+#: core/templates/navigation.html:134 core/templates/user/overview.html:114
+#: weight/templates/overview.html:7
+msgid "Weight overview"
+msgstr "Επισκόπηση βάρους"
+
+#: core/templates/navigation.html:147
msgid "About this software"
msgstr "Σχετικά"
-#: core/templates/navigation.html:151 core/templates/template_features.html:83
+#: core/templates/navigation.html:149 core/templates/template_features.html:82
#: software/templates/about_us.html:5
msgid "About us"
msgstr "Σχετικά με μας"
-#: core/templates/navigation.html:153 software/templates/features.html:209
+#: core/templates/navigation.html:151 software/templates/features.html:209
msgid "REST API"
msgstr "REST API"
-#: core/templates/navigation.html:157 utils/models.py:40
+#: core/templates/navigation.html:155 utils/models.py:40
msgid "License"
msgstr "Άδεια"
-#: core/templates/navigation.html:163
+#: core/templates/navigation.html:161
msgid "Developer documentation"
msgstr ""
-#: core/templates/navigation.html:169
+#: core/templates/navigation.html:167
msgid "Get the code"
msgstr "Κατεβάστε τον κώδικα"
-#: core/templates/navigation.html:175 core/templates/template.html:205
-#: core/templates/template_features.html:100
+#: core/templates/navigation.html:173 core/templates/template.html:204
+#: core/templates/template_features.html:99
msgid "Translate"
msgstr "Μετάφραση"
-#: core/templates/navigation.html:196 core/templates/user/login.html:28
+#: core/templates/navigation.html:194 core/templates/user/login.html:28
msgid "Reset password"
msgstr "Αλλαγή κωδικού"
-#: core/templates/navigation.html:209
+#: core/templates/navigation.html:207
msgid "My preferences"
msgstr "Οι προτιμήσεις μου"
-#: core/templates/navigation.html:216
+#: core/templates/navigation.html:214
msgid "Logout"
msgstr "Έξοδος"
-#: core/templates/navigation.html:231
+#: core/templates/navigation.html:229
msgid "Licenses"
msgstr "Άδειες"
-#: core/templates/navigation.html:234
+#: core/templates/navigation.html:232
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr ""
-#: core/templates/navigation.html:237 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:235 core/templates/weight_unit/list.html:4
#: nutrition/templates/ingredient/view.html:174
msgid "Weight units"
msgstr "Μονάδες βάρους"
-#: core/templates/navigation.html:240 core/templates/user/list.html:4
+#: core/templates/navigation.html:238 core/templates/user/list.html:4
msgid "User list"
msgstr ""
-#: core/templates/navigation.html:241
+#: core/templates/navigation.html:239
msgid "Gyms"
msgstr "Γυμναστήρια"
@@ -1085,7 +1085,7 @@ msgstr ""
#: core/templates/tags/render_day.html:114
#: exercises/templates/equipment/overview.html:59
#: exercises/templates/exercise/overview.html:63
-#: exercises/templates/muscles/overview.html:61
+#: exercises/templates/muscles/overview.html:65
msgid "Placeholder image for exercise"
msgstr "Εικονίδιο placeholder για άσκηση"
@@ -1112,23 +1112,23 @@ msgstr "Επαναλήψεις"
msgid "RiR"
msgstr ""
-#: core/templates/template.html:140
+#: core/templates/template.html:139
msgid ""
"You are using a guest account, data entered will be deleted after a week."
msgstr ""
"Χρησιμοποιείτε έναν λογαριασμό επισκέπτη. Τα δεδομένα που εισάγετε θα "
"διαγραφούν σε μία εβδομάδα."
-#: core/templates/template.html:144
+#: core/templates/template.html:143
msgid "Create some demo entries"
msgstr "Δημιουργήστε μερικές δοκιμαστικές εγγραφές"
-#: core/templates/template.html:176 core/templates/template_features.html:122
+#: core/templates/template.html:175 core/templates/template_features.html:121
#: core/templates/template_no_context.html:89 software/templates/tos.html:7
msgid "Terms of service"
msgstr ""
-#: core/templates/template_features.html:62 software/templates/features.html:9
+#: core/templates/template_features.html:61 software/templates/features.html:9
#: software/templates/features.html:120
msgid "Features"
msgstr "Δυνατότητες"
@@ -1552,7 +1552,7 @@ msgstr "Κύριοι μύς"
#: exercises/models/base.py:64 exercises/templates/equipment/overview.html:71
#: exercises/templates/exercise/overview.html:76
#: exercises/templates/exercise/view.html:268
-#: exercises/templates/muscles/overview.html:73
+#: exercises/templates/muscles/overview.html:77
msgid "Secondary muscles"
msgstr "Δευτερεύοντες μύς"
@@ -1564,9 +1564,9 @@ msgstr ""
msgid "Exercise Categories"
msgstr "Κατηγορίες ασκήσεων"
-#: exercises/models/comment.py:34 exercises/models/image.py:75
-#: exercises/models/video.py:82 manager/forms.py:165 manager/helpers.py:89
-#: manager/models/log.py:51
+#: exercises/models/comment.py:34 exercises/models/exercise_alias.py:32
+#: exercises/models/image.py:75 exercises/models/video.py:82
+#: manager/forms.py:165 manager/helpers.py:89 manager/models/log.py:51
msgid "Exercise"
msgstr "Άσκηση"
@@ -1592,6 +1592,12 @@ msgstr "Ένας νέος χρήστης πρόσθεσε μια άσκηση"
msgid "The user {0} submitted a new exercise \"{1}\"."
msgstr "Ο χρήστης {0} πρόσθεσε μια νέα άσκηση \"{1}\"."
+#: exercises/models/exercise_alias.py:35
+#, fuzzy
+#| msgid "Add new exercise"
+msgid "Alias for an exercise"
+msgstr "Νέα άσκηση"
+
#: exercises/models/image.py:59
msgid "Line"
msgstr ""
@@ -1653,6 +1659,16 @@ msgstr "Ο χρήστης {0} υπέβαλλε μιά νέα εικόνα \"{1}\
msgid "In latin, e.g. \"Pectoralis major\""
msgstr "Στα λατινικά, π.χ. \"Pectoralis major\""
+#: exercises/models/muscle.py:47
+#, fuzzy
+#| msgid "exercise name"
+msgid "Alternative name"
+msgstr "ονομασία άσκησης"
+
+#: exercises/models/muscle.py:48
+msgid "A more basic name for the muscle"
+msgstr ""
+
#: exercises/models/video.py:41
msgid "Maximum file size is 100MB."
msgstr ""
@@ -1719,7 +1735,7 @@ msgstr "Επισκόπηση οργάνων"
#: exercises/templates/equipment/overview.html:69
#: exercises/templates/exercise/overview.html:74
#: exercises/templates/exercise/view.html:264
-#: exercises/templates/muscles/overview.html:71
+#: exercises/templates/muscles/overview.html:75
msgid "Main muscles"
msgstr "Κύριοι μύες"
@@ -1744,7 +1760,7 @@ msgstr "ονομασία άσκησης"
#: exercises/templates/equipment/overview.html:115
#: exercises/templates/exercise/overview.html:118
-#: exercises/templates/muscles/overview.html:114
+#: exercises/templates/muscles/overview.html:118
#: nutrition/templates/ingredient/overview.html:85
msgid "Only registered users can do this"
msgstr "Μόνο εγγεγραμμένοι χρήστες μπορούν να το κάνουν αυτό"
@@ -1937,7 +1953,7 @@ msgstr "Επισκόπηση μυών"
msgid "Add muscle"
msgstr "Νέος μύς"
-#: exercises/templates/muscles/overview.html:81
+#: exercises/templates/muscles/overview.html:85
msgid ""
"No exercises for this muscle. Add or edit an exercise and set the muscle."
msgstr ""
@@ -2315,7 +2331,7 @@ msgstr "Προσθήκη χρήστη στο γυμναστήριο"
msgid "Edit gym"
msgstr "Επεξεργασία γυμναστηρίου"
-#: i18n.tpl:2
+#: i18n.tpl:2 i18n.tpl:28
msgid "Abs"
msgstr "Κοιλιακοί"
@@ -2327,11 +2343,11 @@ msgstr "Χέρια"
msgid "Back"
msgstr "Πλάτη"
-#: i18n.tpl:5
+#: i18n.tpl:5 i18n.tpl:23
msgid "Calves"
msgstr "Μηροί"
-#: i18n.tpl:6
+#: i18n.tpl:6 i18n.tpl:26
msgid "Chest"
msgstr "Στήθος"
@@ -2339,7 +2355,7 @@ msgstr "Στήθος"
msgid "Legs"
msgstr "Πόδια"
-#: i18n.tpl:8
+#: i18n.tpl:8 i18n.tpl:19
msgid "Shoulders"
msgstr "Ώμοι"
@@ -2368,11 +2384,11 @@ msgid "Kettlebell"
msgstr ""
#: i18n.tpl:15
-msgid "none (bodyweight exercise)"
-msgstr "κανένα (άσκηση με το βάρος σώματος)"
+msgid "Pull-up bar"
+msgstr ""
#: i18n.tpl:16
-msgid "Pull-up bar"
+msgid "SZ-Bar"
msgstr ""
#: i18n.tpl:17
@@ -2380,97 +2396,59 @@ msgid "Swiss Ball"
msgstr ""
#: i18n.tpl:18
-msgid "SZ-Bar"
-msgstr ""
-
-#: i18n.tpl:19
-msgid "Anterior deltoid"
-msgstr ""
+msgid "none (bodyweight exercise)"
+msgstr "κανένα (άσκηση με το βάρος σώματος)"
#: i18n.tpl:20
-msgid "Biceps brachii"
+msgid "Biceps"
msgstr ""
#: i18n.tpl:21
-msgid "Biceps femoris"
+msgid "Hamstrings"
msgstr ""
#: i18n.tpl:22
-msgid "Brachialis"
-msgstr ""
-
-#: i18n.tpl:23
-msgid "Gastrocnemius"
+msgid "Lower back"
msgstr ""
#: i18n.tpl:24
-msgid "Gluteus maximus"
+msgid "Glutes"
msgstr ""
#: i18n.tpl:25
-msgid "Latissimus dorsi"
-msgstr ""
-
-#: i18n.tpl:26
-msgid "Obliquus externus abdominis"
+msgid "Lats"
msgstr ""
#: i18n.tpl:27
-msgid "Pectoralis major"
-msgstr ""
-
-#: i18n.tpl:28
-msgid "Quadriceps femoris"
+msgid "Quads"
msgstr ""
#: i18n.tpl:29
-msgid "Rectus abdominis"
+msgid "Triceps"
msgstr ""
#: i18n.tpl:30
-msgid "Serratus anterior"
-msgstr ""
-
-#: i18n.tpl:31
-msgid "Soleus"
-msgstr ""
-
-#: i18n.tpl:32
-msgid "Trapezius"
-msgstr ""
-
-#: i18n.tpl:33
-msgid "Triceps brachii"
-msgstr ""
-
-#: i18n.tpl:34
msgid "Kilometers"
msgstr ""
-#: i18n.tpl:35
-#, fuzzy
-#| msgid "Reps"
-msgid "Max Reps"
-msgstr "Επαναλήψεις"
-
-#: i18n.tpl:36
+#: i18n.tpl:31
msgid "Miles"
msgstr ""
-#: i18n.tpl:37
+#: i18n.tpl:32
msgid "Minutes"
msgstr ""
-#: i18n.tpl:38 manager/forms.py:169 manager/models/log.py:71
+#: i18n.tpl:33 manager/forms.py:169 manager/models/log.py:71
#: manager/templates/set/add.html:53
msgid "Repetitions"
msgstr "Επαναλήψεις"
-#: i18n.tpl:39
+#: i18n.tpl:34
msgid "Seconds"
msgstr ""
-#: i18n.tpl:40
+#: i18n.tpl:35
msgid "Until Failure"
msgstr ""
@@ -4100,6 +4078,11 @@ msgstr ""
msgid "Delete weight entry for the %s"
msgstr ""
+#, fuzzy
+#~| msgid "Reps"
+#~ msgid "Max Reps"
+#~ msgstr "Επαναλήψεις"
+
#~ msgid "Your current weight is: "
#~ msgstr "Το τρέχων βάρος σας είναι: "
diff --git a/wger/locale/es/LC_MESSAGES/django.mo b/wger/locale/es/LC_MESSAGES/django.mo
index fd255087f..a09facc8d 100644
Binary files a/wger/locale/es/LC_MESSAGES/django.mo and b/wger/locale/es/LC_MESSAGES/django.mo differ
diff --git a/wger/locale/es/LC_MESSAGES/django.po b/wger/locale/es/LC_MESSAGES/django.po
index 48265602d..558d7c5ab 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: 2022-02-15 14:51+0100\n"
+"POT-Creation-Date: 2022-05-14 12:01+0200\n"
"PO-Revision-Date: 2022-01-18 14:31+0000\n"
"Last-Translator: G. Buendía <[email protected]>\n"
"Language-Team: Spanish <https://hosted.weblate.org/projects/wger/web/es/>\n"
@@ -49,7 +49,7 @@ msgstr "Ejercicios"
msgid "Ingredients"
msgstr "Ingredientes"
-#: config/templates/language/overview.html:4 core/templates/navigation.html:228
+#: config/templates/language/overview.html:4 core/templates/navigation.html:226
msgid "Languages"
msgstr "Idiomas"
@@ -225,8 +225,8 @@ msgstr "Mi programa de rutinas"
msgid "Empty placeholder schedule"
msgstr "Programación de marcador posición vacía"
-#: core/forms.py:61 core/templates/navigation.html:190
-#: core/templates/navigation.html:194 core/templates/user/login.html:4
+#: core/forms.py:61 core/templates/navigation.html:188
+#: core/templates/navigation.html:192 core/templates/user/login.html:4
#: software/templates/features.html:43
msgid "Login"
msgstr "Ingresar"
@@ -303,8 +303,8 @@ msgstr "Contraseña incorrecta"
msgid "The form is secured with reCAPTCHA"
msgstr "El Formulario está asegurado por recaptcha"
-#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:190
-#: core/templates/navigation.html:195 core/templates/template.html:150
+#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:188
+#: core/templates/navigation.html:193 core/templates/template.html:149
#: core/templates/user/login.html:20 core/views/user.py:293
#: software/templates/features.html:38
msgid "Register"
@@ -635,7 +635,7 @@ msgstr ""
#: core/templates/index.html:33 core/templates/index.html:73
#: core/templates/misc/fragments/shariff_modal.html:29
-#: core/templates/template.html:125 manager/templates/calendar/month.html:138
+#: core/templates/template.html:124 manager/templates/calendar/month.html:138
#: manager/templates/schedule/view.html:246
#: manager/templates/schedule/view.html:266
#: manager/templates/workout/view.html:132
@@ -772,7 +772,7 @@ msgstr "No hay planes nutricionales."
msgid "Weight"
msgstr "Peso"
-#: core/templates/index.html:210 core/templates/navigation.html:97
+#: core/templates/index.html:210 core/templates/navigation.html:135
#: weight/views.py:70
msgid "Add weight entry"
msgstr "Añadir entrada de peso"
@@ -804,8 +804,8 @@ msgstr "Listado de licencias"
msgid "Nothing found"
msgstr "No se ha encontrado nada"
-#: core/templates/misc/about.html:4 core/templates/template.html:175
-#: core/templates/template_features.html:118
+#: core/templates/misc/about.html:4 core/templates/template.html:174
+#: core/templates/template_features.html:117
#: core/templates/template_no_context.html:88
msgid "Imprint"
msgstr "Imprimir"
@@ -892,13 +892,13 @@ msgstr "por equipamiento"
#: exercises/templates/equipment/overview.html:113
#: exercises/templates/exercise/overview.html:112
#: exercises/templates/exercise/overview.html:116
-#: exercises/templates/muscles/overview.html:108
#: exercises/templates/muscles/overview.html:112
+#: exercises/templates/muscles/overview.html:116
msgid "Add new exercise"
msgstr "Añadir nuevo ejercicio"
-#: core/templates/navigation.html:75 core/templates/navigation.html:134
-#: core/templates/navigation.html:226
+#: core/templates/navigation.html:75 core/templates/navigation.html:116
+#: core/templates/navigation.html:224
msgid "Administration"
msgstr "Administración"
@@ -921,106 +921,106 @@ msgstr "Músculos"
msgid "Categories"
msgstr "Categorias"
-#: core/templates/navigation.html:94
-msgid "Body weight"
-msgstr "Peso corporal"
-
-#: core/templates/navigation.html:96 core/templates/user/overview.html:114
-#: weight/templates/overview.html:7
-msgid "Weight overview"
-msgstr "Índice de peso"
-
-#: core/templates/navigation.html:111 software/templates/features.html:87
+#: core/templates/navigation.html:93 software/templates/features.html:87
msgid "Nutrition"
msgstr "Nutrición"
-#: core/templates/navigation.html:117 core/templates/user/overview.html:144
+#: core/templates/navigation.html:99 core/templates/user/overview.html:144
msgid "Nutrition plans"
msgstr "Planes nutritionales"
-#: core/templates/navigation.html:123 nutrition/templates/bmi/form.html:50
+#: core/templates/navigation.html:105 nutrition/templates/bmi/form.html:50
msgid "BMI calculator"
msgstr "Calculadora de IMC"
-#: core/templates/navigation.html:129 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:111 nutrition/templates/rate/form.html:17
msgid "Daily calories calculator"
msgstr "Caluladora de calorias diarias"
-#: core/templates/navigation.html:131
+#: core/templates/navigation.html:113
#: nutrition/templates/ingredient/overview.html:29
msgid "Ingredient overview"
msgstr "Índice de ingredientes"
-#: core/templates/navigation.html:135 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:117 nutrition/templates/units/list.html:6
msgid "Ingredient weight units"
msgstr "Unidades de peso de los ingredientes"
-#: core/templates/navigation.html:136
+#: core/templates/navigation.html:118
#: nutrition/templates/ingredient/pending.html:6
msgid "Ingredients pending review"
msgstr "Ingredientes esperando revisión"
-#: core/templates/navigation.html:149
+#: core/templates/navigation.html:132
+msgid "Body weight"
+msgstr "Peso corporal"
+
+#: core/templates/navigation.html:134 core/templates/user/overview.html:114
+#: weight/templates/overview.html:7
+msgid "Weight overview"
+msgstr "Índice de peso"
+
+#: core/templates/navigation.html:147
msgid "About this software"
msgstr "Sobre este programa"
-#: core/templates/navigation.html:151 core/templates/template_features.html:83
+#: core/templates/navigation.html:149 core/templates/template_features.html:82
#: software/templates/about_us.html:5
msgid "About us"
msgstr "Sobre nosotros"
-#: core/templates/navigation.html:153 software/templates/features.html:209
+#: core/templates/navigation.html:151 software/templates/features.html:209
msgid "REST API"
msgstr "REST API"
-#: core/templates/navigation.html:157 utils/models.py:40
+#: core/templates/navigation.html:155 utils/models.py:40
msgid "License"
msgstr "Licencia"
-#: core/templates/navigation.html:163
+#: core/templates/navigation.html:161
msgid "Developer documentation"
msgstr "Documentación para desarrolladores"
-#: core/templates/navigation.html:169
+#: core/templates/navigation.html:167
msgid "Get the code"
msgstr "Código fuente"
-#: core/templates/navigation.html:175 core/templates/template.html:205
-#: core/templates/template_features.html:100
+#: core/templates/navigation.html:173 core/templates/template.html:204
+#: core/templates/template_features.html:99
msgid "Translate"
msgstr "Traduce"
-#: core/templates/navigation.html:196 core/templates/user/login.html:28
+#: core/templates/navigation.html:194 core/templates/user/login.html:28
msgid "Reset password"
msgstr "Restablecer la contraseña"
-#: core/templates/navigation.html:209
+#: core/templates/navigation.html:207
msgid "My preferences"
msgstr "Mis preferencias"
-#: core/templates/navigation.html:216
+#: core/templates/navigation.html:214
msgid "Logout"
msgstr "Cerrar sesión"
-#: core/templates/navigation.html:231
+#: core/templates/navigation.html:229
msgid "Licenses"
msgstr "Licencias"
-#: core/templates/navigation.html:234
+#: core/templates/navigation.html:232
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr "Unidades de repetición"
-#: core/templates/navigation.html:237 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:235 core/templates/weight_unit/list.html:4
#: nutrition/templates/ingredient/view.html:174
msgid "Weight units"
msgstr "Unidades de peso"
-#: core/templates/navigation.html:240 core/templates/user/list.html:4
+#: core/templates/navigation.html:238 core/templates/user/list.html:4
msgid "User list"
msgstr "Lista de usuarios"
-#: core/templates/navigation.html:241
+#: core/templates/navigation.html:239
msgid "Gyms"
msgstr "Gimnasios"
@@ -1105,7 +1105,7 @@ msgstr "Añader registro de peso"
#: core/templates/tags/render_day.html:114
#: exercises/templates/equipment/overview.html:59
#: exercises/templates/exercise/overview.html:63
-#: exercises/templates/muscles/overview.html:61
+#: exercises/templates/muscles/overview.html:65
msgid "Placeholder image for exercise"
msgstr "Marcador de imagen para ejercicio"
@@ -1132,23 +1132,23 @@ msgstr "Repeticiones"
msgid "RiR"
msgstr "ReR"
-#: core/templates/template.html:140
+#: core/templates/template.html:139
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:144
+#: core/templates/template.html:143
msgid "Create some demo entries"
msgstr "Crear datos de ejemplo"
-#: core/templates/template.html:176 core/templates/template_features.html:122
+#: core/templates/template.html:175 core/templates/template_features.html:121
#: core/templates/template_no_context.html:89 software/templates/tos.html:7
msgid "Terms of service"
msgstr "Términos de servicio"
-#: core/templates/template_features.html:62 software/templates/features.html:9
+#: core/templates/template_features.html:61 software/templates/features.html:9
#: software/templates/features.html:120
msgid "Features"
msgstr "Funciones"
@@ -1572,7 +1572,7 @@ msgstr "Músculos primarios"
#: exercises/models/base.py:64 exercises/templates/equipment/overview.html:71
#: exercises/templates/exercise/overview.html:76
#: exercises/templates/exercise/view.html:268
-#: exercises/templates/muscles/overview.html:73
+#: exercises/templates/muscles/overview.html:77
msgid "Secondary muscles"
msgstr "Músculos secundarios"
@@ -1584,9 +1584,9 @@ msgstr "Variantes"
msgid "Exercise Categories"
msgstr "Categorías de ejercicios"
-#: exercises/models/comment.py:34 exercises/models/image.py:75
-#: exercises/models/video.py:82 manager/forms.py:165 manager/helpers.py:89
-#: manager/models/log.py:51
+#: exercises/models/comment.py:34 exercises/models/exercise_alias.py:32
+#: exercises/models/image.py:75 exercises/models/video.py:82
+#: manager/forms.py:165 manager/helpers.py:89 manager/models/log.py:51
msgid "Exercise"
msgstr "Ejercicio"
@@ -1612,6 +1612,12 @@ msgstr "Nuevo ejercicio enviado por un usuario"
msgid "The user {0} submitted a new exercise \"{1}\"."
msgstr "El usuario {0} ha enviado un nuevo ejercicio \"{1}\"."
+#: exercises/models/exercise_alias.py:35
+#, fuzzy
+#| msgid "Correcting an exercise"
+msgid "Alias for an exercise"
+msgstr "Corregir un ejercicio"
+
#: exercises/models/image.py:59
msgid "Line"
msgstr ""
@@ -1673,6 +1679,16 @@ msgstr "El usuario {0} agrego una nueva imagen \"{1}\" para el ejercicio {2}."
msgid "In latin, e.g. \"Pectoralis major\""
msgstr "En latín, p.ej. \"Pectoralis major\""
+#: exercises/models/muscle.py:47
+#, fuzzy
+#| msgid "exercise name"
+msgid "Alternative name"
+msgstr "nombre del ejercicio"
+
+#: exercises/models/muscle.py:48
+msgid "A more basic name for the muscle"
+msgstr ""
+
#: exercises/models/video.py:41
msgid "Maximum file size is 100MB."
msgstr ""
@@ -1741,7 +1757,7 @@ msgstr "Resumen de equipos"
#: exercises/templates/equipment/overview.html:69
#: exercises/templates/exercise/overview.html:74
#: exercises/templates/exercise/view.html:264
-#: exercises/templates/muscles/overview.html:71
+#: exercises/templates/muscles/overview.html:75
msgid "Main muscles"
msgstr "Músculos principales"
@@ -1766,7 +1782,7 @@ msgstr "nombre del ejercicio"
#: exercises/templates/equipment/overview.html:115
#: exercises/templates/exercise/overview.html:118
-#: exercises/templates/muscles/overview.html:114
+#: exercises/templates/muscles/overview.html:118
#: nutrition/templates/ingredient/overview.html:85
msgid "Only registered users can do this"
msgstr "Sólo usuarios registrados pueden hacer esto"
@@ -1962,7 +1978,7 @@ msgstr "Índice de músculos"
msgid "Add muscle"
msgstr "Añadir músculo"
-#: exercises/templates/muscles/overview.html:81
+#: exercises/templates/muscles/overview.html:85
msgid ""
"No exercises for this muscle. Add or edit an exercise and set the muscle."
msgstr ""
@@ -2344,7 +2360,7 @@ msgstr "Añadir usuario al gimnasio"
msgid "Edit gym"
msgstr "Editar gimnasio"
-#: i18n.tpl:2
+#: i18n.tpl:2 i18n.tpl:28
msgid "Abs"
msgstr "Abdominales"
@@ -2356,11 +2372,11 @@ msgstr "Brazos"
msgid "Back"
msgstr "Espalda"
-#: i18n.tpl:5
+#: i18n.tpl:5 i18n.tpl:23
msgid "Calves"
msgstr "Pantorrillas"
-#: i18n.tpl:6
+#: i18n.tpl:6 i18n.tpl:26
msgid "Chest"
msgstr "Pectorales"
@@ -2368,7 +2384,7 @@ msgstr "Pectorales"
msgid "Legs"
msgstr "Piernas"
-#: i18n.tpl:8
+#: i18n.tpl:8 i18n.tpl:19
msgid "Shoulders"
msgstr "Hombros"
@@ -2397,107 +2413,77 @@ msgid "Kettlebell"
msgstr "Pesa rusa"
#: i18n.tpl:15
-msgid "none (bodyweight exercise)"
-msgstr "ninguno (ejercicio de peso corporal)"
-
-#: i18n.tpl:16
msgid "Pull-up bar"
msgstr "Barra hacia arriba"
+#: i18n.tpl:16
+msgid "SZ-Bar"
+msgstr "Barra de curl"
+
#: i18n.tpl:17
msgid "Swiss Ball"
msgstr "Balón suizo"
#: i18n.tpl:18
-msgid "SZ-Bar"
-msgstr "Barra de curl"
-
-#: i18n.tpl:19
-msgid "Anterior deltoid"
-msgstr "Hombro"
+msgid "none (bodyweight exercise)"
+msgstr "ninguno (ejercicio de peso corporal)"
#: i18n.tpl:20
-msgid "Biceps brachii"
+#, fuzzy
+#| msgid "Biceps brachii"
+msgid "Biceps"
msgstr "Bíceps"
#: i18n.tpl:21
-msgid "Biceps femoris"
-msgstr "Bíceps femoral"
+msgid "Hamstrings"
+msgstr ""
#: i18n.tpl:22
-msgid "Brachialis"
-msgstr "Braquial anterior"
-
-#: i18n.tpl:23
-msgid "Gastrocnemius"
-msgstr "gemelos"
+msgid "Lower back"
+msgstr ""
#: i18n.tpl:24
-msgid "Gluteus maximus"
-msgstr "nalgas"
+#, fuzzy
+#| msgid "Minutes"
+msgid "Glutes"
+msgstr "Minutos"
#: i18n.tpl:25
-msgid "Latissimus dorsi"
-msgstr "Dorsal ancho"
-
-#: i18n.tpl:26
-msgid "Obliquus externus abdominis"
-msgstr "Oblicuo mayor del abdomen"
+msgid "Lats"
+msgstr ""
#: i18n.tpl:27
-msgid "Pectoralis major"
-msgstr "pecho"
-
-#: i18n.tpl:28
-msgid "Quadriceps femoris"
-msgstr "Cuadriceps"
+msgid "Quads"
+msgstr ""
#: i18n.tpl:29
-msgid "Rectus abdominis"
-msgstr "abdominales"
-
-#: i18n.tpl:30
-msgid "Serratus anterior"
-msgstr "Serrato anterior"
-
-#: i18n.tpl:31
-msgid "Soleus"
-msgstr "Sóleo"
-
-#: i18n.tpl:32
-msgid "Trapezius"
-msgstr "Trapecio"
-
-#: i18n.tpl:33
-msgid "Triceps brachii"
+#, fuzzy
+#| msgid "Triceps brachii"
+msgid "Triceps"
msgstr "Tríceps braquial"
-#: i18n.tpl:34
+#: i18n.tpl:30
msgid "Kilometers"
msgstr "Kilómetros"
-#: i18n.tpl:35
-msgid "Max Reps"
-msgstr "Repeticiones máximas"
-
-#: i18n.tpl:36
+#: i18n.tpl:31
msgid "Miles"
msgstr "Millas"
-#: i18n.tpl:37
+#: i18n.tpl:32
msgid "Minutes"
msgstr "Minutos"
-#: i18n.tpl:38 manager/forms.py:169 manager/models/log.py:71
+#: i18n.tpl:33 manager/forms.py:169 manager/models/log.py:71
#: manager/templates/set/add.html:53
msgid "Repetitions"
msgstr "Repeticiones"
-#: i18n.tpl:39
+#: i18n.tpl:34
msgid "Seconds"
msgstr "Segundos"
-#: i18n.tpl:40
+#: i18n.tpl:35
msgid "Until Failure"
msgstr "Hasta fallo muscular"
@@ -4172,6 +4158,48 @@ msgstr "Borrado con éxito."
msgid "Delete weight entry for the %s"
msgstr "Eliminar la entrada de peso para el %s"
+#~ msgid "Anterior deltoid"
+#~ msgstr "Hombro"
+
+#~ msgid "Biceps femoris"
+#~ msgstr "Bíceps femoral"
+
+#~ msgid "Brachialis"
+#~ msgstr "Braquial anterior"
+
+#~ msgid "Gastrocnemius"
+#~ msgstr "gemelos"
+
+#~ msgid "Gluteus maximus"
+#~ msgstr "nalgas"
+
+#~ msgid "Latissimus dorsi"
+#~ msgstr "Dorsal ancho"
+
+#~ msgid "Obliquus externus abdominis"
+#~ msgstr "Oblicuo mayor del abdomen"
+
+#~ msgid "Pectoralis major"
+#~ msgstr "pecho"
+
+#~ msgid "Quadriceps femoris"
+#~ msgstr "Cuadriceps"
+
+#~ msgid "Rectus abdominis"
+#~ msgstr "abdominales"
+
+#~ msgid "Serratus anterior"
+#~ msgstr "Serrato anterior"
+
+#~ msgid "Soleus"
+#~ msgstr "Sóleo"
+
+#~ msgid "Trapezius"
+#~ msgstr "Trapecio"
+
+#~ msgid "Max Reps"
+#~ msgstr "Repeticiones máximas"
+
#~ msgid "Your current weight is: "
#~ msgstr "Tu peso actual es: "
diff --git a/wger/locale/fa/LC_MESSAGES/django.po b/wger/locale/fa/LC_MESSAGES/django.po
index 5c746f8dd..8d591f3c4 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: 2022-02-15 14:51+0100\n"
+"POT-Creation-Date: 2022-05-14 12:01+0200\n"
"PO-Revision-Date: 2022-02-15 09:56+0000\n"
"Last-Translator: anyBlackSoul <[email protected]>\n"
"Language-Team: Persian <https://hosted.weblate.org/projects/wger/web/fa/>\n"
@@ -42,7 +42,7 @@ msgstr "تمرینات"
msgid "Ingredients"
msgstr "عناصر"
-#: config/templates/language/overview.html:4 core/templates/navigation.html:228
+#: config/templates/language/overview.html:4 core/templates/navigation.html:226
msgid "Languages"
msgstr "زبان ها"
@@ -218,8 +218,8 @@ msgstr "برنامه تمرینی جالب من"
msgid "Empty placeholder schedule"
msgstr "برنامه خالی"
-#: core/forms.py:61 core/templates/navigation.html:190
-#: core/templates/navigation.html:194 core/templates/user/login.html:4
+#: core/forms.py:61 core/templates/navigation.html:188
+#: core/templates/navigation.html:192 core/templates/user/login.html:4
#: software/templates/features.html:43
msgid "Login"
msgstr "ورود"
@@ -295,8 +295,8 @@ msgstr "رمز نامعتبر"
msgid "The form is secured with reCAPTCHA"
msgstr "این فرم با ریکپچا امن شده است"
-#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:190
-#: core/templates/navigation.html:195 core/templates/template.html:150
+#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:188
+#: core/templates/navigation.html:193 core/templates/template.html:149
#: core/templates/user/login.html:20 core/views/user.py:293
#: software/templates/features.html:38
msgid "Register"
@@ -617,7 +617,7 @@ msgstr ""
#: core/templates/index.html:33 core/templates/index.html:73
#: core/templates/misc/fragments/shariff_modal.html:29
-#: core/templates/template.html:125 manager/templates/calendar/month.html:138
+#: core/templates/template.html:124 manager/templates/calendar/month.html:138
#: manager/templates/schedule/view.html:246
#: manager/templates/schedule/view.html:266
#: manager/templates/workout/view.html:132
@@ -749,7 +749,7 @@ msgstr "برنامه وجود ندارد"
msgid "Weight"
msgstr "وزن"
-#: core/templates/index.html:210 core/templates/navigation.html:97
+#: core/templates/index.html:210 core/templates/navigation.html:135
#: weight/views.py:70
msgid "Add weight entry"
msgstr "وزن را وارد کنید"
@@ -781,8 +781,8 @@ msgstr "لیست مجوز ها"
msgid "Nothing found"
msgstr "چیزی یافت نشد"
-#: core/templates/misc/about.html:4 core/templates/template.html:175
-#: core/templates/template_features.html:118
+#: core/templates/misc/about.html:4 core/templates/template.html:174
+#: core/templates/template_features.html:117
#: core/templates/template_no_context.html:88
msgid "Imprint"
msgstr ""
@@ -866,13 +866,13 @@ msgstr ""
#: exercises/templates/equipment/overview.html:113
#: exercises/templates/exercise/overview.html:112
#: exercises/templates/exercise/overview.html:116
-#: exercises/templates/muscles/overview.html:108
#: exercises/templates/muscles/overview.html:112
+#: exercises/templates/muscles/overview.html:116
msgid "Add new exercise"
msgstr ""
-#: core/templates/navigation.html:75 core/templates/navigation.html:134
-#: core/templates/navigation.html:226
+#: core/templates/navigation.html:75 core/templates/navigation.html:116
+#: core/templates/navigation.html:224
msgid "Administration"
msgstr ""
@@ -895,106 +895,106 @@ msgstr ""
msgid "Categories"
msgstr ""
-#: core/templates/navigation.html:94
-msgid "Body weight"
-msgstr ""
-
-#: core/templates/navigation.html:96 core/templates/user/overview.html:114
-#: weight/templates/overview.html:7
-msgid "Weight overview"
-msgstr "بازنگری وزن "
-
-#: core/templates/navigation.html:111 software/templates/features.html:87
+#: core/templates/navigation.html:93 software/templates/features.html:87
msgid "Nutrition"
msgstr "مواد غذایی"
-#: core/templates/navigation.html:117 core/templates/user/overview.html:144
+#: core/templates/navigation.html:99 core/templates/user/overview.html:144
msgid "Nutrition plans"
msgstr ""
-#: core/templates/navigation.html:123 nutrition/templates/bmi/form.html:50
+#: core/templates/navigation.html:105 nutrition/templates/bmi/form.html:50
msgid "BMI calculator"
msgstr ""
-#: core/templates/navigation.html:129 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:111 nutrition/templates/rate/form.html:17
msgid "Daily calories calculator"
msgstr ""
-#: core/templates/navigation.html:131
+#: core/templates/navigation.html:113
#: nutrition/templates/ingredient/overview.html:29
msgid "Ingredient overview"
msgstr ""
-#: core/templates/navigation.html:135 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:117 nutrition/templates/units/list.html:6
msgid "Ingredient weight units"
msgstr ""
-#: core/templates/navigation.html:136
+#: core/templates/navigation.html:118
#: nutrition/templates/ingredient/pending.html:6
msgid "Ingredients pending review"
msgstr ""
-#: core/templates/navigation.html:149
+#: core/templates/navigation.html:132
+msgid "Body weight"
+msgstr ""
+
+#: core/templates/navigation.html:134 core/templates/user/overview.html:114
+#: weight/templates/overview.html:7
+msgid "Weight overview"
+msgstr "بازنگری وزن "
+
+#: core/templates/navigation.html:147
msgid "About this software"
msgstr ""
-#: core/templates/navigation.html:151 core/templates/template_features.html:83
+#: core/templates/navigation.html:149 core/templates/template_features.html:82
#: software/templates/about_us.html:5
msgid "About us"
msgstr "درباره ما"
-#: core/templates/navigation.html:153 software/templates/features.html:209
+#: core/templates/navigation.html:151 software/templates/features.html:209
msgid "REST API"
msgstr ""
-#: core/templates/navigation.html:157 utils/models.py:40
+#: core/templates/navigation.html:155 utils/models.py:40
msgid "License"
msgstr ""
-#: core/templates/navigation.html:163
+#: core/templates/navigation.html:161
msgid "Developer documentation"
msgstr ""
-#: core/templates/navigation.html:169
+#: core/templates/navigation.html:167
msgid "Get the code"
msgstr ""
-#: core/templates/navigation.html:175 core/templates/template.html:205
-#: core/templates/template_features.html:100
+#: core/templates/navigation.html:173 core/templates/template.html:204
+#: core/templates/template_features.html:99
msgid "Translate"
msgstr ""
-#: core/templates/navigation.html:196 core/templates/user/login.html:28
+#: core/templates/navigation.html:194 core/templates/user/login.html:28
msgid "Reset password"
msgstr ""
-#: core/templates/navigation.html:209
+#: core/templates/navigation.html:207
msgid "My preferences"
msgstr ""
-#: core/templates/navigation.html:216
+#: core/templates/navigation.html:214
msgid "Logout"
msgstr ""
-#: core/templates/navigation.html:231
+#: core/templates/navigation.html:229
msgid "Licenses"
msgstr ""
-#: core/templates/navigation.html:234
+#: core/templates/navigation.html:232
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr ""
-#: core/templates/navigation.html:237 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:235 core/templates/weight_unit/list.html:4
#: nutrition/templates/ingredient/view.html:174
msgid "Weight units"
msgstr ""
-#: core/templates/navigation.html:240 core/templates/user/list.html:4
+#: core/templates/navigation.html:238 core/templates/user/list.html:4
msgid "User list"
msgstr ""
-#: core/templates/navigation.html:241
+#: core/templates/navigation.html:239
msgid "Gyms"
msgstr ""
@@ -1074,7 +1074,7 @@ msgstr ""
#: core/templates/tags/render_day.html:114
#: exercises/templates/equipment/overview.html:59
#: exercises/templates/exercise/overview.html:63
-#: exercises/templates/muscles/overview.html:61
+#: exercises/templates/muscles/overview.html:65
msgid "Placeholder image for exercise"
msgstr ""
@@ -1101,21 +1101,21 @@ msgstr ""
msgid "RiR"
msgstr ""
-#: core/templates/template.html:140
+#: core/templates/template.html:139
msgid ""
"You are using a guest account, data entered will be deleted after a week."
msgstr ""
-#: core/templates/template.html:144
+#: core/templates/template.html:143
msgid "Create some demo entries"
msgstr "چند نمونه پر کنید"
-#: core/templates/template.html:176 core/templates/template_features.html:122
+#: core/templates/template.html:175 core/templates/template_features.html:121
#: core/templates/template_no_context.html:89 software/templates/tos.html:7
msgid "Terms of service"
msgstr ""
-#: core/templates/template_features.html:62 software/templates/features.html:9
+#: core/templates/template_features.html:61 software/templates/features.html:9
#: software/templates/features.html:120
msgid "Features"
msgstr "امکانات"
@@ -1525,7 +1525,7 @@ msgstr ""
#: exercises/models/base.py:64 exercises/templates/equipment/overview.html:71
#: exercises/templates/exercise/overview.html:76
#: exercises/templates/exercise/view.html:268
-#: exercises/templates/muscles/overview.html:73
+#: exercises/templates/muscles/overview.html:77
msgid "Secondary muscles"
msgstr ""
@@ -1537,9 +1537,9 @@ msgstr ""
msgid "Exercise Categories"
msgstr ""
-#: exercises/models/comment.py:34 exercises/models/image.py:75
-#: exercises/models/video.py:82 manager/forms.py:165 manager/helpers.py:89
-#: manager/models/log.py:51
+#: exercises/models/comment.py:34 exercises/models/exercise_alias.py:32
+#: exercises/models/image.py:75 exercises/models/video.py:82
+#: manager/forms.py:165 manager/helpers.py:89 manager/models/log.py:51
msgid "Exercise"
msgstr ""
@@ -1565,6 +1565,10 @@ msgstr ""
msgid "The user {0} submitted a new exercise \"{1}\"."
msgstr ""
+#: exercises/models/exercise_alias.py:35
+msgid "Alias for an exercise"
+msgstr ""
+
#: exercises/models/image.py:59
msgid "Line"
msgstr ""
@@ -1621,6 +1625,14 @@ msgstr ""
msgid "In latin, e.g. \"Pectoralis major\""
msgstr ""
+#: exercises/models/muscle.py:47
+msgid "Alternative name"
+msgstr ""
+
+#: exercises/models/muscle.py:48
+msgid "A more basic name for the muscle"
+msgstr ""
+
#: exercises/models/video.py:41
msgid "Maximum file size is 100MB."
msgstr ""
@@ -1685,7 +1697,7 @@ msgstr ""
#: exercises/templates/equipment/overview.html:69
#: exercises/templates/exercise/overview.html:74
#: exercises/templates/exercise/view.html:264
-#: exercises/templates/muscles/overview.html:71
+#: exercises/templates/muscles/overview.html:75
msgid "Main muscles"
msgstr ""
@@ -1708,7 +1720,7 @@ msgstr ""
#: exercises/templates/equipment/overview.html:115
#: exercises/templates/exercise/overview.html:118
-#: exercises/templates/muscles/overview.html:114
+#: exercises/templates/muscles/overview.html:118
#: nutrition/templates/ingredient/overview.html:85
msgid "Only registered users can do this"
msgstr ""
@@ -1887,7 +1899,7 @@ msgstr "بررسی عضله"
msgid "Add muscle"
msgstr ""
-#: exercises/templates/muscles/overview.html:81
+#: exercises/templates/muscles/overview.html:85
msgid ""
"No exercises for this muscle. Add or edit an exercise and set the muscle."
msgstr ""
@@ -2253,7 +2265,7 @@ msgstr ""
msgid "Edit gym"
msgstr ""
-#: i18n.tpl:2
+#: i18n.tpl:2 i18n.tpl:28
msgid "Abs"
msgstr ""
@@ -2265,11 +2277,11 @@ msgstr ""
msgid "Back"
msgstr ""
-#: i18n.tpl:5
+#: i18n.tpl:5 i18n.tpl:23
msgid "Calves"
msgstr ""
-#: i18n.tpl:6
+#: i18n.tpl:6 i18n.tpl:26
msgid "Chest"
msgstr ""
@@ -2277,7 +2289,7 @@ msgstr ""
msgid "Legs"
msgstr ""
-#: i18n.tpl:8
+#: i18n.tpl:8 i18n.tpl:19
msgid "Shoulders"
msgstr ""
@@ -2306,11 +2318,11 @@ msgid "Kettlebell"
msgstr ""
#: i18n.tpl:15
-msgid "none (bodyweight exercise)"
+msgid "Pull-up bar"
msgstr ""
#: i18n.tpl:16
-msgid "Pull-up bar"
+msgid "SZ-Bar"
msgstr ""
#: i18n.tpl:17
@@ -2318,95 +2330,63 @@ msgid "Swiss Ball"
msgstr ""
#: i18n.tpl:18
-msgid "SZ-Bar"
-msgstr ""
-
-#: i18n.tpl:19
-msgid "Anterior deltoid"
+msgid "none (bodyweight exercise)"
msgstr ""
#: i18n.tpl:20
-msgid "Biceps brachii"
+msgid "Biceps"
msgstr ""
#: i18n.tpl:21
-msgid "Biceps femoris"
+msgid "Hamstrings"
msgstr ""
#: i18n.tpl:22
-msgid "Brachialis"
-msgstr ""
-
-#: i18n.tpl:23
-msgid "Gastrocnemius"
+msgid "Lower back"
msgstr ""
#: i18n.tpl:24
-msgid "Gluteus maximus"
-msgstr ""
+#, fuzzy
+#| msgid "Minutes"
+msgid "Glutes"
+msgstr "دقیقه"
#: i18n.tpl:25
-msgid "Latissimus dorsi"
-msgstr ""
-
-#: i18n.tpl:26
-msgid "Obliquus externus abdominis"
+msgid "Lats"
msgstr ""
#: i18n.tpl:27
-msgid "Pectoralis major"
-msgstr ""
-
-#: i18n.tpl:28
-msgid "Quadriceps femoris"
+msgid "Quads"
msgstr ""
#: i18n.tpl:29
-msgid "Rectus abdominis"
-msgstr ""
-
-#: i18n.tpl:30
-msgid "Serratus anterior"
-msgstr ""
-
-#: i18n.tpl:31
-msgid "Soleus"
-msgstr "سولوس"
-
-#: i18n.tpl:32
-msgid "Trapezius"
-msgstr "تراپسیوس"
-
-#: i18n.tpl:33
-msgid "Triceps brachii"
+#, fuzzy
+#| msgid "Triceps brachii"
+msgid "Triceps"
msgstr "سه سر بازو"
-#: i18n.tpl:34
+#: i18n.tpl:30
msgid "Kilometers"
msgstr "کیلوگرم"
-#: i18n.tpl:35
-msgid "Max Reps"
-msgstr ""
-
-#: i18n.tpl:36
+#: i18n.tpl:31
msgid "Miles"
msgstr "مایل"
-#: i18n.tpl:37
+#: i18n.tpl:32
msgid "Minutes"
msgstr "دقیقه"
-#: i18n.tpl:38 manager/forms.py:169 manager/models/log.py:71
+#: i18n.tpl:33 manager/forms.py:169 manager/models/log.py:71
#: manager/templates/set/add.html:53
msgid "Repetitions"
msgstr ""
-#: i18n.tpl:39
+#: i18n.tpl:34
msgid "Seconds"
msgstr "دومین"
-#: i18n.tpl:40
+#: i18n.tpl:35
msgid "Until Failure"
msgstr "تا حد ناتوانی"
@@ -3903,6 +3883,12 @@ msgstr ""
msgid "Delete weight entry for the %s"
msgstr ""
+#~ msgid "Soleus"
+#~ msgstr "سولوس"
+
+#~ msgid "Trapezius"
+#~ msgstr "تراپسیوس"
+
#~ msgid "Your current weight is: "
#~ msgstr "وزن فعلی شما :"
diff --git a/wger/locale/fi/LC_MESSAGES/django.po b/wger/locale/fi/LC_MESSAGES/django.po
index f83cdc69b..c91bf07e2 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: 2022-02-15 14:51+0100\n"
+"POT-Creation-Date: 2022-05-14 12:01+0200\n"
"PO-Revision-Date: 2021-05-09 09:11+0000\n"
"Last-Translator: J. Lavoie <[email protected]>\n"
"Language-Team: Finnish <https://hosted.weblate.org/projects/wger/web/fi/>\n"
@@ -42,7 +42,7 @@ msgstr "Harjoitukset"
msgid "Ingredients"
msgstr "Raaka-aineet"
-#: config/templates/language/overview.html:4 core/templates/navigation.html:228
+#: config/templates/language/overview.html:4 core/templates/navigation.html:226
msgid "Languages"
msgstr "Kielet"
@@ -218,8 +218,8 @@ msgstr "Minun hieno harjoitusohjelmani"
msgid "Empty placeholder schedule"
msgstr "Tyhjä tilanvaraaja-aikataulu"
-#: core/forms.py:61 core/templates/navigation.html:190
-#: core/templates/navigation.html:194 core/templates/user/login.html:4
+#: core/forms.py:61 core/templates/navigation.html:188
+#: core/templates/navigation.html:192 core/templates/user/login.html:4
#: software/templates/features.html:43
msgid "Login"
msgstr "Kirjaudu sisään"
@@ -300,8 +300,8 @@ msgstr "Väärä salasana"
msgid "The form is secured with reCAPTCHA"
msgstr ""
-#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:190
-#: core/templates/navigation.html:195 core/templates/template.html:150
+#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:188
+#: core/templates/navigation.html:193 core/templates/template.html:149
#: core/templates/user/login.html:20 core/views/user.py:293
#: software/templates/features.html:38
msgid "Register"
@@ -612,7 +612,7 @@ msgstr ""
#: core/templates/index.html:33 core/templates/index.html:73
#: core/templates/misc/fragments/shariff_modal.html:29
-#: core/templates/template.html:125 manager/templates/calendar/month.html:138
+#: core/templates/template.html:124 manager/templates/calendar/month.html:138
#: manager/templates/schedule/view.html:246
#: manager/templates/schedule/view.html:266
#: manager/templates/workout/view.html:132
@@ -744,7 +744,7 @@ msgstr ""
msgid "Weight"
msgstr ""
-#: core/templates/index.html:210 core/templates/navigation.html:97
+#: core/templates/index.html:210 core/templates/navigation.html:135
#: weight/views.py:70
msgid "Add weight entry"
msgstr ""
@@ -776,8 +776,8 @@ msgstr ""
msgid "Nothing found"
msgstr ""
-#: core/templates/misc/about.html:4 core/templates/template.html:175
-#: core/templates/template_features.html:118
+#: core/templates/misc/about.html:4 core/templates/template.html:174
+#: core/templates/template_features.html:117
#: core/templates/template_no_context.html:88
msgid "Imprint"
msgstr ""
@@ -859,13 +859,13 @@ msgstr ""
#: exercises/templates/equipment/overview.html:113
#: exercises/templates/exercise/overview.html:112
#: exercises/templates/exercise/overview.html:116
-#: exercises/templates/muscles/overview.html:108
#: exercises/templates/muscles/overview.html:112
+#: exercises/templates/muscles/overview.html:116
msgid "Add new exercise"
msgstr ""
-#: core/templates/navigation.html:75 core/templates/navigation.html:134
-#: core/templates/navigation.html:226
+#: core/templates/navigation.html:75 core/templates/navigation.html:116
+#: core/templates/navigation.html:224
msgid "Administration"
msgstr ""
@@ -888,106 +888,106 @@ msgstr ""
msgid "Categories"
msgstr ""
-#: core/templates/navigation.html:94
-msgid "Body weight"
-msgstr ""
-
-#: core/templates/navigation.html:96 core/templates/user/overview.html:114
-#: weight/templates/overview.html:7
-msgid "Weight overview"
-msgstr ""
-
-#: core/templates/navigation.html:111 software/templates/features.html:87
+#: core/templates/navigation.html:93 software/templates/features.html:87
msgid "Nutrition"
msgstr ""
-#: core/templates/navigation.html:117 core/templates/user/overview.html:144
+#: core/templates/navigation.html:99 core/templates/user/overview.html:144
msgid "Nutrition plans"
msgstr ""
-#: core/templates/navigation.html:123 nutrition/templates/bmi/form.html:50
+#: core/templates/navigation.html:105 nutrition/templates/bmi/form.html:50
msgid "BMI calculator"
msgstr "Painoindeksilaskuri"
-#: core/templates/navigation.html:129 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:111 nutrition/templates/rate/form.html:17
msgid "Daily calories calculator"
msgstr ""
-#: core/templates/navigation.html:131
+#: core/templates/navigation.html:113
#: nutrition/templates/ingredient/overview.html:29
msgid "Ingredient overview"
msgstr ""
-#: core/templates/navigation.html:135 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:117 nutrition/templates/units/list.html:6
msgid "Ingredient weight units"
msgstr ""
-#: core/templates/navigation.html:136
+#: core/templates/navigation.html:118
#: nutrition/templates/ingredient/pending.html:6
msgid "Ingredients pending review"
msgstr ""
-#: core/templates/navigation.html:149
+#: core/templates/navigation.html:132
+msgid "Body weight"
+msgstr ""
+
+#: core/templates/navigation.html:134 core/templates/user/overview.html:114
+#: weight/templates/overview.html:7
+msgid "Weight overview"
+msgstr ""
+
+#: core/templates/navigation.html:147
msgid "About this software"
msgstr ""
-#: core/templates/navigation.html:151 core/templates/template_features.html:83
+#: core/templates/navigation.html:149 core/templates/template_features.html:82
#: software/templates/about_us.html:5
msgid "About us"
msgstr "Meistä"
-#: core/templates/navigation.html:153 software/templates/features.html:209
+#: core/templates/navigation.html:151 software/templates/features.html:209
msgid "REST API"
msgstr ""
-#: core/templates/navigation.html:157 utils/models.py:40
+#: core/templates/navigation.html:155 utils/models.py:40
msgid "License"
msgstr ""
-#: core/templates/navigation.html:163
+#: core/templates/navigation.html:161
msgid "Developer documentation"
msgstr ""
-#: core/templates/navigation.html:169
+#: core/templates/navigation.html:167
msgid "Get the code"
msgstr ""
-#: core/templates/navigation.html:175 core/templates/template.html:205
-#: core/templates/template_features.html:100
+#: core/templates/navigation.html:173 core/templates/template.html:204
+#: core/templates/template_features.html:99
msgid "Translate"
msgstr ""
-#: core/templates/navigation.html:196 core/templates/user/login.html:28
+#: core/templates/navigation.html:194 core/templates/user/login.html:28
msgid "Reset password"
msgstr ""
-#: core/templates/navigation.html:209
+#: core/templates/navigation.html:207
msgid "My preferences"
msgstr ""
-#: core/templates/navigation.html:216
+#: core/templates/navigation.html:214
msgid "Logout"
msgstr ""
-#: core/templates/navigation.html:231
+#: core/templates/navigation.html:229
msgid "Licenses"
msgstr ""
-#: core/templates/navigation.html:234
+#: core/templates/navigation.html:232
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr ""
-#: core/templates/navigation.html:237 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:235 core/templates/weight_unit/list.html:4
#: nutrition/templates/ingredient/view.html:174
msgid "Weight units"
msgstr ""
-#: core/templates/navigation.html:240 core/templates/user/list.html:4
+#: core/templates/navigation.html:238 core/templates/user/list.html:4
msgid "User list"
msgstr ""
-#: core/templates/navigation.html:241
+#: core/templates/navigation.html:239
msgid "Gyms"
msgstr ""
@@ -1065,7 +1065,7 @@ msgstr ""
#: core/templates/tags/render_day.html:114
#: exercises/templates/equipment/overview.html:59
#: exercises/templates/exercise/overview.html:63
-#: exercises/templates/muscles/overview.html:61
+#: exercises/templates/muscles/overview.html:65
msgid "Placeholder image for exercise"
msgstr ""
@@ -1092,21 +1092,21 @@ msgstr "Toistot"
msgid "RiR"
msgstr ""
-#: core/templates/template.html:140
+#: core/templates/template.html:139
msgid ""
"You are using a guest account, data entered will be deleted after a week."
msgstr ""
-#: core/templates/template.html:144
+#: core/templates/template.html:143
msgid "Create some demo entries"
msgstr ""
-#: core/templates/template.html:176 core/templates/template_features.html:122
+#: core/templates/template.html:175 core/templates/template_features.html:121
#: core/templates/template_no_context.html:89 software/templates/tos.html:7
msgid "Terms of service"
msgstr "Käyttöehdot"
-#: core/templates/template_features.html:62 software/templates/features.html:9
+#: core/templates/template_features.html:61 software/templates/features.html:9
#: software/templates/features.html:120
msgid "Features"
msgstr ""
@@ -1516,7 +1516,7 @@ msgstr ""
#: exercises/models/base.py:64 exercises/templates/equipment/overview.html:71
#: exercises/templates/exercise/overview.html:76
#: exercises/templates/exercise/view.html:268
-#: exercises/templates/muscles/overview.html:73
+#: exercises/templates/muscles/overview.html:77
msgid "Secondary muscles"
msgstr ""
@@ -1528,9 +1528,9 @@ msgstr ""
msgid "Exercise Categories"
msgstr ""
-#: exercises/models/comment.py:34 exercises/models/image.py:75
-#: exercises/models/video.py:82 manager/forms.py:165 manager/helpers.py:89
-#: manager/models/log.py:51
+#: exercises/models/comment.py:34 exercises/models/exercise_alias.py:32
+#: exercises/models/image.py:75 exercises/models/video.py:82
+#: manager/forms.py:165 manager/helpers.py:89 manager/models/log.py:51
msgid "Exercise"
msgstr ""
@@ -1556,6 +1556,10 @@ msgstr ""
msgid "The user {0} submitted a new exercise \"{1}\"."
msgstr ""
+#: exercises/models/exercise_alias.py:35
+msgid "Alias for an exercise"
+msgstr ""
+
#: exercises/models/image.py:59
msgid "Line"
msgstr ""
@@ -1612,6 +1616,14 @@ msgstr ""
msgid "In latin, e.g. \"Pectoralis major\""
msgstr ""
+#: exercises/models/muscle.py:47
+msgid "Alternative name"
+msgstr ""
+
+#: exercises/models/muscle.py:48
+msgid "A more basic name for the muscle"
+msgstr ""
+
#: exercises/models/video.py:41
msgid "Maximum file size is 100MB."
msgstr ""
@@ -1674,7 +1686,7 @@ msgstr ""
#: exercises/templates/equipment/overview.html:69
#: exercises/templates/exercise/overview.html:74
#: exercises/templates/exercise/view.html:264
-#: exercises/templates/muscles/overview.html:71
+#: exercises/templates/muscles/overview.html:75
msgid "Main muscles"
msgstr ""
@@ -1697,7 +1709,7 @@ msgstr ""
#: exercises/templates/equipment/overview.html:115
#: exercises/templates/exercise/overview.html:118
-#: exercises/templates/muscles/overview.html:114
+#: exercises/templates/muscles/overview.html:118
#: nutrition/templates/ingredient/overview.html:85
msgid "Only registered users can do this"
msgstr ""
@@ -1874,7 +1886,7 @@ msgstr ""
msgid "Add muscle"
msgstr ""
-#: exercises/templates/muscles/overview.html:81
+#: exercises/templates/muscles/overview.html:85
msgid ""
"No exercises for this muscle. Add or edit an exercise and set the muscle."
msgstr ""
@@ -2240,7 +2252,7 @@ msgstr ""
msgid "Edit gym"
msgstr ""
-#: i18n.tpl:2
+#: i18n.tpl:2 i18n.tpl:28
msgid "Abs"
msgstr "Vatsalihakset"
@@ -2252,11 +2264,11 @@ msgstr "Kädet"
msgid "Back"
msgstr "Selkä"
-#: i18n.tpl:5
+#: i18n.tpl:5 i18n.tpl:23
msgid "Calves"
msgstr "Pohkeet"
-#: i18n.tpl:6
+#: i18n.tpl:6 i18n.tpl:26
msgid "Chest"
msgstr "Rinta"
@@ -2264,7 +2276,7 @@ msgstr "Rinta"
msgid "Legs"
msgstr "Jalat"
-#: i18n.tpl:8
+#: i18n.tpl:8 i18n.tpl:19
msgid "Shoulders"
msgstr "Hartiat"
@@ -2293,109 +2305,71 @@ msgid "Kettlebell"
msgstr "Kahvakuula"
#: i18n.tpl:15
-msgid "none (bodyweight exercise)"
-msgstr ""
-
-#: i18n.tpl:16
msgid "Pull-up bar"
msgstr "Leuanvetotanko"
+#: i18n.tpl:16
+msgid "SZ-Bar"
+msgstr ""
+
#: i18n.tpl:17
msgid "Swiss Ball"
msgstr ""
#: i18n.tpl:18
-msgid "SZ-Bar"
-msgstr ""
-
-#: i18n.tpl:19
-msgid "Anterior deltoid"
+msgid "none (bodyweight exercise)"
msgstr ""
#: i18n.tpl:20
-msgid "Biceps brachii"
+msgid "Biceps"
msgstr ""
#: i18n.tpl:21
-msgid "Biceps femoris"
+msgid "Hamstrings"
msgstr ""
#: i18n.tpl:22
-msgid "Brachialis"
-msgstr ""
-
-#: i18n.tpl:23
-msgid "Gastrocnemius"
+msgid "Lower back"
msgstr ""
#: i18n.tpl:24
-msgid "Gluteus maximus"
+msgid "Glutes"
msgstr ""
#: i18n.tpl:25
-msgid "Latissimus dorsi"
-msgstr ""
-
-#: i18n.tpl:26
-msgid "Obliquus externus abdominis"
+msgid "Lats"
msgstr ""
#: i18n.tpl:27
-msgid "Pectoralis major"
-msgstr ""
-
-#: i18n.tpl:28
-msgid "Quadriceps femoris"
+msgid "Quads"
msgstr ""
#: i18n.tpl:29
-msgid "Rectus abdominis"
+msgid "Triceps"
msgstr ""
#: i18n.tpl:30
-msgid "Serratus anterior"
-msgstr ""
-
-#: i18n.tpl:31
-msgid "Soleus"
-msgstr ""
-
-#: i18n.tpl:32
-msgid "Trapezius"
-msgstr ""
-
-#: i18n.tpl:33
-msgid "Triceps brachii"
-msgstr ""
-
-#: i18n.tpl:34
msgid "Kilometers"
msgstr ""
-#: i18n.tpl:35
-#, fuzzy
-#| msgid "Reps"
-msgid "Max Reps"
-msgstr "Toistot"
-
-#: i18n.tpl:36
+#: i18n.tpl:31
msgid "Miles"
msgstr ""
-#: i18n.tpl:37
+#: i18n.tpl:32
msgid "Minutes"
msgstr ""
-#: i18n.tpl:38 manager/forms.py:169 manager/models/log.py:71
+#: i18n.tpl:33 manager/forms.py:169 manager/models/log.py:71
#: manager/templates/set/add.html:53
msgid "Repetitions"
msgstr ""
-#: i18n.tpl:39
+#: i18n.tpl:34
msgid "Seconds"
msgstr ""
-#: i18n.tpl:40
+#: i18n.tpl:35
msgid "Until Failure"
msgstr ""
@@ -3892,6 +3866,11 @@ msgstr ""
msgid "Delete weight entry for the %s"
msgstr ""
+#, fuzzy
+#~| msgid "Reps"
+#~ msgid "Max Reps"
+#~ msgstr "Toistot"
+
#~ msgid "Released under the Affero GPL"
#~ msgstr "Julkaistu Affero GPL -lisenssin alla"
diff --git a/wger/locale/fr/LC_MESSAGES/django.mo b/wger/locale/fr/LC_MESSAGES/django.mo
index f9324b9d7..b282533b5 100644
Binary files a/wger/locale/fr/LC_MESSAGES/django.mo and b/wger/locale/fr/LC_MESSAGES/django.mo differ
diff --git a/wger/locale/fr/LC_MESSAGES/django.po b/wger/locale/fr/LC_MESSAGES/django.po
index 8395b6b73..a5f6ca370 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: 2022-02-15 14:51+0100\n"
+"POT-Creation-Date: 2022-05-14 12:01+0200\n"
"PO-Revision-Date: 2021-11-07 16:51+0000\n"
"Last-Translator: J. Lavoie <[email protected]>\n"
"Language-Team: French <https://hosted.weblate.org/projects/wger/web/fr/>\n"
@@ -55,7 +55,7 @@ msgstr "Exercices"
msgid "Ingredients"
msgstr "Ingrédients"
-#: config/templates/language/overview.html:4 core/templates/navigation.html:228
+#: config/templates/language/overview.html:4 core/templates/navigation.html:226
msgid "Languages"
msgstr "Langues"
@@ -231,8 +231,8 @@ msgstr "Mon programme d’entraînement"
msgid "Empty placeholder schedule"
msgstr "Programme vide de démonstration"
-#: core/forms.py:61 core/templates/navigation.html:190
-#: core/templates/navigation.html:194 core/templates/user/login.html:4
+#: core/forms.py:61 core/templates/navigation.html:188
+#: core/templates/navigation.html:192 core/templates/user/login.html:4
#: software/templates/features.html:43
msgid "Login"
msgstr "Se connecter"
@@ -309,8 +309,8 @@ msgstr "Mot de passe invalide"
msgid "The form is secured with reCAPTCHA"
msgstr "Le formulaire est sécurisé avec reCAPTCHA"
-#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:190
-#: core/templates/navigation.html:195 core/templates/template.html:150
+#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:188
+#: core/templates/navigation.html:193 core/templates/template.html:149
#: core/templates/user/login.html:20 core/views/user.py:293
#: software/templates/features.html:38
msgid "Register"
@@ -636,7 +636,7 @@ msgstr "Cliquer pour ajouter un journal de poids à un jour :"
#: core/templates/index.html:33 core/templates/index.html:73
#: core/templates/misc/fragments/shariff_modal.html:29
-#: core/templates/template.html:125 manager/templates/calendar/month.html:138
+#: core/templates/template.html:124 manager/templates/calendar/month.html:138
#: manager/templates/schedule/view.html:246
#: manager/templates/schedule/view.html:266
#: manager/templates/workout/view.html:132
@@ -773,7 +773,7 @@ msgstr "Aucun plan de nutrition."
msgid "Weight"
msgstr "Poids"
-#: core/templates/index.html:210 core/templates/navigation.html:97
+#: core/templates/index.html:210 core/templates/navigation.html:135
#: weight/views.py:70
msgid "Add weight entry"
msgstr "Ajouter une entrée"
@@ -805,8 +805,8 @@ msgstr "Liste des licences"
msgid "Nothing found"
msgstr "Rien trouvé"
-#: core/templates/misc/about.html:4 core/templates/template.html:175
-#: core/templates/template_features.html:118
+#: core/templates/misc/about.html:4 core/templates/template.html:174
+#: core/templates/template_features.html:117
#: core/templates/template_no_context.html:88
msgid "Imprint"
msgstr "Informations légales"
@@ -892,13 +892,13 @@ msgstr "par équipement"
#: exercises/templates/equipment/overview.html:113
#: exercises/templates/exercise/overview.html:112
#: exercises/templates/exercise/overview.html:116
-#: exercises/templates/muscles/overview.html:108
#: exercises/templates/muscles/overview.html:112
+#: exercises/templates/muscles/overview.html:116
msgid "Add new exercise"
msgstr "Ajouter nouvel exercice"
-#: core/templates/navigation.html:75 core/templates/navigation.html:134
-#: core/templates/navigation.html:226
+#: core/templates/navigation.html:75 core/templates/navigation.html:116
+#: core/templates/navigation.html:224
msgid "Administration"
msgstr "Administration"
@@ -921,106 +921,106 @@ msgstr "Muscles"
msgid "Categories"
msgstr "Catégories"
-#: core/templates/navigation.html:94
-msgid "Body weight"
-msgstr "Poids corporel"
-
-#: core/templates/navigation.html:96 core/templates/user/overview.html:114
-#: weight/templates/overview.html:7
-msgid "Weight overview"
-msgstr "Aperçu poids"
-
-#: core/templates/navigation.html:111 software/templates/features.html:87
+#: core/templates/navigation.html:93 software/templates/features.html:87
msgid "Nutrition"
msgstr "Nutrition"
-#: core/templates/navigation.html:117 core/templates/user/overview.html:144
+#: core/templates/navigation.html:99 core/templates/user/overview.html:144
msgid "Nutrition plans"
msgstr "Plans de nutrition"
-#: core/templates/navigation.html:123 nutrition/templates/bmi/form.html:50
+#: core/templates/navigation.html:105 nutrition/templates/bmi/form.html:50
msgid "BMI calculator"
msgstr "Calculateur d’IMC"
-#: core/templates/navigation.html:129 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:111 nutrition/templates/rate/form.html:17
msgid "Daily calories calculator"
msgstr "Calculateur de calories quotidiennes"
-#: core/templates/navigation.html:131
+#: core/templates/navigation.html:113
#: nutrition/templates/ingredient/overview.html:29
msgid "Ingredient overview"
msgstr "Aperçu ingrédients"
-#: core/templates/navigation.html:135 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:117 nutrition/templates/units/list.html:6
msgid "Ingredient weight units"
msgstr "Unité de poids des ingrédients"
-#: core/templates/navigation.html:136
+#: core/templates/navigation.html:118
#: nutrition/templates/ingredient/pending.html:6
msgid "Ingredients pending review"
msgstr "Ingrédients en attente d'examen"
-#: core/templates/navigation.html:149
+#: core/templates/navigation.html:132
+msgid "Body weight"
+msgstr "Poids corporel"
+
+#: core/templates/navigation.html:134 core/templates/user/overview.html:114
+#: weight/templates/overview.html:7
+msgid "Weight overview"
+msgstr "Aperçu poids"
+
+#: core/templates/navigation.html:147
msgid "About this software"
msgstr "À propos de ce logiciel"
-#: core/templates/navigation.html:151 core/templates/template_features.html:83
+#: core/templates/navigation.html:149 core/templates/template_features.html:82
#: software/templates/about_us.html:5
msgid "About us"
msgstr "À propos de nous"
-#: core/templates/navigation.html:153 software/templates/features.html:209
+#: core/templates/navigation.html:151 software/templates/features.html:209
msgid "REST API"
msgstr "API REST"
-#: core/templates/navigation.html:157 utils/models.py:40
+#: core/templates/navigation.html:155 utils/models.py:40
msgid "License"
msgstr "Licence"
-#: core/templates/navigation.html:163
+#: core/templates/navigation.html:161
msgid "Developer documentation"
msgstr "Documentation du développeur"
-#: core/templates/navigation.html:169
+#: core/templates/navigation.html:167
msgid "Get the code"
msgstr "Récupérer le code"
-#: core/templates/navigation.html:175 core/templates/template.html:205
-#: core/templates/template_features.html:100
+#: core/templates/navigation.html:173 core/templates/template.html:204
+#: core/templates/template_features.html:99
msgid "Translate"
msgstr "Traduire"
-#: core/templates/navigation.html:196 core/templates/user/login.html:28
+#: core/templates/navigation.html:194 core/templates/user/login.html:28
msgid "Reset password"
msgstr "Réinitialiser le mot de passe"
-#: core/templates/navigation.html:209
+#: core/templates/navigation.html:207
msgid "My preferences"
msgstr "Mes préférences"
-#: core/templates/navigation.html:216
+#: core/templates/navigation.html:214
msgid "Logout"
msgstr "Se déconnecter"
-#: core/templates/navigation.html:231
+#: core/templates/navigation.html:229
msgid "Licenses"
msgstr "Licences"
-#: core/templates/navigation.html:234
+#: core/templates/navigation.html:232
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr "Unités de répétition"
-#: core/templates/navigation.html:237 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:235 core/templates/weight_unit/list.html:4
#: nutrition/templates/ingredient/view.html:174
msgid "Weight units"
msgstr "Unité de poids"
-#: core/templates/navigation.html:240 core/templates/user/list.html:4
+#: core/templates/navigation.html:238 core/templates/user/list.html:4
msgid "User list"
msgstr "Liste des utilisateurs"
-#: core/templates/navigation.html:241
+#: core/templates/navigation.html:239
msgid "Gyms"
msgstr "Activités"
@@ -1105,7 +1105,7 @@ msgstr "Ajouter un journal de poids"
#: core/templates/tags/render_day.html:114
#: exercises/templates/equipment/overview.html:59
#: exercises/templates/exercise/overview.html:63
-#: exercises/templates/muscles/overview.html:61
+#: exercises/templates/muscles/overview.html:65
msgid "Placeholder image for exercise"
msgstr "Espace réservé pour l'image de l'exercice"
@@ -1132,23 +1132,23 @@ msgstr "Reps"
msgid "RiR"
msgstr "ReR"
-#: core/templates/template.html:140
+#: core/templates/template.html:139
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:144
+#: core/templates/template.html:143
msgid "Create some demo entries"
msgstr "Créer des entrées de démo"
-#: core/templates/template.html:176 core/templates/template_features.html:122
+#: core/templates/template.html:175 core/templates/template_features.html:121
#: core/templates/template_no_context.html:89 software/templates/tos.html:7
msgid "Terms of service"
msgstr "Conditions d’utilisation"
-#: core/templates/template_features.html:62 software/templates/features.html:9
+#: core/templates/template_features.html:61 software/templates/features.html:9
#: software/templates/features.html:120
msgid "Features"
msgstr "Fonctionnalités"
@@ -1575,7 +1575,7 @@ msgstr "Muscles primaires"
#: exercises/models/base.py:64 exercises/templates/equipment/overview.html:71
#: exercises/templates/exercise/overview.html:76
#: exercises/templates/exercise/view.html:268
-#: exercises/templates/muscles/overview.html:73
+#: exercises/templates/muscles/overview.html:77
msgid "Secondary muscles"
msgstr "Muscles secondaires"
@@ -1587,9 +1587,9 @@ msgstr "Variations"
msgid "Exercise Categories"
msgstr "Catégorie d'exercices"
-#: exercises/models/comment.py:34 exercises/models/image.py:75
-#: exercises/models/video.py:82 manager/forms.py:165 manager/helpers.py:89
-#: manager/models/log.py:51
+#: exercises/models/comment.py:34 exercises/models/exercise_alias.py:32
+#: exercises/models/image.py:75 exercises/models/video.py:82
+#: manager/forms.py:165 manager/helpers.py:89 manager/models/log.py:51
msgid "Exercise"
msgstr "Exercice"
@@ -1615,6 +1615,12 @@ msgstr "Nouvel exercice proposé par un utilisateur"
msgid "The user {0} submitted a new exercise \"{1}\"."
msgstr "L'utilisateur {0} a proposé un nouvel exercice « {1} »."
+#: exercises/models/exercise_alias.py:35
+#, fuzzy
+#| msgid "Correcting an exercise"
+msgid "Alias for an exercise"
+msgstr "Corriger un exercice"
+
#: exercises/models/image.py:59
msgid "Line"
msgstr ""
@@ -1677,6 +1683,16 @@ msgstr ""
msgid "In latin, e.g. \"Pectoralis major\""
msgstr "En latin, par ex. « Pectoralis major »"
+#: exercises/models/muscle.py:47
+#, fuzzy
+#| msgid "exercise name"
+msgid "Alternative name"
+msgstr "nom de l'exercice"
+
+#: exercises/models/muscle.py:48
+msgid "A more basic name for the muscle"
+msgstr ""
+
#: exercises/models/video.py:41
msgid "Maximum file size is 100MB."
msgstr ""
@@ -1745,7 +1761,7 @@ msgstr "Résumé de l'équipement"
#: exercises/templates/equipment/overview.html:69
#: exercises/templates/exercise/overview.html:74
#: exercises/templates/exercise/view.html:264
-#: exercises/templates/muscles/overview.html:71
+#: exercises/templates/muscles/overview.html:75
msgid "Main muscles"
msgstr "Muscles principaux"
@@ -1770,7 +1786,7 @@ msgstr "nom de l'exercice"
#: exercises/templates/equipment/overview.html:115
#: exercises/templates/exercise/overview.html:118
-#: exercises/templates/muscles/overview.html:114
+#: exercises/templates/muscles/overview.html:118
#: nutrition/templates/ingredient/overview.html:85
msgid "Only registered users can do this"
msgstr "Seul les utilisateurs enregistrés peuvent faire ça"
@@ -1970,7 +1986,7 @@ msgstr "Résumé du muscle"
msgid "Add muscle"
msgstr "Ajouter un muscle"
-#: exercises/templates/muscles/overview.html:81
+#: exercises/templates/muscles/overview.html:85
msgid ""
"No exercises for this muscle. Add or edit an exercise and set the muscle."
msgstr ""
@@ -2356,7 +2372,7 @@ msgstr "Ajouter un utilisateur à l'activité"
msgid "Edit gym"
msgstr "Modifier l’activité"
-#: i18n.tpl:2
+#: i18n.tpl:2 i18n.tpl:28
msgid "Abs"
msgstr "Abdominaux"
@@ -2368,11 +2384,11 @@ msgstr "Bras"
msgid "Back"
msgstr "Dos"
-#: i18n.tpl:5
+#: i18n.tpl:5 i18n.tpl:23
msgid "Calves"
msgstr "Mollets"
-#: i18n.tpl:6
+#: i18n.tpl:6 i18n.tpl:26
msgid "Chest"
msgstr "Torse"
@@ -2380,7 +2396,7 @@ msgstr "Torse"
msgid "Legs"
msgstr "Jambes"
-#: i18n.tpl:8
+#: i18n.tpl:8 i18n.tpl:19
msgid "Shoulders"
msgstr "Épaules"
@@ -2409,107 +2425,77 @@ msgid "Kettlebell"
msgstr "Kettlebell"
#: i18n.tpl:15
-msgid "none (bodyweight exercise)"
-msgstr "aucun (poids du corps)"
-
-#: i18n.tpl:16
msgid "Pull-up bar"
msgstr "Barre de traction"
+#: i18n.tpl:16
+msgid "SZ-Bar"
+msgstr "Barre Ez"
+
#: i18n.tpl:17
msgid "Swiss Ball"
msgstr "Médecine ball"
#: i18n.tpl:18
-msgid "SZ-Bar"
-msgstr "Barre Ez"
-
-#: i18n.tpl:19
-msgid "Anterior deltoid"
-msgstr "Deltoïde antérieur"
+msgid "none (bodyweight exercise)"
+msgstr "aucun (poids du corps)"
#: i18n.tpl:20
-msgid "Biceps brachii"
+#, fuzzy
+#| msgid "Biceps brachii"
+msgid "Biceps"
msgstr "Biceps brachial"
#: i18n.tpl:21
-msgid "Biceps femoris"
-msgstr "Biceps fémoral"
+msgid "Hamstrings"
+msgstr ""
#: i18n.tpl:22
-msgid "Brachialis"
-msgstr "Muscle brachial"
-
-#: i18n.tpl:23
-msgid "Gastrocnemius"
-msgstr "Mollet"
+msgid "Lower back"
+msgstr ""
#: i18n.tpl:24
-msgid "Gluteus maximus"
-msgstr "Grand fessier"
+#, fuzzy
+#| msgid "Minutes"
+msgid "Glutes"
+msgstr "minutes"
#: i18n.tpl:25
-msgid "Latissimus dorsi"
-msgstr "Grand dorsal"
-
-#: i18n.tpl:26
-msgid "Obliquus externus abdominis"
-msgstr "Grand oblique de l’abdomen"
+msgid "Lats"
+msgstr ""
#: i18n.tpl:27
-msgid "Pectoralis major"
-msgstr "Grand pectoral"
-
-#: i18n.tpl:28
-msgid "Quadriceps femoris"
-msgstr "Quadriceps fémoral"
+msgid "Quads"
+msgstr ""
#: i18n.tpl:29
-msgid "Rectus abdominis"
-msgstr "Muscle droit de l'abdomen"
-
-#: i18n.tpl:30
-msgid "Serratus anterior"
-msgstr "Muscle dentelé antérieur"
-
-#: i18n.tpl:31
-msgid "Soleus"
-msgstr "Muscle soléaire"
-
-#: i18n.tpl:32
-msgid "Trapezius"
-msgstr "Trapèze"
-
-#: i18n.tpl:33
-msgid "Triceps brachii"
+#, fuzzy
+#| msgid "Triceps brachii"
+msgid "Triceps"
msgstr "Triceps brachial"
-#: i18n.tpl:34
+#: i18n.tpl:30
msgid "Kilometers"
msgstr "kilomètres"
-#: i18n.tpl:35
-msgid "Max Reps"
-msgstr "Reps max"
-
-#: i18n.tpl:36
+#: i18n.tpl:31
msgid "Miles"
msgstr "miles"
-#: i18n.tpl:37
+#: i18n.tpl:32
msgid "Minutes"
msgstr "minutes"
-#: i18n.tpl:38 manager/forms.py:169 manager/models/log.py:71
+#: i18n.tpl:33 manager/forms.py:169 manager/models/log.py:71
#: manager/templates/set/add.html:53
msgid "Repetitions"
msgstr "Répétitions"
-#: i18n.tpl:39
+#: i18n.tpl:34
msgid "Seconds"
msgstr "secondes"
-#: i18n.tpl:40
+#: i18n.tpl:35
msgid "Until Failure"
msgstr "Jusqu'à l'échec"
@@ -4204,6 +4190,48 @@ msgstr "Supprimé avec succès."
msgid "Delete weight entry for the %s"
msgstr "Supprimer l’entrée de poids pour le %s"
+#~ msgid "Anterior deltoid"
+#~ msgstr "Deltoïde antérieur"
+
+#~ msgid "Biceps femoris"
+#~ msgstr "Biceps fémoral"
+
+#~ msgid "Brachialis"
+#~ msgstr "Muscle brachial"
+
+#~ msgid "Gastrocnemius"
+#~ msgstr "Mollet"
+
+#~ msgid "Gluteus maximus"
+#~ msgstr "Grand fessier"
+
+#~ msgid "Latissimus dorsi"
+#~ msgstr "Grand dorsal"
+
+#~ msgid "Obliquus externus abdominis"
+#~ msgstr "Grand oblique de l’abdomen"
+
+#~ msgid "Pectoralis major"
+#~ msgstr "Grand pectoral"
+
+#~ msgid "Quadriceps femoris"
+#~ msgstr "Quadriceps fémoral"
+
+#~ msgid "Rectus abdominis"
+#~ msgstr "Muscle droit de l'abdomen"
+
+#~ msgid "Serratus anterior"
+#~ msgstr "Muscle dentelé antérieur"
+
+#~ msgid "Soleus"
+#~ msgstr "Muscle soléaire"
+
+#~ msgid "Trapezius"
+#~ msgstr "Trapèze"
+
+#~ msgid "Max Reps"
+#~ msgstr "Reps max"
+
#~ msgid "Your current weight is: "
#~ msgstr "Votre poids actuel est : "
diff --git a/wger/locale/he/LC_MESSAGES/django.po b/wger/locale/he/LC_MESSAGES/django.po
index e0bcfff04..f997df826 100644
--- a/wger/locale/he/LC_MESSAGES/django.po
+++ b/wger/locale/he/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-02-15 14:51+0100\n"
+"POT-Creation-Date: 2022-05-14 12:01+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
@@ -38,7 +38,7 @@ msgstr ""
msgid "Ingredients"
msgstr ""
-#: config/templates/language/overview.html:4 core/templates/navigation.html:228
+#: config/templates/language/overview.html:4 core/templates/navigation.html:226
msgid "Languages"
msgstr ""
@@ -210,8 +210,8 @@ msgstr ""
msgid "Empty placeholder schedule"
msgstr ""
-#: core/forms.py:61 core/templates/navigation.html:190
-#: core/templates/navigation.html:194 core/templates/user/login.html:4
+#: core/forms.py:61 core/templates/navigation.html:188
+#: core/templates/navigation.html:192 core/templates/user/login.html:4
#: software/templates/features.html:43
msgid "Login"
msgstr ""
@@ -284,8 +284,8 @@ msgstr ""
msgid "The form is secured with reCAPTCHA"
msgstr ""
-#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:190
-#: core/templates/navigation.html:195 core/templates/template.html:150
+#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:188
+#: core/templates/navigation.html:193 core/templates/template.html:149
#: core/templates/user/login.html:20 core/views/user.py:293
#: software/templates/features.html:38
msgid "Register"
@@ -585,7 +585,7 @@ msgstr ""
#: core/templates/index.html:33 core/templates/index.html:73
#: core/templates/misc/fragments/shariff_modal.html:29
-#: core/templates/template.html:125 manager/templates/calendar/month.html:138
+#: core/templates/template.html:124 manager/templates/calendar/month.html:138
#: manager/templates/schedule/view.html:246
#: manager/templates/schedule/view.html:266
#: manager/templates/workout/view.html:132
@@ -717,7 +717,7 @@ msgstr ""
msgid "Weight"
msgstr ""
-#: core/templates/index.html:210 core/templates/navigation.html:97
+#: core/templates/index.html:210 core/templates/navigation.html:135
#: weight/views.py:70
msgid "Add weight entry"
msgstr ""
@@ -749,8 +749,8 @@ msgstr ""
msgid "Nothing found"
msgstr ""
-#: core/templates/misc/about.html:4 core/templates/template.html:175
-#: core/templates/template_features.html:118
+#: core/templates/misc/about.html:4 core/templates/template.html:174
+#: core/templates/template_features.html:117
#: core/templates/template_no_context.html:88
msgid "Imprint"
msgstr ""
@@ -832,13 +832,13 @@ msgstr ""
#: exercises/templates/equipment/overview.html:113
#: exercises/templates/exercise/overview.html:112
#: exercises/templates/exercise/overview.html:116
-#: exercises/templates/muscles/overview.html:108
#: exercises/templates/muscles/overview.html:112
+#: exercises/templates/muscles/overview.html:116
msgid "Add new exercise"
msgstr ""
-#: core/templates/navigation.html:75 core/templates/navigation.html:134
-#: core/templates/navigation.html:226
+#: core/templates/navigation.html:75 core/templates/navigation.html:116
+#: core/templates/navigation.html:224
msgid "Administration"
msgstr ""
@@ -861,106 +861,106 @@ msgstr ""
msgid "Categories"
msgstr ""
-#: core/templates/navigation.html:94
-msgid "Body weight"
-msgstr ""
-
-#: core/templates/navigation.html:96 core/templates/user/overview.html:114
-#: weight/templates/overview.html:7
-msgid "Weight overview"
-msgstr ""
-
-#: core/templates/navigation.html:111 software/templates/features.html:87
+#: core/templates/navigation.html:93 software/templates/features.html:87
msgid "Nutrition"
msgstr ""
-#: core/templates/navigation.html:117 core/templates/user/overview.html:144
+#: core/templates/navigation.html:99 core/templates/user/overview.html:144
msgid "Nutrition plans"
msgstr ""
-#: core/templates/navigation.html:123 nutrition/templates/bmi/form.html:50
+#: core/templates/navigation.html:105 nutrition/templates/bmi/form.html:50
msgid "BMI calculator"
msgstr ""
-#: core/templates/navigation.html:129 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:111 nutrition/templates/rate/form.html:17
msgid "Daily calories calculator"
msgstr ""
-#: core/templates/navigation.html:131
+#: core/templates/navigation.html:113
#: nutrition/templates/ingredient/overview.html:29
msgid "Ingredient overview"
msgstr ""
-#: core/templates/navigation.html:135 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:117 nutrition/templates/units/list.html:6
msgid "Ingredient weight units"
msgstr ""
-#: core/templates/navigation.html:136
+#: core/templates/navigation.html:118
#: nutrition/templates/ingredient/pending.html:6
msgid "Ingredients pending review"
msgstr ""
-#: core/templates/navigation.html:149
+#: core/templates/navigation.html:132
+msgid "Body weight"
+msgstr ""
+
+#: core/templates/navigation.html:134 core/templates/user/overview.html:114
+#: weight/templates/overview.html:7
+msgid "Weight overview"
+msgstr ""
+
+#: core/templates/navigation.html:147
msgid "About this software"
msgstr ""
-#: core/templates/navigation.html:151 core/templates/template_features.html:83
+#: core/templates/navigation.html:149 core/templates/template_features.html:82
#: software/templates/about_us.html:5
msgid "About us"
msgstr ""
-#: core/templates/navigation.html:153 software/templates/features.html:209
+#: core/templates/navigation.html:151 software/templates/features.html:209
msgid "REST API"
msgstr ""
-#: core/templates/navigation.html:157 utils/models.py:40
+#: core/templates/navigation.html:155 utils/models.py:40
msgid "License"
msgstr ""
-#: core/templates/navigation.html:163
+#: core/templates/navigation.html:161
msgid "Developer documentation"
msgstr ""
-#: core/templates/navigation.html:169
+#: core/templates/navigation.html:167
msgid "Get the code"
msgstr ""
-#: core/templates/navigation.html:175 core/templates/template.html:205
-#: core/templates/template_features.html:100
+#: core/templates/navigation.html:173 core/templates/template.html:204
+#: core/templates/template_features.html:99
msgid "Translate"
msgstr ""
-#: core/templates/navigation.html:196 core/templates/user/login.html:28
+#: core/templates/navigation.html:194 core/templates/user/login.html:28
msgid "Reset password"
msgstr ""
-#: core/templates/navigation.html:209
+#: core/templates/navigation.html:207
msgid "My preferences"
msgstr ""
-#: core/templates/navigation.html:216
+#: core/templates/navigation.html:214
msgid "Logout"
msgstr ""
-#: core/templates/navigation.html:231
+#: core/templates/navigation.html:229
msgid "Licenses"
msgstr ""
-#: core/templates/navigation.html:234
+#: core/templates/navigation.html:232
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr ""
-#: core/templates/navigation.html:237 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:235 core/templates/weight_unit/list.html:4
#: nutrition/templates/ingredient/view.html:174
msgid "Weight units"
msgstr ""
-#: core/templates/navigation.html:240 core/templates/user/list.html:4
+#: core/templates/navigation.html:238 core/templates/user/list.html:4
msgid "User list"
msgstr ""
-#: core/templates/navigation.html:241
+#: core/templates/navigation.html:239
msgid "Gyms"
msgstr ""
@@ -1038,7 +1038,7 @@ msgstr ""
#: core/templates/tags/render_day.html:114
#: exercises/templates/equipment/overview.html:59
#: exercises/templates/exercise/overview.html:63
-#: exercises/templates/muscles/overview.html:61
+#: exercises/templates/muscles/overview.html:65
msgid "Placeholder image for exercise"
msgstr ""
@@ -1065,21 +1065,21 @@ msgstr ""
msgid "RiR"
msgstr ""
-#: core/templates/template.html:140
+#: core/templates/template.html:139
msgid ""
"You are using a guest account, data entered will be deleted after a week."
msgstr ""
-#: core/templates/template.html:144
+#: core/templates/template.html:143
msgid "Create some demo entries"
msgstr ""
-#: core/templates/template.html:176 core/templates/template_features.html:122
+#: core/templates/template.html:175 core/templates/template_features.html:121
#: core/templates/template_no_context.html:89 software/templates/tos.html:7
msgid "Terms of service"
msgstr ""
-#: core/templates/template_features.html:62 software/templates/features.html:9
+#: core/templates/template_features.html:61 software/templates/features.html:9
#: software/templates/features.html:120
msgid "Features"
msgstr ""
@@ -1489,7 +1489,7 @@ msgstr ""
#: exercises/models/base.py:64 exercises/templates/equipment/overview.html:71
#: exercises/templates/exercise/overview.html:76
#: exercises/templates/exercise/view.html:268
-#: exercises/templates/muscles/overview.html:73
+#: exercises/templates/muscles/overview.html:77
msgid "Secondary muscles"
msgstr ""
@@ -1501,9 +1501,9 @@ msgstr ""
msgid "Exercise Categories"
msgstr ""
-#: exercises/models/comment.py:34 exercises/models/image.py:75
-#: exercises/models/video.py:82 manager/forms.py:165 manager/helpers.py:89
-#: manager/models/log.py:51
+#: exercises/models/comment.py:34 exercises/models/exercise_alias.py:32
+#: exercises/models/image.py:75 exercises/models/video.py:82
+#: manager/forms.py:165 manager/helpers.py:89 manager/models/log.py:51
msgid "Exercise"
msgstr ""
@@ -1529,6 +1529,10 @@ msgstr ""
msgid "The user {0} submitted a new exercise \"{1}\"."
msgstr ""
+#: exercises/models/exercise_alias.py:35
+msgid "Alias for an exercise"
+msgstr ""
+
#: exercises/models/image.py:59
msgid "Line"
msgstr ""
@@ -1585,6 +1589,14 @@ msgstr ""
msgid "In latin, e.g. \"Pectoralis major\""
msgstr ""
+#: exercises/models/muscle.py:47
+msgid "Alternative name"
+msgstr ""
+
+#: exercises/models/muscle.py:48
+msgid "A more basic name for the muscle"
+msgstr ""
+
#: exercises/models/video.py:41
msgid "Maximum file size is 100MB."
msgstr ""
@@ -1645,7 +1657,7 @@ msgstr ""
#: exercises/templates/equipment/overview.html:69
#: exercises/templates/exercise/overview.html:74
#: exercises/templates/exercise/view.html:264
-#: exercises/templates/muscles/overview.html:71
+#: exercises/templates/muscles/overview.html:75
msgid "Main muscles"
msgstr ""
@@ -1668,7 +1680,7 @@ msgstr ""
#: exercises/templates/equipment/overview.html:115
#: exercises/templates/exercise/overview.html:118
-#: exercises/templates/muscles/overview.html:114
+#: exercises/templates/muscles/overview.html:118
#: nutrition/templates/ingredient/overview.html:85
msgid "Only registered users can do this"
msgstr ""
@@ -1845,7 +1857,7 @@ msgstr ""
msgid "Add muscle"
msgstr ""
-#: exercises/templates/muscles/overview.html:81
+#: exercises/templates/muscles/overview.html:85
msgid ""
"No exercises for this muscle. Add or edit an exercise and set the muscle."
msgstr ""
@@ -2211,7 +2223,7 @@ msgstr ""
msgid "Edit gym"
msgstr ""
-#: i18n.tpl:2
+#: i18n.tpl:2 i18n.tpl:28
msgid "Abs"
msgstr ""
@@ -2223,11 +2235,11 @@ msgstr ""
msgid "Back"
msgstr ""
-#: i18n.tpl:5
+#: i18n.tpl:5 i18n.tpl:23
msgid "Calves"
msgstr ""
-#: i18n.tpl:6
+#: i18n.tpl:6 i18n.tpl:26
msgid "Chest"
msgstr ""
@@ -2235,7 +2247,7 @@ msgstr ""
msgid "Legs"
msgstr ""
-#: i18n.tpl:8
+#: i18n.tpl:8 i18n.tpl:19
msgid "Shoulders"
msgstr ""
@@ -2264,11 +2276,11 @@ msgid "Kettlebell"
msgstr ""
#: i18n.tpl:15
-msgid "none (bodyweight exercise)"
+msgid "Pull-up bar"
msgstr ""
#: i18n.tpl:16
-msgid "Pull-up bar"
+msgid "SZ-Bar"
msgstr ""
#: i18n.tpl:17
@@ -2276,95 +2288,59 @@ msgid "Swiss Ball"
msgstr ""
#: i18n.tpl:18
-msgid "SZ-Bar"
-msgstr ""
-
-#: i18n.tpl:19
-msgid "Anterior deltoid"
+msgid "none (bodyweight exercise)"
msgstr ""
#: i18n.tpl:20
-msgid "Biceps brachii"
+msgid "Biceps"
msgstr ""
#: i18n.tpl:21
-msgid "Biceps femoris"
+msgid "Hamstrings"
msgstr ""
#: i18n.tpl:22
-msgid "Brachialis"
-msgstr ""
-
-#: i18n.tpl:23
-msgid "Gastrocnemius"
+msgid "Lower back"
msgstr ""
#: i18n.tpl:24
-msgid "Gluteus maximus"
+msgid "Glutes"
msgstr ""
#: i18n.tpl:25
-msgid "Latissimus dorsi"
-msgstr ""
-
-#: i18n.tpl:26
-msgid "Obliquus externus abdominis"
+msgid "Lats"
msgstr ""
#: i18n.tpl:27
-msgid "Pectoralis major"
-msgstr ""
-
-#: i18n.tpl:28
-msgid "Quadriceps femoris"
+msgid "Quads"
msgstr ""
#: i18n.tpl:29
-msgid "Rectus abdominis"
+msgid "Triceps"
msgstr ""
#: i18n.tpl:30
-msgid "Serratus anterior"
-msgstr ""
-
-#: i18n.tpl:31
-msgid "Soleus"
-msgstr ""
-
-#: i18n.tpl:32
-msgid "Trapezius"
-msgstr ""
-
-#: i18n.tpl:33
-msgid "Triceps brachii"
-msgstr ""
-
-#: i18n.tpl:34
msgid "Kilometers"
msgstr ""
-#: i18n.tpl:35
-msgid "Max Reps"
-msgstr ""
-
-#: i18n.tpl:36
+#: i18n.tpl:31
msgid "Miles"
msgstr ""
-#: i18n.tpl:37
+#: i18n.tpl:32
msgid "Minutes"
msgstr ""
-#: i18n.tpl:38 manager/forms.py:169 manager/models/log.py:71
+#: i18n.tpl:33 manager/forms.py:169 manager/models/log.py:71
#: manager/templates/set/add.html:53
msgid "Repetitions"
msgstr ""
-#: i18n.tpl:39
+#: i18n.tpl:34
msgid "Seconds"
msgstr ""
-#: i18n.tpl:40
+#: i18n.tpl:35
msgid "Until Failure"
msgstr ""
diff --git a/wger/locale/hi/LC_MESSAGES/django.po b/wger/locale/hi/LC_MESSAGES/django.po
index e0bcfff04..f997df826 100644
--- a/wger/locale/hi/LC_MESSAGES/django.po
+++ b/wger/locale/hi/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-02-15 14:51+0100\n"
+"POT-Creation-Date: 2022-05-14 12:01+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
@@ -38,7 +38,7 @@ msgstr ""
msgid "Ingredients"
msgstr ""
-#: config/templates/language/overview.html:4 core/templates/navigation.html:228
+#: config/templates/language/overview.html:4 core/templates/navigation.html:226
msgid "Languages"
msgstr ""
@@ -210,8 +210,8 @@ msgstr ""
msgid "Empty placeholder schedule"
msgstr ""
-#: core/forms.py:61 core/templates/navigation.html:190
-#: core/templates/navigation.html:194 core/templates/user/login.html:4
+#: core/forms.py:61 core/templates/navigation.html:188
+#: core/templates/navigation.html:192 core/templates/user/login.html:4
#: software/templates/features.html:43
msgid "Login"
msgstr ""
@@ -284,8 +284,8 @@ msgstr ""
msgid "The form is secured with reCAPTCHA"
msgstr ""
-#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:190
-#: core/templates/navigation.html:195 core/templates/template.html:150
+#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:188
+#: core/templates/navigation.html:193 core/templates/template.html:149
#: core/templates/user/login.html:20 core/views/user.py:293
#: software/templates/features.html:38
msgid "Register"
@@ -585,7 +585,7 @@ msgstr ""
#: core/templates/index.html:33 core/templates/index.html:73
#: core/templates/misc/fragments/shariff_modal.html:29
-#: core/templates/template.html:125 manager/templates/calendar/month.html:138
+#: core/templates/template.html:124 manager/templates/calendar/month.html:138
#: manager/templates/schedule/view.html:246
#: manager/templates/schedule/view.html:266
#: manager/templates/workout/view.html:132
@@ -717,7 +717,7 @@ msgstr ""
msgid "Weight"
msgstr ""
-#: core/templates/index.html:210 core/templates/navigation.html:97
+#: core/templates/index.html:210 core/templates/navigation.html:135
#: weight/views.py:70
msgid "Add weight entry"
msgstr ""
@@ -749,8 +749,8 @@ msgstr ""
msgid "Nothing found"
msgstr ""
-#: core/templates/misc/about.html:4 core/templates/template.html:175
-#: core/templates/template_features.html:118
+#: core/templates/misc/about.html:4 core/templates/template.html:174
+#: core/templates/template_features.html:117
#: core/templates/template_no_context.html:88
msgid "Imprint"
msgstr ""
@@ -832,13 +832,13 @@ msgstr ""
#: exercises/templates/equipment/overview.html:113
#: exercises/templates/exercise/overview.html:112
#: exercises/templates/exercise/overview.html:116
-#: exercises/templates/muscles/overview.html:108
#: exercises/templates/muscles/overview.html:112
+#: exercises/templates/muscles/overview.html:116
msgid "Add new exercise"
msgstr ""
-#: core/templates/navigation.html:75 core/templates/navigation.html:134
-#: core/templates/navigation.html:226
+#: core/templates/navigation.html:75 core/templates/navigation.html:116
+#: core/templates/navigation.html:224
msgid "Administration"
msgstr ""
@@ -861,106 +861,106 @@ msgstr ""
msgid "Categories"
msgstr ""
-#: core/templates/navigation.html:94
-msgid "Body weight"
-msgstr ""
-
-#: core/templates/navigation.html:96 core/templates/user/overview.html:114
-#: weight/templates/overview.html:7
-msgid "Weight overview"
-msgstr ""
-
-#: core/templates/navigation.html:111 software/templates/features.html:87
+#: core/templates/navigation.html:93 software/templates/features.html:87
msgid "Nutrition"
msgstr ""
-#: core/templates/navigation.html:117 core/templates/user/overview.html:144
+#: core/templates/navigation.html:99 core/templates/user/overview.html:144
msgid "Nutrition plans"
msgstr ""
-#: core/templates/navigation.html:123 nutrition/templates/bmi/form.html:50
+#: core/templates/navigation.html:105 nutrition/templates/bmi/form.html:50
msgid "BMI calculator"
msgstr ""
-#: core/templates/navigation.html:129 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:111 nutrition/templates/rate/form.html:17
msgid "Daily calories calculator"
msgstr ""
-#: core/templates/navigation.html:131
+#: core/templates/navigation.html:113
#: nutrition/templates/ingredient/overview.html:29
msgid "Ingredient overview"
msgstr ""
-#: core/templates/navigation.html:135 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:117 nutrition/templates/units/list.html:6
msgid "Ingredient weight units"
msgstr ""
-#: core/templates/navigation.html:136
+#: core/templates/navigation.html:118
#: nutrition/templates/ingredient/pending.html:6
msgid "Ingredients pending review"
msgstr ""
-#: core/templates/navigation.html:149
+#: core/templates/navigation.html:132
+msgid "Body weight"
+msgstr ""
+
+#: core/templates/navigation.html:134 core/templates/user/overview.html:114
+#: weight/templates/overview.html:7
+msgid "Weight overview"
+msgstr ""
+
+#: core/templates/navigation.html:147
msgid "About this software"
msgstr ""
-#: core/templates/navigation.html:151 core/templates/template_features.html:83
+#: core/templates/navigation.html:149 core/templates/template_features.html:82
#: software/templates/about_us.html:5
msgid "About us"
msgstr ""
-#: core/templates/navigation.html:153 software/templates/features.html:209
+#: core/templates/navigation.html:151 software/templates/features.html:209
msgid "REST API"
msgstr ""
-#: core/templates/navigation.html:157 utils/models.py:40
+#: core/templates/navigation.html:155 utils/models.py:40
msgid "License"
msgstr ""
-#: core/templates/navigation.html:163
+#: core/templates/navigation.html:161
msgid "Developer documentation"
msgstr ""
-#: core/templates/navigation.html:169
+#: core/templates/navigation.html:167
msgid "Get the code"
msgstr ""
-#: core/templates/navigation.html:175 core/templates/template.html:205
-#: core/templates/template_features.html:100
+#: core/templates/navigation.html:173 core/templates/template.html:204
+#: core/templates/template_features.html:99
msgid "Translate"
msgstr ""
-#: core/templates/navigation.html:196 core/templates/user/login.html:28
+#: core/templates/navigation.html:194 core/templates/user/login.html:28
msgid "Reset password"
msgstr ""
-#: core/templates/navigation.html:209
+#: core/templates/navigation.html:207
msgid "My preferences"
msgstr ""
-#: core/templates/navigation.html:216
+#: core/templates/navigation.html:214
msgid "Logout"
msgstr ""
-#: core/templates/navigation.html:231
+#: core/templates/navigation.html:229
msgid "Licenses"
msgstr ""
-#: core/templates/navigation.html:234
+#: core/templates/navigation.html:232
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr ""
-#: core/templates/navigation.html:237 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:235 core/templates/weight_unit/list.html:4
#: nutrition/templates/ingredient/view.html:174
msgid "Weight units"
msgstr ""
-#: core/templates/navigation.html:240 core/templates/user/list.html:4
+#: core/templates/navigation.html:238 core/templates/user/list.html:4
msgid "User list"
msgstr ""
-#: core/templates/navigation.html:241
+#: core/templates/navigation.html:239
msgid "Gyms"
msgstr ""
@@ -1038,7 +1038,7 @@ msgstr ""
#: core/templates/tags/render_day.html:114
#: exercises/templates/equipment/overview.html:59
#: exercises/templates/exercise/overview.html:63
-#: exercises/templates/muscles/overview.html:61
+#: exercises/templates/muscles/overview.html:65
msgid "Placeholder image for exercise"
msgstr ""
@@ -1065,21 +1065,21 @@ msgstr ""
msgid "RiR"
msgstr ""
-#: core/templates/template.html:140
+#: core/templates/template.html:139
msgid ""
"You are using a guest account, data entered will be deleted after a week."
msgstr ""
-#: core/templates/template.html:144
+#: core/templates/template.html:143
msgid "Create some demo entries"
msgstr ""
-#: core/templates/template.html:176 core/templates/template_features.html:122
+#: core/templates/template.html:175 core/templates/template_features.html:121
#: core/templates/template_no_context.html:89 software/templates/tos.html:7
msgid "Terms of service"
msgstr ""
-#: core/templates/template_features.html:62 software/templates/features.html:9
+#: core/templates/template_features.html:61 software/templates/features.html:9
#: software/templates/features.html:120
msgid "Features"
msgstr ""
@@ -1489,7 +1489,7 @@ msgstr ""
#: exercises/models/base.py:64 exercises/templates/equipment/overview.html:71
#: exercises/templates/exercise/overview.html:76
#: exercises/templates/exercise/view.html:268
-#: exercises/templates/muscles/overview.html:73
+#: exercises/templates/muscles/overview.html:77
msgid "Secondary muscles"
msgstr ""
@@ -1501,9 +1501,9 @@ msgstr ""
msgid "Exercise Categories"
msgstr ""
-#: exercises/models/comment.py:34 exercises/models/image.py:75
-#: exercises/models/video.py:82 manager/forms.py:165 manager/helpers.py:89
-#: manager/models/log.py:51
+#: exercises/models/comment.py:34 exercises/models/exercise_alias.py:32
+#: exercises/models/image.py:75 exercises/models/video.py:82
+#: manager/forms.py:165 manager/helpers.py:89 manager/models/log.py:51
msgid "Exercise"
msgstr ""
@@ -1529,6 +1529,10 @@ msgstr ""
msgid "The user {0} submitted a new exercise \"{1}\"."
msgstr ""
+#: exercises/models/exercise_alias.py:35
+msgid "Alias for an exercise"
+msgstr ""
+
#: exercises/models/image.py:59
msgid "Line"
msgstr ""
@@ -1585,6 +1589,14 @@ msgstr ""
msgid "In latin, e.g. \"Pectoralis major\""
msgstr ""
+#: exercises/models/muscle.py:47
+msgid "Alternative name"
+msgstr ""
+
+#: exercises/models/muscle.py:48
+msgid "A more basic name for the muscle"
+msgstr ""
+
#: exercises/models/video.py:41
msgid "Maximum file size is 100MB."
msgstr ""
@@ -1645,7 +1657,7 @@ msgstr ""
#: exercises/templates/equipment/overview.html:69
#: exercises/templates/exercise/overview.html:74
#: exercises/templates/exercise/view.html:264
-#: exercises/templates/muscles/overview.html:71
+#: exercises/templates/muscles/overview.html:75
msgid "Main muscles"
msgstr ""
@@ -1668,7 +1680,7 @@ msgstr ""
#: exercises/templates/equipment/overview.html:115
#: exercises/templates/exercise/overview.html:118
-#: exercises/templates/muscles/overview.html:114
+#: exercises/templates/muscles/overview.html:118
#: nutrition/templates/ingredient/overview.html:85
msgid "Only registered users can do this"
msgstr ""
@@ -1845,7 +1857,7 @@ msgstr ""
msgid "Add muscle"
msgstr ""
-#: exercises/templates/muscles/overview.html:81
+#: exercises/templates/muscles/overview.html:85
msgid ""
"No exercises for this muscle. Add or edit an exercise and set the muscle."
msgstr ""
@@ -2211,7 +2223,7 @@ msgstr ""
msgid "Edit gym"
msgstr ""
-#: i18n.tpl:2
+#: i18n.tpl:2 i18n.tpl:28
msgid "Abs"
msgstr ""
@@ -2223,11 +2235,11 @@ msgstr ""
msgid "Back"
msgstr ""
-#: i18n.tpl:5
+#: i18n.tpl:5 i18n.tpl:23
msgid "Calves"
msgstr ""
-#: i18n.tpl:6
+#: i18n.tpl:6 i18n.tpl:26
msgid "Chest"
msgstr ""
@@ -2235,7 +2247,7 @@ msgstr ""
msgid "Legs"
msgstr ""
-#: i18n.tpl:8
+#: i18n.tpl:8 i18n.tpl:19
msgid "Shoulders"
msgstr ""
@@ -2264,11 +2276,11 @@ msgid "Kettlebell"
msgstr ""
#: i18n.tpl:15
-msgid "none (bodyweight exercise)"
+msgid "Pull-up bar"
msgstr ""
#: i18n.tpl:16
-msgid "Pull-up bar"
+msgid "SZ-Bar"
msgstr ""
#: i18n.tpl:17
@@ -2276,95 +2288,59 @@ msgid "Swiss Ball"
msgstr ""
#: i18n.tpl:18
-msgid "SZ-Bar"
-msgstr ""
-
-#: i18n.tpl:19
-msgid "Anterior deltoid"
+msgid "none (bodyweight exercise)"
msgstr ""
#: i18n.tpl:20
-msgid "Biceps brachii"
+msgid "Biceps"
msgstr ""
#: i18n.tpl:21
-msgid "Biceps femoris"
+msgid "Hamstrings"
msgstr ""
#: i18n.tpl:22
-msgid "Brachialis"
-msgstr ""
-
-#: i18n.tpl:23
-msgid "Gastrocnemius"
+msgid "Lower back"
msgstr ""
#: i18n.tpl:24
-msgid "Gluteus maximus"
+msgid "Glutes"
msgstr ""
#: i18n.tpl:25
-msgid "Latissimus dorsi"
-msgstr ""
-
-#: i18n.tpl:26
-msgid "Obliquus externus abdominis"
+msgid "Lats"
msgstr ""
#: i18n.tpl:27
-msgid "Pectoralis major"
-msgstr ""
-
-#: i18n.tpl:28
-msgid "Quadriceps femoris"
+msgid "Quads"
msgstr ""
#: i18n.tpl:29
-msgid "Rectus abdominis"
+msgid "Triceps"
msgstr ""
#: i18n.tpl:30
-msgid "Serratus anterior"
-msgstr ""
-
-#: i18n.tpl:31
-msgid "Soleus"
-msgstr ""
-
-#: i18n.tpl:32
-msgid "Trapezius"
-msgstr ""
-
-#: i18n.tpl:33
-msgid "Triceps brachii"
-msgstr ""
-
-#: i18n.tpl:34
msgid "Kilometers"
msgstr ""
-#: i18n.tpl:35
-msgid "Max Reps"
-msgstr ""
-
-#: i18n.tpl:36
+#: i18n.tpl:31
msgid "Miles"
msgstr ""
-#: i18n.tpl:37
+#: i18n.tpl:32
msgid "Minutes"
msgstr ""
-#: i18n.tpl:38 manager/forms.py:169 manager/models/log.py:71
+#: i18n.tpl:33 manager/forms.py:169 manager/models/log.py:71
#: manager/templates/set/add.html:53
msgid "Repetitions"
msgstr ""
-#: i18n.tpl:39
+#: i18n.tpl:34
msgid "Seconds"
msgstr ""
-#: i18n.tpl:40
+#: i18n.tpl:35
msgid "Until Failure"
msgstr ""
diff --git a/wger/locale/hu/LC_MESSAGES/django.mo b/wger/locale/hu/LC_MESSAGES/django.mo
index 8d48517a2..a95d243c3 100644
Binary files a/wger/locale/hu/LC_MESSAGES/django.mo and b/wger/locale/hu/LC_MESSAGES/django.mo differ
diff --git a/wger/locale/hu/LC_MESSAGES/django.po b/wger/locale/hu/LC_MESSAGES/django.po
index e0c93f441..96275a19f 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: 2022-02-15 14:51+0100\n"
+"POT-Creation-Date: 2022-05-14 12:01+0200\n"
"PO-Revision-Date: 2021-04-15 07:27+0000\n"
"Last-Translator: László Mócsy <[email protected]>\n"
"Language-Team: Hungarian <https://hosted.weblate.org/projects/wger/web/hu/>\n"
@@ -40,7 +40,7 @@ msgstr "Gyakorlatok"
msgid "Ingredients"
msgstr "Összetevők"
-#: config/templates/language/overview.html:4 core/templates/navigation.html:228
+#: config/templates/language/overview.html:4 core/templates/navigation.html:226
msgid "Languages"
msgstr "Nyelvek"
@@ -212,8 +212,8 @@ msgstr "Az én király edzés ütemtervem"
msgid "Empty placeholder schedule"
msgstr "Üres helyfoglaló ütemterv"
-#: core/forms.py:61 core/templates/navigation.html:190
-#: core/templates/navigation.html:194 core/templates/user/login.html:4
+#: core/forms.py:61 core/templates/navigation.html:188
+#: core/templates/navigation.html:192 core/templates/user/login.html:4
#: software/templates/features.html:43
msgid "Login"
msgstr "Bejelentkezés"
@@ -288,8 +288,8 @@ msgstr "Érvénytelen jelszó"
msgid "The form is secured with reCAPTCHA"
msgstr "Ez az űrlap reCAPTCHA-val van biztosítva"
-#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:190
-#: core/templates/navigation.html:195 core/templates/template.html:150
+#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:188
+#: core/templates/navigation.html:193 core/templates/template.html:149
#: core/templates/user/login.html:20 core/views/user.py:293
#: software/templates/features.html:38
msgid "Register"
@@ -594,7 +594,7 @@ msgstr ""
#: core/templates/index.html:33 core/templates/index.html:73
#: core/templates/misc/fragments/shariff_modal.html:29
-#: core/templates/template.html:125 manager/templates/calendar/month.html:138
+#: core/templates/template.html:124 manager/templates/calendar/month.html:138
#: manager/templates/schedule/view.html:246
#: manager/templates/schedule/view.html:266
#: manager/templates/workout/view.html:132
@@ -726,7 +726,7 @@ msgstr "Nincs táplálkozási terv."
msgid "Weight"
msgstr "Súly"
-#: core/templates/index.html:210 core/templates/navigation.html:97
+#: core/templates/index.html:210 core/templates/navigation.html:135
#: weight/views.py:70
msgid "Add weight entry"
msgstr "Új súly bejegyzés hozzáadása"
@@ -758,8 +758,8 @@ msgstr "Licenc lista"
msgid "Nothing found"
msgstr "Nincs találat"
-#: core/templates/misc/about.html:4 core/templates/template.html:175
-#: core/templates/template_features.html:118
+#: core/templates/misc/about.html:4 core/templates/template.html:174
+#: core/templates/template_features.html:117
#: core/templates/template_no_context.html:88
msgid "Imprint"
msgstr ""
@@ -845,13 +845,13 @@ msgstr ""
#: exercises/templates/equipment/overview.html:113
#: exercises/templates/exercise/overview.html:112
#: exercises/templates/exercise/overview.html:116
-#: exercises/templates/muscles/overview.html:108
#: exercises/templates/muscles/overview.html:112
+#: exercises/templates/muscles/overview.html:116
msgid "Add new exercise"
msgstr "Új gyakorlat hozzáadása"
-#: core/templates/navigation.html:75 core/templates/navigation.html:134
-#: core/templates/navigation.html:226
+#: core/templates/navigation.html:75 core/templates/navigation.html:116
+#: core/templates/navigation.html:224
msgid "Administration"
msgstr "Adminisztráció"
@@ -874,106 +874,106 @@ msgstr "Izmok"
msgid "Categories"
msgstr "Kategóriák"
-#: core/templates/navigation.html:94
-msgid "Body weight"
-msgstr ""
-
-#: core/templates/navigation.html:96 core/templates/user/overview.html:114
-#: weight/templates/overview.html:7
-msgid "Weight overview"
-msgstr "Súly áttekintés"
-
-#: core/templates/navigation.html:111 software/templates/features.html:87
+#: core/templates/navigation.html:93 software/templates/features.html:87
msgid "Nutrition"
msgstr "Táplálkozás"
-#: core/templates/navigation.html:117 core/templates/user/overview.html:144
+#: core/templates/navigation.html:99 core/templates/user/overview.html:144
msgid "Nutrition plans"
msgstr "Táplálkozási tervek"
-#: core/templates/navigation.html:123 nutrition/templates/bmi/form.html:50
+#: core/templates/navigation.html:105 nutrition/templates/bmi/form.html:50
msgid "BMI calculator"
msgstr "BMI kalkulátor"
-#: core/templates/navigation.html:129 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:111 nutrition/templates/rate/form.html:17
msgid "Daily calories calculator"
msgstr "Napi kalória kalkulátor"
-#: core/templates/navigation.html:131
+#: core/templates/navigation.html:113
#: nutrition/templates/ingredient/overview.html:29
msgid "Ingredient overview"
msgstr "Összetevő áttekintés"
-#: core/templates/navigation.html:135 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:117 nutrition/templates/units/list.html:6
msgid "Ingredient weight units"
msgstr "Összetevő súly egységek"
-#: core/templates/navigation.html:136
+#: core/templates/navigation.html:118
#: nutrition/templates/ingredient/pending.html:6
msgid "Ingredients pending review"
msgstr "Ellenőrzésre váró összetevők"
-#: core/templates/navigation.html:149
+#: core/templates/navigation.html:132
+msgid "Body weight"
+msgstr ""
+
+#: core/templates/navigation.html:134 core/templates/user/overview.html:114
+#: weight/templates/overview.html:7
+msgid "Weight overview"
+msgstr "Súly áttekintés"
+
+#: core/templates/navigation.html:147
msgid "About this software"
msgstr "Erről a szoftverről"
-#: core/templates/navigation.html:151 core/templates/template_features.html:83
+#: core/templates/navigation.html:149 core/templates/template_features.html:82
#: software/templates/about_us.html:5
msgid "About us"
msgstr "Rólunk"
-#: core/templates/navigation.html:153 software/templates/features.html:209
+#: core/templates/navigation.html:151 software/templates/features.html:209
msgid "REST API"
msgstr "REST API"
-#: core/templates/navigation.html:157 utils/models.py:40
+#: core/templates/navigation.html:155 utils/models.py:40
msgid "License"
msgstr "Licenc"
-#: core/templates/navigation.html:163
+#: core/templates/navigation.html:161
msgid "Developer documentation"
msgstr ""
-#: core/templates/navigation.html:169
+#: core/templates/navigation.html:167
msgid "Get the code"
msgstr "Szerezd meg a kódot"
-#: core/templates/navigation.html:175 core/templates/template.html:205
-#: core/templates/template_features.html:100
+#: core/templates/navigation.html:173 core/templates/template.html:204
+#: core/templates/template_features.html:99
msgid "Translate"
msgstr "Lefordítás"
-#: core/templates/navigation.html:196 core/templates/user/login.html:28
+#: core/templates/navigation.html:194 core/templates/user/login.html:28
msgid "Reset password"
msgstr "Új jelszó igénylése"
-#: core/templates/navigation.html:209
+#: core/templates/navigation.html:207
msgid "My preferences"
msgstr "Beállításaim"
-#: core/templates/navigation.html:216
+#: core/templates/navigation.html:214
msgid "Logout"
msgstr "Kijelentkezés"
-#: core/templates/navigation.html:231
+#: core/templates/navigation.html:229
msgid "Licenses"
msgstr "Licencek"
-#: core/templates/navigation.html:234
+#: core/templates/navigation.html:232
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr ""
-#: core/templates/navigation.html:237 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:235 core/templates/weight_unit/list.html:4
#: nutrition/templates/ingredient/view.html:174
msgid "Weight units"
msgstr ""
-#: core/templates/navigation.html:240 core/templates/user/list.html:4
+#: core/templates/navigation.html:238 core/templates/user/list.html:4
msgid "User list"
msgstr ""
-#: core/templates/navigation.html:241
+#: core/templates/navigation.html:239
msgid "Gyms"
msgstr "Edzőtermek"
@@ -1051,7 +1051,7 @@ msgstr ""
#: core/templates/tags/render_day.html:114
#: exercises/templates/equipment/overview.html:59
#: exercises/templates/exercise/overview.html:63
-#: exercises/templates/muscles/overview.html:61
+#: exercises/templates/muscles/overview.html:65
msgid "Placeholder image for exercise"
msgstr "Helyfoglaló kép a gyakorlathoz"
@@ -1078,23 +1078,23 @@ msgstr "Ismétlés"
msgid "RiR"
msgstr ""
-#: core/templates/template.html:140
+#: core/templates/template.html:139
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:144
+#: core/templates/template.html:143
msgid "Create some demo entries"
msgstr "Készíts egy pár demó bejegyzést"
-#: core/templates/template.html:176 core/templates/template_features.html:122
+#: core/templates/template.html:175 core/templates/template_features.html:121
#: core/templates/template_no_context.html:89 software/templates/tos.html:7
msgid "Terms of service"
msgstr ""
-#: core/templates/template_features.html:62 software/templates/features.html:9
+#: core/templates/template_features.html:61 software/templates/features.html:9
#: software/templates/features.html:120
msgid "Features"
msgstr "Funkciók"
@@ -1504,7 +1504,7 @@ msgstr "Elsődleges izmok"
#: exercises/models/base.py:64 exercises/templates/equipment/overview.html:71
#: exercises/templates/exercise/overview.html:76
#: exercises/templates/exercise/view.html:268
-#: exercises/templates/muscles/overview.html:73
+#: exercises/templates/muscles/overview.html:77
msgid "Secondary muscles"
msgstr "Másodlagos izmok"
@@ -1516,9 +1516,9 @@ msgstr ""
msgid "Exercise Categories"
msgstr "Gyakorlati kategóriák"
-#: exercises/models/comment.py:34 exercises/models/image.py:75
-#: exercises/models/video.py:82 manager/forms.py:165 manager/helpers.py:89
-#: manager/models/log.py:51
+#: exercises/models/comment.py:34 exercises/models/exercise_alias.py:32
+#: exercises/models/image.py:75 exercises/models/video.py:82
+#: manager/forms.py:165 manager/helpers.py:89 manager/models/log.py:51
msgid "Exercise"
msgstr "Gyakorlat"
@@ -1544,6 +1544,12 @@ msgstr "Új felhasználó által javasolt gyakorlat"
msgid "The user {0} submitted a new exercise \"{1}\"."
msgstr "A {0} felhasználó javasolt egy új gyakorlatot \"{1}\"."
+#: exercises/models/exercise_alias.py:35
+#, fuzzy
+#| msgid "Add new exercise"
+msgid "Alias for an exercise"
+msgstr "Új gyakorlat hozzáadása"
+
#: exercises/models/image.py:59
msgid "Line"
msgstr ""
@@ -1601,6 +1607,16 @@ msgstr ""
msgid "In latin, e.g. \"Pectoralis major\""
msgstr "Latinul, pl.: \"Pectoralis major\""
+#: exercises/models/muscle.py:47
+#, fuzzy
+#| msgid "exercise name"
+msgid "Alternative name"
+msgstr "gyakorlat neve"
+
+#: exercises/models/muscle.py:48
+msgid "A more basic name for the muscle"
+msgstr ""
+
#: exercises/models/video.py:41
msgid "Maximum file size is 100MB."
msgstr ""
@@ -1663,7 +1679,7 @@ msgstr "Felszerelés áttekintés"
#: exercises/templates/equipment/overview.html:69
#: exercises/templates/exercise/overview.html:74
#: exercises/templates/exercise/view.html:264
-#: exercises/templates/muscles/overview.html:71
+#: exercises/templates/muscles/overview.html:75
msgid "Main muscles"
msgstr "Fő izmok"
@@ -1688,7 +1704,7 @@ msgstr "gyakorlat neve"
#: exercises/templates/equipment/overview.html:115
#: exercises/templates/exercise/overview.html:118
-#: exercises/templates/muscles/overview.html:114
+#: exercises/templates/muscles/overview.html:118
#: nutrition/templates/ingredient/overview.html:85
msgid "Only registered users can do this"
msgstr "Csak regisztrált felhasználók láthatják"
@@ -1869,7 +1885,7 @@ msgstr "Izom áttekintés"
msgid "Add muscle"
msgstr "Izom hozzáadása"
-#: exercises/templates/muscles/overview.html:81
+#: exercises/templates/muscles/overview.html:85
msgid ""
"No exercises for this muscle. Add or edit an exercise and set the muscle."
msgstr ""
@@ -2239,7 +2255,7 @@ msgstr "Felhasználó hozzáadása az edzőteremhez"
msgid "Edit gym"
msgstr "Edzőterem módosítása"
-#: i18n.tpl:2
+#: i18n.tpl:2 i18n.tpl:28
msgid "Abs"
msgstr ""
@@ -2251,11 +2267,11 @@ msgstr ""
msgid "Back"
msgstr ""
-#: i18n.tpl:5
+#: i18n.tpl:5 i18n.tpl:23
msgid "Calves"
msgstr ""
-#: i18n.tpl:6
+#: i18n.tpl:6 i18n.tpl:26
msgid "Chest"
msgstr ""
@@ -2263,7 +2279,7 @@ msgstr ""
msgid "Legs"
msgstr ""
-#: i18n.tpl:8
+#: i18n.tpl:8 i18n.tpl:19
msgid "Shoulders"
msgstr ""
@@ -2292,11 +2308,11 @@ msgid "Kettlebell"
msgstr ""
#: i18n.tpl:15
-msgid "none (bodyweight exercise)"
+msgid "Pull-up bar"
msgstr ""
#: i18n.tpl:16
-msgid "Pull-up bar"
+msgid "SZ-Bar"
msgstr ""
#: i18n.tpl:17
@@ -2304,97 +2320,59 @@ msgid "Swiss Ball"
msgstr ""
#: i18n.tpl:18
-msgid "SZ-Bar"
-msgstr ""
-
-#: i18n.tpl:19
-msgid "Anterior deltoid"
+msgid "none (bodyweight exercise)"
msgstr ""
#: i18n.tpl:20
-msgid "Biceps brachii"
+msgid "Biceps"
msgstr ""
#: i18n.tpl:21
-msgid "Biceps femoris"
+msgid "Hamstrings"
msgstr ""
#: i18n.tpl:22
-msgid "Brachialis"
-msgstr ""
-
-#: i18n.tpl:23
-msgid "Gastrocnemius"
+msgid "Lower back"
msgstr ""
#: i18n.tpl:24
-msgid "Gluteus maximus"
+msgid "Glutes"
msgstr ""
#: i18n.tpl:25
-msgid "Latissimus dorsi"
-msgstr ""
-
-#: i18n.tpl:26
-msgid "Obliquus externus abdominis"
+msgid "Lats"
msgstr ""
#: i18n.tpl:27
-msgid "Pectoralis major"
-msgstr ""
-
-#: i18n.tpl:28
-msgid "Quadriceps femoris"
+msgid "Quads"
msgstr ""
#: i18n.tpl:29
-msgid "Rectus abdominis"
+msgid "Triceps"
msgstr ""
#: i18n.tpl:30
-msgid "Serratus anterior"
-msgstr ""
-
-#: i18n.tpl:31
-msgid "Soleus"
-msgstr ""
-
-#: i18n.tpl:32
-msgid "Trapezius"
-msgstr ""
-
-#: i18n.tpl:33
-msgid "Triceps brachii"
-msgstr ""
-
-#: i18n.tpl:34
msgid "Kilometers"
msgstr ""
-#: i18n.tpl:35
-#, fuzzy
-#| msgid "Reps"
-msgid "Max Reps"
-msgstr "Ismétlés"
-
-#: i18n.tpl:36
+#: i18n.tpl:31
msgid "Miles"
msgstr ""
-#: i18n.tpl:37
+#: i18n.tpl:32
msgid "Minutes"
msgstr ""
-#: i18n.tpl:38 manager/forms.py:169 manager/models/log.py:71
+#: i18n.tpl:33 manager/forms.py:169 manager/models/log.py:71
#: manager/templates/set/add.html:53
msgid "Repetitions"
msgstr "Ismétlések"
-#: i18n.tpl:39
+#: i18n.tpl:34
msgid "Seconds"
msgstr ""
-#: i18n.tpl:40
+#: i18n.tpl:35
msgid "Until Failure"
msgstr ""
@@ -3893,6 +3871,11 @@ msgstr ""
msgid "Delete weight entry for the %s"
msgstr ""
+#, fuzzy
+#~| msgid "Reps"
+#~ msgid "Max Reps"
+#~ msgstr "Ismétlés"
+
#~ msgid "Your current weight is: "
#~ msgstr "Jelenlegi súlyod:"
diff --git a/wger/locale/it/LC_MESSAGES/django.po b/wger/locale/it/LC_MESSAGES/django.po
index 43c88c01a..1409fce66 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: 2022-02-15 14:51+0100\n"
+"POT-Creation-Date: 2022-05-14 12:01+0200\n"
"PO-Revision-Date: 2022-03-10 08:59+0000\n"
"Last-Translator: MARCO ACORTE <[email protected]>\n"
"Language-Team: Italian <https://hosted.weblate.org/projects/wger/web/it/>\n"
@@ -49,7 +49,7 @@ msgstr "Esercizi"
msgid "Ingredients"
msgstr "Ingredienti"
-#: config/templates/language/overview.html:4 core/templates/navigation.html:228
+#: config/templates/language/overview.html:4 core/templates/navigation.html:226
msgid "Languages"
msgstr "Lingue"
@@ -227,8 +227,8 @@ msgstr "Il mio programma di allenamento"
msgid "Empty placeholder schedule"
msgstr "Programma segnaposto vuoto"
-#: core/forms.py:61 core/templates/navigation.html:190
-#: core/templates/navigation.html:194 core/templates/user/login.html:4
+#: core/forms.py:61 core/templates/navigation.html:188
+#: core/templates/navigation.html:192 core/templates/user/login.html:4
#: software/templates/features.html:43
msgid "Login"
msgstr "Entra"
@@ -305,8 +305,8 @@ msgstr "Password non valida"
msgid "The form is secured with reCAPTCHA"
msgstr "Quest formulario è protetto con reCAPTCHA"
-#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:190
-#: core/templates/navigation.html:195 core/templates/template.html:150
+#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:188
+#: core/templates/navigation.html:193 core/templates/template.html:149
#: core/templates/user/login.html:20 core/views/user.py:293
#: software/templates/features.html:38
msgid "Register"
@@ -635,7 +635,7 @@ msgstr ""
#: core/templates/index.html:33 core/templates/index.html:73
#: core/templates/misc/fragments/shariff_modal.html:29
-#: core/templates/template.html:125 manager/templates/calendar/month.html:138
+#: core/templates/template.html:124 manager/templates/calendar/month.html:138
#: manager/templates/schedule/view.html:246
#: manager/templates/schedule/view.html:266
#: manager/templates/workout/view.html:132
@@ -772,7 +772,7 @@ msgstr "Nessun piano nutrizionale trovato."
msgid "Weight"
msgstr "Peso"
-#: core/templates/index.html:210 core/templates/navigation.html:97
+#: core/templates/index.html:210 core/templates/navigation.html:135
#: weight/views.py:70
msgid "Add weight entry"
msgstr "Aggiungi peso corporeo"
@@ -804,8 +804,8 @@ msgstr "Elenco delle licenze"
msgid "Nothing found"
msgstr "Trovato niente"
-#: core/templates/misc/about.html:4 core/templates/template.html:175
-#: core/templates/template_features.html:118
+#: core/templates/misc/about.html:4 core/templates/template.html:174
+#: core/templates/template_features.html:117
#: core/templates/template_no_context.html:88
msgid "Imprint"
msgstr "Impressum"
@@ -891,13 +891,13 @@ msgstr "per equipaggiamento"
#: exercises/templates/equipment/overview.html:113
#: exercises/templates/exercise/overview.html:112
#: exercises/templates/exercise/overview.html:116
-#: exercises/templates/muscles/overview.html:108
#: exercises/templates/muscles/overview.html:112
+#: exercises/templates/muscles/overview.html:116
msgid "Add new exercise"
msgstr "Aggiungi un nuovo esercizio"
-#: core/templates/navigation.html:75 core/templates/navigation.html:134
-#: core/templates/navigation.html:226
+#: core/templates/navigation.html:75 core/templates/navigation.html:116
+#: core/templates/navigation.html:224
msgid "Administration"
msgstr "Amministrazione"
@@ -920,106 +920,106 @@ msgstr "Muscoli"
msgid "Categories"
msgstr "Categorie"
-#: core/templates/navigation.html:94
-msgid "Body weight"
-msgstr "Peso corporeo"
-
-#: core/templates/navigation.html:96 core/templates/user/overview.html:114
-#: weight/templates/overview.html:7
-msgid "Weight overview"
-msgstr "Panoramica peso corporeo"
-
-#: core/templates/navigation.html:111 software/templates/features.html:87
+#: core/templates/navigation.html:93 software/templates/features.html:87
msgid "Nutrition"
msgstr "Piano nutrizionale"
-#: core/templates/navigation.html:117 core/templates/user/overview.html:144
+#: core/templates/navigation.html:99 core/templates/user/overview.html:144
msgid "Nutrition plans"
msgstr "Piani nutrizionali"
-#: core/templates/navigation.html:123 nutrition/templates/bmi/form.html:50
+#: core/templates/navigation.html:105 nutrition/templates/bmi/form.html:50
msgid "BMI calculator"
msgstr "Calcolatore IMC"
-#: core/templates/navigation.html:129 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:111 nutrition/templates/rate/form.html:17
msgid "Daily calories calculator"
msgstr "Calcolo calorie giornaliere"
-#: core/templates/navigation.html:131
+#: core/templates/navigation.html:113
#: nutrition/templates/ingredient/overview.html:29
msgid "Ingredient overview"
msgstr "Panoramica alimenti"
-#: core/templates/navigation.html:135 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:117 nutrition/templates/units/list.html:6
msgid "Ingredient weight units"
msgstr "Unità di peso ingrediente"
-#: core/templates/navigation.html:136
+#: core/templates/navigation.html:118
#: nutrition/templates/ingredient/pending.html:6
msgid "Ingredients pending review"
msgstr "Ingredienti in attesa di revisione"
-#: core/templates/navigation.html:149
+#: core/templates/navigation.html:132
+msgid "Body weight"
+msgstr "Peso corporeo"
+
+#: core/templates/navigation.html:134 core/templates/user/overview.html:114
+#: weight/templates/overview.html:7
+msgid "Weight overview"
+msgstr "Panoramica peso corporeo"
+
+#: core/templates/navigation.html:147
msgid "About this software"
msgstr "Informazioni"
-#: core/templates/navigation.html:151 core/templates/template_features.html:83
+#: core/templates/navigation.html:149 core/templates/template_features.html:82
#: software/templates/about_us.html:5
msgid "About us"
msgstr "Chi siamo"
-#: core/templates/navigation.html:153 software/templates/features.html:209
+#: core/templates/navigation.html:151 software/templates/features.html:209
msgid "REST API"
msgstr "REST API"
-#: core/templates/navigation.html:157 utils/models.py:40
+#: core/templates/navigation.html:155 utils/models.py:40
msgid "License"
msgstr "Licenza"
-#: core/templates/navigation.html:163
+#: core/templates/navigation.html:161
msgid "Developer documentation"
msgstr "Documentazione dello sviluppatore"
-#: core/templates/navigation.html:169
+#: core/templates/navigation.html:167
msgid "Get the code"
msgstr "Ottieni il codice"
-#: core/templates/navigation.html:175 core/templates/template.html:205
-#: core/templates/template_features.html:100
+#: core/templates/navigation.html:173 core/templates/template.html:204
+#: core/templates/template_features.html:99
msgid "Translate"
msgstr "Traduci"
-#: core/templates/navigation.html:196 core/templates/user/login.html:28
+#: core/templates/navigation.html:194 core/templates/user/login.html:28
msgid "Reset password"
msgstr "Reimposta la password"
-#: core/templates/navigation.html:209
+#: core/templates/navigation.html:207
msgid "My preferences"
msgstr "Preferenze"
-#: core/templates/navigation.html:216
+#: core/templates/navigation.html:214
msgid "Logout"
msgstr "Esci"
-#: core/templates/navigation.html:231
+#: core/templates/navigation.html:229
msgid "Licenses"
msgstr "Licenza"
-#: core/templates/navigation.html:234
+#: core/templates/navigation.html:232
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr "Unità di ripetizione"
-#: core/templates/navigation.html:237 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:235 core/templates/weight_unit/list.html:4
#: nutrition/templates/ingredient/view.html:174
msgid "Weight units"
msgstr "Unità peso"
-#: core/templates/navigation.html:240 core/templates/user/list.html:4
+#: core/templates/navigation.html:238 core/templates/user/list.html:4
msgid "User list"
msgstr "Lista utenti"
-#: core/templates/navigation.html:241
+#: core/templates/navigation.html:239
msgid "Gyms"
msgstr "Palestre"
@@ -1102,7 +1102,7 @@ msgstr "Aggiungi record peso"
#: core/templates/tags/render_day.html:114
#: exercises/templates/equipment/overview.html:59
#: exercises/templates/exercise/overview.html:63
-#: exercises/templates/muscles/overview.html:61
+#: exercises/templates/muscles/overview.html:65
msgid "Placeholder image for exercise"
msgstr "Immagine segnaposto per l'esercizio"
@@ -1129,23 +1129,23 @@ msgstr "Ripetizioni"
msgid "RiR"
msgstr "RiR"
-#: core/templates/template.html:140
+#: core/templates/template.html:139
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:144
+#: core/templates/template.html:143
msgid "Create some demo entries"
msgstr "Crea alcune voci demo"
-#: core/templates/template.html:176 core/templates/template_features.html:122
+#: core/templates/template.html:175 core/templates/template_features.html:121
#: core/templates/template_no_context.html:89 software/templates/tos.html:7
msgid "Terms of service"
msgstr "Termini di servizio"
-#: core/templates/template_features.html:62 software/templates/features.html:9
+#: core/templates/template_features.html:61 software/templates/features.html:9
#: software/templates/features.html:120
msgid "Features"
msgstr "Caratteristiche"
@@ -1569,7 +1569,7 @@ msgstr "Muscoli primari"
#: exercises/models/base.py:64 exercises/templates/equipment/overview.html:71
#: exercises/templates/exercise/overview.html:76
#: exercises/templates/exercise/view.html:268
-#: exercises/templates/muscles/overview.html:73
+#: exercises/templates/muscles/overview.html:77
msgid "Secondary muscles"
msgstr "Muscoli secondari"
@@ -1581,9 +1581,9 @@ msgstr "Variazioni"
msgid "Exercise Categories"
msgstr "Categorie esercizi"
-#: exercises/models/comment.py:34 exercises/models/image.py:75
-#: exercises/models/video.py:82 manager/forms.py:165 manager/helpers.py:89
-#: manager/models/log.py:51
+#: exercises/models/comment.py:34 exercises/models/exercise_alias.py:32
+#: exercises/models/image.py:75 exercises/models/video.py:82
+#: manager/forms.py:165 manager/helpers.py:89 manager/models/log.py:51
msgid "Exercise"
msgstr "Esercizio"
@@ -1609,6 +1609,12 @@ msgstr "Un nuovo utente ha inserito un esercizio"
msgid "The user {0} submitted a new exercise \"{1}\"."
msgstr "L'utente {0} ha inserito un nuovo esercizio «{1}»."
+#: exercises/models/exercise_alias.py:35
+#, fuzzy
+#| msgid "Correcting an exercise"
+msgid "Alias for an exercise"
+msgstr "Correggere un esercizio"
+
#: exercises/models/image.py:59
msgid "Line"
msgstr "Linea"
@@ -1668,6 +1674,16 @@ msgstr "L'utente {0} ha inviato una nuova immagine «{1}» per l'esercizio {2}."
msgid "In latin, e.g. \"Pectoralis major\""
msgstr "In latino es. «Pectoralis major»"
+#: exercises/models/muscle.py:47
+#, fuzzy
+#| msgid "exercise name"
+msgid "Alternative name"
+msgstr "Nome esercizio"
+
+#: exercises/models/muscle.py:48
+msgid "A more basic name for the muscle"
+msgstr ""
+
#: exercises/models/video.py:41
msgid "Maximum file size is 100MB."
msgstr "La dimensione massima del file è 100 MB."
@@ -1728,7 +1744,7 @@ msgstr "Prospetto dell'attrezzatura"
#: exercises/templates/equipment/overview.html:69
#: exercises/templates/exercise/overview.html:74
#: exercises/templates/exercise/view.html:264
-#: exercises/templates/muscles/overview.html:71
+#: exercises/templates/muscles/overview.html:75
msgid "Main muscles"
msgstr "Muscoli principali"
@@ -1753,7 +1769,7 @@ msgstr "Nome esercizio"
#: exercises/templates/equipment/overview.html:115
#: exercises/templates/exercise/overview.html:118
-#: exercises/templates/muscles/overview.html:114
+#: exercises/templates/muscles/overview.html:118
#: nutrition/templates/ingredient/overview.html:85
msgid "Only registered users can do this"
msgstr "Soli gli utenti registrato possono fare questo"
@@ -1949,7 +1965,7 @@ msgstr "Prospetto dei muscoli"
msgid "Add muscle"
msgstr "Aggiungi muscolo"
-#: exercises/templates/muscles/overview.html:81
+#: exercises/templates/muscles/overview.html:85
msgid ""
"No exercises for this muscle. Add or edit an exercise and set the muscle."
msgstr ""
@@ -2329,7 +2345,7 @@ msgstr "Aggiungi membro alla palestra"
msgid "Edit gym"
msgstr "Modifica palestra"
-#: i18n.tpl:2
+#: i18n.tpl:2 i18n.tpl:28
msgid "Abs"
msgstr "Addome"
@@ -2341,11 +2357,11 @@ msgstr "Braccia"
msgid "Back"
msgstr "Dorso"
-#: i18n.tpl:5
+#: i18n.tpl:5 i18n.tpl:23
msgid "Calves"
msgstr "Polpacci"
-#: i18n.tpl:6
+#: i18n.tpl:6 i18n.tpl:26
msgid "Chest"
msgstr "Petto"
@@ -2353,7 +2369,7 @@ msgstr "Petto"
msgid "Legs"
msgstr "Gambe"
-#: i18n.tpl:8
+#: i18n.tpl:8 i18n.tpl:19
msgid "Shoulders"
msgstr "Spalle"
@@ -2382,107 +2398,77 @@ msgid "Kettlebell"
msgstr "Kettlebell"
#: i18n.tpl:15
-msgid "none (bodyweight exercise)"
-msgstr "nessuno (esercizio a corpo libero)"
-
-#: i18n.tpl:16
msgid "Pull-up bar"
msgstr "Spalliera"
+#: i18n.tpl:16
+msgid "SZ-Bar"
+msgstr "Bilanaciere Obliquo SZ"
+
#: i18n.tpl:17
msgid "Swiss Ball"
msgstr "Palla Da Ginnastica"
#: i18n.tpl:18
-msgid "SZ-Bar"
-msgstr "Bilanaciere Obliquo SZ"
-
-#: i18n.tpl:19
-msgid "Anterior deltoid"
-msgstr "Deltoide anteriore"
+msgid "none (bodyweight exercise)"
+msgstr "nessuno (esercizio a corpo libero)"
#: i18n.tpl:20
-msgid "Biceps brachii"
+#, fuzzy
+#| msgid "Biceps brachii"
+msgid "Biceps"
msgstr "Bicipite brachiale"
#: i18n.tpl:21
-msgid "Biceps femoris"
-msgstr "Bicipite femorale"
+msgid "Hamstrings"
+msgstr ""
#: i18n.tpl:22
-msgid "Brachialis"
-msgstr "Brachiale"
-
-#: i18n.tpl:23
-msgid "Gastrocnemius"
-msgstr "Gastrocnemio"
+msgid "Lower back"
+msgstr ""
#: i18n.tpl:24
-msgid "Gluteus maximus"
-msgstr "Grande gluteo"
+#, fuzzy
+#| msgid "Minutes"
+msgid "Glutes"
+msgstr "Minuti"
#: i18n.tpl:25
-msgid "Latissimus dorsi"
-msgstr "Latissimus dorsi"
-
-#: i18n.tpl:26
-msgid "Obliquus externus abdominis"
-msgstr "Obliqui esterni addominali"
+msgid "Lats"
+msgstr ""
#: i18n.tpl:27
-msgid "Pectoralis major"
-msgstr "Grande pettorale"
-
-#: i18n.tpl:28
-msgid "Quadriceps femoris"
-msgstr "Quadricipite femorale"
+msgid "Quads"
+msgstr ""
#: i18n.tpl:29
-msgid "Rectus abdominis"
-msgstr "Retto addominale"
-
-#: i18n.tpl:30
-msgid "Serratus anterior"
-msgstr "Serratore anteriore"
-
-#: i18n.tpl:31
-msgid "Soleus"
-msgstr "Soleo"
-
-#: i18n.tpl:32
-msgid "Trapezius"
-msgstr "Trapezio"
-
-#: i18n.tpl:33
-msgid "Triceps brachii"
+#, fuzzy
+#| msgid "Triceps brachii"
+msgid "Triceps"
msgstr "Tricipite brachiale"
-#: i18n.tpl:34
+#: i18n.tpl:30
msgid "Kilometers"
msgstr "Chilometri"
-#: i18n.tpl:35
-msgid "Max Reps"
-msgstr "Numero massimo di ripetizioni"
-
-#: i18n.tpl:36
+#: i18n.tpl:31
msgid "Miles"
msgstr "Miglia"
-#: i18n.tpl:37
+#: i18n.tpl:32
msgid "Minutes"
msgstr "Minuti"
-#: i18n.tpl:38 manager/forms.py:169 manager/models/log.py:71
+#: i18n.tpl:33 manager/forms.py:169 manager/models/log.py:71
#: manager/templates/set/add.html:53
msgid "Repetitions"
msgstr "Ripetizioni"
-#: i18n.tpl:39
+#: i18n.tpl:34
msgid "Seconds"
msgstr "Secondi"
-#: i18n.tpl:40
+#: i18n.tpl:35
msgid "Until Failure"
msgstr "Fino al Fallimento"
@@ -3302,8 +3288,8 @@ msgid ""
"Give meals a textual description / name such as \"Breakfast\" or \"after "
"workout\""
msgstr ""
-"Dai ai pasti una descrizione testuale/nome come \"Colazione\" o \"Dopo l'"
-"allenamento\""
+"Dai ai pasti una descrizione testuale/nome come \"Colazione\" o \"Dopo "
+"l'allenamento\""
#: nutrition/models/plan.py:71
msgid ""
@@ -4183,6 +4169,48 @@ msgstr "Cancellato con successo."
msgid "Delete weight entry for the %s"
msgstr "Cancellato il peso inserito di %s"
+#~ msgid "Anterior deltoid"
+#~ msgstr "Deltoide anteriore"
+
+#~ msgid "Biceps femoris"
+#~ msgstr "Bicipite femorale"
+
+#~ msgid "Brachialis"
+#~ msgstr "Brachiale"
+
+#~ msgid "Gastrocnemius"
+#~ msgstr "Gastrocnemio"
+
+#~ msgid "Gluteus maximus"
+#~ msgstr "Grande gluteo"
+
+#~ msgid "Latissimus dorsi"
+#~ msgstr "Latissimus dorsi"
+
+#~ msgid "Obliquus externus abdominis"
+#~ msgstr "Obliqui esterni addominali"
+
+#~ msgid "Pectoralis major"
+#~ msgstr "Grande pettorale"
+
+#~ msgid "Quadriceps femoris"
+#~ msgstr "Quadricipite femorale"
+
+#~ msgid "Rectus abdominis"
+#~ msgstr "Retto addominale"
+
+#~ msgid "Serratus anterior"
+#~ msgstr "Serratore anteriore"
+
+#~ msgid "Soleus"
+#~ msgstr "Soleo"
+
+#~ msgid "Trapezius"
+#~ msgstr "Trapezio"
+
+#~ msgid "Max Reps"
+#~ msgstr "Numero massimo di ripetizioni"
+
#~ msgid "Your current weight is: "
#~ msgstr "Il tuo peso corporeo è: "
diff --git a/wger/locale/ja/LC_MESSAGES/django.mo b/wger/locale/ja/LC_MESSAGES/django.mo
index bc9350c04..93e5b2432 100644
Binary files a/wger/locale/ja/LC_MESSAGES/django.mo and b/wger/locale/ja/LC_MESSAGES/django.mo differ
diff --git a/wger/locale/ja/LC_MESSAGES/django.po b/wger/locale/ja/LC_MESSAGES/django.po
index 7c42e4254..c4cc3c264 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: 2022-02-15 14:51+0100\n"
+"POT-Creation-Date: 2022-05-14 12:01+0200\n"
"PO-Revision-Date: 2021-10-31 07:34+0000\n"
"Last-Translator: yuki chi <[email protected]>\n"
"Language-Team: Japanese <https://hosted.weblate.org/projects/wger/web/ja/>\n"
@@ -42,7 +42,7 @@ msgstr "運動"
msgid "Ingredients"
msgstr "材料"
-#: config/templates/language/overview.html:4 core/templates/navigation.html:228
+#: config/templates/language/overview.html:4 core/templates/navigation.html:226
msgid "Languages"
msgstr "言語"
@@ -214,8 +214,8 @@ msgstr ""
msgid "Empty placeholder schedule"
msgstr ""
-#: core/forms.py:61 core/templates/navigation.html:190
-#: core/templates/navigation.html:194 core/templates/user/login.html:4
+#: core/forms.py:61 core/templates/navigation.html:188
+#: core/templates/navigation.html:192 core/templates/user/login.html:4
#: software/templates/features.html:43
msgid "Login"
msgstr "ログイン"
@@ -290,8 +290,8 @@ msgstr "パスワードは無効です。"
msgid "The form is secured with reCAPTCHA"
msgstr ""
-#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:190
-#: core/templates/navigation.html:195 core/templates/template.html:150
+#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:188
+#: core/templates/navigation.html:193 core/templates/template.html:149
#: core/templates/user/login.html:20 core/views/user.py:293
#: software/templates/features.html:38
msgid "Register"
@@ -591,7 +591,7 @@ msgstr ""
#: core/templates/index.html:33 core/templates/index.html:73
#: core/templates/misc/fragments/shariff_modal.html:29
-#: core/templates/template.html:125 manager/templates/calendar/month.html:138
+#: core/templates/template.html:124 manager/templates/calendar/month.html:138
#: manager/templates/schedule/view.html:246
#: manager/templates/schedule/view.html:266
#: manager/templates/workout/view.html:132
@@ -723,7 +723,7 @@ msgstr ""
msgid "Weight"
msgstr "体重"
-#: core/templates/index.html:210 core/templates/navigation.html:97
+#: core/templates/index.html:210 core/templates/navigation.html:135
#: weight/views.py:70
msgid "Add weight entry"
msgstr ""
@@ -755,8 +755,8 @@ msgstr ""
msgid "Nothing found"
msgstr ""
-#: core/templates/misc/about.html:4 core/templates/template.html:175
-#: core/templates/template_features.html:118
+#: core/templates/misc/about.html:4 core/templates/template.html:174
+#: core/templates/template_features.html:117
#: core/templates/template_no_context.html:88
msgid "Imprint"
msgstr ""
@@ -838,13 +838,13 @@ msgstr ""
#: exercises/templates/equipment/overview.html:113
#: exercises/templates/exercise/overview.html:112
#: exercises/templates/exercise/overview.html:116
-#: exercises/templates/muscles/overview.html:108
#: exercises/templates/muscles/overview.html:112
+#: exercises/templates/muscles/overview.html:116
msgid "Add new exercise"
msgstr ""
-#: core/templates/navigation.html:75 core/templates/navigation.html:134
-#: core/templates/navigation.html:226
+#: core/templates/navigation.html:75 core/templates/navigation.html:116
+#: core/templates/navigation.html:224
msgid "Administration"
msgstr ""
@@ -867,106 +867,106 @@ msgstr "筋肉"
msgid "Categories"
msgstr ""
-#: core/templates/navigation.html:94
-msgid "Body weight"
-msgstr ""
-
-#: core/templates/navigation.html:96 core/templates/user/overview.html:114
-#: weight/templates/overview.html:7
-msgid "Weight overview"
-msgstr ""
-
-#: core/templates/navigation.html:111 software/templates/features.html:87
+#: core/templates/navigation.html:93 software/templates/features.html:87
msgid "Nutrition"
msgstr ""
-#: core/templates/navigation.html:117 core/templates/user/overview.html:144
+#: core/templates/navigation.html:99 core/templates/user/overview.html:144
msgid "Nutrition plans"
msgstr ""
-#: core/templates/navigation.html:123 nutrition/templates/bmi/form.html:50
+#: core/templates/navigation.html:105 nutrition/templates/bmi/form.html:50
msgid "BMI calculator"
msgstr "BMI計算"
-#: core/templates/navigation.html:129 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:111 nutrition/templates/rate/form.html:17
msgid "Daily calories calculator"
msgstr ""
-#: core/templates/navigation.html:131
+#: core/templates/navigation.html:113
#: nutrition/templates/ingredient/overview.html:29
msgid "Ingredient overview"
msgstr ""
-#: core/templates/navigation.html:135 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:117 nutrition/templates/units/list.html:6
msgid "Ingredient weight units"
msgstr ""
-#: core/templates/navigation.html:136
+#: core/templates/navigation.html:118
#: nutrition/templates/ingredient/pending.html:6
msgid "Ingredients pending review"
msgstr ""
-#: core/templates/navigation.html:149
+#: core/templates/navigation.html:132
+msgid "Body weight"
+msgstr ""
+
+#: core/templates/navigation.html:134 core/templates/user/overview.html:114
+#: weight/templates/overview.html:7
+msgid "Weight overview"
+msgstr ""
+
+#: core/templates/navigation.html:147
msgid "About this software"
msgstr ""
-#: core/templates/navigation.html:151 core/templates/template_features.html:83
+#: core/templates/navigation.html:149 core/templates/template_features.html:82
#: software/templates/about_us.html:5
msgid "About us"
msgstr ""
-#: core/templates/navigation.html:153 software/templates/features.html:209
+#: core/templates/navigation.html:151 software/templates/features.html:209
msgid "REST API"
msgstr ""
-#: core/templates/navigation.html:157 utils/models.py:40
+#: core/templates/navigation.html:155 utils/models.py:40
msgid "License"
msgstr "ライセンス"
-#: core/templates/navigation.html:163
+#: core/templates/navigation.html:161
msgid "Developer documentation"
msgstr ""
-#: core/templates/navigation.html:169
+#: core/templates/navigation.html:167
msgid "Get the code"
msgstr ""
-#: core/templates/navigation.html:175 core/templates/template.html:205
-#: core/templates/template_features.html:100
+#: core/templates/navigation.html:173 core/templates/template.html:204
+#: core/templates/template_features.html:99
msgid "Translate"
msgstr "翻訳"
-#: core/templates/navigation.html:196 core/templates/user/login.html:28
+#: core/templates/navigation.html:194 core/templates/user/login.html:28
msgid "Reset password"
msgstr "パスワード再設定"
-#: core/templates/navigation.html:209
+#: core/templates/navigation.html:207
msgid "My preferences"
msgstr ""
-#: core/templates/navigation.html:216
+#: core/templates/navigation.html:214
msgid "Logout"
msgstr "ロッグアウト"
-#: core/templates/navigation.html:231
+#: core/templates/navigation.html:229
msgid "Licenses"
msgstr ""
-#: core/templates/navigation.html:234
+#: core/templates/navigation.html:232
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr ""
-#: core/templates/navigation.html:237 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:235 core/templates/weight_unit/list.html:4
#: nutrition/templates/ingredient/view.html:174
msgid "Weight units"
msgstr ""
-#: core/templates/navigation.html:240 core/templates/user/list.html:4
+#: core/templates/navigation.html:238 core/templates/user/list.html:4
msgid "User list"
msgstr ""
-#: core/templates/navigation.html:241
+#: core/templates/navigation.html:239
msgid "Gyms"
msgstr ""
@@ -1044,7 +1044,7 @@ msgstr ""
#: core/templates/tags/render_day.html:114
#: exercises/templates/equipment/overview.html:59
#: exercises/templates/exercise/overview.html:63
-#: exercises/templates/muscles/overview.html:61
+#: exercises/templates/muscles/overview.html:65
msgid "Placeholder image for exercise"
msgstr ""
@@ -1071,21 +1071,21 @@ msgstr "回"
msgid "RiR"
msgstr ""
-#: core/templates/template.html:140
+#: core/templates/template.html:139
msgid ""
"You are using a guest account, data entered will be deleted after a week."
msgstr ""
-#: core/templates/template.html:144
+#: core/templates/template.html:143
msgid "Create some demo entries"
msgstr ""
-#: core/templates/template.html:176 core/templates/template_features.html:122
+#: core/templates/template.html:175 core/templates/template_features.html:121
#: core/templates/template_no_context.html:89 software/templates/tos.html:7
msgid "Terms of service"
msgstr "使用条件"
-#: core/templates/template_features.html:62 software/templates/features.html:9
+#: core/templates/template_features.html:61 software/templates/features.html:9
#: software/templates/features.html:120
msgid "Features"
msgstr ""
@@ -1495,7 +1495,7 @@ msgstr ""
#: exercises/models/base.py:64 exercises/templates/equipment/overview.html:71
#: exercises/templates/exercise/overview.html:76
#: exercises/templates/exercise/view.html:268
-#: exercises/templates/muscles/overview.html:73
+#: exercises/templates/muscles/overview.html:77
msgid "Secondary muscles"
msgstr ""
@@ -1507,9 +1507,9 @@ msgstr ""
msgid "Exercise Categories"
msgstr ""
-#: exercises/models/comment.py:34 exercises/models/image.py:75
-#: exercises/models/video.py:82 manager/forms.py:165 manager/helpers.py:89
-#: manager/models/log.py:51
+#: exercises/models/comment.py:34 exercises/models/exercise_alias.py:32
+#: exercises/models/image.py:75 exercises/models/video.py:82
+#: manager/forms.py:165 manager/helpers.py:89 manager/models/log.py:51
msgid "Exercise"
msgstr ""
@@ -1535,6 +1535,10 @@ msgstr ""
msgid "The user {0} submitted a new exercise \"{1}\"."
msgstr ""
+#: exercises/models/exercise_alias.py:35
+msgid "Alias for an exercise"
+msgstr ""
+
#: exercises/models/image.py:59
msgid "Line"
msgstr ""
@@ -1591,6 +1595,14 @@ msgstr ""
msgid "In latin, e.g. \"Pectoralis major\""
msgstr ""
+#: exercises/models/muscle.py:47
+msgid "Alternative name"
+msgstr ""
+
+#: exercises/models/muscle.py:48
+msgid "A more basic name for the muscle"
+msgstr ""
+
#: exercises/models/video.py:41
msgid "Maximum file size is 100MB."
msgstr ""
@@ -1653,7 +1665,7 @@ msgstr ""
#: exercises/templates/equipment/overview.html:69
#: exercises/templates/exercise/overview.html:74
#: exercises/templates/exercise/view.html:264
-#: exercises/templates/muscles/overview.html:71
+#: exercises/templates/muscles/overview.html:75
msgid "Main muscles"
msgstr ""
@@ -1676,7 +1688,7 @@ msgstr ""
#: exercises/templates/equipment/overview.html:115
#: exercises/templates/exercise/overview.html:118
-#: exercises/templates/muscles/overview.html:114
+#: exercises/templates/muscles/overview.html:118
#: nutrition/templates/ingredient/overview.html:85
msgid "Only registered users can do this"
msgstr ""
@@ -1855,7 +1867,7 @@ msgstr ""
msgid "Add muscle"
msgstr ""
-#: exercises/templates/muscles/overview.html:81
+#: exercises/templates/muscles/overview.html:85
msgid ""
"No exercises for this muscle. Add or edit an exercise and set the muscle."
msgstr ""
@@ -2223,7 +2235,7 @@ msgstr ""
msgid "Edit gym"
msgstr ""
-#: i18n.tpl:2
+#: i18n.tpl:2 i18n.tpl:28
msgid "Abs"
msgstr "腹"
@@ -2235,11 +2247,11 @@ msgstr "腕"
msgid "Back"
msgstr "背中"
-#: i18n.tpl:5
+#: i18n.tpl:5 i18n.tpl:23
msgid "Calves"
msgstr "ふくらはぎ"
-#: i18n.tpl:6
+#: i18n.tpl:6 i18n.tpl:26
msgid "Chest"
msgstr "胸"
@@ -2247,7 +2259,7 @@ msgstr "胸"
msgid "Legs"
msgstr "脚"
-#: i18n.tpl:8
+#: i18n.tpl:8 i18n.tpl:19
msgid "Shoulders"
msgstr "肩"
@@ -2276,109 +2288,75 @@ msgid "Kettlebell"
msgstr "ケトルベル"
#: i18n.tpl:15
-msgid "none (bodyweight exercise)"
-msgstr ""
-
-#: i18n.tpl:16
msgid "Pull-up bar"
msgstr "プルアップ・バー"
+#: i18n.tpl:16
+msgid "SZ-Bar"
+msgstr "EZバー"
+
#: i18n.tpl:17
msgid "Swiss Ball"
msgstr "バランスボール"
#: i18n.tpl:18
-msgid "SZ-Bar"
-msgstr "EZバー"
-
-#: i18n.tpl:19
-msgid "Anterior deltoid"
-msgstr "三角筋前部"
+msgid "none (bodyweight exercise)"
+msgstr ""
#: i18n.tpl:20
-msgid "Biceps brachii"
+#, fuzzy
+#| msgid "Biceps brachii"
+msgid "Biceps"
msgstr "上腕二頭筋"
#: i18n.tpl:21
-msgid "Biceps femoris"
-msgstr "大腿二頭筋"
+msgid "Hamstrings"
+msgstr ""
#: i18n.tpl:22
-msgid "Brachialis"
-msgstr "上腕筋"
-
-#: i18n.tpl:23
-msgid "Gastrocnemius"
-msgstr "腓腹筋"
+msgid "Lower back"
+msgstr ""
#: i18n.tpl:24
-msgid "Gluteus maximus"
-msgstr "大臀筋"
+msgid "Glutes"
+msgstr ""
#: i18n.tpl:25
-msgid "Latissimus dorsi"
-msgstr "広背筋"
-
-#: i18n.tpl:26
-msgid "Obliquus externus abdominis"
-msgstr "外腹斜筋"
+msgid "Lats"
+msgstr ""
#: i18n.tpl:27
-msgid "Pectoralis major"
-msgstr "大胸筋"
-
-#: i18n.tpl:28
-msgid "Quadriceps femoris"
-msgstr "大腿四頭筋"
+msgid "Quads"
+msgstr ""
#: i18n.tpl:29
-msgid "Rectus abdominis"
-msgstr "腹直筋"
-
-#: i18n.tpl:30
-msgid "Serratus anterior"
-msgstr "前鋸筋"
-
-#: i18n.tpl:31
-msgid "Soleus"
-msgstr "ヒラメ筋"
-
-#: i18n.tpl:32
-msgid "Trapezius"
-msgstr "僧帽筋"
-
-#: i18n.tpl:33
-msgid "Triceps brachii"
+#, fuzzy
+#| msgid "Triceps brachii"
+msgid "Triceps"
msgstr "上腕三頭筋"
-#: i18n.tpl:34
+#: i18n.tpl:30
msgid "Kilometers"
msgstr ""
-#: i18n.tpl:35
-#, fuzzy
-#| msgid "Reps"
-msgid "Max Reps"
-msgstr "回"
-
-#: i18n.tpl:36
+#: i18n.tpl:31
msgid "Miles"
msgstr ""
-#: i18n.tpl:37
+#: i18n.tpl:32
msgid "Minutes"
msgstr ""
-#: i18n.tpl:38 manager/forms.py:169 manager/models/log.py:71
+#: i18n.tpl:33 manager/forms.py:169 manager/models/log.py:71
#: manager/templates/set/add.html:53
msgid "Repetitions"
msgstr "回数"
-#: i18n.tpl:39
+#: i18n.tpl:34
msgid "Seconds"
msgstr ""
-#: i18n.tpl:40
+#: i18n.tpl:35
msgid "Until Failure"
msgstr ""
@@ -3870,6 +3848,50 @@ msgstr ""
msgid "Delete weight entry for the %s"
msgstr ""
+#~ msgid "Anterior deltoid"
+#~ msgstr "三角筋前部"
+
+#~ msgid "Biceps femoris"
+#~ msgstr "大腿二頭筋"
+
+#~ msgid "Brachialis"
+#~ msgstr "上腕筋"
+
+#~ msgid "Gastrocnemius"
+#~ msgstr "腓腹筋"
+
+#~ msgid "Gluteus maximus"
+#~ msgstr "大臀筋"
+
+#~ msgid "Latissimus dorsi"
+#~ msgstr "広背筋"
+
+#~ msgid "Obliquus externus abdominis"
+#~ msgstr "外腹斜筋"
+
+#~ msgid "Pectoralis major"
+#~ msgstr "大胸筋"
+
+#~ msgid "Quadriceps femoris"
+#~ msgstr "大腿四頭筋"
+
+#~ msgid "Rectus abdominis"
+#~ msgstr "腹直筋"
+
+#~ msgid "Serratus anterior"
+#~ msgstr "前鋸筋"
+
+#~ msgid "Soleus"
+#~ msgstr "ヒラメ筋"
+
+#~ msgid "Trapezius"
+#~ msgstr "僧帽筋"
+
+#, fuzzy
+#~| msgid "Reps"
+#~ msgid "Max Reps"
+#~ msgstr "回"
+
#~ msgid "Your current weight is: "
#~ msgstr "現在の体重:"
diff --git a/wger/locale/ko/LC_MESSAGES/django.po b/wger/locale/ko/LC_MESSAGES/django.po
index cf8903617..53090c332 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: 2022-02-15 14:51+0100\n"
+"POT-Creation-Date: 2022-05-14 12:01+0200\n"
"PO-Revision-Date: 2022-01-21 19:55+0000\n"
"Last-Translator: namong79 <[email protected]>\n"
"Language-Team: Korean <https://hosted.weblate.org/projects/wger/web/ko/>\n"
@@ -41,7 +41,7 @@ msgstr "운동"
msgid "Ingredients"
msgstr "영양성분"
-#: config/templates/language/overview.html:4 core/templates/navigation.html:228
+#: config/templates/language/overview.html:4 core/templates/navigation.html:226
msgid "Languages"
msgstr "언어"
@@ -213,8 +213,8 @@ msgstr ""
msgid "Empty placeholder schedule"
msgstr ""
-#: core/forms.py:61 core/templates/navigation.html:190
-#: core/templates/navigation.html:194 core/templates/user/login.html:4
+#: core/forms.py:61 core/templates/navigation.html:188
+#: core/templates/navigation.html:192 core/templates/user/login.html:4
#: software/templates/features.html:43
msgid "Login"
msgstr "로그인"
@@ -291,8 +291,8 @@ msgstr "유효하지 않은 비밀번호"
msgid "The form is secured with reCAPTCHA"
msgstr ""
-#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:190
-#: core/templates/navigation.html:195 core/templates/template.html:150
+#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:188
+#: core/templates/navigation.html:193 core/templates/template.html:149
#: core/templates/user/login.html:20 core/views/user.py:293
#: software/templates/features.html:38
msgid "Register"
@@ -594,7 +594,7 @@ msgstr ""
#: core/templates/index.html:33 core/templates/index.html:73
#: core/templates/misc/fragments/shariff_modal.html:29
-#: core/templates/template.html:125 manager/templates/calendar/month.html:138
+#: core/templates/template.html:124 manager/templates/calendar/month.html:138
#: manager/templates/schedule/view.html:246
#: manager/templates/schedule/view.html:266
#: manager/templates/workout/view.html:132
@@ -726,7 +726,7 @@ msgstr ""
msgid "Weight"
msgstr ""
-#: core/templates/index.html:210 core/templates/navigation.html:97
+#: core/templates/index.html:210 core/templates/navigation.html:135
#: weight/views.py:70
msgid "Add weight entry"
msgstr "체중 기록 추가"
@@ -758,8 +758,8 @@ msgstr "라이센스 리스트"
msgid "Nothing found"
msgstr ""
-#: core/templates/misc/about.html:4 core/templates/template.html:175
-#: core/templates/template_features.html:118
+#: core/templates/misc/about.html:4 core/templates/template.html:174
+#: core/templates/template_features.html:117
#: core/templates/template_no_context.html:88
msgid "Imprint"
msgstr ""
@@ -845,13 +845,13 @@ msgstr "by 장비"
#: exercises/templates/equipment/overview.html:113
#: exercises/templates/exercise/overview.html:112
#: exercises/templates/exercise/overview.html:116
-#: exercises/templates/muscles/overview.html:108
#: exercises/templates/muscles/overview.html:112
+#: exercises/templates/muscles/overview.html:116
msgid "Add new exercise"
msgstr "새 Exercise 추가"
-#: core/templates/navigation.html:75 core/templates/navigation.html:134
-#: core/templates/navigation.html:226
+#: core/templates/navigation.html:75 core/templates/navigation.html:116
+#: core/templates/navigation.html:224
msgid "Administration"
msgstr ""
@@ -874,106 +874,106 @@ msgstr ""
msgid "Categories"
msgstr ""
-#: core/templates/navigation.html:94
-msgid "Body weight"
-msgstr "체중"
-
-#: core/templates/navigation.html:96 core/templates/user/overview.html:114
-#: weight/templates/overview.html:7
-msgid "Weight overview"
-msgstr "체중 개요"
-
-#: core/templates/navigation.html:111 software/templates/features.html:87
+#: core/templates/navigation.html:93 software/templates/features.html:87
msgid "Nutrition"
msgstr "영양"
-#: core/templates/navigation.html:117 core/templates/user/overview.html:144
+#: core/templates/navigation.html:99 core/templates/user/overview.html:144
msgid "Nutrition plans"
msgstr ""
-#: core/templates/navigation.html:123 nutrition/templates/bmi/form.html:50
+#: core/templates/navigation.html:105 nutrition/templates/bmi/form.html:50
msgid "BMI calculator"
msgstr ""
-#: core/templates/navigation.html:129 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:111 nutrition/templates/rate/form.html:17
msgid "Daily calories calculator"
msgstr ""
-#: core/templates/navigation.html:131
+#: core/templates/navigation.html:113
#: nutrition/templates/ingredient/overview.html:29
msgid "Ingredient overview"
msgstr ""
-#: core/templates/navigation.html:135 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:117 nutrition/templates/units/list.html:6
msgid "Ingredient weight units"
msgstr ""
-#: core/templates/navigation.html:136
+#: core/templates/navigation.html:118
#: nutrition/templates/ingredient/pending.html:6
msgid "Ingredients pending review"
msgstr ""
-#: core/templates/navigation.html:149
+#: core/templates/navigation.html:132
+msgid "Body weight"
+msgstr "체중"
+
+#: core/templates/navigation.html:134 core/templates/user/overview.html:114
+#: weight/templates/overview.html:7
+msgid "Weight overview"
+msgstr "체중 개요"
+
+#: core/templates/navigation.html:147
msgid "About this software"
msgstr ""
-#: core/templates/navigation.html:151 core/templates/template_features.html:83
+#: core/templates/navigation.html:149 core/templates/template_features.html:82
#: software/templates/about_us.html:5
msgid "About us"
msgstr ""
-#: core/templates/navigation.html:153 software/templates/features.html:209
+#: core/templates/navigation.html:151 software/templates/features.html:209
msgid "REST API"
msgstr ""
-#: core/templates/navigation.html:157 utils/models.py:40
+#: core/templates/navigation.html:155 utils/models.py:40
msgid "License"
msgstr ""
-#: core/templates/navigation.html:163
+#: core/templates/navigation.html:161
msgid "Developer documentation"
msgstr ""
-#: core/templates/navigation.html:169
+#: core/templates/navigation.html:167
msgid "Get the code"
msgstr ""
-#: core/templates/navigation.html:175 core/templates/template.html:205
-#: core/templates/template_features.html:100
+#: core/templates/navigation.html:173 core/templates/template.html:204
+#: core/templates/template_features.html:99
msgid "Translate"
msgstr ""
-#: core/templates/navigation.html:196 core/templates/user/login.html:28
+#: core/templates/navigation.html:194 core/templates/user/login.html:28
msgid "Reset password"
msgstr ""
-#: core/templates/navigation.html:209
+#: core/templates/navigation.html:207
msgid "My preferences"
msgstr "내 환경설정"
-#: core/templates/navigation.html:216
+#: core/templates/navigation.html:214
msgid "Logout"
msgstr "로그아웃"
-#: core/templates/navigation.html:231
+#: core/templates/navigation.html:229
msgid "Licenses"
msgstr ""
-#: core/templates/navigation.html:234
+#: core/templates/navigation.html:232
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr ""
-#: core/templates/navigation.html:237 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:235 core/templates/weight_unit/list.html:4
#: nutrition/templates/ingredient/view.html:174
msgid "Weight units"
msgstr "무게 단위"
-#: core/templates/navigation.html:240 core/templates/user/list.html:4
+#: core/templates/navigation.html:238 core/templates/user/list.html:4
msgid "User list"
msgstr "사용자 리스트"
-#: core/templates/navigation.html:241
+#: core/templates/navigation.html:239
msgid "Gyms"
msgstr "Gyms"
@@ -1051,7 +1051,7 @@ msgstr "체중 기록 추가"
#: core/templates/tags/render_day.html:114
#: exercises/templates/equipment/overview.html:59
#: exercises/templates/exercise/overview.html:63
-#: exercises/templates/muscles/overview.html:61
+#: exercises/templates/muscles/overview.html:65
msgid "Placeholder image for exercise"
msgstr ""
@@ -1078,21 +1078,21 @@ msgstr ""
msgid "RiR"
msgstr ""
-#: core/templates/template.html:140
+#: core/templates/template.html:139
msgid ""
"You are using a guest account, data entered will be deleted after a week."
msgstr ""
-#: core/templates/template.html:144
+#: core/templates/template.html:143
msgid "Create some demo entries"
msgstr ""
-#: core/templates/template.html:176 core/templates/template_features.html:122
+#: core/templates/template.html:175 core/templates/template_features.html:121
#: core/templates/template_no_context.html:89 software/templates/tos.html:7
msgid "Terms of service"
msgstr ""
-#: core/templates/template_features.html:62 software/templates/features.html:9
+#: core/templates/template_features.html:61 software/templates/features.html:9
#: software/templates/features.html:120
msgid "Features"
msgstr ""
@@ -1505,7 +1505,7 @@ msgstr ""
#: exercises/models/base.py:64 exercises/templates/equipment/overview.html:71
#: exercises/templates/exercise/overview.html:76
#: exercises/templates/exercise/view.html:268
-#: exercises/templates/muscles/overview.html:73
+#: exercises/templates/muscles/overview.html:77
msgid "Secondary muscles"
msgstr ""
@@ -1517,9 +1517,9 @@ msgstr ""
msgid "Exercise Categories"
msgstr ""
-#: exercises/models/comment.py:34 exercises/models/image.py:75
-#: exercises/models/video.py:82 manager/forms.py:165 manager/helpers.py:89
-#: manager/models/log.py:51
+#: exercises/models/comment.py:34 exercises/models/exercise_alias.py:32
+#: exercises/models/image.py:75 exercises/models/video.py:82
+#: manager/forms.py:165 manager/helpers.py:89 manager/models/log.py:51
msgid "Exercise"
msgstr ""
@@ -1545,6 +1545,12 @@ msgstr ""
msgid "The user {0} submitted a new exercise \"{1}\"."
msgstr ""
+#: exercises/models/exercise_alias.py:35
+#, fuzzy
+#| msgid "Add new exercise"
+msgid "Alias for an exercise"
+msgstr "새 Exercise 추가"
+
#: exercises/models/image.py:59
msgid "Line"
msgstr ""
@@ -1601,6 +1607,14 @@ msgstr ""
msgid "In latin, e.g. \"Pectoralis major\""
msgstr ""
+#: exercises/models/muscle.py:47
+msgid "Alternative name"
+msgstr ""
+
+#: exercises/models/muscle.py:48
+msgid "A more basic name for the muscle"
+msgstr ""
+
#: exercises/models/video.py:41
msgid "Maximum file size is 100MB."
msgstr ""
@@ -1665,7 +1679,7 @@ msgstr ""
#: exercises/templates/equipment/overview.html:69
#: exercises/templates/exercise/overview.html:74
#: exercises/templates/exercise/view.html:264
-#: exercises/templates/muscles/overview.html:71
+#: exercises/templates/muscles/overview.html:75
msgid "Main muscles"
msgstr ""
@@ -1688,7 +1702,7 @@ msgstr ""
#: exercises/templates/equipment/overview.html:115
#: exercises/templates/exercise/overview.html:118
-#: exercises/templates/muscles/overview.html:114
+#: exercises/templates/muscles/overview.html:118
#: nutrition/templates/ingredient/overview.html:85
msgid "Only registered users can do this"
msgstr ""
@@ -1873,7 +1887,7 @@ msgstr ""
msgid "Add muscle"
msgstr "근육 추가"
-#: exercises/templates/muscles/overview.html:81
+#: exercises/templates/muscles/overview.html:85
msgid ""
"No exercises for this muscle. Add or edit an exercise and set the muscle."
msgstr ""
@@ -2244,7 +2258,7 @@ msgstr "Gym에 사용자 추가"
msgid "Edit gym"
msgstr ""
-#: i18n.tpl:2
+#: i18n.tpl:2 i18n.tpl:28
msgid "Abs"
msgstr "복근"
@@ -2256,11 +2270,11 @@ msgstr "팔"
msgid "Back"
msgstr "등"
-#: i18n.tpl:5
+#: i18n.tpl:5 i18n.tpl:23
msgid "Calves"
msgstr "종아리"
-#: i18n.tpl:6
+#: i18n.tpl:6 i18n.tpl:26
msgid "Chest"
msgstr "가슴"
@@ -2268,7 +2282,7 @@ msgstr "가슴"
msgid "Legs"
msgstr "다리"
-#: i18n.tpl:8
+#: i18n.tpl:8 i18n.tpl:19
msgid "Shoulders"
msgstr "어깨"
@@ -2297,107 +2311,77 @@ msgid "Kettlebell"
msgstr "캐틀벨"
#: i18n.tpl:15
-msgid "none (bodyweight exercise)"
-msgstr ""
-
-#: i18n.tpl:16
msgid "Pull-up bar"
msgstr "풀업바"
+#: i18n.tpl:16
+msgid "SZ-Bar"
+msgstr "SZ바"
+
#: i18n.tpl:17
msgid "Swiss Ball"
msgstr "스위스볼"
#: i18n.tpl:18
-msgid "SZ-Bar"
-msgstr "SZ바"
-
-#: i18n.tpl:19
-msgid "Anterior deltoid"
-msgstr "전삼각근 (Anterior deltoid)"
+msgid "none (bodyweight exercise)"
+msgstr ""
#: i18n.tpl:20
-msgid "Biceps brachii"
+#, fuzzy
+#| msgid "Biceps brachii"
+msgid "Biceps"
msgstr "상완 이두근 (Biceps brachii)"
#: i18n.tpl:21
-msgid "Biceps femoris"
-msgstr "대퇴 이두근 (Biceps femoris)"
+msgid "Hamstrings"
+msgstr ""
#: i18n.tpl:22
-msgid "Brachialis"
-msgstr "상완근 (Brachialis)"
-
-#: i18n.tpl:23
-msgid "Gastrocnemius"
-msgstr "비복근 (Gastrocnemius)"
+msgid "Lower back"
+msgstr ""
#: i18n.tpl:24
-msgid "Gluteus maximus"
-msgstr "대둔근 (Gluteus maximus)"
+#, fuzzy
+#| msgid "Minutes"
+msgid "Glutes"
+msgstr "분"
#: i18n.tpl:25
-msgid "Latissimus dorsi"
-msgstr "광배근 (Latissimus dorsi)"
-
-#: i18n.tpl:26
-msgid "Obliquus externus abdominis"
-msgstr "외복사근 (Obliquus externus abdominis)"
+msgid "Lats"
+msgstr ""
#: i18n.tpl:27
-msgid "Pectoralis major"
-msgstr "대흉근 (Pectoralis major)"
-
-#: i18n.tpl:28
-msgid "Quadriceps femoris"
-msgstr "대퇴사두근 (Quadriceps femoris)"
+msgid "Quads"
+msgstr ""
#: i18n.tpl:29
-msgid "Rectus abdominis"
-msgstr "복직근 (Rectus abdominis)"
-
-#: i18n.tpl:30
-msgid "Serratus anterior"
-msgstr "전흉근 (Serratus anterior)"
-
-#: i18n.tpl:31
-msgid "Soleus"
-msgstr "가자미근 (Soleus)"
-
-#: i18n.tpl:32
-msgid "Trapezius"
-msgstr "승모근 (Trapezius)"
-
-#: i18n.tpl:33
-msgid "Triceps brachii"
+#, fuzzy
+#| msgid "Triceps brachii"
+msgid "Triceps"
msgstr "상완 삼두근 (Triceps brachii)"
-#: i18n.tpl:34
+#: i18n.tpl:30
msgid "Kilometers"
msgstr "킬로미터"
-#: i18n.tpl:35
-msgid "Max Reps"
-msgstr ""
-
-#: i18n.tpl:36
+#: i18n.tpl:31
msgid "Miles"
msgstr "마일"
-#: i18n.tpl:37
+#: i18n.tpl:32
msgid "Minutes"
msgstr "분"
-#: i18n.tpl:38 manager/forms.py:169 manager/models/log.py:71
+#: i18n.tpl:33 manager/forms.py:169 manager/models/log.py:71
#: manager/templates/set/add.html:53
msgid "Repetitions"
msgstr ""
-#: i18n.tpl:39
+#: i18n.tpl:34
msgid "Seconds"
msgstr "초"
-#: i18n.tpl:40
+#: i18n.tpl:35
msgid "Until Failure"
msgstr "실패 전까지"
@@ -3911,6 +3895,45 @@ msgstr "삭제되었습니다."
msgid "Delete weight entry for the %s"
msgstr ""
+#~ msgid "Anterior deltoid"
+#~ msgstr "전삼각근 (Anterior deltoid)"
+
+#~ msgid "Biceps femoris"
+#~ msgstr "대퇴 이두근 (Biceps femoris)"
+
+#~ msgid "Brachialis"
+#~ msgstr "상완근 (Brachialis)"
+
+#~ msgid "Gastrocnemius"
+#~ msgstr "비복근 (Gastrocnemius)"
+
+#~ msgid "Gluteus maximus"
+#~ msgstr "대둔근 (Gluteus maximus)"
+
+#~ msgid "Latissimus dorsi"
+#~ msgstr "광배근 (Latissimus dorsi)"
+
+#~ msgid "Obliquus externus abdominis"
+#~ msgstr "외복사근 (Obliquus externus abdominis)"
+
+#~ msgid "Pectoralis major"
+#~ msgstr "대흉근 (Pectoralis major)"
+
+#~ msgid "Quadriceps femoris"
+#~ msgstr "대퇴사두근 (Quadriceps femoris)"
+
+#~ msgid "Rectus abdominis"
+#~ msgstr "복직근 (Rectus abdominis)"
+
+#~ msgid "Serratus anterior"
+#~ msgstr "전흉근 (Serratus anterior)"
+
+#~ msgid "Soleus"
+#~ msgstr "가자미근 (Soleus)"
+
+#~ msgid "Trapezius"
+#~ msgstr "승모근 (Trapezius)"
+
#~ msgid "Your current weight is: "
#~ msgstr "현재 체중은 : "
diff --git a/wger/locale/nl/LC_MESSAGES/django.mo b/wger/locale/nl/LC_MESSAGES/django.mo
index dc0745d2a..30ed1f58e 100644
Binary files a/wger/locale/nl/LC_MESSAGES/django.mo and b/wger/locale/nl/LC_MESSAGES/django.mo differ
diff --git a/wger/locale/nl/LC_MESSAGES/django.po b/wger/locale/nl/LC_MESSAGES/django.po
index c3579e979..255ef47d6 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: 2022-02-15 14:51+0100\n"
+"POT-Creation-Date: 2022-05-14 12:01+0200\n"
"PO-Revision-Date: 2022-05-12 14:15+0000\n"
"Last-Translator: Rick <[email protected]>\n"
"Language-Team: Dutch <https://hosted.weblate.org/projects/wger/web/nl/>\n"
@@ -48,7 +48,7 @@ msgstr "Oefeningen"
msgid "Ingredients"
msgstr "Ingrediënten"
-#: config/templates/language/overview.html:4 core/templates/navigation.html:228
+#: config/templates/language/overview.html:4 core/templates/navigation.html:226
msgid "Languages"
msgstr "Talen"
@@ -225,8 +225,8 @@ msgstr "Mijn hip workoutschema"
msgid "Empty placeholder schedule"
msgstr "Leeg tijdelijk schema"
-#: core/forms.py:61 core/templates/navigation.html:190
-#: core/templates/navigation.html:194 core/templates/user/login.html:4
+#: core/forms.py:61 core/templates/navigation.html:188
+#: core/templates/navigation.html:192 core/templates/user/login.html:4
#: software/templates/features.html:43
msgid "Login"
msgstr "Aanmelden"
@@ -303,8 +303,8 @@ msgstr "Ongeldig wachtwoord"
msgid "The form is secured with reCAPTCHA"
msgstr "Dit formulier is beveiligd met reCAPTCHA"
-#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:190
-#: core/templates/navigation.html:195 core/templates/template.html:150
+#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:188
+#: core/templates/navigation.html:193 core/templates/template.html:149
#: core/templates/user/login.html:20 core/views/user.py:293
#: software/templates/features.html:38
msgid "Register"
@@ -632,7 +632,7 @@ msgstr ""
#: core/templates/index.html:33 core/templates/index.html:73
#: core/templates/misc/fragments/shariff_modal.html:29
-#: core/templates/template.html:125 manager/templates/calendar/month.html:138
+#: core/templates/template.html:124 manager/templates/calendar/month.html:138
#: manager/templates/schedule/view.html:246
#: manager/templates/schedule/view.html:266
#: manager/templates/workout/view.html:132
@@ -769,7 +769,7 @@ msgstr "Geen voedingsplannen."
msgid "Weight"
msgstr "Gewicht"
-#: core/templates/index.html:210 core/templates/navigation.html:97
+#: core/templates/index.html:210 core/templates/navigation.html:135
#: weight/views.py:70
msgid "Add weight entry"
msgstr "Voeg gewichtmeting toe"
@@ -801,8 +801,8 @@ msgstr "Licentielijst"
msgid "Nothing found"
msgstr "Niets gevonden"
-#: core/templates/misc/about.html:4 core/templates/template.html:175
-#: core/templates/template_features.html:118
+#: core/templates/misc/about.html:4 core/templates/template.html:174
+#: core/templates/template_features.html:117
#: core/templates/template_no_context.html:88
msgid "Imprint"
msgstr "Afdruk"
@@ -889,13 +889,13 @@ msgstr "per materiaal"
#: exercises/templates/equipment/overview.html:113
#: exercises/templates/exercise/overview.html:112
#: exercises/templates/exercise/overview.html:116
-#: exercises/templates/muscles/overview.html:108
#: exercises/templates/muscles/overview.html:112
+#: exercises/templates/muscles/overview.html:116
msgid "Add new exercise"
msgstr "Creëer oefening"
-#: core/templates/navigation.html:75 core/templates/navigation.html:134
-#: core/templates/navigation.html:226
+#: core/templates/navigation.html:75 core/templates/navigation.html:116
+#: core/templates/navigation.html:224
msgid "Administration"
msgstr "Administratie"
@@ -918,106 +918,106 @@ msgstr "Spieren"
msgid "Categories"
msgstr "Categorieën"
-#: core/templates/navigation.html:94
-msgid "Body weight"
-msgstr "Lichaamsgewicht"
-
-#: core/templates/navigation.html:96 core/templates/user/overview.html:114
-#: weight/templates/overview.html:7
-msgid "Weight overview"
-msgstr "Gewichtsoverzicht"
-
-#: core/templates/navigation.html:111 software/templates/features.html:87
+#: core/templates/navigation.html:93 software/templates/features.html:87
msgid "Nutrition"
msgstr "Voeding"
-#: core/templates/navigation.html:117 core/templates/user/overview.html:144
+#: core/templates/navigation.html:99 core/templates/user/overview.html:144
msgid "Nutrition plans"
msgstr "Voedingsplannen"
-#: core/templates/navigation.html:123 nutrition/templates/bmi/form.html:50
+#: core/templates/navigation.html:105 nutrition/templates/bmi/form.html:50
msgid "BMI calculator"
msgstr "BMI-calculator"
-#: core/templates/navigation.html:129 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:111 nutrition/templates/rate/form.html:17
msgid "Daily calories calculator"
msgstr "Dagelijkse calorieëncalculator"
-#: core/templates/navigation.html:131
+#: core/templates/navigation.html:113
#: nutrition/templates/ingredient/overview.html:29
msgid "Ingredient overview"
msgstr "Ingrediëntenoverzicht"
-#: core/templates/navigation.html:135 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:117 nutrition/templates/units/list.html:6
msgid "Ingredient weight units"
msgstr "Gewichteenheden ingrediënt"
-#: core/templates/navigation.html:136
+#: core/templates/navigation.html:118
#: nutrition/templates/ingredient/pending.html:6
msgid "Ingredients pending review"
msgstr "Ingrediënten in overweging"
-#: core/templates/navigation.html:149
+#: core/templates/navigation.html:132
+msgid "Body weight"
+msgstr "Lichaamsgewicht"
+
+#: core/templates/navigation.html:134 core/templates/user/overview.html:114
+#: weight/templates/overview.html:7
+msgid "Weight overview"
+msgstr "Gewichtsoverzicht"
+
+#: core/templates/navigation.html:147
msgid "About this software"
msgstr "Over deze software"
-#: core/templates/navigation.html:151 core/templates/template_features.html:83
+#: core/templates/navigation.html:149 core/templates/template_features.html:82
#: software/templates/about_us.html:5
msgid "About us"
msgstr "Over ons"
-#: core/templates/navigation.html:153 software/templates/features.html:209
+#: core/templates/navigation.html:151 software/templates/features.html:209
msgid "REST API"
msgstr "REST API"
-#: core/templates/navigation.html:157 utils/models.py:40
+#: core/templates/navigation.html:155 utils/models.py:40
msgid "License"
msgstr "Licentie"
-#: core/templates/navigation.html:163
+#: core/templates/navigation.html:161
msgid "Developer documentation"
msgstr "Developer documentatie"
-#: core/templates/navigation.html:169
+#: core/templates/navigation.html:167
msgid "Get the code"
msgstr "Download de code"
-#: core/templates/navigation.html:175 core/templates/template.html:205
-#: core/templates/template_features.html:100
+#: core/templates/navigation.html:173 core/templates/template.html:204
+#: core/templates/template_features.html:99
msgid "Translate"
msgstr "Vertaal"
-#: core/templates/navigation.html:196 core/templates/user/login.html:28
+#: core/templates/navigation.html:194 core/templates/user/login.html:28
msgid "Reset password"
msgstr "Reset wachtwoord"
-#: core/templates/navigation.html:209
+#: core/templates/navigation.html:207
msgid "My preferences"
msgstr "Mijn voorkeuren"
-#: core/templates/navigation.html:216
+#: core/templates/navigation.html:214
msgid "Logout"
msgstr "Afmelden"
-#: core/templates/navigation.html:231
+#: core/templates/navigation.html:229
msgid "Licenses"
msgstr "Licenties"
-#: core/templates/navigation.html:234
+#: core/templates/navigation.html:232
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr "Herhalingen"
-#: core/templates/navigation.html:237 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:235 core/templates/weight_unit/list.html:4
#: nutrition/templates/ingredient/view.html:174
msgid "Weight units"
msgstr "Gewichteenheden"
-#: core/templates/navigation.html:240 core/templates/user/list.html:4
+#: core/templates/navigation.html:238 core/templates/user/list.html:4
msgid "User list"
msgstr "Gebruikerslijst"
-#: core/templates/navigation.html:241
+#: core/templates/navigation.html:239
msgid "Gyms"
msgstr "Gyms"
@@ -1100,7 +1100,7 @@ msgstr "Voeg gewichtlog toe"
#: core/templates/tags/render_day.html:114
#: exercises/templates/equipment/overview.html:59
#: exercises/templates/exercise/overview.html:63
-#: exercises/templates/muscles/overview.html:61
+#: exercises/templates/muscles/overview.html:65
msgid "Placeholder image for exercise"
msgstr "Placeholder afbeelding voor oefening"
@@ -1127,22 +1127,22 @@ msgstr "Herhalingen"
msgid "RiR"
msgstr "RiR"
-#: core/templates/template.html:140
+#: core/templates/template.html:139
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:144
+#: core/templates/template.html:143
msgid "Create some demo entries"
msgstr "Maak wat demo-ingaven aan"
-#: core/templates/template.html:176 core/templates/template_features.html:122
+#: core/templates/template.html:175 core/templates/template_features.html:121
#: core/templates/template_no_context.html:89 software/templates/tos.html:7
msgid "Terms of service"
msgstr "Algemene voorwaarden"
-#: core/templates/template_features.html:62 software/templates/features.html:9
+#: core/templates/template_features.html:61 software/templates/features.html:9
#: software/templates/features.html:120
msgid "Features"
msgstr "Functies"
@@ -1563,7 +1563,7 @@ msgstr "Primaire spieren"
#: exercises/models/base.py:64 exercises/templates/equipment/overview.html:71
#: exercises/templates/exercise/overview.html:76
#: exercises/templates/exercise/view.html:268
-#: exercises/templates/muscles/overview.html:73
+#: exercises/templates/muscles/overview.html:77
msgid "Secondary muscles"
msgstr "Secundaire spieren"
@@ -1575,9 +1575,9 @@ msgstr "Variaties"
msgid "Exercise Categories"
msgstr "Oefeningcategorieën"
-#: exercises/models/comment.py:34 exercises/models/image.py:75
-#: exercises/models/video.py:82 manager/forms.py:165 manager/helpers.py:89
-#: manager/models/log.py:51
+#: exercises/models/comment.py:34 exercises/models/exercise_alias.py:32
+#: exercises/models/image.py:75 exercises/models/video.py:82
+#: manager/forms.py:165 manager/helpers.py:89 manager/models/log.py:51
msgid "Exercise"
msgstr "Oefening"
@@ -1603,6 +1603,12 @@ msgstr "Nieuwe door gebruiker toegevoegde oefening"
msgid "The user {0} submitted a new exercise \"{1}\"."
msgstr "Gebruiker {0} voegde een nieuwe oefening \"{1}\" toe."
+#: exercises/models/exercise_alias.py:35
+#, fuzzy
+#| msgid "Correcting an exercise"
+msgid "Alias for an exercise"
+msgstr "Een oefening indienen"
+
#: exercises/models/image.py:59
msgid "Line"
msgstr "Regel"
@@ -1663,6 +1669,16 @@ msgstr "De gebruiker {0} voegde een afbeelding \"{1}\" toe voor oefening {2}."
msgid "In latin, e.g. \"Pectoralis major\""
msgstr "Latijns, bvb. \"Pectoralis major\""
+#: exercises/models/muscle.py:47
+#, fuzzy
+#| msgid "exercise name"
+msgid "Alternative name"
+msgstr "naam oefening"
+
+#: exercises/models/muscle.py:48
+msgid "A more basic name for the muscle"
+msgstr ""
+
#: exercises/models/video.py:41
msgid "Maximum file size is 100MB."
msgstr "Maximale bestandsgrootte is 100MB"
@@ -1727,7 +1743,7 @@ msgstr "Materiaaloverzicht"
#: exercises/templates/equipment/overview.html:69
#: exercises/templates/exercise/overview.html:74
#: exercises/templates/exercise/view.html:264
-#: exercises/templates/muscles/overview.html:71
+#: exercises/templates/muscles/overview.html:75
msgid "Main muscles"
msgstr "Primaire spieren"
@@ -1752,7 +1768,7 @@ msgstr "naam oefening"
#: exercises/templates/equipment/overview.html:115
#: exercises/templates/exercise/overview.html:118
-#: exercises/templates/muscles/overview.html:114
+#: exercises/templates/muscles/overview.html:118
#: nutrition/templates/ingredient/overview.html:85
msgid "Only registered users can do this"
msgstr "Enkel geregistreerde gebruikers kunnen dit"
@@ -1949,7 +1965,7 @@ msgstr "Spieroverzicht"
msgid "Add muscle"
msgstr "Creëer spier"
-#: exercises/templates/muscles/overview.html:81
+#: exercises/templates/muscles/overview.html:85
msgid ""
"No exercises for this muscle. Add or edit an exercise and set the muscle."
msgstr ""
@@ -2327,7 +2343,7 @@ msgstr "Gebruiker aan gym toevoegen"
msgid "Edit gym"
msgstr "Gym bewerken"
-#: i18n.tpl:2
+#: i18n.tpl:2 i18n.tpl:28
msgid "Abs"
msgstr "Buikspieren"
@@ -2339,11 +2355,11 @@ msgstr "Armen"
msgid "Back"
msgstr "Rug"
-#: i18n.tpl:5
+#: i18n.tpl:5 i18n.tpl:23
msgid "Calves"
msgstr "Kuiten"
-#: i18n.tpl:6
+#: i18n.tpl:6 i18n.tpl:26
msgid "Chest"
msgstr "Borstkas"
@@ -2351,7 +2367,7 @@ msgstr "Borstkas"
msgid "Legs"
msgstr "Benen"
-#: i18n.tpl:8
+#: i18n.tpl:8 i18n.tpl:19
msgid "Shoulders"
msgstr "Schouders"
@@ -2380,109 +2396,77 @@ msgid "Kettlebell"
msgstr "Kettlebell"
#: i18n.tpl:15
-msgid "none (bodyweight exercise)"
-msgstr "Geen (oefening met lichaamsgewicht)"
-
-#: i18n.tpl:16
msgid "Pull-up bar"
msgstr "Optrekstaaf"
+#: i18n.tpl:16
+msgid "SZ-Bar"
+msgstr "SZ-staaf"
+
#: i18n.tpl:17
msgid "Swiss Ball"
msgstr "Kogelgewicht"
#: i18n.tpl:18
-msgid "SZ-Bar"
-msgstr "SZ-staaf"
-
-#: i18n.tpl:19
-msgid "Anterior deltoid"
-msgstr "Voorste deltaspier"
+msgid "none (bodyweight exercise)"
+msgstr "Geen (oefening met lichaamsgewicht)"
#: i18n.tpl:20
-msgid "Biceps brachii"
+#, fuzzy
+#| msgid "Biceps brachii"
+msgid "Biceps"
msgstr "Biceps brachii"
#: i18n.tpl:21
-msgid "Biceps femoris"
-msgstr "Biceps femoris"
+msgid "Hamstrings"
+msgstr ""
#: i18n.tpl:22
-msgid "Brachialis"
-msgstr "Brachialis"
-
-#: i18n.tpl:23
-msgid "Gastrocnemius"
-msgstr "Gastrocnemius"
+msgid "Lower back"
+msgstr ""
#: i18n.tpl:24
-msgid "Gluteus maximus"
-msgstr "Gluteus maximus"
+#, fuzzy
+#| msgid "Minutes"
+msgid "Glutes"
+msgstr "Minuten"
#: i18n.tpl:25
-msgid "Latissimus dorsi"
-msgstr "Latissimus dorsi"
-
-#: i18n.tpl:26
-msgid "Obliquus externus abdominis"
-msgstr "Obliquus externus abdominis"
+msgid "Lats"
+msgstr ""
#: i18n.tpl:27
-msgid "Pectoralis major"
-msgstr "Pectoralis major"
-
-#: i18n.tpl:28
-msgid "Quadriceps femoris"
-msgstr "Quadriceps femoris"
+msgid "Quads"
+msgstr ""
#: i18n.tpl:29
-msgid "Rectus abdominis"
-msgstr "Rectus abdominis"
-
-#: i18n.tpl:30
-msgid "Serratus anterior"
-msgstr "Serratus anterior"
-
-#: i18n.tpl:31
-msgid "Soleus"
-msgstr "Soleus"
-
-#: i18n.tpl:32
-msgid "Trapezius"
-msgstr "Trapezius"
-
-#: i18n.tpl:33
-msgid "Triceps brachii"
+#, fuzzy
+#| msgid "Triceps brachii"
+msgid "Triceps"
msgstr "Triceps brachii"
-#: i18n.tpl:34
+#: i18n.tpl:30
msgid "Kilometers"
msgstr "Kilometer"
-#: i18n.tpl:35
-#, fuzzy
-#| msgid "Reps"
-msgid "Max Reps"
-msgstr "Herhalingen"
-
-#: i18n.tpl:36
+#: i18n.tpl:31
msgid "Miles"
msgstr "Mijl"
-#: i18n.tpl:37
+#: i18n.tpl:32
msgid "Minutes"
msgstr "Minuten"
-#: i18n.tpl:38 manager/forms.py:169 manager/models/log.py:71
+#: i18n.tpl:33 manager/forms.py:169 manager/models/log.py:71
#: manager/templates/set/add.html:53
msgid "Repetitions"
msgstr "Herhalingen"
-#: i18n.tpl:39
+#: i18n.tpl:34
msgid "Seconds"
msgstr "Seconden"
-#: i18n.tpl:40
+#: i18n.tpl:35
msgid "Until Failure"
msgstr "Tot je faalt"
@@ -4113,6 +4097,50 @@ msgstr "Met succes verwijderd."
msgid "Delete weight entry for the %s"
msgstr "Verwijder gewichtsingave voor de %s"
+#~ msgid "Anterior deltoid"
+#~ msgstr "Voorste deltaspier"
+
+#~ msgid "Biceps femoris"
+#~ msgstr "Biceps femoris"
+
+#~ msgid "Brachialis"
+#~ msgstr "Brachialis"
+
+#~ msgid "Gastrocnemius"
+#~ msgstr "Gastrocnemius"
+
+#~ msgid "Gluteus maximus"
+#~ msgstr "Gluteus maximus"
+
+#~ msgid "Latissimus dorsi"
+#~ msgstr "Latissimus dorsi"
+
+#~ msgid "Obliquus externus abdominis"
+#~ msgstr "Obliquus externus abdominis"
+
+#~ msgid "Pectoralis major"
+#~ msgstr "Pectoralis major"
+
+#~ msgid "Quadriceps femoris"
+#~ msgstr "Quadriceps femoris"
+
+#~ msgid "Rectus abdominis"
+#~ msgstr "Rectus abdominis"
+
+#~ msgid "Serratus anterior"
+#~ msgstr "Serratus anterior"
+
+#~ msgid "Soleus"
+#~ msgstr "Soleus"
+
+#~ msgid "Trapezius"
+#~ msgstr "Trapezius"
+
+#, fuzzy
+#~| msgid "Reps"
+#~ msgid "Max Reps"
+#~ msgstr "Herhalingen"
+
#~ msgid "Your current weight is: "
#~ msgstr "Je huidige gewicht is:"
diff --git a/wger/locale/no/LC_MESSAGES/django.mo b/wger/locale/no/LC_MESSAGES/django.mo
index 805c6d26c..386fb1f8c 100644
Binary files a/wger/locale/no/LC_MESSAGES/django.mo and b/wger/locale/no/LC_MESSAGES/django.mo differ
diff --git a/wger/locale/no/LC_MESSAGES/django.po b/wger/locale/no/LC_MESSAGES/django.po
index 41763f20a..8391be3cb 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: 2022-02-15 14:51+0100\n"
+"POT-Creation-Date: 2022-05-14 12:01+0200\n"
"PO-Revision-Date: 2021-08-20 23:35+0000\n"
"Last-Translator: Allan Nordhøy <[email protected]>\n"
"Language-Team: Norwegian Bokmål <https://hosted.weblate.org/projects/wger/"
@@ -47,7 +47,7 @@ msgstr "Øvelser"
msgid "Ingredients"
msgstr "Ingredienser"
-#: config/templates/language/overview.html:4 core/templates/navigation.html:228
+#: config/templates/language/overview.html:4 core/templates/navigation.html:226
msgid "Languages"
msgstr "Språk"
@@ -223,8 +223,8 @@ msgstr "Mitt kule treningsprogram"
msgid "Empty placeholder schedule"
msgstr "Tom plassholder for timeplanen"
-#: core/forms.py:61 core/templates/navigation.html:190
-#: core/templates/navigation.html:194 core/templates/user/login.html:4
+#: core/forms.py:61 core/templates/navigation.html:188
+#: core/templates/navigation.html:192 core/templates/user/login.html:4
#: software/templates/features.html:43
msgid "Login"
msgstr "Logg inn"
@@ -297,8 +297,8 @@ msgstr "Ugyldig passord"
msgid "The form is secured with reCAPTCHA"
msgstr "Skjemaet er sikret med reCAPTCHA"
-#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:190
-#: core/templates/navigation.html:195 core/templates/template.html:150
+#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:188
+#: core/templates/navigation.html:193 core/templates/template.html:149
#: core/templates/user/login.html:20 core/views/user.py:293
#: software/templates/features.html:38
msgid "Register"
@@ -622,7 +622,7 @@ msgstr ""
#: core/templates/index.html:33 core/templates/index.html:73
#: core/templates/misc/fragments/shariff_modal.html:29
-#: core/templates/template.html:125 manager/templates/calendar/month.html:138
+#: core/templates/template.html:124 manager/templates/calendar/month.html:138
#: manager/templates/schedule/view.html:246
#: manager/templates/schedule/view.html:266
#: manager/templates/workout/view.html:132
@@ -759,7 +759,7 @@ msgstr "Ingen ernæringsplaner."
msgid "Weight"
msgstr "Vekt"
-#: core/templates/index.html:210 core/templates/navigation.html:97
+#: core/templates/index.html:210 core/templates/navigation.html:135
#: weight/views.py:70
msgid "Add weight entry"
msgstr "Legg til vekt"
@@ -791,8 +791,8 @@ msgstr "Lisensliste"
msgid "Nothing found"
msgstr "Ingenting funnet"
-#: core/templates/misc/about.html:4 core/templates/template.html:175
-#: core/templates/template_features.html:118
+#: core/templates/misc/about.html:4 core/templates/template.html:174
+#: core/templates/template_features.html:117
#: core/templates/template_no_context.html:88
msgid "Imprint"
msgstr ""
@@ -880,13 +880,13 @@ msgstr "etter apperat"
#: exercises/templates/equipment/overview.html:113
#: exercises/templates/exercise/overview.html:112
#: exercises/templates/exercise/overview.html:116
-#: exercises/templates/muscles/overview.html:108
#: exercises/templates/muscles/overview.html:112
+#: exercises/templates/muscles/overview.html:116
msgid "Add new exercise"
msgstr "Legg til ny øvelse"
-#: core/templates/navigation.html:75 core/templates/navigation.html:134
-#: core/templates/navigation.html:226
+#: core/templates/navigation.html:75 core/templates/navigation.html:116
+#: core/templates/navigation.html:224
msgid "Administration"
msgstr "Administrasjon"
@@ -909,106 +909,106 @@ msgstr "Muskler"
msgid "Categories"
msgstr "Kategorier"
-#: core/templates/navigation.html:94
-msgid "Body weight"
-msgstr "Kropsvekt"
-
-#: core/templates/navigation.html:96 core/templates/user/overview.html:114
-#: weight/templates/overview.html:7
-msgid "Weight overview"
-msgstr "Vektoversikt"
-
-#: core/templates/navigation.html:111 software/templates/features.html:87
+#: core/templates/navigation.html:93 software/templates/features.html:87
msgid "Nutrition"
msgstr "Ernæring"
-#: core/templates/navigation.html:117 core/templates/user/overview.html:144
+#: core/templates/navigation.html:99 core/templates/user/overview.html:144
msgid "Nutrition plans"
msgstr "Ernæringsplaner"
-#: core/templates/navigation.html:123 nutrition/templates/bmi/form.html:50
+#: core/templates/navigation.html:105 nutrition/templates/bmi/form.html:50
msgid "BMI calculator"
msgstr "BMI-kalkulator"
-#: core/templates/navigation.html:129 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:111 nutrition/templates/rate/form.html:17
msgid "Daily calories calculator"
msgstr "Daglig kalorikalkulator"
-#: core/templates/navigation.html:131
+#: core/templates/navigation.html:113
#: nutrition/templates/ingredient/overview.html:29
msgid "Ingredient overview"
msgstr "Ingrediensoversikt"
-#: core/templates/navigation.html:135 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:117 nutrition/templates/units/list.html:6
msgid "Ingredient weight units"
msgstr "Vektenheter for ingredienser"
-#: core/templates/navigation.html:136
+#: core/templates/navigation.html:118
#: nutrition/templates/ingredient/pending.html:6
msgid "Ingredients pending review"
msgstr "Ingredienser som venter på godkjenning"
-#: core/templates/navigation.html:149
+#: core/templates/navigation.html:132
+msgid "Body weight"
+msgstr "Kropsvekt"
+
+#: core/templates/navigation.html:134 core/templates/user/overview.html:114
+#: weight/templates/overview.html:7
+msgid "Weight overview"
+msgstr "Vektoversikt"
+
+#: core/templates/navigation.html:147
msgid "About this software"
msgstr "Om denne programvaren"
-#: core/templates/navigation.html:151 core/templates/template_features.html:83
+#: core/templates/navigation.html:149 core/templates/template_features.html:82
#: software/templates/about_us.html:5
msgid "About us"
msgstr "Om oss"
-#: core/templates/navigation.html:153 software/templates/features.html:209
+#: core/templates/navigation.html:151 software/templates/features.html:209
msgid "REST API"
msgstr "REST API"
-#: core/templates/navigation.html:157 utils/models.py:40
+#: core/templates/navigation.html:155 utils/models.py:40
msgid "License"
msgstr "Lisens"
-#: core/templates/navigation.html:163
+#: core/templates/navigation.html:161
msgid "Developer documentation"
msgstr "Utvikler dokumentasjon"
-#: core/templates/navigation.html:169
+#: core/templates/navigation.html:167
msgid "Get the code"
msgstr "Få koden"
-#: core/templates/navigation.html:175 core/templates/template.html:205
-#: core/templates/template_features.html:100
+#: core/templates/navigation.html:173 core/templates/template.html:204
+#: core/templates/template_features.html:99
msgid "Translate"
msgstr "Oversett"
-#: core/templates/navigation.html:196 core/templates/user/login.html:28
+#: core/templates/navigation.html:194 core/templates/user/login.html:28
msgid "Reset password"
msgstr "Tilbakestill passord"
-#: core/templates/navigation.html:209
+#: core/templates/navigation.html:207
msgid "My preferences"
msgstr "Mine innstillinger"
-#: core/templates/navigation.html:216
+#: core/templates/navigation.html:214
msgid "Logout"
msgstr "Logg ut"
-#: core/templates/navigation.html:231
+#: core/templates/navigation.html:229
msgid "Licenses"
msgstr "Lisenser"
-#: core/templates/navigation.html:234
+#: core/templates/navigation.html:232
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr "Repetisjonsenheter"
-#: core/templates/navigation.html:237 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:235 core/templates/weight_unit/list.html:4
#: nutrition/templates/ingredient/view.html:174
msgid "Weight units"
msgstr "Vektenheter"
-#: core/templates/navigation.html:240 core/templates/user/list.html:4
+#: core/templates/navigation.html:238 core/templates/user/list.html:4
msgid "User list"
msgstr "Brukerliste"
-#: core/templates/navigation.html:241
+#: core/templates/navigation.html:239
msgid "Gyms"
msgstr "Treningsstudioer"
@@ -1090,7 +1090,7 @@ msgstr "Legg til vektlogg"
#: core/templates/tags/render_day.html:114
#: exercises/templates/equipment/overview.html:59
#: exercises/templates/exercise/overview.html:63
-#: exercises/templates/muscles/overview.html:61
+#: exercises/templates/muscles/overview.html:65
msgid "Placeholder image for exercise"
msgstr "Plassholder for bilde for øvelsen"
@@ -1117,21 +1117,21 @@ msgstr "Repetisjoner"
msgid "RiR"
msgstr "RiR"
-#: core/templates/template.html:140
+#: core/templates/template.html:139
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:144
+#: core/templates/template.html:143
msgid "Create some demo entries"
msgstr "Lag noen demo oppføringer"
-#: core/templates/template.html:176 core/templates/template_features.html:122
+#: core/templates/template.html:175 core/templates/template_features.html:121
#: core/templates/template_no_context.html:89 software/templates/tos.html:7
msgid "Terms of service"
msgstr "Vilkår for bruk"
-#: core/templates/template_features.html:62 software/templates/features.html:9
+#: core/templates/template_features.html:61 software/templates/features.html:9
#: software/templates/features.html:120
msgid "Features"
msgstr "Funksjoner"
@@ -1553,7 +1553,7 @@ msgstr "Primære muskler"
#: exercises/models/base.py:64 exercises/templates/equipment/overview.html:71
#: exercises/templates/exercise/overview.html:76
#: exercises/templates/exercise/view.html:268
-#: exercises/templates/muscles/overview.html:73
+#: exercises/templates/muscles/overview.html:77
msgid "Secondary muscles"
msgstr "Sekundære muskler"
@@ -1565,9 +1565,9 @@ msgstr "Variasjoner"
msgid "Exercise Categories"
msgstr "Øvelses kategorier"
-#: exercises/models/comment.py:34 exercises/models/image.py:75
-#: exercises/models/video.py:82 manager/forms.py:165 manager/helpers.py:89
-#: manager/models/log.py:51
+#: exercises/models/comment.py:34 exercises/models/exercise_alias.py:32
+#: exercises/models/image.py:75 exercises/models/video.py:82
+#: manager/forms.py:165 manager/helpers.py:89 manager/models/log.py:51
msgid "Exercise"
msgstr "Øvelse"
@@ -1593,6 +1593,12 @@ msgstr "Ny bruker har sendt inn øvelse"
msgid "The user {0} submitted a new exercise \"{1}\"."
msgstr "Brukeren {0} sendte inn en ny øvelse \"{1}\"."
+#: exercises/models/exercise_alias.py:35
+#, fuzzy
+#| msgid "Correcting an exercise"
+msgid "Alias for an exercise"
+msgstr "Retter en øvelse"
+
#: exercises/models/image.py:59
msgid "Line"
msgstr ""
@@ -1654,6 +1660,16 @@ msgstr "Brukeren {0} sendte inn et nytt bilde \"{1}\" for øvelsen {2}."
msgid "In latin, e.g. \"Pectoralis major\""
msgstr "I latin, f.eks \"Pectoralis major\""
+#: exercises/models/muscle.py:47
+#, fuzzy
+#| msgid "exercise name"
+msgid "Alternative name"
+msgstr "Navn på øvelsen"
+
+#: exercises/models/muscle.py:48
+msgid "A more basic name for the muscle"
+msgstr ""
+
#: exercises/models/video.py:41
msgid "Maximum file size is 100MB."
msgstr ""
@@ -1722,7 +1738,7 @@ msgstr "Utstyrsoversikt"
#: exercises/templates/equipment/overview.html:69
#: exercises/templates/exercise/overview.html:74
#: exercises/templates/exercise/view.html:264
-#: exercises/templates/muscles/overview.html:71
+#: exercises/templates/muscles/overview.html:75
msgid "Main muscles"
msgstr "Viktigste musklene"
@@ -1747,7 +1763,7 @@ msgstr "Navn på øvelsen"
#: exercises/templates/equipment/overview.html:115
#: exercises/templates/exercise/overview.html:118
-#: exercises/templates/muscles/overview.html:114
+#: exercises/templates/muscles/overview.html:118
#: nutrition/templates/ingredient/overview.html:85
msgid "Only registered users can do this"
msgstr "Kun registrerte brukere kan utføre dette"
@@ -1944,7 +1960,7 @@ msgstr "Muskeloversikt"
msgid "Add muscle"
msgstr "Legg til muskel"
-#: exercises/templates/muscles/overview.html:81
+#: exercises/templates/muscles/overview.html:85
#, fuzzy
msgid ""
"No exercises for this muscle. Add or edit an exercise and set the muscle."
@@ -2320,7 +2336,7 @@ msgstr "Legg til brukere til treningsstudio"
msgid "Edit gym"
msgstr "Rediger treningsstudio"
-#: i18n.tpl:2
+#: i18n.tpl:2 i18n.tpl:28
msgid "Abs"
msgstr "Mage"
@@ -2332,11 +2348,11 @@ msgstr "Armer"
msgid "Back"
msgstr "Rygg"
-#: i18n.tpl:5
+#: i18n.tpl:5 i18n.tpl:23
msgid "Calves"
msgstr "Legg"
-#: i18n.tpl:6
+#: i18n.tpl:6 i18n.tpl:26
msgid "Chest"
msgstr "Bryst"
@@ -2344,7 +2360,7 @@ msgstr "Bryst"
msgid "Legs"
msgstr "Bein"
-#: i18n.tpl:8
+#: i18n.tpl:8 i18n.tpl:19
msgid "Shoulders"
msgstr "Skuldre"
@@ -2373,107 +2389,77 @@ msgid "Kettlebell"
msgstr "Kettlebell"
#: i18n.tpl:15
-msgid "none (bodyweight exercise)"
-msgstr "ingen (kroppsvekt øvelse)"
-
-#: i18n.tpl:16
msgid "Pull-up bar"
msgstr "Pull-up stang"
+#: i18n.tpl:16
+msgid "SZ-Bar"
+msgstr "SZ-stang"
+
#: i18n.tpl:17
msgid "Swiss Ball"
msgstr "Gymball"
#: i18n.tpl:18
-msgid "SZ-Bar"
-msgstr "SZ-stang"
-
-#: i18n.tpl:19
-msgid "Anterior deltoid"
-msgstr "Anterior deltoid"
+msgid "none (bodyweight exercise)"
+msgstr "ingen (kroppsvekt øvelse)"
#: i18n.tpl:20
-msgid "Biceps brachii"
+#, fuzzy
+#| msgid "Biceps brachii"
+msgid "Biceps"
msgstr "Biceps brachii"
#: i18n.tpl:21
-msgid "Biceps femoris"
-msgstr "Biceps femoris"
+msgid "Hamstrings"
+msgstr ""
#: i18n.tpl:22
-msgid "Brachialis"
-msgstr "Brachialis"
-
-#: i18n.tpl:23
-msgid "Gastrocnemius"
-msgstr "Gastrocnemius"
+msgid "Lower back"
+msgstr ""
#: i18n.tpl:24
-msgid "Gluteus maximus"
-msgstr "Gluteus maximus"
+#, fuzzy
+#| msgid "Minutes"
+msgid "Glutes"
+msgstr "Minutter"
#: i18n.tpl:25
-msgid "Latissimus dorsi"
-msgstr "Latissimus dorsi"
-
-#: i18n.tpl:26
-msgid "Obliquus externus abdominis"
-msgstr "Obliquus externus abdominis"
+msgid "Lats"
+msgstr ""
#: i18n.tpl:27
-msgid "Pectoralis major"
-msgstr "Pectoralis major"
-
-#: i18n.tpl:28
-msgid "Quadriceps femoris"
-msgstr "Quadriceps femoris"
+msgid "Quads"
+msgstr ""
#: i18n.tpl:29
-msgid "Rectus abdominis"
-msgstr "Rectus abdominis"
-
-#: i18n.tpl:30
-msgid "Serratus anterior"
-msgstr "Serratus anterior"
-
-#: i18n.tpl:31
-msgid "Soleus"
-msgstr "Soleus"
-
-#: i18n.tpl:32
-msgid "Trapezius"
-msgstr "Trapezius"
-
-#: i18n.tpl:33
-msgid "Triceps brachii"
+#, fuzzy
+#| msgid "Triceps brachii"
+msgid "Triceps"
msgstr "Triceps brachii"
-#: i18n.tpl:34
+#: i18n.tpl:30
msgid "Kilometers"
msgstr "Kilometer"
-#: i18n.tpl:35
-msgid "Max Reps"
-msgstr "Maks. repetisjoner"
-
-#: i18n.tpl:36
+#: i18n.tpl:31
msgid "Miles"
msgstr "Miles"
-#: i18n.tpl:37
+#: i18n.tpl:32
msgid "Minutes"
msgstr "Minutter"
-#: i18n.tpl:38 manager/forms.py:169 manager/models/log.py:71
+#: i18n.tpl:33 manager/forms.py:169 manager/models/log.py:71
#: manager/templates/set/add.html:53
msgid "Repetitions"
msgstr "Repetisjoner"
-#: i18n.tpl:39
+#: i18n.tpl:34
msgid "Seconds"
msgstr "Sekunder"
-#: i18n.tpl:40
+#: i18n.tpl:35
msgid "Until Failure"
msgstr "Til Utmattelse"
@@ -4145,6 +4131,48 @@ msgstr "Slettet."
msgid "Delete weight entry for the %s"
msgstr "Slett vektoppføring for %s"
+#~ msgid "Anterior deltoid"
+#~ msgstr "Anterior deltoid"
+
+#~ msgid "Biceps femoris"
+#~ msgstr "Biceps femoris"
+
+#~ msgid "Brachialis"
+#~ msgstr "Brachialis"
+
+#~ msgid "Gastrocnemius"
+#~ msgstr "Gastrocnemius"
+
+#~ msgid "Gluteus maximus"
+#~ msgstr "Gluteus maximus"
+
+#~ msgid "Latissimus dorsi"
+#~ msgstr "Latissimus dorsi"
+
+#~ msgid "Obliquus externus abdominis"
+#~ msgstr "Obliquus externus abdominis"
+
+#~ msgid "Pectoralis major"
+#~ msgstr "Pectoralis major"
+
+#~ msgid "Quadriceps femoris"
+#~ msgstr "Quadriceps femoris"
+
+#~ msgid "Rectus abdominis"
+#~ msgstr "Rectus abdominis"
+
+#~ msgid "Serratus anterior"
+#~ msgstr "Serratus anterior"
+
+#~ msgid "Soleus"
+#~ msgstr "Soleus"
+
+#~ msgid "Trapezius"
+#~ msgstr "Trapezius"
+
+#~ msgid "Max Reps"
+#~ msgstr "Maks. repetisjoner"
+
#~ msgid "Your current weight is: "
#~ msgstr "Din nåværende vekt er:"
diff --git a/wger/locale/os/LC_MESSAGES/django.po b/wger/locale/os/LC_MESSAGES/django.po
index 86c6ab6bb..ead926b15 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: 2022-02-15 14:51+0100\n"
+"POT-Creation-Date: 2022-05-14 12:01+0200\n"
"PO-Revision-Date: 2021-04-11 18:54+0000\n"
"Last-Translator: rge <[email protected]>\n"
"Language-Team: Ossetic (http://www.transifex.com/rge/wger-workout-manager/"
@@ -39,7 +39,7 @@ msgstr "Фӕлтӕрӕнтӕ"
msgid "Ingredients"
msgstr ""
-#: config/templates/language/overview.html:4 core/templates/navigation.html:228
+#: config/templates/language/overview.html:4 core/templates/navigation.html:226
msgid "Languages"
msgstr ""
@@ -211,8 +211,8 @@ msgstr ""
msgid "Empty placeholder schedule"
msgstr ""
-#: core/forms.py:61 core/templates/navigation.html:190
-#: core/templates/navigation.html:194 core/templates/user/login.html:4
+#: core/forms.py:61 core/templates/navigation.html:188
+#: core/templates/navigation.html:192 core/templates/user/login.html:4
#: software/templates/features.html:43
msgid "Login"
msgstr ""
@@ -285,8 +285,8 @@ msgstr ""
msgid "The form is secured with reCAPTCHA"
msgstr ""
-#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:190
-#: core/templates/navigation.html:195 core/templates/template.html:150
+#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:188
+#: core/templates/navigation.html:193 core/templates/template.html:149
#: core/templates/user/login.html:20 core/views/user.py:293
#: software/templates/features.html:38
msgid "Register"
@@ -586,7 +586,7 @@ msgstr ""
#: core/templates/index.html:33 core/templates/index.html:73
#: core/templates/misc/fragments/shariff_modal.html:29
-#: core/templates/template.html:125 manager/templates/calendar/month.html:138
+#: core/templates/template.html:124 manager/templates/calendar/month.html:138
#: manager/templates/schedule/view.html:246
#: manager/templates/schedule/view.html:266
#: manager/templates/workout/view.html:132
@@ -718,7 +718,7 @@ msgstr ""
msgid "Weight"
msgstr ""
-#: core/templates/index.html:210 core/templates/navigation.html:97
+#: core/templates/index.html:210 core/templates/navigation.html:135
#: weight/views.py:70
msgid "Add weight entry"
msgstr ""
@@ -750,8 +750,8 @@ msgstr ""
msgid "Nothing found"
msgstr ""
-#: core/templates/misc/about.html:4 core/templates/template.html:175
-#: core/templates/template_features.html:118
+#: core/templates/misc/about.html:4 core/templates/template.html:174
+#: core/templates/template_features.html:117
#: core/templates/template_no_context.html:88
msgid "Imprint"
msgstr ""
@@ -833,13 +833,13 @@ msgstr ""
#: exercises/templates/equipment/overview.html:113
#: exercises/templates/exercise/overview.html:112
#: exercises/templates/exercise/overview.html:116
-#: exercises/templates/muscles/overview.html:108
#: exercises/templates/muscles/overview.html:112
+#: exercises/templates/muscles/overview.html:116
msgid "Add new exercise"
msgstr "Ног фӕлтӕрӕн бафтауын"
-#: core/templates/navigation.html:75 core/templates/navigation.html:134
-#: core/templates/navigation.html:226
+#: core/templates/navigation.html:75 core/templates/navigation.html:116
+#: core/templates/navigation.html:224
msgid "Administration"
msgstr "Администраци"
@@ -862,106 +862,106 @@ msgstr "Мускултӕ"
msgid "Categories"
msgstr ""
-#: core/templates/navigation.html:94
-msgid "Body weight"
-msgstr ""
-
-#: core/templates/navigation.html:96 core/templates/user/overview.html:114
-#: weight/templates/overview.html:7
-msgid "Weight overview"
-msgstr ""
-
-#: core/templates/navigation.html:111 software/templates/features.html:87
+#: core/templates/navigation.html:93 software/templates/features.html:87
msgid "Nutrition"
msgstr ""
-#: core/templates/navigation.html:117 core/templates/user/overview.html:144
+#: core/templates/navigation.html:99 core/templates/user/overview.html:144
msgid "Nutrition plans"
msgstr ""
-#: core/templates/navigation.html:123 nutrition/templates/bmi/form.html:50
+#: core/templates/navigation.html:105 nutrition/templates/bmi/form.html:50
msgid "BMI calculator"
msgstr ""
-#: core/templates/navigation.html:129 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:111 nutrition/templates/rate/form.html:17
msgid "Daily calories calculator"
msgstr ""
-#: core/templates/navigation.html:131
+#: core/templates/navigation.html:113
#: nutrition/templates/ingredient/overview.html:29
msgid "Ingredient overview"
msgstr ""
-#: core/templates/navigation.html:135 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:117 nutrition/templates/units/list.html:6
msgid "Ingredient weight units"
msgstr ""
-#: core/templates/navigation.html:136
+#: core/templates/navigation.html:118
#: nutrition/templates/ingredient/pending.html:6
msgid "Ingredients pending review"
msgstr ""
-#: core/templates/navigation.html:149
+#: core/templates/navigation.html:132
+msgid "Body weight"
+msgstr ""
+
+#: core/templates/navigation.html:134 core/templates/user/overview.html:114
+#: weight/templates/overview.html:7
+msgid "Weight overview"
+msgstr ""
+
+#: core/templates/navigation.html:147
msgid "About this software"
msgstr ""
-#: core/templates/navigation.html:151 core/templates/template_features.html:83
+#: core/templates/navigation.html:149 core/templates/template_features.html:82
#: software/templates/about_us.html:5
msgid "About us"
msgstr ""
-#: core/templates/navigation.html:153 software/templates/features.html:209
+#: core/templates/navigation.html:151 software/templates/features.html:209
msgid "REST API"
msgstr ""
-#: core/templates/navigation.html:157 utils/models.py:40
+#: core/templates/navigation.html:155 utils/models.py:40
msgid "License"
msgstr ""
-#: core/templates/navigation.html:163
+#: core/templates/navigation.html:161
msgid "Developer documentation"
msgstr ""
-#: core/templates/navigation.html:169
+#: core/templates/navigation.html:167
msgid "Get the code"
msgstr ""
-#: core/templates/navigation.html:175 core/templates/template.html:205
-#: core/templates/template_features.html:100
+#: core/templates/navigation.html:173 core/templates/template.html:204
+#: core/templates/template_features.html:99
msgid "Translate"
msgstr ""
-#: core/templates/navigation.html:196 core/templates/user/login.html:28
+#: core/templates/navigation.html:194 core/templates/user/login.html:28
msgid "Reset password"
msgstr ""
-#: core/templates/navigation.html:209
+#: core/templates/navigation.html:207
msgid "My preferences"
msgstr ""
-#: core/templates/navigation.html:216
+#: core/templates/navigation.html:214
msgid "Logout"
msgstr ""
-#: core/templates/navigation.html:231
+#: core/templates/navigation.html:229
msgid "Licenses"
msgstr ""
-#: core/templates/navigation.html:234
+#: core/templates/navigation.html:232
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr ""
-#: core/templates/navigation.html:237 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:235 core/templates/weight_unit/list.html:4
#: nutrition/templates/ingredient/view.html:174
msgid "Weight units"
msgstr ""
-#: core/templates/navigation.html:240 core/templates/user/list.html:4
+#: core/templates/navigation.html:238 core/templates/user/list.html:4
msgid "User list"
msgstr ""
-#: core/templates/navigation.html:241
+#: core/templates/navigation.html:239
msgid "Gyms"
msgstr ""
@@ -1039,7 +1039,7 @@ msgstr ""
#: core/templates/tags/render_day.html:114
#: exercises/templates/equipment/overview.html:59
#: exercises/templates/exercise/overview.html:63
-#: exercises/templates/muscles/overview.html:61
+#: exercises/templates/muscles/overview.html:65
msgid "Placeholder image for exercise"
msgstr ""
@@ -1066,21 +1066,21 @@ msgstr ""
msgid "RiR"
msgstr ""
-#: core/templates/template.html:140
+#: core/templates/template.html:139
msgid ""
"You are using a guest account, data entered will be deleted after a week."
msgstr ""
-#: core/templates/template.html:144
+#: core/templates/template.html:143
msgid "Create some demo entries"
msgstr ""
-#: core/templates/template.html:176 core/templates/template_features.html:122
+#: core/templates/template.html:175 core/templates/template_features.html:121
#: core/templates/template_no_context.html:89 software/templates/tos.html:7
msgid "Terms of service"
msgstr ""
-#: core/templates/template_features.html:62 software/templates/features.html:9
+#: core/templates/template_features.html:61 software/templates/features.html:9
#: software/templates/features.html:120
msgid "Features"
msgstr ""
@@ -1490,7 +1490,7 @@ msgstr "Фыццаг мускултӕ"
#: exercises/models/base.py:64 exercises/templates/equipment/overview.html:71
#: exercises/templates/exercise/overview.html:76
#: exercises/templates/exercise/view.html:268
-#: exercises/templates/muscles/overview.html:73
+#: exercises/templates/muscles/overview.html:77
msgid "Secondary muscles"
msgstr "Дыггаг мускултӕ"
@@ -1502,9 +1502,9 @@ msgstr ""
msgid "Exercise Categories"
msgstr "Фӕлтӕрӕнты ӕмбырд"
-#: exercises/models/comment.py:34 exercises/models/image.py:75
-#: exercises/models/video.py:82 manager/forms.py:165 manager/helpers.py:89
-#: manager/models/log.py:51
+#: exercises/models/comment.py:34 exercises/models/exercise_alias.py:32
+#: exercises/models/image.py:75 exercises/models/video.py:82
+#: manager/forms.py:165 manager/helpers.py:89 manager/models/log.py:51
msgid "Exercise"
msgstr "Фӕлтӕрӕн"
@@ -1530,6 +1530,12 @@ msgstr ""
msgid "The user {0} submitted a new exercise \"{1}\"."
msgstr ""
+#: exercises/models/exercise_alias.py:35
+#, fuzzy
+#| msgid "Add new exercise"
+msgid "Alias for an exercise"
+msgstr "Ног фӕлтӕрӕн бафтауын"
+
#: exercises/models/image.py:59
msgid "Line"
msgstr ""
@@ -1586,6 +1592,16 @@ msgstr ""
msgid "In latin, e.g. \"Pectoralis major\""
msgstr ""
+#: exercises/models/muscle.py:47
+#, fuzzy
+#| msgid "exercise name"
+msgid "Alternative name"
+msgstr "фӕлтӕрӕны ном"
+
+#: exercises/models/muscle.py:48
+msgid "A more basic name for the muscle"
+msgstr ""
+
#: exercises/models/video.py:41
msgid "Maximum file size is 100MB."
msgstr ""
@@ -1646,7 +1662,7 @@ msgstr ""
#: exercises/templates/equipment/overview.html:69
#: exercises/templates/exercise/overview.html:74
#: exercises/templates/exercise/view.html:264
-#: exercises/templates/muscles/overview.html:71
+#: exercises/templates/muscles/overview.html:75
msgid "Main muscles"
msgstr ""
@@ -1669,7 +1685,7 @@ msgstr "фӕлтӕрӕны ном"
#: exercises/templates/equipment/overview.html:115
#: exercises/templates/exercise/overview.html:118
-#: exercises/templates/muscles/overview.html:114
+#: exercises/templates/muscles/overview.html:118
#: nutrition/templates/ingredient/overview.html:85
msgid "Only registered users can do this"
msgstr ""
@@ -1848,7 +1864,7 @@ msgstr ""
msgid "Add muscle"
msgstr "Мускул бафтауын"
-#: exercises/templates/muscles/overview.html:81
+#: exercises/templates/muscles/overview.html:85
msgid ""
"No exercises for this muscle. Add or edit an exercise and set the muscle."
msgstr ""
@@ -2216,7 +2232,7 @@ msgstr ""
msgid "Edit gym"
msgstr ""
-#: i18n.tpl:2
+#: i18n.tpl:2 i18n.tpl:28
msgid "Abs"
msgstr ""
@@ -2228,11 +2244,11 @@ msgstr ""
msgid "Back"
msgstr "Фӕсонтӕ"
-#: i18n.tpl:5
+#: i18n.tpl:5 i18n.tpl:23
msgid "Calves"
msgstr ""
-#: i18n.tpl:6
+#: i18n.tpl:6 i18n.tpl:26
msgid "Chest"
msgstr ""
@@ -2240,7 +2256,7 @@ msgstr ""
msgid "Legs"
msgstr ""
-#: i18n.tpl:8
+#: i18n.tpl:8 i18n.tpl:19
msgid "Shoulders"
msgstr ""
@@ -2269,11 +2285,11 @@ msgid "Kettlebell"
msgstr ""
#: i18n.tpl:15
-msgid "none (bodyweight exercise)"
+msgid "Pull-up bar"
msgstr ""
#: i18n.tpl:16
-msgid "Pull-up bar"
+msgid "SZ-Bar"
msgstr ""
#: i18n.tpl:17
@@ -2281,95 +2297,59 @@ msgid "Swiss Ball"
msgstr ""
#: i18n.tpl:18
-msgid "SZ-Bar"
-msgstr ""
-
-#: i18n.tpl:19
-msgid "Anterior deltoid"
+msgid "none (bodyweight exercise)"
msgstr ""
#: i18n.tpl:20
-msgid "Biceps brachii"
+msgid "Biceps"
msgstr ""
#: i18n.tpl:21
-msgid "Biceps femoris"
+msgid "Hamstrings"
msgstr ""
#: i18n.tpl:22
-msgid "Brachialis"
-msgstr ""
-
-#: i18n.tpl:23
-msgid "Gastrocnemius"
+msgid "Lower back"
msgstr ""
#: i18n.tpl:24
-msgid "Gluteus maximus"
+msgid "Glutes"
msgstr ""
#: i18n.tpl:25
-msgid "Latissimus dorsi"
-msgstr ""
-
-#: i18n.tpl:26
-msgid "Obliquus externus abdominis"
+msgid "Lats"
msgstr ""
#: i18n.tpl:27
-msgid "Pectoralis major"
-msgstr ""
-
-#: i18n.tpl:28
-msgid "Quadriceps femoris"
+msgid "Quads"
msgstr ""
#: i18n.tpl:29
-msgid "Rectus abdominis"
+msgid "Triceps"
msgstr ""
#: i18n.tpl:30
-msgid "Serratus anterior"
-msgstr ""
-
-#: i18n.tpl:31
-msgid "Soleus"
-msgstr ""
-
-#: i18n.tpl:32
-msgid "Trapezius"
-msgstr ""
-
-#: i18n.tpl:33
-msgid "Triceps brachii"
-msgstr ""
-
-#: i18n.tpl:34
msgid "Kilometers"
msgstr ""
-#: i18n.tpl:35
-msgid "Max Reps"
-msgstr ""
-
-#: i18n.tpl:36
+#: i18n.tpl:31
msgid "Miles"
msgstr ""
-#: i18n.tpl:37
+#: i18n.tpl:32
msgid "Minutes"
msgstr ""
-#: i18n.tpl:38 manager/forms.py:169 manager/models/log.py:71
+#: i18n.tpl:33 manager/forms.py:169 manager/models/log.py:71
#: manager/templates/set/add.html:53
msgid "Repetitions"
msgstr ""
-#: i18n.tpl:39
+#: i18n.tpl:34
msgid "Seconds"
msgstr ""
-#: i18n.tpl:40
+#: i18n.tpl:35
msgid "Until Failure"
msgstr ""
diff --git a/wger/locale/pl/LC_MESSAGES/django.po b/wger/locale/pl/LC_MESSAGES/django.po
index 148add492..520718855 100644
--- a/wger/locale/pl/LC_MESSAGES/django.po
+++ b/wger/locale/pl/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: 2022-02-15 14:51+0100\n"
+"POT-Creation-Date: 2022-05-14 12:01+0200\n"
"PO-Revision-Date: 2021-10-27 10:48+0000\n"
"Last-Translator: A M <[email protected]>\n"
"Language-Team: Polish <https://hosted.weblate.org/projects/wger/web/pl/>\n"
@@ -49,7 +49,7 @@ msgstr "Ćwiczenia"
msgid "Ingredients"
msgstr "Składniki"
-#: config/templates/language/overview.html:4 core/templates/navigation.html:228
+#: config/templates/language/overview.html:4 core/templates/navigation.html:226
msgid "Languages"
msgstr "Języki"
@@ -226,8 +226,8 @@ msgstr "Mój fajny harmonogram treningu"
msgid "Empty placeholder schedule"
msgstr "Pusty zapychacz harmonogramu"
-#: core/forms.py:61 core/templates/navigation.html:190
-#: core/templates/navigation.html:194 core/templates/user/login.html:4
+#: core/forms.py:61 core/templates/navigation.html:188
+#: core/templates/navigation.html:192 core/templates/user/login.html:4
#: software/templates/features.html:43
msgid "Login"
msgstr "Zaloguj"
@@ -300,8 +300,8 @@ msgstr "Hasło nieprawidłowe"
msgid "The form is secured with reCAPTCHA"
msgstr "Formularz jest chroniony przez reCaptcha"
-#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:190
-#: core/templates/navigation.html:195 core/templates/template.html:150
+#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:188
+#: core/templates/navigation.html:193 core/templates/template.html:149
#: core/templates/user/login.html:20 core/views/user.py:293
#: software/templates/features.html:38
msgid "Register"
@@ -624,7 +624,7 @@ msgstr ""
#: core/templates/index.html:33 core/templates/index.html:73
#: core/templates/misc/fragments/shariff_modal.html:29
-#: core/templates/template.html:125 manager/templates/calendar/month.html:138
+#: core/templates/template.html:124 manager/templates/calendar/month.html:138
#: manager/templates/schedule/view.html:246
#: manager/templates/schedule/view.html:266
#: manager/templates/workout/view.html:132
@@ -760,7 +760,7 @@ msgstr "Brak planów żywienia."
msgid "Weight"
msgstr "Ciężar"
-#: core/templates/index.html:210 core/templates/navigation.html:97
+#: core/templates/index.html:210 core/templates/navigation.html:135
#: weight/views.py:70
msgid "Add weight entry"
msgstr "Dodaj aktualną wagę"
@@ -792,8 +792,8 @@ msgstr "Lista licencji"
msgid "Nothing found"
msgstr "Nic nie znaleziono"
-#: core/templates/misc/about.html:4 core/templates/template.html:175
-#: core/templates/template_features.html:118
+#: core/templates/misc/about.html:4 core/templates/template.html:174
+#: core/templates/template_features.html:117
#: core/templates/template_no_context.html:88
msgid "Imprint"
msgstr ""
@@ -879,13 +879,13 @@ msgstr "po ekwipunku"
#: exercises/templates/equipment/overview.html:113
#: exercises/templates/exercise/overview.html:112
#: exercises/templates/exercise/overview.html:116
-#: exercises/templates/muscles/overview.html:108
#: exercises/templates/muscles/overview.html:112
+#: exercises/templates/muscles/overview.html:116
msgid "Add new exercise"
msgstr "Dodaj nowe ćwiczenie"
-#: core/templates/navigation.html:75 core/templates/navigation.html:134
-#: core/templates/navigation.html:226
+#: core/templates/navigation.html:75 core/templates/navigation.html:116
+#: core/templates/navigation.html:224
msgid "Administration"
msgstr "Zarządzanie"
@@ -908,106 +908,106 @@ msgstr "Mięśnie"
msgid "Categories"
msgstr "Kategorie"
-#: core/templates/navigation.html:94
-msgid "Body weight"
-msgstr "Waga ciała"
-
-#: core/templates/navigation.html:96 core/templates/user/overview.html:114
-#: weight/templates/overview.html:7
-msgid "Weight overview"
-msgstr "Rozpiska wagi"
-
-#: core/templates/navigation.html:111 software/templates/features.html:87
+#: core/templates/navigation.html:93 software/templates/features.html:87
msgid "Nutrition"
msgstr "Żywienie"
-#: core/templates/navigation.html:117 core/templates/user/overview.html:144
+#: core/templates/navigation.html:99 core/templates/user/overview.html:144
msgid "Nutrition plans"
msgstr "Plany żywienia"
-#: core/templates/navigation.html:123 nutrition/templates/bmi/form.html:50
+#: core/templates/navigation.html:105 nutrition/templates/bmi/form.html:50
msgid "BMI calculator"
msgstr "Kalkulator BMI"
-#: core/templates/navigation.html:129 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:111 nutrition/templates/rate/form.html:17
msgid "Daily calories calculator"
msgstr "Kalkulator dziennych kalorii"
-#: core/templates/navigation.html:131
+#: core/templates/navigation.html:113
#: nutrition/templates/ingredient/overview.html:29
msgid "Ingredient overview"
msgstr "Rozpiska składników"
-#: core/templates/navigation.html:135 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:117 nutrition/templates/units/list.html:6
msgid "Ingredient weight units"
msgstr "Jednostka wagowa składników"
-#: core/templates/navigation.html:136
+#: core/templates/navigation.html:118
#: nutrition/templates/ingredient/pending.html:6
msgid "Ingredients pending review"
msgstr "Składniki oczekujące na akceptację"
-#: core/templates/navigation.html:149
+#: core/templates/navigation.html:132
+msgid "Body weight"
+msgstr "Waga ciała"
+
+#: core/templates/navigation.html:134 core/templates/user/overview.html:114
+#: weight/templates/overview.html:7
+msgid "Weight overview"
+msgstr "Rozpiska wagi"
+
+#: core/templates/navigation.html:147
msgid "About this software"
msgstr "O tym programie"
-#: core/templates/navigation.html:151 core/templates/template_features.html:83
+#: core/templates/navigation.html:149 core/templates/template_features.html:82
#: software/templates/about_us.html:5
msgid "About us"
msgstr "O nas"
-#: core/templates/navigation.html:153 software/templates/features.html:209
+#: core/templates/navigation.html:151 software/templates/features.html:209
msgid "REST API"
msgstr "REST API"
-#: core/templates/navigation.html:157 utils/models.py:40
+#: core/templates/navigation.html:155 utils/models.py:40
msgid "License"
msgstr "Licencja"
-#: core/templates/navigation.html:163
+#: core/templates/navigation.html:161
msgid "Developer documentation"
msgstr "Dokumentacja"
-#: core/templates/navigation.html:169
+#: core/templates/navigation.html:167
msgid "Get the code"
msgstr "Pobierz kod źródłowy"
-#: core/templates/navigation.html:175 core/templates/template.html:205
-#: core/templates/template_features.html:100
+#: core/templates/navigation.html:173 core/templates/template.html:204
+#: core/templates/template_features.html:99
msgid "Translate"
msgstr "Tłumacz"
-#: core/templates/navigation.html:196 core/templates/user/login.html:28
+#: core/templates/navigation.html:194 core/templates/user/login.html:28
msgid "Reset password"
msgstr "Resetuj hasło"
-#: core/templates/navigation.html:209
+#: core/templates/navigation.html:207
msgid "My preferences"
msgstr "Moje preferencje"
-#: core/templates/navigation.html:216
+#: core/templates/navigation.html:214
msgid "Logout"
msgstr "Wyloguj"
-#: core/templates/navigation.html:231
+#: core/templates/navigation.html:229
msgid "Licenses"
msgstr "Licencje"
-#: core/templates/navigation.html:234
+#: core/templates/navigation.html:232
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr "Jednostki potwórzeń"
-#: core/templates/navigation.html:237 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:235 core/templates/weight_unit/list.html:4
#: nutrition/templates/ingredient/view.html:174
msgid "Weight units"
msgstr "Jednostki wagi"
-#: core/templates/navigation.html:240 core/templates/user/list.html:4
+#: core/templates/navigation.html:238 core/templates/user/list.html:4
msgid "User list"
msgstr "Lista użytkowników"
-#: core/templates/navigation.html:241
+#: core/templates/navigation.html:239
msgid "Gyms"
msgstr "Siłownie"
@@ -1089,7 +1089,7 @@ msgstr "Dodaj wpis dot. wagi"
#: core/templates/tags/render_day.html:114
#: exercises/templates/equipment/overview.html:59
#: exercises/templates/exercise/overview.html:63
-#: exercises/templates/muscles/overview.html:61
+#: exercises/templates/muscles/overview.html:65
msgid "Placeholder image for exercise"
msgstr "Zapychacz obrazka dla ćwiczenia"
@@ -1117,23 +1117,23 @@ msgstr "Powtórzenia"
msgid "RiR"
msgstr "RiR"
-#: core/templates/template.html:140
+#: core/templates/template.html:139
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:144
+#: core/templates/template.html:143
msgid "Create some demo entries"
msgstr "Utwórz kilka przykładowych wpisów"
-#: core/templates/template.html:176 core/templates/template_features.html:122
+#: core/templates/template.html:175 core/templates/template_features.html:121
#: core/templates/template_no_context.html:89 software/templates/tos.html:7
msgid "Terms of service"
msgstr "Warunki świadczenia usługi"
-#: core/templates/template_features.html:62 software/templates/features.html:9
+#: core/templates/template_features.html:61 software/templates/features.html:9
#: software/templates/features.html:120
msgid "Features"
msgstr "Cechy"
@@ -1556,7 +1556,7 @@ msgstr "Mięśnie główne"
#: exercises/models/base.py:64 exercises/templates/equipment/overview.html:71
#: exercises/templates/exercise/overview.html:76
#: exercises/templates/exercise/view.html:268
-#: exercises/templates/muscles/overview.html:73
+#: exercises/templates/muscles/overview.html:77
msgid "Secondary muscles"
msgstr "Mięśnie pomocnicze"
@@ -1568,9 +1568,9 @@ msgstr "Możliwości"
msgid "Exercise Categories"
msgstr "Kategorie ćwiczeń"
-#: exercises/models/comment.py:34 exercises/models/image.py:75
-#: exercises/models/video.py:82 manager/forms.py:165 manager/helpers.py:89
-#: manager/models/log.py:51
+#: exercises/models/comment.py:34 exercises/models/exercise_alias.py:32
+#: exercises/models/image.py:75 exercises/models/video.py:82
+#: manager/forms.py:165 manager/helpers.py:89 manager/models/log.py:51
msgid "Exercise"
msgstr "Ćwiczenie"
@@ -1596,6 +1596,12 @@ msgstr "Nowe ćwiczenie przesłane przez użytkownika"
msgid "The user {0} submitted a new exercise \"{1}\"."
msgstr "Użytkownik {0} przesłał nowe ćwiczenie \"{1}\"."
+#: exercises/models/exercise_alias.py:35
+#, fuzzy
+#| msgid "Correcting an exercise"
+msgid "Alias for an exercise"
+msgstr "Poprawianie ćwiczenia"
+
#: exercises/models/image.py:59
msgid "Line"
msgstr ""
@@ -1657,6 +1663,16 @@ msgstr "Użytkownik {0} dodał nowy obraz \"{1}\" dla ćwiczenia {2}."
msgid "In latin, e.g. \"Pectoralis major\""
msgstr "Po łacinie, np. \"Pectoralis major\""
+#: exercises/models/muscle.py:47
+#, fuzzy
+#| msgid "exercise name"
+msgid "Alternative name"
+msgstr "nazwa ćwiczenia"
+
+#: exercises/models/muscle.py:48
+msgid "A more basic name for the muscle"
+msgstr ""
+
#: exercises/models/video.py:41
msgid "Maximum file size is 100MB."
msgstr ""
@@ -1725,7 +1741,7 @@ msgstr "Rozpiska sprzętu"
#: exercises/templates/equipment/overview.html:69
#: exercises/templates/exercise/overview.html:74
#: exercises/templates/exercise/view.html:264
-#: exercises/templates/muscles/overview.html:71
+#: exercises/templates/muscles/overview.html:75
msgid "Main muscles"
msgstr "Mięśnie główne"
@@ -1749,7 +1765,7 @@ msgstr "nazwa ćwiczenia"
#: exercises/templates/equipment/overview.html:115
#: exercises/templates/exercise/overview.html:118
-#: exercises/templates/muscles/overview.html:114
+#: exercises/templates/muscles/overview.html:118
#: nutrition/templates/ingredient/overview.html:85
msgid "Only registered users can do this"
msgstr "Tylko zarejestrowani użytkownicy mogą wykonać tą akcję"
@@ -1945,7 +1961,7 @@ msgstr "Rozpiska mieśni"
msgid "Add muscle"
msgstr "Dodaj mięsień"
-#: exercises/templates/muscles/overview.html:81
+#: exercises/templates/muscles/overview.html:85
msgid ""
"No exercises for this muscle. Add or edit an exercise and set the muscle."
msgstr ""
@@ -2324,7 +2340,7 @@ msgstr "Dodaj członka do siłowni"
msgid "Edit gym"
msgstr "Edytuj siłownię"
-#: i18n.tpl:2
+#: i18n.tpl:2 i18n.tpl:28
msgid "Abs"
msgstr "Brzuch"
@@ -2336,11 +2352,11 @@ msgstr "Ramiona"
msgid "Back"
msgstr "Plecy"
-#: i18n.tpl:5
+#: i18n.tpl:5 i18n.tpl:23
msgid "Calves"
msgstr "Łydki"
-#: i18n.tpl:6
+#: i18n.tpl:6 i18n.tpl:26
msgid "Chest"
msgstr "Klatka piersiowa"
@@ -2348,7 +2364,7 @@ msgstr "Klatka piersiowa"
msgid "Legs"
msgstr "Nogi"
-#: i18n.tpl:8
+#: i18n.tpl:8 i18n.tpl:19
msgid "Shoulders"
msgstr "Barki"
@@ -2377,109 +2393,77 @@ msgid "Kettlebell"
msgstr "Odważniki"
#: i18n.tpl:15
-msgid "none (bodyweight exercise)"
-msgstr "żaden (własny ciężar ciała)"
-
-#: i18n.tpl:16
msgid "Pull-up bar"
msgstr "Drążek"
+#: i18n.tpl:16
+msgid "SZ-Bar"
+msgstr "Sztanga łamana"
+
#: i18n.tpl:17
msgid "Swiss Ball"
msgstr "Piłka do ćwiczeń"
#: i18n.tpl:18
-msgid "SZ-Bar"
-msgstr "Sztanga łamana"
-
-#: i18n.tpl:19
-msgid "Anterior deltoid"
-msgstr "Barki"
+msgid "none (bodyweight exercise)"
+msgstr "żaden (własny ciężar ciała)"
#: i18n.tpl:20
-msgid "Biceps brachii"
+#, fuzzy
+#| msgid "Biceps brachii"
+msgid "Biceps"
msgstr "Biceps"
#: i18n.tpl:21
-msgid "Biceps femoris"
-msgstr "Dwugłowe uda"
+msgid "Hamstrings"
+msgstr ""
#: i18n.tpl:22
-msgid "Brachialis"
-msgstr "Ramienne"
-
-#: i18n.tpl:23
-msgid "Gastrocnemius"
-msgstr "Łydki"
+msgid "Lower back"
+msgstr ""
#: i18n.tpl:24
-msgid "Gluteus maximus"
-msgstr "Pośladki"
+#, fuzzy
+#| msgid "Minutes"
+msgid "Glutes"
+msgstr "Minuty"
#: i18n.tpl:25
-msgid "Latissimus dorsi"
-msgstr "Najszersze grzbietu"
-
-#: i18n.tpl:26
-msgid "Obliquus externus abdominis"
-msgstr "Skośne brzucha"
+msgid "Lats"
+msgstr ""
#: i18n.tpl:27
-msgid "Pectoralis major"
-msgstr "Klatka piersiowa"
-
-#: i18n.tpl:28
-msgid "Quadriceps femoris"
-msgstr "Czterogłowe uda"
+msgid "Quads"
+msgstr ""
#: i18n.tpl:29
-msgid "Rectus abdominis"
-msgstr "Proste brzucha"
-
-#: i18n.tpl:30
-msgid "Serratus anterior"
-msgstr "Zębate klatki piersiowej"
-
-#: i18n.tpl:31
-msgid "Soleus"
-msgstr "Płaszczykowate łydki"
-
-#: i18n.tpl:32
-msgid "Trapezius"
-msgstr "Czworoboczne"
-
-#: i18n.tpl:33
-msgid "Triceps brachii"
+#, fuzzy
+#| msgid "Triceps brachii"
+msgid "Triceps"
msgstr "Triceps"
-#: i18n.tpl:34
+#: i18n.tpl:30
msgid "Kilometers"
msgstr "Kilometry"
-#: i18n.tpl:35
-#, fuzzy
-#| msgid "Reps"
-msgid "Max Reps"
-msgstr "Powtórzenia"
-
-#: i18n.tpl:36
+#: i18n.tpl:31
msgid "Miles"
msgstr "Mile"
-#: i18n.tpl:37
+#: i18n.tpl:32
msgid "Minutes"
msgstr "Minuty"
-#: i18n.tpl:38 manager/forms.py:169 manager/models/log.py:71
+#: i18n.tpl:33 manager/forms.py:169 manager/models/log.py:71
#: manager/templates/set/add.html:53
msgid "Repetitions"
msgstr "Powtórzenia"
-#: i18n.tpl:39
+#: i18n.tpl:34
msgid "Seconds"
msgstr "Sekundy"
-#: i18n.tpl:40
+#: i18n.tpl:35
msgid "Until Failure"
msgstr "Do porażki"
@@ -4165,6 +4149,50 @@ msgstr "Usunięto."
msgid "Delete weight entry for the %s"
msgstr "Usuń wpis wagi dla %s"
+#~ msgid "Anterior deltoid"
+#~ msgstr "Barki"
+
+#~ msgid "Biceps femoris"
+#~ msgstr "Dwugłowe uda"
+
+#~ msgid "Brachialis"
+#~ msgstr "Ramienne"
+
+#~ msgid "Gastrocnemius"
+#~ msgstr "Łydki"
+
+#~ msgid "Gluteus maximus"
+#~ msgstr "Pośladki"
+
+#~ msgid "Latissimus dorsi"
+#~ msgstr "Najszersze grzbietu"
+
+#~ msgid "Obliquus externus abdominis"
+#~ msgstr "Skośne brzucha"
+
+#~ msgid "Pectoralis major"
+#~ msgstr "Klatka piersiowa"
+
+#~ msgid "Quadriceps femoris"
+#~ msgstr "Czterogłowe uda"
+
+#~ msgid "Rectus abdominis"
+#~ msgstr "Proste brzucha"
+
+#~ msgid "Serratus anterior"
+#~ msgstr "Zębate klatki piersiowej"
+
+#~ msgid "Soleus"
+#~ msgstr "Płaszczykowate łydki"
+
+#~ msgid "Trapezius"
+#~ msgstr "Czworoboczne"
+
+#, fuzzy
+#~| msgid "Reps"
+#~ msgid "Max Reps"
+#~ msgstr "Powtórzenia"
+
#~ msgid "Your current weight is: "
#~ msgstr "Twoja obecna waga: "
diff --git a/wger/locale/pt/LC_MESSAGES/django.po b/wger/locale/pt/LC_MESSAGES/django.po
index 29234ffdc..e415e0c1e 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: 2022-02-15 14:51+0100\n"
+"POT-Creation-Date: 2022-05-14 12:01+0200\n"
"PO-Revision-Date: 2022-02-06 10:57+0000\n"
"Last-Translator: João Goulart <[email protected]>\n"
"Language-Team: Portuguese <https://hosted.weblate.org/projects/wger/web/pt/"
@@ -49,7 +49,7 @@ msgstr "Exercícios"
msgid "Ingredients"
msgstr "Ingredientes"
-#: config/templates/language/overview.html:4 core/templates/navigation.html:228
+#: config/templates/language/overview.html:4 core/templates/navigation.html:226
msgid "Languages"
msgstr "Idiomas"
@@ -226,8 +226,8 @@ msgstr "Minha agenda de treino"
msgid "Empty placeholder schedule"
msgstr "Agenda de espaço reservado vazia"
-#: core/forms.py:61 core/templates/navigation.html:190
-#: core/templates/navigation.html:194 core/templates/user/login.html:4
+#: core/forms.py:61 core/templates/navigation.html:188
+#: core/templates/navigation.html:192 core/templates/user/login.html:4
#: software/templates/features.html:43
msgid "Login"
msgstr "Login"
@@ -301,8 +301,8 @@ msgstr "Senha inválida"
msgid "The form is secured with reCAPTCHA"
msgstr "O formulário está seguro com o reCAPTCHA"
-#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:190
-#: core/templates/navigation.html:195 core/templates/template.html:150
+#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:188
+#: core/templates/navigation.html:193 core/templates/template.html:149
#: core/templates/user/login.html:20 core/views/user.py:293
#: software/templates/features.html:38
msgid "Register"
@@ -627,7 +627,7 @@ msgstr ""
#: core/templates/index.html:33 core/templates/index.html:73
#: core/templates/misc/fragments/shariff_modal.html:29
-#: core/templates/template.html:125 manager/templates/calendar/month.html:138
+#: core/templates/template.html:124 manager/templates/calendar/month.html:138
#: manager/templates/schedule/view.html:246
#: manager/templates/schedule/view.html:266
#: manager/templates/workout/view.html:132
@@ -764,7 +764,7 @@ msgstr "Nenhum plano de nutrição."
msgid "Weight"
msgstr "Peso"
-#: core/templates/index.html:210 core/templates/navigation.html:97
+#: core/templates/index.html:210 core/templates/navigation.html:135
#: weight/views.py:70
msgid "Add weight entry"
msgstr "Adicionar uma entrada para peso"
@@ -796,8 +796,8 @@ msgstr "Lista de licença"
msgid "Nothing found"
msgstr "Nada encontrado"
-#: core/templates/misc/about.html:4 core/templates/template.html:175
-#: core/templates/template_features.html:118
+#: core/templates/misc/about.html:4 core/templates/template.html:174
+#: core/templates/template_features.html:117
#: core/templates/template_no_context.html:88
msgid "Imprint"
msgstr "Imprimir"
@@ -883,13 +883,13 @@ msgstr "por equipamento"
#: exercises/templates/equipment/overview.html:113
#: exercises/templates/exercise/overview.html:112
#: exercises/templates/exercise/overview.html:116
-#: exercises/templates/muscles/overview.html:108
#: exercises/templates/muscles/overview.html:112
+#: exercises/templates/muscles/overview.html:116
msgid "Add new exercise"
msgstr "adicionar novo exercício"
-#: core/templates/navigation.html:75 core/templates/navigation.html:134
-#: core/templates/navigation.html:226
+#: core/templates/navigation.html:75 core/templates/navigation.html:116
+#: core/templates/navigation.html:224
msgid "Administration"
msgstr "Administração"
@@ -912,106 +912,106 @@ msgstr "Músculos"
msgid "Categories"
msgstr "Categorias"
-#: core/templates/navigation.html:94
-msgid "Body weight"
-msgstr "Peso Corporal"
-
-#: core/templates/navigation.html:96 core/templates/user/overview.html:114
-#: weight/templates/overview.html:7
-msgid "Weight overview"
-msgstr "Visão geral do peso"
-
-#: core/templates/navigation.html:111 software/templates/features.html:87
+#: core/templates/navigation.html:93 software/templates/features.html:87
msgid "Nutrition"
msgstr "Nutrição"
-#: core/templates/navigation.html:117 core/templates/user/overview.html:144
+#: core/templates/navigation.html:99 core/templates/user/overview.html:144
msgid "Nutrition plans"
msgstr "Planos de nutrição"
-#: core/templates/navigation.html:123 nutrition/templates/bmi/form.html:50
+#: core/templates/navigation.html:105 nutrition/templates/bmi/form.html:50
msgid "BMI calculator"
msgstr "Calculadora IMC"
-#: core/templates/navigation.html:129 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:111 nutrition/templates/rate/form.html:17
msgid "Daily calories calculator"
msgstr "Calculador de calorias diárias"
-#: core/templates/navigation.html:131
+#: core/templates/navigation.html:113
#: nutrition/templates/ingredient/overview.html:29
msgid "Ingredient overview"
msgstr "Visão geral do ingrediente"
-#: core/templates/navigation.html:135 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:117 nutrition/templates/units/list.html:6
msgid "Ingredient weight units"
msgstr "Unidade de peso dos ingredientes"
-#: core/templates/navigation.html:136
+#: core/templates/navigation.html:118
#: nutrition/templates/ingredient/pending.html:6
msgid "Ingredients pending review"
msgstr "Ingredientes pendendo revisão"
-#: core/templates/navigation.html:149
+#: core/templates/navigation.html:132
+msgid "Body weight"
+msgstr "Peso Corporal"
+
+#: core/templates/navigation.html:134 core/templates/user/overview.html:114
+#: weight/templates/overview.html:7
+msgid "Weight overview"
+msgstr "Visão geral do peso"
+
+#: core/templates/navigation.html:147
msgid "About this software"
msgstr "Sobre este software"
-#: core/templates/navigation.html:151 core/templates/template_features.html:83
+#: core/templates/navigation.html:149 core/templates/template_features.html:82
#: software/templates/about_us.html:5
msgid "About us"
msgstr "Sobre nós"
-#: core/templates/navigation.html:153 software/templates/features.html:209
+#: core/templates/navigation.html:151 software/templates/features.html:209
msgid "REST API"
msgstr "API REST"
-#: core/templates/navigation.html:157 utils/models.py:40
+#: core/templates/navigation.html:155 utils/models.py:40
msgid "License"
msgstr "Licença"
-#: core/templates/navigation.html:163
+#: core/templates/navigation.html:161
msgid "Developer documentation"
msgstr "Documentação do desenvolvedor"
-#: core/templates/navigation.html:169
+#: core/templates/navigation.html:167
msgid "Get the code"
msgstr "Obtenha o código fonte"
-#: core/templates/navigation.html:175 core/templates/template.html:205
-#: core/templates/template_features.html:100
+#: core/templates/navigation.html:173 core/templates/template.html:204
+#: core/templates/template_features.html:99
msgid "Translate"
msgstr "Traduzir"
-#: core/templates/navigation.html:196 core/templates/user/login.html:28
+#: core/templates/navigation.html:194 core/templates/user/login.html:28
msgid "Reset password"
msgstr "Redefinr a senha"
-#: core/templates/navigation.html:209
+#: core/templates/navigation.html:207
msgid "My preferences"
msgstr "Minhas preferências"
-#: core/templates/navigation.html:216
+#: core/templates/navigation.html:214
msgid "Logout"
msgstr "Sair"
-#: core/templates/navigation.html:231
+#: core/templates/navigation.html:229
msgid "Licenses"
msgstr "Licenças"
-#: core/templates/navigation.html:234
+#: core/templates/navigation.html:232
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr "Unidades de repetição"
-#: core/templates/navigation.html:237 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:235 core/templates/weight_unit/list.html:4
#: nutrition/templates/ingredient/view.html:174
msgid "Weight units"
msgstr "Unidade de peso"
-#: core/templates/navigation.html:240 core/templates/user/list.html:4
+#: core/templates/navigation.html:238 core/templates/user/list.html:4
msgid "User list"
msgstr "Lista de utilizadores"
-#: core/templates/navigation.html:241
+#: core/templates/navigation.html:239
msgid "Gyms"
msgstr "Academias"
@@ -1094,7 +1094,7 @@ msgstr "Adicionar registro de peso"
#: core/templates/tags/render_day.html:114
#: exercises/templates/equipment/overview.html:59
#: exercises/templates/exercise/overview.html:63
-#: exercises/templates/muscles/overview.html:61
+#: exercises/templates/muscles/overview.html:65
msgid "Placeholder image for exercise"
msgstr "Espaço reservado para imagem do exercício"
@@ -1121,23 +1121,23 @@ msgstr "Repetições"
msgid "RiR"
msgstr "ReR"
-#: core/templates/template.html:140
+#: core/templates/template.html:139
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:144
+#: core/templates/template.html:143
msgid "Create some demo entries"
msgstr "Crie alguns registros de demonstração"
-#: core/templates/template.html:176 core/templates/template_features.html:122
+#: core/templates/template.html:175 core/templates/template_features.html:121
#: core/templates/template_no_context.html:89 software/templates/tos.html:7
msgid "Terms of service"
msgstr "Termos de uso"
-#: core/templates/template_features.html:62 software/templates/features.html:9
+#: core/templates/template_features.html:61 software/templates/features.html:9
#: software/templates/features.html:120
msgid "Features"
msgstr "Funcionalidades"
@@ -1561,7 +1561,7 @@ msgstr "Músculos primários"
#: exercises/models/base.py:64 exercises/templates/equipment/overview.html:71
#: exercises/templates/exercise/overview.html:76
#: exercises/templates/exercise/view.html:268
-#: exercises/templates/muscles/overview.html:73
+#: exercises/templates/muscles/overview.html:77
msgid "Secondary muscles"
msgstr "Músculos secundários"
@@ -1573,9 +1573,9 @@ msgstr "Variações"
msgid "Exercise Categories"
msgstr "Categorias de exercício"
-#: exercises/models/comment.py:34 exercises/models/image.py:75
-#: exercises/models/video.py:82 manager/forms.py:165 manager/helpers.py:89
-#: manager/models/log.py:51
+#: exercises/models/comment.py:34 exercises/models/exercise_alias.py:32
+#: exercises/models/image.py:75 exercises/models/video.py:82
+#: manager/forms.py:165 manager/helpers.py:89 manager/models/log.py:51
msgid "Exercise"
msgstr "Exercício"
@@ -1601,6 +1601,12 @@ msgstr "Novo exercício submetido pelo utilizador"
msgid "The user {0} submitted a new exercise \"{1}\"."
msgstr "O utilizador {0} submete um novo exercício \"{1}\"."
+#: exercises/models/exercise_alias.py:35
+#, fuzzy
+#| msgid "Correcting an exercise"
+msgid "Alias for an exercise"
+msgstr "Corrige um exercício"
+
#: exercises/models/image.py:59
msgid "Line"
msgstr ""
@@ -1662,6 +1668,16 @@ msgstr "uário {0} submeteu uma nova imagem \"{1}\" para o exercício {2}."
msgid "In latin, e.g. \"Pectoralis major\""
msgstr "Em latim, ex.: \"Pectoralis major\""
+#: exercises/models/muscle.py:47
+#, fuzzy
+#| msgid "exercise name"
+msgid "Alternative name"
+msgstr "nome do exercício"
+
+#: exercises/models/muscle.py:48
+msgid "A more basic name for the muscle"
+msgstr ""
+
#: exercises/models/video.py:41
msgid "Maximum file size is 100MB."
msgstr ""
@@ -1730,7 +1746,7 @@ msgstr "Visão geral do equipamento"
#: exercises/templates/equipment/overview.html:69
#: exercises/templates/exercise/overview.html:74
#: exercises/templates/exercise/view.html:264
-#: exercises/templates/muscles/overview.html:71
+#: exercises/templates/muscles/overview.html:75
msgid "Main muscles"
msgstr "Músculos principais"
@@ -1755,7 +1771,7 @@ msgstr "nome do exercício"
#: exercises/templates/equipment/overview.html:115
#: exercises/templates/exercise/overview.html:118
-#: exercises/templates/muscles/overview.html:114
+#: exercises/templates/muscles/overview.html:118
#: nutrition/templates/ingredient/overview.html:85
msgid "Only registered users can do this"
msgstr "Somente utilizadores cadastrados podem fazer isto"
@@ -1953,7 +1969,7 @@ msgstr "Visão geral do músculo"
msgid "Add muscle"
msgstr "Adicionar músculo"
-#: exercises/templates/muscles/overview.html:81
+#: exercises/templates/muscles/overview.html:85
msgid ""
"No exercises for this muscle. Add or edit an exercise and set the muscle."
msgstr ""
@@ -2333,7 +2349,7 @@ msgstr "Adicionar utilizador à academia"
msgid "Edit gym"
msgstr "Editar academia"
-#: i18n.tpl:2
+#: i18n.tpl:2 i18n.tpl:28
msgid "Abs"
msgstr "Abdominal"
@@ -2345,11 +2361,11 @@ msgstr "Braços"
msgid "Back"
msgstr "Costas"
-#: i18n.tpl:5
+#: i18n.tpl:5 i18n.tpl:23
msgid "Calves"
msgstr "Batata da perna"
-#: i18n.tpl:6
+#: i18n.tpl:6 i18n.tpl:26
msgid "Chest"
msgstr "Peito"
@@ -2357,7 +2373,7 @@ msgstr "Peito"
msgid "Legs"
msgstr "Pernas"
-#: i18n.tpl:8
+#: i18n.tpl:8 i18n.tpl:19
msgid "Shoulders"
msgstr "Ombros"
@@ -2386,107 +2402,77 @@ msgid "Kettlebell"
msgstr "Kettlebell"
#: i18n.tpl:15
-msgid "none (bodyweight exercise)"
-msgstr "nenhum (exercício corporal)"
-
-#: i18n.tpl:16
msgid "Pull-up bar"
msgstr "Barra de puxar"
+#: i18n.tpl:16
+msgid "SZ-Bar"
+msgstr "Barra SZ"
+
#: i18n.tpl:17
msgid "Swiss Ball"
msgstr "Bola Suíça"
#: i18n.tpl:18
-msgid "SZ-Bar"
-msgstr "Barra SZ"
-
-#: i18n.tpl:19
-msgid "Anterior deltoid"
-msgstr "Deltóide anterior"
+msgid "none (bodyweight exercise)"
+msgstr "nenhum (exercício corporal)"
#: i18n.tpl:20
-msgid "Biceps brachii"
+#, fuzzy
+#| msgid "Biceps brachii"
+msgid "Biceps"
msgstr "Brícipes Braquial"
#: i18n.tpl:21
-msgid "Biceps femoris"
-msgstr "Bíceps femoral"
+msgid "Hamstrings"
+msgstr ""
#: i18n.tpl:22
-msgid "Brachialis"
-msgstr "Branquial"
-
-#: i18n.tpl:23
-msgid "Gastrocnemius"
-msgstr "Gastrocnêmio"
+msgid "Lower back"
+msgstr ""
#: i18n.tpl:24
-msgid "Gluteus maximus"
-msgstr "Glúteo máximo"
+#, fuzzy
+#| msgid "Minutes"
+msgid "Glutes"
+msgstr "Minutos"
#: i18n.tpl:25
-msgid "Latissimus dorsi"
-msgstr "Grande dorsal"
-
-#: i18n.tpl:26
-msgid "Obliquus externus abdominis"
-msgstr "abdominal oblíquo externo"
+msgid "Lats"
+msgstr ""
#: i18n.tpl:27
-msgid "Pectoralis major"
-msgstr "Peitoral maior"
-
-#: i18n.tpl:28
-msgid "Quadriceps femoris"
-msgstr "Quadríceps femoral"
+msgid "Quads"
+msgstr ""
#: i18n.tpl:29
-msgid "Rectus abdominis"
-msgstr "reto abdominal"
-
-#: i18n.tpl:30
-msgid "Serratus anterior"
-msgstr "Serrátil anterior"
-
-#: i18n.tpl:31
-msgid "Soleus"
-msgstr "Sóleo"
-
-#: i18n.tpl:32
-msgid "Trapezius"
-msgstr "Trapézios"
-
-#: i18n.tpl:33
-msgid "Triceps brachii"
+#, fuzzy
+#| msgid "Triceps brachii"
+msgid "Triceps"
msgstr "Tríceps branquial"
-#: i18n.tpl:34
+#: i18n.tpl:30
msgid "Kilometers"
msgstr "Kilometros"
-#: i18n.tpl:35
-msgid "Max Reps"
-msgstr "Max. de Repetições"
-
-#: i18n.tpl:36
+#: i18n.tpl:31
msgid "Miles"
msgstr "Milhas"
-#: i18n.tpl:37
+#: i18n.tpl:32
msgid "Minutes"
msgstr "Minutos"
-#: i18n.tpl:38 manager/forms.py:169 manager/models/log.py:71
+#: i18n.tpl:33 manager/forms.py:169 manager/models/log.py:71
#: manager/templates/set/add.html:53
msgid "Repetitions"
msgstr "Repeticões"
-#: i18n.tpl:39
+#: i18n.tpl:34
msgid "Seconds"
msgstr "Segundos"
-#: i18n.tpl:40
+#: i18n.tpl:35
msgid "Until Failure"
msgstr "Até falhar"
@@ -4166,6 +4152,48 @@ msgstr "Excluído com sucesso."
msgid "Delete weight entry for the %s"
msgstr "Excluir entrada de peso para %s"
+#~ msgid "Anterior deltoid"
+#~ msgstr "Deltóide anterior"
+
+#~ msgid "Biceps femoris"
+#~ msgstr "Bíceps femoral"
+
+#~ msgid "Brachialis"
+#~ msgstr "Branquial"
+
+#~ msgid "Gastrocnemius"
+#~ msgstr "Gastrocnêmio"
+
+#~ msgid "Gluteus maximus"
+#~ msgstr "Glúteo máximo"
+
+#~ msgid "Latissimus dorsi"
+#~ msgstr "Grande dorsal"
+
+#~ msgid "Obliquus externus abdominis"
+#~ msgstr "abdominal oblíquo externo"
+
+#~ msgid "Pectoralis major"
+#~ msgstr "Peitoral maior"
+
+#~ msgid "Quadriceps femoris"
+#~ msgstr "Quadríceps femoral"
+
+#~ msgid "Rectus abdominis"
+#~ msgstr "reto abdominal"
+
+#~ msgid "Serratus anterior"
+#~ msgstr "Serrátil anterior"
+
+#~ msgid "Soleus"
+#~ msgstr "Sóleo"
+
+#~ msgid "Trapezius"
+#~ msgstr "Trapézios"
+
+#~ msgid "Max Reps"
+#~ msgstr "Max. de Repetições"
+
#~ msgid "Your current weight is: "
#~ msgstr "Seu peso atual é: "
diff --git a/wger/locale/ro/LC_MESSAGES/django.mo b/wger/locale/ro/LC_MESSAGES/django.mo
index 9dba44e0f..e89eacb63 100644
Binary files a/wger/locale/ro/LC_MESSAGES/django.mo and b/wger/locale/ro/LC_MESSAGES/django.mo differ
diff --git a/wger/locale/ro/LC_MESSAGES/django.po b/wger/locale/ro/LC_MESSAGES/django.po
index d7d75daed..8616bf31e 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: 2022-02-15 14:51+0100\n"
+"POT-Creation-Date: 2022-05-14 12:01+0200\n"
"PO-Revision-Date: 2021-04-15 07:27+0000\n"
"Last-Translator: Allan Nordhøy <[email protected]>\n"
"Language-Team: Romanian <https://hosted.weblate.org/projects/wger/web/ro/>\n"
@@ -43,7 +43,7 @@ msgstr "Exerciții"
msgid "Ingredients"
msgstr "Ingrediente"
-#: config/templates/language/overview.html:4 core/templates/navigation.html:228
+#: config/templates/language/overview.html:4 core/templates/navigation.html:226
msgid "Languages"
msgstr "Limbi"
@@ -215,8 +215,8 @@ msgstr ""
msgid "Empty placeholder schedule"
msgstr ""
-#: core/forms.py:61 core/templates/navigation.html:190
-#: core/templates/navigation.html:194 core/templates/user/login.html:4
+#: core/forms.py:61 core/templates/navigation.html:188
+#: core/templates/navigation.html:192 core/templates/user/login.html:4
#: software/templates/features.html:43
msgid "Login"
msgstr ""
@@ -297,8 +297,8 @@ msgstr "Parola incorectă"
msgid "The form is secured with reCAPTCHA"
msgstr ""
-#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:190
-#: core/templates/navigation.html:195 core/templates/template.html:150
+#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:188
+#: core/templates/navigation.html:193 core/templates/template.html:149
#: core/templates/user/login.html:20 core/views/user.py:293
#: software/templates/features.html:38
msgid "Register"
@@ -609,7 +609,7 @@ msgstr ""
#: core/templates/index.html:33 core/templates/index.html:73
#: core/templates/misc/fragments/shariff_modal.html:29
-#: core/templates/template.html:125 manager/templates/calendar/month.html:138
+#: core/templates/template.html:124 manager/templates/calendar/month.html:138
#: manager/templates/schedule/view.html:246
#: manager/templates/schedule/view.html:266
#: manager/templates/workout/view.html:132
@@ -741,7 +741,7 @@ msgstr ""
msgid "Weight"
msgstr ""
-#: core/templates/index.html:210 core/templates/navigation.html:97
+#: core/templates/index.html:210 core/templates/navigation.html:135
#: weight/views.py:70
msgid "Add weight entry"
msgstr ""
@@ -773,8 +773,8 @@ msgstr ""
msgid "Nothing found"
msgstr ""
-#: core/templates/misc/about.html:4 core/templates/template.html:175
-#: core/templates/template_features.html:118
+#: core/templates/misc/about.html:4 core/templates/template.html:174
+#: core/templates/template_features.html:117
#: core/templates/template_no_context.html:88
msgid "Imprint"
msgstr ""
@@ -858,13 +858,13 @@ msgstr ""
#: exercises/templates/equipment/overview.html:113
#: exercises/templates/exercise/overview.html:112
#: exercises/templates/exercise/overview.html:116
-#: exercises/templates/muscles/overview.html:108
#: exercises/templates/muscles/overview.html:112
+#: exercises/templates/muscles/overview.html:116
msgid "Add new exercise"
msgstr "Adăugați un exercițiu nou"
-#: core/templates/navigation.html:75 core/templates/navigation.html:134
-#: core/templates/navigation.html:226
+#: core/templates/navigation.html:75 core/templates/navigation.html:116
+#: core/templates/navigation.html:224
msgid "Administration"
msgstr "Administrație"
@@ -887,106 +887,106 @@ msgstr "Mușchii"
msgid "Categories"
msgstr ""
-#: core/templates/navigation.html:94
-msgid "Body weight"
-msgstr ""
-
-#: core/templates/navigation.html:96 core/templates/user/overview.html:114
-#: weight/templates/overview.html:7
-msgid "Weight overview"
-msgstr ""
-
-#: core/templates/navigation.html:111 software/templates/features.html:87
+#: core/templates/navigation.html:93 software/templates/features.html:87
msgid "Nutrition"
msgstr ""
-#: core/templates/navigation.html:117 core/templates/user/overview.html:144
+#: core/templates/navigation.html:99 core/templates/user/overview.html:144
msgid "Nutrition plans"
msgstr ""
-#: core/templates/navigation.html:123 nutrition/templates/bmi/form.html:50
+#: core/templates/navigation.html:105 nutrition/templates/bmi/form.html:50
msgid "BMI calculator"
msgstr ""
-#: core/templates/navigation.html:129 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:111 nutrition/templates/rate/form.html:17
msgid "Daily calories calculator"
msgstr ""
-#: core/templates/navigation.html:131
+#: core/templates/navigation.html:113
#: nutrition/templates/ingredient/overview.html:29
msgid "Ingredient overview"
msgstr ""
-#: core/templates/navigation.html:135 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:117 nutrition/templates/units/list.html:6
msgid "Ingredient weight units"
msgstr ""
-#: core/templates/navigation.html:136
+#: core/templates/navigation.html:118
#: nutrition/templates/ingredient/pending.html:6
msgid "Ingredients pending review"
msgstr ""
-#: core/templates/navigation.html:149
+#: core/templates/navigation.html:132
+msgid "Body weight"
+msgstr ""
+
+#: core/templates/navigation.html:134 core/templates/user/overview.html:114
+#: weight/templates/overview.html:7
+msgid "Weight overview"
+msgstr ""
+
+#: core/templates/navigation.html:147
msgid "About this software"
msgstr ""
-#: core/templates/navigation.html:151 core/templates/template_features.html:83
+#: core/templates/navigation.html:149 core/templates/template_features.html:82
#: software/templates/about_us.html:5
msgid "About us"
msgstr ""
-#: core/templates/navigation.html:153 software/templates/features.html:209
+#: core/templates/navigation.html:151 software/templates/features.html:209
msgid "REST API"
msgstr ""
-#: core/templates/navigation.html:157 utils/models.py:40
+#: core/templates/navigation.html:155 utils/models.py:40
msgid "License"
msgstr ""
-#: core/templates/navigation.html:163
+#: core/templates/navigation.html:161
msgid "Developer documentation"
msgstr ""
-#: core/templates/navigation.html:169
+#: core/templates/navigation.html:167
msgid "Get the code"
msgstr ""
-#: core/templates/navigation.html:175 core/templates/template.html:205
-#: core/templates/template_features.html:100
+#: core/templates/navigation.html:173 core/templates/template.html:204
+#: core/templates/template_features.html:99
msgid "Translate"
msgstr ""
-#: core/templates/navigation.html:196 core/templates/user/login.html:28
+#: core/templates/navigation.html:194 core/templates/user/login.html:28
msgid "Reset password"
msgstr ""
-#: core/templates/navigation.html:209
+#: core/templates/navigation.html:207
msgid "My preferences"
msgstr ""
-#: core/templates/navigation.html:216
+#: core/templates/navigation.html:214
msgid "Logout"
msgstr ""
-#: core/templates/navigation.html:231
+#: core/templates/navigation.html:229
msgid "Licenses"
msgstr ""
-#: core/templates/navigation.html:234
+#: core/templates/navigation.html:232
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr ""
-#: core/templates/navigation.html:237 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:235 core/templates/weight_unit/list.html:4
#: nutrition/templates/ingredient/view.html:174
msgid "Weight units"
msgstr ""
-#: core/templates/navigation.html:240 core/templates/user/list.html:4
+#: core/templates/navigation.html:238 core/templates/user/list.html:4
msgid "User list"
msgstr ""
-#: core/templates/navigation.html:241
+#: core/templates/navigation.html:239
msgid "Gyms"
msgstr ""
@@ -1066,7 +1066,7 @@ msgstr ""
#: core/templates/tags/render_day.html:114
#: exercises/templates/equipment/overview.html:59
#: exercises/templates/exercise/overview.html:63
-#: exercises/templates/muscles/overview.html:61
+#: exercises/templates/muscles/overview.html:65
msgid "Placeholder image for exercise"
msgstr ""
@@ -1093,21 +1093,21 @@ msgstr ""
msgid "RiR"
msgstr ""
-#: core/templates/template.html:140
+#: core/templates/template.html:139
msgid ""
"You are using a guest account, data entered will be deleted after a week."
msgstr ""
-#: core/templates/template.html:144
+#: core/templates/template.html:143
msgid "Create some demo entries"
msgstr ""
-#: core/templates/template.html:176 core/templates/template_features.html:122
+#: core/templates/template.html:175 core/templates/template_features.html:121
#: core/templates/template_no_context.html:89 software/templates/tos.html:7
msgid "Terms of service"
msgstr ""
-#: core/templates/template_features.html:62 software/templates/features.html:9
+#: core/templates/template_features.html:61 software/templates/features.html:9
#: software/templates/features.html:120
msgid "Features"
msgstr ""
@@ -1517,7 +1517,7 @@ msgstr "Mușchii primari"
#: exercises/models/base.py:64 exercises/templates/equipment/overview.html:71
#: exercises/templates/exercise/overview.html:76
#: exercises/templates/exercise/view.html:268
-#: exercises/templates/muscles/overview.html:73
+#: exercises/templates/muscles/overview.html:77
msgid "Secondary muscles"
msgstr "Mușchii secundari"
@@ -1529,9 +1529,9 @@ msgstr ""
msgid "Exercise Categories"
msgstr "Categorii de Exerciții"
-#: exercises/models/comment.py:34 exercises/models/image.py:75
-#: exercises/models/video.py:82 manager/forms.py:165 manager/helpers.py:89
-#: manager/models/log.py:51
+#: exercises/models/comment.py:34 exercises/models/exercise_alias.py:32
+#: exercises/models/image.py:75 exercises/models/video.py:82
+#: manager/forms.py:165 manager/helpers.py:89 manager/models/log.py:51
msgid "Exercise"
msgstr "Exercițiu"
@@ -1557,6 +1557,12 @@ msgstr ""
msgid "The user {0} submitted a new exercise \"{1}\"."
msgstr ""
+#: exercises/models/exercise_alias.py:35
+#, fuzzy
+#| msgid "Add new exercise"
+msgid "Alias for an exercise"
+msgstr "Adăugați un exercițiu nou"
+
#: exercises/models/image.py:59
msgid "Line"
msgstr ""
@@ -1613,6 +1619,16 @@ msgstr ""
msgid "In latin, e.g. \"Pectoralis major\""
msgstr ""
+#: exercises/models/muscle.py:47
+#, fuzzy
+#| msgid "exercise name"
+msgid "Alternative name"
+msgstr "numele exercițiului"
+
+#: exercises/models/muscle.py:48
+msgid "A more basic name for the muscle"
+msgstr ""
+
#: exercises/models/video.py:41
msgid "Maximum file size is 100MB."
msgstr ""
@@ -1677,7 +1693,7 @@ msgstr ""
#: exercises/templates/equipment/overview.html:69
#: exercises/templates/exercise/overview.html:74
#: exercises/templates/exercise/view.html:264
-#: exercises/templates/muscles/overview.html:71
+#: exercises/templates/muscles/overview.html:75
msgid "Main muscles"
msgstr "Mușchii principali"
@@ -1700,7 +1716,7 @@ msgstr "numele exercițiului"
#: exercises/templates/equipment/overview.html:115
#: exercises/templates/exercise/overview.html:118
-#: exercises/templates/muscles/overview.html:114
+#: exercises/templates/muscles/overview.html:118
#: nutrition/templates/ingredient/overview.html:85
msgid "Only registered users can do this"
msgstr ""
@@ -1882,7 +1898,7 @@ msgstr "Prezentarea generală de muschi"
msgid "Add muscle"
msgstr "Adaugă un mușchi"
-#: exercises/templates/muscles/overview.html:81
+#: exercises/templates/muscles/overview.html:85
msgid ""
"No exercises for this muscle. Add or edit an exercise and set the muscle."
msgstr ""
@@ -2250,7 +2266,7 @@ msgstr ""
msgid "Edit gym"
msgstr ""
-#: i18n.tpl:2
+#: i18n.tpl:2 i18n.tpl:28
msgid "Abs"
msgstr "Abdomen"
@@ -2262,11 +2278,11 @@ msgstr "Brate"
msgid "Back"
msgstr "Înapoi"
-#: i18n.tpl:5
+#: i18n.tpl:5 i18n.tpl:23
msgid "Calves"
msgstr ""
-#: i18n.tpl:6
+#: i18n.tpl:6 i18n.tpl:26
msgid "Chest"
msgstr "Piept"
@@ -2274,7 +2290,7 @@ msgstr "Piept"
msgid "Legs"
msgstr "Picioare"
-#: i18n.tpl:8
+#: i18n.tpl:8 i18n.tpl:19
msgid "Shoulders"
msgstr "Umeri"
@@ -2303,107 +2319,77 @@ msgid "Kettlebell"
msgstr "Kettlebell"
#: i18n.tpl:15
-msgid "none (bodyweight exercise)"
-msgstr "nici unul (exercițiu cu greutate corporală)"
-
-#: i18n.tpl:16
msgid "Pull-up bar"
msgstr "Bara de tragere"
+#: i18n.tpl:16
+msgid "SZ-Bar"
+msgstr "SZ-Bar"
+
#: i18n.tpl:17
msgid "Swiss Ball"
msgstr "Minge Elvețiană"
#: i18n.tpl:18
-msgid "SZ-Bar"
-msgstr "SZ-Bar"
-
-#: i18n.tpl:19
-msgid "Anterior deltoid"
-msgstr "Deltoidul anterior"
+msgid "none (bodyweight exercise)"
+msgstr "nici unul (exercițiu cu greutate corporală)"
#: i18n.tpl:20
-msgid "Biceps brachii"
+#, fuzzy
+#| msgid "Biceps brachii"
+msgid "Biceps"
msgstr "Biceps brachii"
#: i18n.tpl:21
-msgid "Biceps femoris"
-msgstr "Biceps femoral"
+msgid "Hamstrings"
+msgstr ""
#: i18n.tpl:22
-msgid "Brachialis"
-msgstr "Brahial"
-
-#: i18n.tpl:23
-msgid "Gastrocnemius"
-msgstr "Gastrocnemius"
+msgid "Lower back"
+msgstr ""
#: i18n.tpl:24
-msgid "Gluteus maximus"
-msgstr "Gluteus maximus"
+#, fuzzy
+#| msgid "Minutes"
+msgid "Glutes"
+msgstr "Minute"
#: i18n.tpl:25
-msgid "Latissimus dorsi"
-msgstr "Dorsal mare"
-
-#: i18n.tpl:26
-msgid "Obliquus externus abdominis"
-msgstr "Obliquus externus abdominis"
+msgid "Lats"
+msgstr ""
#: i18n.tpl:27
-msgid "Pectoralis major"
-msgstr "Pectoral major"
-
-#: i18n.tpl:28
-msgid "Quadriceps femoris"
-msgstr "Quadriceps femoris"
+msgid "Quads"
+msgstr ""
#: i18n.tpl:29
-msgid "Rectus abdominis"
-msgstr "Drept abdominal"
-
-#: i18n.tpl:30
-msgid "Serratus anterior"
-msgstr "Serratus anterior"
-
-#: i18n.tpl:31
-msgid "Soleus"
-msgstr "Soleus"
-
-#: i18n.tpl:32
-msgid "Trapezius"
-msgstr "Trapez"
-
-#: i18n.tpl:33
-msgid "Triceps brachii"
+#, fuzzy
+#| msgid "Triceps brachii"
+msgid "Triceps"
msgstr "Triceps brachii"
-#: i18n.tpl:34
+#: i18n.tpl:30
msgid "Kilometers"
msgstr "Kilometri"
-#: i18n.tpl:35
-msgid "Max Reps"
-msgstr ""
-
-#: i18n.tpl:36
+#: i18n.tpl:31
msgid "Miles"
msgstr "Mile"
-#: i18n.tpl:37
+#: i18n.tpl:32
msgid "Minutes"
msgstr "Minute"
-#: i18n.tpl:38 manager/forms.py:169 manager/models/log.py:71
+#: i18n.tpl:33 manager/forms.py:169 manager/models/log.py:71
#: manager/templates/set/add.html:53
msgid "Repetitions"
msgstr ""
-#: i18n.tpl:39
+#: i18n.tpl:34
msgid "Seconds"
msgstr "Secunde"
-#: i18n.tpl:40
+#: i18n.tpl:35
msgid "Until Failure"
msgstr "Până la eșec"
@@ -3902,6 +3888,45 @@ msgstr "Șters cu succes."
msgid "Delete weight entry for the %s"
msgstr "Ștergeți greutatea pentru %s"
+#~ msgid "Anterior deltoid"
+#~ msgstr "Deltoidul anterior"
+
+#~ msgid "Biceps femoris"
+#~ msgstr "Biceps femoral"
+
+#~ msgid "Brachialis"
+#~ msgstr "Brahial"
+
+#~ msgid "Gastrocnemius"
+#~ msgstr "Gastrocnemius"
+
+#~ msgid "Gluteus maximus"
+#~ msgstr "Gluteus maximus"
+
+#~ msgid "Latissimus dorsi"
+#~ msgstr "Dorsal mare"
+
+#~ msgid "Obliquus externus abdominis"
+#~ msgstr "Obliquus externus abdominis"
+
+#~ msgid "Pectoralis major"
+#~ msgstr "Pectoral major"
+
+#~ msgid "Quadriceps femoris"
+#~ msgstr "Quadriceps femoris"
+
+#~ msgid "Rectus abdominis"
+#~ msgstr "Drept abdominal"
+
+#~ msgid "Serratus anterior"
+#~ msgstr "Serratus anterior"
+
+#~ msgid "Soleus"
+#~ msgstr "Soleus"
+
+#~ msgid "Trapezius"
+#~ msgstr "Trapez"
+
#~ msgid "Twitter"
#~ msgstr "Twitter"
diff --git a/wger/locale/ru/LC_MESSAGES/django.mo b/wger/locale/ru/LC_MESSAGES/django.mo
index bbe2c93fa..a28e10ff4 100644
Binary files a/wger/locale/ru/LC_MESSAGES/django.mo and b/wger/locale/ru/LC_MESSAGES/django.mo differ
diff --git a/wger/locale/ru/LC_MESSAGES/django.po b/wger/locale/ru/LC_MESSAGES/django.po
index fc2d0056b..01caa5b65 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: 2022-02-15 14:51+0100\n"
+"POT-Creation-Date: 2022-05-14 12:01+0200\n"
"PO-Revision-Date: 2022-03-26 23:13+0000\n"
"Last-Translator: gudvinr <[email protected]>\n"
"Language-Team: Russian <https://hosted.weblate.org/projects/wger/web/ru/>\n"
@@ -50,7 +50,7 @@ msgstr "Упражнения"
msgid "Ingredients"
msgstr "Ингредиенты"
-#: config/templates/language/overview.html:4 core/templates/navigation.html:228
+#: config/templates/language/overview.html:4 core/templates/navigation.html:226
msgid "Languages"
msgstr "Языки"
@@ -226,8 +226,8 @@ msgstr "Моя прикольная программа тренировки"
msgid "Empty placeholder schedule"
msgstr "Пустая программа-«заполнитель»"
-#: core/forms.py:61 core/templates/navigation.html:190
-#: core/templates/navigation.html:194 core/templates/user/login.html:4
+#: core/forms.py:61 core/templates/navigation.html:188
+#: core/templates/navigation.html:192 core/templates/user/login.html:4
#: software/templates/features.html:43
msgid "Login"
msgstr "Войти"
@@ -302,8 +302,8 @@ msgstr "Неверный пароль"
msgid "The form is secured with reCAPTCHA"
msgstr "Данная форма защищена reCAPTCHA"
-#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:190
-#: core/templates/navigation.html:195 core/templates/template.html:150
+#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:188
+#: core/templates/navigation.html:193 core/templates/template.html:149
#: core/templates/user/login.html:20 core/views/user.py:293
#: software/templates/features.html:38
msgid "Register"
@@ -629,7 +629,7 @@ msgstr ""
#: core/templates/index.html:33 core/templates/index.html:73
#: core/templates/misc/fragments/shariff_modal.html:29
-#: core/templates/template.html:125 manager/templates/calendar/month.html:138
+#: core/templates/template.html:124 manager/templates/calendar/month.html:138
#: manager/templates/schedule/view.html:246
#: manager/templates/schedule/view.html:266
#: manager/templates/workout/view.html:132
@@ -766,7 +766,7 @@ msgstr "Программ питания нет."
msgid "Weight"
msgstr "Вес"
-#: core/templates/index.html:210 core/templates/navigation.html:97
+#: core/templates/index.html:210 core/templates/navigation.html:135
#: weight/views.py:70
msgid "Add weight entry"
msgstr "Добавить запись веса"
@@ -798,8 +798,8 @@ msgstr "Список лицензий"
msgid "Nothing found"
msgstr "Ничего не найдено"
-#: core/templates/misc/about.html:4 core/templates/template.html:175
-#: core/templates/template_features.html:118
+#: core/templates/misc/about.html:4 core/templates/template.html:174
+#: core/templates/template_features.html:117
#: core/templates/template_no_context.html:88
msgid "Imprint"
msgstr "Отпечаток"
@@ -884,13 +884,13 @@ msgstr "по инвентарю"
#: exercises/templates/equipment/overview.html:113
#: exercises/templates/exercise/overview.html:112
#: exercises/templates/exercise/overview.html:116
-#: exercises/templates/muscles/overview.html:108
#: exercises/templates/muscles/overview.html:112
+#: exercises/templates/muscles/overview.html:116
msgid "Add new exercise"
msgstr "Добавить новое упражнение"
-#: core/templates/navigation.html:75 core/templates/navigation.html:134
-#: core/templates/navigation.html:226
+#: core/templates/navigation.html:75 core/templates/navigation.html:116
+#: core/templates/navigation.html:224
msgid "Administration"
msgstr "Администрация"
@@ -913,106 +913,106 @@ msgstr "Мышцы"
msgid "Categories"
msgstr "Категории"
-#: core/templates/navigation.html:94
-msgid "Body weight"
-msgstr "Вес тела"
-
-#: core/templates/navigation.html:96 core/templates/user/overview.html:114
-#: weight/templates/overview.html:7
-msgid "Weight overview"
-msgstr "Обзор веса"
-
-#: core/templates/navigation.html:111 software/templates/features.html:87
+#: core/templates/navigation.html:93 software/templates/features.html:87
msgid "Nutrition"
msgstr "Питание"
-#: core/templates/navigation.html:117 core/templates/user/overview.html:144
+#: core/templates/navigation.html:99 core/templates/user/overview.html:144
msgid "Nutrition plans"
msgstr "Программы питания"
-#: core/templates/navigation.html:123 nutrition/templates/bmi/form.html:50
+#: core/templates/navigation.html:105 nutrition/templates/bmi/form.html:50
msgid "BMI calculator"
msgstr "Калькулятор индекса массы тела"
-#: core/templates/navigation.html:129 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:111 nutrition/templates/rate/form.html:17
msgid "Daily calories calculator"
msgstr "Калькулятор ежедневных калорий"
-#: core/templates/navigation.html:131
+#: core/templates/navigation.html:113
#: nutrition/templates/ingredient/overview.html:29
msgid "Ingredient overview"
msgstr "Обзор ингредиентов"
-#: core/templates/navigation.html:135 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:117 nutrition/templates/units/list.html:6
msgid "Ingredient weight units"
msgstr "Единицы веса ингредиентов"
-#: core/templates/navigation.html:136
+#: core/templates/navigation.html:118
#: nutrition/templates/ingredient/pending.html:6
msgid "Ingredients pending review"
msgstr "Ингредиенты ожидающие рассмотрения"
-#: core/templates/navigation.html:149
+#: core/templates/navigation.html:132
+msgid "Body weight"
+msgstr "Вес тела"
+
+#: core/templates/navigation.html:134 core/templates/user/overview.html:114
+#: weight/templates/overview.html:7
+msgid "Weight overview"
+msgstr "Обзор веса"
+
+#: core/templates/navigation.html:147
msgid "About this software"
msgstr "Об этой программе"
-#: core/templates/navigation.html:151 core/templates/template_features.html:83
+#: core/templates/navigation.html:149 core/templates/template_features.html:82
#: software/templates/about_us.html:5
msgid "About us"
msgstr "О нас"
-#: core/templates/navigation.html:153 software/templates/features.html:209
+#: core/templates/navigation.html:151 software/templates/features.html:209
msgid "REST API"
msgstr "REST API"
-#: core/templates/navigation.html:157 utils/models.py:40
+#: core/templates/navigation.html:155 utils/models.py:40
msgid "License"
msgstr "Лицензия"
-#: core/templates/navigation.html:163
+#: core/templates/navigation.html:161
msgid "Developer documentation"
msgstr "Документация для разработчиков"
-#: core/templates/navigation.html:169
+#: core/templates/navigation.html:167
msgid "Get the code"
msgstr "Получить код"
-#: core/templates/navigation.html:175 core/templates/template.html:205
-#: core/templates/template_features.html:100
+#: core/templates/navigation.html:173 core/templates/template.html:204
+#: core/templates/template_features.html:99
msgid "Translate"
msgstr "Перевести"
-#: core/templates/navigation.html:196 core/templates/user/login.html:28
+#: core/templates/navigation.html:194 core/templates/user/login.html:28
msgid "Reset password"
msgstr "Восстановить пароль"
-#: core/templates/navigation.html:209
+#: core/templates/navigation.html:207
msgid "My preferences"
msgstr "Мои настройки"
-#: core/templates/navigation.html:216
+#: core/templates/navigation.html:214
msgid "Logout"
msgstr "Выйти"
-#: core/templates/navigation.html:231
+#: core/templates/navigation.html:229
msgid "Licenses"
msgstr "Лицензии"
-#: core/templates/navigation.html:234
+#: core/templates/navigation.html:232
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr "Единицы повторения"
-#: core/templates/navigation.html:237 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:235 core/templates/weight_unit/list.html:4
#: nutrition/templates/ingredient/view.html:174
msgid "Weight units"
msgstr "Единицы веса"
-#: core/templates/navigation.html:240 core/templates/user/list.html:4
+#: core/templates/navigation.html:238 core/templates/user/list.html:4
msgid "User list"
msgstr "Список пользователей"
-#: core/templates/navigation.html:241
+#: core/templates/navigation.html:239
msgid "Gyms"
msgstr "Тренажерные залы"
@@ -1094,7 +1094,7 @@ msgstr "Добавить журнал веса"
#: core/templates/tags/render_day.html:114
#: exercises/templates/equipment/overview.html:59
#: exercises/templates/exercise/overview.html:63
-#: exercises/templates/muscles/overview.html:61
+#: exercises/templates/muscles/overview.html:65
msgid "Placeholder image for exercise"
msgstr "Заполнитель изображения для упражнения"
@@ -1122,23 +1122,23 @@ msgstr "Повтор"
msgid "RiR"
msgstr "ПвЗ"
-#: core/templates/template.html:140
+#: core/templates/template.html:139
msgid ""
"You are using a guest account, data entered will be deleted after a week."
msgstr ""
"Вы используете аккаунт для гостей, введенные данные будут удалены через "
"неделю."
-#: core/templates/template.html:144
+#: core/templates/template.html:143
msgid "Create some demo entries"
msgstr "Создайте демо-записи"
-#: core/templates/template.html:176 core/templates/template_features.html:122
+#: core/templates/template.html:175 core/templates/template_features.html:121
#: core/templates/template_no_context.html:89 software/templates/tos.html:7
msgid "Terms of service"
msgstr "Условия обслуживания"
-#: core/templates/template_features.html:62 software/templates/features.html:9
+#: core/templates/template_features.html:61 software/templates/features.html:9
#: software/templates/features.html:120
msgid "Features"
msgstr "Особенности"
@@ -1165,7 +1165,8 @@ msgstr ""
#: core/templates/user/api_key.html:15
msgid "For security reasons, you should only access the API via HTTPS."
-msgstr "По соображениям безопасности обращаться к API нужно только через HTTPS."
+msgstr ""
+"По соображениям безопасности обращаться к API нужно только через HTTPS."
#: core/templates/user/api_key.html:18
msgid "Your API key"
@@ -1561,7 +1562,7 @@ msgstr "Основные мышцы"
#: exercises/models/base.py:64 exercises/templates/equipment/overview.html:71
#: exercises/templates/exercise/overview.html:76
#: exercises/templates/exercise/view.html:268
-#: exercises/templates/muscles/overview.html:73
+#: exercises/templates/muscles/overview.html:77
msgid "Secondary muscles"
msgstr "Второстепенные мышцы"
@@ -1573,9 +1574,9 @@ msgstr "Вариации"
msgid "Exercise Categories"
msgstr "Категории упражнений"
-#: exercises/models/comment.py:34 exercises/models/image.py:75
-#: exercises/models/video.py:82 manager/forms.py:165 manager/helpers.py:89
-#: manager/models/log.py:51
+#: exercises/models/comment.py:34 exercises/models/exercise_alias.py:32
+#: exercises/models/image.py:75 exercises/models/video.py:82
+#: manager/forms.py:165 manager/helpers.py:89 manager/models/log.py:51
msgid "Exercise"
msgstr "Упражнение"
@@ -1601,6 +1602,12 @@ msgstr "Новый пользователь добавил упражнение"
msgid "The user {0} submitted a new exercise \"{1}\"."
msgstr "Пользователь {0} представил новое упражнение \"{1}\"."
+#: exercises/models/exercise_alias.py:35
+#, fuzzy
+#| msgid "Correcting an exercise"
+msgid "Alias for an exercise"
+msgstr "Исправить упражнение"
+
#: exercises/models/image.py:59
#, fuzzy
msgid "Line"
@@ -1663,6 +1670,16 @@ msgstr ""
msgid "In latin, e.g. \"Pectoralis major\""
msgstr "Латинское название (например: \"Pectoralis major\")"
+#: exercises/models/muscle.py:47
+#, fuzzy
+#| msgid "exercise name"
+msgid "Alternative name"
+msgstr "название упражнения"
+
+#: exercises/models/muscle.py:48
+msgid "A more basic name for the muscle"
+msgstr ""
+
#: exercises/models/video.py:41
msgid "Maximum file size is 100MB."
msgstr "Максимальный размер файла - 100 МБ."
@@ -1723,7 +1740,7 @@ msgstr "Обзор оборудования"
#: exercises/templates/equipment/overview.html:69
#: exercises/templates/exercise/overview.html:74
#: exercises/templates/exercise/view.html:264
-#: exercises/templates/muscles/overview.html:71
+#: exercises/templates/muscles/overview.html:75
msgid "Main muscles"
msgstr "Основные мышцы"
@@ -1748,7 +1765,7 @@ msgstr "название упражнения"
#: exercises/templates/equipment/overview.html:115
#: exercises/templates/exercise/overview.html:118
-#: exercises/templates/muscles/overview.html:114
+#: exercises/templates/muscles/overview.html:118
#: nutrition/templates/ingredient/overview.html:85
msgid "Only registered users can do this"
msgstr "Это разрешается только зарегистрированным пользователям"
@@ -1939,7 +1956,7 @@ msgstr "Обзор мыщц"
msgid "Add muscle"
msgstr "Добавить мышцу"
-#: exercises/templates/muscles/overview.html:81
+#: exercises/templates/muscles/overview.html:85
msgid ""
"No exercises for this muscle. Add or edit an exercise and set the muscle."
msgstr ""
@@ -2320,7 +2337,7 @@ msgstr "Добавить пользователя в тренажерный за
msgid "Edit gym"
msgstr "Редактировать тренажерный зал"
-#: i18n.tpl:2
+#: i18n.tpl:2 i18n.tpl:28
msgid "Abs"
msgstr "Пресс"
@@ -2332,11 +2349,11 @@ msgstr "Руки"
msgid "Back"
msgstr "Спина"
-#: i18n.tpl:5
+#: i18n.tpl:5 i18n.tpl:23
msgid "Calves"
msgstr "Икры"
-#: i18n.tpl:6
+#: i18n.tpl:6 i18n.tpl:26
msgid "Chest"
msgstr "Грудь"
@@ -2344,7 +2361,7 @@ msgstr "Грудь"
msgid "Legs"
msgstr "Ноги"
-#: i18n.tpl:8
+#: i18n.tpl:8 i18n.tpl:19
msgid "Shoulders"
msgstr "Плечи"
@@ -2373,107 +2390,77 @@ msgid "Kettlebell"
msgstr "Гиря"
#: i18n.tpl:15
-msgid "none (bodyweight exercise)"
-msgstr "Никакое (упражнение с весом тела)"
-
-#: i18n.tpl:16
msgid "Pull-up bar"
msgstr "Брус для подтягивания"
+#: i18n.tpl:16
+msgid "SZ-Bar"
+msgstr "SZ-Штанга"
+
#: i18n.tpl:17
msgid "Swiss Ball"
msgstr "Фитбол"
#: i18n.tpl:18
-msgid "SZ-Bar"
-msgstr "SZ-Штанга"
-
-#: i18n.tpl:19
-msgid "Anterior deltoid"
-msgstr "Дельтовидная мышца"
+msgid "none (bodyweight exercise)"
+msgstr "Никакое (упражнение с весом тела)"
#: i18n.tpl:20
-msgid "Biceps brachii"
+#, fuzzy
+#| msgid "Biceps brachii"
+msgid "Biceps"
msgstr "Бицепс"
#: i18n.tpl:21
-msgid "Biceps femoris"
-msgstr "Двуглавая мышца бедра"
+msgid "Hamstrings"
+msgstr ""
#: i18n.tpl:22
-msgid "Brachialis"
-msgstr "Плечевая мышца"
-
-#: i18n.tpl:23
-msgid "Gastrocnemius"
-msgstr "Икроножная мышца"
+msgid "Lower back"
+msgstr ""
#: i18n.tpl:24
-msgid "Gluteus maximus"
-msgstr "Большая ягодичная мышца"
+#, fuzzy
+#| msgid "Minutes"
+msgid "Glutes"
+msgstr "Минут"
#: i18n.tpl:25
-msgid "Latissimus dorsi"
-msgstr "Широчайшая мышца спины"
-
-#: i18n.tpl:26
-msgid "Obliquus externus abdominis"
-msgstr "Наружная косая мышца живота"
+msgid "Lats"
+msgstr ""
#: i18n.tpl:27
-msgid "Pectoralis major"
-msgstr "Большая грудная мышца"
-
-#: i18n.tpl:28
-msgid "Quadriceps femoris"
-msgstr "Четырёхглавая мышца бедра"
+msgid "Quads"
+msgstr ""
#: i18n.tpl:29
-msgid "Rectus abdominis"
-msgstr "Прямая мышца живота"
-
-#: i18n.tpl:30
-msgid "Serratus anterior"
-msgstr "Передняя зубчатая мышца"
-
-#: i18n.tpl:31
-msgid "Soleus"
-msgstr "Камбаловидная мышца"
-
-#: i18n.tpl:32
-msgid "Trapezius"
-msgstr "Трапециевидная мышца"
-
-#: i18n.tpl:33
-msgid "Triceps brachii"
+#, fuzzy
+#| msgid "Triceps brachii"
+msgid "Triceps"
msgstr "Трицепс"
-#: i18n.tpl:34
+#: i18n.tpl:30
msgid "Kilometers"
msgstr "Километров"
-#: i18n.tpl:35
-msgid "Max Reps"
-msgstr "Макс. Повтор"
-
-#: i18n.tpl:36
+#: i18n.tpl:31
msgid "Miles"
msgstr "Миль"
-#: i18n.tpl:37
+#: i18n.tpl:32
msgid "Minutes"
msgstr "Минут"
-#: i18n.tpl:38 manager/forms.py:169 manager/models/log.py:71
+#: i18n.tpl:33 manager/forms.py:169 manager/models/log.py:71
#: manager/templates/set/add.html:53
msgid "Repetitions"
msgstr "Повторений"
-#: i18n.tpl:39
+#: i18n.tpl:34
msgid "Seconds"
msgstr "Секунд"
-#: i18n.tpl:40
+#: i18n.tpl:35
msgid "Until Failure"
msgstr "До отказа"
@@ -3285,8 +3272,8 @@ msgid ""
"Give meals a textual description / name such as \"Breakfast\" or \"after "
"workout\""
msgstr ""
-"Дайте блюдам текстовое описание / название, например, \"Завтрак\" или \"После"
-" тренировки\""
+"Дайте блюдам текстовое описание / название, например, \"Завтрак\" или "
+"\"После тренировки\""
#: nutrition/models/plan.py:71
msgid ""
@@ -4076,8 +4063,8 @@ msgstr ""
"даты\n"
" или числа до проблем с кодировкой или что-нибудь ещё Пожалуйста, "
"проверьте\n"
-" чтобы не было очевидных ошибок в списке (и исправьте их, если они есть!)"
-"\n"
+" чтобы не было очевидных ошибок в списке (и исправьте их, если они "
+"есть!)\n"
" и попытайтесь импортировать список еще раз."
#: weight/templates/import_csv_preview.html:37
@@ -4151,6 +4138,48 @@ msgstr "Успешно удалено."
msgid "Delete weight entry for the %s"
msgstr "Удалить запись о весе для %s"
+#~ msgid "Anterior deltoid"
+#~ msgstr "Дельтовидная мышца"
+
+#~ msgid "Biceps femoris"
+#~ msgstr "Двуглавая мышца бедра"
+
+#~ msgid "Brachialis"
+#~ msgstr "Плечевая мышца"
+
+#~ msgid "Gastrocnemius"
+#~ msgstr "Икроножная мышца"
+
+#~ msgid "Gluteus maximus"
+#~ msgstr "Большая ягодичная мышца"
+
+#~ msgid "Latissimus dorsi"
+#~ msgstr "Широчайшая мышца спины"
+
+#~ msgid "Obliquus externus abdominis"
+#~ msgstr "Наружная косая мышца живота"
+
+#~ msgid "Pectoralis major"
+#~ msgstr "Большая грудная мышца"
+
+#~ msgid "Quadriceps femoris"
+#~ msgstr "Четырёхглавая мышца бедра"
+
+#~ msgid "Rectus abdominis"
+#~ msgstr "Прямая мышца живота"
+
+#~ msgid "Serratus anterior"
+#~ msgstr "Передняя зубчатая мышца"
+
+#~ msgid "Soleus"
+#~ msgstr "Камбаловидная мышца"
+
+#~ msgid "Trapezius"
+#~ msgstr "Трапециевидная мышца"
+
+#~ msgid "Max Reps"
+#~ msgstr "Макс. Повтор"
+
#~ msgid "Your current weight is: "
#~ msgstr "Ваш вес на данный момент:"
diff --git a/wger/locale/sv/LC_MESSAGES/django.po b/wger/locale/sv/LC_MESSAGES/django.po
index 62df18ae7..ed49bfa5c 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: 2022-02-15 14:51+0100\n"
+"POT-Creation-Date: 2022-05-14 12:01+0200\n"
"PO-Revision-Date: 2022-04-20 20:12+0000\n"
"Last-Translator: stefan <[email protected]>\n"
"Language-Team: Swedish <https://hosted.weblate.org/projects/wger/web/sv/>\n"
@@ -45,7 +45,7 @@ msgstr "Övningar"
msgid "Ingredients"
msgstr "Ingredienser"
-#: config/templates/language/overview.html:4 core/templates/navigation.html:228
+#: config/templates/language/overview.html:4 core/templates/navigation.html:226
msgid "Languages"
msgstr "Språk"
@@ -220,8 +220,8 @@ msgstr "Mitt coola träningsschema"
msgid "Empty placeholder schedule"
msgstr "Tom platshållarschema"
-#: core/forms.py:61 core/templates/navigation.html:190
-#: core/templates/navigation.html:194 core/templates/user/login.html:4
+#: core/forms.py:61 core/templates/navigation.html:188
+#: core/templates/navigation.html:192 core/templates/user/login.html:4
#: software/templates/features.html:43
msgid "Login"
msgstr "Logga in"
@@ -295,8 +295,8 @@ msgstr "Ogiltigt lösenord"
msgid "The form is secured with reCAPTCHA"
msgstr "Denna formen är säkrad med reCAPTCHA"
-#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:190
-#: core/templates/navigation.html:195 core/templates/template.html:150
+#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:188
+#: core/templates/navigation.html:193 core/templates/template.html:149
#: core/templates/user/login.html:20 core/views/user.py:293
#: software/templates/features.html:38
msgid "Register"
@@ -612,7 +612,7 @@ msgstr ""
#: core/templates/index.html:33 core/templates/index.html:73
#: core/templates/misc/fragments/shariff_modal.html:29
-#: core/templates/template.html:125 manager/templates/calendar/month.html:138
+#: core/templates/template.html:124 manager/templates/calendar/month.html:138
#: manager/templates/schedule/view.html:246
#: manager/templates/schedule/view.html:266
#: manager/templates/workout/view.html:132
@@ -744,7 +744,7 @@ msgstr "Inga kostplaner."
msgid "Weight"
msgstr "Vikt"
-#: core/templates/index.html:210 core/templates/navigation.html:97
+#: core/templates/index.html:210 core/templates/navigation.html:135
#: weight/views.py:70
msgid "Add weight entry"
msgstr "Lägg till vikt"
@@ -776,8 +776,8 @@ msgstr "Licens lista"
msgid "Nothing found"
msgstr "Ingenting hittades"
-#: core/templates/misc/about.html:4 core/templates/template.html:175
-#: core/templates/template_features.html:118
+#: core/templates/misc/about.html:4 core/templates/template.html:174
+#: core/templates/template_features.html:117
#: core/templates/template_no_context.html:88
msgid "Imprint"
msgstr ""
@@ -864,13 +864,13 @@ msgstr ""
#: exercises/templates/equipment/overview.html:113
#: exercises/templates/exercise/overview.html:112
#: exercises/templates/exercise/overview.html:116
-#: exercises/templates/muscles/overview.html:108
#: exercises/templates/muscles/overview.html:112
+#: exercises/templates/muscles/overview.html:116
msgid "Add new exercise"
msgstr "Lägg till ny övning"
-#: core/templates/navigation.html:75 core/templates/navigation.html:134
-#: core/templates/navigation.html:226
+#: core/templates/navigation.html:75 core/templates/navigation.html:116
+#: core/templates/navigation.html:224
msgid "Administration"
msgstr "Administration"
@@ -893,106 +893,106 @@ msgstr "Muskler"
msgid "Categories"
msgstr "Kategorier"
-#: core/templates/navigation.html:94
-msgid "Body weight"
-msgstr ""
-
-#: core/templates/navigation.html:96 core/templates/user/overview.html:114
-#: weight/templates/overview.html:7
-msgid "Weight overview"
-msgstr "Viktöversikt"
-
-#: core/templates/navigation.html:111 software/templates/features.html:87
+#: core/templates/navigation.html:93 software/templates/features.html:87
msgid "Nutrition"
msgstr "Kost"
-#: core/templates/navigation.html:117 core/templates/user/overview.html:144
+#: core/templates/navigation.html:99 core/templates/user/overview.html:144
msgid "Nutrition plans"
msgstr "Kostplaner"
-#: core/templates/navigation.html:123 nutrition/templates/bmi/form.html:50
+#: core/templates/navigation.html:105 nutrition/templates/bmi/form.html:50
msgid "BMI calculator"
msgstr "BMI-kalkylator"
-#: core/templates/navigation.html:129 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:111 nutrition/templates/rate/form.html:17
msgid "Daily calories calculator"
msgstr "Dagliga-kalorier-kalkylator"
-#: core/templates/navigation.html:131
+#: core/templates/navigation.html:113
#: nutrition/templates/ingredient/overview.html:29
msgid "Ingredient overview"
msgstr "Ingrediensöversikt"
-#: core/templates/navigation.html:135 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:117 nutrition/templates/units/list.html:6
msgid "Ingredient weight units"
msgstr "Ingrediens viktenheter"
-#: core/templates/navigation.html:136
+#: core/templates/navigation.html:118
#: nutrition/templates/ingredient/pending.html:6
msgid "Ingredients pending review"
msgstr "Ingredienser i avvaktan på översyn"
-#: core/templates/navigation.html:149
+#: core/templates/navigation.html:132
+msgid "Body weight"
+msgstr ""
+
+#: core/templates/navigation.html:134 core/templates/user/overview.html:114
+#: weight/templates/overview.html:7
+msgid "Weight overview"
+msgstr "Viktöversikt"
+
+#: core/templates/navigation.html:147
msgid "About this software"
msgstr "Om programvaran"
-#: core/templates/navigation.html:151 core/templates/template_features.html:83
+#: core/templates/navigation.html:149 core/templates/template_features.html:82
#: software/templates/about_us.html:5
msgid "About us"
msgstr "Om oss"
-#: core/templates/navigation.html:153 software/templates/features.html:209
+#: core/templates/navigation.html:151 software/templates/features.html:209
msgid "REST API"
msgstr "REST API"
-#: core/templates/navigation.html:157 utils/models.py:40
+#: core/templates/navigation.html:155 utils/models.py:40
msgid "License"
msgstr "Licens"
-#: core/templates/navigation.html:163
+#: core/templates/navigation.html:161
msgid "Developer documentation"
msgstr "Dokument för utvecklare"
-#: core/templates/navigation.html:169
+#: core/templates/navigation.html:167
msgid "Get the code"
msgstr "Hämta koden"
-#: core/templates/navigation.html:175 core/templates/template.html:205
-#: core/templates/template_features.html:100
+#: core/templates/navigation.html:173 core/templates/template.html:204
+#: core/templates/template_features.html:99
msgid "Translate"
msgstr "Översätt"
-#: core/templates/navigation.html:196 core/templates/user/login.html:28
+#: core/templates/navigation.html:194 core/templates/user/login.html:28
msgid "Reset password"
msgstr "Återställ lösenord"
-#: core/templates/navigation.html:209
+#: core/templates/navigation.html:207
msgid "My preferences"
msgstr "Mina preferenser"
-#: core/templates/navigation.html:216
+#: core/templates/navigation.html:214
msgid "Logout"
msgstr "Logga ut"
-#: core/templates/navigation.html:231
+#: core/templates/navigation.html:229
msgid "Licenses"
msgstr "Licenser"
-#: core/templates/navigation.html:234
+#: core/templates/navigation.html:232
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr "Repetitioner"
-#: core/templates/navigation.html:237 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:235 core/templates/weight_unit/list.html:4
#: nutrition/templates/ingredient/view.html:174
msgid "Weight units"
msgstr "Viktenheter"
-#: core/templates/navigation.html:240 core/templates/user/list.html:4
+#: core/templates/navigation.html:238 core/templates/user/list.html:4
msgid "User list"
msgstr "Användarlista"
-#: core/templates/navigation.html:241
+#: core/templates/navigation.html:239
msgid "Gyms"
msgstr "Gym"
@@ -1074,7 +1074,7 @@ msgstr ""
#: core/templates/tags/render_day.html:114
#: exercises/templates/equipment/overview.html:59
#: exercises/templates/exercise/overview.html:63
-#: exercises/templates/muscles/overview.html:61
+#: exercises/templates/muscles/overview.html:65
msgid "Placeholder image for exercise"
msgstr "Platshållarbild för övning"
@@ -1101,21 +1101,21 @@ msgstr "Reps"
msgid "RiR"
msgstr ""
-#: core/templates/template.html:140
+#: core/templates/template.html:139
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:144
+#: core/templates/template.html:143
msgid "Create some demo entries"
msgstr "Skapa några demoposter"
-#: core/templates/template.html:176 core/templates/template_features.html:122
+#: core/templates/template.html:175 core/templates/template_features.html:121
#: core/templates/template_no_context.html:89 software/templates/tos.html:7
msgid "Terms of service"
msgstr "Villkor för tjänsten"
-#: core/templates/template_features.html:62 software/templates/features.html:9
+#: core/templates/template_features.html:61 software/templates/features.html:9
#: software/templates/features.html:120
msgid "Features"
msgstr "Funktioner"
@@ -1536,7 +1536,7 @@ msgstr "Primära muskler"
#: exercises/models/base.py:64 exercises/templates/equipment/overview.html:71
#: exercises/templates/exercise/overview.html:76
#: exercises/templates/exercise/view.html:268
-#: exercises/templates/muscles/overview.html:73
+#: exercises/templates/muscles/overview.html:77
msgid "Secondary muscles"
msgstr "Sekundära muskler"
@@ -1548,9 +1548,9 @@ msgstr ""
msgid "Exercise Categories"
msgstr "Övningskategorier"
-#: exercises/models/comment.py:34 exercises/models/image.py:75
-#: exercises/models/video.py:82 manager/forms.py:165 manager/helpers.py:89
-#: manager/models/log.py:51
+#: exercises/models/comment.py:34 exercises/models/exercise_alias.py:32
+#: exercises/models/image.py:75 exercises/models/video.py:82
+#: manager/forms.py:165 manager/helpers.py:89 manager/models/log.py:51
msgid "Exercise"
msgstr "Träning"
@@ -1576,6 +1576,12 @@ msgstr "Ny användarskapad övning"
msgid "The user {0} submitted a new exercise \"{1}\"."
msgstr "Användaren {0} har laggt in en ny övning \"{1}\"."
+#: exercises/models/exercise_alias.py:35
+#, fuzzy
+#| msgid "Correcting an exercise"
+msgid "Alias for an exercise"
+msgstr "Korrigera en övning"
+
#: exercises/models/image.py:59
msgid "Line"
msgstr ""
@@ -1637,6 +1643,16 @@ msgstr "Användaren {0} har laggt in en ny bild {1} för övning {2}."
msgid "In latin, e.g. \"Pectoralis major\""
msgstr "På latin, e.g. \"Pectoralis major\""
+#: exercises/models/muscle.py:47
+#, fuzzy
+#| msgid "exercise name"
+msgid "Alternative name"
+msgstr "Övningsnamn"
+
+#: exercises/models/muscle.py:48
+msgid "A more basic name for the muscle"
+msgstr ""
+
#: exercises/models/video.py:41
msgid "Maximum file size is 100MB."
msgstr ""
@@ -1703,7 +1719,7 @@ msgstr "Utrustningsöversikt"
#: exercises/templates/equipment/overview.html:69
#: exercises/templates/exercise/overview.html:74
#: exercises/templates/exercise/view.html:264
-#: exercises/templates/muscles/overview.html:71
+#: exercises/templates/muscles/overview.html:75
msgid "Main muscles"
msgstr "Huvudsakliga muskler"
@@ -1728,7 +1744,7 @@ msgstr "Övningsnamn"
#: exercises/templates/equipment/overview.html:115
#: exercises/templates/exercise/overview.html:118
-#: exercises/templates/muscles/overview.html:114
+#: exercises/templates/muscles/overview.html:118
#: nutrition/templates/ingredient/overview.html:85
msgid "Only registered users can do this"
msgstr "Endast registrerade användare kan göra detta"
@@ -1920,7 +1936,7 @@ msgstr "Muskelöversikt"
msgid "Add muscle"
msgstr "Lägg till muskel"
-#: exercises/templates/muscles/overview.html:81
+#: exercises/templates/muscles/overview.html:85
msgid ""
"No exercises for this muscle. Add or edit an exercise and set the muscle."
msgstr ""
@@ -2298,7 +2314,7 @@ msgstr "Lägg till användare till gym"
msgid "Edit gym"
msgstr "Redigera gym"
-#: i18n.tpl:2
+#: i18n.tpl:2 i18n.tpl:28
msgid "Abs"
msgstr "Magmuskler"
@@ -2310,11 +2326,11 @@ msgstr "Armar"
msgid "Back"
msgstr "Rygg"
-#: i18n.tpl:5
+#: i18n.tpl:5 i18n.tpl:23
msgid "Calves"
msgstr "Vader"
-#: i18n.tpl:6
+#: i18n.tpl:6 i18n.tpl:26
msgid "Chest"
msgstr "Bröst"
@@ -2322,7 +2338,7 @@ msgstr "Bröst"
msgid "Legs"
msgstr "Ben"
-#: i18n.tpl:8
+#: i18n.tpl:8 i18n.tpl:19
msgid "Shoulders"
msgstr "Axlar"
@@ -2351,107 +2367,77 @@ msgid "Kettlebell"
msgstr "Kettlebell"
#: i18n.tpl:15
-msgid "none (bodyweight exercise)"
-msgstr "ingen (kroppsvikt träning)"
-
-#: i18n.tpl:16
msgid "Pull-up bar"
msgstr "Pull-up bar"
+#: i18n.tpl:16
+msgid "SZ-Bar"
+msgstr "SZ-Bar"
+
#: i18n.tpl:17
msgid "Swiss Ball"
msgstr "Schweizisk boll"
#: i18n.tpl:18
-msgid "SZ-Bar"
-msgstr "SZ-Bar"
-
-#: i18n.tpl:19
-msgid "Anterior deltoid"
-msgstr "Främre deltamuskeln"
+msgid "none (bodyweight exercise)"
+msgstr "ingen (kroppsvikt träning)"
#: i18n.tpl:20
-msgid "Biceps brachii"
+#, fuzzy
+#| msgid "Biceps brachii"
+msgid "Biceps"
msgstr "Biceps brachii"
#: i18n.tpl:21
-msgid "Biceps femoris"
-msgstr "Biceps femoris"
+msgid "Hamstrings"
+msgstr ""
#: i18n.tpl:22
-msgid "Brachialis"
-msgstr "Brachialis"
-
-#: i18n.tpl:23
-msgid "Gastrocnemius"
-msgstr "Gastrocnemius"
+msgid "Lower back"
+msgstr ""
#: i18n.tpl:24
-msgid "Gluteus maximus"
-msgstr "Gluteus maximus"
+#, fuzzy
+#| msgid "Minutes"
+msgid "Glutes"
+msgstr "Minuter"
#: i18n.tpl:25
-msgid "Latissimus dorsi"
-msgstr "Latissimus dorsi"
-
-#: i18n.tpl:26
-msgid "Obliquus externus abdominis"
-msgstr "Obliquus externus abdominis"
+msgid "Lats"
+msgstr ""
#: i18n.tpl:27
-msgid "Pectoralis major"
-msgstr "Pectoralis stora"
-
-#: i18n.tpl:28
-msgid "Quadriceps femoris"
-msgstr "Quadriceps femoris"
+msgid "Quads"
+msgstr ""
#: i18n.tpl:29
-msgid "Rectus abdominis"
-msgstr "Rectus abdominis"
-
-#: i18n.tpl:30
-msgid "Serratus anterior"
-msgstr "Serratus anterior"
-
-#: i18n.tpl:31
-msgid "Soleus"
-msgstr "Soleus"
-
-#: i18n.tpl:32
-msgid "Trapezius"
-msgstr "Trapezius"
-
-#: i18n.tpl:33
-msgid "Triceps brachii"
+#, fuzzy
+#| msgid "Triceps brachii"
+msgid "Triceps"
msgstr "Tricepsbrachii"
-#: i18n.tpl:34
+#: i18n.tpl:30
msgid "Kilometers"
msgstr "Kilometer"
-#: i18n.tpl:35
-msgid "Max Reps"
-msgstr "Max antal Reps"
-
-#: i18n.tpl:36
+#: i18n.tpl:31
msgid "Miles"
msgstr "Mil"
-#: i18n.tpl:37
+#: i18n.tpl:32
msgid "Minutes"
msgstr "Minuter"
-#: i18n.tpl:38 manager/forms.py:169 manager/models/log.py:71
+#: i18n.tpl:33 manager/forms.py:169 manager/models/log.py:71
#: manager/templates/set/add.html:53
msgid "Repetitions"
msgstr "Repetitioner"
-#: i18n.tpl:39
+#: i18n.tpl:34
msgid "Seconds"
msgstr "Sekunder"
-#: i18n.tpl:40
+#: i18n.tpl:35
msgid "Until Failure"
msgstr "Tills Misslyckande"
@@ -4100,6 +4086,48 @@ msgstr ""
msgid "Delete weight entry for the %s"
msgstr ""
+#~ msgid "Anterior deltoid"
+#~ msgstr "Främre deltamuskeln"
+
+#~ msgid "Biceps femoris"
+#~ msgstr "Biceps femoris"
+
+#~ msgid "Brachialis"
+#~ msgstr "Brachialis"
+
+#~ msgid "Gastrocnemius"
+#~ msgstr "Gastrocnemius"
+
+#~ msgid "Gluteus maximus"
+#~ msgstr "Gluteus maximus"
+
+#~ msgid "Latissimus dorsi"
+#~ msgstr "Latissimus dorsi"
+
+#~ msgid "Obliquus externus abdominis"
+#~ msgstr "Obliquus externus abdominis"
+
+#~ msgid "Pectoralis major"
+#~ msgstr "Pectoralis stora"
+
+#~ msgid "Quadriceps femoris"
+#~ msgstr "Quadriceps femoris"
+
+#~ msgid "Rectus abdominis"
+#~ msgstr "Rectus abdominis"
+
+#~ msgid "Serratus anterior"
+#~ msgstr "Serratus anterior"
+
+#~ msgid "Soleus"
+#~ msgstr "Soleus"
+
+#~ msgid "Trapezius"
+#~ msgstr "Trapezius"
+
+#~ msgid "Max Reps"
+#~ msgstr "Max antal Reps"
+
#~ msgid "Your current weight is: "
#~ msgstr "Din nuvarande vikt är: "
diff --git a/wger/locale/tr/LC_MESSAGES/django.mo b/wger/locale/tr/LC_MESSAGES/django.mo
index 4c2f0751e..f878234b9 100644
Binary files a/wger/locale/tr/LC_MESSAGES/django.mo and b/wger/locale/tr/LC_MESSAGES/django.mo differ
diff --git a/wger/locale/tr/LC_MESSAGES/django.po b/wger/locale/tr/LC_MESSAGES/django.po
index 8bd99c2a0..dd100c9f3 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: 2022-02-15 14:51+0100\n"
+"POT-Creation-Date: 2022-05-14 12:01+0200\n"
"PO-Revision-Date: 2022-04-20 20:12+0000\n"
"Last-Translator: Oğuz Ersen <[email protected]>\n"
"Language-Team: Turkish <https://hosted.weblate.org/projects/wger/web/tr/>\n"
@@ -44,7 +44,7 @@ msgstr "Egzersizler"
msgid "Ingredients"
msgstr "Bileşimindekiler"
-#: config/templates/language/overview.html:4 core/templates/navigation.html:228
+#: config/templates/language/overview.html:4 core/templates/navigation.html:226
msgid "Languages"
msgstr "Diller"
@@ -221,8 +221,8 @@ msgstr "Harika antrenman programım"
msgid "Empty placeholder schedule"
msgstr "Yer tutucu planı boş"
-#: core/forms.py:61 core/templates/navigation.html:190
-#: core/templates/navigation.html:194 core/templates/user/login.html:4
+#: core/forms.py:61 core/templates/navigation.html:188
+#: core/templates/navigation.html:192 core/templates/user/login.html:4
#: software/templates/features.html:43
msgid "Login"
msgstr "Oturum aç"
@@ -299,8 +299,8 @@ msgstr "Geçersiz parola"
msgid "The form is secured with reCAPTCHA"
msgstr "Form reCAPTCHA ile güvence altına alındı"
-#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:190
-#: core/templates/navigation.html:195 core/templates/template.html:150
+#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:188
+#: core/templates/navigation.html:193 core/templates/template.html:149
#: core/templates/user/login.html:20 core/views/user.py:293
#: software/templates/features.html:38
msgid "Register"
@@ -623,7 +623,7 @@ msgstr ""
#: core/templates/index.html:33 core/templates/index.html:73
#: core/templates/misc/fragments/shariff_modal.html:29
-#: core/templates/template.html:125 manager/templates/calendar/month.html:138
+#: core/templates/template.html:124 manager/templates/calendar/month.html:138
#: manager/templates/schedule/view.html:246
#: manager/templates/schedule/view.html:266
#: manager/templates/workout/view.html:132
@@ -760,7 +760,7 @@ msgstr "Beslenme planı yok."
msgid "Weight"
msgstr "Kilo"
-#: core/templates/index.html:210 core/templates/navigation.html:97
+#: core/templates/index.html:210 core/templates/navigation.html:135
#: weight/views.py:70
msgid "Add weight entry"
msgstr "Kilo girişi ekleyin"
@@ -792,8 +792,8 @@ msgstr "Lisans listesi"
msgid "Nothing found"
msgstr "Hiçbir şey Bulunamadı"
-#: core/templates/misc/about.html:4 core/templates/template.html:175
-#: core/templates/template_features.html:118
+#: core/templates/misc/about.html:4 core/templates/template.html:174
+#: core/templates/template_features.html:117
#: core/templates/template_no_context.html:88
msgid "Imprint"
msgstr "Künye"
@@ -879,13 +879,13 @@ msgstr "ekipmana göre"
#: exercises/templates/equipment/overview.html:113
#: exercises/templates/exercise/overview.html:112
#: exercises/templates/exercise/overview.html:116
-#: exercises/templates/muscles/overview.html:108
#: exercises/templates/muscles/overview.html:112
+#: exercises/templates/muscles/overview.html:116
msgid "Add new exercise"
msgstr "Yeni egzersiz ekleyin"
-#: core/templates/navigation.html:75 core/templates/navigation.html:134
-#: core/templates/navigation.html:226
+#: core/templates/navigation.html:75 core/templates/navigation.html:116
+#: core/templates/navigation.html:224
msgid "Administration"
msgstr "Yönetim"
@@ -908,106 +908,106 @@ msgstr "Kaslar"
msgid "Categories"
msgstr "Kategoriler"
-#: core/templates/navigation.html:94
-msgid "Body weight"
-msgstr "Vücut ağırlığı"
-
-#: core/templates/navigation.html:96 core/templates/user/overview.html:114
-#: weight/templates/overview.html:7
-msgid "Weight overview"
-msgstr "Ağırlığa genel bakış"
-
-#: core/templates/navigation.html:111 software/templates/features.html:87
+#: core/templates/navigation.html:93 software/templates/features.html:87
msgid "Nutrition"
msgstr "Beslenme"
-#: core/templates/navigation.html:117 core/templates/user/overview.html:144
+#: core/templates/navigation.html:99 core/templates/user/overview.html:144
msgid "Nutrition plans"
msgstr "Beslenme planları"
-#: core/templates/navigation.html:123 nutrition/templates/bmi/form.html:50
+#: core/templates/navigation.html:105 nutrition/templates/bmi/form.html:50
msgid "BMI calculator"
msgstr "BMI hesaplayıcı"
-#: core/templates/navigation.html:129 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:111 nutrition/templates/rate/form.html:17
msgid "Daily calories calculator"
msgstr "Günlük kalori hesaplayıcı"
-#: core/templates/navigation.html:131
+#: core/templates/navigation.html:113
#: nutrition/templates/ingredient/overview.html:29
msgid "Ingredient overview"
msgstr "İçeriğe genel bakış"
-#: core/templates/navigation.html:135 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:117 nutrition/templates/units/list.html:6
msgid "Ingredient weight units"
msgstr "İçerik ağırlık birimleri"
-#: core/templates/navigation.html:136
+#: core/templates/navigation.html:118
#: nutrition/templates/ingredient/pending.html:6
msgid "Ingredients pending review"
msgstr "İncelenmeyi bekleyen malzemeler"
-#: core/templates/navigation.html:149
+#: core/templates/navigation.html:132
+msgid "Body weight"
+msgstr "Vücut ağırlığı"
+
+#: core/templates/navigation.html:134 core/templates/user/overview.html:114
+#: weight/templates/overview.html:7
+msgid "Weight overview"
+msgstr "Ağırlığa genel bakış"
+
+#: core/templates/navigation.html:147
msgid "About this software"
msgstr "Bu yazılım hakkında"
-#: core/templates/navigation.html:151 core/templates/template_features.html:83
+#: core/templates/navigation.html:149 core/templates/template_features.html:82
#: software/templates/about_us.html:5
msgid "About us"
msgstr "Hakkımızda"
-#: core/templates/navigation.html:153 software/templates/features.html:209
+#: core/templates/navigation.html:151 software/templates/features.html:209
msgid "REST API"
msgstr "REST API"
-#: core/templates/navigation.html:157 utils/models.py:40
+#: core/templates/navigation.html:155 utils/models.py:40
msgid "License"
msgstr "Lisans"
-#: core/templates/navigation.html:163
+#: core/templates/navigation.html:161
msgid "Developer documentation"
msgstr "Geliştirici belgeleri"
-#: core/templates/navigation.html:169
+#: core/templates/navigation.html:167
msgid "Get the code"
msgstr "Kodu alın"
-#: core/templates/navigation.html:175 core/templates/template.html:205
-#: core/templates/template_features.html:100
+#: core/templates/navigation.html:173 core/templates/template.html:204
+#: core/templates/template_features.html:99
msgid "Translate"
msgstr "Çevir"
-#: core/templates/navigation.html:196 core/templates/user/login.html:28
+#: core/templates/navigation.html:194 core/templates/user/login.html:28
msgid "Reset password"
msgstr "Parolayı sıfırla"
-#: core/templates/navigation.html:209
+#: core/templates/navigation.html:207
msgid "My preferences"
msgstr "Benim tercihlerim"
-#: core/templates/navigation.html:216
+#: core/templates/navigation.html:214
msgid "Logout"
msgstr "Çıkış"
-#: core/templates/navigation.html:231
+#: core/templates/navigation.html:229
msgid "Licenses"
msgstr "Lisanslar"
-#: core/templates/navigation.html:234
+#: core/templates/navigation.html:232
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr "Tekrarlama birimleri"
-#: core/templates/navigation.html:237 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:235 core/templates/weight_unit/list.html:4
#: nutrition/templates/ingredient/view.html:174
msgid "Weight units"
msgstr "Ağırlık birimleri"
-#: core/templates/navigation.html:240 core/templates/user/list.html:4
+#: core/templates/navigation.html:238 core/templates/user/list.html:4
msgid "User list"
msgstr "Kullanıcı listesi"
-#: core/templates/navigation.html:241
+#: core/templates/navigation.html:239
msgid "Gyms"
msgstr "Spor salonları"
@@ -1089,7 +1089,7 @@ msgstr "Kilo günlüğü ekle"
#: core/templates/tags/render_day.html:114
#: exercises/templates/equipment/overview.html:59
#: exercises/templates/exercise/overview.html:63
-#: exercises/templates/muscles/overview.html:61
+#: exercises/templates/muscles/overview.html:65
msgid "Placeholder image for exercise"
msgstr "Egzersiz için yer tutucu resmi"
@@ -1116,22 +1116,22 @@ msgstr "Temsilciler"
msgid "RiR"
msgstr "RiR"
-#: core/templates/template.html:140
+#: core/templates/template.html:139
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:144
+#: core/templates/template.html:143
msgid "Create some demo entries"
msgstr "Bazı demo girişleri oluşturun"
-#: core/templates/template.html:176 core/templates/template_features.html:122
+#: core/templates/template.html:175 core/templates/template_features.html:121
#: core/templates/template_no_context.html:89 software/templates/tos.html:7
msgid "Terms of service"
msgstr "Kullanım Şartları"
-#: core/templates/template_features.html:62 software/templates/features.html:9
+#: core/templates/template_features.html:61 software/templates/features.html:9
#: software/templates/features.html:120
msgid "Features"
msgstr "Özellikleri"
@@ -1556,7 +1556,7 @@ msgstr "Birincil kaslar"
#: exercises/models/base.py:64 exercises/templates/equipment/overview.html:71
#: exercises/templates/exercise/overview.html:76
#: exercises/templates/exercise/view.html:268
-#: exercises/templates/muscles/overview.html:73
+#: exercises/templates/muscles/overview.html:77
msgid "Secondary muscles"
msgstr "İkincil kaslar"
@@ -1568,9 +1568,9 @@ msgstr "Varyasyonlar"
msgid "Exercise Categories"
msgstr "Egzersiz Kategorileri"
-#: exercises/models/comment.py:34 exercises/models/image.py:75
-#: exercises/models/video.py:82 manager/forms.py:165 manager/helpers.py:89
-#: manager/models/log.py:51
+#: exercises/models/comment.py:34 exercises/models/exercise_alias.py:32
+#: exercises/models/image.py:75 exercises/models/video.py:82
+#: manager/forms.py:165 manager/helpers.py:89 manager/models/log.py:51
msgid "Exercise"
msgstr "Egzersiz"
@@ -1596,6 +1596,12 @@ msgstr "Yeni kullanıcı gönderilen egzersiz"
msgid "The user {0} submitted a new exercise \"{1}\"."
msgstr "{0} kullanıcısı yeni bir \"{1}\" alıştırması gönderdi."
+#: exercises/models/exercise_alias.py:35
+#, fuzzy
+#| msgid "Correcting an exercise"
+msgid "Alias for an exercise"
+msgstr "Bir egzersizi düzeltme"
+
#: exercises/models/image.py:59
msgid "Line"
msgstr "Çizgi"
@@ -1656,6 +1662,16 @@ msgstr ""
msgid "In latin, e.g. \"Pectoralis major\""
msgstr "Latince, ör. \"Büyük pektoralis\""
+#: exercises/models/muscle.py:47
+#, fuzzy
+#| msgid "exercise name"
+msgid "Alternative name"
+msgstr "egzersiz adı"
+
+#: exercises/models/muscle.py:48
+msgid "A more basic name for the muscle"
+msgstr ""
+
#: exercises/models/video.py:41
msgid "Maximum file size is 100MB."
msgstr "Azami dosya boyutu 100MB'dir."
@@ -1716,7 +1732,7 @@ msgstr "Ekipmana genel bakış"
#: exercises/templates/equipment/overview.html:69
#: exercises/templates/exercise/overview.html:74
#: exercises/templates/exercise/view.html:264
-#: exercises/templates/muscles/overview.html:71
+#: exercises/templates/muscles/overview.html:75
msgid "Main muscles"
msgstr "Ana kaslar"
@@ -1741,7 +1757,7 @@ msgstr "egzersiz adı"
#: exercises/templates/equipment/overview.html:115
#: exercises/templates/exercise/overview.html:118
-#: exercises/templates/muscles/overview.html:114
+#: exercises/templates/muscles/overview.html:118
#: nutrition/templates/ingredient/overview.html:85
msgid "Only registered users can do this"
msgstr "Bunu sadece kayıtlı kullanıcılar yapabilir"
@@ -1936,7 +1952,7 @@ msgstr "Kaslara genel bakış"
msgid "Add muscle"
msgstr "Kas ekleyin"
-#: exercises/templates/muscles/overview.html:81
+#: exercises/templates/muscles/overview.html:85
msgid ""
"No exercises for this muscle. Add or edit an exercise and set the muscle."
msgstr ""
@@ -2320,7 +2336,7 @@ msgstr "Spor salonuna kullanıcı ekle"
msgid "Edit gym"
msgstr "Spor salonunu düzenle"
-#: i18n.tpl:2
+#: i18n.tpl:2 i18n.tpl:28
msgid "Abs"
msgstr "Karın Kasları"
@@ -2332,11 +2348,11 @@ msgstr "Kollar"
msgid "Back"
msgstr "Sırt"
-#: i18n.tpl:5
+#: i18n.tpl:5 i18n.tpl:23
msgid "Calves"
msgstr "Baldırlar"
-#: i18n.tpl:6
+#: i18n.tpl:6 i18n.tpl:26
msgid "Chest"
msgstr "Göğüs"
@@ -2344,7 +2360,7 @@ msgstr "Göğüs"
msgid "Legs"
msgstr "Bacaklar"
-#: i18n.tpl:8
+#: i18n.tpl:8 i18n.tpl:19
msgid "Shoulders"
msgstr "Omuzlar"
@@ -2373,107 +2389,77 @@ msgid "Kettlebell"
msgstr "Kettlebell"
#: i18n.tpl:15
-msgid "none (bodyweight exercise)"
-msgstr "yok (vücut ağırlığı egzersizi)"
-
-#: i18n.tpl:16
msgid "Pull-up bar"
msgstr "Barfiks çubuğu"
+#: i18n.tpl:16
+msgid "SZ-Bar"
+msgstr "SZ-Bar"
+
#: i18n.tpl:17
msgid "Swiss Ball"
msgstr "Egzersiz Topu"
#: i18n.tpl:18
-msgid "SZ-Bar"
-msgstr "SZ-Bar"
-
-#: i18n.tpl:19
-msgid "Anterior deltoid"
-msgstr "Ön deltoid"
+msgid "none (bodyweight exercise)"
+msgstr "yok (vücut ağırlığı egzersizi)"
#: i18n.tpl:20
-msgid "Biceps brachii"
+#, fuzzy
+#| msgid "Biceps brachii"
+msgid "Biceps"
msgstr "Biceps brachii"
#: i18n.tpl:21
-msgid "Biceps femoris"
-msgstr "Biceps femoris"
+msgid "Hamstrings"
+msgstr ""
#: i18n.tpl:22
-msgid "Brachialis"
-msgstr "Brachialis"
-
-#: i18n.tpl:23
-msgid "Gastrocnemius"
-msgstr "Gastroknemi"
+msgid "Lower back"
+msgstr ""
#: i18n.tpl:24
-msgid "Gluteus maximus"
-msgstr "Gluteus maximus"
+#, fuzzy
+#| msgid "Minutes"
+msgid "Glutes"
+msgstr "Dakika"
#: i18n.tpl:25
-msgid "Latissimus dorsi"
-msgstr "Latissimus dorsi"
-
-#: i18n.tpl:26
-msgid "Obliquus externus abdominis"
-msgstr "Obliquus externus abdominis"
+msgid "Lats"
+msgstr ""
#: i18n.tpl:27
-msgid "Pectoralis major"
-msgstr "Büyük pektoralis"
-
-#: i18n.tpl:28
-msgid "Quadriceps femoris"
-msgstr "Kuadriseps femoris"
+msgid "Quads"
+msgstr ""
#: i18n.tpl:29
-msgid "Rectus abdominis"
-msgstr "Rektus abdominis"
-
-#: i18n.tpl:30
-msgid "Serratus anterior"
-msgstr "Serratus anterior"
-
-#: i18n.tpl:31
-msgid "Soleus"
-msgstr "Soleus"
-
-#: i18n.tpl:32
-msgid "Trapezius"
-msgstr "Trapezius"
-
-#: i18n.tpl:33
-msgid "Triceps brachii"
+#, fuzzy
+#| msgid "Triceps brachii"
+msgid "Triceps"
msgstr "Triceps brachii"
-#: i18n.tpl:34
+#: i18n.tpl:30
msgid "Kilometers"
msgstr "Kilometre"
-#: i18n.tpl:35
-msgid "Max Reps"
-msgstr "Azami Tekrar Sayısı"
-
-#: i18n.tpl:36
+#: i18n.tpl:31
msgid "Miles"
msgstr "Mil"
-#: i18n.tpl:37
+#: i18n.tpl:32
msgid "Minutes"
msgstr "Dakika"
-#: i18n.tpl:38 manager/forms.py:169 manager/models/log.py:71
+#: i18n.tpl:33 manager/forms.py:169 manager/models/log.py:71
#: manager/templates/set/add.html:53
msgid "Repetitions"
msgstr "Tekrarlar"
-#: i18n.tpl:39
+#: i18n.tpl:34
msgid "Seconds"
msgstr "Saniye"
-#: i18n.tpl:40
+#: i18n.tpl:35
msgid "Until Failure"
msgstr "Başarısızlığa Kadar"
@@ -4159,6 +4145,48 @@ msgstr "Başarıyla silindi."
msgid "Delete weight entry for the %s"
msgstr "%s için ağırlık girişini silin"
+#~ msgid "Anterior deltoid"
+#~ msgstr "Ön deltoid"
+
+#~ msgid "Biceps femoris"
+#~ msgstr "Biceps femoris"
+
+#~ msgid "Brachialis"
+#~ msgstr "Brachialis"
+
+#~ msgid "Gastrocnemius"
+#~ msgstr "Gastroknemi"
+
+#~ msgid "Gluteus maximus"
+#~ msgstr "Gluteus maximus"
+
+#~ msgid "Latissimus dorsi"
+#~ msgstr "Latissimus dorsi"
+
+#~ msgid "Obliquus externus abdominis"
+#~ msgstr "Obliquus externus abdominis"
+
+#~ msgid "Pectoralis major"
+#~ msgstr "Büyük pektoralis"
+
+#~ msgid "Quadriceps femoris"
+#~ msgstr "Kuadriseps femoris"
+
+#~ msgid "Rectus abdominis"
+#~ msgstr "Rektus abdominis"
+
+#~ msgid "Serratus anterior"
+#~ msgstr "Serratus anterior"
+
+#~ msgid "Soleus"
+#~ msgstr "Soleus"
+
+#~ msgid "Trapezius"
+#~ msgstr "Trapezius"
+
+#~ msgid "Max Reps"
+#~ msgstr "Azami Tekrar Sayısı"
+
#~ msgid "Your current weight is: "
#~ msgstr "Şu anki kilonuz: "
diff --git a/wger/locale/uk/LC_MESSAGES/django.mo b/wger/locale/uk/LC_MESSAGES/django.mo
index 403f92331..4a6fae9d6 100644
Binary files a/wger/locale/uk/LC_MESSAGES/django.mo and b/wger/locale/uk/LC_MESSAGES/django.mo differ
diff --git a/wger/locale/uk/LC_MESSAGES/django.po b/wger/locale/uk/LC_MESSAGES/django.po
index 3dbd94567..702a2df75 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: 2022-02-15 14:51+0100\n"
+"POT-Creation-Date: 2022-05-14 12:01+0200\n"
"PO-Revision-Date: 2022-05-09 10:18+0000\n"
"Last-Translator: Artem <[email protected]>\n"
"Language-Team: Ukrainian <https://hosted.weblate.org/projects/wger/web/uk/>\n"
@@ -20,10 +20,10 @@ 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 4.12.1\n"
#: config/models/gym_config.py:46 gym/templates/gym/list.html:50
@@ -49,7 +49,7 @@ msgstr "Вправи"
msgid "Ingredients"
msgstr "Інгредієнти"
-#: config/templates/language/overview.html:4 core/templates/navigation.html:228
+#: config/templates/language/overview.html:4 core/templates/navigation.html:226
msgid "Languages"
msgstr "Мови"
@@ -225,8 +225,8 @@ msgstr "Моя класна програграма тренувань"
msgid "Empty placeholder schedule"
msgstr "Порожня програма-заповнювач"
-#: core/forms.py:61 core/templates/navigation.html:190
-#: core/templates/navigation.html:194 core/templates/user/login.html:4
+#: core/forms.py:61 core/templates/navigation.html:188
+#: core/templates/navigation.html:192 core/templates/user/login.html:4
#: software/templates/features.html:43
msgid "Login"
msgstr "Вхід"
@@ -303,8 +303,8 @@ msgstr "Неправильний пароль"
msgid "The form is secured with reCAPTCHA"
msgstr "Форма захищена reCAPTCHA"
-#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:190
-#: core/templates/navigation.html:195 core/templates/template.html:150
+#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:188
+#: core/templates/navigation.html:193 core/templates/template.html:149
#: core/templates/user/login.html:20 core/views/user.py:293
#: software/templates/features.html:38
msgid "Register"
@@ -626,7 +626,7 @@ msgstr ""
#: core/templates/index.html:33 core/templates/index.html:73
#: core/templates/misc/fragments/shariff_modal.html:29
-#: core/templates/template.html:125 manager/templates/calendar/month.html:138
+#: core/templates/template.html:124 manager/templates/calendar/month.html:138
#: manager/templates/schedule/view.html:246
#: manager/templates/schedule/view.html:266
#: manager/templates/workout/view.html:132
@@ -763,7 +763,7 @@ msgstr "Немає планів харчування."
msgid "Weight"
msgstr "Вага"
-#: core/templates/index.html:210 core/templates/navigation.html:97
+#: core/templates/index.html:210 core/templates/navigation.html:135
#: weight/views.py:70
msgid "Add weight entry"
msgstr "Додати запис ваги"
@@ -795,8 +795,8 @@ msgstr "Список ліцензій"
msgid "Nothing found"
msgstr "Нічого не знайдено"
-#: core/templates/misc/about.html:4 core/templates/template.html:175
-#: core/templates/template_features.html:118
+#: core/templates/misc/about.html:4 core/templates/template.html:174
+#: core/templates/template_features.html:117
#: core/templates/template_no_context.html:88
msgid "Imprint"
msgstr "Відбиток"
@@ -882,13 +882,13 @@ msgstr "за інвентарем"
#: exercises/templates/equipment/overview.html:113
#: exercises/templates/exercise/overview.html:112
#: exercises/templates/exercise/overview.html:116
-#: exercises/templates/muscles/overview.html:108
#: exercises/templates/muscles/overview.html:112
+#: exercises/templates/muscles/overview.html:116
msgid "Add new exercise"
msgstr "Додати нову вправу"
-#: core/templates/navigation.html:75 core/templates/navigation.html:134
-#: core/templates/navigation.html:226
+#: core/templates/navigation.html:75 core/templates/navigation.html:116
+#: core/templates/navigation.html:224
msgid "Administration"
msgstr "Адміністрація"
@@ -911,106 +911,106 @@ msgstr "М'язи"
msgid "Categories"
msgstr "Категорії"
-#: core/templates/navigation.html:94
-msgid "Body weight"
-msgstr "Вага тіла"
-
-#: core/templates/navigation.html:96 core/templates/user/overview.html:114
-#: weight/templates/overview.html:7
-msgid "Weight overview"
-msgstr "Огляд ваги"
-
-#: core/templates/navigation.html:111 software/templates/features.html:87
+#: core/templates/navigation.html:93 software/templates/features.html:87
msgid "Nutrition"
msgstr "Харчування"
-#: core/templates/navigation.html:117 core/templates/user/overview.html:144
+#: core/templates/navigation.html:99 core/templates/user/overview.html:144
msgid "Nutrition plans"
msgstr "Плани харчування"
-#: core/templates/navigation.html:123 nutrition/templates/bmi/form.html:50
+#: core/templates/navigation.html:105 nutrition/templates/bmi/form.html:50
msgid "BMI calculator"
msgstr "Калькулятор індексу маси тіла"
-#: core/templates/navigation.html:129 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:111 nutrition/templates/rate/form.html:17
msgid "Daily calories calculator"
msgstr "Калькулятор щоденних калорій"
-#: core/templates/navigation.html:131
+#: core/templates/navigation.html:113
#: nutrition/templates/ingredient/overview.html:29
msgid "Ingredient overview"
msgstr "Огляд інгредієнтів"
-#: core/templates/navigation.html:135 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:117 nutrition/templates/units/list.html:6
msgid "Ingredient weight units"
msgstr "Одиниці ваги інгредієнтів"
-#: core/templates/navigation.html:136
+#: core/templates/navigation.html:118
#: nutrition/templates/ingredient/pending.html:6
msgid "Ingredients pending review"
msgstr "Інгредієнти, що очікують розгляду"
-#: core/templates/navigation.html:149
+#: core/templates/navigation.html:132
+msgid "Body weight"
+msgstr "Вага тіла"
+
+#: core/templates/navigation.html:134 core/templates/user/overview.html:114
+#: weight/templates/overview.html:7
+msgid "Weight overview"
+msgstr "Огляд ваги"
+
+#: core/templates/navigation.html:147
msgid "About this software"
msgstr "Про це програмне забезпечення"
-#: core/templates/navigation.html:151 core/templates/template_features.html:83
+#: core/templates/navigation.html:149 core/templates/template_features.html:82
#: software/templates/about_us.html:5
msgid "About us"
msgstr "Про нас"
-#: core/templates/navigation.html:153 software/templates/features.html:209
+#: core/templates/navigation.html:151 software/templates/features.html:209
msgid "REST API"
msgstr "REST API"
-#: core/templates/navigation.html:157 utils/models.py:40
+#: core/templates/navigation.html:155 utils/models.py:40
msgid "License"
msgstr "Ліцензія"
-#: core/templates/navigation.html:163
+#: core/templates/navigation.html:161
msgid "Developer documentation"
msgstr "Документація для розробників"
-#: core/templates/navigation.html:169
+#: core/templates/navigation.html:167
msgid "Get the code"
msgstr "Отримати код"
-#: core/templates/navigation.html:175 core/templates/template.html:205
-#: core/templates/template_features.html:100
+#: core/templates/navigation.html:173 core/templates/template.html:204
+#: core/templates/template_features.html:99
msgid "Translate"
msgstr "Перекласти"
-#: core/templates/navigation.html:196 core/templates/user/login.html:28
+#: core/templates/navigation.html:194 core/templates/user/login.html:28
msgid "Reset password"
msgstr "Скинути пароль"
-#: core/templates/navigation.html:209
+#: core/templates/navigation.html:207
msgid "My preferences"
msgstr "Мої налаштування"
-#: core/templates/navigation.html:216
+#: core/templates/navigation.html:214
msgid "Logout"
msgstr "Вийти"
-#: core/templates/navigation.html:231
+#: core/templates/navigation.html:229
msgid "Licenses"
msgstr "Ліцензії"
-#: core/templates/navigation.html:234
+#: core/templates/navigation.html:232
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr "Одиниці повторень"
-#: core/templates/navigation.html:237 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:235 core/templates/weight_unit/list.html:4
#: nutrition/templates/ingredient/view.html:174
msgid "Weight units"
msgstr "Одиниця ваги"
-#: core/templates/navigation.html:240 core/templates/user/list.html:4
+#: core/templates/navigation.html:238 core/templates/user/list.html:4
msgid "User list"
msgstr "Список користувачів"
-#: core/templates/navigation.html:241
+#: core/templates/navigation.html:239
msgid "Gyms"
msgstr "Тренажерні зали"
@@ -1092,7 +1092,7 @@ msgstr "Додати журнал ваги"
#: core/templates/tags/render_day.html:114
#: exercises/templates/equipment/overview.html:59
#: exercises/templates/exercise/overview.html:63
-#: exercises/templates/muscles/overview.html:61
+#: exercises/templates/muscles/overview.html:65
msgid "Placeholder image for exercise"
msgstr "Заповнювач зображення для вправи"
@@ -1119,23 +1119,23 @@ msgstr "Повтори"
msgid "RiR"
msgstr "Повторів можете зробити"
-#: core/templates/template.html:140
+#: core/templates/template.html:139
msgid ""
"You are using a guest account, data entered will be deleted after a week."
msgstr ""
"Ви використовуєте обліковий запис гостя, введені дані будуть видалені через "
"тиждень."
-#: core/templates/template.html:144
+#: core/templates/template.html:143
msgid "Create some demo entries"
msgstr "Створіть деякі демонстраційні записи"
-#: core/templates/template.html:176 core/templates/template_features.html:122
+#: core/templates/template.html:175 core/templates/template_features.html:121
#: core/templates/template_no_context.html:89 software/templates/tos.html:7
msgid "Terms of service"
msgstr "Умови надання послуг"
-#: core/templates/template_features.html:62 software/templates/features.html:9
+#: core/templates/template_features.html:61 software/templates/features.html:9
#: software/templates/features.html:120
msgid "Features"
msgstr "Особливості"
@@ -1559,7 +1559,7 @@ msgstr "Основні м'язи"
#: exercises/models/base.py:64 exercises/templates/equipment/overview.html:71
#: exercises/templates/exercise/overview.html:76
#: exercises/templates/exercise/view.html:268
-#: exercises/templates/muscles/overview.html:73
+#: exercises/templates/muscles/overview.html:77
msgid "Secondary muscles"
msgstr "Другорядні м'язи"
@@ -1571,9 +1571,9 @@ msgstr "Варіації"
msgid "Exercise Categories"
msgstr "Категорії вправ"
-#: exercises/models/comment.py:34 exercises/models/image.py:75
-#: exercises/models/video.py:82 manager/forms.py:165 manager/helpers.py:89
-#: manager/models/log.py:51
+#: exercises/models/comment.py:34 exercises/models/exercise_alias.py:32
+#: exercises/models/image.py:75 exercises/models/video.py:82
+#: manager/forms.py:165 manager/helpers.py:89 manager/models/log.py:51
msgid "Exercise"
msgstr "Вправа"
@@ -1599,6 +1599,12 @@ msgstr "Нова вправа надіслана користувачем"
msgid "The user {0} submitted a new exercise \"{1}\"."
msgstr "Користувач {0} подав нову вправу \"{1}\"."
+#: exercises/models/exercise_alias.py:35
+#, fuzzy
+#| msgid "Correcting an exercise"
+msgid "Alias for an exercise"
+msgstr "Виправлення вправи"
+
#: exercises/models/image.py:59
msgid "Line"
msgstr "Лінія"
@@ -1658,6 +1664,16 @@ msgstr "Користувач {0} подав нове зображення \"{1}\
msgid "In latin, e.g. \"Pectoralis major\""
msgstr "На латині, напр. \"Pectoralis major\""
+#: exercises/models/muscle.py:47
+#, fuzzy
+#| msgid "exercise name"
+msgid "Alternative name"
+msgstr "назва вправи"
+
+#: exercises/models/muscle.py:48
+msgid "A more basic name for the muscle"
+msgstr ""
+
#: exercises/models/video.py:41
msgid "Maximum file size is 100MB."
msgstr "Максимальний розмір файлу - 100 МБ."
@@ -1718,7 +1734,7 @@ msgstr "Огляд обладнання"
#: exercises/templates/equipment/overview.html:69
#: exercises/templates/exercise/overview.html:74
#: exercises/templates/exercise/view.html:264
-#: exercises/templates/muscles/overview.html:71
+#: exercises/templates/muscles/overview.html:75
msgid "Main muscles"
msgstr "Основні м'язи"
@@ -1743,7 +1759,7 @@ msgstr "назва вправи"
#: exercises/templates/equipment/overview.html:115
#: exercises/templates/exercise/overview.html:118
-#: exercises/templates/muscles/overview.html:114
+#: exercises/templates/muscles/overview.html:118
#: nutrition/templates/ingredient/overview.html:85
msgid "Only registered users can do this"
msgstr "Це можуть робити лише зареєстровані користувачі"
@@ -1937,7 +1953,7 @@ msgstr "Огляд м'язів"
msgid "Add muscle"
msgstr "Додати м'язи"
-#: exercises/templates/muscles/overview.html:81
+#: exercises/templates/muscles/overview.html:85
msgid ""
"No exercises for this muscle. Add or edit an exercise and set the muscle."
msgstr ""
@@ -2314,7 +2330,7 @@ msgstr "Додати користувача до залу"
msgid "Edit gym"
msgstr "Редагувати тренажерний зал"
-#: i18n.tpl:2
+#: i18n.tpl:2 i18n.tpl:28
msgid "Abs"
msgstr "Прес"
@@ -2326,11 +2342,11 @@ msgstr "Руки"
msgid "Back"
msgstr "Спина"
-#: i18n.tpl:5
+#: i18n.tpl:5 i18n.tpl:23
msgid "Calves"
msgstr "Литки"
-#: i18n.tpl:6
+#: i18n.tpl:6 i18n.tpl:26
msgid "Chest"
msgstr "Груди"
@@ -2338,7 +2354,7 @@ msgstr "Груди"
msgid "Legs"
msgstr "Ноги"
-#: i18n.tpl:8
+#: i18n.tpl:8 i18n.tpl:19
msgid "Shoulders"
msgstr "Плечі"
@@ -2367,107 +2383,77 @@ msgid "Kettlebell"
msgstr "Гирі"
#: i18n.tpl:15
-msgid "none (bodyweight exercise)"
-msgstr "немає (вправа з вагою тіла)"
-
-#: i18n.tpl:16
msgid "Pull-up bar"
msgstr "Перекладина"
+#: i18n.tpl:16
+msgid "SZ-Bar"
+msgstr "SZ-Штанга"
+
#: i18n.tpl:17
msgid "Swiss Ball"
msgstr "Фітбол"
#: i18n.tpl:18
-msgid "SZ-Bar"
-msgstr "SZ-Штанга"
-
-#: i18n.tpl:19
-msgid "Anterior deltoid"
-msgstr "Дельтоподібний м'яз"
+msgid "none (bodyweight exercise)"
+msgstr "немає (вправа з вагою тіла)"
#: i18n.tpl:20
-msgid "Biceps brachii"
+#, fuzzy
+#| msgid "Biceps brachii"
+msgid "Biceps"
msgstr "Біцепс"
#: i18n.tpl:21
-msgid "Biceps femoris"
-msgstr "Двоголовий м’яз стегна"
+msgid "Hamstrings"
+msgstr ""
#: i18n.tpl:22
-msgid "Brachialis"
-msgstr "Плечовий м'яз"
-
-#: i18n.tpl:23
-msgid "Gastrocnemius"
-msgstr "Литковий м'яз"
+msgid "Lower back"
+msgstr ""
#: i18n.tpl:24
-msgid "Gluteus maximus"
-msgstr "Великий сiдничний м’яз"
+#, fuzzy
+#| msgid "Minutes"
+msgid "Glutes"
+msgstr "Хвилини"
#: i18n.tpl:25
-msgid "Latissimus dorsi"
-msgstr "Найширший м'яз спини"
-
-#: i18n.tpl:26
-msgid "Obliquus externus abdominis"
-msgstr "Зовнiшнiй косий м’яз живота"
+msgid "Lats"
+msgstr ""
#: i18n.tpl:27
-msgid "Pectoralis major"
-msgstr "Великий грудний м’яз"
-
-#: i18n.tpl:28
-msgid "Quadriceps femoris"
-msgstr "Чотириголовий м’яз стегна"
+msgid "Quads"
+msgstr ""
#: i18n.tpl:29
-msgid "Rectus abdominis"
-msgstr "Прямий м’яз живота"
-
-#: i18n.tpl:30
-msgid "Serratus anterior"
-msgstr "Передній зубчастий м’яз"
-
-#: i18n.tpl:31
-msgid "Soleus"
-msgstr "Камбалоподібний м'яз"
-
-#: i18n.tpl:32
-msgid "Trapezius"
-msgstr "Трапеція"
-
-#: i18n.tpl:33
-msgid "Triceps brachii"
+#, fuzzy
+#| msgid "Triceps brachii"
+msgid "Triceps"
msgstr "Трицепс"
-#: i18n.tpl:34
+#: i18n.tpl:30
msgid "Kilometers"
msgstr "Кілометри"
-#: i18n.tpl:35
-msgid "Max Reps"
-msgstr "Макс. Повтор"
-
-#: i18n.tpl:36
+#: i18n.tpl:31
msgid "Miles"
msgstr "Милі"
-#: i18n.tpl:37
+#: i18n.tpl:32
msgid "Minutes"
msgstr "Хвилини"
-#: i18n.tpl:38 manager/forms.py:169 manager/models/log.py:71
+#: i18n.tpl:33 manager/forms.py:169 manager/models/log.py:71
#: manager/templates/set/add.html:53
msgid "Repetitions"
msgstr "Повтори"
-#: i18n.tpl:39
+#: i18n.tpl:34
msgid "Seconds"
msgstr "Секунди"
-#: i18n.tpl:40
+#: i18n.tpl:35
msgid "Until Failure"
msgstr "До відмови"
@@ -4157,6 +4143,48 @@ msgstr "Успішно видалено."
msgid "Delete weight entry for the %s"
msgstr "Видалити запис ваги для %s"
+#~ msgid "Anterior deltoid"
+#~ msgstr "Дельтоподібний м'яз"
+
+#~ msgid "Biceps femoris"
+#~ msgstr "Двоголовий м’яз стегна"
+
+#~ msgid "Brachialis"
+#~ msgstr "Плечовий м'яз"
+
+#~ msgid "Gastrocnemius"
+#~ msgstr "Литковий м'яз"
+
+#~ msgid "Gluteus maximus"
+#~ msgstr "Великий сiдничний м’яз"
+
+#~ msgid "Latissimus dorsi"
+#~ msgstr "Найширший м'яз спини"
+
+#~ msgid "Obliquus externus abdominis"
+#~ msgstr "Зовнiшнiй косий м’яз живота"
+
+#~ msgid "Pectoralis major"
+#~ msgstr "Великий грудний м’яз"
+
+#~ msgid "Quadriceps femoris"
+#~ msgstr "Чотириголовий м’яз стегна"
+
+#~ msgid "Rectus abdominis"
+#~ msgstr "Прямий м’яз живота"
+
+#~ msgid "Serratus anterior"
+#~ msgstr "Передній зубчастий м’яз"
+
+#~ msgid "Soleus"
+#~ msgstr "Камбалоподібний м'яз"
+
+#~ msgid "Trapezius"
+#~ msgstr "Трапеція"
+
+#~ msgid "Max Reps"
+#~ msgstr "Макс. Повтор"
+
#~ msgid "Your current weight is: "
#~ msgstr "Ваша поточна вага: "
diff --git a/wger/locale/zh_CN/LC_MESSAGES/django.po b/wger/locale/zh_CN/LC_MESSAGES/django.po
index bc520ea94..28ecd07dd 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: 2022-02-15 14:51+0100\n"
+"POT-Creation-Date: 2022-05-14 12:01+0200\n"
"PO-Revision-Date: 2022-02-25 20:58+0000\n"
"Last-Translator: Jing <[email protected]>\n"
"Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/"
@@ -48,7 +48,7 @@ msgstr "练习"
msgid "Ingredients"
msgstr "食谱"
-#: config/templates/language/overview.html:4 core/templates/navigation.html:228
+#: config/templates/language/overview.html:4 core/templates/navigation.html:226
msgid "Languages"
msgstr "语言"
@@ -224,8 +224,8 @@ msgstr "我酷酷的健身日程"
msgid "Empty placeholder schedule"
msgstr "空的时间表"
-#: core/forms.py:61 core/templates/navigation.html:190
-#: core/templates/navigation.html:194 core/templates/user/login.html:4
+#: core/forms.py:61 core/templates/navigation.html:188
+#: core/templates/navigation.html:192 core/templates/user/login.html:4
#: software/templates/features.html:43
msgid "Login"
msgstr "登录"
@@ -298,8 +298,8 @@ msgstr "密码无效"
msgid "The form is secured with reCAPTCHA"
msgstr "该表格由 reCAPTCHA 保护"
-#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:190
-#: core/templates/navigation.html:195 core/templates/template.html:150
+#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:188
+#: core/templates/navigation.html:193 core/templates/template.html:149
#: core/templates/user/login.html:20 core/views/user.py:293
#: software/templates/features.html:38
msgid "Register"
@@ -616,7 +616,7 @@ msgstr ""
#: core/templates/index.html:33 core/templates/index.html:73
#: core/templates/misc/fragments/shariff_modal.html:29
-#: core/templates/template.html:125 manager/templates/calendar/month.html:138
+#: core/templates/template.html:124 manager/templates/calendar/month.html:138
#: manager/templates/schedule/view.html:246
#: manager/templates/schedule/view.html:266
#: manager/templates/workout/view.html:132
@@ -751,7 +751,7 @@ msgstr "没有健身计划."
msgid "Weight"
msgstr "体重"
-#: core/templates/index.html:210 core/templates/navigation.html:97
+#: core/templates/index.html:210 core/templates/navigation.html:135
#: weight/views.py:70
msgid "Add weight entry"
msgstr "新增体重记录"
@@ -783,8 +783,8 @@ msgstr "许可协议列表"
msgid "Nothing found"
msgstr "没有找到任何内容"
-#: core/templates/misc/about.html:4 core/templates/template.html:175
-#: core/templates/template_features.html:118
+#: core/templates/misc/about.html:4 core/templates/template.html:174
+#: core/templates/template_features.html:117
#: core/templates/template_no_context.html:88
msgid "Imprint"
msgstr ""
@@ -868,13 +868,13 @@ msgstr "按器械"
#: exercises/templates/equipment/overview.html:113
#: exercises/templates/exercise/overview.html:112
#: exercises/templates/exercise/overview.html:116
-#: exercises/templates/muscles/overview.html:108
#: exercises/templates/muscles/overview.html:112
+#: exercises/templates/muscles/overview.html:116
msgid "Add new exercise"
msgstr "新增健身项目"
-#: core/templates/navigation.html:75 core/templates/navigation.html:134
-#: core/templates/navigation.html:226
+#: core/templates/navigation.html:75 core/templates/navigation.html:116
+#: core/templates/navigation.html:224
msgid "Administration"
msgstr "管理"
@@ -897,106 +897,106 @@ msgstr "肌肉"
msgid "Categories"
msgstr "类别"
-#: core/templates/navigation.html:94
-msgid "Body weight"
-msgstr "体重"
-
-#: core/templates/navigation.html:96 core/templates/user/overview.html:114
-#: weight/templates/overview.html:7
-msgid "Weight overview"
-msgstr "体重总览"
-
-#: core/templates/navigation.html:111 software/templates/features.html:87
+#: core/templates/navigation.html:93 software/templates/features.html:87
msgid "Nutrition"
msgstr "营养"
-#: core/templates/navigation.html:117 core/templates/user/overview.html:144
+#: core/templates/navigation.html:99 core/templates/user/overview.html:144
msgid "Nutrition plans"
msgstr "营养计划"
-#: core/templates/navigation.html:123 nutrition/templates/bmi/form.html:50
+#: core/templates/navigation.html:105 nutrition/templates/bmi/form.html:50
msgid "BMI calculator"
msgstr "体重指数计算器"
-#: core/templates/navigation.html:129 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:111 nutrition/templates/rate/form.html:17
msgid "Daily calories calculator"
msgstr "每日卡路里计算器"
-#: core/templates/navigation.html:131
+#: core/templates/navigation.html:113
#: nutrition/templates/ingredient/overview.html:29
msgid "Ingredient overview"
msgstr "食谱总览"
-#: core/templates/navigation.html:135 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:117 nutrition/templates/units/list.html:6
msgid "Ingredient weight units"
msgstr "食谱计量单位"
-#: core/templates/navigation.html:136
+#: core/templates/navigation.html:118
#: nutrition/templates/ingredient/pending.html:6
msgid "Ingredients pending review"
msgstr "食谱审核"
-#: core/templates/navigation.html:149
+#: core/templates/navigation.html:132
+msgid "Body weight"
+msgstr "体重"
+
+#: core/templates/navigation.html:134 core/templates/user/overview.html:114
+#: weight/templates/overview.html:7
+msgid "Weight overview"
+msgstr "体重总览"
+
+#: core/templates/navigation.html:147
msgid "About this software"
msgstr "关于软件"
-#: core/templates/navigation.html:151 core/templates/template_features.html:83
+#: core/templates/navigation.html:149 core/templates/template_features.html:82
#: software/templates/about_us.html:5
msgid "About us"
msgstr "关于我们"
-#: core/templates/navigation.html:153 software/templates/features.html:209
+#: core/templates/navigation.html:151 software/templates/features.html:209
msgid "REST API"
msgstr "REST API"
-#: core/templates/navigation.html:157 utils/models.py:40
+#: core/templates/navigation.html:155 utils/models.py:40
msgid "License"
msgstr "许可协议"
-#: core/templates/navigation.html:163
+#: core/templates/navigation.html:161
msgid "Developer documentation"
msgstr "开发者文档"
-#: core/templates/navigation.html:169
+#: core/templates/navigation.html:167
msgid "Get the code"
msgstr "获取源码"
-#: core/templates/navigation.html:175 core/templates/template.html:205
-#: core/templates/template_features.html:100
+#: core/templates/navigation.html:173 core/templates/template.html:204
+#: core/templates/template_features.html:99
msgid "Translate"
msgstr "翻译"
-#: core/templates/navigation.html:196 core/templates/user/login.html:28
+#: core/templates/navigation.html:194 core/templates/user/login.html:28
msgid "Reset password"
msgstr "重设密码"
-#: core/templates/navigation.html:209
+#: core/templates/navigation.html:207
msgid "My preferences"
msgstr "我的首选项"
-#: core/templates/navigation.html:216
+#: core/templates/navigation.html:214
msgid "Logout"
msgstr "退出"
-#: core/templates/navigation.html:231
+#: core/templates/navigation.html:229
msgid "Licenses"
msgstr "许可协议"
-#: core/templates/navigation.html:234
+#: core/templates/navigation.html:232
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr "重复单元"
-#: core/templates/navigation.html:237 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:235 core/templates/weight_unit/list.html:4
#: nutrition/templates/ingredient/view.html:174
msgid "Weight units"
msgstr "重量单位"
-#: core/templates/navigation.html:240 core/templates/user/list.html:4
+#: core/templates/navigation.html:238 core/templates/user/list.html:4
msgid "User list"
msgstr "用户列表"
-#: core/templates/navigation.html:241
+#: core/templates/navigation.html:239
msgid "Gyms"
msgstr "健身房"
@@ -1076,7 +1076,7 @@ msgstr "新增体重记录"
#: core/templates/tags/render_day.html:114
#: exercises/templates/equipment/overview.html:59
#: exercises/templates/exercise/overview.html:63
-#: exercises/templates/muscles/overview.html:61
+#: exercises/templates/muscles/overview.html:65
msgid "Placeholder image for exercise"
msgstr "健身图片占位符"
@@ -1103,21 +1103,21 @@ msgstr "重复次数"
msgid "RiR"
msgstr "力竭之前的剩余次数"
-#: core/templates/template.html:140
+#: core/templates/template.html:139
msgid ""
"You are using a guest account, data entered will be deleted after a week."
msgstr "你正在以访客模式浏览,输入的数据会在一周后删除."
-#: core/templates/template.html:144
+#: core/templates/template.html:143
msgid "Create some demo entries"
msgstr "创建一些示例项"
-#: core/templates/template.html:176 core/templates/template_features.html:122
+#: core/templates/template.html:175 core/templates/template_features.html:121
#: core/templates/template_no_context.html:89 software/templates/tos.html:7
msgid "Terms of service"
msgstr "服务条款"
-#: core/templates/template_features.html:62 software/templates/features.html:9
+#: core/templates/template_features.html:61 software/templates/features.html:9
#: software/templates/features.html:120
msgid "Features"
msgstr "特色"
@@ -1537,7 +1537,7 @@ msgstr "主要训练肌肉"
#: exercises/models/base.py:64 exercises/templates/equipment/overview.html:71
#: exercises/templates/exercise/overview.html:76
#: exercises/templates/exercise/view.html:268
-#: exercises/templates/muscles/overview.html:73
+#: exercises/templates/muscles/overview.html:77
msgid "Secondary muscles"
msgstr "次要肌肉"
@@ -1549,9 +1549,9 @@ msgstr "变体"
msgid "Exercise Categories"
msgstr "训练类别"
-#: exercises/models/comment.py:34 exercises/models/image.py:75
-#: exercises/models/video.py:82 manager/forms.py:165 manager/helpers.py:89
-#: manager/models/log.py:51
+#: exercises/models/comment.py:34 exercises/models/exercise_alias.py:32
+#: exercises/models/image.py:75 exercises/models/video.py:82
+#: manager/forms.py:165 manager/helpers.py:89 manager/models/log.py:51
msgid "Exercise"
msgstr "训练"
@@ -1577,6 +1577,12 @@ msgstr "新用户提交锻炼动作"
msgid "The user {0} submitted a new exercise \"{1}\"."
msgstr "用户{0}提交了一次新训练“{1}”."
+#: exercises/models/exercise_alias.py:35
+#, fuzzy
+#| msgid "Correcting an exercise"
+msgid "Alias for an exercise"
+msgstr "修正健身项目中"
+
#: exercises/models/image.py:59
msgid "Line"
msgstr "线条"
@@ -1635,6 +1641,16 @@ msgstr "用户{0}为健身项目{2}提交了一个新图片\"{1}\"."
msgid "In latin, e.g. \"Pectoralis major\""
msgstr ""
+#: exercises/models/muscle.py:47
+#, fuzzy
+#| msgid "exercise name"
+msgid "Alternative name"
+msgstr "健身项目名称"
+
+#: exercises/models/muscle.py:48
+msgid "A more basic name for the muscle"
+msgstr ""
+
#: exercises/models/video.py:41
msgid "Maximum file size is 100MB."
msgstr ""
@@ -1695,7 +1711,7 @@ msgstr "器材总览"
#: exercises/templates/equipment/overview.html:69
#: exercises/templates/exercise/overview.html:74
#: exercises/templates/exercise/view.html:264
-#: exercises/templates/muscles/overview.html:71
+#: exercises/templates/muscles/overview.html:75
msgid "Main muscles"
msgstr "主要肌肉"
@@ -1718,7 +1734,7 @@ msgstr "健身项目名称"
#: exercises/templates/equipment/overview.html:115
#: exercises/templates/exercise/overview.html:118
-#: exercises/templates/muscles/overview.html:114
+#: exercises/templates/muscles/overview.html:118
#: nutrition/templates/ingredient/overview.html:85
msgid "Only registered users can do this"
msgstr "只有注册用户才可以操作"
@@ -1903,7 +1919,7 @@ msgstr "肌肉总览"
msgid "Add muscle"
msgstr "新增肌肉"
-#: exercises/templates/muscles/overview.html:81
+#: exercises/templates/muscles/overview.html:85
msgid ""
"No exercises for this muscle. Add or edit an exercise and set the muscle."
msgstr ""
@@ -2271,7 +2287,7 @@ msgstr "添加用户到健身房"
msgid "Edit gym"
msgstr "编辑健身房"
-#: i18n.tpl:2
+#: i18n.tpl:2 i18n.tpl:28
msgid "Abs"
msgstr "腹部"
@@ -2283,11 +2299,11 @@ msgstr "手臂"
msgid "Back"
msgstr "背部"
-#: i18n.tpl:5
+#: i18n.tpl:5 i18n.tpl:23
msgid "Calves"
msgstr "小腿"
-#: i18n.tpl:6
+#: i18n.tpl:6 i18n.tpl:26
msgid "Chest"
msgstr "胸部"
@@ -2295,7 +2311,7 @@ msgstr "胸部"
msgid "Legs"
msgstr "双腿"
-#: i18n.tpl:8
+#: i18n.tpl:8 i18n.tpl:19
msgid "Shoulders"
msgstr "肩部"
@@ -2324,107 +2340,75 @@ msgid "Kettlebell"
msgstr "壶铃"
#: i18n.tpl:15
-msgid "none (bodyweight exercise)"
-msgstr ""
-
-#: i18n.tpl:16
msgid "Pull-up bar"
msgstr "上拉杆"
+#: i18n.tpl:16
+msgid "SZ-Bar"
+msgstr "SZ杠"
+
#: i18n.tpl:17
msgid "Swiss Ball"
msgstr "平衡球"
#: i18n.tpl:18
-msgid "SZ-Bar"
-msgstr "SZ杠"
-
-#: i18n.tpl:19
-msgid "Anterior deltoid"
-msgstr "前三角肌"
+msgid "none (bodyweight exercise)"
+msgstr ""
#: i18n.tpl:20
-msgid "Biceps brachii"
+#, fuzzy
+#| msgid "Biceps brachii"
+msgid "Biceps"
msgstr "肱二头肌"
#: i18n.tpl:21
-msgid "Biceps femoris"
-msgstr "股二头肌"
+msgid "Hamstrings"
+msgstr ""
#: i18n.tpl:22
-msgid "Brachialis"
-msgstr "肱肌"
-
-#: i18n.tpl:23
-msgid "Gastrocnemius"
-msgstr "腓肠肌"
+msgid "Lower back"
+msgstr ""
#: i18n.tpl:24
-msgid "Gluteus maximus"
-msgstr "股大肌"
+msgid "Glutes"
+msgstr ""
#: i18n.tpl:25
-msgid "Latissimus dorsi"
-msgstr "背阔肌"
-
-#: i18n.tpl:26
-msgid "Obliquus externus abdominis"
-msgstr "腹外斜肌"
+msgid "Lats"
+msgstr ""
#: i18n.tpl:27
-msgid "Pectoralis major"
-msgstr "大胸肌"
-
-#: i18n.tpl:28
-msgid "Quadriceps femoris"
-msgstr "股四头肌"
+msgid "Quads"
+msgstr ""
#: i18n.tpl:29
-msgid "Rectus abdominis"
-msgstr "腹直肌"
-
-#: i18n.tpl:30
-msgid "Serratus anterior"
-msgstr "前锯肌"
-
-#: i18n.tpl:31
-msgid "Soleus"
-msgstr "比目鱼肌"
-
-#: i18n.tpl:32
-msgid "Trapezius"
-msgstr "斜方肌"
-
-#: i18n.tpl:33
-msgid "Triceps brachii"
+#, fuzzy
+#| msgid "Triceps brachii"
+msgid "Triceps"
msgstr "肱三头肌"
-#: i18n.tpl:34
+#: i18n.tpl:30
msgid "Kilometers"
msgstr ""
-#: i18n.tpl:35
-msgid "Max Reps"
-msgstr "最大重复次数"
-
-#: i18n.tpl:36
+#: i18n.tpl:31
msgid "Miles"
msgstr ""
-#: i18n.tpl:37
+#: i18n.tpl:32
msgid "Minutes"
msgstr ""
-#: i18n.tpl:38 manager/forms.py:169 manager/models/log.py:71
+#: i18n.tpl:33 manager/forms.py:169 manager/models/log.py:71
#: manager/templates/set/add.html:53
msgid "Repetitions"
msgstr "重复次数"
-#: i18n.tpl:39
+#: i18n.tpl:34
msgid "Seconds"
msgstr ""
-#: i18n.tpl:40
+#: i18n.tpl:35
msgid "Until Failure"
msgstr ""
@@ -3935,6 +3919,48 @@ msgstr ""
msgid "Delete weight entry for the %s"
msgstr ""
+#~ msgid "Anterior deltoid"
+#~ msgstr "前三角肌"
+
+#~ msgid "Biceps femoris"
+#~ msgstr "股二头肌"
+
+#~ msgid "Brachialis"
+#~ msgstr "肱肌"
+
+#~ msgid "Gastrocnemius"
+#~ msgstr "腓肠肌"
+
+#~ msgid "Gluteus maximus"
+#~ msgstr "股大肌"
+
+#~ msgid "Latissimus dorsi"
+#~ msgstr "背阔肌"
+
+#~ msgid "Obliquus externus abdominis"
+#~ msgstr "腹外斜肌"
+
+#~ msgid "Pectoralis major"
+#~ msgstr "大胸肌"
+
+#~ msgid "Quadriceps femoris"
+#~ msgstr "股四头肌"
+
+#~ msgid "Rectus abdominis"
+#~ msgstr "腹直肌"
+
+#~ msgid "Serratus anterior"
+#~ msgstr "前锯肌"
+
+#~ msgid "Soleus"
+#~ msgstr "比目鱼肌"
+
+#~ msgid "Trapezius"
+#~ msgstr "斜方肌"
+
+#~ msgid "Max Reps"
+#~ msgstr "最大重复次数"
+
#~ msgid "Your current weight is: "
#~ msgstr "你现在的体重是: "