Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Add link to mastodon on about us / contact page

Roland Geiderc6af4f608f3f
diff --git a/wger/locale/ar_SA/LC_MESSAGES/django.po b/wger/locale/ar_SA/LC_MESSAGES/django.po
index 5d16396af..a198f9d4c 100644
--- a/wger/locale/ar_SA/LC_MESSAGES/django.po
+++ b/wger/locale/ar_SA/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: wger Workout Manager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-02-02 12:42+0100\n"
+"POT-Creation-Date: 2024-07-14 15:49+0200\n"
"PO-Revision-Date: 2023-06-24 20:53+0000\n"
"Last-Translator: SlyBat <[email protected]>\n"
"Language-Team: Arabic (Saudi Arabia) <https://hosted.weblate.org/projects/"
@@ -34,7 +34,7 @@ msgstr ""
"المستخدمين المسجلين الجدد في هذه الصالة الرياضية وتحديث جميع المستخدمين "
"الحاليين بدون صالة رياضية."
-#: config/views/gym_config.py:42 core/templates/language/view.html:63
+#: config/views/gym_config.py:42 core/templates/language/view.html:67
#: core/templates/license/list.html:17 core/templates/misc/license/list.html:18
#: core/templates/repetition_unit/list.html:18
#: core/templates/tags/render_day.html:39
@@ -54,8 +54,8 @@ msgstr ""
#: manager/templates/calendar/day.html:68
#: manager/templates/calendar/month.html:85
#: manager/templates/calendar/partial_overview_table.html:18
-#: manager/templates/schedule/view.html:119
-#: nutrition/templates/ingredient/view.html:191
+#: manager/templates/schedule/view.html:118
+#: nutrition/templates/ingredient/view.html:165
#: nutrition/templates/units/list.html:19
msgid "Edit"
msgstr "تعديل"
@@ -91,8 +91,8 @@ msgstr "جدول تماريني الرائع"
msgid "Empty placeholder schedule"
msgstr "حامل جدول فارغ"
-#: core/forms.py:69 core/templates/navigation.html:275
-#: core/templates/navigation.html:281 core/templates/user/login.html:4
+#: core/forms.py:69 core/templates/navigation.html:285
+#: core/templates/navigation.html:291 core/templates/user/login.html:4
#: software/templates/features.html:82 software/templates/features.html:427
msgid "Login"
msgstr "تسجيل الدخول"
@@ -162,7 +162,7 @@ msgstr "كلمة السر"
msgid "Please enter your current password."
msgstr "الرجاء ادخال كلمة المرور الحالية."
-#: core/forms.py:242 core/templates/language/view.html:68
+#: core/forms.py:242 core/templates/language/view.html:73
#: core/templates/license/list.html:19 core/templates/misc/license/list.html:22
#: core/templates/repetition_unit/list.html:20
#: core/templates/tags/render_day.html:45
@@ -177,10 +177,10 @@ msgstr "الرجاء ادخال كلمة المرور الحالية."
#: gym/templates/gym/list.html:22 manager/templates/calendar/day.html:73
#: manager/templates/calendar/month.html:89
#: manager/templates/calendar/partial_overview_table.html:23
-#: manager/templates/schedule/view.html:123
-#: manager/templates/workout/view.html:190
-#: nutrition/templates/ingredient/view.html:192
-#: nutrition/templates/ingredient/view.html:241
+#: manager/templates/schedule/view.html:122
+#: manager/templates/workout/view.html:188
+#: nutrition/templates/ingredient/view.html:166
+#: nutrition/templates/ingredient/view.html:215
#: nutrition/templates/units/list.html:22
msgid "Delete"
msgstr "حذف"
@@ -193,14 +193,14 @@ msgstr "الرمز غير صحيح"
msgid "The form is secured with reCAPTCHA"
msgstr ""
-#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:275
-#: core/templates/navigation.html:287 core/templates/template.html:147
+#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:285
+#: core/templates/navigation.html:297 core/templates/template.html:149
#: core/templates/user/login.html:20 core/views/user.py:298
#: software/templates/features.html:87 software/templates/features.html:422
msgid "Register"
msgstr "التسجيل"
-#: core/forms.py:315
+#: core/forms.py:315 software/templates/features.html:45
msgid "Contact"
msgstr "الوصول الى الدعم"
@@ -209,7 +209,7 @@ msgid "Some way of answering you (e-mail, etc.)"
msgstr "طريقة للأجابة على مشكلتك (بريدك الألكتروني أو وسيلة اخرى)"
#: core/forms.py:324 exercises/models/comment.py:58 manager/models/set.py:61
-#: manager/models/setting.py:111 nutrition/models/log.py:74
+#: manager/models/setting.py:114 nutrition/models/log.py:77
msgid "Comment"
msgstr "ملاحظة"
@@ -229,6 +229,12 @@ msgstr "اسم قصير للغة"
msgid "Language full name"
msgstr "الاسم الكامل للغة"
+#: core/models/language.py:45 core/templates/language/view.html:23
+#, fuzzy
+#| msgid "Language full name"
+msgid "Language full name in English"
+msgstr "الاسم الكامل للغة"
+
#: core/models/license.py:29
msgid "Full name"
msgstr "الأسم الكامل"
@@ -243,7 +249,7 @@ msgstr ""
msgid "Short name, e.g. CC-BY-SA 3"
msgstr "كتابة أسم قصيرمثلاً : CC-BY-SA 3"
-#: core/models/license.py:45 nutrition/models/ingredient.py:214
+#: core/models/license.py:45 nutrition/models/ingredient.py:208
msgid "Link"
msgstr "الرابط"
@@ -346,7 +352,7 @@ msgstr ""
msgid "Age"
msgstr ""
-#: core/models/profile.py:230 nutrition/forms.py:117
+#: core/models/profile.py:230 nutrition/forms.py:118
msgid "Height (cm)"
msgstr ""
@@ -397,7 +403,7 @@ msgid "Total caloric intake, including e.g. any surplus"
msgstr ""
#: core/models/profile.py:333 nutrition/models/ingredient_weight_unit.py:45
-#: nutrition/models/log.py:93 nutrition/models/meal_item.py:58
+#: nutrition/models/log.py:96 nutrition/models/meal_item.py:59
msgid "Weight unit"
msgstr ""
@@ -426,17 +432,16 @@ msgstr ""
#: core/models/rep_unit.py:36 core/models/weight_unit.py:36
#: core/templates/user/overview.html:262 core/views/user.py:599
#: exercises/models/category.py:29 exercises/models/equipment.py:29
-#: exercises/models/exercise.py:58 exercises/models/muscle.py:36
+#: exercises/models/exercise.py:59 exercises/models/muscle.py:36
#: gym/models/contract.py:52 gym/models/contract.py:103 gym/models/gym.py:46
#: gym/models/user_document.py:84 gym/templates/contract/view.html:50
#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:96
#: gym/views/gym.py:158 manager/models/schedule.py:55
#: manager/models/workout.py:57 measurements/models/category.py:36
-#: nutrition/models/ingredient.py:125
+#: nutrition/models/ingredient.py:111
#: nutrition/models/ingredient_category.py:27 nutrition/models/meal.py:67
#: nutrition/models/weight_unit.py:38
-#: nutrition/templates/ingredient/pending.html:15
-#: nutrition/templates/ingredient/view.html:178
+#: nutrition/templates/ingredient/view.html:152
msgid "Name"
msgstr ""
@@ -535,25 +540,25 @@ msgstr ""
msgid "Dashboard"
msgstr ""
-#: core/templates/language/overview.html:4 core/templates/navigation.html:335
+#: core/templates/language/overview.html:4 core/templates/navigation.html:345
msgid "Languages"
msgstr "اللغات"
-#: core/templates/language/overview.html:20
+#: core/templates/language/overview.html:22
msgid "Nothing found."
msgstr "لم يتم العثور على شيء."
-#: core/templates/language/overview.html:20
+#: core/templates/language/overview.html:22
#: manager/templates/calendar/month.html:132
#: manager/templates/schedule/overview.html:28
-#: manager/templates/schedule/view.html:145
+#: manager/templates/schedule/view.html:144
#: manager/templates/workout/overview.html:28
#: nutrition/templates/ingredient/overview.html:38
#, fuzzy
msgid "Add one now."
msgstr "أضف واحدة الآن."
-#: core/templates/language/overview.html:33 core/templates/license/list.html:40
+#: core/templates/language/overview.html:35 core/templates/license/list.html:40
#: core/templates/misc/license/list.html:43
#: core/templates/repetition_unit/list.html:43
#: core/templates/user/overview.html:326 core/templates/user/overview.html:365
@@ -573,13 +578,13 @@ msgstr "أضف واحدة الآن."
msgid "Add"
msgstr "اضف"
-#: core/templates/language/view.html:58 core/templates/user/api_key.html:44
+#: core/templates/language/view.html:61 core/templates/user/api_key.html:44
#: core/templates/user/preferences.html:45 gym/models/contract.py:203
#: gym/templates/contract/view.html:41 gym/templates/contract/view.html:106
#: gym/templates/gym/member_list.html:248
-#: manager/templates/schedule/view.html:286
-#: manager/templates/workout/view.html:165
-#: nutrition/templates/ingredient/view.html:228
+#: manager/templates/schedule/view.html:285
+#: manager/templates/workout/view.html:163
+#: nutrition/templates/ingredient/view.html:202
msgid "Options"
msgstr "الخيارات"
@@ -604,12 +609,11 @@ msgstr ""
#: gym/templates/gym/member_list.html:299
#: mailer/templates/mailer/gym/overview.html:30
#: manager/templates/calendar/day.html:87
-#: nutrition/templates/ingredient/pending.html:30
#: nutrition/templates/units/list.html:29
msgid "Nothing found"
msgstr ""
-#: core/templates/misc/about.html:4 core/templates/template.html:173
+#: core/templates/misc/about.html:4 core/templates/template.html:175
msgid "Imprint"
msgstr ""
@@ -620,176 +624,171 @@ msgid ""
"entries here."
msgstr ""
-#: core/templates/navigation.html:27 software/templates/features.html:437
+#: core/templates/navigation.html:28 software/templates/features.html:437
msgid "Training"
msgstr ""
-#: core/templates/navigation.html:34 core/templates/user/overview.html:25
+#: core/templates/navigation.html:37 core/templates/user/overview.html:25
msgid "Workouts"
msgstr ""
-#: core/templates/navigation.html:42
+#: core/templates/navigation.html:46
msgid "Workouts schedules"
msgstr ""
-#: core/templates/navigation.html:50 core/templates/user/overview.html:70
+#: core/templates/navigation.html:54 core/templates/user/overview.html:70
#: manager/templates/calendar/month.html:10
#: manager/templates/calendar/month.html:21
msgid "Calendar"
msgstr ""
-#: core/templates/navigation.html:60
+#: core/templates/navigation.html:64
msgid "Measurements"
msgstr ""
-#: core/templates/navigation.html:70 gallery/templates/images/overview.html:6
+#: core/templates/navigation.html:75 gallery/templates/images/overview.html:6
msgid "Gallery"
msgstr ""
-#: core/templates/navigation.html:76
+#: core/templates/navigation.html:81
msgid "Workout templates"
msgstr ""
-#: core/templates/navigation.html:82 manager/views/workout.py:84
+#: core/templates/navigation.html:88 manager/views/workout.py:84
msgid "Your templates"
msgstr ""
-#: core/templates/navigation.html:90 manager/views/workout.py:98
+#: core/templates/navigation.html:97 manager/views/workout.py:98
msgid "Public templates"
msgstr ""
-#: core/templates/navigation.html:97 manager/forms.py:129
-#: manager/models/setting.py:54 software/templates/features.html:51
+#: core/templates/navigation.html:105 manager/forms.py:129
+#: manager/models/setting.py:57 software/templates/features.html:51
#: software/templates/features.html:459
msgid "Exercises"
msgstr "تمارين"
-#: core/templates/navigation.html:103 core/templates/navigation.html:170
-#: core/templates/navigation.html:330
+#: core/templates/navigation.html:111 core/templates/navigation.html:184
+#: core/templates/navigation.html:340
msgid "Administration"
msgstr ""
-#: core/templates/navigation.html:106
+#: core/templates/navigation.html:115
#, fuzzy
#| msgid "Exercises"
msgid "Exercise edit history"
msgstr "تمارين"
-#: core/templates/navigation.html:111 exercises/models/base.py:103
+#: core/templates/navigation.html:121 exercises/models/base.py:103
msgid "Equipment"
msgstr ""
-#: core/templates/navigation.html:116
+#: core/templates/navigation.html:127
msgid "Muscles"
msgstr ""
-#: core/templates/navigation.html:121
+#: core/templates/navigation.html:133
#: exercises/templates/categories/admin-overview.html:4
msgid "Categories"
msgstr ""
-#: core/templates/navigation.html:136 software/templates/features.html:447
+#: core/templates/navigation.html:148 software/templates/features.html:447
msgid "Nutrition"
msgstr ""
-#: core/templates/navigation.html:143 core/templates/user/overview.html:144
+#: core/templates/navigation.html:156 core/templates/user/overview.html:144
msgid "Nutrition plans"
msgstr ""
-#: core/templates/navigation.html:151 nutrition/templates/bmi/form.html:50
+#: core/templates/navigation.html:165 nutrition/templates/bmi/form.html:50
msgid "BMI calculator"
msgstr ""
-#: core/templates/navigation.html:159 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:174 nutrition/templates/rate/form.html:17
msgid "Daily calories calculator"
msgstr ""
-#: core/templates/navigation.html:165
+#: core/templates/navigation.html:179
#: nutrition/templates/ingredient/overview.html:10
msgid "Ingredient overview"
msgstr ""
-#: core/templates/navigation.html:172 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:187 nutrition/templates/units/list.html:6
msgid "Ingredient weight units"
msgstr ""
-#: core/templates/navigation.html:177
-#: nutrition/templates/ingredient/pending.html:6
-msgid "Ingredients pending review"
-msgstr ""
-
-#: core/templates/navigation.html:193 software/templates/features.html:442
+#: core/templates/navigation.html:203 software/templates/features.html:442
msgid "Body weight"
msgstr ""
-#: core/templates/navigation.html:200 core/templates/user/overview.html:114
+#: core/templates/navigation.html:210 core/templates/user/overview.html:114
msgid "Weight overview"
msgstr ""
-#: core/templates/navigation.html:207 weight/views.py:65
+#: core/templates/navigation.html:217 weight/views.py:65
msgid "Add weight entry"
msgstr ""
-#: core/templates/navigation.html:221
+#: core/templates/navigation.html:231
msgid "About this software"
msgstr ""
-#: core/templates/navigation.html:227 software/templates/about_us.html:5
+#: core/templates/navigation.html:237 software/templates/about_us.html:5
msgid "About us"
msgstr ""
-#: core/templates/navigation.html:233 software/templates/features.html:507
+#: core/templates/navigation.html:243 software/templates/features.html:507
msgid "REST API"
msgstr ""
-#: core/templates/navigation.html:239 utils/models.py:45
+#: core/templates/navigation.html:249 utils/models.py:45
msgid "License"
msgstr ""
-#: core/templates/navigation.html:245
+#: core/templates/navigation.html:255
msgid "Developer documentation"
msgstr ""
-#: core/templates/navigation.html:252
+#: core/templates/navigation.html:262
msgid "Get the code"
msgstr ""
-#: core/templates/navigation.html:259 core/templates/template.html:212
+#: core/templates/navigation.html:269 core/templates/template.html:214
#: software/templates/features.html:582
msgid "Translate"
msgstr ""
-#: core/templates/navigation.html:293 core/templates/user/login.html:28
+#: core/templates/navigation.html:303 core/templates/user/login.html:28
msgid "Reset password"
msgstr ""
-#: core/templates/navigation.html:311
+#: core/templates/navigation.html:321
msgid "My preferences"
msgstr ""
-#: core/templates/navigation.html:320
+#: core/templates/navigation.html:330
msgid "Logout"
msgstr ""
-#: core/templates/navigation.html:343
+#: core/templates/navigation.html:353
msgid "Licenses"
msgstr ""
-#: core/templates/navigation.html:351
+#: core/templates/navigation.html:361
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr ""
-#: core/templates/navigation.html:359 core/templates/weight_unit/list.html:4
-#: nutrition/templates/ingredient/view.html:167
+#: core/templates/navigation.html:369 core/templates/weight_unit/list.html:4
+#: nutrition/templates/ingredient/view.html:141
msgid "Weight units"
msgstr ""
-#: core/templates/navigation.html:367 core/templates/user/list.html:4
+#: core/templates/navigation.html:377 core/templates/user/list.html:4
msgid "User list"
msgstr ""
-#: core/templates/navigation.html:373
+#: core/templates/navigation.html:383
msgid "Gyms"
msgstr ""
@@ -839,12 +838,12 @@ msgstr ""
msgid "The %(site_name)s team"
msgstr ""
-#: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:11
+#: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:12
msgid "previous"
msgstr ""
-#: core/templates/tags/pagination.html:31
-#: core/templates/tags/pagination.html:35
+#: core/templates/tags/pagination.html:33
+#: core/templates/tags/pagination.html:38
msgid "next"
msgstr ""
@@ -869,34 +868,34 @@ msgid "Add exercises to this workout day"
msgstr ""
#: core/templates/tags/render_weight_log.html:17 manager/helpers.py:86
-#: manager/models/setting.py:69 manager/templates/set/formset.html:9
+#: manager/models/setting.py:72 manager/templates/set/formset.html:9
msgid "Reps"
msgstr ""
#: core/templates/tags/render_weight_log.html:30 manager/forms.py:191
-#: manager/models/log.py:103 manager/models/setting.py:99
+#: manager/models/log.py:103 manager/models/setting.py:102
#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
msgid "RiR"
msgstr ""
-#: core/templates/template.html:120 manager/templates/calendar/month.html:138
-#: manager/templates/schedule/view.html:249
-#: manager/templates/schedule/view.html:270
-#: manager/templates/workout/view.html:86
-#: manager/templates/workout/view.html:139
+#: core/templates/template.html:122 manager/templates/calendar/month.html:138
+#: manager/templates/schedule/view.html:248
+#: manager/templates/schedule/view.html:269
+#: manager/templates/workout/view.html:84
+#: manager/templates/workout/view.html:137
msgid "Close"
msgstr ""
-#: core/templates/template.html:136
+#: core/templates/template.html:138
msgid ""
"You are using a guest account, data entered will be deleted after a week."
msgstr ""
-#: core/templates/template.html:141
+#: core/templates/template.html:143
msgid "Create some demo entries"
msgstr ""
-#: core/templates/template.html:178 software/templates/features.html:547
+#: core/templates/template.html:180 software/templates/features.html:547
#: software/templates/tos.html:7
msgid "Terms of service"
msgstr ""
@@ -988,7 +987,7 @@ msgid "Overview"
msgstr ""
#: core/templates/user/overview.html:28
-#: manager/templates/schedule/view.html:164
+#: manager/templates/schedule/view.html:163
#: manager/templates/workout/overview.html:39 manager/views/schedule_step.py:60
msgid "Add workout"
msgstr ""
@@ -996,20 +995,20 @@ msgstr ""
#: core/templates/user/overview.html:34 core/templates/user/overview.html:76
#: core/templates/user/overview.html:120 core/templates/user/overview.html:152
#: exercises/models/base.py:118 exercises/models/base.py:124
-#: exercises/models/exercise.py:63 exercises/models/exercise.py:69
+#: exercises/models/exercise.py:64 exercises/models/exercise.py:70
#: exercises/models/image.py:107 exercises/models/image.py:113
#: exercises/models/video.py:163 exercises/models/video.py:169
#: gallery/models/image.py:42 manager/helpers.py:85 manager/models/log.py:100
#: manager/models/session.py:67 measurements/models/measurement.py:47
-#: nutrition/models/ingredient.py:101 nutrition/models/ingredient.py:107
-#: nutrition/models/ingredient.py:222 weight/models.py:33
+#: nutrition/models/ingredient.py:87 nutrition/models/ingredient.py:93
+#: nutrition/models/ingredient.py:216 weight/models.py:51
#: weight/templates/import_csv_preview.html:13
#: weight/templates/import_csv_preview.html:42 weight/views.py:144
msgid "Date"
msgstr ""
#: core/templates/user/overview.html:35 core/templates/user/overview.html:153
-#: exercises/models/exercise.py:51 gallery/models/image.py:65
+#: exercises/models/exercise.py:52 gallery/models/image.py:65
#: gym/models/contract.py:58 gym/models/contract.py:109
#: manager/models/day.py:37 manager/models/workout.py:63
#: measurements/models/measurement.py:62 nutrition/models/plan.py:67
@@ -1027,13 +1026,13 @@ msgstr ""
#: core/templates/user/overview.html:58
#: manager/templates/calendar/month.html:128
-#: manager/templates/schedule/view.html:145
+#: manager/templates/schedule/view.html:144
#: manager/templates/workout/overview.html:28
msgid "No workouts found."
msgstr ""
#: core/templates/user/overview.html:68 manager/forms.py:280
-#: manager/templates/workout/view.html:108
+#: manager/templates/workout/view.html:106
msgid "Log"
msgstr ""
@@ -1057,35 +1056,35 @@ msgstr ""
#: core/templates/user/overview.html:112 core/templates/user/overview.html:121
#: manager/forms.py:186 manager/helpers.py:86 manager/models/log.py:86
-#: manager/models/setting.py:79 manager/templates/log/add.html:54
-#: manager/templates/set/formset.html:11 weight/models.py:35
+#: manager/models/setting.py:82 manager/templates/log/add.html:54
+#: manager/templates/set/formset.html:11 weight/models.py:53
#: weight/templates/import_csv_preview.html:14
#: weight/templates/import_csv_preview.html:43 weight/views.py:144
msgid "Weight"
msgstr ""
-#: core/templates/user/overview.html:154 nutrition/models/ingredient.py:130
-#: nutrition/templates/ingredient/view.html:77 nutrition/views/plan.py:237
+#: core/templates/user/overview.html:154 nutrition/models/ingredient.py:116
+#: nutrition/templates/ingredient/view.html:51 nutrition/views/plan.py:237
msgid "Energy"
msgstr ""
-#: core/templates/user/overview.html:155 nutrition/models/ingredient.py:137
-#: nutrition/templates/ingredient/view.html:84 nutrition/views/plan.py:243
+#: core/templates/user/overview.html:155 nutrition/models/ingredient.py:123
+#: nutrition/templates/ingredient/view.html:58 nutrition/views/plan.py:243
msgid "Protein"
msgstr ""
-#: core/templates/user/overview.html:156 nutrition/models/ingredient.py:145
-#: nutrition/templates/ingredient/view.html:90 nutrition/views/plan.py:251
+#: core/templates/user/overview.html:156 nutrition/models/ingredient.py:131
+#: nutrition/templates/ingredient/view.html:64 nutrition/views/plan.py:251
msgid "Carbohydrates"
msgstr ""
-#: core/templates/user/overview.html:157 nutrition/models/ingredient.py:163
-#: nutrition/templates/ingredient/view.html:106 nutrition/views/plan.py:265
+#: core/templates/user/overview.html:157 nutrition/models/ingredient.py:149
+#: nutrition/templates/ingredient/view.html:80 nutrition/views/plan.py:265
msgid "Fat"
msgstr ""
#: core/templates/user/overview.html:170
-#: nutrition/templates/ingredient/view.html:79
+#: nutrition/templates/ingredient/view.html:53
msgid "kcal"
msgstr ""
@@ -1097,7 +1096,7 @@ msgstr ""
#: gym/templates/gym/member_list.html:207
#: gym/templates/gym/member_list.html:240
#: gym/templates/gym/member_list.html:277
-#: manager/templates/schedule/view.html:101
+#: manager/templates/schedule/view.html:100
msgid "Actions"
msgstr ""
@@ -1140,7 +1139,7 @@ msgid "Details"
msgstr ""
#: core/templates/user/overview.html:258 gym/views/export.py:57
-#: manager/helpers.py:86 manager/templates/schedule/view.html:99
+#: manager/helpers.py:86 manager/templates/schedule/view.html:98
msgid "Nr."
msgstr ""
@@ -1185,7 +1184,7 @@ msgid "Documents"
msgstr ""
#: core/templates/user/overview.html:412 gym/templates/document/list.html:32
-#: manager/forms.py:292 manager/templates/workout/view.html:134
+#: manager/forms.py:292 manager/templates/workout/view.html:132
msgid "Download"
msgstr ""
@@ -1237,13 +1236,13 @@ msgid "kg"
msgstr ""
#: core/templatetags/wger_extras.py:207
-#: nutrition/templates/ingredient/view.html:86
-#: nutrition/templates/ingredient/view.html:92
-#: nutrition/templates/ingredient/view.html:99
-#: nutrition/templates/ingredient/view.html:108
-#: nutrition/templates/ingredient/view.html:115
-#: nutrition/templates/ingredient/view.html:137
-#: nutrition/templates/ingredient/view.html:147
+#: nutrition/templates/ingredient/view.html:60
+#: nutrition/templates/ingredient/view.html:66
+#: nutrition/templates/ingredient/view.html:73
+#: nutrition/templates/ingredient/view.html:82
+#: nutrition/templates/ingredient/view.html:89
+#: nutrition/templates/ingredient/view.html:111
+#: nutrition/templates/ingredient/view.html:121
msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr ""
@@ -1261,7 +1260,7 @@ msgstr ""
#: exercises/views/equipment.py:103 exercises/views/exercises.py:73
#: exercises/views/muscles.py:99 manager/views/schedule.py:309
#: manager/views/schedule_step.py:128 manager/views/workout.py:249
-#: manager/views/workout_session.py:142 nutrition/views/ingredient.py:116
+#: manager/views/workout_session.py:142 nutrition/views/ingredient.py:119
#: nutrition/views/unit.py:110
msgid "Successfully deleted"
msgstr ""
@@ -1273,7 +1272,7 @@ msgstr ""
#: gym/views/admin_notes.py:196 gym/views/document.py:206 gym/views/gym.py:481
#: manager/views/schedule.py:316 manager/views/schedule_step.py:138
#: manager/views/workout.py:253 manager/views/workout_session.py:156
-#: nutrition/views/ingredient.py:123 nutrition/views/unit.py:117
+#: nutrition/views/ingredient.py:126 nutrition/views/unit.py:117
#, python-brace-format
msgid "Delete {0}?"
msgstr ""
@@ -1286,7 +1285,7 @@ msgstr ""
#: gym/views/contract.py:186 gym/views/contract_option.py:123
#: gym/views/contract_type.py:123 gym/views/document.py:171
#: gym/views/gym.py:463 manager/views/day.py:100 manager/views/schedule.py:333
-#: manager/views/workout.py:267 nutrition/views/ingredient.py:142
+#: manager/views/workout.py:267 nutrition/views/ingredient.py:145
#: nutrition/views/unit.py:143
#, python-brace-format
msgid "Edit {0}"
@@ -1357,7 +1356,7 @@ msgstr ""
msgid "A verification email was sent to %(email)s"
msgstr ""
-#: exercises/models/base.py:82 nutrition/models/ingredient.py:236
+#: exercises/models/base.py:82 nutrition/models/ingredient.py:230
msgid "Category"
msgstr ""
@@ -1377,7 +1376,7 @@ msgstr ""
msgid "Exercise Categories"
msgstr ""
-#: exercises/models/comment.py:52 exercises/models/exercise_alias.py:52
+#: exercises/models/comment.py:52 exercises/models/exercise_alias.py:53
#: exercises/models/image.py:74 exercises/models/video.py:98
#: manager/forms.py:178 manager/helpers.py:86 manager/models/log.py:52
msgid "Exercise"
@@ -1387,12 +1386,12 @@ msgstr ""
msgid "A comment about how to correctly do this exercise."
msgstr ""
-#: exercises/models/exercise.py:76 nutrition/models/ingredient.py:95
+#: exercises/models/exercise.py:77 nutrition/models/ingredient.py:81
#: nutrition/models/weight_unit.py:32
msgid "Language"
msgstr ""
-#: exercises/models/exercise_alias.py:58
+#: exercises/models/exercise_alias.py:59
msgid "Alias for an exercise"
msgstr ""
@@ -1524,7 +1523,7 @@ msgstr "الخيارات"
#: manager/models/schedule.py:44 manager/models/session.py:49
#: manager/models/workout.py:89 measurements/models/category.py:31
#: measurements/models/measurement.py:42 nutrition/models/plan.py:54
-#: nutrition/templates/ingredient/pending.html:16 weight/models.py:42
+#: weight/models.py:60
msgid "User"
msgstr ""
@@ -1643,9 +1642,9 @@ msgid "Contract type"
msgstr ""
#: gym/models/contract.py:211 gym/templates/contract/view.html:59
-#: manager/templates/log/add.html:52 nutrition/forms.py:62
-#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:105
-#: nutrition/models/meal_item.py:72
+#: manager/templates/log/add.html:52 nutrition/forms.py:63
+#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:108
+#: nutrition/models/meal_item.py:73
msgid "Amount"
msgstr ""
@@ -1662,7 +1661,7 @@ msgid "Contract is active"
msgstr ""
#: gym/models/contract.py:237 gym/templates/contract/view.html:69
-#: manager/models/schedule.py:61 manager/templates/schedule/view.html:68
+#: manager/models/schedule.py:61 manager/templates/schedule/view.html:67
msgid "Start date"
msgstr ""
@@ -2044,7 +2043,7 @@ msgstr ""
#: mailer/templates/mailer/gym/form.html:28
#: mailer/templates/mailer/gym/preview.html:62
-#: manager/templates/workout/view.html:42
+#: manager/templates/workout/view.html:40
msgid "Steps"
msgstr ""
@@ -2066,7 +2065,7 @@ msgid ""
msgstr ""
#: mailer/templates/mailer/gym/preview.html:22
-#: software/templates/about_us.html:60
+#: software/templates/about_us.html:70
msgid "Current version"
msgstr ""
@@ -2095,16 +2094,16 @@ msgid ""
"a superset."
msgstr ""
-#: manager/forms.py:140 nutrition/forms.py:252
+#: manager/forms.py:140 nutrition/forms.py:253
msgid "Also search for names in English"
msgstr ""
#: manager/forms.py:168 manager/forms.py:173 manager/models/log.py:64
-#: manager/models/log.py:92 manager/models/setting.py:59
-#: manager/models/setting.py:90 manager/templates/log/add.html:53
+#: manager/models/log.py:92 manager/models/setting.py:62
+#: manager/models/setting.py:93 manager/templates/log/add.html:53
#: manager/templates/log/add.html:55 manager/templates/set/formset.html:10
#: manager/templates/set/formset.html:12 measurements/models/category.py:41
-#: nutrition/forms.py:66
+#: nutrition/forms.py:67
msgid "Unit"
msgstr ""
@@ -2112,15 +2111,15 @@ msgstr ""
msgid "Type"
msgstr ""
-#: manager/forms.py:280 manager/templates/workout/view.html:115
+#: manager/forms.py:280 manager/templates/workout/view.html:113
msgid "Table"
msgstr ""
-#: manager/forms.py:282 manager/templates/workout/view.html:121
+#: manager/forms.py:282 manager/templates/workout/view.html:119
msgid "with images"
msgstr ""
-#: manager/forms.py:283 manager/templates/workout/view.html:127
+#: manager/forms.py:283 manager/templates/workout/view.html:125
msgid "with comments"
msgstr ""
@@ -2129,11 +2128,10 @@ msgid "Workout will expire soon"
msgstr ""
#: manager/models/day.py:34 manager/models/log.py:58
-#: manager/models/session.py:60 manager/templates/schedule/view.html:103
-#: manager/templates/workout/view.html:11
-#: manager/templates/workout/view.html:19 manager/views/pdf.py:85
-#: manager/views/pdf.py:161 manager/views/schedule.py:151
-#: manager/views/schedule.py:221
+#: manager/models/session.py:60 manager/templates/schedule/view.html:102
+#: manager/templates/workout/view.html:9 manager/templates/workout/view.html:17
+#: manager/views/pdf.py:85 manager/views/pdf.py:161
+#: manager/views/schedule.py:151 manager/views/schedule.py:221
msgid "Workout"
msgstr ""
@@ -2151,7 +2149,7 @@ msgstr ""
msgid "Name or short description of the schedule. For example 'Program XYZ'."
msgstr ""
-#: manager/models/schedule.py:65 manager/templates/schedule/view.html:72
+#: manager/models/schedule.py:65 manager/templates/schedule/view.html:71
msgid "Schedule active"
msgstr ""
@@ -2162,7 +2160,7 @@ msgid ""
"inactive"
msgstr ""
-#: manager/models/schedule.py:77 manager/templates/schedule/view.html:82
+#: manager/models/schedule.py:77 manager/templates/schedule/view.html:81
msgid "Is a loop"
msgstr ""
@@ -2181,8 +2179,8 @@ msgid "The duration in weeks"
msgstr ""
#: manager/models/schedule_step.py:64 manager/models/set.py:53
-#: manager/models/setting.py:110 nutrition/models/meal.py:55
-#: nutrition/models/meal_item.py:65
+#: manager/models/setting.py:113 nutrition/models/meal.py:55
+#: nutrition/models/meal_item.py:66
msgid "Order"
msgstr ""
@@ -2232,7 +2230,7 @@ msgstr ""
msgid "Number of sets"
msgstr ""
-#: manager/models/setting.py:48
+#: manager/models/setting.py:51
msgid "Sets"
msgstr ""
@@ -2301,7 +2299,7 @@ msgstr ""
msgid "Go to current month"
msgstr ""
-#: manager/templates/calendar/month.html:188
+#: manager/templates/calendar/month.html:190
msgid "Add new log"
msgstr ""
@@ -2338,8 +2336,8 @@ msgid "Your schedules"
msgstr ""
#: manager/templates/schedule/overview.html:19
-#: manager/templates/schedule/view.html:132
-#: manager/templates/schedule/view.html:184
+#: manager/templates/schedule/view.html:131
+#: manager/templates/schedule/view.html:183
#: manager/templates/workout/overview.html:16
msgid "active"
msgstr ""
@@ -2375,29 +2373,29 @@ msgstr ""
msgid "Add schedule"
msgstr ""
-#: manager/templates/schedule/view.html:10
+#: manager/templates/schedule/view.html:9
msgid "Schedule"
msgstr ""
-#: manager/templates/schedule/view.html:86
+#: manager/templates/schedule/view.html:85
msgid ""
"This schedule is a loop and will go through the workouts above till you "
"deactivate it"
msgstr ""
-#: manager/templates/schedule/view.html:104
+#: manager/templates/schedule/view.html:103
msgid "Weeks"
msgstr ""
-#: manager/templates/schedule/view.html:116
+#: manager/templates/schedule/view.html:115
msgid "Move me"
msgstr ""
-#: manager/templates/schedule/view.html:157
+#: manager/templates/schedule/view.html:156
msgid "Start schedule"
msgstr ""
-#: manager/templates/schedule/view.html:188
+#: manager/templates/schedule/view.html:187
#, python-format
msgid ""
"%(weeks)s Week\n"
@@ -2412,11 +2410,11 @@ msgstr[3] ""
msgstr[4] ""
msgstr[5] ""
-#: manager/templates/schedule/view.html:222
+#: manager/templates/schedule/view.html:221
msgid "Adding workouts"
msgstr ""
-#: manager/templates/schedule/view.html:224
+#: manager/templates/schedule/view.html:223
msgid ""
"Add as many workouts to the schedule as you want. You can\n"
" edit the order by dragging and dropping them. It's also possible "
@@ -2424,21 +2422,21 @@ msgid ""
" than once."
msgstr ""
-#: manager/templates/schedule/view.html:233
-#: manager/templates/schedule/view.html:244
-#: manager/templates/schedule/view.html:291
-#: manager/templates/workout/view.html:71
-#: manager/templates/workout/view.html:81
-#: manager/templates/workout/view.html:180
+#: manager/templates/schedule/view.html:232
+#: manager/templates/schedule/view.html:243
+#: manager/templates/schedule/view.html:290
+#: manager/templates/workout/view.html:69
+#: manager/templates/workout/view.html:79
+#: manager/templates/workout/view.html:178
msgid "Export calendar file"
msgstr ""
-#: manager/templates/schedule/view.html:237
+#: manager/templates/schedule/view.html:236
msgid "Export this schedule as a calendar file."
msgstr ""
-#: manager/templates/schedule/view.html:238
-#: manager/templates/workout/view.html:76
+#: manager/templates/schedule/view.html:237
+#: manager/templates/workout/view.html:74
msgid ""
"You can then import the file it into your calendar\n"
" application for example google calendar, outlook or "
@@ -2447,18 +2445,18 @@ msgid ""
"appropriate exercises."
msgstr ""
-#: manager/templates/schedule/view.html:259
-#: manager/templates/schedule/view.html:295
-#: manager/templates/workout/view.html:96
-#: manager/templates/workout/view.html:176
+#: manager/templates/schedule/view.html:258
+#: manager/templates/schedule/view.html:294
+#: manager/templates/workout/view.html:94
+#: manager/templates/workout/view.html:174
msgid "Download as PDF"
msgstr ""
-#: manager/templates/schedule/view.html:300
+#: manager/templates/schedule/view.html:299
msgid "Edit schedule"
msgstr ""
-#: manager/templates/schedule/view.html:305
+#: manager/templates/schedule/view.html:304
msgid "Delete schedule"
msgstr ""
@@ -2576,12 +2574,12 @@ msgid "Mark as workout"
msgstr ""
#: manager/templates/workout/template_view.html:65
-#: manager/templates/workout/view.html:51
+#: manager/templates/workout/view.html:49
msgid "Muscles trained"
msgstr ""
#: manager/templates/workout/template_view.html:68
-#: manager/templates/workout/view.html:54
+#: manager/templates/workout/view.html:52
msgid ""
"Images show combined muscles as trained by the exercises on the workout."
msgstr ""
@@ -2590,35 +2588,35 @@ msgstr ""
msgid "Use this template"
msgstr ""
-#: manager/templates/workout/view.html:45
+#: manager/templates/workout/view.html:43
msgid "Add training days"
msgstr ""
-#: manager/templates/workout/view.html:46
+#: manager/templates/workout/view.html:44
msgid "Add workout sets to days"
msgstr ""
-#: manager/templates/workout/view.html:47
+#: manager/templates/workout/view.html:45
msgid "Set the repetitions for each set"
msgstr ""
-#: manager/templates/workout/view.html:75
+#: manager/templates/workout/view.html:73
msgid "Export this workout as a calendar file."
msgstr ""
-#: manager/templates/workout/view.html:146
+#: manager/templates/workout/view.html:144
msgid "Logs"
msgstr ""
-#: manager/templates/workout/view.html:148
+#: manager/templates/workout/view.html:146
msgid "View logs"
msgstr ""
-#: manager/templates/workout/view.html:171 manager/views/schedule_step.py:99
+#: manager/templates/workout/view.html:169 manager/views/schedule_step.py:99
msgid "Edit workout"
msgstr ""
-#: manager/templates/workout/view.html:184 manager/views/workout.py:281
+#: manager/templates/workout/view.html:182 manager/views/workout.py:281
msgid "Mark as template"
msgstr ""
@@ -2665,103 +2663,89 @@ msgstr ""
msgid "Value"
msgstr ""
-#: nutrition/forms.py:117
+#: nutrition/forms.py:118
msgid "Height (in)"
msgstr ""
-#: nutrition/forms.py:120
+#: nutrition/forms.py:121
msgid "Weight (kg)"
msgstr ""
-#: nutrition/forms.py:120
+#: nutrition/forms.py:121
msgid "Weight (lbs)"
msgstr ""
-#: nutrition/forms.py:133
+#: nutrition/forms.py:134
msgid "Calculate"
msgstr ""
-#: nutrition/forms.py:207 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:208 nutrition/templates/rate/form.html:76
msgid "Basic caloric intake"
msgstr ""
-#: nutrition/forms.py:208
+#: nutrition/forms.py:209
msgid "Your basic caloric intake as calculated for your data"
msgstr ""
-#: nutrition/forms.py:213
+#: nutrition/forms.py:214
msgid "Additional calories"
msgstr ""
-#: nutrition/forms.py:215
+#: nutrition/forms.py:216
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
msgstr ""
-#: nutrition/forms.py:248 nutrition/models/ingredient_weight_unit.py:39
-#: nutrition/models/log.py:84 nutrition/models/meal_item.py:53
+#: nutrition/forms.py:249 nutrition/models/ingredient_weight_unit.py:39
+#: nutrition/models/log.py:87 nutrition/models/meal_item.py:54
msgid "Ingredient"
msgstr ""
-#: nutrition/models/ingredient.py:131
+#: nutrition/models/ingredient.py:117
msgid "In kcal per 100g"
msgstr ""
-#: nutrition/models/ingredient.py:138 nutrition/models/ingredient.py:146
-#: nutrition/models/ingredient.py:156 nutrition/models/ingredient.py:164
-#: nutrition/models/ingredient.py:174 nutrition/models/ingredient.py:184
-#: nutrition/models/ingredient.py:194
+#: nutrition/models/ingredient.py:124 nutrition/models/ingredient.py:132
+#: nutrition/models/ingredient.py:142 nutrition/models/ingredient.py:150
+#: nutrition/models/ingredient.py:160 nutrition/models/ingredient.py:170
+#: nutrition/models/ingredient.py:180
msgid "In g per 100g of product"
msgstr ""
-#: nutrition/models/ingredient.py:155
-#: nutrition/templates/ingredient/view.html:96 nutrition/views/plan.py:259
+#: nutrition/models/ingredient.py:141
+#: nutrition/templates/ingredient/view.html:70 nutrition/views/plan.py:259
msgid "Sugar content in carbohydrates"
msgstr ""
-#: nutrition/models/ingredient.py:173
-#: nutrition/templates/ingredient/view.html:112 nutrition/views/plan.py:273
+#: nutrition/models/ingredient.py:159
+#: nutrition/templates/ingredient/view.html:86 nutrition/views/plan.py:273
msgid "Saturated fat content in fats"
msgstr ""
-#: nutrition/models/ingredient.py:183
-#: nutrition/templates/ingredient/view.html:134 nutrition/views/plan.py:279
-msgid "Fibres"
+#: nutrition/models/ingredient.py:169
+#: nutrition/templates/ingredient/view.html:108 nutrition/views/plan.py:279
+msgid "Fiber"
msgstr ""
-#: nutrition/models/ingredient.py:193
-#: nutrition/templates/ingredient/view.html:144 nutrition/views/plan.py:285
+#: nutrition/models/ingredient.py:179
+#: nutrition/templates/ingredient/view.html:118 nutrition/views/plan.py:285
msgid "Sodium"
msgstr ""
-#: nutrition/models/ingredient.py:215
+#: nutrition/models/ingredient.py:209
msgid "Link to product"
msgstr ""
-#: nutrition/models/ingredient.py:244
+#: nutrition/models/ingredient.py:238
msgid "Brand name of product"
msgstr ""
-#: nutrition/models/ingredient.py:304
+#: nutrition/models/ingredient.py:305
#, python-brace-format
msgid "The total energy ({self.energy}kcal) is not the approximate sum of the "
msgstr ""
-#: nutrition/models/ingredient.py:383 nutrition/views/ingredient.py:196
-msgid "Ingredient was successfully added to the general database"
-msgstr ""
-
-#: nutrition/models/ingredient.py:408
-msgid "New user submitted ingredient"
-msgstr ""
-
-#: nutrition/models/ingredient.py:410
-#, python-brace-format
-msgid ""
-"The user {request.user.username} submitted a new ingredient \"{self.name}\"."
-msgstr ""
-
#: nutrition/models/ingredient_category.py:31
msgid "Ingredient Categories"
msgstr ""
@@ -2774,16 +2758,16 @@ msgstr ""
msgid "Unit amount, e.g. \"1 Cup\" or \"1/2 spoon\""
msgstr ""
-#: nutrition/models/log.py:49 nutrition/models/meal.py:50
-#: nutrition/models/meal_item.py:47 nutrition/models/plan.py:106
+#: nutrition/models/log.py:52 nutrition/models/meal.py:50
+#: nutrition/models/meal_item.py:48 nutrition/models/plan.py:108
msgid "Nutrition plan"
msgstr ""
-#: nutrition/models/log.py:58
+#: nutrition/models/log.py:61
msgid "Meal"
msgstr ""
-#: nutrition/models/log.py:68
+#: nutrition/models/log.py:71
msgid "Date and Time (Approx.)"
msgstr ""
@@ -2803,11 +2787,11 @@ msgid ""
"summer\""
msgstr ""
-#: nutrition/models/plan.py:88
+#: nutrition/models/plan.py:90
msgid "Use daily calories"
msgstr ""
-#: nutrition/models/plan.py:91
+#: nutrition/models/plan.py:93
msgid ""
"Tick the box if you want to mark this plan as having a goal amount of "
"calories. You can use the calculator or enter the value yourself."
@@ -2914,64 +2898,36 @@ msgstr ""
msgid "Add ingredient"
msgstr ""
-#: nutrition/templates/ingredient/pending.html:14
-msgid "Submission date"
-msgstr ""
-
-#: nutrition/templates/ingredient/view.html:27
-msgid "Ingredient is pending review"
-msgstr ""
-
-#: nutrition/templates/ingredient/view.html:28
-msgid ""
-"This user submitted ingredient is pending a decision to be\n"
-"included in the database. Till then, it will not be shown in the overview "
-"or\n"
-"the search."
-msgstr ""
-
-#: nutrition/templates/ingredient/view.html:31
-msgid "Please select one of the options below."
-msgstr ""
-
-#: nutrition/templates/ingredient/view.html:38
-msgid "Accept"
-msgstr ""
-
-#: nutrition/templates/ingredient/view.html:42
-msgid "Decline"
-msgstr ""
-
-#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:229
+#: nutrition/templates/ingredient/view.html:45 nutrition/views/plan.py:229
msgid "Macronutrients"
msgstr ""
-#: nutrition/templates/ingredient/view.html:80
+#: nutrition/templates/ingredient/view.html:54
msgid "kJ"
msgstr ""
-#: nutrition/templates/ingredient/view.html:101
-#: nutrition/templates/ingredient/view.html:117
-#: nutrition/templates/ingredient/view.html:139
-#: nutrition/templates/ingredient/view.html:149
+#: nutrition/templates/ingredient/view.html:75
+#: nutrition/templates/ingredient/view.html:91
+#: nutrition/templates/ingredient/view.html:113
+#: nutrition/templates/ingredient/view.html:123
msgid "n.A."
msgstr ""
-#: nutrition/templates/ingredient/view.html:128
+#: nutrition/templates/ingredient/view.html:102
msgid "Others"
msgstr ""
-#: nutrition/templates/ingredient/view.html:170
+#: nutrition/templates/ingredient/view.html:144
#: nutrition/templates/units/list.html:46 nutrition/views/unit.py:86
msgid "Add new weight unit"
msgstr ""
-#: nutrition/templates/ingredient/view.html:232
-#: nutrition/templates/ingredient/view.html:235
+#: nutrition/templates/ingredient/view.html:206
+#: nutrition/templates/ingredient/view.html:209
msgid "Edit ingredient"
msgstr ""
-#: nutrition/templates/ingredient/view.html:239
+#: nutrition/templates/ingredient/view.html:213
msgid "Delete ingredient"
msgstr ""
@@ -3055,14 +3011,10 @@ msgstr ""
msgid "56 to 90"
msgstr ""
-#: nutrition/views/ingredient.py:154
+#: nutrition/views/ingredient.py:157
msgid "Add a new ingredient"
msgstr ""
-#: nutrition/views/ingredient.py:209
-msgid "Ingredient was successfully marked as rejected"
-msgstr ""
-
#: nutrition/views/plan.py:120
msgid "Nutritional plan"
msgstr ""
@@ -3107,50 +3059,59 @@ msgid ""
msgstr ""
#: software/templates/about_us.html:18
-msgid "Source code"
-msgstr ""
-
-#: software/templates/about_us.html:20
-msgid "Get the source code of this application and its server on github"
-msgstr ""
-
-#: software/templates/about_us.html:25
msgid "Have a problem or idea?"
msgstr ""
-#: software/templates/about_us.html:27
+#: software/templates/about_us.html:20
msgid ""
"Get in touch if something didn't behave as expected or if there is a feature "
"that you feel is missing."
msgstr ""
-#: software/templates/about_us.html:32
+#: software/templates/about_us.html:26
msgid "Say hi!"
msgstr ""
-#: software/templates/about_us.html:34
+#: software/templates/about_us.html:28
msgid "If you want to chat with us, hop on the Discord server and get in touch"
msgstr ""
-#: software/templates/about_us.html:39 software/templates/features.html:503
+#: software/templates/about_us.html:33
+msgid "Mastodon"
+msgstr ""
+
+#: software/templates/about_us.html:35
+msgid "Follow us on mastodon for updates and news about the project"
+msgstr ""
+
+#: software/templates/about_us.html:40 software/templates/features.html:503
msgid "Translation"
msgstr "الترجمة"
-#: software/templates/about_us.html:41
+#: software/templates/about_us.html:42
msgid ""
"This application is translated on weblate. If you also want to help, click "
"the link and start translating"
msgstr ""
-#: software/templates/about_us.html:50
+#: software/templates/about_us.html:47
+msgid "Source code"
+msgstr ""
+
+#: software/templates/about_us.html:49
+msgid "Get the source code of this application and its server on github"
+msgstr ""
+
+#: software/templates/about_us.html:59
msgid "Our goal"
msgstr ""
-#: software/templates/about_us.html:53
+#: software/templates/about_us.html:62
msgid ""
"The goal is to build an awesome\n"
" and flexible fitness manager, along with a comprehensive and "
-"complete list of exercises and\n"
+"complete list of\n"
+" exercises and\n"
" ingredients, all released under a free license."
msgstr ""
@@ -3160,10 +3121,6 @@ msgid ""
"your exercises and workouts."
msgstr ""
-#: software/templates/features.html:45
-msgid "About"
-msgstr ""
-
#: software/templates/features.html:57
msgid "Mobile app"
msgstr "تطبيق الهاتف"
@@ -3399,18 +3356,6 @@ msgid ""
"to its own copyright."
msgstr ""
-#: utils/models.py:130
-msgid "Pending"
-msgstr ""
-
-#: utils/models.py:131
-msgid "Accepted"
-msgstr ""
-
-#: utils/models.py:132
-msgid "Declined"
-msgstr ""
-
#: weight/forms.py:54
msgid "Input"
msgstr ""
@@ -3423,7 +3368,7 @@ msgstr ""
msgid "You have to enter your weight"
msgstr ""
-#: weight/models.py:60
+#: weight/models.py:78
msgid "Weight entry"
msgstr ""
diff --git a/wger/locale/bg/LC_MESSAGES/django.po b/wger/locale/bg/LC_MESSAGES/django.po
index 8678d6d53..3142c306f 100644
--- a/wger/locale/bg/LC_MESSAGES/django.po
+++ b/wger/locale/bg/LC_MESSAGES/django.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: wger Workout Manager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-02-02 12:42+0100\n"
+"POT-Creation-Date: 2024-07-14 15:49+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"
@@ -32,7 +32,7 @@ msgid ""
"registered users to this gym and update all existing users without a gym."
msgstr ""
-#: config/views/gym_config.py:42 core/templates/language/view.html:63
+#: config/views/gym_config.py:42 core/templates/language/view.html:67
#: core/templates/license/list.html:17 core/templates/misc/license/list.html:18
#: core/templates/repetition_unit/list.html:18
#: core/templates/tags/render_day.html:39
@@ -52,8 +52,8 @@ msgstr ""
#: manager/templates/calendar/day.html:68
#: manager/templates/calendar/month.html:85
#: manager/templates/calendar/partial_overview_table.html:18
-#: manager/templates/schedule/view.html:119
-#: nutrition/templates/ingredient/view.html:191
+#: manager/templates/schedule/view.html:118
+#: nutrition/templates/ingredient/view.html:165
#: nutrition/templates/units/list.html:19
msgid "Edit"
msgstr "Поправи"
@@ -89,8 +89,8 @@ msgstr "Моята готина тренировъчна схема"
msgid "Empty placeholder schedule"
msgstr "Празно място за тренировъчен план"
-#: core/forms.py:69 core/templates/navigation.html:275
-#: core/templates/navigation.html:281 core/templates/user/login.html:4
+#: core/forms.py:69 core/templates/navigation.html:285
+#: core/templates/navigation.html:291 core/templates/user/login.html:4
#: software/templates/features.html:82 software/templates/features.html:427
msgid "Login"
msgstr "Вход"
@@ -162,7 +162,7 @@ msgstr ""
msgid "Please enter your current password."
msgstr ""
-#: core/forms.py:242 core/templates/language/view.html:68
+#: core/forms.py:242 core/templates/language/view.html:73
#: core/templates/license/list.html:19 core/templates/misc/license/list.html:22
#: core/templates/repetition_unit/list.html:20
#: core/templates/tags/render_day.html:45
@@ -177,10 +177,10 @@ msgstr ""
#: gym/templates/gym/list.html:22 manager/templates/calendar/day.html:73
#: manager/templates/calendar/month.html:89
#: manager/templates/calendar/partial_overview_table.html:23
-#: manager/templates/schedule/view.html:123
-#: manager/templates/workout/view.html:190
-#: nutrition/templates/ingredient/view.html:192
-#: nutrition/templates/ingredient/view.html:241
+#: manager/templates/schedule/view.html:122
+#: manager/templates/workout/view.html:188
+#: nutrition/templates/ingredient/view.html:166
+#: nutrition/templates/ingredient/view.html:215
#: nutrition/templates/units/list.html:22
msgid "Delete"
msgstr "Изтрии"
@@ -193,14 +193,14 @@ msgstr ""
msgid "The form is secured with reCAPTCHA"
msgstr ""
-#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:275
-#: core/templates/navigation.html:287 core/templates/template.html:147
+#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:285
+#: core/templates/navigation.html:297 core/templates/template.html:149
#: core/templates/user/login.html:20 core/views/user.py:298
#: software/templates/features.html:87 software/templates/features.html:422
msgid "Register"
msgstr "Регистрация"
-#: core/forms.py:315
+#: core/forms.py:315 software/templates/features.html:45
msgid "Contact"
msgstr ""
@@ -209,7 +209,7 @@ msgid "Some way of answering you (e-mail, etc.)"
msgstr ""
#: core/forms.py:324 exercises/models/comment.py:58 manager/models/set.py:61
-#: manager/models/setting.py:111 nutrition/models/log.py:74
+#: manager/models/setting.py:114 nutrition/models/log.py:77
msgid "Comment"
msgstr "Коментирай"
@@ -229,6 +229,12 @@ msgstr "Съкратено име на езика"
msgid "Language full name"
msgstr "Пълно име на език"
+#: core/models/language.py:45 core/templates/language/view.html:23
+#, fuzzy
+#| msgid "Language full name"
+msgid "Language full name in English"
+msgstr "Пълно име на език"
+
#: core/models/license.py:29
msgid "Full name"
msgstr ""
@@ -243,7 +249,7 @@ msgstr ""
msgid "Short name, e.g. CC-BY-SA 3"
msgstr ""
-#: core/models/license.py:45 nutrition/models/ingredient.py:214
+#: core/models/license.py:45 nutrition/models/ingredient.py:208
msgid "Link"
msgstr ""
@@ -353,7 +359,7 @@ msgstr ""
msgid "Age"
msgstr ""
-#: core/models/profile.py:230 nutrition/forms.py:117
+#: core/models/profile.py:230 nutrition/forms.py:118
msgid "Height (cm)"
msgstr ""
@@ -404,7 +410,7 @@ msgid "Total caloric intake, including e.g. any surplus"
msgstr ""
#: core/models/profile.py:333 nutrition/models/ingredient_weight_unit.py:45
-#: nutrition/models/log.py:93 nutrition/models/meal_item.py:58
+#: nutrition/models/log.py:96 nutrition/models/meal_item.py:59
msgid "Weight unit"
msgstr "Единица за тегло"
@@ -433,17 +439,16 @@ msgstr ""
#: core/models/rep_unit.py:36 core/models/weight_unit.py:36
#: core/templates/user/overview.html:262 core/views/user.py:599
#: exercises/models/category.py:29 exercises/models/equipment.py:29
-#: exercises/models/exercise.py:58 exercises/models/muscle.py:36
+#: exercises/models/exercise.py:59 exercises/models/muscle.py:36
#: gym/models/contract.py:52 gym/models/contract.py:103 gym/models/gym.py:46
#: gym/models/user_document.py:84 gym/templates/contract/view.html:50
#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:96
#: gym/views/gym.py:158 manager/models/schedule.py:55
#: manager/models/workout.py:57 measurements/models/category.py:36
-#: nutrition/models/ingredient.py:125
+#: nutrition/models/ingredient.py:111
#: nutrition/models/ingredient_category.py:27 nutrition/models/meal.py:67
#: nutrition/models/weight_unit.py:38
-#: nutrition/templates/ingredient/pending.html:15
-#: nutrition/templates/ingredient/view.html:178
+#: nutrition/templates/ingredient/view.html:152
msgid "Name"
msgstr "Име"
@@ -544,24 +549,24 @@ msgstr ""
msgid "Dashboard"
msgstr "Табло"
-#: core/templates/language/overview.html:4 core/templates/navigation.html:335
+#: core/templates/language/overview.html:4 core/templates/navigation.html:345
msgid "Languages"
msgstr ""
-#: core/templates/language/overview.html:20
+#: core/templates/language/overview.html:22
msgid "Nothing found."
msgstr ""
-#: core/templates/language/overview.html:20
+#: core/templates/language/overview.html:22
#: manager/templates/calendar/month.html:132
#: manager/templates/schedule/overview.html:28
-#: manager/templates/schedule/view.html:145
+#: manager/templates/schedule/view.html:144
#: manager/templates/workout/overview.html:28
#: nutrition/templates/ingredient/overview.html:38
msgid "Add one now."
msgstr "Добави сега."
-#: core/templates/language/overview.html:33 core/templates/license/list.html:40
+#: core/templates/language/overview.html:35 core/templates/license/list.html:40
#: core/templates/misc/license/list.html:43
#: core/templates/repetition_unit/list.html:43
#: core/templates/user/overview.html:326 core/templates/user/overview.html:365
@@ -581,13 +586,13 @@ msgstr "Добави сега."
msgid "Add"
msgstr "Добави"
-#: core/templates/language/view.html:58 core/templates/user/api_key.html:44
+#: core/templates/language/view.html:61 core/templates/user/api_key.html:44
#: core/templates/user/preferences.html:45 gym/models/contract.py:203
#: gym/templates/contract/view.html:41 gym/templates/contract/view.html:106
#: gym/templates/gym/member_list.html:248
-#: manager/templates/schedule/view.html:286
-#: manager/templates/workout/view.html:165
-#: nutrition/templates/ingredient/view.html:228
+#: manager/templates/schedule/view.html:285
+#: manager/templates/workout/view.html:163
+#: nutrition/templates/ingredient/view.html:202
msgid "Options"
msgstr "Опции"
@@ -612,12 +617,11 @@ msgstr ""
#: gym/templates/gym/member_list.html:299
#: mailer/templates/mailer/gym/overview.html:30
#: manager/templates/calendar/day.html:87
-#: nutrition/templates/ingredient/pending.html:30
#: nutrition/templates/units/list.html:29
msgid "Nothing found"
msgstr ""
-#: core/templates/misc/about.html:4 core/templates/template.html:173
+#: core/templates/misc/about.html:4 core/templates/template.html:175
msgid "Imprint"
msgstr ""
@@ -628,182 +632,177 @@ msgid ""
"entries here."
msgstr ""
-#: core/templates/navigation.html:27 software/templates/features.html:437
+#: core/templates/navigation.html:28 software/templates/features.html:437
msgid "Training"
msgstr "Тренировка"
-#: core/templates/navigation.html:34 core/templates/user/overview.html:25
+#: core/templates/navigation.html:37 core/templates/user/overview.html:25
msgid "Workouts"
msgstr "Тренировки"
-#: core/templates/navigation.html:42
+#: core/templates/navigation.html:46
msgid "Workouts schedules"
msgstr "График на тренировки"
-#: core/templates/navigation.html:50 core/templates/user/overview.html:70
+#: core/templates/navigation.html:54 core/templates/user/overview.html:70
#: manager/templates/calendar/month.html:10
#: manager/templates/calendar/month.html:21
msgid "Calendar"
msgstr ""
-#: core/templates/navigation.html:60
+#: core/templates/navigation.html:64
#, fuzzy
#| msgid "Macronutrients"
msgid "Measurements"
msgstr "Макронутриенти"
-#: core/templates/navigation.html:70 gallery/templates/images/overview.html:6
+#: core/templates/navigation.html:75 gallery/templates/images/overview.html:6
msgid "Gallery"
msgstr ""
-#: core/templates/navigation.html:76
+#: core/templates/navigation.html:81
#, fuzzy
#| msgid "Workouts schedules"
msgid "Workout templates"
msgstr "График на тренировки"
-#: core/templates/navigation.html:82 manager/views/workout.py:84
+#: core/templates/navigation.html:88 manager/views/workout.py:84
#, fuzzy
#| msgid "Your schedules"
msgid "Your templates"
msgstr "Твоите графици"
-#: core/templates/navigation.html:90 manager/views/workout.py:98
+#: core/templates/navigation.html:97 manager/views/workout.py:98
msgid "Public templates"
msgstr ""
-#: core/templates/navigation.html:97 manager/forms.py:129
-#: manager/models/setting.py:54 software/templates/features.html:51
+#: core/templates/navigation.html:105 manager/forms.py:129
+#: manager/models/setting.py:57 software/templates/features.html:51
#: software/templates/features.html:459
msgid "Exercises"
msgstr "Упражнения"
-#: core/templates/navigation.html:103 core/templates/navigation.html:170
-#: core/templates/navigation.html:330
+#: core/templates/navigation.html:111 core/templates/navigation.html:184
+#: core/templates/navigation.html:340
msgid "Administration"
msgstr "Администрация"
-#: core/templates/navigation.html:106
+#: core/templates/navigation.html:115
#, fuzzy
#| msgid "Exercise day"
msgid "Exercise edit history"
msgstr "Ден за упражнение"
-#: core/templates/navigation.html:111 exercises/models/base.py:103
+#: core/templates/navigation.html:121 exercises/models/base.py:103
msgid "Equipment"
msgstr ""
-#: core/templates/navigation.html:116
+#: core/templates/navigation.html:127
msgid "Muscles"
msgstr "Мускули"
-#: core/templates/navigation.html:121
+#: core/templates/navigation.html:133
#: exercises/templates/categories/admin-overview.html:4
msgid "Categories"
msgstr ""
-#: core/templates/navigation.html:136 software/templates/features.html:447
+#: core/templates/navigation.html:148 software/templates/features.html:447
msgid "Nutrition"
msgstr "Хранене"
-#: core/templates/navigation.html:143 core/templates/user/overview.html:144
+#: core/templates/navigation.html:156 core/templates/user/overview.html:144
msgid "Nutrition plans"
msgstr "План за хранене"
-#: core/templates/navigation.html:151 nutrition/templates/bmi/form.html:50
+#: core/templates/navigation.html:165 nutrition/templates/bmi/form.html:50
msgid "BMI calculator"
msgstr ""
-#: core/templates/navigation.html:159 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:174 nutrition/templates/rate/form.html:17
msgid "Daily calories calculator"
msgstr ""
-#: core/templates/navigation.html:165
+#: core/templates/navigation.html:179
#: nutrition/templates/ingredient/overview.html:10
msgid "Ingredient overview"
msgstr "Преглед на съставките"
-#: core/templates/navigation.html:172 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:187 nutrition/templates/units/list.html:6
msgid "Ingredient weight units"
msgstr "Единици за тежест на съставки"
-#: core/templates/navigation.html:177
-#: nutrition/templates/ingredient/pending.html:6
-msgid "Ingredients pending review"
-msgstr "Съставки без преглед"
-
-#: core/templates/navigation.html:193 software/templates/features.html:442
+#: core/templates/navigation.html:203 software/templates/features.html:442
msgid "Body weight"
msgstr ""
-#: core/templates/navigation.html:200 core/templates/user/overview.html:114
+#: core/templates/navigation.html:210 core/templates/user/overview.html:114
msgid "Weight overview"
msgstr "Преглед на тегло"
-#: core/templates/navigation.html:207 weight/views.py:65
+#: core/templates/navigation.html:217 weight/views.py:65
msgid "Add weight entry"
msgstr "Добави тегло"
-#: core/templates/navigation.html:221
+#: core/templates/navigation.html:231
msgid "About this software"
msgstr "Относно този код"
-#: core/templates/navigation.html:227 software/templates/about_us.html:5
+#: core/templates/navigation.html:237 software/templates/about_us.html:5
msgid "About us"
msgstr "За нас"
-#: core/templates/navigation.html:233 software/templates/features.html:507
+#: core/templates/navigation.html:243 software/templates/features.html:507
msgid "REST API"
msgstr ""
-#: core/templates/navigation.html:239 utils/models.py:45
+#: core/templates/navigation.html:249 utils/models.py:45
msgid "License"
msgstr "Лиценз"
-#: core/templates/navigation.html:245
+#: core/templates/navigation.html:255
msgid "Developer documentation"
msgstr ""
-#: core/templates/navigation.html:252
+#: core/templates/navigation.html:262
msgid "Get the code"
msgstr "Грабни кода"
-#: core/templates/navigation.html:259 core/templates/template.html:212
+#: core/templates/navigation.html:269 core/templates/template.html:214
#: software/templates/features.html:582
msgid "Translate"
msgstr "Преведи"
-#: core/templates/navigation.html:293 core/templates/user/login.html:28
+#: core/templates/navigation.html:303 core/templates/user/login.html:28
msgid "Reset password"
msgstr "Промени парола"
-#: core/templates/navigation.html:311
+#: core/templates/navigation.html:321
msgid "My preferences"
msgstr "Моите преференции"
-#: core/templates/navigation.html:320
+#: core/templates/navigation.html:330
msgid "Logout"
msgstr "Изход"
-#: core/templates/navigation.html:343
+#: core/templates/navigation.html:353
msgid "Licenses"
msgstr ""
-#: core/templates/navigation.html:351
+#: core/templates/navigation.html:361
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr ""
-#: core/templates/navigation.html:359 core/templates/weight_unit/list.html:4
-#: nutrition/templates/ingredient/view.html:167
+#: core/templates/navigation.html:369 core/templates/weight_unit/list.html:4
+#: nutrition/templates/ingredient/view.html:141
msgid "Weight units"
msgstr "Единици за тегло"
-#: core/templates/navigation.html:367 core/templates/user/list.html:4
+#: core/templates/navigation.html:377 core/templates/user/list.html:4
msgid "User list"
msgstr ""
-#: core/templates/navigation.html:373
+#: core/templates/navigation.html:383
msgid "Gyms"
msgstr ""
@@ -857,12 +856,12 @@ msgstr "Мерси че ползвахте нашият сайт!"
msgid "The %(site_name)s team"
msgstr "Отбора на %(site_name)s."
-#: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:11
+#: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:12
msgid "previous"
msgstr "предишно"
-#: core/templates/tags/pagination.html:31
-#: core/templates/tags/pagination.html:35
+#: core/templates/tags/pagination.html:33
+#: core/templates/tags/pagination.html:38
msgid "next"
msgstr "следващо"
@@ -887,36 +886,36 @@ msgid "Add exercises to this workout day"
msgstr "Добави упражнения за този тренировъчен ден"
#: core/templates/tags/render_weight_log.html:17 manager/helpers.py:86
-#: manager/models/setting.py:69 manager/templates/set/formset.html:9
+#: manager/models/setting.py:72 manager/templates/set/formset.html:9
msgid "Reps"
msgstr "Повторения"
#: core/templates/tags/render_weight_log.html:30 manager/forms.py:191
-#: manager/models/log.py:103 manager/models/setting.py:99
+#: manager/models/log.py:103 manager/models/setting.py:102
#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
msgid "RiR"
msgstr ""
-#: core/templates/template.html:120 manager/templates/calendar/month.html:138
-#: manager/templates/schedule/view.html:249
-#: manager/templates/schedule/view.html:270
-#: manager/templates/workout/view.html:86
-#: manager/templates/workout/view.html:139
+#: core/templates/template.html:122 manager/templates/calendar/month.html:138
+#: manager/templates/schedule/view.html:248
+#: manager/templates/schedule/view.html:269
+#: manager/templates/workout/view.html:84
+#: manager/templates/workout/view.html:137
msgid "Close"
msgstr ""
-#: core/templates/template.html:136
+#: core/templates/template.html:138
msgid ""
"You are using a guest account, data entered will be deleted after a week."
msgstr ""
"Вие сте влезли като гост и всички данни, които добавяте ще бъдат изтрити "
"след една седмица."
-#: core/templates/template.html:141
+#: core/templates/template.html:143
msgid "Create some demo entries"
msgstr "Направи демонстративни попълнения"
-#: core/templates/template.html:178 software/templates/features.html:547
+#: core/templates/template.html:180 software/templates/features.html:547
#: software/templates/tos.html:7
msgid "Terms of service"
msgstr ""
@@ -1008,7 +1007,7 @@ msgid "Overview"
msgstr "Преглед"
#: core/templates/user/overview.html:28
-#: manager/templates/schedule/view.html:164
+#: manager/templates/schedule/view.html:163
#: manager/templates/workout/overview.html:39 manager/views/schedule_step.py:60
msgid "Add workout"
msgstr "Добави упражнение"
@@ -1016,20 +1015,20 @@ msgstr "Добави упражнение"
#: core/templates/user/overview.html:34 core/templates/user/overview.html:76
#: core/templates/user/overview.html:120 core/templates/user/overview.html:152
#: exercises/models/base.py:118 exercises/models/base.py:124
-#: exercises/models/exercise.py:63 exercises/models/exercise.py:69
+#: exercises/models/exercise.py:64 exercises/models/exercise.py:70
#: exercises/models/image.py:107 exercises/models/image.py:113
#: exercises/models/video.py:163 exercises/models/video.py:169
#: gallery/models/image.py:42 manager/helpers.py:85 manager/models/log.py:100
#: manager/models/session.py:67 measurements/models/measurement.py:47
-#: nutrition/models/ingredient.py:101 nutrition/models/ingredient.py:107
-#: nutrition/models/ingredient.py:222 weight/models.py:33
+#: nutrition/models/ingredient.py:87 nutrition/models/ingredient.py:93
+#: nutrition/models/ingredient.py:216 weight/models.py:51
#: weight/templates/import_csv_preview.html:13
#: weight/templates/import_csv_preview.html:42 weight/views.py:144
msgid "Date"
msgstr "Дата"
#: core/templates/user/overview.html:35 core/templates/user/overview.html:153
-#: exercises/models/exercise.py:51 gallery/models/image.py:65
+#: exercises/models/exercise.py:52 gallery/models/image.py:65
#: gym/models/contract.py:58 gym/models/contract.py:109
#: manager/models/day.py:37 manager/models/workout.py:63
#: measurements/models/measurement.py:62 nutrition/models/plan.py:67
@@ -1047,13 +1046,13 @@ msgstr ""
#: core/templates/user/overview.html:58
#: manager/templates/calendar/month.html:128
-#: manager/templates/schedule/view.html:145
+#: manager/templates/schedule/view.html:144
#: manager/templates/workout/overview.html:28
msgid "No workouts found."
msgstr "Не са намерени тренировки."
#: core/templates/user/overview.html:68 manager/forms.py:280
-#: manager/templates/workout/view.html:108
+#: manager/templates/workout/view.html:106
msgid "Log"
msgstr ""
@@ -1077,35 +1076,35 @@ msgstr ""
#: core/templates/user/overview.html:112 core/templates/user/overview.html:121
#: manager/forms.py:186 manager/helpers.py:86 manager/models/log.py:86
-#: manager/models/setting.py:79 manager/templates/log/add.html:54
-#: manager/templates/set/formset.html:11 weight/models.py:35
+#: manager/models/setting.py:82 manager/templates/log/add.html:54
+#: manager/templates/set/formset.html:11 weight/models.py:53
#: weight/templates/import_csv_preview.html:14
#: weight/templates/import_csv_preview.html:43 weight/views.py:144
msgid "Weight"
msgstr "Тегло"
-#: core/templates/user/overview.html:154 nutrition/models/ingredient.py:130
-#: nutrition/templates/ingredient/view.html:77 nutrition/views/plan.py:237
+#: core/templates/user/overview.html:154 nutrition/models/ingredient.py:116
+#: nutrition/templates/ingredient/view.html:51 nutrition/views/plan.py:237
msgid "Energy"
msgstr "Енергия"
-#: core/templates/user/overview.html:155 nutrition/models/ingredient.py:137
-#: nutrition/templates/ingredient/view.html:84 nutrition/views/plan.py:243
+#: core/templates/user/overview.html:155 nutrition/models/ingredient.py:123
+#: nutrition/templates/ingredient/view.html:58 nutrition/views/plan.py:243
msgid "Protein"
msgstr "Протеин"
-#: core/templates/user/overview.html:156 nutrition/models/ingredient.py:145
-#: nutrition/templates/ingredient/view.html:90 nutrition/views/plan.py:251
+#: core/templates/user/overview.html:156 nutrition/models/ingredient.py:131
+#: nutrition/templates/ingredient/view.html:64 nutrition/views/plan.py:251
msgid "Carbohydrates"
msgstr "Въглехидрати"
-#: core/templates/user/overview.html:157 nutrition/models/ingredient.py:163
-#: nutrition/templates/ingredient/view.html:106 nutrition/views/plan.py:265
+#: core/templates/user/overview.html:157 nutrition/models/ingredient.py:149
+#: nutrition/templates/ingredient/view.html:80 nutrition/views/plan.py:265
msgid "Fat"
msgstr "Мазнини"
#: core/templates/user/overview.html:170
-#: nutrition/templates/ingredient/view.html:79
+#: nutrition/templates/ingredient/view.html:53
msgid "kcal"
msgstr ""
@@ -1117,7 +1116,7 @@ msgstr ""
#: gym/templates/gym/member_list.html:207
#: gym/templates/gym/member_list.html:240
#: gym/templates/gym/member_list.html:277
-#: manager/templates/schedule/view.html:101
+#: manager/templates/schedule/view.html:100
msgid "Actions"
msgstr "Действия"
@@ -1160,7 +1159,7 @@ msgid "Details"
msgstr ""
#: core/templates/user/overview.html:258 gym/views/export.py:57
-#: manager/helpers.py:86 manager/templates/schedule/view.html:99
+#: manager/helpers.py:86 manager/templates/schedule/view.html:98
msgid "Nr."
msgstr "№"
@@ -1205,7 +1204,7 @@ msgid "Documents"
msgstr ""
#: core/templates/user/overview.html:412 gym/templates/document/list.html:32
-#: manager/forms.py:292 manager/templates/workout/view.html:134
+#: manager/forms.py:292 manager/templates/workout/view.html:132
msgid "Download"
msgstr ""
@@ -1256,13 +1255,13 @@ msgid "kg"
msgstr ""
#: core/templatetags/wger_extras.py:207
-#: nutrition/templates/ingredient/view.html:86
-#: nutrition/templates/ingredient/view.html:92
-#: nutrition/templates/ingredient/view.html:99
-#: nutrition/templates/ingredient/view.html:108
-#: nutrition/templates/ingredient/view.html:115
-#: nutrition/templates/ingredient/view.html:137
-#: nutrition/templates/ingredient/view.html:147
+#: nutrition/templates/ingredient/view.html:60
+#: nutrition/templates/ingredient/view.html:66
+#: nutrition/templates/ingredient/view.html:73
+#: nutrition/templates/ingredient/view.html:82
+#: nutrition/templates/ingredient/view.html:89
+#: nutrition/templates/ingredient/view.html:111
+#: nutrition/templates/ingredient/view.html:121
msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr ""
@@ -1280,7 +1279,7 @@ msgstr ""
#: exercises/views/equipment.py:103 exercises/views/exercises.py:73
#: exercises/views/muscles.py:99 manager/views/schedule.py:309
#: manager/views/schedule_step.py:128 manager/views/workout.py:249
-#: manager/views/workout_session.py:142 nutrition/views/ingredient.py:116
+#: manager/views/workout_session.py:142 nutrition/views/ingredient.py:119
#: nutrition/views/unit.py:110
msgid "Successfully deleted"
msgstr ""
@@ -1292,7 +1291,7 @@ msgstr ""
#: gym/views/admin_notes.py:196 gym/views/document.py:206 gym/views/gym.py:481
#: manager/views/schedule.py:316 manager/views/schedule_step.py:138
#: manager/views/workout.py:253 manager/views/workout_session.py:156
-#: nutrition/views/ingredient.py:123 nutrition/views/unit.py:117
+#: nutrition/views/ingredient.py:126 nutrition/views/unit.py:117
#, python-brace-format
msgid "Delete {0}?"
msgstr ""
@@ -1305,7 +1304,7 @@ msgstr ""
#: gym/views/contract.py:186 gym/views/contract_option.py:123
#: gym/views/contract_type.py:123 gym/views/document.py:171
#: gym/views/gym.py:463 manager/views/day.py:100 manager/views/schedule.py:333
-#: manager/views/workout.py:267 nutrition/views/ingredient.py:142
+#: manager/views/workout.py:267 nutrition/views/ingredient.py:145
#: nutrition/views/unit.py:143
#, python-brace-format
msgid "Edit {0}"
@@ -1380,7 +1379,7 @@ msgstr ""
msgid "A verification email was sent to %(email)s"
msgstr ""
-#: exercises/models/base.py:82 nutrition/models/ingredient.py:236
+#: exercises/models/base.py:82 nutrition/models/ingredient.py:230
msgid "Category"
msgstr "Категория"
@@ -1400,7 +1399,7 @@ msgstr ""
msgid "Exercise Categories"
msgstr "Категории на упражнения"
-#: exercises/models/comment.py:52 exercises/models/exercise_alias.py:52
+#: exercises/models/comment.py:52 exercises/models/exercise_alias.py:53
#: exercises/models/image.py:74 exercises/models/video.py:98
#: manager/forms.py:178 manager/helpers.py:86 manager/models/log.py:52
msgid "Exercise"
@@ -1410,12 +1409,12 @@ msgstr "Упражнение"
msgid "A comment about how to correctly do this exercise."
msgstr "Коментар как да се направи упражнението правилно."
-#: exercises/models/exercise.py:76 nutrition/models/ingredient.py:95
+#: exercises/models/exercise.py:77 nutrition/models/ingredient.py:81
#: nutrition/models/weight_unit.py:32
msgid "Language"
msgstr "Език"
-#: exercises/models/exercise_alias.py:58
+#: exercises/models/exercise_alias.py:59
#, fuzzy
#| msgid "Add new exercise"
msgid "Alias for an exercise"
@@ -1559,7 +1558,7 @@ msgstr "Действия"
#: manager/models/schedule.py:44 manager/models/session.py:49
#: manager/models/workout.py:89 measurements/models/category.py:31
#: measurements/models/measurement.py:42 nutrition/models/plan.py:54
-#: nutrition/templates/ingredient/pending.html:16 weight/models.py:42
+#: weight/models.py:60
msgid "User"
msgstr "Потребител"
@@ -1682,9 +1681,9 @@ msgid "Contract type"
msgstr ""
#: gym/models/contract.py:211 gym/templates/contract/view.html:59
-#: manager/templates/log/add.html:52 nutrition/forms.py:62
-#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:105
-#: nutrition/models/meal_item.py:72
+#: manager/templates/log/add.html:52 nutrition/forms.py:63
+#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:108
+#: nutrition/models/meal_item.py:73
msgid "Amount"
msgstr "Количество"
@@ -1701,7 +1700,7 @@ msgid "Contract is active"
msgstr ""
#: gym/models/contract.py:237 gym/templates/contract/view.html:69
-#: manager/models/schedule.py:61 manager/templates/schedule/view.html:68
+#: manager/models/schedule.py:61 manager/templates/schedule/view.html:67
msgid "Start date"
msgstr "Начална дата"
@@ -2087,7 +2086,7 @@ msgstr ""
#: mailer/templates/mailer/gym/form.html:28
#: mailer/templates/mailer/gym/preview.html:62
-#: manager/templates/workout/view.html:42
+#: manager/templates/workout/view.html:40
msgid "Steps"
msgstr "Стъпки"
@@ -2109,7 +2108,7 @@ msgid ""
msgstr ""
#: mailer/templates/mailer/gym/preview.html:22
-#: software/templates/about_us.html:60
+#: software/templates/about_us.html:70
msgid "Current version"
msgstr ""
@@ -2144,18 +2143,18 @@ msgstr ""
"Можеш да потърсиш повече от едно упражнение, като те ще бъдат групирани в "
"суперсет."
-#: manager/forms.py:140 nutrition/forms.py:252
+#: manager/forms.py:140 nutrition/forms.py:253
#, fuzzy
#| msgid "Also use ingredients in English"
msgid "Also search for names in English"
msgstr "Също използвай съставки на Английски"
#: manager/forms.py:168 manager/forms.py:173 manager/models/log.py:64
-#: manager/models/log.py:92 manager/models/setting.py:59
-#: manager/models/setting.py:90 manager/templates/log/add.html:53
+#: manager/models/log.py:92 manager/models/setting.py:62
+#: manager/models/setting.py:93 manager/templates/log/add.html:53
#: manager/templates/log/add.html:55 manager/templates/set/formset.html:10
#: manager/templates/set/formset.html:12 measurements/models/category.py:41
-#: nutrition/forms.py:66
+#: nutrition/forms.py:67
msgid "Unit"
msgstr ""
@@ -2163,15 +2162,15 @@ msgstr ""
msgid "Type"
msgstr ""
-#: manager/forms.py:280 manager/templates/workout/view.html:115
+#: manager/forms.py:280 manager/templates/workout/view.html:113
msgid "Table"
msgstr ""
-#: manager/forms.py:282 manager/templates/workout/view.html:121
+#: manager/forms.py:282 manager/templates/workout/view.html:119
msgid "with images"
msgstr ""
-#: manager/forms.py:283 manager/templates/workout/view.html:127
+#: manager/forms.py:283 manager/templates/workout/view.html:125
msgid "with comments"
msgstr ""
@@ -2180,11 +2179,10 @@ msgid "Workout will expire soon"
msgstr ""
#: manager/models/day.py:34 manager/models/log.py:58
-#: manager/models/session.py:60 manager/templates/schedule/view.html:103
-#: manager/templates/workout/view.html:11
-#: manager/templates/workout/view.html:19 manager/views/pdf.py:85
-#: manager/views/pdf.py:161 manager/views/schedule.py:151
-#: manager/views/schedule.py:221
+#: manager/models/session.py:60 manager/templates/schedule/view.html:102
+#: manager/templates/workout/view.html:9 manager/templates/workout/view.html:17
+#: manager/views/pdf.py:85 manager/views/pdf.py:161
+#: manager/views/schedule.py:151 manager/views/schedule.py:221
msgid "Workout"
msgstr "Упражнение"
@@ -2203,7 +2201,7 @@ msgid "Name or short description of the schedule. For example 'Program XYZ'."
msgstr ""
"Име или кратко описание на тренировъчната схема. Например \"Схема XYZ\"."
-#: manager/models/schedule.py:65 manager/templates/schedule/view.html:72
+#: manager/models/schedule.py:65 manager/templates/schedule/view.html:71
msgid "Schedule active"
msgstr "Схемата е активна"
@@ -2217,7 +2215,7 @@ msgstr ""
"(например, ще бъде показан на таблото ви). Всички други графици ще бъдат "
"маркирани като неактивни."
-#: manager/models/schedule.py:77 manager/templates/schedule/view.html:82
+#: manager/models/schedule.py:77 manager/templates/schedule/view.html:81
msgid "Is a loop"
msgstr ""
@@ -2238,8 +2236,8 @@ msgid "The duration in weeks"
msgstr "Времетраене в седмици"
#: manager/models/schedule_step.py:64 manager/models/set.py:53
-#: manager/models/setting.py:110 nutrition/models/meal.py:55
-#: nutrition/models/meal_item.py:65
+#: manager/models/setting.py:113 nutrition/models/meal.py:55
+#: nutrition/models/meal_item.py:66
msgid "Order"
msgstr "Ред"
@@ -2289,7 +2287,7 @@ msgstr "Ден за упражнение"
msgid "Number of sets"
msgstr "Номер на серии"
-#: manager/models/setting.py:48
+#: manager/models/setting.py:51
msgid "Sets"
msgstr "Серии"
@@ -2360,7 +2358,7 @@ msgstr ""
msgid "Go to current month"
msgstr ""
-#: manager/templates/calendar/month.html:188
+#: manager/templates/calendar/month.html:190
msgid "Add new log"
msgstr ""
@@ -2397,8 +2395,8 @@ msgid "Your schedules"
msgstr "Твоите графици"
#: manager/templates/schedule/overview.html:19
-#: manager/templates/schedule/view.html:132
-#: manager/templates/schedule/view.html:184
+#: manager/templates/schedule/view.html:131
+#: manager/templates/schedule/view.html:183
#: manager/templates/workout/overview.html:16
msgid "active"
msgstr "активен"
@@ -2459,29 +2457,29 @@ msgstr ""
msgid "Add schedule"
msgstr "Добави график"
-#: manager/templates/schedule/view.html:10
+#: manager/templates/schedule/view.html:9
msgid "Schedule"
msgstr ""
-#: manager/templates/schedule/view.html:86
+#: manager/templates/schedule/view.html:85
msgid ""
"This schedule is a loop and will go through the workouts above till you "
"deactivate it"
msgstr "Този график е повтарящ се докато не го деактивираш."
-#: manager/templates/schedule/view.html:104
+#: manager/templates/schedule/view.html:103
msgid "Weeks"
msgstr "Седмици"
-#: manager/templates/schedule/view.html:116
+#: manager/templates/schedule/view.html:115
msgid "Move me"
msgstr "Премести ме"
-#: manager/templates/schedule/view.html:157
+#: manager/templates/schedule/view.html:156
msgid "Start schedule"
msgstr ""
-#: manager/templates/schedule/view.html:188
+#: manager/templates/schedule/view.html:187
#, python-format
msgid ""
"%(weeks)s Week\n"
@@ -2492,11 +2490,11 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: manager/templates/schedule/view.html:222
+#: manager/templates/schedule/view.html:221
msgid "Adding workouts"
msgstr "Добавяне на тренировки"
-#: manager/templates/schedule/view.html:224
+#: manager/templates/schedule/view.html:223
msgid ""
"Add as many workouts to the schedule as you want. You can\n"
" edit the order by dragging and dropping them. It's also possible "
@@ -2504,21 +2502,21 @@ msgid ""
" than once."
msgstr ""
-#: manager/templates/schedule/view.html:233
-#: manager/templates/schedule/view.html:244
-#: manager/templates/schedule/view.html:291
-#: manager/templates/workout/view.html:71
-#: manager/templates/workout/view.html:81
-#: manager/templates/workout/view.html:180
+#: manager/templates/schedule/view.html:232
+#: manager/templates/schedule/view.html:243
+#: manager/templates/schedule/view.html:290
+#: manager/templates/workout/view.html:69
+#: manager/templates/workout/view.html:79
+#: manager/templates/workout/view.html:178
msgid "Export calendar file"
msgstr ""
-#: manager/templates/schedule/view.html:237
+#: manager/templates/schedule/view.html:236
msgid "Export this schedule as a calendar file."
msgstr ""
-#: manager/templates/schedule/view.html:238
-#: manager/templates/workout/view.html:76
+#: manager/templates/schedule/view.html:237
+#: manager/templates/workout/view.html:74
msgid ""
"You can then import the file it into your calendar\n"
" application for example google calendar, outlook or "
@@ -2527,18 +2525,18 @@ msgid ""
"appropriate exercises."
msgstr ""
-#: manager/templates/schedule/view.html:259
-#: manager/templates/schedule/view.html:295
-#: manager/templates/workout/view.html:96
-#: manager/templates/workout/view.html:176
+#: manager/templates/schedule/view.html:258
+#: manager/templates/schedule/view.html:294
+#: manager/templates/workout/view.html:94
+#: manager/templates/workout/view.html:174
msgid "Download as PDF"
msgstr "Свали като PDF"
-#: manager/templates/schedule/view.html:300
+#: manager/templates/schedule/view.html:299
msgid "Edit schedule"
msgstr "Промени график"
-#: manager/templates/schedule/view.html:305
+#: manager/templates/schedule/view.html:304
msgid "Delete schedule"
msgstr "Изтрий график"
@@ -2668,12 +2666,12 @@ msgid "Mark as workout"
msgstr "Направи копие на тренировката"
#: manager/templates/workout/template_view.html:65
-#: manager/templates/workout/view.html:51
+#: manager/templates/workout/view.html:49
msgid "Muscles trained"
msgstr "Тренирани мускули"
#: manager/templates/workout/template_view.html:68
-#: manager/templates/workout/view.html:54
+#: manager/templates/workout/view.html:52
msgid ""
"Images show combined muscles as trained by the exercises on the workout."
msgstr ""
@@ -2686,35 +2684,35 @@ msgstr ""
msgid "Use this template"
msgstr "Ползвайте страницата"
-#: manager/templates/workout/view.html:45
+#: manager/templates/workout/view.html:43
msgid "Add training days"
msgstr "Добави дни за тренировка"
-#: manager/templates/workout/view.html:46
+#: manager/templates/workout/view.html:44
msgid "Add workout sets to days"
msgstr ""
-#: manager/templates/workout/view.html:47
+#: manager/templates/workout/view.html:45
msgid "Set the repetitions for each set"
msgstr "Задайте повторения за всяка серия"
-#: manager/templates/workout/view.html:75
+#: manager/templates/workout/view.html:73
msgid "Export this workout as a calendar file."
msgstr ""
-#: manager/templates/workout/view.html:146
+#: manager/templates/workout/view.html:144
msgid "Logs"
msgstr ""
-#: manager/templates/workout/view.html:148
+#: manager/templates/workout/view.html:146
msgid "View logs"
msgstr ""
-#: manager/templates/workout/view.html:171 manager/views/schedule_step.py:99
+#: manager/templates/workout/view.html:169 manager/views/schedule_step.py:99
msgid "Edit workout"
msgstr "Редактирай тренировката"
-#: manager/templates/workout/view.html:184 manager/views/workout.py:281
+#: manager/templates/workout/view.html:182 manager/views/workout.py:281
msgid "Mark as template"
msgstr ""
@@ -2761,110 +2759,95 @@ msgstr ""
msgid "Value"
msgstr ""
-#: nutrition/forms.py:117
+#: nutrition/forms.py:118
#, fuzzy
#| msgid "Weight"
msgid "Height (in)"
msgstr "Тегло"
-#: nutrition/forms.py:120
+#: nutrition/forms.py:121
#, fuzzy
#| msgid "Weight log"
msgid "Weight (kg)"
msgstr "Запис на тегло"
-#: nutrition/forms.py:120
+#: nutrition/forms.py:121
#, fuzzy
#| msgid "Weight log"
msgid "Weight (lbs)"
msgstr "Запис на тегло"
-#: nutrition/forms.py:133
+#: nutrition/forms.py:134
msgid "Calculate"
msgstr ""
-#: nutrition/forms.py:207 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:208 nutrition/templates/rate/form.html:76
msgid "Basic caloric intake"
msgstr ""
-#: nutrition/forms.py:208
+#: nutrition/forms.py:209
msgid "Your basic caloric intake as calculated for your data"
msgstr ""
-#: nutrition/forms.py:213
+#: nutrition/forms.py:214
msgid "Additional calories"
msgstr ""
-#: nutrition/forms.py:215
+#: nutrition/forms.py:216
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
msgstr ""
-#: nutrition/forms.py:248 nutrition/models/ingredient_weight_unit.py:39
-#: nutrition/models/log.py:84 nutrition/models/meal_item.py:53
+#: nutrition/forms.py:249 nutrition/models/ingredient_weight_unit.py:39
+#: nutrition/models/log.py:87 nutrition/models/meal_item.py:54
msgid "Ingredient"
msgstr "Съставка"
-#: nutrition/models/ingredient.py:131
+#: nutrition/models/ingredient.py:117
msgid "In kcal per 100g"
msgstr "в кило калории за 100гр"
-#: nutrition/models/ingredient.py:138 nutrition/models/ingredient.py:146
-#: nutrition/models/ingredient.py:156 nutrition/models/ingredient.py:164
-#: nutrition/models/ingredient.py:174 nutrition/models/ingredient.py:184
-#: nutrition/models/ingredient.py:194
+#: nutrition/models/ingredient.py:124 nutrition/models/ingredient.py:132
+#: nutrition/models/ingredient.py:142 nutrition/models/ingredient.py:150
+#: nutrition/models/ingredient.py:160 nutrition/models/ingredient.py:170
+#: nutrition/models/ingredient.py:180
msgid "In g per 100g of product"
msgstr "В гр. за 100гр продукт"
-#: nutrition/models/ingredient.py:155
-#: nutrition/templates/ingredient/view.html:96 nutrition/views/plan.py:259
+#: nutrition/models/ingredient.py:141
+#: nutrition/templates/ingredient/view.html:70 nutrition/views/plan.py:259
msgid "Sugar content in carbohydrates"
msgstr "Състав на захар в въглехидратите"
-#: nutrition/models/ingredient.py:173
-#: nutrition/templates/ingredient/view.html:112 nutrition/views/plan.py:273
+#: nutrition/models/ingredient.py:159
+#: nutrition/templates/ingredient/view.html:86 nutrition/views/plan.py:273
msgid "Saturated fat content in fats"
msgstr "Наситени мазнини в мазнини"
-#: nutrition/models/ingredient.py:183
-#: nutrition/templates/ingredient/view.html:134 nutrition/views/plan.py:279
-msgid "Fibres"
-msgstr "Фибри"
+#: nutrition/models/ingredient.py:169
+#: nutrition/templates/ingredient/view.html:108 nutrition/views/plan.py:279
+msgid "Fiber"
+msgstr ""
-#: nutrition/models/ingredient.py:193
-#: nutrition/templates/ingredient/view.html:144 nutrition/views/plan.py:285
+#: nutrition/models/ingredient.py:179
+#: nutrition/templates/ingredient/view.html:118 nutrition/views/plan.py:285
msgid "Sodium"
msgstr "Натрий"
-#: nutrition/models/ingredient.py:215
+#: nutrition/models/ingredient.py:209
msgid "Link to product"
msgstr ""
-#: nutrition/models/ingredient.py:244
+#: nutrition/models/ingredient.py:238
msgid "Brand name of product"
msgstr ""
-#: nutrition/models/ingredient.py:304
+#: nutrition/models/ingredient.py:305
#, python-brace-format
msgid "The total energy ({self.energy}kcal) is not the approximate sum of the "
msgstr ""
-#: nutrition/models/ingredient.py:383 nutrition/views/ingredient.py:196
-msgid "Ingredient was successfully added to the general database"
-msgstr "Съставката е успешно добавен към общата база данни."
-
-#: nutrition/models/ingredient.py:408
-msgid "New user submitted ingredient"
-msgstr "Нова съставка добавена от потребител"
-
-#: nutrition/models/ingredient.py:410
-#, fuzzy, python-brace-format
-#| msgid "The user {0} submitted a new ingredient \"{1}\"."
-msgid ""
-"The user {request.user.username} submitted a new ingredient \"{self.name}\"."
-msgstr "Потребителя {0} добави нова съставка \"{1}\"."
-
#: nutrition/models/ingredient_category.py:31
msgid "Ingredient Categories"
msgstr ""
@@ -2877,16 +2860,16 @@ msgstr ""
msgid "Unit amount, e.g. \"1 Cup\" or \"1/2 spoon\""
msgstr "Единица количество, напр. \"1 Чаша\" или \"1/2 лъжица\""
-#: nutrition/models/log.py:49 nutrition/models/meal.py:50
-#: nutrition/models/meal_item.py:47 nutrition/models/plan.py:106
+#: nutrition/models/log.py:52 nutrition/models/meal.py:50
+#: nutrition/models/meal_item.py:48 nutrition/models/plan.py:108
msgid "Nutrition plan"
msgstr "План за хранене"
-#: nutrition/models/log.py:58
+#: nutrition/models/log.py:61
msgid "Meal"
msgstr "Ядене"
-#: nutrition/models/log.py:68
+#: nutrition/models/log.py:71
#, fuzzy
#| msgid "Time (approx)"
msgid "Date and Time (Approx.)"
@@ -2910,11 +2893,11 @@ msgstr ""
"Пояснение за целта на плана, напр. \"Работа са Маса\" или \"Подготви се за "
"лятото\""
-#: nutrition/models/plan.py:88
+#: nutrition/models/plan.py:90
msgid "Use daily calories"
msgstr ""
-#: nutrition/models/plan.py:91
+#: nutrition/models/plan.py:93
msgid ""
"Tick the box if you want to mark this plan as having a goal amount of "
"calories. You can use the calculator or enter the value yourself."
@@ -3029,67 +3012,36 @@ msgstr "Търси"
msgid "Add ingredient"
msgstr "Добави съставка"
-#: nutrition/templates/ingredient/pending.html:14
-msgid "Submission date"
-msgstr "Дата на подаване"
-
-#: nutrition/templates/ingredient/view.html:27
-msgid "Ingredient is pending review"
-msgstr "Съставките подлежат на преглед"
-
-#: nutrition/templates/ingredient/view.html:28
-msgid ""
-"This user submitted ingredient is pending a decision to be\n"
-"included in the database. Till then, it will not be shown in the overview "
-"or\n"
-"the search."
-msgstr ""
-"Съставката добавена от този потребител не е потвърдена, за да\n"
-"бъде добавена в датабазата. Дотогава, тя няма да бъде показвана в прегледа\n"
-"или търсачката."
-
-#: nutrition/templates/ingredient/view.html:31
-msgid "Please select one of the options below."
-msgstr "Моля изберете една опция от изброените по-долу."
-
-#: nutrition/templates/ingredient/view.html:38
-msgid "Accept"
-msgstr "Приемам"
-
-#: nutrition/templates/ingredient/view.html:42
-msgid "Decline"
-msgstr "Отказвам"
-
-#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:229
+#: nutrition/templates/ingredient/view.html:45 nutrition/views/plan.py:229
msgid "Macronutrients"
msgstr "Макронутриенти"
-#: nutrition/templates/ingredient/view.html:80
+#: nutrition/templates/ingredient/view.html:54
msgid "kJ"
msgstr ""
-#: nutrition/templates/ingredient/view.html:101
-#: nutrition/templates/ingredient/view.html:117
-#: nutrition/templates/ingredient/view.html:139
-#: nutrition/templates/ingredient/view.html:149
+#: nutrition/templates/ingredient/view.html:75
+#: nutrition/templates/ingredient/view.html:91
+#: nutrition/templates/ingredient/view.html:113
+#: nutrition/templates/ingredient/view.html:123
msgid "n.A."
msgstr "Не е налично"
-#: nutrition/templates/ingredient/view.html:128
+#: nutrition/templates/ingredient/view.html:102
msgid "Others"
msgstr "Други"
-#: nutrition/templates/ingredient/view.html:170
+#: nutrition/templates/ingredient/view.html:144
#: nutrition/templates/units/list.html:46 nutrition/views/unit.py:86
msgid "Add new weight unit"
msgstr "Добави нова единица за тегло"
-#: nutrition/templates/ingredient/view.html:232
-#: nutrition/templates/ingredient/view.html:235
+#: nutrition/templates/ingredient/view.html:206
+#: nutrition/templates/ingredient/view.html:209
msgid "Edit ingredient"
msgstr "Промени съставка"
-#: nutrition/templates/ingredient/view.html:239
+#: nutrition/templates/ingredient/view.html:213
msgid "Delete ingredient"
msgstr "Изтрий съставка"
@@ -3173,14 +3125,10 @@ msgstr ""
msgid "56 to 90"
msgstr ""
-#: nutrition/views/ingredient.py:154
+#: nutrition/views/ingredient.py:157
msgid "Add a new ingredient"
msgstr "Добави нова съставка"
-#: nutrition/views/ingredient.py:209
-msgid "Ingredient was successfully marked as rejected"
-msgstr "Съставката бе успешно маркирана като отхвърлена"
-
#: nutrition/views/plan.py:120
msgid "Nutritional plan"
msgstr ""
@@ -3225,48 +3173,56 @@ msgid ""
msgstr ""
#: software/templates/about_us.html:18
-msgid "Source code"
-msgstr ""
-
-#: software/templates/about_us.html:20
-msgid "Get the source code of this application and its server on github"
-msgstr ""
-
-#: software/templates/about_us.html:25
msgid "Have a problem or idea?"
msgstr ""
-#: software/templates/about_us.html:27
+#: software/templates/about_us.html:20
msgid ""
"Get in touch if something didn't behave as expected or if there is a feature "
"that you feel is missing."
msgstr ""
-#: software/templates/about_us.html:32
+#: software/templates/about_us.html:26
msgid "Say hi!"
msgstr ""
-#: software/templates/about_us.html:34
+#: software/templates/about_us.html:28
msgid "If you want to chat with us, hop on the Discord server and get in touch"
msgstr ""
-#: software/templates/about_us.html:39 software/templates/features.html:503
+#: software/templates/about_us.html:33
+msgid "Mastodon"
+msgstr ""
+
+#: software/templates/about_us.html:35
+msgid "Follow us on mastodon for updates and news about the project"
+msgstr ""
+
+#: software/templates/about_us.html:40 software/templates/features.html:503
#, fuzzy
#| msgid "Translate"
msgid "Translation"
msgstr "Преведи"
-#: software/templates/about_us.html:41
+#: software/templates/about_us.html:42
msgid ""
"This application is translated on weblate. If you also want to help, click "
"the link and start translating"
msgstr ""
-#: software/templates/about_us.html:50
+#: software/templates/about_us.html:47
+msgid "Source code"
+msgstr ""
+
+#: software/templates/about_us.html:49
+msgid "Get the source code of this application and its server on github"
+msgstr ""
+
+#: software/templates/about_us.html:59
msgid "Our goal"
msgstr ""
-#: software/templates/about_us.html:53
+#: software/templates/about_us.html:62
#, fuzzy
#| msgid ""
#| "The goal is to build an awesome\n"
@@ -3276,7 +3232,8 @@ msgstr ""
msgid ""
"The goal is to build an awesome\n"
" and flexible fitness manager, along with a comprehensive and "
-"complete list of exercises and\n"
+"complete list of\n"
+" exercises and\n"
" ingredients, all released under a free license."
msgstr ""
"Целта е да се изгради едно страхотно \n"
@@ -3290,10 +3247,6 @@ msgid ""
"your exercises and workouts."
msgstr ""
-#: software/templates/features.html:45
-msgid "About"
-msgstr "Относно"
-
#: software/templates/features.html:57
msgid "Mobile app"
msgstr ""
@@ -3543,18 +3496,6 @@ msgid ""
"to its own copyright."
msgstr ""
-#: utils/models.py:130
-msgid "Pending"
-msgstr "В очакване"
-
-#: utils/models.py:131
-msgid "Accepted"
-msgstr "Прието"
-
-#: utils/models.py:132
-msgid "Declined"
-msgstr "Отказано"
-
#: weight/forms.py:54
msgid "Input"
msgstr ""
@@ -3567,7 +3508,7 @@ msgstr ""
msgid "You have to enter your weight"
msgstr ""
-#: weight/models.py:60
+#: weight/models.py:78
msgid "Weight entry"
msgstr ""
@@ -3684,6 +3625,66 @@ msgstr ""
msgid "Delete weight entry for the %s"
msgstr ""
+#~ msgid "Ingredients pending review"
+#~ msgstr "Съставки без преглед"
+
+#~ msgid "Fibres"
+#~ msgstr "Фибри"
+
+#~ msgid "Ingredient was successfully added to the general database"
+#~ msgstr "Съставката е успешно добавен към общата база данни."
+
+#~ msgid "New user submitted ingredient"
+#~ msgstr "Нова съставка добавена от потребител"
+
+#, fuzzy, python-brace-format
+#~| msgid "The user {0} submitted a new ingredient \"{1}\"."
+#~ msgid ""
+#~ "The user {request.user.username} submitted a new ingredient \"{self."
+#~ "name}\"."
+#~ msgstr "Потребителя {0} добави нова съставка \"{1}\"."
+
+#~ msgid "Submission date"
+#~ msgstr "Дата на подаване"
+
+#~ msgid "Ingredient is pending review"
+#~ msgstr "Съставките подлежат на преглед"
+
+#~ msgid ""
+#~ "This user submitted ingredient is pending a decision to be\n"
+#~ "included in the database. Till then, it will not be shown in the overview "
+#~ "or\n"
+#~ "the search."
+#~ msgstr ""
+#~ "Съставката добавена от този потребител не е потвърдена, за да\n"
+#~ "бъде добавена в датабазата. Дотогава, тя няма да бъде показвана в "
+#~ "прегледа\n"
+#~ "или търсачката."
+
+#~ msgid "Please select one of the options below."
+#~ msgstr "Моля изберете една опция от изброените по-долу."
+
+#~ msgid "Accept"
+#~ msgstr "Приемам"
+
+#~ msgid "Decline"
+#~ msgstr "Отказвам"
+
+#~ msgid "Ingredient was successfully marked as rejected"
+#~ msgstr "Съставката бе успешно маркирана като отхвърлена"
+
+#~ msgid "About"
+#~ msgstr "Относно"
+
+#~ msgid "Pending"
+#~ msgstr "В очакване"
+
+#~ msgid "Accepted"
+#~ msgstr "Прието"
+
+#~ msgid "Declined"
+#~ msgstr "Отказано"
+
#~ msgid "This workout is part of a schedule:"
#~ msgstr "Тази тренировка е част от график:"
diff --git a/wger/locale/ca/LC_MESSAGES/django.po b/wger/locale/ca/LC_MESSAGES/django.po
index 9361ebaf3..182480156 100644
--- a/wger/locale/ca/LC_MESSAGES/django.po
+++ b/wger/locale/ca/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-02-02 12:42+0100\n"
+"POT-Creation-Date: 2024-07-14 15:49+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"
@@ -31,7 +31,7 @@ msgstr ""
"tot nou usuari que es registri a dit gimnàs i actualitzarà tots els usuaris "
"existents que no en tinguin."
-#: config/views/gym_config.py:42 core/templates/language/view.html:63
+#: config/views/gym_config.py:42 core/templates/language/view.html:67
#: core/templates/license/list.html:17 core/templates/misc/license/list.html:18
#: core/templates/repetition_unit/list.html:18
#: core/templates/tags/render_day.html:39
@@ -51,8 +51,8 @@ msgstr ""
#: manager/templates/calendar/day.html:68
#: manager/templates/calendar/month.html:85
#: manager/templates/calendar/partial_overview_table.html:18
-#: manager/templates/schedule/view.html:119
-#: nutrition/templates/ingredient/view.html:191
+#: manager/templates/schedule/view.html:118
+#: nutrition/templates/ingredient/view.html:165
#: nutrition/templates/units/list.html:19
msgid "Edit"
msgstr "Edita"
@@ -88,8 +88,8 @@ msgstr "El meu programa d'entrenament xamós"
msgid "Empty placeholder schedule"
msgstr "Programa buit per a reservar l'espai"
-#: core/forms.py:69 core/templates/navigation.html:275
-#: core/templates/navigation.html:281 core/templates/user/login.html:4
+#: core/forms.py:69 core/templates/navigation.html:285
+#: core/templates/navigation.html:291 core/templates/user/login.html:4
#: software/templates/features.html:82 software/templates/features.html:427
msgid "Login"
msgstr "Accedeix"
@@ -163,7 +163,7 @@ msgstr "Contrasenya"
msgid "Please enter your current password."
msgstr "Introduïu la contrasenya actual."
-#: core/forms.py:242 core/templates/language/view.html:68
+#: core/forms.py:242 core/templates/language/view.html:73
#: core/templates/license/list.html:19 core/templates/misc/license/list.html:22
#: core/templates/repetition_unit/list.html:20
#: core/templates/tags/render_day.html:45
@@ -178,10 +178,10 @@ msgstr "Introduïu la contrasenya actual."
#: gym/templates/gym/list.html:22 manager/templates/calendar/day.html:73
#: manager/templates/calendar/month.html:89
#: manager/templates/calendar/partial_overview_table.html:23
-#: manager/templates/schedule/view.html:123
-#: manager/templates/workout/view.html:190
-#: nutrition/templates/ingredient/view.html:192
-#: nutrition/templates/ingredient/view.html:241
+#: manager/templates/schedule/view.html:122
+#: manager/templates/workout/view.html:188
+#: nutrition/templates/ingredient/view.html:166
+#: nutrition/templates/ingredient/view.html:215
#: nutrition/templates/units/list.html:22
msgid "Delete"
msgstr "Esborra"
@@ -194,14 +194,14 @@ msgstr "Contrasenya invàlida"
msgid "The form is secured with reCAPTCHA"
msgstr "El formulari està protegit amb reCAPTCHA"
-#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:275
-#: core/templates/navigation.html:287 core/templates/template.html:147
+#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:285
+#: core/templates/navigation.html:297 core/templates/template.html:149
#: core/templates/user/login.html:20 core/views/user.py:298
#: software/templates/features.html:87 software/templates/features.html:422
msgid "Register"
msgstr "Enregistreu-vos"
-#: core/forms.py:315
+#: core/forms.py:315 software/templates/features.html:45
msgid "Contact"
msgstr "Contacte"
@@ -210,7 +210,7 @@ msgid "Some way of answering you (e-mail, etc.)"
msgstr "Algun medi per respondre-us (adreça electrònica, etc.)"
#: core/forms.py:324 exercises/models/comment.py:58 manager/models/set.py:61
-#: manager/models/setting.py:111 nutrition/models/log.py:74
+#: manager/models/setting.py:114 nutrition/models/log.py:77
msgid "Comment"
msgstr "Comentari"
@@ -230,6 +230,12 @@ msgstr "Nom curt de la llengua"
msgid "Language full name"
msgstr "Nom llarg de la llengua"
+#: core/models/language.py:45 core/templates/language/view.html:23
+#, fuzzy
+#| msgid "Language full name"
+msgid "Language full name in English"
+msgstr "Nom llarg de la llengua"
+
#: core/models/license.py:29
msgid "Full name"
msgstr "Nom complet"
@@ -246,7 +252,7 @@ msgstr ""
msgid "Short name, e.g. CC-BY-SA 3"
msgstr "Nom curt, p. e. CC-BY-SA 3"
-#: core/models/license.py:45 nutrition/models/ingredient.py:214
+#: core/models/license.py:45 nutrition/models/ingredient.py:208
msgid "Link"
msgstr "Vincle"
@@ -363,7 +369,7 @@ msgstr ""
msgid "Age"
msgstr "Edat"
-#: core/models/profile.py:230 nutrition/forms.py:117
+#: core/models/profile.py:230 nutrition/forms.py:118
msgid "Height (cm)"
msgstr "Alçada (cm)"
@@ -414,7 +420,7 @@ msgid "Total caloric intake, including e.g. any surplus"
msgstr "Ingesta calòrica total, inclosos p. e. qualsevol extra"
#: core/models/profile.py:333 nutrition/models/ingredient_weight_unit.py:45
-#: nutrition/models/log.py:93 nutrition/models/meal_item.py:58
+#: nutrition/models/log.py:96 nutrition/models/meal_item.py:59
msgid "Weight unit"
msgstr "Unitat de pes"
@@ -448,17 +454,16 @@ msgstr "La suma de totes les hores ha de ser 24"
#: core/models/rep_unit.py:36 core/models/weight_unit.py:36
#: core/templates/user/overview.html:262 core/views/user.py:599
#: exercises/models/category.py:29 exercises/models/equipment.py:29
-#: exercises/models/exercise.py:58 exercises/models/muscle.py:36
+#: exercises/models/exercise.py:59 exercises/models/muscle.py:36
#: gym/models/contract.py:52 gym/models/contract.py:103 gym/models/gym.py:46
#: gym/models/user_document.py:84 gym/templates/contract/view.html:50
#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:96
#: gym/views/gym.py:158 manager/models/schedule.py:55
#: manager/models/workout.py:57 measurements/models/category.py:36
-#: nutrition/models/ingredient.py:125
+#: nutrition/models/ingredient.py:111
#: nutrition/models/ingredient_category.py:27 nutrition/models/meal.py:67
#: nutrition/models/weight_unit.py:38
-#: nutrition/templates/ingredient/pending.html:15
-#: nutrition/templates/ingredient/view.html:178
+#: nutrition/templates/ingredient/view.html:152
msgid "Name"
msgstr "Nom"
@@ -569,24 +574,24 @@ msgstr ""
msgid "Dashboard"
msgstr "Consola"
-#: core/templates/language/overview.html:4 core/templates/navigation.html:335
+#: core/templates/language/overview.html:4 core/templates/navigation.html:345
msgid "Languages"
msgstr "Llengües"
-#: core/templates/language/overview.html:20
+#: core/templates/language/overview.html:22
msgid "Nothing found."
msgstr "No s'ha trobat res."
-#: core/templates/language/overview.html:20
+#: core/templates/language/overview.html:22
#: manager/templates/calendar/month.html:132
#: manager/templates/schedule/overview.html:28
-#: manager/templates/schedule/view.html:145
+#: manager/templates/schedule/view.html:144
#: manager/templates/workout/overview.html:28
#: nutrition/templates/ingredient/overview.html:38
msgid "Add one now."
msgstr "Afegeix-ne un ara."
-#: core/templates/language/overview.html:33 core/templates/license/list.html:40
+#: core/templates/language/overview.html:35 core/templates/license/list.html:40
#: core/templates/misc/license/list.html:43
#: core/templates/repetition_unit/list.html:43
#: core/templates/user/overview.html:326 core/templates/user/overview.html:365
@@ -606,13 +611,13 @@ msgstr "Afegeix-ne un ara."
msgid "Add"
msgstr "Afegeix"
-#: core/templates/language/view.html:58 core/templates/user/api_key.html:44
+#: core/templates/language/view.html:61 core/templates/user/api_key.html:44
#: core/templates/user/preferences.html:45 gym/models/contract.py:203
#: gym/templates/contract/view.html:41 gym/templates/contract/view.html:106
#: gym/templates/gym/member_list.html:248
-#: manager/templates/schedule/view.html:286
-#: manager/templates/workout/view.html:165
-#: nutrition/templates/ingredient/view.html:228
+#: manager/templates/schedule/view.html:285
+#: manager/templates/workout/view.html:163
+#: nutrition/templates/ingredient/view.html:202
msgid "Options"
msgstr "Opcions"
@@ -637,12 +642,11 @@ msgstr "Llista de llicències"
#: gym/templates/gym/member_list.html:299
#: mailer/templates/mailer/gym/overview.html:30
#: manager/templates/calendar/day.html:87
-#: nutrition/templates/ingredient/pending.html:30
#: nutrition/templates/units/list.html:29
msgid "Nothing found"
msgstr "No s'ha trobat res"
-#: core/templates/misc/about.html:4 core/templates/template.html:173
+#: core/templates/misc/about.html:4 core/templates/template.html:175
msgid "Imprint"
msgstr "Colofó"
@@ -659,176 +663,171 @@ msgstr ""
"Si una llicència està localitzada, p. e. les llicències Creative Commons\n"
"per a diferents països, afegiu-les aquí com a entrades separades."
-#: core/templates/navigation.html:27 software/templates/features.html:437
+#: core/templates/navigation.html:28 software/templates/features.html:437
msgid "Training"
msgstr "Entrenament"
-#: core/templates/navigation.html:34 core/templates/user/overview.html:25
+#: core/templates/navigation.html:37 core/templates/user/overview.html:25
msgid "Workouts"
msgstr "Entrenaments"
-#: core/templates/navigation.html:42
+#: core/templates/navigation.html:46
msgid "Workouts schedules"
msgstr "Plans d'entrenament"
-#: core/templates/navigation.html:50 core/templates/user/overview.html:70
+#: core/templates/navigation.html:54 core/templates/user/overview.html:70
#: manager/templates/calendar/month.html:10
#: manager/templates/calendar/month.html:21
msgid "Calendar"
msgstr "Calendari"
-#: core/templates/navigation.html:60
+#: core/templates/navigation.html:64
msgid "Measurements"
msgstr ""
-#: core/templates/navigation.html:70 gallery/templates/images/overview.html:6
+#: core/templates/navigation.html:75 gallery/templates/images/overview.html:6
msgid "Gallery"
msgstr "Galeria"
-#: core/templates/navigation.html:76
+#: core/templates/navigation.html:81
msgid "Workout templates"
msgstr "Plantilles d'entrenaments"
-#: core/templates/navigation.html:82 manager/views/workout.py:84
+#: core/templates/navigation.html:88 manager/views/workout.py:84
msgid "Your templates"
msgstr "Les vostres plantilles"
-#: core/templates/navigation.html:90 manager/views/workout.py:98
+#: core/templates/navigation.html:97 manager/views/workout.py:98
msgid "Public templates"
msgstr "Plantilles públiques"
-#: core/templates/navigation.html:97 manager/forms.py:129
-#: manager/models/setting.py:54 software/templates/features.html:51
+#: core/templates/navigation.html:105 manager/forms.py:129
+#: manager/models/setting.py:57 software/templates/features.html:51
#: software/templates/features.html:459
msgid "Exercises"
msgstr "Exercicis"
-#: core/templates/navigation.html:103 core/templates/navigation.html:170
-#: core/templates/navigation.html:330
+#: core/templates/navigation.html:111 core/templates/navigation.html:184
+#: core/templates/navigation.html:340
msgid "Administration"
msgstr "Administració"
-#: core/templates/navigation.html:106
+#: core/templates/navigation.html:115
#, fuzzy
#| msgid "Exercise day"
msgid "Exercise edit history"
msgstr "Dia d'entrenament"
-#: core/templates/navigation.html:111 exercises/models/base.py:103
+#: core/templates/navigation.html:121 exercises/models/base.py:103
msgid "Equipment"
msgstr "Equipament"
-#: core/templates/navigation.html:116
+#: core/templates/navigation.html:127
msgid "Muscles"
msgstr "Músculs"
-#: core/templates/navigation.html:121
+#: core/templates/navigation.html:133
#: exercises/templates/categories/admin-overview.html:4
msgid "Categories"
msgstr "Categories"
-#: core/templates/navigation.html:136 software/templates/features.html:447
+#: core/templates/navigation.html:148 software/templates/features.html:447
msgid "Nutrition"
msgstr "Nutrició"
-#: core/templates/navigation.html:143 core/templates/user/overview.html:144
+#: core/templates/navigation.html:156 core/templates/user/overview.html:144
msgid "Nutrition plans"
msgstr "Plans de nutrició"
-#: core/templates/navigation.html:151 nutrition/templates/bmi/form.html:50
+#: core/templates/navigation.html:165 nutrition/templates/bmi/form.html:50
msgid "BMI calculator"
msgstr "Calculadora de l'IMC"
-#: core/templates/navigation.html:159 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:174 nutrition/templates/rate/form.html:17
msgid "Daily calories calculator"
msgstr "Calculadora de calories diàries"
-#: core/templates/navigation.html:165
+#: core/templates/navigation.html:179
#: nutrition/templates/ingredient/overview.html:10
msgid "Ingredient overview"
msgstr "Ingredients en un cop d'ull"
-#: core/templates/navigation.html:172 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:187 nutrition/templates/units/list.html:6
msgid "Ingredient weight units"
msgstr "Unitats de pes dels ingredients"
-#: core/templates/navigation.html:177
-#: nutrition/templates/ingredient/pending.html:6
-msgid "Ingredients pending review"
-msgstr "Ingredients pendents de revisar"
-
-#: core/templates/navigation.html:193 software/templates/features.html:442
+#: core/templates/navigation.html:203 software/templates/features.html:442
msgid "Body weight"
msgstr "Pes corporal"
-#: core/templates/navigation.html:200 core/templates/user/overview.html:114
+#: core/templates/navigation.html:210 core/templates/user/overview.html:114
msgid "Weight overview"
msgstr "El pes en un cop d'ull"
-#: core/templates/navigation.html:207 weight/views.py:65
+#: core/templates/navigation.html:217 weight/views.py:65
msgid "Add weight entry"
msgstr "Afegeix entrada de pes"
-#: core/templates/navigation.html:221
+#: core/templates/navigation.html:231
msgid "About this software"
msgstr "Quant a aquest programari"
-#: core/templates/navigation.html:227 software/templates/about_us.html:5
+#: core/templates/navigation.html:237 software/templates/about_us.html:5
msgid "About us"
msgstr "Quant a nosaltres"
-#: core/templates/navigation.html:233 software/templates/features.html:507
+#: core/templates/navigation.html:243 software/templates/features.html:507
msgid "REST API"
msgstr "API REST"
-#: core/templates/navigation.html:239 utils/models.py:45
+#: core/templates/navigation.html:249 utils/models.py:45
msgid "License"
msgstr "Llicència"
-#: core/templates/navigation.html:245
+#: core/templates/navigation.html:255
msgid "Developer documentation"
msgstr "Documentació per a desenvolupadors"
-#: core/templates/navigation.html:252
+#: core/templates/navigation.html:262
msgid "Get the code"
msgstr "Obteniu el codi font"
-#: core/templates/navigation.html:259 core/templates/template.html:212
+#: core/templates/navigation.html:269 core/templates/template.html:214
#: software/templates/features.html:582
msgid "Translate"
msgstr "Traduïu"
-#: core/templates/navigation.html:293 core/templates/user/login.html:28
+#: core/templates/navigation.html:303 core/templates/user/login.html:28
msgid "Reset password"
msgstr "Reinicialitza la contrasenya"
-#: core/templates/navigation.html:311
+#: core/templates/navigation.html:321
msgid "My preferences"
msgstr "Les meves preferències"
-#: core/templates/navigation.html:320
+#: core/templates/navigation.html:330
msgid "Logout"
msgstr "Surt"
-#: core/templates/navigation.html:343
+#: core/templates/navigation.html:353
msgid "Licenses"
msgstr "Llicències"
-#: core/templates/navigation.html:351
+#: core/templates/navigation.html:361
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr "Unitats de repetició"
-#: core/templates/navigation.html:359 core/templates/weight_unit/list.html:4
-#: nutrition/templates/ingredient/view.html:167
+#: core/templates/navigation.html:369 core/templates/weight_unit/list.html:4
+#: nutrition/templates/ingredient/view.html:141
msgid "Weight units"
msgstr "Unitats de pes"
-#: core/templates/navigation.html:367 core/templates/user/list.html:4
+#: core/templates/navigation.html:377 core/templates/user/list.html:4
msgid "User list"
msgstr "Llista d'usuaris"
-#: core/templates/navigation.html:373
+#: core/templates/navigation.html:383
msgid "Gyms"
msgstr "Gimnasos"
@@ -882,12 +881,12 @@ msgstr "Gràcies per usar el nostre lloc web!"
msgid "The %(site_name)s team"
msgstr "L'equip de %(site_name)s"
-#: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:11
+#: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:12
msgid "previous"
msgstr "enrere"
-#: core/templates/tags/pagination.html:31
-#: core/templates/tags/pagination.html:35
+#: core/templates/tags/pagination.html:33
+#: core/templates/tags/pagination.html:38
msgid "next"
msgstr "següent"
@@ -912,36 +911,36 @@ msgid "Add exercises to this workout day"
msgstr "Afegeix exercicis a aquest dia d'entrenament"
#: core/templates/tags/render_weight_log.html:17 manager/helpers.py:86
-#: manager/models/setting.py:69 manager/templates/set/formset.html:9
+#: manager/models/setting.py:72 manager/templates/set/formset.html:9
msgid "Reps"
msgstr "Repeticions"
#: core/templates/tags/render_weight_log.html:30 manager/forms.py:191
-#: manager/models/log.py:103 manager/models/setting.py:99
+#: manager/models/log.py:103 manager/models/setting.py:102
#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
msgid "RiR"
msgstr "RER"
-#: core/templates/template.html:120 manager/templates/calendar/month.html:138
-#: manager/templates/schedule/view.html:249
-#: manager/templates/schedule/view.html:270
-#: manager/templates/workout/view.html:86
-#: manager/templates/workout/view.html:139
+#: core/templates/template.html:122 manager/templates/calendar/month.html:138
+#: manager/templates/schedule/view.html:248
+#: manager/templates/schedule/view.html:269
+#: manager/templates/workout/view.html:84
+#: manager/templates/workout/view.html:137
msgid "Close"
msgstr "Tanca"
-#: core/templates/template.html:136
+#: core/templates/template.html:138
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:141
+#: core/templates/template.html:143
msgid "Create some demo entries"
msgstr "Crea algunes entrades de mostra"
-#: core/templates/template.html:178 software/templates/features.html:547
+#: core/templates/template.html:180 software/templates/features.html:547
#: software/templates/tos.html:7
msgid "Terms of service"
msgstr "Condicions del servei"
@@ -1043,7 +1042,7 @@ msgid "Overview"
msgstr "Visió general"
#: core/templates/user/overview.html:28
-#: manager/templates/schedule/view.html:164
+#: manager/templates/schedule/view.html:163
#: manager/templates/workout/overview.html:39 manager/views/schedule_step.py:60
msgid "Add workout"
msgstr "Afegeix entrenament"
@@ -1051,20 +1050,20 @@ msgstr "Afegeix entrenament"
#: core/templates/user/overview.html:34 core/templates/user/overview.html:76
#: core/templates/user/overview.html:120 core/templates/user/overview.html:152
#: exercises/models/base.py:118 exercises/models/base.py:124
-#: exercises/models/exercise.py:63 exercises/models/exercise.py:69
+#: exercises/models/exercise.py:64 exercises/models/exercise.py:70
#: exercises/models/image.py:107 exercises/models/image.py:113
#: exercises/models/video.py:163 exercises/models/video.py:169
#: gallery/models/image.py:42 manager/helpers.py:85 manager/models/log.py:100
#: manager/models/session.py:67 measurements/models/measurement.py:47
-#: nutrition/models/ingredient.py:101 nutrition/models/ingredient.py:107
-#: nutrition/models/ingredient.py:222 weight/models.py:33
+#: nutrition/models/ingredient.py:87 nutrition/models/ingredient.py:93
+#: nutrition/models/ingredient.py:216 weight/models.py:51
#: weight/templates/import_csv_preview.html:13
#: weight/templates/import_csv_preview.html:42 weight/views.py:144
msgid "Date"
msgstr "Data"
#: core/templates/user/overview.html:35 core/templates/user/overview.html:153
-#: exercises/models/exercise.py:51 gallery/models/image.py:65
+#: exercises/models/exercise.py:52 gallery/models/image.py:65
#: gym/models/contract.py:58 gym/models/contract.py:109
#: manager/models/day.py:37 manager/models/workout.py:63
#: measurements/models/measurement.py:62 nutrition/models/plan.py:67
@@ -1082,13 +1081,13 @@ msgstr "Darrera activitat"
#: core/templates/user/overview.html:58
#: manager/templates/calendar/month.html:128
-#: manager/templates/schedule/view.html:145
+#: manager/templates/schedule/view.html:144
#: manager/templates/workout/overview.html:28
msgid "No workouts found."
msgstr "No s'han trobat entrenaments."
#: core/templates/user/overview.html:68 manager/forms.py:280
-#: manager/templates/workout/view.html:108
+#: manager/templates/workout/view.html:106
msgid "Log"
msgstr "Registre"
@@ -1112,35 +1111,35 @@ msgstr "Temps"
#: core/templates/user/overview.html:112 core/templates/user/overview.html:121
#: manager/forms.py:186 manager/helpers.py:86 manager/models/log.py:86
-#: manager/models/setting.py:79 manager/templates/log/add.html:54
-#: manager/templates/set/formset.html:11 weight/models.py:35
+#: manager/models/setting.py:82 manager/templates/log/add.html:54
+#: manager/templates/set/formset.html:11 weight/models.py:53
#: weight/templates/import_csv_preview.html:14
#: weight/templates/import_csv_preview.html:43 weight/views.py:144
msgid "Weight"
msgstr "Pes"
-#: core/templates/user/overview.html:154 nutrition/models/ingredient.py:130
-#: nutrition/templates/ingredient/view.html:77 nutrition/views/plan.py:237
+#: core/templates/user/overview.html:154 nutrition/models/ingredient.py:116
+#: nutrition/templates/ingredient/view.html:51 nutrition/views/plan.py:237
msgid "Energy"
msgstr "Energia"
-#: core/templates/user/overview.html:155 nutrition/models/ingredient.py:137
-#: nutrition/templates/ingredient/view.html:84 nutrition/views/plan.py:243
+#: core/templates/user/overview.html:155 nutrition/models/ingredient.py:123
+#: nutrition/templates/ingredient/view.html:58 nutrition/views/plan.py:243
msgid "Protein"
msgstr "Proteïna"
-#: core/templates/user/overview.html:156 nutrition/models/ingredient.py:145
-#: nutrition/templates/ingredient/view.html:90 nutrition/views/plan.py:251
+#: core/templates/user/overview.html:156 nutrition/models/ingredient.py:131
+#: nutrition/templates/ingredient/view.html:64 nutrition/views/plan.py:251
msgid "Carbohydrates"
msgstr "Carbohidrats"
-#: core/templates/user/overview.html:157 nutrition/models/ingredient.py:163
-#: nutrition/templates/ingredient/view.html:106 nutrition/views/plan.py:265
+#: core/templates/user/overview.html:157 nutrition/models/ingredient.py:149
+#: nutrition/templates/ingredient/view.html:80 nutrition/views/plan.py:265
msgid "Fat"
msgstr "Greix"
#: core/templates/user/overview.html:170
-#: nutrition/templates/ingredient/view.html:79
+#: nutrition/templates/ingredient/view.html:53
msgid "kcal"
msgstr "kcal"
@@ -1152,7 +1151,7 @@ msgstr "kcal"
#: gym/templates/gym/member_list.html:207
#: gym/templates/gym/member_list.html:240
#: gym/templates/gym/member_list.html:277
-#: manager/templates/schedule/view.html:101
+#: manager/templates/schedule/view.html:100
msgid "Actions"
msgstr "Accions"
@@ -1195,7 +1194,7 @@ msgid "Details"
msgstr "Detalls"
#: core/templates/user/overview.html:258 gym/views/export.py:57
-#: manager/helpers.py:86 manager/templates/schedule/view.html:99
+#: manager/helpers.py:86 manager/templates/schedule/view.html:98
msgid "Nr."
msgstr "Núm."
@@ -1240,7 +1239,7 @@ msgid "Documents"
msgstr "Documents"
#: core/templates/user/overview.html:412 gym/templates/document/list.html:32
-#: manager/forms.py:292 manager/templates/workout/view.html:134
+#: manager/forms.py:292 manager/templates/workout/view.html:132
msgid "Download"
msgstr "Descarrega"
@@ -1295,13 +1294,13 @@ msgid "kg"
msgstr "kg"
#: core/templatetags/wger_extras.py:207
-#: nutrition/templates/ingredient/view.html:86
-#: nutrition/templates/ingredient/view.html:92
-#: nutrition/templates/ingredient/view.html:99
-#: nutrition/templates/ingredient/view.html:108
-#: nutrition/templates/ingredient/view.html:115
-#: nutrition/templates/ingredient/view.html:137
-#: nutrition/templates/ingredient/view.html:147
+#: nutrition/templates/ingredient/view.html:60
+#: nutrition/templates/ingredient/view.html:66
+#: nutrition/templates/ingredient/view.html:73
+#: nutrition/templates/ingredient/view.html:82
+#: nutrition/templates/ingredient/view.html:89
+#: nutrition/templates/ingredient/view.html:111
+#: nutrition/templates/ingredient/view.html:121
msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr "g"
@@ -1319,7 +1318,7 @@ msgstr "oz"
#: exercises/views/equipment.py:103 exercises/views/exercises.py:73
#: exercises/views/muscles.py:99 manager/views/schedule.py:309
#: manager/views/schedule_step.py:128 manager/views/workout.py:249
-#: manager/views/workout_session.py:142 nutrition/views/ingredient.py:116
+#: manager/views/workout_session.py:142 nutrition/views/ingredient.py:119
#: nutrition/views/unit.py:110
msgid "Successfully deleted"
msgstr "Esborrat amb èxit"
@@ -1331,7 +1330,7 @@ msgstr "Esborrat amb èxit"
#: gym/views/admin_notes.py:196 gym/views/document.py:206 gym/views/gym.py:481
#: manager/views/schedule.py:316 manager/views/schedule_step.py:138
#: manager/views/workout.py:253 manager/views/workout_session.py:156
-#: nutrition/views/ingredient.py:123 nutrition/views/unit.py:117
+#: nutrition/views/ingredient.py:126 nutrition/views/unit.py:117
#, python-brace-format
msgid "Delete {0}?"
msgstr "Esborrar {0}?"
@@ -1344,7 +1343,7 @@ msgstr "Esborrar {0}?"
#: gym/views/contract.py:186 gym/views/contract_option.py:123
#: gym/views/contract_type.py:123 gym/views/document.py:171
#: gym/views/gym.py:463 manager/views/day.py:100 manager/views/schedule.py:333
-#: manager/views/workout.py:267 nutrition/views/ingredient.py:142
+#: manager/views/workout.py:267 nutrition/views/ingredient.py:145
#: nutrition/views/unit.py:143
#, python-brace-format
msgid "Edit {0}"
@@ -1418,7 +1417,7 @@ msgstr "Gimnàs"
msgid "A verification email was sent to %(email)s"
msgstr ""
-#: exercises/models/base.py:82 nutrition/models/ingredient.py:236
+#: exercises/models/base.py:82 nutrition/models/ingredient.py:230
msgid "Category"
msgstr "Categoria"
@@ -1438,7 +1437,7 @@ msgstr "Variacions"
msgid "Exercise Categories"
msgstr "Categories d'exercicis"
-#: exercises/models/comment.py:52 exercises/models/exercise_alias.py:52
+#: exercises/models/comment.py:52 exercises/models/exercise_alias.py:53
#: exercises/models/image.py:74 exercises/models/video.py:98
#: manager/forms.py:178 manager/helpers.py:86 manager/models/log.py:52
msgid "Exercise"
@@ -1448,12 +1447,12 @@ msgstr "Exercici"
msgid "A comment about how to correctly do this exercise."
msgstr "Un comentari sobre com fer aquest exercici correctament."
-#: exercises/models/exercise.py:76 nutrition/models/ingredient.py:95
+#: exercises/models/exercise.py:77 nutrition/models/ingredient.py:81
#: nutrition/models/weight_unit.py:32
msgid "Language"
msgstr "Llengua"
-#: exercises/models/exercise_alias.py:58
+#: exercises/models/exercise_alias.py:59
#, fuzzy
#| msgid "Correcting an exercise"
msgid "Alias for an exercise"
@@ -1600,7 +1599,7 @@ msgstr "Accions"
#: manager/models/schedule.py:44 manager/models/session.py:49
#: manager/models/workout.py:89 measurements/models/category.py:31
#: measurements/models/measurement.py:42 nutrition/models/plan.py:54
-#: nutrition/templates/ingredient/pending.html:16 weight/models.py:42
+#: weight/models.py:60
msgid "User"
msgstr "Usuari"
@@ -1726,9 +1725,9 @@ msgid "Contract type"
msgstr "Tipus de contracte"
#: gym/models/contract.py:211 gym/templates/contract/view.html:59
-#: manager/templates/log/add.html:52 nutrition/forms.py:62
-#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:105
-#: nutrition/models/meal_item.py:72
+#: manager/templates/log/add.html:52 nutrition/forms.py:63
+#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:108
+#: nutrition/models/meal_item.py:73
msgid "Amount"
msgstr "Quantitat"
@@ -1745,7 +1744,7 @@ msgid "Contract is active"
msgstr "El contracte és actiu"
#: gym/models/contract.py:237 gym/templates/contract/view.html:69
-#: manager/models/schedule.py:61 manager/templates/schedule/view.html:68
+#: manager/models/schedule.py:61 manager/templates/schedule/view.html:67
msgid "Start date"
msgstr "Data d'inici"
@@ -2144,7 +2143,7 @@ msgstr "Genera una vista prèvia"
#: mailer/templates/mailer/gym/form.html:28
#: mailer/templates/mailer/gym/preview.html:62
-#: manager/templates/workout/view.html:42
+#: manager/templates/workout/view.html:40
msgid "Steps"
msgstr "Passos"
@@ -2168,7 +2167,7 @@ msgstr ""
"d'enviar els correus"
#: mailer/templates/mailer/gym/preview.html:22
-#: software/templates/about_us.html:60
+#: software/templates/about_us.html:70
msgid "Current version"
msgstr "Versió actual"
@@ -2199,18 +2198,18 @@ msgid ""
"a superset."
msgstr "Podeu cercar més d'un exercici, s'agruparan en un conjunt."
-#: manager/forms.py:140 nutrition/forms.py:252
+#: manager/forms.py:140 nutrition/forms.py:253
#, fuzzy
#| msgid "Also use ingredients in English"
msgid "Also search for names in English"
msgstr "Usa també ingredients en anglès"
#: manager/forms.py:168 manager/forms.py:173 manager/models/log.py:64
-#: manager/models/log.py:92 manager/models/setting.py:59
-#: manager/models/setting.py:90 manager/templates/log/add.html:53
+#: manager/models/log.py:92 manager/models/setting.py:62
+#: manager/models/setting.py:93 manager/templates/log/add.html:53
#: manager/templates/log/add.html:55 manager/templates/set/formset.html:10
#: manager/templates/set/formset.html:12 measurements/models/category.py:41
-#: nutrition/forms.py:66
+#: nutrition/forms.py:67
msgid "Unit"
msgstr "Unitat"
@@ -2218,15 +2217,15 @@ msgstr "Unitat"
msgid "Type"
msgstr "Tipus"
-#: manager/forms.py:280 manager/templates/workout/view.html:115
+#: manager/forms.py:280 manager/templates/workout/view.html:113
msgid "Table"
msgstr "Taula"
-#: manager/forms.py:282 manager/templates/workout/view.html:121
+#: manager/forms.py:282 manager/templates/workout/view.html:119
msgid "with images"
msgstr "amb imatges"
-#: manager/forms.py:283 manager/templates/workout/view.html:127
+#: manager/forms.py:283 manager/templates/workout/view.html:125
msgid "with comments"
msgstr "amb comentaris"
@@ -2235,11 +2234,10 @@ msgid "Workout will expire soon"
msgstr "L'entrenament caducarà aviat"
#: manager/models/day.py:34 manager/models/log.py:58
-#: manager/models/session.py:60 manager/templates/schedule/view.html:103
-#: manager/templates/workout/view.html:11
-#: manager/templates/workout/view.html:19 manager/views/pdf.py:85
-#: manager/views/pdf.py:161 manager/views/schedule.py:151
-#: manager/views/schedule.py:221
+#: manager/models/session.py:60 manager/templates/schedule/view.html:102
+#: manager/templates/workout/view.html:9 manager/templates/workout/view.html:17
+#: manager/views/pdf.py:85 manager/views/pdf.py:161
+#: manager/views/schedule.py:151 manager/views/schedule.py:221
msgid "Workout"
msgstr "Entrenament"
@@ -2259,7 +2257,7 @@ msgstr "Dia"
msgid "Name or short description of the schedule. For example 'Program XYZ'."
msgstr "Nom o breu descripció del programa. Per exemple «Programa XYZ»."
-#: manager/models/schedule.py:65 manager/templates/schedule/view.html:72
+#: manager/models/schedule.py:65 manager/templates/schedule/view.html:71
msgid "Schedule active"
msgstr "Programa actiu"
@@ -2273,7 +2271,7 @@ msgstr ""
"mostrarà p. e. a la vostra consola). Tots els altres programes es marcaran "
"com a inactius"
-#: manager/models/schedule.py:77 manager/templates/schedule/view.html:82
+#: manager/models/schedule.py:77 manager/templates/schedule/view.html:81
msgid "Is a loop"
msgstr "És un cicle"
@@ -2294,8 +2292,8 @@ msgid "The duration in weeks"
msgstr "La duració en setmanes"
#: manager/models/schedule_step.py:64 manager/models/set.py:53
-#: manager/models/setting.py:110 nutrition/models/meal.py:55
-#: nutrition/models/meal_item.py:65
+#: manager/models/setting.py:113 nutrition/models/meal.py:55
+#: nutrition/models/meal_item.py:66
msgid "Order"
msgstr "Ordre"
@@ -2347,7 +2345,7 @@ msgstr "Dia d'entrenament"
msgid "Number of sets"
msgstr "Nombre de sèries"
-#: manager/models/setting.py:48
+#: manager/models/setting.py:51
msgid "Sets"
msgstr "Sèries"
@@ -2422,7 +2420,7 @@ msgstr ""
msgid "Go to current month"
msgstr "Vés al mes actual"
-#: manager/templates/calendar/month.html:188
+#: manager/templates/calendar/month.html:190
msgid "Add new log"
msgstr "Afegeix nou registre"
@@ -2462,8 +2460,8 @@ msgid "Your schedules"
msgstr "Els vostres programes"
#: manager/templates/schedule/overview.html:19
-#: manager/templates/schedule/view.html:132
-#: manager/templates/schedule/view.html:184
+#: manager/templates/schedule/view.html:131
+#: manager/templates/schedule/view.html:183
#: manager/templates/workout/overview.html:16
msgid "active"
msgstr "actiu"
@@ -2523,11 +2521,11 @@ msgstr ""
msgid "Add schedule"
msgstr "Afegeix programa"
-#: manager/templates/schedule/view.html:10
+#: manager/templates/schedule/view.html:9
msgid "Schedule"
msgstr "Programa"
-#: manager/templates/schedule/view.html:86
+#: manager/templates/schedule/view.html:85
msgid ""
"This schedule is a loop and will go through the workouts above till you "
"deactivate it"
@@ -2535,19 +2533,19 @@ msgstr ""
"Aquest programa és un bucle i repetirà els entrenaments de més amunt fins "
"que no el desactiveu"
-#: manager/templates/schedule/view.html:104
+#: manager/templates/schedule/view.html:103
msgid "Weeks"
msgstr "Setmanes"
-#: manager/templates/schedule/view.html:116
+#: manager/templates/schedule/view.html:115
msgid "Move me"
msgstr "Mou-me"
-#: manager/templates/schedule/view.html:157
+#: manager/templates/schedule/view.html:156
msgid "Start schedule"
msgstr "Inicia programa"
-#: manager/templates/schedule/view.html:188
+#: manager/templates/schedule/view.html:187
#, fuzzy, python-format
#| msgid ""
#| "%(weeks)s Week\n"
@@ -2568,11 +2566,11 @@ msgstr[1] ""
"%(weeks)s setmanes\n"
" "
-#: manager/templates/schedule/view.html:222
+#: manager/templates/schedule/view.html:221
msgid "Adding workouts"
msgstr "Afegeix entrenaments"
-#: manager/templates/schedule/view.html:224
+#: manager/templates/schedule/view.html:223
#, fuzzy
#| msgid ""
#| "Add as many workouts to the schedule as you want. You can\n"
@@ -2589,21 +2587,21 @@ msgstr ""
"arrossegant-los i deixant-los anar. També és possible afegir un\n"
"entrenament més d'un cop."
-#: manager/templates/schedule/view.html:233
-#: manager/templates/schedule/view.html:244
-#: manager/templates/schedule/view.html:291
-#: manager/templates/workout/view.html:71
-#: manager/templates/workout/view.html:81
-#: manager/templates/workout/view.html:180
+#: manager/templates/schedule/view.html:232
+#: manager/templates/schedule/view.html:243
+#: manager/templates/schedule/view.html:290
+#: manager/templates/workout/view.html:69
+#: manager/templates/workout/view.html:79
+#: manager/templates/workout/view.html:178
msgid "Export calendar file"
msgstr "Exporta fitxer de calendari"
-#: manager/templates/schedule/view.html:237
+#: manager/templates/schedule/view.html:236
msgid "Export this schedule as a calendar file."
msgstr "Exporta aquest programa com a fitxer de calendari."
-#: manager/templates/schedule/view.html:238
-#: manager/templates/workout/view.html:76
+#: manager/templates/schedule/view.html:237
+#: manager/templates/workout/view.html:74
#, fuzzy
#| msgid ""
#| "You can then import the file it into your calendar\n"
@@ -2621,18 +2619,18 @@ msgstr ""
"calendari, p .e. Google Calendar, Outlook o iCal. Això crearà\n"
"una cita per a cada dia d'entrenament amb els exercicis pertinents."
-#: manager/templates/schedule/view.html:259
-#: manager/templates/schedule/view.html:295
-#: manager/templates/workout/view.html:96
-#: manager/templates/workout/view.html:176
+#: manager/templates/schedule/view.html:258
+#: manager/templates/schedule/view.html:294
+#: manager/templates/workout/view.html:94
+#: manager/templates/workout/view.html:174
msgid "Download as PDF"
msgstr "Descarrega com a PDF"
-#: manager/templates/schedule/view.html:300
+#: manager/templates/schedule/view.html:299
msgid "Edit schedule"
msgstr "Edita programa"
-#: manager/templates/schedule/view.html:305
+#: manager/templates/schedule/view.html:304
msgid "Delete schedule"
msgstr "Esborra programa"
@@ -2771,12 +2769,12 @@ msgid "Mark as workout"
msgstr "Marca com a pla d'entrenament"
#: manager/templates/workout/template_view.html:65
-#: manager/templates/workout/view.html:51
+#: manager/templates/workout/view.html:49
msgid "Muscles trained"
msgstr "Músculs entrenats"
#: manager/templates/workout/template_view.html:68
-#: manager/templates/workout/view.html:54
+#: manager/templates/workout/view.html:52
msgid ""
"Images show combined muscles as trained by the exercises on the workout."
msgstr ""
@@ -2787,35 +2785,35 @@ msgstr ""
msgid "Use this template"
msgstr "Usa aquesta plantilla"
-#: manager/templates/workout/view.html:45
+#: manager/templates/workout/view.html:43
msgid "Add training days"
msgstr "Afegeix dies d'entrenament"
-#: manager/templates/workout/view.html:46
+#: manager/templates/workout/view.html:44
msgid "Add workout sets to days"
msgstr "Afegeix sèries d'entrenament als dies"
-#: manager/templates/workout/view.html:47
+#: manager/templates/workout/view.html:45
msgid "Set the repetitions for each set"
msgstr "Defineix les repeticions per a cada sèrie"
-#: manager/templates/workout/view.html:75
+#: manager/templates/workout/view.html:73
msgid "Export this workout as a calendar file."
msgstr "Exporta aquest pla d'entrenament com a fitxer de calendari."
-#: manager/templates/workout/view.html:146
+#: manager/templates/workout/view.html:144
msgid "Logs"
msgstr "Registres"
-#: manager/templates/workout/view.html:148
+#: manager/templates/workout/view.html:146
msgid "View logs"
msgstr "Veure registres"
-#: manager/templates/workout/view.html:171 manager/views/schedule_step.py:99
+#: manager/templates/workout/view.html:169 manager/views/schedule_step.py:99
msgid "Edit workout"
msgstr "Edita el pla d'entrenament"
-#: manager/templates/workout/view.html:184 manager/views/workout.py:281
+#: manager/templates/workout/view.html:182 manager/views/workout.py:281
msgid "Mark as template"
msgstr "Marca com a plantilla"
@@ -2862,41 +2860,41 @@ msgstr "Això esborrarà també tots els registres de pes per a aquest dia."
msgid "Value"
msgstr "Valor"
-#: nutrition/forms.py:117
+#: nutrition/forms.py:118
#, fuzzy
#| msgid "Height (cm)"
msgid "Height (in)"
msgstr "Alçada (cm)"
-#: nutrition/forms.py:120
+#: nutrition/forms.py:121
#, fuzzy
#| msgid "Weight log"
msgid "Weight (kg)"
msgstr "Registre del pes"
-#: nutrition/forms.py:120
+#: nutrition/forms.py:121
#, fuzzy
#| msgid "Weight log"
msgid "Weight (lbs)"
msgstr "Registre del pes"
-#: nutrition/forms.py:133
+#: nutrition/forms.py:134
msgid "Calculate"
msgstr "Calcula"
-#: nutrition/forms.py:207 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:208 nutrition/templates/rate/form.html:76
msgid "Basic caloric intake"
msgstr "Ingesta energètica bàsica"
-#: nutrition/forms.py:208
+#: nutrition/forms.py:209
msgid "Your basic caloric intake as calculated for your data"
msgstr "La vostra ingesta energètica bàsica calculada segons les vostres dades"
-#: nutrition/forms.py:213
+#: nutrition/forms.py:214
msgid "Additional calories"
msgstr "Calories addicionals"
-#: nutrition/forms.py:215
+#: nutrition/forms.py:216
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
@@ -2904,70 +2902,55 @@ msgstr ""
"Calories addicionals a afegir a la base (per a sostreure-les-en, introduïu "
"un número negatiu)"
-#: nutrition/forms.py:248 nutrition/models/ingredient_weight_unit.py:39
-#: nutrition/models/log.py:84 nutrition/models/meal_item.py:53
+#: nutrition/forms.py:249 nutrition/models/ingredient_weight_unit.py:39
+#: nutrition/models/log.py:87 nutrition/models/meal_item.py:54
msgid "Ingredient"
msgstr "Ingredient"
-#: nutrition/models/ingredient.py:131
+#: nutrition/models/ingredient.py:117
msgid "In kcal per 100g"
msgstr "En kcal per 100g"
-#: nutrition/models/ingredient.py:138 nutrition/models/ingredient.py:146
-#: nutrition/models/ingredient.py:156 nutrition/models/ingredient.py:164
-#: nutrition/models/ingredient.py:174 nutrition/models/ingredient.py:184
-#: nutrition/models/ingredient.py:194
+#: nutrition/models/ingredient.py:124 nutrition/models/ingredient.py:132
+#: nutrition/models/ingredient.py:142 nutrition/models/ingredient.py:150
+#: nutrition/models/ingredient.py:160 nutrition/models/ingredient.py:170
+#: nutrition/models/ingredient.py:180
msgid "In g per 100g of product"
msgstr "En g per 100g de producte"
-#: nutrition/models/ingredient.py:155
-#: nutrition/templates/ingredient/view.html:96 nutrition/views/plan.py:259
+#: nutrition/models/ingredient.py:141
+#: nutrition/templates/ingredient/view.html:70 nutrition/views/plan.py:259
msgid "Sugar content in carbohydrates"
msgstr ""
-#: nutrition/models/ingredient.py:173
-#: nutrition/templates/ingredient/view.html:112 nutrition/views/plan.py:273
+#: nutrition/models/ingredient.py:159
+#: nutrition/templates/ingredient/view.html:86 nutrition/views/plan.py:273
msgid "Saturated fat content in fats"
msgstr ""
-#: nutrition/models/ingredient.py:183
-#: nutrition/templates/ingredient/view.html:134 nutrition/views/plan.py:279
-msgid "Fibres"
+#: nutrition/models/ingredient.py:169
+#: nutrition/templates/ingredient/view.html:108 nutrition/views/plan.py:279
+msgid "Fiber"
msgstr ""
-#: nutrition/models/ingredient.py:193
-#: nutrition/templates/ingredient/view.html:144 nutrition/views/plan.py:285
+#: nutrition/models/ingredient.py:179
+#: nutrition/templates/ingredient/view.html:118 nutrition/views/plan.py:285
msgid "Sodium"
msgstr ""
-#: nutrition/models/ingredient.py:215
+#: nutrition/models/ingredient.py:209
msgid "Link to product"
msgstr ""
-#: nutrition/models/ingredient.py:244
+#: nutrition/models/ingredient.py:238
msgid "Brand name of product"
msgstr ""
-#: nutrition/models/ingredient.py:304
+#: nutrition/models/ingredient.py:305
#, python-brace-format
msgid "The total energy ({self.energy}kcal) is not the approximate sum of the "
msgstr ""
-#: nutrition/models/ingredient.py:383 nutrition/views/ingredient.py:196
-msgid "Ingredient was successfully added to the general database"
-msgstr ""
-
-#: nutrition/models/ingredient.py:408
-msgid "New user submitted ingredient"
-msgstr ""
-
-#: nutrition/models/ingredient.py:410
-#, fuzzy, python-brace-format
-#| msgid "The user {0} submitted a new exercise \"{1}\"."
-msgid ""
-"The user {request.user.username} submitted a new ingredient \"{self.name}\"."
-msgstr "L'usuari {0} ha proposat un nou exercici «{1}»."
-
#: nutrition/models/ingredient_category.py:31
msgid "Ingredient Categories"
msgstr ""
@@ -2980,16 +2963,16 @@ msgstr ""
msgid "Unit amount, e.g. \"1 Cup\" or \"1/2 spoon\""
msgstr ""
-#: nutrition/models/log.py:49 nutrition/models/meal.py:50
-#: nutrition/models/meal_item.py:47 nutrition/models/plan.py:106
+#: nutrition/models/log.py:52 nutrition/models/meal.py:50
+#: nutrition/models/meal_item.py:48 nutrition/models/plan.py:108
msgid "Nutrition plan"
msgstr "Pla nutricional"
-#: nutrition/models/log.py:58
+#: nutrition/models/log.py:61
msgid "Meal"
msgstr ""
-#: nutrition/models/log.py:68
+#: nutrition/models/log.py:71
msgid "Date and Time (Approx.)"
msgstr ""
@@ -3009,11 +2992,11 @@ msgid ""
"summer\""
msgstr ""
-#: nutrition/models/plan.py:88
+#: nutrition/models/plan.py:90
msgid "Use daily calories"
msgstr ""
-#: nutrition/models/plan.py:91
+#: nutrition/models/plan.py:93
msgid ""
"Tick the box if you want to mark this plan as having a goal amount of "
"calories. You can use the calculator or enter the value yourself."
@@ -3120,64 +3103,36 @@ msgstr "Cerca"
msgid "Add ingredient"
msgstr ""
-#: nutrition/templates/ingredient/pending.html:14
-msgid "Submission date"
-msgstr "Data d'inserció"
-
-#: nutrition/templates/ingredient/view.html:27
-msgid "Ingredient is pending review"
-msgstr ""
-
-#: nutrition/templates/ingredient/view.html:28
-msgid ""
-"This user submitted ingredient is pending a decision to be\n"
-"included in the database. Till then, it will not be shown in the overview "
-"or\n"
-"the search."
-msgstr ""
-
-#: nutrition/templates/ingredient/view.html:31
-msgid "Please select one of the options below."
-msgstr "Seleccioneu una de les opcions següents."
-
-#: nutrition/templates/ingredient/view.html:38
-msgid "Accept"
-msgstr "Accepta"
-
-#: nutrition/templates/ingredient/view.html:42
-msgid "Decline"
-msgstr "Refusa"
-
-#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:229
+#: nutrition/templates/ingredient/view.html:45 nutrition/views/plan.py:229
msgid "Macronutrients"
msgstr ""
-#: nutrition/templates/ingredient/view.html:80
+#: nutrition/templates/ingredient/view.html:54
msgid "kJ"
msgstr ""
-#: nutrition/templates/ingredient/view.html:101
-#: nutrition/templates/ingredient/view.html:117
-#: nutrition/templates/ingredient/view.html:139
-#: nutrition/templates/ingredient/view.html:149
+#: nutrition/templates/ingredient/view.html:75
+#: nutrition/templates/ingredient/view.html:91
+#: nutrition/templates/ingredient/view.html:113
+#: nutrition/templates/ingredient/view.html:123
msgid "n.A."
msgstr ""
-#: nutrition/templates/ingredient/view.html:128
+#: nutrition/templates/ingredient/view.html:102
msgid "Others"
msgstr ""
-#: nutrition/templates/ingredient/view.html:170
+#: nutrition/templates/ingredient/view.html:144
#: nutrition/templates/units/list.html:46 nutrition/views/unit.py:86
msgid "Add new weight unit"
msgstr ""
-#: nutrition/templates/ingredient/view.html:232
-#: nutrition/templates/ingredient/view.html:235
+#: nutrition/templates/ingredient/view.html:206
+#: nutrition/templates/ingredient/view.html:209
msgid "Edit ingredient"
msgstr ""
-#: nutrition/templates/ingredient/view.html:239
+#: nutrition/templates/ingredient/view.html:213
msgid "Delete ingredient"
msgstr ""
@@ -3261,14 +3216,10 @@ msgstr ""
msgid "56 to 90"
msgstr ""
-#: nutrition/views/ingredient.py:154
+#: nutrition/views/ingredient.py:157
msgid "Add a new ingredient"
msgstr ""
-#: nutrition/views/ingredient.py:209
-msgid "Ingredient was successfully marked as rejected"
-msgstr ""
-
#: nutrition/views/plan.py:120
msgid "Nutritional plan"
msgstr ""
@@ -3313,50 +3264,59 @@ msgid ""
msgstr ""
#: software/templates/about_us.html:18
-msgid "Source code"
-msgstr ""
-
-#: software/templates/about_us.html:20
-msgid "Get the source code of this application and its server on github"
-msgstr ""
-
-#: software/templates/about_us.html:25
msgid "Have a problem or idea?"
msgstr ""
-#: software/templates/about_us.html:27
+#: software/templates/about_us.html:20
msgid ""
"Get in touch if something didn't behave as expected or if there is a feature "
"that you feel is missing."
msgstr ""
-#: software/templates/about_us.html:32
+#: software/templates/about_us.html:26
msgid "Say hi!"
msgstr ""
-#: software/templates/about_us.html:34
+#: software/templates/about_us.html:28
msgid "If you want to chat with us, hop on the Discord server and get in touch"
msgstr ""
-#: software/templates/about_us.html:39 software/templates/features.html:503
+#: software/templates/about_us.html:33
+msgid "Mastodon"
+msgstr ""
+
+#: software/templates/about_us.html:35
+msgid "Follow us on mastodon for updates and news about the project"
+msgstr ""
+
+#: software/templates/about_us.html:40 software/templates/features.html:503
msgid "Translation"
msgstr ""
-#: software/templates/about_us.html:41
+#: software/templates/about_us.html:42
msgid ""
"This application is translated on weblate. If you also want to help, click "
"the link and start translating"
msgstr ""
-#: software/templates/about_us.html:50
+#: software/templates/about_us.html:47
+msgid "Source code"
+msgstr ""
+
+#: software/templates/about_us.html:49
+msgid "Get the source code of this application and its server on github"
+msgstr ""
+
+#: software/templates/about_us.html:59
msgid "Our goal"
msgstr ""
-#: software/templates/about_us.html:53
+#: software/templates/about_us.html:62
msgid ""
"The goal is to build an awesome\n"
" and flexible fitness manager, along with a comprehensive and "
-"complete list of exercises and\n"
+"complete list of\n"
+" exercises and\n"
" ingredients, all released under a free license."
msgstr ""
@@ -3366,12 +3326,6 @@ msgid ""
"your exercises and workouts."
msgstr ""
-#: software/templates/features.html:45
-#, fuzzy
-#| msgid "About us"
-msgid "About"
-msgstr "Quant a nosaltres"
-
#: software/templates/features.html:57
msgid "Mobile app"
msgstr ""
@@ -3627,18 +3581,6 @@ msgid ""
"to its own copyright."
msgstr ""
-#: utils/models.py:130
-msgid "Pending"
-msgstr ""
-
-#: utils/models.py:131
-msgid "Accepted"
-msgstr ""
-
-#: utils/models.py:132
-msgid "Declined"
-msgstr ""
-
#: weight/forms.py:54
msgid "Input"
msgstr ""
@@ -3651,7 +3593,7 @@ msgstr ""
msgid "You have to enter your weight"
msgstr ""
-#: weight/models.py:60
+#: weight/models.py:78
msgid "Weight entry"
msgstr ""
@@ -3768,6 +3710,33 @@ msgstr ""
msgid "Delete weight entry for the %s"
msgstr ""
+#~ msgid "Ingredients pending review"
+#~ msgstr "Ingredients pendents de revisar"
+
+#, fuzzy, python-brace-format
+#~| msgid "The user {0} submitted a new exercise \"{1}\"."
+#~ msgid ""
+#~ "The user {request.user.username} submitted a new ingredient \"{self."
+#~ "name}\"."
+#~ msgstr "L'usuari {0} ha proposat un nou exercici «{1}»."
+
+#~ msgid "Submission date"
+#~ msgstr "Data d'inserció"
+
+#~ msgid "Please select one of the options below."
+#~ msgstr "Seleccioneu una de les opcions següents."
+
+#~ msgid "Accept"
+#~ msgstr "Accepta"
+
+#~ msgid "Decline"
+#~ msgstr "Refusa"
+
+#, fuzzy
+#~| msgid "About us"
+#~ msgid "About"
+#~ msgstr "Quant a nosaltres"
+
#~ msgid "Share"
#~ msgstr "Comparteix"
diff --git a/wger/locale/cs/LC_MESSAGES/django.po b/wger/locale/cs/LC_MESSAGES/django.po
index f03c5ae2f..cdc5ec808 100644
--- a/wger/locale/cs/LC_MESSAGES/django.po
+++ b/wger/locale/cs/LC_MESSAGES/django.po
@@ -13,7 +13,7 @@ msgid ""
msgstr ""
"Project-Id-Version: wger Workout Manager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-02-02 12:42+0100\n"
+"POT-Creation-Date: 2024-07-14 15:49+0200\n"
"PO-Revision-Date: 2024-02-21 11:02+0000\n"
"Last-Translator: Fjuro <[email protected]>\n"
"Language-Team: Czech <https://hosted.weblate.org/projects/wger/web/cs/>\n"
@@ -38,7 +38,7 @@ msgstr ""
"všem nově registrovaným uživatelům a uživatelům, kteří nemají posilovnu "
"zvolenou."
-#: config/views/gym_config.py:42 core/templates/language/view.html:63
+#: config/views/gym_config.py:42 core/templates/language/view.html:67
#: core/templates/license/list.html:17 core/templates/misc/license/list.html:18
#: core/templates/repetition_unit/list.html:18
#: core/templates/tags/render_day.html:39
@@ -58,8 +58,8 @@ msgstr ""
#: manager/templates/calendar/day.html:68
#: manager/templates/calendar/month.html:85
#: manager/templates/calendar/partial_overview_table.html:18
-#: manager/templates/schedule/view.html:119
-#: nutrition/templates/ingredient/view.html:191
+#: manager/templates/schedule/view.html:118
+#: nutrition/templates/ingredient/view.html:165
#: nutrition/templates/units/list.html:19
msgid "Edit"
msgstr "Upravit"
@@ -93,8 +93,8 @@ msgstr "Můj suprový tréninkový rozvrh"
msgid "Empty placeholder schedule"
msgstr "Prázdný ukázkový rozvrh"
-#: core/forms.py:69 core/templates/navigation.html:275
-#: core/templates/navigation.html:281 core/templates/user/login.html:4
+#: core/forms.py:69 core/templates/navigation.html:285
+#: core/templates/navigation.html:291 core/templates/user/login.html:4
#: software/templates/features.html:82 software/templates/features.html:427
msgid "Login"
msgstr "Přihlášení"
@@ -164,7 +164,7 @@ msgstr "Heslo"
msgid "Please enter your current password."
msgstr "Zadejte prosím vaše současné heslo."
-#: core/forms.py:242 core/templates/language/view.html:68
+#: core/forms.py:242 core/templates/language/view.html:73
#: core/templates/license/list.html:19 core/templates/misc/license/list.html:22
#: core/templates/repetition_unit/list.html:20
#: core/templates/tags/render_day.html:45
@@ -179,10 +179,10 @@ msgstr "Zadejte prosím vaše současné heslo."
#: gym/templates/gym/list.html:22 manager/templates/calendar/day.html:73
#: manager/templates/calendar/month.html:89
#: manager/templates/calendar/partial_overview_table.html:23
-#: manager/templates/schedule/view.html:123
-#: manager/templates/workout/view.html:190
-#: nutrition/templates/ingredient/view.html:192
-#: nutrition/templates/ingredient/view.html:241
+#: manager/templates/schedule/view.html:122
+#: manager/templates/workout/view.html:188
+#: nutrition/templates/ingredient/view.html:166
+#: nutrition/templates/ingredient/view.html:215
#: nutrition/templates/units/list.html:22
msgid "Delete"
msgstr "Smazat"
@@ -195,14 +195,14 @@ msgstr "Chybné heslo"
msgid "The form is secured with reCAPTCHA"
msgstr "Zabezpečeno službou reCAPTCHA"
-#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:275
-#: core/templates/navigation.html:287 core/templates/template.html:147
+#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:285
+#: core/templates/navigation.html:297 core/templates/template.html:149
#: core/templates/user/login.html:20 core/views/user.py:298
#: software/templates/features.html:87 software/templates/features.html:422
msgid "Register"
msgstr "Registrace"
-#: core/forms.py:315
+#: core/forms.py:315 software/templates/features.html:45
msgid "Contact"
msgstr "Kontakt"
@@ -211,7 +211,7 @@ msgid "Some way of answering you (e-mail, etc.)"
msgstr "Nějaký kontakt na vás (email, apod.)"
#: core/forms.py:324 exercises/models/comment.py:58 manager/models/set.py:61
-#: manager/models/setting.py:111 nutrition/models/log.py:74
+#: manager/models/setting.py:114 nutrition/models/log.py:77
msgid "Comment"
msgstr "Komentář"
@@ -231,6 +231,12 @@ msgstr "Krátký název jazyka"
msgid "Language full name"
msgstr "Plný název jazyka"
+#: core/models/language.py:45 core/templates/language/view.html:23
+#, fuzzy
+#| msgid "Language full name"
+msgid "Language full name in English"
+msgstr "Plný název jazyka"
+
#: core/models/license.py:29
msgid "Full name"
msgstr "Plné jméno"
@@ -247,7 +253,7 @@ msgstr ""
msgid "Short name, e.g. CC-BY-SA 3"
msgstr "Krátké jméno, například CC-BY-SA-3"
-#: core/models/license.py:45 nutrition/models/ingredient.py:214
+#: core/models/license.py:45 nutrition/models/ingredient.py:208
msgid "Link"
msgstr "Odkaz"
@@ -361,7 +367,7 @@ msgstr ""
msgid "Age"
msgstr "Věk"
-#: core/models/profile.py:230 nutrition/forms.py:117
+#: core/models/profile.py:230 nutrition/forms.py:118
msgid "Height (cm)"
msgstr "Výška (cm)"
@@ -412,7 +418,7 @@ msgid "Total caloric intake, including e.g. any surplus"
msgstr "Celkový příjem kalorií, včetně např. přebytků"
#: core/models/profile.py:333 nutrition/models/ingredient_weight_unit.py:45
-#: nutrition/models/log.py:93 nutrition/models/meal_item.py:58
+#: nutrition/models/log.py:96 nutrition/models/meal_item.py:59
msgid "Weight unit"
msgstr "Jednotka váhy"
@@ -446,17 +452,16 @@ msgstr "Součet všech hodin musí být 24"
#: core/models/rep_unit.py:36 core/models/weight_unit.py:36
#: core/templates/user/overview.html:262 core/views/user.py:599
#: exercises/models/category.py:29 exercises/models/equipment.py:29
-#: exercises/models/exercise.py:58 exercises/models/muscle.py:36
+#: exercises/models/exercise.py:59 exercises/models/muscle.py:36
#: gym/models/contract.py:52 gym/models/contract.py:103 gym/models/gym.py:46
#: gym/models/user_document.py:84 gym/templates/contract/view.html:50
#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:96
#: gym/views/gym.py:158 manager/models/schedule.py:55
#: manager/models/workout.py:57 measurements/models/category.py:36
-#: nutrition/models/ingredient.py:125
+#: nutrition/models/ingredient.py:111
#: nutrition/models/ingredient_category.py:27 nutrition/models/meal.py:67
#: nutrition/models/weight_unit.py:38
-#: nutrition/templates/ingredient/pending.html:15
-#: nutrition/templates/ingredient/view.html:178
+#: nutrition/templates/ingredient/view.html:152
msgid "Name"
msgstr "Název"
@@ -560,24 +565,24 @@ msgstr "Pro potvrzení e-mailu klikněte na následující odkaz: %(link)s"
msgid "Dashboard"
msgstr "Nástěnka"
-#: core/templates/language/overview.html:4 core/templates/navigation.html:335
+#: core/templates/language/overview.html:4 core/templates/navigation.html:345
msgid "Languages"
msgstr "Jazyky"
-#: core/templates/language/overview.html:20
+#: core/templates/language/overview.html:22
msgid "Nothing found."
msgstr "Nic nenalezeno."
-#: core/templates/language/overview.html:20
+#: core/templates/language/overview.html:22
#: manager/templates/calendar/month.html:132
#: manager/templates/schedule/overview.html:28
-#: manager/templates/schedule/view.html:145
+#: manager/templates/schedule/view.html:144
#: manager/templates/workout/overview.html:28
#: nutrition/templates/ingredient/overview.html:38
msgid "Add one now."
msgstr "Přidat nyní."
-#: core/templates/language/overview.html:33 core/templates/license/list.html:40
+#: core/templates/language/overview.html:35 core/templates/license/list.html:40
#: core/templates/misc/license/list.html:43
#: core/templates/repetition_unit/list.html:43
#: core/templates/user/overview.html:326 core/templates/user/overview.html:365
@@ -597,13 +602,13 @@ msgstr "Přidat nyní."
msgid "Add"
msgstr "Přidat"
-#: core/templates/language/view.html:58 core/templates/user/api_key.html:44
+#: core/templates/language/view.html:61 core/templates/user/api_key.html:44
#: core/templates/user/preferences.html:45 gym/models/contract.py:203
#: gym/templates/contract/view.html:41 gym/templates/contract/view.html:106
#: gym/templates/gym/member_list.html:248
-#: manager/templates/schedule/view.html:286
-#: manager/templates/workout/view.html:165
-#: nutrition/templates/ingredient/view.html:228
+#: manager/templates/schedule/view.html:285
+#: manager/templates/workout/view.html:163
+#: nutrition/templates/ingredient/view.html:202
msgid "Options"
msgstr "Nastavení"
@@ -628,12 +633,11 @@ msgstr "Seznam licencí"
#: gym/templates/gym/member_list.html:299
#: mailer/templates/mailer/gym/overview.html:30
#: manager/templates/calendar/day.html:87
-#: nutrition/templates/ingredient/pending.html:30
#: nutrition/templates/units/list.html:29
msgid "Nothing found"
msgstr "Nic nenalezeno"
-#: core/templates/misc/about.html:4 core/templates/template.html:173
+#: core/templates/misc/about.html:4 core/templates/template.html:175
msgid "Imprint"
msgstr "Tiráž"
@@ -647,174 +651,169 @@ msgstr ""
" přeložena do různých jazyků, přidejte je sem jako jednotlivé "
"položky."
-#: core/templates/navigation.html:27 software/templates/features.html:437
+#: core/templates/navigation.html:28 software/templates/features.html:437
msgid "Training"
msgstr "Trénink"
-#: core/templates/navigation.html:34 core/templates/user/overview.html:25
+#: core/templates/navigation.html:37 core/templates/user/overview.html:25
msgid "Workouts"
msgstr "Tréninky"
-#: core/templates/navigation.html:42
+#: core/templates/navigation.html:46
msgid "Workouts schedules"
msgstr "Rozvrhy tréninků"
-#: core/templates/navigation.html:50 core/templates/user/overview.html:70
+#: core/templates/navigation.html:54 core/templates/user/overview.html:70
#: manager/templates/calendar/month.html:10
#: manager/templates/calendar/month.html:21
msgid "Calendar"
msgstr "Kalendář"
-#: core/templates/navigation.html:60
+#: core/templates/navigation.html:64
msgid "Measurements"
msgstr "Měření"
-#: core/templates/navigation.html:70 gallery/templates/images/overview.html:6
+#: core/templates/navigation.html:75 gallery/templates/images/overview.html:6
msgid "Gallery"
msgstr "Galerie"
-#: core/templates/navigation.html:76
+#: core/templates/navigation.html:81
msgid "Workout templates"
msgstr "Tréninkové šablony"
-#: core/templates/navigation.html:82 manager/views/workout.py:84
+#: core/templates/navigation.html:88 manager/views/workout.py:84
msgid "Your templates"
msgstr "Tvé šablony"
-#: core/templates/navigation.html:90 manager/views/workout.py:98
+#: core/templates/navigation.html:97 manager/views/workout.py:98
msgid "Public templates"
msgstr "Veřejné šablony"
-#: core/templates/navigation.html:97 manager/forms.py:129
-#: manager/models/setting.py:54 software/templates/features.html:51
+#: core/templates/navigation.html:105 manager/forms.py:129
+#: manager/models/setting.py:57 software/templates/features.html:51
#: software/templates/features.html:459
msgid "Exercises"
msgstr "Cviky"
-#: core/templates/navigation.html:103 core/templates/navigation.html:170
-#: core/templates/navigation.html:330
+#: core/templates/navigation.html:111 core/templates/navigation.html:184
+#: core/templates/navigation.html:340
msgid "Administration"
msgstr "Administrace"
-#: core/templates/navigation.html:106
+#: core/templates/navigation.html:115
msgid "Exercise edit history"
msgstr "Historie úprav cvičení"
-#: core/templates/navigation.html:111 exercises/models/base.py:103
+#: core/templates/navigation.html:121 exercises/models/base.py:103
msgid "Equipment"
msgstr "Nářadí"
-#: core/templates/navigation.html:116
+#: core/templates/navigation.html:127
msgid "Muscles"
msgstr "Svaly"
-#: core/templates/navigation.html:121
+#: core/templates/navigation.html:133
#: exercises/templates/categories/admin-overview.html:4
msgid "Categories"
msgstr "Kategorie"
-#: core/templates/navigation.html:136 software/templates/features.html:447
+#: core/templates/navigation.html:148 software/templates/features.html:447
msgid "Nutrition"
msgstr "Výživa"
-#: core/templates/navigation.html:143 core/templates/user/overview.html:144
+#: core/templates/navigation.html:156 core/templates/user/overview.html:144
msgid "Nutrition plans"
msgstr "Nutriční plány"
-#: core/templates/navigation.html:151 nutrition/templates/bmi/form.html:50
+#: core/templates/navigation.html:165 nutrition/templates/bmi/form.html:50
msgid "BMI calculator"
msgstr "Kalkulačka BMI"
-#: core/templates/navigation.html:159 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:174 nutrition/templates/rate/form.html:17
msgid "Daily calories calculator"
msgstr "Kalkulačka denních kalorii"
-#: core/templates/navigation.html:165
+#: core/templates/navigation.html:179
#: nutrition/templates/ingredient/overview.html:10
msgid "Ingredient overview"
msgstr "Přehled jídel"
-#: core/templates/navigation.html:172 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:187 nutrition/templates/units/list.html:6
msgid "Ingredient weight units"
msgstr "Jednotka váhy položek"
-#: core/templates/navigation.html:177
-#: nutrition/templates/ingredient/pending.html:6
-msgid "Ingredients pending review"
-msgstr "Potraviny čekající na kontrolu"
-
-#: core/templates/navigation.html:193 software/templates/features.html:442
+#: core/templates/navigation.html:203 software/templates/features.html:442
msgid "Body weight"
msgstr "Tělesná hmotnost"
-#: core/templates/navigation.html:200 core/templates/user/overview.html:114
+#: core/templates/navigation.html:210 core/templates/user/overview.html:114
msgid "Weight overview"
msgstr "Přehled váhy"
-#: core/templates/navigation.html:207 weight/views.py:65
+#: core/templates/navigation.html:217 weight/views.py:65
msgid "Add weight entry"
msgstr "Zaznamenat váhu"
-#: core/templates/navigation.html:221
+#: core/templates/navigation.html:231
msgid "About this software"
msgstr "O aplikaci"
-#: core/templates/navigation.html:227 software/templates/about_us.html:5
+#: core/templates/navigation.html:237 software/templates/about_us.html:5
msgid "About us"
msgstr "O nás"
-#: core/templates/navigation.html:233 software/templates/features.html:507
+#: core/templates/navigation.html:243 software/templates/features.html:507
msgid "REST API"
msgstr "REST API"
-#: core/templates/navigation.html:239 utils/models.py:45
+#: core/templates/navigation.html:249 utils/models.py:45
msgid "License"
msgstr "Licence"
-#: core/templates/navigation.html:245
+#: core/templates/navigation.html:255
msgid "Developer documentation"
msgstr "Dokumentace vývojáře"
-#: core/templates/navigation.html:252
+#: core/templates/navigation.html:262
msgid "Get the code"
msgstr "Získejte kód"
-#: core/templates/navigation.html:259 core/templates/template.html:212
+#: core/templates/navigation.html:269 core/templates/template.html:214
#: software/templates/features.html:582
msgid "Translate"
msgstr "Překlad"
-#: core/templates/navigation.html:293 core/templates/user/login.html:28
+#: core/templates/navigation.html:303 core/templates/user/login.html:28
msgid "Reset password"
msgstr "Reset hesla"
-#: core/templates/navigation.html:311
+#: core/templates/navigation.html:321
msgid "My preferences"
msgstr "Má nastavení"
-#: core/templates/navigation.html:320
+#: core/templates/navigation.html:330
msgid "Logout"
msgstr "Odhlásit"
-#: core/templates/navigation.html:343
+#: core/templates/navigation.html:353
msgid "Licenses"
msgstr "Licence"
-#: core/templates/navigation.html:351
+#: core/templates/navigation.html:361
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr "Opakující jednotky"
-#: core/templates/navigation.html:359 core/templates/weight_unit/list.html:4
-#: nutrition/templates/ingredient/view.html:167
+#: core/templates/navigation.html:369 core/templates/weight_unit/list.html:4
+#: nutrition/templates/ingredient/view.html:141
msgid "Weight units"
msgstr "Jednotka hmostnosti"
-#: core/templates/navigation.html:367 core/templates/user/list.html:4
+#: core/templates/navigation.html:377 core/templates/user/list.html:4
msgid "User list"
msgstr "Uživatelský seznam"
-#: core/templates/navigation.html:373
+#: core/templates/navigation.html:383
msgid "Gyms"
msgstr "Posilovny"
@@ -869,12 +868,12 @@ msgstr "Děkujeme, že využíváte naši stránku!"
msgid "The %(site_name)s team"
msgstr "Tým %(site_name)s"
-#: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:11
+#: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:12
msgid "previous"
msgstr "předchozí"
-#: core/templates/tags/pagination.html:31
-#: core/templates/tags/pagination.html:35
+#: core/templates/tags/pagination.html:33
+#: core/templates/tags/pagination.html:38
msgid "next"
msgstr "další"
@@ -899,34 +898,34 @@ msgid "Add exercises to this workout day"
msgstr "Přidat k tomuto dni cviky"
#: core/templates/tags/render_weight_log.html:17 manager/helpers.py:86
-#: manager/models/setting.py:69 manager/templates/set/formset.html:9
+#: manager/models/setting.py:72 manager/templates/set/formset.html:9
msgid "Reps"
msgstr "Opakování"
#: core/templates/tags/render_weight_log.html:30 manager/forms.py:191
-#: manager/models/log.py:103 manager/models/setting.py:99
+#: manager/models/log.py:103 manager/models/setting.py:102
#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
msgid "RiR"
msgstr "OvR"
-#: core/templates/template.html:120 manager/templates/calendar/month.html:138
-#: manager/templates/schedule/view.html:249
-#: manager/templates/schedule/view.html:270
-#: manager/templates/workout/view.html:86
-#: manager/templates/workout/view.html:139
+#: core/templates/template.html:122 manager/templates/calendar/month.html:138
+#: manager/templates/schedule/view.html:248
+#: manager/templates/schedule/view.html:269
+#: manager/templates/workout/view.html:84
+#: manager/templates/workout/view.html:137
msgid "Close"
msgstr "Zavřít"
-#: core/templates/template.html:136
+#: core/templates/template.html:138
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:141
+#: core/templates/template.html:143
msgid "Create some demo entries"
msgstr "Vytvořit nějaké testovací potraviny"
-#: core/templates/template.html:178 software/templates/features.html:547
+#: core/templates/template.html:180 software/templates/features.html:547
#: software/templates/tos.html:7
msgid "Terms of service"
msgstr "Podmínky služby"
@@ -1026,7 +1025,7 @@ msgid "Overview"
msgstr "Přehled"
#: core/templates/user/overview.html:28
-#: manager/templates/schedule/view.html:164
+#: manager/templates/schedule/view.html:163
#: manager/templates/workout/overview.html:39 manager/views/schedule_step.py:60
msgid "Add workout"
msgstr "Přidat trénink"
@@ -1034,20 +1033,20 @@ msgstr "Přidat trénink"
#: core/templates/user/overview.html:34 core/templates/user/overview.html:76
#: core/templates/user/overview.html:120 core/templates/user/overview.html:152
#: exercises/models/base.py:118 exercises/models/base.py:124
-#: exercises/models/exercise.py:63 exercises/models/exercise.py:69
+#: exercises/models/exercise.py:64 exercises/models/exercise.py:70
#: exercises/models/image.py:107 exercises/models/image.py:113
#: exercises/models/video.py:163 exercises/models/video.py:169
#: gallery/models/image.py:42 manager/helpers.py:85 manager/models/log.py:100
#: manager/models/session.py:67 measurements/models/measurement.py:47
-#: nutrition/models/ingredient.py:101 nutrition/models/ingredient.py:107
-#: nutrition/models/ingredient.py:222 weight/models.py:33
+#: nutrition/models/ingredient.py:87 nutrition/models/ingredient.py:93
+#: nutrition/models/ingredient.py:216 weight/models.py:51
#: weight/templates/import_csv_preview.html:13
#: weight/templates/import_csv_preview.html:42 weight/views.py:144
msgid "Date"
msgstr "Datum"
#: core/templates/user/overview.html:35 core/templates/user/overview.html:153
-#: exercises/models/exercise.py:51 gallery/models/image.py:65
+#: exercises/models/exercise.py:52 gallery/models/image.py:65
#: gym/models/contract.py:58 gym/models/contract.py:109
#: manager/models/day.py:37 manager/models/workout.py:63
#: measurements/models/measurement.py:62 nutrition/models/plan.py:67
@@ -1065,13 +1064,13 @@ msgstr "Poslední aktivita"
#: core/templates/user/overview.html:58
#: manager/templates/calendar/month.html:128
-#: manager/templates/schedule/view.html:145
+#: manager/templates/schedule/view.html:144
#: manager/templates/workout/overview.html:28
msgid "No workouts found."
msgstr "Nenalezeny žádné tréninky."
#: core/templates/user/overview.html:68 manager/forms.py:280
-#: manager/templates/workout/view.html:108
+#: manager/templates/workout/view.html:106
msgid "Log"
msgstr "Záznam"
@@ -1095,35 +1094,35 @@ msgstr "Čas"
#: core/templates/user/overview.html:112 core/templates/user/overview.html:121
#: manager/forms.py:186 manager/helpers.py:86 manager/models/log.py:86
-#: manager/models/setting.py:79 manager/templates/log/add.html:54
-#: manager/templates/set/formset.html:11 weight/models.py:35
+#: manager/models/setting.py:82 manager/templates/log/add.html:54
+#: manager/templates/set/formset.html:11 weight/models.py:53
#: weight/templates/import_csv_preview.html:14
#: weight/templates/import_csv_preview.html:43 weight/views.py:144
msgid "Weight"
msgstr "Váha"
-#: core/templates/user/overview.html:154 nutrition/models/ingredient.py:130
-#: nutrition/templates/ingredient/view.html:77 nutrition/views/plan.py:237
+#: core/templates/user/overview.html:154 nutrition/models/ingredient.py:116
+#: nutrition/templates/ingredient/view.html:51 nutrition/views/plan.py:237
msgid "Energy"
msgstr "Energie"
-#: core/templates/user/overview.html:155 nutrition/models/ingredient.py:137
-#: nutrition/templates/ingredient/view.html:84 nutrition/views/plan.py:243
+#: core/templates/user/overview.html:155 nutrition/models/ingredient.py:123
+#: nutrition/templates/ingredient/view.html:58 nutrition/views/plan.py:243
msgid "Protein"
msgstr "Bílkoviny"
-#: core/templates/user/overview.html:156 nutrition/models/ingredient.py:145
-#: nutrition/templates/ingredient/view.html:90 nutrition/views/plan.py:251
+#: core/templates/user/overview.html:156 nutrition/models/ingredient.py:131
+#: nutrition/templates/ingredient/view.html:64 nutrition/views/plan.py:251
msgid "Carbohydrates"
msgstr "Sacharidy"
-#: core/templates/user/overview.html:157 nutrition/models/ingredient.py:163
-#: nutrition/templates/ingredient/view.html:106 nutrition/views/plan.py:265
+#: core/templates/user/overview.html:157 nutrition/models/ingredient.py:149
+#: nutrition/templates/ingredient/view.html:80 nutrition/views/plan.py:265
msgid "Fat"
msgstr "Tuky"
#: core/templates/user/overview.html:170
-#: nutrition/templates/ingredient/view.html:79
+#: nutrition/templates/ingredient/view.html:53
msgid "kcal"
msgstr "kcal"
@@ -1135,7 +1134,7 @@ msgstr "kcal"
#: gym/templates/gym/member_list.html:207
#: gym/templates/gym/member_list.html:240
#: gym/templates/gym/member_list.html:277
-#: manager/templates/schedule/view.html:101
+#: manager/templates/schedule/view.html:100
msgid "Actions"
msgstr "Akce"
@@ -1178,7 +1177,7 @@ msgid "Details"
msgstr "Podrobnosti"
#: core/templates/user/overview.html:258 gym/views/export.py:57
-#: manager/helpers.py:86 manager/templates/schedule/view.html:99
+#: manager/helpers.py:86 manager/templates/schedule/view.html:98
msgid "Nr."
msgstr "Č."
@@ -1223,7 +1222,7 @@ msgid "Documents"
msgstr "Dokumenty"
#: core/templates/user/overview.html:412 gym/templates/document/list.html:32
-#: manager/forms.py:292 manager/templates/workout/view.html:134
+#: manager/forms.py:292 manager/templates/workout/view.html:132
msgid "Download"
msgstr "Stáhnout"
@@ -1274,13 +1273,13 @@ msgid "kg"
msgstr "kg"
#: core/templatetags/wger_extras.py:207
-#: nutrition/templates/ingredient/view.html:86
-#: nutrition/templates/ingredient/view.html:92
-#: nutrition/templates/ingredient/view.html:99
-#: nutrition/templates/ingredient/view.html:108
-#: nutrition/templates/ingredient/view.html:115
-#: nutrition/templates/ingredient/view.html:137
-#: nutrition/templates/ingredient/view.html:147
+#: nutrition/templates/ingredient/view.html:60
+#: nutrition/templates/ingredient/view.html:66
+#: nutrition/templates/ingredient/view.html:73
+#: nutrition/templates/ingredient/view.html:82
+#: nutrition/templates/ingredient/view.html:89
+#: nutrition/templates/ingredient/view.html:111
+#: nutrition/templates/ingredient/view.html:121
msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr "g"
@@ -1298,7 +1297,7 @@ msgstr "oz"
#: exercises/views/equipment.py:103 exercises/views/exercises.py:73
#: exercises/views/muscles.py:99 manager/views/schedule.py:309
#: manager/views/schedule_step.py:128 manager/views/workout.py:249
-#: manager/views/workout_session.py:142 nutrition/views/ingredient.py:116
+#: manager/views/workout_session.py:142 nutrition/views/ingredient.py:119
#: nutrition/views/unit.py:110
msgid "Successfully deleted"
msgstr "Úspěšně smazáno"
@@ -1310,7 +1309,7 @@ msgstr "Úspěšně smazáno"
#: gym/views/admin_notes.py:196 gym/views/document.py:206 gym/views/gym.py:481
#: manager/views/schedule.py:316 manager/views/schedule_step.py:138
#: manager/views/workout.py:253 manager/views/workout_session.py:156
-#: nutrition/views/ingredient.py:123 nutrition/views/unit.py:117
+#: nutrition/views/ingredient.py:126 nutrition/views/unit.py:117
#, python-brace-format
msgid "Delete {0}?"
msgstr "Smazat {0}?"
@@ -1323,7 +1322,7 @@ msgstr "Smazat {0}?"
#: gym/views/contract.py:186 gym/views/contract_option.py:123
#: gym/views/contract_type.py:123 gym/views/document.py:171
#: gym/views/gym.py:463 manager/views/day.py:100 manager/views/schedule.py:333
-#: manager/views/workout.py:267 nutrition/views/ingredient.py:142
+#: manager/views/workout.py:267 nutrition/views/ingredient.py:145
#: nutrition/views/unit.py:143
#, python-brace-format
msgid "Edit {0}"
@@ -1397,7 +1396,7 @@ msgstr "Posilovna"
msgid "A verification email was sent to %(email)s"
msgstr "Ověřovací e-mail byl zaslán na %(email)s"
-#: exercises/models/base.py:82 nutrition/models/ingredient.py:236
+#: exercises/models/base.py:82 nutrition/models/ingredient.py:230
msgid "Category"
msgstr "Kategorie"
@@ -1417,7 +1416,7 @@ msgstr "Variace"
msgid "Exercise Categories"
msgstr "Kategorie cviků"
-#: exercises/models/comment.py:52 exercises/models/exercise_alias.py:52
+#: exercises/models/comment.py:52 exercises/models/exercise_alias.py:53
#: exercises/models/image.py:74 exercises/models/video.py:98
#: manager/forms.py:178 manager/helpers.py:86 manager/models/log.py:52
msgid "Exercise"
@@ -1427,12 +1426,12 @@ msgstr "Cvik"
msgid "A comment about how to correctly do this exercise."
msgstr "Komentář o tom, jak správně provést tento cvik."
-#: exercises/models/exercise.py:76 nutrition/models/ingredient.py:95
+#: exercises/models/exercise.py:77 nutrition/models/ingredient.py:81
#: nutrition/models/weight_unit.py:32
msgid "Language"
msgstr "Jazyk"
-#: exercises/models/exercise_alias.py:58
+#: exercises/models/exercise_alias.py:59
msgid "Alias for an exercise"
msgstr "Přezdívka pro cvičení"
@@ -1565,7 +1564,7 @@ msgstr "Akce"
#: manager/models/schedule.py:44 manager/models/session.py:49
#: manager/models/workout.py:89 measurements/models/category.py:31
#: measurements/models/measurement.py:42 nutrition/models/plan.py:54
-#: nutrition/templates/ingredient/pending.html:16 weight/models.py:42
+#: weight/models.py:60
msgid "User"
msgstr "Uživatel"
@@ -1685,9 +1684,9 @@ msgid "Contract type"
msgstr "Typ zakázky"
#: gym/models/contract.py:211 gym/templates/contract/view.html:59
-#: manager/templates/log/add.html:52 nutrition/forms.py:62
-#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:105
-#: nutrition/models/meal_item.py:72
+#: manager/templates/log/add.html:52 nutrition/forms.py:63
+#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:108
+#: nutrition/models/meal_item.py:73
msgid "Amount"
msgstr "Množství"
@@ -1704,7 +1703,7 @@ msgid "Contract is active"
msgstr "Zakázka je aktivní"
#: gym/models/contract.py:237 gym/templates/contract/view.html:69
-#: manager/models/schedule.py:61 manager/templates/schedule/view.html:68
+#: manager/models/schedule.py:61 manager/templates/schedule/view.html:67
msgid "Start date"
msgstr "Datum začátku"
@@ -2096,7 +2095,7 @@ msgstr "Vygenerovat náhled"
#: mailer/templates/mailer/gym/form.html:28
#: mailer/templates/mailer/gym/preview.html:62
-#: manager/templates/workout/view.html:42
+#: manager/templates/workout/view.html:40
msgid "Steps"
msgstr "Kroky"
@@ -2120,7 +2119,7 @@ msgstr ""
"potřebujete"
#: mailer/templates/mailer/gym/preview.html:22
-#: software/templates/about_us.html:60
+#: software/templates/about_us.html:70
msgid "Current version"
msgstr "Aktuální verze"
@@ -2152,16 +2151,16 @@ msgid ""
msgstr ""
"Můžete vyhledat více jak jeden cvik. Cviky pak budou zařazeny do supersérie."
-#: manager/forms.py:140 nutrition/forms.py:252
+#: manager/forms.py:140 nutrition/forms.py:253
msgid "Also search for names in English"
msgstr "Také hledat názvy v angličtině"
#: manager/forms.py:168 manager/forms.py:173 manager/models/log.py:64
-#: manager/models/log.py:92 manager/models/setting.py:59
-#: manager/models/setting.py:90 manager/templates/log/add.html:53
+#: manager/models/log.py:92 manager/models/setting.py:62
+#: manager/models/setting.py:93 manager/templates/log/add.html:53
#: manager/templates/log/add.html:55 manager/templates/set/formset.html:10
#: manager/templates/set/formset.html:12 measurements/models/category.py:41
-#: nutrition/forms.py:66
+#: nutrition/forms.py:67
msgid "Unit"
msgstr "Jednotka"
@@ -2169,15 +2168,15 @@ msgstr "Jednotka"
msgid "Type"
msgstr "Typ"
-#: manager/forms.py:280 manager/templates/workout/view.html:115
+#: manager/forms.py:280 manager/templates/workout/view.html:113
msgid "Table"
msgstr "Tabulka"
-#: manager/forms.py:282 manager/templates/workout/view.html:121
+#: manager/forms.py:282 manager/templates/workout/view.html:119
msgid "with images"
msgstr "s obrázky"
-#: manager/forms.py:283 manager/templates/workout/view.html:127
+#: manager/forms.py:283 manager/templates/workout/view.html:125
msgid "with comments"
msgstr "s komentáři"
@@ -2186,11 +2185,10 @@ msgid "Workout will expire soon"
msgstr "Trénink bude brzy expirovat"
#: manager/models/day.py:34 manager/models/log.py:58
-#: manager/models/session.py:60 manager/templates/schedule/view.html:103
-#: manager/templates/workout/view.html:11
-#: manager/templates/workout/view.html:19 manager/views/pdf.py:85
-#: manager/views/pdf.py:161 manager/views/schedule.py:151
-#: manager/views/schedule.py:221
+#: manager/models/session.py:60 manager/templates/schedule/view.html:102
+#: manager/templates/workout/view.html:9 manager/templates/workout/view.html:17
+#: manager/views/pdf.py:85 manager/views/pdf.py:161
+#: manager/views/schedule.py:151 manager/views/schedule.py:221
msgid "Workout"
msgstr "Trénink"
@@ -2210,7 +2208,7 @@ msgstr "Dny"
msgid "Name or short description of the schedule. For example 'Program XYZ'."
msgstr "Jméno, nebo krátký popis plánu. Například 'Program XYZ'."
-#: manager/models/schedule.py:65 manager/templates/schedule/view.html:72
+#: manager/models/schedule.py:65 manager/templates/schedule/view.html:71
msgid "Schedule active"
msgstr "Rozvrh je aktivní"
@@ -2220,11 +2218,11 @@ msgid ""
"shown e.g. on your dashboard). All other schedules will then be marked as "
"inactive"
msgstr ""
-"Zaškrtněte toto políčko, pokud chcete tento rozvrh označit jako váš aktivní ("
-"bude zobrazen např. na nástěnce). Všechny ostatní rozvrhy budou označeny "
+"Zaškrtněte toto políčko, pokud chcete tento rozvrh označit jako váš aktivní "
+"(bude zobrazen např. na nástěnce). Všechny ostatní rozvrhy budou označeny "
"jako neaktivní"
-#: manager/models/schedule.py:77 manager/templates/schedule/view.html:82
+#: manager/models/schedule.py:77 manager/templates/schedule/view.html:81
msgid "Is a loop"
msgstr "Opakující se"
@@ -2245,8 +2243,8 @@ msgid "The duration in weeks"
msgstr "Trvání v týdnech"
#: manager/models/schedule_step.py:64 manager/models/set.py:53
-#: manager/models/setting.py:110 nutrition/models/meal.py:55
-#: nutrition/models/meal_item.py:65
+#: manager/models/setting.py:113 nutrition/models/meal.py:55
+#: nutrition/models/meal_item.py:66
msgid "Order"
msgstr "Řazení"
@@ -2299,7 +2297,7 @@ msgstr "Cvičební den"
msgid "Number of sets"
msgstr "Počet sad"
-#: manager/models/setting.py:48
+#: manager/models/setting.py:51
msgid "Sets"
msgstr "Sady"
@@ -2374,7 +2372,7 @@ msgstr ""
msgid "Go to current month"
msgstr "Na současný měsíc"
-#: manager/templates/calendar/month.html:188
+#: manager/templates/calendar/month.html:190
msgid "Add new log"
msgstr "Přidat nový záznam"
@@ -2414,8 +2412,8 @@ msgid "Your schedules"
msgstr "Tvé rozvrhy"
#: manager/templates/schedule/overview.html:19
-#: manager/templates/schedule/view.html:132
-#: manager/templates/schedule/view.html:184
+#: manager/templates/schedule/view.html:131
+#: manager/templates/schedule/view.html:183
#: manager/templates/workout/overview.html:16
msgid "active"
msgstr "aktivní"
@@ -2460,11 +2458,11 @@ msgstr ""
msgid "Add schedule"
msgstr "Přidat rozvrh"
-#: manager/templates/schedule/view.html:10
+#: manager/templates/schedule/view.html:9
msgid "Schedule"
msgstr "Rozvrh"
-#: manager/templates/schedule/view.html:86
+#: manager/templates/schedule/view.html:85
msgid ""
"This schedule is a loop and will go through the workouts above till you "
"deactivate it"
@@ -2472,19 +2470,19 @@ msgstr ""
"Tento rozvrh je opakujicí se a bude procházet výše uvedené tréninky, pokud "
"jej nevypnete"
-#: manager/templates/schedule/view.html:104
+#: manager/templates/schedule/view.html:103
msgid "Weeks"
msgstr "Týdny"
-#: manager/templates/schedule/view.html:116
+#: manager/templates/schedule/view.html:115
msgid "Move me"
msgstr "Přesuň mě"
-#: manager/templates/schedule/view.html:157
+#: manager/templates/schedule/view.html:156
msgid "Start schedule"
msgstr "Začít rozvrh"
-#: manager/templates/schedule/view.html:188
+#: manager/templates/schedule/view.html:187
#, python-format
msgid ""
"%(weeks)s Week\n"
@@ -2505,11 +2503,11 @@ msgstr[3] ""
"%(weeks)s týdnů\n"
" "
-#: manager/templates/schedule/view.html:222
+#: manager/templates/schedule/view.html:221
msgid "Adding workouts"
msgstr "Přidat tréninky"
-#: manager/templates/schedule/view.html:224
+#: manager/templates/schedule/view.html:223
msgid ""
"Add as many workouts to the schedule as you want. You can\n"
" edit the order by dragging and dropping them. It's also possible "
@@ -2521,21 +2519,21 @@ msgstr ""
"trénink více\n"
" než jednou."
-#: manager/templates/schedule/view.html:233
-#: manager/templates/schedule/view.html:244
-#: manager/templates/schedule/view.html:291
-#: manager/templates/workout/view.html:71
-#: manager/templates/workout/view.html:81
-#: manager/templates/workout/view.html:180
+#: manager/templates/schedule/view.html:232
+#: manager/templates/schedule/view.html:243
+#: manager/templates/schedule/view.html:290
+#: manager/templates/workout/view.html:69
+#: manager/templates/workout/view.html:79
+#: manager/templates/workout/view.html:178
msgid "Export calendar file"
msgstr "Exportovat kalendářový soubor"
-#: manager/templates/schedule/view.html:237
+#: manager/templates/schedule/view.html:236
msgid "Export this schedule as a calendar file."
msgstr "Exportovat rozvrh jako kalendářový soubor."
-#: manager/templates/schedule/view.html:238
-#: manager/templates/workout/view.html:76
+#: manager/templates/schedule/view.html:237
+#: manager/templates/workout/view.html:74
msgid ""
"You can then import the file it into your calendar\n"
" application for example google calendar, outlook or "
@@ -2549,18 +2547,18 @@ msgstr ""
" tím událost pro každý tréninkový den s "
"odpovídajícími cvičeními."
-#: manager/templates/schedule/view.html:259
-#: manager/templates/schedule/view.html:295
-#: manager/templates/workout/view.html:96
-#: manager/templates/workout/view.html:176
+#: manager/templates/schedule/view.html:258
+#: manager/templates/schedule/view.html:294
+#: manager/templates/workout/view.html:94
+#: manager/templates/workout/view.html:174
msgid "Download as PDF"
msgstr "Stáhnout jako PDF"
-#: manager/templates/schedule/view.html:300
+#: manager/templates/schedule/view.html:299
msgid "Edit schedule"
msgstr "Upravit rozvrh"
-#: manager/templates/schedule/view.html:305
+#: manager/templates/schedule/view.html:304
msgid "Delete schedule"
msgstr "Smazat rozvrh"
@@ -2700,12 +2698,12 @@ msgid "Mark as workout"
msgstr "Označit jako cvičení"
#: manager/templates/workout/template_view.html:65
-#: manager/templates/workout/view.html:51
+#: manager/templates/workout/view.html:49
msgid "Muscles trained"
msgstr "Trénink svalů"
#: manager/templates/workout/template_view.html:68
-#: manager/templates/workout/view.html:54
+#: manager/templates/workout/view.html:52
msgid ""
"Images show combined muscles as trained by the exercises on the workout."
msgstr ""
@@ -2716,35 +2714,35 @@ msgstr ""
msgid "Use this template"
msgstr "Použít tuto šablonu"
-#: manager/templates/workout/view.html:45
+#: manager/templates/workout/view.html:43
msgid "Add training days"
msgstr "Přidat trénikové dny"
-#: manager/templates/workout/view.html:46
+#: manager/templates/workout/view.html:44
msgid "Add workout sets to days"
msgstr "Přidat tréninkové série pro dny"
-#: manager/templates/workout/view.html:47
+#: manager/templates/workout/view.html:45
msgid "Set the repetitions for each set"
msgstr "Nastavte opakování pro každou sérii"
-#: manager/templates/workout/view.html:75
+#: manager/templates/workout/view.html:73
msgid "Export this workout as a calendar file."
msgstr "Exportovat trénink jako calendářový soubor."
-#: manager/templates/workout/view.html:146
+#: manager/templates/workout/view.html:144
msgid "Logs"
msgstr "Záznamy"
-#: manager/templates/workout/view.html:148
+#: manager/templates/workout/view.html:146
msgid "View logs"
msgstr "Zobrazit záznamy"
-#: manager/templates/workout/view.html:171 manager/views/schedule_step.py:99
+#: manager/templates/workout/view.html:169 manager/views/schedule_step.py:99
msgid "Edit workout"
msgstr "Upravit trénink"
-#: manager/templates/workout/view.html:184 manager/views/workout.py:281
+#: manager/templates/workout/view.html:182 manager/views/workout.py:281
msgid "Mark as template"
msgstr "Označit jako šablonu"
@@ -2791,35 +2789,35 @@ msgstr "Tato akce odstraní také všechny záznamy váhy pro tento den."
msgid "Value"
msgstr "Hodnota"
-#: nutrition/forms.py:117
+#: nutrition/forms.py:118
msgid "Height (in)"
msgstr "Výška (palce)"
-#: nutrition/forms.py:120
+#: nutrition/forms.py:121
msgid "Weight (kg)"
msgstr "Váha (kg)"
-#: nutrition/forms.py:120
+#: nutrition/forms.py:121
msgid "Weight (lbs)"
msgstr "Váha (libry)"
-#: nutrition/forms.py:133
+#: nutrition/forms.py:134
msgid "Calculate"
msgstr "Výpočet"
-#: nutrition/forms.py:207 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:208 nutrition/templates/rate/form.html:76
msgid "Basic caloric intake"
msgstr "Základní energetický příjem"
-#: nutrition/forms.py:208
+#: nutrition/forms.py:209
msgid "Your basic caloric intake as calculated for your data"
msgstr "Váš základní energetický příjem byl vypočítan ze zadaných dat"
-#: nutrition/forms.py:213
+#: nutrition/forms.py:214
msgid "Additional calories"
msgstr "Přidat kalorie"
-#: nutrition/forms.py:215
+#: nutrition/forms.py:216
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
@@ -2827,70 +2825,55 @@ msgstr ""
"Další kalorie můžete přidat k základní hodnotě (pokud chcete odečíst, "
"zadejte záporné číslo)"
-#: nutrition/forms.py:248 nutrition/models/ingredient_weight_unit.py:39
-#: nutrition/models/log.py:84 nutrition/models/meal_item.py:53
+#: nutrition/forms.py:249 nutrition/models/ingredient_weight_unit.py:39
+#: nutrition/models/log.py:87 nutrition/models/meal_item.py:54
msgid "Ingredient"
msgstr "Potravina"
-#: nutrition/models/ingredient.py:131
+#: nutrition/models/ingredient.py:117
msgid "In kcal per 100g"
msgstr "V kcal na 100g"
-#: nutrition/models/ingredient.py:138 nutrition/models/ingredient.py:146
-#: nutrition/models/ingredient.py:156 nutrition/models/ingredient.py:164
-#: nutrition/models/ingredient.py:174 nutrition/models/ingredient.py:184
-#: nutrition/models/ingredient.py:194
+#: nutrition/models/ingredient.py:124 nutrition/models/ingredient.py:132
+#: nutrition/models/ingredient.py:142 nutrition/models/ingredient.py:150
+#: nutrition/models/ingredient.py:160 nutrition/models/ingredient.py:170
+#: nutrition/models/ingredient.py:180
msgid "In g per 100g of product"
msgstr "V g na 100g produktu"
-#: nutrition/models/ingredient.py:155
-#: nutrition/templates/ingredient/view.html:96 nutrition/views/plan.py:259
+#: nutrition/models/ingredient.py:141
+#: nutrition/templates/ingredient/view.html:70 nutrition/views/plan.py:259
msgid "Sugar content in carbohydrates"
msgstr "Cukr v sacharidech"
-#: nutrition/models/ingredient.py:173
-#: nutrition/templates/ingredient/view.html:112 nutrition/views/plan.py:273
+#: nutrition/models/ingredient.py:159
+#: nutrition/templates/ingredient/view.html:86 nutrition/views/plan.py:273
msgid "Saturated fat content in fats"
msgstr "Nasycené mastné kyseliny"
-#: nutrition/models/ingredient.py:183
-#: nutrition/templates/ingredient/view.html:134 nutrition/views/plan.py:279
-msgid "Fibres"
-msgstr "Vláknina"
+#: nutrition/models/ingredient.py:169
+#: nutrition/templates/ingredient/view.html:108 nutrition/views/plan.py:279
+msgid "Fiber"
+msgstr ""
-#: nutrition/models/ingredient.py:193
-#: nutrition/templates/ingredient/view.html:144 nutrition/views/plan.py:285
+#: nutrition/models/ingredient.py:179
+#: nutrition/templates/ingredient/view.html:118 nutrition/views/plan.py:285
msgid "Sodium"
msgstr "Sodík"
-#: nutrition/models/ingredient.py:215
+#: nutrition/models/ingredient.py:209
msgid "Link to product"
msgstr "Odkaz na produkt"
-#: nutrition/models/ingredient.py:244
+#: nutrition/models/ingredient.py:238
msgid "Brand name of product"
msgstr "Značka produktu"
-#: nutrition/models/ingredient.py:304
+#: nutrition/models/ingredient.py:305
#, python-brace-format
msgid "The total energy ({self.energy}kcal) is not the approximate sum of the "
msgstr "Celková energie ({self.energy}kcal) neodpovídá celkovému odhadu z "
-#: nutrition/models/ingredient.py:383 nutrition/views/ingredient.py:196
-msgid "Ingredient was successfully added to the general database"
-msgstr "Potravina byla přidána do základní databáze"
-
-#: nutrition/models/ingredient.py:408
-msgid "New user submitted ingredient"
-msgstr "Uživatelem zaslané nové složky"
-
-#: nutrition/models/ingredient.py:410
-#, python-brace-format
-msgid ""
-"The user {request.user.username} submitted a new ingredient \"{self.name}\"."
-msgstr ""
-"Uživatel {request.user.username} přidal novou ingredienci „{self.name}“."
-
#: nutrition/models/ingredient_category.py:31
msgid "Ingredient Categories"
msgstr "Kategorie přísad"
@@ -2903,16 +2886,16 @@ msgstr "Množství v gramech"
msgid "Unit amount, e.g. \"1 Cup\" or \"1/2 spoon\""
msgstr "Jednotka množství, např. \"1 pohár\" nebo \"1/2 lžíce\""
-#: nutrition/models/log.py:49 nutrition/models/meal.py:50
-#: nutrition/models/meal_item.py:47 nutrition/models/plan.py:106
+#: nutrition/models/log.py:52 nutrition/models/meal.py:50
+#: nutrition/models/meal_item.py:48 nutrition/models/plan.py:108
msgid "Nutrition plan"
msgstr "Nutriční plán"
-#: nutrition/models/log.py:58
+#: nutrition/models/log.py:61
msgid "Meal"
msgstr "Jídlo"
-#: nutrition/models/log.py:68
+#: nutrition/models/log.py:71
msgid "Date and Time (Approx.)"
msgstr "Datum a čas (přibližně)"
@@ -2935,11 +2918,11 @@ msgstr ""
"Popis cíle plánu, například \"Získat svalovou hmotu\", nebo \"Shodit do "
"plavek\""
-#: nutrition/models/plan.py:88
+#: nutrition/models/plan.py:90
msgid "Use daily calories"
msgstr "Použít denní kalorie"
-#: nutrition/models/plan.py:91
+#: nutrition/models/plan.py:93
msgid ""
"Tick the box if you want to mark this plan as having a goal amount of "
"calories. You can use the calculator or enter the value yourself."
@@ -3064,67 +3047,36 @@ msgstr "Vyhledat"
msgid "Add ingredient"
msgstr "Přidat položku"
-#: nutrition/templates/ingredient/pending.html:14
-msgid "Submission date"
-msgstr "Datum zaslání"
-
-#: nutrition/templates/ingredient/view.html:27
-msgid "Ingredient is pending review"
-msgstr "Potravina čeká na schválení"
-
-#: nutrition/templates/ingredient/view.html:28
-msgid ""
-"This user submitted ingredient is pending a decision to be\n"
-"included in the database. Till then, it will not be shown in the overview "
-"or\n"
-"the search."
-msgstr ""
-"Uživatel zaslal k nutriční položku k překontrolování a rozhodnutí, \n"
-"jestli bude zahrnuta v databázi. Do doby, než bude zkontrolována,\n"
-"nebude se zobrazovat v přehledu, nebo ve vyhledávání."
-
-#: nutrition/templates/ingredient/view.html:31
-msgid "Please select one of the options below."
-msgstr "Vyberte si jednu z možností níže."
-
-#: nutrition/templates/ingredient/view.html:38
-msgid "Accept"
-msgstr "Povolit"
-
-#: nutrition/templates/ingredient/view.html:42
-msgid "Decline"
-msgstr "Zamítnout"
-
-#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:229
+#: nutrition/templates/ingredient/view.html:45 nutrition/views/plan.py:229
msgid "Macronutrients"
msgstr "Makroživiny"
-#: nutrition/templates/ingredient/view.html:80
+#: nutrition/templates/ingredient/view.html:54
msgid "kJ"
msgstr "kJ"
-#: nutrition/templates/ingredient/view.html:101
-#: nutrition/templates/ingredient/view.html:117
-#: nutrition/templates/ingredient/view.html:139
-#: nutrition/templates/ingredient/view.html:149
+#: nutrition/templates/ingredient/view.html:75
+#: nutrition/templates/ingredient/view.html:91
+#: nutrition/templates/ingredient/view.html:113
+#: nutrition/templates/ingredient/view.html:123
msgid "n.A."
msgstr "neuvedeno"
-#: nutrition/templates/ingredient/view.html:128
+#: nutrition/templates/ingredient/view.html:102
msgid "Others"
msgstr "Další"
-#: nutrition/templates/ingredient/view.html:170
+#: nutrition/templates/ingredient/view.html:144
#: nutrition/templates/units/list.html:46 nutrition/views/unit.py:86
msgid "Add new weight unit"
msgstr "Přidejte novou jednotku hmostnosti"
-#: nutrition/templates/ingredient/view.html:232
-#: nutrition/templates/ingredient/view.html:235
+#: nutrition/templates/ingredient/view.html:206
+#: nutrition/templates/ingredient/view.html:209
msgid "Edit ingredient"
msgstr "Upravit ingredience"
-#: nutrition/templates/ingredient/view.html:239
+#: nutrition/templates/ingredient/view.html:213
msgid "Delete ingredient"
msgstr "Smazat ingredience"
@@ -3222,14 +3174,10 @@ msgstr "140 až 230"
msgid "56 to 90"
msgstr "56 až 90"
-#: nutrition/views/ingredient.py:154
+#: nutrition/views/ingredient.py:157
msgid "Add a new ingredient"
msgstr "Přidat novou složku"
-#: nutrition/views/ingredient.py:209
-msgid "Ingredient was successfully marked as rejected"
-msgstr "Složka byla označena jako zamítnuta"
-
#: nutrition/views/plan.py:120
msgid "Nutritional plan"
msgstr "Nutriční plán"
@@ -3276,18 +3224,10 @@ msgstr ""
"je tvořen fitness nadšenci z celého světa."
#: software/templates/about_us.html:18
-msgid "Source code"
-msgstr "Zdrojový kód"
-
-#: software/templates/about_us.html:20
-msgid "Get the source code of this application and its server on github"
-msgstr "Získejte zdrojový kód této aplikace a jejího serveru na GitHubu"
-
-#: software/templates/about_us.html:25
msgid "Have a problem or idea?"
msgstr "Máte problém nebo nápad?"
-#: software/templates/about_us.html:27
+#: software/templates/about_us.html:20
msgid ""
"Get in touch if something didn't behave as expected or if there is a feature "
"that you feel is missing."
@@ -3295,21 +3235,29 @@ msgstr ""
"Kontaktujte nás, pokud se něco nechovalo podle očekávání nebo pokud existuje "
"funkce, o které se domníváte, že chybí."
-#: software/templates/about_us.html:32
+#: software/templates/about_us.html:26
msgid "Say hi!"
msgstr "Ahoj!"
-#: software/templates/about_us.html:34
+#: software/templates/about_us.html:28
msgid "If you want to chat with us, hop on the Discord server and get in touch"
msgstr ""
"Pokud si s námi chcete popovídat, přejděte na Discord server a kontaktujte "
"nás"
-#: software/templates/about_us.html:39 software/templates/features.html:503
+#: software/templates/about_us.html:33
+msgid "Mastodon"
+msgstr ""
+
+#: software/templates/about_us.html:35
+msgid "Follow us on mastodon for updates and news about the project"
+msgstr ""
+
+#: software/templates/about_us.html:40 software/templates/features.html:503
msgid "Translation"
msgstr "Překlad"
-#: software/templates/about_us.html:41
+#: software/templates/about_us.html:42
msgid ""
"This application is translated on weblate. If you also want to help, click "
"the link and start translating"
@@ -3317,15 +3265,30 @@ msgstr ""
"Tato aplikace je překládána na Weblate. Chcete-li také pomoci, klikněte na "
"odkaz a začněte překládat"
-#: software/templates/about_us.html:50
+#: software/templates/about_us.html:47
+msgid "Source code"
+msgstr "Zdrojový kód"
+
+#: software/templates/about_us.html:49
+msgid "Get the source code of this application and its server on github"
+msgstr "Získejte zdrojový kód této aplikace a jejího serveru na GitHubu"
+
+#: software/templates/about_us.html:59
msgid "Our goal"
msgstr "Váš cíl"
-#: software/templates/about_us.html:53
+#: software/templates/about_us.html:62
+#, fuzzy
+#| msgid ""
+#| "The goal is to build an awesome\n"
+#| " and flexible fitness manager, along with a comprehensive "
+#| "and complete list of exercises and\n"
+#| " ingredients, all released under a free license."
msgid ""
"The goal is to build an awesome\n"
" and flexible fitness manager, along with a comprehensive and "
-"complete list of exercises and\n"
+"complete list of\n"
+" exercises and\n"
" ingredients, all released under a free license."
msgstr ""
"Cílem je vytvořit úžasnou\n"
@@ -3341,10 +3304,6 @@ msgstr ""
"wget Workout Manager je bezplatná, open-source webová aplikace, která "
"spravuje vaše cvičení a tréninky."
-#: software/templates/features.html:45
-msgid "About"
-msgstr "O nás"
-
#: software/templates/features.html:57
msgid "Mobile app"
msgstr "Mobilní aplikace"
@@ -3601,18 +3560,6 @@ msgstr ""
"také obsahuje dostatečně nový, tvůrčí obsah, aby mu vznikl nárok na vlastní "
"autorská práva."
-#: utils/models.py:130
-msgid "Pending"
-msgstr "Čekájící"
-
-#: utils/models.py:131
-msgid "Accepted"
-msgstr "Schváleno"
-
-#: utils/models.py:132
-msgid "Declined"
-msgstr "Zamítnuto"
-
#: weight/forms.py:54
msgid "Input"
msgstr "Vstup"
@@ -3625,7 +3572,7 @@ msgstr "Formát data"
msgid "You have to enter your weight"
msgstr "Zadejte nový údaj své hmotnosti"
-#: weight/models.py:60
+#: weight/models.py:78
msgid "Weight entry"
msgstr "Vložit hmotnost"
@@ -3766,6 +3713,65 @@ msgstr "Úspěšně smazáno."
msgid "Delete weight entry for the %s"
msgstr "Vymazat záznam váhy pro %s"
+#~ msgid "Ingredients pending review"
+#~ msgstr "Potraviny čekající na kontrolu"
+
+#~ msgid "Fibres"
+#~ msgstr "Vláknina"
+
+#~ msgid "Ingredient was successfully added to the general database"
+#~ msgstr "Potravina byla přidána do základní databáze"
+
+#~ msgid "New user submitted ingredient"
+#~ msgstr "Uživatelem zaslané nové složky"
+
+#, python-brace-format
+#~ msgid ""
+#~ "The user {request.user.username} submitted a new ingredient \"{self."
+#~ "name}\"."
+#~ msgstr ""
+#~ "Uživatel {request.user.username} přidal novou ingredienci „{self.name}“."
+
+#~ msgid "Submission date"
+#~ msgstr "Datum zaslání"
+
+#~ msgid "Ingredient is pending review"
+#~ msgstr "Potravina čeká na schválení"
+
+#~ msgid ""
+#~ "This user submitted ingredient is pending a decision to be\n"
+#~ "included in the database. Till then, it will not be shown in the overview "
+#~ "or\n"
+#~ "the search."
+#~ msgstr ""
+#~ "Uživatel zaslal k nutriční položku k překontrolování a rozhodnutí, \n"
+#~ "jestli bude zahrnuta v databázi. Do doby, než bude zkontrolována,\n"
+#~ "nebude se zobrazovat v přehledu, nebo ve vyhledávání."
+
+#~ msgid "Please select one of the options below."
+#~ msgstr "Vyberte si jednu z možností níže."
+
+#~ msgid "Accept"
+#~ msgstr "Povolit"
+
+#~ msgid "Decline"
+#~ msgstr "Zamítnout"
+
+#~ msgid "Ingredient was successfully marked as rejected"
+#~ msgstr "Složka byla označena jako zamítnuta"
+
+#~ msgid "About"
+#~ msgstr "O nás"
+
+#~ msgid "Pending"
+#~ msgstr "Čekájící"
+
+#~ msgid "Accepted"
+#~ msgstr "Schváleno"
+
+#~ msgid "Declined"
+#~ msgstr "Zamítnuto"
+
#~ msgid "Share"
#~ msgstr "Sdílet"
diff --git a/wger/locale/da/LC_MESSAGES/django.po b/wger/locale/da/LC_MESSAGES/django.po
index 1f610f7a4..bdca46e49 100644
--- a/wger/locale/da/LC_MESSAGES/django.po
+++ b/wger/locale/da/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: wger Workout Manager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-02-02 12:42+0100\n"
+"POT-Creation-Date: 2024-07-14 15:49+0200\n"
"PO-Revision-Date: 2023-07-09 18:48+0000\n"
"Last-Translator: Tomasz Cielecki <[email protected]>\n"
"Language-Team: Danish <https://hosted.weblate.org/projects/wger/web/da/>\n"
@@ -33,7 +33,7 @@ msgstr ""
"tilknyttet dette fitnesscenter, og allerede eksisterende brugere der ikke er "
"tilknyttet et center vil tilknyttes dette."
-#: config/views/gym_config.py:42 core/templates/language/view.html:63
+#: config/views/gym_config.py:42 core/templates/language/view.html:67
#: core/templates/license/list.html:17 core/templates/misc/license/list.html:18
#: core/templates/repetition_unit/list.html:18
#: core/templates/tags/render_day.html:39
@@ -53,8 +53,8 @@ msgstr ""
#: manager/templates/calendar/day.html:68
#: manager/templates/calendar/month.html:85
#: manager/templates/calendar/partial_overview_table.html:18
-#: manager/templates/schedule/view.html:119
-#: nutrition/templates/ingredient/view.html:191
+#: manager/templates/schedule/view.html:118
+#: nutrition/templates/ingredient/view.html:165
#: nutrition/templates/units/list.html:19
msgid "Edit"
msgstr "Rediger"
@@ -90,8 +90,8 @@ msgstr "Min seje trænings-plan"
msgid "Empty placeholder schedule"
msgstr "Tom plan"
-#: core/forms.py:69 core/templates/navigation.html:275
-#: core/templates/navigation.html:281 core/templates/user/login.html:4
+#: core/forms.py:69 core/templates/navigation.html:285
+#: core/templates/navigation.html:291 core/templates/user/login.html:4
#: software/templates/features.html:82 software/templates/features.html:427
msgid "Login"
msgstr "Login"
@@ -163,7 +163,7 @@ msgstr "Kodeord"
msgid "Please enter your current password."
msgstr "Indtast venligst dit nuværende kodeord."
-#: core/forms.py:242 core/templates/language/view.html:68
+#: core/forms.py:242 core/templates/language/view.html:73
#: core/templates/license/list.html:19 core/templates/misc/license/list.html:22
#: core/templates/repetition_unit/list.html:20
#: core/templates/tags/render_day.html:45
@@ -178,10 +178,10 @@ msgstr "Indtast venligst dit nuværende kodeord."
#: gym/templates/gym/list.html:22 manager/templates/calendar/day.html:73
#: manager/templates/calendar/month.html:89
#: manager/templates/calendar/partial_overview_table.html:23
-#: manager/templates/schedule/view.html:123
-#: manager/templates/workout/view.html:190
-#: nutrition/templates/ingredient/view.html:192
-#: nutrition/templates/ingredient/view.html:241
+#: manager/templates/schedule/view.html:122
+#: manager/templates/workout/view.html:188
+#: nutrition/templates/ingredient/view.html:166
+#: nutrition/templates/ingredient/view.html:215
#: nutrition/templates/units/list.html:22
msgid "Delete"
msgstr "Slet"
@@ -194,14 +194,14 @@ msgstr "Ukorrekt kodeord"
msgid "The form is secured with reCAPTCHA"
msgstr "Denne formular er sikret med reCAPTCHA"
-#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:275
-#: core/templates/navigation.html:287 core/templates/template.html:147
+#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:285
+#: core/templates/navigation.html:297 core/templates/template.html:149
#: core/templates/user/login.html:20 core/views/user.py:298
#: software/templates/features.html:87 software/templates/features.html:422
msgid "Register"
msgstr "Registrer"
-#: core/forms.py:315
+#: core/forms.py:315 software/templates/features.html:45
msgid "Contact"
msgstr "Kontakt"
@@ -212,7 +212,7 @@ msgid "Some way of answering you (e-mail, etc.)"
msgstr "Måder du kan kontaktes på (email, etc.)"
#: core/forms.py:324 exercises/models/comment.py:58 manager/models/set.py:61
-#: manager/models/setting.py:111 nutrition/models/log.py:74
+#: manager/models/setting.py:114 nutrition/models/log.py:77
msgid "Comment"
msgstr "Kommentar"
@@ -232,6 +232,12 @@ msgstr "Sprogets korte navn"
msgid "Language full name"
msgstr "Sprogets fulde navn"
+#: core/models/language.py:45 core/templates/language/view.html:23
+#, fuzzy
+#| msgid "Language full name"
+msgid "Language full name in English"
+msgstr "Sprogets fulde navn"
+
#: core/models/license.py:29
msgid "Full name"
msgstr "Fulde navn"
@@ -248,7 +254,7 @@ msgstr ""
msgid "Short name, e.g. CC-BY-SA 3"
msgstr "Kort navn, f.eks. CC-BY-SA 3"
-#: core/models/license.py:45 nutrition/models/ingredient.py:214
+#: core/models/license.py:45 nutrition/models/ingredient.py:208
msgid "Link"
msgstr "Link"
@@ -364,7 +370,7 @@ msgstr ""
msgid "Age"
msgstr "Alder"
-#: core/models/profile.py:230 nutrition/forms.py:117
+#: core/models/profile.py:230 nutrition/forms.py:118
msgid "Height (cm)"
msgstr "Højde (cm)"
@@ -415,7 +421,7 @@ msgid "Total caloric intake, including e.g. any surplus"
msgstr "Total kalorieindtag, inklusive eventuelle overskud"
#: core/models/profile.py:333 nutrition/models/ingredient_weight_unit.py:45
-#: nutrition/models/log.py:93 nutrition/models/meal_item.py:58
+#: nutrition/models/log.py:96 nutrition/models/meal_item.py:59
msgid "Weight unit"
msgstr "Vægt enhed"
@@ -447,17 +453,16 @@ msgstr "Summen af alle timer skal være 24"
#: core/models/rep_unit.py:36 core/models/weight_unit.py:36
#: core/templates/user/overview.html:262 core/views/user.py:599
#: exercises/models/category.py:29 exercises/models/equipment.py:29
-#: exercises/models/exercise.py:58 exercises/models/muscle.py:36
+#: exercises/models/exercise.py:59 exercises/models/muscle.py:36
#: gym/models/contract.py:52 gym/models/contract.py:103 gym/models/gym.py:46
#: gym/models/user_document.py:84 gym/templates/contract/view.html:50
#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:96
#: gym/views/gym.py:158 manager/models/schedule.py:55
#: manager/models/workout.py:57 measurements/models/category.py:36
-#: nutrition/models/ingredient.py:125
+#: nutrition/models/ingredient.py:111
#: nutrition/models/ingredient_category.py:27 nutrition/models/meal.py:67
#: nutrition/models/weight_unit.py:38
-#: nutrition/templates/ingredient/pending.html:15
-#: nutrition/templates/ingredient/view.html:178
+#: nutrition/templates/ingredient/view.html:152
msgid "Name"
msgstr "Navn"
@@ -560,24 +565,24 @@ msgstr "Klik venligst følgende link for at bekræfte din email: %(link)s"
msgid "Dashboard"
msgstr "Instrumentbrættet"
-#: core/templates/language/overview.html:4 core/templates/navigation.html:335
+#: core/templates/language/overview.html:4 core/templates/navigation.html:345
msgid "Languages"
msgstr "Sprog"
-#: core/templates/language/overview.html:20
+#: core/templates/language/overview.html:22
msgid "Nothing found."
msgstr "Intet fundet."
-#: core/templates/language/overview.html:20
+#: core/templates/language/overview.html:22
#: manager/templates/calendar/month.html:132
#: manager/templates/schedule/overview.html:28
-#: manager/templates/schedule/view.html:145
+#: manager/templates/schedule/view.html:144
#: manager/templates/workout/overview.html:28
#: nutrition/templates/ingredient/overview.html:38
msgid "Add one now."
msgstr "Tilføj en ny."
-#: core/templates/language/overview.html:33 core/templates/license/list.html:40
+#: core/templates/language/overview.html:35 core/templates/license/list.html:40
#: core/templates/misc/license/list.html:43
#: core/templates/repetition_unit/list.html:43
#: core/templates/user/overview.html:326 core/templates/user/overview.html:365
@@ -597,13 +602,13 @@ msgstr "Tilføj en ny."
msgid "Add"
msgstr "Tilføj"
-#: core/templates/language/view.html:58 core/templates/user/api_key.html:44
+#: core/templates/language/view.html:61 core/templates/user/api_key.html:44
#: core/templates/user/preferences.html:45 gym/models/contract.py:203
#: gym/templates/contract/view.html:41 gym/templates/contract/view.html:106
#: gym/templates/gym/member_list.html:248
-#: manager/templates/schedule/view.html:286
-#: manager/templates/workout/view.html:165
-#: nutrition/templates/ingredient/view.html:228
+#: manager/templates/schedule/view.html:285
+#: manager/templates/workout/view.html:163
+#: nutrition/templates/ingredient/view.html:202
msgid "Options"
msgstr "Indstillinger"
@@ -628,12 +633,11 @@ msgstr "Licens liste"
#: gym/templates/gym/member_list.html:299
#: mailer/templates/mailer/gym/overview.html:30
#: manager/templates/calendar/day.html:87
-#: nutrition/templates/ingredient/pending.html:30
#: nutrition/templates/units/list.html:29
msgid "Nothing found"
msgstr "Ingenting fundet"
-#: core/templates/misc/about.html:4 core/templates/template.html:173
+#: core/templates/misc/about.html:4 core/templates/template.html:175
msgid "Imprint"
msgstr "Aftryk"
@@ -646,174 +650,169 @@ msgstr ""
"Hvis in licens er fundet, f.eks. en Creative Commons\n"
" licens for et land, tilføj dem som seperate poster her."
-#: core/templates/navigation.html:27 software/templates/features.html:437
+#: core/templates/navigation.html:28 software/templates/features.html:437
msgid "Training"
msgstr "Træning"
-#: core/templates/navigation.html:34 core/templates/user/overview.html:25
+#: core/templates/navigation.html:37 core/templates/user/overview.html:25
msgid "Workouts"
msgstr "Træninger"
-#: core/templates/navigation.html:42
+#: core/templates/navigation.html:46
msgid "Workouts schedules"
msgstr "Træningsplaner"
-#: core/templates/navigation.html:50 core/templates/user/overview.html:70
+#: core/templates/navigation.html:54 core/templates/user/overview.html:70
#: manager/templates/calendar/month.html:10
#: manager/templates/calendar/month.html:21
msgid "Calendar"
msgstr "Kaldender"
-#: core/templates/navigation.html:60
+#: core/templates/navigation.html:64
msgid "Measurements"
msgstr ""
-#: core/templates/navigation.html:70 gallery/templates/images/overview.html:6
+#: core/templates/navigation.html:75 gallery/templates/images/overview.html:6
msgid "Gallery"
msgstr "Galleri"
-#: core/templates/navigation.html:76
+#: core/templates/navigation.html:81
msgid "Workout templates"
msgstr "Træningsskabeloner"
-#: core/templates/navigation.html:82 manager/views/workout.py:84
+#: core/templates/navigation.html:88 manager/views/workout.py:84
msgid "Your templates"
msgstr "Dine skabeloner"
-#: core/templates/navigation.html:90 manager/views/workout.py:98
+#: core/templates/navigation.html:97 manager/views/workout.py:98
msgid "Public templates"
msgstr "Offentlige skabeloner"
-#: core/templates/navigation.html:97 manager/forms.py:129
-#: manager/models/setting.py:54 software/templates/features.html:51
+#: core/templates/navigation.html:105 manager/forms.py:129
+#: manager/models/setting.py:57 software/templates/features.html:51
#: software/templates/features.html:459
msgid "Exercises"
msgstr "Øvelser"
-#: core/templates/navigation.html:103 core/templates/navigation.html:170
-#: core/templates/navigation.html:330
+#: core/templates/navigation.html:111 core/templates/navigation.html:184
+#: core/templates/navigation.html:340
msgid "Administration"
msgstr "Administration"
-#: core/templates/navigation.html:106
+#: core/templates/navigation.html:115
msgid "Exercise edit history"
msgstr "Øvelsesredigeringshistorik"
-#: core/templates/navigation.html:111 exercises/models/base.py:103
+#: core/templates/navigation.html:121 exercises/models/base.py:103
msgid "Equipment"
msgstr "Udstyr"
-#: core/templates/navigation.html:116
+#: core/templates/navigation.html:127
msgid "Muscles"
msgstr "Muskler"
-#: core/templates/navigation.html:121
+#: core/templates/navigation.html:133
#: exercises/templates/categories/admin-overview.html:4
msgid "Categories"
msgstr "Kategorier"
-#: core/templates/navigation.html:136 software/templates/features.html:447
+#: core/templates/navigation.html:148 software/templates/features.html:447
msgid "Nutrition"
msgstr "Ernæring"
-#: core/templates/navigation.html:143 core/templates/user/overview.html:144
+#: core/templates/navigation.html:156 core/templates/user/overview.html:144
msgid "Nutrition plans"
msgstr "Ernæringsplaner"
-#: core/templates/navigation.html:151 nutrition/templates/bmi/form.html:50
+#: core/templates/navigation.html:165 nutrition/templates/bmi/form.html:50
msgid "BMI calculator"
msgstr "BMI lommeregner"
-#: core/templates/navigation.html:159 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:174 nutrition/templates/rate/form.html:17
msgid "Daily calories calculator"
msgstr "Daglige kalorier lommeregner"
-#: core/templates/navigation.html:165
+#: core/templates/navigation.html:179
#: nutrition/templates/ingredient/overview.html:10
msgid "Ingredient overview"
msgstr "Ingrediensoversigt"
-#: core/templates/navigation.html:172 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:187 nutrition/templates/units/list.html:6
msgid "Ingredient weight units"
msgstr "Ingrediens vægtenheder"
-#: core/templates/navigation.html:177
-#: nutrition/templates/ingredient/pending.html:6
-msgid "Ingredients pending review"
-msgstr "Ingredienser afventer gennemgang"
-
-#: core/templates/navigation.html:193 software/templates/features.html:442
+#: core/templates/navigation.html:203 software/templates/features.html:442
msgid "Body weight"
msgstr "Kropsvægt"
-#: core/templates/navigation.html:200 core/templates/user/overview.html:114
+#: core/templates/navigation.html:210 core/templates/user/overview.html:114
msgid "Weight overview"
msgstr "Vægt oversigt"
-#: core/templates/navigation.html:207 weight/views.py:65
+#: core/templates/navigation.html:217 weight/views.py:65
msgid "Add weight entry"
msgstr "Tilføj vægtpost"
-#: core/templates/navigation.html:221
+#: core/templates/navigation.html:231
msgid "About this software"
msgstr "Om denne software"
-#: core/templates/navigation.html:227 software/templates/about_us.html:5
+#: core/templates/navigation.html:237 software/templates/about_us.html:5
msgid "About us"
msgstr "Om os"
-#: core/templates/navigation.html:233 software/templates/features.html:507
+#: core/templates/navigation.html:243 software/templates/features.html:507
msgid "REST API"
msgstr "REST API"
-#: core/templates/navigation.html:239 utils/models.py:45
+#: core/templates/navigation.html:249 utils/models.py:45
msgid "License"
msgstr "Licens"
-#: core/templates/navigation.html:245
+#: core/templates/navigation.html:255
msgid "Developer documentation"
msgstr "Udviklerdokumentation"
-#: core/templates/navigation.html:252
+#: core/templates/navigation.html:262
msgid "Get the code"
msgstr "Hent koden"
-#: core/templates/navigation.html:259 core/templates/template.html:212
+#: core/templates/navigation.html:269 core/templates/template.html:214
#: software/templates/features.html:582
msgid "Translate"
msgstr "Oversæt"
-#: core/templates/navigation.html:293 core/templates/user/login.html:28
+#: core/templates/navigation.html:303 core/templates/user/login.html:28
msgid "Reset password"
msgstr "Nulstil kodeord"
-#: core/templates/navigation.html:311
+#: core/templates/navigation.html:321
msgid "My preferences"
msgstr "Mine indstillinger"
-#: core/templates/navigation.html:320
+#: core/templates/navigation.html:330
msgid "Logout"
msgstr "Log ud"
-#: core/templates/navigation.html:343
+#: core/templates/navigation.html:353
msgid "Licenses"
msgstr "Licenser"
-#: core/templates/navigation.html:351
+#: core/templates/navigation.html:361
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr "Gentagelsesenheder"
-#: core/templates/navigation.html:359 core/templates/weight_unit/list.html:4
-#: nutrition/templates/ingredient/view.html:167
+#: core/templates/navigation.html:369 core/templates/weight_unit/list.html:4
+#: nutrition/templates/ingredient/view.html:141
msgid "Weight units"
msgstr "Vægtenheder"
-#: core/templates/navigation.html:367 core/templates/user/list.html:4
+#: core/templates/navigation.html:377 core/templates/user/list.html:4
msgid "User list"
msgstr "Brugerliste"
-#: core/templates/navigation.html:373
+#: core/templates/navigation.html:383
msgid "Gyms"
msgstr "Fitnescentre"
@@ -867,12 +866,12 @@ msgstr "Tak fordi du bruger vores side!"
msgid "The %(site_name)s team"
msgstr "%(site_name)s teamet"
-#: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:11
+#: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:12
msgid "previous"
msgstr "forrige"
-#: core/templates/tags/pagination.html:31
-#: core/templates/tags/pagination.html:35
+#: core/templates/tags/pagination.html:33
+#: core/templates/tags/pagination.html:38
msgid "next"
msgstr "næste"
@@ -897,35 +896,35 @@ msgid "Add exercises to this workout day"
msgstr "Tilføj øvelser til denne træningsdag"
#: core/templates/tags/render_weight_log.html:17 manager/helpers.py:86
-#: manager/models/setting.py:69 manager/templates/set/formset.html:9
+#: manager/models/setting.py:72 manager/templates/set/formset.html:9
msgid "Reps"
msgstr "Repetitioner"
#: core/templates/tags/render_weight_log.html:30 manager/forms.py:191
-#: manager/models/log.py:103 manager/models/setting.py:99
+#: manager/models/log.py:103 manager/models/setting.py:102
#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
msgid "RiR"
msgstr ""
-#: core/templates/template.html:120 manager/templates/calendar/month.html:138
-#: manager/templates/schedule/view.html:249
-#: manager/templates/schedule/view.html:270
-#: manager/templates/workout/view.html:86
-#: manager/templates/workout/view.html:139
+#: core/templates/template.html:122 manager/templates/calendar/month.html:138
+#: manager/templates/schedule/view.html:248
+#: manager/templates/schedule/view.html:269
+#: manager/templates/workout/view.html:84
+#: manager/templates/workout/view.html:137
msgid "Close"
msgstr "Luk"
-#: core/templates/template.html:136
+#: core/templates/template.html:138
msgid ""
"You are using a guest account, data entered will be deleted after a week."
msgstr ""
"Du bruger en gæstekonto, date indtastet vil blive slettet efter en uge."
-#: core/templates/template.html:141
+#: core/templates/template.html:143
msgid "Create some demo entries"
msgstr "Indtast nogle demo-poster"
-#: core/templates/template.html:178 software/templates/features.html:547
+#: core/templates/template.html:180 software/templates/features.html:547
#: software/templates/tos.html:7
msgid "Terms of service"
msgstr "Vilkår for brug"
@@ -1026,7 +1025,7 @@ msgid "Overview"
msgstr "Oversigt"
#: core/templates/user/overview.html:28
-#: manager/templates/schedule/view.html:164
+#: manager/templates/schedule/view.html:163
#: manager/templates/workout/overview.html:39 manager/views/schedule_step.py:60
msgid "Add workout"
msgstr "Tilføj træning"
@@ -1034,20 +1033,20 @@ msgstr "Tilføj træning"
#: core/templates/user/overview.html:34 core/templates/user/overview.html:76
#: core/templates/user/overview.html:120 core/templates/user/overview.html:152
#: exercises/models/base.py:118 exercises/models/base.py:124
-#: exercises/models/exercise.py:63 exercises/models/exercise.py:69
+#: exercises/models/exercise.py:64 exercises/models/exercise.py:70
#: exercises/models/image.py:107 exercises/models/image.py:113
#: exercises/models/video.py:163 exercises/models/video.py:169
#: gallery/models/image.py:42 manager/helpers.py:85 manager/models/log.py:100
#: manager/models/session.py:67 measurements/models/measurement.py:47
-#: nutrition/models/ingredient.py:101 nutrition/models/ingredient.py:107
-#: nutrition/models/ingredient.py:222 weight/models.py:33
+#: nutrition/models/ingredient.py:87 nutrition/models/ingredient.py:93
+#: nutrition/models/ingredient.py:216 weight/models.py:51
#: weight/templates/import_csv_preview.html:13
#: weight/templates/import_csv_preview.html:42 weight/views.py:144
msgid "Date"
msgstr "Dato"
#: core/templates/user/overview.html:35 core/templates/user/overview.html:153
-#: exercises/models/exercise.py:51 gallery/models/image.py:65
+#: exercises/models/exercise.py:52 gallery/models/image.py:65
#: gym/models/contract.py:58 gym/models/contract.py:109
#: manager/models/day.py:37 manager/models/workout.py:63
#: measurements/models/measurement.py:62 nutrition/models/plan.py:67
@@ -1065,13 +1064,13 @@ msgstr "Sidste aktivitet"
#: core/templates/user/overview.html:58
#: manager/templates/calendar/month.html:128
-#: manager/templates/schedule/view.html:145
+#: manager/templates/schedule/view.html:144
#: manager/templates/workout/overview.html:28
msgid "No workouts found."
msgstr "Ingen træninger fundet."
#: core/templates/user/overview.html:68 manager/forms.py:280
-#: manager/templates/workout/view.html:108
+#: manager/templates/workout/view.html:106
msgid "Log"
msgstr "Log"
@@ -1095,35 +1094,35 @@ msgstr "Tid"
#: core/templates/user/overview.html:112 core/templates/user/overview.html:121
#: manager/forms.py:186 manager/helpers.py:86 manager/models/log.py:86
-#: manager/models/setting.py:79 manager/templates/log/add.html:54
-#: manager/templates/set/formset.html:11 weight/models.py:35
+#: manager/models/setting.py:82 manager/templates/log/add.html:54
+#: manager/templates/set/formset.html:11 weight/models.py:53
#: weight/templates/import_csv_preview.html:14
#: weight/templates/import_csv_preview.html:43 weight/views.py:144
msgid "Weight"
msgstr "Vægt"
-#: core/templates/user/overview.html:154 nutrition/models/ingredient.py:130
-#: nutrition/templates/ingredient/view.html:77 nutrition/views/plan.py:237
+#: core/templates/user/overview.html:154 nutrition/models/ingredient.py:116
+#: nutrition/templates/ingredient/view.html:51 nutrition/views/plan.py:237
msgid "Energy"
msgstr "Energi"
-#: core/templates/user/overview.html:155 nutrition/models/ingredient.py:137
-#: nutrition/templates/ingredient/view.html:84 nutrition/views/plan.py:243
+#: core/templates/user/overview.html:155 nutrition/models/ingredient.py:123
+#: nutrition/templates/ingredient/view.html:58 nutrition/views/plan.py:243
msgid "Protein"
msgstr "Protein"
-#: core/templates/user/overview.html:156 nutrition/models/ingredient.py:145
-#: nutrition/templates/ingredient/view.html:90 nutrition/views/plan.py:251
+#: core/templates/user/overview.html:156 nutrition/models/ingredient.py:131
+#: nutrition/templates/ingredient/view.html:64 nutrition/views/plan.py:251
msgid "Carbohydrates"
msgstr "Kulhydrater"
-#: core/templates/user/overview.html:157 nutrition/models/ingredient.py:163
-#: nutrition/templates/ingredient/view.html:106 nutrition/views/plan.py:265
+#: core/templates/user/overview.html:157 nutrition/models/ingredient.py:149
+#: nutrition/templates/ingredient/view.html:80 nutrition/views/plan.py:265
msgid "Fat"
msgstr "Fedt"
#: core/templates/user/overview.html:170
-#: nutrition/templates/ingredient/view.html:79
+#: nutrition/templates/ingredient/view.html:53
msgid "kcal"
msgstr "kcal"
@@ -1135,7 +1134,7 @@ msgstr "kcal"
#: gym/templates/gym/member_list.html:207
#: gym/templates/gym/member_list.html:240
#: gym/templates/gym/member_list.html:277
-#: manager/templates/schedule/view.html:101
+#: manager/templates/schedule/view.html:100
msgid "Actions"
msgstr "Handlinger"
@@ -1178,7 +1177,7 @@ msgid "Details"
msgstr "Detaljer"
#: core/templates/user/overview.html:258 gym/views/export.py:57
-#: manager/helpers.py:86 manager/templates/schedule/view.html:99
+#: manager/helpers.py:86 manager/templates/schedule/view.html:98
msgid "Nr."
msgstr "Nr."
@@ -1223,7 +1222,7 @@ msgid "Documents"
msgstr "Dokumenter"
#: core/templates/user/overview.html:412 gym/templates/document/list.html:32
-#: manager/forms.py:292 manager/templates/workout/view.html:134
+#: manager/forms.py:292 manager/templates/workout/view.html:132
msgid "Download"
msgstr ""
@@ -1274,13 +1273,13 @@ msgid "kg"
msgstr "kg"
#: core/templatetags/wger_extras.py:207
-#: nutrition/templates/ingredient/view.html:86
-#: nutrition/templates/ingredient/view.html:92
-#: nutrition/templates/ingredient/view.html:99
-#: nutrition/templates/ingredient/view.html:108
-#: nutrition/templates/ingredient/view.html:115
-#: nutrition/templates/ingredient/view.html:137
-#: nutrition/templates/ingredient/view.html:147
+#: nutrition/templates/ingredient/view.html:60
+#: nutrition/templates/ingredient/view.html:66
+#: nutrition/templates/ingredient/view.html:73
+#: nutrition/templates/ingredient/view.html:82
+#: nutrition/templates/ingredient/view.html:89
+#: nutrition/templates/ingredient/view.html:111
+#: nutrition/templates/ingredient/view.html:121
msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr "g"
@@ -1298,7 +1297,7 @@ msgstr "oz"
#: exercises/views/equipment.py:103 exercises/views/exercises.py:73
#: exercises/views/muscles.py:99 manager/views/schedule.py:309
#: manager/views/schedule_step.py:128 manager/views/workout.py:249
-#: manager/views/workout_session.py:142 nutrition/views/ingredient.py:116
+#: manager/views/workout_session.py:142 nutrition/views/ingredient.py:119
#: nutrition/views/unit.py:110
msgid "Successfully deleted"
msgstr "Sletning udført"
@@ -1310,7 +1309,7 @@ msgstr "Sletning udført"
#: gym/views/admin_notes.py:196 gym/views/document.py:206 gym/views/gym.py:481
#: manager/views/schedule.py:316 manager/views/schedule_step.py:138
#: manager/views/workout.py:253 manager/views/workout_session.py:156
-#: nutrition/views/ingredient.py:123 nutrition/views/unit.py:117
+#: nutrition/views/ingredient.py:126 nutrition/views/unit.py:117
#, python-brace-format
msgid "Delete {0}?"
msgstr "Slet {0}?"
@@ -1323,7 +1322,7 @@ msgstr "Slet {0}?"
#: gym/views/contract.py:186 gym/views/contract_option.py:123
#: gym/views/contract_type.py:123 gym/views/document.py:171
#: gym/views/gym.py:463 manager/views/day.py:100 manager/views/schedule.py:333
-#: manager/views/workout.py:267 nutrition/views/ingredient.py:142
+#: manager/views/workout.py:267 nutrition/views/ingredient.py:145
#: nutrition/views/unit.py:143
#, python-brace-format
msgid "Edit {0}"
@@ -1397,7 +1396,7 @@ msgstr "Fitnescenter"
msgid "A verification email was sent to %(email)s"
msgstr "En bekræftelsesemail blev sendt til %(email)s"
-#: exercises/models/base.py:82 nutrition/models/ingredient.py:236
+#: exercises/models/base.py:82 nutrition/models/ingredient.py:230
msgid "Category"
msgstr "Kategori"
@@ -1417,7 +1416,7 @@ msgstr "Variationer"
msgid "Exercise Categories"
msgstr "Øvelseskategorier"
-#: exercises/models/comment.py:52 exercises/models/exercise_alias.py:52
+#: exercises/models/comment.py:52 exercises/models/exercise_alias.py:53
#: exercises/models/image.py:74 exercises/models/video.py:98
#: manager/forms.py:178 manager/helpers.py:86 manager/models/log.py:52
msgid "Exercise"
@@ -1427,12 +1426,12 @@ msgstr "Øvelse"
msgid "A comment about how to correctly do this exercise."
msgstr "En kommentar om hvordan øvelsen udføres korrekt."
-#: exercises/models/exercise.py:76 nutrition/models/ingredient.py:95
+#: exercises/models/exercise.py:77 nutrition/models/ingredient.py:81
#: nutrition/models/weight_unit.py:32
msgid "Language"
msgstr "Sprog"
-#: exercises/models/exercise_alias.py:58
+#: exercises/models/exercise_alias.py:59
msgid "Alias for an exercise"
msgstr "Alias for en øvelse"
@@ -1567,7 +1566,7 @@ msgstr "Indstillinger"
#: manager/models/schedule.py:44 manager/models/session.py:49
#: manager/models/workout.py:89 measurements/models/category.py:31
#: measurements/models/measurement.py:42 nutrition/models/plan.py:54
-#: nutrition/templates/ingredient/pending.html:16 weight/models.py:42
+#: weight/models.py:60
msgid "User"
msgstr "Bruger"
@@ -1686,9 +1685,9 @@ msgid "Contract type"
msgstr "Kontrakttype"
#: gym/models/contract.py:211 gym/templates/contract/view.html:59
-#: manager/templates/log/add.html:52 nutrition/forms.py:62
-#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:105
-#: nutrition/models/meal_item.py:72
+#: manager/templates/log/add.html:52 nutrition/forms.py:63
+#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:108
+#: nutrition/models/meal_item.py:73
msgid "Amount"
msgstr "Mængde"
@@ -1705,7 +1704,7 @@ msgid "Contract is active"
msgstr "Kontrakten er aktiv"
#: gym/models/contract.py:237 gym/templates/contract/view.html:69
-#: manager/models/schedule.py:61 manager/templates/schedule/view.html:68
+#: manager/models/schedule.py:61 manager/templates/schedule/view.html:67
msgid "Start date"
msgstr "Startdato"
@@ -2098,7 +2097,7 @@ msgstr "Generer forhåndsvisning"
#: mailer/templates/mailer/gym/form.html:28
#: mailer/templates/mailer/gym/preview.html:62
-#: manager/templates/workout/view.html:42
+#: manager/templates/workout/view.html:40
msgid "Steps"
msgstr "Trin"
@@ -2121,7 +2120,7 @@ msgstr ""
"Du kan opdatere og rette indholdet så meget du vil før du sender emailsne"
#: mailer/templates/mailer/gym/preview.html:22
-#: software/templates/about_us.html:60
+#: software/templates/about_us.html:70
msgid "Current version"
msgstr "Nuværende version"
@@ -2154,16 +2153,16 @@ msgstr ""
"Du kan søge efter mere end en øvelse, de vil blive gruperet sammen til et "
"supersæt."
-#: manager/forms.py:140 nutrition/forms.py:252
+#: manager/forms.py:140 nutrition/forms.py:253
msgid "Also search for names in English"
msgstr "Søg også navne på Engelsk"
#: manager/forms.py:168 manager/forms.py:173 manager/models/log.py:64
-#: manager/models/log.py:92 manager/models/setting.py:59
-#: manager/models/setting.py:90 manager/templates/log/add.html:53
+#: manager/models/log.py:92 manager/models/setting.py:62
+#: manager/models/setting.py:93 manager/templates/log/add.html:53
#: manager/templates/log/add.html:55 manager/templates/set/formset.html:10
#: manager/templates/set/formset.html:12 measurements/models/category.py:41
-#: nutrition/forms.py:66
+#: nutrition/forms.py:67
msgid "Unit"
msgstr "Enhed"
@@ -2171,15 +2170,15 @@ msgstr "Enhed"
msgid "Type"
msgstr ""
-#: manager/forms.py:280 manager/templates/workout/view.html:115
+#: manager/forms.py:280 manager/templates/workout/view.html:113
msgid "Table"
msgstr "Tabel"
-#: manager/forms.py:282 manager/templates/workout/view.html:121
+#: manager/forms.py:282 manager/templates/workout/view.html:119
msgid "with images"
msgstr "med billeder"
-#: manager/forms.py:283 manager/templates/workout/view.html:127
+#: manager/forms.py:283 manager/templates/workout/view.html:125
msgid "with comments"
msgstr "med kommentarer"
@@ -2188,11 +2187,10 @@ msgid "Workout will expire soon"
msgstr "Træning vil udløbe snart"
#: manager/models/day.py:34 manager/models/log.py:58
-#: manager/models/session.py:60 manager/templates/schedule/view.html:103
-#: manager/templates/workout/view.html:11
-#: manager/templates/workout/view.html:19 manager/views/pdf.py:85
-#: manager/views/pdf.py:161 manager/views/schedule.py:151
-#: manager/views/schedule.py:221
+#: manager/models/session.py:60 manager/templates/schedule/view.html:102
+#: manager/templates/workout/view.html:9 manager/templates/workout/view.html:17
+#: manager/views/pdf.py:85 manager/views/pdf.py:161
+#: manager/views/schedule.py:151 manager/views/schedule.py:221
msgid "Workout"
msgstr "Træning"
@@ -2212,7 +2210,7 @@ msgstr "Dag"
msgid "Name or short description of the schedule. For example 'Program XYZ'."
msgstr "Navn eller kort beskrivelse af skema. For eksempel 'Program XYZ'."
-#: manager/models/schedule.py:65 manager/templates/schedule/view.html:72
+#: manager/models/schedule.py:65 manager/templates/schedule/view.html:71
msgid "Schedule active"
msgstr "Skema aktivt"
@@ -2226,7 +2224,7 @@ msgstr ""
"blive vis f.eks. på dit dashboard). Alle andre skemaer vil blive markerede "
"inaktive"
-#: manager/models/schedule.py:77 manager/templates/schedule/view.html:82
+#: manager/models/schedule.py:77 manager/templates/schedule/view.html:81
msgid "Is a loop"
msgstr "Er en sløjfe"
@@ -2247,8 +2245,8 @@ msgid "The duration in weeks"
msgstr "Varighed i uger"
#: manager/models/schedule_step.py:64 manager/models/set.py:53
-#: manager/models/setting.py:110 nutrition/models/meal.py:55
-#: nutrition/models/meal_item.py:65
+#: manager/models/setting.py:113 nutrition/models/meal.py:55
+#: nutrition/models/meal_item.py:66
msgid "Order"
msgstr "Orden"
@@ -2298,7 +2296,7 @@ msgstr "Øvelsesdag"
msgid "Number of sets"
msgstr "Antal sæt"
-#: manager/models/setting.py:48
+#: manager/models/setting.py:51
msgid "Sets"
msgstr "Sæt"
@@ -2374,7 +2372,7 @@ msgstr ""
msgid "Go to current month"
msgstr "Gå til nuværende måned"
-#: manager/templates/calendar/month.html:188
+#: manager/templates/calendar/month.html:190
msgid "Add new log"
msgstr "Tilføj ny log"
@@ -2415,8 +2413,8 @@ msgid "Your schedules"
msgstr "Dine skemaer"
#: manager/templates/schedule/overview.html:19
-#: manager/templates/schedule/view.html:132
-#: manager/templates/schedule/view.html:184
+#: manager/templates/schedule/view.html:131
+#: manager/templates/schedule/view.html:183
#: manager/templates/workout/overview.html:16
msgid "active"
msgstr "aktive"
@@ -2463,11 +2461,11 @@ msgstr ""
msgid "Add schedule"
msgstr "Tilføj skema"
-#: manager/templates/schedule/view.html:10
+#: manager/templates/schedule/view.html:9
msgid "Schedule"
msgstr "Skema"
-#: manager/templates/schedule/view.html:86
+#: manager/templates/schedule/view.html:85
msgid ""
"This schedule is a loop and will go through the workouts above till you "
"deactivate it"
@@ -2475,19 +2473,19 @@ msgstr ""
"Dette skema er en sløjfe og vil gå igennem træningerne ovenfor indtil du "
"deaktiverer det"
-#: manager/templates/schedule/view.html:104
+#: manager/templates/schedule/view.html:103
msgid "Weeks"
msgstr "Uger"
-#: manager/templates/schedule/view.html:116
+#: manager/templates/schedule/view.html:115
msgid "Move me"
msgstr "Flyt mig"
-#: manager/templates/schedule/view.html:157
+#: manager/templates/schedule/view.html:156
msgid "Start schedule"
msgstr "Start skema"
-#: manager/templates/schedule/view.html:188
+#: manager/templates/schedule/view.html:187
#, python-format
msgid ""
"%(weeks)s Week\n"
@@ -2502,11 +2500,11 @@ msgstr[1] ""
"%(weeks)s Uger\n"
" "
-#: manager/templates/schedule/view.html:222
+#: manager/templates/schedule/view.html:221
msgid "Adding workouts"
msgstr "Tilføj træninger"
-#: manager/templates/schedule/view.html:224
+#: manager/templates/schedule/view.html:223
msgid ""
"Add as many workouts to the schedule as you want. You can\n"
" edit the order by dragging and dropping them. It's also possible "
@@ -2518,21 +2516,21 @@ msgstr ""
"muligt at tilføje en træning mere\n"
" end en gang."
-#: manager/templates/schedule/view.html:233
-#: manager/templates/schedule/view.html:244
-#: manager/templates/schedule/view.html:291
-#: manager/templates/workout/view.html:71
-#: manager/templates/workout/view.html:81
-#: manager/templates/workout/view.html:180
+#: manager/templates/schedule/view.html:232
+#: manager/templates/schedule/view.html:243
+#: manager/templates/schedule/view.html:290
+#: manager/templates/workout/view.html:69
+#: manager/templates/workout/view.html:79
+#: manager/templates/workout/view.html:178
msgid "Export calendar file"
msgstr "Eksporter kalenderfil"
-#: manager/templates/schedule/view.html:237
+#: manager/templates/schedule/view.html:236
msgid "Export this schedule as a calendar file."
msgstr "Eksporter dette skema som kalenderfil."
-#: manager/templates/schedule/view.html:238
-#: manager/templates/workout/view.html:76
+#: manager/templates/schedule/view.html:237
+#: manager/templates/workout/view.html:74
msgid ""
"You can then import the file it into your calendar\n"
" application for example google calendar, outlook or "
@@ -2545,18 +2543,18 @@ msgstr ""
"Dette vil oprette\n"
" en aftale for hver træningsdag med øvelser."
-#: manager/templates/schedule/view.html:259
-#: manager/templates/schedule/view.html:295
-#: manager/templates/workout/view.html:96
-#: manager/templates/workout/view.html:176
+#: manager/templates/schedule/view.html:258
+#: manager/templates/schedule/view.html:294
+#: manager/templates/workout/view.html:94
+#: manager/templates/workout/view.html:174
msgid "Download as PDF"
msgstr "Hent som PDF"
-#: manager/templates/schedule/view.html:300
+#: manager/templates/schedule/view.html:299
msgid "Edit schedule"
msgstr "Rediger skema"
-#: manager/templates/schedule/view.html:305
+#: manager/templates/schedule/view.html:304
msgid "Delete schedule"
msgstr "Slet skema"
@@ -2682,12 +2680,12 @@ msgid "Mark as workout"
msgstr "Eksempel-træning"
#: manager/templates/workout/template_view.html:65
-#: manager/templates/workout/view.html:51
+#: manager/templates/workout/view.html:49
msgid "Muscles trained"
msgstr ""
#: manager/templates/workout/template_view.html:68
-#: manager/templates/workout/view.html:54
+#: manager/templates/workout/view.html:52
msgid ""
"Images show combined muscles as trained by the exercises on the workout."
msgstr ""
@@ -2696,35 +2694,35 @@ msgstr ""
msgid "Use this template"
msgstr ""
-#: manager/templates/workout/view.html:45
+#: manager/templates/workout/view.html:43
msgid "Add training days"
msgstr ""
-#: manager/templates/workout/view.html:46
+#: manager/templates/workout/view.html:44
msgid "Add workout sets to days"
msgstr ""
-#: manager/templates/workout/view.html:47
+#: manager/templates/workout/view.html:45
msgid "Set the repetitions for each set"
msgstr ""
-#: manager/templates/workout/view.html:75
+#: manager/templates/workout/view.html:73
msgid "Export this workout as a calendar file."
msgstr ""
-#: manager/templates/workout/view.html:146
+#: manager/templates/workout/view.html:144
msgid "Logs"
msgstr ""
-#: manager/templates/workout/view.html:148
+#: manager/templates/workout/view.html:146
msgid "View logs"
msgstr ""
-#: manager/templates/workout/view.html:171 manager/views/schedule_step.py:99
+#: manager/templates/workout/view.html:169 manager/views/schedule_step.py:99
msgid "Edit workout"
msgstr ""
-#: manager/templates/workout/view.html:184 manager/views/workout.py:281
+#: manager/templates/workout/view.html:182 manager/views/workout.py:281
msgid "Mark as template"
msgstr ""
@@ -2771,103 +2769,89 @@ msgstr ""
msgid "Value"
msgstr ""
-#: nutrition/forms.py:117
+#: nutrition/forms.py:118
msgid "Height (in)"
msgstr ""
-#: nutrition/forms.py:120
+#: nutrition/forms.py:121
msgid "Weight (kg)"
msgstr ""
-#: nutrition/forms.py:120
+#: nutrition/forms.py:121
msgid "Weight (lbs)"
msgstr ""
-#: nutrition/forms.py:133
+#: nutrition/forms.py:134
msgid "Calculate"
msgstr ""
-#: nutrition/forms.py:207 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:208 nutrition/templates/rate/form.html:76
msgid "Basic caloric intake"
msgstr ""
-#: nutrition/forms.py:208
+#: nutrition/forms.py:209
msgid "Your basic caloric intake as calculated for your data"
msgstr ""
-#: nutrition/forms.py:213
+#: nutrition/forms.py:214
msgid "Additional calories"
msgstr ""
-#: nutrition/forms.py:215
+#: nutrition/forms.py:216
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
msgstr ""
-#: nutrition/forms.py:248 nutrition/models/ingredient_weight_unit.py:39
-#: nutrition/models/log.py:84 nutrition/models/meal_item.py:53
+#: nutrition/forms.py:249 nutrition/models/ingredient_weight_unit.py:39
+#: nutrition/models/log.py:87 nutrition/models/meal_item.py:54
msgid "Ingredient"
msgstr ""
-#: nutrition/models/ingredient.py:131
+#: nutrition/models/ingredient.py:117
msgid "In kcal per 100g"
msgstr ""
-#: nutrition/models/ingredient.py:138 nutrition/models/ingredient.py:146
-#: nutrition/models/ingredient.py:156 nutrition/models/ingredient.py:164
-#: nutrition/models/ingredient.py:174 nutrition/models/ingredient.py:184
-#: nutrition/models/ingredient.py:194
+#: nutrition/models/ingredient.py:124 nutrition/models/ingredient.py:132
+#: nutrition/models/ingredient.py:142 nutrition/models/ingredient.py:150
+#: nutrition/models/ingredient.py:160 nutrition/models/ingredient.py:170
+#: nutrition/models/ingredient.py:180
msgid "In g per 100g of product"
msgstr ""
-#: nutrition/models/ingredient.py:155
-#: nutrition/templates/ingredient/view.html:96 nutrition/views/plan.py:259
+#: nutrition/models/ingredient.py:141
+#: nutrition/templates/ingredient/view.html:70 nutrition/views/plan.py:259
msgid "Sugar content in carbohydrates"
msgstr ""
-#: nutrition/models/ingredient.py:173
-#: nutrition/templates/ingredient/view.html:112 nutrition/views/plan.py:273
+#: nutrition/models/ingredient.py:159
+#: nutrition/templates/ingredient/view.html:86 nutrition/views/plan.py:273
msgid "Saturated fat content in fats"
msgstr ""
-#: nutrition/models/ingredient.py:183
-#: nutrition/templates/ingredient/view.html:134 nutrition/views/plan.py:279
-msgid "Fibres"
+#: nutrition/models/ingredient.py:169
+#: nutrition/templates/ingredient/view.html:108 nutrition/views/plan.py:279
+msgid "Fiber"
msgstr ""
-#: nutrition/models/ingredient.py:193
-#: nutrition/templates/ingredient/view.html:144 nutrition/views/plan.py:285
+#: nutrition/models/ingredient.py:179
+#: nutrition/templates/ingredient/view.html:118 nutrition/views/plan.py:285
msgid "Sodium"
msgstr ""
-#: nutrition/models/ingredient.py:215
+#: nutrition/models/ingredient.py:209
msgid "Link to product"
msgstr ""
-#: nutrition/models/ingredient.py:244
+#: nutrition/models/ingredient.py:238
msgid "Brand name of product"
msgstr ""
-#: nutrition/models/ingredient.py:304
+#: nutrition/models/ingredient.py:305
#, python-brace-format
msgid "The total energy ({self.energy}kcal) is not the approximate sum of the "
msgstr ""
-#: nutrition/models/ingredient.py:383 nutrition/views/ingredient.py:196
-msgid "Ingredient was successfully added to the general database"
-msgstr ""
-
-#: nutrition/models/ingredient.py:408
-msgid "New user submitted ingredient"
-msgstr ""
-
-#: nutrition/models/ingredient.py:410
-#, python-brace-format
-msgid ""
-"The user {request.user.username} submitted a new ingredient \"{self.name}\"."
-msgstr ""
-
#: nutrition/models/ingredient_category.py:31
msgid "Ingredient Categories"
msgstr ""
@@ -2880,16 +2864,16 @@ msgstr ""
msgid "Unit amount, e.g. \"1 Cup\" or \"1/2 spoon\""
msgstr ""
-#: nutrition/models/log.py:49 nutrition/models/meal.py:50
-#: nutrition/models/meal_item.py:47 nutrition/models/plan.py:106
+#: nutrition/models/log.py:52 nutrition/models/meal.py:50
+#: nutrition/models/meal_item.py:48 nutrition/models/plan.py:108
msgid "Nutrition plan"
msgstr "Ernæringsplan"
-#: nutrition/models/log.py:58
+#: nutrition/models/log.py:61
msgid "Meal"
msgstr ""
-#: nutrition/models/log.py:68
+#: nutrition/models/log.py:71
msgid "Date and Time (Approx.)"
msgstr ""
@@ -2909,11 +2893,11 @@ msgid ""
"summer\""
msgstr ""
-#: nutrition/models/plan.py:88
+#: nutrition/models/plan.py:90
msgid "Use daily calories"
msgstr ""
-#: nutrition/models/plan.py:91
+#: nutrition/models/plan.py:93
msgid ""
"Tick the box if you want to mark this plan as having a goal amount of "
"calories. You can use the calculator or enter the value yourself."
@@ -3020,64 +3004,36 @@ msgstr ""
msgid "Add ingredient"
msgstr ""
-#: nutrition/templates/ingredient/pending.html:14
-msgid "Submission date"
-msgstr ""
-
-#: nutrition/templates/ingredient/view.html:27
-msgid "Ingredient is pending review"
-msgstr ""
-
-#: nutrition/templates/ingredient/view.html:28
-msgid ""
-"This user submitted ingredient is pending a decision to be\n"
-"included in the database. Till then, it will not be shown in the overview "
-"or\n"
-"the search."
-msgstr ""
-
-#: nutrition/templates/ingredient/view.html:31
-msgid "Please select one of the options below."
-msgstr ""
-
-#: nutrition/templates/ingredient/view.html:38
-msgid "Accept"
-msgstr ""
-
-#: nutrition/templates/ingredient/view.html:42
-msgid "Decline"
-msgstr ""
-
-#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:229
+#: nutrition/templates/ingredient/view.html:45 nutrition/views/plan.py:229
msgid "Macronutrients"
msgstr ""
-#: nutrition/templates/ingredient/view.html:80
+#: nutrition/templates/ingredient/view.html:54
msgid "kJ"
msgstr ""
-#: nutrition/templates/ingredient/view.html:101
-#: nutrition/templates/ingredient/view.html:117
-#: nutrition/templates/ingredient/view.html:139
-#: nutrition/templates/ingredient/view.html:149
+#: nutrition/templates/ingredient/view.html:75
+#: nutrition/templates/ingredient/view.html:91
+#: nutrition/templates/ingredient/view.html:113
+#: nutrition/templates/ingredient/view.html:123
msgid "n.A."
msgstr ""
-#: nutrition/templates/ingredient/view.html:128
+#: nutrition/templates/ingredient/view.html:102
msgid "Others"
msgstr ""
-#: nutrition/templates/ingredient/view.html:170
+#: nutrition/templates/ingredient/view.html:144
#: nutrition/templates/units/list.html:46 nutrition/views/unit.py:86
msgid "Add new weight unit"
msgstr ""
-#: nutrition/templates/ingredient/view.html:232
-#: nutrition/templates/ingredient/view.html:235
+#: nutrition/templates/ingredient/view.html:206
+#: nutrition/templates/ingredient/view.html:209
msgid "Edit ingredient"
msgstr ""
-#: nutrition/templates/ingredient/view.html:239
+#: nutrition/templates/ingredient/view.html:213
msgid "Delete ingredient"
msgstr ""
@@ -3161,14 +3117,10 @@ msgstr ""
msgid "56 to 90"
msgstr ""
-#: nutrition/views/ingredient.py:154
+#: nutrition/views/ingredient.py:157
msgid "Add a new ingredient"
msgstr ""
-#: nutrition/views/ingredient.py:209
-msgid "Ingredient was successfully marked as rejected"
-msgstr ""
-
#: nutrition/views/plan.py:120
msgid "Nutritional plan"
msgstr ""
@@ -3213,50 +3165,59 @@ msgid ""
msgstr ""
#: software/templates/about_us.html:18
-msgid "Source code"
-msgstr ""
-
-#: software/templates/about_us.html:20
-msgid "Get the source code of this application and its server on github"
-msgstr ""
-
-#: software/templates/about_us.html:25
msgid "Have a problem or idea?"
msgstr ""
-#: software/templates/about_us.html:27
+#: software/templates/about_us.html:20
msgid ""
"Get in touch if something didn't behave as expected or if there is a feature "
"that you feel is missing."
msgstr ""
-#: software/templates/about_us.html:32
+#: software/templates/about_us.html:26
msgid "Say hi!"
msgstr ""
-#: software/templates/about_us.html:34
+#: software/templates/about_us.html:28
msgid "If you want to chat with us, hop on the Discord server and get in touch"
msgstr ""
-#: software/templates/about_us.html:39 software/templates/features.html:503
+#: software/templates/about_us.html:33
+msgid "Mastodon"
+msgstr ""
+
+#: software/templates/about_us.html:35
+msgid "Follow us on mastodon for updates and news about the project"
+msgstr ""
+
+#: software/templates/about_us.html:40 software/templates/features.html:503
msgid "Translation"
msgstr ""
-#: software/templates/about_us.html:41
+#: software/templates/about_us.html:42
msgid ""
"This application is translated on weblate. If you also want to help, click "
"the link and start translating"
msgstr ""
-#: software/templates/about_us.html:50
+#: software/templates/about_us.html:47
+msgid "Source code"
+msgstr ""
+
+#: software/templates/about_us.html:49
+msgid "Get the source code of this application and its server on github"
+msgstr ""
+
+#: software/templates/about_us.html:59
msgid "Our goal"
msgstr ""
-#: software/templates/about_us.html:53
+#: software/templates/about_us.html:62
msgid ""
"The goal is to build an awesome\n"
" and flexible fitness manager, along with a comprehensive and "
-"complete list of exercises and\n"
+"complete list of\n"
+" exercises and\n"
" ingredients, all released under a free license."
msgstr ""
@@ -3266,10 +3227,6 @@ msgid ""
"your exercises and workouts."
msgstr ""
-#: software/templates/features.html:45
-msgid "About"
-msgstr ""
-
#: software/templates/features.html:57
msgid "Mobile app"
msgstr ""
@@ -3509,18 +3466,6 @@ msgid ""
"to its own copyright."
msgstr ""
-#: utils/models.py:130
-msgid "Pending"
-msgstr ""
-
-#: utils/models.py:131
-msgid "Accepted"
-msgstr ""
-
-#: utils/models.py:132
-msgid "Declined"
-msgstr ""
-
#: weight/forms.py:54
msgid "Input"
msgstr ""
@@ -3533,7 +3478,7 @@ msgstr ""
msgid "You have to enter your weight"
msgstr ""
-#: weight/models.py:60
+#: weight/models.py:78
msgid "Weight entry"
msgstr ""
@@ -3650,6 +3595,9 @@ msgstr ""
msgid "Delete weight entry for the %s"
msgstr ""
+#~ msgid "Ingredients pending review"
+#~ msgstr "Ingredienser afventer gennemgang"
+
#~ msgid "Share"
#~ msgstr "Del"
diff --git a/wger/locale/de/LC_MESSAGES/django.po b/wger/locale/de/LC_MESSAGES/django.po
index 1f933d554..6ffa41292 100644
--- a/wger/locale/de/LC_MESSAGES/django.po
+++ b/wger/locale/de/LC_MESSAGES/django.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: wger Workout Manager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-02-02 12:42+0100\n"
+"POT-Creation-Date: 2024-07-14 15:49+0200\n"
"PO-Revision-Date: 2024-05-07 00:42+0000\n"
"Last-Translator: becothas <[email protected]>\n"
"Language-Team: German <https://hosted.weblate.org/projects/wger/web/de/>\n"
@@ -35,7 +35,7 @@ msgstr ""
"registrierten Benutzer diesem Studio zuweisen und alle Anwender ohne ein "
"Studio aktualisieren."
-#: config/views/gym_config.py:42 core/templates/language/view.html:63
+#: config/views/gym_config.py:42 core/templates/language/view.html:67
#: core/templates/license/list.html:17 core/templates/misc/license/list.html:18
#: core/templates/repetition_unit/list.html:18
#: core/templates/tags/render_day.html:39
@@ -55,8 +55,8 @@ msgstr ""
#: manager/templates/calendar/day.html:68
#: manager/templates/calendar/month.html:85
#: manager/templates/calendar/partial_overview_table.html:18
-#: manager/templates/schedule/view.html:119
-#: nutrition/templates/ingredient/view.html:191
+#: manager/templates/schedule/view.html:118
+#: nutrition/templates/ingredient/view.html:165
#: nutrition/templates/units/list.html:19
msgid "Edit"
msgstr "Bearbeiten"
@@ -90,8 +90,8 @@ msgstr "Mein cooler Zeitplan"
msgid "Empty placeholder schedule"
msgstr "Leerer Platzhalter Zeitplan"
-#: core/forms.py:69 core/templates/navigation.html:275
-#: core/templates/navigation.html:281 core/templates/user/login.html:4
+#: core/forms.py:69 core/templates/navigation.html:285
+#: core/templates/navigation.html:291 core/templates/user/login.html:4
#: software/templates/features.html:82 software/templates/features.html:427
msgid "Login"
msgstr "Anmelden"
@@ -165,7 +165,7 @@ msgstr "Passwort"
msgid "Please enter your current password."
msgstr "Bitte dein aktuelles Passwort eingeben."
-#: core/forms.py:242 core/templates/language/view.html:68
+#: core/forms.py:242 core/templates/language/view.html:73
#: core/templates/license/list.html:19 core/templates/misc/license/list.html:22
#: core/templates/repetition_unit/list.html:20
#: core/templates/tags/render_day.html:45
@@ -180,10 +180,10 @@ msgstr "Bitte dein aktuelles Passwort eingeben."
#: gym/templates/gym/list.html:22 manager/templates/calendar/day.html:73
#: manager/templates/calendar/month.html:89
#: manager/templates/calendar/partial_overview_table.html:23
-#: manager/templates/schedule/view.html:123
-#: manager/templates/workout/view.html:190
-#: nutrition/templates/ingredient/view.html:192
-#: nutrition/templates/ingredient/view.html:241
+#: manager/templates/schedule/view.html:122
+#: manager/templates/workout/view.html:188
+#: nutrition/templates/ingredient/view.html:166
+#: nutrition/templates/ingredient/view.html:215
#: nutrition/templates/units/list.html:22
msgid "Delete"
msgstr "Löschen"
@@ -196,14 +196,14 @@ msgstr "Ungültiges Passwort"
msgid "The form is secured with reCAPTCHA"
msgstr "Das Formular ist mit reCaptcha gesichert"
-#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:275
-#: core/templates/navigation.html:287 core/templates/template.html:147
+#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:285
+#: core/templates/navigation.html:297 core/templates/template.html:149
#: core/templates/user/login.html:20 core/views/user.py:298
#: software/templates/features.html:87 software/templates/features.html:422
msgid "Register"
msgstr "Registrieren"
-#: core/forms.py:315
+#: core/forms.py:315 software/templates/features.html:45
msgid "Contact"
msgstr "Kontakt"
@@ -212,7 +212,7 @@ msgid "Some way of answering you (e-mail, etc.)"
msgstr "Eine Möglichkeit, dich zu erreichen (E-Mail, usw.)"
#: core/forms.py:324 exercises/models/comment.py:58 manager/models/set.py:61
-#: manager/models/setting.py:111 nutrition/models/log.py:74
+#: manager/models/setting.py:114 nutrition/models/log.py:77
msgid "Comment"
msgstr "Kommentar"
@@ -232,6 +232,12 @@ msgstr "Name der Sprache - kurz"
msgid "Language full name"
msgstr "Name der Sprache - lang"
+#: core/models/language.py:45 core/templates/language/view.html:23
+#, fuzzy
+#| msgid "Language full name"
+msgid "Language full name in English"
+msgstr "Name der Sprache - lang"
+
#: core/models/license.py:29
msgid "Full name"
msgstr "Name"
@@ -248,7 +254,7 @@ msgstr ""
msgid "Short name, e.g. CC-BY-SA 3"
msgstr "Kürzel, z.B. CC-BY-SA 3"
-#: core/models/license.py:45 nutrition/models/ingredient.py:214
+#: core/models/license.py:45 nutrition/models/ingredient.py:208
msgid "Link"
msgstr "Verweis"
@@ -365,7 +371,7 @@ msgstr ""
msgid "Age"
msgstr "Alter"
-#: core/models/profile.py:230 nutrition/forms.py:117
+#: core/models/profile.py:230 nutrition/forms.py:118
msgid "Height (cm)"
msgstr "Größe (cm)"
@@ -416,7 +422,7 @@ msgid "Total caloric intake, including e.g. any surplus"
msgstr "Gesamt Kalorieneinnahme inkl. Überschuss"
#: core/models/profile.py:333 nutrition/models/ingredient_weight_unit.py:45
-#: nutrition/models/log.py:93 nutrition/models/meal_item.py:58
+#: nutrition/models/log.py:96 nutrition/models/meal_item.py:59
msgid "Weight unit"
msgstr "Gewichtseinheit"
@@ -450,17 +456,16 @@ msgstr "Die Summe aller Stunden muss 24 sein"
#: core/models/rep_unit.py:36 core/models/weight_unit.py:36
#: core/templates/user/overview.html:262 core/views/user.py:599
#: exercises/models/category.py:29 exercises/models/equipment.py:29
-#: exercises/models/exercise.py:58 exercises/models/muscle.py:36
+#: exercises/models/exercise.py:59 exercises/models/muscle.py:36
#: gym/models/contract.py:52 gym/models/contract.py:103 gym/models/gym.py:46
#: gym/models/user_document.py:84 gym/templates/contract/view.html:50
#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:96
#: gym/views/gym.py:158 manager/models/schedule.py:55
#: manager/models/workout.py:57 measurements/models/category.py:36
-#: nutrition/models/ingredient.py:125
+#: nutrition/models/ingredient.py:111
#: nutrition/models/ingredient_category.py:27 nutrition/models/meal.py:67
#: nutrition/models/weight_unit.py:38
-#: nutrition/templates/ingredient/pending.html:15
-#: nutrition/templates/ingredient/view.html:178
+#: nutrition/templates/ingredient/view.html:152
msgid "Name"
msgstr "Name"
@@ -566,24 +571,24 @@ msgstr ""
msgid "Dashboard"
msgstr "Übersicht"
-#: core/templates/language/overview.html:4 core/templates/navigation.html:335
+#: core/templates/language/overview.html:4 core/templates/navigation.html:345
msgid "Languages"
msgstr "Sprachen"
-#: core/templates/language/overview.html:20
+#: core/templates/language/overview.html:22
msgid "Nothing found."
msgstr "Nichts gefunden."
-#: core/templates/language/overview.html:20
+#: core/templates/language/overview.html:22
#: manager/templates/calendar/month.html:132
#: manager/templates/schedule/overview.html:28
-#: manager/templates/schedule/view.html:145
+#: manager/templates/schedule/view.html:144
#: manager/templates/workout/overview.html:28
#: nutrition/templates/ingredient/overview.html:38
msgid "Add one now."
msgstr "Jetzt hinzufügen."
-#: core/templates/language/overview.html:33 core/templates/license/list.html:40
+#: core/templates/language/overview.html:35 core/templates/license/list.html:40
#: core/templates/misc/license/list.html:43
#: core/templates/repetition_unit/list.html:43
#: core/templates/user/overview.html:326 core/templates/user/overview.html:365
@@ -603,13 +608,13 @@ msgstr "Jetzt hinzufügen."
msgid "Add"
msgstr "Hinzufügen"
-#: core/templates/language/view.html:58 core/templates/user/api_key.html:44
+#: core/templates/language/view.html:61 core/templates/user/api_key.html:44
#: core/templates/user/preferences.html:45 gym/models/contract.py:203
#: gym/templates/contract/view.html:41 gym/templates/contract/view.html:106
#: gym/templates/gym/member_list.html:248
-#: manager/templates/schedule/view.html:286
-#: manager/templates/workout/view.html:165
-#: nutrition/templates/ingredient/view.html:228
+#: manager/templates/schedule/view.html:285
+#: manager/templates/workout/view.html:163
+#: nutrition/templates/ingredient/view.html:202
msgid "Options"
msgstr "Optionen"
@@ -634,12 +639,11 @@ msgstr "Lizenzliste"
#: gym/templates/gym/member_list.html:299
#: mailer/templates/mailer/gym/overview.html:30
#: manager/templates/calendar/day.html:87
-#: nutrition/templates/ingredient/pending.html:30
#: nutrition/templates/units/list.html:29
msgid "Nothing found"
msgstr "Nichts gefunden"
-#: core/templates/misc/about.html:4 core/templates/template.html:173
+#: core/templates/misc/about.html:4 core/templates/template.html:175
msgid "Imprint"
msgstr "Impressum"
@@ -652,174 +656,169 @@ msgstr ""
"Wenn eine Lizenz lokalisiert wurde wie z.B. die Creative Commons Lizenzen\n"
"für die verschiedenen Länder, füge sie einzeln hinzu."
-#: core/templates/navigation.html:27 software/templates/features.html:437
+#: core/templates/navigation.html:28 software/templates/features.html:437
msgid "Training"
msgstr "Training"
-#: core/templates/navigation.html:34 core/templates/user/overview.html:25
+#: core/templates/navigation.html:37 core/templates/user/overview.html:25
msgid "Workouts"
msgstr "Trainingspläne"
-#: core/templates/navigation.html:42
+#: core/templates/navigation.html:46
msgid "Workouts schedules"
msgstr "Trainingszeitpläne"
-#: core/templates/navigation.html:50 core/templates/user/overview.html:70
+#: core/templates/navigation.html:54 core/templates/user/overview.html:70
#: manager/templates/calendar/month.html:10
#: manager/templates/calendar/month.html:21
msgid "Calendar"
msgstr "Kalender"
-#: core/templates/navigation.html:60
+#: core/templates/navigation.html:64
msgid "Measurements"
msgstr "Messungen"
-#: core/templates/navigation.html:70 gallery/templates/images/overview.html:6
+#: core/templates/navigation.html:75 gallery/templates/images/overview.html:6
msgid "Gallery"
msgstr "Galerie"
-#: core/templates/navigation.html:76
+#: core/templates/navigation.html:81
msgid "Workout templates"
msgstr "Trainingsvorlagen"
-#: core/templates/navigation.html:82 manager/views/workout.py:84
+#: core/templates/navigation.html:88 manager/views/workout.py:84
msgid "Your templates"
msgstr "Ihre Vorlagen"
-#: core/templates/navigation.html:90 manager/views/workout.py:98
+#: core/templates/navigation.html:97 manager/views/workout.py:98
msgid "Public templates"
msgstr "Öffentliche Vorlagen"
-#: core/templates/navigation.html:97 manager/forms.py:129
-#: manager/models/setting.py:54 software/templates/features.html:51
+#: core/templates/navigation.html:105 manager/forms.py:129
+#: manager/models/setting.py:57 software/templates/features.html:51
#: software/templates/features.html:459
msgid "Exercises"
msgstr "Übungen"
-#: core/templates/navigation.html:103 core/templates/navigation.html:170
-#: core/templates/navigation.html:330
+#: core/templates/navigation.html:111 core/templates/navigation.html:184
+#: core/templates/navigation.html:340
msgid "Administration"
msgstr "Administration"
-#: core/templates/navigation.html:106
+#: core/templates/navigation.html:115
msgid "Exercise edit history"
msgstr "Übungen - Bearbeitungshistorie"
-#: core/templates/navigation.html:111 exercises/models/base.py:103
+#: core/templates/navigation.html:121 exercises/models/base.py:103
msgid "Equipment"
msgstr "Gerät"
-#: core/templates/navigation.html:116
+#: core/templates/navigation.html:127
msgid "Muscles"
msgstr "Muskeln"
-#: core/templates/navigation.html:121
+#: core/templates/navigation.html:133
#: exercises/templates/categories/admin-overview.html:4
msgid "Categories"
msgstr "Kategorien"
-#: core/templates/navigation.html:136 software/templates/features.html:447
+#: core/templates/navigation.html:148 software/templates/features.html:447
msgid "Nutrition"
msgstr "Ernährung"
-#: core/templates/navigation.html:143 core/templates/user/overview.html:144
+#: core/templates/navigation.html:156 core/templates/user/overview.html:144
msgid "Nutrition plans"
msgstr "Ernährungspläne"
-#: core/templates/navigation.html:151 nutrition/templates/bmi/form.html:50
+#: core/templates/navigation.html:165 nutrition/templates/bmi/form.html:50
msgid "BMI calculator"
msgstr "BMI-Rechner"
-#: core/templates/navigation.html:159 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:174 nutrition/templates/rate/form.html:17
msgid "Daily calories calculator"
msgstr "Kalorienrechner"
-#: core/templates/navigation.html:165
+#: core/templates/navigation.html:179
#: nutrition/templates/ingredient/overview.html:10
msgid "Ingredient overview"
msgstr "Zutatenübersicht"
-#: core/templates/navigation.html:172 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:187 nutrition/templates/units/list.html:6
msgid "Ingredient weight units"
msgstr "Gewichtseinheiten für Zutaten"
-#: core/templates/navigation.html:177
-#: nutrition/templates/ingredient/pending.html:6
-msgid "Ingredients pending review"
-msgstr "Zutaten ohne Freigabe"
-
-#: core/templates/navigation.html:193 software/templates/features.html:442
+#: core/templates/navigation.html:203 software/templates/features.html:442
msgid "Body weight"
msgstr "Körpergewicht"
-#: core/templates/navigation.html:200 core/templates/user/overview.html:114
+#: core/templates/navigation.html:210 core/templates/user/overview.html:114
msgid "Weight overview"
msgstr "Gewichtsübersicht"
-#: core/templates/navigation.html:207 weight/views.py:65
+#: core/templates/navigation.html:217 weight/views.py:65
msgid "Add weight entry"
msgstr "Gewichtseintrag hinzufügen"
-#: core/templates/navigation.html:221
+#: core/templates/navigation.html:231
msgid "About this software"
msgstr "Über diese Software"
-#: core/templates/navigation.html:227 software/templates/about_us.html:5
+#: core/templates/navigation.html:237 software/templates/about_us.html:5
msgid "About us"
msgstr "Über uns"
-#: core/templates/navigation.html:233 software/templates/features.html:507
+#: core/templates/navigation.html:243 software/templates/features.html:507
msgid "REST API"
msgstr "REST API"
-#: core/templates/navigation.html:239 utils/models.py:45
+#: core/templates/navigation.html:249 utils/models.py:45
msgid "License"
msgstr "Lizenz"
-#: core/templates/navigation.html:245
+#: core/templates/navigation.html:255
msgid "Developer documentation"
msgstr "Entwickler-Dokumentation"
-#: core/templates/navigation.html:252
+#: core/templates/navigation.html:262
msgid "Get the code"
msgstr "Quellcode"
-#: core/templates/navigation.html:259 core/templates/template.html:212
+#: core/templates/navigation.html:269 core/templates/template.html:214
#: software/templates/features.html:582
msgid "Translate"
msgstr "Übersetze"
-#: core/templates/navigation.html:293 core/templates/user/login.html:28
+#: core/templates/navigation.html:303 core/templates/user/login.html:28
msgid "Reset password"
msgstr "Passwort zurücketzen"
-#: core/templates/navigation.html:311
+#: core/templates/navigation.html:321
msgid "My preferences"
msgstr "Meine Einstellungen"
-#: core/templates/navigation.html:320
+#: core/templates/navigation.html:330
msgid "Logout"
msgstr "Abmelden"
-#: core/templates/navigation.html:343
+#: core/templates/navigation.html:353
msgid "Licenses"
msgstr "Lizenzen"
-#: core/templates/navigation.html:351
+#: core/templates/navigation.html:361
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr "Wiederholungs-Einheiten"
-#: core/templates/navigation.html:359 core/templates/weight_unit/list.html:4
-#: nutrition/templates/ingredient/view.html:167
+#: core/templates/navigation.html:369 core/templates/weight_unit/list.html:4
+#: nutrition/templates/ingredient/view.html:141
msgid "Weight units"
msgstr "Gewichtseinheiten"
-#: core/templates/navigation.html:367 core/templates/user/list.html:4
+#: core/templates/navigation.html:377 core/templates/user/list.html:4
msgid "User list"
msgstr "Benutzerliste"
-#: core/templates/navigation.html:373
+#: core/templates/navigation.html:383
msgid "Gyms"
msgstr "Studios"
@@ -873,12 +872,12 @@ msgstr "Vielen Dank, dass du unsere Website benutzt!"
msgid "The %(site_name)s team"
msgstr "Das Team von %(site_name)s"
-#: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:11
+#: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:12
msgid "previous"
msgstr "zurück"
-#: core/templates/tags/pagination.html:31
-#: core/templates/tags/pagination.html:35
+#: core/templates/tags/pagination.html:33
+#: core/templates/tags/pagination.html:38
msgid "next"
msgstr "vor"
@@ -903,36 +902,36 @@ msgid "Add exercises to this workout day"
msgstr "Übungen zu diesem Trainingstag hinzufügen"
#: core/templates/tags/render_weight_log.html:17 manager/helpers.py:86
-#: manager/models/setting.py:69 manager/templates/set/formset.html:9
+#: manager/models/setting.py:72 manager/templates/set/formset.html:9
msgid "Reps"
msgstr "Wdh."
#: core/templates/tags/render_weight_log.html:30 manager/forms.py:191
-#: manager/models/log.py:103 manager/models/setting.py:99
+#: manager/models/log.py:103 manager/models/setting.py:102
#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
msgid "RiR"
msgstr "RiR"
-#: core/templates/template.html:120 manager/templates/calendar/month.html:138
-#: manager/templates/schedule/view.html:249
-#: manager/templates/schedule/view.html:270
-#: manager/templates/workout/view.html:86
-#: manager/templates/workout/view.html:139
+#: core/templates/template.html:122 manager/templates/calendar/month.html:138
+#: manager/templates/schedule/view.html:248
+#: manager/templates/schedule/view.html:269
+#: manager/templates/workout/view.html:84
+#: manager/templates/workout/view.html:137
msgid "Close"
msgstr "Schließen"
-#: core/templates/template.html:136
+#: core/templates/template.html:138
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:141
+#: core/templates/template.html:143
msgid "Create some demo entries"
msgstr "Beispieldaten erstellen"
-#: core/templates/template.html:178 software/templates/features.html:547
+#: core/templates/template.html:180 software/templates/features.html:547
#: software/templates/tos.html:7
msgid "Terms of service"
msgstr "Allgemeine Nutzungsbedingungen"
@@ -1035,7 +1034,7 @@ msgid "Overview"
msgstr "Übersicht"
#: core/templates/user/overview.html:28
-#: manager/templates/schedule/view.html:164
+#: manager/templates/schedule/view.html:163
#: manager/templates/workout/overview.html:39 manager/views/schedule_step.py:60
msgid "Add workout"
msgstr "Trainingsplan hinzufügen"
@@ -1043,20 +1042,20 @@ msgstr "Trainingsplan hinzufügen"
#: core/templates/user/overview.html:34 core/templates/user/overview.html:76
#: core/templates/user/overview.html:120 core/templates/user/overview.html:152
#: exercises/models/base.py:118 exercises/models/base.py:124
-#: exercises/models/exercise.py:63 exercises/models/exercise.py:69
+#: exercises/models/exercise.py:64 exercises/models/exercise.py:70
#: exercises/models/image.py:107 exercises/models/image.py:113
#: exercises/models/video.py:163 exercises/models/video.py:169
#: gallery/models/image.py:42 manager/helpers.py:85 manager/models/log.py:100
#: manager/models/session.py:67 measurements/models/measurement.py:47
-#: nutrition/models/ingredient.py:101 nutrition/models/ingredient.py:107
-#: nutrition/models/ingredient.py:222 weight/models.py:33
+#: nutrition/models/ingredient.py:87 nutrition/models/ingredient.py:93
+#: nutrition/models/ingredient.py:216 weight/models.py:51
#: weight/templates/import_csv_preview.html:13
#: weight/templates/import_csv_preview.html:42 weight/views.py:144
msgid "Date"
msgstr "Datum"
#: core/templates/user/overview.html:35 core/templates/user/overview.html:153
-#: exercises/models/exercise.py:51 gallery/models/image.py:65
+#: exercises/models/exercise.py:52 gallery/models/image.py:65
#: gym/models/contract.py:58 gym/models/contract.py:109
#: manager/models/day.py:37 manager/models/workout.py:63
#: measurements/models/measurement.py:62 nutrition/models/plan.py:67
@@ -1074,13 +1073,13 @@ msgstr "Letzte Aktivität"
#: core/templates/user/overview.html:58
#: manager/templates/calendar/month.html:128
-#: manager/templates/schedule/view.html:145
+#: manager/templates/schedule/view.html:144
#: manager/templates/workout/overview.html:28
msgid "No workouts found."
msgstr "Keine Trainingspläne gefunden."
#: core/templates/user/overview.html:68 manager/forms.py:280
-#: manager/templates/workout/view.html:108
+#: manager/templates/workout/view.html:106
msgid "Log"
msgstr "Tagebucheintrag"
@@ -1104,35 +1103,35 @@ msgstr "Zeit"
#: core/templates/user/overview.html:112 core/templates/user/overview.html:121
#: manager/forms.py:186 manager/helpers.py:86 manager/models/log.py:86
-#: manager/models/setting.py:79 manager/templates/log/add.html:54
-#: manager/templates/set/formset.html:11 weight/models.py:35
+#: manager/models/setting.py:82 manager/templates/log/add.html:54
+#: manager/templates/set/formset.html:11 weight/models.py:53
#: weight/templates/import_csv_preview.html:14
#: weight/templates/import_csv_preview.html:43 weight/views.py:144
msgid "Weight"
msgstr "Gewicht"
-#: core/templates/user/overview.html:154 nutrition/models/ingredient.py:130
-#: nutrition/templates/ingredient/view.html:77 nutrition/views/plan.py:237
+#: core/templates/user/overview.html:154 nutrition/models/ingredient.py:116
+#: nutrition/templates/ingredient/view.html:51 nutrition/views/plan.py:237
msgid "Energy"
msgstr "Energie"
-#: core/templates/user/overview.html:155 nutrition/models/ingredient.py:137
-#: nutrition/templates/ingredient/view.html:84 nutrition/views/plan.py:243
+#: core/templates/user/overview.html:155 nutrition/models/ingredient.py:123
+#: nutrition/templates/ingredient/view.html:58 nutrition/views/plan.py:243
msgid "Protein"
msgstr "Eiweiß"
-#: core/templates/user/overview.html:156 nutrition/models/ingredient.py:145
-#: nutrition/templates/ingredient/view.html:90 nutrition/views/plan.py:251
+#: core/templates/user/overview.html:156 nutrition/models/ingredient.py:131
+#: nutrition/templates/ingredient/view.html:64 nutrition/views/plan.py:251
msgid "Carbohydrates"
msgstr "Kohlenhydrate"
-#: core/templates/user/overview.html:157 nutrition/models/ingredient.py:163
-#: nutrition/templates/ingredient/view.html:106 nutrition/views/plan.py:265
+#: core/templates/user/overview.html:157 nutrition/models/ingredient.py:149
+#: nutrition/templates/ingredient/view.html:80 nutrition/views/plan.py:265
msgid "Fat"
msgstr "Fett"
#: core/templates/user/overview.html:170
-#: nutrition/templates/ingredient/view.html:79
+#: nutrition/templates/ingredient/view.html:53
msgid "kcal"
msgstr "kcal"
@@ -1144,7 +1143,7 @@ msgstr "kcal"
#: gym/templates/gym/member_list.html:207
#: gym/templates/gym/member_list.html:240
#: gym/templates/gym/member_list.html:277
-#: manager/templates/schedule/view.html:101
+#: manager/templates/schedule/view.html:100
msgid "Actions"
msgstr "Aktionen"
@@ -1187,7 +1186,7 @@ msgid "Details"
msgstr "Details"
#: core/templates/user/overview.html:258 gym/views/export.py:57
-#: manager/helpers.py:86 manager/templates/schedule/view.html:99
+#: manager/helpers.py:86 manager/templates/schedule/view.html:98
msgid "Nr."
msgstr "Nr."
@@ -1232,7 +1231,7 @@ msgid "Documents"
msgstr "Dokumente"
#: core/templates/user/overview.html:412 gym/templates/document/list.html:32
-#: manager/forms.py:292 manager/templates/workout/view.html:134
+#: manager/forms.py:292 manager/templates/workout/view.html:132
msgid "Download"
msgstr "Runterladen"
@@ -1283,13 +1282,13 @@ msgid "kg"
msgstr "kg"
#: core/templatetags/wger_extras.py:207
-#: nutrition/templates/ingredient/view.html:86
-#: nutrition/templates/ingredient/view.html:92
-#: nutrition/templates/ingredient/view.html:99
-#: nutrition/templates/ingredient/view.html:108
-#: nutrition/templates/ingredient/view.html:115
-#: nutrition/templates/ingredient/view.html:137
-#: nutrition/templates/ingredient/view.html:147
+#: nutrition/templates/ingredient/view.html:60
+#: nutrition/templates/ingredient/view.html:66
+#: nutrition/templates/ingredient/view.html:73
+#: nutrition/templates/ingredient/view.html:82
+#: nutrition/templates/ingredient/view.html:89
+#: nutrition/templates/ingredient/view.html:111
+#: nutrition/templates/ingredient/view.html:121
msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr "g"
@@ -1307,7 +1306,7 @@ msgstr "oz"
#: exercises/views/equipment.py:103 exercises/views/exercises.py:73
#: exercises/views/muscles.py:99 manager/views/schedule.py:309
#: manager/views/schedule_step.py:128 manager/views/workout.py:249
-#: manager/views/workout_session.py:142 nutrition/views/ingredient.py:116
+#: manager/views/workout_session.py:142 nutrition/views/ingredient.py:119
#: nutrition/views/unit.py:110
msgid "Successfully deleted"
msgstr "Erfolgreich gelöscht"
@@ -1319,7 +1318,7 @@ msgstr "Erfolgreich gelöscht"
#: gym/views/admin_notes.py:196 gym/views/document.py:206 gym/views/gym.py:481
#: manager/views/schedule.py:316 manager/views/schedule_step.py:138
#: manager/views/workout.py:253 manager/views/workout_session.py:156
-#: nutrition/views/ingredient.py:123 nutrition/views/unit.py:117
+#: nutrition/views/ingredient.py:126 nutrition/views/unit.py:117
#, python-brace-format
msgid "Delete {0}?"
msgstr "{0} löschen?"
@@ -1332,7 +1331,7 @@ msgstr "{0} löschen?"
#: gym/views/contract.py:186 gym/views/contract_option.py:123
#: gym/views/contract_type.py:123 gym/views/document.py:171
#: gym/views/gym.py:463 manager/views/day.py:100 manager/views/schedule.py:333
-#: manager/views/workout.py:267 nutrition/views/ingredient.py:142
+#: manager/views/workout.py:267 nutrition/views/ingredient.py:145
#: nutrition/views/unit.py:143
#, python-brace-format
msgid "Edit {0}"
@@ -1407,7 +1406,7 @@ msgstr "Studio"
msgid "A verification email was sent to %(email)s"
msgstr "Eine Bestätigungs-E-Mail wurde an %(email)s gesendet"
-#: exercises/models/base.py:82 nutrition/models/ingredient.py:236
+#: exercises/models/base.py:82 nutrition/models/ingredient.py:230
msgid "Category"
msgstr "Kategorie"
@@ -1427,7 +1426,7 @@ msgstr "Variationen"
msgid "Exercise Categories"
msgstr "Kategorie Übung"
-#: exercises/models/comment.py:52 exercises/models/exercise_alias.py:52
+#: exercises/models/comment.py:52 exercises/models/exercise_alias.py:53
#: exercises/models/image.py:74 exercises/models/video.py:98
#: manager/forms.py:178 manager/helpers.py:86 manager/models/log.py:52
msgid "Exercise"
@@ -1437,12 +1436,12 @@ msgstr "Übung"
msgid "A comment about how to correctly do this exercise."
msgstr "Ein Kommentar über die korrekte Durchführung der Übung."
-#: exercises/models/exercise.py:76 nutrition/models/ingredient.py:95
+#: exercises/models/exercise.py:77 nutrition/models/ingredient.py:81
#: nutrition/models/weight_unit.py:32
msgid "Language"
msgstr "Sprache"
-#: exercises/models/exercise_alias.py:58
+#: exercises/models/exercise_alias.py:59
msgid "Alias for an exercise"
msgstr "Alternativer Name für eine Übung"
@@ -1576,7 +1575,7 @@ msgstr "Aktionen"
#: manager/models/schedule.py:44 manager/models/session.py:49
#: manager/models/workout.py:89 measurements/models/category.py:31
#: measurements/models/measurement.py:42 nutrition/models/plan.py:54
-#: nutrition/templates/ingredient/pending.html:16 weight/models.py:42
+#: weight/models.py:60
msgid "User"
msgstr "Benutzer"
@@ -1698,9 +1697,9 @@ msgid "Contract type"
msgstr "Vertragstyp"
#: gym/models/contract.py:211 gym/templates/contract/view.html:59
-#: manager/templates/log/add.html:52 nutrition/forms.py:62
-#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:105
-#: nutrition/models/meal_item.py:72
+#: manager/templates/log/add.html:52 nutrition/forms.py:63
+#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:108
+#: nutrition/models/meal_item.py:73
msgid "Amount"
msgstr "Menge"
@@ -1717,7 +1716,7 @@ msgid "Contract is active"
msgstr "Vertrag ist aktiv"
#: gym/models/contract.py:237 gym/templates/contract/view.html:69
-#: manager/models/schedule.py:61 manager/templates/schedule/view.html:68
+#: manager/models/schedule.py:61 manager/templates/schedule/view.html:67
msgid "Start date"
msgstr "Startdatum"
@@ -2108,7 +2107,7 @@ msgstr "Vorschau generieren"
#: mailer/templates/mailer/gym/form.html:28
#: mailer/templates/mailer/gym/preview.html:62
-#: manager/templates/workout/view.html:42
+#: manager/templates/workout/view.html:40
msgid "Steps"
msgstr "Schritte"
@@ -2132,7 +2131,7 @@ msgstr ""
"verschickt werden"
#: mailer/templates/mailer/gym/preview.html:22
-#: software/templates/about_us.html:60
+#: software/templates/about_us.html:70
msgid "Current version"
msgstr "Aktuelle Version"
@@ -2165,16 +2164,16 @@ msgstr ""
"Du kannst mehr als eine Übung auswählen/suchen, sie werden dann z.B. für "
"einen Supersatz gruppiert."
-#: manager/forms.py:140 nutrition/forms.py:252
+#: manager/forms.py:140 nutrition/forms.py:253
msgid "Also search for names in English"
msgstr "Auch Zutaten auf Englisch suchen"
#: manager/forms.py:168 manager/forms.py:173 manager/models/log.py:64
-#: manager/models/log.py:92 manager/models/setting.py:59
-#: manager/models/setting.py:90 manager/templates/log/add.html:53
+#: manager/models/log.py:92 manager/models/setting.py:62
+#: manager/models/setting.py:93 manager/templates/log/add.html:53
#: manager/templates/log/add.html:55 manager/templates/set/formset.html:10
#: manager/templates/set/formset.html:12 measurements/models/category.py:41
-#: nutrition/forms.py:66
+#: nutrition/forms.py:67
msgid "Unit"
msgstr "Einheit"
@@ -2182,15 +2181,15 @@ msgstr "Einheit"
msgid "Type"
msgstr "Typ"
-#: manager/forms.py:280 manager/templates/workout/view.html:115
+#: manager/forms.py:280 manager/templates/workout/view.html:113
msgid "Table"
msgstr "Tabelle"
-#: manager/forms.py:282 manager/templates/workout/view.html:121
+#: manager/forms.py:282 manager/templates/workout/view.html:119
msgid "with images"
msgstr "mit Bilder"
-#: manager/forms.py:283 manager/templates/workout/view.html:127
+#: manager/forms.py:283 manager/templates/workout/view.html:125
msgid "with comments"
msgstr "mit Kommentare"
@@ -2199,11 +2198,10 @@ msgid "Workout will expire soon"
msgstr "Trainingsplan wird bald auslaufen"
#: manager/models/day.py:34 manager/models/log.py:58
-#: manager/models/session.py:60 manager/templates/schedule/view.html:103
-#: manager/templates/workout/view.html:11
-#: manager/templates/workout/view.html:19 manager/views/pdf.py:85
-#: manager/views/pdf.py:161 manager/views/schedule.py:151
-#: manager/views/schedule.py:221
+#: manager/models/session.py:60 manager/templates/schedule/view.html:102
+#: manager/templates/workout/view.html:9 manager/templates/workout/view.html:17
+#: manager/views/pdf.py:85 manager/views/pdf.py:161
+#: manager/views/schedule.py:151 manager/views/schedule.py:221
msgid "Workout"
msgstr "Trainingsplan"
@@ -2224,7 +2222,7 @@ msgid "Name or short description of the schedule. For example 'Program XYZ'."
msgstr ""
"Name oder kurze Beschreibung des Zeitplans. Zum Beispiel 'Programm XYZ'."
-#: manager/models/schedule.py:65 manager/templates/schedule/view.html:72
+#: manager/models/schedule.py:65 manager/templates/schedule/view.html:71
msgid "Schedule active"
msgstr "Zeitplan aktiv"
@@ -2238,7 +2236,7 @@ msgstr ""
"dann z.B. auf der Statseite angezeigt). Alle andere Zeitpläne werden dann "
"deaktiviert"
-#: manager/models/schedule.py:77 manager/templates/schedule/view.html:82
+#: manager/models/schedule.py:77 manager/templates/schedule/view.html:81
msgid "Is a loop"
msgstr "Ist eine Schleife"
@@ -2259,8 +2257,8 @@ msgid "The duration in weeks"
msgstr "Die Dauer in Wochen"
#: manager/models/schedule_step.py:64 manager/models/set.py:53
-#: manager/models/setting.py:110 nutrition/models/meal.py:55
-#: nutrition/models/meal_item.py:65
+#: manager/models/setting.py:113 nutrition/models/meal.py:55
+#: nutrition/models/meal_item.py:66
msgid "Order"
msgstr "Reihenfolge"
@@ -2313,7 +2311,7 @@ msgstr "Übungstag"
msgid "Number of sets"
msgstr "Anzahl der Sätze"
-#: manager/models/setting.py:48
+#: manager/models/setting.py:51
msgid "Sets"
msgstr "Sätze"
@@ -2390,7 +2388,7 @@ msgstr ""
msgid "Go to current month"
msgstr "Zum aktuellen Monat gehen"
-#: manager/templates/calendar/month.html:188
+#: manager/templates/calendar/month.html:190
msgid "Add new log"
msgstr "Neuen Tagebucheintrag hinzufügen"
@@ -2430,8 +2428,8 @@ msgid "Your schedules"
msgstr "Deine Zeitpläne"
#: manager/templates/schedule/overview.html:19
-#: manager/templates/schedule/view.html:132
-#: manager/templates/schedule/view.html:184
+#: manager/templates/schedule/view.html:131
+#: manager/templates/schedule/view.html:183
#: manager/templates/workout/overview.html:16
msgid "active"
msgstr "Aktiv"
@@ -2486,11 +2484,11 @@ msgstr ""
msgid "Add schedule"
msgstr "Zeitplan hinzufügen"
-#: manager/templates/schedule/view.html:10
+#: manager/templates/schedule/view.html:9
msgid "Schedule"
msgstr "Zeitplan"
-#: manager/templates/schedule/view.html:86
+#: manager/templates/schedule/view.html:85
msgid ""
"This schedule is a loop and will go through the workouts above till you "
"deactivate it"
@@ -2498,19 +2496,19 @@ msgstr ""
"Dieser Zeitplan ist eine Schleife und wird durch die Trainingspläne gehen\n"
"bist du ihn deaktivierst"
-#: manager/templates/schedule/view.html:104
+#: manager/templates/schedule/view.html:103
msgid "Weeks"
msgstr "Wochen"
-#: manager/templates/schedule/view.html:116
+#: manager/templates/schedule/view.html:115
msgid "Move me"
msgstr "Bewege mich"
-#: manager/templates/schedule/view.html:157
+#: manager/templates/schedule/view.html:156
msgid "Start schedule"
msgstr "Zeitplan starten"
-#: manager/templates/schedule/view.html:188
+#: manager/templates/schedule/view.html:187
#, fuzzy, python-format
#| msgid ""
#| "%(weeks)s Week\n"
@@ -2531,11 +2529,11 @@ msgstr[1] ""
"%(weeks)s Wochen\n"
" "
-#: manager/templates/schedule/view.html:222
+#: manager/templates/schedule/view.html:221
msgid "Adding workouts"
msgstr "Trainingspläne hinzufügen"
-#: manager/templates/schedule/view.html:224
+#: manager/templates/schedule/view.html:223
#, fuzzy
#| msgid ""
#| "Add as many workouts to the schedule as you want. You can\n"
@@ -2552,21 +2550,21 @@ msgstr ""
"per Ziehen anpassen. Es ist außerdem möglich, ein Traininsplan\n"
"mehr als einmal hinzuzufügen."
-#: manager/templates/schedule/view.html:233
-#: manager/templates/schedule/view.html:244
-#: manager/templates/schedule/view.html:291
-#: manager/templates/workout/view.html:71
-#: manager/templates/workout/view.html:81
-#: manager/templates/workout/view.html:180
+#: manager/templates/schedule/view.html:232
+#: manager/templates/schedule/view.html:243
+#: manager/templates/schedule/view.html:290
+#: manager/templates/workout/view.html:69
+#: manager/templates/workout/view.html:79
+#: manager/templates/workout/view.html:178
msgid "Export calendar file"
msgstr "Kalender exportieren"
-#: manager/templates/schedule/view.html:237
+#: manager/templates/schedule/view.html:236
msgid "Export this schedule as a calendar file."
msgstr "Diesen Zeitplan als Kalenderdatei exportieren."
-#: manager/templates/schedule/view.html:238
-#: manager/templates/workout/view.html:76
+#: manager/templates/schedule/view.html:237
+#: manager/templates/workout/view.html:74
#, fuzzy
#| msgid ""
#| "You can then import the file it into your calendar\n"
@@ -2585,18 +2583,18 @@ msgstr ""
"Trainingstag generieren, mit den entsprechenden Übungen als\n"
"Terminbeschreibung."
-#: manager/templates/schedule/view.html:259
-#: manager/templates/schedule/view.html:295
-#: manager/templates/workout/view.html:96
-#: manager/templates/workout/view.html:176
+#: manager/templates/schedule/view.html:258
+#: manager/templates/schedule/view.html:294
+#: manager/templates/workout/view.html:94
+#: manager/templates/workout/view.html:174
msgid "Download as PDF"
msgstr "Als PDF runterladen"
-#: manager/templates/schedule/view.html:300
+#: manager/templates/schedule/view.html:299
msgid "Edit schedule"
msgstr "Zeitplan bearbeiten"
-#: manager/templates/schedule/view.html:305
+#: manager/templates/schedule/view.html:304
msgid "Delete schedule"
msgstr "Zeitplan löschen"
@@ -2743,12 +2741,12 @@ msgid "Mark as workout"
msgstr "Als Trainingsplan markieren"
#: manager/templates/workout/template_view.html:65
-#: manager/templates/workout/view.html:51
+#: manager/templates/workout/view.html:49
msgid "Muscles trained"
msgstr "Trainierte Muskeln"
#: manager/templates/workout/template_view.html:68
-#: manager/templates/workout/view.html:54
+#: manager/templates/workout/view.html:52
msgid ""
"Images show combined muscles as trained by the exercises on the workout."
msgstr ""
@@ -2759,35 +2757,35 @@ msgstr ""
msgid "Use this template"
msgstr "Diese Vorlage verwenden"
-#: manager/templates/workout/view.html:45
+#: manager/templates/workout/view.html:43
msgid "Add training days"
msgstr "Trainingstag hinzufügen"
-#: manager/templates/workout/view.html:46
+#: manager/templates/workout/view.html:44
msgid "Add workout sets to days"
msgstr "Sätze zu den Tagen hinzufügen"
-#: manager/templates/workout/view.html:47
+#: manager/templates/workout/view.html:45
msgid "Set the repetitions for each set"
msgstr "Wiederholungen für den Satz eingeben"
-#: manager/templates/workout/view.html:75
+#: manager/templates/workout/view.html:73
msgid "Export this workout as a calendar file."
msgstr "Diesen Trainingsplan als Kalenderdatei exportieren."
-#: manager/templates/workout/view.html:146
+#: manager/templates/workout/view.html:144
msgid "Logs"
msgstr "Tagebucheintrag"
-#: manager/templates/workout/view.html:148
+#: manager/templates/workout/view.html:146
msgid "View logs"
msgstr "Logs anzeigen"
-#: manager/templates/workout/view.html:171 manager/views/schedule_step.py:99
+#: manager/templates/workout/view.html:169 manager/views/schedule_step.py:99
msgid "Edit workout"
msgstr "Trainingsplan bearbeiten"
-#: manager/templates/workout/view.html:184 manager/views/workout.py:281
+#: manager/templates/workout/view.html:182 manager/views/workout.py:281
msgid "Mark as template"
msgstr "Als Vorlage markieren"
@@ -2834,104 +2832,89 @@ msgstr "Dies wird ebenfalls alle Gewichtslogs für diesen Tag löschen."
msgid "Value"
msgstr "Wert"
-#: nutrition/forms.py:117
+#: nutrition/forms.py:118
msgid "Height (in)"
msgstr "Größe (zoll)"
-#: nutrition/forms.py:120
+#: nutrition/forms.py:121
msgid "Weight (kg)"
msgstr "Gewicht (kg)"
-#: nutrition/forms.py:120
+#: nutrition/forms.py:121
msgid "Weight (lbs)"
msgstr "Gewicht (lbs)"
-#: nutrition/forms.py:133
+#: nutrition/forms.py:134
msgid "Calculate"
msgstr "Berechnen"
-#: nutrition/forms.py:207 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:208 nutrition/templates/rate/form.html:76
msgid "Basic caloric intake"
msgstr "Basis-Kalorienzufuhr"
-#: nutrition/forms.py:208
+#: nutrition/forms.py:209
msgid "Your basic caloric intake as calculated for your data"
msgstr "Deine Basis-Kalorienzufuhr wird aus deinen Angaben berechnet"
-#: nutrition/forms.py:213
+#: nutrition/forms.py:214
msgid "Additional calories"
msgstr "Zusätzliche Kalorien"
-#: nutrition/forms.py:215
+#: nutrition/forms.py:216
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
msgstr "Zusat"
-#: nutrition/forms.py:248 nutrition/models/ingredient_weight_unit.py:39
-#: nutrition/models/log.py:84 nutrition/models/meal_item.py:53
+#: nutrition/forms.py:249 nutrition/models/ingredient_weight_unit.py:39
+#: nutrition/models/log.py:87 nutrition/models/meal_item.py:54
msgid "Ingredient"
msgstr "Zutat"
-#: nutrition/models/ingredient.py:131
+#: nutrition/models/ingredient.py:117
msgid "In kcal per 100g"
msgstr "In kcal/100 g"
-#: nutrition/models/ingredient.py:138 nutrition/models/ingredient.py:146
-#: nutrition/models/ingredient.py:156 nutrition/models/ingredient.py:164
-#: nutrition/models/ingredient.py:174 nutrition/models/ingredient.py:184
-#: nutrition/models/ingredient.py:194
+#: nutrition/models/ingredient.py:124 nutrition/models/ingredient.py:132
+#: nutrition/models/ingredient.py:142 nutrition/models/ingredient.py:150
+#: nutrition/models/ingredient.py:160 nutrition/models/ingredient.py:170
+#: nutrition/models/ingredient.py:180
msgid "In g per 100g of product"
msgstr "In g pro 100 g Produkt"
-#: nutrition/models/ingredient.py:155
-#: nutrition/templates/ingredient/view.html:96 nutrition/views/plan.py:259
+#: nutrition/models/ingredient.py:141
+#: nutrition/templates/ingredient/view.html:70 nutrition/views/plan.py:259
msgid "Sugar content in carbohydrates"
msgstr "Davon Zucker"
-#: nutrition/models/ingredient.py:173
-#: nutrition/templates/ingredient/view.html:112 nutrition/views/plan.py:273
+#: nutrition/models/ingredient.py:159
+#: nutrition/templates/ingredient/view.html:86 nutrition/views/plan.py:273
msgid "Saturated fat content in fats"
msgstr "Davon gesättigte Fettsäuren"
-#: nutrition/models/ingredient.py:183
-#: nutrition/templates/ingredient/view.html:134 nutrition/views/plan.py:279
-msgid "Fibres"
-msgstr "Ballastoffe"
+#: nutrition/models/ingredient.py:169
+#: nutrition/templates/ingredient/view.html:108 nutrition/views/plan.py:279
+msgid "Fiber"
+msgstr ""
-#: nutrition/models/ingredient.py:193
-#: nutrition/templates/ingredient/view.html:144 nutrition/views/plan.py:285
+#: nutrition/models/ingredient.py:179
+#: nutrition/templates/ingredient/view.html:118 nutrition/views/plan.py:285
msgid "Sodium"
msgstr "Natrium"
-#: nutrition/models/ingredient.py:215
+#: nutrition/models/ingredient.py:209
msgid "Link to product"
msgstr "Link zum Produkt"
-#: nutrition/models/ingredient.py:244
+#: nutrition/models/ingredient.py:238
msgid "Brand name of product"
msgstr "Markenname des Produkts"
-#: nutrition/models/ingredient.py:304
+#: nutrition/models/ingredient.py:305
#, python-brace-format
msgid "The total energy ({self.energy}kcal) is not the approximate sum of the "
msgstr ""
-#: nutrition/models/ingredient.py:383 nutrition/views/ingredient.py:196
-msgid "Ingredient was successfully added to the general database"
-msgstr "Die Zutat wurde erfolgreich zur Datenbank hinzugefügt"
-
-#: nutrition/models/ingredient.py:408
-msgid "New user submitted ingredient"
-msgstr "Neue Zutat von Benutzer eingereicht"
-
-#: nutrition/models/ingredient.py:410
-#, fuzzy, python-brace-format
-#| msgid "The user {0} submitted a new ingredient \"{1}\"."
-msgid ""
-"The user {request.user.username} submitted a new ingredient \"{self.name}\"."
-msgstr "Der Nutzer {0} hat erfolgreich die neue Zutat „{1}“ eingereicht."
-
#: nutrition/models/ingredient_category.py:31
msgid "Ingredient Categories"
msgstr "Zutatenkategorien"
@@ -2944,16 +2927,16 @@ msgstr "Menge in Gramm"
msgid "Unit amount, e.g. \"1 Cup\" or \"1/2 spoon\""
msgstr "Menge der Einheit, z.B. „1 Tasse“ or „1/2 Löffel“"
-#: nutrition/models/log.py:49 nutrition/models/meal.py:50
-#: nutrition/models/meal_item.py:47 nutrition/models/plan.py:106
+#: nutrition/models/log.py:52 nutrition/models/meal.py:50
+#: nutrition/models/meal_item.py:48 nutrition/models/plan.py:108
msgid "Nutrition plan"
msgstr "Ernährungsplan"
-#: nutrition/models/log.py:58
+#: nutrition/models/log.py:61
msgid "Meal"
msgstr "Mahlzeit"
-#: nutrition/models/log.py:68
+#: nutrition/models/log.py:71
msgid "Date and Time (Approx.)"
msgstr "Uhrzeit und Datum (ca.)"
@@ -2976,11 +2959,11 @@ msgid ""
msgstr ""
"Eine Beschreibung des Ernährungplanes, z.B. „Vorbereitung für den Sommer“"
-#: nutrition/models/plan.py:88
+#: nutrition/models/plan.py:90
msgid "Use daily calories"
msgstr "Tägliche Kalorien benutzen"
-#: nutrition/models/plan.py:91
+#: nutrition/models/plan.py:93
msgid ""
"Tick the box if you want to mark this plan as having a goal amount of "
"calories. You can use the calculator or enter the value yourself."
@@ -3105,66 +3088,36 @@ msgstr "Suchen"
msgid "Add ingredient"
msgstr "Zutat hinzufügen"
-#: nutrition/templates/ingredient/pending.html:14
-msgid "Submission date"
-msgstr "Datum der Einreichung"
-
-#: nutrition/templates/ingredient/view.html:27
-msgid "Ingredient is pending review"
-msgstr "Zutat noch nicht freigegeben"
-
-#: nutrition/templates/ingredient/view.html:28
-msgid ""
-"This user submitted ingredient is pending a decision to be\n"
-"included in the database. Till then, it will not be shown in the overview "
-"or\n"
-"the search."
-msgstr ""
-"Diese von einem Benutzer eingereichte Zutat ist noch nicht freigegeben.\n"
-"Bis dann, wird sie weder in der Übersicht, noch in der Suche erscheinen."
-
-#: nutrition/templates/ingredient/view.html:31
-msgid "Please select one of the options below."
-msgstr "Wähle bitte eine der folgenden Optionen."
-
-#: nutrition/templates/ingredient/view.html:38
-msgid "Accept"
-msgstr "Freigeben"
-
-#: nutrition/templates/ingredient/view.html:42
-msgid "Decline"
-msgstr "Ablehnen"
-
-#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:229
+#: nutrition/templates/ingredient/view.html:45 nutrition/views/plan.py:229
msgid "Macronutrients"
msgstr "Makronährstoffe"
-#: nutrition/templates/ingredient/view.html:80
+#: nutrition/templates/ingredient/view.html:54
msgid "kJ"
msgstr "kJ"
-#: nutrition/templates/ingredient/view.html:101
-#: nutrition/templates/ingredient/view.html:117
-#: nutrition/templates/ingredient/view.html:139
-#: nutrition/templates/ingredient/view.html:149
+#: nutrition/templates/ingredient/view.html:75
+#: nutrition/templates/ingredient/view.html:91
+#: nutrition/templates/ingredient/view.html:113
+#: nutrition/templates/ingredient/view.html:123
msgid "n.A."
msgstr "k.A."
-#: nutrition/templates/ingredient/view.html:128
+#: nutrition/templates/ingredient/view.html:102
msgid "Others"
msgstr "Andere"
-#: nutrition/templates/ingredient/view.html:170
+#: nutrition/templates/ingredient/view.html:144
#: nutrition/templates/units/list.html:46 nutrition/views/unit.py:86
msgid "Add new weight unit"
msgstr "Gewichtseinheit hinzufügen"
-#: nutrition/templates/ingredient/view.html:232
-#: nutrition/templates/ingredient/view.html:235
+#: nutrition/templates/ingredient/view.html:206
+#: nutrition/templates/ingredient/view.html:209
msgid "Edit ingredient"
msgstr "Zutat bearbeiten"
-#: nutrition/templates/ingredient/view.html:239
+#: nutrition/templates/ingredient/view.html:213
msgid "Delete ingredient"
msgstr "Zutat entfernen"
@@ -3266,14 +3219,10 @@ msgstr "140 bis 230"
msgid "56 to 90"
msgstr "56 bis 90"
-#: nutrition/views/ingredient.py:154
+#: nutrition/views/ingredient.py:157
msgid "Add a new ingredient"
msgstr "Zutat hinzufügen"
-#: nutrition/views/ingredient.py:209
-msgid "Ingredient was successfully marked as rejected"
-msgstr "Zutat wurde erfolgreich als abgelehnt markiert"
-
#: nutrition/views/plan.py:120
msgid "Nutritional plan"
msgstr "Ernährungsplan"
@@ -3320,20 +3269,10 @@ msgstr ""
"Projekt, das von Fitness-Enthusiasten aus der ganzen Welt entwickelt wurde."
#: software/templates/about_us.html:18
-msgid "Source code"
-msgstr "Quelltext"
-
-#: software/templates/about_us.html:20
-msgid "Get the source code of this application and its server on github"
-msgstr ""
-"Hole dir den Quellcode dieser Anwendung und des dazugehörigen Servers auf "
-"Github"
-
-#: software/templates/about_us.html:25
msgid "Have a problem or idea?"
msgstr "Hast du ein Problem oder eine Idee?"
-#: software/templates/about_us.html:27
+#: software/templates/about_us.html:20
msgid ""
"Get in touch if something didn't behave as expected or if there is a feature "
"that you feel is missing."
@@ -3341,20 +3280,28 @@ msgstr ""
"Setze dich mit uns in Verbindung, wenn sich etwas nicht wie erwartet "
"verhalten hat oder wenn es eine Funktion gibt, die du vermisst."
-#: software/templates/about_us.html:32
+#: software/templates/about_us.html:26
msgid "Say hi!"
msgstr "Sag Hallo!"
-#: software/templates/about_us.html:34
+#: software/templates/about_us.html:28
msgid "If you want to chat with us, hop on the Discord server and get in touch"
msgstr ""
"Wenn du mit uns chatten möchtest, komm auf den Discord-Server und sag hallo"
-#: software/templates/about_us.html:39 software/templates/features.html:503
+#: software/templates/about_us.html:33
+msgid "Mastodon"
+msgstr ""
+
+#: software/templates/about_us.html:35
+msgid "Follow us on mastodon for updates and news about the project"
+msgstr ""
+
+#: software/templates/about_us.html:40 software/templates/features.html:503
msgid "Translation"
msgstr "Übersetzung"
-#: software/templates/about_us.html:41
+#: software/templates/about_us.html:42
msgid ""
"This application is translated on weblate. If you also want to help, click "
"the link and start translating"
@@ -3362,11 +3309,21 @@ msgstr ""
"Diese Anwendung wird auf weblate übersetzt. Wenn du auch helfen möchtest, "
"klicke auf den Link und beginne zu übersetzen"
-#: software/templates/about_us.html:50
+#: software/templates/about_us.html:47
+msgid "Source code"
+msgstr "Quelltext"
+
+#: software/templates/about_us.html:49
+msgid "Get the source code of this application and its server on github"
+msgstr ""
+"Hole dir den Quellcode dieser Anwendung und des dazugehörigen Servers auf "
+"Github"
+
+#: software/templates/about_us.html:59
msgid "Our goal"
msgstr "Unser Ziel"
-#: software/templates/about_us.html:53
+#: software/templates/about_us.html:62
#, fuzzy
#| msgid ""
#| "The goal is to build an awesome\n"
@@ -3376,7 +3333,8 @@ msgstr "Unser Ziel"
msgid ""
"The goal is to build an awesome\n"
" and flexible fitness manager, along with a comprehensive and "
-"complete list of exercises and\n"
+"complete list of\n"
+" exercises and\n"
" ingredients, all released under a free license."
msgstr ""
"Das Ziel ist, einen großartigen und flexiblen Traininsplan- und\n"
@@ -3392,10 +3350,6 @@ msgstr ""
"Wger Workout Manager ist eine kostenlose open Source-Web-Anwendung, die "
"deine Übungen und Trainingspläne verwaltet."
-#: software/templates/features.html:45
-msgid "About"
-msgstr "Impressum"
-
#: software/templates/features.html:57
msgid "Mobile app"
msgstr "Mobile app"
@@ -3656,18 +3610,6 @@ msgid ""
"to its own copyright."
msgstr ""
-#: utils/models.py:130
-msgid "Pending"
-msgstr "In Bearbeitung"
-
-#: utils/models.py:131
-msgid "Accepted"
-msgstr "Angenommen"
-
-#: utils/models.py:132
-msgid "Declined"
-msgstr "Abgelehnt"
-
#: weight/forms.py:54
msgid "Input"
msgstr "Eingabe"
@@ -3680,7 +3622,7 @@ msgstr "Datumsformat"
msgid "You have to enter your weight"
msgstr "Du musst dein Gewicht eingeben"
-#: weight/models.py:60
+#: weight/models.py:78
msgid "Weight entry"
msgstr "Gewichtseintrag"
@@ -3822,6 +3764,64 @@ msgstr "Erfolgreich gelöscht."
msgid "Delete weight entry for the %s"
msgstr "Gewichtseintrag für den %s löschen"
+#~ msgid "Ingredients pending review"
+#~ msgstr "Zutaten ohne Freigabe"
+
+#~ msgid "Fibres"
+#~ msgstr "Ballastoffe"
+
+#~ msgid "Ingredient was successfully added to the general database"
+#~ msgstr "Die Zutat wurde erfolgreich zur Datenbank hinzugefügt"
+
+#~ msgid "New user submitted ingredient"
+#~ msgstr "Neue Zutat von Benutzer eingereicht"
+
+#, fuzzy, python-brace-format
+#~| msgid "The user {0} submitted a new ingredient \"{1}\"."
+#~ msgid ""
+#~ "The user {request.user.username} submitted a new ingredient \"{self."
+#~ "name}\"."
+#~ msgstr "Der Nutzer {0} hat erfolgreich die neue Zutat „{1}“ eingereicht."
+
+#~ msgid "Submission date"
+#~ msgstr "Datum der Einreichung"
+
+#~ msgid "Ingredient is pending review"
+#~ msgstr "Zutat noch nicht freigegeben"
+
+#~ msgid ""
+#~ "This user submitted ingredient is pending a decision to be\n"
+#~ "included in the database. Till then, it will not be shown in the overview "
+#~ "or\n"
+#~ "the search."
+#~ msgstr ""
+#~ "Diese von einem Benutzer eingereichte Zutat ist noch nicht freigegeben.\n"
+#~ "Bis dann, wird sie weder in der Übersicht, noch in der Suche erscheinen."
+
+#~ msgid "Please select one of the options below."
+#~ msgstr "Wähle bitte eine der folgenden Optionen."
+
+#~ msgid "Accept"
+#~ msgstr "Freigeben"
+
+#~ msgid "Decline"
+#~ msgstr "Ablehnen"
+
+#~ msgid "Ingredient was successfully marked as rejected"
+#~ msgstr "Zutat wurde erfolgreich als abgelehnt markiert"
+
+#~ msgid "About"
+#~ msgstr "Impressum"
+
+#~ msgid "Pending"
+#~ msgstr "In Bearbeitung"
+
+#~ msgid "Accepted"
+#~ msgstr "Angenommen"
+
+#~ msgid "Declined"
+#~ msgstr "Abgelehnt"
+
#~ msgid "Share"
#~ msgstr "Teilen"
diff --git a/wger/locale/el/LC_MESSAGES/django.po b/wger/locale/el/LC_MESSAGES/django.po
index 836f62705..ccbbce9f9 100644
--- a/wger/locale/el/LC_MESSAGES/django.po
+++ b/wger/locale/el/LC_MESSAGES/django.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: wger Workout Manager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-02-02 12:42+0100\n"
+"POT-Creation-Date: 2024-07-14 15:49+0200\n"
"PO-Revision-Date: 2023-10-01 07:01+0000\n"
"Last-Translator: Antonis-geo <[email protected]>\n"
"Language-Team: Greek <https://hosted.weblate.org/projects/wger/web/el/>\n"
@@ -34,7 +34,7 @@ msgstr ""
"νέα εγγεγραμμένα μέλη και θα ενημερώσει τα υπάρχοντα μέλη που δεν έχουν "
"γυμναστήριο."
-#: config/views/gym_config.py:42 core/templates/language/view.html:63
+#: config/views/gym_config.py:42 core/templates/language/view.html:67
#: core/templates/license/list.html:17 core/templates/misc/license/list.html:18
#: core/templates/repetition_unit/list.html:18
#: core/templates/tags/render_day.html:39
@@ -54,8 +54,8 @@ msgstr ""
#: manager/templates/calendar/day.html:68
#: manager/templates/calendar/month.html:85
#: manager/templates/calendar/partial_overview_table.html:18
-#: manager/templates/schedule/view.html:119
-#: nutrition/templates/ingredient/view.html:191
+#: manager/templates/schedule/view.html:118
+#: nutrition/templates/ingredient/view.html:165
#: nutrition/templates/units/list.html:19
msgid "Edit"
msgstr "Επεξεργασία"
@@ -89,8 +89,8 @@ msgstr "Το τέλειο πρόγραμμα γυμναστικής μου"
msgid "Empty placeholder schedule"
msgstr "Άδειο placeholder ημερολογίου"
-#: core/forms.py:69 core/templates/navigation.html:275
-#: core/templates/navigation.html:281 core/templates/user/login.html:4
+#: core/forms.py:69 core/templates/navigation.html:285
+#: core/templates/navigation.html:291 core/templates/user/login.html:4
#: software/templates/features.html:82 software/templates/features.html:427
msgid "Login"
msgstr "Σύνδεση"
@@ -164,7 +164,7 @@ msgstr "Κωδικός"
msgid "Please enter your current password."
msgstr "Παρακαλώ πληκτρολογήστε τον τρέχων κωδικό σας."
-#: core/forms.py:242 core/templates/language/view.html:68
+#: core/forms.py:242 core/templates/language/view.html:73
#: core/templates/license/list.html:19 core/templates/misc/license/list.html:22
#: core/templates/repetition_unit/list.html:20
#: core/templates/tags/render_day.html:45
@@ -179,10 +179,10 @@ msgstr "Παρακαλώ πληκτρολογήστε τον τρέχων κωδ
#: gym/templates/gym/list.html:22 manager/templates/calendar/day.html:73
#: manager/templates/calendar/month.html:89
#: manager/templates/calendar/partial_overview_table.html:23
-#: manager/templates/schedule/view.html:123
-#: manager/templates/workout/view.html:190
-#: nutrition/templates/ingredient/view.html:192
-#: nutrition/templates/ingredient/view.html:241
+#: manager/templates/schedule/view.html:122
+#: manager/templates/workout/view.html:188
+#: nutrition/templates/ingredient/view.html:166
+#: nutrition/templates/ingredient/view.html:215
#: nutrition/templates/units/list.html:22
msgid "Delete"
msgstr "Διαγραφή"
@@ -195,14 +195,14 @@ msgstr "Λάθος κωδικός"
msgid "The form is secured with reCAPTCHA"
msgstr "Η φόρμα είναι ασφαλισμένη με reCAPTCHA"
-#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:275
-#: core/templates/navigation.html:287 core/templates/template.html:147
+#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:285
+#: core/templates/navigation.html:297 core/templates/template.html:149
#: core/templates/user/login.html:20 core/views/user.py:298
#: software/templates/features.html:87 software/templates/features.html:422
msgid "Register"
msgstr "Εγγραφή"
-#: core/forms.py:315
+#: core/forms.py:315 software/templates/features.html:45
msgid "Contact"
msgstr "Επικοινωνία"
@@ -211,7 +211,7 @@ msgid "Some way of answering you (e-mail, etc.)"
msgstr "Κάποιος τρόπος απάντησής σας (ηλεκτρονικό ταχυδρομείο κ.λπ.)"
#: core/forms.py:324 exercises/models/comment.py:58 manager/models/set.py:61
-#: manager/models/setting.py:111 nutrition/models/log.py:74
+#: manager/models/setting.py:114 nutrition/models/log.py:77
msgid "Comment"
msgstr "Σχόλια"
@@ -231,6 +231,12 @@ msgstr "Γλώσσα μικρή ονομασία"
msgid "Language full name"
msgstr "Γλώσσα κανονική ονομασία"
+#: core/models/language.py:45 core/templates/language/view.html:23
+#, fuzzy
+#| msgid "Language full name"
+msgid "Language full name in English"
+msgstr "Γλώσσα κανονική ονομασία"
+
#: core/models/license.py:29
msgid "Full name"
msgstr "Ονοματεπώνυμο"
@@ -247,7 +253,7 @@ msgstr ""
msgid "Short name, e.g. CC-BY-SA 3"
msgstr "Μικρό όνομα, π.χ. CC-BY-SA 3"
-#: core/models/license.py:45 nutrition/models/ingredient.py:214
+#: core/models/license.py:45 nutrition/models/ingredient.py:208
msgid "Link"
msgstr "Σύνδεσμος"
@@ -364,7 +370,7 @@ msgstr ""
msgid "Age"
msgstr "Ηλικία"
-#: core/models/profile.py:230 nutrition/forms.py:117
+#: core/models/profile.py:230 nutrition/forms.py:118
msgid "Height (cm)"
msgstr "Ύψος (cm)"
@@ -416,7 +422,7 @@ msgstr ""
"Συνολική εισαγωγή θερμίδων, συμπεριλαμβάνοντας π.χ. οποιαδήποτε υπερβολή"
#: core/models/profile.py:333 nutrition/models/ingredient_weight_unit.py:45
-#: nutrition/models/log.py:93 nutrition/models/meal_item.py:58
+#: nutrition/models/log.py:96 nutrition/models/meal_item.py:59
msgid "Weight unit"
msgstr "Μονάδα βάρους"
@@ -450,17 +456,16 @@ msgstr "Το σύνολο όλων των ωρών θα πρέπει να είν
#: core/models/rep_unit.py:36 core/models/weight_unit.py:36
#: core/templates/user/overview.html:262 core/views/user.py:599
#: exercises/models/category.py:29 exercises/models/equipment.py:29
-#: exercises/models/exercise.py:58 exercises/models/muscle.py:36
+#: exercises/models/exercise.py:59 exercises/models/muscle.py:36
#: gym/models/contract.py:52 gym/models/contract.py:103 gym/models/gym.py:46
#: gym/models/user_document.py:84 gym/templates/contract/view.html:50
#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:96
#: gym/views/gym.py:158 manager/models/schedule.py:55
#: manager/models/workout.py:57 measurements/models/category.py:36
-#: nutrition/models/ingredient.py:125
+#: nutrition/models/ingredient.py:111
#: nutrition/models/ingredient_category.py:27 nutrition/models/meal.py:67
#: nutrition/models/weight_unit.py:38
-#: nutrition/templates/ingredient/pending.html:15
-#: nutrition/templates/ingredient/view.html:178
+#: nutrition/templates/ingredient/view.html:152
msgid "Name"
msgstr "Όνομα"
@@ -567,24 +572,24 @@ msgstr ""
msgid "Dashboard"
msgstr "Πίνακας Ελέγχου"
-#: core/templates/language/overview.html:4 core/templates/navigation.html:335
+#: core/templates/language/overview.html:4 core/templates/navigation.html:345
msgid "Languages"
msgstr "Γλώσσες"
-#: core/templates/language/overview.html:20
+#: core/templates/language/overview.html:22
msgid "Nothing found."
msgstr "Δεν βρέθηκε τίποτα."
-#: core/templates/language/overview.html:20
+#: core/templates/language/overview.html:22
#: manager/templates/calendar/month.html:132
#: manager/templates/schedule/overview.html:28
-#: manager/templates/schedule/view.html:145
+#: manager/templates/schedule/view.html:144
#: manager/templates/workout/overview.html:28
#: nutrition/templates/ingredient/overview.html:38
msgid "Add one now."
msgstr "Προσθήκη τώρα."
-#: core/templates/language/overview.html:33 core/templates/license/list.html:40
+#: core/templates/language/overview.html:35 core/templates/license/list.html:40
#: core/templates/misc/license/list.html:43
#: core/templates/repetition_unit/list.html:43
#: core/templates/user/overview.html:326 core/templates/user/overview.html:365
@@ -604,13 +609,13 @@ msgstr "Προσθήκη τώρα."
msgid "Add"
msgstr "Προσθήκη"
-#: core/templates/language/view.html:58 core/templates/user/api_key.html:44
+#: core/templates/language/view.html:61 core/templates/user/api_key.html:44
#: core/templates/user/preferences.html:45 gym/models/contract.py:203
#: gym/templates/contract/view.html:41 gym/templates/contract/view.html:106
#: gym/templates/gym/member_list.html:248
-#: manager/templates/schedule/view.html:286
-#: manager/templates/workout/view.html:165
-#: nutrition/templates/ingredient/view.html:228
+#: manager/templates/schedule/view.html:285
+#: manager/templates/workout/view.html:163
+#: nutrition/templates/ingredient/view.html:202
msgid "Options"
msgstr "Επιλογές"
@@ -635,12 +640,11 @@ msgstr "Λίστα αδειών"
#: gym/templates/gym/member_list.html:299
#: mailer/templates/mailer/gym/overview.html:30
#: manager/templates/calendar/day.html:87
-#: nutrition/templates/ingredient/pending.html:30
#: nutrition/templates/units/list.html:29
msgid "Nothing found"
msgstr "Δεν βρέθηκε τίποτα"
-#: core/templates/misc/about.html:4 core/templates/template.html:173
+#: core/templates/misc/about.html:4 core/templates/template.html:175
msgid "Imprint"
msgstr "Εκτύπωση"
@@ -653,176 +657,171 @@ msgstr ""
"Εάν μια άδεια έχει εντοπιστεί, π.χ. τις άδειες Creative Commons\n"
"για τις διάφορες χώρες, προσθέστε τις ως ξεχωριστές εγγραφές εδώ."
-#: core/templates/navigation.html:27 software/templates/features.html:437
+#: core/templates/navigation.html:28 software/templates/features.html:437
msgid "Training"
msgstr "Εξάσκηση"
-#: core/templates/navigation.html:34 core/templates/user/overview.html:25
+#: core/templates/navigation.html:37 core/templates/user/overview.html:25
msgid "Workouts"
msgstr "Προπονήσεις"
-#: core/templates/navigation.html:42
+#: core/templates/navigation.html:46
msgid "Workouts schedules"
msgstr "Προγράμματα προπονήσεων"
-#: core/templates/navigation.html:50 core/templates/user/overview.html:70
+#: core/templates/navigation.html:54 core/templates/user/overview.html:70
#: manager/templates/calendar/month.html:10
#: manager/templates/calendar/month.html:21
msgid "Calendar"
msgstr "Ημερολόγιο"
-#: core/templates/navigation.html:60
+#: core/templates/navigation.html:64
#, fuzzy
#| msgid "Macronutrients"
msgid "Measurements"
msgstr "Θρεπτικά στοιχεία"
-#: core/templates/navigation.html:70 gallery/templates/images/overview.html:6
+#: core/templates/navigation.html:75 gallery/templates/images/overview.html:6
msgid "Gallery"
msgstr "Γκαλερί"
-#: core/templates/navigation.html:76
+#: core/templates/navigation.html:81
msgid "Workout templates"
msgstr "Πρότυπα προπόνησης"
-#: core/templates/navigation.html:82 manager/views/workout.py:84
+#: core/templates/navigation.html:88 manager/views/workout.py:84
msgid "Your templates"
msgstr "Τα πρότυπά σας"
-#: core/templates/navigation.html:90 manager/views/workout.py:98
+#: core/templates/navigation.html:97 manager/views/workout.py:98
msgid "Public templates"
msgstr "Δημόσια υποδείγματα"
-#: core/templates/navigation.html:97 manager/forms.py:129
-#: manager/models/setting.py:54 software/templates/features.html:51
+#: core/templates/navigation.html:105 manager/forms.py:129
+#: manager/models/setting.py:57 software/templates/features.html:51
#: software/templates/features.html:459
msgid "Exercises"
msgstr "Ασκήσεις"
-#: core/templates/navigation.html:103 core/templates/navigation.html:170
-#: core/templates/navigation.html:330
+#: core/templates/navigation.html:111 core/templates/navigation.html:184
+#: core/templates/navigation.html:340
msgid "Administration"
msgstr "Διαχείριση"
-#: core/templates/navigation.html:106
+#: core/templates/navigation.html:115
msgid "Exercise edit history"
msgstr "Ιστορικό επεξεργασίας της άσκησης"
-#: core/templates/navigation.html:111 exercises/models/base.py:103
+#: core/templates/navigation.html:121 exercises/models/base.py:103
msgid "Equipment"
msgstr "Όργανα"
-#: core/templates/navigation.html:116
+#: core/templates/navigation.html:127
msgid "Muscles"
msgstr "Μύες"
-#: core/templates/navigation.html:121
+#: core/templates/navigation.html:133
#: exercises/templates/categories/admin-overview.html:4
msgid "Categories"
msgstr "Κατηγορίες"
-#: core/templates/navigation.html:136 software/templates/features.html:447
+#: core/templates/navigation.html:148 software/templates/features.html:447
msgid "Nutrition"
msgstr "Διατροφή"
-#: core/templates/navigation.html:143 core/templates/user/overview.html:144
+#: core/templates/navigation.html:156 core/templates/user/overview.html:144
msgid "Nutrition plans"
msgstr "Προγράμματα διατροφής"
-#: core/templates/navigation.html:151 nutrition/templates/bmi/form.html:50
+#: core/templates/navigation.html:165 nutrition/templates/bmi/form.html:50
msgid "BMI calculator"
msgstr "Υπολογιστής BMI"
-#: core/templates/navigation.html:159 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:174 nutrition/templates/rate/form.html:17
msgid "Daily calories calculator"
msgstr "Υπολογιστής ημερήσιων θερμίδων"
-#: core/templates/navigation.html:165
+#: core/templates/navigation.html:179
#: nutrition/templates/ingredient/overview.html:10
msgid "Ingredient overview"
msgstr "Επισκόπηση συστατικών"
-#: core/templates/navigation.html:172 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:187 nutrition/templates/units/list.html:6
msgid "Ingredient weight units"
msgstr "Μονάδες βάρους συστατικών"
-#: core/templates/navigation.html:177
-#: nutrition/templates/ingredient/pending.html:6
-msgid "Ingredients pending review"
-msgstr "Συστατικά που αναμένουν εξέταση"
-
-#: core/templates/navigation.html:193 software/templates/features.html:442
+#: core/templates/navigation.html:203 software/templates/features.html:442
msgid "Body weight"
msgstr "Σωματικό βάρος"
-#: core/templates/navigation.html:200 core/templates/user/overview.html:114
+#: core/templates/navigation.html:210 core/templates/user/overview.html:114
msgid "Weight overview"
msgstr "Επισκόπηση βάρους"
-#: core/templates/navigation.html:207 weight/views.py:65
+#: core/templates/navigation.html:217 weight/views.py:65
msgid "Add weight entry"
msgstr "Νέα εγγραφή βάρους"
-#: core/templates/navigation.html:221
+#: core/templates/navigation.html:231
msgid "About this software"
msgstr "Σχετικά"
-#: core/templates/navigation.html:227 software/templates/about_us.html:5
+#: core/templates/navigation.html:237 software/templates/about_us.html:5
msgid "About us"
msgstr "Σχετικά με μας"
-#: core/templates/navigation.html:233 software/templates/features.html:507
+#: core/templates/navigation.html:243 software/templates/features.html:507
msgid "REST API"
msgstr "REST API"
-#: core/templates/navigation.html:239 utils/models.py:45
+#: core/templates/navigation.html:249 utils/models.py:45
msgid "License"
msgstr "Άδεια"
-#: core/templates/navigation.html:245
+#: core/templates/navigation.html:255
msgid "Developer documentation"
msgstr "Τεκμηρίωση προγραμματιστή"
-#: core/templates/navigation.html:252
+#: core/templates/navigation.html:262
msgid "Get the code"
msgstr "Κατεβάστε τον κώδικα"
-#: core/templates/navigation.html:259 core/templates/template.html:212
+#: core/templates/navigation.html:269 core/templates/template.html:214
#: software/templates/features.html:582
msgid "Translate"
msgstr "Μετάφραση"
-#: core/templates/navigation.html:293 core/templates/user/login.html:28
+#: core/templates/navigation.html:303 core/templates/user/login.html:28
msgid "Reset password"
msgstr "Επαναφορά κωδικού"
-#: core/templates/navigation.html:311
+#: core/templates/navigation.html:321
msgid "My preferences"
msgstr "Οι προτιμήσεις μου"
-#: core/templates/navigation.html:320
+#: core/templates/navigation.html:330
msgid "Logout"
msgstr "Έξοδος"
-#: core/templates/navigation.html:343
+#: core/templates/navigation.html:353
msgid "Licenses"
msgstr "Άδειες"
-#: core/templates/navigation.html:351
+#: core/templates/navigation.html:361
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr "Μονάδες επανάληψης"
-#: core/templates/navigation.html:359 core/templates/weight_unit/list.html:4
-#: nutrition/templates/ingredient/view.html:167
+#: core/templates/navigation.html:369 core/templates/weight_unit/list.html:4
+#: nutrition/templates/ingredient/view.html:141
msgid "Weight units"
msgstr "Μονάδες βάρους"
-#: core/templates/navigation.html:367 core/templates/user/list.html:4
+#: core/templates/navigation.html:377 core/templates/user/list.html:4
msgid "User list"
msgstr "Λίστα χρήστη"
-#: core/templates/navigation.html:373
+#: core/templates/navigation.html:383
msgid "Gyms"
msgstr "Γυμναστήρια"
@@ -879,12 +878,12 @@ msgstr "Ευχαριστούμε που χρησιμοποιήσατε τις υ
msgid "The %(site_name)s team"
msgstr "Η ομάδα %(site_name)s"
-#: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:11
+#: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:12
msgid "previous"
msgstr "προηγούμενο"
-#: core/templates/tags/pagination.html:31
-#: core/templates/tags/pagination.html:35
+#: core/templates/tags/pagination.html:33
+#: core/templates/tags/pagination.html:38
msgid "next"
msgstr "επόμενο"
@@ -909,36 +908,36 @@ msgid "Add exercises to this workout day"
msgstr "Προσθέστε ασκήσεις για την προπόνηση σε αυτήν την μέρα"
#: core/templates/tags/render_weight_log.html:17 manager/helpers.py:86
-#: manager/models/setting.py:69 manager/templates/set/formset.html:9
+#: manager/models/setting.py:72 manager/templates/set/formset.html:9
msgid "Reps"
msgstr "Επαναλήψεις"
#: core/templates/tags/render_weight_log.html:30 manager/forms.py:191
-#: manager/models/log.py:103 manager/models/setting.py:99
+#: manager/models/log.py:103 manager/models/setting.py:102
#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
msgid "RiR"
msgstr "Απόθεμα Επαναλήψεων"
-#: core/templates/template.html:120 manager/templates/calendar/month.html:138
-#: manager/templates/schedule/view.html:249
-#: manager/templates/schedule/view.html:270
-#: manager/templates/workout/view.html:86
-#: manager/templates/workout/view.html:139
+#: core/templates/template.html:122 manager/templates/calendar/month.html:138
+#: manager/templates/schedule/view.html:248
+#: manager/templates/schedule/view.html:269
+#: manager/templates/workout/view.html:84
+#: manager/templates/workout/view.html:137
msgid "Close"
msgstr "Κλείσιμο"
-#: core/templates/template.html:136
+#: core/templates/template.html:138
msgid ""
"You are using a guest account, data entered will be deleted after a week."
msgstr ""
"Χρησιμοποιείτε έναν λογαριασμό επισκέπτη. Τα δεδομένα που εισάγετε θα "
"διαγραφούν σε μία εβδομάδα."
-#: core/templates/template.html:141
+#: core/templates/template.html:143
msgid "Create some demo entries"
msgstr "Δημιουργήστε μερικές δοκιμαστικές εγγραφές"
-#: core/templates/template.html:178 software/templates/features.html:547
+#: core/templates/template.html:180 software/templates/features.html:547
#: software/templates/tos.html:7
msgid "Terms of service"
msgstr "Όροι χρήσης"
@@ -1040,7 +1039,7 @@ msgid "Overview"
msgstr "Έπισκόπηση"
#: core/templates/user/overview.html:28
-#: manager/templates/schedule/view.html:164
+#: manager/templates/schedule/view.html:163
#: manager/templates/workout/overview.html:39 manager/views/schedule_step.py:60
msgid "Add workout"
msgstr "Νέα προπόνηση"
@@ -1048,20 +1047,20 @@ msgstr "Νέα προπόνηση"
#: core/templates/user/overview.html:34 core/templates/user/overview.html:76
#: core/templates/user/overview.html:120 core/templates/user/overview.html:152
#: exercises/models/base.py:118 exercises/models/base.py:124
-#: exercises/models/exercise.py:63 exercises/models/exercise.py:69
+#: exercises/models/exercise.py:64 exercises/models/exercise.py:70
#: exercises/models/image.py:107 exercises/models/image.py:113
#: exercises/models/video.py:163 exercises/models/video.py:169
#: gallery/models/image.py:42 manager/helpers.py:85 manager/models/log.py:100
#: manager/models/session.py:67 measurements/models/measurement.py:47
-#: nutrition/models/ingredient.py:101 nutrition/models/ingredient.py:107
-#: nutrition/models/ingredient.py:222 weight/models.py:33
+#: nutrition/models/ingredient.py:87 nutrition/models/ingredient.py:93
+#: nutrition/models/ingredient.py:216 weight/models.py:51
#: weight/templates/import_csv_preview.html:13
#: weight/templates/import_csv_preview.html:42 weight/views.py:144
msgid "Date"
msgstr "Ημερομηνία"
#: core/templates/user/overview.html:35 core/templates/user/overview.html:153
-#: exercises/models/exercise.py:51 gallery/models/image.py:65
+#: exercises/models/exercise.py:52 gallery/models/image.py:65
#: gym/models/contract.py:58 gym/models/contract.py:109
#: manager/models/day.py:37 manager/models/workout.py:63
#: measurements/models/measurement.py:62 nutrition/models/plan.py:67
@@ -1079,13 +1078,13 @@ msgstr "Τελευταία δραστηριότητα"
#: core/templates/user/overview.html:58
#: manager/templates/calendar/month.html:128
-#: manager/templates/schedule/view.html:145
+#: manager/templates/schedule/view.html:144
#: manager/templates/workout/overview.html:28
msgid "No workouts found."
msgstr "Δεν βρέθηκαν προπονήσεις."
#: core/templates/user/overview.html:68 manager/forms.py:280
-#: manager/templates/workout/view.html:108
+#: manager/templates/workout/view.html:106
msgid "Log"
msgstr "Ιστορικό"
@@ -1109,35 +1108,35 @@ msgstr "Ώρα"
#: core/templates/user/overview.html:112 core/templates/user/overview.html:121
#: manager/forms.py:186 manager/helpers.py:86 manager/models/log.py:86
-#: manager/models/setting.py:79 manager/templates/log/add.html:54
-#: manager/templates/set/formset.html:11 weight/models.py:35
+#: manager/models/setting.py:82 manager/templates/log/add.html:54
+#: manager/templates/set/formset.html:11 weight/models.py:53
#: weight/templates/import_csv_preview.html:14
#: weight/templates/import_csv_preview.html:43 weight/views.py:144
msgid "Weight"
msgstr "Βάρος"
-#: core/templates/user/overview.html:154 nutrition/models/ingredient.py:130
-#: nutrition/templates/ingredient/view.html:77 nutrition/views/plan.py:237
+#: core/templates/user/overview.html:154 nutrition/models/ingredient.py:116
+#: nutrition/templates/ingredient/view.html:51 nutrition/views/plan.py:237
msgid "Energy"
msgstr "Ενέργεια"
-#: core/templates/user/overview.html:155 nutrition/models/ingredient.py:137
-#: nutrition/templates/ingredient/view.html:84 nutrition/views/plan.py:243
+#: core/templates/user/overview.html:155 nutrition/models/ingredient.py:123
+#: nutrition/templates/ingredient/view.html:58 nutrition/views/plan.py:243
msgid "Protein"
msgstr "Προτεϊνες"
-#: core/templates/user/overview.html:156 nutrition/models/ingredient.py:145
-#: nutrition/templates/ingredient/view.html:90 nutrition/views/plan.py:251
+#: core/templates/user/overview.html:156 nutrition/models/ingredient.py:131
+#: nutrition/templates/ingredient/view.html:64 nutrition/views/plan.py:251
msgid "Carbohydrates"
msgstr "Υδατάνθρακες"
-#: core/templates/user/overview.html:157 nutrition/models/ingredient.py:163
-#: nutrition/templates/ingredient/view.html:106 nutrition/views/plan.py:265
+#: core/templates/user/overview.html:157 nutrition/models/ingredient.py:149
+#: nutrition/templates/ingredient/view.html:80 nutrition/views/plan.py:265
msgid "Fat"
msgstr "Λιπαρή ύλη"
#: core/templates/user/overview.html:170
-#: nutrition/templates/ingredient/view.html:79
+#: nutrition/templates/ingredient/view.html:53
msgid "kcal"
msgstr "kcal"
@@ -1149,7 +1148,7 @@ msgstr "kcal"
#: gym/templates/gym/member_list.html:207
#: gym/templates/gym/member_list.html:240
#: gym/templates/gym/member_list.html:277
-#: manager/templates/schedule/view.html:101
+#: manager/templates/schedule/view.html:100
msgid "Actions"
msgstr "Ενέργειες"
@@ -1192,7 +1191,7 @@ msgid "Details"
msgstr "Λεπτομέρειες"
#: core/templates/user/overview.html:258 gym/views/export.py:57
-#: manager/helpers.py:86 manager/templates/schedule/view.html:99
+#: manager/helpers.py:86 manager/templates/schedule/view.html:98
msgid "Nr."
msgstr "Νο."
@@ -1237,7 +1236,7 @@ msgid "Documents"
msgstr "Έγγραφα"
#: core/templates/user/overview.html:412 gym/templates/document/list.html:32
-#: manager/forms.py:292 manager/templates/workout/view.html:134
+#: manager/forms.py:292 manager/templates/workout/view.html:132
msgid "Download"
msgstr "Μεταφόρτωση"
@@ -1288,13 +1287,13 @@ msgid "kg"
msgstr "kg"
#: core/templatetags/wger_extras.py:207
-#: nutrition/templates/ingredient/view.html:86
-#: nutrition/templates/ingredient/view.html:92
-#: nutrition/templates/ingredient/view.html:99
-#: nutrition/templates/ingredient/view.html:108
-#: nutrition/templates/ingredient/view.html:115
-#: nutrition/templates/ingredient/view.html:137
-#: nutrition/templates/ingredient/view.html:147
+#: nutrition/templates/ingredient/view.html:60
+#: nutrition/templates/ingredient/view.html:66
+#: nutrition/templates/ingredient/view.html:73
+#: nutrition/templates/ingredient/view.html:82
+#: nutrition/templates/ingredient/view.html:89
+#: nutrition/templates/ingredient/view.html:111
+#: nutrition/templates/ingredient/view.html:121
msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr "γρ"
@@ -1312,7 +1311,7 @@ msgstr "oz"
#: exercises/views/equipment.py:103 exercises/views/exercises.py:73
#: exercises/views/muscles.py:99 manager/views/schedule.py:309
#: manager/views/schedule_step.py:128 manager/views/workout.py:249
-#: manager/views/workout_session.py:142 nutrition/views/ingredient.py:116
+#: manager/views/workout_session.py:142 nutrition/views/ingredient.py:119
#: nutrition/views/unit.py:110
msgid "Successfully deleted"
msgstr "Επιτυχής διαγραφή"
@@ -1324,7 +1323,7 @@ msgstr "Επιτυχής διαγραφή"
#: gym/views/admin_notes.py:196 gym/views/document.py:206 gym/views/gym.py:481
#: manager/views/schedule.py:316 manager/views/schedule_step.py:138
#: manager/views/workout.py:253 manager/views/workout_session.py:156
-#: nutrition/views/ingredient.py:123 nutrition/views/unit.py:117
+#: nutrition/views/ingredient.py:126 nutrition/views/unit.py:117
#, python-brace-format
msgid "Delete {0}?"
msgstr "Διαγραφή {0};"
@@ -1337,7 +1336,7 @@ msgstr "Διαγραφή {0};"
#: gym/views/contract.py:186 gym/views/contract_option.py:123
#: gym/views/contract_type.py:123 gym/views/document.py:171
#: gym/views/gym.py:463 manager/views/day.py:100 manager/views/schedule.py:333
-#: manager/views/workout.py:267 nutrition/views/ingredient.py:142
+#: manager/views/workout.py:267 nutrition/views/ingredient.py:145
#: nutrition/views/unit.py:143
#, python-brace-format
msgid "Edit {0}"
@@ -1412,7 +1411,7 @@ msgstr "Γυμναστήριο"
msgid "A verification email was sent to %(email)s"
msgstr "Ένα μήνυμα ηλεκτρονικού ταχυδρομείου επαλήθευσης εστάλη στον%(email)s"
-#: exercises/models/base.py:82 nutrition/models/ingredient.py:236
+#: exercises/models/base.py:82 nutrition/models/ingredient.py:230
msgid "Category"
msgstr "Κατηγορία"
@@ -1432,7 +1431,7 @@ msgstr "Διαφοροποιήσεις"
msgid "Exercise Categories"
msgstr "Κατηγορίες ασκήσεων"
-#: exercises/models/comment.py:52 exercises/models/exercise_alias.py:52
+#: exercises/models/comment.py:52 exercises/models/exercise_alias.py:53
#: exercises/models/image.py:74 exercises/models/video.py:98
#: manager/forms.py:178 manager/helpers.py:86 manager/models/log.py:52
msgid "Exercise"
@@ -1442,12 +1441,12 @@ msgstr "Άσκηση"
msgid "A comment about how to correctly do this exercise."
msgstr "Ένα σχόλιο για τον σωστό τρόπο εφαρμογής της άσκησης."
-#: exercises/models/exercise.py:76 nutrition/models/ingredient.py:95
+#: exercises/models/exercise.py:77 nutrition/models/ingredient.py:81
#: nutrition/models/weight_unit.py:32
msgid "Language"
msgstr "Γλώσσα"
-#: exercises/models/exercise_alias.py:58
+#: exercises/models/exercise_alias.py:59
msgid "Alias for an exercise"
msgstr "Ψευδώνυμο για μια άσκηση"
@@ -1580,7 +1579,7 @@ msgstr "Δράση"
#: manager/models/schedule.py:44 manager/models/session.py:49
#: manager/models/workout.py:89 measurements/models/category.py:31
#: measurements/models/measurement.py:42 nutrition/models/plan.py:54
-#: nutrition/templates/ingredient/pending.html:16 weight/models.py:42
+#: weight/models.py:60
msgid "User"
msgstr "Χρήστης"
@@ -1703,9 +1702,9 @@ msgid "Contract type"
msgstr "Τύπος συμβολαίου"
#: gym/models/contract.py:211 gym/templates/contract/view.html:59
-#: manager/templates/log/add.html:52 nutrition/forms.py:62
-#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:105
-#: nutrition/models/meal_item.py:72
+#: manager/templates/log/add.html:52 nutrition/forms.py:63
+#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:108
+#: nutrition/models/meal_item.py:73
msgid "Amount"
msgstr "Ποσότητα"
@@ -1722,7 +1721,7 @@ msgid "Contract is active"
msgstr "Το συμβόλαιο είναι ενεργό"
#: gym/models/contract.py:237 gym/templates/contract/view.html:69
-#: manager/models/schedule.py:61 manager/templates/schedule/view.html:68
+#: manager/models/schedule.py:61 manager/templates/schedule/view.html:67
msgid "Start date"
msgstr "Ημερομηνία έναρξης"
@@ -2114,7 +2113,7 @@ msgstr "Δημιουργία προεπισκόπησης"
#: mailer/templates/mailer/gym/form.html:28
#: mailer/templates/mailer/gym/preview.html:62
-#: manager/templates/workout/view.html:42
+#: manager/templates/workout/view.html:40
msgid "Steps"
msgstr "Βήματα"
@@ -2140,7 +2139,7 @@ msgstr ""
"χρειάζεστε πριν από την αποστολή των μηνυμάτων ηλεκτρονικού ταχυδρομείου"
#: mailer/templates/mailer/gym/preview.html:22
-#: software/templates/about_us.html:60
+#: software/templates/about_us.html:70
msgid "Current version"
msgstr "Τρέχουσα έκδοση"
@@ -2173,16 +2172,16 @@ msgstr ""
"Μπορείτε να ψάξετε για περισσότερες από μία ασκήσεις, θα ομαδοποιηθούν σε "
"μια ομάδα."
-#: manager/forms.py:140 nutrition/forms.py:252
+#: manager/forms.py:140 nutrition/forms.py:253
msgid "Also search for names in English"
msgstr "Αναζητήστε επίσης ονόματα στα αγγλικά"
#: manager/forms.py:168 manager/forms.py:173 manager/models/log.py:64
-#: manager/models/log.py:92 manager/models/setting.py:59
-#: manager/models/setting.py:90 manager/templates/log/add.html:53
+#: manager/models/log.py:92 manager/models/setting.py:62
+#: manager/models/setting.py:93 manager/templates/log/add.html:53
#: manager/templates/log/add.html:55 manager/templates/set/formset.html:10
#: manager/templates/set/formset.html:12 measurements/models/category.py:41
-#: nutrition/forms.py:66
+#: nutrition/forms.py:67
msgid "Unit"
msgstr "Μονάδα"
@@ -2190,15 +2189,15 @@ msgstr "Μονάδα"
msgid "Type"
msgstr "Είδος"
-#: manager/forms.py:280 manager/templates/workout/view.html:115
+#: manager/forms.py:280 manager/templates/workout/view.html:113
msgid "Table"
msgstr "Πίνακας"
-#: manager/forms.py:282 manager/templates/workout/view.html:121
+#: manager/forms.py:282 manager/templates/workout/view.html:119
msgid "with images"
msgstr "με εικόνες"
-#: manager/forms.py:283 manager/templates/workout/view.html:127
+#: manager/forms.py:283 manager/templates/workout/view.html:125
msgid "with comments"
msgstr "με σχόλια"
@@ -2207,11 +2206,10 @@ msgid "Workout will expire soon"
msgstr "Η προπόνηση θα λήξει σε λίγο"
#: manager/models/day.py:34 manager/models/log.py:58
-#: manager/models/session.py:60 manager/templates/schedule/view.html:103
-#: manager/templates/workout/view.html:11
-#: manager/templates/workout/view.html:19 manager/views/pdf.py:85
-#: manager/views/pdf.py:161 manager/views/schedule.py:151
-#: manager/views/schedule.py:221
+#: manager/models/session.py:60 manager/templates/schedule/view.html:102
+#: manager/templates/workout/view.html:9 manager/templates/workout/view.html:17
+#: manager/views/pdf.py:85 manager/views/pdf.py:161
+#: manager/views/schedule.py:151 manager/views/schedule.py:221
msgid "Workout"
msgstr "Προπόνηση"
@@ -2233,7 +2231,7 @@ msgstr ""
"Ονομασία ή μικρή περιγραφή του προγράμματος. Για παράδειγμα \"Πρόγραμμα "
"XYZ\"."
-#: manager/models/schedule.py:65 manager/templates/schedule/view.html:72
+#: manager/models/schedule.py:65 manager/templates/schedule/view.html:71
msgid "Schedule active"
msgstr "Πρόγραμμα ενεργό"
@@ -2247,7 +2245,7 @@ msgstr ""
"(θα εμφανίζεται π.χ. στον πίνακα ελέγχου). Όλα τα υπόλοιπα προγράμματα θα "
"χαρακτηριστούν ώς μή ενεργά μετά"
-#: manager/models/schedule.py:77 manager/templates/schedule/view.html:82
+#: manager/models/schedule.py:77 manager/templates/schedule/view.html:81
msgid "Is a loop"
msgstr "Είναι μία επανάληψη"
@@ -2268,8 +2266,8 @@ msgid "The duration in weeks"
msgstr "Η διάρκεια σε εβδομάδες"
#: manager/models/schedule_step.py:64 manager/models/set.py:53
-#: manager/models/setting.py:110 nutrition/models/meal.py:55
-#: nutrition/models/meal_item.py:65
+#: manager/models/setting.py:113 nutrition/models/meal.py:55
+#: nutrition/models/meal_item.py:66
msgid "Order"
msgstr "Διάταξη"
@@ -2324,7 +2322,7 @@ msgstr "Μέρα προπόνησης"
msgid "Number of sets"
msgstr "Αριθμός σέτ"
-#: manager/models/setting.py:48
+#: manager/models/setting.py:51
msgid "Sets"
msgstr "Σετ"
@@ -2401,7 +2399,7 @@ msgstr ""
msgid "Go to current month"
msgstr "Τρέχων μήνας"
-#: manager/templates/calendar/month.html:188
+#: manager/templates/calendar/month.html:190
msgid "Add new log"
msgstr "Νέα εγγραφή"
@@ -2442,8 +2440,8 @@ msgid "Your schedules"
msgstr "Τα προγράμματα σας"
#: manager/templates/schedule/overview.html:19
-#: manager/templates/schedule/view.html:132
-#: manager/templates/schedule/view.html:184
+#: manager/templates/schedule/view.html:131
+#: manager/templates/schedule/view.html:183
#: manager/templates/workout/overview.html:16
msgid "active"
msgstr "ενεργό"
@@ -2490,11 +2488,11 @@ msgstr ""
msgid "Add schedule"
msgstr "Νέο πρόγραμμα"
-#: manager/templates/schedule/view.html:10
+#: manager/templates/schedule/view.html:9
msgid "Schedule"
msgstr "Πρόγραμμα"
-#: manager/templates/schedule/view.html:86
+#: manager/templates/schedule/view.html:85
msgid ""
"This schedule is a loop and will go through the workouts above till you "
"deactivate it"
@@ -2502,19 +2500,19 @@ msgstr ""
"Αυτό το πρόγραμμα είναι σε βρόγχο και θα περάσει απο όλες τις προπονήσεις "
"μέχρι να το απενεργοποιήσετε"
-#: manager/templates/schedule/view.html:104
+#: manager/templates/schedule/view.html:103
msgid "Weeks"
msgstr "Εβδομάδες"
-#: manager/templates/schedule/view.html:116
+#: manager/templates/schedule/view.html:115
msgid "Move me"
msgstr "Μετακίνησε με"
-#: manager/templates/schedule/view.html:157
+#: manager/templates/schedule/view.html:156
msgid "Start schedule"
msgstr "Έναρξη προγράμματος"
-#: manager/templates/schedule/view.html:188
+#: manager/templates/schedule/view.html:187
#, python-format
msgid ""
"%(weeks)s Week\n"
@@ -2529,11 +2527,11 @@ msgstr[1] ""
"%(weeks)s Εβδομάδες\n"
" "
-#: manager/templates/schedule/view.html:222
+#: manager/templates/schedule/view.html:221
msgid "Adding workouts"
msgstr "Πρόσθεση προπονήσεων"
-#: manager/templates/schedule/view.html:224
+#: manager/templates/schedule/view.html:223
msgid ""
"Add as many workouts to the schedule as you want. You can\n"
" edit the order by dragging and dropping them. It's also possible "
@@ -2545,21 +2543,21 @@ msgstr ""
"επίσης δυνατό να προσθέσετε μία προπόνηση περισσοτερο\n"
"\tαπό μία φορά."
-#: manager/templates/schedule/view.html:233
-#: manager/templates/schedule/view.html:244
-#: manager/templates/schedule/view.html:291
-#: manager/templates/workout/view.html:71
-#: manager/templates/workout/view.html:81
-#: manager/templates/workout/view.html:180
+#: manager/templates/schedule/view.html:232
+#: manager/templates/schedule/view.html:243
+#: manager/templates/schedule/view.html:290
+#: manager/templates/workout/view.html:69
+#: manager/templates/workout/view.html:79
+#: manager/templates/workout/view.html:178
msgid "Export calendar file"
msgstr "Εξαγωγή αρχείου ημερολογίου"
-#: manager/templates/schedule/view.html:237
+#: manager/templates/schedule/view.html:236
msgid "Export this schedule as a calendar file."
msgstr "Εξαγωγή του προγράμματος ως αρχείο ημερολογίου."
-#: manager/templates/schedule/view.html:238
-#: manager/templates/workout/view.html:76
+#: manager/templates/schedule/view.html:237
+#: manager/templates/workout/view.html:74
msgid ""
"You can then import the file it into your calendar\n"
" application for example google calendar, outlook or "
@@ -2572,18 +2570,18 @@ msgstr ""
"δημιουργήσει\n"
"\tραντεβού για κάθε προπονητική μέρα με τις κατάλληλες ασκήσεις."
-#: manager/templates/schedule/view.html:259
-#: manager/templates/schedule/view.html:295
-#: manager/templates/workout/view.html:96
-#: manager/templates/workout/view.html:176
+#: manager/templates/schedule/view.html:258
+#: manager/templates/schedule/view.html:294
+#: manager/templates/workout/view.html:94
+#: manager/templates/workout/view.html:174
msgid "Download as PDF"
msgstr "Αποθήκευση ώς PDF"
-#: manager/templates/schedule/view.html:300
+#: manager/templates/schedule/view.html:299
msgid "Edit schedule"
msgstr "Επεξεργασία προγράμματος"
-#: manager/templates/schedule/view.html:305
+#: manager/templates/schedule/view.html:304
msgid "Delete schedule"
msgstr "Διαγραφή προγράμματος"
@@ -2730,12 +2728,12 @@ msgid "Mark as workout"
msgstr "Σημειώστε το ως προπόνηση"
#: manager/templates/workout/template_view.html:65
-#: manager/templates/workout/view.html:51
+#: manager/templates/workout/view.html:49
msgid "Muscles trained"
msgstr "Μύς που γυμνάστηκαν"
#: manager/templates/workout/template_view.html:68
-#: manager/templates/workout/view.html:54
+#: manager/templates/workout/view.html:52
msgid ""
"Images show combined muscles as trained by the exercises on the workout."
msgstr ""
@@ -2746,35 +2744,35 @@ msgstr ""
msgid "Use this template"
msgstr "Χρησιμοποιήστε αυτό το υπόδειγμα"
-#: manager/templates/workout/view.html:45
+#: manager/templates/workout/view.html:43
msgid "Add training days"
msgstr "Προσθήκη ημερών προπόνησης"
-#: manager/templates/workout/view.html:46
+#: manager/templates/workout/view.html:44
msgid "Add workout sets to days"
msgstr "Προσθήκη σετ προπονήσεων στις μέρες"
-#: manager/templates/workout/view.html:47
+#: manager/templates/workout/view.html:45
msgid "Set the repetitions for each set"
msgstr "Ρύθμιση των επαναλήψεων για κάθε σετ"
-#: manager/templates/workout/view.html:75
+#: manager/templates/workout/view.html:73
msgid "Export this workout as a calendar file."
msgstr "Εξαγωγή αυτής της προπόνησης σε αρχείο ημερολογίου."
-#: manager/templates/workout/view.html:146
+#: manager/templates/workout/view.html:144
msgid "Logs"
msgstr "Καταγραφές"
-#: manager/templates/workout/view.html:148
+#: manager/templates/workout/view.html:146
msgid "View logs"
msgstr "Προβολή αρχείων καταγραφής"
-#: manager/templates/workout/view.html:171 manager/views/schedule_step.py:99
+#: manager/templates/workout/view.html:169 manager/views/schedule_step.py:99
msgid "Edit workout"
msgstr "Επεξεργασία προπόνησης"
-#: manager/templates/workout/view.html:184 manager/views/workout.py:281
+#: manager/templates/workout/view.html:182 manager/views/workout.py:281
msgid "Mark as template"
msgstr "Σημειώστε ως υπόδειγμα"
@@ -2822,35 +2820,35 @@ msgstr ""
msgid "Value"
msgstr "Αξία"
-#: nutrition/forms.py:117
+#: nutrition/forms.py:118
msgid "Height (in)"
msgstr "Ύψος (σε)"
-#: nutrition/forms.py:120
+#: nutrition/forms.py:121
msgid "Weight (kg)"
msgstr "Βάρος (κιλά)"
-#: nutrition/forms.py:120
+#: nutrition/forms.py:121
msgid "Weight (lbs)"
msgstr "Βάρος (lbs)"
-#: nutrition/forms.py:133
+#: nutrition/forms.py:134
msgid "Calculate"
msgstr "Υπολογισμός"
-#: nutrition/forms.py:207 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:208 nutrition/templates/rate/form.html:76
msgid "Basic caloric intake"
msgstr "Βασική εισαγωγή θερμίδων"
-#: nutrition/forms.py:208
+#: nutrition/forms.py:209
msgid "Your basic caloric intake as calculated for your data"
msgstr "Η βασική σας εισαγωγή θερμίδων όπως υπολογίστηκε απο τα δεδομένα σας"
-#: nutrition/forms.py:213
+#: nutrition/forms.py:214
msgid "Additional calories"
msgstr "Επιπλέον θερμίδες"
-#: nutrition/forms.py:215
+#: nutrition/forms.py:216
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
@@ -2858,70 +2856,55 @@ msgstr ""
"Επιπλέον θερμίδες θα προστεθούν στην βασική τάση (για αφαίρεση, εισάγετε "
"αρνητικό αριθμό)"
-#: nutrition/forms.py:248 nutrition/models/ingredient_weight_unit.py:39
-#: nutrition/models/log.py:84 nutrition/models/meal_item.py:53
+#: nutrition/forms.py:249 nutrition/models/ingredient_weight_unit.py:39
+#: nutrition/models/log.py:87 nutrition/models/meal_item.py:54
msgid "Ingredient"
msgstr "Συστατικά"
-#: nutrition/models/ingredient.py:131
+#: nutrition/models/ingredient.py:117
msgid "In kcal per 100g"
msgstr "Σε kcal ανα 100g"
-#: nutrition/models/ingredient.py:138 nutrition/models/ingredient.py:146
-#: nutrition/models/ingredient.py:156 nutrition/models/ingredient.py:164
-#: nutrition/models/ingredient.py:174 nutrition/models/ingredient.py:184
-#: nutrition/models/ingredient.py:194
+#: nutrition/models/ingredient.py:124 nutrition/models/ingredient.py:132
+#: nutrition/models/ingredient.py:142 nutrition/models/ingredient.py:150
+#: nutrition/models/ingredient.py:160 nutrition/models/ingredient.py:170
+#: nutrition/models/ingredient.py:180
msgid "In g per 100g of product"
msgstr "Σε g ανα 100g προϊόντος"
-#: nutrition/models/ingredient.py:155
-#: nutrition/templates/ingredient/view.html:96 nutrition/views/plan.py:259
+#: nutrition/models/ingredient.py:141
+#: nutrition/templates/ingredient/view.html:70 nutrition/views/plan.py:259
msgid "Sugar content in carbohydrates"
msgstr "Περιεχόμενο σάκχαρων σε υδατάνθρακες"
-#: nutrition/models/ingredient.py:173
-#: nutrition/templates/ingredient/view.html:112 nutrition/views/plan.py:273
+#: nutrition/models/ingredient.py:159
+#: nutrition/templates/ingredient/view.html:86 nutrition/views/plan.py:273
msgid "Saturated fat content in fats"
msgstr "Εκ των οποίων κορεσμένα λίπη"
-#: nutrition/models/ingredient.py:183
-#: nutrition/templates/ingredient/view.html:134 nutrition/views/plan.py:279
-msgid "Fibres"
-msgstr "Ίνες"
+#: nutrition/models/ingredient.py:169
+#: nutrition/templates/ingredient/view.html:108 nutrition/views/plan.py:279
+msgid "Fiber"
+msgstr ""
-#: nutrition/models/ingredient.py:193
-#: nutrition/templates/ingredient/view.html:144 nutrition/views/plan.py:285
+#: nutrition/models/ingredient.py:179
+#: nutrition/templates/ingredient/view.html:118 nutrition/views/plan.py:285
msgid "Sodium"
msgstr "Νάτριο"
-#: nutrition/models/ingredient.py:215
+#: nutrition/models/ingredient.py:209
msgid "Link to product"
msgstr "Σύνδεσμος προς το προϊόν"
-#: nutrition/models/ingredient.py:244
+#: nutrition/models/ingredient.py:238
msgid "Brand name of product"
msgstr "Επωνυμία του προϊόντος"
-#: nutrition/models/ingredient.py:304
+#: nutrition/models/ingredient.py:305
#, python-brace-format
msgid "The total energy ({self.energy}kcal) is not the approximate sum of the "
msgstr ""
-#: nutrition/models/ingredient.py:383 nutrition/views/ingredient.py:196
-msgid "Ingredient was successfully added to the general database"
-msgstr "Το συστατικό προστέθηκε με επιτυχία στην γενική βάση δεδομένων"
-
-#: nutrition/models/ingredient.py:408
-msgid "New user submitted ingredient"
-msgstr "Ένας χρήστης υπέβαλλε συστατικό"
-
-#: nutrition/models/ingredient.py:410
-#, fuzzy, python-brace-format
-#| msgid "The user {0} submitted a new ingredient \"{1}\"."
-msgid ""
-"The user {request.user.username} submitted a new ingredient \"{self.name}\"."
-msgstr "Ο χρήστης {0} υπέβαλλε ένα νέο συστατικό \"{1}\"."
-
#: nutrition/models/ingredient_category.py:31
msgid "Ingredient Categories"
msgstr "Κατηγορίες συστατικών"
@@ -2934,16 +2917,16 @@ msgstr "Ποσότητα σε γραμμάρια"
msgid "Unit amount, e.g. \"1 Cup\" or \"1/2 spoon\""
msgstr "Μονάδα ποσότητας, π.χ. \"1 Φλιτζάνι\" ή \"1/2 κουτάλι\""
-#: nutrition/models/log.py:49 nutrition/models/meal.py:50
-#: nutrition/models/meal_item.py:47 nutrition/models/plan.py:106
+#: nutrition/models/log.py:52 nutrition/models/meal.py:50
+#: nutrition/models/meal_item.py:48 nutrition/models/plan.py:108
msgid "Nutrition plan"
msgstr "Πρόγραμμα διατροφής"
-#: nutrition/models/log.py:58
+#: nutrition/models/log.py:61
msgid "Meal"
msgstr "Γεύμα"
-#: nutrition/models/log.py:68
+#: nutrition/models/log.py:71
msgid "Date and Time (Approx.)"
msgstr "Ημερομηνία και ώρα (περίπου)"
@@ -2967,11 +2950,11 @@ msgstr ""
"Μια περιγραφή του στόχου ενός προγράμματος, π.χ. \"Προετοιμασία για το "
"καλοκαίρι\" ή \"Πρόσθεση μάζας\""
-#: nutrition/models/plan.py:88
+#: nutrition/models/plan.py:90
msgid "Use daily calories"
msgstr "Χρήση ημερήσιων θερμίδων"
-#: nutrition/models/plan.py:91
+#: nutrition/models/plan.py:93
msgid ""
"Tick the box if you want to mark this plan as having a goal amount of "
"calories. You can use the calculator or enter the value yourself."
@@ -3100,68 +3083,36 @@ msgstr "Εύρεση"
msgid "Add ingredient"
msgstr "Προσθήκη συστατικών"
-#: nutrition/templates/ingredient/pending.html:14
-msgid "Submission date"
-msgstr "Ημερομηνία υποβολής"
-
-#: nutrition/templates/ingredient/view.html:27
-msgid "Ingredient is pending review"
-msgstr "Συστατικά που αναμένουν εξέταση"
-
-#: nutrition/templates/ingredient/view.html:28
-msgid ""
-"This user submitted ingredient is pending a decision to be\n"
-"included in the database. Till then, it will not be shown in the overview "
-"or\n"
-"the search."
-msgstr ""
-"Ο χρήστης υπέβαλλε ένα συστατικό που αναμένει εξέταση προκειμένου να "
-"συμπεριληφθεί\n"
-"στην βάση δεδομένων. Έως τότε, δεν θα εμφανίζεται στην επισκόπηση ή\n"
-"στην αναζήτηση."
-
-#: nutrition/templates/ingredient/view.html:31
-msgid "Please select one of the options below."
-msgstr "Παρακαλούμε επιλέξτε μια επιλογή απο τις παρακάτω."
-
-#: nutrition/templates/ingredient/view.html:38
-msgid "Accept"
-msgstr "Αποδοχή"
-
-#: nutrition/templates/ingredient/view.html:42
-msgid "Decline"
-msgstr "Άρνηση"
-
-#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:229
+#: nutrition/templates/ingredient/view.html:45 nutrition/views/plan.py:229
msgid "Macronutrients"
msgstr "Θρεπτικά στοιχεία"
-#: nutrition/templates/ingredient/view.html:80
+#: nutrition/templates/ingredient/view.html:54
msgid "kJ"
msgstr "kJ"
-#: nutrition/templates/ingredient/view.html:101
-#: nutrition/templates/ingredient/view.html:117
-#: nutrition/templates/ingredient/view.html:139
-#: nutrition/templates/ingredient/view.html:149
+#: nutrition/templates/ingredient/view.html:75
+#: nutrition/templates/ingredient/view.html:91
+#: nutrition/templates/ingredient/view.html:113
+#: nutrition/templates/ingredient/view.html:123
msgid "n.A."
msgstr "Μη διαθέσιμο"
-#: nutrition/templates/ingredient/view.html:128
+#: nutrition/templates/ingredient/view.html:102
msgid "Others"
msgstr "Άλλα"
-#: nutrition/templates/ingredient/view.html:170
+#: nutrition/templates/ingredient/view.html:144
#: nutrition/templates/units/list.html:46 nutrition/views/unit.py:86
msgid "Add new weight unit"
msgstr "Προσθήκη νέας μονάδας βάρους"
-#: nutrition/templates/ingredient/view.html:232
-#: nutrition/templates/ingredient/view.html:235
+#: nutrition/templates/ingredient/view.html:206
+#: nutrition/templates/ingredient/view.html:209
msgid "Edit ingredient"
msgstr "Επεξεργασία συστατικού"
-#: nutrition/templates/ingredient/view.html:239
+#: nutrition/templates/ingredient/view.html:213
msgid "Delete ingredient"
msgstr "Διαγραφή συστατικού"
@@ -3268,14 +3219,10 @@ msgstr "Από 140 έως 230"
msgid "56 to 90"
msgstr "Από 56 εώς 90"
-#: nutrition/views/ingredient.py:154
+#: nutrition/views/ingredient.py:157
msgid "Add a new ingredient"
msgstr "Προσθήκη νέου συστατικού"
-#: nutrition/views/ingredient.py:209
-msgid "Ingredient was successfully marked as rejected"
-msgstr "Το συστατικό απορρίφθηκε με επιτυχία"
-
#: nutrition/views/plan.py:120
msgid "Nutritional plan"
msgstr "Διατροφικό σχέδιο"
@@ -3324,20 +3271,10 @@ msgstr ""
"κόσμο."
#: software/templates/about_us.html:18
-msgid "Source code"
-msgstr "Πηγαίος κώδικας"
-
-#: software/templates/about_us.html:20
-msgid "Get the source code of this application and its server on github"
-msgstr ""
-"Λάβετε τον πηγαίο κώδικα αυτής της εφαρμογής και του διακομιστή της στο "
-"github"
-
-#: software/templates/about_us.html:25
msgid "Have a problem or idea?"
msgstr "Έχετε κάποιο πρόβλημα ή ιδέα;"
-#: software/templates/about_us.html:27
+#: software/templates/about_us.html:20
msgid ""
"Get in touch if something didn't behave as expected or if there is a feature "
"that you feel is missing."
@@ -3345,21 +3282,29 @@ msgstr ""
"Επικοινωνήστε μαζί μας αν κάτι δεν συμπεριφέρθηκε όπως αναμενόταν ή αν "
"υπάρχει κάποιο χαρακτηριστικό που θεωρείτε ότι λείπει."
-#: software/templates/about_us.html:32
+#: software/templates/about_us.html:26
msgid "Say hi!"
msgstr "Πες γεια!"
-#: software/templates/about_us.html:34
+#: software/templates/about_us.html:28
msgid "If you want to chat with us, hop on the Discord server and get in touch"
msgstr ""
"Αν θέλετε να συνομιλήσετε μαζί μας, μπείτε στον διακομιστή Discord και "
"επικοινωνήστε μαζί μας"
-#: software/templates/about_us.html:39 software/templates/features.html:503
+#: software/templates/about_us.html:33
+msgid "Mastodon"
+msgstr ""
+
+#: software/templates/about_us.html:35
+msgid "Follow us on mastodon for updates and news about the project"
+msgstr ""
+
+#: software/templates/about_us.html:40 software/templates/features.html:503
msgid "Translation"
msgstr "Μετάφραση"
-#: software/templates/about_us.html:41
+#: software/templates/about_us.html:42
msgid ""
"This application is translated on weblate. If you also want to help, click "
"the link and start translating"
@@ -3367,15 +3312,32 @@ msgstr ""
"Αυτή η εφαρμογή μεταφράζεται στο weblate. Αν θέλετε επίσης να βοηθήσετε, "
"κάντε κλικ στο σύνδεσμο και ξεκινήστε τη μετάφραση"
-#: software/templates/about_us.html:50
+#: software/templates/about_us.html:47
+msgid "Source code"
+msgstr "Πηγαίος κώδικας"
+
+#: software/templates/about_us.html:49
+msgid "Get the source code of this application and its server on github"
+msgstr ""
+"Λάβετε τον πηγαίο κώδικα αυτής της εφαρμογής και του διακομιστή της στο "
+"github"
+
+#: software/templates/about_us.html:59
msgid "Our goal"
msgstr "Ο στόχος μας"
-#: software/templates/about_us.html:53
+#: software/templates/about_us.html:62
+#, fuzzy
+#| msgid ""
+#| "The goal is to build an awesome\n"
+#| " and flexible fitness manager, along with a comprehensive "
+#| "and complete list of exercises and\n"
+#| " ingredients, all released under a free license."
msgid ""
"The goal is to build an awesome\n"
" and flexible fitness manager, along with a comprehensive and "
-"complete list of exercises and\n"
+"complete list of\n"
+" exercises and\n"
" ingredients, all released under a free license."
msgstr ""
"Ο στόχος είναι να χτιστεί μιά καταπληκτική\n"
@@ -3391,10 +3353,6 @@ msgstr ""
"Το wger Workout Manager είναι μια δωρεάν διαδικτυακή εφαρμογή ανοιχτού "
"κώδικα που διαχειρίζεται τις ασκήσεις και τις προπονήσεις σας."
-#: software/templates/features.html:45
-msgid "About"
-msgstr "Σχετικά"
-
#: software/templates/features.html:57
msgid "Mobile app"
msgstr "Εφαρμογή για κινητά τηλέφωνα"
@@ -3661,18 +3619,6 @@ msgstr ""
"προηγούμενο έργο, αλλά περιέχει επίσης επαρκές νέο, δημιουργικό περιεχόμενο "
"για να το παρέχει στα δικά του δικαιώματα πνευματικής ιδιοκτησίας."
-#: utils/models.py:130
-msgid "Pending"
-msgstr "Προς έγκριση"
-
-#: utils/models.py:131
-msgid "Accepted"
-msgstr "Αποδεκτό"
-
-#: utils/models.py:132
-msgid "Declined"
-msgstr "Απόρριψη"
-
#: weight/forms.py:54
msgid "Input"
msgstr "Εισαγωγή"
@@ -3685,7 +3631,7 @@ msgstr "Μορφή ημερομηνίας"
msgid "You have to enter your weight"
msgstr "Πρέπει να εισάγετε το βάρος σας"
-#: weight/models.py:60
+#: weight/models.py:78
msgid "Weight entry"
msgstr "Εισαγωγή βάρους"
@@ -3831,6 +3777,66 @@ msgstr "Διαγράφηκε με επιτυχία."
msgid "Delete weight entry for the %s"
msgstr "Διαγραφή καταχώρισης βάρους για το %s"
+#~ msgid "Ingredients pending review"
+#~ msgstr "Συστατικά που αναμένουν εξέταση"
+
+#~ msgid "Fibres"
+#~ msgstr "Ίνες"
+
+#~ msgid "Ingredient was successfully added to the general database"
+#~ msgstr "Το συστατικό προστέθηκε με επιτυχία στην γενική βάση δεδομένων"
+
+#~ msgid "New user submitted ingredient"
+#~ msgstr "Ένας χρήστης υπέβαλλε συστατικό"
+
+#, fuzzy, python-brace-format
+#~| msgid "The user {0} submitted a new ingredient \"{1}\"."
+#~ msgid ""
+#~ "The user {request.user.username} submitted a new ingredient \"{self."
+#~ "name}\"."
+#~ msgstr "Ο χρήστης {0} υπέβαλλε ένα νέο συστατικό \"{1}\"."
+
+#~ msgid "Submission date"
+#~ msgstr "Ημερομηνία υποβολής"
+
+#~ msgid "Ingredient is pending review"
+#~ msgstr "Συστατικά που αναμένουν εξέταση"
+
+#~ msgid ""
+#~ "This user submitted ingredient is pending a decision to be\n"
+#~ "included in the database. Till then, it will not be shown in the overview "
+#~ "or\n"
+#~ "the search."
+#~ msgstr ""
+#~ "Ο χρήστης υπέβαλλε ένα συστατικό που αναμένει εξέταση προκειμένου να "
+#~ "συμπεριληφθεί\n"
+#~ "στην βάση δεδομένων. Έως τότε, δεν θα εμφανίζεται στην επισκόπηση ή\n"
+#~ "στην αναζήτηση."
+
+#~ msgid "Please select one of the options below."
+#~ msgstr "Παρακαλούμε επιλέξτε μια επιλογή απο τις παρακάτω."
+
+#~ msgid "Accept"
+#~ msgstr "Αποδοχή"
+
+#~ msgid "Decline"
+#~ msgstr "Άρνηση"
+
+#~ msgid "Ingredient was successfully marked as rejected"
+#~ msgstr "Το συστατικό απορρίφθηκε με επιτυχία"
+
+#~ msgid "About"
+#~ msgstr "Σχετικά"
+
+#~ msgid "Pending"
+#~ msgstr "Προς έγκριση"
+
+#~ msgid "Accepted"
+#~ msgstr "Αποδεκτό"
+
+#~ msgid "Declined"
+#~ msgstr "Απόρριψη"
+
#~ msgid "Share"
#~ msgstr "Κοινοποίηση"
diff --git a/wger/locale/es/LC_MESSAGES/django.po b/wger/locale/es/LC_MESSAGES/django.po
index 562a0e0e8..8d0134d49 100644
--- a/wger/locale/es/LC_MESSAGES/django.po
+++ b/wger/locale/es/LC_MESSAGES/django.po
@@ -15,7 +15,7 @@ msgid ""
msgstr ""
"Project-Id-Version: wger Workout Manager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-02-02 12:42+0100\n"
+"POT-Creation-Date: 2024-07-14 15:49+0200\n"
"PO-Revision-Date: 2024-02-07 20:01+0000\n"
"Last-Translator: gallegonovato <[email protected]>\n"
"Language-Team: Spanish <https://hosted.weblate.org/projects/wger/web/es/>\n"
@@ -39,7 +39,7 @@ msgstr ""
"todos los nuevos usuarios registrados a este gimnasio y actualizará todos "
"los usuarios existentes sin gimnasio."
-#: config/views/gym_config.py:42 core/templates/language/view.html:63
+#: config/views/gym_config.py:42 core/templates/language/view.html:67
#: core/templates/license/list.html:17 core/templates/misc/license/list.html:18
#: core/templates/repetition_unit/list.html:18
#: core/templates/tags/render_day.html:39
@@ -59,8 +59,8 @@ msgstr ""
#: manager/templates/calendar/day.html:68
#: manager/templates/calendar/month.html:85
#: manager/templates/calendar/partial_overview_table.html:18
-#: manager/templates/schedule/view.html:119
-#: nutrition/templates/ingredient/view.html:191
+#: manager/templates/schedule/view.html:118
+#: nutrition/templates/ingredient/view.html:165
#: nutrition/templates/units/list.html:19
msgid "Edit"
msgstr "Editar"
@@ -94,8 +94,8 @@ msgstr "Mi programa de rutinas"
msgid "Empty placeholder schedule"
msgstr "Programación de marcador posición vacía"
-#: core/forms.py:69 core/templates/navigation.html:275
-#: core/templates/navigation.html:281 core/templates/user/login.html:4
+#: core/forms.py:69 core/templates/navigation.html:285
+#: core/templates/navigation.html:291 core/templates/user/login.html:4
#: software/templates/features.html:82 software/templates/features.html:427
msgid "Login"
msgstr "Ingresar"
@@ -169,7 +169,7 @@ msgstr "Contraseña"
msgid "Please enter your current password."
msgstr "Por favor, ingrese su contraseña actual."
-#: core/forms.py:242 core/templates/language/view.html:68
+#: core/forms.py:242 core/templates/language/view.html:73
#: core/templates/license/list.html:19 core/templates/misc/license/list.html:22
#: core/templates/repetition_unit/list.html:20
#: core/templates/tags/render_day.html:45
@@ -184,10 +184,10 @@ msgstr "Por favor, ingrese su contraseña actual."
#: gym/templates/gym/list.html:22 manager/templates/calendar/day.html:73
#: manager/templates/calendar/month.html:89
#: manager/templates/calendar/partial_overview_table.html:23
-#: manager/templates/schedule/view.html:123
-#: manager/templates/workout/view.html:190
-#: nutrition/templates/ingredient/view.html:192
-#: nutrition/templates/ingredient/view.html:241
+#: manager/templates/schedule/view.html:122
+#: manager/templates/workout/view.html:188
+#: nutrition/templates/ingredient/view.html:166
+#: nutrition/templates/ingredient/view.html:215
#: nutrition/templates/units/list.html:22
msgid "Delete"
msgstr "Borrar"
@@ -200,14 +200,14 @@ msgstr "Contraseña incorrecta"
msgid "The form is secured with reCAPTCHA"
msgstr "El Formulario está asegurado por recaptcha"
-#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:275
-#: core/templates/navigation.html:287 core/templates/template.html:147
+#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:285
+#: core/templates/navigation.html:297 core/templates/template.html:149
#: core/templates/user/login.html:20 core/views/user.py:298
#: software/templates/features.html:87 software/templates/features.html:422
msgid "Register"
msgstr "Registrarse"
-#: core/forms.py:315
+#: core/forms.py:315 software/templates/features.html:45
msgid "Contact"
msgstr "Contacto"
@@ -216,7 +216,7 @@ msgid "Some way of answering you (e-mail, etc.)"
msgstr "Alguna manera de responderte (correo electrónico u otros)"
#: core/forms.py:324 exercises/models/comment.py:58 manager/models/set.py:61
-#: manager/models/setting.py:111 nutrition/models/log.py:74
+#: manager/models/setting.py:114 nutrition/models/log.py:77
msgid "Comment"
msgstr "Comentario"
@@ -236,6 +236,12 @@ msgstr "Idioma - nombre corto"
msgid "Language full name"
msgstr "Idioma - nombre largo"
+#: core/models/language.py:45 core/templates/language/view.html:23
+#, fuzzy
+#| msgid "Language full name"
+msgid "Language full name in English"
+msgstr "Idioma - nombre largo"
+
#: core/models/license.py:29
msgid "Full name"
msgstr "Nombre completo"
@@ -252,7 +258,7 @@ msgstr ""
msgid "Short name, e.g. CC-BY-SA 3"
msgstr "Nombre corto, por ejemplo CC-BY-SA 3"
-#: core/models/license.py:45 nutrition/models/ingredient.py:214
+#: core/models/license.py:45 nutrition/models/ingredient.py:208
msgid "Link"
msgstr "Enlace"
@@ -372,7 +378,7 @@ msgstr ""
msgid "Age"
msgstr "Edad"
-#: core/models/profile.py:230 nutrition/forms.py:117
+#: core/models/profile.py:230 nutrition/forms.py:118
msgid "Height (cm)"
msgstr "Altura (cm)"
@@ -423,7 +429,7 @@ msgid "Total caloric intake, including e.g. any surplus"
msgstr "Ingesta total de calorías, incluyendo cualquier suplemento"
#: core/models/profile.py:333 nutrition/models/ingredient_weight_unit.py:45
-#: nutrition/models/log.py:93 nutrition/models/meal_item.py:58
+#: nutrition/models/log.py:96 nutrition/models/meal_item.py:59
msgid "Weight unit"
msgstr "Unidad de peso"
@@ -457,17 +463,16 @@ msgstr "La suma de todas las horas tiene que ser 24"
#: core/models/rep_unit.py:36 core/models/weight_unit.py:36
#: core/templates/user/overview.html:262 core/views/user.py:599
#: exercises/models/category.py:29 exercises/models/equipment.py:29
-#: exercises/models/exercise.py:58 exercises/models/muscle.py:36
+#: exercises/models/exercise.py:59 exercises/models/muscle.py:36
#: gym/models/contract.py:52 gym/models/contract.py:103 gym/models/gym.py:46
#: gym/models/user_document.py:84 gym/templates/contract/view.html:50
#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:96
#: gym/views/gym.py:158 manager/models/schedule.py:55
#: manager/models/workout.py:57 measurements/models/category.py:36
-#: nutrition/models/ingredient.py:125
+#: nutrition/models/ingredient.py:111
#: nutrition/models/ingredient_category.py:27 nutrition/models/meal.py:67
#: nutrition/models/weight_unit.py:38
-#: nutrition/templates/ingredient/pending.html:15
-#: nutrition/templates/ingredient/view.html:178
+#: nutrition/templates/ingredient/view.html:152
msgid "Name"
msgstr "Nombre"
@@ -576,24 +581,24 @@ msgstr ""
msgid "Dashboard"
msgstr "Escritorio"
-#: core/templates/language/overview.html:4 core/templates/navigation.html:335
+#: core/templates/language/overview.html:4 core/templates/navigation.html:345
msgid "Languages"
msgstr "Idiomas"
-#: core/templates/language/overview.html:20
+#: core/templates/language/overview.html:22
msgid "Nothing found."
msgstr "No se ha encontrado nada."
-#: core/templates/language/overview.html:20
+#: core/templates/language/overview.html:22
#: manager/templates/calendar/month.html:132
#: manager/templates/schedule/overview.html:28
-#: manager/templates/schedule/view.html:145
+#: manager/templates/schedule/view.html:144
#: manager/templates/workout/overview.html:28
#: nutrition/templates/ingredient/overview.html:38
msgid "Add one now."
msgstr "Añadir ahora."
-#: core/templates/language/overview.html:33 core/templates/license/list.html:40
+#: core/templates/language/overview.html:35 core/templates/license/list.html:40
#: core/templates/misc/license/list.html:43
#: core/templates/repetition_unit/list.html:43
#: core/templates/user/overview.html:326 core/templates/user/overview.html:365
@@ -613,13 +618,13 @@ msgstr "Añadir ahora."
msgid "Add"
msgstr "Añadir"
-#: core/templates/language/view.html:58 core/templates/user/api_key.html:44
+#: core/templates/language/view.html:61 core/templates/user/api_key.html:44
#: core/templates/user/preferences.html:45 gym/models/contract.py:203
#: gym/templates/contract/view.html:41 gym/templates/contract/view.html:106
#: gym/templates/gym/member_list.html:248
-#: manager/templates/schedule/view.html:286
-#: manager/templates/workout/view.html:165
-#: nutrition/templates/ingredient/view.html:228
+#: manager/templates/schedule/view.html:285
+#: manager/templates/workout/view.html:163
+#: nutrition/templates/ingredient/view.html:202
msgid "Options"
msgstr "Opciones"
@@ -644,12 +649,11 @@ msgstr "Listado de licencias"
#: gym/templates/gym/member_list.html:299
#: mailer/templates/mailer/gym/overview.html:30
#: manager/templates/calendar/day.html:87
-#: nutrition/templates/ingredient/pending.html:30
#: nutrition/templates/units/list.html:29
msgid "Nothing found"
msgstr "No se ha encontrado nada"
-#: core/templates/misc/about.html:4 core/templates/template.html:173
+#: core/templates/misc/about.html:4 core/templates/template.html:175
msgid "Imprint"
msgstr "Imprimir"
@@ -663,174 +667,169 @@ msgstr ""
" Creative Commons para los diferentes países, "
"agrégalas como entradas separadas aquí."
-#: core/templates/navigation.html:27 software/templates/features.html:437
+#: core/templates/navigation.html:28 software/templates/features.html:437
msgid "Training"
msgstr "Entrenamiento"
-#: core/templates/navigation.html:34 core/templates/user/overview.html:25
+#: core/templates/navigation.html:37 core/templates/user/overview.html:25
msgid "Workouts"
msgstr "Rutinas"
-#: core/templates/navigation.html:42
+#: core/templates/navigation.html:46
msgid "Workouts schedules"
msgstr "Programas"
-#: core/templates/navigation.html:50 core/templates/user/overview.html:70
+#: core/templates/navigation.html:54 core/templates/user/overview.html:70
#: manager/templates/calendar/month.html:10
#: manager/templates/calendar/month.html:21
msgid "Calendar"
msgstr "Calendario"
-#: core/templates/navigation.html:60
+#: core/templates/navigation.html:64
msgid "Measurements"
msgstr "Mediciones"
-#: core/templates/navigation.html:70 gallery/templates/images/overview.html:6
+#: core/templates/navigation.html:75 gallery/templates/images/overview.html:6
msgid "Gallery"
msgstr "Galería"
-#: core/templates/navigation.html:76
+#: core/templates/navigation.html:81
msgid "Workout templates"
msgstr "Plantillas de entrenamiento"
-#: core/templates/navigation.html:82 manager/views/workout.py:84
+#: core/templates/navigation.html:88 manager/views/workout.py:84
msgid "Your templates"
msgstr "Tus plantillas"
-#: core/templates/navigation.html:90 manager/views/workout.py:98
+#: core/templates/navigation.html:97 manager/views/workout.py:98
msgid "Public templates"
msgstr "Plantillas públicas"
-#: core/templates/navigation.html:97 manager/forms.py:129
-#: manager/models/setting.py:54 software/templates/features.html:51
+#: core/templates/navigation.html:105 manager/forms.py:129
+#: manager/models/setting.py:57 software/templates/features.html:51
#: software/templates/features.html:459
msgid "Exercises"
msgstr "Ejercicios"
-#: core/templates/navigation.html:103 core/templates/navigation.html:170
-#: core/templates/navigation.html:330
+#: core/templates/navigation.html:111 core/templates/navigation.html:184
+#: core/templates/navigation.html:340
msgid "Administration"
msgstr "Administración"
-#: core/templates/navigation.html:106
+#: core/templates/navigation.html:115
msgid "Exercise edit history"
msgstr "Historial de edición de ejercicios"
-#: core/templates/navigation.html:111 exercises/models/base.py:103
+#: core/templates/navigation.html:121 exercises/models/base.py:103
msgid "Equipment"
msgstr "Equipo"
-#: core/templates/navigation.html:116
+#: core/templates/navigation.html:127
msgid "Muscles"
msgstr "Músculos"
-#: core/templates/navigation.html:121
+#: core/templates/navigation.html:133
#: exercises/templates/categories/admin-overview.html:4
msgid "Categories"
msgstr "Categorias"
-#: core/templates/navigation.html:136 software/templates/features.html:447
+#: core/templates/navigation.html:148 software/templates/features.html:447
msgid "Nutrition"
msgstr "Nutrición"
-#: core/templates/navigation.html:143 core/templates/user/overview.html:144
+#: core/templates/navigation.html:156 core/templates/user/overview.html:144
msgid "Nutrition plans"
msgstr "Planes nutritionales"
-#: core/templates/navigation.html:151 nutrition/templates/bmi/form.html:50
+#: core/templates/navigation.html:165 nutrition/templates/bmi/form.html:50
msgid "BMI calculator"
msgstr "Calculadora de IMC"
-#: core/templates/navigation.html:159 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:174 nutrition/templates/rate/form.html:17
msgid "Daily calories calculator"
msgstr "Caluladora de calorias diarias"
-#: core/templates/navigation.html:165
+#: core/templates/navigation.html:179
#: nutrition/templates/ingredient/overview.html:10
msgid "Ingredient overview"
msgstr "Índice de ingredientes"
-#: core/templates/navigation.html:172 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:187 nutrition/templates/units/list.html:6
msgid "Ingredient weight units"
msgstr "Unidades de peso de los ingredientes"
-#: core/templates/navigation.html:177
-#: nutrition/templates/ingredient/pending.html:6
-msgid "Ingredients pending review"
-msgstr "Ingredientes esperando revisión"
-
-#: core/templates/navigation.html:193 software/templates/features.html:442
+#: core/templates/navigation.html:203 software/templates/features.html:442
msgid "Body weight"
msgstr "Peso corporal"
-#: core/templates/navigation.html:200 core/templates/user/overview.html:114
+#: core/templates/navigation.html:210 core/templates/user/overview.html:114
msgid "Weight overview"
msgstr "Índice de peso"
-#: core/templates/navigation.html:207 weight/views.py:65
+#: core/templates/navigation.html:217 weight/views.py:65
msgid "Add weight entry"
msgstr "Añadir entrada de peso"
-#: core/templates/navigation.html:221
+#: core/templates/navigation.html:231
msgid "About this software"
msgstr "Sobre este programa"
-#: core/templates/navigation.html:227 software/templates/about_us.html:5
+#: core/templates/navigation.html:237 software/templates/about_us.html:5
msgid "About us"
msgstr "Sobre nosotros"
-#: core/templates/navigation.html:233 software/templates/features.html:507
+#: core/templates/navigation.html:243 software/templates/features.html:507
msgid "REST API"
msgstr "REST API"
-#: core/templates/navigation.html:239 utils/models.py:45
+#: core/templates/navigation.html:249 utils/models.py:45
msgid "License"
msgstr "Licencia"
-#: core/templates/navigation.html:245
+#: core/templates/navigation.html:255
msgid "Developer documentation"
msgstr "Documentación para desarrolladores"
-#: core/templates/navigation.html:252
+#: core/templates/navigation.html:262
msgid "Get the code"
msgstr "Código fuente"
-#: core/templates/navigation.html:259 core/templates/template.html:212
+#: core/templates/navigation.html:269 core/templates/template.html:214
#: software/templates/features.html:582
msgid "Translate"
msgstr "Traduce"
-#: core/templates/navigation.html:293 core/templates/user/login.html:28
+#: core/templates/navigation.html:303 core/templates/user/login.html:28
msgid "Reset password"
msgstr "Restablecer la contraseña"
-#: core/templates/navigation.html:311
+#: core/templates/navigation.html:321
msgid "My preferences"
msgstr "Mis preferencias"
-#: core/templates/navigation.html:320
+#: core/templates/navigation.html:330
msgid "Logout"
msgstr "Cerrar sesión"
-#: core/templates/navigation.html:343
+#: core/templates/navigation.html:353
msgid "Licenses"
msgstr "Licencias"
-#: core/templates/navigation.html:351
+#: core/templates/navigation.html:361
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr "Unidades de repetición"
-#: core/templates/navigation.html:359 core/templates/weight_unit/list.html:4
-#: nutrition/templates/ingredient/view.html:167
+#: core/templates/navigation.html:369 core/templates/weight_unit/list.html:4
+#: nutrition/templates/ingredient/view.html:141
msgid "Weight units"
msgstr "Unidades de peso"
-#: core/templates/navigation.html:367 core/templates/user/list.html:4
+#: core/templates/navigation.html:377 core/templates/user/list.html:4
msgid "User list"
msgstr "Lista de usuarios"
-#: core/templates/navigation.html:373
+#: core/templates/navigation.html:383
msgid "Gyms"
msgstr "Gimnasios"
@@ -887,12 +886,12 @@ msgstr "¡Gracias por usar nuestra página!"
msgid "The %(site_name)s team"
msgstr "El equipo de %(site_name)s"
-#: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:11
+#: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:12
msgid "previous"
msgstr "anterior"
-#: core/templates/tags/pagination.html:31
-#: core/templates/tags/pagination.html:35
+#: core/templates/tags/pagination.html:33
+#: core/templates/tags/pagination.html:38
msgid "next"
msgstr "próximo"
@@ -917,36 +916,36 @@ msgid "Add exercises to this workout day"
msgstr "Añadir ejercicios a este dia"
#: core/templates/tags/render_weight_log.html:17 manager/helpers.py:86
-#: manager/models/setting.py:69 manager/templates/set/formset.html:9
+#: manager/models/setting.py:72 manager/templates/set/formset.html:9
msgid "Reps"
msgstr "Repeticiones"
#: core/templates/tags/render_weight_log.html:30 manager/forms.py:191
-#: manager/models/log.py:103 manager/models/setting.py:99
+#: manager/models/log.py:103 manager/models/setting.py:102
#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
msgid "RiR"
msgstr "ReR"
-#: core/templates/template.html:120 manager/templates/calendar/month.html:138
-#: manager/templates/schedule/view.html:249
-#: manager/templates/schedule/view.html:270
-#: manager/templates/workout/view.html:86
-#: manager/templates/workout/view.html:139
+#: core/templates/template.html:122 manager/templates/calendar/month.html:138
+#: manager/templates/schedule/view.html:248
+#: manager/templates/schedule/view.html:269
+#: manager/templates/workout/view.html:84
+#: manager/templates/workout/view.html:137
msgid "Close"
msgstr "Cerrar"
-#: core/templates/template.html:136
+#: core/templates/template.html:138
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:141
+#: core/templates/template.html:143
msgid "Create some demo entries"
msgstr "Crear datos de ejemplo"
-#: core/templates/template.html:178 software/templates/features.html:547
+#: core/templates/template.html:180 software/templates/features.html:547
#: software/templates/tos.html:7
msgid "Terms of service"
msgstr "Términos de servicio"
@@ -1047,7 +1046,7 @@ msgid "Overview"
msgstr "Resumen"
#: core/templates/user/overview.html:28
-#: manager/templates/schedule/view.html:164
+#: manager/templates/schedule/view.html:163
#: manager/templates/workout/overview.html:39 manager/views/schedule_step.py:60
msgid "Add workout"
msgstr "Añadir rutina"
@@ -1055,20 +1054,20 @@ msgstr "Añadir rutina"
#: core/templates/user/overview.html:34 core/templates/user/overview.html:76
#: core/templates/user/overview.html:120 core/templates/user/overview.html:152
#: exercises/models/base.py:118 exercises/models/base.py:124
-#: exercises/models/exercise.py:63 exercises/models/exercise.py:69
+#: exercises/models/exercise.py:64 exercises/models/exercise.py:70
#: exercises/models/image.py:107 exercises/models/image.py:113
#: exercises/models/video.py:163 exercises/models/video.py:169
#: gallery/models/image.py:42 manager/helpers.py:85 manager/models/log.py:100
#: manager/models/session.py:67 measurements/models/measurement.py:47
-#: nutrition/models/ingredient.py:101 nutrition/models/ingredient.py:107
-#: nutrition/models/ingredient.py:222 weight/models.py:33
+#: nutrition/models/ingredient.py:87 nutrition/models/ingredient.py:93
+#: nutrition/models/ingredient.py:216 weight/models.py:51
#: weight/templates/import_csv_preview.html:13
#: weight/templates/import_csv_preview.html:42 weight/views.py:144
msgid "Date"
msgstr "Fecha"
#: core/templates/user/overview.html:35 core/templates/user/overview.html:153
-#: exercises/models/exercise.py:51 gallery/models/image.py:65
+#: exercises/models/exercise.py:52 gallery/models/image.py:65
#: gym/models/contract.py:58 gym/models/contract.py:109
#: manager/models/day.py:37 manager/models/workout.py:63
#: measurements/models/measurement.py:62 nutrition/models/plan.py:67
@@ -1086,13 +1085,13 @@ msgstr "Última actividad"
#: core/templates/user/overview.html:58
#: manager/templates/calendar/month.html:128
-#: manager/templates/schedule/view.html:145
+#: manager/templates/schedule/view.html:144
#: manager/templates/workout/overview.html:28
msgid "No workouts found."
msgstr "No se han encontrado rutinas."
#: core/templates/user/overview.html:68 manager/forms.py:280
-#: manager/templates/workout/view.html:108
+#: manager/templates/workout/view.html:106
msgid "Log"
msgstr "Registro"
@@ -1116,35 +1115,35 @@ msgstr "Tiempo"
#: core/templates/user/overview.html:112 core/templates/user/overview.html:121
#: manager/forms.py:186 manager/helpers.py:86 manager/models/log.py:86
-#: manager/models/setting.py:79 manager/templates/log/add.html:54
-#: manager/templates/set/formset.html:11 weight/models.py:35
+#: manager/models/setting.py:82 manager/templates/log/add.html:54
+#: manager/templates/set/formset.html:11 weight/models.py:53
#: weight/templates/import_csv_preview.html:14
#: weight/templates/import_csv_preview.html:43 weight/views.py:144
msgid "Weight"
msgstr "Peso"
-#: core/templates/user/overview.html:154 nutrition/models/ingredient.py:130
-#: nutrition/templates/ingredient/view.html:77 nutrition/views/plan.py:237
+#: core/templates/user/overview.html:154 nutrition/models/ingredient.py:116
+#: nutrition/templates/ingredient/view.html:51 nutrition/views/plan.py:237
msgid "Energy"
msgstr "Energía"
-#: core/templates/user/overview.html:155 nutrition/models/ingredient.py:137
-#: nutrition/templates/ingredient/view.html:84 nutrition/views/plan.py:243
+#: core/templates/user/overview.html:155 nutrition/models/ingredient.py:123
+#: nutrition/templates/ingredient/view.html:58 nutrition/views/plan.py:243
msgid "Protein"
msgstr "Proteínas"
-#: core/templates/user/overview.html:156 nutrition/models/ingredient.py:145
-#: nutrition/templates/ingredient/view.html:90 nutrition/views/plan.py:251
+#: core/templates/user/overview.html:156 nutrition/models/ingredient.py:131
+#: nutrition/templates/ingredient/view.html:64 nutrition/views/plan.py:251
msgid "Carbohydrates"
msgstr "Hidratos de carbono"
-#: core/templates/user/overview.html:157 nutrition/models/ingredient.py:163
-#: nutrition/templates/ingredient/view.html:106 nutrition/views/plan.py:265
+#: core/templates/user/overview.html:157 nutrition/models/ingredient.py:149
+#: nutrition/templates/ingredient/view.html:80 nutrition/views/plan.py:265
msgid "Fat"
msgstr "Grasa"
#: core/templates/user/overview.html:170
-#: nutrition/templates/ingredient/view.html:79
+#: nutrition/templates/ingredient/view.html:53
msgid "kcal"
msgstr "kcal"
@@ -1156,7 +1155,7 @@ msgstr "kcal"
#: gym/templates/gym/member_list.html:207
#: gym/templates/gym/member_list.html:240
#: gym/templates/gym/member_list.html:277
-#: manager/templates/schedule/view.html:101
+#: manager/templates/schedule/view.html:100
msgid "Actions"
msgstr "Acciones"
@@ -1199,7 +1198,7 @@ msgid "Details"
msgstr "Detalles"
#: core/templates/user/overview.html:258 gym/views/export.py:57
-#: manager/helpers.py:86 manager/templates/schedule/view.html:99
+#: manager/helpers.py:86 manager/templates/schedule/view.html:98
msgid "Nr."
msgstr "Nr."
@@ -1244,7 +1243,7 @@ msgid "Documents"
msgstr "Documentos"
#: core/templates/user/overview.html:412 gym/templates/document/list.html:32
-#: manager/forms.py:292 manager/templates/workout/view.html:134
+#: manager/forms.py:292 manager/templates/workout/view.html:132
msgid "Download"
msgstr "Bajar"
@@ -1298,13 +1297,13 @@ msgid "kg"
msgstr "kg"
#: core/templatetags/wger_extras.py:207
-#: nutrition/templates/ingredient/view.html:86
-#: nutrition/templates/ingredient/view.html:92
-#: nutrition/templates/ingredient/view.html:99
-#: nutrition/templates/ingredient/view.html:108
-#: nutrition/templates/ingredient/view.html:115
-#: nutrition/templates/ingredient/view.html:137
-#: nutrition/templates/ingredient/view.html:147
+#: nutrition/templates/ingredient/view.html:60
+#: nutrition/templates/ingredient/view.html:66
+#: nutrition/templates/ingredient/view.html:73
+#: nutrition/templates/ingredient/view.html:82
+#: nutrition/templates/ingredient/view.html:89
+#: nutrition/templates/ingredient/view.html:111
+#: nutrition/templates/ingredient/view.html:121
msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr "g"
@@ -1322,7 +1321,7 @@ msgstr "oz"
#: exercises/views/equipment.py:103 exercises/views/exercises.py:73
#: exercises/views/muscles.py:99 manager/views/schedule.py:309
#: manager/views/schedule_step.py:128 manager/views/workout.py:249
-#: manager/views/workout_session.py:142 nutrition/views/ingredient.py:116
+#: manager/views/workout_session.py:142 nutrition/views/ingredient.py:119
#: nutrition/views/unit.py:110
msgid "Successfully deleted"
msgstr "Borrado con éxito"
@@ -1334,7 +1333,7 @@ msgstr "Borrado con éxito"
#: gym/views/admin_notes.py:196 gym/views/document.py:206 gym/views/gym.py:481
#: manager/views/schedule.py:316 manager/views/schedule_step.py:138
#: manager/views/workout.py:253 manager/views/workout_session.py:156
-#: nutrition/views/ingredient.py:123 nutrition/views/unit.py:117
+#: nutrition/views/ingredient.py:126 nutrition/views/unit.py:117
#, python-brace-format
msgid "Delete {0}?"
msgstr "¿Borrar {0}?"
@@ -1347,7 +1346,7 @@ msgstr "¿Borrar {0}?"
#: gym/views/contract.py:186 gym/views/contract_option.py:123
#: gym/views/contract_type.py:123 gym/views/document.py:171
#: gym/views/gym.py:463 manager/views/day.py:100 manager/views/schedule.py:333
-#: manager/views/workout.py:267 nutrition/views/ingredient.py:142
+#: manager/views/workout.py:267 nutrition/views/ingredient.py:145
#: nutrition/views/unit.py:143
#, python-brace-format
msgid "Edit {0}"
@@ -1421,7 +1420,7 @@ msgstr "Gimnasio"
msgid "A verification email was sent to %(email)s"
msgstr "Se envió un correo electrónico de verificación a %(email)s"
-#: exercises/models/base.py:82 nutrition/models/ingredient.py:236
+#: exercises/models/base.py:82 nutrition/models/ingredient.py:230
msgid "Category"
msgstr "Categoría"
@@ -1441,7 +1440,7 @@ msgstr "Variantes"
msgid "Exercise Categories"
msgstr "Categorías de ejercicios"
-#: exercises/models/comment.py:52 exercises/models/exercise_alias.py:52
+#: exercises/models/comment.py:52 exercises/models/exercise_alias.py:53
#: exercises/models/image.py:74 exercises/models/video.py:98
#: manager/forms.py:178 manager/helpers.py:86 manager/models/log.py:52
msgid "Exercise"
@@ -1451,12 +1450,12 @@ msgstr "Ejercicio"
msgid "A comment about how to correctly do this exercise."
msgstr "Comentario describiendo como hacer correctamente el ejercicio."
-#: exercises/models/exercise.py:76 nutrition/models/ingredient.py:95
+#: exercises/models/exercise.py:77 nutrition/models/ingredient.py:81
#: nutrition/models/weight_unit.py:32
msgid "Language"
msgstr "Idioma"
-#: exercises/models/exercise_alias.py:58
+#: exercises/models/exercise_alias.py:59
msgid "Alias for an exercise"
msgstr "Alias para un ejercicio"
@@ -1589,7 +1588,7 @@ msgstr "Acción"
#: manager/models/schedule.py:44 manager/models/session.py:49
#: manager/models/workout.py:89 measurements/models/category.py:31
#: measurements/models/measurement.py:42 nutrition/models/plan.py:54
-#: nutrition/templates/ingredient/pending.html:16 weight/models.py:42
+#: weight/models.py:60
msgid "User"
msgstr "Usuario"
@@ -1709,9 +1708,9 @@ msgid "Contract type"
msgstr "Tipo de contrato"
#: gym/models/contract.py:211 gym/templates/contract/view.html:59
-#: manager/templates/log/add.html:52 nutrition/forms.py:62
-#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:105
-#: nutrition/models/meal_item.py:72
+#: manager/templates/log/add.html:52 nutrition/forms.py:63
+#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:108
+#: nutrition/models/meal_item.py:73
msgid "Amount"
msgstr "Cantidad"
@@ -1728,7 +1727,7 @@ msgid "Contract is active"
msgstr "Contrato está activo"
#: gym/models/contract.py:237 gym/templates/contract/view.html:69
-#: manager/models/schedule.py:61 manager/templates/schedule/view.html:68
+#: manager/models/schedule.py:61 manager/templates/schedule/view.html:67
msgid "Start date"
msgstr "Fecha de comienzo"
@@ -2120,7 +2119,7 @@ msgstr "Generar vista previa"
#: mailer/templates/mailer/gym/form.html:28
#: mailer/templates/mailer/gym/preview.html:62
-#: manager/templates/workout/view.html:42
+#: manager/templates/workout/view.html:40
msgid "Steps"
msgstr "Pasos"
@@ -2144,7 +2143,7 @@ msgstr ""
"enviar los correos electrónicos"
#: mailer/templates/mailer/gym/preview.html:22
-#: software/templates/about_us.html:60
+#: software/templates/about_us.html:70
msgid "Current version"
msgstr "Versión actual"
@@ -2177,16 +2176,16 @@ msgstr ""
"Puedes buscar y seleccionar más de un ejercicio, se agruparán juntos para "
"una superserie."
-#: manager/forms.py:140 nutrition/forms.py:252
+#: manager/forms.py:140 nutrition/forms.py:253
msgid "Also search for names in English"
msgstr "Busque también los nombres en inglés"
#: manager/forms.py:168 manager/forms.py:173 manager/models/log.py:64
-#: manager/models/log.py:92 manager/models/setting.py:59
-#: manager/models/setting.py:90 manager/templates/log/add.html:53
+#: manager/models/log.py:92 manager/models/setting.py:62
+#: manager/models/setting.py:93 manager/templates/log/add.html:53
#: manager/templates/log/add.html:55 manager/templates/set/formset.html:10
#: manager/templates/set/formset.html:12 measurements/models/category.py:41
-#: nutrition/forms.py:66
+#: nutrition/forms.py:67
msgid "Unit"
msgstr "Unidad"
@@ -2194,15 +2193,15 @@ msgstr "Unidad"
msgid "Type"
msgstr "Tipo"
-#: manager/forms.py:280 manager/templates/workout/view.html:115
+#: manager/forms.py:280 manager/templates/workout/view.html:113
msgid "Table"
msgstr "Tabla"
-#: manager/forms.py:282 manager/templates/workout/view.html:121
+#: manager/forms.py:282 manager/templates/workout/view.html:119
msgid "with images"
msgstr "con imágenes"
-#: manager/forms.py:283 manager/templates/workout/view.html:127
+#: manager/forms.py:283 manager/templates/workout/view.html:125
msgid "with comments"
msgstr "con comentarios"
@@ -2211,11 +2210,10 @@ msgid "Workout will expire soon"
msgstr "Rutina expirará pronto"
#: manager/models/day.py:34 manager/models/log.py:58
-#: manager/models/session.py:60 manager/templates/schedule/view.html:103
-#: manager/templates/workout/view.html:11
-#: manager/templates/workout/view.html:19 manager/views/pdf.py:85
-#: manager/views/pdf.py:161 manager/views/schedule.py:151
-#: manager/views/schedule.py:221
+#: manager/models/session.py:60 manager/templates/schedule/view.html:102
+#: manager/templates/workout/view.html:9 manager/templates/workout/view.html:17
+#: manager/views/pdf.py:85 manager/views/pdf.py:161
+#: manager/views/schedule.py:151 manager/views/schedule.py:221
msgid "Workout"
msgstr "Rutina"
@@ -2235,7 +2233,7 @@ msgstr "Día"
msgid "Name or short description of the schedule. For example 'Program XYZ'."
msgstr "Nombre o descripción corta del programa. Por ejemplo 'Programa XYZ'."
-#: manager/models/schedule.py:65 manager/templates/schedule/view.html:72
+#: manager/models/schedule.py:65 manager/templates/schedule/view.html:71
msgid "Schedule active"
msgstr "Programa activo"
@@ -2248,7 +2246,7 @@ msgstr ""
"Activa si quieres marcar este programa como activo (será mostrado p.ej. en "
"tu panel de control). Otros programas se marcarán como inactivos"
-#: manager/models/schedule.py:77 manager/templates/schedule/view.html:82
+#: manager/models/schedule.py:77 manager/templates/schedule/view.html:81
msgid "Is a loop"
msgstr "Se repite"
@@ -2268,8 +2266,8 @@ msgid "The duration in weeks"
msgstr "La duración, en semanas"
#: manager/models/schedule_step.py:64 manager/models/set.py:53
-#: manager/models/setting.py:110 nutrition/models/meal.py:55
-#: nutrition/models/meal_item.py:65
+#: manager/models/setting.py:113 nutrition/models/meal.py:55
+#: nutrition/models/meal_item.py:66
msgid "Order"
msgstr "Orden"
@@ -2323,7 +2321,7 @@ msgstr "Día de ejercicio"
msgid "Number of sets"
msgstr "Número de series"
-#: manager/models/setting.py:48
+#: manager/models/setting.py:51
msgid "Sets"
msgstr "Series"
@@ -2400,7 +2398,7 @@ msgstr ""
msgid "Go to current month"
msgstr "Ir al mes actual"
-#: manager/templates/calendar/month.html:188
+#: manager/templates/calendar/month.html:190
msgid "Add new log"
msgstr "Agregar nuevo registro"
@@ -2440,8 +2438,8 @@ msgid "Your schedules"
msgstr "Tus programas"
#: manager/templates/schedule/overview.html:19
-#: manager/templates/schedule/view.html:132
-#: manager/templates/schedule/view.html:184
+#: manager/templates/schedule/view.html:131
+#: manager/templates/schedule/view.html:183
#: manager/templates/workout/overview.html:16
msgid "active"
msgstr "activo"
@@ -2487,30 +2485,30 @@ msgstr ""
msgid "Add schedule"
msgstr "Añadir programa"
-#: manager/templates/schedule/view.html:10
+#: manager/templates/schedule/view.html:9
msgid "Schedule"
msgstr "Calendario"
-#: manager/templates/schedule/view.html:86
+#: manager/templates/schedule/view.html:85
msgid ""
"This schedule is a loop and will go through the workouts above till you "
"deactivate it"
msgstr ""
"Este programa es un bucle y pasará por las rutinas hasta que lo desactives"
-#: manager/templates/schedule/view.html:104
+#: manager/templates/schedule/view.html:103
msgid "Weeks"
msgstr "Semanas"
-#: manager/templates/schedule/view.html:116
+#: manager/templates/schedule/view.html:115
msgid "Move me"
msgstr "Arrástrame"
-#: manager/templates/schedule/view.html:157
+#: manager/templates/schedule/view.html:156
msgid "Start schedule"
msgstr "Iniciar programa"
-#: manager/templates/schedule/view.html:188
+#: manager/templates/schedule/view.html:187
#, python-format
msgid ""
"%(weeks)s Week\n"
@@ -2525,11 +2523,11 @@ msgstr[1] ""
"%(weeks)s Semanas\n"
" "
-#: manager/templates/schedule/view.html:222
+#: manager/templates/schedule/view.html:221
msgid "Adding workouts"
msgstr "Añadir rutinas"
-#: manager/templates/schedule/view.html:224
+#: manager/templates/schedule/view.html:223
msgid ""
"Add as many workouts to the schedule as you want. You can\n"
" edit the order by dragging and dropping them. It's also possible "
@@ -2541,21 +2539,21 @@ msgstr ""
"añadir el mismo ejercicio más\n"
"de una vez."
-#: manager/templates/schedule/view.html:233
-#: manager/templates/schedule/view.html:244
-#: manager/templates/schedule/view.html:291
-#: manager/templates/workout/view.html:71
-#: manager/templates/workout/view.html:81
-#: manager/templates/workout/view.html:180
+#: manager/templates/schedule/view.html:232
+#: manager/templates/schedule/view.html:243
+#: manager/templates/schedule/view.html:290
+#: manager/templates/workout/view.html:69
+#: manager/templates/workout/view.html:79
+#: manager/templates/workout/view.html:178
msgid "Export calendar file"
msgstr "Exportar como archivo calendario"
-#: manager/templates/schedule/view.html:237
+#: manager/templates/schedule/view.html:236
msgid "Export this schedule as a calendar file."
msgstr "Expora este programa como archivo de calendario."
-#: manager/templates/schedule/view.html:238
-#: manager/templates/workout/view.html:76
+#: manager/templates/schedule/view.html:237
+#: manager/templates/workout/view.html:74
msgid ""
"You can then import the file it into your calendar\n"
" application for example google calendar, outlook or "
@@ -2567,18 +2565,18 @@ msgstr ""
"Google Calendar, Outlook o iCal. Esto creará una entrada para cada día\n"
"de entrenamiento con los respectivos ejercicios."
-#: manager/templates/schedule/view.html:259
-#: manager/templates/schedule/view.html:295
-#: manager/templates/workout/view.html:96
-#: manager/templates/workout/view.html:176
+#: manager/templates/schedule/view.html:258
+#: manager/templates/schedule/view.html:294
+#: manager/templates/workout/view.html:94
+#: manager/templates/workout/view.html:174
msgid "Download as PDF"
msgstr "Bajar como PDF"
-#: manager/templates/schedule/view.html:300
+#: manager/templates/schedule/view.html:299
msgid "Edit schedule"
msgstr "Editar programa"
-#: manager/templates/schedule/view.html:305
+#: manager/templates/schedule/view.html:304
msgid "Delete schedule"
msgstr "Borrar programa"
@@ -2719,12 +2717,12 @@ msgid "Mark as workout"
msgstr "Marcar como entrenamiento"
#: manager/templates/workout/template_view.html:65
-#: manager/templates/workout/view.html:51
+#: manager/templates/workout/view.html:49
msgid "Muscles trained"
msgstr "Músculos entrenados"
#: manager/templates/workout/template_view.html:68
-#: manager/templates/workout/view.html:54
+#: manager/templates/workout/view.html:52
msgid ""
"Images show combined muscles as trained by the exercises on the workout."
msgstr ""
@@ -2735,35 +2733,35 @@ msgstr ""
msgid "Use this template"
msgstr "Usar esta plantilla"
-#: manager/templates/workout/view.html:45
+#: manager/templates/workout/view.html:43
msgid "Add training days"
msgstr "Añadir días de entrenamiento"
-#: manager/templates/workout/view.html:46
+#: manager/templates/workout/view.html:44
msgid "Add workout sets to days"
msgstr "Añadir conjunto de rutinas a días"
-#: manager/templates/workout/view.html:47
+#: manager/templates/workout/view.html:45
msgid "Set the repetitions for each set"
msgstr "Pon las repeticiones para cada serie"
-#: manager/templates/workout/view.html:75
+#: manager/templates/workout/view.html:73
msgid "Export this workout as a calendar file."
msgstr "Exportar esta rutina como archivo de calendario."
-#: manager/templates/workout/view.html:146
+#: manager/templates/workout/view.html:144
msgid "Logs"
msgstr "Registro"
-#: manager/templates/workout/view.html:148
+#: manager/templates/workout/view.html:146
msgid "View logs"
msgstr "Ver registro de peso"
-#: manager/templates/workout/view.html:171 manager/views/schedule_step.py:99
+#: manager/templates/workout/view.html:169 manager/views/schedule_step.py:99
msgid "Edit workout"
msgstr "Editar rutina"
-#: manager/templates/workout/view.html:184 manager/views/workout.py:281
+#: manager/templates/workout/view.html:182 manager/views/workout.py:281
msgid "Mark as template"
msgstr "Marcar como plantilla"
@@ -2810,35 +2808,35 @@ msgstr "Esto también eliminará todos los registros de peso de este día."
msgid "Value"
msgstr "Valor"
-#: nutrition/forms.py:117
+#: nutrition/forms.py:118
msgid "Height (in)"
msgstr "Altura (pulgadas)"
-#: nutrition/forms.py:120
+#: nutrition/forms.py:121
msgid "Weight (kg)"
msgstr "Peso (kg)"
-#: nutrition/forms.py:120
+#: nutrition/forms.py:121
msgid "Weight (lbs)"
msgstr "Peso (libras)"
-#: nutrition/forms.py:133
+#: nutrition/forms.py:134
msgid "Calculate"
msgstr "Calcular"
-#: nutrition/forms.py:207 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:208 nutrition/templates/rate/form.html:76
msgid "Basic caloric intake"
msgstr "Ingesta básica de calorías"
-#: nutrition/forms.py:208
+#: nutrition/forms.py:209
msgid "Your basic caloric intake as calculated for your data"
msgstr "Tu ingesta básica de calorías calculadas en base a los datos"
-#: nutrition/forms.py:213
+#: nutrition/forms.py:214
msgid "Additional calories"
msgstr "Calorias adicionales"
-#: nutrition/forms.py:215
+#: nutrition/forms.py:216
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
@@ -2846,71 +2844,55 @@ msgstr ""
"Calorías adicionales para agregar a la tasa básica (para restar, introduce "
"un número negativo)"
-#: nutrition/forms.py:248 nutrition/models/ingredient_weight_unit.py:39
-#: nutrition/models/log.py:84 nutrition/models/meal_item.py:53
+#: nutrition/forms.py:249 nutrition/models/ingredient_weight_unit.py:39
+#: nutrition/models/log.py:87 nutrition/models/meal_item.py:54
msgid "Ingredient"
msgstr "Ingrediente"
-#: nutrition/models/ingredient.py:131
+#: nutrition/models/ingredient.py:117
msgid "In kcal per 100g"
msgstr "En kcal por 100g"
-#: nutrition/models/ingredient.py:138 nutrition/models/ingredient.py:146
-#: nutrition/models/ingredient.py:156 nutrition/models/ingredient.py:164
-#: nutrition/models/ingredient.py:174 nutrition/models/ingredient.py:184
-#: nutrition/models/ingredient.py:194
+#: nutrition/models/ingredient.py:124 nutrition/models/ingredient.py:132
+#: nutrition/models/ingredient.py:142 nutrition/models/ingredient.py:150
+#: nutrition/models/ingredient.py:160 nutrition/models/ingredient.py:170
+#: nutrition/models/ingredient.py:180
msgid "In g per 100g of product"
msgstr "En g por 100g de producto"
-#: nutrition/models/ingredient.py:155
-#: nutrition/templates/ingredient/view.html:96 nutrition/views/plan.py:259
+#: nutrition/models/ingredient.py:141
+#: nutrition/templates/ingredient/view.html:70 nutrition/views/plan.py:259
msgid "Sugar content in carbohydrates"
msgstr "Azúcar en los hidratos de carbono"
-#: nutrition/models/ingredient.py:173
-#: nutrition/templates/ingredient/view.html:112 nutrition/views/plan.py:273
+#: nutrition/models/ingredient.py:159
+#: nutrition/templates/ingredient/view.html:86 nutrition/views/plan.py:273
msgid "Saturated fat content in fats"
msgstr "Contenido de grasas saturadas en grasas"
-#: nutrition/models/ingredient.py:183
-#: nutrition/templates/ingredient/view.html:134 nutrition/views/plan.py:279
-msgid "Fibres"
-msgstr "Fibras"
+#: nutrition/models/ingredient.py:169
+#: nutrition/templates/ingredient/view.html:108 nutrition/views/plan.py:279
+msgid "Fiber"
+msgstr ""
-#: nutrition/models/ingredient.py:193
-#: nutrition/templates/ingredient/view.html:144 nutrition/views/plan.py:285
+#: nutrition/models/ingredient.py:179
+#: nutrition/templates/ingredient/view.html:118 nutrition/views/plan.py:285
msgid "Sodium"
msgstr "Sodio"
-#: nutrition/models/ingredient.py:215
+#: nutrition/models/ingredient.py:209
msgid "Link to product"
msgstr "Enlace al producto"
-#: nutrition/models/ingredient.py:244
+#: nutrition/models/ingredient.py:238
msgid "Brand name of product"
msgstr "Marca del producto"
-#: nutrition/models/ingredient.py:304
+#: nutrition/models/ingredient.py:305
#, python-brace-format
msgid "The total energy ({self.energy}kcal) is not the approximate sum of the "
msgstr "La energía total ({self.energy}kcal) no es la suma aproximada de las "
-#: nutrition/models/ingredient.py:383 nutrition/views/ingredient.py:196
-msgid "Ingredient was successfully added to the general database"
-msgstr "El ingrediente se ha añadido con éxito a la base de datos"
-
-#: nutrition/models/ingredient.py:408
-msgid "New user submitted ingredient"
-msgstr "Nuevo ingrediente enviado por un usuario"
-
-#: nutrition/models/ingredient.py:410
-#, python-brace-format
-msgid ""
-"The user {request.user.username} submitted a new ingredient \"{self.name}\"."
-msgstr ""
-"El usuario {request.user.username} ha enviado un nuevo ingrediente \"{self."
-"name}\"."
-
#: nutrition/models/ingredient_category.py:31
msgid "Ingredient Categories"
msgstr "Categoría de ingredientes"
@@ -2923,16 +2905,16 @@ msgstr "Cantidad en gramos"
msgid "Unit amount, e.g. \"1 Cup\" or \"1/2 spoon\""
msgstr "Unidad, p.ej. \"1 taza\" o \"1/2 cuchara\""
-#: nutrition/models/log.py:49 nutrition/models/meal.py:50
-#: nutrition/models/meal_item.py:47 nutrition/models/plan.py:106
+#: nutrition/models/log.py:52 nutrition/models/meal.py:50
+#: nutrition/models/meal_item.py:48 nutrition/models/plan.py:108
msgid "Nutrition plan"
msgstr "Plan nutricional"
-#: nutrition/models/log.py:58
+#: nutrition/models/log.py:61
msgid "Meal"
msgstr "Comida"
-#: nutrition/models/log.py:68
+#: nutrition/models/log.py:71
msgid "Date and Time (Approx.)"
msgstr "Fecha y Hora (aprox.)"
@@ -2955,11 +2937,11 @@ msgstr ""
"Una descripción o meta del plan, p.ej. \"Ganar masa\" o \"Prepararse para el "
"verano\""
-#: nutrition/models/plan.py:88
+#: nutrition/models/plan.py:90
msgid "Use daily calories"
msgstr "Usar calorías diarias"
-#: nutrition/models/plan.py:91
+#: nutrition/models/plan.py:93
msgid ""
"Tick the box if you want to mark this plan as having a goal amount of "
"calories. You can use the calculator or enter the value yourself."
@@ -3082,67 +3064,36 @@ msgstr "Buscar"
msgid "Add ingredient"
msgstr "Añadir ingrediente"
-#: nutrition/templates/ingredient/pending.html:14
-msgid "Submission date"
-msgstr "Fecha de sumisión"
-
-#: nutrition/templates/ingredient/view.html:27
-msgid "Ingredient is pending review"
-msgstr "Ingrediente pendiente de revisión"
-
-#: nutrition/templates/ingredient/view.html:28
-msgid ""
-"This user submitted ingredient is pending a decision to be\n"
-"included in the database. Till then, it will not be shown in the overview "
-"or\n"
-"the search."
-msgstr ""
-"Este ingrediente enviado por un usuario esta pendiente de una decisión\n"
-"de ser incluido en la base de datos. Hasta entonces no se mostrará en el\n"
-"índice o la búsqueda."
-
-#: nutrition/templates/ingredient/view.html:31
-msgid "Please select one of the options below."
-msgstr "Por favor, selecciona una de las opciones de abajo."
-
-#: nutrition/templates/ingredient/view.html:38
-msgid "Accept"
-msgstr "Aceptar"
-
-#: nutrition/templates/ingredient/view.html:42
-msgid "Decline"
-msgstr "Rechazar"
-
-#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:229
+#: nutrition/templates/ingredient/view.html:45 nutrition/views/plan.py:229
msgid "Macronutrients"
msgstr "Macronutrientes"
-#: nutrition/templates/ingredient/view.html:80
+#: nutrition/templates/ingredient/view.html:54
msgid "kJ"
msgstr "kJ"
-#: nutrition/templates/ingredient/view.html:101
-#: nutrition/templates/ingredient/view.html:117
-#: nutrition/templates/ingredient/view.html:139
-#: nutrition/templates/ingredient/view.html:149
+#: nutrition/templates/ingredient/view.html:75
+#: nutrition/templates/ingredient/view.html:91
+#: nutrition/templates/ingredient/view.html:113
+#: nutrition/templates/ingredient/view.html:123
msgid "n.A."
msgstr "n.d."
-#: nutrition/templates/ingredient/view.html:128
+#: nutrition/templates/ingredient/view.html:102
msgid "Others"
msgstr "Otros"
-#: nutrition/templates/ingredient/view.html:170
+#: nutrition/templates/ingredient/view.html:144
#: nutrition/templates/units/list.html:46 nutrition/views/unit.py:86
msgid "Add new weight unit"
msgstr "Añadir nueva unidad de peso"
-#: nutrition/templates/ingredient/view.html:232
-#: nutrition/templates/ingredient/view.html:235
+#: nutrition/templates/ingredient/view.html:206
+#: nutrition/templates/ingredient/view.html:209
msgid "Edit ingredient"
msgstr "Editar ingrediente"
-#: nutrition/templates/ingredient/view.html:239
+#: nutrition/templates/ingredient/view.html:213
msgid "Delete ingredient"
msgstr "Borrar ingrediente"
@@ -3242,14 +3193,10 @@ msgstr "140 a 230"
msgid "56 to 90"
msgstr "56 a 90"
-#: nutrition/views/ingredient.py:154
+#: nutrition/views/ingredient.py:157
msgid "Add a new ingredient"
msgstr "Añadir nuevo ingrediente"
-#: nutrition/views/ingredient.py:209
-msgid "Ingredient was successfully marked as rejected"
-msgstr "El ingrediente se ha marcado como rechazado con éxito"
-
#: nutrition/views/plan.py:120
msgid "Nutritional plan"
msgstr "Plan nutricional"
@@ -3296,18 +3243,10 @@ msgstr ""
"hecho por entusiastas del fitness de todo el mundo."
#: software/templates/about_us.html:18
-msgid "Source code"
-msgstr "Código fuente"
-
-#: software/templates/about_us.html:20
-msgid "Get the source code of this application and its server on github"
-msgstr "Consigue el código fuente de esta aplicación y su servidor en GitHub"
-
-#: software/templates/about_us.html:25
msgid "Have a problem or idea?"
msgstr "¿Tiene un problema o una idea?"
-#: software/templates/about_us.html:27
+#: software/templates/about_us.html:20
msgid ""
"Get in touch if something didn't behave as expected or if there is a feature "
"that you feel is missing."
@@ -3315,21 +3254,29 @@ msgstr ""
"Ponte en contacto con nosotros si algo no funciona como esperabas o si hay "
"una función que crees que falta."
-#: software/templates/about_us.html:32
+#: software/templates/about_us.html:26
msgid "Say hi!"
msgstr "¡Saluda!"
-#: software/templates/about_us.html:34
+#: software/templates/about_us.html:28
msgid "If you want to chat with us, hop on the Discord server and get in touch"
msgstr ""
"Si quieres charlar con nosotros, entra en el servidor de Discord y mantente "
"en contacto"
-#: software/templates/about_us.html:39 software/templates/features.html:503
+#: software/templates/about_us.html:33
+msgid "Mastodon"
+msgstr ""
+
+#: software/templates/about_us.html:35
+msgid "Follow us on mastodon for updates and news about the project"
+msgstr ""
+
+#: software/templates/about_us.html:40 software/templates/features.html:503
msgid "Translation"
msgstr "Traducción"
-#: software/templates/about_us.html:41
+#: software/templates/about_us.html:42
msgid ""
"This application is translated on weblate. If you also want to help, click "
"the link and start translating"
@@ -3337,15 +3284,30 @@ msgstr ""
"Esta aplicación se traduce en weblate. Si tú también quieres ayudar, haz "
"clic en el enlace y comienza a traducir"
-#: software/templates/about_us.html:50
+#: software/templates/about_us.html:47
+msgid "Source code"
+msgstr "Código fuente"
+
+#: software/templates/about_us.html:49
+msgid "Get the source code of this application and its server on github"
+msgstr "Consigue el código fuente de esta aplicación y su servidor en GitHub"
+
+#: software/templates/about_us.html:59
msgid "Our goal"
msgstr "Nuestro objetivo"
-#: software/templates/about_us.html:53
+#: software/templates/about_us.html:62
+#, fuzzy
+#| msgid ""
+#| "The goal is to build an awesome\n"
+#| " and flexible fitness manager, along with a comprehensive "
+#| "and complete list of exercises and\n"
+#| " ingredients, all released under a free license."
msgid ""
"The goal is to build an awesome\n"
" and flexible fitness manager, along with a comprehensive and "
-"complete list of exercises and\n"
+"complete list of\n"
+" exercises and\n"
" ingredients, all released under a free license."
msgstr ""
"El objetivo es crear un administrador de rutinas flexible y eficiente, "
@@ -3362,10 +3324,6 @@ msgstr ""
"wger Workout Manager es una aplicación web gratuita y de código abierto que "
"gestiona tus ejercicios y entrenamientos."
-#: software/templates/features.html:45
-msgid "About"
-msgstr "Aviso legal"
-
#: software/templates/features.html:57
msgid "Mobile app"
msgstr "Aplicación Móvil"
@@ -3622,18 +3580,6 @@ msgstr ""
"obra anterior, sino que además contiene suficiente contenido nuevo y "
"creativo como para tener derecho a sus propios derechos de autor."
-#: utils/models.py:130
-msgid "Pending"
-msgstr "Pendiente"
-
-#: utils/models.py:131
-msgid "Accepted"
-msgstr "Aceptado"
-
-#: utils/models.py:132
-msgid "Declined"
-msgstr "Rechazado"
-
#: weight/forms.py:54
msgid "Input"
msgstr "Entrada"
@@ -3646,7 +3592,7 @@ msgstr "Formato de fecha"
msgid "You have to enter your weight"
msgstr "Tienes que introducir su peso"
-#: weight/models.py:60
+#: weight/models.py:78
msgid "Weight entry"
msgstr "Entrada de peso"
@@ -3788,6 +3734,66 @@ msgstr "Borrado con éxito."
msgid "Delete weight entry for the %s"
msgstr "Eliminar la entrada de peso para el %s"
+#~ msgid "Ingredients pending review"
+#~ msgstr "Ingredientes esperando revisión"
+
+#~ msgid "Fibres"
+#~ msgstr "Fibras"
+
+#~ msgid "Ingredient was successfully added to the general database"
+#~ msgstr "El ingrediente se ha añadido con éxito a la base de datos"
+
+#~ msgid "New user submitted ingredient"
+#~ msgstr "Nuevo ingrediente enviado por un usuario"
+
+#, python-brace-format
+#~ msgid ""
+#~ "The user {request.user.username} submitted a new ingredient \"{self."
+#~ "name}\"."
+#~ msgstr ""
+#~ "El usuario {request.user.username} ha enviado un nuevo ingrediente "
+#~ "\"{self.name}\"."
+
+#~ msgid "Submission date"
+#~ msgstr "Fecha de sumisión"
+
+#~ msgid "Ingredient is pending review"
+#~ msgstr "Ingrediente pendiente de revisión"
+
+#~ msgid ""
+#~ "This user submitted ingredient is pending a decision to be\n"
+#~ "included in the database. Till then, it will not be shown in the overview "
+#~ "or\n"
+#~ "the search."
+#~ msgstr ""
+#~ "Este ingrediente enviado por un usuario esta pendiente de una decisión\n"
+#~ "de ser incluido en la base de datos. Hasta entonces no se mostrará en el\n"
+#~ "índice o la búsqueda."
+
+#~ msgid "Please select one of the options below."
+#~ msgstr "Por favor, selecciona una de las opciones de abajo."
+
+#~ msgid "Accept"
+#~ msgstr "Aceptar"
+
+#~ msgid "Decline"
+#~ msgstr "Rechazar"
+
+#~ msgid "Ingredient was successfully marked as rejected"
+#~ msgstr "El ingrediente se ha marcado como rechazado con éxito"
+
+#~ msgid "About"
+#~ msgstr "Aviso legal"
+
+#~ msgid "Pending"
+#~ msgstr "Pendiente"
+
+#~ msgid "Accepted"
+#~ msgstr "Aceptado"
+
+#~ msgid "Declined"
+#~ msgstr "Rechazado"
+
#~ msgid "Share"
#~ msgstr "Comparte"
diff --git a/wger/locale/fa/LC_MESSAGES/django.po b/wger/locale/fa/LC_MESSAGES/django.po
index d26d5ff68..3a8153e90 100644
--- a/wger/locale/fa/LC_MESSAGES/django.po
+++ b/wger/locale/fa/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: wger Workout Manager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-02-02 12:42+0100\n"
+"POT-Creation-Date: 2024-07-14 15:49+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"
@@ -32,7 +32,7 @@ msgstr ""
"کاربران جدید و کاربران قدیدمی که باشگاه پیش فرض ندارند به این باشگاه اضافه "
"میشوند."
-#: config/views/gym_config.py:42 core/templates/language/view.html:63
+#: config/views/gym_config.py:42 core/templates/language/view.html:67
#: core/templates/license/list.html:17 core/templates/misc/license/list.html:18
#: core/templates/repetition_unit/list.html:18
#: core/templates/tags/render_day.html:39
@@ -52,8 +52,8 @@ msgstr ""
#: manager/templates/calendar/day.html:68
#: manager/templates/calendar/month.html:85
#: manager/templates/calendar/partial_overview_table.html:18
-#: manager/templates/schedule/view.html:119
-#: nutrition/templates/ingredient/view.html:191
+#: manager/templates/schedule/view.html:118
+#: nutrition/templates/ingredient/view.html:165
#: nutrition/templates/units/list.html:19
msgid "Edit"
msgstr "ویرایش"
@@ -89,8 +89,8 @@ msgstr "برنامه تمرینی جالب من"
msgid "Empty placeholder schedule"
msgstr "برنامه خالی"
-#: core/forms.py:69 core/templates/navigation.html:275
-#: core/templates/navigation.html:281 core/templates/user/login.html:4
+#: core/forms.py:69 core/templates/navigation.html:285
+#: core/templates/navigation.html:291 core/templates/user/login.html:4
#: software/templates/features.html:82 software/templates/features.html:427
msgid "Login"
msgstr "ورود"
@@ -163,7 +163,7 @@ msgstr "پسورد"
msgid "Please enter your current password."
msgstr "لطفا رمز عبور فعلی خود را وارد کنید."
-#: core/forms.py:242 core/templates/language/view.html:68
+#: core/forms.py:242 core/templates/language/view.html:73
#: core/templates/license/list.html:19 core/templates/misc/license/list.html:22
#: core/templates/repetition_unit/list.html:20
#: core/templates/tags/render_day.html:45
@@ -178,10 +178,10 @@ msgstr "لطفا رمز عبور فعلی خود را وارد کنید."
#: gym/templates/gym/list.html:22 manager/templates/calendar/day.html:73
#: manager/templates/calendar/month.html:89
#: manager/templates/calendar/partial_overview_table.html:23
-#: manager/templates/schedule/view.html:123
-#: manager/templates/workout/view.html:190
-#: nutrition/templates/ingredient/view.html:192
-#: nutrition/templates/ingredient/view.html:241
+#: manager/templates/schedule/view.html:122
+#: manager/templates/workout/view.html:188
+#: nutrition/templates/ingredient/view.html:166
+#: nutrition/templates/ingredient/view.html:215
#: nutrition/templates/units/list.html:22
msgid "Delete"
msgstr "حذف"
@@ -194,14 +194,14 @@ msgstr "رمز نامعتبر"
msgid "The form is secured with reCAPTCHA"
msgstr "این فرم با ریکپچا امن شده است"
-#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:275
-#: core/templates/navigation.html:287 core/templates/template.html:147
+#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:285
+#: core/templates/navigation.html:297 core/templates/template.html:149
#: core/templates/user/login.html:20 core/views/user.py:298
#: software/templates/features.html:87 software/templates/features.html:422
msgid "Register"
msgstr "ثبت"
-#: core/forms.py:315
+#: core/forms.py:315 software/templates/features.html:45
msgid "Contact"
msgstr "ارتباط"
@@ -210,7 +210,7 @@ msgid "Some way of answering you (e-mail, etc.)"
msgstr "راه های ارتباطی با شما(ایمیل و ... )"
#: core/forms.py:324 exercises/models/comment.py:58 manager/models/set.py:61
-#: manager/models/setting.py:111 nutrition/models/log.py:74
+#: manager/models/setting.py:114 nutrition/models/log.py:77
msgid "Comment"
msgstr "نظر"
@@ -230,6 +230,12 @@ msgstr "نام مخفف زبان "
msgid "Language full name"
msgstr "نام زبان"
+#: core/models/language.py:45 core/templates/language/view.html:23
+#, fuzzy
+#| msgid "Language full name"
+msgid "Language full name in English"
+msgstr "نام زبان"
+
#: core/models/license.py:29
msgid "Full name"
msgstr "نام و نام خانوادگی"
@@ -247,7 +253,7 @@ msgstr ""
msgid "Short name, e.g. CC-BY-SA 3"
msgstr "مخفف نام شما، e.g. CC-BY-SA 3"
-#: core/models/license.py:45 nutrition/models/ingredient.py:214
+#: core/models/license.py:45 nutrition/models/ingredient.py:208
msgid "Link"
msgstr "پیوند"
@@ -362,7 +368,7 @@ msgstr ""
msgid "Age"
msgstr "سن"
-#: core/models/profile.py:230 nutrition/forms.py:117
+#: core/models/profile.py:230 nutrition/forms.py:118
msgid "Height (cm)"
msgstr "قد (سانتی متر)"
@@ -413,7 +419,7 @@ msgid "Total caloric intake, including e.g. any surplus"
msgstr "مصرف کل کالری"
#: core/models/profile.py:333 nutrition/models/ingredient_weight_unit.py:45
-#: nutrition/models/log.py:93 nutrition/models/meal_item.py:58
+#: nutrition/models/log.py:96 nutrition/models/meal_item.py:59
msgid "Weight unit"
msgstr "واحد وزن"
@@ -446,17 +452,16 @@ msgstr "مجموع تمام ساعت ها باید 24 باشد"
#: core/models/rep_unit.py:36 core/models/weight_unit.py:36
#: core/templates/user/overview.html:262 core/views/user.py:599
#: exercises/models/category.py:29 exercises/models/equipment.py:29
-#: exercises/models/exercise.py:58 exercises/models/muscle.py:36
+#: exercises/models/exercise.py:59 exercises/models/muscle.py:36
#: gym/models/contract.py:52 gym/models/contract.py:103 gym/models/gym.py:46
#: gym/models/user_document.py:84 gym/templates/contract/view.html:50
#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:96
#: gym/views/gym.py:158 manager/models/schedule.py:55
#: manager/models/workout.py:57 measurements/models/category.py:36
-#: nutrition/models/ingredient.py:125
+#: nutrition/models/ingredient.py:111
#: nutrition/models/ingredient_category.py:27 nutrition/models/meal.py:67
#: nutrition/models/weight_unit.py:38
-#: nutrition/templates/ingredient/pending.html:15
-#: nutrition/templates/ingredient/view.html:178
+#: nutrition/templates/ingredient/view.html:152
msgid "Name"
msgstr "نام"
@@ -559,24 +564,24 @@ msgstr ""
msgid "Dashboard"
msgstr "داشبورد"
-#: core/templates/language/overview.html:4 core/templates/navigation.html:335
+#: core/templates/language/overview.html:4 core/templates/navigation.html:345
msgid "Languages"
msgstr "زبان ها"
-#: core/templates/language/overview.html:20
+#: core/templates/language/overview.html:22
msgid "Nothing found."
msgstr "چیزی یافت نشد!"
-#: core/templates/language/overview.html:20
+#: core/templates/language/overview.html:22
#: manager/templates/calendar/month.html:132
#: manager/templates/schedule/overview.html:28
-#: manager/templates/schedule/view.html:145
+#: manager/templates/schedule/view.html:144
#: manager/templates/workout/overview.html:28
#: nutrition/templates/ingredient/overview.html:38
msgid "Add one now."
msgstr "اضافه کن"
-#: core/templates/language/overview.html:33 core/templates/license/list.html:40
+#: core/templates/language/overview.html:35 core/templates/license/list.html:40
#: core/templates/misc/license/list.html:43
#: core/templates/repetition_unit/list.html:43
#: core/templates/user/overview.html:326 core/templates/user/overview.html:365
@@ -596,13 +601,13 @@ msgstr "اضافه کن"
msgid "Add"
msgstr "اضافه کردن"
-#: core/templates/language/view.html:58 core/templates/user/api_key.html:44
+#: core/templates/language/view.html:61 core/templates/user/api_key.html:44
#: core/templates/user/preferences.html:45 gym/models/contract.py:203
#: gym/templates/contract/view.html:41 gym/templates/contract/view.html:106
#: gym/templates/gym/member_list.html:248
-#: manager/templates/schedule/view.html:286
-#: manager/templates/workout/view.html:165
-#: nutrition/templates/ingredient/view.html:228
+#: manager/templates/schedule/view.html:285
+#: manager/templates/workout/view.html:163
+#: nutrition/templates/ingredient/view.html:202
msgid "Options"
msgstr "امکانات"
@@ -627,12 +632,11 @@ msgstr "لیست مجوز ها"
#: gym/templates/gym/member_list.html:299
#: mailer/templates/mailer/gym/overview.html:30
#: manager/templates/calendar/day.html:87
-#: nutrition/templates/ingredient/pending.html:30
#: nutrition/templates/units/list.html:29
msgid "Nothing found"
msgstr "چیزی یافت نشد"
-#: core/templates/misc/about.html:4 core/templates/template.html:173
+#: core/templates/misc/about.html:4 core/templates/template.html:175
msgid "Imprint"
msgstr ""
@@ -646,178 +650,173 @@ msgstr ""
"اگریک مجوز محلی شده باشد , به عنوان مثال مجوزهای عوام خلاق برای کشورهای "
"مختلف ,ان ها را در اینجا به عنوان ورودی ها جدا اضافه کنید"
-#: core/templates/navigation.html:27 software/templates/features.html:437
+#: core/templates/navigation.html:28 software/templates/features.html:437
msgid "Training"
msgstr ""
-#: core/templates/navigation.html:34 core/templates/user/overview.html:25
+#: core/templates/navigation.html:37 core/templates/user/overview.html:25
msgid "Workouts"
msgstr "تمرینات"
-#: core/templates/navigation.html:42
+#: core/templates/navigation.html:46
msgid "Workouts schedules"
msgstr "برنامه تمرین"
-#: core/templates/navigation.html:50 core/templates/user/overview.html:70
+#: core/templates/navigation.html:54 core/templates/user/overview.html:70
#: manager/templates/calendar/month.html:10
#: manager/templates/calendar/month.html:21
msgid "Calendar"
msgstr "ماشین حساب"
-#: core/templates/navigation.html:60
+#: core/templates/navigation.html:64
msgid "Measurements"
msgstr ""
-#: core/templates/navigation.html:70 gallery/templates/images/overview.html:6
+#: core/templates/navigation.html:75 gallery/templates/images/overview.html:6
msgid "Gallery"
msgstr ""
-#: core/templates/navigation.html:76
+#: core/templates/navigation.html:81
#, fuzzy
#| msgid "Workouts schedules"
msgid "Workout templates"
msgstr "برنامه تمرین"
-#: core/templates/navigation.html:82 manager/views/workout.py:84
+#: core/templates/navigation.html:88 manager/views/workout.py:84
msgid "Your templates"
msgstr ""
-#: core/templates/navigation.html:90 manager/views/workout.py:98
+#: core/templates/navigation.html:97 manager/views/workout.py:98
msgid "Public templates"
msgstr ""
-#: core/templates/navigation.html:97 manager/forms.py:129
-#: manager/models/setting.py:54 software/templates/features.html:51
+#: core/templates/navigation.html:105 manager/forms.py:129
+#: manager/models/setting.py:57 software/templates/features.html:51
#: software/templates/features.html:459
msgid "Exercises"
msgstr "تمرینات"
-#: core/templates/navigation.html:103 core/templates/navigation.html:170
-#: core/templates/navigation.html:330
+#: core/templates/navigation.html:111 core/templates/navigation.html:184
+#: core/templates/navigation.html:340
msgid "Administration"
msgstr ""
-#: core/templates/navigation.html:106
+#: core/templates/navigation.html:115
#, fuzzy
#| msgid "Exercises"
msgid "Exercise edit history"
msgstr "تمرینات"
-#: core/templates/navigation.html:111 exercises/models/base.py:103
+#: core/templates/navigation.html:121 exercises/models/base.py:103
msgid "Equipment"
msgstr ""
-#: core/templates/navigation.html:116
+#: core/templates/navigation.html:127
msgid "Muscles"
msgstr ""
-#: core/templates/navigation.html:121
+#: core/templates/navigation.html:133
#: exercises/templates/categories/admin-overview.html:4
msgid "Categories"
msgstr ""
-#: core/templates/navigation.html:136 software/templates/features.html:447
+#: core/templates/navigation.html:148 software/templates/features.html:447
msgid "Nutrition"
msgstr "مواد غذایی"
-#: core/templates/navigation.html:143 core/templates/user/overview.html:144
+#: core/templates/navigation.html:156 core/templates/user/overview.html:144
msgid "Nutrition plans"
msgstr ""
-#: core/templates/navigation.html:151 nutrition/templates/bmi/form.html:50
+#: core/templates/navigation.html:165 nutrition/templates/bmi/form.html:50
msgid "BMI calculator"
msgstr ""
-#: core/templates/navigation.html:159 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:174 nutrition/templates/rate/form.html:17
msgid "Daily calories calculator"
msgstr ""
-#: core/templates/navigation.html:165
+#: core/templates/navigation.html:179
#: nutrition/templates/ingredient/overview.html:10
msgid "Ingredient overview"
msgstr ""
-#: core/templates/navigation.html:172 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:187 nutrition/templates/units/list.html:6
msgid "Ingredient weight units"
msgstr ""
-#: core/templates/navigation.html:177
-#: nutrition/templates/ingredient/pending.html:6
-msgid "Ingredients pending review"
-msgstr ""
-
-#: core/templates/navigation.html:193 software/templates/features.html:442
+#: core/templates/navigation.html:203 software/templates/features.html:442
msgid "Body weight"
msgstr ""
-#: core/templates/navigation.html:200 core/templates/user/overview.html:114
+#: core/templates/navigation.html:210 core/templates/user/overview.html:114
msgid "Weight overview"
msgstr "بازنگری وزن "
-#: core/templates/navigation.html:207 weight/views.py:65
+#: core/templates/navigation.html:217 weight/views.py:65
msgid "Add weight entry"
msgstr "وزن را وارد کنید"
-#: core/templates/navigation.html:221
+#: core/templates/navigation.html:231
msgid "About this software"
msgstr ""
-#: core/templates/navigation.html:227 software/templates/about_us.html:5
+#: core/templates/navigation.html:237 software/templates/about_us.html:5
msgid "About us"
msgstr "درباره ما"
-#: core/templates/navigation.html:233 software/templates/features.html:507
+#: core/templates/navigation.html:243 software/templates/features.html:507
msgid "REST API"
msgstr ""
-#: core/templates/navigation.html:239 utils/models.py:45
+#: core/templates/navigation.html:249 utils/models.py:45
msgid "License"
msgstr ""
-#: core/templates/navigation.html:245
+#: core/templates/navigation.html:255
msgid "Developer documentation"
msgstr ""
-#: core/templates/navigation.html:252
+#: core/templates/navigation.html:262
msgid "Get the code"
msgstr ""
-#: core/templates/navigation.html:259 core/templates/template.html:212
+#: core/templates/navigation.html:269 core/templates/template.html:214
#: software/templates/features.html:582
msgid "Translate"
msgstr ""
-#: core/templates/navigation.html:293 core/templates/user/login.html:28
+#: core/templates/navigation.html:303 core/templates/user/login.html:28
msgid "Reset password"
msgstr ""
-#: core/templates/navigation.html:311
+#: core/templates/navigation.html:321
msgid "My preferences"
msgstr ""
-#: core/templates/navigation.html:320
+#: core/templates/navigation.html:330
msgid "Logout"
msgstr ""
-#: core/templates/navigation.html:343
+#: core/templates/navigation.html:353
msgid "Licenses"
msgstr ""
-#: core/templates/navigation.html:351
+#: core/templates/navigation.html:361
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr ""
-#: core/templates/navigation.html:359 core/templates/weight_unit/list.html:4
-#: nutrition/templates/ingredient/view.html:167
+#: core/templates/navigation.html:369 core/templates/weight_unit/list.html:4
+#: nutrition/templates/ingredient/view.html:141
msgid "Weight units"
msgstr ""
-#: core/templates/navigation.html:367 core/templates/user/list.html:4
+#: core/templates/navigation.html:377 core/templates/user/list.html:4
msgid "User list"
msgstr ""
-#: core/templates/navigation.html:373
+#: core/templates/navigation.html:383
msgid "Gyms"
msgstr ""
@@ -869,12 +868,12 @@ msgstr "از شما برای استفاده از این سایت ممنونیم!
msgid "The %(site_name)s team"
msgstr "تیم %(site_name)s "
-#: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:11
+#: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:12
msgid "previous"
msgstr ""
-#: core/templates/tags/pagination.html:31
-#: core/templates/tags/pagination.html:35
+#: core/templates/tags/pagination.html:33
+#: core/templates/tags/pagination.html:38
msgid "next"
msgstr ""
@@ -899,34 +898,34 @@ msgid "Add exercises to this workout day"
msgstr ""
#: core/templates/tags/render_weight_log.html:17 manager/helpers.py:86
-#: manager/models/setting.py:69 manager/templates/set/formset.html:9
+#: manager/models/setting.py:72 manager/templates/set/formset.html:9
msgid "Reps"
msgstr ""
#: core/templates/tags/render_weight_log.html:30 manager/forms.py:191
-#: manager/models/log.py:103 manager/models/setting.py:99
+#: manager/models/log.py:103 manager/models/setting.py:102
#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
msgid "RiR"
msgstr ""
-#: core/templates/template.html:120 manager/templates/calendar/month.html:138
-#: manager/templates/schedule/view.html:249
-#: manager/templates/schedule/view.html:270
-#: manager/templates/workout/view.html:86
-#: manager/templates/workout/view.html:139
+#: core/templates/template.html:122 manager/templates/calendar/month.html:138
+#: manager/templates/schedule/view.html:248
+#: manager/templates/schedule/view.html:269
+#: manager/templates/workout/view.html:84
+#: manager/templates/workout/view.html:137
msgid "Close"
msgstr "بستن"
-#: core/templates/template.html:136
+#: core/templates/template.html:138
msgid ""
"You are using a guest account, data entered will be deleted after a week."
msgstr ""
-#: core/templates/template.html:141
+#: core/templates/template.html:143
msgid "Create some demo entries"
msgstr "چند نمونه پر کنید"
-#: core/templates/template.html:178 software/templates/features.html:547
+#: core/templates/template.html:180 software/templates/features.html:547
#: software/templates/tos.html:7
msgid "Terms of service"
msgstr ""
@@ -1018,7 +1017,7 @@ msgid "Overview"
msgstr "بازنگری"
#: core/templates/user/overview.html:28
-#: manager/templates/schedule/view.html:164
+#: manager/templates/schedule/view.html:163
#: manager/templates/workout/overview.html:39 manager/views/schedule_step.py:60
msgid "Add workout"
msgstr ""
@@ -1026,20 +1025,20 @@ msgstr ""
#: core/templates/user/overview.html:34 core/templates/user/overview.html:76
#: core/templates/user/overview.html:120 core/templates/user/overview.html:152
#: exercises/models/base.py:118 exercises/models/base.py:124
-#: exercises/models/exercise.py:63 exercises/models/exercise.py:69
+#: exercises/models/exercise.py:64 exercises/models/exercise.py:70
#: exercises/models/image.py:107 exercises/models/image.py:113
#: exercises/models/video.py:163 exercises/models/video.py:169
#: gallery/models/image.py:42 manager/helpers.py:85 manager/models/log.py:100
#: manager/models/session.py:67 measurements/models/measurement.py:47
-#: nutrition/models/ingredient.py:101 nutrition/models/ingredient.py:107
-#: nutrition/models/ingredient.py:222 weight/models.py:33
+#: nutrition/models/ingredient.py:87 nutrition/models/ingredient.py:93
+#: nutrition/models/ingredient.py:216 weight/models.py:51
#: weight/templates/import_csv_preview.html:13
#: weight/templates/import_csv_preview.html:42 weight/views.py:144
msgid "Date"
msgstr ""
#: core/templates/user/overview.html:35 core/templates/user/overview.html:153
-#: exercises/models/exercise.py:51 gallery/models/image.py:65
+#: exercises/models/exercise.py:52 gallery/models/image.py:65
#: gym/models/contract.py:58 gym/models/contract.py:109
#: manager/models/day.py:37 manager/models/workout.py:63
#: measurements/models/measurement.py:62 nutrition/models/plan.py:67
@@ -1057,13 +1056,13 @@ msgstr ""
#: core/templates/user/overview.html:58
#: manager/templates/calendar/month.html:128
-#: manager/templates/schedule/view.html:145
+#: manager/templates/schedule/view.html:144
#: manager/templates/workout/overview.html:28
msgid "No workouts found."
msgstr "تمرین یافت نشد"
#: core/templates/user/overview.html:68 manager/forms.py:280
-#: manager/templates/workout/view.html:108
+#: manager/templates/workout/view.html:106
msgid "Log"
msgstr ""
@@ -1087,35 +1086,35 @@ msgstr ""
#: core/templates/user/overview.html:112 core/templates/user/overview.html:121
#: manager/forms.py:186 manager/helpers.py:86 manager/models/log.py:86
-#: manager/models/setting.py:79 manager/templates/log/add.html:54
-#: manager/templates/set/formset.html:11 weight/models.py:35
+#: manager/models/setting.py:82 manager/templates/log/add.html:54
+#: manager/templates/set/formset.html:11 weight/models.py:53
#: weight/templates/import_csv_preview.html:14
#: weight/templates/import_csv_preview.html:43 weight/views.py:144
msgid "Weight"
msgstr "وزن"
-#: core/templates/user/overview.html:154 nutrition/models/ingredient.py:130
-#: nutrition/templates/ingredient/view.html:77 nutrition/views/plan.py:237
+#: core/templates/user/overview.html:154 nutrition/models/ingredient.py:116
+#: nutrition/templates/ingredient/view.html:51 nutrition/views/plan.py:237
msgid "Energy"
msgstr "انرژی"
-#: core/templates/user/overview.html:155 nutrition/models/ingredient.py:137
-#: nutrition/templates/ingredient/view.html:84 nutrition/views/plan.py:243
+#: core/templates/user/overview.html:155 nutrition/models/ingredient.py:123
+#: nutrition/templates/ingredient/view.html:58 nutrition/views/plan.py:243
msgid "Protein"
msgstr "پروتئین"
-#: core/templates/user/overview.html:156 nutrition/models/ingredient.py:145
-#: nutrition/templates/ingredient/view.html:90 nutrition/views/plan.py:251
+#: core/templates/user/overview.html:156 nutrition/models/ingredient.py:131
+#: nutrition/templates/ingredient/view.html:64 nutrition/views/plan.py:251
msgid "Carbohydrates"
msgstr "کربوهیدارت ها"
-#: core/templates/user/overview.html:157 nutrition/models/ingredient.py:163
-#: nutrition/templates/ingredient/view.html:106 nutrition/views/plan.py:265
+#: core/templates/user/overview.html:157 nutrition/models/ingredient.py:149
+#: nutrition/templates/ingredient/view.html:80 nutrition/views/plan.py:265
msgid "Fat"
msgstr "چربی"
#: core/templates/user/overview.html:170
-#: nutrition/templates/ingredient/view.html:79
+#: nutrition/templates/ingredient/view.html:53
msgid "kcal"
msgstr "کیلو کالری"
@@ -1127,7 +1126,7 @@ msgstr "کیلو کالری"
#: gym/templates/gym/member_list.html:207
#: gym/templates/gym/member_list.html:240
#: gym/templates/gym/member_list.html:277
-#: manager/templates/schedule/view.html:101
+#: manager/templates/schedule/view.html:100
msgid "Actions"
msgstr ""
@@ -1170,7 +1169,7 @@ msgid "Details"
msgstr ""
#: core/templates/user/overview.html:258 gym/views/export.py:57
-#: manager/helpers.py:86 manager/templates/schedule/view.html:99
+#: manager/helpers.py:86 manager/templates/schedule/view.html:98
msgid "Nr."
msgstr ""
@@ -1215,7 +1214,7 @@ msgid "Documents"
msgstr ""
#: core/templates/user/overview.html:412 gym/templates/document/list.html:32
-#: manager/forms.py:292 manager/templates/workout/view.html:134
+#: manager/forms.py:292 manager/templates/workout/view.html:132
msgid "Download"
msgstr ""
@@ -1266,13 +1265,13 @@ msgid "kg"
msgstr ""
#: core/templatetags/wger_extras.py:207
-#: nutrition/templates/ingredient/view.html:86
-#: nutrition/templates/ingredient/view.html:92
-#: nutrition/templates/ingredient/view.html:99
-#: nutrition/templates/ingredient/view.html:108
-#: nutrition/templates/ingredient/view.html:115
-#: nutrition/templates/ingredient/view.html:137
-#: nutrition/templates/ingredient/view.html:147
+#: nutrition/templates/ingredient/view.html:60
+#: nutrition/templates/ingredient/view.html:66
+#: nutrition/templates/ingredient/view.html:73
+#: nutrition/templates/ingredient/view.html:82
+#: nutrition/templates/ingredient/view.html:89
+#: nutrition/templates/ingredient/view.html:111
+#: nutrition/templates/ingredient/view.html:121
msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr ""
@@ -1290,7 +1289,7 @@ msgstr ""
#: exercises/views/equipment.py:103 exercises/views/exercises.py:73
#: exercises/views/muscles.py:99 manager/views/schedule.py:309
#: manager/views/schedule_step.py:128 manager/views/workout.py:249
-#: manager/views/workout_session.py:142 nutrition/views/ingredient.py:116
+#: manager/views/workout_session.py:142 nutrition/views/ingredient.py:119
#: nutrition/views/unit.py:110
msgid "Successfully deleted"
msgstr ""
@@ -1302,7 +1301,7 @@ msgstr ""
#: gym/views/admin_notes.py:196 gym/views/document.py:206 gym/views/gym.py:481
#: manager/views/schedule.py:316 manager/views/schedule_step.py:138
#: manager/views/workout.py:253 manager/views/workout_session.py:156
-#: nutrition/views/ingredient.py:123 nutrition/views/unit.py:117
+#: nutrition/views/ingredient.py:126 nutrition/views/unit.py:117
#, python-brace-format
msgid "Delete {0}?"
msgstr ""
@@ -1315,7 +1314,7 @@ msgstr ""
#: gym/views/contract.py:186 gym/views/contract_option.py:123
#: gym/views/contract_type.py:123 gym/views/document.py:171
#: gym/views/gym.py:463 manager/views/day.py:100 manager/views/schedule.py:333
-#: manager/views/workout.py:267 nutrition/views/ingredient.py:142
+#: manager/views/workout.py:267 nutrition/views/ingredient.py:145
#: nutrition/views/unit.py:143
#, python-brace-format
msgid "Edit {0}"
@@ -1386,7 +1385,7 @@ msgstr ""
msgid "A verification email was sent to %(email)s"
msgstr ""
-#: exercises/models/base.py:82 nutrition/models/ingredient.py:236
+#: exercises/models/base.py:82 nutrition/models/ingredient.py:230
msgid "Category"
msgstr ""
@@ -1406,7 +1405,7 @@ msgstr ""
msgid "Exercise Categories"
msgstr ""
-#: exercises/models/comment.py:52 exercises/models/exercise_alias.py:52
+#: exercises/models/comment.py:52 exercises/models/exercise_alias.py:53
#: exercises/models/image.py:74 exercises/models/video.py:98
#: manager/forms.py:178 manager/helpers.py:86 manager/models/log.py:52
msgid "Exercise"
@@ -1416,12 +1415,12 @@ msgstr ""
msgid "A comment about how to correctly do this exercise."
msgstr ""
-#: exercises/models/exercise.py:76 nutrition/models/ingredient.py:95
+#: exercises/models/exercise.py:77 nutrition/models/ingredient.py:81
#: nutrition/models/weight_unit.py:32
msgid "Language"
msgstr "زبان"
-#: exercises/models/exercise_alias.py:58
+#: exercises/models/exercise_alias.py:59
msgid "Alias for an exercise"
msgstr ""
@@ -1557,7 +1556,7 @@ msgstr "امکانات"
#: manager/models/schedule.py:44 manager/models/session.py:49
#: manager/models/workout.py:89 measurements/models/category.py:31
#: measurements/models/measurement.py:42 nutrition/models/plan.py:54
-#: nutrition/templates/ingredient/pending.html:16 weight/models.py:42
+#: weight/models.py:60
msgid "User"
msgstr ""
@@ -1676,9 +1675,9 @@ msgid "Contract type"
msgstr ""
#: gym/models/contract.py:211 gym/templates/contract/view.html:59
-#: manager/templates/log/add.html:52 nutrition/forms.py:62
-#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:105
-#: nutrition/models/meal_item.py:72
+#: manager/templates/log/add.html:52 nutrition/forms.py:63
+#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:108
+#: nutrition/models/meal_item.py:73
msgid "Amount"
msgstr ""
@@ -1695,7 +1694,7 @@ msgid "Contract is active"
msgstr ""
#: gym/models/contract.py:237 gym/templates/contract/view.html:69
-#: manager/models/schedule.py:61 manager/templates/schedule/view.html:68
+#: manager/models/schedule.py:61 manager/templates/schedule/view.html:67
msgid "Start date"
msgstr ""
@@ -2085,7 +2084,7 @@ msgstr ""
#: mailer/templates/mailer/gym/form.html:28
#: mailer/templates/mailer/gym/preview.html:62
-#: manager/templates/workout/view.html:42
+#: manager/templates/workout/view.html:40
msgid "Steps"
msgstr ""
@@ -2107,7 +2106,7 @@ msgid ""
msgstr ""
#: mailer/templates/mailer/gym/preview.html:22
-#: software/templates/about_us.html:60
+#: software/templates/about_us.html:70
msgid "Current version"
msgstr ""
@@ -2136,18 +2135,18 @@ msgid ""
"a superset."
msgstr ""
-#: manager/forms.py:140 nutrition/forms.py:252
+#: manager/forms.py:140 nutrition/forms.py:253
#, fuzzy
#| msgid "Also use ingredients in English"
msgid "Also search for names in English"
msgstr "همچنین عناصر مورد نیاز را به انگلیسی نمایش بده"
#: manager/forms.py:168 manager/forms.py:173 manager/models/log.py:64
-#: manager/models/log.py:92 manager/models/setting.py:59
-#: manager/models/setting.py:90 manager/templates/log/add.html:53
+#: manager/models/log.py:92 manager/models/setting.py:62
+#: manager/models/setting.py:93 manager/templates/log/add.html:53
#: manager/templates/log/add.html:55 manager/templates/set/formset.html:10
#: manager/templates/set/formset.html:12 measurements/models/category.py:41
-#: nutrition/forms.py:66
+#: nutrition/forms.py:67
msgid "Unit"
msgstr ""
@@ -2155,15 +2154,15 @@ msgstr ""
msgid "Type"
msgstr ""
-#: manager/forms.py:280 manager/templates/workout/view.html:115
+#: manager/forms.py:280 manager/templates/workout/view.html:113
msgid "Table"
msgstr ""
-#: manager/forms.py:282 manager/templates/workout/view.html:121
+#: manager/forms.py:282 manager/templates/workout/view.html:119
msgid "with images"
msgstr ""
-#: manager/forms.py:283 manager/templates/workout/view.html:127
+#: manager/forms.py:283 manager/templates/workout/view.html:125
msgid "with comments"
msgstr ""
@@ -2172,11 +2171,10 @@ msgid "Workout will expire soon"
msgstr ""
#: manager/models/day.py:34 manager/models/log.py:58
-#: manager/models/session.py:60 manager/templates/schedule/view.html:103
-#: manager/templates/workout/view.html:11
-#: manager/templates/workout/view.html:19 manager/views/pdf.py:85
-#: manager/views/pdf.py:161 manager/views/schedule.py:151
-#: manager/views/schedule.py:221
+#: manager/models/session.py:60 manager/templates/schedule/view.html:102
+#: manager/templates/workout/view.html:9 manager/templates/workout/view.html:17
+#: manager/views/pdf.py:85 manager/views/pdf.py:161
+#: manager/views/schedule.py:151 manager/views/schedule.py:221
msgid "Workout"
msgstr "تمرین"
@@ -2194,7 +2192,7 @@ msgstr ""
msgid "Name or short description of the schedule. For example 'Program XYZ'."
msgstr ""
-#: manager/models/schedule.py:65 manager/templates/schedule/view.html:72
+#: manager/models/schedule.py:65 manager/templates/schedule/view.html:71
msgid "Schedule active"
msgstr ""
@@ -2205,7 +2203,7 @@ msgid ""
"inactive"
msgstr ""
-#: manager/models/schedule.py:77 manager/templates/schedule/view.html:82
+#: manager/models/schedule.py:77 manager/templates/schedule/view.html:81
msgid "Is a loop"
msgstr ""
@@ -2224,8 +2222,8 @@ msgid "The duration in weeks"
msgstr ""
#: manager/models/schedule_step.py:64 manager/models/set.py:53
-#: manager/models/setting.py:110 nutrition/models/meal.py:55
-#: nutrition/models/meal_item.py:65
+#: manager/models/setting.py:113 nutrition/models/meal.py:55
+#: nutrition/models/meal_item.py:66
msgid "Order"
msgstr ""
@@ -2275,7 +2273,7 @@ msgstr ""
msgid "Number of sets"
msgstr ""
-#: manager/models/setting.py:48
+#: manager/models/setting.py:51
msgid "Sets"
msgstr ""
@@ -2346,7 +2344,7 @@ msgstr ""
msgid "Go to current month"
msgstr ""
-#: manager/templates/calendar/month.html:188
+#: manager/templates/calendar/month.html:190
msgid "Add new log"
msgstr "اضافه کردن گزارش جدید"
@@ -2383,8 +2381,8 @@ msgid "Your schedules"
msgstr ""
#: manager/templates/schedule/overview.html:19
-#: manager/templates/schedule/view.html:132
-#: manager/templates/schedule/view.html:184
+#: manager/templates/schedule/view.html:131
+#: manager/templates/schedule/view.html:183
#: manager/templates/workout/overview.html:16
msgid "active"
msgstr ""
@@ -2420,29 +2418,29 @@ msgstr ""
msgid "Add schedule"
msgstr ""
-#: manager/templates/schedule/view.html:10
+#: manager/templates/schedule/view.html:9
msgid "Schedule"
msgstr ""
-#: manager/templates/schedule/view.html:86
+#: manager/templates/schedule/view.html:85
msgid ""
"This schedule is a loop and will go through the workouts above till you "
"deactivate it"
msgstr ""
-#: manager/templates/schedule/view.html:104
+#: manager/templates/schedule/view.html:103
msgid "Weeks"
msgstr ""
-#: manager/templates/schedule/view.html:116
+#: manager/templates/schedule/view.html:115
msgid "Move me"
msgstr ""
-#: manager/templates/schedule/view.html:157
+#: manager/templates/schedule/view.html:156
msgid "Start schedule"
msgstr ""
-#: manager/templates/schedule/view.html:188
+#: manager/templates/schedule/view.html:187
#, python-format
msgid ""
"%(weeks)s Week\n"
@@ -2453,11 +2451,11 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: manager/templates/schedule/view.html:222
+#: manager/templates/schedule/view.html:221
msgid "Adding workouts"
msgstr ""
-#: manager/templates/schedule/view.html:224
+#: manager/templates/schedule/view.html:223
msgid ""
"Add as many workouts to the schedule as you want. You can\n"
" edit the order by dragging and dropping them. It's also possible "
@@ -2465,21 +2463,21 @@ msgid ""
" than once."
msgstr ""
-#: manager/templates/schedule/view.html:233
-#: manager/templates/schedule/view.html:244
-#: manager/templates/schedule/view.html:291
-#: manager/templates/workout/view.html:71
-#: manager/templates/workout/view.html:81
-#: manager/templates/workout/view.html:180
+#: manager/templates/schedule/view.html:232
+#: manager/templates/schedule/view.html:243
+#: manager/templates/schedule/view.html:290
+#: manager/templates/workout/view.html:69
+#: manager/templates/workout/view.html:79
+#: manager/templates/workout/view.html:178
msgid "Export calendar file"
msgstr ""
-#: manager/templates/schedule/view.html:237
+#: manager/templates/schedule/view.html:236
msgid "Export this schedule as a calendar file."
msgstr ""
-#: manager/templates/schedule/view.html:238
-#: manager/templates/workout/view.html:76
+#: manager/templates/schedule/view.html:237
+#: manager/templates/workout/view.html:74
msgid ""
"You can then import the file it into your calendar\n"
" application for example google calendar, outlook or "
@@ -2488,18 +2486,18 @@ msgid ""
"appropriate exercises."
msgstr ""
-#: manager/templates/schedule/view.html:259
-#: manager/templates/schedule/view.html:295
-#: manager/templates/workout/view.html:96
-#: manager/templates/workout/view.html:176
+#: manager/templates/schedule/view.html:258
+#: manager/templates/schedule/view.html:294
+#: manager/templates/workout/view.html:94
+#: manager/templates/workout/view.html:174
msgid "Download as PDF"
msgstr ""
-#: manager/templates/schedule/view.html:300
+#: manager/templates/schedule/view.html:299
msgid "Edit schedule"
msgstr ""
-#: manager/templates/schedule/view.html:305
+#: manager/templates/schedule/view.html:304
msgid "Delete schedule"
msgstr ""
@@ -2621,12 +2619,12 @@ msgid "Mark as workout"
msgstr "نمونه تمرینات"
#: manager/templates/workout/template_view.html:65
-#: manager/templates/workout/view.html:51
+#: manager/templates/workout/view.html:49
msgid "Muscles trained"
msgstr ""
#: manager/templates/workout/template_view.html:68
-#: manager/templates/workout/view.html:54
+#: manager/templates/workout/view.html:52
msgid ""
"Images show combined muscles as trained by the exercises on the workout."
msgstr ""
@@ -2637,35 +2635,35 @@ msgstr ""
msgid "Use this template"
msgstr "این صفحه را به اشتراک بگذار"
-#: manager/templates/workout/view.html:45
+#: manager/templates/workout/view.html:43
msgid "Add training days"
msgstr ""
-#: manager/templates/workout/view.html:46
+#: manager/templates/workout/view.html:44
msgid "Add workout sets to days"
msgstr ""
-#: manager/templates/workout/view.html:47
+#: manager/templates/workout/view.html:45
msgid "Set the repetitions for each set"
msgstr ""
-#: manager/templates/workout/view.html:75
+#: manager/templates/workout/view.html:73
msgid "Export this workout as a calendar file."
msgstr ""
-#: manager/templates/workout/view.html:146
+#: manager/templates/workout/view.html:144
msgid "Logs"
msgstr ""
-#: manager/templates/workout/view.html:148
+#: manager/templates/workout/view.html:146
msgid "View logs"
msgstr ""
-#: manager/templates/workout/view.html:171 manager/views/schedule_step.py:99
+#: manager/templates/workout/view.html:169 manager/views/schedule_step.py:99
msgid "Edit workout"
msgstr ""
-#: manager/templates/workout/view.html:184 manager/views/workout.py:281
+#: manager/templates/workout/view.html:182 manager/views/workout.py:281
msgid "Mark as template"
msgstr ""
@@ -2712,109 +2710,95 @@ msgstr ""
msgid "Value"
msgstr ""
-#: nutrition/forms.py:117
+#: nutrition/forms.py:118
#, fuzzy
#| msgid "Height (cm)"
msgid "Height (in)"
msgstr "قد (سانتی متر)"
-#: nutrition/forms.py:120
+#: nutrition/forms.py:121
#, fuzzy
#| msgid "Height (cm)"
msgid "Weight (kg)"
msgstr "قد (سانتی متر)"
-#: nutrition/forms.py:120
+#: nutrition/forms.py:121
#, fuzzy
#| msgid "Height (cm)"
msgid "Weight (lbs)"
msgstr "قد (سانتی متر)"
-#: nutrition/forms.py:133
+#: nutrition/forms.py:134
msgid "Calculate"
msgstr ""
-#: nutrition/forms.py:207 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:208 nutrition/templates/rate/form.html:76
msgid "Basic caloric intake"
msgstr ""
-#: nutrition/forms.py:208
+#: nutrition/forms.py:209
msgid "Your basic caloric intake as calculated for your data"
msgstr ""
-#: nutrition/forms.py:213
+#: nutrition/forms.py:214
msgid "Additional calories"
msgstr ""
-#: nutrition/forms.py:215
+#: nutrition/forms.py:216
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
msgstr ""
-#: nutrition/forms.py:248 nutrition/models/ingredient_weight_unit.py:39
-#: nutrition/models/log.py:84 nutrition/models/meal_item.py:53
+#: nutrition/forms.py:249 nutrition/models/ingredient_weight_unit.py:39
+#: nutrition/models/log.py:87 nutrition/models/meal_item.py:54
msgid "Ingredient"
msgstr ""
-#: nutrition/models/ingredient.py:131
+#: nutrition/models/ingredient.py:117
msgid "In kcal per 100g"
msgstr ""
-#: nutrition/models/ingredient.py:138 nutrition/models/ingredient.py:146
-#: nutrition/models/ingredient.py:156 nutrition/models/ingredient.py:164
-#: nutrition/models/ingredient.py:174 nutrition/models/ingredient.py:184
-#: nutrition/models/ingredient.py:194
+#: nutrition/models/ingredient.py:124 nutrition/models/ingredient.py:132
+#: nutrition/models/ingredient.py:142 nutrition/models/ingredient.py:150
+#: nutrition/models/ingredient.py:160 nutrition/models/ingredient.py:170
+#: nutrition/models/ingredient.py:180
msgid "In g per 100g of product"
msgstr ""
-#: nutrition/models/ingredient.py:155
-#: nutrition/templates/ingredient/view.html:96 nutrition/views/plan.py:259
+#: nutrition/models/ingredient.py:141
+#: nutrition/templates/ingredient/view.html:70 nutrition/views/plan.py:259
msgid "Sugar content in carbohydrates"
msgstr ""
-#: nutrition/models/ingredient.py:173
-#: nutrition/templates/ingredient/view.html:112 nutrition/views/plan.py:273
+#: nutrition/models/ingredient.py:159
+#: nutrition/templates/ingredient/view.html:86 nutrition/views/plan.py:273
msgid "Saturated fat content in fats"
msgstr ""
-#: nutrition/models/ingredient.py:183
-#: nutrition/templates/ingredient/view.html:134 nutrition/views/plan.py:279
-msgid "Fibres"
+#: nutrition/models/ingredient.py:169
+#: nutrition/templates/ingredient/view.html:108 nutrition/views/plan.py:279
+msgid "Fiber"
msgstr ""
-#: nutrition/models/ingredient.py:193
-#: nutrition/templates/ingredient/view.html:144 nutrition/views/plan.py:285
+#: nutrition/models/ingredient.py:179
+#: nutrition/templates/ingredient/view.html:118 nutrition/views/plan.py:285
msgid "Sodium"
msgstr ""
-#: nutrition/models/ingredient.py:215
+#: nutrition/models/ingredient.py:209
msgid "Link to product"
msgstr ""
-#: nutrition/models/ingredient.py:244
+#: nutrition/models/ingredient.py:238
msgid "Brand name of product"
msgstr ""
-#: nutrition/models/ingredient.py:304
+#: nutrition/models/ingredient.py:305
#, python-brace-format
msgid "The total energy ({self.energy}kcal) is not the approximate sum of the "
msgstr ""
-#: nutrition/models/ingredient.py:383 nutrition/views/ingredient.py:196
-msgid "Ingredient was successfully added to the general database"
-msgstr ""
-
-#: nutrition/models/ingredient.py:408
-msgid "New user submitted ingredient"
-msgstr ""
-
-#: nutrition/models/ingredient.py:410
-#, python-brace-format
-msgid ""
-"The user {request.user.username} submitted a new ingredient \"{self.name}\"."
-msgstr ""
-
#: nutrition/models/ingredient_category.py:31
msgid "Ingredient Categories"
msgstr ""
@@ -2827,16 +2811,16 @@ msgstr ""
msgid "Unit amount, e.g. \"1 Cup\" or \"1/2 spoon\""
msgstr ""
-#: nutrition/models/log.py:49 nutrition/models/meal.py:50
-#: nutrition/models/meal_item.py:47 nutrition/models/plan.py:106
+#: nutrition/models/log.py:52 nutrition/models/meal.py:50
+#: nutrition/models/meal_item.py:48 nutrition/models/plan.py:108
msgid "Nutrition plan"
msgstr "برنامه غذایی"
-#: nutrition/models/log.py:58
+#: nutrition/models/log.py:61
msgid "Meal"
msgstr ""
-#: nutrition/models/log.py:68
+#: nutrition/models/log.py:71
msgid "Date and Time (Approx.)"
msgstr ""
@@ -2856,11 +2840,11 @@ msgid ""
"summer\""
msgstr ""
-#: nutrition/models/plan.py:88
+#: nutrition/models/plan.py:90
msgid "Use daily calories"
msgstr ""
-#: nutrition/models/plan.py:91
+#: nutrition/models/plan.py:93
msgid ""
"Tick the box if you want to mark this plan as having a goal amount of "
"calories. You can use the calculator or enter the value yourself."
@@ -2967,64 +2951,36 @@ msgstr ""
msgid "Add ingredient"
msgstr ""
-#: nutrition/templates/ingredient/pending.html:14
-msgid "Submission date"
-msgstr ""
-
-#: nutrition/templates/ingredient/view.html:27
-msgid "Ingredient is pending review"
-msgstr ""
-
-#: nutrition/templates/ingredient/view.html:28
-msgid ""
-"This user submitted ingredient is pending a decision to be\n"
-"included in the database. Till then, it will not be shown in the overview "
-"or\n"
-"the search."
-msgstr ""
-
-#: nutrition/templates/ingredient/view.html:31
-msgid "Please select one of the options below."
-msgstr ""
-
-#: nutrition/templates/ingredient/view.html:38
-msgid "Accept"
-msgstr ""
-
-#: nutrition/templates/ingredient/view.html:42
-msgid "Decline"
-msgstr ""
-
-#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:229
+#: nutrition/templates/ingredient/view.html:45 nutrition/views/plan.py:229
msgid "Macronutrients"
msgstr ""
-#: nutrition/templates/ingredient/view.html:80
+#: nutrition/templates/ingredient/view.html:54
msgid "kJ"
msgstr ""
-#: nutrition/templates/ingredient/view.html:101
-#: nutrition/templates/ingredient/view.html:117
-#: nutrition/templates/ingredient/view.html:139
-#: nutrition/templates/ingredient/view.html:149
+#: nutrition/templates/ingredient/view.html:75
+#: nutrition/templates/ingredient/view.html:91
+#: nutrition/templates/ingredient/view.html:113
+#: nutrition/templates/ingredient/view.html:123
msgid "n.A."
msgstr ""
-#: nutrition/templates/ingredient/view.html:128
+#: nutrition/templates/ingredient/view.html:102
msgid "Others"
msgstr ""
-#: nutrition/templates/ingredient/view.html:170
+#: nutrition/templates/ingredient/view.html:144
#: nutrition/templates/units/list.html:46 nutrition/views/unit.py:86
msgid "Add new weight unit"
msgstr ""
-#: nutrition/templates/ingredient/view.html:232
-#: nutrition/templates/ingredient/view.html:235
+#: nutrition/templates/ingredient/view.html:206
+#: nutrition/templates/ingredient/view.html:209
msgid "Edit ingredient"
msgstr ""
-#: nutrition/templates/ingredient/view.html:239
+#: nutrition/templates/ingredient/view.html:213
msgid "Delete ingredient"
msgstr ""
@@ -3108,14 +3064,10 @@ msgstr ""
msgid "56 to 90"
msgstr ""
-#: nutrition/views/ingredient.py:154
+#: nutrition/views/ingredient.py:157
msgid "Add a new ingredient"
msgstr ""
-#: nutrition/views/ingredient.py:209
-msgid "Ingredient was successfully marked as rejected"
-msgstr ""
-
#: nutrition/views/plan.py:120
msgid "Nutritional plan"
msgstr ""
@@ -3160,50 +3112,59 @@ msgid ""
msgstr ""
#: software/templates/about_us.html:18
-msgid "Source code"
-msgstr ""
-
-#: software/templates/about_us.html:20
-msgid "Get the source code of this application and its server on github"
-msgstr ""
-
-#: software/templates/about_us.html:25
msgid "Have a problem or idea?"
msgstr ""
-#: software/templates/about_us.html:27
+#: software/templates/about_us.html:20
msgid ""
"Get in touch if something didn't behave as expected or if there is a feature "
"that you feel is missing."
msgstr ""
-#: software/templates/about_us.html:32
+#: software/templates/about_us.html:26
msgid "Say hi!"
msgstr ""
-#: software/templates/about_us.html:34
+#: software/templates/about_us.html:28
msgid "If you want to chat with us, hop on the Discord server and get in touch"
msgstr ""
-#: software/templates/about_us.html:39 software/templates/features.html:503
+#: software/templates/about_us.html:33
+msgid "Mastodon"
+msgstr ""
+
+#: software/templates/about_us.html:35
+msgid "Follow us on mastodon for updates and news about the project"
+msgstr ""
+
+#: software/templates/about_us.html:40 software/templates/features.html:503
msgid "Translation"
msgstr ""
-#: software/templates/about_us.html:41
+#: software/templates/about_us.html:42
msgid ""
"This application is translated on weblate. If you also want to help, click "
"the link and start translating"
msgstr ""
-#: software/templates/about_us.html:50
+#: software/templates/about_us.html:47
+msgid "Source code"
+msgstr ""
+
+#: software/templates/about_us.html:49
+msgid "Get the source code of this application and its server on github"
+msgstr ""
+
+#: software/templates/about_us.html:59
msgid "Our goal"
msgstr ""
-#: software/templates/about_us.html:53
+#: software/templates/about_us.html:62
msgid ""
"The goal is to build an awesome\n"
" and flexible fitness manager, along with a comprehensive and "
-"complete list of exercises and\n"
+"complete list of\n"
+" exercises and\n"
" ingredients, all released under a free license."
msgstr ""
@@ -3213,12 +3174,6 @@ msgid ""
"your exercises and workouts."
msgstr ""
-#: software/templates/features.html:45
-#, fuzzy
-#| msgid "About us"
-msgid "About"
-msgstr "درباره ما"
-
#: software/templates/features.html:57
msgid "Mobile app"
msgstr ""
@@ -3458,18 +3413,6 @@ msgid ""
"to its own copyright."
msgstr ""
-#: utils/models.py:130
-msgid "Pending"
-msgstr ""
-
-#: utils/models.py:131
-msgid "Accepted"
-msgstr ""
-
-#: utils/models.py:132
-msgid "Declined"
-msgstr ""
-
#: weight/forms.py:54
msgid "Input"
msgstr ""
@@ -3482,7 +3425,7 @@ msgstr ""
msgid "You have to enter your weight"
msgstr ""
-#: weight/models.py:60
+#: weight/models.py:78
msgid "Weight entry"
msgstr ""
@@ -3599,6 +3542,11 @@ msgstr ""
msgid "Delete weight entry for the %s"
msgstr ""
+#, fuzzy
+#~| msgid "About us"
+#~ msgid "About"
+#~ msgstr "درباره ما"
+
#~ msgid "Share"
#~ msgstr "اشتراک"
diff --git a/wger/locale/fi/LC_MESSAGES/django.po b/wger/locale/fi/LC_MESSAGES/django.po
index 4c5504734..ea7ef16b8 100644
--- a/wger/locale/fi/LC_MESSAGES/django.po
+++ b/wger/locale/fi/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: wger Workout Manager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-02-02 12:42+0100\n"
+"POT-Creation-Date: 2024-07-14 15:49+0200\n"
"PO-Revision-Date: 2022-08-31 10:16+0000\n"
"Last-Translator: Juuso Haapanen <[email protected]>\n"
"Language-Team: Finnish <https://hosted.weblate.org/projects/wger/web/fi/>\n"
@@ -32,7 +32,7 @@ msgstr ""
"Valitse oletussali tälle asennukselle. Tämä sali asetetaan kaikille uusille "
"käyttäjille ja päivitetään niille käyttäjille joilta sali vielä puuttuu."
-#: config/views/gym_config.py:42 core/templates/language/view.html:63
+#: config/views/gym_config.py:42 core/templates/language/view.html:67
#: core/templates/license/list.html:17 core/templates/misc/license/list.html:18
#: core/templates/repetition_unit/list.html:18
#: core/templates/tags/render_day.html:39
@@ -52,8 +52,8 @@ msgstr ""
#: manager/templates/calendar/day.html:68
#: manager/templates/calendar/month.html:85
#: manager/templates/calendar/partial_overview_table.html:18
-#: manager/templates/schedule/view.html:119
-#: nutrition/templates/ingredient/view.html:191
+#: manager/templates/schedule/view.html:118
+#: nutrition/templates/ingredient/view.html:165
#: nutrition/templates/units/list.html:19
msgid "Edit"
msgstr "Muokkaa"
@@ -89,8 +89,8 @@ msgstr "Minun hieno harjoitusohjelmani"
msgid "Empty placeholder schedule"
msgstr "Tyhjä tilanvaraaja-aikataulu"
-#: core/forms.py:69 core/templates/navigation.html:275
-#: core/templates/navigation.html:281 core/templates/user/login.html:4
+#: core/forms.py:69 core/templates/navigation.html:285
+#: core/templates/navigation.html:291 core/templates/user/login.html:4
#: software/templates/features.html:82 software/templates/features.html:427
msgid "Login"
msgstr "Kirjaudu sisään"
@@ -168,7 +168,7 @@ msgstr "Salasana"
msgid "Please enter your current password."
msgstr "Anna nykyinen salasanasi."
-#: core/forms.py:242 core/templates/language/view.html:68
+#: core/forms.py:242 core/templates/language/view.html:73
#: core/templates/license/list.html:19 core/templates/misc/license/list.html:22
#: core/templates/repetition_unit/list.html:20
#: core/templates/tags/render_day.html:45
@@ -183,10 +183,10 @@ msgstr "Anna nykyinen salasanasi."
#: gym/templates/gym/list.html:22 manager/templates/calendar/day.html:73
#: manager/templates/calendar/month.html:89
#: manager/templates/calendar/partial_overview_table.html:23
-#: manager/templates/schedule/view.html:123
-#: manager/templates/workout/view.html:190
-#: nutrition/templates/ingredient/view.html:192
-#: nutrition/templates/ingredient/view.html:241
+#: manager/templates/schedule/view.html:122
+#: manager/templates/workout/view.html:188
+#: nutrition/templates/ingredient/view.html:166
+#: nutrition/templates/ingredient/view.html:215
#: nutrition/templates/units/list.html:22
msgid "Delete"
msgstr "Poista"
@@ -199,14 +199,14 @@ msgstr "Väärä salasana"
msgid "The form is secured with reCAPTCHA"
msgstr "Lomake on suojattu reCAPTCHA:lla"
-#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:275
-#: core/templates/navigation.html:287 core/templates/template.html:147
+#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:285
+#: core/templates/navigation.html:297 core/templates/template.html:149
#: core/templates/user/login.html:20 core/views/user.py:298
#: software/templates/features.html:87 software/templates/features.html:422
msgid "Register"
msgstr "Rekisteröidy"
-#: core/forms.py:315
+#: core/forms.py:315 software/templates/features.html:45
msgid "Contact"
msgstr "Yhteydenotto"
@@ -217,7 +217,7 @@ msgid "Some way of answering you (e-mail, etc.)"
msgstr "Jokin vastaustapa(sähköposti, etc.)"
#: core/forms.py:324 exercises/models/comment.py:58 manager/models/set.py:61
-#: manager/models/setting.py:111 nutrition/models/log.py:74
+#: manager/models/setting.py:114 nutrition/models/log.py:77
msgid "Comment"
msgstr "Kommentti"
@@ -237,6 +237,12 @@ msgstr "Kielen lyhenne"
msgid "Language full name"
msgstr "Kielen koko nimi"
+#: core/models/language.py:45 core/templates/language/view.html:23
+#, fuzzy
+#| msgid "Language full name"
+msgid "Language full name in English"
+msgstr "Kielen koko nimi"
+
#: core/models/license.py:29
msgid "Full name"
msgstr "Koko nimi"
@@ -251,7 +257,7 @@ msgstr ""
msgid "Short name, e.g. CC-BY-SA 3"
msgstr "Lyhenne"
-#: core/models/license.py:45 nutrition/models/ingredient.py:214
+#: core/models/license.py:45 nutrition/models/ingredient.py:208
msgid "Link"
msgstr "Linkki"
@@ -359,7 +365,7 @@ msgstr ""
msgid "Age"
msgstr "Ikä"
-#: core/models/profile.py:230 nutrition/forms.py:117
+#: core/models/profile.py:230 nutrition/forms.py:118
msgid "Height (cm)"
msgstr "Pituus (cm)"
@@ -410,7 +416,7 @@ msgid "Total caloric intake, including e.g. any surplus"
msgstr "Syötävien kaloreiden määrä, sisältäen mahdolliset lisäkalorit"
#: core/models/profile.py:333 nutrition/models/ingredient_weight_unit.py:45
-#: nutrition/models/log.py:93 nutrition/models/meal_item.py:58
+#: nutrition/models/log.py:96 nutrition/models/meal_item.py:59
msgid "Weight unit"
msgstr "Painoyksikkö"
@@ -443,17 +449,16 @@ msgstr "Tuntien summa tarvitsee olla 24"
#: core/models/rep_unit.py:36 core/models/weight_unit.py:36
#: core/templates/user/overview.html:262 core/views/user.py:599
#: exercises/models/category.py:29 exercises/models/equipment.py:29
-#: exercises/models/exercise.py:58 exercises/models/muscle.py:36
+#: exercises/models/exercise.py:59 exercises/models/muscle.py:36
#: gym/models/contract.py:52 gym/models/contract.py:103 gym/models/gym.py:46
#: gym/models/user_document.py:84 gym/templates/contract/view.html:50
#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:96
#: gym/views/gym.py:158 manager/models/schedule.py:55
#: manager/models/workout.py:57 measurements/models/category.py:36
-#: nutrition/models/ingredient.py:125
+#: nutrition/models/ingredient.py:111
#: nutrition/models/ingredient_category.py:27 nutrition/models/meal.py:67
#: nutrition/models/weight_unit.py:38
-#: nutrition/templates/ingredient/pending.html:15
-#: nutrition/templates/ingredient/view.html:178
+#: nutrition/templates/ingredient/view.html:152
msgid "Name"
msgstr "Nimi"
@@ -556,24 +561,24 @@ msgstr ""
msgid "Dashboard"
msgstr ""
-#: core/templates/language/overview.html:4 core/templates/navigation.html:335
+#: core/templates/language/overview.html:4 core/templates/navigation.html:345
msgid "Languages"
msgstr "Kielet"
-#: core/templates/language/overview.html:20
+#: core/templates/language/overview.html:22
msgid "Nothing found."
msgstr "Mitään ei löytynyt."
-#: core/templates/language/overview.html:20
+#: core/templates/language/overview.html:22
#: manager/templates/calendar/month.html:132
#: manager/templates/schedule/overview.html:28
-#: manager/templates/schedule/view.html:145
+#: manager/templates/schedule/view.html:144
#: manager/templates/workout/overview.html:28
#: nutrition/templates/ingredient/overview.html:38
msgid "Add one now."
msgstr ""
-#: core/templates/language/overview.html:33 core/templates/license/list.html:40
+#: core/templates/language/overview.html:35 core/templates/license/list.html:40
#: core/templates/misc/license/list.html:43
#: core/templates/repetition_unit/list.html:43
#: core/templates/user/overview.html:326 core/templates/user/overview.html:365
@@ -593,13 +598,13 @@ msgstr ""
msgid "Add"
msgstr "Lisää"
-#: core/templates/language/view.html:58 core/templates/user/api_key.html:44
+#: core/templates/language/view.html:61 core/templates/user/api_key.html:44
#: core/templates/user/preferences.html:45 gym/models/contract.py:203
#: gym/templates/contract/view.html:41 gym/templates/contract/view.html:106
#: gym/templates/gym/member_list.html:248
-#: manager/templates/schedule/view.html:286
-#: manager/templates/workout/view.html:165
-#: nutrition/templates/ingredient/view.html:228
+#: manager/templates/schedule/view.html:285
+#: manager/templates/workout/view.html:163
+#: nutrition/templates/ingredient/view.html:202
msgid "Options"
msgstr "Asetukset"
@@ -624,12 +629,11 @@ msgstr ""
#: gym/templates/gym/member_list.html:299
#: mailer/templates/mailer/gym/overview.html:30
#: manager/templates/calendar/day.html:87
-#: nutrition/templates/ingredient/pending.html:30
#: nutrition/templates/units/list.html:29
msgid "Nothing found"
msgstr ""
-#: core/templates/misc/about.html:4 core/templates/template.html:173
+#: core/templates/misc/about.html:4 core/templates/template.html:175
msgid "Imprint"
msgstr ""
@@ -640,176 +644,171 @@ msgid ""
"entries here."
msgstr ""
-#: core/templates/navigation.html:27 software/templates/features.html:437
+#: core/templates/navigation.html:28 software/templates/features.html:437
msgid "Training"
msgstr ""
-#: core/templates/navigation.html:34 core/templates/user/overview.html:25
+#: core/templates/navigation.html:37 core/templates/user/overview.html:25
msgid "Workouts"
msgstr ""
-#: core/templates/navigation.html:42
+#: core/templates/navigation.html:46
msgid "Workouts schedules"
msgstr ""
-#: core/templates/navigation.html:50 core/templates/user/overview.html:70
+#: core/templates/navigation.html:54 core/templates/user/overview.html:70
#: manager/templates/calendar/month.html:10
#: manager/templates/calendar/month.html:21
msgid "Calendar"
msgstr ""
-#: core/templates/navigation.html:60
+#: core/templates/navigation.html:64
msgid "Measurements"
msgstr ""
-#: core/templates/navigation.html:70 gallery/templates/images/overview.html:6
+#: core/templates/navigation.html:75 gallery/templates/images/overview.html:6
msgid "Gallery"
msgstr ""
-#: core/templates/navigation.html:76
+#: core/templates/navigation.html:81
msgid "Workout templates"
msgstr ""
-#: core/templates/navigation.html:82 manager/views/workout.py:84
+#: core/templates/navigation.html:88 manager/views/workout.py:84
msgid "Your templates"
msgstr ""
-#: core/templates/navigation.html:90 manager/views/workout.py:98
+#: core/templates/navigation.html:97 manager/views/workout.py:98
msgid "Public templates"
msgstr ""
-#: core/templates/navigation.html:97 manager/forms.py:129
-#: manager/models/setting.py:54 software/templates/features.html:51
+#: core/templates/navigation.html:105 manager/forms.py:129
+#: manager/models/setting.py:57 software/templates/features.html:51
#: software/templates/features.html:459
msgid "Exercises"
msgstr "Harjoitukset"
-#: core/templates/navigation.html:103 core/templates/navigation.html:170
-#: core/templates/navigation.html:330
+#: core/templates/navigation.html:111 core/templates/navigation.html:184
+#: core/templates/navigation.html:340
msgid "Administration"
msgstr ""
-#: core/templates/navigation.html:106
+#: core/templates/navigation.html:115
#, fuzzy
#| msgid "Exercises"
msgid "Exercise edit history"
msgstr "Harjoitukset"
-#: core/templates/navigation.html:111 exercises/models/base.py:103
+#: core/templates/navigation.html:121 exercises/models/base.py:103
msgid "Equipment"
msgstr ""
-#: core/templates/navigation.html:116
+#: core/templates/navigation.html:127
msgid "Muscles"
msgstr ""
-#: core/templates/navigation.html:121
+#: core/templates/navigation.html:133
#: exercises/templates/categories/admin-overview.html:4
msgid "Categories"
msgstr ""
-#: core/templates/navigation.html:136 software/templates/features.html:447
+#: core/templates/navigation.html:148 software/templates/features.html:447
msgid "Nutrition"
msgstr ""
-#: core/templates/navigation.html:143 core/templates/user/overview.html:144
+#: core/templates/navigation.html:156 core/templates/user/overview.html:144
msgid "Nutrition plans"
msgstr ""
-#: core/templates/navigation.html:151 nutrition/templates/bmi/form.html:50
+#: core/templates/navigation.html:165 nutrition/templates/bmi/form.html:50
msgid "BMI calculator"
msgstr "Painoindeksilaskuri"
-#: core/templates/navigation.html:159 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:174 nutrition/templates/rate/form.html:17
msgid "Daily calories calculator"
msgstr ""
-#: core/templates/navigation.html:165
+#: core/templates/navigation.html:179
#: nutrition/templates/ingredient/overview.html:10
msgid "Ingredient overview"
msgstr ""
-#: core/templates/navigation.html:172 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:187 nutrition/templates/units/list.html:6
msgid "Ingredient weight units"
msgstr ""
-#: core/templates/navigation.html:177
-#: nutrition/templates/ingredient/pending.html:6
-msgid "Ingredients pending review"
-msgstr ""
-
-#: core/templates/navigation.html:193 software/templates/features.html:442
+#: core/templates/navigation.html:203 software/templates/features.html:442
msgid "Body weight"
msgstr ""
-#: core/templates/navigation.html:200 core/templates/user/overview.html:114
+#: core/templates/navigation.html:210 core/templates/user/overview.html:114
msgid "Weight overview"
msgstr ""
-#: core/templates/navigation.html:207 weight/views.py:65
+#: core/templates/navigation.html:217 weight/views.py:65
msgid "Add weight entry"
msgstr ""
-#: core/templates/navigation.html:221
+#: core/templates/navigation.html:231
msgid "About this software"
msgstr ""
-#: core/templates/navigation.html:227 software/templates/about_us.html:5
+#: core/templates/navigation.html:237 software/templates/about_us.html:5
msgid "About us"
msgstr "Meistä"
-#: core/templates/navigation.html:233 software/templates/features.html:507
+#: core/templates/navigation.html:243 software/templates/features.html:507
msgid "REST API"
msgstr ""
-#: core/templates/navigation.html:239 utils/models.py:45
+#: core/templates/navigation.html:249 utils/models.py:45
msgid "License"
msgstr ""
-#: core/templates/navigation.html:245
+#: core/templates/navigation.html:255
msgid "Developer documentation"
msgstr ""
-#: core/templates/navigation.html:252
+#: core/templates/navigation.html:262
msgid "Get the code"
msgstr ""
-#: core/templates/navigation.html:259 core/templates/template.html:212
+#: core/templates/navigation.html:269 core/templates/template.html:214
#: software/templates/features.html:582
msgid "Translate"
msgstr ""
-#: core/templates/navigation.html:293 core/templates/user/login.html:28
+#: core/templates/navigation.html:303 core/templates/user/login.html:28
msgid "Reset password"
msgstr ""
-#: core/templates/navigation.html:311
+#: core/templates/navigation.html:321
msgid "My preferences"
msgstr ""
-#: core/templates/navigation.html:320
+#: core/templates/navigation.html:330
msgid "Logout"
msgstr ""
-#: core/templates/navigation.html:343
+#: core/templates/navigation.html:353
msgid "Licenses"
msgstr ""
-#: core/templates/navigation.html:351
+#: core/templates/navigation.html:361
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr ""
-#: core/templates/navigation.html:359 core/templates/weight_unit/list.html:4
-#: nutrition/templates/ingredient/view.html:167
+#: core/templates/navigation.html:369 core/templates/weight_unit/list.html:4
+#: nutrition/templates/ingredient/view.html:141
msgid "Weight units"
msgstr ""
-#: core/templates/navigation.html:367 core/templates/user/list.html:4
+#: core/templates/navigation.html:377 core/templates/user/list.html:4
msgid "User list"
msgstr ""
-#: core/templates/navigation.html:373
+#: core/templates/navigation.html:383
msgid "Gyms"
msgstr ""
@@ -859,12 +858,12 @@ msgstr ""
msgid "The %(site_name)s team"
msgstr ""
-#: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:11
+#: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:12
msgid "previous"
msgstr "edellinen"
-#: core/templates/tags/pagination.html:31
-#: core/templates/tags/pagination.html:35
+#: core/templates/tags/pagination.html:33
+#: core/templates/tags/pagination.html:38
msgid "next"
msgstr "seuraava"
@@ -889,34 +888,34 @@ msgid "Add exercises to this workout day"
msgstr ""
#: core/templates/tags/render_weight_log.html:17 manager/helpers.py:86
-#: manager/models/setting.py:69 manager/templates/set/formset.html:9
+#: manager/models/setting.py:72 manager/templates/set/formset.html:9
msgid "Reps"
msgstr "Toistot"
#: core/templates/tags/render_weight_log.html:30 manager/forms.py:191
-#: manager/models/log.py:103 manager/models/setting.py:99
+#: manager/models/log.py:103 manager/models/setting.py:102
#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
msgid "RiR"
msgstr ""
-#: core/templates/template.html:120 manager/templates/calendar/month.html:138
-#: manager/templates/schedule/view.html:249
-#: manager/templates/schedule/view.html:270
-#: manager/templates/workout/view.html:86
-#: manager/templates/workout/view.html:139
+#: core/templates/template.html:122 manager/templates/calendar/month.html:138
+#: manager/templates/schedule/view.html:248
+#: manager/templates/schedule/view.html:269
+#: manager/templates/workout/view.html:84
+#: manager/templates/workout/view.html:137
msgid "Close"
msgstr ""
-#: core/templates/template.html:136
+#: core/templates/template.html:138
msgid ""
"You are using a guest account, data entered will be deleted after a week."
msgstr ""
-#: core/templates/template.html:141
+#: core/templates/template.html:143
msgid "Create some demo entries"
msgstr ""
-#: core/templates/template.html:178 software/templates/features.html:547
+#: core/templates/template.html:180 software/templates/features.html:547
#: software/templates/tos.html:7
msgid "Terms of service"
msgstr "Käyttöehdot"
@@ -1008,7 +1007,7 @@ msgid "Overview"
msgstr ""
#: core/templates/user/overview.html:28
-#: manager/templates/schedule/view.html:164
+#: manager/templates/schedule/view.html:163
#: manager/templates/workout/overview.html:39 manager/views/schedule_step.py:60
msgid "Add workout"
msgstr ""
@@ -1016,20 +1015,20 @@ msgstr ""
#: core/templates/user/overview.html:34 core/templates/user/overview.html:76
#: core/templates/user/overview.html:120 core/templates/user/overview.html:152
#: exercises/models/base.py:118 exercises/models/base.py:124
-#: exercises/models/exercise.py:63 exercises/models/exercise.py:69
+#: exercises/models/exercise.py:64 exercises/models/exercise.py:70
#: exercises/models/image.py:107 exercises/models/image.py:113
#: exercises/models/video.py:163 exercises/models/video.py:169
#: gallery/models/image.py:42 manager/helpers.py:85 manager/models/log.py:100
#: manager/models/session.py:67 measurements/models/measurement.py:47
-#: nutrition/models/ingredient.py:101 nutrition/models/ingredient.py:107
-#: nutrition/models/ingredient.py:222 weight/models.py:33
+#: nutrition/models/ingredient.py:87 nutrition/models/ingredient.py:93
+#: nutrition/models/ingredient.py:216 weight/models.py:51
#: weight/templates/import_csv_preview.html:13
#: weight/templates/import_csv_preview.html:42 weight/views.py:144
msgid "Date"
msgstr ""
#: core/templates/user/overview.html:35 core/templates/user/overview.html:153
-#: exercises/models/exercise.py:51 gallery/models/image.py:65
+#: exercises/models/exercise.py:52 gallery/models/image.py:65
#: gym/models/contract.py:58 gym/models/contract.py:109
#: manager/models/day.py:37 manager/models/workout.py:63
#: measurements/models/measurement.py:62 nutrition/models/plan.py:67
@@ -1047,13 +1046,13 @@ msgstr ""
#: core/templates/user/overview.html:58
#: manager/templates/calendar/month.html:128
-#: manager/templates/schedule/view.html:145
+#: manager/templates/schedule/view.html:144
#: manager/templates/workout/overview.html:28
msgid "No workouts found."
msgstr ""
#: core/templates/user/overview.html:68 manager/forms.py:280
-#: manager/templates/workout/view.html:108
+#: manager/templates/workout/view.html:106
msgid "Log"
msgstr ""
@@ -1077,35 +1076,35 @@ msgstr ""
#: core/templates/user/overview.html:112 core/templates/user/overview.html:121
#: manager/forms.py:186 manager/helpers.py:86 manager/models/log.py:86
-#: manager/models/setting.py:79 manager/templates/log/add.html:54
-#: manager/templates/set/formset.html:11 weight/models.py:35
+#: manager/models/setting.py:82 manager/templates/log/add.html:54
+#: manager/templates/set/formset.html:11 weight/models.py:53
#: weight/templates/import_csv_preview.html:14
#: weight/templates/import_csv_preview.html:43 weight/views.py:144
msgid "Weight"
msgstr ""
-#: core/templates/user/overview.html:154 nutrition/models/ingredient.py:130
-#: nutrition/templates/ingredient/view.html:77 nutrition/views/plan.py:237
+#: core/templates/user/overview.html:154 nutrition/models/ingredient.py:116
+#: nutrition/templates/ingredient/view.html:51 nutrition/views/plan.py:237
msgid "Energy"
msgstr ""
-#: core/templates/user/overview.html:155 nutrition/models/ingredient.py:137
-#: nutrition/templates/ingredient/view.html:84 nutrition/views/plan.py:243
+#: core/templates/user/overview.html:155 nutrition/models/ingredient.py:123
+#: nutrition/templates/ingredient/view.html:58 nutrition/views/plan.py:243
msgid "Protein"
msgstr ""
-#: core/templates/user/overview.html:156 nutrition/models/ingredient.py:145
-#: nutrition/templates/ingredient/view.html:90 nutrition/views/plan.py:251
+#: core/templates/user/overview.html:156 nutrition/models/ingredient.py:131
+#: nutrition/templates/ingredient/view.html:64 nutrition/views/plan.py:251
msgid "Carbohydrates"
msgstr ""
-#: core/templates/user/overview.html:157 nutrition/models/ingredient.py:163
-#: nutrition/templates/ingredient/view.html:106 nutrition/views/plan.py:265
+#: core/templates/user/overview.html:157 nutrition/models/ingredient.py:149
+#: nutrition/templates/ingredient/view.html:80 nutrition/views/plan.py:265
msgid "Fat"
msgstr ""
#: core/templates/user/overview.html:170
-#: nutrition/templates/ingredient/view.html:79
+#: nutrition/templates/ingredient/view.html:53
msgid "kcal"
msgstr "kcal"
@@ -1117,7 +1116,7 @@ msgstr "kcal"
#: gym/templates/gym/member_list.html:207
#: gym/templates/gym/member_list.html:240
#: gym/templates/gym/member_list.html:277
-#: manager/templates/schedule/view.html:101
+#: manager/templates/schedule/view.html:100
msgid "Actions"
msgstr ""
@@ -1160,7 +1159,7 @@ msgid "Details"
msgstr ""
#: core/templates/user/overview.html:258 gym/views/export.py:57
-#: manager/helpers.py:86 manager/templates/schedule/view.html:99
+#: manager/helpers.py:86 manager/templates/schedule/view.html:98
msgid "Nr."
msgstr ""
@@ -1205,7 +1204,7 @@ msgid "Documents"
msgstr ""
#: core/templates/user/overview.html:412 gym/templates/document/list.html:32
-#: manager/forms.py:292 manager/templates/workout/view.html:134
+#: manager/forms.py:292 manager/templates/workout/view.html:132
msgid "Download"
msgstr ""
@@ -1256,13 +1255,13 @@ msgid "kg"
msgstr "kg"
#: core/templatetags/wger_extras.py:207
-#: nutrition/templates/ingredient/view.html:86
-#: nutrition/templates/ingredient/view.html:92
-#: nutrition/templates/ingredient/view.html:99
-#: nutrition/templates/ingredient/view.html:108
-#: nutrition/templates/ingredient/view.html:115
-#: nutrition/templates/ingredient/view.html:137
-#: nutrition/templates/ingredient/view.html:147
+#: nutrition/templates/ingredient/view.html:60
+#: nutrition/templates/ingredient/view.html:66
+#: nutrition/templates/ingredient/view.html:73
+#: nutrition/templates/ingredient/view.html:82
+#: nutrition/templates/ingredient/view.html:89
+#: nutrition/templates/ingredient/view.html:111
+#: nutrition/templates/ingredient/view.html:121
msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr "g"
@@ -1280,7 +1279,7 @@ msgstr ""
#: exercises/views/equipment.py:103 exercises/views/exercises.py:73
#: exercises/views/muscles.py:99 manager/views/schedule.py:309
#: manager/views/schedule_step.py:128 manager/views/workout.py:249
-#: manager/views/workout_session.py:142 nutrition/views/ingredient.py:116
+#: manager/views/workout_session.py:142 nutrition/views/ingredient.py:119
#: nutrition/views/unit.py:110
msgid "Successfully deleted"
msgstr "Poistettu onnistuneesti"
@@ -1292,7 +1291,7 @@ msgstr "Poistettu onnistuneesti"
#: gym/views/admin_notes.py:196 gym/views/document.py:206 gym/views/gym.py:481
#: manager/views/schedule.py:316 manager/views/schedule_step.py:138
#: manager/views/workout.py:253 manager/views/workout_session.py:156
-#: nutrition/views/ingredient.py:123 nutrition/views/unit.py:117
+#: nutrition/views/ingredient.py:126 nutrition/views/unit.py:117
#, python-brace-format
msgid "Delete {0}?"
msgstr "Poista {0}?"
@@ -1305,7 +1304,7 @@ msgstr "Poista {0}?"
#: gym/views/contract.py:186 gym/views/contract_option.py:123
#: gym/views/contract_type.py:123 gym/views/document.py:171
#: gym/views/gym.py:463 manager/views/day.py:100 manager/views/schedule.py:333
-#: manager/views/workout.py:267 nutrition/views/ingredient.py:142
+#: manager/views/workout.py:267 nutrition/views/ingredient.py:145
#: nutrition/views/unit.py:143
#, python-brace-format
msgid "Edit {0}"
@@ -1376,7 +1375,7 @@ msgstr ""
msgid "A verification email was sent to %(email)s"
msgstr ""
-#: exercises/models/base.py:82 nutrition/models/ingredient.py:236
+#: exercises/models/base.py:82 nutrition/models/ingredient.py:230
msgid "Category"
msgstr ""
@@ -1396,7 +1395,7 @@ msgstr ""
msgid "Exercise Categories"
msgstr ""
-#: exercises/models/comment.py:52 exercises/models/exercise_alias.py:52
+#: exercises/models/comment.py:52 exercises/models/exercise_alias.py:53
#: exercises/models/image.py:74 exercises/models/video.py:98
#: manager/forms.py:178 manager/helpers.py:86 manager/models/log.py:52
msgid "Exercise"
@@ -1406,12 +1405,12 @@ msgstr ""
msgid "A comment about how to correctly do this exercise."
msgstr ""
-#: exercises/models/exercise.py:76 nutrition/models/ingredient.py:95
+#: exercises/models/exercise.py:77 nutrition/models/ingredient.py:81
#: nutrition/models/weight_unit.py:32
msgid "Language"
msgstr ""
-#: exercises/models/exercise_alias.py:58
+#: exercises/models/exercise_alias.py:59
msgid "Alias for an exercise"
msgstr ""
@@ -1545,7 +1544,7 @@ msgstr "Asetukset"
#: manager/models/schedule.py:44 manager/models/session.py:49
#: manager/models/workout.py:89 measurements/models/category.py:31
#: measurements/models/measurement.py:42 nutrition/models/plan.py:54
-#: nutrition/templates/ingredient/pending.html:16 weight/models.py:42
+#: weight/models.py:60
msgid "User"
msgstr ""
@@ -1664,9 +1663,9 @@ msgid "Contract type"
msgstr ""
#: gym/models/contract.py:211 gym/templates/contract/view.html:59
-#: manager/templates/log/add.html:52 nutrition/forms.py:62
-#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:105
-#: nutrition/models/meal_item.py:72
+#: manager/templates/log/add.html:52 nutrition/forms.py:63
+#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:108
+#: nutrition/models/meal_item.py:73
msgid "Amount"
msgstr ""
@@ -1683,7 +1682,7 @@ msgid "Contract is active"
msgstr ""
#: gym/models/contract.py:237 gym/templates/contract/view.html:69
-#: manager/models/schedule.py:61 manager/templates/schedule/view.html:68
+#: manager/models/schedule.py:61 manager/templates/schedule/view.html:67
msgid "Start date"
msgstr ""
@@ -2067,7 +2066,7 @@ msgstr ""
#: mailer/templates/mailer/gym/form.html:28
#: mailer/templates/mailer/gym/preview.html:62
-#: manager/templates/workout/view.html:42
+#: manager/templates/workout/view.html:40
msgid "Steps"
msgstr ""
@@ -2089,7 +2088,7 @@ msgid ""
msgstr ""
#: mailer/templates/mailer/gym/preview.html:22
-#: software/templates/about_us.html:60
+#: software/templates/about_us.html:70
msgid "Current version"
msgstr ""
@@ -2118,18 +2117,18 @@ msgid ""
"a superset."
msgstr ""
-#: manager/forms.py:140 nutrition/forms.py:252
+#: manager/forms.py:140 nutrition/forms.py:253
#, fuzzy
#| msgid "Also use ingredients in English"
msgid "Also search for names in English"
msgstr "Näytä raaka-aineet myös englanniksi"
#: manager/forms.py:168 manager/forms.py:173 manager/models/log.py:64
-#: manager/models/log.py:92 manager/models/setting.py:59
-#: manager/models/setting.py:90 manager/templates/log/add.html:53
+#: manager/models/log.py:92 manager/models/setting.py:62
+#: manager/models/setting.py:93 manager/templates/log/add.html:53
#: manager/templates/log/add.html:55 manager/templates/set/formset.html:10
#: manager/templates/set/formset.html:12 measurements/models/category.py:41
-#: nutrition/forms.py:66
+#: nutrition/forms.py:67
msgid "Unit"
msgstr ""
@@ -2137,15 +2136,15 @@ msgstr ""
msgid "Type"
msgstr ""
-#: manager/forms.py:280 manager/templates/workout/view.html:115
+#: manager/forms.py:280 manager/templates/workout/view.html:113
msgid "Table"
msgstr ""
-#: manager/forms.py:282 manager/templates/workout/view.html:121
+#: manager/forms.py:282 manager/templates/workout/view.html:119
msgid "with images"
msgstr ""
-#: manager/forms.py:283 manager/templates/workout/view.html:127
+#: manager/forms.py:283 manager/templates/workout/view.html:125
msgid "with comments"
msgstr ""
@@ -2154,11 +2153,10 @@ msgid "Workout will expire soon"
msgstr ""
#: manager/models/day.py:34 manager/models/log.py:58
-#: manager/models/session.py:60 manager/templates/schedule/view.html:103
-#: manager/templates/workout/view.html:11
-#: manager/templates/workout/view.html:19 manager/views/pdf.py:85
-#: manager/views/pdf.py:161 manager/views/schedule.py:151
-#: manager/views/schedule.py:221
+#: manager/models/session.py:60 manager/templates/schedule/view.html:102
+#: manager/templates/workout/view.html:9 manager/templates/workout/view.html:17
+#: manager/views/pdf.py:85 manager/views/pdf.py:161
+#: manager/views/schedule.py:151 manager/views/schedule.py:221
msgid "Workout"
msgstr ""
@@ -2176,7 +2174,7 @@ msgstr ""
msgid "Name or short description of the schedule. For example 'Program XYZ'."
msgstr ""
-#: manager/models/schedule.py:65 manager/templates/schedule/view.html:72
+#: manager/models/schedule.py:65 manager/templates/schedule/view.html:71
msgid "Schedule active"
msgstr ""
@@ -2187,7 +2185,7 @@ msgid ""
"inactive"
msgstr ""
-#: manager/models/schedule.py:77 manager/templates/schedule/view.html:82
+#: manager/models/schedule.py:77 manager/templates/schedule/view.html:81
msgid "Is a loop"
msgstr ""
@@ -2206,8 +2204,8 @@ msgid "The duration in weeks"
msgstr ""
#: manager/models/schedule_step.py:64 manager/models/set.py:53
-#: manager/models/setting.py:110 nutrition/models/meal.py:55
-#: nutrition/models/meal_item.py:65
+#: manager/models/setting.py:113 nutrition/models/meal.py:55
+#: nutrition/models/meal_item.py:66
msgid "Order"
msgstr ""
@@ -2257,7 +2255,7 @@ msgstr ""
msgid "Number of sets"
msgstr "Sarjojen määrä"
-#: manager/models/setting.py:48
+#: manager/models/setting.py:51
msgid "Sets"
msgstr "Sarjat"
@@ -2326,7 +2324,7 @@ msgstr ""
msgid "Go to current month"
msgstr ""
-#: manager/templates/calendar/month.html:188
+#: manager/templates/calendar/month.html:190
msgid "Add new log"
msgstr ""
@@ -2363,8 +2361,8 @@ msgid "Your schedules"
msgstr ""
#: manager/templates/schedule/overview.html:19
-#: manager/templates/schedule/view.html:132
-#: manager/templates/schedule/view.html:184
+#: manager/templates/schedule/view.html:131
+#: manager/templates/schedule/view.html:183
#: manager/templates/workout/overview.html:16
msgid "active"
msgstr ""
@@ -2400,29 +2398,29 @@ msgstr ""
msgid "Add schedule"
msgstr ""
-#: manager/templates/schedule/view.html:10
+#: manager/templates/schedule/view.html:9
msgid "Schedule"
msgstr ""
-#: manager/templates/schedule/view.html:86
+#: manager/templates/schedule/view.html:85
msgid ""
"This schedule is a loop and will go through the workouts above till you "
"deactivate it"
msgstr ""
-#: manager/templates/schedule/view.html:104
+#: manager/templates/schedule/view.html:103
msgid "Weeks"
msgstr ""
-#: manager/templates/schedule/view.html:116
+#: manager/templates/schedule/view.html:115
msgid "Move me"
msgstr ""
-#: manager/templates/schedule/view.html:157
+#: manager/templates/schedule/view.html:156
msgid "Start schedule"
msgstr ""
-#: manager/templates/schedule/view.html:188
+#: manager/templates/schedule/view.html:187
#, python-format
msgid ""
"%(weeks)s Week\n"
@@ -2433,11 +2431,11 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: manager/templates/schedule/view.html:222
+#: manager/templates/schedule/view.html:221
msgid "Adding workouts"
msgstr ""
-#: manager/templates/schedule/view.html:224
+#: manager/templates/schedule/view.html:223
msgid ""
"Add as many workouts to the schedule as you want. You can\n"
" edit the order by dragging and dropping them. It's also possible "
@@ -2445,21 +2443,21 @@ msgid ""
" than once."
msgstr ""
-#: manager/templates/schedule/view.html:233
-#: manager/templates/schedule/view.html:244
-#: manager/templates/schedule/view.html:291
-#: manager/templates/workout/view.html:71
-#: manager/templates/workout/view.html:81
-#: manager/templates/workout/view.html:180
+#: manager/templates/schedule/view.html:232
+#: manager/templates/schedule/view.html:243
+#: manager/templates/schedule/view.html:290
+#: manager/templates/workout/view.html:69
+#: manager/templates/workout/view.html:79
+#: manager/templates/workout/view.html:178
msgid "Export calendar file"
msgstr ""
-#: manager/templates/schedule/view.html:237
+#: manager/templates/schedule/view.html:236
msgid "Export this schedule as a calendar file."
msgstr ""
-#: manager/templates/schedule/view.html:238
-#: manager/templates/workout/view.html:76
+#: manager/templates/schedule/view.html:237
+#: manager/templates/workout/view.html:74
msgid ""
"You can then import the file it into your calendar\n"
" application for example google calendar, outlook or "
@@ -2468,18 +2466,18 @@ msgid ""
"appropriate exercises."
msgstr ""
-#: manager/templates/schedule/view.html:259
-#: manager/templates/schedule/view.html:295
-#: manager/templates/workout/view.html:96
-#: manager/templates/workout/view.html:176
+#: manager/templates/schedule/view.html:258
+#: manager/templates/schedule/view.html:294
+#: manager/templates/workout/view.html:94
+#: manager/templates/workout/view.html:174
msgid "Download as PDF"
msgstr "Lataa PDF:nä"
-#: manager/templates/schedule/view.html:300
+#: manager/templates/schedule/view.html:299
msgid "Edit schedule"
msgstr ""
-#: manager/templates/schedule/view.html:305
+#: manager/templates/schedule/view.html:304
msgid "Delete schedule"
msgstr ""
@@ -2601,12 +2599,12 @@ msgid "Mark as workout"
msgstr "Esimerkkiharjoitus"
#: manager/templates/workout/template_view.html:65
-#: manager/templates/workout/view.html:51
+#: manager/templates/workout/view.html:49
msgid "Muscles trained"
msgstr ""
#: manager/templates/workout/template_view.html:68
-#: manager/templates/workout/view.html:54
+#: manager/templates/workout/view.html:52
msgid ""
"Images show combined muscles as trained by the exercises on the workout."
msgstr ""
@@ -2615,35 +2613,35 @@ msgstr ""
msgid "Use this template"
msgstr ""
-#: manager/templates/workout/view.html:45
+#: manager/templates/workout/view.html:43
msgid "Add training days"
msgstr ""
-#: manager/templates/workout/view.html:46
+#: manager/templates/workout/view.html:44
msgid "Add workout sets to days"
msgstr ""
-#: manager/templates/workout/view.html:47
+#: manager/templates/workout/view.html:45
msgid "Set the repetitions for each set"
msgstr ""
-#: manager/templates/workout/view.html:75
+#: manager/templates/workout/view.html:73
msgid "Export this workout as a calendar file."
msgstr ""
-#: manager/templates/workout/view.html:146
+#: manager/templates/workout/view.html:144
msgid "Logs"
msgstr ""
-#: manager/templates/workout/view.html:148
+#: manager/templates/workout/view.html:146
msgid "View logs"
msgstr ""
-#: manager/templates/workout/view.html:171 manager/views/schedule_step.py:99
+#: manager/templates/workout/view.html:169 manager/views/schedule_step.py:99
msgid "Edit workout"
msgstr ""
-#: manager/templates/workout/view.html:184 manager/views/workout.py:281
+#: manager/templates/workout/view.html:182 manager/views/workout.py:281
msgid "Mark as template"
msgstr ""
@@ -2690,109 +2688,95 @@ msgstr ""
msgid "Value"
msgstr ""
-#: nutrition/forms.py:117
+#: nutrition/forms.py:118
#, fuzzy
#| msgid "Height (cm)"
msgid "Height (in)"
msgstr "Pituus (cm)"
-#: nutrition/forms.py:120
+#: nutrition/forms.py:121
#, fuzzy
#| msgid "Height (cm)"
msgid "Weight (kg)"
msgstr "Pituus (cm)"
-#: nutrition/forms.py:120
+#: nutrition/forms.py:121
#, fuzzy
#| msgid "Height (cm)"
msgid "Weight (lbs)"
msgstr "Pituus (cm)"
-#: nutrition/forms.py:133
+#: nutrition/forms.py:134
msgid "Calculate"
msgstr ""
-#: nutrition/forms.py:207 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:208 nutrition/templates/rate/form.html:76
msgid "Basic caloric intake"
msgstr ""
-#: nutrition/forms.py:208
+#: nutrition/forms.py:209
msgid "Your basic caloric intake as calculated for your data"
msgstr ""
-#: nutrition/forms.py:213
+#: nutrition/forms.py:214
msgid "Additional calories"
msgstr ""
-#: nutrition/forms.py:215
+#: nutrition/forms.py:216
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
msgstr ""
-#: nutrition/forms.py:248 nutrition/models/ingredient_weight_unit.py:39
-#: nutrition/models/log.py:84 nutrition/models/meal_item.py:53
+#: nutrition/forms.py:249 nutrition/models/ingredient_weight_unit.py:39
+#: nutrition/models/log.py:87 nutrition/models/meal_item.py:54
msgid "Ingredient"
msgstr ""
-#: nutrition/models/ingredient.py:131
+#: nutrition/models/ingredient.py:117
msgid "In kcal per 100g"
msgstr ""
-#: nutrition/models/ingredient.py:138 nutrition/models/ingredient.py:146
-#: nutrition/models/ingredient.py:156 nutrition/models/ingredient.py:164
-#: nutrition/models/ingredient.py:174 nutrition/models/ingredient.py:184
-#: nutrition/models/ingredient.py:194
+#: nutrition/models/ingredient.py:124 nutrition/models/ingredient.py:132
+#: nutrition/models/ingredient.py:142 nutrition/models/ingredient.py:150
+#: nutrition/models/ingredient.py:160 nutrition/models/ingredient.py:170
+#: nutrition/models/ingredient.py:180
msgid "In g per 100g of product"
msgstr ""
-#: nutrition/models/ingredient.py:155
-#: nutrition/templates/ingredient/view.html:96 nutrition/views/plan.py:259
+#: nutrition/models/ingredient.py:141
+#: nutrition/templates/ingredient/view.html:70 nutrition/views/plan.py:259
msgid "Sugar content in carbohydrates"
msgstr ""
-#: nutrition/models/ingredient.py:173
-#: nutrition/templates/ingredient/view.html:112 nutrition/views/plan.py:273
+#: nutrition/models/ingredient.py:159
+#: nutrition/templates/ingredient/view.html:86 nutrition/views/plan.py:273
msgid "Saturated fat content in fats"
msgstr ""
-#: nutrition/models/ingredient.py:183
-#: nutrition/templates/ingredient/view.html:134 nutrition/views/plan.py:279
-msgid "Fibres"
+#: nutrition/models/ingredient.py:169
+#: nutrition/templates/ingredient/view.html:108 nutrition/views/plan.py:279
+msgid "Fiber"
msgstr ""
-#: nutrition/models/ingredient.py:193
-#: nutrition/templates/ingredient/view.html:144 nutrition/views/plan.py:285
+#: nutrition/models/ingredient.py:179
+#: nutrition/templates/ingredient/view.html:118 nutrition/views/plan.py:285
msgid "Sodium"
msgstr ""
-#: nutrition/models/ingredient.py:215
+#: nutrition/models/ingredient.py:209
msgid "Link to product"
msgstr ""
-#: nutrition/models/ingredient.py:244
+#: nutrition/models/ingredient.py:238
msgid "Brand name of product"
msgstr ""
-#: nutrition/models/ingredient.py:304
+#: nutrition/models/ingredient.py:305
#, python-brace-format
msgid "The total energy ({self.energy}kcal) is not the approximate sum of the "
msgstr ""
-#: nutrition/models/ingredient.py:383 nutrition/views/ingredient.py:196
-msgid "Ingredient was successfully added to the general database"
-msgstr ""
-
-#: nutrition/models/ingredient.py:408
-msgid "New user submitted ingredient"
-msgstr ""
-
-#: nutrition/models/ingredient.py:410
-#, python-brace-format
-msgid ""
-"The user {request.user.username} submitted a new ingredient \"{self.name}\"."
-msgstr ""
-
#: nutrition/models/ingredient_category.py:31
msgid "Ingredient Categories"
msgstr ""
@@ -2805,16 +2789,16 @@ msgstr ""
msgid "Unit amount, e.g. \"1 Cup\" or \"1/2 spoon\""
msgstr ""
-#: nutrition/models/log.py:49 nutrition/models/meal.py:50
-#: nutrition/models/meal_item.py:47 nutrition/models/plan.py:106
+#: nutrition/models/log.py:52 nutrition/models/meal.py:50
+#: nutrition/models/meal_item.py:48 nutrition/models/plan.py:108
msgid "Nutrition plan"
msgstr ""
-#: nutrition/models/log.py:58
+#: nutrition/models/log.py:61
msgid "Meal"
msgstr ""
-#: nutrition/models/log.py:68
+#: nutrition/models/log.py:71
msgid "Date and Time (Approx.)"
msgstr ""
@@ -2834,11 +2818,11 @@ msgid ""
"summer\""
msgstr ""
-#: nutrition/models/plan.py:88
+#: nutrition/models/plan.py:90
msgid "Use daily calories"
msgstr ""
-#: nutrition/models/plan.py:91
+#: nutrition/models/plan.py:93
msgid ""
"Tick the box if you want to mark this plan as having a goal amount of "
"calories. You can use the calculator or enter the value yourself."
@@ -2949,64 +2933,36 @@ msgstr ""
msgid "Add ingredient"
msgstr ""
-#: nutrition/templates/ingredient/pending.html:14
-msgid "Submission date"
-msgstr ""
-
-#: nutrition/templates/ingredient/view.html:27
-msgid "Ingredient is pending review"
-msgstr ""
-
-#: nutrition/templates/ingredient/view.html:28
-msgid ""
-"This user submitted ingredient is pending a decision to be\n"
-"included in the database. Till then, it will not be shown in the overview "
-"or\n"
-"the search."
-msgstr ""
-
-#: nutrition/templates/ingredient/view.html:31
-msgid "Please select one of the options below."
-msgstr ""
-
-#: nutrition/templates/ingredient/view.html:38
-msgid "Accept"
-msgstr ""
-
-#: nutrition/templates/ingredient/view.html:42
-msgid "Decline"
-msgstr ""
-
-#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:229
+#: nutrition/templates/ingredient/view.html:45 nutrition/views/plan.py:229
msgid "Macronutrients"
msgstr ""
-#: nutrition/templates/ingredient/view.html:80
+#: nutrition/templates/ingredient/view.html:54
msgid "kJ"
msgstr ""
-#: nutrition/templates/ingredient/view.html:101
-#: nutrition/templates/ingredient/view.html:117
-#: nutrition/templates/ingredient/view.html:139
-#: nutrition/templates/ingredient/view.html:149
+#: nutrition/templates/ingredient/view.html:75
+#: nutrition/templates/ingredient/view.html:91
+#: nutrition/templates/ingredient/view.html:113
+#: nutrition/templates/ingredient/view.html:123
msgid "n.A."
msgstr ""
-#: nutrition/templates/ingredient/view.html:128
+#: nutrition/templates/ingredient/view.html:102
msgid "Others"
msgstr ""
-#: nutrition/templates/ingredient/view.html:170
+#: nutrition/templates/ingredient/view.html:144
#: nutrition/templates/units/list.html:46 nutrition/views/unit.py:86
msgid "Add new weight unit"
msgstr ""
-#: nutrition/templates/ingredient/view.html:232
-#: nutrition/templates/ingredient/view.html:235
+#: nutrition/templates/ingredient/view.html:206
+#: nutrition/templates/ingredient/view.html:209
msgid "Edit ingredient"
msgstr ""
-#: nutrition/templates/ingredient/view.html:239
+#: nutrition/templates/ingredient/view.html:213
msgid "Delete ingredient"
msgstr ""
@@ -3090,14 +3046,10 @@ msgstr ""
msgid "56 to 90"
msgstr ""
-#: nutrition/views/ingredient.py:154
+#: nutrition/views/ingredient.py:157
msgid "Add a new ingredient"
msgstr ""
-#: nutrition/views/ingredient.py:209
-msgid "Ingredient was successfully marked as rejected"
-msgstr ""
-
#: nutrition/views/plan.py:120
msgid "Nutritional plan"
msgstr ""
@@ -3142,50 +3094,59 @@ msgid ""
msgstr ""
#: software/templates/about_us.html:18
-msgid "Source code"
-msgstr ""
-
-#: software/templates/about_us.html:20
-msgid "Get the source code of this application and its server on github"
-msgstr ""
-
-#: software/templates/about_us.html:25
msgid "Have a problem or idea?"
msgstr ""
-#: software/templates/about_us.html:27
+#: software/templates/about_us.html:20
msgid ""
"Get in touch if something didn't behave as expected or if there is a feature "
"that you feel is missing."
msgstr ""
-#: software/templates/about_us.html:32
+#: software/templates/about_us.html:26
msgid "Say hi!"
msgstr ""
-#: software/templates/about_us.html:34
+#: software/templates/about_us.html:28
msgid "If you want to chat with us, hop on the Discord server and get in touch"
msgstr ""
-#: software/templates/about_us.html:39 software/templates/features.html:503
+#: software/templates/about_us.html:33
+msgid "Mastodon"
+msgstr ""
+
+#: software/templates/about_us.html:35
+msgid "Follow us on mastodon for updates and news about the project"
+msgstr ""
+
+#: software/templates/about_us.html:40 software/templates/features.html:503
msgid "Translation"
msgstr ""
-#: software/templates/about_us.html:41
+#: software/templates/about_us.html:42
msgid ""
"This application is translated on weblate. If you also want to help, click "
"the link and start translating"
msgstr ""
-#: software/templates/about_us.html:50
+#: software/templates/about_us.html:47
+msgid "Source code"
+msgstr ""
+
+#: software/templates/about_us.html:49
+msgid "Get the source code of this application and its server on github"
+msgstr ""
+
+#: software/templates/about_us.html:59
msgid "Our goal"
msgstr ""
-#: software/templates/about_us.html:53
+#: software/templates/about_us.html:62
msgid ""
"The goal is to build an awesome\n"
" and flexible fitness manager, along with a comprehensive and "
-"complete list of exercises and\n"
+"complete list of\n"
+" exercises and\n"
" ingredients, all released under a free license."
msgstr ""
@@ -3195,12 +3156,6 @@ msgid ""
"your exercises and workouts."
msgstr ""
-#: software/templates/features.html:45
-#, fuzzy
-#| msgid "About us"
-msgid "About"
-msgstr "Meistä"
-
#: software/templates/features.html:57
msgid "Mobile app"
msgstr ""
@@ -3440,18 +3395,6 @@ msgid ""
"to its own copyright."
msgstr ""
-#: utils/models.py:130
-msgid "Pending"
-msgstr ""
-
-#: utils/models.py:131
-msgid "Accepted"
-msgstr ""
-
-#: utils/models.py:132
-msgid "Declined"
-msgstr ""
-
#: weight/forms.py:54
msgid "Input"
msgstr ""
@@ -3464,7 +3407,7 @@ msgstr ""
msgid "You have to enter your weight"
msgstr ""
-#: weight/models.py:60
+#: weight/models.py:78
msgid "Weight entry"
msgstr ""
@@ -3581,6 +3524,11 @@ msgstr ""
msgid "Delete weight entry for the %s"
msgstr ""
+#, fuzzy
+#~| msgid "About us"
+#~ msgid "About"
+#~ msgstr "Meistä"
+
#~ msgid "Share"
#~ msgstr "Jaa"
diff --git a/wger/locale/fr/LC_MESSAGES/django.po b/wger/locale/fr/LC_MESSAGES/django.po
index 257da1486..348ce9f85 100644
--- a/wger/locale/fr/LC_MESSAGES/django.po
+++ b/wger/locale/fr/LC_MESSAGES/django.po
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: wger Workout Manager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-02-02 12:42+0100\n"
+"POT-Creation-Date: 2024-07-14 15:49+0200\n"
"PO-Revision-Date: 2024-07-09 08:09+0000\n"
"Last-Translator: florent4014 <[email protected]>\n"
"Language-Team: French <https://hosted.weblate.org/projects/wger/web/fr/>\n"
@@ -45,7 +45,7 @@ msgstr ""
"assigner à chaque utilisateur non enregistré ainsi qu'aux utilisateurs sans "
"activités."
-#: config/views/gym_config.py:42 core/templates/language/view.html:63
+#: config/views/gym_config.py:42 core/templates/language/view.html:67
#: core/templates/license/list.html:17 core/templates/misc/license/list.html:18
#: core/templates/repetition_unit/list.html:18
#: core/templates/tags/render_day.html:39
@@ -65,8 +65,8 @@ msgstr ""
#: manager/templates/calendar/day.html:68
#: manager/templates/calendar/month.html:85
#: manager/templates/calendar/partial_overview_table.html:18
-#: manager/templates/schedule/view.html:119
-#: nutrition/templates/ingredient/view.html:191
+#: manager/templates/schedule/view.html:118
+#: nutrition/templates/ingredient/view.html:165
#: nutrition/templates/units/list.html:19
msgid "Edit"
msgstr "Modifier"
@@ -100,8 +100,8 @@ msgstr "Mon programme d’entraînement"
msgid "Empty placeholder schedule"
msgstr "Programme vide de démonstration"
-#: core/forms.py:69 core/templates/navigation.html:275
-#: core/templates/navigation.html:281 core/templates/user/login.html:4
+#: core/forms.py:69 core/templates/navigation.html:285
+#: core/templates/navigation.html:291 core/templates/user/login.html:4
#: software/templates/features.html:82 software/templates/features.html:427
msgid "Login"
msgstr "Se connecter"
@@ -175,7 +175,7 @@ msgstr "Mot de passe"
msgid "Please enter your current password."
msgstr "Veuillez entrer votre mot de passe actuel."
-#: core/forms.py:242 core/templates/language/view.html:68
+#: core/forms.py:242 core/templates/language/view.html:73
#: core/templates/license/list.html:19 core/templates/misc/license/list.html:22
#: core/templates/repetition_unit/list.html:20
#: core/templates/tags/render_day.html:45
@@ -190,10 +190,10 @@ msgstr "Veuillez entrer votre mot de passe actuel."
#: gym/templates/gym/list.html:22 manager/templates/calendar/day.html:73
#: manager/templates/calendar/month.html:89
#: manager/templates/calendar/partial_overview_table.html:23
-#: manager/templates/schedule/view.html:123
-#: manager/templates/workout/view.html:190
-#: nutrition/templates/ingredient/view.html:192
-#: nutrition/templates/ingredient/view.html:241
+#: manager/templates/schedule/view.html:122
+#: manager/templates/workout/view.html:188
+#: nutrition/templates/ingredient/view.html:166
+#: nutrition/templates/ingredient/view.html:215
#: nutrition/templates/units/list.html:22
msgid "Delete"
msgstr "Supprimer"
@@ -206,14 +206,14 @@ msgstr "Mot de passe invalide"
msgid "The form is secured with reCAPTCHA"
msgstr "Le formulaire est sécurisé avec reCAPTCHA"
-#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:275
-#: core/templates/navigation.html:287 core/templates/template.html:147
+#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:285
+#: core/templates/navigation.html:297 core/templates/template.html:149
#: core/templates/user/login.html:20 core/views/user.py:298
#: software/templates/features.html:87 software/templates/features.html:422
msgid "Register"
msgstr "S’inscrire"
-#: core/forms.py:315
+#: core/forms.py:315 software/templates/features.html:45
msgid "Contact"
msgstr "Contact"
@@ -222,7 +222,7 @@ msgid "Some way of answering you (e-mail, etc.)"
msgstr "Un moyen de vous répondre (courriel, etc.)"
#: core/forms.py:324 exercises/models/comment.py:58 manager/models/set.py:61
-#: manager/models/setting.py:111 nutrition/models/log.py:74
+#: manager/models/setting.py:114 nutrition/models/log.py:77
msgid "Comment"
msgstr "Commentaire"
@@ -242,6 +242,12 @@ msgstr "Nom court de la langue"
msgid "Language full name"
msgstr "Nom complet de la langue"
+#: core/models/language.py:45 core/templates/language/view.html:23
+#, fuzzy
+#| msgid "Language full name"
+msgid "Language full name in English"
+msgstr "Nom complet de la langue"
+
#: core/models/license.py:29
msgid "Full name"
msgstr "Nom complet"
@@ -258,7 +264,7 @@ msgstr ""
msgid "Short name, e.g. CC-BY-SA 3"
msgstr "Abbréviation, e.g. CC-BY-SA 3"
-#: core/models/license.py:45 nutrition/models/ingredient.py:214
+#: core/models/license.py:45 nutrition/models/ingredient.py:208
msgid "Link"
msgstr "Lien"
@@ -376,7 +382,7 @@ msgstr ""
msgid "Age"
msgstr "Âge"
-#: core/models/profile.py:230 nutrition/forms.py:117
+#: core/models/profile.py:230 nutrition/forms.py:118
msgid "Height (cm)"
msgstr "Taille (cm)"
@@ -427,7 +433,7 @@ msgid "Total caloric intake, including e.g. any surplus"
msgstr "Total des entrées caloriques, incluant les suppléments"
#: core/models/profile.py:333 nutrition/models/ingredient_weight_unit.py:45
-#: nutrition/models/log.py:93 nutrition/models/meal_item.py:58
+#: nutrition/models/log.py:96 nutrition/models/meal_item.py:59
msgid "Weight unit"
msgstr "Unité de poids"
@@ -461,17 +467,16 @@ msgstr "La somme des heures doit être de 24"
#: core/models/rep_unit.py:36 core/models/weight_unit.py:36
#: core/templates/user/overview.html:262 core/views/user.py:599
#: exercises/models/category.py:29 exercises/models/equipment.py:29
-#: exercises/models/exercise.py:58 exercises/models/muscle.py:36
+#: exercises/models/exercise.py:59 exercises/models/muscle.py:36
#: gym/models/contract.py:52 gym/models/contract.py:103 gym/models/gym.py:46
#: gym/models/user_document.py:84 gym/templates/contract/view.html:50
#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:96
#: gym/views/gym.py:158 manager/models/schedule.py:55
#: manager/models/workout.py:57 measurements/models/category.py:36
-#: nutrition/models/ingredient.py:125
+#: nutrition/models/ingredient.py:111
#: nutrition/models/ingredient_category.py:27 nutrition/models/meal.py:67
#: nutrition/models/weight_unit.py:38
-#: nutrition/templates/ingredient/pending.html:15
-#: nutrition/templates/ingredient/view.html:178
+#: nutrition/templates/ingredient/view.html:152
msgid "Name"
msgstr "Nom"
@@ -515,8 +520,8 @@ msgid ""
" "
msgstr ""
"Vous êtes\n"
-" en train de naviguer sur le site en tant qu’utilisateur « %(current_user)"
-"s », toutes les actions sont effectuées sur ses données.\n"
+" en train de naviguer sur le site en tant qu’utilisateur "
+"« %(current_user)s », toutes les actions sont effectuées sur ses données.\n"
" "
#: core/templates/base.html:14 core/templates/base_wide.html:11
@@ -578,24 +583,24 @@ msgstr ""
msgid "Dashboard"
msgstr "Tableau de bord"
-#: core/templates/language/overview.html:4 core/templates/navigation.html:335
+#: core/templates/language/overview.html:4 core/templates/navigation.html:345
msgid "Languages"
msgstr "Langues"
-#: core/templates/language/overview.html:20
+#: core/templates/language/overview.html:22
msgid "Nothing found."
msgstr "Rien trouvé."
-#: core/templates/language/overview.html:20
+#: core/templates/language/overview.html:22
#: manager/templates/calendar/month.html:132
#: manager/templates/schedule/overview.html:28
-#: manager/templates/schedule/view.html:145
+#: manager/templates/schedule/view.html:144
#: manager/templates/workout/overview.html:28
#: nutrition/templates/ingredient/overview.html:38
msgid "Add one now."
msgstr "En ajouter une."
-#: core/templates/language/overview.html:33 core/templates/license/list.html:40
+#: core/templates/language/overview.html:35 core/templates/license/list.html:40
#: core/templates/misc/license/list.html:43
#: core/templates/repetition_unit/list.html:43
#: core/templates/user/overview.html:326 core/templates/user/overview.html:365
@@ -615,13 +620,13 @@ msgstr "En ajouter une."
msgid "Add"
msgstr "Ajouter"
-#: core/templates/language/view.html:58 core/templates/user/api_key.html:44
+#: core/templates/language/view.html:61 core/templates/user/api_key.html:44
#: core/templates/user/preferences.html:45 gym/models/contract.py:203
#: gym/templates/contract/view.html:41 gym/templates/contract/view.html:106
#: gym/templates/gym/member_list.html:248
-#: manager/templates/schedule/view.html:286
-#: manager/templates/workout/view.html:165
-#: nutrition/templates/ingredient/view.html:228
+#: manager/templates/schedule/view.html:285
+#: manager/templates/workout/view.html:163
+#: nutrition/templates/ingredient/view.html:202
msgid "Options"
msgstr "Options"
@@ -646,12 +651,11 @@ msgstr "Liste des licences"
#: gym/templates/gym/member_list.html:299
#: mailer/templates/mailer/gym/overview.html:30
#: manager/templates/calendar/day.html:87
-#: nutrition/templates/ingredient/pending.html:30
#: nutrition/templates/units/list.html:29
msgid "Nothing found"
msgstr "Rien trouvé"
-#: core/templates/misc/about.html:4 core/templates/template.html:173
+#: core/templates/misc/about.html:4 core/templates/template.html:175
msgid "Imprint"
msgstr "Informations légales"
@@ -664,174 +668,169 @@ msgstr ""
"Si une licence a été localisée, par exemple les licences Creative Commons\n"
"pour les différents pays, ajoutez-les comme des entrées distinctes ici."
-#: core/templates/navigation.html:27 software/templates/features.html:437
+#: core/templates/navigation.html:28 software/templates/features.html:437
msgid "Training"
msgstr "Formation"
-#: core/templates/navigation.html:34 core/templates/user/overview.html:25
+#: core/templates/navigation.html:37 core/templates/user/overview.html:25
msgid "Workouts"
msgstr "Entraînements"
-#: core/templates/navigation.html:42
+#: core/templates/navigation.html:46
msgid "Workouts schedules"
msgstr "Planifications d’entraînements"
-#: core/templates/navigation.html:50 core/templates/user/overview.html:70
+#: core/templates/navigation.html:54 core/templates/user/overview.html:70
#: manager/templates/calendar/month.html:10
#: manager/templates/calendar/month.html:21
msgid "Calendar"
msgstr "Calendrier"
-#: core/templates/navigation.html:60
+#: core/templates/navigation.html:64
msgid "Measurements"
msgstr "Macronutriments"
-#: core/templates/navigation.html:70 gallery/templates/images/overview.html:6
+#: core/templates/navigation.html:75 gallery/templates/images/overview.html:6
msgid "Gallery"
msgstr "Galerie"
-#: core/templates/navigation.html:76
+#: core/templates/navigation.html:81
msgid "Workout templates"
msgstr "Modèles d'entraînement"
-#: core/templates/navigation.html:82 manager/views/workout.py:84
+#: core/templates/navigation.html:88 manager/views/workout.py:84
msgid "Your templates"
msgstr "Vos modèles"
-#: core/templates/navigation.html:90 manager/views/workout.py:98
+#: core/templates/navigation.html:97 manager/views/workout.py:98
msgid "Public templates"
msgstr "Modèles publics"
-#: core/templates/navigation.html:97 manager/forms.py:129
-#: manager/models/setting.py:54 software/templates/features.html:51
+#: core/templates/navigation.html:105 manager/forms.py:129
+#: manager/models/setting.py:57 software/templates/features.html:51
#: software/templates/features.html:459
msgid "Exercises"
msgstr "Exercices"
-#: core/templates/navigation.html:103 core/templates/navigation.html:170
-#: core/templates/navigation.html:330
+#: core/templates/navigation.html:111 core/templates/navigation.html:184
+#: core/templates/navigation.html:340
msgid "Administration"
msgstr "Administration"
-#: core/templates/navigation.html:106
+#: core/templates/navigation.html:115
msgid "Exercise edit history"
msgstr "Historique d'édition d'exercice"
-#: core/templates/navigation.html:111 exercises/models/base.py:103
+#: core/templates/navigation.html:121 exercises/models/base.py:103
msgid "Equipment"
msgstr "Équipement"
-#: core/templates/navigation.html:116
+#: core/templates/navigation.html:127
msgid "Muscles"
msgstr "Muscles"
-#: core/templates/navigation.html:121
+#: core/templates/navigation.html:133
#: exercises/templates/categories/admin-overview.html:4
msgid "Categories"
msgstr "Catégories"
-#: core/templates/navigation.html:136 software/templates/features.html:447
+#: core/templates/navigation.html:148 software/templates/features.html:447
msgid "Nutrition"
msgstr "Nutrition"
-#: core/templates/navigation.html:143 core/templates/user/overview.html:144
+#: core/templates/navigation.html:156 core/templates/user/overview.html:144
msgid "Nutrition plans"
msgstr "Plans de nutrition"
-#: core/templates/navigation.html:151 nutrition/templates/bmi/form.html:50
+#: core/templates/navigation.html:165 nutrition/templates/bmi/form.html:50
msgid "BMI calculator"
msgstr "Calculateur d’IMC"
-#: core/templates/navigation.html:159 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:174 nutrition/templates/rate/form.html:17
msgid "Daily calories calculator"
msgstr "Calculateur de calories quotidiennes"
-#: core/templates/navigation.html:165
+#: core/templates/navigation.html:179
#: nutrition/templates/ingredient/overview.html:10
msgid "Ingredient overview"
msgstr "Aperçu ingrédients"
-#: core/templates/navigation.html:172 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:187 nutrition/templates/units/list.html:6
msgid "Ingredient weight units"
msgstr "Unité de poids des ingrédients"
-#: core/templates/navigation.html:177
-#: nutrition/templates/ingredient/pending.html:6
-msgid "Ingredients pending review"
-msgstr "Ingrédients en attente d'examen"
-
-#: core/templates/navigation.html:193 software/templates/features.html:442
+#: core/templates/navigation.html:203 software/templates/features.html:442
msgid "Body weight"
msgstr "Poids corporel"
-#: core/templates/navigation.html:200 core/templates/user/overview.html:114
+#: core/templates/navigation.html:210 core/templates/user/overview.html:114
msgid "Weight overview"
msgstr "Aperçu poids"
-#: core/templates/navigation.html:207 weight/views.py:65
+#: core/templates/navigation.html:217 weight/views.py:65
msgid "Add weight entry"
msgstr "Ajouter une entrée"
-#: core/templates/navigation.html:221
+#: core/templates/navigation.html:231
msgid "About this software"
msgstr "À propos de ce logiciel"
-#: core/templates/navigation.html:227 software/templates/about_us.html:5
+#: core/templates/navigation.html:237 software/templates/about_us.html:5
msgid "About us"
msgstr "À propos de nous"
-#: core/templates/navigation.html:233 software/templates/features.html:507
+#: core/templates/navigation.html:243 software/templates/features.html:507
msgid "REST API"
msgstr "API REST"
-#: core/templates/navigation.html:239 utils/models.py:45
+#: core/templates/navigation.html:249 utils/models.py:45
msgid "License"
msgstr "Licence"
-#: core/templates/navigation.html:245
+#: core/templates/navigation.html:255
msgid "Developer documentation"
msgstr "Documentation du développeur"
-#: core/templates/navigation.html:252
+#: core/templates/navigation.html:262
msgid "Get the code"
msgstr "Récupérer le code"
-#: core/templates/navigation.html:259 core/templates/template.html:212
+#: core/templates/navigation.html:269 core/templates/template.html:214
#: software/templates/features.html:582
msgid "Translate"
msgstr "Traduire"
-#: core/templates/navigation.html:293 core/templates/user/login.html:28
+#: core/templates/navigation.html:303 core/templates/user/login.html:28
msgid "Reset password"
msgstr "Réinitialiser le mot de passe"
-#: core/templates/navigation.html:311
+#: core/templates/navigation.html:321
msgid "My preferences"
msgstr "Mes préférences"
-#: core/templates/navigation.html:320
+#: core/templates/navigation.html:330
msgid "Logout"
msgstr "Se déconnecter"
-#: core/templates/navigation.html:343
+#: core/templates/navigation.html:353
msgid "Licenses"
msgstr "Licences"
-#: core/templates/navigation.html:351
+#: core/templates/navigation.html:361
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr "Unités de répétition"
-#: core/templates/navigation.html:359 core/templates/weight_unit/list.html:4
-#: nutrition/templates/ingredient/view.html:167
+#: core/templates/navigation.html:369 core/templates/weight_unit/list.html:4
+#: nutrition/templates/ingredient/view.html:141
msgid "Weight units"
msgstr "Unité de poids"
-#: core/templates/navigation.html:367 core/templates/user/list.html:4
+#: core/templates/navigation.html:377 core/templates/user/list.html:4
msgid "User list"
msgstr "Liste des utilisateurs"
-#: core/templates/navigation.html:373
+#: core/templates/navigation.html:383
msgid "Gyms"
msgstr "Activités"
@@ -888,12 +887,12 @@ msgstr "Merci d’utiliser notre site !"
msgid "The %(site_name)s team"
msgstr "L’équipe de %(site_name)s"
-#: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:11
+#: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:12
msgid "previous"
msgstr "précédent"
-#: core/templates/tags/pagination.html:31
-#: core/templates/tags/pagination.html:35
+#: core/templates/tags/pagination.html:33
+#: core/templates/tags/pagination.html:38
msgid "next"
msgstr "suivant"
@@ -918,36 +917,36 @@ msgid "Add exercises to this workout day"
msgstr "Ajouter des exercices à cette séance"
#: core/templates/tags/render_weight_log.html:17 manager/helpers.py:86
-#: manager/models/setting.py:69 manager/templates/set/formset.html:9
+#: manager/models/setting.py:72 manager/templates/set/formset.html:9
msgid "Reps"
msgstr "Reps"
#: core/templates/tags/render_weight_log.html:30 manager/forms.py:191
-#: manager/models/log.py:103 manager/models/setting.py:99
+#: manager/models/log.py:103 manager/models/setting.py:102
#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
msgid "RiR"
msgstr "ReR"
-#: core/templates/template.html:120 manager/templates/calendar/month.html:138
-#: manager/templates/schedule/view.html:249
-#: manager/templates/schedule/view.html:270
-#: manager/templates/workout/view.html:86
-#: manager/templates/workout/view.html:139
+#: core/templates/template.html:122 manager/templates/calendar/month.html:138
+#: manager/templates/schedule/view.html:248
+#: manager/templates/schedule/view.html:269
+#: manager/templates/workout/view.html:84
+#: manager/templates/workout/view.html:137
msgid "Close"
msgstr "Fermer"
-#: core/templates/template.html:136
+#: core/templates/template.html:138
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:141
+#: core/templates/template.html:143
msgid "Create some demo entries"
msgstr "Créer des entrées de démo"
-#: core/templates/template.html:178 software/templates/features.html:547
+#: core/templates/template.html:180 software/templates/features.html:547
#: software/templates/tos.html:7
msgid "Terms of service"
msgstr "Conditions d’utilisation"
@@ -1050,7 +1049,7 @@ msgid "Overview"
msgstr "Aperçu"
#: core/templates/user/overview.html:28
-#: manager/templates/schedule/view.html:164
+#: manager/templates/schedule/view.html:163
#: manager/templates/workout/overview.html:39 manager/views/schedule_step.py:60
msgid "Add workout"
msgstr "Ajouter une séance"
@@ -1058,20 +1057,20 @@ msgstr "Ajouter une séance"
#: core/templates/user/overview.html:34 core/templates/user/overview.html:76
#: core/templates/user/overview.html:120 core/templates/user/overview.html:152
#: exercises/models/base.py:118 exercises/models/base.py:124
-#: exercises/models/exercise.py:63 exercises/models/exercise.py:69
+#: exercises/models/exercise.py:64 exercises/models/exercise.py:70
#: exercises/models/image.py:107 exercises/models/image.py:113
#: exercises/models/video.py:163 exercises/models/video.py:169
#: gallery/models/image.py:42 manager/helpers.py:85 manager/models/log.py:100
#: manager/models/session.py:67 measurements/models/measurement.py:47
-#: nutrition/models/ingredient.py:101 nutrition/models/ingredient.py:107
-#: nutrition/models/ingredient.py:222 weight/models.py:33
+#: nutrition/models/ingredient.py:87 nutrition/models/ingredient.py:93
+#: nutrition/models/ingredient.py:216 weight/models.py:51
#: weight/templates/import_csv_preview.html:13
#: weight/templates/import_csv_preview.html:42 weight/views.py:144
msgid "Date"
msgstr "Date"
#: core/templates/user/overview.html:35 core/templates/user/overview.html:153
-#: exercises/models/exercise.py:51 gallery/models/image.py:65
+#: exercises/models/exercise.py:52 gallery/models/image.py:65
#: gym/models/contract.py:58 gym/models/contract.py:109
#: manager/models/day.py:37 manager/models/workout.py:63
#: measurements/models/measurement.py:62 nutrition/models/plan.py:67
@@ -1089,13 +1088,13 @@ msgstr "Dernière activité"
#: core/templates/user/overview.html:58
#: manager/templates/calendar/month.html:128
-#: manager/templates/schedule/view.html:145
+#: manager/templates/schedule/view.html:144
#: manager/templates/workout/overview.html:28
msgid "No workouts found."
msgstr "Pas de séance trouvée."
#: core/templates/user/overview.html:68 manager/forms.py:280
-#: manager/templates/workout/view.html:108
+#: manager/templates/workout/view.html:106
msgid "Log"
msgstr "Journal"
@@ -1119,35 +1118,35 @@ msgstr "Temps"
#: core/templates/user/overview.html:112 core/templates/user/overview.html:121
#: manager/forms.py:186 manager/helpers.py:86 manager/models/log.py:86
-#: manager/models/setting.py:79 manager/templates/log/add.html:54
-#: manager/templates/set/formset.html:11 weight/models.py:35
+#: manager/models/setting.py:82 manager/templates/log/add.html:54
+#: manager/templates/set/formset.html:11 weight/models.py:53
#: weight/templates/import_csv_preview.html:14
#: weight/templates/import_csv_preview.html:43 weight/views.py:144
msgid "Weight"
msgstr "Poids"
-#: core/templates/user/overview.html:154 nutrition/models/ingredient.py:130
-#: nutrition/templates/ingredient/view.html:77 nutrition/views/plan.py:237
+#: core/templates/user/overview.html:154 nutrition/models/ingredient.py:116
+#: nutrition/templates/ingredient/view.html:51 nutrition/views/plan.py:237
msgid "Energy"
msgstr "Énergie"
-#: core/templates/user/overview.html:155 nutrition/models/ingredient.py:137
-#: nutrition/templates/ingredient/view.html:84 nutrition/views/plan.py:243
+#: core/templates/user/overview.html:155 nutrition/models/ingredient.py:123
+#: nutrition/templates/ingredient/view.html:58 nutrition/views/plan.py:243
msgid "Protein"
msgstr "Protéines"
-#: core/templates/user/overview.html:156 nutrition/models/ingredient.py:145
-#: nutrition/templates/ingredient/view.html:90 nutrition/views/plan.py:251
+#: core/templates/user/overview.html:156 nutrition/models/ingredient.py:131
+#: nutrition/templates/ingredient/view.html:64 nutrition/views/plan.py:251
msgid "Carbohydrates"
msgstr "Glucides"
-#: core/templates/user/overview.html:157 nutrition/models/ingredient.py:163
-#: nutrition/templates/ingredient/view.html:106 nutrition/views/plan.py:265
+#: core/templates/user/overview.html:157 nutrition/models/ingredient.py:149
+#: nutrition/templates/ingredient/view.html:80 nutrition/views/plan.py:265
msgid "Fat"
msgstr "Lipides"
#: core/templates/user/overview.html:170
-#: nutrition/templates/ingredient/view.html:79
+#: nutrition/templates/ingredient/view.html:53
msgid "kcal"
msgstr "kcal"
@@ -1159,7 +1158,7 @@ msgstr "kcal"
#: gym/templates/gym/member_list.html:207
#: gym/templates/gym/member_list.html:240
#: gym/templates/gym/member_list.html:277
-#: manager/templates/schedule/view.html:101
+#: manager/templates/schedule/view.html:100
msgid "Actions"
msgstr "Actions"
@@ -1202,7 +1201,7 @@ msgid "Details"
msgstr "Détails"
#: core/templates/user/overview.html:258 gym/views/export.py:57
-#: manager/helpers.py:86 manager/templates/schedule/view.html:99
+#: manager/helpers.py:86 manager/templates/schedule/view.html:98
msgid "Nr."
msgstr "N°"
@@ -1247,7 +1246,7 @@ msgid "Documents"
msgstr "Documents"
#: core/templates/user/overview.html:412 gym/templates/document/list.html:32
-#: manager/forms.py:292 manager/templates/workout/view.html:134
+#: manager/forms.py:292 manager/templates/workout/view.html:132
msgid "Download"
msgstr "Télécharger"
@@ -1300,13 +1299,13 @@ msgid "kg"
msgstr "kg"
#: core/templatetags/wger_extras.py:207
-#: nutrition/templates/ingredient/view.html:86
-#: nutrition/templates/ingredient/view.html:92
-#: nutrition/templates/ingredient/view.html:99
-#: nutrition/templates/ingredient/view.html:108
-#: nutrition/templates/ingredient/view.html:115
-#: nutrition/templates/ingredient/view.html:137
-#: nutrition/templates/ingredient/view.html:147
+#: nutrition/templates/ingredient/view.html:60
+#: nutrition/templates/ingredient/view.html:66
+#: nutrition/templates/ingredient/view.html:73
+#: nutrition/templates/ingredient/view.html:82
+#: nutrition/templates/ingredient/view.html:89
+#: nutrition/templates/ingredient/view.html:111
+#: nutrition/templates/ingredient/view.html:121
msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr "g"
@@ -1324,7 +1323,7 @@ msgstr "oz"
#: exercises/views/equipment.py:103 exercises/views/exercises.py:73
#: exercises/views/muscles.py:99 manager/views/schedule.py:309
#: manager/views/schedule_step.py:128 manager/views/workout.py:249
-#: manager/views/workout_session.py:142 nutrition/views/ingredient.py:116
+#: manager/views/workout_session.py:142 nutrition/views/ingredient.py:119
#: nutrition/views/unit.py:110
msgid "Successfully deleted"
msgstr "Supprimé avec succès"
@@ -1336,7 +1335,7 @@ msgstr "Supprimé avec succès"
#: gym/views/admin_notes.py:196 gym/views/document.py:206 gym/views/gym.py:481
#: manager/views/schedule.py:316 manager/views/schedule_step.py:138
#: manager/views/workout.py:253 manager/views/workout_session.py:156
-#: nutrition/views/ingredient.py:123 nutrition/views/unit.py:117
+#: nutrition/views/ingredient.py:126 nutrition/views/unit.py:117
#, python-brace-format
msgid "Delete {0}?"
msgstr "Supprimer {0} ?"
@@ -1349,7 +1348,7 @@ msgstr "Supprimer {0} ?"
#: gym/views/contract.py:186 gym/views/contract_option.py:123
#: gym/views/contract_type.py:123 gym/views/document.py:171
#: gym/views/gym.py:463 manager/views/day.py:100 manager/views/schedule.py:333
-#: manager/views/workout.py:267 nutrition/views/ingredient.py:142
+#: manager/views/workout.py:267 nutrition/views/ingredient.py:145
#: nutrition/views/unit.py:143
#, python-brace-format
msgid "Edit {0}"
@@ -1424,7 +1423,7 @@ msgstr "Activités"
msgid "A verification email was sent to %(email)s"
msgstr "Un email de vérification a été envoyé à %(email)s"
-#: exercises/models/base.py:82 nutrition/models/ingredient.py:236
+#: exercises/models/base.py:82 nutrition/models/ingredient.py:230
msgid "Category"
msgstr "Catégorie"
@@ -1444,7 +1443,7 @@ msgstr "Variations"
msgid "Exercise Categories"
msgstr "Catégorie d'exercices"
-#: exercises/models/comment.py:52 exercises/models/exercise_alias.py:52
+#: exercises/models/comment.py:52 exercises/models/exercise_alias.py:53
#: exercises/models/image.py:74 exercises/models/video.py:98
#: manager/forms.py:178 manager/helpers.py:86 manager/models/log.py:52
msgid "Exercise"
@@ -1454,12 +1453,12 @@ msgstr "Exercice"
msgid "A comment about how to correctly do this exercise."
msgstr "Un commentaire sur la meilleure manière de réaliser cet exercice."
-#: exercises/models/exercise.py:76 nutrition/models/ingredient.py:95
+#: exercises/models/exercise.py:77 nutrition/models/ingredient.py:81
#: nutrition/models/weight_unit.py:32
msgid "Language"
msgstr "Langue"
-#: exercises/models/exercise_alias.py:58
+#: exercises/models/exercise_alias.py:59
msgid "Alias for an exercise"
msgstr "Alias pour un exercice"
@@ -1592,7 +1591,7 @@ msgstr "Action"
#: manager/models/schedule.py:44 manager/models/session.py:49
#: manager/models/workout.py:89 measurements/models/category.py:31
#: measurements/models/measurement.py:42 nutrition/models/plan.py:54
-#: nutrition/templates/ingredient/pending.html:16 weight/models.py:42
+#: weight/models.py:60
msgid "User"
msgstr "Utilisateur"
@@ -1715,9 +1714,9 @@ msgid "Contract type"
msgstr "Type de contrat"
#: gym/models/contract.py:211 gym/templates/contract/view.html:59
-#: manager/templates/log/add.html:52 nutrition/forms.py:62
-#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:105
-#: nutrition/models/meal_item.py:72
+#: manager/templates/log/add.html:52 nutrition/forms.py:63
+#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:108
+#: nutrition/models/meal_item.py:73
msgid "Amount"
msgstr "Quantité"
@@ -1734,7 +1733,7 @@ msgid "Contract is active"
msgstr "Le contrat est actif"
#: gym/models/contract.py:237 gym/templates/contract/view.html:69
-#: manager/models/schedule.py:61 manager/templates/schedule/view.html:68
+#: manager/models/schedule.py:61 manager/templates/schedule/view.html:67
msgid "Start date"
msgstr "Date de début"
@@ -2128,7 +2127,7 @@ msgstr "Générer un aperçu"
#: mailer/templates/mailer/gym/form.html:28
#: mailer/templates/mailer/gym/preview.html:62
-#: manager/templates/workout/view.html:42
+#: manager/templates/workout/view.html:40
msgid "Steps"
msgstr "Étapes"
@@ -2153,7 +2152,7 @@ msgstr ""
"souhaitez avant d’envoyer les courriels"
#: mailer/templates/mailer/gym/preview.html:22
-#: software/templates/about_us.html:60
+#: software/templates/about_us.html:70
msgid "Current version"
msgstr "Version actuelle"
@@ -2186,16 +2185,16 @@ msgstr ""
"Vous pouvez rechercher plus d'un exercice à la fois, ils seront groupés "
"ensemble."
-#: manager/forms.py:140 nutrition/forms.py:252
+#: manager/forms.py:140 nutrition/forms.py:253
msgid "Also search for names in English"
msgstr "Chercher aussi le nom des ingrédients en anglais"
#: manager/forms.py:168 manager/forms.py:173 manager/models/log.py:64
-#: manager/models/log.py:92 manager/models/setting.py:59
-#: manager/models/setting.py:90 manager/templates/log/add.html:53
+#: manager/models/log.py:92 manager/models/setting.py:62
+#: manager/models/setting.py:93 manager/templates/log/add.html:53
#: manager/templates/log/add.html:55 manager/templates/set/formset.html:10
#: manager/templates/set/formset.html:12 measurements/models/category.py:41
-#: nutrition/forms.py:66
+#: nutrition/forms.py:67
msgid "Unit"
msgstr "Unité"
@@ -2203,15 +2202,15 @@ msgstr "Unité"
msgid "Type"
msgstr "Type"
-#: manager/forms.py:280 manager/templates/workout/view.html:115
+#: manager/forms.py:280 manager/templates/workout/view.html:113
msgid "Table"
msgstr "Tableau"
-#: manager/forms.py:282 manager/templates/workout/view.html:121
+#: manager/forms.py:282 manager/templates/workout/view.html:119
msgid "with images"
msgstr "avec des images"
-#: manager/forms.py:283 manager/templates/workout/view.html:127
+#: manager/forms.py:283 manager/templates/workout/view.html:125
msgid "with comments"
msgstr "avec commentaires"
@@ -2220,11 +2219,10 @@ msgid "Workout will expire soon"
msgstr "L’entraînement va bientôt expirer"
#: manager/models/day.py:34 manager/models/log.py:58
-#: manager/models/session.py:60 manager/templates/schedule/view.html:103
-#: manager/templates/workout/view.html:11
-#: manager/templates/workout/view.html:19 manager/views/pdf.py:85
-#: manager/views/pdf.py:161 manager/views/schedule.py:151
-#: manager/views/schedule.py:221
+#: manager/models/session.py:60 manager/templates/schedule/view.html:102
+#: manager/templates/workout/view.html:9 manager/templates/workout/view.html:17
+#: manager/views/pdf.py:85 manager/views/pdf.py:161
+#: manager/views/schedule.py:151 manager/views/schedule.py:221
msgid "Workout"
msgstr "Séance"
@@ -2245,7 +2243,7 @@ msgid "Name or short description of the schedule. For example 'Program XYZ'."
msgstr ""
"Nom ou courte description du programme. Par exemple : « Programme XYZ »."
-#: manager/models/schedule.py:65 manager/templates/schedule/view.html:72
+#: manager/models/schedule.py:65 manager/templates/schedule/view.html:71
msgid "Schedule active"
msgstr "Programme actif"
@@ -2259,7 +2257,7 @@ msgstr ""
"montré, notamment sur le tableau de bord). Tous les autres programmes seront "
"marqués comme inactifs"
-#: manager/models/schedule.py:77 manager/templates/schedule/view.html:82
+#: manager/models/schedule.py:77 manager/templates/schedule/view.html:81
msgid "Is a loop"
msgstr "Est une boucle"
@@ -2280,8 +2278,8 @@ msgid "The duration in weeks"
msgstr "Durée en semaines"
#: manager/models/schedule_step.py:64 manager/models/set.py:53
-#: manager/models/setting.py:110 nutrition/models/meal.py:55
-#: nutrition/models/meal_item.py:65
+#: manager/models/setting.py:113 nutrition/models/meal.py:55
+#: nutrition/models/meal_item.py:66
msgid "Order"
msgstr "Ordre"
@@ -2334,7 +2332,7 @@ msgstr "Jour d'exercice"
msgid "Number of sets"
msgstr "Nombre de séries"
-#: manager/models/setting.py:48
+#: manager/models/setting.py:51
msgid "Sets"
msgstr "Séries"
@@ -2409,7 +2407,7 @@ msgstr ""
msgid "Go to current month"
msgstr "Aller au mois courant"
-#: manager/templates/calendar/month.html:188
+#: manager/templates/calendar/month.html:190
msgid "Add new log"
msgstr "Ajouter un journal"
@@ -2450,8 +2448,8 @@ msgid "Your schedules"
msgstr "Vos programmes"
#: manager/templates/schedule/overview.html:19
-#: manager/templates/schedule/view.html:132
-#: manager/templates/schedule/view.html:184
+#: manager/templates/schedule/view.html:131
+#: manager/templates/schedule/view.html:183
#: manager/templates/workout/overview.html:16
msgid "active"
msgstr "actif"
@@ -2498,11 +2496,11 @@ msgstr ""
msgid "Add schedule"
msgstr "Ajouter un programme"
-#: manager/templates/schedule/view.html:10
+#: manager/templates/schedule/view.html:9
msgid "Schedule"
msgstr "Programme"
-#: manager/templates/schedule/view.html:86
+#: manager/templates/schedule/view.html:85
msgid ""
"This schedule is a loop and will go through the workouts above till you "
"deactivate it"
@@ -2510,19 +2508,19 @@ msgstr ""
"Ce programme est une boucle et passera par toutes séances jusqu'à ce que "
"vous l’arrêtiez"
-#: manager/templates/schedule/view.html:104
+#: manager/templates/schedule/view.html:103
msgid "Weeks"
msgstr "Semaines"
-#: manager/templates/schedule/view.html:116
+#: manager/templates/schedule/view.html:115
msgid "Move me"
msgstr "Déplacez-moi"
-#: manager/templates/schedule/view.html:157
+#: manager/templates/schedule/view.html:156
msgid "Start schedule"
msgstr "Démarrer le programme"
-#: manager/templates/schedule/view.html:188
+#: manager/templates/schedule/view.html:187
#, python-format
msgid ""
"%(weeks)s Week\n"
@@ -2537,37 +2535,37 @@ msgstr[1] ""
"%(weeks)s semaines\n"
" "
-#: manager/templates/schedule/view.html:222
+#: manager/templates/schedule/view.html:221
msgid "Adding workouts"
msgstr "Ajout de séances"
-#: manager/templates/schedule/view.html:224
+#: manager/templates/schedule/view.html:223
msgid ""
"Add as many workouts to the schedule as you want. You can\n"
" edit the order by dragging and dropping them. It's also possible "
"to add one workout more\n"
" than once."
msgstr ""
-"Ajoutez autant de séances d’entraînements à la planification que vous voulez."
-"\n"
+"Ajoutez autant de séances d’entraînements à la planification que vous "
+"voulez.\n"
"Vous pouvez changer l’ordre par glisser-déposer.\n"
"C’est également possible d’ajouter une séance plus d’une fois."
-#: manager/templates/schedule/view.html:233
-#: manager/templates/schedule/view.html:244
-#: manager/templates/schedule/view.html:291
-#: manager/templates/workout/view.html:71
-#: manager/templates/workout/view.html:81
-#: manager/templates/workout/view.html:180
+#: manager/templates/schedule/view.html:232
+#: manager/templates/schedule/view.html:243
+#: manager/templates/schedule/view.html:290
+#: manager/templates/workout/view.html:69
+#: manager/templates/workout/view.html:79
+#: manager/templates/workout/view.html:178
msgid "Export calendar file"
msgstr "Exporter en tant que fichier calendrier"
-#: manager/templates/schedule/view.html:237
+#: manager/templates/schedule/view.html:236
msgid "Export this schedule as a calendar file."
msgstr "Exporter ce programme dans un fichier de calendrier."
-#: manager/templates/schedule/view.html:238
-#: manager/templates/workout/view.html:76
+#: manager/templates/schedule/view.html:237
+#: manager/templates/workout/view.html:74
msgid ""
"You can then import the file it into your calendar\n"
" application for example google calendar, outlook or "
@@ -2575,23 +2573,23 @@ msgid ""
" an appointment for each training day with the "
"appropriate exercises."
msgstr ""
-"Vous pouvez ensuite importer le fichier dans votre application de calendrier,"
-"\n"
+"Vous pouvez ensuite importer le fichier dans votre application de "
+"calendrier,\n"
"par exemple Google Agenda, Outlook ou iCal. Ceci va créer un rendez-vous\n"
"pour chaque jour d'entraînement avec les exercices appropriés."
-#: manager/templates/schedule/view.html:259
-#: manager/templates/schedule/view.html:295
-#: manager/templates/workout/view.html:96
-#: manager/templates/workout/view.html:176
+#: manager/templates/schedule/view.html:258
+#: manager/templates/schedule/view.html:294
+#: manager/templates/workout/view.html:94
+#: manager/templates/workout/view.html:174
msgid "Download as PDF"
msgstr "Télécharger au format PDF"
-#: manager/templates/schedule/view.html:300
+#: manager/templates/schedule/view.html:299
msgid "Edit schedule"
msgstr "Modifier le programme"
-#: manager/templates/schedule/view.html:305
+#: manager/templates/schedule/view.html:304
msgid "Delete schedule"
msgstr "Supprimer le programme"
@@ -2738,12 +2736,12 @@ msgid "Mark as workout"
msgstr "Marquer comme entraînement"
#: manager/templates/workout/template_view.html:65
-#: manager/templates/workout/view.html:51
+#: manager/templates/workout/view.html:49
msgid "Muscles trained"
msgstr "Muscles travaillés"
#: manager/templates/workout/template_view.html:68
-#: manager/templates/workout/view.html:54
+#: manager/templates/workout/view.html:52
msgid ""
"Images show combined muscles as trained by the exercises on the workout."
msgstr ""
@@ -2753,35 +2751,35 @@ msgstr ""
msgid "Use this template"
msgstr "Utiliser ce modèle"
-#: manager/templates/workout/view.html:45
+#: manager/templates/workout/view.html:43
msgid "Add training days"
msgstr "Ajouter un jour d’entrainement"
-#: manager/templates/workout/view.html:46
+#: manager/templates/workout/view.html:44
msgid "Add workout sets to days"
msgstr "Ajouter des entraînements aux jours"
-#: manager/templates/workout/view.html:47
+#: manager/templates/workout/view.html:45
msgid "Set the repetitions for each set"
msgstr "Définir les répétitions pour chaque série"
-#: manager/templates/workout/view.html:75
+#: manager/templates/workout/view.html:73
msgid "Export this workout as a calendar file."
msgstr "Exporter cette séance en un fichier de calendrier."
-#: manager/templates/workout/view.html:146
+#: manager/templates/workout/view.html:144
msgid "Logs"
msgstr "Journaux"
-#: manager/templates/workout/view.html:148
+#: manager/templates/workout/view.html:146
msgid "View logs"
msgstr "Voir les journaux"
-#: manager/templates/workout/view.html:171 manager/views/schedule_step.py:99
+#: manager/templates/workout/view.html:169 manager/views/schedule_step.py:99
msgid "Edit workout"
msgstr "Modifier la séance"
-#: manager/templates/workout/view.html:184 manager/views/workout.py:281
+#: manager/templates/workout/view.html:182 manager/views/workout.py:281
msgid "Mark as template"
msgstr "Marquer comme modèle"
@@ -2828,35 +2826,35 @@ msgstr "Ceci supprimera également tous les exercices de la catégorie."
msgid "Value"
msgstr "Valeur"
-#: nutrition/forms.py:117
+#: nutrition/forms.py:118
msgid "Height (in)"
msgstr "Taille (in)"
-#: nutrition/forms.py:120
+#: nutrition/forms.py:121
msgid "Weight (kg)"
msgstr "Poids (kg)"
-#: nutrition/forms.py:120
+#: nutrition/forms.py:121
msgid "Weight (lbs)"
msgstr "Poids (lbs)"
-#: nutrition/forms.py:133
+#: nutrition/forms.py:134
msgid "Calculate"
msgstr "Calculer"
-#: nutrition/forms.py:207 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:208 nutrition/templates/rate/form.html:76
msgid "Basic caloric intake"
msgstr "Apport calorique de base"
-#: nutrition/forms.py:208
+#: nutrition/forms.py:209
msgid "Your basic caloric intake as calculated for your data"
msgstr "Votre apport calorique de base calculé avec vos données"
-#: nutrition/forms.py:213
+#: nutrition/forms.py:214
msgid "Additional calories"
msgstr "Calories supplémentaires"
-#: nutrition/forms.py:215
+#: nutrition/forms.py:216
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
@@ -2864,72 +2862,56 @@ msgstr ""
"Les calories supplémentaires à ajouter au taux de base (pour soustraire, "
"entrez un nombre négatif)"
-#: nutrition/forms.py:248 nutrition/models/ingredient_weight_unit.py:39
-#: nutrition/models/log.py:84 nutrition/models/meal_item.py:53
+#: nutrition/forms.py:249 nutrition/models/ingredient_weight_unit.py:39
+#: nutrition/models/log.py:87 nutrition/models/meal_item.py:54
msgid "Ingredient"
msgstr "Ingrédient"
-#: nutrition/models/ingredient.py:131
+#: nutrition/models/ingredient.py:117
msgid "In kcal per 100g"
msgstr "En kcal/100 g"
-#: nutrition/models/ingredient.py:138 nutrition/models/ingredient.py:146
-#: nutrition/models/ingredient.py:156 nutrition/models/ingredient.py:164
-#: nutrition/models/ingredient.py:174 nutrition/models/ingredient.py:184
-#: nutrition/models/ingredient.py:194
+#: nutrition/models/ingredient.py:124 nutrition/models/ingredient.py:132
+#: nutrition/models/ingredient.py:142 nutrition/models/ingredient.py:150
+#: nutrition/models/ingredient.py:160 nutrition/models/ingredient.py:170
+#: nutrition/models/ingredient.py:180
msgid "In g per 100g of product"
msgstr "En g pour 100 g de produit"
-#: nutrition/models/ingredient.py:155
-#: nutrition/templates/ingredient/view.html:96 nutrition/views/plan.py:259
+#: nutrition/models/ingredient.py:141
+#: nutrition/templates/ingredient/view.html:70 nutrition/views/plan.py:259
msgid "Sugar content in carbohydrates"
msgstr "Sucre contenu dans les glucides"
-#: nutrition/models/ingredient.py:173
-#: nutrition/templates/ingredient/view.html:112 nutrition/views/plan.py:273
+#: nutrition/models/ingredient.py:159
+#: nutrition/templates/ingredient/view.html:86 nutrition/views/plan.py:273
msgid "Saturated fat content in fats"
msgstr "Teneur en acides gras saturés dans les acides gras"
-#: nutrition/models/ingredient.py:183
-#: nutrition/templates/ingredient/view.html:134 nutrition/views/plan.py:279
-msgid "Fibres"
-msgstr "Fibres"
+#: nutrition/models/ingredient.py:169
+#: nutrition/templates/ingredient/view.html:108 nutrition/views/plan.py:279
+msgid "Fiber"
+msgstr ""
-#: nutrition/models/ingredient.py:193
-#: nutrition/templates/ingredient/view.html:144 nutrition/views/plan.py:285
+#: nutrition/models/ingredient.py:179
+#: nutrition/templates/ingredient/view.html:118 nutrition/views/plan.py:285
msgid "Sodium"
msgstr "Sodium"
-#: nutrition/models/ingredient.py:215
+#: nutrition/models/ingredient.py:209
msgid "Link to product"
msgstr "Lien vers le produit"
-#: nutrition/models/ingredient.py:244
+#: nutrition/models/ingredient.py:238
msgid "Brand name of product"
msgstr "Nom de la marque du produit"
-#: nutrition/models/ingredient.py:304
+#: nutrition/models/ingredient.py:305
#, python-brace-format
msgid "The total energy ({self.energy}kcal) is not the approximate sum of the "
msgstr ""
"L'énergie totale ({self.energy}kcal) n'est pas une somme approximative du"
-#: nutrition/models/ingredient.py:383 nutrition/views/ingredient.py:196
-msgid "Ingredient was successfully added to the general database"
-msgstr "L’ingrédient a été ajouté avec succès à la base de données général"
-
-#: nutrition/models/ingredient.py:408
-msgid "New user submitted ingredient"
-msgstr "Nouveau ingrédient soumis par un utilisateur"
-
-#: nutrition/models/ingredient.py:410
-#, python-brace-format
-msgid ""
-"The user {request.user.username} submitted a new ingredient \"{self.name}\"."
-msgstr ""
-"L’utilisateur {request.user.username} a soumis un nouvel ingrédient « {self."
-"name} »."
-
#: nutrition/models/ingredient_category.py:31
msgid "Ingredient Categories"
msgstr "Catégories d’ingrédients"
@@ -2942,16 +2924,16 @@ msgstr "Quantité en grammes"
msgid "Unit amount, e.g. \"1 Cup\" or \"1/2 spoon\""
msgstr "Quantité, par exemple « 1 tasse » ou « 1/2 cuillère »"
-#: nutrition/models/log.py:49 nutrition/models/meal.py:50
-#: nutrition/models/meal_item.py:47 nutrition/models/plan.py:106
+#: nutrition/models/log.py:52 nutrition/models/meal.py:50
+#: nutrition/models/meal_item.py:48 nutrition/models/plan.py:108
msgid "Nutrition plan"
msgstr "Plan de nutrition"
-#: nutrition/models/log.py:58
+#: nutrition/models/log.py:61
msgid "Meal"
msgstr "Repas"
-#: nutrition/models/log.py:68
+#: nutrition/models/log.py:71
msgid "Date and Time (Approx.)"
msgstr "Date et heure (Approx.)"
@@ -2972,14 +2954,14 @@ msgid ""
"A description of the goal of the plan, e.g. \"Gain mass\" or \"Prepare for "
"summer\""
msgstr ""
-"Une description de l’objectif du régime, par exemple « Gain de masse » ou « "
-"Se préparer pour l’été »"
+"Une description de l’objectif du régime, par exemple « Gain de masse » ou "
+"« Se préparer pour l’été »"
-#: nutrition/models/plan.py:88
+#: nutrition/models/plan.py:90
msgid "Use daily calories"
msgstr "Utiliser les calories par jour"
-#: nutrition/models/plan.py:91
+#: nutrition/models/plan.py:93
msgid ""
"Tick the box if you want to mark this plan as having a goal amount of "
"calories. You can use the calculator or enter the value yourself."
@@ -3108,67 +3090,36 @@ msgstr "Recherche"
msgid "Add ingredient"
msgstr "Ajouter un ingrédient"
-#: nutrition/templates/ingredient/pending.html:14
-msgid "Submission date"
-msgstr "Date de proposition"
-
-#: nutrition/templates/ingredient/view.html:27
-msgid "Ingredient is pending review"
-msgstr "L'ingrédient est en attente d'examen"
-
-#: nutrition/templates/ingredient/view.html:28
-msgid ""
-"This user submitted ingredient is pending a decision to be\n"
-"included in the database. Till then, it will not be shown in the overview "
-"or\n"
-"the search."
-msgstr ""
-"Cet utilisateur a fait valoir l’ingrédient et est en attente d’une décision "
-"pour figurer dans la base de données. En attendant, il ne sera pas montré "
-"dans la vue d’ensemble ou lors de la recherche."
-
-#: nutrition/templates/ingredient/view.html:31
-msgid "Please select one of the options below."
-msgstr "Merci de choisir une des options suivantes."
-
-#: nutrition/templates/ingredient/view.html:38
-msgid "Accept"
-msgstr "Accepter"
-
-#: nutrition/templates/ingredient/view.html:42
-msgid "Decline"
-msgstr "Refuser"
-
-#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:229
+#: nutrition/templates/ingredient/view.html:45 nutrition/views/plan.py:229
msgid "Macronutrients"
msgstr "Macronutriments"
-#: nutrition/templates/ingredient/view.html:80
+#: nutrition/templates/ingredient/view.html:54
msgid "kJ"
msgstr "kJ"
-#: nutrition/templates/ingredient/view.html:101
-#: nutrition/templates/ingredient/view.html:117
-#: nutrition/templates/ingredient/view.html:139
-#: nutrition/templates/ingredient/view.html:149
+#: nutrition/templates/ingredient/view.html:75
+#: nutrition/templates/ingredient/view.html:91
+#: nutrition/templates/ingredient/view.html:113
+#: nutrition/templates/ingredient/view.html:123
msgid "n.A."
msgstr "n.A."
-#: nutrition/templates/ingredient/view.html:128
+#: nutrition/templates/ingredient/view.html:102
msgid "Others"
msgstr "Autres"
-#: nutrition/templates/ingredient/view.html:170
+#: nutrition/templates/ingredient/view.html:144
#: nutrition/templates/units/list.html:46 nutrition/views/unit.py:86
msgid "Add new weight unit"
msgstr "Ajouter une nouvelle unité de poids"
-#: nutrition/templates/ingredient/view.html:232
-#: nutrition/templates/ingredient/view.html:235
+#: nutrition/templates/ingredient/view.html:206
+#: nutrition/templates/ingredient/view.html:209
msgid "Edit ingredient"
msgstr "Modifier l’ingrédient"
-#: nutrition/templates/ingredient/view.html:239
+#: nutrition/templates/ingredient/view.html:213
msgid "Delete ingredient"
msgstr "Supprimer l'ingrédient"
@@ -3269,14 +3220,10 @@ msgstr "140 à 230"
msgid "56 to 90"
msgstr "56 à 90"
-#: nutrition/views/ingredient.py:154
+#: nutrition/views/ingredient.py:157
msgid "Add a new ingredient"
msgstr "Ajouter un nouvel ingrédient"
-#: nutrition/views/ingredient.py:209
-msgid "Ingredient was successfully marked as rejected"
-msgstr "L'ingrédient a été marqué avec succès comme rejeté"
-
#: nutrition/views/plan.py:120
msgid "Nutritional plan"
msgstr "Plan de nutrition"
@@ -3324,19 +3271,10 @@ msgstr ""
"ouvert, réalisé par des passionnés de fitness du monde entier."
#: software/templates/about_us.html:18
-msgid "Source code"
-msgstr "Code source"
-
-#: software/templates/about_us.html:20
-msgid "Get the source code of this application and its server on github"
-msgstr ""
-"Récupérez le code source de cette application et de son serveur sur Github"
-
-#: software/templates/about_us.html:25
msgid "Have a problem or idea?"
msgstr "Vous avez un problème ou une idée ?"
-#: software/templates/about_us.html:27
+#: software/templates/about_us.html:20
msgid ""
"Get in touch if something didn't behave as expected or if there is a feature "
"that you feel is missing."
@@ -3344,21 +3282,29 @@ msgstr ""
"Contactez-nous si un élément ne s’est pas comporté comme prévu ou si une "
"fonctionnalité vous semble manquer."
-#: software/templates/about_us.html:32
+#: software/templates/about_us.html:26
msgid "Say hi!"
msgstr "Dites-nous bonjour !"
-#: software/templates/about_us.html:34
+#: software/templates/about_us.html:28
msgid "If you want to chat with us, hop on the Discord server and get in touch"
msgstr ""
"Si vous souhaitez discuter avec nous, rendez-vous sur le serveur Discord et "
"contactez-nous"
-#: software/templates/about_us.html:39 software/templates/features.html:503
+#: software/templates/about_us.html:33
+msgid "Mastodon"
+msgstr ""
+
+#: software/templates/about_us.html:35
+msgid "Follow us on mastodon for updates and news about the project"
+msgstr ""
+
+#: software/templates/about_us.html:40 software/templates/features.html:503
msgid "Translation"
msgstr "Traduction"
-#: software/templates/about_us.html:41
+#: software/templates/about_us.html:42
msgid ""
"This application is translated on weblate. If you also want to help, click "
"the link and start translating"
@@ -3366,20 +3312,36 @@ msgstr ""
"Cette application est traduite sur Weblate. Si vous voulez aussi aider, "
"cliquez sur le lien et commencez à traduire"
-#: software/templates/about_us.html:50
+#: software/templates/about_us.html:47
+msgid "Source code"
+msgstr "Code source"
+
+#: software/templates/about_us.html:49
+msgid "Get the source code of this application and its server on github"
+msgstr ""
+"Récupérez le code source de cette application et de son serveur sur Github"
+
+#: software/templates/about_us.html:59
msgid "Our goal"
msgstr "Notre objectif"
-#: software/templates/about_us.html:53
+#: software/templates/about_us.html:62
+#, fuzzy
+#| msgid ""
+#| "The goal is to build an awesome\n"
+#| " and flexible fitness manager, along with a comprehensive "
+#| "and complete list of exercises and\n"
+#| " ingredients, all released under a free license."
msgid ""
"The goal is to build an awesome\n"
" and flexible fitness manager, along with a comprehensive and "
-"complete list of exercises and\n"
+"complete list of\n"
+" exercises and\n"
" ingredients, all released under a free license."
msgstr ""
"Le but est de construire un \n"
-"entraîneur de conditionnement physique impressionnant et flexible, ainsi qu’"
-"une liste exhaustive et complète d’exercices\n"
+"entraîneur de conditionnement physique impressionnant et flexible, ainsi "
+"qu’une liste exhaustive et complète d’exercices\n"
"et d’ingrédients, tous publiés sous une licence libre."
#: software/templates/features.html:11
@@ -3390,10 +3352,6 @@ msgstr ""
"wger Workout Manager est une application web open source gratuit qui gère "
"vos exercices et séances d’entraînement."
-#: software/templates/features.html:45
-msgid "About"
-msgstr "À propos"
-
#: software/templates/features.html:57
msgid "Mobile app"
msgstr "Application mobile"
@@ -3656,18 +3614,6 @@ msgstr ""
"une œuvre antérieure, mais qui contient également suffisamment de contenu "
"nouveau et créatif pour lui donner droit à son propre droit d'auteur."
-#: utils/models.py:130
-msgid "Pending"
-msgstr "En attente"
-
-#: utils/models.py:131
-msgid "Accepted"
-msgstr "Accepté"
-
-#: utils/models.py:132
-msgid "Declined"
-msgstr "Refusé"
-
#: weight/forms.py:54
msgid "Input"
msgstr "Entrée"
@@ -3680,7 +3626,7 @@ msgstr "Format de date"
msgid "You have to enter your weight"
msgstr "Vous devez entrer votre poids"
-#: weight/models.py:60
+#: weight/models.py:78
msgid "Weight entry"
msgstr "Entrée de poids"
@@ -3753,8 +3699,8 @@ msgstr ""
"Ces valeurs ne peuvent pas être convertis à une note de journal de poids.\n"
"\tLes raisons pour cela pourraient être une date inconnue ou le format de "
"nombre,\n"
-"\tun problème avec l’encodage ou autre chose. S’il vous plaît, vérifiez qu’"
-"il n’y a pas\n"
+"\tun problème avec l’encodage ou autre chose. S’il vous plaît, vérifiez "
+"qu’il n’y a pas\n"
"\td’erreurs évidentes dans la liste (et corrigez les dans les cas où!)\n"
"\tpuis essayez d’importer la liste à nouveau."
@@ -3822,6 +3768,66 @@ msgstr "Supprimé avec succès."
msgid "Delete weight entry for the %s"
msgstr "Supprimer l’entrée de poids pour le %s"
+#~ msgid "Ingredients pending review"
+#~ msgstr "Ingrédients en attente d'examen"
+
+#~ msgid "Fibres"
+#~ msgstr "Fibres"
+
+#~ msgid "Ingredient was successfully added to the general database"
+#~ msgstr "L’ingrédient a été ajouté avec succès à la base de données général"
+
+#~ msgid "New user submitted ingredient"
+#~ msgstr "Nouveau ingrédient soumis par un utilisateur"
+
+#, python-brace-format
+#~ msgid ""
+#~ "The user {request.user.username} submitted a new ingredient \"{self."
+#~ "name}\"."
+#~ msgstr ""
+#~ "L’utilisateur {request.user.username} a soumis un nouvel ingrédient "
+#~ "« {self.name} »."
+
+#~ msgid "Submission date"
+#~ msgstr "Date de proposition"
+
+#~ msgid "Ingredient is pending review"
+#~ msgstr "L'ingrédient est en attente d'examen"
+
+#~ msgid ""
+#~ "This user submitted ingredient is pending a decision to be\n"
+#~ "included in the database. Till then, it will not be shown in the overview "
+#~ "or\n"
+#~ "the search."
+#~ msgstr ""
+#~ "Cet utilisateur a fait valoir l’ingrédient et est en attente d’une "
+#~ "décision pour figurer dans la base de données. En attendant, il ne sera "
+#~ "pas montré dans la vue d’ensemble ou lors de la recherche."
+
+#~ msgid "Please select one of the options below."
+#~ msgstr "Merci de choisir une des options suivantes."
+
+#~ msgid "Accept"
+#~ msgstr "Accepter"
+
+#~ msgid "Decline"
+#~ msgstr "Refuser"
+
+#~ msgid "Ingredient was successfully marked as rejected"
+#~ msgstr "L'ingrédient a été marqué avec succès comme rejeté"
+
+#~ msgid "About"
+#~ msgstr "À propos"
+
+#~ msgid "Pending"
+#~ msgstr "En attente"
+
+#~ msgid "Accepted"
+#~ msgstr "Accepté"
+
+#~ msgid "Declined"
+#~ msgstr "Refusé"
+
#~ msgid "Share"
#~ msgstr "Partager"
diff --git a/wger/locale/he/LC_MESSAGES/django.po b/wger/locale/he/LC_MESSAGES/django.po
index eb21bdae0..406350595 100644
--- a/wger/locale/he/LC_MESSAGES/django.po
+++ b/wger/locale/he/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-02-02 12:42+0100\n"
+"POT-Creation-Date: 2024-07-14 15:49+0200\n"
"PO-Revision-Date: 2024-05-24 13:09+0000\n"
"Last-Translator: Tsz Hong CHAN <[email protected]>\n"
"Language-Team: Hebrew <https://hosted.weblate.org/projects/wger/web/he/>\n"
@@ -28,7 +28,7 @@ msgid ""
"registered users to this gym and update all existing users without a gym."
msgstr ""
-#: config/views/gym_config.py:42 core/templates/language/view.html:63
+#: config/views/gym_config.py:42 core/templates/language/view.html:67
#: core/templates/license/list.html:17 core/templates/misc/license/list.html:18
#: core/templates/repetition_unit/list.html:18
#: core/templates/tags/render_day.html:39
@@ -48,8 +48,8 @@ msgstr ""
#: manager/templates/calendar/day.html:68
#: manager/templates/calendar/month.html:85
#: manager/templates/calendar/partial_overview_table.html:18
-#: manager/templates/schedule/view.html:119
-#: nutrition/templates/ingredient/view.html:191
+#: manager/templates/schedule/view.html:118
+#: nutrition/templates/ingredient/view.html:165
#: nutrition/templates/units/list.html:19
msgid "Edit"
msgstr ""
@@ -83,8 +83,8 @@ msgstr ""
msgid "Empty placeholder schedule"
msgstr ""
-#: core/forms.py:69 core/templates/navigation.html:275
-#: core/templates/navigation.html:281 core/templates/user/login.html:4
+#: core/forms.py:69 core/templates/navigation.html:285
+#: core/templates/navigation.html:291 core/templates/user/login.html:4
#: software/templates/features.html:82 software/templates/features.html:427
msgid "Login"
msgstr ""
@@ -154,7 +154,7 @@ msgstr ""
msgid "Please enter your current password."
msgstr ""
-#: core/forms.py:242 core/templates/language/view.html:68
+#: core/forms.py:242 core/templates/language/view.html:73
#: core/templates/license/list.html:19 core/templates/misc/license/list.html:22
#: core/templates/repetition_unit/list.html:20
#: core/templates/tags/render_day.html:45
@@ -169,10 +169,10 @@ msgstr ""
#: gym/templates/gym/list.html:22 manager/templates/calendar/day.html:73
#: manager/templates/calendar/month.html:89
#: manager/templates/calendar/partial_overview_table.html:23
-#: manager/templates/schedule/view.html:123
-#: manager/templates/workout/view.html:190
-#: nutrition/templates/ingredient/view.html:192
-#: nutrition/templates/ingredient/view.html:241
+#: manager/templates/schedule/view.html:122
+#: manager/templates/workout/view.html:188
+#: nutrition/templates/ingredient/view.html:166
+#: nutrition/templates/ingredient/view.html:215
#: nutrition/templates/units/list.html:22
msgid "Delete"
msgstr ""
@@ -185,14 +185,14 @@ msgstr ""
msgid "The form is secured with reCAPTCHA"
msgstr ""
-#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:275
-#: core/templates/navigation.html:287 core/templates/template.html:147
+#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:285
+#: core/templates/navigation.html:297 core/templates/template.html:149
#: core/templates/user/login.html:20 core/views/user.py:298
#: software/templates/features.html:87 software/templates/features.html:422
msgid "Register"
msgstr ""
-#: core/forms.py:315
+#: core/forms.py:315 software/templates/features.html:45
msgid "Contact"
msgstr ""
@@ -201,7 +201,7 @@ msgid "Some way of answering you (e-mail, etc.)"
msgstr ""
#: core/forms.py:324 exercises/models/comment.py:58 manager/models/set.py:61
-#: manager/models/setting.py:111 nutrition/models/log.py:74
+#: manager/models/setting.py:114 nutrition/models/log.py:77
msgid "Comment"
msgstr ""
@@ -221,6 +221,10 @@ msgstr ""
msgid "Language full name"
msgstr ""
+#: core/models/language.py:45 core/templates/language/view.html:23
+msgid "Language full name in English"
+msgstr ""
+
#: core/models/license.py:29
msgid "Full name"
msgstr ""
@@ -235,7 +239,7 @@ msgstr ""
msgid "Short name, e.g. CC-BY-SA 3"
msgstr ""
-#: core/models/license.py:45 nutrition/models/ingredient.py:214
+#: core/models/license.py:45 nutrition/models/ingredient.py:208
msgid "Link"
msgstr ""
@@ -338,7 +342,7 @@ msgstr ""
msgid "Age"
msgstr ""
-#: core/models/profile.py:230 nutrition/forms.py:117
+#: core/models/profile.py:230 nutrition/forms.py:118
msgid "Height (cm)"
msgstr ""
@@ -389,7 +393,7 @@ msgid "Total caloric intake, including e.g. any surplus"
msgstr ""
#: core/models/profile.py:333 nutrition/models/ingredient_weight_unit.py:45
-#: nutrition/models/log.py:93 nutrition/models/meal_item.py:58
+#: nutrition/models/log.py:96 nutrition/models/meal_item.py:59
msgid "Weight unit"
msgstr ""
@@ -418,17 +422,16 @@ msgstr ""
#: core/models/rep_unit.py:36 core/models/weight_unit.py:36
#: core/templates/user/overview.html:262 core/views/user.py:599
#: exercises/models/category.py:29 exercises/models/equipment.py:29
-#: exercises/models/exercise.py:58 exercises/models/muscle.py:36
+#: exercises/models/exercise.py:59 exercises/models/muscle.py:36
#: gym/models/contract.py:52 gym/models/contract.py:103 gym/models/gym.py:46
#: gym/models/user_document.py:84 gym/templates/contract/view.html:50
#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:96
#: gym/views/gym.py:158 manager/models/schedule.py:55
#: manager/models/workout.py:57 measurements/models/category.py:36
-#: nutrition/models/ingredient.py:125
+#: nutrition/models/ingredient.py:111
#: nutrition/models/ingredient_category.py:27 nutrition/models/meal.py:67
#: nutrition/models/weight_unit.py:38
-#: nutrition/templates/ingredient/pending.html:15
-#: nutrition/templates/ingredient/view.html:178
+#: nutrition/templates/ingredient/view.html:152
msgid "Name"
msgstr ""
@@ -525,24 +528,24 @@ msgstr ""
msgid "Dashboard"
msgstr ""
-#: core/templates/language/overview.html:4 core/templates/navigation.html:335
+#: core/templates/language/overview.html:4 core/templates/navigation.html:345
msgid "Languages"
msgstr ""
-#: core/templates/language/overview.html:20
+#: core/templates/language/overview.html:22
msgid "Nothing found."
msgstr ""
-#: core/templates/language/overview.html:20
+#: core/templates/language/overview.html:22
#: manager/templates/calendar/month.html:132
#: manager/templates/schedule/overview.html:28
-#: manager/templates/schedule/view.html:145
+#: manager/templates/schedule/view.html:144
#: manager/templates/workout/overview.html:28
#: nutrition/templates/ingredient/overview.html:38
msgid "Add one now."
msgstr ""
-#: core/templates/language/overview.html:33 core/templates/license/list.html:40
+#: core/templates/language/overview.html:35 core/templates/license/list.html:40
#: core/templates/misc/license/list.html:43
#: core/templates/repetition_unit/list.html:43
#: core/templates/user/overview.html:326 core/templates/user/overview.html:365
@@ -562,13 +565,13 @@ msgstr ""
msgid "Add"
msgstr ""
-#: core/templates/language/view.html:58 core/templates/user/api_key.html:44
+#: core/templates/language/view.html:61 core/templates/user/api_key.html:44
#: core/templates/user/preferences.html:45 gym/models/contract.py:203
#: gym/templates/contract/view.html:41 gym/templates/contract/view.html:106
#: gym/templates/gym/member_list.html:248
-#: manager/templates/schedule/view.html:286
-#: manager/templates/workout/view.html:165
-#: nutrition/templates/ingredient/view.html:228
+#: manager/templates/schedule/view.html:285
+#: manager/templates/workout/view.html:163
+#: nutrition/templates/ingredient/view.html:202
msgid "Options"
msgstr ""
@@ -593,12 +596,11 @@ msgstr ""
#: gym/templates/gym/member_list.html:299
#: mailer/templates/mailer/gym/overview.html:30
#: manager/templates/calendar/day.html:87
-#: nutrition/templates/ingredient/pending.html:30
#: nutrition/templates/units/list.html:29
msgid "Nothing found"
msgstr ""
-#: core/templates/misc/about.html:4 core/templates/template.html:173
+#: core/templates/misc/about.html:4 core/templates/template.html:175
msgid "Imprint"
msgstr ""
@@ -609,174 +611,169 @@ msgid ""
"entries here."
msgstr ""
-#: core/templates/navigation.html:27 software/templates/features.html:437
+#: core/templates/navigation.html:28 software/templates/features.html:437
msgid "Training"
msgstr ""
-#: core/templates/navigation.html:34 core/templates/user/overview.html:25
+#: core/templates/navigation.html:37 core/templates/user/overview.html:25
msgid "Workouts"
msgstr ""
-#: core/templates/navigation.html:42
+#: core/templates/navigation.html:46
msgid "Workouts schedules"
msgstr ""
-#: core/templates/navigation.html:50 core/templates/user/overview.html:70
+#: core/templates/navigation.html:54 core/templates/user/overview.html:70
#: manager/templates/calendar/month.html:10
#: manager/templates/calendar/month.html:21
msgid "Calendar"
msgstr ""
-#: core/templates/navigation.html:60
+#: core/templates/navigation.html:64
msgid "Measurements"
msgstr ""
-#: core/templates/navigation.html:70 gallery/templates/images/overview.html:6
+#: core/templates/navigation.html:75 gallery/templates/images/overview.html:6
msgid "Gallery"
msgstr ""
-#: core/templates/navigation.html:76
+#: core/templates/navigation.html:81
msgid "Workout templates"
msgstr ""
-#: core/templates/navigation.html:82 manager/views/workout.py:84
+#: core/templates/navigation.html:88 manager/views/workout.py:84
msgid "Your templates"
msgstr ""
-#: core/templates/navigation.html:90 manager/views/workout.py:98
+#: core/templates/navigation.html:97 manager/views/workout.py:98
msgid "Public templates"
msgstr ""
-#: core/templates/navigation.html:97 manager/forms.py:129
-#: manager/models/setting.py:54 software/templates/features.html:51
+#: core/templates/navigation.html:105 manager/forms.py:129
+#: manager/models/setting.py:57 software/templates/features.html:51
#: software/templates/features.html:459
msgid "Exercises"
msgstr ""
-#: core/templates/navigation.html:103 core/templates/navigation.html:170
-#: core/templates/navigation.html:330
+#: core/templates/navigation.html:111 core/templates/navigation.html:184
+#: core/templates/navigation.html:340
msgid "Administration"
msgstr ""
-#: core/templates/navigation.html:106
+#: core/templates/navigation.html:115
msgid "Exercise edit history"
msgstr ""
-#: core/templates/navigation.html:111 exercises/models/base.py:103
+#: core/templates/navigation.html:121 exercises/models/base.py:103
msgid "Equipment"
msgstr ""
-#: core/templates/navigation.html:116
+#: core/templates/navigation.html:127
msgid "Muscles"
msgstr ""
-#: core/templates/navigation.html:121
+#: core/templates/navigation.html:133
#: exercises/templates/categories/admin-overview.html:4
msgid "Categories"
msgstr ""
-#: core/templates/navigation.html:136 software/templates/features.html:447
+#: core/templates/navigation.html:148 software/templates/features.html:447
msgid "Nutrition"
msgstr ""
-#: core/templates/navigation.html:143 core/templates/user/overview.html:144
+#: core/templates/navigation.html:156 core/templates/user/overview.html:144
msgid "Nutrition plans"
msgstr ""
-#: core/templates/navigation.html:151 nutrition/templates/bmi/form.html:50
+#: core/templates/navigation.html:165 nutrition/templates/bmi/form.html:50
msgid "BMI calculator"
msgstr ""
-#: core/templates/navigation.html:159 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:174 nutrition/templates/rate/form.html:17
msgid "Daily calories calculator"
msgstr ""
-#: core/templates/navigation.html:165
+#: core/templates/navigation.html:179
#: nutrition/templates/ingredient/overview.html:10
msgid "Ingredient overview"
msgstr ""
-#: core/templates/navigation.html:172 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:187 nutrition/templates/units/list.html:6
msgid "Ingredient weight units"
msgstr ""
-#: core/templates/navigation.html:177
-#: nutrition/templates/ingredient/pending.html:6
-msgid "Ingredients pending review"
-msgstr ""
-
-#: core/templates/navigation.html:193 software/templates/features.html:442
+#: core/templates/navigation.html:203 software/templates/features.html:442
msgid "Body weight"
msgstr ""
-#: core/templates/navigation.html:200 core/templates/user/overview.html:114
+#: core/templates/navigation.html:210 core/templates/user/overview.html:114
msgid "Weight overview"
msgstr ""
-#: core/templates/navigation.html:207 weight/views.py:65
+#: core/templates/navigation.html:217 weight/views.py:65
msgid "Add weight entry"
msgstr ""
-#: core/templates/navigation.html:221
+#: core/templates/navigation.html:231
msgid "About this software"
msgstr ""
-#: core/templates/navigation.html:227 software/templates/about_us.html:5
+#: core/templates/navigation.html:237 software/templates/about_us.html:5
msgid "About us"
msgstr ""
-#: core/templates/navigation.html:233 software/templates/features.html:507
+#: core/templates/navigation.html:243 software/templates/features.html:507
msgid "REST API"
msgstr ""
-#: core/templates/navigation.html:239 utils/models.py:45
+#: core/templates/navigation.html:249 utils/models.py:45
msgid "License"
msgstr ""
-#: core/templates/navigation.html:245
+#: core/templates/navigation.html:255
msgid "Developer documentation"
msgstr ""
-#: core/templates/navigation.html:252
+#: core/templates/navigation.html:262
msgid "Get the code"
msgstr ""
-#: core/templates/navigation.html:259 core/templates/template.html:212
+#: core/templates/navigation.html:269 core/templates/template.html:214
#: software/templates/features.html:582
msgid "Translate"
msgstr ""
-#: core/templates/navigation.html:293 core/templates/user/login.html:28
+#: core/templates/navigation.html:303 core/templates/user/login.html:28
msgid "Reset password"
msgstr ""
-#: core/templates/navigation.html:311
+#: core/templates/navigation.html:321
msgid "My preferences"
msgstr ""
-#: core/templates/navigation.html:320
+#: core/templates/navigation.html:330
msgid "Logout"
msgstr ""
-#: core/templates/navigation.html:343
+#: core/templates/navigation.html:353
msgid "Licenses"
msgstr ""
-#: core/templates/navigation.html:351
+#: core/templates/navigation.html:361
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr ""
-#: core/templates/navigation.html:359 core/templates/weight_unit/list.html:4
-#: nutrition/templates/ingredient/view.html:167
+#: core/templates/navigation.html:369 core/templates/weight_unit/list.html:4
+#: nutrition/templates/ingredient/view.html:141
msgid "Weight units"
msgstr ""
-#: core/templates/navigation.html:367 core/templates/user/list.html:4
+#: core/templates/navigation.html:377 core/templates/user/list.html:4
msgid "User list"
msgstr ""
-#: core/templates/navigation.html:373
+#: core/templates/navigation.html:383
msgid "Gyms"
msgstr ""
@@ -826,12 +823,12 @@ msgstr ""
msgid "The %(site_name)s team"
msgstr ""
-#: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:11
+#: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:12
msgid "previous"
msgstr ""
-#: core/templates/tags/pagination.html:31
-#: core/templates/tags/pagination.html:35
+#: core/templates/tags/pagination.html:33
+#: core/templates/tags/pagination.html:38
msgid "next"
msgstr ""
@@ -856,34 +853,34 @@ msgid "Add exercises to this workout day"
msgstr ""
#: core/templates/tags/render_weight_log.html:17 manager/helpers.py:86
-#: manager/models/setting.py:69 manager/templates/set/formset.html:9
+#: manager/models/setting.py:72 manager/templates/set/formset.html:9
msgid "Reps"
msgstr ""
#: core/templates/tags/render_weight_log.html:30 manager/forms.py:191
-#: manager/models/log.py:103 manager/models/setting.py:99
+#: manager/models/log.py:103 manager/models/setting.py:102
#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
msgid "RiR"
msgstr ""
-#: core/templates/template.html:120 manager/templates/calendar/month.html:138
-#: manager/templates/schedule/view.html:249
-#: manager/templates/schedule/view.html:270
-#: manager/templates/workout/view.html:86
-#: manager/templates/workout/view.html:139
+#: core/templates/template.html:122 manager/templates/calendar/month.html:138
+#: manager/templates/schedule/view.html:248
+#: manager/templates/schedule/view.html:269
+#: manager/templates/workout/view.html:84
+#: manager/templates/workout/view.html:137
msgid "Close"
msgstr ""
-#: core/templates/template.html:136
+#: core/templates/template.html:138
msgid ""
"You are using a guest account, data entered will be deleted after a week."
msgstr ""
-#: core/templates/template.html:141
+#: core/templates/template.html:143
msgid "Create some demo entries"
msgstr ""
-#: core/templates/template.html:178 software/templates/features.html:547
+#: core/templates/template.html:180 software/templates/features.html:547
#: software/templates/tos.html:7
msgid "Terms of service"
msgstr ""
@@ -975,7 +972,7 @@ msgid "Overview"
msgstr ""
#: core/templates/user/overview.html:28
-#: manager/templates/schedule/view.html:164
+#: manager/templates/schedule/view.html:163
#: manager/templates/workout/overview.html:39 manager/views/schedule_step.py:60
msgid "Add workout"
msgstr ""
@@ -983,20 +980,20 @@ msgstr ""
#: core/templates/user/overview.html:34 core/templates/user/overview.html:76
#: core/templates/user/overview.html:120 core/templates/user/overview.html:152
#: exercises/models/base.py:118 exercises/models/base.py:124
-#: exercises/models/exercise.py:63 exercises/models/exercise.py:69
+#: exercises/models/exercise.py:64 exercises/models/exercise.py:70
#: exercises/models/image.py:107 exercises/models/image.py:113
#: exercises/models/video.py:163 exercises/models/video.py:169
#: gallery/models/image.py:42 manager/helpers.py:85 manager/models/log.py:100
#: manager/models/session.py:67 measurements/models/measurement.py:47
-#: nutrition/models/ingredient.py:101 nutrition/models/ingredient.py:107
-#: nutrition/models/ingredient.py:222 weight/models.py:33
+#: nutrition/models/ingredient.py:87 nutrition/models/ingredient.py:93
+#: nutrition/models/ingredient.py:216 weight/models.py:51
#: weight/templates/import_csv_preview.html:13
#: weight/templates/import_csv_preview.html:42 weight/views.py:144
msgid "Date"
msgstr ""
#: core/templates/user/overview.html:35 core/templates/user/overview.html:153
-#: exercises/models/exercise.py:51 gallery/models/image.py:65
+#: exercises/models/exercise.py:52 gallery/models/image.py:65
#: gym/models/contract.py:58 gym/models/contract.py:109
#: manager/models/day.py:37 manager/models/workout.py:63
#: measurements/models/measurement.py:62 nutrition/models/plan.py:67
@@ -1014,13 +1011,13 @@ msgstr ""
#: core/templates/user/overview.html:58
#: manager/templates/calendar/month.html:128
-#: manager/templates/schedule/view.html:145
+#: manager/templates/schedule/view.html:144
#: manager/templates/workout/overview.html:28
msgid "No workouts found."
msgstr ""
#: core/templates/user/overview.html:68 manager/forms.py:280
-#: manager/templates/workout/view.html:108
+#: manager/templates/workout/view.html:106
msgid "Log"
msgstr ""
@@ -1044,35 +1041,35 @@ msgstr ""
#: core/templates/user/overview.html:112 core/templates/user/overview.html:121
#: manager/forms.py:186 manager/helpers.py:86 manager/models/log.py:86
-#: manager/models/setting.py:79 manager/templates/log/add.html:54
-#: manager/templates/set/formset.html:11 weight/models.py:35
+#: manager/models/setting.py:82 manager/templates/log/add.html:54
+#: manager/templates/set/formset.html:11 weight/models.py:53
#: weight/templates/import_csv_preview.html:14
#: weight/templates/import_csv_preview.html:43 weight/views.py:144
msgid "Weight"
msgstr ""
-#: core/templates/user/overview.html:154 nutrition/models/ingredient.py:130
-#: nutrition/templates/ingredient/view.html:77 nutrition/views/plan.py:237
+#: core/templates/user/overview.html:154 nutrition/models/ingredient.py:116
+#: nutrition/templates/ingredient/view.html:51 nutrition/views/plan.py:237
msgid "Energy"
msgstr ""
-#: core/templates/user/overview.html:155 nutrition/models/ingredient.py:137
-#: nutrition/templates/ingredient/view.html:84 nutrition/views/plan.py:243
+#: core/templates/user/overview.html:155 nutrition/models/ingredient.py:123
+#: nutrition/templates/ingredient/view.html:58 nutrition/views/plan.py:243
msgid "Protein"
msgstr ""
-#: core/templates/user/overview.html:156 nutrition/models/ingredient.py:145
-#: nutrition/templates/ingredient/view.html:90 nutrition/views/plan.py:251
+#: core/templates/user/overview.html:156 nutrition/models/ingredient.py:131
+#: nutrition/templates/ingredient/view.html:64 nutrition/views/plan.py:251
msgid "Carbohydrates"
msgstr ""
-#: core/templates/user/overview.html:157 nutrition/models/ingredient.py:163
-#: nutrition/templates/ingredient/view.html:106 nutrition/views/plan.py:265
+#: core/templates/user/overview.html:157 nutrition/models/ingredient.py:149
+#: nutrition/templates/ingredient/view.html:80 nutrition/views/plan.py:265
msgid "Fat"
msgstr ""
#: core/templates/user/overview.html:170
-#: nutrition/templates/ingredient/view.html:79
+#: nutrition/templates/ingredient/view.html:53
msgid "kcal"
msgstr ""
@@ -1084,7 +1081,7 @@ msgstr ""
#: gym/templates/gym/member_list.html:207
#: gym/templates/gym/member_list.html:240
#: gym/templates/gym/member_list.html:277
-#: manager/templates/schedule/view.html:101
+#: manager/templates/schedule/view.html:100
msgid "Actions"
msgstr ""
@@ -1127,7 +1124,7 @@ msgid "Details"
msgstr ""
#: core/templates/user/overview.html:258 gym/views/export.py:57
-#: manager/helpers.py:86 manager/templates/schedule/view.html:99
+#: manager/helpers.py:86 manager/templates/schedule/view.html:98
msgid "Nr."
msgstr ""
@@ -1172,7 +1169,7 @@ msgid "Documents"
msgstr ""
#: core/templates/user/overview.html:412 gym/templates/document/list.html:32
-#: manager/forms.py:292 manager/templates/workout/view.html:134
+#: manager/forms.py:292 manager/templates/workout/view.html:132
msgid "Download"
msgstr "הורדה"
@@ -1223,13 +1220,13 @@ msgid "kg"
msgstr ""
#: core/templatetags/wger_extras.py:207
-#: nutrition/templates/ingredient/view.html:86
-#: nutrition/templates/ingredient/view.html:92
-#: nutrition/templates/ingredient/view.html:99
-#: nutrition/templates/ingredient/view.html:108
-#: nutrition/templates/ingredient/view.html:115
-#: nutrition/templates/ingredient/view.html:137
-#: nutrition/templates/ingredient/view.html:147
+#: nutrition/templates/ingredient/view.html:60
+#: nutrition/templates/ingredient/view.html:66
+#: nutrition/templates/ingredient/view.html:73
+#: nutrition/templates/ingredient/view.html:82
+#: nutrition/templates/ingredient/view.html:89
+#: nutrition/templates/ingredient/view.html:111
+#: nutrition/templates/ingredient/view.html:121
msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr ""
@@ -1247,7 +1244,7 @@ msgstr ""
#: exercises/views/equipment.py:103 exercises/views/exercises.py:73
#: exercises/views/muscles.py:99 manager/views/schedule.py:309
#: manager/views/schedule_step.py:128 manager/views/workout.py:249
-#: manager/views/workout_session.py:142 nutrition/views/ingredient.py:116
+#: manager/views/workout_session.py:142 nutrition/views/ingredient.py:119
#: nutrition/views/unit.py:110
msgid "Successfully deleted"
msgstr ""
@@ -1259,7 +1256,7 @@ msgstr ""
#: gym/views/admin_notes.py:196 gym/views/document.py:206 gym/views/gym.py:481
#: manager/views/schedule.py:316 manager/views/schedule_step.py:138
#: manager/views/workout.py:253 manager/views/workout_session.py:156
-#: nutrition/views/ingredient.py:123 nutrition/views/unit.py:117
+#: nutrition/views/ingredient.py:126 nutrition/views/unit.py:117
#, python-brace-format
msgid "Delete {0}?"
msgstr ""
@@ -1272,7 +1269,7 @@ msgstr ""
#: gym/views/contract.py:186 gym/views/contract_option.py:123
#: gym/views/contract_type.py:123 gym/views/document.py:171
#: gym/views/gym.py:463 manager/views/day.py:100 manager/views/schedule.py:333
-#: manager/views/workout.py:267 nutrition/views/ingredient.py:142
+#: manager/views/workout.py:267 nutrition/views/ingredient.py:145
#: nutrition/views/unit.py:143
#, python-brace-format
msgid "Edit {0}"
@@ -1343,7 +1340,7 @@ msgstr ""
msgid "A verification email was sent to %(email)s"
msgstr ""
-#: exercises/models/base.py:82 nutrition/models/ingredient.py:236
+#: exercises/models/base.py:82 nutrition/models/ingredient.py:230
msgid "Category"
msgstr "קטגוריה"
@@ -1363,7 +1360,7 @@ msgstr ""
msgid "Exercise Categories"
msgstr ""
-#: exercises/models/comment.py:52 exercises/models/exercise_alias.py:52
+#: exercises/models/comment.py:52 exercises/models/exercise_alias.py:53
#: exercises/models/image.py:74 exercises/models/video.py:98
#: manager/forms.py:178 manager/helpers.py:86 manager/models/log.py:52
msgid "Exercise"
@@ -1373,12 +1370,12 @@ msgstr ""
msgid "A comment about how to correctly do this exercise."
msgstr ""
-#: exercises/models/exercise.py:76 nutrition/models/ingredient.py:95
+#: exercises/models/exercise.py:77 nutrition/models/ingredient.py:81
#: nutrition/models/weight_unit.py:32
msgid "Language"
msgstr ""
-#: exercises/models/exercise_alias.py:58
+#: exercises/models/exercise_alias.py:59
msgid "Alias for an exercise"
msgstr ""
@@ -1508,7 +1505,7 @@ msgstr ""
#: manager/models/schedule.py:44 manager/models/session.py:49
#: manager/models/workout.py:89 measurements/models/category.py:31
#: measurements/models/measurement.py:42 nutrition/models/plan.py:54
-#: nutrition/templates/ingredient/pending.html:16 weight/models.py:42
+#: weight/models.py:60
msgid "User"
msgstr ""
@@ -1627,9 +1624,9 @@ msgid "Contract type"
msgstr ""
#: gym/models/contract.py:211 gym/templates/contract/view.html:59
-#: manager/templates/log/add.html:52 nutrition/forms.py:62
-#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:105
-#: nutrition/models/meal_item.py:72
+#: manager/templates/log/add.html:52 nutrition/forms.py:63
+#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:108
+#: nutrition/models/meal_item.py:73
msgid "Amount"
msgstr ""
@@ -1646,7 +1643,7 @@ msgid "Contract is active"
msgstr ""
#: gym/models/contract.py:237 gym/templates/contract/view.html:69
-#: manager/models/schedule.py:61 manager/templates/schedule/view.html:68
+#: manager/models/schedule.py:61 manager/templates/schedule/view.html:67
msgid "Start date"
msgstr ""
@@ -2028,7 +2025,7 @@ msgstr ""
#: mailer/templates/mailer/gym/form.html:28
#: mailer/templates/mailer/gym/preview.html:62
-#: manager/templates/workout/view.html:42
+#: manager/templates/workout/view.html:40
msgid "Steps"
msgstr ""
@@ -2050,7 +2047,7 @@ msgid ""
msgstr ""
#: mailer/templates/mailer/gym/preview.html:22
-#: software/templates/about_us.html:60
+#: software/templates/about_us.html:70
msgid "Current version"
msgstr ""
@@ -2079,16 +2076,16 @@ msgid ""
"a superset."
msgstr ""
-#: manager/forms.py:140 nutrition/forms.py:252
+#: manager/forms.py:140 nutrition/forms.py:253
msgid "Also search for names in English"
msgstr ""
#: manager/forms.py:168 manager/forms.py:173 manager/models/log.py:64
-#: manager/models/log.py:92 manager/models/setting.py:59
-#: manager/models/setting.py:90 manager/templates/log/add.html:53
+#: manager/models/log.py:92 manager/models/setting.py:62
+#: manager/models/setting.py:93 manager/templates/log/add.html:53
#: manager/templates/log/add.html:55 manager/templates/set/formset.html:10
#: manager/templates/set/formset.html:12 measurements/models/category.py:41
-#: nutrition/forms.py:66
+#: nutrition/forms.py:67
msgid "Unit"
msgstr ""
@@ -2096,15 +2093,15 @@ msgstr ""
msgid "Type"
msgstr ""
-#: manager/forms.py:280 manager/templates/workout/view.html:115
+#: manager/forms.py:280 manager/templates/workout/view.html:113
msgid "Table"
msgstr ""
-#: manager/forms.py:282 manager/templates/workout/view.html:121
+#: manager/forms.py:282 manager/templates/workout/view.html:119
msgid "with images"
msgstr ""
-#: manager/forms.py:283 manager/templates/workout/view.html:127
+#: manager/forms.py:283 manager/templates/workout/view.html:125
msgid "with comments"
msgstr ""
@@ -2113,11 +2110,10 @@ msgid "Workout will expire soon"
msgstr ""
#: manager/models/day.py:34 manager/models/log.py:58
-#: manager/models/session.py:60 manager/templates/schedule/view.html:103
-#: manager/templates/workout/view.html:11
-#: manager/templates/workout/view.html:19 manager/views/pdf.py:85
-#: manager/views/pdf.py:161 manager/views/schedule.py:151
-#: manager/views/schedule.py:221
+#: manager/models/session.py:60 manager/templates/schedule/view.html:102
+#: manager/templates/workout/view.html:9 manager/templates/workout/view.html:17
+#: manager/views/pdf.py:85 manager/views/pdf.py:161
+#: manager/views/schedule.py:151 manager/views/schedule.py:221
msgid "Workout"
msgstr ""
@@ -2135,7 +2131,7 @@ msgstr ""
msgid "Name or short description of the schedule. For example 'Program XYZ'."
msgstr ""
-#: manager/models/schedule.py:65 manager/templates/schedule/view.html:72
+#: manager/models/schedule.py:65 manager/templates/schedule/view.html:71
msgid "Schedule active"
msgstr ""
@@ -2146,7 +2142,7 @@ msgid ""
"inactive"
msgstr ""
-#: manager/models/schedule.py:77 manager/templates/schedule/view.html:82
+#: manager/models/schedule.py:77 manager/templates/schedule/view.html:81
msgid "Is a loop"
msgstr ""
@@ -2165,8 +2161,8 @@ msgid "The duration in weeks"
msgstr ""
#: manager/models/schedule_step.py:64 manager/models/set.py:53
-#: manager/models/setting.py:110 nutrition/models/meal.py:55
-#: nutrition/models/meal_item.py:65
+#: manager/models/setting.py:113 nutrition/models/meal.py:55
+#: nutrition/models/meal_item.py:66
msgid "Order"
msgstr ""
@@ -2216,7 +2212,7 @@ msgstr ""
msgid "Number of sets"
msgstr ""
-#: manager/models/setting.py:48
+#: manager/models/setting.py:51
msgid "Sets"
msgstr ""
@@ -2285,7 +2281,7 @@ msgstr ""
msgid "Go to current month"
msgstr ""
-#: manager/templates/calendar/month.html:188
+#: manager/templates/calendar/month.html:190
msgid "Add new log"
msgstr ""
@@ -2322,8 +2318,8 @@ msgid "Your schedules"
msgstr ""
#: manager/templates/schedule/overview.html:19
-#: manager/templates/schedule/view.html:132
-#: manager/templates/schedule/view.html:184
+#: manager/templates/schedule/view.html:131
+#: manager/templates/schedule/view.html:183
#: manager/templates/workout/overview.html:16
msgid "active"
msgstr ""
@@ -2359,29 +2355,29 @@ msgstr ""
msgid "Add schedule"
msgstr ""
-#: manager/templates/schedule/view.html:10
+#: manager/templates/schedule/view.html:9
msgid "Schedule"
msgstr ""
-#: manager/templates/schedule/view.html:86
+#: manager/templates/schedule/view.html:85
msgid ""
"This schedule is a loop and will go through the workouts above till you "
"deactivate it"
msgstr ""
-#: manager/templates/schedule/view.html:104
+#: manager/templates/schedule/view.html:103
msgid "Weeks"
msgstr ""
-#: manager/templates/schedule/view.html:116
+#: manager/templates/schedule/view.html:115
msgid "Move me"
msgstr ""
-#: manager/templates/schedule/view.html:157
+#: manager/templates/schedule/view.html:156
msgid "Start schedule"
msgstr ""
-#: manager/templates/schedule/view.html:188
+#: manager/templates/schedule/view.html:187
#, python-format
msgid ""
"%(weeks)s Week\n"
@@ -2392,11 +2388,11 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: manager/templates/schedule/view.html:222
+#: manager/templates/schedule/view.html:221
msgid "Adding workouts"
msgstr ""
-#: manager/templates/schedule/view.html:224
+#: manager/templates/schedule/view.html:223
msgid ""
"Add as many workouts to the schedule as you want. You can\n"
" edit the order by dragging and dropping them. It's also possible "
@@ -2404,21 +2400,21 @@ msgid ""
" than once."
msgstr ""
-#: manager/templates/schedule/view.html:233
-#: manager/templates/schedule/view.html:244
-#: manager/templates/schedule/view.html:291
-#: manager/templates/workout/view.html:71
-#: manager/templates/workout/view.html:81
-#: manager/templates/workout/view.html:180
+#: manager/templates/schedule/view.html:232
+#: manager/templates/schedule/view.html:243
+#: manager/templates/schedule/view.html:290
+#: manager/templates/workout/view.html:69
+#: manager/templates/workout/view.html:79
+#: manager/templates/workout/view.html:178
msgid "Export calendar file"
msgstr ""
-#: manager/templates/schedule/view.html:237
+#: manager/templates/schedule/view.html:236
msgid "Export this schedule as a calendar file."
msgstr ""
-#: manager/templates/schedule/view.html:238
-#: manager/templates/workout/view.html:76
+#: manager/templates/schedule/view.html:237
+#: manager/templates/workout/view.html:74
msgid ""
"You can then import the file it into your calendar\n"
" application for example google calendar, outlook or "
@@ -2427,18 +2423,18 @@ msgid ""
"appropriate exercises."
msgstr ""
-#: manager/templates/schedule/view.html:259
-#: manager/templates/schedule/view.html:295
-#: manager/templates/workout/view.html:96
-#: manager/templates/workout/view.html:176
+#: manager/templates/schedule/view.html:258
+#: manager/templates/schedule/view.html:294
+#: manager/templates/workout/view.html:94
+#: manager/templates/workout/view.html:174
msgid "Download as PDF"
msgstr ""
-#: manager/templates/schedule/view.html:300
+#: manager/templates/schedule/view.html:299
msgid "Edit schedule"
msgstr ""
-#: manager/templates/schedule/view.html:305
+#: manager/templates/schedule/view.html:304
msgid "Delete schedule"
msgstr ""
@@ -2556,12 +2552,12 @@ msgid "Mark as workout"
msgstr ""
#: manager/templates/workout/template_view.html:65
-#: manager/templates/workout/view.html:51
+#: manager/templates/workout/view.html:49
msgid "Muscles trained"
msgstr ""
#: manager/templates/workout/template_view.html:68
-#: manager/templates/workout/view.html:54
+#: manager/templates/workout/view.html:52
msgid ""
"Images show combined muscles as trained by the exercises on the workout."
msgstr ""
@@ -2570,35 +2566,35 @@ msgstr ""
msgid "Use this template"
msgstr ""
-#: manager/templates/workout/view.html:45
+#: manager/templates/workout/view.html:43
msgid "Add training days"
msgstr ""
-#: manager/templates/workout/view.html:46
+#: manager/templates/workout/view.html:44
msgid "Add workout sets to days"
msgstr ""
-#: manager/templates/workout/view.html:47
+#: manager/templates/workout/view.html:45
msgid "Set the repetitions for each set"
msgstr ""
-#: manager/templates/workout/view.html:75
+#: manager/templates/workout/view.html:73
msgid "Export this workout as a calendar file."
msgstr ""
-#: manager/templates/workout/view.html:146
+#: manager/templates/workout/view.html:144
msgid "Logs"
msgstr ""
-#: manager/templates/workout/view.html:148
+#: manager/templates/workout/view.html:146
msgid "View logs"
msgstr ""
-#: manager/templates/workout/view.html:171 manager/views/schedule_step.py:99
+#: manager/templates/workout/view.html:169 manager/views/schedule_step.py:99
msgid "Edit workout"
msgstr ""
-#: manager/templates/workout/view.html:184 manager/views/workout.py:281
+#: manager/templates/workout/view.html:182 manager/views/workout.py:281
msgid "Mark as template"
msgstr ""
@@ -2645,103 +2641,89 @@ msgstr ""
msgid "Value"
msgstr ""
-#: nutrition/forms.py:117
+#: nutrition/forms.py:118
msgid "Height (in)"
msgstr ""
-#: nutrition/forms.py:120
+#: nutrition/forms.py:121
msgid "Weight (kg)"
msgstr ""
-#: nutrition/forms.py:120
+#: nutrition/forms.py:121
msgid "Weight (lbs)"
msgstr ""
-#: nutrition/forms.py:133
+#: nutrition/forms.py:134
msgid "Calculate"
msgstr ""
-#: nutrition/forms.py:207 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:208 nutrition/templates/rate/form.html:76
msgid "Basic caloric intake"
msgstr ""
-#: nutrition/forms.py:208
+#: nutrition/forms.py:209
msgid "Your basic caloric intake as calculated for your data"
msgstr ""
-#: nutrition/forms.py:213
+#: nutrition/forms.py:214
msgid "Additional calories"
msgstr ""
-#: nutrition/forms.py:215
+#: nutrition/forms.py:216
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
msgstr ""
-#: nutrition/forms.py:248 nutrition/models/ingredient_weight_unit.py:39
-#: nutrition/models/log.py:84 nutrition/models/meal_item.py:53
+#: nutrition/forms.py:249 nutrition/models/ingredient_weight_unit.py:39
+#: nutrition/models/log.py:87 nutrition/models/meal_item.py:54
msgid "Ingredient"
msgstr ""
-#: nutrition/models/ingredient.py:131
+#: nutrition/models/ingredient.py:117
msgid "In kcal per 100g"
msgstr ""
-#: nutrition/models/ingredient.py:138 nutrition/models/ingredient.py:146
-#: nutrition/models/ingredient.py:156 nutrition/models/ingredient.py:164
-#: nutrition/models/ingredient.py:174 nutrition/models/ingredient.py:184
-#: nutrition/models/ingredient.py:194
+#: nutrition/models/ingredient.py:124 nutrition/models/ingredient.py:132
+#: nutrition/models/ingredient.py:142 nutrition/models/ingredient.py:150
+#: nutrition/models/ingredient.py:160 nutrition/models/ingredient.py:170
+#: nutrition/models/ingredient.py:180
msgid "In g per 100g of product"
msgstr ""
-#: nutrition/models/ingredient.py:155
-#: nutrition/templates/ingredient/view.html:96 nutrition/views/plan.py:259
+#: nutrition/models/ingredient.py:141
+#: nutrition/templates/ingredient/view.html:70 nutrition/views/plan.py:259
msgid "Sugar content in carbohydrates"
msgstr ""
-#: nutrition/models/ingredient.py:173
-#: nutrition/templates/ingredient/view.html:112 nutrition/views/plan.py:273
+#: nutrition/models/ingredient.py:159
+#: nutrition/templates/ingredient/view.html:86 nutrition/views/plan.py:273
msgid "Saturated fat content in fats"
msgstr ""
-#: nutrition/models/ingredient.py:183
-#: nutrition/templates/ingredient/view.html:134 nutrition/views/plan.py:279
-msgid "Fibres"
+#: nutrition/models/ingredient.py:169
+#: nutrition/templates/ingredient/view.html:108 nutrition/views/plan.py:279
+msgid "Fiber"
msgstr ""
-#: nutrition/models/ingredient.py:193
-#: nutrition/templates/ingredient/view.html:144 nutrition/views/plan.py:285
+#: nutrition/models/ingredient.py:179
+#: nutrition/templates/ingredient/view.html:118 nutrition/views/plan.py:285
msgid "Sodium"
msgstr ""
-#: nutrition/models/ingredient.py:215
+#: nutrition/models/ingredient.py:209
msgid "Link to product"
msgstr ""
-#: nutrition/models/ingredient.py:244
+#: nutrition/models/ingredient.py:238
msgid "Brand name of product"
msgstr ""
-#: nutrition/models/ingredient.py:304
+#: nutrition/models/ingredient.py:305
#, python-brace-format
msgid "The total energy ({self.energy}kcal) is not the approximate sum of the "
msgstr ""
-#: nutrition/models/ingredient.py:383 nutrition/views/ingredient.py:196
-msgid "Ingredient was successfully added to the general database"
-msgstr ""
-
-#: nutrition/models/ingredient.py:408
-msgid "New user submitted ingredient"
-msgstr ""
-
-#: nutrition/models/ingredient.py:410
-#, python-brace-format
-msgid ""
-"The user {request.user.username} submitted a new ingredient \"{self.name}\"."
-msgstr ""
-
#: nutrition/models/ingredient_category.py:31
msgid "Ingredient Categories"
msgstr ""
@@ -2754,16 +2736,16 @@ msgstr ""
msgid "Unit amount, e.g. \"1 Cup\" or \"1/2 spoon\""
msgstr ""
-#: nutrition/models/log.py:49 nutrition/models/meal.py:50
-#: nutrition/models/meal_item.py:47 nutrition/models/plan.py:106
+#: nutrition/models/log.py:52 nutrition/models/meal.py:50
+#: nutrition/models/meal_item.py:48 nutrition/models/plan.py:108
msgid "Nutrition plan"
msgstr ""
-#: nutrition/models/log.py:58
+#: nutrition/models/log.py:61
msgid "Meal"
msgstr ""
-#: nutrition/models/log.py:68
+#: nutrition/models/log.py:71
msgid "Date and Time (Approx.)"
msgstr ""
@@ -2783,11 +2765,11 @@ msgid ""
"summer\""
msgstr ""
-#: nutrition/models/plan.py:88
+#: nutrition/models/plan.py:90
msgid "Use daily calories"
msgstr ""
-#: nutrition/models/plan.py:91
+#: nutrition/models/plan.py:93
msgid ""
"Tick the box if you want to mark this plan as having a goal amount of "
"calories. You can use the calculator or enter the value yourself."
@@ -2894,64 +2876,36 @@ msgstr ""
msgid "Add ingredient"
msgstr ""
-#: nutrition/templates/ingredient/pending.html:14
-msgid "Submission date"
-msgstr ""
-
-#: nutrition/templates/ingredient/view.html:27
-msgid "Ingredient is pending review"
-msgstr ""
-
-#: nutrition/templates/ingredient/view.html:28
-msgid ""
-"This user submitted ingredient is pending a decision to be\n"
-"included in the database. Till then, it will not be shown in the overview "
-"or\n"
-"the search."
-msgstr ""
-
-#: nutrition/templates/ingredient/view.html:31
-msgid "Please select one of the options below."
-msgstr ""
-
-#: nutrition/templates/ingredient/view.html:38
-msgid "Accept"
-msgstr ""
-
-#: nutrition/templates/ingredient/view.html:42
-msgid "Decline"
-msgstr ""
-
-#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:229
+#: nutrition/templates/ingredient/view.html:45 nutrition/views/plan.py:229
msgid "Macronutrients"
msgstr ""
-#: nutrition/templates/ingredient/view.html:80
+#: nutrition/templates/ingredient/view.html:54
msgid "kJ"
msgstr ""
-#: nutrition/templates/ingredient/view.html:101
-#: nutrition/templates/ingredient/view.html:117
-#: nutrition/templates/ingredient/view.html:139
-#: nutrition/templates/ingredient/view.html:149
+#: nutrition/templates/ingredient/view.html:75
+#: nutrition/templates/ingredient/view.html:91
+#: nutrition/templates/ingredient/view.html:113
+#: nutrition/templates/ingredient/view.html:123
msgid "n.A."
msgstr ""
-#: nutrition/templates/ingredient/view.html:128
+#: nutrition/templates/ingredient/view.html:102
msgid "Others"
msgstr ""
-#: nutrition/templates/ingredient/view.html:170
+#: nutrition/templates/ingredient/view.html:144
#: nutrition/templates/units/list.html:46 nutrition/views/unit.py:86
msgid "Add new weight unit"
msgstr ""
-#: nutrition/templates/ingredient/view.html:232
-#: nutrition/templates/ingredient/view.html:235
+#: nutrition/templates/ingredient/view.html:206
+#: nutrition/templates/ingredient/view.html:209
msgid "Edit ingredient"
msgstr ""
-#: nutrition/templates/ingredient/view.html:239
+#: nutrition/templates/ingredient/view.html:213
msgid "Delete ingredient"
msgstr ""
@@ -3035,14 +2989,10 @@ msgstr ""
msgid "56 to 90"
msgstr ""
-#: nutrition/views/ingredient.py:154
+#: nutrition/views/ingredient.py:157
msgid "Add a new ingredient"
msgstr ""
-#: nutrition/views/ingredient.py:209
-msgid "Ingredient was successfully marked as rejected"
-msgstr ""
-
#: nutrition/views/plan.py:120
msgid "Nutritional plan"
msgstr ""
@@ -3087,50 +3037,59 @@ msgid ""
msgstr ""
#: software/templates/about_us.html:18
-msgid "Source code"
-msgstr ""
-
-#: software/templates/about_us.html:20
-msgid "Get the source code of this application and its server on github"
-msgstr ""
-
-#: software/templates/about_us.html:25
msgid "Have a problem or idea?"
msgstr ""
-#: software/templates/about_us.html:27
+#: software/templates/about_us.html:20
msgid ""
"Get in touch if something didn't behave as expected or if there is a feature "
"that you feel is missing."
msgstr ""
-#: software/templates/about_us.html:32
+#: software/templates/about_us.html:26
msgid "Say hi!"
msgstr ""
-#: software/templates/about_us.html:34
+#: software/templates/about_us.html:28
msgid "If you want to chat with us, hop on the Discord server and get in touch"
msgstr ""
-#: software/templates/about_us.html:39 software/templates/features.html:503
+#: software/templates/about_us.html:33
+msgid "Mastodon"
+msgstr ""
+
+#: software/templates/about_us.html:35
+msgid "Follow us on mastodon for updates and news about the project"
+msgstr ""
+
+#: software/templates/about_us.html:40 software/templates/features.html:503
msgid "Translation"
msgstr ""
-#: software/templates/about_us.html:41
+#: software/templates/about_us.html:42
msgid ""
"This application is translated on weblate. If you also want to help, click "
"the link and start translating"
msgstr ""
-#: software/templates/about_us.html:50
+#: software/templates/about_us.html:47
+msgid "Source code"
+msgstr ""
+
+#: software/templates/about_us.html:49
+msgid "Get the source code of this application and its server on github"
+msgstr ""
+
+#: software/templates/about_us.html:59
msgid "Our goal"
msgstr ""
-#: software/templates/about_us.html:53
+#: software/templates/about_us.html:62
msgid ""
"The goal is to build an awesome\n"
" and flexible fitness manager, along with a comprehensive and "
-"complete list of exercises and\n"
+"complete list of\n"
+" exercises and\n"
" ingredients, all released under a free license."
msgstr ""
@@ -3140,10 +3099,6 @@ msgid ""
"your exercises and workouts."
msgstr ""
-#: software/templates/features.html:45
-msgid "About"
-msgstr ""
-
#: software/templates/features.html:57
msgid "Mobile app"
msgstr ""
@@ -3379,18 +3334,6 @@ msgid ""
"to its own copyright."
msgstr ""
-#: utils/models.py:130
-msgid "Pending"
-msgstr ""
-
-#: utils/models.py:131
-msgid "Accepted"
-msgstr ""
-
-#: utils/models.py:132
-msgid "Declined"
-msgstr ""
-
#: weight/forms.py:54
msgid "Input"
msgstr ""
@@ -3403,7 +3346,7 @@ msgstr ""
msgid "You have to enter your weight"
msgstr ""
-#: weight/models.py:60
+#: weight/models.py:78
msgid "Weight entry"
msgstr ""
diff --git a/wger/locale/hi/LC_MESSAGES/django.po b/wger/locale/hi/LC_MESSAGES/django.po
index ab78cbf10..7422badb3 100644
--- a/wger/locale/hi/LC_MESSAGES/django.po
+++ b/wger/locale/hi/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-02-02 12:42+0100\n"
+"POT-Creation-Date: 2024-07-14 15:49+0200\n"
"PO-Revision-Date: 2022-10-05 20:25+0000\n"
"Last-Translator: Ritish Bhardwaj <[email protected]>\n"
"Language-Team: Hindi <https://hosted.weblate.org/projects/wger/web/hi/>\n"
@@ -28,7 +28,7 @@ msgid ""
"registered users to this gym and update all existing users without a gym."
msgstr ""
-#: config/views/gym_config.py:42 core/templates/language/view.html:63
+#: config/views/gym_config.py:42 core/templates/language/view.html:67
#: core/templates/license/list.html:17 core/templates/misc/license/list.html:18
#: core/templates/repetition_unit/list.html:18
#: core/templates/tags/render_day.html:39
@@ -48,8 +48,8 @@ msgstr ""
#: manager/templates/calendar/day.html:68
#: manager/templates/calendar/month.html:85
#: manager/templates/calendar/partial_overview_table.html:18
-#: manager/templates/schedule/view.html:119
-#: nutrition/templates/ingredient/view.html:191
+#: manager/templates/schedule/view.html:118
+#: nutrition/templates/ingredient/view.html:165
#: nutrition/templates/units/list.html:19
msgid "Edit"
msgstr ""
@@ -83,8 +83,8 @@ msgstr ""
msgid "Empty placeholder schedule"
msgstr ""
-#: core/forms.py:69 core/templates/navigation.html:275
-#: core/templates/navigation.html:281 core/templates/user/login.html:4
+#: core/forms.py:69 core/templates/navigation.html:285
+#: core/templates/navigation.html:291 core/templates/user/login.html:4
#: software/templates/features.html:82 software/templates/features.html:427
msgid "Login"
msgstr ""
@@ -154,7 +154,7 @@ msgstr ""
msgid "Please enter your current password."
msgstr ""
-#: core/forms.py:242 core/templates/language/view.html:68
+#: core/forms.py:242 core/templates/language/view.html:73
#: core/templates/license/list.html:19 core/templates/misc/license/list.html:22
#: core/templates/repetition_unit/list.html:20
#: core/templates/tags/render_day.html:45
@@ -169,10 +169,10 @@ msgstr ""
#: gym/templates/gym/list.html:22 manager/templates/calendar/day.html:73
#: manager/templates/calendar/month.html:89
#: manager/templates/calendar/partial_overview_table.html:23
-#: manager/templates/schedule/view.html:123
-#: manager/templates/workout/view.html:190
-#: nutrition/templates/ingredient/view.html:192
-#: nutrition/templates/ingredient/view.html:241
+#: manager/templates/schedule/view.html:122
+#: manager/templates/workout/view.html:188
+#: nutrition/templates/ingredient/view.html:166
+#: nutrition/templates/ingredient/view.html:215
#: nutrition/templates/units/list.html:22
msgid "Delete"
msgstr "मिटादे"
@@ -185,14 +185,14 @@ msgstr ""
msgid "The form is secured with reCAPTCHA"
msgstr ""
-#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:275
-#: core/templates/navigation.html:287 core/templates/template.html:147
+#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:285
+#: core/templates/navigation.html:297 core/templates/template.html:149
#: core/templates/user/login.html:20 core/views/user.py:298
#: software/templates/features.html:87 software/templates/features.html:422
msgid "Register"
msgstr ""
-#: core/forms.py:315
+#: core/forms.py:315 software/templates/features.html:45
msgid "Contact"
msgstr ""
@@ -201,7 +201,7 @@ msgid "Some way of answering you (e-mail, etc.)"
msgstr ""
#: core/forms.py:324 exercises/models/comment.py:58 manager/models/set.py:61
-#: manager/models/setting.py:111 nutrition/models/log.py:74
+#: manager/models/setting.py:114 nutrition/models/log.py:77
msgid "Comment"
msgstr ""
@@ -221,6 +221,10 @@ msgstr ""
msgid "Language full name"
msgstr ""
+#: core/models/language.py:45 core/templates/language/view.html:23
+msgid "Language full name in English"
+msgstr ""
+
#: core/models/license.py:29
msgid "Full name"
msgstr ""
@@ -235,7 +239,7 @@ msgstr ""
msgid "Short name, e.g. CC-BY-SA 3"
msgstr ""
-#: core/models/license.py:45 nutrition/models/ingredient.py:214
+#: core/models/license.py:45 nutrition/models/ingredient.py:208
msgid "Link"
msgstr ""
@@ -338,7 +342,7 @@ msgstr ""
msgid "Age"
msgstr ""
-#: core/models/profile.py:230 nutrition/forms.py:117
+#: core/models/profile.py:230 nutrition/forms.py:118
msgid "Height (cm)"
msgstr ""
@@ -389,7 +393,7 @@ msgid "Total caloric intake, including e.g. any surplus"
msgstr ""
#: core/models/profile.py:333 nutrition/models/ingredient_weight_unit.py:45
-#: nutrition/models/log.py:93 nutrition/models/meal_item.py:58
+#: nutrition/models/log.py:96 nutrition/models/meal_item.py:59
msgid "Weight unit"
msgstr ""
@@ -418,17 +422,16 @@ msgstr ""
#: core/models/rep_unit.py:36 core/models/weight_unit.py:36
#: core/templates/user/overview.html:262 core/views/user.py:599
#: exercises/models/category.py:29 exercises/models/equipment.py:29
-#: exercises/models/exercise.py:58 exercises/models/muscle.py:36
+#: exercises/models/exercise.py:59 exercises/models/muscle.py:36
#: gym/models/contract.py:52 gym/models/contract.py:103 gym/models/gym.py:46
#: gym/models/user_document.py:84 gym/templates/contract/view.html:50
#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:96
#: gym/views/gym.py:158 manager/models/schedule.py:55
#: manager/models/workout.py:57 measurements/models/category.py:36
-#: nutrition/models/ingredient.py:125
+#: nutrition/models/ingredient.py:111
#: nutrition/models/ingredient_category.py:27 nutrition/models/meal.py:67
#: nutrition/models/weight_unit.py:38
-#: nutrition/templates/ingredient/pending.html:15
-#: nutrition/templates/ingredient/view.html:178
+#: nutrition/templates/ingredient/view.html:152
msgid "Name"
msgstr ""
@@ -525,24 +528,24 @@ msgstr ""
msgid "Dashboard"
msgstr ""
-#: core/templates/language/overview.html:4 core/templates/navigation.html:335
+#: core/templates/language/overview.html:4 core/templates/navigation.html:345
msgid "Languages"
msgstr "भाषाएँ"
-#: core/templates/language/overview.html:20
+#: core/templates/language/overview.html:22
msgid "Nothing found."
msgstr "कुछ नहीं मिला"
-#: core/templates/language/overview.html:20
+#: core/templates/language/overview.html:22
#: manager/templates/calendar/month.html:132
#: manager/templates/schedule/overview.html:28
-#: manager/templates/schedule/view.html:145
+#: manager/templates/schedule/view.html:144
#: manager/templates/workout/overview.html:28
#: nutrition/templates/ingredient/overview.html:38
msgid "Add one now."
msgstr "एक नया जोड़ें |"
-#: core/templates/language/overview.html:33 core/templates/license/list.html:40
+#: core/templates/language/overview.html:35 core/templates/license/list.html:40
#: core/templates/misc/license/list.html:43
#: core/templates/repetition_unit/list.html:43
#: core/templates/user/overview.html:326 core/templates/user/overview.html:365
@@ -562,13 +565,13 @@ msgstr "एक नया जोड़ें |"
msgid "Add"
msgstr "जोड़ें"
-#: core/templates/language/view.html:58 core/templates/user/api_key.html:44
+#: core/templates/language/view.html:61 core/templates/user/api_key.html:44
#: core/templates/user/preferences.html:45 gym/models/contract.py:203
#: gym/templates/contract/view.html:41 gym/templates/contract/view.html:106
#: gym/templates/gym/member_list.html:248
-#: manager/templates/schedule/view.html:286
-#: manager/templates/workout/view.html:165
-#: nutrition/templates/ingredient/view.html:228
+#: manager/templates/schedule/view.html:285
+#: manager/templates/workout/view.html:163
+#: nutrition/templates/ingredient/view.html:202
msgid "Options"
msgstr ""
@@ -593,12 +596,11 @@ msgstr ""
#: gym/templates/gym/member_list.html:299
#: mailer/templates/mailer/gym/overview.html:30
#: manager/templates/calendar/day.html:87
-#: nutrition/templates/ingredient/pending.html:30
#: nutrition/templates/units/list.html:29
msgid "Nothing found"
msgstr ""
-#: core/templates/misc/about.html:4 core/templates/template.html:173
+#: core/templates/misc/about.html:4 core/templates/template.html:175
msgid "Imprint"
msgstr ""
@@ -609,176 +611,171 @@ msgid ""
"entries here."
msgstr ""
-#: core/templates/navigation.html:27 software/templates/features.html:437
+#: core/templates/navigation.html:28 software/templates/features.html:437
msgid "Training"
msgstr ""
-#: core/templates/navigation.html:34 core/templates/user/overview.html:25
+#: core/templates/navigation.html:37 core/templates/user/overview.html:25
msgid "Workouts"
msgstr ""
-#: core/templates/navigation.html:42
+#: core/templates/navigation.html:46
msgid "Workouts schedules"
msgstr ""
-#: core/templates/navigation.html:50 core/templates/user/overview.html:70
+#: core/templates/navigation.html:54 core/templates/user/overview.html:70
#: manager/templates/calendar/month.html:10
#: manager/templates/calendar/month.html:21
msgid "Calendar"
msgstr ""
-#: core/templates/navigation.html:60
+#: core/templates/navigation.html:64
msgid "Measurements"
msgstr ""
-#: core/templates/navigation.html:70 gallery/templates/images/overview.html:6
+#: core/templates/navigation.html:75 gallery/templates/images/overview.html:6
msgid "Gallery"
msgstr ""
-#: core/templates/navigation.html:76
+#: core/templates/navigation.html:81
msgid "Workout templates"
msgstr ""
-#: core/templates/navigation.html:82 manager/views/workout.py:84
+#: core/templates/navigation.html:88 manager/views/workout.py:84
msgid "Your templates"
msgstr ""
-#: core/templates/navigation.html:90 manager/views/workout.py:98
+#: core/templates/navigation.html:97 manager/views/workout.py:98
msgid "Public templates"
msgstr ""
-#: core/templates/navigation.html:97 manager/forms.py:129
-#: manager/models/setting.py:54 software/templates/features.html:51
+#: core/templates/navigation.html:105 manager/forms.py:129
+#: manager/models/setting.py:57 software/templates/features.html:51
#: software/templates/features.html:459
msgid "Exercises"
msgstr "व्यायाम"
-#: core/templates/navigation.html:103 core/templates/navigation.html:170
-#: core/templates/navigation.html:330
+#: core/templates/navigation.html:111 core/templates/navigation.html:184
+#: core/templates/navigation.html:340
msgid "Administration"
msgstr ""
-#: core/templates/navigation.html:106
+#: core/templates/navigation.html:115
#, fuzzy
#| msgid "Exercises"
msgid "Exercise edit history"
msgstr "व्यायाम"
-#: core/templates/navigation.html:111 exercises/models/base.py:103
+#: core/templates/navigation.html:121 exercises/models/base.py:103
msgid "Equipment"
msgstr ""
-#: core/templates/navigation.html:116
+#: core/templates/navigation.html:127
msgid "Muscles"
msgstr ""
-#: core/templates/navigation.html:121
+#: core/templates/navigation.html:133
#: exercises/templates/categories/admin-overview.html:4
msgid "Categories"
msgstr ""
-#: core/templates/navigation.html:136 software/templates/features.html:447
+#: core/templates/navigation.html:148 software/templates/features.html:447
msgid "Nutrition"
msgstr ""
-#: core/templates/navigation.html:143 core/templates/user/overview.html:144
+#: core/templates/navigation.html:156 core/templates/user/overview.html:144
msgid "Nutrition plans"
msgstr ""
-#: core/templates/navigation.html:151 nutrition/templates/bmi/form.html:50
+#: core/templates/navigation.html:165 nutrition/templates/bmi/form.html:50
msgid "BMI calculator"
msgstr ""
-#: core/templates/navigation.html:159 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:174 nutrition/templates/rate/form.html:17
msgid "Daily calories calculator"
msgstr ""
-#: core/templates/navigation.html:165
+#: core/templates/navigation.html:179
#: nutrition/templates/ingredient/overview.html:10
msgid "Ingredient overview"
msgstr ""
-#: core/templates/navigation.html:172 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:187 nutrition/templates/units/list.html:6
msgid "Ingredient weight units"
msgstr ""
-#: core/templates/navigation.html:177
-#: nutrition/templates/ingredient/pending.html:6
-msgid "Ingredients pending review"
-msgstr ""
-
-#: core/templates/navigation.html:193 software/templates/features.html:442
+#: core/templates/navigation.html:203 software/templates/features.html:442
msgid "Body weight"
msgstr ""
-#: core/templates/navigation.html:200 core/templates/user/overview.html:114
+#: core/templates/navigation.html:210 core/templates/user/overview.html:114
msgid "Weight overview"
msgstr ""
-#: core/templates/navigation.html:207 weight/views.py:65
+#: core/templates/navigation.html:217 weight/views.py:65
msgid "Add weight entry"
msgstr ""
-#: core/templates/navigation.html:221
+#: core/templates/navigation.html:231
msgid "About this software"
msgstr ""
-#: core/templates/navigation.html:227 software/templates/about_us.html:5
+#: core/templates/navigation.html:237 software/templates/about_us.html:5
msgid "About us"
msgstr ""
-#: core/templates/navigation.html:233 software/templates/features.html:507
+#: core/templates/navigation.html:243 software/templates/features.html:507
msgid "REST API"
msgstr ""
-#: core/templates/navigation.html:239 utils/models.py:45
+#: core/templates/navigation.html:249 utils/models.py:45
msgid "License"
msgstr ""
-#: core/templates/navigation.html:245
+#: core/templates/navigation.html:255
msgid "Developer documentation"
msgstr ""
-#: core/templates/navigation.html:252
+#: core/templates/navigation.html:262
msgid "Get the code"
msgstr ""
-#: core/templates/navigation.html:259 core/templates/template.html:212
+#: core/templates/navigation.html:269 core/templates/template.html:214
#: software/templates/features.html:582
msgid "Translate"
msgstr ""
-#: core/templates/navigation.html:293 core/templates/user/login.html:28
+#: core/templates/navigation.html:303 core/templates/user/login.html:28
msgid "Reset password"
msgstr ""
-#: core/templates/navigation.html:311
+#: core/templates/navigation.html:321
msgid "My preferences"
msgstr ""
-#: core/templates/navigation.html:320
+#: core/templates/navigation.html:330
msgid "Logout"
msgstr ""
-#: core/templates/navigation.html:343
+#: core/templates/navigation.html:353
msgid "Licenses"
msgstr ""
-#: core/templates/navigation.html:351
+#: core/templates/navigation.html:361
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr ""
-#: core/templates/navigation.html:359 core/templates/weight_unit/list.html:4
-#: nutrition/templates/ingredient/view.html:167
+#: core/templates/navigation.html:369 core/templates/weight_unit/list.html:4
+#: nutrition/templates/ingredient/view.html:141
msgid "Weight units"
msgstr ""
-#: core/templates/navigation.html:367 core/templates/user/list.html:4
+#: core/templates/navigation.html:377 core/templates/user/list.html:4
msgid "User list"
msgstr ""
-#: core/templates/navigation.html:373
+#: core/templates/navigation.html:383
msgid "Gyms"
msgstr ""
@@ -828,12 +825,12 @@ msgstr ""
msgid "The %(site_name)s team"
msgstr ""
-#: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:11
+#: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:12
msgid "previous"
msgstr ""
-#: core/templates/tags/pagination.html:31
-#: core/templates/tags/pagination.html:35
+#: core/templates/tags/pagination.html:33
+#: core/templates/tags/pagination.html:38
msgid "next"
msgstr ""
@@ -858,34 +855,34 @@ msgid "Add exercises to this workout day"
msgstr ""
#: core/templates/tags/render_weight_log.html:17 manager/helpers.py:86
-#: manager/models/setting.py:69 manager/templates/set/formset.html:9
+#: manager/models/setting.py:72 manager/templates/set/formset.html:9
msgid "Reps"
msgstr ""
#: core/templates/tags/render_weight_log.html:30 manager/forms.py:191
-#: manager/models/log.py:103 manager/models/setting.py:99
+#: manager/models/log.py:103 manager/models/setting.py:102
#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
msgid "RiR"
msgstr ""
-#: core/templates/template.html:120 manager/templates/calendar/month.html:138
-#: manager/templates/schedule/view.html:249
-#: manager/templates/schedule/view.html:270
-#: manager/templates/workout/view.html:86
-#: manager/templates/workout/view.html:139
+#: core/templates/template.html:122 manager/templates/calendar/month.html:138
+#: manager/templates/schedule/view.html:248
+#: manager/templates/schedule/view.html:269
+#: manager/templates/workout/view.html:84
+#: manager/templates/workout/view.html:137
msgid "Close"
msgstr ""
-#: core/templates/template.html:136
+#: core/templates/template.html:138
msgid ""
"You are using a guest account, data entered will be deleted after a week."
msgstr ""
-#: core/templates/template.html:141
+#: core/templates/template.html:143
msgid "Create some demo entries"
msgstr ""
-#: core/templates/template.html:178 software/templates/features.html:547
+#: core/templates/template.html:180 software/templates/features.html:547
#: software/templates/tos.html:7
msgid "Terms of service"
msgstr ""
@@ -977,7 +974,7 @@ msgid "Overview"
msgstr ""
#: core/templates/user/overview.html:28
-#: manager/templates/schedule/view.html:164
+#: manager/templates/schedule/view.html:163
#: manager/templates/workout/overview.html:39 manager/views/schedule_step.py:60
msgid "Add workout"
msgstr ""
@@ -985,20 +982,20 @@ msgstr ""
#: core/templates/user/overview.html:34 core/templates/user/overview.html:76
#: core/templates/user/overview.html:120 core/templates/user/overview.html:152
#: exercises/models/base.py:118 exercises/models/base.py:124
-#: exercises/models/exercise.py:63 exercises/models/exercise.py:69
+#: exercises/models/exercise.py:64 exercises/models/exercise.py:70
#: exercises/models/image.py:107 exercises/models/image.py:113
#: exercises/models/video.py:163 exercises/models/video.py:169
#: gallery/models/image.py:42 manager/helpers.py:85 manager/models/log.py:100
#: manager/models/session.py:67 measurements/models/measurement.py:47
-#: nutrition/models/ingredient.py:101 nutrition/models/ingredient.py:107
-#: nutrition/models/ingredient.py:222 weight/models.py:33
+#: nutrition/models/ingredient.py:87 nutrition/models/ingredient.py:93
+#: nutrition/models/ingredient.py:216 weight/models.py:51
#: weight/templates/import_csv_preview.html:13
#: weight/templates/import_csv_preview.html:42 weight/views.py:144
msgid "Date"
msgstr ""
#: core/templates/user/overview.html:35 core/templates/user/overview.html:153
-#: exercises/models/exercise.py:51 gallery/models/image.py:65
+#: exercises/models/exercise.py:52 gallery/models/image.py:65
#: gym/models/contract.py:58 gym/models/contract.py:109
#: manager/models/day.py:37 manager/models/workout.py:63
#: measurements/models/measurement.py:62 nutrition/models/plan.py:67
@@ -1016,13 +1013,13 @@ msgstr ""
#: core/templates/user/overview.html:58
#: manager/templates/calendar/month.html:128
-#: manager/templates/schedule/view.html:145
+#: manager/templates/schedule/view.html:144
#: manager/templates/workout/overview.html:28
msgid "No workouts found."
msgstr ""
#: core/templates/user/overview.html:68 manager/forms.py:280
-#: manager/templates/workout/view.html:108
+#: manager/templates/workout/view.html:106
msgid "Log"
msgstr ""
@@ -1046,35 +1043,35 @@ msgstr ""
#: core/templates/user/overview.html:112 core/templates/user/overview.html:121
#: manager/forms.py:186 manager/helpers.py:86 manager/models/log.py:86
-#: manager/models/setting.py:79 manager/templates/log/add.html:54
-#: manager/templates/set/formset.html:11 weight/models.py:35
+#: manager/models/setting.py:82 manager/templates/log/add.html:54
+#: manager/templates/set/formset.html:11 weight/models.py:53
#: weight/templates/import_csv_preview.html:14
#: weight/templates/import_csv_preview.html:43 weight/views.py:144
msgid "Weight"
msgstr ""
-#: core/templates/user/overview.html:154 nutrition/models/ingredient.py:130
-#: nutrition/templates/ingredient/view.html:77 nutrition/views/plan.py:237
+#: core/templates/user/overview.html:154 nutrition/models/ingredient.py:116
+#: nutrition/templates/ingredient/view.html:51 nutrition/views/plan.py:237
msgid "Energy"
msgstr ""
-#: core/templates/user/overview.html:155 nutrition/models/ingredient.py:137
-#: nutrition/templates/ingredient/view.html:84 nutrition/views/plan.py:243
+#: core/templates/user/overview.html:155 nutrition/models/ingredient.py:123
+#: nutrition/templates/ingredient/view.html:58 nutrition/views/plan.py:243
msgid "Protein"
msgstr ""
-#: core/templates/user/overview.html:156 nutrition/models/ingredient.py:145
-#: nutrition/templates/ingredient/view.html:90 nutrition/views/plan.py:251
+#: core/templates/user/overview.html:156 nutrition/models/ingredient.py:131
+#: nutrition/templates/ingredient/view.html:64 nutrition/views/plan.py:251
msgid "Carbohydrates"
msgstr ""
-#: core/templates/user/overview.html:157 nutrition/models/ingredient.py:163
-#: nutrition/templates/ingredient/view.html:106 nutrition/views/plan.py:265
+#: core/templates/user/overview.html:157 nutrition/models/ingredient.py:149
+#: nutrition/templates/ingredient/view.html:80 nutrition/views/plan.py:265
msgid "Fat"
msgstr ""
#: core/templates/user/overview.html:170
-#: nutrition/templates/ingredient/view.html:79
+#: nutrition/templates/ingredient/view.html:53
msgid "kcal"
msgstr ""
@@ -1086,7 +1083,7 @@ msgstr ""
#: gym/templates/gym/member_list.html:207
#: gym/templates/gym/member_list.html:240
#: gym/templates/gym/member_list.html:277
-#: manager/templates/schedule/view.html:101
+#: manager/templates/schedule/view.html:100
msgid "Actions"
msgstr ""
@@ -1129,7 +1126,7 @@ msgid "Details"
msgstr ""
#: core/templates/user/overview.html:258 gym/views/export.py:57
-#: manager/helpers.py:86 manager/templates/schedule/view.html:99
+#: manager/helpers.py:86 manager/templates/schedule/view.html:98
msgid "Nr."
msgstr ""
@@ -1174,7 +1171,7 @@ msgid "Documents"
msgstr ""
#: core/templates/user/overview.html:412 gym/templates/document/list.html:32
-#: manager/forms.py:292 manager/templates/workout/view.html:134
+#: manager/forms.py:292 manager/templates/workout/view.html:132
msgid "Download"
msgstr ""
@@ -1225,13 +1222,13 @@ msgid "kg"
msgstr ""
#: core/templatetags/wger_extras.py:207
-#: nutrition/templates/ingredient/view.html:86
-#: nutrition/templates/ingredient/view.html:92
-#: nutrition/templates/ingredient/view.html:99
-#: nutrition/templates/ingredient/view.html:108
-#: nutrition/templates/ingredient/view.html:115
-#: nutrition/templates/ingredient/view.html:137
-#: nutrition/templates/ingredient/view.html:147
+#: nutrition/templates/ingredient/view.html:60
+#: nutrition/templates/ingredient/view.html:66
+#: nutrition/templates/ingredient/view.html:73
+#: nutrition/templates/ingredient/view.html:82
+#: nutrition/templates/ingredient/view.html:89
+#: nutrition/templates/ingredient/view.html:111
+#: nutrition/templates/ingredient/view.html:121
msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr ""
@@ -1249,7 +1246,7 @@ msgstr ""
#: exercises/views/equipment.py:103 exercises/views/exercises.py:73
#: exercises/views/muscles.py:99 manager/views/schedule.py:309
#: manager/views/schedule_step.py:128 manager/views/workout.py:249
-#: manager/views/workout_session.py:142 nutrition/views/ingredient.py:116
+#: manager/views/workout_session.py:142 nutrition/views/ingredient.py:119
#: nutrition/views/unit.py:110
msgid "Successfully deleted"
msgstr ""
@@ -1261,7 +1258,7 @@ msgstr ""
#: gym/views/admin_notes.py:196 gym/views/document.py:206 gym/views/gym.py:481
#: manager/views/schedule.py:316 manager/views/schedule_step.py:138
#: manager/views/workout.py:253 manager/views/workout_session.py:156
-#: nutrition/views/ingredient.py:123 nutrition/views/unit.py:117
+#: nutrition/views/ingredient.py:126 nutrition/views/unit.py:117
#, python-brace-format
msgid "Delete {0}?"
msgstr ""
@@ -1274,7 +1271,7 @@ msgstr ""
#: gym/views/contract.py:186 gym/views/contract_option.py:123
#: gym/views/contract_type.py:123 gym/views/document.py:171
#: gym/views/gym.py:463 manager/views/day.py:100 manager/views/schedule.py:333
-#: manager/views/workout.py:267 nutrition/views/ingredient.py:142
+#: manager/views/workout.py:267 nutrition/views/ingredient.py:145
#: nutrition/views/unit.py:143
#, python-brace-format
msgid "Edit {0}"
@@ -1345,7 +1342,7 @@ msgstr ""
msgid "A verification email was sent to %(email)s"
msgstr ""
-#: exercises/models/base.py:82 nutrition/models/ingredient.py:236
+#: exercises/models/base.py:82 nutrition/models/ingredient.py:230
msgid "Category"
msgstr ""
@@ -1365,7 +1362,7 @@ msgstr ""
msgid "Exercise Categories"
msgstr ""
-#: exercises/models/comment.py:52 exercises/models/exercise_alias.py:52
+#: exercises/models/comment.py:52 exercises/models/exercise_alias.py:53
#: exercises/models/image.py:74 exercises/models/video.py:98
#: manager/forms.py:178 manager/helpers.py:86 manager/models/log.py:52
msgid "Exercise"
@@ -1375,12 +1372,12 @@ msgstr ""
msgid "A comment about how to correctly do this exercise."
msgstr ""
-#: exercises/models/exercise.py:76 nutrition/models/ingredient.py:95
+#: exercises/models/exercise.py:77 nutrition/models/ingredient.py:81
#: nutrition/models/weight_unit.py:32
msgid "Language"
msgstr ""
-#: exercises/models/exercise_alias.py:58
+#: exercises/models/exercise_alias.py:59
msgid "Alias for an exercise"
msgstr ""
@@ -1510,7 +1507,7 @@ msgstr ""
#: manager/models/schedule.py:44 manager/models/session.py:49
#: manager/models/workout.py:89 measurements/models/category.py:31
#: measurements/models/measurement.py:42 nutrition/models/plan.py:54
-#: nutrition/templates/ingredient/pending.html:16 weight/models.py:42
+#: weight/models.py:60
msgid "User"
msgstr ""
@@ -1629,9 +1626,9 @@ msgid "Contract type"
msgstr ""
#: gym/models/contract.py:211 gym/templates/contract/view.html:59
-#: manager/templates/log/add.html:52 nutrition/forms.py:62
-#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:105
-#: nutrition/models/meal_item.py:72
+#: manager/templates/log/add.html:52 nutrition/forms.py:63
+#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:108
+#: nutrition/models/meal_item.py:73
msgid "Amount"
msgstr ""
@@ -1648,7 +1645,7 @@ msgid "Contract is active"
msgstr ""
#: gym/models/contract.py:237 gym/templates/contract/view.html:69
-#: manager/models/schedule.py:61 manager/templates/schedule/view.html:68
+#: manager/models/schedule.py:61 manager/templates/schedule/view.html:67
msgid "Start date"
msgstr ""
@@ -2030,7 +2027,7 @@ msgstr ""
#: mailer/templates/mailer/gym/form.html:28
#: mailer/templates/mailer/gym/preview.html:62
-#: manager/templates/workout/view.html:42
+#: manager/templates/workout/view.html:40
msgid "Steps"
msgstr ""
@@ -2052,7 +2049,7 @@ msgid ""
msgstr ""
#: mailer/templates/mailer/gym/preview.html:22
-#: software/templates/about_us.html:60
+#: software/templates/about_us.html:70
msgid "Current version"
msgstr ""
@@ -2081,16 +2078,16 @@ msgid ""
"a superset."
msgstr ""
-#: manager/forms.py:140 nutrition/forms.py:252
+#: manager/forms.py:140 nutrition/forms.py:253
msgid "Also search for names in English"
msgstr ""
#: manager/forms.py:168 manager/forms.py:173 manager/models/log.py:64
-#: manager/models/log.py:92 manager/models/setting.py:59
-#: manager/models/setting.py:90 manager/templates/log/add.html:53
+#: manager/models/log.py:92 manager/models/setting.py:62
+#: manager/models/setting.py:93 manager/templates/log/add.html:53
#: manager/templates/log/add.html:55 manager/templates/set/formset.html:10
#: manager/templates/set/formset.html:12 measurements/models/category.py:41
-#: nutrition/forms.py:66
+#: nutrition/forms.py:67
msgid "Unit"
msgstr ""
@@ -2098,15 +2095,15 @@ msgstr ""
msgid "Type"
msgstr ""
-#: manager/forms.py:280 manager/templates/workout/view.html:115
+#: manager/forms.py:280 manager/templates/workout/view.html:113
msgid "Table"
msgstr ""
-#: manager/forms.py:282 manager/templates/workout/view.html:121
+#: manager/forms.py:282 manager/templates/workout/view.html:119
msgid "with images"
msgstr ""
-#: manager/forms.py:283 manager/templates/workout/view.html:127
+#: manager/forms.py:283 manager/templates/workout/view.html:125
msgid "with comments"
msgstr ""
@@ -2115,11 +2112,10 @@ msgid "Workout will expire soon"
msgstr ""
#: manager/models/day.py:34 manager/models/log.py:58
-#: manager/models/session.py:60 manager/templates/schedule/view.html:103
-#: manager/templates/workout/view.html:11
-#: manager/templates/workout/view.html:19 manager/views/pdf.py:85
-#: manager/views/pdf.py:161 manager/views/schedule.py:151
-#: manager/views/schedule.py:221
+#: manager/models/session.py:60 manager/templates/schedule/view.html:102
+#: manager/templates/workout/view.html:9 manager/templates/workout/view.html:17
+#: manager/views/pdf.py:85 manager/views/pdf.py:161
+#: manager/views/schedule.py:151 manager/views/schedule.py:221
msgid "Workout"
msgstr ""
@@ -2137,7 +2133,7 @@ msgstr ""
msgid "Name or short description of the schedule. For example 'Program XYZ'."
msgstr ""
-#: manager/models/schedule.py:65 manager/templates/schedule/view.html:72
+#: manager/models/schedule.py:65 manager/templates/schedule/view.html:71
msgid "Schedule active"
msgstr ""
@@ -2148,7 +2144,7 @@ msgid ""
"inactive"
msgstr ""
-#: manager/models/schedule.py:77 manager/templates/schedule/view.html:82
+#: manager/models/schedule.py:77 manager/templates/schedule/view.html:81
msgid "Is a loop"
msgstr ""
@@ -2167,8 +2163,8 @@ msgid "The duration in weeks"
msgstr ""
#: manager/models/schedule_step.py:64 manager/models/set.py:53
-#: manager/models/setting.py:110 nutrition/models/meal.py:55
-#: nutrition/models/meal_item.py:65
+#: manager/models/setting.py:113 nutrition/models/meal.py:55
+#: nutrition/models/meal_item.py:66
msgid "Order"
msgstr ""
@@ -2218,7 +2214,7 @@ msgstr ""
msgid "Number of sets"
msgstr ""
-#: manager/models/setting.py:48
+#: manager/models/setting.py:51
msgid "Sets"
msgstr ""
@@ -2287,7 +2283,7 @@ msgstr ""
msgid "Go to current month"
msgstr ""
-#: manager/templates/calendar/month.html:188
+#: manager/templates/calendar/month.html:190
msgid "Add new log"
msgstr ""
@@ -2324,8 +2320,8 @@ msgid "Your schedules"
msgstr ""
#: manager/templates/schedule/overview.html:19
-#: manager/templates/schedule/view.html:132
-#: manager/templates/schedule/view.html:184
+#: manager/templates/schedule/view.html:131
+#: manager/templates/schedule/view.html:183
#: manager/templates/workout/overview.html:16
msgid "active"
msgstr ""
@@ -2361,29 +2357,29 @@ msgstr ""
msgid "Add schedule"
msgstr ""
-#: manager/templates/schedule/view.html:10
+#: manager/templates/schedule/view.html:9
msgid "Schedule"
msgstr ""
-#: manager/templates/schedule/view.html:86
+#: manager/templates/schedule/view.html:85
msgid ""
"This schedule is a loop and will go through the workouts above till you "
"deactivate it"
msgstr ""
-#: manager/templates/schedule/view.html:104
+#: manager/templates/schedule/view.html:103
msgid "Weeks"
msgstr ""
-#: manager/templates/schedule/view.html:116
+#: manager/templates/schedule/view.html:115
msgid "Move me"
msgstr ""
-#: manager/templates/schedule/view.html:157
+#: manager/templates/schedule/view.html:156
msgid "Start schedule"
msgstr ""
-#: manager/templates/schedule/view.html:188
+#: manager/templates/schedule/view.html:187
#, python-format
msgid ""
"%(weeks)s Week\n"
@@ -2394,11 +2390,11 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: manager/templates/schedule/view.html:222
+#: manager/templates/schedule/view.html:221
msgid "Adding workouts"
msgstr ""
-#: manager/templates/schedule/view.html:224
+#: manager/templates/schedule/view.html:223
msgid ""
"Add as many workouts to the schedule as you want. You can\n"
" edit the order by dragging and dropping them. It's also possible "
@@ -2406,21 +2402,21 @@ msgid ""
" than once."
msgstr ""
-#: manager/templates/schedule/view.html:233
-#: manager/templates/schedule/view.html:244
-#: manager/templates/schedule/view.html:291
-#: manager/templates/workout/view.html:71
-#: manager/templates/workout/view.html:81
-#: manager/templates/workout/view.html:180
+#: manager/templates/schedule/view.html:232
+#: manager/templates/schedule/view.html:243
+#: manager/templates/schedule/view.html:290
+#: manager/templates/workout/view.html:69
+#: manager/templates/workout/view.html:79
+#: manager/templates/workout/view.html:178
msgid "Export calendar file"
msgstr ""
-#: manager/templates/schedule/view.html:237
+#: manager/templates/schedule/view.html:236
msgid "Export this schedule as a calendar file."
msgstr ""
-#: manager/templates/schedule/view.html:238
-#: manager/templates/workout/view.html:76
+#: manager/templates/schedule/view.html:237
+#: manager/templates/workout/view.html:74
msgid ""
"You can then import the file it into your calendar\n"
" application for example google calendar, outlook or "
@@ -2429,18 +2425,18 @@ msgid ""
"appropriate exercises."
msgstr ""
-#: manager/templates/schedule/view.html:259
-#: manager/templates/schedule/view.html:295
-#: manager/templates/workout/view.html:96
-#: manager/templates/workout/view.html:176
+#: manager/templates/schedule/view.html:258
+#: manager/templates/schedule/view.html:294
+#: manager/templates/workout/view.html:94
+#: manager/templates/workout/view.html:174
msgid "Download as PDF"
msgstr ""
-#: manager/templates/schedule/view.html:300
+#: manager/templates/schedule/view.html:299
msgid "Edit schedule"
msgstr ""
-#: manager/templates/schedule/view.html:305
+#: manager/templates/schedule/view.html:304
msgid "Delete schedule"
msgstr ""
@@ -2558,12 +2554,12 @@ msgid "Mark as workout"
msgstr ""
#: manager/templates/workout/template_view.html:65
-#: manager/templates/workout/view.html:51
+#: manager/templates/workout/view.html:49
msgid "Muscles trained"
msgstr ""
#: manager/templates/workout/template_view.html:68
-#: manager/templates/workout/view.html:54
+#: manager/templates/workout/view.html:52
msgid ""
"Images show combined muscles as trained by the exercises on the workout."
msgstr ""
@@ -2572,35 +2568,35 @@ msgstr ""
msgid "Use this template"
msgstr ""
-#: manager/templates/workout/view.html:45
+#: manager/templates/workout/view.html:43
msgid "Add training days"
msgstr ""
-#: manager/templates/workout/view.html:46
+#: manager/templates/workout/view.html:44
msgid "Add workout sets to days"
msgstr ""
-#: manager/templates/workout/view.html:47
+#: manager/templates/workout/view.html:45
msgid "Set the repetitions for each set"
msgstr ""
-#: manager/templates/workout/view.html:75
+#: manager/templates/workout/view.html:73
msgid "Export this workout as a calendar file."
msgstr ""
-#: manager/templates/workout/view.html:146
+#: manager/templates/workout/view.html:144
msgid "Logs"
msgstr ""
-#: manager/templates/workout/view.html:148
+#: manager/templates/workout/view.html:146
msgid "View logs"
msgstr ""
-#: manager/templates/workout/view.html:171 manager/views/schedule_step.py:99
+#: manager/templates/workout/view.html:169 manager/views/schedule_step.py:99
msgid "Edit workout"
msgstr ""
-#: manager/templates/workout/view.html:184 manager/views/workout.py:281
+#: manager/templates/workout/view.html:182 manager/views/workout.py:281
msgid "Mark as template"
msgstr ""
@@ -2647,103 +2643,89 @@ msgstr ""
msgid "Value"
msgstr ""
-#: nutrition/forms.py:117
+#: nutrition/forms.py:118
msgid "Height (in)"
msgstr ""
-#: nutrition/forms.py:120
+#: nutrition/forms.py:121
msgid "Weight (kg)"
msgstr ""
-#: nutrition/forms.py:120
+#: nutrition/forms.py:121
msgid "Weight (lbs)"
msgstr ""
-#: nutrition/forms.py:133
+#: nutrition/forms.py:134
msgid "Calculate"
msgstr ""
-#: nutrition/forms.py:207 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:208 nutrition/templates/rate/form.html:76
msgid "Basic caloric intake"
msgstr ""
-#: nutrition/forms.py:208
+#: nutrition/forms.py:209
msgid "Your basic caloric intake as calculated for your data"
msgstr ""
-#: nutrition/forms.py:213
+#: nutrition/forms.py:214
msgid "Additional calories"
msgstr ""
-#: nutrition/forms.py:215
+#: nutrition/forms.py:216
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
msgstr ""
-#: nutrition/forms.py:248 nutrition/models/ingredient_weight_unit.py:39
-#: nutrition/models/log.py:84 nutrition/models/meal_item.py:53
+#: nutrition/forms.py:249 nutrition/models/ingredient_weight_unit.py:39
+#: nutrition/models/log.py:87 nutrition/models/meal_item.py:54
msgid "Ingredient"
msgstr ""
-#: nutrition/models/ingredient.py:131
+#: nutrition/models/ingredient.py:117
msgid "In kcal per 100g"
msgstr ""
-#: nutrition/models/ingredient.py:138 nutrition/models/ingredient.py:146
-#: nutrition/models/ingredient.py:156 nutrition/models/ingredient.py:164
-#: nutrition/models/ingredient.py:174 nutrition/models/ingredient.py:184
-#: nutrition/models/ingredient.py:194
+#: nutrition/models/ingredient.py:124 nutrition/models/ingredient.py:132
+#: nutrition/models/ingredient.py:142 nutrition/models/ingredient.py:150
+#: nutrition/models/ingredient.py:160 nutrition/models/ingredient.py:170
+#: nutrition/models/ingredient.py:180
msgid "In g per 100g of product"
msgstr ""
-#: nutrition/models/ingredient.py:155
-#: nutrition/templates/ingredient/view.html:96 nutrition/views/plan.py:259
+#: nutrition/models/ingredient.py:141
+#: nutrition/templates/ingredient/view.html:70 nutrition/views/plan.py:259
msgid "Sugar content in carbohydrates"
msgstr ""
-#: nutrition/models/ingredient.py:173
-#: nutrition/templates/ingredient/view.html:112 nutrition/views/plan.py:273
+#: nutrition/models/ingredient.py:159
+#: nutrition/templates/ingredient/view.html:86 nutrition/views/plan.py:273
msgid "Saturated fat content in fats"
msgstr ""
-#: nutrition/models/ingredient.py:183
-#: nutrition/templates/ingredient/view.html:134 nutrition/views/plan.py:279
-msgid "Fibres"
+#: nutrition/models/ingredient.py:169
+#: nutrition/templates/ingredient/view.html:108 nutrition/views/plan.py:279
+msgid "Fiber"
msgstr ""
-#: nutrition/models/ingredient.py:193
-#: nutrition/templates/ingredient/view.html:144 nutrition/views/plan.py:285
+#: nutrition/models/ingredient.py:179
+#: nutrition/templates/ingredient/view.html:118 nutrition/views/plan.py:285
msgid "Sodium"
msgstr ""
-#: nutrition/models/ingredient.py:215
+#: nutrition/models/ingredient.py:209
msgid "Link to product"
msgstr ""
-#: nutrition/models/ingredient.py:244
+#: nutrition/models/ingredient.py:238
msgid "Brand name of product"
msgstr ""
-#: nutrition/models/ingredient.py:304
+#: nutrition/models/ingredient.py:305
#, python-brace-format
msgid "The total energy ({self.energy}kcal) is not the approximate sum of the "
msgstr ""
-#: nutrition/models/ingredient.py:383 nutrition/views/ingredient.py:196
-msgid "Ingredient was successfully added to the general database"
-msgstr ""
-
-#: nutrition/models/ingredient.py:408
-msgid "New user submitted ingredient"
-msgstr ""
-
-#: nutrition/models/ingredient.py:410
-#, python-brace-format
-msgid ""
-"The user {request.user.username} submitted a new ingredient \"{self.name}\"."
-msgstr ""
-
#: nutrition/models/ingredient_category.py:31
msgid "Ingredient Categories"
msgstr ""
@@ -2756,16 +2738,16 @@ msgstr ""
msgid "Unit amount, e.g. \"1 Cup\" or \"1/2 spoon\""
msgstr ""
-#: nutrition/models/log.py:49 nutrition/models/meal.py:50
-#: nutrition/models/meal_item.py:47 nutrition/models/plan.py:106
+#: nutrition/models/log.py:52 nutrition/models/meal.py:50
+#: nutrition/models/meal_item.py:48 nutrition/models/plan.py:108
msgid "Nutrition plan"
msgstr ""
-#: nutrition/models/log.py:58
+#: nutrition/models/log.py:61
msgid "Meal"
msgstr ""
-#: nutrition/models/log.py:68
+#: nutrition/models/log.py:71
msgid "Date and Time (Approx.)"
msgstr ""
@@ -2785,11 +2767,11 @@ msgid ""
"summer\""
msgstr ""
-#: nutrition/models/plan.py:88
+#: nutrition/models/plan.py:90
msgid "Use daily calories"
msgstr ""
-#: nutrition/models/plan.py:91
+#: nutrition/models/plan.py:93
msgid ""
"Tick the box if you want to mark this plan as having a goal amount of "
"calories. You can use the calculator or enter the value yourself."
@@ -2896,64 +2878,36 @@ msgstr ""
msgid "Add ingredient"
msgstr ""
-#: nutrition/templates/ingredient/pending.html:14
-msgid "Submission date"
-msgstr ""
-
-#: nutrition/templates/ingredient/view.html:27
-msgid "Ingredient is pending review"
-msgstr ""
-
-#: nutrition/templates/ingredient/view.html:28
-msgid ""
-"This user submitted ingredient is pending a decision to be\n"
-"included in the database. Till then, it will not be shown in the overview "
-"or\n"
-"the search."
-msgstr ""
-
-#: nutrition/templates/ingredient/view.html:31
-msgid "Please select one of the options below."
-msgstr ""
-
-#: nutrition/templates/ingredient/view.html:38
-msgid "Accept"
-msgstr ""
-
-#: nutrition/templates/ingredient/view.html:42
-msgid "Decline"
-msgstr ""
-
-#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:229
+#: nutrition/templates/ingredient/view.html:45 nutrition/views/plan.py:229
msgid "Macronutrients"
msgstr ""
-#: nutrition/templates/ingredient/view.html:80
+#: nutrition/templates/ingredient/view.html:54
msgid "kJ"
msgstr ""
-#: nutrition/templates/ingredient/view.html:101
-#: nutrition/templates/ingredient/view.html:117
-#: nutrition/templates/ingredient/view.html:139
-#: nutrition/templates/ingredient/view.html:149
+#: nutrition/templates/ingredient/view.html:75
+#: nutrition/templates/ingredient/view.html:91
+#: nutrition/templates/ingredient/view.html:113
+#: nutrition/templates/ingredient/view.html:123
msgid "n.A."
msgstr ""
-#: nutrition/templates/ingredient/view.html:128
+#: nutrition/templates/ingredient/view.html:102
msgid "Others"
msgstr ""
-#: nutrition/templates/ingredient/view.html:170
+#: nutrition/templates/ingredient/view.html:144
#: nutrition/templates/units/list.html:46 nutrition/views/unit.py:86
msgid "Add new weight unit"
msgstr ""
-#: nutrition/templates/ingredient/view.html:232
-#: nutrition/templates/ingredient/view.html:235
+#: nutrition/templates/ingredient/view.html:206
+#: nutrition/templates/ingredient/view.html:209
msgid "Edit ingredient"
msgstr ""
-#: nutrition/templates/ingredient/view.html:239
+#: nutrition/templates/ingredient/view.html:213
msgid "Delete ingredient"
msgstr ""
@@ -3037,14 +2991,10 @@ msgstr ""
msgid "56 to 90"
msgstr ""
-#: nutrition/views/ingredient.py:154
+#: nutrition/views/ingredient.py:157
msgid "Add a new ingredient"
msgstr ""
-#: nutrition/views/ingredient.py:209
-msgid "Ingredient was successfully marked as rejected"
-msgstr ""
-
#: nutrition/views/plan.py:120
msgid "Nutritional plan"
msgstr ""
@@ -3089,50 +3039,59 @@ msgid ""
msgstr ""
#: software/templates/about_us.html:18
-msgid "Source code"
-msgstr ""
-
-#: software/templates/about_us.html:20
-msgid "Get the source code of this application and its server on github"
-msgstr ""
-
-#: software/templates/about_us.html:25
msgid "Have a problem or idea?"
msgstr ""
-#: software/templates/about_us.html:27
+#: software/templates/about_us.html:20
msgid ""
"Get in touch if something didn't behave as expected or if there is a feature "
"that you feel is missing."
msgstr ""
-#: software/templates/about_us.html:32
+#: software/templates/about_us.html:26
msgid "Say hi!"
msgstr ""
-#: software/templates/about_us.html:34
+#: software/templates/about_us.html:28
msgid "If you want to chat with us, hop on the Discord server and get in touch"
msgstr ""
-#: software/templates/about_us.html:39 software/templates/features.html:503
+#: software/templates/about_us.html:33
+msgid "Mastodon"
+msgstr ""
+
+#: software/templates/about_us.html:35
+msgid "Follow us on mastodon for updates and news about the project"
+msgstr ""
+
+#: software/templates/about_us.html:40 software/templates/features.html:503
msgid "Translation"
msgstr ""
-#: software/templates/about_us.html:41
+#: software/templates/about_us.html:42
msgid ""
"This application is translated on weblate. If you also want to help, click "
"the link and start translating"
msgstr ""
-#: software/templates/about_us.html:50
+#: software/templates/about_us.html:47
+msgid "Source code"
+msgstr ""
+
+#: software/templates/about_us.html:49
+msgid "Get the source code of this application and its server on github"
+msgstr ""
+
+#: software/templates/about_us.html:59
msgid "Our goal"
msgstr ""
-#: software/templates/about_us.html:53
+#: software/templates/about_us.html:62
msgid ""
"The goal is to build an awesome\n"
" and flexible fitness manager, along with a comprehensive and "
-"complete list of exercises and\n"
+"complete list of\n"
+" exercises and\n"
" ingredients, all released under a free license."
msgstr ""
@@ -3142,10 +3101,6 @@ msgid ""
"your exercises and workouts."
msgstr ""
-#: software/templates/features.html:45
-msgid "About"
-msgstr ""
-
#: software/templates/features.html:57
msgid "Mobile app"
msgstr ""
@@ -3381,18 +3336,6 @@ msgid ""
"to its own copyright."
msgstr ""
-#: utils/models.py:130
-msgid "Pending"
-msgstr ""
-
-#: utils/models.py:131
-msgid "Accepted"
-msgstr ""
-
-#: utils/models.py:132
-msgid "Declined"
-msgstr ""
-
#: weight/forms.py:54
msgid "Input"
msgstr ""
@@ -3405,7 +3348,7 @@ msgstr ""
msgid "You have to enter your weight"
msgstr ""
-#: weight/models.py:60
+#: weight/models.py:78
msgid "Weight entry"
msgstr ""
diff --git a/wger/locale/hr/LC_MESSAGES/django.po b/wger/locale/hr/LC_MESSAGES/django.po
index b2b229421..063246e1e 100644
--- a/wger/locale/hr/LC_MESSAGES/django.po
+++ b/wger/locale/hr/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-02-02 12:42+0100\n"
+"POT-Creation-Date: 2024-07-14 15:49+0200\n"
"PO-Revision-Date: 2024-02-19 05:04+0000\n"
"Last-Translator: Milo Ivir <[email protected]>\n"
"Language-Team: Croatian <https://hosted.weblate.org/projects/wger/web/hr/>\n"
@@ -32,7 +32,7 @@ msgstr ""
"registrirane korisnike ovoj teretani i aktualizirati sve postojeće korisnike "
"bez teretane."
-#: config/views/gym_config.py:42 core/templates/language/view.html:63
+#: config/views/gym_config.py:42 core/templates/language/view.html:67
#: core/templates/license/list.html:17 core/templates/misc/license/list.html:18
#: core/templates/repetition_unit/list.html:18
#: core/templates/tags/render_day.html:39
@@ -52,8 +52,8 @@ msgstr ""
#: manager/templates/calendar/day.html:68
#: manager/templates/calendar/month.html:85
#: manager/templates/calendar/partial_overview_table.html:18
-#: manager/templates/schedule/view.html:119
-#: nutrition/templates/ingredient/view.html:191
+#: manager/templates/schedule/view.html:118
+#: nutrition/templates/ingredient/view.html:165
#: nutrition/templates/units/list.html:19
msgid "Edit"
msgstr "Uredi"
@@ -87,8 +87,8 @@ msgstr "Moj raspored treninga"
msgid "Empty placeholder schedule"
msgstr "Prazan primjer rasporeda"
-#: core/forms.py:69 core/templates/navigation.html:275
-#: core/templates/navigation.html:281 core/templates/user/login.html:4
+#: core/forms.py:69 core/templates/navigation.html:285
+#: core/templates/navigation.html:291 core/templates/user/login.html:4
#: software/templates/features.html:82 software/templates/features.html:427
msgid "Login"
msgstr "Prijava"
@@ -160,7 +160,7 @@ msgstr "Lozinka"
msgid "Please enter your current password."
msgstr "Upiši svoju aktualnu lozinku."
-#: core/forms.py:242 core/templates/language/view.html:68
+#: core/forms.py:242 core/templates/language/view.html:73
#: core/templates/license/list.html:19 core/templates/misc/license/list.html:22
#: core/templates/repetition_unit/list.html:20
#: core/templates/tags/render_day.html:45
@@ -175,10 +175,10 @@ msgstr "Upiši svoju aktualnu lozinku."
#: gym/templates/gym/list.html:22 manager/templates/calendar/day.html:73
#: manager/templates/calendar/month.html:89
#: manager/templates/calendar/partial_overview_table.html:23
-#: manager/templates/schedule/view.html:123
-#: manager/templates/workout/view.html:190
-#: nutrition/templates/ingredient/view.html:192
-#: nutrition/templates/ingredient/view.html:241
+#: manager/templates/schedule/view.html:122
+#: manager/templates/workout/view.html:188
+#: nutrition/templates/ingredient/view.html:166
+#: nutrition/templates/ingredient/view.html:215
#: nutrition/templates/units/list.html:22
msgid "Delete"
msgstr "Izbriši"
@@ -191,14 +191,14 @@ msgstr "Neispravna lozinka"
msgid "The form is secured with reCAPTCHA"
msgstr "Obrazac je zaštićen pomoću reCAPTCHA"
-#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:275
-#: core/templates/navigation.html:287 core/templates/template.html:147
+#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:285
+#: core/templates/navigation.html:297 core/templates/template.html:149
#: core/templates/user/login.html:20 core/views/user.py:298
#: software/templates/features.html:87 software/templates/features.html:422
msgid "Register"
msgstr "Registracija"
-#: core/forms.py:315
+#: core/forms.py:315 software/templates/features.html:45
msgid "Contact"
msgstr "Kontakt"
@@ -207,7 +207,7 @@ msgid "Some way of answering you (e-mail, etc.)"
msgstr "Neki način slanja odgovora (e-mail, itd.)"
#: core/forms.py:324 exercises/models/comment.py:58 manager/models/set.py:61
-#: manager/models/setting.py:111 nutrition/models/log.py:74
+#: manager/models/setting.py:114 nutrition/models/log.py:77
msgid "Comment"
msgstr "Komentar"
@@ -227,6 +227,12 @@ msgstr "Kratko ime jezika"
msgid "Language full name"
msgstr "Potpuno ime jezika"
+#: core/models/language.py:45 core/templates/language/view.html:23
+#, fuzzy
+#| msgid "Language full name"
+msgid "Language full name in English"
+msgstr "Potpuno ime jezika"
+
#: core/models/license.py:29
msgid "Full name"
msgstr "Potpuno ime"
@@ -243,7 +249,7 @@ msgstr ""
msgid "Short name, e.g. CC-BY-SA 3"
msgstr "Kratko ime, npr. CC-BY-SA 3"
-#: core/models/license.py:45 nutrition/models/ingredient.py:214
+#: core/models/license.py:45 nutrition/models/ingredient.py:208
msgid "Link"
msgstr "Poveznica"
@@ -356,7 +362,7 @@ msgstr ""
msgid "Age"
msgstr "Dob"
-#: core/models/profile.py:230 nutrition/forms.py:117
+#: core/models/profile.py:230 nutrition/forms.py:118
msgid "Height (cm)"
msgstr "Veličina (cm)"
@@ -407,7 +413,7 @@ msgid "Total caloric intake, including e.g. any surplus"
msgstr "Ukupni dnevni unos kalorija, uključujući npr. višak"
#: core/models/profile.py:333 nutrition/models/ingredient_weight_unit.py:45
-#: nutrition/models/log.py:93 nutrition/models/meal_item.py:58
+#: nutrition/models/log.py:96 nutrition/models/meal_item.py:59
msgid "Weight unit"
msgstr "Jedinica težine"
@@ -439,17 +445,16 @@ msgstr "Zbroj svih sati mora biti 24"
#: core/models/rep_unit.py:36 core/models/weight_unit.py:36
#: core/templates/user/overview.html:262 core/views/user.py:599
#: exercises/models/category.py:29 exercises/models/equipment.py:29
-#: exercises/models/exercise.py:58 exercises/models/muscle.py:36
+#: exercises/models/exercise.py:59 exercises/models/muscle.py:36
#: gym/models/contract.py:52 gym/models/contract.py:103 gym/models/gym.py:46
#: gym/models/user_document.py:84 gym/templates/contract/view.html:50
#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:96
#: gym/views/gym.py:158 manager/models/schedule.py:55
#: manager/models/workout.py:57 measurements/models/category.py:36
-#: nutrition/models/ingredient.py:125
+#: nutrition/models/ingredient.py:111
#: nutrition/models/ingredient_category.py:27 nutrition/models/meal.py:67
#: nutrition/models/weight_unit.py:38
-#: nutrition/templates/ingredient/pending.html:15
-#: nutrition/templates/ingredient/view.html:178
+#: nutrition/templates/ingredient/view.html:152
msgid "Name"
msgstr "Ime"
@@ -555,24 +560,24 @@ msgstr ""
msgid "Dashboard"
msgstr "Kontrolna ploča"
-#: core/templates/language/overview.html:4 core/templates/navigation.html:335
+#: core/templates/language/overview.html:4 core/templates/navigation.html:345
msgid "Languages"
msgstr "Jezici"
-#: core/templates/language/overview.html:20
+#: core/templates/language/overview.html:22
msgid "Nothing found."
msgstr "Ništa nije pronađeno."
-#: core/templates/language/overview.html:20
+#: core/templates/language/overview.html:22
#: manager/templates/calendar/month.html:132
#: manager/templates/schedule/overview.html:28
-#: manager/templates/schedule/view.html:145
+#: manager/templates/schedule/view.html:144
#: manager/templates/workout/overview.html:28
#: nutrition/templates/ingredient/overview.html:38
msgid "Add one now."
msgstr "Dodaj jedan sada."
-#: core/templates/language/overview.html:33 core/templates/license/list.html:40
+#: core/templates/language/overview.html:35 core/templates/license/list.html:40
#: core/templates/misc/license/list.html:43
#: core/templates/repetition_unit/list.html:43
#: core/templates/user/overview.html:326 core/templates/user/overview.html:365
@@ -592,13 +597,13 @@ msgstr "Dodaj jedan sada."
msgid "Add"
msgstr "Dodaj"
-#: core/templates/language/view.html:58 core/templates/user/api_key.html:44
+#: core/templates/language/view.html:61 core/templates/user/api_key.html:44
#: core/templates/user/preferences.html:45 gym/models/contract.py:203
#: gym/templates/contract/view.html:41 gym/templates/contract/view.html:106
#: gym/templates/gym/member_list.html:248
-#: manager/templates/schedule/view.html:286
-#: manager/templates/workout/view.html:165
-#: nutrition/templates/ingredient/view.html:228
+#: manager/templates/schedule/view.html:285
+#: manager/templates/workout/view.html:163
+#: nutrition/templates/ingredient/view.html:202
msgid "Options"
msgstr "Opcije"
@@ -623,12 +628,11 @@ msgstr "Popis licenca"
#: gym/templates/gym/member_list.html:299
#: mailer/templates/mailer/gym/overview.html:30
#: manager/templates/calendar/day.html:87
-#: nutrition/templates/ingredient/pending.html:30
#: nutrition/templates/units/list.html:29
msgid "Nothing found"
msgstr "Ništa nije pronađeno"
-#: core/templates/misc/about.html:4 core/templates/template.html:173
+#: core/templates/misc/about.html:4 core/templates/template.html:175
msgid "Imprint"
msgstr "Impresum"
@@ -641,174 +645,169 @@ msgstr ""
"Ako je licenca lokalizirana, npr. Creative Commons\n"
" licence za različite zemlje, dodaj ih kao zasebne unose ovdje."
-#: core/templates/navigation.html:27 software/templates/features.html:437
+#: core/templates/navigation.html:28 software/templates/features.html:437
msgid "Training"
msgstr "Treniranje"
-#: core/templates/navigation.html:34 core/templates/user/overview.html:25
+#: core/templates/navigation.html:37 core/templates/user/overview.html:25
msgid "Workouts"
msgstr "Treninzi"
-#: core/templates/navigation.html:42
+#: core/templates/navigation.html:46
msgid "Workouts schedules"
msgstr "Rasporedi treninga"
-#: core/templates/navigation.html:50 core/templates/user/overview.html:70
+#: core/templates/navigation.html:54 core/templates/user/overview.html:70
#: manager/templates/calendar/month.html:10
#: manager/templates/calendar/month.html:21
msgid "Calendar"
msgstr "Kalendar"
-#: core/templates/navigation.html:60
+#: core/templates/navigation.html:64
msgid "Measurements"
msgstr "Mjerenja"
-#: core/templates/navigation.html:70 gallery/templates/images/overview.html:6
+#: core/templates/navigation.html:75 gallery/templates/images/overview.html:6
msgid "Gallery"
msgstr "Galerija"
-#: core/templates/navigation.html:76
+#: core/templates/navigation.html:81
msgid "Workout templates"
msgstr "Predlošci treninga"
-#: core/templates/navigation.html:82 manager/views/workout.py:84
+#: core/templates/navigation.html:88 manager/views/workout.py:84
msgid "Your templates"
msgstr "Tvoji predlošci"
-#: core/templates/navigation.html:90 manager/views/workout.py:98
+#: core/templates/navigation.html:97 manager/views/workout.py:98
msgid "Public templates"
msgstr "Javni predlošci"
-#: core/templates/navigation.html:97 manager/forms.py:129
-#: manager/models/setting.py:54 software/templates/features.html:51
+#: core/templates/navigation.html:105 manager/forms.py:129
+#: manager/models/setting.py:57 software/templates/features.html:51
#: software/templates/features.html:459
msgid "Exercises"
msgstr "Vježbe"
-#: core/templates/navigation.html:103 core/templates/navigation.html:170
-#: core/templates/navigation.html:330
+#: core/templates/navigation.html:111 core/templates/navigation.html:184
+#: core/templates/navigation.html:340
msgid "Administration"
msgstr "Administracija"
-#: core/templates/navigation.html:106
+#: core/templates/navigation.html:115
msgid "Exercise edit history"
msgstr "Povijest uređivanja vježbe"
-#: core/templates/navigation.html:111 exercises/models/base.py:103
+#: core/templates/navigation.html:121 exercises/models/base.py:103
msgid "Equipment"
msgstr "Oprema"
-#: core/templates/navigation.html:116
+#: core/templates/navigation.html:127
msgid "Muscles"
msgstr "Mišići"
-#: core/templates/navigation.html:121
+#: core/templates/navigation.html:133
#: exercises/templates/categories/admin-overview.html:4
msgid "Categories"
msgstr "Kategorije"
-#: core/templates/navigation.html:136 software/templates/features.html:447
+#: core/templates/navigation.html:148 software/templates/features.html:447
msgid "Nutrition"
msgstr "Prehrana"
-#: core/templates/navigation.html:143 core/templates/user/overview.html:144
+#: core/templates/navigation.html:156 core/templates/user/overview.html:144
msgid "Nutrition plans"
msgstr "Planovi prehrane"
-#: core/templates/navigation.html:151 nutrition/templates/bmi/form.html:50
+#: core/templates/navigation.html:165 nutrition/templates/bmi/form.html:50
msgid "BMI calculator"
msgstr "Kalkulator indeksa tjelesne mase"
-#: core/templates/navigation.html:159 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:174 nutrition/templates/rate/form.html:17
msgid "Daily calories calculator"
msgstr "Kalkulator dnevnih kalorija"
-#: core/templates/navigation.html:165
+#: core/templates/navigation.html:179
#: nutrition/templates/ingredient/overview.html:10
msgid "Ingredient overview"
msgstr "Pregled sastojaka"
-#: core/templates/navigation.html:172 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:187 nutrition/templates/units/list.html:6
msgid "Ingredient weight units"
msgstr "Jedinica težine sastojka"
-#: core/templates/navigation.html:177
-#: nutrition/templates/ingredient/pending.html:6
-msgid "Ingredients pending review"
-msgstr "Još nepregledani sastojci"
-
-#: core/templates/navigation.html:193 software/templates/features.html:442
+#: core/templates/navigation.html:203 software/templates/features.html:442
msgid "Body weight"
msgstr "Tjelesna težina"
-#: core/templates/navigation.html:200 core/templates/user/overview.html:114
+#: core/templates/navigation.html:210 core/templates/user/overview.html:114
msgid "Weight overview"
msgstr "Pregled težine"
-#: core/templates/navigation.html:207 weight/views.py:65
+#: core/templates/navigation.html:217 weight/views.py:65
msgid "Add weight entry"
msgstr "Dodaj unos težine"
-#: core/templates/navigation.html:221
+#: core/templates/navigation.html:231
msgid "About this software"
msgstr "O ovom softveru"
-#: core/templates/navigation.html:227 software/templates/about_us.html:5
+#: core/templates/navigation.html:237 software/templates/about_us.html:5
msgid "About us"
msgstr "O nama"
-#: core/templates/navigation.html:233 software/templates/features.html:507
+#: core/templates/navigation.html:243 software/templates/features.html:507
msgid "REST API"
msgstr "REST API"
-#: core/templates/navigation.html:239 utils/models.py:45
+#: core/templates/navigation.html:249 utils/models.py:45
msgid "License"
msgstr "Licenca"
-#: core/templates/navigation.html:245
+#: core/templates/navigation.html:255
msgid "Developer documentation"
msgstr "Dokumentacija za programere"
-#: core/templates/navigation.html:252
+#: core/templates/navigation.html:262
msgid "Get the code"
msgstr "Nabavi kôd"
-#: core/templates/navigation.html:259 core/templates/template.html:212
+#: core/templates/navigation.html:269 core/templates/template.html:214
#: software/templates/features.html:582
msgid "Translate"
msgstr "Prevodi"
-#: core/templates/navigation.html:293 core/templates/user/login.html:28
+#: core/templates/navigation.html:303 core/templates/user/login.html:28
msgid "Reset password"
msgstr "Obnovi lozinku"
-#: core/templates/navigation.html:311
+#: core/templates/navigation.html:321
msgid "My preferences"
msgstr "Moje postavke"
-#: core/templates/navigation.html:320
+#: core/templates/navigation.html:330
msgid "Logout"
msgstr "Odjava"
-#: core/templates/navigation.html:343
+#: core/templates/navigation.html:353
msgid "Licenses"
msgstr "Licence"
-#: core/templates/navigation.html:351
+#: core/templates/navigation.html:361
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr "Jedinice ponavljanja"
-#: core/templates/navigation.html:359 core/templates/weight_unit/list.html:4
-#: nutrition/templates/ingredient/view.html:167
+#: core/templates/navigation.html:369 core/templates/weight_unit/list.html:4
+#: nutrition/templates/ingredient/view.html:141
msgid "Weight units"
msgstr "Jedinice težine"
-#: core/templates/navigation.html:367 core/templates/user/list.html:4
+#: core/templates/navigation.html:377 core/templates/user/list.html:4
msgid "User list"
msgstr "Popis korisnika"
-#: core/templates/navigation.html:373
+#: core/templates/navigation.html:383
msgid "Gyms"
msgstr "Teretane"
@@ -862,12 +861,12 @@ msgstr "Hvala što koristiš našu stranicu!"
msgid "The %(site_name)s team"
msgstr "%(site_name)s tim"
-#: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:11
+#: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:12
msgid "previous"
msgstr "prethodno"
-#: core/templates/tags/pagination.html:31
-#: core/templates/tags/pagination.html:35
+#: core/templates/tags/pagination.html:33
+#: core/templates/tags/pagination.html:38
msgid "next"
msgstr "dalje"
@@ -892,35 +891,35 @@ msgid "Add exercises to this workout day"
msgstr "Dodaj vježbe za ovaj dan treninga"
#: core/templates/tags/render_weight_log.html:17 manager/helpers.py:86
-#: manager/models/setting.py:69 manager/templates/set/formset.html:9
+#: manager/models/setting.py:72 manager/templates/set/formset.html:9
msgid "Reps"
msgstr "Ponavljanja"
#: core/templates/tags/render_weight_log.html:30 manager/forms.py:191
-#: manager/models/log.py:103 manager/models/setting.py:99
+#: manager/models/log.py:103 manager/models/setting.py:102
#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
msgid "RiR"
msgstr "PUR"
-#: core/templates/template.html:120 manager/templates/calendar/month.html:138
-#: manager/templates/schedule/view.html:249
-#: manager/templates/schedule/view.html:270
-#: manager/templates/workout/view.html:86
-#: manager/templates/workout/view.html:139
+#: core/templates/template.html:122 manager/templates/calendar/month.html:138
+#: manager/templates/schedule/view.html:248
+#: manager/templates/schedule/view.html:269
+#: manager/templates/workout/view.html:84
+#: manager/templates/workout/view.html:137
msgid "Close"
msgstr "Zatvori"
-#: core/templates/template.html:136
+#: core/templates/template.html:138
msgid ""
"You are using a guest account, data entered will be deleted after a week."
msgstr ""
"Koristiš račun gosta, upisani podaci će se izbrisati nakon tjedan dana."
-#: core/templates/template.html:141
+#: core/templates/template.html:143
msgid "Create some demo entries"
msgstr "Stvori neke demo snimke"
-#: core/templates/template.html:178 software/templates/features.html:547
+#: core/templates/template.html:180 software/templates/features.html:547
#: software/templates/tos.html:7
msgid "Terms of service"
msgstr "Uvjeti usluge"
@@ -1021,7 +1020,7 @@ msgid "Overview"
msgstr "Pregled"
#: core/templates/user/overview.html:28
-#: manager/templates/schedule/view.html:164
+#: manager/templates/schedule/view.html:163
#: manager/templates/workout/overview.html:39 manager/views/schedule_step.py:60
msgid "Add workout"
msgstr "Dodaj trening"
@@ -1029,20 +1028,20 @@ msgstr "Dodaj trening"
#: core/templates/user/overview.html:34 core/templates/user/overview.html:76
#: core/templates/user/overview.html:120 core/templates/user/overview.html:152
#: exercises/models/base.py:118 exercises/models/base.py:124
-#: exercises/models/exercise.py:63 exercises/models/exercise.py:69
+#: exercises/models/exercise.py:64 exercises/models/exercise.py:70
#: exercises/models/image.py:107 exercises/models/image.py:113
#: exercises/models/video.py:163 exercises/models/video.py:169
#: gallery/models/image.py:42 manager/helpers.py:85 manager/models/log.py:100
#: manager/models/session.py:67 measurements/models/measurement.py:47
-#: nutrition/models/ingredient.py:101 nutrition/models/ingredient.py:107
-#: nutrition/models/ingredient.py:222 weight/models.py:33
+#: nutrition/models/ingredient.py:87 nutrition/models/ingredient.py:93
+#: nutrition/models/ingredient.py:216 weight/models.py:51
#: weight/templates/import_csv_preview.html:13
#: weight/templates/import_csv_preview.html:42 weight/views.py:144
msgid "Date"
msgstr "Datum"
#: core/templates/user/overview.html:35 core/templates/user/overview.html:153
-#: exercises/models/exercise.py:51 gallery/models/image.py:65
+#: exercises/models/exercise.py:52 gallery/models/image.py:65
#: gym/models/contract.py:58 gym/models/contract.py:109
#: manager/models/day.py:37 manager/models/workout.py:63
#: measurements/models/measurement.py:62 nutrition/models/plan.py:67
@@ -1060,13 +1059,13 @@ msgstr "Zadnja aktivnost"
#: core/templates/user/overview.html:58
#: manager/templates/calendar/month.html:128
-#: manager/templates/schedule/view.html:145
+#: manager/templates/schedule/view.html:144
#: manager/templates/workout/overview.html:28
msgid "No workouts found."
msgstr "Nije pronađen nijedan trening."
#: core/templates/user/overview.html:68 manager/forms.py:280
-#: manager/templates/workout/view.html:108
+#: manager/templates/workout/view.html:106
msgid "Log"
msgstr "Zapis"
@@ -1090,35 +1089,35 @@ msgstr "Vrijeme"
#: core/templates/user/overview.html:112 core/templates/user/overview.html:121
#: manager/forms.py:186 manager/helpers.py:86 manager/models/log.py:86
-#: manager/models/setting.py:79 manager/templates/log/add.html:54
-#: manager/templates/set/formset.html:11 weight/models.py:35
+#: manager/models/setting.py:82 manager/templates/log/add.html:54
+#: manager/templates/set/formset.html:11 weight/models.py:53
#: weight/templates/import_csv_preview.html:14
#: weight/templates/import_csv_preview.html:43 weight/views.py:144
msgid "Weight"
msgstr "Težina"
-#: core/templates/user/overview.html:154 nutrition/models/ingredient.py:130
-#: nutrition/templates/ingredient/view.html:77 nutrition/views/plan.py:237
+#: core/templates/user/overview.html:154 nutrition/models/ingredient.py:116
+#: nutrition/templates/ingredient/view.html:51 nutrition/views/plan.py:237
msgid "Energy"
msgstr "Energija"
-#: core/templates/user/overview.html:155 nutrition/models/ingredient.py:137
-#: nutrition/templates/ingredient/view.html:84 nutrition/views/plan.py:243
+#: core/templates/user/overview.html:155 nutrition/models/ingredient.py:123
+#: nutrition/templates/ingredient/view.html:58 nutrition/views/plan.py:243
msgid "Protein"
msgstr "Proteini"
-#: core/templates/user/overview.html:156 nutrition/models/ingredient.py:145
-#: nutrition/templates/ingredient/view.html:90 nutrition/views/plan.py:251
+#: core/templates/user/overview.html:156 nutrition/models/ingredient.py:131
+#: nutrition/templates/ingredient/view.html:64 nutrition/views/plan.py:251
msgid "Carbohydrates"
msgstr "Ugljikohidrati"
-#: core/templates/user/overview.html:157 nutrition/models/ingredient.py:163
-#: nutrition/templates/ingredient/view.html:106 nutrition/views/plan.py:265
+#: core/templates/user/overview.html:157 nutrition/models/ingredient.py:149
+#: nutrition/templates/ingredient/view.html:80 nutrition/views/plan.py:265
msgid "Fat"
msgstr "Mast"
#: core/templates/user/overview.html:170
-#: nutrition/templates/ingredient/view.html:79
+#: nutrition/templates/ingredient/view.html:53
msgid "kcal"
msgstr "kcal"
@@ -1130,7 +1129,7 @@ msgstr "kcal"
#: gym/templates/gym/member_list.html:207
#: gym/templates/gym/member_list.html:240
#: gym/templates/gym/member_list.html:277
-#: manager/templates/schedule/view.html:101
+#: manager/templates/schedule/view.html:100
msgid "Actions"
msgstr "Radnje"
@@ -1173,7 +1172,7 @@ msgid "Details"
msgstr "Detalji"
#: core/templates/user/overview.html:258 gym/views/export.py:57
-#: manager/helpers.py:86 manager/templates/schedule/view.html:99
+#: manager/helpers.py:86 manager/templates/schedule/view.html:98
msgid "Nr."
msgstr "Br."
@@ -1218,7 +1217,7 @@ msgid "Documents"
msgstr "Dokumenti"
#: core/templates/user/overview.html:412 gym/templates/document/list.html:32
-#: manager/forms.py:292 manager/templates/workout/view.html:134
+#: manager/forms.py:292 manager/templates/workout/view.html:132
msgid "Download"
msgstr "Preuzimanje"
@@ -1269,13 +1268,13 @@ msgid "kg"
msgstr "kg"
#: core/templatetags/wger_extras.py:207
-#: nutrition/templates/ingredient/view.html:86
-#: nutrition/templates/ingredient/view.html:92
-#: nutrition/templates/ingredient/view.html:99
-#: nutrition/templates/ingredient/view.html:108
-#: nutrition/templates/ingredient/view.html:115
-#: nutrition/templates/ingredient/view.html:137
-#: nutrition/templates/ingredient/view.html:147
+#: nutrition/templates/ingredient/view.html:60
+#: nutrition/templates/ingredient/view.html:66
+#: nutrition/templates/ingredient/view.html:73
+#: nutrition/templates/ingredient/view.html:82
+#: nutrition/templates/ingredient/view.html:89
+#: nutrition/templates/ingredient/view.html:111
+#: nutrition/templates/ingredient/view.html:121
msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr "g"
@@ -1293,7 +1292,7 @@ msgstr "unca"
#: exercises/views/equipment.py:103 exercises/views/exercises.py:73
#: exercises/views/muscles.py:99 manager/views/schedule.py:309
#: manager/views/schedule_step.py:128 manager/views/workout.py:249
-#: manager/views/workout_session.py:142 nutrition/views/ingredient.py:116
+#: manager/views/workout_session.py:142 nutrition/views/ingredient.py:119
#: nutrition/views/unit.py:110
msgid "Successfully deleted"
msgstr "Uspješno izbrisano"
@@ -1305,7 +1304,7 @@ msgstr "Uspješno izbrisano"
#: gym/views/admin_notes.py:196 gym/views/document.py:206 gym/views/gym.py:481
#: manager/views/schedule.py:316 manager/views/schedule_step.py:138
#: manager/views/workout.py:253 manager/views/workout_session.py:156
-#: nutrition/views/ingredient.py:123 nutrition/views/unit.py:117
+#: nutrition/views/ingredient.py:126 nutrition/views/unit.py:117
#, python-brace-format
msgid "Delete {0}?"
msgstr "Izbrisati {0}?"
@@ -1318,7 +1317,7 @@ msgstr "Izbrisati {0}?"
#: gym/views/contract.py:186 gym/views/contract_option.py:123
#: gym/views/contract_type.py:123 gym/views/document.py:171
#: gym/views/gym.py:463 manager/views/day.py:100 manager/views/schedule.py:333
-#: manager/views/workout.py:267 nutrition/views/ingredient.py:142
+#: manager/views/workout.py:267 nutrition/views/ingredient.py:145
#: nutrition/views/unit.py:143
#, python-brace-format
msgid "Edit {0}"
@@ -1392,7 +1391,7 @@ msgstr "Teretana"
msgid "A verification email was sent to %(email)s"
msgstr "E-mail za ovjeru je poslan na %(email)s"
-#: exercises/models/base.py:82 nutrition/models/ingredient.py:236
+#: exercises/models/base.py:82 nutrition/models/ingredient.py:230
msgid "Category"
msgstr "Kategorija"
@@ -1412,7 +1411,7 @@ msgstr "Varijante"
msgid "Exercise Categories"
msgstr "Kategorije vježbi"
-#: exercises/models/comment.py:52 exercises/models/exercise_alias.py:52
+#: exercises/models/comment.py:52 exercises/models/exercise_alias.py:53
#: exercises/models/image.py:74 exercises/models/video.py:98
#: manager/forms.py:178 manager/helpers.py:86 manager/models/log.py:52
msgid "Exercise"
@@ -1422,12 +1421,12 @@ msgstr "Vježba"
msgid "A comment about how to correctly do this exercise."
msgstr "Komentar o tome kako pravilno izvesti ovu vježbu."
-#: exercises/models/exercise.py:76 nutrition/models/ingredient.py:95
+#: exercises/models/exercise.py:77 nutrition/models/ingredient.py:81
#: nutrition/models/weight_unit.py:32
msgid "Language"
msgstr "Jezik"
-#: exercises/models/exercise_alias.py:58
+#: exercises/models/exercise_alias.py:59
msgid "Alias for an exercise"
msgstr "Pseudonim za vježbu"
@@ -1559,7 +1558,7 @@ msgstr "Radnja"
#: manager/models/schedule.py:44 manager/models/session.py:49
#: manager/models/workout.py:89 measurements/models/category.py:31
#: measurements/models/measurement.py:42 nutrition/models/plan.py:54
-#: nutrition/templates/ingredient/pending.html:16 weight/models.py:42
+#: weight/models.py:60
msgid "User"
msgstr "Korisnik"
@@ -1680,9 +1679,9 @@ msgid "Contract type"
msgstr "Vrsta ugovora"
#: gym/models/contract.py:211 gym/templates/contract/view.html:59
-#: manager/templates/log/add.html:52 nutrition/forms.py:62
-#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:105
-#: nutrition/models/meal_item.py:72
+#: manager/templates/log/add.html:52 nutrition/forms.py:63
+#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:108
+#: nutrition/models/meal_item.py:73
msgid "Amount"
msgstr "Iznos"
@@ -1699,7 +1698,7 @@ msgid "Contract is active"
msgstr "Ugovor je aktivan"
#: gym/models/contract.py:237 gym/templates/contract/view.html:69
-#: manager/models/schedule.py:61 manager/templates/schedule/view.html:68
+#: manager/models/schedule.py:61 manager/templates/schedule/view.html:67
msgid "Start date"
msgstr "Datum početka"
@@ -2086,7 +2085,7 @@ msgstr "Generiraj pregled"
#: mailer/templates/mailer/gym/form.html:28
#: mailer/templates/mailer/gym/preview.html:62
-#: manager/templates/workout/view.html:42
+#: manager/templates/workout/view.html:40
msgid "Steps"
msgstr "Koraci"
@@ -2110,7 +2109,7 @@ msgstr ""
"često želiš"
#: mailer/templates/mailer/gym/preview.html:22
-#: software/templates/about_us.html:60
+#: software/templates/about_us.html:70
msgid "Current version"
msgstr "Trenutačna verzija"
@@ -2142,16 +2141,16 @@ msgid ""
msgstr ""
"Možeš tražiti više od jedne vježbe. Vježbe će se grupirati u jedan nadskup."
-#: manager/forms.py:140 nutrition/forms.py:252
+#: manager/forms.py:140 nutrition/forms.py:253
msgid "Also search for names in English"
msgstr "Također traži imena na engleskom jeziku"
#: manager/forms.py:168 manager/forms.py:173 manager/models/log.py:64
-#: manager/models/log.py:92 manager/models/setting.py:59
-#: manager/models/setting.py:90 manager/templates/log/add.html:53
+#: manager/models/log.py:92 manager/models/setting.py:62
+#: manager/models/setting.py:93 manager/templates/log/add.html:53
#: manager/templates/log/add.html:55 manager/templates/set/formset.html:10
#: manager/templates/set/formset.html:12 measurements/models/category.py:41
-#: nutrition/forms.py:66
+#: nutrition/forms.py:67
msgid "Unit"
msgstr "Jedinica"
@@ -2159,15 +2158,15 @@ msgstr "Jedinica"
msgid "Type"
msgstr "Vrsta"
-#: manager/forms.py:280 manager/templates/workout/view.html:115
+#: manager/forms.py:280 manager/templates/workout/view.html:113
msgid "Table"
msgstr "Tablica"
-#: manager/forms.py:282 manager/templates/workout/view.html:121
+#: manager/forms.py:282 manager/templates/workout/view.html:119
msgid "with images"
msgstr "sa slikama"
-#: manager/forms.py:283 manager/templates/workout/view.html:127
+#: manager/forms.py:283 manager/templates/workout/view.html:125
msgid "with comments"
msgstr "s komentarima"
@@ -2176,11 +2175,10 @@ msgid "Workout will expire soon"
msgstr "Trening će uskoro isteći"
#: manager/models/day.py:34 manager/models/log.py:58
-#: manager/models/session.py:60 manager/templates/schedule/view.html:103
-#: manager/templates/workout/view.html:11
-#: manager/templates/workout/view.html:19 manager/views/pdf.py:85
-#: manager/views/pdf.py:161 manager/views/schedule.py:151
-#: manager/views/schedule.py:221
+#: manager/models/session.py:60 manager/templates/schedule/view.html:102
+#: manager/templates/workout/view.html:9 manager/templates/workout/view.html:17
+#: manager/views/pdf.py:85 manager/views/pdf.py:161
+#: manager/views/schedule.py:151 manager/views/schedule.py:221
msgid "Workout"
msgstr "Trening"
@@ -2200,7 +2198,7 @@ msgstr "Dan"
msgid "Name or short description of the schedule. For example 'Program XYZ'."
msgstr "Ime ili kratak opis rasporeda. Na primjer „Program XYZ”."
-#: manager/models/schedule.py:65 manager/templates/schedule/view.html:72
+#: manager/models/schedule.py:65 manager/templates/schedule/view.html:71
msgid "Schedule active"
msgstr "Raspored je aktivan"
@@ -2214,7 +2212,7 @@ msgstr ""
"se npr. na tvojoj kontrolnoj ploči). Svi ostali rasporedi će se tada "
"označiti kao neaktivni"
-#: manager/models/schedule.py:77 manager/templates/schedule/view.html:82
+#: manager/models/schedule.py:77 manager/templates/schedule/view.html:81
msgid "Is a loop"
msgstr "Petlja"
@@ -2235,8 +2233,8 @@ msgid "The duration in weeks"
msgstr "Trajanje u tjednima"
#: manager/models/schedule_step.py:64 manager/models/set.py:53
-#: manager/models/setting.py:110 nutrition/models/meal.py:55
-#: nutrition/models/meal_item.py:65
+#: manager/models/setting.py:113 nutrition/models/meal.py:55
+#: nutrition/models/meal_item.py:66
msgid "Order"
msgstr "Redoslijed"
@@ -2286,7 +2284,7 @@ msgstr "Dan za vježbu"
msgid "Number of sets"
msgstr "Broj setova"
-#: manager/models/setting.py:48
+#: manager/models/setting.py:51
msgid "Sets"
msgstr "Setovi"
@@ -2362,7 +2360,7 @@ msgstr ""
msgid "Go to current month"
msgstr "Idi na aktualni mjesec"
-#: manager/templates/calendar/month.html:188
+#: manager/templates/calendar/month.html:190
msgid "Add new log"
msgstr "Dodaj novi zapis"
@@ -2402,8 +2400,8 @@ msgid "Your schedules"
msgstr "Tvoji rasporedi"
#: manager/templates/schedule/overview.html:19
-#: manager/templates/schedule/view.html:132
-#: manager/templates/schedule/view.html:184
+#: manager/templates/schedule/view.html:131
+#: manager/templates/schedule/view.html:183
#: manager/templates/workout/overview.html:16
msgid "active"
msgstr "aktivni"
@@ -2448,11 +2446,11 @@ msgstr ""
msgid "Add schedule"
msgstr "Dodaj raspored"
-#: manager/templates/schedule/view.html:10
+#: manager/templates/schedule/view.html:9
msgid "Schedule"
msgstr "Raspored"
-#: manager/templates/schedule/view.html:86
+#: manager/templates/schedule/view.html:85
msgid ""
"This schedule is a loop and will go through the workouts above till you "
"deactivate it"
@@ -2460,19 +2458,19 @@ msgstr ""
"Ovaj raspored je petlja i prolazit će kroz gore navedene treninge sve dok ga "
"ne deaktiviraš"
-#: manager/templates/schedule/view.html:104
+#: manager/templates/schedule/view.html:103
msgid "Weeks"
msgstr "Tjedni"
-#: manager/templates/schedule/view.html:116
+#: manager/templates/schedule/view.html:115
msgid "Move me"
msgstr "Pomakni me"
-#: manager/templates/schedule/view.html:157
+#: manager/templates/schedule/view.html:156
msgid "Start schedule"
msgstr "Pokreni raspored"
-#: manager/templates/schedule/view.html:188
+#: manager/templates/schedule/view.html:187
#, python-format
msgid ""
"%(weeks)s Week\n"
@@ -2490,11 +2488,11 @@ msgstr[2] ""
"%(weeks)s tjedana\n"
" "
-#: manager/templates/schedule/view.html:222
+#: manager/templates/schedule/view.html:221
msgid "Adding workouts"
msgstr "Dodavanje treninga"
-#: manager/templates/schedule/view.html:224
+#: manager/templates/schedule/view.html:223
msgid ""
"Add as many workouts to the schedule as you want. You can\n"
" edit the order by dragging and dropping them. It's also possible "
@@ -2506,21 +2504,21 @@ msgstr ""
"dodati i\n"
" više puta."
-#: manager/templates/schedule/view.html:233
-#: manager/templates/schedule/view.html:244
-#: manager/templates/schedule/view.html:291
-#: manager/templates/workout/view.html:71
-#: manager/templates/workout/view.html:81
-#: manager/templates/workout/view.html:180
+#: manager/templates/schedule/view.html:232
+#: manager/templates/schedule/view.html:243
+#: manager/templates/schedule/view.html:290
+#: manager/templates/workout/view.html:69
+#: manager/templates/workout/view.html:79
+#: manager/templates/workout/view.html:178
msgid "Export calendar file"
msgstr "Izvezi datoteku kalendara"
-#: manager/templates/schedule/view.html:237
+#: manager/templates/schedule/view.html:236
msgid "Export this schedule as a calendar file."
msgstr "Izvezi ovaj raspored kao datoteku kalendara."
-#: manager/templates/schedule/view.html:238
-#: manager/templates/workout/view.html:76
+#: manager/templates/schedule/view.html:237
+#: manager/templates/workout/view.html:74
msgid ""
"You can then import the file it into your calendar\n"
" application for example google calendar, outlook or "
@@ -2534,18 +2532,18 @@ msgstr ""
" termin za svaki dan treninga s odgovarajućim "
"vježbama."
-#: manager/templates/schedule/view.html:259
-#: manager/templates/schedule/view.html:295
-#: manager/templates/workout/view.html:96
-#: manager/templates/workout/view.html:176
+#: manager/templates/schedule/view.html:258
+#: manager/templates/schedule/view.html:294
+#: manager/templates/workout/view.html:94
+#: manager/templates/workout/view.html:174
msgid "Download as PDF"
msgstr "Preuzmi kao PDF"
-#: manager/templates/schedule/view.html:300
+#: manager/templates/schedule/view.html:299
msgid "Edit schedule"
msgstr "Uredi raspored"
-#: manager/templates/schedule/view.html:305
+#: manager/templates/schedule/view.html:304
msgid "Delete schedule"
msgstr "Izbriši raspored"
@@ -2683,12 +2681,12 @@ msgid "Mark as workout"
msgstr "Označi kao trening"
#: manager/templates/workout/template_view.html:65
-#: manager/templates/workout/view.html:51
+#: manager/templates/workout/view.html:49
msgid "Muscles trained"
msgstr "Trenirani mišići"
#: manager/templates/workout/template_view.html:68
-#: manager/templates/workout/view.html:54
+#: manager/templates/workout/view.html:52
msgid ""
"Images show combined muscles as trained by the exercises on the workout."
msgstr "Slike prikazuju mišiće koji se treniraju vježbama tijekom treninga."
@@ -2697,35 +2695,35 @@ msgstr "Slike prikazuju mišiće koji se treniraju vježbama tijekom treninga."
msgid "Use this template"
msgstr "Koristi ovaj predložak"
-#: manager/templates/workout/view.html:45
+#: manager/templates/workout/view.html:43
msgid "Add training days"
msgstr "Dodaj dane treniranja"
-#: manager/templates/workout/view.html:46
+#: manager/templates/workout/view.html:44
msgid "Add workout sets to days"
msgstr "Dodaj setove treninga danima"
-#: manager/templates/workout/view.html:47
+#: manager/templates/workout/view.html:45
msgid "Set the repetitions for each set"
msgstr "Postavi broj ponavljanja za svaki set"
-#: manager/templates/workout/view.html:75
+#: manager/templates/workout/view.html:73
msgid "Export this workout as a calendar file."
msgstr "Izvezi ovaj traning kao datoteku kalendara."
-#: manager/templates/workout/view.html:146
+#: manager/templates/workout/view.html:144
msgid "Logs"
msgstr "Zapisi"
-#: manager/templates/workout/view.html:148
+#: manager/templates/workout/view.html:146
msgid "View logs"
msgstr "Pogledaj zapise"
-#: manager/templates/workout/view.html:171 manager/views/schedule_step.py:99
+#: manager/templates/workout/view.html:169 manager/views/schedule_step.py:99
msgid "Edit workout"
msgstr "Uredi trening"
-#: manager/templates/workout/view.html:184 manager/views/workout.py:281
+#: manager/templates/workout/view.html:182 manager/views/workout.py:281
msgid "Mark as template"
msgstr "Označi kao predložak"
@@ -2772,35 +2770,35 @@ msgstr "Ovo će tekođer izbrisati sve zapise težine za ovaj dan."
msgid "Value"
msgstr "Vrijednost"
-#: nutrition/forms.py:117
+#: nutrition/forms.py:118
msgid "Height (in)"
msgstr "Visina (inč)"
-#: nutrition/forms.py:120
+#: nutrition/forms.py:121
msgid "Weight (kg)"
msgstr "Težina (kg)"
-#: nutrition/forms.py:120
+#: nutrition/forms.py:121
msgid "Weight (lbs)"
msgstr "Težina (funte)"
-#: nutrition/forms.py:133
+#: nutrition/forms.py:134
msgid "Calculate"
msgstr "Izračunaj"
-#: nutrition/forms.py:207 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:208 nutrition/templates/rate/form.html:76
msgid "Basic caloric intake"
msgstr "Osnovni unos kalorija"
-#: nutrition/forms.py:208
+#: nutrition/forms.py:209
msgid "Your basic caloric intake as calculated for your data"
msgstr "Osnovni unos kalorija izračunat za tvoje podatke"
-#: nutrition/forms.py:213
+#: nutrition/forms.py:214
msgid "Additional calories"
msgstr "Dodatne kalorije"
-#: nutrition/forms.py:215
+#: nutrition/forms.py:216
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
@@ -2808,69 +2806,55 @@ msgstr ""
"Dodatne kalorije za dodavanje osnovnoj stopi (za oduzimanje upiši negativan "
"broj)"
-#: nutrition/forms.py:248 nutrition/models/ingredient_weight_unit.py:39
-#: nutrition/models/log.py:84 nutrition/models/meal_item.py:53
+#: nutrition/forms.py:249 nutrition/models/ingredient_weight_unit.py:39
+#: nutrition/models/log.py:87 nutrition/models/meal_item.py:54
msgid "Ingredient"
msgstr "Sastojak"
-#: nutrition/models/ingredient.py:131
+#: nutrition/models/ingredient.py:117
msgid "In kcal per 100g"
msgstr "U kcal po 100 g"
-#: nutrition/models/ingredient.py:138 nutrition/models/ingredient.py:146
-#: nutrition/models/ingredient.py:156 nutrition/models/ingredient.py:164
-#: nutrition/models/ingredient.py:174 nutrition/models/ingredient.py:184
-#: nutrition/models/ingredient.py:194
+#: nutrition/models/ingredient.py:124 nutrition/models/ingredient.py:132
+#: nutrition/models/ingredient.py:142 nutrition/models/ingredient.py:150
+#: nutrition/models/ingredient.py:160 nutrition/models/ingredient.py:170
+#: nutrition/models/ingredient.py:180
msgid "In g per 100g of product"
msgstr "U g po 100 g proizvoda"
-#: nutrition/models/ingredient.py:155
-#: nutrition/templates/ingredient/view.html:96 nutrition/views/plan.py:259
+#: nutrition/models/ingredient.py:141
+#: nutrition/templates/ingredient/view.html:70 nutrition/views/plan.py:259
msgid "Sugar content in carbohydrates"
msgstr "Količina šećera u ugljikohidratima"
-#: nutrition/models/ingredient.py:173
-#: nutrition/templates/ingredient/view.html:112 nutrition/views/plan.py:273
+#: nutrition/models/ingredient.py:159
+#: nutrition/templates/ingredient/view.html:86 nutrition/views/plan.py:273
msgid "Saturated fat content in fats"
msgstr "Količina zasićene masti u mastima"
-#: nutrition/models/ingredient.py:183
-#: nutrition/templates/ingredient/view.html:134 nutrition/views/plan.py:279
-msgid "Fibres"
-msgstr "Balastne tvari"
+#: nutrition/models/ingredient.py:169
+#: nutrition/templates/ingredient/view.html:108 nutrition/views/plan.py:279
+msgid "Fiber"
+msgstr ""
-#: nutrition/models/ingredient.py:193
-#: nutrition/templates/ingredient/view.html:144 nutrition/views/plan.py:285
+#: nutrition/models/ingredient.py:179
+#: nutrition/templates/ingredient/view.html:118 nutrition/views/plan.py:285
msgid "Sodium"
msgstr "Natrij"
-#: nutrition/models/ingredient.py:215
+#: nutrition/models/ingredient.py:209
msgid "Link to product"
msgstr "Poveznica za proizvod"
-#: nutrition/models/ingredient.py:244
+#: nutrition/models/ingredient.py:238
msgid "Brand name of product"
msgstr "Ime proizvoda"
-#: nutrition/models/ingredient.py:304
+#: nutrition/models/ingredient.py:305
#, python-brace-format
msgid "The total energy ({self.energy}kcal) is not the approximate sum of the "
msgstr "Ukupna energija ({self.energy} kcal) nije približni zbroj od "
-#: nutrition/models/ingredient.py:383 nutrition/views/ingredient.py:196
-msgid "Ingredient was successfully added to the general database"
-msgstr "Sastojak je uspješno dodan u opću bazu podataka"
-
-#: nutrition/models/ingredient.py:408
-msgid "New user submitted ingredient"
-msgstr "Novi korisnik je poslao sastojak"
-
-#: nutrition/models/ingredient.py:410
-#, python-brace-format
-msgid ""
-"The user {request.user.username} submitted a new ingredient \"{self.name}\"."
-msgstr "{request.user.username} je poslao/la novi sastojak „{self.name}”."
-
#: nutrition/models/ingredient_category.py:31
msgid "Ingredient Categories"
msgstr "Kategorije sastojaka"
@@ -2883,16 +2867,16 @@ msgstr "Količina u gramima"
msgid "Unit amount, e.g. \"1 Cup\" or \"1/2 spoon\""
msgstr "Jedinica količine, npr. „1 šalica” ili „1/2 žlice”"
-#: nutrition/models/log.py:49 nutrition/models/meal.py:50
-#: nutrition/models/meal_item.py:47 nutrition/models/plan.py:106
+#: nutrition/models/log.py:52 nutrition/models/meal.py:50
+#: nutrition/models/meal_item.py:48 nutrition/models/plan.py:108
msgid "Nutrition plan"
msgstr "Plan prehrane"
-#: nutrition/models/log.py:58
+#: nutrition/models/log.py:61
msgid "Meal"
msgstr "Obrok"
-#: nutrition/models/log.py:68
+#: nutrition/models/log.py:71
msgid "Date and Time (Approx.)"
msgstr "Datum i vrijeme (otprilike)"
@@ -2914,11 +2898,11 @@ msgid ""
msgstr ""
"Opis cilja plana, npr. „Povećanje tjelesne mase” ili „Priprema za ljeto”"
-#: nutrition/models/plan.py:88
+#: nutrition/models/plan.py:90
msgid "Use daily calories"
msgstr "Koristi dnevne kalorije"
-#: nutrition/models/plan.py:91
+#: nutrition/models/plan.py:93
msgid ""
"Tick the box if you want to mark this plan as having a goal amount of "
"calories. You can use the calculator or enter the value yourself."
@@ -3040,67 +3024,36 @@ msgstr "Traži"
msgid "Add ingredient"
msgstr "Dodaj sastojak"
-#: nutrition/templates/ingredient/pending.html:14
-msgid "Submission date"
-msgstr "Datum slanja"
-
-#: nutrition/templates/ingredient/view.html:27
-msgid "Ingredient is pending review"
-msgstr "Sastojak još nije pregledan"
-
-#: nutrition/templates/ingredient/view.html:28
-msgid ""
-"This user submitted ingredient is pending a decision to be\n"
-"included in the database. Till then, it will not be shown in the overview "
-"or\n"
-"the search."
-msgstr ""
-"Ovaj sastojak koji je poslao korisnik čeka odluku o uključivanju u\n"
-"bazu podataka. Sve dok se ne pregleda, neće se vidjeti u pregledu ili\n"
-"pretrazi."
-
-#: nutrition/templates/ingredient/view.html:31
-msgid "Please select one of the options below."
-msgstr "Odaberi jednu od donjih opcija."
-
-#: nutrition/templates/ingredient/view.html:38
-msgid "Accept"
-msgstr "Prihvati"
-
-#: nutrition/templates/ingredient/view.html:42
-msgid "Decline"
-msgstr "Odbij"
-
-#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:229
+#: nutrition/templates/ingredient/view.html:45 nutrition/views/plan.py:229
msgid "Macronutrients"
msgstr "Makronutrijenti"
-#: nutrition/templates/ingredient/view.html:80
+#: nutrition/templates/ingredient/view.html:54
msgid "kJ"
msgstr "kJ"
-#: nutrition/templates/ingredient/view.html:101
-#: nutrition/templates/ingredient/view.html:117
-#: nutrition/templates/ingredient/view.html:139
-#: nutrition/templates/ingredient/view.html:149
+#: nutrition/templates/ingredient/view.html:75
+#: nutrition/templates/ingredient/view.html:91
+#: nutrition/templates/ingredient/view.html:113
+#: nutrition/templates/ingredient/view.html:123
msgid "n.A."
msgstr "--"
-#: nutrition/templates/ingredient/view.html:128
+#: nutrition/templates/ingredient/view.html:102
msgid "Others"
msgstr "Drugi"
-#: nutrition/templates/ingredient/view.html:170
+#: nutrition/templates/ingredient/view.html:144
#: nutrition/templates/units/list.html:46 nutrition/views/unit.py:86
msgid "Add new weight unit"
msgstr "Dodaj novu jedinicu težine"
-#: nutrition/templates/ingredient/view.html:232
-#: nutrition/templates/ingredient/view.html:235
+#: nutrition/templates/ingredient/view.html:206
+#: nutrition/templates/ingredient/view.html:209
msgid "Edit ingredient"
msgstr "Uredi sastojak"
-#: nutrition/templates/ingredient/view.html:239
+#: nutrition/templates/ingredient/view.html:213
msgid "Delete ingredient"
msgstr "Izbriši sastojak"
@@ -3200,14 +3153,10 @@ msgstr "140 do 230"
msgid "56 to 90"
msgstr "56 do 90"
-#: nutrition/views/ingredient.py:154
+#: nutrition/views/ingredient.py:157
msgid "Add a new ingredient"
msgstr "Dodaj novi sastojak"
-#: nutrition/views/ingredient.py:209
-msgid "Ingredient was successfully marked as rejected"
-msgstr "Sastojak je uspješno označen kao odbijen"
-
#: nutrition/views/plan.py:120
msgid "Nutritional plan"
msgstr "Plan prehrane"
@@ -3254,18 +3203,10 @@ msgstr ""
"izradili entuzijasti fitnesa iz cijelog svijeta."
#: software/templates/about_us.html:18
-msgid "Source code"
-msgstr "Izvorni kod"
-
-#: software/templates/about_us.html:20
-msgid "Get the source code of this application and its server on github"
-msgstr "Preuzmi izvorni kod ove aplikacije i njezinog poslužitelja na githubu"
-
-#: software/templates/about_us.html:25
msgid "Have a problem or idea?"
msgstr "Imaš problem ili ideju?"
-#: software/templates/about_us.html:27
+#: software/templates/about_us.html:20
msgid ""
"Get in touch if something didn't behave as expected or if there is a feature "
"that you feel is missing."
@@ -3273,20 +3214,28 @@ msgstr ""
"Javi ako se nešto ponaša neočekivano ili ako smatraš da nedostaje neka "
"funkcija."
-#: software/templates/about_us.html:32
+#: software/templates/about_us.html:26
msgid "Say hi!"
msgstr "Pošalji pozdrav!"
-#: software/templates/about_us.html:34
+#: software/templates/about_us.html:28
msgid "If you want to chat with us, hop on the Discord server and get in touch"
msgstr ""
"Ako želiš s nama razgovarati prijeđi na Discord poslužitelj i kontaktiraj nas"
-#: software/templates/about_us.html:39 software/templates/features.html:503
+#: software/templates/about_us.html:33
+msgid "Mastodon"
+msgstr ""
+
+#: software/templates/about_us.html:35
+msgid "Follow us on mastodon for updates and news about the project"
+msgstr ""
+
+#: software/templates/about_us.html:40 software/templates/features.html:503
msgid "Translation"
msgstr "Prijevod"
-#: software/templates/about_us.html:41
+#: software/templates/about_us.html:42
msgid ""
"This application is translated on weblate. If you also want to help, click "
"the link and start translating"
@@ -3294,15 +3243,30 @@ msgstr ""
"Ova se aplikacija prevodi na Weblateu. Ako želiš pomoći prevoditi, pritisni "
"poveznicu i počni prevoditi"
-#: software/templates/about_us.html:50
+#: software/templates/about_us.html:47
+msgid "Source code"
+msgstr "Izvorni kod"
+
+#: software/templates/about_us.html:49
+msgid "Get the source code of this application and its server on github"
+msgstr "Preuzmi izvorni kod ove aplikacije i njezinog poslužitelja na githubu"
+
+#: software/templates/about_us.html:59
msgid "Our goal"
msgstr "Naš cilj"
-#: software/templates/about_us.html:53
+#: software/templates/about_us.html:62
+#, fuzzy
+#| msgid ""
+#| "The goal is to build an awesome\n"
+#| " and flexible fitness manager, along with a comprehensive "
+#| "and complete list of exercises and\n"
+#| " ingredients, all released under a free license."
msgid ""
"The goal is to build an awesome\n"
" and flexible fitness manager, along with a comprehensive and "
-"complete list of exercises and\n"
+"complete list of\n"
+" exercises and\n"
" ingredients, all released under a free license."
msgstr ""
"Cilj je izgraditi sjajan i fleksibilan\n"
@@ -3318,10 +3282,6 @@ msgstr ""
"wger Workout Manager je besplatna web aplikacija otvorenog koda za "
"upravljanje tvojim vježbama i treninzima."
-#: software/templates/features.html:45
-msgid "About"
-msgstr "Informacije"
-
#: software/templates/features.html:57
msgid "Mobile app"
msgstr "Mobilna aplikacija"
@@ -3574,18 +3534,6 @@ msgstr ""
"Izvedeni rad koji se ne temelji samo na prethodnom radu, te sadrži dovoljno "
"novog, kreativnog sadržaja ima pravo na vlastito autorsko pravo."
-#: utils/models.py:130
-msgid "Pending"
-msgstr "Na čekanju"
-
-#: utils/models.py:131
-msgid "Accepted"
-msgstr "Prihvaćeno"
-
-#: utils/models.py:132
-msgid "Declined"
-msgstr "Odbijeno"
-
#: weight/forms.py:54
msgid "Input"
msgstr "Unos"
@@ -3598,7 +3546,7 @@ msgstr "Format datuma"
msgid "You have to enter your weight"
msgstr "Moraš upisati svoju težinu"
-#: weight/models.py:60
+#: weight/models.py:78
msgid "Weight entry"
msgstr "Unos težine"
@@ -3738,6 +3686,64 @@ msgstr "Uspješno izbrisano."
msgid "Delete weight entry for the %s"
msgstr "Izbriši unos težine za %s"
+#~ msgid "Ingredients pending review"
+#~ msgstr "Još nepregledani sastojci"
+
+#~ msgid "Fibres"
+#~ msgstr "Balastne tvari"
+
+#~ msgid "Ingredient was successfully added to the general database"
+#~ msgstr "Sastojak je uspješno dodan u opću bazu podataka"
+
+#~ msgid "New user submitted ingredient"
+#~ msgstr "Novi korisnik je poslao sastojak"
+
+#, python-brace-format
+#~ msgid ""
+#~ "The user {request.user.username} submitted a new ingredient \"{self."
+#~ "name}\"."
+#~ msgstr "{request.user.username} je poslao/la novi sastojak „{self.name}”."
+
+#~ msgid "Submission date"
+#~ msgstr "Datum slanja"
+
+#~ msgid "Ingredient is pending review"
+#~ msgstr "Sastojak još nije pregledan"
+
+#~ msgid ""
+#~ "This user submitted ingredient is pending a decision to be\n"
+#~ "included in the database. Till then, it will not be shown in the overview "
+#~ "or\n"
+#~ "the search."
+#~ msgstr ""
+#~ "Ovaj sastojak koji je poslao korisnik čeka odluku o uključivanju u\n"
+#~ "bazu podataka. Sve dok se ne pregleda, neće se vidjeti u pregledu ili\n"
+#~ "pretrazi."
+
+#~ msgid "Please select one of the options below."
+#~ msgstr "Odaberi jednu od donjih opcija."
+
+#~ msgid "Accept"
+#~ msgstr "Prihvati"
+
+#~ msgid "Decline"
+#~ msgstr "Odbij"
+
+#~ msgid "Ingredient was successfully marked as rejected"
+#~ msgstr "Sastojak je uspješno označen kao odbijen"
+
+#~ msgid "About"
+#~ msgstr "Informacije"
+
+#~ msgid "Pending"
+#~ msgstr "Na čekanju"
+
+#~ msgid "Accepted"
+#~ msgstr "Prihvaćeno"
+
+#~ msgid "Declined"
+#~ msgstr "Odbijeno"
+
#~ msgid "Share"
#~ msgstr "Dijeli"
diff --git a/wger/locale/hu/LC_MESSAGES/django.po b/wger/locale/hu/LC_MESSAGES/django.po
index f608051d9..193100082 100644
--- a/wger/locale/hu/LC_MESSAGES/django.po
+++ b/wger/locale/hu/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: wger Workout Manager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-02-02 12:42+0100\n"
+"POT-Creation-Date: 2024-07-14 15:49+0200\n"
"PO-Revision-Date: 2023-12-29 22:12+0000\n"
"Last-Translator: Adam Cool <[email protected]>\n"
"Language-Team: Hungarian <https://hosted.weblate.org/projects/wger/web/hu/>\n"
@@ -33,7 +33,7 @@ msgstr ""
"hozzárendeli az összes újonnan regisztrált felhasználót ehhez az "
"edzőteremhez, és frissíti az összes meglévő edzőterem nélküli felhasználót."
-#: config/views/gym_config.py:42 core/templates/language/view.html:63
+#: config/views/gym_config.py:42 core/templates/language/view.html:67
#: core/templates/license/list.html:17 core/templates/misc/license/list.html:18
#: core/templates/repetition_unit/list.html:18
#: core/templates/tags/render_day.html:39
@@ -53,8 +53,8 @@ msgstr ""
#: manager/templates/calendar/day.html:68
#: manager/templates/calendar/month.html:85
#: manager/templates/calendar/partial_overview_table.html:18
-#: manager/templates/schedule/view.html:119
-#: nutrition/templates/ingredient/view.html:191
+#: manager/templates/schedule/view.html:118
+#: nutrition/templates/ingredient/view.html:165
#: nutrition/templates/units/list.html:19
msgid "Edit"
msgstr "Módosítás"
@@ -90,8 +90,8 @@ msgstr "Az én király edzés ütemtervem"
msgid "Empty placeholder schedule"
msgstr "Üres helyfoglaló ütemterv"
-#: core/forms.py:69 core/templates/navigation.html:275
-#: core/templates/navigation.html:281 core/templates/user/login.html:4
+#: core/forms.py:69 core/templates/navigation.html:285
+#: core/templates/navigation.html:291 core/templates/user/login.html:4
#: software/templates/features.html:82 software/templates/features.html:427
msgid "Login"
msgstr "Bejelentkezés"
@@ -163,7 +163,7 @@ msgstr "Jelszó"
msgid "Please enter your current password."
msgstr "Kérlek írd be a jelenlegi jelszavad."
-#: core/forms.py:242 core/templates/language/view.html:68
+#: core/forms.py:242 core/templates/language/view.html:73
#: core/templates/license/list.html:19 core/templates/misc/license/list.html:22
#: core/templates/repetition_unit/list.html:20
#: core/templates/tags/render_day.html:45
@@ -178,10 +178,10 @@ msgstr "Kérlek írd be a jelenlegi jelszavad."
#: gym/templates/gym/list.html:22 manager/templates/calendar/day.html:73
#: manager/templates/calendar/month.html:89
#: manager/templates/calendar/partial_overview_table.html:23
-#: manager/templates/schedule/view.html:123
-#: manager/templates/workout/view.html:190
-#: nutrition/templates/ingredient/view.html:192
-#: nutrition/templates/ingredient/view.html:241
+#: manager/templates/schedule/view.html:122
+#: manager/templates/workout/view.html:188
+#: nutrition/templates/ingredient/view.html:166
+#: nutrition/templates/ingredient/view.html:215
#: nutrition/templates/units/list.html:22
msgid "Delete"
msgstr "Törlés"
@@ -194,14 +194,14 @@ msgstr "Érvénytelen jelszó"
msgid "The form is secured with reCAPTCHA"
msgstr "Ez az űrlap reCAPTCHA-val van biztosítva"
-#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:275
-#: core/templates/navigation.html:287 core/templates/template.html:147
+#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:285
+#: core/templates/navigation.html:297 core/templates/template.html:149
#: core/templates/user/login.html:20 core/views/user.py:298
#: software/templates/features.html:87 software/templates/features.html:422
msgid "Register"
msgstr "Regisztráció"
-#: core/forms.py:315
+#: core/forms.py:315 software/templates/features.html:45
msgid "Contact"
msgstr "Kapcsolat"
@@ -210,7 +210,7 @@ msgid "Some way of answering you (e-mail, etc.)"
msgstr "Néhány elérhetőség, hogy válaszolni tudjunk: (e-mail, stb.)"
#: core/forms.py:324 exercises/models/comment.py:58 manager/models/set.py:61
-#: manager/models/setting.py:111 nutrition/models/log.py:74
+#: manager/models/setting.py:114 nutrition/models/log.py:77
msgid "Comment"
msgstr "Hozzászólás"
@@ -230,6 +230,12 @@ msgstr "Nyelv rövid neve"
msgid "Language full name"
msgstr "Nyelv teljes neve"
+#: core/models/language.py:45 core/templates/language/view.html:23
+#, fuzzy
+#| msgid "Language full name"
+msgid "Language full name in English"
+msgstr "Nyelv teljes neve"
+
#: core/models/license.py:29
msgid "Full name"
msgstr "Teljes név"
@@ -244,7 +250,7 @@ msgstr ""
msgid "Short name, e.g. CC-BY-SA 3"
msgstr "Rövid név, pl.: CC-BY-SA 3"
-#: core/models/license.py:45 nutrition/models/ingredient.py:214
+#: core/models/license.py:45 nutrition/models/ingredient.py:208
msgid "Link"
msgstr "Link"
@@ -352,7 +358,7 @@ msgstr ""
msgid "Age"
msgstr "Kor"
-#: core/models/profile.py:230 nutrition/forms.py:117
+#: core/models/profile.py:230 nutrition/forms.py:118
msgid "Height (cm)"
msgstr "Magasság (cm)"
@@ -403,7 +409,7 @@ msgid "Total caloric intake, including e.g. any surplus"
msgstr "Teljes kalória bevitel, beleérve pl: bármilyen többlet"
#: core/models/profile.py:333 nutrition/models/ingredient_weight_unit.py:45
-#: nutrition/models/log.py:93 nutrition/models/meal_item.py:58
+#: nutrition/models/log.py:96 nutrition/models/meal_item.py:59
msgid "Weight unit"
msgstr "Súly egység"
@@ -432,17 +438,16 @@ msgstr "Az órák összegének meg kell egyeznie 24-el"
#: core/models/rep_unit.py:36 core/models/weight_unit.py:36
#: core/templates/user/overview.html:262 core/views/user.py:599
#: exercises/models/category.py:29 exercises/models/equipment.py:29
-#: exercises/models/exercise.py:58 exercises/models/muscle.py:36
+#: exercises/models/exercise.py:59 exercises/models/muscle.py:36
#: gym/models/contract.py:52 gym/models/contract.py:103 gym/models/gym.py:46
#: gym/models/user_document.py:84 gym/templates/contract/view.html:50
#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:96
#: gym/views/gym.py:158 manager/models/schedule.py:55
#: manager/models/workout.py:57 measurements/models/category.py:36
-#: nutrition/models/ingredient.py:125
+#: nutrition/models/ingredient.py:111
#: nutrition/models/ingredient_category.py:27 nutrition/models/meal.py:67
#: nutrition/models/weight_unit.py:38
-#: nutrition/templates/ingredient/pending.html:15
-#: nutrition/templates/ingredient/view.html:178
+#: nutrition/templates/ingredient/view.html:152
msgid "Name"
msgstr "Név"
@@ -543,24 +548,24 @@ msgstr ""
msgid "Dashboard"
msgstr "Irányítópult"
-#: core/templates/language/overview.html:4 core/templates/navigation.html:335
+#: core/templates/language/overview.html:4 core/templates/navigation.html:345
msgid "Languages"
msgstr "Nyelvek"
-#: core/templates/language/overview.html:20
+#: core/templates/language/overview.html:22
msgid "Nothing found."
msgstr "Nincs találat."
-#: core/templates/language/overview.html:20
+#: core/templates/language/overview.html:22
#: manager/templates/calendar/month.html:132
#: manager/templates/schedule/overview.html:28
-#: manager/templates/schedule/view.html:145
+#: manager/templates/schedule/view.html:144
#: manager/templates/workout/overview.html:28
#: nutrition/templates/ingredient/overview.html:38
msgid "Add one now."
msgstr "Adj hozzá egyet most."
-#: core/templates/language/overview.html:33 core/templates/license/list.html:40
+#: core/templates/language/overview.html:35 core/templates/license/list.html:40
#: core/templates/misc/license/list.html:43
#: core/templates/repetition_unit/list.html:43
#: core/templates/user/overview.html:326 core/templates/user/overview.html:365
@@ -580,13 +585,13 @@ msgstr "Adj hozzá egyet most."
msgid "Add"
msgstr "Hozzáadás"
-#: core/templates/language/view.html:58 core/templates/user/api_key.html:44
+#: core/templates/language/view.html:61 core/templates/user/api_key.html:44
#: core/templates/user/preferences.html:45 gym/models/contract.py:203
#: gym/templates/contract/view.html:41 gym/templates/contract/view.html:106
#: gym/templates/gym/member_list.html:248
-#: manager/templates/schedule/view.html:286
-#: manager/templates/workout/view.html:165
-#: nutrition/templates/ingredient/view.html:228
+#: manager/templates/schedule/view.html:285
+#: manager/templates/workout/view.html:163
+#: nutrition/templates/ingredient/view.html:202
msgid "Options"
msgstr "Beállítások"
@@ -611,12 +616,11 @@ msgstr "Licenc lista"
#: gym/templates/gym/member_list.html:299
#: mailer/templates/mailer/gym/overview.html:30
#: manager/templates/calendar/day.html:87
-#: nutrition/templates/ingredient/pending.html:30
#: nutrition/templates/units/list.html:29
msgid "Nothing found"
msgstr "Nincs találat"
-#: core/templates/misc/about.html:4 core/templates/template.html:173
+#: core/templates/misc/about.html:4 core/templates/template.html:175
msgid "Imprint"
msgstr ""
@@ -627,180 +631,175 @@ msgid ""
"entries here."
msgstr ""
-#: core/templates/navigation.html:27 software/templates/features.html:437
+#: core/templates/navigation.html:28 software/templates/features.html:437
msgid "Training"
msgstr ""
-#: core/templates/navigation.html:34 core/templates/user/overview.html:25
+#: core/templates/navigation.html:37 core/templates/user/overview.html:25
msgid "Workouts"
msgstr "Edzések"
-#: core/templates/navigation.html:42
+#: core/templates/navigation.html:46
msgid "Workouts schedules"
msgstr "Edzés ütemtervek"
-#: core/templates/navigation.html:50 core/templates/user/overview.html:70
+#: core/templates/navigation.html:54 core/templates/user/overview.html:70
#: manager/templates/calendar/month.html:10
#: manager/templates/calendar/month.html:21
msgid "Calendar"
msgstr "Naptár"
-#: core/templates/navigation.html:60
+#: core/templates/navigation.html:64
msgid "Measurements"
msgstr ""
-#: core/templates/navigation.html:70 gallery/templates/images/overview.html:6
+#: core/templates/navigation.html:75 gallery/templates/images/overview.html:6
msgid "Gallery"
msgstr ""
-#: core/templates/navigation.html:76
+#: core/templates/navigation.html:81
#, fuzzy
#| msgid "Workout complete!"
msgid "Workout templates"
msgstr "Edzés befejezve!"
-#: core/templates/navigation.html:82 manager/views/workout.py:84
+#: core/templates/navigation.html:88 manager/views/workout.py:84
#, fuzzy
#| msgid "Your schedules"
msgid "Your templates"
msgstr "Ütemterveid"
-#: core/templates/navigation.html:90 manager/views/workout.py:98
+#: core/templates/navigation.html:97 manager/views/workout.py:98
msgid "Public templates"
msgstr ""
-#: core/templates/navigation.html:97 manager/forms.py:129
-#: manager/models/setting.py:54 software/templates/features.html:51
+#: core/templates/navigation.html:105 manager/forms.py:129
+#: manager/models/setting.py:57 software/templates/features.html:51
#: software/templates/features.html:459
msgid "Exercises"
msgstr "Gyakorlatok"
-#: core/templates/navigation.html:103 core/templates/navigation.html:170
-#: core/templates/navigation.html:330
+#: core/templates/navigation.html:111 core/templates/navigation.html:184
+#: core/templates/navigation.html:340
msgid "Administration"
msgstr "Adminisztráció"
-#: core/templates/navigation.html:106
+#: core/templates/navigation.html:115
#, fuzzy
#| msgid "Exercises pending review"
msgid "Exercise edit history"
msgstr "Ellenőrzésre váró gyakorlatok"
-#: core/templates/navigation.html:111 exercises/models/base.py:103
+#: core/templates/navigation.html:121 exercises/models/base.py:103
msgid "Equipment"
msgstr "Felszerelés"
-#: core/templates/navigation.html:116
+#: core/templates/navigation.html:127
msgid "Muscles"
msgstr "Izmok"
-#: core/templates/navigation.html:121
+#: core/templates/navigation.html:133
#: exercises/templates/categories/admin-overview.html:4
msgid "Categories"
msgstr "Kategóriák"
-#: core/templates/navigation.html:136 software/templates/features.html:447
+#: core/templates/navigation.html:148 software/templates/features.html:447
msgid "Nutrition"
msgstr "Táplálkozás"
-#: core/templates/navigation.html:143 core/templates/user/overview.html:144
+#: core/templates/navigation.html:156 core/templates/user/overview.html:144
msgid "Nutrition plans"
msgstr "Táplálkozási tervek"
-#: core/templates/navigation.html:151 nutrition/templates/bmi/form.html:50
+#: core/templates/navigation.html:165 nutrition/templates/bmi/form.html:50
msgid "BMI calculator"
msgstr "BMI kalkulátor"
-#: core/templates/navigation.html:159 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:174 nutrition/templates/rate/form.html:17
msgid "Daily calories calculator"
msgstr "Napi kalória kalkulátor"
-#: core/templates/navigation.html:165
+#: core/templates/navigation.html:179
#: nutrition/templates/ingredient/overview.html:10
msgid "Ingredient overview"
msgstr "Összetevő áttekintés"
-#: core/templates/navigation.html:172 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:187 nutrition/templates/units/list.html:6
msgid "Ingredient weight units"
msgstr "Összetevő súly egységek"
-#: core/templates/navigation.html:177
-#: nutrition/templates/ingredient/pending.html:6
-msgid "Ingredients pending review"
-msgstr "Ellenőrzésre váró összetevők"
-
-#: core/templates/navigation.html:193 software/templates/features.html:442
+#: core/templates/navigation.html:203 software/templates/features.html:442
msgid "Body weight"
msgstr ""
-#: core/templates/navigation.html:200 core/templates/user/overview.html:114
+#: core/templates/navigation.html:210 core/templates/user/overview.html:114
msgid "Weight overview"
msgstr "Súly áttekintés"
-#: core/templates/navigation.html:207 weight/views.py:65
+#: core/templates/navigation.html:217 weight/views.py:65
msgid "Add weight entry"
msgstr "Új súly bejegyzés hozzáadása"
-#: core/templates/navigation.html:221
+#: core/templates/navigation.html:231
msgid "About this software"
msgstr "Erről a szoftverről"
-#: core/templates/navigation.html:227 software/templates/about_us.html:5
+#: core/templates/navigation.html:237 software/templates/about_us.html:5
msgid "About us"
msgstr "Rólunk"
-#: core/templates/navigation.html:233 software/templates/features.html:507
+#: core/templates/navigation.html:243 software/templates/features.html:507
msgid "REST API"
msgstr "REST API"
-#: core/templates/navigation.html:239 utils/models.py:45
+#: core/templates/navigation.html:249 utils/models.py:45
msgid "License"
msgstr "Licenc"
-#: core/templates/navigation.html:245
+#: core/templates/navigation.html:255
msgid "Developer documentation"
msgstr ""
-#: core/templates/navigation.html:252
+#: core/templates/navigation.html:262
msgid "Get the code"
msgstr "Szerezd meg a kódot"
-#: core/templates/navigation.html:259 core/templates/template.html:212
+#: core/templates/navigation.html:269 core/templates/template.html:214
#: software/templates/features.html:582
msgid "Translate"
msgstr "Lefordítás"
-#: core/templates/navigation.html:293 core/templates/user/login.html:28
+#: core/templates/navigation.html:303 core/templates/user/login.html:28
msgid "Reset password"
msgstr "Új jelszó igénylése"
-#: core/templates/navigation.html:311
+#: core/templates/navigation.html:321
msgid "My preferences"
msgstr "Beállításaim"
-#: core/templates/navigation.html:320
+#: core/templates/navigation.html:330
msgid "Logout"
msgstr "Kijelentkezés"
-#: core/templates/navigation.html:343
+#: core/templates/navigation.html:353
msgid "Licenses"
msgstr "Licencek"
-#: core/templates/navigation.html:351
+#: core/templates/navigation.html:361
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr ""
-#: core/templates/navigation.html:359 core/templates/weight_unit/list.html:4
-#: nutrition/templates/ingredient/view.html:167
+#: core/templates/navigation.html:369 core/templates/weight_unit/list.html:4
+#: nutrition/templates/ingredient/view.html:141
msgid "Weight units"
msgstr ""
-#: core/templates/navigation.html:367 core/templates/user/list.html:4
+#: core/templates/navigation.html:377 core/templates/user/list.html:4
msgid "User list"
msgstr ""
-#: core/templates/navigation.html:373
+#: core/templates/navigation.html:383
msgid "Gyms"
msgstr "Edzőtermek"
@@ -850,12 +849,12 @@ msgstr "Köszönjük, hogy használod az oldalunkat!"
msgid "The %(site_name)s team"
msgstr "A %(site_name)s csapat"
-#: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:11
+#: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:12
msgid "previous"
msgstr "előző"
-#: core/templates/tags/pagination.html:31
-#: core/templates/tags/pagination.html:35
+#: core/templates/tags/pagination.html:33
+#: core/templates/tags/pagination.html:38
msgid "next"
msgstr "következő"
@@ -880,36 +879,36 @@ msgid "Add exercises to this workout day"
msgstr "Gyakorlat hozzáadása ehhez az edzés naphoz"
#: core/templates/tags/render_weight_log.html:17 manager/helpers.py:86
-#: manager/models/setting.py:69 manager/templates/set/formset.html:9
+#: manager/models/setting.py:72 manager/templates/set/formset.html:9
msgid "Reps"
msgstr "Ismétlés"
#: core/templates/tags/render_weight_log.html:30 manager/forms.py:191
-#: manager/models/log.py:103 manager/models/setting.py:99
+#: manager/models/log.py:103 manager/models/setting.py:102
#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
msgid "RiR"
msgstr ""
-#: core/templates/template.html:120 manager/templates/calendar/month.html:138
-#: manager/templates/schedule/view.html:249
-#: manager/templates/schedule/view.html:270
-#: manager/templates/workout/view.html:86
-#: manager/templates/workout/view.html:139
+#: core/templates/template.html:122 manager/templates/calendar/month.html:138
+#: manager/templates/schedule/view.html:248
+#: manager/templates/schedule/view.html:269
+#: manager/templates/workout/view.html:84
+#: manager/templates/workout/view.html:137
msgid "Close"
msgstr "Bezárás"
-#: core/templates/template.html:136
+#: core/templates/template.html:138
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:141
+#: core/templates/template.html:143
msgid "Create some demo entries"
msgstr "Készíts egy pár demó bejegyzést"
-#: core/templates/template.html:178 software/templates/features.html:547
+#: core/templates/template.html:180 software/templates/features.html:547
#: software/templates/tos.html:7
msgid "Terms of service"
msgstr ""
@@ -1001,7 +1000,7 @@ msgid "Overview"
msgstr "Áttekintés"
#: core/templates/user/overview.html:28
-#: manager/templates/schedule/view.html:164
+#: manager/templates/schedule/view.html:163
#: manager/templates/workout/overview.html:39 manager/views/schedule_step.py:60
msgid "Add workout"
msgstr "Edzés hozzáadása"
@@ -1009,20 +1008,20 @@ msgstr "Edzés hozzáadása"
#: core/templates/user/overview.html:34 core/templates/user/overview.html:76
#: core/templates/user/overview.html:120 core/templates/user/overview.html:152
#: exercises/models/base.py:118 exercises/models/base.py:124
-#: exercises/models/exercise.py:63 exercises/models/exercise.py:69
+#: exercises/models/exercise.py:64 exercises/models/exercise.py:70
#: exercises/models/image.py:107 exercises/models/image.py:113
#: exercises/models/video.py:163 exercises/models/video.py:169
#: gallery/models/image.py:42 manager/helpers.py:85 manager/models/log.py:100
#: manager/models/session.py:67 measurements/models/measurement.py:47
-#: nutrition/models/ingredient.py:101 nutrition/models/ingredient.py:107
-#: nutrition/models/ingredient.py:222 weight/models.py:33
+#: nutrition/models/ingredient.py:87 nutrition/models/ingredient.py:93
+#: nutrition/models/ingredient.py:216 weight/models.py:51
#: weight/templates/import_csv_preview.html:13
#: weight/templates/import_csv_preview.html:42 weight/views.py:144
msgid "Date"
msgstr "Dátum"
#: core/templates/user/overview.html:35 core/templates/user/overview.html:153
-#: exercises/models/exercise.py:51 gallery/models/image.py:65
+#: exercises/models/exercise.py:52 gallery/models/image.py:65
#: gym/models/contract.py:58 gym/models/contract.py:109
#: manager/models/day.py:37 manager/models/workout.py:63
#: measurements/models/measurement.py:62 nutrition/models/plan.py:67
@@ -1040,13 +1039,13 @@ msgstr "Utolsó tevékenység"
#: core/templates/user/overview.html:58
#: manager/templates/calendar/month.html:128
-#: manager/templates/schedule/view.html:145
+#: manager/templates/schedule/view.html:144
#: manager/templates/workout/overview.html:28
msgid "No workouts found."
msgstr "Nem található edzés."
#: core/templates/user/overview.html:68 manager/forms.py:280
-#: manager/templates/workout/view.html:108
+#: manager/templates/workout/view.html:106
msgid "Log"
msgstr "Bejegyzések"
@@ -1070,35 +1069,35 @@ msgstr "Idő"
#: core/templates/user/overview.html:112 core/templates/user/overview.html:121
#: manager/forms.py:186 manager/helpers.py:86 manager/models/log.py:86
-#: manager/models/setting.py:79 manager/templates/log/add.html:54
-#: manager/templates/set/formset.html:11 weight/models.py:35
+#: manager/models/setting.py:82 manager/templates/log/add.html:54
+#: manager/templates/set/formset.html:11 weight/models.py:53
#: weight/templates/import_csv_preview.html:14
#: weight/templates/import_csv_preview.html:43 weight/views.py:144
msgid "Weight"
msgstr "Súly"
-#: core/templates/user/overview.html:154 nutrition/models/ingredient.py:130
-#: nutrition/templates/ingredient/view.html:77 nutrition/views/plan.py:237
+#: core/templates/user/overview.html:154 nutrition/models/ingredient.py:116
+#: nutrition/templates/ingredient/view.html:51 nutrition/views/plan.py:237
msgid "Energy"
msgstr "Energia"
-#: core/templates/user/overview.html:155 nutrition/models/ingredient.py:137
-#: nutrition/templates/ingredient/view.html:84 nutrition/views/plan.py:243
+#: core/templates/user/overview.html:155 nutrition/models/ingredient.py:123
+#: nutrition/templates/ingredient/view.html:58 nutrition/views/plan.py:243
msgid "Protein"
msgstr "Fehérje"
-#: core/templates/user/overview.html:156 nutrition/models/ingredient.py:145
-#: nutrition/templates/ingredient/view.html:90 nutrition/views/plan.py:251
+#: core/templates/user/overview.html:156 nutrition/models/ingredient.py:131
+#: nutrition/templates/ingredient/view.html:64 nutrition/views/plan.py:251
msgid "Carbohydrates"
msgstr "Szénhidrát"
-#: core/templates/user/overview.html:157 nutrition/models/ingredient.py:163
-#: nutrition/templates/ingredient/view.html:106 nutrition/views/plan.py:265
+#: core/templates/user/overview.html:157 nutrition/models/ingredient.py:149
+#: nutrition/templates/ingredient/view.html:80 nutrition/views/plan.py:265
msgid "Fat"
msgstr "Zsír"
#: core/templates/user/overview.html:170
-#: nutrition/templates/ingredient/view.html:79
+#: nutrition/templates/ingredient/view.html:53
msgid "kcal"
msgstr "kcal"
@@ -1110,7 +1109,7 @@ msgstr "kcal"
#: gym/templates/gym/member_list.html:207
#: gym/templates/gym/member_list.html:240
#: gym/templates/gym/member_list.html:277
-#: manager/templates/schedule/view.html:101
+#: manager/templates/schedule/view.html:100
msgid "Actions"
msgstr "Műveletek"
@@ -1153,7 +1152,7 @@ msgid "Details"
msgstr "Részletek"
#: core/templates/user/overview.html:258 gym/views/export.py:57
-#: manager/helpers.py:86 manager/templates/schedule/view.html:99
+#: manager/helpers.py:86 manager/templates/schedule/view.html:98
msgid "Nr."
msgstr "sz."
@@ -1198,7 +1197,7 @@ msgid "Documents"
msgstr "Dokumentumok"
#: core/templates/user/overview.html:412 gym/templates/document/list.html:32
-#: manager/forms.py:292 manager/templates/workout/view.html:134
+#: manager/forms.py:292 manager/templates/workout/view.html:132
msgid "Download"
msgstr "Letöltés"
@@ -1249,13 +1248,13 @@ msgid "kg"
msgstr "kg"
#: core/templatetags/wger_extras.py:207
-#: nutrition/templates/ingredient/view.html:86
-#: nutrition/templates/ingredient/view.html:92
-#: nutrition/templates/ingredient/view.html:99
-#: nutrition/templates/ingredient/view.html:108
-#: nutrition/templates/ingredient/view.html:115
-#: nutrition/templates/ingredient/view.html:137
-#: nutrition/templates/ingredient/view.html:147
+#: nutrition/templates/ingredient/view.html:60
+#: nutrition/templates/ingredient/view.html:66
+#: nutrition/templates/ingredient/view.html:73
+#: nutrition/templates/ingredient/view.html:82
+#: nutrition/templates/ingredient/view.html:89
+#: nutrition/templates/ingredient/view.html:111
+#: nutrition/templates/ingredient/view.html:121
msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr "g"
@@ -1273,7 +1272,7 @@ msgstr ""
#: exercises/views/equipment.py:103 exercises/views/exercises.py:73
#: exercises/views/muscles.py:99 manager/views/schedule.py:309
#: manager/views/schedule_step.py:128 manager/views/workout.py:249
-#: manager/views/workout_session.py:142 nutrition/views/ingredient.py:116
+#: manager/views/workout_session.py:142 nutrition/views/ingredient.py:119
#: nutrition/views/unit.py:110
msgid "Successfully deleted"
msgstr "Sikeresen törölve"
@@ -1285,7 +1284,7 @@ msgstr "Sikeresen törölve"
#: gym/views/admin_notes.py:196 gym/views/document.py:206 gym/views/gym.py:481
#: manager/views/schedule.py:316 manager/views/schedule_step.py:138
#: manager/views/workout.py:253 manager/views/workout_session.py:156
-#: nutrition/views/ingredient.py:123 nutrition/views/unit.py:117
+#: nutrition/views/ingredient.py:126 nutrition/views/unit.py:117
#, python-brace-format
msgid "Delete {0}?"
msgstr "Töröljem {0}?"
@@ -1298,7 +1297,7 @@ msgstr "Töröljem {0}?"
#: gym/views/contract.py:186 gym/views/contract_option.py:123
#: gym/views/contract_type.py:123 gym/views/document.py:171
#: gym/views/gym.py:463 manager/views/day.py:100 manager/views/schedule.py:333
-#: manager/views/workout.py:267 nutrition/views/ingredient.py:142
+#: manager/views/workout.py:267 nutrition/views/ingredient.py:145
#: nutrition/views/unit.py:143
#, python-brace-format
msgid "Edit {0}"
@@ -1369,7 +1368,7 @@ msgstr "Edzőterem"
msgid "A verification email was sent to %(email)s"
msgstr ""
-#: exercises/models/base.py:82 nutrition/models/ingredient.py:236
+#: exercises/models/base.py:82 nutrition/models/ingredient.py:230
msgid "Category"
msgstr "Kategória"
@@ -1389,7 +1388,7 @@ msgstr ""
msgid "Exercise Categories"
msgstr "Gyakorlati kategóriák"
-#: exercises/models/comment.py:52 exercises/models/exercise_alias.py:52
+#: exercises/models/comment.py:52 exercises/models/exercise_alias.py:53
#: exercises/models/image.py:74 exercises/models/video.py:98
#: manager/forms.py:178 manager/helpers.py:86 manager/models/log.py:52
msgid "Exercise"
@@ -1399,12 +1398,12 @@ msgstr "Gyakorlat"
msgid "A comment about how to correctly do this exercise."
msgstr "Megjegyzés, hogy hogyan kell helyesen csinálni ezt a gyakorlatot."
-#: exercises/models/exercise.py:76 nutrition/models/ingredient.py:95
+#: exercises/models/exercise.py:77 nutrition/models/ingredient.py:81
#: nutrition/models/weight_unit.py:32
msgid "Language"
msgstr "Nyelv"
-#: exercises/models/exercise_alias.py:58
+#: exercises/models/exercise_alias.py:59
#, fuzzy
#| msgid "Add new exercise"
msgid "Alias for an exercise"
@@ -1544,7 +1543,7 @@ msgstr "Műveletek"
#: manager/models/schedule.py:44 manager/models/session.py:49
#: manager/models/workout.py:89 measurements/models/category.py:31
#: measurements/models/measurement.py:42 nutrition/models/plan.py:54
-#: nutrition/templates/ingredient/pending.html:16 weight/models.py:42
+#: weight/models.py:60
msgid "User"
msgstr "Felhasználó"
@@ -1669,9 +1668,9 @@ msgid "Contract type"
msgstr ""
#: gym/models/contract.py:211 gym/templates/contract/view.html:59
-#: manager/templates/log/add.html:52 nutrition/forms.py:62
-#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:105
-#: nutrition/models/meal_item.py:72
+#: manager/templates/log/add.html:52 nutrition/forms.py:63
+#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:108
+#: nutrition/models/meal_item.py:73
msgid "Amount"
msgstr ""
@@ -1688,7 +1687,7 @@ msgid "Contract is active"
msgstr ""
#: gym/models/contract.py:237 gym/templates/contract/view.html:69
-#: manager/models/schedule.py:61 manager/templates/schedule/view.html:68
+#: manager/models/schedule.py:61 manager/templates/schedule/view.html:67
msgid "Start date"
msgstr "Kezdés dátuma"
@@ -2075,7 +2074,7 @@ msgstr ""
#: mailer/templates/mailer/gym/form.html:28
#: mailer/templates/mailer/gym/preview.html:62
-#: manager/templates/workout/view.html:42
+#: manager/templates/workout/view.html:40
msgid "Steps"
msgstr "Lépések"
@@ -2097,7 +2096,7 @@ msgid ""
msgstr ""
#: mailer/templates/mailer/gym/preview.html:22
-#: software/templates/about_us.html:60
+#: software/templates/about_us.html:70
msgid "Current version"
msgstr ""
@@ -2128,18 +2127,18 @@ msgid ""
"a superset."
msgstr ""
-#: manager/forms.py:140 nutrition/forms.py:252
+#: manager/forms.py:140 nutrition/forms.py:253
#, fuzzy
#| msgid "Also use ingredients in English"
msgid "Also search for names in English"
msgstr "Használjon hozzávalókat Angolul is"
#: manager/forms.py:168 manager/forms.py:173 manager/models/log.py:64
-#: manager/models/log.py:92 manager/models/setting.py:59
-#: manager/models/setting.py:90 manager/templates/log/add.html:53
+#: manager/models/log.py:92 manager/models/setting.py:62
+#: manager/models/setting.py:93 manager/templates/log/add.html:53
#: manager/templates/log/add.html:55 manager/templates/set/formset.html:10
#: manager/templates/set/formset.html:12 measurements/models/category.py:41
-#: nutrition/forms.py:66
+#: nutrition/forms.py:67
msgid "Unit"
msgstr ""
@@ -2147,15 +2146,15 @@ msgstr ""
msgid "Type"
msgstr ""
-#: manager/forms.py:280 manager/templates/workout/view.html:115
+#: manager/forms.py:280 manager/templates/workout/view.html:113
msgid "Table"
msgstr ""
-#: manager/forms.py:282 manager/templates/workout/view.html:121
+#: manager/forms.py:282 manager/templates/workout/view.html:119
msgid "with images"
msgstr ""
-#: manager/forms.py:283 manager/templates/workout/view.html:127
+#: manager/forms.py:283 manager/templates/workout/view.html:125
msgid "with comments"
msgstr ""
@@ -2164,11 +2163,10 @@ msgid "Workout will expire soon"
msgstr ""
#: manager/models/day.py:34 manager/models/log.py:58
-#: manager/models/session.py:60 manager/templates/schedule/view.html:103
-#: manager/templates/workout/view.html:11
-#: manager/templates/workout/view.html:19 manager/views/pdf.py:85
-#: manager/views/pdf.py:161 manager/views/schedule.py:151
-#: manager/views/schedule.py:221
+#: manager/models/session.py:60 manager/templates/schedule/view.html:102
+#: manager/templates/workout/view.html:9 manager/templates/workout/view.html:17
+#: manager/views/pdf.py:85 manager/views/pdf.py:161
+#: manager/views/schedule.py:151 manager/views/schedule.py:221
msgid "Workout"
msgstr "Edzés"
@@ -2186,7 +2184,7 @@ msgstr "Nap"
msgid "Name or short description of the schedule. For example 'Program XYZ'."
msgstr ""
-#: manager/models/schedule.py:65 manager/templates/schedule/view.html:72
+#: manager/models/schedule.py:65 manager/templates/schedule/view.html:71
msgid "Schedule active"
msgstr ""
@@ -2197,7 +2195,7 @@ msgid ""
"inactive"
msgstr ""
-#: manager/models/schedule.py:77 manager/templates/schedule/view.html:82
+#: manager/models/schedule.py:77 manager/templates/schedule/view.html:81
msgid "Is a loop"
msgstr ""
@@ -2216,8 +2214,8 @@ msgid "The duration in weeks"
msgstr "Az időtartam hetekben"
#: manager/models/schedule_step.py:64 manager/models/set.py:53
-#: manager/models/setting.py:110 nutrition/models/meal.py:55
-#: nutrition/models/meal_item.py:65
+#: manager/models/setting.py:113 nutrition/models/meal.py:55
+#: nutrition/models/meal_item.py:66
msgid "Order"
msgstr "Sorrend"
@@ -2267,7 +2265,7 @@ msgstr ""
msgid "Number of sets"
msgstr "Sorozatok száma"
-#: manager/models/setting.py:48
+#: manager/models/setting.py:51
msgid "Sets"
msgstr "Sorozatok"
@@ -2338,7 +2336,7 @@ msgstr ""
msgid "Go to current month"
msgstr ""
-#: manager/templates/calendar/month.html:188
+#: manager/templates/calendar/month.html:190
msgid "Add new log"
msgstr "Új naplóbejegyzés hozzáadása"
@@ -2375,8 +2373,8 @@ msgid "Your schedules"
msgstr "Ütemterveid"
#: manager/templates/schedule/overview.html:19
-#: manager/templates/schedule/view.html:132
-#: manager/templates/schedule/view.html:184
+#: manager/templates/schedule/view.html:131
+#: manager/templates/schedule/view.html:183
#: manager/templates/workout/overview.html:16
msgid "active"
msgstr "aktív"
@@ -2412,29 +2410,29 @@ msgstr ""
msgid "Add schedule"
msgstr "Ütemterv hozzáadása"
-#: manager/templates/schedule/view.html:10
+#: manager/templates/schedule/view.html:9
msgid "Schedule"
msgstr "ütemterv"
-#: manager/templates/schedule/view.html:86
+#: manager/templates/schedule/view.html:85
msgid ""
"This schedule is a loop and will go through the workouts above till you "
"deactivate it"
msgstr ""
-#: manager/templates/schedule/view.html:104
+#: manager/templates/schedule/view.html:103
msgid "Weeks"
msgstr "Hetek"
-#: manager/templates/schedule/view.html:116
+#: manager/templates/schedule/view.html:115
msgid "Move me"
msgstr ""
-#: manager/templates/schedule/view.html:157
+#: manager/templates/schedule/view.html:156
msgid "Start schedule"
msgstr "Ütemterv indítása"
-#: manager/templates/schedule/view.html:188
+#: manager/templates/schedule/view.html:187
#, python-format
msgid ""
"%(weeks)s Week\n"
@@ -2445,11 +2443,11 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: manager/templates/schedule/view.html:222
+#: manager/templates/schedule/view.html:221
msgid "Adding workouts"
msgstr "Edzések hozzáadása"
-#: manager/templates/schedule/view.html:224
+#: manager/templates/schedule/view.html:223
msgid ""
"Add as many workouts to the schedule as you want. You can\n"
" edit the order by dragging and dropping them. It's also possible "
@@ -2457,21 +2455,21 @@ msgid ""
" than once."
msgstr ""
-#: manager/templates/schedule/view.html:233
-#: manager/templates/schedule/view.html:244
-#: manager/templates/schedule/view.html:291
-#: manager/templates/workout/view.html:71
-#: manager/templates/workout/view.html:81
-#: manager/templates/workout/view.html:180
+#: manager/templates/schedule/view.html:232
+#: manager/templates/schedule/view.html:243
+#: manager/templates/schedule/view.html:290
+#: manager/templates/workout/view.html:69
+#: manager/templates/workout/view.html:79
+#: manager/templates/workout/view.html:178
msgid "Export calendar file"
msgstr "Calendar fájl exportálása"
-#: manager/templates/schedule/view.html:237
+#: manager/templates/schedule/view.html:236
msgid "Export this schedule as a calendar file."
msgstr "Az ütemterv exportálása calendar fájlként."
-#: manager/templates/schedule/view.html:238
-#: manager/templates/workout/view.html:76
+#: manager/templates/schedule/view.html:237
+#: manager/templates/workout/view.html:74
msgid ""
"You can then import the file it into your calendar\n"
" application for example google calendar, outlook or "
@@ -2480,18 +2478,18 @@ msgid ""
"appropriate exercises."
msgstr ""
-#: manager/templates/schedule/view.html:259
-#: manager/templates/schedule/view.html:295
-#: manager/templates/workout/view.html:96
-#: manager/templates/workout/view.html:176
+#: manager/templates/schedule/view.html:258
+#: manager/templates/schedule/view.html:294
+#: manager/templates/workout/view.html:94
+#: manager/templates/workout/view.html:174
msgid "Download as PDF"
msgstr "PDF letöltése"
-#: manager/templates/schedule/view.html:300
+#: manager/templates/schedule/view.html:299
msgid "Edit schedule"
msgstr "Ütemterv szerkesztése"
-#: manager/templates/schedule/view.html:305
+#: manager/templates/schedule/view.html:304
msgid "Delete schedule"
msgstr "Ütemterv törlése"
@@ -2613,12 +2611,12 @@ msgid "Mark as workout"
msgstr "Edzéseid"
#: manager/templates/workout/template_view.html:65
-#: manager/templates/workout/view.html:51
+#: manager/templates/workout/view.html:49
msgid "Muscles trained"
msgstr ""
#: manager/templates/workout/template_view.html:68
-#: manager/templates/workout/view.html:54
+#: manager/templates/workout/view.html:52
msgid ""
"Images show combined muscles as trained by the exercises on the workout."
msgstr ""
@@ -2627,35 +2625,35 @@ msgstr ""
msgid "Use this template"
msgstr ""
-#: manager/templates/workout/view.html:45
+#: manager/templates/workout/view.html:43
msgid "Add training days"
msgstr ""
-#: manager/templates/workout/view.html:46
+#: manager/templates/workout/view.html:44
msgid "Add workout sets to days"
msgstr ""
-#: manager/templates/workout/view.html:47
+#: manager/templates/workout/view.html:45
msgid "Set the repetitions for each set"
msgstr ""
-#: manager/templates/workout/view.html:75
+#: manager/templates/workout/view.html:73
msgid "Export this workout as a calendar file."
msgstr ""
-#: manager/templates/workout/view.html:146
+#: manager/templates/workout/view.html:144
msgid "Logs"
msgstr ""
-#: manager/templates/workout/view.html:148
+#: manager/templates/workout/view.html:146
msgid "View logs"
msgstr ""
-#: manager/templates/workout/view.html:171 manager/views/schedule_step.py:99
+#: manager/templates/workout/view.html:169 manager/views/schedule_step.py:99
msgid "Edit workout"
msgstr "Edzés módosítása"
-#: manager/templates/workout/view.html:184 manager/views/workout.py:281
+#: manager/templates/workout/view.html:182 manager/views/workout.py:281
msgid "Mark as template"
msgstr ""
@@ -2702,110 +2700,95 @@ msgstr ""
msgid "Value"
msgstr ""
-#: nutrition/forms.py:117
+#: nutrition/forms.py:118
#, fuzzy
#| msgid "Height (cm)"
msgid "Height (in)"
msgstr "Magasság (cm)"
-#: nutrition/forms.py:120
+#: nutrition/forms.py:121
#, fuzzy
#| msgid "Weight log"
msgid "Weight (kg)"
msgstr "Testsúly napló"
-#: nutrition/forms.py:120
+#: nutrition/forms.py:121
#, fuzzy
#| msgid "Weight log"
msgid "Weight (lbs)"
msgstr "Testsúly napló"
-#: nutrition/forms.py:133
+#: nutrition/forms.py:134
msgid "Calculate"
msgstr ""
-#: nutrition/forms.py:207 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:208 nutrition/templates/rate/form.html:76
msgid "Basic caloric intake"
msgstr ""
-#: nutrition/forms.py:208
+#: nutrition/forms.py:209
msgid "Your basic caloric intake as calculated for your data"
msgstr ""
-#: nutrition/forms.py:213
+#: nutrition/forms.py:214
msgid "Additional calories"
msgstr ""
-#: nutrition/forms.py:215
+#: nutrition/forms.py:216
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
msgstr ""
-#: nutrition/forms.py:248 nutrition/models/ingredient_weight_unit.py:39
-#: nutrition/models/log.py:84 nutrition/models/meal_item.py:53
+#: nutrition/forms.py:249 nutrition/models/ingredient_weight_unit.py:39
+#: nutrition/models/log.py:87 nutrition/models/meal_item.py:54
msgid "Ingredient"
msgstr ""
-#: nutrition/models/ingredient.py:131
+#: nutrition/models/ingredient.py:117
msgid "In kcal per 100g"
msgstr ""
-#: nutrition/models/ingredient.py:138 nutrition/models/ingredient.py:146
-#: nutrition/models/ingredient.py:156 nutrition/models/ingredient.py:164
-#: nutrition/models/ingredient.py:174 nutrition/models/ingredient.py:184
-#: nutrition/models/ingredient.py:194
+#: nutrition/models/ingredient.py:124 nutrition/models/ingredient.py:132
+#: nutrition/models/ingredient.py:142 nutrition/models/ingredient.py:150
+#: nutrition/models/ingredient.py:160 nutrition/models/ingredient.py:170
+#: nutrition/models/ingredient.py:180
msgid "In g per 100g of product"
msgstr ""
-#: nutrition/models/ingredient.py:155
-#: nutrition/templates/ingredient/view.html:96 nutrition/views/plan.py:259
+#: nutrition/models/ingredient.py:141
+#: nutrition/templates/ingredient/view.html:70 nutrition/views/plan.py:259
msgid "Sugar content in carbohydrates"
msgstr ""
-#: nutrition/models/ingredient.py:173
-#: nutrition/templates/ingredient/view.html:112 nutrition/views/plan.py:273
+#: nutrition/models/ingredient.py:159
+#: nutrition/templates/ingredient/view.html:86 nutrition/views/plan.py:273
msgid "Saturated fat content in fats"
msgstr ""
-#: nutrition/models/ingredient.py:183
-#: nutrition/templates/ingredient/view.html:134 nutrition/views/plan.py:279
-msgid "Fibres"
+#: nutrition/models/ingredient.py:169
+#: nutrition/templates/ingredient/view.html:108 nutrition/views/plan.py:279
+msgid "Fiber"
msgstr ""
-#: nutrition/models/ingredient.py:193
-#: nutrition/templates/ingredient/view.html:144 nutrition/views/plan.py:285
+#: nutrition/models/ingredient.py:179
+#: nutrition/templates/ingredient/view.html:118 nutrition/views/plan.py:285
msgid "Sodium"
msgstr ""
-#: nutrition/models/ingredient.py:215
+#: nutrition/models/ingredient.py:209
msgid "Link to product"
msgstr ""
-#: nutrition/models/ingredient.py:244
+#: nutrition/models/ingredient.py:238
msgid "Brand name of product"
msgstr ""
-#: nutrition/models/ingredient.py:304
+#: nutrition/models/ingredient.py:305
#, python-brace-format
msgid "The total energy ({self.energy}kcal) is not the approximate sum of the "
msgstr ""
-#: nutrition/models/ingredient.py:383 nutrition/views/ingredient.py:196
-msgid "Ingredient was successfully added to the general database"
-msgstr ""
-
-#: nutrition/models/ingredient.py:408
-msgid "New user submitted ingredient"
-msgstr ""
-
-#: nutrition/models/ingredient.py:410
-#, fuzzy, python-brace-format
-#| msgid "The user {0} submitted a new exercise \"{1}\"."
-msgid ""
-"The user {request.user.username} submitted a new ingredient \"{self.name}\"."
-msgstr "A {0} felhasználó javasolt egy új gyakorlatot \"{1}\"."
-
#: nutrition/models/ingredient_category.py:31
msgid "Ingredient Categories"
msgstr ""
@@ -2818,16 +2801,16 @@ msgstr ""
msgid "Unit amount, e.g. \"1 Cup\" or \"1/2 spoon\""
msgstr ""
-#: nutrition/models/log.py:49 nutrition/models/meal.py:50
-#: nutrition/models/meal_item.py:47 nutrition/models/plan.py:106
+#: nutrition/models/log.py:52 nutrition/models/meal.py:50
+#: nutrition/models/meal_item.py:48 nutrition/models/plan.py:108
msgid "Nutrition plan"
msgstr "Táplálkozási terv"
-#: nutrition/models/log.py:58
+#: nutrition/models/log.py:61
msgid "Meal"
msgstr ""
-#: nutrition/models/log.py:68
+#: nutrition/models/log.py:71
msgid "Date and Time (Approx.)"
msgstr ""
@@ -2847,11 +2830,11 @@ msgid ""
"summer\""
msgstr ""
-#: nutrition/models/plan.py:88
+#: nutrition/models/plan.py:90
msgid "Use daily calories"
msgstr ""
-#: nutrition/models/plan.py:91
+#: nutrition/models/plan.py:93
msgid ""
"Tick the box if you want to mark this plan as having a goal amount of "
"calories. You can use the calculator or enter the value yourself."
@@ -2958,64 +2941,36 @@ msgstr "Keresés"
msgid "Add ingredient"
msgstr "Összetevő hozzáadása"
-#: nutrition/templates/ingredient/pending.html:14
-msgid "Submission date"
-msgstr "Beküldési dátum"
-
-#: nutrition/templates/ingredient/view.html:27
-msgid "Ingredient is pending review"
-msgstr ""
-
-#: nutrition/templates/ingredient/view.html:28
-msgid ""
-"This user submitted ingredient is pending a decision to be\n"
-"included in the database. Till then, it will not be shown in the overview "
-"or\n"
-"the search."
-msgstr ""
-
-#: nutrition/templates/ingredient/view.html:31
-msgid "Please select one of the options below."
-msgstr "Kérlek válassz egyet az alábbi lehetőség közül."
-
-#: nutrition/templates/ingredient/view.html:38
-msgid "Accept"
-msgstr "Elfogad"
-
-#: nutrition/templates/ingredient/view.html:42
-msgid "Decline"
-msgstr "Elutasít"
-
-#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:229
+#: nutrition/templates/ingredient/view.html:45 nutrition/views/plan.py:229
msgid "Macronutrients"
msgstr ""
-#: nutrition/templates/ingredient/view.html:80
+#: nutrition/templates/ingredient/view.html:54
msgid "kJ"
msgstr ""
-#: nutrition/templates/ingredient/view.html:101
-#: nutrition/templates/ingredient/view.html:117
-#: nutrition/templates/ingredient/view.html:139
-#: nutrition/templates/ingredient/view.html:149
+#: nutrition/templates/ingredient/view.html:75
+#: nutrition/templates/ingredient/view.html:91
+#: nutrition/templates/ingredient/view.html:113
+#: nutrition/templates/ingredient/view.html:123
msgid "n.A."
msgstr ""
-#: nutrition/templates/ingredient/view.html:128
+#: nutrition/templates/ingredient/view.html:102
msgid "Others"
msgstr ""
-#: nutrition/templates/ingredient/view.html:170
+#: nutrition/templates/ingredient/view.html:144
#: nutrition/templates/units/list.html:46 nutrition/views/unit.py:86
msgid "Add new weight unit"
msgstr ""
-#: nutrition/templates/ingredient/view.html:232
-#: nutrition/templates/ingredient/view.html:235
+#: nutrition/templates/ingredient/view.html:206
+#: nutrition/templates/ingredient/view.html:209
msgid "Edit ingredient"
msgstr ""
-#: nutrition/templates/ingredient/view.html:239
+#: nutrition/templates/ingredient/view.html:213
msgid "Delete ingredient"
msgstr ""
@@ -3099,14 +3054,10 @@ msgstr ""
msgid "56 to 90"
msgstr ""
-#: nutrition/views/ingredient.py:154
+#: nutrition/views/ingredient.py:157
msgid "Add a new ingredient"
msgstr ""
-#: nutrition/views/ingredient.py:209
-msgid "Ingredient was successfully marked as rejected"
-msgstr ""
-
#: nutrition/views/plan.py:120
msgid "Nutritional plan"
msgstr ""
@@ -3151,52 +3102,61 @@ msgid ""
msgstr ""
#: software/templates/about_us.html:18
-msgid "Source code"
-msgstr ""
-
-#: software/templates/about_us.html:20
-msgid "Get the source code of this application and its server on github"
-msgstr ""
-
-#: software/templates/about_us.html:25
msgid "Have a problem or idea?"
msgstr ""
-#: software/templates/about_us.html:27
+#: software/templates/about_us.html:20
msgid ""
"Get in touch if something didn't behave as expected or if there is a feature "
"that you feel is missing."
msgstr ""
-#: software/templates/about_us.html:32
+#: software/templates/about_us.html:26
msgid "Say hi!"
msgstr ""
-#: software/templates/about_us.html:34
+#: software/templates/about_us.html:28
msgid "If you want to chat with us, hop on the Discord server and get in touch"
msgstr ""
-#: software/templates/about_us.html:39 software/templates/features.html:503
+#: software/templates/about_us.html:33
+msgid "Mastodon"
+msgstr ""
+
+#: software/templates/about_us.html:35
+msgid "Follow us on mastodon for updates and news about the project"
+msgstr ""
+
+#: software/templates/about_us.html:40 software/templates/features.html:503
#, fuzzy
#| msgid "Translate"
msgid "Translation"
msgstr "Lefordítás"
-#: software/templates/about_us.html:41
+#: software/templates/about_us.html:42
msgid ""
"This application is translated on weblate. If you also want to help, click "
"the link and start translating"
msgstr ""
-#: software/templates/about_us.html:50
+#: software/templates/about_us.html:47
+msgid "Source code"
+msgstr ""
+
+#: software/templates/about_us.html:49
+msgid "Get the source code of this application and its server on github"
+msgstr ""
+
+#: software/templates/about_us.html:59
msgid "Our goal"
msgstr ""
-#: software/templates/about_us.html:53
+#: software/templates/about_us.html:62
msgid ""
"The goal is to build an awesome\n"
" and flexible fitness manager, along with a comprehensive and "
-"complete list of exercises and\n"
+"complete list of\n"
+" exercises and\n"
" ingredients, all released under a free license."
msgstr ""
@@ -3206,10 +3166,6 @@ msgid ""
"your exercises and workouts."
msgstr ""
-#: software/templates/features.html:45
-msgid "About"
-msgstr "Impresszum"
-
#: software/templates/features.html:57
msgid "Mobile app"
msgstr ""
@@ -3461,18 +3417,6 @@ msgid ""
"to its own copyright."
msgstr ""
-#: utils/models.py:130
-msgid "Pending"
-msgstr "Függő"
-
-#: utils/models.py:131
-msgid "Accepted"
-msgstr "Elfogadott"
-
-#: utils/models.py:132
-msgid "Declined"
-msgstr "Elutasított"
-
#: weight/forms.py:54
msgid "Input"
msgstr ""
@@ -3485,7 +3429,7 @@ msgstr ""
msgid "You have to enter your weight"
msgstr ""
-#: weight/models.py:60
+#: weight/models.py:78
msgid "Weight entry"
msgstr ""
@@ -3602,6 +3546,40 @@ msgstr ""
msgid "Delete weight entry for the %s"
msgstr ""
+#~ msgid "Ingredients pending review"
+#~ msgstr "Ellenőrzésre váró összetevők"
+
+#, fuzzy, python-brace-format
+#~| msgid "The user {0} submitted a new exercise \"{1}\"."
+#~ msgid ""
+#~ "The user {request.user.username} submitted a new ingredient \"{self."
+#~ "name}\"."
+#~ msgstr "A {0} felhasználó javasolt egy új gyakorlatot \"{1}\"."
+
+#~ msgid "Submission date"
+#~ msgstr "Beküldési dátum"
+
+#~ msgid "Please select one of the options below."
+#~ msgstr "Kérlek válassz egyet az alábbi lehetőség közül."
+
+#~ msgid "Accept"
+#~ msgstr "Elfogad"
+
+#~ msgid "Decline"
+#~ msgstr "Elutasít"
+
+#~ msgid "About"
+#~ msgstr "Impresszum"
+
+#~ msgid "Pending"
+#~ msgstr "Függő"
+
+#~ msgid "Accepted"
+#~ msgstr "Elfogadott"
+
+#~ msgid "Declined"
+#~ msgstr "Elutasított"
+
#~ msgid "This workout is part of a schedule:"
#~ msgstr "Ez az edzés egy ütemterv része:"
diff --git a/wger/locale/it/LC_MESSAGES/django.po b/wger/locale/it/LC_MESSAGES/django.po
index b98a39463..6f21dfa38 100644
--- a/wger/locale/it/LC_MESSAGES/django.po
+++ b/wger/locale/it/LC_MESSAGES/django.po
@@ -15,7 +15,7 @@ msgid ""
msgstr ""
"Project-Id-Version: wger Workout Manager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-02-02 12:42+0100\n"
+"POT-Creation-Date: 2024-07-14 15:49+0200\n"
"PO-Revision-Date: 2024-04-05 23:01+0000\n"
"Last-Translator: Federico Pierantoni <[email protected]>\n"
"Language-Team: Italian <https://hosted.weblate.org/projects/wger/web/it/>\n"
@@ -39,7 +39,7 @@ msgstr ""
"sarà assegnata a tutti i nuovi utenti e a tutti gli utenti già registrati "
"che non ne hanno una."
-#: config/views/gym_config.py:42 core/templates/language/view.html:63
+#: config/views/gym_config.py:42 core/templates/language/view.html:67
#: core/templates/license/list.html:17 core/templates/misc/license/list.html:18
#: core/templates/repetition_unit/list.html:18
#: core/templates/tags/render_day.html:39
@@ -59,8 +59,8 @@ msgstr ""
#: manager/templates/calendar/day.html:68
#: manager/templates/calendar/month.html:85
#: manager/templates/calendar/partial_overview_table.html:18
-#: manager/templates/schedule/view.html:119
-#: nutrition/templates/ingredient/view.html:191
+#: manager/templates/schedule/view.html:118
+#: nutrition/templates/ingredient/view.html:165
#: nutrition/templates/units/list.html:19
msgid "Edit"
msgstr "Modifica"
@@ -94,8 +94,8 @@ msgstr "Il mio programma di allenamento"
msgid "Empty placeholder schedule"
msgstr "Programma segnaposto vuoto"
-#: core/forms.py:69 core/templates/navigation.html:275
-#: core/templates/navigation.html:281 core/templates/user/login.html:4
+#: core/forms.py:69 core/templates/navigation.html:285
+#: core/templates/navigation.html:291 core/templates/user/login.html:4
#: software/templates/features.html:82 software/templates/features.html:427
msgid "Login"
msgstr "Entra"
@@ -169,7 +169,7 @@ msgstr "Password"
msgid "Please enter your current password."
msgstr "Si prega di inserire la tua password attuale."
-#: core/forms.py:242 core/templates/language/view.html:68
+#: core/forms.py:242 core/templates/language/view.html:73
#: core/templates/license/list.html:19 core/templates/misc/license/list.html:22
#: core/templates/repetition_unit/list.html:20
#: core/templates/tags/render_day.html:45
@@ -184,10 +184,10 @@ msgstr "Si prega di inserire la tua password attuale."
#: gym/templates/gym/list.html:22 manager/templates/calendar/day.html:73
#: manager/templates/calendar/month.html:89
#: manager/templates/calendar/partial_overview_table.html:23
-#: manager/templates/schedule/view.html:123
-#: manager/templates/workout/view.html:190
-#: nutrition/templates/ingredient/view.html:192
-#: nutrition/templates/ingredient/view.html:241
+#: manager/templates/schedule/view.html:122
+#: manager/templates/workout/view.html:188
+#: nutrition/templates/ingredient/view.html:166
+#: nutrition/templates/ingredient/view.html:215
#: nutrition/templates/units/list.html:22
msgid "Delete"
msgstr "Elimina"
@@ -200,14 +200,14 @@ msgstr "Password non valida"
msgid "The form is secured with reCAPTCHA"
msgstr "Questo modulo è protetto con reCAPTCHA"
-#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:275
-#: core/templates/navigation.html:287 core/templates/template.html:147
+#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:285
+#: core/templates/navigation.html:297 core/templates/template.html:149
#: core/templates/user/login.html:20 core/views/user.py:298
#: software/templates/features.html:87 software/templates/features.html:422
msgid "Register"
msgstr "Registrati"
-#: core/forms.py:315
+#: core/forms.py:315 software/templates/features.html:45
msgid "Contact"
msgstr "Contatto"
@@ -216,7 +216,7 @@ msgid "Some way of answering you (e-mail, etc.)"
msgstr "Un modo per contattarti (e-mail, ecc.)"
#: core/forms.py:324 exercises/models/comment.py:58 manager/models/set.py:61
-#: manager/models/setting.py:111 nutrition/models/log.py:74
+#: manager/models/setting.py:114 nutrition/models/log.py:77
msgid "Comment"
msgstr "Commento"
@@ -236,6 +236,12 @@ msgstr "Nome breve Lingua"
msgid "Language full name"
msgstr "Nome completo Lingua"
+#: core/models/language.py:45 core/templates/language/view.html:23
+#, fuzzy
+#| msgid "Language full name"
+msgid "Language full name in English"
+msgstr "Nome completo Lingua"
+
#: core/models/license.py:29
msgid "Full name"
msgstr "Nome completo"
@@ -252,7 +258,7 @@ msgstr ""
msgid "Short name, e.g. CC-BY-SA 3"
msgstr "Nome corto, e.g. CC-BY-SA 3"
-#: core/models/license.py:45 nutrition/models/ingredient.py:214
+#: core/models/license.py:45 nutrition/models/ingredient.py:208
msgid "Link"
msgstr "Link"
@@ -371,7 +377,7 @@ msgstr ""
msgid "Age"
msgstr "Età"
-#: core/models/profile.py:230 nutrition/forms.py:117
+#: core/models/profile.py:230 nutrition/forms.py:118
msgid "Height (cm)"
msgstr "Altezza (cm)"
@@ -422,7 +428,7 @@ msgid "Total caloric intake, including e.g. any surplus"
msgstr "Totale calorico, incluso es. qualsiasi eccesso calorico"
#: core/models/profile.py:333 nutrition/models/ingredient_weight_unit.py:45
-#: nutrition/models/log.py:93 nutrition/models/meal_item.py:58
+#: nutrition/models/log.py:96 nutrition/models/meal_item.py:59
msgid "Weight unit"
msgstr "Unità"
@@ -456,17 +462,16 @@ msgstr "La somma di tutte le ore deve essere 24"
#: core/models/rep_unit.py:36 core/models/weight_unit.py:36
#: core/templates/user/overview.html:262 core/views/user.py:599
#: exercises/models/category.py:29 exercises/models/equipment.py:29
-#: exercises/models/exercise.py:58 exercises/models/muscle.py:36
+#: exercises/models/exercise.py:59 exercises/models/muscle.py:36
#: gym/models/contract.py:52 gym/models/contract.py:103 gym/models/gym.py:46
#: gym/models/user_document.py:84 gym/templates/contract/view.html:50
#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:96
#: gym/views/gym.py:158 manager/models/schedule.py:55
#: manager/models/workout.py:57 measurements/models/category.py:36
-#: nutrition/models/ingredient.py:125
+#: nutrition/models/ingredient.py:111
#: nutrition/models/ingredient_category.py:27 nutrition/models/meal.py:67
#: nutrition/models/weight_unit.py:38
-#: nutrition/templates/ingredient/pending.html:15
-#: nutrition/templates/ingredient/view.html:178
+#: nutrition/templates/ingredient/view.html:152
msgid "Name"
msgstr "Nome"
@@ -572,24 +577,24 @@ msgstr "Clicca sul seguente link per confermare la tua email: %(link)s"
msgid "Dashboard"
msgstr "Pagina principale"
-#: core/templates/language/overview.html:4 core/templates/navigation.html:335
+#: core/templates/language/overview.html:4 core/templates/navigation.html:345
msgid "Languages"
msgstr "Lingue"
-#: core/templates/language/overview.html:20
+#: core/templates/language/overview.html:22
msgid "Nothing found."
msgstr "Nessun risultato."
-#: core/templates/language/overview.html:20
+#: core/templates/language/overview.html:22
#: manager/templates/calendar/month.html:132
#: manager/templates/schedule/overview.html:28
-#: manager/templates/schedule/view.html:145
+#: manager/templates/schedule/view.html:144
#: manager/templates/workout/overview.html:28
#: nutrition/templates/ingredient/overview.html:38
msgid "Add one now."
msgstr "Aggiungine uno adesso."
-#: core/templates/language/overview.html:33 core/templates/license/list.html:40
+#: core/templates/language/overview.html:35 core/templates/license/list.html:40
#: core/templates/misc/license/list.html:43
#: core/templates/repetition_unit/list.html:43
#: core/templates/user/overview.html:326 core/templates/user/overview.html:365
@@ -609,13 +614,13 @@ msgstr "Aggiungine uno adesso."
msgid "Add"
msgstr "Aggiungi"
-#: core/templates/language/view.html:58 core/templates/user/api_key.html:44
+#: core/templates/language/view.html:61 core/templates/user/api_key.html:44
#: core/templates/user/preferences.html:45 gym/models/contract.py:203
#: gym/templates/contract/view.html:41 gym/templates/contract/view.html:106
#: gym/templates/gym/member_list.html:248
-#: manager/templates/schedule/view.html:286
-#: manager/templates/workout/view.html:165
-#: nutrition/templates/ingredient/view.html:228
+#: manager/templates/schedule/view.html:285
+#: manager/templates/workout/view.html:163
+#: nutrition/templates/ingredient/view.html:202
msgid "Options"
msgstr "Opzioni"
@@ -640,12 +645,11 @@ msgstr "Elenco delle licenze"
#: gym/templates/gym/member_list.html:299
#: mailer/templates/mailer/gym/overview.html:30
#: manager/templates/calendar/day.html:87
-#: nutrition/templates/ingredient/pending.html:30
#: nutrition/templates/units/list.html:29
msgid "Nothing found"
msgstr "Trovato niente"
-#: core/templates/misc/about.html:4 core/templates/template.html:173
+#: core/templates/misc/about.html:4 core/templates/template.html:175
msgid "Imprint"
msgstr "Impressum"
@@ -658,174 +662,169 @@ msgstr ""
"Se una licenza è stata localizzata, ad es. le licenze Creative Commons\n"
" per i diversi paesi, aggiungile qui come voci separate."
-#: core/templates/navigation.html:27 software/templates/features.html:437
+#: core/templates/navigation.html:28 software/templates/features.html:437
msgid "Training"
msgstr "Allenamento"
-#: core/templates/navigation.html:34 core/templates/user/overview.html:25
+#: core/templates/navigation.html:37 core/templates/user/overview.html:25
msgid "Workouts"
msgstr "Allenamento"
-#: core/templates/navigation.html:42
+#: core/templates/navigation.html:46
msgid "Workouts schedules"
msgstr "Programma allenamenti"
-#: core/templates/navigation.html:50 core/templates/user/overview.html:70
+#: core/templates/navigation.html:54 core/templates/user/overview.html:70
#: manager/templates/calendar/month.html:10
#: manager/templates/calendar/month.html:21
msgid "Calendar"
msgstr "Calendario"
-#: core/templates/navigation.html:60
+#: core/templates/navigation.html:64
msgid "Measurements"
msgstr "Misure"
-#: core/templates/navigation.html:70 gallery/templates/images/overview.html:6
+#: core/templates/navigation.html:75 gallery/templates/images/overview.html:6
msgid "Gallery"
msgstr "Galleria"
-#: core/templates/navigation.html:76
+#: core/templates/navigation.html:81
msgid "Workout templates"
msgstr "Modelli di allenamento"
-#: core/templates/navigation.html:82 manager/views/workout.py:84
+#: core/templates/navigation.html:88 manager/views/workout.py:84
msgid "Your templates"
msgstr "I tuoi modelli"
-#: core/templates/navigation.html:90 manager/views/workout.py:98
+#: core/templates/navigation.html:97 manager/views/workout.py:98
msgid "Public templates"
msgstr "Modelli pubblici"
-#: core/templates/navigation.html:97 manager/forms.py:129
-#: manager/models/setting.py:54 software/templates/features.html:51
+#: core/templates/navigation.html:105 manager/forms.py:129
+#: manager/models/setting.py:57 software/templates/features.html:51
#: software/templates/features.html:459
msgid "Exercises"
msgstr "Esercizi"
-#: core/templates/navigation.html:103 core/templates/navigation.html:170
-#: core/templates/navigation.html:330
+#: core/templates/navigation.html:111 core/templates/navigation.html:184
+#: core/templates/navigation.html:340
msgid "Administration"
msgstr "Amministrazione"
-#: core/templates/navigation.html:106
+#: core/templates/navigation.html:115
msgid "Exercise edit history"
msgstr "Aggiorna storico esercizi"
-#: core/templates/navigation.html:111 exercises/models/base.py:103
+#: core/templates/navigation.html:121 exercises/models/base.py:103
msgid "Equipment"
msgstr "Attrezzatura"
-#: core/templates/navigation.html:116
+#: core/templates/navigation.html:127
msgid "Muscles"
msgstr "Muscoli"
-#: core/templates/navigation.html:121
+#: core/templates/navigation.html:133
#: exercises/templates/categories/admin-overview.html:4
msgid "Categories"
msgstr "Categorie"
-#: core/templates/navigation.html:136 software/templates/features.html:447
+#: core/templates/navigation.html:148 software/templates/features.html:447
msgid "Nutrition"
msgstr "Piano nutrizionale"
-#: core/templates/navigation.html:143 core/templates/user/overview.html:144
+#: core/templates/navigation.html:156 core/templates/user/overview.html:144
msgid "Nutrition plans"
msgstr "Piani nutrizionali"
-#: core/templates/navigation.html:151 nutrition/templates/bmi/form.html:50
+#: core/templates/navigation.html:165 nutrition/templates/bmi/form.html:50
msgid "BMI calculator"
msgstr "Calcolatore IMC"
-#: core/templates/navigation.html:159 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:174 nutrition/templates/rate/form.html:17
msgid "Daily calories calculator"
msgstr "Calcolo calorie giornaliere"
-#: core/templates/navigation.html:165
+#: core/templates/navigation.html:179
#: nutrition/templates/ingredient/overview.html:10
msgid "Ingredient overview"
msgstr "Panoramica alimenti"
-#: core/templates/navigation.html:172 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:187 nutrition/templates/units/list.html:6
msgid "Ingredient weight units"
msgstr "Unità di peso ingrediente"
-#: core/templates/navigation.html:177
-#: nutrition/templates/ingredient/pending.html:6
-msgid "Ingredients pending review"
-msgstr "Ingredienti in attesa di revisione"
-
-#: core/templates/navigation.html:193 software/templates/features.html:442
+#: core/templates/navigation.html:203 software/templates/features.html:442
msgid "Body weight"
msgstr "Peso corporeo"
-#: core/templates/navigation.html:200 core/templates/user/overview.html:114
+#: core/templates/navigation.html:210 core/templates/user/overview.html:114
msgid "Weight overview"
msgstr "Panoramica peso corporeo"
-#: core/templates/navigation.html:207 weight/views.py:65
+#: core/templates/navigation.html:217 weight/views.py:65
msgid "Add weight entry"
msgstr "Aggiungi peso corporeo"
-#: core/templates/navigation.html:221
+#: core/templates/navigation.html:231
msgid "About this software"
msgstr "Informazioni su questo software"
-#: core/templates/navigation.html:227 software/templates/about_us.html:5
+#: core/templates/navigation.html:237 software/templates/about_us.html:5
msgid "About us"
msgstr "Chi siamo"
-#: core/templates/navigation.html:233 software/templates/features.html:507
+#: core/templates/navigation.html:243 software/templates/features.html:507
msgid "REST API"
msgstr "REST API"
-#: core/templates/navigation.html:239 utils/models.py:45
+#: core/templates/navigation.html:249 utils/models.py:45
msgid "License"
msgstr "Licenza"
-#: core/templates/navigation.html:245
+#: core/templates/navigation.html:255
msgid "Developer documentation"
msgstr "Documentazione dello sviluppatore"
-#: core/templates/navigation.html:252
+#: core/templates/navigation.html:262
msgid "Get the code"
msgstr "Ottieni il codice"
-#: core/templates/navigation.html:259 core/templates/template.html:212
+#: core/templates/navigation.html:269 core/templates/template.html:214
#: software/templates/features.html:582
msgid "Translate"
msgstr "Traduci"
-#: core/templates/navigation.html:293 core/templates/user/login.html:28
+#: core/templates/navigation.html:303 core/templates/user/login.html:28
msgid "Reset password"
msgstr "Reimposta la password"
-#: core/templates/navigation.html:311
+#: core/templates/navigation.html:321
msgid "My preferences"
msgstr "Preferenze"
-#: core/templates/navigation.html:320
+#: core/templates/navigation.html:330
msgid "Logout"
msgstr "Esci"
-#: core/templates/navigation.html:343
+#: core/templates/navigation.html:353
msgid "Licenses"
msgstr "Licenza"
-#: core/templates/navigation.html:351
+#: core/templates/navigation.html:361
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr "Unità di ripetizione"
-#: core/templates/navigation.html:359 core/templates/weight_unit/list.html:4
-#: nutrition/templates/ingredient/view.html:167
+#: core/templates/navigation.html:369 core/templates/weight_unit/list.html:4
+#: nutrition/templates/ingredient/view.html:141
msgid "Weight units"
msgstr "Unità peso"
-#: core/templates/navigation.html:367 core/templates/user/list.html:4
+#: core/templates/navigation.html:377 core/templates/user/list.html:4
msgid "User list"
msgstr "Lista utenti"
-#: core/templates/navigation.html:373
+#: core/templates/navigation.html:383
msgid "Gyms"
msgstr "Palestre"
@@ -880,12 +879,12 @@ msgstr "Grazie per aver usato il nostro sito!"
msgid "The %(site_name)s team"
msgstr "I creatori di %(site_name)s"
-#: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:11
+#: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:12
msgid "previous"
msgstr "precedente"
-#: core/templates/tags/pagination.html:31
-#: core/templates/tags/pagination.html:35
+#: core/templates/tags/pagination.html:33
+#: core/templates/tags/pagination.html:38
msgid "next"
msgstr "successivo"
@@ -910,36 +909,36 @@ msgid "Add exercises to this workout day"
msgstr "Aggiungi esercizi per questo giorno di allenamento"
#: core/templates/tags/render_weight_log.html:17 manager/helpers.py:86
-#: manager/models/setting.py:69 manager/templates/set/formset.html:9
+#: manager/models/setting.py:72 manager/templates/set/formset.html:9
msgid "Reps"
msgstr "Ripetizioni"
#: core/templates/tags/render_weight_log.html:30 manager/forms.py:191
-#: manager/models/log.py:103 manager/models/setting.py:99
+#: manager/models/log.py:103 manager/models/setting.py:102
#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
msgid "RiR"
msgstr "RiR"
-#: core/templates/template.html:120 manager/templates/calendar/month.html:138
-#: manager/templates/schedule/view.html:249
-#: manager/templates/schedule/view.html:270
-#: manager/templates/workout/view.html:86
-#: manager/templates/workout/view.html:139
+#: core/templates/template.html:122 manager/templates/calendar/month.html:138
+#: manager/templates/schedule/view.html:248
+#: manager/templates/schedule/view.html:269
+#: manager/templates/workout/view.html:84
+#: manager/templates/workout/view.html:137
msgid "Close"
msgstr "Chiudi"
-#: core/templates/template.html:136
+#: core/templates/template.html:138
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:141
+#: core/templates/template.html:143
msgid "Create some demo entries"
msgstr "Crea alcune voci demo"
-#: core/templates/template.html:178 software/templates/features.html:547
+#: core/templates/template.html:180 software/templates/features.html:547
#: software/templates/tos.html:7
msgid "Terms of service"
msgstr "Termini di servizio"
@@ -1041,7 +1040,7 @@ msgid "Overview"
msgstr "Panoramica"
#: core/templates/user/overview.html:28
-#: manager/templates/schedule/view.html:164
+#: manager/templates/schedule/view.html:163
#: manager/templates/workout/overview.html:39 manager/views/schedule_step.py:60
msgid "Add workout"
msgstr "Aggiungi allenamento"
@@ -1049,20 +1048,20 @@ msgstr "Aggiungi allenamento"
#: core/templates/user/overview.html:34 core/templates/user/overview.html:76
#: core/templates/user/overview.html:120 core/templates/user/overview.html:152
#: exercises/models/base.py:118 exercises/models/base.py:124
-#: exercises/models/exercise.py:63 exercises/models/exercise.py:69
+#: exercises/models/exercise.py:64 exercises/models/exercise.py:70
#: exercises/models/image.py:107 exercises/models/image.py:113
#: exercises/models/video.py:163 exercises/models/video.py:169
#: gallery/models/image.py:42 manager/helpers.py:85 manager/models/log.py:100
#: manager/models/session.py:67 measurements/models/measurement.py:47
-#: nutrition/models/ingredient.py:101 nutrition/models/ingredient.py:107
-#: nutrition/models/ingredient.py:222 weight/models.py:33
+#: nutrition/models/ingredient.py:87 nutrition/models/ingredient.py:93
+#: nutrition/models/ingredient.py:216 weight/models.py:51
#: weight/templates/import_csv_preview.html:13
#: weight/templates/import_csv_preview.html:42 weight/views.py:144
msgid "Date"
msgstr "Data"
#: core/templates/user/overview.html:35 core/templates/user/overview.html:153
-#: exercises/models/exercise.py:51 gallery/models/image.py:65
+#: exercises/models/exercise.py:52 gallery/models/image.py:65
#: gym/models/contract.py:58 gym/models/contract.py:109
#: manager/models/day.py:37 manager/models/workout.py:63
#: measurements/models/measurement.py:62 nutrition/models/plan.py:67
@@ -1080,13 +1079,13 @@ msgstr "Ultima attività"
#: core/templates/user/overview.html:58
#: manager/templates/calendar/month.html:128
-#: manager/templates/schedule/view.html:145
+#: manager/templates/schedule/view.html:144
#: manager/templates/workout/overview.html:28
msgid "No workouts found."
msgstr "Nessun allenamento trovato."
#: core/templates/user/overview.html:68 manager/forms.py:280
-#: manager/templates/workout/view.html:108
+#: manager/templates/workout/view.html:106
msgid "Log"
msgstr "Diario"
@@ -1110,35 +1109,35 @@ msgstr "Tempo"
#: core/templates/user/overview.html:112 core/templates/user/overview.html:121
#: manager/forms.py:186 manager/helpers.py:86 manager/models/log.py:86
-#: manager/models/setting.py:79 manager/templates/log/add.html:54
-#: manager/templates/set/formset.html:11 weight/models.py:35
+#: manager/models/setting.py:82 manager/templates/log/add.html:54
+#: manager/templates/set/formset.html:11 weight/models.py:53
#: weight/templates/import_csv_preview.html:14
#: weight/templates/import_csv_preview.html:43 weight/views.py:144
msgid "Weight"
msgstr "Peso"
-#: core/templates/user/overview.html:154 nutrition/models/ingredient.py:130
-#: nutrition/templates/ingredient/view.html:77 nutrition/views/plan.py:237
+#: core/templates/user/overview.html:154 nutrition/models/ingredient.py:116
+#: nutrition/templates/ingredient/view.html:51 nutrition/views/plan.py:237
msgid "Energy"
msgstr "Energie"
-#: core/templates/user/overview.html:155 nutrition/models/ingredient.py:137
-#: nutrition/templates/ingredient/view.html:84 nutrition/views/plan.py:243
+#: core/templates/user/overview.html:155 nutrition/models/ingredient.py:123
+#: nutrition/templates/ingredient/view.html:58 nutrition/views/plan.py:243
msgid "Protein"
msgstr "Proteine"
-#: core/templates/user/overview.html:156 nutrition/models/ingredient.py:145
-#: nutrition/templates/ingredient/view.html:90 nutrition/views/plan.py:251
+#: core/templates/user/overview.html:156 nutrition/models/ingredient.py:131
+#: nutrition/templates/ingredient/view.html:64 nutrition/views/plan.py:251
msgid "Carbohydrates"
msgstr "Carboidrati"
-#: core/templates/user/overview.html:157 nutrition/models/ingredient.py:163
-#: nutrition/templates/ingredient/view.html:106 nutrition/views/plan.py:265
+#: core/templates/user/overview.html:157 nutrition/models/ingredient.py:149
+#: nutrition/templates/ingredient/view.html:80 nutrition/views/plan.py:265
msgid "Fat"
msgstr "Grassi"
#: core/templates/user/overview.html:170
-#: nutrition/templates/ingredient/view.html:79
+#: nutrition/templates/ingredient/view.html:53
msgid "kcal"
msgstr "kcal"
@@ -1150,7 +1149,7 @@ msgstr "kcal"
#: gym/templates/gym/member_list.html:207
#: gym/templates/gym/member_list.html:240
#: gym/templates/gym/member_list.html:277
-#: manager/templates/schedule/view.html:101
+#: manager/templates/schedule/view.html:100
msgid "Actions"
msgstr "Azioni"
@@ -1193,7 +1192,7 @@ msgid "Details"
msgstr "Dettagli"
#: core/templates/user/overview.html:258 gym/views/export.py:57
-#: manager/helpers.py:86 manager/templates/schedule/view.html:99
+#: manager/helpers.py:86 manager/templates/schedule/view.html:98
msgid "Nr."
msgstr "Numero"
@@ -1238,7 +1237,7 @@ msgid "Documents"
msgstr "Documenti"
#: core/templates/user/overview.html:412 gym/templates/document/list.html:32
-#: manager/forms.py:292 manager/templates/workout/view.html:134
+#: manager/forms.py:292 manager/templates/workout/view.html:132
msgid "Download"
msgstr "Scarica"
@@ -1289,13 +1288,13 @@ msgid "kg"
msgstr "kg"
#: core/templatetags/wger_extras.py:207
-#: nutrition/templates/ingredient/view.html:86
-#: nutrition/templates/ingredient/view.html:92
-#: nutrition/templates/ingredient/view.html:99
-#: nutrition/templates/ingredient/view.html:108
-#: nutrition/templates/ingredient/view.html:115
-#: nutrition/templates/ingredient/view.html:137
-#: nutrition/templates/ingredient/view.html:147
+#: nutrition/templates/ingredient/view.html:60
+#: nutrition/templates/ingredient/view.html:66
+#: nutrition/templates/ingredient/view.html:73
+#: nutrition/templates/ingredient/view.html:82
+#: nutrition/templates/ingredient/view.html:89
+#: nutrition/templates/ingredient/view.html:111
+#: nutrition/templates/ingredient/view.html:121
msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr "g"
@@ -1313,7 +1312,7 @@ msgstr "oz"
#: exercises/views/equipment.py:103 exercises/views/exercises.py:73
#: exercises/views/muscles.py:99 manager/views/schedule.py:309
#: manager/views/schedule_step.py:128 manager/views/workout.py:249
-#: manager/views/workout_session.py:142 nutrition/views/ingredient.py:116
+#: manager/views/workout_session.py:142 nutrition/views/ingredient.py:119
#: nutrition/views/unit.py:110
msgid "Successfully deleted"
msgstr "Eliminato con successo"
@@ -1325,7 +1324,7 @@ msgstr "Eliminato con successo"
#: gym/views/admin_notes.py:196 gym/views/document.py:206 gym/views/gym.py:481
#: manager/views/schedule.py:316 manager/views/schedule_step.py:138
#: manager/views/workout.py:253 manager/views/workout_session.py:156
-#: nutrition/views/ingredient.py:123 nutrition/views/unit.py:117
+#: nutrition/views/ingredient.py:126 nutrition/views/unit.py:117
#, python-brace-format
msgid "Delete {0}?"
msgstr "Eliminare {0}?"
@@ -1338,7 +1337,7 @@ msgstr "Eliminare {0}?"
#: gym/views/contract.py:186 gym/views/contract_option.py:123
#: gym/views/contract_type.py:123 gym/views/document.py:171
#: gym/views/gym.py:463 manager/views/day.py:100 manager/views/schedule.py:333
-#: manager/views/workout.py:267 nutrition/views/ingredient.py:142
+#: manager/views/workout.py:267 nutrition/views/ingredient.py:145
#: nutrition/views/unit.py:143
#, python-brace-format
msgid "Edit {0}"
@@ -1413,7 +1412,7 @@ msgstr "Palestra"
msgid "A verification email was sent to %(email)s"
msgstr "Un'email di verifica è stata inviata a %(email)s"
-#: exercises/models/base.py:82 nutrition/models/ingredient.py:236
+#: exercises/models/base.py:82 nutrition/models/ingredient.py:230
msgid "Category"
msgstr "Categoria"
@@ -1433,7 +1432,7 @@ msgstr "Variazioni"
msgid "Exercise Categories"
msgstr "Categorie esercizi"
-#: exercises/models/comment.py:52 exercises/models/exercise_alias.py:52
+#: exercises/models/comment.py:52 exercises/models/exercise_alias.py:53
#: exercises/models/image.py:74 exercises/models/video.py:98
#: manager/forms.py:178 manager/helpers.py:86 manager/models/log.py:52
msgid "Exercise"
@@ -1443,12 +1442,12 @@ msgstr "Esercizio"
msgid "A comment about how to correctly do this exercise."
msgstr "Un commento su come eseguire correttamente l'esercizio."
-#: exercises/models/exercise.py:76 nutrition/models/ingredient.py:95
+#: exercises/models/exercise.py:77 nutrition/models/ingredient.py:81
#: nutrition/models/weight_unit.py:32
msgid "Language"
msgstr "Lingua"
-#: exercises/models/exercise_alias.py:58
+#: exercises/models/exercise_alias.py:59
msgid "Alias for an exercise"
msgstr "Sinonimo per un esercizio"
@@ -1581,7 +1580,7 @@ msgstr "Azione"
#: manager/models/schedule.py:44 manager/models/session.py:49
#: manager/models/workout.py:89 measurements/models/category.py:31
#: measurements/models/measurement.py:42 nutrition/models/plan.py:54
-#: nutrition/templates/ingredient/pending.html:16 weight/models.py:42
+#: weight/models.py:60
msgid "User"
msgstr "Utente"
@@ -1700,9 +1699,9 @@ msgid "Contract type"
msgstr "Tipo di contratto"
#: gym/models/contract.py:211 gym/templates/contract/view.html:59
-#: manager/templates/log/add.html:52 nutrition/forms.py:62
-#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:105
-#: nutrition/models/meal_item.py:72
+#: manager/templates/log/add.html:52 nutrition/forms.py:63
+#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:108
+#: nutrition/models/meal_item.py:73
msgid "Amount"
msgstr "Quantità"
@@ -1719,7 +1718,7 @@ msgid "Contract is active"
msgstr "Contratto è attivo"
#: gym/models/contract.py:237 gym/templates/contract/view.html:69
-#: manager/models/schedule.py:61 manager/templates/schedule/view.html:68
+#: manager/models/schedule.py:61 manager/templates/schedule/view.html:67
msgid "Start date"
msgstr "Data di partenza"
@@ -2111,7 +2110,7 @@ msgstr "Genera anteprima"
#: mailer/templates/mailer/gym/form.html:28
#: mailer/templates/mailer/gym/preview.html:62
-#: manager/templates/workout/view.html:42
+#: manager/templates/workout/view.html:40
msgid "Steps"
msgstr "Passi"
@@ -2135,7 +2134,7 @@ msgstr ""
"necessario prima di inviare le e-mail"
#: mailer/templates/mailer/gym/preview.html:22
-#: software/templates/about_us.html:60
+#: software/templates/about_us.html:70
msgid "Current version"
msgstr "Versione attuale"
@@ -2166,16 +2165,16 @@ msgid ""
"a superset."
msgstr "Puoi cercare più di un esercizio, saranno raggruppati in un Superset."
-#: manager/forms.py:140 nutrition/forms.py:252
+#: manager/forms.py:140 nutrition/forms.py:253
msgid "Also search for names in English"
msgstr "Usa anche i nomi in inglese"
#: manager/forms.py:168 manager/forms.py:173 manager/models/log.py:64
-#: manager/models/log.py:92 manager/models/setting.py:59
-#: manager/models/setting.py:90 manager/templates/log/add.html:53
+#: manager/models/log.py:92 manager/models/setting.py:62
+#: manager/models/setting.py:93 manager/templates/log/add.html:53
#: manager/templates/log/add.html:55 manager/templates/set/formset.html:10
#: manager/templates/set/formset.html:12 measurements/models/category.py:41
-#: nutrition/forms.py:66
+#: nutrition/forms.py:67
msgid "Unit"
msgstr "Unità"
@@ -2183,15 +2182,15 @@ msgstr "Unità"
msgid "Type"
msgstr "Tipo"
-#: manager/forms.py:280 manager/templates/workout/view.html:115
+#: manager/forms.py:280 manager/templates/workout/view.html:113
msgid "Table"
msgstr "Tabella"
-#: manager/forms.py:282 manager/templates/workout/view.html:121
+#: manager/forms.py:282 manager/templates/workout/view.html:119
msgid "with images"
msgstr "con immagini"
-#: manager/forms.py:283 manager/templates/workout/view.html:127
+#: manager/forms.py:283 manager/templates/workout/view.html:125
msgid "with comments"
msgstr "con commenti"
@@ -2200,11 +2199,10 @@ msgid "Workout will expire soon"
msgstr "L'allenamento scadrà presto"
#: manager/models/day.py:34 manager/models/log.py:58
-#: manager/models/session.py:60 manager/templates/schedule/view.html:103
-#: manager/templates/workout/view.html:11
-#: manager/templates/workout/view.html:19 manager/views/pdf.py:85
-#: manager/views/pdf.py:161 manager/views/schedule.py:151
-#: manager/views/schedule.py:221
+#: manager/models/session.py:60 manager/templates/schedule/view.html:102
+#: manager/templates/workout/view.html:9 manager/templates/workout/view.html:17
+#: manager/views/pdf.py:85 manager/views/pdf.py:161
+#: manager/views/schedule.py:151 manager/views/schedule.py:221
msgid "Workout"
msgstr "Allenamento"
@@ -2225,7 +2223,7 @@ msgid "Name or short description of the schedule. For example 'Program XYZ'."
msgstr ""
"Nome o breve descrizione della programmazione. Per esempio «Programma XYZ»."
-#: manager/models/schedule.py:65 manager/templates/schedule/view.html:72
+#: manager/models/schedule.py:65 manager/templates/schedule/view.html:71
msgid "Schedule active"
msgstr "Programmazione attiva"
@@ -2239,7 +2237,7 @@ msgstr ""
"mostrata ad esempio sul tuo cruscotto. Tutte le altre programmazioni sarà "
"poste a non attive"
-#: manager/models/schedule.py:77 manager/templates/schedule/view.html:82
+#: manager/models/schedule.py:77 manager/templates/schedule/view.html:81
msgid "Is a loop"
msgstr "È un ciclo"
@@ -2260,8 +2258,8 @@ msgid "The duration in weeks"
msgstr "Durata in settimane"
#: manager/models/schedule_step.py:64 manager/models/set.py:53
-#: manager/models/setting.py:110 nutrition/models/meal.py:55
-#: nutrition/models/meal_item.py:65
+#: manager/models/setting.py:113 nutrition/models/meal.py:55
+#: nutrition/models/meal_item.py:66
msgid "Order"
msgstr "Ordine"
@@ -2315,7 +2313,7 @@ msgstr "Giorno di allenamento"
msgid "Number of sets"
msgstr "Numero di serie"
-#: manager/models/setting.py:48
+#: manager/models/setting.py:51
msgid "Sets"
msgstr "Serie"
@@ -2392,7 +2390,7 @@ msgstr ""
msgid "Go to current month"
msgstr "Vai al mese attuale"
-#: manager/templates/calendar/month.html:188
+#: manager/templates/calendar/month.html:190
msgid "Add new log"
msgstr "Aggiorna diario di allenamento"
@@ -2432,8 +2430,8 @@ msgid "Your schedules"
msgstr "Le tue programmazioni"
#: manager/templates/schedule/overview.html:19
-#: manager/templates/schedule/view.html:132
-#: manager/templates/schedule/view.html:184
+#: manager/templates/schedule/view.html:131
+#: manager/templates/schedule/view.html:183
#: manager/templates/workout/overview.html:16
msgid "active"
msgstr "attivo"
@@ -2479,11 +2477,11 @@ msgstr ""
msgid "Add schedule"
msgstr "Aggiungi programmazione"
-#: manager/templates/schedule/view.html:10
+#: manager/templates/schedule/view.html:9
msgid "Schedule"
msgstr "Programmazione"
-#: manager/templates/schedule/view.html:86
+#: manager/templates/schedule/view.html:85
msgid ""
"This schedule is a loop and will go through the workouts above till you "
"deactivate it"
@@ -2491,19 +2489,19 @@ msgstr ""
"Questo programma è un ciclo e passerà attraverso gli allenamenti che vedi "
"sopra fino a quando non lo disattivi"
-#: manager/templates/schedule/view.html:104
+#: manager/templates/schedule/view.html:103
msgid "Weeks"
msgstr "Settimane"
-#: manager/templates/schedule/view.html:116
+#: manager/templates/schedule/view.html:115
msgid "Move me"
msgstr "Spostami"
-#: manager/templates/schedule/view.html:157
+#: manager/templates/schedule/view.html:156
msgid "Start schedule"
msgstr "Inizia programmazione"
-#: manager/templates/schedule/view.html:188
+#: manager/templates/schedule/view.html:187
#, python-format
msgid ""
"%(weeks)s Week\n"
@@ -2518,11 +2516,11 @@ msgstr[1] ""
"Settimane %(weeks)s\n"
" "
-#: manager/templates/schedule/view.html:222
+#: manager/templates/schedule/view.html:221
msgid "Adding workouts"
msgstr "Aggiungi allenamenti"
-#: manager/templates/schedule/view.html:224
+#: manager/templates/schedule/view.html:223
msgid ""
"Add as many workouts to the schedule as you want. You can\n"
" edit the order by dragging and dropping them. It's also possible "
@@ -2534,21 +2532,21 @@ msgstr ""
"possibile aggiungere un allenamento più\n"
" di una volta."
-#: manager/templates/schedule/view.html:233
-#: manager/templates/schedule/view.html:244
-#: manager/templates/schedule/view.html:291
-#: manager/templates/workout/view.html:71
-#: manager/templates/workout/view.html:81
-#: manager/templates/workout/view.html:180
+#: manager/templates/schedule/view.html:232
+#: manager/templates/schedule/view.html:243
+#: manager/templates/schedule/view.html:290
+#: manager/templates/workout/view.html:69
+#: manager/templates/workout/view.html:79
+#: manager/templates/workout/view.html:178
msgid "Export calendar file"
msgstr "Esporta il file del calendario"
-#: manager/templates/schedule/view.html:237
+#: manager/templates/schedule/view.html:236
msgid "Export this schedule as a calendar file."
msgstr "Esporta questo programma come un file di calendario."
-#: manager/templates/schedule/view.html:238
-#: manager/templates/workout/view.html:76
+#: manager/templates/schedule/view.html:237
+#: manager/templates/workout/view.html:74
msgid ""
"You can then import the file it into your calendar\n"
" application for example google calendar, outlook or "
@@ -2562,18 +2560,18 @@ msgstr ""
" un appuntamento per ogni giorno di allenamento con "
"gli esercizi appropriati."
-#: manager/templates/schedule/view.html:259
-#: manager/templates/schedule/view.html:295
-#: manager/templates/workout/view.html:96
-#: manager/templates/workout/view.html:176
+#: manager/templates/schedule/view.html:258
+#: manager/templates/schedule/view.html:294
+#: manager/templates/workout/view.html:94
+#: manager/templates/workout/view.html:174
msgid "Download as PDF"
msgstr "Scarica come PDF"
-#: manager/templates/schedule/view.html:300
+#: manager/templates/schedule/view.html:299
msgid "Edit schedule"
msgstr "Modifica programma"
-#: manager/templates/schedule/view.html:305
+#: manager/templates/schedule/view.html:304
msgid "Delete schedule"
msgstr "Elimina programma"
@@ -2718,12 +2716,12 @@ msgid "Mark as workout"
msgstr "Contrassegna come allenamento"
#: manager/templates/workout/template_view.html:65
-#: manager/templates/workout/view.html:51
+#: manager/templates/workout/view.html:49
msgid "Muscles trained"
msgstr "Muscoli allenati"
#: manager/templates/workout/template_view.html:68
-#: manager/templates/workout/view.html:54
+#: manager/templates/workout/view.html:52
msgid ""
"Images show combined muscles as trained by the exercises on the workout."
msgstr ""
@@ -2734,35 +2732,35 @@ msgstr ""
msgid "Use this template"
msgstr "Usa questo modello"
-#: manager/templates/workout/view.html:45
+#: manager/templates/workout/view.html:43
msgid "Add training days"
msgstr "Aggiungi giorni di allenamento"
-#: manager/templates/workout/view.html:46
+#: manager/templates/workout/view.html:44
msgid "Add workout sets to days"
msgstr "Aggiungi set allenamento a giorni"
-#: manager/templates/workout/view.html:47
+#: manager/templates/workout/view.html:45
msgid "Set the repetitions for each set"
msgstr "Imposta le ripetizioni per ciascun set"
-#: manager/templates/workout/view.html:75
+#: manager/templates/workout/view.html:73
msgid "Export this workout as a calendar file."
msgstr "Esporta questo allenamento come un file di calendario."
-#: manager/templates/workout/view.html:146
+#: manager/templates/workout/view.html:144
msgid "Logs"
msgstr "Records"
-#: manager/templates/workout/view.html:148
+#: manager/templates/workout/view.html:146
msgid "View logs"
msgstr "Guarda records"
-#: manager/templates/workout/view.html:171 manager/views/schedule_step.py:99
+#: manager/templates/workout/view.html:169 manager/views/schedule_step.py:99
msgid "Edit workout"
msgstr "Modifica allenamento"
-#: manager/templates/workout/view.html:184 manager/views/workout.py:281
+#: manager/templates/workout/view.html:182 manager/views/workout.py:281
msgid "Mark as template"
msgstr "Contrassegna come modello"
@@ -2809,35 +2807,35 @@ msgstr "Questo cancellerà anche tutti i log del peso per questo giorno."
msgid "Value"
msgstr "Valore"
-#: nutrition/forms.py:117
+#: nutrition/forms.py:118
msgid "Height (in)"
msgstr "Altezza (in)"
-#: nutrition/forms.py:120
+#: nutrition/forms.py:121
msgid "Weight (kg)"
msgstr "Peso (kg)"
-#: nutrition/forms.py:120
+#: nutrition/forms.py:121
msgid "Weight (lbs)"
msgstr "Peso (lbs)"
-#: nutrition/forms.py:133
+#: nutrition/forms.py:134
msgid "Calculate"
msgstr "Calcola"
-#: nutrition/forms.py:207 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:208 nutrition/templates/rate/form.html:76
msgid "Basic caloric intake"
msgstr "Assunzione calorica di base"
-#: nutrition/forms.py:208
+#: nutrition/forms.py:209
msgid "Your basic caloric intake as calculated for your data"
msgstr "Il tuo apporto calorico di base calcolato per i tuoi dati"
-#: nutrition/forms.py:213
+#: nutrition/forms.py:214
msgid "Additional calories"
msgstr "Calorie aggiuntive"
-#: nutrition/forms.py:215
+#: nutrition/forms.py:216
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
@@ -2845,71 +2843,55 @@ msgstr ""
"Calorie aggiuntive da aggiungere alla tariffa base (per sottrarre, inserire "
"un numero negativo)"
-#: nutrition/forms.py:248 nutrition/models/ingredient_weight_unit.py:39
-#: nutrition/models/log.py:84 nutrition/models/meal_item.py:53
+#: nutrition/forms.py:249 nutrition/models/ingredient_weight_unit.py:39
+#: nutrition/models/log.py:87 nutrition/models/meal_item.py:54
msgid "Ingredient"
msgstr "Alimenti"
-#: nutrition/models/ingredient.py:131
+#: nutrition/models/ingredient.py:117
msgid "In kcal per 100g"
msgstr "In kcal/100 g"
-#: nutrition/models/ingredient.py:138 nutrition/models/ingredient.py:146
-#: nutrition/models/ingredient.py:156 nutrition/models/ingredient.py:164
-#: nutrition/models/ingredient.py:174 nutrition/models/ingredient.py:184
-#: nutrition/models/ingredient.py:194
+#: nutrition/models/ingredient.py:124 nutrition/models/ingredient.py:132
+#: nutrition/models/ingredient.py:142 nutrition/models/ingredient.py:150
+#: nutrition/models/ingredient.py:160 nutrition/models/ingredient.py:170
+#: nutrition/models/ingredient.py:180
msgid "In g per 100g of product"
msgstr "In g per 100 g di prodotto"
-#: nutrition/models/ingredient.py:155
-#: nutrition/templates/ingredient/view.html:96 nutrition/views/plan.py:259
+#: nutrition/models/ingredient.py:141
+#: nutrition/templates/ingredient/view.html:70 nutrition/views/plan.py:259
msgid "Sugar content in carbohydrates"
msgstr "Zuccheri contenuti nei carboidrati"
-#: nutrition/models/ingredient.py:173
-#: nutrition/templates/ingredient/view.html:112 nutrition/views/plan.py:273
+#: nutrition/models/ingredient.py:159
+#: nutrition/templates/ingredient/view.html:86 nutrition/views/plan.py:273
msgid "Saturated fat content in fats"
msgstr "Grassi saturi contenuti nei grassi"
-#: nutrition/models/ingredient.py:183
-#: nutrition/templates/ingredient/view.html:134 nutrition/views/plan.py:279
-msgid "Fibres"
-msgstr "Fibre"
+#: nutrition/models/ingredient.py:169
+#: nutrition/templates/ingredient/view.html:108 nutrition/views/plan.py:279
+msgid "Fiber"
+msgstr ""
-#: nutrition/models/ingredient.py:193
-#: nutrition/templates/ingredient/view.html:144 nutrition/views/plan.py:285
+#: nutrition/models/ingredient.py:179
+#: nutrition/templates/ingredient/view.html:118 nutrition/views/plan.py:285
msgid "Sodium"
msgstr "Sodio"
-#: nutrition/models/ingredient.py:215
+#: nutrition/models/ingredient.py:209
msgid "Link to product"
msgstr "Collega al prodotto"
-#: nutrition/models/ingredient.py:244
+#: nutrition/models/ingredient.py:238
msgid "Brand name of product"
msgstr "Nome del produttore"
-#: nutrition/models/ingredient.py:304
+#: nutrition/models/ingredient.py:305
#, python-brace-format
msgid "The total energy ({self.energy}kcal) is not the approximate sum of the "
msgstr "L'energia totale ({self.energy}kcal) non è la somma approssimata di"
-#: nutrition/models/ingredient.py:383 nutrition/views/ingredient.py:196
-msgid "Ingredient was successfully added to the general database"
-msgstr "L'ingrediente è stato aggiunto con successo al database generale"
-
-#: nutrition/models/ingredient.py:408
-msgid "New user submitted ingredient"
-msgstr "Nuovo ingrediente presentato dall'utente"
-
-#: nutrition/models/ingredient.py:410
-#, python-brace-format
-msgid ""
-"The user {request.user.username} submitted a new ingredient \"{self.name}\"."
-msgstr ""
-"L'utente {request.user.username} ha inviato un nuovo ingrediente \"{self."
-"name}\"."
-
#: nutrition/models/ingredient_category.py:31
msgid "Ingredient Categories"
msgstr "Categorie ingredienti"
@@ -2922,16 +2904,16 @@ msgstr "Quantità in grammi"
msgid "Unit amount, e.g. \"1 Cup\" or \"1/2 spoon\""
msgstr "Importo unitario, ad es. «1 tazza» o «1/2 cucchiaio»"
-#: nutrition/models/log.py:49 nutrition/models/meal.py:50
-#: nutrition/models/meal_item.py:47 nutrition/models/plan.py:106
+#: nutrition/models/log.py:52 nutrition/models/meal.py:50
+#: nutrition/models/meal_item.py:48 nutrition/models/plan.py:108
msgid "Nutrition plan"
msgstr "Piano nutrizionale"
-#: nutrition/models/log.py:58
+#: nutrition/models/log.py:61
msgid "Meal"
msgstr "Pasto"
-#: nutrition/models/log.py:68
+#: nutrition/models/log.py:71
msgid "Date and Time (Approx.)"
msgstr "Data e Ora (Approssimative)"
@@ -2955,11 +2937,11 @@ msgstr ""
"Una descrizione dell'obiettivo del piano, ad es. «Guadagna massa» o "
"«Preparati per l'estate»"
-#: nutrition/models/plan.py:88
+#: nutrition/models/plan.py:90
msgid "Use daily calories"
msgstr "Usa calorie giornaliere"
-#: nutrition/models/plan.py:91
+#: nutrition/models/plan.py:93
msgid ""
"Tick the box if you want to mark this plan as having a goal amount of "
"calories. You can use the calculator or enter the value yourself."
@@ -3088,67 +3070,36 @@ msgstr "Ricerca"
msgid "Add ingredient"
msgstr "Aggiungi ingrediente"
-#: nutrition/templates/ingredient/pending.html:14
-msgid "Submission date"
-msgstr "Data di inserimento"
-
-#: nutrition/templates/ingredient/view.html:27
-msgid "Ingredient is pending review"
-msgstr "L'ingrediente è in attesa di revisione"
-
-#: nutrition/templates/ingredient/view.html:28
-msgid ""
-"This user submitted ingredient is pending a decision to be\n"
-"included in the database. Till then, it will not be shown in the overview "
-"or\n"
-"the search."
-msgstr ""
-"Questo ingrediente presentato dall'utente è in attesa di decisione\n"
-"incluso nel database. Fino ad allora, non sarà mostrato nella panoramica o\n"
-"la ricerca."
-
-#: nutrition/templates/ingredient/view.html:31
-msgid "Please select one of the options below."
-msgstr "Per favore seleziona una delle opzione specificate."
-
-#: nutrition/templates/ingredient/view.html:38
-msgid "Accept"
-msgstr "Accetta"
-
-#: nutrition/templates/ingredient/view.html:42
-msgid "Decline"
-msgstr "Rifiuta"
-
-#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:229
+#: nutrition/templates/ingredient/view.html:45 nutrition/views/plan.py:229
msgid "Macronutrients"
msgstr "Macronutrienti"
-#: nutrition/templates/ingredient/view.html:80
+#: nutrition/templates/ingredient/view.html:54
msgid "kJ"
msgstr "kJ"
-#: nutrition/templates/ingredient/view.html:101
-#: nutrition/templates/ingredient/view.html:117
-#: nutrition/templates/ingredient/view.html:139
-#: nutrition/templates/ingredient/view.html:149
+#: nutrition/templates/ingredient/view.html:75
+#: nutrition/templates/ingredient/view.html:91
+#: nutrition/templates/ingredient/view.html:113
+#: nutrition/templates/ingredient/view.html:123
msgid "n.A."
msgstr "n.D."
-#: nutrition/templates/ingredient/view.html:128
+#: nutrition/templates/ingredient/view.html:102
msgid "Others"
msgstr "Altri"
-#: nutrition/templates/ingredient/view.html:170
+#: nutrition/templates/ingredient/view.html:144
#: nutrition/templates/units/list.html:46 nutrition/views/unit.py:86
msgid "Add new weight unit"
msgstr "Aggiungi una nuova unità di peso"
-#: nutrition/templates/ingredient/view.html:232
-#: nutrition/templates/ingredient/view.html:235
+#: nutrition/templates/ingredient/view.html:206
+#: nutrition/templates/ingredient/view.html:209
msgid "Edit ingredient"
msgstr "Modifica ingrediente"
-#: nutrition/templates/ingredient/view.html:239
+#: nutrition/templates/ingredient/view.html:213
msgid "Delete ingredient"
msgstr "Cancella ingrediente"
@@ -3251,14 +3202,10 @@ msgstr "140 a 230"
msgid "56 to 90"
msgstr "56 a 90"
-#: nutrition/views/ingredient.py:154
+#: nutrition/views/ingredient.py:157
msgid "Add a new ingredient"
msgstr "Aggiungi un nuovo ingrediente"
-#: nutrition/views/ingredient.py:209
-msgid "Ingredient was successfully marked as rejected"
-msgstr "L'ingrediente è stato contrassegnato con successo come rifiutato"
-
#: nutrition/views/plan.py:120
msgid "Nutritional plan"
msgstr "Piano nutrizionale"
@@ -3305,19 +3252,10 @@ msgstr ""
"realizzato da appassionati di fitness di tutto il mondo."
#: software/templates/about_us.html:18
-msgid "Source code"
-msgstr "Codice sorgente"
-
-#: software/templates/about_us.html:20
-msgid "Get the source code of this application and its server on github"
-msgstr ""
-"Ottieni il codice sorgente di questa applicazione e del suo server su GitHub"
-
-#: software/templates/about_us.html:25
msgid "Have a problem or idea?"
msgstr "Hai un problema o un'idea?"
-#: software/templates/about_us.html:27
+#: software/templates/about_us.html:20
msgid ""
"Get in touch if something didn't behave as expected or if there is a feature "
"that you feel is missing."
@@ -3325,21 +3263,29 @@ msgstr ""
"Contattaci se qualcosa non ha funzionato come previsto o se c'è una "
"funzionalità che ritieni mancante."
-#: software/templates/about_us.html:32
+#: software/templates/about_us.html:26
msgid "Say hi!"
msgstr "Dì ciao!"
-#: software/templates/about_us.html:34
+#: software/templates/about_us.html:28
msgid "If you want to chat with us, hop on the Discord server and get in touch"
msgstr ""
"Se vuoi chattare con noi, raggiungici sul server Discord e mettiti in "
"contatto"
-#: software/templates/about_us.html:39 software/templates/features.html:503
+#: software/templates/about_us.html:33
+msgid "Mastodon"
+msgstr ""
+
+#: software/templates/about_us.html:35
+msgid "Follow us on mastodon for updates and news about the project"
+msgstr ""
+
+#: software/templates/about_us.html:40 software/templates/features.html:503
msgid "Translation"
msgstr "Traduzione"
-#: software/templates/about_us.html:41
+#: software/templates/about_us.html:42
msgid ""
"This application is translated on weblate. If you also want to help, click "
"the link and start translating"
@@ -3347,15 +3293,31 @@ msgstr ""
"Questa applicazione è tradotta su weblate. Se vuoi aiutare anche tu, clicca "
"sul link e inizia a tradurre"
-#: software/templates/about_us.html:50
+#: software/templates/about_us.html:47
+msgid "Source code"
+msgstr "Codice sorgente"
+
+#: software/templates/about_us.html:49
+msgid "Get the source code of this application and its server on github"
+msgstr ""
+"Ottieni il codice sorgente di questa applicazione e del suo server su GitHub"
+
+#: software/templates/about_us.html:59
msgid "Our goal"
msgstr "Il nostro obbiettivo"
-#: software/templates/about_us.html:53
+#: software/templates/about_us.html:62
+#, fuzzy
+#| msgid ""
+#| "The goal is to build an awesome\n"
+#| " and flexible fitness manager, along with a comprehensive "
+#| "and complete list of exercises and\n"
+#| " ingredients, all released under a free license."
msgid ""
"The goal is to build an awesome\n"
" and flexible fitness manager, along with a comprehensive and "
-"complete list of exercises and\n"
+"complete list of\n"
+" exercises and\n"
" ingredients, all released under a free license."
msgstr ""
"L'obiettivo è costruire un fantastico\n"
@@ -3371,10 +3333,6 @@ msgstr ""
"wger Workout Manager è un'applicazione web gratuita e open source che "
"gestisce gli esercizi e gli allenamenti."
-#: software/templates/features.html:45
-msgid "About"
-msgstr "Informazioni"
-
#: software/templates/features.html:57
msgid "Mobile app"
msgstr "App mobile"
@@ -3634,18 +3592,6 @@ msgstr ""
"un'opera precedente, ma che contiene anche contenuti nuovi e creativi a "
"sufficienza per darle diritto al proprio copyright."
-#: utils/models.py:130
-msgid "Pending"
-msgstr "In attesa"
-
-#: utils/models.py:131
-msgid "Accepted"
-msgstr "Accettato"
-
-#: utils/models.py:132
-msgid "Declined"
-msgstr "Rifiutato"
-
#: weight/forms.py:54
msgid "Input"
msgstr "Immisione"
@@ -3658,7 +3604,7 @@ msgstr "Formato data"
msgid "You have to enter your weight"
msgstr "Devi inserire il tuo peso"
-#: weight/models.py:60
+#: weight/models.py:78
msgid "Weight entry"
msgstr "Voce del peso"
@@ -3801,6 +3747,67 @@ msgstr "Cancellato con successo."
msgid "Delete weight entry for the %s"
msgstr "Cancellato il peso inserito di %s"
+#~ msgid "Ingredients pending review"
+#~ msgstr "Ingredienti in attesa di revisione"
+
+#~ msgid "Fibres"
+#~ msgstr "Fibre"
+
+#~ msgid "Ingredient was successfully added to the general database"
+#~ msgstr "L'ingrediente è stato aggiunto con successo al database generale"
+
+#~ msgid "New user submitted ingredient"
+#~ msgstr "Nuovo ingrediente presentato dall'utente"
+
+#, python-brace-format
+#~ msgid ""
+#~ "The user {request.user.username} submitted a new ingredient \"{self."
+#~ "name}\"."
+#~ msgstr ""
+#~ "L'utente {request.user.username} ha inviato un nuovo ingrediente \"{self."
+#~ "name}\"."
+
+#~ msgid "Submission date"
+#~ msgstr "Data di inserimento"
+
+#~ msgid "Ingredient is pending review"
+#~ msgstr "L'ingrediente è in attesa di revisione"
+
+#~ msgid ""
+#~ "This user submitted ingredient is pending a decision to be\n"
+#~ "included in the database. Till then, it will not be shown in the overview "
+#~ "or\n"
+#~ "the search."
+#~ msgstr ""
+#~ "Questo ingrediente presentato dall'utente è in attesa di decisione\n"
+#~ "incluso nel database. Fino ad allora, non sarà mostrato nella panoramica "
+#~ "o\n"
+#~ "la ricerca."
+
+#~ msgid "Please select one of the options below."
+#~ msgstr "Per favore seleziona una delle opzione specificate."
+
+#~ msgid "Accept"
+#~ msgstr "Accetta"
+
+#~ msgid "Decline"
+#~ msgstr "Rifiuta"
+
+#~ msgid "Ingredient was successfully marked as rejected"
+#~ msgstr "L'ingrediente è stato contrassegnato con successo come rifiutato"
+
+#~ msgid "About"
+#~ msgstr "Informazioni"
+
+#~ msgid "Pending"
+#~ msgstr "In attesa"
+
+#~ msgid "Accepted"
+#~ msgstr "Accettato"
+
+#~ msgid "Declined"
+#~ msgstr "Rifiutato"
+
#~ msgid "Share"
#~ msgstr "Condividi"
diff --git a/wger/locale/ja/LC_MESSAGES/django.po b/wger/locale/ja/LC_MESSAGES/django.po
index 20b6f8451..ef935a589 100644
--- a/wger/locale/ja/LC_MESSAGES/django.po
+++ b/wger/locale/ja/LC_MESSAGES/django.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: wger Workout Manager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-02-02 12:42+0100\n"
+"POT-Creation-Date: 2024-07-14 15:49+0200\n"
"PO-Revision-Date: 2023-12-27 14:07+0000\n"
"Last-Translator: sasukeiscool <[email protected]>\n"
"Language-Team: Japanese <https://hosted.weblate.org/projects/wger/web/ja/>\n"
@@ -32,7 +32,7 @@ msgid ""
"registered users to this gym and update all existing users without a gym."
msgstr ""
-#: config/views/gym_config.py:42 core/templates/language/view.html:63
+#: config/views/gym_config.py:42 core/templates/language/view.html:67
#: core/templates/license/list.html:17 core/templates/misc/license/list.html:18
#: core/templates/repetition_unit/list.html:18
#: core/templates/tags/render_day.html:39
@@ -52,8 +52,8 @@ msgstr ""
#: manager/templates/calendar/day.html:68
#: manager/templates/calendar/month.html:85
#: manager/templates/calendar/partial_overview_table.html:18
-#: manager/templates/schedule/view.html:119
-#: nutrition/templates/ingredient/view.html:191
+#: manager/templates/schedule/view.html:118
+#: nutrition/templates/ingredient/view.html:165
#: nutrition/templates/units/list.html:19
msgid "Edit"
msgstr "編集"
@@ -87,8 +87,8 @@ msgstr ""
msgid "Empty placeholder schedule"
msgstr ""
-#: core/forms.py:69 core/templates/navigation.html:275
-#: core/templates/navigation.html:281 core/templates/user/login.html:4
+#: core/forms.py:69 core/templates/navigation.html:285
+#: core/templates/navigation.html:291 core/templates/user/login.html:4
#: software/templates/features.html:82 software/templates/features.html:427
msgid "Login"
msgstr "ログイン"
@@ -160,7 +160,7 @@ msgstr "パスワード"
msgid "Please enter your current password."
msgstr "現在のパスワードを入力してください。"
-#: core/forms.py:242 core/templates/language/view.html:68
+#: core/forms.py:242 core/templates/language/view.html:73
#: core/templates/license/list.html:19 core/templates/misc/license/list.html:22
#: core/templates/repetition_unit/list.html:20
#: core/templates/tags/render_day.html:45
@@ -175,10 +175,10 @@ msgstr "現在のパスワードを入力してください。"
#: gym/templates/gym/list.html:22 manager/templates/calendar/day.html:73
#: manager/templates/calendar/month.html:89
#: manager/templates/calendar/partial_overview_table.html:23
-#: manager/templates/schedule/view.html:123
-#: manager/templates/workout/view.html:190
-#: nutrition/templates/ingredient/view.html:192
-#: nutrition/templates/ingredient/view.html:241
+#: manager/templates/schedule/view.html:122
+#: manager/templates/workout/view.html:188
+#: nutrition/templates/ingredient/view.html:166
+#: nutrition/templates/ingredient/view.html:215
#: nutrition/templates/units/list.html:22
msgid "Delete"
msgstr "削除"
@@ -191,14 +191,14 @@ msgstr "パスワードは無効です。"
msgid "The form is secured with reCAPTCHA"
msgstr ""
-#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:275
-#: core/templates/navigation.html:287 core/templates/template.html:147
+#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:285
+#: core/templates/navigation.html:297 core/templates/template.html:149
#: core/templates/user/login.html:20 core/views/user.py:298
#: software/templates/features.html:87 software/templates/features.html:422
msgid "Register"
msgstr "登録"
-#: core/forms.py:315
+#: core/forms.py:315 software/templates/features.html:45
msgid "Contact"
msgstr "問い合わせ"
@@ -207,7 +207,7 @@ msgid "Some way of answering you (e-mail, etc.)"
msgstr ""
#: core/forms.py:324 exercises/models/comment.py:58 manager/models/set.py:61
-#: manager/models/setting.py:111 nutrition/models/log.py:74
+#: manager/models/setting.py:114 nutrition/models/log.py:77
msgid "Comment"
msgstr "コメント"
@@ -227,6 +227,12 @@ msgstr "言語省略名"
msgid "Language full name"
msgstr "言語正式名"
+#: core/models/language.py:45 core/templates/language/view.html:23
+#, fuzzy
+#| msgid "Language full name"
+msgid "Language full name in English"
+msgstr "言語正式名"
+
#: core/models/license.py:29
msgid "Full name"
msgstr ""
@@ -241,7 +247,7 @@ msgstr ""
msgid "Short name, e.g. CC-BY-SA 3"
msgstr ""
-#: core/models/license.py:45 nutrition/models/ingredient.py:214
+#: core/models/license.py:45 nutrition/models/ingredient.py:208
msgid "Link"
msgstr "リンク"
@@ -344,7 +350,7 @@ msgstr ""
msgid "Age"
msgstr "年齢"
-#: core/models/profile.py:230 nutrition/forms.py:117
+#: core/models/profile.py:230 nutrition/forms.py:118
msgid "Height (cm)"
msgstr "身長(cm)"
@@ -395,7 +401,7 @@ msgid "Total caloric intake, including e.g. any surplus"
msgstr ""
#: core/models/profile.py:333 nutrition/models/ingredient_weight_unit.py:45
-#: nutrition/models/log.py:93 nutrition/models/meal_item.py:58
+#: nutrition/models/log.py:96 nutrition/models/meal_item.py:59
msgid "Weight unit"
msgstr "体重の単位"
@@ -424,17 +430,16 @@ msgstr ""
#: core/models/rep_unit.py:36 core/models/weight_unit.py:36
#: core/templates/user/overview.html:262 core/views/user.py:599
#: exercises/models/category.py:29 exercises/models/equipment.py:29
-#: exercises/models/exercise.py:58 exercises/models/muscle.py:36
+#: exercises/models/exercise.py:59 exercises/models/muscle.py:36
#: gym/models/contract.py:52 gym/models/contract.py:103 gym/models/gym.py:46
#: gym/models/user_document.py:84 gym/templates/contract/view.html:50
#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:96
#: gym/views/gym.py:158 manager/models/schedule.py:55
#: manager/models/workout.py:57 measurements/models/category.py:36
-#: nutrition/models/ingredient.py:125
+#: nutrition/models/ingredient.py:111
#: nutrition/models/ingredient_category.py:27 nutrition/models/meal.py:67
#: nutrition/models/weight_unit.py:38
-#: nutrition/templates/ingredient/pending.html:15
-#: nutrition/templates/ingredient/view.html:178
+#: nutrition/templates/ingredient/view.html:152
msgid "Name"
msgstr ""
@@ -535,24 +540,24 @@ msgstr ""
msgid "Dashboard"
msgstr "ダッシュボード"
-#: core/templates/language/overview.html:4 core/templates/navigation.html:335
+#: core/templates/language/overview.html:4 core/templates/navigation.html:345
msgid "Languages"
msgstr "言語"
-#: core/templates/language/overview.html:20
+#: core/templates/language/overview.html:22
msgid "Nothing found."
msgstr ""
-#: core/templates/language/overview.html:20
+#: core/templates/language/overview.html:22
#: manager/templates/calendar/month.html:132
#: manager/templates/schedule/overview.html:28
-#: manager/templates/schedule/view.html:145
+#: manager/templates/schedule/view.html:144
#: manager/templates/workout/overview.html:28
#: nutrition/templates/ingredient/overview.html:38
msgid "Add one now."
msgstr "今すぐ追加する"
-#: core/templates/language/overview.html:33 core/templates/license/list.html:40
+#: core/templates/language/overview.html:35 core/templates/license/list.html:40
#: core/templates/misc/license/list.html:43
#: core/templates/repetition_unit/list.html:43
#: core/templates/user/overview.html:326 core/templates/user/overview.html:365
@@ -572,13 +577,13 @@ msgstr "今すぐ追加する"
msgid "Add"
msgstr "追加"
-#: core/templates/language/view.html:58 core/templates/user/api_key.html:44
+#: core/templates/language/view.html:61 core/templates/user/api_key.html:44
#: core/templates/user/preferences.html:45 gym/models/contract.py:203
#: gym/templates/contract/view.html:41 gym/templates/contract/view.html:106
#: gym/templates/gym/member_list.html:248
-#: manager/templates/schedule/view.html:286
-#: manager/templates/workout/view.html:165
-#: nutrition/templates/ingredient/view.html:228
+#: manager/templates/schedule/view.html:285
+#: manager/templates/workout/view.html:163
+#: nutrition/templates/ingredient/view.html:202
msgid "Options"
msgstr "オプション"
@@ -603,12 +608,11 @@ msgstr ""
#: gym/templates/gym/member_list.html:299
#: mailer/templates/mailer/gym/overview.html:30
#: manager/templates/calendar/day.html:87
-#: nutrition/templates/ingredient/pending.html:30
#: nutrition/templates/units/list.html:29
msgid "Nothing found"
msgstr ""
-#: core/templates/misc/about.html:4 core/templates/template.html:173
+#: core/templates/misc/about.html:4 core/templates/template.html:175
msgid "Imprint"
msgstr ""
@@ -619,176 +623,171 @@ msgid ""
"entries here."
msgstr ""
-#: core/templates/navigation.html:27 software/templates/features.html:437
+#: core/templates/navigation.html:28 software/templates/features.html:437
msgid "Training"
msgstr ""
-#: core/templates/navigation.html:34 core/templates/user/overview.html:25
+#: core/templates/navigation.html:37 core/templates/user/overview.html:25
msgid "Workouts"
msgstr ""
-#: core/templates/navigation.html:42
+#: core/templates/navigation.html:46
msgid "Workouts schedules"
msgstr ""
-#: core/templates/navigation.html:50 core/templates/user/overview.html:70
+#: core/templates/navigation.html:54 core/templates/user/overview.html:70
#: manager/templates/calendar/month.html:10
#: manager/templates/calendar/month.html:21
msgid "Calendar"
msgstr "カレンダー"
-#: core/templates/navigation.html:60
+#: core/templates/navigation.html:64
msgid "Measurements"
msgstr ""
-#: core/templates/navigation.html:70 gallery/templates/images/overview.html:6
+#: core/templates/navigation.html:75 gallery/templates/images/overview.html:6
msgid "Gallery"
msgstr ""
-#: core/templates/navigation.html:76
+#: core/templates/navigation.html:81
msgid "Workout templates"
msgstr ""
-#: core/templates/navigation.html:82 manager/views/workout.py:84
+#: core/templates/navigation.html:88 manager/views/workout.py:84
msgid "Your templates"
msgstr ""
-#: core/templates/navigation.html:90 manager/views/workout.py:98
+#: core/templates/navigation.html:97 manager/views/workout.py:98
msgid "Public templates"
msgstr ""
-#: core/templates/navigation.html:97 manager/forms.py:129
-#: manager/models/setting.py:54 software/templates/features.html:51
+#: core/templates/navigation.html:105 manager/forms.py:129
+#: manager/models/setting.py:57 software/templates/features.html:51
#: software/templates/features.html:459
msgid "Exercises"
msgstr "運動"
-#: core/templates/navigation.html:103 core/templates/navigation.html:170
-#: core/templates/navigation.html:330
+#: core/templates/navigation.html:111 core/templates/navigation.html:184
+#: core/templates/navigation.html:340
msgid "Administration"
msgstr ""
-#: core/templates/navigation.html:106
+#: core/templates/navigation.html:115
#, fuzzy
#| msgid "Exercises"
msgid "Exercise edit history"
msgstr "運動"
-#: core/templates/navigation.html:111 exercises/models/base.py:103
+#: core/templates/navigation.html:121 exercises/models/base.py:103
msgid "Equipment"
msgstr ""
-#: core/templates/navigation.html:116
+#: core/templates/navigation.html:127
msgid "Muscles"
msgstr "筋肉"
-#: core/templates/navigation.html:121
+#: core/templates/navigation.html:133
#: exercises/templates/categories/admin-overview.html:4
msgid "Categories"
msgstr ""
-#: core/templates/navigation.html:136 software/templates/features.html:447
+#: core/templates/navigation.html:148 software/templates/features.html:447
msgid "Nutrition"
msgstr ""
-#: core/templates/navigation.html:143 core/templates/user/overview.html:144
+#: core/templates/navigation.html:156 core/templates/user/overview.html:144
msgid "Nutrition plans"
msgstr ""
-#: core/templates/navigation.html:151 nutrition/templates/bmi/form.html:50
+#: core/templates/navigation.html:165 nutrition/templates/bmi/form.html:50
msgid "BMI calculator"
msgstr "BMI計算"
-#: core/templates/navigation.html:159 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:174 nutrition/templates/rate/form.html:17
msgid "Daily calories calculator"
msgstr ""
-#: core/templates/navigation.html:165
+#: core/templates/navigation.html:179
#: nutrition/templates/ingredient/overview.html:10
msgid "Ingredient overview"
msgstr ""
-#: core/templates/navigation.html:172 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:187 nutrition/templates/units/list.html:6
msgid "Ingredient weight units"
msgstr ""
-#: core/templates/navigation.html:177
-#: nutrition/templates/ingredient/pending.html:6
-msgid "Ingredients pending review"
-msgstr ""
-
-#: core/templates/navigation.html:193 software/templates/features.html:442
+#: core/templates/navigation.html:203 software/templates/features.html:442
msgid "Body weight"
msgstr ""
-#: core/templates/navigation.html:200 core/templates/user/overview.html:114
+#: core/templates/navigation.html:210 core/templates/user/overview.html:114
msgid "Weight overview"
msgstr ""
-#: core/templates/navigation.html:207 weight/views.py:65
+#: core/templates/navigation.html:217 weight/views.py:65
msgid "Add weight entry"
msgstr ""
-#: core/templates/navigation.html:221
+#: core/templates/navigation.html:231
msgid "About this software"
msgstr ""
-#: core/templates/navigation.html:227 software/templates/about_us.html:5
+#: core/templates/navigation.html:237 software/templates/about_us.html:5
msgid "About us"
msgstr ""
-#: core/templates/navigation.html:233 software/templates/features.html:507
+#: core/templates/navigation.html:243 software/templates/features.html:507
msgid "REST API"
msgstr ""
-#: core/templates/navigation.html:239 utils/models.py:45
+#: core/templates/navigation.html:249 utils/models.py:45
msgid "License"
msgstr "ライセンス"
-#: core/templates/navigation.html:245
+#: core/templates/navigation.html:255
msgid "Developer documentation"
msgstr ""
-#: core/templates/navigation.html:252
+#: core/templates/navigation.html:262
msgid "Get the code"
msgstr ""
-#: core/templates/navigation.html:259 core/templates/template.html:212
+#: core/templates/navigation.html:269 core/templates/template.html:214
#: software/templates/features.html:582
msgid "Translate"
msgstr "翻訳"
-#: core/templates/navigation.html:293 core/templates/user/login.html:28
+#: core/templates/navigation.html:303 core/templates/user/login.html:28
msgid "Reset password"
msgstr "パスワード再設定"
-#: core/templates/navigation.html:311
+#: core/templates/navigation.html:321
msgid "My preferences"
msgstr ""
-#: core/templates/navigation.html:320
+#: core/templates/navigation.html:330
msgid "Logout"
msgstr "ロッグアウト"
-#: core/templates/navigation.html:343
+#: core/templates/navigation.html:353
msgid "Licenses"
msgstr ""
-#: core/templates/navigation.html:351
+#: core/templates/navigation.html:361
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr ""
-#: core/templates/navigation.html:359 core/templates/weight_unit/list.html:4
-#: nutrition/templates/ingredient/view.html:167
+#: core/templates/navigation.html:369 core/templates/weight_unit/list.html:4
+#: nutrition/templates/ingredient/view.html:141
msgid "Weight units"
msgstr ""
-#: core/templates/navigation.html:367 core/templates/user/list.html:4
+#: core/templates/navigation.html:377 core/templates/user/list.html:4
msgid "User list"
msgstr ""
-#: core/templates/navigation.html:373
+#: core/templates/navigation.html:383
msgid "Gyms"
msgstr ""
@@ -838,12 +837,12 @@ msgstr ""
msgid "The %(site_name)s team"
msgstr ""
-#: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:11
+#: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:12
msgid "previous"
msgstr ""
-#: core/templates/tags/pagination.html:31
-#: core/templates/tags/pagination.html:35
+#: core/templates/tags/pagination.html:33
+#: core/templates/tags/pagination.html:38
msgid "next"
msgstr ""
@@ -868,34 +867,34 @@ msgid "Add exercises to this workout day"
msgstr ""
#: core/templates/tags/render_weight_log.html:17 manager/helpers.py:86
-#: manager/models/setting.py:69 manager/templates/set/formset.html:9
+#: manager/models/setting.py:72 manager/templates/set/formset.html:9
msgid "Reps"
msgstr "回"
#: core/templates/tags/render_weight_log.html:30 manager/forms.py:191
-#: manager/models/log.py:103 manager/models/setting.py:99
+#: manager/models/log.py:103 manager/models/setting.py:102
#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
msgid "RiR"
msgstr ""
-#: core/templates/template.html:120 manager/templates/calendar/month.html:138
-#: manager/templates/schedule/view.html:249
-#: manager/templates/schedule/view.html:270
-#: manager/templates/workout/view.html:86
-#: manager/templates/workout/view.html:139
+#: core/templates/template.html:122 manager/templates/calendar/month.html:138
+#: manager/templates/schedule/view.html:248
+#: manager/templates/schedule/view.html:269
+#: manager/templates/workout/view.html:84
+#: manager/templates/workout/view.html:137
msgid "Close"
msgstr "閉じる"
-#: core/templates/template.html:136
+#: core/templates/template.html:138
msgid ""
"You are using a guest account, data entered will be deleted after a week."
msgstr ""
-#: core/templates/template.html:141
+#: core/templates/template.html:143
msgid "Create some demo entries"
msgstr ""
-#: core/templates/template.html:178 software/templates/features.html:547
+#: core/templates/template.html:180 software/templates/features.html:547
#: software/templates/tos.html:7
msgid "Terms of service"
msgstr "使用条件"
@@ -987,7 +986,7 @@ msgid "Overview"
msgstr ""
#: core/templates/user/overview.html:28
-#: manager/templates/schedule/view.html:164
+#: manager/templates/schedule/view.html:163
#: manager/templates/workout/overview.html:39 manager/views/schedule_step.py:60
msgid "Add workout"
msgstr "ワークアウトを追加する"
@@ -995,20 +994,20 @@ msgstr "ワークアウトを追加する"
#: core/templates/user/overview.html:34 core/templates/user/overview.html:76
#: core/templates/user/overview.html:120 core/templates/user/overview.html:152
#: exercises/models/base.py:118 exercises/models/base.py:124
-#: exercises/models/exercise.py:63 exercises/models/exercise.py:69
+#: exercises/models/exercise.py:64 exercises/models/exercise.py:70
#: exercises/models/image.py:107 exercises/models/image.py:113
#: exercises/models/video.py:163 exercises/models/video.py:169
#: gallery/models/image.py:42 manager/helpers.py:85 manager/models/log.py:100
#: manager/models/session.py:67 measurements/models/measurement.py:47
-#: nutrition/models/ingredient.py:101 nutrition/models/ingredient.py:107
-#: nutrition/models/ingredient.py:222 weight/models.py:33
+#: nutrition/models/ingredient.py:87 nutrition/models/ingredient.py:93
+#: nutrition/models/ingredient.py:216 weight/models.py:51
#: weight/templates/import_csv_preview.html:13
#: weight/templates/import_csv_preview.html:42 weight/views.py:144
msgid "Date"
msgstr "日付"
#: core/templates/user/overview.html:35 core/templates/user/overview.html:153
-#: exercises/models/exercise.py:51 gallery/models/image.py:65
+#: exercises/models/exercise.py:52 gallery/models/image.py:65
#: gym/models/contract.py:58 gym/models/contract.py:109
#: manager/models/day.py:37 manager/models/workout.py:63
#: measurements/models/measurement.py:62 nutrition/models/plan.py:67
@@ -1026,13 +1025,13 @@ msgstr ""
#: core/templates/user/overview.html:58
#: manager/templates/calendar/month.html:128
-#: manager/templates/schedule/view.html:145
+#: manager/templates/schedule/view.html:144
#: manager/templates/workout/overview.html:28
msgid "No workouts found."
msgstr ""
#: core/templates/user/overview.html:68 manager/forms.py:280
-#: manager/templates/workout/view.html:108
+#: manager/templates/workout/view.html:106
msgid "Log"
msgstr ""
@@ -1056,35 +1055,35 @@ msgstr ""
#: core/templates/user/overview.html:112 core/templates/user/overview.html:121
#: manager/forms.py:186 manager/helpers.py:86 manager/models/log.py:86
-#: manager/models/setting.py:79 manager/templates/log/add.html:54
-#: manager/templates/set/formset.html:11 weight/models.py:35
+#: manager/models/setting.py:82 manager/templates/log/add.html:54
+#: manager/templates/set/formset.html:11 weight/models.py:53
#: weight/templates/import_csv_preview.html:14
#: weight/templates/import_csv_preview.html:43 weight/views.py:144
msgid "Weight"
msgstr "体重"
-#: core/templates/user/overview.html:154 nutrition/models/ingredient.py:130
-#: nutrition/templates/ingredient/view.html:77 nutrition/views/plan.py:237
+#: core/templates/user/overview.html:154 nutrition/models/ingredient.py:116
+#: nutrition/templates/ingredient/view.html:51 nutrition/views/plan.py:237
msgid "Energy"
msgstr "エネルギー"
-#: core/templates/user/overview.html:155 nutrition/models/ingredient.py:137
-#: nutrition/templates/ingredient/view.html:84 nutrition/views/plan.py:243
+#: core/templates/user/overview.html:155 nutrition/models/ingredient.py:123
+#: nutrition/templates/ingredient/view.html:58 nutrition/views/plan.py:243
msgid "Protein"
msgstr "タンパク質"
-#: core/templates/user/overview.html:156 nutrition/models/ingredient.py:145
-#: nutrition/templates/ingredient/view.html:90 nutrition/views/plan.py:251
+#: core/templates/user/overview.html:156 nutrition/models/ingredient.py:131
+#: nutrition/templates/ingredient/view.html:64 nutrition/views/plan.py:251
msgid "Carbohydrates"
msgstr "炭水化物"
-#: core/templates/user/overview.html:157 nutrition/models/ingredient.py:163
-#: nutrition/templates/ingredient/view.html:106 nutrition/views/plan.py:265
+#: core/templates/user/overview.html:157 nutrition/models/ingredient.py:149
+#: nutrition/templates/ingredient/view.html:80 nutrition/views/plan.py:265
msgid "Fat"
msgstr "脂肪質"
#: core/templates/user/overview.html:170
-#: nutrition/templates/ingredient/view.html:79
+#: nutrition/templates/ingredient/view.html:53
msgid "kcal"
msgstr "kcal"
@@ -1096,7 +1095,7 @@ msgstr "kcal"
#: gym/templates/gym/member_list.html:207
#: gym/templates/gym/member_list.html:240
#: gym/templates/gym/member_list.html:277
-#: manager/templates/schedule/view.html:101
+#: manager/templates/schedule/view.html:100
msgid "Actions"
msgstr ""
@@ -1139,7 +1138,7 @@ msgid "Details"
msgstr ""
#: core/templates/user/overview.html:258 gym/views/export.py:57
-#: manager/helpers.py:86 manager/templates/schedule/view.html:99
+#: manager/helpers.py:86 manager/templates/schedule/view.html:98
msgid "Nr."
msgstr ""
@@ -1184,7 +1183,7 @@ msgid "Documents"
msgstr ""
#: core/templates/user/overview.html:412 gym/templates/document/list.html:32
-#: manager/forms.py:292 manager/templates/workout/view.html:134
+#: manager/forms.py:292 manager/templates/workout/view.html:132
msgid "Download"
msgstr "ダウンロード"
@@ -1235,13 +1234,13 @@ msgid "kg"
msgstr "kg"
#: core/templatetags/wger_extras.py:207
-#: nutrition/templates/ingredient/view.html:86
-#: nutrition/templates/ingredient/view.html:92
-#: nutrition/templates/ingredient/view.html:99
-#: nutrition/templates/ingredient/view.html:108
-#: nutrition/templates/ingredient/view.html:115
-#: nutrition/templates/ingredient/view.html:137
-#: nutrition/templates/ingredient/view.html:147
+#: nutrition/templates/ingredient/view.html:60
+#: nutrition/templates/ingredient/view.html:66
+#: nutrition/templates/ingredient/view.html:73
+#: nutrition/templates/ingredient/view.html:82
+#: nutrition/templates/ingredient/view.html:89
+#: nutrition/templates/ingredient/view.html:111
+#: nutrition/templates/ingredient/view.html:121
msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr "g"
@@ -1259,7 +1258,7 @@ msgstr "oz"
#: exercises/views/equipment.py:103 exercises/views/exercises.py:73
#: exercises/views/muscles.py:99 manager/views/schedule.py:309
#: manager/views/schedule_step.py:128 manager/views/workout.py:249
-#: manager/views/workout_session.py:142 nutrition/views/ingredient.py:116
+#: manager/views/workout_session.py:142 nutrition/views/ingredient.py:119
#: nutrition/views/unit.py:110
msgid "Successfully deleted"
msgstr ""
@@ -1271,7 +1270,7 @@ msgstr ""
#: gym/views/admin_notes.py:196 gym/views/document.py:206 gym/views/gym.py:481
#: manager/views/schedule.py:316 manager/views/schedule_step.py:138
#: manager/views/workout.py:253 manager/views/workout_session.py:156
-#: nutrition/views/ingredient.py:123 nutrition/views/unit.py:117
+#: nutrition/views/ingredient.py:126 nutrition/views/unit.py:117
#, python-brace-format
msgid "Delete {0}?"
msgstr ""
@@ -1284,7 +1283,7 @@ msgstr ""
#: gym/views/contract.py:186 gym/views/contract_option.py:123
#: gym/views/contract_type.py:123 gym/views/document.py:171
#: gym/views/gym.py:463 manager/views/day.py:100 manager/views/schedule.py:333
-#: manager/views/workout.py:267 nutrition/views/ingredient.py:142
+#: manager/views/workout.py:267 nutrition/views/ingredient.py:145
#: nutrition/views/unit.py:143
#, python-brace-format
msgid "Edit {0}"
@@ -1355,7 +1354,7 @@ msgstr ""
msgid "A verification email was sent to %(email)s"
msgstr ""
-#: exercises/models/base.py:82 nutrition/models/ingredient.py:236
+#: exercises/models/base.py:82 nutrition/models/ingredient.py:230
msgid "Category"
msgstr ""
@@ -1375,7 +1374,7 @@ msgstr ""
msgid "Exercise Categories"
msgstr ""
-#: exercises/models/comment.py:52 exercises/models/exercise_alias.py:52
+#: exercises/models/comment.py:52 exercises/models/exercise_alias.py:53
#: exercises/models/image.py:74 exercises/models/video.py:98
#: manager/forms.py:178 manager/helpers.py:86 manager/models/log.py:52
msgid "Exercise"
@@ -1385,12 +1384,12 @@ msgstr ""
msgid "A comment about how to correctly do this exercise."
msgstr ""
-#: exercises/models/exercise.py:76 nutrition/models/ingredient.py:95
+#: exercises/models/exercise.py:77 nutrition/models/ingredient.py:81
#: nutrition/models/weight_unit.py:32
msgid "Language"
msgstr "表示言語"
-#: exercises/models/exercise_alias.py:58
+#: exercises/models/exercise_alias.py:59
msgid "Alias for an exercise"
msgstr ""
@@ -1524,7 +1523,7 @@ msgstr "オプション"
#: manager/models/schedule.py:44 manager/models/session.py:49
#: manager/models/workout.py:89 measurements/models/category.py:31
#: measurements/models/measurement.py:42 nutrition/models/plan.py:54
-#: nutrition/templates/ingredient/pending.html:16 weight/models.py:42
+#: weight/models.py:60
msgid "User"
msgstr ""
@@ -1645,9 +1644,9 @@ msgid "Contract type"
msgstr ""
#: gym/models/contract.py:211 gym/templates/contract/view.html:59
-#: manager/templates/log/add.html:52 nutrition/forms.py:62
-#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:105
-#: nutrition/models/meal_item.py:72
+#: manager/templates/log/add.html:52 nutrition/forms.py:63
+#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:108
+#: nutrition/models/meal_item.py:73
msgid "Amount"
msgstr ""
@@ -1664,7 +1663,7 @@ msgid "Contract is active"
msgstr ""
#: gym/models/contract.py:237 gym/templates/contract/view.html:69
-#: manager/models/schedule.py:61 manager/templates/schedule/view.html:68
+#: manager/models/schedule.py:61 manager/templates/schedule/view.html:67
msgid "Start date"
msgstr ""
@@ -2054,7 +2053,7 @@ msgstr ""
#: mailer/templates/mailer/gym/form.html:28
#: mailer/templates/mailer/gym/preview.html:62
-#: manager/templates/workout/view.html:42
+#: manager/templates/workout/view.html:40
msgid "Steps"
msgstr ""
@@ -2076,7 +2075,7 @@ msgid ""
msgstr ""
#: mailer/templates/mailer/gym/preview.html:22
-#: software/templates/about_us.html:60
+#: software/templates/about_us.html:70
msgid "Current version"
msgstr ""
@@ -2105,16 +2104,16 @@ msgid ""
"a superset."
msgstr ""
-#: manager/forms.py:140 nutrition/forms.py:252
+#: manager/forms.py:140 nutrition/forms.py:253
msgid "Also search for names in English"
msgstr ""
#: manager/forms.py:168 manager/forms.py:173 manager/models/log.py:64
-#: manager/models/log.py:92 manager/models/setting.py:59
-#: manager/models/setting.py:90 manager/templates/log/add.html:53
+#: manager/models/log.py:92 manager/models/setting.py:62
+#: manager/models/setting.py:93 manager/templates/log/add.html:53
#: manager/templates/log/add.html:55 manager/templates/set/formset.html:10
#: manager/templates/set/formset.html:12 measurements/models/category.py:41
-#: nutrition/forms.py:66
+#: nutrition/forms.py:67
msgid "Unit"
msgstr "単位"
@@ -2122,15 +2121,15 @@ msgstr "単位"
msgid "Type"
msgstr ""
-#: manager/forms.py:280 manager/templates/workout/view.html:115
+#: manager/forms.py:280 manager/templates/workout/view.html:113
msgid "Table"
msgstr ""
-#: manager/forms.py:282 manager/templates/workout/view.html:121
+#: manager/forms.py:282 manager/templates/workout/view.html:119
msgid "with images"
msgstr ""
-#: manager/forms.py:283 manager/templates/workout/view.html:127
+#: manager/forms.py:283 manager/templates/workout/view.html:125
msgid "with comments"
msgstr ""
@@ -2139,11 +2138,10 @@ msgid "Workout will expire soon"
msgstr ""
#: manager/models/day.py:34 manager/models/log.py:58
-#: manager/models/session.py:60 manager/templates/schedule/view.html:103
-#: manager/templates/workout/view.html:11
-#: manager/templates/workout/view.html:19 manager/views/pdf.py:85
-#: manager/views/pdf.py:161 manager/views/schedule.py:151
-#: manager/views/schedule.py:221
+#: manager/models/session.py:60 manager/templates/schedule/view.html:102
+#: manager/templates/workout/view.html:9 manager/templates/workout/view.html:17
+#: manager/views/pdf.py:85 manager/views/pdf.py:161
+#: manager/views/schedule.py:151 manager/views/schedule.py:221
msgid "Workout"
msgstr ""
@@ -2161,7 +2159,7 @@ msgstr ""
msgid "Name or short description of the schedule. For example 'Program XYZ'."
msgstr ""
-#: manager/models/schedule.py:65 manager/templates/schedule/view.html:72
+#: manager/models/schedule.py:65 manager/templates/schedule/view.html:71
msgid "Schedule active"
msgstr ""
@@ -2172,7 +2170,7 @@ msgid ""
"inactive"
msgstr ""
-#: manager/models/schedule.py:77 manager/templates/schedule/view.html:82
+#: manager/models/schedule.py:77 manager/templates/schedule/view.html:81
msgid "Is a loop"
msgstr ""
@@ -2191,8 +2189,8 @@ msgid "The duration in weeks"
msgstr ""
#: manager/models/schedule_step.py:64 manager/models/set.py:53
-#: manager/models/setting.py:110 nutrition/models/meal.py:55
-#: nutrition/models/meal_item.py:65
+#: manager/models/setting.py:113 nutrition/models/meal.py:55
+#: nutrition/models/meal_item.py:66
msgid "Order"
msgstr ""
@@ -2242,7 +2240,7 @@ msgstr ""
msgid "Number of sets"
msgstr "セット数"
-#: manager/models/setting.py:48
+#: manager/models/setting.py:51
msgid "Sets"
msgstr "セット"
@@ -2311,7 +2309,7 @@ msgstr ""
msgid "Go to current month"
msgstr ""
-#: manager/templates/calendar/month.html:188
+#: manager/templates/calendar/month.html:190
msgid "Add new log"
msgstr ""
@@ -2348,8 +2346,8 @@ msgid "Your schedules"
msgstr ""
#: manager/templates/schedule/overview.html:19
-#: manager/templates/schedule/view.html:132
-#: manager/templates/schedule/view.html:184
+#: manager/templates/schedule/view.html:131
+#: manager/templates/schedule/view.html:183
#: manager/templates/workout/overview.html:16
msgid "active"
msgstr ""
@@ -2385,29 +2383,29 @@ msgstr ""
msgid "Add schedule"
msgstr ""
-#: manager/templates/schedule/view.html:10
+#: manager/templates/schedule/view.html:9
msgid "Schedule"
msgstr "スケジュール"
-#: manager/templates/schedule/view.html:86
+#: manager/templates/schedule/view.html:85
msgid ""
"This schedule is a loop and will go through the workouts above till you "
"deactivate it"
msgstr ""
-#: manager/templates/schedule/view.html:104
+#: manager/templates/schedule/view.html:103
msgid "Weeks"
msgstr ""
-#: manager/templates/schedule/view.html:116
+#: manager/templates/schedule/view.html:115
msgid "Move me"
msgstr ""
-#: manager/templates/schedule/view.html:157
+#: manager/templates/schedule/view.html:156
msgid "Start schedule"
msgstr ""
-#: manager/templates/schedule/view.html:188
+#: manager/templates/schedule/view.html:187
#, python-format
msgid ""
"%(weeks)s Week\n"
@@ -2417,11 +2415,11 @@ msgid_plural ""
" "
msgstr[0] ""
-#: manager/templates/schedule/view.html:222
+#: manager/templates/schedule/view.html:221
msgid "Adding workouts"
msgstr ""
-#: manager/templates/schedule/view.html:224
+#: manager/templates/schedule/view.html:223
msgid ""
"Add as many workouts to the schedule as you want. You can\n"
" edit the order by dragging and dropping them. It's also possible "
@@ -2429,21 +2427,21 @@ msgid ""
" than once."
msgstr ""
-#: manager/templates/schedule/view.html:233
-#: manager/templates/schedule/view.html:244
-#: manager/templates/schedule/view.html:291
-#: manager/templates/workout/view.html:71
-#: manager/templates/workout/view.html:81
-#: manager/templates/workout/view.html:180
+#: manager/templates/schedule/view.html:232
+#: manager/templates/schedule/view.html:243
+#: manager/templates/schedule/view.html:290
+#: manager/templates/workout/view.html:69
+#: manager/templates/workout/view.html:79
+#: manager/templates/workout/view.html:178
msgid "Export calendar file"
msgstr ""
-#: manager/templates/schedule/view.html:237
+#: manager/templates/schedule/view.html:236
msgid "Export this schedule as a calendar file."
msgstr ""
-#: manager/templates/schedule/view.html:238
-#: manager/templates/workout/view.html:76
+#: manager/templates/schedule/view.html:237
+#: manager/templates/workout/view.html:74
msgid ""
"You can then import the file it into your calendar\n"
" application for example google calendar, outlook or "
@@ -2452,18 +2450,18 @@ msgid ""
"appropriate exercises."
msgstr ""
-#: manager/templates/schedule/view.html:259
-#: manager/templates/schedule/view.html:295
-#: manager/templates/workout/view.html:96
-#: manager/templates/workout/view.html:176
+#: manager/templates/schedule/view.html:258
+#: manager/templates/schedule/view.html:294
+#: manager/templates/workout/view.html:94
+#: manager/templates/workout/view.html:174
msgid "Download as PDF"
msgstr ""
-#: manager/templates/schedule/view.html:300
+#: manager/templates/schedule/view.html:299
msgid "Edit schedule"
msgstr ""
-#: manager/templates/schedule/view.html:305
+#: manager/templates/schedule/view.html:304
msgid "Delete schedule"
msgstr ""
@@ -2583,12 +2581,12 @@ msgid "Mark as workout"
msgstr "ワークアウトを追加する"
#: manager/templates/workout/template_view.html:65
-#: manager/templates/workout/view.html:51
+#: manager/templates/workout/view.html:49
msgid "Muscles trained"
msgstr ""
#: manager/templates/workout/template_view.html:68
-#: manager/templates/workout/view.html:54
+#: manager/templates/workout/view.html:52
msgid ""
"Images show combined muscles as trained by the exercises on the workout."
msgstr ""
@@ -2597,35 +2595,35 @@ msgstr ""
msgid "Use this template"
msgstr ""
-#: manager/templates/workout/view.html:45
+#: manager/templates/workout/view.html:43
msgid "Add training days"
msgstr ""
-#: manager/templates/workout/view.html:46
+#: manager/templates/workout/view.html:44
msgid "Add workout sets to days"
msgstr ""
-#: manager/templates/workout/view.html:47
+#: manager/templates/workout/view.html:45
msgid "Set the repetitions for each set"
msgstr ""
-#: manager/templates/workout/view.html:75
+#: manager/templates/workout/view.html:73
msgid "Export this workout as a calendar file."
msgstr ""
-#: manager/templates/workout/view.html:146
+#: manager/templates/workout/view.html:144
msgid "Logs"
msgstr ""
-#: manager/templates/workout/view.html:148
+#: manager/templates/workout/view.html:146
msgid "View logs"
msgstr ""
-#: manager/templates/workout/view.html:171 manager/views/schedule_step.py:99
+#: manager/templates/workout/view.html:169 manager/views/schedule_step.py:99
msgid "Edit workout"
msgstr ""
-#: manager/templates/workout/view.html:184 manager/views/workout.py:281
+#: manager/templates/workout/view.html:182 manager/views/workout.py:281
msgid "Mark as template"
msgstr ""
@@ -2672,109 +2670,95 @@ msgstr ""
msgid "Value"
msgstr ""
-#: nutrition/forms.py:117
+#: nutrition/forms.py:118
#, fuzzy
#| msgid "Height (cm)"
msgid "Height (in)"
msgstr "身長(cm)"
-#: nutrition/forms.py:120
+#: nutrition/forms.py:121
#, fuzzy
#| msgid "Height (cm)"
msgid "Weight (kg)"
msgstr "身長(cm)"
-#: nutrition/forms.py:120
+#: nutrition/forms.py:121
#, fuzzy
#| msgid "Height (cm)"
msgid "Weight (lbs)"
msgstr "身長(cm)"
-#: nutrition/forms.py:133
+#: nutrition/forms.py:134
msgid "Calculate"
msgstr ""
-#: nutrition/forms.py:207 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:208 nutrition/templates/rate/form.html:76
msgid "Basic caloric intake"
msgstr "基礎カロリー摂取量"
-#: nutrition/forms.py:208
+#: nutrition/forms.py:209
msgid "Your basic caloric intake as calculated for your data"
msgstr ""
-#: nutrition/forms.py:213
+#: nutrition/forms.py:214
msgid "Additional calories"
msgstr ""
-#: nutrition/forms.py:215
+#: nutrition/forms.py:216
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
msgstr ""
-#: nutrition/forms.py:248 nutrition/models/ingredient_weight_unit.py:39
-#: nutrition/models/log.py:84 nutrition/models/meal_item.py:53
+#: nutrition/forms.py:249 nutrition/models/ingredient_weight_unit.py:39
+#: nutrition/models/log.py:87 nutrition/models/meal_item.py:54
msgid "Ingredient"
msgstr "材料"
-#: nutrition/models/ingredient.py:131
+#: nutrition/models/ingredient.py:117
msgid "In kcal per 100g"
msgstr ""
-#: nutrition/models/ingredient.py:138 nutrition/models/ingredient.py:146
-#: nutrition/models/ingredient.py:156 nutrition/models/ingredient.py:164
-#: nutrition/models/ingredient.py:174 nutrition/models/ingredient.py:184
-#: nutrition/models/ingredient.py:194
+#: nutrition/models/ingredient.py:124 nutrition/models/ingredient.py:132
+#: nutrition/models/ingredient.py:142 nutrition/models/ingredient.py:150
+#: nutrition/models/ingredient.py:160 nutrition/models/ingredient.py:170
+#: nutrition/models/ingredient.py:180
msgid "In g per 100g of product"
msgstr ""
-#: nutrition/models/ingredient.py:155
-#: nutrition/templates/ingredient/view.html:96 nutrition/views/plan.py:259
+#: nutrition/models/ingredient.py:141
+#: nutrition/templates/ingredient/view.html:70 nutrition/views/plan.py:259
msgid "Sugar content in carbohydrates"
msgstr ""
-#: nutrition/models/ingredient.py:173
-#: nutrition/templates/ingredient/view.html:112 nutrition/views/plan.py:273
+#: nutrition/models/ingredient.py:159
+#: nutrition/templates/ingredient/view.html:86 nutrition/views/plan.py:273
msgid "Saturated fat content in fats"
msgstr ""
-#: nutrition/models/ingredient.py:183
-#: nutrition/templates/ingredient/view.html:134 nutrition/views/plan.py:279
-msgid "Fibres"
-msgstr "食物繊維"
+#: nutrition/models/ingredient.py:169
+#: nutrition/templates/ingredient/view.html:108 nutrition/views/plan.py:279
+msgid "Fiber"
+msgstr ""
-#: nutrition/models/ingredient.py:193
-#: nutrition/templates/ingredient/view.html:144 nutrition/views/plan.py:285
+#: nutrition/models/ingredient.py:179
+#: nutrition/templates/ingredient/view.html:118 nutrition/views/plan.py:285
msgid "Sodium"
msgstr "ナトリウム"
-#: nutrition/models/ingredient.py:215
+#: nutrition/models/ingredient.py:209
msgid "Link to product"
msgstr ""
-#: nutrition/models/ingredient.py:244
+#: nutrition/models/ingredient.py:238
msgid "Brand name of product"
msgstr ""
-#: nutrition/models/ingredient.py:304
+#: nutrition/models/ingredient.py:305
#, python-brace-format
msgid "The total energy ({self.energy}kcal) is not the approximate sum of the "
msgstr ""
-#: nutrition/models/ingredient.py:383 nutrition/views/ingredient.py:196
-msgid "Ingredient was successfully added to the general database"
-msgstr ""
-
-#: nutrition/models/ingredient.py:408
-msgid "New user submitted ingredient"
-msgstr ""
-
-#: nutrition/models/ingredient.py:410
-#, python-brace-format
-msgid ""
-"The user {request.user.username} submitted a new ingredient \"{self.name}\"."
-msgstr ""
-
#: nutrition/models/ingredient_category.py:31
msgid "Ingredient Categories"
msgstr ""
@@ -2787,16 +2771,16 @@ msgstr ""
msgid "Unit amount, e.g. \"1 Cup\" or \"1/2 spoon\""
msgstr ""
-#: nutrition/models/log.py:49 nutrition/models/meal.py:50
-#: nutrition/models/meal_item.py:47 nutrition/models/plan.py:106
+#: nutrition/models/log.py:52 nutrition/models/meal.py:50
+#: nutrition/models/meal_item.py:48 nutrition/models/plan.py:108
msgid "Nutrition plan"
msgstr ""
-#: nutrition/models/log.py:58
+#: nutrition/models/log.py:61
msgid "Meal"
msgstr ""
-#: nutrition/models/log.py:68
+#: nutrition/models/log.py:71
msgid "Date and Time (Approx.)"
msgstr ""
@@ -2816,11 +2800,11 @@ msgid ""
"summer\""
msgstr ""
-#: nutrition/models/plan.py:88
+#: nutrition/models/plan.py:90
msgid "Use daily calories"
msgstr ""
-#: nutrition/models/plan.py:91
+#: nutrition/models/plan.py:93
msgid ""
"Tick the box if you want to mark this plan as having a goal amount of "
"calories. You can use the calculator or enter the value yourself."
@@ -2927,64 +2911,36 @@ msgstr ""
msgid "Add ingredient"
msgstr ""
-#: nutrition/templates/ingredient/pending.html:14
-msgid "Submission date"
-msgstr ""
-
-#: nutrition/templates/ingredient/view.html:27
-msgid "Ingredient is pending review"
-msgstr ""
-
-#: nutrition/templates/ingredient/view.html:28
-msgid ""
-"This user submitted ingredient is pending a decision to be\n"
-"included in the database. Till then, it will not be shown in the overview "
-"or\n"
-"the search."
-msgstr ""
-
-#: nutrition/templates/ingredient/view.html:31
-msgid "Please select one of the options below."
-msgstr ""
-
-#: nutrition/templates/ingredient/view.html:38
-msgid "Accept"
-msgstr ""
-
-#: nutrition/templates/ingredient/view.html:42
-msgid "Decline"
-msgstr ""
-
-#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:229
+#: nutrition/templates/ingredient/view.html:45 nutrition/views/plan.py:229
msgid "Macronutrients"
msgstr ""
-#: nutrition/templates/ingredient/view.html:80
+#: nutrition/templates/ingredient/view.html:54
msgid "kJ"
msgstr ""
-#: nutrition/templates/ingredient/view.html:101
-#: nutrition/templates/ingredient/view.html:117
-#: nutrition/templates/ingredient/view.html:139
-#: nutrition/templates/ingredient/view.html:149
+#: nutrition/templates/ingredient/view.html:75
+#: nutrition/templates/ingredient/view.html:91
+#: nutrition/templates/ingredient/view.html:113
+#: nutrition/templates/ingredient/view.html:123
msgid "n.A."
msgstr ""
-#: nutrition/templates/ingredient/view.html:128
+#: nutrition/templates/ingredient/view.html:102
msgid "Others"
msgstr ""
-#: nutrition/templates/ingredient/view.html:170
+#: nutrition/templates/ingredient/view.html:144
#: nutrition/templates/units/list.html:46 nutrition/views/unit.py:86
msgid "Add new weight unit"
msgstr ""
-#: nutrition/templates/ingredient/view.html:232
-#: nutrition/templates/ingredient/view.html:235
+#: nutrition/templates/ingredient/view.html:206
+#: nutrition/templates/ingredient/view.html:209
msgid "Edit ingredient"
msgstr ""
-#: nutrition/templates/ingredient/view.html:239
+#: nutrition/templates/ingredient/view.html:213
msgid "Delete ingredient"
msgstr ""
@@ -3068,14 +3024,10 @@ msgstr ""
msgid "56 to 90"
msgstr ""
-#: nutrition/views/ingredient.py:154
+#: nutrition/views/ingredient.py:157
msgid "Add a new ingredient"
msgstr ""
-#: nutrition/views/ingredient.py:209
-msgid "Ingredient was successfully marked as rejected"
-msgstr ""
-
#: nutrition/views/plan.py:120
msgid "Nutritional plan"
msgstr ""
@@ -3120,52 +3072,61 @@ msgid ""
msgstr ""
#: software/templates/about_us.html:18
-msgid "Source code"
-msgstr ""
-
-#: software/templates/about_us.html:20
-msgid "Get the source code of this application and its server on github"
-msgstr ""
-
-#: software/templates/about_us.html:25
msgid "Have a problem or idea?"
msgstr ""
-#: software/templates/about_us.html:27
+#: software/templates/about_us.html:20
msgid ""
"Get in touch if something didn't behave as expected or if there is a feature "
"that you feel is missing."
msgstr ""
-#: software/templates/about_us.html:32
+#: software/templates/about_us.html:26
msgid "Say hi!"
msgstr ""
-#: software/templates/about_us.html:34
+#: software/templates/about_us.html:28
msgid "If you want to chat with us, hop on the Discord server and get in touch"
msgstr ""
-#: software/templates/about_us.html:39 software/templates/features.html:503
+#: software/templates/about_us.html:33
+msgid "Mastodon"
+msgstr ""
+
+#: software/templates/about_us.html:35
+msgid "Follow us on mastodon for updates and news about the project"
+msgstr ""
+
+#: software/templates/about_us.html:40 software/templates/features.html:503
#, fuzzy
#| msgid "Translate"
msgid "Translation"
msgstr "翻訳"
-#: software/templates/about_us.html:41
+#: software/templates/about_us.html:42
msgid ""
"This application is translated on weblate. If you also want to help, click "
"the link and start translating"
msgstr ""
-#: software/templates/about_us.html:50
+#: software/templates/about_us.html:47
+msgid "Source code"
+msgstr ""
+
+#: software/templates/about_us.html:49
+msgid "Get the source code of this application and its server on github"
+msgstr ""
+
+#: software/templates/about_us.html:59
msgid "Our goal"
msgstr ""
-#: software/templates/about_us.html:53
+#: software/templates/about_us.html:62
msgid ""
"The goal is to build an awesome\n"
" and flexible fitness manager, along with a comprehensive and "
-"complete list of exercises and\n"
+"complete list of\n"
+" exercises and\n"
" ingredients, all released under a free license."
msgstr ""
@@ -3175,10 +3136,6 @@ msgid ""
"your exercises and workouts."
msgstr ""
-#: software/templates/features.html:45
-msgid "About"
-msgstr ""
-
#: software/templates/features.html:57
msgid "Mobile app"
msgstr ""
@@ -3418,18 +3375,6 @@ msgid ""
"to its own copyright."
msgstr ""
-#: utils/models.py:130
-msgid "Pending"
-msgstr ""
-
-#: utils/models.py:131
-msgid "Accepted"
-msgstr ""
-
-#: utils/models.py:132
-msgid "Declined"
-msgstr ""
-
#: weight/forms.py:54
msgid "Input"
msgstr ""
@@ -3442,7 +3387,7 @@ msgstr ""
msgid "You have to enter your weight"
msgstr ""
-#: weight/models.py:60
+#: weight/models.py:78
msgid "Weight entry"
msgstr ""
@@ -3559,6 +3504,9 @@ msgstr ""
msgid "Delete weight entry for the %s"
msgstr ""
+#~ msgid "Fibres"
+#~ msgstr "食物繊維"
+
#~ msgid "Share"
#~ msgstr "共有する"
diff --git a/wger/locale/ko/LC_MESSAGES/django.po b/wger/locale/ko/LC_MESSAGES/django.po
index d82eb3d4c..9a624a72f 100644
--- a/wger/locale/ko/LC_MESSAGES/django.po
+++ b/wger/locale/ko/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: wger Workout Manager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-02-02 12:42+0100\n"
+"POT-Creation-Date: 2024-07-14 15:49+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"
@@ -31,7 +31,7 @@ msgstr ""
"이 설치에 대한 기본 Gym을 선택하십시오. 새로 등록된 모든 사용자가 이 Gym에 할"
"당되고, Gym이 없는 모든 기존 사용자가 업데이트됩니다."
-#: config/views/gym_config.py:42 core/templates/language/view.html:63
+#: config/views/gym_config.py:42 core/templates/language/view.html:67
#: core/templates/license/list.html:17 core/templates/misc/license/list.html:18
#: core/templates/repetition_unit/list.html:18
#: core/templates/tags/render_day.html:39
@@ -51,8 +51,8 @@ msgstr ""
#: manager/templates/calendar/day.html:68
#: manager/templates/calendar/month.html:85
#: manager/templates/calendar/partial_overview_table.html:18
-#: manager/templates/schedule/view.html:119
-#: nutrition/templates/ingredient/view.html:191
+#: manager/templates/schedule/view.html:118
+#: nutrition/templates/ingredient/view.html:165
#: nutrition/templates/units/list.html:19
msgid "Edit"
msgstr "수정"
@@ -88,8 +88,8 @@ msgstr ""
msgid "Empty placeholder schedule"
msgstr ""
-#: core/forms.py:69 core/templates/navigation.html:275
-#: core/templates/navigation.html:281 core/templates/user/login.html:4
+#: core/forms.py:69 core/templates/navigation.html:285
+#: core/templates/navigation.html:291 core/templates/user/login.html:4
#: software/templates/features.html:82 software/templates/features.html:427
msgid "Login"
msgstr "로그인"
@@ -163,7 +163,7 @@ msgstr "비밀번호"
msgid "Please enter your current password."
msgstr "현재 비밀번호를 입력해주세요."
-#: core/forms.py:242 core/templates/language/view.html:68
+#: core/forms.py:242 core/templates/language/view.html:73
#: core/templates/license/list.html:19 core/templates/misc/license/list.html:22
#: core/templates/repetition_unit/list.html:20
#: core/templates/tags/render_day.html:45
@@ -178,10 +178,10 @@ msgstr "현재 비밀번호를 입력해주세요."
#: gym/templates/gym/list.html:22 manager/templates/calendar/day.html:73
#: manager/templates/calendar/month.html:89
#: manager/templates/calendar/partial_overview_table.html:23
-#: manager/templates/schedule/view.html:123
-#: manager/templates/workout/view.html:190
-#: nutrition/templates/ingredient/view.html:192
-#: nutrition/templates/ingredient/view.html:241
+#: manager/templates/schedule/view.html:122
+#: manager/templates/workout/view.html:188
+#: nutrition/templates/ingredient/view.html:166
+#: nutrition/templates/ingredient/view.html:215
#: nutrition/templates/units/list.html:22
msgid "Delete"
msgstr "삭제"
@@ -194,14 +194,14 @@ msgstr "유효하지 않은 비밀번호"
msgid "The form is secured with reCAPTCHA"
msgstr ""
-#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:275
-#: core/templates/navigation.html:287 core/templates/template.html:147
+#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:285
+#: core/templates/navigation.html:297 core/templates/template.html:149
#: core/templates/user/login.html:20 core/views/user.py:298
#: software/templates/features.html:87 software/templates/features.html:422
msgid "Register"
msgstr "등록"
-#: core/forms.py:315
+#: core/forms.py:315 software/templates/features.html:45
msgid "Contact"
msgstr "연락"
@@ -212,7 +212,7 @@ msgid "Some way of answering you (e-mail, etc.)"
msgstr "답변방법 (이메일 등)"
#: core/forms.py:324 exercises/models/comment.py:58 manager/models/set.py:61
-#: manager/models/setting.py:111 nutrition/models/log.py:74
+#: manager/models/setting.py:114 nutrition/models/log.py:77
msgid "Comment"
msgstr "Comment"
@@ -232,6 +232,12 @@ msgstr "언어 코드"
msgid "Language full name"
msgstr "언어명"
+#: core/models/language.py:45 core/templates/language/view.html:23
+#, fuzzy
+#| msgid "Language full name"
+msgid "Language full name in English"
+msgstr "언어명"
+
#: core/models/license.py:29
msgid "Full name"
msgstr ""
@@ -246,7 +252,7 @@ msgstr ""
msgid "Short name, e.g. CC-BY-SA 3"
msgstr ""
-#: core/models/license.py:45 nutrition/models/ingredient.py:214
+#: core/models/license.py:45 nutrition/models/ingredient.py:208
msgid "Link"
msgstr ""
@@ -349,7 +355,7 @@ msgstr ""
msgid "Age"
msgstr "나이"
-#: core/models/profile.py:230 nutrition/forms.py:117
+#: core/models/profile.py:230 nutrition/forms.py:118
msgid "Height (cm)"
msgstr "키 (cm)"
@@ -400,7 +406,7 @@ msgid "Total caloric intake, including e.g. any surplus"
msgstr ""
#: core/models/profile.py:333 nutrition/models/ingredient_weight_unit.py:45
-#: nutrition/models/log.py:93 nutrition/models/meal_item.py:58
+#: nutrition/models/log.py:96 nutrition/models/meal_item.py:59
msgid "Weight unit"
msgstr ""
@@ -429,17 +435,16 @@ msgstr ""
#: core/models/rep_unit.py:36 core/models/weight_unit.py:36
#: core/templates/user/overview.html:262 core/views/user.py:599
#: exercises/models/category.py:29 exercises/models/equipment.py:29
-#: exercises/models/exercise.py:58 exercises/models/muscle.py:36
+#: exercises/models/exercise.py:59 exercises/models/muscle.py:36
#: gym/models/contract.py:52 gym/models/contract.py:103 gym/models/gym.py:46
#: gym/models/user_document.py:84 gym/templates/contract/view.html:50
#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:96
#: gym/views/gym.py:158 manager/models/schedule.py:55
#: manager/models/workout.py:57 measurements/models/category.py:36
-#: nutrition/models/ingredient.py:125
+#: nutrition/models/ingredient.py:111
#: nutrition/models/ingredient_category.py:27 nutrition/models/meal.py:67
#: nutrition/models/weight_unit.py:38
-#: nutrition/templates/ingredient/pending.html:15
-#: nutrition/templates/ingredient/view.html:178
+#: nutrition/templates/ingredient/view.html:152
msgid "Name"
msgstr ""
@@ -541,24 +546,24 @@ msgstr ""
msgid "Dashboard"
msgstr "대시보드"
-#: core/templates/language/overview.html:4 core/templates/navigation.html:335
+#: core/templates/language/overview.html:4 core/templates/navigation.html:345
msgid "Languages"
msgstr "언어"
-#: core/templates/language/overview.html:20
+#: core/templates/language/overview.html:22
msgid "Nothing found."
msgstr "찾을 수 없음."
-#: core/templates/language/overview.html:20
+#: core/templates/language/overview.html:22
#: manager/templates/calendar/month.html:132
#: manager/templates/schedule/overview.html:28
-#: manager/templates/schedule/view.html:145
+#: manager/templates/schedule/view.html:144
#: manager/templates/workout/overview.html:28
#: nutrition/templates/ingredient/overview.html:38
msgid "Add one now."
msgstr "추가하세요."
-#: core/templates/language/overview.html:33 core/templates/license/list.html:40
+#: core/templates/language/overview.html:35 core/templates/license/list.html:40
#: core/templates/misc/license/list.html:43
#: core/templates/repetition_unit/list.html:43
#: core/templates/user/overview.html:326 core/templates/user/overview.html:365
@@ -578,13 +583,13 @@ msgstr "추가하세요."
msgid "Add"
msgstr "추가"
-#: core/templates/language/view.html:58 core/templates/user/api_key.html:44
+#: core/templates/language/view.html:61 core/templates/user/api_key.html:44
#: core/templates/user/preferences.html:45 gym/models/contract.py:203
#: gym/templates/contract/view.html:41 gym/templates/contract/view.html:106
#: gym/templates/gym/member_list.html:248
-#: manager/templates/schedule/view.html:286
-#: manager/templates/workout/view.html:165
-#: nutrition/templates/ingredient/view.html:228
+#: manager/templates/schedule/view.html:285
+#: manager/templates/workout/view.html:163
+#: nutrition/templates/ingredient/view.html:202
msgid "Options"
msgstr "옵션"
@@ -609,12 +614,11 @@ msgstr "라이센스 리스트"
#: gym/templates/gym/member_list.html:299
#: mailer/templates/mailer/gym/overview.html:30
#: manager/templates/calendar/day.html:87
-#: nutrition/templates/ingredient/pending.html:30
#: nutrition/templates/units/list.html:29
msgid "Nothing found"
msgstr ""
-#: core/templates/misc/about.html:4 core/templates/template.html:173
+#: core/templates/misc/about.html:4 core/templates/template.html:175
msgid "Imprint"
msgstr ""
@@ -625,180 +629,175 @@ msgid ""
"entries here."
msgstr ""
-#: core/templates/navigation.html:27 software/templates/features.html:437
+#: core/templates/navigation.html:28 software/templates/features.html:437
msgid "Training"
msgstr "Training"
-#: core/templates/navigation.html:34 core/templates/user/overview.html:25
+#: core/templates/navigation.html:37 core/templates/user/overview.html:25
msgid "Workouts"
msgstr "Workouts"
-#: core/templates/navigation.html:42
+#: core/templates/navigation.html:46
msgid "Workouts schedules"
msgstr "Workout 일정"
-#: core/templates/navigation.html:50 core/templates/user/overview.html:70
+#: core/templates/navigation.html:54 core/templates/user/overview.html:70
#: manager/templates/calendar/month.html:10
#: manager/templates/calendar/month.html:21
msgid "Calendar"
msgstr "달력"
-#: core/templates/navigation.html:60
+#: core/templates/navigation.html:64
msgid "Measurements"
msgstr ""
-#: core/templates/navigation.html:70 gallery/templates/images/overview.html:6
+#: core/templates/navigation.html:75 gallery/templates/images/overview.html:6
msgid "Gallery"
msgstr ""
-#: core/templates/navigation.html:76
+#: core/templates/navigation.html:81
#, fuzzy
#| msgid "Workout reminders"
msgid "Workout templates"
msgstr "Workout 리마인더"
-#: core/templates/navigation.html:82 manager/views/workout.py:84
+#: core/templates/navigation.html:88 manager/views/workout.py:84
#, fuzzy
#| msgid "Your schedules"
msgid "Your templates"
msgstr "일정"
-#: core/templates/navigation.html:90 manager/views/workout.py:98
+#: core/templates/navigation.html:97 manager/views/workout.py:98
msgid "Public templates"
msgstr ""
-#: core/templates/navigation.html:97 manager/forms.py:129
-#: manager/models/setting.py:54 software/templates/features.html:51
+#: core/templates/navigation.html:105 manager/forms.py:129
+#: manager/models/setting.py:57 software/templates/features.html:51
#: software/templates/features.html:459
msgid "Exercises"
msgstr "운동"
-#: core/templates/navigation.html:103 core/templates/navigation.html:170
-#: core/templates/navigation.html:330
+#: core/templates/navigation.html:111 core/templates/navigation.html:184
+#: core/templates/navigation.html:340
msgid "Administration"
msgstr ""
-#: core/templates/navigation.html:106
+#: core/templates/navigation.html:115
#, fuzzy
#| msgid "Exercise day"
msgid "Exercise edit history"
msgstr "운동한 날"
-#: core/templates/navigation.html:111 exercises/models/base.py:103
+#: core/templates/navigation.html:121 exercises/models/base.py:103
msgid "Equipment"
msgstr ""
-#: core/templates/navigation.html:116
+#: core/templates/navigation.html:127
msgid "Muscles"
msgstr ""
-#: core/templates/navigation.html:121
+#: core/templates/navigation.html:133
#: exercises/templates/categories/admin-overview.html:4
msgid "Categories"
msgstr ""
-#: core/templates/navigation.html:136 software/templates/features.html:447
+#: core/templates/navigation.html:148 software/templates/features.html:447
msgid "Nutrition"
msgstr "영양"
-#: core/templates/navigation.html:143 core/templates/user/overview.html:144
+#: core/templates/navigation.html:156 core/templates/user/overview.html:144
msgid "Nutrition plans"
msgstr ""
-#: core/templates/navigation.html:151 nutrition/templates/bmi/form.html:50
+#: core/templates/navigation.html:165 nutrition/templates/bmi/form.html:50
msgid "BMI calculator"
msgstr ""
-#: core/templates/navigation.html:159 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:174 nutrition/templates/rate/form.html:17
msgid "Daily calories calculator"
msgstr ""
-#: core/templates/navigation.html:165
+#: core/templates/navigation.html:179
#: nutrition/templates/ingredient/overview.html:10
msgid "Ingredient overview"
msgstr ""
-#: core/templates/navigation.html:172 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:187 nutrition/templates/units/list.html:6
msgid "Ingredient weight units"
msgstr ""
-#: core/templates/navigation.html:177
-#: nutrition/templates/ingredient/pending.html:6
-msgid "Ingredients pending review"
-msgstr ""
-
-#: core/templates/navigation.html:193 software/templates/features.html:442
+#: core/templates/navigation.html:203 software/templates/features.html:442
msgid "Body weight"
msgstr "체중"
-#: core/templates/navigation.html:200 core/templates/user/overview.html:114
+#: core/templates/navigation.html:210 core/templates/user/overview.html:114
msgid "Weight overview"
msgstr "체중 개요"
-#: core/templates/navigation.html:207 weight/views.py:65
+#: core/templates/navigation.html:217 weight/views.py:65
msgid "Add weight entry"
msgstr "체중 기록 추가"
-#: core/templates/navigation.html:221
+#: core/templates/navigation.html:231
msgid "About this software"
msgstr ""
-#: core/templates/navigation.html:227 software/templates/about_us.html:5
+#: core/templates/navigation.html:237 software/templates/about_us.html:5
msgid "About us"
msgstr ""
-#: core/templates/navigation.html:233 software/templates/features.html:507
+#: core/templates/navigation.html:243 software/templates/features.html:507
msgid "REST API"
msgstr ""
-#: core/templates/navigation.html:239 utils/models.py:45
+#: core/templates/navigation.html:249 utils/models.py:45
msgid "License"
msgstr ""
-#: core/templates/navigation.html:245
+#: core/templates/navigation.html:255
msgid "Developer documentation"
msgstr ""
-#: core/templates/navigation.html:252
+#: core/templates/navigation.html:262
msgid "Get the code"
msgstr ""
-#: core/templates/navigation.html:259 core/templates/template.html:212
+#: core/templates/navigation.html:269 core/templates/template.html:214
#: software/templates/features.html:582
msgid "Translate"
msgstr ""
-#: core/templates/navigation.html:293 core/templates/user/login.html:28
+#: core/templates/navigation.html:303 core/templates/user/login.html:28
msgid "Reset password"
msgstr ""
-#: core/templates/navigation.html:311
+#: core/templates/navigation.html:321
msgid "My preferences"
msgstr "내 환경설정"
-#: core/templates/navigation.html:320
+#: core/templates/navigation.html:330
msgid "Logout"
msgstr "로그아웃"
-#: core/templates/navigation.html:343
+#: core/templates/navigation.html:353
msgid "Licenses"
msgstr ""
-#: core/templates/navigation.html:351
+#: core/templates/navigation.html:361
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr ""
-#: core/templates/navigation.html:359 core/templates/weight_unit/list.html:4
-#: nutrition/templates/ingredient/view.html:167
+#: core/templates/navigation.html:369 core/templates/weight_unit/list.html:4
+#: nutrition/templates/ingredient/view.html:141
msgid "Weight units"
msgstr "무게 단위"
-#: core/templates/navigation.html:367 core/templates/user/list.html:4
+#: core/templates/navigation.html:377 core/templates/user/list.html:4
msgid "User list"
msgstr "사용자 리스트"
-#: core/templates/navigation.html:373
+#: core/templates/navigation.html:383
msgid "Gyms"
msgstr "Gyms"
@@ -848,12 +847,12 @@ msgstr ""
msgid "The %(site_name)s team"
msgstr ""
-#: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:11
+#: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:12
msgid "previous"
msgstr ""
-#: core/templates/tags/pagination.html:31
-#: core/templates/tags/pagination.html:35
+#: core/templates/tags/pagination.html:33
+#: core/templates/tags/pagination.html:38
msgid "next"
msgstr ""
@@ -878,34 +877,34 @@ msgid "Add exercises to this workout day"
msgstr ""
#: core/templates/tags/render_weight_log.html:17 manager/helpers.py:86
-#: manager/models/setting.py:69 manager/templates/set/formset.html:9
+#: manager/models/setting.py:72 manager/templates/set/formset.html:9
msgid "Reps"
msgstr ""
#: core/templates/tags/render_weight_log.html:30 manager/forms.py:191
-#: manager/models/log.py:103 manager/models/setting.py:99
+#: manager/models/log.py:103 manager/models/setting.py:102
#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
msgid "RiR"
msgstr ""
-#: core/templates/template.html:120 manager/templates/calendar/month.html:138
-#: manager/templates/schedule/view.html:249
-#: manager/templates/schedule/view.html:270
-#: manager/templates/workout/view.html:86
-#: manager/templates/workout/view.html:139
+#: core/templates/template.html:122 manager/templates/calendar/month.html:138
+#: manager/templates/schedule/view.html:248
+#: manager/templates/schedule/view.html:269
+#: manager/templates/workout/view.html:84
+#: manager/templates/workout/view.html:137
msgid "Close"
msgstr ""
-#: core/templates/template.html:136
+#: core/templates/template.html:138
msgid ""
"You are using a guest account, data entered will be deleted after a week."
msgstr ""
-#: core/templates/template.html:141
+#: core/templates/template.html:143
msgid "Create some demo entries"
msgstr ""
-#: core/templates/template.html:178 software/templates/features.html:547
+#: core/templates/template.html:180 software/templates/features.html:547
#: software/templates/tos.html:7
msgid "Terms of service"
msgstr ""
@@ -1000,7 +999,7 @@ msgid "Overview"
msgstr ""
#: core/templates/user/overview.html:28
-#: manager/templates/schedule/view.html:164
+#: manager/templates/schedule/view.html:163
#: manager/templates/workout/overview.html:39 manager/views/schedule_step.py:60
msgid "Add workout"
msgstr "Workout 추가"
@@ -1008,20 +1007,20 @@ msgstr "Workout 추가"
#: core/templates/user/overview.html:34 core/templates/user/overview.html:76
#: core/templates/user/overview.html:120 core/templates/user/overview.html:152
#: exercises/models/base.py:118 exercises/models/base.py:124
-#: exercises/models/exercise.py:63 exercises/models/exercise.py:69
+#: exercises/models/exercise.py:64 exercises/models/exercise.py:70
#: exercises/models/image.py:107 exercises/models/image.py:113
#: exercises/models/video.py:163 exercises/models/video.py:169
#: gallery/models/image.py:42 manager/helpers.py:85 manager/models/log.py:100
#: manager/models/session.py:67 measurements/models/measurement.py:47
-#: nutrition/models/ingredient.py:101 nutrition/models/ingredient.py:107
-#: nutrition/models/ingredient.py:222 weight/models.py:33
+#: nutrition/models/ingredient.py:87 nutrition/models/ingredient.py:93
+#: nutrition/models/ingredient.py:216 weight/models.py:51
#: weight/templates/import_csv_preview.html:13
#: weight/templates/import_csv_preview.html:42 weight/views.py:144
msgid "Date"
msgstr "날짜"
#: core/templates/user/overview.html:35 core/templates/user/overview.html:153
-#: exercises/models/exercise.py:51 gallery/models/image.py:65
+#: exercises/models/exercise.py:52 gallery/models/image.py:65
#: gym/models/contract.py:58 gym/models/contract.py:109
#: manager/models/day.py:37 manager/models/workout.py:63
#: measurements/models/measurement.py:62 nutrition/models/plan.py:67
@@ -1039,13 +1038,13 @@ msgstr "최종 활동"
#: core/templates/user/overview.html:58
#: manager/templates/calendar/month.html:128
-#: manager/templates/schedule/view.html:145
+#: manager/templates/schedule/view.html:144
#: manager/templates/workout/overview.html:28
msgid "No workouts found."
msgstr "Workout을 찾을 수 없음."
#: core/templates/user/overview.html:68 manager/forms.py:280
-#: manager/templates/workout/view.html:108
+#: manager/templates/workout/view.html:106
msgid "Log"
msgstr ""
@@ -1069,35 +1068,35 @@ msgstr ""
#: core/templates/user/overview.html:112 core/templates/user/overview.html:121
#: manager/forms.py:186 manager/helpers.py:86 manager/models/log.py:86
-#: manager/models/setting.py:79 manager/templates/log/add.html:54
-#: manager/templates/set/formset.html:11 weight/models.py:35
+#: manager/models/setting.py:82 manager/templates/log/add.html:54
+#: manager/templates/set/formset.html:11 weight/models.py:53
#: weight/templates/import_csv_preview.html:14
#: weight/templates/import_csv_preview.html:43 weight/views.py:144
msgid "Weight"
msgstr ""
-#: core/templates/user/overview.html:154 nutrition/models/ingredient.py:130
-#: nutrition/templates/ingredient/view.html:77 nutrition/views/plan.py:237
+#: core/templates/user/overview.html:154 nutrition/models/ingredient.py:116
+#: nutrition/templates/ingredient/view.html:51 nutrition/views/plan.py:237
msgid "Energy"
msgstr ""
-#: core/templates/user/overview.html:155 nutrition/models/ingredient.py:137
-#: nutrition/templates/ingredient/view.html:84 nutrition/views/plan.py:243
+#: core/templates/user/overview.html:155 nutrition/models/ingredient.py:123
+#: nutrition/templates/ingredient/view.html:58 nutrition/views/plan.py:243
msgid "Protein"
msgstr ""
-#: core/templates/user/overview.html:156 nutrition/models/ingredient.py:145
-#: nutrition/templates/ingredient/view.html:90 nutrition/views/plan.py:251
+#: core/templates/user/overview.html:156 nutrition/models/ingredient.py:131
+#: nutrition/templates/ingredient/view.html:64 nutrition/views/plan.py:251
msgid "Carbohydrates"
msgstr ""
-#: core/templates/user/overview.html:157 nutrition/models/ingredient.py:163
-#: nutrition/templates/ingredient/view.html:106 nutrition/views/plan.py:265
+#: core/templates/user/overview.html:157 nutrition/models/ingredient.py:149
+#: nutrition/templates/ingredient/view.html:80 nutrition/views/plan.py:265
msgid "Fat"
msgstr ""
#: core/templates/user/overview.html:170
-#: nutrition/templates/ingredient/view.html:79
+#: nutrition/templates/ingredient/view.html:53
msgid "kcal"
msgstr ""
@@ -1109,7 +1108,7 @@ msgstr ""
#: gym/templates/gym/member_list.html:207
#: gym/templates/gym/member_list.html:240
#: gym/templates/gym/member_list.html:277
-#: manager/templates/schedule/view.html:101
+#: manager/templates/schedule/view.html:100
msgid "Actions"
msgstr "Actions"
@@ -1152,7 +1151,7 @@ msgid "Details"
msgstr "세부정보"
#: core/templates/user/overview.html:258 gym/views/export.py:57
-#: manager/helpers.py:86 manager/templates/schedule/view.html:99
+#: manager/helpers.py:86 manager/templates/schedule/view.html:98
msgid "Nr."
msgstr ""
@@ -1197,7 +1196,7 @@ msgid "Documents"
msgstr ""
#: core/templates/user/overview.html:412 gym/templates/document/list.html:32
-#: manager/forms.py:292 manager/templates/workout/view.html:134
+#: manager/forms.py:292 manager/templates/workout/view.html:132
msgid "Download"
msgstr ""
@@ -1250,13 +1249,13 @@ msgid "kg"
msgstr ""
#: core/templatetags/wger_extras.py:207
-#: nutrition/templates/ingredient/view.html:86
-#: nutrition/templates/ingredient/view.html:92
-#: nutrition/templates/ingredient/view.html:99
-#: nutrition/templates/ingredient/view.html:108
-#: nutrition/templates/ingredient/view.html:115
-#: nutrition/templates/ingredient/view.html:137
-#: nutrition/templates/ingredient/view.html:147
+#: nutrition/templates/ingredient/view.html:60
+#: nutrition/templates/ingredient/view.html:66
+#: nutrition/templates/ingredient/view.html:73
+#: nutrition/templates/ingredient/view.html:82
+#: nutrition/templates/ingredient/view.html:89
+#: nutrition/templates/ingredient/view.html:111
+#: nutrition/templates/ingredient/view.html:121
msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr ""
@@ -1274,7 +1273,7 @@ msgstr ""
#: exercises/views/equipment.py:103 exercises/views/exercises.py:73
#: exercises/views/muscles.py:99 manager/views/schedule.py:309
#: manager/views/schedule_step.py:128 manager/views/workout.py:249
-#: manager/views/workout_session.py:142 nutrition/views/ingredient.py:116
+#: manager/views/workout_session.py:142 nutrition/views/ingredient.py:119
#: nutrition/views/unit.py:110
msgid "Successfully deleted"
msgstr ""
@@ -1286,7 +1285,7 @@ msgstr ""
#: gym/views/admin_notes.py:196 gym/views/document.py:206 gym/views/gym.py:481
#: manager/views/schedule.py:316 manager/views/schedule_step.py:138
#: manager/views/workout.py:253 manager/views/workout_session.py:156
-#: nutrition/views/ingredient.py:123 nutrition/views/unit.py:117
+#: nutrition/views/ingredient.py:126 nutrition/views/unit.py:117
#, python-brace-format
msgid "Delete {0}?"
msgstr ""
@@ -1299,7 +1298,7 @@ msgstr ""
#: gym/views/contract.py:186 gym/views/contract_option.py:123
#: gym/views/contract_type.py:123 gym/views/document.py:171
#: gym/views/gym.py:463 manager/views/day.py:100 manager/views/schedule.py:333
-#: manager/views/workout.py:267 nutrition/views/ingredient.py:142
+#: manager/views/workout.py:267 nutrition/views/ingredient.py:145
#: nutrition/views/unit.py:143
#, python-brace-format
msgid "Edit {0}"
@@ -1370,7 +1369,7 @@ msgstr "Gym"
msgid "A verification email was sent to %(email)s"
msgstr ""
-#: exercises/models/base.py:82 nutrition/models/ingredient.py:236
+#: exercises/models/base.py:82 nutrition/models/ingredient.py:230
msgid "Category"
msgstr ""
@@ -1390,7 +1389,7 @@ msgstr ""
msgid "Exercise Categories"
msgstr ""
-#: exercises/models/comment.py:52 exercises/models/exercise_alias.py:52
+#: exercises/models/comment.py:52 exercises/models/exercise_alias.py:53
#: exercises/models/image.py:74 exercises/models/video.py:98
#: manager/forms.py:178 manager/helpers.py:86 manager/models/log.py:52
msgid "Exercise"
@@ -1400,12 +1399,12 @@ msgstr ""
msgid "A comment about how to correctly do this exercise."
msgstr ""
-#: exercises/models/exercise.py:76 nutrition/models/ingredient.py:95
+#: exercises/models/exercise.py:77 nutrition/models/ingredient.py:81
#: nutrition/models/weight_unit.py:32
msgid "Language"
msgstr ""
-#: exercises/models/exercise_alias.py:58
+#: exercises/models/exercise_alias.py:59
#, fuzzy
#| msgid "Add new exercise"
msgid "Alias for an exercise"
@@ -1545,7 +1544,7 @@ msgstr "Actions"
#: manager/models/schedule.py:44 manager/models/session.py:49
#: manager/models/workout.py:89 measurements/models/category.py:31
#: measurements/models/measurement.py:42 nutrition/models/plan.py:54
-#: nutrition/templates/ingredient/pending.html:16 weight/models.py:42
+#: weight/models.py:60
msgid "User"
msgstr ""
@@ -1666,9 +1665,9 @@ msgid "Contract type"
msgstr ""
#: gym/models/contract.py:211 gym/templates/contract/view.html:59
-#: manager/templates/log/add.html:52 nutrition/forms.py:62
-#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:105
-#: nutrition/models/meal_item.py:72
+#: manager/templates/log/add.html:52 nutrition/forms.py:63
+#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:108
+#: nutrition/models/meal_item.py:73
msgid "Amount"
msgstr ""
@@ -1685,7 +1684,7 @@ msgid "Contract is active"
msgstr ""
#: gym/models/contract.py:237 gym/templates/contract/view.html:69
-#: manager/models/schedule.py:61 manager/templates/schedule/view.html:68
+#: manager/models/schedule.py:61 manager/templates/schedule/view.html:67
msgid "Start date"
msgstr "시작 날짜"
@@ -2080,7 +2079,7 @@ msgstr ""
#: mailer/templates/mailer/gym/form.html:28
#: mailer/templates/mailer/gym/preview.html:62
-#: manager/templates/workout/view.html:42
+#: manager/templates/workout/view.html:40
msgid "Steps"
msgstr ""
@@ -2102,7 +2101,7 @@ msgid ""
msgstr ""
#: mailer/templates/mailer/gym/preview.html:22
-#: software/templates/about_us.html:60
+#: software/templates/about_us.html:70
msgid "Current version"
msgstr ""
@@ -2131,16 +2130,16 @@ msgid ""
"a superset."
msgstr ""
-#: manager/forms.py:140 nutrition/forms.py:252
+#: manager/forms.py:140 nutrition/forms.py:253
msgid "Also search for names in English"
msgstr ""
#: manager/forms.py:168 manager/forms.py:173 manager/models/log.py:64
-#: manager/models/log.py:92 manager/models/setting.py:59
-#: manager/models/setting.py:90 manager/templates/log/add.html:53
+#: manager/models/log.py:92 manager/models/setting.py:62
+#: manager/models/setting.py:93 manager/templates/log/add.html:53
#: manager/templates/log/add.html:55 manager/templates/set/formset.html:10
#: manager/templates/set/formset.html:12 measurements/models/category.py:41
-#: nutrition/forms.py:66
+#: nutrition/forms.py:67
msgid "Unit"
msgstr ""
@@ -2148,15 +2147,15 @@ msgstr ""
msgid "Type"
msgstr ""
-#: manager/forms.py:280 manager/templates/workout/view.html:115
+#: manager/forms.py:280 manager/templates/workout/view.html:113
msgid "Table"
msgstr ""
-#: manager/forms.py:282 manager/templates/workout/view.html:121
+#: manager/forms.py:282 manager/templates/workout/view.html:119
msgid "with images"
msgstr ""
-#: manager/forms.py:283 manager/templates/workout/view.html:127
+#: manager/forms.py:283 manager/templates/workout/view.html:125
msgid "with comments"
msgstr ""
@@ -2165,11 +2164,10 @@ msgid "Workout will expire soon"
msgstr ""
#: manager/models/day.py:34 manager/models/log.py:58
-#: manager/models/session.py:60 manager/templates/schedule/view.html:103
-#: manager/templates/workout/view.html:11
-#: manager/templates/workout/view.html:19 manager/views/pdf.py:85
-#: manager/views/pdf.py:161 manager/views/schedule.py:151
-#: manager/views/schedule.py:221
+#: manager/models/session.py:60 manager/templates/schedule/view.html:102
+#: manager/templates/workout/view.html:9 manager/templates/workout/view.html:17
+#: manager/views/pdf.py:85 manager/views/pdf.py:161
+#: manager/views/schedule.py:151 manager/views/schedule.py:221
msgid "Workout"
msgstr "운동"
@@ -2187,7 +2185,7 @@ msgstr "일"
msgid "Name or short description of the schedule. For example 'Program XYZ'."
msgstr ""
-#: manager/models/schedule.py:65 manager/templates/schedule/view.html:72
+#: manager/models/schedule.py:65 manager/templates/schedule/view.html:71
msgid "Schedule active"
msgstr "일정 활성화"
@@ -2198,7 +2196,7 @@ msgid ""
"inactive"
msgstr ""
-#: manager/models/schedule.py:77 manager/templates/schedule/view.html:82
+#: manager/models/schedule.py:77 manager/templates/schedule/view.html:81
msgid "Is a loop"
msgstr ""
@@ -2217,8 +2215,8 @@ msgid "The duration in weeks"
msgstr ""
#: manager/models/schedule_step.py:64 manager/models/set.py:53
-#: manager/models/setting.py:110 nutrition/models/meal.py:55
-#: nutrition/models/meal_item.py:65
+#: manager/models/setting.py:113 nutrition/models/meal.py:55
+#: nutrition/models/meal_item.py:66
msgid "Order"
msgstr ""
@@ -2268,7 +2266,7 @@ msgstr "운동한 날"
msgid "Number of sets"
msgstr ""
-#: manager/models/setting.py:48
+#: manager/models/setting.py:51
msgid "Sets"
msgstr ""
@@ -2341,7 +2339,7 @@ msgstr ""
msgid "Go to current month"
msgstr ""
-#: manager/templates/calendar/month.html:188
+#: manager/templates/calendar/month.html:190
msgid "Add new log"
msgstr ""
@@ -2378,8 +2376,8 @@ msgid "Your schedules"
msgstr "일정"
#: manager/templates/schedule/overview.html:19
-#: manager/templates/schedule/view.html:132
-#: manager/templates/schedule/view.html:184
+#: manager/templates/schedule/view.html:131
+#: manager/templates/schedule/view.html:183
#: manager/templates/workout/overview.html:16
msgid "active"
msgstr ""
@@ -2438,29 +2436,29 @@ msgstr ""
msgid "Add schedule"
msgstr "일정 추가"
-#: manager/templates/schedule/view.html:10
+#: manager/templates/schedule/view.html:9
msgid "Schedule"
msgstr "일정"
-#: manager/templates/schedule/view.html:86
+#: manager/templates/schedule/view.html:85
msgid ""
"This schedule is a loop and will go through the workouts above till you "
"deactivate it"
msgstr ""
-#: manager/templates/schedule/view.html:104
+#: manager/templates/schedule/view.html:103
msgid "Weeks"
msgstr ""
-#: manager/templates/schedule/view.html:116
+#: manager/templates/schedule/view.html:115
msgid "Move me"
msgstr ""
-#: manager/templates/schedule/view.html:157
+#: manager/templates/schedule/view.html:156
msgid "Start schedule"
msgstr "일정 시작"
-#: manager/templates/schedule/view.html:188
+#: manager/templates/schedule/view.html:187
#, python-format
msgid ""
"%(weeks)s Week\n"
@@ -2470,11 +2468,11 @@ msgid_plural ""
" "
msgstr[0] ""
-#: manager/templates/schedule/view.html:222
+#: manager/templates/schedule/view.html:221
msgid "Adding workouts"
msgstr ""
-#: manager/templates/schedule/view.html:224
+#: manager/templates/schedule/view.html:223
msgid ""
"Add as many workouts to the schedule as you want. You can\n"
" edit the order by dragging and dropping them. It's also possible "
@@ -2482,21 +2480,21 @@ msgid ""
" than once."
msgstr ""
-#: manager/templates/schedule/view.html:233
-#: manager/templates/schedule/view.html:244
-#: manager/templates/schedule/view.html:291
-#: manager/templates/workout/view.html:71
-#: manager/templates/workout/view.html:81
-#: manager/templates/workout/view.html:180
+#: manager/templates/schedule/view.html:232
+#: manager/templates/schedule/view.html:243
+#: manager/templates/schedule/view.html:290
+#: manager/templates/workout/view.html:69
+#: manager/templates/workout/view.html:79
+#: manager/templates/workout/view.html:178
msgid "Export calendar file"
msgstr "달력 파일 내보내기"
-#: manager/templates/schedule/view.html:237
+#: manager/templates/schedule/view.html:236
msgid "Export this schedule as a calendar file."
msgstr "이 일정을 달력 파일로 내보내기"
-#: manager/templates/schedule/view.html:238
-#: manager/templates/workout/view.html:76
+#: manager/templates/schedule/view.html:237
+#: manager/templates/workout/view.html:74
msgid ""
"You can then import the file it into your calendar\n"
" application for example google calendar, outlook or "
@@ -2505,18 +2503,18 @@ msgid ""
"appropriate exercises."
msgstr ""
-#: manager/templates/schedule/view.html:259
-#: manager/templates/schedule/view.html:295
-#: manager/templates/workout/view.html:96
-#: manager/templates/workout/view.html:176
+#: manager/templates/schedule/view.html:258
+#: manager/templates/schedule/view.html:294
+#: manager/templates/workout/view.html:94
+#: manager/templates/workout/view.html:174
msgid "Download as PDF"
msgstr ""
-#: manager/templates/schedule/view.html:300
+#: manager/templates/schedule/view.html:299
msgid "Edit schedule"
msgstr "일정 수정"
-#: manager/templates/schedule/view.html:305
+#: manager/templates/schedule/view.html:304
msgid "Delete schedule"
msgstr "일정 삭제"
@@ -2640,12 +2638,12 @@ msgid "Mark as workout"
msgstr "샘플 Workout"
#: manager/templates/workout/template_view.html:65
-#: manager/templates/workout/view.html:51
+#: manager/templates/workout/view.html:49
msgid "Muscles trained"
msgstr ""
#: manager/templates/workout/template_view.html:68
-#: manager/templates/workout/view.html:54
+#: manager/templates/workout/view.html:52
msgid ""
"Images show combined muscles as trained by the exercises on the workout."
msgstr ""
@@ -2654,35 +2652,35 @@ msgstr ""
msgid "Use this template"
msgstr ""
-#: manager/templates/workout/view.html:45
+#: manager/templates/workout/view.html:43
msgid "Add training days"
msgstr ""
-#: manager/templates/workout/view.html:46
+#: manager/templates/workout/view.html:44
msgid "Add workout sets to days"
msgstr ""
-#: manager/templates/workout/view.html:47
+#: manager/templates/workout/view.html:45
msgid "Set the repetitions for each set"
msgstr ""
-#: manager/templates/workout/view.html:75
+#: manager/templates/workout/view.html:73
msgid "Export this workout as a calendar file."
msgstr "이 Workout을 달력파일로 내보내기"
-#: manager/templates/workout/view.html:146
+#: manager/templates/workout/view.html:144
msgid "Logs"
msgstr ""
-#: manager/templates/workout/view.html:148
+#: manager/templates/workout/view.html:146
msgid "View logs"
msgstr ""
-#: manager/templates/workout/view.html:171 manager/views/schedule_step.py:99
+#: manager/templates/workout/view.html:169 manager/views/schedule_step.py:99
msgid "Edit workout"
msgstr ""
-#: manager/templates/workout/view.html:184 manager/views/workout.py:281
+#: manager/templates/workout/view.html:182 manager/views/workout.py:281
msgid "Mark as template"
msgstr ""
@@ -2729,109 +2727,95 @@ msgstr ""
msgid "Value"
msgstr ""
-#: nutrition/forms.py:117
+#: nutrition/forms.py:118
#, fuzzy
#| msgid "Height (cm)"
msgid "Height (in)"
msgstr "키 (cm)"
-#: nutrition/forms.py:120
+#: nutrition/forms.py:121
#, fuzzy
#| msgid "Height (cm)"
msgid "Weight (kg)"
msgstr "키 (cm)"
-#: nutrition/forms.py:120
+#: nutrition/forms.py:121
#, fuzzy
#| msgid "Height (cm)"
msgid "Weight (lbs)"
msgstr "키 (cm)"
-#: nutrition/forms.py:133
+#: nutrition/forms.py:134
msgid "Calculate"
msgstr ""
-#: nutrition/forms.py:207 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:208 nutrition/templates/rate/form.html:76
msgid "Basic caloric intake"
msgstr ""
-#: nutrition/forms.py:208
+#: nutrition/forms.py:209
msgid "Your basic caloric intake as calculated for your data"
msgstr ""
-#: nutrition/forms.py:213
+#: nutrition/forms.py:214
msgid "Additional calories"
msgstr ""
-#: nutrition/forms.py:215
+#: nutrition/forms.py:216
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
msgstr ""
-#: nutrition/forms.py:248 nutrition/models/ingredient_weight_unit.py:39
-#: nutrition/models/log.py:84 nutrition/models/meal_item.py:53
+#: nutrition/forms.py:249 nutrition/models/ingredient_weight_unit.py:39
+#: nutrition/models/log.py:87 nutrition/models/meal_item.py:54
msgid "Ingredient"
msgstr ""
-#: nutrition/models/ingredient.py:131
+#: nutrition/models/ingredient.py:117
msgid "In kcal per 100g"
msgstr ""
-#: nutrition/models/ingredient.py:138 nutrition/models/ingredient.py:146
-#: nutrition/models/ingredient.py:156 nutrition/models/ingredient.py:164
-#: nutrition/models/ingredient.py:174 nutrition/models/ingredient.py:184
-#: nutrition/models/ingredient.py:194
+#: nutrition/models/ingredient.py:124 nutrition/models/ingredient.py:132
+#: nutrition/models/ingredient.py:142 nutrition/models/ingredient.py:150
+#: nutrition/models/ingredient.py:160 nutrition/models/ingredient.py:170
+#: nutrition/models/ingredient.py:180
msgid "In g per 100g of product"
msgstr ""
-#: nutrition/models/ingredient.py:155
-#: nutrition/templates/ingredient/view.html:96 nutrition/views/plan.py:259
+#: nutrition/models/ingredient.py:141
+#: nutrition/templates/ingredient/view.html:70 nutrition/views/plan.py:259
msgid "Sugar content in carbohydrates"
msgstr ""
-#: nutrition/models/ingredient.py:173
-#: nutrition/templates/ingredient/view.html:112 nutrition/views/plan.py:273
+#: nutrition/models/ingredient.py:159
+#: nutrition/templates/ingredient/view.html:86 nutrition/views/plan.py:273
msgid "Saturated fat content in fats"
msgstr ""
-#: nutrition/models/ingredient.py:183
-#: nutrition/templates/ingredient/view.html:134 nutrition/views/plan.py:279
-msgid "Fibres"
+#: nutrition/models/ingredient.py:169
+#: nutrition/templates/ingredient/view.html:108 nutrition/views/plan.py:279
+msgid "Fiber"
msgstr ""
-#: nutrition/models/ingredient.py:193
-#: nutrition/templates/ingredient/view.html:144 nutrition/views/plan.py:285
+#: nutrition/models/ingredient.py:179
+#: nutrition/templates/ingredient/view.html:118 nutrition/views/plan.py:285
msgid "Sodium"
msgstr ""
-#: nutrition/models/ingredient.py:215
+#: nutrition/models/ingredient.py:209
msgid "Link to product"
msgstr ""
-#: nutrition/models/ingredient.py:244
+#: nutrition/models/ingredient.py:238
msgid "Brand name of product"
msgstr ""
-#: nutrition/models/ingredient.py:304
+#: nutrition/models/ingredient.py:305
#, python-brace-format
msgid "The total energy ({self.energy}kcal) is not the approximate sum of the "
msgstr ""
-#: nutrition/models/ingredient.py:383 nutrition/views/ingredient.py:196
-msgid "Ingredient was successfully added to the general database"
-msgstr ""
-
-#: nutrition/models/ingredient.py:408
-msgid "New user submitted ingredient"
-msgstr ""
-
-#: nutrition/models/ingredient.py:410
-#, python-brace-format
-msgid ""
-"The user {request.user.username} submitted a new ingredient \"{self.name}\"."
-msgstr ""
-
#: nutrition/models/ingredient_category.py:31
msgid "Ingredient Categories"
msgstr ""
@@ -2844,16 +2828,16 @@ msgstr ""
msgid "Unit amount, e.g. \"1 Cup\" or \"1/2 spoon\""
msgstr ""
-#: nutrition/models/log.py:49 nutrition/models/meal.py:50
-#: nutrition/models/meal_item.py:47 nutrition/models/plan.py:106
+#: nutrition/models/log.py:52 nutrition/models/meal.py:50
+#: nutrition/models/meal_item.py:48 nutrition/models/plan.py:108
msgid "Nutrition plan"
msgstr ""
-#: nutrition/models/log.py:58
+#: nutrition/models/log.py:61
msgid "Meal"
msgstr ""
-#: nutrition/models/log.py:68
+#: nutrition/models/log.py:71
msgid "Date and Time (Approx.)"
msgstr ""
@@ -2873,11 +2857,11 @@ msgid ""
"summer\""
msgstr ""
-#: nutrition/models/plan.py:88
+#: nutrition/models/plan.py:90
msgid "Use daily calories"
msgstr ""
-#: nutrition/models/plan.py:91
+#: nutrition/models/plan.py:93
msgid ""
"Tick the box if you want to mark this plan as having a goal amount of "
"calories. You can use the calculator or enter the value yourself."
@@ -2988,64 +2972,36 @@ msgstr ""
msgid "Add ingredient"
msgstr ""
-#: nutrition/templates/ingredient/pending.html:14
-msgid "Submission date"
-msgstr "제출일"
-
-#: nutrition/templates/ingredient/view.html:27
-msgid "Ingredient is pending review"
-msgstr ""
-
-#: nutrition/templates/ingredient/view.html:28
-msgid ""
-"This user submitted ingredient is pending a decision to be\n"
-"included in the database. Till then, it will not be shown in the overview "
-"or\n"
-"the search."
-msgstr ""
-
-#: nutrition/templates/ingredient/view.html:31
-msgid "Please select one of the options below."
-msgstr ""
-
-#: nutrition/templates/ingredient/view.html:38
-msgid "Accept"
-msgstr ""
-
-#: nutrition/templates/ingredient/view.html:42
-msgid "Decline"
-msgstr ""
-
-#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:229
+#: nutrition/templates/ingredient/view.html:45 nutrition/views/plan.py:229
msgid "Macronutrients"
msgstr ""
-#: nutrition/templates/ingredient/view.html:80
+#: nutrition/templates/ingredient/view.html:54
msgid "kJ"
msgstr ""
-#: nutrition/templates/ingredient/view.html:101
-#: nutrition/templates/ingredient/view.html:117
-#: nutrition/templates/ingredient/view.html:139
-#: nutrition/templates/ingredient/view.html:149
+#: nutrition/templates/ingredient/view.html:75
+#: nutrition/templates/ingredient/view.html:91
+#: nutrition/templates/ingredient/view.html:113
+#: nutrition/templates/ingredient/view.html:123
msgid "n.A."
msgstr ""
-#: nutrition/templates/ingredient/view.html:128
+#: nutrition/templates/ingredient/view.html:102
msgid "Others"
msgstr ""
-#: nutrition/templates/ingredient/view.html:170
+#: nutrition/templates/ingredient/view.html:144
#: nutrition/templates/units/list.html:46 nutrition/views/unit.py:86
msgid "Add new weight unit"
msgstr ""
-#: nutrition/templates/ingredient/view.html:232
-#: nutrition/templates/ingredient/view.html:235
+#: nutrition/templates/ingredient/view.html:206
+#: nutrition/templates/ingredient/view.html:209
msgid "Edit ingredient"
msgstr ""
-#: nutrition/templates/ingredient/view.html:239
+#: nutrition/templates/ingredient/view.html:213
msgid "Delete ingredient"
msgstr ""
@@ -3129,14 +3085,10 @@ msgstr ""
msgid "56 to 90"
msgstr ""
-#: nutrition/views/ingredient.py:154
+#: nutrition/views/ingredient.py:157
msgid "Add a new ingredient"
msgstr ""
-#: nutrition/views/ingredient.py:209
-msgid "Ingredient was successfully marked as rejected"
-msgstr ""
-
#: nutrition/views/plan.py:120
msgid "Nutritional plan"
msgstr ""
@@ -3181,50 +3133,59 @@ msgid ""
msgstr ""
#: software/templates/about_us.html:18
-msgid "Source code"
-msgstr ""
-
-#: software/templates/about_us.html:20
-msgid "Get the source code of this application and its server on github"
-msgstr ""
-
-#: software/templates/about_us.html:25
msgid "Have a problem or idea?"
msgstr ""
-#: software/templates/about_us.html:27
+#: software/templates/about_us.html:20
msgid ""
"Get in touch if something didn't behave as expected or if there is a feature "
"that you feel is missing."
msgstr ""
-#: software/templates/about_us.html:32
+#: software/templates/about_us.html:26
msgid "Say hi!"
msgstr ""
-#: software/templates/about_us.html:34
+#: software/templates/about_us.html:28
msgid "If you want to chat with us, hop on the Discord server and get in touch"
msgstr ""
-#: software/templates/about_us.html:39 software/templates/features.html:503
+#: software/templates/about_us.html:33
+msgid "Mastodon"
+msgstr ""
+
+#: software/templates/about_us.html:35
+msgid "Follow us on mastodon for updates and news about the project"
+msgstr ""
+
+#: software/templates/about_us.html:40 software/templates/features.html:503
msgid "Translation"
msgstr ""
-#: software/templates/about_us.html:41
+#: software/templates/about_us.html:42
msgid ""
"This application is translated on weblate. If you also want to help, click "
"the link and start translating"
msgstr ""
-#: software/templates/about_us.html:50
+#: software/templates/about_us.html:47
+msgid "Source code"
+msgstr ""
+
+#: software/templates/about_us.html:49
+msgid "Get the source code of this application and its server on github"
+msgstr ""
+
+#: software/templates/about_us.html:59
msgid "Our goal"
msgstr ""
-#: software/templates/about_us.html:53
+#: software/templates/about_us.html:62
msgid ""
"The goal is to build an awesome\n"
" and flexible fitness manager, along with a comprehensive and "
-"complete list of exercises and\n"
+"complete list of\n"
+" exercises and\n"
" ingredients, all released under a free license."
msgstr ""
@@ -3234,10 +3195,6 @@ msgid ""
"your exercises and workouts."
msgstr ""
-#: software/templates/features.html:45
-msgid "About"
-msgstr ""
-
#: software/templates/features.html:57
msgid "Mobile app"
msgstr ""
@@ -3481,18 +3438,6 @@ msgid ""
"to its own copyright."
msgstr ""
-#: utils/models.py:130
-msgid "Pending"
-msgstr ""
-
-#: utils/models.py:131
-msgid "Accepted"
-msgstr ""
-
-#: utils/models.py:132
-msgid "Declined"
-msgstr ""
-
#: weight/forms.py:54
msgid "Input"
msgstr ""
@@ -3505,7 +3450,7 @@ msgstr "날짜 포맷"
msgid "You have to enter your weight"
msgstr ""
-#: weight/models.py:60
+#: weight/models.py:78
msgid "Weight entry"
msgstr ""
@@ -3622,6 +3567,9 @@ msgstr "삭제되었습니다."
msgid "Delete weight entry for the %s"
msgstr ""
+#~ msgid "Submission date"
+#~ msgstr "제출일"
+
#~ msgid "Rest day"
#~ msgstr "휴식"
diff --git a/wger/locale/nl/LC_MESSAGES/django.po b/wger/locale/nl/LC_MESSAGES/django.po
index 666a311a4..8a866bff2 100644
--- a/wger/locale/nl/LC_MESSAGES/django.po
+++ b/wger/locale/nl/LC_MESSAGES/django.po
@@ -14,7 +14,7 @@ msgid ""
msgstr ""
"Project-Id-Version: wger Workout Manager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-02-02 12:42+0100\n"
+"POT-Creation-Date: 2024-07-14 15:49+0200\n"
"PO-Revision-Date: 2024-05-29 22:09+0000\n"
"Last-Translator: SilverServerT <[email protected]>\n"
"Language-Team: Dutch <https://hosted.weblate.org/projects/wger/web/nl/>\n"
@@ -38,7 +38,7 @@ msgstr ""
"nieuwe geregistreerde gebruikers aan deze sportschool toevoegen en alle "
"bestaande gebruikers zonder sportschool bijwerken."
-#: config/views/gym_config.py:42 core/templates/language/view.html:63
+#: config/views/gym_config.py:42 core/templates/language/view.html:67
#: core/templates/license/list.html:17 core/templates/misc/license/list.html:18
#: core/templates/repetition_unit/list.html:18
#: core/templates/tags/render_day.html:39
@@ -58,10 +58,9 @@ msgstr ""
#: manager/templates/calendar/day.html:68
#: manager/templates/calendar/month.html:85
#: manager/templates/calendar/partial_overview_table.html:18
-#: manager/templates/schedule/view.html:119
-#: nutrition/templates/ingredient/view.html:191
-#: nutrition/templates/units/list.html:19 config/views/gym_config.py:41
-#: gallery/views/images.py:96 manager/templates/calendar/day.html:66
+#: manager/templates/schedule/view.html:118
+#: nutrition/templates/ingredient/view.html:165
+#: nutrition/templates/units/list.html:19
msgid "Edit"
msgstr "Bewerk"
@@ -95,22 +94,19 @@ msgstr "Mijn hip workoutschema"
msgid "Empty placeholder schedule"
msgstr "Leeg tijdelijk schema"
-#: core/forms.py:69 core/templates/navigation.html:275
-#: core/templates/navigation.html:281 core/templates/user/login.html:4
+#: core/forms.py:69 core/templates/navigation.html:285
+#: core/templates/navigation.html:291 core/templates/user/login.html:4
#: software/templates/features.html:82 software/templates/features.html:427
-#: software/templates/features.html:75 software/templates/features.html:420
msgid "Login"
msgstr "Aanmelden"
#: core/forms.py:108 core/forms.py:214 gym/views/export.py:61
-#: gym/views/gym.py:217 core/forms.py:210 gym/views/export.py:63
-#: gym/views/gym.py:218
+#: gym/views/gym.py:217
msgid "First name"
msgstr "Voornaam"
#: core/forms.py:109 core/forms.py:215 core/templates/user/overview.html:266
-#: gym/views/export.py:62 gym/views/gym.py:217 core/forms.py:211
-#: gym/views/export.py:64 gym/views/gym.py:218
+#: gym/views/export.py:62 gym/views/gym.py:217
msgid "Last name"
msgstr "Achternaam"
@@ -120,8 +116,7 @@ msgstr "Achternaam"
#: gym/templates/gym/new_user.html:30 gym/views/export.py:60
#: mailer/templates/mailer/gym/form.html:4
#: mailer/templates/mailer/gym/overview.html:4
-#: mailer/templates/mailer/gym/preview.html:4 core/forms.py:176
-#: gym/models/contract.py:253 gym/views/export.py:62
+#: mailer/templates/mailer/gym/preview.html:4
msgid "Email"
msgstr "E-mail"
@@ -132,7 +127,7 @@ msgstr ""
"mailherinneringen."
#: core/forms.py:116 core/models/profile.py:222
-#: gym/templates/gym/new_user.html:38 core/models/profile.py:224
+#: gym/templates/gym/new_user.html:38
msgid "Date of Birth"
msgstr "Geboortedatum"
@@ -140,44 +135,41 @@ msgstr "Geboortedatum"
msgid "Personal data"
msgstr "Persoonlijke gegevens"
-#: core/forms.py:159 core/forms.py:156
+#: core/forms.py:159
msgid "Workout reminders"
msgstr "Workout-herinneringen"
-#: core/forms.py:166 core/forms.py:163
+#: core/forms.py:166
msgid "Other settings"
msgstr "Overige instellingen"
#: core/forms.py:174 core/views/user.py:624 core/views/user.py:639
#: core/views/user.py:651 gym/forms.py:73 manager/templates/log/add.html:65
#: manager/templates/set/add.html:70 manager/views/workout.py:203
-#: utils/generic_views.py:143 core/forms.py:170 core/views/user.py:615
-#: core/views/user.py:630 core/views/user.py:642 gym/forms.py:72
-#: manager/views/workout.py:205
+#: utils/generic_views.py:143
msgid "Save"
msgstr "Opslaan"
-#: core/forms.py:181 core/forms.py:177
+#: core/forms.py:181
msgid "Used for password resets and, optionally, email reminders."
msgstr ""
"Wordt gebruikt voor het resetten van een wachtwoord en optioneel voor e-mail "
"herinneringen."
-#: core/forms.py:210 core/forms.py:206
+#: core/forms.py:210
msgid "This e-mail address is already in use."
msgstr "Dit e-mailadres wordt al gebruikt."
#: core/forms.py:231 gym/templates/gym/new_user.html:26
#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:217
-#: core/forms.py:226 gym/views/gym.py:218
msgid "Password"
msgstr "Wachtwoord"
-#: core/forms.py:233 core/forms.py:228
+#: core/forms.py:233
msgid "Please enter your current password."
msgstr "Gelieve je huidige wachtwoord in te geven."
-#: core/forms.py:242 core/templates/language/view.html:68
+#: core/forms.py:242 core/templates/language/view.html:73
#: core/templates/license/list.html:19 core/templates/misc/license/list.html:22
#: core/templates/repetition_unit/list.html:20
#: core/templates/tags/render_day.html:45
@@ -192,48 +184,43 @@ msgstr "Gelieve je huidige wachtwoord in te geven."
#: gym/templates/gym/list.html:22 manager/templates/calendar/day.html:73
#: manager/templates/calendar/month.html:89
#: manager/templates/calendar/partial_overview_table.html:23
-#: manager/templates/schedule/view.html:123
-#: manager/templates/workout/view.html:190
-#: nutrition/templates/ingredient/view.html:192
-#: nutrition/templates/ingredient/view.html:241
-#: nutrition/templates/units/list.html:22 core/forms.py:237
-#: manager/templates/calendar/day.html:70
+#: manager/templates/schedule/view.html:122
+#: manager/templates/workout/view.html:188
+#: nutrition/templates/ingredient/view.html:166
+#: nutrition/templates/ingredient/view.html:215
+#: nutrition/templates/units/list.html:22
msgid "Delete"
msgstr "Verwijder"
-#: core/forms.py:251 core/forms.py:246
+#: core/forms.py:251
msgid "Invalid password"
msgstr "Ongeldig wachtwoord"
-#: core/forms.py:263 core/forms.py:338 core/forms.py:258 core/forms.py:328
+#: core/forms.py:263 core/forms.py:338
msgid "The form is secured with reCAPTCHA"
msgstr "Dit formulier is beveiligd met reCAPTCHA"
-#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:275
-#: core/templates/navigation.html:287 core/templates/template.html:147
+#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:285
+#: core/templates/navigation.html:297 core/templates/template.html:149
#: core/templates/user/login.html:20 core/views/user.py:298
#: software/templates/features.html:87 software/templates/features.html:422
-#: core/forms.py:272 core/forms.py:293 core/templates/template.html:152
-#: core/views/user.py:300 software/templates/features.html:80
-#: software/templates/features.html:415
msgid "Register"
msgstr "Registreer"
-#: core/forms.py:315 core/forms.py:306
+#: core/forms.py:315 software/templates/features.html:45
msgid "Contact"
msgstr "Contact"
-#: core/forms.py:316 core/forms.py:307
+#: core/forms.py:316
msgid "Some way of answering you (e-mail, etc.)"
msgstr "Een manier om je te beantwoorden (e-mail, etc.)"
#: core/forms.py:324 exercises/models/comment.py:58 manager/models/set.py:61
-#: manager/models/setting.py:111 nutrition/models/log.py:74 core/forms.py:315
-#: exercises/models/comment.py:42 manager/models/set.py:60
+#: manager/models/setting.py:114 nutrition/models/log.py:77
msgid "Comment"
msgstr "Opmerking"
-#: core/forms.py:325 core/forms.py:316
+#: core/forms.py:325
msgid "What do you want to say?"
msgstr "Wat wil je zeggen?"
@@ -249,6 +236,12 @@ msgstr "Taal korte notatie"
msgid "Language full name"
msgstr "Taal lange notatie"
+#: core/models/language.py:45 core/templates/language/view.html:23
+#, fuzzy
+#| msgid "Language full name"
+msgid "Language full name in English"
+msgstr "Taal lange notatie"
+
#: core/models/license.py:29
msgid "Full name"
msgstr "Volledige naam"
@@ -266,8 +259,7 @@ msgstr ""
msgid "Short name, e.g. CC-BY-SA 3"
msgstr "Korte naam, bvb. CC-BY-SA 3"
-#: core/models/license.py:45 nutrition/models/ingredient.py:214
-#: nutrition/models/ingredient.py:213
+#: core/models/license.py:45 nutrition/models/ingredient.py:208
msgid "Link"
msgstr "Link"
@@ -316,11 +308,11 @@ msgstr "Toon opmerkingen oefening"
msgid "Check to show exercise comments on the workout view"
msgstr "Vink aan om oefeningopmerkingen te tonen in de workout view."
-#: core/models/profile.py:129 core/models/profile.py:130
+#: core/models/profile.py:129
msgid "Also use ingredients in English"
msgstr "Gebruik ook engelstalige ingrediënten"
-#: core/models/profile.py:131 core/models/profile.py:132
+#: core/models/profile.py:131
msgid ""
"Check to also show ingredients in English while creating\n"
"a nutritional plan. These ingredients are extracted from a list provided\n"
@@ -333,11 +325,11 @@ msgstr ""
"compleet, met ongeveer 7000 elementen, maar kan ook overweldigend zijn en je "
"zoektocht bemoeilijken"
-#: core/models/profile.py:140 core/models/profile.py:141
+#: core/models/profile.py:140
msgid "Activate workout reminders"
msgstr "Activeer workout-herinneringen"
-#: core/models/profile.py:142 core/models/profile.py:143
+#: core/models/profile.py:142
msgid ""
"Check to activate automatic reminders for workouts. You need to provide a "
"valid email for this to work."
@@ -345,20 +337,20 @@ msgstr ""
"Aanvinken om automatische herinneringen voor je workouts te activeren. Je "
"moet een geldig e-mailadres invoeren om hiervan gebruik te maken."
-#: core/models/profile.py:151 core/models/profile.py:152
+#: core/models/profile.py:151
msgid "Remind before expiration"
msgstr "Herinner voor vervaldatum"
-#: core/models/profile.py:152 core/models/profile.py:153
+#: core/models/profile.py:152
msgid "The number of days you want to be reminded before a workout expires."
msgstr ""
"Het aantal dagen dat je wil herinnerd worden vooraleer een workout vervalt."
-#: core/models/profile.py:157 core/models/profile.py:159
+#: core/models/profile.py:157
msgid "Default duration of workouts"
msgstr "Standaard duurtijd van workouts"
-#: core/models/profile.py:159 core/models/profile.py:161
+#: core/models/profile.py:159
msgid ""
"Default duration in weeks of workouts not in a schedule. Used for email "
"workout reminders."
@@ -366,11 +358,11 @@ msgstr ""
"Standaard duurtijd in weken voor workouts die geen deel uitmaken van een "
"schema. Gebruikt voor e-mailherinneringen."
-#: core/models/profile.py:176 core/models/profile.py:178
+#: core/models/profile.py:176
msgid "Notification language"
msgstr "Taal meldingen"
-#: core/models/profile.py:178 core/models/profile.py:180
+#: core/models/profile.py:178
msgid ""
"Language to use when sending you email notifications, e.g. email reminders "
"for workouts. This does not affect the language used on the website."
@@ -379,77 +371,70 @@ msgstr ""
"herinneringen voor workouts. Dit beïnvloedt niet de taal die wordt gebruikt "
"op de website."
-#: core/models/profile.py:214 gym/views/export.py:64 core/models/profile.py:216
-#: gym/views/export.py:66
+#: core/models/profile.py:214 gym/views/export.py:64
msgid "Age"
msgstr "Leeftijd"
-#: core/models/profile.py:230 nutrition/forms.py:117 core/models/profile.py:232
-#: nutrition/forms.py:115
+#: core/models/profile.py:230 nutrition/forms.py:118
msgid "Height (cm)"
msgstr "Hoogte (cm)"
-#: core/models/profile.py:247 core/models/profile.py:249
+#: core/models/profile.py:247
msgid "Hours of sleep"
msgstr "Uren slaap"
-#: core/models/profile.py:248 core/models/profile.py:250
+#: core/models/profile.py:248
msgid "The average hours of sleep per day"
msgstr "De gemiddelde uren slaap per dag"
-#: core/models/profile.py:257 core/models/profile.py:259
+#: core/models/profile.py:257
msgid "Work"
msgstr "Werk"
#: core/models/profile.py:258 core/models/profile.py:300
-#: core/models/profile.py:260 core/models/profile.py:302
msgid "Average hours per day"
msgstr "Gemiddelde uren per dag"
#: core/models/profile.py:267 core/models/profile.py:288
-#: core/models/profile.py:309 core/models/profile.py:269
-#: core/models/profile.py:290 core/models/profile.py:311
+#: core/models/profile.py:309
msgid "Physical intensity"
msgstr "Fysieke intensiteit"
#: core/models/profile.py:268 core/models/profile.py:289
-#: core/models/profile.py:310 core/models/profile.py:270
-#: core/models/profile.py:291 core/models/profile.py:312
+#: core/models/profile.py:310
msgid "Approximately"
msgstr "Ongeveer"
-#: core/models/profile.py:278 core/models/profile.py:280
+#: core/models/profile.py:278
msgid "Sport"
msgstr "Sport"
-#: core/models/profile.py:279 core/models/profile.py:281
+#: core/models/profile.py:279
msgid "Average hours per week"
msgstr "Gemiddeld aantal uren per week"
-#: core/models/profile.py:299 core/models/profile.py:301
+#: core/models/profile.py:299
msgid "Free time"
msgstr "Vrije tijd"
#: core/models/profile.py:320 nutrition/templates/rate/form.html:66
-#: core/models/profile.py:322
msgid "Total daily calories"
msgstr "Totale dagelijkse calorieën"
-#: core/models/profile.py:321 core/models/profile.py:323
+#: core/models/profile.py:321
msgid "Total caloric intake, including e.g. any surplus"
msgstr "Totale calorie-inname, inclusief bvb. enige surplus"
#: core/models/profile.py:333 nutrition/models/ingredient_weight_unit.py:45
-#: nutrition/models/log.py:93 nutrition/models/meal_item.py:58
-#: core/models/profile.py:335
+#: nutrition/models/log.py:96 nutrition/models/meal_item.py:59
msgid "Weight unit"
msgstr "Gewichteenheid"
-#: core/models/profile.py:341 core/models/profile.py:343
+#: core/models/profile.py:341
msgid "Allow external access"
msgstr "Externe toegang toestaan"
-#: core/models/profile.py:343 core/models/profile.py:345
+#: core/models/profile.py:343
msgid ""
"Allow external users to access your workouts and logs in a read-only mode. "
"You need to set this before you can share links e.g. to social media."
@@ -458,40 +443,32 @@ msgstr ""
"lezen modus. Je moet dit instellen voordat je links kan delen in "
"bijvoorbeeld social media."
-#: core/models/profile.py:352 core/models/profile.py:354
+#: core/models/profile.py:352
msgid "Automatic reminders for weight entries"
msgstr "Automatische herinneringen voor gewichtsingave"
-#: core/models/profile.py:353 core/models/profile.py:356
+#: core/models/profile.py:353
msgid "Number of days after the last weight entry (enter 0 to deactivate)"
msgstr ""
"Aantal dagen na de laatste gewichtsingave ( geef 0 in om te deactiveren )"
-#: core/models/profile.py:416 core/models/profile.py:422
+#: core/models/profile.py:416
msgid "The sum of all hours has to be 24"
msgstr "Het toaal van alle uren moet 24 zijn"
#: core/models/rep_unit.py:36 core/models/weight_unit.py:36
#: core/templates/user/overview.html:262 core/views/user.py:599
#: exercises/models/category.py:29 exercises/models/equipment.py:29
-#: exercises/models/exercise.py:58 exercises/models/muscle.py:36
+#: exercises/models/exercise.py:59 exercises/models/muscle.py:36
#: gym/models/contract.py:52 gym/models/contract.py:103 gym/models/gym.py:46
#: gym/models/user_document.py:84 gym/templates/contract/view.html:50
#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:96
#: gym/views/gym.py:158 manager/models/schedule.py:55
#: manager/models/workout.py:57 measurements/models/category.py:36
-#: nutrition/models/ingredient.py:125
+#: nutrition/models/ingredient.py:111
#: nutrition/models/ingredient_category.py:27 nutrition/models/meal.py:67
#: nutrition/models/weight_unit.py:38
-#: nutrition/templates/ingredient/pending.html:15
-#: nutrition/templates/ingredient/view.html:178 core/models/rep_unit.py:35
-#: core/models/weight_unit.py:35 core/views/user.py:591
-#: exercises/models/category.py:28 exercises/models/exercise.py:54
-#: gym/models/contract.py:51 gym/models/contract.py:101
-#: gym/models/user_document.py:87 gym/views/gym.py:156
-#: manager/models/workout.py:56 measurements/models/category.py:37
-#: nutrition/models/ingredient.py:124
-#: nutrition/models/ingredient_category.py:26
+#: nutrition/templates/ingredient/view.html:152
msgid "Name"
msgstr "Naam"
@@ -526,7 +503,6 @@ msgstr ""
"voorkomen, bezoek een van de onderstaande links:"
#: core/templates/base.html:10 core/templates/base_wide.html:7
-#: core/templates/base.html:12 core/templates/base_wide.html:10
#, python-format
msgid ""
"You are\n"
@@ -540,7 +516,6 @@ msgstr ""
" "
#: core/templates/base.html:14 core/templates/base_wide.html:11
-#: core/templates/base.html:16 core/templates/base_wide.html:14
#, python-format
msgid "Back to \"%(target)s\""
msgstr "Terug naar \"%(target)s\""
@@ -596,30 +571,27 @@ msgid "Please click the following link to confirm your email: %(link)s"
msgstr "Aub, klik op de volgende link om je email te bevestigen %(link)s"
#: core/templates/index.html:4 software/templates/features.html:432
-#: software/templates/features.html:425
msgid "Dashboard"
msgstr "Dashboard"
-#: core/templates/language/overview.html:4 core/templates/navigation.html:335
+#: core/templates/language/overview.html:4 core/templates/navigation.html:345
msgid "Languages"
msgstr "Talen"
-#: core/templates/language/overview.html:20
+#: core/templates/language/overview.html:22
msgid "Nothing found."
msgstr "Niets gevonden."
-#: core/templates/language/overview.html:20
+#: core/templates/language/overview.html:22
#: manager/templates/calendar/month.html:132
#: manager/templates/schedule/overview.html:28
-#: manager/templates/schedule/view.html:145
+#: manager/templates/schedule/view.html:144
#: manager/templates/workout/overview.html:28
#: nutrition/templates/ingredient/overview.html:38
-#: core/templates/index.html:109
-#: nutrition/templates/ingredient/overview.html:51
msgid "Add one now."
msgstr "Voeg er een toe."
-#: core/templates/language/overview.html:33 core/templates/license/list.html:40
+#: core/templates/language/overview.html:35 core/templates/license/list.html:40
#: core/templates/misc/license/list.html:43
#: core/templates/repetition_unit/list.html:43
#: core/templates/user/overview.html:326 core/templates/user/overview.html:365
@@ -635,20 +607,17 @@ msgstr "Voeg er een toe."
#: gym/templates/gym/member_list.html:211
#: gym/templates/gym/member_list.html:244
#: gym/templates/gym/member_list.html:281
-#: mailer/templates/mailer/gym/overview.html:43 core/views/languages.py:73
-#: core/views/license.py:65 core/views/repetition_units.py:65
-#: core/views/weight_units.py:65 gallery/views/images.py:62
+#: mailer/templates/mailer/gym/overview.html:43
msgid "Add"
msgstr "Aanmaken"
-#: core/templates/language/view.html:58 core/templates/user/api_key.html:44
+#: core/templates/language/view.html:61 core/templates/user/api_key.html:44
#: core/templates/user/preferences.html:45 gym/models/contract.py:203
#: gym/templates/contract/view.html:41 gym/templates/contract/view.html:106
#: gym/templates/gym/member_list.html:248
-#: manager/templates/schedule/view.html:286
-#: manager/templates/workout/view.html:165
-#: nutrition/templates/ingredient/view.html:228 gym/models/contract.py:200
-#: weight/templates/overview.html:46
+#: manager/templates/schedule/view.html:285
+#: manager/templates/workout/view.html:163
+#: nutrition/templates/ingredient/view.html:202
msgid "Options"
msgstr "Opties"
@@ -673,14 +642,11 @@ msgstr "Licentielijst"
#: gym/templates/gym/member_list.html:299
#: mailer/templates/mailer/gym/overview.html:30
#: manager/templates/calendar/day.html:87
-#: nutrition/templates/ingredient/pending.html:30
#: nutrition/templates/units/list.html:29
-#: manager/templates/calendar/day.html:84
msgid "Nothing found"
msgstr "Niets gevonden"
-#: core/templates/misc/about.html:4 core/templates/template.html:173
-#: core/templates/template.html:178
+#: core/templates/misc/about.html:4 core/templates/template.html:175
msgid "Imprint"
msgstr "Afdruk"
@@ -695,185 +661,170 @@ msgstr ""
"licenties voor verschillende landen, voeg ze ze dan hier toe als aparte "
"ingaven."
-#: core/templates/navigation.html:27 software/templates/features.html:437
-#: software/templates/features.html:430
+#: core/templates/navigation.html:28 software/templates/features.html:437
msgid "Training"
msgstr "Training"
-#: core/templates/navigation.html:34 core/templates/user/overview.html:25
+#: core/templates/navigation.html:37 core/templates/user/overview.html:25
msgid "Workouts"
msgstr "Workouts"
-#: core/templates/navigation.html:42
+#: core/templates/navigation.html:46
msgid "Workouts schedules"
msgstr "Workout-schema's"
-#: core/templates/navigation.html:50 core/templates/user/overview.html:70
+#: core/templates/navigation.html:54 core/templates/user/overview.html:70
#: manager/templates/calendar/month.html:10
#: manager/templates/calendar/month.html:21
msgid "Calendar"
msgstr "Kalender"
-#: core/templates/navigation.html:60
+#: core/templates/navigation.html:64
msgid "Measurements"
msgstr "Afmetingen"
-#: core/templates/navigation.html:70 gallery/templates/images/overview.html:6
+#: core/templates/navigation.html:75 gallery/templates/images/overview.html:6
msgid "Gallery"
msgstr "Gallerij"
-#: core/templates/navigation.html:76
+#: core/templates/navigation.html:81
msgid "Workout templates"
msgstr "Workout schemas"
-#: core/templates/navigation.html:82 manager/views/workout.py:84
+#: core/templates/navigation.html:88 manager/views/workout.py:84
msgid "Your templates"
msgstr "Je sjablonen"
-#: core/templates/navigation.html:90 manager/views/workout.py:98
+#: core/templates/navigation.html:97 manager/views/workout.py:98
msgid "Public templates"
msgstr "Publieke schemas"
-#: core/templates/navigation.html:97 manager/forms.py:129
-#: manager/models/setting.py:54 software/templates/features.html:51
-#: software/templates/features.html:459 manager/forms.py:132
-#: software/templates/features.html:452
+#: core/templates/navigation.html:105 manager/forms.py:129
+#: manager/models/setting.py:57 software/templates/features.html:51
+#: software/templates/features.html:459
msgid "Exercises"
msgstr "Oefeningen"
-#: core/templates/navigation.html:103 core/templates/navigation.html:170
-#: core/templates/navigation.html:330
+#: core/templates/navigation.html:111 core/templates/navigation.html:184
+#: core/templates/navigation.html:340
msgid "Administration"
msgstr "Administratie"
-#: core/templates/navigation.html:106
+#: core/templates/navigation.html:115
#, fuzzy
msgid "Exercise edit history"
msgstr "Oefeningdag"
-#: core/templates/navigation.html:111 exercises/models/base.py:103
-#: exercises/models/base.py:101
+#: core/templates/navigation.html:121 exercises/models/base.py:103
msgid "Equipment"
msgstr "Materiaal"
-#: core/templates/navigation.html:116
+#: core/templates/navigation.html:127
msgid "Muscles"
msgstr "Spieren"
-#: core/templates/navigation.html:121
+#: core/templates/navigation.html:133
#: exercises/templates/categories/admin-overview.html:4
msgid "Categories"
msgstr "Categorieën"
-#: core/templates/navigation.html:136 software/templates/features.html:447
-#: software/templates/features.html:440
+#: core/templates/navigation.html:148 software/templates/features.html:447
msgid "Nutrition"
msgstr "Voeding"
-#: core/templates/navigation.html:143 core/templates/user/overview.html:144
+#: core/templates/navigation.html:156 core/templates/user/overview.html:144
msgid "Nutrition plans"
msgstr "Voedingsplannen"
-#: core/templates/navigation.html:151 nutrition/templates/bmi/form.html:50
+#: core/templates/navigation.html:165 nutrition/templates/bmi/form.html:50
msgid "BMI calculator"
msgstr "BMI-calculator"
-#: core/templates/navigation.html:159 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:174 nutrition/templates/rate/form.html:17
msgid "Daily calories calculator"
msgstr "Dagelijkse calorieëncalculator"
-#: core/templates/navigation.html:165
+#: core/templates/navigation.html:179
#: nutrition/templates/ingredient/overview.html:10
-#: nutrition/templates/ingredient/overview.html:35
msgid "Ingredient overview"
msgstr "Ingrediëntenoverzicht"
-#: core/templates/navigation.html:172 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:187 nutrition/templates/units/list.html:6
msgid "Ingredient weight units"
msgstr "Gewichteenheden ingrediënt"
-#: core/templates/navigation.html:177
-#: nutrition/templates/ingredient/pending.html:6
-msgid "Ingredients pending review"
-msgstr "Ingrediënten in overweging"
-
-#: core/templates/navigation.html:193 software/templates/features.html:442
-#: software/templates/features.html:435
+#: core/templates/navigation.html:203 software/templates/features.html:442
msgid "Body weight"
msgstr "Lichaamsgewicht"
-#: core/templates/navigation.html:200 core/templates/user/overview.html:114
-#: weight/templates/overview.html:7
+#: core/templates/navigation.html:210 core/templates/user/overview.html:114
msgid "Weight overview"
msgstr "Gewichtsoverzicht"
-#: core/templates/navigation.html:207 weight/views.py:65
-#: core/templates/index.html:132 weight/views.py:64
+#: core/templates/navigation.html:217 weight/views.py:65
msgid "Add weight entry"
msgstr "Voeg gewichtmeting toe"
-#: core/templates/navigation.html:221
+#: core/templates/navigation.html:231
msgid "About this software"
msgstr "Over deze software"
-#: core/templates/navigation.html:227 software/templates/about_us.html:5
+#: core/templates/navigation.html:237 software/templates/about_us.html:5
msgid "About us"
msgstr "Over ons"
-#: core/templates/navigation.html:233 software/templates/features.html:507
-#: software/templates/features.html:500
+#: core/templates/navigation.html:243 software/templates/features.html:507
msgid "REST API"
msgstr "REST API"
-#: core/templates/navigation.html:239 utils/models.py:45
+#: core/templates/navigation.html:249 utils/models.py:45
msgid "License"
msgstr "Licentie"
-#: core/templates/navigation.html:245
+#: core/templates/navigation.html:255
msgid "Developer documentation"
msgstr "Developer documentatie"
-#: core/templates/navigation.html:252
+#: core/templates/navigation.html:262
msgid "Get the code"
msgstr "Download de code"
-#: core/templates/navigation.html:259 core/templates/template.html:212
-#: software/templates/features.html:582 core/templates/template.html:217
-#: software/templates/features.html:575
+#: core/templates/navigation.html:269 core/templates/template.html:214
+#: software/templates/features.html:582
msgid "Translate"
msgstr "Vertaal"
-#: core/templates/navigation.html:293 core/templates/user/login.html:28
+#: core/templates/navigation.html:303 core/templates/user/login.html:28
msgid "Reset password"
msgstr "Reset wachtwoord"
-#: core/templates/navigation.html:311
+#: core/templates/navigation.html:321
msgid "My preferences"
msgstr "Mijn voorkeuren"
-#: core/templates/navigation.html:320
+#: core/templates/navigation.html:330
msgid "Logout"
msgstr "Afmelden"
-#: core/templates/navigation.html:343
+#: core/templates/navigation.html:353
msgid "Licenses"
msgstr "Licenties"
-#: core/templates/navigation.html:351
+#: core/templates/navigation.html:361
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr "Herhalingen"
-#: core/templates/navigation.html:359 core/templates/weight_unit/list.html:4
-#: nutrition/templates/ingredient/view.html:167
+#: core/templates/navigation.html:369 core/templates/weight_unit/list.html:4
+#: nutrition/templates/ingredient/view.html:141
msgid "Weight units"
msgstr "Gewichteenheden"
-#: core/templates/navigation.html:367 core/templates/user/list.html:4
+#: core/templates/navigation.html:377 core/templates/user/list.html:4
msgid "User list"
msgstr "Gebruikerslijst"
-#: core/templates/navigation.html:373
+#: core/templates/navigation.html:383
msgid "Gyms"
msgstr "Gyms"
@@ -928,12 +879,12 @@ msgstr "Bedankt om onze site te gebruiken!"
msgid "The %(site_name)s team"
msgstr "Het %(site_name)s team"
-#: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:11
+#: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:12
msgid "previous"
msgstr "vorige"
-#: core/templates/tags/pagination.html:31
-#: core/templates/tags/pagination.html:35
+#: core/templates/tags/pagination.html:33
+#: core/templates/tags/pagination.html:38
msgid "next"
msgstr "volgende"
@@ -958,41 +909,36 @@ msgid "Add exercises to this workout day"
msgstr "Oefeningen toevoegen aan deze workout-dag."
#: core/templates/tags/render_weight_log.html:17 manager/helpers.py:86
-#: manager/models/setting.py:69 manager/templates/set/formset.html:9
-#: manager/helpers.py:87
+#: manager/models/setting.py:72 manager/templates/set/formset.html:9
msgid "Reps"
msgstr "Herhalingen"
#: core/templates/tags/render_weight_log.html:30 manager/forms.py:191
-#: manager/models/log.py:103 manager/models/setting.py:99
+#: manager/models/log.py:103 manager/models/setting.py:102
#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
-#: manager/forms.py:194
msgid "RiR"
msgstr "RiR"
-#: core/templates/template.html:120 manager/templates/calendar/month.html:138
-#: manager/templates/schedule/view.html:249
-#: manager/templates/schedule/view.html:270
-#: manager/templates/workout/view.html:86
-#: manager/templates/workout/view.html:139 core/templates/index.html:37
-#: core/templates/misc/fragments/shariff_modal.html:33
-#: core/templates/template.html:125
+#: core/templates/template.html:122 manager/templates/calendar/month.html:138
+#: manager/templates/schedule/view.html:248
+#: manager/templates/schedule/view.html:269
+#: manager/templates/workout/view.html:84
+#: manager/templates/workout/view.html:137
msgid "Close"
msgstr "Sluit"
-#: core/templates/template.html:136 core/templates/template.html:141
+#: core/templates/template.html:138
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:141 core/templates/template.html:146
+#: core/templates/template.html:143
msgid "Create some demo entries"
msgstr "Maak wat demo-ingaven aan"
-#: core/templates/template.html:178 software/templates/features.html:547
-#: software/templates/tos.html:7 core/templates/template.html:183
-#: software/templates/features.html:540
+#: core/templates/template.html:180 software/templates/features.html:547
+#: software/templates/tos.html:7
msgid "Terms of service"
msgstr "Algemene voorwaarden"
@@ -1042,7 +988,6 @@ msgid "Generate new API key"
msgstr "Genereer nieuwe API-sleutel"
#: core/templates/user/api_key.html:55 software/templates/features.html:512
-#: software/templates/features.html:505
msgid "Documentation"
msgstr "Documentatie"
@@ -1092,7 +1037,7 @@ msgid "Overview"
msgstr "Overzicht"
#: core/templates/user/overview.html:28
-#: manager/templates/schedule/view.html:164
+#: manager/templates/schedule/view.html:163
#: manager/templates/workout/overview.html:39 manager/views/schedule_step.py:60
msgid "Add workout"
msgstr "Workout toevoegen"
@@ -1100,35 +1045,23 @@ msgstr "Workout toevoegen"
#: core/templates/user/overview.html:34 core/templates/user/overview.html:76
#: core/templates/user/overview.html:120 core/templates/user/overview.html:152
#: exercises/models/base.py:118 exercises/models/base.py:124
-#: exercises/models/exercise.py:63 exercises/models/exercise.py:69
+#: exercises/models/exercise.py:64 exercises/models/exercise.py:70
#: exercises/models/image.py:107 exercises/models/image.py:113
#: exercises/models/video.py:163 exercises/models/video.py:169
#: gallery/models/image.py:42 manager/helpers.py:85 manager/models/log.py:100
#: manager/models/session.py:67 measurements/models/measurement.py:47
-#: nutrition/models/ingredient.py:101 nutrition/models/ingredient.py:107
-#: nutrition/models/ingredient.py:222 weight/models.py:33
+#: nutrition/models/ingredient.py:87 nutrition/models/ingredient.py:93
+#: nutrition/models/ingredient.py:216 weight/models.py:51
#: weight/templates/import_csv_preview.html:13
#: weight/templates/import_csv_preview.html:42 weight/views.py:144
-#: exercises/models/base.py:116 exercises/models/base.py:122
-#: exercises/models/exercise.py:59 exercises/models/exercise.py:65
-#: exercises/models/image.py:106 exercises/models/image.py:112
-#: exercises/models/video.py:160 exercises/models/video.py:166
-#: gallery/models/image.py:47 manager/helpers.py:86
-#: measurements/models/measurement.py:48 nutrition/models/ingredient.py:100
-#: nutrition/models/ingredient.py:106 nutrition/models/ingredient.py:221
-#: weight/models.py:32 weight/views.py:142
msgid "Date"
msgstr "Datum"
#: core/templates/user/overview.html:35 core/templates/user/overview.html:153
-#: exercises/models/exercise.py:51 gallery/models/image.py:65
+#: exercises/models/exercise.py:52 gallery/models/image.py:65
#: gym/models/contract.py:58 gym/models/contract.py:109
#: manager/models/day.py:37 manager/models/workout.py:63
#: measurements/models/measurement.py:62 nutrition/models/plan.py:67
-#: exercises/models/exercise.py:47 gallery/models/image.py:70
-#: gym/models/contract.py:57 gym/models/contract.py:107
-#: manager/models/workout.py:62 measurements/models/measurement.py:63
-#: nutrition/models/plan.py:68
msgid "Description"
msgstr "Beschrijving"
@@ -1138,25 +1071,23 @@ msgstr "Aantal logs (dagen)"
#: core/templates/user/overview.html:37 core/views/user.py:600
#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:158
-#: core/views/user.py:592 gym/views/gym.py:157
msgid "Last activity"
msgstr "Laatste activiteit"
#: core/templates/user/overview.html:58
#: manager/templates/calendar/month.html:128
-#: manager/templates/schedule/view.html:145
-#: manager/templates/workout/overview.html:28 core/templates/index.html:109
+#: manager/templates/schedule/view.html:144
+#: manager/templates/workout/overview.html:28
msgid "No workouts found."
msgstr "Geen workouts gevonden."
#: core/templates/user/overview.html:68 manager/forms.py:280
-#: manager/templates/workout/view.html:108 manager/forms.py:283
+#: manager/templates/workout/view.html:106
msgid "Log"
msgstr "Log"
#: core/templates/user/overview.html:77 manager/models/session.py:83
#: manager/templates/calendar/partial_overview_table.html:52
-#: manager/models/session.py:84
msgid "General impression"
msgstr "Algemene indruk"
@@ -1175,41 +1106,35 @@ msgstr "Tijd"
#: core/templates/user/overview.html:112 core/templates/user/overview.html:121
#: manager/forms.py:186 manager/helpers.py:86 manager/models/log.py:86
-#: manager/models/setting.py:79 manager/templates/log/add.html:54
-#: manager/templates/set/formset.html:11 weight/models.py:35
+#: manager/models/setting.py:82 manager/templates/log/add.html:54
+#: manager/templates/set/formset.html:11 weight/models.py:53
#: weight/templates/import_csv_preview.html:14
#: weight/templates/import_csv_preview.html:43 weight/views.py:144
-#: core/templates/index.html:125 manager/forms.py:189 manager/helpers.py:87
-#: weight/models.py:34 weight/views.py:142
msgid "Weight"
msgstr "Gewicht"
-#: core/templates/user/overview.html:154 nutrition/models/ingredient.py:130
-#: nutrition/templates/ingredient/view.html:77 nutrition/views/plan.py:237
-#: nutrition/models/ingredient.py:129
+#: core/templates/user/overview.html:154 nutrition/models/ingredient.py:116
+#: nutrition/templates/ingredient/view.html:51 nutrition/views/plan.py:237
msgid "Energy"
msgstr "Energie"
-#: core/templates/user/overview.html:155 nutrition/models/ingredient.py:137
-#: nutrition/templates/ingredient/view.html:84 nutrition/views/plan.py:243
-#: nutrition/models/ingredient.py:136
+#: core/templates/user/overview.html:155 nutrition/models/ingredient.py:123
+#: nutrition/templates/ingredient/view.html:58 nutrition/views/plan.py:243
msgid "Protein"
msgstr "Proteïnen"
-#: core/templates/user/overview.html:156 nutrition/models/ingredient.py:145
-#: nutrition/templates/ingredient/view.html:90 nutrition/views/plan.py:251
-#: nutrition/models/ingredient.py:144
+#: core/templates/user/overview.html:156 nutrition/models/ingredient.py:131
+#: nutrition/templates/ingredient/view.html:64 nutrition/views/plan.py:251
msgid "Carbohydrates"
msgstr "Koolhydraten"
-#: core/templates/user/overview.html:157 nutrition/models/ingredient.py:163
-#: nutrition/templates/ingredient/view.html:106 nutrition/views/plan.py:265
-#: nutrition/models/ingredient.py:162
+#: core/templates/user/overview.html:157 nutrition/models/ingredient.py:149
+#: nutrition/templates/ingredient/view.html:80 nutrition/views/plan.py:265
msgid "Fat"
msgstr "Vet"
#: core/templates/user/overview.html:170
-#: nutrition/templates/ingredient/view.html:79
+#: nutrition/templates/ingredient/view.html:53
msgid "kcal"
msgstr "kcal"
@@ -1221,7 +1146,7 @@ msgstr "kcal"
#: gym/templates/gym/member_list.html:207
#: gym/templates/gym/member_list.html:240
#: gym/templates/gym/member_list.html:277
-#: manager/templates/schedule/view.html:101
+#: manager/templates/schedule/view.html:100
msgid "Actions"
msgstr "Acties"
@@ -1264,16 +1189,13 @@ msgid "Details"
msgstr "Details"
#: core/templates/user/overview.html:258 gym/views/export.py:57
-#: manager/helpers.py:86 manager/templates/schedule/view.html:99
-#: gym/views/export.py:59 manager/helpers.py:87 nutrition/views/plan.py:143
-#: nutrition/views/plan.py:151
+#: manager/helpers.py:86 manager/templates/schedule/view.html:98
msgid "Nr."
msgstr "Nr."
#: core/templates/user/overview.html:280 gym/models/contract.py:287
#: gym/models/gym.py:50 gym/templates/contract/view.html:75
#: gym/templates/gym/member_list.html:100 gym/views/export.py:68
-#: gym/models/contract.py:284 gym/views/export.py:70
msgid "Phone"
msgstr "Telefoon"
@@ -1312,8 +1234,7 @@ msgid "Documents"
msgstr "Documenten"
#: core/templates/user/overview.html:412 gym/templates/document/list.html:32
-#: manager/forms.py:292 manager/templates/workout/view.html:134
-#: manager/forms.py:295
+#: manager/forms.py:292 manager/templates/workout/view.html:132
msgid "Download"
msgstr "Download"
@@ -1356,34 +1277,30 @@ msgid "You need to verify your email to contribute exercises"
msgstr "Je moet jouw email bevestigen om bij te dragen aan oefeningen"
#: core/templates/user/preferences.html:50 core/views/user.py:611
-#: core/views/user.py:603
msgid "Change password"
msgstr "Verander wachtwoord"
#: core/templatetags/wger_extras.py:205 i18n.tpl:37
-#: core/templatetags/wger_extras.py:204
msgid "kg"
msgstr "kg"
#: core/templatetags/wger_extras.py:207
-#: nutrition/templates/ingredient/view.html:86
-#: nutrition/templates/ingredient/view.html:92
-#: nutrition/templates/ingredient/view.html:99
-#: nutrition/templates/ingredient/view.html:108
-#: nutrition/templates/ingredient/view.html:115
-#: nutrition/templates/ingredient/view.html:137
-#: nutrition/templates/ingredient/view.html:147
-#: core/templatetags/wger_extras.py:206
+#: nutrition/templates/ingredient/view.html:60
+#: nutrition/templates/ingredient/view.html:66
+#: nutrition/templates/ingredient/view.html:73
+#: nutrition/templates/ingredient/view.html:82
+#: nutrition/templates/ingredient/view.html:89
+#: nutrition/templates/ingredient/view.html:111
+#: nutrition/templates/ingredient/view.html:121
msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr "g"
#: core/templatetags/wger_extras.py:210 i18n.tpl:38
-#: core/templatetags/wger_extras.py:209
msgid "lb"
msgstr "lb"
-#: core/templatetags/wger_extras.py:212 core/templatetags/wger_extras.py:211
+#: core/templatetags/wger_extras.py:212
msgctxt "weight unit, i.e. ounces"
msgid "oz"
msgstr "oz"
@@ -1392,12 +1309,8 @@ msgstr "oz"
#: exercises/views/equipment.py:103 exercises/views/exercises.py:73
#: exercises/views/muscles.py:99 manager/views/schedule.py:309
#: manager/views/schedule_step.py:128 manager/views/workout.py:249
-#: manager/views/workout_session.py:142 nutrition/views/ingredient.py:116
-#: nutrition/views/unit.py:110 core/views/languages.py:84
-#: exercises/views/categories.py:121 exercises/views/exercises.py:76
-#: exercises/views/muscles.py:98 manager/views/schedule.py:310
-#: manager/views/workout.py:251 manager/views/workout_session.py:140
-#: nutrition/views/ingredient.py:128
+#: manager/views/workout_session.py:142 nutrition/views/ingredient.py:119
+#: nutrition/views/unit.py:110
msgid "Successfully deleted"
msgstr "Met succes verwijderd"
@@ -1408,14 +1321,7 @@ msgstr "Met succes verwijderd"
#: gym/views/admin_notes.py:196 gym/views/document.py:206 gym/views/gym.py:481
#: manager/views/schedule.py:316 manager/views/schedule_step.py:138
#: manager/views/workout.py:253 manager/views/workout_session.py:156
-#: nutrition/views/ingredient.py:123 nutrition/views/unit.py:117
-#: core/views/languages.py:92 core/views/license.py:102
-#: core/views/repetition_units.py:114 core/views/weight_units.py:114
-#: exercises/views/categories.py:127 exercises/views/exercises.py:84
-#: exercises/views/muscles.py:105 gallery/views/images.py:120
-#: gym/views/admin_notes.py:195 gym/views/document.py:205 gym/views/gym.py:477
-#: manager/views/schedule.py:317 manager/views/workout.py:255
-#: manager/views/workout_session.py:155 nutrition/views/ingredient.py:135
+#: nutrition/views/ingredient.py:126 nutrition/views/unit.py:117
#, python-brace-format
msgid "Delete {0}?"
msgstr "Verwijder {0}?"
@@ -1428,19 +1334,13 @@ msgstr "Verwijder {0}?"
#: gym/views/contract.py:186 gym/views/contract_option.py:123
#: gym/views/contract_type.py:123 gym/views/document.py:171
#: gym/views/gym.py:463 manager/views/day.py:100 manager/views/schedule.py:333
-#: manager/views/workout.py:267 nutrition/views/ingredient.py:142
-#: nutrition/views/unit.py:143 core/views/languages.py:110
-#: core/views/license.py:84 core/views/repetition_units.py:85
-#: core/views/user.py:472 core/views/weight_units.py:85
-#: exercises/views/categories.py:97 exercises/views/muscles.py:86
-#: gym/views/admin_notes.py:160 gym/views/document.py:170 gym/views/gym.py:459
-#: manager/views/schedule.py:334 manager/views/workout.py:269
-#: nutrition/views/ingredient.py:154
+#: manager/views/workout.py:267 nutrition/views/ingredient.py:145
+#: nutrition/views/unit.py:143
#, python-brace-format
msgid "Edit {0}"
msgstr "Bewerk {0}"
-#: core/views/misc.py:92 core/views/misc.py:95
+#: core/views/misc.py:92
msgid ""
"We have created sample workout, workout schedules, weight logs, (body) "
"weight and nutrition plan entries so you can better see what this site can "
@@ -1450,33 +1350,32 @@ msgstr ""
"(lichaam)gewicht en voedingsplannen aangemaakt zodat je beter kan zien wat "
"deze site allemaal kan. Voel je vrij om ze te bewerken of verwijderen!"
-#: core/views/misc.py:127 core/views/misc.py:159
+#: core/views/misc.py:127
msgid "Feedback"
msgstr "Feedback"
#: core/views/misc.py:146 weight/templates/import_csv_form.html:9
-#: core/views/misc.py:178
msgid "Submit"
msgstr "Insturen"
-#: core/views/misc.py:154 core/views/misc.py:186
+#: core/views/misc.py:154
msgid "Your feedback was successfully sent. Thank you!"
msgstr "Je feedback werd met succes verzonden. Bedankt!"
-#: core/views/user.py:156 core/views/user.py:157
+#: core/views/user.py:156
#, python-brace-format
msgid "Account \"{0}\" was successfully deleted"
msgstr "Account \"{0}\" werd met succes verwijderd"
-#: core/views/user.py:292 core/views/user.py:294
+#: core/views/user.py:292
msgid "You were successfully registered"
msgstr "Je bent met succes geregistreerd"
-#: core/views/user.py:351 core/views/user.py:355
+#: core/views/user.py:351
msgid "Settings successfully updated"
msgstr "Instellingen met succes aangepast"
-#: core/views/user.py:390 core/views/user.py:392
+#: core/views/user.py:390
msgid "The user was successfully deactivated"
msgstr "De gebruiker werd met succes gedeactiveerd"
@@ -1489,110 +1388,100 @@ msgid "Edit user"
msgstr "Bewerk gebruiker"
#: core/views/user.py:597 gym/templates/gym/member_list.html:26
-#: gym/views/gym.py:158 core/views/user.py:589 gym/views/gym.py:156
+#: gym/views/gym.py:158
msgid "ID"
msgstr "ID"
#: core/views/user.py:598 gym/forms.py:95 gym/templates/contract/view.html:55
#: gym/templates/gym/member_list.html:27 gym/views/export.py:59
-#: gym/views/gym.py:158 gym/views/gym.py:217 core/views/user.py:590
-#: gym/forms.py:94 gym/views/export.py:61 gym/views/gym.py:156
-#: gym/views/gym.py:218
+#: gym/views/gym.py:158 gym/views/gym.py:217
msgid "Username"
msgstr "Gebruikersnaam"
#: core/views/user.py:601 gym/templates/gym/new_user.html:34
-#: gym/views/export.py:58 gym/views/gym.py:217 core/views/user.py:593
-#: gym/views/export.py:60 gym/views/gym.py:218
+#: gym/views/export.py:58 gym/views/gym.py:217
msgid "Gym"
msgstr "Gym"
-#: core/views/user.py:660 core/views/user.py:652
+#: core/views/user.py:660
#, python-format
msgid "A verification email was sent to %(email)s"
msgstr "Een bevestigingsmail is verstuurd naar %(email)s"
-#: exercises/models/base.py:82 nutrition/models/ingredient.py:236
-#: exercises/models/base.py:80 nutrition/models/ingredient.py:235
+#: exercises/models/base.py:82 nutrition/models/ingredient.py:230
msgid "Category"
msgstr "Categorie"
-#: exercises/models/base.py:89 exercises/models/base.py:87
+#: exercises/models/base.py:89
msgid "Primary muscles"
msgstr "Primaire spieren"
-#: exercises/models/base.py:95 exercises/models/base.py:93
+#: exercises/models/base.py:95
msgid "Secondary muscles"
msgstr "Secundaire spieren"
-#: exercises/models/base.py:110 exercises/models/base.py:108
+#: exercises/models/base.py:110
msgid "Variations"
msgstr "Variaties"
-#: exercises/models/category.py:34 exercises/models/category.py:33
+#: exercises/models/category.py:34
msgid "Exercise Categories"
msgstr "Oefeningcategorieën"
-#: exercises/models/comment.py:52 exercises/models/exercise_alias.py:52
+#: exercises/models/comment.py:52 exercises/models/exercise_alias.py:53
#: exercises/models/image.py:74 exercises/models/video.py:98
#: manager/forms.py:178 manager/helpers.py:86 manager/models/log.py:52
-#: exercises/models/comment.py:37 exercises/models/exercise_alias.py:37
-#: exercises/models/image.py:73 exercises/models/video.py:95
-#: manager/forms.py:181 manager/helpers.py:87
msgid "Exercise"
msgstr "Oefening"
-#: exercises/models/comment.py:59 exercises/models/comment.py:43
+#: exercises/models/comment.py:59
msgid "A comment about how to correctly do this exercise."
msgstr "Een opmerking over hoe je deze oefening correct kan uitvoeren."
-#: exercises/models/exercise.py:76 nutrition/models/ingredient.py:95
-#: nutrition/models/weight_unit.py:32 exercises/models/exercise.py:72
-#: nutrition/models/ingredient.py:94
+#: exercises/models/exercise.py:77 nutrition/models/ingredient.py:81
+#: nutrition/models/weight_unit.py:32
msgid "Language"
msgstr "Taal"
-#: exercises/models/exercise_alias.py:58 exercises/models/exercise_alias.py:43
+#: exercises/models/exercise_alias.py:59
msgid "Alias for an exercise"
msgstr "Andere naam voor een oefening"
-#: exercises/models/image.py:57 exercises/models/image.py:56
+#: exercises/models/image.py:57
msgid "Line"
msgstr "Regel"
-#: exercises/models/image.py:58 exercises/models/image.py:57
+#: exercises/models/image.py:58
msgid "3D"
msgstr "3D"
-#: exercises/models/image.py:59 exercises/models/image.py:58
+#: exercises/models/image.py:59
msgid "Low-poly"
msgstr ""
-#: exercises/models/image.py:60 exercises/models/image.py:59
+#: exercises/models/image.py:60
msgid "Photo"
msgstr "Foto"
-#: exercises/models/image.py:61 exercises/models/image.py:60
+#: exercises/models/image.py:61
msgid "Other"
msgstr "Andere"
#: exercises/models/image.py:80 gallery/models/image.py:51
-#: nutrition/models/image.py:60 exercises/models/image.py:79
-#: gallery/models/image.py:56
+#: nutrition/models/image.py:60
msgid "Image"
msgstr "Afbeelding"
#: exercises/models/image.py:81 gallery/models/image.py:52
-#: nutrition/models/image.py:61 exercises/models/image.py:80
-#: gallery/models/image.py:57
+#: nutrition/models/image.py:61
msgid "Only PNG and JPEG formats are supported"
msgstr "Enkel PNG en JPEG-formaten worden ondersteund"
-#: exercises/models/image.py:87 exercises/models/image.py:86
+#: exercises/models/image.py:87
msgid "Main picture"
msgstr "Hoofdafbeelding"
-#: exercises/models/image.py:90 exercises/models/image.py:89
+#: exercises/models/image.py:90
msgid ""
"Tick the box if you want to set this image as the main one for the exercise "
"(will be shown e.g. in the search). The first image is automatically marked "
@@ -1602,7 +1491,7 @@ msgstr ""
"stellen voor de oefening (zal oa. getoond worden in zoekresultaten). De "
"eerste afbeelding wordt automatisch aangeduid door het systeem."
-#: exercises/models/image.py:99 exercises/models/image.py:98
+#: exercises/models/image.py:99
msgid "The art style of your image"
msgstr "De artistieke stijl van de afbeelding"
@@ -1618,52 +1507,50 @@ msgstr "Alternatieve naam"
msgid "A more basic name for the muscle"
msgstr "Een bekendere naam voor deze spier"
-#: exercises/models/video.py:52 exercises/models/video.py:49
+#: exercises/models/video.py:52
#, python-format
msgid "Maximum file size is %(size)sMB."
msgstr "Maximale bestandsgrootte is %(size)sMB."
#: exercises/models/video.py:59 exercises/models/video.py:67
-#: exercises/models/video.py:56 exercises/models/video.py:64
msgid "File type is not supported"
msgstr "Bestandstype wordt niet ondersteund"
-#: exercises/models/video.py:72 exercises/models/video.py:69
+#: exercises/models/video.py:72
#, fuzzy
msgid "File is not a valid video"
msgstr "Bestand is geen geldige video"
-#: exercises/models/video.py:104 exercises/models/video.py:101
+#: exercises/models/video.py:104
#, fuzzy
msgid "Main video"
msgstr "Hoofdvideo"
-#: exercises/models/video.py:110 exercises/models/video.py:107
+#: exercises/models/video.py:110
msgid "Video"
msgstr "Video"
-#: exercises/models/video.py:117 exercises/models/video.py:114
+#: exercises/models/video.py:117
msgid "Size"
msgstr "Grootte"
#: exercises/models/video.py:124 manager/models/schedule_step.py:57
-#: exercises/models/video.py:121 manager/models/schedule_step.py:56
msgid "Duration"
msgstr "Duur"
-#: exercises/models/video.py:133 exercises/models/video.py:130
+#: exercises/models/video.py:133
msgid "Width"
msgstr "Breedte"
-#: exercises/models/video.py:140 exercises/models/video.py:137
+#: exercises/models/video.py:140
msgid "Height"
msgstr "Hoogte"
-#: exercises/models/video.py:147 exercises/models/video.py:144
+#: exercises/models/video.py:147
msgid "Codec"
msgstr "Codec"
-#: exercises/models/video.py:155 exercises/models/video.py:152
+#: exercises/models/video.py:155
msgid "Codec, long name"
msgstr "Codec, lange naam"
@@ -1693,10 +1580,7 @@ msgstr "Acties"
#: manager/models/schedule.py:44 manager/models/session.py:49
#: manager/models/workout.py:89 measurements/models/category.py:31
#: measurements/models/measurement.py:42 nutrition/models/plan.py:54
-#: nutrition/templates/ingredient/pending.html:16 weight/models.py:42
-#: gallery/models/image.py:51 gym/forms.py:57
-#: measurements/models/category.py:32 measurements/models/measurement.py:43
-#: nutrition/models/plan.py:55 weight/models.py:41
+#: weight/models.py:60
msgid "User"
msgstr "Gebruiker"
@@ -1730,15 +1614,15 @@ msgid "Muscle overview"
msgstr "Spieroverzicht"
#: exercises/templates/muscles/admin-overview.html:38
-#: exercises/views/muscles.py:68 exercises/views/muscles.py:67
+#: exercises/views/muscles.py:68
msgid "Add muscle"
msgstr "Creëer spier"
-#: exercises/views/categories.py:72 exercises/views/categories.py:71
+#: exercises/views/categories.py:72
msgid "Add category"
msgstr "Creëer categorie"
-#: exercises/views/categories.py:121 exercises/views/categories.py:120
+#: exercises/views/categories.py:121
msgid "This will also delete all exercises in this category."
msgstr "Dit zal ook alle oefeningen in deze categorie verwijderen."
@@ -1746,7 +1630,7 @@ msgstr "Dit zal ook alle oefeningen in deze categorie verwijderen."
msgid "Delete equipment?"
msgstr "Materiaal verwijderen?"
-#: exercises/views/exercises.py:72 exercises/views/exercises.py:75
+#: exercises/views/exercises.py:72
msgid "This will delete the exercise from all workouts."
msgstr "Dit zal de oefening van alle workouts verwijderen."
@@ -1755,28 +1639,28 @@ msgstr "Dit zal de oefening van alle workouts verwijderen."
msgid "Add image"
msgstr "Voeg afbeelding toe"
-#: gym/forms.py:60 gym/templates/gym/member_list.html:44 gym/forms.py:59
+#: gym/forms.py:60 gym/templates/gym/member_list.html:44
msgid "Trainer"
msgstr "Trainer"
-#: gym/forms.py:62 gym/forms.py:61
+#: gym/forms.py:62
msgid "Gym administrator"
msgstr "Gym-admnistrator"
-#: gym/forms.py:64 gym/templates/gym/member_list.html:52 gym/forms.py:63
+#: gym/forms.py:64 gym/templates/gym/member_list.html:52
msgid "General manager"
msgstr "Algemeen beheerder"
-#: gym/forms.py:98 gym/forms.py:97
+#: gym/forms.py:98
msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
msgstr ""
"Vereist. 30 karakters of minder. Uitsluitend letters, cijfers en @/./+/-/_/."
-#: gym/forms.py:100 gym/forms.py:101
+#: gym/forms.py:100
msgid "This value may contain only letters, numbers and @/.//-/_ characters."
msgstr "Deze waarde mag enkel letters, cijfers en de tekens @/.//-/_ bevatten."
-#: gym/forms.py:114 gym/forms.py:116
+#: gym/forms.py:114
msgid "A user with that username already exists."
msgstr "Er bestaat reeds een gebruiker met deze gebruikersnaam."
@@ -1786,90 +1670,78 @@ msgstr "Herinnering aan inactieve gebruikers"
#: gym/models/admin_user_note.py:67 gym/models/contract.py:305
#: gym/models/user_document.py:93 gym/templates/contract/view.html:96
-#: gym/models/admin_user_note.py:66 gym/models/contract.py:302
-#: gym/models/user_document.py:96
msgid "Note"
msgstr "Notitie"
-#: gym/models/contract.py:143 gym/models/contract.py:141
+#: gym/models/contract.py:143
msgid "Yearly"
msgstr "Jaarlijks"
-#: gym/models/contract.py:144 gym/models/contract.py:142
+#: gym/models/contract.py:144
msgid "Half yearly"
msgstr "Iedere zes maanden"
-#: gym/models/contract.py:145 gym/models/contract.py:143
+#: gym/models/contract.py:145
msgid "Monthly"
msgstr "Maandelijks"
-#: gym/models/contract.py:146 gym/models/contract.py:144
+#: gym/models/contract.py:146
msgid "Biweekly"
msgstr "Om de week"
-#: gym/models/contract.py:147 gym/models/contract.py:145
+#: gym/models/contract.py:147
msgid "Weekly"
msgstr "Wekelijks"
-#: gym/models/contract.py:148 gym/models/contract.py:146
+#: gym/models/contract.py:148
msgid "Daily"
msgstr "Dagelijks"
#: gym/models/contract.py:194 gym/templates/contract/view.html:34
-#: gym/models/contract.py:191
msgid "Contract type"
msgstr "Contracttype"
#: gym/models/contract.py:211 gym/templates/contract/view.html:59
-#: manager/templates/log/add.html:52 nutrition/forms.py:62
-#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:105
-#: nutrition/models/meal_item.py:72 gym/models/contract.py:208
-#: nutrition/forms.py:61
+#: manager/templates/log/add.html:52 nutrition/forms.py:63
+#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:108
+#: nutrition/models/meal_item.py:73
msgid "Amount"
msgstr "Hoeveelheid"
#: gym/models/contract.py:221 gym/templates/contract/view.html:63
-#: gym/models/contract.py:218
msgid "Payment type"
msgstr "Betalingstype"
-#: gym/models/contract.py:225 gym/models/contract.py:222
+#: gym/models/contract.py:225
msgid "How often the amount will be charged to the member"
msgstr "Hoe vaak het bedrag aangerekend zal worden aan het lid"
#: gym/models/contract.py:231 gym/templates/contract/view.html:24
-#: gym/models/contract.py:228
msgid "Contract is active"
msgstr "Contract is actief"
#: gym/models/contract.py:237 gym/templates/contract/view.html:69
-#: manager/models/schedule.py:61 manager/templates/schedule/view.html:68
-#: gym/models/contract.py:234 manager/models/schedule.py:62
+#: manager/models/schedule.py:61 manager/templates/schedule/view.html:67
msgid "Start date"
msgstr "Startdatum"
#: gym/models/contract.py:247 gym/templates/contract/view.html:71
-#: gym/models/contract.py:244
msgid "End date"
msgstr "Einddatum"
#: gym/models/contract.py:263 gym/models/gym.py:73 gym/views/export.py:65
-#: gym/models/contract.py:260 gym/views/export.py:67
msgid "ZIP code"
msgstr "Postcode"
#: gym/models/contract.py:271 gym/models/gym.py:81 gym/views/export.py:66
-#: gym/models/contract.py:268 gym/views/export.py:68
msgid "City"
msgstr "Stad"
#: gym/models/contract.py:279 gym/models/gym.py:89 gym/views/export.py:67
-#: gym/models/contract.py:276 gym/views/export.py:69
msgid "Street"
msgstr "Straat"
#: gym/models/contract.py:295 gym/templates/contract/view.html:92
-#: gym/models/contract.py:292
msgid "Profession"
msgstr "Beroep"
@@ -1922,11 +1794,11 @@ msgstr "Ontvang email-overzichten van inactieve gebruikers"
msgid "Include this user in the email list with inactive members"
msgstr "Deze gebruiker invoegen in de e-maillijst voor inactieve gebruikers"
-#: gym/models/user_document.py:72 gym/models/user_document.py:75
+#: gym/models/user_document.py:72
msgid "Document"
msgstr "Document"
-#: gym/models/user_document.py:85 gym/models/user_document.py:88
+#: gym/models/user_document.py:85
msgid "Will use file name if nothing provided"
msgstr "Zal bestandsnaam gebruiken indien niets voorzien"
@@ -1964,7 +1836,7 @@ msgstr "Gym-lijst"
msgid "Global gym configuration"
msgstr "Globale gym-configuratie"
-#: gym/templates/gym/list.html:67 gym/views/gym.py:171 gym/views/gym.py:170
+#: gym/templates/gym/list.html:67 gym/views/gym.py:171
msgid "Add new gym"
msgstr "Nieuwe gym toevoegen"
@@ -2045,7 +1917,6 @@ msgstr ""
"alsjeblieft op de hoogte van zijn nieuwe wachtwoord."
#: gym/views/admin_notes.py:95 gym/views/document.py:95
-#: gym/views/admin_notes.py:94 gym/views/document.py:94
msgid "Add note"
msgstr "Notitie toevoegen"
@@ -2066,15 +1937,15 @@ msgstr "Verwijder {0}"
msgid "Add contract type"
msgstr "Contracttype toevoegen"
-#: gym/views/export.py:63 gym/views/export.py:65
+#: gym/views/export.py:63
msgid "Gender"
msgstr "Geslacht"
-#: gym/views/gym.py:344 gym/views/gym.py:342
+#: gym/views/gym.py:344
msgid "Add user to gym"
msgstr "Gebruiker aan gym toevoegen"
-#: gym/views/gym.py:443 gym/views/gym.py:438
+#: gym/views/gym.py:443
msgid "Edit gym"
msgstr "Gym bewerken"
@@ -2192,7 +2063,7 @@ msgid "Quads"
msgstr "Quads"
#: i18n.tpl:30 manager/forms.py:182 manager/models/log.py:73
-#: manager/templates/set/add.html:54 manager/forms.py:185
+#: manager/templates/set/add.html:54
msgid "Repetitions"
msgstr "Herhalingen"
@@ -2240,7 +2111,7 @@ msgstr "Genereer proefweergave"
#: mailer/templates/mailer/gym/form.html:28
#: mailer/templates/mailer/gym/preview.html:62
-#: manager/templates/workout/view.html:42
+#: manager/templates/workout/view.html:40
msgid "Steps"
msgstr "Stappen"
@@ -2264,7 +2135,7 @@ msgstr ""
"je wilt"
#: mailer/templates/mailer/gym/preview.html:22
-#: software/templates/about_us.html:60
+#: software/templates/about_us.html:70
msgid "Current version"
msgstr "Huidige versie"
@@ -2277,13 +2148,11 @@ msgstr "Verzend e-mails"
msgid "Correction"
msgstr "Verbetering"
-#: manager/forms.py:90 manager/models/workout.py:60 manager/forms.py:92
-#: manager/models/workout.py:59
+#: manager/forms.py:90 manager/models/workout.py:60
msgid "The name of the workout"
msgstr "Naam van de training"
-#: manager/forms.py:94 manager/models/workout.py:67 manager/forms.py:96
-#: manager/models/workout.py:66
+#: manager/forms.py:94 manager/models/workout.py:67
msgid ""
"A short description or goal of the workout. For example 'Focus on back' or "
"'Week 1 of program xy'."
@@ -2291,7 +2160,7 @@ msgstr ""
"Een korte beschrijving of doel van de workout. Bijvoorbeeld \"Focus op rug\" "
"of \"Week 1 van programma X\"."
-#: manager/forms.py:133 manager/forms.py:136
+#: manager/forms.py:133
msgid ""
"You can search for more than one exercise, they will be grouped together for "
"a superset."
@@ -2299,53 +2168,44 @@ msgstr ""
"Je kan zoeken naar meer dan één oefening, ze zullen gegroepeerd worden in "
"een supserset."
-#: manager/forms.py:140 nutrition/forms.py:252 manager/forms.py:143
-#: nutrition/forms.py:248
+#: manager/forms.py:140 nutrition/forms.py:253
msgid "Also search for names in English"
msgstr "Zoek ook in Engelse namen"
#: manager/forms.py:168 manager/forms.py:173 manager/models/log.py:64
-#: manager/models/log.py:92 manager/models/setting.py:59
-#: manager/models/setting.py:90 manager/templates/log/add.html:53
+#: manager/models/log.py:92 manager/models/setting.py:62
+#: manager/models/setting.py:93 manager/templates/log/add.html:53
#: manager/templates/log/add.html:55 manager/templates/set/formset.html:10
#: manager/templates/set/formset.html:12 measurements/models/category.py:41
-#: nutrition/forms.py:66 manager/forms.py:171 manager/forms.py:176
-#: measurements/models/category.py:42 nutrition/forms.py:65
+#: nutrition/forms.py:67
msgid "Unit"
msgstr "Eenheid"
-#: manager/forms.py:279 manager/forms.py:282
+#: manager/forms.py:279
msgid "Type"
msgstr "Type"
-#: manager/forms.py:280 manager/templates/workout/view.html:115
-#: manager/forms.py:283
+#: manager/forms.py:280 manager/templates/workout/view.html:113
msgid "Table"
msgstr "Tabel"
-#: manager/forms.py:282 manager/templates/workout/view.html:121
-#: manager/forms.py:285
+#: manager/forms.py:282 manager/templates/workout/view.html:119
msgid "with images"
msgstr "met afbeelding"
-#: manager/forms.py:283 manager/templates/workout/view.html:127
-#: manager/forms.py:286
+#: manager/forms.py:283 manager/templates/workout/view.html:125
msgid "with comments"
msgstr "met reacties"
#: manager/management/commands/email-reminders.py:121
-#: manager/management/commands/email-reminders.py:123
msgid "Workout will expire soon"
msgstr "Workout zal spoedig vervallen"
#: manager/models/day.py:34 manager/models/log.py:58
-#: manager/models/session.py:60 manager/templates/schedule/view.html:103
-#: manager/templates/workout/view.html:11
-#: manager/templates/workout/view.html:19 manager/views/pdf.py:85
-#: manager/views/pdf.py:161 manager/views/schedule.py:151
-#: manager/views/schedule.py:221 core/templates/index.html:52
-#: core/templates/index.html:60 manager/models/workout.py:109
-#: manager/views/schedule.py:152 manager/views/schedule.py:222
+#: manager/models/session.py:60 manager/templates/schedule/view.html:102
+#: manager/templates/workout/view.html:9 manager/templates/workout/view.html:17
+#: manager/views/pdf.py:85 manager/views/pdf.py:161
+#: manager/views/schedule.py:151 manager/views/schedule.py:221
msgid "Workout"
msgstr "Workout"
@@ -2366,12 +2226,11 @@ msgid "Name or short description of the schedule. For example 'Program XYZ'."
msgstr ""
"Naam of korte beschrijving van het schema. Bijvoorbeeld \"Programma X\"."
-#: manager/models/schedule.py:65 manager/templates/schedule/view.html:72
-#: manager/models/schedule.py:66
+#: manager/models/schedule.py:65 manager/templates/schedule/view.html:71
msgid "Schedule active"
msgstr "Schema actief"
-#: manager/models/schedule.py:68 manager/models/schedule.py:69
+#: manager/models/schedule.py:68
msgid ""
"Tick the box if you want to mark this schedule as your active one (will be "
"shown e.g. on your dashboard). All other schedules will then be marked as "
@@ -2381,12 +2240,11 @@ msgstr ""
"op o.a. je dashboard). Alle andere schema's zullen dan worden gemarkeerd als "
"inactief."
-#: manager/models/schedule.py:77 manager/templates/schedule/view.html:82
-#: manager/models/schedule.py:78
+#: manager/models/schedule.py:77 manager/templates/schedule/view.html:81
msgid "Is a loop"
msgstr "Is een herhaling"
-#: manager/models/schedule.py:80 manager/models/schedule.py:81
+#: manager/models/schedule.py:80
msgid ""
"Tick the box if you want to repeat the schedules in a loop (i.e. A, B, C, A, "
"B, C, and so on)"
@@ -2394,18 +2252,17 @@ msgstr ""
"Duid het veld aan als je de schema's in een lus (bvb. A, B, C, A, B, C enz.) "
"wil herhalen."
-#: manager/models/schedule_step.py:50 manager/models/schedule_step.py:49
+#: manager/models/schedule_step.py:50
msgid "schedule"
msgstr "schema"
-#: manager/models/schedule_step.py:58 manager/models/schedule_step.py:57
+#: manager/models/schedule_step.py:58
msgid "The duration in weeks"
msgstr "De duurtijd in weken"
#: manager/models/schedule_step.py:64 manager/models/set.py:53
-#: manager/models/setting.py:110 nutrition/models/meal.py:55
-#: nutrition/models/meal_item.py:65 manager/models/schedule_step.py:63
-#: manager/models/set.py:52
+#: manager/models/setting.py:113 nutrition/models/meal.py:55
+#: nutrition/models/meal_item.py:66
msgid "Order"
msgstr "Volgorde"
@@ -2425,7 +2282,7 @@ msgstr "Goed"
msgid "Any notes you might want to save about this workout session."
msgstr "Eenderwelke opmerking die je wil bewarne over deze workout-sessie."
-#: manager/models/session.py:88 manager/models/session.py:89
+#: manager/models/session.py:88
msgid ""
"Your impression about this workout session. Did you exercise as well as you "
"could?"
@@ -2433,45 +2290,44 @@ msgstr ""
"Je indruk over deze workout-sessie. Voerde je de oefening even goed uit als "
"je kon?"
-#: manager/models/session.py:95 manager/models/session.py:97
+#: manager/models/session.py:95
msgid "Start time"
msgstr "Starttijd"
-#: manager/models/session.py:100 manager/models/session.py:102
+#: manager/models/session.py:100
msgid "Finish time"
msgstr "Eindtijd"
-#: manager/models/session.py:127 manager/models/session.py:128
+#: manager/models/session.py:127
msgid "If you enter a time, you must enter both start and end time."
msgstr "Als je een tijd ingeeft, moet je zowel start- als eindtijd ingeven."
-#: manager/models/session.py:130 manager/models/session.py:131
+#: manager/models/session.py:130
msgid "The start time cannot be after the end time."
msgstr "De startijd kan niet na de eindtijd liggen."
-#: manager/models/set.py:47 manager/models/set.py:46
+#: manager/models/set.py:47
msgid "Exercise day"
msgstr "Oefeningdag"
-#: manager/models/set.py:57 manager/models/set.py:56
+#: manager/models/set.py:57
msgid "Number of sets"
msgstr "Aantal sets"
-#: manager/models/setting.py:48
+#: manager/models/setting.py:51
msgid "Sets"
msgstr "Sets"
#: manager/models/workout.py:55 nutrition/models/plan.py:60
-#: manager/models/workout.py:54 nutrition/models/plan.py:61
msgid "Creation date"
msgstr "Creatiedatum"
#: manager/models/workout.py:73 manager/templates/workout/template_view.html:11
-#: manager/templates/workout/template_view.html:19 manager/models/workout.py:72
+#: manager/templates/workout/template_view.html:19
msgid "Workout template"
msgstr "Workout template"
-#: manager/models/workout.py:75 manager/models/workout.py:74
+#: manager/models/workout.py:75
msgid ""
"Marking a workout as a template will freeze it and allow you to make copies "
"of it"
@@ -2511,7 +2367,7 @@ msgstr "Kalender voor %(username)s"
msgid "Detail page"
msgstr "Detailpagina"
-#: manager/templates/calendar/month.html:115 core/templates/index.html:20
+#: manager/templates/calendar/month.html:115
msgid "Add log to day"
msgstr "Log aan dag toevoegen"
@@ -2535,7 +2391,7 @@ msgstr ""
msgid "Go to current month"
msgstr "Naar huidige maand"
-#: manager/templates/calendar/month.html:188 core/templates/index.html:104
+#: manager/templates/calendar/month.html:190
msgid "Add new log"
msgstr "Nieuw log toevoegen"
@@ -2576,8 +2432,8 @@ msgid "Your schedules"
msgstr "Je schema's"
#: manager/templates/schedule/overview.html:19
-#: manager/templates/schedule/view.html:132
-#: manager/templates/schedule/view.html:184
+#: manager/templates/schedule/view.html:131
+#: manager/templates/schedule/view.html:183
#: manager/templates/workout/overview.html:16
msgid "active"
msgstr "Actief"
@@ -2623,11 +2479,11 @@ msgstr ""
msgid "Add schedule"
msgstr "Schema toevoegen"
-#: manager/templates/schedule/view.html:10
+#: manager/templates/schedule/view.html:9
msgid "Schedule"
msgstr "Planning"
-#: manager/templates/schedule/view.html:86
+#: manager/templates/schedule/view.html:85
msgid ""
"This schedule is a loop and will go through the workouts above till you "
"deactivate it"
@@ -2635,20 +2491,19 @@ msgstr ""
"Dit schema is een lus en zal door de workouts hierboven gaan totdat je het "
"deactiveert."
-#: manager/templates/schedule/view.html:104 manager/views/schedule.py:168
-#: manager/views/schedule.py:238
+#: manager/templates/schedule/view.html:103
msgid "Weeks"
msgstr "Weken"
-#: manager/templates/schedule/view.html:116
+#: manager/templates/schedule/view.html:115
msgid "Move me"
msgstr "Verplaats me"
-#: manager/templates/schedule/view.html:157
+#: manager/templates/schedule/view.html:156
msgid "Start schedule"
msgstr "Start schema"
-#: manager/templates/schedule/view.html:188
+#: manager/templates/schedule/view.html:187
#, python-format
msgid ""
"%(weeks)s Week\n"
@@ -2663,11 +2518,11 @@ msgstr[1] ""
"%(weeks)s Weken\n"
" "
-#: manager/templates/schedule/view.html:222
+#: manager/templates/schedule/view.html:221
msgid "Adding workouts"
msgstr "Workouts toevoegen"
-#: manager/templates/schedule/view.html:224
+#: manager/templates/schedule/view.html:223
msgid ""
"Add as many workouts to the schedule as you want. You can\n"
" edit the order by dragging and dropping them. It's also possible "
@@ -2675,21 +2530,21 @@ msgid ""
" than once."
msgstr ""
-#: manager/templates/schedule/view.html:233
-#: manager/templates/schedule/view.html:244
-#: manager/templates/schedule/view.html:291
-#: manager/templates/workout/view.html:71
-#: manager/templates/workout/view.html:81
-#: manager/templates/workout/view.html:180
+#: manager/templates/schedule/view.html:232
+#: manager/templates/schedule/view.html:243
+#: manager/templates/schedule/view.html:290
+#: manager/templates/workout/view.html:69
+#: manager/templates/workout/view.html:79
+#: manager/templates/workout/view.html:178
msgid "Export calendar file"
msgstr "Exporteer kalenderbestand"
-#: manager/templates/schedule/view.html:237
+#: manager/templates/schedule/view.html:236
msgid "Export this schedule as a calendar file."
msgstr "Exporteer dit schema als een kalenderbestand."
-#: manager/templates/schedule/view.html:238
-#: manager/templates/workout/view.html:76
+#: manager/templates/schedule/view.html:237
+#: manager/templates/workout/view.html:74
#, fuzzy
msgid ""
"You can then import the file it into your calendar\n"
@@ -2702,18 +2557,18 @@ msgstr ""
"Google Calendar, Outlook of iCal. Dit zal een afspraak creëren op elke "
"trainingdag met de geschikte oefeningen."
-#: manager/templates/schedule/view.html:259
-#: manager/templates/schedule/view.html:295
-#: manager/templates/workout/view.html:96
-#: manager/templates/workout/view.html:176
+#: manager/templates/schedule/view.html:258
+#: manager/templates/schedule/view.html:294
+#: manager/templates/workout/view.html:94
+#: manager/templates/workout/view.html:174
msgid "Download as PDF"
msgstr "Download als PDF"
-#: manager/templates/schedule/view.html:300
+#: manager/templates/schedule/view.html:299
msgid "Edit schedule"
msgstr "Bewerk schema"
-#: manager/templates/schedule/view.html:305
+#: manager/templates/schedule/view.html:304
msgid "Delete schedule"
msgstr "Verwijder schema"
@@ -2847,12 +2702,12 @@ msgid "Mark as workout"
msgstr "Kopieer deze workout"
#: manager/templates/workout/template_view.html:65
-#: manager/templates/workout/view.html:51
+#: manager/templates/workout/view.html:49
msgid "Muscles trained"
msgstr "Spieren getraind"
#: manager/templates/workout/template_view.html:68
-#: manager/templates/workout/view.html:54
+#: manager/templates/workout/view.html:52
msgid ""
"Images show combined muscles as trained by the exercises on the workout."
msgstr ""
@@ -2864,36 +2719,35 @@ msgstr ""
msgid "Use this template"
msgstr "Deze pagina delen"
-#: manager/templates/workout/view.html:45
+#: manager/templates/workout/view.html:43
msgid "Add training days"
msgstr "Voeg trainingsdagen toe"
-#: manager/templates/workout/view.html:46
+#: manager/templates/workout/view.html:44
msgid "Add workout sets to days"
msgstr "Voeg workout-sets toe aan daen"
-#: manager/templates/workout/view.html:47
+#: manager/templates/workout/view.html:45
msgid "Set the repetitions for each set"
msgstr "Stel de herhalingen in voor elke set"
-#: manager/templates/workout/view.html:75
+#: manager/templates/workout/view.html:73
msgid "Export this workout as a calendar file."
msgstr "Exporteer deze workout als kalenderbestand"
-#: manager/templates/workout/view.html:146
+#: manager/templates/workout/view.html:144
msgid "Logs"
msgstr "Logs"
-#: manager/templates/workout/view.html:148
+#: manager/templates/workout/view.html:146
msgid "View logs"
msgstr "Bekijk logs"
-#: manager/templates/workout/view.html:171 manager/views/schedule_step.py:99
+#: manager/templates/workout/view.html:169 manager/views/schedule_step.py:99
msgid "Edit workout"
msgstr "Bewerk workout"
-#: manager/templates/workout/view.html:184 manager/views/workout.py:281
-#: manager/views/workout.py:283
+#: manager/templates/workout/view.html:182 manager/views/workout.py:281
msgid "Mark as template"
msgstr ""
@@ -2901,7 +2755,7 @@ msgstr ""
msgid "Add workout day"
msgstr "Voeg workout-dag toe"
-#: manager/views/log.py:100 manager/views/log.py:99
+#: manager/views/log.py:100
msgid "Delete workout log"
msgstr "Verwijder workout-log"
@@ -2910,69 +2764,68 @@ msgstr "Verwijder workout-log"
msgid "Workout for %s"
msgstr "Workout voor %s"
-#: manager/views/schedule.py:291 manager/views/schedule.py:292
+#: manager/views/schedule.py:291
msgid "Create schedule"
msgstr "Schema aanmaken"
-#: manager/views/workout.py:209 manager/views/workout.py:211
+#: manager/views/workout.py:209
msgid "Copy workout"
msgstr "Kopieer workout"
-#: manager/views/workout.py:212 manager/views/workout.py:214
+#: manager/views/workout.py:212
msgid "Copy"
msgstr "Kopieer"
-#: manager/views/workout_session.py:70 manager/views/workout_session.py:69
+#: manager/views/workout_session.py:70
#, python-brace-format
msgid "Edit workout impression for {0}"
msgstr "Bewerk workout-indruk voor {0}"
-#: manager/views/workout_session.py:117 manager/views/workout_session.py:115
+#: manager/views/workout_session.py:117
#, python-brace-format
msgid "New workout impression for the {0}"
msgstr "Nieuwe workout-impressie voor de {0}"
-#: manager/views/workout_session.py:158 manager/views/workout_session.py:157
+#: manager/views/workout_session.py:158
msgid "This will delete all weight logs for this day as well."
msgstr ""
-#: measurements/models/measurement.py:52 measurements/models/measurement.py:53
+#: measurements/models/measurement.py:52
msgid "Value"
msgstr ""
-#: nutrition/forms.py:117 nutrition/forms.py:116
+#: nutrition/forms.py:118
#, fuzzy
msgid "Height (in)"
msgstr "Hoogte (cm)"
-#: nutrition/forms.py:120 nutrition/forms.py:117
+#: nutrition/forms.py:121
#, fuzzy
msgid "Weight (kg)"
msgstr "Gewichtlog"
-#: nutrition/forms.py:120 nutrition/forms.py:118
+#: nutrition/forms.py:121
#, fuzzy
msgid "Weight (lbs)"
msgstr "Gewichtlog"
-#: nutrition/forms.py:133 nutrition/forms.py:129
+#: nutrition/forms.py:134
msgid "Calculate"
msgstr "Bereken"
-#: nutrition/forms.py:207 nutrition/templates/rate/form.html:76
-#: nutrition/forms.py:202
+#: nutrition/forms.py:208 nutrition/templates/rate/form.html:76
msgid "Basic caloric intake"
msgstr "Basis calorie-inname"
-#: nutrition/forms.py:208 nutrition/forms.py:203
+#: nutrition/forms.py:209
msgid "Your basic caloric intake as calculated for your data"
msgstr "Je basis calorie-inname zoals berekend voor je data"
-#: nutrition/forms.py:213 nutrition/forms.py:209
+#: nutrition/forms.py:214
msgid "Additional calories"
msgstr "Bijkomende calorieën"
-#: nutrition/forms.py:215 nutrition/forms.py:211
+#: nutrition/forms.py:216
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
@@ -2980,80 +2833,56 @@ msgstr ""
"Bijkomende calorieën om toe te voegen aan het basisaantal (om af te trekken, "
"voer een negatief cijfer in)"
-#: nutrition/forms.py:248 nutrition/models/ingredient_weight_unit.py:39
-#: nutrition/models/log.py:84 nutrition/models/meal_item.py:53
-#: nutrition/forms.py:244
+#: nutrition/forms.py:249 nutrition/models/ingredient_weight_unit.py:39
+#: nutrition/models/log.py:87 nutrition/models/meal_item.py:54
msgid "Ingredient"
msgstr "Ingrediënt"
-#: nutrition/models/ingredient.py:131 nutrition/models/ingredient.py:130
+#: nutrition/models/ingredient.py:117
msgid "In kcal per 100g"
msgstr "In kcal per 100g"
-#: nutrition/models/ingredient.py:138 nutrition/models/ingredient.py:146
-#: nutrition/models/ingredient.py:156 nutrition/models/ingredient.py:164
-#: nutrition/models/ingredient.py:174 nutrition/models/ingredient.py:184
-#: nutrition/models/ingredient.py:194 nutrition/models/ingredient.py:137
-#: nutrition/models/ingredient.py:145 nutrition/models/ingredient.py:155
-#: nutrition/models/ingredient.py:163 nutrition/models/ingredient.py:173
-#: nutrition/models/ingredient.py:183 nutrition/models/ingredient.py:193
+#: nutrition/models/ingredient.py:124 nutrition/models/ingredient.py:132
+#: nutrition/models/ingredient.py:142 nutrition/models/ingredient.py:150
+#: nutrition/models/ingredient.py:160 nutrition/models/ingredient.py:170
+#: nutrition/models/ingredient.py:180
msgid "In g per 100g of product"
msgstr "In g per 100g product"
-#: nutrition/models/ingredient.py:155
-#: nutrition/templates/ingredient/view.html:96 nutrition/views/plan.py:259
-#: nutrition/models/ingredient.py:154
+#: nutrition/models/ingredient.py:141
+#: nutrition/templates/ingredient/view.html:70 nutrition/views/plan.py:259
msgid "Sugar content in carbohydrates"
msgstr "Suikerinhoud in koolhydraten"
-#: nutrition/models/ingredient.py:173
-#: nutrition/templates/ingredient/view.html:112 nutrition/views/plan.py:273
-#: nutrition/models/ingredient.py:172
+#: nutrition/models/ingredient.py:159
+#: nutrition/templates/ingredient/view.html:86 nutrition/views/plan.py:273
msgid "Saturated fat content in fats"
msgstr "Verzadigde vetinhoud in vetten"
-#: nutrition/models/ingredient.py:183
-#: nutrition/templates/ingredient/view.html:134 nutrition/views/plan.py:279
-#: nutrition/models/ingredient.py:182
-msgid "Fibres"
-msgstr "Vezels"
+#: nutrition/models/ingredient.py:169
+#: nutrition/templates/ingredient/view.html:108 nutrition/views/plan.py:279
+msgid "Fiber"
+msgstr ""
-#: nutrition/models/ingredient.py:193
-#: nutrition/templates/ingredient/view.html:144 nutrition/views/plan.py:285
-#: nutrition/models/ingredient.py:192
+#: nutrition/models/ingredient.py:179
+#: nutrition/templates/ingredient/view.html:118 nutrition/views/plan.py:285
msgid "Sodium"
msgstr "Natrium"
-#: nutrition/models/ingredient.py:215 nutrition/models/ingredient.py:214
+#: nutrition/models/ingredient.py:209
msgid "Link to product"
msgstr ""
-#: nutrition/models/ingredient.py:244 nutrition/models/ingredient.py:243
+#: nutrition/models/ingredient.py:238
msgid "Brand name of product"
msgstr ""
-#: nutrition/models/ingredient.py:304
+#: nutrition/models/ingredient.py:305
#, python-brace-format
msgid "The total energy ({self.energy}kcal) is not the approximate sum of the "
msgstr ""
-#: nutrition/models/ingredient.py:383 nutrition/views/ingredient.py:196
-#: nutrition/models/ingredient.py:385 nutrition/views/ingredient.py:207
-msgid "Ingredient was successfully added to the general database"
-msgstr "Ingrediënt met succes toegevoegd aan de algemene databank"
-
-#: nutrition/models/ingredient.py:408 nutrition/models/ingredient.py:409
-msgid "New user submitted ingredient"
-msgstr "Nieuw door gebruiker toegevoegd ingrediënt"
-
-#: nutrition/models/ingredient.py:410
-#, fuzzy, python-brace-format
-msgid ""
-"The user {request.user.username} submitted a new ingredient \"{self.name}\"."
-msgstr "Gebruiker {0} diende een nieuw ingrediënt \"{1}\" in."
-
#: nutrition/models/ingredient_category.py:31
-#: nutrition/models/ingredient_category.py:30
msgid "Ingredient Categories"
msgstr ""
@@ -3065,17 +2894,16 @@ msgstr "Hoeveelheid in grammen"
msgid "Unit amount, e.g. \"1 Cup\" or \"1/2 spoon\""
msgstr "Eenheidshoeveelheid, bvb. \"1 kopje\" of \"1/2 lepel\""
-#: nutrition/models/log.py:49 nutrition/models/meal.py:50
-#: nutrition/models/meal_item.py:47 nutrition/models/plan.py:106
-#: nutrition/models/plan.py:108
+#: nutrition/models/log.py:52 nutrition/models/meal.py:50
+#: nutrition/models/meal_item.py:48 nutrition/models/plan.py:108
msgid "Nutrition plan"
msgstr "Voedingsplan"
-#: nutrition/models/log.py:58
+#: nutrition/models/log.py:61
msgid "Meal"
msgstr "Maaltijd"
-#: nutrition/models/log.py:68
+#: nutrition/models/log.py:71
#, fuzzy
msgid "Date and Time (Approx.)"
msgstr "Tijd (ongeveer)"
@@ -3090,7 +2918,7 @@ msgid ""
"workout\""
msgstr ""
-#: nutrition/models/plan.py:69 nutrition/models/plan.py:70
+#: nutrition/models/plan.py:69
msgid ""
"A description of the goal of the plan, e.g. \"Gain mass\" or \"Prepare for "
"summer\""
@@ -3098,11 +2926,11 @@ msgstr ""
"Een omschrijving van het doel van je plan, bvb \"Massa verhogen\" of "
"\"Klaarstomen voor de zomer\""
-#: nutrition/models/plan.py:88 nutrition/models/plan.py:90
+#: nutrition/models/plan.py:90
msgid "Use daily calories"
msgstr "Gebruik dagelijkse calorieën"
-#: nutrition/models/plan.py:91 nutrition/models/plan.py:93
+#: nutrition/models/plan.py:93
msgid ""
"Tick the box if you want to mark this plan as having a goal amount of "
"calories. You can use the calculator or enter the value yourself."
@@ -3218,82 +3046,47 @@ msgstr ""
"gebracht wanneer het proces met succes voltooid werd."
#: nutrition/templates/ingredient/overview.html:38
-#: nutrition/templates/ingredient/overview.html:51
msgid "No ingredients."
msgstr "Geen ingrediënten."
#: nutrition/templates/ingredient/overview.html:49
-#: nutrition/templates/ingredient/overview.html:63
msgid "Search"
msgstr "Zoek"
#: nutrition/templates/ingredient/overview.html:62
-#: nutrition/templates/ingredient/overview.html:85
-#: nutrition/templates/ingredient/overview.html:89
msgid "Add ingredient"
msgstr "Ingrediënt toevoegen"
-#: nutrition/templates/ingredient/pending.html:14
-msgid "Submission date"
-msgstr "Instuurdatum"
-
-#: nutrition/templates/ingredient/view.html:27
-msgid "Ingredient is pending review"
-msgstr "Ingrediënt in overweging"
-
-#: nutrition/templates/ingredient/view.html:28
-msgid ""
-"This user submitted ingredient is pending a decision to be\n"
-"included in the database. Till then, it will not be shown in the overview "
-"or\n"
-"the search."
-msgstr ""
-"Dit ingrediënt, ingediend door een gebruiker, wacht op \n"
-"een goedkeuring om toegevoegd te worden aan de databank. Tot dat moment\n"
-"zal deze niet worden getoond in het overzicht of de zoekresultaten."
-
-#: nutrition/templates/ingredient/view.html:31
-msgid "Please select one of the options below."
-msgstr "Gelieve één van de opties hieronder te kiezen."
-
-#: nutrition/templates/ingredient/view.html:38
-msgid "Accept"
-msgstr "Aanvaard"
-
-#: nutrition/templates/ingredient/view.html:42
-msgid "Decline"
-msgstr "Weiger"
-
-#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:229
+#: nutrition/templates/ingredient/view.html:45 nutrition/views/plan.py:229
msgid "Macronutrients"
msgstr "Macrovoedingstoffen"
-#: nutrition/templates/ingredient/view.html:80
+#: nutrition/templates/ingredient/view.html:54
msgid "kJ"
msgstr ""
-#: nutrition/templates/ingredient/view.html:101
-#: nutrition/templates/ingredient/view.html:117
-#: nutrition/templates/ingredient/view.html:139
-#: nutrition/templates/ingredient/view.html:149
+#: nutrition/templates/ingredient/view.html:75
+#: nutrition/templates/ingredient/view.html:91
+#: nutrition/templates/ingredient/view.html:113
+#: nutrition/templates/ingredient/view.html:123
msgid "n.A."
msgstr "Nvt."
-#: nutrition/templates/ingredient/view.html:128
+#: nutrition/templates/ingredient/view.html:102
msgid "Others"
msgstr "Anderen"
-#: nutrition/templates/ingredient/view.html:170
+#: nutrition/templates/ingredient/view.html:144
#: nutrition/templates/units/list.html:46 nutrition/views/unit.py:86
msgid "Add new weight unit"
msgstr "Voeg gewichteenheid toe"
-#: nutrition/templates/ingredient/view.html:232
-#: nutrition/templates/ingredient/view.html:235
+#: nutrition/templates/ingredient/view.html:206
+#: nutrition/templates/ingredient/view.html:209
msgid "Edit ingredient"
msgstr "Bewerk ingrediënt"
-#: nutrition/templates/ingredient/view.html:239
+#: nutrition/templates/ingredient/view.html:213
msgid "Delete ingredient"
msgstr "Verwijder ingrediënt"
@@ -3394,24 +3187,20 @@ msgstr ""
msgid "56 to 90"
msgstr ""
-#: nutrition/views/ingredient.py:154 nutrition/views/ingredient.py:165
+#: nutrition/views/ingredient.py:157
msgid "Add a new ingredient"
msgstr "Nieuw ingrediënt toevoegen"
-#: nutrition/views/ingredient.py:209 nutrition/views/ingredient.py:220
-msgid "Ingredient was successfully marked as rejected"
-msgstr "Ingrediënt met succes gemarkeerd als afgewezen"
-
-#: nutrition/views/plan.py:120 nutrition/views/plan.py:119
+#: nutrition/views/plan.py:120
msgid "Nutritional plan"
msgstr "Voedingsplan"
-#: nutrition/views/plan.py:122 nutrition/views/plan.py:121
+#: nutrition/views/plan.py:122
#, python-format
msgid "Nutritional plan for %s"
msgstr "Voedingsplan voor %s"
-#: nutrition/views/plan.py:194 nutrition/views/plan.py:195
+#: nutrition/views/plan.py:194
msgid "<i>This is an empty plan, what did you expect on the PDF?</i>"
msgstr "<i>Dit is een leeg plan, wat had je verwacht op de PDF?</i>"
@@ -3446,53 +3235,61 @@ msgid ""
msgstr ""
#: software/templates/about_us.html:18
-msgid "Source code"
-msgstr ""
-
-#: software/templates/about_us.html:20
-msgid "Get the source code of this application and its server on github"
-msgstr ""
-
-#: software/templates/about_us.html:25
msgid "Have a problem or idea?"
msgstr ""
-#: software/templates/about_us.html:27
+#: software/templates/about_us.html:20
msgid ""
"Get in touch if something didn't behave as expected or if there is a feature "
"that you feel is missing."
msgstr ""
-#: software/templates/about_us.html:32
+#: software/templates/about_us.html:26
msgid "Say hi!"
msgstr ""
-#: software/templates/about_us.html:34
+#: software/templates/about_us.html:28
msgid "If you want to chat with us, hop on the Discord server and get in touch"
msgstr ""
-#: software/templates/about_us.html:39 software/templates/features.html:503
-#: software/templates/features.html:496
+#: software/templates/about_us.html:33
+msgid "Mastodon"
+msgstr ""
+
+#: software/templates/about_us.html:35
+msgid "Follow us on mastodon for updates and news about the project"
+msgstr ""
+
+#: software/templates/about_us.html:40 software/templates/features.html:503
#, fuzzy
msgid "Translation"
msgstr "Vertaal"
-#: software/templates/about_us.html:41
+#: software/templates/about_us.html:42
msgid ""
"This application is translated on weblate. If you also want to help, click "
"the link and start translating"
msgstr ""
-#: software/templates/about_us.html:50
+#: software/templates/about_us.html:47
+msgid "Source code"
+msgstr ""
+
+#: software/templates/about_us.html:49
+msgid "Get the source code of this application and its server on github"
+msgstr ""
+
+#: software/templates/about_us.html:59
msgid "Our goal"
msgstr "Ons doel"
-#: software/templates/about_us.html:53
+#: software/templates/about_us.html:62
#, fuzzy
msgid ""
"The goal is to build an awesome\n"
" and flexible fitness manager, along with a comprehensive and "
-"complete list of exercises and\n"
+"complete list of\n"
+" exercises and\n"
" ingredients, all released under a free license."
msgstr ""
"Het doel is een geweldige en\n"
@@ -3506,224 +3303,218 @@ msgid ""
"your exercises and workouts."
msgstr ""
-#: software/templates/features.html:45
-msgid "About"
-msgstr "Over"
-
-#: software/templates/features.html:57 software/templates/features.html:50
+#: software/templates/features.html:57
msgid "Mobile app"
msgstr ""
#: software/templates/features.html:63 software/templates/features.html:319
-#: software/templates/features.html:56 software/templates/features.html:312
msgid "Donate"
msgstr ""
-#: software/templates/features.html:68 software/templates/features.html:61
+#: software/templates/features.html:68
msgid "Develop"
msgstr ""
#: software/templates/features.html:73 software/templates/features.html:455
-#: software/templates/features.html:66 software/templates/features.html:448
#, fuzzy
msgid "Community"
msgstr "Opmerking"
-#: software/templates/features.html:107 software/templates/features.html:100
+#: software/templates/features.html:107
msgid "Track your <br> way to your <br> ideal body"
msgstr ""
-#: software/templates/features.html:110 software/templates/features.html:103
+#: software/templates/features.html:110
msgid ""
"Join wger, the community-driven <b>free and open-source fitness tracker</b>"
msgstr ""
-#: software/templates/features.html:120 software/templates/features.html:113
+#: software/templates/features.html:120
#, fuzzy
msgid "Get Started"
msgstr "Download de code"
-#: software/templates/features.html:130 software/templates/features.html:123
+#: software/templates/features.html:130
msgid "people <br> using wger"
msgstr ""
-#: software/templates/features.html:134 software/templates/features.html:127
+#: software/templates/features.html:134
#, fuzzy
msgid "exercises <br> for workout creation"
msgstr "Oefeningen toevoegen aan deze workout-dag."
-#: software/templates/features.html:138 software/templates/features.html:131
+#: software/templates/features.html:138
msgid "foods <br> for meal planing"
msgstr ""
-#: software/templates/features.html:142 software/templates/features.html:135
+#: software/templates/features.html:142
msgid "stars <br> on GitHub"
msgstr ""
-#: software/templates/features.html:166 software/templates/features.html:159
+#: software/templates/features.html:166
msgid "Craft your perfect <span>workout routines</span>"
msgstr ""
-#: software/templates/features.html:170 software/templates/features.html:163
+#: software/templates/features.html:170
msgid "Design a weekly workout plan from more than 100 exercises"
msgstr ""
-#: software/templates/features.html:173 software/templates/features.html:166
+#: software/templates/features.html:173
msgid "Set reps and sets, duration, or distance goals for each exercise"
msgstr ""
-#: software/templates/features.html:176 software/templates/features.html:169
+#: software/templates/features.html:176
msgid "Get guided through your workouts step by step"
msgstr ""
-#: software/templates/features.html:179 software/templates/features.html:172
+#: software/templates/features.html:179
msgid ""
"Keep track of the workouts you've done, including how you felt you performed"
msgstr ""
-#: software/templates/features.html:200 software/templates/features.html:193
+#: software/templates/features.html:200
msgid "Plan your <span>daily meals</span>"
msgstr ""
-#: software/templates/features.html:204 software/templates/features.html:197
+#: software/templates/features.html:204
msgid "Fill your week with nutritious meals that help you perform better"
msgstr ""
-#: software/templates/features.html:207 software/templates/features.html:200
+#: software/templates/features.html:207
msgid "Build meals from a database of more than 2 million foods"
msgstr ""
-#: software/templates/features.html:210 software/templates/features.html:203
+#: software/templates/features.html:210
msgid ""
"Get automatically calculated nutritional values (energy, protein, "
"carbs, ...) for both individual meals and your entire weekly plan"
msgstr ""
-#: software/templates/features.html:237 software/templates/features.html:230
+#: software/templates/features.html:237
msgid "Keep track of <span>your progress</span>"
msgstr ""
-#: software/templates/features.html:242 software/templates/features.html:235
+#: software/templates/features.html:242
msgid "Track and annotate everything about your meals and workouts"
msgstr ""
-#: software/templates/features.html:245 software/templates/features.html:238
+#: software/templates/features.html:245
#, fuzzy
msgid "Add custom notes"
msgstr "Voeg dagboekitem op maat toe"
-#: software/templates/features.html:248 software/templates/features.html:241
+#: software/templates/features.html:248
#, fuzzy
msgid "Record your weight"
msgstr "Lichaamsgewicht"
-#: software/templates/features.html:251 software/templates/features.html:244
+#: software/templates/features.html:251
msgid "Keep a photo log to see your progress"
msgstr ""
-#: software/templates/features.html:254 software/templates/features.html:247
+#: software/templates/features.html:254
msgid "Use the calendar view to see past entries"
msgstr ""
-#: software/templates/features.html:273 software/templates/features.html:266
+#: software/templates/features.html:273
#, fuzzy
msgid "Try wger now"
msgstr "Probeer het nu"
-#: software/templates/features.html:290 software/templates/features.html:283
+#: software/templates/features.html:290
msgid "Powered By <span>the community</span>"
msgstr ""
-#: software/templates/features.html:293 software/templates/features.html:286
+#: software/templates/features.html:293
msgid ""
"wger is funded and created by the open-source community: people like you "
"translating, adding exercises and nutritional info, developing, and more."
msgstr ""
-#: software/templates/features.html:299 software/templates/features.html:292
+#: software/templates/features.html:299
msgid ""
"We don't use ads, don't sell your personal info, and we share the code under "
"a free and open-source license."
msgstr ""
-#: software/templates/features.html:304 software/templates/features.html:297
+#: software/templates/features.html:304
msgid "Pitch in and help make wger even better!"
msgstr ""
-#: software/templates/features.html:313 software/templates/features.html:306
+#: software/templates/features.html:313
#, fuzzy
msgid "Contribute"
msgstr "Draag bij!"
-#: software/templates/features.html:337 software/templates/features.html:330
+#: software/templates/features.html:337
msgid "Sign Up Now For Free"
msgstr ""
-#: software/templates/features.html:350 software/templates/features.html:343
+#: software/templates/features.html:350
msgid "Web version not enough?"
msgstr ""
-#: software/templates/features.html:352 software/templates/features.html:345
+#: software/templates/features.html:352
#, fuzzy
msgid "Get the code, too!"
msgstr "Download de code"
-#: software/templates/features.html:363 software/templates/features.html:356
+#: software/templates/features.html:363
msgid "Set up a private server for your gym"
msgstr ""
-#: software/templates/features.html:366 software/templates/features.html:359
+#: software/templates/features.html:366
msgid ""
"Don't want your data on an online service? Set up a wger instance on your "
"own server for free!"
msgstr ""
-#: software/templates/features.html:380 software/templates/features.html:373
+#: software/templates/features.html:380
msgid "Integrate with your own app"
msgstr ""
-#: software/templates/features.html:383 software/templates/features.html:376
+#: software/templates/features.html:383
msgid "wger offers an open API that you can use for your app."
msgstr ""
-#: software/templates/features.html:394 software/templates/features.html:387
+#: software/templates/features.html:394
#, fuzzy
msgid "Create your own version"
msgstr "Huidige versie"
-#: software/templates/features.html:397 software/templates/features.html:390
+#: software/templates/features.html:397
msgid ""
"The source code is available under the GNU AGPLv3 license! Feel free to fork "
"it on GitHub."
msgstr ""
-#: software/templates/features.html:418 software/templates/features.html:411
+#: software/templates/features.html:418
#, fuzzy
msgid "Account"
msgstr "Hoeveelheid"
-#: software/templates/features.html:464 software/templates/features.html:457
+#: software/templates/features.html:464
#, fuzzy
msgid "Workout routines"
msgstr "Workout-herinneringen"
-#: software/templates/features.html:470 software/templates/features.html:463
+#: software/templates/features.html:470
msgid "Discord"
msgstr "Discord"
-#: software/templates/features.html:485 software/templates/features.html:478
+#: software/templates/features.html:485
msgid "Software"
msgstr ""
-#: software/templates/features.html:491 software/templates/features.html:484
+#: software/templates/features.html:491
msgid "Report an issue"
msgstr ""
-#: software/templates/features.html:497 software/templates/features.html:490
+#: software/templates/features.html:497
msgid "Source Code"
msgstr ""
-#: utils/generic_views.py:263 utils/generic_views.py:262
+#: utils/generic_views.py:263
msgid "Yes, delete"
msgstr "Ja, verwijder"
@@ -3762,32 +3553,19 @@ msgid ""
"to its own copyright."
msgstr ""
-#: utils/models.py:130 utils/models.py:128
-msgid "Pending"
-msgstr "In overweging"
-
-#: utils/models.py:131 utils/models.py:129
-msgid "Accepted"
-msgstr "Aanvaard"
-
-#: utils/models.py:132 utils/models.py:130
-msgid "Declined"
-msgstr "Afgewezen"
-
-#: weight/forms.py:54 weight/forms.py:53
+#: weight/forms.py:54
msgid "Input"
msgstr "Ingave"
-#: weight/forms.py:55 weight/forms.py:54
+#: weight/forms.py:55
msgid "Date format"
msgstr "Datumformaat"
#: weight/management/commands/email-weight-reminder.py:78
-#: weight/management/commands/email-weight-reminder.py:80
msgid "You have to enter your weight"
msgstr "U moet uw gewicht ingeven"
-#: weight/models.py:60 weight/models.py:58
+#: weight/models.py:78
msgid "Weight entry"
msgstr "Gewichtingave"
@@ -3907,101 +3685,136 @@ msgstr ""
msgid "Re-Submit"
msgstr "Her-indienen"
-#: weight/views.py:100 weight/views.py:98
+#: weight/views.py:100
#, python-format
msgid "Edit weight entry for the %s"
msgstr "Bewerkt gewichtingave voor %s"
-#: weight/views.py:117 weight/views.py:115
+#: weight/views.py:117
msgid "Successfully deleted."
msgstr "Met succes verwijderd."
-#: weight/views.py:121 weight/views.py:119
+#: weight/views.py:121
#, python-format
msgid "Delete weight entry for the %s"
msgstr "Verwijder gewichtsingave voor de %s"
-#: core/templates/base.html:42 core/templates/base_wide.html:39
-msgid "Share"
-msgstr "Deel"
+#~ msgid "Ingredients pending review"
+#~ msgstr "Ingrediënten in overweging"
-#: core/templates/index.html:24
-msgid ""
-"Click to add weight logs to a training\n"
-" day in your current workout:"
-msgstr ""
-"Klik om gewichtingaven toe te voegen aan een\n"
-"trainingdag in je huidige workout:"
+#~ msgid "Fibres"
+#~ msgstr "Vezels"
-#: core/templates/index.html:86
-msgid "This workout is part of a schedule:"
-msgstr "Deze workout maakt deel uit van een schema."
+#~ msgid "Ingredient was successfully added to the general database"
+#~ msgstr "Ingrediënt met succes toegevoegd aan de algemene databank"
-#: core/templates/index.html:91
-msgid ""
-"The current workout is selected from your active schedule or, if you don't "
-"have one, simply by date."
-msgstr ""
-"De huidige workout werd geselecteerd van je actieve schema of, als je er "
-"geen hebt, gewoonweg op basis van datum."
+#~ msgid "New user submitted ingredient"
+#~ msgstr "Nieuw door gebruiker toegevoegd ingrediënt"
-#: core/templates/misc/fragments/shariff_modal.html:6
-msgid "Share this page"
-msgstr "Deze pagina delen"
+#, fuzzy, python-brace-format
+#~ msgid ""
+#~ "The user {request.user.username} submitted a new ingredient \"{self."
+#~ "name}\"."
+#~ msgstr "Gebruiker {0} diende een nieuw ingrediënt \"{1}\" in."
-#: core/templates/misc/fragments/shariff_modal.html:20
-#, fuzzy
-msgid ""
-"Before you share links on social media you need to allow external\n"
-" access."
-msgstr ""
-"Voordat u links kan delen op sociale media dient u externe toegang toe te "
-"staan."
+#~ msgid "Submission date"
+#~ msgstr "Instuurdatum"
-#: core/templates/misc/fragments/shariff_modal.html:26
-msgid "That's done here"
-msgstr "Dat gebeurt hier"
+#~ msgid "Ingredient is pending review"
+#~ msgstr "Ingrediënt in overweging"
-#: core/views/misc.py:135
-msgid "Rest day"
-msgstr "Rustdag"
+#~ msgid ""
+#~ "This user submitted ingredient is pending a decision to be\n"
+#~ "included in the database. Till then, it will not be shown in the overview "
+#~ "or\n"
+#~ "the search."
+#~ msgstr ""
+#~ "Dit ingrediënt, ingediend door een gebruiker, wacht op \n"
+#~ "een goedkeuring om toegevoegd te worden aan de databank. Tot dat moment\n"
+#~ "zal deze niet worden getoond in het overzicht of de zoekresultaten."
-#: nutrition/templates/ingredient/overview.html:72
-msgid "ingredient name"
-msgstr "Naam ingrediënt"
+#~ msgid "Please select one of the options below."
+#~ msgstr "Gelieve één van de opties hieronder te kiezen."
-#: nutrition/templates/ingredient/overview.html:91
-msgid "Only registered users can do this"
-msgstr "Enkel geregistreerde gebruikers kunnen dit"
+#~ msgid "Accept"
+#~ msgstr "Aanvaard"
-#: nutrition/views/plan.py:222
-msgid "Nutritional data"
-msgstr "Voedingsgegevens"
+#~ msgid "Decline"
+#~ msgstr "Weiger"
-#: weight/templates/overview.html:52
-msgid "Export as CSV"
-msgstr "Exporteer als CSV"
+#~ msgid "Ingredient was successfully marked as rejected"
+#~ msgstr "Ingrediënt met succes gemarkeerd als afgewezen"
-#: weight/templates/overview.html:56
-msgid "Import from spreadsheet"
-msgstr "Importeer uit spreadsheet"
+#~ msgid "About"
+#~ msgstr "Over"
-#: gym/models/gym_config.py:68
-msgid "Configuration for {}"
-msgstr "Configuratie voor {}"
+#~ msgid "Pending"
+#~ msgstr "In overweging"
-#: nutrition/models/ingredient.py:303
-#, python-brace-format
-msgid ""
-"The total energy ({energy}kcal) is not the approximate sum of the energy "
-"provided by protein, carbohydrates and fat ({energy_calculated}kcal +/-"
-"{energy_approx}%)"
-msgstr ""
+#~ msgid "Accepted"
+#~ msgstr "Aanvaard"
+
+#~ msgid "Declined"
+#~ msgstr "Afgewezen"
+
+#~ msgid "Share"
+#~ msgstr "Deel"
+
+#~ msgid ""
+#~ "Click to add weight logs to a training\n"
+#~ " day in your current workout:"
+#~ msgstr ""
+#~ "Klik om gewichtingaven toe te voegen aan een\n"
+#~ "trainingdag in je huidige workout:"
+
+#~ msgid "This workout is part of a schedule:"
+#~ msgstr "Deze workout maakt deel uit van een schema."
+
+#~ msgid ""
+#~ "The current workout is selected from your active schedule or, if you "
+#~ "don't have one, simply by date."
+#~ msgstr ""
+#~ "De huidige workout werd geselecteerd van je actieve schema of, als je er "
+#~ "geen hebt, gewoonweg op basis van datum."
+
+#~ msgid "Share this page"
+#~ msgstr "Deze pagina delen"
+
+#, fuzzy
+#~ msgid ""
+#~ "Before you share links on social media you need to allow external\n"
+#~ " access."
+#~ msgstr ""
+#~ "Voordat u links kan delen op sociale media dient u externe toegang toe te "
+#~ "staan."
+
+#~ msgid "That's done here"
+#~ msgstr "Dat gebeurt hier"
+
+#~ msgid "Rest day"
+#~ msgstr "Rustdag"
+
+#~ msgid "ingredient name"
+#~ msgstr "Naam ingrediënt"
+
+#~ msgid "Only registered users can do this"
+#~ msgstr "Enkel geregistreerde gebruikers kunnen dit"
+
+#~ msgid "Nutritional data"
+#~ msgstr "Voedingsgegevens"
+
+#~ msgid "Export as CSV"
+#~ msgstr "Exporteer als CSV"
+
+#~ msgid "Import from spreadsheet"
+#~ msgstr "Importeer uit spreadsheet"
+
+#~ msgid "Configuration for {}"
+#~ msgstr "Configuratie voor {}"
-#: nutrition/models/ingredient.py:411
#, python-brace-format
-msgid "The user {0} submitted a new ingredient \"{1}\"."
-msgstr "Gebruiker {0} diende een nieuw ingrediënt \"{1}\" in."
+#~ msgid "The user {0} submitted a new ingredient \"{1}\"."
+#~ msgstr "Gebruiker {0} diende een nieuw ingrediënt \"{1}\" in."
#~ msgid "Something happened that is not allowed."
#~ msgstr "Er is iets gebeurd dat niet mocht gebeuren."
diff --git a/wger/locale/no/LC_MESSAGES/django.po b/wger/locale/no/LC_MESSAGES/django.po
index 2ffc2a902..d055e6aa1 100644
--- a/wger/locale/no/LC_MESSAGES/django.po
+++ b/wger/locale/no/LC_MESSAGES/django.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: wger Workout Manager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-02-02 12:42+0100\n"
+"POT-Creation-Date: 2024-07-14 15:49+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/"
@@ -37,7 +37,7 @@ msgstr ""
"brukere som ikke er tildelt et treningsstudio vil også bli tildelt dette "
"treningsstudioet."
-#: config/views/gym_config.py:42 core/templates/language/view.html:63
+#: config/views/gym_config.py:42 core/templates/language/view.html:67
#: core/templates/license/list.html:17 core/templates/misc/license/list.html:18
#: core/templates/repetition_unit/list.html:18
#: core/templates/tags/render_day.html:39
@@ -57,8 +57,8 @@ msgstr ""
#: manager/templates/calendar/day.html:68
#: manager/templates/calendar/month.html:85
#: manager/templates/calendar/partial_overview_table.html:18
-#: manager/templates/schedule/view.html:119
-#: nutrition/templates/ingredient/view.html:191
+#: manager/templates/schedule/view.html:118
+#: nutrition/templates/ingredient/view.html:165
#: nutrition/templates/units/list.html:19
msgid "Edit"
msgstr "Rediger"
@@ -94,8 +94,8 @@ msgstr "Mitt kule treningsprogram"
msgid "Empty placeholder schedule"
msgstr "Tom plassholder for timeplanen"
-#: core/forms.py:69 core/templates/navigation.html:275
-#: core/templates/navigation.html:281 core/templates/user/login.html:4
+#: core/forms.py:69 core/templates/navigation.html:285
+#: core/templates/navigation.html:291 core/templates/user/login.html:4
#: software/templates/features.html:82 software/templates/features.html:427
msgid "Login"
msgstr "Logg inn"
@@ -165,7 +165,7 @@ msgstr "Passord"
msgid "Please enter your current password."
msgstr "Skriv inn ditt nåværende passord."
-#: core/forms.py:242 core/templates/language/view.html:68
+#: core/forms.py:242 core/templates/language/view.html:73
#: core/templates/license/list.html:19 core/templates/misc/license/list.html:22
#: core/templates/repetition_unit/list.html:20
#: core/templates/tags/render_day.html:45
@@ -180,10 +180,10 @@ msgstr "Skriv inn ditt nåværende passord."
#: gym/templates/gym/list.html:22 manager/templates/calendar/day.html:73
#: manager/templates/calendar/month.html:89
#: manager/templates/calendar/partial_overview_table.html:23
-#: manager/templates/schedule/view.html:123
-#: manager/templates/workout/view.html:190
-#: nutrition/templates/ingredient/view.html:192
-#: nutrition/templates/ingredient/view.html:241
+#: manager/templates/schedule/view.html:122
+#: manager/templates/workout/view.html:188
+#: nutrition/templates/ingredient/view.html:166
+#: nutrition/templates/ingredient/view.html:215
#: nutrition/templates/units/list.html:22
msgid "Delete"
msgstr "Slett"
@@ -196,14 +196,14 @@ msgstr "Ugyldig passord"
msgid "The form is secured with reCAPTCHA"
msgstr "Skjemaet er sikret med reCAPTCHA"
-#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:275
-#: core/templates/navigation.html:287 core/templates/template.html:147
+#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:285
+#: core/templates/navigation.html:297 core/templates/template.html:149
#: core/templates/user/login.html:20 core/views/user.py:298
#: software/templates/features.html:87 software/templates/features.html:422
msgid "Register"
msgstr "Registrer"
-#: core/forms.py:315
+#: core/forms.py:315 software/templates/features.html:45
msgid "Contact"
msgstr "Kontakt"
@@ -212,7 +212,7 @@ msgid "Some way of answering you (e-mail, etc.)"
msgstr "En måte å svare deg på (e-post, etc.)"
#: core/forms.py:324 exercises/models/comment.py:58 manager/models/set.py:61
-#: manager/models/setting.py:111 nutrition/models/log.py:74
+#: manager/models/setting.py:114 nutrition/models/log.py:77
msgid "Comment"
msgstr "Kommentar"
@@ -232,6 +232,12 @@ msgstr "Språk, forkortet navn"
msgid "Language full name"
msgstr "Språk, fullt navn"
+#: core/models/language.py:45 core/templates/language/view.html:23
+#, fuzzy
+#| msgid "Language full name"
+msgid "Language full name in English"
+msgstr "Språk, fullt navn"
+
#: core/models/license.py:29
msgid "Full name"
msgstr "Fullt navn"
@@ -248,7 +254,7 @@ msgstr ""
msgid "Short name, e.g. CC-BY-SA 3"
msgstr "Forkortet navn, f.eks. CC-BY-SA 3"
-#: core/models/license.py:45 nutrition/models/ingredient.py:214
+#: core/models/license.py:45 nutrition/models/ingredient.py:208
msgid "Link"
msgstr "Link"
@@ -362,7 +368,7 @@ msgstr ""
msgid "Age"
msgstr "Alder"
-#: core/models/profile.py:230 nutrition/forms.py:117
+#: core/models/profile.py:230 nutrition/forms.py:118
msgid "Height (cm)"
msgstr "Høyde (cm)"
@@ -413,7 +419,7 @@ msgid "Total caloric intake, including e.g. any surplus"
msgstr "Totalt kaloriinntak, inkludert f.eks. overskudd"
#: core/models/profile.py:333 nutrition/models/ingredient_weight_unit.py:45
-#: nutrition/models/log.py:93 nutrition/models/meal_item.py:58
+#: nutrition/models/log.py:96 nutrition/models/meal_item.py:59
msgid "Weight unit"
msgstr "Vektenhet"
@@ -446,17 +452,16 @@ msgstr "Summen av antall timer må bli 24"
#: core/models/rep_unit.py:36 core/models/weight_unit.py:36
#: core/templates/user/overview.html:262 core/views/user.py:599
#: exercises/models/category.py:29 exercises/models/equipment.py:29
-#: exercises/models/exercise.py:58 exercises/models/muscle.py:36
+#: exercises/models/exercise.py:59 exercises/models/muscle.py:36
#: gym/models/contract.py:52 gym/models/contract.py:103 gym/models/gym.py:46
#: gym/models/user_document.py:84 gym/templates/contract/view.html:50
#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:96
#: gym/views/gym.py:158 manager/models/schedule.py:55
#: manager/models/workout.py:57 measurements/models/category.py:36
-#: nutrition/models/ingredient.py:125
+#: nutrition/models/ingredient.py:111
#: nutrition/models/ingredient_category.py:27 nutrition/models/meal.py:67
#: nutrition/models/weight_unit.py:38
-#: nutrition/templates/ingredient/pending.html:15
-#: nutrition/templates/ingredient/view.html:178
+#: nutrition/templates/ingredient/view.html:152
msgid "Name"
msgstr "Navn"
@@ -563,24 +568,24 @@ msgstr ""
msgid "Dashboard"
msgstr "Dashboard"
-#: core/templates/language/overview.html:4 core/templates/navigation.html:335
+#: core/templates/language/overview.html:4 core/templates/navigation.html:345
msgid "Languages"
msgstr "Språk"
-#: core/templates/language/overview.html:20
+#: core/templates/language/overview.html:22
msgid "Nothing found."
msgstr "Resultatløst."
-#: core/templates/language/overview.html:20
+#: core/templates/language/overview.html:22
#: manager/templates/calendar/month.html:132
#: manager/templates/schedule/overview.html:28
-#: manager/templates/schedule/view.html:145
+#: manager/templates/schedule/view.html:144
#: manager/templates/workout/overview.html:28
#: nutrition/templates/ingredient/overview.html:38
msgid "Add one now."
msgstr "Legg til en nå."
-#: core/templates/language/overview.html:33 core/templates/license/list.html:40
+#: core/templates/language/overview.html:35 core/templates/license/list.html:40
#: core/templates/misc/license/list.html:43
#: core/templates/repetition_unit/list.html:43
#: core/templates/user/overview.html:326 core/templates/user/overview.html:365
@@ -600,13 +605,13 @@ msgstr "Legg til en nå."
msgid "Add"
msgstr "Legg til"
-#: core/templates/language/view.html:58 core/templates/user/api_key.html:44
+#: core/templates/language/view.html:61 core/templates/user/api_key.html:44
#: core/templates/user/preferences.html:45 gym/models/contract.py:203
#: gym/templates/contract/view.html:41 gym/templates/contract/view.html:106
#: gym/templates/gym/member_list.html:248
-#: manager/templates/schedule/view.html:286
-#: manager/templates/workout/view.html:165
-#: nutrition/templates/ingredient/view.html:228
+#: manager/templates/schedule/view.html:285
+#: manager/templates/workout/view.html:163
+#: nutrition/templates/ingredient/view.html:202
msgid "Options"
msgstr "Alternativer"
@@ -631,12 +636,11 @@ msgstr "Lisensliste"
#: gym/templates/gym/member_list.html:299
#: mailer/templates/mailer/gym/overview.html:30
#: manager/templates/calendar/day.html:87
-#: nutrition/templates/ingredient/pending.html:30
#: nutrition/templates/units/list.html:29
msgid "Nothing found"
msgstr "Ingenting funnet"
-#: core/templates/misc/about.html:4 core/templates/template.html:173
+#: core/templates/misc/about.html:4 core/templates/template.html:175
msgid "Imprint"
msgstr ""
@@ -653,182 +657,177 @@ msgstr ""
"Hvis en lisens er en lokal lisens, feks Creative Commons\n"
"lisenser for de ulike landene, legges dem til som separate oppføringer her."
-#: core/templates/navigation.html:27 software/templates/features.html:437
+#: core/templates/navigation.html:28 software/templates/features.html:437
msgid "Training"
msgstr "Trening"
-#: core/templates/navigation.html:34 core/templates/user/overview.html:25
+#: core/templates/navigation.html:37 core/templates/user/overview.html:25
msgid "Workouts"
msgstr "Treningsøkter"
-#: core/templates/navigation.html:42
+#: core/templates/navigation.html:46
msgid "Workouts schedules"
msgstr "Treningsplaner"
-#: core/templates/navigation.html:50 core/templates/user/overview.html:70
+#: core/templates/navigation.html:54 core/templates/user/overview.html:70
#: manager/templates/calendar/month.html:10
#: manager/templates/calendar/month.html:21
msgid "Calendar"
msgstr "Kalender"
-#: core/templates/navigation.html:60
+#: core/templates/navigation.html:64
#, fuzzy
#| msgid "Macronutrients"
msgid "Measurements"
msgstr "Makronæringsstoffer"
-#: core/templates/navigation.html:70 gallery/templates/images/overview.html:6
+#: core/templates/navigation.html:75 gallery/templates/images/overview.html:6
msgid "Gallery"
msgstr "Galleri"
-#: core/templates/navigation.html:76
+#: core/templates/navigation.html:81
#, fuzzy
#| msgid "Workout complete!"
msgid "Workout templates"
msgstr "Treningsøkt fullført!"
-#: core/templates/navigation.html:82 manager/views/workout.py:84
+#: core/templates/navigation.html:88 manager/views/workout.py:84
#, fuzzy
#| msgid "Your schedules"
msgid "Your templates"
msgstr "Dine timeplaner"
-#: core/templates/navigation.html:90 manager/views/workout.py:98
+#: core/templates/navigation.html:97 manager/views/workout.py:98
msgid "Public templates"
msgstr "Offentlige maler"
-#: core/templates/navigation.html:97 manager/forms.py:129
-#: manager/models/setting.py:54 software/templates/features.html:51
+#: core/templates/navigation.html:105 manager/forms.py:129
+#: manager/models/setting.py:57 software/templates/features.html:51
#: software/templates/features.html:459
msgid "Exercises"
msgstr "Øvelser"
-#: core/templates/navigation.html:103 core/templates/navigation.html:170
-#: core/templates/navigation.html:330
+#: core/templates/navigation.html:111 core/templates/navigation.html:184
+#: core/templates/navigation.html:340
msgid "Administration"
msgstr "Administrasjon"
-#: core/templates/navigation.html:106
+#: core/templates/navigation.html:115
#, fuzzy
#| msgid "Exercise day"
msgid "Exercise edit history"
msgstr "Treningsdag"
-#: core/templates/navigation.html:111 exercises/models/base.py:103
+#: core/templates/navigation.html:121 exercises/models/base.py:103
msgid "Equipment"
msgstr "Utstyr"
-#: core/templates/navigation.html:116
+#: core/templates/navigation.html:127
msgid "Muscles"
msgstr "Muskler"
-#: core/templates/navigation.html:121
+#: core/templates/navigation.html:133
#: exercises/templates/categories/admin-overview.html:4
msgid "Categories"
msgstr "Kategorier"
-#: core/templates/navigation.html:136 software/templates/features.html:447
+#: core/templates/navigation.html:148 software/templates/features.html:447
msgid "Nutrition"
msgstr "Ernæring"
-#: core/templates/navigation.html:143 core/templates/user/overview.html:144
+#: core/templates/navigation.html:156 core/templates/user/overview.html:144
msgid "Nutrition plans"
msgstr "Ernæringsplaner"
-#: core/templates/navigation.html:151 nutrition/templates/bmi/form.html:50
+#: core/templates/navigation.html:165 nutrition/templates/bmi/form.html:50
msgid "BMI calculator"
msgstr "BMI-kalkulator"
-#: core/templates/navigation.html:159 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:174 nutrition/templates/rate/form.html:17
msgid "Daily calories calculator"
msgstr "Daglig kalorikalkulator"
-#: core/templates/navigation.html:165
+#: core/templates/navigation.html:179
#: nutrition/templates/ingredient/overview.html:10
msgid "Ingredient overview"
msgstr "Ingrediensoversikt"
-#: core/templates/navigation.html:172 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:187 nutrition/templates/units/list.html:6
msgid "Ingredient weight units"
msgstr "Vektenheter for ingredienser"
-#: core/templates/navigation.html:177
-#: nutrition/templates/ingredient/pending.html:6
-msgid "Ingredients pending review"
-msgstr "Ingredienser som venter på godkjenning"
-
-#: core/templates/navigation.html:193 software/templates/features.html:442
+#: core/templates/navigation.html:203 software/templates/features.html:442
msgid "Body weight"
msgstr "Kropsvekt"
-#: core/templates/navigation.html:200 core/templates/user/overview.html:114
+#: core/templates/navigation.html:210 core/templates/user/overview.html:114
msgid "Weight overview"
msgstr "Vektoversikt"
-#: core/templates/navigation.html:207 weight/views.py:65
+#: core/templates/navigation.html:217 weight/views.py:65
msgid "Add weight entry"
msgstr "Legg til vekt"
-#: core/templates/navigation.html:221
+#: core/templates/navigation.html:231
msgid "About this software"
msgstr "Om denne programvaren"
-#: core/templates/navigation.html:227 software/templates/about_us.html:5
+#: core/templates/navigation.html:237 software/templates/about_us.html:5
msgid "About us"
msgstr "Om oss"
-#: core/templates/navigation.html:233 software/templates/features.html:507
+#: core/templates/navigation.html:243 software/templates/features.html:507
msgid "REST API"
msgstr "REST API"
-#: core/templates/navigation.html:239 utils/models.py:45
+#: core/templates/navigation.html:249 utils/models.py:45
msgid "License"
msgstr "Lisens"
-#: core/templates/navigation.html:245
+#: core/templates/navigation.html:255
msgid "Developer documentation"
msgstr "Utvikler dokumentasjon"
-#: core/templates/navigation.html:252
+#: core/templates/navigation.html:262
msgid "Get the code"
msgstr "Få koden"
-#: core/templates/navigation.html:259 core/templates/template.html:212
+#: core/templates/navigation.html:269 core/templates/template.html:214
#: software/templates/features.html:582
msgid "Translate"
msgstr "Oversett"
-#: core/templates/navigation.html:293 core/templates/user/login.html:28
+#: core/templates/navigation.html:303 core/templates/user/login.html:28
msgid "Reset password"
msgstr "Tilbakestill passord"
-#: core/templates/navigation.html:311
+#: core/templates/navigation.html:321
msgid "My preferences"
msgstr "Mine innstillinger"
-#: core/templates/navigation.html:320
+#: core/templates/navigation.html:330
msgid "Logout"
msgstr "Logg ut"
-#: core/templates/navigation.html:343
+#: core/templates/navigation.html:353
msgid "Licenses"
msgstr "Lisenser"
-#: core/templates/navigation.html:351
+#: core/templates/navigation.html:361
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr "Repetisjonsenheter"
-#: core/templates/navigation.html:359 core/templates/weight_unit/list.html:4
-#: nutrition/templates/ingredient/view.html:167
+#: core/templates/navigation.html:369 core/templates/weight_unit/list.html:4
+#: nutrition/templates/ingredient/view.html:141
msgid "Weight units"
msgstr "Vektenheter"
-#: core/templates/navigation.html:367 core/templates/user/list.html:4
+#: core/templates/navigation.html:377 core/templates/user/list.html:4
msgid "User list"
msgstr "Brukerliste"
-#: core/templates/navigation.html:373
+#: core/templates/navigation.html:383
msgid "Gyms"
msgstr "Treningsstudioer"
@@ -882,12 +881,12 @@ msgstr "Takk for at du bruker vår side!"
msgid "The %(site_name)s team"
msgstr "%(site_name)s teamet"
-#: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:11
+#: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:12
msgid "previous"
msgstr "forrige"
-#: core/templates/tags/pagination.html:31
-#: core/templates/tags/pagination.html:35
+#: core/templates/tags/pagination.html:33
+#: core/templates/tags/pagination.html:38
msgid "next"
msgstr "neste"
@@ -912,34 +911,34 @@ msgid "Add exercises to this workout day"
msgstr "Legg til øvelser for denne treningsdagen"
#: core/templates/tags/render_weight_log.html:17 manager/helpers.py:86
-#: manager/models/setting.py:69 manager/templates/set/formset.html:9
+#: manager/models/setting.py:72 manager/templates/set/formset.html:9
msgid "Reps"
msgstr "Repetisjoner"
#: core/templates/tags/render_weight_log.html:30 manager/forms.py:191
-#: manager/models/log.py:103 manager/models/setting.py:99
+#: manager/models/log.py:103 manager/models/setting.py:102
#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
msgid "RiR"
msgstr "RiR"
-#: core/templates/template.html:120 manager/templates/calendar/month.html:138
-#: manager/templates/schedule/view.html:249
-#: manager/templates/schedule/view.html:270
-#: manager/templates/workout/view.html:86
-#: manager/templates/workout/view.html:139
+#: core/templates/template.html:122 manager/templates/calendar/month.html:138
+#: manager/templates/schedule/view.html:248
+#: manager/templates/schedule/view.html:269
+#: manager/templates/workout/view.html:84
+#: manager/templates/workout/view.html:137
msgid "Close"
msgstr "Lukk"
-#: core/templates/template.html:136
+#: core/templates/template.html:138
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:141
+#: core/templates/template.html:143
msgid "Create some demo entries"
msgstr "Lag noen demo oppføringer"
-#: core/templates/template.html:178 software/templates/features.html:547
+#: core/templates/template.html:180 software/templates/features.html:547
#: software/templates/tos.html:7
msgid "Terms of service"
msgstr "Vilkår for bruk"
@@ -1040,7 +1039,7 @@ msgid "Overview"
msgstr "Oversikt"
#: core/templates/user/overview.html:28
-#: manager/templates/schedule/view.html:164
+#: manager/templates/schedule/view.html:163
#: manager/templates/workout/overview.html:39 manager/views/schedule_step.py:60
msgid "Add workout"
msgstr "Legg til treningsøkt"
@@ -1048,20 +1047,20 @@ msgstr "Legg til treningsøkt"
#: core/templates/user/overview.html:34 core/templates/user/overview.html:76
#: core/templates/user/overview.html:120 core/templates/user/overview.html:152
#: exercises/models/base.py:118 exercises/models/base.py:124
-#: exercises/models/exercise.py:63 exercises/models/exercise.py:69
+#: exercises/models/exercise.py:64 exercises/models/exercise.py:70
#: exercises/models/image.py:107 exercises/models/image.py:113
#: exercises/models/video.py:163 exercises/models/video.py:169
#: gallery/models/image.py:42 manager/helpers.py:85 manager/models/log.py:100
#: manager/models/session.py:67 measurements/models/measurement.py:47
-#: nutrition/models/ingredient.py:101 nutrition/models/ingredient.py:107
-#: nutrition/models/ingredient.py:222 weight/models.py:33
+#: nutrition/models/ingredient.py:87 nutrition/models/ingredient.py:93
+#: nutrition/models/ingredient.py:216 weight/models.py:51
#: weight/templates/import_csv_preview.html:13
#: weight/templates/import_csv_preview.html:42 weight/views.py:144
msgid "Date"
msgstr "Dato"
#: core/templates/user/overview.html:35 core/templates/user/overview.html:153
-#: exercises/models/exercise.py:51 gallery/models/image.py:65
+#: exercises/models/exercise.py:52 gallery/models/image.py:65
#: gym/models/contract.py:58 gym/models/contract.py:109
#: manager/models/day.py:37 manager/models/workout.py:63
#: measurements/models/measurement.py:62 nutrition/models/plan.py:67
@@ -1079,13 +1078,13 @@ msgstr "Siste aktivitet"
#: core/templates/user/overview.html:58
#: manager/templates/calendar/month.html:128
-#: manager/templates/schedule/view.html:145
+#: manager/templates/schedule/view.html:144
#: manager/templates/workout/overview.html:28
msgid "No workouts found."
msgstr "Ingen treningsøkter funnet."
#: core/templates/user/overview.html:68 manager/forms.py:280
-#: manager/templates/workout/view.html:108
+#: manager/templates/workout/view.html:106
msgid "Log"
msgstr "Logg"
@@ -1109,35 +1108,35 @@ msgstr "Tid"
#: core/templates/user/overview.html:112 core/templates/user/overview.html:121
#: manager/forms.py:186 manager/helpers.py:86 manager/models/log.py:86
-#: manager/models/setting.py:79 manager/templates/log/add.html:54
-#: manager/templates/set/formset.html:11 weight/models.py:35
+#: manager/models/setting.py:82 manager/templates/log/add.html:54
+#: manager/templates/set/formset.html:11 weight/models.py:53
#: weight/templates/import_csv_preview.html:14
#: weight/templates/import_csv_preview.html:43 weight/views.py:144
msgid "Weight"
msgstr "Vekt"
-#: core/templates/user/overview.html:154 nutrition/models/ingredient.py:130
-#: nutrition/templates/ingredient/view.html:77 nutrition/views/plan.py:237
+#: core/templates/user/overview.html:154 nutrition/models/ingredient.py:116
+#: nutrition/templates/ingredient/view.html:51 nutrition/views/plan.py:237
msgid "Energy"
msgstr "Energi"
-#: core/templates/user/overview.html:155 nutrition/models/ingredient.py:137
-#: nutrition/templates/ingredient/view.html:84 nutrition/views/plan.py:243
+#: core/templates/user/overview.html:155 nutrition/models/ingredient.py:123
+#: nutrition/templates/ingredient/view.html:58 nutrition/views/plan.py:243
msgid "Protein"
msgstr "Protein"
-#: core/templates/user/overview.html:156 nutrition/models/ingredient.py:145
-#: nutrition/templates/ingredient/view.html:90 nutrition/views/plan.py:251
+#: core/templates/user/overview.html:156 nutrition/models/ingredient.py:131
+#: nutrition/templates/ingredient/view.html:64 nutrition/views/plan.py:251
msgid "Carbohydrates"
msgstr "Karbohydrater"
-#: core/templates/user/overview.html:157 nutrition/models/ingredient.py:163
-#: nutrition/templates/ingredient/view.html:106 nutrition/views/plan.py:265
+#: core/templates/user/overview.html:157 nutrition/models/ingredient.py:149
+#: nutrition/templates/ingredient/view.html:80 nutrition/views/plan.py:265
msgid "Fat"
msgstr "Fett"
#: core/templates/user/overview.html:170
-#: nutrition/templates/ingredient/view.html:79
+#: nutrition/templates/ingredient/view.html:53
msgid "kcal"
msgstr "kcal"
@@ -1149,7 +1148,7 @@ msgstr "kcal"
#: gym/templates/gym/member_list.html:207
#: gym/templates/gym/member_list.html:240
#: gym/templates/gym/member_list.html:277
-#: manager/templates/schedule/view.html:101
+#: manager/templates/schedule/view.html:100
msgid "Actions"
msgstr "Handlinger"
@@ -1192,7 +1191,7 @@ msgid "Details"
msgstr "Detaljer"
#: core/templates/user/overview.html:258 gym/views/export.py:57
-#: manager/helpers.py:86 manager/templates/schedule/view.html:99
+#: manager/helpers.py:86 manager/templates/schedule/view.html:98
msgid "Nr."
msgstr "Nr."
@@ -1237,7 +1236,7 @@ msgid "Documents"
msgstr "Dokumenter"
#: core/templates/user/overview.html:412 gym/templates/document/list.html:32
-#: manager/forms.py:292 manager/templates/workout/view.html:134
+#: manager/forms.py:292 manager/templates/workout/view.html:132
msgid "Download"
msgstr "Last ned"
@@ -1290,13 +1289,13 @@ msgid "kg"
msgstr "kg"
#: core/templatetags/wger_extras.py:207
-#: nutrition/templates/ingredient/view.html:86
-#: nutrition/templates/ingredient/view.html:92
-#: nutrition/templates/ingredient/view.html:99
-#: nutrition/templates/ingredient/view.html:108
-#: nutrition/templates/ingredient/view.html:115
-#: nutrition/templates/ingredient/view.html:137
-#: nutrition/templates/ingredient/view.html:147
+#: nutrition/templates/ingredient/view.html:60
+#: nutrition/templates/ingredient/view.html:66
+#: nutrition/templates/ingredient/view.html:73
+#: nutrition/templates/ingredient/view.html:82
+#: nutrition/templates/ingredient/view.html:89
+#: nutrition/templates/ingredient/view.html:111
+#: nutrition/templates/ingredient/view.html:121
msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr "g"
@@ -1314,7 +1313,7 @@ msgstr "oz"
#: exercises/views/equipment.py:103 exercises/views/exercises.py:73
#: exercises/views/muscles.py:99 manager/views/schedule.py:309
#: manager/views/schedule_step.py:128 manager/views/workout.py:249
-#: manager/views/workout_session.py:142 nutrition/views/ingredient.py:116
+#: manager/views/workout_session.py:142 nutrition/views/ingredient.py:119
#: nutrition/views/unit.py:110
msgid "Successfully deleted"
msgstr "Slettingen var vellykket"
@@ -1326,7 +1325,7 @@ msgstr "Slettingen var vellykket"
#: gym/views/admin_notes.py:196 gym/views/document.py:206 gym/views/gym.py:481
#: manager/views/schedule.py:316 manager/views/schedule_step.py:138
#: manager/views/workout.py:253 manager/views/workout_session.py:156
-#: nutrition/views/ingredient.py:123 nutrition/views/unit.py:117
+#: nutrition/views/ingredient.py:126 nutrition/views/unit.py:117
#, python-brace-format
msgid "Delete {0}?"
msgstr "Slett {0}?"
@@ -1339,7 +1338,7 @@ msgstr "Slett {0}?"
#: gym/views/contract.py:186 gym/views/contract_option.py:123
#: gym/views/contract_type.py:123 gym/views/document.py:171
#: gym/views/gym.py:463 manager/views/day.py:100 manager/views/schedule.py:333
-#: manager/views/workout.py:267 nutrition/views/ingredient.py:142
+#: manager/views/workout.py:267 nutrition/views/ingredient.py:145
#: nutrition/views/unit.py:143
#, python-brace-format
msgid "Edit {0}"
@@ -1413,7 +1412,7 @@ msgstr "treningsstudio"
msgid "A verification email was sent to %(email)s"
msgstr ""
-#: exercises/models/base.py:82 nutrition/models/ingredient.py:236
+#: exercises/models/base.py:82 nutrition/models/ingredient.py:230
msgid "Category"
msgstr "Kategori"
@@ -1433,7 +1432,7 @@ msgstr "Variasjoner"
msgid "Exercise Categories"
msgstr "Øvelses kategorier"
-#: exercises/models/comment.py:52 exercises/models/exercise_alias.py:52
+#: exercises/models/comment.py:52 exercises/models/exercise_alias.py:53
#: exercises/models/image.py:74 exercises/models/video.py:98
#: manager/forms.py:178 manager/helpers.py:86 manager/models/log.py:52
msgid "Exercise"
@@ -1443,12 +1442,12 @@ msgstr "Øvelse"
msgid "A comment about how to correctly do this exercise."
msgstr "En kommentar for hvordan denne øvelsen utføres korrekt."
-#: exercises/models/exercise.py:76 nutrition/models/ingredient.py:95
+#: exercises/models/exercise.py:77 nutrition/models/ingredient.py:81
#: nutrition/models/weight_unit.py:32
msgid "Language"
msgstr "Språk"
-#: exercises/models/exercise_alias.py:58
+#: exercises/models/exercise_alias.py:59
#, fuzzy
#| msgid "Correcting an exercise"
msgid "Alias for an exercise"
@@ -1599,7 +1598,7 @@ msgstr "Handlinger"
#: manager/models/schedule.py:44 manager/models/session.py:49
#: manager/models/workout.py:89 measurements/models/category.py:31
#: measurements/models/measurement.py:42 nutrition/models/plan.py:54
-#: nutrition/templates/ingredient/pending.html:16 weight/models.py:42
+#: weight/models.py:60
msgid "User"
msgstr "Bruker"
@@ -1726,9 +1725,9 @@ msgid "Contract type"
msgstr "Kontraktstype"
#: gym/models/contract.py:211 gym/templates/contract/view.html:59
-#: manager/templates/log/add.html:52 nutrition/forms.py:62
-#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:105
-#: nutrition/models/meal_item.py:72
+#: manager/templates/log/add.html:52 nutrition/forms.py:63
+#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:108
+#: nutrition/models/meal_item.py:73
msgid "Amount"
msgstr "Beløp"
@@ -1745,7 +1744,7 @@ msgid "Contract is active"
msgstr "Kontrakten er aktiv"
#: gym/models/contract.py:237 gym/templates/contract/view.html:69
-#: manager/models/schedule.py:61 manager/templates/schedule/view.html:68
+#: manager/models/schedule.py:61 manager/templates/schedule/view.html:67
msgid "Start date"
msgstr "Startdato"
@@ -2147,7 +2146,7 @@ msgstr "Generer forhåndsvisning"
#: mailer/templates/mailer/gym/form.html:28
#: mailer/templates/mailer/gym/preview.html:62
-#: manager/templates/workout/view.html:42
+#: manager/templates/workout/view.html:40
msgid "Steps"
msgstr "Steg"
@@ -2171,7 +2170,7 @@ msgstr ""
"postene"
#: mailer/templates/mailer/gym/preview.html:22
-#: software/templates/about_us.html:60
+#: software/templates/about_us.html:70
msgid "Current version"
msgstr "Gjeldene versjon"
@@ -2204,18 +2203,18 @@ msgstr ""
"Du kan søke etter mer enn en øvelse, de vil bli gruppert sammen til et "
"supersett."
-#: manager/forms.py:140 nutrition/forms.py:252
+#: manager/forms.py:140 nutrition/forms.py:253
#, fuzzy
#| msgid "Also use ingredients in English"
msgid "Also search for names in English"
msgstr "Bruk også ingredienser på engelsk"
#: manager/forms.py:168 manager/forms.py:173 manager/models/log.py:64
-#: manager/models/log.py:92 manager/models/setting.py:59
-#: manager/models/setting.py:90 manager/templates/log/add.html:53
+#: manager/models/log.py:92 manager/models/setting.py:62
+#: manager/models/setting.py:93 manager/templates/log/add.html:53
#: manager/templates/log/add.html:55 manager/templates/set/formset.html:10
#: manager/templates/set/formset.html:12 measurements/models/category.py:41
-#: nutrition/forms.py:66
+#: nutrition/forms.py:67
msgid "Unit"
msgstr "Enhet"
@@ -2223,15 +2222,15 @@ msgstr "Enhet"
msgid "Type"
msgstr "Type"
-#: manager/forms.py:280 manager/templates/workout/view.html:115
+#: manager/forms.py:280 manager/templates/workout/view.html:113
msgid "Table"
msgstr "Tabell"
-#: manager/forms.py:282 manager/templates/workout/view.html:121
+#: manager/forms.py:282 manager/templates/workout/view.html:119
msgid "with images"
msgstr "med bilder"
-#: manager/forms.py:283 manager/templates/workout/view.html:127
+#: manager/forms.py:283 manager/templates/workout/view.html:125
msgid "with comments"
msgstr "med kommentarer"
@@ -2240,11 +2239,10 @@ msgid "Workout will expire soon"
msgstr "Treningen vil utløpe snart"
#: manager/models/day.py:34 manager/models/log.py:58
-#: manager/models/session.py:60 manager/templates/schedule/view.html:103
-#: manager/templates/workout/view.html:11
-#: manager/templates/workout/view.html:19 manager/views/pdf.py:85
-#: manager/views/pdf.py:161 manager/views/schedule.py:151
-#: manager/views/schedule.py:221
+#: manager/models/session.py:60 manager/templates/schedule/view.html:102
+#: manager/templates/workout/view.html:9 manager/templates/workout/view.html:17
+#: manager/views/pdf.py:85 manager/views/pdf.py:161
+#: manager/views/schedule.py:151 manager/views/schedule.py:221
msgid "Workout"
msgstr "Treningsøkt"
@@ -2264,7 +2262,7 @@ msgstr "Dag"
msgid "Name or short description of the schedule. For example 'Program XYZ'."
msgstr "Navn eller kort beskrivelse av planen. For eksempel \"Program XYZ\"."
-#: manager/models/schedule.py:65 manager/templates/schedule/view.html:72
+#: manager/models/schedule.py:65 manager/templates/schedule/view.html:71
msgid "Schedule active"
msgstr "Timeplan aktiv"
@@ -2278,7 +2276,7 @@ msgstr ""
"vist for eksempel på dashbordet ). Alle andre timeplaner vil da bli merket "
"som inaktiv"
-#: manager/models/schedule.py:77 manager/templates/schedule/view.html:82
+#: manager/models/schedule.py:77 manager/templates/schedule/view.html:81
msgid "Is a loop"
msgstr "Går i loop"
@@ -2299,8 +2297,8 @@ msgid "The duration in weeks"
msgstr "Varigheten i uker"
#: manager/models/schedule_step.py:64 manager/models/set.py:53
-#: manager/models/setting.py:110 nutrition/models/meal.py:55
-#: nutrition/models/meal_item.py:65
+#: manager/models/setting.py:113 nutrition/models/meal.py:55
+#: nutrition/models/meal_item.py:66
msgid "Order"
msgstr "Rekkefølge"
@@ -2350,7 +2348,7 @@ msgstr "Treningsdag"
msgid "Number of sets"
msgstr "Antall sett"
-#: manager/models/setting.py:48
+#: manager/models/setting.py:51
msgid "Sets"
msgstr "Sett"
@@ -2425,7 +2423,7 @@ msgstr ""
msgid "Go to current month"
msgstr "Gå til nåværende måned"
-#: manager/templates/calendar/month.html:188
+#: manager/templates/calendar/month.html:190
msgid "Add new log"
msgstr "Legg til logg"
@@ -2466,8 +2464,8 @@ msgid "Your schedules"
msgstr "Dine timeplaner"
#: manager/templates/schedule/overview.html:19
-#: manager/templates/schedule/view.html:132
-#: manager/templates/schedule/view.html:184
+#: manager/templates/schedule/view.html:131
+#: manager/templates/schedule/view.html:183
#: manager/templates/workout/overview.html:16
msgid "active"
msgstr "aktiv"
@@ -2528,11 +2526,11 @@ msgstr ""
msgid "Add schedule"
msgstr "Legg til timeplan"
-#: manager/templates/schedule/view.html:10
+#: manager/templates/schedule/view.html:9
msgid "Schedule"
msgstr "Timeplan"
-#: manager/templates/schedule/view.html:86
+#: manager/templates/schedule/view.html:85
msgid ""
"This schedule is a loop and will go through the workouts above till you "
"deactivate it"
@@ -2540,19 +2538,19 @@ msgstr ""
"Denne timeplanen er en loop, og vil gå gjennom treningsøktene ovenfor til du "
"deaktivere den"
-#: manager/templates/schedule/view.html:104
+#: manager/templates/schedule/view.html:103
msgid "Weeks"
msgstr "Uker"
-#: manager/templates/schedule/view.html:116
+#: manager/templates/schedule/view.html:115
msgid "Move me"
msgstr "Flytt meg"
-#: manager/templates/schedule/view.html:157
+#: manager/templates/schedule/view.html:156
msgid "Start schedule"
msgstr "Start timeplan"
-#: manager/templates/schedule/view.html:188
+#: manager/templates/schedule/view.html:187
#, fuzzy, python-format
#| msgid ""
#| "%(weeks)s Week\n"
@@ -2573,11 +2571,11 @@ msgstr[1] ""
"%(weeks)s Uker\n"
" "
-#: manager/templates/schedule/view.html:222
+#: manager/templates/schedule/view.html:221
msgid "Adding workouts"
msgstr "Legger til treningsøkter"
-#: manager/templates/schedule/view.html:224
+#: manager/templates/schedule/view.html:223
#, fuzzy
#| msgid ""
#| "Add as many workouts to the schedule as you want. You can\n"
@@ -2595,21 +2593,21 @@ msgstr ""
"en treningsøkt mer\n"
"enn én gang."
-#: manager/templates/schedule/view.html:233
-#: manager/templates/schedule/view.html:244
-#: manager/templates/schedule/view.html:291
-#: manager/templates/workout/view.html:71
-#: manager/templates/workout/view.html:81
-#: manager/templates/workout/view.html:180
+#: manager/templates/schedule/view.html:232
+#: manager/templates/schedule/view.html:243
+#: manager/templates/schedule/view.html:290
+#: manager/templates/workout/view.html:69
+#: manager/templates/workout/view.html:79
+#: manager/templates/workout/view.html:178
msgid "Export calendar file"
msgstr "Eksporter kalender fil"
-#: manager/templates/schedule/view.html:237
+#: manager/templates/schedule/view.html:236
msgid "Export this schedule as a calendar file."
msgstr "Eksporter denne timeplanen som kalenderfil."
-#: manager/templates/schedule/view.html:238
-#: manager/templates/workout/view.html:76
+#: manager/templates/schedule/view.html:237
+#: manager/templates/workout/view.html:74
#, fuzzy
#| msgid ""
#| "You can then import the file it into your calendar\n"
@@ -2627,18 +2625,18 @@ msgstr ""
"for eksempel Google Kalender, Outlook eller iCal. Dette vil skape\n"
"en avtale for hver treningsdag med riktige øvelser."
-#: manager/templates/schedule/view.html:259
-#: manager/templates/schedule/view.html:295
-#: manager/templates/workout/view.html:96
-#: manager/templates/workout/view.html:176
+#: manager/templates/schedule/view.html:258
+#: manager/templates/schedule/view.html:294
+#: manager/templates/workout/view.html:94
+#: manager/templates/workout/view.html:174
msgid "Download as PDF"
msgstr "Last ned som PDF"
-#: manager/templates/schedule/view.html:300
+#: manager/templates/schedule/view.html:299
msgid "Edit schedule"
msgstr "Endre timeplan"
-#: manager/templates/schedule/view.html:305
+#: manager/templates/schedule/view.html:304
msgid "Delete schedule"
msgstr "Slett timeplan"
@@ -2778,12 +2776,12 @@ msgid "Mark as workout"
msgstr "Marker som treningsøkt"
#: manager/templates/workout/template_view.html:65
-#: manager/templates/workout/view.html:51
+#: manager/templates/workout/view.html:49
msgid "Muscles trained"
msgstr "Muskler trent"
#: manager/templates/workout/template_view.html:68
-#: manager/templates/workout/view.html:54
+#: manager/templates/workout/view.html:52
msgid ""
"Images show combined muscles as trained by the exercises on the workout."
msgstr "Bildene viser kombinerte muskler som trenes av øvelsene på trening."
@@ -2792,35 +2790,35 @@ msgstr "Bildene viser kombinerte muskler som trenes av øvelsene på trening."
msgid "Use this template"
msgstr "Bruk denne malen"
-#: manager/templates/workout/view.html:45
+#: manager/templates/workout/view.html:43
msgid "Add training days"
msgstr "Legg til treningsdager"
-#: manager/templates/workout/view.html:46
+#: manager/templates/workout/view.html:44
msgid "Add workout sets to days"
msgstr "Legg til treningssett til dager"
-#: manager/templates/workout/view.html:47
+#: manager/templates/workout/view.html:45
msgid "Set the repetitions for each set"
msgstr "Sett repetisjoner for hvert sett"
-#: manager/templates/workout/view.html:75
+#: manager/templates/workout/view.html:73
msgid "Export this workout as a calendar file."
msgstr "Eksporter denne treningsøkten som kalenderfil."
-#: manager/templates/workout/view.html:146
+#: manager/templates/workout/view.html:144
msgid "Logs"
msgstr "Logg"
-#: manager/templates/workout/view.html:148
+#: manager/templates/workout/view.html:146
msgid "View logs"
msgstr "Vis logger"
-#: manager/templates/workout/view.html:171 manager/views/schedule_step.py:99
+#: manager/templates/workout/view.html:169 manager/views/schedule_step.py:99
msgid "Edit workout"
msgstr "Endre treningsøkt"
-#: manager/templates/workout/view.html:184 manager/views/workout.py:281
+#: manager/templates/workout/view.html:182 manager/views/workout.py:281
msgid "Mark as template"
msgstr "Marker som mal"
@@ -2867,41 +2865,41 @@ msgstr "Dette vil slette alle vekt logger for denne dagen også."
msgid "Value"
msgstr ""
-#: nutrition/forms.py:117
+#: nutrition/forms.py:118
#, fuzzy
#| msgid "Height (cm)"
msgid "Height (in)"
msgstr "Høyde (cm)"
-#: nutrition/forms.py:120
+#: nutrition/forms.py:121
#, fuzzy
#| msgid "Weight log"
msgid "Weight (kg)"
msgstr "Vektlogg"
-#: nutrition/forms.py:120
+#: nutrition/forms.py:121
#, fuzzy
#| msgid "Weight log"
msgid "Weight (lbs)"
msgstr "Vektlogg"
-#: nutrition/forms.py:133
+#: nutrition/forms.py:134
msgid "Calculate"
msgstr "Beregn"
-#: nutrition/forms.py:207 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:208 nutrition/templates/rate/form.html:76
msgid "Basic caloric intake"
msgstr "Grunnleggende kaloriinntak"
-#: nutrition/forms.py:208
+#: nutrition/forms.py:209
msgid "Your basic caloric intake as calculated for your data"
msgstr "Din grunnleggende kaloriinntak beregnet med din data"
-#: nutrition/forms.py:213
+#: nutrition/forms.py:214
msgid "Additional calories"
msgstr "Ekstra kalorier"
-#: nutrition/forms.py:215
+#: nutrition/forms.py:216
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
@@ -2909,71 +2907,56 @@ msgstr ""
"Ekstra kalorier for å legge til base rate (for å trekke fra, legg inn et "
"negativt tall)"
-#: nutrition/forms.py:248 nutrition/models/ingredient_weight_unit.py:39
-#: nutrition/models/log.py:84 nutrition/models/meal_item.py:53
+#: nutrition/forms.py:249 nutrition/models/ingredient_weight_unit.py:39
+#: nutrition/models/log.py:87 nutrition/models/meal_item.py:54
msgid "Ingredient"
msgstr "Ingrediens"
-#: nutrition/models/ingredient.py:131
+#: nutrition/models/ingredient.py:117
msgid "In kcal per 100g"
msgstr "I kcal per 100g"
-#: nutrition/models/ingredient.py:138 nutrition/models/ingredient.py:146
-#: nutrition/models/ingredient.py:156 nutrition/models/ingredient.py:164
-#: nutrition/models/ingredient.py:174 nutrition/models/ingredient.py:184
-#: nutrition/models/ingredient.py:194
+#: nutrition/models/ingredient.py:124 nutrition/models/ingredient.py:132
+#: nutrition/models/ingredient.py:142 nutrition/models/ingredient.py:150
+#: nutrition/models/ingredient.py:160 nutrition/models/ingredient.py:170
+#: nutrition/models/ingredient.py:180
msgid "In g per 100g of product"
msgstr "I g per 100g produkt"
-#: nutrition/models/ingredient.py:155
-#: nutrition/templates/ingredient/view.html:96 nutrition/views/plan.py:259
+#: nutrition/models/ingredient.py:141
+#: nutrition/templates/ingredient/view.html:70 nutrition/views/plan.py:259
msgid "Sugar content in carbohydrates"
msgstr "Sukkerinnholdet i karbohydrater"
-#: nutrition/models/ingredient.py:173
-#: nutrition/templates/ingredient/view.html:112 nutrition/views/plan.py:273
+#: nutrition/models/ingredient.py:159
+#: nutrition/templates/ingredient/view.html:86 nutrition/views/plan.py:273
msgid "Saturated fat content in fats"
msgstr "Mettet fett i fett"
-#: nutrition/models/ingredient.py:183
-#: nutrition/templates/ingredient/view.html:134 nutrition/views/plan.py:279
-msgid "Fibres"
-msgstr "Fiber"
+#: nutrition/models/ingredient.py:169
+#: nutrition/templates/ingredient/view.html:108 nutrition/views/plan.py:279
+msgid "Fiber"
+msgstr ""
-#: nutrition/models/ingredient.py:193
-#: nutrition/templates/ingredient/view.html:144 nutrition/views/plan.py:285
+#: nutrition/models/ingredient.py:179
+#: nutrition/templates/ingredient/view.html:118 nutrition/views/plan.py:285
msgid "Sodium"
msgstr "Natrium"
-#: nutrition/models/ingredient.py:215
+#: nutrition/models/ingredient.py:209
msgid "Link to product"
msgstr "Lenke til produkt"
-#: nutrition/models/ingredient.py:244
+#: nutrition/models/ingredient.py:238
msgid "Brand name of product"
msgstr "Merkenavn for produkt"
-#: nutrition/models/ingredient.py:304
+#: nutrition/models/ingredient.py:305
#, python-brace-format
msgid "The total energy ({self.energy}kcal) is not the approximate sum of the "
msgstr ""
"Den totale energien ({self.energy} kcal) er ikke den omtrentlige summen av"
-#: nutrition/models/ingredient.py:383 nutrition/views/ingredient.py:196
-msgid "Ingredient was successfully added to the general database"
-msgstr "Ingrediens ble lagt til i databasen"
-
-#: nutrition/models/ingredient.py:408
-msgid "New user submitted ingredient"
-msgstr "Ny bruker sendte inn ingrediens"
-
-#: nutrition/models/ingredient.py:410
-#, fuzzy, python-brace-format
-#| msgid "The user {0} submitted a new ingredient \"{1}\"."
-msgid ""
-"The user {request.user.username} submitted a new ingredient \"{self.name}\"."
-msgstr "Brukeren {0} sendte inn en ny ingrediens \"{1}\"."
-
#: nutrition/models/ingredient_category.py:31
msgid "Ingredient Categories"
msgstr "Ingredienskategorier"
@@ -2986,16 +2969,16 @@ msgstr "Mengde i gram"
msgid "Unit amount, e.g. \"1 Cup\" or \"1/2 spoon\""
msgstr "Enhetsmengde , f.eks \"1 kopp\" eller \"1/2 skje\""
-#: nutrition/models/log.py:49 nutrition/models/meal.py:50
-#: nutrition/models/meal_item.py:47 nutrition/models/plan.py:106
+#: nutrition/models/log.py:52 nutrition/models/meal.py:50
+#: nutrition/models/meal_item.py:48 nutrition/models/plan.py:108
msgid "Nutrition plan"
msgstr "Ernæringsplan"
-#: nutrition/models/log.py:58
+#: nutrition/models/log.py:61
msgid "Meal"
msgstr "Måltid"
-#: nutrition/models/log.py:68
+#: nutrition/models/log.py:71
#, fuzzy
#| msgid "Time (approx)"
msgid "Date and Time (Approx.)"
@@ -3019,11 +3002,11 @@ msgstr ""
"En beskrivelse av målet med planen, f.eks \"Få masse\" eller \"klar for "
"sommeren\""
-#: nutrition/models/plan.py:88
+#: nutrition/models/plan.py:90
msgid "Use daily calories"
msgstr "Bruk daglige kalorier"
-#: nutrition/models/plan.py:91
+#: nutrition/models/plan.py:93
msgid ""
"Tick the box if you want to mark this plan as having a goal amount of "
"calories. You can use the calculator or enter the value yourself."
@@ -3147,67 +3130,36 @@ msgstr "Søk"
msgid "Add ingredient"
msgstr "Legg til ingrediens"
-#: nutrition/templates/ingredient/pending.html:14
-msgid "Submission date"
-msgstr "Innleveringsdato"
-
-#: nutrition/templates/ingredient/view.html:27
-msgid "Ingredient is pending review"
-msgstr "Ingrediens venter på godkjenning"
-
-#: nutrition/templates/ingredient/view.html:28
-msgid ""
-"This user submitted ingredient is pending a decision to be\n"
-"included in the database. Till then, it will not be shown in the overview "
-"or\n"
-"the search."
-msgstr ""
-"Ingrediens brukeren har sendt inn er i påvente av en beslutning om å bli\n"
-"inkludert i databasen. Inntil da, vil den ikke bli vist i oversikten eller\n"
-"søket."
-
-#: nutrition/templates/ingredient/view.html:31
-msgid "Please select one of the options below."
-msgstr "Velg ett av alternativene nedenfor."
-
-#: nutrition/templates/ingredient/view.html:38
-msgid "Accept"
-msgstr "Godta"
-
-#: nutrition/templates/ingredient/view.html:42
-msgid "Decline"
-msgstr "Avslå"
-
-#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:229
+#: nutrition/templates/ingredient/view.html:45 nutrition/views/plan.py:229
msgid "Macronutrients"
msgstr "Makronæringsstoffer"
-#: nutrition/templates/ingredient/view.html:80
+#: nutrition/templates/ingredient/view.html:54
msgid "kJ"
msgstr "kJ"
-#: nutrition/templates/ingredient/view.html:101
-#: nutrition/templates/ingredient/view.html:117
-#: nutrition/templates/ingredient/view.html:139
-#: nutrition/templates/ingredient/view.html:149
+#: nutrition/templates/ingredient/view.html:75
+#: nutrition/templates/ingredient/view.html:91
+#: nutrition/templates/ingredient/view.html:113
+#: nutrition/templates/ingredient/view.html:123
msgid "n.A."
msgstr "n.A."
-#: nutrition/templates/ingredient/view.html:128
+#: nutrition/templates/ingredient/view.html:102
msgid "Others"
msgstr "Andre"
-#: nutrition/templates/ingredient/view.html:170
+#: nutrition/templates/ingredient/view.html:144
#: nutrition/templates/units/list.html:46 nutrition/views/unit.py:86
msgid "Add new weight unit"
msgstr "Legg til vekt enhet"
-#: nutrition/templates/ingredient/view.html:232
-#: nutrition/templates/ingredient/view.html:235
+#: nutrition/templates/ingredient/view.html:206
+#: nutrition/templates/ingredient/view.html:209
msgid "Edit ingredient"
msgstr "Endre ingrediens"
-#: nutrition/templates/ingredient/view.html:239
+#: nutrition/templates/ingredient/view.html:213
msgid "Delete ingredient"
msgstr "Slett ingrediens"
@@ -3308,14 +3260,10 @@ msgstr ""
msgid "56 to 90"
msgstr ""
-#: nutrition/views/ingredient.py:154
+#: nutrition/views/ingredient.py:157
msgid "Add a new ingredient"
msgstr "Legg til ny ingrediens"
-#: nutrition/views/ingredient.py:209
-msgid "Ingredient was successfully marked as rejected"
-msgstr "Ingrediens ble vellykket merket som avvist"
-
#: nutrition/views/plan.py:120
msgid "Nutritional plan"
msgstr "Ernæringsplan"
@@ -3362,46 +3310,54 @@ msgstr ""
"treningsentusiaster fra hele verden."
#: software/templates/about_us.html:18
-msgid "Source code"
-msgstr "Kildekode"
-
-#: software/templates/about_us.html:20
-msgid "Get the source code of this application and its server on github"
-msgstr ""
-
-#: software/templates/about_us.html:25
msgid "Have a problem or idea?"
msgstr "Har du et problem eller en idé?"
-#: software/templates/about_us.html:27
+#: software/templates/about_us.html:20
msgid ""
"Get in touch if something didn't behave as expected or if there is a feature "
"that you feel is missing."
msgstr ""
-#: software/templates/about_us.html:32
+#: software/templates/about_us.html:26
msgid "Say hi!"
msgstr "Si hei."
-#: software/templates/about_us.html:34
+#: software/templates/about_us.html:28
msgid "If you want to chat with us, hop on the Discord server and get in touch"
msgstr ""
-#: software/templates/about_us.html:39 software/templates/features.html:503
+#: software/templates/about_us.html:33
+msgid "Mastodon"
+msgstr ""
+
+#: software/templates/about_us.html:35
+msgid "Follow us on mastodon for updates and news about the project"
+msgstr ""
+
+#: software/templates/about_us.html:40 software/templates/features.html:503
msgid "Translation"
msgstr "Oversettelse"
-#: software/templates/about_us.html:41
+#: software/templates/about_us.html:42
msgid ""
"This application is translated on weblate. If you also want to help, click "
"the link and start translating"
msgstr ""
-#: software/templates/about_us.html:50
+#: software/templates/about_us.html:47
+msgid "Source code"
+msgstr "Kildekode"
+
+#: software/templates/about_us.html:49
+msgid "Get the source code of this application and its server on github"
+msgstr ""
+
+#: software/templates/about_us.html:59
msgid "Our goal"
msgstr "Vårt mål"
-#: software/templates/about_us.html:53
+#: software/templates/about_us.html:62
#, fuzzy
#| msgid ""
#| "The goal is to build an awesome\n"
@@ -3411,7 +3367,8 @@ msgstr "Vårt mål"
msgid ""
"The goal is to build an awesome\n"
" and flexible fitness manager, along with a comprehensive and "
-"complete list of exercises and\n"
+"complete list of\n"
+" exercises and\n"
" ingredients, all released under a free license."
msgstr ""
"Målet er å bygge en kjempe god\n"
@@ -3431,10 +3388,6 @@ msgstr ""
"hvor Workout Manager er et gratis, åpen kildekode web-applikasjon som "
"håndterer øvelser og trening."
-#: software/templates/features.html:45
-msgid "About"
-msgstr "Om"
-
#: software/templates/features.html:57
msgid "Mobile app"
msgstr ""
@@ -3702,18 +3655,6 @@ msgid ""
"to its own copyright."
msgstr ""
-#: utils/models.py:130
-msgid "Pending"
-msgstr "Avventer"
-
-#: utils/models.py:131
-msgid "Accepted"
-msgstr "Godkjent"
-
-#: utils/models.py:132
-msgid "Declined"
-msgstr "Ikke godkjent"
-
#: weight/forms.py:54
msgid "Input"
msgstr "Inndata"
@@ -3726,7 +3667,7 @@ msgstr "Datoformat"
msgid "You have to enter your weight"
msgstr "Du må angi vekten din"
-#: weight/models.py:60
+#: weight/models.py:78
msgid "Weight entry"
msgstr "Vektoppføring"
@@ -3869,6 +3810,66 @@ msgstr "Slettet."
msgid "Delete weight entry for the %s"
msgstr "Slett vektoppføring for %s"
+#~ msgid "Ingredients pending review"
+#~ msgstr "Ingredienser som venter på godkjenning"
+
+#~ msgid "Fibres"
+#~ msgstr "Fiber"
+
+#~ msgid "Ingredient was successfully added to the general database"
+#~ msgstr "Ingrediens ble lagt til i databasen"
+
+#~ msgid "New user submitted ingredient"
+#~ msgstr "Ny bruker sendte inn ingrediens"
+
+#, fuzzy, python-brace-format
+#~| msgid "The user {0} submitted a new ingredient \"{1}\"."
+#~ msgid ""
+#~ "The user {request.user.username} submitted a new ingredient \"{self."
+#~ "name}\"."
+#~ msgstr "Brukeren {0} sendte inn en ny ingrediens \"{1}\"."
+
+#~ msgid "Submission date"
+#~ msgstr "Innleveringsdato"
+
+#~ msgid "Ingredient is pending review"
+#~ msgstr "Ingrediens venter på godkjenning"
+
+#~ msgid ""
+#~ "This user submitted ingredient is pending a decision to be\n"
+#~ "included in the database. Till then, it will not be shown in the overview "
+#~ "or\n"
+#~ "the search."
+#~ msgstr ""
+#~ "Ingrediens brukeren har sendt inn er i påvente av en beslutning om å bli\n"
+#~ "inkludert i databasen. Inntil da, vil den ikke bli vist i oversikten "
+#~ "eller\n"
+#~ "søket."
+
+#~ msgid "Please select one of the options below."
+#~ msgstr "Velg ett av alternativene nedenfor."
+
+#~ msgid "Accept"
+#~ msgstr "Godta"
+
+#~ msgid "Decline"
+#~ msgstr "Avslå"
+
+#~ msgid "Ingredient was successfully marked as rejected"
+#~ msgstr "Ingrediens ble vellykket merket som avvist"
+
+#~ msgid "About"
+#~ msgstr "Om"
+
+#~ msgid "Pending"
+#~ msgstr "Avventer"
+
+#~ msgid "Accepted"
+#~ msgstr "Godkjent"
+
+#~ msgid "Declined"
+#~ msgstr "Ikke godkjent"
+
#~ msgid "Share"
#~ msgstr "Del"
diff --git a/wger/locale/os/LC_MESSAGES/django.po b/wger/locale/os/LC_MESSAGES/django.po
index 49408500c..8c8f91f6a 100644
--- a/wger/locale/os/LC_MESSAGES/django.po
+++ b/wger/locale/os/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: wger Workout Manager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-02-02 12:42+0100\n"
+"POT-Creation-Date: 2024-07-14 15:49+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/"
@@ -29,7 +29,7 @@ msgid ""
"registered users to this gym and update all existing users without a gym."
msgstr ""
-#: config/views/gym_config.py:42 core/templates/language/view.html:63
+#: config/views/gym_config.py:42 core/templates/language/view.html:67
#: core/templates/license/list.html:17 core/templates/misc/license/list.html:18
#: core/templates/repetition_unit/list.html:18
#: core/templates/tags/render_day.html:39
@@ -49,8 +49,8 @@ msgstr ""
#: manager/templates/calendar/day.html:68
#: manager/templates/calendar/month.html:85
#: manager/templates/calendar/partial_overview_table.html:18
-#: manager/templates/schedule/view.html:119
-#: nutrition/templates/ingredient/view.html:191
+#: manager/templates/schedule/view.html:118
+#: nutrition/templates/ingredient/view.html:165
#: nutrition/templates/units/list.html:19
msgid "Edit"
msgstr "Ивын"
@@ -84,8 +84,8 @@ msgstr ""
msgid "Empty placeholder schedule"
msgstr ""
-#: core/forms.py:69 core/templates/navigation.html:275
-#: core/templates/navigation.html:281 core/templates/user/login.html:4
+#: core/forms.py:69 core/templates/navigation.html:285
+#: core/templates/navigation.html:291 core/templates/user/login.html:4
#: software/templates/features.html:82 software/templates/features.html:427
msgid "Login"
msgstr ""
@@ -155,7 +155,7 @@ msgstr ""
msgid "Please enter your current password."
msgstr ""
-#: core/forms.py:242 core/templates/language/view.html:68
+#: core/forms.py:242 core/templates/language/view.html:73
#: core/templates/license/list.html:19 core/templates/misc/license/list.html:22
#: core/templates/repetition_unit/list.html:20
#: core/templates/tags/render_day.html:45
@@ -170,10 +170,10 @@ msgstr ""
#: gym/templates/gym/list.html:22 manager/templates/calendar/day.html:73
#: manager/templates/calendar/month.html:89
#: manager/templates/calendar/partial_overview_table.html:23
-#: manager/templates/schedule/view.html:123
-#: manager/templates/workout/view.html:190
-#: nutrition/templates/ingredient/view.html:192
-#: nutrition/templates/ingredient/view.html:241
+#: manager/templates/schedule/view.html:122
+#: manager/templates/workout/view.html:188
+#: nutrition/templates/ingredient/view.html:166
+#: nutrition/templates/ingredient/view.html:215
#: nutrition/templates/units/list.html:22
msgid "Delete"
msgstr "Схафын"
@@ -186,14 +186,14 @@ msgstr ""
msgid "The form is secured with reCAPTCHA"
msgstr ""
-#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:275
-#: core/templates/navigation.html:287 core/templates/template.html:147
+#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:285
+#: core/templates/navigation.html:297 core/templates/template.html:149
#: core/templates/user/login.html:20 core/views/user.py:298
#: software/templates/features.html:87 software/templates/features.html:422
msgid "Register"
msgstr ""
-#: core/forms.py:315
+#: core/forms.py:315 software/templates/features.html:45
msgid "Contact"
msgstr ""
@@ -202,7 +202,7 @@ msgid "Some way of answering you (e-mail, etc.)"
msgstr ""
#: core/forms.py:324 exercises/models/comment.py:58 manager/models/set.py:61
-#: manager/models/setting.py:111 nutrition/models/log.py:74
+#: manager/models/setting.py:114 nutrition/models/log.py:77
msgid "Comment"
msgstr "Хъуыды"
@@ -222,6 +222,12 @@ msgstr "Ӕвзаджы цыбыр ном"
msgid "Language full name"
msgstr "Ӕвзаджы ӕнӕхъӕн ном"
+#: core/models/language.py:45 core/templates/language/view.html:23
+#, fuzzy
+#| msgid "Language full name"
+msgid "Language full name in English"
+msgstr "Ӕвзаджы ӕнӕхъӕн ном"
+
#: core/models/license.py:29
msgid "Full name"
msgstr ""
@@ -236,7 +242,7 @@ msgstr ""
msgid "Short name, e.g. CC-BY-SA 3"
msgstr ""
-#: core/models/license.py:45 nutrition/models/ingredient.py:214
+#: core/models/license.py:45 nutrition/models/ingredient.py:208
msgid "Link"
msgstr ""
@@ -339,7 +345,7 @@ msgstr ""
msgid "Age"
msgstr ""
-#: core/models/profile.py:230 nutrition/forms.py:117
+#: core/models/profile.py:230 nutrition/forms.py:118
msgid "Height (cm)"
msgstr ""
@@ -390,7 +396,7 @@ msgid "Total caloric intake, including e.g. any surplus"
msgstr ""
#: core/models/profile.py:333 nutrition/models/ingredient_weight_unit.py:45
-#: nutrition/models/log.py:93 nutrition/models/meal_item.py:58
+#: nutrition/models/log.py:96 nutrition/models/meal_item.py:59
msgid "Weight unit"
msgstr ""
@@ -419,17 +425,16 @@ msgstr ""
#: core/models/rep_unit.py:36 core/models/weight_unit.py:36
#: core/templates/user/overview.html:262 core/views/user.py:599
#: exercises/models/category.py:29 exercises/models/equipment.py:29
-#: exercises/models/exercise.py:58 exercises/models/muscle.py:36
+#: exercises/models/exercise.py:59 exercises/models/muscle.py:36
#: gym/models/contract.py:52 gym/models/contract.py:103 gym/models/gym.py:46
#: gym/models/user_document.py:84 gym/templates/contract/view.html:50
#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:96
#: gym/views/gym.py:158 manager/models/schedule.py:55
#: manager/models/workout.py:57 measurements/models/category.py:36
-#: nutrition/models/ingredient.py:125
+#: nutrition/models/ingredient.py:111
#: nutrition/models/ingredient_category.py:27 nutrition/models/meal.py:67
#: nutrition/models/weight_unit.py:38
-#: nutrition/templates/ingredient/pending.html:15
-#: nutrition/templates/ingredient/view.html:178
+#: nutrition/templates/ingredient/view.html:152
msgid "Name"
msgstr "Ном"
@@ -530,24 +535,24 @@ msgstr ""
msgid "Dashboard"
msgstr ""
-#: core/templates/language/overview.html:4 core/templates/navigation.html:335
+#: core/templates/language/overview.html:4 core/templates/navigation.html:345
msgid "Languages"
msgstr ""
-#: core/templates/language/overview.html:20
+#: core/templates/language/overview.html:22
msgid "Nothing found."
msgstr ""
-#: core/templates/language/overview.html:20
+#: core/templates/language/overview.html:22
#: manager/templates/calendar/month.html:132
#: manager/templates/schedule/overview.html:28
-#: manager/templates/schedule/view.html:145
+#: manager/templates/schedule/view.html:144
#: manager/templates/workout/overview.html:28
#: nutrition/templates/ingredient/overview.html:38
msgid "Add one now."
msgstr ""
-#: core/templates/language/overview.html:33 core/templates/license/list.html:40
+#: core/templates/language/overview.html:35 core/templates/license/list.html:40
#: core/templates/misc/license/list.html:43
#: core/templates/repetition_unit/list.html:43
#: core/templates/user/overview.html:326 core/templates/user/overview.html:365
@@ -567,13 +572,13 @@ msgstr ""
msgid "Add"
msgstr "Бафтауын"
-#: core/templates/language/view.html:58 core/templates/user/api_key.html:44
+#: core/templates/language/view.html:61 core/templates/user/api_key.html:44
#: core/templates/user/preferences.html:45 gym/models/contract.py:203
#: gym/templates/contract/view.html:41 gym/templates/contract/view.html:106
#: gym/templates/gym/member_list.html:248
-#: manager/templates/schedule/view.html:286
-#: manager/templates/workout/view.html:165
-#: nutrition/templates/ingredient/view.html:228
+#: manager/templates/schedule/view.html:285
+#: manager/templates/workout/view.html:163
+#: nutrition/templates/ingredient/view.html:202
msgid "Options"
msgstr "Фадӕттӕ"
@@ -598,12 +603,11 @@ msgstr ""
#: gym/templates/gym/member_list.html:299
#: mailer/templates/mailer/gym/overview.html:30
#: manager/templates/calendar/day.html:87
-#: nutrition/templates/ingredient/pending.html:30
#: nutrition/templates/units/list.html:29
msgid "Nothing found"
msgstr ""
-#: core/templates/misc/about.html:4 core/templates/template.html:173
+#: core/templates/misc/about.html:4 core/templates/template.html:175
msgid "Imprint"
msgstr ""
@@ -614,176 +618,171 @@ msgid ""
"entries here."
msgstr ""
-#: core/templates/navigation.html:27 software/templates/features.html:437
+#: core/templates/navigation.html:28 software/templates/features.html:437
msgid "Training"
msgstr "Фӕлтӕрд"
-#: core/templates/navigation.html:34 core/templates/user/overview.html:25
+#: core/templates/navigation.html:37 core/templates/user/overview.html:25
msgid "Workouts"
msgstr ""
-#: core/templates/navigation.html:42
+#: core/templates/navigation.html:46
msgid "Workouts schedules"
msgstr ""
-#: core/templates/navigation.html:50 core/templates/user/overview.html:70
+#: core/templates/navigation.html:54 core/templates/user/overview.html:70
#: manager/templates/calendar/month.html:10
#: manager/templates/calendar/month.html:21
msgid "Calendar"
msgstr ""
-#: core/templates/navigation.html:60
+#: core/templates/navigation.html:64
msgid "Measurements"
msgstr ""
-#: core/templates/navigation.html:70 gallery/templates/images/overview.html:6
+#: core/templates/navigation.html:75 gallery/templates/images/overview.html:6
msgid "Gallery"
msgstr ""
-#: core/templates/navigation.html:76
+#: core/templates/navigation.html:81
msgid "Workout templates"
msgstr ""
-#: core/templates/navigation.html:82 manager/views/workout.py:84
+#: core/templates/navigation.html:88 manager/views/workout.py:84
msgid "Your templates"
msgstr ""
-#: core/templates/navigation.html:90 manager/views/workout.py:98
+#: core/templates/navigation.html:97 manager/views/workout.py:98
msgid "Public templates"
msgstr ""
-#: core/templates/navigation.html:97 manager/forms.py:129
-#: manager/models/setting.py:54 software/templates/features.html:51
+#: core/templates/navigation.html:105 manager/forms.py:129
+#: manager/models/setting.py:57 software/templates/features.html:51
#: software/templates/features.html:459
msgid "Exercises"
msgstr "Фӕлтӕрӕнтӕ"
-#: core/templates/navigation.html:103 core/templates/navigation.html:170
-#: core/templates/navigation.html:330
+#: core/templates/navigation.html:111 core/templates/navigation.html:184
+#: core/templates/navigation.html:340
msgid "Administration"
msgstr "Администраци"
-#: core/templates/navigation.html:106
+#: core/templates/navigation.html:115
#, fuzzy
#| msgid "Exercise Categories"
msgid "Exercise edit history"
msgstr "Фӕлтӕрӕнты ӕмбырд"
-#: core/templates/navigation.html:111 exercises/models/base.py:103
+#: core/templates/navigation.html:121 exercises/models/base.py:103
msgid "Equipment"
msgstr ""
-#: core/templates/navigation.html:116
+#: core/templates/navigation.html:127
msgid "Muscles"
msgstr "Мускултӕ"
-#: core/templates/navigation.html:121
+#: core/templates/navigation.html:133
#: exercises/templates/categories/admin-overview.html:4
msgid "Categories"
msgstr ""
-#: core/templates/navigation.html:136 software/templates/features.html:447
+#: core/templates/navigation.html:148 software/templates/features.html:447
msgid "Nutrition"
msgstr ""
-#: core/templates/navigation.html:143 core/templates/user/overview.html:144
+#: core/templates/navigation.html:156 core/templates/user/overview.html:144
msgid "Nutrition plans"
msgstr ""
-#: core/templates/navigation.html:151 nutrition/templates/bmi/form.html:50
+#: core/templates/navigation.html:165 nutrition/templates/bmi/form.html:50
msgid "BMI calculator"
msgstr ""
-#: core/templates/navigation.html:159 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:174 nutrition/templates/rate/form.html:17
msgid "Daily calories calculator"
msgstr ""
-#: core/templates/navigation.html:165
+#: core/templates/navigation.html:179
#: nutrition/templates/ingredient/overview.html:10
msgid "Ingredient overview"
msgstr ""
-#: core/templates/navigation.html:172 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:187 nutrition/templates/units/list.html:6
msgid "Ingredient weight units"
msgstr ""
-#: core/templates/navigation.html:177
-#: nutrition/templates/ingredient/pending.html:6
-msgid "Ingredients pending review"
-msgstr ""
-
-#: core/templates/navigation.html:193 software/templates/features.html:442
+#: core/templates/navigation.html:203 software/templates/features.html:442
msgid "Body weight"
msgstr ""
-#: core/templates/navigation.html:200 core/templates/user/overview.html:114
+#: core/templates/navigation.html:210 core/templates/user/overview.html:114
msgid "Weight overview"
msgstr ""
-#: core/templates/navigation.html:207 weight/views.py:65
+#: core/templates/navigation.html:217 weight/views.py:65
msgid "Add weight entry"
msgstr ""
-#: core/templates/navigation.html:221
+#: core/templates/navigation.html:231
msgid "About this software"
msgstr ""
-#: core/templates/navigation.html:227 software/templates/about_us.html:5
+#: core/templates/navigation.html:237 software/templates/about_us.html:5
msgid "About us"
msgstr ""
-#: core/templates/navigation.html:233 software/templates/features.html:507
+#: core/templates/navigation.html:243 software/templates/features.html:507
msgid "REST API"
msgstr ""
-#: core/templates/navigation.html:239 utils/models.py:45
+#: core/templates/navigation.html:249 utils/models.py:45
msgid "License"
msgstr ""
-#: core/templates/navigation.html:245
+#: core/templates/navigation.html:255
msgid "Developer documentation"
msgstr ""
-#: core/templates/navigation.html:252
+#: core/templates/navigation.html:262
msgid "Get the code"
msgstr ""
-#: core/templates/navigation.html:259 core/templates/template.html:212
+#: core/templates/navigation.html:269 core/templates/template.html:214
#: software/templates/features.html:582
msgid "Translate"
msgstr ""
-#: core/templates/navigation.html:293 core/templates/user/login.html:28
+#: core/templates/navigation.html:303 core/templates/user/login.html:28
msgid "Reset password"
msgstr ""
-#: core/templates/navigation.html:311
+#: core/templates/navigation.html:321
msgid "My preferences"
msgstr ""
-#: core/templates/navigation.html:320
+#: core/templates/navigation.html:330
msgid "Logout"
msgstr ""
-#: core/templates/navigation.html:343
+#: core/templates/navigation.html:353
msgid "Licenses"
msgstr ""
-#: core/templates/navigation.html:351
+#: core/templates/navigation.html:361
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr ""
-#: core/templates/navigation.html:359 core/templates/weight_unit/list.html:4
-#: nutrition/templates/ingredient/view.html:167
+#: core/templates/navigation.html:369 core/templates/weight_unit/list.html:4
+#: nutrition/templates/ingredient/view.html:141
msgid "Weight units"
msgstr ""
-#: core/templates/navigation.html:367 core/templates/user/list.html:4
+#: core/templates/navigation.html:377 core/templates/user/list.html:4
msgid "User list"
msgstr ""
-#: core/templates/navigation.html:373
+#: core/templates/navigation.html:383
msgid "Gyms"
msgstr ""
@@ -833,12 +832,12 @@ msgstr ""
msgid "The %(site_name)s team"
msgstr ""
-#: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:11
+#: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:12
msgid "previous"
msgstr ""
-#: core/templates/tags/pagination.html:31
-#: core/templates/tags/pagination.html:35
+#: core/templates/tags/pagination.html:33
+#: core/templates/tags/pagination.html:38
msgid "next"
msgstr ""
@@ -863,34 +862,34 @@ msgid "Add exercises to this workout day"
msgstr ""
#: core/templates/tags/render_weight_log.html:17 manager/helpers.py:86
-#: manager/models/setting.py:69 manager/templates/set/formset.html:9
+#: manager/models/setting.py:72 manager/templates/set/formset.html:9
msgid "Reps"
msgstr ""
#: core/templates/tags/render_weight_log.html:30 manager/forms.py:191
-#: manager/models/log.py:103 manager/models/setting.py:99
+#: manager/models/log.py:103 manager/models/setting.py:102
#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
msgid "RiR"
msgstr ""
-#: core/templates/template.html:120 manager/templates/calendar/month.html:138
-#: manager/templates/schedule/view.html:249
-#: manager/templates/schedule/view.html:270
-#: manager/templates/workout/view.html:86
-#: manager/templates/workout/view.html:139
+#: core/templates/template.html:122 manager/templates/calendar/month.html:138
+#: manager/templates/schedule/view.html:248
+#: manager/templates/schedule/view.html:269
+#: manager/templates/workout/view.html:84
+#: manager/templates/workout/view.html:137
msgid "Close"
msgstr ""
-#: core/templates/template.html:136
+#: core/templates/template.html:138
msgid ""
"You are using a guest account, data entered will be deleted after a week."
msgstr ""
-#: core/templates/template.html:141
+#: core/templates/template.html:143
msgid "Create some demo entries"
msgstr ""
-#: core/templates/template.html:178 software/templates/features.html:547
+#: core/templates/template.html:180 software/templates/features.html:547
#: software/templates/tos.html:7
msgid "Terms of service"
msgstr ""
@@ -982,7 +981,7 @@ msgid "Overview"
msgstr ""
#: core/templates/user/overview.html:28
-#: manager/templates/schedule/view.html:164
+#: manager/templates/schedule/view.html:163
#: manager/templates/workout/overview.html:39 manager/views/schedule_step.py:60
msgid "Add workout"
msgstr ""
@@ -990,20 +989,20 @@ msgstr ""
#: core/templates/user/overview.html:34 core/templates/user/overview.html:76
#: core/templates/user/overview.html:120 core/templates/user/overview.html:152
#: exercises/models/base.py:118 exercises/models/base.py:124
-#: exercises/models/exercise.py:63 exercises/models/exercise.py:69
+#: exercises/models/exercise.py:64 exercises/models/exercise.py:70
#: exercises/models/image.py:107 exercises/models/image.py:113
#: exercises/models/video.py:163 exercises/models/video.py:169
#: gallery/models/image.py:42 manager/helpers.py:85 manager/models/log.py:100
#: manager/models/session.py:67 measurements/models/measurement.py:47
-#: nutrition/models/ingredient.py:101 nutrition/models/ingredient.py:107
-#: nutrition/models/ingredient.py:222 weight/models.py:33
+#: nutrition/models/ingredient.py:87 nutrition/models/ingredient.py:93
+#: nutrition/models/ingredient.py:216 weight/models.py:51
#: weight/templates/import_csv_preview.html:13
#: weight/templates/import_csv_preview.html:42 weight/views.py:144
msgid "Date"
msgstr "Бон"
#: core/templates/user/overview.html:35 core/templates/user/overview.html:153
-#: exercises/models/exercise.py:51 gallery/models/image.py:65
+#: exercises/models/exercise.py:52 gallery/models/image.py:65
#: gym/models/contract.py:58 gym/models/contract.py:109
#: manager/models/day.py:37 manager/models/workout.py:63
#: measurements/models/measurement.py:62 nutrition/models/plan.py:67
@@ -1021,13 +1020,13 @@ msgstr ""
#: core/templates/user/overview.html:58
#: manager/templates/calendar/month.html:128
-#: manager/templates/schedule/view.html:145
+#: manager/templates/schedule/view.html:144
#: manager/templates/workout/overview.html:28
msgid "No workouts found."
msgstr ""
#: core/templates/user/overview.html:68 manager/forms.py:280
-#: manager/templates/workout/view.html:108
+#: manager/templates/workout/view.html:106
msgid "Log"
msgstr ""
@@ -1051,35 +1050,35 @@ msgstr ""
#: core/templates/user/overview.html:112 core/templates/user/overview.html:121
#: manager/forms.py:186 manager/helpers.py:86 manager/models/log.py:86
-#: manager/models/setting.py:79 manager/templates/log/add.html:54
-#: manager/templates/set/formset.html:11 weight/models.py:35
+#: manager/models/setting.py:82 manager/templates/log/add.html:54
+#: manager/templates/set/formset.html:11 weight/models.py:53
#: weight/templates/import_csv_preview.html:14
#: weight/templates/import_csv_preview.html:43 weight/views.py:144
msgid "Weight"
msgstr ""
-#: core/templates/user/overview.html:154 nutrition/models/ingredient.py:130
-#: nutrition/templates/ingredient/view.html:77 nutrition/views/plan.py:237
+#: core/templates/user/overview.html:154 nutrition/models/ingredient.py:116
+#: nutrition/templates/ingredient/view.html:51 nutrition/views/plan.py:237
msgid "Energy"
msgstr ""
-#: core/templates/user/overview.html:155 nutrition/models/ingredient.py:137
-#: nutrition/templates/ingredient/view.html:84 nutrition/views/plan.py:243
+#: core/templates/user/overview.html:155 nutrition/models/ingredient.py:123
+#: nutrition/templates/ingredient/view.html:58 nutrition/views/plan.py:243
msgid "Protein"
msgstr ""
-#: core/templates/user/overview.html:156 nutrition/models/ingredient.py:145
-#: nutrition/templates/ingredient/view.html:90 nutrition/views/plan.py:251
+#: core/templates/user/overview.html:156 nutrition/models/ingredient.py:131
+#: nutrition/templates/ingredient/view.html:64 nutrition/views/plan.py:251
msgid "Carbohydrates"
msgstr ""
-#: core/templates/user/overview.html:157 nutrition/models/ingredient.py:163
-#: nutrition/templates/ingredient/view.html:106 nutrition/views/plan.py:265
+#: core/templates/user/overview.html:157 nutrition/models/ingredient.py:149
+#: nutrition/templates/ingredient/view.html:80 nutrition/views/plan.py:265
msgid "Fat"
msgstr ""
#: core/templates/user/overview.html:170
-#: nutrition/templates/ingredient/view.html:79
+#: nutrition/templates/ingredient/view.html:53
msgid "kcal"
msgstr ""
@@ -1091,7 +1090,7 @@ msgstr ""
#: gym/templates/gym/member_list.html:207
#: gym/templates/gym/member_list.html:240
#: gym/templates/gym/member_list.html:277
-#: manager/templates/schedule/view.html:101
+#: manager/templates/schedule/view.html:100
msgid "Actions"
msgstr ""
@@ -1134,7 +1133,7 @@ msgid "Details"
msgstr ""
#: core/templates/user/overview.html:258 gym/views/export.py:57
-#: manager/helpers.py:86 manager/templates/schedule/view.html:99
+#: manager/helpers.py:86 manager/templates/schedule/view.html:98
msgid "Nr."
msgstr "Н."
@@ -1179,7 +1178,7 @@ msgid "Documents"
msgstr ""
#: core/templates/user/overview.html:412 gym/templates/document/list.html:32
-#: manager/forms.py:292 manager/templates/workout/view.html:134
+#: manager/forms.py:292 manager/templates/workout/view.html:132
msgid "Download"
msgstr ""
@@ -1230,13 +1229,13 @@ msgid "kg"
msgstr ""
#: core/templatetags/wger_extras.py:207
-#: nutrition/templates/ingredient/view.html:86
-#: nutrition/templates/ingredient/view.html:92
-#: nutrition/templates/ingredient/view.html:99
-#: nutrition/templates/ingredient/view.html:108
-#: nutrition/templates/ingredient/view.html:115
-#: nutrition/templates/ingredient/view.html:137
-#: nutrition/templates/ingredient/view.html:147
+#: nutrition/templates/ingredient/view.html:60
+#: nutrition/templates/ingredient/view.html:66
+#: nutrition/templates/ingredient/view.html:73
+#: nutrition/templates/ingredient/view.html:82
+#: nutrition/templates/ingredient/view.html:89
+#: nutrition/templates/ingredient/view.html:111
+#: nutrition/templates/ingredient/view.html:121
msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr ""
@@ -1254,7 +1253,7 @@ msgstr ""
#: exercises/views/equipment.py:103 exercises/views/exercises.py:73
#: exercises/views/muscles.py:99 manager/views/schedule.py:309
#: manager/views/schedule_step.py:128 manager/views/workout.py:249
-#: manager/views/workout_session.py:142 nutrition/views/ingredient.py:116
+#: manager/views/workout_session.py:142 nutrition/views/ingredient.py:119
#: nutrition/views/unit.py:110
msgid "Successfully deleted"
msgstr ""
@@ -1266,7 +1265,7 @@ msgstr ""
#: gym/views/admin_notes.py:196 gym/views/document.py:206 gym/views/gym.py:481
#: manager/views/schedule.py:316 manager/views/schedule_step.py:138
#: manager/views/workout.py:253 manager/views/workout_session.py:156
-#: nutrition/views/ingredient.py:123 nutrition/views/unit.py:117
+#: nutrition/views/ingredient.py:126 nutrition/views/unit.py:117
#, python-brace-format
msgid "Delete {0}?"
msgstr ""
@@ -1279,7 +1278,7 @@ msgstr ""
#: gym/views/contract.py:186 gym/views/contract_option.py:123
#: gym/views/contract_type.py:123 gym/views/document.py:171
#: gym/views/gym.py:463 manager/views/day.py:100 manager/views/schedule.py:333
-#: manager/views/workout.py:267 nutrition/views/ingredient.py:142
+#: manager/views/workout.py:267 nutrition/views/ingredient.py:145
#: nutrition/views/unit.py:143
#, python-brace-format
msgid "Edit {0}"
@@ -1350,7 +1349,7 @@ msgstr ""
msgid "A verification email was sent to %(email)s"
msgstr ""
-#: exercises/models/base.py:82 nutrition/models/ingredient.py:236
+#: exercises/models/base.py:82 nutrition/models/ingredient.py:230
msgid "Category"
msgstr "Ӕмбырд"
@@ -1370,7 +1369,7 @@ msgstr ""
msgid "Exercise Categories"
msgstr "Фӕлтӕрӕнты ӕмбырд"
-#: exercises/models/comment.py:52 exercises/models/exercise_alias.py:52
+#: exercises/models/comment.py:52 exercises/models/exercise_alias.py:53
#: exercises/models/image.py:74 exercises/models/video.py:98
#: manager/forms.py:178 manager/helpers.py:86 manager/models/log.py:52
msgid "Exercise"
@@ -1380,12 +1379,12 @@ msgstr "Фӕлтӕрӕн"
msgid "A comment about how to correctly do this exercise."
msgstr "Ацы фӕлтӕрӕн раст куыд хъӕуы аразын, уый тыххӕй хъуыды."
-#: exercises/models/exercise.py:76 nutrition/models/ingredient.py:95
+#: exercises/models/exercise.py:77 nutrition/models/ingredient.py:81
#: nutrition/models/weight_unit.py:32
msgid "Language"
msgstr "Ӕвзаг"
-#: exercises/models/exercise_alias.py:58
+#: exercises/models/exercise_alias.py:59
#, fuzzy
#| msgid "Add new exercise"
msgid "Alias for an exercise"
@@ -1523,7 +1522,7 @@ msgstr "Фадӕттӕ"
#: manager/models/schedule.py:44 manager/models/session.py:49
#: manager/models/workout.py:89 measurements/models/category.py:31
#: measurements/models/measurement.py:42 nutrition/models/plan.py:54
-#: nutrition/templates/ingredient/pending.html:16 weight/models.py:42
+#: weight/models.py:60
msgid "User"
msgstr "Архайӕг"
@@ -1644,9 +1643,9 @@ msgid "Contract type"
msgstr ""
#: gym/models/contract.py:211 gym/templates/contract/view.html:59
-#: manager/templates/log/add.html:52 nutrition/forms.py:62
-#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:105
-#: nutrition/models/meal_item.py:72
+#: manager/templates/log/add.html:52 nutrition/forms.py:63
+#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:108
+#: nutrition/models/meal_item.py:73
msgid "Amount"
msgstr ""
@@ -1663,7 +1662,7 @@ msgid "Contract is active"
msgstr ""
#: gym/models/contract.py:237 gym/templates/contract/view.html:69
-#: manager/models/schedule.py:61 manager/templates/schedule/view.html:68
+#: manager/models/schedule.py:61 manager/templates/schedule/view.html:67
msgid "Start date"
msgstr ""
@@ -2045,7 +2044,7 @@ msgstr ""
#: mailer/templates/mailer/gym/form.html:28
#: mailer/templates/mailer/gym/preview.html:62
-#: manager/templates/workout/view.html:42
+#: manager/templates/workout/view.html:40
msgid "Steps"
msgstr ""
@@ -2067,7 +2066,7 @@ msgid ""
msgstr ""
#: mailer/templates/mailer/gym/preview.html:22
-#: software/templates/about_us.html:60
+#: software/templates/about_us.html:70
msgid "Current version"
msgstr ""
@@ -2096,16 +2095,16 @@ msgid ""
"a superset."
msgstr ""
-#: manager/forms.py:140 nutrition/forms.py:252
+#: manager/forms.py:140 nutrition/forms.py:253
msgid "Also search for names in English"
msgstr ""
#: manager/forms.py:168 manager/forms.py:173 manager/models/log.py:64
-#: manager/models/log.py:92 manager/models/setting.py:59
-#: manager/models/setting.py:90 manager/templates/log/add.html:53
+#: manager/models/log.py:92 manager/models/setting.py:62
+#: manager/models/setting.py:93 manager/templates/log/add.html:53
#: manager/templates/log/add.html:55 manager/templates/set/formset.html:10
#: manager/templates/set/formset.html:12 measurements/models/category.py:41
-#: nutrition/forms.py:66
+#: nutrition/forms.py:67
msgid "Unit"
msgstr ""
@@ -2113,15 +2112,15 @@ msgstr ""
msgid "Type"
msgstr ""
-#: manager/forms.py:280 manager/templates/workout/view.html:115
+#: manager/forms.py:280 manager/templates/workout/view.html:113
msgid "Table"
msgstr ""
-#: manager/forms.py:282 manager/templates/workout/view.html:121
+#: manager/forms.py:282 manager/templates/workout/view.html:119
msgid "with images"
msgstr ""
-#: manager/forms.py:283 manager/templates/workout/view.html:127
+#: manager/forms.py:283 manager/templates/workout/view.html:125
msgid "with comments"
msgstr ""
@@ -2130,11 +2129,10 @@ msgid "Workout will expire soon"
msgstr ""
#: manager/models/day.py:34 manager/models/log.py:58
-#: manager/models/session.py:60 manager/templates/schedule/view.html:103
-#: manager/templates/workout/view.html:11
-#: manager/templates/workout/view.html:19 manager/views/pdf.py:85
-#: manager/views/pdf.py:161 manager/views/schedule.py:151
-#: manager/views/schedule.py:221
+#: manager/models/session.py:60 manager/templates/schedule/view.html:102
+#: manager/templates/workout/view.html:9 manager/templates/workout/view.html:17
+#: manager/views/pdf.py:85 manager/views/pdf.py:161
+#: manager/views/schedule.py:151 manager/views/schedule.py:221
msgid "Workout"
msgstr ""
@@ -2152,7 +2150,7 @@ msgstr ""
msgid "Name or short description of the schedule. For example 'Program XYZ'."
msgstr ""
-#: manager/models/schedule.py:65 manager/templates/schedule/view.html:72
+#: manager/models/schedule.py:65 manager/templates/schedule/view.html:71
msgid "Schedule active"
msgstr ""
@@ -2163,7 +2161,7 @@ msgid ""
"inactive"
msgstr ""
-#: manager/models/schedule.py:77 manager/templates/schedule/view.html:82
+#: manager/models/schedule.py:77 manager/templates/schedule/view.html:81
msgid "Is a loop"
msgstr ""
@@ -2182,8 +2180,8 @@ msgid "The duration in weeks"
msgstr ""
#: manager/models/schedule_step.py:64 manager/models/set.py:53
-#: manager/models/setting.py:110 nutrition/models/meal.py:55
-#: nutrition/models/meal_item.py:65
+#: manager/models/setting.py:113 nutrition/models/meal.py:55
+#: nutrition/models/meal_item.py:66
msgid "Order"
msgstr ""
@@ -2233,7 +2231,7 @@ msgstr ""
msgid "Number of sets"
msgstr ""
-#: manager/models/setting.py:48
+#: manager/models/setting.py:51
msgid "Sets"
msgstr ""
@@ -2302,7 +2300,7 @@ msgstr ""
msgid "Go to current month"
msgstr ""
-#: manager/templates/calendar/month.html:188
+#: manager/templates/calendar/month.html:190
msgid "Add new log"
msgstr ""
@@ -2339,8 +2337,8 @@ msgid "Your schedules"
msgstr ""
#: manager/templates/schedule/overview.html:19
-#: manager/templates/schedule/view.html:132
-#: manager/templates/schedule/view.html:184
+#: manager/templates/schedule/view.html:131
+#: manager/templates/schedule/view.html:183
#: manager/templates/workout/overview.html:16
msgid "active"
msgstr ""
@@ -2376,29 +2374,29 @@ msgstr ""
msgid "Add schedule"
msgstr ""
-#: manager/templates/schedule/view.html:10
+#: manager/templates/schedule/view.html:9
msgid "Schedule"
msgstr ""
-#: manager/templates/schedule/view.html:86
+#: manager/templates/schedule/view.html:85
msgid ""
"This schedule is a loop and will go through the workouts above till you "
"deactivate it"
msgstr ""
-#: manager/templates/schedule/view.html:104
+#: manager/templates/schedule/view.html:103
msgid "Weeks"
msgstr ""
-#: manager/templates/schedule/view.html:116
+#: manager/templates/schedule/view.html:115
msgid "Move me"
msgstr ""
-#: manager/templates/schedule/view.html:157
+#: manager/templates/schedule/view.html:156
msgid "Start schedule"
msgstr ""
-#: manager/templates/schedule/view.html:188
+#: manager/templates/schedule/view.html:187
#, python-format
msgid ""
"%(weeks)s Week\n"
@@ -2409,11 +2407,11 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: manager/templates/schedule/view.html:222
+#: manager/templates/schedule/view.html:221
msgid "Adding workouts"
msgstr ""
-#: manager/templates/schedule/view.html:224
+#: manager/templates/schedule/view.html:223
msgid ""
"Add as many workouts to the schedule as you want. You can\n"
" edit the order by dragging and dropping them. It's also possible "
@@ -2421,21 +2419,21 @@ msgid ""
" than once."
msgstr ""
-#: manager/templates/schedule/view.html:233
-#: manager/templates/schedule/view.html:244
-#: manager/templates/schedule/view.html:291
-#: manager/templates/workout/view.html:71
-#: manager/templates/workout/view.html:81
-#: manager/templates/workout/view.html:180
+#: manager/templates/schedule/view.html:232
+#: manager/templates/schedule/view.html:243
+#: manager/templates/schedule/view.html:290
+#: manager/templates/workout/view.html:69
+#: manager/templates/workout/view.html:79
+#: manager/templates/workout/view.html:178
msgid "Export calendar file"
msgstr ""
-#: manager/templates/schedule/view.html:237
+#: manager/templates/schedule/view.html:236
msgid "Export this schedule as a calendar file."
msgstr ""
-#: manager/templates/schedule/view.html:238
-#: manager/templates/workout/view.html:76
+#: manager/templates/schedule/view.html:237
+#: manager/templates/workout/view.html:74
msgid ""
"You can then import the file it into your calendar\n"
" application for example google calendar, outlook or "
@@ -2444,18 +2442,18 @@ msgid ""
"appropriate exercises."
msgstr ""
-#: manager/templates/schedule/view.html:259
-#: manager/templates/schedule/view.html:295
-#: manager/templates/workout/view.html:96
-#: manager/templates/workout/view.html:176
+#: manager/templates/schedule/view.html:258
+#: manager/templates/schedule/view.html:294
+#: manager/templates/workout/view.html:94
+#: manager/templates/workout/view.html:174
msgid "Download as PDF"
msgstr ""
-#: manager/templates/schedule/view.html:300
+#: manager/templates/schedule/view.html:299
msgid "Edit schedule"
msgstr ""
-#: manager/templates/schedule/view.html:305
+#: manager/templates/schedule/view.html:304
msgid "Delete schedule"
msgstr ""
@@ -2573,12 +2571,12 @@ msgid "Mark as workout"
msgstr ""
#: manager/templates/workout/template_view.html:65
-#: manager/templates/workout/view.html:51
+#: manager/templates/workout/view.html:49
msgid "Muscles trained"
msgstr ""
#: manager/templates/workout/template_view.html:68
-#: manager/templates/workout/view.html:54
+#: manager/templates/workout/view.html:52
msgid ""
"Images show combined muscles as trained by the exercises on the workout."
msgstr ""
@@ -2587,35 +2585,35 @@ msgstr ""
msgid "Use this template"
msgstr ""
-#: manager/templates/workout/view.html:45
+#: manager/templates/workout/view.html:43
msgid "Add training days"
msgstr ""
-#: manager/templates/workout/view.html:46
+#: manager/templates/workout/view.html:44
msgid "Add workout sets to days"
msgstr ""
-#: manager/templates/workout/view.html:47
+#: manager/templates/workout/view.html:45
msgid "Set the repetitions for each set"
msgstr ""
-#: manager/templates/workout/view.html:75
+#: manager/templates/workout/view.html:73
msgid "Export this workout as a calendar file."
msgstr ""
-#: manager/templates/workout/view.html:146
+#: manager/templates/workout/view.html:144
msgid "Logs"
msgstr ""
-#: manager/templates/workout/view.html:148
+#: manager/templates/workout/view.html:146
msgid "View logs"
msgstr ""
-#: manager/templates/workout/view.html:171 manager/views/schedule_step.py:99
+#: manager/templates/workout/view.html:169 manager/views/schedule_step.py:99
msgid "Edit workout"
msgstr ""
-#: manager/templates/workout/view.html:184 manager/views/workout.py:281
+#: manager/templates/workout/view.html:182 manager/views/workout.py:281
msgid "Mark as template"
msgstr ""
@@ -2662,103 +2660,89 @@ msgstr ""
msgid "Value"
msgstr ""
-#: nutrition/forms.py:117
+#: nutrition/forms.py:118
msgid "Height (in)"
msgstr ""
-#: nutrition/forms.py:120
+#: nutrition/forms.py:121
msgid "Weight (kg)"
msgstr ""
-#: nutrition/forms.py:120
+#: nutrition/forms.py:121
msgid "Weight (lbs)"
msgstr ""
-#: nutrition/forms.py:133
+#: nutrition/forms.py:134
msgid "Calculate"
msgstr ""
-#: nutrition/forms.py:207 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:208 nutrition/templates/rate/form.html:76
msgid "Basic caloric intake"
msgstr ""
-#: nutrition/forms.py:208
+#: nutrition/forms.py:209
msgid "Your basic caloric intake as calculated for your data"
msgstr ""
-#: nutrition/forms.py:213
+#: nutrition/forms.py:214
msgid "Additional calories"
msgstr ""
-#: nutrition/forms.py:215
+#: nutrition/forms.py:216
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
msgstr ""
-#: nutrition/forms.py:248 nutrition/models/ingredient_weight_unit.py:39
-#: nutrition/models/log.py:84 nutrition/models/meal_item.py:53
+#: nutrition/forms.py:249 nutrition/models/ingredient_weight_unit.py:39
+#: nutrition/models/log.py:87 nutrition/models/meal_item.py:54
msgid "Ingredient"
msgstr ""
-#: nutrition/models/ingredient.py:131
+#: nutrition/models/ingredient.py:117
msgid "In kcal per 100g"
msgstr ""
-#: nutrition/models/ingredient.py:138 nutrition/models/ingredient.py:146
-#: nutrition/models/ingredient.py:156 nutrition/models/ingredient.py:164
-#: nutrition/models/ingredient.py:174 nutrition/models/ingredient.py:184
-#: nutrition/models/ingredient.py:194
+#: nutrition/models/ingredient.py:124 nutrition/models/ingredient.py:132
+#: nutrition/models/ingredient.py:142 nutrition/models/ingredient.py:150
+#: nutrition/models/ingredient.py:160 nutrition/models/ingredient.py:170
+#: nutrition/models/ingredient.py:180
msgid "In g per 100g of product"
msgstr ""
-#: nutrition/models/ingredient.py:155
-#: nutrition/templates/ingredient/view.html:96 nutrition/views/plan.py:259
+#: nutrition/models/ingredient.py:141
+#: nutrition/templates/ingredient/view.html:70 nutrition/views/plan.py:259
msgid "Sugar content in carbohydrates"
msgstr ""
-#: nutrition/models/ingredient.py:173
-#: nutrition/templates/ingredient/view.html:112 nutrition/views/plan.py:273
+#: nutrition/models/ingredient.py:159
+#: nutrition/templates/ingredient/view.html:86 nutrition/views/plan.py:273
msgid "Saturated fat content in fats"
msgstr ""
-#: nutrition/models/ingredient.py:183
-#: nutrition/templates/ingredient/view.html:134 nutrition/views/plan.py:279
-msgid "Fibres"
+#: nutrition/models/ingredient.py:169
+#: nutrition/templates/ingredient/view.html:108 nutrition/views/plan.py:279
+msgid "Fiber"
msgstr ""
-#: nutrition/models/ingredient.py:193
-#: nutrition/templates/ingredient/view.html:144 nutrition/views/plan.py:285
+#: nutrition/models/ingredient.py:179
+#: nutrition/templates/ingredient/view.html:118 nutrition/views/plan.py:285
msgid "Sodium"
msgstr ""
-#: nutrition/models/ingredient.py:215
+#: nutrition/models/ingredient.py:209
msgid "Link to product"
msgstr ""
-#: nutrition/models/ingredient.py:244
+#: nutrition/models/ingredient.py:238
msgid "Brand name of product"
msgstr ""
-#: nutrition/models/ingredient.py:304
+#: nutrition/models/ingredient.py:305
#, python-brace-format
msgid "The total energy ({self.energy}kcal) is not the approximate sum of the "
msgstr ""
-#: nutrition/models/ingredient.py:383 nutrition/views/ingredient.py:196
-msgid "Ingredient was successfully added to the general database"
-msgstr ""
-
-#: nutrition/models/ingredient.py:408
-msgid "New user submitted ingredient"
-msgstr ""
-
-#: nutrition/models/ingredient.py:410
-#, python-brace-format
-msgid ""
-"The user {request.user.username} submitted a new ingredient \"{self.name}\"."
-msgstr ""
-
#: nutrition/models/ingredient_category.py:31
msgid "Ingredient Categories"
msgstr ""
@@ -2771,16 +2755,16 @@ msgstr ""
msgid "Unit amount, e.g. \"1 Cup\" or \"1/2 spoon\""
msgstr ""
-#: nutrition/models/log.py:49 nutrition/models/meal.py:50
-#: nutrition/models/meal_item.py:47 nutrition/models/plan.py:106
+#: nutrition/models/log.py:52 nutrition/models/meal.py:50
+#: nutrition/models/meal_item.py:48 nutrition/models/plan.py:108
msgid "Nutrition plan"
msgstr ""
-#: nutrition/models/log.py:58
+#: nutrition/models/log.py:61
msgid "Meal"
msgstr ""
-#: nutrition/models/log.py:68
+#: nutrition/models/log.py:71
msgid "Date and Time (Approx.)"
msgstr ""
@@ -2800,11 +2784,11 @@ msgid ""
"summer\""
msgstr ""
-#: nutrition/models/plan.py:88
+#: nutrition/models/plan.py:90
msgid "Use daily calories"
msgstr ""
-#: nutrition/models/plan.py:91
+#: nutrition/models/plan.py:93
msgid ""
"Tick the box if you want to mark this plan as having a goal amount of "
"calories. You can use the calculator or enter the value yourself."
@@ -2911,64 +2895,36 @@ msgstr "Агурын"
msgid "Add ingredient"
msgstr ""
-#: nutrition/templates/ingredient/pending.html:14
-msgid "Submission date"
-msgstr ""
-
-#: nutrition/templates/ingredient/view.html:27
-msgid "Ingredient is pending review"
-msgstr ""
-
-#: nutrition/templates/ingredient/view.html:28
-msgid ""
-"This user submitted ingredient is pending a decision to be\n"
-"included in the database. Till then, it will not be shown in the overview "
-"or\n"
-"the search."
-msgstr ""
-
-#: nutrition/templates/ingredient/view.html:31
-msgid "Please select one of the options below."
-msgstr ""
-
-#: nutrition/templates/ingredient/view.html:38
-msgid "Accept"
-msgstr ""
-
-#: nutrition/templates/ingredient/view.html:42
-msgid "Decline"
-msgstr ""
-
-#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:229
+#: nutrition/templates/ingredient/view.html:45 nutrition/views/plan.py:229
msgid "Macronutrients"
msgstr ""
-#: nutrition/templates/ingredient/view.html:80
+#: nutrition/templates/ingredient/view.html:54
msgid "kJ"
msgstr ""
-#: nutrition/templates/ingredient/view.html:101
-#: nutrition/templates/ingredient/view.html:117
-#: nutrition/templates/ingredient/view.html:139
-#: nutrition/templates/ingredient/view.html:149
+#: nutrition/templates/ingredient/view.html:75
+#: nutrition/templates/ingredient/view.html:91
+#: nutrition/templates/ingredient/view.html:113
+#: nutrition/templates/ingredient/view.html:123
msgid "n.A."
msgstr ""
-#: nutrition/templates/ingredient/view.html:128
+#: nutrition/templates/ingredient/view.html:102
msgid "Others"
msgstr ""
-#: nutrition/templates/ingredient/view.html:170
+#: nutrition/templates/ingredient/view.html:144
#: nutrition/templates/units/list.html:46 nutrition/views/unit.py:86
msgid "Add new weight unit"
msgstr ""
-#: nutrition/templates/ingredient/view.html:232
-#: nutrition/templates/ingredient/view.html:235
+#: nutrition/templates/ingredient/view.html:206
+#: nutrition/templates/ingredient/view.html:209
msgid "Edit ingredient"
msgstr ""
-#: nutrition/templates/ingredient/view.html:239
+#: nutrition/templates/ingredient/view.html:213
msgid "Delete ingredient"
msgstr ""
@@ -3052,14 +3008,10 @@ msgstr ""
msgid "56 to 90"
msgstr ""
-#: nutrition/views/ingredient.py:154
+#: nutrition/views/ingredient.py:157
msgid "Add a new ingredient"
msgstr ""
-#: nutrition/views/ingredient.py:209
-msgid "Ingredient was successfully marked as rejected"
-msgstr ""
-
#: nutrition/views/plan.py:120
msgid "Nutritional plan"
msgstr ""
@@ -3104,50 +3056,59 @@ msgid ""
msgstr ""
#: software/templates/about_us.html:18
-msgid "Source code"
-msgstr ""
-
-#: software/templates/about_us.html:20
-msgid "Get the source code of this application and its server on github"
-msgstr ""
-
-#: software/templates/about_us.html:25
msgid "Have a problem or idea?"
msgstr ""
-#: software/templates/about_us.html:27
+#: software/templates/about_us.html:20
msgid ""
"Get in touch if something didn't behave as expected or if there is a feature "
"that you feel is missing."
msgstr ""
-#: software/templates/about_us.html:32
+#: software/templates/about_us.html:26
msgid "Say hi!"
msgstr ""
-#: software/templates/about_us.html:34
+#: software/templates/about_us.html:28
msgid "If you want to chat with us, hop on the Discord server and get in touch"
msgstr ""
-#: software/templates/about_us.html:39 software/templates/features.html:503
+#: software/templates/about_us.html:33
+msgid "Mastodon"
+msgstr ""
+
+#: software/templates/about_us.html:35
+msgid "Follow us on mastodon for updates and news about the project"
+msgstr ""
+
+#: software/templates/about_us.html:40 software/templates/features.html:503
msgid "Translation"
msgstr ""
-#: software/templates/about_us.html:41
+#: software/templates/about_us.html:42
msgid ""
"This application is translated on weblate. If you also want to help, click "
"the link and start translating"
msgstr ""
-#: software/templates/about_us.html:50
+#: software/templates/about_us.html:47
+msgid "Source code"
+msgstr ""
+
+#: software/templates/about_us.html:49
+msgid "Get the source code of this application and its server on github"
+msgstr ""
+
+#: software/templates/about_us.html:59
msgid "Our goal"
msgstr ""
-#: software/templates/about_us.html:53
+#: software/templates/about_us.html:62
msgid ""
"The goal is to build an awesome\n"
" and flexible fitness manager, along with a comprehensive and "
-"complete list of exercises and\n"
+"complete list of\n"
+" exercises and\n"
" ingredients, all released under a free license."
msgstr ""
@@ -3157,10 +3118,6 @@ msgid ""
"your exercises and workouts."
msgstr ""
-#: software/templates/features.html:45
-msgid "About"
-msgstr ""
-
#: software/templates/features.html:57
msgid "Mobile app"
msgstr ""
@@ -3398,18 +3355,6 @@ msgid ""
"to its own copyright."
msgstr ""
-#: utils/models.py:130
-msgid "Pending"
-msgstr "Лӕууы"
-
-#: utils/models.py:131
-msgid "Accepted"
-msgstr "Бӕлвырд"
-
-#: utils/models.py:132
-msgid "Declined"
-msgstr "Ӕздӕхт"
-
#: weight/forms.py:54
msgid "Input"
msgstr ""
@@ -3422,7 +3367,7 @@ msgstr ""
msgid "You have to enter your weight"
msgstr ""
-#: weight/models.py:60
+#: weight/models.py:78
msgid "Weight entry"
msgstr ""
@@ -3539,6 +3484,15 @@ msgstr ""
msgid "Delete weight entry for the %s"
msgstr ""
+#~ msgid "Pending"
+#~ msgstr "Лӕууы"
+
+#~ msgid "Accepted"
+#~ msgstr "Бӕлвырд"
+
+#~ msgid "Declined"
+#~ msgstr "Ӕздӕхт"
+
#~ msgid "Add new exercise"
#~ msgstr "Ног фӕлтӕрӕн бафтауын"
diff --git a/wger/locale/pl/LC_MESSAGES/django.po b/wger/locale/pl/LC_MESSAGES/django.po
index 25ddf17bc..3368088f7 100644
--- a/wger/locale/pl/LC_MESSAGES/django.po
+++ b/wger/locale/pl/LC_MESSAGES/django.po
@@ -14,7 +14,7 @@ msgid ""
msgstr ""
"Project-Id-Version: wger Workout Manager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-02-02 12:42+0100\n"
+"POT-Creation-Date: 2024-07-14 15:49+0200\n"
"PO-Revision-Date: 2024-05-10 11:24+0000\n"
"Last-Translator: Marcin Schoenknecht <[email protected]>\n"
"Language-Team: Polish <https://hosted.weblate.org/projects/wger/web/pl/>\n"
@@ -22,8 +22,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && ("
-"n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && "
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && "
+"(n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && "
"n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
"X-Generator: Weblate 5.5.4-rc\n"
@@ -40,7 +40,7 @@ msgstr ""
"przypisywani wszyscy nowi użytkownicy oraz obecni użytkownicy bez określonej "
"siłowni."
-#: config/views/gym_config.py:42 core/templates/language/view.html:63
+#: config/views/gym_config.py:42 core/templates/language/view.html:67
#: core/templates/license/list.html:17 core/templates/misc/license/list.html:18
#: core/templates/repetition_unit/list.html:18
#: core/templates/tags/render_day.html:39
@@ -60,8 +60,8 @@ msgstr ""
#: manager/templates/calendar/day.html:68
#: manager/templates/calendar/month.html:85
#: manager/templates/calendar/partial_overview_table.html:18
-#: manager/templates/schedule/view.html:119
-#: nutrition/templates/ingredient/view.html:191
+#: manager/templates/schedule/view.html:118
+#: nutrition/templates/ingredient/view.html:165
#: nutrition/templates/units/list.html:19
msgid "Edit"
msgstr "Edytuj"
@@ -95,8 +95,8 @@ msgstr "Mój fajny harmonogram treningu"
msgid "Empty placeholder schedule"
msgstr "Pusty zapychacz harmonogramu"
-#: core/forms.py:69 core/templates/navigation.html:275
-#: core/templates/navigation.html:281 core/templates/user/login.html:4
+#: core/forms.py:69 core/templates/navigation.html:285
+#: core/templates/navigation.html:291 core/templates/user/login.html:4
#: software/templates/features.html:82 software/templates/features.html:427
msgid "Login"
msgstr "Zaloguj"
@@ -166,7 +166,7 @@ msgstr "Hasło"
msgid "Please enter your current password."
msgstr "Wprowadź swoje aktualne hasło."
-#: core/forms.py:242 core/templates/language/view.html:68
+#: core/forms.py:242 core/templates/language/view.html:73
#: core/templates/license/list.html:19 core/templates/misc/license/list.html:22
#: core/templates/repetition_unit/list.html:20
#: core/templates/tags/render_day.html:45
@@ -181,10 +181,10 @@ msgstr "Wprowadź swoje aktualne hasło."
#: gym/templates/gym/list.html:22 manager/templates/calendar/day.html:73
#: manager/templates/calendar/month.html:89
#: manager/templates/calendar/partial_overview_table.html:23
-#: manager/templates/schedule/view.html:123
-#: manager/templates/workout/view.html:190
-#: nutrition/templates/ingredient/view.html:192
-#: nutrition/templates/ingredient/view.html:241
+#: manager/templates/schedule/view.html:122
+#: manager/templates/workout/view.html:188
+#: nutrition/templates/ingredient/view.html:166
+#: nutrition/templates/ingredient/view.html:215
#: nutrition/templates/units/list.html:22
msgid "Delete"
msgstr "Usuń"
@@ -197,14 +197,14 @@ msgstr "Hasło nieprawidłowe"
msgid "The form is secured with reCAPTCHA"
msgstr "Formularz jest chroniony przez reCaptcha"
-#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:275
-#: core/templates/navigation.html:287 core/templates/template.html:147
+#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:285
+#: core/templates/navigation.html:297 core/templates/template.html:149
#: core/templates/user/login.html:20 core/views/user.py:298
#: software/templates/features.html:87 software/templates/features.html:422
msgid "Register"
msgstr "Zarejestruj"
-#: core/forms.py:315
+#: core/forms.py:315 software/templates/features.html:45
msgid "Contact"
msgstr "Kontakt"
@@ -213,7 +213,7 @@ msgid "Some way of answering you (e-mail, etc.)"
msgstr "Wybrany sposób kontaktu (e-mail itp.)"
#: core/forms.py:324 exercises/models/comment.py:58 manager/models/set.py:61
-#: manager/models/setting.py:111 nutrition/models/log.py:74
+#: manager/models/setting.py:114 nutrition/models/log.py:77
msgid "Comment"
msgstr "Komentarz"
@@ -233,6 +233,12 @@ msgstr "Skrócona nazwa języka"
msgid "Language full name"
msgstr "Pełna nazwa języka"
+#: core/models/language.py:45 core/templates/language/view.html:23
+#, fuzzy
+#| msgid "Language full name"
+msgid "Language full name in English"
+msgstr "Pełna nazwa języka"
+
#: core/models/license.py:29
msgid "Full name"
msgstr "Pełna nazwa"
@@ -249,7 +255,7 @@ msgstr ""
msgid "Short name, e.g. CC-BY-SA 3"
msgstr "Krótka nazwa np. CC-BY-SA 3"
-#: core/models/license.py:45 nutrition/models/ingredient.py:214
+#: core/models/license.py:45 nutrition/models/ingredient.py:208
msgid "Link"
msgstr "Link"
@@ -364,7 +370,7 @@ msgstr ""
msgid "Age"
msgstr "Wiek"
-#: core/models/profile.py:230 nutrition/forms.py:117
+#: core/models/profile.py:230 nutrition/forms.py:118
msgid "Height (cm)"
msgstr "Wzrost (cm)"
@@ -415,7 +421,7 @@ msgid "Total caloric intake, including e.g. any surplus"
msgstr "Pełne spożycie kalorii, włączając surplus"
#: core/models/profile.py:333 nutrition/models/ingredient_weight_unit.py:45
-#: nutrition/models/log.py:93 nutrition/models/meal_item.py:58
+#: nutrition/models/log.py:96 nutrition/models/meal_item.py:59
msgid "Weight unit"
msgstr "Jednostka wagi"
@@ -447,17 +453,16 @@ msgstr "Godziny muszą sumować się do wartości 24"
#: core/models/rep_unit.py:36 core/models/weight_unit.py:36
#: core/templates/user/overview.html:262 core/views/user.py:599
#: exercises/models/category.py:29 exercises/models/equipment.py:29
-#: exercises/models/exercise.py:58 exercises/models/muscle.py:36
+#: exercises/models/exercise.py:59 exercises/models/muscle.py:36
#: gym/models/contract.py:52 gym/models/contract.py:103 gym/models/gym.py:46
#: gym/models/user_document.py:84 gym/templates/contract/view.html:50
#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:96
#: gym/views/gym.py:158 manager/models/schedule.py:55
#: manager/models/workout.py:57 measurements/models/category.py:36
-#: nutrition/models/ingredient.py:125
+#: nutrition/models/ingredient.py:111
#: nutrition/models/ingredient_category.py:27 nutrition/models/meal.py:67
#: nutrition/models/weight_unit.py:38
-#: nutrition/templates/ingredient/pending.html:15
-#: nutrition/templates/ingredient/view.html:178
+#: nutrition/templates/ingredient/view.html:152
msgid "Name"
msgstr "Nazwa"
@@ -562,24 +567,24 @@ msgstr "Kliknij poniższy link, aby potwierdzić swój adres e-mail: %(link)s"
msgid "Dashboard"
msgstr "Pulpit"
-#: core/templates/language/overview.html:4 core/templates/navigation.html:335
+#: core/templates/language/overview.html:4 core/templates/navigation.html:345
msgid "Languages"
msgstr "Języki"
-#: core/templates/language/overview.html:20
+#: core/templates/language/overview.html:22
msgid "Nothing found."
msgstr "Nie znaleziono."
-#: core/templates/language/overview.html:20
+#: core/templates/language/overview.html:22
#: manager/templates/calendar/month.html:132
#: manager/templates/schedule/overview.html:28
-#: manager/templates/schedule/view.html:145
+#: manager/templates/schedule/view.html:144
#: manager/templates/workout/overview.html:28
#: nutrition/templates/ingredient/overview.html:38
msgid "Add one now."
msgstr "Dodaj jeden teraz."
-#: core/templates/language/overview.html:33 core/templates/license/list.html:40
+#: core/templates/language/overview.html:35 core/templates/license/list.html:40
#: core/templates/misc/license/list.html:43
#: core/templates/repetition_unit/list.html:43
#: core/templates/user/overview.html:326 core/templates/user/overview.html:365
@@ -599,13 +604,13 @@ msgstr "Dodaj jeden teraz."
msgid "Add"
msgstr "Dodaj"
-#: core/templates/language/view.html:58 core/templates/user/api_key.html:44
+#: core/templates/language/view.html:61 core/templates/user/api_key.html:44
#: core/templates/user/preferences.html:45 gym/models/contract.py:203
#: gym/templates/contract/view.html:41 gym/templates/contract/view.html:106
#: gym/templates/gym/member_list.html:248
-#: manager/templates/schedule/view.html:286
-#: manager/templates/workout/view.html:165
-#: nutrition/templates/ingredient/view.html:228
+#: manager/templates/schedule/view.html:285
+#: manager/templates/workout/view.html:163
+#: nutrition/templates/ingredient/view.html:202
msgid "Options"
msgstr "Opcje"
@@ -630,12 +635,11 @@ msgstr "Lista licencji"
#: gym/templates/gym/member_list.html:299
#: mailer/templates/mailer/gym/overview.html:30
#: manager/templates/calendar/day.html:87
-#: nutrition/templates/ingredient/pending.html:30
#: nutrition/templates/units/list.html:29
msgid "Nothing found"
msgstr "Nic nie znaleziono"
-#: core/templates/misc/about.html:4 core/templates/template.html:173
+#: core/templates/misc/about.html:4 core/templates/template.html:175
msgid "Imprint"
msgstr "Odcisk"
@@ -648,174 +652,169 @@ msgstr ""
"Jeżeli licencje zostały przetłumaczone, np. licencja Creative Commons\n"
" dla różnych krajów, dodaj je tutaj jako osobne wpisy."
-#: core/templates/navigation.html:27 software/templates/features.html:437
+#: core/templates/navigation.html:28 software/templates/features.html:437
msgid "Training"
msgstr "Trening"
-#: core/templates/navigation.html:34 core/templates/user/overview.html:25
+#: core/templates/navigation.html:37 core/templates/user/overview.html:25
msgid "Workouts"
msgstr "Treningi"
-#: core/templates/navigation.html:42
+#: core/templates/navigation.html:46
msgid "Workouts schedules"
msgstr "Harmonogramy treningów"
-#: core/templates/navigation.html:50 core/templates/user/overview.html:70
+#: core/templates/navigation.html:54 core/templates/user/overview.html:70
#: manager/templates/calendar/month.html:10
#: manager/templates/calendar/month.html:21
msgid "Calendar"
msgstr "Kalendarz"
-#: core/templates/navigation.html:60
+#: core/templates/navigation.html:64
msgid "Measurements"
msgstr "Pomiary"
-#: core/templates/navigation.html:70 gallery/templates/images/overview.html:6
+#: core/templates/navigation.html:75 gallery/templates/images/overview.html:6
msgid "Gallery"
msgstr "Galeria"
-#: core/templates/navigation.html:76
+#: core/templates/navigation.html:81
msgid "Workout templates"
msgstr "Szablony treningu"
-#: core/templates/navigation.html:82 manager/views/workout.py:84
+#: core/templates/navigation.html:88 manager/views/workout.py:84
msgid "Your templates"
msgstr "Twoje schematy"
-#: core/templates/navigation.html:90 manager/views/workout.py:98
+#: core/templates/navigation.html:97 manager/views/workout.py:98
msgid "Public templates"
msgstr "Publiczne szablony"
-#: core/templates/navigation.html:97 manager/forms.py:129
-#: manager/models/setting.py:54 software/templates/features.html:51
+#: core/templates/navigation.html:105 manager/forms.py:129
+#: manager/models/setting.py:57 software/templates/features.html:51
#: software/templates/features.html:459
msgid "Exercises"
msgstr "Ćwiczenia"
-#: core/templates/navigation.html:103 core/templates/navigation.html:170
-#: core/templates/navigation.html:330
+#: core/templates/navigation.html:111 core/templates/navigation.html:184
+#: core/templates/navigation.html:340
msgid "Administration"
msgstr "Zarządzanie"
-#: core/templates/navigation.html:106
+#: core/templates/navigation.html:115
msgid "Exercise edit history"
msgstr "Historia edycji ćwiczeń"
-#: core/templates/navigation.html:111 exercises/models/base.py:103
+#: core/templates/navigation.html:121 exercises/models/base.py:103
msgid "Equipment"
msgstr "Sprzęt"
-#: core/templates/navigation.html:116
+#: core/templates/navigation.html:127
msgid "Muscles"
msgstr "Mięśnie"
-#: core/templates/navigation.html:121
+#: core/templates/navigation.html:133
#: exercises/templates/categories/admin-overview.html:4
msgid "Categories"
msgstr "Kategorie"
-#: core/templates/navigation.html:136 software/templates/features.html:447
+#: core/templates/navigation.html:148 software/templates/features.html:447
msgid "Nutrition"
msgstr "Żywienie"
-#: core/templates/navigation.html:143 core/templates/user/overview.html:144
+#: core/templates/navigation.html:156 core/templates/user/overview.html:144
msgid "Nutrition plans"
msgstr "Plany żywienia"
-#: core/templates/navigation.html:151 nutrition/templates/bmi/form.html:50
+#: core/templates/navigation.html:165 nutrition/templates/bmi/form.html:50
msgid "BMI calculator"
msgstr "Kalkulator BMI"
-#: core/templates/navigation.html:159 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:174 nutrition/templates/rate/form.html:17
msgid "Daily calories calculator"
msgstr "Kalkulator dziennych kalorii"
-#: core/templates/navigation.html:165
+#: core/templates/navigation.html:179
#: nutrition/templates/ingredient/overview.html:10
msgid "Ingredient overview"
msgstr "Rozpiska składników"
-#: core/templates/navigation.html:172 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:187 nutrition/templates/units/list.html:6
msgid "Ingredient weight units"
msgstr "Jednostka wagowa składników"
-#: core/templates/navigation.html:177
-#: nutrition/templates/ingredient/pending.html:6
-msgid "Ingredients pending review"
-msgstr "Składniki oczekujące na akceptację"
-
-#: core/templates/navigation.html:193 software/templates/features.html:442
+#: core/templates/navigation.html:203 software/templates/features.html:442
msgid "Body weight"
msgstr "Waga ciała"
-#: core/templates/navigation.html:200 core/templates/user/overview.html:114
+#: core/templates/navigation.html:210 core/templates/user/overview.html:114
msgid "Weight overview"
msgstr "Wykres masy ciała"
-#: core/templates/navigation.html:207 weight/views.py:65
+#: core/templates/navigation.html:217 weight/views.py:65
msgid "Add weight entry"
msgstr "Dodaj aktualną wagę"
-#: core/templates/navigation.html:221
+#: core/templates/navigation.html:231
msgid "About this software"
msgstr "O tym programie"
-#: core/templates/navigation.html:227 software/templates/about_us.html:5
+#: core/templates/navigation.html:237 software/templates/about_us.html:5
msgid "About us"
msgstr "O nas"
-#: core/templates/navigation.html:233 software/templates/features.html:507
+#: core/templates/navigation.html:243 software/templates/features.html:507
msgid "REST API"
msgstr "REST API"
-#: core/templates/navigation.html:239 utils/models.py:45
+#: core/templates/navigation.html:249 utils/models.py:45
msgid "License"
msgstr "Licencja"
-#: core/templates/navigation.html:245
+#: core/templates/navigation.html:255
msgid "Developer documentation"
msgstr "Dokumentacja"
-#: core/templates/navigation.html:252
+#: core/templates/navigation.html:262
msgid "Get the code"
msgstr "Pobierz kod źródłowy"
-#: core/templates/navigation.html:259 core/templates/template.html:212
+#: core/templates/navigation.html:269 core/templates/template.html:214
#: software/templates/features.html:582
msgid "Translate"
msgstr "Tłumacz"
-#: core/templates/navigation.html:293 core/templates/user/login.html:28
+#: core/templates/navigation.html:303 core/templates/user/login.html:28
msgid "Reset password"
msgstr "Resetuj hasło"
-#: core/templates/navigation.html:311
+#: core/templates/navigation.html:321
msgid "My preferences"
msgstr "Moje preferencje"
-#: core/templates/navigation.html:320
+#: core/templates/navigation.html:330
msgid "Logout"
msgstr "Wyloguj"
-#: core/templates/navigation.html:343
+#: core/templates/navigation.html:353
msgid "Licenses"
msgstr "Licencje"
-#: core/templates/navigation.html:351
+#: core/templates/navigation.html:361
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr "Jednostki potwórzeń"
-#: core/templates/navigation.html:359 core/templates/weight_unit/list.html:4
-#: nutrition/templates/ingredient/view.html:167
+#: core/templates/navigation.html:369 core/templates/weight_unit/list.html:4
+#: nutrition/templates/ingredient/view.html:141
msgid "Weight units"
msgstr "Jednostki wagi"
-#: core/templates/navigation.html:367 core/templates/user/list.html:4
+#: core/templates/navigation.html:377 core/templates/user/list.html:4
msgid "User list"
msgstr "Lista użytkowników"
-#: core/templates/navigation.html:373
+#: core/templates/navigation.html:383
msgid "Gyms"
msgstr "Siłownie"
@@ -869,12 +868,12 @@ msgstr "Dziękujemy za korzystanie z naszej strony!"
msgid "The %(site_name)s team"
msgstr "Zespół %(site_name)s"
-#: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:11
+#: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:12
msgid "previous"
msgstr "poprzednie"
-#: core/templates/tags/pagination.html:31
-#: core/templates/tags/pagination.html:35
+#: core/templates/tags/pagination.html:33
+#: core/templates/tags/pagination.html:38
msgid "next"
msgstr "następne"
@@ -899,36 +898,36 @@ msgid "Add exercises to this workout day"
msgstr "Dodaj ćwiczenia do tego dnia treningowego"
#: core/templates/tags/render_weight_log.html:17 manager/helpers.py:86
-#: manager/models/setting.py:69 manager/templates/set/formset.html:9
+#: manager/models/setting.py:72 manager/templates/set/formset.html:9
msgid "Reps"
msgstr "Powtórzenia"
#: core/templates/tags/render_weight_log.html:30 manager/forms.py:191
-#: manager/models/log.py:103 manager/models/setting.py:99
+#: manager/models/log.py:103 manager/models/setting.py:102
#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
msgid "RiR"
msgstr "Liczba powtórzeń w rezerwie"
-#: core/templates/template.html:120 manager/templates/calendar/month.html:138
-#: manager/templates/schedule/view.html:249
-#: manager/templates/schedule/view.html:270
-#: manager/templates/workout/view.html:86
-#: manager/templates/workout/view.html:139
+#: core/templates/template.html:122 manager/templates/calendar/month.html:138
+#: manager/templates/schedule/view.html:248
+#: manager/templates/schedule/view.html:269
+#: manager/templates/workout/view.html:84
+#: manager/templates/workout/view.html:137
msgid "Close"
msgstr "Zamknij"
-#: core/templates/template.html:136
+#: core/templates/template.html:138
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:141
+#: core/templates/template.html:143
msgid "Create some demo entries"
msgstr "Utwórz kilka przykładowych wpisów"
-#: core/templates/template.html:178 software/templates/features.html:547
+#: core/templates/template.html:180 software/templates/features.html:547
#: software/templates/tos.html:7
msgid "Terms of service"
msgstr "Warunki świadczenia usługi"
@@ -1028,7 +1027,7 @@ msgid "Overview"
msgstr "Podsumowanie"
#: core/templates/user/overview.html:28
-#: manager/templates/schedule/view.html:164
+#: manager/templates/schedule/view.html:163
#: manager/templates/workout/overview.html:39 manager/views/schedule_step.py:60
msgid "Add workout"
msgstr "Dodaj trening"
@@ -1036,20 +1035,20 @@ msgstr "Dodaj trening"
#: core/templates/user/overview.html:34 core/templates/user/overview.html:76
#: core/templates/user/overview.html:120 core/templates/user/overview.html:152
#: exercises/models/base.py:118 exercises/models/base.py:124
-#: exercises/models/exercise.py:63 exercises/models/exercise.py:69
+#: exercises/models/exercise.py:64 exercises/models/exercise.py:70
#: exercises/models/image.py:107 exercises/models/image.py:113
#: exercises/models/video.py:163 exercises/models/video.py:169
#: gallery/models/image.py:42 manager/helpers.py:85 manager/models/log.py:100
#: manager/models/session.py:67 measurements/models/measurement.py:47
-#: nutrition/models/ingredient.py:101 nutrition/models/ingredient.py:107
-#: nutrition/models/ingredient.py:222 weight/models.py:33
+#: nutrition/models/ingredient.py:87 nutrition/models/ingredient.py:93
+#: nutrition/models/ingredient.py:216 weight/models.py:51
#: weight/templates/import_csv_preview.html:13
#: weight/templates/import_csv_preview.html:42 weight/views.py:144
msgid "Date"
msgstr "Data"
#: core/templates/user/overview.html:35 core/templates/user/overview.html:153
-#: exercises/models/exercise.py:51 gallery/models/image.py:65
+#: exercises/models/exercise.py:52 gallery/models/image.py:65
#: gym/models/contract.py:58 gym/models/contract.py:109
#: manager/models/day.py:37 manager/models/workout.py:63
#: measurements/models/measurement.py:62 nutrition/models/plan.py:67
@@ -1067,13 +1066,13 @@ msgstr "Ostatnia aktywność"
#: core/templates/user/overview.html:58
#: manager/templates/calendar/month.html:128
-#: manager/templates/schedule/view.html:145
+#: manager/templates/schedule/view.html:144
#: manager/templates/workout/overview.html:28
msgid "No workouts found."
msgstr "Nie znaleziono treningu."
#: core/templates/user/overview.html:68 manager/forms.py:280
-#: manager/templates/workout/view.html:108
+#: manager/templates/workout/view.html:106
msgid "Log"
msgstr "Log"
@@ -1097,35 +1096,35 @@ msgstr "Czas"
#: core/templates/user/overview.html:112 core/templates/user/overview.html:121
#: manager/forms.py:186 manager/helpers.py:86 manager/models/log.py:86
-#: manager/models/setting.py:79 manager/templates/log/add.html:54
-#: manager/templates/set/formset.html:11 weight/models.py:35
+#: manager/models/setting.py:82 manager/templates/log/add.html:54
+#: manager/templates/set/formset.html:11 weight/models.py:53
#: weight/templates/import_csv_preview.html:14
#: weight/templates/import_csv_preview.html:43 weight/views.py:144
msgid "Weight"
msgstr "Ciężar"
-#: core/templates/user/overview.html:154 nutrition/models/ingredient.py:130
-#: nutrition/templates/ingredient/view.html:77 nutrition/views/plan.py:237
+#: core/templates/user/overview.html:154 nutrition/models/ingredient.py:116
+#: nutrition/templates/ingredient/view.html:51 nutrition/views/plan.py:237
msgid "Energy"
msgstr "Energia"
-#: core/templates/user/overview.html:155 nutrition/models/ingredient.py:137
-#: nutrition/templates/ingredient/view.html:84 nutrition/views/plan.py:243
+#: core/templates/user/overview.html:155 nutrition/models/ingredient.py:123
+#: nutrition/templates/ingredient/view.html:58 nutrition/views/plan.py:243
msgid "Protein"
msgstr "Białko"
-#: core/templates/user/overview.html:156 nutrition/models/ingredient.py:145
-#: nutrition/templates/ingredient/view.html:90 nutrition/views/plan.py:251
+#: core/templates/user/overview.html:156 nutrition/models/ingredient.py:131
+#: nutrition/templates/ingredient/view.html:64 nutrition/views/plan.py:251
msgid "Carbohydrates"
msgstr "Węglowodany"
-#: core/templates/user/overview.html:157 nutrition/models/ingredient.py:163
-#: nutrition/templates/ingredient/view.html:106 nutrition/views/plan.py:265
+#: core/templates/user/overview.html:157 nutrition/models/ingredient.py:149
+#: nutrition/templates/ingredient/view.html:80 nutrition/views/plan.py:265
msgid "Fat"
msgstr "Tłuszcz"
#: core/templates/user/overview.html:170
-#: nutrition/templates/ingredient/view.html:79
+#: nutrition/templates/ingredient/view.html:53
msgid "kcal"
msgstr "kcal"
@@ -1137,7 +1136,7 @@ msgstr "kcal"
#: gym/templates/gym/member_list.html:207
#: gym/templates/gym/member_list.html:240
#: gym/templates/gym/member_list.html:277
-#: manager/templates/schedule/view.html:101
+#: manager/templates/schedule/view.html:100
msgid "Actions"
msgstr "Akcje"
@@ -1180,7 +1179,7 @@ msgid "Details"
msgstr "Szczegóły"
#: core/templates/user/overview.html:258 gym/views/export.py:57
-#: manager/helpers.py:86 manager/templates/schedule/view.html:99
+#: manager/helpers.py:86 manager/templates/schedule/view.html:98
msgid "Nr."
msgstr "Nr."
@@ -1225,7 +1224,7 @@ msgid "Documents"
msgstr "Dokumenty"
#: core/templates/user/overview.html:412 gym/templates/document/list.html:32
-#: manager/forms.py:292 manager/templates/workout/view.html:134
+#: manager/forms.py:292 manager/templates/workout/view.html:132
msgid "Download"
msgstr "Pobierz"
@@ -1278,13 +1277,13 @@ msgid "kg"
msgstr "kg"
#: core/templatetags/wger_extras.py:207
-#: nutrition/templates/ingredient/view.html:86
-#: nutrition/templates/ingredient/view.html:92
-#: nutrition/templates/ingredient/view.html:99
-#: nutrition/templates/ingredient/view.html:108
-#: nutrition/templates/ingredient/view.html:115
-#: nutrition/templates/ingredient/view.html:137
-#: nutrition/templates/ingredient/view.html:147
+#: nutrition/templates/ingredient/view.html:60
+#: nutrition/templates/ingredient/view.html:66
+#: nutrition/templates/ingredient/view.html:73
+#: nutrition/templates/ingredient/view.html:82
+#: nutrition/templates/ingredient/view.html:89
+#: nutrition/templates/ingredient/view.html:111
+#: nutrition/templates/ingredient/view.html:121
msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr "g"
@@ -1302,7 +1301,7 @@ msgstr "oz"
#: exercises/views/equipment.py:103 exercises/views/exercises.py:73
#: exercises/views/muscles.py:99 manager/views/schedule.py:309
#: manager/views/schedule_step.py:128 manager/views/workout.py:249
-#: manager/views/workout_session.py:142 nutrition/views/ingredient.py:116
+#: manager/views/workout_session.py:142 nutrition/views/ingredient.py:119
#: nutrition/views/unit.py:110
msgid "Successfully deleted"
msgstr "Pomyślnie usunięto"
@@ -1314,7 +1313,7 @@ msgstr "Pomyślnie usunięto"
#: gym/views/admin_notes.py:196 gym/views/document.py:206 gym/views/gym.py:481
#: manager/views/schedule.py:316 manager/views/schedule_step.py:138
#: manager/views/workout.py:253 manager/views/workout_session.py:156
-#: nutrition/views/ingredient.py:123 nutrition/views/unit.py:117
+#: nutrition/views/ingredient.py:126 nutrition/views/unit.py:117
#, python-brace-format
msgid "Delete {0}?"
msgstr "Usunąć {0}?"
@@ -1327,7 +1326,7 @@ msgstr "Usunąć {0}?"
#: gym/views/contract.py:186 gym/views/contract_option.py:123
#: gym/views/contract_type.py:123 gym/views/document.py:171
#: gym/views/gym.py:463 manager/views/day.py:100 manager/views/schedule.py:333
-#: manager/views/workout.py:267 nutrition/views/ingredient.py:142
+#: manager/views/workout.py:267 nutrition/views/ingredient.py:145
#: nutrition/views/unit.py:143
#, python-brace-format
msgid "Edit {0}"
@@ -1401,7 +1400,7 @@ msgstr "Siłownia"
msgid "A verification email was sent to %(email)s"
msgstr "E-mail weryfikacyjny został wysłany na adres %(email)s"
-#: exercises/models/base.py:82 nutrition/models/ingredient.py:236
+#: exercises/models/base.py:82 nutrition/models/ingredient.py:230
msgid "Category"
msgstr "Kategoria"
@@ -1421,7 +1420,7 @@ msgstr "Możliwości"
msgid "Exercise Categories"
msgstr "Kategorie ćwiczeń"
-#: exercises/models/comment.py:52 exercises/models/exercise_alias.py:52
+#: exercises/models/comment.py:52 exercises/models/exercise_alias.py:53
#: exercises/models/image.py:74 exercises/models/video.py:98
#: manager/forms.py:178 manager/helpers.py:86 manager/models/log.py:52
msgid "Exercise"
@@ -1431,12 +1430,12 @@ msgstr "Ćwiczenie"
msgid "A comment about how to correctly do this exercise."
msgstr "Komentarz jak poprawnie wykonywać to ćwiczenie."
-#: exercises/models/exercise.py:76 nutrition/models/ingredient.py:95
+#: exercises/models/exercise.py:77 nutrition/models/ingredient.py:81
#: nutrition/models/weight_unit.py:32
msgid "Language"
msgstr "Język"
-#: exercises/models/exercise_alias.py:58
+#: exercises/models/exercise_alias.py:59
msgid "Alias for an exercise"
msgstr "Nacisk na ćwiczenie"
@@ -1569,7 +1568,7 @@ msgstr "Akcja"
#: manager/models/schedule.py:44 manager/models/session.py:49
#: manager/models/workout.py:89 measurements/models/category.py:31
#: measurements/models/measurement.py:42 nutrition/models/plan.py:54
-#: nutrition/templates/ingredient/pending.html:16 weight/models.py:42
+#: weight/models.py:60
msgid "User"
msgstr "Użytkownik"
@@ -1688,9 +1687,9 @@ msgid "Contract type"
msgstr "Typ kontraktu"
#: gym/models/contract.py:211 gym/templates/contract/view.html:59
-#: manager/templates/log/add.html:52 nutrition/forms.py:62
-#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:105
-#: nutrition/models/meal_item.py:72
+#: manager/templates/log/add.html:52 nutrition/forms.py:63
+#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:108
+#: nutrition/models/meal_item.py:73
msgid "Amount"
msgstr "Kwota"
@@ -1707,7 +1706,7 @@ msgid "Contract is active"
msgstr "Kontrakt jest aktywny"
#: gym/models/contract.py:237 gym/templates/contract/view.html:69
-#: manager/models/schedule.py:61 manager/templates/schedule/view.html:68
+#: manager/models/schedule.py:61 manager/templates/schedule/view.html:67
msgid "Start date"
msgstr "Data rozpoczęcia"
@@ -2097,7 +2096,7 @@ msgstr "Pokaż podgląd"
#: mailer/templates/mailer/gym/form.html:28
#: mailer/templates/mailer/gym/preview.html:62
-#: manager/templates/workout/view.html:42
+#: manager/templates/workout/view.html:40
msgid "Steps"
msgstr "Kroki"
@@ -2119,7 +2118,7 @@ msgid ""
msgstr "Możesz dowolnie zmieniać i poprawiać treść przed wysłaniem e-maila"
#: mailer/templates/mailer/gym/preview.html:22
-#: software/templates/about_us.html:60
+#: software/templates/about_us.html:70
msgid "Current version"
msgstr "Aktualna wersja"
@@ -2152,16 +2151,16 @@ msgstr ""
"Możesz szukać więcej niż jednego ćwiczenia, zostaną one zebrane w jedną "
"supergrupę."
-#: manager/forms.py:140 nutrition/forms.py:252
+#: manager/forms.py:140 nutrition/forms.py:253
msgid "Also search for names in English"
msgstr "Szukaj również w języku angielskim"
#: manager/forms.py:168 manager/forms.py:173 manager/models/log.py:64
-#: manager/models/log.py:92 manager/models/setting.py:59
-#: manager/models/setting.py:90 manager/templates/log/add.html:53
+#: manager/models/log.py:92 manager/models/setting.py:62
+#: manager/models/setting.py:93 manager/templates/log/add.html:53
#: manager/templates/log/add.html:55 manager/templates/set/formset.html:10
#: manager/templates/set/formset.html:12 measurements/models/category.py:41
-#: nutrition/forms.py:66
+#: nutrition/forms.py:67
msgid "Unit"
msgstr "Jednostka"
@@ -2169,15 +2168,15 @@ msgstr "Jednostka"
msgid "Type"
msgstr "Typ"
-#: manager/forms.py:280 manager/templates/workout/view.html:115
+#: manager/forms.py:280 manager/templates/workout/view.html:113
msgid "Table"
msgstr "Tabela"
-#: manager/forms.py:282 manager/templates/workout/view.html:121
+#: manager/forms.py:282 manager/templates/workout/view.html:119
msgid "with images"
msgstr "z obrazami"
-#: manager/forms.py:283 manager/templates/workout/view.html:127
+#: manager/forms.py:283 manager/templates/workout/view.html:125
msgid "with comments"
msgstr "z komentarzami"
@@ -2186,11 +2185,10 @@ msgid "Workout will expire soon"
msgstr "Trening wkrótce wygaśnie"
#: manager/models/day.py:34 manager/models/log.py:58
-#: manager/models/session.py:60 manager/templates/schedule/view.html:103
-#: manager/templates/workout/view.html:11
-#: manager/templates/workout/view.html:19 manager/views/pdf.py:85
-#: manager/views/pdf.py:161 manager/views/schedule.py:151
-#: manager/views/schedule.py:221
+#: manager/models/session.py:60 manager/templates/schedule/view.html:102
+#: manager/templates/workout/view.html:9 manager/templates/workout/view.html:17
+#: manager/views/pdf.py:85 manager/views/pdf.py:161
+#: manager/views/schedule.py:151 manager/views/schedule.py:221
msgid "Workout"
msgstr "Trening"
@@ -2210,7 +2208,7 @@ msgstr "Dzień"
msgid "Name or short description of the schedule. For example 'Program XYZ'."
msgstr "Nazwa bądź krótki opis harmonogramu. Przykładowo \"Program XYZ\"."
-#: manager/models/schedule.py:65 manager/templates/schedule/view.html:72
+#: manager/models/schedule.py:65 manager/templates/schedule/view.html:71
msgid "Schedule active"
msgstr "Aktywny harmonogram"
@@ -2224,7 +2222,7 @@ msgstr ""
"odzwierciedlone w kokpicie). Inne harmonogramy zostaną oznaczone jako "
"nieaktywne"
-#: manager/models/schedule.py:77 manager/templates/schedule/view.html:82
+#: manager/models/schedule.py:77 manager/templates/schedule/view.html:81
msgid "Is a loop"
msgstr "Zapętlone"
@@ -2244,8 +2242,8 @@ msgid "The duration in weeks"
msgstr "Czas trwania w tygodniach"
#: manager/models/schedule_step.py:64 manager/models/set.py:53
-#: manager/models/setting.py:110 nutrition/models/meal.py:55
-#: nutrition/models/meal_item.py:65
+#: manager/models/setting.py:113 nutrition/models/meal.py:55
+#: nutrition/models/meal_item.py:66
msgid "Order"
msgstr "Kolejność"
@@ -2298,7 +2296,7 @@ msgstr "Dzień treningu"
msgid "Number of sets"
msgstr "Liczba serii"
-#: manager/models/setting.py:48
+#: manager/models/setting.py:51
msgid "Sets"
msgstr "Serie"
@@ -2372,7 +2370,7 @@ msgstr ""
msgid "Go to current month"
msgstr "Idź do bieżącego miesiąca"
-#: manager/templates/calendar/month.html:188
+#: manager/templates/calendar/month.html:190
msgid "Add new log"
msgstr "Dodaj nowy log"
@@ -2413,8 +2411,8 @@ msgid "Your schedules"
msgstr "Twoje harmonogramy"
#: manager/templates/schedule/overview.html:19
-#: manager/templates/schedule/view.html:132
-#: manager/templates/schedule/view.html:184
+#: manager/templates/schedule/view.html:131
+#: manager/templates/schedule/view.html:183
#: manager/templates/workout/overview.html:16
msgid "active"
msgstr "aktywny"
@@ -2461,11 +2459,11 @@ msgstr ""
msgid "Add schedule"
msgstr "Dodaj hamonogram"
-#: manager/templates/schedule/view.html:10
+#: manager/templates/schedule/view.html:9
msgid "Schedule"
msgstr "Harmonogram"
-#: manager/templates/schedule/view.html:86
+#: manager/templates/schedule/view.html:85
msgid ""
"This schedule is a loop and will go through the workouts above till you "
"deactivate it"
@@ -2473,19 +2471,19 @@ msgstr ""
"Ten harmonogram jest zapętlony i będzie przechodził przez treningi aż do "
"jego dezaktywacji"
-#: manager/templates/schedule/view.html:104
+#: manager/templates/schedule/view.html:103
msgid "Weeks"
msgstr "Tygodnie"
-#: manager/templates/schedule/view.html:116
+#: manager/templates/schedule/view.html:115
msgid "Move me"
msgstr "Przesuń mnie"
-#: manager/templates/schedule/view.html:157
+#: manager/templates/schedule/view.html:156
msgid "Start schedule"
msgstr "Rozpocznij harmonogram"
-#: manager/templates/schedule/view.html:188
+#: manager/templates/schedule/view.html:187
#, python-format
msgid ""
"%(weeks)s Week\n"
@@ -2506,11 +2504,11 @@ msgstr[3] ""
"%(weeks)s tygodni\n"
" "
-#: manager/templates/schedule/view.html:222
+#: manager/templates/schedule/view.html:221
msgid "Adding workouts"
msgstr "Dodawanie treningów"
-#: manager/templates/schedule/view.html:224
+#: manager/templates/schedule/view.html:223
msgid ""
"Add as many workouts to the schedule as you want. You can\n"
" edit the order by dragging and dropping them. It's also possible "
@@ -2522,21 +2520,21 @@ msgstr ""
"dodać\n"
" wielokrotnie."
-#: manager/templates/schedule/view.html:233
-#: manager/templates/schedule/view.html:244
-#: manager/templates/schedule/view.html:291
-#: manager/templates/workout/view.html:71
-#: manager/templates/workout/view.html:81
-#: manager/templates/workout/view.html:180
+#: manager/templates/schedule/view.html:232
+#: manager/templates/schedule/view.html:243
+#: manager/templates/schedule/view.html:290
+#: manager/templates/workout/view.html:69
+#: manager/templates/workout/view.html:79
+#: manager/templates/workout/view.html:178
msgid "Export calendar file"
msgstr "Eksportuj plik kalendarza"
-#: manager/templates/schedule/view.html:237
+#: manager/templates/schedule/view.html:236
msgid "Export this schedule as a calendar file."
msgstr "Eksportuj ten harmonogram jako plik kalendarza."
-#: manager/templates/schedule/view.html:238
-#: manager/templates/workout/view.html:76
+#: manager/templates/schedule/view.html:237
+#: manager/templates/workout/view.html:74
msgid ""
"You can then import the file it into your calendar\n"
" application for example google calendar, outlook or "
@@ -2549,18 +2547,18 @@ msgstr ""
" wydarzenie dla każdego treningu, z odpowiednimi "
"ćwiczeniami."
-#: manager/templates/schedule/view.html:259
-#: manager/templates/schedule/view.html:295
-#: manager/templates/workout/view.html:96
-#: manager/templates/workout/view.html:176
+#: manager/templates/schedule/view.html:258
+#: manager/templates/schedule/view.html:294
+#: manager/templates/workout/view.html:94
+#: manager/templates/workout/view.html:174
msgid "Download as PDF"
msgstr "Pobierz jako PDF"
-#: manager/templates/schedule/view.html:300
+#: manager/templates/schedule/view.html:299
msgid "Edit schedule"
msgstr "Edytuj harmonogram"
-#: manager/templates/schedule/view.html:305
+#: manager/templates/schedule/view.html:304
msgid "Delete schedule"
msgstr "Usuń harmonogram"
@@ -2702,12 +2700,12 @@ msgid "Mark as workout"
msgstr "Oznacz jako trening"
#: manager/templates/workout/template_view.html:65
-#: manager/templates/workout/view.html:51
+#: manager/templates/workout/view.html:49
msgid "Muscles trained"
msgstr "Trenowane mięśnie"
#: manager/templates/workout/template_view.html:68
-#: manager/templates/workout/view.html:54
+#: manager/templates/workout/view.html:52
msgid ""
"Images show combined muscles as trained by the exercises on the workout."
msgstr ""
@@ -2717,35 +2715,35 @@ msgstr ""
msgid "Use this template"
msgstr "Użyj tego schematu"
-#: manager/templates/workout/view.html:45
+#: manager/templates/workout/view.html:43
msgid "Add training days"
msgstr "Dodaj dni treningowe"
-#: manager/templates/workout/view.html:46
+#: manager/templates/workout/view.html:44
msgid "Add workout sets to days"
msgstr "Dodaj zestawy treningów do dni"
-#: manager/templates/workout/view.html:47
+#: manager/templates/workout/view.html:45
msgid "Set the repetitions for each set"
msgstr "Ustaw powtórzenia dla każdej serii"
-#: manager/templates/workout/view.html:75
+#: manager/templates/workout/view.html:73
msgid "Export this workout as a calendar file."
msgstr "Eksportuj trening jako plik kalendarza."
-#: manager/templates/workout/view.html:146
+#: manager/templates/workout/view.html:144
msgid "Logs"
msgstr "Wpisy"
-#: manager/templates/workout/view.html:148
+#: manager/templates/workout/view.html:146
msgid "View logs"
msgstr "Pokaż wpisy"
-#: manager/templates/workout/view.html:171 manager/views/schedule_step.py:99
+#: manager/templates/workout/view.html:169 manager/views/schedule_step.py:99
msgid "Edit workout"
msgstr "Edytuj trening"
-#: manager/templates/workout/view.html:184 manager/views/workout.py:281
+#: manager/templates/workout/view.html:182 manager/views/workout.py:281
msgid "Mark as template"
msgstr "Oznacz jako szablon"
@@ -2793,35 +2791,35 @@ msgstr ""
msgid "Value"
msgstr "Wartość"
-#: nutrition/forms.py:117
+#: nutrition/forms.py:118
msgid "Height (in)"
msgstr "Wzrost (in)"
-#: nutrition/forms.py:120
+#: nutrition/forms.py:121
msgid "Weight (kg)"
msgstr "Waga (kg)"
-#: nutrition/forms.py:120
+#: nutrition/forms.py:121
msgid "Weight (lbs)"
msgstr "Waga (lbs)"
-#: nutrition/forms.py:133
+#: nutrition/forms.py:134
msgid "Calculate"
msgstr "Oblicz"
-#: nutrition/forms.py:207 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:208 nutrition/templates/rate/form.html:76
msgid "Basic caloric intake"
msgstr "Podstawowe spożycie kalorii"
-#: nutrition/forms.py:208
+#: nutrition/forms.py:209
msgid "Your basic caloric intake as calculated for your data"
msgstr "Twoje podstawowe spożycie kalorii obliczone na podstawie danych"
-#: nutrition/forms.py:213
+#: nutrition/forms.py:214
msgid "Additional calories"
msgstr "Dodatkowe kalorie"
-#: nutrition/forms.py:215
+#: nutrition/forms.py:216
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
@@ -2829,70 +2827,56 @@ msgstr ""
"Dodatkowe kalorie modyfikujące bazową wartość (by odjąć, wpisz ujemną "
"wartość)"
-#: nutrition/forms.py:248 nutrition/models/ingredient_weight_unit.py:39
-#: nutrition/models/log.py:84 nutrition/models/meal_item.py:53
+#: nutrition/forms.py:249 nutrition/models/ingredient_weight_unit.py:39
+#: nutrition/models/log.py:87 nutrition/models/meal_item.py:54
msgid "Ingredient"
msgstr "Składnik"
-#: nutrition/models/ingredient.py:131
+#: nutrition/models/ingredient.py:117
msgid "In kcal per 100g"
msgstr "W kcal na 100g"
-#: nutrition/models/ingredient.py:138 nutrition/models/ingredient.py:146
-#: nutrition/models/ingredient.py:156 nutrition/models/ingredient.py:164
-#: nutrition/models/ingredient.py:174 nutrition/models/ingredient.py:184
-#: nutrition/models/ingredient.py:194
+#: nutrition/models/ingredient.py:124 nutrition/models/ingredient.py:132
+#: nutrition/models/ingredient.py:142 nutrition/models/ingredient.py:150
+#: nutrition/models/ingredient.py:160 nutrition/models/ingredient.py:170
+#: nutrition/models/ingredient.py:180
msgid "In g per 100g of product"
msgstr "W g na 100g produktu"
-#: nutrition/models/ingredient.py:155
-#: nutrition/templates/ingredient/view.html:96 nutrition/views/plan.py:259
+#: nutrition/models/ingredient.py:141
+#: nutrition/templates/ingredient/view.html:70 nutrition/views/plan.py:259
msgid "Sugar content in carbohydrates"
msgstr "Cukry proste"
-#: nutrition/models/ingredient.py:173
-#: nutrition/templates/ingredient/view.html:112 nutrition/views/plan.py:273
+#: nutrition/models/ingredient.py:159
+#: nutrition/templates/ingredient/view.html:86 nutrition/views/plan.py:273
msgid "Saturated fat content in fats"
msgstr "Tłuszcze nasycone"
-#: nutrition/models/ingredient.py:183
-#: nutrition/templates/ingredient/view.html:134 nutrition/views/plan.py:279
-msgid "Fibres"
-msgstr "Błonnik"
+#: nutrition/models/ingredient.py:169
+#: nutrition/templates/ingredient/view.html:108 nutrition/views/plan.py:279
+msgid "Fiber"
+msgstr ""
-#: nutrition/models/ingredient.py:193
-#: nutrition/templates/ingredient/view.html:144 nutrition/views/plan.py:285
+#: nutrition/models/ingredient.py:179
+#: nutrition/templates/ingredient/view.html:118 nutrition/views/plan.py:285
msgid "Sodium"
msgstr "Sód"
-#: nutrition/models/ingredient.py:215
+#: nutrition/models/ingredient.py:209
msgid "Link to product"
msgstr "Podlinkuj produkt"
-#: nutrition/models/ingredient.py:244
+#: nutrition/models/ingredient.py:238
msgid "Brand name of product"
msgstr "Nazwa marki produktu"
-#: nutrition/models/ingredient.py:304
+#: nutrition/models/ingredient.py:305
#, python-brace-format
msgid "The total energy ({self.energy}kcal) is not the approximate sum of the "
msgstr ""
"Całkowita energia ({self.energy}kcal) nie jest zgodna z przybliżoną sumą "
-#: nutrition/models/ingredient.py:383 nutrition/views/ingredient.py:196
-msgid "Ingredient was successfully added to the general database"
-msgstr "Składnik został pomyślnie dodany do bazy danych"
-
-#: nutrition/models/ingredient.py:408
-msgid "New user submitted ingredient"
-msgstr "Nowy składnik dodany przez użytkownika"
-
-#: nutrition/models/ingredient.py:410
-#, python-brace-format
-msgid ""
-"The user {request.user.username} submitted a new ingredient \"{self.name}\"."
-msgstr "Użytkownik {request.user.username} dodał nowy składnik \"{self.name}\"."
-
#: nutrition/models/ingredient_category.py:31
msgid "Ingredient Categories"
msgstr "Kategorie składników"
@@ -2905,16 +2889,16 @@ msgstr "Ilość w gramach"
msgid "Unit amount, e.g. \"1 Cup\" or \"1/2 spoon\""
msgstr "Jednostka ilości, np. \"1 kubek\" lub \"1/2 łyżki\""
-#: nutrition/models/log.py:49 nutrition/models/meal.py:50
-#: nutrition/models/meal_item.py:47 nutrition/models/plan.py:106
+#: nutrition/models/log.py:52 nutrition/models/meal.py:50
+#: nutrition/models/meal_item.py:48 nutrition/models/plan.py:108
msgid "Nutrition plan"
msgstr "Plan żywienia"
-#: nutrition/models/log.py:58
+#: nutrition/models/log.py:61
msgid "Meal"
msgstr "Posiłek"
-#: nutrition/models/log.py:68
+#: nutrition/models/log.py:71
msgid "Date and Time (Approx.)"
msgstr "Data oraz czas (przybliżony)"
@@ -2934,11 +2918,11 @@ msgid ""
"summer\""
msgstr "Opis bądź cel planu, np. \"Zrób masę\" lub \"Przygotuj się na lato\""
-#: nutrition/models/plan.py:88
+#: nutrition/models/plan.py:90
msgid "Use daily calories"
msgstr "Wykorzystaj dzienne kalorie"
-#: nutrition/models/plan.py:91
+#: nutrition/models/plan.py:93
msgid ""
"Tick the box if you want to mark this plan as having a goal amount of "
"calories. You can use the calculator or enter the value yourself."
@@ -3063,67 +3047,36 @@ msgstr "Szukaj"
msgid "Add ingredient"
msgstr "Dodaj składnik"
-#: nutrition/templates/ingredient/pending.html:14
-msgid "Submission date"
-msgstr "Data zgłoszenia"
-
-#: nutrition/templates/ingredient/view.html:27
-msgid "Ingredient is pending review"
-msgstr "Składnik czeka na akceptację"
-
-#: nutrition/templates/ingredient/view.html:28
-msgid ""
-"This user submitted ingredient is pending a decision to be\n"
-"included in the database. Till then, it will not be shown in the overview "
-"or\n"
-"the search."
-msgstr ""
-"Ten składnik przesłany prze użytkownika czeka na\n"
-"umieszczenie w bazie danych. Do tego czasu, nie będzie on umieszczony w\n"
-"wynikach wyszukiwania."
-
-#: nutrition/templates/ingredient/view.html:31
-msgid "Please select one of the options below."
-msgstr "Wybierz jedną z opcji poniżej."
-
-#: nutrition/templates/ingredient/view.html:38
-msgid "Accept"
-msgstr "Akceptuj"
-
-#: nutrition/templates/ingredient/view.html:42
-msgid "Decline"
-msgstr "Odrzuć"
-
-#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:229
+#: nutrition/templates/ingredient/view.html:45 nutrition/views/plan.py:229
msgid "Macronutrients"
msgstr "Makroelementy"
-#: nutrition/templates/ingredient/view.html:80
+#: nutrition/templates/ingredient/view.html:54
msgid "kJ"
msgstr "kJ"
-#: nutrition/templates/ingredient/view.html:101
-#: nutrition/templates/ingredient/view.html:117
-#: nutrition/templates/ingredient/view.html:139
-#: nutrition/templates/ingredient/view.html:149
+#: nutrition/templates/ingredient/view.html:75
+#: nutrition/templates/ingredient/view.html:91
+#: nutrition/templates/ingredient/view.html:113
+#: nutrition/templates/ingredient/view.html:123
msgid "n.A."
msgstr "N/A"
-#: nutrition/templates/ingredient/view.html:128
+#: nutrition/templates/ingredient/view.html:102
msgid "Others"
msgstr "Inne"
-#: nutrition/templates/ingredient/view.html:170
+#: nutrition/templates/ingredient/view.html:144
#: nutrition/templates/units/list.html:46 nutrition/views/unit.py:86
msgid "Add new weight unit"
msgstr "Dodaj nową jednostkę wagi"
-#: nutrition/templates/ingredient/view.html:232
-#: nutrition/templates/ingredient/view.html:235
+#: nutrition/templates/ingredient/view.html:206
+#: nutrition/templates/ingredient/view.html:209
msgid "Edit ingredient"
msgstr "Edytuj składnik"
-#: nutrition/templates/ingredient/view.html:239
+#: nutrition/templates/ingredient/view.html:213
msgid "Delete ingredient"
msgstr "Usuń składnik"
@@ -3226,14 +3179,10 @@ msgstr "140 do 230"
msgid "56 to 90"
msgstr "56 do 90"
-#: nutrition/views/ingredient.py:154
+#: nutrition/views/ingredient.py:157
msgid "Add a new ingredient"
msgstr "Dodaj nowy składnik"
-#: nutrition/views/ingredient.py:209
-msgid "Ingredient was successfully marked as rejected"
-msgstr "Składnik został poprawnie oznaczony jako odrzucony"
-
#: nutrition/views/plan.py:120
msgid "Nutritional plan"
msgstr "Plan diety"
@@ -3280,18 +3229,10 @@ msgstr ""
"współpracy entuzjastów fitnessu na całym świecie."
#: software/templates/about_us.html:18
-msgid "Source code"
-msgstr "Kod źródłowy"
-
-#: software/templates/about_us.html:20
-msgid "Get the source code of this application and its server on github"
-msgstr "Zobacz kod źródłowy tej aplikacji i jej serwera na Githubie"
-
-#: software/templates/about_us.html:25
msgid "Have a problem or idea?"
msgstr "Masz problem lub pomysł?"
-#: software/templates/about_us.html:27
+#: software/templates/about_us.html:20
msgid ""
"Get in touch if something didn't behave as expected or if there is a feature "
"that you feel is missing."
@@ -3299,20 +3240,28 @@ msgstr ""
"Skontaktuj się z nami, jeżeli coś zachowało się w niespodziewany sposób lub "
"czujesz, że brakuje jakiejś funkcji."
-#: software/templates/about_us.html:32
+#: software/templates/about_us.html:26
msgid "Say hi!"
msgstr "Przywitaj się!"
-#: software/templates/about_us.html:34
+#: software/templates/about_us.html:28
msgid "If you want to chat with us, hop on the Discord server and get in touch"
msgstr ""
"Jeśli chcesz z nami porozmawiać, wskocz na serwer Discorda i przywitaj się"
-#: software/templates/about_us.html:39 software/templates/features.html:503
+#: software/templates/about_us.html:33
+msgid "Mastodon"
+msgstr ""
+
+#: software/templates/about_us.html:35
+msgid "Follow us on mastodon for updates and news about the project"
+msgstr ""
+
+#: software/templates/about_us.html:40 software/templates/features.html:503
msgid "Translation"
msgstr "Tłumaczenie"
-#: software/templates/about_us.html:41
+#: software/templates/about_us.html:42
msgid ""
"This application is translated on weblate. If you also want to help, click "
"the link and start translating"
@@ -3320,15 +3269,30 @@ msgstr ""
"Ta aplikacja jest tłumaczona poprzez Weblate. Jeśli też chcesz pomóc, "
"kliknij link i zacznij tłumaczyć"
-#: software/templates/about_us.html:50
+#: software/templates/about_us.html:47
+msgid "Source code"
+msgstr "Kod źródłowy"
+
+#: software/templates/about_us.html:49
+msgid "Get the source code of this application and its server on github"
+msgstr "Zobacz kod źródłowy tej aplikacji i jej serwera na Githubie"
+
+#: software/templates/about_us.html:59
msgid "Our goal"
msgstr "Nasz cel"
-#: software/templates/about_us.html:53
+#: software/templates/about_us.html:62
+#, fuzzy
+#| msgid ""
+#| "The goal is to build an awesome\n"
+#| " and flexible fitness manager, along with a comprehensive "
+#| "and complete list of exercises and\n"
+#| " ingredients, all released under a free license."
msgid ""
"The goal is to build an awesome\n"
" and flexible fitness manager, along with a comprehensive and "
-"complete list of exercises and\n"
+"complete list of\n"
+" exercises and\n"
" ingredients, all released under a free license."
msgstr ""
"Celem jest zbudowanie świetnego\n"
@@ -3344,10 +3308,6 @@ msgstr ""
"wger Workout Manager to darmowa, aplikacja open source do zarzadzania "
"ćwiczeniami i treningami."
-#: software/templates/features.html:45
-msgid "About"
-msgstr "O nas"
-
#: software/templates/features.html:57
msgid "Mobile app"
msgstr "Aplikacja Mobilna"
@@ -3608,18 +3568,6 @@ msgstr ""
"wcześniejszym dziele, ale także zawiera wystarczającą ilość nowych, "
"kreatywnych treści, aby uprawniać go do własnych praw autorskich."
-#: utils/models.py:130
-msgid "Pending"
-msgstr "Oczekujące"
-
-#: utils/models.py:131
-msgid "Accepted"
-msgstr "Zaakceptowano"
-
-#: utils/models.py:132
-msgid "Declined"
-msgstr "Odrzucono"
-
#: weight/forms.py:54
msgid "Input"
msgstr "Wartość wejściowa"
@@ -3632,7 +3580,7 @@ msgstr "Format daty"
msgid "You have to enter your weight"
msgstr "Musisz wpisać swoją wagę"
-#: weight/models.py:60
+#: weight/models.py:78
msgid "Weight entry"
msgstr "Waga"
@@ -3772,6 +3720,65 @@ msgstr "Usunięto."
msgid "Delete weight entry for the %s"
msgstr "Usuń wpis wagi dla %s"
+#~ msgid "Ingredients pending review"
+#~ msgstr "Składniki oczekujące na akceptację"
+
+#~ msgid "Fibres"
+#~ msgstr "Błonnik"
+
+#~ msgid "Ingredient was successfully added to the general database"
+#~ msgstr "Składnik został pomyślnie dodany do bazy danych"
+
+#~ msgid "New user submitted ingredient"
+#~ msgstr "Nowy składnik dodany przez użytkownika"
+
+#, python-brace-format
+#~ msgid ""
+#~ "The user {request.user.username} submitted a new ingredient \"{self."
+#~ "name}\"."
+#~ msgstr ""
+#~ "Użytkownik {request.user.username} dodał nowy składnik \"{self.name}\"."
+
+#~ msgid "Submission date"
+#~ msgstr "Data zgłoszenia"
+
+#~ msgid "Ingredient is pending review"
+#~ msgstr "Składnik czeka na akceptację"
+
+#~ msgid ""
+#~ "This user submitted ingredient is pending a decision to be\n"
+#~ "included in the database. Till then, it will not be shown in the overview "
+#~ "or\n"
+#~ "the search."
+#~ msgstr ""
+#~ "Ten składnik przesłany prze użytkownika czeka na\n"
+#~ "umieszczenie w bazie danych. Do tego czasu, nie będzie on umieszczony w\n"
+#~ "wynikach wyszukiwania."
+
+#~ msgid "Please select one of the options below."
+#~ msgstr "Wybierz jedną z opcji poniżej."
+
+#~ msgid "Accept"
+#~ msgstr "Akceptuj"
+
+#~ msgid "Decline"
+#~ msgstr "Odrzuć"
+
+#~ msgid "Ingredient was successfully marked as rejected"
+#~ msgstr "Składnik został poprawnie oznaczony jako odrzucony"
+
+#~ msgid "About"
+#~ msgstr "O nas"
+
+#~ msgid "Pending"
+#~ msgstr "Oczekujące"
+
+#~ msgid "Accepted"
+#~ msgstr "Zaakceptowano"
+
+#~ msgid "Declined"
+#~ msgstr "Odrzucono"
+
#~ msgid "Share"
#~ msgstr "Udostępnij"
diff --git a/wger/locale/pt/LC_MESSAGES/django.po b/wger/locale/pt/LC_MESSAGES/django.po
index c43950c4b..6ad930fb7 100644
--- a/wger/locale/pt/LC_MESSAGES/django.po
+++ b/wger/locale/pt/LC_MESSAGES/django.po
@@ -15,11 +15,11 @@ msgid ""
msgstr ""
"Project-Id-Version: wger Workout Manager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-02-02 12:42+0100\n"
+"POT-Creation-Date: 2024-07-14 15:49+0200\n"
"PO-Revision-Date: 2024-03-23 17:01+0000\n"
"Last-Translator: Wilton Rodrigues <[email protected]>\n"
-"Language-Team: Portuguese <https://hosted.weblate.org/projects/wger/web/pt/>"
-"\n"
+"Language-Team: Portuguese <https://hosted.weblate.org/projects/wger/web/pt/"
+">\n"
"Language: pt\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -39,7 +39,7 @@ msgstr ""
"Selecione a academia principal para essa instalação. Isto atribuirá todos os "
"novos utilizadores registados e os utilizadores sem academia à essa academia."
-#: config/views/gym_config.py:42 core/templates/language/view.html:63
+#: config/views/gym_config.py:42 core/templates/language/view.html:67
#: core/templates/license/list.html:17 core/templates/misc/license/list.html:18
#: core/templates/repetition_unit/list.html:18
#: core/templates/tags/render_day.html:39
@@ -59,8 +59,8 @@ msgstr ""
#: manager/templates/calendar/day.html:68
#: manager/templates/calendar/month.html:85
#: manager/templates/calendar/partial_overview_table.html:18
-#: manager/templates/schedule/view.html:119
-#: nutrition/templates/ingredient/view.html:191
+#: manager/templates/schedule/view.html:118
+#: nutrition/templates/ingredient/view.html:165
#: nutrition/templates/units/list.html:19
msgid "Edit"
msgstr "Editar"
@@ -94,8 +94,8 @@ msgstr "Minha agenda de treino"
msgid "Empty placeholder schedule"
msgstr "Agenda de espaço reservado vazia"
-#: core/forms.py:69 core/templates/navigation.html:275
-#: core/templates/navigation.html:281 core/templates/user/login.html:4
+#: core/forms.py:69 core/templates/navigation.html:285
+#: core/templates/navigation.html:291 core/templates/user/login.html:4
#: software/templates/features.html:82 software/templates/features.html:427
msgid "Login"
msgstr "Login"
@@ -167,7 +167,7 @@ msgstr "Senha"
msgid "Please enter your current password."
msgstr "Por favor informe a sua senha atual."
-#: core/forms.py:242 core/templates/language/view.html:68
+#: core/forms.py:242 core/templates/language/view.html:73
#: core/templates/license/list.html:19 core/templates/misc/license/list.html:22
#: core/templates/repetition_unit/list.html:20
#: core/templates/tags/render_day.html:45
@@ -182,10 +182,10 @@ msgstr "Por favor informe a sua senha atual."
#: gym/templates/gym/list.html:22 manager/templates/calendar/day.html:73
#: manager/templates/calendar/month.html:89
#: manager/templates/calendar/partial_overview_table.html:23
-#: manager/templates/schedule/view.html:123
-#: manager/templates/workout/view.html:190
-#: nutrition/templates/ingredient/view.html:192
-#: nutrition/templates/ingredient/view.html:241
+#: manager/templates/schedule/view.html:122
+#: manager/templates/workout/view.html:188
+#: nutrition/templates/ingredient/view.html:166
+#: nutrition/templates/ingredient/view.html:215
#: nutrition/templates/units/list.html:22
msgid "Delete"
msgstr "Remover"
@@ -198,14 +198,14 @@ msgstr "Senha inválida"
msgid "The form is secured with reCAPTCHA"
msgstr "O formulário está seguro com o reCAPTCHA"
-#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:275
-#: core/templates/navigation.html:287 core/templates/template.html:147
+#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:285
+#: core/templates/navigation.html:297 core/templates/template.html:149
#: core/templates/user/login.html:20 core/views/user.py:298
#: software/templates/features.html:87 software/templates/features.html:422
msgid "Register"
msgstr "Cadastro"
-#: core/forms.py:315
+#: core/forms.py:315 software/templates/features.html:45
msgid "Contact"
msgstr "Contato"
@@ -214,7 +214,7 @@ msgid "Some way of answering you (e-mail, etc.)"
msgstr "Meios de contato (e-mail, etc.)"
#: core/forms.py:324 exercises/models/comment.py:58 manager/models/set.py:61
-#: manager/models/setting.py:111 nutrition/models/log.py:74
+#: manager/models/setting.py:114 nutrition/models/log.py:77
msgid "Comment"
msgstr "Comentário"
@@ -234,6 +234,12 @@ msgstr "Abreviação do idioma"
msgid "Language full name"
msgstr "Nome completo idioma"
+#: core/models/language.py:45 core/templates/language/view.html:23
+#, fuzzy
+#| msgid "Language full name"
+msgid "Language full name in English"
+msgstr "Nome completo idioma"
+
#: core/models/license.py:29
msgid "Full name"
msgstr "Nome completo"
@@ -250,7 +256,7 @@ msgstr ""
msgid "Short name, e.g. CC-BY-SA 3"
msgstr "Abreviação, por exemplo CC-BY-SA 3"
-#: core/models/license.py:45 nutrition/models/ingredient.py:214
+#: core/models/license.py:45 nutrition/models/ingredient.py:208
msgid "Link"
msgstr "Link"
@@ -367,7 +373,7 @@ msgstr ""
msgid "Age"
msgstr "Idade"
-#: core/models/profile.py:230 nutrition/forms.py:117
+#: core/models/profile.py:230 nutrition/forms.py:118
msgid "Height (cm)"
msgstr "Altura (cm)"
@@ -418,7 +424,7 @@ msgid "Total caloric intake, including e.g. any surplus"
msgstr "Total de ingestão calórica, incluindo qualquer excedente"
#: core/models/profile.py:333 nutrition/models/ingredient_weight_unit.py:45
-#: nutrition/models/log.py:93 nutrition/models/meal_item.py:58
+#: nutrition/models/log.py:96 nutrition/models/meal_item.py:59
msgid "Weight unit"
msgstr "Unidade de peso"
@@ -449,17 +455,16 @@ msgstr "A soma de todas as horas deve ser 24"
#: core/models/rep_unit.py:36 core/models/weight_unit.py:36
#: core/templates/user/overview.html:262 core/views/user.py:599
#: exercises/models/category.py:29 exercises/models/equipment.py:29
-#: exercises/models/exercise.py:58 exercises/models/muscle.py:36
+#: exercises/models/exercise.py:59 exercises/models/muscle.py:36
#: gym/models/contract.py:52 gym/models/contract.py:103 gym/models/gym.py:46
#: gym/models/user_document.py:84 gym/templates/contract/view.html:50
#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:96
#: gym/views/gym.py:158 manager/models/schedule.py:55
#: manager/models/workout.py:57 measurements/models/category.py:36
-#: nutrition/models/ingredient.py:125
+#: nutrition/models/ingredient.py:111
#: nutrition/models/ingredient_category.py:27 nutrition/models/meal.py:67
#: nutrition/models/weight_unit.py:38
-#: nutrition/templates/ingredient/pending.html:15
-#: nutrition/templates/ingredient/view.html:178
+#: nutrition/templates/ingredient/view.html:152
msgid "Name"
msgstr "Nome"
@@ -564,24 +569,24 @@ msgstr "Clique no seguinte link para confirmar seu e-mail: %(link)s"
msgid "Dashboard"
msgstr "Painel"
-#: core/templates/language/overview.html:4 core/templates/navigation.html:335
+#: core/templates/language/overview.html:4 core/templates/navigation.html:345
msgid "Languages"
msgstr "Idiomas"
-#: core/templates/language/overview.html:20
+#: core/templates/language/overview.html:22
msgid "Nothing found."
msgstr "Não encontrado."
-#: core/templates/language/overview.html:20
+#: core/templates/language/overview.html:22
#: manager/templates/calendar/month.html:132
#: manager/templates/schedule/overview.html:28
-#: manager/templates/schedule/view.html:145
+#: manager/templates/schedule/view.html:144
#: manager/templates/workout/overview.html:28
#: nutrition/templates/ingredient/overview.html:38
msgid "Add one now."
msgstr "Adicionar um agora."
-#: core/templates/language/overview.html:33 core/templates/license/list.html:40
+#: core/templates/language/overview.html:35 core/templates/license/list.html:40
#: core/templates/misc/license/list.html:43
#: core/templates/repetition_unit/list.html:43
#: core/templates/user/overview.html:326 core/templates/user/overview.html:365
@@ -601,13 +606,13 @@ msgstr "Adicionar um agora."
msgid "Add"
msgstr "Adicionar"
-#: core/templates/language/view.html:58 core/templates/user/api_key.html:44
+#: core/templates/language/view.html:61 core/templates/user/api_key.html:44
#: core/templates/user/preferences.html:45 gym/models/contract.py:203
#: gym/templates/contract/view.html:41 gym/templates/contract/view.html:106
#: gym/templates/gym/member_list.html:248
-#: manager/templates/schedule/view.html:286
-#: manager/templates/workout/view.html:165
-#: nutrition/templates/ingredient/view.html:228
+#: manager/templates/schedule/view.html:285
+#: manager/templates/workout/view.html:163
+#: nutrition/templates/ingredient/view.html:202
msgid "Options"
msgstr "Opções"
@@ -632,12 +637,11 @@ msgstr "Lista de licença"
#: gym/templates/gym/member_list.html:299
#: mailer/templates/mailer/gym/overview.html:30
#: manager/templates/calendar/day.html:87
-#: nutrition/templates/ingredient/pending.html:30
#: nutrition/templates/units/list.html:29
msgid "Nothing found"
msgstr "Nada encontrado"
-#: core/templates/misc/about.html:4 core/templates/template.html:173
+#: core/templates/misc/about.html:4 core/templates/template.html:175
msgid "Imprint"
msgstr "Imprimir"
@@ -651,174 +655,169 @@ msgstr ""
" Commons para os differentes países, adicione-as como entradas "
"separadas aqui."
-#: core/templates/navigation.html:27 software/templates/features.html:437
+#: core/templates/navigation.html:28 software/templates/features.html:437
msgid "Training"
msgstr "Treinamento"
-#: core/templates/navigation.html:34 core/templates/user/overview.html:25
+#: core/templates/navigation.html:37 core/templates/user/overview.html:25
msgid "Workouts"
msgstr "Treinos"
-#: core/templates/navigation.html:42
+#: core/templates/navigation.html:46
msgid "Workouts schedules"
msgstr "Horários de treinos"
-#: core/templates/navigation.html:50 core/templates/user/overview.html:70
+#: core/templates/navigation.html:54 core/templates/user/overview.html:70
#: manager/templates/calendar/month.html:10
#: manager/templates/calendar/month.html:21
msgid "Calendar"
msgstr "Calendário"
-#: core/templates/navigation.html:60
+#: core/templates/navigation.html:64
msgid "Measurements"
msgstr "Medições"
-#: core/templates/navigation.html:70 gallery/templates/images/overview.html:6
+#: core/templates/navigation.html:75 gallery/templates/images/overview.html:6
msgid "Gallery"
msgstr "Galeria"
-#: core/templates/navigation.html:76
+#: core/templates/navigation.html:81
msgid "Workout templates"
msgstr "Modelos de treino"
-#: core/templates/navigation.html:82 manager/views/workout.py:84
+#: core/templates/navigation.html:88 manager/views/workout.py:84
msgid "Your templates"
msgstr "Seus modelos"
-#: core/templates/navigation.html:90 manager/views/workout.py:98
+#: core/templates/navigation.html:97 manager/views/workout.py:98
msgid "Public templates"
msgstr "Modelos públicos"
-#: core/templates/navigation.html:97 manager/forms.py:129
-#: manager/models/setting.py:54 software/templates/features.html:51
+#: core/templates/navigation.html:105 manager/forms.py:129
+#: manager/models/setting.py:57 software/templates/features.html:51
#: software/templates/features.html:459
msgid "Exercises"
msgstr "Exercícios"
-#: core/templates/navigation.html:103 core/templates/navigation.html:170
-#: core/templates/navigation.html:330
+#: core/templates/navigation.html:111 core/templates/navigation.html:184
+#: core/templates/navigation.html:340
msgid "Administration"
msgstr "Administração"
-#: core/templates/navigation.html:106
+#: core/templates/navigation.html:115
msgid "Exercise edit history"
msgstr "Histórico de edição do exercício"
-#: core/templates/navigation.html:111 exercises/models/base.py:103
+#: core/templates/navigation.html:121 exercises/models/base.py:103
msgid "Equipment"
msgstr "Equipamento"
-#: core/templates/navigation.html:116
+#: core/templates/navigation.html:127
msgid "Muscles"
msgstr "Músculos"
-#: core/templates/navigation.html:121
+#: core/templates/navigation.html:133
#: exercises/templates/categories/admin-overview.html:4
msgid "Categories"
msgstr "Categorias"
-#: core/templates/navigation.html:136 software/templates/features.html:447
+#: core/templates/navigation.html:148 software/templates/features.html:447
msgid "Nutrition"
msgstr "Nutrição"
-#: core/templates/navigation.html:143 core/templates/user/overview.html:144
+#: core/templates/navigation.html:156 core/templates/user/overview.html:144
msgid "Nutrition plans"
msgstr "Planos de nutrição"
-#: core/templates/navigation.html:151 nutrition/templates/bmi/form.html:50
+#: core/templates/navigation.html:165 nutrition/templates/bmi/form.html:50
msgid "BMI calculator"
msgstr "Calculadora IMC"
-#: core/templates/navigation.html:159 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:174 nutrition/templates/rate/form.html:17
msgid "Daily calories calculator"
msgstr "Calculador de calorias diárias"
-#: core/templates/navigation.html:165
+#: core/templates/navigation.html:179
#: nutrition/templates/ingredient/overview.html:10
msgid "Ingredient overview"
msgstr "Visão geral do ingrediente"
-#: core/templates/navigation.html:172 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:187 nutrition/templates/units/list.html:6
msgid "Ingredient weight units"
msgstr "Unidade de peso dos ingredientes"
-#: core/templates/navigation.html:177
-#: nutrition/templates/ingredient/pending.html:6
-msgid "Ingredients pending review"
-msgstr "Ingredientes pendendo revisão"
-
-#: core/templates/navigation.html:193 software/templates/features.html:442
+#: core/templates/navigation.html:203 software/templates/features.html:442
msgid "Body weight"
msgstr "Peso Corporal"
-#: core/templates/navigation.html:200 core/templates/user/overview.html:114
+#: core/templates/navigation.html:210 core/templates/user/overview.html:114
msgid "Weight overview"
msgstr "Visão geral do peso"
-#: core/templates/navigation.html:207 weight/views.py:65
+#: core/templates/navigation.html:217 weight/views.py:65
msgid "Add weight entry"
msgstr "Adicionar uma entrada para peso"
-#: core/templates/navigation.html:221
+#: core/templates/navigation.html:231
msgid "About this software"
msgstr "Sobre este software"
-#: core/templates/navigation.html:227 software/templates/about_us.html:5
+#: core/templates/navigation.html:237 software/templates/about_us.html:5
msgid "About us"
msgstr "Sobre nós"
-#: core/templates/navigation.html:233 software/templates/features.html:507
+#: core/templates/navigation.html:243 software/templates/features.html:507
msgid "REST API"
msgstr "API REST"
-#: core/templates/navigation.html:239 utils/models.py:45
+#: core/templates/navigation.html:249 utils/models.py:45
msgid "License"
msgstr "Licença"
-#: core/templates/navigation.html:245
+#: core/templates/navigation.html:255
msgid "Developer documentation"
msgstr "Documentação do desenvolvedor"
-#: core/templates/navigation.html:252
+#: core/templates/navigation.html:262
msgid "Get the code"
msgstr "Obtenha o código fonte"
-#: core/templates/navigation.html:259 core/templates/template.html:212
+#: core/templates/navigation.html:269 core/templates/template.html:214
#: software/templates/features.html:582
msgid "Translate"
msgstr "Traduzir"
-#: core/templates/navigation.html:293 core/templates/user/login.html:28
+#: core/templates/navigation.html:303 core/templates/user/login.html:28
msgid "Reset password"
msgstr "Redefinr a senha"
-#: core/templates/navigation.html:311
+#: core/templates/navigation.html:321
msgid "My preferences"
msgstr "Minhas preferências"
-#: core/templates/navigation.html:320
+#: core/templates/navigation.html:330
msgid "Logout"
msgstr "Sair"
-#: core/templates/navigation.html:343
+#: core/templates/navigation.html:353
msgid "Licenses"
msgstr "Licenças"
-#: core/templates/navigation.html:351
+#: core/templates/navigation.html:361
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr "Unidades de repetição"
-#: core/templates/navigation.html:359 core/templates/weight_unit/list.html:4
-#: nutrition/templates/ingredient/view.html:167
+#: core/templates/navigation.html:369 core/templates/weight_unit/list.html:4
+#: nutrition/templates/ingredient/view.html:141
msgid "Weight units"
msgstr "Unidade de peso"
-#: core/templates/navigation.html:367 core/templates/user/list.html:4
+#: core/templates/navigation.html:377 core/templates/user/list.html:4
msgid "User list"
msgstr "Lista de utilizadores"
-#: core/templates/navigation.html:373
+#: core/templates/navigation.html:383
msgid "Gyms"
msgstr "Academias"
@@ -872,12 +871,12 @@ msgstr "Obrigado por usar o nosso site!"
msgid "The %(site_name)s team"
msgstr "O time do %(site_name)s"
-#: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:11
+#: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:12
msgid "previous"
msgstr "Anterior"
-#: core/templates/tags/pagination.html:31
-#: core/templates/tags/pagination.html:35
+#: core/templates/tags/pagination.html:33
+#: core/templates/tags/pagination.html:38
msgid "next"
msgstr "Próximo"
@@ -902,36 +901,36 @@ msgid "Add exercises to this workout day"
msgstr "Adicione exercícios para este dia de treino"
#: core/templates/tags/render_weight_log.html:17 manager/helpers.py:86
-#: manager/models/setting.py:69 manager/templates/set/formset.html:9
+#: manager/models/setting.py:72 manager/templates/set/formset.html:9
msgid "Reps"
msgstr "Repetições"
#: core/templates/tags/render_weight_log.html:30 manager/forms.py:191
-#: manager/models/log.py:103 manager/models/setting.py:99
+#: manager/models/log.py:103 manager/models/setting.py:102
#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
msgid "RiR"
msgstr "ReR"
-#: core/templates/template.html:120 manager/templates/calendar/month.html:138
-#: manager/templates/schedule/view.html:249
-#: manager/templates/schedule/view.html:270
-#: manager/templates/workout/view.html:86
-#: manager/templates/workout/view.html:139
+#: core/templates/template.html:122 manager/templates/calendar/month.html:138
+#: manager/templates/schedule/view.html:248
+#: manager/templates/schedule/view.html:269
+#: manager/templates/workout/view.html:84
+#: manager/templates/workout/view.html:137
msgid "Close"
msgstr "Fechar"
-#: core/templates/template.html:136
+#: core/templates/template.html:138
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:141
+#: core/templates/template.html:143
msgid "Create some demo entries"
msgstr "Crie alguns registros de demonstração"
-#: core/templates/template.html:178 software/templates/features.html:547
+#: core/templates/template.html:180 software/templates/features.html:547
#: software/templates/tos.html:7
msgid "Terms of service"
msgstr "Termos de uso"
@@ -1033,7 +1032,7 @@ msgid "Overview"
msgstr "Visão geral"
#: core/templates/user/overview.html:28
-#: manager/templates/schedule/view.html:164
+#: manager/templates/schedule/view.html:163
#: manager/templates/workout/overview.html:39 manager/views/schedule_step.py:60
msgid "Add workout"
msgstr "Adicionar treino"
@@ -1041,20 +1040,20 @@ msgstr "Adicionar treino"
#: core/templates/user/overview.html:34 core/templates/user/overview.html:76
#: core/templates/user/overview.html:120 core/templates/user/overview.html:152
#: exercises/models/base.py:118 exercises/models/base.py:124
-#: exercises/models/exercise.py:63 exercises/models/exercise.py:69
+#: exercises/models/exercise.py:64 exercises/models/exercise.py:70
#: exercises/models/image.py:107 exercises/models/image.py:113
#: exercises/models/video.py:163 exercises/models/video.py:169
#: gallery/models/image.py:42 manager/helpers.py:85 manager/models/log.py:100
#: manager/models/session.py:67 measurements/models/measurement.py:47
-#: nutrition/models/ingredient.py:101 nutrition/models/ingredient.py:107
-#: nutrition/models/ingredient.py:222 weight/models.py:33
+#: nutrition/models/ingredient.py:87 nutrition/models/ingredient.py:93
+#: nutrition/models/ingredient.py:216 weight/models.py:51
#: weight/templates/import_csv_preview.html:13
#: weight/templates/import_csv_preview.html:42 weight/views.py:144
msgid "Date"
msgstr "Data"
#: core/templates/user/overview.html:35 core/templates/user/overview.html:153
-#: exercises/models/exercise.py:51 gallery/models/image.py:65
+#: exercises/models/exercise.py:52 gallery/models/image.py:65
#: gym/models/contract.py:58 gym/models/contract.py:109
#: manager/models/day.py:37 manager/models/workout.py:63
#: measurements/models/measurement.py:62 nutrition/models/plan.py:67
@@ -1072,13 +1071,13 @@ msgstr "Última atividade"
#: core/templates/user/overview.html:58
#: manager/templates/calendar/month.html:128
-#: manager/templates/schedule/view.html:145
+#: manager/templates/schedule/view.html:144
#: manager/templates/workout/overview.html:28
msgid "No workouts found."
msgstr "Nenhum treino encontrado."
#: core/templates/user/overview.html:68 manager/forms.py:280
-#: manager/templates/workout/view.html:108
+#: manager/templates/workout/view.html:106
msgid "Log"
msgstr "Log"
@@ -1102,35 +1101,35 @@ msgstr "Tempo"
#: core/templates/user/overview.html:112 core/templates/user/overview.html:121
#: manager/forms.py:186 manager/helpers.py:86 manager/models/log.py:86
-#: manager/models/setting.py:79 manager/templates/log/add.html:54
-#: manager/templates/set/formset.html:11 weight/models.py:35
+#: manager/models/setting.py:82 manager/templates/log/add.html:54
+#: manager/templates/set/formset.html:11 weight/models.py:53
#: weight/templates/import_csv_preview.html:14
#: weight/templates/import_csv_preview.html:43 weight/views.py:144
msgid "Weight"
msgstr "Peso"
-#: core/templates/user/overview.html:154 nutrition/models/ingredient.py:130
-#: nutrition/templates/ingredient/view.html:77 nutrition/views/plan.py:237
+#: core/templates/user/overview.html:154 nutrition/models/ingredient.py:116
+#: nutrition/templates/ingredient/view.html:51 nutrition/views/plan.py:237
msgid "Energy"
msgstr "Energia"
-#: core/templates/user/overview.html:155 nutrition/models/ingredient.py:137
-#: nutrition/templates/ingredient/view.html:84 nutrition/views/plan.py:243
+#: core/templates/user/overview.html:155 nutrition/models/ingredient.py:123
+#: nutrition/templates/ingredient/view.html:58 nutrition/views/plan.py:243
msgid "Protein"
msgstr "Proteína"
-#: core/templates/user/overview.html:156 nutrition/models/ingredient.py:145
-#: nutrition/templates/ingredient/view.html:90 nutrition/views/plan.py:251
+#: core/templates/user/overview.html:156 nutrition/models/ingredient.py:131
+#: nutrition/templates/ingredient/view.html:64 nutrition/views/plan.py:251
msgid "Carbohydrates"
msgstr "Carboidratos"
-#: core/templates/user/overview.html:157 nutrition/models/ingredient.py:163
-#: nutrition/templates/ingredient/view.html:106 nutrition/views/plan.py:265
+#: core/templates/user/overview.html:157 nutrition/models/ingredient.py:149
+#: nutrition/templates/ingredient/view.html:80 nutrition/views/plan.py:265
msgid "Fat"
msgstr "Gordura"
#: core/templates/user/overview.html:170
-#: nutrition/templates/ingredient/view.html:79
+#: nutrition/templates/ingredient/view.html:53
msgid "kcal"
msgstr "kcal"
@@ -1142,7 +1141,7 @@ msgstr "kcal"
#: gym/templates/gym/member_list.html:207
#: gym/templates/gym/member_list.html:240
#: gym/templates/gym/member_list.html:277
-#: manager/templates/schedule/view.html:101
+#: manager/templates/schedule/view.html:100
msgid "Actions"
msgstr "Ações"
@@ -1185,7 +1184,7 @@ msgid "Details"
msgstr "Detalhes"
#: core/templates/user/overview.html:258 gym/views/export.py:57
-#: manager/helpers.py:86 manager/templates/schedule/view.html:99
+#: manager/helpers.py:86 manager/templates/schedule/view.html:98
msgid "Nr."
msgstr "Nr."
@@ -1230,7 +1229,7 @@ msgid "Documents"
msgstr "Documentos"
#: core/templates/user/overview.html:412 gym/templates/document/list.html:32
-#: manager/forms.py:292 manager/templates/workout/view.html:134
+#: manager/forms.py:292 manager/templates/workout/view.html:132
msgid "Download"
msgstr "Descarregar"
@@ -1282,13 +1281,13 @@ msgid "kg"
msgstr "kg"
#: core/templatetags/wger_extras.py:207
-#: nutrition/templates/ingredient/view.html:86
-#: nutrition/templates/ingredient/view.html:92
-#: nutrition/templates/ingredient/view.html:99
-#: nutrition/templates/ingredient/view.html:108
-#: nutrition/templates/ingredient/view.html:115
-#: nutrition/templates/ingredient/view.html:137
-#: nutrition/templates/ingredient/view.html:147
+#: nutrition/templates/ingredient/view.html:60
+#: nutrition/templates/ingredient/view.html:66
+#: nutrition/templates/ingredient/view.html:73
+#: nutrition/templates/ingredient/view.html:82
+#: nutrition/templates/ingredient/view.html:89
+#: nutrition/templates/ingredient/view.html:111
+#: nutrition/templates/ingredient/view.html:121
msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr "g"
@@ -1306,7 +1305,7 @@ msgstr "oz"
#: exercises/views/equipment.py:103 exercises/views/exercises.py:73
#: exercises/views/muscles.py:99 manager/views/schedule.py:309
#: manager/views/schedule_step.py:128 manager/views/workout.py:249
-#: manager/views/workout_session.py:142 nutrition/views/ingredient.py:116
+#: manager/views/workout_session.py:142 nutrition/views/ingredient.py:119
#: nutrition/views/unit.py:110
msgid "Successfully deleted"
msgstr "Apagado com sucesso"
@@ -1318,7 +1317,7 @@ msgstr "Apagado com sucesso"
#: gym/views/admin_notes.py:196 gym/views/document.py:206 gym/views/gym.py:481
#: manager/views/schedule.py:316 manager/views/schedule_step.py:138
#: manager/views/workout.py:253 manager/views/workout_session.py:156
-#: nutrition/views/ingredient.py:123 nutrition/views/unit.py:117
+#: nutrition/views/ingredient.py:126 nutrition/views/unit.py:117
#, python-brace-format
msgid "Delete {0}?"
msgstr "Remover {0}?"
@@ -1331,7 +1330,7 @@ msgstr "Remover {0}?"
#: gym/views/contract.py:186 gym/views/contract_option.py:123
#: gym/views/contract_type.py:123 gym/views/document.py:171
#: gym/views/gym.py:463 manager/views/day.py:100 manager/views/schedule.py:333
-#: manager/views/workout.py:267 nutrition/views/ingredient.py:142
+#: manager/views/workout.py:267 nutrition/views/ingredient.py:145
#: nutrition/views/unit.py:143
#, python-brace-format
msgid "Edit {0}"
@@ -1405,7 +1404,7 @@ msgstr "Academia"
msgid "A verification email was sent to %(email)s"
msgstr "Um e-mail de verificação foi enviado para %(email)s"
-#: exercises/models/base.py:82 nutrition/models/ingredient.py:236
+#: exercises/models/base.py:82 nutrition/models/ingredient.py:230
msgid "Category"
msgstr "Categoria"
@@ -1425,7 +1424,7 @@ msgstr "Variações"
msgid "Exercise Categories"
msgstr "Categorias de exercício"
-#: exercises/models/comment.py:52 exercises/models/exercise_alias.py:52
+#: exercises/models/comment.py:52 exercises/models/exercise_alias.py:53
#: exercises/models/image.py:74 exercises/models/video.py:98
#: manager/forms.py:178 manager/helpers.py:86 manager/models/log.py:52
msgid "Exercise"
@@ -1435,12 +1434,12 @@ msgstr "Exercício"
msgid "A comment about how to correctly do this exercise."
msgstr "Um comentário sobre como executar corretamente este exercício."
-#: exercises/models/exercise.py:76 nutrition/models/ingredient.py:95
+#: exercises/models/exercise.py:77 nutrition/models/ingredient.py:81
#: nutrition/models/weight_unit.py:32
msgid "Language"
msgstr "Idioma"
-#: exercises/models/exercise_alias.py:58
+#: exercises/models/exercise_alias.py:59
msgid "Alias for an exercise"
msgstr "Outro nome para um exercício"
@@ -1573,7 +1572,7 @@ msgstr "Ação"
#: manager/models/schedule.py:44 manager/models/session.py:49
#: manager/models/workout.py:89 measurements/models/category.py:31
#: measurements/models/measurement.py:42 nutrition/models/plan.py:54
-#: nutrition/templates/ingredient/pending.html:16 weight/models.py:42
+#: weight/models.py:60
msgid "User"
msgstr "Utilizador"
@@ -1693,9 +1692,9 @@ msgid "Contract type"
msgstr "Tipo de contrato"
#: gym/models/contract.py:211 gym/templates/contract/view.html:59
-#: manager/templates/log/add.html:52 nutrition/forms.py:62
-#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:105
-#: nutrition/models/meal_item.py:72
+#: manager/templates/log/add.html:52 nutrition/forms.py:63
+#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:108
+#: nutrition/models/meal_item.py:73
msgid "Amount"
msgstr "Quantidade"
@@ -1712,7 +1711,7 @@ msgid "Contract is active"
msgstr "Contrato está ativo"
#: gym/models/contract.py:237 gym/templates/contract/view.html:69
-#: manager/models/schedule.py:61 manager/templates/schedule/view.html:68
+#: manager/models/schedule.py:61 manager/templates/schedule/view.html:67
msgid "Start date"
msgstr "Data início"
@@ -2104,7 +2103,7 @@ msgstr "Gerar visualização"
#: mailer/templates/mailer/gym/form.html:28
#: mailer/templates/mailer/gym/preview.html:62
-#: manager/templates/workout/view.html:42
+#: manager/templates/workout/view.html:40
msgid "Steps"
msgstr "Passos"
@@ -2128,7 +2127,7 @@ msgstr ""
"os e-mails"
#: mailer/templates/mailer/gym/preview.html:22
-#: software/templates/about_us.html:60
+#: software/templates/about_us.html:70
msgid "Current version"
msgstr "Versão atual"
@@ -2161,16 +2160,16 @@ msgstr ""
"Pode pesquisar para mais de um exercício, eles irão ser agrupados juntos num "
"superconjunto."
-#: manager/forms.py:140 nutrition/forms.py:252
+#: manager/forms.py:140 nutrition/forms.py:253
msgid "Also search for names in English"
msgstr "Também buscar nomes em inglês"
#: manager/forms.py:168 manager/forms.py:173 manager/models/log.py:64
-#: manager/models/log.py:92 manager/models/setting.py:59
-#: manager/models/setting.py:90 manager/templates/log/add.html:53
+#: manager/models/log.py:92 manager/models/setting.py:62
+#: manager/models/setting.py:93 manager/templates/log/add.html:53
#: manager/templates/log/add.html:55 manager/templates/set/formset.html:10
#: manager/templates/set/formset.html:12 measurements/models/category.py:41
-#: nutrition/forms.py:66
+#: nutrition/forms.py:67
msgid "Unit"
msgstr "Unidade"
@@ -2178,15 +2177,15 @@ msgstr "Unidade"
msgid "Type"
msgstr "Tipo"
-#: manager/forms.py:280 manager/templates/workout/view.html:115
+#: manager/forms.py:280 manager/templates/workout/view.html:113
msgid "Table"
msgstr "Tabela"
-#: manager/forms.py:282 manager/templates/workout/view.html:121
+#: manager/forms.py:282 manager/templates/workout/view.html:119
msgid "with images"
msgstr "com imagens"
-#: manager/forms.py:283 manager/templates/workout/view.html:127
+#: manager/forms.py:283 manager/templates/workout/view.html:125
msgid "with comments"
msgstr "com comentários"
@@ -2195,11 +2194,10 @@ msgid "Workout will expire soon"
msgstr "Treino irá expirar logo"
#: manager/models/day.py:34 manager/models/log.py:58
-#: manager/models/session.py:60 manager/templates/schedule/view.html:103
-#: manager/templates/workout/view.html:11
-#: manager/templates/workout/view.html:19 manager/views/pdf.py:85
-#: manager/views/pdf.py:161 manager/views/schedule.py:151
-#: manager/views/schedule.py:221
+#: manager/models/session.py:60 manager/templates/schedule/view.html:102
+#: manager/templates/workout/view.html:9 manager/templates/workout/view.html:17
+#: manager/views/pdf.py:85 manager/views/pdf.py:161
+#: manager/views/schedule.py:151 manager/views/schedule.py:221
msgid "Workout"
msgstr "Treino"
@@ -2219,7 +2217,7 @@ msgstr "Dia"
msgid "Name or short description of the schedule. For example 'Program XYZ'."
msgstr "Nome ou descrição curta da agenda. Por exemplo 'Programa XYZ'."
-#: manager/models/schedule.py:65 manager/templates/schedule/view.html:72
+#: manager/models/schedule.py:65 manager/templates/schedule/view.html:71
msgid "Schedule active"
msgstr "Agenda ativa"
@@ -2233,7 +2231,7 @@ msgstr ""
"exercício (irá ser mostrada, por exemplo, na busca). A primeira imagem é "
"automaticamente marcada pelo sistema"
-#: manager/models/schedule.py:77 manager/templates/schedule/view.html:82
+#: manager/models/schedule.py:77 manager/templates/schedule/view.html:81
msgid "Is a loop"
msgstr "É um loop"
@@ -2254,8 +2252,8 @@ msgid "The duration in weeks"
msgstr "A duração em semanas"
#: manager/models/schedule_step.py:64 manager/models/set.py:53
-#: manager/models/setting.py:110 nutrition/models/meal.py:55
-#: nutrition/models/meal_item.py:65
+#: manager/models/setting.py:113 nutrition/models/meal.py:55
+#: nutrition/models/meal_item.py:66
msgid "Order"
msgstr "Ordem"
@@ -2308,7 +2306,7 @@ msgstr "Dia do exercício"
msgid "Number of sets"
msgstr "Número de conjuntos"
-#: manager/models/setting.py:48
+#: manager/models/setting.py:51
msgid "Sets"
msgstr "Conjuntos"
@@ -2384,7 +2382,7 @@ msgstr ""
msgid "Go to current month"
msgstr "Vá para o mês atual"
-#: manager/templates/calendar/month.html:188
+#: manager/templates/calendar/month.html:190
msgid "Add new log"
msgstr "Adicionar um novo registro"
@@ -2424,8 +2422,8 @@ msgid "Your schedules"
msgstr "Seus horários"
#: manager/templates/schedule/overview.html:19
-#: manager/templates/schedule/view.html:132
-#: manager/templates/schedule/view.html:184
+#: manager/templates/schedule/view.html:131
+#: manager/templates/schedule/view.html:183
#: manager/templates/workout/overview.html:16
msgid "active"
msgstr "ativo"
@@ -2472,11 +2470,11 @@ msgstr ""
msgid "Add schedule"
msgstr "Adicionar cronograma"
-#: manager/templates/schedule/view.html:10
+#: manager/templates/schedule/view.html:9
msgid "Schedule"
msgstr "Agendar"
-#: manager/templates/schedule/view.html:86
+#: manager/templates/schedule/view.html:85
msgid ""
"This schedule is a loop and will go through the workouts above till you "
"deactivate it"
@@ -2484,19 +2482,19 @@ msgstr ""
"Este cronograma é um laço de repetição e irá percorrer os treinos acima até "
"que você desative-o"
-#: manager/templates/schedule/view.html:104
+#: manager/templates/schedule/view.html:103
msgid "Weeks"
msgstr "Semanas"
-#: manager/templates/schedule/view.html:116
+#: manager/templates/schedule/view.html:115
msgid "Move me"
msgstr "Me mova"
-#: manager/templates/schedule/view.html:157
+#: manager/templates/schedule/view.html:156
msgid "Start schedule"
msgstr "Começar um cronograma"
-#: manager/templates/schedule/view.html:188
+#: manager/templates/schedule/view.html:187
#, python-format
msgid ""
"%(weeks)s Week\n"
@@ -2511,11 +2509,11 @@ msgstr[1] ""
"%(weeks)s Semanas\n"
" "
-#: manager/templates/schedule/view.html:222
+#: manager/templates/schedule/view.html:221
msgid "Adding workouts"
msgstr "Adicionando treinos"
-#: manager/templates/schedule/view.html:224
+#: manager/templates/schedule/view.html:223
msgid ""
"Add as many workouts to the schedule as you want. You can\n"
" edit the order by dragging and dropping them. It's also possible "
@@ -2527,21 +2525,21 @@ msgstr ""
"adicionar um treino mais\n"
" que uma vez."
-#: manager/templates/schedule/view.html:233
-#: manager/templates/schedule/view.html:244
-#: manager/templates/schedule/view.html:291
-#: manager/templates/workout/view.html:71
-#: manager/templates/workout/view.html:81
-#: manager/templates/workout/view.html:180
+#: manager/templates/schedule/view.html:232
+#: manager/templates/schedule/view.html:243
+#: manager/templates/schedule/view.html:290
+#: manager/templates/workout/view.html:69
+#: manager/templates/workout/view.html:79
+#: manager/templates/workout/view.html:178
msgid "Export calendar file"
msgstr "Exportar ficheiro de calendário"
-#: manager/templates/schedule/view.html:237
+#: manager/templates/schedule/view.html:236
msgid "Export this schedule as a calendar file."
msgstr "Exporte este cronograma com um ficheiro de calendário."
-#: manager/templates/schedule/view.html:238
-#: manager/templates/workout/view.html:76
+#: manager/templates/schedule/view.html:237
+#: manager/templates/workout/view.html:74
msgid ""
"You can then import the file it into your calendar\n"
" application for example google calendar, outlook or "
@@ -2555,18 +2553,18 @@ msgstr ""
" um evento para cada dia de treino, com os exercícios "
"apropriados."
-#: manager/templates/schedule/view.html:259
-#: manager/templates/schedule/view.html:295
-#: manager/templates/workout/view.html:96
-#: manager/templates/workout/view.html:176
+#: manager/templates/schedule/view.html:258
+#: manager/templates/schedule/view.html:294
+#: manager/templates/workout/view.html:94
+#: manager/templates/workout/view.html:174
msgid "Download as PDF"
msgstr "Baixe como PDF"
-#: manager/templates/schedule/view.html:300
+#: manager/templates/schedule/view.html:299
msgid "Edit schedule"
msgstr "Editar cronograma"
-#: manager/templates/schedule/view.html:305
+#: manager/templates/schedule/view.html:304
msgid "Delete schedule"
msgstr "Apagar cronograma"
@@ -2705,12 +2703,12 @@ msgid "Mark as workout"
msgstr "Faça uma cópia deste treino"
#: manager/templates/workout/template_view.html:65
-#: manager/templates/workout/view.html:51
+#: manager/templates/workout/view.html:49
msgid "Muscles trained"
msgstr "Músculos treinados"
#: manager/templates/workout/template_view.html:68
-#: manager/templates/workout/view.html:54
+#: manager/templates/workout/view.html:52
msgid ""
"Images show combined muscles as trained by the exercises on the workout."
msgstr ""
@@ -2721,35 +2719,35 @@ msgstr ""
msgid "Use this template"
msgstr "Compartilha a página"
-#: manager/templates/workout/view.html:45
+#: manager/templates/workout/view.html:43
msgid "Add training days"
msgstr "Adicione dias de treinamento"
-#: manager/templates/workout/view.html:46
+#: manager/templates/workout/view.html:44
msgid "Add workout sets to days"
msgstr "Adicionar conjunto de treinos aos dias"
-#: manager/templates/workout/view.html:47
+#: manager/templates/workout/view.html:45
msgid "Set the repetitions for each set"
msgstr "Defina a repetição para cada conjunto"
-#: manager/templates/workout/view.html:75
+#: manager/templates/workout/view.html:73
msgid "Export this workout as a calendar file."
msgstr "Exporte este treino como um ficheiro de calendário."
-#: manager/templates/workout/view.html:146
+#: manager/templates/workout/view.html:144
msgid "Logs"
msgstr "registros"
-#: manager/templates/workout/view.html:148
+#: manager/templates/workout/view.html:146
msgid "View logs"
msgstr "Ver registros"
-#: manager/templates/workout/view.html:171 manager/views/schedule_step.py:99
+#: manager/templates/workout/view.html:169 manager/views/schedule_step.py:99
msgid "Edit workout"
msgstr "Edite treino"
-#: manager/templates/workout/view.html:184 manager/views/workout.py:281
+#: manager/templates/workout/view.html:182 manager/views/workout.py:281
msgid "Mark as template"
msgstr "Marcar como modelo"
@@ -2796,35 +2794,35 @@ msgstr "Isto apagará todos os logs de pesos para este dia também."
msgid "Value"
msgstr "Valor"
-#: nutrition/forms.py:117
+#: nutrition/forms.py:118
msgid "Height (in)"
msgstr "Altura (pol)"
-#: nutrition/forms.py:120
+#: nutrition/forms.py:121
msgid "Weight (kg)"
msgstr "Peso (kg)"
-#: nutrition/forms.py:120
+#: nutrition/forms.py:121
msgid "Weight (lbs)"
msgstr "Peso (lbs)"
-#: nutrition/forms.py:133
+#: nutrition/forms.py:134
msgid "Calculate"
msgstr "Calcular"
-#: nutrition/forms.py:207 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:208 nutrition/templates/rate/form.html:76
msgid "Basic caloric intake"
msgstr "Ingestão básica de calorias"
-#: nutrition/forms.py:208
+#: nutrition/forms.py:209
msgid "Your basic caloric intake as calculated for your data"
msgstr "Seu consumo calórico básico conforme cálculo baseado em seus dados"
-#: nutrition/forms.py:213
+#: nutrition/forms.py:214
msgid "Additional calories"
msgstr "Calorias adicionais"
-#: nutrition/forms.py:215
+#: nutrition/forms.py:216
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
@@ -2832,71 +2830,55 @@ msgstr ""
"Calorias adicionais para adicionar à taxa básica (para subtrair, entre com "
"um número negativo)"
-#: nutrition/forms.py:248 nutrition/models/ingredient_weight_unit.py:39
-#: nutrition/models/log.py:84 nutrition/models/meal_item.py:53
+#: nutrition/forms.py:249 nutrition/models/ingredient_weight_unit.py:39
+#: nutrition/models/log.py:87 nutrition/models/meal_item.py:54
msgid "Ingredient"
msgstr "Ingrediente"
-#: nutrition/models/ingredient.py:131
+#: nutrition/models/ingredient.py:117
msgid "In kcal per 100g"
msgstr "Em kcal por 100g"
-#: nutrition/models/ingredient.py:138 nutrition/models/ingredient.py:146
-#: nutrition/models/ingredient.py:156 nutrition/models/ingredient.py:164
-#: nutrition/models/ingredient.py:174 nutrition/models/ingredient.py:184
-#: nutrition/models/ingredient.py:194
+#: nutrition/models/ingredient.py:124 nutrition/models/ingredient.py:132
+#: nutrition/models/ingredient.py:142 nutrition/models/ingredient.py:150
+#: nutrition/models/ingredient.py:160 nutrition/models/ingredient.py:170
+#: nutrition/models/ingredient.py:180
msgid "In g per 100g of product"
msgstr "Em g por 100g do produto"
-#: nutrition/models/ingredient.py:155
-#: nutrition/templates/ingredient/view.html:96 nutrition/views/plan.py:259
+#: nutrition/models/ingredient.py:141
+#: nutrition/templates/ingredient/view.html:70 nutrition/views/plan.py:259
msgid "Sugar content in carbohydrates"
msgstr "Açúcar contido nos carboidratos"
-#: nutrition/models/ingredient.py:173
-#: nutrition/templates/ingredient/view.html:112 nutrition/views/plan.py:273
+#: nutrition/models/ingredient.py:159
+#: nutrition/templates/ingredient/view.html:86 nutrition/views/plan.py:273
msgid "Saturated fat content in fats"
msgstr "Gordura saturada contida nas gorduras"
-#: nutrition/models/ingredient.py:183
-#: nutrition/templates/ingredient/view.html:134 nutrition/views/plan.py:279
-msgid "Fibres"
-msgstr "Fibras"
+#: nutrition/models/ingredient.py:169
+#: nutrition/templates/ingredient/view.html:108 nutrition/views/plan.py:279
+msgid "Fiber"
+msgstr ""
-#: nutrition/models/ingredient.py:193
-#: nutrition/templates/ingredient/view.html:144 nutrition/views/plan.py:285
+#: nutrition/models/ingredient.py:179
+#: nutrition/templates/ingredient/view.html:118 nutrition/views/plan.py:285
msgid "Sodium"
msgstr "Sódio"
-#: nutrition/models/ingredient.py:215
+#: nutrition/models/ingredient.py:209
msgid "Link to product"
msgstr "Link para o produto"
-#: nutrition/models/ingredient.py:244
+#: nutrition/models/ingredient.py:238
msgid "Brand name of product"
msgstr "Nome da marca do produto"
-#: nutrition/models/ingredient.py:304
+#: nutrition/models/ingredient.py:305
#, python-brace-format
msgid "The total energy ({self.energy}kcal) is not the approximate sum of the "
msgstr "A energia total ({self.energy}kcal) não é a soma aproximada de. "
-#: nutrition/models/ingredient.py:383 nutrition/views/ingredient.py:196
-msgid "Ingredient was successfully added to the general database"
-msgstr "Ingrediente foi adicionado ao banco de dados geral com sucesso"
-
-#: nutrition/models/ingredient.py:408
-msgid "New user submitted ingredient"
-msgstr "Novo ingrediente submetido por utilizador"
-
-#: nutrition/models/ingredient.py:410
-#, python-brace-format
-msgid ""
-"The user {request.user.username} submitted a new ingredient \"{self.name}\"."
-msgstr ""
-"O utilizador {request.user.username} submeteu um novo ingrediente \"{self."
-"name}\"."
-
#: nutrition/models/ingredient_category.py:31
msgid "Ingredient Categories"
msgstr "Categorias de ingredientes"
@@ -2909,16 +2891,16 @@ msgstr "total em gramas"
msgid "Unit amount, e.g. \"1 Cup\" or \"1/2 spoon\""
msgstr "Unidade para quantidade, ex. \"1 xícara\" ou \"1/2 colher\""
-#: nutrition/models/log.py:49 nutrition/models/meal.py:50
-#: nutrition/models/meal_item.py:47 nutrition/models/plan.py:106
+#: nutrition/models/log.py:52 nutrition/models/meal.py:50
+#: nutrition/models/meal_item.py:48 nutrition/models/plan.py:108
msgid "Nutrition plan"
msgstr "Plano de nutrição"
-#: nutrition/models/log.py:58
+#: nutrition/models/log.py:61
msgid "Meal"
msgstr "Refeição"
-#: nutrition/models/log.py:68
+#: nutrition/models/log.py:71
msgid "Date and Time (Approx.)"
msgstr "Data e Hora (aprox.)"
@@ -2942,11 +2924,11 @@ msgstr ""
"Uma descrição do objetivo do plano, e.x. \"Ganhar mass\" ou \"Preparação "
"para o verão\""
-#: nutrition/models/plan.py:88
+#: nutrition/models/plan.py:90
msgid "Use daily calories"
msgstr "Utilizar as calorias diária"
-#: nutrition/models/plan.py:91
+#: nutrition/models/plan.py:93
msgid ""
"Tick the box if you want to mark this plan as having a goal amount of "
"calories. You can use the calculator or enter the value yourself."
@@ -3073,67 +3055,36 @@ msgstr "Pesquisa"
msgid "Add ingredient"
msgstr "Adicione um ingrediente"
-#: nutrition/templates/ingredient/pending.html:14
-msgid "Submission date"
-msgstr "Data de submissão"
-
-#: nutrition/templates/ingredient/view.html:27
-msgid "Ingredient is pending review"
-msgstr "Ingrediente está com a revisão pendente"
-
-#: nutrition/templates/ingredient/view.html:28
-msgid ""
-"This user submitted ingredient is pending a decision to be\n"
-"included in the database. Till then, it will not be shown in the overview "
-"or\n"
-"the search."
-msgstr ""
-"Este utilizador submeteu um ingrediente que está com decisão pendente sobre "
-"a inclusão no banco de dados. Até então, não será mostrado na visão geral ou "
-"na busca."
-
-#: nutrition/templates/ingredient/view.html:31
-msgid "Please select one of the options below."
-msgstr "Por favor selecione uma das opções abaixo."
-
-#: nutrition/templates/ingredient/view.html:38
-msgid "Accept"
-msgstr "Aceito"
-
-#: nutrition/templates/ingredient/view.html:42
-msgid "Decline"
-msgstr "Recusar"
-
-#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:229
+#: nutrition/templates/ingredient/view.html:45 nutrition/views/plan.py:229
msgid "Macronutrients"
msgstr "Macronutrientes"
-#: nutrition/templates/ingredient/view.html:80
+#: nutrition/templates/ingredient/view.html:54
msgid "kJ"
msgstr "Kj"
-#: nutrition/templates/ingredient/view.html:101
-#: nutrition/templates/ingredient/view.html:117
-#: nutrition/templates/ingredient/view.html:139
-#: nutrition/templates/ingredient/view.html:149
+#: nutrition/templates/ingredient/view.html:75
+#: nutrition/templates/ingredient/view.html:91
+#: nutrition/templates/ingredient/view.html:113
+#: nutrition/templates/ingredient/view.html:123
msgid "n.A."
msgstr "n.d."
-#: nutrition/templates/ingredient/view.html:128
+#: nutrition/templates/ingredient/view.html:102
msgid "Others"
msgstr "Outros"
-#: nutrition/templates/ingredient/view.html:170
+#: nutrition/templates/ingredient/view.html:144
#: nutrition/templates/units/list.html:46 nutrition/views/unit.py:86
msgid "Add new weight unit"
msgstr "Adicione nova unidade de peso"
-#: nutrition/templates/ingredient/view.html:232
-#: nutrition/templates/ingredient/view.html:235
+#: nutrition/templates/ingredient/view.html:206
+#: nutrition/templates/ingredient/view.html:209
msgid "Edit ingredient"
msgstr "Edite ingrediente"
-#: nutrition/templates/ingredient/view.html:239
+#: nutrition/templates/ingredient/view.html:213
msgid "Delete ingredient"
msgstr "Apagar ingrediente"
@@ -3233,14 +3184,10 @@ msgstr "140 a 230"
msgid "56 to 90"
msgstr "56 a 90"
-#: nutrition/views/ingredient.py:154
+#: nutrition/views/ingredient.py:157
msgid "Add a new ingredient"
msgstr "Adicione um novo ingrediente"
-#: nutrition/views/ingredient.py:209
-msgid "Ingredient was successfully marked as rejected"
-msgstr "Ingrediente foi marcado como rejeitado com sucesso"
-
#: nutrition/views/plan.py:120
msgid "Nutritional plan"
msgstr "Plano nutricional"
@@ -3287,18 +3234,10 @@ msgstr ""
"feito por entusiastas do fitness de todo o mundo."
#: software/templates/about_us.html:18
-msgid "Source code"
-msgstr "Código fonte"
-
-#: software/templates/about_us.html:20
-msgid "Get the source code of this application and its server on github"
-msgstr "Obtenha o código fonte deste aplicativo e seu servidor no github"
-
-#: software/templates/about_us.html:25
msgid "Have a problem or idea?"
msgstr "Tem um problema ou ideia?"
-#: software/templates/about_us.html:27
+#: software/templates/about_us.html:20
msgid ""
"Get in touch if something didn't behave as expected or if there is a feature "
"that you feel is missing."
@@ -3306,21 +3245,29 @@ msgstr ""
"Entre em contato se algo não se comportar conforme o esperado ou se houver "
"um recurso que você sente que está faltando."
-#: software/templates/about_us.html:32
+#: software/templates/about_us.html:26
msgid "Say hi!"
msgstr "Diga oi!"
-#: software/templates/about_us.html:34
+#: software/templates/about_us.html:28
msgid "If you want to chat with us, hop on the Discord server and get in touch"
msgstr ""
"Se você quiser conversar conosco, entre no servidor Discord e entre em "
"contato"
-#: software/templates/about_us.html:39 software/templates/features.html:503
+#: software/templates/about_us.html:33
+msgid "Mastodon"
+msgstr ""
+
+#: software/templates/about_us.html:35
+msgid "Follow us on mastodon for updates and news about the project"
+msgstr ""
+
+#: software/templates/about_us.html:40 software/templates/features.html:503
msgid "Translation"
msgstr "Traduzir"
-#: software/templates/about_us.html:41
+#: software/templates/about_us.html:42
msgid ""
"This application is translated on weblate. If you also want to help, click "
"the link and start translating"
@@ -3328,15 +3275,30 @@ msgstr ""
"Este aplicativo é traduzido em weblate. Se você também quiser ajudar, clique "
"no link e comece a traduzir"
-#: software/templates/about_us.html:50
+#: software/templates/about_us.html:47
+msgid "Source code"
+msgstr "Código fonte"
+
+#: software/templates/about_us.html:49
+msgid "Get the source code of this application and its server on github"
+msgstr "Obtenha o código fonte deste aplicativo e seu servidor no github"
+
+#: software/templates/about_us.html:59
msgid "Our goal"
msgstr "Noso objetivo"
-#: software/templates/about_us.html:53
+#: software/templates/about_us.html:62
+#, fuzzy
+#| msgid ""
+#| "The goal is to build an awesome\n"
+#| " and flexible fitness manager, along with a comprehensive "
+#| "and complete list of exercises and\n"
+#| " ingredients, all released under a free license."
msgid ""
"The goal is to build an awesome\n"
" and flexible fitness manager, along with a comprehensive and "
-"complete list of exercises and\n"
+"complete list of\n"
+" exercises and\n"
" ingredients, all released under a free license."
msgstr ""
"O objetivo é construir um incrível\n"
@@ -3352,10 +3314,6 @@ msgstr ""
"wger Workout Manager é uma aplicação web gratuita de código aberto que "
"gerencia os seus exercícios e treinos."
-#: software/templates/features.html:45
-msgid "About"
-msgstr "Sobre"
-
#: software/templates/features.html:57
msgid "Mobile app"
msgstr "Aplicativo móvel"
@@ -3615,18 +3573,6 @@ msgstr ""
"anterior, mas que também tenha conteúdo criativo novo suficiente para "
"intitulá-lo para seu próprio direito autoral."
-#: utils/models.py:130
-msgid "Pending"
-msgstr "Pendente"
-
-#: utils/models.py:131
-msgid "Accepted"
-msgstr "Aceito"
-
-#: utils/models.py:132
-msgid "Declined"
-msgstr "Recusado"
-
#: weight/forms.py:54
msgid "Input"
msgstr "Entrada"
@@ -3639,7 +3585,7 @@ msgstr "Formato da data"
msgid "You have to enter your weight"
msgstr "Você precisa digitar seu peso"
-#: weight/models.py:60
+#: weight/models.py:78
msgid "Weight entry"
msgstr "Registro de peso"
@@ -3783,6 +3729,66 @@ msgstr "Excluído com sucesso."
msgid "Delete weight entry for the %s"
msgstr "Excluir entrada de peso para %s"
+#~ msgid "Ingredients pending review"
+#~ msgstr "Ingredientes pendendo revisão"
+
+#~ msgid "Fibres"
+#~ msgstr "Fibras"
+
+#~ msgid "Ingredient was successfully added to the general database"
+#~ msgstr "Ingrediente foi adicionado ao banco de dados geral com sucesso"
+
+#~ msgid "New user submitted ingredient"
+#~ msgstr "Novo ingrediente submetido por utilizador"
+
+#, python-brace-format
+#~ msgid ""
+#~ "The user {request.user.username} submitted a new ingredient \"{self."
+#~ "name}\"."
+#~ msgstr ""
+#~ "O utilizador {request.user.username} submeteu um novo ingrediente \"{self."
+#~ "name}\"."
+
+#~ msgid "Submission date"
+#~ msgstr "Data de submissão"
+
+#~ msgid "Ingredient is pending review"
+#~ msgstr "Ingrediente está com a revisão pendente"
+
+#~ msgid ""
+#~ "This user submitted ingredient is pending a decision to be\n"
+#~ "included in the database. Till then, it will not be shown in the overview "
+#~ "or\n"
+#~ "the search."
+#~ msgstr ""
+#~ "Este utilizador submeteu um ingrediente que está com decisão pendente "
+#~ "sobre a inclusão no banco de dados. Até então, não será mostrado na visão "
+#~ "geral ou na busca."
+
+#~ msgid "Please select one of the options below."
+#~ msgstr "Por favor selecione uma das opções abaixo."
+
+#~ msgid "Accept"
+#~ msgstr "Aceito"
+
+#~ msgid "Decline"
+#~ msgstr "Recusar"
+
+#~ msgid "Ingredient was successfully marked as rejected"
+#~ msgstr "Ingrediente foi marcado como rejeitado com sucesso"
+
+#~ msgid "About"
+#~ msgstr "Sobre"
+
+#~ msgid "Pending"
+#~ msgstr "Pendente"
+
+#~ msgid "Accepted"
+#~ msgstr "Aceito"
+
+#~ msgid "Declined"
+#~ msgstr "Recusado"
+
#~ msgid "Share"
#~ msgstr "Compartilha"
diff --git a/wger/locale/ro/LC_MESSAGES/django.po b/wger/locale/ro/LC_MESSAGES/django.po
index 92feb6169..7abcc0c1f 100644
--- a/wger/locale/ro/LC_MESSAGES/django.po
+++ b/wger/locale/ro/LC_MESSAGES/django.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: wger Workout Manager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-02-02 12:42+0100\n"
+"POT-Creation-Date: 2024-07-14 15:49+0200\n"
"PO-Revision-Date: 2023-11-24 01:08+0000\n"
"Last-Translator: dimii27 <[email protected]>\n"
"Language-Team: Romanian <https://hosted.weblate.org/projects/wger/web/ro/>\n"
@@ -36,7 +36,7 @@ msgstr ""
"utilizatorii noi înregistrați la această sală și va actualiza toți "
"utilizatorii existenți fără o sală."
-#: config/views/gym_config.py:42 core/templates/language/view.html:63
+#: config/views/gym_config.py:42 core/templates/language/view.html:67
#: core/templates/license/list.html:17 core/templates/misc/license/list.html:18
#: core/templates/repetition_unit/list.html:18
#: core/templates/tags/render_day.html:39
@@ -56,8 +56,8 @@ msgstr ""
#: manager/templates/calendar/day.html:68
#: manager/templates/calendar/month.html:85
#: manager/templates/calendar/partial_overview_table.html:18
-#: manager/templates/schedule/view.html:119
-#: nutrition/templates/ingredient/view.html:191
+#: manager/templates/schedule/view.html:118
+#: nutrition/templates/ingredient/view.html:165
#: nutrition/templates/units/list.html:19
msgid "Edit"
msgstr "Editare"
@@ -92,8 +92,8 @@ msgstr "Programul meu cool de antrenament"
msgid "Empty placeholder schedule"
msgstr "Program substituent gol"
-#: core/forms.py:69 core/templates/navigation.html:275
-#: core/templates/navigation.html:281 core/templates/user/login.html:4
+#: core/forms.py:69 core/templates/navigation.html:285
+#: core/templates/navigation.html:291 core/templates/user/login.html:4
#: software/templates/features.html:82 software/templates/features.html:427
msgid "Login"
msgstr "Login"
@@ -167,7 +167,7 @@ msgstr "Parola"
msgid "Please enter your current password."
msgstr "Te rog introdu parola curentă"
-#: core/forms.py:242 core/templates/language/view.html:68
+#: core/forms.py:242 core/templates/language/view.html:73
#: core/templates/license/list.html:19 core/templates/misc/license/list.html:22
#: core/templates/repetition_unit/list.html:20
#: core/templates/tags/render_day.html:45
@@ -182,10 +182,10 @@ msgstr "Te rog introdu parola curentă"
#: gym/templates/gym/list.html:22 manager/templates/calendar/day.html:73
#: manager/templates/calendar/month.html:89
#: manager/templates/calendar/partial_overview_table.html:23
-#: manager/templates/schedule/view.html:123
-#: manager/templates/workout/view.html:190
-#: nutrition/templates/ingredient/view.html:192
-#: nutrition/templates/ingredient/view.html:241
+#: manager/templates/schedule/view.html:122
+#: manager/templates/workout/view.html:188
+#: nutrition/templates/ingredient/view.html:166
+#: nutrition/templates/ingredient/view.html:215
#: nutrition/templates/units/list.html:22
msgid "Delete"
msgstr "Ștergere"
@@ -198,14 +198,14 @@ msgstr "Parola incorectă"
msgid "The form is secured with reCAPTCHA"
msgstr "Acest formular este securizat cu reCAPTCHA"
-#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:275
-#: core/templates/navigation.html:287 core/templates/template.html:147
+#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:285
+#: core/templates/navigation.html:297 core/templates/template.html:149
#: core/templates/user/login.html:20 core/views/user.py:298
#: software/templates/features.html:87 software/templates/features.html:422
msgid "Register"
msgstr "Inregistreaza-te"
-#: core/forms.py:315
+#: core/forms.py:315 software/templates/features.html:45
msgid "Contact"
msgstr "Contact"
@@ -214,7 +214,7 @@ msgid "Some way of answering you (e-mail, etc.)"
msgstr "Metodă de contactare (e-mail, etc.)"
#: core/forms.py:324 exercises/models/comment.py:58 manager/models/set.py:61
-#: manager/models/setting.py:111 nutrition/models/log.py:74
+#: manager/models/setting.py:114 nutrition/models/log.py:77
msgid "Comment"
msgstr "Comentariu"
@@ -234,6 +234,12 @@ msgstr "Denumirea limbii scurt"
msgid "Language full name"
msgstr "Denumirea limbii complet"
+#: core/models/language.py:45 core/templates/language/view.html:23
+#, fuzzy
+#| msgid "Language full name"
+msgid "Language full name in English"
+msgstr "Denumirea limbii complet"
+
#: core/models/license.py:29
msgid "Full name"
msgstr "Nume complet"
@@ -250,7 +256,7 @@ msgstr ""
msgid "Short name, e.g. CC-BY-SA 3"
msgstr "Nume scurt, de ex. CC-BY-SA 3"
-#: core/models/license.py:45 nutrition/models/ingredient.py:214
+#: core/models/license.py:45 nutrition/models/ingredient.py:208
msgid "Link"
msgstr "Link"
@@ -368,7 +374,7 @@ msgstr ""
msgid "Age"
msgstr ""
-#: core/models/profile.py:230 nutrition/forms.py:117
+#: core/models/profile.py:230 nutrition/forms.py:118
msgid "Height (cm)"
msgstr ""
@@ -419,7 +425,7 @@ msgid "Total caloric intake, including e.g. any surplus"
msgstr ""
#: core/models/profile.py:333 nutrition/models/ingredient_weight_unit.py:45
-#: nutrition/models/log.py:93 nutrition/models/meal_item.py:58
+#: nutrition/models/log.py:96 nutrition/models/meal_item.py:59
msgid "Weight unit"
msgstr ""
@@ -448,17 +454,16 @@ msgstr ""
#: core/models/rep_unit.py:36 core/models/weight_unit.py:36
#: core/templates/user/overview.html:262 core/views/user.py:599
#: exercises/models/category.py:29 exercises/models/equipment.py:29
-#: exercises/models/exercise.py:58 exercises/models/muscle.py:36
+#: exercises/models/exercise.py:59 exercises/models/muscle.py:36
#: gym/models/contract.py:52 gym/models/contract.py:103 gym/models/gym.py:46
#: gym/models/user_document.py:84 gym/templates/contract/view.html:50
#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:96
#: gym/views/gym.py:158 manager/models/schedule.py:55
#: manager/models/workout.py:57 measurements/models/category.py:36
-#: nutrition/models/ingredient.py:125
+#: nutrition/models/ingredient.py:111
#: nutrition/models/ingredient_category.py:27 nutrition/models/meal.py:67
#: nutrition/models/weight_unit.py:38
-#: nutrition/templates/ingredient/pending.html:15
-#: nutrition/templates/ingredient/view.html:178
+#: nutrition/templates/ingredient/view.html:152
msgid "Name"
msgstr "Numele"
@@ -559,24 +564,24 @@ msgstr ""
msgid "Dashboard"
msgstr ""
-#: core/templates/language/overview.html:4 core/templates/navigation.html:335
+#: core/templates/language/overview.html:4 core/templates/navigation.html:345
msgid "Languages"
msgstr "Limbi"
-#: core/templates/language/overview.html:20
+#: core/templates/language/overview.html:22
msgid "Nothing found."
msgstr ""
-#: core/templates/language/overview.html:20
+#: core/templates/language/overview.html:22
#: manager/templates/calendar/month.html:132
#: manager/templates/schedule/overview.html:28
-#: manager/templates/schedule/view.html:145
+#: manager/templates/schedule/view.html:144
#: manager/templates/workout/overview.html:28
#: nutrition/templates/ingredient/overview.html:38
msgid "Add one now."
msgstr ""
-#: core/templates/language/overview.html:33 core/templates/license/list.html:40
+#: core/templates/language/overview.html:35 core/templates/license/list.html:40
#: core/templates/misc/license/list.html:43
#: core/templates/repetition_unit/list.html:43
#: core/templates/user/overview.html:326 core/templates/user/overview.html:365
@@ -596,13 +601,13 @@ msgstr ""
msgid "Add"
msgstr "Adăugare"
-#: core/templates/language/view.html:58 core/templates/user/api_key.html:44
+#: core/templates/language/view.html:61 core/templates/user/api_key.html:44
#: core/templates/user/preferences.html:45 gym/models/contract.py:203
#: gym/templates/contract/view.html:41 gym/templates/contract/view.html:106
#: gym/templates/gym/member_list.html:248
-#: manager/templates/schedule/view.html:286
-#: manager/templates/workout/view.html:165
-#: nutrition/templates/ingredient/view.html:228
+#: manager/templates/schedule/view.html:285
+#: manager/templates/workout/view.html:163
+#: nutrition/templates/ingredient/view.html:202
msgid "Options"
msgstr "Opțiuni"
@@ -627,12 +632,11 @@ msgstr ""
#: gym/templates/gym/member_list.html:299
#: mailer/templates/mailer/gym/overview.html:30
#: manager/templates/calendar/day.html:87
-#: nutrition/templates/ingredient/pending.html:30
#: nutrition/templates/units/list.html:29
msgid "Nothing found"
msgstr ""
-#: core/templates/misc/about.html:4 core/templates/template.html:173
+#: core/templates/misc/about.html:4 core/templates/template.html:175
msgid "Imprint"
msgstr ""
@@ -643,178 +647,173 @@ msgid ""
"entries here."
msgstr ""
-#: core/templates/navigation.html:27 software/templates/features.html:437
+#: core/templates/navigation.html:28 software/templates/features.html:437
msgid "Training"
msgstr "Antrenament"
-#: core/templates/navigation.html:34 core/templates/user/overview.html:25
+#: core/templates/navigation.html:37 core/templates/user/overview.html:25
msgid "Workouts"
msgstr ""
-#: core/templates/navigation.html:42
+#: core/templates/navigation.html:46
msgid "Workouts schedules"
msgstr ""
-#: core/templates/navigation.html:50 core/templates/user/overview.html:70
+#: core/templates/navigation.html:54 core/templates/user/overview.html:70
#: manager/templates/calendar/month.html:10
#: manager/templates/calendar/month.html:21
msgid "Calendar"
msgstr ""
-#: core/templates/navigation.html:60
+#: core/templates/navigation.html:64
msgid "Measurements"
msgstr ""
-#: core/templates/navigation.html:70 gallery/templates/images/overview.html:6
+#: core/templates/navigation.html:75 gallery/templates/images/overview.html:6
msgid "Gallery"
msgstr ""
-#: core/templates/navigation.html:76
+#: core/templates/navigation.html:81
#, fuzzy
#| msgid "Workout reminders"
msgid "Workout templates"
msgstr "Mementouri de antrenament"
-#: core/templates/navigation.html:82 manager/views/workout.py:84
+#: core/templates/navigation.html:88 manager/views/workout.py:84
msgid "Your templates"
msgstr ""
-#: core/templates/navigation.html:90 manager/views/workout.py:98
+#: core/templates/navigation.html:97 manager/views/workout.py:98
msgid "Public templates"
msgstr ""
-#: core/templates/navigation.html:97 manager/forms.py:129
-#: manager/models/setting.py:54 software/templates/features.html:51
+#: core/templates/navigation.html:105 manager/forms.py:129
+#: manager/models/setting.py:57 software/templates/features.html:51
#: software/templates/features.html:459
msgid "Exercises"
msgstr "Exerciții"
-#: core/templates/navigation.html:103 core/templates/navigation.html:170
-#: core/templates/navigation.html:330
+#: core/templates/navigation.html:111 core/templates/navigation.html:184
+#: core/templates/navigation.html:340
msgid "Administration"
msgstr "Administrație"
-#: core/templates/navigation.html:106
+#: core/templates/navigation.html:115
#, fuzzy
#| msgid "Exercise Categories"
msgid "Exercise edit history"
msgstr "Categorii de Exerciții"
-#: core/templates/navigation.html:111 exercises/models/base.py:103
+#: core/templates/navigation.html:121 exercises/models/base.py:103
msgid "Equipment"
msgstr ""
-#: core/templates/navigation.html:116
+#: core/templates/navigation.html:127
msgid "Muscles"
msgstr "Mușchii"
-#: core/templates/navigation.html:121
+#: core/templates/navigation.html:133
#: exercises/templates/categories/admin-overview.html:4
msgid "Categories"
msgstr ""
-#: core/templates/navigation.html:136 software/templates/features.html:447
+#: core/templates/navigation.html:148 software/templates/features.html:447
msgid "Nutrition"
msgstr ""
-#: core/templates/navigation.html:143 core/templates/user/overview.html:144
+#: core/templates/navigation.html:156 core/templates/user/overview.html:144
msgid "Nutrition plans"
msgstr ""
-#: core/templates/navigation.html:151 nutrition/templates/bmi/form.html:50
+#: core/templates/navigation.html:165 nutrition/templates/bmi/form.html:50
msgid "BMI calculator"
msgstr ""
-#: core/templates/navigation.html:159 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:174 nutrition/templates/rate/form.html:17
msgid "Daily calories calculator"
msgstr ""
-#: core/templates/navigation.html:165
+#: core/templates/navigation.html:179
#: nutrition/templates/ingredient/overview.html:10
msgid "Ingredient overview"
msgstr ""
-#: core/templates/navigation.html:172 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:187 nutrition/templates/units/list.html:6
msgid "Ingredient weight units"
msgstr ""
-#: core/templates/navigation.html:177
-#: nutrition/templates/ingredient/pending.html:6
-msgid "Ingredients pending review"
-msgstr ""
-
-#: core/templates/navigation.html:193 software/templates/features.html:442
+#: core/templates/navigation.html:203 software/templates/features.html:442
msgid "Body weight"
msgstr ""
-#: core/templates/navigation.html:200 core/templates/user/overview.html:114
+#: core/templates/navigation.html:210 core/templates/user/overview.html:114
msgid "Weight overview"
msgstr ""
-#: core/templates/navigation.html:207 weight/views.py:65
+#: core/templates/navigation.html:217 weight/views.py:65
msgid "Add weight entry"
msgstr ""
-#: core/templates/navigation.html:221
+#: core/templates/navigation.html:231
msgid "About this software"
msgstr ""
-#: core/templates/navigation.html:227 software/templates/about_us.html:5
+#: core/templates/navigation.html:237 software/templates/about_us.html:5
msgid "About us"
msgstr ""
-#: core/templates/navigation.html:233 software/templates/features.html:507
+#: core/templates/navigation.html:243 software/templates/features.html:507
msgid "REST API"
msgstr ""
-#: core/templates/navigation.html:239 utils/models.py:45
+#: core/templates/navigation.html:249 utils/models.py:45
msgid "License"
msgstr ""
-#: core/templates/navigation.html:245
+#: core/templates/navigation.html:255
msgid "Developer documentation"
msgstr ""
-#: core/templates/navigation.html:252
+#: core/templates/navigation.html:262
msgid "Get the code"
msgstr ""
-#: core/templates/navigation.html:259 core/templates/template.html:212
+#: core/templates/navigation.html:269 core/templates/template.html:214
#: software/templates/features.html:582
msgid "Translate"
msgstr ""
-#: core/templates/navigation.html:293 core/templates/user/login.html:28
+#: core/templates/navigation.html:303 core/templates/user/login.html:28
msgid "Reset password"
msgstr ""
-#: core/templates/navigation.html:311
+#: core/templates/navigation.html:321
msgid "My preferences"
msgstr ""
-#: core/templates/navigation.html:320
+#: core/templates/navigation.html:330
msgid "Logout"
msgstr ""
-#: core/templates/navigation.html:343
+#: core/templates/navigation.html:353
msgid "Licenses"
msgstr ""
-#: core/templates/navigation.html:351
+#: core/templates/navigation.html:361
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr ""
-#: core/templates/navigation.html:359 core/templates/weight_unit/list.html:4
-#: nutrition/templates/ingredient/view.html:167
+#: core/templates/navigation.html:369 core/templates/weight_unit/list.html:4
+#: nutrition/templates/ingredient/view.html:141
msgid "Weight units"
msgstr ""
-#: core/templates/navigation.html:367 core/templates/user/list.html:4
+#: core/templates/navigation.html:377 core/templates/user/list.html:4
msgid "User list"
msgstr ""
-#: core/templates/navigation.html:373
+#: core/templates/navigation.html:383
msgid "Gyms"
msgstr ""
@@ -866,12 +865,12 @@ msgstr "Mulțumiri pentru utilizarea sitului nostru!"
msgid "The %(site_name)s team"
msgstr "Echipa %(site_name)s"
-#: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:11
+#: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:12
msgid "previous"
msgstr ""
-#: core/templates/tags/pagination.html:31
-#: core/templates/tags/pagination.html:35
+#: core/templates/tags/pagination.html:33
+#: core/templates/tags/pagination.html:38
msgid "next"
msgstr ""
@@ -896,34 +895,34 @@ msgid "Add exercises to this workout day"
msgstr ""
#: core/templates/tags/render_weight_log.html:17 manager/helpers.py:86
-#: manager/models/setting.py:69 manager/templates/set/formset.html:9
+#: manager/models/setting.py:72 manager/templates/set/formset.html:9
msgid "Reps"
msgstr ""
#: core/templates/tags/render_weight_log.html:30 manager/forms.py:191
-#: manager/models/log.py:103 manager/models/setting.py:99
+#: manager/models/log.py:103 manager/models/setting.py:102
#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
msgid "RiR"
msgstr ""
-#: core/templates/template.html:120 manager/templates/calendar/month.html:138
-#: manager/templates/schedule/view.html:249
-#: manager/templates/schedule/view.html:270
-#: manager/templates/workout/view.html:86
-#: manager/templates/workout/view.html:139
+#: core/templates/template.html:122 manager/templates/calendar/month.html:138
+#: manager/templates/schedule/view.html:248
+#: manager/templates/schedule/view.html:269
+#: manager/templates/workout/view.html:84
+#: manager/templates/workout/view.html:137
msgid "Close"
msgstr ""
-#: core/templates/template.html:136
+#: core/templates/template.html:138
msgid ""
"You are using a guest account, data entered will be deleted after a week."
msgstr ""
-#: core/templates/template.html:141
+#: core/templates/template.html:143
msgid "Create some demo entries"
msgstr ""
-#: core/templates/template.html:178 software/templates/features.html:547
+#: core/templates/template.html:180 software/templates/features.html:547
#: software/templates/tos.html:7
msgid "Terms of service"
msgstr ""
@@ -1015,7 +1014,7 @@ msgid "Overview"
msgstr ""
#: core/templates/user/overview.html:28
-#: manager/templates/schedule/view.html:164
+#: manager/templates/schedule/view.html:163
#: manager/templates/workout/overview.html:39 manager/views/schedule_step.py:60
msgid "Add workout"
msgstr ""
@@ -1023,20 +1022,20 @@ msgstr ""
#: core/templates/user/overview.html:34 core/templates/user/overview.html:76
#: core/templates/user/overview.html:120 core/templates/user/overview.html:152
#: exercises/models/base.py:118 exercises/models/base.py:124
-#: exercises/models/exercise.py:63 exercises/models/exercise.py:69
+#: exercises/models/exercise.py:64 exercises/models/exercise.py:70
#: exercises/models/image.py:107 exercises/models/image.py:113
#: exercises/models/video.py:163 exercises/models/video.py:169
#: gallery/models/image.py:42 manager/helpers.py:85 manager/models/log.py:100
#: manager/models/session.py:67 measurements/models/measurement.py:47
-#: nutrition/models/ingredient.py:101 nutrition/models/ingredient.py:107
-#: nutrition/models/ingredient.py:222 weight/models.py:33
+#: nutrition/models/ingredient.py:87 nutrition/models/ingredient.py:93
+#: nutrition/models/ingredient.py:216 weight/models.py:51
#: weight/templates/import_csv_preview.html:13
#: weight/templates/import_csv_preview.html:42 weight/views.py:144
msgid "Date"
msgstr "Data"
#: core/templates/user/overview.html:35 core/templates/user/overview.html:153
-#: exercises/models/exercise.py:51 gallery/models/image.py:65
+#: exercises/models/exercise.py:52 gallery/models/image.py:65
#: gym/models/contract.py:58 gym/models/contract.py:109
#: manager/models/day.py:37 manager/models/workout.py:63
#: measurements/models/measurement.py:62 nutrition/models/plan.py:67
@@ -1054,13 +1053,13 @@ msgstr ""
#: core/templates/user/overview.html:58
#: manager/templates/calendar/month.html:128
-#: manager/templates/schedule/view.html:145
+#: manager/templates/schedule/view.html:144
#: manager/templates/workout/overview.html:28
msgid "No workouts found."
msgstr ""
#: core/templates/user/overview.html:68 manager/forms.py:280
-#: manager/templates/workout/view.html:108
+#: manager/templates/workout/view.html:106
msgid "Log"
msgstr ""
@@ -1084,35 +1083,35 @@ msgstr ""
#: core/templates/user/overview.html:112 core/templates/user/overview.html:121
#: manager/forms.py:186 manager/helpers.py:86 manager/models/log.py:86
-#: manager/models/setting.py:79 manager/templates/log/add.html:54
-#: manager/templates/set/formset.html:11 weight/models.py:35
+#: manager/models/setting.py:82 manager/templates/log/add.html:54
+#: manager/templates/set/formset.html:11 weight/models.py:53
#: weight/templates/import_csv_preview.html:14
#: weight/templates/import_csv_preview.html:43 weight/views.py:144
msgid "Weight"
msgstr ""
-#: core/templates/user/overview.html:154 nutrition/models/ingredient.py:130
-#: nutrition/templates/ingredient/view.html:77 nutrition/views/plan.py:237
+#: core/templates/user/overview.html:154 nutrition/models/ingredient.py:116
+#: nutrition/templates/ingredient/view.html:51 nutrition/views/plan.py:237
msgid "Energy"
msgstr ""
-#: core/templates/user/overview.html:155 nutrition/models/ingredient.py:137
-#: nutrition/templates/ingredient/view.html:84 nutrition/views/plan.py:243
+#: core/templates/user/overview.html:155 nutrition/models/ingredient.py:123
+#: nutrition/templates/ingredient/view.html:58 nutrition/views/plan.py:243
msgid "Protein"
msgstr ""
-#: core/templates/user/overview.html:156 nutrition/models/ingredient.py:145
-#: nutrition/templates/ingredient/view.html:90 nutrition/views/plan.py:251
+#: core/templates/user/overview.html:156 nutrition/models/ingredient.py:131
+#: nutrition/templates/ingredient/view.html:64 nutrition/views/plan.py:251
msgid "Carbohydrates"
msgstr ""
-#: core/templates/user/overview.html:157 nutrition/models/ingredient.py:163
-#: nutrition/templates/ingredient/view.html:106 nutrition/views/plan.py:265
+#: core/templates/user/overview.html:157 nutrition/models/ingredient.py:149
+#: nutrition/templates/ingredient/view.html:80 nutrition/views/plan.py:265
msgid "Fat"
msgstr ""
#: core/templates/user/overview.html:170
-#: nutrition/templates/ingredient/view.html:79
+#: nutrition/templates/ingredient/view.html:53
msgid "kcal"
msgstr ""
@@ -1124,7 +1123,7 @@ msgstr ""
#: gym/templates/gym/member_list.html:207
#: gym/templates/gym/member_list.html:240
#: gym/templates/gym/member_list.html:277
-#: manager/templates/schedule/view.html:101
+#: manager/templates/schedule/view.html:100
msgid "Actions"
msgstr ""
@@ -1167,7 +1166,7 @@ msgid "Details"
msgstr ""
#: core/templates/user/overview.html:258 gym/views/export.py:57
-#: manager/helpers.py:86 manager/templates/schedule/view.html:99
+#: manager/helpers.py:86 manager/templates/schedule/view.html:98
msgid "Nr."
msgstr "Nr."
@@ -1212,7 +1211,7 @@ msgid "Documents"
msgstr ""
#: core/templates/user/overview.html:412 gym/templates/document/list.html:32
-#: manager/forms.py:292 manager/templates/workout/view.html:134
+#: manager/forms.py:292 manager/templates/workout/view.html:132
msgid "Download"
msgstr ""
@@ -1263,13 +1262,13 @@ msgid "kg"
msgstr ""
#: core/templatetags/wger_extras.py:207
-#: nutrition/templates/ingredient/view.html:86
-#: nutrition/templates/ingredient/view.html:92
-#: nutrition/templates/ingredient/view.html:99
-#: nutrition/templates/ingredient/view.html:108
-#: nutrition/templates/ingredient/view.html:115
-#: nutrition/templates/ingredient/view.html:137
-#: nutrition/templates/ingredient/view.html:147
+#: nutrition/templates/ingredient/view.html:60
+#: nutrition/templates/ingredient/view.html:66
+#: nutrition/templates/ingredient/view.html:73
+#: nutrition/templates/ingredient/view.html:82
+#: nutrition/templates/ingredient/view.html:89
+#: nutrition/templates/ingredient/view.html:111
+#: nutrition/templates/ingredient/view.html:121
msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr ""
@@ -1287,7 +1286,7 @@ msgstr ""
#: exercises/views/equipment.py:103 exercises/views/exercises.py:73
#: exercises/views/muscles.py:99 manager/views/schedule.py:309
#: manager/views/schedule_step.py:128 manager/views/workout.py:249
-#: manager/views/workout_session.py:142 nutrition/views/ingredient.py:116
+#: manager/views/workout_session.py:142 nutrition/views/ingredient.py:119
#: nutrition/views/unit.py:110
msgid "Successfully deleted"
msgstr ""
@@ -1299,7 +1298,7 @@ msgstr ""
#: gym/views/admin_notes.py:196 gym/views/document.py:206 gym/views/gym.py:481
#: manager/views/schedule.py:316 manager/views/schedule_step.py:138
#: manager/views/workout.py:253 manager/views/workout_session.py:156
-#: nutrition/views/ingredient.py:123 nutrition/views/unit.py:117
+#: nutrition/views/ingredient.py:126 nutrition/views/unit.py:117
#, python-brace-format
msgid "Delete {0}?"
msgstr "Ștergere {0}?"
@@ -1312,7 +1311,7 @@ msgstr "Ștergere {0}?"
#: gym/views/contract.py:186 gym/views/contract_option.py:123
#: gym/views/contract_type.py:123 gym/views/document.py:171
#: gym/views/gym.py:463 manager/views/day.py:100 manager/views/schedule.py:333
-#: manager/views/workout.py:267 nutrition/views/ingredient.py:142
+#: manager/views/workout.py:267 nutrition/views/ingredient.py:145
#: nutrition/views/unit.py:143
#, python-brace-format
msgid "Edit {0}"
@@ -1383,7 +1382,7 @@ msgstr ""
msgid "A verification email was sent to %(email)s"
msgstr ""
-#: exercises/models/base.py:82 nutrition/models/ingredient.py:236
+#: exercises/models/base.py:82 nutrition/models/ingredient.py:230
msgid "Category"
msgstr "Categoria"
@@ -1403,7 +1402,7 @@ msgstr ""
msgid "Exercise Categories"
msgstr "Categorii de Exerciții"
-#: exercises/models/comment.py:52 exercises/models/exercise_alias.py:52
+#: exercises/models/comment.py:52 exercises/models/exercise_alias.py:53
#: exercises/models/image.py:74 exercises/models/video.py:98
#: manager/forms.py:178 manager/helpers.py:86 manager/models/log.py:52
msgid "Exercise"
@@ -1413,12 +1412,12 @@ msgstr "Exercițiu"
msgid "A comment about how to correctly do this exercise."
msgstr "Comentariu despre modul de a face acest exercițiu corect."
-#: exercises/models/exercise.py:76 nutrition/models/ingredient.py:95
+#: exercises/models/exercise.py:77 nutrition/models/ingredient.py:81
#: nutrition/models/weight_unit.py:32
msgid "Language"
msgstr "Limba"
-#: exercises/models/exercise_alias.py:58
+#: exercises/models/exercise_alias.py:59
#, fuzzy
#| msgid "Add new exercise"
msgid "Alias for an exercise"
@@ -1560,7 +1559,7 @@ msgstr "Opțiuni"
#: manager/models/schedule.py:44 manager/models/session.py:49
#: manager/models/workout.py:89 measurements/models/category.py:31
#: measurements/models/measurement.py:42 nutrition/models/plan.py:54
-#: nutrition/templates/ingredient/pending.html:16 weight/models.py:42
+#: weight/models.py:60
msgid "User"
msgstr "Utilizator"
@@ -1684,9 +1683,9 @@ msgid "Contract type"
msgstr ""
#: gym/models/contract.py:211 gym/templates/contract/view.html:59
-#: manager/templates/log/add.html:52 nutrition/forms.py:62
-#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:105
-#: nutrition/models/meal_item.py:72
+#: manager/templates/log/add.html:52 nutrition/forms.py:63
+#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:108
+#: nutrition/models/meal_item.py:73
msgid "Amount"
msgstr ""
@@ -1703,7 +1702,7 @@ msgid "Contract is active"
msgstr ""
#: gym/models/contract.py:237 gym/templates/contract/view.html:69
-#: manager/models/schedule.py:61 manager/templates/schedule/view.html:68
+#: manager/models/schedule.py:61 manager/templates/schedule/view.html:67
msgid "Start date"
msgstr ""
@@ -2095,7 +2094,7 @@ msgstr ""
#: mailer/templates/mailer/gym/form.html:28
#: mailer/templates/mailer/gym/preview.html:62
-#: manager/templates/workout/view.html:42
+#: manager/templates/workout/view.html:40
msgid "Steps"
msgstr ""
@@ -2117,7 +2116,7 @@ msgid ""
msgstr ""
#: mailer/templates/mailer/gym/preview.html:22
-#: software/templates/about_us.html:60
+#: software/templates/about_us.html:70
msgid "Current version"
msgstr ""
@@ -2146,18 +2145,18 @@ msgid ""
"a superset."
msgstr ""
-#: manager/forms.py:140 nutrition/forms.py:252
+#: manager/forms.py:140 nutrition/forms.py:253
#, fuzzy
#| msgid "Also use ingredients in English"
msgid "Also search for names in English"
msgstr "Folosește și ingrediente din limba Engleză"
#: manager/forms.py:168 manager/forms.py:173 manager/models/log.py:64
-#: manager/models/log.py:92 manager/models/setting.py:59
-#: manager/models/setting.py:90 manager/templates/log/add.html:53
+#: manager/models/log.py:92 manager/models/setting.py:62
+#: manager/models/setting.py:93 manager/templates/log/add.html:53
#: manager/templates/log/add.html:55 manager/templates/set/formset.html:10
#: manager/templates/set/formset.html:12 measurements/models/category.py:41
-#: nutrition/forms.py:66
+#: nutrition/forms.py:67
msgid "Unit"
msgstr ""
@@ -2165,15 +2164,15 @@ msgstr ""
msgid "Type"
msgstr ""
-#: manager/forms.py:280 manager/templates/workout/view.html:115
+#: manager/forms.py:280 manager/templates/workout/view.html:113
msgid "Table"
msgstr ""
-#: manager/forms.py:282 manager/templates/workout/view.html:121
+#: manager/forms.py:282 manager/templates/workout/view.html:119
msgid "with images"
msgstr ""
-#: manager/forms.py:283 manager/templates/workout/view.html:127
+#: manager/forms.py:283 manager/templates/workout/view.html:125
msgid "with comments"
msgstr ""
@@ -2182,11 +2181,10 @@ msgid "Workout will expire soon"
msgstr ""
#: manager/models/day.py:34 manager/models/log.py:58
-#: manager/models/session.py:60 manager/templates/schedule/view.html:103
-#: manager/templates/workout/view.html:11
-#: manager/templates/workout/view.html:19 manager/views/pdf.py:85
-#: manager/views/pdf.py:161 manager/views/schedule.py:151
-#: manager/views/schedule.py:221
+#: manager/models/session.py:60 manager/templates/schedule/view.html:102
+#: manager/templates/workout/view.html:9 manager/templates/workout/view.html:17
+#: manager/views/pdf.py:85 manager/views/pdf.py:161
+#: manager/views/schedule.py:151 manager/views/schedule.py:221
msgid "Workout"
msgstr ""
@@ -2204,7 +2202,7 @@ msgstr ""
msgid "Name or short description of the schedule. For example 'Program XYZ'."
msgstr ""
-#: manager/models/schedule.py:65 manager/templates/schedule/view.html:72
+#: manager/models/schedule.py:65 manager/templates/schedule/view.html:71
msgid "Schedule active"
msgstr ""
@@ -2215,7 +2213,7 @@ msgid ""
"inactive"
msgstr ""
-#: manager/models/schedule.py:77 manager/templates/schedule/view.html:82
+#: manager/models/schedule.py:77 manager/templates/schedule/view.html:81
msgid "Is a loop"
msgstr ""
@@ -2234,8 +2232,8 @@ msgid "The duration in weeks"
msgstr ""
#: manager/models/schedule_step.py:64 manager/models/set.py:53
-#: manager/models/setting.py:110 nutrition/models/meal.py:55
-#: nutrition/models/meal_item.py:65
+#: manager/models/setting.py:113 nutrition/models/meal.py:55
+#: nutrition/models/meal_item.py:66
msgid "Order"
msgstr ""
@@ -2285,7 +2283,7 @@ msgstr ""
msgid "Number of sets"
msgstr ""
-#: manager/models/setting.py:48
+#: manager/models/setting.py:51
msgid "Sets"
msgstr ""
@@ -2356,7 +2354,7 @@ msgstr ""
msgid "Go to current month"
msgstr ""
-#: manager/templates/calendar/month.html:188
+#: manager/templates/calendar/month.html:190
msgid "Add new log"
msgstr ""
@@ -2393,8 +2391,8 @@ msgid "Your schedules"
msgstr ""
#: manager/templates/schedule/overview.html:19
-#: manager/templates/schedule/view.html:132
-#: manager/templates/schedule/view.html:184
+#: manager/templates/schedule/view.html:131
+#: manager/templates/schedule/view.html:183
#: manager/templates/workout/overview.html:16
msgid "active"
msgstr ""
@@ -2430,29 +2428,29 @@ msgstr ""
msgid "Add schedule"
msgstr ""
-#: manager/templates/schedule/view.html:10
+#: manager/templates/schedule/view.html:9
msgid "Schedule"
msgstr ""
-#: manager/templates/schedule/view.html:86
+#: manager/templates/schedule/view.html:85
msgid ""
"This schedule is a loop and will go through the workouts above till you "
"deactivate it"
msgstr ""
-#: manager/templates/schedule/view.html:104
+#: manager/templates/schedule/view.html:103
msgid "Weeks"
msgstr ""
-#: manager/templates/schedule/view.html:116
+#: manager/templates/schedule/view.html:115
msgid "Move me"
msgstr ""
-#: manager/templates/schedule/view.html:157
+#: manager/templates/schedule/view.html:156
msgid "Start schedule"
msgstr ""
-#: manager/templates/schedule/view.html:188
+#: manager/templates/schedule/view.html:187
#, python-format
msgid ""
"%(weeks)s Week\n"
@@ -2464,11 +2462,11 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: manager/templates/schedule/view.html:222
+#: manager/templates/schedule/view.html:221
msgid "Adding workouts"
msgstr ""
-#: manager/templates/schedule/view.html:224
+#: manager/templates/schedule/view.html:223
msgid ""
"Add as many workouts to the schedule as you want. You can\n"
" edit the order by dragging and dropping them. It's also possible "
@@ -2476,21 +2474,21 @@ msgid ""
" than once."
msgstr ""
-#: manager/templates/schedule/view.html:233
-#: manager/templates/schedule/view.html:244
-#: manager/templates/schedule/view.html:291
-#: manager/templates/workout/view.html:71
-#: manager/templates/workout/view.html:81
-#: manager/templates/workout/view.html:180
+#: manager/templates/schedule/view.html:232
+#: manager/templates/schedule/view.html:243
+#: manager/templates/schedule/view.html:290
+#: manager/templates/workout/view.html:69
+#: manager/templates/workout/view.html:79
+#: manager/templates/workout/view.html:178
msgid "Export calendar file"
msgstr ""
-#: manager/templates/schedule/view.html:237
+#: manager/templates/schedule/view.html:236
msgid "Export this schedule as a calendar file."
msgstr ""
-#: manager/templates/schedule/view.html:238
-#: manager/templates/workout/view.html:76
+#: manager/templates/schedule/view.html:237
+#: manager/templates/workout/view.html:74
msgid ""
"You can then import the file it into your calendar\n"
" application for example google calendar, outlook or "
@@ -2499,18 +2497,18 @@ msgid ""
"appropriate exercises."
msgstr ""
-#: manager/templates/schedule/view.html:259
-#: manager/templates/schedule/view.html:295
-#: manager/templates/workout/view.html:96
-#: manager/templates/workout/view.html:176
+#: manager/templates/schedule/view.html:258
+#: manager/templates/schedule/view.html:294
+#: manager/templates/workout/view.html:94
+#: manager/templates/workout/view.html:174
msgid "Download as PDF"
msgstr ""
-#: manager/templates/schedule/view.html:300
+#: manager/templates/schedule/view.html:299
msgid "Edit schedule"
msgstr ""
-#: manager/templates/schedule/view.html:305
+#: manager/templates/schedule/view.html:304
msgid "Delete schedule"
msgstr ""
@@ -2628,12 +2626,12 @@ msgid "Mark as workout"
msgstr ""
#: manager/templates/workout/template_view.html:65
-#: manager/templates/workout/view.html:51
+#: manager/templates/workout/view.html:49
msgid "Muscles trained"
msgstr ""
#: manager/templates/workout/template_view.html:68
-#: manager/templates/workout/view.html:54
+#: manager/templates/workout/view.html:52
msgid ""
"Images show combined muscles as trained by the exercises on the workout."
msgstr ""
@@ -2642,35 +2640,35 @@ msgstr ""
msgid "Use this template"
msgstr ""
-#: manager/templates/workout/view.html:45
+#: manager/templates/workout/view.html:43
msgid "Add training days"
msgstr ""
-#: manager/templates/workout/view.html:46
+#: manager/templates/workout/view.html:44
msgid "Add workout sets to days"
msgstr ""
-#: manager/templates/workout/view.html:47
+#: manager/templates/workout/view.html:45
msgid "Set the repetitions for each set"
msgstr ""
-#: manager/templates/workout/view.html:75
+#: manager/templates/workout/view.html:73
msgid "Export this workout as a calendar file."
msgstr ""
-#: manager/templates/workout/view.html:146
+#: manager/templates/workout/view.html:144
msgid "Logs"
msgstr ""
-#: manager/templates/workout/view.html:148
+#: manager/templates/workout/view.html:146
msgid "View logs"
msgstr ""
-#: manager/templates/workout/view.html:171 manager/views/schedule_step.py:99
+#: manager/templates/workout/view.html:169 manager/views/schedule_step.py:99
msgid "Edit workout"
msgstr ""
-#: manager/templates/workout/view.html:184 manager/views/workout.py:281
+#: manager/templates/workout/view.html:182 manager/views/workout.py:281
msgid "Mark as template"
msgstr ""
@@ -2717,109 +2715,95 @@ msgstr ""
msgid "Value"
msgstr ""
-#: nutrition/forms.py:117
+#: nutrition/forms.py:118
#, fuzzy
#| msgid "Weight log"
msgid "Height (in)"
msgstr "Jurnalul de greutate"
-#: nutrition/forms.py:120
+#: nutrition/forms.py:121
#, fuzzy
#| msgid "Weight log"
msgid "Weight (kg)"
msgstr "Jurnalul de greutate"
-#: nutrition/forms.py:120
+#: nutrition/forms.py:121
#, fuzzy
#| msgid "Weight log"
msgid "Weight (lbs)"
msgstr "Jurnalul de greutate"
-#: nutrition/forms.py:133
+#: nutrition/forms.py:134
msgid "Calculate"
msgstr ""
-#: nutrition/forms.py:207 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:208 nutrition/templates/rate/form.html:76
msgid "Basic caloric intake"
msgstr ""
-#: nutrition/forms.py:208
+#: nutrition/forms.py:209
msgid "Your basic caloric intake as calculated for your data"
msgstr ""
-#: nutrition/forms.py:213
+#: nutrition/forms.py:214
msgid "Additional calories"
msgstr ""
-#: nutrition/forms.py:215
+#: nutrition/forms.py:216
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
msgstr ""
-#: nutrition/forms.py:248 nutrition/models/ingredient_weight_unit.py:39
-#: nutrition/models/log.py:84 nutrition/models/meal_item.py:53
+#: nutrition/forms.py:249 nutrition/models/ingredient_weight_unit.py:39
+#: nutrition/models/log.py:87 nutrition/models/meal_item.py:54
msgid "Ingredient"
msgstr ""
-#: nutrition/models/ingredient.py:131
+#: nutrition/models/ingredient.py:117
msgid "In kcal per 100g"
msgstr ""
-#: nutrition/models/ingredient.py:138 nutrition/models/ingredient.py:146
-#: nutrition/models/ingredient.py:156 nutrition/models/ingredient.py:164
-#: nutrition/models/ingredient.py:174 nutrition/models/ingredient.py:184
-#: nutrition/models/ingredient.py:194
+#: nutrition/models/ingredient.py:124 nutrition/models/ingredient.py:132
+#: nutrition/models/ingredient.py:142 nutrition/models/ingredient.py:150
+#: nutrition/models/ingredient.py:160 nutrition/models/ingredient.py:170
+#: nutrition/models/ingredient.py:180
msgid "In g per 100g of product"
msgstr ""
-#: nutrition/models/ingredient.py:155
-#: nutrition/templates/ingredient/view.html:96 nutrition/views/plan.py:259
+#: nutrition/models/ingredient.py:141
+#: nutrition/templates/ingredient/view.html:70 nutrition/views/plan.py:259
msgid "Sugar content in carbohydrates"
msgstr ""
-#: nutrition/models/ingredient.py:173
-#: nutrition/templates/ingredient/view.html:112 nutrition/views/plan.py:273
+#: nutrition/models/ingredient.py:159
+#: nutrition/templates/ingredient/view.html:86 nutrition/views/plan.py:273
msgid "Saturated fat content in fats"
msgstr ""
-#: nutrition/models/ingredient.py:183
-#: nutrition/templates/ingredient/view.html:134 nutrition/views/plan.py:279
-msgid "Fibres"
+#: nutrition/models/ingredient.py:169
+#: nutrition/templates/ingredient/view.html:108 nutrition/views/plan.py:279
+msgid "Fiber"
msgstr ""
-#: nutrition/models/ingredient.py:193
-#: nutrition/templates/ingredient/view.html:144 nutrition/views/plan.py:285
+#: nutrition/models/ingredient.py:179
+#: nutrition/templates/ingredient/view.html:118 nutrition/views/plan.py:285
msgid "Sodium"
msgstr ""
-#: nutrition/models/ingredient.py:215
+#: nutrition/models/ingredient.py:209
msgid "Link to product"
msgstr ""
-#: nutrition/models/ingredient.py:244
+#: nutrition/models/ingredient.py:238
msgid "Brand name of product"
msgstr ""
-#: nutrition/models/ingredient.py:304
+#: nutrition/models/ingredient.py:305
#, python-brace-format
msgid "The total energy ({self.energy}kcal) is not the approximate sum of the "
msgstr ""
-#: nutrition/models/ingredient.py:383 nutrition/views/ingredient.py:196
-msgid "Ingredient was successfully added to the general database"
-msgstr ""
-
-#: nutrition/models/ingredient.py:408
-msgid "New user submitted ingredient"
-msgstr ""
-
-#: nutrition/models/ingredient.py:410
-#, python-brace-format
-msgid ""
-"The user {request.user.username} submitted a new ingredient \"{self.name}\"."
-msgstr ""
-
#: nutrition/models/ingredient_category.py:31
msgid "Ingredient Categories"
msgstr ""
@@ -2832,16 +2816,16 @@ msgstr ""
msgid "Unit amount, e.g. \"1 Cup\" or \"1/2 spoon\""
msgstr ""
-#: nutrition/models/log.py:49 nutrition/models/meal.py:50
-#: nutrition/models/meal_item.py:47 nutrition/models/plan.py:106
+#: nutrition/models/log.py:52 nutrition/models/meal.py:50
+#: nutrition/models/meal_item.py:48 nutrition/models/plan.py:108
msgid "Nutrition plan"
msgstr ""
-#: nutrition/models/log.py:58
+#: nutrition/models/log.py:61
msgid "Meal"
msgstr ""
-#: nutrition/models/log.py:68
+#: nutrition/models/log.py:71
msgid "Date and Time (Approx.)"
msgstr ""
@@ -2861,11 +2845,11 @@ msgid ""
"summer\""
msgstr ""
-#: nutrition/models/plan.py:88
+#: nutrition/models/plan.py:90
msgid "Use daily calories"
msgstr ""
-#: nutrition/models/plan.py:91
+#: nutrition/models/plan.py:93
msgid ""
"Tick the box if you want to mark this plan as having a goal amount of "
"calories. You can use the calculator or enter the value yourself."
@@ -2977,64 +2961,36 @@ msgstr "Căutare"
msgid "Add ingredient"
msgstr ""
-#: nutrition/templates/ingredient/pending.html:14
-msgid "Submission date"
-msgstr "Data depunerii"
-
-#: nutrition/templates/ingredient/view.html:27
-msgid "Ingredient is pending review"
-msgstr ""
-
-#: nutrition/templates/ingredient/view.html:28
-msgid ""
-"This user submitted ingredient is pending a decision to be\n"
-"included in the database. Till then, it will not be shown in the overview "
-"or\n"
-"the search."
-msgstr ""
-
-#: nutrition/templates/ingredient/view.html:31
-msgid "Please select one of the options below."
-msgstr "Selectați una dintre opțiunile de mai jos."
-
-#: nutrition/templates/ingredient/view.html:38
-msgid "Accept"
-msgstr "Acceptare"
-
-#: nutrition/templates/ingredient/view.html:42
-msgid "Decline"
-msgstr "Declinare"
-
-#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:229
+#: nutrition/templates/ingredient/view.html:45 nutrition/views/plan.py:229
msgid "Macronutrients"
msgstr ""
-#: nutrition/templates/ingredient/view.html:80
+#: nutrition/templates/ingredient/view.html:54
msgid "kJ"
msgstr ""
-#: nutrition/templates/ingredient/view.html:101
-#: nutrition/templates/ingredient/view.html:117
-#: nutrition/templates/ingredient/view.html:139
-#: nutrition/templates/ingredient/view.html:149
+#: nutrition/templates/ingredient/view.html:75
+#: nutrition/templates/ingredient/view.html:91
+#: nutrition/templates/ingredient/view.html:113
+#: nutrition/templates/ingredient/view.html:123
msgid "n.A."
msgstr ""
-#: nutrition/templates/ingredient/view.html:128
+#: nutrition/templates/ingredient/view.html:102
msgid "Others"
msgstr ""
-#: nutrition/templates/ingredient/view.html:170
+#: nutrition/templates/ingredient/view.html:144
#: nutrition/templates/units/list.html:46 nutrition/views/unit.py:86
msgid "Add new weight unit"
msgstr ""
-#: nutrition/templates/ingredient/view.html:232
-#: nutrition/templates/ingredient/view.html:235
+#: nutrition/templates/ingredient/view.html:206
+#: nutrition/templates/ingredient/view.html:209
msgid "Edit ingredient"
msgstr ""
-#: nutrition/templates/ingredient/view.html:239
+#: nutrition/templates/ingredient/view.html:213
msgid "Delete ingredient"
msgstr ""
@@ -3118,14 +3074,10 @@ msgstr ""
msgid "56 to 90"
msgstr ""
-#: nutrition/views/ingredient.py:154
+#: nutrition/views/ingredient.py:157
msgid "Add a new ingredient"
msgstr ""
-#: nutrition/views/ingredient.py:209
-msgid "Ingredient was successfully marked as rejected"
-msgstr ""
-
#: nutrition/views/plan.py:120
msgid "Nutritional plan"
msgstr ""
@@ -3170,50 +3122,59 @@ msgid ""
msgstr ""
#: software/templates/about_us.html:18
-msgid "Source code"
-msgstr ""
-
-#: software/templates/about_us.html:20
-msgid "Get the source code of this application and its server on github"
-msgstr ""
-
-#: software/templates/about_us.html:25
msgid "Have a problem or idea?"
msgstr ""
-#: software/templates/about_us.html:27
+#: software/templates/about_us.html:20
msgid ""
"Get in touch if something didn't behave as expected or if there is a feature "
"that you feel is missing."
msgstr ""
-#: software/templates/about_us.html:32
+#: software/templates/about_us.html:26
msgid "Say hi!"
msgstr ""
-#: software/templates/about_us.html:34
+#: software/templates/about_us.html:28
msgid "If you want to chat with us, hop on the Discord server and get in touch"
msgstr ""
-#: software/templates/about_us.html:39 software/templates/features.html:503
+#: software/templates/about_us.html:33
+msgid "Mastodon"
+msgstr ""
+
+#: software/templates/about_us.html:35
+msgid "Follow us on mastodon for updates and news about the project"
+msgstr ""
+
+#: software/templates/about_us.html:40 software/templates/features.html:503
msgid "Translation"
msgstr ""
-#: software/templates/about_us.html:41
+#: software/templates/about_us.html:42
msgid ""
"This application is translated on weblate. If you also want to help, click "
"the link and start translating"
msgstr ""
-#: software/templates/about_us.html:50
+#: software/templates/about_us.html:47
+msgid "Source code"
+msgstr ""
+
+#: software/templates/about_us.html:49
+msgid "Get the source code of this application and its server on github"
+msgstr ""
+
+#: software/templates/about_us.html:59
msgid "Our goal"
msgstr ""
-#: software/templates/about_us.html:53
+#: software/templates/about_us.html:62
msgid ""
"The goal is to build an awesome\n"
" and flexible fitness manager, along with a comprehensive and "
-"complete list of exercises and\n"
+"complete list of\n"
+" exercises and\n"
" ingredients, all released under a free license."
msgstr ""
@@ -3223,10 +3184,6 @@ msgid ""
"your exercises and workouts."
msgstr ""
-#: software/templates/features.html:45
-msgid "About"
-msgstr ""
-
#: software/templates/features.html:57
msgid "Mobile app"
msgstr ""
@@ -3466,18 +3423,6 @@ msgid ""
"to its own copyright."
msgstr ""
-#: utils/models.py:130
-msgid "Pending"
-msgstr "în așteptare"
-
-#: utils/models.py:131
-msgid "Accepted"
-msgstr "Acceptat"
-
-#: utils/models.py:132
-msgid "Declined"
-msgstr "Declinat"
-
#: weight/forms.py:54
msgid "Input"
msgstr ""
@@ -3490,7 +3435,7 @@ msgstr ""
msgid "You have to enter your weight"
msgstr ""
-#: weight/models.py:60
+#: weight/models.py:78
msgid "Weight entry"
msgstr ""
@@ -3609,6 +3554,27 @@ msgstr "Șters cu succes."
msgid "Delete weight entry for the %s"
msgstr "Ștergeți greutatea pentru %s"
+#~ msgid "Submission date"
+#~ msgstr "Data depunerii"
+
+#~ msgid "Please select one of the options below."
+#~ msgstr "Selectați una dintre opțiunile de mai jos."
+
+#~ msgid "Accept"
+#~ msgstr "Acceptare"
+
+#~ msgid "Decline"
+#~ msgstr "Declinare"
+
+#~ msgid "Pending"
+#~ msgstr "în așteptare"
+
+#~ msgid "Accepted"
+#~ msgstr "Acceptat"
+
+#~ msgid "Declined"
+#~ msgstr "Declinat"
+
#~ msgid "Export as CSV"
#~ msgstr "Exportați ca CSV"
diff --git a/wger/locale/ru/LC_MESSAGES/django.po b/wger/locale/ru/LC_MESSAGES/django.po
index a2da580f6..01e28c4d4 100644
--- a/wger/locale/ru/LC_MESSAGES/django.po
+++ b/wger/locale/ru/LC_MESSAGES/django.po
@@ -14,7 +14,7 @@ msgid ""
msgstr ""
"Project-Id-Version: wger Workout Manager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-02-02 12:42+0100\n"
+"POT-Creation-Date: 2024-07-14 15:49+0200\n"
"PO-Revision-Date: 2022-05-24 21:14+0000\n"
"Last-Translator: Konstantin <[email protected]>\n"
"Language-Team: Russian <https://hosted.weblate.org/projects/wger/web/ru/>\n"
@@ -40,7 +40,7 @@ msgstr ""
"новых зарегистрированных пользователей в этот спортзал и обновит всех "
"существующих пользователей без тренажерный зала."
-#: config/views/gym_config.py:42 core/templates/language/view.html:63
+#: config/views/gym_config.py:42 core/templates/language/view.html:67
#: core/templates/license/list.html:17 core/templates/misc/license/list.html:18
#: core/templates/repetition_unit/list.html:18
#: core/templates/tags/render_day.html:39
@@ -60,8 +60,8 @@ msgstr ""
#: manager/templates/calendar/day.html:68
#: manager/templates/calendar/month.html:85
#: manager/templates/calendar/partial_overview_table.html:18
-#: manager/templates/schedule/view.html:119
-#: nutrition/templates/ingredient/view.html:191
+#: manager/templates/schedule/view.html:118
+#: nutrition/templates/ingredient/view.html:165
#: nutrition/templates/units/list.html:19
msgid "Edit"
msgstr "Редактировать"
@@ -97,8 +97,8 @@ msgstr "Моя прикольная программа тренировки"
msgid "Empty placeholder schedule"
msgstr "Пустая программа-«заполнитель»"
-#: core/forms.py:69 core/templates/navigation.html:275
-#: core/templates/navigation.html:281 core/templates/user/login.html:4
+#: core/forms.py:69 core/templates/navigation.html:285
+#: core/templates/navigation.html:291 core/templates/user/login.html:4
#: software/templates/features.html:82 software/templates/features.html:427
msgid "Login"
msgstr "Войти"
@@ -170,7 +170,7 @@ msgstr "Пароль"
msgid "Please enter your current password."
msgstr "Пожалуйста, введите ваш пароль."
-#: core/forms.py:242 core/templates/language/view.html:68
+#: core/forms.py:242 core/templates/language/view.html:73
#: core/templates/license/list.html:19 core/templates/misc/license/list.html:22
#: core/templates/repetition_unit/list.html:20
#: core/templates/tags/render_day.html:45
@@ -185,10 +185,10 @@ msgstr "Пожалуйста, введите ваш пароль."
#: gym/templates/gym/list.html:22 manager/templates/calendar/day.html:73
#: manager/templates/calendar/month.html:89
#: manager/templates/calendar/partial_overview_table.html:23
-#: manager/templates/schedule/view.html:123
-#: manager/templates/workout/view.html:190
-#: nutrition/templates/ingredient/view.html:192
-#: nutrition/templates/ingredient/view.html:241
+#: manager/templates/schedule/view.html:122
+#: manager/templates/workout/view.html:188
+#: nutrition/templates/ingredient/view.html:166
+#: nutrition/templates/ingredient/view.html:215
#: nutrition/templates/units/list.html:22
msgid "Delete"
msgstr "Удалить"
@@ -201,14 +201,14 @@ msgstr "Неверный пароль"
msgid "The form is secured with reCAPTCHA"
msgstr "Данная форма защищена reCAPTCHA"
-#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:275
-#: core/templates/navigation.html:287 core/templates/template.html:147
+#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:285
+#: core/templates/navigation.html:297 core/templates/template.html:149
#: core/templates/user/login.html:20 core/views/user.py:298
#: software/templates/features.html:87 software/templates/features.html:422
msgid "Register"
msgstr "Зарегистрироваться"
-#: core/forms.py:315
+#: core/forms.py:315 software/templates/features.html:45
msgid "Contact"
msgstr "Контакт"
@@ -217,7 +217,7 @@ msgid "Some way of answering you (e-mail, etc.)"
msgstr "Обратная связь с вами (электронная почта, и т.д.)"
#: core/forms.py:324 exercises/models/comment.py:58 manager/models/set.py:61
-#: manager/models/setting.py:111 nutrition/models/log.py:74
+#: manager/models/setting.py:114 nutrition/models/log.py:77
msgid "Comment"
msgstr "Комментарий"
@@ -237,6 +237,12 @@ msgstr "Короткое обозночение языка"
msgid "Language full name"
msgstr "Полное обозночение языка"
+#: core/models/language.py:45 core/templates/language/view.html:23
+#, fuzzy
+#| msgid "Language full name"
+msgid "Language full name in English"
+msgstr "Полное обозночение языка"
+
#: core/models/license.py:29
msgid "Full name"
msgstr "Полное название"
@@ -253,7 +259,7 @@ msgstr ""
msgid "Short name, e.g. CC-BY-SA 3"
msgstr "Краткое название, например, CC-BY-SA 3"
-#: core/models/license.py:45 nutrition/models/ingredient.py:214
+#: core/models/license.py:45 nutrition/models/ingredient.py:208
msgid "Link"
msgstr "Ссылка"
@@ -371,7 +377,7 @@ msgstr ""
msgid "Age"
msgstr "Возраст"
-#: core/models/profile.py:230 nutrition/forms.py:117
+#: core/models/profile.py:230 nutrition/forms.py:118
msgid "Height (cm)"
msgstr "Рост (см)"
@@ -422,7 +428,7 @@ msgid "Total caloric intake, including e.g. any surplus"
msgstr "Общее потребление калорий, в том числе, любой излишек"
#: core/models/profile.py:333 nutrition/models/ingredient_weight_unit.py:45
-#: nutrition/models/log.py:93 nutrition/models/meal_item.py:58
+#: nutrition/models/log.py:96 nutrition/models/meal_item.py:59
msgid "Weight unit"
msgstr "Единица веса"
@@ -454,17 +460,16 @@ msgstr "Сумма всех часов должна быть 24"
#: core/models/rep_unit.py:36 core/models/weight_unit.py:36
#: core/templates/user/overview.html:262 core/views/user.py:599
#: exercises/models/category.py:29 exercises/models/equipment.py:29
-#: exercises/models/exercise.py:58 exercises/models/muscle.py:36
+#: exercises/models/exercise.py:59 exercises/models/muscle.py:36
#: gym/models/contract.py:52 gym/models/contract.py:103 gym/models/gym.py:46
#: gym/models/user_document.py:84 gym/templates/contract/view.html:50
#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:96
#: gym/views/gym.py:158 manager/models/schedule.py:55
#: manager/models/workout.py:57 measurements/models/category.py:36
-#: nutrition/models/ingredient.py:125
+#: nutrition/models/ingredient.py:111
#: nutrition/models/ingredient_category.py:27 nutrition/models/meal.py:67
#: nutrition/models/weight_unit.py:38
-#: nutrition/templates/ingredient/pending.html:15
-#: nutrition/templates/ingredient/view.html:178
+#: nutrition/templates/ingredient/view.html:152
msgid "Name"
msgstr "Имя"
@@ -575,24 +580,24 @@ msgstr ""
msgid "Dashboard"
msgstr "Панель управления"
-#: core/templates/language/overview.html:4 core/templates/navigation.html:335
+#: core/templates/language/overview.html:4 core/templates/navigation.html:345
msgid "Languages"
msgstr "Языки"
-#: core/templates/language/overview.html:20
+#: core/templates/language/overview.html:22
msgid "Nothing found."
msgstr "Ничего не найдено."
-#: core/templates/language/overview.html:20
+#: core/templates/language/overview.html:22
#: manager/templates/calendar/month.html:132
#: manager/templates/schedule/overview.html:28
-#: manager/templates/schedule/view.html:145
+#: manager/templates/schedule/view.html:144
#: manager/templates/workout/overview.html:28
#: nutrition/templates/ingredient/overview.html:38
msgid "Add one now."
msgstr "Добавить одну сейчас."
-#: core/templates/language/overview.html:33 core/templates/license/list.html:40
+#: core/templates/language/overview.html:35 core/templates/license/list.html:40
#: core/templates/misc/license/list.html:43
#: core/templates/repetition_unit/list.html:43
#: core/templates/user/overview.html:326 core/templates/user/overview.html:365
@@ -612,13 +617,13 @@ msgstr "Добавить одну сейчас."
msgid "Add"
msgstr "Добавить"
-#: core/templates/language/view.html:58 core/templates/user/api_key.html:44
+#: core/templates/language/view.html:61 core/templates/user/api_key.html:44
#: core/templates/user/preferences.html:45 gym/models/contract.py:203
#: gym/templates/contract/view.html:41 gym/templates/contract/view.html:106
#: gym/templates/gym/member_list.html:248
-#: manager/templates/schedule/view.html:286
-#: manager/templates/workout/view.html:165
-#: nutrition/templates/ingredient/view.html:228
+#: manager/templates/schedule/view.html:285
+#: manager/templates/workout/view.html:163
+#: nutrition/templates/ingredient/view.html:202
msgid "Options"
msgstr "Опции"
@@ -643,12 +648,11 @@ msgstr "Список лицензий"
#: gym/templates/gym/member_list.html:299
#: mailer/templates/mailer/gym/overview.html:30
#: manager/templates/calendar/day.html:87
-#: nutrition/templates/ingredient/pending.html:30
#: nutrition/templates/units/list.html:29
msgid "Nothing found"
msgstr "Ничего не найдено"
-#: core/templates/misc/about.html:4 core/templates/template.html:173
+#: core/templates/misc/about.html:4 core/templates/template.html:175
msgid "Imprint"
msgstr "Отпечаток"
@@ -665,178 +669,173 @@ msgstr ""
"Если лицензии были локализованы, например лицензии\n"
"Creative Commons для разных стран, добавьте их здесь отдельно."
-#: core/templates/navigation.html:27 software/templates/features.html:437
+#: core/templates/navigation.html:28 software/templates/features.html:437
msgid "Training"
msgstr "Тренировка"
-#: core/templates/navigation.html:34 core/templates/user/overview.html:25
+#: core/templates/navigation.html:37 core/templates/user/overview.html:25
msgid "Workouts"
msgstr "Тренировки"
-#: core/templates/navigation.html:42
+#: core/templates/navigation.html:46
msgid "Workouts schedules"
msgstr "Программы тренировок"
-#: core/templates/navigation.html:50 core/templates/user/overview.html:70
+#: core/templates/navigation.html:54 core/templates/user/overview.html:70
#: manager/templates/calendar/month.html:10
#: manager/templates/calendar/month.html:21
msgid "Calendar"
msgstr "Календарь"
-#: core/templates/navigation.html:60
+#: core/templates/navigation.html:64
#, fuzzy
#| msgid "Macronutrients"
msgid "Measurements"
msgstr "Макронутриенты"
-#: core/templates/navigation.html:70 gallery/templates/images/overview.html:6
+#: core/templates/navigation.html:75 gallery/templates/images/overview.html:6
msgid "Gallery"
msgstr "Галерея"
-#: core/templates/navigation.html:76
+#: core/templates/navigation.html:81
msgid "Workout templates"
msgstr "Шаблоны тренировок"
-#: core/templates/navigation.html:82 manager/views/workout.py:84
+#: core/templates/navigation.html:88 manager/views/workout.py:84
msgid "Your templates"
msgstr "Ваши шаблоны"
-#: core/templates/navigation.html:90 manager/views/workout.py:98
+#: core/templates/navigation.html:97 manager/views/workout.py:98
msgid "Public templates"
msgstr "Общедоступные шаблоны"
-#: core/templates/navigation.html:97 manager/forms.py:129
-#: manager/models/setting.py:54 software/templates/features.html:51
+#: core/templates/navigation.html:105 manager/forms.py:129
+#: manager/models/setting.py:57 software/templates/features.html:51
#: software/templates/features.html:459
msgid "Exercises"
msgstr "Упражнения"
-#: core/templates/navigation.html:103 core/templates/navigation.html:170
-#: core/templates/navigation.html:330
+#: core/templates/navigation.html:111 core/templates/navigation.html:184
+#: core/templates/navigation.html:340
msgid "Administration"
msgstr "Администрация"
-#: core/templates/navigation.html:106
+#: core/templates/navigation.html:115
#, fuzzy
#| msgid "Exercise day"
msgid "Exercise edit history"
msgstr "День упражнений"
-#: core/templates/navigation.html:111 exercises/models/base.py:103
+#: core/templates/navigation.html:121 exercises/models/base.py:103
msgid "Equipment"
msgstr "Спортивное оборудование"
-#: core/templates/navigation.html:116
+#: core/templates/navigation.html:127
msgid "Muscles"
msgstr "Мышцы"
-#: core/templates/navigation.html:121
+#: core/templates/navigation.html:133
#: exercises/templates/categories/admin-overview.html:4
msgid "Categories"
msgstr "Категории"
-#: core/templates/navigation.html:136 software/templates/features.html:447
+#: core/templates/navigation.html:148 software/templates/features.html:447
msgid "Nutrition"
msgstr "Питание"
-#: core/templates/navigation.html:143 core/templates/user/overview.html:144
+#: core/templates/navigation.html:156 core/templates/user/overview.html:144
msgid "Nutrition plans"
msgstr "Программы питания"
-#: core/templates/navigation.html:151 nutrition/templates/bmi/form.html:50
+#: core/templates/navigation.html:165 nutrition/templates/bmi/form.html:50
msgid "BMI calculator"
msgstr "Калькулятор индекса массы тела"
-#: core/templates/navigation.html:159 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:174 nutrition/templates/rate/form.html:17
msgid "Daily calories calculator"
msgstr "Калькулятор ежедневных калорий"
-#: core/templates/navigation.html:165
+#: core/templates/navigation.html:179
#: nutrition/templates/ingredient/overview.html:10
msgid "Ingredient overview"
msgstr "Обзор ингредиентов"
-#: core/templates/navigation.html:172 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:187 nutrition/templates/units/list.html:6
msgid "Ingredient weight units"
msgstr "Единицы веса ингредиентов"
-#: core/templates/navigation.html:177
-#: nutrition/templates/ingredient/pending.html:6
-msgid "Ingredients pending review"
-msgstr "Ингредиенты ожидающие рассмотрения"
-
-#: core/templates/navigation.html:193 software/templates/features.html:442
+#: core/templates/navigation.html:203 software/templates/features.html:442
msgid "Body weight"
msgstr "Вес тела"
-#: core/templates/navigation.html:200 core/templates/user/overview.html:114
+#: core/templates/navigation.html:210 core/templates/user/overview.html:114
msgid "Weight overview"
msgstr "Обзор веса"
-#: core/templates/navigation.html:207 weight/views.py:65
+#: core/templates/navigation.html:217 weight/views.py:65
msgid "Add weight entry"
msgstr "Добавить запись веса"
-#: core/templates/navigation.html:221
+#: core/templates/navigation.html:231
msgid "About this software"
msgstr "Об этой программе"
-#: core/templates/navigation.html:227 software/templates/about_us.html:5
+#: core/templates/navigation.html:237 software/templates/about_us.html:5
msgid "About us"
msgstr "О нас"
-#: core/templates/navigation.html:233 software/templates/features.html:507
+#: core/templates/navigation.html:243 software/templates/features.html:507
msgid "REST API"
msgstr "REST API"
-#: core/templates/navigation.html:239 utils/models.py:45
+#: core/templates/navigation.html:249 utils/models.py:45
msgid "License"
msgstr "Лицензия"
-#: core/templates/navigation.html:245
+#: core/templates/navigation.html:255
msgid "Developer documentation"
msgstr "Документация для разработчиков"
-#: core/templates/navigation.html:252
+#: core/templates/navigation.html:262
msgid "Get the code"
msgstr "Получить код"
-#: core/templates/navigation.html:259 core/templates/template.html:212
+#: core/templates/navigation.html:269 core/templates/template.html:214
#: software/templates/features.html:582
msgid "Translate"
msgstr "Перевести"
-#: core/templates/navigation.html:293 core/templates/user/login.html:28
+#: core/templates/navigation.html:303 core/templates/user/login.html:28
msgid "Reset password"
msgstr "Восстановить пароль"
-#: core/templates/navigation.html:311
+#: core/templates/navigation.html:321
msgid "My preferences"
msgstr "Мои настройки"
-#: core/templates/navigation.html:320
+#: core/templates/navigation.html:330
msgid "Logout"
msgstr "Выйти"
-#: core/templates/navigation.html:343
+#: core/templates/navigation.html:353
msgid "Licenses"
msgstr "Лицензии"
-#: core/templates/navigation.html:351
+#: core/templates/navigation.html:361
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr "Единицы повторения"
-#: core/templates/navigation.html:359 core/templates/weight_unit/list.html:4
-#: nutrition/templates/ingredient/view.html:167
+#: core/templates/navigation.html:369 core/templates/weight_unit/list.html:4
+#: nutrition/templates/ingredient/view.html:141
msgid "Weight units"
msgstr "Единицы веса"
-#: core/templates/navigation.html:367 core/templates/user/list.html:4
+#: core/templates/navigation.html:377 core/templates/user/list.html:4
msgid "User list"
msgstr "Список пользователей"
-#: core/templates/navigation.html:373
+#: core/templates/navigation.html:383
msgid "Gyms"
msgstr "Тренажерные залы"
@@ -890,12 +889,12 @@ msgstr "Спасибо за пользование нашим сайтом!"
msgid "The %(site_name)s team"
msgstr "Команда %(site_name)s"
-#: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:11
+#: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:12
msgid "previous"
msgstr "предыдущий"
-#: core/templates/tags/pagination.html:31
-#: core/templates/tags/pagination.html:35
+#: core/templates/tags/pagination.html:33
+#: core/templates/tags/pagination.html:38
msgid "next"
msgstr "следующий"
@@ -920,37 +919,37 @@ msgid "Add exercises to this workout day"
msgstr "Добавить упражнения к этому тренировочному дню"
#: core/templates/tags/render_weight_log.html:17 manager/helpers.py:86
-#: manager/models/setting.py:69 manager/templates/set/formset.html:9
+#: manager/models/setting.py:72 manager/templates/set/formset.html:9
msgid "Reps"
msgstr "Повтор"
#: core/templates/tags/render_weight_log.html:30 manager/forms.py:191
-#: manager/models/log.py:103 manager/models/setting.py:99
+#: manager/models/log.py:103 manager/models/setting.py:102
#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
#, fuzzy
msgid "RiR"
msgstr "ПвЗ"
-#: core/templates/template.html:120 manager/templates/calendar/month.html:138
-#: manager/templates/schedule/view.html:249
-#: manager/templates/schedule/view.html:270
-#: manager/templates/workout/view.html:86
-#: manager/templates/workout/view.html:139
+#: core/templates/template.html:122 manager/templates/calendar/month.html:138
+#: manager/templates/schedule/view.html:248
+#: manager/templates/schedule/view.html:269
+#: manager/templates/workout/view.html:84
+#: manager/templates/workout/view.html:137
msgid "Close"
msgstr "Закрыть"
-#: core/templates/template.html:136
+#: core/templates/template.html:138
msgid ""
"You are using a guest account, data entered will be deleted after a week."
msgstr ""
"Вы используете аккаунт для гостей, введенные данные будут удалены через "
"неделю."
-#: core/templates/template.html:141
+#: core/templates/template.html:143
msgid "Create some demo entries"
msgstr "Создайте демо-записи"
-#: core/templates/template.html:178 software/templates/features.html:547
+#: core/templates/template.html:180 software/templates/features.html:547
#: software/templates/tos.html:7
msgid "Terms of service"
msgstr "Условия обслуживания"
@@ -1053,7 +1052,7 @@ msgid "Overview"
msgstr "Обзор"
#: core/templates/user/overview.html:28
-#: manager/templates/schedule/view.html:164
+#: manager/templates/schedule/view.html:163
#: manager/templates/workout/overview.html:39 manager/views/schedule_step.py:60
msgid "Add workout"
msgstr "Добавить тренировку"
@@ -1061,20 +1060,20 @@ msgstr "Добавить тренировку"
#: core/templates/user/overview.html:34 core/templates/user/overview.html:76
#: core/templates/user/overview.html:120 core/templates/user/overview.html:152
#: exercises/models/base.py:118 exercises/models/base.py:124
-#: exercises/models/exercise.py:63 exercises/models/exercise.py:69
+#: exercises/models/exercise.py:64 exercises/models/exercise.py:70
#: exercises/models/image.py:107 exercises/models/image.py:113
#: exercises/models/video.py:163 exercises/models/video.py:169
#: gallery/models/image.py:42 manager/helpers.py:85 manager/models/log.py:100
#: manager/models/session.py:67 measurements/models/measurement.py:47
-#: nutrition/models/ingredient.py:101 nutrition/models/ingredient.py:107
-#: nutrition/models/ingredient.py:222 weight/models.py:33
+#: nutrition/models/ingredient.py:87 nutrition/models/ingredient.py:93
+#: nutrition/models/ingredient.py:216 weight/models.py:51
#: weight/templates/import_csv_preview.html:13
#: weight/templates/import_csv_preview.html:42 weight/views.py:144
msgid "Date"
msgstr "Дата"
#: core/templates/user/overview.html:35 core/templates/user/overview.html:153
-#: exercises/models/exercise.py:51 gallery/models/image.py:65
+#: exercises/models/exercise.py:52 gallery/models/image.py:65
#: gym/models/contract.py:58 gym/models/contract.py:109
#: manager/models/day.py:37 manager/models/workout.py:63
#: measurements/models/measurement.py:62 nutrition/models/plan.py:67
@@ -1092,13 +1091,13 @@ msgstr "Последние действия"
#: core/templates/user/overview.html:58
#: manager/templates/calendar/month.html:128
-#: manager/templates/schedule/view.html:145
+#: manager/templates/schedule/view.html:144
#: manager/templates/workout/overview.html:28
msgid "No workouts found."
msgstr "Тренировок не найдено."
#: core/templates/user/overview.html:68 manager/forms.py:280
-#: manager/templates/workout/view.html:108
+#: manager/templates/workout/view.html:106
msgid "Log"
msgstr "Журнал"
@@ -1122,35 +1121,35 @@ msgstr "Время"
#: core/templates/user/overview.html:112 core/templates/user/overview.html:121
#: manager/forms.py:186 manager/helpers.py:86 manager/models/log.py:86
-#: manager/models/setting.py:79 manager/templates/log/add.html:54
-#: manager/templates/set/formset.html:11 weight/models.py:35
+#: manager/models/setting.py:82 manager/templates/log/add.html:54
+#: manager/templates/set/formset.html:11 weight/models.py:53
#: weight/templates/import_csv_preview.html:14
#: weight/templates/import_csv_preview.html:43 weight/views.py:144
msgid "Weight"
msgstr "Вес"
-#: core/templates/user/overview.html:154 nutrition/models/ingredient.py:130
-#: nutrition/templates/ingredient/view.html:77 nutrition/views/plan.py:237
+#: core/templates/user/overview.html:154 nutrition/models/ingredient.py:116
+#: nutrition/templates/ingredient/view.html:51 nutrition/views/plan.py:237
msgid "Energy"
msgstr "Энергия"
-#: core/templates/user/overview.html:155 nutrition/models/ingredient.py:137
-#: nutrition/templates/ingredient/view.html:84 nutrition/views/plan.py:243
+#: core/templates/user/overview.html:155 nutrition/models/ingredient.py:123
+#: nutrition/templates/ingredient/view.html:58 nutrition/views/plan.py:243
msgid "Protein"
msgstr "Белки"
-#: core/templates/user/overview.html:156 nutrition/models/ingredient.py:145
-#: nutrition/templates/ingredient/view.html:90 nutrition/views/plan.py:251
+#: core/templates/user/overview.html:156 nutrition/models/ingredient.py:131
+#: nutrition/templates/ingredient/view.html:64 nutrition/views/plan.py:251
msgid "Carbohydrates"
msgstr "Углеводы"
-#: core/templates/user/overview.html:157 nutrition/models/ingredient.py:163
-#: nutrition/templates/ingredient/view.html:106 nutrition/views/plan.py:265
+#: core/templates/user/overview.html:157 nutrition/models/ingredient.py:149
+#: nutrition/templates/ingredient/view.html:80 nutrition/views/plan.py:265
msgid "Fat"
msgstr "Жиры"
#: core/templates/user/overview.html:170
-#: nutrition/templates/ingredient/view.html:79
+#: nutrition/templates/ingredient/view.html:53
msgid "kcal"
msgstr "ккал"
@@ -1162,7 +1161,7 @@ msgstr "ккал"
#: gym/templates/gym/member_list.html:207
#: gym/templates/gym/member_list.html:240
#: gym/templates/gym/member_list.html:277
-#: manager/templates/schedule/view.html:101
+#: manager/templates/schedule/view.html:100
msgid "Actions"
msgstr "Действия"
@@ -1205,7 +1204,7 @@ msgid "Details"
msgstr "Детали"
#: core/templates/user/overview.html:258 gym/views/export.py:57
-#: manager/helpers.py:86 manager/templates/schedule/view.html:99
+#: manager/helpers.py:86 manager/templates/schedule/view.html:98
msgid "Nr."
msgstr "№"
@@ -1250,7 +1249,7 @@ msgid "Documents"
msgstr "Документы"
#: core/templates/user/overview.html:412 gym/templates/document/list.html:32
-#: manager/forms.py:292 manager/templates/workout/view.html:134
+#: manager/forms.py:292 manager/templates/workout/view.html:132
msgid "Download"
msgstr "Загрузка"
@@ -1303,13 +1302,13 @@ msgid "kg"
msgstr "кг"
#: core/templatetags/wger_extras.py:207
-#: nutrition/templates/ingredient/view.html:86
-#: nutrition/templates/ingredient/view.html:92
-#: nutrition/templates/ingredient/view.html:99
-#: nutrition/templates/ingredient/view.html:108
-#: nutrition/templates/ingredient/view.html:115
-#: nutrition/templates/ingredient/view.html:137
-#: nutrition/templates/ingredient/view.html:147
+#: nutrition/templates/ingredient/view.html:60
+#: nutrition/templates/ingredient/view.html:66
+#: nutrition/templates/ingredient/view.html:73
+#: nutrition/templates/ingredient/view.html:82
+#: nutrition/templates/ingredient/view.html:89
+#: nutrition/templates/ingredient/view.html:111
+#: nutrition/templates/ingredient/view.html:121
msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr "г"
@@ -1327,7 +1326,7 @@ msgstr "oz"
#: exercises/views/equipment.py:103 exercises/views/exercises.py:73
#: exercises/views/muscles.py:99 manager/views/schedule.py:309
#: manager/views/schedule_step.py:128 manager/views/workout.py:249
-#: manager/views/workout_session.py:142 nutrition/views/ingredient.py:116
+#: manager/views/workout_session.py:142 nutrition/views/ingredient.py:119
#: nutrition/views/unit.py:110
msgid "Successfully deleted"
msgstr "Успешно удалено"
@@ -1339,7 +1338,7 @@ msgstr "Успешно удалено"
#: gym/views/admin_notes.py:196 gym/views/document.py:206 gym/views/gym.py:481
#: manager/views/schedule.py:316 manager/views/schedule_step.py:138
#: manager/views/workout.py:253 manager/views/workout_session.py:156
-#: nutrition/views/ingredient.py:123 nutrition/views/unit.py:117
+#: nutrition/views/ingredient.py:126 nutrition/views/unit.py:117
#, python-brace-format
msgid "Delete {0}?"
msgstr "Удалить {0}?"
@@ -1352,7 +1351,7 @@ msgstr "Удалить {0}?"
#: gym/views/contract.py:186 gym/views/contract_option.py:123
#: gym/views/contract_type.py:123 gym/views/document.py:171
#: gym/views/gym.py:463 manager/views/day.py:100 manager/views/schedule.py:333
-#: manager/views/workout.py:267 nutrition/views/ingredient.py:142
+#: manager/views/workout.py:267 nutrition/views/ingredient.py:145
#: nutrition/views/unit.py:143
#, python-brace-format
msgid "Edit {0}"
@@ -1426,7 +1425,7 @@ msgstr "Тренажерный зал"
msgid "A verification email was sent to %(email)s"
msgstr ""
-#: exercises/models/base.py:82 nutrition/models/ingredient.py:236
+#: exercises/models/base.py:82 nutrition/models/ingredient.py:230
msgid "Category"
msgstr "Категория"
@@ -1446,7 +1445,7 @@ msgstr "Вариации"
msgid "Exercise Categories"
msgstr "Категории упражнений"
-#: exercises/models/comment.py:52 exercises/models/exercise_alias.py:52
+#: exercises/models/comment.py:52 exercises/models/exercise_alias.py:53
#: exercises/models/image.py:74 exercises/models/video.py:98
#: manager/forms.py:178 manager/helpers.py:86 manager/models/log.py:52
msgid "Exercise"
@@ -1456,12 +1455,12 @@ msgstr "Упражнение"
msgid "A comment about how to correctly do this exercise."
msgstr "Коментарий о том, как правильно выполнять это упражнение."
-#: exercises/models/exercise.py:76 nutrition/models/ingredient.py:95
+#: exercises/models/exercise.py:77 nutrition/models/ingredient.py:81
#: nutrition/models/weight_unit.py:32
msgid "Language"
msgstr "Язык"
-#: exercises/models/exercise_alias.py:58
+#: exercises/models/exercise_alias.py:59
#, fuzzy
#| msgid "Correcting an exercise"
msgid "Alias for an exercise"
@@ -1605,7 +1604,7 @@ msgstr "Действия"
#: manager/models/schedule.py:44 manager/models/session.py:49
#: manager/models/workout.py:89 measurements/models/category.py:31
#: measurements/models/measurement.py:42 nutrition/models/plan.py:54
-#: nutrition/templates/ingredient/pending.html:16 weight/models.py:42
+#: weight/models.py:60
msgid "User"
msgstr "Пользователь"
@@ -1734,9 +1733,9 @@ msgid "Contract type"
msgstr "Форма контракта"
#: gym/models/contract.py:211 gym/templates/contract/view.html:59
-#: manager/templates/log/add.html:52 nutrition/forms.py:62
-#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:105
-#: nutrition/models/meal_item.py:72
+#: manager/templates/log/add.html:52 nutrition/forms.py:63
+#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:108
+#: nutrition/models/meal_item.py:73
msgid "Amount"
msgstr "Количество"
@@ -1753,7 +1752,7 @@ msgid "Contract is active"
msgstr "Контракт активен"
#: gym/models/contract.py:237 gym/templates/contract/view.html:69
-#: manager/models/schedule.py:61 manager/templates/schedule/view.html:68
+#: manager/models/schedule.py:61 manager/templates/schedule/view.html:67
msgid "Start date"
msgstr "Дата начала"
@@ -2156,7 +2155,7 @@ msgstr "Создать предварительный просмотр"
#: mailer/templates/mailer/gym/form.html:28
#: mailer/templates/mailer/gym/preview.html:62
-#: manager/templates/workout/view.html:42
+#: manager/templates/workout/view.html:40
msgid "Steps"
msgstr "Шаги"
@@ -2180,7 +2179,7 @@ msgstr ""
"перед отправкой писем"
#: mailer/templates/mailer/gym/preview.html:22
-#: software/templates/about_us.html:60
+#: software/templates/about_us.html:70
msgid "Current version"
msgstr "Текущая версия"
@@ -2213,18 +2212,18 @@ msgstr ""
"Вы можете искать больше одного упражнения, они будут сгруппированы в "
"расширенном наборе."
-#: manager/forms.py:140 nutrition/forms.py:252
+#: manager/forms.py:140 nutrition/forms.py:253
#, fuzzy
#| msgid "Also use ingredients in English"
msgid "Also search for names in English"
msgstr "Компоненты также на английском языке"
#: manager/forms.py:168 manager/forms.py:173 manager/models/log.py:64
-#: manager/models/log.py:92 manager/models/setting.py:59
-#: manager/models/setting.py:90 manager/templates/log/add.html:53
+#: manager/models/log.py:92 manager/models/setting.py:62
+#: manager/models/setting.py:93 manager/templates/log/add.html:53
#: manager/templates/log/add.html:55 manager/templates/set/formset.html:10
#: manager/templates/set/formset.html:12 measurements/models/category.py:41
-#: nutrition/forms.py:66
+#: nutrition/forms.py:67
msgid "Unit"
msgstr "Секция"
@@ -2232,15 +2231,15 @@ msgstr "Секция"
msgid "Type"
msgstr "Тип"
-#: manager/forms.py:280 manager/templates/workout/view.html:115
+#: manager/forms.py:280 manager/templates/workout/view.html:113
msgid "Table"
msgstr "Таблица"
-#: manager/forms.py:282 manager/templates/workout/view.html:121
+#: manager/forms.py:282 manager/templates/workout/view.html:119
msgid "with images"
msgstr "с изображениями"
-#: manager/forms.py:283 manager/templates/workout/view.html:127
+#: manager/forms.py:283 manager/templates/workout/view.html:125
msgid "with comments"
msgstr "с комментариями"
@@ -2249,11 +2248,10 @@ msgid "Workout will expire soon"
msgstr "Срок этой тренировки скоро истечет"
#: manager/models/day.py:34 manager/models/log.py:58
-#: manager/models/session.py:60 manager/templates/schedule/view.html:103
-#: manager/templates/workout/view.html:11
-#: manager/templates/workout/view.html:19 manager/views/pdf.py:85
-#: manager/views/pdf.py:161 manager/views/schedule.py:151
-#: manager/views/schedule.py:221
+#: manager/models/session.py:60 manager/templates/schedule/view.html:102
+#: manager/templates/workout/view.html:9 manager/templates/workout/view.html:17
+#: manager/views/pdf.py:85 manager/views/pdf.py:161
+#: manager/views/schedule.py:151 manager/views/schedule.py:221
msgid "Workout"
msgstr "Тренировка"
@@ -2273,7 +2271,7 @@ msgstr "День"
msgid "Name or short description of the schedule. For example 'Program XYZ'."
msgstr "Название или короткое описание программы. Например 'Программа XYZ'."
-#: manager/models/schedule.py:65 manager/templates/schedule/view.html:72
+#: manager/models/schedule.py:65 manager/templates/schedule/view.html:71
msgid "Schedule active"
msgstr "Программа активна"
@@ -2287,7 +2285,7 @@ msgstr ""
"показана, например, на вашей панели инструментов). Все остальные программы "
"будут помечены как неактивные"
-#: manager/models/schedule.py:77 manager/templates/schedule/view.html:82
+#: manager/models/schedule.py:77 manager/templates/schedule/view.html:81
msgid "Is a loop"
msgstr "Является циклом"
@@ -2308,8 +2306,8 @@ msgid "The duration in weeks"
msgstr "Длительность в неделях"
#: manager/models/schedule_step.py:64 manager/models/set.py:53
-#: manager/models/setting.py:110 nutrition/models/meal.py:55
-#: nutrition/models/meal_item.py:65
+#: manager/models/setting.py:113 nutrition/models/meal.py:55
+#: nutrition/models/meal_item.py:66
msgid "Order"
msgstr "Порядок"
@@ -2359,7 +2357,7 @@ msgstr "День упражнений"
msgid "Number of sets"
msgstr "Количество подходов"
-#: manager/models/setting.py:48
+#: manager/models/setting.py:51
msgid "Sets"
msgstr "Подходы"
@@ -2435,7 +2433,7 @@ msgstr ""
msgid "Go to current month"
msgstr "Перейти на текущий месяц"
-#: manager/templates/calendar/month.html:188
+#: manager/templates/calendar/month.html:190
msgid "Add new log"
msgstr "Добавить новый журнал"
@@ -2475,8 +2473,8 @@ msgid "Your schedules"
msgstr "Ваши программы"
#: manager/templates/schedule/overview.html:19
-#: manager/templates/schedule/view.html:132
-#: manager/templates/schedule/view.html:184
+#: manager/templates/schedule/view.html:131
+#: manager/templates/schedule/view.html:183
#: manager/templates/workout/overview.html:16
msgid "active"
msgstr "активные"
@@ -2534,11 +2532,11 @@ msgstr ""
msgid "Add schedule"
msgstr "Добавить тренировку"
-#: manager/templates/schedule/view.html:10
+#: manager/templates/schedule/view.html:9
msgid "Schedule"
msgstr "Программа"
-#: manager/templates/schedule/view.html:86
+#: manager/templates/schedule/view.html:85
msgid ""
"This schedule is a loop and will go through the workouts above till you "
"deactivate it"
@@ -2546,19 +2544,19 @@ msgstr ""
"Это программа - бесконечный цикл и будет повторяться до тех пор, пока Вы ее "
"не отключите"
-#: manager/templates/schedule/view.html:104
+#: manager/templates/schedule/view.html:103
msgid "Weeks"
msgstr "Недели"
-#: manager/templates/schedule/view.html:116
+#: manager/templates/schedule/view.html:115
msgid "Move me"
msgstr "Переместите меня"
-#: manager/templates/schedule/view.html:157
+#: manager/templates/schedule/view.html:156
msgid "Start schedule"
msgstr "Начать программу тренировок"
-#: manager/templates/schedule/view.html:188
+#: manager/templates/schedule/view.html:187
#, fuzzy, python-format
#| msgid ""
#| "%(weeks)s Week\n"
@@ -2585,11 +2583,11 @@ msgstr[3] ""
"%(weeks)s Недель\n"
" "
-#: manager/templates/schedule/view.html:222
+#: manager/templates/schedule/view.html:221
msgid "Adding workouts"
msgstr "Добавляю тренировки"
-#: manager/templates/schedule/view.html:224
+#: manager/templates/schedule/view.html:223
#, fuzzy
#| msgid ""
#| "Add as many workouts to the schedule as you want. You can\n"
@@ -2606,21 +2604,21 @@ msgstr ""
"изменить порядок, перетаскивая их. Также можно добавлять одну тренировку "
"несколько раз."
-#: manager/templates/schedule/view.html:233
-#: manager/templates/schedule/view.html:244
-#: manager/templates/schedule/view.html:291
-#: manager/templates/workout/view.html:71
-#: manager/templates/workout/view.html:81
-#: manager/templates/workout/view.html:180
+#: manager/templates/schedule/view.html:232
+#: manager/templates/schedule/view.html:243
+#: manager/templates/schedule/view.html:290
+#: manager/templates/workout/view.html:69
+#: manager/templates/workout/view.html:79
+#: manager/templates/workout/view.html:178
msgid "Export calendar file"
msgstr "Экспортировать файл календаря"
-#: manager/templates/schedule/view.html:237
+#: manager/templates/schedule/view.html:236
msgid "Export this schedule as a calendar file."
msgstr "Экспортируйте расписание в файл календаря."
-#: manager/templates/schedule/view.html:238
-#: manager/templates/workout/view.html:76
+#: manager/templates/schedule/view.html:237
+#: manager/templates/workout/view.html:74
#, fuzzy
#| msgid ""
#| "You can then import the file it into your calendar\n"
@@ -2638,18 +2636,18 @@ msgstr ""
"календарь, outlook или iCal. Это позволит создать расписание на каждый "
"тренировочный день с соответствующими упражнениями."
-#: manager/templates/schedule/view.html:259
-#: manager/templates/schedule/view.html:295
-#: manager/templates/workout/view.html:96
-#: manager/templates/workout/view.html:176
+#: manager/templates/schedule/view.html:258
+#: manager/templates/schedule/view.html:294
+#: manager/templates/workout/view.html:94
+#: manager/templates/workout/view.html:174
msgid "Download as PDF"
msgstr "Скачать в формате PDF"
-#: manager/templates/schedule/view.html:300
+#: manager/templates/schedule/view.html:299
msgid "Edit schedule"
msgstr "Отредактировать программу"
-#: manager/templates/schedule/view.html:305
+#: manager/templates/schedule/view.html:304
msgid "Delete schedule"
msgstr "Удалить программу"
@@ -2789,12 +2787,12 @@ msgid "Mark as workout"
msgstr "Пометить как тренировку"
#: manager/templates/workout/template_view.html:65
-#: manager/templates/workout/view.html:51
+#: manager/templates/workout/view.html:49
msgid "Muscles trained"
msgstr "Тренированные мышцы"
#: manager/templates/workout/template_view.html:68
-#: manager/templates/workout/view.html:54
+#: manager/templates/workout/view.html:52
msgid ""
"Images show combined muscles as trained by the exercises on the workout."
msgstr ""
@@ -2805,35 +2803,35 @@ msgstr ""
msgid "Use this template"
msgstr "Использовать этот шаблон"
-#: manager/templates/workout/view.html:45
+#: manager/templates/workout/view.html:43
msgid "Add training days"
msgstr "Добавить тренировочные дни"
-#: manager/templates/workout/view.html:46
+#: manager/templates/workout/view.html:44
msgid "Add workout sets to days"
msgstr "Добавить наборы подходов к тренировочным дням"
-#: manager/templates/workout/view.html:47
+#: manager/templates/workout/view.html:45
msgid "Set the repetitions for each set"
msgstr "Установить повторения к каждому подходу"
-#: manager/templates/workout/view.html:75
+#: manager/templates/workout/view.html:73
msgid "Export this workout as a calendar file."
msgstr "Экспортировать тренировку в формате календаря."
-#: manager/templates/workout/view.html:146
+#: manager/templates/workout/view.html:144
msgid "Logs"
msgstr "Журналы"
-#: manager/templates/workout/view.html:148
+#: manager/templates/workout/view.html:146
msgid "View logs"
msgstr "Просмотр журналов"
-#: manager/templates/workout/view.html:171 manager/views/schedule_step.py:99
+#: manager/templates/workout/view.html:169 manager/views/schedule_step.py:99
msgid "Edit workout"
msgstr "Изменить тренировку"
-#: manager/templates/workout/view.html:184 manager/views/workout.py:281
+#: manager/templates/workout/view.html:182 manager/views/workout.py:281
msgid "Mark as template"
msgstr "Пометить как шаблон"
@@ -2881,41 +2879,41 @@ msgstr "Это приведет также к удалению всех запи
msgid "Value"
msgstr "Значение"
-#: nutrition/forms.py:117
+#: nutrition/forms.py:118
#, fuzzy
#| msgid "Height (cm)"
msgid "Height (in)"
msgstr "Рост (см)"
-#: nutrition/forms.py:120
+#: nutrition/forms.py:121
#, fuzzy
#| msgid "Weight log"
msgid "Weight (kg)"
msgstr "Регистрация веса"
-#: nutrition/forms.py:120
+#: nutrition/forms.py:121
#, fuzzy
#| msgid "Weight log"
msgid "Weight (lbs)"
msgstr "Регистрация веса"
-#: nutrition/forms.py:133
+#: nutrition/forms.py:134
msgid "Calculate"
msgstr "Рассчитать"
-#: nutrition/forms.py:207 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:208 nutrition/templates/rate/form.html:76
msgid "Basic caloric intake"
msgstr "Основное потребление калорий"
-#: nutrition/forms.py:208
+#: nutrition/forms.py:209
msgid "Your basic caloric intake as calculated for your data"
msgstr "Ваше основное потребление калорий, рассчитанное для ваших данных"
-#: nutrition/forms.py:213
+#: nutrition/forms.py:214
msgid "Additional calories"
msgstr "Дополнительные калории"
-#: nutrition/forms.py:215
+#: nutrition/forms.py:216
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
@@ -2923,70 +2921,55 @@ msgstr ""
"Дополнительные калории для добавления к базовой ставке (для вычитывания, "
"введите отрицательное число)"
-#: nutrition/forms.py:248 nutrition/models/ingredient_weight_unit.py:39
-#: nutrition/models/log.py:84 nutrition/models/meal_item.py:53
+#: nutrition/forms.py:249 nutrition/models/ingredient_weight_unit.py:39
+#: nutrition/models/log.py:87 nutrition/models/meal_item.py:54
msgid "Ingredient"
msgstr "Ингредиент"
-#: nutrition/models/ingredient.py:131
+#: nutrition/models/ingredient.py:117
msgid "In kcal per 100g"
msgstr "В ккал на 100г"
-#: nutrition/models/ingredient.py:138 nutrition/models/ingredient.py:146
-#: nutrition/models/ingredient.py:156 nutrition/models/ingredient.py:164
-#: nutrition/models/ingredient.py:174 nutrition/models/ingredient.py:184
-#: nutrition/models/ingredient.py:194
+#: nutrition/models/ingredient.py:124 nutrition/models/ingredient.py:132
+#: nutrition/models/ingredient.py:142 nutrition/models/ingredient.py:150
+#: nutrition/models/ingredient.py:160 nutrition/models/ingredient.py:170
+#: nutrition/models/ingredient.py:180
msgid "In g per 100g of product"
msgstr "В г на 100г продукта"
-#: nutrition/models/ingredient.py:155
-#: nutrition/templates/ingredient/view.html:96 nutrition/views/plan.py:259
+#: nutrition/models/ingredient.py:141
+#: nutrition/templates/ingredient/view.html:70 nutrition/views/plan.py:259
msgid "Sugar content in carbohydrates"
msgstr "Содержание сахара в углеводах"
-#: nutrition/models/ingredient.py:173
-#: nutrition/templates/ingredient/view.html:112 nutrition/views/plan.py:273
+#: nutrition/models/ingredient.py:159
+#: nutrition/templates/ingredient/view.html:86 nutrition/views/plan.py:273
msgid "Saturated fat content in fats"
msgstr "Содержание насыщенных жиров в жирах"
-#: nutrition/models/ingredient.py:183
-#: nutrition/templates/ingredient/view.html:134 nutrition/views/plan.py:279
-msgid "Fibres"
-msgstr "Клетчатка (пищевые волокна)"
+#: nutrition/models/ingredient.py:169
+#: nutrition/templates/ingredient/view.html:108 nutrition/views/plan.py:279
+msgid "Fiber"
+msgstr ""
-#: nutrition/models/ingredient.py:193
-#: nutrition/templates/ingredient/view.html:144 nutrition/views/plan.py:285
+#: nutrition/models/ingredient.py:179
+#: nutrition/templates/ingredient/view.html:118 nutrition/views/plan.py:285
msgid "Sodium"
msgstr "Натрий"
-#: nutrition/models/ingredient.py:215
+#: nutrition/models/ingredient.py:209
msgid "Link to product"
msgstr "Ссылка на продукт"
-#: nutrition/models/ingredient.py:244
+#: nutrition/models/ingredient.py:238
msgid "Brand name of product"
msgstr "Название бренда продукта"
-#: nutrition/models/ingredient.py:304
+#: nutrition/models/ingredient.py:305
#, python-brace-format
msgid "The total energy ({self.energy}kcal) is not the approximate sum of the "
msgstr ""
-#: nutrition/models/ingredient.py:383 nutrition/views/ingredient.py:196
-msgid "Ingredient was successfully added to the general database"
-msgstr "Ингредиент успешно добавлен в общую базу данных"
-
-#: nutrition/models/ingredient.py:408
-msgid "New user submitted ingredient"
-msgstr "Новый ингредиент представленный пользователем"
-
-#: nutrition/models/ingredient.py:410
-#, fuzzy, python-brace-format
-#| msgid "The user {0} submitted a new ingredient \"{1}\"."
-msgid ""
-"The user {request.user.username} submitted a new ingredient \"{self.name}\"."
-msgstr "Пользователь {0} представил новый ингредиент \"{1}\"."
-
#: nutrition/models/ingredient_category.py:31
msgid "Ingredient Categories"
msgstr "Категории ингредиентов"
@@ -2999,16 +2982,16 @@ msgstr "Количество в граммах"
msgid "Unit amount, e.g. \"1 Cup\" or \"1/2 spoon\""
msgstr "Единица измерения количества, например \"1 чашка\" или \"1/2 ложки\""
-#: nutrition/models/log.py:49 nutrition/models/meal.py:50
-#: nutrition/models/meal_item.py:47 nutrition/models/plan.py:106
+#: nutrition/models/log.py:52 nutrition/models/meal.py:50
+#: nutrition/models/meal_item.py:48 nutrition/models/plan.py:108
msgid "Nutrition plan"
msgstr "Программа питания"
-#: nutrition/models/log.py:58
+#: nutrition/models/log.py:61
msgid "Meal"
msgstr "Прием пищи"
-#: nutrition/models/log.py:68
+#: nutrition/models/log.py:71
#, fuzzy
#| msgid "Time (approx)"
msgid "Date and Time (Approx.)"
@@ -3033,11 +3016,11 @@ msgid ""
msgstr ""
"Описание цели плана, например \"Набрать вес\" или \"Подготовка к лету\""
-#: nutrition/models/plan.py:88
+#: nutrition/models/plan.py:90
msgid "Use daily calories"
msgstr "Используйте ежедневныу калории"
-#: nutrition/models/plan.py:91
+#: nutrition/models/plan.py:93
msgid ""
"Tick the box if you want to mark this plan as having a goal amount of "
"calories. You can use the calculator or enter the value yourself."
@@ -3158,67 +3141,36 @@ msgstr "Поиск"
msgid "Add ingredient"
msgstr "Добавить ингредиент"
-#: nutrition/templates/ingredient/pending.html:14
-msgid "Submission date"
-msgstr "Дата представления"
-
-#: nutrition/templates/ingredient/view.html:27
-msgid "Ingredient is pending review"
-msgstr "Ингредиент находится в ожидании рассмотрения"
-
-#: nutrition/templates/ingredient/view.html:28
-msgid ""
-"This user submitted ingredient is pending a decision to be\n"
-"included in the database. Till then, it will not be shown in the overview "
-"or\n"
-"the search."
-msgstr ""
-"Этот ингредиент, который был представленный пользователем, находится в "
-"ожидании решения относительно его добавления в базу данных. До этого, его не "
-"будет показано ни в обзоре, ни в поиске."
-
-#: nutrition/templates/ingredient/view.html:31
-msgid "Please select one of the options below."
-msgstr "Пожалуйста, выберите одну из опций ниже."
-
-#: nutrition/templates/ingredient/view.html:38
-msgid "Accept"
-msgstr "Принять"
-
-#: nutrition/templates/ingredient/view.html:42
-msgid "Decline"
-msgstr "Отклонить"
-
-#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:229
+#: nutrition/templates/ingredient/view.html:45 nutrition/views/plan.py:229
msgid "Macronutrients"
msgstr "Макронутриенты"
-#: nutrition/templates/ingredient/view.html:80
+#: nutrition/templates/ingredient/view.html:54
msgid "kJ"
msgstr "кДж"
-#: nutrition/templates/ingredient/view.html:101
-#: nutrition/templates/ingredient/view.html:117
-#: nutrition/templates/ingredient/view.html:139
-#: nutrition/templates/ingredient/view.html:149
+#: nutrition/templates/ingredient/view.html:75
+#: nutrition/templates/ingredient/view.html:91
+#: nutrition/templates/ingredient/view.html:113
+#: nutrition/templates/ingredient/view.html:123
msgid "n.A."
msgstr "не имеется в наличии"
-#: nutrition/templates/ingredient/view.html:128
+#: nutrition/templates/ingredient/view.html:102
msgid "Others"
msgstr "Другие"
-#: nutrition/templates/ingredient/view.html:170
+#: nutrition/templates/ingredient/view.html:144
#: nutrition/templates/units/list.html:46 nutrition/views/unit.py:86
msgid "Add new weight unit"
msgstr "Добавить новую единицу веса"
-#: nutrition/templates/ingredient/view.html:232
-#: nutrition/templates/ingredient/view.html:235
+#: nutrition/templates/ingredient/view.html:206
+#: nutrition/templates/ingredient/view.html:209
msgid "Edit ingredient"
msgstr "Изменить ингредиент"
-#: nutrition/templates/ingredient/view.html:239
+#: nutrition/templates/ingredient/view.html:213
msgid "Delete ingredient"
msgstr "Удалить ингредиент"
@@ -3318,14 +3270,10 @@ msgstr ""
msgid "56 to 90"
msgstr ""
-#: nutrition/views/ingredient.py:154
+#: nutrition/views/ingredient.py:157
msgid "Add a new ingredient"
msgstr "Добавить новый ингредиент"
-#: nutrition/views/ingredient.py:209
-msgid "Ingredient was successfully marked as rejected"
-msgstr "Ингредиент был успешно помечен как отклонённые"
-
#: nutrition/views/plan.py:120
msgid "Nutritional plan"
msgstr "План питания"
@@ -3372,18 +3320,10 @@ msgstr ""
"исходным кодом, созданный фитнес энтузиастами со всего мира."
#: software/templates/about_us.html:18
-msgid "Source code"
-msgstr "Исходный код"
-
-#: software/templates/about_us.html:20
-msgid "Get the source code of this application and its server on github"
-msgstr "Получите исходный код этого приложения и его сервера на github"
-
-#: software/templates/about_us.html:25
msgid "Have a problem or idea?"
msgstr "Есть проблема или идея?"
-#: software/templates/about_us.html:27
+#: software/templates/about_us.html:20
msgid ""
"Get in touch if something didn't behave as expected or if there is a feature "
"that you feel is missing."
@@ -3391,21 +3331,29 @@ msgstr ""
"Свяжитесь с нами, если что-то пошло не так или если вам кажется, что какой-"
"то функции не хватает."
-#: software/templates/about_us.html:32
+#: software/templates/about_us.html:26
msgid "Say hi!"
msgstr "Скажите привет!"
-#: software/templates/about_us.html:34
+#: software/templates/about_us.html:28
msgid "If you want to chat with us, hop on the Discord server and get in touch"
msgstr ""
"Если вы хотите пообщаться с нами, зайдите на сервер Discord и свяжитесь с "
"нами"
-#: software/templates/about_us.html:39 software/templates/features.html:503
+#: software/templates/about_us.html:33
+msgid "Mastodon"
+msgstr ""
+
+#: software/templates/about_us.html:35
+msgid "Follow us on mastodon for updates and news about the project"
+msgstr ""
+
+#: software/templates/about_us.html:40 software/templates/features.html:503
msgid "Translation"
msgstr "Перевод"
-#: software/templates/about_us.html:41
+#: software/templates/about_us.html:42
msgid ""
"This application is translated on weblate. If you also want to help, click "
"the link and start translating"
@@ -3413,11 +3361,19 @@ msgstr ""
"Это приложение переведено на weblate. Если вы тоже хотите помочь, нажмите на "
"ссылку и начните переводить"
-#: software/templates/about_us.html:50
+#: software/templates/about_us.html:47
+msgid "Source code"
+msgstr "Исходный код"
+
+#: software/templates/about_us.html:49
+msgid "Get the source code of this application and its server on github"
+msgstr "Получите исходный код этого приложения и его сервера на github"
+
+#: software/templates/about_us.html:59
msgid "Our goal"
msgstr "Наша цель"
-#: software/templates/about_us.html:53
+#: software/templates/about_us.html:62
#, fuzzy
#| msgid ""
#| "The goal is to build an awesome\n"
@@ -3427,7 +3383,8 @@ msgstr "Наша цель"
msgid ""
"The goal is to build an awesome\n"
" and flexible fitness manager, along with a comprehensive and "
-"complete list of exercises and\n"
+"complete list of\n"
+" exercises and\n"
" ingredients, all released under a free license."
msgstr ""
"Цель - создать удивительный и гибкий фитнес-менеджер, наряду с всесторонним "
@@ -3446,10 +3403,6 @@ msgstr ""
"wger Workout Manager является бесплатным веб-приложением с открытым исходным "
"кодом, которое управляет вашими упражнениями и тренировками. "
-#: software/templates/features.html:45
-msgid "About"
-msgstr "О"
-
#: software/templates/features.html:57
msgid "Mobile app"
msgstr ""
@@ -3717,18 +3670,6 @@ msgid ""
"to its own copyright."
msgstr ""
-#: utils/models.py:130
-msgid "Pending"
-msgstr "В ожидании"
-
-#: utils/models.py:131
-msgid "Accepted"
-msgstr "Принятый"
-
-#: utils/models.py:132
-msgid "Declined"
-msgstr "Непринятый"
-
#: weight/forms.py:54
msgid "Input"
msgstr "Ввод"
@@ -3741,7 +3682,7 @@ msgstr "Формат даты"
msgid "You have to enter your weight"
msgstr "Вы должны ввести свой вес"
-#: weight/models.py:60
+#: weight/models.py:78
msgid "Weight entry"
msgstr "Запись веса"
@@ -3883,6 +3824,65 @@ msgstr "Успешно удалено."
msgid "Delete weight entry for the %s"
msgstr "Удалить запись о весе для %s"
+#~ msgid "Ingredients pending review"
+#~ msgstr "Ингредиенты ожидающие рассмотрения"
+
+#~ msgid "Fibres"
+#~ msgstr "Клетчатка (пищевые волокна)"
+
+#~ msgid "Ingredient was successfully added to the general database"
+#~ msgstr "Ингредиент успешно добавлен в общую базу данных"
+
+#~ msgid "New user submitted ingredient"
+#~ msgstr "Новый ингредиент представленный пользователем"
+
+#, fuzzy, python-brace-format
+#~| msgid "The user {0} submitted a new ingredient \"{1}\"."
+#~ msgid ""
+#~ "The user {request.user.username} submitted a new ingredient \"{self."
+#~ "name}\"."
+#~ msgstr "Пользователь {0} представил новый ингредиент \"{1}\"."
+
+#~ msgid "Submission date"
+#~ msgstr "Дата представления"
+
+#~ msgid "Ingredient is pending review"
+#~ msgstr "Ингредиент находится в ожидании рассмотрения"
+
+#~ msgid ""
+#~ "This user submitted ingredient is pending a decision to be\n"
+#~ "included in the database. Till then, it will not be shown in the overview "
+#~ "or\n"
+#~ "the search."
+#~ msgstr ""
+#~ "Этот ингредиент, который был представленный пользователем, находится в "
+#~ "ожидании решения относительно его добавления в базу данных. До этого, его "
+#~ "не будет показано ни в обзоре, ни в поиске."
+
+#~ msgid "Please select one of the options below."
+#~ msgstr "Пожалуйста, выберите одну из опций ниже."
+
+#~ msgid "Accept"
+#~ msgstr "Принять"
+
+#~ msgid "Decline"
+#~ msgstr "Отклонить"
+
+#~ msgid "Ingredient was successfully marked as rejected"
+#~ msgstr "Ингредиент был успешно помечен как отклонённые"
+
+#~ msgid "About"
+#~ msgstr "О"
+
+#~ msgid "Pending"
+#~ msgstr "В ожидании"
+
+#~ msgid "Accepted"
+#~ msgstr "Принятый"
+
+#~ msgid "Declined"
+#~ msgstr "Непринятый"
+
#~ msgid "Share"
#~ msgstr "Поделиться"
diff --git a/wger/locale/sv/LC_MESSAGES/django.po b/wger/locale/sv/LC_MESSAGES/django.po
index 221b70f96..87af896c0 100644
--- a/wger/locale/sv/LC_MESSAGES/django.po
+++ b/wger/locale/sv/LC_MESSAGES/django.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: wger Workout Manager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-02-02 12:42+0100\n"
+"POT-Creation-Date: 2024-07-14 15:49+0200\n"
"PO-Revision-Date: 2023-01-18 17:47+0000\n"
"Last-Translator: tygyh <[email protected]>\n"
"Language-Team: Swedish <https://hosted.weblate.org/projects/wger/web/sv/>\n"
@@ -35,7 +35,7 @@ msgstr ""
"alla nya registrerade användare här gym och uppdatera alla befintliga "
"användare utan ett gym."
-#: config/views/gym_config.py:42 core/templates/language/view.html:63
+#: config/views/gym_config.py:42 core/templates/language/view.html:67
#: core/templates/license/list.html:17 core/templates/misc/license/list.html:18
#: core/templates/repetition_unit/list.html:18
#: core/templates/tags/render_day.html:39
@@ -55,8 +55,8 @@ msgstr ""
#: manager/templates/calendar/day.html:68
#: manager/templates/calendar/month.html:85
#: manager/templates/calendar/partial_overview_table.html:18
-#: manager/templates/schedule/view.html:119
-#: nutrition/templates/ingredient/view.html:191
+#: manager/templates/schedule/view.html:118
+#: nutrition/templates/ingredient/view.html:165
#: nutrition/templates/units/list.html:19
msgid "Edit"
msgstr "Redigera"
@@ -92,8 +92,8 @@ msgstr "Mitt coola träningsschema"
msgid "Empty placeholder schedule"
msgstr "Tom platshållarschema"
-#: core/forms.py:69 core/templates/navigation.html:275
-#: core/templates/navigation.html:281 core/templates/user/login.html:4
+#: core/forms.py:69 core/templates/navigation.html:285
+#: core/templates/navigation.html:291 core/templates/user/login.html:4
#: software/templates/features.html:82 software/templates/features.html:427
msgid "Login"
msgstr "Logga in"
@@ -165,7 +165,7 @@ msgstr "Lösenord"
msgid "Please enter your current password."
msgstr "Vänligen ange ditt nuvarande lösenord."
-#: core/forms.py:242 core/templates/language/view.html:68
+#: core/forms.py:242 core/templates/language/view.html:73
#: core/templates/license/list.html:19 core/templates/misc/license/list.html:22
#: core/templates/repetition_unit/list.html:20
#: core/templates/tags/render_day.html:45
@@ -180,10 +180,10 @@ msgstr "Vänligen ange ditt nuvarande lösenord."
#: gym/templates/gym/list.html:22 manager/templates/calendar/day.html:73
#: manager/templates/calendar/month.html:89
#: manager/templates/calendar/partial_overview_table.html:23
-#: manager/templates/schedule/view.html:123
-#: manager/templates/workout/view.html:190
-#: nutrition/templates/ingredient/view.html:192
-#: nutrition/templates/ingredient/view.html:241
+#: manager/templates/schedule/view.html:122
+#: manager/templates/workout/view.html:188
+#: nutrition/templates/ingredient/view.html:166
+#: nutrition/templates/ingredient/view.html:215
#: nutrition/templates/units/list.html:22
msgid "Delete"
msgstr "Ta bort"
@@ -196,14 +196,14 @@ msgstr "Ogiltigt lösenord"
msgid "The form is secured with reCAPTCHA"
msgstr "Formuläret är säkrat med reCAPTCHA"
-#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:275
-#: core/templates/navigation.html:287 core/templates/template.html:147
+#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:285
+#: core/templates/navigation.html:297 core/templates/template.html:149
#: core/templates/user/login.html:20 core/views/user.py:298
#: software/templates/features.html:87 software/templates/features.html:422
msgid "Register"
msgstr "Registrera dig"
-#: core/forms.py:315
+#: core/forms.py:315 software/templates/features.html:45
msgid "Contact"
msgstr "Kontakt"
@@ -212,7 +212,7 @@ msgid "Some way of answering you (e-mail, etc.)"
msgstr "Något sätt att svara dig (e-post osv.)"
#: core/forms.py:324 exercises/models/comment.py:58 manager/models/set.py:61
-#: manager/models/setting.py:111 nutrition/models/log.py:74
+#: manager/models/setting.py:114 nutrition/models/log.py:77
msgid "Comment"
msgstr "Kommentar"
@@ -232,6 +232,12 @@ msgstr "Språk kort namn"
msgid "Language full name"
msgstr "Språk fullständigt namn"
+#: core/models/language.py:45 core/templates/language/view.html:23
+#, fuzzy
+#| msgid "Language full name"
+msgid "Language full name in English"
+msgstr "Språk fullständigt namn"
+
#: core/models/license.py:29
msgid "Full name"
msgstr "Fullständigt namn"
@@ -248,7 +254,7 @@ msgstr ""
msgid "Short name, e.g. CC-BY-SA 3"
msgstr "Kort namn, t.ex. OM-AR-OU 3"
-#: core/models/license.py:45 nutrition/models/ingredient.py:214
+#: core/models/license.py:45 nutrition/models/ingredient.py:208
msgid "Link"
msgstr "Länk"
@@ -360,7 +366,7 @@ msgstr ""
msgid "Age"
msgstr "Ålder"
-#: core/models/profile.py:230 nutrition/forms.py:117
+#: core/models/profile.py:230 nutrition/forms.py:118
msgid "Height (cm)"
msgstr "Längd (cm)"
@@ -411,7 +417,7 @@ msgid "Total caloric intake, including e.g. any surplus"
msgstr "Totala kaloriintaget, inklusive t.ex. eventuellt överskott"
#: core/models/profile.py:333 nutrition/models/ingredient_weight_unit.py:45
-#: nutrition/models/log.py:93 nutrition/models/meal_item.py:58
+#: nutrition/models/log.py:96 nutrition/models/meal_item.py:59
msgid "Weight unit"
msgstr "Viktenhet"
@@ -443,17 +449,16 @@ msgstr "Summan av alla timmar måste vara 24"
#: core/models/rep_unit.py:36 core/models/weight_unit.py:36
#: core/templates/user/overview.html:262 core/views/user.py:599
#: exercises/models/category.py:29 exercises/models/equipment.py:29
-#: exercises/models/exercise.py:58 exercises/models/muscle.py:36
+#: exercises/models/exercise.py:59 exercises/models/muscle.py:36
#: gym/models/contract.py:52 gym/models/contract.py:103 gym/models/gym.py:46
#: gym/models/user_document.py:84 gym/templates/contract/view.html:50
#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:96
#: gym/views/gym.py:158 manager/models/schedule.py:55
#: manager/models/workout.py:57 measurements/models/category.py:36
-#: nutrition/models/ingredient.py:125
+#: nutrition/models/ingredient.py:111
#: nutrition/models/ingredient_category.py:27 nutrition/models/meal.py:67
#: nutrition/models/weight_unit.py:38
-#: nutrition/templates/ingredient/pending.html:15
-#: nutrition/templates/ingredient/view.html:178
+#: nutrition/templates/ingredient/view.html:152
msgid "Name"
msgstr "Namn"
@@ -556,24 +561,24 @@ msgstr ""
msgid "Dashboard"
msgstr "Instrumentpanel"
-#: core/templates/language/overview.html:4 core/templates/navigation.html:335
+#: core/templates/language/overview.html:4 core/templates/navigation.html:345
msgid "Languages"
msgstr "Språk"
-#: core/templates/language/overview.html:20
+#: core/templates/language/overview.html:22
msgid "Nothing found."
msgstr "Ingenting hittades"
-#: core/templates/language/overview.html:20
+#: core/templates/language/overview.html:22
#: manager/templates/calendar/month.html:132
#: manager/templates/schedule/overview.html:28
-#: manager/templates/schedule/view.html:145
+#: manager/templates/schedule/view.html:144
#: manager/templates/workout/overview.html:28
#: nutrition/templates/ingredient/overview.html:38
msgid "Add one now."
msgstr "Lägg till ett nu."
-#: core/templates/language/overview.html:33 core/templates/license/list.html:40
+#: core/templates/language/overview.html:35 core/templates/license/list.html:40
#: core/templates/misc/license/list.html:43
#: core/templates/repetition_unit/list.html:43
#: core/templates/user/overview.html:326 core/templates/user/overview.html:365
@@ -593,13 +598,13 @@ msgstr "Lägg till ett nu."
msgid "Add"
msgstr "Lägg till"
-#: core/templates/language/view.html:58 core/templates/user/api_key.html:44
+#: core/templates/language/view.html:61 core/templates/user/api_key.html:44
#: core/templates/user/preferences.html:45 gym/models/contract.py:203
#: gym/templates/contract/view.html:41 gym/templates/contract/view.html:106
#: gym/templates/gym/member_list.html:248
-#: manager/templates/schedule/view.html:286
-#: manager/templates/workout/view.html:165
-#: nutrition/templates/ingredient/view.html:228
+#: manager/templates/schedule/view.html:285
+#: manager/templates/workout/view.html:163
+#: nutrition/templates/ingredient/view.html:202
msgid "Options"
msgstr "Alternativ"
@@ -624,12 +629,11 @@ msgstr "Licens lista"
#: gym/templates/gym/member_list.html:299
#: mailer/templates/mailer/gym/overview.html:30
#: manager/templates/calendar/day.html:87
-#: nutrition/templates/ingredient/pending.html:30
#: nutrition/templates/units/list.html:29
msgid "Nothing found"
msgstr "Ingenting hittades"
-#: core/templates/misc/about.html:4 core/templates/template.html:173
+#: core/templates/misc/about.html:4 core/templates/template.html:175
msgid "Imprint"
msgstr ""
@@ -646,180 +650,175 @@ msgstr ""
"Om en licens har lokaliserats, t. ex. de landsspecifika Creative Commons "
"licenserna, lägg till dessa som separata ingångar här."
-#: core/templates/navigation.html:27 software/templates/features.html:437
+#: core/templates/navigation.html:28 software/templates/features.html:437
msgid "Training"
msgstr ""
-#: core/templates/navigation.html:34 core/templates/user/overview.html:25
+#: core/templates/navigation.html:37 core/templates/user/overview.html:25
msgid "Workouts"
msgstr "Träningspass"
-#: core/templates/navigation.html:42
+#: core/templates/navigation.html:46
msgid "Workouts schedules"
msgstr "Träningscheman"
-#: core/templates/navigation.html:50 core/templates/user/overview.html:70
+#: core/templates/navigation.html:54 core/templates/user/overview.html:70
#: manager/templates/calendar/month.html:10
#: manager/templates/calendar/month.html:21
msgid "Calendar"
msgstr "Kalender"
-#: core/templates/navigation.html:60
+#: core/templates/navigation.html:64
#, fuzzy
#| msgid "Macronutrients"
msgid "Measurements"
msgstr "Makronäringsämnen"
-#: core/templates/navigation.html:70 gallery/templates/images/overview.html:6
+#: core/templates/navigation.html:75 gallery/templates/images/overview.html:6
msgid "Gallery"
msgstr "Galleri"
-#: core/templates/navigation.html:76
+#: core/templates/navigation.html:81
#, fuzzy
#| msgid "Workout complete!"
msgid "Workout templates"
msgstr "Träningsmallar"
-#: core/templates/navigation.html:82 manager/views/workout.py:84
+#: core/templates/navigation.html:88 manager/views/workout.py:84
msgid "Your templates"
msgstr "Dina mallar"
-#: core/templates/navigation.html:90 manager/views/workout.py:98
+#: core/templates/navigation.html:97 manager/views/workout.py:98
msgid "Public templates"
msgstr "Publika mallar"
-#: core/templates/navigation.html:97 manager/forms.py:129
-#: manager/models/setting.py:54 software/templates/features.html:51
+#: core/templates/navigation.html:105 manager/forms.py:129
+#: manager/models/setting.py:57 software/templates/features.html:51
#: software/templates/features.html:459
msgid "Exercises"
msgstr "Övningar"
-#: core/templates/navigation.html:103 core/templates/navigation.html:170
-#: core/templates/navigation.html:330
+#: core/templates/navigation.html:111 core/templates/navigation.html:184
+#: core/templates/navigation.html:340
msgid "Administration"
msgstr "Administration"
-#: core/templates/navigation.html:106
+#: core/templates/navigation.html:115
#, fuzzy
#| msgid "Exercise day"
msgid "Exercise edit history"
msgstr "Träningsdag"
-#: core/templates/navigation.html:111 exercises/models/base.py:103
+#: core/templates/navigation.html:121 exercises/models/base.py:103
msgid "Equipment"
msgstr "Utrustning"
-#: core/templates/navigation.html:116
+#: core/templates/navigation.html:127
msgid "Muscles"
msgstr "Muskler"
-#: core/templates/navigation.html:121
+#: core/templates/navigation.html:133
#: exercises/templates/categories/admin-overview.html:4
msgid "Categories"
msgstr "Kategorier"
-#: core/templates/navigation.html:136 software/templates/features.html:447
+#: core/templates/navigation.html:148 software/templates/features.html:447
msgid "Nutrition"
msgstr "Kost"
-#: core/templates/navigation.html:143 core/templates/user/overview.html:144
+#: core/templates/navigation.html:156 core/templates/user/overview.html:144
msgid "Nutrition plans"
msgstr "Kostplaner"
-#: core/templates/navigation.html:151 nutrition/templates/bmi/form.html:50
+#: core/templates/navigation.html:165 nutrition/templates/bmi/form.html:50
msgid "BMI calculator"
msgstr "BMI-kalkylator"
-#: core/templates/navigation.html:159 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:174 nutrition/templates/rate/form.html:17
msgid "Daily calories calculator"
msgstr "Dagliga-kalorier-kalkylator"
-#: core/templates/navigation.html:165
+#: core/templates/navigation.html:179
#: nutrition/templates/ingredient/overview.html:10
msgid "Ingredient overview"
msgstr "Ingrediensöversikt"
-#: core/templates/navigation.html:172 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:187 nutrition/templates/units/list.html:6
msgid "Ingredient weight units"
msgstr "Ingrediens viktenheter"
-#: core/templates/navigation.html:177
-#: nutrition/templates/ingredient/pending.html:6
-msgid "Ingredients pending review"
-msgstr "Ingredienser i avvaktan på översyn"
-
-#: core/templates/navigation.html:193 software/templates/features.html:442
+#: core/templates/navigation.html:203 software/templates/features.html:442
msgid "Body weight"
msgstr ""
-#: core/templates/navigation.html:200 core/templates/user/overview.html:114
+#: core/templates/navigation.html:210 core/templates/user/overview.html:114
msgid "Weight overview"
msgstr "Viktöversikt"
-#: core/templates/navigation.html:207 weight/views.py:65
+#: core/templates/navigation.html:217 weight/views.py:65
msgid "Add weight entry"
msgstr "Lägg till vikt"
-#: core/templates/navigation.html:221
+#: core/templates/navigation.html:231
msgid "About this software"
msgstr "Om programvaran"
-#: core/templates/navigation.html:227 software/templates/about_us.html:5
+#: core/templates/navigation.html:237 software/templates/about_us.html:5
msgid "About us"
msgstr "Om oss"
-#: core/templates/navigation.html:233 software/templates/features.html:507
+#: core/templates/navigation.html:243 software/templates/features.html:507
msgid "REST API"
msgstr "REST API"
-#: core/templates/navigation.html:239 utils/models.py:45
+#: core/templates/navigation.html:249 utils/models.py:45
msgid "License"
msgstr "Licens"
-#: core/templates/navigation.html:245
+#: core/templates/navigation.html:255
msgid "Developer documentation"
msgstr "Dokument för utvecklare"
-#: core/templates/navigation.html:252
+#: core/templates/navigation.html:262
msgid "Get the code"
msgstr "Hämta koden"
-#: core/templates/navigation.html:259 core/templates/template.html:212
+#: core/templates/navigation.html:269 core/templates/template.html:214
#: software/templates/features.html:582
msgid "Translate"
msgstr "Översätt"
-#: core/templates/navigation.html:293 core/templates/user/login.html:28
+#: core/templates/navigation.html:303 core/templates/user/login.html:28
msgid "Reset password"
msgstr "Återställ lösenord"
-#: core/templates/navigation.html:311
+#: core/templates/navigation.html:321
msgid "My preferences"
msgstr "Mina preferenser"
-#: core/templates/navigation.html:320
+#: core/templates/navigation.html:330
msgid "Logout"
msgstr "Logga ut"
-#: core/templates/navigation.html:343
+#: core/templates/navigation.html:353
msgid "Licenses"
msgstr "Licenser"
-#: core/templates/navigation.html:351
+#: core/templates/navigation.html:361
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr "Repetitioner"
-#: core/templates/navigation.html:359 core/templates/weight_unit/list.html:4
-#: nutrition/templates/ingredient/view.html:167
+#: core/templates/navigation.html:369 core/templates/weight_unit/list.html:4
+#: nutrition/templates/ingredient/view.html:141
msgid "Weight units"
msgstr "Viktenheter"
-#: core/templates/navigation.html:367 core/templates/user/list.html:4
+#: core/templates/navigation.html:377 core/templates/user/list.html:4
msgid "User list"
msgstr "Användarlista"
-#: core/templates/navigation.html:373
+#: core/templates/navigation.html:383
msgid "Gyms"
msgstr "Gym"
@@ -873,12 +872,12 @@ msgstr "Tack för att du använder vår sida!"
msgid "The %(site_name)s team"
msgstr "%(site_name)s lag"
-#: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:11
+#: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:12
msgid "previous"
msgstr "tidigare"
-#: core/templates/tags/pagination.html:31
-#: core/templates/tags/pagination.html:35
+#: core/templates/tags/pagination.html:33
+#: core/templates/tags/pagination.html:38
msgid "next"
msgstr "nästa"
@@ -903,34 +902,34 @@ msgid "Add exercises to this workout day"
msgstr "Lägg till övningar i denna träningsdag"
#: core/templates/tags/render_weight_log.html:17 manager/helpers.py:86
-#: manager/models/setting.py:69 manager/templates/set/formset.html:9
+#: manager/models/setting.py:72 manager/templates/set/formset.html:9
msgid "Reps"
msgstr "Reps"
#: core/templates/tags/render_weight_log.html:30 manager/forms.py:191
-#: manager/models/log.py:103 manager/models/setting.py:99
+#: manager/models/log.py:103 manager/models/setting.py:102
#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
msgid "RiR"
msgstr ""
-#: core/templates/template.html:120 manager/templates/calendar/month.html:138
-#: manager/templates/schedule/view.html:249
-#: manager/templates/schedule/view.html:270
-#: manager/templates/workout/view.html:86
-#: manager/templates/workout/view.html:139
+#: core/templates/template.html:122 manager/templates/calendar/month.html:138
+#: manager/templates/schedule/view.html:248
+#: manager/templates/schedule/view.html:269
+#: manager/templates/workout/view.html:84
+#: manager/templates/workout/view.html:137
msgid "Close"
msgstr "Stäng"
-#: core/templates/template.html:136
+#: core/templates/template.html:138
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:141
+#: core/templates/template.html:143
msgid "Create some demo entries"
msgstr "Skapa några demoposter"
-#: core/templates/template.html:178 software/templates/features.html:547
+#: core/templates/template.html:180 software/templates/features.html:547
#: software/templates/tos.html:7
msgid "Terms of service"
msgstr "Villkor för tjänsten"
@@ -1030,7 +1029,7 @@ msgid "Overview"
msgstr "Överblick"
#: core/templates/user/overview.html:28
-#: manager/templates/schedule/view.html:164
+#: manager/templates/schedule/view.html:163
#: manager/templates/workout/overview.html:39 manager/views/schedule_step.py:60
msgid "Add workout"
msgstr "Lägg till träningspass"
@@ -1038,20 +1037,20 @@ msgstr "Lägg till träningspass"
#: core/templates/user/overview.html:34 core/templates/user/overview.html:76
#: core/templates/user/overview.html:120 core/templates/user/overview.html:152
#: exercises/models/base.py:118 exercises/models/base.py:124
-#: exercises/models/exercise.py:63 exercises/models/exercise.py:69
+#: exercises/models/exercise.py:64 exercises/models/exercise.py:70
#: exercises/models/image.py:107 exercises/models/image.py:113
#: exercises/models/video.py:163 exercises/models/video.py:169
#: gallery/models/image.py:42 manager/helpers.py:85 manager/models/log.py:100
#: manager/models/session.py:67 measurements/models/measurement.py:47
-#: nutrition/models/ingredient.py:101 nutrition/models/ingredient.py:107
-#: nutrition/models/ingredient.py:222 weight/models.py:33
+#: nutrition/models/ingredient.py:87 nutrition/models/ingredient.py:93
+#: nutrition/models/ingredient.py:216 weight/models.py:51
#: weight/templates/import_csv_preview.html:13
#: weight/templates/import_csv_preview.html:42 weight/views.py:144
msgid "Date"
msgstr "Datum"
#: core/templates/user/overview.html:35 core/templates/user/overview.html:153
-#: exercises/models/exercise.py:51 gallery/models/image.py:65
+#: exercises/models/exercise.py:52 gallery/models/image.py:65
#: gym/models/contract.py:58 gym/models/contract.py:109
#: manager/models/day.py:37 manager/models/workout.py:63
#: measurements/models/measurement.py:62 nutrition/models/plan.py:67
@@ -1069,13 +1068,13 @@ msgstr "Senaste aktiviteten"
#: core/templates/user/overview.html:58
#: manager/templates/calendar/month.html:128
-#: manager/templates/schedule/view.html:145
+#: manager/templates/schedule/view.html:144
#: manager/templates/workout/overview.html:28
msgid "No workouts found."
msgstr "Inga träningspass hittade."
#: core/templates/user/overview.html:68 manager/forms.py:280
-#: manager/templates/workout/view.html:108
+#: manager/templates/workout/view.html:106
msgid "Log"
msgstr "Log"
@@ -1099,35 +1098,35 @@ msgstr "Tid"
#: core/templates/user/overview.html:112 core/templates/user/overview.html:121
#: manager/forms.py:186 manager/helpers.py:86 manager/models/log.py:86
-#: manager/models/setting.py:79 manager/templates/log/add.html:54
-#: manager/templates/set/formset.html:11 weight/models.py:35
+#: manager/models/setting.py:82 manager/templates/log/add.html:54
+#: manager/templates/set/formset.html:11 weight/models.py:53
#: weight/templates/import_csv_preview.html:14
#: weight/templates/import_csv_preview.html:43 weight/views.py:144
msgid "Weight"
msgstr "Vikt"
-#: core/templates/user/overview.html:154 nutrition/models/ingredient.py:130
-#: nutrition/templates/ingredient/view.html:77 nutrition/views/plan.py:237
+#: core/templates/user/overview.html:154 nutrition/models/ingredient.py:116
+#: nutrition/templates/ingredient/view.html:51 nutrition/views/plan.py:237
msgid "Energy"
msgstr "Energi"
-#: core/templates/user/overview.html:155 nutrition/models/ingredient.py:137
-#: nutrition/templates/ingredient/view.html:84 nutrition/views/plan.py:243
+#: core/templates/user/overview.html:155 nutrition/models/ingredient.py:123
+#: nutrition/templates/ingredient/view.html:58 nutrition/views/plan.py:243
msgid "Protein"
msgstr "Protein"
-#: core/templates/user/overview.html:156 nutrition/models/ingredient.py:145
-#: nutrition/templates/ingredient/view.html:90 nutrition/views/plan.py:251
+#: core/templates/user/overview.html:156 nutrition/models/ingredient.py:131
+#: nutrition/templates/ingredient/view.html:64 nutrition/views/plan.py:251
msgid "Carbohydrates"
msgstr "Kolhydrater"
-#: core/templates/user/overview.html:157 nutrition/models/ingredient.py:163
-#: nutrition/templates/ingredient/view.html:106 nutrition/views/plan.py:265
+#: core/templates/user/overview.html:157 nutrition/models/ingredient.py:149
+#: nutrition/templates/ingredient/view.html:80 nutrition/views/plan.py:265
msgid "Fat"
msgstr "Fett"
#: core/templates/user/overview.html:170
-#: nutrition/templates/ingredient/view.html:79
+#: nutrition/templates/ingredient/view.html:53
msgid "kcal"
msgstr "kcal"
@@ -1139,7 +1138,7 @@ msgstr "kcal"
#: gym/templates/gym/member_list.html:207
#: gym/templates/gym/member_list.html:240
#: gym/templates/gym/member_list.html:277
-#: manager/templates/schedule/view.html:101
+#: manager/templates/schedule/view.html:100
msgid "Actions"
msgstr "Åtgärder"
@@ -1182,7 +1181,7 @@ msgid "Details"
msgstr "Detaljer"
#: core/templates/user/overview.html:258 gym/views/export.py:57
-#: manager/helpers.py:86 manager/templates/schedule/view.html:99
+#: manager/helpers.py:86 manager/templates/schedule/view.html:98
msgid "Nr."
msgstr "Nr."
@@ -1227,7 +1226,7 @@ msgid "Documents"
msgstr "Dokument"
#: core/templates/user/overview.html:412 gym/templates/document/list.html:32
-#: manager/forms.py:292 manager/templates/workout/view.html:134
+#: manager/forms.py:292 manager/templates/workout/view.html:132
msgid "Download"
msgstr "Hämta"
@@ -1278,13 +1277,13 @@ msgid "kg"
msgstr "kg"
#: core/templatetags/wger_extras.py:207
-#: nutrition/templates/ingredient/view.html:86
-#: nutrition/templates/ingredient/view.html:92
-#: nutrition/templates/ingredient/view.html:99
-#: nutrition/templates/ingredient/view.html:108
-#: nutrition/templates/ingredient/view.html:115
-#: nutrition/templates/ingredient/view.html:137
-#: nutrition/templates/ingredient/view.html:147
+#: nutrition/templates/ingredient/view.html:60
+#: nutrition/templates/ingredient/view.html:66
+#: nutrition/templates/ingredient/view.html:73
+#: nutrition/templates/ingredient/view.html:82
+#: nutrition/templates/ingredient/view.html:89
+#: nutrition/templates/ingredient/view.html:111
+#: nutrition/templates/ingredient/view.html:121
msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr "g"
@@ -1302,7 +1301,7 @@ msgstr "oz"
#: exercises/views/equipment.py:103 exercises/views/exercises.py:73
#: exercises/views/muscles.py:99 manager/views/schedule.py:309
#: manager/views/schedule_step.py:128 manager/views/workout.py:249
-#: manager/views/workout_session.py:142 nutrition/views/ingredient.py:116
+#: manager/views/workout_session.py:142 nutrition/views/ingredient.py:119
#: nutrition/views/unit.py:110
msgid "Successfully deleted"
msgstr "Borttagning genomförd"
@@ -1314,7 +1313,7 @@ msgstr "Borttagning genomförd"
#: gym/views/admin_notes.py:196 gym/views/document.py:206 gym/views/gym.py:481
#: manager/views/schedule.py:316 manager/views/schedule_step.py:138
#: manager/views/workout.py:253 manager/views/workout_session.py:156
-#: nutrition/views/ingredient.py:123 nutrition/views/unit.py:117
+#: nutrition/views/ingredient.py:126 nutrition/views/unit.py:117
#, python-brace-format
msgid "Delete {0}?"
msgstr "Ta bort {0}?"
@@ -1327,7 +1326,7 @@ msgstr "Ta bort {0}?"
#: gym/views/contract.py:186 gym/views/contract_option.py:123
#: gym/views/contract_type.py:123 gym/views/document.py:171
#: gym/views/gym.py:463 manager/views/day.py:100 manager/views/schedule.py:333
-#: manager/views/workout.py:267 nutrition/views/ingredient.py:142
+#: manager/views/workout.py:267 nutrition/views/ingredient.py:145
#: nutrition/views/unit.py:143
#, python-brace-format
msgid "Edit {0}"
@@ -1401,7 +1400,7 @@ msgstr "Gym"
msgid "A verification email was sent to %(email)s"
msgstr ""
-#: exercises/models/base.py:82 nutrition/models/ingredient.py:236
+#: exercises/models/base.py:82 nutrition/models/ingredient.py:230
msgid "Category"
msgstr "Kategori"
@@ -1421,7 +1420,7 @@ msgstr ""
msgid "Exercise Categories"
msgstr "Övningskategorier"
-#: exercises/models/comment.py:52 exercises/models/exercise_alias.py:52
+#: exercises/models/comment.py:52 exercises/models/exercise_alias.py:53
#: exercises/models/image.py:74 exercises/models/video.py:98
#: manager/forms.py:178 manager/helpers.py:86 manager/models/log.py:52
msgid "Exercise"
@@ -1431,12 +1430,12 @@ msgstr "Träning"
msgid "A comment about how to correctly do this exercise."
msgstr "En kommentar om hur man utför denna övning korrekt."
-#: exercises/models/exercise.py:76 nutrition/models/ingredient.py:95
+#: exercises/models/exercise.py:77 nutrition/models/ingredient.py:81
#: nutrition/models/weight_unit.py:32
msgid "Language"
msgstr "Språk"
-#: exercises/models/exercise_alias.py:58
+#: exercises/models/exercise_alias.py:59
#, fuzzy
#| msgid "Correcting an exercise"
msgid "Alias for an exercise"
@@ -1585,7 +1584,7 @@ msgstr "Åtgärder"
#: manager/models/schedule.py:44 manager/models/session.py:49
#: manager/models/workout.py:89 measurements/models/category.py:31
#: measurements/models/measurement.py:42 nutrition/models/plan.py:54
-#: nutrition/templates/ingredient/pending.html:16 weight/models.py:42
+#: weight/models.py:60
msgid "User"
msgstr "Användare"
@@ -1715,9 +1714,9 @@ msgid "Contract type"
msgstr "Kontrakttyp"
#: gym/models/contract.py:211 gym/templates/contract/view.html:59
-#: manager/templates/log/add.html:52 nutrition/forms.py:62
-#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:105
-#: nutrition/models/meal_item.py:72
+#: manager/templates/log/add.html:52 nutrition/forms.py:63
+#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:108
+#: nutrition/models/meal_item.py:73
msgid "Amount"
msgstr "Mängd"
@@ -1734,7 +1733,7 @@ msgid "Contract is active"
msgstr "Kontraktet är aktiv"
#: gym/models/contract.py:237 gym/templates/contract/view.html:69
-#: manager/models/schedule.py:61 manager/templates/schedule/view.html:68
+#: manager/models/schedule.py:61 manager/templates/schedule/view.html:67
msgid "Start date"
msgstr "Startdatum"
@@ -2134,7 +2133,7 @@ msgstr ""
#: mailer/templates/mailer/gym/form.html:28
#: mailer/templates/mailer/gym/preview.html:62
-#: manager/templates/workout/view.html:42
+#: manager/templates/workout/view.html:40
msgid "Steps"
msgstr "Steg"
@@ -2158,7 +2157,7 @@ msgstr ""
"mailen"
#: mailer/templates/mailer/gym/preview.html:22
-#: software/templates/about_us.html:60
+#: software/templates/about_us.html:70
msgid "Current version"
msgstr "Aktuell version"
@@ -2191,18 +2190,18 @@ msgstr ""
"Du kan söka efter mer än en övning, dessa kommer att grupperas för ett "
"superset."
-#: manager/forms.py:140 nutrition/forms.py:252
+#: manager/forms.py:140 nutrition/forms.py:253
#, fuzzy
#| msgid "Also use ingredients in English"
msgid "Also search for names in English"
msgstr "Också använda ingredienser i Svenska"
#: manager/forms.py:168 manager/forms.py:173 manager/models/log.py:64
-#: manager/models/log.py:92 manager/models/setting.py:59
-#: manager/models/setting.py:90 manager/templates/log/add.html:53
+#: manager/models/log.py:92 manager/models/setting.py:62
+#: manager/models/setting.py:93 manager/templates/log/add.html:53
#: manager/templates/log/add.html:55 manager/templates/set/formset.html:10
#: manager/templates/set/formset.html:12 measurements/models/category.py:41
-#: nutrition/forms.py:66
+#: nutrition/forms.py:67
msgid "Unit"
msgstr "Enhet"
@@ -2210,15 +2209,15 @@ msgstr "Enhet"
msgid "Type"
msgstr "Typ"
-#: manager/forms.py:280 manager/templates/workout/view.html:115
+#: manager/forms.py:280 manager/templates/workout/view.html:113
msgid "Table"
msgstr "Tabell"
-#: manager/forms.py:282 manager/templates/workout/view.html:121
+#: manager/forms.py:282 manager/templates/workout/view.html:119
msgid "with images"
msgstr "med bilder"
-#: manager/forms.py:283 manager/templates/workout/view.html:127
+#: manager/forms.py:283 manager/templates/workout/view.html:125
msgid "with comments"
msgstr "med kommentarer"
@@ -2227,11 +2226,10 @@ msgid "Workout will expire soon"
msgstr "Träningspass snart löper ut"
#: manager/models/day.py:34 manager/models/log.py:58
-#: manager/models/session.py:60 manager/templates/schedule/view.html:103
-#: manager/templates/workout/view.html:11
-#: manager/templates/workout/view.html:19 manager/views/pdf.py:85
-#: manager/views/pdf.py:161 manager/views/schedule.py:151
-#: manager/views/schedule.py:221
+#: manager/models/session.py:60 manager/templates/schedule/view.html:102
+#: manager/templates/workout/view.html:9 manager/templates/workout/view.html:17
+#: manager/views/pdf.py:85 manager/views/pdf.py:161
+#: manager/views/schedule.py:151 manager/views/schedule.py:221
msgid "Workout"
msgstr "Träning"
@@ -2251,7 +2249,7 @@ msgstr "Dag"
msgid "Name or short description of the schedule. For example 'Program XYZ'."
msgstr "Namn eller en kort beskrivning av schemat. Till exempel 'Program XYZ'."
-#: manager/models/schedule.py:65 manager/templates/schedule/view.html:72
+#: manager/models/schedule.py:65 manager/templates/schedule/view.html:71
msgid "Schedule active"
msgstr "Schema aktivt"
@@ -2265,7 +2263,7 @@ msgstr ""
"exempel på instrumentpanelen). Alla andra scheman kommer då att markeras som "
"inaktiva"
-#: manager/models/schedule.py:77 manager/templates/schedule/view.html:82
+#: manager/models/schedule.py:77 manager/templates/schedule/view.html:81
msgid "Is a loop"
msgstr "Är en loop"
@@ -2286,8 +2284,8 @@ msgid "The duration in weeks"
msgstr "Varaktighet i veckor"
#: manager/models/schedule_step.py:64 manager/models/set.py:53
-#: manager/models/setting.py:110 nutrition/models/meal.py:55
-#: nutrition/models/meal_item.py:65
+#: manager/models/setting.py:113 nutrition/models/meal.py:55
+#: nutrition/models/meal_item.py:66
msgid "Order"
msgstr "Ordning"
@@ -2337,7 +2335,7 @@ msgstr "Träningsdag"
msgid "Number of sets"
msgstr "Antal set"
-#: manager/models/setting.py:48
+#: manager/models/setting.py:51
msgid "Sets"
msgstr "Set"
@@ -2409,7 +2407,7 @@ msgstr ""
msgid "Go to current month"
msgstr "Gå till aktuell månad"
-#: manager/templates/calendar/month.html:188
+#: manager/templates/calendar/month.html:190
msgid "Add new log"
msgstr "Lägg till ny logg"
@@ -2449,8 +2447,8 @@ msgid "Your schedules"
msgstr "Dina scheman"
#: manager/templates/schedule/overview.html:19
-#: manager/templates/schedule/view.html:132
-#: manager/templates/schedule/view.html:184
+#: manager/templates/schedule/view.html:131
+#: manager/templates/schedule/view.html:183
#: manager/templates/workout/overview.html:16
msgid "active"
msgstr "aktiv"
@@ -2508,11 +2506,11 @@ msgstr ""
msgid "Add schedule"
msgstr "Lägg till schema"
-#: manager/templates/schedule/view.html:10
+#: manager/templates/schedule/view.html:9
msgid "Schedule"
msgstr "Schema"
-#: manager/templates/schedule/view.html:86
+#: manager/templates/schedule/view.html:85
msgid ""
"This schedule is a loop and will go through the workouts above till you "
"deactivate it"
@@ -2520,19 +2518,19 @@ msgstr ""
"Detta schema är en loop och kommer att gå igenom de pass ovan tills du "
"avaktiverar den"
-#: manager/templates/schedule/view.html:104
+#: manager/templates/schedule/view.html:103
msgid "Weeks"
msgstr "Veckor"
-#: manager/templates/schedule/view.html:116
+#: manager/templates/schedule/view.html:115
msgid "Move me"
msgstr "Flytta mig"
-#: manager/templates/schedule/view.html:157
+#: manager/templates/schedule/view.html:156
msgid "Start schedule"
msgstr "Starta schema"
-#: manager/templates/schedule/view.html:188
+#: manager/templates/schedule/view.html:187
#, python-format
msgid ""
"%(weeks)s Week\n"
@@ -2543,11 +2541,11 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: manager/templates/schedule/view.html:222
+#: manager/templates/schedule/view.html:221
msgid "Adding workouts"
msgstr "Lägga till träningspass"
-#: manager/templates/schedule/view.html:224
+#: manager/templates/schedule/view.html:223
#, fuzzy
#| msgid ""
#| "Add as many workouts to the schedule as you want. You can\n"
@@ -2564,21 +2562,21 @@ msgstr ""
"genom att dra och släppa dem. Det är också möjligt att lägga till en övning "
"mer än en gång."
-#: manager/templates/schedule/view.html:233
-#: manager/templates/schedule/view.html:244
-#: manager/templates/schedule/view.html:291
-#: manager/templates/workout/view.html:71
-#: manager/templates/workout/view.html:81
-#: manager/templates/workout/view.html:180
+#: manager/templates/schedule/view.html:232
+#: manager/templates/schedule/view.html:243
+#: manager/templates/schedule/view.html:290
+#: manager/templates/workout/view.html:69
+#: manager/templates/workout/view.html:79
+#: manager/templates/workout/view.html:178
msgid "Export calendar file"
msgstr "Exportera kalenderfil"
-#: manager/templates/schedule/view.html:237
+#: manager/templates/schedule/view.html:236
msgid "Export this schedule as a calendar file."
msgstr "Exportera detta schema som en kalenderfil."
-#: manager/templates/schedule/view.html:238
-#: manager/templates/workout/view.html:76
+#: manager/templates/schedule/view.html:237
+#: manager/templates/workout/view.html:74
#, fuzzy
#| msgid ""
#| "You can then import the file it into your calendar\n"
@@ -2596,18 +2594,18 @@ msgstr ""
"calendar, Outlook eller iCal. Detta kommer skapa ett \"möte\" för varje "
"träningsdag med övningar inkluderade."
-#: manager/templates/schedule/view.html:259
-#: manager/templates/schedule/view.html:295
-#: manager/templates/workout/view.html:96
-#: manager/templates/workout/view.html:176
+#: manager/templates/schedule/view.html:258
+#: manager/templates/schedule/view.html:294
+#: manager/templates/workout/view.html:94
+#: manager/templates/workout/view.html:174
msgid "Download as PDF"
msgstr "Ladda ner som PDF"
-#: manager/templates/schedule/view.html:300
+#: manager/templates/schedule/view.html:299
msgid "Edit schedule"
msgstr "Redigera schema"
-#: manager/templates/schedule/view.html:305
+#: manager/templates/schedule/view.html:304
msgid "Delete schedule"
msgstr "Ta bort schema"
@@ -2749,12 +2747,12 @@ msgid "Mark as workout"
msgstr "Skapa en kopia av detta träningspass"
#: manager/templates/workout/template_view.html:65
-#: manager/templates/workout/view.html:51
+#: manager/templates/workout/view.html:49
msgid "Muscles trained"
msgstr "Muskler som tränats"
#: manager/templates/workout/template_view.html:68
-#: manager/templates/workout/view.html:54
+#: manager/templates/workout/view.html:52
msgid ""
"Images show combined muscles as trained by the exercises on the workout."
msgstr ""
@@ -2766,35 +2764,35 @@ msgstr ""
msgid "Use this template"
msgstr "Dela denna sida"
-#: manager/templates/workout/view.html:45
+#: manager/templates/workout/view.html:43
msgid "Add training days"
msgstr "Lägg till träningsdagar"
-#: manager/templates/workout/view.html:46
+#: manager/templates/workout/view.html:44
msgid "Add workout sets to days"
msgstr "Lägg till träningsset till dagar"
-#: manager/templates/workout/view.html:47
+#: manager/templates/workout/view.html:45
msgid "Set the repetitions for each set"
msgstr "Ange repetitioner för varje set"
-#: manager/templates/workout/view.html:75
+#: manager/templates/workout/view.html:73
msgid "Export this workout as a calendar file."
msgstr "Exportera detta träningspass som en kalenderfil."
-#: manager/templates/workout/view.html:146
+#: manager/templates/workout/view.html:144
msgid "Logs"
msgstr ""
-#: manager/templates/workout/view.html:148
+#: manager/templates/workout/view.html:146
msgid "View logs"
msgstr ""
-#: manager/templates/workout/view.html:171 manager/views/schedule_step.py:99
+#: manager/templates/workout/view.html:169 manager/views/schedule_step.py:99
msgid "Edit workout"
msgstr "Redigera träningspass"
-#: manager/templates/workout/view.html:184 manager/views/workout.py:281
+#: manager/templates/workout/view.html:182 manager/views/workout.py:281
msgid "Mark as template"
msgstr ""
@@ -2841,41 +2839,41 @@ msgstr "Detta kommer ta bort alla viktloggar för denna dag med."
msgid "Value"
msgstr ""
-#: nutrition/forms.py:117
+#: nutrition/forms.py:118
#, fuzzy
#| msgid "Height (cm)"
msgid "Height (in)"
msgstr "Längd (cm)"
-#: nutrition/forms.py:120
+#: nutrition/forms.py:121
#, fuzzy
#| msgid "Weight log"
msgid "Weight (kg)"
msgstr "Viktlogg"
-#: nutrition/forms.py:120
+#: nutrition/forms.py:121
#, fuzzy
#| msgid "Weight log"
msgid "Weight (lbs)"
msgstr "Viktlogg"
-#: nutrition/forms.py:133
+#: nutrition/forms.py:134
msgid "Calculate"
msgstr "Beräkna"
-#: nutrition/forms.py:207 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:208 nutrition/templates/rate/form.html:76
msgid "Basic caloric intake"
msgstr "Grundläggande kaloriintag"
-#: nutrition/forms.py:208
+#: nutrition/forms.py:209
msgid "Your basic caloric intake as calculated for your data"
msgstr "Ditt grundläggande kaloriintag som beräknats för din data"
-#: nutrition/forms.py:213
+#: nutrition/forms.py:214
msgid "Additional calories"
msgstr "Extra kalorier"
-#: nutrition/forms.py:215
+#: nutrition/forms.py:216
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
@@ -2883,70 +2881,55 @@ msgstr ""
"Extra kalorier att lägga till basen (för att subtrahera, ange ett negativt "
"tal)"
-#: nutrition/forms.py:248 nutrition/models/ingredient_weight_unit.py:39
-#: nutrition/models/log.py:84 nutrition/models/meal_item.py:53
+#: nutrition/forms.py:249 nutrition/models/ingredient_weight_unit.py:39
+#: nutrition/models/log.py:87 nutrition/models/meal_item.py:54
msgid "Ingredient"
msgstr "Ingrediens"
-#: nutrition/models/ingredient.py:131
+#: nutrition/models/ingredient.py:117
msgid "In kcal per 100g"
msgstr "I kcal per 100g"
-#: nutrition/models/ingredient.py:138 nutrition/models/ingredient.py:146
-#: nutrition/models/ingredient.py:156 nutrition/models/ingredient.py:164
-#: nutrition/models/ingredient.py:174 nutrition/models/ingredient.py:184
-#: nutrition/models/ingredient.py:194
+#: nutrition/models/ingredient.py:124 nutrition/models/ingredient.py:132
+#: nutrition/models/ingredient.py:142 nutrition/models/ingredient.py:150
+#: nutrition/models/ingredient.py:160 nutrition/models/ingredient.py:170
+#: nutrition/models/ingredient.py:180
msgid "In g per 100g of product"
msgstr "I g per 100g av produkt"
-#: nutrition/models/ingredient.py:155
-#: nutrition/templates/ingredient/view.html:96 nutrition/views/plan.py:259
+#: nutrition/models/ingredient.py:141
+#: nutrition/templates/ingredient/view.html:70 nutrition/views/plan.py:259
msgid "Sugar content in carbohydrates"
msgstr "Sockerinehåll i kolhydraterna"
-#: nutrition/models/ingredient.py:173
-#: nutrition/templates/ingredient/view.html:112 nutrition/views/plan.py:273
+#: nutrition/models/ingredient.py:159
+#: nutrition/templates/ingredient/view.html:86 nutrition/views/plan.py:273
msgid "Saturated fat content in fats"
msgstr "Mättat-fett innehåll i fettet"
-#: nutrition/models/ingredient.py:183
-#: nutrition/templates/ingredient/view.html:134 nutrition/views/plan.py:279
-msgid "Fibres"
-msgstr "Fibrer"
+#: nutrition/models/ingredient.py:169
+#: nutrition/templates/ingredient/view.html:108 nutrition/views/plan.py:279
+msgid "Fiber"
+msgstr ""
-#: nutrition/models/ingredient.py:193
-#: nutrition/templates/ingredient/view.html:144 nutrition/views/plan.py:285
+#: nutrition/models/ingredient.py:179
+#: nutrition/templates/ingredient/view.html:118 nutrition/views/plan.py:285
msgid "Sodium"
msgstr "Natrium"
-#: nutrition/models/ingredient.py:215
+#: nutrition/models/ingredient.py:209
msgid "Link to product"
msgstr ""
-#: nutrition/models/ingredient.py:244
+#: nutrition/models/ingredient.py:238
msgid "Brand name of product"
msgstr ""
-#: nutrition/models/ingredient.py:304
+#: nutrition/models/ingredient.py:305
#, python-brace-format
msgid "The total energy ({self.energy}kcal) is not the approximate sum of the "
msgstr ""
-#: nutrition/models/ingredient.py:383 nutrition/views/ingredient.py:196
-msgid "Ingredient was successfully added to the general database"
-msgstr "Ingrediensen lades till den allmänna databasen"
-
-#: nutrition/models/ingredient.py:408
-msgid "New user submitted ingredient"
-msgstr "Ny användareinlämnad ingrediens"
-
-#: nutrition/models/ingredient.py:410
-#, fuzzy, python-brace-format
-#| msgid "The user {0} submitted a new ingredient \"{1}\"."
-msgid ""
-"The user {request.user.username} submitted a new ingredient \"{self.name}\"."
-msgstr "Användare {0} har skickat in en ny ingrediens \"{1}\"."
-
#: nutrition/models/ingredient_category.py:31
msgid "Ingredient Categories"
msgstr ""
@@ -2959,16 +2942,16 @@ msgstr "Mängd i gram"
msgid "Unit amount, e.g. \"1 Cup\" or \"1/2 spoon\""
msgstr "Enhetsmängd (e.g. \"1 DL\" eller \"1/2 tesked\")"
-#: nutrition/models/log.py:49 nutrition/models/meal.py:50
-#: nutrition/models/meal_item.py:47 nutrition/models/plan.py:106
+#: nutrition/models/log.py:52 nutrition/models/meal.py:50
+#: nutrition/models/meal_item.py:48 nutrition/models/plan.py:108
msgid "Nutrition plan"
msgstr "Kostplan"
-#: nutrition/models/log.py:58
+#: nutrition/models/log.py:61
msgid "Meal"
msgstr "Måltid"
-#: nutrition/models/log.py:68
+#: nutrition/models/log.py:71
#, fuzzy
#| msgid "Time (approx)"
msgid "Date and Time (Approx.)"
@@ -2992,11 +2975,11 @@ msgstr ""
"En beskrivning av målet för planen, t.ex. \"Gå upp i vikt\" eller "
"\"Förbereda mig för sommaren\""
-#: nutrition/models/plan.py:88
+#: nutrition/models/plan.py:90
msgid "Use daily calories"
msgstr "Använda dagliga kalorier"
-#: nutrition/models/plan.py:91
+#: nutrition/models/plan.py:93
msgid ""
"Tick the box if you want to mark this plan as having a goal amount of "
"calories. You can use the calculator or enter the value yourself."
@@ -3116,67 +3099,36 @@ msgstr "Sök"
msgid "Add ingredient"
msgstr "Lägg till ingrediens"
-#: nutrition/templates/ingredient/pending.html:14
-msgid "Submission date"
-msgstr "Inlämningsdatum"
-
-#: nutrition/templates/ingredient/view.html:27
-msgid "Ingredient is pending review"
-msgstr "Ingrediensen är i väntan på granskning"
-
-#: nutrition/templates/ingredient/view.html:28
-msgid ""
-"This user submitted ingredient is pending a decision to be\n"
-"included in the database. Till then, it will not be shown in the overview "
-"or\n"
-"the search."
-msgstr ""
-"Denna användarskapade ingrediens väntar beslut på om den skall inkluderas i "
-"databasen. Tills dess kommed den inte visas i översikten eller i "
-"sökresultaten."
-
-#: nutrition/templates/ingredient/view.html:31
-msgid "Please select one of the options below."
-msgstr "Vänligen välj ett av alternativen nedan."
-
-#: nutrition/templates/ingredient/view.html:38
-msgid "Accept"
-msgstr "Acceptera"
-
-#: nutrition/templates/ingredient/view.html:42
-msgid "Decline"
-msgstr "Neka"
-
-#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:229
+#: nutrition/templates/ingredient/view.html:45 nutrition/views/plan.py:229
msgid "Macronutrients"
msgstr "Makronäringsämnen"
-#: nutrition/templates/ingredient/view.html:80
+#: nutrition/templates/ingredient/view.html:54
msgid "kJ"
msgstr ""
-#: nutrition/templates/ingredient/view.html:101
-#: nutrition/templates/ingredient/view.html:117
-#: nutrition/templates/ingredient/view.html:139
-#: nutrition/templates/ingredient/view.html:149
+#: nutrition/templates/ingredient/view.html:75
+#: nutrition/templates/ingredient/view.html:91
+#: nutrition/templates/ingredient/view.html:113
+#: nutrition/templates/ingredient/view.html:123
msgid "n.A."
msgstr "n.A."
-#: nutrition/templates/ingredient/view.html:128
+#: nutrition/templates/ingredient/view.html:102
msgid "Others"
msgstr "Andra"
-#: nutrition/templates/ingredient/view.html:170
+#: nutrition/templates/ingredient/view.html:144
#: nutrition/templates/units/list.html:46 nutrition/views/unit.py:86
msgid "Add new weight unit"
msgstr "Lägg till ny viktenhet"
-#: nutrition/templates/ingredient/view.html:232
-#: nutrition/templates/ingredient/view.html:235
+#: nutrition/templates/ingredient/view.html:206
+#: nutrition/templates/ingredient/view.html:209
msgid "Edit ingredient"
msgstr "Redigera ingrediens"
-#: nutrition/templates/ingredient/view.html:239
+#: nutrition/templates/ingredient/view.html:213
msgid "Delete ingredient"
msgstr "Ta bort ingrediens"
@@ -3275,14 +3227,10 @@ msgstr ""
msgid "56 to 90"
msgstr ""
-#: nutrition/views/ingredient.py:154
+#: nutrition/views/ingredient.py:157
msgid "Add a new ingredient"
msgstr "Lägg till en ny ingrediens"
-#: nutrition/views/ingredient.py:209
-msgid "Ingredient was successfully marked as rejected"
-msgstr "Ingrediensen har markerats som nekad"
-
#: nutrition/views/plan.py:120
msgid "Nutritional plan"
msgstr ""
@@ -3327,48 +3275,56 @@ msgid ""
msgstr ""
#: software/templates/about_us.html:18
-msgid "Source code"
-msgstr ""
-
-#: software/templates/about_us.html:20
-msgid "Get the source code of this application and its server on github"
-msgstr ""
-
-#: software/templates/about_us.html:25
msgid "Have a problem or idea?"
msgstr ""
-#: software/templates/about_us.html:27
+#: software/templates/about_us.html:20
msgid ""
"Get in touch if something didn't behave as expected or if there is a feature "
"that you feel is missing."
msgstr ""
-#: software/templates/about_us.html:32
+#: software/templates/about_us.html:26
msgid "Say hi!"
msgstr ""
-#: software/templates/about_us.html:34
+#: software/templates/about_us.html:28
msgid "If you want to chat with us, hop on the Discord server and get in touch"
msgstr ""
-#: software/templates/about_us.html:39 software/templates/features.html:503
+#: software/templates/about_us.html:33
+msgid "Mastodon"
+msgstr ""
+
+#: software/templates/about_us.html:35
+msgid "Follow us on mastodon for updates and news about the project"
+msgstr ""
+
+#: software/templates/about_us.html:40 software/templates/features.html:503
#, fuzzy
#| msgid "Translate"
msgid "Translation"
msgstr "Översätt"
-#: software/templates/about_us.html:41
+#: software/templates/about_us.html:42
msgid ""
"This application is translated on weblate. If you also want to help, click "
"the link and start translating"
msgstr ""
-#: software/templates/about_us.html:50
+#: software/templates/about_us.html:47
+msgid "Source code"
+msgstr ""
+
+#: software/templates/about_us.html:49
+msgid "Get the source code of this application and its server on github"
+msgstr ""
+
+#: software/templates/about_us.html:59
msgid "Our goal"
msgstr "Vårt mål"
-#: software/templates/about_us.html:53
+#: software/templates/about_us.html:62
#, fuzzy
#| msgid ""
#| "The goal is to build an awesome\n"
@@ -3378,7 +3334,8 @@ msgstr "Vårt mål"
msgid ""
"The goal is to build an awesome\n"
" and flexible fitness manager, along with a comprehensive and "
-"complete list of exercises and\n"
+"complete list of\n"
+" exercises and\n"
" ingredients, all released under a free license."
msgstr ""
"Målet är att bygga en fantastisk och flexibel fitness manager tillsammans "
@@ -3397,10 +3354,6 @@ msgstr ""
"wger Workout Manager är en webapp med fri och öppen källkod som hanterar "
"dina övningar, träningspass och din kost. "
-#: software/templates/features.html:45
-msgid "About"
-msgstr "Om"
-
#: software/templates/features.html:57
msgid "Mobile app"
msgstr ""
@@ -3666,18 +3619,6 @@ msgid ""
"to its own copyright."
msgstr ""
-#: utils/models.py:130
-msgid "Pending"
-msgstr "I väntan"
-
-#: utils/models.py:131
-msgid "Accepted"
-msgstr "Accepterat"
-
-#: utils/models.py:132
-msgid "Declined"
-msgstr "Nekad"
-
#: weight/forms.py:54
msgid "Input"
msgstr "Input"
@@ -3690,7 +3631,7 @@ msgstr "Datumformat"
msgid "You have to enter your weight"
msgstr "Du måste ange din vikt"
-#: weight/models.py:60
+#: weight/models.py:78
msgid "Weight entry"
msgstr "Viktinträde"
@@ -3824,6 +3765,65 @@ msgstr ""
msgid "Delete weight entry for the %s"
msgstr ""
+#~ msgid "Ingredients pending review"
+#~ msgstr "Ingredienser i avvaktan på översyn"
+
+#~ msgid "Fibres"
+#~ msgstr "Fibrer"
+
+#~ msgid "Ingredient was successfully added to the general database"
+#~ msgstr "Ingrediensen lades till den allmänna databasen"
+
+#~ msgid "New user submitted ingredient"
+#~ msgstr "Ny användareinlämnad ingrediens"
+
+#, fuzzy, python-brace-format
+#~| msgid "The user {0} submitted a new ingredient \"{1}\"."
+#~ msgid ""
+#~ "The user {request.user.username} submitted a new ingredient \"{self."
+#~ "name}\"."
+#~ msgstr "Användare {0} har skickat in en ny ingrediens \"{1}\"."
+
+#~ msgid "Submission date"
+#~ msgstr "Inlämningsdatum"
+
+#~ msgid "Ingredient is pending review"
+#~ msgstr "Ingrediensen är i väntan på granskning"
+
+#~ msgid ""
+#~ "This user submitted ingredient is pending a decision to be\n"
+#~ "included in the database. Till then, it will not be shown in the overview "
+#~ "or\n"
+#~ "the search."
+#~ msgstr ""
+#~ "Denna användarskapade ingrediens väntar beslut på om den skall inkluderas "
+#~ "i databasen. Tills dess kommed den inte visas i översikten eller i "
+#~ "sökresultaten."
+
+#~ msgid "Please select one of the options below."
+#~ msgstr "Vänligen välj ett av alternativen nedan."
+
+#~ msgid "Accept"
+#~ msgstr "Acceptera"
+
+#~ msgid "Decline"
+#~ msgstr "Neka"
+
+#~ msgid "Ingredient was successfully marked as rejected"
+#~ msgstr "Ingrediensen har markerats som nekad"
+
+#~ msgid "About"
+#~ msgstr "Om"
+
+#~ msgid "Pending"
+#~ msgstr "I väntan"
+
+#~ msgid "Accepted"
+#~ msgstr "Accepterat"
+
+#~ msgid "Declined"
+#~ msgstr "Nekad"
+
#~ msgid "Share"
#~ msgstr "Dela"
diff --git a/wger/locale/tr/LC_MESSAGES/django.po b/wger/locale/tr/LC_MESSAGES/django.po
index fda492099..a71727972 100644
--- a/wger/locale/tr/LC_MESSAGES/django.po
+++ b/wger/locale/tr/LC_MESSAGES/django.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: wger Workout Manager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-02-02 12:42+0100\n"
+"POT-Creation-Date: 2024-07-14 15:49+0200\n"
"PO-Revision-Date: 2024-02-17 18:02+0000\n"
"Last-Translator: Oğuz Ersen <[email protected]>\n"
"Language-Team: Turkish <https://hosted.weblate.org/projects/wger/web/tr/>\n"
@@ -34,7 +34,7 @@ msgstr ""
"kullanıcıları bu spor salonuna atayacak ve spor salonu olmayan tüm mevcut "
"kullanıcıları güncelleyecektir."
-#: config/views/gym_config.py:42 core/templates/language/view.html:63
+#: config/views/gym_config.py:42 core/templates/language/view.html:67
#: core/templates/license/list.html:17 core/templates/misc/license/list.html:18
#: core/templates/repetition_unit/list.html:18
#: core/templates/tags/render_day.html:39
@@ -54,8 +54,8 @@ msgstr ""
#: manager/templates/calendar/day.html:68
#: manager/templates/calendar/month.html:85
#: manager/templates/calendar/partial_overview_table.html:18
-#: manager/templates/schedule/view.html:119
-#: nutrition/templates/ingredient/view.html:191
+#: manager/templates/schedule/view.html:118
+#: nutrition/templates/ingredient/view.html:165
#: nutrition/templates/units/list.html:19
msgid "Edit"
msgstr "Düzenle"
@@ -89,8 +89,8 @@ msgstr "Harika antrenman programım"
msgid "Empty placeholder schedule"
msgstr "Yer tutucu planı boş"
-#: core/forms.py:69 core/templates/navigation.html:275
-#: core/templates/navigation.html:281 core/templates/user/login.html:4
+#: core/forms.py:69 core/templates/navigation.html:285
+#: core/templates/navigation.html:291 core/templates/user/login.html:4
#: software/templates/features.html:82 software/templates/features.html:427
msgid "Login"
msgstr "Oturum aç"
@@ -164,7 +164,7 @@ msgstr "Parola"
msgid "Please enter your current password."
msgstr "Lütfen geçerli parolanızı girin."
-#: core/forms.py:242 core/templates/language/view.html:68
+#: core/forms.py:242 core/templates/language/view.html:73
#: core/templates/license/list.html:19 core/templates/misc/license/list.html:22
#: core/templates/repetition_unit/list.html:20
#: core/templates/tags/render_day.html:45
@@ -179,10 +179,10 @@ msgstr "Lütfen geçerli parolanızı girin."
#: gym/templates/gym/list.html:22 manager/templates/calendar/day.html:73
#: manager/templates/calendar/month.html:89
#: manager/templates/calendar/partial_overview_table.html:23
-#: manager/templates/schedule/view.html:123
-#: manager/templates/workout/view.html:190
-#: nutrition/templates/ingredient/view.html:192
-#: nutrition/templates/ingredient/view.html:241
+#: manager/templates/schedule/view.html:122
+#: manager/templates/workout/view.html:188
+#: nutrition/templates/ingredient/view.html:166
+#: nutrition/templates/ingredient/view.html:215
#: nutrition/templates/units/list.html:22
msgid "Delete"
msgstr "Sil"
@@ -195,14 +195,14 @@ msgstr "Geçersiz parola"
msgid "The form is secured with reCAPTCHA"
msgstr "Form reCAPTCHA ile güvence altına alındı"
-#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:275
-#: core/templates/navigation.html:287 core/templates/template.html:147
+#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:285
+#: core/templates/navigation.html:297 core/templates/template.html:149
#: core/templates/user/login.html:20 core/views/user.py:298
#: software/templates/features.html:87 software/templates/features.html:422
msgid "Register"
msgstr "Kayıt ol"
-#: core/forms.py:315
+#: core/forms.py:315 software/templates/features.html:45
msgid "Contact"
msgstr "İletişim"
@@ -211,7 +211,7 @@ msgid "Some way of answering you (e-mail, etc.)"
msgstr "Size cevap vermenin bir yolu (e-posta vb.)"
#: core/forms.py:324 exercises/models/comment.py:58 manager/models/set.py:61
-#: manager/models/setting.py:111 nutrition/models/log.py:74
+#: manager/models/setting.py:114 nutrition/models/log.py:77
msgid "Comment"
msgstr "Yorum"
@@ -231,6 +231,12 @@ msgstr "Dilin kısa adı"
msgid "Language full name"
msgstr "Dilin tam adı"
+#: core/models/language.py:45 core/templates/language/view.html:23
+#, fuzzy
+#| msgid "Language full name"
+msgid "Language full name in English"
+msgstr "Dilin tam adı"
+
#: core/models/license.py:29
msgid "Full name"
msgstr "Ad Soyad"
@@ -247,7 +253,7 @@ msgstr ""
msgid "Short name, e.g. CC-BY-SA 3"
msgstr "Kısa ad, ör. CC-BY-SA 3"
-#: core/models/license.py:45 nutrition/models/ingredient.py:214
+#: core/models/license.py:45 nutrition/models/ingredient.py:208
msgid "Link"
msgstr "Bağlantı"
@@ -361,7 +367,7 @@ msgstr ""
msgid "Age"
msgstr "Yaş"
-#: core/models/profile.py:230 nutrition/forms.py:117
+#: core/models/profile.py:230 nutrition/forms.py:118
msgid "Height (cm)"
msgstr "Boy (cm)"
@@ -412,7 +418,7 @@ msgid "Total caloric intake, including e.g. any surplus"
msgstr "Toplam kalori alımı, örn. herhangi bir fazlalık"
#: core/models/profile.py:333 nutrition/models/ingredient_weight_unit.py:45
-#: nutrition/models/log.py:93 nutrition/models/meal_item.py:58
+#: nutrition/models/log.py:96 nutrition/models/meal_item.py:59
msgid "Weight unit"
msgstr "Ağırlık birimi"
@@ -445,17 +451,16 @@ msgstr "Tüm saatlerin toplamı 24 olmalıdır"
#: core/models/rep_unit.py:36 core/models/weight_unit.py:36
#: core/templates/user/overview.html:262 core/views/user.py:599
#: exercises/models/category.py:29 exercises/models/equipment.py:29
-#: exercises/models/exercise.py:58 exercises/models/muscle.py:36
+#: exercises/models/exercise.py:59 exercises/models/muscle.py:36
#: gym/models/contract.py:52 gym/models/contract.py:103 gym/models/gym.py:46
#: gym/models/user_document.py:84 gym/templates/contract/view.html:50
#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:96
#: gym/views/gym.py:158 manager/models/schedule.py:55
#: manager/models/workout.py:57 measurements/models/category.py:36
-#: nutrition/models/ingredient.py:125
+#: nutrition/models/ingredient.py:111
#: nutrition/models/ingredient_category.py:27 nutrition/models/meal.py:67
#: nutrition/models/weight_unit.py:38
-#: nutrition/templates/ingredient/pending.html:15
-#: nutrition/templates/ingredient/view.html:178
+#: nutrition/templates/ingredient/view.html:152
msgid "Name"
msgstr "İsim"
@@ -561,24 +566,24 @@ msgstr "E-posta adresinizi doğrulamak için lütfen tıklayın: %(link)s"
msgid "Dashboard"
msgstr "Gösterge Paneli"
-#: core/templates/language/overview.html:4 core/templates/navigation.html:335
+#: core/templates/language/overview.html:4 core/templates/navigation.html:345
msgid "Languages"
msgstr "Diller"
-#: core/templates/language/overview.html:20
+#: core/templates/language/overview.html:22
msgid "Nothing found."
msgstr "Bulunamadı."
-#: core/templates/language/overview.html:20
+#: core/templates/language/overview.html:22
#: manager/templates/calendar/month.html:132
#: manager/templates/schedule/overview.html:28
-#: manager/templates/schedule/view.html:145
+#: manager/templates/schedule/view.html:144
#: manager/templates/workout/overview.html:28
#: nutrition/templates/ingredient/overview.html:38
msgid "Add one now."
msgstr "Yeni ekle."
-#: core/templates/language/overview.html:33 core/templates/license/list.html:40
+#: core/templates/language/overview.html:35 core/templates/license/list.html:40
#: core/templates/misc/license/list.html:43
#: core/templates/repetition_unit/list.html:43
#: core/templates/user/overview.html:326 core/templates/user/overview.html:365
@@ -598,13 +603,13 @@ msgstr "Yeni ekle."
msgid "Add"
msgstr "Ekle"
-#: core/templates/language/view.html:58 core/templates/user/api_key.html:44
+#: core/templates/language/view.html:61 core/templates/user/api_key.html:44
#: core/templates/user/preferences.html:45 gym/models/contract.py:203
#: gym/templates/contract/view.html:41 gym/templates/contract/view.html:106
#: gym/templates/gym/member_list.html:248
-#: manager/templates/schedule/view.html:286
-#: manager/templates/workout/view.html:165
-#: nutrition/templates/ingredient/view.html:228
+#: manager/templates/schedule/view.html:285
+#: manager/templates/workout/view.html:163
+#: nutrition/templates/ingredient/view.html:202
msgid "Options"
msgstr "Seçenekler"
@@ -629,12 +634,11 @@ msgstr "Lisans listesi"
#: gym/templates/gym/member_list.html:299
#: mailer/templates/mailer/gym/overview.html:30
#: manager/templates/calendar/day.html:87
-#: nutrition/templates/ingredient/pending.html:30
#: nutrition/templates/units/list.html:29
msgid "Nothing found"
msgstr "Hiçbir şey Bulunamadı"
-#: core/templates/misc/about.html:4 core/templates/template.html:173
+#: core/templates/misc/about.html:4 core/templates/template.html:175
msgid "Imprint"
msgstr "Künye"
@@ -648,174 +652,169 @@ msgstr ""
" Creative Commons lisansları, onları buraya ayrı girişler olarak "
"ekleyin."
-#: core/templates/navigation.html:27 software/templates/features.html:437
+#: core/templates/navigation.html:28 software/templates/features.html:437
msgid "Training"
msgstr "Eğitim"
-#: core/templates/navigation.html:34 core/templates/user/overview.html:25
+#: core/templates/navigation.html:37 core/templates/user/overview.html:25
msgid "Workouts"
msgstr "Egzersizler"
-#: core/templates/navigation.html:42
+#: core/templates/navigation.html:46
msgid "Workouts schedules"
msgstr "Egzersiz programları"
-#: core/templates/navigation.html:50 core/templates/user/overview.html:70
+#: core/templates/navigation.html:54 core/templates/user/overview.html:70
#: manager/templates/calendar/month.html:10
#: manager/templates/calendar/month.html:21
msgid "Calendar"
msgstr "Takvim"
-#: core/templates/navigation.html:60
+#: core/templates/navigation.html:64
msgid "Measurements"
msgstr "Ölçümler"
-#: core/templates/navigation.html:70 gallery/templates/images/overview.html:6
+#: core/templates/navigation.html:75 gallery/templates/images/overview.html:6
msgid "Gallery"
msgstr "Galeri"
-#: core/templates/navigation.html:76
+#: core/templates/navigation.html:81
msgid "Workout templates"
msgstr "Antrenman şablonları"
-#: core/templates/navigation.html:82 manager/views/workout.py:84
+#: core/templates/navigation.html:88 manager/views/workout.py:84
msgid "Your templates"
msgstr "Şablonlarınız"
-#: core/templates/navigation.html:90 manager/views/workout.py:98
+#: core/templates/navigation.html:97 manager/views/workout.py:98
msgid "Public templates"
msgstr "Herkese açık şablonlar"
-#: core/templates/navigation.html:97 manager/forms.py:129
-#: manager/models/setting.py:54 software/templates/features.html:51
+#: core/templates/navigation.html:105 manager/forms.py:129
+#: manager/models/setting.py:57 software/templates/features.html:51
#: software/templates/features.html:459
msgid "Exercises"
msgstr "Egzersizler"
-#: core/templates/navigation.html:103 core/templates/navigation.html:170
-#: core/templates/navigation.html:330
+#: core/templates/navigation.html:111 core/templates/navigation.html:184
+#: core/templates/navigation.html:340
msgid "Administration"
msgstr "Yönetim"
-#: core/templates/navigation.html:106
+#: core/templates/navigation.html:115
msgid "Exercise edit history"
msgstr "Egzersiz düzenleme geçmişi"
-#: core/templates/navigation.html:111 exercises/models/base.py:103
+#: core/templates/navigation.html:121 exercises/models/base.py:103
msgid "Equipment"
msgstr "Ekipman"
-#: core/templates/navigation.html:116
+#: core/templates/navigation.html:127
msgid "Muscles"
msgstr "Kaslar"
-#: core/templates/navigation.html:121
+#: core/templates/navigation.html:133
#: exercises/templates/categories/admin-overview.html:4
msgid "Categories"
msgstr "Kategoriler"
-#: core/templates/navigation.html:136 software/templates/features.html:447
+#: core/templates/navigation.html:148 software/templates/features.html:447
msgid "Nutrition"
msgstr "Beslenme"
-#: core/templates/navigation.html:143 core/templates/user/overview.html:144
+#: core/templates/navigation.html:156 core/templates/user/overview.html:144
msgid "Nutrition plans"
msgstr "Beslenme planları"
-#: core/templates/navigation.html:151 nutrition/templates/bmi/form.html:50
+#: core/templates/navigation.html:165 nutrition/templates/bmi/form.html:50
msgid "BMI calculator"
msgstr "BMI hesaplayıcı"
-#: core/templates/navigation.html:159 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:174 nutrition/templates/rate/form.html:17
msgid "Daily calories calculator"
msgstr "Günlük kalori hesaplayıcı"
-#: core/templates/navigation.html:165
+#: core/templates/navigation.html:179
#: nutrition/templates/ingredient/overview.html:10
msgid "Ingredient overview"
msgstr "İçeriğe genel bakış"
-#: core/templates/navigation.html:172 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:187 nutrition/templates/units/list.html:6
msgid "Ingredient weight units"
msgstr "İçerik ağırlık birimleri"
-#: core/templates/navigation.html:177
-#: nutrition/templates/ingredient/pending.html:6
-msgid "Ingredients pending review"
-msgstr "İncelenmeyi bekleyen malzemeler"
-
-#: core/templates/navigation.html:193 software/templates/features.html:442
+#: core/templates/navigation.html:203 software/templates/features.html:442
msgid "Body weight"
msgstr "Vücut ağırlığı"
-#: core/templates/navigation.html:200 core/templates/user/overview.html:114
+#: core/templates/navigation.html:210 core/templates/user/overview.html:114
msgid "Weight overview"
msgstr "Ağırlığa genel bakış"
-#: core/templates/navigation.html:207 weight/views.py:65
+#: core/templates/navigation.html:217 weight/views.py:65
msgid "Add weight entry"
msgstr "Kilo girişi ekleyin"
-#: core/templates/navigation.html:221
+#: core/templates/navigation.html:231
msgid "About this software"
msgstr "Bu yazılım hakkında"
-#: core/templates/navigation.html:227 software/templates/about_us.html:5
+#: core/templates/navigation.html:237 software/templates/about_us.html:5
msgid "About us"
msgstr "Hakkımızda"
-#: core/templates/navigation.html:233 software/templates/features.html:507
+#: core/templates/navigation.html:243 software/templates/features.html:507
msgid "REST API"
msgstr "REST API"
-#: core/templates/navigation.html:239 utils/models.py:45
+#: core/templates/navigation.html:249 utils/models.py:45
msgid "License"
msgstr "Lisans"
-#: core/templates/navigation.html:245
+#: core/templates/navigation.html:255
msgid "Developer documentation"
msgstr "Geliştirici belgeleri"
-#: core/templates/navigation.html:252
+#: core/templates/navigation.html:262
msgid "Get the code"
msgstr "Kodu alın"
-#: core/templates/navigation.html:259 core/templates/template.html:212
+#: core/templates/navigation.html:269 core/templates/template.html:214
#: software/templates/features.html:582
msgid "Translate"
msgstr "Çevir"
-#: core/templates/navigation.html:293 core/templates/user/login.html:28
+#: core/templates/navigation.html:303 core/templates/user/login.html:28
msgid "Reset password"
msgstr "Parolayı sıfırla"
-#: core/templates/navigation.html:311
+#: core/templates/navigation.html:321
msgid "My preferences"
msgstr "Benim tercihlerim"
-#: core/templates/navigation.html:320
+#: core/templates/navigation.html:330
msgid "Logout"
msgstr "Çıkış"
-#: core/templates/navigation.html:343
+#: core/templates/navigation.html:353
msgid "Licenses"
msgstr "Lisanslar"
-#: core/templates/navigation.html:351
+#: core/templates/navigation.html:361
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr "Tekrarlama birimleri"
-#: core/templates/navigation.html:359 core/templates/weight_unit/list.html:4
-#: nutrition/templates/ingredient/view.html:167
+#: core/templates/navigation.html:369 core/templates/weight_unit/list.html:4
+#: nutrition/templates/ingredient/view.html:141
msgid "Weight units"
msgstr "Ağırlık birimleri"
-#: core/templates/navigation.html:367 core/templates/user/list.html:4
+#: core/templates/navigation.html:377 core/templates/user/list.html:4
msgid "User list"
msgstr "Kullanıcı listesi"
-#: core/templates/navigation.html:373
+#: core/templates/navigation.html:383
msgid "Gyms"
msgstr "Spor salonları"
@@ -869,12 +868,12 @@ msgstr "Sitemizi kullandığınız için teşekkürler!"
msgid "The %(site_name)s team"
msgstr "%(site_name)s ekibi"
-#: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:11
+#: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:12
msgid "previous"
msgstr "önceki"
-#: core/templates/tags/pagination.html:31
-#: core/templates/tags/pagination.html:35
+#: core/templates/tags/pagination.html:33
+#: core/templates/tags/pagination.html:38
msgid "next"
msgstr "Sonraki"
@@ -899,35 +898,35 @@ msgid "Add exercises to this workout day"
msgstr "Bu antrenman gününe egzersiz ekleyin"
#: core/templates/tags/render_weight_log.html:17 manager/helpers.py:86
-#: manager/models/setting.py:69 manager/templates/set/formset.html:9
+#: manager/models/setting.py:72 manager/templates/set/formset.html:9
msgid "Reps"
msgstr "Temsilciler"
#: core/templates/tags/render_weight_log.html:30 manager/forms.py:191
-#: manager/models/log.py:103 manager/models/setting.py:99
+#: manager/models/log.py:103 manager/models/setting.py:102
#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
msgid "RiR"
msgstr "RiR"
-#: core/templates/template.html:120 manager/templates/calendar/month.html:138
-#: manager/templates/schedule/view.html:249
-#: manager/templates/schedule/view.html:270
-#: manager/templates/workout/view.html:86
-#: manager/templates/workout/view.html:139
+#: core/templates/template.html:122 manager/templates/calendar/month.html:138
+#: manager/templates/schedule/view.html:248
+#: manager/templates/schedule/view.html:269
+#: manager/templates/workout/view.html:84
+#: manager/templates/workout/view.html:137
msgid "Close"
msgstr "Kapat"
-#: core/templates/template.html:136
+#: core/templates/template.html:138
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:141
+#: core/templates/template.html:143
msgid "Create some demo entries"
msgstr "Bazı demo girişleri oluşturun"
-#: core/templates/template.html:178 software/templates/features.html:547
+#: core/templates/template.html:180 software/templates/features.html:547
#: software/templates/tos.html:7
msgid "Terms of service"
msgstr "Kullanım Şartları"
@@ -1029,7 +1028,7 @@ msgid "Overview"
msgstr "Genel Bakış"
#: core/templates/user/overview.html:28
-#: manager/templates/schedule/view.html:164
+#: manager/templates/schedule/view.html:163
#: manager/templates/workout/overview.html:39 manager/views/schedule_step.py:60
msgid "Add workout"
msgstr "Antrenman ekle"
@@ -1037,20 +1036,20 @@ msgstr "Antrenman ekle"
#: core/templates/user/overview.html:34 core/templates/user/overview.html:76
#: core/templates/user/overview.html:120 core/templates/user/overview.html:152
#: exercises/models/base.py:118 exercises/models/base.py:124
-#: exercises/models/exercise.py:63 exercises/models/exercise.py:69
+#: exercises/models/exercise.py:64 exercises/models/exercise.py:70
#: exercises/models/image.py:107 exercises/models/image.py:113
#: exercises/models/video.py:163 exercises/models/video.py:169
#: gallery/models/image.py:42 manager/helpers.py:85 manager/models/log.py:100
#: manager/models/session.py:67 measurements/models/measurement.py:47
-#: nutrition/models/ingredient.py:101 nutrition/models/ingredient.py:107
-#: nutrition/models/ingredient.py:222 weight/models.py:33
+#: nutrition/models/ingredient.py:87 nutrition/models/ingredient.py:93
+#: nutrition/models/ingredient.py:216 weight/models.py:51
#: weight/templates/import_csv_preview.html:13
#: weight/templates/import_csv_preview.html:42 weight/views.py:144
msgid "Date"
msgstr "Tarih"
#: core/templates/user/overview.html:35 core/templates/user/overview.html:153
-#: exercises/models/exercise.py:51 gallery/models/image.py:65
+#: exercises/models/exercise.py:52 gallery/models/image.py:65
#: gym/models/contract.py:58 gym/models/contract.py:109
#: manager/models/day.py:37 manager/models/workout.py:63
#: measurements/models/measurement.py:62 nutrition/models/plan.py:67
@@ -1068,13 +1067,13 @@ msgstr "Son Aktivite"
#: core/templates/user/overview.html:58
#: manager/templates/calendar/month.html:128
-#: manager/templates/schedule/view.html:145
+#: manager/templates/schedule/view.html:144
#: manager/templates/workout/overview.html:28
msgid "No workouts found."
msgstr "Antrenman bulunamadı."
#: core/templates/user/overview.html:68 manager/forms.py:280
-#: manager/templates/workout/view.html:108
+#: manager/templates/workout/view.html:106
msgid "Log"
msgstr "Kayıt"
@@ -1098,35 +1097,35 @@ msgstr "Zaman"
#: core/templates/user/overview.html:112 core/templates/user/overview.html:121
#: manager/forms.py:186 manager/helpers.py:86 manager/models/log.py:86
-#: manager/models/setting.py:79 manager/templates/log/add.html:54
-#: manager/templates/set/formset.html:11 weight/models.py:35
+#: manager/models/setting.py:82 manager/templates/log/add.html:54
+#: manager/templates/set/formset.html:11 weight/models.py:53
#: weight/templates/import_csv_preview.html:14
#: weight/templates/import_csv_preview.html:43 weight/views.py:144
msgid "Weight"
msgstr "Kilo"
-#: core/templates/user/overview.html:154 nutrition/models/ingredient.py:130
-#: nutrition/templates/ingredient/view.html:77 nutrition/views/plan.py:237
+#: core/templates/user/overview.html:154 nutrition/models/ingredient.py:116
+#: nutrition/templates/ingredient/view.html:51 nutrition/views/plan.py:237
msgid "Energy"
msgstr "Enerji"
-#: core/templates/user/overview.html:155 nutrition/models/ingredient.py:137
-#: nutrition/templates/ingredient/view.html:84 nutrition/views/plan.py:243
+#: core/templates/user/overview.html:155 nutrition/models/ingredient.py:123
+#: nutrition/templates/ingredient/view.html:58 nutrition/views/plan.py:243
msgid "Protein"
msgstr "Protein"
-#: core/templates/user/overview.html:156 nutrition/models/ingredient.py:145
-#: nutrition/templates/ingredient/view.html:90 nutrition/views/plan.py:251
+#: core/templates/user/overview.html:156 nutrition/models/ingredient.py:131
+#: nutrition/templates/ingredient/view.html:64 nutrition/views/plan.py:251
msgid "Carbohydrates"
msgstr "Karbonhidratlar"
-#: core/templates/user/overview.html:157 nutrition/models/ingredient.py:163
-#: nutrition/templates/ingredient/view.html:106 nutrition/views/plan.py:265
+#: core/templates/user/overview.html:157 nutrition/models/ingredient.py:149
+#: nutrition/templates/ingredient/view.html:80 nutrition/views/plan.py:265
msgid "Fat"
msgstr "Yağ"
#: core/templates/user/overview.html:170
-#: nutrition/templates/ingredient/view.html:79
+#: nutrition/templates/ingredient/view.html:53
msgid "kcal"
msgstr "kilokalori"
@@ -1138,7 +1137,7 @@ msgstr "kilokalori"
#: gym/templates/gym/member_list.html:207
#: gym/templates/gym/member_list.html:240
#: gym/templates/gym/member_list.html:277
-#: manager/templates/schedule/view.html:101
+#: manager/templates/schedule/view.html:100
msgid "Actions"
msgstr "Hareketler"
@@ -1181,7 +1180,7 @@ msgid "Details"
msgstr "Detaylar"
#: core/templates/user/overview.html:258 gym/views/export.py:57
-#: manager/helpers.py:86 manager/templates/schedule/view.html:99
+#: manager/helpers.py:86 manager/templates/schedule/view.html:98
msgid "Nr."
msgstr "Nr."
@@ -1226,7 +1225,7 @@ msgid "Documents"
msgstr "Belgeler"
#: core/templates/user/overview.html:412 gym/templates/document/list.html:32
-#: manager/forms.py:292 manager/templates/workout/view.html:134
+#: manager/forms.py:292 manager/templates/workout/view.html:132
msgid "Download"
msgstr "İndir"
@@ -1280,13 +1279,13 @@ msgid "kg"
msgstr "kilogram"
#: core/templatetags/wger_extras.py:207
-#: nutrition/templates/ingredient/view.html:86
-#: nutrition/templates/ingredient/view.html:92
-#: nutrition/templates/ingredient/view.html:99
-#: nutrition/templates/ingredient/view.html:108
-#: nutrition/templates/ingredient/view.html:115
-#: nutrition/templates/ingredient/view.html:137
-#: nutrition/templates/ingredient/view.html:147
+#: nutrition/templates/ingredient/view.html:60
+#: nutrition/templates/ingredient/view.html:66
+#: nutrition/templates/ingredient/view.html:73
+#: nutrition/templates/ingredient/view.html:82
+#: nutrition/templates/ingredient/view.html:89
+#: nutrition/templates/ingredient/view.html:111
+#: nutrition/templates/ingredient/view.html:121
msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr "g"
@@ -1304,7 +1303,7 @@ msgstr "oz"
#: exercises/views/equipment.py:103 exercises/views/exercises.py:73
#: exercises/views/muscles.py:99 manager/views/schedule.py:309
#: manager/views/schedule_step.py:128 manager/views/workout.py:249
-#: manager/views/workout_session.py:142 nutrition/views/ingredient.py:116
+#: manager/views/workout_session.py:142 nutrition/views/ingredient.py:119
#: nutrition/views/unit.py:110
msgid "Successfully deleted"
msgstr "Başarıyla silindi"
@@ -1316,7 +1315,7 @@ msgstr "Başarıyla silindi"
#: gym/views/admin_notes.py:196 gym/views/document.py:206 gym/views/gym.py:481
#: manager/views/schedule.py:316 manager/views/schedule_step.py:138
#: manager/views/workout.py:253 manager/views/workout_session.py:156
-#: nutrition/views/ingredient.py:123 nutrition/views/unit.py:117
+#: nutrition/views/ingredient.py:126 nutrition/views/unit.py:117
#, python-brace-format
msgid "Delete {0}?"
msgstr "{0} silinsin mi?"
@@ -1329,7 +1328,7 @@ msgstr "{0} silinsin mi?"
#: gym/views/contract.py:186 gym/views/contract_option.py:123
#: gym/views/contract_type.py:123 gym/views/document.py:171
#: gym/views/gym.py:463 manager/views/day.py:100 manager/views/schedule.py:333
-#: manager/views/workout.py:267 nutrition/views/ingredient.py:142
+#: manager/views/workout.py:267 nutrition/views/ingredient.py:145
#: nutrition/views/unit.py:143
#, python-brace-format
msgid "Edit {0}"
@@ -1403,7 +1402,7 @@ msgstr "Jimnastik"
msgid "A verification email was sent to %(email)s"
msgstr "%(email)s adresine bir doğrulama e-postası gönderildi"
-#: exercises/models/base.py:82 nutrition/models/ingredient.py:236
+#: exercises/models/base.py:82 nutrition/models/ingredient.py:230
msgid "Category"
msgstr "Kategori"
@@ -1423,7 +1422,7 @@ msgstr "Varyasyonlar"
msgid "Exercise Categories"
msgstr "Egzersiz Kategorileri"
-#: exercises/models/comment.py:52 exercises/models/exercise_alias.py:52
+#: exercises/models/comment.py:52 exercises/models/exercise_alias.py:53
#: exercises/models/image.py:74 exercises/models/video.py:98
#: manager/forms.py:178 manager/helpers.py:86 manager/models/log.py:52
msgid "Exercise"
@@ -1433,12 +1432,12 @@ msgstr "Egzersiz"
msgid "A comment about how to correctly do this exercise."
msgstr "Bu alıştırmanın nasıl doğru bir şekilde yapılacağına dair bir yorum."
-#: exercises/models/exercise.py:76 nutrition/models/ingredient.py:95
+#: exercises/models/exercise.py:77 nutrition/models/ingredient.py:81
#: nutrition/models/weight_unit.py:32
msgid "Language"
msgstr "Dil"
-#: exercises/models/exercise_alias.py:58
+#: exercises/models/exercise_alias.py:59
msgid "Alias for an exercise"
msgstr "Bir egzersizin takma adı"
@@ -1571,7 +1570,7 @@ msgstr "Eylem"
#: manager/models/schedule.py:44 manager/models/session.py:49
#: manager/models/workout.py:89 measurements/models/category.py:31
#: measurements/models/measurement.py:42 nutrition/models/plan.py:54
-#: nutrition/templates/ingredient/pending.html:16 weight/models.py:42
+#: weight/models.py:60
msgid "User"
msgstr "Kullanıcı"
@@ -1693,9 +1692,9 @@ msgid "Contract type"
msgstr "Sözleşme tipi"
#: gym/models/contract.py:211 gym/templates/contract/view.html:59
-#: manager/templates/log/add.html:52 nutrition/forms.py:62
-#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:105
-#: nutrition/models/meal_item.py:72
+#: manager/templates/log/add.html:52 nutrition/forms.py:63
+#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:108
+#: nutrition/models/meal_item.py:73
msgid "Amount"
msgstr "Miktar"
@@ -1712,7 +1711,7 @@ msgid "Contract is active"
msgstr "Sözleşme aktif"
#: gym/models/contract.py:237 gym/templates/contract/view.html:69
-#: manager/models/schedule.py:61 manager/templates/schedule/view.html:68
+#: manager/models/schedule.py:61 manager/templates/schedule/view.html:67
msgid "Start date"
msgstr "Başlangıç tarihi"
@@ -2104,7 +2103,7 @@ msgstr "Önizleme oluştur"
#: mailer/templates/mailer/gym/form.html:28
#: mailer/templates/mailer/gym/preview.html:62
-#: manager/templates/workout/view.html:42
+#: manager/templates/workout/view.html:40
msgid "Steps"
msgstr "Adımlar"
@@ -2128,7 +2127,7 @@ msgstr ""
"güncelleyebilir ve düzeltebilirsiniz"
#: mailer/templates/mailer/gym/preview.html:22
-#: software/templates/about_us.html:60
+#: software/templates/about_us.html:70
msgid "Current version"
msgstr "Şimdiki versiyonu"
@@ -2161,16 +2160,16 @@ msgstr ""
"Birden fazla egzersiz için arama yapabilirsiniz, bunlar bir üst set için "
"birlikte gruplandırılır."
-#: manager/forms.py:140 nutrition/forms.py:252
+#: manager/forms.py:140 nutrition/forms.py:253
msgid "Also search for names in English"
msgstr "Ayrıca İngilizce adları da arayın"
#: manager/forms.py:168 manager/forms.py:173 manager/models/log.py:64
-#: manager/models/log.py:92 manager/models/setting.py:59
-#: manager/models/setting.py:90 manager/templates/log/add.html:53
+#: manager/models/log.py:92 manager/models/setting.py:62
+#: manager/models/setting.py:93 manager/templates/log/add.html:53
#: manager/templates/log/add.html:55 manager/templates/set/formset.html:10
#: manager/templates/set/formset.html:12 measurements/models/category.py:41
-#: nutrition/forms.py:66
+#: nutrition/forms.py:67
msgid "Unit"
msgstr "Birim"
@@ -2178,15 +2177,15 @@ msgstr "Birim"
msgid "Type"
msgstr "Tür"
-#: manager/forms.py:280 manager/templates/workout/view.html:115
+#: manager/forms.py:280 manager/templates/workout/view.html:113
msgid "Table"
msgstr "Tablo"
-#: manager/forms.py:282 manager/templates/workout/view.html:121
+#: manager/forms.py:282 manager/templates/workout/view.html:119
msgid "with images"
msgstr "resimlerle"
-#: manager/forms.py:283 manager/templates/workout/view.html:127
+#: manager/forms.py:283 manager/templates/workout/view.html:125
msgid "with comments"
msgstr "yorumlarla"
@@ -2195,11 +2194,10 @@ msgid "Workout will expire soon"
msgstr "Antrenman yakında sona erecek"
#: manager/models/day.py:34 manager/models/log.py:58
-#: manager/models/session.py:60 manager/templates/schedule/view.html:103
-#: manager/templates/workout/view.html:11
-#: manager/templates/workout/view.html:19 manager/views/pdf.py:85
-#: manager/views/pdf.py:161 manager/views/schedule.py:151
-#: manager/views/schedule.py:221
+#: manager/models/session.py:60 manager/templates/schedule/view.html:102
+#: manager/templates/workout/view.html:9 manager/templates/workout/view.html:17
+#: manager/views/pdf.py:85 manager/views/pdf.py:161
+#: manager/views/schedule.py:151 manager/views/schedule.py:221
msgid "Workout"
msgstr "Antrenman"
@@ -2219,7 +2217,7 @@ msgstr "Gün"
msgid "Name or short description of the schedule. For example 'Program XYZ'."
msgstr "Programın adı veya kısa açıklaması. Örneğin 'XYZ Programı'."
-#: manager/models/schedule.py:65 manager/templates/schedule/view.html:72
+#: manager/models/schedule.py:65 manager/templates/schedule/view.html:71
msgid "Schedule active"
msgstr "Etkin program"
@@ -2233,7 +2231,7 @@ msgstr ""
"işaretleyin (örneğin, kontrol panelinizde gösterilecektir). Diğer tüm "
"programlar devre dışı olarak işaretlenecektir"
-#: manager/models/schedule.py:77 manager/templates/schedule/view.html:82
+#: manager/models/schedule.py:77 manager/templates/schedule/view.html:81
msgid "Is a loop"
msgstr "Bir döngü"
@@ -2254,8 +2252,8 @@ msgid "The duration in weeks"
msgstr "Hafta cinsinden süre"
#: manager/models/schedule_step.py:64 manager/models/set.py:53
-#: manager/models/setting.py:110 nutrition/models/meal.py:55
-#: nutrition/models/meal_item.py:65
+#: manager/models/setting.py:113 nutrition/models/meal.py:55
+#: nutrition/models/meal_item.py:66
msgid "Order"
msgstr "Sipariş"
@@ -2309,7 +2307,7 @@ msgstr "Egzersiz günü"
msgid "Number of sets"
msgstr "Set sayısı"
-#: manager/models/setting.py:48
+#: manager/models/setting.py:51
msgid "Sets"
msgstr "Setleri"
@@ -2386,7 +2384,7 @@ msgstr ""
msgid "Go to current month"
msgstr "Geçerli aya git"
-#: manager/templates/calendar/month.html:188
+#: manager/templates/calendar/month.html:190
msgid "Add new log"
msgstr "Yeni günlük ekle"
@@ -2426,8 +2424,8 @@ msgid "Your schedules"
msgstr "Programlarınız"
#: manager/templates/schedule/overview.html:19
-#: manager/templates/schedule/view.html:132
-#: manager/templates/schedule/view.html:184
+#: manager/templates/schedule/view.html:131
+#: manager/templates/schedule/view.html:183
#: manager/templates/workout/overview.html:16
msgid "active"
msgstr "aktif"
@@ -2474,11 +2472,11 @@ msgstr ""
msgid "Add schedule"
msgstr "Program ekle"
-#: manager/templates/schedule/view.html:10
+#: manager/templates/schedule/view.html:9
msgid "Schedule"
msgstr "Program"
-#: manager/templates/schedule/view.html:86
+#: manager/templates/schedule/view.html:85
msgid ""
"This schedule is a loop and will go through the workouts above till you "
"deactivate it"
@@ -2486,19 +2484,19 @@ msgstr ""
"Bu program bir döngüdür ve siz devre dışı bırakana kadar yukarıdaki "
"antrenmanlardan geçecektir"
-#: manager/templates/schedule/view.html:104
+#: manager/templates/schedule/view.html:103
msgid "Weeks"
msgstr "Haftalar"
-#: manager/templates/schedule/view.html:116
+#: manager/templates/schedule/view.html:115
msgid "Move me"
msgstr "Beni hareket ettir"
-#: manager/templates/schedule/view.html:157
+#: manager/templates/schedule/view.html:156
msgid "Start schedule"
msgstr "Programı başlat"
-#: manager/templates/schedule/view.html:188
+#: manager/templates/schedule/view.html:187
#, python-format
msgid ""
"%(weeks)s Week\n"
@@ -2513,11 +2511,11 @@ msgstr[1] ""
"%(weeks)s Hafta\n"
" "
-#: manager/templates/schedule/view.html:222
+#: manager/templates/schedule/view.html:221
msgid "Adding workouts"
msgstr "Antrenman ekleme"
-#: manager/templates/schedule/view.html:224
+#: manager/templates/schedule/view.html:223
msgid ""
"Add as many workouts to the schedule as you want. You can\n"
" edit the order by dragging and dropping them. It's also possible "
@@ -2529,21 +2527,21 @@ msgstr ""
"fazla kez de\n"
" ekleyebilirsiniz."
-#: manager/templates/schedule/view.html:233
-#: manager/templates/schedule/view.html:244
-#: manager/templates/schedule/view.html:291
-#: manager/templates/workout/view.html:71
-#: manager/templates/workout/view.html:81
-#: manager/templates/workout/view.html:180
+#: manager/templates/schedule/view.html:232
+#: manager/templates/schedule/view.html:243
+#: manager/templates/schedule/view.html:290
+#: manager/templates/workout/view.html:69
+#: manager/templates/workout/view.html:79
+#: manager/templates/workout/view.html:178
msgid "Export calendar file"
msgstr "Takvim dosyasını dışa aktar"
-#: manager/templates/schedule/view.html:237
+#: manager/templates/schedule/view.html:236
msgid "Export this schedule as a calendar file."
msgstr "Bu programı bir takvim dosyası olarak dışa aktarın."
-#: manager/templates/schedule/view.html:238
-#: manager/templates/workout/view.html:76
+#: manager/templates/schedule/view.html:237
+#: manager/templates/workout/view.html:74
msgid ""
"You can then import the file it into your calendar\n"
" application for example google calendar, outlook or "
@@ -2556,18 +2554,18 @@ msgstr ""
"eğitim günü için uygun\n"
" egzersizlerle birlikte bir randevu oluşturacaktır."
-#: manager/templates/schedule/view.html:259
-#: manager/templates/schedule/view.html:295
-#: manager/templates/workout/view.html:96
-#: manager/templates/workout/view.html:176
+#: manager/templates/schedule/view.html:258
+#: manager/templates/schedule/view.html:294
+#: manager/templates/workout/view.html:94
+#: manager/templates/workout/view.html:174
msgid "Download as PDF"
msgstr "PDF olarak indir"
-#: manager/templates/schedule/view.html:300
+#: manager/templates/schedule/view.html:299
msgid "Edit schedule"
msgstr "Programı düzenle"
-#: manager/templates/schedule/view.html:305
+#: manager/templates/schedule/view.html:304
msgid "Delete schedule"
msgstr "Programı sil"
@@ -2710,12 +2708,12 @@ msgid "Mark as workout"
msgstr "Antrenman olarak işaretle"
#: manager/templates/workout/template_view.html:65
-#: manager/templates/workout/view.html:51
+#: manager/templates/workout/view.html:49
msgid "Muscles trained"
msgstr "Eğitimli kaslar"
#: manager/templates/workout/template_view.html:68
-#: manager/templates/workout/view.html:54
+#: manager/templates/workout/view.html:52
msgid ""
"Images show combined muscles as trained by the exercises on the workout."
msgstr ""
@@ -2726,35 +2724,35 @@ msgstr ""
msgid "Use this template"
msgstr "Bu şablonu kullan"
-#: manager/templates/workout/view.html:45
+#: manager/templates/workout/view.html:43
msgid "Add training days"
msgstr "Eğitim günleri ekleyin"
-#: manager/templates/workout/view.html:46
+#: manager/templates/workout/view.html:44
msgid "Add workout sets to days"
msgstr "Günlere antrenman setleri ekle"
-#: manager/templates/workout/view.html:47
+#: manager/templates/workout/view.html:45
msgid "Set the repetitions for each set"
msgstr "Her set için tekrarları ayarlayın"
-#: manager/templates/workout/view.html:75
+#: manager/templates/workout/view.html:73
msgid "Export this workout as a calendar file."
msgstr "Bu antrenmanı bir takvim dosyası olarak dışa aktarın."
-#: manager/templates/workout/view.html:146
+#: manager/templates/workout/view.html:144
msgid "Logs"
msgstr "Kütükler"
-#: manager/templates/workout/view.html:148
+#: manager/templates/workout/view.html:146
msgid "View logs"
msgstr "Günlükleri görüntüle"
-#: manager/templates/workout/view.html:171 manager/views/schedule_step.py:99
+#: manager/templates/workout/view.html:169 manager/views/schedule_step.py:99
msgid "Edit workout"
msgstr "Antrenmanı düzenle"
-#: manager/templates/workout/view.html:184 manager/views/workout.py:281
+#: manager/templates/workout/view.html:182 manager/views/workout.py:281
msgid "Mark as template"
msgstr "Şablon olarak işaretle"
@@ -2801,105 +2799,90 @@ msgstr "Bu, o gün için tüm ağırlık günlüklerini de siler."
msgid "Value"
msgstr "Değer"
-#: nutrition/forms.py:117
+#: nutrition/forms.py:118
msgid "Height (in)"
msgstr "Boy (inç)"
-#: nutrition/forms.py:120
+#: nutrition/forms.py:121
msgid "Weight (kg)"
msgstr "Ağırlık (kg)"
-#: nutrition/forms.py:120
+#: nutrition/forms.py:121
msgid "Weight (lbs)"
msgstr "Ağırlık (paunt)"
-#: nutrition/forms.py:133
+#: nutrition/forms.py:134
msgid "Calculate"
msgstr "Hesaplamak"
-#: nutrition/forms.py:207 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:208 nutrition/templates/rate/form.html:76
msgid "Basic caloric intake"
msgstr "Temel kalori alımı"
-#: nutrition/forms.py:208
+#: nutrition/forms.py:209
msgid "Your basic caloric intake as calculated for your data"
msgstr "Verileriniz için hesaplanan temel kalori alımınız"
-#: nutrition/forms.py:213
+#: nutrition/forms.py:214
msgid "Additional calories"
msgstr "Ek kaloriler"
-#: nutrition/forms.py:215
+#: nutrition/forms.py:216
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
msgstr ""
"Baz orana eklenecek ek kaloriler (çıkarmak için negatif bir sayı girin)"
-#: nutrition/forms.py:248 nutrition/models/ingredient_weight_unit.py:39
-#: nutrition/models/log.py:84 nutrition/models/meal_item.py:53
+#: nutrition/forms.py:249 nutrition/models/ingredient_weight_unit.py:39
+#: nutrition/models/log.py:87 nutrition/models/meal_item.py:54
msgid "Ingredient"
msgstr "Bileşen"
-#: nutrition/models/ingredient.py:131
+#: nutrition/models/ingredient.py:117
msgid "In kcal per 100g"
msgstr "100 g başına kcal olarak"
-#: nutrition/models/ingredient.py:138 nutrition/models/ingredient.py:146
-#: nutrition/models/ingredient.py:156 nutrition/models/ingredient.py:164
-#: nutrition/models/ingredient.py:174 nutrition/models/ingredient.py:184
-#: nutrition/models/ingredient.py:194
+#: nutrition/models/ingredient.py:124 nutrition/models/ingredient.py:132
+#: nutrition/models/ingredient.py:142 nutrition/models/ingredient.py:150
+#: nutrition/models/ingredient.py:160 nutrition/models/ingredient.py:170
+#: nutrition/models/ingredient.py:180
msgid "In g per 100g of product"
msgstr "100 g ürün başına g cinsinden"
-#: nutrition/models/ingredient.py:155
-#: nutrition/templates/ingredient/view.html:96 nutrition/views/plan.py:259
+#: nutrition/models/ingredient.py:141
+#: nutrition/templates/ingredient/view.html:70 nutrition/views/plan.py:259
msgid "Sugar content in carbohydrates"
msgstr "Karbonhidratlardaki şeker içeriği"
-#: nutrition/models/ingredient.py:173
-#: nutrition/templates/ingredient/view.html:112 nutrition/views/plan.py:273
+#: nutrition/models/ingredient.py:159
+#: nutrition/templates/ingredient/view.html:86 nutrition/views/plan.py:273
msgid "Saturated fat content in fats"
msgstr "Yağlarda doymuş yağ içeriği"
-#: nutrition/models/ingredient.py:183
-#: nutrition/templates/ingredient/view.html:134 nutrition/views/plan.py:279
-msgid "Fibres"
-msgstr "Lifler"
+#: nutrition/models/ingredient.py:169
+#: nutrition/templates/ingredient/view.html:108 nutrition/views/plan.py:279
+msgid "Fiber"
+msgstr ""
-#: nutrition/models/ingredient.py:193
-#: nutrition/templates/ingredient/view.html:144 nutrition/views/plan.py:285
+#: nutrition/models/ingredient.py:179
+#: nutrition/templates/ingredient/view.html:118 nutrition/views/plan.py:285
msgid "Sodium"
msgstr "Sodyum"
-#: nutrition/models/ingredient.py:215
+#: nutrition/models/ingredient.py:209
msgid "Link to product"
msgstr "Ürün bağlantısı"
-#: nutrition/models/ingredient.py:244
+#: nutrition/models/ingredient.py:238
msgid "Brand name of product"
msgstr "Ürünün marka adı"
-#: nutrition/models/ingredient.py:304
+#: nutrition/models/ingredient.py:305
#, python-brace-format
msgid "The total energy ({self.energy}kcal) is not the approximate sum of the "
msgstr "Toplam enerji ({self.energy} kcal), yaklaşık toplamı değil "
-#: nutrition/models/ingredient.py:383 nutrition/views/ingredient.py:196
-msgid "Ingredient was successfully added to the general database"
-msgstr "İçerik genel veri tabanına başarıyla eklendi"
-
-#: nutrition/models/ingredient.py:408
-msgid "New user submitted ingredient"
-msgstr "Yeni kullanıcı tarafından gönderilen içerik"
-
-#: nutrition/models/ingredient.py:410
-#, python-brace-format
-msgid ""
-"The user {request.user.username} submitted a new ingredient \"{self.name}\"."
-msgstr ""
-"{request.user.username} kullanıcısı yeni bir içerik \"{self.name}\" gönderdi."
-
#: nutrition/models/ingredient_category.py:31
msgid "Ingredient Categories"
msgstr "İçerik Kategorileri"
@@ -2912,16 +2895,16 @@ msgstr "Gram cinsinden miktar"
msgid "Unit amount, e.g. \"1 Cup\" or \"1/2 spoon\""
msgstr "Birim miktar, ör. \"1 Fincan\" veya \"1/2 kaşık\""
-#: nutrition/models/log.py:49 nutrition/models/meal.py:50
-#: nutrition/models/meal_item.py:47 nutrition/models/plan.py:106
+#: nutrition/models/log.py:52 nutrition/models/meal.py:50
+#: nutrition/models/meal_item.py:48 nutrition/models/plan.py:108
msgid "Nutrition plan"
msgstr "Beslenme planı"
-#: nutrition/models/log.py:58
+#: nutrition/models/log.py:61
msgid "Meal"
msgstr "Yemek"
-#: nutrition/models/log.py:68
+#: nutrition/models/log.py:71
msgid "Date and Time (Approx.)"
msgstr "Tarih ve Saat (Yaklaşık)"
@@ -2945,11 +2928,11 @@ msgstr ""
"Planın amacının bir açıklaması, ör. \"Kitle kazanın\" veya \"Yaza "
"hazırlanın\""
-#: nutrition/models/plan.py:88
+#: nutrition/models/plan.py:90
msgid "Use daily calories"
msgstr "Günlük kalori kullanın"
-#: nutrition/models/plan.py:91
+#: nutrition/models/plan.py:93
msgid ""
"Tick the box if you want to mark this plan as having a goal amount of "
"calories. You can use the calculator or enter the value yourself."
@@ -3077,67 +3060,36 @@ msgstr "Ara"
msgid "Add ingredient"
msgstr "İçerik ekleyin"
-#: nutrition/templates/ingredient/pending.html:14
-msgid "Submission date"
-msgstr "Teslim tarihi"
-
-#: nutrition/templates/ingredient/view.html:27
-msgid "Ingredient is pending review"
-msgstr "İçerik incelenmeyi bekliyor"
-
-#: nutrition/templates/ingredient/view.html:28
-msgid ""
-"This user submitted ingredient is pending a decision to be\n"
-"included in the database. Till then, it will not be shown in the overview "
-"or\n"
-"the search."
-msgstr ""
-"Bu kullanıcı tarafından gönderilen malzeme, veri tabanına\n"
-"dahil edilmek için bir karar bekliyor. Bu olana kadar, genel bakışta veya\n"
-"aramada görünmeyecektir."
-
-#: nutrition/templates/ingredient/view.html:31
-msgid "Please select one of the options below."
-msgstr "Lütfen aşağıdaki seçeneklerden birini seçin."
-
-#: nutrition/templates/ingredient/view.html:38
-msgid "Accept"
-msgstr "Kabul etmek"
-
-#: nutrition/templates/ingredient/view.html:42
-msgid "Decline"
-msgstr "Reddet"
-
-#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:229
+#: nutrition/templates/ingredient/view.html:45 nutrition/views/plan.py:229
msgid "Macronutrients"
msgstr "Makrobesinler"
-#: nutrition/templates/ingredient/view.html:80
+#: nutrition/templates/ingredient/view.html:54
msgid "kJ"
msgstr "kJ"
-#: nutrition/templates/ingredient/view.html:101
-#: nutrition/templates/ingredient/view.html:117
-#: nutrition/templates/ingredient/view.html:139
-#: nutrition/templates/ingredient/view.html:149
+#: nutrition/templates/ingredient/view.html:75
+#: nutrition/templates/ingredient/view.html:91
+#: nutrition/templates/ingredient/view.html:113
+#: nutrition/templates/ingredient/view.html:123
msgid "n.A."
msgstr "n.A."
-#: nutrition/templates/ingredient/view.html:128
+#: nutrition/templates/ingredient/view.html:102
msgid "Others"
msgstr "Diğerleri"
-#: nutrition/templates/ingredient/view.html:170
+#: nutrition/templates/ingredient/view.html:144
#: nutrition/templates/units/list.html:46 nutrition/views/unit.py:86
msgid "Add new weight unit"
msgstr "Yeni ağırlık birimi ekle"
-#: nutrition/templates/ingredient/view.html:232
-#: nutrition/templates/ingredient/view.html:235
+#: nutrition/templates/ingredient/view.html:206
+#: nutrition/templates/ingredient/view.html:209
msgid "Edit ingredient"
msgstr "Malzemeyi düzenleyin"
-#: nutrition/templates/ingredient/view.html:239
+#: nutrition/templates/ingredient/view.html:213
msgid "Delete ingredient"
msgstr "Malzemeyi sil"
@@ -3237,14 +3189,10 @@ msgstr "140 ile 230 arası"
msgid "56 to 90"
msgstr "56 ile 90 arası"
-#: nutrition/views/ingredient.py:154
+#: nutrition/views/ingredient.py:157
msgid "Add a new ingredient"
msgstr "Yeni bir malzeme ekle"
-#: nutrition/views/ingredient.py:209
-msgid "Ingredient was successfully marked as rejected"
-msgstr "İçerik başarıyla reddedildi olarak işaretlendi"
-
#: nutrition/views/plan.py:120
msgid "Nutritional plan"
msgstr "Beslenme planı"
@@ -3291,18 +3239,10 @@ msgstr ""
"spor tutkunları tarafından gerçekleştirilen ortak bir açık kaynaklı projedir."
#: software/templates/about_us.html:18
-msgid "Source code"
-msgstr "Kaynak kodları"
-
-#: software/templates/about_us.html:20
-msgid "Get the source code of this application and its server on github"
-msgstr "Bu uygulamanın ve sunucusunun kaynak kodlarını github'dan edinin"
-
-#: software/templates/about_us.html:25
msgid "Have a problem or idea?"
msgstr "Bir sorununuz veya fikriniz mi var?"
-#: software/templates/about_us.html:27
+#: software/templates/about_us.html:20
msgid ""
"Get in touch if something didn't behave as expected or if there is a feature "
"that you feel is missing."
@@ -3310,21 +3250,29 @@ msgstr ""
"Bir şey beklendiği gibi davranmazsa veya eksik olduğunu düşündüğünüz bir "
"özellik varsa iletişime geçin."
-#: software/templates/about_us.html:32
+#: software/templates/about_us.html:26
msgid "Say hi!"
msgstr "Merhaba deyin!"
-#: software/templates/about_us.html:34
+#: software/templates/about_us.html:28
msgid "If you want to chat with us, hop on the Discord server and get in touch"
msgstr ""
"Bizimle sohbet etmek istiyorsanız, Discord sunucusuna gelin ve iletişime "
"geçin"
-#: software/templates/about_us.html:39 software/templates/features.html:503
+#: software/templates/about_us.html:33
+msgid "Mastodon"
+msgstr ""
+
+#: software/templates/about_us.html:35
+msgid "Follow us on mastodon for updates and news about the project"
+msgstr ""
+
+#: software/templates/about_us.html:40 software/templates/features.html:503
msgid "Translation"
msgstr "Çeviri"
-#: software/templates/about_us.html:41
+#: software/templates/about_us.html:42
msgid ""
"This application is translated on weblate. If you also want to help, click "
"the link and start translating"
@@ -3332,15 +3280,30 @@ msgstr ""
"Bu uygulama Weblate üzerinde çevrilmektedir. Yardım etmek istiyorsanız "
"bağlantıya tıklayın ve çevirmeye başlayın"
-#: software/templates/about_us.html:50
+#: software/templates/about_us.html:47
+msgid "Source code"
+msgstr "Kaynak kodları"
+
+#: software/templates/about_us.html:49
+msgid "Get the source code of this application and its server on github"
+msgstr "Bu uygulamanın ve sunucusunun kaynak kodlarını github'dan edinin"
+
+#: software/templates/about_us.html:59
msgid "Our goal"
msgstr "Hedefimiz"
-#: software/templates/about_us.html:53
+#: software/templates/about_us.html:62
+#, fuzzy
+#| msgid ""
+#| "The goal is to build an awesome\n"
+#| " and flexible fitness manager, along with a comprehensive "
+#| "and complete list of exercises and\n"
+#| " ingredients, all released under a free license."
msgid ""
"The goal is to build an awesome\n"
" and flexible fitness manager, along with a comprehensive and "
-"complete list of exercises and\n"
+"complete list of\n"
+" exercises and\n"
" ingredients, all released under a free license."
msgstr ""
"Amaç, tümü özgür bir lisans altında\n"
@@ -3356,10 +3319,6 @@ msgstr ""
"wger Workout Manager, egzersizlerinizi ve antrenmanlarınızı yöneten özgür, "
"açık kaynaklı bir web uygulamasıdır."
-#: software/templates/features.html:45
-msgid "About"
-msgstr "hakkında"
-
#: software/templates/features.html:57
msgid "Mobile app"
msgstr "Mobil uygulama"
@@ -3619,18 +3578,6 @@ msgstr ""
"zamanda kendi telif hakkına hak kazanması için yeterli yeni, yaratıcı içerik "
"içeren bir çalışma olduğunu unutmayın."
-#: utils/models.py:130
-msgid "Pending"
-msgstr "Bekliyor"
-
-#: utils/models.py:131
-msgid "Accepted"
-msgstr "Kabul edilmiş"
-
-#: utils/models.py:132
-msgid "Declined"
-msgstr "Reddedildi"
-
#: weight/forms.py:54
msgid "Input"
msgstr "Girdi"
@@ -3643,7 +3590,7 @@ msgstr "Tarih Biçimi"
msgid "You have to enter your weight"
msgstr "Kilonuzu girmelisiniz"
-#: weight/models.py:60
+#: weight/models.py:78
msgid "Weight entry"
msgstr "Ağırlık girişi"
@@ -3788,6 +3735,67 @@ msgstr "Başarıyla silindi."
msgid "Delete weight entry for the %s"
msgstr "%s için ağırlık girişini silin"
+#~ msgid "Ingredients pending review"
+#~ msgstr "İncelenmeyi bekleyen malzemeler"
+
+#~ msgid "Fibres"
+#~ msgstr "Lifler"
+
+#~ msgid "Ingredient was successfully added to the general database"
+#~ msgstr "İçerik genel veri tabanına başarıyla eklendi"
+
+#~ msgid "New user submitted ingredient"
+#~ msgstr "Yeni kullanıcı tarafından gönderilen içerik"
+
+#, python-brace-format
+#~ msgid ""
+#~ "The user {request.user.username} submitted a new ingredient \"{self."
+#~ "name}\"."
+#~ msgstr ""
+#~ "{request.user.username} kullanıcısı yeni bir içerik \"{self.name}\" "
+#~ "gönderdi."
+
+#~ msgid "Submission date"
+#~ msgstr "Teslim tarihi"
+
+#~ msgid "Ingredient is pending review"
+#~ msgstr "İçerik incelenmeyi bekliyor"
+
+#~ msgid ""
+#~ "This user submitted ingredient is pending a decision to be\n"
+#~ "included in the database. Till then, it will not be shown in the overview "
+#~ "or\n"
+#~ "the search."
+#~ msgstr ""
+#~ "Bu kullanıcı tarafından gönderilen malzeme, veri tabanına\n"
+#~ "dahil edilmek için bir karar bekliyor. Bu olana kadar, genel bakışta "
+#~ "veya\n"
+#~ "aramada görünmeyecektir."
+
+#~ msgid "Please select one of the options below."
+#~ msgstr "Lütfen aşağıdaki seçeneklerden birini seçin."
+
+#~ msgid "Accept"
+#~ msgstr "Kabul etmek"
+
+#~ msgid "Decline"
+#~ msgstr "Reddet"
+
+#~ msgid "Ingredient was successfully marked as rejected"
+#~ msgstr "İçerik başarıyla reddedildi olarak işaretlendi"
+
+#~ msgid "About"
+#~ msgstr "hakkında"
+
+#~ msgid "Pending"
+#~ msgstr "Bekliyor"
+
+#~ msgid "Accepted"
+#~ msgstr "Kabul edilmiş"
+
+#~ msgid "Declined"
+#~ msgstr "Reddedildi"
+
#~ msgid "Share"
#~ msgstr "Paylaş"
diff --git a/wger/locale/uk/LC_MESSAGES/django.po b/wger/locale/uk/LC_MESSAGES/django.po
index be92179d6..5d74eb4e5 100644
--- a/wger/locale/uk/LC_MESSAGES/django.po
+++ b/wger/locale/uk/LC_MESSAGES/django.po
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: wger Workout Manager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-02-02 12:42+0100\n"
+"POT-Creation-Date: 2024-07-14 15:49+0200\n"
"PO-Revision-Date: 2023-06-07 12:57+0000\n"
"Last-Translator: Dan <[email protected]>\n"
"Language-Team: Ukrainian <https://hosted.weblate.org/projects/wger/web/uk/>\n"
@@ -39,7 +39,7 @@ msgstr ""
"призначений всім новим зареєстрованим користувачам і для всіх існуючих "
"користувачів без тренажерного залу."
-#: config/views/gym_config.py:42 core/templates/language/view.html:63
+#: config/views/gym_config.py:42 core/templates/language/view.html:67
#: core/templates/license/list.html:17 core/templates/misc/license/list.html:18
#: core/templates/repetition_unit/list.html:18
#: core/templates/tags/render_day.html:39
@@ -59,8 +59,8 @@ msgstr ""
#: manager/templates/calendar/day.html:68
#: manager/templates/calendar/month.html:85
#: manager/templates/calendar/partial_overview_table.html:18
-#: manager/templates/schedule/view.html:119
-#: nutrition/templates/ingredient/view.html:191
+#: manager/templates/schedule/view.html:118
+#: nutrition/templates/ingredient/view.html:165
#: nutrition/templates/units/list.html:19
msgid "Edit"
msgstr "Змінити"
@@ -94,8 +94,8 @@ msgstr "Моя класна програграма тренувань"
msgid "Empty placeholder schedule"
msgstr "Порожня програма-заповнювач"
-#: core/forms.py:69 core/templates/navigation.html:275
-#: core/templates/navigation.html:281 core/templates/user/login.html:4
+#: core/forms.py:69 core/templates/navigation.html:285
+#: core/templates/navigation.html:291 core/templates/user/login.html:4
#: software/templates/features.html:82 software/templates/features.html:427
msgid "Login"
msgstr "Вхід"
@@ -169,7 +169,7 @@ msgstr "Пароль"
msgid "Please enter your current password."
msgstr "Введіть свій поточний пароль."
-#: core/forms.py:242 core/templates/language/view.html:68
+#: core/forms.py:242 core/templates/language/view.html:73
#: core/templates/license/list.html:19 core/templates/misc/license/list.html:22
#: core/templates/repetition_unit/list.html:20
#: core/templates/tags/render_day.html:45
@@ -184,10 +184,10 @@ msgstr "Введіть свій поточний пароль."
#: gym/templates/gym/list.html:22 manager/templates/calendar/day.html:73
#: manager/templates/calendar/month.html:89
#: manager/templates/calendar/partial_overview_table.html:23
-#: manager/templates/schedule/view.html:123
-#: manager/templates/workout/view.html:190
-#: nutrition/templates/ingredient/view.html:192
-#: nutrition/templates/ingredient/view.html:241
+#: manager/templates/schedule/view.html:122
+#: manager/templates/workout/view.html:188
+#: nutrition/templates/ingredient/view.html:166
+#: nutrition/templates/ingredient/view.html:215
#: nutrition/templates/units/list.html:22
msgid "Delete"
msgstr "Вилучити"
@@ -200,14 +200,14 @@ msgstr "Неправильний пароль"
msgid "The form is secured with reCAPTCHA"
msgstr "Форма захищена reCAPTCHA"
-#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:275
-#: core/templates/navigation.html:287 core/templates/template.html:147
+#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:285
+#: core/templates/navigation.html:297 core/templates/template.html:149
#: core/templates/user/login.html:20 core/views/user.py:298
#: software/templates/features.html:87 software/templates/features.html:422
msgid "Register"
msgstr "Зареєструватись"
-#: core/forms.py:315
+#: core/forms.py:315 software/templates/features.html:45
msgid "Contact"
msgstr "Контакт"
@@ -216,7 +216,7 @@ msgid "Some way of answering you (e-mail, etc.)"
msgstr "Яким чином відповідати вам (електронна пошта, тощо)"
#: core/forms.py:324 exercises/models/comment.py:58 manager/models/set.py:61
-#: manager/models/setting.py:111 nutrition/models/log.py:74
+#: manager/models/setting.py:114 nutrition/models/log.py:77
msgid "Comment"
msgstr "Коментар"
@@ -236,6 +236,12 @@ msgstr "Коротке позначення мови"
msgid "Language full name"
msgstr "Довге позначення мови"
+#: core/models/language.py:45 core/templates/language/view.html:23
+#, fuzzy
+#| msgid "Language full name"
+msgid "Language full name in English"
+msgstr "Довге позначення мови"
+
#: core/models/license.py:29
msgid "Full name"
msgstr "Повне ім'я"
@@ -252,7 +258,7 @@ msgstr ""
msgid "Short name, e.g. CC-BY-SA 3"
msgstr "Коротке ім'я, н-д CC-BY-SA 3"
-#: core/models/license.py:45 nutrition/models/ingredient.py:214
+#: core/models/license.py:45 nutrition/models/ingredient.py:208
msgid "Link"
msgstr "Посилання"
@@ -365,7 +371,7 @@ msgstr ""
msgid "Age"
msgstr "Вік"
-#: core/models/profile.py:230 nutrition/forms.py:117
+#: core/models/profile.py:230 nutrition/forms.py:118
msgid "Height (cm)"
msgstr "Зріст (см)"
@@ -416,7 +422,7 @@ msgid "Total caloric intake, including e.g. any surplus"
msgstr "Загальне споживання калорій, в тому числі, будь-який надлишок"
#: core/models/profile.py:333 nutrition/models/ingredient_weight_unit.py:45
-#: nutrition/models/log.py:93 nutrition/models/meal_item.py:58
+#: nutrition/models/log.py:96 nutrition/models/meal_item.py:59
msgid "Weight unit"
msgstr "Одиниця ваги"
@@ -449,17 +455,16 @@ msgstr "Сума всіх годин повинна дорівнювати 24"
#: core/models/rep_unit.py:36 core/models/weight_unit.py:36
#: core/templates/user/overview.html:262 core/views/user.py:599
#: exercises/models/category.py:29 exercises/models/equipment.py:29
-#: exercises/models/exercise.py:58 exercises/models/muscle.py:36
+#: exercises/models/exercise.py:59 exercises/models/muscle.py:36
#: gym/models/contract.py:52 gym/models/contract.py:103 gym/models/gym.py:46
#: gym/models/user_document.py:84 gym/templates/contract/view.html:50
#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:96
#: gym/views/gym.py:158 manager/models/schedule.py:55
#: manager/models/workout.py:57 measurements/models/category.py:36
-#: nutrition/models/ingredient.py:125
+#: nutrition/models/ingredient.py:111
#: nutrition/models/ingredient_category.py:27 nutrition/models/meal.py:67
#: nutrition/models/weight_unit.py:38
-#: nutrition/templates/ingredient/pending.html:15
-#: nutrition/templates/ingredient/view.html:178
+#: nutrition/templates/ingredient/view.html:152
msgid "Name"
msgstr "Ім'я"
@@ -566,24 +571,24 @@ msgstr ""
msgid "Dashboard"
msgstr "Панель"
-#: core/templates/language/overview.html:4 core/templates/navigation.html:335
+#: core/templates/language/overview.html:4 core/templates/navigation.html:345
msgid "Languages"
msgstr "Мови"
-#: core/templates/language/overview.html:20
+#: core/templates/language/overview.html:22
msgid "Nothing found."
msgstr "Нічого не знайдено."
-#: core/templates/language/overview.html:20
+#: core/templates/language/overview.html:22
#: manager/templates/calendar/month.html:132
#: manager/templates/schedule/overview.html:28
-#: manager/templates/schedule/view.html:145
+#: manager/templates/schedule/view.html:144
#: manager/templates/workout/overview.html:28
#: nutrition/templates/ingredient/overview.html:38
msgid "Add one now."
msgstr "Додати зараз."
-#: core/templates/language/overview.html:33 core/templates/license/list.html:40
+#: core/templates/language/overview.html:35 core/templates/license/list.html:40
#: core/templates/misc/license/list.html:43
#: core/templates/repetition_unit/list.html:43
#: core/templates/user/overview.html:326 core/templates/user/overview.html:365
@@ -603,13 +608,13 @@ msgstr "Додати зараз."
msgid "Add"
msgstr "Додати"
-#: core/templates/language/view.html:58 core/templates/user/api_key.html:44
+#: core/templates/language/view.html:61 core/templates/user/api_key.html:44
#: core/templates/user/preferences.html:45 gym/models/contract.py:203
#: gym/templates/contract/view.html:41 gym/templates/contract/view.html:106
#: gym/templates/gym/member_list.html:248
-#: manager/templates/schedule/view.html:286
-#: manager/templates/workout/view.html:165
-#: nutrition/templates/ingredient/view.html:228
+#: manager/templates/schedule/view.html:285
+#: manager/templates/workout/view.html:163
+#: nutrition/templates/ingredient/view.html:202
msgid "Options"
msgstr "Параметри"
@@ -634,12 +639,11 @@ msgstr "Список ліцензій"
#: gym/templates/gym/member_list.html:299
#: mailer/templates/mailer/gym/overview.html:30
#: manager/templates/calendar/day.html:87
-#: nutrition/templates/ingredient/pending.html:30
#: nutrition/templates/units/list.html:29
msgid "Nothing found"
msgstr "Нічого не знайдено"
-#: core/templates/misc/about.html:4 core/templates/template.html:173
+#: core/templates/misc/about.html:4 core/templates/template.html:175
msgid "Imprint"
msgstr "Відбиток"
@@ -652,176 +656,171 @@ msgstr ""
"Якщо ліцензія була локалізована, наприклад, як ліцензії\n"
"Creative Commons для різних країн, додайте їх як окремі записи."
-#: core/templates/navigation.html:27 software/templates/features.html:437
+#: core/templates/navigation.html:28 software/templates/features.html:437
msgid "Training"
msgstr "Тренування"
-#: core/templates/navigation.html:34 core/templates/user/overview.html:25
+#: core/templates/navigation.html:37 core/templates/user/overview.html:25
msgid "Workouts"
msgstr "Тренування"
-#: core/templates/navigation.html:42
+#: core/templates/navigation.html:46
msgid "Workouts schedules"
msgstr "Програми тренувань"
-#: core/templates/navigation.html:50 core/templates/user/overview.html:70
+#: core/templates/navigation.html:54 core/templates/user/overview.html:70
#: manager/templates/calendar/month.html:10
#: manager/templates/calendar/month.html:21
msgid "Calendar"
msgstr "Календар"
-#: core/templates/navigation.html:60
+#: core/templates/navigation.html:64
#, fuzzy
#| msgid "Macronutrients"
msgid "Measurements"
msgstr "Макроелементи"
-#: core/templates/navigation.html:70 gallery/templates/images/overview.html:6
+#: core/templates/navigation.html:75 gallery/templates/images/overview.html:6
msgid "Gallery"
msgstr "Галерея"
-#: core/templates/navigation.html:76
+#: core/templates/navigation.html:81
msgid "Workout templates"
msgstr "Шаблони тренувань"
-#: core/templates/navigation.html:82 manager/views/workout.py:84
+#: core/templates/navigation.html:88 manager/views/workout.py:84
msgid "Your templates"
msgstr "Ваші шаблони"
-#: core/templates/navigation.html:90 manager/views/workout.py:98
+#: core/templates/navigation.html:97 manager/views/workout.py:98
msgid "Public templates"
msgstr "Загальнодоступні шаблони"
-#: core/templates/navigation.html:97 manager/forms.py:129
-#: manager/models/setting.py:54 software/templates/features.html:51
+#: core/templates/navigation.html:105 manager/forms.py:129
+#: manager/models/setting.py:57 software/templates/features.html:51
#: software/templates/features.html:459
msgid "Exercises"
msgstr "Вправи"
-#: core/templates/navigation.html:103 core/templates/navigation.html:170
-#: core/templates/navigation.html:330
+#: core/templates/navigation.html:111 core/templates/navigation.html:184
+#: core/templates/navigation.html:340
msgid "Administration"
msgstr "Адміністрація"
-#: core/templates/navigation.html:106
+#: core/templates/navigation.html:115
msgid "Exercise edit history"
msgstr "Історія редагування вправи"
-#: core/templates/navigation.html:111 exercises/models/base.py:103
+#: core/templates/navigation.html:121 exercises/models/base.py:103
msgid "Equipment"
msgstr "Обладнання"
-#: core/templates/navigation.html:116
+#: core/templates/navigation.html:127
msgid "Muscles"
msgstr "М'язи"
-#: core/templates/navigation.html:121
+#: core/templates/navigation.html:133
#: exercises/templates/categories/admin-overview.html:4
msgid "Categories"
msgstr "Категорії"
-#: core/templates/navigation.html:136 software/templates/features.html:447
+#: core/templates/navigation.html:148 software/templates/features.html:447
msgid "Nutrition"
msgstr "Харчування"
-#: core/templates/navigation.html:143 core/templates/user/overview.html:144
+#: core/templates/navigation.html:156 core/templates/user/overview.html:144
msgid "Nutrition plans"
msgstr "Плани харчування"
-#: core/templates/navigation.html:151 nutrition/templates/bmi/form.html:50
+#: core/templates/navigation.html:165 nutrition/templates/bmi/form.html:50
msgid "BMI calculator"
msgstr "Калькулятор індексу маси тіла"
-#: core/templates/navigation.html:159 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:174 nutrition/templates/rate/form.html:17
msgid "Daily calories calculator"
msgstr "Калькулятор щоденних калорій"
-#: core/templates/navigation.html:165
+#: core/templates/navigation.html:179
#: nutrition/templates/ingredient/overview.html:10
msgid "Ingredient overview"
msgstr "Огляд інгредієнтів"
-#: core/templates/navigation.html:172 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:187 nutrition/templates/units/list.html:6
msgid "Ingredient weight units"
msgstr "Одиниці ваги інгредієнтів"
-#: core/templates/navigation.html:177
-#: nutrition/templates/ingredient/pending.html:6
-msgid "Ingredients pending review"
-msgstr "Інгредієнти, що очікують розгляду"
-
-#: core/templates/navigation.html:193 software/templates/features.html:442
+#: core/templates/navigation.html:203 software/templates/features.html:442
msgid "Body weight"
msgstr "Вага тіла"
-#: core/templates/navigation.html:200 core/templates/user/overview.html:114
+#: core/templates/navigation.html:210 core/templates/user/overview.html:114
msgid "Weight overview"
msgstr "Огляд ваги"
-#: core/templates/navigation.html:207 weight/views.py:65
+#: core/templates/navigation.html:217 weight/views.py:65
msgid "Add weight entry"
msgstr "Додати запис ваги"
-#: core/templates/navigation.html:221
+#: core/templates/navigation.html:231
msgid "About this software"
msgstr "Про це програмне забезпечення"
-#: core/templates/navigation.html:227 software/templates/about_us.html:5
+#: core/templates/navigation.html:237 software/templates/about_us.html:5
msgid "About us"
msgstr "Про нас"
-#: core/templates/navigation.html:233 software/templates/features.html:507
+#: core/templates/navigation.html:243 software/templates/features.html:507
msgid "REST API"
msgstr "REST API"
-#: core/templates/navigation.html:239 utils/models.py:45
+#: core/templates/navigation.html:249 utils/models.py:45
msgid "License"
msgstr "Ліцензія"
-#: core/templates/navigation.html:245
+#: core/templates/navigation.html:255
msgid "Developer documentation"
msgstr "Документація для розробників"
-#: core/templates/navigation.html:252
+#: core/templates/navigation.html:262
msgid "Get the code"
msgstr "Отримати код"
-#: core/templates/navigation.html:259 core/templates/template.html:212
+#: core/templates/navigation.html:269 core/templates/template.html:214
#: software/templates/features.html:582
msgid "Translate"
msgstr "Перекласти"
-#: core/templates/navigation.html:293 core/templates/user/login.html:28
+#: core/templates/navigation.html:303 core/templates/user/login.html:28
msgid "Reset password"
msgstr "Скинути пароль"
-#: core/templates/navigation.html:311
+#: core/templates/navigation.html:321
msgid "My preferences"
msgstr "Мої налаштування"
-#: core/templates/navigation.html:320
+#: core/templates/navigation.html:330
msgid "Logout"
msgstr "Вийти"
-#: core/templates/navigation.html:343
+#: core/templates/navigation.html:353
msgid "Licenses"
msgstr "Ліцензії"
-#: core/templates/navigation.html:351
+#: core/templates/navigation.html:361
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr "Одиниці повторень"
-#: core/templates/navigation.html:359 core/templates/weight_unit/list.html:4
-#: nutrition/templates/ingredient/view.html:167
+#: core/templates/navigation.html:369 core/templates/weight_unit/list.html:4
+#: nutrition/templates/ingredient/view.html:141
msgid "Weight units"
msgstr "Одиниця ваги"
-#: core/templates/navigation.html:367 core/templates/user/list.html:4
+#: core/templates/navigation.html:377 core/templates/user/list.html:4
msgid "User list"
msgstr "Список користувачів"
-#: core/templates/navigation.html:373
+#: core/templates/navigation.html:383
msgid "Gyms"
msgstr "Тренажерні зали"
@@ -875,12 +874,12 @@ msgstr "Дякуємо за користування нашим сайтом!"
msgid "The %(site_name)s team"
msgstr "Команда сайту %(site_name)s"
-#: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:11
+#: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:12
msgid "previous"
msgstr "назад"
-#: core/templates/tags/pagination.html:31
-#: core/templates/tags/pagination.html:35
+#: core/templates/tags/pagination.html:33
+#: core/templates/tags/pagination.html:38
msgid "next"
msgstr "вперед"
@@ -905,36 +904,36 @@ msgid "Add exercises to this workout day"
msgstr "Додати вправи до цього дня тренування"
#: core/templates/tags/render_weight_log.html:17 manager/helpers.py:86
-#: manager/models/setting.py:69 manager/templates/set/formset.html:9
+#: manager/models/setting.py:72 manager/templates/set/formset.html:9
msgid "Reps"
msgstr "Повтори"
#: core/templates/tags/render_weight_log.html:30 manager/forms.py:191
-#: manager/models/log.py:103 manager/models/setting.py:99
+#: manager/models/log.py:103 manager/models/setting.py:102
#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
msgid "RiR"
msgstr "Повторів можете зробити"
-#: core/templates/template.html:120 manager/templates/calendar/month.html:138
-#: manager/templates/schedule/view.html:249
-#: manager/templates/schedule/view.html:270
-#: manager/templates/workout/view.html:86
-#: manager/templates/workout/view.html:139
+#: core/templates/template.html:122 manager/templates/calendar/month.html:138
+#: manager/templates/schedule/view.html:248
+#: manager/templates/schedule/view.html:269
+#: manager/templates/workout/view.html:84
+#: manager/templates/workout/view.html:137
msgid "Close"
msgstr "Закрити"
-#: core/templates/template.html:136
+#: core/templates/template.html:138
msgid ""
"You are using a guest account, data entered will be deleted after a week."
msgstr ""
"Ви використовуєте обліковий запис гостя, введені дані будуть видалені через "
"тиждень."
-#: core/templates/template.html:141
+#: core/templates/template.html:143
msgid "Create some demo entries"
msgstr "Створіть деякі демонстраційні записи"
-#: core/templates/template.html:178 software/templates/features.html:547
+#: core/templates/template.html:180 software/templates/features.html:547
#: software/templates/tos.html:7
msgid "Terms of service"
msgstr "Умови надання послуг"
@@ -1037,7 +1036,7 @@ msgid "Overview"
msgstr "Огляд"
#: core/templates/user/overview.html:28
-#: manager/templates/schedule/view.html:164
+#: manager/templates/schedule/view.html:163
#: manager/templates/workout/overview.html:39 manager/views/schedule_step.py:60
msgid "Add workout"
msgstr "Додати тренування"
@@ -1045,20 +1044,20 @@ msgstr "Додати тренування"
#: core/templates/user/overview.html:34 core/templates/user/overview.html:76
#: core/templates/user/overview.html:120 core/templates/user/overview.html:152
#: exercises/models/base.py:118 exercises/models/base.py:124
-#: exercises/models/exercise.py:63 exercises/models/exercise.py:69
+#: exercises/models/exercise.py:64 exercises/models/exercise.py:70
#: exercises/models/image.py:107 exercises/models/image.py:113
#: exercises/models/video.py:163 exercises/models/video.py:169
#: gallery/models/image.py:42 manager/helpers.py:85 manager/models/log.py:100
#: manager/models/session.py:67 measurements/models/measurement.py:47
-#: nutrition/models/ingredient.py:101 nutrition/models/ingredient.py:107
-#: nutrition/models/ingredient.py:222 weight/models.py:33
+#: nutrition/models/ingredient.py:87 nutrition/models/ingredient.py:93
+#: nutrition/models/ingredient.py:216 weight/models.py:51
#: weight/templates/import_csv_preview.html:13
#: weight/templates/import_csv_preview.html:42 weight/views.py:144
msgid "Date"
msgstr "Дата"
#: core/templates/user/overview.html:35 core/templates/user/overview.html:153
-#: exercises/models/exercise.py:51 gallery/models/image.py:65
+#: exercises/models/exercise.py:52 gallery/models/image.py:65
#: gym/models/contract.py:58 gym/models/contract.py:109
#: manager/models/day.py:37 manager/models/workout.py:63
#: measurements/models/measurement.py:62 nutrition/models/plan.py:67
@@ -1076,13 +1075,13 @@ msgstr "Остання активність"
#: core/templates/user/overview.html:58
#: manager/templates/calendar/month.html:128
-#: manager/templates/schedule/view.html:145
+#: manager/templates/schedule/view.html:144
#: manager/templates/workout/overview.html:28
msgid "No workouts found."
msgstr "Не знайдено жодних тренувань."
#: core/templates/user/overview.html:68 manager/forms.py:280
-#: manager/templates/workout/view.html:108
+#: manager/templates/workout/view.html:106
msgid "Log"
msgstr "Журнал"
@@ -1106,35 +1105,35 @@ msgstr "Час"
#: core/templates/user/overview.html:112 core/templates/user/overview.html:121
#: manager/forms.py:186 manager/helpers.py:86 manager/models/log.py:86
-#: manager/models/setting.py:79 manager/templates/log/add.html:54
-#: manager/templates/set/formset.html:11 weight/models.py:35
+#: manager/models/setting.py:82 manager/templates/log/add.html:54
+#: manager/templates/set/formset.html:11 weight/models.py:53
#: weight/templates/import_csv_preview.html:14
#: weight/templates/import_csv_preview.html:43 weight/views.py:144
msgid "Weight"
msgstr "Вага"
-#: core/templates/user/overview.html:154 nutrition/models/ingredient.py:130
-#: nutrition/templates/ingredient/view.html:77 nutrition/views/plan.py:237
+#: core/templates/user/overview.html:154 nutrition/models/ingredient.py:116
+#: nutrition/templates/ingredient/view.html:51 nutrition/views/plan.py:237
msgid "Energy"
msgstr "Енергія"
-#: core/templates/user/overview.html:155 nutrition/models/ingredient.py:137
-#: nutrition/templates/ingredient/view.html:84 nutrition/views/plan.py:243
+#: core/templates/user/overview.html:155 nutrition/models/ingredient.py:123
+#: nutrition/templates/ingredient/view.html:58 nutrition/views/plan.py:243
msgid "Protein"
msgstr "Білок"
-#: core/templates/user/overview.html:156 nutrition/models/ingredient.py:145
-#: nutrition/templates/ingredient/view.html:90 nutrition/views/plan.py:251
+#: core/templates/user/overview.html:156 nutrition/models/ingredient.py:131
+#: nutrition/templates/ingredient/view.html:64 nutrition/views/plan.py:251
msgid "Carbohydrates"
msgstr "Вуглеводи"
-#: core/templates/user/overview.html:157 nutrition/models/ingredient.py:163
-#: nutrition/templates/ingredient/view.html:106 nutrition/views/plan.py:265
+#: core/templates/user/overview.html:157 nutrition/models/ingredient.py:149
+#: nutrition/templates/ingredient/view.html:80 nutrition/views/plan.py:265
msgid "Fat"
msgstr "Жири"
#: core/templates/user/overview.html:170
-#: nutrition/templates/ingredient/view.html:79
+#: nutrition/templates/ingredient/view.html:53
msgid "kcal"
msgstr "ккал"
@@ -1146,7 +1145,7 @@ msgstr "ккал"
#: gym/templates/gym/member_list.html:207
#: gym/templates/gym/member_list.html:240
#: gym/templates/gym/member_list.html:277
-#: manager/templates/schedule/view.html:101
+#: manager/templates/schedule/view.html:100
msgid "Actions"
msgstr "Дії"
@@ -1189,7 +1188,7 @@ msgid "Details"
msgstr "Деталі"
#: core/templates/user/overview.html:258 gym/views/export.py:57
-#: manager/helpers.py:86 manager/templates/schedule/view.html:99
+#: manager/helpers.py:86 manager/templates/schedule/view.html:98
msgid "Nr."
msgstr "№"
@@ -1234,7 +1233,7 @@ msgid "Documents"
msgstr "Документи"
#: core/templates/user/overview.html:412 gym/templates/document/list.html:32
-#: manager/forms.py:292 manager/templates/workout/view.html:134
+#: manager/forms.py:292 manager/templates/workout/view.html:132
msgid "Download"
msgstr "Завантажити"
@@ -1285,13 +1284,13 @@ msgid "kg"
msgstr "кг"
#: core/templatetags/wger_extras.py:207
-#: nutrition/templates/ingredient/view.html:86
-#: nutrition/templates/ingredient/view.html:92
-#: nutrition/templates/ingredient/view.html:99
-#: nutrition/templates/ingredient/view.html:108
-#: nutrition/templates/ingredient/view.html:115
-#: nutrition/templates/ingredient/view.html:137
-#: nutrition/templates/ingredient/view.html:147
+#: nutrition/templates/ingredient/view.html:60
+#: nutrition/templates/ingredient/view.html:66
+#: nutrition/templates/ingredient/view.html:73
+#: nutrition/templates/ingredient/view.html:82
+#: nutrition/templates/ingredient/view.html:89
+#: nutrition/templates/ingredient/view.html:111
+#: nutrition/templates/ingredient/view.html:121
msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr "г"
@@ -1309,7 +1308,7 @@ msgstr "унцій"
#: exercises/views/equipment.py:103 exercises/views/exercises.py:73
#: exercises/views/muscles.py:99 manager/views/schedule.py:309
#: manager/views/schedule_step.py:128 manager/views/workout.py:249
-#: manager/views/workout_session.py:142 nutrition/views/ingredient.py:116
+#: manager/views/workout_session.py:142 nutrition/views/ingredient.py:119
#: nutrition/views/unit.py:110
msgid "Successfully deleted"
msgstr "Успішно вилучено"
@@ -1321,7 +1320,7 @@ msgstr "Успішно вилучено"
#: gym/views/admin_notes.py:196 gym/views/document.py:206 gym/views/gym.py:481
#: manager/views/schedule.py:316 manager/views/schedule_step.py:138
#: manager/views/workout.py:253 manager/views/workout_session.py:156
-#: nutrition/views/ingredient.py:123 nutrition/views/unit.py:117
+#: nutrition/views/ingredient.py:126 nutrition/views/unit.py:117
#, python-brace-format
msgid "Delete {0}?"
msgstr "Вилучити {0}?"
@@ -1334,7 +1333,7 @@ msgstr "Вилучити {0}?"
#: gym/views/contract.py:186 gym/views/contract_option.py:123
#: gym/views/contract_type.py:123 gym/views/document.py:171
#: gym/views/gym.py:463 manager/views/day.py:100 manager/views/schedule.py:333
-#: manager/views/workout.py:267 nutrition/views/ingredient.py:142
+#: manager/views/workout.py:267 nutrition/views/ingredient.py:145
#: nutrition/views/unit.py:143
#, python-brace-format
msgid "Edit {0}"
@@ -1408,7 +1407,7 @@ msgstr "Тренажерний зал"
msgid "A verification email was sent to %(email)s"
msgstr "Підтверджувальний лист було надіслано на електронну адресу %(email)s"
-#: exercises/models/base.py:82 nutrition/models/ingredient.py:236
+#: exercises/models/base.py:82 nutrition/models/ingredient.py:230
msgid "Category"
msgstr "Категорія"
@@ -1428,7 +1427,7 @@ msgstr "Варіації"
msgid "Exercise Categories"
msgstr "Категорії вправ"
-#: exercises/models/comment.py:52 exercises/models/exercise_alias.py:52
+#: exercises/models/comment.py:52 exercises/models/exercise_alias.py:53
#: exercises/models/image.py:74 exercises/models/video.py:98
#: manager/forms.py:178 manager/helpers.py:86 manager/models/log.py:52
msgid "Exercise"
@@ -1438,12 +1437,12 @@ msgstr "Вправа"
msgid "A comment about how to correctly do this exercise."
msgstr "Коментар про те, як правильно виконувати цю вправу."
-#: exercises/models/exercise.py:76 nutrition/models/ingredient.py:95
+#: exercises/models/exercise.py:77 nutrition/models/ingredient.py:81
#: nutrition/models/weight_unit.py:32
msgid "Language"
msgstr "Мова"
-#: exercises/models/exercise_alias.py:58
+#: exercises/models/exercise_alias.py:59
msgid "Alias for an exercise"
msgstr "Псевдонім вправи"
@@ -1576,7 +1575,7 @@ msgstr "Дія"
#: manager/models/schedule.py:44 manager/models/session.py:49
#: manager/models/workout.py:89 measurements/models/category.py:31
#: measurements/models/measurement.py:42 nutrition/models/plan.py:54
-#: nutrition/templates/ingredient/pending.html:16 weight/models.py:42
+#: weight/models.py:60
msgid "User"
msgstr "Користувач"
@@ -1695,9 +1694,9 @@ msgid "Contract type"
msgstr "Тип контракту"
#: gym/models/contract.py:211 gym/templates/contract/view.html:59
-#: manager/templates/log/add.html:52 nutrition/forms.py:62
-#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:105
-#: nutrition/models/meal_item.py:72
+#: manager/templates/log/add.html:52 nutrition/forms.py:63
+#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:108
+#: nutrition/models/meal_item.py:73
msgid "Amount"
msgstr "Сума"
@@ -1714,7 +1713,7 @@ msgid "Contract is active"
msgstr "Контракт активний"
#: gym/models/contract.py:237 gym/templates/contract/view.html:69
-#: manager/models/schedule.py:61 manager/templates/schedule/view.html:68
+#: manager/models/schedule.py:61 manager/templates/schedule/view.html:67
msgid "Start date"
msgstr "Дата початку"
@@ -2106,7 +2105,7 @@ msgstr "Утворити попередній перегляд"
#: mailer/templates/mailer/gym/form.html:28
#: mailer/templates/mailer/gym/preview.html:62
-#: manager/templates/workout/view.html:42
+#: manager/templates/workout/view.html:40
msgid "Steps"
msgstr "Кроки"
@@ -2130,7 +2129,7 @@ msgstr ""
"надсилати електронні листи"
#: mailer/templates/mailer/gym/preview.html:22
-#: software/templates/about_us.html:60
+#: software/templates/about_us.html:70
msgid "Current version"
msgstr "Поточна версія"
@@ -2162,16 +2161,16 @@ msgid ""
msgstr ""
"Ви можете шукати більше ніж одну вправу, вони будуть згруповані в суперсет."
-#: manager/forms.py:140 nutrition/forms.py:252
+#: manager/forms.py:140 nutrition/forms.py:253
msgid "Also search for names in English"
msgstr "Також шукайте імена англійською мовою"
#: manager/forms.py:168 manager/forms.py:173 manager/models/log.py:64
-#: manager/models/log.py:92 manager/models/setting.py:59
-#: manager/models/setting.py:90 manager/templates/log/add.html:53
+#: manager/models/log.py:92 manager/models/setting.py:62
+#: manager/models/setting.py:93 manager/templates/log/add.html:53
#: manager/templates/log/add.html:55 manager/templates/set/formset.html:10
#: manager/templates/set/formset.html:12 measurements/models/category.py:41
-#: nutrition/forms.py:66
+#: nutrition/forms.py:67
msgid "Unit"
msgstr "Одиниця"
@@ -2179,15 +2178,15 @@ msgstr "Одиниця"
msgid "Type"
msgstr "Тип"
-#: manager/forms.py:280 manager/templates/workout/view.html:115
+#: manager/forms.py:280 manager/templates/workout/view.html:113
msgid "Table"
msgstr "Таблиця"
-#: manager/forms.py:282 manager/templates/workout/view.html:121
+#: manager/forms.py:282 manager/templates/workout/view.html:119
msgid "with images"
msgstr "із зображеннями"
-#: manager/forms.py:283 manager/templates/workout/view.html:127
+#: manager/forms.py:283 manager/templates/workout/view.html:125
msgid "with comments"
msgstr "з коментарями"
@@ -2196,11 +2195,10 @@ msgid "Workout will expire soon"
msgstr "Тренування скоро завершиться"
#: manager/models/day.py:34 manager/models/log.py:58
-#: manager/models/session.py:60 manager/templates/schedule/view.html:103
-#: manager/templates/workout/view.html:11
-#: manager/templates/workout/view.html:19 manager/views/pdf.py:85
-#: manager/views/pdf.py:161 manager/views/schedule.py:151
-#: manager/views/schedule.py:221
+#: manager/models/session.py:60 manager/templates/schedule/view.html:102
+#: manager/templates/workout/view.html:9 manager/templates/workout/view.html:17
+#: manager/views/pdf.py:85 manager/views/pdf.py:161
+#: manager/views/schedule.py:151 manager/views/schedule.py:221
msgid "Workout"
msgstr "Тренування"
@@ -2220,7 +2218,7 @@ msgstr "День"
msgid "Name or short description of the schedule. For example 'Program XYZ'."
msgstr "Назва або короткий опис програми. Наприклад 'Програма XYZ'."
-#: manager/models/schedule.py:65 manager/templates/schedule/view.html:72
+#: manager/models/schedule.py:65 manager/templates/schedule/view.html:71
msgid "Schedule active"
msgstr "Програма активна"
@@ -2234,7 +2232,7 @@ msgstr ""
"(відображатиметься, наприклад, на інформаційній панелі). Всі інші програми "
"будуть позначені як неактивні"
-#: manager/models/schedule.py:77 manager/templates/schedule/view.html:82
+#: manager/models/schedule.py:77 manager/templates/schedule/view.html:81
msgid "Is a loop"
msgstr "Є циклом"
@@ -2255,8 +2253,8 @@ msgid "The duration in weeks"
msgstr "Тривалість в тижнях"
#: manager/models/schedule_step.py:64 manager/models/set.py:53
-#: manager/models/setting.py:110 nutrition/models/meal.py:55
-#: nutrition/models/meal_item.py:65
+#: manager/models/setting.py:113 nutrition/models/meal.py:55
+#: nutrition/models/meal_item.py:66
msgid "Order"
msgstr "Порядок"
@@ -2306,7 +2304,7 @@ msgstr "День тренування"
msgid "Number of sets"
msgstr "Кількість підходів"
-#: manager/models/setting.py:48
+#: manager/models/setting.py:51
msgid "Sets"
msgstr "Підходи"
@@ -2383,7 +2381,7 @@ msgstr ""
msgid "Go to current month"
msgstr "Перейти до поточного місяця"
-#: manager/templates/calendar/month.html:188
+#: manager/templates/calendar/month.html:190
msgid "Add new log"
msgstr "Додати новий журнал"
@@ -2423,8 +2421,8 @@ msgid "Your schedules"
msgstr "Ваші програми"
#: manager/templates/schedule/overview.html:19
-#: manager/templates/schedule/view.html:132
-#: manager/templates/schedule/view.html:184
+#: manager/templates/schedule/view.html:131
+#: manager/templates/schedule/view.html:183
#: manager/templates/workout/overview.html:16
msgid "active"
msgstr "активні"
@@ -2471,11 +2469,11 @@ msgstr ""
msgid "Add schedule"
msgstr "Додати програму"
-#: manager/templates/schedule/view.html:10
+#: manager/templates/schedule/view.html:9
msgid "Schedule"
msgstr "Програма"
-#: manager/templates/schedule/view.html:86
+#: manager/templates/schedule/view.html:85
msgid ""
"This schedule is a loop and will go through the workouts above till you "
"deactivate it"
@@ -2483,19 +2481,19 @@ msgstr ""
"Ця програма є циклом і буде повторюватись до тих пір, поки ви не деактивуєте "
"її"
-#: manager/templates/schedule/view.html:104
+#: manager/templates/schedule/view.html:103
msgid "Weeks"
msgstr "Тижні"
-#: manager/templates/schedule/view.html:116
+#: manager/templates/schedule/view.html:115
msgid "Move me"
msgstr "Перемістіть мене"
-#: manager/templates/schedule/view.html:157
+#: manager/templates/schedule/view.html:156
msgid "Start schedule"
msgstr "Почати програму"
-#: manager/templates/schedule/view.html:188
+#: manager/templates/schedule/view.html:187
#, python-format
msgid ""
"%(weeks)s Week\n"
@@ -2516,11 +2514,11 @@ msgstr[3] ""
"%(weeks)s Тижні\n"
" "
-#: manager/templates/schedule/view.html:222
+#: manager/templates/schedule/view.html:221
msgid "Adding workouts"
msgstr "Додавання тренувань"
-#: manager/templates/schedule/view.html:224
+#: manager/templates/schedule/view.html:223
msgid ""
"Add as many workouts to the schedule as you want. You can\n"
" edit the order by dragging and dropping them. It's also possible "
@@ -2531,21 +2529,21 @@ msgstr ""
"змінити порядок, перетягнувши їх. Також можна додати одне тренування\n"
"більш ніж один раз."
-#: manager/templates/schedule/view.html:233
-#: manager/templates/schedule/view.html:244
-#: manager/templates/schedule/view.html:291
-#: manager/templates/workout/view.html:71
-#: manager/templates/workout/view.html:81
-#: manager/templates/workout/view.html:180
+#: manager/templates/schedule/view.html:232
+#: manager/templates/schedule/view.html:243
+#: manager/templates/schedule/view.html:290
+#: manager/templates/workout/view.html:69
+#: manager/templates/workout/view.html:79
+#: manager/templates/workout/view.html:178
msgid "Export calendar file"
msgstr "Експортувати файл календаря"
-#: manager/templates/schedule/view.html:237
+#: manager/templates/schedule/view.html:236
msgid "Export this schedule as a calendar file."
msgstr "Експортувати цю програму в файл календаря."
-#: manager/templates/schedule/view.html:238
-#: manager/templates/workout/view.html:76
+#: manager/templates/schedule/view.html:237
+#: manager/templates/workout/view.html:74
msgid ""
"You can then import the file it into your calendar\n"
" application for example google calendar, outlook or "
@@ -2557,18 +2555,18 @@ msgstr ""
"google календар, outlook або iCal. Це дозволить створити розклад на\n"
"кожен тренувальний день з відповідними вправами."
-#: manager/templates/schedule/view.html:259
-#: manager/templates/schedule/view.html:295
-#: manager/templates/workout/view.html:96
-#: manager/templates/workout/view.html:176
+#: manager/templates/schedule/view.html:258
+#: manager/templates/schedule/view.html:294
+#: manager/templates/workout/view.html:94
+#: manager/templates/workout/view.html:174
msgid "Download as PDF"
msgstr "Завантажити як PDF"
-#: manager/templates/schedule/view.html:300
+#: manager/templates/schedule/view.html:299
msgid "Edit schedule"
msgstr "Редагувати програму"
-#: manager/templates/schedule/view.html:305
+#: manager/templates/schedule/view.html:304
msgid "Delete schedule"
msgstr "Видалити програму"
@@ -2710,12 +2708,12 @@ msgid "Mark as workout"
msgstr "Позначити як тренування"
#: manager/templates/workout/template_view.html:65
-#: manager/templates/workout/view.html:51
+#: manager/templates/workout/view.html:49
msgid "Muscles trained"
msgstr "Треновані м'язи"
#: manager/templates/workout/template_view.html:68
-#: manager/templates/workout/view.html:54
+#: manager/templates/workout/view.html:52
msgid ""
"Images show combined muscles as trained by the exercises on the workout."
msgstr ""
@@ -2725,35 +2723,35 @@ msgstr ""
msgid "Use this template"
msgstr "Використовувати цей шаблон"
-#: manager/templates/workout/view.html:45
+#: manager/templates/workout/view.html:43
msgid "Add training days"
msgstr "Додати тренувальні дні"
-#: manager/templates/workout/view.html:46
+#: manager/templates/workout/view.html:44
msgid "Add workout sets to days"
msgstr "Додати набори підходів до тренувальних днів"
-#: manager/templates/workout/view.html:47
+#: manager/templates/workout/view.html:45
msgid "Set the repetitions for each set"
msgstr "Встановити повторення для кожного підходу"
-#: manager/templates/workout/view.html:75
+#: manager/templates/workout/view.html:73
msgid "Export this workout as a calendar file."
msgstr "Експорт цього тренування у файлі календаря."
-#: manager/templates/workout/view.html:146
+#: manager/templates/workout/view.html:144
msgid "Logs"
msgstr "Журнали"
-#: manager/templates/workout/view.html:148
+#: manager/templates/workout/view.html:146
msgid "View logs"
msgstr "Перегляд журналів"
-#: manager/templates/workout/view.html:171 manager/views/schedule_step.py:99
+#: manager/templates/workout/view.html:169 manager/views/schedule_step.py:99
msgid "Edit workout"
msgstr "Змінити тренування"
-#: manager/templates/workout/view.html:184 manager/views/workout.py:281
+#: manager/templates/workout/view.html:182 manager/views/workout.py:281
msgid "Mark as template"
msgstr "Позначити як шаблон"
@@ -2800,35 +2798,35 @@ msgstr "Також буде видалено всі записи ваги для
msgid "Value"
msgstr "Значення"
-#: nutrition/forms.py:117
+#: nutrition/forms.py:118
msgid "Height (in)"
msgstr "Зріст (см)"
-#: nutrition/forms.py:120
+#: nutrition/forms.py:121
msgid "Weight (kg)"
msgstr "Вага (кг)"
-#: nutrition/forms.py:120
+#: nutrition/forms.py:121
msgid "Weight (lbs)"
msgstr "Вага (фунти)"
-#: nutrition/forms.py:133
+#: nutrition/forms.py:134
msgid "Calculate"
msgstr "Обчислити"
-#: nutrition/forms.py:207 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:208 nutrition/templates/rate/form.html:76
msgid "Basic caloric intake"
msgstr "Основне споживання калорій"
-#: nutrition/forms.py:208
+#: nutrition/forms.py:209
msgid "Your basic caloric intake as calculated for your data"
msgstr "Ваше основне споживання калорій, розраховане для ваших даних"
-#: nutrition/forms.py:213
+#: nutrition/forms.py:214
msgid "Additional calories"
msgstr "Додаткові калорії"
-#: nutrition/forms.py:215
+#: nutrition/forms.py:216
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
@@ -2836,70 +2834,55 @@ msgstr ""
"Додаткові калорії для додавання до базової ставки (для віднімання, введіть "
"від'ємне число)"
-#: nutrition/forms.py:248 nutrition/models/ingredient_weight_unit.py:39
-#: nutrition/models/log.py:84 nutrition/models/meal_item.py:53
+#: nutrition/forms.py:249 nutrition/models/ingredient_weight_unit.py:39
+#: nutrition/models/log.py:87 nutrition/models/meal_item.py:54
msgid "Ingredient"
msgstr "Інгредієнт"
-#: nutrition/models/ingredient.py:131
+#: nutrition/models/ingredient.py:117
msgid "In kcal per 100g"
msgstr "В ккал на 100 г"
-#: nutrition/models/ingredient.py:138 nutrition/models/ingredient.py:146
-#: nutrition/models/ingredient.py:156 nutrition/models/ingredient.py:164
-#: nutrition/models/ingredient.py:174 nutrition/models/ingredient.py:184
-#: nutrition/models/ingredient.py:194
+#: nutrition/models/ingredient.py:124 nutrition/models/ingredient.py:132
+#: nutrition/models/ingredient.py:142 nutrition/models/ingredient.py:150
+#: nutrition/models/ingredient.py:160 nutrition/models/ingredient.py:170
+#: nutrition/models/ingredient.py:180
msgid "In g per 100g of product"
msgstr "В г на 100г продукту"
-#: nutrition/models/ingredient.py:155
-#: nutrition/templates/ingredient/view.html:96 nutrition/views/plan.py:259
+#: nutrition/models/ingredient.py:141
+#: nutrition/templates/ingredient/view.html:70 nutrition/views/plan.py:259
msgid "Sugar content in carbohydrates"
msgstr "Вміст цукру в вуглеводах"
-#: nutrition/models/ingredient.py:173
-#: nutrition/templates/ingredient/view.html:112 nutrition/views/plan.py:273
+#: nutrition/models/ingredient.py:159
+#: nutrition/templates/ingredient/view.html:86 nutrition/views/plan.py:273
msgid "Saturated fat content in fats"
msgstr "Вміст жиру у жирах"
-#: nutrition/models/ingredient.py:183
-#: nutrition/templates/ingredient/view.html:134 nutrition/views/plan.py:279
-msgid "Fibres"
-msgstr "Волокна"
+#: nutrition/models/ingredient.py:169
+#: nutrition/templates/ingredient/view.html:108 nutrition/views/plan.py:279
+msgid "Fiber"
+msgstr ""
-#: nutrition/models/ingredient.py:193
-#: nutrition/templates/ingredient/view.html:144 nutrition/views/plan.py:285
+#: nutrition/models/ingredient.py:179
+#: nutrition/templates/ingredient/view.html:118 nutrition/views/plan.py:285
msgid "Sodium"
msgstr "Натрій"
-#: nutrition/models/ingredient.py:215
+#: nutrition/models/ingredient.py:209
msgid "Link to product"
msgstr "Посилання на виріб"
-#: nutrition/models/ingredient.py:244
+#: nutrition/models/ingredient.py:238
msgid "Brand name of product"
msgstr "Торгова марка виробу"
-#: nutrition/models/ingredient.py:304
+#: nutrition/models/ingredient.py:305
#, python-brace-format
msgid "The total energy ({self.energy}kcal) is not the approximate sum of the "
msgstr ""
-#: nutrition/models/ingredient.py:383 nutrition/views/ingredient.py:196
-msgid "Ingredient was successfully added to the general database"
-msgstr "Інгредієнт успішно додано до загальної бази даних"
-
-#: nutrition/models/ingredient.py:408
-msgid "New user submitted ingredient"
-msgstr "Новий інгредієнт поданий користувачем"
-
-#: nutrition/models/ingredient.py:410
-#, fuzzy, python-brace-format
-#| msgid "The user {0} submitted a new ingredient \"{1}\"."
-msgid ""
-"The user {request.user.username} submitted a new ingredient \"{self.name}\"."
-msgstr "Користувач {0} подав новий інгредієнт \"{1}\"."
-
#: nutrition/models/ingredient_category.py:31
msgid "Ingredient Categories"
msgstr "Категорії інгредієнтів"
@@ -2912,16 +2895,16 @@ msgstr "Кількість в грамах"
msgid "Unit amount, e.g. \"1 Cup\" or \"1/2 spoon\""
msgstr "Одиниця кількісті, напр. \"1 чашка\" або \"1/2 ложки\""
-#: nutrition/models/log.py:49 nutrition/models/meal.py:50
-#: nutrition/models/meal_item.py:47 nutrition/models/plan.py:106
+#: nutrition/models/log.py:52 nutrition/models/meal.py:50
+#: nutrition/models/meal_item.py:48 nutrition/models/plan.py:108
msgid "Nutrition plan"
msgstr "План харчування"
-#: nutrition/models/log.py:58
+#: nutrition/models/log.py:61
msgid "Meal"
msgstr "Приймання їжі"
-#: nutrition/models/log.py:68
+#: nutrition/models/log.py:71
msgid "Date and Time (Approx.)"
msgstr "Дата і час (приблизно)"
@@ -2943,11 +2926,11 @@ msgid ""
"summer\""
msgstr "Опис мети плану, напр. \"Набір маси\" або \"Підготування до літа\""
-#: nutrition/models/plan.py:88
+#: nutrition/models/plan.py:90
msgid "Use daily calories"
msgstr "Використовуйте щоденні калорії"
-#: nutrition/models/plan.py:91
+#: nutrition/models/plan.py:93
msgid ""
"Tick the box if you want to mark this plan as having a goal amount of "
"calories. You can use the calculator or enter the value yourself."
@@ -3073,67 +3056,36 @@ msgstr "Пошук"
msgid "Add ingredient"
msgstr "Додати інгредієнт"
-#: nutrition/templates/ingredient/pending.html:14
-msgid "Submission date"
-msgstr "Дата подання"
-
-#: nutrition/templates/ingredient/view.html:27
-msgid "Ingredient is pending review"
-msgstr "Інгредієнт очікує на розгляд"
-
-#: nutrition/templates/ingredient/view.html:28
-msgid ""
-"This user submitted ingredient is pending a decision to be\n"
-"included in the database. Till then, it will not be shown in the overview "
-"or\n"
-"the search."
-msgstr ""
-"Цей інгредієнт, який подав користувач, очікує на прийняття рішення\n"
-"включення до бази даних. До цього часу він не буде показаний в огляді \n"
-"або в пошуку."
-
-#: nutrition/templates/ingredient/view.html:31
-msgid "Please select one of the options below."
-msgstr "Виберіть один із наведених нижче варіантів."
-
-#: nutrition/templates/ingredient/view.html:38
-msgid "Accept"
-msgstr "Прийняти"
-
-#: nutrition/templates/ingredient/view.html:42
-msgid "Decline"
-msgstr "Відхилити"
-
-#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:229
+#: nutrition/templates/ingredient/view.html:45 nutrition/views/plan.py:229
msgid "Macronutrients"
msgstr "Макроелементи"
-#: nutrition/templates/ingredient/view.html:80
+#: nutrition/templates/ingredient/view.html:54
msgid "kJ"
msgstr "кДж"
-#: nutrition/templates/ingredient/view.html:101
-#: nutrition/templates/ingredient/view.html:117
-#: nutrition/templates/ingredient/view.html:139
-#: nutrition/templates/ingredient/view.html:149
+#: nutrition/templates/ingredient/view.html:75
+#: nutrition/templates/ingredient/view.html:91
+#: nutrition/templates/ingredient/view.html:113
+#: nutrition/templates/ingredient/view.html:123
msgid "n.A."
msgstr "немає в наявності"
-#: nutrition/templates/ingredient/view.html:128
+#: nutrition/templates/ingredient/view.html:102
msgid "Others"
msgstr "Інші"
-#: nutrition/templates/ingredient/view.html:170
+#: nutrition/templates/ingredient/view.html:144
#: nutrition/templates/units/list.html:46 nutrition/views/unit.py:86
msgid "Add new weight unit"
msgstr "Додати нову одиницю ваги"
-#: nutrition/templates/ingredient/view.html:232
-#: nutrition/templates/ingredient/view.html:235
+#: nutrition/templates/ingredient/view.html:206
+#: nutrition/templates/ingredient/view.html:209
msgid "Edit ingredient"
msgstr "Редагувати інгредієнт"
-#: nutrition/templates/ingredient/view.html:239
+#: nutrition/templates/ingredient/view.html:213
msgid "Delete ingredient"
msgstr "Видалити інгредієнт"
@@ -3238,14 +3190,10 @@ msgstr "від 140 до 230"
msgid "56 to 90"
msgstr "від 56 до 90"
-#: nutrition/views/ingredient.py:154
+#: nutrition/views/ingredient.py:157
msgid "Add a new ingredient"
msgstr "Додати новий інгредієнт"
-#: nutrition/views/ingredient.py:209
-msgid "Ingredient was successfully marked as rejected"
-msgstr "Інгредієнт успішно позначений як відхилений"
-
#: nutrition/views/plan.py:120
msgid "Nutritional plan"
msgstr "План харчування"
@@ -3292,18 +3240,10 @@ msgstr ""
"створений ентузіастами фітнесу з усього світу."
#: software/templates/about_us.html:18
-msgid "Source code"
-msgstr "Джерельний код"
-
-#: software/templates/about_us.html:20
-msgid "Get the source code of this application and its server on github"
-msgstr "Отримайте джерельний код цього застосунку та його сервера на github"
-
-#: software/templates/about_us.html:25
msgid "Have a problem or idea?"
msgstr "У вас є проблема чи ідея?"
-#: software/templates/about_us.html:27
+#: software/templates/about_us.html:20
msgid ""
"Get in touch if something didn't behave as expected or if there is a feature "
"that you feel is missing."
@@ -3311,21 +3251,29 @@ msgstr ""
"Зв'яжіться з нами, якщо щось відбувається не так, як очікувалося, або якщо є "
"функція, яка, на вашу думку, відсутня."
-#: software/templates/about_us.html:32
+#: software/templates/about_us.html:26
msgid "Say hi!"
msgstr "Привітайтеся!"
-#: software/templates/about_us.html:34
+#: software/templates/about_us.html:28
msgid "If you want to chat with us, hop on the Discord server and get in touch"
msgstr ""
"Якщо ви хочете поспілкуватися з нами, зайдіть на сервер Discord і зв'яжіться "
"з нами"
-#: software/templates/about_us.html:39 software/templates/features.html:503
+#: software/templates/about_us.html:33
+msgid "Mastodon"
+msgstr ""
+
+#: software/templates/about_us.html:35
+msgid "Follow us on mastodon for updates and news about the project"
+msgstr ""
+
+#: software/templates/about_us.html:40 software/templates/features.html:503
msgid "Translation"
msgstr "Перекладання"
-#: software/templates/about_us.html:41
+#: software/templates/about_us.html:42
msgid ""
"This application is translated on weblate. If you also want to help, click "
"the link and start translating"
@@ -3333,15 +3281,30 @@ msgstr ""
"Цей застосунок перекладено на Weblate. Якщо ви також хочете допомогти, "
"клацніть на посилання та почніть переклад"
-#: software/templates/about_us.html:50
+#: software/templates/about_us.html:47
+msgid "Source code"
+msgstr "Джерельний код"
+
+#: software/templates/about_us.html:49
+msgid "Get the source code of this application and its server on github"
+msgstr "Отримайте джерельний код цього застосунку та його сервера на github"
+
+#: software/templates/about_us.html:59
msgid "Our goal"
msgstr "Наша мета"
-#: software/templates/about_us.html:53
+#: software/templates/about_us.html:62
+#, fuzzy
+#| msgid ""
+#| "The goal is to build an awesome\n"
+#| " and flexible fitness manager, along with a comprehensive "
+#| "and complete list of exercises and\n"
+#| " ingredients, all released under a free license."
msgid ""
"The goal is to build an awesome\n"
" and flexible fitness manager, along with a comprehensive and "
-"complete list of exercises and\n"
+"complete list of\n"
+" exercises and\n"
" ingredients, all released under a free license."
msgstr ""
"Мета полягає в тому, щоб побудувати дивовижний і гнучкий фітнес-менеджер, а "
@@ -3357,10 +3320,6 @@ msgstr ""
"wger Workout Manager - безплатний вебзастосунок з відкритим вихідним кодом, "
"який керує вашими вправами та тренуванням."
-#: software/templates/features.html:45
-msgid "About"
-msgstr "Про"
-
#: software/templates/features.html:57
msgid "Mobile app"
msgstr "Мобільний застосунок"
@@ -3619,18 +3578,6 @@ msgstr ""
"роботі, але також містить достатньо нового творчого змісту, щоб надати їй "
"право на власне авторське право."
-#: utils/models.py:130
-msgid "Pending"
-msgstr "В очікуванні"
-
-#: utils/models.py:131
-msgid "Accepted"
-msgstr "Прийнято"
-
-#: utils/models.py:132
-msgid "Declined"
-msgstr "Відхилено"
-
#: weight/forms.py:54
msgid "Input"
msgstr "Віхдні дані"
@@ -3643,7 +3590,7 @@ msgstr "Формат дати"
msgid "You have to enter your weight"
msgstr "Ви повинні ввести свою вагу"
-#: weight/models.py:60
+#: weight/models.py:78
msgid "Weight entry"
msgstr "Запис ваги"
@@ -3786,6 +3733,65 @@ msgstr "Успішно видалено."
msgid "Delete weight entry for the %s"
msgstr "Видалити запис ваги для %s"
+#~ msgid "Ingredients pending review"
+#~ msgstr "Інгредієнти, що очікують розгляду"
+
+#~ msgid "Fibres"
+#~ msgstr "Волокна"
+
+#~ msgid "Ingredient was successfully added to the general database"
+#~ msgstr "Інгредієнт успішно додано до загальної бази даних"
+
+#~ msgid "New user submitted ingredient"
+#~ msgstr "Новий інгредієнт поданий користувачем"
+
+#, fuzzy, python-brace-format
+#~| msgid "The user {0} submitted a new ingredient \"{1}\"."
+#~ msgid ""
+#~ "The user {request.user.username} submitted a new ingredient \"{self."
+#~ "name}\"."
+#~ msgstr "Користувач {0} подав новий інгредієнт \"{1}\"."
+
+#~ msgid "Submission date"
+#~ msgstr "Дата подання"
+
+#~ msgid "Ingredient is pending review"
+#~ msgstr "Інгредієнт очікує на розгляд"
+
+#~ msgid ""
+#~ "This user submitted ingredient is pending a decision to be\n"
+#~ "included in the database. Till then, it will not be shown in the overview "
+#~ "or\n"
+#~ "the search."
+#~ msgstr ""
+#~ "Цей інгредієнт, який подав користувач, очікує на прийняття рішення\n"
+#~ "включення до бази даних. До цього часу він не буде показаний в огляді \n"
+#~ "або в пошуку."
+
+#~ msgid "Please select one of the options below."
+#~ msgstr "Виберіть один із наведених нижче варіантів."
+
+#~ msgid "Accept"
+#~ msgstr "Прийняти"
+
+#~ msgid "Decline"
+#~ msgstr "Відхилити"
+
+#~ msgid "Ingredient was successfully marked as rejected"
+#~ msgstr "Інгредієнт успішно позначений як відхилений"
+
+#~ msgid "About"
+#~ msgstr "Про"
+
+#~ msgid "Pending"
+#~ msgstr "В очікуванні"
+
+#~ msgid "Accepted"
+#~ msgstr "Прийнято"
+
+#~ msgid "Declined"
+#~ msgstr "Відхилено"
+
#~ msgid "Share"
#~ msgstr "Поділитися"
diff --git a/wger/locale/zh_CN/LC_MESSAGES/django.po b/wger/locale/zh_CN/LC_MESSAGES/django.po
index 05874a671..83af27db2 100644
--- a/wger/locale/zh_CN/LC_MESSAGES/django.po
+++ b/wger/locale/zh_CN/LC_MESSAGES/django.po
@@ -14,7 +14,7 @@ msgid ""
msgstr ""
"Project-Id-Version: wger Workout Manager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-02-02 12:42+0100\n"
+"POT-Creation-Date: 2024-07-14 15:49+0200\n"
"PO-Revision-Date: 2024-06-05 08:09+0000\n"
"Last-Translator: Yi-Han Hsiung <[email protected]>\n"
"Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/"
@@ -38,7 +38,7 @@ msgstr ""
"选择默认健身房。所有新注册用户及没有添加健身房的已注册用户会加入此默认健身"
"房。"
-#: config/views/gym_config.py:42 core/templates/language/view.html:63
+#: config/views/gym_config.py:42 core/templates/language/view.html:67
#: core/templates/license/list.html:17 core/templates/misc/license/list.html:18
#: core/templates/repetition_unit/list.html:18
#: core/templates/tags/render_day.html:39
@@ -58,8 +58,8 @@ msgstr ""
#: manager/templates/calendar/day.html:68
#: manager/templates/calendar/month.html:85
#: manager/templates/calendar/partial_overview_table.html:18
-#: manager/templates/schedule/view.html:119
-#: nutrition/templates/ingredient/view.html:191
+#: manager/templates/schedule/view.html:118
+#: nutrition/templates/ingredient/view.html:165
#: nutrition/templates/units/list.html:19
msgid "Edit"
msgstr "编辑"
@@ -93,8 +93,8 @@ msgstr "我酷酷的健身日程"
msgid "Empty placeholder schedule"
msgstr "空的时间表"
-#: core/forms.py:69 core/templates/navigation.html:275
-#: core/templates/navigation.html:281 core/templates/user/login.html:4
+#: core/forms.py:69 core/templates/navigation.html:285
+#: core/templates/navigation.html:291 core/templates/user/login.html:4
#: software/templates/features.html:82 software/templates/features.html:427
msgid "Login"
msgstr "登录"
@@ -164,7 +164,7 @@ msgstr "密码"
msgid "Please enter your current password."
msgstr "请输入你的原密码。"
-#: core/forms.py:242 core/templates/language/view.html:68
+#: core/forms.py:242 core/templates/language/view.html:73
#: core/templates/license/list.html:19 core/templates/misc/license/list.html:22
#: core/templates/repetition_unit/list.html:20
#: core/templates/tags/render_day.html:45
@@ -179,10 +179,10 @@ msgstr "请输入你的原密码。"
#: gym/templates/gym/list.html:22 manager/templates/calendar/day.html:73
#: manager/templates/calendar/month.html:89
#: manager/templates/calendar/partial_overview_table.html:23
-#: manager/templates/schedule/view.html:123
-#: manager/templates/workout/view.html:190
-#: nutrition/templates/ingredient/view.html:192
-#: nutrition/templates/ingredient/view.html:241
+#: manager/templates/schedule/view.html:122
+#: manager/templates/workout/view.html:188
+#: nutrition/templates/ingredient/view.html:166
+#: nutrition/templates/ingredient/view.html:215
#: nutrition/templates/units/list.html:22
msgid "Delete"
msgstr "删除"
@@ -195,14 +195,14 @@ msgstr "密码无效"
msgid "The form is secured with reCAPTCHA"
msgstr "该表格由 reCAPTCHA 保护"
-#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:275
-#: core/templates/navigation.html:287 core/templates/template.html:147
+#: core/forms.py:279 core/forms.py:301 core/templates/navigation.html:285
+#: core/templates/navigation.html:297 core/templates/template.html:149
#: core/templates/user/login.html:20 core/views/user.py:298
#: software/templates/features.html:87 software/templates/features.html:422
msgid "Register"
msgstr "注册"
-#: core/forms.py:315
+#: core/forms.py:315 software/templates/features.html:45
msgid "Contact"
msgstr "联系"
@@ -211,7 +211,7 @@ msgid "Some way of answering you (e-mail, etc.)"
msgstr "回复你问题的方式(邮件等)"
#: core/forms.py:324 exercises/models/comment.py:58 manager/models/set.py:61
-#: manager/models/setting.py:111 nutrition/models/log.py:74
+#: manager/models/setting.py:114 nutrition/models/log.py:77
msgid "Comment"
msgstr "评论"
@@ -231,6 +231,12 @@ msgstr "语言缩写"
msgid "Language full name"
msgstr "语言全称"
+#: core/models/language.py:45 core/templates/language/view.html:23
+#, fuzzy
+#| msgid "Language full name"
+msgid "Language full name in English"
+msgstr "语言全称"
+
#: core/models/license.py:29
msgid "Full name"
msgstr "全称"
@@ -247,7 +253,7 @@ msgstr ""
msgid "Short name, e.g. CC-BY-SA 3"
msgstr "缩略名,例如,CC-BY-SA 3"
-#: core/models/license.py:45 nutrition/models/ingredient.py:214
+#: core/models/license.py:45 nutrition/models/ingredient.py:208
msgid "Link"
msgstr "链接"
@@ -358,7 +364,7 @@ msgstr ""
msgid "Age"
msgstr "年龄"
-#: core/models/profile.py:230 nutrition/forms.py:117
+#: core/models/profile.py:230 nutrition/forms.py:118
msgid "Height (cm)"
msgstr "身高(cm)"
@@ -409,7 +415,7 @@ msgid "Total caloric intake, including e.g. any surplus"
msgstr "总卡路里摄取量,包括例如:任何过量的卡路里"
#: core/models/profile.py:333 nutrition/models/ingredient_weight_unit.py:45
-#: nutrition/models/log.py:93 nutrition/models/meal_item.py:58
+#: nutrition/models/log.py:96 nutrition/models/meal_item.py:59
msgid "Weight unit"
msgstr "重量单位"
@@ -440,17 +446,16 @@ msgstr "所有时长的和应该是24"
#: core/models/rep_unit.py:36 core/models/weight_unit.py:36
#: core/templates/user/overview.html:262 core/views/user.py:599
#: exercises/models/category.py:29 exercises/models/equipment.py:29
-#: exercises/models/exercise.py:58 exercises/models/muscle.py:36
+#: exercises/models/exercise.py:59 exercises/models/muscle.py:36
#: gym/models/contract.py:52 gym/models/contract.py:103 gym/models/gym.py:46
#: gym/models/user_document.py:84 gym/templates/contract/view.html:50
#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:96
#: gym/views/gym.py:158 manager/models/schedule.py:55
#: manager/models/workout.py:57 measurements/models/category.py:36
-#: nutrition/models/ingredient.py:125
+#: nutrition/models/ingredient.py:111
#: nutrition/models/ingredient_category.py:27 nutrition/models/meal.py:67
#: nutrition/models/weight_unit.py:38
-#: nutrition/templates/ingredient/pending.html:15
-#: nutrition/templates/ingredient/view.html:178
+#: nutrition/templates/ingredient/view.html:152
msgid "Name"
msgstr "名称"
@@ -479,8 +484,9 @@ msgid ""
"There was an error on the server while processing your request. Try "
"refreshing your browser and if that doesn't help, please try again at a "
"later time. If the problem persists, you can seek help in ways listed below:"
-msgstr "服务器在处理您的请求时出现错误。尝试刷新您的浏览器,如果没有帮助,请稍后再试"
-"。如果问题仍然存在,您可以通过以下方式寻求帮助:"
+msgstr ""
+"服务器在处理您的请求时出现错误。尝试刷新您的浏览器,如果没有帮助,请稍后再"
+"试。如果问题仍然存在,您可以通过以下方式寻求帮助:"
#: core/templates/base.html:10 core/templates/base_wide.html:7
#, python-format
@@ -553,24 +559,24 @@ msgstr ""
msgid "Dashboard"
msgstr "管理面板"
-#: core/templates/language/overview.html:4 core/templates/navigation.html:335
+#: core/templates/language/overview.html:4 core/templates/navigation.html:345
msgid "Languages"
msgstr "语言"
-#: core/templates/language/overview.html:20
+#: core/templates/language/overview.html:22
msgid "Nothing found."
msgstr "未找到匹配项。"
-#: core/templates/language/overview.html:20
+#: core/templates/language/overview.html:22
#: manager/templates/calendar/month.html:132
#: manager/templates/schedule/overview.html:28
-#: manager/templates/schedule/view.html:145
+#: manager/templates/schedule/view.html:144
#: manager/templates/workout/overview.html:28
#: nutrition/templates/ingredient/overview.html:38
msgid "Add one now."
msgstr "现在就新增一个。"
-#: core/templates/language/overview.html:33 core/templates/license/list.html:40
+#: core/templates/language/overview.html:35 core/templates/license/list.html:40
#: core/templates/misc/license/list.html:43
#: core/templates/repetition_unit/list.html:43
#: core/templates/user/overview.html:326 core/templates/user/overview.html:365
@@ -590,13 +596,13 @@ msgstr "现在就新增一个。"
msgid "Add"
msgstr "新增"
-#: core/templates/language/view.html:58 core/templates/user/api_key.html:44
+#: core/templates/language/view.html:61 core/templates/user/api_key.html:44
#: core/templates/user/preferences.html:45 gym/models/contract.py:203
#: gym/templates/contract/view.html:41 gym/templates/contract/view.html:106
#: gym/templates/gym/member_list.html:248
-#: manager/templates/schedule/view.html:286
-#: manager/templates/workout/view.html:165
-#: nutrition/templates/ingredient/view.html:228
+#: manager/templates/schedule/view.html:285
+#: manager/templates/workout/view.html:163
+#: nutrition/templates/ingredient/view.html:202
msgid "Options"
msgstr "选项"
@@ -621,12 +627,11 @@ msgstr "许可协议列表"
#: gym/templates/gym/member_list.html:299
#: mailer/templates/mailer/gym/overview.html:30
#: manager/templates/calendar/day.html:87
-#: nutrition/templates/ingredient/pending.html:30
#: nutrition/templates/units/list.html:29
msgid "Nothing found"
msgstr "没有找到任何内容"
-#: core/templates/misc/about.html:4 core/templates/template.html:173
+#: core/templates/misc/about.html:4 core/templates/template.html:175
msgid "Imprint"
msgstr "版本说明"
@@ -639,174 +644,169 @@ msgstr ""
"如果一个许可证已经本地化,例如,不同国家的 \"知识共享 \"\n"
"许可证,请将它们作为单独的条目添加到这里。"
-#: core/templates/navigation.html:27 software/templates/features.html:437
+#: core/templates/navigation.html:28 software/templates/features.html:437
msgid "Training"
msgstr "训练"
-#: core/templates/navigation.html:34 core/templates/user/overview.html:25
+#: core/templates/navigation.html:37 core/templates/user/overview.html:25
msgid "Workouts"
msgstr "健身"
-#: core/templates/navigation.html:42
+#: core/templates/navigation.html:46
msgid "Workouts schedules"
msgstr "健身日程"
-#: core/templates/navigation.html:50 core/templates/user/overview.html:70
+#: core/templates/navigation.html:54 core/templates/user/overview.html:70
#: manager/templates/calendar/month.html:10
#: manager/templates/calendar/month.html:21
msgid "Calendar"
msgstr "日历"
-#: core/templates/navigation.html:60
+#: core/templates/navigation.html:64
msgid "Measurements"
msgstr "测量"
-#: core/templates/navigation.html:70 gallery/templates/images/overview.html:6
+#: core/templates/navigation.html:75 gallery/templates/images/overview.html:6
msgid "Gallery"
msgstr "画廊"
-#: core/templates/navigation.html:76
+#: core/templates/navigation.html:81
msgid "Workout templates"
msgstr "健身模板"
-#: core/templates/navigation.html:82 manager/views/workout.py:84
+#: core/templates/navigation.html:88 manager/views/workout.py:84
msgid "Your templates"
msgstr "你的模板"
-#: core/templates/navigation.html:90 manager/views/workout.py:98
+#: core/templates/navigation.html:97 manager/views/workout.py:98
msgid "Public templates"
msgstr "公共模板"
-#: core/templates/navigation.html:97 manager/forms.py:129
-#: manager/models/setting.py:54 software/templates/features.html:51
+#: core/templates/navigation.html:105 manager/forms.py:129
+#: manager/models/setting.py:57 software/templates/features.html:51
#: software/templates/features.html:459
msgid "Exercises"
msgstr "练习"
-#: core/templates/navigation.html:103 core/templates/navigation.html:170
-#: core/templates/navigation.html:330
+#: core/templates/navigation.html:111 core/templates/navigation.html:184
+#: core/templates/navigation.html:340
msgid "Administration"
msgstr "管理"
-#: core/templates/navigation.html:106
+#: core/templates/navigation.html:115
msgid "Exercise edit history"
msgstr "训练变更记录"
-#: core/templates/navigation.html:111 exercises/models/base.py:103
+#: core/templates/navigation.html:121 exercises/models/base.py:103
msgid "Equipment"
msgstr "器材"
-#: core/templates/navigation.html:116
+#: core/templates/navigation.html:127
msgid "Muscles"
msgstr "肌肉"
-#: core/templates/navigation.html:121
+#: core/templates/navigation.html:133
#: exercises/templates/categories/admin-overview.html:4
msgid "Categories"
msgstr "类别"
-#: core/templates/navigation.html:136 software/templates/features.html:447
+#: core/templates/navigation.html:148 software/templates/features.html:447
msgid "Nutrition"
msgstr "营养"
-#: core/templates/navigation.html:143 core/templates/user/overview.html:144
+#: core/templates/navigation.html:156 core/templates/user/overview.html:144
msgid "Nutrition plans"
msgstr "营养计划"
-#: core/templates/navigation.html:151 nutrition/templates/bmi/form.html:50
+#: core/templates/navigation.html:165 nutrition/templates/bmi/form.html:50
msgid "BMI calculator"
msgstr "体重指数计算器"
-#: core/templates/navigation.html:159 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:174 nutrition/templates/rate/form.html:17
msgid "Daily calories calculator"
msgstr "每日卡路里计算器"
-#: core/templates/navigation.html:165
+#: core/templates/navigation.html:179
#: nutrition/templates/ingredient/overview.html:10
msgid "Ingredient overview"
msgstr "食谱总览"
-#: core/templates/navigation.html:172 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:187 nutrition/templates/units/list.html:6
msgid "Ingredient weight units"
msgstr "食谱计量单位"
-#: core/templates/navigation.html:177
-#: nutrition/templates/ingredient/pending.html:6
-msgid "Ingredients pending review"
-msgstr "食谱审核"
-
-#: core/templates/navigation.html:193 software/templates/features.html:442
+#: core/templates/navigation.html:203 software/templates/features.html:442
msgid "Body weight"
msgstr "体重"
-#: core/templates/navigation.html:200 core/templates/user/overview.html:114
+#: core/templates/navigation.html:210 core/templates/user/overview.html:114
msgid "Weight overview"
msgstr "体重总览"
-#: core/templates/navigation.html:207 weight/views.py:65
+#: core/templates/navigation.html:217 weight/views.py:65
msgid "Add weight entry"
msgstr "新增体重记录"
-#: core/templates/navigation.html:221
+#: core/templates/navigation.html:231
msgid "About this software"
msgstr "关于软件"
-#: core/templates/navigation.html:227 software/templates/about_us.html:5
+#: core/templates/navigation.html:237 software/templates/about_us.html:5
msgid "About us"
msgstr "关于我们"
-#: core/templates/navigation.html:233 software/templates/features.html:507
+#: core/templates/navigation.html:243 software/templates/features.html:507
msgid "REST API"
msgstr "REST API"
-#: core/templates/navigation.html:239 utils/models.py:45
+#: core/templates/navigation.html:249 utils/models.py:45
msgid "License"
msgstr "许可协议"
-#: core/templates/navigation.html:245
+#: core/templates/navigation.html:255
msgid "Developer documentation"
msgstr "开发者文档"
-#: core/templates/navigation.html:252
+#: core/templates/navigation.html:262
msgid "Get the code"
msgstr "获取源码"
-#: core/templates/navigation.html:259 core/templates/template.html:212
+#: core/templates/navigation.html:269 core/templates/template.html:214
#: software/templates/features.html:582
msgid "Translate"
msgstr "翻译"
-#: core/templates/navigation.html:293 core/templates/user/login.html:28
+#: core/templates/navigation.html:303 core/templates/user/login.html:28
msgid "Reset password"
msgstr "重设密码"
-#: core/templates/navigation.html:311
+#: core/templates/navigation.html:321
msgid "My preferences"
msgstr "我的首选项"
-#: core/templates/navigation.html:320
+#: core/templates/navigation.html:330
msgid "Logout"
msgstr "退出"
-#: core/templates/navigation.html:343
+#: core/templates/navigation.html:353
msgid "Licenses"
msgstr "许可协议"
-#: core/templates/navigation.html:351
+#: core/templates/navigation.html:361
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr "重复单元"
-#: core/templates/navigation.html:359 core/templates/weight_unit/list.html:4
-#: nutrition/templates/ingredient/view.html:167
+#: core/templates/navigation.html:369 core/templates/weight_unit/list.html:4
+#: nutrition/templates/ingredient/view.html:141
msgid "Weight units"
msgstr "重量单位"
-#: core/templates/navigation.html:367 core/templates/user/list.html:4
+#: core/templates/navigation.html:377 core/templates/user/list.html:4
msgid "User list"
msgstr "用户列表"
-#: core/templates/navigation.html:373
+#: core/templates/navigation.html:383
msgid "Gyms"
msgstr "健身房"
@@ -858,12 +858,12 @@ msgstr "感谢使用我们的网站!"
msgid "The %(site_name)s team"
msgstr "%(site_name)s 团队"
-#: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:11
+#: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:12
msgid "previous"
msgstr "前一页"
-#: core/templates/tags/pagination.html:31
-#: core/templates/tags/pagination.html:35
+#: core/templates/tags/pagination.html:33
+#: core/templates/tags/pagination.html:38
msgid "next"
msgstr "后一页"
@@ -888,34 +888,34 @@ msgid "Add exercises to this workout day"
msgstr "新增健身项目到这个健身日"
#: core/templates/tags/render_weight_log.html:17 manager/helpers.py:86
-#: manager/models/setting.py:69 manager/templates/set/formset.html:9
+#: manager/models/setting.py:72 manager/templates/set/formset.html:9
msgid "Reps"
msgstr "重复次数"
#: core/templates/tags/render_weight_log.html:30 manager/forms.py:191
-#: manager/models/log.py:103 manager/models/setting.py:99
+#: manager/models/log.py:103 manager/models/setting.py:102
#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
msgid "RiR"
msgstr "力竭之前的剩余次数"
-#: core/templates/template.html:120 manager/templates/calendar/month.html:138
-#: manager/templates/schedule/view.html:249
-#: manager/templates/schedule/view.html:270
-#: manager/templates/workout/view.html:86
-#: manager/templates/workout/view.html:139
+#: core/templates/template.html:122 manager/templates/calendar/month.html:138
+#: manager/templates/schedule/view.html:248
+#: manager/templates/schedule/view.html:269
+#: manager/templates/workout/view.html:84
+#: manager/templates/workout/view.html:137
msgid "Close"
msgstr "关闭"
-#: core/templates/template.html:136
+#: core/templates/template.html:138
msgid ""
"You are using a guest account, data entered will be deleted after a week."
msgstr "你正在以访客模式浏览,输入的数据会在一周后删除."
-#: core/templates/template.html:141
+#: core/templates/template.html:143
msgid "Create some demo entries"
msgstr "创建一些示例项"
-#: core/templates/template.html:178 software/templates/features.html:547
+#: core/templates/template.html:180 software/templates/features.html:547
#: software/templates/tos.html:7
msgid "Terms of service"
msgstr "服务条款"
@@ -1014,7 +1014,7 @@ msgid "Overview"
msgstr "总览"
#: core/templates/user/overview.html:28
-#: manager/templates/schedule/view.html:164
+#: manager/templates/schedule/view.html:163
#: manager/templates/workout/overview.html:39 manager/views/schedule_step.py:60
msgid "Add workout"
msgstr "新增健身"
@@ -1022,20 +1022,20 @@ msgstr "新增健身"
#: core/templates/user/overview.html:34 core/templates/user/overview.html:76
#: core/templates/user/overview.html:120 core/templates/user/overview.html:152
#: exercises/models/base.py:118 exercises/models/base.py:124
-#: exercises/models/exercise.py:63 exercises/models/exercise.py:69
+#: exercises/models/exercise.py:64 exercises/models/exercise.py:70
#: exercises/models/image.py:107 exercises/models/image.py:113
#: exercises/models/video.py:163 exercises/models/video.py:169
#: gallery/models/image.py:42 manager/helpers.py:85 manager/models/log.py:100
#: manager/models/session.py:67 measurements/models/measurement.py:47
-#: nutrition/models/ingredient.py:101 nutrition/models/ingredient.py:107
-#: nutrition/models/ingredient.py:222 weight/models.py:33
+#: nutrition/models/ingredient.py:87 nutrition/models/ingredient.py:93
+#: nutrition/models/ingredient.py:216 weight/models.py:51
#: weight/templates/import_csv_preview.html:13
#: weight/templates/import_csv_preview.html:42 weight/views.py:144
msgid "Date"
msgstr "日期"
#: core/templates/user/overview.html:35 core/templates/user/overview.html:153
-#: exercises/models/exercise.py:51 gallery/models/image.py:65
+#: exercises/models/exercise.py:52 gallery/models/image.py:65
#: gym/models/contract.py:58 gym/models/contract.py:109
#: manager/models/day.py:37 manager/models/workout.py:63
#: measurements/models/measurement.py:62 nutrition/models/plan.py:67
@@ -1053,13 +1053,13 @@ msgstr "最后一次活动"
#: core/templates/user/overview.html:58
#: manager/templates/calendar/month.html:128
-#: manager/templates/schedule/view.html:145
+#: manager/templates/schedule/view.html:144
#: manager/templates/workout/overview.html:28
msgid "No workouts found."
msgstr "没有健身记录。"
#: core/templates/user/overview.html:68 manager/forms.py:280
-#: manager/templates/workout/view.html:108
+#: manager/templates/workout/view.html:106
msgid "Log"
msgstr "日志"
@@ -1083,35 +1083,35 @@ msgstr "时间"
#: core/templates/user/overview.html:112 core/templates/user/overview.html:121
#: manager/forms.py:186 manager/helpers.py:86 manager/models/log.py:86
-#: manager/models/setting.py:79 manager/templates/log/add.html:54
-#: manager/templates/set/formset.html:11 weight/models.py:35
+#: manager/models/setting.py:82 manager/templates/log/add.html:54
+#: manager/templates/set/formset.html:11 weight/models.py:53
#: weight/templates/import_csv_preview.html:14
#: weight/templates/import_csv_preview.html:43 weight/views.py:144
msgid "Weight"
msgstr "体重"
-#: core/templates/user/overview.html:154 nutrition/models/ingredient.py:130
-#: nutrition/templates/ingredient/view.html:77 nutrition/views/plan.py:237
+#: core/templates/user/overview.html:154 nutrition/models/ingredient.py:116
+#: nutrition/templates/ingredient/view.html:51 nutrition/views/plan.py:237
msgid "Energy"
msgstr "能量"
-#: core/templates/user/overview.html:155 nutrition/models/ingredient.py:137
-#: nutrition/templates/ingredient/view.html:84 nutrition/views/plan.py:243
+#: core/templates/user/overview.html:155 nutrition/models/ingredient.py:123
+#: nutrition/templates/ingredient/view.html:58 nutrition/views/plan.py:243
msgid "Protein"
msgstr "蛋白质"
-#: core/templates/user/overview.html:156 nutrition/models/ingredient.py:145
-#: nutrition/templates/ingredient/view.html:90 nutrition/views/plan.py:251
+#: core/templates/user/overview.html:156 nutrition/models/ingredient.py:131
+#: nutrition/templates/ingredient/view.html:64 nutrition/views/plan.py:251
msgid "Carbohydrates"
msgstr "碳水化合物"
-#: core/templates/user/overview.html:157 nutrition/models/ingredient.py:163
-#: nutrition/templates/ingredient/view.html:106 nutrition/views/plan.py:265
+#: core/templates/user/overview.html:157 nutrition/models/ingredient.py:149
+#: nutrition/templates/ingredient/view.html:80 nutrition/views/plan.py:265
msgid "Fat"
msgstr "脂肪"
#: core/templates/user/overview.html:170
-#: nutrition/templates/ingredient/view.html:79
+#: nutrition/templates/ingredient/view.html:53
msgid "kcal"
msgstr "大卡"
@@ -1123,7 +1123,7 @@ msgstr "大卡"
#: gym/templates/gym/member_list.html:207
#: gym/templates/gym/member_list.html:240
#: gym/templates/gym/member_list.html:277
-#: manager/templates/schedule/view.html:101
+#: manager/templates/schedule/view.html:100
msgid "Actions"
msgstr "操作"
@@ -1166,7 +1166,7 @@ msgid "Details"
msgstr "详细"
#: core/templates/user/overview.html:258 gym/views/export.py:57
-#: manager/helpers.py:86 manager/templates/schedule/view.html:99
+#: manager/helpers.py:86 manager/templates/schedule/view.html:98
msgid "Nr."
msgstr "序号"
@@ -1211,7 +1211,7 @@ msgid "Documents"
msgstr "文档"
#: core/templates/user/overview.html:412 gym/templates/document/list.html:32
-#: manager/forms.py:292 manager/templates/workout/view.html:134
+#: manager/forms.py:292 manager/templates/workout/view.html:132
msgid "Download"
msgstr "下载"
@@ -1262,13 +1262,13 @@ msgid "kg"
msgstr "千克"
#: core/templatetags/wger_extras.py:207
-#: nutrition/templates/ingredient/view.html:86
-#: nutrition/templates/ingredient/view.html:92
-#: nutrition/templates/ingredient/view.html:99
-#: nutrition/templates/ingredient/view.html:108
-#: nutrition/templates/ingredient/view.html:115
-#: nutrition/templates/ingredient/view.html:137
-#: nutrition/templates/ingredient/view.html:147
+#: nutrition/templates/ingredient/view.html:60
+#: nutrition/templates/ingredient/view.html:66
+#: nutrition/templates/ingredient/view.html:73
+#: nutrition/templates/ingredient/view.html:82
+#: nutrition/templates/ingredient/view.html:89
+#: nutrition/templates/ingredient/view.html:111
+#: nutrition/templates/ingredient/view.html:121
msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr "克"
@@ -1286,7 +1286,7 @@ msgstr "盎司"
#: exercises/views/equipment.py:103 exercises/views/exercises.py:73
#: exercises/views/muscles.py:99 manager/views/schedule.py:309
#: manager/views/schedule_step.py:128 manager/views/workout.py:249
-#: manager/views/workout_session.py:142 nutrition/views/ingredient.py:116
+#: manager/views/workout_session.py:142 nutrition/views/ingredient.py:119
#: nutrition/views/unit.py:110
msgid "Successfully deleted"
msgstr "删除成功"
@@ -1298,7 +1298,7 @@ msgstr "删除成功"
#: gym/views/admin_notes.py:196 gym/views/document.py:206 gym/views/gym.py:481
#: manager/views/schedule.py:316 manager/views/schedule_step.py:138
#: manager/views/workout.py:253 manager/views/workout_session.py:156
-#: nutrition/views/ingredient.py:123 nutrition/views/unit.py:117
+#: nutrition/views/ingredient.py:126 nutrition/views/unit.py:117
#, python-brace-format
msgid "Delete {0}?"
msgstr "删除 {0}?"
@@ -1311,7 +1311,7 @@ msgstr "删除 {0}?"
#: gym/views/contract.py:186 gym/views/contract_option.py:123
#: gym/views/contract_type.py:123 gym/views/document.py:171
#: gym/views/gym.py:463 manager/views/day.py:100 manager/views/schedule.py:333
-#: manager/views/workout.py:267 nutrition/views/ingredient.py:142
+#: manager/views/workout.py:267 nutrition/views/ingredient.py:145
#: nutrition/views/unit.py:143
#, python-brace-format
msgid "Edit {0}"
@@ -1385,7 +1385,7 @@ msgstr "健身房"
msgid "A verification email was sent to %(email)s"
msgstr "一封验证邮箱已发送至 %(email)s"
-#: exercises/models/base.py:82 nutrition/models/ingredient.py:236
+#: exercises/models/base.py:82 nutrition/models/ingredient.py:230
msgid "Category"
msgstr "类别"
@@ -1405,7 +1405,7 @@ msgstr "变体"
msgid "Exercise Categories"
msgstr "训练类别"
-#: exercises/models/comment.py:52 exercises/models/exercise_alias.py:52
+#: exercises/models/comment.py:52 exercises/models/exercise_alias.py:53
#: exercises/models/image.py:74 exercises/models/video.py:98
#: manager/forms.py:178 manager/helpers.py:86 manager/models/log.py:52
msgid "Exercise"
@@ -1415,12 +1415,12 @@ msgstr "训练"
msgid "A comment about how to correctly do this exercise."
msgstr "关于如何正确做这个健身项目的评论."
-#: exercises/models/exercise.py:76 nutrition/models/ingredient.py:95
+#: exercises/models/exercise.py:77 nutrition/models/ingredient.py:81
#: nutrition/models/weight_unit.py:32
msgid "Language"
msgstr "语言"
-#: exercises/models/exercise_alias.py:58
+#: exercises/models/exercise_alias.py:59
msgid "Alias for an exercise"
msgstr "训练项目别称"
@@ -1556,7 +1556,7 @@ msgstr "操作"
#: manager/models/schedule.py:44 manager/models/session.py:49
#: manager/models/workout.py:89 measurements/models/category.py:31
#: measurements/models/measurement.py:42 nutrition/models/plan.py:54
-#: nutrition/templates/ingredient/pending.html:16 weight/models.py:42
+#: weight/models.py:60
msgid "User"
msgstr "用户"
@@ -1677,9 +1677,9 @@ msgid "Contract type"
msgstr "合同类型"
#: gym/models/contract.py:211 gym/templates/contract/view.html:59
-#: manager/templates/log/add.html:52 nutrition/forms.py:62
-#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:105
-#: nutrition/models/meal_item.py:72
+#: manager/templates/log/add.html:52 nutrition/forms.py:63
+#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:108
+#: nutrition/models/meal_item.py:73
msgid "Amount"
msgstr "数量"
@@ -1696,7 +1696,7 @@ msgid "Contract is active"
msgstr "合同已激活"
#: gym/models/contract.py:237 gym/templates/contract/view.html:69
-#: manager/models/schedule.py:61 manager/templates/schedule/view.html:68
+#: manager/models/schedule.py:61 manager/templates/schedule/view.html:67
msgid "Start date"
msgstr "开始时间"
@@ -2085,7 +2085,7 @@ msgstr "生成预览"
#: mailer/templates/mailer/gym/form.html:28
#: mailer/templates/mailer/gym/preview.html:62
-#: manager/templates/workout/view.html:42
+#: manager/templates/workout/view.html:40
msgid "Steps"
msgstr "步骤"
@@ -2107,7 +2107,7 @@ msgid ""
msgstr "你可以按照你的需要在邮件发送之前随时更新或修正邮件的内容"
#: mailer/templates/mailer/gym/preview.html:22
-#: software/templates/about_us.html:60
+#: software/templates/about_us.html:70
msgid "Current version"
msgstr "当前版本"
@@ -2136,18 +2136,18 @@ msgid ""
"a superset."
msgstr "你可以搜索多个健身项目,它们将会被聚合成一个超集."
-#: manager/forms.py:140 nutrition/forms.py:252
+#: manager/forms.py:140 nutrition/forms.py:253
#, fuzzy
#| msgid "Also use ingredients in English"
msgid "Also search for names in English"
msgstr "使用食谱时用英文显示"
#: manager/forms.py:168 manager/forms.py:173 manager/models/log.py:64
-#: manager/models/log.py:92 manager/models/setting.py:59
-#: manager/models/setting.py:90 manager/templates/log/add.html:53
+#: manager/models/log.py:92 manager/models/setting.py:62
+#: manager/models/setting.py:93 manager/templates/log/add.html:53
#: manager/templates/log/add.html:55 manager/templates/set/formset.html:10
#: manager/templates/set/formset.html:12 measurements/models/category.py:41
-#: nutrition/forms.py:66
+#: nutrition/forms.py:67
msgid "Unit"
msgstr "单元"
@@ -2155,15 +2155,15 @@ msgstr "单元"
msgid "Type"
msgstr "类型"
-#: manager/forms.py:280 manager/templates/workout/view.html:115
+#: manager/forms.py:280 manager/templates/workout/view.html:113
msgid "Table"
msgstr "表格"
-#: manager/forms.py:282 manager/templates/workout/view.html:121
+#: manager/forms.py:282 manager/templates/workout/view.html:119
msgid "with images"
msgstr "带有图片"
-#: manager/forms.py:283 manager/templates/workout/view.html:127
+#: manager/forms.py:283 manager/templates/workout/view.html:125
msgid "with comments"
msgstr "带有评论"
@@ -2172,11 +2172,10 @@ msgid "Workout will expire soon"
msgstr "安排的健身很快就要过期了"
#: manager/models/day.py:34 manager/models/log.py:58
-#: manager/models/session.py:60 manager/templates/schedule/view.html:103
-#: manager/templates/workout/view.html:11
-#: manager/templates/workout/view.html:19 manager/views/pdf.py:85
-#: manager/views/pdf.py:161 manager/views/schedule.py:151
-#: manager/views/schedule.py:221
+#: manager/models/session.py:60 manager/templates/schedule/view.html:102
+#: manager/templates/workout/view.html:9 manager/templates/workout/view.html:17
+#: manager/views/pdf.py:85 manager/views/pdf.py:161
+#: manager/views/schedule.py:151 manager/views/schedule.py:221
msgid "Workout"
msgstr "健身"
@@ -2184,7 +2183,8 @@ msgstr "健身"
msgid ""
"A description of what is done on this day (e.g. \"Pull day\") or what body "
"parts are trained (e.g. \"Arms and abs\")"
-msgstr "对这一天要做什么(例如“拉力日”)或训练身体哪些部位(例如“手臂和腹肌”)的描述"
+msgstr ""
+"对这一天要做什么(例如“拉力日”)或训练身体哪些部位(例如“手臂和腹肌”)的描述"
#: manager/models/day.py:44
msgid "Day"
@@ -2194,7 +2194,7 @@ msgstr "天"
msgid "Name or short description of the schedule. For example 'Program XYZ'."
msgstr "日程的名称或者简短描述,像'某某某训练日程'"
-#: manager/models/schedule.py:65 manager/templates/schedule/view.html:72
+#: manager/models/schedule.py:65 manager/templates/schedule/view.html:71
msgid "Schedule active"
msgstr "日程活跃"
@@ -2207,7 +2207,7 @@ msgstr ""
"勾选方格,如果你想把这个日程设置为活跃日程(会在管理面板等地方显示).然后,其他的"
"日程会被自动标记为非活跃."
-#: manager/models/schedule.py:77 manager/templates/schedule/view.html:82
+#: manager/models/schedule.py:77 manager/templates/schedule/view.html:81
msgid "Is a loop"
msgstr "是一个循环"
@@ -2226,8 +2226,8 @@ msgid "The duration in weeks"
msgstr "每周持续时间"
#: manager/models/schedule_step.py:64 manager/models/set.py:53
-#: manager/models/setting.py:110 nutrition/models/meal.py:55
-#: nutrition/models/meal_item.py:65
+#: manager/models/setting.py:113 nutrition/models/meal.py:55
+#: nutrition/models/meal_item.py:66
msgid "Order"
msgstr "順序"
@@ -2277,7 +2277,7 @@ msgstr "训练日"
msgid "Number of sets"
msgstr "组数"
-#: manager/models/setting.py:48
+#: manager/models/setting.py:51
msgid "Sets"
msgstr "组"
@@ -2350,7 +2350,7 @@ msgstr ""
msgid "Go to current month"
msgstr "回到当前月份"
-#: manager/templates/calendar/month.html:188
+#: manager/templates/calendar/month.html:190
msgid "Add new log"
msgstr "新增日志"
@@ -2390,8 +2390,8 @@ msgid "Your schedules"
msgstr "你的日程安排"
#: manager/templates/schedule/overview.html:19
-#: manager/templates/schedule/view.html:132
-#: manager/templates/schedule/view.html:184
+#: manager/templates/schedule/view.html:131
+#: manager/templates/schedule/view.html:183
#: manager/templates/workout/overview.html:16
msgid "active"
msgstr "活跃"
@@ -2435,29 +2435,29 @@ msgstr ""
msgid "Add schedule"
msgstr "添加行程"
-#: manager/templates/schedule/view.html:10
+#: manager/templates/schedule/view.html:9
msgid "Schedule"
msgstr "行程表"
-#: manager/templates/schedule/view.html:86
+#: manager/templates/schedule/view.html:85
msgid ""
"This schedule is a loop and will go through the workouts above till you "
"deactivate it"
msgstr "此计划是一个循环,将执行上述锻炼,直到你停用它"
-#: manager/templates/schedule/view.html:104
+#: manager/templates/schedule/view.html:103
msgid "Weeks"
msgstr "周数"
-#: manager/templates/schedule/view.html:116
+#: manager/templates/schedule/view.html:115
msgid "Move me"
msgstr "移开我"
-#: manager/templates/schedule/view.html:157
+#: manager/templates/schedule/view.html:156
msgid "Start schedule"
msgstr "开始日程"
-#: manager/templates/schedule/view.html:188
+#: manager/templates/schedule/view.html:187
#, python-format
msgid ""
"%(weeks)s Week\n"
@@ -2467,11 +2467,11 @@ msgid_plural ""
" "
msgstr[0] ""
-#: manager/templates/schedule/view.html:222
+#: manager/templates/schedule/view.html:221
msgid "Adding workouts"
msgstr "新增健身中"
-#: manager/templates/schedule/view.html:224
+#: manager/templates/schedule/view.html:223
msgid ""
"Add as many workouts to the schedule as you want. You can\n"
" edit the order by dragging and dropping them. It's also possible "
@@ -2479,21 +2479,21 @@ msgid ""
" than once."
msgstr ""
-#: manager/templates/schedule/view.html:233
-#: manager/templates/schedule/view.html:244
-#: manager/templates/schedule/view.html:291
-#: manager/templates/workout/view.html:71
-#: manager/templates/workout/view.html:81
-#: manager/templates/workout/view.html:180
+#: manager/templates/schedule/view.html:232
+#: manager/templates/schedule/view.html:243
+#: manager/templates/schedule/view.html:290
+#: manager/templates/workout/view.html:69
+#: manager/templates/workout/view.html:79
+#: manager/templates/workout/view.html:178
msgid "Export calendar file"
msgstr "导出日历文件"
-#: manager/templates/schedule/view.html:237
+#: manager/templates/schedule/view.html:236
msgid "Export this schedule as a calendar file."
msgstr "将此日程表导出为日历文件。"
-#: manager/templates/schedule/view.html:238
-#: manager/templates/workout/view.html:76
+#: manager/templates/schedule/view.html:237
+#: manager/templates/workout/view.html:74
msgid ""
"You can then import the file it into your calendar\n"
" application for example google calendar, outlook or "
@@ -2502,18 +2502,18 @@ msgid ""
"appropriate exercises."
msgstr ""
-#: manager/templates/schedule/view.html:259
-#: manager/templates/schedule/view.html:295
-#: manager/templates/workout/view.html:96
-#: manager/templates/workout/view.html:176
+#: manager/templates/schedule/view.html:258
+#: manager/templates/schedule/view.html:294
+#: manager/templates/workout/view.html:94
+#: manager/templates/workout/view.html:174
msgid "Download as PDF"
msgstr "下载为PDF"
-#: manager/templates/schedule/view.html:300
+#: manager/templates/schedule/view.html:299
msgid "Edit schedule"
msgstr ""
-#: manager/templates/schedule/view.html:305
+#: manager/templates/schedule/view.html:304
msgid "Delete schedule"
msgstr ""
@@ -2631,12 +2631,12 @@ msgid "Mark as workout"
msgstr "标记此健身计划"
#: manager/templates/workout/template_view.html:65
-#: manager/templates/workout/view.html:51
+#: manager/templates/workout/view.html:49
msgid "Muscles trained"
msgstr ""
#: manager/templates/workout/template_view.html:68
-#: manager/templates/workout/view.html:54
+#: manager/templates/workout/view.html:52
msgid ""
"Images show combined muscles as trained by the exercises on the workout."
msgstr "这个图片展示了这个健身中健身项目联合训练到的所有肌肉。"
@@ -2645,35 +2645,35 @@ msgstr "这个图片展示了这个健身中健身项目联合训练到的所有
msgid "Use this template"
msgstr "使用此模板"
-#: manager/templates/workout/view.html:45
+#: manager/templates/workout/view.html:43
msgid "Add training days"
msgstr ""
-#: manager/templates/workout/view.html:46
+#: manager/templates/workout/view.html:44
msgid "Add workout sets to days"
msgstr "新增健身项目组到健身日"
-#: manager/templates/workout/view.html:47
+#: manager/templates/workout/view.html:45
msgid "Set the repetitions for each set"
msgstr ""
-#: manager/templates/workout/view.html:75
+#: manager/templates/workout/view.html:73
msgid "Export this workout as a calendar file."
msgstr ""
-#: manager/templates/workout/view.html:146
+#: manager/templates/workout/view.html:144
msgid "Logs"
msgstr ""
-#: manager/templates/workout/view.html:148
+#: manager/templates/workout/view.html:146
msgid "View logs"
msgstr ""
-#: manager/templates/workout/view.html:171 manager/views/schedule_step.py:99
+#: manager/templates/workout/view.html:169 manager/views/schedule_step.py:99
msgid "Edit workout"
msgstr "编辑健身"
-#: manager/templates/workout/view.html:184 manager/views/workout.py:281
+#: manager/templates/workout/view.html:182 manager/views/workout.py:281
msgid "Mark as template"
msgstr ""
@@ -2720,110 +2720,95 @@ msgstr ""
msgid "Value"
msgstr ""
-#: nutrition/forms.py:117
+#: nutrition/forms.py:118
#, fuzzy
#| msgid "Height (cm)"
msgid "Height (in)"
msgstr "身高(cm)"
-#: nutrition/forms.py:120
+#: nutrition/forms.py:121
#, fuzzy
#| msgid "Weight log"
msgid "Weight (kg)"
msgstr "体重日志"
-#: nutrition/forms.py:120
+#: nutrition/forms.py:121
#, fuzzy
#| msgid "Weight log"
msgid "Weight (lbs)"
msgstr "体重日志"
-#: nutrition/forms.py:133
+#: nutrition/forms.py:134
msgid "Calculate"
msgstr "计算"
-#: nutrition/forms.py:207 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:208 nutrition/templates/rate/form.html:76
msgid "Basic caloric intake"
msgstr ""
-#: nutrition/forms.py:208
+#: nutrition/forms.py:209
msgid "Your basic caloric intake as calculated for your data"
msgstr ""
-#: nutrition/forms.py:213
+#: nutrition/forms.py:214
msgid "Additional calories"
msgstr "额外卡路里"
-#: nutrition/forms.py:215
+#: nutrition/forms.py:216
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
msgstr ""
-#: nutrition/forms.py:248 nutrition/models/ingredient_weight_unit.py:39
-#: nutrition/models/log.py:84 nutrition/models/meal_item.py:53
+#: nutrition/forms.py:249 nutrition/models/ingredient_weight_unit.py:39
+#: nutrition/models/log.py:87 nutrition/models/meal_item.py:54
msgid "Ingredient"
msgstr "食谱"
-#: nutrition/models/ingredient.py:131
+#: nutrition/models/ingredient.py:117
msgid "In kcal per 100g"
msgstr ""
-#: nutrition/models/ingredient.py:138 nutrition/models/ingredient.py:146
-#: nutrition/models/ingredient.py:156 nutrition/models/ingredient.py:164
-#: nutrition/models/ingredient.py:174 nutrition/models/ingredient.py:184
-#: nutrition/models/ingredient.py:194
+#: nutrition/models/ingredient.py:124 nutrition/models/ingredient.py:132
+#: nutrition/models/ingredient.py:142 nutrition/models/ingredient.py:150
+#: nutrition/models/ingredient.py:160 nutrition/models/ingredient.py:170
+#: nutrition/models/ingredient.py:180
msgid "In g per 100g of product"
msgstr ""
-#: nutrition/models/ingredient.py:155
-#: nutrition/templates/ingredient/view.html:96 nutrition/views/plan.py:259
+#: nutrition/models/ingredient.py:141
+#: nutrition/templates/ingredient/view.html:70 nutrition/views/plan.py:259
msgid "Sugar content in carbohydrates"
msgstr ""
-#: nutrition/models/ingredient.py:173
-#: nutrition/templates/ingredient/view.html:112 nutrition/views/plan.py:273
+#: nutrition/models/ingredient.py:159
+#: nutrition/templates/ingredient/view.html:86 nutrition/views/plan.py:273
msgid "Saturated fat content in fats"
msgstr ""
-#: nutrition/models/ingredient.py:183
-#: nutrition/templates/ingredient/view.html:134 nutrition/views/plan.py:279
-msgid "Fibres"
-msgstr "纤维"
+#: nutrition/models/ingredient.py:169
+#: nutrition/templates/ingredient/view.html:108 nutrition/views/plan.py:279
+msgid "Fiber"
+msgstr ""
-#: nutrition/models/ingredient.py:193
-#: nutrition/templates/ingredient/view.html:144 nutrition/views/plan.py:285
+#: nutrition/models/ingredient.py:179
+#: nutrition/templates/ingredient/view.html:118 nutrition/views/plan.py:285
msgid "Sodium"
msgstr "钠"
-#: nutrition/models/ingredient.py:215
+#: nutrition/models/ingredient.py:209
msgid "Link to product"
msgstr ""
-#: nutrition/models/ingredient.py:244
+#: nutrition/models/ingredient.py:238
msgid "Brand name of product"
msgstr ""
-#: nutrition/models/ingredient.py:304
+#: nutrition/models/ingredient.py:305
#, python-brace-format
msgid "The total energy ({self.energy}kcal) is not the approximate sum of the "
msgstr ""
-#: nutrition/models/ingredient.py:383 nutrition/views/ingredient.py:196
-msgid "Ingredient was successfully added to the general database"
-msgstr ""
-
-#: nutrition/models/ingredient.py:408
-msgid "New user submitted ingredient"
-msgstr ""
-
-#: nutrition/models/ingredient.py:410
-#, fuzzy, python-brace-format
-#| msgid "The user {0} submitted a new exercise \"{1}\"."
-msgid ""
-"The user {request.user.username} submitted a new ingredient \"{self.name}\"."
-msgstr "用户{0}提交了一次新训练“{1}”."
-
#: nutrition/models/ingredient_category.py:31
msgid "Ingredient Categories"
msgstr ""
@@ -2836,16 +2821,16 @@ msgstr ""
msgid "Unit amount, e.g. \"1 Cup\" or \"1/2 spoon\""
msgstr ""
-#: nutrition/models/log.py:49 nutrition/models/meal.py:50
-#: nutrition/models/meal_item.py:47 nutrition/models/plan.py:106
+#: nutrition/models/log.py:52 nutrition/models/meal.py:50
+#: nutrition/models/meal_item.py:48 nutrition/models/plan.py:108
msgid "Nutrition plan"
msgstr "营养计划"
-#: nutrition/models/log.py:58
+#: nutrition/models/log.py:61
msgid "Meal"
msgstr ""
-#: nutrition/models/log.py:68
+#: nutrition/models/log.py:71
msgid "Date and Time (Approx.)"
msgstr ""
@@ -2865,11 +2850,11 @@ msgid ""
"summer\""
msgstr ""
-#: nutrition/models/plan.py:88
+#: nutrition/models/plan.py:90
msgid "Use daily calories"
msgstr ""
-#: nutrition/models/plan.py:91
+#: nutrition/models/plan.py:93
msgid ""
"Tick the box if you want to mark this plan as having a goal amount of "
"calories. You can use the calculator or enter the value yourself."
@@ -2979,67 +2964,36 @@ msgstr "搜索"
msgid "Add ingredient"
msgstr "新增食谱"
-#: nutrition/templates/ingredient/pending.html:14
-msgid "Submission date"
-msgstr "提交日期"
-
-#: nutrition/templates/ingredient/view.html:27
-msgid "Ingredient is pending review"
-msgstr "该食谱待审核"
-
-#: nutrition/templates/ingredient/view.html:28
-msgid ""
-"This user submitted ingredient is pending a decision to be\n"
-"included in the database. Till then, it will not be shown in the overview "
-"or\n"
-"the search."
-msgstr ""
-"用户提交一个新的食谱之后,会在这里进行审核,\n"
-"最终来决定是否将申请的食谱添加到数据库中.审核之前,该食谱不会在食谱总览或者\n"
-"食谱搜索中出现."
-
-#: nutrition/templates/ingredient/view.html:31
-msgid "Please select one of the options below."
-msgstr "请选择通过或者拒绝."
-
-#: nutrition/templates/ingredient/view.html:38
-msgid "Accept"
-msgstr "接受"
-
-#: nutrition/templates/ingredient/view.html:42
-msgid "Decline"
-msgstr "拒绝"
-
-#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:229
+#: nutrition/templates/ingredient/view.html:45 nutrition/views/plan.py:229
msgid "Macronutrients"
msgstr "常量营养物"
-#: nutrition/templates/ingredient/view.html:80
+#: nutrition/templates/ingredient/view.html:54
msgid "kJ"
msgstr ""
-#: nutrition/templates/ingredient/view.html:101
-#: nutrition/templates/ingredient/view.html:117
-#: nutrition/templates/ingredient/view.html:139
-#: nutrition/templates/ingredient/view.html:149
+#: nutrition/templates/ingredient/view.html:75
+#: nutrition/templates/ingredient/view.html:91
+#: nutrition/templates/ingredient/view.html:113
+#: nutrition/templates/ingredient/view.html:123
msgid "n.A."
msgstr ""
-#: nutrition/templates/ingredient/view.html:128
+#: nutrition/templates/ingredient/view.html:102
msgid "Others"
msgstr "其它"
-#: nutrition/templates/ingredient/view.html:170
+#: nutrition/templates/ingredient/view.html:144
#: nutrition/templates/units/list.html:46 nutrition/views/unit.py:86
msgid "Add new weight unit"
msgstr "新增计量单位"
-#: nutrition/templates/ingredient/view.html:232
-#: nutrition/templates/ingredient/view.html:235
+#: nutrition/templates/ingredient/view.html:206
+#: nutrition/templates/ingredient/view.html:209
msgid "Edit ingredient"
msgstr "编辑食谱"
-#: nutrition/templates/ingredient/view.html:239
+#: nutrition/templates/ingredient/view.html:213
msgid "Delete ingredient"
msgstr "删除食谱"
@@ -3128,14 +3082,10 @@ msgstr ""
msgid "56 to 90"
msgstr ""
-#: nutrition/views/ingredient.py:154
+#: nutrition/views/ingredient.py:157
msgid "Add a new ingredient"
msgstr "新增一个食谱"
-#: nutrition/views/ingredient.py:209
-msgid "Ingredient was successfully marked as rejected"
-msgstr ""
-
#: nutrition/views/plan.py:120
msgid "Nutritional plan"
msgstr ""
@@ -3180,48 +3130,56 @@ msgid ""
msgstr ""
#: software/templates/about_us.html:18
-msgid "Source code"
-msgstr ""
-
-#: software/templates/about_us.html:20
-msgid "Get the source code of this application and its server on github"
-msgstr ""
-
-#: software/templates/about_us.html:25
msgid "Have a problem or idea?"
msgstr ""
-#: software/templates/about_us.html:27
+#: software/templates/about_us.html:20
msgid ""
"Get in touch if something didn't behave as expected or if there is a feature "
"that you feel is missing."
msgstr ""
-#: software/templates/about_us.html:32
+#: software/templates/about_us.html:26
msgid "Say hi!"
msgstr ""
-#: software/templates/about_us.html:34
+#: software/templates/about_us.html:28
msgid "If you want to chat with us, hop on the Discord server and get in touch"
msgstr ""
-#: software/templates/about_us.html:39 software/templates/features.html:503
+#: software/templates/about_us.html:33
+msgid "Mastodon"
+msgstr ""
+
+#: software/templates/about_us.html:35
+msgid "Follow us on mastodon for updates and news about the project"
+msgstr ""
+
+#: software/templates/about_us.html:40 software/templates/features.html:503
#, fuzzy
#| msgid "Translate"
msgid "Translation"
msgstr "翻译"
-#: software/templates/about_us.html:41
+#: software/templates/about_us.html:42
msgid ""
"This application is translated on weblate. If you also want to help, click "
"the link and start translating"
msgstr ""
-#: software/templates/about_us.html:50
+#: software/templates/about_us.html:47
+msgid "Source code"
+msgstr ""
+
+#: software/templates/about_us.html:49
+msgid "Get the source code of this application and its server on github"
+msgstr ""
+
+#: software/templates/about_us.html:59
msgid "Our goal"
msgstr "目标"
-#: software/templates/about_us.html:53
+#: software/templates/about_us.html:62
#, fuzzy
#| msgid ""
#| "The goal is to build an awesome\n"
@@ -3231,7 +3189,8 @@ msgstr "目标"
msgid ""
"The goal is to build an awesome\n"
" and flexible fitness manager, along with a comprehensive and "
-"complete list of exercises and\n"
+"complete list of\n"
+" exercises and\n"
" ingredients, all released under a free license."
msgstr ""
"目标是为了在免费许可协议下,建立一个灵活有效的健康管理软件.\n"
@@ -3249,10 +3208,6 @@ msgstr ""
"wger 健身经理是一个免费的,开源的网络应用,它可以帮助管理和计划你练习和健身的过"
"程."
-#: software/templates/features.html:45
-msgid "About"
-msgstr "关于"
-
#: software/templates/features.html:57
msgid "Mobile app"
msgstr ""
@@ -3508,21 +3463,10 @@ msgid ""
"Note that a derivative work is one which is not only based on a previous "
"work, but which also contains sufficient new, creative content to entitle it "
"to its own copyright."
-msgstr "请注意,衍生作品不仅基于以前的作品,而且还包含足够的新创意内容以使其拥有自己"
+msgstr ""
+"请注意,衍生作品不仅基于以前的作品,而且还包含足够的新创意内容以使其拥有自己"
"的版权。"
-#: utils/models.py:130
-msgid "Pending"
-msgstr "审核中"
-
-#: utils/models.py:131
-msgid "Accepted"
-msgstr "已接受"
-
-#: utils/models.py:132
-msgid "Declined"
-msgstr "已拒绝"
-
#: weight/forms.py:54
msgid "Input"
msgstr "输入"
@@ -3535,7 +3479,7 @@ msgstr "日期格式"
msgid "You have to enter your weight"
msgstr "您必须输入您的体重"
-#: weight/models.py:60
+#: weight/models.py:78
msgid "Weight entry"
msgstr "体重输入"
@@ -3670,6 +3614,57 @@ msgstr "已成功删除。"
msgid "Delete weight entry for the %s"
msgstr "删除 %s 的体重条目"
+#~ msgid "Ingredients pending review"
+#~ msgstr "食谱审核"
+
+#~ msgid "Fibres"
+#~ msgstr "纤维"
+
+#, fuzzy, python-brace-format
+#~| msgid "The user {0} submitted a new exercise \"{1}\"."
+#~ msgid ""
+#~ "The user {request.user.username} submitted a new ingredient \"{self."
+#~ "name}\"."
+#~ msgstr "用户{0}提交了一次新训练“{1}”."
+
+#~ msgid "Submission date"
+#~ msgstr "提交日期"
+
+#~ msgid "Ingredient is pending review"
+#~ msgstr "该食谱待审核"
+
+#~ msgid ""
+#~ "This user submitted ingredient is pending a decision to be\n"
+#~ "included in the database. Till then, it will not be shown in the overview "
+#~ "or\n"
+#~ "the search."
+#~ msgstr ""
+#~ "用户提交一个新的食谱之后,会在这里进行审核,\n"
+#~ "最终来决定是否将申请的食谱添加到数据库中.审核之前,该食谱不会在食谱总览或"
+#~ "者\n"
+#~ "食谱搜索中出现."
+
+#~ msgid "Please select one of the options below."
+#~ msgstr "请选择通过或者拒绝."
+
+#~ msgid "Accept"
+#~ msgstr "接受"
+
+#~ msgid "Decline"
+#~ msgstr "拒绝"
+
+#~ msgid "About"
+#~ msgstr "关于"
+
+#~ msgid "Pending"
+#~ msgstr "审核中"
+
+#~ msgid "Accepted"
+#~ msgstr "已接受"
+
+#~ msgid "Declined"
+#~ msgstr "已拒绝"
+
#~ msgid "Share"
#~ msgstr "分享"
diff --git a/wger/software/templates/about_us.html b/wger/software/templates/about_us.html
index 727c8f5c8..df1de8167 100644
--- a/wger/software/templates/about_us.html
+++ b/wger/software/templates/about_us.html
@@ -13,33 +13,42 @@
</p>
- <h5>
- <span class="{% fa_class 'code' %}"></span>
- {% translate 'Source code' %}
- </h5>
- <p>{% translate 'Get the source code of this application and its server on github' %}</p>
- <a class="btn btn-outline-primary mb-5" href="https://github.com/wger-project">https://github.com/wger-project</a>
-
<h5>
<span class="{% fa_class 'bug' %}"></span>
{% translate 'Have a problem or idea?' %}
</h5>
<p>{% translate "Get in touch if something didn't behave as expected or if there is a feature that you feel is missing." %}</p>
- <a class="btn btn-outline-primary mb-5" href="https://github.com/wger-project/wger/issues/new/choose">https://github.com/wger-project/wger/issues/new/choose</a>
+ <a class="btn btn-outline-primary mb-5"
+ href="https://github.com/wger-project/wger/issues/new/choose">https://github.com/wger-project/wger/issues/new/choose</a>
<h5>
- <span class="{% fa_class 'comments' %}"></span>
+ <span class="fa-brands fa-discord"></span>
{% translate 'Say hi!' %}
</h5>
<p>{% translate 'If you want to chat with us, hop on the Discord server and get in touch' %}</p>
<a class="btn btn-outline-primary mb-5" href="https://discord.gg/rPWFv6W">https://discord.gg/rPWFv6W</a>
+ <h5>
+ <span class="fa-brands fa-mastodon"></span>
+ {% translate 'Mastodon' %}
+ </h5>
+ <p>{% translate 'Follow us on mastodon for updates and news about the project' %}</p>
+ <a class="btn btn-outline-primary mb-5" href="https://fosstodon.org/@wger">https://fosstodon.org/@wger</a>
+
<h5>
<span class="{% fa_class 'language' %}"></span>
{% translate 'Translation' %}
</h5>
<p>{% translate 'This application is translated on weblate. If you also want to help, click the link and start translating' %}</p>
<a class="btn btn-outline-primary mb-5" href="https://hosted.weblate.org/engage/wger/">https://hosted.weblate.org/engage/wger/</a>
+
+ <h5>
+ <span class="{% fa_class 'code' %}"></span>
+ {% translate 'Source code' %}
+ </h5>
+ <p>{% translate 'Get the source code of this application and its server on github' %}</p>
+ <a class="btn btn-outline-primary mb-5" href="https://github.com/wger-project">https://github.com/wger-project</a>
+
{% endblock %}
@@ -51,7 +60,8 @@
</div>
<div class="card-body">
{% blocktranslate %}The goal is to build an awesome
- and flexible fitness manager, along with a comprehensive and complete list of exercises and
+ and flexible fitness manager, along with a comprehensive and complete list of
+ exercises and
ingredients, all released under a free license.{% endblocktranslate %}
</div>
</div>
diff --git a/wger/software/templates/features.html b/wger/software/templates/features.html
index 6e60f2908..28c30bd8c 100644
--- a/wger/software/templates/features.html
+++ b/wger/software/templates/features.html
@@ -42,7 +42,7 @@
<ul class="navbar-nav me-auto mb-2 mb-lg-0">
<li class="nav-item mx-2 my-1">
<a class="nav-link fw-semibold" aria-current="page"
- href="{% url 'software:about-us' %}">{% translate "About" %}
+ href="{% url 'software:about-us' %}">{% translate "Contact" %}
</a>
</li>
<li class="nav-item mx-2 my-1">