Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Update translation files

Roland Geider0e0b5da887f0
diff --git a/wger/locale/ar_SA/LC_MESSAGES/django.po b/wger/locale/ar_SA/LC_MESSAGES/django.po
index 67a64f61c..97b768674 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: 2021-08-17 17:23+0200\n"
+"POT-Creation-Date: 2022-02-15 14:51+0100\n"
"PO-Revision-Date: 2021-09-13 21:39+0000\n"
"Last-Translator: My Google <[email protected]>\n"
"Language-Team: Arabic (Saudi Arabia) <https://hosted.weblate.org/projects/"
@@ -52,16 +52,16 @@ msgstr "اللغات"
msgid "Nothing found."
msgstr "لم يتم العثور على شيء."
-#: config/templates/language/overview.html:16 core/templates/index.html:147
-#: core/templates/index.html:199 manager/templates/calendar/month.html:132
+#: config/templates/language/overview.html:16 core/templates/index.html:137
+#: core/templates/index.html:189 manager/templates/calendar/month.html:132
#: manager/templates/schedule/overview.html:28
#: manager/templates/schedule/view.html:146
#: manager/templates/workout/overview.html:28
#: nutrition/templates/ingredient/overview.html:45
#: nutrition/templates/plan/overview.html:23
-#: nutrition/templates/plan/view.html:148
-#: nutrition/templates/plan/view.html:151
-#: nutrition/templates/plan/view.html:189
+#: nutrition/templates/plan/view.html:150
+#: nutrition/templates/plan/view.html:153
+#: nutrition/templates/plan/view.html:191
#, fuzzy
msgid "Add one now."
msgstr "أضف واحدة الآن."
@@ -83,7 +83,7 @@ msgstr "أضف واحدة الآن."
#: gym/templates/gym/member_list.html:244
#: gym/templates/gym/member_list.html:281
#: mailer/templates/mailer/gym/overview.html:43
-#: weight/templates/overview.html:78
+#: weight/templates/overview.html:61
msgid "Add"
msgstr "اضف"
@@ -124,14 +124,14 @@ msgstr "العرض"
#: config/templates/language/view.html:91 core/templates/user/api_key.html:44
#: core/templates/user/preferences.html:28
-#: exercises/templates/exercise/view.html:273
-#: exercises/templates/exercise/view.html:296 gym/models/contract.py:200
+#: exercises/templates/exercise/view.html:323
+#: exercises/templates/exercise/view.html:346 gym/models/contract.py:200
#: gym/templates/contract/view.html:41 gym/templates/contract/view.html:106
#: gym/templates/gym/member_list.html:248
#: manager/templates/schedule/view.html:281
#: manager/templates/workout/view.html:206
#: nutrition/templates/ingredient/view.html:226
-#: nutrition/templates/plan/view.html:409 weight/templates/overview.html:62
+#: nutrition/templates/plan/view.html:411 weight/templates/overview.html:45
msgid "Options"
msgstr "الخيارات"
@@ -145,12 +145,12 @@ msgstr "الخيارات"
#: core/templates/weight_unit/list.html:17
#: exercises/templates/categories/admin-overview.html:16
#: exercises/templates/equipment/admin-overview.html:16
-#: exercises/templates/exercise/view.html:180
-#: exercises/templates/exercise/view.html:301
+#: exercises/templates/exercise/view.html:230
+#: exercises/templates/exercise/view.html:351
#: exercises/templates/muscles/admin-overview.html:16
-#: exercises/views/comments.py:63 gallery/views/images.py:96
-#: gym/templates/admin_notes/list.html:32 gym/templates/contract/list.html:31
-#: gym/templates/contract/view.html:107
+#: exercises/views/comments.py:63 exercises/views/videos.py:69
+#: gallery/views/images.py:96 gym/templates/admin_notes/list.html:32
+#: gym/templates/contract/list.html:31 gym/templates/contract/view.html:107
#: gym/templates/contract_option/list.html:31
#: gym/templates/contract_type/list.html:31 gym/templates/document/list.html:38
#: gym/templates/gym/list.html:19 gym/templates/gym/list.html:43
@@ -161,7 +161,7 @@ msgstr "الخيارات"
#: manager/templates/calendar/partial_overview_table.html:18
#: manager/templates/schedule/view.html:121
#: nutrition/templates/ingredient/view.html:198
-#: nutrition/templates/plan/view.html:89 nutrition/templates/plan/view.html:124
+#: nutrition/templates/plan/view.html:89 nutrition/templates/plan/view.html:126
#: nutrition/templates/units/list.html:18
msgid "Edit"
msgstr "تعديل"
@@ -175,9 +175,9 @@ msgstr "تعديل"
#: exercises/templates/categories/admin-overview.html:17
#: exercises/templates/equipment/admin-overview.html:17
#: exercises/templates/exercise/view.html:68
-#: exercises/templates/exercise/view.html:155
-#: exercises/templates/exercise/view.html:185
-#: exercises/templates/exercise/view.html:306
+#: exercises/templates/exercise/view.html:205
+#: exercises/templates/exercise/view.html:235
+#: exercises/templates/exercise/view.html:356
#: exercises/templates/muscles/admin-overview.html:17
#: gym/templates/admin_notes/list.html:40
#: gym/templates/contract_option/list.html:39
@@ -190,7 +190,7 @@ msgstr "تعديل"
#: nutrition/templates/ingredient/view.html:199
#: nutrition/templates/ingredient/view.html:239
#: nutrition/templates/log/detail.html:197
-#: nutrition/templates/plan/view.html:95 nutrition/templates/plan/view.html:130
+#: nutrition/templates/plan/view.html:95 nutrition/templates/plan/view.html:132
#: nutrition/templates/units/list.html:20
msgid "Delete"
msgstr "حذف"
@@ -314,7 +314,7 @@ msgid "Some way of answering you (e-mail, etc.)"
msgstr ""
#: core/forms.py:265 exercises/models/comment.py:40 manager/models/set.py:60
-#: manager/models/setting.py:99 nutrition/models/log.py:61
+#: manager/models/setting.py:99 nutrition/models/log.py:71
msgid "Comment"
msgstr ""
@@ -443,7 +443,7 @@ msgstr ""
msgid "Age"
msgstr ""
-#: core/models/profile.py:202 nutrition/forms.py:98
+#: core/models/profile.py:202 nutrition/forms.py:99
msgid "Height (cm)"
msgstr ""
@@ -494,7 +494,7 @@ msgid "Total caloric intake, including e.g. any surplus"
msgstr ""
#: core/models/profile.py:305 nutrition/models/ingredient_weight_unit.py:45
-#: nutrition/models/log.py:80 nutrition/models/meal_item.py:58
+#: nutrition/models/log.py:90 nutrition/models/meal_item.py:58
msgid "Weight unit"
msgstr ""
@@ -529,9 +529,9 @@ msgstr ""
#: gym/models/user_document.py:87 gym/templates/contract/view.html:50
#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:96
#: gym/views/gym.py:156 manager/models/schedule.py:55
-#: manager/models/workout.py:56 nutrition/models/ingredient.py:96
-#: nutrition/models/ingredient_category.py:26
-#: nutrition/models/weight_unit.py:38
+#: manager/models/workout.py:56 measurements/models/category.py:53
+#: nutrition/models/ingredient.py:96 nutrition/models/ingredient_category.py:26
+#: nutrition/models/meal.py:66 nutrition/models/weight_unit.py:38
#: nutrition/templates/ingredient/pending.html:15
#: nutrition/templates/ingredient/view.html:185
msgid "Name"
@@ -587,17 +587,17 @@ msgstr ""
msgid "Dashboard"
msgstr ""
-#: core/templates/index.html:31 manager/templates/calendar/month.html:115
+#: core/templates/index.html:21 manager/templates/calendar/month.html:115
msgid "Add log to day"
msgstr ""
-#: core/templates/index.html:35 manager/templates/calendar/month.html:120
+#: core/templates/index.html:25 manager/templates/calendar/month.html:120
msgid ""
"Click to add weight logs to a training\n"
"day in your current workout:"
msgstr ""
-#: core/templates/index.html:43 core/templates/index.html:83
+#: core/templates/index.html:33 core/templates/index.html:73
#: core/templates/misc/fragments/shariff_modal.html:29
#: core/templates/template.html:125 manager/templates/calendar/month.html:138
#: manager/templates/schedule/view.html:246
@@ -607,17 +607,17 @@ msgstr ""
msgid "Close"
msgstr ""
-#: core/templates/index.html:54 core/templates/index.html:203
+#: core/templates/index.html:44 core/templates/index.html:193
msgid "Add new diary entry"
msgstr ""
-#: core/templates/index.html:59
+#: core/templates/index.html:49
msgid ""
"Click to add an entry to your nutrition diary for today. You can either log "
"a meal as you defined it, or entry any number of custom entries."
msgstr ""
-#: core/templates/index.html:67 core/templates/index.html:171
+#: core/templates/index.html:57 core/templates/index.html:161
#: core/templates/user/overview.html:171
#: nutrition/templates/ingredient/view.html:79
#: nutrition/templates/log/detail.html:40
@@ -626,19 +626,19 @@ msgstr ""
#: nutrition/templates/log/overview.html:7
#: nutrition/templates/log/overview.html:44
#: nutrition/templates/plan/overview.html:17
-#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:242
-#: nutrition/templates/plan/view.html:301
-#: nutrition/templates/plan/view.html:321
-#: nutrition/templates/plan/view.html:363
-#: nutrition/templates/plan/view.html:373
+#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:244
+#: nutrition/templates/plan/view.html:303
+#: nutrition/templates/plan/view.html:323
+#: nutrition/templates/plan/view.html:365
+#: nutrition/templates/plan/view.html:375
msgid "kcal"
msgstr ""
-#: core/templates/index.html:79 nutrition/templates/plan/view.html:348
+#: core/templates/index.html:69 nutrition/templates/plan/view.html:350
msgid "Add custom diary entry"
msgstr ""
-#: core/templates/index.html:94 core/templates/index.html:102
+#: core/templates/index.html:84 core/templates/index.html:92
#: manager/models/day.py:34 manager/models/log.py:56
#: manager/models/session.py:60 manager/models/workout.py:109
#: manager/templates/schedule/view.html:105
@@ -649,80 +649,80 @@ msgstr ""
msgid "Workout"
msgstr ""
-#: core/templates/index.html:128
+#: core/templates/index.html:118
msgid "This workout is part of a schedule:"
msgstr ""
-#: core/templates/index.html:133
+#: core/templates/index.html:123
msgid ""
"The current workout is selected from your active schedule or, if you don't "
"have one, simply by date."
msgstr ""
-#: core/templates/index.html:142 manager/templates/calendar/month.html:188
+#: core/templates/index.html:132 manager/templates/calendar/month.html:188
msgid "Add new log"
msgstr ""
-#: core/templates/index.html:147 core/templates/user/overview.html:58
+#: core/templates/index.html:137 core/templates/user/overview.html:58
#: manager/templates/calendar/month.html:128
#: manager/templates/schedule/view.html:146
#: manager/templates/workout/overview.html:28
msgid "No workouts found."
msgstr ""
-#: core/templates/index.html:157 nutrition/models/log.py:48
+#: core/templates/index.html:147 nutrition/models/log.py:49
#: nutrition/models/meal.py:49 nutrition/models/meal_item.py:47
#: nutrition/models/plan.py:94 nutrition/templates/plan/view.html:11
#: nutrition/templates/plan/view.html:19
msgid "Nutrition plan"
msgstr ""
-#: core/templates/index.html:169 core/templates/user/overview.html:155
+#: core/templates/index.html:159 core/templates/user/overview.html:155
#: nutrition/models/ingredient.py:100
#: nutrition/templates/ingredient/view.html:77
#: nutrition/templates/log/detail.html:39
#: nutrition/templates/log/detail.html:156
-#: nutrition/templates/plan/view.html:53 nutrition/templates/plan/view.html:241
-#: nutrition/templates/plan/view.html:358
-#: nutrition/templates/plan/view.html:362 nutrition/views/plan.py:384
+#: nutrition/templates/plan/view.html:53 nutrition/templates/plan/view.html:243
+#: nutrition/templates/plan/view.html:360
+#: nutrition/templates/plan/view.html:364 nutrition/views/plan.py:384
msgid "Energy"
msgstr ""
-#: core/templates/index.html:175 core/templates/user/overview.html:156
+#: core/templates/index.html:165 core/templates/user/overview.html:156
#: nutrition/models/ingredient.py:105
#: nutrition/templates/ingredient/view.html:84
#: nutrition/templates/log/detail.html:52
#: nutrition/templates/log/detail.html:174
-#: nutrition/templates/plan/view.html:54 nutrition/templates/plan/view.html:249
+#: nutrition/templates/plan/view.html:54 nutrition/templates/plan/view.html:251
#: nutrition/views/plan.py:390
msgid "Protein"
msgstr ""
-#: core/templates/index.html:181 core/templates/user/overview.html:157
+#: core/templates/index.html:171 core/templates/user/overview.html:157
#: nutrition/models/ingredient.py:113
#: nutrition/templates/ingredient/view.html:90
#: nutrition/templates/log/detail.html:65
#: nutrition/templates/log/detail.html:175
-#: nutrition/templates/plan/view.html:55 nutrition/templates/plan/view.html:255
+#: nutrition/templates/plan/view.html:55 nutrition/templates/plan/view.html:257
#: nutrition/views/plan.py:398
msgid "Carbohydrates"
msgstr ""
-#: core/templates/index.html:187 core/templates/user/overview.html:158
+#: core/templates/index.html:177 core/templates/user/overview.html:158
#: nutrition/models/ingredient.py:131
#: nutrition/templates/ingredient/view.html:106
#: nutrition/templates/log/detail.html:91
#: nutrition/templates/log/detail.html:176
-#: nutrition/templates/plan/view.html:56 nutrition/templates/plan/view.html:268
+#: nutrition/templates/plan/view.html:56 nutrition/templates/plan/view.html:270
#: nutrition/views/plan.py:412
msgid "Fat"
msgstr ""
-#: core/templates/index.html:199 nutrition/templates/plan/overview.html:22
+#: core/templates/index.html:189 nutrition/templates/plan/overview.html:22
msgid "No nutrition plans."
msgstr ""
-#: core/templates/index.html:213 core/templates/user/overview.html:112
+#: core/templates/index.html:203 core/templates/user/overview.html:112
#: core/templates/user/overview.html:121 manager/forms.py:173
#: manager/helpers.py:89 manager/models/log.py:84 manager/models/setting.py:67
#: manager/templates/log/add.html:54 manager/templates/set/formset.html:12
@@ -731,11 +731,7 @@ msgstr ""
msgid "Weight"
msgstr ""
-#: core/templates/index.html:217
-msgid "Your current weight is: "
-msgstr ""
-
-#: core/templates/index.html:248 core/templates/navigation.html:97
+#: core/templates/index.html:210 core/templates/navigation.html:97
#: weight/views.py:70
msgid "Add weight entry"
msgstr ""
@@ -767,7 +763,7 @@ msgstr ""
msgid "Nothing found"
msgstr ""
-#: core/templates/misc/about.html:4 core/templates/template.html:201
+#: core/templates/misc/about.html:4 core/templates/template.html:175
#: core/templates/template_features.html:118
#: core/templates/template_no_context.html:88
msgid "Imprint"
@@ -783,8 +779,8 @@ msgid ""
msgstr ""
#: core/templates/misc/fragments/shariff_modal.html:22
-#: nutrition/templates/plan/view.html:385
-#: nutrition/templates/plan/view.html:394
+#: nutrition/templates/plan/view.html:387
+#: nutrition/templates/plan/view.html:396
msgid "That's done here"
msgstr ""
@@ -870,7 +866,7 @@ msgstr ""
msgid "Equipment"
msgstr ""
-#: core/templates/navigation.html:78 exercises/templates/exercise/view.html:208
+#: core/templates/navigation.html:78 exercises/templates/exercise/view.html:258
msgid "Muscles"
msgstr ""
@@ -943,7 +939,7 @@ msgstr ""
msgid "Get the code"
msgstr ""
-#: core/templates/navigation.html:175 core/templates/template.html:193
+#: core/templates/navigation.html:175 core/templates/template.html:205
#: core/templates/template_features.html:100
msgid "Translate"
msgstr ""
@@ -1092,15 +1088,11 @@ msgstr ""
msgid "Create some demo entries"
msgstr ""
-#: core/templates/template.html:202 core/templates/template_features.html:122
+#: core/templates/template.html:176 core/templates/template_features.html:122
#: core/templates/template_no_context.html:89 software/templates/tos.html:7
msgid "Terms of service"
msgstr ""
-#: core/templates/template.html:209 core/templates/template.html:210
-msgid "Released under the Affero GPL"
-msgstr ""
-
#: core/templates/template_features.html:62 software/templates/features.html:9
#: software/templates/features.html:120
msgid "Features"
@@ -1197,9 +1189,10 @@ msgstr ""
#: core/templates/user/overview.html:120 core/templates/user/overview.html:153
#: exercises/models/exercise.py:77 gallery/models/image.py:47
#: manager/helpers.py:88 manager/models/log.py:98 manager/models/session.py:67
-#: nutrition/models/ingredient.py:85 nutrition/models/ingredient.py:87
-#: nutrition/models/ingredient.py:190 nutrition/templates/log/overview.html:30
-#: nutrition/templates/plan/view.html:307 weight/models.py:32
+#: measurements/models/measurement.py:64 nutrition/models/ingredient.py:85
+#: nutrition/models/ingredient.py:87 nutrition/models/ingredient.py:190
+#: nutrition/templates/log/overview.html:30
+#: nutrition/templates/plan/view.html:309 weight/models.py:32
#: weight/templates/import_csv_preview.html:13
#: weight/templates/import_csv_preview.html:42 weight/views.py:150
msgid "Date"
@@ -1207,10 +1200,10 @@ msgstr ""
#: core/templates/user/overview.html:35 core/templates/user/overview.html:154
#: exercises/models/exercise.py:61 exercises/templates/exercise/view.html:88
-#: exercises/views/exercises.py:189 gallery/models/image.py:70
+#: exercises/views/exercises.py:190 gallery/models/image.py:70
#: gym/models/contract.py:57 gym/models/contract.py:107
#: manager/models/day.py:37 manager/models/workout.py:62
-#: nutrition/models/plan.py:69
+#: measurements/models/measurement.py:79 nutrition/models/plan.py:69
msgid "Description"
msgstr ""
@@ -1371,11 +1364,11 @@ msgstr ""
msgid "Change password"
msgstr ""
-#: core/templatetags/wger_extras.py:217
+#: core/templatetags/wger_extras.py:229
msgid "kg"
msgstr ""
-#: core/templatetags/wger_extras.py:219
+#: core/templatetags/wger_extras.py:231
#: nutrition/templates/ingredient/view.html:86
#: nutrition/templates/ingredient/view.html:92
#: nutrition/templates/ingredient/view.html:99
@@ -1387,28 +1380,28 @@ msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr ""
-#: core/templatetags/wger_extras.py:222
+#: core/templatetags/wger_extras.py:234
msgid "lb"
msgstr ""
-#: core/templatetags/wger_extras.py:224
+#: core/templatetags/wger_extras.py:236
msgctxt "weight unit, i.e. ounces"
msgid "oz"
msgstr ""
#: core/views/languages.py:85 exercises/views/categories.py:121
-#: exercises/views/equipment.py:106 exercises/views/exercises.py:422
+#: exercises/views/equipment.py:106 exercises/views/exercises.py:423
#: exercises/views/images.py:128 exercises/views/muscles.py:118
-#: manager/views/schedule.py:311 manager/views/schedule_step.py:129
-#: manager/views/workout.py:268 manager/views/workout_session.py:141
-#: nutrition/views/ingredient.py:144 nutrition/views/plan.py:120
-#: nutrition/views/unit.py:111
+#: exercises/views/videos.py:129 manager/views/schedule.py:311
+#: manager/views/schedule_step.py:129 manager/views/workout.py:268
+#: manager/views/workout_session.py:141 nutrition/views/ingredient.py:144
+#: nutrition/views/plan.py:120 nutrition/views/unit.py:111
msgid "Successfully deleted"
msgstr ""
#: core/views/languages.py:93 core/views/license.py:103
#: core/views/repetition_units.py:115 core/views/weight_units.py:115
-#: exercises/views/categories.py:127 exercises/views/exercises.py:430
+#: exercises/views/categories.py:127 exercises/views/exercises.py:431
#: exercises/views/muscles.py:125 gallery/views/images.py:121
#: gym/views/admin_notes.py:196 gym/views/document.py:206 gym/views/gym.py:486
#: manager/views/schedule.py:318 manager/views/schedule_step.py:139
@@ -1422,7 +1415,7 @@ msgstr ""
#: core/views/languages.py:111 core/views/license.py:84
#: core/views/repetition_units.py:85 core/views/user.py:456
#: core/views/weight_units.py:85 exercises/views/categories.py:97
-#: exercises/views/equipment.py:83 exercises/views/exercises.py:304
+#: exercises/views/equipment.py:83 exercises/views/exercises.py:305
#: exercises/views/muscles.py:105 gym/views/admin_notes.py:160
#: gym/views/config.py:68 gym/views/contract.py:186
#: gym/views/contract_option.py:123 gym/views/contract_type.py:123
@@ -1509,7 +1502,7 @@ msgstr ""
#: exercises/models/base.py:64 exercises/templates/equipment/overview.html:71
#: exercises/templates/exercise/overview.html:76
-#: exercises/templates/exercise/view.html:218
+#: exercises/templates/exercise/view.html:268
#: exercises/templates/muscles/overview.html:73
msgid "Secondary muscles"
msgstr ""
@@ -1522,8 +1515,9 @@ msgstr ""
msgid "Exercise Categories"
msgstr ""
-#: exercises/models/comment.py:34 exercises/models/image.py:62
-#: manager/forms.py:165 manager/helpers.py:89 manager/models/log.py:51
+#: exercises/models/comment.py:34 exercises/models/image.py:75
+#: exercises/models/video.py:82 manager/forms.py:165 manager/helpers.py:89
+#: manager/models/log.py:51
msgid "Exercise"
msgstr ""
@@ -1536,43 +1530,67 @@ msgstr ""
msgid "Language"
msgstr ""
-#: exercises/models/exercise.py:233 exercises/views/exercises.py:460
+#: exercises/models/exercise.py:237 exercises/views/exercises.py:461
msgid "Exercise was successfully added to the general database"
msgstr ""
-#: exercises/models/exercise.py:261
+#: exercises/models/exercise.py:265
msgid "New user submitted exercise"
msgstr ""
-#: exercises/models/exercise.py:263
+#: exercises/models/exercise.py:267
#, python-brace-format
msgid "The user {0} submitted a new exercise \"{1}\"."
msgstr ""
-#: exercises/models/image.py:68 gallery/models/image.py:56
+#: exercises/models/image.py:59
+msgid "Line"
+msgstr ""
+
+#: exercises/models/image.py:60
+msgid "3D"
+msgstr ""
+
+#: exercises/models/image.py:61
+msgid "Low-poly"
+msgstr ""
+
+#: exercises/models/image.py:62
+msgid "Photo"
+msgstr ""
+
+#: exercises/models/image.py:63
+msgid "Other"
+msgstr ""
+
+#: exercises/models/image.py:81 gallery/models/image.py:56
msgid "Image"
msgstr ""
-#: exercises/models/image.py:69 gallery/models/image.py:57
+#: exercises/models/image.py:82 gallery/models/image.py:57
msgid "Only PNG and JPEG formats are supported"
msgstr ""
-#: exercises/models/image.py:75
+#: exercises/models/image.py:88
msgid "Main picture"
msgstr ""
-#: exercises/models/image.py:78
+#: exercises/models/image.py:91
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 "
"by the system."
msgstr ""
-#: exercises/models/image.py:166
+#: exercises/models/image.py:100
+msgid "The art style of your image"
+msgstr ""
+
+#: exercises/models/image.py:185
msgid "New user submitted image"
msgstr ""
-#: exercises/models/image.py:167
+#: exercises/models/image.py:186
#, python-brace-format
msgid "The user {0} submitted a new image \"{1}\" for exercise {2}."
msgstr ""
@@ -1581,6 +1599,50 @@ msgstr ""
msgid "In latin, e.g. \"Pectoralis major\""
msgstr ""
+#: exercises/models/video.py:41
+msgid "Maximum file size is 100MB."
+msgstr ""
+
+#: exercises/models/video.py:44 exercises/models/video.py:48
+msgid "File type is not supported"
+msgstr ""
+
+#: exercises/models/video.py:57
+msgid "File is not a valid video"
+msgstr ""
+
+#: exercises/models/video.py:88
+msgid "Main video"
+msgstr ""
+
+#: exercises/models/video.py:94
+msgid "Video"
+msgstr ""
+
+#: exercises/models/video.py:101
+msgid "Size"
+msgstr ""
+
+#: exercises/models/video.py:108 manager/models/schedule_step.py:56
+msgid "Duration"
+msgstr ""
+
+#: exercises/models/video.py:117
+msgid "Width"
+msgstr ""
+
+#: exercises/models/video.py:124
+msgid "Height"
+msgstr ""
+
+#: exercises/models/video.py:131
+msgid "Codec"
+msgstr ""
+
+#: exercises/models/video.py:139
+msgid "Codec, long name"
+msgstr ""
+
#: exercises/templates/equipment/admin-overview.html:4
msgid "Equipment list"
msgstr ""
@@ -1596,7 +1658,7 @@ msgstr ""
#: exercises/templates/equipment/overview.html:69
#: exercises/templates/exercise/overview.html:74
-#: exercises/templates/exercise/view.html:214
+#: exercises/templates/exercise/view.html:264
#: exercises/templates/muscles/overview.html:71
msgid "Main muscles"
msgstr ""
@@ -1705,7 +1767,8 @@ msgstr ""
#: gym/templates/gym/new_user.html:22
#: gym/templates/gym/reset_user_password.html:20 manager/models/log.py:45
#: manager/models/schedule.py:44 manager/models/session.py:49
-#: manager/models/workout.py:89 nutrition/models/plan.py:55
+#: manager/models/workout.py:89 measurements/models/category.py:48
+#: measurements/models/measurement.py:59 nutrition/models/plan.py:55
#: nutrition/templates/ingredient/pending.html:16 weight/models.py:41
msgid "User"
msgstr ""
@@ -1730,13 +1793,13 @@ msgid "Please select one of the options below."
msgstr ""
#: exercises/templates/exercise/view.html:60
-#: exercises/templates/exercise/view.html:153
+#: exercises/templates/exercise/view.html:203
#: nutrition/templates/ingredient/view.html:38
msgid "Accept"
msgstr ""
#: exercises/templates/exercise/view.html:64
-#: exercises/templates/exercise/view.html:154
+#: exercises/templates/exercise/view.html:204
#: nutrition/templates/ingredient/view.html:42
msgid "Decline"
msgstr ""
@@ -1749,32 +1812,41 @@ msgstr ""
msgid "Add new image"
msgstr ""
-#: exercises/templates/exercise/view.html:147
+#: exercises/templates/exercise/view.html:148
+msgid "Videos"
+msgstr ""
+
+#: exercises/templates/exercise/view.html:187 exercises/views/videos.py:94
+#, fuzzy
+msgid "Add new video"
+msgstr "أضف واحدة الآن."
+
+#: exercises/templates/exercise/view.html:197
msgid "Images pending review"
msgstr ""
-#: exercises/templates/exercise/view.html:168
+#: exercises/templates/exercise/view.html:218
msgid "Comments for this exercise"
msgstr ""
-#: exercises/templates/exercise/view.html:196
+#: exercises/templates/exercise/view.html:246
msgid "Add new comment"
msgstr ""
-#: exercises/templates/exercise/view.html:210
+#: exercises/templates/exercise/view.html:260
msgid "The diagram shows the most used muscles on this exercise"
msgstr ""
-#: exercises/templates/exercise/view.html:251
+#: exercises/templates/exercise/view.html:301
#: manager/templates/workout/log.html:10 manager/templates/workout/log.html:11
msgid "Weight log"
msgstr ""
-#: exercises/templates/exercise/view.html:256
+#: exercises/templates/exercise/view.html:306
msgid "Exercise Variations"
msgstr ""
-#: exercises/templates/exercise/view.html:277
+#: exercises/templates/exercise/view.html:327
msgid "Submit a correction"
msgstr ""
@@ -1809,30 +1881,30 @@ msgstr ""
msgid "Delete equipment?"
msgstr ""
-#: exercises/views/exercises.py:228
+#: exercises/views/exercises.py:229
#, python-format
msgid ""
"%(name_original)s is too similar to existing exercise \"%(exercise_name)s\""
msgstr ""
-#: exercises/views/exercises.py:246
+#: exercises/views/exercises.py:247
msgid "Add exercise"
msgstr ""
-#: exercises/views/exercises.py:366
+#: exercises/views/exercises.py:367
msgid "Thank you. Once the changes are reviewed the exercise will be updated."
msgstr ""
-#: exercises/views/exercises.py:379
+#: exercises/views/exercises.py:380
#, python-brace-format
msgid "Correct {0}"
msgstr ""
-#: exercises/views/exercises.py:421
+#: exercises/views/exercises.py:422
msgid "This will delete the exercise from all workouts."
msgstr ""
-#: exercises/views/exercises.py:473
+#: exercises/views/exercises.py:474
msgid "Exercise was successfully marked as rejected"
msgstr ""
@@ -1844,6 +1916,11 @@ msgstr ""
msgid "Delete exercise image?"
msgstr ""
+#: exercises/views/videos.py:144 nutrition/views/log.py:230
+#: nutrition/views/unit_ingredient.py:139
+msgid "Delete?"
+msgstr ""
+
#: gallery/templates/images/overview.html:62
msgid "Add image"
msgstr ""
@@ -1910,8 +1987,8 @@ msgid "Contract type"
msgstr ""
#: gym/models/contract.py:208 gym/templates/contract/view.html:59
-#: manager/templates/log/add.html:52 nutrition/forms.py:58
-#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:92
+#: manager/templates/log/add.html:52 nutrition/forms.py:59
+#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:102
#: nutrition/models/meal_item.py:72
msgid "Amount"
msgstr ""
@@ -2344,6 +2421,7 @@ msgid ""
msgstr ""
#: mailer/templates/mailer/gym/preview.html:22
+#: software/templates/about_us.html:59
msgid "Current version"
msgstr ""
@@ -2376,7 +2454,8 @@ msgstr ""
#: manager/models/log.py:90 manager/models/setting.py:47
#: manager/models/setting.py:78 manager/templates/log/add.html:53
#: manager/templates/log/add.html:55 manager/templates/set/formset.html:11
-#: manager/templates/set/formset.html:13 nutrition/forms.py:62
+#: manager/templates/set/formset.html:13 measurements/models/category.py:58
+#: nutrition/forms.py:63
msgid "Unit"
msgstr ""
@@ -2439,10 +2518,6 @@ msgstr ""
msgid "schedule"
msgstr ""
-#: manager/models/schedule_step.py:56
-msgid "Duration"
-msgstr ""
-
#: manager/models/schedule_step.py:57
msgid "The duration in weeks"
msgstr ""
@@ -2701,7 +2776,7 @@ msgstr ""
#: manager/templates/schedule/view.html:290
#: manager/templates/workout/view.html:142
#: manager/templates/workout/view.html:217
-#: nutrition/templates/plan/view.html:415
+#: nutrition/templates/plan/view.html:417
msgid "Download as PDF"
msgstr ""
@@ -2918,30 +2993,34 @@ msgstr ""
msgid "This will delete all weight logs for this day as well."
msgstr ""
-#: nutrition/forms.py:121
+#: measurements/models/measurement.py:69
+msgid "Value"
+msgstr ""
+
+#: nutrition/forms.py:122
msgid "Calculate"
msgstr ""
-#: nutrition/forms.py:194 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:195 nutrition/templates/rate/form.html:76
msgid "Basic caloric intake"
msgstr ""
-#: nutrition/forms.py:195
+#: nutrition/forms.py:196
msgid "Your basic caloric intake as calculated for your data"
msgstr ""
-#: nutrition/forms.py:201
+#: nutrition/forms.py:202
msgid "Additional calories"
msgstr ""
-#: nutrition/forms.py:203
+#: nutrition/forms.py:204
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
msgstr ""
-#: nutrition/forms.py:231 nutrition/models/ingredient_weight_unit.py:39
-#: nutrition/models/log.py:71 nutrition/models/meal_item.py:53
+#: nutrition/forms.py:232 nutrition/models/ingredient_weight_unit.py:39
+#: nutrition/models/log.py:81 nutrition/models/meal_item.py:53
#: nutrition/templates/log/detail.html:155
msgid "Ingredient"
msgstr ""
@@ -2960,14 +3039,14 @@ msgstr ""
#: nutrition/models/ingredient.py:123
#: nutrition/templates/ingredient/view.html:96
#: nutrition/templates/log/detail.html:78
-#: nutrition/templates/plan/view.html:262 nutrition/views/plan.py:406
+#: nutrition/templates/plan/view.html:264 nutrition/views/plan.py:406
msgid "Sugar content in carbohydrates"
msgstr ""
#: nutrition/models/ingredient.py:141
#: nutrition/templates/ingredient/view.html:112
#: nutrition/templates/log/detail.html:104
-#: nutrition/templates/plan/view.html:274 nutrition/views/plan.py:420
+#: nutrition/templates/plan/view.html:276 nutrition/views/plan.py:420
msgid "Saturated fat content in fats"
msgstr ""
@@ -2975,7 +3054,7 @@ msgstr ""
#: nutrition/templates/ingredient/view.html:134
#: nutrition/templates/log/detail.html:122
#: nutrition/templates/log/detail.html:178
-#: nutrition/templates/plan/view.html:285 nutrition/views/plan.py:426
+#: nutrition/templates/plan/view.html:287 nutrition/views/plan.py:426
msgid "Fibres"
msgstr ""
@@ -2983,7 +3062,7 @@ msgstr ""
#: nutrition/templates/ingredient/view.html:144
#: nutrition/templates/log/detail.html:135
#: nutrition/templates/log/detail.html:181
-#: nutrition/templates/plan/view.html:291 nutrition/views/plan.py:432
+#: nutrition/templates/plan/view.html:293 nutrition/views/plan.py:432
msgid "Sodium"
msgstr ""
@@ -3028,10 +3107,20 @@ msgstr ""
msgid "Unit amount, e.g. \"1 Cup\" or \"1/2 spoon\""
msgstr ""
+#: nutrition/models/log.py:55
+msgid "Meal"
+msgstr ""
+
#: nutrition/models/meal.py:61
msgid "Time (approx)"
msgstr ""
+#: nutrition/models/meal.py:68
+msgid ""
+"Give meals a textual description / name such as \"Breakfast\" or \"after "
+"workout\""
+msgstr ""
+
#: nutrition/models/plan.py:71
msgid ""
"A description of the goal of the plan, e.g. \"Gain mass\" or \"Prepare for "
@@ -3160,12 +3249,12 @@ msgstr ""
#: nutrition/templates/ingredient/view.html:71
#: nutrition/templates/log/detail.html:31
-#: nutrition/templates/plan/view.html:227 nutrition/views/plan.py:376
+#: nutrition/templates/plan/view.html:229 nutrition/views/plan.py:376
msgid "Macronutrients"
msgstr ""
#: nutrition/templates/ingredient/view.html:80
-#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:244
+#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:246
msgid "kJ"
msgstr ""
@@ -3178,7 +3267,7 @@ msgstr ""
#: nutrition/templates/ingredient/view.html:128
#: nutrition/templates/log/detail.html:119
-#: nutrition/templates/plan/view.html:282
+#: nutrition/templates/plan/view.html:284
msgid "Others"
msgstr ""
@@ -3207,7 +3296,7 @@ msgstr ""
#: nutrition/templates/log/detail.html:7
#: nutrition/templates/log/overview.html:7
-#: nutrition/templates/plan/view.html:300
+#: nutrition/templates/plan/view.html:302
msgid "Nutrition diary"
msgstr ""
@@ -3217,13 +3306,13 @@ msgstr ""
#: nutrition/templates/log/detail.html:33
#: nutrition/templates/log/overview.html:31
-#: nutrition/templates/plan/view.html:308
+#: nutrition/templates/plan/view.html:310
msgid "Logged"
msgstr ""
#: nutrition/templates/log/detail.html:34
#: nutrition/templates/log/overview.html:32
-#: nutrition/templates/plan/view.html:309
+#: nutrition/templates/plan/view.html:311
msgid "Difference"
msgstr ""
@@ -3236,7 +3325,7 @@ msgid "g"
msgstr ""
#: nutrition/templates/log/overview.html:53
-#: nutrition/templates/plan/view.html:330
+#: nutrition/templates/plan/view.html:332
msgid "nothing found"
msgstr ""
@@ -3256,77 +3345,77 @@ msgstr ""
msgid "Add ingredient to meal"
msgstr ""
-#: nutrition/templates/plan/view.html:150
+#: nutrition/templates/plan/view.html:152
msgid "No items for this meal."
msgstr ""
-#: nutrition/templates/plan/view.html:188
+#: nutrition/templates/plan/view.html:190
msgid "No meals for this plan."
msgstr ""
-#: nutrition/templates/plan/view.html:200
+#: nutrition/templates/plan/view.html:202
msgid "Log this Plan"
msgstr ""
-#: nutrition/templates/plan/view.html:206
+#: nutrition/templates/plan/view.html:208
msgid "Add a new meal"
msgstr ""
-#: nutrition/templates/plan/view.html:216 nutrition/views/plan.py:369
+#: nutrition/templates/plan/view.html:218 nutrition/views/plan.py:369
msgid "Nutritional data"
msgstr ""
-#: nutrition/templates/plan/view.html:219
+#: nutrition/templates/plan/view.html:221
#, python-format
msgid "Based on the weight entry dated %(date)s (%(weight)s)"
msgstr ""
-#: nutrition/templates/plan/view.html:228 nutrition/views/plan.py:377
+#: nutrition/templates/plan/view.html:230 nutrition/views/plan.py:377
msgid "Total"
msgstr ""
-#: nutrition/templates/plan/view.html:229 nutrition/views/plan.py:378
+#: nutrition/templates/plan/view.html:231 nutrition/views/plan.py:378
msgid "Percent of energy"
msgstr ""
-#: nutrition/templates/plan/view.html:232 nutrition/views/plan.py:379
+#: nutrition/templates/plan/view.html:234 nutrition/views/plan.py:379
msgid "g per body kg"
msgstr ""
-#: nutrition/templates/plan/view.html:234
+#: nutrition/templates/plan/view.html:236
msgid "oz per body lb"
msgstr ""
-#: nutrition/templates/plan/view.html:338
+#: nutrition/templates/plan/view.html:340
msgid "View complete nutrition log"
msgstr ""
-#: nutrition/templates/plan/view.html:371
+#: nutrition/templates/plan/view.html:373
msgid "Goal"
msgstr ""
-#: nutrition/templates/plan/view.html:382
+#: nutrition/templates/plan/view.html:384
msgid ""
"You have selected that this nutritional plan has a\n"
" goal amount of calories. Use the calculator or enter the value\n"
" yourself."
msgstr ""
-#: nutrition/templates/plan/view.html:392
+#: nutrition/templates/plan/view.html:394
msgid ""
"If you find the ingredient list too short, you might want to activate the "
"preference to also show English ingredients."
msgstr ""
-#: nutrition/templates/plan/view.html:421
+#: nutrition/templates/plan/view.html:423
msgid "Edit nutrition plan"
msgstr ""
-#: nutrition/templates/plan/view.html:425
+#: nutrition/templates/plan/view.html:427
msgid "Make a copy of this nutrition plan"
msgstr ""
-#: nutrition/templates/plan/view.html:431
+#: nutrition/templates/plan/view.html:433
msgid "Delete nutrition plan"
msgstr ""
@@ -3406,10 +3495,6 @@ msgstr ""
msgid "Ingredient was successfully marked as rejected"
msgstr ""
-#: nutrition/views/log.py:229 nutrition/views/unit_ingredient.py:139
-msgid "Delete?"
-msgstr ""
-
#: nutrition/views/meal.py:55
msgid "Add new meal"
msgstr ""
@@ -3765,11 +3850,11 @@ msgstr ""
msgid "Re-Submit"
msgstr ""
-#: weight/templates/overview.html:68
+#: weight/templates/overview.html:51
msgid "Export as CSV"
msgstr ""
-#: weight/templates/overview.html:72
+#: weight/templates/overview.html:55
msgid "Import from spreadsheet"
msgstr ""
diff --git a/wger/locale/bg/LC_MESSAGES/django.po b/wger/locale/bg/LC_MESSAGES/django.po
index f58e5af2a..4fb199441 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: 2021-08-17 17:23+0200\n"
+"POT-Creation-Date: 2022-02-15 14:51+0100\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"
@@ -50,16 +50,16 @@ msgstr ""
msgid "Nothing found."
msgstr ""
-#: config/templates/language/overview.html:16 core/templates/index.html:147
-#: core/templates/index.html:199 manager/templates/calendar/month.html:132
+#: config/templates/language/overview.html:16 core/templates/index.html:137
+#: core/templates/index.html:189 manager/templates/calendar/month.html:132
#: manager/templates/schedule/overview.html:28
#: manager/templates/schedule/view.html:146
#: manager/templates/workout/overview.html:28
#: nutrition/templates/ingredient/overview.html:45
#: nutrition/templates/plan/overview.html:23
-#: nutrition/templates/plan/view.html:148
-#: nutrition/templates/plan/view.html:151
-#: nutrition/templates/plan/view.html:189
+#: nutrition/templates/plan/view.html:150
+#: nutrition/templates/plan/view.html:153
+#: nutrition/templates/plan/view.html:191
msgid "Add one now."
msgstr "Добави сега."
@@ -80,7 +80,7 @@ msgstr "Добави сега."
#: gym/templates/gym/member_list.html:244
#: gym/templates/gym/member_list.html:281
#: mailer/templates/mailer/gym/overview.html:43
-#: weight/templates/overview.html:78
+#: weight/templates/overview.html:61
msgid "Add"
msgstr "Добави"
@@ -114,14 +114,14 @@ msgstr ""
#: config/templates/language/view.html:91 core/templates/user/api_key.html:44
#: core/templates/user/preferences.html:28
-#: exercises/templates/exercise/view.html:273
-#: exercises/templates/exercise/view.html:296 gym/models/contract.py:200
+#: exercises/templates/exercise/view.html:323
+#: exercises/templates/exercise/view.html:346 gym/models/contract.py:200
#: gym/templates/contract/view.html:41 gym/templates/contract/view.html:106
#: gym/templates/gym/member_list.html:248
#: manager/templates/schedule/view.html:281
#: manager/templates/workout/view.html:206
#: nutrition/templates/ingredient/view.html:226
-#: nutrition/templates/plan/view.html:409 weight/templates/overview.html:62
+#: nutrition/templates/plan/view.html:411 weight/templates/overview.html:45
msgid "Options"
msgstr "Опции"
@@ -135,12 +135,12 @@ msgstr "Опции"
#: core/templates/weight_unit/list.html:17
#: exercises/templates/categories/admin-overview.html:16
#: exercises/templates/equipment/admin-overview.html:16
-#: exercises/templates/exercise/view.html:180
-#: exercises/templates/exercise/view.html:301
+#: exercises/templates/exercise/view.html:230
+#: exercises/templates/exercise/view.html:351
#: exercises/templates/muscles/admin-overview.html:16
-#: exercises/views/comments.py:63 gallery/views/images.py:96
-#: gym/templates/admin_notes/list.html:32 gym/templates/contract/list.html:31
-#: gym/templates/contract/view.html:107
+#: exercises/views/comments.py:63 exercises/views/videos.py:69
+#: gallery/views/images.py:96 gym/templates/admin_notes/list.html:32
+#: gym/templates/contract/list.html:31 gym/templates/contract/view.html:107
#: gym/templates/contract_option/list.html:31
#: gym/templates/contract_type/list.html:31 gym/templates/document/list.html:38
#: gym/templates/gym/list.html:19 gym/templates/gym/list.html:43
@@ -151,7 +151,7 @@ msgstr "Опции"
#: manager/templates/calendar/partial_overview_table.html:18
#: manager/templates/schedule/view.html:121
#: nutrition/templates/ingredient/view.html:198
-#: nutrition/templates/plan/view.html:89 nutrition/templates/plan/view.html:124
+#: nutrition/templates/plan/view.html:89 nutrition/templates/plan/view.html:126
#: nutrition/templates/units/list.html:18
msgid "Edit"
msgstr "Поправи"
@@ -165,9 +165,9 @@ msgstr "Поправи"
#: exercises/templates/categories/admin-overview.html:17
#: exercises/templates/equipment/admin-overview.html:17
#: exercises/templates/exercise/view.html:68
-#: exercises/templates/exercise/view.html:155
-#: exercises/templates/exercise/view.html:185
-#: exercises/templates/exercise/view.html:306
+#: exercises/templates/exercise/view.html:205
+#: exercises/templates/exercise/view.html:235
+#: exercises/templates/exercise/view.html:356
#: exercises/templates/muscles/admin-overview.html:17
#: gym/templates/admin_notes/list.html:40
#: gym/templates/contract_option/list.html:39
@@ -180,7 +180,7 @@ msgstr "Поправи"
#: nutrition/templates/ingredient/view.html:199
#: nutrition/templates/ingredient/view.html:239
#: nutrition/templates/log/detail.html:197
-#: nutrition/templates/plan/view.html:95 nutrition/templates/plan/view.html:130
+#: nutrition/templates/plan/view.html:95 nutrition/templates/plan/view.html:132
#: nutrition/templates/units/list.html:20
msgid "Delete"
msgstr "Изтрии"
@@ -306,7 +306,7 @@ msgid "Some way of answering you (e-mail, etc.)"
msgstr ""
#: core/forms.py:265 exercises/models/comment.py:40 manager/models/set.py:60
-#: manager/models/setting.py:99 nutrition/models/log.py:61
+#: manager/models/setting.py:99 nutrition/models/log.py:71
msgid "Comment"
msgstr "Коментирай"
@@ -442,7 +442,7 @@ msgstr ""
msgid "Age"
msgstr ""
-#: core/models/profile.py:202 nutrition/forms.py:98
+#: core/models/profile.py:202 nutrition/forms.py:99
msgid "Height (cm)"
msgstr ""
@@ -493,7 +493,7 @@ msgid "Total caloric intake, including e.g. any surplus"
msgstr ""
#: core/models/profile.py:305 nutrition/models/ingredient_weight_unit.py:45
-#: nutrition/models/log.py:80 nutrition/models/meal_item.py:58
+#: nutrition/models/log.py:90 nutrition/models/meal_item.py:58
msgid "Weight unit"
msgstr "Единица за тегло"
@@ -528,9 +528,9 @@ msgstr ""
#: gym/models/user_document.py:87 gym/templates/contract/view.html:50
#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:96
#: gym/views/gym.py:156 manager/models/schedule.py:55
-#: manager/models/workout.py:56 nutrition/models/ingredient.py:96
-#: nutrition/models/ingredient_category.py:26
-#: nutrition/models/weight_unit.py:38
+#: manager/models/workout.py:56 measurements/models/category.py:53
+#: nutrition/models/ingredient.py:96 nutrition/models/ingredient_category.py:26
+#: nutrition/models/meal.py:66 nutrition/models/weight_unit.py:38
#: nutrition/templates/ingredient/pending.html:15
#: nutrition/templates/ingredient/view.html:185
msgid "Name"
@@ -586,17 +586,17 @@ msgstr "Сигурен ли си, че искаш да изтриеш това?
msgid "Dashboard"
msgstr "Табло"
-#: core/templates/index.html:31 manager/templates/calendar/month.html:115
+#: core/templates/index.html:21 manager/templates/calendar/month.html:115
msgid "Add log to day"
msgstr ""
-#: core/templates/index.html:35 manager/templates/calendar/month.html:120
+#: core/templates/index.html:25 manager/templates/calendar/month.html:120
msgid ""
"Click to add weight logs to a training\n"
"day in your current workout:"
msgstr ""
-#: core/templates/index.html:43 core/templates/index.html:83
+#: core/templates/index.html:33 core/templates/index.html:73
#: core/templates/misc/fragments/shariff_modal.html:29
#: core/templates/template.html:125 manager/templates/calendar/month.html:138
#: manager/templates/schedule/view.html:246
@@ -606,17 +606,17 @@ msgstr ""
msgid "Close"
msgstr ""
-#: core/templates/index.html:54 core/templates/index.html:203
+#: core/templates/index.html:44 core/templates/index.html:193
msgid "Add new diary entry"
msgstr ""
-#: core/templates/index.html:59
+#: core/templates/index.html:49
msgid ""
"Click to add an entry to your nutrition diary for today. You can either log "
"a meal as you defined it, or entry any number of custom entries."
msgstr ""
-#: core/templates/index.html:67 core/templates/index.html:171
+#: core/templates/index.html:57 core/templates/index.html:161
#: core/templates/user/overview.html:171
#: nutrition/templates/ingredient/view.html:79
#: nutrition/templates/log/detail.html:40
@@ -625,19 +625,19 @@ msgstr ""
#: nutrition/templates/log/overview.html:7
#: nutrition/templates/log/overview.html:44
#: nutrition/templates/plan/overview.html:17
-#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:242
-#: nutrition/templates/plan/view.html:301
-#: nutrition/templates/plan/view.html:321
-#: nutrition/templates/plan/view.html:363
-#: nutrition/templates/plan/view.html:373
+#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:244
+#: nutrition/templates/plan/view.html:303
+#: nutrition/templates/plan/view.html:323
+#: nutrition/templates/plan/view.html:365
+#: nutrition/templates/plan/view.html:375
msgid "kcal"
msgstr ""
-#: core/templates/index.html:79 nutrition/templates/plan/view.html:348
+#: core/templates/index.html:69 nutrition/templates/plan/view.html:350
msgid "Add custom diary entry"
msgstr ""
-#: core/templates/index.html:94 core/templates/index.html:102
+#: core/templates/index.html:84 core/templates/index.html:92
#: manager/models/day.py:34 manager/models/log.py:56
#: manager/models/session.py:60 manager/models/workout.py:109
#: manager/templates/schedule/view.html:105
@@ -648,80 +648,80 @@ msgstr ""
msgid "Workout"
msgstr "Упражнение"
-#: core/templates/index.html:128
+#: core/templates/index.html:118
msgid "This workout is part of a schedule:"
msgstr "Тази тренировка е част от график:"
-#: core/templates/index.html:133
+#: core/templates/index.html:123
msgid ""
"The current workout is selected from your active schedule or, if you don't "
"have one, simply by date."
msgstr ""
-#: core/templates/index.html:142 manager/templates/calendar/month.html:188
+#: core/templates/index.html:132 manager/templates/calendar/month.html:188
msgid "Add new log"
msgstr ""
-#: core/templates/index.html:147 core/templates/user/overview.html:58
+#: core/templates/index.html:137 core/templates/user/overview.html:58
#: manager/templates/calendar/month.html:128
#: manager/templates/schedule/view.html:146
#: manager/templates/workout/overview.html:28
msgid "No workouts found."
msgstr "Не са намерени тренировки."
-#: core/templates/index.html:157 nutrition/models/log.py:48
+#: core/templates/index.html:147 nutrition/models/log.py:49
#: nutrition/models/meal.py:49 nutrition/models/meal_item.py:47
#: nutrition/models/plan.py:94 nutrition/templates/plan/view.html:11
#: nutrition/templates/plan/view.html:19
msgid "Nutrition plan"
msgstr "План за хранене"
-#: core/templates/index.html:169 core/templates/user/overview.html:155
+#: core/templates/index.html:159 core/templates/user/overview.html:155
#: nutrition/models/ingredient.py:100
#: nutrition/templates/ingredient/view.html:77
#: nutrition/templates/log/detail.html:39
#: nutrition/templates/log/detail.html:156
-#: nutrition/templates/plan/view.html:53 nutrition/templates/plan/view.html:241
-#: nutrition/templates/plan/view.html:358
-#: nutrition/templates/plan/view.html:362 nutrition/views/plan.py:384
+#: nutrition/templates/plan/view.html:53 nutrition/templates/plan/view.html:243
+#: nutrition/templates/plan/view.html:360
+#: nutrition/templates/plan/view.html:364 nutrition/views/plan.py:384
msgid "Energy"
msgstr "Енергия"
-#: core/templates/index.html:175 core/templates/user/overview.html:156
+#: core/templates/index.html:165 core/templates/user/overview.html:156
#: nutrition/models/ingredient.py:105
#: nutrition/templates/ingredient/view.html:84
#: nutrition/templates/log/detail.html:52
#: nutrition/templates/log/detail.html:174
-#: nutrition/templates/plan/view.html:54 nutrition/templates/plan/view.html:249
+#: nutrition/templates/plan/view.html:54 nutrition/templates/plan/view.html:251
#: nutrition/views/plan.py:390
msgid "Protein"
msgstr "Протеин"
-#: core/templates/index.html:181 core/templates/user/overview.html:157
+#: core/templates/index.html:171 core/templates/user/overview.html:157
#: nutrition/models/ingredient.py:113
#: nutrition/templates/ingredient/view.html:90
#: nutrition/templates/log/detail.html:65
#: nutrition/templates/log/detail.html:175
-#: nutrition/templates/plan/view.html:55 nutrition/templates/plan/view.html:255
+#: nutrition/templates/plan/view.html:55 nutrition/templates/plan/view.html:257
#: nutrition/views/plan.py:398
msgid "Carbohydrates"
msgstr "Въглехидрати"
-#: core/templates/index.html:187 core/templates/user/overview.html:158
+#: core/templates/index.html:177 core/templates/user/overview.html:158
#: nutrition/models/ingredient.py:131
#: nutrition/templates/ingredient/view.html:106
#: nutrition/templates/log/detail.html:91
#: nutrition/templates/log/detail.html:176
-#: nutrition/templates/plan/view.html:56 nutrition/templates/plan/view.html:268
+#: nutrition/templates/plan/view.html:56 nutrition/templates/plan/view.html:270
#: nutrition/views/plan.py:412
msgid "Fat"
msgstr "Мазнини"
-#: core/templates/index.html:199 nutrition/templates/plan/overview.html:22
+#: core/templates/index.html:189 nutrition/templates/plan/overview.html:22
msgid "No nutrition plans."
msgstr "Няма план за хранене"
-#: core/templates/index.html:213 core/templates/user/overview.html:112
+#: core/templates/index.html:203 core/templates/user/overview.html:112
#: core/templates/user/overview.html:121 manager/forms.py:173
#: manager/helpers.py:89 manager/models/log.py:84 manager/models/setting.py:67
#: manager/templates/log/add.html:54 manager/templates/set/formset.html:12
@@ -730,11 +730,7 @@ msgstr "Няма план за хранене"
msgid "Weight"
msgstr "Тегло"
-#: core/templates/index.html:217
-msgid "Your current weight is: "
-msgstr "Текущото ви тегло е:"
-
-#: core/templates/index.html:248 core/templates/navigation.html:97
+#: core/templates/index.html:210 core/templates/navigation.html:97
#: weight/views.py:70
msgid "Add weight entry"
msgstr "Добави тегло"
@@ -766,7 +762,7 @@ msgstr ""
msgid "Nothing found"
msgstr ""
-#: core/templates/misc/about.html:4 core/templates/template.html:201
+#: core/templates/misc/about.html:4 core/templates/template.html:175
#: core/templates/template_features.html:118
#: core/templates/template_no_context.html:88
msgid "Imprint"
@@ -782,8 +778,8 @@ msgid ""
msgstr ""
#: core/templates/misc/fragments/shariff_modal.html:22
-#: nutrition/templates/plan/view.html:385
-#: nutrition/templates/plan/view.html:394
+#: nutrition/templates/plan/view.html:387
+#: nutrition/templates/plan/view.html:396
msgid "That's done here"
msgstr "Това е свършено"
@@ -873,7 +869,7 @@ msgstr "Упражненията "
msgid "Equipment"
msgstr ""
-#: core/templates/navigation.html:78 exercises/templates/exercise/view.html:208
+#: core/templates/navigation.html:78 exercises/templates/exercise/view.html:258
msgid "Muscles"
msgstr "Мускули"
@@ -946,7 +942,7 @@ msgstr ""
msgid "Get the code"
msgstr "Грабни кода"
-#: core/templates/navigation.html:175 core/templates/template.html:193
+#: core/templates/navigation.html:175 core/templates/template.html:205
#: core/templates/template_features.html:100
msgid "Translate"
msgstr "Преведи"
@@ -1101,15 +1097,11 @@ msgstr ""
msgid "Create some demo entries"
msgstr "Направи демонстративни попълнения"
-#: core/templates/template.html:202 core/templates/template_features.html:122
+#: core/templates/template.html:176 core/templates/template_features.html:122
#: core/templates/template_no_context.html:89 software/templates/tos.html:7
msgid "Terms of service"
msgstr ""
-#: core/templates/template.html:209 core/templates/template.html:210
-msgid "Released under the Affero GPL"
-msgstr "Създадено под закрилата на Affero GPL"
-
#: core/templates/template_features.html:62 software/templates/features.html:9
#: software/templates/features.html:120
msgid "Features"
@@ -1206,9 +1198,10 @@ msgstr "Добави упражнение"
#: core/templates/user/overview.html:120 core/templates/user/overview.html:153
#: exercises/models/exercise.py:77 gallery/models/image.py:47
#: manager/helpers.py:88 manager/models/log.py:98 manager/models/session.py:67
-#: nutrition/models/ingredient.py:85 nutrition/models/ingredient.py:87
-#: nutrition/models/ingredient.py:190 nutrition/templates/log/overview.html:30
-#: nutrition/templates/plan/view.html:307 weight/models.py:32
+#: measurements/models/measurement.py:64 nutrition/models/ingredient.py:85
+#: nutrition/models/ingredient.py:87 nutrition/models/ingredient.py:190
+#: nutrition/templates/log/overview.html:30
+#: nutrition/templates/plan/view.html:309 weight/models.py:32
#: weight/templates/import_csv_preview.html:13
#: weight/templates/import_csv_preview.html:42 weight/views.py:150
msgid "Date"
@@ -1216,10 +1209,10 @@ msgstr "Дата"
#: core/templates/user/overview.html:35 core/templates/user/overview.html:154
#: exercises/models/exercise.py:61 exercises/templates/exercise/view.html:88
-#: exercises/views/exercises.py:189 gallery/models/image.py:70
+#: exercises/views/exercises.py:190 gallery/models/image.py:70
#: gym/models/contract.py:57 gym/models/contract.py:107
#: manager/models/day.py:37 manager/models/workout.py:62
-#: nutrition/models/plan.py:69
+#: measurements/models/measurement.py:79 nutrition/models/plan.py:69
msgid "Description"
msgstr "Описание"
@@ -1380,11 +1373,11 @@ msgstr "Преференции"
msgid "Change password"
msgstr "Смени парола"
-#: core/templatetags/wger_extras.py:217
+#: core/templatetags/wger_extras.py:229
msgid "kg"
msgstr ""
-#: core/templatetags/wger_extras.py:219
+#: core/templatetags/wger_extras.py:231
#: nutrition/templates/ingredient/view.html:86
#: nutrition/templates/ingredient/view.html:92
#: nutrition/templates/ingredient/view.html:99
@@ -1396,28 +1389,28 @@ msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr ""
-#: core/templatetags/wger_extras.py:222
+#: core/templatetags/wger_extras.py:234
msgid "lb"
msgstr ""
-#: core/templatetags/wger_extras.py:224
+#: core/templatetags/wger_extras.py:236
msgctxt "weight unit, i.e. ounces"
msgid "oz"
msgstr ""
#: core/views/languages.py:85 exercises/views/categories.py:121
-#: exercises/views/equipment.py:106 exercises/views/exercises.py:422
+#: exercises/views/equipment.py:106 exercises/views/exercises.py:423
#: exercises/views/images.py:128 exercises/views/muscles.py:118
-#: manager/views/schedule.py:311 manager/views/schedule_step.py:129
-#: manager/views/workout.py:268 manager/views/workout_session.py:141
-#: nutrition/views/ingredient.py:144 nutrition/views/plan.py:120
-#: nutrition/views/unit.py:111
+#: exercises/views/videos.py:129 manager/views/schedule.py:311
+#: manager/views/schedule_step.py:129 manager/views/workout.py:268
+#: manager/views/workout_session.py:141 nutrition/views/ingredient.py:144
+#: nutrition/views/plan.py:120 nutrition/views/unit.py:111
msgid "Successfully deleted"
msgstr ""
#: core/views/languages.py:93 core/views/license.py:103
#: core/views/repetition_units.py:115 core/views/weight_units.py:115
-#: exercises/views/categories.py:127 exercises/views/exercises.py:430
+#: exercises/views/categories.py:127 exercises/views/exercises.py:431
#: exercises/views/muscles.py:125 gallery/views/images.py:121
#: gym/views/admin_notes.py:196 gym/views/document.py:206 gym/views/gym.py:486
#: manager/views/schedule.py:318 manager/views/schedule_step.py:139
@@ -1431,7 +1424,7 @@ msgstr ""
#: core/views/languages.py:111 core/views/license.py:84
#: core/views/repetition_units.py:85 core/views/user.py:456
#: core/views/weight_units.py:85 exercises/views/categories.py:97
-#: exercises/views/equipment.py:83 exercises/views/exercises.py:304
+#: exercises/views/equipment.py:83 exercises/views/exercises.py:305
#: exercises/views/muscles.py:105 gym/views/admin_notes.py:160
#: gym/views/config.py:68 gym/views/contract.py:186
#: gym/views/contract_option.py:123 gym/views/contract_type.py:123
@@ -1522,7 +1515,7 @@ msgstr "Основни мускули"
#: exercises/models/base.py:64 exercises/templates/equipment/overview.html:71
#: exercises/templates/exercise/overview.html:76
-#: exercises/templates/exercise/view.html:218
+#: exercises/templates/exercise/view.html:268
#: exercises/templates/muscles/overview.html:73
msgid "Secondary muscles"
msgstr "Второстепенни мускули"
@@ -1535,8 +1528,9 @@ msgstr ""
msgid "Exercise Categories"
msgstr "Категории на упражнения"
-#: exercises/models/comment.py:34 exercises/models/image.py:62
-#: manager/forms.py:165 manager/helpers.py:89 manager/models/log.py:51
+#: exercises/models/comment.py:34 exercises/models/image.py:75
+#: exercises/models/video.py:82 manager/forms.py:165 manager/helpers.py:89
+#: manager/models/log.py:51
msgid "Exercise"
msgstr "Упражнение"
@@ -1549,43 +1543,69 @@ msgstr "Коментар как да се направи упражнениет
msgid "Language"
msgstr "Език"
-#: exercises/models/exercise.py:233 exercises/views/exercises.py:460
+#: exercises/models/exercise.py:237 exercises/views/exercises.py:461
msgid "Exercise was successfully added to the general database"
msgstr "Упражнението беше успешно прибавено към датабазата"
-#: exercises/models/exercise.py:261
+#: exercises/models/exercise.py:265
msgid "New user submitted exercise"
msgstr "Ново упражнение добавено от потребител"
-#: exercises/models/exercise.py:263
+#: exercises/models/exercise.py:267
#, python-brace-format
msgid "The user {0} submitted a new exercise \"{1}\"."
msgstr "Потребителя {0} предостави ново упражнение \"{1}\"."
-#: exercises/models/image.py:68 gallery/models/image.py:56
+#: exercises/models/image.py:59
+msgid "Line"
+msgstr ""
+
+#: exercises/models/image.py:60
+msgid "3D"
+msgstr ""
+
+#: exercises/models/image.py:61
+msgid "Low-poly"
+msgstr ""
+
+#: exercises/models/image.py:62
+msgid "Photo"
+msgstr ""
+
+#: exercises/models/image.py:63
+#, fuzzy
+#| msgid "Others"
+msgid "Other"
+msgstr "Други"
+
+#: exercises/models/image.py:81 gallery/models/image.py:56
msgid "Image"
msgstr ""
-#: exercises/models/image.py:69 gallery/models/image.py:57
+#: exercises/models/image.py:82 gallery/models/image.py:57
msgid "Only PNG and JPEG formats are supported"
msgstr ""
-#: exercises/models/image.py:75
+#: exercises/models/image.py:88
msgid "Main picture"
msgstr ""
-#: exercises/models/image.py:78
+#: exercises/models/image.py:91
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 "
"by the system."
msgstr ""
-#: exercises/models/image.py:166
+#: exercises/models/image.py:100
+msgid "The art style of your image"
+msgstr ""
+
+#: exercises/models/image.py:185
msgid "New user submitted image"
msgstr ""
-#: exercises/models/image.py:167
+#: exercises/models/image.py:186
#, python-brace-format
msgid "The user {0} submitted a new image \"{1}\" for exercise {2}."
msgstr ""
@@ -1594,6 +1614,54 @@ msgstr ""
msgid "In latin, e.g. \"Pectoralis major\""
msgstr ""
+#: exercises/models/video.py:41
+msgid "Maximum file size is 100MB."
+msgstr ""
+
+#: exercises/models/video.py:44 exercises/models/video.py:48
+msgid "File type is not supported"
+msgstr ""
+
+#: exercises/models/video.py:57
+msgid "File is not a valid video"
+msgstr ""
+
+#: exercises/models/video.py:88
+msgid "Main video"
+msgstr ""
+
+#: exercises/models/video.py:94
+msgid "Video"
+msgstr ""
+
+#: exercises/models/video.py:101
+msgid "Size"
+msgstr ""
+
+#: exercises/models/video.py:108 manager/models/schedule_step.py:56
+msgid "Duration"
+msgstr "Времетраене"
+
+#: exercises/models/video.py:117
+msgid "Width"
+msgstr ""
+
+#: exercises/models/video.py:124
+#, fuzzy
+#| msgid "Weight"
+msgid "Height"
+msgstr "Тегло"
+
+#: exercises/models/video.py:131
+#, fuzzy
+#| msgid "Code"
+msgid "Codec"
+msgstr "Код"
+
+#: exercises/models/video.py:139
+msgid "Codec, long name"
+msgstr ""
+
#: exercises/templates/equipment/admin-overview.html:4
msgid "Equipment list"
msgstr ""
@@ -1609,7 +1677,7 @@ msgstr ""
#: exercises/templates/equipment/overview.html:69
#: exercises/templates/exercise/overview.html:74
-#: exercises/templates/exercise/view.html:214
+#: exercises/templates/exercise/view.html:264
#: exercises/templates/muscles/overview.html:71
msgid "Main muscles"
msgstr "Основни мускули"
@@ -1726,7 +1794,8 @@ msgstr "Дата на подаване"
#: gym/templates/gym/new_user.html:22
#: gym/templates/gym/reset_user_password.html:20 manager/models/log.py:45
#: manager/models/schedule.py:44 manager/models/session.py:49
-#: manager/models/workout.py:89 nutrition/models/plan.py:55
+#: manager/models/workout.py:89 measurements/models/category.py:48
+#: measurements/models/measurement.py:59 nutrition/models/plan.py:55
#: nutrition/templates/ingredient/pending.html:16 weight/models.py:41
msgid "User"
msgstr "Потребител"
@@ -1751,13 +1820,13 @@ msgid "Please select one of the options below."
msgstr "Моля изберете една опция от изброените по-долу."
#: exercises/templates/exercise/view.html:60
-#: exercises/templates/exercise/view.html:153
+#: exercises/templates/exercise/view.html:203
#: nutrition/templates/ingredient/view.html:38
msgid "Accept"
msgstr "Приемам"
#: exercises/templates/exercise/view.html:64
-#: exercises/templates/exercise/view.html:154
+#: exercises/templates/exercise/view.html:204
#: nutrition/templates/ingredient/view.html:42
msgid "Decline"
msgstr "Отказвам"
@@ -1770,32 +1839,42 @@ msgstr ""
msgid "Add new image"
msgstr ""
-#: exercises/templates/exercise/view.html:147
+#: exercises/templates/exercise/view.html:148
+msgid "Videos"
+msgstr ""
+
+#: exercises/templates/exercise/view.html:187 exercises/views/videos.py:94
+#, fuzzy
+#| msgid "Add new meal"
+msgid "Add new video"
+msgstr "Добави ново ядене"
+
+#: exercises/templates/exercise/view.html:197
msgid "Images pending review"
msgstr ""
-#: exercises/templates/exercise/view.html:168
+#: exercises/templates/exercise/view.html:218
msgid "Comments for this exercise"
msgstr "Коментари за упражнението"
-#: exercises/templates/exercise/view.html:196
+#: exercises/templates/exercise/view.html:246
msgid "Add new comment"
msgstr "Добави нов коментар"
-#: exercises/templates/exercise/view.html:210
+#: exercises/templates/exercise/view.html:260
msgid "The diagram shows the most used muscles on this exercise"
msgstr "Диаграмата показва най-натоварваните мускули при това упражнение."
-#: exercises/templates/exercise/view.html:251
+#: exercises/templates/exercise/view.html:301
#: manager/templates/workout/log.html:10 manager/templates/workout/log.html:11
msgid "Weight log"
msgstr "Запис на тегло"
-#: exercises/templates/exercise/view.html:256
+#: exercises/templates/exercise/view.html:306
msgid "Exercise Variations"
msgstr ""
-#: exercises/templates/exercise/view.html:277
+#: exercises/templates/exercise/view.html:327
msgid "Submit a correction"
msgstr ""
@@ -1830,30 +1909,30 @@ msgstr "Добави коментар към упражнение"
msgid "Delete equipment?"
msgstr ""
-#: exercises/views/exercises.py:228
+#: exercises/views/exercises.py:229
#, python-format
msgid ""
"%(name_original)s is too similar to existing exercise \"%(exercise_name)s\""
msgstr ""
-#: exercises/views/exercises.py:246
+#: exercises/views/exercises.py:247
msgid "Add exercise"
msgstr "Добави упражнение"
-#: exercises/views/exercises.py:366
+#: exercises/views/exercises.py:367
msgid "Thank you. Once the changes are reviewed the exercise will be updated."
msgstr ""
-#: exercises/views/exercises.py:379
+#: exercises/views/exercises.py:380
#, python-brace-format
msgid "Correct {0}"
msgstr ""
-#: exercises/views/exercises.py:421
+#: exercises/views/exercises.py:422
msgid "This will delete the exercise from all workouts."
msgstr "Това ще изтрие упражнението от всички тренировки."
-#: exercises/views/exercises.py:473
+#: exercises/views/exercises.py:474
msgid "Exercise was successfully marked as rejected"
msgstr "Упражнението бе успешно маркирано като отхвърлено"
@@ -1865,6 +1944,11 @@ msgstr ""
msgid "Delete exercise image?"
msgstr ""
+#: exercises/views/videos.py:144 nutrition/views/log.py:230
+#: nutrition/views/unit_ingredient.py:139
+msgid "Delete?"
+msgstr ""
+
#: gallery/templates/images/overview.html:62
#, fuzzy
#| msgid "Add muscle"
@@ -1933,8 +2017,8 @@ msgid "Contract type"
msgstr ""
#: gym/models/contract.py:208 gym/templates/contract/view.html:59
-#: manager/templates/log/add.html:52 nutrition/forms.py:58
-#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:92
+#: manager/templates/log/add.html:52 nutrition/forms.py:59
+#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:102
#: nutrition/models/meal_item.py:72
msgid "Amount"
msgstr "Количество"
@@ -2369,6 +2453,7 @@ msgid ""
msgstr ""
#: mailer/templates/mailer/gym/preview.html:22
+#: software/templates/about_us.html:59
msgid "Current version"
msgstr ""
@@ -2407,7 +2492,8 @@ msgstr ""
#: manager/models/log.py:90 manager/models/setting.py:47
#: manager/models/setting.py:78 manager/templates/log/add.html:53
#: manager/templates/log/add.html:55 manager/templates/set/formset.html:11
-#: manager/templates/set/formset.html:13 nutrition/forms.py:62
+#: manager/templates/set/formset.html:13 measurements/models/category.py:58
+#: nutrition/forms.py:63
msgid "Unit"
msgstr ""
@@ -2476,10 +2562,6 @@ msgstr ""
msgid "schedule"
msgstr "график"
-#: manager/models/schedule_step.py:56
-msgid "Duration"
-msgstr "Времетраене"
-
#: manager/models/schedule_step.py:57
msgid "The duration in weeks"
msgstr "Времетраене в седмици"
@@ -2745,7 +2827,7 @@ msgstr ""
#: manager/templates/schedule/view.html:290
#: manager/templates/workout/view.html:142
#: manager/templates/workout/view.html:217
-#: nutrition/templates/plan/view.html:415
+#: nutrition/templates/plan/view.html:417
msgid "Download as PDF"
msgstr "Свали като PDF"
@@ -2978,30 +3060,34 @@ msgstr ""
msgid "This will delete all weight logs for this day as well."
msgstr ""
-#: nutrition/forms.py:121
+#: measurements/models/measurement.py:69
+msgid "Value"
+msgstr ""
+
+#: nutrition/forms.py:122
msgid "Calculate"
msgstr ""
-#: nutrition/forms.py:194 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:195 nutrition/templates/rate/form.html:76
msgid "Basic caloric intake"
msgstr ""
-#: nutrition/forms.py:195
+#: nutrition/forms.py:196
msgid "Your basic caloric intake as calculated for your data"
msgstr ""
-#: nutrition/forms.py:201
+#: nutrition/forms.py:202
msgid "Additional calories"
msgstr ""
-#: nutrition/forms.py:203
+#: nutrition/forms.py:204
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
msgstr ""
-#: nutrition/forms.py:231 nutrition/models/ingredient_weight_unit.py:39
-#: nutrition/models/log.py:71 nutrition/models/meal_item.py:53
+#: nutrition/forms.py:232 nutrition/models/ingredient_weight_unit.py:39
+#: nutrition/models/log.py:81 nutrition/models/meal_item.py:53
#: nutrition/templates/log/detail.html:155
msgid "Ingredient"
msgstr "Съставка"
@@ -3020,14 +3106,14 @@ msgstr "В гр. за 100гр продукт"
#: nutrition/models/ingredient.py:123
#: nutrition/templates/ingredient/view.html:96
#: nutrition/templates/log/detail.html:78
-#: nutrition/templates/plan/view.html:262 nutrition/views/plan.py:406
+#: nutrition/templates/plan/view.html:264 nutrition/views/plan.py:406
msgid "Sugar content in carbohydrates"
msgstr "Състав на захар в въглехидратите"
#: nutrition/models/ingredient.py:141
#: nutrition/templates/ingredient/view.html:112
#: nutrition/templates/log/detail.html:104
-#: nutrition/templates/plan/view.html:274 nutrition/views/plan.py:420
+#: nutrition/templates/plan/view.html:276 nutrition/views/plan.py:420
msgid "Saturated fat content in fats"
msgstr "Наситени мазнини в мазнини"
@@ -3035,7 +3121,7 @@ msgstr "Наситени мазнини в мазнини"
#: nutrition/templates/ingredient/view.html:134
#: nutrition/templates/log/detail.html:122
#: nutrition/templates/log/detail.html:178
-#: nutrition/templates/plan/view.html:285 nutrition/views/plan.py:426
+#: nutrition/templates/plan/view.html:287 nutrition/views/plan.py:426
msgid "Fibres"
msgstr "Фибри"
@@ -3043,7 +3129,7 @@ msgstr "Фибри"
#: nutrition/templates/ingredient/view.html:144
#: nutrition/templates/log/detail.html:135
#: nutrition/templates/log/detail.html:181
-#: nutrition/templates/plan/view.html:291 nutrition/views/plan.py:432
+#: nutrition/templates/plan/view.html:293 nutrition/views/plan.py:432
msgid "Sodium"
msgstr "Натрий"
@@ -3088,10 +3174,20 @@ msgstr ""
msgid "Unit amount, e.g. \"1 Cup\" or \"1/2 spoon\""
msgstr "Единица количество, напр. \"1 Чаша\" или \"1/2 лъжица\""
+#: nutrition/models/log.py:55
+msgid "Meal"
+msgstr "Ядене"
+
#: nutrition/models/meal.py:61
msgid "Time (approx)"
msgstr "Време (приблизително)"
+#: nutrition/models/meal.py:68
+msgid ""
+"Give meals a textual description / name such as \"Breakfast\" or \"after "
+"workout\""
+msgstr ""
+
#: nutrition/models/plan.py:71
msgid ""
"A description of the goal of the plan, e.g. \"Gain mass\" or \"Prepare for "
@@ -3233,12 +3329,12 @@ msgstr ""
#: nutrition/templates/ingredient/view.html:71
#: nutrition/templates/log/detail.html:31
-#: nutrition/templates/plan/view.html:227 nutrition/views/plan.py:376
+#: nutrition/templates/plan/view.html:229 nutrition/views/plan.py:376
msgid "Macronutrients"
msgstr "Макронутриенти"
#: nutrition/templates/ingredient/view.html:80
-#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:244
+#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:246
msgid "kJ"
msgstr ""
@@ -3251,7 +3347,7 @@ msgstr "Не е налично"
#: nutrition/templates/ingredient/view.html:128
#: nutrition/templates/log/detail.html:119
-#: nutrition/templates/plan/view.html:282
+#: nutrition/templates/plan/view.html:284
msgid "Others"
msgstr "Други"
@@ -3280,7 +3376,7 @@ msgstr "Изтрий съставка"
#: nutrition/templates/log/detail.html:7
#: nutrition/templates/log/overview.html:7
-#: nutrition/templates/plan/view.html:300
+#: nutrition/templates/plan/view.html:302
msgid "Nutrition diary"
msgstr ""
@@ -3290,13 +3386,13 @@ msgstr ""
#: nutrition/templates/log/detail.html:33
#: nutrition/templates/log/overview.html:31
-#: nutrition/templates/plan/view.html:308
+#: nutrition/templates/plan/view.html:310
msgid "Logged"
msgstr ""
#: nutrition/templates/log/detail.html:34
#: nutrition/templates/log/overview.html:32
-#: nutrition/templates/plan/view.html:309
+#: nutrition/templates/plan/view.html:311
msgid "Difference"
msgstr ""
@@ -3309,7 +3405,7 @@ msgid "g"
msgstr ""
#: nutrition/templates/log/overview.html:53
-#: nutrition/templates/plan/view.html:330
+#: nutrition/templates/plan/view.html:332
msgid "nothing found"
msgstr ""
@@ -3329,63 +3425,63 @@ msgstr ""
msgid "Add ingredient to meal"
msgstr ""
-#: nutrition/templates/plan/view.html:150
+#: nutrition/templates/plan/view.html:152
msgid "No items for this meal."
msgstr "Няма артикули за това ядене."
-#: nutrition/templates/plan/view.html:188
+#: nutrition/templates/plan/view.html:190
msgid "No meals for this plan."
msgstr "Няма яденета за този план."
-#: nutrition/templates/plan/view.html:200
+#: nutrition/templates/plan/view.html:202
msgid "Log this Plan"
msgstr ""
-#: nutrition/templates/plan/view.html:206
+#: nutrition/templates/plan/view.html:208
msgid "Add a new meal"
msgstr "Добави ново ядене"
-#: nutrition/templates/plan/view.html:216 nutrition/views/plan.py:369
+#: nutrition/templates/plan/view.html:218 nutrition/views/plan.py:369
msgid "Nutritional data"
msgstr "Хранителни данни"
-#: nutrition/templates/plan/view.html:219
+#: nutrition/templates/plan/view.html:221
#, python-format
msgid "Based on the weight entry dated %(date)s (%(weight)s)"
msgstr ""
-#: nutrition/templates/plan/view.html:228 nutrition/views/plan.py:377
+#: nutrition/templates/plan/view.html:230 nutrition/views/plan.py:377
msgid "Total"
msgstr ""
-#: nutrition/templates/plan/view.html:229 nutrition/views/plan.py:378
+#: nutrition/templates/plan/view.html:231 nutrition/views/plan.py:378
msgid "Percent of energy"
msgstr ""
-#: nutrition/templates/plan/view.html:232 nutrition/views/plan.py:379
+#: nutrition/templates/plan/view.html:234 nutrition/views/plan.py:379
msgid "g per body kg"
msgstr ""
-#: nutrition/templates/plan/view.html:234
+#: nutrition/templates/plan/view.html:236
msgid "oz per body lb"
msgstr ""
-#: nutrition/templates/plan/view.html:338
+#: nutrition/templates/plan/view.html:340
msgid "View complete nutrition log"
msgstr ""
-#: nutrition/templates/plan/view.html:371
+#: nutrition/templates/plan/view.html:373
msgid "Goal"
msgstr "Цел"
-#: nutrition/templates/plan/view.html:382
+#: nutrition/templates/plan/view.html:384
msgid ""
"You have selected that this nutritional plan has a\n"
" goal amount of calories. Use the calculator or enter the value\n"
" yourself."
msgstr ""
-#: nutrition/templates/plan/view.html:392
+#: nutrition/templates/plan/view.html:394
msgid ""
"If you find the ingredient list too short, you might want to activate the "
"preference to also show English ingredients."
@@ -3393,15 +3489,15 @@ msgstr ""
"Ако намирате списъка на съставки твърде кратък, може да активирате "
"предпочитанието да се показват също английски съставки."
-#: nutrition/templates/plan/view.html:421
+#: nutrition/templates/plan/view.html:423
msgid "Edit nutrition plan"
msgstr "Промени плана за хранене"
-#: nutrition/templates/plan/view.html:425
+#: nutrition/templates/plan/view.html:427
msgid "Make a copy of this nutrition plan"
msgstr "Направи копие на този план за хранене"
-#: nutrition/templates/plan/view.html:431
+#: nutrition/templates/plan/view.html:433
msgid "Delete nutrition plan"
msgstr "Изтрий план за хранене"
@@ -3481,10 +3577,6 @@ msgstr "Добави нова съставка"
msgid "Ingredient was successfully marked as rejected"
msgstr "Съставката бе успешно маркирана като отхвърлена"
-#: nutrition/views/log.py:229 nutrition/views/unit_ingredient.py:139
-msgid "Delete?"
-msgstr ""
-
#: nutrition/views/meal.py:55
msgid "Add new meal"
msgstr "Добави ново ядене"
@@ -3846,11 +3938,11 @@ msgstr ""
msgid "Re-Submit"
msgstr ""
-#: weight/templates/overview.html:68
+#: weight/templates/overview.html:51
msgid "Export as CSV"
msgstr ""
-#: weight/templates/overview.html:72
+#: weight/templates/overview.html:55
msgid "Import from spreadsheet"
msgstr ""
@@ -3868,6 +3960,12 @@ msgstr ""
msgid "Delete weight entry for the %s"
msgstr ""
+#~ msgid "Your current weight is: "
+#~ msgstr "Текущото ви тегло е:"
+
+#~ msgid "Released under the Affero GPL"
+#~ msgstr "Създадено под закрилата на Affero GPL"
+
#~ msgid "Responsible for the content of this site as per German law §5 TMG:"
#~ msgstr "Отговност за съдържанието на този сайт, по немски закон §5 TMG:"
@@ -4008,9 +4106,6 @@ msgstr ""
#~ "Преводите лесно се управляват и редактират онлайн. Ако се интересувате, \n"
#~ "отидете на сайтът transifex и поискайте достъп."
-#~ msgid "Code"
-#~ msgstr "Код"
-
#~ msgid ""
#~ "Obviously, you are highly encouraged to clone the\n"
#~ "repo and start hacking! Once you are ready, send a pull request and we\n"
@@ -4027,8 +4122,5 @@ msgstr ""
#~ msgid "The goal or description of the new workout."
#~ msgstr "Целта или описанието на предишната тренировка."
-#~ msgid "Meal"
-#~ msgstr "Ядене"
-
#~ msgid "Translate with Transifex"
#~ msgstr "Преведи с Transifex"
diff --git a/wger/locale/ca/LC_MESSAGES/django.po b/wger/locale/ca/LC_MESSAGES/django.po
index dcec32236..9e8967042 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: 2021-12-28 19:01+0100\n"
+"POT-Creation-Date: 2022-02-15 14:51+0100\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"
@@ -49,8 +49,8 @@ msgstr "Llengües"
msgid "Nothing found."
msgstr "No s'ha trobat res."
-#: config/templates/language/overview.html:16 core/templates/index.html:147
-#: core/templates/index.html:199 manager/templates/calendar/month.html:132
+#: config/templates/language/overview.html:16 core/templates/index.html:137
+#: core/templates/index.html:189 manager/templates/calendar/month.html:132
#: manager/templates/schedule/overview.html:28
#: manager/templates/schedule/view.html:146
#: manager/templates/workout/overview.html:28
@@ -79,7 +79,7 @@ msgstr "Afegeix-ne un ara."
#: gym/templates/gym/member_list.html:244
#: gym/templates/gym/member_list.html:281
#: mailer/templates/mailer/gym/overview.html:43
-#: weight/templates/overview.html:78
+#: weight/templates/overview.html:61
msgid "Add"
msgstr "Afegeix"
@@ -117,14 +117,14 @@ msgstr "Mostra"
#: config/templates/language/view.html:91 core/templates/user/api_key.html:44
#: core/templates/user/preferences.html:28
-#: exercises/templates/exercise/view.html:273
-#: exercises/templates/exercise/view.html:296 gym/models/contract.py:200
+#: exercises/templates/exercise/view.html:323
+#: exercises/templates/exercise/view.html:346 gym/models/contract.py:200
#: gym/templates/contract/view.html:41 gym/templates/contract/view.html:106
#: gym/templates/gym/member_list.html:248
#: manager/templates/schedule/view.html:281
#: manager/templates/workout/view.html:206
#: nutrition/templates/ingredient/view.html:226
-#: nutrition/templates/plan/view.html:411 weight/templates/overview.html:62
+#: nutrition/templates/plan/view.html:411 weight/templates/overview.html:45
msgid "Options"
msgstr "Opcions"
@@ -138,12 +138,12 @@ msgstr "Opcions"
#: core/templates/weight_unit/list.html:17
#: exercises/templates/categories/admin-overview.html:16
#: exercises/templates/equipment/admin-overview.html:16
-#: exercises/templates/exercise/view.html:180
-#: exercises/templates/exercise/view.html:301
+#: exercises/templates/exercise/view.html:230
+#: exercises/templates/exercise/view.html:351
#: exercises/templates/muscles/admin-overview.html:16
-#: exercises/views/comments.py:63 gallery/views/images.py:96
-#: gym/templates/admin_notes/list.html:32 gym/templates/contract/list.html:31
-#: gym/templates/contract/view.html:107
+#: exercises/views/comments.py:63 exercises/views/videos.py:69
+#: gallery/views/images.py:96 gym/templates/admin_notes/list.html:32
+#: gym/templates/contract/list.html:31 gym/templates/contract/view.html:107
#: gym/templates/contract_option/list.html:31
#: gym/templates/contract_type/list.html:31 gym/templates/document/list.html:38
#: gym/templates/gym/list.html:19 gym/templates/gym/list.html:43
@@ -168,9 +168,9 @@ msgstr "Edita"
#: exercises/templates/categories/admin-overview.html:17
#: exercises/templates/equipment/admin-overview.html:17
#: exercises/templates/exercise/view.html:68
-#: exercises/templates/exercise/view.html:155
-#: exercises/templates/exercise/view.html:185
-#: exercises/templates/exercise/view.html:306
+#: exercises/templates/exercise/view.html:205
+#: exercises/templates/exercise/view.html:235
+#: exercises/templates/exercise/view.html:356
#: exercises/templates/muscles/admin-overview.html:17
#: gym/templates/admin_notes/list.html:40
#: gym/templates/contract_option/list.html:39
@@ -609,11 +609,11 @@ msgstr "Esteu segur que voleu esborrar això? Aquesta acció no es pot desfer."
msgid "Dashboard"
msgstr "Consola"
-#: core/templates/index.html:31 manager/templates/calendar/month.html:115
+#: core/templates/index.html:21 manager/templates/calendar/month.html:115
msgid "Add log to day"
msgstr "Afegeix registre al dia"
-#: core/templates/index.html:35 manager/templates/calendar/month.html:120
+#: core/templates/index.html:25 manager/templates/calendar/month.html:120
msgid ""
"Click to add weight logs to a training\n"
"day in your current workout:"
@@ -621,7 +621,7 @@ msgstr ""
"Feu clic per a afegir registres de pes a un\n"
"dia del vostre entrenament:"
-#: core/templates/index.html:43 core/templates/index.html:83
+#: core/templates/index.html:33 core/templates/index.html:73
#: core/templates/misc/fragments/shariff_modal.html:29
#: core/templates/template.html:125 manager/templates/calendar/month.html:138
#: manager/templates/schedule/view.html:246
@@ -631,11 +631,11 @@ msgstr ""
msgid "Close"
msgstr "Tanca"
-#: core/templates/index.html:54 core/templates/index.html:203
+#: core/templates/index.html:44 core/templates/index.html:193
msgid "Add new diary entry"
msgstr "Afegeix nova entrada al diari"
-#: core/templates/index.html:59
+#: core/templates/index.html:49
msgid ""
"Click to add an entry to your nutrition diary for today. You can either log "
"a meal as you defined it, or entry any number of custom entries."
@@ -644,7 +644,7 @@ msgstr ""
"registrar un àpat com l'heu definit, o entrar qualsevol quantitat d'entrades "
"personalitzades."
-#: core/templates/index.html:67 core/templates/index.html:171
+#: core/templates/index.html:57 core/templates/index.html:161
#: core/templates/user/overview.html:171
#: nutrition/templates/ingredient/view.html:79
#: nutrition/templates/log/detail.html:40
@@ -661,11 +661,11 @@ msgstr ""
msgid "kcal"
msgstr "kcal"
-#: core/templates/index.html:79 nutrition/templates/plan/view.html:350
+#: core/templates/index.html:69 nutrition/templates/plan/view.html:350
msgid "Add custom diary entry"
msgstr "Afegeix entrada de diari personalitzada"
-#: core/templates/index.html:94 core/templates/index.html:102
+#: core/templates/index.html:84 core/templates/index.html:92
#: manager/models/day.py:34 manager/models/log.py:56
#: manager/models/session.py:60 manager/models/workout.py:109
#: manager/templates/schedule/view.html:105
@@ -676,11 +676,11 @@ msgstr "Afegeix entrada de diari personalitzada"
msgid "Workout"
msgstr "Entrenament"
-#: core/templates/index.html:128
+#: core/templates/index.html:118
msgid "This workout is part of a schedule:"
msgstr "Aquest entrenament és part d'un programa:"
-#: core/templates/index.html:133
+#: core/templates/index.html:123
msgid ""
"The current workout is selected from your active schedule or, if you don't "
"have one, simply by date."
@@ -688,25 +688,25 @@ msgstr ""
"L'entrenament actual se selecciona del vostre programa actiu o, si no en "
"teniu un, simplement per data."
-#: core/templates/index.html:142 manager/templates/calendar/month.html:188
+#: core/templates/index.html:132 manager/templates/calendar/month.html:188
msgid "Add new log"
msgstr "Afegeix nou registre"
-#: core/templates/index.html:147 core/templates/user/overview.html:58
+#: core/templates/index.html:137 core/templates/user/overview.html:58
#: manager/templates/calendar/month.html:128
#: manager/templates/schedule/view.html:146
#: manager/templates/workout/overview.html:28
msgid "No workouts found."
msgstr "No s'han trobat entrenaments."
-#: core/templates/index.html:157 nutrition/models/log.py:49
+#: core/templates/index.html:147 nutrition/models/log.py:49
#: nutrition/models/meal.py:49 nutrition/models/meal_item.py:47
#: nutrition/models/plan.py:94 nutrition/templates/plan/view.html:11
#: nutrition/templates/plan/view.html:19
msgid "Nutrition plan"
msgstr "Pla nutricional"
-#: core/templates/index.html:169 core/templates/user/overview.html:155
+#: core/templates/index.html:159 core/templates/user/overview.html:155
#: nutrition/models/ingredient.py:100
#: nutrition/templates/ingredient/view.html:77
#: nutrition/templates/log/detail.html:39
@@ -717,7 +717,7 @@ msgstr "Pla nutricional"
msgid "Energy"
msgstr "Energia"
-#: core/templates/index.html:175 core/templates/user/overview.html:156
+#: core/templates/index.html:165 core/templates/user/overview.html:156
#: nutrition/models/ingredient.py:105
#: nutrition/templates/ingredient/view.html:84
#: nutrition/templates/log/detail.html:52
@@ -727,7 +727,7 @@ msgstr "Energia"
msgid "Protein"
msgstr "Proteïna"
-#: core/templates/index.html:181 core/templates/user/overview.html:157
+#: core/templates/index.html:171 core/templates/user/overview.html:157
#: nutrition/models/ingredient.py:113
#: nutrition/templates/ingredient/view.html:90
#: nutrition/templates/log/detail.html:65
@@ -737,7 +737,7 @@ msgstr "Proteïna"
msgid "Carbohydrates"
msgstr "Carbohidrats"
-#: core/templates/index.html:187 core/templates/user/overview.html:158
+#: core/templates/index.html:177 core/templates/user/overview.html:158
#: nutrition/models/ingredient.py:131
#: nutrition/templates/ingredient/view.html:106
#: nutrition/templates/log/detail.html:91
@@ -747,11 +747,11 @@ msgstr "Carbohidrats"
msgid "Fat"
msgstr "Greix"
-#: core/templates/index.html:199 nutrition/templates/plan/overview.html:22
+#: core/templates/index.html:189 nutrition/templates/plan/overview.html:22
msgid "No nutrition plans."
msgstr "No s'han trobat plans nutricionals."
-#: core/templates/index.html:213 core/templates/user/overview.html:112
+#: core/templates/index.html:203 core/templates/user/overview.html:112
#: core/templates/user/overview.html:121 manager/forms.py:173
#: manager/helpers.py:89 manager/models/log.py:84 manager/models/setting.py:67
#: manager/templates/log/add.html:54 manager/templates/set/formset.html:12
@@ -760,11 +760,7 @@ msgstr "No s'han trobat plans nutricionals."
msgid "Weight"
msgstr "Pes"
-#: core/templates/index.html:217
-msgid "Your current weight is: "
-msgstr "El vostre pes actual es: "
-
-#: core/templates/index.html:248 core/templates/navigation.html:97
+#: core/templates/index.html:210 core/templates/navigation.html:97
#: weight/views.py:70
msgid "Add weight entry"
msgstr "Afegeix entrada de pes"
@@ -902,7 +898,7 @@ msgstr "Exercicis pendents de revisar"
msgid "Equipment"
msgstr "Equipament"
-#: core/templates/navigation.html:78 exercises/templates/exercise/view.html:208
+#: core/templates/navigation.html:78 exercises/templates/exercise/view.html:258
msgid "Muscles"
msgstr "Músculs"
@@ -1203,8 +1199,8 @@ msgid ""
"and can't be undone. "
msgstr ""
"Aquesta acció escborrarà el compte d'usuari \"%(username)s\".\n"
-"També eliminarà de forma irrevocable totes les dades associades ("
-"entrenaments, \n"
+"També eliminarà de forma irrevocable totes les dades associades "
+"(entrenaments, \n"
"registres, etc.) sense possibilitat de desfer-ho. "
#: core/templates/user/login.html:16
@@ -1252,7 +1248,7 @@ msgstr "Data"
#: core/templates/user/overview.html:35 core/templates/user/overview.html:154
#: exercises/models/exercise.py:61 exercises/templates/exercise/view.html:88
-#: exercises/views/exercises.py:189 gallery/models/image.py:70
+#: exercises/views/exercises.py:190 gallery/models/image.py:70
#: gym/models/contract.py:57 gym/models/contract.py:107
#: manager/models/day.py:37 manager/models/workout.py:62
#: measurements/models/measurement.py:79 nutrition/models/plan.py:69
@@ -1418,11 +1414,11 @@ msgstr "Opcions"
msgid "Change password"
msgstr "Canvia la contrasenya"
-#: core/templatetags/wger_extras.py:217
+#: core/templatetags/wger_extras.py:229
msgid "kg"
msgstr "kg"
-#: core/templatetags/wger_extras.py:219
+#: core/templatetags/wger_extras.py:231
#: nutrition/templates/ingredient/view.html:86
#: nutrition/templates/ingredient/view.html:92
#: nutrition/templates/ingredient/view.html:99
@@ -1434,28 +1430,28 @@ msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr "g"
-#: core/templatetags/wger_extras.py:222
+#: core/templatetags/wger_extras.py:234
msgid "lb"
msgstr "lb"
-#: core/templatetags/wger_extras.py:224
+#: core/templatetags/wger_extras.py:236
msgctxt "weight unit, i.e. ounces"
msgid "oz"
msgstr "oz"
#: core/views/languages.py:85 exercises/views/categories.py:121
-#: exercises/views/equipment.py:106 exercises/views/exercises.py:422
+#: exercises/views/equipment.py:106 exercises/views/exercises.py:423
#: exercises/views/images.py:128 exercises/views/muscles.py:118
-#: manager/views/schedule.py:311 manager/views/schedule_step.py:129
-#: manager/views/workout.py:268 manager/views/workout_session.py:141
-#: nutrition/views/ingredient.py:144 nutrition/views/plan.py:120
-#: nutrition/views/unit.py:111
+#: exercises/views/videos.py:129 manager/views/schedule.py:311
+#: manager/views/schedule_step.py:129 manager/views/workout.py:268
+#: manager/views/workout_session.py:141 nutrition/views/ingredient.py:144
+#: nutrition/views/plan.py:120 nutrition/views/unit.py:111
msgid "Successfully deleted"
msgstr "Esborrat amb èxit"
#: core/views/languages.py:93 core/views/license.py:103
#: core/views/repetition_units.py:115 core/views/weight_units.py:115
-#: exercises/views/categories.py:127 exercises/views/exercises.py:430
+#: exercises/views/categories.py:127 exercises/views/exercises.py:431
#: exercises/views/muscles.py:125 gallery/views/images.py:121
#: gym/views/admin_notes.py:196 gym/views/document.py:206 gym/views/gym.py:486
#: manager/views/schedule.py:318 manager/views/schedule_step.py:139
@@ -1469,7 +1465,7 @@ msgstr "Esborrar {0}?"
#: core/views/languages.py:111 core/views/license.py:84
#: core/views/repetition_units.py:85 core/views/user.py:456
#: core/views/weight_units.py:85 exercises/views/categories.py:97
-#: exercises/views/equipment.py:83 exercises/views/exercises.py:304
+#: exercises/views/equipment.py:83 exercises/views/exercises.py:305
#: exercises/views/muscles.py:105 gym/views/admin_notes.py:160
#: gym/views/config.py:68 gym/views/contract.py:186
#: gym/views/contract_option.py:123 gym/views/contract_type.py:123
@@ -1559,7 +1555,7 @@ msgstr "Músculs primaris"
#: exercises/models/base.py:64 exercises/templates/equipment/overview.html:71
#: exercises/templates/exercise/overview.html:76
-#: exercises/templates/exercise/view.html:218
+#: exercises/templates/exercise/view.html:268
#: exercises/templates/muscles/overview.html:73
msgid "Secondary muscles"
msgstr "Músculs secundaris"
@@ -1573,7 +1569,8 @@ msgid "Exercise Categories"
msgstr "Categories d'exercicis"
#: exercises/models/comment.py:34 exercises/models/image.py:75
-#: manager/forms.py:165 manager/helpers.py:89 manager/models/log.py:51
+#: exercises/models/video.py:82 manager/forms.py:165 manager/helpers.py:89
+#: manager/models/log.py:51
msgid "Exercise"
msgstr "Exercici"
@@ -1586,15 +1583,15 @@ msgstr "Un comentari sobre com fer aquest exercici correctament."
msgid "Language"
msgstr "Llengua"
-#: exercises/models/exercise.py:233 exercises/views/exercises.py:460
+#: exercises/models/exercise.py:237 exercises/views/exercises.py:461
msgid "Exercise was successfully added to the general database"
msgstr "L'exercici s'ha afegit amb èxit a la base de dades general"
-#: exercises/models/exercise.py:261
+#: exercises/models/exercise.py:265
msgid "New user submitted exercise"
msgstr "Nou exercici proposat per un usuari"
-#: exercises/models/exercise.py:263
+#: exercises/models/exercise.py:267
#, python-brace-format
msgid "The user {0} submitted a new exercise \"{1}\"."
msgstr "L'usuari {0} ha proposat un nou exercici «{1}»."
@@ -1658,6 +1655,56 @@ msgstr "L'usuari {0} ha proposat una nova imatge «{1}» per a l'exercici {2}."
msgid "In latin, e.g. \"Pectoralis major\""
msgstr "En llatí, p. e. «Pectoralis major»"
+#: exercises/models/video.py:41
+msgid "Maximum file size is 100MB."
+msgstr ""
+
+#: exercises/models/video.py:44 exercises/models/video.py:48
+msgid "File type is not supported"
+msgstr ""
+
+#: exercises/models/video.py:57
+#, fuzzy
+#| msgid "%(birthdate)s is not a valid birthdate"
+msgid "File is not a valid video"
+msgstr "%(birthdate)s no és una data de naixement vàlida"
+
+#: exercises/models/video.py:88
+#, fuzzy
+#| msgid "Main picture"
+msgid "Main video"
+msgstr "Imatge principal"
+
+#: exercises/models/video.py:94
+msgid "Video"
+msgstr ""
+
+#: exercises/models/video.py:101
+msgid "Size"
+msgstr ""
+
+#: exercises/models/video.py:108 manager/models/schedule_step.py:56
+msgid "Duration"
+msgstr "Duració"
+
+#: exercises/models/video.py:117
+msgid "Width"
+msgstr ""
+
+#: exercises/models/video.py:124
+#, fuzzy
+#| msgid "Weight"
+msgid "Height"
+msgstr "Pes"
+
+#: exercises/models/video.py:131
+msgid "Codec"
+msgstr ""
+
+#: exercises/models/video.py:139
+msgid "Codec, long name"
+msgstr ""
+
#: exercises/templates/equipment/admin-overview.html:4
msgid "Equipment list"
msgstr "Llista d'equipaments"
@@ -1673,7 +1720,7 @@ msgstr "Vista general d'equipaments"
#: exercises/templates/equipment/overview.html:69
#: exercises/templates/exercise/overview.html:74
-#: exercises/templates/exercise/view.html:214
+#: exercises/templates/exercise/view.html:264
#: exercises/templates/muscles/overview.html:71
msgid "Main muscles"
msgstr "Músculs principals"
@@ -1826,13 +1873,13 @@ msgid "Please select one of the options below."
msgstr "Seleccioneu una de les opcions següents."
#: exercises/templates/exercise/view.html:60
-#: exercises/templates/exercise/view.html:153
+#: exercises/templates/exercise/view.html:203
#: nutrition/templates/ingredient/view.html:38
msgid "Accept"
msgstr "Accepta"
#: exercises/templates/exercise/view.html:64
-#: exercises/templates/exercise/view.html:154
+#: exercises/templates/exercise/view.html:204
#: nutrition/templates/ingredient/view.html:42
msgid "Decline"
msgstr "Refusa"
@@ -1845,32 +1892,42 @@ msgstr "Imatges"
msgid "Add new image"
msgstr "Afegeix una nova imatge"
-#: exercises/templates/exercise/view.html:147
+#: exercises/templates/exercise/view.html:148
+msgid "Videos"
+msgstr ""
+
+#: exercises/templates/exercise/view.html:187 exercises/views/videos.py:94
+#, fuzzy
+#| msgid "Add new image"
+msgid "Add new video"
+msgstr "Afegeix una nova imatge"
+
+#: exercises/templates/exercise/view.html:197
msgid "Images pending review"
msgstr "Imatges pendents de revisió"
-#: exercises/templates/exercise/view.html:168
+#: exercises/templates/exercise/view.html:218
msgid "Comments for this exercise"
msgstr "Comentaris per a aquest exercici"
-#: exercises/templates/exercise/view.html:196
+#: exercises/templates/exercise/view.html:246
msgid "Add new comment"
msgstr "Afegeix un nou comentari"
-#: exercises/templates/exercise/view.html:210
+#: exercises/templates/exercise/view.html:260
msgid "The diagram shows the most used muscles on this exercise"
msgstr "El diagrama mostra els músculs més usats en aquest exercici"
-#: exercises/templates/exercise/view.html:251
+#: exercises/templates/exercise/view.html:301
#: manager/templates/workout/log.html:10 manager/templates/workout/log.html:11
msgid "Weight log"
msgstr "Registre del pes"
-#: exercises/templates/exercise/view.html:256
+#: exercises/templates/exercise/view.html:306
msgid "Exercise Variations"
msgstr "Variacions de l'exercici"
-#: exercises/templates/exercise/view.html:277
+#: exercises/templates/exercise/view.html:327
msgid "Submit a correction"
msgstr "Envia una esmena"
@@ -1907,31 +1964,31 @@ msgstr "Afegeix comentari de l'exercici"
msgid "Delete equipment?"
msgstr "Voleu esborrar l'equipament?"
-#: exercises/views/exercises.py:228
+#: exercises/views/exercises.py:229
#, python-format
msgid ""
"%(name_original)s is too similar to existing exercise \"%(exercise_name)s\""
msgstr ""
"%(name_original)s és massa semblant a l'exercici existent «%(exercise_name)s»"
-#: exercises/views/exercises.py:246
+#: exercises/views/exercises.py:247
msgid "Add exercise"
msgstr "Afegeix exercici"
-#: exercises/views/exercises.py:366
+#: exercises/views/exercises.py:367
msgid "Thank you. Once the changes are reviewed the exercise will be updated."
msgstr "Gràcies. Un cop els canvis es revisin l'exercici s'actualitzarà."
-#: exercises/views/exercises.py:379
+#: exercises/views/exercises.py:380
#, python-brace-format
msgid "Correct {0}"
msgstr "Corregeix {0}"
-#: exercises/views/exercises.py:421
+#: exercises/views/exercises.py:422
msgid "This will delete the exercise from all workouts."
msgstr "Això esborrarà l'exercici de tots els entrenaments."
-#: exercises/views/exercises.py:473
+#: exercises/views/exercises.py:474
msgid "Exercise was successfully marked as rejected"
msgstr "L'exercici s'ha marcat amb èxit com a refusat"
@@ -1943,6 +2000,11 @@ msgstr "Edita imatge de l'exercici"
msgid "Delete exercise image?"
msgstr "Voleu esborrar la imatge de l'exercici?"
+#: exercises/views/videos.py:144 nutrition/views/log.py:230
+#: nutrition/views/unit_ingredient.py:139
+msgid "Delete?"
+msgstr ""
+
#: gallery/templates/images/overview.html:62
msgid "Add image"
msgstr "Afegeix imatge"
@@ -2258,6 +2320,169 @@ msgstr "Afegeix usuari al gimnàs"
msgid "Edit gym"
msgstr "Edita el gimnàs"
+#: i18n.tpl:2
+msgid "Abs"
+msgstr ""
+
+#: i18n.tpl:3
+msgid "Arms"
+msgstr ""
+
+#: i18n.tpl:4
+msgid "Back"
+msgstr ""
+
+#: i18n.tpl:5
+msgid "Calves"
+msgstr ""
+
+#: i18n.tpl:6
+msgid "Chest"
+msgstr ""
+
+#: i18n.tpl:7
+msgid "Legs"
+msgstr ""
+
+#: i18n.tpl:8
+msgid "Shoulders"
+msgstr ""
+
+#: i18n.tpl:9
+msgid "Barbell"
+msgstr ""
+
+#: i18n.tpl:10
+msgid "Bench"
+msgstr ""
+
+#: i18n.tpl:11
+msgid "Dumbbell"
+msgstr ""
+
+#: i18n.tpl:12
+#, fuzzy
+#| msgid "Gym manager"
+msgid "Gym mat"
+msgstr "Director del gimnàs"
+
+#: i18n.tpl:13
+msgid "Incline bench"
+msgstr ""
+
+#: i18n.tpl:14
+msgid "Kettlebell"
+msgstr ""
+
+#: i18n.tpl:15
+msgid "none (bodyweight exercise)"
+msgstr ""
+
+#: i18n.tpl:16
+msgid "Pull-up bar"
+msgstr ""
+
+#: i18n.tpl:17
+msgid "Swiss Ball"
+msgstr ""
+
+#: i18n.tpl:18
+msgid "SZ-Bar"
+msgstr ""
+
+#: i18n.tpl:19
+msgid "Anterior deltoid"
+msgstr ""
+
+#: i18n.tpl:20
+msgid "Biceps brachii"
+msgstr ""
+
+#: i18n.tpl:21
+msgid "Biceps femoris"
+msgstr ""
+
+#: i18n.tpl:22
+msgid "Brachialis"
+msgstr ""
+
+#: i18n.tpl:23
+msgid "Gastrocnemius"
+msgstr ""
+
+#: i18n.tpl:24
+msgid "Gluteus maximus"
+msgstr ""
+
+#: i18n.tpl:25
+msgid "Latissimus dorsi"
+msgstr ""
+
+#: i18n.tpl:26
+msgid "Obliquus externus abdominis"
+msgstr ""
+
+#: i18n.tpl:27
+#, fuzzy
+#| msgid "In latin, e.g. \"Pectoralis major\""
+msgid "Pectoralis major"
+msgstr "En llatí, p. e. «Pectoralis major»"
+
+#: i18n.tpl:28
+msgid "Quadriceps femoris"
+msgstr ""
+
+#: i18n.tpl:29
+msgid "Rectus abdominis"
+msgstr ""
+
+#: i18n.tpl:30
+msgid "Serratus anterior"
+msgstr ""
+
+#: i18n.tpl:31
+msgid "Soleus"
+msgstr ""
+
+#: i18n.tpl:32
+msgid "Trapezius"
+msgstr ""
+
+#: i18n.tpl:33
+msgid "Triceps brachii"
+msgstr ""
+
+#: i18n.tpl:34
+msgid "Kilometers"
+msgstr ""
+
+#: i18n.tpl:35
+#, fuzzy
+#| msgid "Reps"
+msgid "Max Reps"
+msgstr "Repeticions"
+
+#: i18n.tpl:36
+msgid "Miles"
+msgstr ""
+
+#: i18n.tpl:37
+msgid "Minutes"
+msgstr ""
+
+#: i18n.tpl:38 manager/forms.py:169 manager/models/log.py:71
+#: manager/templates/set/add.html:53
+msgid "Repetitions"
+msgstr "Repeticions"
+
+#: i18n.tpl:39
+msgid "Seconds"
+msgstr ""
+
+#: i18n.tpl:40
+msgid "Until Failure"
+msgstr ""
+
#: mailer/forms.py:34 mailer/templates/mailer/gym/preview.html:32
msgctxt "As in \"email subject\""
msgid "Subject"
@@ -2338,11 +2563,6 @@ msgstr "Podeu cercar més d'un exercici, s'agruparan en un conjunt."
msgid "Unit"
msgstr "Unitat"
-#: manager/forms.py:169 manager/models/log.py:71
-#: manager/templates/set/add.html:53
-msgid "Repetitions"
-msgstr "Repeticions"
-
#: manager/forms.py:266
msgid "Type"
msgstr "Tipus"
@@ -2409,10 +2629,6 @@ msgstr ""
msgid "schedule"
msgstr "Programa"
-#: manager/models/schedule_step.py:56
-msgid "Duration"
-msgstr "Duració"
-
#: manager/models/schedule_step.py:57
msgid "The duration in weeks"
msgstr "La duració en setmanes"
@@ -2501,7 +2717,8 @@ msgstr "Una plantilla pública està disponible per a altres usuaris"
#: manager/models/workout.py:114
msgid "You must mark this workout as a template before declaring it public"
-msgstr "Heu de marcar aquest entrenament com a plantilla abans de fer-ho públic"
+msgstr ""
+"Heu de marcar aquest entrenament com a plantilla abans de fer-ho públic"
#: manager/templates/calendar/day.html:9 manager/templates/calendar/day.html:31
msgid "Workout log"
@@ -3439,10 +3656,6 @@ msgstr ""
msgid "Ingredient was successfully marked as rejected"
msgstr ""
-#: nutrition/views/log.py:230 nutrition/views/unit_ingredient.py:139
-msgid "Delete?"
-msgstr ""
-
#: nutrition/views/meal.py:55
msgid "Add new meal"
msgstr ""
@@ -3798,11 +4011,11 @@ msgstr ""
msgid "Re-Submit"
msgstr ""
-#: weight/templates/overview.html:68
+#: weight/templates/overview.html:51
msgid "Export as CSV"
msgstr ""
-#: weight/templates/overview.html:72
+#: weight/templates/overview.html:55
msgid "Import from spreadsheet"
msgstr ""
@@ -3819,3 +4032,6 @@ msgstr ""
#, python-format
msgid "Delete weight entry for the %s"
msgstr ""
+
+#~ msgid "Your current weight is: "
+#~ msgstr "El vostre pes actual es: "
diff --git a/wger/locale/cs/LC_MESSAGES/django.po b/wger/locale/cs/LC_MESSAGES/django.po
index a27dda491..973f8e87a 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: 2021-08-17 17:23+0200\n"
+"POT-Creation-Date: 2022-02-15 14:51+0100\n"
"PO-Revision-Date: 2021-04-15 07:27+0000\n"
"Last-Translator: Zrnek <[email protected]>\n"
"Language-Team: Czech <https://hosted.weblate.org/projects/wger/web/cs/>\n"
@@ -56,16 +56,16 @@ msgstr "Jazyky"
msgid "Nothing found."
msgstr "Nic nenalezeno"
-#: config/templates/language/overview.html:16 core/templates/index.html:147
-#: core/templates/index.html:199 manager/templates/calendar/month.html:132
+#: config/templates/language/overview.html:16 core/templates/index.html:137
+#: core/templates/index.html:189 manager/templates/calendar/month.html:132
#: manager/templates/schedule/overview.html:28
#: manager/templates/schedule/view.html:146
#: manager/templates/workout/overview.html:28
#: nutrition/templates/ingredient/overview.html:45
#: nutrition/templates/plan/overview.html:23
-#: nutrition/templates/plan/view.html:148
-#: nutrition/templates/plan/view.html:151
-#: nutrition/templates/plan/view.html:189
+#: nutrition/templates/plan/view.html:150
+#: nutrition/templates/plan/view.html:153
+#: nutrition/templates/plan/view.html:191
msgid "Add one now."
msgstr "Přidat nyní"
@@ -86,7 +86,7 @@ msgstr "Přidat nyní"
#: gym/templates/gym/member_list.html:244
#: gym/templates/gym/member_list.html:281
#: mailer/templates/mailer/gym/overview.html:43
-#: weight/templates/overview.html:78
+#: weight/templates/overview.html:61
msgid "Add"
msgstr "Přidat"
@@ -124,14 +124,14 @@ msgstr "Zobrazit"
#: config/templates/language/view.html:91 core/templates/user/api_key.html:44
#: core/templates/user/preferences.html:28
-#: exercises/templates/exercise/view.html:273
-#: exercises/templates/exercise/view.html:296 gym/models/contract.py:200
+#: exercises/templates/exercise/view.html:323
+#: exercises/templates/exercise/view.html:346 gym/models/contract.py:200
#: gym/templates/contract/view.html:41 gym/templates/contract/view.html:106
#: gym/templates/gym/member_list.html:248
#: manager/templates/schedule/view.html:281
#: manager/templates/workout/view.html:206
#: nutrition/templates/ingredient/view.html:226
-#: nutrition/templates/plan/view.html:409 weight/templates/overview.html:62
+#: nutrition/templates/plan/view.html:411 weight/templates/overview.html:45
msgid "Options"
msgstr "Nastavení"
@@ -145,12 +145,12 @@ msgstr "Nastavení"
#: core/templates/weight_unit/list.html:17
#: exercises/templates/categories/admin-overview.html:16
#: exercises/templates/equipment/admin-overview.html:16
-#: exercises/templates/exercise/view.html:180
-#: exercises/templates/exercise/view.html:301
+#: exercises/templates/exercise/view.html:230
+#: exercises/templates/exercise/view.html:351
#: exercises/templates/muscles/admin-overview.html:16
-#: exercises/views/comments.py:63 gallery/views/images.py:96
-#: gym/templates/admin_notes/list.html:32 gym/templates/contract/list.html:31
-#: gym/templates/contract/view.html:107
+#: exercises/views/comments.py:63 exercises/views/videos.py:69
+#: gallery/views/images.py:96 gym/templates/admin_notes/list.html:32
+#: gym/templates/contract/list.html:31 gym/templates/contract/view.html:107
#: gym/templates/contract_option/list.html:31
#: gym/templates/contract_type/list.html:31 gym/templates/document/list.html:38
#: gym/templates/gym/list.html:19 gym/templates/gym/list.html:43
@@ -161,7 +161,7 @@ msgstr "Nastavení"
#: manager/templates/calendar/partial_overview_table.html:18
#: manager/templates/schedule/view.html:121
#: nutrition/templates/ingredient/view.html:198
-#: nutrition/templates/plan/view.html:89 nutrition/templates/plan/view.html:124
+#: nutrition/templates/plan/view.html:89 nutrition/templates/plan/view.html:126
#: nutrition/templates/units/list.html:18
msgid "Edit"
msgstr "Upravit"
@@ -175,9 +175,9 @@ msgstr "Upravit"
#: exercises/templates/categories/admin-overview.html:17
#: exercises/templates/equipment/admin-overview.html:17
#: exercises/templates/exercise/view.html:68
-#: exercises/templates/exercise/view.html:155
-#: exercises/templates/exercise/view.html:185
-#: exercises/templates/exercise/view.html:306
+#: exercises/templates/exercise/view.html:205
+#: exercises/templates/exercise/view.html:235
+#: exercises/templates/exercise/view.html:356
#: exercises/templates/muscles/admin-overview.html:17
#: gym/templates/admin_notes/list.html:40
#: gym/templates/contract_option/list.html:39
@@ -190,7 +190,7 @@ msgstr "Upravit"
#: nutrition/templates/ingredient/view.html:199
#: nutrition/templates/ingredient/view.html:239
#: nutrition/templates/log/detail.html:197
-#: nutrition/templates/plan/view.html:95 nutrition/templates/plan/view.html:130
+#: nutrition/templates/plan/view.html:95 nutrition/templates/plan/view.html:132
#: nutrition/templates/units/list.html:20
msgid "Delete"
msgstr "Smazat"
@@ -322,7 +322,7 @@ msgid "Some way of answering you (e-mail, etc.)"
msgstr "Nějaký kontakt na váš (email, apod.)"
#: core/forms.py:265 exercises/models/comment.py:40 manager/models/set.py:60
-#: manager/models/setting.py:99 nutrition/models/log.py:61
+#: manager/models/setting.py:99 nutrition/models/log.py:71
msgid "Comment"
msgstr "Komentář"
@@ -464,7 +464,7 @@ msgstr ""
msgid "Age"
msgstr "Věk"
-#: core/models/profile.py:202 nutrition/forms.py:98
+#: core/models/profile.py:202 nutrition/forms.py:99
msgid "Height (cm)"
msgstr "Výška (cm)"
@@ -515,7 +515,7 @@ msgid "Total caloric intake, including e.g. any surplus"
msgstr "Celkový energetický příjem, který zahrnuje třeba jakýkoliv přebytek."
#: core/models/profile.py:305 nutrition/models/ingredient_weight_unit.py:45
-#: nutrition/models/log.py:80 nutrition/models/meal_item.py:58
+#: nutrition/models/log.py:90 nutrition/models/meal_item.py:58
msgid "Weight unit"
msgstr "Jednotka váhy"
@@ -555,9 +555,9 @@ msgstr "Součet všech hodin musí být 24"
#: gym/models/user_document.py:87 gym/templates/contract/view.html:50
#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:96
#: gym/views/gym.py:156 manager/models/schedule.py:55
-#: manager/models/workout.py:56 nutrition/models/ingredient.py:96
-#: nutrition/models/ingredient_category.py:26
-#: nutrition/models/weight_unit.py:38
+#: manager/models/workout.py:56 measurements/models/category.py:53
+#: nutrition/models/ingredient.py:96 nutrition/models/ingredient_category.py:26
+#: nutrition/models/meal.py:66 nutrition/models/weight_unit.py:38
#: nutrition/templates/ingredient/pending.html:15
#: nutrition/templates/ingredient/view.html:185
msgid "Name"
@@ -616,11 +616,11 @@ msgstr "Jsi si jistý, že to chceš smazat? Tuhle akci už nejde pak odvolat."
msgid "Dashboard"
msgstr "Nástěnka"
-#: core/templates/index.html:31 manager/templates/calendar/month.html:115
+#: core/templates/index.html:21 manager/templates/calendar/month.html:115
msgid "Add log to day"
msgstr "Přidat záznam ke dni"
-#: core/templates/index.html:35 manager/templates/calendar/month.html:120
+#: core/templates/index.html:25 manager/templates/calendar/month.html:120
msgid ""
"Click to add weight logs to a training\n"
"day in your current workout:"
@@ -628,7 +628,7 @@ msgstr ""
"Klikněte na přidat záznam váhy do\n"
"tréninkového dne v aktuálním tréninku."
-#: core/templates/index.html:43 core/templates/index.html:83
+#: core/templates/index.html:33 core/templates/index.html:73
#: core/templates/misc/fragments/shariff_modal.html:29
#: core/templates/template.html:125 manager/templates/calendar/month.html:138
#: manager/templates/schedule/view.html:246
@@ -638,11 +638,11 @@ msgstr ""
msgid "Close"
msgstr "Zavřít"
-#: core/templates/index.html:54 core/templates/index.html:203
+#: core/templates/index.html:44 core/templates/index.html:193
msgid "Add new diary entry"
msgstr "Přidat nový záznam"
-#: core/templates/index.html:59
+#: core/templates/index.html:49
msgid ""
"Click to add an entry to your nutrition diary for today. You can either log "
"a meal as you defined it, or entry any number of custom entries."
@@ -650,7 +650,7 @@ msgstr ""
"Klepni sem pro přidání do tvého nutričního deníku pro dnešní den. Můžeš buď "
"zapsat jídlo podle sebe nebo vložit jakékoliv množství vlastních záznamů."
-#: core/templates/index.html:67 core/templates/index.html:171
+#: core/templates/index.html:57 core/templates/index.html:161
#: core/templates/user/overview.html:171
#: nutrition/templates/ingredient/view.html:79
#: nutrition/templates/log/detail.html:40
@@ -659,19 +659,19 @@ msgstr ""
#: nutrition/templates/log/overview.html:7
#: nutrition/templates/log/overview.html:44
#: nutrition/templates/plan/overview.html:17
-#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:242
-#: nutrition/templates/plan/view.html:301
-#: nutrition/templates/plan/view.html:321
-#: nutrition/templates/plan/view.html:363
-#: nutrition/templates/plan/view.html:373
+#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:244
+#: nutrition/templates/plan/view.html:303
+#: nutrition/templates/plan/view.html:323
+#: nutrition/templates/plan/view.html:365
+#: nutrition/templates/plan/view.html:375
msgid "kcal"
msgstr "kcal"
-#: core/templates/index.html:79 nutrition/templates/plan/view.html:348
+#: core/templates/index.html:69 nutrition/templates/plan/view.html:350
msgid "Add custom diary entry"
msgstr "Vložit vlastní záznam"
-#: core/templates/index.html:94 core/templates/index.html:102
+#: core/templates/index.html:84 core/templates/index.html:92
#: manager/models/day.py:34 manager/models/log.py:56
#: manager/models/session.py:60 manager/models/workout.py:109
#: manager/templates/schedule/view.html:105
@@ -682,11 +682,11 @@ msgstr "Vložit vlastní záznam"
msgid "Workout"
msgstr "Trénink"
-#: core/templates/index.html:128
+#: core/templates/index.html:118
msgid "This workout is part of a schedule:"
msgstr "Tenhle trénink je součásti rozvrhu:"
-#: core/templates/index.html:133
+#: core/templates/index.html:123
msgid ""
"The current workout is selected from your active schedule or, if you don't "
"have one, simply by date."
@@ -694,70 +694,70 @@ msgstr ""
"Aktivní cvičení je vybráno z aktivního rozvrhu\n"
"nebo, pokud nemáte, bude vybráno podle data."
-#: core/templates/index.html:142 manager/templates/calendar/month.html:188
+#: core/templates/index.html:132 manager/templates/calendar/month.html:188
msgid "Add new log"
msgstr "Přidat nový záznam"
-#: core/templates/index.html:147 core/templates/user/overview.html:58
+#: core/templates/index.html:137 core/templates/user/overview.html:58
#: manager/templates/calendar/month.html:128
#: manager/templates/schedule/view.html:146
#: manager/templates/workout/overview.html:28
msgid "No workouts found."
msgstr "Žádný trénink"
-#: core/templates/index.html:157 nutrition/models/log.py:48
+#: core/templates/index.html:147 nutrition/models/log.py:49
#: nutrition/models/meal.py:49 nutrition/models/meal_item.py:47
#: nutrition/models/plan.py:94 nutrition/templates/plan/view.html:11
#: nutrition/templates/plan/view.html:19
msgid "Nutrition plan"
msgstr "Nutriční plán"
-#: core/templates/index.html:169 core/templates/user/overview.html:155
+#: core/templates/index.html:159 core/templates/user/overview.html:155
#: nutrition/models/ingredient.py:100
#: nutrition/templates/ingredient/view.html:77
#: nutrition/templates/log/detail.html:39
#: nutrition/templates/log/detail.html:156
-#: nutrition/templates/plan/view.html:53 nutrition/templates/plan/view.html:241
-#: nutrition/templates/plan/view.html:358
-#: nutrition/templates/plan/view.html:362 nutrition/views/plan.py:384
+#: nutrition/templates/plan/view.html:53 nutrition/templates/plan/view.html:243
+#: nutrition/templates/plan/view.html:360
+#: nutrition/templates/plan/view.html:364 nutrition/views/plan.py:384
msgid "Energy"
msgstr "Energie"
-#: core/templates/index.html:175 core/templates/user/overview.html:156
+#: core/templates/index.html:165 core/templates/user/overview.html:156
#: nutrition/models/ingredient.py:105
#: nutrition/templates/ingredient/view.html:84
#: nutrition/templates/log/detail.html:52
#: nutrition/templates/log/detail.html:174
-#: nutrition/templates/plan/view.html:54 nutrition/templates/plan/view.html:249
+#: nutrition/templates/plan/view.html:54 nutrition/templates/plan/view.html:251
#: nutrition/views/plan.py:390
msgid "Protein"
msgstr "Bílkoviny"
-#: core/templates/index.html:181 core/templates/user/overview.html:157
+#: core/templates/index.html:171 core/templates/user/overview.html:157
#: nutrition/models/ingredient.py:113
#: nutrition/templates/ingredient/view.html:90
#: nutrition/templates/log/detail.html:65
#: nutrition/templates/log/detail.html:175
-#: nutrition/templates/plan/view.html:55 nutrition/templates/plan/view.html:255
+#: nutrition/templates/plan/view.html:55 nutrition/templates/plan/view.html:257
#: nutrition/views/plan.py:398
msgid "Carbohydrates"
msgstr "Sacharidy"
-#: core/templates/index.html:187 core/templates/user/overview.html:158
+#: core/templates/index.html:177 core/templates/user/overview.html:158
#: nutrition/models/ingredient.py:131
#: nutrition/templates/ingredient/view.html:106
#: nutrition/templates/log/detail.html:91
#: nutrition/templates/log/detail.html:176
-#: nutrition/templates/plan/view.html:56 nutrition/templates/plan/view.html:268
+#: nutrition/templates/plan/view.html:56 nutrition/templates/plan/view.html:270
#: nutrition/views/plan.py:412
msgid "Fat"
msgstr "Tuky"
-#: core/templates/index.html:199 nutrition/templates/plan/overview.html:22
+#: core/templates/index.html:189 nutrition/templates/plan/overview.html:22
msgid "No nutrition plans."
msgstr "Žádný nutriční plán."
-#: core/templates/index.html:213 core/templates/user/overview.html:112
+#: core/templates/index.html:203 core/templates/user/overview.html:112
#: core/templates/user/overview.html:121 manager/forms.py:173
#: manager/helpers.py:89 manager/models/log.py:84 manager/models/setting.py:67
#: manager/templates/log/add.html:54 manager/templates/set/formset.html:12
@@ -766,11 +766,7 @@ msgstr "Žádný nutriční plán."
msgid "Weight"
msgstr "Váha"
-#: core/templates/index.html:217
-msgid "Your current weight is: "
-msgstr "Nyní vážíte:"
-
-#: core/templates/index.html:248 core/templates/navigation.html:97
+#: core/templates/index.html:210 core/templates/navigation.html:97
#: weight/views.py:70
msgid "Add weight entry"
msgstr "Zaznamenat váhu"
@@ -802,7 +798,7 @@ msgstr "Seznam licencí"
msgid "Nothing found"
msgstr "Nic nenalezeno"
-#: core/templates/misc/about.html:4 core/templates/template.html:201
+#: core/templates/misc/about.html:4 core/templates/template.html:175
#: core/templates/template_features.html:118
#: core/templates/template_no_context.html:88
msgid "Imprint"
@@ -820,8 +816,8 @@ msgstr ""
"povolit externí přístup."
#: core/templates/misc/fragments/shariff_modal.html:22
-#: nutrition/templates/plan/view.html:385
-#: nutrition/templates/plan/view.html:394
+#: nutrition/templates/plan/view.html:387
+#: nutrition/templates/plan/view.html:396
msgid "That's done here"
msgstr "A je to provedo"
@@ -913,7 +909,7 @@ msgstr "Cvik čeká na zkontrolování"
msgid "Equipment"
msgstr "Nářadí"
-#: core/templates/navigation.html:78 exercises/templates/exercise/view.html:208
+#: core/templates/navigation.html:78 exercises/templates/exercise/view.html:258
msgid "Muscles"
msgstr "Svaly"
@@ -986,7 +982,7 @@ msgstr "Dokumentace vývojáře"
msgid "Get the code"
msgstr "Získat kód."
-#: core/templates/navigation.html:175 core/templates/template.html:193
+#: core/templates/navigation.html:175 core/templates/template.html:205
#: core/templates/template_features.html:100
msgid "Translate"
msgstr "Překlad"
@@ -1140,15 +1136,11 @@ msgstr "Využíváte testovací účet. Data zde vložená budou po týdnu smaz
msgid "Create some demo entries"
msgstr "Vytvořit nějaké testovací potraviny"
-#: core/templates/template.html:202 core/templates/template_features.html:122
+#: core/templates/template.html:176 core/templates/template_features.html:122
#: core/templates/template_no_context.html:89 software/templates/tos.html:7
msgid "Terms of service"
msgstr "Obecná pravidla."
-#: core/templates/template.html:209 core/templates/template.html:210
-msgid "Released under the Affero GPL"
-msgstr "Uvolněno pod licencí Affero GPL"
-
#: core/templates/template_features.html:62 software/templates/features.html:9
#: software/templates/features.html:120
msgid "Features"
@@ -1254,9 +1246,10 @@ msgstr "Přidat trénink"
#: core/templates/user/overview.html:120 core/templates/user/overview.html:153
#: exercises/models/exercise.py:77 gallery/models/image.py:47
#: manager/helpers.py:88 manager/models/log.py:98 manager/models/session.py:67
-#: nutrition/models/ingredient.py:85 nutrition/models/ingredient.py:87
-#: nutrition/models/ingredient.py:190 nutrition/templates/log/overview.html:30
-#: nutrition/templates/plan/view.html:307 weight/models.py:32
+#: measurements/models/measurement.py:64 nutrition/models/ingredient.py:85
+#: nutrition/models/ingredient.py:87 nutrition/models/ingredient.py:190
+#: nutrition/templates/log/overview.html:30
+#: nutrition/templates/plan/view.html:309 weight/models.py:32
#: weight/templates/import_csv_preview.html:13
#: weight/templates/import_csv_preview.html:42 weight/views.py:150
msgid "Date"
@@ -1264,10 +1257,10 @@ msgstr "Datum"
#: core/templates/user/overview.html:35 core/templates/user/overview.html:154
#: exercises/models/exercise.py:61 exercises/templates/exercise/view.html:88
-#: exercises/views/exercises.py:189 gallery/models/image.py:70
+#: exercises/views/exercises.py:190 gallery/models/image.py:70
#: gym/models/contract.py:57 gym/models/contract.py:107
#: manager/models/day.py:37 manager/models/workout.py:62
-#: nutrition/models/plan.py:69
+#: measurements/models/measurement.py:79 nutrition/models/plan.py:69
msgid "Description"
msgstr "Popis"
@@ -1428,11 +1421,11 @@ msgstr "Nastavení"
msgid "Change password"
msgstr "Změna hesla"
-#: core/templatetags/wger_extras.py:217
+#: core/templatetags/wger_extras.py:229
msgid "kg"
msgstr "kg"
-#: core/templatetags/wger_extras.py:219
+#: core/templatetags/wger_extras.py:231
#: nutrition/templates/ingredient/view.html:86
#: nutrition/templates/ingredient/view.html:92
#: nutrition/templates/ingredient/view.html:99
@@ -1444,28 +1437,28 @@ msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr "g"
-#: core/templatetags/wger_extras.py:222
+#: core/templatetags/wger_extras.py:234
msgid "lb"
msgstr "lb"
-#: core/templatetags/wger_extras.py:224
+#: core/templatetags/wger_extras.py:236
msgctxt "weight unit, i.e. ounces"
msgid "oz"
msgstr "oz"
#: core/views/languages.py:85 exercises/views/categories.py:121
-#: exercises/views/equipment.py:106 exercises/views/exercises.py:422
+#: exercises/views/equipment.py:106 exercises/views/exercises.py:423
#: exercises/views/images.py:128 exercises/views/muscles.py:118
-#: manager/views/schedule.py:311 manager/views/schedule_step.py:129
-#: manager/views/workout.py:268 manager/views/workout_session.py:141
-#: nutrition/views/ingredient.py:144 nutrition/views/plan.py:120
-#: nutrition/views/unit.py:111
+#: exercises/views/videos.py:129 manager/views/schedule.py:311
+#: manager/views/schedule_step.py:129 manager/views/workout.py:268
+#: manager/views/workout_session.py:141 nutrition/views/ingredient.py:144
+#: nutrition/views/plan.py:120 nutrition/views/unit.py:111
msgid "Successfully deleted"
msgstr "Úspěšně smazáno"
#: core/views/languages.py:93 core/views/license.py:103
#: core/views/repetition_units.py:115 core/views/weight_units.py:115
-#: exercises/views/categories.py:127 exercises/views/exercises.py:430
+#: exercises/views/categories.py:127 exercises/views/exercises.py:431
#: exercises/views/muscles.py:125 gallery/views/images.py:121
#: gym/views/admin_notes.py:196 gym/views/document.py:206 gym/views/gym.py:486
#: manager/views/schedule.py:318 manager/views/schedule_step.py:139
@@ -1479,7 +1472,7 @@ msgstr "Smazat {0}?"
#: core/views/languages.py:111 core/views/license.py:84
#: core/views/repetition_units.py:85 core/views/user.py:456
#: core/views/weight_units.py:85 exercises/views/categories.py:97
-#: exercises/views/equipment.py:83 exercises/views/exercises.py:304
+#: exercises/views/equipment.py:83 exercises/views/exercises.py:305
#: exercises/views/muscles.py:105 gym/views/admin_notes.py:160
#: gym/views/config.py:68 gym/views/contract.py:186
#: gym/views/contract_option.py:123 gym/views/contract_type.py:123
@@ -1569,7 +1562,7 @@ msgstr "Hlavní svaly"
#: exercises/models/base.py:64 exercises/templates/equipment/overview.html:71
#: exercises/templates/exercise/overview.html:76
-#: exercises/templates/exercise/view.html:218
+#: exercises/templates/exercise/view.html:268
#: exercises/templates/muscles/overview.html:73
msgid "Secondary muscles"
msgstr "Vedlejší svaly"
@@ -1582,8 +1575,9 @@ msgstr "Variace"
msgid "Exercise Categories"
msgstr "Kategorie cviků"
-#: exercises/models/comment.py:34 exercises/models/image.py:62
-#: manager/forms.py:165 manager/helpers.py:89 manager/models/log.py:51
+#: exercises/models/comment.py:34 exercises/models/image.py:75
+#: exercises/models/video.py:82 manager/forms.py:165 manager/helpers.py:89
+#: manager/models/log.py:51
msgid "Exercise"
msgstr "Cvik"
@@ -1596,32 +1590,54 @@ msgstr "Komentář o tom, jak správně provést tento cvik"
msgid "Language"
msgstr "Jazyk"
-#: exercises/models/exercise.py:233 exercises/views/exercises.py:460
+#: exercises/models/exercise.py:237 exercises/views/exercises.py:461
msgid "Exercise was successfully added to the general database"
msgstr "Cvičení bylo přidáno do základní databáze"
-#: exercises/models/exercise.py:261
+#: exercises/models/exercise.py:265
msgid "New user submitted exercise"
msgstr "Uživatel zaslal nový cvik"
-#: exercises/models/exercise.py:263
+#: exercises/models/exercise.py:267
#, python-brace-format
msgid "The user {0} submitted a new exercise \"{1}\"."
msgstr "Uživatel {0} zaslal nový cvik \"{1}\"."
-#: exercises/models/image.py:68 gallery/models/image.py:56
+#: exercises/models/image.py:59
+msgid "Line"
+msgstr ""
+
+#: exercises/models/image.py:60
+msgid "3D"
+msgstr ""
+
+#: exercises/models/image.py:61
+msgid "Low-poly"
+msgstr ""
+
+#: exercises/models/image.py:62
+msgid "Photo"
+msgstr ""
+
+#: exercises/models/image.py:63
+#, fuzzy
+#| msgid "Others"
+msgid "Other"
+msgstr "Další"
+
+#: exercises/models/image.py:81 gallery/models/image.py:56
msgid "Image"
msgstr "Obrázek"
-#: exercises/models/image.py:69 gallery/models/image.py:57
+#: exercises/models/image.py:82 gallery/models/image.py:57
msgid "Only PNG and JPEG formats are supported"
msgstr "Podporovány jsou pouze formáty PNG a JPEG"
-#: exercises/models/image.py:75
+#: exercises/models/image.py:88
msgid "Main picture"
msgstr "Hlavní obrázek"
-#: exercises/models/image.py:78
+#: exercises/models/image.py:91
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 "
@@ -1631,11 +1647,15 @@ msgstr ""
"(například se zobrazí při hledání). Hlavní obrázek bude automaticky "
"zvýrazněn systémem."
-#: exercises/models/image.py:166
+#: exercises/models/image.py:100
+msgid "The art style of your image"
+msgstr ""
+
+#: exercises/models/image.py:185
msgid "New user submitted image"
msgstr "Uživatel zaslal nový obrázek"
-#: exercises/models/image.py:167
+#: exercises/models/image.py:186
#, python-brace-format
msgid "The user {0} submitted a new image \"{1}\" for exercise {2}."
msgstr "Uživatel {0} zaslal nový obrázek \"{1}\" ke cviku {2}."
@@ -1644,6 +1664,58 @@ msgstr "Uživatel {0} zaslal nový obrázek \"{1}\" ke cviku {2}."
msgid "In latin, e.g. \"Pectoralis major\""
msgstr "v latině, např. \"Pectoralis major\""
+#: exercises/models/video.py:41
+msgid "Maximum file size is 100MB."
+msgstr ""
+
+#: exercises/models/video.py:44 exercises/models/video.py:48
+msgid "File type is not supported"
+msgstr ""
+
+#: exercises/models/video.py:57
+#, fuzzy
+#| msgid "%(birthdate)s is not a valid birthdate"
+msgid "File is not a valid video"
+msgstr "%(birthdate)s není správné datum narození"
+
+#: exercises/models/video.py:88
+#, fuzzy
+#| msgid "Main picture"
+msgid "Main video"
+msgstr "Hlavní obrázek"
+
+#: exercises/models/video.py:94
+msgid "Video"
+msgstr ""
+
+#: exercises/models/video.py:101
+msgid "Size"
+msgstr ""
+
+#: exercises/models/video.py:108 manager/models/schedule_step.py:56
+msgid "Duration"
+msgstr "Trvání"
+
+#: exercises/models/video.py:117
+msgid "Width"
+msgstr ""
+
+#: exercises/models/video.py:124
+#, fuzzy
+#| msgid "Weight"
+msgid "Height"
+msgstr "Váha"
+
+#: exercises/models/video.py:131
+#, fuzzy
+#| msgid "Code"
+msgid "Codec"
+msgstr "Kód"
+
+#: exercises/models/video.py:139
+msgid "Codec, long name"
+msgstr ""
+
#: exercises/templates/equipment/admin-overview.html:4
msgid "Equipment list"
msgstr "Seznam nářadí"
@@ -1659,7 +1731,7 @@ msgstr "Přehled přístrojů"
#: exercises/templates/equipment/overview.html:69
#: exercises/templates/exercise/overview.html:74
-#: exercises/templates/exercise/view.html:214
+#: exercises/templates/exercise/view.html:264
#: exercises/templates/muscles/overview.html:71
msgid "Main muscles"
msgstr "Hlavní svaly"
@@ -1782,7 +1854,8 @@ msgstr "Datum zaslání"
#: gym/templates/gym/new_user.html:22
#: gym/templates/gym/reset_user_password.html:20 manager/models/log.py:45
#: manager/models/schedule.py:44 manager/models/session.py:49
-#: manager/models/workout.py:89 nutrition/models/plan.py:55
+#: manager/models/workout.py:89 measurements/models/category.py:48
+#: measurements/models/measurement.py:59 nutrition/models/plan.py:55
#: nutrition/templates/ingredient/pending.html:16 weight/models.py:41
msgid "User"
msgstr "Uživatel"
@@ -1809,13 +1882,13 @@ msgid "Please select one of the options below."
msgstr "Prosím vyberte jednu z níže uvedených možností"
#: exercises/templates/exercise/view.html:60
-#: exercises/templates/exercise/view.html:153
+#: exercises/templates/exercise/view.html:203
#: nutrition/templates/ingredient/view.html:38
msgid "Accept"
msgstr "Povolit"
#: exercises/templates/exercise/view.html:64
-#: exercises/templates/exercise/view.html:154
+#: exercises/templates/exercise/view.html:204
#: nutrition/templates/ingredient/view.html:42
msgid "Decline"
msgstr "Zamítnout"
@@ -1828,32 +1901,42 @@ msgstr "Obrázky"
msgid "Add new image"
msgstr "Přidat nový obrázek"
-#: exercises/templates/exercise/view.html:147
+#: exercises/templates/exercise/view.html:148
+msgid "Videos"
+msgstr ""
+
+#: exercises/templates/exercise/view.html:187 exercises/views/videos.py:94
+#, fuzzy
+#| msgid "Add new image"
+msgid "Add new video"
+msgstr "Přidat nový obrázek"
+
+#: exercises/templates/exercise/view.html:197
msgid "Images pending review"
msgstr "Obrázky čekající na zkontrolování"
-#: exercises/templates/exercise/view.html:168
+#: exercises/templates/exercise/view.html:218
msgid "Comments for this exercise"
msgstr "Komentáře pro tento cvik"
-#: exercises/templates/exercise/view.html:196
+#: exercises/templates/exercise/view.html:246
msgid "Add new comment"
msgstr "Přidat nový komentář"
-#: exercises/templates/exercise/view.html:210
+#: exercises/templates/exercise/view.html:260
msgid "The diagram shows the most used muscles on this exercise"
msgstr "Obrázek zobrazuje, jaké svaly budou při tomto cviku nejvíc zapojeny"
-#: exercises/templates/exercise/view.html:251
+#: exercises/templates/exercise/view.html:301
#: manager/templates/workout/log.html:10 manager/templates/workout/log.html:11
msgid "Weight log"
msgstr "Záznam váhy"
-#: exercises/templates/exercise/view.html:256
+#: exercises/templates/exercise/view.html:306
msgid "Exercise Variations"
msgstr "Variace cvičení"
-#: exercises/templates/exercise/view.html:277
+#: exercises/templates/exercise/view.html:327
msgid "Submit a correction"
msgstr "Zaslat opravu"
@@ -1890,7 +1973,7 @@ msgstr "Přidat komentář ke cviku"
msgid "Delete equipment?"
msgstr "Smazat nářadí?"
-#: exercises/views/exercises.py:228
+#: exercises/views/exercises.py:229
#, python-format
msgid ""
"%(name_original)s is too similar to existing exercise \"%(exercise_name)s\""
@@ -1898,24 +1981,24 @@ msgstr ""
"%(name_original)sje příliš podobné již existujícímu cvičení "
"\"%(exercise_name)s\""
-#: exercises/views/exercises.py:246
+#: exercises/views/exercises.py:247
msgid "Add exercise"
msgstr "Přidat cvik"
-#: exercises/views/exercises.py:366
+#: exercises/views/exercises.py:367
msgid "Thank you. Once the changes are reviewed the exercise will be updated."
msgstr "Děkujeme. Jakmile budou změny zkontrolovány, dojde k aktualizaci."
-#: exercises/views/exercises.py:379
+#: exercises/views/exercises.py:380
#, python-brace-format
msgid "Correct {0}"
msgstr "Správné {0}"
-#: exercises/views/exercises.py:421
+#: exercises/views/exercises.py:422
msgid "This will delete the exercise from all workouts."
msgstr "To smaže všechny cviky ze všech tréninků."
-#: exercises/views/exercises.py:473
+#: exercises/views/exercises.py:474
msgid "Exercise was successfully marked as rejected"
msgstr "Cvik byl označen jako zamítnutý"
@@ -1927,6 +2010,11 @@ msgstr "Upravit obrázek cviku"
msgid "Delete exercise image?"
msgstr "Smazat obrázek cviku?"
+#: exercises/views/videos.py:144 nutrition/views/log.py:230
+#: nutrition/views/unit_ingredient.py:139
+msgid "Delete?"
+msgstr "Smazat?"
+
#: gallery/templates/images/overview.html:62
#, fuzzy
#| msgid "Add new image"
@@ -1995,8 +2083,8 @@ msgid "Contract type"
msgstr "Typ zakázky"
#: gym/models/contract.py:208 gym/templates/contract/view.html:59
-#: manager/templates/log/add.html:52 nutrition/forms.py:58
-#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:92
+#: manager/templates/log/add.html:52 nutrition/forms.py:59
+#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:102
#: nutrition/models/meal_item.py:72
msgid "Amount"
msgstr "Množství"
@@ -2443,6 +2531,7 @@ msgstr ""
"potřebujete"
#: mailer/templates/mailer/gym/preview.html:22
+#: software/templates/about_us.html:59
msgid "Current version"
msgstr "Aktuální verze"
@@ -2480,7 +2569,8 @@ msgstr ""
#: manager/models/log.py:90 manager/models/setting.py:47
#: manager/models/setting.py:78 manager/templates/log/add.html:53
#: manager/templates/log/add.html:55 manager/templates/set/formset.html:11
-#: manager/templates/set/formset.html:13 nutrition/forms.py:62
+#: manager/templates/set/formset.html:13 measurements/models/category.py:58
+#: nutrition/forms.py:63
msgid "Unit"
msgstr "Jednotka"
@@ -2550,10 +2640,6 @@ msgstr ""
msgid "schedule"
msgstr "rozvrh"
-#: manager/models/schedule_step.py:56
-msgid "Duration"
-msgstr "Trvání"
-
#: manager/models/schedule_step.py:57
msgid "The duration in weeks"
msgstr "Trvání v týdnech"
@@ -2838,7 +2924,7 @@ msgstr ""
#: manager/templates/schedule/view.html:290
#: manager/templates/workout/view.html:142
#: manager/templates/workout/view.html:217
-#: nutrition/templates/plan/view.html:415
+#: nutrition/templates/plan/view.html:417
msgid "Download as PDF"
msgstr "Stáhnout jako PDF"
@@ -3084,23 +3170,27 @@ msgstr "Nový dojem z tréninku pro {0}"
msgid "This will delete all weight logs for this day as well."
msgstr "Toto smaže všechny záznamy váhy pro tento den"
-#: nutrition/forms.py:121
+#: measurements/models/measurement.py:69
+msgid "Value"
+msgstr ""
+
+#: nutrition/forms.py:122
msgid "Calculate"
msgstr "Výpočet"
-#: nutrition/forms.py:194 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:195 nutrition/templates/rate/form.html:76
msgid "Basic caloric intake"
msgstr "Základní energetický příjem"
-#: nutrition/forms.py:195
+#: nutrition/forms.py:196
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:201
+#: nutrition/forms.py:202
msgid "Additional calories"
msgstr "Přidat kalorie"
-#: nutrition/forms.py:203
+#: nutrition/forms.py:204
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
@@ -3108,8 +3198,8 @@ msgstr ""
"Další kalorie můžete přidat k základní hodnotě (pokud chcete odečíst, "
"zadejte záporné číslo)"
-#: nutrition/forms.py:231 nutrition/models/ingredient_weight_unit.py:39
-#: nutrition/models/log.py:71 nutrition/models/meal_item.py:53
+#: nutrition/forms.py:232 nutrition/models/ingredient_weight_unit.py:39
+#: nutrition/models/log.py:81 nutrition/models/meal_item.py:53
#: nutrition/templates/log/detail.html:155
msgid "Ingredient"
msgstr "Potravina"
@@ -3128,14 +3218,14 @@ msgstr "V g na 100g produktu"
#: nutrition/models/ingredient.py:123
#: nutrition/templates/ingredient/view.html:96
#: nutrition/templates/log/detail.html:78
-#: nutrition/templates/plan/view.html:262 nutrition/views/plan.py:406
+#: nutrition/templates/plan/view.html:264 nutrition/views/plan.py:406
msgid "Sugar content in carbohydrates"
msgstr "Cukr v sacharidech"
#: nutrition/models/ingredient.py:141
#: nutrition/templates/ingredient/view.html:112
#: nutrition/templates/log/detail.html:104
-#: nutrition/templates/plan/view.html:274 nutrition/views/plan.py:420
+#: nutrition/templates/plan/view.html:276 nutrition/views/plan.py:420
msgid "Saturated fat content in fats"
msgstr "Nasycené mastné kyseliny"
@@ -3143,7 +3233,7 @@ msgstr "Nasycené mastné kyseliny"
#: nutrition/templates/ingredient/view.html:134
#: nutrition/templates/log/detail.html:122
#: nutrition/templates/log/detail.html:178
-#: nutrition/templates/plan/view.html:285 nutrition/views/plan.py:426
+#: nutrition/templates/plan/view.html:287 nutrition/views/plan.py:426
msgid "Fibres"
msgstr "Vláknina"
@@ -3151,7 +3241,7 @@ msgstr "Vláknina"
#: nutrition/templates/ingredient/view.html:144
#: nutrition/templates/log/detail.html:135
#: nutrition/templates/log/detail.html:181
-#: nutrition/templates/plan/view.html:291 nutrition/views/plan.py:432
+#: nutrition/templates/plan/view.html:293 nutrition/views/plan.py:432
msgid "Sodium"
msgstr "Sodík"
@@ -3198,10 +3288,20 @@ 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:55
+msgid "Meal"
+msgstr "Jídlo"
+
#: nutrition/models/meal.py:61
msgid "Time (approx)"
msgstr "Čas (cca)"
+#: nutrition/models/meal.py:68
+msgid ""
+"Give meals a textual description / name such as \"Breakfast\" or \"after "
+"workout\""
+msgstr ""
+
#: nutrition/models/plan.py:71
msgid ""
"A description of the goal of the plan, e.g. \"Gain mass\" or \"Prepare for "
@@ -3351,12 +3451,12 @@ msgstr ""
#: nutrition/templates/ingredient/view.html:71
#: nutrition/templates/log/detail.html:31
-#: nutrition/templates/plan/view.html:227 nutrition/views/plan.py:376
+#: nutrition/templates/plan/view.html:229 nutrition/views/plan.py:376
msgid "Macronutrients"
msgstr "Makroživiny"
#: nutrition/templates/ingredient/view.html:80
-#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:244
+#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:246
msgid "kJ"
msgstr "kJ"
@@ -3369,7 +3469,7 @@ msgstr "neuvedeno"
#: nutrition/templates/ingredient/view.html:128
#: nutrition/templates/log/detail.html:119
-#: nutrition/templates/plan/view.html:282
+#: nutrition/templates/plan/view.html:284
msgid "Others"
msgstr "Další"
@@ -3398,7 +3498,7 @@ msgstr "Smazat ingredience"
#: nutrition/templates/log/detail.html:7
#: nutrition/templates/log/overview.html:7
-#: nutrition/templates/plan/view.html:300
+#: nutrition/templates/plan/view.html:302
msgid "Nutrition diary"
msgstr "Nutriční deník"
@@ -3408,13 +3508,13 @@ msgstr "Naplánováno"
#: nutrition/templates/log/detail.html:33
#: nutrition/templates/log/overview.html:31
-#: nutrition/templates/plan/view.html:308
+#: nutrition/templates/plan/view.html:310
msgid "Logged"
msgstr "Zaznamenáno"
#: nutrition/templates/log/detail.html:34
#: nutrition/templates/log/overview.html:32
-#: nutrition/templates/plan/view.html:309
+#: nutrition/templates/plan/view.html:311
msgid "Difference"
msgstr "Rozdíl"
@@ -3427,7 +3527,7 @@ msgid "g"
msgstr "g"
#: nutrition/templates/log/overview.html:53
-#: nutrition/templates/plan/view.html:330
+#: nutrition/templates/plan/view.html:332
msgid "nothing found"
msgstr "nic nenalezeno"
@@ -3447,56 +3547,56 @@ msgstr "Zaznamenat toto jídlo"
msgid "Add ingredient to meal"
msgstr "Přidat ingredienci do jídla"
-#: nutrition/templates/plan/view.html:150
+#: nutrition/templates/plan/view.html:152
msgid "No items for this meal."
msgstr "Žádné potraviny pro toto jídlo."
-#: nutrition/templates/plan/view.html:188
+#: nutrition/templates/plan/view.html:190
msgid "No meals for this plan."
msgstr "Tento plán je bez stravy"
-#: nutrition/templates/plan/view.html:200
+#: nutrition/templates/plan/view.html:202
msgid "Log this Plan"
msgstr "Zaznamenat tento plán"
-#: nutrition/templates/plan/view.html:206
+#: nutrition/templates/plan/view.html:208
msgid "Add a new meal"
msgstr "Přidat nové jídlo"
-#: nutrition/templates/plan/view.html:216 nutrition/views/plan.py:369
+#: nutrition/templates/plan/view.html:218 nutrition/views/plan.py:369
msgid "Nutritional data"
msgstr "Nutriční data"
-#: nutrition/templates/plan/view.html:219
+#: nutrition/templates/plan/view.html:221
#, python-format
msgid "Based on the weight entry dated %(date)s (%(weight)s)"
msgstr "Založeno na záznamu váhy ze dne %(date)s (%(weight)s)"
-#: nutrition/templates/plan/view.html:228 nutrition/views/plan.py:377
+#: nutrition/templates/plan/view.html:230 nutrition/views/plan.py:377
msgid "Total"
msgstr "Celkem"
-#: nutrition/templates/plan/view.html:229 nutrition/views/plan.py:378
+#: nutrition/templates/plan/view.html:231 nutrition/views/plan.py:378
msgid "Percent of energy"
msgstr "Procent z energie"
-#: nutrition/templates/plan/view.html:232 nutrition/views/plan.py:379
+#: nutrition/templates/plan/view.html:234 nutrition/views/plan.py:379
msgid "g per body kg"
msgstr "g na kg tělesné váhy"
-#: nutrition/templates/plan/view.html:234
+#: nutrition/templates/plan/view.html:236
msgid "oz per body lb"
msgstr "oz na lb tělesné váhy"
-#: nutrition/templates/plan/view.html:338
+#: nutrition/templates/plan/view.html:340
msgid "View complete nutrition log"
msgstr "Zobrazit kompletní nutriční log"
-#: nutrition/templates/plan/view.html:371
+#: nutrition/templates/plan/view.html:373
msgid "Goal"
msgstr "Cíl"
-#: nutrition/templates/plan/view.html:382
+#: nutrition/templates/plan/view.html:384
#, fuzzy
#| msgid ""
#| "You have selected that this nutritional plan has a\n"
@@ -3510,7 +3610,7 @@ msgstr ""
"Zvolili jste, že tento nutriční plán má jako cíl\n"
"množství kalorií. Použijte kalkulačku, nebo zadejte hodnotu sami."
-#: nutrition/templates/plan/view.html:392
+#: nutrition/templates/plan/view.html:394
msgid ""
"If you find the ingredient list too short, you might want to activate the "
"preference to also show English ingredients."
@@ -3518,15 +3618,15 @@ msgstr ""
"Pokud seznam jídel je malý, můžete si aktivovat v nastevení, aby se také "
"zobrazovali jídla v Angličtině."
-#: nutrition/templates/plan/view.html:421
+#: nutrition/templates/plan/view.html:423
msgid "Edit nutrition plan"
msgstr "Upravit nutriční plán"
-#: nutrition/templates/plan/view.html:425
+#: nutrition/templates/plan/view.html:427
msgid "Make a copy of this nutrition plan"
msgstr "Vytvořit kopii tohoto nutričního plánu"
-#: nutrition/templates/plan/view.html:431
+#: nutrition/templates/plan/view.html:433
msgid "Delete nutrition plan"
msgstr "Smazat nutriční plán"
@@ -3620,10 +3720,6 @@ msgstr "Přidat novou složku"
msgid "Ingredient was successfully marked as rejected"
msgstr "Složka byla označena jako zamítnuta"
-#: nutrition/views/log.py:229 nutrition/views/unit_ingredient.py:139
-msgid "Delete?"
-msgstr "Smazat?"
-
#: nutrition/views/meal.py:55
msgid "Add new meal"
msgstr "Přidat nové jídlo"
@@ -4038,11 +4134,11 @@ msgstr ""
msgid "Re-Submit"
msgstr "Znovu poslat"
-#: weight/templates/overview.html:68
+#: weight/templates/overview.html:51
msgid "Export as CSV"
msgstr "Exportovat do CSV"
-#: weight/templates/overview.html:72
+#: weight/templates/overview.html:55
msgid "Import from spreadsheet"
msgstr "Importovat z tabulky"
@@ -4060,6 +4156,12 @@ msgstr "Úspěšně smazáno."
msgid "Delete weight entry for the %s"
msgstr "Vymazat záznam váhy pro %s"
+#~ msgid "Your current weight is: "
+#~ msgstr "Nyní vážíte:"
+
+#~ msgid "Released under the Affero GPL"
+#~ msgstr "Uvolněno pod licencí Affero GPL"
+
#~ msgid "Responsible for the content of this site as per German law §5 TMG:"
#~ msgstr ""
#~ "Zodpovědnou osobou za obsah na stránce je dle Německého práva §5 TMG:"
@@ -4217,9 +4319,6 @@ msgstr "Vymazat záznam váhy pro %s"
#~ "Překlady jdou snadno spravovat a upravovat online, pokud máte zájem,\n"
#~ "jděte na stránku transifex a požádejte o přístup a my vám jej nastavíme."
-#~ msgid "Code"
-#~ msgstr "Kód"
-
#~ msgid ""
#~ "Obviously, you are highly encouraged to clone the\n"
#~ "repo and start hacking! Once you are ready, send a pull request and we\n"
@@ -4365,9 +4464,6 @@ msgstr "Vymazat záznam váhy pro %s"
#~ msgid "Pause!"
#~ msgstr "Pauza!"
-#~ msgid "Meal"
-#~ msgstr "Jídlo"
-
#~ msgid "There is no chart here because there are no weight entries."
#~ msgstr ""
#~ "V tuto chvíli zde žádná tabulka není, protože nejsou vloženy záznamy o "
diff --git a/wger/locale/da/LC_MESSAGES/django.po b/wger/locale/da/LC_MESSAGES/django.po
index 1221473d7..36a2167ab 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: 2021-08-17 17:23+0200\n"
+"POT-Creation-Date: 2022-02-15 14:51+0100\n"
"PO-Revision-Date: 2021-10-14 06:50+0000\n"
"Last-Translator: Roland Geider <[email protected]>\n"
"Language-Team: Danish <https://hosted.weblate.org/projects/wger/web/da/>\n"
@@ -51,16 +51,16 @@ msgstr "Sprog"
msgid "Nothing found."
msgstr "Intet fundet."
-#: config/templates/language/overview.html:16 core/templates/index.html:147
-#: core/templates/index.html:199 manager/templates/calendar/month.html:132
+#: config/templates/language/overview.html:16 core/templates/index.html:137
+#: core/templates/index.html:189 manager/templates/calendar/month.html:132
#: manager/templates/schedule/overview.html:28
#: manager/templates/schedule/view.html:146
#: manager/templates/workout/overview.html:28
#: nutrition/templates/ingredient/overview.html:45
#: nutrition/templates/plan/overview.html:23
-#: nutrition/templates/plan/view.html:148
-#: nutrition/templates/plan/view.html:151
-#: nutrition/templates/plan/view.html:189
+#: nutrition/templates/plan/view.html:150
+#: nutrition/templates/plan/view.html:153
+#: nutrition/templates/plan/view.html:191
msgid "Add one now."
msgstr "Tilføj en ny."
@@ -81,7 +81,7 @@ msgstr "Tilføj en ny."
#: gym/templates/gym/member_list.html:244
#: gym/templates/gym/member_list.html:281
#: mailer/templates/mailer/gym/overview.html:43
-#: weight/templates/overview.html:78
+#: weight/templates/overview.html:61
msgid "Add"
msgstr "Tilføj"
@@ -119,14 +119,14 @@ msgstr "Vis"
#: config/templates/language/view.html:91 core/templates/user/api_key.html:44
#: core/templates/user/preferences.html:28
-#: exercises/templates/exercise/view.html:273
-#: exercises/templates/exercise/view.html:296 gym/models/contract.py:200
+#: exercises/templates/exercise/view.html:323
+#: exercises/templates/exercise/view.html:346 gym/models/contract.py:200
#: gym/templates/contract/view.html:41 gym/templates/contract/view.html:106
#: gym/templates/gym/member_list.html:248
#: manager/templates/schedule/view.html:281
#: manager/templates/workout/view.html:206
#: nutrition/templates/ingredient/view.html:226
-#: nutrition/templates/plan/view.html:409 weight/templates/overview.html:62
+#: nutrition/templates/plan/view.html:411 weight/templates/overview.html:45
msgid "Options"
msgstr "Indstillinger"
@@ -140,12 +140,12 @@ msgstr "Indstillinger"
#: core/templates/weight_unit/list.html:17
#: exercises/templates/categories/admin-overview.html:16
#: exercises/templates/equipment/admin-overview.html:16
-#: exercises/templates/exercise/view.html:180
-#: exercises/templates/exercise/view.html:301
+#: exercises/templates/exercise/view.html:230
+#: exercises/templates/exercise/view.html:351
#: exercises/templates/muscles/admin-overview.html:16
-#: exercises/views/comments.py:63 gallery/views/images.py:96
-#: gym/templates/admin_notes/list.html:32 gym/templates/contract/list.html:31
-#: gym/templates/contract/view.html:107
+#: exercises/views/comments.py:63 exercises/views/videos.py:69
+#: gallery/views/images.py:96 gym/templates/admin_notes/list.html:32
+#: gym/templates/contract/list.html:31 gym/templates/contract/view.html:107
#: gym/templates/contract_option/list.html:31
#: gym/templates/contract_type/list.html:31 gym/templates/document/list.html:38
#: gym/templates/gym/list.html:19 gym/templates/gym/list.html:43
@@ -156,7 +156,7 @@ msgstr "Indstillinger"
#: manager/templates/calendar/partial_overview_table.html:18
#: manager/templates/schedule/view.html:121
#: nutrition/templates/ingredient/view.html:198
-#: nutrition/templates/plan/view.html:89 nutrition/templates/plan/view.html:124
+#: nutrition/templates/plan/view.html:89 nutrition/templates/plan/view.html:126
#: nutrition/templates/units/list.html:18
msgid "Edit"
msgstr "Rediger"
@@ -170,9 +170,9 @@ msgstr "Rediger"
#: exercises/templates/categories/admin-overview.html:17
#: exercises/templates/equipment/admin-overview.html:17
#: exercises/templates/exercise/view.html:68
-#: exercises/templates/exercise/view.html:155
-#: exercises/templates/exercise/view.html:185
-#: exercises/templates/exercise/view.html:306
+#: exercises/templates/exercise/view.html:205
+#: exercises/templates/exercise/view.html:235
+#: exercises/templates/exercise/view.html:356
#: exercises/templates/muscles/admin-overview.html:17
#: gym/templates/admin_notes/list.html:40
#: gym/templates/contract_option/list.html:39
@@ -185,7 +185,7 @@ msgstr "Rediger"
#: nutrition/templates/ingredient/view.html:199
#: nutrition/templates/ingredient/view.html:239
#: nutrition/templates/log/detail.html:197
-#: nutrition/templates/plan/view.html:95 nutrition/templates/plan/view.html:130
+#: nutrition/templates/plan/view.html:95 nutrition/templates/plan/view.html:132
#: nutrition/templates/units/list.html:20
msgid "Delete"
msgstr "Slet"
@@ -313,7 +313,7 @@ msgid "Some way of answering you (e-mail, etc.)"
msgstr "Måder du kan kontaktes på (email, etc.)"
#: core/forms.py:265 exercises/models/comment.py:40 manager/models/set.py:60
-#: manager/models/setting.py:99 nutrition/models/log.py:61
+#: manager/models/setting.py:99 nutrition/models/log.py:71
msgid "Comment"
msgstr "Kommentar"
@@ -442,7 +442,7 @@ msgstr ""
msgid "Age"
msgstr ""
-#: core/models/profile.py:202 nutrition/forms.py:98
+#: core/models/profile.py:202 nutrition/forms.py:99
msgid "Height (cm)"
msgstr ""
@@ -493,7 +493,7 @@ msgid "Total caloric intake, including e.g. any surplus"
msgstr ""
#: core/models/profile.py:305 nutrition/models/ingredient_weight_unit.py:45
-#: nutrition/models/log.py:80 nutrition/models/meal_item.py:58
+#: nutrition/models/log.py:90 nutrition/models/meal_item.py:58
msgid "Weight unit"
msgstr ""
@@ -528,9 +528,9 @@ msgstr ""
#: gym/models/user_document.py:87 gym/templates/contract/view.html:50
#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:96
#: gym/views/gym.py:156 manager/models/schedule.py:55
-#: manager/models/workout.py:56 nutrition/models/ingredient.py:96
-#: nutrition/models/ingredient_category.py:26
-#: nutrition/models/weight_unit.py:38
+#: manager/models/workout.py:56 measurements/models/category.py:53
+#: nutrition/models/ingredient.py:96 nutrition/models/ingredient_category.py:26
+#: nutrition/models/meal.py:66 nutrition/models/weight_unit.py:38
#: nutrition/templates/ingredient/pending.html:15
#: nutrition/templates/ingredient/view.html:185
msgid "Name"
@@ -586,17 +586,17 @@ msgstr ""
msgid "Dashboard"
msgstr ""
-#: core/templates/index.html:31 manager/templates/calendar/month.html:115
+#: core/templates/index.html:21 manager/templates/calendar/month.html:115
msgid "Add log to day"
msgstr ""
-#: core/templates/index.html:35 manager/templates/calendar/month.html:120
+#: core/templates/index.html:25 manager/templates/calendar/month.html:120
msgid ""
"Click to add weight logs to a training\n"
"day in your current workout:"
msgstr ""
-#: core/templates/index.html:43 core/templates/index.html:83
+#: core/templates/index.html:33 core/templates/index.html:73
#: core/templates/misc/fragments/shariff_modal.html:29
#: core/templates/template.html:125 manager/templates/calendar/month.html:138
#: manager/templates/schedule/view.html:246
@@ -606,17 +606,17 @@ msgstr ""
msgid "Close"
msgstr ""
-#: core/templates/index.html:54 core/templates/index.html:203
+#: core/templates/index.html:44 core/templates/index.html:193
msgid "Add new diary entry"
msgstr ""
-#: core/templates/index.html:59
+#: core/templates/index.html:49
msgid ""
"Click to add an entry to your nutrition diary for today. You can either log "
"a meal as you defined it, or entry any number of custom entries."
msgstr ""
-#: core/templates/index.html:67 core/templates/index.html:171
+#: core/templates/index.html:57 core/templates/index.html:161
#: core/templates/user/overview.html:171
#: nutrition/templates/ingredient/view.html:79
#: nutrition/templates/log/detail.html:40
@@ -625,19 +625,19 @@ msgstr ""
#: nutrition/templates/log/overview.html:7
#: nutrition/templates/log/overview.html:44
#: nutrition/templates/plan/overview.html:17
-#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:242
-#: nutrition/templates/plan/view.html:301
-#: nutrition/templates/plan/view.html:321
-#: nutrition/templates/plan/view.html:363
-#: nutrition/templates/plan/view.html:373
+#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:244
+#: nutrition/templates/plan/view.html:303
+#: nutrition/templates/plan/view.html:323
+#: nutrition/templates/plan/view.html:365
+#: nutrition/templates/plan/view.html:375
msgid "kcal"
msgstr ""
-#: core/templates/index.html:79 nutrition/templates/plan/view.html:348
+#: core/templates/index.html:69 nutrition/templates/plan/view.html:350
msgid "Add custom diary entry"
msgstr ""
-#: core/templates/index.html:94 core/templates/index.html:102
+#: core/templates/index.html:84 core/templates/index.html:92
#: manager/models/day.py:34 manager/models/log.py:56
#: manager/models/session.py:60 manager/models/workout.py:109
#: manager/templates/schedule/view.html:105
@@ -648,80 +648,80 @@ msgstr ""
msgid "Workout"
msgstr ""
-#: core/templates/index.html:128
+#: core/templates/index.html:118
msgid "This workout is part of a schedule:"
msgstr ""
-#: core/templates/index.html:133
+#: core/templates/index.html:123
msgid ""
"The current workout is selected from your active schedule or, if you don't "
"have one, simply by date."
msgstr ""
-#: core/templates/index.html:142 manager/templates/calendar/month.html:188
+#: core/templates/index.html:132 manager/templates/calendar/month.html:188
msgid "Add new log"
msgstr ""
-#: core/templates/index.html:147 core/templates/user/overview.html:58
+#: core/templates/index.html:137 core/templates/user/overview.html:58
#: manager/templates/calendar/month.html:128
#: manager/templates/schedule/view.html:146
#: manager/templates/workout/overview.html:28
msgid "No workouts found."
msgstr ""
-#: core/templates/index.html:157 nutrition/models/log.py:48
+#: core/templates/index.html:147 nutrition/models/log.py:49
#: nutrition/models/meal.py:49 nutrition/models/meal_item.py:47
#: nutrition/models/plan.py:94 nutrition/templates/plan/view.html:11
#: nutrition/templates/plan/view.html:19
msgid "Nutrition plan"
msgstr ""
-#: core/templates/index.html:169 core/templates/user/overview.html:155
+#: core/templates/index.html:159 core/templates/user/overview.html:155
#: nutrition/models/ingredient.py:100
#: nutrition/templates/ingredient/view.html:77
#: nutrition/templates/log/detail.html:39
#: nutrition/templates/log/detail.html:156
-#: nutrition/templates/plan/view.html:53 nutrition/templates/plan/view.html:241
-#: nutrition/templates/plan/view.html:358
-#: nutrition/templates/plan/view.html:362 nutrition/views/plan.py:384
+#: nutrition/templates/plan/view.html:53 nutrition/templates/plan/view.html:243
+#: nutrition/templates/plan/view.html:360
+#: nutrition/templates/plan/view.html:364 nutrition/views/plan.py:384
msgid "Energy"
msgstr ""
-#: core/templates/index.html:175 core/templates/user/overview.html:156
+#: core/templates/index.html:165 core/templates/user/overview.html:156
#: nutrition/models/ingredient.py:105
#: nutrition/templates/ingredient/view.html:84
#: nutrition/templates/log/detail.html:52
#: nutrition/templates/log/detail.html:174
-#: nutrition/templates/plan/view.html:54 nutrition/templates/plan/view.html:249
+#: nutrition/templates/plan/view.html:54 nutrition/templates/plan/view.html:251
#: nutrition/views/plan.py:390
msgid "Protein"
msgstr ""
-#: core/templates/index.html:181 core/templates/user/overview.html:157
+#: core/templates/index.html:171 core/templates/user/overview.html:157
#: nutrition/models/ingredient.py:113
#: nutrition/templates/ingredient/view.html:90
#: nutrition/templates/log/detail.html:65
#: nutrition/templates/log/detail.html:175
-#: nutrition/templates/plan/view.html:55 nutrition/templates/plan/view.html:255
+#: nutrition/templates/plan/view.html:55 nutrition/templates/plan/view.html:257
#: nutrition/views/plan.py:398
msgid "Carbohydrates"
msgstr ""
-#: core/templates/index.html:187 core/templates/user/overview.html:158
+#: core/templates/index.html:177 core/templates/user/overview.html:158
#: nutrition/models/ingredient.py:131
#: nutrition/templates/ingredient/view.html:106
#: nutrition/templates/log/detail.html:91
#: nutrition/templates/log/detail.html:176
-#: nutrition/templates/plan/view.html:56 nutrition/templates/plan/view.html:268
+#: nutrition/templates/plan/view.html:56 nutrition/templates/plan/view.html:270
#: nutrition/views/plan.py:412
msgid "Fat"
msgstr ""
-#: core/templates/index.html:199 nutrition/templates/plan/overview.html:22
+#: core/templates/index.html:189 nutrition/templates/plan/overview.html:22
msgid "No nutrition plans."
msgstr ""
-#: core/templates/index.html:213 core/templates/user/overview.html:112
+#: core/templates/index.html:203 core/templates/user/overview.html:112
#: core/templates/user/overview.html:121 manager/forms.py:173
#: manager/helpers.py:89 manager/models/log.py:84 manager/models/setting.py:67
#: manager/templates/log/add.html:54 manager/templates/set/formset.html:12
@@ -730,11 +730,7 @@ msgstr ""
msgid "Weight"
msgstr ""
-#: core/templates/index.html:217
-msgid "Your current weight is: "
-msgstr ""
-
-#: core/templates/index.html:248 core/templates/navigation.html:97
+#: core/templates/index.html:210 core/templates/navigation.html:97
#: weight/views.py:70
msgid "Add weight entry"
msgstr ""
@@ -766,7 +762,7 @@ msgstr ""
msgid "Nothing found"
msgstr ""
-#: core/templates/misc/about.html:4 core/templates/template.html:201
+#: core/templates/misc/about.html:4 core/templates/template.html:175
#: core/templates/template_features.html:118
#: core/templates/template_no_context.html:88
msgid "Imprint"
@@ -782,8 +778,8 @@ msgid ""
msgstr ""
#: core/templates/misc/fragments/shariff_modal.html:22
-#: nutrition/templates/plan/view.html:385
-#: nutrition/templates/plan/view.html:394
+#: nutrition/templates/plan/view.html:387
+#: nutrition/templates/plan/view.html:396
msgid "That's done here"
msgstr ""
@@ -869,7 +865,7 @@ msgstr ""
msgid "Equipment"
msgstr ""
-#: core/templates/navigation.html:78 exercises/templates/exercise/view.html:208
+#: core/templates/navigation.html:78 exercises/templates/exercise/view.html:258
msgid "Muscles"
msgstr ""
@@ -942,7 +938,7 @@ msgstr ""
msgid "Get the code"
msgstr ""
-#: core/templates/navigation.html:175 core/templates/template.html:193
+#: core/templates/navigation.html:175 core/templates/template.html:205
#: core/templates/template_features.html:100
msgid "Translate"
msgstr ""
@@ -1091,15 +1087,11 @@ msgstr ""
msgid "Create some demo entries"
msgstr ""
-#: core/templates/template.html:202 core/templates/template_features.html:122
+#: core/templates/template.html:176 core/templates/template_features.html:122
#: core/templates/template_no_context.html:89 software/templates/tos.html:7
msgid "Terms of service"
msgstr ""
-#: core/templates/template.html:209 core/templates/template.html:210
-msgid "Released under the Affero GPL"
-msgstr ""
-
#: core/templates/template_features.html:62 software/templates/features.html:9
#: software/templates/features.html:120
msgid "Features"
@@ -1196,9 +1188,10 @@ msgstr ""
#: core/templates/user/overview.html:120 core/templates/user/overview.html:153
#: exercises/models/exercise.py:77 gallery/models/image.py:47
#: manager/helpers.py:88 manager/models/log.py:98 manager/models/session.py:67
-#: nutrition/models/ingredient.py:85 nutrition/models/ingredient.py:87
-#: nutrition/models/ingredient.py:190 nutrition/templates/log/overview.html:30
-#: nutrition/templates/plan/view.html:307 weight/models.py:32
+#: measurements/models/measurement.py:64 nutrition/models/ingredient.py:85
+#: nutrition/models/ingredient.py:87 nutrition/models/ingredient.py:190
+#: nutrition/templates/log/overview.html:30
+#: nutrition/templates/plan/view.html:309 weight/models.py:32
#: weight/templates/import_csv_preview.html:13
#: weight/templates/import_csv_preview.html:42 weight/views.py:150
msgid "Date"
@@ -1206,10 +1199,10 @@ msgstr ""
#: core/templates/user/overview.html:35 core/templates/user/overview.html:154
#: exercises/models/exercise.py:61 exercises/templates/exercise/view.html:88
-#: exercises/views/exercises.py:189 gallery/models/image.py:70
+#: exercises/views/exercises.py:190 gallery/models/image.py:70
#: gym/models/contract.py:57 gym/models/contract.py:107
#: manager/models/day.py:37 manager/models/workout.py:62
-#: nutrition/models/plan.py:69
+#: measurements/models/measurement.py:79 nutrition/models/plan.py:69
msgid "Description"
msgstr ""
@@ -1370,11 +1363,11 @@ msgstr ""
msgid "Change password"
msgstr ""
-#: core/templatetags/wger_extras.py:217
+#: core/templatetags/wger_extras.py:229
msgid "kg"
msgstr ""
-#: core/templatetags/wger_extras.py:219
+#: core/templatetags/wger_extras.py:231
#: nutrition/templates/ingredient/view.html:86
#: nutrition/templates/ingredient/view.html:92
#: nutrition/templates/ingredient/view.html:99
@@ -1386,28 +1379,28 @@ msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr ""
-#: core/templatetags/wger_extras.py:222
+#: core/templatetags/wger_extras.py:234
msgid "lb"
msgstr ""
-#: core/templatetags/wger_extras.py:224
+#: core/templatetags/wger_extras.py:236
msgctxt "weight unit, i.e. ounces"
msgid "oz"
msgstr ""
#: core/views/languages.py:85 exercises/views/categories.py:121
-#: exercises/views/equipment.py:106 exercises/views/exercises.py:422
+#: exercises/views/equipment.py:106 exercises/views/exercises.py:423
#: exercises/views/images.py:128 exercises/views/muscles.py:118
-#: manager/views/schedule.py:311 manager/views/schedule_step.py:129
-#: manager/views/workout.py:268 manager/views/workout_session.py:141
-#: nutrition/views/ingredient.py:144 nutrition/views/plan.py:120
-#: nutrition/views/unit.py:111
+#: exercises/views/videos.py:129 manager/views/schedule.py:311
+#: manager/views/schedule_step.py:129 manager/views/workout.py:268
+#: manager/views/workout_session.py:141 nutrition/views/ingredient.py:144
+#: nutrition/views/plan.py:120 nutrition/views/unit.py:111
msgid "Successfully deleted"
msgstr ""
#: core/views/languages.py:93 core/views/license.py:103
#: core/views/repetition_units.py:115 core/views/weight_units.py:115
-#: exercises/views/categories.py:127 exercises/views/exercises.py:430
+#: exercises/views/categories.py:127 exercises/views/exercises.py:431
#: exercises/views/muscles.py:125 gallery/views/images.py:121
#: gym/views/admin_notes.py:196 gym/views/document.py:206 gym/views/gym.py:486
#: manager/views/schedule.py:318 manager/views/schedule_step.py:139
@@ -1421,7 +1414,7 @@ msgstr ""
#: core/views/languages.py:111 core/views/license.py:84
#: core/views/repetition_units.py:85 core/views/user.py:456
#: core/views/weight_units.py:85 exercises/views/categories.py:97
-#: exercises/views/equipment.py:83 exercises/views/exercises.py:304
+#: exercises/views/equipment.py:83 exercises/views/exercises.py:305
#: exercises/views/muscles.py:105 gym/views/admin_notes.py:160
#: gym/views/config.py:68 gym/views/contract.py:186
#: gym/views/contract_option.py:123 gym/views/contract_type.py:123
@@ -1508,7 +1501,7 @@ msgstr ""
#: exercises/models/base.py:64 exercises/templates/equipment/overview.html:71
#: exercises/templates/exercise/overview.html:76
-#: exercises/templates/exercise/view.html:218
+#: exercises/templates/exercise/view.html:268
#: exercises/templates/muscles/overview.html:73
msgid "Secondary muscles"
msgstr ""
@@ -1521,8 +1514,9 @@ msgstr ""
msgid "Exercise Categories"
msgstr ""
-#: exercises/models/comment.py:34 exercises/models/image.py:62
-#: manager/forms.py:165 manager/helpers.py:89 manager/models/log.py:51
+#: exercises/models/comment.py:34 exercises/models/image.py:75
+#: exercises/models/video.py:82 manager/forms.py:165 manager/helpers.py:89
+#: manager/models/log.py:51
msgid "Exercise"
msgstr ""
@@ -1535,43 +1529,67 @@ msgstr ""
msgid "Language"
msgstr ""
-#: exercises/models/exercise.py:233 exercises/views/exercises.py:460
+#: exercises/models/exercise.py:237 exercises/views/exercises.py:461
msgid "Exercise was successfully added to the general database"
msgstr ""
-#: exercises/models/exercise.py:261
+#: exercises/models/exercise.py:265
msgid "New user submitted exercise"
msgstr ""
-#: exercises/models/exercise.py:263
+#: exercises/models/exercise.py:267
#, python-brace-format
msgid "The user {0} submitted a new exercise \"{1}\"."
msgstr ""
-#: exercises/models/image.py:68 gallery/models/image.py:56
+#: exercises/models/image.py:59
+msgid "Line"
+msgstr ""
+
+#: exercises/models/image.py:60
+msgid "3D"
+msgstr ""
+
+#: exercises/models/image.py:61
+msgid "Low-poly"
+msgstr ""
+
+#: exercises/models/image.py:62
+msgid "Photo"
+msgstr ""
+
+#: exercises/models/image.py:63
+msgid "Other"
+msgstr ""
+
+#: exercises/models/image.py:81 gallery/models/image.py:56
msgid "Image"
msgstr ""
-#: exercises/models/image.py:69 gallery/models/image.py:57
+#: exercises/models/image.py:82 gallery/models/image.py:57
msgid "Only PNG and JPEG formats are supported"
msgstr ""
-#: exercises/models/image.py:75
+#: exercises/models/image.py:88
msgid "Main picture"
msgstr ""
-#: exercises/models/image.py:78
+#: exercises/models/image.py:91
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 "
"by the system."
msgstr ""
-#: exercises/models/image.py:166
+#: exercises/models/image.py:100
+msgid "The art style of your image"
+msgstr ""
+
+#: exercises/models/image.py:185
msgid "New user submitted image"
msgstr ""
-#: exercises/models/image.py:167
+#: exercises/models/image.py:186
#, python-brace-format
msgid "The user {0} submitted a new image \"{1}\" for exercise {2}."
msgstr ""
@@ -1580,6 +1598,50 @@ msgstr ""
msgid "In latin, e.g. \"Pectoralis major\""
msgstr ""
+#: exercises/models/video.py:41
+msgid "Maximum file size is 100MB."
+msgstr ""
+
+#: exercises/models/video.py:44 exercises/models/video.py:48
+msgid "File type is not supported"
+msgstr ""
+
+#: exercises/models/video.py:57
+msgid "File is not a valid video"
+msgstr ""
+
+#: exercises/models/video.py:88
+msgid "Main video"
+msgstr ""
+
+#: exercises/models/video.py:94
+msgid "Video"
+msgstr ""
+
+#: exercises/models/video.py:101
+msgid "Size"
+msgstr ""
+
+#: exercises/models/video.py:108 manager/models/schedule_step.py:56
+msgid "Duration"
+msgstr ""
+
+#: exercises/models/video.py:117
+msgid "Width"
+msgstr ""
+
+#: exercises/models/video.py:124
+msgid "Height"
+msgstr ""
+
+#: exercises/models/video.py:131
+msgid "Codec"
+msgstr ""
+
+#: exercises/models/video.py:139
+msgid "Codec, long name"
+msgstr ""
+
#: exercises/templates/equipment/admin-overview.html:4
msgid "Equipment list"
msgstr ""
@@ -1595,7 +1657,7 @@ msgstr ""
#: exercises/templates/equipment/overview.html:69
#: exercises/templates/exercise/overview.html:74
-#: exercises/templates/exercise/view.html:214
+#: exercises/templates/exercise/view.html:264
#: exercises/templates/muscles/overview.html:71
msgid "Main muscles"
msgstr ""
@@ -1704,7 +1766,8 @@ msgstr ""
#: gym/templates/gym/new_user.html:22
#: gym/templates/gym/reset_user_password.html:20 manager/models/log.py:45
#: manager/models/schedule.py:44 manager/models/session.py:49
-#: manager/models/workout.py:89 nutrition/models/plan.py:55
+#: manager/models/workout.py:89 measurements/models/category.py:48
+#: measurements/models/measurement.py:59 nutrition/models/plan.py:55
#: nutrition/templates/ingredient/pending.html:16 weight/models.py:41
msgid "User"
msgstr "Bruger"
@@ -1729,13 +1792,13 @@ msgid "Please select one of the options below."
msgstr ""
#: exercises/templates/exercise/view.html:60
-#: exercises/templates/exercise/view.html:153
+#: exercises/templates/exercise/view.html:203
#: nutrition/templates/ingredient/view.html:38
msgid "Accept"
msgstr ""
#: exercises/templates/exercise/view.html:64
-#: exercises/templates/exercise/view.html:154
+#: exercises/templates/exercise/view.html:204
#: nutrition/templates/ingredient/view.html:42
msgid "Decline"
msgstr ""
@@ -1748,32 +1811,42 @@ msgstr ""
msgid "Add new image"
msgstr ""
-#: exercises/templates/exercise/view.html:147
+#: exercises/templates/exercise/view.html:148
+msgid "Videos"
+msgstr ""
+
+#: exercises/templates/exercise/view.html:187 exercises/views/videos.py:94
+#, fuzzy
+#| msgid "Add one now."
+msgid "Add new video"
+msgstr "Tilføj en ny."
+
+#: exercises/templates/exercise/view.html:197
msgid "Images pending review"
msgstr ""
-#: exercises/templates/exercise/view.html:168
+#: exercises/templates/exercise/view.html:218
msgid "Comments for this exercise"
msgstr ""
-#: exercises/templates/exercise/view.html:196
+#: exercises/templates/exercise/view.html:246
msgid "Add new comment"
msgstr ""
-#: exercises/templates/exercise/view.html:210
+#: exercises/templates/exercise/view.html:260
msgid "The diagram shows the most used muscles on this exercise"
msgstr ""
-#: exercises/templates/exercise/view.html:251
+#: exercises/templates/exercise/view.html:301
#: manager/templates/workout/log.html:10 manager/templates/workout/log.html:11
msgid "Weight log"
msgstr ""
-#: exercises/templates/exercise/view.html:256
+#: exercises/templates/exercise/view.html:306
msgid "Exercise Variations"
msgstr ""
-#: exercises/templates/exercise/view.html:277
+#: exercises/templates/exercise/view.html:327
msgid "Submit a correction"
msgstr ""
@@ -1808,30 +1881,30 @@ msgstr ""
msgid "Delete equipment?"
msgstr ""
-#: exercises/views/exercises.py:228
+#: exercises/views/exercises.py:229
#, python-format
msgid ""
"%(name_original)s is too similar to existing exercise \"%(exercise_name)s\""
msgstr ""
-#: exercises/views/exercises.py:246
+#: exercises/views/exercises.py:247
msgid "Add exercise"
msgstr ""
-#: exercises/views/exercises.py:366
+#: exercises/views/exercises.py:367
msgid "Thank you. Once the changes are reviewed the exercise will be updated."
msgstr ""
-#: exercises/views/exercises.py:379
+#: exercises/views/exercises.py:380
#, python-brace-format
msgid "Correct {0}"
msgstr ""
-#: exercises/views/exercises.py:421
+#: exercises/views/exercises.py:422
msgid "This will delete the exercise from all workouts."
msgstr ""
-#: exercises/views/exercises.py:473
+#: exercises/views/exercises.py:474
msgid "Exercise was successfully marked as rejected"
msgstr ""
@@ -1843,6 +1916,11 @@ msgstr ""
msgid "Delete exercise image?"
msgstr ""
+#: exercises/views/videos.py:144 nutrition/views/log.py:230
+#: nutrition/views/unit_ingredient.py:139
+msgid "Delete?"
+msgstr ""
+
#: gallery/templates/images/overview.html:62
msgid "Add image"
msgstr ""
@@ -1909,8 +1987,8 @@ msgid "Contract type"
msgstr ""
#: gym/models/contract.py:208 gym/templates/contract/view.html:59
-#: manager/templates/log/add.html:52 nutrition/forms.py:58
-#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:92
+#: manager/templates/log/add.html:52 nutrition/forms.py:59
+#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:102
#: nutrition/models/meal_item.py:72
msgid "Amount"
msgstr ""
@@ -2343,6 +2421,7 @@ msgid ""
msgstr ""
#: mailer/templates/mailer/gym/preview.html:22
+#: software/templates/about_us.html:59
msgid "Current version"
msgstr ""
@@ -2375,7 +2454,8 @@ msgstr ""
#: manager/models/log.py:90 manager/models/setting.py:47
#: manager/models/setting.py:78 manager/templates/log/add.html:53
#: manager/templates/log/add.html:55 manager/templates/set/formset.html:11
-#: manager/templates/set/formset.html:13 nutrition/forms.py:62
+#: manager/templates/set/formset.html:13 measurements/models/category.py:58
+#: nutrition/forms.py:63
msgid "Unit"
msgstr ""
@@ -2438,10 +2518,6 @@ msgstr ""
msgid "schedule"
msgstr ""
-#: manager/models/schedule_step.py:56
-msgid "Duration"
-msgstr ""
-
#: manager/models/schedule_step.py:57
msgid "The duration in weeks"
msgstr ""
@@ -2696,7 +2772,7 @@ msgstr ""
#: manager/templates/schedule/view.html:290
#: manager/templates/workout/view.html:142
#: manager/templates/workout/view.html:217
-#: nutrition/templates/plan/view.html:415
+#: nutrition/templates/plan/view.html:417
msgid "Download as PDF"
msgstr ""
@@ -2917,30 +2993,34 @@ msgstr ""
msgid "This will delete all weight logs for this day as well."
msgstr ""
-#: nutrition/forms.py:121
+#: measurements/models/measurement.py:69
+msgid "Value"
+msgstr ""
+
+#: nutrition/forms.py:122
msgid "Calculate"
msgstr ""
-#: nutrition/forms.py:194 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:195 nutrition/templates/rate/form.html:76
msgid "Basic caloric intake"
msgstr ""
-#: nutrition/forms.py:195
+#: nutrition/forms.py:196
msgid "Your basic caloric intake as calculated for your data"
msgstr ""
-#: nutrition/forms.py:201
+#: nutrition/forms.py:202
msgid "Additional calories"
msgstr ""
-#: nutrition/forms.py:203
+#: nutrition/forms.py:204
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
msgstr ""
-#: nutrition/forms.py:231 nutrition/models/ingredient_weight_unit.py:39
-#: nutrition/models/log.py:71 nutrition/models/meal_item.py:53
+#: nutrition/forms.py:232 nutrition/models/ingredient_weight_unit.py:39
+#: nutrition/models/log.py:81 nutrition/models/meal_item.py:53
#: nutrition/templates/log/detail.html:155
msgid "Ingredient"
msgstr ""
@@ -2959,14 +3039,14 @@ msgstr ""
#: nutrition/models/ingredient.py:123
#: nutrition/templates/ingredient/view.html:96
#: nutrition/templates/log/detail.html:78
-#: nutrition/templates/plan/view.html:262 nutrition/views/plan.py:406
+#: nutrition/templates/plan/view.html:264 nutrition/views/plan.py:406
msgid "Sugar content in carbohydrates"
msgstr ""
#: nutrition/models/ingredient.py:141
#: nutrition/templates/ingredient/view.html:112
#: nutrition/templates/log/detail.html:104
-#: nutrition/templates/plan/view.html:274 nutrition/views/plan.py:420
+#: nutrition/templates/plan/view.html:276 nutrition/views/plan.py:420
msgid "Saturated fat content in fats"
msgstr ""
@@ -2974,7 +3054,7 @@ msgstr ""
#: nutrition/templates/ingredient/view.html:134
#: nutrition/templates/log/detail.html:122
#: nutrition/templates/log/detail.html:178
-#: nutrition/templates/plan/view.html:285 nutrition/views/plan.py:426
+#: nutrition/templates/plan/view.html:287 nutrition/views/plan.py:426
msgid "Fibres"
msgstr ""
@@ -2982,7 +3062,7 @@ msgstr ""
#: nutrition/templates/ingredient/view.html:144
#: nutrition/templates/log/detail.html:135
#: nutrition/templates/log/detail.html:181
-#: nutrition/templates/plan/view.html:291 nutrition/views/plan.py:432
+#: nutrition/templates/plan/view.html:293 nutrition/views/plan.py:432
msgid "Sodium"
msgstr ""
@@ -3027,10 +3107,20 @@ msgstr ""
msgid "Unit amount, e.g. \"1 Cup\" or \"1/2 spoon\""
msgstr ""
+#: nutrition/models/log.py:55
+msgid "Meal"
+msgstr ""
+
#: nutrition/models/meal.py:61
msgid "Time (approx)"
msgstr ""
+#: nutrition/models/meal.py:68
+msgid ""
+"Give meals a textual description / name such as \"Breakfast\" or \"after "
+"workout\""
+msgstr ""
+
#: nutrition/models/plan.py:71
msgid ""
"A description of the goal of the plan, e.g. \"Gain mass\" or \"Prepare for "
@@ -3159,12 +3249,12 @@ msgstr ""
#: nutrition/templates/ingredient/view.html:71
#: nutrition/templates/log/detail.html:31
-#: nutrition/templates/plan/view.html:227 nutrition/views/plan.py:376
+#: nutrition/templates/plan/view.html:229 nutrition/views/plan.py:376
msgid "Macronutrients"
msgstr ""
#: nutrition/templates/ingredient/view.html:80
-#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:244
+#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:246
msgid "kJ"
msgstr ""
@@ -3177,7 +3267,7 @@ msgstr ""
#: nutrition/templates/ingredient/view.html:128
#: nutrition/templates/log/detail.html:119
-#: nutrition/templates/plan/view.html:282
+#: nutrition/templates/plan/view.html:284
msgid "Others"
msgstr ""
@@ -3206,7 +3296,7 @@ msgstr ""
#: nutrition/templates/log/detail.html:7
#: nutrition/templates/log/overview.html:7
-#: nutrition/templates/plan/view.html:300
+#: nutrition/templates/plan/view.html:302
msgid "Nutrition diary"
msgstr ""
@@ -3216,13 +3306,13 @@ msgstr ""
#: nutrition/templates/log/detail.html:33
#: nutrition/templates/log/overview.html:31
-#: nutrition/templates/plan/view.html:308
+#: nutrition/templates/plan/view.html:310
msgid "Logged"
msgstr ""
#: nutrition/templates/log/detail.html:34
#: nutrition/templates/log/overview.html:32
-#: nutrition/templates/plan/view.html:309
+#: nutrition/templates/plan/view.html:311
msgid "Difference"
msgstr ""
@@ -3235,7 +3325,7 @@ msgid "g"
msgstr ""
#: nutrition/templates/log/overview.html:53
-#: nutrition/templates/plan/view.html:330
+#: nutrition/templates/plan/view.html:332
msgid "nothing found"
msgstr ""
@@ -3255,77 +3345,77 @@ msgstr ""
msgid "Add ingredient to meal"
msgstr ""
-#: nutrition/templates/plan/view.html:150
+#: nutrition/templates/plan/view.html:152
msgid "No items for this meal."
msgstr ""
-#: nutrition/templates/plan/view.html:188
+#: nutrition/templates/plan/view.html:190
msgid "No meals for this plan."
msgstr ""
-#: nutrition/templates/plan/view.html:200
+#: nutrition/templates/plan/view.html:202
msgid "Log this Plan"
msgstr ""
-#: nutrition/templates/plan/view.html:206
+#: nutrition/templates/plan/view.html:208
msgid "Add a new meal"
msgstr ""
-#: nutrition/templates/plan/view.html:216 nutrition/views/plan.py:369
+#: nutrition/templates/plan/view.html:218 nutrition/views/plan.py:369
msgid "Nutritional data"
msgstr ""
-#: nutrition/templates/plan/view.html:219
+#: nutrition/templates/plan/view.html:221
#, python-format
msgid "Based on the weight entry dated %(date)s (%(weight)s)"
msgstr ""
-#: nutrition/templates/plan/view.html:228 nutrition/views/plan.py:377
+#: nutrition/templates/plan/view.html:230 nutrition/views/plan.py:377
msgid "Total"
msgstr ""
-#: nutrition/templates/plan/view.html:229 nutrition/views/plan.py:378
+#: nutrition/templates/plan/view.html:231 nutrition/views/plan.py:378
msgid "Percent of energy"
msgstr ""
-#: nutrition/templates/plan/view.html:232 nutrition/views/plan.py:379
+#: nutrition/templates/plan/view.html:234 nutrition/views/plan.py:379
msgid "g per body kg"
msgstr ""
-#: nutrition/templates/plan/view.html:234
+#: nutrition/templates/plan/view.html:236
msgid "oz per body lb"
msgstr ""
-#: nutrition/templates/plan/view.html:338
+#: nutrition/templates/plan/view.html:340
msgid "View complete nutrition log"
msgstr ""
-#: nutrition/templates/plan/view.html:371
+#: nutrition/templates/plan/view.html:373
msgid "Goal"
msgstr ""
-#: nutrition/templates/plan/view.html:382
+#: nutrition/templates/plan/view.html:384
msgid ""
"You have selected that this nutritional plan has a\n"
" goal amount of calories. Use the calculator or enter the value\n"
" yourself."
msgstr ""
-#: nutrition/templates/plan/view.html:392
+#: nutrition/templates/plan/view.html:394
msgid ""
"If you find the ingredient list too short, you might want to activate the "
"preference to also show English ingredients."
msgstr ""
-#: nutrition/templates/plan/view.html:421
+#: nutrition/templates/plan/view.html:423
msgid "Edit nutrition plan"
msgstr ""
-#: nutrition/templates/plan/view.html:425
+#: nutrition/templates/plan/view.html:427
msgid "Make a copy of this nutrition plan"
msgstr ""
-#: nutrition/templates/plan/view.html:431
+#: nutrition/templates/plan/view.html:433
msgid "Delete nutrition plan"
msgstr ""
@@ -3405,10 +3495,6 @@ msgstr ""
msgid "Ingredient was successfully marked as rejected"
msgstr ""
-#: nutrition/views/log.py:229 nutrition/views/unit_ingredient.py:139
-msgid "Delete?"
-msgstr ""
-
#: nutrition/views/meal.py:55
msgid "Add new meal"
msgstr ""
@@ -3764,11 +3850,11 @@ msgstr ""
msgid "Re-Submit"
msgstr ""
-#: weight/templates/overview.html:68
+#: weight/templates/overview.html:51
msgid "Export as CSV"
msgstr ""
-#: weight/templates/overview.html:72
+#: weight/templates/overview.html:55
msgid "Import from spreadsheet"
msgstr ""
diff --git a/wger/locale/de/LC_MESSAGES/django.po b/wger/locale/de/LC_MESSAGES/django.po
index 454c1fa43..ea2c0ef5d 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: 2021-08-17 15:00+0200\n"
+"POT-Creation-Date: 2022-02-15 14:51+0100\n"
"PO-Revision-Date: 2021-09-19 02:37+0000\n"
"Last-Translator: J. Lavoie <[email protected]>\n"
"Language-Team: German <https://hosted.weblate.org/projects/wger/web/de/>\n"
@@ -53,16 +53,16 @@ msgstr "Sprachen"
msgid "Nothing found."
msgstr "Nichts gefunden."
-#: config/templates/language/overview.html:16 core/templates/index.html:147
-#: core/templates/index.html:199 manager/templates/calendar/month.html:132
+#: config/templates/language/overview.html:16 core/templates/index.html:137
+#: core/templates/index.html:189 manager/templates/calendar/month.html:132
#: manager/templates/schedule/overview.html:28
#: manager/templates/schedule/view.html:146
#: manager/templates/workout/overview.html:28
#: nutrition/templates/ingredient/overview.html:45
#: nutrition/templates/plan/overview.html:23
-#: nutrition/templates/plan/view.html:148
-#: nutrition/templates/plan/view.html:151
-#: nutrition/templates/plan/view.html:189
+#: nutrition/templates/plan/view.html:150
+#: nutrition/templates/plan/view.html:153
+#: nutrition/templates/plan/view.html:191
msgid "Add one now."
msgstr "Jetzt hinzufügen."
@@ -83,7 +83,7 @@ msgstr "Jetzt hinzufügen."
#: gym/templates/gym/member_list.html:244
#: gym/templates/gym/member_list.html:281
#: mailer/templates/mailer/gym/overview.html:43
-#: weight/templates/overview.html:78
+#: weight/templates/overview.html:61
msgid "Add"
msgstr "Hinzufügen"
@@ -122,14 +122,14 @@ msgstr "Anzeigen"
#: config/templates/language/view.html:91 core/templates/user/api_key.html:44
#: core/templates/user/preferences.html:28
-#: exercises/templates/exercise/view.html:273
-#: exercises/templates/exercise/view.html:296 gym/models/contract.py:200
+#: exercises/templates/exercise/view.html:323
+#: exercises/templates/exercise/view.html:346 gym/models/contract.py:200
#: gym/templates/contract/view.html:41 gym/templates/contract/view.html:106
#: gym/templates/gym/member_list.html:248
#: manager/templates/schedule/view.html:281
#: manager/templates/workout/view.html:206
#: nutrition/templates/ingredient/view.html:226
-#: nutrition/templates/plan/view.html:409 weight/templates/overview.html:62
+#: nutrition/templates/plan/view.html:411 weight/templates/overview.html:45
msgid "Options"
msgstr "Optionen"
@@ -143,12 +143,12 @@ msgstr "Optionen"
#: core/templates/weight_unit/list.html:17
#: exercises/templates/categories/admin-overview.html:16
#: exercises/templates/equipment/admin-overview.html:16
-#: exercises/templates/exercise/view.html:180
-#: exercises/templates/exercise/view.html:301
+#: exercises/templates/exercise/view.html:230
+#: exercises/templates/exercise/view.html:351
#: exercises/templates/muscles/admin-overview.html:16
-#: exercises/views/comments.py:63 gallery/views/images.py:96
-#: gym/templates/admin_notes/list.html:32 gym/templates/contract/list.html:31
-#: gym/templates/contract/view.html:107
+#: exercises/views/comments.py:63 exercises/views/videos.py:69
+#: gallery/views/images.py:96 gym/templates/admin_notes/list.html:32
+#: gym/templates/contract/list.html:31 gym/templates/contract/view.html:107
#: gym/templates/contract_option/list.html:31
#: gym/templates/contract_type/list.html:31 gym/templates/document/list.html:38
#: gym/templates/gym/list.html:19 gym/templates/gym/list.html:43
@@ -159,7 +159,7 @@ msgstr "Optionen"
#: manager/templates/calendar/partial_overview_table.html:18
#: manager/templates/schedule/view.html:121
#: nutrition/templates/ingredient/view.html:198
-#: nutrition/templates/plan/view.html:89 nutrition/templates/plan/view.html:124
+#: nutrition/templates/plan/view.html:89 nutrition/templates/plan/view.html:126
#: nutrition/templates/units/list.html:18
msgid "Edit"
msgstr "Bearbeiten"
@@ -173,9 +173,9 @@ msgstr "Bearbeiten"
#: exercises/templates/categories/admin-overview.html:17
#: exercises/templates/equipment/admin-overview.html:17
#: exercises/templates/exercise/view.html:68
-#: exercises/templates/exercise/view.html:155
-#: exercises/templates/exercise/view.html:185
-#: exercises/templates/exercise/view.html:306
+#: exercises/templates/exercise/view.html:205
+#: exercises/templates/exercise/view.html:235
+#: exercises/templates/exercise/view.html:356
#: exercises/templates/muscles/admin-overview.html:17
#: gym/templates/admin_notes/list.html:40
#: gym/templates/contract_option/list.html:39
@@ -188,7 +188,7 @@ msgstr "Bearbeiten"
#: nutrition/templates/ingredient/view.html:199
#: nutrition/templates/ingredient/view.html:239
#: nutrition/templates/log/detail.html:197
-#: nutrition/templates/plan/view.html:95 nutrition/templates/plan/view.html:130
+#: nutrition/templates/plan/view.html:95 nutrition/templates/plan/view.html:132
#: nutrition/templates/units/list.html:20
msgid "Delete"
msgstr "Löschen"
@@ -316,7 +316,7 @@ msgid "Some way of answering you (e-mail, etc.)"
msgstr "Eine Möglichkeit, dich zu erreichen (E-Mail, usw.)"
#: core/forms.py:265 exercises/models/comment.py:40 manager/models/set.py:60
-#: manager/models/setting.py:99 nutrition/models/log.py:61
+#: manager/models/setting.py:99 nutrition/models/log.py:71
msgid "Comment"
msgstr "Kommentar"
@@ -460,7 +460,7 @@ msgstr ""
msgid "Age"
msgstr "Alter"
-#: core/models/profile.py:202 nutrition/forms.py:98
+#: core/models/profile.py:202 nutrition/forms.py:99
msgid "Height (cm)"
msgstr "Größe (cm)"
@@ -511,7 +511,7 @@ msgid "Total caloric intake, including e.g. any surplus"
msgstr "Gesamt Kalorieneinnahme inkl. Überschuss"
#: core/models/profile.py:305 nutrition/models/ingredient_weight_unit.py:45
-#: nutrition/models/log.py:80 nutrition/models/meal_item.py:58
+#: nutrition/models/log.py:90 nutrition/models/meal_item.py:58
msgid "Weight unit"
msgstr "Gewichtseinheit"
@@ -551,9 +551,9 @@ msgstr "Die Summe aller Stunden muss 24 sein"
#: gym/models/user_document.py:87 gym/templates/contract/view.html:50
#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:96
#: gym/views/gym.py:156 manager/models/schedule.py:55
-#: manager/models/workout.py:56 nutrition/models/ingredient.py:96
-#: nutrition/models/ingredient_category.py:26
-#: nutrition/models/weight_unit.py:38
+#: manager/models/workout.py:56 measurements/models/category.py:53
+#: nutrition/models/ingredient.py:96 nutrition/models/ingredient_category.py:26
+#: nutrition/models/meal.py:66 nutrition/models/weight_unit.py:38
#: nutrition/templates/ingredient/pending.html:15
#: nutrition/templates/ingredient/view.html:185
msgid "Name"
@@ -614,11 +614,11 @@ msgstr ""
msgid "Dashboard"
msgstr "Übersicht"
-#: core/templates/index.html:31 manager/templates/calendar/month.html:115
+#: core/templates/index.html:21 manager/templates/calendar/month.html:115
msgid "Add log to day"
msgstr "Logbucheintrag zum Tag hinzufügen"
-#: core/templates/index.html:35 manager/templates/calendar/month.html:120
+#: core/templates/index.html:25 manager/templates/calendar/month.html:120
msgid ""
"Click to add weight logs to a training\n"
"day in your current workout:"
@@ -626,7 +626,7 @@ msgstr ""
"Klicken, um einen Gewichtseintrag zu einem Trainingstag in\n"
"deinem aktuellen Trainingsplan hinzuzufügen:"
-#: core/templates/index.html:43 core/templates/index.html:83
+#: core/templates/index.html:33 core/templates/index.html:73
#: core/templates/misc/fragments/shariff_modal.html:29
#: core/templates/template.html:125 manager/templates/calendar/month.html:138
#: manager/templates/schedule/view.html:246
@@ -636,11 +636,11 @@ msgstr ""
msgid "Close"
msgstr "Schließen"
-#: core/templates/index.html:54 core/templates/index.html:203
+#: core/templates/index.html:44 core/templates/index.html:193
msgid "Add new diary entry"
msgstr "Neuen Tagebucheintrag hinzufügen"
-#: core/templates/index.html:59
+#: core/templates/index.html:49
msgid ""
"Click to add an entry to your nutrition diary for today. You can either log "
"a meal as you defined it, or entry any number of custom entries."
@@ -650,7 +650,7 @@ msgstr ""
"sie definiert haben, oder eine beliebige Anzahl von benutzerdefinierten "
"Einträgen eingeben."
-#: core/templates/index.html:67 core/templates/index.html:171
+#: core/templates/index.html:57 core/templates/index.html:161
#: core/templates/user/overview.html:171
#: nutrition/templates/ingredient/view.html:79
#: nutrition/templates/log/detail.html:40
@@ -659,19 +659,19 @@ msgstr ""
#: nutrition/templates/log/overview.html:7
#: nutrition/templates/log/overview.html:44
#: nutrition/templates/plan/overview.html:17
-#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:242
-#: nutrition/templates/plan/view.html:301
-#: nutrition/templates/plan/view.html:321
-#: nutrition/templates/plan/view.html:363
-#: nutrition/templates/plan/view.html:373
+#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:244
+#: nutrition/templates/plan/view.html:303
+#: nutrition/templates/plan/view.html:323
+#: nutrition/templates/plan/view.html:365
+#: nutrition/templates/plan/view.html:375
msgid "kcal"
msgstr "kcal"
-#: core/templates/index.html:79 nutrition/templates/plan/view.html:348
+#: core/templates/index.html:69 nutrition/templates/plan/view.html:350
msgid "Add custom diary entry"
msgstr "Benutzerdefinierten Tagebucheintrag hinzufügen"
-#: core/templates/index.html:94 core/templates/index.html:102
+#: core/templates/index.html:84 core/templates/index.html:92
#: manager/models/day.py:34 manager/models/log.py:56
#: manager/models/session.py:60 manager/models/workout.py:109
#: manager/templates/schedule/view.html:105
@@ -682,11 +682,11 @@ msgstr "Benutzerdefinierten Tagebucheintrag hinzufügen"
msgid "Workout"
msgstr "Trainingsplan"
-#: core/templates/index.html:128
+#: core/templates/index.html:118
msgid "This workout is part of a schedule:"
msgstr "Dieser Traininsplan ist teil eines Zeitplans:"
-#: core/templates/index.html:133
+#: core/templates/index.html:123
msgid ""
"The current workout is selected from your active schedule or, if you don't "
"have one, simply by date."
@@ -694,70 +694,70 @@ msgstr ""
"Dein aktueller Traininsplan wird aus deinem gerade aktiven Zeitplan "
"ausgewählt oder, wenn du keinen hast, nach Datum."
-#: core/templates/index.html:142 manager/templates/calendar/month.html:188
+#: core/templates/index.html:132 manager/templates/calendar/month.html:188
msgid "Add new log"
msgstr "Neuen Tagebucheintrag hinzufügen"
-#: core/templates/index.html:147 core/templates/user/overview.html:58
+#: core/templates/index.html:137 core/templates/user/overview.html:58
#: manager/templates/calendar/month.html:128
#: manager/templates/schedule/view.html:146
#: manager/templates/workout/overview.html:28
msgid "No workouts found."
msgstr "Keine Trainingspläne gefunden."
-#: core/templates/index.html:157 nutrition/models/log.py:48
+#: core/templates/index.html:147 nutrition/models/log.py:49
#: nutrition/models/meal.py:49 nutrition/models/meal_item.py:47
#: nutrition/models/plan.py:94 nutrition/templates/plan/view.html:11
#: nutrition/templates/plan/view.html:19
msgid "Nutrition plan"
msgstr "Ernährungsplan"
-#: core/templates/index.html:169 core/templates/user/overview.html:155
+#: core/templates/index.html:159 core/templates/user/overview.html:155
#: nutrition/models/ingredient.py:100
#: nutrition/templates/ingredient/view.html:77
#: nutrition/templates/log/detail.html:39
#: nutrition/templates/log/detail.html:156
-#: nutrition/templates/plan/view.html:53 nutrition/templates/plan/view.html:241
-#: nutrition/templates/plan/view.html:358
-#: nutrition/templates/plan/view.html:362 nutrition/views/plan.py:384
+#: nutrition/templates/plan/view.html:53 nutrition/templates/plan/view.html:243
+#: nutrition/templates/plan/view.html:360
+#: nutrition/templates/plan/view.html:364 nutrition/views/plan.py:384
msgid "Energy"
msgstr "Energie"
-#: core/templates/index.html:175 core/templates/user/overview.html:156
+#: core/templates/index.html:165 core/templates/user/overview.html:156
#: nutrition/models/ingredient.py:105
#: nutrition/templates/ingredient/view.html:84
#: nutrition/templates/log/detail.html:52
#: nutrition/templates/log/detail.html:174
-#: nutrition/templates/plan/view.html:54 nutrition/templates/plan/view.html:249
+#: nutrition/templates/plan/view.html:54 nutrition/templates/plan/view.html:251
#: nutrition/views/plan.py:390
msgid "Protein"
msgstr "Eiweiß"
-#: core/templates/index.html:181 core/templates/user/overview.html:157
+#: core/templates/index.html:171 core/templates/user/overview.html:157
#: nutrition/models/ingredient.py:113
#: nutrition/templates/ingredient/view.html:90
#: nutrition/templates/log/detail.html:65
#: nutrition/templates/log/detail.html:175
-#: nutrition/templates/plan/view.html:55 nutrition/templates/plan/view.html:255
+#: nutrition/templates/plan/view.html:55 nutrition/templates/plan/view.html:257
#: nutrition/views/plan.py:398
msgid "Carbohydrates"
msgstr "Kohlenhydrate"
-#: core/templates/index.html:187 core/templates/user/overview.html:158
+#: core/templates/index.html:177 core/templates/user/overview.html:158
#: nutrition/models/ingredient.py:131
#: nutrition/templates/ingredient/view.html:106
#: nutrition/templates/log/detail.html:91
#: nutrition/templates/log/detail.html:176
-#: nutrition/templates/plan/view.html:56 nutrition/templates/plan/view.html:268
+#: nutrition/templates/plan/view.html:56 nutrition/templates/plan/view.html:270
#: nutrition/views/plan.py:412
msgid "Fat"
msgstr "Fett"
-#: core/templates/index.html:199 nutrition/templates/plan/overview.html:22
+#: core/templates/index.html:189 nutrition/templates/plan/overview.html:22
msgid "No nutrition plans."
msgstr "Keine Ernährungspläne."
-#: core/templates/index.html:213 core/templates/user/overview.html:112
+#: core/templates/index.html:203 core/templates/user/overview.html:112
#: core/templates/user/overview.html:121 manager/forms.py:173
#: manager/helpers.py:89 manager/models/log.py:84 manager/models/setting.py:67
#: manager/templates/log/add.html:54 manager/templates/set/formset.html:12
@@ -766,11 +766,7 @@ msgstr "Keine Ernährungspläne."
msgid "Weight"
msgstr "Gewicht"
-#: core/templates/index.html:217
-msgid "Your current weight is: "
-msgstr "Dein aktuelles Gewicht ist: "
-
-#: core/templates/index.html:248 core/templates/navigation.html:97
+#: core/templates/index.html:210 core/templates/navigation.html:97
#: weight/views.py:70
msgid "Add weight entry"
msgstr "Gewichtseintrag hinzufügen"
@@ -802,7 +798,7 @@ msgstr "Lizenzliste"
msgid "Nothing found"
msgstr "Nichts gefunden"
-#: core/templates/misc/about.html:4 core/templates/template.html:201
+#: core/templates/misc/about.html:4 core/templates/template.html:175
#: core/templates/template_features.html:118
#: core/templates/template_no_context.html:88
msgid "Imprint"
@@ -820,8 +816,8 @@ msgstr ""
"aktivieren."
#: core/templates/misc/fragments/shariff_modal.html:22
-#: nutrition/templates/plan/view.html:385
-#: nutrition/templates/plan/view.html:394
+#: nutrition/templates/plan/view.html:387
+#: nutrition/templates/plan/view.html:396
msgid "That's done here"
msgstr "Das wird hier gemacht"
@@ -909,7 +905,7 @@ msgstr "Übungen ohne Freigabe"
msgid "Equipment"
msgstr "Gerät"
-#: core/templates/navigation.html:78 exercises/templates/exercise/view.html:208
+#: core/templates/navigation.html:78 exercises/templates/exercise/view.html:258
msgid "Muscles"
msgstr "Muskeln"
@@ -982,7 +978,7 @@ msgstr "Entwickler-Dokumentation"
msgid "Get the code"
msgstr "Quellcode"
-#: core/templates/navigation.html:175 core/templates/template.html:193
+#: core/templates/navigation.html:175 core/templates/template.html:205
#: core/templates/template_features.html:100
msgid "Translate"
msgstr "Übersetze"
@@ -1137,15 +1133,11 @@ msgstr ""
msgid "Create some demo entries"
msgstr "Beispieldaten erstellen"
-#: core/templates/template.html:202 core/templates/template_features.html:122
+#: core/templates/template.html:176 core/templates/template_features.html:122
#: core/templates/template_no_context.html:89 software/templates/tos.html:7
msgid "Terms of service"
msgstr "Allgemeine Nutzungsbedingungen"
-#: core/templates/template.html:209 core/templates/template.html:210
-msgid "Released under the Affero GPL"
-msgstr "Unter der Affero GPL veröffentlicht"
-
#: core/templates/template_features.html:62 software/templates/features.html:9
#: software/templates/features.html:120
msgid "Features"
@@ -1250,9 +1242,10 @@ msgstr "Trainingsplan hinzufügen"
#: core/templates/user/overview.html:120 core/templates/user/overview.html:153
#: exercises/models/exercise.py:77 gallery/models/image.py:47
#: manager/helpers.py:88 manager/models/log.py:98 manager/models/session.py:67
-#: nutrition/models/ingredient.py:85 nutrition/models/ingredient.py:87
-#: nutrition/models/ingredient.py:190 nutrition/templates/log/overview.html:30
-#: nutrition/templates/plan/view.html:307 weight/models.py:32
+#: measurements/models/measurement.py:64 nutrition/models/ingredient.py:85
+#: nutrition/models/ingredient.py:87 nutrition/models/ingredient.py:190
+#: nutrition/templates/log/overview.html:30
+#: nutrition/templates/plan/view.html:309 weight/models.py:32
#: weight/templates/import_csv_preview.html:13
#: weight/templates/import_csv_preview.html:42 weight/views.py:150
msgid "Date"
@@ -1260,10 +1253,10 @@ msgstr "Datum"
#: core/templates/user/overview.html:35 core/templates/user/overview.html:154
#: exercises/models/exercise.py:61 exercises/templates/exercise/view.html:88
-#: exercises/views/exercises.py:189 gallery/models/image.py:70
+#: exercises/views/exercises.py:190 gallery/models/image.py:70
#: gym/models/contract.py:57 gym/models/contract.py:107
#: manager/models/day.py:37 manager/models/workout.py:62
-#: nutrition/models/plan.py:69
+#: measurements/models/measurement.py:79 nutrition/models/plan.py:69
msgid "Description"
msgstr "Beschreibung"
@@ -1424,11 +1417,11 @@ msgstr "Einstellungen"
msgid "Change password"
msgstr "Passwort ändern"
-#: core/templatetags/wger_extras.py:217
+#: core/templatetags/wger_extras.py:229
msgid "kg"
msgstr "kg"
-#: core/templatetags/wger_extras.py:219
+#: core/templatetags/wger_extras.py:231
#: nutrition/templates/ingredient/view.html:86
#: nutrition/templates/ingredient/view.html:92
#: nutrition/templates/ingredient/view.html:99
@@ -1440,28 +1433,28 @@ msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr "g"
-#: core/templatetags/wger_extras.py:222
+#: core/templatetags/wger_extras.py:234
msgid "lb"
msgstr "lb"
-#: core/templatetags/wger_extras.py:224
+#: core/templatetags/wger_extras.py:236
msgctxt "weight unit, i.e. ounces"
msgid "oz"
msgstr "oz"
#: core/views/languages.py:85 exercises/views/categories.py:121
-#: exercises/views/equipment.py:106 exercises/views/exercises.py:422
+#: exercises/views/equipment.py:106 exercises/views/exercises.py:423
#: exercises/views/images.py:128 exercises/views/muscles.py:118
-#: manager/views/schedule.py:311 manager/views/schedule_step.py:129
-#: manager/views/workout.py:268 manager/views/workout_session.py:141
-#: nutrition/views/ingredient.py:144 nutrition/views/plan.py:120
-#: nutrition/views/unit.py:111
+#: exercises/views/videos.py:129 manager/views/schedule.py:311
+#: manager/views/schedule_step.py:129 manager/views/workout.py:268
+#: manager/views/workout_session.py:141 nutrition/views/ingredient.py:144
+#: nutrition/views/plan.py:120 nutrition/views/unit.py:111
msgid "Successfully deleted"
msgstr "Erfolgreich gelöscht"
#: core/views/languages.py:93 core/views/license.py:103
#: core/views/repetition_units.py:115 core/views/weight_units.py:115
-#: exercises/views/categories.py:127 exercises/views/exercises.py:430
+#: exercises/views/categories.py:127 exercises/views/exercises.py:431
#: exercises/views/muscles.py:125 gallery/views/images.py:121
#: gym/views/admin_notes.py:196 gym/views/document.py:206 gym/views/gym.py:486
#: manager/views/schedule.py:318 manager/views/schedule_step.py:139
@@ -1475,7 +1468,7 @@ msgstr "{0} löschen?"
#: core/views/languages.py:111 core/views/license.py:84
#: core/views/repetition_units.py:85 core/views/user.py:456
#: core/views/weight_units.py:85 exercises/views/categories.py:97
-#: exercises/views/equipment.py:83 exercises/views/exercises.py:304
+#: exercises/views/equipment.py:83 exercises/views/exercises.py:305
#: exercises/views/muscles.py:105 gym/views/admin_notes.py:160
#: gym/views/config.py:68 gym/views/contract.py:186
#: gym/views/contract_option.py:123 gym/views/contract_type.py:123
@@ -1567,7 +1560,7 @@ msgstr "Primärmuskeln"
#: exercises/models/base.py:64 exercises/templates/equipment/overview.html:71
#: exercises/templates/exercise/overview.html:76
-#: exercises/templates/exercise/view.html:218
+#: exercises/templates/exercise/view.html:268
#: exercises/templates/muscles/overview.html:73
msgid "Secondary muscles"
msgstr "Sekundärmuskeln"
@@ -1580,8 +1573,9 @@ msgstr "Variationen"
msgid "Exercise Categories"
msgstr "Kategorie Übung"
-#: exercises/models/comment.py:34 exercises/models/image.py:62
-#: manager/forms.py:165 manager/helpers.py:89 manager/models/log.py:51
+#: exercises/models/comment.py:34 exercises/models/image.py:75
+#: exercises/models/video.py:82 manager/forms.py:165 manager/helpers.py:89
+#: manager/models/log.py:51
msgid "Exercise"
msgstr "Übung"
@@ -1594,32 +1588,54 @@ msgstr "Ein Kommentar über die korrekte Durchführung der Übung."
msgid "Language"
msgstr "Sprache"
-#: exercises/models/exercise.py:233 exercises/views/exercises.py:460
+#: exercises/models/exercise.py:237 exercises/views/exercises.py:461
msgid "Exercise was successfully added to the general database"
msgstr "Übung wurde erfolgreich zur Datenbank hinzugefügt"
-#: exercises/models/exercise.py:261
+#: exercises/models/exercise.py:265
msgid "New user submitted exercise"
msgstr "Neue eingereichte Übung"
-#: exercises/models/exercise.py:263
+#: exercises/models/exercise.py:267
#, python-brace-format
msgid "The user {0} submitted a new exercise \"{1}\"."
msgstr "Der Benutzer {0} hat die Übung „{1}“ eingereicht."
-#: exercises/models/image.py:68 gallery/models/image.py:56
+#: exercises/models/image.py:59
+msgid "Line"
+msgstr ""
+
+#: exercises/models/image.py:60
+msgid "3D"
+msgstr ""
+
+#: exercises/models/image.py:61
+msgid "Low-poly"
+msgstr ""
+
+#: exercises/models/image.py:62
+msgid "Photo"
+msgstr ""
+
+#: exercises/models/image.py:63
+#, fuzzy
+#| msgid "Others"
+msgid "Other"
+msgstr "Andere"
+
+#: exercises/models/image.py:81 gallery/models/image.py:56
msgid "Image"
msgstr "Bild"
-#: exercises/models/image.py:69 gallery/models/image.py:57
+#: exercises/models/image.py:82 gallery/models/image.py:57
msgid "Only PNG and JPEG formats are supported"
msgstr "Nur die PNG und JPEG-Formate werden unterstützt"
-#: exercises/models/image.py:75
+#: exercises/models/image.py:88
msgid "Main picture"
msgstr "Hauptbild"
-#: exercises/models/image.py:78
+#: exercises/models/image.py:91
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 "
@@ -1630,11 +1646,15 @@ msgstr ""
"(wird dann z.B. auf Übersichten angezeigt). Das erste Bild bekommt die "
"Flagge automatisch."
-#: exercises/models/image.py:166
+#: exercises/models/image.py:100
+msgid "The art style of your image"
+msgstr ""
+
+#: exercises/models/image.py:185
msgid "New user submitted image"
msgstr "Neuer User hat ein Bild eingereicht"
-#: exercises/models/image.py:167
+#: exercises/models/image.py:186
#, python-brace-format
msgid "The user {0} submitted a new image \"{1}\" for exercise {2}."
msgstr ""
@@ -1644,6 +1664,58 @@ msgstr ""
msgid "In latin, e.g. \"Pectoralis major\""
msgstr "Auf latein, z.B. „Pectoralis major“"
+#: exercises/models/video.py:41
+msgid "Maximum file size is 100MB."
+msgstr ""
+
+#: exercises/models/video.py:44 exercises/models/video.py:48
+msgid "File type is not supported"
+msgstr ""
+
+#: exercises/models/video.py:57
+#, fuzzy
+#| msgid "%(birthdate)s is not a valid birthdate"
+msgid "File is not a valid video"
+msgstr "%(birthdate)s ist kein gültiges Geburtsdatum"
+
+#: exercises/models/video.py:88
+#, fuzzy
+#| msgid "Main picture"
+msgid "Main video"
+msgstr "Hauptbild"
+
+#: exercises/models/video.py:94
+msgid "Video"
+msgstr ""
+
+#: exercises/models/video.py:101
+msgid "Size"
+msgstr ""
+
+#: exercises/models/video.py:108 manager/models/schedule_step.py:56
+msgid "Duration"
+msgstr "Dauer"
+
+#: exercises/models/video.py:117
+msgid "Width"
+msgstr ""
+
+#: exercises/models/video.py:124
+#, fuzzy
+#| msgid "Weight"
+msgid "Height"
+msgstr "Gewicht"
+
+#: exercises/models/video.py:131
+#, fuzzy
+#| msgid "Code"
+msgid "Codec"
+msgstr "Quellcode"
+
+#: exercises/models/video.py:139
+msgid "Codec, long name"
+msgstr ""
+
#: exercises/templates/equipment/admin-overview.html:4
msgid "Equipment list"
msgstr "Geräteliste"
@@ -1659,7 +1731,7 @@ msgstr "Geräteübersicht"
#: exercises/templates/equipment/overview.html:69
#: exercises/templates/exercise/overview.html:74
-#: exercises/templates/exercise/view.html:214
+#: exercises/templates/exercise/view.html:264
#: exercises/templates/muscles/overview.html:71
msgid "Main muscles"
msgstr "Hauptmuskeln"
@@ -1785,7 +1857,8 @@ msgstr "Datum der Einreichung"
#: gym/templates/gym/new_user.html:22
#: gym/templates/gym/reset_user_password.html:20 manager/models/log.py:45
#: manager/models/schedule.py:44 manager/models/session.py:49
-#: manager/models/workout.py:89 nutrition/models/plan.py:55
+#: manager/models/workout.py:89 measurements/models/category.py:48
+#: measurements/models/measurement.py:59 nutrition/models/plan.py:55
#: nutrition/templates/ingredient/pending.html:16 weight/models.py:41
msgid "User"
msgstr "Benutzer"
@@ -1812,13 +1885,13 @@ msgid "Please select one of the options below."
msgstr "Wähle bitte eine der folgenden Optionen."
#: exercises/templates/exercise/view.html:60
-#: exercises/templates/exercise/view.html:153
+#: exercises/templates/exercise/view.html:203
#: nutrition/templates/ingredient/view.html:38
msgid "Accept"
msgstr "Freigeben"
#: exercises/templates/exercise/view.html:64
-#: exercises/templates/exercise/view.html:154
+#: exercises/templates/exercise/view.html:204
#: nutrition/templates/ingredient/view.html:42
msgid "Decline"
msgstr "Ablehnen"
@@ -1831,32 +1904,42 @@ msgstr "Bilder"
msgid "Add new image"
msgstr "Neues Bild hinzufügen"
-#: exercises/templates/exercise/view.html:147
+#: exercises/templates/exercise/view.html:148
+msgid "Videos"
+msgstr ""
+
+#: exercises/templates/exercise/view.html:187 exercises/views/videos.py:94
+#, fuzzy
+#| msgid "Add new image"
+msgid "Add new video"
+msgstr "Neues Bild hinzufügen"
+
+#: exercises/templates/exercise/view.html:197
msgid "Images pending review"
msgstr "Bilder ohne Freigabe"
-#: exercises/templates/exercise/view.html:168
+#: exercises/templates/exercise/view.html:218
msgid "Comments for this exercise"
msgstr "Kommentare für diese Übung"
-#: exercises/templates/exercise/view.html:196
+#: exercises/templates/exercise/view.html:246
msgid "Add new comment"
msgstr "Kommentar hinzufügen"
-#: exercises/templates/exercise/view.html:210
+#: exercises/templates/exercise/view.html:260
msgid "The diagram shows the most used muscles on this exercise"
msgstr "Das Diagramm zeigt die meistbeanspruchten Muskeln"
-#: exercises/templates/exercise/view.html:251
+#: exercises/templates/exercise/view.html:301
#: manager/templates/workout/log.html:10 manager/templates/workout/log.html:11
msgid "Weight log"
msgstr "Gewichtslog"
-#: exercises/templates/exercise/view.html:256
+#: exercises/templates/exercise/view.html:306
msgid "Exercise Variations"
msgstr "Übungsvariationen"
-#: exercises/templates/exercise/view.html:277
+#: exercises/templates/exercise/view.html:327
msgid "Submit a correction"
msgstr "Eine Korrektur einreichen"
@@ -1893,33 +1976,33 @@ msgstr "Übungskommentar hinzufügen"
msgid "Delete equipment?"
msgstr "Gerät löschen?"
-#: exercises/views/exercises.py:228
+#: exercises/views/exercises.py:229
#, python-format
msgid ""
"%(name_original)s is too similar to existing exercise \"%(exercise_name)s\""
msgstr ""
"%(name_original)s ist zu ähnlich zur bestehenden Übung „%(exercise_name)s“"
-#: exercises/views/exercises.py:246
+#: exercises/views/exercises.py:247
msgid "Add exercise"
msgstr "Neue Übung hinzufügen"
-#: exercises/views/exercises.py:366
+#: exercises/views/exercises.py:367
msgid "Thank you. Once the changes are reviewed the exercise will be updated."
msgstr ""
"Danke. Die Übung wird aktualisiert, sobald die Änderungen überprüft wurden."
-#: exercises/views/exercises.py:379
+#: exercises/views/exercises.py:380
#, python-brace-format
msgid "Correct {0}"
msgstr "{0} korrigieren"
-#: exercises/views/exercises.py:421
+#: exercises/views/exercises.py:422
msgid "This will delete the exercise from all workouts."
msgstr ""
"Das Löschen der Übung wird sie auch aus allen Trainingsplänen entfernen."
-#: exercises/views/exercises.py:473
+#: exercises/views/exercises.py:474
msgid "Exercise was successfully marked as rejected"
msgstr "Die Übung wurde erfolgreich abgelehnt"
@@ -1931,6 +2014,11 @@ msgstr "Übungsbild bearbeiten"
msgid "Delete exercise image?"
msgstr "Übungsbild wirklich löschten?"
+#: exercises/views/videos.py:144 nutrition/views/log.py:230
+#: nutrition/views/unit_ingredient.py:139
+msgid "Delete?"
+msgstr "Löschen?"
+
#: gallery/templates/images/overview.html:62
msgid "Add image"
msgstr "Bild hinzufügen"
@@ -1999,8 +2087,8 @@ msgid "Contract type"
msgstr "Vertragstyp"
#: gym/models/contract.py:208 gym/templates/contract/view.html:59
-#: manager/templates/log/add.html:52 nutrition/forms.py:58
-#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:92
+#: manager/templates/log/add.html:52 nutrition/forms.py:59
+#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:102
#: nutrition/models/meal_item.py:72
msgid "Amount"
msgstr "Menge"
@@ -2444,6 +2532,7 @@ msgstr ""
"verschickt werden"
#: mailer/templates/mailer/gym/preview.html:22
+#: software/templates/about_us.html:59
msgid "Current version"
msgstr "Aktuelle Version"
@@ -2480,7 +2569,8 @@ msgstr ""
#: manager/models/log.py:90 manager/models/setting.py:47
#: manager/models/setting.py:78 manager/templates/log/add.html:53
#: manager/templates/log/add.html:55 manager/templates/set/formset.html:11
-#: manager/templates/set/formset.html:13 nutrition/forms.py:62
+#: manager/templates/set/formset.html:13 measurements/models/category.py:58
+#: nutrition/forms.py:63
msgid "Unit"
msgstr "Einheit"
@@ -2551,10 +2641,6 @@ msgstr ""
msgid "schedule"
msgstr "Zeitplan"
-#: manager/models/schedule_step.py:56
-msgid "Duration"
-msgstr "Dauer"
-
#: manager/models/schedule_step.py:57
msgid "The duration in weeks"
msgstr "Die Dauer in Wochen"
@@ -2843,7 +2929,7 @@ msgstr ""
#: manager/templates/schedule/view.html:290
#: manager/templates/workout/view.html:142
#: manager/templates/workout/view.html:217
-#: nutrition/templates/plan/view.html:415
+#: nutrition/templates/plan/view.html:417
msgid "Download as PDF"
msgstr "Als PDF runterladen"
@@ -3091,30 +3177,34 @@ msgstr "Trainingseindruck für den {0} bearbeiten"
msgid "This will delete all weight logs for this day as well."
msgstr "Dies wird ebenfalls alle Gewichtslogs für diesen Tag löschen."
-#: nutrition/forms.py:121
+#: measurements/models/measurement.py:69
+msgid "Value"
+msgstr ""
+
+#: nutrition/forms.py:122
msgid "Calculate"
msgstr "Berechnen"
-#: nutrition/forms.py:194 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:195 nutrition/templates/rate/form.html:76
msgid "Basic caloric intake"
msgstr "Basis-Kalorienzufuhr"
-#: nutrition/forms.py:195
+#: nutrition/forms.py:196
msgid "Your basic caloric intake as calculated for your data"
msgstr "Deine Basis-Kalorienzufuhr wird aus deinen Angaben berechnet"
-#: nutrition/forms.py:201
+#: nutrition/forms.py:202
msgid "Additional calories"
msgstr "Zusätzliche Kalorien"
-#: nutrition/forms.py:203
+#: nutrition/forms.py:204
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
msgstr "Zusat"
-#: nutrition/forms.py:231 nutrition/models/ingredient_weight_unit.py:39
-#: nutrition/models/log.py:71 nutrition/models/meal_item.py:53
+#: nutrition/forms.py:232 nutrition/models/ingredient_weight_unit.py:39
+#: nutrition/models/log.py:81 nutrition/models/meal_item.py:53
#: nutrition/templates/log/detail.html:155
msgid "Ingredient"
msgstr "Zutat"
@@ -3133,14 +3223,14 @@ msgstr "In g pro 100 g Produkt"
#: nutrition/models/ingredient.py:123
#: nutrition/templates/ingredient/view.html:96
#: nutrition/templates/log/detail.html:78
-#: nutrition/templates/plan/view.html:262 nutrition/views/plan.py:406
+#: nutrition/templates/plan/view.html:264 nutrition/views/plan.py:406
msgid "Sugar content in carbohydrates"
msgstr "Davon Zucker"
#: nutrition/models/ingredient.py:141
#: nutrition/templates/ingredient/view.html:112
#: nutrition/templates/log/detail.html:104
-#: nutrition/templates/plan/view.html:274 nutrition/views/plan.py:420
+#: nutrition/templates/plan/view.html:276 nutrition/views/plan.py:420
msgid "Saturated fat content in fats"
msgstr "Davon gesättigte Fettsäuren"
@@ -3148,7 +3238,7 @@ msgstr "Davon gesättigte Fettsäuren"
#: nutrition/templates/ingredient/view.html:134
#: nutrition/templates/log/detail.html:122
#: nutrition/templates/log/detail.html:178
-#: nutrition/templates/plan/view.html:285 nutrition/views/plan.py:426
+#: nutrition/templates/plan/view.html:287 nutrition/views/plan.py:426
msgid "Fibres"
msgstr "Ballastoffe"
@@ -3156,7 +3246,7 @@ msgstr "Ballastoffe"
#: nutrition/templates/ingredient/view.html:144
#: nutrition/templates/log/detail.html:135
#: nutrition/templates/log/detail.html:181
-#: nutrition/templates/plan/view.html:291 nutrition/views/plan.py:432
+#: nutrition/templates/plan/view.html:293 nutrition/views/plan.py:432
msgid "Sodium"
msgstr "Natrium"
@@ -3204,10 +3294,20 @@ 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:55
+msgid "Meal"
+msgstr "Mahlzeit"
+
#: nutrition/models/meal.py:61
msgid "Time (approx)"
msgstr "Uhrzeit (ca.)"
+#: nutrition/models/meal.py:68
+msgid ""
+"Give meals a textual description / name such as \"Breakfast\" or \"after "
+"workout\""
+msgstr ""
+
#: nutrition/models/plan.py:71
msgid ""
"A description of the goal of the plan, e.g. \"Gain mass\" or \"Prepare for "
@@ -3357,12 +3457,12 @@ msgstr ""
#: nutrition/templates/ingredient/view.html:71
#: nutrition/templates/log/detail.html:31
-#: nutrition/templates/plan/view.html:227 nutrition/views/plan.py:376
+#: nutrition/templates/plan/view.html:229 nutrition/views/plan.py:376
msgid "Macronutrients"
msgstr "Makronährstoffe"
#: nutrition/templates/ingredient/view.html:80
-#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:244
+#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:246
msgid "kJ"
msgstr "kJ"
@@ -3375,7 +3475,7 @@ msgstr "k.A."
#: nutrition/templates/ingredient/view.html:128
#: nutrition/templates/log/detail.html:119
-#: nutrition/templates/plan/view.html:282
+#: nutrition/templates/plan/view.html:284
msgid "Others"
msgstr "Andere"
@@ -3404,7 +3504,7 @@ msgstr "Zutat entfernen"
#: nutrition/templates/log/detail.html:7
#: nutrition/templates/log/overview.html:7
-#: nutrition/templates/plan/view.html:300
+#: nutrition/templates/plan/view.html:302
msgid "Nutrition diary"
msgstr "Ernährungstagebuch"
@@ -3414,13 +3514,13 @@ msgstr "Geplant"
#: nutrition/templates/log/detail.html:33
#: nutrition/templates/log/overview.html:31
-#: nutrition/templates/plan/view.html:308
+#: nutrition/templates/plan/view.html:310
msgid "Logged"
msgstr "Protokolliert"
#: nutrition/templates/log/detail.html:34
#: nutrition/templates/log/overview.html:32
-#: nutrition/templates/plan/view.html:309
+#: nutrition/templates/plan/view.html:311
msgid "Difference"
msgstr "Unterschied"
@@ -3433,7 +3533,7 @@ msgid "g"
msgstr "g"
#: nutrition/templates/log/overview.html:53
-#: nutrition/templates/plan/view.html:330
+#: nutrition/templates/plan/view.html:332
msgid "nothing found"
msgstr "Nichts gefunden"
@@ -3453,66 +3553,66 @@ msgstr "Diese Mahlzeit protokollieren"
msgid "Add ingredient to meal"
msgstr "Zutat zur Mahlzeit hinzufügen"
-#: nutrition/templates/plan/view.html:150
+#: nutrition/templates/plan/view.html:152
msgid "No items for this meal."
msgstr "Keine Zutaten für diese Mahlzeit."
-#: nutrition/templates/plan/view.html:188
+#: nutrition/templates/plan/view.html:190
msgid "No meals for this plan."
msgstr "Keine Mahlzeiten für diesen Ernährungsplan."
-#: nutrition/templates/plan/view.html:200
+#: nutrition/templates/plan/view.html:202
msgid "Log this Plan"
msgstr "Diesen Plan protokollieren"
-#: nutrition/templates/plan/view.html:206
+#: nutrition/templates/plan/view.html:208
msgid "Add a new meal"
msgstr "Neue Mahlzeit hinzufügen"
-#: nutrition/templates/plan/view.html:216 nutrition/views/plan.py:369
+#: nutrition/templates/plan/view.html:218 nutrition/views/plan.py:369
msgid "Nutritional data"
msgstr "Ernährungswerte"
-#: nutrition/templates/plan/view.html:219
+#: nutrition/templates/plan/view.html:221
#, python-format
msgid "Based on the weight entry dated %(date)s (%(weight)s)"
msgstr "Basierend auf dem Gewichtseintrag vom %(date)s (%(weight)s)"
-#: nutrition/templates/plan/view.html:228 nutrition/views/plan.py:377
+#: nutrition/templates/plan/view.html:230 nutrition/views/plan.py:377
msgid "Total"
msgstr "Gesamt"
-#: nutrition/templates/plan/view.html:229 nutrition/views/plan.py:378
+#: nutrition/templates/plan/view.html:231 nutrition/views/plan.py:378
msgid "Percent of energy"
msgstr "Prozent der Energie"
-#: nutrition/templates/plan/view.html:232 nutrition/views/plan.py:379
+#: nutrition/templates/plan/view.html:234 nutrition/views/plan.py:379
msgid "g per body kg"
msgstr "g pro Körper-kg"
-#: nutrition/templates/plan/view.html:234
+#: nutrition/templates/plan/view.html:236
msgid "oz per body lb"
msgstr "oz pro Körper-lb"
-#: nutrition/templates/plan/view.html:338
+#: nutrition/templates/plan/view.html:340
msgid "View complete nutrition log"
msgstr "Komplettes Ernährungsprotokoll anzeigen"
-#: nutrition/templates/plan/view.html:371
+#: nutrition/templates/plan/view.html:373
msgid "Goal"
msgstr "Ziel"
-#: nutrition/templates/plan/view.html:382
+#: nutrition/templates/plan/view.html:384
msgid ""
"You have selected that this nutritional plan has a\n"
" goal amount of calories. Use the calculator or enter the value\n"
" yourself."
msgstr ""
-"Du hast angegeben, dass dieser Ernährungsplan eine Zielmenge an Kalorien hat."
-"\n"
+"Du hast angegeben, dass dieser Ernährungsplan eine Zielmenge an Kalorien "
+"hat.\n"
"Benutze den Kalorienrechner oder gebe einen Wert ein."
-#: nutrition/templates/plan/view.html:392
+#: nutrition/templates/plan/view.html:394
msgid ""
"If you find the ingredient list too short, you might want to activate the "
"preference to also show English ingredients."
@@ -3520,15 +3620,15 @@ msgstr ""
"Wenn die Liste der verfügbaren Zutaten zu kurz ist, kannst du die Option "
"benutzen, um auch Zutaten auf englisch anzuzeigen."
-#: nutrition/templates/plan/view.html:421
+#: nutrition/templates/plan/view.html:423
msgid "Edit nutrition plan"
msgstr "Ernährungplan bearbeiten"
-#: nutrition/templates/plan/view.html:425
+#: nutrition/templates/plan/view.html:427
msgid "Make a copy of this nutrition plan"
msgstr "Eine Kopie des Ernährungplanes machen"
-#: nutrition/templates/plan/view.html:431
+#: nutrition/templates/plan/view.html:433
msgid "Delete nutrition plan"
msgstr "Ernährungplan löschen"
@@ -3625,10 +3725,6 @@ msgstr "Zutat hinzufügen"
msgid "Ingredient was successfully marked as rejected"
msgstr "Zutat wurde erfolgreich als abgelehnt markiert"
-#: nutrition/views/log.py:229 nutrition/views/unit_ingredient.py:139
-msgid "Delete?"
-msgstr "Löschen?"
-
#: nutrition/views/meal.py:55
msgid "Add new meal"
msgstr "Neue Mahlzeit hinzufügen"
@@ -4059,11 +4155,11 @@ msgstr ""
msgid "Re-Submit"
msgstr "Wieder abschicken"
-#: weight/templates/overview.html:68
+#: weight/templates/overview.html:51
msgid "Export as CSV"
msgstr "Als CSV-Datei exportieren"
-#: weight/templates/overview.html:72
+#: weight/templates/overview.html:55
msgid "Import from spreadsheet"
msgstr "Aus Tabellenkalkulation importieren"
@@ -4081,6 +4177,12 @@ msgstr "Erfolgreich gelöscht."
msgid "Delete weight entry for the %s"
msgstr "Gewichtseintrag für den %s löschen"
+#~ msgid "Your current weight is: "
+#~ msgstr "Dein aktuelles Gewicht ist: "
+
+#~ msgid "Released under the Affero GPL"
+#~ msgstr "Unter der Affero GPL veröffentlicht"
+
#~ msgid "Responsible for the content of this site as per German law §5 TMG:"
#~ msgstr "Angaben gemäß §5 TMG:"
@@ -4235,9 +4337,6 @@ msgstr "Gewichtseintrag für den %s löschen"
#~ "komfortabel online verwaltet und bearbeitet werden. Wenn du interessiert\n"
#~ "bist, besuche den Link und fang an zu übersetzten."
-#~ msgid "Code"
-#~ msgstr "Quellcode"
-
#~ msgid ""
#~ "Obviously, you are highly encouraged to clone the\n"
#~ "repo and start hacking! Once you are ready, send a pull request and we\n"
@@ -4382,9 +4481,6 @@ msgstr "Gewichtseintrag für den %s löschen"
#~ msgid "Pause!"
#~ msgstr "Pause!"
-#~ msgid "Meal"
-#~ msgstr "Mahlzeit"
-
#~ msgid "There is no chart here because there are no weight entries."
#~ msgstr "Es gibt kein Diagramm hier weil es keine Gewichtseinträge gibt."
diff --git a/wger/locale/el/LC_MESSAGES/django.po b/wger/locale/el/LC_MESSAGES/django.po
index d0234c426..adbfb3ccf 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: 2021-08-17 17:23+0200\n"
+"POT-Creation-Date: 2022-02-15 14:51+0100\n"
"PO-Revision-Date: 2021-04-17 13:26+0000\n"
"Last-Translator: Eugenia Russell <[email protected]>\n"
"Language-Team: Greek <https://hosted.weblate.org/projects/wger/web/el/>\n"
@@ -52,16 +52,16 @@ msgstr "Γλώσσες"
msgid "Nothing found."
msgstr "Δεν βρέθηκε τίποτα."
-#: config/templates/language/overview.html:16 core/templates/index.html:147
-#: core/templates/index.html:199 manager/templates/calendar/month.html:132
+#: config/templates/language/overview.html:16 core/templates/index.html:137
+#: core/templates/index.html:189 manager/templates/calendar/month.html:132
#: manager/templates/schedule/overview.html:28
#: manager/templates/schedule/view.html:146
#: manager/templates/workout/overview.html:28
#: nutrition/templates/ingredient/overview.html:45
#: nutrition/templates/plan/overview.html:23
-#: nutrition/templates/plan/view.html:148
-#: nutrition/templates/plan/view.html:151
-#: nutrition/templates/plan/view.html:189
+#: nutrition/templates/plan/view.html:150
+#: nutrition/templates/plan/view.html:153
+#: nutrition/templates/plan/view.html:191
msgid "Add one now."
msgstr "Προσθήκη τώρα."
@@ -82,7 +82,7 @@ msgstr "Προσθήκη τώρα."
#: gym/templates/gym/member_list.html:244
#: gym/templates/gym/member_list.html:281
#: mailer/templates/mailer/gym/overview.html:43
-#: weight/templates/overview.html:78
+#: weight/templates/overview.html:61
msgid "Add"
msgstr "Προσθήκη"
@@ -121,14 +121,14 @@ msgstr "Εμφάνιση"
#: config/templates/language/view.html:91 core/templates/user/api_key.html:44
#: core/templates/user/preferences.html:28
-#: exercises/templates/exercise/view.html:273
-#: exercises/templates/exercise/view.html:296 gym/models/contract.py:200
+#: exercises/templates/exercise/view.html:323
+#: exercises/templates/exercise/view.html:346 gym/models/contract.py:200
#: gym/templates/contract/view.html:41 gym/templates/contract/view.html:106
#: gym/templates/gym/member_list.html:248
#: manager/templates/schedule/view.html:281
#: manager/templates/workout/view.html:206
#: nutrition/templates/ingredient/view.html:226
-#: nutrition/templates/plan/view.html:409 weight/templates/overview.html:62
+#: nutrition/templates/plan/view.html:411 weight/templates/overview.html:45
msgid "Options"
msgstr "Επιλογές"
@@ -142,12 +142,12 @@ msgstr "Επιλογές"
#: core/templates/weight_unit/list.html:17
#: exercises/templates/categories/admin-overview.html:16
#: exercises/templates/equipment/admin-overview.html:16
-#: exercises/templates/exercise/view.html:180
-#: exercises/templates/exercise/view.html:301
+#: exercises/templates/exercise/view.html:230
+#: exercises/templates/exercise/view.html:351
#: exercises/templates/muscles/admin-overview.html:16
-#: exercises/views/comments.py:63 gallery/views/images.py:96
-#: gym/templates/admin_notes/list.html:32 gym/templates/contract/list.html:31
-#: gym/templates/contract/view.html:107
+#: exercises/views/comments.py:63 exercises/views/videos.py:69
+#: gallery/views/images.py:96 gym/templates/admin_notes/list.html:32
+#: gym/templates/contract/list.html:31 gym/templates/contract/view.html:107
#: gym/templates/contract_option/list.html:31
#: gym/templates/contract_type/list.html:31 gym/templates/document/list.html:38
#: gym/templates/gym/list.html:19 gym/templates/gym/list.html:43
@@ -158,7 +158,7 @@ msgstr "Επιλογές"
#: manager/templates/calendar/partial_overview_table.html:18
#: manager/templates/schedule/view.html:121
#: nutrition/templates/ingredient/view.html:198
-#: nutrition/templates/plan/view.html:89 nutrition/templates/plan/view.html:124
+#: nutrition/templates/plan/view.html:89 nutrition/templates/plan/view.html:126
#: nutrition/templates/units/list.html:18
msgid "Edit"
msgstr "Επεξεργασία"
@@ -172,9 +172,9 @@ msgstr "Επεξεργασία"
#: exercises/templates/categories/admin-overview.html:17
#: exercises/templates/equipment/admin-overview.html:17
#: exercises/templates/exercise/view.html:68
-#: exercises/templates/exercise/view.html:155
-#: exercises/templates/exercise/view.html:185
-#: exercises/templates/exercise/view.html:306
+#: exercises/templates/exercise/view.html:205
+#: exercises/templates/exercise/view.html:235
+#: exercises/templates/exercise/view.html:356
#: exercises/templates/muscles/admin-overview.html:17
#: gym/templates/admin_notes/list.html:40
#: gym/templates/contract_option/list.html:39
@@ -187,7 +187,7 @@ msgstr "Επεξεργασία"
#: nutrition/templates/ingredient/view.html:199
#: nutrition/templates/ingredient/view.html:239
#: nutrition/templates/log/detail.html:197
-#: nutrition/templates/plan/view.html:95 nutrition/templates/plan/view.html:130
+#: nutrition/templates/plan/view.html:95 nutrition/templates/plan/view.html:132
#: nutrition/templates/units/list.html:20
msgid "Delete"
msgstr "Διαγραφή"
@@ -321,7 +321,7 @@ msgid "Some way of answering you (e-mail, etc.)"
msgstr "Κάποιος τρόπος επικοινωνίας μαζί σας (email, κλπ)"
#: core/forms.py:265 exercises/models/comment.py:40 manager/models/set.py:60
-#: manager/models/setting.py:99 nutrition/models/log.py:61
+#: manager/models/setting.py:99 nutrition/models/log.py:71
msgid "Comment"
msgstr "Σχόλια"
@@ -460,7 +460,7 @@ msgstr ""
msgid "Age"
msgstr "Ηλικία"
-#: core/models/profile.py:202 nutrition/forms.py:98
+#: core/models/profile.py:202 nutrition/forms.py:99
msgid "Height (cm)"
msgstr "Ύψος (cm)"
@@ -512,7 +512,7 @@ msgstr ""
"Συνολική εισαγωγή θερμίδων, συμπεριλαμβάνοντας π.χ. οποιαδήποτε υπερβολή"
#: core/models/profile.py:305 nutrition/models/ingredient_weight_unit.py:45
-#: nutrition/models/log.py:80 nutrition/models/meal_item.py:58
+#: nutrition/models/log.py:90 nutrition/models/meal_item.py:58
msgid "Weight unit"
msgstr "Μονάδα βάρους"
@@ -547,9 +547,9 @@ msgstr "Το σύνολο όλων των ωρών θα πρέπει να είν
#: gym/models/user_document.py:87 gym/templates/contract/view.html:50
#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:96
#: gym/views/gym.py:156 manager/models/schedule.py:55
-#: manager/models/workout.py:56 nutrition/models/ingredient.py:96
-#: nutrition/models/ingredient_category.py:26
-#: nutrition/models/weight_unit.py:38
+#: manager/models/workout.py:56 measurements/models/category.py:53
+#: nutrition/models/ingredient.py:96 nutrition/models/ingredient_category.py:26
+#: nutrition/models/meal.py:66 nutrition/models/weight_unit.py:38
#: nutrition/templates/ingredient/pending.html:15
#: nutrition/templates/ingredient/view.html:185
msgid "Name"
@@ -606,11 +606,11 @@ msgstr ""
msgid "Dashboard"
msgstr "Πίνακας Ελέγχου"
-#: core/templates/index.html:31 manager/templates/calendar/month.html:115
+#: core/templates/index.html:21 manager/templates/calendar/month.html:115
msgid "Add log to day"
msgstr "Προσθήκη ιστορικού στην μέρα"
-#: core/templates/index.html:35 manager/templates/calendar/month.html:120
+#: core/templates/index.html:25 manager/templates/calendar/month.html:120
msgid ""
"Click to add weight logs to a training\n"
"day in your current workout:"
@@ -618,7 +618,7 @@ msgstr ""
"Επιλέξτε για την εισαγωγή ιστορικού βαρών σε μιά μέρα \n"
"προπόνησης στην τρέχουσα προπόνηση:"
-#: core/templates/index.html:43 core/templates/index.html:83
+#: core/templates/index.html:33 core/templates/index.html:73
#: core/templates/misc/fragments/shariff_modal.html:29
#: core/templates/template.html:125 manager/templates/calendar/month.html:138
#: manager/templates/schedule/view.html:246
@@ -628,17 +628,17 @@ msgstr ""
msgid "Close"
msgstr "Κλείσιμο"
-#: core/templates/index.html:54 core/templates/index.html:203
+#: core/templates/index.html:44 core/templates/index.html:193
msgid "Add new diary entry"
msgstr ""
-#: core/templates/index.html:59
+#: core/templates/index.html:49
msgid ""
"Click to add an entry to your nutrition diary for today. You can either log "
"a meal as you defined it, or entry any number of custom entries."
msgstr ""
-#: core/templates/index.html:67 core/templates/index.html:171
+#: core/templates/index.html:57 core/templates/index.html:161
#: core/templates/user/overview.html:171
#: nutrition/templates/ingredient/view.html:79
#: nutrition/templates/log/detail.html:40
@@ -647,19 +647,19 @@ msgstr ""
#: nutrition/templates/log/overview.html:7
#: nutrition/templates/log/overview.html:44
#: nutrition/templates/plan/overview.html:17
-#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:242
-#: nutrition/templates/plan/view.html:301
-#: nutrition/templates/plan/view.html:321
-#: nutrition/templates/plan/view.html:363
-#: nutrition/templates/plan/view.html:373
+#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:244
+#: nutrition/templates/plan/view.html:303
+#: nutrition/templates/plan/view.html:323
+#: nutrition/templates/plan/view.html:365
+#: nutrition/templates/plan/view.html:375
msgid "kcal"
msgstr "kcal"
-#: core/templates/index.html:79 nutrition/templates/plan/view.html:348
+#: core/templates/index.html:69 nutrition/templates/plan/view.html:350
msgid "Add custom diary entry"
msgstr ""
-#: core/templates/index.html:94 core/templates/index.html:102
+#: core/templates/index.html:84 core/templates/index.html:92
#: manager/models/day.py:34 manager/models/log.py:56
#: manager/models/session.py:60 manager/models/workout.py:109
#: manager/templates/schedule/view.html:105
@@ -670,80 +670,80 @@ msgstr ""
msgid "Workout"
msgstr "Προπόνηση"
-#: core/templates/index.html:128
+#: core/templates/index.html:118
msgid "This workout is part of a schedule:"
msgstr "Αυτή η προπόνηση είναι μέρος του προγράμματος:"
-#: core/templates/index.html:133
+#: core/templates/index.html:123
msgid ""
"The current workout is selected from your active schedule or, if you don't "
"have one, simply by date."
msgstr ""
-#: core/templates/index.html:142 manager/templates/calendar/month.html:188
+#: core/templates/index.html:132 manager/templates/calendar/month.html:188
msgid "Add new log"
msgstr "Νέα εγγραφή"
-#: core/templates/index.html:147 core/templates/user/overview.html:58
+#: core/templates/index.html:137 core/templates/user/overview.html:58
#: manager/templates/calendar/month.html:128
#: manager/templates/schedule/view.html:146
#: manager/templates/workout/overview.html:28
msgid "No workouts found."
msgstr "Δεν βρέθηκαν προπονήσεις."
-#: core/templates/index.html:157 nutrition/models/log.py:48
+#: core/templates/index.html:147 nutrition/models/log.py:49
#: nutrition/models/meal.py:49 nutrition/models/meal_item.py:47
#: nutrition/models/plan.py:94 nutrition/templates/plan/view.html:11
#: nutrition/templates/plan/view.html:19
msgid "Nutrition plan"
msgstr "Πρόγραμμα διατροφής"
-#: core/templates/index.html:169 core/templates/user/overview.html:155
+#: core/templates/index.html:159 core/templates/user/overview.html:155
#: nutrition/models/ingredient.py:100
#: nutrition/templates/ingredient/view.html:77
#: nutrition/templates/log/detail.html:39
#: nutrition/templates/log/detail.html:156
-#: nutrition/templates/plan/view.html:53 nutrition/templates/plan/view.html:241
-#: nutrition/templates/plan/view.html:358
-#: nutrition/templates/plan/view.html:362 nutrition/views/plan.py:384
+#: nutrition/templates/plan/view.html:53 nutrition/templates/plan/view.html:243
+#: nutrition/templates/plan/view.html:360
+#: nutrition/templates/plan/view.html:364 nutrition/views/plan.py:384
msgid "Energy"
msgstr "Ενέργεια"
-#: core/templates/index.html:175 core/templates/user/overview.html:156
+#: core/templates/index.html:165 core/templates/user/overview.html:156
#: nutrition/models/ingredient.py:105
#: nutrition/templates/ingredient/view.html:84
#: nutrition/templates/log/detail.html:52
#: nutrition/templates/log/detail.html:174
-#: nutrition/templates/plan/view.html:54 nutrition/templates/plan/view.html:249
+#: nutrition/templates/plan/view.html:54 nutrition/templates/plan/view.html:251
#: nutrition/views/plan.py:390
msgid "Protein"
msgstr "Προτεϊνες"
-#: core/templates/index.html:181 core/templates/user/overview.html:157
+#: core/templates/index.html:171 core/templates/user/overview.html:157
#: nutrition/models/ingredient.py:113
#: nutrition/templates/ingredient/view.html:90
#: nutrition/templates/log/detail.html:65
#: nutrition/templates/log/detail.html:175
-#: nutrition/templates/plan/view.html:55 nutrition/templates/plan/view.html:255
+#: nutrition/templates/plan/view.html:55 nutrition/templates/plan/view.html:257
#: nutrition/views/plan.py:398
msgid "Carbohydrates"
msgstr "Υδατάνθρακες"
-#: core/templates/index.html:187 core/templates/user/overview.html:158
+#: core/templates/index.html:177 core/templates/user/overview.html:158
#: nutrition/models/ingredient.py:131
#: nutrition/templates/ingredient/view.html:106
#: nutrition/templates/log/detail.html:91
#: nutrition/templates/log/detail.html:176
-#: nutrition/templates/plan/view.html:56 nutrition/templates/plan/view.html:268
+#: nutrition/templates/plan/view.html:56 nutrition/templates/plan/view.html:270
#: nutrition/views/plan.py:412
msgid "Fat"
msgstr "Λιπαρή ύλη"
-#: core/templates/index.html:199 nutrition/templates/plan/overview.html:22
+#: core/templates/index.html:189 nutrition/templates/plan/overview.html:22
msgid "No nutrition plans."
msgstr "Κανένα πρόγραμμα διατροφής."
-#: core/templates/index.html:213 core/templates/user/overview.html:112
+#: core/templates/index.html:203 core/templates/user/overview.html:112
#: core/templates/user/overview.html:121 manager/forms.py:173
#: manager/helpers.py:89 manager/models/log.py:84 manager/models/setting.py:67
#: manager/templates/log/add.html:54 manager/templates/set/formset.html:12
@@ -752,11 +752,7 @@ msgstr "Κανένα πρόγραμμα διατροφής."
msgid "Weight"
msgstr "Βάρος"
-#: core/templates/index.html:217
-msgid "Your current weight is: "
-msgstr "Το τρέχων βάρος σας είναι: "
-
-#: core/templates/index.html:248 core/templates/navigation.html:97
+#: core/templates/index.html:210 core/templates/navigation.html:97
#: weight/views.py:70
msgid "Add weight entry"
msgstr "Νέα εγγραφή βάρους"
@@ -788,7 +784,7 @@ msgstr "Λίστα αδειών"
msgid "Nothing found"
msgstr "Δεν βρέθηκε τίποτα"
-#: core/templates/misc/about.html:4 core/templates/template.html:201
+#: core/templates/misc/about.html:4 core/templates/template.html:175
#: core/templates/template_features.html:118
#: core/templates/template_no_context.html:88
msgid "Imprint"
@@ -804,8 +800,8 @@ msgid ""
msgstr ""
#: core/templates/misc/fragments/shariff_modal.html:22
-#: nutrition/templates/plan/view.html:385
-#: nutrition/templates/plan/view.html:394
+#: nutrition/templates/plan/view.html:387
+#: nutrition/templates/plan/view.html:396
msgid "That's done here"
msgstr "Αυτό γίνεται εδώ"
@@ -895,7 +891,7 @@ msgstr "Ασκήσεις που αναμένουν εξέταση"
msgid "Equipment"
msgstr "Όργανα"
-#: core/templates/navigation.html:78 exercises/templates/exercise/view.html:208
+#: core/templates/navigation.html:78 exercises/templates/exercise/view.html:258
msgid "Muscles"
msgstr "Μύες"
@@ -968,7 +964,7 @@ msgstr ""
msgid "Get the code"
msgstr "Κατεβάστε τον κώδικα"
-#: core/templates/navigation.html:175 core/templates/template.html:193
+#: core/templates/navigation.html:175 core/templates/template.html:205
#: core/templates/template_features.html:100
msgid "Translate"
msgstr "Μετάφραση"
@@ -1127,15 +1123,11 @@ msgstr ""
msgid "Create some demo entries"
msgstr "Δημιουργήστε μερικές δοκιμαστικές εγγραφές"
-#: core/templates/template.html:202 core/templates/template_features.html:122
+#: core/templates/template.html:176 core/templates/template_features.html:122
#: core/templates/template_no_context.html:89 software/templates/tos.html:7
msgid "Terms of service"
msgstr ""
-#: core/templates/template.html:209 core/templates/template.html:210
-msgid "Released under the Affero GPL"
-msgstr "Released under the Affero GPL"
-
#: core/templates/template_features.html:62 software/templates/features.html:9
#: software/templates/features.html:120
msgid "Features"
@@ -1242,9 +1234,10 @@ msgstr "Νέα προπόνηση"
#: core/templates/user/overview.html:120 core/templates/user/overview.html:153
#: exercises/models/exercise.py:77 gallery/models/image.py:47
#: manager/helpers.py:88 manager/models/log.py:98 manager/models/session.py:67
-#: nutrition/models/ingredient.py:85 nutrition/models/ingredient.py:87
-#: nutrition/models/ingredient.py:190 nutrition/templates/log/overview.html:30
-#: nutrition/templates/plan/view.html:307 weight/models.py:32
+#: measurements/models/measurement.py:64 nutrition/models/ingredient.py:85
+#: nutrition/models/ingredient.py:87 nutrition/models/ingredient.py:190
+#: nutrition/templates/log/overview.html:30
+#: nutrition/templates/plan/view.html:309 weight/models.py:32
#: weight/templates/import_csv_preview.html:13
#: weight/templates/import_csv_preview.html:42 weight/views.py:150
msgid "Date"
@@ -1252,10 +1245,10 @@ msgstr "Ημερομηνία"
#: core/templates/user/overview.html:35 core/templates/user/overview.html:154
#: exercises/models/exercise.py:61 exercises/templates/exercise/view.html:88
-#: exercises/views/exercises.py:189 gallery/models/image.py:70
+#: exercises/views/exercises.py:190 gallery/models/image.py:70
#: gym/models/contract.py:57 gym/models/contract.py:107
#: manager/models/day.py:37 manager/models/workout.py:62
-#: nutrition/models/plan.py:69
+#: measurements/models/measurement.py:79 nutrition/models/plan.py:69
msgid "Description"
msgstr "Περιγραφή"
@@ -1416,11 +1409,11 @@ msgstr "Προτιμήσεις"
msgid "Change password"
msgstr "Αλλαγή κωδικού"
-#: core/templatetags/wger_extras.py:217
+#: core/templatetags/wger_extras.py:229
msgid "kg"
msgstr "kg"
-#: core/templatetags/wger_extras.py:219
+#: core/templatetags/wger_extras.py:231
#: nutrition/templates/ingredient/view.html:86
#: nutrition/templates/ingredient/view.html:92
#: nutrition/templates/ingredient/view.html:99
@@ -1432,28 +1425,28 @@ msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr "g"
-#: core/templatetags/wger_extras.py:222
+#: core/templatetags/wger_extras.py:234
msgid "lb"
msgstr "lb"
-#: core/templatetags/wger_extras.py:224
+#: core/templatetags/wger_extras.py:236
msgctxt "weight unit, i.e. ounces"
msgid "oz"
msgstr "oz"
#: core/views/languages.py:85 exercises/views/categories.py:121
-#: exercises/views/equipment.py:106 exercises/views/exercises.py:422
+#: exercises/views/equipment.py:106 exercises/views/exercises.py:423
#: exercises/views/images.py:128 exercises/views/muscles.py:118
-#: manager/views/schedule.py:311 manager/views/schedule_step.py:129
-#: manager/views/workout.py:268 manager/views/workout_session.py:141
-#: nutrition/views/ingredient.py:144 nutrition/views/plan.py:120
-#: nutrition/views/unit.py:111
+#: exercises/views/videos.py:129 manager/views/schedule.py:311
+#: manager/views/schedule_step.py:129 manager/views/workout.py:268
+#: manager/views/workout_session.py:141 nutrition/views/ingredient.py:144
+#: nutrition/views/plan.py:120 nutrition/views/unit.py:111
msgid "Successfully deleted"
msgstr "Επιτυχής διαγραφή"
#: core/views/languages.py:93 core/views/license.py:103
#: core/views/repetition_units.py:115 core/views/weight_units.py:115
-#: exercises/views/categories.py:127 exercises/views/exercises.py:430
+#: exercises/views/categories.py:127 exercises/views/exercises.py:431
#: exercises/views/muscles.py:125 gallery/views/images.py:121
#: gym/views/admin_notes.py:196 gym/views/document.py:206 gym/views/gym.py:486
#: manager/views/schedule.py:318 manager/views/schedule_step.py:139
@@ -1467,7 +1460,7 @@ msgstr "Διαγραφή {0};"
#: core/views/languages.py:111 core/views/license.py:84
#: core/views/repetition_units.py:85 core/views/user.py:456
#: core/views/weight_units.py:85 exercises/views/categories.py:97
-#: exercises/views/equipment.py:83 exercises/views/exercises.py:304
+#: exercises/views/equipment.py:83 exercises/views/exercises.py:305
#: exercises/views/muscles.py:105 gym/views/admin_notes.py:160
#: gym/views/config.py:68 gym/views/contract.py:186
#: gym/views/contract_option.py:123 gym/views/contract_type.py:123
@@ -1558,7 +1551,7 @@ msgstr "Κύριοι μύς"
#: exercises/models/base.py:64 exercises/templates/equipment/overview.html:71
#: exercises/templates/exercise/overview.html:76
-#: exercises/templates/exercise/view.html:218
+#: exercises/templates/exercise/view.html:268
#: exercises/templates/muscles/overview.html:73
msgid "Secondary muscles"
msgstr "Δευτερεύοντες μύς"
@@ -1571,8 +1564,9 @@ msgstr ""
msgid "Exercise Categories"
msgstr "Κατηγορίες ασκήσεων"
-#: exercises/models/comment.py:34 exercises/models/image.py:62
-#: manager/forms.py:165 manager/helpers.py:89 manager/models/log.py:51
+#: exercises/models/comment.py:34 exercises/models/image.py:75
+#: exercises/models/video.py:82 manager/forms.py:165 manager/helpers.py:89
+#: manager/models/log.py:51
msgid "Exercise"
msgstr "Άσκηση"
@@ -1585,32 +1579,54 @@ msgstr "Ένα σχόλιο για τον σωστό τρόπο εφαρμογή
msgid "Language"
msgstr "Γλώσσα"
-#: exercises/models/exercise.py:233 exercises/views/exercises.py:460
+#: exercises/models/exercise.py:237 exercises/views/exercises.py:461
msgid "Exercise was successfully added to the general database"
msgstr "Η άσκηση προστέθηκε με επιτυχία στην γενική βάση δεδομένων"
-#: exercises/models/exercise.py:261
+#: exercises/models/exercise.py:265
msgid "New user submitted exercise"
msgstr "Ένας νέος χρήστης πρόσθεσε μια άσκηση"
-#: exercises/models/exercise.py:263
+#: exercises/models/exercise.py:267
#, python-brace-format
msgid "The user {0} submitted a new exercise \"{1}\"."
msgstr "Ο χρήστης {0} πρόσθεσε μια νέα άσκηση \"{1}\"."
-#: exercises/models/image.py:68 gallery/models/image.py:56
+#: exercises/models/image.py:59
+msgid "Line"
+msgstr ""
+
+#: exercises/models/image.py:60
+msgid "3D"
+msgstr ""
+
+#: exercises/models/image.py:61
+msgid "Low-poly"
+msgstr ""
+
+#: exercises/models/image.py:62
+msgid "Photo"
+msgstr ""
+
+#: exercises/models/image.py:63
+#, fuzzy
+#| msgid "Others"
+msgid "Other"
+msgstr "Άλλα"
+
+#: exercises/models/image.py:81 gallery/models/image.py:56
msgid "Image"
msgstr "Εικόνα"
-#: exercises/models/image.py:69 gallery/models/image.py:57
+#: exercises/models/image.py:82 gallery/models/image.py:57
msgid "Only PNG and JPEG formats are supported"
msgstr "Μόνο PNG και JPEG εικόνες υποστηρίζονται"
-#: exercises/models/image.py:75
+#: exercises/models/image.py:88
msgid "Main picture"
msgstr ""
-#: exercises/models/image.py:78
+#: exercises/models/image.py:91
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 "
@@ -1620,11 +1636,15 @@ msgstr ""
"αυτήν την άσκηση (θα εμφανίζεται π.χ. στην εύρεση). Η πρώτη εικόνα αυτόματα "
"μαρκάρεται απο το σύστημα."
-#: exercises/models/image.py:166
+#: exercises/models/image.py:100
+msgid "The art style of your image"
+msgstr ""
+
+#: exercises/models/image.py:185
msgid "New user submitted image"
msgstr "Ένας νέος χρήστης υπέβαλε εικόνα"
-#: exercises/models/image.py:167
+#: exercises/models/image.py:186
#, python-brace-format
msgid "The user {0} submitted a new image \"{1}\" for exercise {2}."
msgstr "Ο χρήστης {0} υπέβαλλε μιά νέα εικόνα \"{1}\" για την άσκηση {2}."
@@ -1633,6 +1653,56 @@ msgstr "Ο χρήστης {0} υπέβαλλε μιά νέα εικόνα \"{1}\
msgid "In latin, e.g. \"Pectoralis major\""
msgstr "Στα λατινικά, π.χ. \"Pectoralis major\""
+#: exercises/models/video.py:41
+msgid "Maximum file size is 100MB."
+msgstr ""
+
+#: exercises/models/video.py:44 exercises/models/video.py:48
+msgid "File type is not supported"
+msgstr ""
+
+#: exercises/models/video.py:57
+#, fuzzy
+#| msgid "%(birthdate)s is not a valid birthdate"
+msgid "File is not a valid video"
+msgstr "%(birthdate)s δεν είναι σωστή ημερομηνία γέννησης"
+
+#: exercises/models/video.py:88
+msgid "Main video"
+msgstr ""
+
+#: exercises/models/video.py:94
+msgid "Video"
+msgstr ""
+
+#: exercises/models/video.py:101
+msgid "Size"
+msgstr ""
+
+#: exercises/models/video.py:108 manager/models/schedule_step.py:56
+msgid "Duration"
+msgstr "Διάρκεια"
+
+#: exercises/models/video.py:117
+msgid "Width"
+msgstr ""
+
+#: exercises/models/video.py:124
+#, fuzzy
+#| msgid "Weight"
+msgid "Height"
+msgstr "Βάρος"
+
+#: exercises/models/video.py:131
+#, fuzzy
+#| msgid "Code"
+msgid "Codec"
+msgstr "Κώδικας"
+
+#: exercises/models/video.py:139
+msgid "Codec, long name"
+msgstr ""
+
#: exercises/templates/equipment/admin-overview.html:4
msgid "Equipment list"
msgstr "Λίστα οργάνων"
@@ -1648,7 +1718,7 @@ msgstr "Επισκόπηση οργάνων"
#: exercises/templates/equipment/overview.html:69
#: exercises/templates/exercise/overview.html:74
-#: exercises/templates/exercise/view.html:214
+#: exercises/templates/exercise/view.html:264
#: exercises/templates/muscles/overview.html:71
msgid "Main muscles"
msgstr "Κύριοι μύες"
@@ -1771,7 +1841,8 @@ msgstr "Ημερομηνία υποβολής"
#: gym/templates/gym/new_user.html:22
#: gym/templates/gym/reset_user_password.html:20 manager/models/log.py:45
#: manager/models/schedule.py:44 manager/models/session.py:49
-#: manager/models/workout.py:89 nutrition/models/plan.py:55
+#: manager/models/workout.py:89 measurements/models/category.py:48
+#: measurements/models/measurement.py:59 nutrition/models/plan.py:55
#: nutrition/templates/ingredient/pending.html:16 weight/models.py:41
msgid "User"
msgstr "Χρήστης"
@@ -1796,13 +1867,13 @@ msgid "Please select one of the options below."
msgstr "Παρακαλούμε επιλέξτε μια επιλογή απο τις παρακάτω."
#: exercises/templates/exercise/view.html:60
-#: exercises/templates/exercise/view.html:153
+#: exercises/templates/exercise/view.html:203
#: nutrition/templates/ingredient/view.html:38
msgid "Accept"
msgstr "Αποδοχή"
#: exercises/templates/exercise/view.html:64
-#: exercises/templates/exercise/view.html:154
+#: exercises/templates/exercise/view.html:204
#: nutrition/templates/ingredient/view.html:42
msgid "Decline"
msgstr "Άρνηση"
@@ -1815,34 +1886,44 @@ msgstr "Εικόνες"
msgid "Add new image"
msgstr "Νέας εικόνα"
-#: exercises/templates/exercise/view.html:147
+#: exercises/templates/exercise/view.html:148
+msgid "Videos"
+msgstr ""
+
+#: exercises/templates/exercise/view.html:187 exercises/views/videos.py:94
+#, fuzzy
+#| msgid "Add new image"
+msgid "Add new video"
+msgstr "Νέας εικόνα"
+
+#: exercises/templates/exercise/view.html:197
msgid "Images pending review"
msgstr ""
-#: exercises/templates/exercise/view.html:168
+#: exercises/templates/exercise/view.html:218
msgid "Comments for this exercise"
msgstr "Σχόλια για αυτήν την άσκηση"
-#: exercises/templates/exercise/view.html:196
+#: exercises/templates/exercise/view.html:246
msgid "Add new comment"
msgstr "Νέο σχόλιο"
-#: exercises/templates/exercise/view.html:210
+#: exercises/templates/exercise/view.html:260
msgid "The diagram shows the most used muscles on this exercise"
msgstr ""
"Το διάγραμμα εμφανίζει τους μύς με την μεγαλύτερη δραστηριότητα σε αυτήν την "
"άσκηση"
-#: exercises/templates/exercise/view.html:251
+#: exercises/templates/exercise/view.html:301
#: manager/templates/workout/log.html:10 manager/templates/workout/log.html:11
msgid "Weight log"
msgstr "Εγγραφή βάρους"
-#: exercises/templates/exercise/view.html:256
+#: exercises/templates/exercise/view.html:306
msgid "Exercise Variations"
msgstr ""
-#: exercises/templates/exercise/view.html:277
+#: exercises/templates/exercise/view.html:327
msgid "Submit a correction"
msgstr ""
@@ -1878,30 +1959,30 @@ msgstr "Νέο σχόλιο άσκησης"
msgid "Delete equipment?"
msgstr "Διαγραφή οργάνου"
-#: exercises/views/exercises.py:228
+#: exercises/views/exercises.py:229
#, python-format
msgid ""
"%(name_original)s is too similar to existing exercise \"%(exercise_name)s\""
msgstr ""
-#: exercises/views/exercises.py:246
+#: exercises/views/exercises.py:247
msgid "Add exercise"
msgstr "Νέα άσκηση"
-#: exercises/views/exercises.py:366
+#: exercises/views/exercises.py:367
msgid "Thank you. Once the changes are reviewed the exercise will be updated."
msgstr ""
-#: exercises/views/exercises.py:379
+#: exercises/views/exercises.py:380
#, python-brace-format
msgid "Correct {0}"
msgstr ""
-#: exercises/views/exercises.py:421
+#: exercises/views/exercises.py:422
msgid "This will delete the exercise from all workouts."
msgstr "Αυτή η λειτουργία θα διαγράψει την άσκηση απο όλες τις προπονήσεις"
-#: exercises/views/exercises.py:473
+#: exercises/views/exercises.py:474
msgid "Exercise was successfully marked as rejected"
msgstr "Η άσκηση απορρίφθηκε με επιτυχία"
@@ -1913,6 +1994,11 @@ msgstr "Επεξεργασία εικόνας άσκησης"
msgid "Delete exercise image?"
msgstr "Διαγραφή εικόνας άσκησης;"
+#: exercises/views/videos.py:144 nutrition/views/log.py:230
+#: nutrition/views/unit_ingredient.py:139
+msgid "Delete?"
+msgstr "Διαγραφη;"
+
#: gallery/templates/images/overview.html:62
#, fuzzy
#| msgid "Add new image"
@@ -1984,8 +2070,8 @@ msgid "Contract type"
msgstr ""
#: gym/models/contract.py:208 gym/templates/contract/view.html:59
-#: manager/templates/log/add.html:52 nutrition/forms.py:58
-#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:92
+#: manager/templates/log/add.html:52 nutrition/forms.py:59
+#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:102
#: nutrition/models/meal_item.py:72
msgid "Amount"
msgstr "Ποσότητα"
@@ -2426,6 +2512,7 @@ msgid ""
msgstr ""
#: mailer/templates/mailer/gym/preview.html:22
+#: software/templates/about_us.html:59
msgid "Current version"
msgstr ""
@@ -2464,7 +2551,8 @@ msgstr ""
#: manager/models/log.py:90 manager/models/setting.py:47
#: manager/models/setting.py:78 manager/templates/log/add.html:53
#: manager/templates/log/add.html:55 manager/templates/set/formset.html:11
-#: manager/templates/set/formset.html:13 nutrition/forms.py:62
+#: manager/templates/set/formset.html:13 measurements/models/category.py:58
+#: nutrition/forms.py:63
msgid "Unit"
msgstr ""
@@ -2534,10 +2622,6 @@ msgstr ""
msgid "schedule"
msgstr "πρόγραμμα"
-#: manager/models/schedule_step.py:56
-msgid "Duration"
-msgstr "Διάρκεια"
-
#: manager/models/schedule_step.py:57
msgid "The duration in weeks"
msgstr "Η διάρκεια σε εβδομάδες"
@@ -2818,7 +2902,7 @@ msgstr ""
#: manager/templates/schedule/view.html:290
#: manager/templates/workout/view.html:142
#: manager/templates/workout/view.html:217
-#: nutrition/templates/plan/view.html:415
+#: nutrition/templates/plan/view.html:417
msgid "Download as PDF"
msgstr "Αποθήκευση ώς PDF"
@@ -3057,23 +3141,27 @@ msgid "This will delete all weight logs for this day as well."
msgstr ""
"Αυτή η λειτουργία θα διαγράψει και όλες τις ασκήσεις σε αυτήν την κατηγορία."
-#: nutrition/forms.py:121
+#: measurements/models/measurement.py:69
+msgid "Value"
+msgstr ""
+
+#: nutrition/forms.py:122
msgid "Calculate"
msgstr "Υπολογισμός"
-#: nutrition/forms.py:194 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:195 nutrition/templates/rate/form.html:76
msgid "Basic caloric intake"
msgstr "Βασική εισαγωγή θερμίδων"
-#: nutrition/forms.py:195
+#: nutrition/forms.py:196
msgid "Your basic caloric intake as calculated for your data"
msgstr "Η βασική σας εισαγωγή θερμίδων όπως υπολογίστηκε απο τα δεδομένα σας"
-#: nutrition/forms.py:201
+#: nutrition/forms.py:202
msgid "Additional calories"
msgstr "Επιπλέον θερμίδες"
-#: nutrition/forms.py:203
+#: nutrition/forms.py:204
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
@@ -3081,8 +3169,8 @@ msgstr ""
"Επιπλέον θερμίδες θα προστεθούν στην βασική τάση (για αφαίρεση, εισάγετε "
"αρνητικό αριθμό)"
-#: nutrition/forms.py:231 nutrition/models/ingredient_weight_unit.py:39
-#: nutrition/models/log.py:71 nutrition/models/meal_item.py:53
+#: nutrition/forms.py:232 nutrition/models/ingredient_weight_unit.py:39
+#: nutrition/models/log.py:81 nutrition/models/meal_item.py:53
#: nutrition/templates/log/detail.html:155
msgid "Ingredient"
msgstr "Συστατικά"
@@ -3101,14 +3189,14 @@ msgstr "Σε g ανα 100g προϊόντος"
#: nutrition/models/ingredient.py:123
#: nutrition/templates/ingredient/view.html:96
#: nutrition/templates/log/detail.html:78
-#: nutrition/templates/plan/view.html:262 nutrition/views/plan.py:406
+#: nutrition/templates/plan/view.html:264 nutrition/views/plan.py:406
msgid "Sugar content in carbohydrates"
msgstr "Περιεχόμενο σάκχαρων σε υδατάνθρακες"
#: nutrition/models/ingredient.py:141
#: nutrition/templates/ingredient/view.html:112
#: nutrition/templates/log/detail.html:104
-#: nutrition/templates/plan/view.html:274 nutrition/views/plan.py:420
+#: nutrition/templates/plan/view.html:276 nutrition/views/plan.py:420
msgid "Saturated fat content in fats"
msgstr "Εκ των οποίων κορεσμένα λίπη"
@@ -3116,7 +3204,7 @@ msgstr "Εκ των οποίων κορεσμένα λίπη"
#: nutrition/templates/ingredient/view.html:134
#: nutrition/templates/log/detail.html:122
#: nutrition/templates/log/detail.html:178
-#: nutrition/templates/plan/view.html:285 nutrition/views/plan.py:426
+#: nutrition/templates/plan/view.html:287 nutrition/views/plan.py:426
msgid "Fibres"
msgstr "Ίνες"
@@ -3124,7 +3212,7 @@ msgstr "Ίνες"
#: nutrition/templates/ingredient/view.html:144
#: nutrition/templates/log/detail.html:135
#: nutrition/templates/log/detail.html:181
-#: nutrition/templates/plan/view.html:291 nutrition/views/plan.py:432
+#: nutrition/templates/plan/view.html:293 nutrition/views/plan.py:432
msgid "Sodium"
msgstr "Νάτριο"
@@ -3169,10 +3257,20 @@ msgstr "Ποσότητα σε γραμμάρια"
msgid "Unit amount, e.g. \"1 Cup\" or \"1/2 spoon\""
msgstr "Μονάδα ποσότητας, π.χ. \"1 Φλιτζάνι\" ή \"1/2 κουτάλι\""
+#: nutrition/models/log.py:55
+msgid "Meal"
+msgstr "Γεύμα"
+
#: nutrition/models/meal.py:61
msgid "Time (approx)"
msgstr "Ώρα (περίπου)"
+#: nutrition/models/meal.py:68
+msgid ""
+"Give meals a textual description / name such as \"Breakfast\" or \"after "
+"workout\""
+msgstr ""
+
#: nutrition/models/plan.py:71
msgid ""
"A description of the goal of the plan, e.g. \"Gain mass\" or \"Prepare for "
@@ -3325,12 +3423,12 @@ msgstr ""
#: nutrition/templates/ingredient/view.html:71
#: nutrition/templates/log/detail.html:31
-#: nutrition/templates/plan/view.html:227 nutrition/views/plan.py:376
+#: nutrition/templates/plan/view.html:229 nutrition/views/plan.py:376
msgid "Macronutrients"
msgstr "Θρεπτικά στοιχεία"
#: nutrition/templates/ingredient/view.html:80
-#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:244
+#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:246
msgid "kJ"
msgstr ""
@@ -3343,7 +3441,7 @@ msgstr ""
#: nutrition/templates/ingredient/view.html:128
#: nutrition/templates/log/detail.html:119
-#: nutrition/templates/plan/view.html:282
+#: nutrition/templates/plan/view.html:284
msgid "Others"
msgstr "Άλλα"
@@ -3372,7 +3470,7 @@ msgstr "Διαγραφή συστατικού"
#: nutrition/templates/log/detail.html:7
#: nutrition/templates/log/overview.html:7
-#: nutrition/templates/plan/view.html:300
+#: nutrition/templates/plan/view.html:302
msgid "Nutrition diary"
msgstr ""
@@ -3382,13 +3480,13 @@ msgstr ""
#: nutrition/templates/log/detail.html:33
#: nutrition/templates/log/overview.html:31
-#: nutrition/templates/plan/view.html:308
+#: nutrition/templates/plan/view.html:310
msgid "Logged"
msgstr ""
#: nutrition/templates/log/detail.html:34
#: nutrition/templates/log/overview.html:32
-#: nutrition/templates/plan/view.html:309
+#: nutrition/templates/plan/view.html:311
msgid "Difference"
msgstr ""
@@ -3401,7 +3499,7 @@ msgid "g"
msgstr "g"
#: nutrition/templates/log/overview.html:53
-#: nutrition/templates/plan/view.html:330
+#: nutrition/templates/plan/view.html:332
msgid "nothing found"
msgstr ""
@@ -3421,56 +3519,56 @@ msgstr ""
msgid "Add ingredient to meal"
msgstr ""
-#: nutrition/templates/plan/view.html:150
+#: nutrition/templates/plan/view.html:152
msgid "No items for this meal."
msgstr "Δεν υπάρχουν εγγραφές σε αυτό το γεύμα."
-#: nutrition/templates/plan/view.html:188
+#: nutrition/templates/plan/view.html:190
msgid "No meals for this plan."
msgstr "Δεν υπάρχουν γεύματα για αυτό το πρόγραμμα."
-#: nutrition/templates/plan/view.html:200
+#: nutrition/templates/plan/view.html:202
msgid "Log this Plan"
msgstr ""
-#: nutrition/templates/plan/view.html:206
+#: nutrition/templates/plan/view.html:208
msgid "Add a new meal"
msgstr "Προσθήκη νέου γεύματος"
-#: nutrition/templates/plan/view.html:216 nutrition/views/plan.py:369
+#: nutrition/templates/plan/view.html:218 nutrition/views/plan.py:369
msgid "Nutritional data"
msgstr "Διατροφικά δεδομένα"
-#: nutrition/templates/plan/view.html:219
+#: nutrition/templates/plan/view.html:221
#, python-format
msgid "Based on the weight entry dated %(date)s (%(weight)s)"
msgstr ""
-#: nutrition/templates/plan/view.html:228 nutrition/views/plan.py:377
+#: nutrition/templates/plan/view.html:230 nutrition/views/plan.py:377
msgid "Total"
msgstr "Σύνολο"
-#: nutrition/templates/plan/view.html:229 nutrition/views/plan.py:378
+#: nutrition/templates/plan/view.html:231 nutrition/views/plan.py:378
msgid "Percent of energy"
msgstr "Ποσοστό ενέργειας"
-#: nutrition/templates/plan/view.html:232 nutrition/views/plan.py:379
+#: nutrition/templates/plan/view.html:234 nutrition/views/plan.py:379
msgid "g per body kg"
msgstr "g ανα kg σώματος"
-#: nutrition/templates/plan/view.html:234
+#: nutrition/templates/plan/view.html:236
msgid "oz per body lb"
msgstr "oz ανα lb σώματος"
-#: nutrition/templates/plan/view.html:338
+#: nutrition/templates/plan/view.html:340
msgid "View complete nutrition log"
msgstr ""
-#: nutrition/templates/plan/view.html:371
+#: nutrition/templates/plan/view.html:373
msgid "Goal"
msgstr "Στόχος"
-#: nutrition/templates/plan/view.html:382
+#: nutrition/templates/plan/view.html:384
#, fuzzy
#| msgid ""
#| "You have selected that this nutritional plan has a\n"
@@ -3484,7 +3582,7 @@ msgstr ""
"Έχετε επιλέξει ότι αυτό το διατροφικό πρόγραμμα έχει εναν\n"
"στόχο θερμίδων. Χρησιμοποιήστε τον υπολογιστή ή εισάγετε τις τιμές εσείς."
-#: nutrition/templates/plan/view.html:392
+#: nutrition/templates/plan/view.html:394
msgid ""
"If you find the ingredient list too short, you might want to activate the "
"preference to also show English ingredients."
@@ -3492,15 +3590,15 @@ msgstr ""
"Αν βρείτε την λίστα συστατικών πολύ μικρή, ίσως θελήσετε να ενεργοποιήσετε "
"απο τις προτιμήσεις τα αγγλικά συστατικά επίσης."
-#: nutrition/templates/plan/view.html:421
+#: nutrition/templates/plan/view.html:423
msgid "Edit nutrition plan"
msgstr "Επεξεργασία προγραμματος διατροφής"
-#: nutrition/templates/plan/view.html:425
+#: nutrition/templates/plan/view.html:427
msgid "Make a copy of this nutrition plan"
msgstr "Δημιουργήστε ένα αντίγραφο αυτού του προγράμματος διατροφής"
-#: nutrition/templates/plan/view.html:431
+#: nutrition/templates/plan/view.html:433
msgid "Delete nutrition plan"
msgstr "Διαγραφή προγράμματος διατροφής"
@@ -3598,10 +3696,6 @@ msgstr "Προσθήκη νέου συστατικού"
msgid "Ingredient was successfully marked as rejected"
msgstr "Το συστατικό απορρίφθηκε με επιτυχία"
-#: nutrition/views/log.py:229 nutrition/views/unit_ingredient.py:139
-msgid "Delete?"
-msgstr "Διαγραφη;"
-
#: nutrition/views/meal.py:55
msgid "Add new meal"
msgstr "Προσθήκη νέου γεύματος"
@@ -3984,11 +4078,11 @@ msgstr ""
msgid "Re-Submit"
msgstr "Επανυποβολή"
-#: weight/templates/overview.html:68
+#: weight/templates/overview.html:51
msgid "Export as CSV"
msgstr "Εξαγωγή σε CSV"
-#: weight/templates/overview.html:72
+#: weight/templates/overview.html:55
msgid "Import from spreadsheet"
msgstr "Εισαγωγή σε λογιστικό φύλλ"
@@ -4006,6 +4100,12 @@ msgstr ""
msgid "Delete weight entry for the %s"
msgstr ""
+#~ msgid "Your current weight is: "
+#~ msgstr "Το τρέχων βάρος σας είναι: "
+
+#~ msgid "Released under the Affero GPL"
+#~ msgstr "Released under the Affero GPL"
+
#~ msgid "Responsible for the content of this site as per German law §5 TMG:"
#~ msgstr ""
#~ "Υπεύθυνος για το περιεχόμενο της σελίδας όπως χρήζει ο Γερμανικός νόμος "
@@ -4128,9 +4228,6 @@ msgstr ""
#~ "online. Αν ενδιαφέρεστε, επισκεφτείτε την σελίδα της transifex, αιτηθείτε "
#~ "πρόσβαση και τα υπόλοιπα θα τα ετοιμάσουμε εμείς."
-#~ msgid "Code"
-#~ msgstr "Κώδικας"
-
#~ msgid ""
#~ "Obviously, you are highly encouraged to clone the\n"
#~ "repo and start hacking! Once you are ready, send a pull request and we\n"
@@ -4195,9 +4292,6 @@ msgstr ""
#~ msgid "Pause!"
#~ msgstr "Παύση!"
-#~ msgid "Meal"
-#~ msgstr "Γεύμα"
-
#~ msgid "There is no chart here because there are no weight entries."
#~ msgstr "Δεν υπάρχει διάγραμμα εδώ γιατί δεν υπάρχουν εγγραφές βάρους."
diff --git a/wger/locale/es/LC_MESSAGES/django.po b/wger/locale/es/LC_MESSAGES/django.po
index 73b354d1e..48265602d 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: 2021-08-17 17:23+0200\n"
+"POT-Creation-Date: 2022-02-15 14:51+0100\n"
"PO-Revision-Date: 2022-01-18 14:31+0000\n"
"Last-Translator: G. Buendía <[email protected]>\n"
"Language-Team: Spanish <https://hosted.weblate.org/projects/wger/web/es/>\n"
@@ -57,16 +57,16 @@ msgstr "Idiomas"
msgid "Nothing found."
msgstr "No se ha encontrado nada."
-#: config/templates/language/overview.html:16 core/templates/index.html:147
-#: core/templates/index.html:199 manager/templates/calendar/month.html:132
+#: config/templates/language/overview.html:16 core/templates/index.html:137
+#: core/templates/index.html:189 manager/templates/calendar/month.html:132
#: manager/templates/schedule/overview.html:28
#: manager/templates/schedule/view.html:146
#: manager/templates/workout/overview.html:28
#: nutrition/templates/ingredient/overview.html:45
#: nutrition/templates/plan/overview.html:23
-#: nutrition/templates/plan/view.html:148
-#: nutrition/templates/plan/view.html:151
-#: nutrition/templates/plan/view.html:189
+#: nutrition/templates/plan/view.html:150
+#: nutrition/templates/plan/view.html:153
+#: nutrition/templates/plan/view.html:191
msgid "Add one now."
msgstr "Añadir ahora."
@@ -87,7 +87,7 @@ msgstr "Añadir ahora."
#: gym/templates/gym/member_list.html:244
#: gym/templates/gym/member_list.html:281
#: mailer/templates/mailer/gym/overview.html:43
-#: weight/templates/overview.html:78
+#: weight/templates/overview.html:61
msgid "Add"
msgstr "Añadir"
@@ -125,14 +125,14 @@ msgstr "Mostrar"
#: config/templates/language/view.html:91 core/templates/user/api_key.html:44
#: core/templates/user/preferences.html:28
-#: exercises/templates/exercise/view.html:273
-#: exercises/templates/exercise/view.html:296 gym/models/contract.py:200
+#: exercises/templates/exercise/view.html:323
+#: exercises/templates/exercise/view.html:346 gym/models/contract.py:200
#: gym/templates/contract/view.html:41 gym/templates/contract/view.html:106
#: gym/templates/gym/member_list.html:248
#: manager/templates/schedule/view.html:281
#: manager/templates/workout/view.html:206
#: nutrition/templates/ingredient/view.html:226
-#: nutrition/templates/plan/view.html:409 weight/templates/overview.html:62
+#: nutrition/templates/plan/view.html:411 weight/templates/overview.html:45
msgid "Options"
msgstr "Opciones"
@@ -146,12 +146,12 @@ msgstr "Opciones"
#: core/templates/weight_unit/list.html:17
#: exercises/templates/categories/admin-overview.html:16
#: exercises/templates/equipment/admin-overview.html:16
-#: exercises/templates/exercise/view.html:180
-#: exercises/templates/exercise/view.html:301
+#: exercises/templates/exercise/view.html:230
+#: exercises/templates/exercise/view.html:351
#: exercises/templates/muscles/admin-overview.html:16
-#: exercises/views/comments.py:63 gallery/views/images.py:96
-#: gym/templates/admin_notes/list.html:32 gym/templates/contract/list.html:31
-#: gym/templates/contract/view.html:107
+#: exercises/views/comments.py:63 exercises/views/videos.py:69
+#: gallery/views/images.py:96 gym/templates/admin_notes/list.html:32
+#: gym/templates/contract/list.html:31 gym/templates/contract/view.html:107
#: gym/templates/contract_option/list.html:31
#: gym/templates/contract_type/list.html:31 gym/templates/document/list.html:38
#: gym/templates/gym/list.html:19 gym/templates/gym/list.html:43
@@ -162,7 +162,7 @@ msgstr "Opciones"
#: manager/templates/calendar/partial_overview_table.html:18
#: manager/templates/schedule/view.html:121
#: nutrition/templates/ingredient/view.html:198
-#: nutrition/templates/plan/view.html:89 nutrition/templates/plan/view.html:124
+#: nutrition/templates/plan/view.html:89 nutrition/templates/plan/view.html:126
#: nutrition/templates/units/list.html:18
msgid "Edit"
msgstr "Editar"
@@ -176,9 +176,9 @@ msgstr "Editar"
#: exercises/templates/categories/admin-overview.html:17
#: exercises/templates/equipment/admin-overview.html:17
#: exercises/templates/exercise/view.html:68
-#: exercises/templates/exercise/view.html:155
-#: exercises/templates/exercise/view.html:185
-#: exercises/templates/exercise/view.html:306
+#: exercises/templates/exercise/view.html:205
+#: exercises/templates/exercise/view.html:235
+#: exercises/templates/exercise/view.html:356
#: exercises/templates/muscles/admin-overview.html:17
#: gym/templates/admin_notes/list.html:40
#: gym/templates/contract_option/list.html:39
@@ -191,7 +191,7 @@ msgstr "Editar"
#: nutrition/templates/ingredient/view.html:199
#: nutrition/templates/ingredient/view.html:239
#: nutrition/templates/log/detail.html:197
-#: nutrition/templates/plan/view.html:95 nutrition/templates/plan/view.html:130
+#: nutrition/templates/plan/view.html:95 nutrition/templates/plan/view.html:132
#: nutrition/templates/units/list.html:20
msgid "Delete"
msgstr "Borrar"
@@ -319,7 +319,7 @@ msgid "Some way of answering you (e-mail, etc.)"
msgstr "Alguna manera de responderte (correo electrónico u otros)"
#: core/forms.py:265 exercises/models/comment.py:40 manager/models/set.py:60
-#: manager/models/setting.py:99 nutrition/models/log.py:61
+#: manager/models/setting.py:99 nutrition/models/log.py:71
msgid "Comment"
msgstr "Comentario"
@@ -411,8 +411,8 @@ msgstr ""
"de\n"
"planes nutricionales. Estos ingredientes han sido extraídos de una lista "
"provista\n"
-"por el Departamento de Agricultura de los EE. UU. Es extremadamente completa,"
-"\n"
+"por el Departamento de Agricultura de los EE. UU. Es extremadamente "
+"completa,\n"
"con aproximadamente 7000 elementos, pero puede hacer la búsqueda más difícil."
#: core/models/profile.py:134
@@ -467,7 +467,7 @@ msgstr ""
msgid "Age"
msgstr "Edad"
-#: core/models/profile.py:202 nutrition/forms.py:98
+#: core/models/profile.py:202 nutrition/forms.py:99
msgid "Height (cm)"
msgstr "Altura (cm)"
@@ -518,7 +518,7 @@ msgid "Total caloric intake, including e.g. any surplus"
msgstr "Ingesta total de calorías, incluyendo cualquier suplemento"
#: core/models/profile.py:305 nutrition/models/ingredient_weight_unit.py:45
-#: nutrition/models/log.py:80 nutrition/models/meal_item.py:58
+#: nutrition/models/log.py:90 nutrition/models/meal_item.py:58
msgid "Weight unit"
msgstr "Unidad de peso"
@@ -558,9 +558,9 @@ msgstr "La suma de todas las horas tiene que ser 24"
#: gym/models/user_document.py:87 gym/templates/contract/view.html:50
#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:96
#: gym/views/gym.py:156 manager/models/schedule.py:55
-#: manager/models/workout.py:56 nutrition/models/ingredient.py:96
-#: nutrition/models/ingredient_category.py:26
-#: nutrition/models/weight_unit.py:38
+#: manager/models/workout.py:56 measurements/models/category.py:53
+#: nutrition/models/ingredient.py:96 nutrition/models/ingredient_category.py:26
+#: nutrition/models/meal.py:66 nutrition/models/weight_unit.py:38
#: nutrition/templates/ingredient/pending.html:15
#: nutrition/templates/ingredient/view.html:185
msgid "Name"
@@ -621,11 +621,11 @@ msgstr ""
msgid "Dashboard"
msgstr "Escritorio"
-#: core/templates/index.html:31 manager/templates/calendar/month.html:115
+#: core/templates/index.html:21 manager/templates/calendar/month.html:115
msgid "Add log to day"
msgstr "Agregar registro al día"
-#: core/templates/index.html:35 manager/templates/calendar/month.html:120
+#: core/templates/index.html:25 manager/templates/calendar/month.html:120
msgid ""
"Click to add weight logs to a training\n"
"day in your current workout:"
@@ -633,7 +633,7 @@ msgstr ""
"Clic para agregar registros de peso a un día de entrenamiento\n"
"en el entrenamiento actual:"
-#: core/templates/index.html:43 core/templates/index.html:83
+#: core/templates/index.html:33 core/templates/index.html:73
#: core/templates/misc/fragments/shariff_modal.html:29
#: core/templates/template.html:125 manager/templates/calendar/month.html:138
#: manager/templates/schedule/view.html:246
@@ -643,11 +643,11 @@ msgstr ""
msgid "Close"
msgstr "Cerrar"
-#: core/templates/index.html:54 core/templates/index.html:203
+#: core/templates/index.html:44 core/templates/index.html:193
msgid "Add new diary entry"
msgstr "Añadir una entrada nueva"
-#: core/templates/index.html:59
+#: core/templates/index.html:49
msgid ""
"Click to add an entry to your nutrition diary for today. You can either log "
"a meal as you defined it, or entry any number of custom entries."
@@ -656,7 +656,7 @@ msgstr ""
"registrar una comida como la definió o ingresar cualquier número de entradas "
"personalizadas."
-#: core/templates/index.html:67 core/templates/index.html:171
+#: core/templates/index.html:57 core/templates/index.html:161
#: core/templates/user/overview.html:171
#: nutrition/templates/ingredient/view.html:79
#: nutrition/templates/log/detail.html:40
@@ -665,19 +665,19 @@ msgstr ""
#: nutrition/templates/log/overview.html:7
#: nutrition/templates/log/overview.html:44
#: nutrition/templates/plan/overview.html:17
-#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:242
-#: nutrition/templates/plan/view.html:301
-#: nutrition/templates/plan/view.html:321
-#: nutrition/templates/plan/view.html:363
-#: nutrition/templates/plan/view.html:373
+#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:244
+#: nutrition/templates/plan/view.html:303
+#: nutrition/templates/plan/view.html:323
+#: nutrition/templates/plan/view.html:365
+#: nutrition/templates/plan/view.html:375
msgid "kcal"
msgstr "kcal"
-#: core/templates/index.html:79 nutrition/templates/plan/view.html:348
+#: core/templates/index.html:69 nutrition/templates/plan/view.html:350
msgid "Add custom diary entry"
msgstr "Añadir una entrada personalizada"
-#: core/templates/index.html:94 core/templates/index.html:102
+#: core/templates/index.html:84 core/templates/index.html:92
#: manager/models/day.py:34 manager/models/log.py:56
#: manager/models/session.py:60 manager/models/workout.py:109
#: manager/templates/schedule/view.html:105
@@ -688,11 +688,11 @@ msgstr "Añadir una entrada personalizada"
msgid "Workout"
msgstr "Rutina"
-#: core/templates/index.html:128
+#: core/templates/index.html:118
msgid "This workout is part of a schedule:"
msgstr "Esta rutina es parte de un programa:"
-#: core/templates/index.html:133
+#: core/templates/index.html:123
msgid ""
"The current workout is selected from your active schedule or, if you don't "
"have one, simply by date."
@@ -700,70 +700,70 @@ msgstr ""
"El entrenamiento actual se selecciona de su programa activo o, si no tiene "
"uno, simplemente por fecha."
-#: core/templates/index.html:142 manager/templates/calendar/month.html:188
+#: core/templates/index.html:132 manager/templates/calendar/month.html:188
msgid "Add new log"
msgstr "Agregar nuevo registro"
-#: core/templates/index.html:147 core/templates/user/overview.html:58
+#: core/templates/index.html:137 core/templates/user/overview.html:58
#: manager/templates/calendar/month.html:128
#: manager/templates/schedule/view.html:146
#: manager/templates/workout/overview.html:28
msgid "No workouts found."
msgstr "No se han encontrado rutinas."
-#: core/templates/index.html:157 nutrition/models/log.py:48
+#: core/templates/index.html:147 nutrition/models/log.py:49
#: nutrition/models/meal.py:49 nutrition/models/meal_item.py:47
#: nutrition/models/plan.py:94 nutrition/templates/plan/view.html:11
#: nutrition/templates/plan/view.html:19
msgid "Nutrition plan"
msgstr "Plan nutricional"
-#: core/templates/index.html:169 core/templates/user/overview.html:155
+#: core/templates/index.html:159 core/templates/user/overview.html:155
#: nutrition/models/ingredient.py:100
#: nutrition/templates/ingredient/view.html:77
#: nutrition/templates/log/detail.html:39
#: nutrition/templates/log/detail.html:156
-#: nutrition/templates/plan/view.html:53 nutrition/templates/plan/view.html:241
-#: nutrition/templates/plan/view.html:358
-#: nutrition/templates/plan/view.html:362 nutrition/views/plan.py:384
+#: nutrition/templates/plan/view.html:53 nutrition/templates/plan/view.html:243
+#: nutrition/templates/plan/view.html:360
+#: nutrition/templates/plan/view.html:364 nutrition/views/plan.py:384
msgid "Energy"
msgstr "Energía"
-#: core/templates/index.html:175 core/templates/user/overview.html:156
+#: core/templates/index.html:165 core/templates/user/overview.html:156
#: nutrition/models/ingredient.py:105
#: nutrition/templates/ingredient/view.html:84
#: nutrition/templates/log/detail.html:52
#: nutrition/templates/log/detail.html:174
-#: nutrition/templates/plan/view.html:54 nutrition/templates/plan/view.html:249
+#: nutrition/templates/plan/view.html:54 nutrition/templates/plan/view.html:251
#: nutrition/views/plan.py:390
msgid "Protein"
msgstr "Proteínas"
-#: core/templates/index.html:181 core/templates/user/overview.html:157
+#: core/templates/index.html:171 core/templates/user/overview.html:157
#: nutrition/models/ingredient.py:113
#: nutrition/templates/ingredient/view.html:90
#: nutrition/templates/log/detail.html:65
#: nutrition/templates/log/detail.html:175
-#: nutrition/templates/plan/view.html:55 nutrition/templates/plan/view.html:255
+#: nutrition/templates/plan/view.html:55 nutrition/templates/plan/view.html:257
#: nutrition/views/plan.py:398
msgid "Carbohydrates"
msgstr "Hidratos de carbono"
-#: core/templates/index.html:187 core/templates/user/overview.html:158
+#: core/templates/index.html:177 core/templates/user/overview.html:158
#: nutrition/models/ingredient.py:131
#: nutrition/templates/ingredient/view.html:106
#: nutrition/templates/log/detail.html:91
#: nutrition/templates/log/detail.html:176
-#: nutrition/templates/plan/view.html:56 nutrition/templates/plan/view.html:268
+#: nutrition/templates/plan/view.html:56 nutrition/templates/plan/view.html:270
#: nutrition/views/plan.py:412
msgid "Fat"
msgstr "Grasa"
-#: core/templates/index.html:199 nutrition/templates/plan/overview.html:22
+#: core/templates/index.html:189 nutrition/templates/plan/overview.html:22
msgid "No nutrition plans."
msgstr "No hay planes nutricionales."
-#: core/templates/index.html:213 core/templates/user/overview.html:112
+#: core/templates/index.html:203 core/templates/user/overview.html:112
#: core/templates/user/overview.html:121 manager/forms.py:173
#: manager/helpers.py:89 manager/models/log.py:84 manager/models/setting.py:67
#: manager/templates/log/add.html:54 manager/templates/set/formset.html:12
@@ -772,11 +772,7 @@ msgstr "No hay planes nutricionales."
msgid "Weight"
msgstr "Peso"
-#: core/templates/index.html:217
-msgid "Your current weight is: "
-msgstr "Tu peso actual es: "
-
-#: core/templates/index.html:248 core/templates/navigation.html:97
+#: core/templates/index.html:210 core/templates/navigation.html:97
#: weight/views.py:70
msgid "Add weight entry"
msgstr "Añadir entrada de peso"
@@ -808,7 +804,7 @@ msgstr "Listado de licencias"
msgid "Nothing found"
msgstr "No se ha encontrado nada"
-#: core/templates/misc/about.html:4 core/templates/template.html:201
+#: core/templates/misc/about.html:4 core/templates/template.html:175
#: core/templates/template_features.html:118
#: core/templates/template_no_context.html:88
msgid "Imprint"
@@ -826,8 +822,8 @@ msgstr ""
"externo."
#: core/templates/misc/fragments/shariff_modal.html:22
-#: nutrition/templates/plan/view.html:385
-#: nutrition/templates/plan/view.html:394
+#: nutrition/templates/plan/view.html:387
+#: nutrition/templates/plan/view.html:396
msgid "That's done here"
msgstr "Eso se hace aqui"
@@ -916,7 +912,7 @@ msgstr "Ejercicios pendientes de revisión"
msgid "Equipment"
msgstr "Equipo"
-#: core/templates/navigation.html:78 exercises/templates/exercise/view.html:208
+#: core/templates/navigation.html:78 exercises/templates/exercise/view.html:258
msgid "Muscles"
msgstr "Músculos"
@@ -989,7 +985,7 @@ msgstr "Documentación para desarrolladores"
msgid "Get the code"
msgstr "Código fuente"
-#: core/templates/navigation.html:175 core/templates/template.html:193
+#: core/templates/navigation.html:175 core/templates/template.html:205
#: core/templates/template_features.html:100
msgid "Translate"
msgstr "Traduce"
@@ -1147,15 +1143,11 @@ msgstr ""
msgid "Create some demo entries"
msgstr "Crear datos de ejemplo"
-#: core/templates/template.html:202 core/templates/template_features.html:122
+#: core/templates/template.html:176 core/templates/template_features.html:122
#: core/templates/template_no_context.html:89 software/templates/tos.html:7
msgid "Terms of service"
msgstr "Términos de servicio"
-#: core/templates/template.html:209 core/templates/template.html:210
-msgid "Released under the Affero GPL"
-msgstr "Disponible bajo la Affero GPL"
-
#: core/templates/template_features.html:62 software/templates/features.html:9
#: software/templates/features.html:120
msgid "Features"
@@ -1223,8 +1215,8 @@ msgid ""
"and can't be undone. "
msgstr ""
"Esta acción borrará la cuenta de usuario \"%(username)s\".\n"
-"También se eliminarán irrevocablemente todos los datos asociados con ella ("
-"entrenamientos, registros, etc.). \n"
+"También se eliminarán irrevocablemente todos los datos asociados con ella "
+"(entrenamientos, registros, etc.). \n"
"y no podrán ser recuperados. "
#: core/templates/user/login.html:16
@@ -1261,9 +1253,10 @@ msgstr "Añadir rutina"
#: core/templates/user/overview.html:120 core/templates/user/overview.html:153
#: exercises/models/exercise.py:77 gallery/models/image.py:47
#: manager/helpers.py:88 manager/models/log.py:98 manager/models/session.py:67
-#: nutrition/models/ingredient.py:85 nutrition/models/ingredient.py:87
-#: nutrition/models/ingredient.py:190 nutrition/templates/log/overview.html:30
-#: nutrition/templates/plan/view.html:307 weight/models.py:32
+#: measurements/models/measurement.py:64 nutrition/models/ingredient.py:85
+#: nutrition/models/ingredient.py:87 nutrition/models/ingredient.py:190
+#: nutrition/templates/log/overview.html:30
+#: nutrition/templates/plan/view.html:309 weight/models.py:32
#: weight/templates/import_csv_preview.html:13
#: weight/templates/import_csv_preview.html:42 weight/views.py:150
msgid "Date"
@@ -1271,10 +1264,10 @@ msgstr "Fecha"
#: core/templates/user/overview.html:35 core/templates/user/overview.html:154
#: exercises/models/exercise.py:61 exercises/templates/exercise/view.html:88
-#: exercises/views/exercises.py:189 gallery/models/image.py:70
+#: exercises/views/exercises.py:190 gallery/models/image.py:70
#: gym/models/contract.py:57 gym/models/contract.py:107
#: manager/models/day.py:37 manager/models/workout.py:62
-#: nutrition/models/plan.py:69
+#: measurements/models/measurement.py:79 nutrition/models/plan.py:69
msgid "Description"
msgstr "Descripción"
@@ -1437,11 +1430,11 @@ msgstr "Preferencias"
msgid "Change password"
msgstr "Cambiar contraseña"
-#: core/templatetags/wger_extras.py:217
+#: core/templatetags/wger_extras.py:229
msgid "kg"
msgstr "kg"
-#: core/templatetags/wger_extras.py:219
+#: core/templatetags/wger_extras.py:231
#: nutrition/templates/ingredient/view.html:86
#: nutrition/templates/ingredient/view.html:92
#: nutrition/templates/ingredient/view.html:99
@@ -1453,28 +1446,28 @@ msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr "g"
-#: core/templatetags/wger_extras.py:222
+#: core/templatetags/wger_extras.py:234
msgid "lb"
msgstr "lb"
-#: core/templatetags/wger_extras.py:224
+#: core/templatetags/wger_extras.py:236
msgctxt "weight unit, i.e. ounces"
msgid "oz"
msgstr "oz"
#: core/views/languages.py:85 exercises/views/categories.py:121
-#: exercises/views/equipment.py:106 exercises/views/exercises.py:422
+#: exercises/views/equipment.py:106 exercises/views/exercises.py:423
#: exercises/views/images.py:128 exercises/views/muscles.py:118
-#: manager/views/schedule.py:311 manager/views/schedule_step.py:129
-#: manager/views/workout.py:268 manager/views/workout_session.py:141
-#: nutrition/views/ingredient.py:144 nutrition/views/plan.py:120
-#: nutrition/views/unit.py:111
+#: exercises/views/videos.py:129 manager/views/schedule.py:311
+#: manager/views/schedule_step.py:129 manager/views/workout.py:268
+#: manager/views/workout_session.py:141 nutrition/views/ingredient.py:144
+#: nutrition/views/plan.py:120 nutrition/views/unit.py:111
msgid "Successfully deleted"
msgstr "Borrado con éxito"
#: core/views/languages.py:93 core/views/license.py:103
#: core/views/repetition_units.py:115 core/views/weight_units.py:115
-#: exercises/views/categories.py:127 exercises/views/exercises.py:430
+#: exercises/views/categories.py:127 exercises/views/exercises.py:431
#: exercises/views/muscles.py:125 gallery/views/images.py:121
#: gym/views/admin_notes.py:196 gym/views/document.py:206 gym/views/gym.py:486
#: manager/views/schedule.py:318 manager/views/schedule_step.py:139
@@ -1488,7 +1481,7 @@ msgstr "¿Borrar {0}?"
#: core/views/languages.py:111 core/views/license.py:84
#: core/views/repetition_units.py:85 core/views/user.py:456
#: core/views/weight_units.py:85 exercises/views/categories.py:97
-#: exercises/views/equipment.py:83 exercises/views/exercises.py:304
+#: exercises/views/equipment.py:83 exercises/views/exercises.py:305
#: exercises/views/muscles.py:105 gym/views/admin_notes.py:160
#: gym/views/config.py:68 gym/views/contract.py:186
#: gym/views/contract_option.py:123 gym/views/contract_type.py:123
@@ -1578,7 +1571,7 @@ msgstr "Músculos primarios"
#: exercises/models/base.py:64 exercises/templates/equipment/overview.html:71
#: exercises/templates/exercise/overview.html:76
-#: exercises/templates/exercise/view.html:218
+#: exercises/templates/exercise/view.html:268
#: exercises/templates/muscles/overview.html:73
msgid "Secondary muscles"
msgstr "Músculos secundarios"
@@ -1591,8 +1584,9 @@ msgstr "Variantes"
msgid "Exercise Categories"
msgstr "Categorías de ejercicios"
-#: exercises/models/comment.py:34 exercises/models/image.py:62
-#: manager/forms.py:165 manager/helpers.py:89 manager/models/log.py:51
+#: exercises/models/comment.py:34 exercises/models/image.py:75
+#: exercises/models/video.py:82 manager/forms.py:165 manager/helpers.py:89
+#: manager/models/log.py:51
msgid "Exercise"
msgstr "Ejercicio"
@@ -1605,32 +1599,54 @@ msgstr "Comentario describiendo como hacer correctamente el ejercicio."
msgid "Language"
msgstr "Idioma"
-#: exercises/models/exercise.py:233 exercises/views/exercises.py:460
+#: exercises/models/exercise.py:237 exercises/views/exercises.py:461
msgid "Exercise was successfully added to the general database"
msgstr "El ejercicio se ha añadido con éxito a la base de datos"
-#: exercises/models/exercise.py:261
+#: exercises/models/exercise.py:265
msgid "New user submitted exercise"
msgstr "Nuevo ejercicio enviado por un usuario"
-#: exercises/models/exercise.py:263
+#: exercises/models/exercise.py:267
#, python-brace-format
msgid "The user {0} submitted a new exercise \"{1}\"."
msgstr "El usuario {0} ha enviado un nuevo ejercicio \"{1}\"."
-#: exercises/models/image.py:68 gallery/models/image.py:56
+#: exercises/models/image.py:59
+msgid "Line"
+msgstr ""
+
+#: exercises/models/image.py:60
+msgid "3D"
+msgstr ""
+
+#: exercises/models/image.py:61
+msgid "Low-poly"
+msgstr ""
+
+#: exercises/models/image.py:62
+msgid "Photo"
+msgstr ""
+
+#: exercises/models/image.py:63
+#, fuzzy
+#| msgid "Others"
+msgid "Other"
+msgstr "Otros"
+
+#: exercises/models/image.py:81 gallery/models/image.py:56
msgid "Image"
msgstr "Imagen"
-#: exercises/models/image.py:69 gallery/models/image.py:57
+#: exercises/models/image.py:82 gallery/models/image.py:57
msgid "Only PNG and JPEG formats are supported"
msgstr "Sólo los formatos PNG y JPEG están soportados"
-#: exercises/models/image.py:75
+#: exercises/models/image.py:88
msgid "Main picture"
msgstr "Imagen principal"
-#: exercises/models/image.py:78
+#: exercises/models/image.py:91
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 "
@@ -1640,11 +1656,15 @@ msgstr ""
"ejercicio (aparecerá por ejemplo en la búsqueda). La primera imagen es "
"marcada automáticamente por el sistema."
-#: exercises/models/image.py:166
+#: exercises/models/image.py:100
+msgid "The art style of your image"
+msgstr ""
+
+#: exercises/models/image.py:185
msgid "New user submitted image"
msgstr "Nueva imagen enviada por un usuario"
-#: exercises/models/image.py:167
+#: exercises/models/image.py:186
#, python-brace-format
msgid "The user {0} submitted a new image \"{1}\" for exercise {2}."
msgstr "El usuario {0} agrego una nueva imagen \"{1}\" para el ejercicio {2}."
@@ -1653,6 +1673,58 @@ msgstr "El usuario {0} agrego una nueva imagen \"{1}\" para el ejercicio {2}."
msgid "In latin, e.g. \"Pectoralis major\""
msgstr "En latín, p.ej. \"Pectoralis major\""
+#: exercises/models/video.py:41
+msgid "Maximum file size is 100MB."
+msgstr ""
+
+#: exercises/models/video.py:44 exercises/models/video.py:48
+msgid "File type is not supported"
+msgstr ""
+
+#: exercises/models/video.py:57
+#, fuzzy
+#| msgid "%(birthdate)s is not a valid birthdate"
+msgid "File is not a valid video"
+msgstr "%(birthdate)s Fecha de nacimiento no valida"
+
+#: exercises/models/video.py:88
+#, fuzzy
+#| msgid "Main picture"
+msgid "Main video"
+msgstr "Imagen principal"
+
+#: exercises/models/video.py:94
+msgid "Video"
+msgstr ""
+
+#: exercises/models/video.py:101
+msgid "Size"
+msgstr ""
+
+#: exercises/models/video.py:108 manager/models/schedule_step.py:56
+msgid "Duration"
+msgstr "Duración"
+
+#: exercises/models/video.py:117
+msgid "Width"
+msgstr ""
+
+#: exercises/models/video.py:124
+#, fuzzy
+#| msgid "Weight"
+msgid "Height"
+msgstr "Peso"
+
+#: exercises/models/video.py:131
+#, fuzzy
+#| msgid "Code"
+msgid "Codec"
+msgstr "Código"
+
+#: exercises/models/video.py:139
+msgid "Codec, long name"
+msgstr ""
+
#: exercises/templates/equipment/admin-overview.html:4
msgid "Equipment list"
msgstr "Lista de equipos"
@@ -1668,7 +1740,7 @@ msgstr "Resumen de equipos"
#: exercises/templates/equipment/overview.html:69
#: exercises/templates/exercise/overview.html:74
-#: exercises/templates/exercise/view.html:214
+#: exercises/templates/exercise/view.html:264
#: exercises/templates/muscles/overview.html:71
msgid "Main muscles"
msgstr "Músculos principales"
@@ -1749,8 +1821,8 @@ msgid ""
"successfully."
msgstr ""
"Después de enviar el formulario un administrador será notificado.\n"
-"Una vez que se haya revisado será añádido a la base de datos. Hasta entonces,"
-"\n"
+"Una vez que se haya revisado será añádido a la base de datos. Hasta "
+"entonces,\n"
"no será visible en el resumen o la búsqueda. En caso de que nos hayas dado "
"tu dirección de email, \n"
"recibirás una notificación cuando el proceso termine con éxito."
@@ -1794,7 +1866,8 @@ msgstr "Fecha de sumisión"
#: gym/templates/gym/new_user.html:22
#: gym/templates/gym/reset_user_password.html:20 manager/models/log.py:45
#: manager/models/schedule.py:44 manager/models/session.py:49
-#: manager/models/workout.py:89 nutrition/models/plan.py:55
+#: manager/models/workout.py:89 measurements/models/category.py:48
+#: measurements/models/measurement.py:59 nutrition/models/plan.py:55
#: nutrition/templates/ingredient/pending.html:16 weight/models.py:41
msgid "User"
msgstr "Usuario"
@@ -1821,13 +1894,13 @@ msgid "Please select one of the options below."
msgstr "Por favor, selecciona una de las opciones de abajo."
#: exercises/templates/exercise/view.html:60
-#: exercises/templates/exercise/view.html:153
+#: exercises/templates/exercise/view.html:203
#: nutrition/templates/ingredient/view.html:38
msgid "Accept"
msgstr "Aceptar"
#: exercises/templates/exercise/view.html:64
-#: exercises/templates/exercise/view.html:154
+#: exercises/templates/exercise/view.html:204
#: nutrition/templates/ingredient/view.html:42
msgid "Decline"
msgstr "Rechazar"
@@ -1840,32 +1913,42 @@ msgstr "Imágenes"
msgid "Add new image"
msgstr "Añadir nueva imagen"
-#: exercises/templates/exercise/view.html:147
+#: exercises/templates/exercise/view.html:148
+msgid "Videos"
+msgstr ""
+
+#: exercises/templates/exercise/view.html:187 exercises/views/videos.py:94
+#, fuzzy
+#| msgid "Add new image"
+msgid "Add new video"
+msgstr "Añadir nueva imagen"
+
+#: exercises/templates/exercise/view.html:197
msgid "Images pending review"
msgstr "Imágenes pendientes de revisión"
-#: exercises/templates/exercise/view.html:168
+#: exercises/templates/exercise/view.html:218
msgid "Comments for this exercise"
msgstr "Comentarios para este ejercicio"
-#: exercises/templates/exercise/view.html:196
+#: exercises/templates/exercise/view.html:246
msgid "Add new comment"
msgstr "Añadir nuevo comentario"
-#: exercises/templates/exercise/view.html:210
+#: exercises/templates/exercise/view.html:260
msgid "The diagram shows the most used muscles on this exercise"
msgstr "El diagrama muestra los músculos más usados en este ejercicio"
-#: exercises/templates/exercise/view.html:251
+#: exercises/templates/exercise/view.html:301
#: manager/templates/workout/log.html:10 manager/templates/workout/log.html:11
msgid "Weight log"
msgstr "Registro de peso"
-#: exercises/templates/exercise/view.html:256
+#: exercises/templates/exercise/view.html:306
msgid "Exercise Variations"
msgstr "Variantes de ejercicios"
-#: exercises/templates/exercise/view.html:277
+#: exercises/templates/exercise/view.html:327
msgid "Submit a correction"
msgstr "Enviar una corrección"
@@ -1902,33 +1985,33 @@ msgstr "Añadir comentario al ejercicio"
msgid "Delete equipment?"
msgstr "¿Borrar equipo?"
-#: exercises/views/exercises.py:228
+#: exercises/views/exercises.py:229
#, python-format
msgid ""
"%(name_original)s is too similar to existing exercise \"%(exercise_name)s\""
msgstr ""
"%(name_original)s es muy similar al ejercicio existente \"%(exercise_name)s\""
-#: exercises/views/exercises.py:246
+#: exercises/views/exercises.py:247
msgid "Add exercise"
msgstr "Añadir ejercicio"
-#: exercises/views/exercises.py:366
+#: exercises/views/exercises.py:367
msgid "Thank you. Once the changes are reviewed the exercise will be updated."
msgstr ""
"Gracias. Una vez los cambios hayan sido revisados el ejercicio será "
"actualizado."
-#: exercises/views/exercises.py:379
+#: exercises/views/exercises.py:380
#, python-brace-format
msgid "Correct {0}"
msgstr "Corregir {0}"
-#: exercises/views/exercises.py:421
+#: exercises/views/exercises.py:422
msgid "This will delete the exercise from all workouts."
msgstr "Esto también borrará el ejercicio de todas las rutinas."
-#: exercises/views/exercises.py:473
+#: exercises/views/exercises.py:474
msgid "Exercise was successfully marked as rejected"
msgstr "El ejercicio se ha marcado como rechazado con éxito"
@@ -1940,6 +2023,11 @@ msgstr "Editar imagen de ejercicio"
msgid "Delete exercise image?"
msgstr "¿Borrar imagen de ejercicio?"
+#: exercises/views/videos.py:144 nutrition/views/log.py:230
+#: nutrition/views/unit_ingredient.py:139
+msgid "Delete?"
+msgstr "¿Borrar?"
+
#: gallery/templates/images/overview.html:62
msgid "Add image"
msgstr "Añadir imagen"
@@ -2007,8 +2095,8 @@ msgid "Contract type"
msgstr "Tipo de contrato"
#: gym/models/contract.py:208 gym/templates/contract/view.html:59
-#: manager/templates/log/add.html:52 nutrition/forms.py:58
-#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:92
+#: manager/templates/log/add.html:52 nutrition/forms.py:59
+#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:102
#: nutrition/models/meal_item.py:72
msgid "Amount"
msgstr "Cantidad"
@@ -2453,6 +2541,7 @@ msgstr ""
"enviar los correos electrónicos"
#: mailer/templates/mailer/gym/preview.html:22
+#: software/templates/about_us.html:59
msgid "Current version"
msgstr "Versión actual"
@@ -2489,7 +2578,8 @@ msgstr ""
#: manager/models/log.py:90 manager/models/setting.py:47
#: manager/models/setting.py:78 manager/templates/log/add.html:53
#: manager/templates/log/add.html:55 manager/templates/set/formset.html:11
-#: manager/templates/set/formset.html:13 nutrition/forms.py:62
+#: manager/templates/set/formset.html:13 measurements/models/category.py:58
+#: nutrition/forms.py:63
msgid "Unit"
msgstr "Unidad"
@@ -2557,10 +2647,6 @@ msgstr ""
msgid "schedule"
msgstr "programa"
-#: manager/models/schedule_step.py:56
-msgid "Duration"
-msgstr "Duración"
-
#: manager/models/schedule_step.py:57
msgid "The duration in weeks"
msgstr "La duración, en semanas"
@@ -2848,7 +2934,7 @@ msgstr ""
#: manager/templates/schedule/view.html:290
#: manager/templates/workout/view.html:142
#: manager/templates/workout/view.html:217
-#: nutrition/templates/plan/view.html:415
+#: nutrition/templates/plan/view.html:417
msgid "Download as PDF"
msgstr "Bajar como PDF"
@@ -2873,8 +2959,8 @@ msgid ""
"automatically becomes \"4 x 10\"."
msgstr ""
"Si haces las mismas repeticiones para todas las series,\n"
-"puedes intriducir un solo valor: por ejemplo para 4 series, introduce un \"10"
-"\" para las repeticiones,\n"
+"puedes intriducir un solo valor: por ejemplo para 4 series, introduce un "
+"\"10\" para las repeticiones,\n"
"esto se convertirá automáticamente en \"4 x 10\"."
#: manager/templates/set/edit.html:10
@@ -3090,23 +3176,27 @@ msgstr "Nueva impresión de entrenamiento para el {0}"
msgid "This will delete all weight logs for this day as well."
msgstr "Esto también eliminará todos los registros de peso de este día."
-#: nutrition/forms.py:121
+#: measurements/models/measurement.py:69
+msgid "Value"
+msgstr ""
+
+#: nutrition/forms.py:122
msgid "Calculate"
msgstr "Calcular"
-#: nutrition/forms.py:194 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:195 nutrition/templates/rate/form.html:76
msgid "Basic caloric intake"
msgstr "Ingesta básica de calorías"
-#: nutrition/forms.py:195
+#: nutrition/forms.py:196
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:201
+#: nutrition/forms.py:202
msgid "Additional calories"
msgstr "Calorias adicionales"
-#: nutrition/forms.py:203
+#: nutrition/forms.py:204
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
@@ -3114,8 +3204,8 @@ msgstr ""
"Calorías adicionales para agregar a la tasa básica (para restar, introduce "
"un número negativo)"
-#: nutrition/forms.py:231 nutrition/models/ingredient_weight_unit.py:39
-#: nutrition/models/log.py:71 nutrition/models/meal_item.py:53
+#: nutrition/forms.py:232 nutrition/models/ingredient_weight_unit.py:39
+#: nutrition/models/log.py:81 nutrition/models/meal_item.py:53
#: nutrition/templates/log/detail.html:155
msgid "Ingredient"
msgstr "Ingrediente"
@@ -3134,14 +3224,14 @@ msgstr "En g por 100g de producto"
#: nutrition/models/ingredient.py:123
#: nutrition/templates/ingredient/view.html:96
#: nutrition/templates/log/detail.html:78
-#: nutrition/templates/plan/view.html:262 nutrition/views/plan.py:406
+#: nutrition/templates/plan/view.html:264 nutrition/views/plan.py:406
msgid "Sugar content in carbohydrates"
msgstr "Azúcar en los hidratos de carbono"
#: nutrition/models/ingredient.py:141
#: nutrition/templates/ingredient/view.html:112
#: nutrition/templates/log/detail.html:104
-#: nutrition/templates/plan/view.html:274 nutrition/views/plan.py:420
+#: nutrition/templates/plan/view.html:276 nutrition/views/plan.py:420
msgid "Saturated fat content in fats"
msgstr "Contenido de grasas saturadas en grasas"
@@ -3149,7 +3239,7 @@ msgstr "Contenido de grasas saturadas en grasas"
#: nutrition/templates/ingredient/view.html:134
#: nutrition/templates/log/detail.html:122
#: nutrition/templates/log/detail.html:178
-#: nutrition/templates/plan/view.html:285 nutrition/views/plan.py:426
+#: nutrition/templates/plan/view.html:287 nutrition/views/plan.py:426
msgid "Fibres"
msgstr "Fibras"
@@ -3157,7 +3247,7 @@ msgstr "Fibras"
#: nutrition/templates/ingredient/view.html:144
#: nutrition/templates/log/detail.html:135
#: nutrition/templates/log/detail.html:181
-#: nutrition/templates/plan/view.html:291 nutrition/views/plan.py:432
+#: nutrition/templates/plan/view.html:293 nutrition/views/plan.py:432
msgid "Sodium"
msgstr "Sodio"
@@ -3205,10 +3295,20 @@ 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:55
+msgid "Meal"
+msgstr "Comida"
+
#: nutrition/models/meal.py:61
msgid "Time (approx)"
msgstr "Hora (aprox.)"
+#: nutrition/models/meal.py:68
+msgid ""
+"Give meals a textual description / name such as \"Breakfast\" or \"after "
+"workout\""
+msgstr ""
+
#: nutrition/models/plan.py:71
msgid ""
"A description of the goal of the plan, e.g. \"Gain mass\" or \"Prepare for "
@@ -3358,12 +3458,12 @@ msgstr ""
#: nutrition/templates/ingredient/view.html:71
#: nutrition/templates/log/detail.html:31
-#: nutrition/templates/plan/view.html:227 nutrition/views/plan.py:376
+#: nutrition/templates/plan/view.html:229 nutrition/views/plan.py:376
msgid "Macronutrients"
msgstr "Macronutrientes"
#: nutrition/templates/ingredient/view.html:80
-#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:244
+#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:246
msgid "kJ"
msgstr "kJ"
@@ -3376,7 +3476,7 @@ msgstr "n.d."
#: nutrition/templates/ingredient/view.html:128
#: nutrition/templates/log/detail.html:119
-#: nutrition/templates/plan/view.html:282
+#: nutrition/templates/plan/view.html:284
msgid "Others"
msgstr "Otros"
@@ -3405,7 +3505,7 @@ msgstr "Borrar ingrediente"
#: nutrition/templates/log/detail.html:7
#: nutrition/templates/log/overview.html:7
-#: nutrition/templates/plan/view.html:300
+#: nutrition/templates/plan/view.html:302
msgid "Nutrition diary"
msgstr "Diario nutricional"
@@ -3415,13 +3515,13 @@ msgstr "Planeado"
#: nutrition/templates/log/detail.html:33
#: nutrition/templates/log/overview.html:31
-#: nutrition/templates/plan/view.html:308
+#: nutrition/templates/plan/view.html:310
msgid "Logged"
msgstr "Registrado"
#: nutrition/templates/log/detail.html:34
#: nutrition/templates/log/overview.html:32
-#: nutrition/templates/plan/view.html:309
+#: nutrition/templates/plan/view.html:311
msgid "Difference"
msgstr "Diferencia"
@@ -3434,7 +3534,7 @@ msgid "g"
msgstr "g"
#: nutrition/templates/log/overview.html:53
-#: nutrition/templates/plan/view.html:330
+#: nutrition/templates/plan/view.html:332
msgid "nothing found"
msgstr "no se encontraron resultados"
@@ -3454,56 +3554,56 @@ msgstr "Registrar esta comida"
msgid "Add ingredient to meal"
msgstr "Añadir ingrendiente a la comida"
-#: nutrition/templates/plan/view.html:150
+#: nutrition/templates/plan/view.html:152
msgid "No items for this meal."
msgstr "No hay artículos para esta comida."
-#: nutrition/templates/plan/view.html:188
+#: nutrition/templates/plan/view.html:190
msgid "No meals for this plan."
msgstr "No hay comidas para este plan."
-#: nutrition/templates/plan/view.html:200
+#: nutrition/templates/plan/view.html:202
msgid "Log this Plan"
msgstr "Registrar este plan"
-#: nutrition/templates/plan/view.html:206
+#: nutrition/templates/plan/view.html:208
msgid "Add a new meal"
msgstr "Añadir nueva comida"
-#: nutrition/templates/plan/view.html:216 nutrition/views/plan.py:369
+#: nutrition/templates/plan/view.html:218 nutrition/views/plan.py:369
msgid "Nutritional data"
msgstr "Valores nutricionales"
-#: nutrition/templates/plan/view.html:219
+#: nutrition/templates/plan/view.html:221
#, python-format
msgid "Based on the weight entry dated %(date)s (%(weight)s)"
msgstr "Basado en la entrada de peso con fecha %(date)s (%(weight)s)"
-#: nutrition/templates/plan/view.html:228 nutrition/views/plan.py:377
+#: nutrition/templates/plan/view.html:230 nutrition/views/plan.py:377
msgid "Total"
msgstr "Total"
-#: nutrition/templates/plan/view.html:229 nutrition/views/plan.py:378
+#: nutrition/templates/plan/view.html:231 nutrition/views/plan.py:378
msgid "Percent of energy"
msgstr "Porcentaje de la energía"
-#: nutrition/templates/plan/view.html:232 nutrition/views/plan.py:379
+#: nutrition/templates/plan/view.html:234 nutrition/views/plan.py:379
msgid "g per body kg"
msgstr "g por kg peso"
-#: nutrition/templates/plan/view.html:234
+#: nutrition/templates/plan/view.html:236
msgid "oz per body lb"
msgstr "oz por lb de peso"
-#: nutrition/templates/plan/view.html:338
+#: nutrition/templates/plan/view.html:340
msgid "View complete nutrition log"
msgstr "Ver el registro completo de nutrición"
-#: nutrition/templates/plan/view.html:371
+#: nutrition/templates/plan/view.html:373
msgid "Goal"
msgstr "Meta"
-#: nutrition/templates/plan/view.html:382
+#: nutrition/templates/plan/view.html:384
msgid ""
"You have selected that this nutritional plan has a\n"
" goal amount of calories. Use the calculator or enter the value\n"
@@ -3514,7 +3614,7 @@ msgstr ""
"el valor\n"
" manualmente."
-#: nutrition/templates/plan/view.html:392
+#: nutrition/templates/plan/view.html:394
msgid ""
"If you find the ingredient list too short, you might want to activate the "
"preference to also show English ingredients."
@@ -3522,15 +3622,15 @@ msgstr ""
"Si encuentras la lista de ingredientes demasiado corta, puedes activar la "
"preferencia para mostrar también ingredientes en inglés."
-#: nutrition/templates/plan/view.html:421
+#: nutrition/templates/plan/view.html:423
msgid "Edit nutrition plan"
msgstr "Editar plan nutricional"
-#: nutrition/templates/plan/view.html:425
+#: nutrition/templates/plan/view.html:427
msgid "Make a copy of this nutrition plan"
msgstr "Hacer una copia de este plan nutricional"
-#: nutrition/templates/plan/view.html:431
+#: nutrition/templates/plan/view.html:433
msgid "Delete nutrition plan"
msgstr "Borrar plan nutricional"
@@ -3626,10 +3726,6 @@ msgstr "Añadir nuevo ingrediente"
msgid "Ingredient was successfully marked as rejected"
msgstr "El ingrediente se ha marcado como rechazado con éxito"
-#: nutrition/views/log.py:229 nutrition/views/unit_ingredient.py:139
-msgid "Delete?"
-msgstr "¿Borrar?"
-
#: nutrition/views/meal.py:55
msgid "Add new meal"
msgstr "Añadir nueva comida"
@@ -4054,11 +4150,11 @@ msgstr ""
msgid "Re-Submit"
msgstr "Re-enviar"
-#: weight/templates/overview.html:68
+#: weight/templates/overview.html:51
msgid "Export as CSV"
msgstr "Exportar como CSV"
-#: weight/templates/overview.html:72
+#: weight/templates/overview.html:55
msgid "Import from spreadsheet"
msgstr "Importar de hoja de cálculo"
@@ -4076,6 +4172,12 @@ msgstr "Borrado con éxito."
msgid "Delete weight entry for the %s"
msgstr "Eliminar la entrada de peso para el %s"
+#~ msgid "Your current weight is: "
+#~ msgstr "Tu peso actual es: "
+
+#~ msgid "Released under the Affero GPL"
+#~ msgstr "Disponible bajo la Affero GPL"
+
#~ msgid "Responsible for the content of this site as per German law §5 TMG:"
#~ msgstr ""
#~ "Responsable del contenido de esta página según la ley alemana §5 TMG:"
@@ -4219,9 +4321,6 @@ msgstr "Eliminar la entrada de peso para el %s"
#~ "a la página de transifex,\n"
#~ "pide accesso y te pondremos todo lo que necesites."
-#~ msgid "Code"
-#~ msgstr "Código"
-
#~ msgid ""
#~ "Obviously, you are highly encouraged to clone the\n"
#~ "repo and start hacking! Once you are ready, send a pull request and we\n"
@@ -4356,9 +4455,6 @@ msgstr "Eliminar la entrada de peso para el %s"
#~ msgid "Pause!"
#~ msgstr "¡Pausa!"
-#~ msgid "Meal"
-#~ msgstr "Comida"
-
#~ msgid "There is no chart here because there are no weight entries."
#~ msgstr "No hay gráfico aqui porque no hay entradas de peso."
diff --git a/wger/locale/fa/LC_MESSAGES/django.po b/wger/locale/fa/LC_MESSAGES/django.po
index 658aad553..5c746f8dd 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: 2021-08-17 17:23+0200\n"
+"POT-Creation-Date: 2022-02-15 14:51+0100\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"
@@ -50,16 +50,16 @@ msgstr "زبان ها"
msgid "Nothing found."
msgstr "چیزی یافت نشد!"
-#: config/templates/language/overview.html:16 core/templates/index.html:147
-#: core/templates/index.html:199 manager/templates/calendar/month.html:132
+#: config/templates/language/overview.html:16 core/templates/index.html:137
+#: core/templates/index.html:189 manager/templates/calendar/month.html:132
#: manager/templates/schedule/overview.html:28
#: manager/templates/schedule/view.html:146
#: manager/templates/workout/overview.html:28
#: nutrition/templates/ingredient/overview.html:45
#: nutrition/templates/plan/overview.html:23
-#: nutrition/templates/plan/view.html:148
-#: nutrition/templates/plan/view.html:151
-#: nutrition/templates/plan/view.html:189
+#: nutrition/templates/plan/view.html:150
+#: nutrition/templates/plan/view.html:153
+#: nutrition/templates/plan/view.html:191
msgid "Add one now."
msgstr "اضافه کن"
@@ -80,7 +80,7 @@ msgstr "اضافه کن"
#: gym/templates/gym/member_list.html:244
#: gym/templates/gym/member_list.html:281
#: mailer/templates/mailer/gym/overview.html:43
-#: weight/templates/overview.html:78
+#: weight/templates/overview.html:61
msgid "Add"
msgstr "اضافه کردن"
@@ -118,14 +118,14 @@ msgstr "نمایش"
#: config/templates/language/view.html:91 core/templates/user/api_key.html:44
#: core/templates/user/preferences.html:28
-#: exercises/templates/exercise/view.html:273
-#: exercises/templates/exercise/view.html:296 gym/models/contract.py:200
+#: exercises/templates/exercise/view.html:323
+#: exercises/templates/exercise/view.html:346 gym/models/contract.py:200
#: gym/templates/contract/view.html:41 gym/templates/contract/view.html:106
#: gym/templates/gym/member_list.html:248
#: manager/templates/schedule/view.html:281
#: manager/templates/workout/view.html:206
#: nutrition/templates/ingredient/view.html:226
-#: nutrition/templates/plan/view.html:409 weight/templates/overview.html:62
+#: nutrition/templates/plan/view.html:411 weight/templates/overview.html:45
msgid "Options"
msgstr "امکانات"
@@ -139,12 +139,12 @@ msgstr "امکانات"
#: core/templates/weight_unit/list.html:17
#: exercises/templates/categories/admin-overview.html:16
#: exercises/templates/equipment/admin-overview.html:16
-#: exercises/templates/exercise/view.html:180
-#: exercises/templates/exercise/view.html:301
+#: exercises/templates/exercise/view.html:230
+#: exercises/templates/exercise/view.html:351
#: exercises/templates/muscles/admin-overview.html:16
-#: exercises/views/comments.py:63 gallery/views/images.py:96
-#: gym/templates/admin_notes/list.html:32 gym/templates/contract/list.html:31
-#: gym/templates/contract/view.html:107
+#: exercises/views/comments.py:63 exercises/views/videos.py:69
+#: gallery/views/images.py:96 gym/templates/admin_notes/list.html:32
+#: gym/templates/contract/list.html:31 gym/templates/contract/view.html:107
#: gym/templates/contract_option/list.html:31
#: gym/templates/contract_type/list.html:31 gym/templates/document/list.html:38
#: gym/templates/gym/list.html:19 gym/templates/gym/list.html:43
@@ -155,7 +155,7 @@ msgstr "امکانات"
#: manager/templates/calendar/partial_overview_table.html:18
#: manager/templates/schedule/view.html:121
#: nutrition/templates/ingredient/view.html:198
-#: nutrition/templates/plan/view.html:89 nutrition/templates/plan/view.html:124
+#: nutrition/templates/plan/view.html:89 nutrition/templates/plan/view.html:126
#: nutrition/templates/units/list.html:18
msgid "Edit"
msgstr "ویرایش"
@@ -169,9 +169,9 @@ msgstr "ویرایش"
#: exercises/templates/categories/admin-overview.html:17
#: exercises/templates/equipment/admin-overview.html:17
#: exercises/templates/exercise/view.html:68
-#: exercises/templates/exercise/view.html:155
-#: exercises/templates/exercise/view.html:185
-#: exercises/templates/exercise/view.html:306
+#: exercises/templates/exercise/view.html:205
+#: exercises/templates/exercise/view.html:235
+#: exercises/templates/exercise/view.html:356
#: exercises/templates/muscles/admin-overview.html:17
#: gym/templates/admin_notes/list.html:40
#: gym/templates/contract_option/list.html:39
@@ -184,7 +184,7 @@ msgstr "ویرایش"
#: nutrition/templates/ingredient/view.html:199
#: nutrition/templates/ingredient/view.html:239
#: nutrition/templates/log/detail.html:197
-#: nutrition/templates/plan/view.html:95 nutrition/templates/plan/view.html:130
+#: nutrition/templates/plan/view.html:95 nutrition/templates/plan/view.html:132
#: nutrition/templates/units/list.html:20
msgid "Delete"
msgstr "حذف"
@@ -311,7 +311,7 @@ msgid "Some way of answering you (e-mail, etc.)"
msgstr "راه های ارتباطی با شما(ایمیل و ... )"
#: core/forms.py:265 exercises/models/comment.py:40 manager/models/set.py:60
-#: manager/models/setting.py:99 nutrition/models/log.py:61
+#: manager/models/setting.py:99 nutrition/models/log.py:71
msgid "Comment"
msgstr "نظر"
@@ -455,7 +455,7 @@ msgstr ""
msgid "Age"
msgstr "سن"
-#: core/models/profile.py:202 nutrition/forms.py:98
+#: core/models/profile.py:202 nutrition/forms.py:99
msgid "Height (cm)"
msgstr "قد (سانتی متر)"
@@ -506,7 +506,7 @@ msgid "Total caloric intake, including e.g. any surplus"
msgstr "مصرف کل کالری"
#: core/models/profile.py:305 nutrition/models/ingredient_weight_unit.py:45
-#: nutrition/models/log.py:80 nutrition/models/meal_item.py:58
+#: nutrition/models/log.py:90 nutrition/models/meal_item.py:58
msgid "Weight unit"
msgstr "واحد وزن"
@@ -545,9 +545,9 @@ msgstr "مجموع تمام ساعت ها باید 24 باشد"
#: gym/models/user_document.py:87 gym/templates/contract/view.html:50
#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:96
#: gym/views/gym.py:156 manager/models/schedule.py:55
-#: manager/models/workout.py:56 nutrition/models/ingredient.py:96
-#: nutrition/models/ingredient_category.py:26
-#: nutrition/models/weight_unit.py:38
+#: manager/models/workout.py:56 measurements/models/category.py:53
+#: nutrition/models/ingredient.py:96 nutrition/models/ingredient_category.py:26
+#: nutrition/models/meal.py:66 nutrition/models/weight_unit.py:38
#: nutrition/templates/ingredient/pending.html:15
#: nutrition/templates/ingredient/view.html:185
msgid "Name"
@@ -605,17 +605,17 @@ msgstr ""
msgid "Dashboard"
msgstr "داشبورد"
-#: core/templates/index.html:31 manager/templates/calendar/month.html:115
+#: core/templates/index.html:21 manager/templates/calendar/month.html:115
msgid "Add log to day"
msgstr "این گزارش را به امروز اضافه کن"
-#: core/templates/index.html:35 manager/templates/calendar/month.html:120
+#: core/templates/index.html:25 manager/templates/calendar/month.html:120
msgid ""
"Click to add weight logs to a training\n"
"day in your current workout:"
msgstr ""
-#: core/templates/index.html:43 core/templates/index.html:83
+#: core/templates/index.html:33 core/templates/index.html:73
#: core/templates/misc/fragments/shariff_modal.html:29
#: core/templates/template.html:125 manager/templates/calendar/month.html:138
#: manager/templates/schedule/view.html:246
@@ -625,17 +625,17 @@ msgstr ""
msgid "Close"
msgstr "بستن"
-#: core/templates/index.html:54 core/templates/index.html:203
+#: core/templates/index.html:44 core/templates/index.html:193
msgid "Add new diary entry"
msgstr ""
-#: core/templates/index.html:59
+#: core/templates/index.html:49
msgid ""
"Click to add an entry to your nutrition diary for today. You can either log "
"a meal as you defined it, or entry any number of custom entries."
msgstr ""
-#: core/templates/index.html:67 core/templates/index.html:171
+#: core/templates/index.html:57 core/templates/index.html:161
#: core/templates/user/overview.html:171
#: nutrition/templates/ingredient/view.html:79
#: nutrition/templates/log/detail.html:40
@@ -644,19 +644,19 @@ msgstr ""
#: nutrition/templates/log/overview.html:7
#: nutrition/templates/log/overview.html:44
#: nutrition/templates/plan/overview.html:17
-#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:242
-#: nutrition/templates/plan/view.html:301
-#: nutrition/templates/plan/view.html:321
-#: nutrition/templates/plan/view.html:363
-#: nutrition/templates/plan/view.html:373
+#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:244
+#: nutrition/templates/plan/view.html:303
+#: nutrition/templates/plan/view.html:323
+#: nutrition/templates/plan/view.html:365
+#: nutrition/templates/plan/view.html:375
msgid "kcal"
msgstr "کیلو کالری"
-#: core/templates/index.html:79 nutrition/templates/plan/view.html:348
+#: core/templates/index.html:69 nutrition/templates/plan/view.html:350
msgid "Add custom diary entry"
msgstr ""
-#: core/templates/index.html:94 core/templates/index.html:102
+#: core/templates/index.html:84 core/templates/index.html:92
#: manager/models/day.py:34 manager/models/log.py:56
#: manager/models/session.py:60 manager/models/workout.py:109
#: manager/templates/schedule/view.html:105
@@ -667,80 +667,80 @@ msgstr ""
msgid "Workout"
msgstr "تمرین"
-#: core/templates/index.html:128
+#: core/templates/index.html:118
msgid "This workout is part of a schedule:"
msgstr "این تمرین بخشی از برنامه است:"
-#: core/templates/index.html:133
+#: core/templates/index.html:123
msgid ""
"The current workout is selected from your active schedule or, if you don't "
"have one, simply by date."
msgstr ""
-#: core/templates/index.html:142 manager/templates/calendar/month.html:188
+#: core/templates/index.html:132 manager/templates/calendar/month.html:188
msgid "Add new log"
msgstr "اضافه کردن گزارش جدید"
-#: core/templates/index.html:147 core/templates/user/overview.html:58
+#: core/templates/index.html:137 core/templates/user/overview.html:58
#: manager/templates/calendar/month.html:128
#: manager/templates/schedule/view.html:146
#: manager/templates/workout/overview.html:28
msgid "No workouts found."
msgstr "تمرین یافت نشد"
-#: core/templates/index.html:157 nutrition/models/log.py:48
+#: core/templates/index.html:147 nutrition/models/log.py:49
#: nutrition/models/meal.py:49 nutrition/models/meal_item.py:47
#: nutrition/models/plan.py:94 nutrition/templates/plan/view.html:11
#: nutrition/templates/plan/view.html:19
msgid "Nutrition plan"
msgstr "برنامه غذایی"
-#: core/templates/index.html:169 core/templates/user/overview.html:155
+#: core/templates/index.html:159 core/templates/user/overview.html:155
#: nutrition/models/ingredient.py:100
#: nutrition/templates/ingredient/view.html:77
#: nutrition/templates/log/detail.html:39
#: nutrition/templates/log/detail.html:156
-#: nutrition/templates/plan/view.html:53 nutrition/templates/plan/view.html:241
-#: nutrition/templates/plan/view.html:358
-#: nutrition/templates/plan/view.html:362 nutrition/views/plan.py:384
+#: nutrition/templates/plan/view.html:53 nutrition/templates/plan/view.html:243
+#: nutrition/templates/plan/view.html:360
+#: nutrition/templates/plan/view.html:364 nutrition/views/plan.py:384
msgid "Energy"
msgstr "انرژی"
-#: core/templates/index.html:175 core/templates/user/overview.html:156
+#: core/templates/index.html:165 core/templates/user/overview.html:156
#: nutrition/models/ingredient.py:105
#: nutrition/templates/ingredient/view.html:84
#: nutrition/templates/log/detail.html:52
#: nutrition/templates/log/detail.html:174
-#: nutrition/templates/plan/view.html:54 nutrition/templates/plan/view.html:249
+#: nutrition/templates/plan/view.html:54 nutrition/templates/plan/view.html:251
#: nutrition/views/plan.py:390
msgid "Protein"
msgstr "پروتئین"
-#: core/templates/index.html:181 core/templates/user/overview.html:157
+#: core/templates/index.html:171 core/templates/user/overview.html:157
#: nutrition/models/ingredient.py:113
#: nutrition/templates/ingredient/view.html:90
#: nutrition/templates/log/detail.html:65
#: nutrition/templates/log/detail.html:175
-#: nutrition/templates/plan/view.html:55 nutrition/templates/plan/view.html:255
+#: nutrition/templates/plan/view.html:55 nutrition/templates/plan/view.html:257
#: nutrition/views/plan.py:398
msgid "Carbohydrates"
msgstr "کربوهیدارت ها"
-#: core/templates/index.html:187 core/templates/user/overview.html:158
+#: core/templates/index.html:177 core/templates/user/overview.html:158
#: nutrition/models/ingredient.py:131
#: nutrition/templates/ingredient/view.html:106
#: nutrition/templates/log/detail.html:91
#: nutrition/templates/log/detail.html:176
-#: nutrition/templates/plan/view.html:56 nutrition/templates/plan/view.html:268
+#: nutrition/templates/plan/view.html:56 nutrition/templates/plan/view.html:270
#: nutrition/views/plan.py:412
msgid "Fat"
msgstr "چربی"
-#: core/templates/index.html:199 nutrition/templates/plan/overview.html:22
+#: core/templates/index.html:189 nutrition/templates/plan/overview.html:22
msgid "No nutrition plans."
msgstr "برنامه وجود ندارد"
-#: core/templates/index.html:213 core/templates/user/overview.html:112
+#: core/templates/index.html:203 core/templates/user/overview.html:112
#: core/templates/user/overview.html:121 manager/forms.py:173
#: manager/helpers.py:89 manager/models/log.py:84 manager/models/setting.py:67
#: manager/templates/log/add.html:54 manager/templates/set/formset.html:12
@@ -749,11 +749,7 @@ msgstr "برنامه وجود ندارد"
msgid "Weight"
msgstr "وزن"
-#: core/templates/index.html:217
-msgid "Your current weight is: "
-msgstr "وزن فعلی شما :"
-
-#: core/templates/index.html:248 core/templates/navigation.html:97
+#: core/templates/index.html:210 core/templates/navigation.html:97
#: weight/views.py:70
msgid "Add weight entry"
msgstr "وزن را وارد کنید"
@@ -785,7 +781,7 @@ msgstr "لیست مجوز ها"
msgid "Nothing found"
msgstr "چیزی یافت نشد"
-#: core/templates/misc/about.html:4 core/templates/template.html:201
+#: core/templates/misc/about.html:4 core/templates/template.html:175
#: core/templates/template_features.html:118
#: core/templates/template_no_context.html:88
msgid "Imprint"
@@ -801,8 +797,8 @@ msgid ""
msgstr ""
#: core/templates/misc/fragments/shariff_modal.html:22
-#: nutrition/templates/plan/view.html:385
-#: nutrition/templates/plan/view.html:394
+#: nutrition/templates/plan/view.html:387
+#: nutrition/templates/plan/view.html:396
msgid "That's done here"
msgstr "انجام شده"
@@ -890,7 +886,7 @@ msgstr ""
msgid "Equipment"
msgstr ""
-#: core/templates/navigation.html:78 exercises/templates/exercise/view.html:208
+#: core/templates/navigation.html:78 exercises/templates/exercise/view.html:258
msgid "Muscles"
msgstr ""
@@ -963,7 +959,7 @@ msgstr ""
msgid "Get the code"
msgstr ""
-#: core/templates/navigation.html:175 core/templates/template.html:193
+#: core/templates/navigation.html:175 core/templates/template.html:205
#: core/templates/template_features.html:100
msgid "Translate"
msgstr ""
@@ -1114,15 +1110,11 @@ msgstr ""
msgid "Create some demo entries"
msgstr "چند نمونه پر کنید"
-#: core/templates/template.html:202 core/templates/template_features.html:122
+#: core/templates/template.html:176 core/templates/template_features.html:122
#: core/templates/template_no_context.html:89 software/templates/tos.html:7
msgid "Terms of service"
msgstr ""
-#: core/templates/template.html:209 core/templates/template.html:210
-msgid "Released under the Affero GPL"
-msgstr ""
-
#: core/templates/template_features.html:62 software/templates/features.html:9
#: software/templates/features.html:120
msgid "Features"
@@ -1219,9 +1211,10 @@ msgstr ""
#: core/templates/user/overview.html:120 core/templates/user/overview.html:153
#: exercises/models/exercise.py:77 gallery/models/image.py:47
#: manager/helpers.py:88 manager/models/log.py:98 manager/models/session.py:67
-#: nutrition/models/ingredient.py:85 nutrition/models/ingredient.py:87
-#: nutrition/models/ingredient.py:190 nutrition/templates/log/overview.html:30
-#: nutrition/templates/plan/view.html:307 weight/models.py:32
+#: measurements/models/measurement.py:64 nutrition/models/ingredient.py:85
+#: nutrition/models/ingredient.py:87 nutrition/models/ingredient.py:190
+#: nutrition/templates/log/overview.html:30
+#: nutrition/templates/plan/view.html:309 weight/models.py:32
#: weight/templates/import_csv_preview.html:13
#: weight/templates/import_csv_preview.html:42 weight/views.py:150
msgid "Date"
@@ -1229,10 +1222,10 @@ msgstr ""
#: core/templates/user/overview.html:35 core/templates/user/overview.html:154
#: exercises/models/exercise.py:61 exercises/templates/exercise/view.html:88
-#: exercises/views/exercises.py:189 gallery/models/image.py:70
+#: exercises/views/exercises.py:190 gallery/models/image.py:70
#: gym/models/contract.py:57 gym/models/contract.py:107
#: manager/models/day.py:37 manager/models/workout.py:62
-#: nutrition/models/plan.py:69
+#: measurements/models/measurement.py:79 nutrition/models/plan.py:69
msgid "Description"
msgstr ""
@@ -1393,11 +1386,11 @@ msgstr "عملکرد"
msgid "Change password"
msgstr ""
-#: core/templatetags/wger_extras.py:217
+#: core/templatetags/wger_extras.py:229
msgid "kg"
msgstr ""
-#: core/templatetags/wger_extras.py:219
+#: core/templatetags/wger_extras.py:231
#: nutrition/templates/ingredient/view.html:86
#: nutrition/templates/ingredient/view.html:92
#: nutrition/templates/ingredient/view.html:99
@@ -1409,28 +1402,28 @@ msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr ""
-#: core/templatetags/wger_extras.py:222
+#: core/templatetags/wger_extras.py:234
msgid "lb"
msgstr ""
-#: core/templatetags/wger_extras.py:224
+#: core/templatetags/wger_extras.py:236
msgctxt "weight unit, i.e. ounces"
msgid "oz"
msgstr ""
#: core/views/languages.py:85 exercises/views/categories.py:121
-#: exercises/views/equipment.py:106 exercises/views/exercises.py:422
+#: exercises/views/equipment.py:106 exercises/views/exercises.py:423
#: exercises/views/images.py:128 exercises/views/muscles.py:118
-#: manager/views/schedule.py:311 manager/views/schedule_step.py:129
-#: manager/views/workout.py:268 manager/views/workout_session.py:141
-#: nutrition/views/ingredient.py:144 nutrition/views/plan.py:120
-#: nutrition/views/unit.py:111
+#: exercises/views/videos.py:129 manager/views/schedule.py:311
+#: manager/views/schedule_step.py:129 manager/views/workout.py:268
+#: manager/views/workout_session.py:141 nutrition/views/ingredient.py:144
+#: nutrition/views/plan.py:120 nutrition/views/unit.py:111
msgid "Successfully deleted"
msgstr ""
#: core/views/languages.py:93 core/views/license.py:103
#: core/views/repetition_units.py:115 core/views/weight_units.py:115
-#: exercises/views/categories.py:127 exercises/views/exercises.py:430
+#: exercises/views/categories.py:127 exercises/views/exercises.py:431
#: exercises/views/muscles.py:125 gallery/views/images.py:121
#: gym/views/admin_notes.py:196 gym/views/document.py:206 gym/views/gym.py:486
#: manager/views/schedule.py:318 manager/views/schedule_step.py:139
@@ -1444,7 +1437,7 @@ msgstr ""
#: core/views/languages.py:111 core/views/license.py:84
#: core/views/repetition_units.py:85 core/views/user.py:456
#: core/views/weight_units.py:85 exercises/views/categories.py:97
-#: exercises/views/equipment.py:83 exercises/views/exercises.py:304
+#: exercises/views/equipment.py:83 exercises/views/exercises.py:305
#: exercises/views/muscles.py:105 gym/views/admin_notes.py:160
#: gym/views/config.py:68 gym/views/contract.py:186
#: gym/views/contract_option.py:123 gym/views/contract_type.py:123
@@ -1531,7 +1524,7 @@ msgstr ""
#: exercises/models/base.py:64 exercises/templates/equipment/overview.html:71
#: exercises/templates/exercise/overview.html:76
-#: exercises/templates/exercise/view.html:218
+#: exercises/templates/exercise/view.html:268
#: exercises/templates/muscles/overview.html:73
msgid "Secondary muscles"
msgstr ""
@@ -1544,8 +1537,9 @@ msgstr ""
msgid "Exercise Categories"
msgstr ""
-#: exercises/models/comment.py:34 exercises/models/image.py:62
-#: manager/forms.py:165 manager/helpers.py:89 manager/models/log.py:51
+#: exercises/models/comment.py:34 exercises/models/image.py:75
+#: exercises/models/video.py:82 manager/forms.py:165 manager/helpers.py:89
+#: manager/models/log.py:51
msgid "Exercise"
msgstr ""
@@ -1558,43 +1552,67 @@ msgstr ""
msgid "Language"
msgstr "زبان"
-#: exercises/models/exercise.py:233 exercises/views/exercises.py:460
+#: exercises/models/exercise.py:237 exercises/views/exercises.py:461
msgid "Exercise was successfully added to the general database"
msgstr ""
-#: exercises/models/exercise.py:261
+#: exercises/models/exercise.py:265
msgid "New user submitted exercise"
msgstr ""
-#: exercises/models/exercise.py:263
+#: exercises/models/exercise.py:267
#, python-brace-format
msgid "The user {0} submitted a new exercise \"{1}\"."
msgstr ""
-#: exercises/models/image.py:68 gallery/models/image.py:56
+#: exercises/models/image.py:59
+msgid "Line"
+msgstr ""
+
+#: exercises/models/image.py:60
+msgid "3D"
+msgstr ""
+
+#: exercises/models/image.py:61
+msgid "Low-poly"
+msgstr ""
+
+#: exercises/models/image.py:62
+msgid "Photo"
+msgstr ""
+
+#: exercises/models/image.py:63
+msgid "Other"
+msgstr ""
+
+#: exercises/models/image.py:81 gallery/models/image.py:56
msgid "Image"
msgstr ""
-#: exercises/models/image.py:69 gallery/models/image.py:57
+#: exercises/models/image.py:82 gallery/models/image.py:57
msgid "Only PNG and JPEG formats are supported"
msgstr ""
-#: exercises/models/image.py:75
+#: exercises/models/image.py:88
msgid "Main picture"
msgstr ""
-#: exercises/models/image.py:78
+#: exercises/models/image.py:91
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 "
"by the system."
msgstr ""
-#: exercises/models/image.py:166
+#: exercises/models/image.py:100
+msgid "The art style of your image"
+msgstr ""
+
+#: exercises/models/image.py:185
msgid "New user submitted image"
msgstr ""
-#: exercises/models/image.py:167
+#: exercises/models/image.py:186
#, python-brace-format
msgid "The user {0} submitted a new image \"{1}\" for exercise {2}."
msgstr ""
@@ -1603,6 +1621,54 @@ msgstr ""
msgid "In latin, e.g. \"Pectoralis major\""
msgstr ""
+#: exercises/models/video.py:41
+msgid "Maximum file size is 100MB."
+msgstr ""
+
+#: exercises/models/video.py:44 exercises/models/video.py:48
+msgid "File type is not supported"
+msgstr ""
+
+#: exercises/models/video.py:57
+#, fuzzy
+#| msgid "%(birthdate)s is not a valid birthdate"
+msgid "File is not a valid video"
+msgstr "%(birthdate)s روز تولد معتبر نمی باشد"
+
+#: exercises/models/video.py:88
+msgid "Main video"
+msgstr ""
+
+#: exercises/models/video.py:94
+msgid "Video"
+msgstr ""
+
+#: exercises/models/video.py:101
+msgid "Size"
+msgstr ""
+
+#: exercises/models/video.py:108 manager/models/schedule_step.py:56
+msgid "Duration"
+msgstr ""
+
+#: exercises/models/video.py:117
+msgid "Width"
+msgstr ""
+
+#: exercises/models/video.py:124
+#, fuzzy
+#| msgid "Weight"
+msgid "Height"
+msgstr "وزن"
+
+#: exercises/models/video.py:131
+msgid "Codec"
+msgstr ""
+
+#: exercises/models/video.py:139
+msgid "Codec, long name"
+msgstr ""
+
#: exercises/templates/equipment/admin-overview.html:4
msgid "Equipment list"
msgstr ""
@@ -1618,7 +1684,7 @@ msgstr ""
#: exercises/templates/equipment/overview.html:69
#: exercises/templates/exercise/overview.html:74
-#: exercises/templates/exercise/view.html:214
+#: exercises/templates/exercise/view.html:264
#: exercises/templates/muscles/overview.html:71
msgid "Main muscles"
msgstr ""
@@ -1727,7 +1793,8 @@ msgstr ""
#: gym/templates/gym/new_user.html:22
#: gym/templates/gym/reset_user_password.html:20 manager/models/log.py:45
#: manager/models/schedule.py:44 manager/models/session.py:49
-#: manager/models/workout.py:89 nutrition/models/plan.py:55
+#: manager/models/workout.py:89 measurements/models/category.py:48
+#: measurements/models/measurement.py:59 nutrition/models/plan.py:55
#: nutrition/templates/ingredient/pending.html:16 weight/models.py:41
msgid "User"
msgstr ""
@@ -1752,13 +1819,13 @@ msgid "Please select one of the options below."
msgstr ""
#: exercises/templates/exercise/view.html:60
-#: exercises/templates/exercise/view.html:153
+#: exercises/templates/exercise/view.html:203
#: nutrition/templates/ingredient/view.html:38
msgid "Accept"
msgstr ""
#: exercises/templates/exercise/view.html:64
-#: exercises/templates/exercise/view.html:154
+#: exercises/templates/exercise/view.html:204
#: nutrition/templates/ingredient/view.html:42
msgid "Decline"
msgstr ""
@@ -1771,32 +1838,42 @@ msgstr ""
msgid "Add new image"
msgstr ""
-#: exercises/templates/exercise/view.html:147
+#: exercises/templates/exercise/view.html:148
+msgid "Videos"
+msgstr ""
+
+#: exercises/templates/exercise/view.html:187 exercises/views/videos.py:94
+#, fuzzy
+#| msgid "Add new log"
+msgid "Add new video"
+msgstr "اضافه کردن گزارش جدید"
+
+#: exercises/templates/exercise/view.html:197
msgid "Images pending review"
msgstr ""
-#: exercises/templates/exercise/view.html:168
+#: exercises/templates/exercise/view.html:218
msgid "Comments for this exercise"
msgstr ""
-#: exercises/templates/exercise/view.html:196
+#: exercises/templates/exercise/view.html:246
msgid "Add new comment"
msgstr ""
-#: exercises/templates/exercise/view.html:210
+#: exercises/templates/exercise/view.html:260
msgid "The diagram shows the most used muscles on this exercise"
msgstr ""
-#: exercises/templates/exercise/view.html:251
+#: exercises/templates/exercise/view.html:301
#: manager/templates/workout/log.html:10 manager/templates/workout/log.html:11
msgid "Weight log"
msgstr ""
-#: exercises/templates/exercise/view.html:256
+#: exercises/templates/exercise/view.html:306
msgid "Exercise Variations"
msgstr ""
-#: exercises/templates/exercise/view.html:277
+#: exercises/templates/exercise/view.html:327
msgid "Submit a correction"
msgstr ""
@@ -1831,30 +1908,30 @@ msgstr ""
msgid "Delete equipment?"
msgstr ""
-#: exercises/views/exercises.py:228
+#: exercises/views/exercises.py:229
#, python-format
msgid ""
"%(name_original)s is too similar to existing exercise \"%(exercise_name)s\""
msgstr ""
-#: exercises/views/exercises.py:246
+#: exercises/views/exercises.py:247
msgid "Add exercise"
msgstr ""
-#: exercises/views/exercises.py:366
+#: exercises/views/exercises.py:367
msgid "Thank you. Once the changes are reviewed the exercise will be updated."
msgstr ""
-#: exercises/views/exercises.py:379
+#: exercises/views/exercises.py:380
#, python-brace-format
msgid "Correct {0}"
msgstr ""
-#: exercises/views/exercises.py:421
+#: exercises/views/exercises.py:422
msgid "This will delete the exercise from all workouts."
msgstr ""
-#: exercises/views/exercises.py:473
+#: exercises/views/exercises.py:474
msgid "Exercise was successfully marked as rejected"
msgstr ""
@@ -1866,6 +1943,11 @@ msgstr ""
msgid "Delete exercise image?"
msgstr ""
+#: exercises/views/videos.py:144 nutrition/views/log.py:230
+#: nutrition/views/unit_ingredient.py:139
+msgid "Delete?"
+msgstr ""
+
#: gallery/templates/images/overview.html:62
msgid "Add image"
msgstr ""
@@ -1932,8 +2014,8 @@ msgid "Contract type"
msgstr ""
#: gym/models/contract.py:208 gym/templates/contract/view.html:59
-#: manager/templates/log/add.html:52 nutrition/forms.py:58
-#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:92
+#: manager/templates/log/add.html:52 nutrition/forms.py:59
+#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:102
#: nutrition/models/meal_item.py:72
msgid "Amount"
msgstr ""
@@ -2366,6 +2448,7 @@ msgid ""
msgstr ""
#: mailer/templates/mailer/gym/preview.html:22
+#: software/templates/about_us.html:59
msgid "Current version"
msgstr ""
@@ -2398,7 +2481,8 @@ msgstr ""
#: manager/models/log.py:90 manager/models/setting.py:47
#: manager/models/setting.py:78 manager/templates/log/add.html:53
#: manager/templates/log/add.html:55 manager/templates/set/formset.html:11
-#: manager/templates/set/formset.html:13 nutrition/forms.py:62
+#: manager/templates/set/formset.html:13 measurements/models/category.py:58
+#: nutrition/forms.py:63
msgid "Unit"
msgstr ""
@@ -2461,10 +2545,6 @@ msgstr ""
msgid "schedule"
msgstr ""
-#: manager/models/schedule_step.py:56
-msgid "Duration"
-msgstr ""
-
#: manager/models/schedule_step.py:57
msgid "The duration in weeks"
msgstr ""
@@ -2721,7 +2801,7 @@ msgstr ""
#: manager/templates/schedule/view.html:290
#: manager/templates/workout/view.html:142
#: manager/templates/workout/view.html:217
-#: nutrition/templates/plan/view.html:415
+#: nutrition/templates/plan/view.html:417
msgid "Download as PDF"
msgstr ""
@@ -2944,30 +3024,34 @@ msgstr ""
msgid "This will delete all weight logs for this day as well."
msgstr ""
-#: nutrition/forms.py:121
+#: measurements/models/measurement.py:69
+msgid "Value"
+msgstr ""
+
+#: nutrition/forms.py:122
msgid "Calculate"
msgstr ""
-#: nutrition/forms.py:194 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:195 nutrition/templates/rate/form.html:76
msgid "Basic caloric intake"
msgstr ""
-#: nutrition/forms.py:195
+#: nutrition/forms.py:196
msgid "Your basic caloric intake as calculated for your data"
msgstr ""
-#: nutrition/forms.py:201
+#: nutrition/forms.py:202
msgid "Additional calories"
msgstr ""
-#: nutrition/forms.py:203
+#: nutrition/forms.py:204
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
msgstr ""
-#: nutrition/forms.py:231 nutrition/models/ingredient_weight_unit.py:39
-#: nutrition/models/log.py:71 nutrition/models/meal_item.py:53
+#: nutrition/forms.py:232 nutrition/models/ingredient_weight_unit.py:39
+#: nutrition/models/log.py:81 nutrition/models/meal_item.py:53
#: nutrition/templates/log/detail.html:155
msgid "Ingredient"
msgstr ""
@@ -2986,14 +3070,14 @@ msgstr ""
#: nutrition/models/ingredient.py:123
#: nutrition/templates/ingredient/view.html:96
#: nutrition/templates/log/detail.html:78
-#: nutrition/templates/plan/view.html:262 nutrition/views/plan.py:406
+#: nutrition/templates/plan/view.html:264 nutrition/views/plan.py:406
msgid "Sugar content in carbohydrates"
msgstr ""
#: nutrition/models/ingredient.py:141
#: nutrition/templates/ingredient/view.html:112
#: nutrition/templates/log/detail.html:104
-#: nutrition/templates/plan/view.html:274 nutrition/views/plan.py:420
+#: nutrition/templates/plan/view.html:276 nutrition/views/plan.py:420
msgid "Saturated fat content in fats"
msgstr ""
@@ -3001,7 +3085,7 @@ msgstr ""
#: nutrition/templates/ingredient/view.html:134
#: nutrition/templates/log/detail.html:122
#: nutrition/templates/log/detail.html:178
-#: nutrition/templates/plan/view.html:285 nutrition/views/plan.py:426
+#: nutrition/templates/plan/view.html:287 nutrition/views/plan.py:426
msgid "Fibres"
msgstr ""
@@ -3009,7 +3093,7 @@ msgstr ""
#: nutrition/templates/ingredient/view.html:144
#: nutrition/templates/log/detail.html:135
#: nutrition/templates/log/detail.html:181
-#: nutrition/templates/plan/view.html:291 nutrition/views/plan.py:432
+#: nutrition/templates/plan/view.html:293 nutrition/views/plan.py:432
msgid "Sodium"
msgstr ""
@@ -3054,10 +3138,20 @@ msgstr ""
msgid "Unit amount, e.g. \"1 Cup\" or \"1/2 spoon\""
msgstr ""
+#: nutrition/models/log.py:55
+msgid "Meal"
+msgstr ""
+
#: nutrition/models/meal.py:61
msgid "Time (approx)"
msgstr ""
+#: nutrition/models/meal.py:68
+msgid ""
+"Give meals a textual description / name such as \"Breakfast\" or \"after "
+"workout\""
+msgstr ""
+
#: nutrition/models/plan.py:71
msgid ""
"A description of the goal of the plan, e.g. \"Gain mass\" or \"Prepare for "
@@ -3186,12 +3280,12 @@ msgstr ""
#: nutrition/templates/ingredient/view.html:71
#: nutrition/templates/log/detail.html:31
-#: nutrition/templates/plan/view.html:227 nutrition/views/plan.py:376
+#: nutrition/templates/plan/view.html:229 nutrition/views/plan.py:376
msgid "Macronutrients"
msgstr ""
#: nutrition/templates/ingredient/view.html:80
-#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:244
+#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:246
msgid "kJ"
msgstr ""
@@ -3204,7 +3298,7 @@ msgstr ""
#: nutrition/templates/ingredient/view.html:128
#: nutrition/templates/log/detail.html:119
-#: nutrition/templates/plan/view.html:282
+#: nutrition/templates/plan/view.html:284
msgid "Others"
msgstr ""
@@ -3233,7 +3327,7 @@ msgstr ""
#: nutrition/templates/log/detail.html:7
#: nutrition/templates/log/overview.html:7
-#: nutrition/templates/plan/view.html:300
+#: nutrition/templates/plan/view.html:302
msgid "Nutrition diary"
msgstr ""
@@ -3243,13 +3337,13 @@ msgstr ""
#: nutrition/templates/log/detail.html:33
#: nutrition/templates/log/overview.html:31
-#: nutrition/templates/plan/view.html:308
+#: nutrition/templates/plan/view.html:310
msgid "Logged"
msgstr ""
#: nutrition/templates/log/detail.html:34
#: nutrition/templates/log/overview.html:32
-#: nutrition/templates/plan/view.html:309
+#: nutrition/templates/plan/view.html:311
msgid "Difference"
msgstr ""
@@ -3262,7 +3356,7 @@ msgid "g"
msgstr ""
#: nutrition/templates/log/overview.html:53
-#: nutrition/templates/plan/view.html:330
+#: nutrition/templates/plan/view.html:332
msgid "nothing found"
msgstr ""
@@ -3282,77 +3376,77 @@ msgstr ""
msgid "Add ingredient to meal"
msgstr ""
-#: nutrition/templates/plan/view.html:150
+#: nutrition/templates/plan/view.html:152
msgid "No items for this meal."
msgstr ""
-#: nutrition/templates/plan/view.html:188
+#: nutrition/templates/plan/view.html:190
msgid "No meals for this plan."
msgstr ""
-#: nutrition/templates/plan/view.html:200
+#: nutrition/templates/plan/view.html:202
msgid "Log this Plan"
msgstr ""
-#: nutrition/templates/plan/view.html:206
+#: nutrition/templates/plan/view.html:208
msgid "Add a new meal"
msgstr ""
-#: nutrition/templates/plan/view.html:216 nutrition/views/plan.py:369
+#: nutrition/templates/plan/view.html:218 nutrition/views/plan.py:369
msgid "Nutritional data"
msgstr ""
-#: nutrition/templates/plan/view.html:219
+#: nutrition/templates/plan/view.html:221
#, python-format
msgid "Based on the weight entry dated %(date)s (%(weight)s)"
msgstr ""
-#: nutrition/templates/plan/view.html:228 nutrition/views/plan.py:377
+#: nutrition/templates/plan/view.html:230 nutrition/views/plan.py:377
msgid "Total"
msgstr ""
-#: nutrition/templates/plan/view.html:229 nutrition/views/plan.py:378
+#: nutrition/templates/plan/view.html:231 nutrition/views/plan.py:378
msgid "Percent of energy"
msgstr ""
-#: nutrition/templates/plan/view.html:232 nutrition/views/plan.py:379
+#: nutrition/templates/plan/view.html:234 nutrition/views/plan.py:379
msgid "g per body kg"
msgstr ""
-#: nutrition/templates/plan/view.html:234
+#: nutrition/templates/plan/view.html:236
msgid "oz per body lb"
msgstr ""
-#: nutrition/templates/plan/view.html:338
+#: nutrition/templates/plan/view.html:340
msgid "View complete nutrition log"
msgstr ""
-#: nutrition/templates/plan/view.html:371
+#: nutrition/templates/plan/view.html:373
msgid "Goal"
msgstr ""
-#: nutrition/templates/plan/view.html:382
+#: nutrition/templates/plan/view.html:384
msgid ""
"You have selected that this nutritional plan has a\n"
" goal amount of calories. Use the calculator or enter the value\n"
" yourself."
msgstr ""
-#: nutrition/templates/plan/view.html:392
+#: nutrition/templates/plan/view.html:394
msgid ""
"If you find the ingredient list too short, you might want to activate the "
"preference to also show English ingredients."
msgstr ""
-#: nutrition/templates/plan/view.html:421
+#: nutrition/templates/plan/view.html:423
msgid "Edit nutrition plan"
msgstr ""
-#: nutrition/templates/plan/view.html:425
+#: nutrition/templates/plan/view.html:427
msgid "Make a copy of this nutrition plan"
msgstr ""
-#: nutrition/templates/plan/view.html:431
+#: nutrition/templates/plan/view.html:433
msgid "Delete nutrition plan"
msgstr ""
@@ -3432,10 +3526,6 @@ msgstr ""
msgid "Ingredient was successfully marked as rejected"
msgstr ""
-#: nutrition/views/log.py:229 nutrition/views/unit_ingredient.py:139
-msgid "Delete?"
-msgstr ""
-
#: nutrition/views/meal.py:55
msgid "Add new meal"
msgstr ""
@@ -3791,11 +3881,11 @@ msgstr ""
msgid "Re-Submit"
msgstr ""
-#: weight/templates/overview.html:68
+#: weight/templates/overview.html:51
msgid "Export as CSV"
msgstr ""
-#: weight/templates/overview.html:72
+#: weight/templates/overview.html:55
msgid "Import from spreadsheet"
msgstr ""
@@ -3813,6 +3903,9 @@ msgstr ""
msgid "Delete weight entry for the %s"
msgstr ""
+#~ msgid "Your current weight is: "
+#~ msgstr "وزن فعلی شما :"
+
#~ msgid "GNUPG-Key:"
#~ msgstr "GNUPG-Key:"
diff --git a/wger/locale/fi/LC_MESSAGES/django.po b/wger/locale/fi/LC_MESSAGES/django.po
index 612dad49c..f83cdc69b 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: 2021-08-17 17:23+0200\n"
+"POT-Creation-Date: 2022-02-15 14:51+0100\n"
"PO-Revision-Date: 2021-05-09 09:11+0000\n"
"Last-Translator: J. Lavoie <[email protected]>\n"
"Language-Team: Finnish <https://hosted.weblate.org/projects/wger/web/fi/>\n"
@@ -50,16 +50,16 @@ msgstr "Kielet"
msgid "Nothing found."
msgstr "Mitään ei löytynyt."
-#: config/templates/language/overview.html:16 core/templates/index.html:147
-#: core/templates/index.html:199 manager/templates/calendar/month.html:132
+#: config/templates/language/overview.html:16 core/templates/index.html:137
+#: core/templates/index.html:189 manager/templates/calendar/month.html:132
#: manager/templates/schedule/overview.html:28
#: manager/templates/schedule/view.html:146
#: manager/templates/workout/overview.html:28
#: nutrition/templates/ingredient/overview.html:45
#: nutrition/templates/plan/overview.html:23
-#: nutrition/templates/plan/view.html:148
-#: nutrition/templates/plan/view.html:151
-#: nutrition/templates/plan/view.html:189
+#: nutrition/templates/plan/view.html:150
+#: nutrition/templates/plan/view.html:153
+#: nutrition/templates/plan/view.html:191
msgid "Add one now."
msgstr ""
@@ -80,7 +80,7 @@ msgstr ""
#: gym/templates/gym/member_list.html:244
#: gym/templates/gym/member_list.html:281
#: mailer/templates/mailer/gym/overview.html:43
-#: weight/templates/overview.html:78
+#: weight/templates/overview.html:61
msgid "Add"
msgstr "Lisää"
@@ -118,14 +118,14 @@ msgstr "Näytä"
#: config/templates/language/view.html:91 core/templates/user/api_key.html:44
#: core/templates/user/preferences.html:28
-#: exercises/templates/exercise/view.html:273
-#: exercises/templates/exercise/view.html:296 gym/models/contract.py:200
+#: exercises/templates/exercise/view.html:323
+#: exercises/templates/exercise/view.html:346 gym/models/contract.py:200
#: gym/templates/contract/view.html:41 gym/templates/contract/view.html:106
#: gym/templates/gym/member_list.html:248
#: manager/templates/schedule/view.html:281
#: manager/templates/workout/view.html:206
#: nutrition/templates/ingredient/view.html:226
-#: nutrition/templates/plan/view.html:409 weight/templates/overview.html:62
+#: nutrition/templates/plan/view.html:411 weight/templates/overview.html:45
msgid "Options"
msgstr "Asetukset"
@@ -139,12 +139,12 @@ msgstr "Asetukset"
#: core/templates/weight_unit/list.html:17
#: exercises/templates/categories/admin-overview.html:16
#: exercises/templates/equipment/admin-overview.html:16
-#: exercises/templates/exercise/view.html:180
-#: exercises/templates/exercise/view.html:301
+#: exercises/templates/exercise/view.html:230
+#: exercises/templates/exercise/view.html:351
#: exercises/templates/muscles/admin-overview.html:16
-#: exercises/views/comments.py:63 gallery/views/images.py:96
-#: gym/templates/admin_notes/list.html:32 gym/templates/contract/list.html:31
-#: gym/templates/contract/view.html:107
+#: exercises/views/comments.py:63 exercises/views/videos.py:69
+#: gallery/views/images.py:96 gym/templates/admin_notes/list.html:32
+#: gym/templates/contract/list.html:31 gym/templates/contract/view.html:107
#: gym/templates/contract_option/list.html:31
#: gym/templates/contract_type/list.html:31 gym/templates/document/list.html:38
#: gym/templates/gym/list.html:19 gym/templates/gym/list.html:43
@@ -155,7 +155,7 @@ msgstr "Asetukset"
#: manager/templates/calendar/partial_overview_table.html:18
#: manager/templates/schedule/view.html:121
#: nutrition/templates/ingredient/view.html:198
-#: nutrition/templates/plan/view.html:89 nutrition/templates/plan/view.html:124
+#: nutrition/templates/plan/view.html:89 nutrition/templates/plan/view.html:126
#: nutrition/templates/units/list.html:18
msgid "Edit"
msgstr "Muokkaa"
@@ -169,9 +169,9 @@ msgstr "Muokkaa"
#: exercises/templates/categories/admin-overview.html:17
#: exercises/templates/equipment/admin-overview.html:17
#: exercises/templates/exercise/view.html:68
-#: exercises/templates/exercise/view.html:155
-#: exercises/templates/exercise/view.html:185
-#: exercises/templates/exercise/view.html:306
+#: exercises/templates/exercise/view.html:205
+#: exercises/templates/exercise/view.html:235
+#: exercises/templates/exercise/view.html:356
#: exercises/templates/muscles/admin-overview.html:17
#: gym/templates/admin_notes/list.html:40
#: gym/templates/contract_option/list.html:39
@@ -184,7 +184,7 @@ msgstr "Muokkaa"
#: nutrition/templates/ingredient/view.html:199
#: nutrition/templates/ingredient/view.html:239
#: nutrition/templates/log/detail.html:197
-#: nutrition/templates/plan/view.html:95 nutrition/templates/plan/view.html:130
+#: nutrition/templates/plan/view.html:95 nutrition/templates/plan/view.html:132
#: nutrition/templates/units/list.html:20
msgid "Delete"
msgstr "Poista"
@@ -318,7 +318,7 @@ msgid "Some way of answering you (e-mail, etc.)"
msgstr "Jokin vastaustapa(sähköposti, etc.)"
#: core/forms.py:265 exercises/models/comment.py:40 manager/models/set.py:60
-#: manager/models/setting.py:99 nutrition/models/log.py:61
+#: manager/models/setting.py:99 nutrition/models/log.py:71
msgid "Comment"
msgstr "Kommentti"
@@ -452,7 +452,7 @@ msgstr ""
msgid "Age"
msgstr "Ikä"
-#: core/models/profile.py:202 nutrition/forms.py:98
+#: core/models/profile.py:202 nutrition/forms.py:99
msgid "Height (cm)"
msgstr "Pituus (cm)"
@@ -503,7 +503,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:305 nutrition/models/ingredient_weight_unit.py:45
-#: nutrition/models/log.py:80 nutrition/models/meal_item.py:58
+#: nutrition/models/log.py:90 nutrition/models/meal_item.py:58
msgid "Weight unit"
msgstr "Painoyksikkö"
@@ -542,9 +542,9 @@ msgstr "Tuntien summa tarvitsee olla 24"
#: gym/models/user_document.py:87 gym/templates/contract/view.html:50
#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:96
#: gym/views/gym.py:156 manager/models/schedule.py:55
-#: manager/models/workout.py:56 nutrition/models/ingredient.py:96
-#: nutrition/models/ingredient_category.py:26
-#: nutrition/models/weight_unit.py:38
+#: manager/models/workout.py:56 measurements/models/category.py:53
+#: nutrition/models/ingredient.py:96 nutrition/models/ingredient_category.py:26
+#: nutrition/models/meal.py:66 nutrition/models/weight_unit.py:38
#: nutrition/templates/ingredient/pending.html:15
#: nutrition/templates/ingredient/view.html:185
msgid "Name"
@@ -600,17 +600,17 @@ msgstr ""
msgid "Dashboard"
msgstr ""
-#: core/templates/index.html:31 manager/templates/calendar/month.html:115
+#: core/templates/index.html:21 manager/templates/calendar/month.html:115
msgid "Add log to day"
msgstr ""
-#: core/templates/index.html:35 manager/templates/calendar/month.html:120
+#: core/templates/index.html:25 manager/templates/calendar/month.html:120
msgid ""
"Click to add weight logs to a training\n"
"day in your current workout:"
msgstr ""
-#: core/templates/index.html:43 core/templates/index.html:83
+#: core/templates/index.html:33 core/templates/index.html:73
#: core/templates/misc/fragments/shariff_modal.html:29
#: core/templates/template.html:125 manager/templates/calendar/month.html:138
#: manager/templates/schedule/view.html:246
@@ -620,17 +620,17 @@ msgstr ""
msgid "Close"
msgstr ""
-#: core/templates/index.html:54 core/templates/index.html:203
+#: core/templates/index.html:44 core/templates/index.html:193
msgid "Add new diary entry"
msgstr ""
-#: core/templates/index.html:59
+#: core/templates/index.html:49
msgid ""
"Click to add an entry to your nutrition diary for today. You can either log "
"a meal as you defined it, or entry any number of custom entries."
msgstr ""
-#: core/templates/index.html:67 core/templates/index.html:171
+#: core/templates/index.html:57 core/templates/index.html:161
#: core/templates/user/overview.html:171
#: nutrition/templates/ingredient/view.html:79
#: nutrition/templates/log/detail.html:40
@@ -639,19 +639,19 @@ msgstr ""
#: nutrition/templates/log/overview.html:7
#: nutrition/templates/log/overview.html:44
#: nutrition/templates/plan/overview.html:17
-#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:242
-#: nutrition/templates/plan/view.html:301
-#: nutrition/templates/plan/view.html:321
-#: nutrition/templates/plan/view.html:363
-#: nutrition/templates/plan/view.html:373
+#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:244
+#: nutrition/templates/plan/view.html:303
+#: nutrition/templates/plan/view.html:323
+#: nutrition/templates/plan/view.html:365
+#: nutrition/templates/plan/view.html:375
msgid "kcal"
msgstr "kcal"
-#: core/templates/index.html:79 nutrition/templates/plan/view.html:348
+#: core/templates/index.html:69 nutrition/templates/plan/view.html:350
msgid "Add custom diary entry"
msgstr ""
-#: core/templates/index.html:94 core/templates/index.html:102
+#: core/templates/index.html:84 core/templates/index.html:92
#: manager/models/day.py:34 manager/models/log.py:56
#: manager/models/session.py:60 manager/models/workout.py:109
#: manager/templates/schedule/view.html:105
@@ -662,80 +662,80 @@ msgstr ""
msgid "Workout"
msgstr ""
-#: core/templates/index.html:128
+#: core/templates/index.html:118
msgid "This workout is part of a schedule:"
msgstr ""
-#: core/templates/index.html:133
+#: core/templates/index.html:123
msgid ""
"The current workout is selected from your active schedule or, if you don't "
"have one, simply by date."
msgstr ""
-#: core/templates/index.html:142 manager/templates/calendar/month.html:188
+#: core/templates/index.html:132 manager/templates/calendar/month.html:188
msgid "Add new log"
msgstr ""
-#: core/templates/index.html:147 core/templates/user/overview.html:58
+#: core/templates/index.html:137 core/templates/user/overview.html:58
#: manager/templates/calendar/month.html:128
#: manager/templates/schedule/view.html:146
#: manager/templates/workout/overview.html:28
msgid "No workouts found."
msgstr ""
-#: core/templates/index.html:157 nutrition/models/log.py:48
+#: core/templates/index.html:147 nutrition/models/log.py:49
#: nutrition/models/meal.py:49 nutrition/models/meal_item.py:47
#: nutrition/models/plan.py:94 nutrition/templates/plan/view.html:11
#: nutrition/templates/plan/view.html:19
msgid "Nutrition plan"
msgstr ""
-#: core/templates/index.html:169 core/templates/user/overview.html:155
+#: core/templates/index.html:159 core/templates/user/overview.html:155
#: nutrition/models/ingredient.py:100
#: nutrition/templates/ingredient/view.html:77
#: nutrition/templates/log/detail.html:39
#: nutrition/templates/log/detail.html:156
-#: nutrition/templates/plan/view.html:53 nutrition/templates/plan/view.html:241
-#: nutrition/templates/plan/view.html:358
-#: nutrition/templates/plan/view.html:362 nutrition/views/plan.py:384
+#: nutrition/templates/plan/view.html:53 nutrition/templates/plan/view.html:243
+#: nutrition/templates/plan/view.html:360
+#: nutrition/templates/plan/view.html:364 nutrition/views/plan.py:384
msgid "Energy"
msgstr ""
-#: core/templates/index.html:175 core/templates/user/overview.html:156
+#: core/templates/index.html:165 core/templates/user/overview.html:156
#: nutrition/models/ingredient.py:105
#: nutrition/templates/ingredient/view.html:84
#: nutrition/templates/log/detail.html:52
#: nutrition/templates/log/detail.html:174
-#: nutrition/templates/plan/view.html:54 nutrition/templates/plan/view.html:249
+#: nutrition/templates/plan/view.html:54 nutrition/templates/plan/view.html:251
#: nutrition/views/plan.py:390
msgid "Protein"
msgstr ""
-#: core/templates/index.html:181 core/templates/user/overview.html:157
+#: core/templates/index.html:171 core/templates/user/overview.html:157
#: nutrition/models/ingredient.py:113
#: nutrition/templates/ingredient/view.html:90
#: nutrition/templates/log/detail.html:65
#: nutrition/templates/log/detail.html:175
-#: nutrition/templates/plan/view.html:55 nutrition/templates/plan/view.html:255
+#: nutrition/templates/plan/view.html:55 nutrition/templates/plan/view.html:257
#: nutrition/views/plan.py:398
msgid "Carbohydrates"
msgstr ""
-#: core/templates/index.html:187 core/templates/user/overview.html:158
+#: core/templates/index.html:177 core/templates/user/overview.html:158
#: nutrition/models/ingredient.py:131
#: nutrition/templates/ingredient/view.html:106
#: nutrition/templates/log/detail.html:91
#: nutrition/templates/log/detail.html:176
-#: nutrition/templates/plan/view.html:56 nutrition/templates/plan/view.html:268
+#: nutrition/templates/plan/view.html:56 nutrition/templates/plan/view.html:270
#: nutrition/views/plan.py:412
msgid "Fat"
msgstr ""
-#: core/templates/index.html:199 nutrition/templates/plan/overview.html:22
+#: core/templates/index.html:189 nutrition/templates/plan/overview.html:22
msgid "No nutrition plans."
msgstr ""
-#: core/templates/index.html:213 core/templates/user/overview.html:112
+#: core/templates/index.html:203 core/templates/user/overview.html:112
#: core/templates/user/overview.html:121 manager/forms.py:173
#: manager/helpers.py:89 manager/models/log.py:84 manager/models/setting.py:67
#: manager/templates/log/add.html:54 manager/templates/set/formset.html:12
@@ -744,11 +744,7 @@ msgstr ""
msgid "Weight"
msgstr ""
-#: core/templates/index.html:217
-msgid "Your current weight is: "
-msgstr ""
-
-#: core/templates/index.html:248 core/templates/navigation.html:97
+#: core/templates/index.html:210 core/templates/navigation.html:97
#: weight/views.py:70
msgid "Add weight entry"
msgstr ""
@@ -780,7 +776,7 @@ msgstr ""
msgid "Nothing found"
msgstr ""
-#: core/templates/misc/about.html:4 core/templates/template.html:201
+#: core/templates/misc/about.html:4 core/templates/template.html:175
#: core/templates/template_features.html:118
#: core/templates/template_no_context.html:88
msgid "Imprint"
@@ -796,8 +792,8 @@ msgid ""
msgstr ""
#: core/templates/misc/fragments/shariff_modal.html:22
-#: nutrition/templates/plan/view.html:385
-#: nutrition/templates/plan/view.html:394
+#: nutrition/templates/plan/view.html:387
+#: nutrition/templates/plan/view.html:396
msgid "That's done here"
msgstr ""
@@ -883,7 +879,7 @@ msgstr ""
msgid "Equipment"
msgstr ""
-#: core/templates/navigation.html:78 exercises/templates/exercise/view.html:208
+#: core/templates/navigation.html:78 exercises/templates/exercise/view.html:258
msgid "Muscles"
msgstr ""
@@ -956,7 +952,7 @@ msgstr ""
msgid "Get the code"
msgstr ""
-#: core/templates/navigation.html:175 core/templates/template.html:193
+#: core/templates/navigation.html:175 core/templates/template.html:205
#: core/templates/template_features.html:100
msgid "Translate"
msgstr ""
@@ -1105,15 +1101,11 @@ msgstr ""
msgid "Create some demo entries"
msgstr ""
-#: core/templates/template.html:202 core/templates/template_features.html:122
+#: core/templates/template.html:176 core/templates/template_features.html:122
#: core/templates/template_no_context.html:89 software/templates/tos.html:7
msgid "Terms of service"
msgstr "Käyttöehdot"
-#: core/templates/template.html:209 core/templates/template.html:210
-msgid "Released under the Affero GPL"
-msgstr "Julkaistu Affero GPL -lisenssin alla"
-
#: core/templates/template_features.html:62 software/templates/features.html:9
#: software/templates/features.html:120
msgid "Features"
@@ -1210,9 +1202,10 @@ msgstr ""
#: core/templates/user/overview.html:120 core/templates/user/overview.html:153
#: exercises/models/exercise.py:77 gallery/models/image.py:47
#: manager/helpers.py:88 manager/models/log.py:98 manager/models/session.py:67
-#: nutrition/models/ingredient.py:85 nutrition/models/ingredient.py:87
-#: nutrition/models/ingredient.py:190 nutrition/templates/log/overview.html:30
-#: nutrition/templates/plan/view.html:307 weight/models.py:32
+#: measurements/models/measurement.py:64 nutrition/models/ingredient.py:85
+#: nutrition/models/ingredient.py:87 nutrition/models/ingredient.py:190
+#: nutrition/templates/log/overview.html:30
+#: nutrition/templates/plan/view.html:309 weight/models.py:32
#: weight/templates/import_csv_preview.html:13
#: weight/templates/import_csv_preview.html:42 weight/views.py:150
msgid "Date"
@@ -1220,10 +1213,10 @@ msgstr ""
#: core/templates/user/overview.html:35 core/templates/user/overview.html:154
#: exercises/models/exercise.py:61 exercises/templates/exercise/view.html:88
-#: exercises/views/exercises.py:189 gallery/models/image.py:70
+#: exercises/views/exercises.py:190 gallery/models/image.py:70
#: gym/models/contract.py:57 gym/models/contract.py:107
#: manager/models/day.py:37 manager/models/workout.py:62
-#: nutrition/models/plan.py:69
+#: measurements/models/measurement.py:79 nutrition/models/plan.py:69
msgid "Description"
msgstr ""
@@ -1384,11 +1377,11 @@ msgstr ""
msgid "Change password"
msgstr ""
-#: core/templatetags/wger_extras.py:217
+#: core/templatetags/wger_extras.py:229
msgid "kg"
msgstr "kg"
-#: core/templatetags/wger_extras.py:219
+#: core/templatetags/wger_extras.py:231
#: nutrition/templates/ingredient/view.html:86
#: nutrition/templates/ingredient/view.html:92
#: nutrition/templates/ingredient/view.html:99
@@ -1400,28 +1393,28 @@ msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr "g"
-#: core/templatetags/wger_extras.py:222
+#: core/templatetags/wger_extras.py:234
msgid "lb"
msgstr ""
-#: core/templatetags/wger_extras.py:224
+#: core/templatetags/wger_extras.py:236
msgctxt "weight unit, i.e. ounces"
msgid "oz"
msgstr ""
#: core/views/languages.py:85 exercises/views/categories.py:121
-#: exercises/views/equipment.py:106 exercises/views/exercises.py:422
+#: exercises/views/equipment.py:106 exercises/views/exercises.py:423
#: exercises/views/images.py:128 exercises/views/muscles.py:118
-#: manager/views/schedule.py:311 manager/views/schedule_step.py:129
-#: manager/views/workout.py:268 manager/views/workout_session.py:141
-#: nutrition/views/ingredient.py:144 nutrition/views/plan.py:120
-#: nutrition/views/unit.py:111
+#: exercises/views/videos.py:129 manager/views/schedule.py:311
+#: manager/views/schedule_step.py:129 manager/views/workout.py:268
+#: manager/views/workout_session.py:141 nutrition/views/ingredient.py:144
+#: nutrition/views/plan.py:120 nutrition/views/unit.py:111
msgid "Successfully deleted"
msgstr "Poistettu onnistuneesti"
#: core/views/languages.py:93 core/views/license.py:103
#: core/views/repetition_units.py:115 core/views/weight_units.py:115
-#: exercises/views/categories.py:127 exercises/views/exercises.py:430
+#: exercises/views/categories.py:127 exercises/views/exercises.py:431
#: exercises/views/muscles.py:125 gallery/views/images.py:121
#: gym/views/admin_notes.py:196 gym/views/document.py:206 gym/views/gym.py:486
#: manager/views/schedule.py:318 manager/views/schedule_step.py:139
@@ -1435,7 +1428,7 @@ msgstr "Poista {0}?"
#: core/views/languages.py:111 core/views/license.py:84
#: core/views/repetition_units.py:85 core/views/user.py:456
#: core/views/weight_units.py:85 exercises/views/categories.py:97
-#: exercises/views/equipment.py:83 exercises/views/exercises.py:304
+#: exercises/views/equipment.py:83 exercises/views/exercises.py:305
#: exercises/views/muscles.py:105 gym/views/admin_notes.py:160
#: gym/views/config.py:68 gym/views/contract.py:186
#: gym/views/contract_option.py:123 gym/views/contract_type.py:123
@@ -1522,7 +1515,7 @@ msgstr ""
#: exercises/models/base.py:64 exercises/templates/equipment/overview.html:71
#: exercises/templates/exercise/overview.html:76
-#: exercises/templates/exercise/view.html:218
+#: exercises/templates/exercise/view.html:268
#: exercises/templates/muscles/overview.html:73
msgid "Secondary muscles"
msgstr ""
@@ -1535,8 +1528,9 @@ msgstr ""
msgid "Exercise Categories"
msgstr ""
-#: exercises/models/comment.py:34 exercises/models/image.py:62
-#: manager/forms.py:165 manager/helpers.py:89 manager/models/log.py:51
+#: exercises/models/comment.py:34 exercises/models/image.py:75
+#: exercises/models/video.py:82 manager/forms.py:165 manager/helpers.py:89
+#: manager/models/log.py:51
msgid "Exercise"
msgstr ""
@@ -1549,43 +1543,67 @@ msgstr ""
msgid "Language"
msgstr ""
-#: exercises/models/exercise.py:233 exercises/views/exercises.py:460
+#: exercises/models/exercise.py:237 exercises/views/exercises.py:461
msgid "Exercise was successfully added to the general database"
msgstr ""
-#: exercises/models/exercise.py:261
+#: exercises/models/exercise.py:265
msgid "New user submitted exercise"
msgstr ""
-#: exercises/models/exercise.py:263
+#: exercises/models/exercise.py:267
#, python-brace-format
msgid "The user {0} submitted a new exercise \"{1}\"."
msgstr ""
-#: exercises/models/image.py:68 gallery/models/image.py:56
+#: exercises/models/image.py:59
+msgid "Line"
+msgstr ""
+
+#: exercises/models/image.py:60
+msgid "3D"
+msgstr ""
+
+#: exercises/models/image.py:61
+msgid "Low-poly"
+msgstr ""
+
+#: exercises/models/image.py:62
+msgid "Photo"
+msgstr ""
+
+#: exercises/models/image.py:63
+msgid "Other"
+msgstr ""
+
+#: exercises/models/image.py:81 gallery/models/image.py:56
msgid "Image"
msgstr ""
-#: exercises/models/image.py:69 gallery/models/image.py:57
+#: exercises/models/image.py:82 gallery/models/image.py:57
msgid "Only PNG and JPEG formats are supported"
msgstr "Vain PNG- ja JPEG-formaatit ovat tuettuja"
-#: exercises/models/image.py:75
+#: exercises/models/image.py:88
msgid "Main picture"
msgstr ""
-#: exercises/models/image.py:78
+#: exercises/models/image.py:91
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 "
"by the system."
msgstr ""
-#: exercises/models/image.py:166
+#: exercises/models/image.py:100
+msgid "The art style of your image"
+msgstr ""
+
+#: exercises/models/image.py:185
msgid "New user submitted image"
msgstr "Uusi käyttäjän lisäämä kuva"
-#: exercises/models/image.py:167
+#: exercises/models/image.py:186
#, python-brace-format
msgid "The user {0} submitted a new image \"{1}\" for exercise {2}."
msgstr ""
@@ -1594,6 +1612,52 @@ msgstr ""
msgid "In latin, e.g. \"Pectoralis major\""
msgstr ""
+#: exercises/models/video.py:41
+msgid "Maximum file size is 100MB."
+msgstr ""
+
+#: exercises/models/video.py:44 exercises/models/video.py:48
+msgid "File type is not supported"
+msgstr ""
+
+#: exercises/models/video.py:57
+msgid "File is not a valid video"
+msgstr ""
+
+#: exercises/models/video.py:88
+msgid "Main video"
+msgstr ""
+
+#: exercises/models/video.py:94
+msgid "Video"
+msgstr ""
+
+#: exercises/models/video.py:101
+msgid "Size"
+msgstr ""
+
+#: exercises/models/video.py:108 manager/models/schedule_step.py:56
+msgid "Duration"
+msgstr ""
+
+#: exercises/models/video.py:117
+msgid "Width"
+msgstr ""
+
+#: exercises/models/video.py:124
+#, fuzzy
+#| msgid "Height (cm)"
+msgid "Height"
+msgstr "Pituus (cm)"
+
+#: exercises/models/video.py:131
+msgid "Codec"
+msgstr ""
+
+#: exercises/models/video.py:139
+msgid "Codec, long name"
+msgstr ""
+
#: exercises/templates/equipment/admin-overview.html:4
msgid "Equipment list"
msgstr ""
@@ -1609,7 +1673,7 @@ msgstr ""
#: exercises/templates/equipment/overview.html:69
#: exercises/templates/exercise/overview.html:74
-#: exercises/templates/exercise/view.html:214
+#: exercises/templates/exercise/view.html:264
#: exercises/templates/muscles/overview.html:71
msgid "Main muscles"
msgstr ""
@@ -1718,7 +1782,8 @@ msgstr ""
#: gym/templates/gym/new_user.html:22
#: gym/templates/gym/reset_user_password.html:20 manager/models/log.py:45
#: manager/models/schedule.py:44 manager/models/session.py:49
-#: manager/models/workout.py:89 nutrition/models/plan.py:55
+#: manager/models/workout.py:89 measurements/models/category.py:48
+#: measurements/models/measurement.py:59 nutrition/models/plan.py:55
#: nutrition/templates/ingredient/pending.html:16 weight/models.py:41
msgid "User"
msgstr ""
@@ -1743,13 +1808,13 @@ msgid "Please select one of the options below."
msgstr ""
#: exercises/templates/exercise/view.html:60
-#: exercises/templates/exercise/view.html:153
+#: exercises/templates/exercise/view.html:203
#: nutrition/templates/ingredient/view.html:38
msgid "Accept"
msgstr ""
#: exercises/templates/exercise/view.html:64
-#: exercises/templates/exercise/view.html:154
+#: exercises/templates/exercise/view.html:204
#: nutrition/templates/ingredient/view.html:42
msgid "Decline"
msgstr ""
@@ -1762,32 +1827,40 @@ msgstr ""
msgid "Add new image"
msgstr ""
-#: exercises/templates/exercise/view.html:147
+#: exercises/templates/exercise/view.html:148
+msgid "Videos"
+msgstr ""
+
+#: exercises/templates/exercise/view.html:187 exercises/views/videos.py:94
+msgid "Add new video"
+msgstr ""
+
+#: exercises/templates/exercise/view.html:197
msgid "Images pending review"
msgstr ""
-#: exercises/templates/exercise/view.html:168
+#: exercises/templates/exercise/view.html:218
msgid "Comments for this exercise"
msgstr ""
-#: exercises/templates/exercise/view.html:196
+#: exercises/templates/exercise/view.html:246
msgid "Add new comment"
msgstr ""
-#: exercises/templates/exercise/view.html:210
+#: exercises/templates/exercise/view.html:260
msgid "The diagram shows the most used muscles on this exercise"
msgstr ""
-#: exercises/templates/exercise/view.html:251
+#: exercises/templates/exercise/view.html:301
#: manager/templates/workout/log.html:10 manager/templates/workout/log.html:11
msgid "Weight log"
msgstr ""
-#: exercises/templates/exercise/view.html:256
+#: exercises/templates/exercise/view.html:306
msgid "Exercise Variations"
msgstr ""
-#: exercises/templates/exercise/view.html:277
+#: exercises/templates/exercise/view.html:327
msgid "Submit a correction"
msgstr ""
@@ -1822,30 +1895,30 @@ msgstr ""
msgid "Delete equipment?"
msgstr ""
-#: exercises/views/exercises.py:228
+#: exercises/views/exercises.py:229
#, python-format
msgid ""
"%(name_original)s is too similar to existing exercise \"%(exercise_name)s\""
msgstr ""
-#: exercises/views/exercises.py:246
+#: exercises/views/exercises.py:247
msgid "Add exercise"
msgstr ""
-#: exercises/views/exercises.py:366
+#: exercises/views/exercises.py:367
msgid "Thank you. Once the changes are reviewed the exercise will be updated."
msgstr ""
-#: exercises/views/exercises.py:379
+#: exercises/views/exercises.py:380
#, python-brace-format
msgid "Correct {0}"
msgstr ""
-#: exercises/views/exercises.py:421
+#: exercises/views/exercises.py:422
msgid "This will delete the exercise from all workouts."
msgstr ""
-#: exercises/views/exercises.py:473
+#: exercises/views/exercises.py:474
msgid "Exercise was successfully marked as rejected"
msgstr ""
@@ -1857,6 +1930,11 @@ msgstr ""
msgid "Delete exercise image?"
msgstr ""
+#: exercises/views/videos.py:144 nutrition/views/log.py:230
+#: nutrition/views/unit_ingredient.py:139
+msgid "Delete?"
+msgstr ""
+
#: gallery/templates/images/overview.html:62
msgid "Add image"
msgstr ""
@@ -1923,8 +2001,8 @@ msgid "Contract type"
msgstr ""
#: gym/models/contract.py:208 gym/templates/contract/view.html:59
-#: manager/templates/log/add.html:52 nutrition/forms.py:58
-#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:92
+#: manager/templates/log/add.html:52 nutrition/forms.py:59
+#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:102
#: nutrition/models/meal_item.py:72
msgid "Amount"
msgstr ""
@@ -2359,6 +2437,7 @@ msgid ""
msgstr ""
#: mailer/templates/mailer/gym/preview.html:22
+#: software/templates/about_us.html:59
msgid "Current version"
msgstr ""
@@ -2391,7 +2470,8 @@ msgstr ""
#: manager/models/log.py:90 manager/models/setting.py:47
#: manager/models/setting.py:78 manager/templates/log/add.html:53
#: manager/templates/log/add.html:55 manager/templates/set/formset.html:11
-#: manager/templates/set/formset.html:13 nutrition/forms.py:62
+#: manager/templates/set/formset.html:13 measurements/models/category.py:58
+#: nutrition/forms.py:63
msgid "Unit"
msgstr ""
@@ -2454,10 +2534,6 @@ msgstr ""
msgid "schedule"
msgstr ""
-#: manager/models/schedule_step.py:56
-msgid "Duration"
-msgstr ""
-
#: manager/models/schedule_step.py:57
msgid "The duration in weeks"
msgstr ""
@@ -2712,7 +2788,7 @@ msgstr ""
#: manager/templates/schedule/view.html:290
#: manager/templates/workout/view.html:142
#: manager/templates/workout/view.html:217
-#: nutrition/templates/plan/view.html:415
+#: nutrition/templates/plan/view.html:417
msgid "Download as PDF"
msgstr "Lataa PDF:nä"
@@ -2933,30 +3009,34 @@ msgstr ""
msgid "This will delete all weight logs for this day as well."
msgstr ""
-#: nutrition/forms.py:121
+#: measurements/models/measurement.py:69
+msgid "Value"
+msgstr ""
+
+#: nutrition/forms.py:122
msgid "Calculate"
msgstr ""
-#: nutrition/forms.py:194 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:195 nutrition/templates/rate/form.html:76
msgid "Basic caloric intake"
msgstr ""
-#: nutrition/forms.py:195
+#: nutrition/forms.py:196
msgid "Your basic caloric intake as calculated for your data"
msgstr ""
-#: nutrition/forms.py:201
+#: nutrition/forms.py:202
msgid "Additional calories"
msgstr ""
-#: nutrition/forms.py:203
+#: nutrition/forms.py:204
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
msgstr ""
-#: nutrition/forms.py:231 nutrition/models/ingredient_weight_unit.py:39
-#: nutrition/models/log.py:71 nutrition/models/meal_item.py:53
+#: nutrition/forms.py:232 nutrition/models/ingredient_weight_unit.py:39
+#: nutrition/models/log.py:81 nutrition/models/meal_item.py:53
#: nutrition/templates/log/detail.html:155
msgid "Ingredient"
msgstr ""
@@ -2975,14 +3055,14 @@ msgstr ""
#: nutrition/models/ingredient.py:123
#: nutrition/templates/ingredient/view.html:96
#: nutrition/templates/log/detail.html:78
-#: nutrition/templates/plan/view.html:262 nutrition/views/plan.py:406
+#: nutrition/templates/plan/view.html:264 nutrition/views/plan.py:406
msgid "Sugar content in carbohydrates"
msgstr ""
#: nutrition/models/ingredient.py:141
#: nutrition/templates/ingredient/view.html:112
#: nutrition/templates/log/detail.html:104
-#: nutrition/templates/plan/view.html:274 nutrition/views/plan.py:420
+#: nutrition/templates/plan/view.html:276 nutrition/views/plan.py:420
msgid "Saturated fat content in fats"
msgstr ""
@@ -2990,7 +3070,7 @@ msgstr ""
#: nutrition/templates/ingredient/view.html:134
#: nutrition/templates/log/detail.html:122
#: nutrition/templates/log/detail.html:178
-#: nutrition/templates/plan/view.html:285 nutrition/views/plan.py:426
+#: nutrition/templates/plan/view.html:287 nutrition/views/plan.py:426
msgid "Fibres"
msgstr ""
@@ -2998,7 +3078,7 @@ msgstr ""
#: nutrition/templates/ingredient/view.html:144
#: nutrition/templates/log/detail.html:135
#: nutrition/templates/log/detail.html:181
-#: nutrition/templates/plan/view.html:291 nutrition/views/plan.py:432
+#: nutrition/templates/plan/view.html:293 nutrition/views/plan.py:432
msgid "Sodium"
msgstr ""
@@ -3043,10 +3123,20 @@ msgstr ""
msgid "Unit amount, e.g. \"1 Cup\" or \"1/2 spoon\""
msgstr ""
+#: nutrition/models/log.py:55
+msgid "Meal"
+msgstr ""
+
#: nutrition/models/meal.py:61
msgid "Time (approx)"
msgstr ""
+#: nutrition/models/meal.py:68
+msgid ""
+"Give meals a textual description / name such as \"Breakfast\" or \"after "
+"workout\""
+msgstr ""
+
#: nutrition/models/plan.py:71
msgid ""
"A description of the goal of the plan, e.g. \"Gain mass\" or \"Prepare for "
@@ -3179,12 +3269,12 @@ msgstr ""
#: nutrition/templates/ingredient/view.html:71
#: nutrition/templates/log/detail.html:31
-#: nutrition/templates/plan/view.html:227 nutrition/views/plan.py:376
+#: nutrition/templates/plan/view.html:229 nutrition/views/plan.py:376
msgid "Macronutrients"
msgstr ""
#: nutrition/templates/ingredient/view.html:80
-#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:244
+#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:246
msgid "kJ"
msgstr ""
@@ -3197,7 +3287,7 @@ msgstr ""
#: nutrition/templates/ingredient/view.html:128
#: nutrition/templates/log/detail.html:119
-#: nutrition/templates/plan/view.html:282
+#: nutrition/templates/plan/view.html:284
msgid "Others"
msgstr ""
@@ -3226,7 +3316,7 @@ msgstr ""
#: nutrition/templates/log/detail.html:7
#: nutrition/templates/log/overview.html:7
-#: nutrition/templates/plan/view.html:300
+#: nutrition/templates/plan/view.html:302
msgid "Nutrition diary"
msgstr ""
@@ -3236,13 +3326,13 @@ msgstr ""
#: nutrition/templates/log/detail.html:33
#: nutrition/templates/log/overview.html:31
-#: nutrition/templates/plan/view.html:308
+#: nutrition/templates/plan/view.html:310
msgid "Logged"
msgstr ""
#: nutrition/templates/log/detail.html:34
#: nutrition/templates/log/overview.html:32
-#: nutrition/templates/plan/view.html:309
+#: nutrition/templates/plan/view.html:311
msgid "Difference"
msgstr ""
@@ -3255,7 +3345,7 @@ msgid "g"
msgstr "g"
#: nutrition/templates/log/overview.html:53
-#: nutrition/templates/plan/view.html:330
+#: nutrition/templates/plan/view.html:332
msgid "nothing found"
msgstr ""
@@ -3275,77 +3365,77 @@ msgstr ""
msgid "Add ingredient to meal"
msgstr ""
-#: nutrition/templates/plan/view.html:150
+#: nutrition/templates/plan/view.html:152
msgid "No items for this meal."
msgstr ""
-#: nutrition/templates/plan/view.html:188
+#: nutrition/templates/plan/view.html:190
msgid "No meals for this plan."
msgstr ""
-#: nutrition/templates/plan/view.html:200
+#: nutrition/templates/plan/view.html:202
msgid "Log this Plan"
msgstr ""
-#: nutrition/templates/plan/view.html:206
+#: nutrition/templates/plan/view.html:208
msgid "Add a new meal"
msgstr ""
-#: nutrition/templates/plan/view.html:216 nutrition/views/plan.py:369
+#: nutrition/templates/plan/view.html:218 nutrition/views/plan.py:369
msgid "Nutritional data"
msgstr ""
-#: nutrition/templates/plan/view.html:219
+#: nutrition/templates/plan/view.html:221
#, python-format
msgid "Based on the weight entry dated %(date)s (%(weight)s)"
msgstr ""
-#: nutrition/templates/plan/view.html:228 nutrition/views/plan.py:377
+#: nutrition/templates/plan/view.html:230 nutrition/views/plan.py:377
msgid "Total"
msgstr ""
-#: nutrition/templates/plan/view.html:229 nutrition/views/plan.py:378
+#: nutrition/templates/plan/view.html:231 nutrition/views/plan.py:378
msgid "Percent of energy"
msgstr ""
-#: nutrition/templates/plan/view.html:232 nutrition/views/plan.py:379
+#: nutrition/templates/plan/view.html:234 nutrition/views/plan.py:379
msgid "g per body kg"
msgstr ""
-#: nutrition/templates/plan/view.html:234
+#: nutrition/templates/plan/view.html:236
msgid "oz per body lb"
msgstr ""
-#: nutrition/templates/plan/view.html:338
+#: nutrition/templates/plan/view.html:340
msgid "View complete nutrition log"
msgstr ""
-#: nutrition/templates/plan/view.html:371
+#: nutrition/templates/plan/view.html:373
msgid "Goal"
msgstr ""
-#: nutrition/templates/plan/view.html:382
+#: nutrition/templates/plan/view.html:384
msgid ""
"You have selected that this nutritional plan has a\n"
" goal amount of calories. Use the calculator or enter the value\n"
" yourself."
msgstr ""
-#: nutrition/templates/plan/view.html:392
+#: nutrition/templates/plan/view.html:394
msgid ""
"If you find the ingredient list too short, you might want to activate the "
"preference to also show English ingredients."
msgstr ""
-#: nutrition/templates/plan/view.html:421
+#: nutrition/templates/plan/view.html:423
msgid "Edit nutrition plan"
msgstr ""
-#: nutrition/templates/plan/view.html:425
+#: nutrition/templates/plan/view.html:427
msgid "Make a copy of this nutrition plan"
msgstr ""
-#: nutrition/templates/plan/view.html:431
+#: nutrition/templates/plan/view.html:433
msgid "Delete nutrition plan"
msgstr ""
@@ -3425,10 +3515,6 @@ msgstr ""
msgid "Ingredient was successfully marked as rejected"
msgstr ""
-#: nutrition/views/log.py:229 nutrition/views/unit_ingredient.py:139
-msgid "Delete?"
-msgstr ""
-
#: nutrition/views/meal.py:55
msgid "Add new meal"
msgstr ""
@@ -3784,11 +3870,11 @@ msgstr ""
msgid "Re-Submit"
msgstr ""
-#: weight/templates/overview.html:68
+#: weight/templates/overview.html:51
msgid "Export as CSV"
msgstr ""
-#: weight/templates/overview.html:72
+#: weight/templates/overview.html:55
msgid "Import from spreadsheet"
msgstr ""
@@ -3806,6 +3892,9 @@ msgstr ""
msgid "Delete weight entry for the %s"
msgstr ""
+#~ msgid "Released under the Affero GPL"
+#~ msgstr "Julkaistu Affero GPL -lisenssin alla"
+
#~ msgid "GNUPG-Key:"
#~ msgstr "GnuPG-avain:"
diff --git a/wger/locale/fr/LC_MESSAGES/django.po b/wger/locale/fr/LC_MESSAGES/django.po
index d6d8b073a..8395b6b73 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: 2021-08-17 17:23+0200\n"
+"POT-Creation-Date: 2022-02-15 14:51+0100\n"
"PO-Revision-Date: 2021-11-07 16:51+0000\n"
"Last-Translator: J. Lavoie <[email protected]>\n"
"Language-Team: French <https://hosted.weblate.org/projects/wger/web/fr/>\n"
@@ -63,16 +63,16 @@ msgstr "Langues"
msgid "Nothing found."
msgstr "Rien trouvé."
-#: config/templates/language/overview.html:16 core/templates/index.html:147
-#: core/templates/index.html:199 manager/templates/calendar/month.html:132
+#: config/templates/language/overview.html:16 core/templates/index.html:137
+#: core/templates/index.html:189 manager/templates/calendar/month.html:132
#: manager/templates/schedule/overview.html:28
#: manager/templates/schedule/view.html:146
#: manager/templates/workout/overview.html:28
#: nutrition/templates/ingredient/overview.html:45
#: nutrition/templates/plan/overview.html:23
-#: nutrition/templates/plan/view.html:148
-#: nutrition/templates/plan/view.html:151
-#: nutrition/templates/plan/view.html:189
+#: nutrition/templates/plan/view.html:150
+#: nutrition/templates/plan/view.html:153
+#: nutrition/templates/plan/view.html:191
msgid "Add one now."
msgstr "En ajouter une."
@@ -93,7 +93,7 @@ msgstr "En ajouter une."
#: gym/templates/gym/member_list.html:244
#: gym/templates/gym/member_list.html:281
#: mailer/templates/mailer/gym/overview.html:43
-#: weight/templates/overview.html:78
+#: weight/templates/overview.html:61
msgid "Add"
msgstr "Ajouter"
@@ -131,14 +131,14 @@ msgstr "Afficher"
#: config/templates/language/view.html:91 core/templates/user/api_key.html:44
#: core/templates/user/preferences.html:28
-#: exercises/templates/exercise/view.html:273
-#: exercises/templates/exercise/view.html:296 gym/models/contract.py:200
+#: exercises/templates/exercise/view.html:323
+#: exercises/templates/exercise/view.html:346 gym/models/contract.py:200
#: gym/templates/contract/view.html:41 gym/templates/contract/view.html:106
#: gym/templates/gym/member_list.html:248
#: manager/templates/schedule/view.html:281
#: manager/templates/workout/view.html:206
#: nutrition/templates/ingredient/view.html:226
-#: nutrition/templates/plan/view.html:409 weight/templates/overview.html:62
+#: nutrition/templates/plan/view.html:411 weight/templates/overview.html:45
msgid "Options"
msgstr "Options"
@@ -152,12 +152,12 @@ msgstr "Options"
#: core/templates/weight_unit/list.html:17
#: exercises/templates/categories/admin-overview.html:16
#: exercises/templates/equipment/admin-overview.html:16
-#: exercises/templates/exercise/view.html:180
-#: exercises/templates/exercise/view.html:301
+#: exercises/templates/exercise/view.html:230
+#: exercises/templates/exercise/view.html:351
#: exercises/templates/muscles/admin-overview.html:16
-#: exercises/views/comments.py:63 gallery/views/images.py:96
-#: gym/templates/admin_notes/list.html:32 gym/templates/contract/list.html:31
-#: gym/templates/contract/view.html:107
+#: exercises/views/comments.py:63 exercises/views/videos.py:69
+#: gallery/views/images.py:96 gym/templates/admin_notes/list.html:32
+#: gym/templates/contract/list.html:31 gym/templates/contract/view.html:107
#: gym/templates/contract_option/list.html:31
#: gym/templates/contract_type/list.html:31 gym/templates/document/list.html:38
#: gym/templates/gym/list.html:19 gym/templates/gym/list.html:43
@@ -168,7 +168,7 @@ msgstr "Options"
#: manager/templates/calendar/partial_overview_table.html:18
#: manager/templates/schedule/view.html:121
#: nutrition/templates/ingredient/view.html:198
-#: nutrition/templates/plan/view.html:89 nutrition/templates/plan/view.html:124
+#: nutrition/templates/plan/view.html:89 nutrition/templates/plan/view.html:126
#: nutrition/templates/units/list.html:18
msgid "Edit"
msgstr "Modifier"
@@ -182,9 +182,9 @@ msgstr "Modifier"
#: exercises/templates/categories/admin-overview.html:17
#: exercises/templates/equipment/admin-overview.html:17
#: exercises/templates/exercise/view.html:68
-#: exercises/templates/exercise/view.html:155
-#: exercises/templates/exercise/view.html:185
-#: exercises/templates/exercise/view.html:306
+#: exercises/templates/exercise/view.html:205
+#: exercises/templates/exercise/view.html:235
+#: exercises/templates/exercise/view.html:356
#: exercises/templates/muscles/admin-overview.html:17
#: gym/templates/admin_notes/list.html:40
#: gym/templates/contract_option/list.html:39
@@ -197,7 +197,7 @@ msgstr "Modifier"
#: nutrition/templates/ingredient/view.html:199
#: nutrition/templates/ingredient/view.html:239
#: nutrition/templates/log/detail.html:197
-#: nutrition/templates/plan/view.html:95 nutrition/templates/plan/view.html:130
+#: nutrition/templates/plan/view.html:95 nutrition/templates/plan/view.html:132
#: nutrition/templates/units/list.html:20
msgid "Delete"
msgstr "Supprimer"
@@ -325,7 +325,7 @@ msgid "Some way of answering you (e-mail, etc.)"
msgstr "Un moyen de vous répondre (courriel, etc.)"
#: core/forms.py:265 exercises/models/comment.py:40 manager/models/set.py:60
-#: manager/models/setting.py:99 nutrition/models/log.py:61
+#: manager/models/setting.py:99 nutrition/models/log.py:71
msgid "Comment"
msgstr "Commentaire"
@@ -471,7 +471,7 @@ msgstr ""
msgid "Age"
msgstr "Âge"
-#: core/models/profile.py:202 nutrition/forms.py:98
+#: core/models/profile.py:202 nutrition/forms.py:99
msgid "Height (cm)"
msgstr "Taille (cm)"
@@ -522,7 +522,7 @@ msgid "Total caloric intake, including e.g. any surplus"
msgstr "Total des entrées caloriques, incluant les suppléments"
#: core/models/profile.py:305 nutrition/models/ingredient_weight_unit.py:45
-#: nutrition/models/log.py:80 nutrition/models/meal_item.py:58
+#: nutrition/models/log.py:90 nutrition/models/meal_item.py:58
msgid "Weight unit"
msgstr "Unité de poids"
@@ -562,9 +562,9 @@ msgstr "La somme des heures doit être de 24"
#: gym/models/user_document.py:87 gym/templates/contract/view.html:50
#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:96
#: gym/views/gym.py:156 manager/models/schedule.py:55
-#: manager/models/workout.py:56 nutrition/models/ingredient.py:96
-#: nutrition/models/ingredient_category.py:26
-#: nutrition/models/weight_unit.py:38
+#: manager/models/workout.py:56 measurements/models/category.py:53
+#: nutrition/models/ingredient.py:96 nutrition/models/ingredient_category.py:26
+#: nutrition/models/meal.py:66 nutrition/models/weight_unit.py:38
#: nutrition/templates/ingredient/pending.html:15
#: nutrition/templates/ingredient/view.html:185
msgid "Name"
@@ -624,17 +624,17 @@ msgstr "Êtes-vous sûr·e de vouloir supprimer ceci ? C’est irréversible."
msgid "Dashboard"
msgstr "Tableau de bord"
-#: core/templates/index.html:31 manager/templates/calendar/month.html:115
+#: core/templates/index.html:21 manager/templates/calendar/month.html:115
msgid "Add log to day"
msgstr "Ajouter un journal au jour"
-#: core/templates/index.html:35 manager/templates/calendar/month.html:120
+#: core/templates/index.html:25 manager/templates/calendar/month.html:120
msgid ""
"Click to add weight logs to a training\n"
"day in your current workout:"
msgstr "Cliquer pour ajouter un journal de poids à un jour :"
-#: core/templates/index.html:43 core/templates/index.html:83
+#: core/templates/index.html:33 core/templates/index.html:73
#: core/templates/misc/fragments/shariff_modal.html:29
#: core/templates/template.html:125 manager/templates/calendar/month.html:138
#: manager/templates/schedule/view.html:246
@@ -644,11 +644,11 @@ msgstr "Cliquer pour ajouter un journal de poids à un jour :"
msgid "Close"
msgstr "Fermer"
-#: core/templates/index.html:54 core/templates/index.html:203
+#: core/templates/index.html:44 core/templates/index.html:193
msgid "Add new diary entry"
msgstr "Ajouter une nouvelle entrée de journal"
-#: core/templates/index.html:59
+#: core/templates/index.html:49
msgid ""
"Click to add an entry to your nutrition diary for today. You can either log "
"a meal as you defined it, or entry any number of custom entries."
@@ -657,7 +657,7 @@ msgstr ""
"aujourd'hui. Vous pouvez enregistrer un repas tel que vous l'avez défini ou "
"saisir un nombre quelconque d'entrées personnalisées."
-#: core/templates/index.html:67 core/templates/index.html:171
+#: core/templates/index.html:57 core/templates/index.html:161
#: core/templates/user/overview.html:171
#: nutrition/templates/ingredient/view.html:79
#: nutrition/templates/log/detail.html:40
@@ -666,19 +666,19 @@ msgstr ""
#: nutrition/templates/log/overview.html:7
#: nutrition/templates/log/overview.html:44
#: nutrition/templates/plan/overview.html:17
-#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:242
-#: nutrition/templates/plan/view.html:301
-#: nutrition/templates/plan/view.html:321
-#: nutrition/templates/plan/view.html:363
-#: nutrition/templates/plan/view.html:373
+#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:244
+#: nutrition/templates/plan/view.html:303
+#: nutrition/templates/plan/view.html:323
+#: nutrition/templates/plan/view.html:365
+#: nutrition/templates/plan/view.html:375
msgid "kcal"
msgstr "kcal"
-#: core/templates/index.html:79 nutrition/templates/plan/view.html:348
+#: core/templates/index.html:69 nutrition/templates/plan/view.html:350
msgid "Add custom diary entry"
msgstr "Ajouter item personnalisé dans le journal"
-#: core/templates/index.html:94 core/templates/index.html:102
+#: core/templates/index.html:84 core/templates/index.html:92
#: manager/models/day.py:34 manager/models/log.py:56
#: manager/models/session.py:60 manager/models/workout.py:109
#: manager/templates/schedule/view.html:105
@@ -689,11 +689,11 @@ msgstr "Ajouter item personnalisé dans le journal"
msgid "Workout"
msgstr "Séance"
-#: core/templates/index.html:128
+#: core/templates/index.html:118
msgid "This workout is part of a schedule:"
msgstr "Cette séance fait partie d'un programme&nbsp;:"
-#: core/templates/index.html:133
+#: core/templates/index.html:123
msgid ""
"The current workout is selected from your active schedule or, if you don't "
"have one, simply by date."
@@ -701,70 +701,70 @@ msgstr ""
"L'entraînement en cours est sélectionné à partir de votre programme actif "
"ou, si vous n'en avez pas, simplement par date."
-#: core/templates/index.html:142 manager/templates/calendar/month.html:188
+#: core/templates/index.html:132 manager/templates/calendar/month.html:188
msgid "Add new log"
msgstr "Ajouter un journal"
-#: core/templates/index.html:147 core/templates/user/overview.html:58
+#: core/templates/index.html:137 core/templates/user/overview.html:58
#: manager/templates/calendar/month.html:128
#: manager/templates/schedule/view.html:146
#: manager/templates/workout/overview.html:28
msgid "No workouts found."
msgstr "Pas de séance trouvée."
-#: core/templates/index.html:157 nutrition/models/log.py:48
+#: core/templates/index.html:147 nutrition/models/log.py:49
#: nutrition/models/meal.py:49 nutrition/models/meal_item.py:47
#: nutrition/models/plan.py:94 nutrition/templates/plan/view.html:11
#: nutrition/templates/plan/view.html:19
msgid "Nutrition plan"
msgstr "Plan de nutrition"
-#: core/templates/index.html:169 core/templates/user/overview.html:155
+#: core/templates/index.html:159 core/templates/user/overview.html:155
#: nutrition/models/ingredient.py:100
#: nutrition/templates/ingredient/view.html:77
#: nutrition/templates/log/detail.html:39
#: nutrition/templates/log/detail.html:156
-#: nutrition/templates/plan/view.html:53 nutrition/templates/plan/view.html:241
-#: nutrition/templates/plan/view.html:358
-#: nutrition/templates/plan/view.html:362 nutrition/views/plan.py:384
+#: nutrition/templates/plan/view.html:53 nutrition/templates/plan/view.html:243
+#: nutrition/templates/plan/view.html:360
+#: nutrition/templates/plan/view.html:364 nutrition/views/plan.py:384
msgid "Energy"
msgstr "Énergie"
-#: core/templates/index.html:175 core/templates/user/overview.html:156
+#: core/templates/index.html:165 core/templates/user/overview.html:156
#: nutrition/models/ingredient.py:105
#: nutrition/templates/ingredient/view.html:84
#: nutrition/templates/log/detail.html:52
#: nutrition/templates/log/detail.html:174
-#: nutrition/templates/plan/view.html:54 nutrition/templates/plan/view.html:249
+#: nutrition/templates/plan/view.html:54 nutrition/templates/plan/view.html:251
#: nutrition/views/plan.py:390
msgid "Protein"
msgstr "Protéines"
-#: core/templates/index.html:181 core/templates/user/overview.html:157
+#: core/templates/index.html:171 core/templates/user/overview.html:157
#: nutrition/models/ingredient.py:113
#: nutrition/templates/ingredient/view.html:90
#: nutrition/templates/log/detail.html:65
#: nutrition/templates/log/detail.html:175
-#: nutrition/templates/plan/view.html:55 nutrition/templates/plan/view.html:255
+#: nutrition/templates/plan/view.html:55 nutrition/templates/plan/view.html:257
#: nutrition/views/plan.py:398
msgid "Carbohydrates"
msgstr "Glucides"
-#: core/templates/index.html:187 core/templates/user/overview.html:158
+#: core/templates/index.html:177 core/templates/user/overview.html:158
#: nutrition/models/ingredient.py:131
#: nutrition/templates/ingredient/view.html:106
#: nutrition/templates/log/detail.html:91
#: nutrition/templates/log/detail.html:176
-#: nutrition/templates/plan/view.html:56 nutrition/templates/plan/view.html:268
+#: nutrition/templates/plan/view.html:56 nutrition/templates/plan/view.html:270
#: nutrition/views/plan.py:412
msgid "Fat"
msgstr "Lipides"
-#: core/templates/index.html:199 nutrition/templates/plan/overview.html:22
+#: core/templates/index.html:189 nutrition/templates/plan/overview.html:22
msgid "No nutrition plans."
msgstr "Aucun plan de nutrition."
-#: core/templates/index.html:213 core/templates/user/overview.html:112
+#: core/templates/index.html:203 core/templates/user/overview.html:112
#: core/templates/user/overview.html:121 manager/forms.py:173
#: manager/helpers.py:89 manager/models/log.py:84 manager/models/setting.py:67
#: manager/templates/log/add.html:54 manager/templates/set/formset.html:12
@@ -773,11 +773,7 @@ msgstr "Aucun plan de nutrition."
msgid "Weight"
msgstr "Poids"
-#: core/templates/index.html:217
-msgid "Your current weight is: "
-msgstr "Votre poids actuel est : "
-
-#: core/templates/index.html:248 core/templates/navigation.html:97
+#: core/templates/index.html:210 core/templates/navigation.html:97
#: weight/views.py:70
msgid "Add weight entry"
msgstr "Ajouter une entrée"
@@ -809,7 +805,7 @@ msgstr "Liste des licences"
msgid "Nothing found"
msgstr "Rien trouvé"
-#: core/templates/misc/about.html:4 core/templates/template.html:201
+#: core/templates/misc/about.html:4 core/templates/template.html:175
#: core/templates/template_features.html:118
#: core/templates/template_no_context.html:88
msgid "Imprint"
@@ -827,8 +823,8 @@ msgstr ""
"autoriser l’accès externe."
#: core/templates/misc/fragments/shariff_modal.html:22
-#: nutrition/templates/plan/view.html:385
-#: nutrition/templates/plan/view.html:394
+#: nutrition/templates/plan/view.html:387
+#: nutrition/templates/plan/view.html:396
msgid "That's done here"
msgstr "Ça se fait ici"
@@ -916,7 +912,7 @@ msgstr "L'exercice est en attente de relecture"
msgid "Equipment"
msgstr "Équipement"
-#: core/templates/navigation.html:78 exercises/templates/exercise/view.html:208
+#: core/templates/navigation.html:78 exercises/templates/exercise/view.html:258
msgid "Muscles"
msgstr "Muscles"
@@ -989,7 +985,7 @@ msgstr "Documentation du développeur"
msgid "Get the code"
msgstr "Récupérer le code"
-#: core/templates/navigation.html:175 core/templates/template.html:193
+#: core/templates/navigation.html:175 core/templates/template.html:205
#: core/templates/template_features.html:100
msgid "Translate"
msgstr "Traduire"
@@ -1147,15 +1143,11 @@ msgstr ""
msgid "Create some demo entries"
msgstr "Créer des entrées de démo"
-#: core/templates/template.html:202 core/templates/template_features.html:122
+#: core/templates/template.html:176 core/templates/template_features.html:122
#: core/templates/template_no_context.html:89 software/templates/tos.html:7
msgid "Terms of service"
msgstr "Conditions d’utilisation"
-#: core/templates/template.html:209 core/templates/template.html:210
-msgid "Released under the Affero GPL"
-msgstr "Publié sous licence Affero GPL"
-
#: core/templates/template_features.html:62 software/templates/features.html:9
#: software/templates/features.html:120
msgid "Features"
@@ -1263,9 +1255,10 @@ msgstr "Ajouter une séance"
#: core/templates/user/overview.html:120 core/templates/user/overview.html:153
#: exercises/models/exercise.py:77 gallery/models/image.py:47
#: manager/helpers.py:88 manager/models/log.py:98 manager/models/session.py:67
-#: nutrition/models/ingredient.py:85 nutrition/models/ingredient.py:87
-#: nutrition/models/ingredient.py:190 nutrition/templates/log/overview.html:30
-#: nutrition/templates/plan/view.html:307 weight/models.py:32
+#: measurements/models/measurement.py:64 nutrition/models/ingredient.py:85
+#: nutrition/models/ingredient.py:87 nutrition/models/ingredient.py:190
+#: nutrition/templates/log/overview.html:30
+#: nutrition/templates/plan/view.html:309 weight/models.py:32
#: weight/templates/import_csv_preview.html:13
#: weight/templates/import_csv_preview.html:42 weight/views.py:150
msgid "Date"
@@ -1273,10 +1266,10 @@ msgstr "Date"
#: core/templates/user/overview.html:35 core/templates/user/overview.html:154
#: exercises/models/exercise.py:61 exercises/templates/exercise/view.html:88
-#: exercises/views/exercises.py:189 gallery/models/image.py:70
+#: exercises/views/exercises.py:190 gallery/models/image.py:70
#: gym/models/contract.py:57 gym/models/contract.py:107
#: manager/models/day.py:37 manager/models/workout.py:62
-#: nutrition/models/plan.py:69
+#: measurements/models/measurement.py:79 nutrition/models/plan.py:69
msgid "Description"
msgstr "Description"
@@ -1439,11 +1432,11 @@ msgstr "Préférences"
msgid "Change password"
msgstr "Changer le mot de passe"
-#: core/templatetags/wger_extras.py:217
+#: core/templatetags/wger_extras.py:229
msgid "kg"
msgstr "kg"
-#: core/templatetags/wger_extras.py:219
+#: core/templatetags/wger_extras.py:231
#: nutrition/templates/ingredient/view.html:86
#: nutrition/templates/ingredient/view.html:92
#: nutrition/templates/ingredient/view.html:99
@@ -1455,28 +1448,28 @@ msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr "g"
-#: core/templatetags/wger_extras.py:222
+#: core/templatetags/wger_extras.py:234
msgid "lb"
msgstr "lb"
-#: core/templatetags/wger_extras.py:224
+#: core/templatetags/wger_extras.py:236
msgctxt "weight unit, i.e. ounces"
msgid "oz"
msgstr "oz"
#: core/views/languages.py:85 exercises/views/categories.py:121
-#: exercises/views/equipment.py:106 exercises/views/exercises.py:422
+#: exercises/views/equipment.py:106 exercises/views/exercises.py:423
#: exercises/views/images.py:128 exercises/views/muscles.py:118
-#: manager/views/schedule.py:311 manager/views/schedule_step.py:129
-#: manager/views/workout.py:268 manager/views/workout_session.py:141
-#: nutrition/views/ingredient.py:144 nutrition/views/plan.py:120
-#: nutrition/views/unit.py:111
+#: exercises/views/videos.py:129 manager/views/schedule.py:311
+#: manager/views/schedule_step.py:129 manager/views/workout.py:268
+#: manager/views/workout_session.py:141 nutrition/views/ingredient.py:144
+#: nutrition/views/plan.py:120 nutrition/views/unit.py:111
msgid "Successfully deleted"
msgstr "Supprimé avec succès"
#: core/views/languages.py:93 core/views/license.py:103
#: core/views/repetition_units.py:115 core/views/weight_units.py:115
-#: exercises/views/categories.py:127 exercises/views/exercises.py:430
+#: exercises/views/categories.py:127 exercises/views/exercises.py:431
#: exercises/views/muscles.py:125 gallery/views/images.py:121
#: gym/views/admin_notes.py:196 gym/views/document.py:206 gym/views/gym.py:486
#: manager/views/schedule.py:318 manager/views/schedule_step.py:139
@@ -1490,7 +1483,7 @@ msgstr "Supprimer {0} ?"
#: core/views/languages.py:111 core/views/license.py:84
#: core/views/repetition_units.py:85 core/views/user.py:456
#: core/views/weight_units.py:85 exercises/views/categories.py:97
-#: exercises/views/equipment.py:83 exercises/views/exercises.py:304
+#: exercises/views/equipment.py:83 exercises/views/exercises.py:305
#: exercises/views/muscles.py:105 gym/views/admin_notes.py:160
#: gym/views/config.py:68 gym/views/contract.py:186
#: gym/views/contract_option.py:123 gym/views/contract_type.py:123
@@ -1581,7 +1574,7 @@ msgstr "Muscles primaires"
#: exercises/models/base.py:64 exercises/templates/equipment/overview.html:71
#: exercises/templates/exercise/overview.html:76
-#: exercises/templates/exercise/view.html:218
+#: exercises/templates/exercise/view.html:268
#: exercises/templates/muscles/overview.html:73
msgid "Secondary muscles"
msgstr "Muscles secondaires"
@@ -1594,8 +1587,9 @@ msgstr "Variations"
msgid "Exercise Categories"
msgstr "Catégorie d'exercices"
-#: exercises/models/comment.py:34 exercises/models/image.py:62
-#: manager/forms.py:165 manager/helpers.py:89 manager/models/log.py:51
+#: exercises/models/comment.py:34 exercises/models/image.py:75
+#: exercises/models/video.py:82 manager/forms.py:165 manager/helpers.py:89
+#: manager/models/log.py:51
msgid "Exercise"
msgstr "Exercice"
@@ -1608,32 +1602,54 @@ msgstr "Un commentaire sur la meilleure manière de réaliser cet exercice."
msgid "Language"
msgstr "Langue"
-#: exercises/models/exercise.py:233 exercises/views/exercises.py:460
+#: exercises/models/exercise.py:237 exercises/views/exercises.py:461
msgid "Exercise was successfully added to the general database"
msgstr "L'exercice a été ajouté avec succès à la base de données"
-#: exercises/models/exercise.py:261
+#: exercises/models/exercise.py:265
msgid "New user submitted exercise"
msgstr "Nouvel exercice proposé par un utilisateur"
-#: exercises/models/exercise.py:263
+#: exercises/models/exercise.py:267
#, python-brace-format
msgid "The user {0} submitted a new exercise \"{1}\"."
msgstr "L'utilisateur {0} a proposé un nouvel exercice « {1} »."
-#: exercises/models/image.py:68 gallery/models/image.py:56
+#: exercises/models/image.py:59
+msgid "Line"
+msgstr ""
+
+#: exercises/models/image.py:60
+msgid "3D"
+msgstr ""
+
+#: exercises/models/image.py:61
+msgid "Low-poly"
+msgstr ""
+
+#: exercises/models/image.py:62
+msgid "Photo"
+msgstr ""
+
+#: exercises/models/image.py:63
+#, fuzzy
+#| msgid "Others"
+msgid "Other"
+msgstr "Autres"
+
+#: exercises/models/image.py:81 gallery/models/image.py:56
msgid "Image"
msgstr "Image"
-#: exercises/models/image.py:69 gallery/models/image.py:57
+#: exercises/models/image.py:82 gallery/models/image.py:57
msgid "Only PNG and JPEG formats are supported"
msgstr "Seuls les formats PNG et JPEG sont pris en charge"
-#: exercises/models/image.py:75
+#: exercises/models/image.py:88
msgid "Main picture"
msgstr "Image principale"
-#: exercises/models/image.py:78
+#: exercises/models/image.py:91
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 "
@@ -1643,11 +1659,15 @@ msgstr ""
"principale de l'exercice (par exemple sera affichée dans la recherche). La "
"première image est marquée automatiquement."
-#: exercises/models/image.py:166
+#: exercises/models/image.py:100
+msgid "The art style of your image"
+msgstr ""
+
+#: exercises/models/image.py:185
msgid "New user submitted image"
msgstr "Nouvelle image soumise par un utilisateur"
-#: exercises/models/image.py:167
+#: exercises/models/image.py:186
#, python-brace-format
msgid "The user {0} submitted a new image \"{1}\" for exercise {2}."
msgstr ""
@@ -1657,6 +1677,58 @@ msgstr ""
msgid "In latin, e.g. \"Pectoralis major\""
msgstr "En latin, par ex. « Pectoralis major »"
+#: exercises/models/video.py:41
+msgid "Maximum file size is 100MB."
+msgstr ""
+
+#: exercises/models/video.py:44 exercises/models/video.py:48
+msgid "File type is not supported"
+msgstr ""
+
+#: exercises/models/video.py:57
+#, fuzzy
+#| msgid "%(birthdate)s is not a valid birthdate"
+msgid "File is not a valid video"
+msgstr "%(birthdate)s n’est pas une date de naissance valide"
+
+#: exercises/models/video.py:88
+#, fuzzy
+#| msgid "Main picture"
+msgid "Main video"
+msgstr "Image principale"
+
+#: exercises/models/video.py:94
+msgid "Video"
+msgstr ""
+
+#: exercises/models/video.py:101
+msgid "Size"
+msgstr ""
+
+#: exercises/models/video.py:108 manager/models/schedule_step.py:56
+msgid "Duration"
+msgstr "Durée"
+
+#: exercises/models/video.py:117
+msgid "Width"
+msgstr ""
+
+#: exercises/models/video.py:124
+#, fuzzy
+#| msgid "Weight"
+msgid "Height"
+msgstr "Poids"
+
+#: exercises/models/video.py:131
+#, fuzzy
+#| msgid "Code"
+msgid "Codec"
+msgstr "Code"
+
+#: exercises/models/video.py:139
+msgid "Codec, long name"
+msgstr ""
+
#: exercises/templates/equipment/admin-overview.html:4
msgid "Equipment list"
msgstr "Liste d'équipement"
@@ -1672,7 +1744,7 @@ msgstr "Résumé de l'équipement"
#: exercises/templates/equipment/overview.html:69
#: exercises/templates/exercise/overview.html:74
-#: exercises/templates/exercise/view.html:214
+#: exercises/templates/exercise/view.html:264
#: exercises/templates/muscles/overview.html:71
msgid "Main muscles"
msgstr "Muscles principaux"
@@ -1801,7 +1873,8 @@ msgstr "Date de proposition"
#: gym/templates/gym/new_user.html:22
#: gym/templates/gym/reset_user_password.html:20 manager/models/log.py:45
#: manager/models/schedule.py:44 manager/models/session.py:49
-#: manager/models/workout.py:89 nutrition/models/plan.py:55
+#: manager/models/workout.py:89 measurements/models/category.py:48
+#: measurements/models/measurement.py:59 nutrition/models/plan.py:55
#: nutrition/templates/ingredient/pending.html:16 weight/models.py:41
msgid "User"
msgstr "Utilisateur"
@@ -1829,13 +1902,13 @@ msgid "Please select one of the options below."
msgstr "Merci de choisir une des options suivantes."
#: exercises/templates/exercise/view.html:60
-#: exercises/templates/exercise/view.html:153
+#: exercises/templates/exercise/view.html:203
#: nutrition/templates/ingredient/view.html:38
msgid "Accept"
msgstr "Accepter"
#: exercises/templates/exercise/view.html:64
-#: exercises/templates/exercise/view.html:154
+#: exercises/templates/exercise/view.html:204
#: nutrition/templates/ingredient/view.html:42
msgid "Decline"
msgstr "Refuser"
@@ -1848,32 +1921,42 @@ msgstr "Images"
msgid "Add new image"
msgstr "Ajouter une nouvelle image"
-#: exercises/templates/exercise/view.html:147
+#: exercises/templates/exercise/view.html:148
+msgid "Videos"
+msgstr ""
+
+#: exercises/templates/exercise/view.html:187 exercises/views/videos.py:94
+#, fuzzy
+#| msgid "Add new image"
+msgid "Add new video"
+msgstr "Ajouter une nouvelle image"
+
+#: exercises/templates/exercise/view.html:197
msgid "Images pending review"
msgstr "Images en attente de l’examen"
-#: exercises/templates/exercise/view.html:168
+#: exercises/templates/exercise/view.html:218
msgid "Comments for this exercise"
msgstr "Commentaires sur l'exercice"
-#: exercises/templates/exercise/view.html:196
+#: exercises/templates/exercise/view.html:246
msgid "Add new comment"
msgstr "Commenter"
-#: exercises/templates/exercise/view.html:210
+#: exercises/templates/exercise/view.html:260
msgid "The diagram shows the most used muscles on this exercise"
msgstr "Le diagramme montre les muscles les plus sollicités par l'exercice"
-#: exercises/templates/exercise/view.html:251
+#: exercises/templates/exercise/view.html:301
#: manager/templates/workout/log.html:10 manager/templates/workout/log.html:11
msgid "Weight log"
msgstr "Journal de pesée"
-#: exercises/templates/exercise/view.html:256
+#: exercises/templates/exercise/view.html:306
msgid "Exercise Variations"
msgstr "Variations de l'exercice"
-#: exercises/templates/exercise/view.html:277
+#: exercises/templates/exercise/view.html:327
msgid "Submit a correction"
msgstr "Proposer une correction"
@@ -1910,7 +1993,7 @@ msgstr "Ajouter un commentaire à l'exercice"
msgid "Delete equipment?"
msgstr "Supprimer équipement ?"
-#: exercises/views/exercises.py:228
+#: exercises/views/exercises.py:229
#, python-format
msgid ""
"%(name_original)s is too similar to existing exercise \"%(exercise_name)s\""
@@ -1918,24 +2001,24 @@ msgstr ""
"%(name_original)s est trop similaire à l’exercice existant "
"« %(exercise_name)s »"
-#: exercises/views/exercises.py:246
+#: exercises/views/exercises.py:247
msgid "Add exercise"
msgstr "Ajouter un exercice"
-#: exercises/views/exercises.py:366
+#: exercises/views/exercises.py:367
msgid "Thank you. Once the changes are reviewed the exercise will be updated."
msgstr "Merci. Une fois les changements vérifiés, l'exercice sera mis à jour."
-#: exercises/views/exercises.py:379
+#: exercises/views/exercises.py:380
#, python-brace-format
msgid "Correct {0}"
msgstr "Corriger {0}"
-#: exercises/views/exercises.py:421
+#: exercises/views/exercises.py:422
msgid "This will delete the exercise from all workouts."
msgstr "Ceci supprimera l'exercice de toutes les séances."
-#: exercises/views/exercises.py:473
+#: exercises/views/exercises.py:474
msgid "Exercise was successfully marked as rejected"
msgstr "L'exercice a été marqué comme rejeté"
@@ -1947,6 +2030,11 @@ msgstr "Modifier l’image de l’exercice"
msgid "Delete exercise image?"
msgstr "Supprimer l'image de l'exercice ?"
+#: exercises/views/videos.py:144 nutrition/views/log.py:230
+#: nutrition/views/unit_ingredient.py:139
+msgid "Delete?"
+msgstr "Supprimer ?"
+
#: gallery/templates/images/overview.html:62
msgid "Add image"
msgstr "Ajouter une image"
@@ -2017,8 +2105,8 @@ msgid "Contract type"
msgstr "Type de contrat"
#: gym/models/contract.py:208 gym/templates/contract/view.html:59
-#: manager/templates/log/add.html:52 nutrition/forms.py:58
-#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:92
+#: manager/templates/log/add.html:52 nutrition/forms.py:59
+#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:102
#: nutrition/models/meal_item.py:72
msgid "Amount"
msgstr "Quantité"
@@ -2466,6 +2554,7 @@ msgstr ""
"souhaitez avant d’envoyer les courriels"
#: mailer/templates/mailer/gym/preview.html:22
+#: software/templates/about_us.html:59
msgid "Current version"
msgstr "Version actuelle"
@@ -2502,7 +2591,8 @@ msgstr ""
#: manager/models/log.py:90 manager/models/setting.py:47
#: manager/models/setting.py:78 manager/templates/log/add.html:53
#: manager/templates/log/add.html:55 manager/templates/set/formset.html:11
-#: manager/templates/set/formset.html:13 nutrition/forms.py:62
+#: manager/templates/set/formset.html:13 measurements/models/category.py:58
+#: nutrition/forms.py:63
msgid "Unit"
msgstr "Unité"
@@ -2573,10 +2663,6 @@ msgstr ""
msgid "schedule"
msgstr "programme"
-#: manager/models/schedule_step.py:56
-msgid "Duration"
-msgstr "Durée"
-
#: manager/models/schedule_step.py:57
msgid "The duration in weeks"
msgstr "Durée en semaines"
@@ -2835,8 +2921,8 @@ msgid ""
"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."
@@ -2860,8 +2946,8 @@ msgid ""
"application for example google calendar, outlook or iCal. This will create\n"
"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 où iCal. Ceci va créer un rendez-vous\n"
"pour chaque jour d'entraînement avec les exercices appropriés."
@@ -2869,7 +2955,7 @@ msgstr ""
#: manager/templates/schedule/view.html:290
#: manager/templates/workout/view.html:142
#: manager/templates/workout/view.html:217
-#: nutrition/templates/plan/view.html:415
+#: nutrition/templates/plan/view.html:417
msgid "Download as PDF"
msgstr "Télécharger au format PDF"
@@ -3112,23 +3198,27 @@ msgstr "Nouvelle impression sur votre séance d'entrainement pour le {0}"
msgid "This will delete all weight logs for this day as well."
msgstr "Ceci supprimera également tous les exercices de la catégorie."
-#: nutrition/forms.py:121
+#: measurements/models/measurement.py:69
+msgid "Value"
+msgstr ""
+
+#: nutrition/forms.py:122
msgid "Calculate"
msgstr "Calculer"
-#: nutrition/forms.py:194 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:195 nutrition/templates/rate/form.html:76
msgid "Basic caloric intake"
msgstr "Apport calorique de base"
-#: nutrition/forms.py:195
+#: nutrition/forms.py:196
msgid "Your basic caloric intake as calculated for your data"
msgstr "Votre apport calorique de base calculé avec vos données"
-#: nutrition/forms.py:201
+#: nutrition/forms.py:202
msgid "Additional calories"
msgstr "Calories supplémentaires"
-#: nutrition/forms.py:203
+#: nutrition/forms.py:204
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
@@ -3136,8 +3226,8 @@ msgstr ""
"Les calories supplémentaires à ajouter au taux de base (pour soustraire, "
"entrez un nombre négatif)"
-#: nutrition/forms.py:231 nutrition/models/ingredient_weight_unit.py:39
-#: nutrition/models/log.py:71 nutrition/models/meal_item.py:53
+#: nutrition/forms.py:232 nutrition/models/ingredient_weight_unit.py:39
+#: nutrition/models/log.py:81 nutrition/models/meal_item.py:53
#: nutrition/templates/log/detail.html:155
msgid "Ingredient"
msgstr "Ingrédient"
@@ -3156,14 +3246,14 @@ msgstr "En g pour 100 g de produit"
#: nutrition/models/ingredient.py:123
#: nutrition/templates/ingredient/view.html:96
#: nutrition/templates/log/detail.html:78
-#: nutrition/templates/plan/view.html:262 nutrition/views/plan.py:406
+#: nutrition/templates/plan/view.html:264 nutrition/views/plan.py:406
msgid "Sugar content in carbohydrates"
msgstr "Sucre contenu dans les glucides"
#: nutrition/models/ingredient.py:141
#: nutrition/templates/ingredient/view.html:112
#: nutrition/templates/log/detail.html:104
-#: nutrition/templates/plan/view.html:274 nutrition/views/plan.py:420
+#: nutrition/templates/plan/view.html:276 nutrition/views/plan.py:420
msgid "Saturated fat content in fats"
msgstr "Teneur en acides gras saturés dans les acides gras"
@@ -3171,7 +3261,7 @@ msgstr "Teneur en acides gras saturés dans les acides gras"
#: nutrition/templates/ingredient/view.html:134
#: nutrition/templates/log/detail.html:122
#: nutrition/templates/log/detail.html:178
-#: nutrition/templates/plan/view.html:285 nutrition/views/plan.py:426
+#: nutrition/templates/plan/view.html:287 nutrition/views/plan.py:426
msgid "Fibres"
msgstr "Fibres"
@@ -3179,7 +3269,7 @@ msgstr "Fibres"
#: nutrition/templates/ingredient/view.html:144
#: nutrition/templates/log/detail.html:135
#: nutrition/templates/log/detail.html:181
-#: nutrition/templates/plan/view.html:291 nutrition/views/plan.py:432
+#: nutrition/templates/plan/view.html:293 nutrition/views/plan.py:432
msgid "Sodium"
msgstr "Sodium"
@@ -3227,10 +3317,20 @@ 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:55
+msgid "Meal"
+msgstr "Repas"
+
#: nutrition/models/meal.py:61
msgid "Time (approx)"
msgstr "Temps (approx.)"
+#: nutrition/models/meal.py:68
+msgid ""
+"Give meals a textual description / name such as \"Breakfast\" or \"after "
+"workout\""
+msgstr ""
+
#: nutrition/models/plan.py:71
msgid ""
"A description of the goal of the plan, e.g. \"Gain mass\" or \"Prepare for "
@@ -3383,12 +3483,12 @@ msgstr ""
#: nutrition/templates/ingredient/view.html:71
#: nutrition/templates/log/detail.html:31
-#: nutrition/templates/plan/view.html:227 nutrition/views/plan.py:376
+#: nutrition/templates/plan/view.html:229 nutrition/views/plan.py:376
msgid "Macronutrients"
msgstr "Macronutriments"
#: nutrition/templates/ingredient/view.html:80
-#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:244
+#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:246
msgid "kJ"
msgstr "kJ"
@@ -3401,7 +3501,7 @@ msgstr "n.A."
#: nutrition/templates/ingredient/view.html:128
#: nutrition/templates/log/detail.html:119
-#: nutrition/templates/plan/view.html:282
+#: nutrition/templates/plan/view.html:284
msgid "Others"
msgstr "Autres"
@@ -3430,7 +3530,7 @@ msgstr "Supprimer l'ingrédient"
#: nutrition/templates/log/detail.html:7
#: nutrition/templates/log/overview.html:7
-#: nutrition/templates/plan/view.html:300
+#: nutrition/templates/plan/view.html:302
msgid "Nutrition diary"
msgstr "Journal de nutrition"
@@ -3440,13 +3540,13 @@ msgstr "Prévu"
#: nutrition/templates/log/detail.html:33
#: nutrition/templates/log/overview.html:31
-#: nutrition/templates/plan/view.html:308
+#: nutrition/templates/plan/view.html:310
msgid "Logged"
msgstr "Connecté"
#: nutrition/templates/log/detail.html:34
#: nutrition/templates/log/overview.html:32
-#: nutrition/templates/plan/view.html:309
+#: nutrition/templates/plan/view.html:311
msgid "Difference"
msgstr "Différence"
@@ -3459,7 +3559,7 @@ msgid "g"
msgstr "g"
#: nutrition/templates/log/overview.html:53
-#: nutrition/templates/plan/view.html:330
+#: nutrition/templates/plan/view.html:332
msgid "nothing found"
msgstr "Rien n'a été trouvé"
@@ -3479,56 +3579,56 @@ msgstr "Ajouter ce repas"
msgid "Add ingredient to meal"
msgstr "Ajouter un ingrédient au repas"
-#: nutrition/templates/plan/view.html:150
+#: nutrition/templates/plan/view.html:152
msgid "No items for this meal."
msgstr "Aucun élément pour ce repas."
-#: nutrition/templates/plan/view.html:188
+#: nutrition/templates/plan/view.html:190
msgid "No meals for this plan."
msgstr "Pas de repas pour ce régime."
-#: nutrition/templates/plan/view.html:200
+#: nutrition/templates/plan/view.html:202
msgid "Log this Plan"
msgstr "Ajouter ce plan"
-#: nutrition/templates/plan/view.html:206
+#: nutrition/templates/plan/view.html:208
msgid "Add a new meal"
msgstr "Ajouter un nouveau repas"
-#: nutrition/templates/plan/view.html:216 nutrition/views/plan.py:369
+#: nutrition/templates/plan/view.html:218 nutrition/views/plan.py:369
msgid "Nutritional data"
msgstr "Donnée nutritionnelle"
-#: nutrition/templates/plan/view.html:219
+#: nutrition/templates/plan/view.html:221
#, python-format
msgid "Based on the weight entry dated %(date)s (%(weight)s)"
msgstr "Basé sur l'entrée de poids du %(date)s (%(weight)s)"
-#: nutrition/templates/plan/view.html:228 nutrition/views/plan.py:377
+#: nutrition/templates/plan/view.html:230 nutrition/views/plan.py:377
msgid "Total"
msgstr "Total"
-#: nutrition/templates/plan/view.html:229 nutrition/views/plan.py:378
+#: nutrition/templates/plan/view.html:231 nutrition/views/plan.py:378
msgid "Percent of energy"
msgstr "Pour cent de l'énergie"
-#: nutrition/templates/plan/view.html:232 nutrition/views/plan.py:379
+#: nutrition/templates/plan/view.html:234 nutrition/views/plan.py:379
msgid "g per body kg"
msgstr "g par kg de masse corporelle"
-#: nutrition/templates/plan/view.html:234
+#: nutrition/templates/plan/view.html:236
msgid "oz per body lb"
msgstr "oz par lb de corps"
-#: nutrition/templates/plan/view.html:338
+#: nutrition/templates/plan/view.html:340
msgid "View complete nutrition log"
msgstr "Voir le journal de nutrition complet"
-#: nutrition/templates/plan/view.html:371
+#: nutrition/templates/plan/view.html:373
msgid "Goal"
msgstr "Objectif"
-#: nutrition/templates/plan/view.html:382
+#: nutrition/templates/plan/view.html:384
msgid ""
"You have selected that this nutritional plan has a\n"
" goal amount of calories. Use the calculator or enter the value\n"
@@ -3539,7 +3639,7 @@ msgstr ""
"la valeur\n"
" vous-même."
-#: nutrition/templates/plan/view.html:392
+#: nutrition/templates/plan/view.html:394
msgid ""
"If you find the ingredient list too short, you might want to activate the "
"preference to also show English ingredients."
@@ -3547,15 +3647,15 @@ msgstr ""
"Si vous trouvez la liste des ingrédients trop petite, vous pouvez activer la "
"préférence de montrer également les ingrédients en anglais."
-#: nutrition/templates/plan/view.html:421
+#: nutrition/templates/plan/view.html:423
msgid "Edit nutrition plan"
msgstr "Modifier le régime"
-#: nutrition/templates/plan/view.html:425
+#: nutrition/templates/plan/view.html:427
msgid "Make a copy of this nutrition plan"
msgstr "Faire une copie de ce régime"
-#: nutrition/templates/plan/view.html:431
+#: nutrition/templates/plan/view.html:433
msgid "Delete nutrition plan"
msgstr "Supprimer le régime"
@@ -3651,10 +3751,6 @@ msgstr "Ajouter un nouvel ingrédient"
msgid "Ingredient was successfully marked as rejected"
msgstr "L'ingrédient a été marqué avec succès comme rejeté"
-#: nutrition/views/log.py:229 nutrition/views/unit_ingredient.py:139
-msgid "Delete?"
-msgstr "Supprimer ?"
-
#: nutrition/views/meal.py:55
msgid "Add new meal"
msgstr "Ajouter un nouveau repas"
@@ -4086,11 +4182,11 @@ msgstr ""
msgid "Re-Submit"
msgstr "Renvoyer"
-#: weight/templates/overview.html:68
+#: weight/templates/overview.html:51
msgid "Export as CSV"
msgstr "Exporter en CSV"
-#: weight/templates/overview.html:72
+#: weight/templates/overview.html:55
msgid "Import from spreadsheet"
msgstr "Importer d'une feuille de calcul"
@@ -4108,6 +4204,12 @@ msgstr "Supprimé avec succès."
msgid "Delete weight entry for the %s"
msgstr "Supprimer l’entrée de poids pour le %s"
+#~ msgid "Your current weight is: "
+#~ msgstr "Votre poids actuel est : "
+
+#~ msgid "Released under the Affero GPL"
+#~ msgstr "Publié sous licence Affero GPL"
+
#~ msgid "Responsible for the content of this site as per German law §5 TMG:"
#~ msgstr ""
#~ "Responsable pour le contenu de ce site selon le droit allemand § 5 TMG :"
@@ -4264,9 +4366,6 @@ msgstr "Supprimer l’entrée de poids pour le %s"
#~ "êtes intéressé·e,\n"
#~ "visitez le lien et commencez à traduire."
-#~ msgid "Code"
-#~ msgstr "Code"
-
#~ msgid ""
#~ "Obviously, you are highly encouraged to clone the\n"
#~ "repo and start hacking! Once you are ready, send a pull request and we\n"
@@ -4409,9 +4508,6 @@ msgstr "Supprimer l’entrée de poids pour le %s"
#~ msgid "Pause!"
#~ msgstr "Pause !"
-#~ msgid "Meal"
-#~ msgstr "Repas"
-
#~ msgid "There is no chart here because there are no weight entries."
#~ msgstr ""
#~ "Il n'y a pas de graphique ici car aucune donnée de poids n'a été ajoutée."
diff --git a/wger/locale/he/LC_MESSAGES/django.po b/wger/locale/he/LC_MESSAGES/django.po
index a1f0ab6d1..e0bcfff04 100644
--- a/wger/locale/he/LC_MESSAGES/django.po
+++ b/wger/locale/he/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-04-12 00:23+0200\n"
+"POT-Creation-Date: 2022-02-15 14:51+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
@@ -18,27 +18,27 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: config/models.py:54 core/templates/navigation.html:41
-#: exercises/templates/exercise/overview.html:11 manager/forms.py:99
-#: manager/models.py:756
-msgid "Exercises"
-msgstr ""
-
-#: config/models.py:55
-msgid "Ingredients"
-msgstr ""
-
-#: config/models.py:121 gym/templates/gym/list.html:50
+#: config/models/gym_config.py:46 gym/templates/gym/list.html:50
msgid "Default gym"
msgstr ""
-#: config/models.py:122
+#: config/models/gym_config.py:48
msgid ""
"Select the default gym for this installation. This will assign all new "
"registered users to this gym and update all existing users without a gym."
msgstr ""
-#: config/templates/language/overview.html:4 core/templates/navigation.html:203
+#: config/models/language_config.py:41 core/templates/navigation.html:63
+#: exercises/templates/exercise/overview.html:11 manager/forms.py:122
+#: manager/models/setting.py:44
+msgid "Exercises"
+msgstr ""
+
+#: config/models/language_config.py:42
+msgid "Ingredients"
+msgstr ""
+
+#: config/templates/language/overview.html:4 core/templates/navigation.html:228
msgid "Languages"
msgstr ""
@@ -46,16 +46,16 @@ msgstr ""
msgid "Nothing found."
msgstr ""
-#: config/templates/language/overview.html:16 core/templates/index.html:145
-#: core/templates/index.html:197 manager/templates/calendar/month.html:132
+#: config/templates/language/overview.html:16 core/templates/index.html:137
+#: core/templates/index.html:189 manager/templates/calendar/month.html:132
#: manager/templates/schedule/overview.html:28
#: manager/templates/schedule/view.html:146
-#: manager/templates/workout/overview.html:25
+#: manager/templates/workout/overview.html:28
#: nutrition/templates/ingredient/overview.html:45
#: nutrition/templates/plan/overview.html:23
-#: nutrition/templates/plan/view.html:140
-#: nutrition/templates/plan/view.html:143
-#: nutrition/templates/plan/view.html:163
+#: nutrition/templates/plan/view.html:150
+#: nutrition/templates/plan/view.html:153
+#: nutrition/templates/plan/view.html:191
msgid "Add one now."
msgstr ""
@@ -68,23 +68,24 @@ msgstr ""
#: core/views/license.py:65 core/views/repetition_units.py:65
#: core/views/weight_units.py:65
#: exercises/templates/categories/admin-overview.html:36
-#: gym/templates/admin_notes/list.html:67 gym/templates/contract/list.html:72
+#: gallery/views/images.py:62 gym/templates/admin_notes/list.html:67
+#: gym/templates/contract/list.html:72
#: gym/templates/contract_option/list.html:70
#: gym/templates/contract_type/list.html:70 gym/templates/document/list.html:78
#: 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
-#: weight/templates/overview.html:136
+#: weight/templates/overview.html:61
msgid "Add"
msgstr ""
-#: config/templates/language/view.html:21 core/models.py:47
+#: config/templates/language/view.html:21 core/models/language.py:29
msgid "Language short name"
msgstr ""
#: config/templates/language/view.html:22
-#: config/templates/language/view.html:43 core/models.py:51
+#: config/templates/language/view.html:43 core/models/language.py:32
msgid "Language full name"
msgstr ""
@@ -109,31 +110,32 @@ msgstr ""
#: config/templates/language/view.html:91 core/templates/user/api_key.html:44
#: core/templates/user/preferences.html:28
-#: exercises/templates/exercise/view.html:274
-#: exercises/templates/exercise/view.html:297 gym/models.py:525
+#: exercises/templates/exercise/view.html:323
+#: exercises/templates/exercise/view.html:346 gym/models/contract.py:200
#: gym/templates/contract/view.html:41 gym/templates/contract/view.html:106
#: gym/templates/gym/member_list.html:248
#: manager/templates/schedule/view.html:281
-#: manager/templates/workout/view.html:202
+#: manager/templates/workout/view.html:206
#: nutrition/templates/ingredient/view.html:226
-#: nutrition/templates/plan/view.html:373 weight/templates/overview.html:120
+#: nutrition/templates/plan/view.html:411 weight/templates/overview.html:45
msgid "Options"
msgstr ""
#: config/templates/language/view.html:96 config/views/gym_config.py:41
-#: config/views/language_config.py:47 core/templates/license/list.html:16
+#: config/views/language_config.py:49 core/templates/license/list.html:16
#: core/templates/misc/license/list.html:17
#: core/templates/repetition_unit/list.html:17
-#: core/templates/tags/render_day.html:35
-#: core/templates/tags/render_day.html:63 core/templates/user/overview.html:205
+#: core/templates/tags/render_day.html:39
+#: core/templates/tags/render_day.html:75 core/templates/user/overview.html:205
#: core/templates/user/overview.html:446
#: core/templates/weight_unit/list.html:17
#: exercises/templates/categories/admin-overview.html:16
#: exercises/templates/equipment/admin-overview.html:16
-#: exercises/templates/exercise/view.html:181
-#: exercises/templates/exercise/view.html:302
+#: exercises/templates/exercise/view.html:230
+#: exercises/templates/exercise/view.html:351
#: exercises/templates/muscles/admin-overview.html:16
-#: exercises/views/comments.py:62 gym/templates/admin_notes/list.html:32
+#: exercises/views/comments.py:63 exercises/views/videos.py:69
+#: gallery/views/images.py:96 gym/templates/admin_notes/list.html:32
#: gym/templates/contract/list.html:31 gym/templates/contract/view.html:107
#: gym/templates/contract_option/list.html:31
#: gym/templates/contract_type/list.html:31 gym/templates/document/list.html:38
@@ -145,23 +147,23 @@ msgstr ""
#: manager/templates/calendar/partial_overview_table.html:18
#: manager/templates/schedule/view.html:121
#: nutrition/templates/ingredient/view.html:198
-#: nutrition/templates/plan/view.html:91 nutrition/templates/plan/view.html:116
+#: nutrition/templates/plan/view.html:89 nutrition/templates/plan/view.html:126
#: nutrition/templates/units/list.html:18
msgid "Edit"
msgstr ""
-#: config/templates/language/view.html:101 core/forms.py:194
+#: config/templates/language/view.html:101 core/forms.py:191
#: core/templates/license/list.html:17 core/templates/misc/license/list.html:20
#: core/templates/repetition_unit/list.html:18
-#: core/templates/tags/render_day.html:40
-#: core/templates/tags/render_day.html:68 core/templates/user/overview.html:218
+#: core/templates/tags/render_day.html:45
+#: core/templates/tags/render_day.html:81 core/templates/user/overview.html:218
#: core/templates/weight_unit/list.html:18
#: exercises/templates/categories/admin-overview.html:17
#: exercises/templates/equipment/admin-overview.html:17
#: exercises/templates/exercise/view.html:68
-#: exercises/templates/exercise/view.html:155
-#: exercises/templates/exercise/view.html:186
-#: exercises/templates/exercise/view.html:307
+#: exercises/templates/exercise/view.html:205
+#: exercises/templates/exercise/view.html:235
+#: exercises/templates/exercise/view.html:356
#: exercises/templates/muscles/admin-overview.html:17
#: gym/templates/admin_notes/list.html:40
#: gym/templates/contract_option/list.html:39
@@ -170,12 +172,12 @@ msgstr ""
#: manager/templates/calendar/month.html:89
#: manager/templates/calendar/partial_overview_table.html:23
#: manager/templates/schedule/view.html:125
-#: manager/templates/workout/view.html:227
+#: manager/templates/workout/view.html:231
#: nutrition/templates/ingredient/view.html:199
#: nutrition/templates/ingredient/view.html:239
#: nutrition/templates/log/detail.html:197
-#: nutrition/templates/plan/view.html:96 nutrition/templates/plan/view.html:121
-#: nutrition/templates/units/list.html:20 weight/templates/overview.html:88
+#: nutrition/templates/plan/view.html:95 nutrition/templates/plan/view.html:132
+#: nutrition/templates/units/list.html:20
msgid "Delete"
msgstr ""
@@ -191,163 +193,193 @@ msgstr ""
msgid "Another sample day"
msgstr ""
-#: core/demo.py:209
+#: core/demo.py:217
msgid "Sample nutrional plan"
msgstr ""
-#: core/demo.py:341 core/demo.py:343 core/demo.py:345
+#: core/demo.py:349 core/demo.py:351 core/demo.py:353
#, python-brace-format
msgid "Placeholder workout nr {0} for schedule"
msgstr ""
-#: core/demo.py:350
+#: core/demo.py:358
msgid "My cool workout schedule"
msgstr ""
-#: core/demo.py:389 core/demo.py:404
+#: core/demo.py:397 core/demo.py:412
msgid "Empty placeholder schedule"
msgstr ""
-#: core/forms.py:63 core/templates/navigation.html:165
-#: core/templates/navigation.html:169 core/templates/user/login.html:4
+#: core/forms.py:61 core/templates/navigation.html:190
+#: core/templates/navigation.html:194 core/templates/user/login.html:4
#: software/templates/features.html:43
msgid "Login"
msgstr ""
-#: core/forms.py:75 core/forms.py:167 gym/views/export.py:61
-#: gym/views/gym.py:210
+#: core/forms.py:73 core/forms.py:164 gym/views/export.py:63
+#: gym/views/gym.py:218
msgid "First name"
msgstr ""
-#: core/forms.py:77 core/forms.py:169 core/templates/user/overview.html:267
-#: gym/views/export.py:62 gym/views/gym.py:210
+#: core/forms.py:74 core/forms.py:165 core/templates/user/overview.html:267
+#: gym/views/export.py:64 gym/views/gym.py:218
msgid "Last name"
msgstr ""
-#: core/forms.py:79 core/forms.py:135 core/templates/user/overview.html:271
-#: gym/models.py:62 gym/models.py:569 gym/templates/contract/view.html:77
-#: gym/templates/gym/member_list.html:104 gym/templates/gym/new_user.html:30
-#: gym/views/export.py:60 mailer/templates/mailer/gym/form.html:4
+#: core/forms.py:76 core/forms.py:131 core/templates/user/overview.html:271
+#: gym/models/contract.py:253 gym/models/gym.py:58
+#: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:104
+#: gym/templates/gym/new_user.html:30 gym/views/export.py:62
+#: mailer/templates/mailer/gym/form.html:4
#: mailer/templates/mailer/gym/overview.html:4
#: mailer/templates/mailer/gym/preview.html:4
msgid "Email"
msgstr ""
-#: core/forms.py:80 core/forms.py:136
-msgid "Used for password resets and, optionally, email reminders."
+#: core/forms.py:77
+msgid "Used for password resets and, optionally, e-mail reminders."
msgstr ""
-#: core/forms.py:105
+#: core/forms.py:102
msgid "Personal data"
msgstr ""
-#: core/forms.py:111
+#: core/forms.py:110
msgid "Workout reminders"
msgstr ""
-#: core/forms.py:120
+#: core/forms.py:117
msgid "Other settings"
msgstr ""
-#: core/forms.py:130 core/views/user.py:584 core/views/user.py:598
-#: core/views/user.py:610 gym/forms.py:71 manager/templates/log/add.html:65
-#: manager/templates/set/add.html:68 manager/templates/workout/timer.html:371
-#: manager/templates/workout/timer.html:512 manager/views/workout.py:189
-#: utils/generic_views.py:141
+#: core/forms.py:125 core/views/user.py:599 core/views/user.py:614
+#: core/views/user.py:626 gym/forms.py:72 manager/templates/log/add.html:65
+#: manager/templates/set/add.html:69 manager/views/workout.py:221
+#: utils/generic_views.py:142
msgid "Save"
msgstr ""
-#: core/forms.py:163
-msgid "This email is already used."
+#: core/forms.py:132
+msgid "Used for password resets and, optionally, email reminders."
+msgstr ""
+
+#: core/forms.py:160
+msgid "This e-mail address is already in use."
msgstr ""
-#: core/forms.py:184 gym/templates/gym/new_user.html:26
-#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:210
+#: core/forms.py:180 gym/templates/gym/new_user.html:26
+#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:218
msgid "Password"
msgstr ""
-#: core/forms.py:186
+#: core/forms.py:182
msgid "Please enter your current password."
msgstr ""
-#: core/forms.py:203
+#: core/forms.py:200
msgid "Invalid password"
msgstr ""
-#: core/forms.py:214 core/forms.py:278
-msgid "Form is secured with reCaptcha"
+#: core/forms.py:212 core/forms.py:278
+msgid "The form is secured with reCAPTCHA"
msgstr ""
-#: core/forms.py:229 core/forms.py:250 core/templates/navigation.html:165
-#: core/templates/navigation.html:170 core/templates/template.html:149
-#: core/templates/user/login.html:20 core/views/user.py:291
+#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:190
+#: core/templates/navigation.html:195 core/templates/template.html:150
+#: core/templates/user/login.html:20 core/views/user.py:293
#: software/templates/features.html:38
msgid "Register"
msgstr ""
-#: core/forms.py:260
+#: core/forms.py:256
msgid "Contact"
msgstr ""
-#: core/forms.py:261
-msgid "Some way of answering you (email, etc.)"
+#: core/forms.py:257
+msgid "Some way of answering you (e-mail, etc.)"
msgstr ""
-#: core/forms.py:267 exercises/models.py:573 manager/models.py:805
-#: nutrition/models.py:864
+#: core/forms.py:265 exercises/models/comment.py:40 manager/models/set.py:60
+#: manager/models/setting.py:99 nutrition/models/log.py:71
msgid "Comment"
msgstr ""
-#: core/forms.py:268
+#: core/forms.py:266
msgid "What do you want to say?"
msgstr ""
-#: core/models.py:94
+#: core/models/days_of_week.py:29
+msgid "Day of the week"
+msgstr ""
+
+#: core/models/license.py:29
+msgid "Full name"
+msgstr ""
+
+#: core/models/license.py:31
+msgid ""
+"If a license has been localized, e.g. the Creative Commons licenses for the "
+"different countries, add them as separate entries here."
+msgstr ""
+
+#: core/models/license.py:38
+msgid "Short name, e.g. CC-BY-SA 3"
+msgstr ""
+
+#: core/models/license.py:42 nutrition/models/ingredient.py:182
+msgid "Link"
+msgstr ""
+
+#: core/models/license.py:43
+msgid "Link to license text or other information"
+msgstr ""
+
+#: core/models/profile.py:52
#, python-format
msgid "%(birthdate)s is not a valid birthdate"
msgstr ""
-#: core/models.py:103
+#: core/models/profile.py:61
msgid "Male"
msgstr ""
-#: core/models.py:104
+#: core/models/profile.py:62
msgid "Female"
msgstr ""
-#: core/models.py:111
+#: core/models/profile.py:69
msgid "Low"
msgstr ""
-#: core/models.py:112
+#: core/models/profile.py:70
msgid "Medium"
msgstr ""
-#: core/models.py:113
+#: core/models/profile.py:71
msgid "High"
msgstr ""
-#: core/models.py:119
+#: core/models/profile.py:77
msgid "Metric (kilogram)"
msgstr ""
-#: core/models.py:120
+#: core/models/profile.py:78
msgid "Imperial (pound)"
msgstr ""
-#: core/models.py:149
+#: core/models/profile.py:111
msgid "Show exercise comments"
msgstr ""
-#: core/models.py:150
+#: core/models/profile.py:112
msgid "Check to show exercise comments on the workout view"
msgstr ""
-#: core/models.py:160
+#: core/models/profile.py:123
msgid "Also use ingredients in English"
msgstr ""
-#: core/models.py:161
+#: core/models/profile.py:125
msgid ""
"Check to also show ingredients in English while creating\n"
"a nutritional plan. These ingredients are extracted from a list provided\n"
@@ -355,175 +387,138 @@ msgid ""
"7000 entries, but can be somewhat overwhelming and make the search difficult."
msgstr ""
-#: core/models.py:167
+#: core/models/profile.py:134
msgid "Activate workout reminders"
msgstr ""
-#: core/models.py:168
+#: core/models/profile.py:136
msgid ""
"Check to activate automatic reminders for workouts. You need to provide a "
"valid email for this to work."
msgstr ""
-#: core/models.py:174
+#: core/models/profile.py:145
msgid "Remind before expiration"
msgstr ""
-#: core/models.py:175
+#: core/models/profile.py:146
msgid "The number of days you want to be reminded before a workout expires."
msgstr ""
-#: core/models.py:179
+#: core/models/profile.py:152
msgid "Default duration of workouts"
msgstr ""
-#: core/models.py:180
+#: core/models/profile.py:154
msgid ""
"Default duration in weeks of workouts not in a schedule. Used for email "
"workout reminders."
msgstr ""
-#: core/models.py:196
+#: core/models/profile.py:171
msgid "Notification language"
msgstr ""
-#: core/models.py:197
+#: core/models/profile.py:173
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."
msgstr ""
-#: core/models.py:204
-msgid "Use pauses in workout timer"
-msgstr ""
-
-#: core/models.py:205
-msgid "Check to activate timer pauses between exercises."
-msgstr ""
-
-#: core/models.py:212
-msgid "Default duration of workout pauses"
-msgstr ""
-
-#: core/models.py:213
-msgid ""
-"Default duration in seconds of pauses used by the timer in the gym mode."
-msgstr ""
-
-#: core/models.py:224 gym/views/export.py:64
+#: core/models/profile.py:186 gym/views/export.py:66
msgid "Age"
msgstr ""
-#: core/models.py:237 nutrition/forms.py:95
+#: core/models/profile.py:202 nutrition/forms.py:99
msgid "Height (cm)"
msgstr ""
-#: core/models.py:250
+#: core/models/profile.py:219
msgid "Hours of sleep"
msgstr ""
-#: core/models.py:251
+#: core/models/profile.py:220
msgid "The average hours of sleep per day"
msgstr ""
-#: core/models.py:258
+#: core/models/profile.py:229
msgid "Work"
msgstr ""
-#: core/models.py:259 core/models.py:293
+#: core/models/profile.py:230 core/models/profile.py:272
msgid "Average hours per day"
msgstr ""
-#: core/models.py:266 core/models.py:283 core/models.py:300
+#: core/models/profile.py:239 core/models/profile.py:260
+#: core/models/profile.py:281
msgid "Physical intensity"
msgstr ""
-#: core/models.py:267 core/models.py:284 core/models.py:301
+#: core/models/profile.py:240 core/models/profile.py:261
+#: core/models/profile.py:282
msgid "Approximately"
msgstr ""
-#: core/models.py:275
+#: core/models/profile.py:250
msgid "Sport"
msgstr ""
-#: core/models.py:276
+#: core/models/profile.py:251
msgid "Average hours per week"
msgstr ""
-#: core/models.py:292
+#: core/models/profile.py:271
msgid "Free time"
msgstr ""
-#: core/models.py:309 nutrition/templates/rate/form.html:66
+#: core/models/profile.py:292 nutrition/templates/rate/form.html:66
msgid "Total daily calories"
msgstr ""
-#: core/models.py:310
+#: core/models/profile.py:293
msgid "Total caloric intake, including e.g. any surplus"
msgstr ""
-#: core/models.py:320 nutrition/models.py:637 nutrition/models.py:817
-#: nutrition/models.py:879
+#: core/models/profile.py:305 nutrition/models/ingredient_weight_unit.py:45
+#: nutrition/models/log.py:90 nutrition/models/meal_item.py:58
msgid "Weight unit"
msgstr ""
-#: core/models.py:326
+#: core/models/profile.py:313
msgid "Allow external access"
msgstr ""
-#: core/models.py:327
+#: core/models/profile.py:315
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."
msgstr ""
-#: core/models.py:333
+#: core/models/profile.py:324
msgid "Automatic reminders for weight entries"
msgstr ""
-#: core/models.py:335
+#: core/models/profile.py:326
msgid "Number of days after the last weight entry (enter 0 to deactivate)"
msgstr ""
-#: core/models.py:396
+#: core/models/profile.py:392
msgid "The sum of all hours has to be 24"
msgstr ""
-#: core/models.py:552
-msgid "Day of the week"
-msgstr ""
-
-#: core/models.py:573
-msgid "Full name"
-msgstr ""
-
-#: core/models.py:574
-msgid ""
-"If a license has been localized, e.g. the Creative Commons licenses for the "
-"different countries, add them as separate entries here."
-msgstr ""
-
-#: core/models.py:580
-msgid "Short name, e.g. CC-BY-SA 3"
-msgstr ""
-
-#: core/models.py:583 nutrition/models.py:395
-msgid "Link"
-msgstr ""
-
-#: core/models.py:584
-msgid "Link to license text or other information"
-msgstr ""
-
-#: core/models.py:626 core/models.py:665 core/templates/user/overview.html:263
-#: core/views/user.py:561 exercises/models.py:62 exercises/models.py:101
-#: exercises/models.py:127 exercises/models.py:249 exercises/models.py:253
-#: exercises/templates/exercise/pending.html:15 gym/models.py:53
-#: gym/models.py:335 gym/models.py:387 gym/models.py:436
-#: gym/templates/contract/view.html:50 gym/templates/gym/member_list.html:28
-#: gym/templates/gym/member_list.html:96 gym/views/gym.py:152
-#: manager/models.py:239 nutrition/models.py:270 nutrition/models.py:321
-#: nutrition/models.py:609 nutrition/templates/ingredient/pending.html:15
+#: core/models/rep_unit.py:35 core/models/weight_unit.py:35
+#: core/templates/user/overview.html:263 core/views/user.py:575
+#: exercises/models/category.py:32 exercises/models/equipment.py:29
+#: exercises/models/exercise.py:66 exercises/models/exercise.py:71
+#: exercises/models/muscle.py:36 exercises/templates/exercise/pending.html:15
+#: gym/models/contract.py:51 gym/models/contract.py:101 gym/models/gym.py:46
+#: gym/models/user_document.py:87 gym/templates/contract/view.html:50
+#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:96
+#: gym/views/gym.py:156 manager/models/schedule.py:55
+#: manager/models/workout.py:56 measurements/models/category.py:53
+#: nutrition/models/ingredient.py:96 nutrition/models/ingredient_category.py:26
+#: nutrition/models/meal.py:66 nutrition/models/weight_unit.py:38
+#: nutrition/templates/ingredient/pending.html:15
#: nutrition/templates/ingredient/view.html:185
msgid "Name"
msgstr ""
@@ -574,43 +569,41 @@ msgstr ""
msgid "Are you sure you want to delete this? This action cannot be undone."
msgstr ""
-#: core/templates/index.html:4 manager/templates/workout/timer.html:506
+#: core/templates/index.html:4
msgid "Dashboard"
msgstr ""
-#: core/templates/index.html:29 manager/templates/calendar/month.html:115
+#: core/templates/index.html:21 manager/templates/calendar/month.html:115
msgid "Add log to day"
msgstr ""
-#: core/templates/index.html:33 manager/templates/calendar/month.html:120
+#: core/templates/index.html:25 manager/templates/calendar/month.html:120
msgid ""
"Click to add weight logs to a training\n"
"day in your current workout:"
msgstr ""
-#: core/templates/index.html:41 core/templates/index.html:81
+#: core/templates/index.html:33 core/templates/index.html:73
#: core/templates/misc/fragments/shariff_modal.html:29
-#: core/templates/template.html:124 manager/templates/calendar/month.html:138
+#: core/templates/template.html:125 manager/templates/calendar/month.html:138
#: manager/templates/schedule/view.html:246
#: manager/templates/schedule/view.html:266
-#: manager/templates/workout/timer.html:449
-#: manager/templates/workout/timer.html:476
-#: manager/templates/workout/view.html:128
-#: manager/templates/workout/view.html:177
+#: manager/templates/workout/view.html:132
+#: manager/templates/workout/view.html:181
msgid "Close"
msgstr ""
-#: core/templates/index.html:52 core/templates/index.html:201
+#: core/templates/index.html:44 core/templates/index.html:193
msgid "Add new diary entry"
msgstr ""
-#: core/templates/index.html:57
+#: core/templates/index.html:49
msgid ""
"Click to add an entry to your nutrition diary for today. You can either log "
"a meal as you defined it, or entry any number of custom entries."
msgstr ""
-#: core/templates/index.html:65 core/templates/index.html:169
+#: core/templates/index.html:57 core/templates/index.html:161
#: core/templates/user/overview.html:171
#: nutrition/templates/ingredient/view.html:79
#: nutrition/templates/log/detail.html:40
@@ -619,113 +612,112 @@ msgstr ""
#: nutrition/templates/log/overview.html:7
#: nutrition/templates/log/overview.html:44
#: nutrition/templates/plan/overview.html:17
-#: nutrition/templates/plan/view.html:64 nutrition/templates/plan/view.html:215
-#: nutrition/templates/plan/view.html:271
-#: nutrition/templates/plan/view.html:291
-#: nutrition/templates/plan/view.html:331
-#: nutrition/templates/plan/view.html:341
+#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:244
+#: nutrition/templates/plan/view.html:303
+#: nutrition/templates/plan/view.html:323
+#: nutrition/templates/plan/view.html:365
+#: nutrition/templates/plan/view.html:375
msgid "kcal"
msgstr ""
-#: core/templates/index.html:77 nutrition/templates/plan/view.html:316
+#: core/templates/index.html:69 nutrition/templates/plan/view.html:350
msgid "Add custom diary entry"
msgstr ""
-#: core/templates/index.html:92 core/templates/index.html:100
-#: manager/models.py:103 manager/models.py:393 manager/models.py:857
-#: manager/models.py:980 manager/templates/schedule/view.html:105
+#: core/templates/index.html:84 core/templates/index.html:92
+#: manager/models/day.py:34 manager/models/log.py:56
+#: manager/models/session.py:60 manager/models/workout.py:109
+#: manager/templates/schedule/view.html:105
#: manager/templates/workout/view.html:11
-#: manager/templates/workout/view.html:19 manager/views/pdf.py:84
-#: manager/views/pdf.py:155 manager/views/schedule.py:151
-#: manager/views/schedule.py:216
+#: manager/templates/workout/view.html:19 manager/views/pdf.py:85
+#: manager/views/pdf.py:161 manager/views/schedule.py:152
+#: manager/views/schedule.py:222
msgid "Workout"
msgstr ""
-#: core/templates/index.html:126
+#: core/templates/index.html:118
msgid "This workout is part of a schedule:"
msgstr ""
-#: core/templates/index.html:131
+#: core/templates/index.html:123
msgid ""
"The current workout is selected from your active schedule or, if you don't "
"have one, simply by date."
msgstr ""
-#: core/templates/index.html:140 manager/templates/calendar/month.html:188
+#: core/templates/index.html:132 manager/templates/calendar/month.html:188
msgid "Add new log"
msgstr ""
-#: core/templates/index.html:145 core/templates/user/overview.html:58
+#: core/templates/index.html:137 core/templates/user/overview.html:58
#: manager/templates/calendar/month.html:128
#: manager/templates/schedule/view.html:146
-#: manager/templates/workout/overview.html:25
+#: manager/templates/workout/overview.html:28
msgid "No workouts found."
msgstr ""
-#: core/templates/index.html:155 nutrition/models.py:115
-#: nutrition/models.py:672 nutrition/models.py:810 nutrition/models.py:853
-#: nutrition/templates/plan/view.html:11 nutrition/templates/plan/view.html:19
+#: core/templates/index.html:147 nutrition/models/log.py:49
+#: nutrition/models/meal.py:49 nutrition/models/meal_item.py:47
+#: nutrition/models/plan.py:94 nutrition/templates/plan/view.html:11
+#: nutrition/templates/plan/view.html:19
msgid "Nutrition plan"
msgstr ""
-#: core/templates/index.html:167 core/templates/user/overview.html:155
-#: nutrition/models.py:324 nutrition/templates/ingredient/view.html:77
+#: core/templates/index.html:159 core/templates/user/overview.html:155
+#: nutrition/models/ingredient.py:100
+#: nutrition/templates/ingredient/view.html:77
#: nutrition/templates/log/detail.html:39
#: nutrition/templates/log/detail.html:156
-#: nutrition/templates/plan/view.html:55 nutrition/templates/plan/view.html:214
-#: nutrition/templates/plan/view.html:326
-#: nutrition/templates/plan/view.html:330 nutrition/views/plan.py:360
+#: nutrition/templates/plan/view.html:53 nutrition/templates/plan/view.html:243
+#: nutrition/templates/plan/view.html:360
+#: nutrition/templates/plan/view.html:364 nutrition/views/plan.py:384
msgid "Energy"
msgstr ""
-#: core/templates/index.html:173 core/templates/user/overview.html:156
-#: nutrition/models.py:329 nutrition/templates/ingredient/view.html:84
+#: core/templates/index.html:165 core/templates/user/overview.html:156
+#: nutrition/models/ingredient.py:105
+#: nutrition/templates/ingredient/view.html:84
#: nutrition/templates/log/detail.html:52
#: nutrition/templates/log/detail.html:174
-#: nutrition/templates/plan/view.html:56 nutrition/templates/plan/view.html:221
-#: nutrition/views/plan.py:362
+#: nutrition/templates/plan/view.html:54 nutrition/templates/plan/view.html:251
+#: nutrition/views/plan.py:390
msgid "Protein"
msgstr ""
-#: core/templates/index.html:179 core/templates/user/overview.html:157
-#: nutrition/models.py:336 nutrition/templates/ingredient/view.html:90
+#: core/templates/index.html:171 core/templates/user/overview.html:157
+#: nutrition/models/ingredient.py:113
+#: nutrition/templates/ingredient/view.html:90
#: nutrition/templates/log/detail.html:65
#: nutrition/templates/log/detail.html:175
-#: nutrition/templates/plan/view.html:57 nutrition/templates/plan/view.html:227
-#: nutrition/views/plan.py:366
+#: nutrition/templates/plan/view.html:55 nutrition/templates/plan/view.html:257
+#: nutrition/views/plan.py:398
msgid "Carbohydrates"
msgstr ""
-#: core/templates/index.html:185 core/templates/user/overview.html:158
-#: nutrition/models.py:352 nutrition/templates/ingredient/view.html:106
+#: core/templates/index.html:177 core/templates/user/overview.html:158
+#: nutrition/models/ingredient.py:131
+#: nutrition/templates/ingredient/view.html:106
#: nutrition/templates/log/detail.html:91
#: nutrition/templates/log/detail.html:176
-#: nutrition/templates/plan/view.html:58 nutrition/templates/plan/view.html:239
-#: nutrition/views/plan.py:376
+#: nutrition/templates/plan/view.html:56 nutrition/templates/plan/view.html:270
+#: nutrition/views/plan.py:412
msgid "Fat"
msgstr ""
-#: core/templates/index.html:197 nutrition/templates/plan/overview.html:22
+#: core/templates/index.html:189 nutrition/templates/plan/overview.html:22
msgid "No nutrition plans."
msgstr ""
-#: core/templates/index.html:211 core/templates/user/overview.html:112
-#: core/templates/user/overview.html:121 manager/forms.py:137
-#: manager/helpers.py:85 manager/models.py:775 manager/models.py:879
+#: core/templates/index.html:203 core/templates/user/overview.html:112
+#: core/templates/user/overview.html:121 manager/forms.py:173
+#: manager/helpers.py:89 manager/models/log.py:84 manager/models/setting.py:67
#: manager/templates/log/add.html:54 manager/templates/set/formset.html:12
-#: manager/templates/workout/timer.html:312
-#: manager/templates/workout/timer.html:315 weight/models.py:33
-#: weight/templates/import_csv_preview.html:14
-#: weight/templates/import_csv_preview.html:43
-#: weight/templates/overview.html:49 weight/views.py:151
+#: weight/models.py:34 weight/templates/import_csv_preview.html:14
+#: weight/templates/import_csv_preview.html:43 weight/views.py:150
msgid "Weight"
msgstr ""
-#: core/templates/index.html:215
-msgid "Your current weight is: "
-msgstr ""
-
-#: core/templates/index.html:248 core/templates/navigation.html:75
+#: core/templates/index.html:210 core/templates/navigation.html:97
#: weight/views.py:70
msgid "Add weight entry"
msgstr ""
@@ -757,84 +749,10 @@ msgstr ""
msgid "Nothing found"
msgstr ""
-#: core/templates/misc/about.html:4
-msgid "About us"
-msgstr ""
-
-#: core/templates/misc/about.html:8
-msgid "Responsible for the content of this site as per German law §5 TMG:"
-msgstr ""
-
-#: core/templates/misc/about.html:16
-msgid "GNUPG-Key:"
-msgstr ""
-
-#: core/templates/misc/contact.html:4 core/templates/navigation.html:131
-#: core/templates/template_features.html:86
-#: software/templates/contribute.html:28
-msgid "Get in touch"
-msgstr ""
-
-#: core/templates/misc/contact.html:10
-#, python-format
-msgid ""
-"Thank you for your interest. Feel free to use any of the\n"
-"ways below to send feedback you have about any aspect of the site. For\n"
-"support, say hi\n"
-"<a href=\"%(discord)s\">on the discord channel</a>, to report\n"
-"a bug, consider doing it through the <a href=\"%(issues)s\">issue tracker</"
-"a>\n"
-"."
-msgstr ""
-
-#: core/templates/misc/contact.html:20
-#, python-format
-msgid ""
-"If you want to further help and improve this project,\n"
-"you might also be interested <a href=\"%(contribute)s\">in contributing</a>."
-msgstr ""
-
-#: core/templates/misc/contact.html:29
-msgid "Feedback form"
-msgstr ""
-
-#: core/templates/misc/contact.html:30
-msgid ""
-"A simple contact form. Remember that\n"
-"if you want an answer, you need to include some way to contact you."
-msgstr ""
-
-#: core/templates/misc/contact.html:35
-msgid "Twitter"
-msgstr ""
-
-#: core/templates/misc/contact.html:36
-msgid ""
-"We are also on twitter. Write us and tell us what\n"
-"you think! Except patches, don't send patches via twitter."
-msgstr ""
-
-#: core/templates/misc/contact.html:42
-msgid "Discord"
-msgstr ""
-
-#: core/templates/misc/contact.html:43
-msgid ""
-"Use the public group to get support for your\n"
-"local wger installation, discuss issues or your new idea, etc.\n"
-"(no registration needed)"
-msgstr ""
-
-#: core/templates/misc/contact.html:49
-msgid "Open feedback form"
-msgstr ""
-
-#: core/templates/misc/contact.html:53
-msgid "tweet to @wger_project"
-msgstr ""
-
-#: core/templates/misc/contact.html:56
-msgid "Go to the discord server"
+#: core/templates/misc/about.html:4 core/templates/template.html:175
+#: core/templates/template_features.html:118
+#: core/templates/template_no_context.html:88
+msgid "Imprint"
msgstr ""
#: core/templates/misc/fragments/shariff_modal.html:6
@@ -847,8 +765,8 @@ msgid ""
msgstr ""
#: core/templates/misc/fragments/shariff_modal.html:22
-#: nutrition/templates/plan/view.html:351
-#: nutrition/templates/plan/view.html:359
+#: nutrition/templates/plan/view.html:387
+#: nutrition/templates/plan/view.html:396
msgid "That's done here"
msgstr ""
@@ -878,22 +796,38 @@ msgstr ""
msgid "Calendar"
msgstr ""
-#: core/templates/navigation.html:42
+#: core/templates/navigation.html:44 gallery/templates/images/overview.html:6
+msgid "Gallery"
+msgstr ""
+
+#: core/templates/navigation.html:48
+msgid "Workout templates"
+msgstr ""
+
+#: core/templates/navigation.html:53 manager/views/workout.py:101
+msgid "Your templates"
+msgstr ""
+
+#: core/templates/navigation.html:59 manager/views/workout.py:115
+msgid "Public templates"
+msgstr ""
+
+#: core/templates/navigation.html:64
msgctxt "as in sorted by category"
msgid "by category"
msgstr ""
-#: core/templates/navigation.html:43
+#: core/templates/navigation.html:65
msgctxt "as in sorted by muscle"
msgid "by muscle"
msgstr ""
-#: core/templates/navigation.html:44
+#: core/templates/navigation.html:66
msgctxt "as in sorted by equipment"
msgid "by equipment"
msgstr ""
-#: core/templates/navigation.html:48
+#: core/templates/navigation.html:70
#: exercises/templates/equipment/overview.html:109
#: exercises/templates/equipment/overview.html:113
#: exercises/templates/exercise/overview.html:112
@@ -903,134 +837,130 @@ msgstr ""
msgid "Add new exercise"
msgstr ""
-#: core/templates/navigation.html:53 core/templates/navigation.html:112
-#: core/templates/navigation.html:201
+#: core/templates/navigation.html:75 core/templates/navigation.html:134
+#: core/templates/navigation.html:226
msgid "Administration"
msgstr ""
-#: core/templates/navigation.html:54
+#: core/templates/navigation.html:76
#: exercises/templates/exercise/pending.html:6
msgid "Exercises pending review"
msgstr ""
-#: core/templates/navigation.html:55 exercises/models.py:212
+#: core/templates/navigation.html:77 exercises/models/base.py:72
#: exercises/templates/exercise/view.html:80
msgid "Equipment"
msgstr ""
-#: core/templates/navigation.html:56 exercises/templates/exercise/view.html:209
+#: core/templates/navigation.html:78 exercises/templates/exercise/view.html:258
msgid "Muscles"
msgstr ""
-#: core/templates/navigation.html:57
+#: core/templates/navigation.html:79
#: exercises/templates/categories/admin-overview.html:4
msgid "Categories"
msgstr ""
-#: core/templates/navigation.html:72
+#: core/templates/navigation.html:94
msgid "Body weight"
msgstr ""
-#: core/templates/navigation.html:74 core/templates/user/overview.html:114
+#: core/templates/navigation.html:96 core/templates/user/overview.html:114
#: weight/templates/overview.html:7
msgid "Weight overview"
msgstr ""
-#: core/templates/navigation.html:89 software/templates/features.html:87
+#: core/templates/navigation.html:111 software/templates/features.html:87
msgid "Nutrition"
msgstr ""
-#: core/templates/navigation.html:95 core/templates/user/overview.html:144
+#: core/templates/navigation.html:117 core/templates/user/overview.html:144
msgid "Nutrition plans"
msgstr ""
-#: core/templates/navigation.html:101 nutrition/templates/bmi/form.html:50
+#: core/templates/navigation.html:123 nutrition/templates/bmi/form.html:50
msgid "BMI calculator"
msgstr ""
-#: core/templates/navigation.html:107 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:129 nutrition/templates/rate/form.html:17
msgid "Daily calories calculator"
msgstr ""
-#: core/templates/navigation.html:109
+#: core/templates/navigation.html:131
#: nutrition/templates/ingredient/overview.html:29
msgid "Ingredient overview"
msgstr ""
-#: core/templates/navigation.html:113 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:135 nutrition/templates/units/list.html:6
msgid "Ingredient weight units"
msgstr ""
-#: core/templates/navigation.html:114
+#: core/templates/navigation.html:136
#: nutrition/templates/ingredient/pending.html:6
msgid "Ingredients pending review"
msgstr ""
-#: core/templates/navigation.html:127
+#: core/templates/navigation.html:149
msgid "About this software"
msgstr ""
-#: core/templates/navigation.html:129 core/templates/template_features.html:83
-#: software/templates/contribute.html:6
-msgid "Contribute!"
-msgstr ""
-
-#: core/templates/navigation.html:130
-msgid "Problems and wishes"
+#: core/templates/navigation.html:151 core/templates/template_features.html:83
+#: software/templates/about_us.html:5
+msgid "About us"
msgstr ""
-#: core/templates/navigation.html:133 software/templates/features.html:209
+#: core/templates/navigation.html:153 software/templates/features.html:209
msgid "REST API"
msgstr ""
-#: core/templates/navigation.html:134 software/templates/license.html:7
-#: utils/models.py:39
+#: core/templates/navigation.html:157 utils/models.py:40
msgid "License"
msgstr ""
-#: core/templates/navigation.html:138
+#: core/templates/navigation.html:163
msgid "Developer documentation"
msgstr ""
-#: core/templates/navigation.html:144 software/templates/contribute.html:60
+#: core/templates/navigation.html:169
msgid "Get the code"
msgstr ""
-#: core/templates/navigation.html:150 software/templates/contribute.html:51
-msgid "Translate with Transifex"
+#: core/templates/navigation.html:175 core/templates/template.html:205
+#: core/templates/template_features.html:100
+msgid "Translate"
msgstr ""
-#: core/templates/navigation.html:171 core/templates/user/login.html:28
+#: core/templates/navigation.html:196 core/templates/user/login.html:28
msgid "Reset password"
msgstr ""
-#: core/templates/navigation.html:184
+#: core/templates/navigation.html:209
msgid "My preferences"
msgstr ""
-#: core/templates/navigation.html:191
+#: core/templates/navigation.html:216
msgid "Logout"
msgstr ""
-#: core/templates/navigation.html:206
+#: core/templates/navigation.html:231
msgid "Licenses"
msgstr ""
-#: core/templates/navigation.html:209
+#: core/templates/navigation.html:234
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr ""
-#: core/templates/navigation.html:212 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:237 core/templates/weight_unit/list.html:4
#: nutrition/templates/ingredient/view.html:174
msgid "Weight units"
msgstr ""
-#: core/templates/navigation.html:215 core/templates/user/list.html:4
+#: core/templates/navigation.html:240 core/templates/user/list.html:4
msgid "User list"
msgstr ""
-#: core/templates/navigation.html:216
+#: core/templates/navigation.html:241
msgid "Gyms"
msgstr ""
@@ -1101,69 +1031,54 @@ msgstr ""
msgid "next"
msgstr ""
-#: core/templates/tags/render_day.html:31
+#: core/templates/tags/render_day.html:34
msgid "Add weight log"
msgstr ""
-#: core/templates/tags/render_day.html:97
+#: core/templates/tags/render_day.html:114
#: exercises/templates/equipment/overview.html:59
#: exercises/templates/exercise/overview.html:63
#: exercises/templates/muscles/overview.html:61
msgid "Placeholder image for exercise"
msgstr ""
-#: core/templates/tags/render_day.html:112
+#: core/templates/tags/render_day.html:131
msgid "This exercise has no repetitions."
msgstr ""
-#: core/templates/tags/render_day.html:114
+#: core/templates/tags/render_day.html:134
msgid "Edit them now."
msgstr ""
-#: core/templates/tags/render_day.html:139
+#: core/templates/tags/render_day.html:159
msgid "Add exercises to this workout day"
msgstr ""
-#: core/templates/tags/render_weight_log.html:17 manager/helpers.py:85
-#: manager/models.py:767 manager/templates/set/formset.html:10
+#: core/templates/tags/render_weight_log.html:17 manager/helpers.py:89
+#: manager/models/setting.py:57 manager/templates/set/formset.html:10
msgid "Reps"
msgstr ""
-#: core/templates/tags/render_weight_log.html:30 manager/forms.py:140
-#: manager/models.py:791 manager/models.py:892
+#: core/templates/tags/render_weight_log.html:30 manager/forms.py:178
+#: manager/models/log.py:101 manager/models/setting.py:87
#: manager/templates/log/add.html:56 manager/templates/set/formset.html:14
msgid "RiR"
msgstr ""
-#: core/templates/template.html:139
+#: core/templates/template.html:140
msgid ""
"You are using a guest account, data entered will be deleted after a week."
msgstr ""
-#: core/templates/template.html:143
+#: core/templates/template.html:144
msgid "Create some demo entries"
msgstr ""
-#: core/templates/template.html:192 core/templates/template_features.html:103
-#: software/templates/contribute.html:43
-msgid "Translate"
-msgstr ""
-
-#: core/templates/template.html:200 core/templates/template_features.html:121
-#: core/templates/template_no_context.html:88
-msgid "About"
-msgstr ""
-
-#: core/templates/template.html:201 core/templates/template_features.html:125
+#: core/templates/template.html:176 core/templates/template_features.html:122
#: core/templates/template_no_context.html:89 software/templates/tos.html:7
msgid "Terms of service"
msgstr ""
-#: core/templates/template.html:208 core/templates/template.html:209
-#: software/templates/license.html:18 software/templates/license.html:19
-msgid "Released under the Affero GPL"
-msgstr ""
-
#: core/templates/template_features.html:62 software/templates/features.html:9
#: software/templates/features.html:120
msgid "Features"
@@ -1252,26 +1167,29 @@ msgstr ""
#: core/templates/user/overview.html:28
#: manager/templates/schedule/view.html:164
-#: manager/templates/workout/overview.html:34 manager/views/schedule_step.py:60
+#: manager/templates/workout/overview.html:39 manager/views/schedule_step.py:60
msgid "Add workout"
msgstr ""
#: core/templates/user/overview.html:34 core/templates/user/overview.html:76
#: core/templates/user/overview.html:120 core/templates/user/overview.html:153
-#: exercises/models.py:257 manager/helpers.py:84 manager/models.py:890
-#: manager/models.py:986 nutrition/models.py:313 nutrition/models.py:314
-#: nutrition/models.py:401 nutrition/templates/log/overview.html:30
-#: nutrition/templates/plan/view.html:277 weight/models.py:32
+#: exercises/models/exercise.py:77 gallery/models/image.py:47
+#: manager/helpers.py:88 manager/models/log.py:98 manager/models/session.py:67
+#: measurements/models/measurement.py:64 nutrition/models/ingredient.py:85
+#: nutrition/models/ingredient.py:87 nutrition/models/ingredient.py:190
+#: nutrition/templates/log/overview.html:30
+#: nutrition/templates/plan/view.html:309 weight/models.py:32
#: weight/templates/import_csv_preview.html:13
-#: weight/templates/import_csv_preview.html:42
-#: weight/templates/overview.html:48 weight/views.py:151
+#: weight/templates/import_csv_preview.html:42 weight/views.py:150
msgid "Date"
msgstr ""
#: core/templates/user/overview.html:35 core/templates/user/overview.html:154
-#: exercises/models.py:244 exercises/templates/exercise/view.html:88
-#: exercises/views/exercises.py:183 gym/models.py:393 gym/models.py:442
-#: manager/models.py:83 manager/models.py:395 nutrition/models.py:97
+#: exercises/models/exercise.py:61 exercises/templates/exercise/view.html:88
+#: exercises/views/exercises.py:190 gallery/models/image.py:70
+#: gym/models/contract.py:57 gym/models/contract.py:107
+#: manager/models/day.py:37 manager/models/workout.py:62
+#: measurements/models/measurement.py:79 nutrition/models/plan.py:69
msgid "Description"
msgstr ""
@@ -1279,31 +1197,30 @@ msgstr ""
msgid "Number of logs (days)"
msgstr ""
-#: core/templates/user/overview.html:37 core/views/user.py:562
-#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:152
+#: core/templates/user/overview.html:37 core/views/user.py:576
+#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:157
msgid "Last activity"
msgstr ""
-#: core/templates/user/overview.html:68 manager/forms.py:225
-#: manager/templates/workout/view.html:147
+#: core/templates/user/overview.html:68 manager/forms.py:267
+#: manager/templates/workout/view.html:151
msgid "Log"
msgstr ""
-#: core/templates/user/overview.html:77 manager/models.py:1000
+#: core/templates/user/overview.html:77 manager/models/session.py:84
#: manager/templates/calendar/partial_overview_table.html:52
msgid "General impression"
msgstr ""
#: core/templates/user/overview.html:78 core/templates/user/overview.html:370
-#: manager/models.py:991
+#: manager/models/session.py:73
#: manager/templates/calendar/partial_overview_table.html:56
-#: manager/templates/workout/log.html:101
+#: manager/templates/workout/log.html:95
msgid "Notes"
msgstr ""
#: core/templates/user/overview.html:79
#: manager/templates/calendar/partial_overview_table.html:42
-#: manager/templates/workout/timer.html:500
#: nutrition/templates/log/detail.html:154
msgid "Time"
msgstr ""
@@ -1361,16 +1278,15 @@ msgstr ""
msgid "Details"
msgstr ""
-#: core/templates/user/overview.html:259 gym/views/export.py:57
-#: manager/helpers.py:85 manager/templates/schedule/view.html:101
-#: nutrition/templates/plan/view.html:73 nutrition/views/plan.py:283
-#: nutrition/views/plan.py:289
+#: core/templates/user/overview.html:259 gym/views/export.py:59
+#: manager/helpers.py:89 manager/templates/schedule/view.html:101
+#: nutrition/views/plan.py:289 nutrition/views/plan.py:297
msgid "Nr."
msgstr ""
-#: core/templates/user/overview.html:281 gym/models.py:56 gym/models.py:592
-#: gym/templates/contract/view.html:75 gym/templates/gym/member_list.html:100
-#: gym/views/export.py:68
+#: core/templates/user/overview.html:281 gym/models/contract.py:284
+#: gym/models/gym.py:50 gym/templates/contract/view.html:75
+#: gym/templates/gym/member_list.html:100 gym/views/export.py:70
msgid "Phone"
msgstr ""
@@ -1409,16 +1325,17 @@ msgid "Documents"
msgstr ""
#: core/templates/user/overview.html:413 gym/templates/document/list.html:32
-#: manager/forms.py:237 manager/templates/workout/view.html:172
+#: manager/forms.py:279 manager/templates/workout/view.html:176
msgid "Download"
msgstr ""
-#: core/templates/user/overview.html:454 gym/models.py:210
+#: core/templates/user/overview.html:454 gym/models/user_config.py:92
msgid "Include in inactive overview"
msgstr ""
#: core/templates/user/overview.html:487
-msgid "Admin login is only available for users in"
+#, python-format
+msgid "Admin login is only available for users in %(gym_name)s"
msgstr ""
#: core/templates/user/overview.html:491
@@ -1429,15 +1346,15 @@ msgstr ""
msgid "Preferences"
msgstr ""
-#: core/templates/user/preferences.html:33 core/views/user.py:571
+#: core/templates/user/preferences.html:33 core/views/user.py:587
msgid "Change password"
msgstr ""
-#: core/templatetags/wger_extras.py:210
+#: core/templatetags/wger_extras.py:229
msgid "kg"
msgstr ""
-#: core/templatetags/wger_extras.py:212
+#: core/templatetags/wger_extras.py:231
#: nutrition/templates/ingredient/view.html:86
#: nutrition/templates/ingredient/view.html:92
#: nutrition/templates/ingredient/view.html:99
@@ -1449,72 +1366,73 @@ msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr ""
-#: core/templatetags/wger_extras.py:215
+#: core/templatetags/wger_extras.py:234
msgid "lb"
msgstr ""
-#: core/templatetags/wger_extras.py:217
+#: core/templatetags/wger_extras.py:236
msgctxt "weight unit, i.e. ounces"
msgid "oz"
msgstr ""
-#: core/views/languages.py:85 exercises/views/categories.py:115
-#: exercises/views/equipment.py:107 exercises/views/exercises.py:401
-#: exercises/views/images.py:123 exercises/views/muscles.py:118
-#: manager/views/schedule.py:296 manager/views/schedule_step.py:129
-#: manager/views/workout.py:222 manager/views/workout_session.py:140
-#: nutrition/views/ingredient.py:138 nutrition/views/plan.py:121
-#: nutrition/views/unit.py:107
+#: core/views/languages.py:85 exercises/views/categories.py:121
+#: exercises/views/equipment.py:106 exercises/views/exercises.py:423
+#: exercises/views/images.py:128 exercises/views/muscles.py:118
+#: exercises/views/videos.py:129 manager/views/schedule.py:311
+#: manager/views/schedule_step.py:129 manager/views/workout.py:268
+#: manager/views/workout_session.py:141 nutrition/views/ingredient.py:144
+#: nutrition/views/plan.py:120 nutrition/views/unit.py:111
msgid "Successfully deleted"
msgstr ""
#: core/views/languages.py:93 core/views/license.py:103
#: core/views/repetition_units.py:115 core/views/weight_units.py:115
-#: exercises/views/categories.py:121 exercises/views/exercises.py:409
-#: exercises/views/muscles.py:125 gym/views/admin_notes.py:197
-#: gym/views/document.py:207 gym/views/gym.py:474 manager/views/schedule.py:303
-#: manager/views/schedule_step.py:139 manager/views/workout.py:226
-#: manager/views/workout_session.py:155 nutrition/views/ingredient.py:145
-#: nutrition/views/plan.py:128 nutrition/views/unit.py:114
+#: exercises/views/categories.py:127 exercises/views/exercises.py:431
+#: exercises/views/muscles.py:125 gallery/views/images.py:121
+#: gym/views/admin_notes.py:196 gym/views/document.py:206 gym/views/gym.py:486
+#: manager/views/schedule.py:318 manager/views/schedule_step.py:139
+#: manager/views/workout.py:272 manager/views/workout_session.py:156
+#: nutrition/views/ingredient.py:151 nutrition/views/plan.py:127
+#: nutrition/views/unit.py:118
#, python-brace-format
msgid "Delete {0}?"
msgstr ""
#: core/views/languages.py:111 core/views/license.py:84
-#: core/views/repetition_units.py:85 core/views/user.py:446
-#: core/views/weight_units.py:85 exercises/views/categories.py:93
-#: exercises/views/equipment.py:84 exercises/views/exercises.py:288
-#: exercises/views/muscles.py:105 gym/views/admin_notes.py:161
-#: gym/views/config.py:68 gym/views/contract.py:158
+#: core/views/repetition_units.py:85 core/views/user.py:456
+#: core/views/weight_units.py:85 exercises/views/categories.py:97
+#: exercises/views/equipment.py:83 exercises/views/exercises.py:305
+#: exercises/views/muscles.py:105 gym/views/admin_notes.py:160
+#: gym/views/config.py:68 gym/views/contract.py:186
#: gym/views/contract_option.py:123 gym/views/contract_type.py:123
-#: gym/views/document.py:171 gym/views/gym.py:449 manager/views/day.py:100
-#: manager/views/schedule.py:320 manager/views/workout.py:240
-#: nutrition/views/ingredient.py:164 nutrition/views/plan.py:145
-#: nutrition/views/unit.py:138
+#: gym/views/document.py:170 gym/views/gym.py:459 manager/views/day.py:100
+#: manager/views/schedule.py:335 manager/views/workout.py:286
+#: nutrition/views/ingredient.py:170 nutrition/views/plan.py:144
+#: nutrition/views/unit.py:144
#, python-brace-format
msgid "Edit {0}"
msgstr ""
-#: core/views/misc.py:93
+#: core/views/misc.py:100
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 "
"do. Feel free to edit or delete them!"
msgstr ""
-#: core/views/misc.py:146
+#: core/views/misc.py:155
msgid "Rest day"
msgstr ""
-#: core/views/misc.py:185
+#: core/views/misc.py:184
msgid "Feedback"
msgstr ""
-#: core/views/misc.py:204 weight/templates/import_csv_form.html:9
+#: core/views/misc.py:203 weight/templates/import_csv_form.html:9
msgid "Submit"
msgstr ""
-#: core/views/misc.py:212
+#: core/views/misc.py:211
msgid "Your feedback was successfully sent. Thank you!"
msgstr ""
@@ -1523,123 +1441,192 @@ msgstr ""
msgid "Account \"{0}\" was successfully deleted"
msgstr ""
-#: core/views/user.py:285
+#: core/views/user.py:287
msgid "You were successfully registered"
msgstr ""
-#: core/views/user.py:335
+#: core/views/user.py:339
msgid "Settings successfully updated"
msgstr ""
-#: core/views/user.py:370
+#: core/views/user.py:376
msgid "The user was successfully deactivated"
msgstr ""
-#: core/views/user.py:403
+#: core/views/user.py:411
msgid "The user was successfully activated"
msgstr ""
-#: core/views/user.py:416
+#: core/views/user.py:426
msgid "Edit user"
msgstr ""
-#: core/views/user.py:559 gym/templates/gym/member_list.html:26
-#: gym/views/gym.py:152
+#: core/views/user.py:573 gym/templates/gym/member_list.html:26
+#: gym/views/gym.py:156
msgid "ID"
msgstr ""
-#: core/views/user.py:560 gym/forms.py:86 gym/templates/contract/view.html:55
-#: gym/templates/gym/member_list.html:27 gym/views/export.py:59
-#: gym/views/gym.py:152 gym/views/gym.py:210
+#: core/views/user.py:574 gym/forms.py:94 gym/templates/contract/view.html:55
+#: gym/templates/gym/member_list.html:27 gym/views/export.py:61
+#: gym/views/gym.py:156 gym/views/gym.py:218
msgid "Username"
msgstr ""
-#: core/views/user.py:563 gym/templates/gym/new_user.html:34
-#: gym/views/export.py:58 gym/views/gym.py:210
+#: core/views/user.py:577 gym/templates/gym/new_user.html:34
+#: gym/views/export.py:60 gym/views/gym.py:218
msgid "Gym"
msgstr ""
-#: exercises/models.py:63
-msgid "In latin, e.g. \"Pectoralis major\""
-msgstr ""
-
-#: exercises/models.py:131
-msgid "Exercise Categories"
-msgstr ""
-
-#: exercises/models.py:197 exercises/templates/exercise/view.html:76
-#: nutrition/models.py:408
+#: exercises/models/base.py:51 exercises/templates/exercise/view.html:76
+#: nutrition/models/ingredient.py:204
msgid "Category"
msgstr ""
-#: exercises/models.py:202
+#: exercises/models/base.py:58
msgid "Primary muscles"
msgstr ""
-#: exercises/models.py:206 exercises/templates/equipment/overview.html:71
+#: exercises/models/base.py:64 exercises/templates/equipment/overview.html:71
#: exercises/templates/exercise/overview.html:76
-#: exercises/templates/exercise/view.html:219
+#: exercises/templates/exercise/view.html:268
#: exercises/templates/muscles/overview.html:73
msgid "Secondary muscles"
msgstr ""
-#: exercises/models.py:217
+#: exercises/models/base.py:79
msgid "Variations"
msgstr ""
-#: exercises/models.py:264 nutrition/models.py:91 nutrition/models.py:309
-#: nutrition/models.py:605
+#: exercises/models/category.py:37
+msgid "Exercise Categories"
+msgstr ""
+
+#: exercises/models/comment.py:34 exercises/models/image.py:75
+#: exercises/models/video.py:82 manager/forms.py:165 manager/helpers.py:89
+#: manager/models/log.py:51
+msgid "Exercise"
+msgstr ""
+
+#: exercises/models/comment.py:41
+msgid "A comment about how to correctly do this exercise."
+msgstr ""
+
+#: exercises/models/exercise.py:86 nutrition/models/ingredient.py:80
+#: nutrition/models/plan.py:61 nutrition/models/weight_unit.py:32
msgid "Language"
msgstr ""
-#: exercises/models.py:402 exercises/views/exercises.py:439
+#: exercises/models/exercise.py:237 exercises/views/exercises.py:461
msgid "Exercise was successfully added to the general database"
msgstr ""
-#: exercises/models.py:429
+#: exercises/models/exercise.py:265
msgid "New user submitted exercise"
msgstr ""
-#: exercises/models.py:431
+#: exercises/models/exercise.py:267
#, python-brace-format
msgid "The user {0} submitted a new exercise \"{1}\"."
msgstr ""
-#: exercises/models.py:459 exercises/models.py:569 manager/forms.py:133
-#: manager/helpers.py:85 manager/models.py:854
-msgid "Exercise"
+#: exercises/models/image.py:59
+msgid "Line"
+msgstr ""
+
+#: exercises/models/image.py:60
+msgid "3D"
+msgstr ""
+
+#: exercises/models/image.py:61
+msgid "Low-poly"
+msgstr ""
+
+#: exercises/models/image.py:62
+msgid "Photo"
+msgstr ""
+
+#: exercises/models/image.py:63
+msgid "Other"
msgstr ""
-#: exercises/models.py:463
+#: exercises/models/image.py:81 gallery/models/image.py:56
msgid "Image"
msgstr ""
-#: exercises/models.py:464
+#: exercises/models/image.py:82 gallery/models/image.py:57
msgid "Only PNG and JPEG formats are supported"
msgstr ""
-#: exercises/models.py:468
+#: exercises/models/image.py:88
msgid "Main picture"
msgstr ""
-#: exercises/models.py:470
+#: exercises/models/image.py:91
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 "
"by the system."
msgstr ""
-#: exercises/models.py:554
+#: exercises/models/image.py:100
+msgid "The art style of your image"
+msgstr ""
+
+#: exercises/models/image.py:185
msgid "New user submitted image"
msgstr ""
-#: exercises/models.py:555
+#: exercises/models/image.py:186
#, python-brace-format
msgid "The user {0} submitted a new image \"{1}\" for exercise {2}."
msgstr ""
-#: exercises/models.py:574
-msgid "A comment about how to correctly do this exercise."
+#: exercises/models/muscle.py:37
+msgid "In latin, e.g. \"Pectoralis major\""
+msgstr ""
+
+#: exercises/models/video.py:41
+msgid "Maximum file size is 100MB."
+msgstr ""
+
+#: exercises/models/video.py:44 exercises/models/video.py:48
+msgid "File type is not supported"
+msgstr ""
+
+#: exercises/models/video.py:57
+msgid "File is not a valid video"
+msgstr ""
+
+#: exercises/models/video.py:88
+msgid "Main video"
+msgstr ""
+
+#: exercises/models/video.py:94
+msgid "Video"
+msgstr ""
+
+#: exercises/models/video.py:101
+msgid "Size"
+msgstr ""
+
+#: exercises/models/video.py:108 manager/models/schedule_step.py:56
+msgid "Duration"
+msgstr ""
+
+#: exercises/models/video.py:117
+msgid "Width"
+msgstr ""
+
+#: exercises/models/video.py:124
+msgid "Height"
+msgstr ""
+
+#: exercises/models/video.py:131
+msgid "Codec"
+msgstr ""
+
+#: exercises/models/video.py:139
+msgid "Codec, long name"
msgstr ""
#: exercises/templates/equipment/admin-overview.html:4
@@ -1647,7 +1634,7 @@ msgid "Equipment list"
msgstr ""
#: exercises/templates/equipment/admin-overview.html:37
-#: exercises/views/equipment.py:95
+#: exercises/views/equipment.py:94
msgid "Add new equipment"
msgstr ""
@@ -1657,7 +1644,7 @@ msgstr ""
#: exercises/templates/equipment/overview.html:69
#: exercises/templates/exercise/overview.html:74
-#: exercises/templates/exercise/view.html:215
+#: exercises/templates/exercise/view.html:264
#: exercises/templates/muscles/overview.html:71
msgid "Main muscles"
msgstr ""
@@ -1683,7 +1670,6 @@ msgstr ""
#: exercises/templates/exercise/overview.html:118
#: exercises/templates/muscles/overview.html:114
#: nutrition/templates/ingredient/overview.html:85
-#: software/templates/contribute.html:39
msgid "Only registered users can do this"
msgstr ""
@@ -1762,13 +1748,14 @@ msgstr ""
msgid "Submission date"
msgstr ""
-#: exercises/templates/exercise/pending.html:16 gym/forms.py:58
-#: gym/templates/gym/email_inactive_members.html:4
+#: exercises/templates/exercise/pending.html:16 gallery/models/image.py:51
+#: gym/forms.py:57 gym/templates/gym/email_inactive_members.html:4
#: gym/templates/gym/new_user.html:22
-#: gym/templates/gym/reset_user_password.html:20 manager/models.py:88
-#: manager/models.py:230 manager/models.py:850 manager/models.py:971
-#: nutrition/models.py:87 nutrition/templates/ingredient/pending.html:16
-#: weight/models.py:38
+#: gym/templates/gym/reset_user_password.html:20 manager/models/log.py:45
+#: manager/models/schedule.py:44 manager/models/session.py:49
+#: manager/models/workout.py:89 measurements/models/category.py:48
+#: measurements/models/measurement.py:59 nutrition/models/plan.py:55
+#: nutrition/templates/ingredient/pending.html:16 weight/models.py:41
msgid "User"
msgstr ""
@@ -1792,13 +1779,13 @@ msgid "Please select one of the options below."
msgstr ""
#: exercises/templates/exercise/view.html:60
-#: exercises/templates/exercise/view.html:153
+#: exercises/templates/exercise/view.html:203
#: nutrition/templates/ingredient/view.html:38
msgid "Accept"
msgstr ""
#: exercises/templates/exercise/view.html:64
-#: exercises/templates/exercise/view.html:154
+#: exercises/templates/exercise/view.html:204
#: nutrition/templates/ingredient/view.html:42
msgid "Decline"
msgstr ""
@@ -1807,36 +1794,44 @@ msgstr ""
msgid "Images"
msgstr ""
-#: exercises/templates/exercise/view.html:137 exercises/views/images.py:90
+#: exercises/templates/exercise/view.html:137 exercises/views/images.py:93
msgid "Add new image"
msgstr ""
-#: exercises/templates/exercise/view.html:147
+#: exercises/templates/exercise/view.html:148
+msgid "Videos"
+msgstr ""
+
+#: exercises/templates/exercise/view.html:187 exercises/views/videos.py:94
+msgid "Add new video"
+msgstr ""
+
+#: exercises/templates/exercise/view.html:197
msgid "Images pending review"
msgstr ""
-#: exercises/templates/exercise/view.html:169
+#: exercises/templates/exercise/view.html:218
msgid "Comments for this exercise"
msgstr ""
-#: exercises/templates/exercise/view.html:197
+#: exercises/templates/exercise/view.html:246
msgid "Add new comment"
msgstr ""
-#: exercises/templates/exercise/view.html:211
+#: exercises/templates/exercise/view.html:260
msgid "The diagram shows the most used muscles on this exercise"
msgstr ""
-#: exercises/templates/exercise/view.html:252
+#: exercises/templates/exercise/view.html:301
#: manager/templates/workout/log.html:10 manager/templates/workout/log.html:11
msgid "Weight log"
msgstr ""
-#: exercises/templates/exercise/view.html:257
+#: exercises/templates/exercise/view.html:306
msgid "Exercise Variations"
msgstr ""
-#: exercises/templates/exercise/view.html:278
+#: exercises/templates/exercise/view.html:327
msgid "Submit a correction"
msgstr ""
@@ -1855,213 +1850,223 @@ msgid ""
"No exercises for this muscle. Add or edit an exercise and set the muscle."
msgstr ""
-#: exercises/views/categories.py:69
+#: exercises/views/categories.py:71
msgid "Add category"
msgstr ""
-#: exercises/views/categories.py:114
+#: exercises/views/categories.py:120
msgid "This will also delete all exercises in this category."
msgstr ""
-#: exercises/views/comments.py:79
+#: exercises/views/comments.py:82
msgid "Add exercise comment"
msgstr ""
-#: exercises/views/equipment.py:108 exercises/views/equipment.py:119
+#: exercises/views/equipment.py:107 exercises/views/equipment.py:118
msgid "Delete equipment?"
msgstr ""
-#: exercises/views/exercises.py:218
+#: exercises/views/exercises.py:229
#, python-format
msgid ""
"%(name_original)s is too similar to existing exercise \"%(exercise_name)s\""
msgstr ""
-#: exercises/views/exercises.py:232 software/templates/contribute.html:37
+#: exercises/views/exercises.py:247
msgid "Add exercise"
msgstr ""
-#: exercises/views/exercises.py:349
+#: exercises/views/exercises.py:367
msgid "Thank you. Once the changes are reviewed the exercise will be updated."
msgstr ""
-#: exercises/views/exercises.py:362
+#: exercises/views/exercises.py:380
#, python-brace-format
msgid "Correct {0}"
msgstr ""
-#: exercises/views/exercises.py:400
+#: exercises/views/exercises.py:422
msgid "This will delete the exercise from all workouts."
msgstr ""
-#: exercises/views/exercises.py:452
+#: exercises/views/exercises.py:474
msgid "Exercise was successfully marked as rejected"
msgstr ""
-#: exercises/views/images.py:67
+#: exercises/views/images.py:68
msgid "Edit exercise image"
msgstr ""
-#: exercises/views/images.py:138
+#: exercises/views/images.py:143
msgid "Delete exercise image?"
msgstr ""
-#: gym/forms.py:60 gym/templates/gym/member_list.html:44
+#: exercises/views/videos.py:144 nutrition/views/log.py:230
+#: nutrition/views/unit_ingredient.py:139
+msgid "Delete?"
+msgstr ""
+
+#: gallery/templates/images/overview.html:62
+msgid "Add image"
+msgstr ""
+
+#: gym/forms.py:59 gym/templates/gym/member_list.html:44
msgid "Trainer"
msgstr ""
-#: gym/forms.py:62
+#: gym/forms.py:61
msgid "Gym administrator"
msgstr ""
-#: gym/forms.py:64 gym/templates/gym/member_list.html:52
+#: gym/forms.py:63 gym/templates/gym/member_list.html:52
msgid "General manager"
msgstr ""
-#: gym/forms.py:89
+#: gym/forms.py:97
msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
msgstr ""
-#: gym/forms.py:92
+#: gym/forms.py:101
msgid "This value may contain only letters, numbers and @/.//-/_ characters."
msgstr ""
-#: gym/forms.py:105
+#: gym/forms.py:116
msgid "A user with that username already exists."
msgstr ""
-#: gym/management/commands/inactive-members.py:97 gym/models.py:123
+#: gym/management/commands/inactive-members.py:97 gym/models/gym_config.py:44
msgid "Reminder of inactive members"
msgstr ""
-#: gym/models.py:41
-msgid "Trainer: can see the users for a gym"
+#: gym/models/admin_user_note.py:66 gym/models/contract.py:302
+#: gym/models/user_document.py:96 gym/templates/contract/view.html:96
+msgid "Note"
msgstr ""
-#: gym/models.py:42
-msgid "Admin: can manage users for a gym"
+#: gym/models/contract.py:141
+msgid "Yearly"
msgstr ""
-#: gym/models.py:43
-msgid "Admin: can administrate the different gyms"
+#: gym/models/contract.py:142
+msgid "Half yearly"
msgstr ""
-#: gym/models.py:67 gym/templates/gym/member_list.html:114
-msgid "Owner"
+#: gym/models/contract.py:143
+msgid "Monthly"
msgstr ""
-#: gym/models.py:73 gym/models.py:574 gym/views/export.py:65
-msgid "ZIP code"
+#: gym/models/contract.py:144
+msgid "Biweekly"
msgstr ""
-#: gym/models.py:79 gym/models.py:580 gym/views/export.py:66
-msgid "City"
+#: gym/models/contract.py:145
+msgid "Weekly"
msgstr ""
-#: gym/models.py:85 gym/models.py:586 gym/views/export.py:67
-msgid "Street"
+#: gym/models/contract.py:146
+msgid "Daily"
msgstr ""
-#: gym/models.py:124
-msgid ""
-"Number of weeks since the last time a user logged his presence to be "
-"considered inactive"
+#: gym/models/contract.py:191 gym/templates/contract/view.html:34
+msgid "Contract type"
msgstr ""
-#: gym/models.py:131 gym/templates/gym/member_list.html:152
-msgid "Show name in header"
+#: gym/models/contract.py:208 gym/templates/contract/view.html:59
+#: manager/templates/log/add.html:52 nutrition/forms.py:59
+#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:102
+#: nutrition/models/meal_item.py:72
+msgid "Amount"
msgstr ""
-#: gym/models.py:132
-msgid "Show the name of the gym in the site header"
+#: gym/models/contract.py:218 gym/templates/contract/view.html:63
+msgid "Payment type"
msgstr ""
-#: gym/models.py:142
-msgid "Configuration for {}"
+#: gym/models/contract.py:222
+msgid "How often the amount will be charged to the member"
msgstr ""
-#: gym/models.py:185 gym/templates/gym/member_list.html:184
-msgid "Overview of inactive members"
+#: gym/models/contract.py:228 gym/templates/contract/view.html:24
+msgid "Contract is active"
msgstr ""
-#: gym/models.py:186
-msgid "Receive email overviews of inactive members"
+#: gym/models/contract.py:234 gym/templates/contract/view.html:69
+#: manager/models/schedule.py:62 manager/templates/schedule/view.html:70
+msgid "Start date"
msgstr ""
-#: gym/models.py:211
-msgid "Include this user in the email list with inactive members"
+#: gym/models/contract.py:244 gym/templates/contract/view.html:71
+msgid "End date"
msgstr ""
-#: gym/models.py:263 gym/models.py:342 gym/models.py:606
-#: gym/templates/contract/view.html:96
-msgid "Note"
+#: gym/models/contract.py:260 gym/models/gym.py:73 gym/views/export.py:67
+msgid "ZIP code"
msgstr ""
-#: gym/models.py:322
-msgid "Document"
+#: gym/models/contract.py:268 gym/models/gym.py:81 gym/views/export.py:68
+msgid "City"
msgstr ""
-#: gym/models.py:336
-msgid "Will use file name if nothing provided"
+#: gym/models/contract.py:276 gym/models/gym.py:89 gym/views/export.py:69
+msgid "Street"
msgstr ""
-#: gym/models.py:475
-msgid "Yearly"
+#: gym/models/contract.py:292 gym/templates/contract/view.html:92
+msgid "Profession"
msgstr ""
-#: gym/models.py:476
-msgid "Half yearly"
+#: gym/models/gym.py:33
+msgid "Trainer: can see the users for a gym"
msgstr ""
-#: gym/models.py:477
-msgid "Monthly"
+#: gym/models/gym.py:34
+msgid "Admin: can manage users for a gym"
msgstr ""
-#: gym/models.py:478
-msgid "Biweekly"
+#: gym/models/gym.py:35
+msgid "Admin: can administrate the different gyms"
msgstr ""
-#: gym/models.py:479
-msgid "Weekly"
+#: gym/models/gym.py:65 gym/templates/gym/member_list.html:114
+msgid "Owner"
msgstr ""
-#: gym/models.py:480
-msgid "Daily"
+#: gym/models/gym_config.py:46
+msgid ""
+"Number of weeks since the last time a user logged his presence to be "
+"considered inactive"
msgstr ""
-#: gym/models.py:518 gym/templates/contract/view.html:34
-msgid "Contract type"
+#: gym/models/gym_config.py:56 gym/templates/gym/member_list.html:152
+msgid "Show name in header"
msgstr ""
-#: gym/models.py:531 gym/templates/contract/view.html:59
-#: manager/templates/log/add.html:52 nutrition/forms.py:58
-#: nutrition/models.py:643 nutrition/models.py:827 nutrition/models.py:889
-msgid "Amount"
+#: gym/models/gym_config.py:57
+msgid "Show the name of the gym in the site header"
msgstr ""
-#: gym/models.py:539 gym/templates/contract/view.html:63
-msgid "Payment type"
+#: gym/models/gym_config.py:68
+msgid "Configuration for {}"
msgstr ""
-#: gym/models.py:543
-msgid "How often the amount will be charged to the member"
+#: gym/models/user_config.py:65 gym/templates/gym/member_list.html:184
+msgid "Overview of inactive members"
msgstr ""
-#: gym/models.py:548 gym/templates/contract/view.html:24
-msgid "Contract is active"
+#: gym/models/user_config.py:66
+msgid "Receive email overviews of inactive members"
msgstr ""
-#: gym/models.py:554 gym/templates/contract/view.html:69 manager/models.py:245
-#: manager/templates/schedule/view.html:70
-msgid "Start date"
+#: gym/models/user_config.py:93
+msgid "Include this user in the email list with inactive members"
msgstr ""
-#: gym/models.py:562 gym/templates/contract/view.html:71
-msgid "End date"
+#: gym/models/user_document.py:75
+msgid "Document"
msgstr ""
-#: gym/models.py:598 gym/templates/contract/view.html:92
-msgid "Profession"
+#: gym/models/user_document.py:88
+msgid "Will use file name if nothing provided"
msgstr ""
#: gym/templates/admin_notes/list.html:4
@@ -2094,7 +2099,7 @@ msgstr ""
msgid "Global gym configuration"
msgstr ""
-#: gym/templates/gym/list.html:64 gym/views/gym.py:164
+#: gym/templates/gym/list.html:64 gym/views/gym.py:170
msgid "Add new gym"
msgstr ""
@@ -2151,9 +2156,7 @@ msgid "Date of Birth"
msgstr ""
#: gym/templates/gym/new_user.html:48 manager/templates/calendar/month.html:144
-#: manager/templates/log/add.html:75 manager/templates/workout/timer.html:443
-#: manager/templates/workout/timer.html:470
-#: nutrition/templates/rate/form.html:120
+#: manager/templates/log/add.html:75 nutrition/templates/rate/form.html:120
msgid "Info"
msgstr ""
@@ -2179,7 +2182,7 @@ msgstr ""
msgid "Add note"
msgstr ""
-#: gym/views/contract.py:56
+#: gym/views/contract.py:69
msgid "Add contract"
msgstr ""
@@ -2196,24 +2199,181 @@ msgstr ""
msgid "Add contract type"
msgstr ""
-#: gym/views/export.py:63
+#: gym/views/export.py:65
msgid "Gender"
msgstr ""
-#: gym/views/gym.py:332
+#: gym/views/gym.py:342
msgid "Add user to gym"
msgstr ""
-#: gym/views/gym.py:428
+#: gym/views/gym.py:438
msgid "Edit gym"
msgstr ""
-#: mailer/forms.py:35 mailer/templates/mailer/gym/preview.html:32
+#: i18n.tpl:2
+msgid "Abs"
+msgstr ""
+
+#: i18n.tpl:3
+msgid "Arms"
+msgstr ""
+
+#: i18n.tpl:4
+msgid "Back"
+msgstr ""
+
+#: i18n.tpl:5
+msgid "Calves"
+msgstr ""
+
+#: i18n.tpl:6
+msgid "Chest"
+msgstr ""
+
+#: i18n.tpl:7
+msgid "Legs"
+msgstr ""
+
+#: i18n.tpl:8
+msgid "Shoulders"
+msgstr ""
+
+#: i18n.tpl:9
+msgid "Barbell"
+msgstr ""
+
+#: i18n.tpl:10
+msgid "Bench"
+msgstr ""
+
+#: i18n.tpl:11
+msgid "Dumbbell"
+msgstr ""
+
+#: i18n.tpl:12
+msgid "Gym mat"
+msgstr ""
+
+#: i18n.tpl:13
+msgid "Incline bench"
+msgstr ""
+
+#: i18n.tpl:14
+msgid "Kettlebell"
+msgstr ""
+
+#: i18n.tpl:15
+msgid "none (bodyweight exercise)"
+msgstr ""
+
+#: i18n.tpl:16
+msgid "Pull-up bar"
+msgstr ""
+
+#: i18n.tpl:17
+msgid "Swiss Ball"
+msgstr ""
+
+#: i18n.tpl:18
+msgid "SZ-Bar"
+msgstr ""
+
+#: i18n.tpl:19
+msgid "Anterior deltoid"
+msgstr ""
+
+#: i18n.tpl:20
+msgid "Biceps brachii"
+msgstr ""
+
+#: i18n.tpl:21
+msgid "Biceps femoris"
+msgstr ""
+
+#: i18n.tpl:22
+msgid "Brachialis"
+msgstr ""
+
+#: i18n.tpl:23
+msgid "Gastrocnemius"
+msgstr ""
+
+#: i18n.tpl:24
+msgid "Gluteus maximus"
+msgstr ""
+
+#: i18n.tpl:25
+msgid "Latissimus dorsi"
+msgstr ""
+
+#: i18n.tpl:26
+msgid "Obliquus externus abdominis"
+msgstr ""
+
+#: i18n.tpl:27
+msgid "Pectoralis major"
+msgstr ""
+
+#: i18n.tpl:28
+msgid "Quadriceps femoris"
+msgstr ""
+
+#: i18n.tpl:29
+msgid "Rectus abdominis"
+msgstr ""
+
+#: i18n.tpl:30
+msgid "Serratus anterior"
+msgstr ""
+
+#: i18n.tpl:31
+msgid "Soleus"
+msgstr ""
+
+#: i18n.tpl:32
+msgid "Trapezius"
+msgstr ""
+
+#: i18n.tpl:33
+msgid "Triceps brachii"
+msgstr ""
+
+#: i18n.tpl:34
+msgid "Kilometers"
+msgstr ""
+
+#: i18n.tpl:35
+msgid "Max Reps"
+msgstr ""
+
+#: i18n.tpl:36
+msgid "Miles"
+msgstr ""
+
+#: i18n.tpl:37
+msgid "Minutes"
+msgstr ""
+
+#: i18n.tpl:38 manager/forms.py:169 manager/models/log.py:71
+#: manager/templates/set/add.html:53
+msgid "Repetitions"
+msgstr ""
+
+#: i18n.tpl:39
+msgid "Seconds"
+msgstr ""
+
+#: i18n.tpl:40
+msgid "Until Failure"
+msgstr ""
+
+#: mailer/forms.py:34 mailer/templates/mailer/gym/preview.html:32
msgctxt "As in \"email subject\""
msgid "Subject"
msgstr ""
-#: mailer/forms.py:36 mailer/templates/mailer/gym/preview.html:40
+#: mailer/forms.py:35 mailer/templates/mailer/gym/preview.html:40
msgctxt "As in \"content of an email\""
msgid "Content"
msgstr ""
@@ -2224,7 +2384,7 @@ msgstr ""
#: mailer/templates/mailer/gym/form.html:28
#: mailer/templates/mailer/gym/preview.html:62
-#: manager/templates/workout/view.html:84
+#: manager/templates/workout/view.html:88
msgid "Steps"
msgstr ""
@@ -2246,6 +2406,7 @@ msgid ""
msgstr ""
#: mailer/templates/mailer/gym/preview.html:22
+#: software/templates/about_us.html:59
msgid "Current version"
msgstr ""
@@ -2258,162 +2419,177 @@ msgstr ""
msgid "Correction"
msgstr ""
-#: manager/forms.py:77
-msgid "The goal or description of the new workout."
+#: manager/forms.py:89 manager/models/workout.py:59
+msgid "The name of the workout"
msgstr ""
-#: manager/forms.py:102
+#: manager/forms.py:93 manager/models/workout.py:66
+msgid ""
+"A short description or goal of the workout. For example 'Focus on back' or "
+"'Week 1 of program xy'."
+msgstr ""
+
+#: manager/forms.py:126
msgid ""
"You can search for more than one exercise, they will be grouped together for "
"a superset."
msgstr ""
-#: manager/forms.py:127 manager/forms.py:130 manager/models.py:759
-#: manager/models.py:784 manager/models.py:861 manager/models.py:883
-#: manager/templates/log/add.html:53 manager/templates/log/add.html:55
-#: manager/templates/set/formset.html:11 manager/templates/set/formset.html:13
-#: nutrition/forms.py:62
+#: manager/forms.py:155 manager/forms.py:160 manager/models/log.py:62
+#: manager/models/log.py:90 manager/models/setting.py:47
+#: manager/models/setting.py:78 manager/templates/log/add.html:53
+#: manager/templates/log/add.html:55 manager/templates/set/formset.html:11
+#: manager/templates/set/formset.html:13 measurements/models/category.py:58
+#: nutrition/forms.py:63
msgid "Unit"
msgstr ""
-#: manager/forms.py:135 manager/models.py:868 manager/templates/set/add.html:52
-#: manager/templates/workout/timer.html:302
-#: manager/templates/workout/timer.html:305
-msgid "Repetitions"
-msgstr ""
-
-#: manager/forms.py:224
+#: manager/forms.py:266
msgid "Type"
msgstr ""
-#: manager/forms.py:226 manager/templates/workout/view.html:153
+#: manager/forms.py:267 manager/templates/workout/view.html:157
msgid "Table"
msgstr ""
-#: manager/forms.py:228 manager/templates/workout/view.html:159
+#: manager/forms.py:269 manager/templates/workout/view.html:163
msgid "with images"
msgstr ""
-#: manager/forms.py:230 manager/templates/workout/view.html:165
+#: manager/forms.py:270 manager/templates/workout/view.html:169
msgid "with comments"
msgstr ""
-#: manager/management/commands/email-reminders.py:121
+#: manager/management/commands/email-reminders.py:125
msgid "Workout will expire soon"
msgstr ""
-#: manager/models.py:82 nutrition/models.py:94
-msgid "Creation date"
+#: manager/models/day.py:39
+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 ""
-#: manager/models.py:86
-msgid ""
-"A short description or goal of the workout. For example 'Focus on back' or "
-"'Week 1 of program xy'."
+#: manager/models/day.py:44
+msgid "Day"
msgstr ""
-#: manager/models.py:241
+#: manager/models/schedule.py:57
msgid "Name or short description of the schedule. For example 'Program XYZ'."
msgstr ""
-#: manager/models.py:249 manager/templates/schedule/view.html:74
+#: manager/models/schedule.py:66 manager/templates/schedule/view.html:74
msgid "Schedule active"
msgstr ""
-#: manager/models.py:251
+#: manager/models/schedule.py:69
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 "
"inactive"
msgstr ""
-#: manager/models.py:257 manager/templates/schedule/view.html:84
+#: manager/models/schedule.py:78 manager/templates/schedule/view.html:84
msgid "Is a loop"
msgstr ""
-#: manager/models.py:259
+#: manager/models/schedule.py:81
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)"
msgstr ""
-#: manager/models.py:338
+#: manager/models/schedule_step.py:49
msgid "schedule"
msgstr ""
-#: manager/models.py:345
-msgid "Duration"
-msgstr ""
-
-#: manager/models.py:346
+#: manager/models/schedule_step.py:57
msgid "The duration in weeks"
msgstr ""
-#: manager/models.py:351 manager/models.py:571 manager/models.py:802
-#: nutrition/models.py:675 nutrition/models.py:822
+#: manager/models/schedule_step.py:63 manager/models/set.py:52
+#: manager/models/setting.py:98 nutrition/models/meal.py:54
+#: nutrition/models/meal_item.py:65
msgid "Order"
msgstr ""
-#: manager/models.py:396
-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 ""
-
-#: manager/models.py:400
-msgid "Day"
-msgstr ""
-
-#: manager/models.py:567
-msgid "Exercise day"
-msgstr ""
-
-#: manager/models.py:573
-msgid "Number of sets"
-msgstr ""
-
-#: manager/models.py:754
-msgid "Sets"
-msgstr ""
-
-#: manager/models.py:965
+#: manager/models/session.py:42
msgid "Bad"
msgstr ""
-#: manager/models.py:966
+#: manager/models/session.py:43
msgid "Neutral"
msgstr ""
-#: manager/models.py:967
+#: manager/models/session.py:44
msgid "Good"
msgstr ""
-#: manager/models.py:994
+#: manager/models/session.py:76
msgid "Any notes you might want to save about this workout session."
msgstr ""
-#: manager/models.py:1004
+#: manager/models/session.py:89
msgid ""
"Your impression about this workout session. Did you exercise as well as you "
"could?"
msgstr ""
-#: manager/models.py:1010
+#: manager/models/session.py:97
msgid "Start time"
msgstr ""
-#: manager/models.py:1017
+#: manager/models/session.py:102
msgid "Finish time"
msgstr ""
-#: manager/models.py:1043
+#: manager/models/session.py:128
msgid "If you enter a time, you must enter both start and end time."
msgstr ""
-#: manager/models.py:1046
+#: manager/models/session.py:131
msgid "The start time cannot be after the end time."
msgstr ""
+#: manager/models/set.py:46
+msgid "Exercise day"
+msgstr ""
+
+#: manager/models/set.py:56
+msgid "Number of sets"
+msgstr ""
+
+#: manager/models/setting.py:43
+msgid "Sets"
+msgstr ""
+
+#: manager/models/workout.py:54 nutrition/models/plan.py:65
+msgid "Creation date"
+msgstr ""
+
+#: manager/models/workout.py:72 manager/templates/workout/template_view.html:11
+#: manager/templates/workout/template_view.html:19
+msgid "Workout template"
+msgstr ""
+
+#: manager/models/workout.py:74
+msgid ""
+"Marking a workout as a template will freeze it and allow you to make copies "
+"of it"
+msgstr ""
+
+#: manager/models/workout.py:81
+msgid "Public template"
+msgstr ""
+
+#: manager/models/workout.py:82
+msgid "A public template is available to other users"
+msgstr ""
+
+#: manager/models/workout.py:114
+msgid "You must mark this workout as a template before declaring it public"
+msgstr ""
+
#: manager/templates/calendar/day.html:9 manager/templates/calendar/day.html:31
msgid "Workout log"
msgstr ""
@@ -2520,8 +2696,8 @@ msgid ""
"deactivate it"
msgstr ""
-#: manager/templates/schedule/view.html:106 manager/views/schedule.py:165
-#: manager/views/schedule.py:230
+#: manager/templates/schedule/view.html:106 manager/views/schedule.py:168
+#: manager/views/schedule.py:238
msgid "Weeks"
msgstr ""
@@ -2559,9 +2735,9 @@ msgstr ""
#: manager/templates/schedule/view.html:231
#: manager/templates/schedule/view.html:241
#: manager/templates/schedule/view.html:286
-#: manager/templates/workout/view.html:113
-#: manager/templates/workout/view.html:123
-#: manager/templates/workout/view.html:217
+#: manager/templates/workout/view.html:117
+#: manager/templates/workout/view.html:127
+#: manager/templates/workout/view.html:221
msgid "Export calendar file"
msgstr ""
@@ -2570,7 +2746,7 @@ msgid "Export this schedule as a calendar file."
msgstr ""
#: manager/templates/schedule/view.html:236
-#: manager/templates/workout/view.html:118
+#: manager/templates/workout/view.html:122
msgid ""
"You can then import the file it into your calendar\n"
"application for example google calendar, outlook or iCal. This will create\n"
@@ -2579,9 +2755,9 @@ msgstr ""
#: manager/templates/schedule/view.html:256
#: manager/templates/schedule/view.html:290
-#: manager/templates/workout/view.html:138
-#: manager/templates/workout/view.html:213
-#: nutrition/templates/plan/view.html:378
+#: manager/templates/workout/view.html:142
+#: manager/templates/workout/view.html:217
+#: nutrition/templates/plan/view.html:417
msgid "Download as PDF"
msgstr ""
@@ -2598,7 +2774,7 @@ msgstr ""
msgid "Add exercises to day \"%(day_name)s\""
msgstr ""
-#: manager/templates/set/add.html:54
+#: manager/templates/set/add.html:55
msgid ""
"If you do the same repetitions for all sets,\n"
"you can just enter one value: e.g. for 4 sets just enter one \"10\" for the "
@@ -2654,119 +2830,100 @@ msgstr ""
msgid "Weight log for workout"
msgstr ""
-#: manager/templates/workout/log.html:45 nutrition/templates/plan/view.html:339
-msgid "Goal"
-msgstr ""
-
-#: manager/templates/workout/log.html:55
+#: manager/templates/workout/log.html:49
msgid "Add weight log to this day"
msgstr ""
-#: manager/templates/workout/log.html:81
+#: manager/templates/workout/log.html:75
msgid "No weight entries here."
msgstr ""
-#: manager/templates/workout/log.html:89
+#: manager/templates/workout/log.html:83
msgid "No exercises for this day."
msgstr ""
-#: manager/templates/workout/log.html:102
+#: manager/templates/workout/log.html:96
msgid ""
"This page shows the weight logs belonging to this workout\n"
"only. Click on an exercise to see all the historical data for\n"
"it."
msgstr ""
-#: manager/templates/workout/log.html:106
+#: manager/templates/workout/log.html:100
msgid ""
"If on a single day there is more than one entry with the\n"
"same number of repetitions, but different weights, only the entry with the\n"
"higher weight is shown in the diagram."
msgstr ""
-#: manager/templates/workout/log.html:110
+#: manager/templates/workout/log.html:104
msgid ""
"Note that only entries with a weight unit (kg or lb) and\n"
"repetitions are charted, other combinations such as time or until failure\n"
"are ignored here."
msgstr ""
-#: manager/templates/workout/overview.html:5
-msgid "Your workouts"
-msgstr ""
-
-#: manager/templates/workout/timer.html:260
-msgid "Your workout today"
-msgstr ""
-
-#: manager/templates/workout/timer.html:271
-msgid "Start!"
+#: manager/templates/workout/overview.html:25
+msgid "No templates found."
msgstr ""
-#: manager/templates/workout/timer.html:357
-msgid "reps"
+#: manager/templates/workout/template_view.html:53
+msgid "Mark as workout"
msgstr ""
-#: manager/templates/workout/timer.html:366
-#: manager/templates/workout/timer.html:415
-msgid "Skip"
+#: manager/templates/workout/template_view.html:65
+#: manager/templates/workout/view.html:97
+msgid "Muscles trained"
msgstr ""
-#: manager/templates/workout/timer.html:390
-msgid "Pause!"
+#: manager/templates/workout/template_view.html:68
+#: manager/templates/workout/view.html:100
+msgid ""
+"Images show combined muscles as trained by the exercises on the workout."
msgstr ""
-#: manager/templates/workout/timer.html:428
-msgid "Workout complete!"
+#: manager/templates/workout/template_view.html:89
+msgid "Use this template"
msgstr ""
-#: manager/templates/workout/view.html:68
+#: manager/templates/workout/view.html:72
msgid "Add training day"
msgstr ""
-#: manager/templates/workout/view.html:72
+#: manager/templates/workout/view.html:76
msgid "Show/Hide exercise comments"
msgstr ""
-#: manager/templates/workout/view.html:87
+#: manager/templates/workout/view.html:91
msgid "Add training days"
msgstr ""
-#: manager/templates/workout/view.html:88
+#: manager/templates/workout/view.html:92
msgid "Add workout sets to days"
msgstr ""
-#: manager/templates/workout/view.html:89
-msgid "Set the repetitions for each set"
-msgstr ""
-
#: manager/templates/workout/view.html:93
-msgid "Muscles trained"
-msgstr ""
-
-#: manager/templates/workout/view.html:96
-msgid ""
-"Images show combined muscles as trained by the exercises on the workout."
+msgid "Set the repetitions for each set"
msgstr ""
-#: manager/templates/workout/view.html:117
+#: manager/templates/workout/view.html:121
msgid "Export this workout as a calendar file."
msgstr ""
-#: manager/templates/workout/view.html:184
+#: manager/templates/workout/view.html:188
msgid "Logs"
msgstr ""
-#: manager/templates/workout/view.html:186
+#: manager/templates/workout/view.html:190
msgid "View logs"
msgstr ""
-#: manager/templates/workout/view.html:208 manager/views/schedule_step.py:99
+#: manager/templates/workout/view.html:212 manager/views/schedule_step.py:99
msgid "Edit workout"
msgstr ""
-#: manager/templates/workout/view.html:221
-msgid "Make a copy of this workout"
+#: manager/templates/workout/view.html:225 manager/views/workout.py:300
+msgid "Mark as template"
msgstr ""
#: manager/views/day.py:109
@@ -2778,165 +2935,189 @@ msgstr ""
msgid "Edit log entry for %s"
msgstr ""
-#: manager/views/log.py:109
+#: manager/views/log.py:111
msgid "Delete workout log"
msgstr ""
-#: manager/views/pdf.py:86 manager/views/pdf.py:157
+#: manager/views/pdf.py:87 manager/views/pdf.py:163
#, python-format
msgid "Workout for %s"
msgstr ""
-#: manager/views/schedule.py:277
+#: manager/views/schedule.py:292
msgid "Create schedule"
msgstr ""
-#: manager/views/workout.py:194
+#: manager/views/workout.py:87
+msgid "Your workouts"
+msgstr ""
+
+#: manager/views/workout.py:227
msgid "Copy workout"
msgstr ""
-#: manager/views/workout.py:197
+#: manager/views/workout.py:230
msgid "Copy"
msgstr ""
-#: manager/views/workout_session.py:70
+#: manager/views/workout_session.py:69
#, python-brace-format
msgid "Edit workout impression for {0}"
msgstr ""
-#: manager/views/workout_session.py:114
+#: manager/views/workout_session.py:115
#, python-brace-format
msgid "New workout impression for the {0}"
msgstr ""
-#: 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 ""
-#: nutrition/forms.py:116
+#: measurements/models/measurement.py:69
+msgid "Value"
+msgstr ""
+
+#: nutrition/forms.py:122
msgid "Calculate"
msgstr ""
-#: nutrition/forms.py:185 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:195 nutrition/templates/rate/form.html:76
msgid "Basic caloric intake"
msgstr ""
-#: nutrition/forms.py:186
+#: nutrition/forms.py:196
msgid "Your basic caloric intake as calculated for your data"
msgstr ""
-#: nutrition/forms.py:190
+#: nutrition/forms.py:202
msgid "Additional calories"
msgstr ""
-#: nutrition/forms.py:191
+#: nutrition/forms.py:204
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
msgstr ""
-#: nutrition/forms.py:217 nutrition/models.py:634 nutrition/models.py:814
-#: nutrition/models.py:872 nutrition/templates/log/detail.html:155
+#: nutrition/forms.py:232 nutrition/models/ingredient_weight_unit.py:39
+#: nutrition/models/log.py:81 nutrition/models/meal_item.py:53
+#: nutrition/templates/log/detail.html:155
msgid "Ingredient"
msgstr ""
-#: nutrition/models.py:98
-msgid ""
-"A description of the goal of the plan, e.g. \"Gain mass\" or \"Prepare for "
-"summer\""
-msgstr ""
-
-#: nutrition/models.py:100
-msgid "Use daily calories"
-msgstr ""
-
-#: nutrition/models.py:102
-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."
-msgstr ""
-
-#: nutrition/models.py:274
-msgid "Ingredient Categories"
-msgstr ""
-
-#: nutrition/models.py:325
+#: nutrition/models/ingredient.py:100
msgid "In kcal per 100g"
msgstr ""
-#: nutrition/models.py:330 nutrition/models.py:337 nutrition/models.py:346
-#: nutrition/models.py:353 nutrition/models.py:362 nutrition/models.py:371
-#: nutrition/models.py:380
+#: nutrition/models/ingredient.py:106 nutrition/models/ingredient.py:114
+#: nutrition/models/ingredient.py:124 nutrition/models/ingredient.py:132
+#: nutrition/models/ingredient.py:142 nutrition/models/ingredient.py:152
+#: nutrition/models/ingredient.py:162
msgid "In g per 100g of product"
msgstr ""
-#: nutrition/models.py:345 nutrition/templates/ingredient/view.html:96
+#: nutrition/models/ingredient.py:123
+#: nutrition/templates/ingredient/view.html:96
#: nutrition/templates/log/detail.html:78
-#: nutrition/templates/plan/view.html:233 nutrition/views/plan.py:373
+#: nutrition/templates/plan/view.html:264 nutrition/views/plan.py:406
msgid "Sugar content in carbohydrates"
msgstr ""
-#: nutrition/models.py:361 nutrition/templates/ingredient/view.html:112
+#: nutrition/models/ingredient.py:141
+#: nutrition/templates/ingredient/view.html:112
#: nutrition/templates/log/detail.html:104
-#: nutrition/templates/plan/view.html:245 nutrition/views/plan.py:380
+#: nutrition/templates/plan/view.html:276 nutrition/views/plan.py:420
msgid "Saturated fat content in fats"
msgstr ""
-#: nutrition/models.py:370 nutrition/templates/ingredient/view.html:134
+#: nutrition/models/ingredient.py:151
+#: nutrition/templates/ingredient/view.html:134
#: nutrition/templates/log/detail.html:122
#: nutrition/templates/log/detail.html:178
-#: nutrition/templates/plan/view.html:256 nutrition/views/plan.py:383
+#: nutrition/templates/plan/view.html:287 nutrition/views/plan.py:426
msgid "Fibres"
msgstr ""
-#: nutrition/models.py:379 nutrition/templates/ingredient/view.html:144
+#: nutrition/models/ingredient.py:161
+#: nutrition/templates/ingredient/view.html:144
#: nutrition/templates/log/detail.html:135
#: nutrition/templates/log/detail.html:181
-#: nutrition/templates/plan/view.html:262 nutrition/views/plan.py:385
+#: nutrition/templates/plan/view.html:293 nutrition/views/plan.py:432
msgid "Sodium"
msgstr ""
-#: nutrition/models.py:396
+#: nutrition/models/ingredient.py:183
msgid "Link to product"
msgstr ""
-#: nutrition/models.py:414
+#: nutrition/models/ingredient.py:212
msgid "Brand name of product"
msgstr ""
-#: nutrition/models.py:473
+#: nutrition/models/ingredient.py:272
#, python-brace-format
msgid ""
-"The 123 total energy ({energy}kcal) is not the approximate sum of the energy "
+"The total energy ({energy}kcal) is not the approximate sum of the energy "
"provided by protein, carbohydrates and fat ({energy_calculated}kcal +/-"
-"{approx}%)"
+"{energy_approx}%)"
msgstr ""
-#: nutrition/models.py:552 nutrition/views/ingredient.py:219
+#: nutrition/models/ingredient.py:357 nutrition/views/ingredient.py:225
msgid "Ingredient was successfully added to the general database"
msgstr ""
-#: nutrition/models.py:575
+#: nutrition/models/ingredient.py:381
msgid "New user submitted ingredient"
msgstr ""
-#: nutrition/models.py:576
+#: nutrition/models/ingredient.py:383
#, python-brace-format
msgid "The user {0} submitted a new ingredient \"{1}\"."
msgstr ""
-#: nutrition/models.py:639
+#: nutrition/models/ingredient_category.py:30
+msgid "Ingredient Categories"
+msgstr ""
+
+#: nutrition/models/ingredient_weight_unit.py:49
msgid "Amount in grams"
msgstr ""
-#: nutrition/models.py:644
+#: nutrition/models/ingredient_weight_unit.py:55
msgid "Unit amount, e.g. \"1 Cup\" or \"1/2 spoon\""
msgstr ""
-#: nutrition/models.py:680
+#: nutrition/models/log.py:55
+msgid "Meal"
+msgstr ""
+
+#: nutrition/models/meal.py:61
msgid "Time (approx)"
msgstr ""
+#: nutrition/models/meal.py:68
+msgid ""
+"Give meals a textual description / name such as \"Breakfast\" or \"after "
+"workout\""
+msgstr ""
+
+#: nutrition/models/plan.py:71
+msgid ""
+"A description of the goal of the plan, e.g. \"Gain mass\" or \"Prepare for "
+"summer\""
+msgstr ""
+
+#: nutrition/models/plan.py:76
+msgid "Use daily calories"
+msgstr ""
+
+#: nutrition/models/plan.py:79
+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."
+msgstr ""
+
#: nutrition/templates/bmi/form.html:62
msgid "Results"
msgstr ""
@@ -3049,12 +3230,12 @@ msgstr ""
#: nutrition/templates/ingredient/view.html:71
#: nutrition/templates/log/detail.html:31
-#: nutrition/templates/plan/view.html:200 nutrition/views/plan.py:356
+#: nutrition/templates/plan/view.html:229 nutrition/views/plan.py:376
msgid "Macronutrients"
msgstr ""
#: nutrition/templates/ingredient/view.html:80
-#: nutrition/templates/plan/view.html:64 nutrition/templates/plan/view.html:216
+#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:246
msgid "kJ"
msgstr ""
@@ -3067,7 +3248,7 @@ msgstr ""
#: nutrition/templates/ingredient/view.html:128
#: nutrition/templates/log/detail.html:119
-#: nutrition/templates/plan/view.html:253
+#: nutrition/templates/plan/view.html:284
msgid "Others"
msgstr ""
@@ -3081,7 +3262,7 @@ msgid "This exercise was submitted by <strong>%(username)s</strong>."
msgstr ""
#: nutrition/templates/ingredient/view.html:177
-#: nutrition/templates/units/list.html:44 nutrition/views/unit.py:84
+#: nutrition/templates/units/list.html:44 nutrition/views/unit.py:86
msgid "Add new weight unit"
msgstr ""
@@ -3096,7 +3277,7 @@ msgstr ""
#: nutrition/templates/log/detail.html:7
#: nutrition/templates/log/overview.html:7
-#: nutrition/templates/plan/view.html:271
+#: nutrition/templates/plan/view.html:302
msgid "Nutrition diary"
msgstr ""
@@ -3106,13 +3287,13 @@ msgstr ""
#: nutrition/templates/log/detail.html:33
#: nutrition/templates/log/overview.html:31
-#: nutrition/templates/plan/view.html:278
+#: nutrition/templates/plan/view.html:310
msgid "Logged"
msgstr ""
#: nutrition/templates/log/detail.html:34
#: nutrition/templates/log/overview.html:32
-#: nutrition/templates/plan/view.html:279
+#: nutrition/templates/plan/view.html:311
msgid "Difference"
msgstr ""
@@ -3125,7 +3306,7 @@ msgid "g"
msgstr ""
#: nutrition/templates/log/overview.html:53
-#: nutrition/templates/plan/view.html:300
+#: nutrition/templates/plan/view.html:332
msgid "nothing found"
msgstr ""
@@ -3133,88 +3314,89 @@ msgstr ""
msgid "Your nutrition plans"
msgstr ""
-#: nutrition/templates/plan/view.html:53
-msgid "Meal"
-msgstr ""
-
-#: nutrition/templates/plan/view.html:54
+#: nutrition/templates/plan/view.html:52
msgid "Contents"
msgstr ""
-#: nutrition/templates/plan/view.html:83
+#: nutrition/templates/plan/view.html:79
msgid "Log this meal"
msgstr ""
-#: nutrition/templates/plan/view.html:87
+#: nutrition/templates/plan/view.html:84
msgid "Add ingredient to meal"
msgstr ""
-#: nutrition/templates/plan/view.html:142
+#: nutrition/templates/plan/view.html:152
msgid "No items for this meal."
msgstr ""
-#: nutrition/templates/plan/view.html:162
+#: nutrition/templates/plan/view.html:190
msgid "No meals for this plan."
msgstr ""
-#: nutrition/templates/plan/view.html:173
+#: nutrition/templates/plan/view.html:202
msgid "Log this Plan"
msgstr ""
-#: nutrition/templates/plan/view.html:179
+#: nutrition/templates/plan/view.html:208
msgid "Add a new meal"
msgstr ""
-#: nutrition/templates/plan/view.html:189 nutrition/views/plan.py:354
+#: nutrition/templates/plan/view.html:218 nutrition/views/plan.py:369
msgid "Nutritional data"
msgstr ""
-#: nutrition/templates/plan/view.html:192
+#: nutrition/templates/plan/view.html:221
#, python-format
msgid "Based on the weight entry dated %(date)s (%(weight)s)"
msgstr ""
-#: nutrition/templates/plan/view.html:201 nutrition/views/plan.py:357
+#: nutrition/templates/plan/view.html:230 nutrition/views/plan.py:377
msgid "Total"
msgstr ""
-#: nutrition/templates/plan/view.html:202 nutrition/views/plan.py:358
+#: nutrition/templates/plan/view.html:231 nutrition/views/plan.py:378
msgid "Percent of energy"
msgstr ""
-#: nutrition/templates/plan/view.html:205 nutrition/views/plan.py:359
+#: nutrition/templates/plan/view.html:234 nutrition/views/plan.py:379
msgid "g per body kg"
msgstr ""
-#: nutrition/templates/plan/view.html:207
+#: nutrition/templates/plan/view.html:236
msgid "oz per body lb"
msgstr ""
-#: nutrition/templates/plan/view.html:307
+#: nutrition/templates/plan/view.html:340
msgid "View complete nutrition log"
msgstr ""
-#: nutrition/templates/plan/view.html:349
+#: nutrition/templates/plan/view.html:373
+msgid "Goal"
+msgstr ""
+
+#: nutrition/templates/plan/view.html:384
msgid ""
"You have selected that this nutritional plan has a\n"
-" goal amount of calories. Use the calculator or enter the value yourself."
+" goal amount of calories. Use the calculator or enter the value\n"
+" yourself."
msgstr ""
-#: nutrition/templates/plan/view.html:358
+#: nutrition/templates/plan/view.html:394
msgid ""
"If you find the ingredient list too short, you might want to activate the "
"preference to also show English ingredients."
msgstr ""
-#: nutrition/templates/plan/view.html:383
+#: nutrition/templates/plan/view.html:423
msgid "Edit nutrition plan"
msgstr ""
-#: nutrition/templates/plan/view.html:387
+#: nutrition/templates/plan/view.html:427
msgid "Make a copy of this nutrition plan"
msgstr ""
-#: nutrition/templates/plan/view.html:392
+#: nutrition/templates/plan/view.html:433
msgid "Delete nutrition plan"
msgstr ""
@@ -3286,18 +3468,14 @@ msgid ""
"yourself for some weeks and change the total amount if needed."
msgstr ""
-#: nutrition/views/ingredient.py:175
+#: nutrition/views/ingredient.py:181
msgid "Add a new ingredient"
msgstr ""
-#: nutrition/views/ingredient.py:232
+#: nutrition/views/ingredient.py:238
msgid "Ingredient was successfully marked as rejected"
msgstr ""
-#: nutrition/views/log.py:212 nutrition/views/unit_ingredient.py:134
-msgid "Delete?"
-msgstr ""
-
#: nutrition/views/meal.py:55
msgid "Add new meal"
msgstr ""
@@ -3310,97 +3488,74 @@ msgstr ""
msgid "Edit meal item"
msgstr ""
-#: nutrition/views/plan.py:261
+#: nutrition/views/plan.py:265
msgid "Nutritional plan"
msgstr ""
-#: nutrition/views/plan.py:263
+#: nutrition/views/plan.py:267
#, python-format
msgid "Nutritional plan for %s"
msgstr ""
-#: nutrition/views/plan.py:330
+#: nutrition/views/plan.py:341
msgid "<i>This is an empty plan, what did you expect on the PDF?</i>"
msgstr ""
-#: nutrition/views/unit_ingredient.py:68
+#: nutrition/views/unit_ingredient.py:69
msgid "Add a new weight unit"
msgstr ""
-#: nutrition/views/unit_ingredient.py:103
+#: nutrition/views/unit_ingredient.py:106
msgid "Edit a weight unit to ingredient connection"
msgstr ""
-#: software/templates/contribute.html:9
+#: software/templates/about_us.html:9
msgid ""
-"wger Workout Manager is build by volunteers,\n"
-"the development process is open and freely accessible to anybody "
-"interested.\n"
-"If you are new to the free software world, we recommend to take a\n"
-"look <a href=\"http://schlitt.info/opensource/"
-"blog/0541_10_golden_rules_for_starting_with_open_source.html\">this\n"
-"article</a> which summarizes they way open source projects work very well. "
+"Thank you for using wger! wger is a collaborative open source project, made "
+"by fitness enthusiasts from around the world."
msgstr ""
-#: software/templates/contribute.html:16
-msgid ""
-"Any kind of contribution is appreciated and welcome.\n"
-"Use this opportunity and influence the direction of the\n"
-"project. "
+#: software/templates/about_us.html:18
+msgid "Source code"
msgstr ""
-#: software/templates/contribute.html:23
-msgid "Use the site"
+#: software/templates/about_us.html:20
+msgid "Get the source code of this application and its server on github"
msgstr ""
-#: software/templates/contribute.html:24
-msgid ""
-"Simply use the site and tell your friends\n"
-"how useful it is! ;) . When you find something that you specially liked,\n"
-"could need some improvements or just doesn't work, tell us! This might not "
-"sound\n"
-"like much, but is incredibly important!"
+#: software/templates/about_us.html:25
+msgid "Have a problem or idea?"
msgstr ""
-#: software/templates/contribute.html:31
-msgid "Submit exercises"
+#: software/templates/about_us.html:27
+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/contribute.html:32
-msgid ""
-"Submit those cool exercises that you absolutely\n"
-"love and do every week but are not in the list yet. If you think some "
-"description\n"
-"is too short or some other detail is missing or could be improved, tell!"
+#: software/templates/about_us.html:32
+msgid "Say hi!"
msgstr ""
-#: software/templates/contribute.html:44
-msgid ""
-"Do you want to use wger in your own language?\n"
-"Do you think the current translation could be improved?\n"
-"The translations are easily managed and edited online, if you are "
-"interested,\n"
-"go to the transifex site, request access and we will set everything\n"
-"up. "
+#: software/templates/about_us.html:34
+msgid "If you want to chat with us, hop on the Discord server and get in touch"
msgstr ""
-#: software/templates/contribute.html:54
-msgid "Code"
+#: software/templates/about_us.html:39
+msgid "Translation"
msgstr ""
-#: software/templates/contribute.html:55
+#: software/templates/about_us.html:41
msgid ""
-"Obviously, you are highly encouraged to clone the\n"
-"repo and start hacking! Once you are ready, send a pull request and we\n"
-"will show the world. Take a look at the developer guide for more details\n"
-"on this."
+"This application is translated on weblate. If you also want to help, click "
+"the link and start translating"
msgstr ""
-#: software/templates/contribute.html:67
+#: software/templates/about_us.html:50
msgid "Our goal"
msgstr ""
-#: software/templates/contribute.html:70
+#: software/templates/about_us.html:53
msgid ""
"The goal is to build an awesome\n"
"and flexible fitness manager, along with a comprehensive and complete list "
@@ -3535,117 +3690,45 @@ msgstr ""
msgid "100%% Free <br>and <br>Open Source"
msgstr ""
-#: software/templates/issues.html:6
-msgid "Reporting a problem"
-msgstr ""
-
-#: software/templates/issues.html:10
-msgid ""
-"\n"
-"No software is perfect. For some severe errors, an email will be "
-"automatically sent, but\n"
-"not always, so I depend on you reporting everything that didn't behave as "
-"expected.\n"
-"Please describe in as much detail as you can what you were doing when the "
-"error\n"
-"happened.\n"
-msgstr ""
-
-#: software/templates/issues.html:21
-msgid "report problem to the issue tracker"
-msgstr ""
-
-#: software/templates/issues.html:25
-msgid "Enhancements"
-msgstr ""
-
-#: software/templates/issues.html:27
-msgid ""
-"\n"
-"The issue tracker can also be used to document enhancements to the "
-"software.\n"
-"If you have some suggestions or think a feature is missing, feel\n"
-"free to open a ticket. This can be anything from a slight change to a whole\n"
-"new section of the site. Please keep in mind that not all wishes can be\n"
-"implemented."
-msgstr ""
-
-#: software/templates/issues.html:36
-msgid "report wish to the issue tracker"
-msgstr ""
-
-#: software/templates/issues.html:41
-msgid "No Github account?"
-msgstr ""
-
-#: software/templates/issues.html:42
-msgid ""
-"Filing an issue requires a github account, if you don't\n"
-"have one and don't want to register, you can also send it to\n"
-"<a href=\"https://groups.google.com/group/wger\">the mailing list</a>."
-msgstr ""
-
-#: software/templates/license.html:10
-msgid ""
-"wger Workout Manager is Free/Libre Open Source\n"
-"Software (FLOSS)."
-msgstr ""
-
-#: software/templates/license.html:22
-msgid ""
-"wger Workout Manager is released under the <strong>Affero GNU\n"
-"General Public License (AGPL) Version 3+</strong> and can (under the "
-"conditions\n"
-"of the license) be used, modified and distributed (also with modifications)\n"
-"without restrictions."
-msgstr ""
-
-#: software/templates/license.html:29
-msgid ""
-"A copy the license text is contained in every wger Workout\n"
-"Manager release (LICENSE.txt) and can be read online on the website of\n"
-"<a href='https://www.gnu.org/licenses/agpl-3.0.en.html'>the GNU project</a>."
-msgstr ""
-
-#: utils/generic_views.py:254
+#: utils/generic_views.py:261
msgid "Yes, delete"
msgstr ""
-#: utils/models.py:44
+#: utils/models.py:47
msgid "Author"
msgstr ""
-#: utils/models.py:48
+#: utils/models.py:52
msgid ""
"If you are not the author, enter the name or source here. This is needed for "
"some licenses e.g. the CC-BY-SA."
msgstr ""
-#: utils/models.py:71
+#: utils/models.py:77
msgid "Pending"
msgstr ""
-#: utils/models.py:72
+#: utils/models.py:78
msgid "Accepted"
msgstr ""
-#: utils/models.py:73
+#: utils/models.py:79
msgid "Declined"
msgstr ""
-#: weight/forms.py:51
+#: weight/forms.py:53
msgid "Input"
msgstr ""
-#: weight/forms.py:52
+#: weight/forms.py:54
msgid "Date format"
msgstr ""
-#: weight/management/commands/email-weight-reminder.py:80
+#: weight/management/commands/email-weight-reminder.py:82
msgid "You have to enter your weight"
msgstr ""
-#: weight/models.py:54
+#: weight/models.py:58
msgid "Weight entry"
msgstr ""
@@ -3748,61 +3831,24 @@ msgstr ""
msgid "Re-Submit"
msgstr ""
-#: weight/templates/overview.html:27
-msgid "There is no chart here because there are no weight entries."
-msgstr ""
-
-#: weight/templates/overview.html:28
-msgid "Use link to add one."
-msgstr ""
-
-#: weight/templates/overview.html:34
-msgid "height in cm"
-msgstr ""
-
-#: weight/templates/overview.html:38
-msgid "Last 3 months"
-msgstr ""
-
-#: weight/templates/overview.html:39
-msgid "Last 12 months"
-msgstr ""
-
-#: weight/templates/overview.html:40
-msgid "No filter"
-msgstr ""
-
-#: weight/templates/overview.html:50
-msgctxt "Noun, not verb"
-msgid "Change"
-msgstr ""
-
#: weight/templates/overview.html:51
-msgid "Days"
-msgstr ""
-
-#: weight/templates/overview.html:83
-msgid "Edit weight"
-msgstr ""
-
-#: weight/templates/overview.html:126
msgid "Export as CSV"
msgstr ""
-#: weight/templates/overview.html:130
+#: weight/templates/overview.html:55
msgid "Import from spreadsheet"
msgstr ""
-#: weight/views.py:105
+#: weight/views.py:104
#, python-format
msgid "Edit weight entry for the %s"
msgstr ""
-#: weight/views.py:124
+#: weight/views.py:123
msgid "Successfully deleted."
msgstr ""
-#: weight/views.py:128
+#: weight/views.py:127
#, python-format
msgid "Delete weight entry for the %s"
msgstr ""
diff --git a/wger/locale/hi/LC_MESSAGES/django.po b/wger/locale/hi/LC_MESSAGES/django.po
index 9be29fbca..e0bcfff04 100644
--- a/wger/locale/hi/LC_MESSAGES/django.po
+++ b/wger/locale/hi/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-28 19:01+0100\n"
+"POT-Creation-Date: 2022-02-15 14:51+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
@@ -46,8 +46,8 @@ msgstr ""
msgid "Nothing found."
msgstr ""
-#: config/templates/language/overview.html:16 core/templates/index.html:147
-#: core/templates/index.html:199 manager/templates/calendar/month.html:132
+#: config/templates/language/overview.html:16 core/templates/index.html:137
+#: core/templates/index.html:189 manager/templates/calendar/month.html:132
#: manager/templates/schedule/overview.html:28
#: manager/templates/schedule/view.html:146
#: manager/templates/workout/overview.html:28
@@ -76,7 +76,7 @@ msgstr ""
#: gym/templates/gym/member_list.html:244
#: gym/templates/gym/member_list.html:281
#: mailer/templates/mailer/gym/overview.html:43
-#: weight/templates/overview.html:78
+#: weight/templates/overview.html:61
msgid "Add"
msgstr ""
@@ -110,14 +110,14 @@ msgstr ""
#: config/templates/language/view.html:91 core/templates/user/api_key.html:44
#: core/templates/user/preferences.html:28
-#: exercises/templates/exercise/view.html:273
-#: exercises/templates/exercise/view.html:296 gym/models/contract.py:200
+#: exercises/templates/exercise/view.html:323
+#: exercises/templates/exercise/view.html:346 gym/models/contract.py:200
#: gym/templates/contract/view.html:41 gym/templates/contract/view.html:106
#: gym/templates/gym/member_list.html:248
#: manager/templates/schedule/view.html:281
#: manager/templates/workout/view.html:206
#: nutrition/templates/ingredient/view.html:226
-#: nutrition/templates/plan/view.html:411 weight/templates/overview.html:62
+#: nutrition/templates/plan/view.html:411 weight/templates/overview.html:45
msgid "Options"
msgstr ""
@@ -131,12 +131,12 @@ msgstr ""
#: core/templates/weight_unit/list.html:17
#: exercises/templates/categories/admin-overview.html:16
#: exercises/templates/equipment/admin-overview.html:16
-#: exercises/templates/exercise/view.html:180
-#: exercises/templates/exercise/view.html:301
+#: exercises/templates/exercise/view.html:230
+#: exercises/templates/exercise/view.html:351
#: exercises/templates/muscles/admin-overview.html:16
-#: exercises/views/comments.py:63 gallery/views/images.py:96
-#: gym/templates/admin_notes/list.html:32 gym/templates/contract/list.html:31
-#: gym/templates/contract/view.html:107
+#: exercises/views/comments.py:63 exercises/views/videos.py:69
+#: gallery/views/images.py:96 gym/templates/admin_notes/list.html:32
+#: gym/templates/contract/list.html:31 gym/templates/contract/view.html:107
#: gym/templates/contract_option/list.html:31
#: gym/templates/contract_type/list.html:31 gym/templates/document/list.html:38
#: gym/templates/gym/list.html:19 gym/templates/gym/list.html:43
@@ -161,9 +161,9 @@ msgstr ""
#: exercises/templates/categories/admin-overview.html:17
#: exercises/templates/equipment/admin-overview.html:17
#: exercises/templates/exercise/view.html:68
-#: exercises/templates/exercise/view.html:155
-#: exercises/templates/exercise/view.html:185
-#: exercises/templates/exercise/view.html:306
+#: exercises/templates/exercise/view.html:205
+#: exercises/templates/exercise/view.html:235
+#: exercises/templates/exercise/view.html:356
#: exercises/templates/muscles/admin-overview.html:17
#: gym/templates/admin_notes/list.html:40
#: gym/templates/contract_option/list.html:39
@@ -573,17 +573,17 @@ msgstr ""
msgid "Dashboard"
msgstr ""
-#: core/templates/index.html:31 manager/templates/calendar/month.html:115
+#: core/templates/index.html:21 manager/templates/calendar/month.html:115
msgid "Add log to day"
msgstr ""
-#: core/templates/index.html:35 manager/templates/calendar/month.html:120
+#: core/templates/index.html:25 manager/templates/calendar/month.html:120
msgid ""
"Click to add weight logs to a training\n"
"day in your current workout:"
msgstr ""
-#: core/templates/index.html:43 core/templates/index.html:83
+#: core/templates/index.html:33 core/templates/index.html:73
#: core/templates/misc/fragments/shariff_modal.html:29
#: core/templates/template.html:125 manager/templates/calendar/month.html:138
#: manager/templates/schedule/view.html:246
@@ -593,17 +593,17 @@ msgstr ""
msgid "Close"
msgstr ""
-#: core/templates/index.html:54 core/templates/index.html:203
+#: core/templates/index.html:44 core/templates/index.html:193
msgid "Add new diary entry"
msgstr ""
-#: core/templates/index.html:59
+#: core/templates/index.html:49
msgid ""
"Click to add an entry to your nutrition diary for today. You can either log "
"a meal as you defined it, or entry any number of custom entries."
msgstr ""
-#: core/templates/index.html:67 core/templates/index.html:171
+#: core/templates/index.html:57 core/templates/index.html:161
#: core/templates/user/overview.html:171
#: nutrition/templates/ingredient/view.html:79
#: nutrition/templates/log/detail.html:40
@@ -620,11 +620,11 @@ msgstr ""
msgid "kcal"
msgstr ""
-#: core/templates/index.html:79 nutrition/templates/plan/view.html:350
+#: core/templates/index.html:69 nutrition/templates/plan/view.html:350
msgid "Add custom diary entry"
msgstr ""
-#: core/templates/index.html:94 core/templates/index.html:102
+#: core/templates/index.html:84 core/templates/index.html:92
#: manager/models/day.py:34 manager/models/log.py:56
#: manager/models/session.py:60 manager/models/workout.py:109
#: manager/templates/schedule/view.html:105
@@ -635,35 +635,35 @@ msgstr ""
msgid "Workout"
msgstr ""
-#: core/templates/index.html:128
+#: core/templates/index.html:118
msgid "This workout is part of a schedule:"
msgstr ""
-#: core/templates/index.html:133
+#: core/templates/index.html:123
msgid ""
"The current workout is selected from your active schedule or, if you don't "
"have one, simply by date."
msgstr ""
-#: core/templates/index.html:142 manager/templates/calendar/month.html:188
+#: core/templates/index.html:132 manager/templates/calendar/month.html:188
msgid "Add new log"
msgstr ""
-#: core/templates/index.html:147 core/templates/user/overview.html:58
+#: core/templates/index.html:137 core/templates/user/overview.html:58
#: manager/templates/calendar/month.html:128
#: manager/templates/schedule/view.html:146
#: manager/templates/workout/overview.html:28
msgid "No workouts found."
msgstr ""
-#: core/templates/index.html:157 nutrition/models/log.py:49
+#: core/templates/index.html:147 nutrition/models/log.py:49
#: nutrition/models/meal.py:49 nutrition/models/meal_item.py:47
#: nutrition/models/plan.py:94 nutrition/templates/plan/view.html:11
#: nutrition/templates/plan/view.html:19
msgid "Nutrition plan"
msgstr ""
-#: core/templates/index.html:169 core/templates/user/overview.html:155
+#: core/templates/index.html:159 core/templates/user/overview.html:155
#: nutrition/models/ingredient.py:100
#: nutrition/templates/ingredient/view.html:77
#: nutrition/templates/log/detail.html:39
@@ -674,7 +674,7 @@ msgstr ""
msgid "Energy"
msgstr ""
-#: core/templates/index.html:175 core/templates/user/overview.html:156
+#: core/templates/index.html:165 core/templates/user/overview.html:156
#: nutrition/models/ingredient.py:105
#: nutrition/templates/ingredient/view.html:84
#: nutrition/templates/log/detail.html:52
@@ -684,7 +684,7 @@ msgstr ""
msgid "Protein"
msgstr ""
-#: core/templates/index.html:181 core/templates/user/overview.html:157
+#: core/templates/index.html:171 core/templates/user/overview.html:157
#: nutrition/models/ingredient.py:113
#: nutrition/templates/ingredient/view.html:90
#: nutrition/templates/log/detail.html:65
@@ -694,7 +694,7 @@ msgstr ""
msgid "Carbohydrates"
msgstr ""
-#: core/templates/index.html:187 core/templates/user/overview.html:158
+#: core/templates/index.html:177 core/templates/user/overview.html:158
#: nutrition/models/ingredient.py:131
#: nutrition/templates/ingredient/view.html:106
#: nutrition/templates/log/detail.html:91
@@ -704,11 +704,11 @@ msgstr ""
msgid "Fat"
msgstr ""
-#: core/templates/index.html:199 nutrition/templates/plan/overview.html:22
+#: core/templates/index.html:189 nutrition/templates/plan/overview.html:22
msgid "No nutrition plans."
msgstr ""
-#: core/templates/index.html:213 core/templates/user/overview.html:112
+#: core/templates/index.html:203 core/templates/user/overview.html:112
#: core/templates/user/overview.html:121 manager/forms.py:173
#: manager/helpers.py:89 manager/models/log.py:84 manager/models/setting.py:67
#: manager/templates/log/add.html:54 manager/templates/set/formset.html:12
@@ -717,11 +717,7 @@ msgstr ""
msgid "Weight"
msgstr ""
-#: core/templates/index.html:217
-msgid "Your current weight is: "
-msgstr ""
-
-#: core/templates/index.html:248 core/templates/navigation.html:97
+#: core/templates/index.html:210 core/templates/navigation.html:97
#: weight/views.py:70
msgid "Add weight entry"
msgstr ""
@@ -856,7 +852,7 @@ msgstr ""
msgid "Equipment"
msgstr ""
-#: core/templates/navigation.html:78 exercises/templates/exercise/view.html:208
+#: core/templates/navigation.html:78 exercises/templates/exercise/view.html:258
msgid "Muscles"
msgstr ""
@@ -1190,7 +1186,7 @@ msgstr ""
#: core/templates/user/overview.html:35 core/templates/user/overview.html:154
#: exercises/models/exercise.py:61 exercises/templates/exercise/view.html:88
-#: exercises/views/exercises.py:189 gallery/models/image.py:70
+#: exercises/views/exercises.py:190 gallery/models/image.py:70
#: gym/models/contract.py:57 gym/models/contract.py:107
#: manager/models/day.py:37 manager/models/workout.py:62
#: measurements/models/measurement.py:79 nutrition/models/plan.py:69
@@ -1354,11 +1350,11 @@ msgstr ""
msgid "Change password"
msgstr ""
-#: core/templatetags/wger_extras.py:217
+#: core/templatetags/wger_extras.py:229
msgid "kg"
msgstr ""
-#: core/templatetags/wger_extras.py:219
+#: core/templatetags/wger_extras.py:231
#: nutrition/templates/ingredient/view.html:86
#: nutrition/templates/ingredient/view.html:92
#: nutrition/templates/ingredient/view.html:99
@@ -1370,28 +1366,28 @@ msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr ""
-#: core/templatetags/wger_extras.py:222
+#: core/templatetags/wger_extras.py:234
msgid "lb"
msgstr ""
-#: core/templatetags/wger_extras.py:224
+#: core/templatetags/wger_extras.py:236
msgctxt "weight unit, i.e. ounces"
msgid "oz"
msgstr ""
#: core/views/languages.py:85 exercises/views/categories.py:121
-#: exercises/views/equipment.py:106 exercises/views/exercises.py:422
+#: exercises/views/equipment.py:106 exercises/views/exercises.py:423
#: exercises/views/images.py:128 exercises/views/muscles.py:118
-#: manager/views/schedule.py:311 manager/views/schedule_step.py:129
-#: manager/views/workout.py:268 manager/views/workout_session.py:141
-#: nutrition/views/ingredient.py:144 nutrition/views/plan.py:120
-#: nutrition/views/unit.py:111
+#: exercises/views/videos.py:129 manager/views/schedule.py:311
+#: manager/views/schedule_step.py:129 manager/views/workout.py:268
+#: manager/views/workout_session.py:141 nutrition/views/ingredient.py:144
+#: nutrition/views/plan.py:120 nutrition/views/unit.py:111
msgid "Successfully deleted"
msgstr ""
#: core/views/languages.py:93 core/views/license.py:103
#: core/views/repetition_units.py:115 core/views/weight_units.py:115
-#: exercises/views/categories.py:127 exercises/views/exercises.py:430
+#: exercises/views/categories.py:127 exercises/views/exercises.py:431
#: exercises/views/muscles.py:125 gallery/views/images.py:121
#: gym/views/admin_notes.py:196 gym/views/document.py:206 gym/views/gym.py:486
#: manager/views/schedule.py:318 manager/views/schedule_step.py:139
@@ -1405,7 +1401,7 @@ msgstr ""
#: core/views/languages.py:111 core/views/license.py:84
#: core/views/repetition_units.py:85 core/views/user.py:456
#: core/views/weight_units.py:85 exercises/views/categories.py:97
-#: exercises/views/equipment.py:83 exercises/views/exercises.py:304
+#: exercises/views/equipment.py:83 exercises/views/exercises.py:305
#: exercises/views/muscles.py:105 gym/views/admin_notes.py:160
#: gym/views/config.py:68 gym/views/contract.py:186
#: gym/views/contract_option.py:123 gym/views/contract_type.py:123
@@ -1492,7 +1488,7 @@ msgstr ""
#: exercises/models/base.py:64 exercises/templates/equipment/overview.html:71
#: exercises/templates/exercise/overview.html:76
-#: exercises/templates/exercise/view.html:218
+#: exercises/templates/exercise/view.html:268
#: exercises/templates/muscles/overview.html:73
msgid "Secondary muscles"
msgstr ""
@@ -1506,7 +1502,8 @@ msgid "Exercise Categories"
msgstr ""
#: exercises/models/comment.py:34 exercises/models/image.py:75
-#: manager/forms.py:165 manager/helpers.py:89 manager/models/log.py:51
+#: exercises/models/video.py:82 manager/forms.py:165 manager/helpers.py:89
+#: manager/models/log.py:51
msgid "Exercise"
msgstr ""
@@ -1519,15 +1516,15 @@ msgstr ""
msgid "Language"
msgstr ""
-#: exercises/models/exercise.py:233 exercises/views/exercises.py:460
+#: exercises/models/exercise.py:237 exercises/views/exercises.py:461
msgid "Exercise was successfully added to the general database"
msgstr ""
-#: exercises/models/exercise.py:261
+#: exercises/models/exercise.py:265
msgid "New user submitted exercise"
msgstr ""
-#: exercises/models/exercise.py:263
+#: exercises/models/exercise.py:267
#, python-brace-format
msgid "The user {0} submitted a new exercise \"{1}\"."
msgstr ""
@@ -1588,6 +1585,50 @@ msgstr ""
msgid "In latin, e.g. \"Pectoralis major\""
msgstr ""
+#: exercises/models/video.py:41
+msgid "Maximum file size is 100MB."
+msgstr ""
+
+#: exercises/models/video.py:44 exercises/models/video.py:48
+msgid "File type is not supported"
+msgstr ""
+
+#: exercises/models/video.py:57
+msgid "File is not a valid video"
+msgstr ""
+
+#: exercises/models/video.py:88
+msgid "Main video"
+msgstr ""
+
+#: exercises/models/video.py:94
+msgid "Video"
+msgstr ""
+
+#: exercises/models/video.py:101
+msgid "Size"
+msgstr ""
+
+#: exercises/models/video.py:108 manager/models/schedule_step.py:56
+msgid "Duration"
+msgstr ""
+
+#: exercises/models/video.py:117
+msgid "Width"
+msgstr ""
+
+#: exercises/models/video.py:124
+msgid "Height"
+msgstr ""
+
+#: exercises/models/video.py:131
+msgid "Codec"
+msgstr ""
+
+#: exercises/models/video.py:139
+msgid "Codec, long name"
+msgstr ""
+
#: exercises/templates/equipment/admin-overview.html:4
msgid "Equipment list"
msgstr ""
@@ -1603,7 +1644,7 @@ msgstr ""
#: exercises/templates/equipment/overview.html:69
#: exercises/templates/exercise/overview.html:74
-#: exercises/templates/exercise/view.html:214
+#: exercises/templates/exercise/view.html:264
#: exercises/templates/muscles/overview.html:71
msgid "Main muscles"
msgstr ""
@@ -1738,13 +1779,13 @@ msgid "Please select one of the options below."
msgstr ""
#: exercises/templates/exercise/view.html:60
-#: exercises/templates/exercise/view.html:153
+#: exercises/templates/exercise/view.html:203
#: nutrition/templates/ingredient/view.html:38
msgid "Accept"
msgstr ""
#: exercises/templates/exercise/view.html:64
-#: exercises/templates/exercise/view.html:154
+#: exercises/templates/exercise/view.html:204
#: nutrition/templates/ingredient/view.html:42
msgid "Decline"
msgstr ""
@@ -1757,32 +1798,40 @@ msgstr ""
msgid "Add new image"
msgstr ""
-#: exercises/templates/exercise/view.html:147
+#: exercises/templates/exercise/view.html:148
+msgid "Videos"
+msgstr ""
+
+#: exercises/templates/exercise/view.html:187 exercises/views/videos.py:94
+msgid "Add new video"
+msgstr ""
+
+#: exercises/templates/exercise/view.html:197
msgid "Images pending review"
msgstr ""
-#: exercises/templates/exercise/view.html:168
+#: exercises/templates/exercise/view.html:218
msgid "Comments for this exercise"
msgstr ""
-#: exercises/templates/exercise/view.html:196
+#: exercises/templates/exercise/view.html:246
msgid "Add new comment"
msgstr ""
-#: exercises/templates/exercise/view.html:210
+#: exercises/templates/exercise/view.html:260
msgid "The diagram shows the most used muscles on this exercise"
msgstr ""
-#: exercises/templates/exercise/view.html:251
+#: exercises/templates/exercise/view.html:301
#: manager/templates/workout/log.html:10 manager/templates/workout/log.html:11
msgid "Weight log"
msgstr ""
-#: exercises/templates/exercise/view.html:256
+#: exercises/templates/exercise/view.html:306
msgid "Exercise Variations"
msgstr ""
-#: exercises/templates/exercise/view.html:277
+#: exercises/templates/exercise/view.html:327
msgid "Submit a correction"
msgstr ""
@@ -1817,30 +1866,30 @@ msgstr ""
msgid "Delete equipment?"
msgstr ""
-#: exercises/views/exercises.py:228
+#: exercises/views/exercises.py:229
#, python-format
msgid ""
"%(name_original)s is too similar to existing exercise \"%(exercise_name)s\""
msgstr ""
-#: exercises/views/exercises.py:246
+#: exercises/views/exercises.py:247
msgid "Add exercise"
msgstr ""
-#: exercises/views/exercises.py:366
+#: exercises/views/exercises.py:367
msgid "Thank you. Once the changes are reviewed the exercise will be updated."
msgstr ""
-#: exercises/views/exercises.py:379
+#: exercises/views/exercises.py:380
#, python-brace-format
msgid "Correct {0}"
msgstr ""
-#: exercises/views/exercises.py:421
+#: exercises/views/exercises.py:422
msgid "This will delete the exercise from all workouts."
msgstr ""
-#: exercises/views/exercises.py:473
+#: exercises/views/exercises.py:474
msgid "Exercise was successfully marked as rejected"
msgstr ""
@@ -1852,6 +1901,11 @@ msgstr ""
msgid "Delete exercise image?"
msgstr ""
+#: exercises/views/videos.py:144 nutrition/views/log.py:230
+#: nutrition/views/unit_ingredient.py:139
+msgid "Delete?"
+msgstr ""
+
#: gallery/templates/images/overview.html:62
msgid "Add image"
msgstr ""
@@ -2157,6 +2211,163 @@ msgstr ""
msgid "Edit gym"
msgstr ""
+#: i18n.tpl:2
+msgid "Abs"
+msgstr ""
+
+#: i18n.tpl:3
+msgid "Arms"
+msgstr ""
+
+#: i18n.tpl:4
+msgid "Back"
+msgstr ""
+
+#: i18n.tpl:5
+msgid "Calves"
+msgstr ""
+
+#: i18n.tpl:6
+msgid "Chest"
+msgstr ""
+
+#: i18n.tpl:7
+msgid "Legs"
+msgstr ""
+
+#: i18n.tpl:8
+msgid "Shoulders"
+msgstr ""
+
+#: i18n.tpl:9
+msgid "Barbell"
+msgstr ""
+
+#: i18n.tpl:10
+msgid "Bench"
+msgstr ""
+
+#: i18n.tpl:11
+msgid "Dumbbell"
+msgstr ""
+
+#: i18n.tpl:12
+msgid "Gym mat"
+msgstr ""
+
+#: i18n.tpl:13
+msgid "Incline bench"
+msgstr ""
+
+#: i18n.tpl:14
+msgid "Kettlebell"
+msgstr ""
+
+#: i18n.tpl:15
+msgid "none (bodyweight exercise)"
+msgstr ""
+
+#: i18n.tpl:16
+msgid "Pull-up bar"
+msgstr ""
+
+#: i18n.tpl:17
+msgid "Swiss Ball"
+msgstr ""
+
+#: i18n.tpl:18
+msgid "SZ-Bar"
+msgstr ""
+
+#: i18n.tpl:19
+msgid "Anterior deltoid"
+msgstr ""
+
+#: i18n.tpl:20
+msgid "Biceps brachii"
+msgstr ""
+
+#: i18n.tpl:21
+msgid "Biceps femoris"
+msgstr ""
+
+#: i18n.tpl:22
+msgid "Brachialis"
+msgstr ""
+
+#: i18n.tpl:23
+msgid "Gastrocnemius"
+msgstr ""
+
+#: i18n.tpl:24
+msgid "Gluteus maximus"
+msgstr ""
+
+#: i18n.tpl:25
+msgid "Latissimus dorsi"
+msgstr ""
+
+#: i18n.tpl:26
+msgid "Obliquus externus abdominis"
+msgstr ""
+
+#: i18n.tpl:27
+msgid "Pectoralis major"
+msgstr ""
+
+#: i18n.tpl:28
+msgid "Quadriceps femoris"
+msgstr ""
+
+#: i18n.tpl:29
+msgid "Rectus abdominis"
+msgstr ""
+
+#: i18n.tpl:30
+msgid "Serratus anterior"
+msgstr ""
+
+#: i18n.tpl:31
+msgid "Soleus"
+msgstr ""
+
+#: i18n.tpl:32
+msgid "Trapezius"
+msgstr ""
+
+#: i18n.tpl:33
+msgid "Triceps brachii"
+msgstr ""
+
+#: i18n.tpl:34
+msgid "Kilometers"
+msgstr ""
+
+#: i18n.tpl:35
+msgid "Max Reps"
+msgstr ""
+
+#: i18n.tpl:36
+msgid "Miles"
+msgstr ""
+
+#: i18n.tpl:37
+msgid "Minutes"
+msgstr ""
+
+#: i18n.tpl:38 manager/forms.py:169 manager/models/log.py:71
+#: manager/templates/set/add.html:53
+msgid "Repetitions"
+msgstr ""
+
+#: i18n.tpl:39
+msgid "Seconds"
+msgstr ""
+
+#: i18n.tpl:40
+msgid "Until Failure"
+msgstr ""
+
#: mailer/forms.py:34 mailer/templates/mailer/gym/preview.html:32
msgctxt "As in \"email subject\""
msgid "Subject"
@@ -2233,11 +2444,6 @@ msgstr ""
msgid "Unit"
msgstr ""
-#: manager/forms.py:169 manager/models/log.py:71
-#: manager/templates/set/add.html:53
-msgid "Repetitions"
-msgstr ""
-
#: manager/forms.py:266
msgid "Type"
msgstr ""
@@ -2297,10 +2503,6 @@ msgstr ""
msgid "schedule"
msgstr ""
-#: manager/models/schedule_step.py:56
-msgid "Duration"
-msgstr ""
-
#: manager/models/schedule_step.py:57
msgid "The duration in weeks"
msgstr ""
@@ -3274,10 +3476,6 @@ msgstr ""
msgid "Ingredient was successfully marked as rejected"
msgstr ""
-#: nutrition/views/log.py:230 nutrition/views/unit_ingredient.py:139
-msgid "Delete?"
-msgstr ""
-
#: nutrition/views/meal.py:55
msgid "Add new meal"
msgstr ""
@@ -3633,11 +3831,11 @@ msgstr ""
msgid "Re-Submit"
msgstr ""
-#: weight/templates/overview.html:68
+#: weight/templates/overview.html:51
msgid "Export as CSV"
msgstr ""
-#: weight/templates/overview.html:72
+#: weight/templates/overview.html:55
msgid "Import from spreadsheet"
msgstr ""
diff --git a/wger/locale/hu/LC_MESSAGES/django.po b/wger/locale/hu/LC_MESSAGES/django.po
index 6f1bd9454..e0c93f441 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: 2021-08-17 17:23+0200\n"
+"POT-Creation-Date: 2022-02-15 14:51+0100\n"
"PO-Revision-Date: 2021-04-15 07:27+0000\n"
"Last-Translator: László Mócsy <[email protected]>\n"
"Language-Team: Hungarian <https://hosted.weblate.org/projects/wger/web/hu/>\n"
@@ -48,16 +48,16 @@ msgstr "Nyelvek"
msgid "Nothing found."
msgstr "Nincs találat."
-#: config/templates/language/overview.html:16 core/templates/index.html:147
-#: core/templates/index.html:199 manager/templates/calendar/month.html:132
+#: config/templates/language/overview.html:16 core/templates/index.html:137
+#: core/templates/index.html:189 manager/templates/calendar/month.html:132
#: manager/templates/schedule/overview.html:28
#: manager/templates/schedule/view.html:146
#: manager/templates/workout/overview.html:28
#: nutrition/templates/ingredient/overview.html:45
#: nutrition/templates/plan/overview.html:23
-#: nutrition/templates/plan/view.html:148
-#: nutrition/templates/plan/view.html:151
-#: nutrition/templates/plan/view.html:189
+#: nutrition/templates/plan/view.html:150
+#: nutrition/templates/plan/view.html:153
+#: nutrition/templates/plan/view.html:191
msgid "Add one now."
msgstr "Adj hozzá egyet most."
@@ -78,7 +78,7 @@ msgstr "Adj hozzá egyet most."
#: gym/templates/gym/member_list.html:244
#: gym/templates/gym/member_list.html:281
#: mailer/templates/mailer/gym/overview.html:43
-#: weight/templates/overview.html:78
+#: weight/templates/overview.html:61
msgid "Add"
msgstr "Hozzáadás"
@@ -112,14 +112,14 @@ msgstr "Megmutat"
#: config/templates/language/view.html:91 core/templates/user/api_key.html:44
#: core/templates/user/preferences.html:28
-#: exercises/templates/exercise/view.html:273
-#: exercises/templates/exercise/view.html:296 gym/models/contract.py:200
+#: exercises/templates/exercise/view.html:323
+#: exercises/templates/exercise/view.html:346 gym/models/contract.py:200
#: gym/templates/contract/view.html:41 gym/templates/contract/view.html:106
#: gym/templates/gym/member_list.html:248
#: manager/templates/schedule/view.html:281
#: manager/templates/workout/view.html:206
#: nutrition/templates/ingredient/view.html:226
-#: nutrition/templates/plan/view.html:409 weight/templates/overview.html:62
+#: nutrition/templates/plan/view.html:411 weight/templates/overview.html:45
msgid "Options"
msgstr "Beállítások"
@@ -133,12 +133,12 @@ msgstr "Beállítások"
#: core/templates/weight_unit/list.html:17
#: exercises/templates/categories/admin-overview.html:16
#: exercises/templates/equipment/admin-overview.html:16
-#: exercises/templates/exercise/view.html:180
-#: exercises/templates/exercise/view.html:301
+#: exercises/templates/exercise/view.html:230
+#: exercises/templates/exercise/view.html:351
#: exercises/templates/muscles/admin-overview.html:16
-#: exercises/views/comments.py:63 gallery/views/images.py:96
-#: gym/templates/admin_notes/list.html:32 gym/templates/contract/list.html:31
-#: gym/templates/contract/view.html:107
+#: exercises/views/comments.py:63 exercises/views/videos.py:69
+#: gallery/views/images.py:96 gym/templates/admin_notes/list.html:32
+#: gym/templates/contract/list.html:31 gym/templates/contract/view.html:107
#: gym/templates/contract_option/list.html:31
#: gym/templates/contract_type/list.html:31 gym/templates/document/list.html:38
#: gym/templates/gym/list.html:19 gym/templates/gym/list.html:43
@@ -149,7 +149,7 @@ msgstr "Beállítások"
#: manager/templates/calendar/partial_overview_table.html:18
#: manager/templates/schedule/view.html:121
#: nutrition/templates/ingredient/view.html:198
-#: nutrition/templates/plan/view.html:89 nutrition/templates/plan/view.html:124
+#: nutrition/templates/plan/view.html:89 nutrition/templates/plan/view.html:126
#: nutrition/templates/units/list.html:18
msgid "Edit"
msgstr "Módosítás"
@@ -163,9 +163,9 @@ msgstr "Módosítás"
#: exercises/templates/categories/admin-overview.html:17
#: exercises/templates/equipment/admin-overview.html:17
#: exercises/templates/exercise/view.html:68
-#: exercises/templates/exercise/view.html:155
-#: exercises/templates/exercise/view.html:185
-#: exercises/templates/exercise/view.html:306
+#: exercises/templates/exercise/view.html:205
+#: exercises/templates/exercise/view.html:235
+#: exercises/templates/exercise/view.html:356
#: exercises/templates/muscles/admin-overview.html:17
#: gym/templates/admin_notes/list.html:40
#: gym/templates/contract_option/list.html:39
@@ -178,7 +178,7 @@ msgstr "Módosítás"
#: nutrition/templates/ingredient/view.html:199
#: nutrition/templates/ingredient/view.html:239
#: nutrition/templates/log/detail.html:197
-#: nutrition/templates/plan/view.html:95 nutrition/templates/plan/view.html:130
+#: nutrition/templates/plan/view.html:95 nutrition/templates/plan/view.html:132
#: nutrition/templates/units/list.html:20
msgid "Delete"
msgstr "Törlés"
@@ -304,7 +304,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:265 exercises/models/comment.py:40 manager/models/set.py:60
-#: manager/models/setting.py:99 nutrition/models/log.py:61
+#: manager/models/setting.py:99 nutrition/models/log.py:71
msgid "Comment"
msgstr "Hozzászólás"
@@ -438,7 +438,7 @@ msgstr ""
msgid "Age"
msgstr "Kor"
-#: core/models/profile.py:202 nutrition/forms.py:98
+#: core/models/profile.py:202 nutrition/forms.py:99
msgid "Height (cm)"
msgstr "Magasság (cm)"
@@ -489,7 +489,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:305 nutrition/models/ingredient_weight_unit.py:45
-#: nutrition/models/log.py:80 nutrition/models/meal_item.py:58
+#: nutrition/models/log.py:90 nutrition/models/meal_item.py:58
msgid "Weight unit"
msgstr "Súly egység"
@@ -524,9 +524,9 @@ msgstr "Az órák összegének meg kell egyeznie 24-el"
#: gym/models/user_document.py:87 gym/templates/contract/view.html:50
#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:96
#: gym/views/gym.py:156 manager/models/schedule.py:55
-#: manager/models/workout.py:56 nutrition/models/ingredient.py:96
-#: nutrition/models/ingredient_category.py:26
-#: nutrition/models/weight_unit.py:38
+#: manager/models/workout.py:56 measurements/models/category.py:53
+#: nutrition/models/ingredient.py:96 nutrition/models/ingredient_category.py:26
+#: nutrition/models/meal.py:66 nutrition/models/weight_unit.py:38
#: nutrition/templates/ingredient/pending.html:15
#: nutrition/templates/ingredient/view.html:185
msgid "Name"
@@ -582,17 +582,17 @@ msgstr "Biztosan törölni akarod? Ez a művelet nem visszavonható."
msgid "Dashboard"
msgstr "Irányítópult"
-#: core/templates/index.html:31 manager/templates/calendar/month.html:115
+#: core/templates/index.html:21 manager/templates/calendar/month.html:115
msgid "Add log to day"
msgstr "Új bejegyzés hozzáadása a naphoz"
-#: core/templates/index.html:35 manager/templates/calendar/month.html:120
+#: core/templates/index.html:25 manager/templates/calendar/month.html:120
msgid ""
"Click to add weight logs to a training\n"
"day in your current workout:"
msgstr ""
-#: core/templates/index.html:43 core/templates/index.html:83
+#: core/templates/index.html:33 core/templates/index.html:73
#: core/templates/misc/fragments/shariff_modal.html:29
#: core/templates/template.html:125 manager/templates/calendar/month.html:138
#: manager/templates/schedule/view.html:246
@@ -602,17 +602,17 @@ msgstr ""
msgid "Close"
msgstr "Bezárás"
-#: core/templates/index.html:54 core/templates/index.html:203
+#: core/templates/index.html:44 core/templates/index.html:193
msgid "Add new diary entry"
msgstr ""
-#: core/templates/index.html:59
+#: core/templates/index.html:49
msgid ""
"Click to add an entry to your nutrition diary for today. You can either log "
"a meal as you defined it, or entry any number of custom entries."
msgstr ""
-#: core/templates/index.html:67 core/templates/index.html:171
+#: core/templates/index.html:57 core/templates/index.html:161
#: core/templates/user/overview.html:171
#: nutrition/templates/ingredient/view.html:79
#: nutrition/templates/log/detail.html:40
@@ -621,19 +621,19 @@ msgstr ""
#: nutrition/templates/log/overview.html:7
#: nutrition/templates/log/overview.html:44
#: nutrition/templates/plan/overview.html:17
-#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:242
-#: nutrition/templates/plan/view.html:301
-#: nutrition/templates/plan/view.html:321
-#: nutrition/templates/plan/view.html:363
-#: nutrition/templates/plan/view.html:373
+#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:244
+#: nutrition/templates/plan/view.html:303
+#: nutrition/templates/plan/view.html:323
+#: nutrition/templates/plan/view.html:365
+#: nutrition/templates/plan/view.html:375
msgid "kcal"
msgstr "kcal"
-#: core/templates/index.html:79 nutrition/templates/plan/view.html:348
+#: core/templates/index.html:69 nutrition/templates/plan/view.html:350
msgid "Add custom diary entry"
msgstr ""
-#: core/templates/index.html:94 core/templates/index.html:102
+#: core/templates/index.html:84 core/templates/index.html:92
#: manager/models/day.py:34 manager/models/log.py:56
#: manager/models/session.py:60 manager/models/workout.py:109
#: manager/templates/schedule/view.html:105
@@ -644,80 +644,80 @@ msgstr ""
msgid "Workout"
msgstr "Edzés"
-#: core/templates/index.html:128
+#: core/templates/index.html:118
msgid "This workout is part of a schedule:"
msgstr "Ez az edzés egy ütemterv része:"
-#: core/templates/index.html:133
+#: core/templates/index.html:123
msgid ""
"The current workout is selected from your active schedule or, if you don't "
"have one, simply by date."
msgstr ""
-#: core/templates/index.html:142 manager/templates/calendar/month.html:188
+#: core/templates/index.html:132 manager/templates/calendar/month.html:188
msgid "Add new log"
msgstr "Új naplóbejegyzés hozzáadása"
-#: core/templates/index.html:147 core/templates/user/overview.html:58
+#: core/templates/index.html:137 core/templates/user/overview.html:58
#: manager/templates/calendar/month.html:128
#: manager/templates/schedule/view.html:146
#: manager/templates/workout/overview.html:28
msgid "No workouts found."
msgstr "Nem található edzés."
-#: core/templates/index.html:157 nutrition/models/log.py:48
+#: core/templates/index.html:147 nutrition/models/log.py:49
#: nutrition/models/meal.py:49 nutrition/models/meal_item.py:47
#: nutrition/models/plan.py:94 nutrition/templates/plan/view.html:11
#: nutrition/templates/plan/view.html:19
msgid "Nutrition plan"
msgstr "Táplálkozási terv"
-#: core/templates/index.html:169 core/templates/user/overview.html:155
+#: core/templates/index.html:159 core/templates/user/overview.html:155
#: nutrition/models/ingredient.py:100
#: nutrition/templates/ingredient/view.html:77
#: nutrition/templates/log/detail.html:39
#: nutrition/templates/log/detail.html:156
-#: nutrition/templates/plan/view.html:53 nutrition/templates/plan/view.html:241
-#: nutrition/templates/plan/view.html:358
-#: nutrition/templates/plan/view.html:362 nutrition/views/plan.py:384
+#: nutrition/templates/plan/view.html:53 nutrition/templates/plan/view.html:243
+#: nutrition/templates/plan/view.html:360
+#: nutrition/templates/plan/view.html:364 nutrition/views/plan.py:384
msgid "Energy"
msgstr "Energia"
-#: core/templates/index.html:175 core/templates/user/overview.html:156
+#: core/templates/index.html:165 core/templates/user/overview.html:156
#: nutrition/models/ingredient.py:105
#: nutrition/templates/ingredient/view.html:84
#: nutrition/templates/log/detail.html:52
#: nutrition/templates/log/detail.html:174
-#: nutrition/templates/plan/view.html:54 nutrition/templates/plan/view.html:249
+#: nutrition/templates/plan/view.html:54 nutrition/templates/plan/view.html:251
#: nutrition/views/plan.py:390
msgid "Protein"
msgstr "Fehérje"
-#: core/templates/index.html:181 core/templates/user/overview.html:157
+#: core/templates/index.html:171 core/templates/user/overview.html:157
#: nutrition/models/ingredient.py:113
#: nutrition/templates/ingredient/view.html:90
#: nutrition/templates/log/detail.html:65
#: nutrition/templates/log/detail.html:175
-#: nutrition/templates/plan/view.html:55 nutrition/templates/plan/view.html:255
+#: nutrition/templates/plan/view.html:55 nutrition/templates/plan/view.html:257
#: nutrition/views/plan.py:398
msgid "Carbohydrates"
msgstr "Szénhidrát"
-#: core/templates/index.html:187 core/templates/user/overview.html:158
+#: core/templates/index.html:177 core/templates/user/overview.html:158
#: nutrition/models/ingredient.py:131
#: nutrition/templates/ingredient/view.html:106
#: nutrition/templates/log/detail.html:91
#: nutrition/templates/log/detail.html:176
-#: nutrition/templates/plan/view.html:56 nutrition/templates/plan/view.html:268
+#: nutrition/templates/plan/view.html:56 nutrition/templates/plan/view.html:270
#: nutrition/views/plan.py:412
msgid "Fat"
msgstr "Zsír"
-#: core/templates/index.html:199 nutrition/templates/plan/overview.html:22
+#: core/templates/index.html:189 nutrition/templates/plan/overview.html:22
msgid "No nutrition plans."
msgstr "Nincs táplálkozási terv."
-#: core/templates/index.html:213 core/templates/user/overview.html:112
+#: core/templates/index.html:203 core/templates/user/overview.html:112
#: core/templates/user/overview.html:121 manager/forms.py:173
#: manager/helpers.py:89 manager/models/log.py:84 manager/models/setting.py:67
#: manager/templates/log/add.html:54 manager/templates/set/formset.html:12
@@ -726,11 +726,7 @@ msgstr "Nincs táplálkozási terv."
msgid "Weight"
msgstr "Súly"
-#: core/templates/index.html:217
-msgid "Your current weight is: "
-msgstr "Jelenlegi súlyod:"
-
-#: core/templates/index.html:248 core/templates/navigation.html:97
+#: core/templates/index.html:210 core/templates/navigation.html:97
#: weight/views.py:70
msgid "Add weight entry"
msgstr "Új súly bejegyzés hozzáadása"
@@ -762,7 +758,7 @@ msgstr "Licenc lista"
msgid "Nothing found"
msgstr "Nincs találat"
-#: core/templates/misc/about.html:4 core/templates/template.html:201
+#: core/templates/misc/about.html:4 core/templates/template.html:175
#: core/templates/template_features.html:118
#: core/templates/template_no_context.html:88
msgid "Imprint"
@@ -778,8 +774,8 @@ msgid ""
msgstr ""
#: core/templates/misc/fragments/shariff_modal.html:22
-#: nutrition/templates/plan/view.html:385
-#: nutrition/templates/plan/view.html:394
+#: nutrition/templates/plan/view.html:387
+#: nutrition/templates/plan/view.html:396
msgid "That's done here"
msgstr ""
@@ -869,7 +865,7 @@ msgstr "Ellenőrzésre váró gyakorlatok"
msgid "Equipment"
msgstr "Felszerelés"
-#: core/templates/navigation.html:78 exercises/templates/exercise/view.html:208
+#: core/templates/navigation.html:78 exercises/templates/exercise/view.html:258
msgid "Muscles"
msgstr "Izmok"
@@ -942,7 +938,7 @@ msgstr ""
msgid "Get the code"
msgstr "Szerezd meg a kódot"
-#: core/templates/navigation.html:175 core/templates/template.html:193
+#: core/templates/navigation.html:175 core/templates/template.html:205
#: core/templates/template_features.html:100
msgid "Translate"
msgstr "Lefordítás"
@@ -1093,15 +1089,11 @@ msgstr ""
msgid "Create some demo entries"
msgstr "Készíts egy pár demó bejegyzést"
-#: core/templates/template.html:202 core/templates/template_features.html:122
+#: core/templates/template.html:176 core/templates/template_features.html:122
#: core/templates/template_no_context.html:89 software/templates/tos.html:7
msgid "Terms of service"
msgstr ""
-#: core/templates/template.html:209 core/templates/template.html:210
-msgid "Released under the Affero GPL"
-msgstr "Az Affero GPL licenc alatt lett kiadva"
-
#: core/templates/template_features.html:62 software/templates/features.html:9
#: software/templates/features.html:120
msgid "Features"
@@ -1198,9 +1190,10 @@ msgstr "Edzés hozzáadása"
#: core/templates/user/overview.html:120 core/templates/user/overview.html:153
#: exercises/models/exercise.py:77 gallery/models/image.py:47
#: manager/helpers.py:88 manager/models/log.py:98 manager/models/session.py:67
-#: nutrition/models/ingredient.py:85 nutrition/models/ingredient.py:87
-#: nutrition/models/ingredient.py:190 nutrition/templates/log/overview.html:30
-#: nutrition/templates/plan/view.html:307 weight/models.py:32
+#: measurements/models/measurement.py:64 nutrition/models/ingredient.py:85
+#: nutrition/models/ingredient.py:87 nutrition/models/ingredient.py:190
+#: nutrition/templates/log/overview.html:30
+#: nutrition/templates/plan/view.html:309 weight/models.py:32
#: weight/templates/import_csv_preview.html:13
#: weight/templates/import_csv_preview.html:42 weight/views.py:150
msgid "Date"
@@ -1208,10 +1201,10 @@ msgstr "Dátum"
#: core/templates/user/overview.html:35 core/templates/user/overview.html:154
#: exercises/models/exercise.py:61 exercises/templates/exercise/view.html:88
-#: exercises/views/exercises.py:189 gallery/models/image.py:70
+#: exercises/views/exercises.py:190 gallery/models/image.py:70
#: gym/models/contract.py:57 gym/models/contract.py:107
#: manager/models/day.py:37 manager/models/workout.py:62
-#: nutrition/models/plan.py:69
+#: measurements/models/measurement.py:79 nutrition/models/plan.py:69
msgid "Description"
msgstr "Leírás"
@@ -1372,11 +1365,11 @@ msgstr "Beállítások"
msgid "Change password"
msgstr "Jelszó megváltoztatása"
-#: core/templatetags/wger_extras.py:217
+#: core/templatetags/wger_extras.py:229
msgid "kg"
msgstr "kg"
-#: core/templatetags/wger_extras.py:219
+#: core/templatetags/wger_extras.py:231
#: nutrition/templates/ingredient/view.html:86
#: nutrition/templates/ingredient/view.html:92
#: nutrition/templates/ingredient/view.html:99
@@ -1388,28 +1381,28 @@ msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr "g"
-#: core/templatetags/wger_extras.py:222
+#: core/templatetags/wger_extras.py:234
msgid "lb"
msgstr ""
-#: core/templatetags/wger_extras.py:224
+#: core/templatetags/wger_extras.py:236
msgctxt "weight unit, i.e. ounces"
msgid "oz"
msgstr ""
#: core/views/languages.py:85 exercises/views/categories.py:121
-#: exercises/views/equipment.py:106 exercises/views/exercises.py:422
+#: exercises/views/equipment.py:106 exercises/views/exercises.py:423
#: exercises/views/images.py:128 exercises/views/muscles.py:118
-#: manager/views/schedule.py:311 manager/views/schedule_step.py:129
-#: manager/views/workout.py:268 manager/views/workout_session.py:141
-#: nutrition/views/ingredient.py:144 nutrition/views/plan.py:120
-#: nutrition/views/unit.py:111
+#: exercises/views/videos.py:129 manager/views/schedule.py:311
+#: manager/views/schedule_step.py:129 manager/views/workout.py:268
+#: manager/views/workout_session.py:141 nutrition/views/ingredient.py:144
+#: nutrition/views/plan.py:120 nutrition/views/unit.py:111
msgid "Successfully deleted"
msgstr "Sikeresen törölve"
#: core/views/languages.py:93 core/views/license.py:103
#: core/views/repetition_units.py:115 core/views/weight_units.py:115
-#: exercises/views/categories.py:127 exercises/views/exercises.py:430
+#: exercises/views/categories.py:127 exercises/views/exercises.py:431
#: exercises/views/muscles.py:125 gallery/views/images.py:121
#: gym/views/admin_notes.py:196 gym/views/document.py:206 gym/views/gym.py:486
#: manager/views/schedule.py:318 manager/views/schedule_step.py:139
@@ -1423,7 +1416,7 @@ msgstr "Töröljem {0}?"
#: core/views/languages.py:111 core/views/license.py:84
#: core/views/repetition_units.py:85 core/views/user.py:456
#: core/views/weight_units.py:85 exercises/views/categories.py:97
-#: exercises/views/equipment.py:83 exercises/views/exercises.py:304
+#: exercises/views/equipment.py:83 exercises/views/exercises.py:305
#: exercises/views/muscles.py:105 gym/views/admin_notes.py:160
#: gym/views/config.py:68 gym/views/contract.py:186
#: gym/views/contract_option.py:123 gym/views/contract_type.py:123
@@ -1510,7 +1503,7 @@ msgstr "Elsődleges izmok"
#: exercises/models/base.py:64 exercises/templates/equipment/overview.html:71
#: exercises/templates/exercise/overview.html:76
-#: exercises/templates/exercise/view.html:218
+#: exercises/templates/exercise/view.html:268
#: exercises/templates/muscles/overview.html:73
msgid "Secondary muscles"
msgstr "Másodlagos izmok"
@@ -1523,8 +1516,9 @@ msgstr ""
msgid "Exercise Categories"
msgstr "Gyakorlati kategóriák"
-#: exercises/models/comment.py:34 exercises/models/image.py:62
-#: manager/forms.py:165 manager/helpers.py:89 manager/models/log.py:51
+#: exercises/models/comment.py:34 exercises/models/image.py:75
+#: exercises/models/video.py:82 manager/forms.py:165 manager/helpers.py:89
+#: manager/models/log.py:51
msgid "Exercise"
msgstr "Gyakorlat"
@@ -1537,43 +1531,67 @@ msgstr "Megjegyzés, hogy hogyan kell helyesen csinálni ezt a gyakorlatot."
msgid "Language"
msgstr "Nyelv"
-#: exercises/models/exercise.py:233 exercises/views/exercises.py:460
+#: exercises/models/exercise.py:237 exercises/views/exercises.py:461
msgid "Exercise was successfully added to the general database"
msgstr "Gyakorlat sikeresen hozzáadva az általános adatbázishoz"
-#: exercises/models/exercise.py:261
+#: exercises/models/exercise.py:265
msgid "New user submitted exercise"
msgstr "Új felhasználó által javasolt gyakorlat"
-#: exercises/models/exercise.py:263
+#: exercises/models/exercise.py:267
#, python-brace-format
msgid "The user {0} submitted a new exercise \"{1}\"."
msgstr "A {0} felhasználó javasolt egy új gyakorlatot \"{1}\"."
-#: exercises/models/image.py:68 gallery/models/image.py:56
+#: exercises/models/image.py:59
+msgid "Line"
+msgstr ""
+
+#: exercises/models/image.py:60
+msgid "3D"
+msgstr ""
+
+#: exercises/models/image.py:61
+msgid "Low-poly"
+msgstr ""
+
+#: exercises/models/image.py:62
+msgid "Photo"
+msgstr ""
+
+#: exercises/models/image.py:63
+msgid "Other"
+msgstr ""
+
+#: exercises/models/image.py:81 gallery/models/image.py:56
msgid "Image"
msgstr "Kép"
-#: exercises/models/image.py:69 gallery/models/image.py:57
+#: exercises/models/image.py:82 gallery/models/image.py:57
msgid "Only PNG and JPEG formats are supported"
msgstr "Csak PNG és JPEG formátumok támogatottak"
-#: exercises/models/image.py:75
+#: exercises/models/image.py:88
msgid "Main picture"
msgstr ""
-#: exercises/models/image.py:78
+#: exercises/models/image.py:91
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 "
"by the system."
msgstr ""
-#: exercises/models/image.py:166
+#: exercises/models/image.py:100
+msgid "The art style of your image"
+msgstr ""
+
+#: exercises/models/image.py:185
msgid "New user submitted image"
msgstr "Új felhasználó által javasolt kép"
-#: exercises/models/image.py:167
+#: exercises/models/image.py:186
#, python-brace-format
msgid "The user {0} submitted a new image \"{1}\" for exercise {2}."
msgstr ""
@@ -1583,6 +1601,52 @@ msgstr ""
msgid "In latin, e.g. \"Pectoralis major\""
msgstr "Latinul, pl.: \"Pectoralis major\""
+#: exercises/models/video.py:41
+msgid "Maximum file size is 100MB."
+msgstr ""
+
+#: exercises/models/video.py:44 exercises/models/video.py:48
+msgid "File type is not supported"
+msgstr ""
+
+#: exercises/models/video.py:57
+msgid "File is not a valid video"
+msgstr ""
+
+#: exercises/models/video.py:88
+msgid "Main video"
+msgstr ""
+
+#: exercises/models/video.py:94
+msgid "Video"
+msgstr ""
+
+#: exercises/models/video.py:101
+msgid "Size"
+msgstr ""
+
+#: exercises/models/video.py:108 manager/models/schedule_step.py:56
+msgid "Duration"
+msgstr "Időtartam"
+
+#: exercises/models/video.py:117
+msgid "Width"
+msgstr ""
+
+#: exercises/models/video.py:124
+#, fuzzy
+#| msgid "Weight"
+msgid "Height"
+msgstr "Súly"
+
+#: exercises/models/video.py:131
+msgid "Codec"
+msgstr ""
+
+#: exercises/models/video.py:139
+msgid "Codec, long name"
+msgstr ""
+
#: exercises/templates/equipment/admin-overview.html:4
msgid "Equipment list"
msgstr "Felszerelés lista"
@@ -1598,7 +1662,7 @@ msgstr "Felszerelés áttekintés"
#: exercises/templates/equipment/overview.html:69
#: exercises/templates/exercise/overview.html:74
-#: exercises/templates/exercise/view.html:214
+#: exercises/templates/exercise/view.html:264
#: exercises/templates/muscles/overview.html:71
msgid "Main muscles"
msgstr "Fő izmok"
@@ -1711,7 +1775,8 @@ msgstr "Beküldési dátum"
#: gym/templates/gym/new_user.html:22
#: gym/templates/gym/reset_user_password.html:20 manager/models/log.py:45
#: manager/models/schedule.py:44 manager/models/session.py:49
-#: manager/models/workout.py:89 nutrition/models/plan.py:55
+#: manager/models/workout.py:89 measurements/models/category.py:48
+#: measurements/models/measurement.py:59 nutrition/models/plan.py:55
#: nutrition/templates/ingredient/pending.html:16 weight/models.py:41
msgid "User"
msgstr "Felhasználó"
@@ -1736,13 +1801,13 @@ msgid "Please select one of the options below."
msgstr "Kérlek válassz egyet az alábbi lehetőség közül."
#: exercises/templates/exercise/view.html:60
-#: exercises/templates/exercise/view.html:153
+#: exercises/templates/exercise/view.html:203
#: nutrition/templates/ingredient/view.html:38
msgid "Accept"
msgstr "Elfogad"
#: exercises/templates/exercise/view.html:64
-#: exercises/templates/exercise/view.html:154
+#: exercises/templates/exercise/view.html:204
#: nutrition/templates/ingredient/view.html:42
msgid "Decline"
msgstr "Elutasít"
@@ -1755,32 +1820,42 @@ msgstr "Képek"
msgid "Add new image"
msgstr "Új kép hozzáadása"
-#: exercises/templates/exercise/view.html:147
+#: exercises/templates/exercise/view.html:148
+msgid "Videos"
+msgstr ""
+
+#: exercises/templates/exercise/view.html:187 exercises/views/videos.py:94
+#, fuzzy
+#| msgid "Add new image"
+msgid "Add new video"
+msgstr "Új kép hozzáadása"
+
+#: exercises/templates/exercise/view.html:197
msgid "Images pending review"
msgstr ""
-#: exercises/templates/exercise/view.html:168
+#: exercises/templates/exercise/view.html:218
msgid "Comments for this exercise"
msgstr "Megjegyzések a gyakorlathoz"
-#: exercises/templates/exercise/view.html:196
+#: exercises/templates/exercise/view.html:246
msgid "Add new comment"
msgstr "Új hozzászólás"
-#: exercises/templates/exercise/view.html:210
+#: exercises/templates/exercise/view.html:260
msgid "The diagram shows the most used muscles on this exercise"
msgstr "Az ábra mutatja a gyakorlat által legjobban igénybe vett izmokat "
-#: exercises/templates/exercise/view.html:251
+#: exercises/templates/exercise/view.html:301
#: manager/templates/workout/log.html:10 manager/templates/workout/log.html:11
msgid "Weight log"
msgstr "Testsúly napló"
-#: exercises/templates/exercise/view.html:256
+#: exercises/templates/exercise/view.html:306
msgid "Exercise Variations"
msgstr ""
-#: exercises/templates/exercise/view.html:277
+#: exercises/templates/exercise/view.html:327
msgid "Submit a correction"
msgstr ""
@@ -1815,30 +1890,30 @@ msgstr "Adj hozzá megjegyzést a gyakorlathoz"
msgid "Delete equipment?"
msgstr "Felszerelés törlése?"
-#: exercises/views/exercises.py:228
+#: exercises/views/exercises.py:229
#, python-format
msgid ""
"%(name_original)s is too similar to existing exercise \"%(exercise_name)s\""
msgstr ""
-#: exercises/views/exercises.py:246
+#: exercises/views/exercises.py:247
msgid "Add exercise"
msgstr "Új gyakorlat hozzáadása"
-#: exercises/views/exercises.py:366
+#: exercises/views/exercises.py:367
msgid "Thank you. Once the changes are reviewed the exercise will be updated."
msgstr ""
-#: exercises/views/exercises.py:379
+#: exercises/views/exercises.py:380
#, python-brace-format
msgid "Correct {0}"
msgstr ""
-#: exercises/views/exercises.py:421
+#: exercises/views/exercises.py:422
msgid "This will delete the exercise from all workouts."
msgstr "Ez a művelet törölni fogja az edzésben lévő összes gyakorlatot."
-#: exercises/views/exercises.py:473
+#: exercises/views/exercises.py:474
msgid "Exercise was successfully marked as rejected"
msgstr "A gyakorlat sikeresen meg lett jelölve visszautasítottként."
@@ -1850,6 +1925,11 @@ msgstr "Gyakorlat képének szerkesztése"
msgid "Delete exercise image?"
msgstr "Gyakorlat képének törlése?"
+#: exercises/views/videos.py:144 nutrition/views/log.py:230
+#: nutrition/views/unit_ingredient.py:139
+msgid "Delete?"
+msgstr "Törlés?"
+
#: gallery/templates/images/overview.html:62
#, fuzzy
#| msgid "Add new image"
@@ -1920,8 +2000,8 @@ msgid "Contract type"
msgstr ""
#: gym/models/contract.py:208 gym/templates/contract/view.html:59
-#: manager/templates/log/add.html:52 nutrition/forms.py:58
-#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:92
+#: manager/templates/log/add.html:52 nutrition/forms.py:59
+#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:102
#: nutrition/models/meal_item.py:72
msgid "Amount"
msgstr ""
@@ -2356,6 +2436,7 @@ msgid ""
msgstr ""
#: mailer/templates/mailer/gym/preview.html:22
+#: software/templates/about_us.html:59
msgid "Current version"
msgstr ""
@@ -2390,7 +2471,8 @@ msgstr ""
#: manager/models/log.py:90 manager/models/setting.py:47
#: manager/models/setting.py:78 manager/templates/log/add.html:53
#: manager/templates/log/add.html:55 manager/templates/set/formset.html:11
-#: manager/templates/set/formset.html:13 nutrition/forms.py:62
+#: manager/templates/set/formset.html:13 measurements/models/category.py:58
+#: nutrition/forms.py:63
msgid "Unit"
msgstr ""
@@ -2453,10 +2535,6 @@ msgstr ""
msgid "schedule"
msgstr "ütemterv"
-#: manager/models/schedule_step.py:56
-msgid "Duration"
-msgstr "Időtartam"
-
#: manager/models/schedule_step.py:57
msgid "The duration in weeks"
msgstr "Az időtartam hetekben"
@@ -2713,7 +2791,7 @@ msgstr ""
#: manager/templates/schedule/view.html:290
#: manager/templates/workout/view.html:142
#: manager/templates/workout/view.html:217
-#: nutrition/templates/plan/view.html:415
+#: nutrition/templates/plan/view.html:417
msgid "Download as PDF"
msgstr "PDF letöltése"
@@ -2934,30 +3012,34 @@ msgstr ""
msgid "This will delete all weight logs for this day as well."
msgstr ""
-#: nutrition/forms.py:121
+#: measurements/models/measurement.py:69
+msgid "Value"
+msgstr ""
+
+#: nutrition/forms.py:122
msgid "Calculate"
msgstr ""
-#: nutrition/forms.py:194 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:195 nutrition/templates/rate/form.html:76
msgid "Basic caloric intake"
msgstr ""
-#: nutrition/forms.py:195
+#: nutrition/forms.py:196
msgid "Your basic caloric intake as calculated for your data"
msgstr ""
-#: nutrition/forms.py:201
+#: nutrition/forms.py:202
msgid "Additional calories"
msgstr ""
-#: nutrition/forms.py:203
+#: nutrition/forms.py:204
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
msgstr ""
-#: nutrition/forms.py:231 nutrition/models/ingredient_weight_unit.py:39
-#: nutrition/models/log.py:71 nutrition/models/meal_item.py:53
+#: nutrition/forms.py:232 nutrition/models/ingredient_weight_unit.py:39
+#: nutrition/models/log.py:81 nutrition/models/meal_item.py:53
#: nutrition/templates/log/detail.html:155
msgid "Ingredient"
msgstr ""
@@ -2976,14 +3058,14 @@ msgstr ""
#: nutrition/models/ingredient.py:123
#: nutrition/templates/ingredient/view.html:96
#: nutrition/templates/log/detail.html:78
-#: nutrition/templates/plan/view.html:262 nutrition/views/plan.py:406
+#: nutrition/templates/plan/view.html:264 nutrition/views/plan.py:406
msgid "Sugar content in carbohydrates"
msgstr ""
#: nutrition/models/ingredient.py:141
#: nutrition/templates/ingredient/view.html:112
#: nutrition/templates/log/detail.html:104
-#: nutrition/templates/plan/view.html:274 nutrition/views/plan.py:420
+#: nutrition/templates/plan/view.html:276 nutrition/views/plan.py:420
msgid "Saturated fat content in fats"
msgstr ""
@@ -2991,7 +3073,7 @@ msgstr ""
#: nutrition/templates/ingredient/view.html:134
#: nutrition/templates/log/detail.html:122
#: nutrition/templates/log/detail.html:178
-#: nutrition/templates/plan/view.html:285 nutrition/views/plan.py:426
+#: nutrition/templates/plan/view.html:287 nutrition/views/plan.py:426
msgid "Fibres"
msgstr ""
@@ -2999,7 +3081,7 @@ msgstr ""
#: nutrition/templates/ingredient/view.html:144
#: nutrition/templates/log/detail.html:135
#: nutrition/templates/log/detail.html:181
-#: nutrition/templates/plan/view.html:291 nutrition/views/plan.py:432
+#: nutrition/templates/plan/view.html:293 nutrition/views/plan.py:432
msgid "Sodium"
msgstr ""
@@ -3044,10 +3126,20 @@ msgstr ""
msgid "Unit amount, e.g. \"1 Cup\" or \"1/2 spoon\""
msgstr ""
+#: nutrition/models/log.py:55
+msgid "Meal"
+msgstr ""
+
#: nutrition/models/meal.py:61
msgid "Time (approx)"
msgstr ""
+#: nutrition/models/meal.py:68
+msgid ""
+"Give meals a textual description / name such as \"Breakfast\" or \"after "
+"workout\""
+msgstr ""
+
#: nutrition/models/plan.py:71
msgid ""
"A description of the goal of the plan, e.g. \"Gain mass\" or \"Prepare for "
@@ -3176,12 +3268,12 @@ msgstr ""
#: nutrition/templates/ingredient/view.html:71
#: nutrition/templates/log/detail.html:31
-#: nutrition/templates/plan/view.html:227 nutrition/views/plan.py:376
+#: nutrition/templates/plan/view.html:229 nutrition/views/plan.py:376
msgid "Macronutrients"
msgstr ""
#: nutrition/templates/ingredient/view.html:80
-#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:244
+#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:246
msgid "kJ"
msgstr ""
@@ -3194,7 +3286,7 @@ msgstr ""
#: nutrition/templates/ingredient/view.html:128
#: nutrition/templates/log/detail.html:119
-#: nutrition/templates/plan/view.html:282
+#: nutrition/templates/plan/view.html:284
msgid "Others"
msgstr ""
@@ -3223,7 +3315,7 @@ msgstr ""
#: nutrition/templates/log/detail.html:7
#: nutrition/templates/log/overview.html:7
-#: nutrition/templates/plan/view.html:300
+#: nutrition/templates/plan/view.html:302
msgid "Nutrition diary"
msgstr ""
@@ -3233,13 +3325,13 @@ msgstr ""
#: nutrition/templates/log/detail.html:33
#: nutrition/templates/log/overview.html:31
-#: nutrition/templates/plan/view.html:308
+#: nutrition/templates/plan/view.html:310
msgid "Logged"
msgstr ""
#: nutrition/templates/log/detail.html:34
#: nutrition/templates/log/overview.html:32
-#: nutrition/templates/plan/view.html:309
+#: nutrition/templates/plan/view.html:311
msgid "Difference"
msgstr ""
@@ -3252,7 +3344,7 @@ msgid "g"
msgstr "g"
#: nutrition/templates/log/overview.html:53
-#: nutrition/templates/plan/view.html:330
+#: nutrition/templates/plan/view.html:332
msgid "nothing found"
msgstr ""
@@ -3272,77 +3364,77 @@ msgstr ""
msgid "Add ingredient to meal"
msgstr ""
-#: nutrition/templates/plan/view.html:150
+#: nutrition/templates/plan/view.html:152
msgid "No items for this meal."
msgstr ""
-#: nutrition/templates/plan/view.html:188
+#: nutrition/templates/plan/view.html:190
msgid "No meals for this plan."
msgstr ""
-#: nutrition/templates/plan/view.html:200
+#: nutrition/templates/plan/view.html:202
msgid "Log this Plan"
msgstr ""
-#: nutrition/templates/plan/view.html:206
+#: nutrition/templates/plan/view.html:208
msgid "Add a new meal"
msgstr ""
-#: nutrition/templates/plan/view.html:216 nutrition/views/plan.py:369
+#: nutrition/templates/plan/view.html:218 nutrition/views/plan.py:369
msgid "Nutritional data"
msgstr ""
-#: nutrition/templates/plan/view.html:219
+#: nutrition/templates/plan/view.html:221
#, python-format
msgid "Based on the weight entry dated %(date)s (%(weight)s)"
msgstr ""
-#: nutrition/templates/plan/view.html:228 nutrition/views/plan.py:377
+#: nutrition/templates/plan/view.html:230 nutrition/views/plan.py:377
msgid "Total"
msgstr ""
-#: nutrition/templates/plan/view.html:229 nutrition/views/plan.py:378
+#: nutrition/templates/plan/view.html:231 nutrition/views/plan.py:378
msgid "Percent of energy"
msgstr ""
-#: nutrition/templates/plan/view.html:232 nutrition/views/plan.py:379
+#: nutrition/templates/plan/view.html:234 nutrition/views/plan.py:379
msgid "g per body kg"
msgstr ""
-#: nutrition/templates/plan/view.html:234
+#: nutrition/templates/plan/view.html:236
msgid "oz per body lb"
msgstr ""
-#: nutrition/templates/plan/view.html:338
+#: nutrition/templates/plan/view.html:340
msgid "View complete nutrition log"
msgstr ""
-#: nutrition/templates/plan/view.html:371
+#: nutrition/templates/plan/view.html:373
msgid "Goal"
msgstr "Cél"
-#: nutrition/templates/plan/view.html:382
+#: nutrition/templates/plan/view.html:384
msgid ""
"You have selected that this nutritional plan has a\n"
" goal amount of calories. Use the calculator or enter the value\n"
" yourself."
msgstr ""
-#: nutrition/templates/plan/view.html:392
+#: nutrition/templates/plan/view.html:394
msgid ""
"If you find the ingredient list too short, you might want to activate the "
"preference to also show English ingredients."
msgstr ""
-#: nutrition/templates/plan/view.html:421
+#: nutrition/templates/plan/view.html:423
msgid "Edit nutrition plan"
msgstr ""
-#: nutrition/templates/plan/view.html:425
+#: nutrition/templates/plan/view.html:427
msgid "Make a copy of this nutrition plan"
msgstr ""
-#: nutrition/templates/plan/view.html:431
+#: nutrition/templates/plan/view.html:433
msgid "Delete nutrition plan"
msgstr ""
@@ -3422,10 +3514,6 @@ msgstr ""
msgid "Ingredient was successfully marked as rejected"
msgstr ""
-#: nutrition/views/log.py:229 nutrition/views/unit_ingredient.py:139
-msgid "Delete?"
-msgstr "Törlés?"
-
#: nutrition/views/meal.py:55
msgid "Add new meal"
msgstr ""
@@ -3783,11 +3871,11 @@ msgstr ""
msgid "Re-Submit"
msgstr ""
-#: weight/templates/overview.html:68
+#: weight/templates/overview.html:51
msgid "Export as CSV"
msgstr ""
-#: weight/templates/overview.html:72
+#: weight/templates/overview.html:55
msgid "Import from spreadsheet"
msgstr ""
@@ -3805,6 +3893,12 @@ msgstr ""
msgid "Delete weight entry for the %s"
msgstr ""
+#~ msgid "Your current weight is: "
+#~ msgstr "Jelenlegi súlyod:"
+
+#~ msgid "Released under the Affero GPL"
+#~ msgstr "Az Affero GPL licenc alatt lett kiadva"
+
#~ msgid "GNUPG-Key:"
#~ msgstr "GNUPG-Kulcs:"
diff --git a/wger/locale/it/LC_MESSAGES/django.po b/wger/locale/it/LC_MESSAGES/django.po
index ec565e7da..73ac79227 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: 2021-08-17 17:23+0200\n"
+"POT-Creation-Date: 2022-02-15 14:51+0100\n"
"PO-Revision-Date: 2021-06-18 08:48+0000\n"
"Last-Translator: Roland Geider <[email protected]>\n"
"Language-Team: Italian <https://hosted.weblate.org/projects/wger/web/it/>\n"
@@ -57,16 +57,16 @@ msgstr "Lingue"
msgid "Nothing found."
msgstr "Niente trovato."
-#: config/templates/language/overview.html:16 core/templates/index.html:147
-#: core/templates/index.html:199 manager/templates/calendar/month.html:132
+#: config/templates/language/overview.html:16 core/templates/index.html:137
+#: core/templates/index.html:189 manager/templates/calendar/month.html:132
#: manager/templates/schedule/overview.html:28
#: manager/templates/schedule/view.html:146
#: manager/templates/workout/overview.html:28
#: nutrition/templates/ingredient/overview.html:45
#: nutrition/templates/plan/overview.html:23
-#: nutrition/templates/plan/view.html:148
-#: nutrition/templates/plan/view.html:151
-#: nutrition/templates/plan/view.html:189
+#: nutrition/templates/plan/view.html:150
+#: nutrition/templates/plan/view.html:153
+#: nutrition/templates/plan/view.html:191
msgid "Add one now."
msgstr "Aggiungine uno adesso."
@@ -87,7 +87,7 @@ msgstr "Aggiungine uno adesso."
#: gym/templates/gym/member_list.html:244
#: gym/templates/gym/member_list.html:281
#: mailer/templates/mailer/gym/overview.html:43
-#: weight/templates/overview.html:78
+#: weight/templates/overview.html:61
msgid "Add"
msgstr "Aggiungi"
@@ -127,14 +127,14 @@ msgstr "Mostra"
#: config/templates/language/view.html:91 core/templates/user/api_key.html:44
#: core/templates/user/preferences.html:28
-#: exercises/templates/exercise/view.html:273
-#: exercises/templates/exercise/view.html:296 gym/models/contract.py:200
+#: exercises/templates/exercise/view.html:323
+#: exercises/templates/exercise/view.html:346 gym/models/contract.py:200
#: gym/templates/contract/view.html:41 gym/templates/contract/view.html:106
#: gym/templates/gym/member_list.html:248
#: manager/templates/schedule/view.html:281
#: manager/templates/workout/view.html:206
#: nutrition/templates/ingredient/view.html:226
-#: nutrition/templates/plan/view.html:409 weight/templates/overview.html:62
+#: nutrition/templates/plan/view.html:411 weight/templates/overview.html:45
msgid "Options"
msgstr "Opzioni"
@@ -148,12 +148,12 @@ msgstr "Opzioni"
#: core/templates/weight_unit/list.html:17
#: exercises/templates/categories/admin-overview.html:16
#: exercises/templates/equipment/admin-overview.html:16
-#: exercises/templates/exercise/view.html:180
-#: exercises/templates/exercise/view.html:301
+#: exercises/templates/exercise/view.html:230
+#: exercises/templates/exercise/view.html:351
#: exercises/templates/muscles/admin-overview.html:16
-#: exercises/views/comments.py:63 gallery/views/images.py:96
-#: gym/templates/admin_notes/list.html:32 gym/templates/contract/list.html:31
-#: gym/templates/contract/view.html:107
+#: exercises/views/comments.py:63 exercises/views/videos.py:69
+#: gallery/views/images.py:96 gym/templates/admin_notes/list.html:32
+#: gym/templates/contract/list.html:31 gym/templates/contract/view.html:107
#: gym/templates/contract_option/list.html:31
#: gym/templates/contract_type/list.html:31 gym/templates/document/list.html:38
#: gym/templates/gym/list.html:19 gym/templates/gym/list.html:43
@@ -164,7 +164,7 @@ msgstr "Opzioni"
#: manager/templates/calendar/partial_overview_table.html:18
#: manager/templates/schedule/view.html:121
#: nutrition/templates/ingredient/view.html:198
-#: nutrition/templates/plan/view.html:89 nutrition/templates/plan/view.html:124
+#: nutrition/templates/plan/view.html:89 nutrition/templates/plan/view.html:126
#: nutrition/templates/units/list.html:18
msgid "Edit"
msgstr "Modifica"
@@ -178,9 +178,9 @@ msgstr "Modifica"
#: exercises/templates/categories/admin-overview.html:17
#: exercises/templates/equipment/admin-overview.html:17
#: exercises/templates/exercise/view.html:68
-#: exercises/templates/exercise/view.html:155
-#: exercises/templates/exercise/view.html:185
-#: exercises/templates/exercise/view.html:306
+#: exercises/templates/exercise/view.html:205
+#: exercises/templates/exercise/view.html:235
+#: exercises/templates/exercise/view.html:356
#: exercises/templates/muscles/admin-overview.html:17
#: gym/templates/admin_notes/list.html:40
#: gym/templates/contract_option/list.html:39
@@ -193,7 +193,7 @@ msgstr "Modifica"
#: nutrition/templates/ingredient/view.html:199
#: nutrition/templates/ingredient/view.html:239
#: nutrition/templates/log/detail.html:197
-#: nutrition/templates/plan/view.html:95 nutrition/templates/plan/view.html:130
+#: nutrition/templates/plan/view.html:95 nutrition/templates/plan/view.html:132
#: nutrition/templates/units/list.html:20
msgid "Delete"
msgstr "Elimina"
@@ -321,7 +321,7 @@ msgid "Some way of answering you (e-mail, etc.)"
msgstr "Un modo per contattarti (e-mail, ecc.)"
#: core/forms.py:265 exercises/models/comment.py:40 manager/models/set.py:60
-#: manager/models/setting.py:99 nutrition/models/log.py:61
+#: manager/models/setting.py:99 nutrition/models/log.py:71
msgid "Comment"
msgstr "Commento"
@@ -468,7 +468,7 @@ msgstr ""
msgid "Age"
msgstr "Età"
-#: core/models/profile.py:202 nutrition/forms.py:98
+#: core/models/profile.py:202 nutrition/forms.py:99
msgid "Height (cm)"
msgstr "Altezza (cm)"
@@ -519,7 +519,7 @@ msgid "Total caloric intake, including e.g. any surplus"
msgstr "Totale calorico, incluso es. qualsiasi eccesso calorico"
#: core/models/profile.py:305 nutrition/models/ingredient_weight_unit.py:45
-#: nutrition/models/log.py:80 nutrition/models/meal_item.py:58
+#: nutrition/models/log.py:90 nutrition/models/meal_item.py:58
msgid "Weight unit"
msgstr "Unità"
@@ -559,9 +559,9 @@ msgstr "La somma di tutte le ore deve essere 24"
#: gym/models/user_document.py:87 gym/templates/contract/view.html:50
#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:96
#: gym/views/gym.py:156 manager/models/schedule.py:55
-#: manager/models/workout.py:56 nutrition/models/ingredient.py:96
-#: nutrition/models/ingredient_category.py:26
-#: nutrition/models/weight_unit.py:38
+#: manager/models/workout.py:56 measurements/models/category.py:53
+#: nutrition/models/ingredient.py:96 nutrition/models/ingredient_category.py:26
+#: nutrition/models/meal.py:66 nutrition/models/weight_unit.py:38
#: nutrition/templates/ingredient/pending.html:15
#: nutrition/templates/ingredient/view.html:185
msgid "Name"
@@ -621,11 +621,11 @@ msgstr "Sei sicuro/a di volerlo eliminare? Questa azione sarà permanente."
msgid "Dashboard"
msgstr "Pagina principale"
-#: core/templates/index.html:31 manager/templates/calendar/month.html:115
+#: core/templates/index.html:21 manager/templates/calendar/month.html:115
msgid "Add log to day"
msgstr "Aggiungi registro al giorno"
-#: core/templates/index.html:35 manager/templates/calendar/month.html:120
+#: core/templates/index.html:25 manager/templates/calendar/month.html:120
msgid ""
"Click to add weight logs to a training\n"
"day in your current workout:"
@@ -633,7 +633,7 @@ msgstr ""
"Fare clic per aggiungere i registri del peso a un giorno di\n"
"allenamento nel tuo allenamento attuale:"
-#: core/templates/index.html:43 core/templates/index.html:83
+#: core/templates/index.html:33 core/templates/index.html:73
#: core/templates/misc/fragments/shariff_modal.html:29
#: core/templates/template.html:125 manager/templates/calendar/month.html:138
#: manager/templates/schedule/view.html:246
@@ -643,11 +643,11 @@ msgstr ""
msgid "Close"
msgstr "Chiudi"
-#: core/templates/index.html:54 core/templates/index.html:203
+#: core/templates/index.html:44 core/templates/index.html:193
msgid "Add new diary entry"
msgstr "Aggiungi nuovo record nel diario"
-#: core/templates/index.html:59
+#: core/templates/index.html:49
msgid ""
"Click to add an entry to your nutrition diary for today. You can either log "
"a meal as you defined it, or entry any number of custom entries."
@@ -656,7 +656,7 @@ msgstr ""
"inserire un pasto predefinito, o inserire qualsiasi numero di informazioni "
"personalizzate."
-#: core/templates/index.html:67 core/templates/index.html:171
+#: core/templates/index.html:57 core/templates/index.html:161
#: core/templates/user/overview.html:171
#: nutrition/templates/ingredient/view.html:79
#: nutrition/templates/log/detail.html:40
@@ -665,19 +665,19 @@ msgstr ""
#: nutrition/templates/log/overview.html:7
#: nutrition/templates/log/overview.html:44
#: nutrition/templates/plan/overview.html:17
-#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:242
-#: nutrition/templates/plan/view.html:301
-#: nutrition/templates/plan/view.html:321
-#: nutrition/templates/plan/view.html:363
-#: nutrition/templates/plan/view.html:373
+#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:244
+#: nutrition/templates/plan/view.html:303
+#: nutrition/templates/plan/view.html:323
+#: nutrition/templates/plan/view.html:365
+#: nutrition/templates/plan/view.html:375
msgid "kcal"
msgstr "kcal"
-#: core/templates/index.html:79 nutrition/templates/plan/view.html:348
+#: core/templates/index.html:69 nutrition/templates/plan/view.html:350
msgid "Add custom diary entry"
msgstr "Aggiungi record personalizzato"
-#: core/templates/index.html:94 core/templates/index.html:102
+#: core/templates/index.html:84 core/templates/index.html:92
#: manager/models/day.py:34 manager/models/log.py:56
#: manager/models/session.py:60 manager/models/workout.py:109
#: manager/templates/schedule/view.html:105
@@ -688,11 +688,11 @@ msgstr "Aggiungi record personalizzato"
msgid "Workout"
msgstr "Allenamento"
-#: core/templates/index.html:128
+#: core/templates/index.html:118
msgid "This workout is part of a schedule:"
msgstr "Questo allenamento fa parte del programma:"
-#: core/templates/index.html:133
+#: core/templates/index.html:123
msgid ""
"The current workout is selected from your active schedule or, if you don't "
"have one, simply by date."
@@ -700,70 +700,70 @@ msgstr ""
"L'allenamento è selezionato dalla pianificazione attiva. Oppure, se non ne "
"hai una, dalla data."
-#: core/templates/index.html:142 manager/templates/calendar/month.html:188
+#: core/templates/index.html:132 manager/templates/calendar/month.html:188
msgid "Add new log"
msgstr "Aggiorna diario di allenamento"
-#: core/templates/index.html:147 core/templates/user/overview.html:58
+#: core/templates/index.html:137 core/templates/user/overview.html:58
#: manager/templates/calendar/month.html:128
#: manager/templates/schedule/view.html:146
#: manager/templates/workout/overview.html:28
msgid "No workouts found."
msgstr "Nessun allenamento trovato."
-#: core/templates/index.html:157 nutrition/models/log.py:48
+#: core/templates/index.html:147 nutrition/models/log.py:49
#: nutrition/models/meal.py:49 nutrition/models/meal_item.py:47
#: nutrition/models/plan.py:94 nutrition/templates/plan/view.html:11
#: nutrition/templates/plan/view.html:19
msgid "Nutrition plan"
msgstr "Piano nutrizionale"
-#: core/templates/index.html:169 core/templates/user/overview.html:155
+#: core/templates/index.html:159 core/templates/user/overview.html:155
#: nutrition/models/ingredient.py:100
#: nutrition/templates/ingredient/view.html:77
#: nutrition/templates/log/detail.html:39
#: nutrition/templates/log/detail.html:156
-#: nutrition/templates/plan/view.html:53 nutrition/templates/plan/view.html:241
-#: nutrition/templates/plan/view.html:358
-#: nutrition/templates/plan/view.html:362 nutrition/views/plan.py:384
+#: nutrition/templates/plan/view.html:53 nutrition/templates/plan/view.html:243
+#: nutrition/templates/plan/view.html:360
+#: nutrition/templates/plan/view.html:364 nutrition/views/plan.py:384
msgid "Energy"
msgstr "Energie"
-#: core/templates/index.html:175 core/templates/user/overview.html:156
+#: core/templates/index.html:165 core/templates/user/overview.html:156
#: nutrition/models/ingredient.py:105
#: nutrition/templates/ingredient/view.html:84
#: nutrition/templates/log/detail.html:52
#: nutrition/templates/log/detail.html:174
-#: nutrition/templates/plan/view.html:54 nutrition/templates/plan/view.html:249
+#: nutrition/templates/plan/view.html:54 nutrition/templates/plan/view.html:251
#: nutrition/views/plan.py:390
msgid "Protein"
msgstr "Proteine"
-#: core/templates/index.html:181 core/templates/user/overview.html:157
+#: core/templates/index.html:171 core/templates/user/overview.html:157
#: nutrition/models/ingredient.py:113
#: nutrition/templates/ingredient/view.html:90
#: nutrition/templates/log/detail.html:65
#: nutrition/templates/log/detail.html:175
-#: nutrition/templates/plan/view.html:55 nutrition/templates/plan/view.html:255
+#: nutrition/templates/plan/view.html:55 nutrition/templates/plan/view.html:257
#: nutrition/views/plan.py:398
msgid "Carbohydrates"
msgstr "Carboidrati"
-#: core/templates/index.html:187 core/templates/user/overview.html:158
+#: core/templates/index.html:177 core/templates/user/overview.html:158
#: nutrition/models/ingredient.py:131
#: nutrition/templates/ingredient/view.html:106
#: nutrition/templates/log/detail.html:91
#: nutrition/templates/log/detail.html:176
-#: nutrition/templates/plan/view.html:56 nutrition/templates/plan/view.html:268
+#: nutrition/templates/plan/view.html:56 nutrition/templates/plan/view.html:270
#: nutrition/views/plan.py:412
msgid "Fat"
msgstr "Grassi"
-#: core/templates/index.html:199 nutrition/templates/plan/overview.html:22
+#: core/templates/index.html:189 nutrition/templates/plan/overview.html:22
msgid "No nutrition plans."
msgstr "Nessun piano nutrizionale trovato."
-#: core/templates/index.html:213 core/templates/user/overview.html:112
+#: core/templates/index.html:203 core/templates/user/overview.html:112
#: core/templates/user/overview.html:121 manager/forms.py:173
#: manager/helpers.py:89 manager/models/log.py:84 manager/models/setting.py:67
#: manager/templates/log/add.html:54 manager/templates/set/formset.html:12
@@ -772,11 +772,7 @@ msgstr "Nessun piano nutrizionale trovato."
msgid "Weight"
msgstr "Peso"
-#: core/templates/index.html:217
-msgid "Your current weight is: "
-msgstr "Il tuo peso corporeo è: "
-
-#: core/templates/index.html:248 core/templates/navigation.html:97
+#: core/templates/index.html:210 core/templates/navigation.html:97
#: weight/views.py:70
msgid "Add weight entry"
msgstr "Aggiungi peso corporeo"
@@ -808,7 +804,7 @@ msgstr "Elenco delle licenze"
msgid "Nothing found"
msgstr "Trovato niente"
-#: core/templates/misc/about.html:4 core/templates/template.html:201
+#: core/templates/misc/about.html:4 core/templates/template.html:175
#: core/templates/template_features.html:118
#: core/templates/template_no_context.html:88
msgid "Imprint"
@@ -826,8 +822,8 @@ msgstr ""
"l'accesso esterno."
#: core/templates/misc/fragments/shariff_modal.html:22
-#: nutrition/templates/plan/view.html:385
-#: nutrition/templates/plan/view.html:394
+#: nutrition/templates/plan/view.html:387
+#: nutrition/templates/plan/view.html:396
msgid "That's done here"
msgstr "Fallo qui"
@@ -919,7 +915,7 @@ msgstr "Esercizi in attesa di revisione"
msgid "Equipment"
msgstr "Attrezzatura"
-#: core/templates/navigation.html:78 exercises/templates/exercise/view.html:208
+#: core/templates/navigation.html:78 exercises/templates/exercise/view.html:258
msgid "Muscles"
msgstr "Muscoli"
@@ -992,7 +988,7 @@ msgstr "Documentazione dello sviluppatore"
msgid "Get the code"
msgstr "Ottieni il codice"
-#: core/templates/navigation.html:175 core/templates/template.html:193
+#: core/templates/navigation.html:175 core/templates/template.html:205
#: core/templates/template_features.html:100
msgid "Translate"
msgstr "Traduci"
@@ -1148,15 +1144,11 @@ msgstr ""
msgid "Create some demo entries"
msgstr "Crea alcune voci demo"
-#: core/templates/template.html:202 core/templates/template_features.html:122
+#: core/templates/template.html:176 core/templates/template_features.html:122
#: core/templates/template_no_context.html:89 software/templates/tos.html:7
msgid "Terms of service"
msgstr "Termini di servizio"
-#: core/templates/template.html:209 core/templates/template.html:210
-msgid "Released under the Affero GPL"
-msgstr "Rilasciato sotto la GPL Affero"
-
#: core/templates/template_features.html:62 software/templates/features.html:9
#: software/templates/features.html:120
msgid "Features"
@@ -1263,9 +1255,10 @@ msgstr "Aggiungi allenamento"
#: core/templates/user/overview.html:120 core/templates/user/overview.html:153
#: exercises/models/exercise.py:77 gallery/models/image.py:47
#: manager/helpers.py:88 manager/models/log.py:98 manager/models/session.py:67
-#: nutrition/models/ingredient.py:85 nutrition/models/ingredient.py:87
-#: nutrition/models/ingredient.py:190 nutrition/templates/log/overview.html:30
-#: nutrition/templates/plan/view.html:307 weight/models.py:32
+#: measurements/models/measurement.py:64 nutrition/models/ingredient.py:85
+#: nutrition/models/ingredient.py:87 nutrition/models/ingredient.py:190
+#: nutrition/templates/log/overview.html:30
+#: nutrition/templates/plan/view.html:309 weight/models.py:32
#: weight/templates/import_csv_preview.html:13
#: weight/templates/import_csv_preview.html:42 weight/views.py:150
msgid "Date"
@@ -1273,10 +1266,10 @@ msgstr "Data"
#: core/templates/user/overview.html:35 core/templates/user/overview.html:154
#: exercises/models/exercise.py:61 exercises/templates/exercise/view.html:88
-#: exercises/views/exercises.py:189 gallery/models/image.py:70
+#: exercises/views/exercises.py:190 gallery/models/image.py:70
#: gym/models/contract.py:57 gym/models/contract.py:107
#: manager/models/day.py:37 manager/models/workout.py:62
-#: nutrition/models/plan.py:69
+#: measurements/models/measurement.py:79 nutrition/models/plan.py:69
msgid "Description"
msgstr "Descrizione"
@@ -1437,11 +1430,11 @@ msgstr "Preferenze"
msgid "Change password"
msgstr "Cambia la password"
-#: core/templatetags/wger_extras.py:217
+#: core/templatetags/wger_extras.py:229
msgid "kg"
msgstr "kg"
-#: core/templatetags/wger_extras.py:219
+#: core/templatetags/wger_extras.py:231
#: nutrition/templates/ingredient/view.html:86
#: nutrition/templates/ingredient/view.html:92
#: nutrition/templates/ingredient/view.html:99
@@ -1453,28 +1446,28 @@ msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr "g"
-#: core/templatetags/wger_extras.py:222
+#: core/templatetags/wger_extras.py:234
msgid "lb"
msgstr "lb"
-#: core/templatetags/wger_extras.py:224
+#: core/templatetags/wger_extras.py:236
msgctxt "weight unit, i.e. ounces"
msgid "oz"
msgstr "oz"
#: core/views/languages.py:85 exercises/views/categories.py:121
-#: exercises/views/equipment.py:106 exercises/views/exercises.py:422
+#: exercises/views/equipment.py:106 exercises/views/exercises.py:423
#: exercises/views/images.py:128 exercises/views/muscles.py:118
-#: manager/views/schedule.py:311 manager/views/schedule_step.py:129
-#: manager/views/workout.py:268 manager/views/workout_session.py:141
-#: nutrition/views/ingredient.py:144 nutrition/views/plan.py:120
-#: nutrition/views/unit.py:111
+#: exercises/views/videos.py:129 manager/views/schedule.py:311
+#: manager/views/schedule_step.py:129 manager/views/workout.py:268
+#: manager/views/workout_session.py:141 nutrition/views/ingredient.py:144
+#: nutrition/views/plan.py:120 nutrition/views/unit.py:111
msgid "Successfully deleted"
msgstr "Eliminato con successo"
#: core/views/languages.py:93 core/views/license.py:103
#: core/views/repetition_units.py:115 core/views/weight_units.py:115
-#: exercises/views/categories.py:127 exercises/views/exercises.py:430
+#: exercises/views/categories.py:127 exercises/views/exercises.py:431
#: exercises/views/muscles.py:125 gallery/views/images.py:121
#: gym/views/admin_notes.py:196 gym/views/document.py:206 gym/views/gym.py:486
#: manager/views/schedule.py:318 manager/views/schedule_step.py:139
@@ -1488,7 +1481,7 @@ msgstr "Eliminare {0}?"
#: core/views/languages.py:111 core/views/license.py:84
#: core/views/repetition_units.py:85 core/views/user.py:456
#: core/views/weight_units.py:85 exercises/views/categories.py:97
-#: exercises/views/equipment.py:83 exercises/views/exercises.py:304
+#: exercises/views/equipment.py:83 exercises/views/exercises.py:305
#: exercises/views/muscles.py:105 gym/views/admin_notes.py:160
#: gym/views/config.py:68 gym/views/contract.py:186
#: gym/views/contract_option.py:123 gym/views/contract_type.py:123
@@ -1579,7 +1572,7 @@ msgstr "Muscoli primari"
#: exercises/models/base.py:64 exercises/templates/equipment/overview.html:71
#: exercises/templates/exercise/overview.html:76
-#: exercises/templates/exercise/view.html:218
+#: exercises/templates/exercise/view.html:268
#: exercises/templates/muscles/overview.html:73
msgid "Secondary muscles"
msgstr "Muscoli secondari"
@@ -1592,8 +1585,9 @@ msgstr "Variazioni"
msgid "Exercise Categories"
msgstr "Categorie esercizi"
-#: exercises/models/comment.py:34 exercises/models/image.py:62
-#: manager/forms.py:165 manager/helpers.py:89 manager/models/log.py:51
+#: exercises/models/comment.py:34 exercises/models/image.py:75
+#: exercises/models/video.py:82 manager/forms.py:165 manager/helpers.py:89
+#: manager/models/log.py:51
msgid "Exercise"
msgstr "Esercizio"
@@ -1606,32 +1600,54 @@ msgstr "Un commento su come eseguire correttamente l'esercizio."
msgid "Language"
msgstr "Lingua"
-#: exercises/models/exercise.py:233 exercises/views/exercises.py:460
+#: exercises/models/exercise.py:237 exercises/views/exercises.py:461
msgid "Exercise was successfully added to the general database"
msgstr "L'esercizio è stato aggiunto con successo al database generale"
-#: exercises/models/exercise.py:261
+#: exercises/models/exercise.py:265
msgid "New user submitted exercise"
msgstr "Un nuovo utente ha inserito un esercizio"
-#: exercises/models/exercise.py:263
+#: exercises/models/exercise.py:267
#, python-brace-format
msgid "The user {0} submitted a new exercise \"{1}\"."
msgstr "L'utente {0} ha inserito un nuovo esercizio «{1}»."
-#: exercises/models/image.py:68 gallery/models/image.py:56
+#: exercises/models/image.py:59
+msgid "Line"
+msgstr ""
+
+#: exercises/models/image.py:60
+msgid "3D"
+msgstr ""
+
+#: exercises/models/image.py:61
+msgid "Low-poly"
+msgstr ""
+
+#: exercises/models/image.py:62
+msgid "Photo"
+msgstr ""
+
+#: exercises/models/image.py:63
+#, fuzzy
+#| msgid "Others"
+msgid "Other"
+msgstr "Altri"
+
+#: exercises/models/image.py:81 gallery/models/image.py:56
msgid "Image"
msgstr "Immagine"
-#: exercises/models/image.py:69 gallery/models/image.py:57
+#: exercises/models/image.py:82 gallery/models/image.py:57
msgid "Only PNG and JPEG formats are supported"
msgstr "Sono supportati solo i formati PNG e JPEG"
-#: exercises/models/image.py:75
+#: exercises/models/image.py:88
msgid "Main picture"
msgstr "Immagine principale"
-#: exercises/models/image.py:78
+#: exercises/models/image.py:91
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 "
@@ -1641,11 +1657,15 @@ msgstr ""
"l'esercizio (verrà mostrata ad es. Nella ricerca). La prima immagine viene "
"automaticamente contrassegnata dal sistema."
-#: exercises/models/image.py:166
+#: exercises/models/image.py:100
+msgid "The art style of your image"
+msgstr ""
+
+#: exercises/models/image.py:185
msgid "New user submitted image"
msgstr "Nuovo utente immagine inviata"
-#: exercises/models/image.py:167
+#: exercises/models/image.py:186
#, python-brace-format
msgid "The user {0} submitted a new image \"{1}\" for exercise {2}."
msgstr "L'utente {0} ha inviato una nuova immagine «{1}» per l'esercizio {2}."
@@ -1654,6 +1674,58 @@ msgstr "L'utente {0} ha inviato una nuova immagine «{1}» per l'esercizio {2}."
msgid "In latin, e.g. \"Pectoralis major\""
msgstr "In latino es. «Pectoralis major»"
+#: exercises/models/video.py:41
+msgid "Maximum file size is 100MB."
+msgstr ""
+
+#: exercises/models/video.py:44 exercises/models/video.py:48
+msgid "File type is not supported"
+msgstr ""
+
+#: exercises/models/video.py:57
+#, fuzzy
+#| msgid "%(birthdate)s is not a valid birthdate"
+msgid "File is not a valid video"
+msgstr "%(birthdate)s non è un compleanno valido"
+
+#: exercises/models/video.py:88
+#, fuzzy
+#| msgid "Main picture"
+msgid "Main video"
+msgstr "Immagine principale"
+
+#: exercises/models/video.py:94
+msgid "Video"
+msgstr ""
+
+#: exercises/models/video.py:101
+msgid "Size"
+msgstr ""
+
+#: exercises/models/video.py:108 manager/models/schedule_step.py:56
+msgid "Duration"
+msgstr "Durata"
+
+#: exercises/models/video.py:117
+msgid "Width"
+msgstr ""
+
+#: exercises/models/video.py:124
+#, fuzzy
+#| msgid "Weight"
+msgid "Height"
+msgstr "Peso"
+
+#: exercises/models/video.py:131
+#, fuzzy
+#| msgid "Code"
+msgid "Codec"
+msgstr "Codice"
+
+#: exercises/models/video.py:139
+msgid "Codec, long name"
+msgstr ""
+
#: exercises/templates/equipment/admin-overview.html:4
msgid "Equipment list"
msgstr "Lista attrezzatura"
@@ -1669,7 +1741,7 @@ msgstr "Prospetto dell'attrezzatura"
#: exercises/templates/equipment/overview.html:69
#: exercises/templates/exercise/overview.html:74
-#: exercises/templates/exercise/view.html:214
+#: exercises/templates/exercise/view.html:264
#: exercises/templates/muscles/overview.html:71
msgid "Main muscles"
msgstr "Muscoli principali"
@@ -1795,7 +1867,8 @@ msgstr "Data di inserimento"
#: gym/templates/gym/new_user.html:22
#: gym/templates/gym/reset_user_password.html:20 manager/models/log.py:45
#: manager/models/schedule.py:44 manager/models/session.py:49
-#: manager/models/workout.py:89 nutrition/models/plan.py:55
+#: manager/models/workout.py:89 measurements/models/category.py:48
+#: measurements/models/measurement.py:59 nutrition/models/plan.py:55
#: nutrition/templates/ingredient/pending.html:16 weight/models.py:41
msgid "User"
msgstr "Utente"
@@ -1822,13 +1895,13 @@ msgid "Please select one of the options below."
msgstr "Per favore seleziona una delle opzione specificate."
#: exercises/templates/exercise/view.html:60
-#: exercises/templates/exercise/view.html:153
+#: exercises/templates/exercise/view.html:203
#: nutrition/templates/ingredient/view.html:38
msgid "Accept"
msgstr "Accetta"
#: exercises/templates/exercise/view.html:64
-#: exercises/templates/exercise/view.html:154
+#: exercises/templates/exercise/view.html:204
#: nutrition/templates/ingredient/view.html:42
msgid "Decline"
msgstr "Rifiuta"
@@ -1841,32 +1914,42 @@ msgstr "Immagini"
msgid "Add new image"
msgstr "Aggiungi nuova immagine"
-#: exercises/templates/exercise/view.html:147
+#: exercises/templates/exercise/view.html:148
+msgid "Videos"
+msgstr ""
+
+#: exercises/templates/exercise/view.html:187 exercises/views/videos.py:94
+#, fuzzy
+#| msgid "Add new image"
+msgid "Add new video"
+msgstr "Aggiungi nuova immagine"
+
+#: exercises/templates/exercise/view.html:197
msgid "Images pending review"
msgstr "Immagini in attesa di revisione"
-#: exercises/templates/exercise/view.html:168
+#: exercises/templates/exercise/view.html:218
msgid "Comments for this exercise"
msgstr "Commenti all'esercizio"
-#: exercises/templates/exercise/view.html:196
+#: exercises/templates/exercise/view.html:246
msgid "Add new comment"
msgstr "Aggiungi un nuovo commento"
-#: exercises/templates/exercise/view.html:210
+#: exercises/templates/exercise/view.html:260
msgid "The diagram shows the most used muscles on this exercise"
msgstr "Il diagramma mostra i muscoli più usati durante l'esercizio"
-#: exercises/templates/exercise/view.html:251
+#: exercises/templates/exercise/view.html:301
#: manager/templates/workout/log.html:10 manager/templates/workout/log.html:11
msgid "Weight log"
msgstr "Diario dei pesi"
-#: exercises/templates/exercise/view.html:256
+#: exercises/templates/exercise/view.html:306
msgid "Exercise Variations"
msgstr "Variazioni esercizio"
-#: exercises/templates/exercise/view.html:277
+#: exercises/templates/exercise/view.html:327
msgid "Submit a correction"
msgstr "Invia una correzione"
@@ -1903,32 +1986,32 @@ msgstr "Aggiungi commento esercizio"
msgid "Delete equipment?"
msgstr "Cancella attrezzatura?"
-#: exercises/views/exercises.py:228
+#: exercises/views/exercises.py:229
#, python-format
msgid ""
"%(name_original)s is too similar to existing exercise \"%(exercise_name)s\""
msgstr "%(name_original)s è troppo simile a «%(exercise_name)s»"
-#: exercises/views/exercises.py:246
+#: exercises/views/exercises.py:247
msgid "Add exercise"
msgstr "Aggiungi esercizio"
-#: exercises/views/exercises.py:366
+#: exercises/views/exercises.py:367
msgid "Thank you. Once the changes are reviewed the exercise will be updated."
msgstr ""
"Grazie. Una volta che le modifiche sono state riviste, l'esercizio verrà "
"aggiornato."
-#: exercises/views/exercises.py:379
+#: exercises/views/exercises.py:380
#, python-brace-format
msgid "Correct {0}"
msgstr "Corretto {0}"
-#: exercises/views/exercises.py:421
+#: exercises/views/exercises.py:422
msgid "This will delete the exercise from all workouts."
msgstr "L'esercizio sarà eliminato da tutti gli allenamenti."
-#: exercises/views/exercises.py:473
+#: exercises/views/exercises.py:474
msgid "Exercise was successfully marked as rejected"
msgstr "L'esercizio è stato contrassegnato con successo come respinto"
@@ -1940,6 +2023,11 @@ msgstr "Modifica immagine esercizio"
msgid "Delete exercise image?"
msgstr "Eliminare l'immagine dell'esercizio?"
+#: exercises/views/videos.py:144 nutrition/views/log.py:230
+#: nutrition/views/unit_ingredient.py:139
+msgid "Delete?"
+msgstr "Elimina?"
+
#: gallery/templates/images/overview.html:62
#, fuzzy
#| msgid "Add new image"
@@ -2008,8 +2096,8 @@ msgid "Contract type"
msgstr "Tipo di contratto"
#: gym/models/contract.py:208 gym/templates/contract/view.html:59
-#: manager/templates/log/add.html:52 nutrition/forms.py:58
-#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:92
+#: manager/templates/log/add.html:52 nutrition/forms.py:59
+#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:102
#: nutrition/models/meal_item.py:72
msgid "Amount"
msgstr "Quantità"
@@ -2456,6 +2544,7 @@ msgstr ""
"necessario prima di inviare le e-mail"
#: mailer/templates/mailer/gym/preview.html:22
+#: software/templates/about_us.html:59
msgid "Current version"
msgstr "Versione attuale"
@@ -2492,7 +2581,8 @@ msgstr "Puoi cercare più di un esercizio, saranno raggruppati in un Superset."
#: manager/models/log.py:90 manager/models/setting.py:47
#: manager/models/setting.py:78 manager/templates/log/add.html:53
#: manager/templates/log/add.html:55 manager/templates/set/formset.html:11
-#: manager/templates/set/formset.html:13 nutrition/forms.py:62
+#: manager/templates/set/formset.html:13 measurements/models/category.py:58
+#: nutrition/forms.py:63
msgid "Unit"
msgstr "Unità"
@@ -2563,10 +2653,6 @@ msgstr ""
msgid "schedule"
msgstr "Programmazione"
-#: manager/models/schedule_step.py:56
-msgid "Duration"
-msgstr "Durata"
-
#: manager/models/schedule_step.py:57
msgid "The duration in weeks"
msgstr "Durata in settimane"
@@ -2856,7 +2942,7 @@ msgstr ""
#: manager/templates/schedule/view.html:290
#: manager/templates/workout/view.html:142
#: manager/templates/workout/view.html:217
-#: nutrition/templates/plan/view.html:415
+#: nutrition/templates/plan/view.html:417
msgid "Download as PDF"
msgstr "Scarica come PDF"
@@ -3108,23 +3194,27 @@ msgstr "Nuova impressione allenamento per {0}"
msgid "This will delete all weight logs for this day as well."
msgstr "Questo cancellerà anche tutti i log del peso per questo giorno."
-#: nutrition/forms.py:121
+#: measurements/models/measurement.py:69
+msgid "Value"
+msgstr ""
+
+#: nutrition/forms.py:122
msgid "Calculate"
msgstr "Calcola"
-#: nutrition/forms.py:194 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:195 nutrition/templates/rate/form.html:76
msgid "Basic caloric intake"
msgstr "Assunzione calorica di base"
-#: nutrition/forms.py:195
+#: nutrition/forms.py:196
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:201
+#: nutrition/forms.py:202
msgid "Additional calories"
msgstr "Calorie aggiuntive"
-#: nutrition/forms.py:203
+#: nutrition/forms.py:204
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
@@ -3132,8 +3222,8 @@ msgstr ""
"Calorie aggiuntive da aggiungere alla tariffa base (per sottrarre, inserire "
"un numero negativo)"
-#: nutrition/forms.py:231 nutrition/models/ingredient_weight_unit.py:39
-#: nutrition/models/log.py:71 nutrition/models/meal_item.py:53
+#: nutrition/forms.py:232 nutrition/models/ingredient_weight_unit.py:39
+#: nutrition/models/log.py:81 nutrition/models/meal_item.py:53
#: nutrition/templates/log/detail.html:155
msgid "Ingredient"
msgstr "Alimenti"
@@ -3152,14 +3242,14 @@ msgstr "In g per 100 g di prodotto"
#: nutrition/models/ingredient.py:123
#: nutrition/templates/ingredient/view.html:96
#: nutrition/templates/log/detail.html:78
-#: nutrition/templates/plan/view.html:262 nutrition/views/plan.py:406
+#: nutrition/templates/plan/view.html:264 nutrition/views/plan.py:406
msgid "Sugar content in carbohydrates"
msgstr "Zuccheri contenuti nei carboidrati"
#: nutrition/models/ingredient.py:141
#: nutrition/templates/ingredient/view.html:112
#: nutrition/templates/log/detail.html:104
-#: nutrition/templates/plan/view.html:274 nutrition/views/plan.py:420
+#: nutrition/templates/plan/view.html:276 nutrition/views/plan.py:420
msgid "Saturated fat content in fats"
msgstr "Grassi saturi contenuti nei grassi"
@@ -3167,7 +3257,7 @@ msgstr "Grassi saturi contenuti nei grassi"
#: nutrition/templates/ingredient/view.html:134
#: nutrition/templates/log/detail.html:122
#: nutrition/templates/log/detail.html:178
-#: nutrition/templates/plan/view.html:285 nutrition/views/plan.py:426
+#: nutrition/templates/plan/view.html:287 nutrition/views/plan.py:426
msgid "Fibres"
msgstr "Fibre"
@@ -3175,7 +3265,7 @@ msgstr "Fibre"
#: nutrition/templates/ingredient/view.html:144
#: nutrition/templates/log/detail.html:135
#: nutrition/templates/log/detail.html:181
-#: nutrition/templates/plan/view.html:291 nutrition/views/plan.py:432
+#: nutrition/templates/plan/view.html:293 nutrition/views/plan.py:432
msgid "Sodium"
msgstr "Sodio"
@@ -3223,10 +3313,20 @@ 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:55
+msgid "Meal"
+msgstr "Pasto"
+
#: nutrition/models/meal.py:61
msgid "Time (approx)"
msgstr "Orario (approssimativo)"
+#: nutrition/models/meal.py:68
+msgid ""
+"Give meals a textual description / name such as \"Breakfast\" or \"after "
+"workout\""
+msgstr ""
+
#: nutrition/models/plan.py:71
msgid ""
"A description of the goal of the plan, e.g. \"Gain mass\" or \"Prepare for "
@@ -3382,12 +3482,12 @@ msgstr ""
#: nutrition/templates/ingredient/view.html:71
#: nutrition/templates/log/detail.html:31
-#: nutrition/templates/plan/view.html:227 nutrition/views/plan.py:376
+#: nutrition/templates/plan/view.html:229 nutrition/views/plan.py:376
msgid "Macronutrients"
msgstr "Macronutrienti"
#: nutrition/templates/ingredient/view.html:80
-#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:244
+#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:246
msgid "kJ"
msgstr "kJ"
@@ -3400,7 +3500,7 @@ msgstr "n.D."
#: nutrition/templates/ingredient/view.html:128
#: nutrition/templates/log/detail.html:119
-#: nutrition/templates/plan/view.html:282
+#: nutrition/templates/plan/view.html:284
msgid "Others"
msgstr "Altri"
@@ -3429,7 +3529,7 @@ msgstr "Cancella ingrediente"
#: nutrition/templates/log/detail.html:7
#: nutrition/templates/log/overview.html:7
-#: nutrition/templates/plan/view.html:300
+#: nutrition/templates/plan/view.html:302
msgid "Nutrition diary"
msgstr "Diario nutrizionale"
@@ -3439,13 +3539,13 @@ msgstr "Pianificato"
#: nutrition/templates/log/detail.html:33
#: nutrition/templates/log/overview.html:31
-#: nutrition/templates/plan/view.html:308
+#: nutrition/templates/plan/view.html:310
msgid "Logged"
msgstr "Registrato"
#: nutrition/templates/log/detail.html:34
#: nutrition/templates/log/overview.html:32
-#: nutrition/templates/plan/view.html:309
+#: nutrition/templates/plan/view.html:311
msgid "Difference"
msgstr "Differenza"
@@ -3458,7 +3558,7 @@ msgid "g"
msgstr "g"
#: nutrition/templates/log/overview.html:53
-#: nutrition/templates/plan/view.html:330
+#: nutrition/templates/plan/view.html:332
msgid "nothing found"
msgstr "Nessun risultato"
@@ -3478,56 +3578,56 @@ msgstr "Registra questo pasto"
msgid "Add ingredient to meal"
msgstr "Aggiungi ingredienti al pasto"
-#: nutrition/templates/plan/view.html:150
+#: nutrition/templates/plan/view.html:152
msgid "No items for this meal."
msgstr "Nessun alimento per questo pasto."
-#: nutrition/templates/plan/view.html:188
+#: nutrition/templates/plan/view.html:190
msgid "No meals for this plan."
msgstr "Nessun pasto per questo piano nutrizionale."
-#: nutrition/templates/plan/view.html:200
+#: nutrition/templates/plan/view.html:202
msgid "Log this Plan"
msgstr "Aggiungi la pianificazione"
-#: nutrition/templates/plan/view.html:206
+#: nutrition/templates/plan/view.html:208
msgid "Add a new meal"
msgstr "Aggiungi un nuovo pasto."
-#: nutrition/templates/plan/view.html:216 nutrition/views/plan.py:369
+#: nutrition/templates/plan/view.html:218 nutrition/views/plan.py:369
msgid "Nutritional data"
msgstr "Dati nutrizionali"
-#: nutrition/templates/plan/view.html:219
+#: nutrition/templates/plan/view.html:221
#, python-format
msgid "Based on the weight entry dated %(date)s (%(weight)s)"
msgstr "Basato sui dati del peso datato%(date)s (%(weight)s)"
-#: nutrition/templates/plan/view.html:228 nutrition/views/plan.py:377
+#: nutrition/templates/plan/view.html:230 nutrition/views/plan.py:377
msgid "Total"
msgstr "Totale"
-#: nutrition/templates/plan/view.html:229 nutrition/views/plan.py:378
+#: nutrition/templates/plan/view.html:231 nutrition/views/plan.py:378
msgid "Percent of energy"
msgstr "Percentuale di energia"
-#: nutrition/templates/plan/view.html:232 nutrition/views/plan.py:379
+#: nutrition/templates/plan/view.html:234 nutrition/views/plan.py:379
msgid "g per body kg"
msgstr "g per peso in kg"
-#: nutrition/templates/plan/view.html:234
+#: nutrition/templates/plan/view.html:236
msgid "oz per body lb"
msgstr "oz per corpo lb"
-#: nutrition/templates/plan/view.html:338
+#: nutrition/templates/plan/view.html:340
msgid "View complete nutrition log"
msgstr "Mostra tutte le registrazioni nutrizionali"
-#: nutrition/templates/plan/view.html:371
+#: nutrition/templates/plan/view.html:373
msgid "Goal"
msgstr "Obiettivo"
-#: nutrition/templates/plan/view.html:382
+#: nutrition/templates/plan/view.html:384
#, fuzzy
#| msgid ""
#| "You have selected that this nutritional plan has a\n"
@@ -3542,7 +3642,7 @@ msgstr ""
"     obbiettivo sulla quantità di calorie. Usa la calcolatrice o inserisci "
"il valore tu stesso."
-#: nutrition/templates/plan/view.html:392
+#: nutrition/templates/plan/view.html:394
msgid ""
"If you find the ingredient list too short, you might want to activate the "
"preference to also show English ingredients."
@@ -3550,15 +3650,15 @@ msgstr ""
"Se trovi che la lista degli ingredienti è troppo corta, potresti voler "
"attivare la preferenza per mostrare anche gli ingredienti Inglesi."
-#: nutrition/templates/plan/view.html:421
+#: nutrition/templates/plan/view.html:423
msgid "Edit nutrition plan"
msgstr "Modifica piano nutrizionale"
-#: nutrition/templates/plan/view.html:425
+#: nutrition/templates/plan/view.html:427
msgid "Make a copy of this nutrition plan"
msgstr "Fai una copia di questo piano nutrizionale"
-#: nutrition/templates/plan/view.html:431
+#: nutrition/templates/plan/view.html:433
msgid "Delete nutrition plan"
msgstr "Cancella piano nutrizionale"
@@ -3657,10 +3757,6 @@ msgstr "Aggiungi un nuovo ingrediente"
msgid "Ingredient was successfully marked as rejected"
msgstr "L'ingrediente è stato contrassegnato con successo come rifiutato"
-#: nutrition/views/log.py:229 nutrition/views/unit_ingredient.py:139
-msgid "Delete?"
-msgstr "Elimina?"
-
#: nutrition/views/meal.py:55
msgid "Add new meal"
msgstr "Aggiungi un nuovo pasto"
@@ -4084,11 +4180,11 @@ msgstr ""
msgid "Re-Submit"
msgstr "Re-Invia"
-#: weight/templates/overview.html:68
+#: weight/templates/overview.html:51
msgid "Export as CSV"
msgstr "Esporta come CSV"
-#: weight/templates/overview.html:72
+#: weight/templates/overview.html:55
msgid "Import from spreadsheet"
msgstr "Importa da foglio di calcolo"
@@ -4106,6 +4202,12 @@ msgstr "Cancellato con successo"
msgid "Delete weight entry for the %s"
msgstr "Cancellato il peso inserito di %s"
+#~ msgid "Your current weight is: "
+#~ msgstr "Il tuo peso corporeo è: "
+
+#~ msgid "Released under the Affero GPL"
+#~ msgstr "Rilasciato sotto la GPL Affero"
+
#~ msgid "Responsible for the content of this site as per German law §5 TMG:"
#~ msgstr ""
#~ "Responsabile per il contenuto di questo sito secondo la legge tedesca §5 "
@@ -4266,9 +4368,6 @@ msgstr "Cancellato il peso inserito di %s"
#~ "interessato,\n"
#~ "visita il link e comincia a tradurre."
-#~ msgid "Code"
-#~ msgstr "Codice"
-
#~ msgid ""
#~ "Obviously, you are highly encouraged to clone the\n"
#~ "repo and start hacking! Once you are ready, send a pull request and we\n"
@@ -4420,9 +4519,6 @@ msgstr "Cancellato il peso inserito di %s"
#~ msgid "Pause!"
#~ msgstr "Pausa!"
-#~ msgid "Meal"
-#~ msgstr "Pasto"
-
#~ msgid "There is no chart here because there are no weight entries."
#~ msgstr "Non ci sono grafici qui perché non ci sono voci di peso."
diff --git a/wger/locale/ja/LC_MESSAGES/django.po b/wger/locale/ja/LC_MESSAGES/django.po
index f5352a534..7c42e4254 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: 2021-08-17 17:23+0200\n"
+"POT-Creation-Date: 2022-02-15 14:51+0100\n"
"PO-Revision-Date: 2021-10-31 07:34+0000\n"
"Last-Translator: yuki chi <[email protected]>\n"
"Language-Team: Japanese <https://hosted.weblate.org/projects/wger/web/ja/>\n"
@@ -50,16 +50,16 @@ msgstr "言語"
msgid "Nothing found."
msgstr ""
-#: config/templates/language/overview.html:16 core/templates/index.html:147
-#: core/templates/index.html:199 manager/templates/calendar/month.html:132
+#: config/templates/language/overview.html:16 core/templates/index.html:137
+#: core/templates/index.html:189 manager/templates/calendar/month.html:132
#: manager/templates/schedule/overview.html:28
#: manager/templates/schedule/view.html:146
#: manager/templates/workout/overview.html:28
#: nutrition/templates/ingredient/overview.html:45
#: nutrition/templates/plan/overview.html:23
-#: nutrition/templates/plan/view.html:148
-#: nutrition/templates/plan/view.html:151
-#: nutrition/templates/plan/view.html:189
+#: nutrition/templates/plan/view.html:150
+#: nutrition/templates/plan/view.html:153
+#: nutrition/templates/plan/view.html:191
msgid "Add one now."
msgstr "今すぐ追加する"
@@ -80,7 +80,7 @@ msgstr "今すぐ追加する"
#: gym/templates/gym/member_list.html:244
#: gym/templates/gym/member_list.html:281
#: mailer/templates/mailer/gym/overview.html:43
-#: weight/templates/overview.html:78
+#: weight/templates/overview.html:61
msgid "Add"
msgstr "追加"
@@ -114,14 +114,14 @@ msgstr "表示"
#: config/templates/language/view.html:91 core/templates/user/api_key.html:44
#: core/templates/user/preferences.html:28
-#: exercises/templates/exercise/view.html:273
-#: exercises/templates/exercise/view.html:296 gym/models/contract.py:200
+#: exercises/templates/exercise/view.html:323
+#: exercises/templates/exercise/view.html:346 gym/models/contract.py:200
#: gym/templates/contract/view.html:41 gym/templates/contract/view.html:106
#: gym/templates/gym/member_list.html:248
#: manager/templates/schedule/view.html:281
#: manager/templates/workout/view.html:206
#: nutrition/templates/ingredient/view.html:226
-#: nutrition/templates/plan/view.html:409 weight/templates/overview.html:62
+#: nutrition/templates/plan/view.html:411 weight/templates/overview.html:45
msgid "Options"
msgstr "オプション"
@@ -135,12 +135,12 @@ msgstr "オプション"
#: core/templates/weight_unit/list.html:17
#: exercises/templates/categories/admin-overview.html:16
#: exercises/templates/equipment/admin-overview.html:16
-#: exercises/templates/exercise/view.html:180
-#: exercises/templates/exercise/view.html:301
+#: exercises/templates/exercise/view.html:230
+#: exercises/templates/exercise/view.html:351
#: exercises/templates/muscles/admin-overview.html:16
-#: exercises/views/comments.py:63 gallery/views/images.py:96
-#: gym/templates/admin_notes/list.html:32 gym/templates/contract/list.html:31
-#: gym/templates/contract/view.html:107
+#: exercises/views/comments.py:63 exercises/views/videos.py:69
+#: gallery/views/images.py:96 gym/templates/admin_notes/list.html:32
+#: gym/templates/contract/list.html:31 gym/templates/contract/view.html:107
#: gym/templates/contract_option/list.html:31
#: gym/templates/contract_type/list.html:31 gym/templates/document/list.html:38
#: gym/templates/gym/list.html:19 gym/templates/gym/list.html:43
@@ -151,7 +151,7 @@ msgstr "オプション"
#: manager/templates/calendar/partial_overview_table.html:18
#: manager/templates/schedule/view.html:121
#: nutrition/templates/ingredient/view.html:198
-#: nutrition/templates/plan/view.html:89 nutrition/templates/plan/view.html:124
+#: nutrition/templates/plan/view.html:89 nutrition/templates/plan/view.html:126
#: nutrition/templates/units/list.html:18
msgid "Edit"
msgstr "編集"
@@ -165,9 +165,9 @@ msgstr "編集"
#: exercises/templates/categories/admin-overview.html:17
#: exercises/templates/equipment/admin-overview.html:17
#: exercises/templates/exercise/view.html:68
-#: exercises/templates/exercise/view.html:155
-#: exercises/templates/exercise/view.html:185
-#: exercises/templates/exercise/view.html:306
+#: exercises/templates/exercise/view.html:205
+#: exercises/templates/exercise/view.html:235
+#: exercises/templates/exercise/view.html:356
#: exercises/templates/muscles/admin-overview.html:17
#: gym/templates/admin_notes/list.html:40
#: gym/templates/contract_option/list.html:39
@@ -180,7 +180,7 @@ msgstr "編集"
#: nutrition/templates/ingredient/view.html:199
#: nutrition/templates/ingredient/view.html:239
#: nutrition/templates/log/detail.html:197
-#: nutrition/templates/plan/view.html:95 nutrition/templates/plan/view.html:130
+#: nutrition/templates/plan/view.html:95 nutrition/templates/plan/view.html:132
#: nutrition/templates/units/list.html:20
msgid "Delete"
msgstr "削除"
@@ -306,7 +306,7 @@ msgid "Some way of answering you (e-mail, etc.)"
msgstr ""
#: core/forms.py:265 exercises/models/comment.py:40 manager/models/set.py:60
-#: manager/models/setting.py:99 nutrition/models/log.py:61
+#: manager/models/setting.py:99 nutrition/models/log.py:71
msgid "Comment"
msgstr "コメント"
@@ -435,7 +435,7 @@ msgstr ""
msgid "Age"
msgstr "年齢"
-#: core/models/profile.py:202 nutrition/forms.py:98
+#: core/models/profile.py:202 nutrition/forms.py:99
msgid "Height (cm)"
msgstr "身長(cm)"
@@ -486,7 +486,7 @@ msgid "Total caloric intake, including e.g. any surplus"
msgstr ""
#: core/models/profile.py:305 nutrition/models/ingredient_weight_unit.py:45
-#: nutrition/models/log.py:80 nutrition/models/meal_item.py:58
+#: nutrition/models/log.py:90 nutrition/models/meal_item.py:58
msgid "Weight unit"
msgstr "体重の単位"
@@ -521,9 +521,9 @@ msgstr ""
#: gym/models/user_document.py:87 gym/templates/contract/view.html:50
#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:96
#: gym/views/gym.py:156 manager/models/schedule.py:55
-#: manager/models/workout.py:56 nutrition/models/ingredient.py:96
-#: nutrition/models/ingredient_category.py:26
-#: nutrition/models/weight_unit.py:38
+#: manager/models/workout.py:56 measurements/models/category.py:53
+#: nutrition/models/ingredient.py:96 nutrition/models/ingredient_category.py:26
+#: nutrition/models/meal.py:66 nutrition/models/weight_unit.py:38
#: nutrition/templates/ingredient/pending.html:15
#: nutrition/templates/ingredient/view.html:185
msgid "Name"
@@ -579,17 +579,17 @@ msgstr ""
msgid "Dashboard"
msgstr "ダッシュボード"
-#: core/templates/index.html:31 manager/templates/calendar/month.html:115
+#: core/templates/index.html:21 manager/templates/calendar/month.html:115
msgid "Add log to day"
msgstr ""
-#: core/templates/index.html:35 manager/templates/calendar/month.html:120
+#: core/templates/index.html:25 manager/templates/calendar/month.html:120
msgid ""
"Click to add weight logs to a training\n"
"day in your current workout:"
msgstr ""
-#: core/templates/index.html:43 core/templates/index.html:83
+#: core/templates/index.html:33 core/templates/index.html:73
#: core/templates/misc/fragments/shariff_modal.html:29
#: core/templates/template.html:125 manager/templates/calendar/month.html:138
#: manager/templates/schedule/view.html:246
@@ -599,17 +599,17 @@ msgstr ""
msgid "Close"
msgstr "閉じる"
-#: core/templates/index.html:54 core/templates/index.html:203
+#: core/templates/index.html:44 core/templates/index.html:193
msgid "Add new diary entry"
msgstr ""
-#: core/templates/index.html:59
+#: core/templates/index.html:49
msgid ""
"Click to add an entry to your nutrition diary for today. You can either log "
"a meal as you defined it, or entry any number of custom entries."
msgstr ""
-#: core/templates/index.html:67 core/templates/index.html:171
+#: core/templates/index.html:57 core/templates/index.html:161
#: core/templates/user/overview.html:171
#: nutrition/templates/ingredient/view.html:79
#: nutrition/templates/log/detail.html:40
@@ -618,19 +618,19 @@ msgstr ""
#: nutrition/templates/log/overview.html:7
#: nutrition/templates/log/overview.html:44
#: nutrition/templates/plan/overview.html:17
-#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:242
-#: nutrition/templates/plan/view.html:301
-#: nutrition/templates/plan/view.html:321
-#: nutrition/templates/plan/view.html:363
-#: nutrition/templates/plan/view.html:373
+#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:244
+#: nutrition/templates/plan/view.html:303
+#: nutrition/templates/plan/view.html:323
+#: nutrition/templates/plan/view.html:365
+#: nutrition/templates/plan/view.html:375
msgid "kcal"
msgstr "kcal"
-#: core/templates/index.html:79 nutrition/templates/plan/view.html:348
+#: core/templates/index.html:69 nutrition/templates/plan/view.html:350
msgid "Add custom diary entry"
msgstr ""
-#: core/templates/index.html:94 core/templates/index.html:102
+#: core/templates/index.html:84 core/templates/index.html:92
#: manager/models/day.py:34 manager/models/log.py:56
#: manager/models/session.py:60 manager/models/workout.py:109
#: manager/templates/schedule/view.html:105
@@ -641,80 +641,80 @@ msgstr ""
msgid "Workout"
msgstr ""
-#: core/templates/index.html:128
+#: core/templates/index.html:118
msgid "This workout is part of a schedule:"
msgstr ""
-#: core/templates/index.html:133
+#: core/templates/index.html:123
msgid ""
"The current workout is selected from your active schedule or, if you don't "
"have one, simply by date."
msgstr ""
-#: core/templates/index.html:142 manager/templates/calendar/month.html:188
+#: core/templates/index.html:132 manager/templates/calendar/month.html:188
msgid "Add new log"
msgstr ""
-#: core/templates/index.html:147 core/templates/user/overview.html:58
+#: core/templates/index.html:137 core/templates/user/overview.html:58
#: manager/templates/calendar/month.html:128
#: manager/templates/schedule/view.html:146
#: manager/templates/workout/overview.html:28
msgid "No workouts found."
msgstr ""
-#: core/templates/index.html:157 nutrition/models/log.py:48
+#: core/templates/index.html:147 nutrition/models/log.py:49
#: nutrition/models/meal.py:49 nutrition/models/meal_item.py:47
#: nutrition/models/plan.py:94 nutrition/templates/plan/view.html:11
#: nutrition/templates/plan/view.html:19
msgid "Nutrition plan"
msgstr ""
-#: core/templates/index.html:169 core/templates/user/overview.html:155
+#: core/templates/index.html:159 core/templates/user/overview.html:155
#: nutrition/models/ingredient.py:100
#: nutrition/templates/ingredient/view.html:77
#: nutrition/templates/log/detail.html:39
#: nutrition/templates/log/detail.html:156
-#: nutrition/templates/plan/view.html:53 nutrition/templates/plan/view.html:241
-#: nutrition/templates/plan/view.html:358
-#: nutrition/templates/plan/view.html:362 nutrition/views/plan.py:384
+#: nutrition/templates/plan/view.html:53 nutrition/templates/plan/view.html:243
+#: nutrition/templates/plan/view.html:360
+#: nutrition/templates/plan/view.html:364 nutrition/views/plan.py:384
msgid "Energy"
msgstr "エネルギー"
-#: core/templates/index.html:175 core/templates/user/overview.html:156
+#: core/templates/index.html:165 core/templates/user/overview.html:156
#: nutrition/models/ingredient.py:105
#: nutrition/templates/ingredient/view.html:84
#: nutrition/templates/log/detail.html:52
#: nutrition/templates/log/detail.html:174
-#: nutrition/templates/plan/view.html:54 nutrition/templates/plan/view.html:249
+#: nutrition/templates/plan/view.html:54 nutrition/templates/plan/view.html:251
#: nutrition/views/plan.py:390
msgid "Protein"
msgstr "タンパク質"
-#: core/templates/index.html:181 core/templates/user/overview.html:157
+#: core/templates/index.html:171 core/templates/user/overview.html:157
#: nutrition/models/ingredient.py:113
#: nutrition/templates/ingredient/view.html:90
#: nutrition/templates/log/detail.html:65
#: nutrition/templates/log/detail.html:175
-#: nutrition/templates/plan/view.html:55 nutrition/templates/plan/view.html:255
+#: nutrition/templates/plan/view.html:55 nutrition/templates/plan/view.html:257
#: nutrition/views/plan.py:398
msgid "Carbohydrates"
msgstr "炭水化物"
-#: core/templates/index.html:187 core/templates/user/overview.html:158
+#: core/templates/index.html:177 core/templates/user/overview.html:158
#: nutrition/models/ingredient.py:131
#: nutrition/templates/ingredient/view.html:106
#: nutrition/templates/log/detail.html:91
#: nutrition/templates/log/detail.html:176
-#: nutrition/templates/plan/view.html:56 nutrition/templates/plan/view.html:268
+#: nutrition/templates/plan/view.html:56 nutrition/templates/plan/view.html:270
#: nutrition/views/plan.py:412
msgid "Fat"
msgstr "脂肪質"
-#: core/templates/index.html:199 nutrition/templates/plan/overview.html:22
+#: core/templates/index.html:189 nutrition/templates/plan/overview.html:22
msgid "No nutrition plans."
msgstr ""
-#: core/templates/index.html:213 core/templates/user/overview.html:112
+#: core/templates/index.html:203 core/templates/user/overview.html:112
#: core/templates/user/overview.html:121 manager/forms.py:173
#: manager/helpers.py:89 manager/models/log.py:84 manager/models/setting.py:67
#: manager/templates/log/add.html:54 manager/templates/set/formset.html:12
@@ -723,11 +723,7 @@ msgstr ""
msgid "Weight"
msgstr "体重"
-#: core/templates/index.html:217
-msgid "Your current weight is: "
-msgstr "現在の体重:"
-
-#: core/templates/index.html:248 core/templates/navigation.html:97
+#: core/templates/index.html:210 core/templates/navigation.html:97
#: weight/views.py:70
msgid "Add weight entry"
msgstr ""
@@ -759,7 +755,7 @@ msgstr ""
msgid "Nothing found"
msgstr ""
-#: core/templates/misc/about.html:4 core/templates/template.html:201
+#: core/templates/misc/about.html:4 core/templates/template.html:175
#: core/templates/template_features.html:118
#: core/templates/template_no_context.html:88
msgid "Imprint"
@@ -775,8 +771,8 @@ msgid ""
msgstr ""
#: core/templates/misc/fragments/shariff_modal.html:22
-#: nutrition/templates/plan/view.html:385
-#: nutrition/templates/plan/view.html:394
+#: nutrition/templates/plan/view.html:387
+#: nutrition/templates/plan/view.html:396
msgid "That's done here"
msgstr ""
@@ -862,7 +858,7 @@ msgstr ""
msgid "Equipment"
msgstr ""
-#: core/templates/navigation.html:78 exercises/templates/exercise/view.html:208
+#: core/templates/navigation.html:78 exercises/templates/exercise/view.html:258
msgid "Muscles"
msgstr "筋肉"
@@ -935,7 +931,7 @@ msgstr ""
msgid "Get the code"
msgstr ""
-#: core/templates/navigation.html:175 core/templates/template.html:193
+#: core/templates/navigation.html:175 core/templates/template.html:205
#: core/templates/template_features.html:100
msgid "Translate"
msgstr "翻訳"
@@ -1084,15 +1080,11 @@ msgstr ""
msgid "Create some demo entries"
msgstr ""
-#: core/templates/template.html:202 core/templates/template_features.html:122
+#: core/templates/template.html:176 core/templates/template_features.html:122
#: core/templates/template_no_context.html:89 software/templates/tos.html:7
msgid "Terms of service"
msgstr "使用条件"
-#: core/templates/template.html:209 core/templates/template.html:210
-msgid "Released under the Affero GPL"
-msgstr ""
-
#: core/templates/template_features.html:62 software/templates/features.html:9
#: software/templates/features.html:120
msgid "Features"
@@ -1189,9 +1181,10 @@ msgstr "ワークアウトを追加する"
#: core/templates/user/overview.html:120 core/templates/user/overview.html:153
#: exercises/models/exercise.py:77 gallery/models/image.py:47
#: manager/helpers.py:88 manager/models/log.py:98 manager/models/session.py:67
-#: nutrition/models/ingredient.py:85 nutrition/models/ingredient.py:87
-#: nutrition/models/ingredient.py:190 nutrition/templates/log/overview.html:30
-#: nutrition/templates/plan/view.html:307 weight/models.py:32
+#: measurements/models/measurement.py:64 nutrition/models/ingredient.py:85
+#: nutrition/models/ingredient.py:87 nutrition/models/ingredient.py:190
+#: nutrition/templates/log/overview.html:30
+#: nutrition/templates/plan/view.html:309 weight/models.py:32
#: weight/templates/import_csv_preview.html:13
#: weight/templates/import_csv_preview.html:42 weight/views.py:150
msgid "Date"
@@ -1199,10 +1192,10 @@ msgstr "日付"
#: core/templates/user/overview.html:35 core/templates/user/overview.html:154
#: exercises/models/exercise.py:61 exercises/templates/exercise/view.html:88
-#: exercises/views/exercises.py:189 gallery/models/image.py:70
+#: exercises/views/exercises.py:190 gallery/models/image.py:70
#: gym/models/contract.py:57 gym/models/contract.py:107
#: manager/models/day.py:37 manager/models/workout.py:62
-#: nutrition/models/plan.py:69
+#: measurements/models/measurement.py:79 nutrition/models/plan.py:69
msgid "Description"
msgstr ""
@@ -1363,11 +1356,11 @@ msgstr ""
msgid "Change password"
msgstr ""
-#: core/templatetags/wger_extras.py:217
+#: core/templatetags/wger_extras.py:229
msgid "kg"
msgstr "kg"
-#: core/templatetags/wger_extras.py:219
+#: core/templatetags/wger_extras.py:231
#: nutrition/templates/ingredient/view.html:86
#: nutrition/templates/ingredient/view.html:92
#: nutrition/templates/ingredient/view.html:99
@@ -1379,28 +1372,28 @@ msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr "g"
-#: core/templatetags/wger_extras.py:222
+#: core/templatetags/wger_extras.py:234
msgid "lb"
msgstr "lb"
-#: core/templatetags/wger_extras.py:224
+#: core/templatetags/wger_extras.py:236
msgctxt "weight unit, i.e. ounces"
msgid "oz"
msgstr "oz"
#: core/views/languages.py:85 exercises/views/categories.py:121
-#: exercises/views/equipment.py:106 exercises/views/exercises.py:422
+#: exercises/views/equipment.py:106 exercises/views/exercises.py:423
#: exercises/views/images.py:128 exercises/views/muscles.py:118
-#: manager/views/schedule.py:311 manager/views/schedule_step.py:129
-#: manager/views/workout.py:268 manager/views/workout_session.py:141
-#: nutrition/views/ingredient.py:144 nutrition/views/plan.py:120
-#: nutrition/views/unit.py:111
+#: exercises/views/videos.py:129 manager/views/schedule.py:311
+#: manager/views/schedule_step.py:129 manager/views/workout.py:268
+#: manager/views/workout_session.py:141 nutrition/views/ingredient.py:144
+#: nutrition/views/plan.py:120 nutrition/views/unit.py:111
msgid "Successfully deleted"
msgstr ""
#: core/views/languages.py:93 core/views/license.py:103
#: core/views/repetition_units.py:115 core/views/weight_units.py:115
-#: exercises/views/categories.py:127 exercises/views/exercises.py:430
+#: exercises/views/categories.py:127 exercises/views/exercises.py:431
#: exercises/views/muscles.py:125 gallery/views/images.py:121
#: gym/views/admin_notes.py:196 gym/views/document.py:206 gym/views/gym.py:486
#: manager/views/schedule.py:318 manager/views/schedule_step.py:139
@@ -1414,7 +1407,7 @@ msgstr ""
#: core/views/languages.py:111 core/views/license.py:84
#: core/views/repetition_units.py:85 core/views/user.py:456
#: core/views/weight_units.py:85 exercises/views/categories.py:97
-#: exercises/views/equipment.py:83 exercises/views/exercises.py:304
+#: exercises/views/equipment.py:83 exercises/views/exercises.py:305
#: exercises/views/muscles.py:105 gym/views/admin_notes.py:160
#: gym/views/config.py:68 gym/views/contract.py:186
#: gym/views/contract_option.py:123 gym/views/contract_type.py:123
@@ -1501,7 +1494,7 @@ msgstr ""
#: exercises/models/base.py:64 exercises/templates/equipment/overview.html:71
#: exercises/templates/exercise/overview.html:76
-#: exercises/templates/exercise/view.html:218
+#: exercises/templates/exercise/view.html:268
#: exercises/templates/muscles/overview.html:73
msgid "Secondary muscles"
msgstr ""
@@ -1514,8 +1507,9 @@ msgstr ""
msgid "Exercise Categories"
msgstr ""
-#: exercises/models/comment.py:34 exercises/models/image.py:62
-#: manager/forms.py:165 manager/helpers.py:89 manager/models/log.py:51
+#: exercises/models/comment.py:34 exercises/models/image.py:75
+#: exercises/models/video.py:82 manager/forms.py:165 manager/helpers.py:89
+#: manager/models/log.py:51
msgid "Exercise"
msgstr ""
@@ -1528,43 +1522,67 @@ msgstr ""
msgid "Language"
msgstr "表示言語"
-#: exercises/models/exercise.py:233 exercises/views/exercises.py:460
+#: exercises/models/exercise.py:237 exercises/views/exercises.py:461
msgid "Exercise was successfully added to the general database"
msgstr ""
-#: exercises/models/exercise.py:261
+#: exercises/models/exercise.py:265
msgid "New user submitted exercise"
msgstr ""
-#: exercises/models/exercise.py:263
+#: exercises/models/exercise.py:267
#, python-brace-format
msgid "The user {0} submitted a new exercise \"{1}\"."
msgstr ""
-#: exercises/models/image.py:68 gallery/models/image.py:56
+#: exercises/models/image.py:59
+msgid "Line"
+msgstr ""
+
+#: exercises/models/image.py:60
+msgid "3D"
+msgstr ""
+
+#: exercises/models/image.py:61
+msgid "Low-poly"
+msgstr ""
+
+#: exercises/models/image.py:62
+msgid "Photo"
+msgstr ""
+
+#: exercises/models/image.py:63
+msgid "Other"
+msgstr ""
+
+#: exercises/models/image.py:81 gallery/models/image.py:56
msgid "Image"
msgstr ""
-#: exercises/models/image.py:69 gallery/models/image.py:57
+#: exercises/models/image.py:82 gallery/models/image.py:57
msgid "Only PNG and JPEG formats are supported"
msgstr ""
-#: exercises/models/image.py:75
+#: exercises/models/image.py:88
msgid "Main picture"
msgstr ""
-#: exercises/models/image.py:78
+#: exercises/models/image.py:91
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 "
"by the system."
msgstr ""
-#: exercises/models/image.py:166
+#: exercises/models/image.py:100
+msgid "The art style of your image"
+msgstr ""
+
+#: exercises/models/image.py:185
msgid "New user submitted image"
msgstr ""
-#: exercises/models/image.py:167
+#: exercises/models/image.py:186
#, python-brace-format
msgid "The user {0} submitted a new image \"{1}\" for exercise {2}."
msgstr ""
@@ -1573,6 +1591,52 @@ msgstr ""
msgid "In latin, e.g. \"Pectoralis major\""
msgstr ""
+#: exercises/models/video.py:41
+msgid "Maximum file size is 100MB."
+msgstr ""
+
+#: exercises/models/video.py:44 exercises/models/video.py:48
+msgid "File type is not supported"
+msgstr ""
+
+#: exercises/models/video.py:57
+msgid "File is not a valid video"
+msgstr ""
+
+#: exercises/models/video.py:88
+msgid "Main video"
+msgstr ""
+
+#: exercises/models/video.py:94
+msgid "Video"
+msgstr ""
+
+#: exercises/models/video.py:101
+msgid "Size"
+msgstr ""
+
+#: exercises/models/video.py:108 manager/models/schedule_step.py:56
+msgid "Duration"
+msgstr ""
+
+#: exercises/models/video.py:117
+msgid "Width"
+msgstr ""
+
+#: exercises/models/video.py:124
+#, fuzzy
+#| msgid "Weight"
+msgid "Height"
+msgstr "体重"
+
+#: exercises/models/video.py:131
+msgid "Codec"
+msgstr ""
+
+#: exercises/models/video.py:139
+msgid "Codec, long name"
+msgstr ""
+
#: exercises/templates/equipment/admin-overview.html:4
msgid "Equipment list"
msgstr ""
@@ -1588,7 +1652,7 @@ msgstr ""
#: exercises/templates/equipment/overview.html:69
#: exercises/templates/exercise/overview.html:74
-#: exercises/templates/exercise/view.html:214
+#: exercises/templates/exercise/view.html:264
#: exercises/templates/muscles/overview.html:71
msgid "Main muscles"
msgstr ""
@@ -1697,7 +1761,8 @@ msgstr ""
#: gym/templates/gym/new_user.html:22
#: gym/templates/gym/reset_user_password.html:20 manager/models/log.py:45
#: manager/models/schedule.py:44 manager/models/session.py:49
-#: manager/models/workout.py:89 nutrition/models/plan.py:55
+#: manager/models/workout.py:89 measurements/models/category.py:48
+#: measurements/models/measurement.py:59 nutrition/models/plan.py:55
#: nutrition/templates/ingredient/pending.html:16 weight/models.py:41
msgid "User"
msgstr ""
@@ -1722,13 +1787,13 @@ msgid "Please select one of the options below."
msgstr ""
#: exercises/templates/exercise/view.html:60
-#: exercises/templates/exercise/view.html:153
+#: exercises/templates/exercise/view.html:203
#: nutrition/templates/ingredient/view.html:38
msgid "Accept"
msgstr ""
#: exercises/templates/exercise/view.html:64
-#: exercises/templates/exercise/view.html:154
+#: exercises/templates/exercise/view.html:204
#: nutrition/templates/ingredient/view.html:42
msgid "Decline"
msgstr ""
@@ -1741,32 +1806,42 @@ msgstr ""
msgid "Add new image"
msgstr ""
-#: exercises/templates/exercise/view.html:147
+#: exercises/templates/exercise/view.html:148
+msgid "Videos"
+msgstr ""
+
+#: exercises/templates/exercise/view.html:187 exercises/views/videos.py:94
+#, fuzzy
+#| msgid "Add one now."
+msgid "Add new video"
+msgstr "今すぐ追加する"
+
+#: exercises/templates/exercise/view.html:197
msgid "Images pending review"
msgstr ""
-#: exercises/templates/exercise/view.html:168
+#: exercises/templates/exercise/view.html:218
msgid "Comments for this exercise"
msgstr ""
-#: exercises/templates/exercise/view.html:196
+#: exercises/templates/exercise/view.html:246
msgid "Add new comment"
msgstr ""
-#: exercises/templates/exercise/view.html:210
+#: exercises/templates/exercise/view.html:260
msgid "The diagram shows the most used muscles on this exercise"
msgstr ""
-#: exercises/templates/exercise/view.html:251
+#: exercises/templates/exercise/view.html:301
#: manager/templates/workout/log.html:10 manager/templates/workout/log.html:11
msgid "Weight log"
msgstr ""
-#: exercises/templates/exercise/view.html:256
+#: exercises/templates/exercise/view.html:306
msgid "Exercise Variations"
msgstr ""
-#: exercises/templates/exercise/view.html:277
+#: exercises/templates/exercise/view.html:327
msgid "Submit a correction"
msgstr ""
@@ -1801,30 +1876,30 @@ msgstr ""
msgid "Delete equipment?"
msgstr ""
-#: exercises/views/exercises.py:228
+#: exercises/views/exercises.py:229
#, python-format
msgid ""
"%(name_original)s is too similar to existing exercise \"%(exercise_name)s\""
msgstr ""
-#: exercises/views/exercises.py:246
+#: exercises/views/exercises.py:247
msgid "Add exercise"
msgstr ""
-#: exercises/views/exercises.py:366
+#: exercises/views/exercises.py:367
msgid "Thank you. Once the changes are reviewed the exercise will be updated."
msgstr ""
-#: exercises/views/exercises.py:379
+#: exercises/views/exercises.py:380
#, python-brace-format
msgid "Correct {0}"
msgstr "{0}を訂正する"
-#: exercises/views/exercises.py:421
+#: exercises/views/exercises.py:422
msgid "This will delete the exercise from all workouts."
msgstr ""
-#: exercises/views/exercises.py:473
+#: exercises/views/exercises.py:474
msgid "Exercise was successfully marked as rejected"
msgstr ""
@@ -1836,6 +1911,11 @@ msgstr ""
msgid "Delete exercise image?"
msgstr ""
+#: exercises/views/videos.py:144 nutrition/views/log.py:230
+#: nutrition/views/unit_ingredient.py:139
+msgid "Delete?"
+msgstr ""
+
#: gallery/templates/images/overview.html:62
#, fuzzy
#| msgid "Add member"
@@ -1904,8 +1984,8 @@ msgid "Contract type"
msgstr ""
#: gym/models/contract.py:208 gym/templates/contract/view.html:59
-#: manager/templates/log/add.html:52 nutrition/forms.py:58
-#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:92
+#: manager/templates/log/add.html:52 nutrition/forms.py:59
+#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:102
#: nutrition/models/meal_item.py:72
msgid "Amount"
msgstr ""
@@ -2340,6 +2420,7 @@ msgid ""
msgstr ""
#: mailer/templates/mailer/gym/preview.html:22
+#: software/templates/about_us.html:59
msgid "Current version"
msgstr ""
@@ -2372,7 +2453,8 @@ msgstr ""
#: manager/models/log.py:90 manager/models/setting.py:47
#: manager/models/setting.py:78 manager/templates/log/add.html:53
#: manager/templates/log/add.html:55 manager/templates/set/formset.html:11
-#: manager/templates/set/formset.html:13 nutrition/forms.py:62
+#: manager/templates/set/formset.html:13 measurements/models/category.py:58
+#: nutrition/forms.py:63
msgid "Unit"
msgstr "単位"
@@ -2435,10 +2517,6 @@ msgstr ""
msgid "schedule"
msgstr ""
-#: manager/models/schedule_step.py:56
-msgid "Duration"
-msgstr ""
-
#: manager/models/schedule_step.py:57
msgid "The duration in weeks"
msgstr ""
@@ -2692,7 +2770,7 @@ msgstr ""
#: manager/templates/schedule/view.html:290
#: manager/templates/workout/view.html:142
#: manager/templates/workout/view.html:217
-#: nutrition/templates/plan/view.html:415
+#: nutrition/templates/plan/view.html:417
msgid "Download as PDF"
msgstr ""
@@ -2911,30 +2989,34 @@ msgstr ""
msgid "This will delete all weight logs for this day as well."
msgstr ""
-#: nutrition/forms.py:121
+#: measurements/models/measurement.py:69
+msgid "Value"
+msgstr ""
+
+#: nutrition/forms.py:122
msgid "Calculate"
msgstr ""
-#: nutrition/forms.py:194 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:195 nutrition/templates/rate/form.html:76
msgid "Basic caloric intake"
msgstr "基礎カロリー摂取量"
-#: nutrition/forms.py:195
+#: nutrition/forms.py:196
msgid "Your basic caloric intake as calculated for your data"
msgstr ""
-#: nutrition/forms.py:201
+#: nutrition/forms.py:202
msgid "Additional calories"
msgstr ""
-#: nutrition/forms.py:203
+#: nutrition/forms.py:204
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
msgstr ""
-#: nutrition/forms.py:231 nutrition/models/ingredient_weight_unit.py:39
-#: nutrition/models/log.py:71 nutrition/models/meal_item.py:53
+#: nutrition/forms.py:232 nutrition/models/ingredient_weight_unit.py:39
+#: nutrition/models/log.py:81 nutrition/models/meal_item.py:53
#: nutrition/templates/log/detail.html:155
msgid "Ingredient"
msgstr "材料"
@@ -2953,14 +3035,14 @@ msgstr ""
#: nutrition/models/ingredient.py:123
#: nutrition/templates/ingredient/view.html:96
#: nutrition/templates/log/detail.html:78
-#: nutrition/templates/plan/view.html:262 nutrition/views/plan.py:406
+#: nutrition/templates/plan/view.html:264 nutrition/views/plan.py:406
msgid "Sugar content in carbohydrates"
msgstr ""
#: nutrition/models/ingredient.py:141
#: nutrition/templates/ingredient/view.html:112
#: nutrition/templates/log/detail.html:104
-#: nutrition/templates/plan/view.html:274 nutrition/views/plan.py:420
+#: nutrition/templates/plan/view.html:276 nutrition/views/plan.py:420
msgid "Saturated fat content in fats"
msgstr ""
@@ -2968,7 +3050,7 @@ msgstr ""
#: nutrition/templates/ingredient/view.html:134
#: nutrition/templates/log/detail.html:122
#: nutrition/templates/log/detail.html:178
-#: nutrition/templates/plan/view.html:285 nutrition/views/plan.py:426
+#: nutrition/templates/plan/view.html:287 nutrition/views/plan.py:426
msgid "Fibres"
msgstr "食物繊維"
@@ -2976,7 +3058,7 @@ msgstr "食物繊維"
#: nutrition/templates/ingredient/view.html:144
#: nutrition/templates/log/detail.html:135
#: nutrition/templates/log/detail.html:181
-#: nutrition/templates/plan/view.html:291 nutrition/views/plan.py:432
+#: nutrition/templates/plan/view.html:293 nutrition/views/plan.py:432
msgid "Sodium"
msgstr "ナトリウム"
@@ -3021,10 +3103,20 @@ msgstr ""
msgid "Unit amount, e.g. \"1 Cup\" or \"1/2 spoon\""
msgstr ""
+#: nutrition/models/log.py:55
+msgid "Meal"
+msgstr ""
+
#: nutrition/models/meal.py:61
msgid "Time (approx)"
msgstr ""
+#: nutrition/models/meal.py:68
+msgid ""
+"Give meals a textual description / name such as \"Breakfast\" or \"after "
+"workout\""
+msgstr ""
+
#: nutrition/models/plan.py:71
msgid ""
"A description of the goal of the plan, e.g. \"Gain mass\" or \"Prepare for "
@@ -3153,12 +3245,12 @@ msgstr ""
#: nutrition/templates/ingredient/view.html:71
#: nutrition/templates/log/detail.html:31
-#: nutrition/templates/plan/view.html:227 nutrition/views/plan.py:376
+#: nutrition/templates/plan/view.html:229 nutrition/views/plan.py:376
msgid "Macronutrients"
msgstr ""
#: nutrition/templates/ingredient/view.html:80
-#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:244
+#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:246
msgid "kJ"
msgstr ""
@@ -3171,7 +3263,7 @@ msgstr ""
#: nutrition/templates/ingredient/view.html:128
#: nutrition/templates/log/detail.html:119
-#: nutrition/templates/plan/view.html:282
+#: nutrition/templates/plan/view.html:284
msgid "Others"
msgstr ""
@@ -3200,7 +3292,7 @@ msgstr ""
#: nutrition/templates/log/detail.html:7
#: nutrition/templates/log/overview.html:7
-#: nutrition/templates/plan/view.html:300
+#: nutrition/templates/plan/view.html:302
msgid "Nutrition diary"
msgstr ""
@@ -3210,13 +3302,13 @@ msgstr ""
#: nutrition/templates/log/detail.html:33
#: nutrition/templates/log/overview.html:31
-#: nutrition/templates/plan/view.html:308
+#: nutrition/templates/plan/view.html:310
msgid "Logged"
msgstr ""
#: nutrition/templates/log/detail.html:34
#: nutrition/templates/log/overview.html:32
-#: nutrition/templates/plan/view.html:309
+#: nutrition/templates/plan/view.html:311
msgid "Difference"
msgstr ""
@@ -3229,7 +3321,7 @@ msgid "g"
msgstr "g"
#: nutrition/templates/log/overview.html:53
-#: nutrition/templates/plan/view.html:330
+#: nutrition/templates/plan/view.html:332
msgid "nothing found"
msgstr ""
@@ -3249,77 +3341,77 @@ msgstr ""
msgid "Add ingredient to meal"
msgstr ""
-#: nutrition/templates/plan/view.html:150
+#: nutrition/templates/plan/view.html:152
msgid "No items for this meal."
msgstr ""
-#: nutrition/templates/plan/view.html:188
+#: nutrition/templates/plan/view.html:190
msgid "No meals for this plan."
msgstr ""
-#: nutrition/templates/plan/view.html:200
+#: nutrition/templates/plan/view.html:202
msgid "Log this Plan"
msgstr ""
-#: nutrition/templates/plan/view.html:206
+#: nutrition/templates/plan/view.html:208
msgid "Add a new meal"
msgstr ""
-#: nutrition/templates/plan/view.html:216 nutrition/views/plan.py:369
+#: nutrition/templates/plan/view.html:218 nutrition/views/plan.py:369
msgid "Nutritional data"
msgstr ""
-#: nutrition/templates/plan/view.html:219
+#: nutrition/templates/plan/view.html:221
#, python-format
msgid "Based on the weight entry dated %(date)s (%(weight)s)"
msgstr ""
-#: nutrition/templates/plan/view.html:228 nutrition/views/plan.py:377
+#: nutrition/templates/plan/view.html:230 nutrition/views/plan.py:377
msgid "Total"
msgstr ""
-#: nutrition/templates/plan/view.html:229 nutrition/views/plan.py:378
+#: nutrition/templates/plan/view.html:231 nutrition/views/plan.py:378
msgid "Percent of energy"
msgstr ""
-#: nutrition/templates/plan/view.html:232 nutrition/views/plan.py:379
+#: nutrition/templates/plan/view.html:234 nutrition/views/plan.py:379
msgid "g per body kg"
msgstr ""
-#: nutrition/templates/plan/view.html:234
+#: nutrition/templates/plan/view.html:236
msgid "oz per body lb"
msgstr ""
-#: nutrition/templates/plan/view.html:338
+#: nutrition/templates/plan/view.html:340
msgid "View complete nutrition log"
msgstr ""
-#: nutrition/templates/plan/view.html:371
+#: nutrition/templates/plan/view.html:373
msgid "Goal"
msgstr "目標"
-#: nutrition/templates/plan/view.html:382
+#: nutrition/templates/plan/view.html:384
msgid ""
"You have selected that this nutritional plan has a\n"
" goal amount of calories. Use the calculator or enter the value\n"
" yourself."
msgstr ""
-#: nutrition/templates/plan/view.html:392
+#: nutrition/templates/plan/view.html:394
msgid ""
"If you find the ingredient list too short, you might want to activate the "
"preference to also show English ingredients."
msgstr ""
-#: nutrition/templates/plan/view.html:421
+#: nutrition/templates/plan/view.html:423
msgid "Edit nutrition plan"
msgstr ""
-#: nutrition/templates/plan/view.html:425
+#: nutrition/templates/plan/view.html:427
msgid "Make a copy of this nutrition plan"
msgstr ""
-#: nutrition/templates/plan/view.html:431
+#: nutrition/templates/plan/view.html:433
msgid "Delete nutrition plan"
msgstr ""
@@ -3399,10 +3491,6 @@ msgstr ""
msgid "Ingredient was successfully marked as rejected"
msgstr ""
-#: nutrition/views/log.py:229 nutrition/views/unit_ingredient.py:139
-msgid "Delete?"
-msgstr ""
-
#: nutrition/views/meal.py:55
msgid "Add new meal"
msgstr ""
@@ -3760,11 +3848,11 @@ msgstr ""
msgid "Re-Submit"
msgstr ""
-#: weight/templates/overview.html:68
+#: weight/templates/overview.html:51
msgid "Export as CSV"
msgstr "CSVで出力"
-#: weight/templates/overview.html:72
+#: weight/templates/overview.html:55
msgid "Import from spreadsheet"
msgstr ""
@@ -3782,6 +3870,9 @@ msgstr ""
msgid "Delete weight entry for the %s"
msgstr ""
+#~ msgid "Your current weight is: "
+#~ msgstr "現在の体重:"
+
#~ msgid "Twitter"
#~ msgstr "Twitter"
diff --git a/wger/locale/ko/LC_MESSAGES/django.po b/wger/locale/ko/LC_MESSAGES/django.po
index c9218ab50..cf8903617 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: 2021-08-17 17:23+0200\n"
+"POT-Creation-Date: 2022-02-15 14:51+0100\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"
@@ -49,16 +49,16 @@ msgstr "언어"
msgid "Nothing found."
msgstr "찾을 수 없음."
-#: config/templates/language/overview.html:16 core/templates/index.html:147
-#: core/templates/index.html:199 manager/templates/calendar/month.html:132
+#: config/templates/language/overview.html:16 core/templates/index.html:137
+#: core/templates/index.html:189 manager/templates/calendar/month.html:132
#: manager/templates/schedule/overview.html:28
#: manager/templates/schedule/view.html:146
#: manager/templates/workout/overview.html:28
#: nutrition/templates/ingredient/overview.html:45
#: nutrition/templates/plan/overview.html:23
-#: nutrition/templates/plan/view.html:148
-#: nutrition/templates/plan/view.html:151
-#: nutrition/templates/plan/view.html:189
+#: nutrition/templates/plan/view.html:150
+#: nutrition/templates/plan/view.html:153
+#: nutrition/templates/plan/view.html:191
msgid "Add one now."
msgstr "추가하세요."
@@ -79,7 +79,7 @@ msgstr "추가하세요."
#: gym/templates/gym/member_list.html:244
#: gym/templates/gym/member_list.html:281
#: mailer/templates/mailer/gym/overview.html:43
-#: weight/templates/overview.html:78
+#: weight/templates/overview.html:61
msgid "Add"
msgstr "추가"
@@ -113,14 +113,14 @@ msgstr "보기"
#: config/templates/language/view.html:91 core/templates/user/api_key.html:44
#: core/templates/user/preferences.html:28
-#: exercises/templates/exercise/view.html:273
-#: exercises/templates/exercise/view.html:296 gym/models/contract.py:200
+#: exercises/templates/exercise/view.html:323
+#: exercises/templates/exercise/view.html:346 gym/models/contract.py:200
#: gym/templates/contract/view.html:41 gym/templates/contract/view.html:106
#: gym/templates/gym/member_list.html:248
#: manager/templates/schedule/view.html:281
#: manager/templates/workout/view.html:206
#: nutrition/templates/ingredient/view.html:226
-#: nutrition/templates/plan/view.html:409 weight/templates/overview.html:62
+#: nutrition/templates/plan/view.html:411 weight/templates/overview.html:45
msgid "Options"
msgstr "옵션"
@@ -134,12 +134,12 @@ msgstr "옵션"
#: core/templates/weight_unit/list.html:17
#: exercises/templates/categories/admin-overview.html:16
#: exercises/templates/equipment/admin-overview.html:16
-#: exercises/templates/exercise/view.html:180
-#: exercises/templates/exercise/view.html:301
+#: exercises/templates/exercise/view.html:230
+#: exercises/templates/exercise/view.html:351
#: exercises/templates/muscles/admin-overview.html:16
-#: exercises/views/comments.py:63 gallery/views/images.py:96
-#: gym/templates/admin_notes/list.html:32 gym/templates/contract/list.html:31
-#: gym/templates/contract/view.html:107
+#: exercises/views/comments.py:63 exercises/views/videos.py:69
+#: gallery/views/images.py:96 gym/templates/admin_notes/list.html:32
+#: gym/templates/contract/list.html:31 gym/templates/contract/view.html:107
#: gym/templates/contract_option/list.html:31
#: gym/templates/contract_type/list.html:31 gym/templates/document/list.html:38
#: gym/templates/gym/list.html:19 gym/templates/gym/list.html:43
@@ -150,7 +150,7 @@ msgstr "옵션"
#: manager/templates/calendar/partial_overview_table.html:18
#: manager/templates/schedule/view.html:121
#: nutrition/templates/ingredient/view.html:198
-#: nutrition/templates/plan/view.html:89 nutrition/templates/plan/view.html:124
+#: nutrition/templates/plan/view.html:89 nutrition/templates/plan/view.html:126
#: nutrition/templates/units/list.html:18
msgid "Edit"
msgstr "수정"
@@ -164,9 +164,9 @@ msgstr "수정"
#: exercises/templates/categories/admin-overview.html:17
#: exercises/templates/equipment/admin-overview.html:17
#: exercises/templates/exercise/view.html:68
-#: exercises/templates/exercise/view.html:155
-#: exercises/templates/exercise/view.html:185
-#: exercises/templates/exercise/view.html:306
+#: exercises/templates/exercise/view.html:205
+#: exercises/templates/exercise/view.html:235
+#: exercises/templates/exercise/view.html:356
#: exercises/templates/muscles/admin-overview.html:17
#: gym/templates/admin_notes/list.html:40
#: gym/templates/contract_option/list.html:39
@@ -179,7 +179,7 @@ msgstr "수정"
#: nutrition/templates/ingredient/view.html:199
#: nutrition/templates/ingredient/view.html:239
#: nutrition/templates/log/detail.html:197
-#: nutrition/templates/plan/view.html:95 nutrition/templates/plan/view.html:130
+#: nutrition/templates/plan/view.html:95 nutrition/templates/plan/view.html:132
#: nutrition/templates/units/list.html:20
msgid "Delete"
msgstr "삭제"
@@ -309,7 +309,7 @@ msgid "Some way of answering you (e-mail, etc.)"
msgstr "답변방법 (이메일 등)"
#: core/forms.py:265 exercises/models/comment.py:40 manager/models/set.py:60
-#: manager/models/setting.py:99 nutrition/models/log.py:61
+#: manager/models/setting.py:99 nutrition/models/log.py:71
msgid "Comment"
msgstr "Comment"
@@ -438,7 +438,7 @@ msgstr ""
msgid "Age"
msgstr "나이"
-#: core/models/profile.py:202 nutrition/forms.py:98
+#: core/models/profile.py:202 nutrition/forms.py:99
msgid "Height (cm)"
msgstr "키 (cm)"
@@ -489,7 +489,7 @@ msgid "Total caloric intake, including e.g. any surplus"
msgstr ""
#: core/models/profile.py:305 nutrition/models/ingredient_weight_unit.py:45
-#: nutrition/models/log.py:80 nutrition/models/meal_item.py:58
+#: nutrition/models/log.py:90 nutrition/models/meal_item.py:58
msgid "Weight unit"
msgstr ""
@@ -524,9 +524,9 @@ msgstr ""
#: gym/models/user_document.py:87 gym/templates/contract/view.html:50
#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:96
#: gym/views/gym.py:156 manager/models/schedule.py:55
-#: manager/models/workout.py:56 nutrition/models/ingredient.py:96
-#: nutrition/models/ingredient_category.py:26
-#: nutrition/models/weight_unit.py:38
+#: manager/models/workout.py:56 measurements/models/category.py:53
+#: nutrition/models/ingredient.py:96 nutrition/models/ingredient_category.py:26
+#: nutrition/models/meal.py:66 nutrition/models/weight_unit.py:38
#: nutrition/templates/ingredient/pending.html:15
#: nutrition/templates/ingredient/view.html:185
msgid "Name"
@@ -582,17 +582,17 @@ msgstr ""
msgid "Dashboard"
msgstr "대시보드"
-#: core/templates/index.html:31 manager/templates/calendar/month.html:115
+#: core/templates/index.html:21 manager/templates/calendar/month.html:115
msgid "Add log to day"
msgstr ""
-#: core/templates/index.html:35 manager/templates/calendar/month.html:120
+#: core/templates/index.html:25 manager/templates/calendar/month.html:120
msgid ""
"Click to add weight logs to a training\n"
"day in your current workout:"
msgstr ""
-#: core/templates/index.html:43 core/templates/index.html:83
+#: core/templates/index.html:33 core/templates/index.html:73
#: core/templates/misc/fragments/shariff_modal.html:29
#: core/templates/template.html:125 manager/templates/calendar/month.html:138
#: manager/templates/schedule/view.html:246
@@ -602,17 +602,17 @@ msgstr ""
msgid "Close"
msgstr ""
-#: core/templates/index.html:54 core/templates/index.html:203
+#: core/templates/index.html:44 core/templates/index.html:193
msgid "Add new diary entry"
msgstr ""
-#: core/templates/index.html:59
+#: core/templates/index.html:49
msgid ""
"Click to add an entry to your nutrition diary for today. You can either log "
"a meal as you defined it, or entry any number of custom entries."
msgstr ""
-#: core/templates/index.html:67 core/templates/index.html:171
+#: core/templates/index.html:57 core/templates/index.html:161
#: core/templates/user/overview.html:171
#: nutrition/templates/ingredient/view.html:79
#: nutrition/templates/log/detail.html:40
@@ -621,19 +621,19 @@ msgstr ""
#: nutrition/templates/log/overview.html:7
#: nutrition/templates/log/overview.html:44
#: nutrition/templates/plan/overview.html:17
-#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:242
-#: nutrition/templates/plan/view.html:301
-#: nutrition/templates/plan/view.html:321
-#: nutrition/templates/plan/view.html:363
-#: nutrition/templates/plan/view.html:373
+#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:244
+#: nutrition/templates/plan/view.html:303
+#: nutrition/templates/plan/view.html:323
+#: nutrition/templates/plan/view.html:365
+#: nutrition/templates/plan/view.html:375
msgid "kcal"
msgstr ""
-#: core/templates/index.html:79 nutrition/templates/plan/view.html:348
+#: core/templates/index.html:69 nutrition/templates/plan/view.html:350
msgid "Add custom diary entry"
msgstr ""
-#: core/templates/index.html:94 core/templates/index.html:102
+#: core/templates/index.html:84 core/templates/index.html:92
#: manager/models/day.py:34 manager/models/log.py:56
#: manager/models/session.py:60 manager/models/workout.py:109
#: manager/templates/schedule/view.html:105
@@ -644,80 +644,80 @@ msgstr ""
msgid "Workout"
msgstr "운동"
-#: core/templates/index.html:128
+#: core/templates/index.html:118
msgid "This workout is part of a schedule:"
msgstr ""
-#: core/templates/index.html:133
+#: core/templates/index.html:123
msgid ""
"The current workout is selected from your active schedule or, if you don't "
"have one, simply by date."
msgstr ""
-#: core/templates/index.html:142 manager/templates/calendar/month.html:188
+#: core/templates/index.html:132 manager/templates/calendar/month.html:188
msgid "Add new log"
msgstr ""
-#: core/templates/index.html:147 core/templates/user/overview.html:58
+#: core/templates/index.html:137 core/templates/user/overview.html:58
#: manager/templates/calendar/month.html:128
#: manager/templates/schedule/view.html:146
#: manager/templates/workout/overview.html:28
msgid "No workouts found."
msgstr "Workout을 찾을 수 없음."
-#: core/templates/index.html:157 nutrition/models/log.py:48
+#: core/templates/index.html:147 nutrition/models/log.py:49
#: nutrition/models/meal.py:49 nutrition/models/meal_item.py:47
#: nutrition/models/plan.py:94 nutrition/templates/plan/view.html:11
#: nutrition/templates/plan/view.html:19
msgid "Nutrition plan"
msgstr ""
-#: core/templates/index.html:169 core/templates/user/overview.html:155
+#: core/templates/index.html:159 core/templates/user/overview.html:155
#: nutrition/models/ingredient.py:100
#: nutrition/templates/ingredient/view.html:77
#: nutrition/templates/log/detail.html:39
#: nutrition/templates/log/detail.html:156
-#: nutrition/templates/plan/view.html:53 nutrition/templates/plan/view.html:241
-#: nutrition/templates/plan/view.html:358
-#: nutrition/templates/plan/view.html:362 nutrition/views/plan.py:384
+#: nutrition/templates/plan/view.html:53 nutrition/templates/plan/view.html:243
+#: nutrition/templates/plan/view.html:360
+#: nutrition/templates/plan/view.html:364 nutrition/views/plan.py:384
msgid "Energy"
msgstr ""
-#: core/templates/index.html:175 core/templates/user/overview.html:156
+#: core/templates/index.html:165 core/templates/user/overview.html:156
#: nutrition/models/ingredient.py:105
#: nutrition/templates/ingredient/view.html:84
#: nutrition/templates/log/detail.html:52
#: nutrition/templates/log/detail.html:174
-#: nutrition/templates/plan/view.html:54 nutrition/templates/plan/view.html:249
+#: nutrition/templates/plan/view.html:54 nutrition/templates/plan/view.html:251
#: nutrition/views/plan.py:390
msgid "Protein"
msgstr ""
-#: core/templates/index.html:181 core/templates/user/overview.html:157
+#: core/templates/index.html:171 core/templates/user/overview.html:157
#: nutrition/models/ingredient.py:113
#: nutrition/templates/ingredient/view.html:90
#: nutrition/templates/log/detail.html:65
#: nutrition/templates/log/detail.html:175
-#: nutrition/templates/plan/view.html:55 nutrition/templates/plan/view.html:255
+#: nutrition/templates/plan/view.html:55 nutrition/templates/plan/view.html:257
#: nutrition/views/plan.py:398
msgid "Carbohydrates"
msgstr ""
-#: core/templates/index.html:187 core/templates/user/overview.html:158
+#: core/templates/index.html:177 core/templates/user/overview.html:158
#: nutrition/models/ingredient.py:131
#: nutrition/templates/ingredient/view.html:106
#: nutrition/templates/log/detail.html:91
#: nutrition/templates/log/detail.html:176
-#: nutrition/templates/plan/view.html:56 nutrition/templates/plan/view.html:268
+#: nutrition/templates/plan/view.html:56 nutrition/templates/plan/view.html:270
#: nutrition/views/plan.py:412
msgid "Fat"
msgstr ""
-#: core/templates/index.html:199 nutrition/templates/plan/overview.html:22
+#: core/templates/index.html:189 nutrition/templates/plan/overview.html:22
msgid "No nutrition plans."
msgstr ""
-#: core/templates/index.html:213 core/templates/user/overview.html:112
+#: core/templates/index.html:203 core/templates/user/overview.html:112
#: core/templates/user/overview.html:121 manager/forms.py:173
#: manager/helpers.py:89 manager/models/log.py:84 manager/models/setting.py:67
#: manager/templates/log/add.html:54 manager/templates/set/formset.html:12
@@ -726,11 +726,7 @@ msgstr ""
msgid "Weight"
msgstr ""
-#: core/templates/index.html:217
-msgid "Your current weight is: "
-msgstr "현재 체중은 : "
-
-#: core/templates/index.html:248 core/templates/navigation.html:97
+#: core/templates/index.html:210 core/templates/navigation.html:97
#: weight/views.py:70
msgid "Add weight entry"
msgstr "체중 기록 추가"
@@ -762,7 +758,7 @@ msgstr "라이센스 리스트"
msgid "Nothing found"
msgstr ""
-#: core/templates/misc/about.html:4 core/templates/template.html:201
+#: core/templates/misc/about.html:4 core/templates/template.html:175
#: core/templates/template_features.html:118
#: core/templates/template_no_context.html:88
msgid "Imprint"
@@ -778,8 +774,8 @@ msgid ""
msgstr ""
#: core/templates/misc/fragments/shariff_modal.html:22
-#: nutrition/templates/plan/view.html:385
-#: nutrition/templates/plan/view.html:394
+#: nutrition/templates/plan/view.html:387
+#: nutrition/templates/plan/view.html:396
msgid "That's done here"
msgstr ""
@@ -869,7 +865,7 @@ msgstr ""
msgid "Equipment"
msgstr ""
-#: core/templates/navigation.html:78 exercises/templates/exercise/view.html:208
+#: core/templates/navigation.html:78 exercises/templates/exercise/view.html:258
msgid "Muscles"
msgstr ""
@@ -942,7 +938,7 @@ msgstr ""
msgid "Get the code"
msgstr ""
-#: core/templates/navigation.html:175 core/templates/template.html:193
+#: core/templates/navigation.html:175 core/templates/template.html:205
#: core/templates/template_features.html:100
msgid "Translate"
msgstr ""
@@ -1091,15 +1087,11 @@ msgstr ""
msgid "Create some demo entries"
msgstr ""
-#: core/templates/template.html:202 core/templates/template_features.html:122
+#: core/templates/template.html:176 core/templates/template_features.html:122
#: core/templates/template_no_context.html:89 software/templates/tos.html:7
msgid "Terms of service"
msgstr ""
-#: core/templates/template.html:209 core/templates/template.html:210
-msgid "Released under the Affero GPL"
-msgstr ""
-
#: core/templates/template_features.html:62 software/templates/features.html:9
#: software/templates/features.html:120
msgid "Features"
@@ -1199,9 +1191,10 @@ msgstr "Workout 추가"
#: core/templates/user/overview.html:120 core/templates/user/overview.html:153
#: exercises/models/exercise.py:77 gallery/models/image.py:47
#: manager/helpers.py:88 manager/models/log.py:98 manager/models/session.py:67
-#: nutrition/models/ingredient.py:85 nutrition/models/ingredient.py:87
-#: nutrition/models/ingredient.py:190 nutrition/templates/log/overview.html:30
-#: nutrition/templates/plan/view.html:307 weight/models.py:32
+#: measurements/models/measurement.py:64 nutrition/models/ingredient.py:85
+#: nutrition/models/ingredient.py:87 nutrition/models/ingredient.py:190
+#: nutrition/templates/log/overview.html:30
+#: nutrition/templates/plan/view.html:309 weight/models.py:32
#: weight/templates/import_csv_preview.html:13
#: weight/templates/import_csv_preview.html:42 weight/views.py:150
msgid "Date"
@@ -1209,10 +1202,10 @@ msgstr "날짜"
#: core/templates/user/overview.html:35 core/templates/user/overview.html:154
#: exercises/models/exercise.py:61 exercises/templates/exercise/view.html:88
-#: exercises/views/exercises.py:189 gallery/models/image.py:70
+#: exercises/views/exercises.py:190 gallery/models/image.py:70
#: gym/models/contract.py:57 gym/models/contract.py:107
#: manager/models/day.py:37 manager/models/workout.py:62
-#: nutrition/models/plan.py:69
+#: measurements/models/measurement.py:79 nutrition/models/plan.py:69
msgid "Description"
msgstr ""
@@ -1373,11 +1366,11 @@ msgstr "환경설정"
msgid "Change password"
msgstr ""
-#: core/templatetags/wger_extras.py:217
+#: core/templatetags/wger_extras.py:229
msgid "kg"
msgstr ""
-#: core/templatetags/wger_extras.py:219
+#: core/templatetags/wger_extras.py:231
#: nutrition/templates/ingredient/view.html:86
#: nutrition/templates/ingredient/view.html:92
#: nutrition/templates/ingredient/view.html:99
@@ -1389,28 +1382,28 @@ msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr ""
-#: core/templatetags/wger_extras.py:222
+#: core/templatetags/wger_extras.py:234
msgid "lb"
msgstr ""
-#: core/templatetags/wger_extras.py:224
+#: core/templatetags/wger_extras.py:236
msgctxt "weight unit, i.e. ounces"
msgid "oz"
msgstr ""
#: core/views/languages.py:85 exercises/views/categories.py:121
-#: exercises/views/equipment.py:106 exercises/views/exercises.py:422
+#: exercises/views/equipment.py:106 exercises/views/exercises.py:423
#: exercises/views/images.py:128 exercises/views/muscles.py:118
-#: manager/views/schedule.py:311 manager/views/schedule_step.py:129
-#: manager/views/workout.py:268 manager/views/workout_session.py:141
-#: nutrition/views/ingredient.py:144 nutrition/views/plan.py:120
-#: nutrition/views/unit.py:111
+#: exercises/views/videos.py:129 manager/views/schedule.py:311
+#: manager/views/schedule_step.py:129 manager/views/workout.py:268
+#: manager/views/workout_session.py:141 nutrition/views/ingredient.py:144
+#: nutrition/views/plan.py:120 nutrition/views/unit.py:111
msgid "Successfully deleted"
msgstr ""
#: core/views/languages.py:93 core/views/license.py:103
#: core/views/repetition_units.py:115 core/views/weight_units.py:115
-#: exercises/views/categories.py:127 exercises/views/exercises.py:430
+#: exercises/views/categories.py:127 exercises/views/exercises.py:431
#: exercises/views/muscles.py:125 gallery/views/images.py:121
#: gym/views/admin_notes.py:196 gym/views/document.py:206 gym/views/gym.py:486
#: manager/views/schedule.py:318 manager/views/schedule_step.py:139
@@ -1424,7 +1417,7 @@ msgstr ""
#: core/views/languages.py:111 core/views/license.py:84
#: core/views/repetition_units.py:85 core/views/user.py:456
#: core/views/weight_units.py:85 exercises/views/categories.py:97
-#: exercises/views/equipment.py:83 exercises/views/exercises.py:304
+#: exercises/views/equipment.py:83 exercises/views/exercises.py:305
#: exercises/views/muscles.py:105 gym/views/admin_notes.py:160
#: gym/views/config.py:68 gym/views/contract.py:186
#: gym/views/contract_option.py:123 gym/views/contract_type.py:123
@@ -1511,7 +1504,7 @@ msgstr ""
#: exercises/models/base.py:64 exercises/templates/equipment/overview.html:71
#: exercises/templates/exercise/overview.html:76
-#: exercises/templates/exercise/view.html:218
+#: exercises/templates/exercise/view.html:268
#: exercises/templates/muscles/overview.html:73
msgid "Secondary muscles"
msgstr ""
@@ -1524,8 +1517,9 @@ msgstr ""
msgid "Exercise Categories"
msgstr ""
-#: exercises/models/comment.py:34 exercises/models/image.py:62
-#: manager/forms.py:165 manager/helpers.py:89 manager/models/log.py:51
+#: exercises/models/comment.py:34 exercises/models/image.py:75
+#: exercises/models/video.py:82 manager/forms.py:165 manager/helpers.py:89
+#: manager/models/log.py:51
msgid "Exercise"
msgstr ""
@@ -1538,43 +1532,67 @@ msgstr ""
msgid "Language"
msgstr ""
-#: exercises/models/exercise.py:233 exercises/views/exercises.py:460
+#: exercises/models/exercise.py:237 exercises/views/exercises.py:461
msgid "Exercise was successfully added to the general database"
msgstr ""
-#: exercises/models/exercise.py:261
+#: exercises/models/exercise.py:265
msgid "New user submitted exercise"
msgstr ""
-#: exercises/models/exercise.py:263
+#: exercises/models/exercise.py:267
#, python-brace-format
msgid "The user {0} submitted a new exercise \"{1}\"."
msgstr ""
-#: exercises/models/image.py:68 gallery/models/image.py:56
+#: exercises/models/image.py:59
+msgid "Line"
+msgstr ""
+
+#: exercises/models/image.py:60
+msgid "3D"
+msgstr ""
+
+#: exercises/models/image.py:61
+msgid "Low-poly"
+msgstr ""
+
+#: exercises/models/image.py:62
+msgid "Photo"
+msgstr ""
+
+#: exercises/models/image.py:63
+msgid "Other"
+msgstr ""
+
+#: exercises/models/image.py:81 gallery/models/image.py:56
msgid "Image"
msgstr ""
-#: exercises/models/image.py:69 gallery/models/image.py:57
+#: exercises/models/image.py:82 gallery/models/image.py:57
msgid "Only PNG and JPEG formats are supported"
msgstr ""
-#: exercises/models/image.py:75
+#: exercises/models/image.py:88
msgid "Main picture"
msgstr ""
-#: exercises/models/image.py:78
+#: exercises/models/image.py:91
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 "
"by the system."
msgstr ""
-#: exercises/models/image.py:166
+#: exercises/models/image.py:100
+msgid "The art style of your image"
+msgstr ""
+
+#: exercises/models/image.py:185
msgid "New user submitted image"
msgstr ""
-#: exercises/models/image.py:167
+#: exercises/models/image.py:186
#, python-brace-format
msgid "The user {0} submitted a new image \"{1}\" for exercise {2}."
msgstr ""
@@ -1583,6 +1601,54 @@ msgstr ""
msgid "In latin, e.g. \"Pectoralis major\""
msgstr ""
+#: exercises/models/video.py:41
+msgid "Maximum file size is 100MB."
+msgstr ""
+
+#: exercises/models/video.py:44 exercises/models/video.py:48
+msgid "File type is not supported"
+msgstr ""
+
+#: exercises/models/video.py:57
+#, fuzzy
+#| msgid "%(birthdate)s is not a valid birthdate"
+msgid "File is not a valid video"
+msgstr "%(birthdate)s은 유효하지 않은 생년월일입니다."
+
+#: exercises/models/video.py:88
+msgid "Main video"
+msgstr ""
+
+#: exercises/models/video.py:94
+msgid "Video"
+msgstr ""
+
+#: exercises/models/video.py:101
+msgid "Size"
+msgstr ""
+
+#: exercises/models/video.py:108 manager/models/schedule_step.py:56
+msgid "Duration"
+msgstr ""
+
+#: exercises/models/video.py:117
+msgid "Width"
+msgstr ""
+
+#: exercises/models/video.py:124
+#, fuzzy
+#| msgid "Height (cm)"
+msgid "Height"
+msgstr "키 (cm)"
+
+#: exercises/models/video.py:131
+msgid "Codec"
+msgstr ""
+
+#: exercises/models/video.py:139
+msgid "Codec, long name"
+msgstr ""
+
#: exercises/templates/equipment/admin-overview.html:4
msgid "Equipment list"
msgstr "장비 리스트"
@@ -1598,7 +1664,7 @@ msgstr ""
#: exercises/templates/equipment/overview.html:69
#: exercises/templates/exercise/overview.html:74
-#: exercises/templates/exercise/view.html:214
+#: exercises/templates/exercise/view.html:264
#: exercises/templates/muscles/overview.html:71
msgid "Main muscles"
msgstr ""
@@ -1713,7 +1779,8 @@ msgstr "제출일"
#: gym/templates/gym/new_user.html:22
#: gym/templates/gym/reset_user_password.html:20 manager/models/log.py:45
#: manager/models/schedule.py:44 manager/models/session.py:49
-#: manager/models/workout.py:89 nutrition/models/plan.py:55
+#: manager/models/workout.py:89 measurements/models/category.py:48
+#: measurements/models/measurement.py:59 nutrition/models/plan.py:55
#: nutrition/templates/ingredient/pending.html:16 weight/models.py:41
msgid "User"
msgstr ""
@@ -1738,13 +1805,13 @@ msgid "Please select one of the options below."
msgstr ""
#: exercises/templates/exercise/view.html:60
-#: exercises/templates/exercise/view.html:153
+#: exercises/templates/exercise/view.html:203
#: nutrition/templates/ingredient/view.html:38
msgid "Accept"
msgstr ""
#: exercises/templates/exercise/view.html:64
-#: exercises/templates/exercise/view.html:154
+#: exercises/templates/exercise/view.html:204
#: nutrition/templates/ingredient/view.html:42
msgid "Decline"
msgstr ""
@@ -1757,32 +1824,42 @@ msgstr ""
msgid "Add new image"
msgstr "새 이미지 추가"
-#: exercises/templates/exercise/view.html:147
+#: exercises/templates/exercise/view.html:148
+msgid "Videos"
+msgstr ""
+
+#: exercises/templates/exercise/view.html:187 exercises/views/videos.py:94
+#, fuzzy
+#| msgid "Add new image"
+msgid "Add new video"
+msgstr "새 이미지 추가"
+
+#: exercises/templates/exercise/view.html:197
msgid "Images pending review"
msgstr ""
-#: exercises/templates/exercise/view.html:168
+#: exercises/templates/exercise/view.html:218
msgid "Comments for this exercise"
msgstr ""
-#: exercises/templates/exercise/view.html:196
+#: exercises/templates/exercise/view.html:246
msgid "Add new comment"
msgstr "새 Comment 추가"
-#: exercises/templates/exercise/view.html:210
+#: exercises/templates/exercise/view.html:260
msgid "The diagram shows the most used muscles on this exercise"
msgstr ""
-#: exercises/templates/exercise/view.html:251
+#: exercises/templates/exercise/view.html:301
#: manager/templates/workout/log.html:10 manager/templates/workout/log.html:11
msgid "Weight log"
msgstr ""
-#: exercises/templates/exercise/view.html:256
+#: exercises/templates/exercise/view.html:306
msgid "Exercise Variations"
msgstr ""
-#: exercises/templates/exercise/view.html:277
+#: exercises/templates/exercise/view.html:327
msgid "Submit a correction"
msgstr ""
@@ -1817,30 +1894,30 @@ msgstr "Exercise comment 추가"
msgid "Delete equipment?"
msgstr ""
-#: exercises/views/exercises.py:228
+#: exercises/views/exercises.py:229
#, python-format
msgid ""
"%(name_original)s is too similar to existing exercise \"%(exercise_name)s\""
msgstr ""
-#: exercises/views/exercises.py:246
+#: exercises/views/exercises.py:247
msgid "Add exercise"
msgstr "Exercise 추가"
-#: exercises/views/exercises.py:366
+#: exercises/views/exercises.py:367
msgid "Thank you. Once the changes are reviewed the exercise will be updated."
msgstr "감사합니다. 변경 사항을 검토 후, Exercise가 업데이트됩니다."
-#: exercises/views/exercises.py:379
+#: exercises/views/exercises.py:380
#, python-brace-format
msgid "Correct {0}"
msgstr ""
-#: exercises/views/exercises.py:421
+#: exercises/views/exercises.py:422
msgid "This will delete the exercise from all workouts."
msgstr ""
-#: exercises/views/exercises.py:473
+#: exercises/views/exercises.py:474
msgid "Exercise was successfully marked as rejected"
msgstr ""
@@ -1852,6 +1929,11 @@ msgstr ""
msgid "Delete exercise image?"
msgstr ""
+#: exercises/views/videos.py:144 nutrition/views/log.py:230
+#: nutrition/views/unit_ingredient.py:139
+msgid "Delete?"
+msgstr ""
+
#: gallery/templates/images/overview.html:62
#, fuzzy
#| msgid "Add new image"
@@ -1920,8 +2002,8 @@ msgid "Contract type"
msgstr ""
#: gym/models/contract.py:208 gym/templates/contract/view.html:59
-#: manager/templates/log/add.html:52 nutrition/forms.py:58
-#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:92
+#: manager/templates/log/add.html:52 nutrition/forms.py:59
+#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:102
#: nutrition/models/meal_item.py:72
msgid "Amount"
msgstr ""
@@ -2357,6 +2439,7 @@ msgid ""
msgstr ""
#: mailer/templates/mailer/gym/preview.html:22
+#: software/templates/about_us.html:59
msgid "Current version"
msgstr ""
@@ -2389,7 +2472,8 @@ msgstr ""
#: manager/models/log.py:90 manager/models/setting.py:47
#: manager/models/setting.py:78 manager/templates/log/add.html:53
#: manager/templates/log/add.html:55 manager/templates/set/formset.html:11
-#: manager/templates/set/formset.html:13 nutrition/forms.py:62
+#: manager/templates/set/formset.html:13 measurements/models/category.py:58
+#: nutrition/forms.py:63
msgid "Unit"
msgstr ""
@@ -2452,10 +2536,6 @@ msgstr ""
msgid "schedule"
msgstr "일정"
-#: manager/models/schedule_step.py:56
-msgid "Duration"
-msgstr ""
-
#: manager/models/schedule_step.py:57
msgid "The duration in weeks"
msgstr ""
@@ -2720,7 +2800,7 @@ msgstr ""
#: manager/templates/schedule/view.html:290
#: manager/templates/workout/view.html:142
#: manager/templates/workout/view.html:217
-#: nutrition/templates/plan/view.html:415
+#: nutrition/templates/plan/view.html:417
msgid "Download as PDF"
msgstr ""
@@ -2943,30 +3023,34 @@ msgstr ""
msgid "This will delete all weight logs for this day as well."
msgstr ""
-#: nutrition/forms.py:121
+#: measurements/models/measurement.py:69
+msgid "Value"
+msgstr ""
+
+#: nutrition/forms.py:122
msgid "Calculate"
msgstr ""
-#: nutrition/forms.py:194 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:195 nutrition/templates/rate/form.html:76
msgid "Basic caloric intake"
msgstr ""
-#: nutrition/forms.py:195
+#: nutrition/forms.py:196
msgid "Your basic caloric intake as calculated for your data"
msgstr ""
-#: nutrition/forms.py:201
+#: nutrition/forms.py:202
msgid "Additional calories"
msgstr ""
-#: nutrition/forms.py:203
+#: nutrition/forms.py:204
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
msgstr ""
-#: nutrition/forms.py:231 nutrition/models/ingredient_weight_unit.py:39
-#: nutrition/models/log.py:71 nutrition/models/meal_item.py:53
+#: nutrition/forms.py:232 nutrition/models/ingredient_weight_unit.py:39
+#: nutrition/models/log.py:81 nutrition/models/meal_item.py:53
#: nutrition/templates/log/detail.html:155
msgid "Ingredient"
msgstr ""
@@ -2985,14 +3069,14 @@ msgstr ""
#: nutrition/models/ingredient.py:123
#: nutrition/templates/ingredient/view.html:96
#: nutrition/templates/log/detail.html:78
-#: nutrition/templates/plan/view.html:262 nutrition/views/plan.py:406
+#: nutrition/templates/plan/view.html:264 nutrition/views/plan.py:406
msgid "Sugar content in carbohydrates"
msgstr ""
#: nutrition/models/ingredient.py:141
#: nutrition/templates/ingredient/view.html:112
#: nutrition/templates/log/detail.html:104
-#: nutrition/templates/plan/view.html:274 nutrition/views/plan.py:420
+#: nutrition/templates/plan/view.html:276 nutrition/views/plan.py:420
msgid "Saturated fat content in fats"
msgstr ""
@@ -3000,7 +3084,7 @@ msgstr ""
#: nutrition/templates/ingredient/view.html:134
#: nutrition/templates/log/detail.html:122
#: nutrition/templates/log/detail.html:178
-#: nutrition/templates/plan/view.html:285 nutrition/views/plan.py:426
+#: nutrition/templates/plan/view.html:287 nutrition/views/plan.py:426
msgid "Fibres"
msgstr ""
@@ -3008,7 +3092,7 @@ msgstr ""
#: nutrition/templates/ingredient/view.html:144
#: nutrition/templates/log/detail.html:135
#: nutrition/templates/log/detail.html:181
-#: nutrition/templates/plan/view.html:291 nutrition/views/plan.py:432
+#: nutrition/templates/plan/view.html:293 nutrition/views/plan.py:432
msgid "Sodium"
msgstr ""
@@ -3053,10 +3137,20 @@ msgstr ""
msgid "Unit amount, e.g. \"1 Cup\" or \"1/2 spoon\""
msgstr ""
+#: nutrition/models/log.py:55
+msgid "Meal"
+msgstr ""
+
#: nutrition/models/meal.py:61
msgid "Time (approx)"
msgstr ""
+#: nutrition/models/meal.py:68
+msgid ""
+"Give meals a textual description / name such as \"Breakfast\" or \"after "
+"workout\""
+msgstr ""
+
#: nutrition/models/plan.py:71
msgid ""
"A description of the goal of the plan, e.g. \"Gain mass\" or \"Prepare for "
@@ -3189,12 +3283,12 @@ msgstr ""
#: nutrition/templates/ingredient/view.html:71
#: nutrition/templates/log/detail.html:31
-#: nutrition/templates/plan/view.html:227 nutrition/views/plan.py:376
+#: nutrition/templates/plan/view.html:229 nutrition/views/plan.py:376
msgid "Macronutrients"
msgstr ""
#: nutrition/templates/ingredient/view.html:80
-#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:244
+#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:246
msgid "kJ"
msgstr ""
@@ -3207,7 +3301,7 @@ msgstr ""
#: nutrition/templates/ingredient/view.html:128
#: nutrition/templates/log/detail.html:119
-#: nutrition/templates/plan/view.html:282
+#: nutrition/templates/plan/view.html:284
msgid "Others"
msgstr ""
@@ -3236,7 +3330,7 @@ msgstr ""
#: nutrition/templates/log/detail.html:7
#: nutrition/templates/log/overview.html:7
-#: nutrition/templates/plan/view.html:300
+#: nutrition/templates/plan/view.html:302
msgid "Nutrition diary"
msgstr ""
@@ -3246,13 +3340,13 @@ msgstr ""
#: nutrition/templates/log/detail.html:33
#: nutrition/templates/log/overview.html:31
-#: nutrition/templates/plan/view.html:308
+#: nutrition/templates/plan/view.html:310
msgid "Logged"
msgstr ""
#: nutrition/templates/log/detail.html:34
#: nutrition/templates/log/overview.html:32
-#: nutrition/templates/plan/view.html:309
+#: nutrition/templates/plan/view.html:311
msgid "Difference"
msgstr ""
@@ -3265,7 +3359,7 @@ msgid "g"
msgstr ""
#: nutrition/templates/log/overview.html:53
-#: nutrition/templates/plan/view.html:330
+#: nutrition/templates/plan/view.html:332
msgid "nothing found"
msgstr ""
@@ -3285,77 +3379,77 @@ msgstr ""
msgid "Add ingredient to meal"
msgstr ""
-#: nutrition/templates/plan/view.html:150
+#: nutrition/templates/plan/view.html:152
msgid "No items for this meal."
msgstr ""
-#: nutrition/templates/plan/view.html:188
+#: nutrition/templates/plan/view.html:190
msgid "No meals for this plan."
msgstr ""
-#: nutrition/templates/plan/view.html:200
+#: nutrition/templates/plan/view.html:202
msgid "Log this Plan"
msgstr ""
-#: nutrition/templates/plan/view.html:206
+#: nutrition/templates/plan/view.html:208
msgid "Add a new meal"
msgstr ""
-#: nutrition/templates/plan/view.html:216 nutrition/views/plan.py:369
+#: nutrition/templates/plan/view.html:218 nutrition/views/plan.py:369
msgid "Nutritional data"
msgstr ""
-#: nutrition/templates/plan/view.html:219
+#: nutrition/templates/plan/view.html:221
#, python-format
msgid "Based on the weight entry dated %(date)s (%(weight)s)"
msgstr ""
-#: nutrition/templates/plan/view.html:228 nutrition/views/plan.py:377
+#: nutrition/templates/plan/view.html:230 nutrition/views/plan.py:377
msgid "Total"
msgstr ""
-#: nutrition/templates/plan/view.html:229 nutrition/views/plan.py:378
+#: nutrition/templates/plan/view.html:231 nutrition/views/plan.py:378
msgid "Percent of energy"
msgstr ""
-#: nutrition/templates/plan/view.html:232 nutrition/views/plan.py:379
+#: nutrition/templates/plan/view.html:234 nutrition/views/plan.py:379
msgid "g per body kg"
msgstr ""
-#: nutrition/templates/plan/view.html:234
+#: nutrition/templates/plan/view.html:236
msgid "oz per body lb"
msgstr ""
-#: nutrition/templates/plan/view.html:338
+#: nutrition/templates/plan/view.html:340
msgid "View complete nutrition log"
msgstr ""
-#: nutrition/templates/plan/view.html:371
+#: nutrition/templates/plan/view.html:373
msgid "Goal"
msgstr ""
-#: nutrition/templates/plan/view.html:382
+#: nutrition/templates/plan/view.html:384
msgid ""
"You have selected that this nutritional plan has a\n"
" goal amount of calories. Use the calculator or enter the value\n"
" yourself."
msgstr ""
-#: nutrition/templates/plan/view.html:392
+#: nutrition/templates/plan/view.html:394
msgid ""
"If you find the ingredient list too short, you might want to activate the "
"preference to also show English ingredients."
msgstr ""
-#: nutrition/templates/plan/view.html:421
+#: nutrition/templates/plan/view.html:423
msgid "Edit nutrition plan"
msgstr ""
-#: nutrition/templates/plan/view.html:425
+#: nutrition/templates/plan/view.html:427
msgid "Make a copy of this nutrition plan"
msgstr ""
-#: nutrition/templates/plan/view.html:431
+#: nutrition/templates/plan/view.html:433
msgid "Delete nutrition plan"
msgstr ""
@@ -3435,10 +3529,6 @@ msgstr ""
msgid "Ingredient was successfully marked as rejected"
msgstr ""
-#: nutrition/views/log.py:229 nutrition/views/unit_ingredient.py:139
-msgid "Delete?"
-msgstr ""
-
#: nutrition/views/meal.py:55
msgid "Add new meal"
msgstr ""
@@ -3799,11 +3889,11 @@ msgstr ""
msgid "Re-Submit"
msgstr ""
-#: weight/templates/overview.html:68
+#: weight/templates/overview.html:51
msgid "Export as CSV"
msgstr "CSV로 내보내기"
-#: weight/templates/overview.html:72
+#: weight/templates/overview.html:55
msgid "Import from spreadsheet"
msgstr "spreadsheet로부터 가져오기"
@@ -3821,6 +3911,9 @@ msgstr "삭제되었습니다."
msgid "Delete weight entry for the %s"
msgstr ""
+#~ msgid "Your current weight is: "
+#~ msgstr "현재 체중은 : "
+
#~ msgid ""
#~ "Default duration in seconds of pauses used by the timer in the gym mode."
#~ msgstr "Gym mode에서 타이머가 사용하는 기본 일시 중지 시간은 '초'입니다."
diff --git a/wger/locale/nl/LC_MESSAGES/django.po b/wger/locale/nl/LC_MESSAGES/django.po
index 2eb66201f..9a674c0c9 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: 2021-08-17 17:23+0200\n"
+"POT-Creation-Date: 2022-02-15 14:51+0100\n"
"PO-Revision-Date: 2021-10-27 10:48+0000\n"
"Last-Translator: Roland Geider <[email protected]>\n"
"Language-Team: Dutch <https://hosted.weblate.org/projects/wger/web/nl/>\n"
@@ -56,16 +56,16 @@ msgstr "Talen"
msgid "Nothing found."
msgstr "Niets gevonden."
-#: config/templates/language/overview.html:16 core/templates/index.html:147
-#: core/templates/index.html:199 manager/templates/calendar/month.html:132
+#: config/templates/language/overview.html:16 core/templates/index.html:137
+#: core/templates/index.html:189 manager/templates/calendar/month.html:132
#: manager/templates/schedule/overview.html:28
#: manager/templates/schedule/view.html:146
#: manager/templates/workout/overview.html:28
#: nutrition/templates/ingredient/overview.html:45
#: nutrition/templates/plan/overview.html:23
-#: nutrition/templates/plan/view.html:148
-#: nutrition/templates/plan/view.html:151
-#: nutrition/templates/plan/view.html:189
+#: nutrition/templates/plan/view.html:150
+#: nutrition/templates/plan/view.html:153
+#: nutrition/templates/plan/view.html:191
msgid "Add one now."
msgstr "Voeg er een toe."
@@ -86,7 +86,7 @@ msgstr "Voeg er een toe."
#: gym/templates/gym/member_list.html:244
#: gym/templates/gym/member_list.html:281
#: mailer/templates/mailer/gym/overview.html:43
-#: weight/templates/overview.html:78
+#: weight/templates/overview.html:61
msgid "Add"
msgstr "Aanmaken"
@@ -125,14 +125,14 @@ msgstr "Toon"
#: config/templates/language/view.html:91 core/templates/user/api_key.html:44
#: core/templates/user/preferences.html:28
-#: exercises/templates/exercise/view.html:273
-#: exercises/templates/exercise/view.html:296 gym/models/contract.py:200
+#: exercises/templates/exercise/view.html:323
+#: exercises/templates/exercise/view.html:346 gym/models/contract.py:200
#: gym/templates/contract/view.html:41 gym/templates/contract/view.html:106
#: gym/templates/gym/member_list.html:248
#: manager/templates/schedule/view.html:281
#: manager/templates/workout/view.html:206
#: nutrition/templates/ingredient/view.html:226
-#: nutrition/templates/plan/view.html:409 weight/templates/overview.html:62
+#: nutrition/templates/plan/view.html:411 weight/templates/overview.html:45
msgid "Options"
msgstr "Opties"
@@ -146,12 +146,12 @@ msgstr "Opties"
#: core/templates/weight_unit/list.html:17
#: exercises/templates/categories/admin-overview.html:16
#: exercises/templates/equipment/admin-overview.html:16
-#: exercises/templates/exercise/view.html:180
-#: exercises/templates/exercise/view.html:301
+#: exercises/templates/exercise/view.html:230
+#: exercises/templates/exercise/view.html:351
#: exercises/templates/muscles/admin-overview.html:16
-#: exercises/views/comments.py:63 gallery/views/images.py:96
-#: gym/templates/admin_notes/list.html:32 gym/templates/contract/list.html:31
-#: gym/templates/contract/view.html:107
+#: exercises/views/comments.py:63 exercises/views/videos.py:69
+#: gallery/views/images.py:96 gym/templates/admin_notes/list.html:32
+#: gym/templates/contract/list.html:31 gym/templates/contract/view.html:107
#: gym/templates/contract_option/list.html:31
#: gym/templates/contract_type/list.html:31 gym/templates/document/list.html:38
#: gym/templates/gym/list.html:19 gym/templates/gym/list.html:43
@@ -162,7 +162,7 @@ msgstr "Opties"
#: manager/templates/calendar/partial_overview_table.html:18
#: manager/templates/schedule/view.html:121
#: nutrition/templates/ingredient/view.html:198
-#: nutrition/templates/plan/view.html:89 nutrition/templates/plan/view.html:124
+#: nutrition/templates/plan/view.html:89 nutrition/templates/plan/view.html:126
#: nutrition/templates/units/list.html:18
msgid "Edit"
msgstr "Bewerk"
@@ -176,9 +176,9 @@ msgstr "Bewerk"
#: exercises/templates/categories/admin-overview.html:17
#: exercises/templates/equipment/admin-overview.html:17
#: exercises/templates/exercise/view.html:68
-#: exercises/templates/exercise/view.html:155
-#: exercises/templates/exercise/view.html:185
-#: exercises/templates/exercise/view.html:306
+#: exercises/templates/exercise/view.html:205
+#: exercises/templates/exercise/view.html:235
+#: exercises/templates/exercise/view.html:356
#: exercises/templates/muscles/admin-overview.html:17
#: gym/templates/admin_notes/list.html:40
#: gym/templates/contract_option/list.html:39
@@ -191,7 +191,7 @@ msgstr "Bewerk"
#: nutrition/templates/ingredient/view.html:199
#: nutrition/templates/ingredient/view.html:239
#: nutrition/templates/log/detail.html:197
-#: nutrition/templates/plan/view.html:95 nutrition/templates/plan/view.html:130
+#: nutrition/templates/plan/view.html:95 nutrition/templates/plan/view.html:132
#: nutrition/templates/units/list.html:20
msgid "Delete"
msgstr "Verwijder"
@@ -321,7 +321,7 @@ msgid "Some way of answering you (e-mail, etc.)"
msgstr "Een manier om je van antwoord te voorzien (e-mail, etc.)"
#: core/forms.py:265 exercises/models/comment.py:40 manager/models/set.py:60
-#: manager/models/setting.py:99 nutrition/models/log.py:61
+#: manager/models/setting.py:99 nutrition/models/log.py:71
msgid "Comment"
msgstr "Opmerking"
@@ -466,7 +466,7 @@ msgstr ""
msgid "Age"
msgstr "Leeftijd"
-#: core/models/profile.py:202 nutrition/forms.py:98
+#: core/models/profile.py:202 nutrition/forms.py:99
msgid "Height (cm)"
msgstr "Hoogte (cm)"
@@ -517,7 +517,7 @@ msgid "Total caloric intake, including e.g. any surplus"
msgstr "Totale calorie-inname, inclusief bvb. enige surplus"
#: core/models/profile.py:305 nutrition/models/ingredient_weight_unit.py:45
-#: nutrition/models/log.py:80 nutrition/models/meal_item.py:58
+#: nutrition/models/log.py:90 nutrition/models/meal_item.py:58
msgid "Weight unit"
msgstr "Gewichteenheid"
@@ -556,9 +556,9 @@ msgstr "Het toaal van alle uren moet 24 zijn"
#: gym/models/user_document.py:87 gym/templates/contract/view.html:50
#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:96
#: gym/views/gym.py:156 manager/models/schedule.py:55
-#: manager/models/workout.py:56 nutrition/models/ingredient.py:96
-#: nutrition/models/ingredient_category.py:26
-#: nutrition/models/weight_unit.py:38
+#: manager/models/workout.py:56 measurements/models/category.py:53
+#: nutrition/models/ingredient.py:96 nutrition/models/ingredient_category.py:26
+#: nutrition/models/meal.py:66 nutrition/models/weight_unit.py:38
#: nutrition/templates/ingredient/pending.html:15
#: nutrition/templates/ingredient/view.html:185
msgid "Name"
@@ -620,11 +620,11 @@ msgstr ""
msgid "Dashboard"
msgstr "Dashboard"
-#: core/templates/index.html:31 manager/templates/calendar/month.html:115
+#: core/templates/index.html:21 manager/templates/calendar/month.html:115
msgid "Add log to day"
msgstr "Log aan dag toevoegen"
-#: core/templates/index.html:35 manager/templates/calendar/month.html:120
+#: core/templates/index.html:25 manager/templates/calendar/month.html:120
msgid ""
"Click to add weight logs to a training\n"
"day in your current workout:"
@@ -632,7 +632,7 @@ msgstr ""
"Klik om gewichtingaven toe te voegen aan een\n"
"trainingdag in je huidige workout:"
-#: core/templates/index.html:43 core/templates/index.html:83
+#: core/templates/index.html:33 core/templates/index.html:73
#: core/templates/misc/fragments/shariff_modal.html:29
#: core/templates/template.html:125 manager/templates/calendar/month.html:138
#: manager/templates/schedule/view.html:246
@@ -642,11 +642,11 @@ msgstr ""
msgid "Close"
msgstr "Sluit"
-#: core/templates/index.html:54 core/templates/index.html:203
+#: core/templates/index.html:44 core/templates/index.html:193
msgid "Add new diary entry"
msgstr "Voeg dagboekitem toe"
-#: core/templates/index.html:59
+#: core/templates/index.html:49
msgid ""
"Click to add an entry to your nutrition diary for today. You can either log "
"a meal as you defined it, or entry any number of custom entries."
@@ -655,7 +655,7 @@ msgstr ""
"een maaltijd loggen zoals je deze vooraf hebt gedefinieerd, of een aantal "
"items op maat ingeven."
-#: core/templates/index.html:67 core/templates/index.html:171
+#: core/templates/index.html:57 core/templates/index.html:161
#: core/templates/user/overview.html:171
#: nutrition/templates/ingredient/view.html:79
#: nutrition/templates/log/detail.html:40
@@ -664,19 +664,19 @@ msgstr ""
#: nutrition/templates/log/overview.html:7
#: nutrition/templates/log/overview.html:44
#: nutrition/templates/plan/overview.html:17
-#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:242
-#: nutrition/templates/plan/view.html:301
-#: nutrition/templates/plan/view.html:321
-#: nutrition/templates/plan/view.html:363
-#: nutrition/templates/plan/view.html:373
+#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:244
+#: nutrition/templates/plan/view.html:303
+#: nutrition/templates/plan/view.html:323
+#: nutrition/templates/plan/view.html:365
+#: nutrition/templates/plan/view.html:375
msgid "kcal"
msgstr "kcal"
-#: core/templates/index.html:79 nutrition/templates/plan/view.html:348
+#: core/templates/index.html:69 nutrition/templates/plan/view.html:350
msgid "Add custom diary entry"
msgstr "Voeg dagboekitem op maat toe"
-#: core/templates/index.html:94 core/templates/index.html:102
+#: core/templates/index.html:84 core/templates/index.html:92
#: manager/models/day.py:34 manager/models/log.py:56
#: manager/models/session.py:60 manager/models/workout.py:109
#: manager/templates/schedule/view.html:105
@@ -687,11 +687,11 @@ msgstr "Voeg dagboekitem op maat toe"
msgid "Workout"
msgstr "Workout"
-#: core/templates/index.html:128
+#: core/templates/index.html:118
msgid "This workout is part of a schedule:"
msgstr "Deze workout maakt deel uit van een schema."
-#: core/templates/index.html:133
+#: core/templates/index.html:123
msgid ""
"The current workout is selected from your active schedule or, if you don't "
"have one, simply by date."
@@ -699,70 +699,70 @@ msgstr ""
"De huidige workout werd geselecteerd van je actieve schema of, als je er "
"geen hebt, gewoonweg op basis van datum."
-#: core/templates/index.html:142 manager/templates/calendar/month.html:188
+#: core/templates/index.html:132 manager/templates/calendar/month.html:188
msgid "Add new log"
msgstr "Nieuw log toevoegen"
-#: core/templates/index.html:147 core/templates/user/overview.html:58
+#: core/templates/index.html:137 core/templates/user/overview.html:58
#: manager/templates/calendar/month.html:128
#: manager/templates/schedule/view.html:146
#: manager/templates/workout/overview.html:28
msgid "No workouts found."
msgstr "Geen workouts gevonden."
-#: core/templates/index.html:157 nutrition/models/log.py:48
+#: core/templates/index.html:147 nutrition/models/log.py:49
#: nutrition/models/meal.py:49 nutrition/models/meal_item.py:47
#: nutrition/models/plan.py:94 nutrition/templates/plan/view.html:11
#: nutrition/templates/plan/view.html:19
msgid "Nutrition plan"
msgstr "Voedingsplan"
-#: core/templates/index.html:169 core/templates/user/overview.html:155
+#: core/templates/index.html:159 core/templates/user/overview.html:155
#: nutrition/models/ingredient.py:100
#: nutrition/templates/ingredient/view.html:77
#: nutrition/templates/log/detail.html:39
#: nutrition/templates/log/detail.html:156
-#: nutrition/templates/plan/view.html:53 nutrition/templates/plan/view.html:241
-#: nutrition/templates/plan/view.html:358
-#: nutrition/templates/plan/view.html:362 nutrition/views/plan.py:384
+#: nutrition/templates/plan/view.html:53 nutrition/templates/plan/view.html:243
+#: nutrition/templates/plan/view.html:360
+#: nutrition/templates/plan/view.html:364 nutrition/views/plan.py:384
msgid "Energy"
msgstr "Energie"
-#: core/templates/index.html:175 core/templates/user/overview.html:156
+#: core/templates/index.html:165 core/templates/user/overview.html:156
#: nutrition/models/ingredient.py:105
#: nutrition/templates/ingredient/view.html:84
#: nutrition/templates/log/detail.html:52
#: nutrition/templates/log/detail.html:174
-#: nutrition/templates/plan/view.html:54 nutrition/templates/plan/view.html:249
+#: nutrition/templates/plan/view.html:54 nutrition/templates/plan/view.html:251
#: nutrition/views/plan.py:390
msgid "Protein"
msgstr "Proteïnen"
-#: core/templates/index.html:181 core/templates/user/overview.html:157
+#: core/templates/index.html:171 core/templates/user/overview.html:157
#: nutrition/models/ingredient.py:113
#: nutrition/templates/ingredient/view.html:90
#: nutrition/templates/log/detail.html:65
#: nutrition/templates/log/detail.html:175
-#: nutrition/templates/plan/view.html:55 nutrition/templates/plan/view.html:255
+#: nutrition/templates/plan/view.html:55 nutrition/templates/plan/view.html:257
#: nutrition/views/plan.py:398
msgid "Carbohydrates"
msgstr "Koolhydraten"
-#: core/templates/index.html:187 core/templates/user/overview.html:158
+#: core/templates/index.html:177 core/templates/user/overview.html:158
#: nutrition/models/ingredient.py:131
#: nutrition/templates/ingredient/view.html:106
#: nutrition/templates/log/detail.html:91
#: nutrition/templates/log/detail.html:176
-#: nutrition/templates/plan/view.html:56 nutrition/templates/plan/view.html:268
+#: nutrition/templates/plan/view.html:56 nutrition/templates/plan/view.html:270
#: nutrition/views/plan.py:412
msgid "Fat"
msgstr "Vet"
-#: core/templates/index.html:199 nutrition/templates/plan/overview.html:22
+#: core/templates/index.html:189 nutrition/templates/plan/overview.html:22
msgid "No nutrition plans."
msgstr "Geen voedingsplannen."
-#: core/templates/index.html:213 core/templates/user/overview.html:112
+#: core/templates/index.html:203 core/templates/user/overview.html:112
#: core/templates/user/overview.html:121 manager/forms.py:173
#: manager/helpers.py:89 manager/models/log.py:84 manager/models/setting.py:67
#: manager/templates/log/add.html:54 manager/templates/set/formset.html:12
@@ -771,11 +771,7 @@ msgstr "Geen voedingsplannen."
msgid "Weight"
msgstr "Gewicht"
-#: core/templates/index.html:217
-msgid "Your current weight is: "
-msgstr "Je huidige gewicht is:"
-
-#: core/templates/index.html:248 core/templates/navigation.html:97
+#: core/templates/index.html:210 core/templates/navigation.html:97
#: weight/views.py:70
msgid "Add weight entry"
msgstr "Voeg gewichtmeting toe"
@@ -807,7 +803,7 @@ msgstr "Licentielijst"
msgid "Nothing found"
msgstr "Niets gevonden"
-#: core/templates/misc/about.html:4 core/templates/template.html:201
+#: core/templates/misc/about.html:4 core/templates/template.html:175
#: core/templates/template_features.html:118
#: core/templates/template_no_context.html:88
msgid "Imprint"
@@ -825,8 +821,8 @@ msgstr ""
"staan."
#: core/templates/misc/fragments/shariff_modal.html:22
-#: nutrition/templates/plan/view.html:385
-#: nutrition/templates/plan/view.html:394
+#: nutrition/templates/plan/view.html:387
+#: nutrition/templates/plan/view.html:396
msgid "That's done here"
msgstr "Dat gebeurt hier"
@@ -917,7 +913,7 @@ msgstr "Oefeningen wachtend op goedkeuring"
msgid "Equipment"
msgstr "Materiaal"
-#: core/templates/navigation.html:78 exercises/templates/exercise/view.html:208
+#: core/templates/navigation.html:78 exercises/templates/exercise/view.html:258
msgid "Muscles"
msgstr "Spieren"
@@ -990,7 +986,7 @@ msgstr "Developer documentatie"
msgid "Get the code"
msgstr "Download de code"
-#: core/templates/navigation.html:175 core/templates/template.html:193
+#: core/templates/navigation.html:175 core/templates/template.html:205
#: core/templates/template_features.html:100
msgid "Translate"
msgstr "Vertaal"
@@ -1145,15 +1141,11 @@ msgstr ""
msgid "Create some demo entries"
msgstr "Maak wat demo-ingaven aan"
-#: core/templates/template.html:202 core/templates/template_features.html:122
+#: core/templates/template.html:176 core/templates/template_features.html:122
#: core/templates/template_no_context.html:89 software/templates/tos.html:7
msgid "Terms of service"
msgstr "Algemene voorwaarden"
-#: core/templates/template.html:209 core/templates/template.html:210
-msgid "Released under the Affero GPL"
-msgstr "Uitgebracht onder de Affero GPL"
-
#: core/templates/template_features.html:62 software/templates/features.html:9
#: software/templates/features.html:120
msgid "Features"
@@ -1258,9 +1250,10 @@ msgstr "Workout toevoegen"
#: core/templates/user/overview.html:120 core/templates/user/overview.html:153
#: exercises/models/exercise.py:77 gallery/models/image.py:47
#: manager/helpers.py:88 manager/models/log.py:98 manager/models/session.py:67
-#: nutrition/models/ingredient.py:85 nutrition/models/ingredient.py:87
-#: nutrition/models/ingredient.py:190 nutrition/templates/log/overview.html:30
-#: nutrition/templates/plan/view.html:307 weight/models.py:32
+#: measurements/models/measurement.py:64 nutrition/models/ingredient.py:85
+#: nutrition/models/ingredient.py:87 nutrition/models/ingredient.py:190
+#: nutrition/templates/log/overview.html:30
+#: nutrition/templates/plan/view.html:309 weight/models.py:32
#: weight/templates/import_csv_preview.html:13
#: weight/templates/import_csv_preview.html:42 weight/views.py:150
msgid "Date"
@@ -1268,10 +1261,10 @@ msgstr "Datum"
#: core/templates/user/overview.html:35 core/templates/user/overview.html:154
#: exercises/models/exercise.py:61 exercises/templates/exercise/view.html:88
-#: exercises/views/exercises.py:189 gallery/models/image.py:70
+#: exercises/views/exercises.py:190 gallery/models/image.py:70
#: gym/models/contract.py:57 gym/models/contract.py:107
#: manager/models/day.py:37 manager/models/workout.py:62
-#: nutrition/models/plan.py:69
+#: measurements/models/measurement.py:79 nutrition/models/plan.py:69
msgid "Description"
msgstr "Beschrijving"
@@ -1432,11 +1425,11 @@ msgstr "Voorkeuren"
msgid "Change password"
msgstr "Verander wachtwoord"
-#: core/templatetags/wger_extras.py:217
+#: core/templatetags/wger_extras.py:229
msgid "kg"
msgstr "kg"
-#: core/templatetags/wger_extras.py:219
+#: core/templatetags/wger_extras.py:231
#: nutrition/templates/ingredient/view.html:86
#: nutrition/templates/ingredient/view.html:92
#: nutrition/templates/ingredient/view.html:99
@@ -1448,28 +1441,28 @@ msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr "g"
-#: core/templatetags/wger_extras.py:222
+#: core/templatetags/wger_extras.py:234
msgid "lb"
msgstr "lb"
-#: core/templatetags/wger_extras.py:224
+#: core/templatetags/wger_extras.py:236
msgctxt "weight unit, i.e. ounces"
msgid "oz"
msgstr "oz"
#: core/views/languages.py:85 exercises/views/categories.py:121
-#: exercises/views/equipment.py:106 exercises/views/exercises.py:422
+#: exercises/views/equipment.py:106 exercises/views/exercises.py:423
#: exercises/views/images.py:128 exercises/views/muscles.py:118
-#: manager/views/schedule.py:311 manager/views/schedule_step.py:129
-#: manager/views/workout.py:268 manager/views/workout_session.py:141
-#: nutrition/views/ingredient.py:144 nutrition/views/plan.py:120
-#: nutrition/views/unit.py:111
+#: exercises/views/videos.py:129 manager/views/schedule.py:311
+#: manager/views/schedule_step.py:129 manager/views/workout.py:268
+#: manager/views/workout_session.py:141 nutrition/views/ingredient.py:144
+#: nutrition/views/plan.py:120 nutrition/views/unit.py:111
msgid "Successfully deleted"
msgstr "Met succes verwijderd"
#: core/views/languages.py:93 core/views/license.py:103
#: core/views/repetition_units.py:115 core/views/weight_units.py:115
-#: exercises/views/categories.py:127 exercises/views/exercises.py:430
+#: exercises/views/categories.py:127 exercises/views/exercises.py:431
#: exercises/views/muscles.py:125 gallery/views/images.py:121
#: gym/views/admin_notes.py:196 gym/views/document.py:206 gym/views/gym.py:486
#: manager/views/schedule.py:318 manager/views/schedule_step.py:139
@@ -1483,7 +1476,7 @@ msgstr "Verwijder {0}?"
#: core/views/languages.py:111 core/views/license.py:84
#: core/views/repetition_units.py:85 core/views/user.py:456
#: core/views/weight_units.py:85 exercises/views/categories.py:97
-#: exercises/views/equipment.py:83 exercises/views/exercises.py:304
+#: exercises/views/equipment.py:83 exercises/views/exercises.py:305
#: exercises/views/muscles.py:105 gym/views/admin_notes.py:160
#: gym/views/config.py:68 gym/views/contract.py:186
#: gym/views/contract_option.py:123 gym/views/contract_type.py:123
@@ -1573,7 +1566,7 @@ msgstr "Primaire spieren"
#: exercises/models/base.py:64 exercises/templates/equipment/overview.html:71
#: exercises/templates/exercise/overview.html:76
-#: exercises/templates/exercise/view.html:218
+#: exercises/templates/exercise/view.html:268
#: exercises/templates/muscles/overview.html:73
msgid "Secondary muscles"
msgstr "Secundaire spieren"
@@ -1586,8 +1579,9 @@ msgstr "Variaties"
msgid "Exercise Categories"
msgstr "Oefeningcategorieën"
-#: exercises/models/comment.py:34 exercises/models/image.py:62
-#: manager/forms.py:165 manager/helpers.py:89 manager/models/log.py:51
+#: exercises/models/comment.py:34 exercises/models/image.py:75
+#: exercises/models/video.py:82 manager/forms.py:165 manager/helpers.py:89
+#: manager/models/log.py:51
msgid "Exercise"
msgstr "Oefening"
@@ -1600,32 +1594,54 @@ msgstr "Een opmerking over hoe je deze oefening correct kan uitvoeren."
msgid "Language"
msgstr "Taal"
-#: exercises/models/exercise.py:233 exercises/views/exercises.py:460
+#: exercises/models/exercise.py:237 exercises/views/exercises.py:461
msgid "Exercise was successfully added to the general database"
msgstr "Oefening met succes toegevoegd aan de algemene databank"
-#: exercises/models/exercise.py:261
+#: exercises/models/exercise.py:265
msgid "New user submitted exercise"
msgstr "Nieuwe door gebruiker toegevoegde oefening"
-#: exercises/models/exercise.py:263
+#: exercises/models/exercise.py:267
#, python-brace-format
msgid "The user {0} submitted a new exercise \"{1}\"."
msgstr "Gebruiker {0} voegde een nieuwe oefening \"{1}\" toe."
-#: exercises/models/image.py:68 gallery/models/image.py:56
+#: exercises/models/image.py:59
+msgid "Line"
+msgstr ""
+
+#: exercises/models/image.py:60
+msgid "3D"
+msgstr ""
+
+#: exercises/models/image.py:61
+msgid "Low-poly"
+msgstr ""
+
+#: exercises/models/image.py:62
+msgid "Photo"
+msgstr ""
+
+#: exercises/models/image.py:63
+#, fuzzy
+#| msgid "Others"
+msgid "Other"
+msgstr "Anderen"
+
+#: exercises/models/image.py:81 gallery/models/image.py:56
msgid "Image"
msgstr "Afbeelding"
-#: exercises/models/image.py:69 gallery/models/image.py:57
+#: exercises/models/image.py:82 gallery/models/image.py:57
msgid "Only PNG and JPEG formats are supported"
msgstr "Enkel PNG en JPEG-formaten worden ondersteund"
-#: exercises/models/image.py:75
+#: exercises/models/image.py:88
msgid "Main picture"
msgstr "Hoofdafbeelding"
-#: exercises/models/image.py:78
+#: exercises/models/image.py:91
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 "
@@ -1635,11 +1651,15 @@ msgstr ""
"stellen voor de oefening (zal oa. getoond worden in zoekresultaten). De "
"eerste afbeelding wordt automatisch aangeduid door het systeem."
-#: exercises/models/image.py:166
+#: exercises/models/image.py:100
+msgid "The art style of your image"
+msgstr ""
+
+#: exercises/models/image.py:185
msgid "New user submitted image"
msgstr "Nieuwe door gebruiker toegevoegde afbeelding."
-#: exercises/models/image.py:167
+#: exercises/models/image.py:186
#, python-brace-format
msgid "The user {0} submitted a new image \"{1}\" for exercise {2}."
msgstr "De gebruiker {0} voegde een afbeelding \"{1}\" toe voor oefening {2}."
@@ -1648,6 +1668,58 @@ msgstr "De gebruiker {0} voegde een afbeelding \"{1}\" toe voor oefening {2}."
msgid "In latin, e.g. \"Pectoralis major\""
msgstr "Latijns, bvb. \"Pectoralis major\""
+#: exercises/models/video.py:41
+msgid "Maximum file size is 100MB."
+msgstr ""
+
+#: exercises/models/video.py:44 exercises/models/video.py:48
+msgid "File type is not supported"
+msgstr ""
+
+#: exercises/models/video.py:57
+#, fuzzy
+#| msgid "%(birthdate)s is not a valid birthdate"
+msgid "File is not a valid video"
+msgstr "%(birthdate)sis geen geldige geboortedatum"
+
+#: exercises/models/video.py:88
+#, fuzzy
+#| msgid "Main picture"
+msgid "Main video"
+msgstr "Hoofdafbeelding"
+
+#: exercises/models/video.py:94
+msgid "Video"
+msgstr ""
+
+#: exercises/models/video.py:101
+msgid "Size"
+msgstr ""
+
+#: exercises/models/video.py:108 manager/models/schedule_step.py:56
+msgid "Duration"
+msgstr "Duur"
+
+#: exercises/models/video.py:117
+msgid "Width"
+msgstr ""
+
+#: exercises/models/video.py:124
+#, fuzzy
+#| msgid "Weight"
+msgid "Height"
+msgstr "Gewicht"
+
+#: exercises/models/video.py:131
+#, fuzzy
+#| msgid "Code"
+msgid "Codec"
+msgstr "Code"
+
+#: exercises/models/video.py:139
+msgid "Codec, long name"
+msgstr ""
+
#: exercises/templates/equipment/admin-overview.html:4
msgid "Equipment list"
msgstr "Materiaallijst"
@@ -1663,7 +1735,7 @@ msgstr "Materiaaloverzicht"
#: exercises/templates/equipment/overview.html:69
#: exercises/templates/exercise/overview.html:74
-#: exercises/templates/exercise/view.html:214
+#: exercises/templates/exercise/view.html:264
#: exercises/templates/muscles/overview.html:71
msgid "Main muscles"
msgstr "Primaire spieren"
@@ -1790,7 +1862,8 @@ msgstr "Instuurdatum"
#: gym/templates/gym/new_user.html:22
#: gym/templates/gym/reset_user_password.html:20 manager/models/log.py:45
#: manager/models/schedule.py:44 manager/models/session.py:49
-#: manager/models/workout.py:89 nutrition/models/plan.py:55
+#: manager/models/workout.py:89 measurements/models/category.py:48
+#: measurements/models/measurement.py:59 nutrition/models/plan.py:55
#: nutrition/templates/ingredient/pending.html:16 weight/models.py:41
msgid "User"
msgstr "Gebruiker"
@@ -1819,13 +1892,13 @@ msgid "Please select one of the options below."
msgstr "Gelieve één van de opties hieronder te kiezen."
#: exercises/templates/exercise/view.html:60
-#: exercises/templates/exercise/view.html:153
+#: exercises/templates/exercise/view.html:203
#: nutrition/templates/ingredient/view.html:38
msgid "Accept"
msgstr "Aanvaard"
#: exercises/templates/exercise/view.html:64
-#: exercises/templates/exercise/view.html:154
+#: exercises/templates/exercise/view.html:204
#: nutrition/templates/ingredient/view.html:42
msgid "Decline"
msgstr "Weiger"
@@ -1838,32 +1911,42 @@ msgstr "Afbeeldingen"
msgid "Add new image"
msgstr "Voeg afbeelding toe"
-#: exercises/templates/exercise/view.html:147
+#: exercises/templates/exercise/view.html:148
+msgid "Videos"
+msgstr ""
+
+#: exercises/templates/exercise/view.html:187 exercises/views/videos.py:94
+#, fuzzy
+#| msgid "Add new image"
+msgid "Add new video"
+msgstr "Voeg afbeelding toe"
+
+#: exercises/templates/exercise/view.html:197
msgid "Images pending review"
msgstr "Afbeelding wacht op goedkeuring"
-#: exercises/templates/exercise/view.html:168
+#: exercises/templates/exercise/view.html:218
msgid "Comments for this exercise"
msgstr "Opmerkingen voor deze oefening"
-#: exercises/templates/exercise/view.html:196
+#: exercises/templates/exercise/view.html:246
msgid "Add new comment"
msgstr "Voeg opmerking toe"
-#: exercises/templates/exercise/view.html:210
+#: exercises/templates/exercise/view.html:260
msgid "The diagram shows the most used muscles on this exercise"
msgstr "Het diagram toont de meest gebruikte spieren in deze oefening"
-#: exercises/templates/exercise/view.html:251
+#: exercises/templates/exercise/view.html:301
#: manager/templates/workout/log.html:10 manager/templates/workout/log.html:11
msgid "Weight log"
msgstr "Gewichtlog"
-#: exercises/templates/exercise/view.html:256
+#: exercises/templates/exercise/view.html:306
msgid "Exercise Variations"
msgstr "Oefeningvariaties"
-#: exercises/templates/exercise/view.html:277
+#: exercises/templates/exercise/view.html:327
msgid "Submit a correction"
msgstr "Voeg een correctie toe"
@@ -1898,32 +1981,32 @@ msgstr "Voeg opmerking oefening toe"
msgid "Delete equipment?"
msgstr "Materiaal verwijderen?"
-#: exercises/views/exercises.py:228
+#: exercises/views/exercises.py:229
#, python-format
msgid ""
"%(name_original)s is too similar to existing exercise \"%(exercise_name)s\""
msgstr ""
-#: exercises/views/exercises.py:246
+#: exercises/views/exercises.py:247
msgid "Add exercise"
msgstr "Creëer oefening"
-#: exercises/views/exercises.py:366
+#: exercises/views/exercises.py:367
msgid "Thank you. Once the changes are reviewed the exercise will be updated."
msgstr ""
"Bedankt. Wanneer de verandering is goedgekeurd zal de oefening worden "
"geupdate."
-#: exercises/views/exercises.py:379
+#: exercises/views/exercises.py:380
#, python-brace-format
msgid "Correct {0}"
msgstr "Juist {0}"
-#: exercises/views/exercises.py:421
+#: exercises/views/exercises.py:422
msgid "This will delete the exercise from all workouts."
msgstr "Dit zal de oefening van alle workouts verwijderen."
-#: exercises/views/exercises.py:473
+#: exercises/views/exercises.py:474
msgid "Exercise was successfully marked as rejected"
msgstr "Oefening met succes gemarkeerd als afgewezen"
@@ -1935,6 +2018,11 @@ msgstr "Bewerk afbeelding oefening"
msgid "Delete exercise image?"
msgstr "Afbeelding oefening verwijderen?"
+#: exercises/views/videos.py:144 nutrition/views/log.py:230
+#: nutrition/views/unit_ingredient.py:139
+msgid "Delete?"
+msgstr "Verwijderen?"
+
#: gallery/templates/images/overview.html:62
#, fuzzy
#| msgid "Add new image"
@@ -2004,8 +2092,8 @@ msgid "Contract type"
msgstr "Contracttype"
#: gym/models/contract.py:208 gym/templates/contract/view.html:59
-#: manager/templates/log/add.html:52 nutrition/forms.py:58
-#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:92
+#: manager/templates/log/add.html:52 nutrition/forms.py:59
+#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:102
#: nutrition/models/meal_item.py:72
msgid "Amount"
msgstr "Hoeveelheid"
@@ -2449,6 +2537,7 @@ msgstr ""
"je wilt"
#: mailer/templates/mailer/gym/preview.html:22
+#: software/templates/about_us.html:59
msgid "Current version"
msgstr "Huidige versie"
@@ -2487,7 +2576,8 @@ msgstr ""
#: manager/models/log.py:90 manager/models/setting.py:47
#: manager/models/setting.py:78 manager/templates/log/add.html:53
#: manager/templates/log/add.html:55 manager/templates/set/formset.html:11
-#: manager/templates/set/formset.html:13 nutrition/forms.py:62
+#: manager/templates/set/formset.html:13 measurements/models/category.py:58
+#: nutrition/forms.py:63
msgid "Unit"
msgstr "Eenheid"
@@ -2558,10 +2648,6 @@ msgstr ""
msgid "schedule"
msgstr "schema"
-#: manager/models/schedule_step.py:56
-msgid "Duration"
-msgstr "Duur"
-
#: manager/models/schedule_step.py:57
msgid "The duration in weeks"
msgstr "De duurtijd in weken"
@@ -2840,7 +2926,7 @@ msgstr ""
#: manager/templates/schedule/view.html:290
#: manager/templates/workout/view.html:142
#: manager/templates/workout/view.html:217
-#: nutrition/templates/plan/view.html:415
+#: nutrition/templates/plan/view.html:417
msgid "Download as PDF"
msgstr "Download als PDF"
@@ -3079,23 +3165,27 @@ msgstr "Nieuwe workout-impressie voor de {0}"
msgid "This will delete all weight logs for this day as well."
msgstr ""
-#: nutrition/forms.py:121
+#: measurements/models/measurement.py:69
+msgid "Value"
+msgstr ""
+
+#: nutrition/forms.py:122
msgid "Calculate"
msgstr "Bereken"
-#: nutrition/forms.py:194 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:195 nutrition/templates/rate/form.html:76
msgid "Basic caloric intake"
msgstr "Basis calorie-inname"
-#: nutrition/forms.py:195
+#: nutrition/forms.py:196
msgid "Your basic caloric intake as calculated for your data"
msgstr "Je basis calorie-inname zoals berekend voor je data"
-#: nutrition/forms.py:201
+#: nutrition/forms.py:202
msgid "Additional calories"
msgstr "Bijkomende calorieën"
-#: nutrition/forms.py:203
+#: nutrition/forms.py:204
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
@@ -3103,8 +3193,8 @@ msgstr ""
"Bijkomende calorieën om toe te voegen aan het basisaantal (om af te trekken, "
"voer een negatief cijfer in)"
-#: nutrition/forms.py:231 nutrition/models/ingredient_weight_unit.py:39
-#: nutrition/models/log.py:71 nutrition/models/meal_item.py:53
+#: nutrition/forms.py:232 nutrition/models/ingredient_weight_unit.py:39
+#: nutrition/models/log.py:81 nutrition/models/meal_item.py:53
#: nutrition/templates/log/detail.html:155
msgid "Ingredient"
msgstr "Ingrediënt"
@@ -3123,14 +3213,14 @@ msgstr "In g per 100g product"
#: nutrition/models/ingredient.py:123
#: nutrition/templates/ingredient/view.html:96
#: nutrition/templates/log/detail.html:78
-#: nutrition/templates/plan/view.html:262 nutrition/views/plan.py:406
+#: nutrition/templates/plan/view.html:264 nutrition/views/plan.py:406
msgid "Sugar content in carbohydrates"
msgstr "Suikerinhoud in koolhydraten"
#: nutrition/models/ingredient.py:141
#: nutrition/templates/ingredient/view.html:112
#: nutrition/templates/log/detail.html:104
-#: nutrition/templates/plan/view.html:274 nutrition/views/plan.py:420
+#: nutrition/templates/plan/view.html:276 nutrition/views/plan.py:420
msgid "Saturated fat content in fats"
msgstr "Verzadigde vetinhoud in vetten"
@@ -3138,7 +3228,7 @@ msgstr "Verzadigde vetinhoud in vetten"
#: nutrition/templates/ingredient/view.html:134
#: nutrition/templates/log/detail.html:122
#: nutrition/templates/log/detail.html:178
-#: nutrition/templates/plan/view.html:285 nutrition/views/plan.py:426
+#: nutrition/templates/plan/view.html:287 nutrition/views/plan.py:426
msgid "Fibres"
msgstr "Vezels"
@@ -3146,7 +3236,7 @@ msgstr "Vezels"
#: nutrition/templates/ingredient/view.html:144
#: nutrition/templates/log/detail.html:135
#: nutrition/templates/log/detail.html:181
-#: nutrition/templates/plan/view.html:291 nutrition/views/plan.py:432
+#: nutrition/templates/plan/view.html:293 nutrition/views/plan.py:432
msgid "Sodium"
msgstr "Natrium"
@@ -3191,10 +3281,20 @@ 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:55
+msgid "Meal"
+msgstr "Maaltijd"
+
#: nutrition/models/meal.py:61
msgid "Time (approx)"
msgstr "Tijd (ongeveer)"
+#: nutrition/models/meal.py:68
+msgid ""
+"Give meals a textual description / name such as \"Breakfast\" or \"after "
+"workout\""
+msgstr ""
+
#: nutrition/models/plan.py:71
msgid ""
"A description of the goal of the plan, e.g. \"Gain mass\" or \"Prepare for "
@@ -3348,12 +3448,12 @@ msgstr ""
#: nutrition/templates/ingredient/view.html:71
#: nutrition/templates/log/detail.html:31
-#: nutrition/templates/plan/view.html:227 nutrition/views/plan.py:376
+#: nutrition/templates/plan/view.html:229 nutrition/views/plan.py:376
msgid "Macronutrients"
msgstr "Macrovoedingstoffen"
#: nutrition/templates/ingredient/view.html:80
-#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:244
+#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:246
msgid "kJ"
msgstr ""
@@ -3366,7 +3466,7 @@ msgstr "Nvt."
#: nutrition/templates/ingredient/view.html:128
#: nutrition/templates/log/detail.html:119
-#: nutrition/templates/plan/view.html:282
+#: nutrition/templates/plan/view.html:284
msgid "Others"
msgstr "Anderen"
@@ -3395,7 +3495,7 @@ msgstr "Verwijder ingrediënt"
#: nutrition/templates/log/detail.html:7
#: nutrition/templates/log/overview.html:7
-#: nutrition/templates/plan/view.html:300
+#: nutrition/templates/plan/view.html:302
msgid "Nutrition diary"
msgstr "Voedingsdagboek"
@@ -3405,13 +3505,13 @@ msgstr "Gepland"
#: nutrition/templates/log/detail.html:33
#: nutrition/templates/log/overview.html:31
-#: nutrition/templates/plan/view.html:308
+#: nutrition/templates/plan/view.html:310
msgid "Logged"
msgstr "Gelogd"
#: nutrition/templates/log/detail.html:34
#: nutrition/templates/log/overview.html:32
-#: nutrition/templates/plan/view.html:309
+#: nutrition/templates/plan/view.html:311
msgid "Difference"
msgstr "Verschil"
@@ -3424,7 +3524,7 @@ msgid "g"
msgstr "g"
#: nutrition/templates/log/overview.html:53
-#: nutrition/templates/plan/view.html:330
+#: nutrition/templates/plan/view.html:332
msgid "nothing found"
msgstr "Niets gevonden"
@@ -3444,56 +3544,56 @@ msgstr "Log deze maaltijd"
msgid "Add ingredient to meal"
msgstr ""
-#: nutrition/templates/plan/view.html:150
+#: nutrition/templates/plan/view.html:152
msgid "No items for this meal."
msgstr "Geen items voor deze maaltijd."
-#: nutrition/templates/plan/view.html:188
+#: nutrition/templates/plan/view.html:190
msgid "No meals for this plan."
msgstr "Geen maaltijden voor dit plan."
-#: nutrition/templates/plan/view.html:200
+#: nutrition/templates/plan/view.html:202
msgid "Log this Plan"
msgstr ""
-#: nutrition/templates/plan/view.html:206
+#: nutrition/templates/plan/view.html:208
msgid "Add a new meal"
msgstr "Nieuwe maaltijd toevoegen"
-#: nutrition/templates/plan/view.html:216 nutrition/views/plan.py:369
+#: nutrition/templates/plan/view.html:218 nutrition/views/plan.py:369
msgid "Nutritional data"
msgstr "Voedingsgegevens"
-#: nutrition/templates/plan/view.html:219
+#: nutrition/templates/plan/view.html:221
#, python-format
msgid "Based on the weight entry dated %(date)s (%(weight)s)"
msgstr ""
-#: nutrition/templates/plan/view.html:228 nutrition/views/plan.py:377
+#: nutrition/templates/plan/view.html:230 nutrition/views/plan.py:377
msgid "Total"
msgstr "Taal"
-#: nutrition/templates/plan/view.html:229 nutrition/views/plan.py:378
+#: nutrition/templates/plan/view.html:231 nutrition/views/plan.py:378
msgid "Percent of energy"
msgstr "Percentage energie"
-#: nutrition/templates/plan/view.html:232 nutrition/views/plan.py:379
+#: nutrition/templates/plan/view.html:234 nutrition/views/plan.py:379
msgid "g per body kg"
msgstr "g per kg lichaamsgewicht"
-#: nutrition/templates/plan/view.html:234
+#: nutrition/templates/plan/view.html:236
msgid "oz per body lb"
msgstr "oz per lichaams lb"
-#: nutrition/templates/plan/view.html:338
+#: nutrition/templates/plan/view.html:340
msgid "View complete nutrition log"
msgstr ""
-#: nutrition/templates/plan/view.html:371
+#: nutrition/templates/plan/view.html:373
msgid "Goal"
msgstr "Doel"
-#: nutrition/templates/plan/view.html:382
+#: nutrition/templates/plan/view.html:384
#, fuzzy
#| msgid ""
#| "You have selected that this nutritional plan has a\n"
@@ -3508,7 +3608,7 @@ msgstr ""
"heeft. \n"
"Gebruik de calculator of vul de waarde zelf in."
-#: nutrition/templates/plan/view.html:392
+#: nutrition/templates/plan/view.html:394
msgid ""
"If you find the ingredient list too short, you might want to activate the "
"preference to also show English ingredients."
@@ -3516,15 +3616,15 @@ msgstr ""
"Als je de ingrediëntenlijst te kort vindt, kan je deze instelling activeren "
"om ook engelstalige ingrediënten te tonen."
-#: nutrition/templates/plan/view.html:421
+#: nutrition/templates/plan/view.html:423
msgid "Edit nutrition plan"
msgstr "Bewerk voedingsplan"
-#: nutrition/templates/plan/view.html:425
+#: nutrition/templates/plan/view.html:427
msgid "Make a copy of this nutrition plan"
msgstr "Kopieer dit voedingsplan"
-#: nutrition/templates/plan/view.html:431
+#: nutrition/templates/plan/view.html:433
msgid "Delete nutrition plan"
msgstr "Verwijder voedingsplan"
@@ -3621,10 +3721,6 @@ msgstr "Nieuw ingrediënt toevoegen"
msgid "Ingredient was successfully marked as rejected"
msgstr "Ingrediënt met succes gemarkeerd als afgewezen"
-#: nutrition/views/log.py:229 nutrition/views/unit_ingredient.py:139
-msgid "Delete?"
-msgstr "Verwijderen?"
-
#: nutrition/views/meal.py:55
msgid "Add new meal"
msgstr "Maaltijd toevoegen"
@@ -4006,11 +4102,11 @@ msgstr ""
msgid "Re-Submit"
msgstr "Her-indienen"
-#: weight/templates/overview.html:68
+#: weight/templates/overview.html:51
msgid "Export as CSV"
msgstr "Exporteer als CSV"
-#: weight/templates/overview.html:72
+#: weight/templates/overview.html:55
msgid "Import from spreadsheet"
msgstr "Importeer uit spreadsheet"
@@ -4028,6 +4124,12 @@ msgstr "Met succes verwijderd."
msgid "Delete weight entry for the %s"
msgstr "Verwijder gewichtsingave voor de %s"
+#~ msgid "Your current weight is: "
+#~ msgstr "Je huidige gewicht is:"
+
+#~ msgid "Released under the Affero GPL"
+#~ msgstr "Uitgebracht onder de Affero GPL"
+
#~ msgid "Responsible for the content of this site as per German law §5 TMG:"
#~ msgstr ""
#~ "Verantwoordelijke voor de inhoud van deze site volgens Duitse wet §5 TMG:"
@@ -4195,9 +4297,6 @@ msgstr "Verwijder gewichtsingave voor de %s"
#~ "interesse zou hebben, ga naar de transifex-site, vraag toegang aan wij\n"
#~ "zorgen voor de rest."
-#~ msgid "Code"
-#~ msgstr "Code"
-
#~ msgid ""
#~ "Obviously, you are highly encouraged to clone the\n"
#~ "repo and start hacking! Once you are ready, send a pull request and we\n"
@@ -4328,9 +4427,6 @@ msgstr "Verwijder gewichtsingave voor de %s"
#~ msgid "Pause!"
#~ msgstr "Pauze!"
-#~ msgid "Meal"
-#~ msgstr "Maaltijd"
-
#~ msgid "There is no chart here because there are no weight entries."
#~ msgstr "Er is hier geen grafiek omdat er geen gewichtingaven zijn."
diff --git a/wger/locale/no/LC_MESSAGES/django.po b/wger/locale/no/LC_MESSAGES/django.po
index 721f2b5a5..41763f20a 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: 2021-08-17 17:23+0200\n"
+"POT-Creation-Date: 2022-02-15 14:51+0100\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/"
@@ -55,16 +55,16 @@ msgstr "Språk"
msgid "Nothing found."
msgstr "Resultatløst."
-#: config/templates/language/overview.html:16 core/templates/index.html:147
-#: core/templates/index.html:199 manager/templates/calendar/month.html:132
+#: config/templates/language/overview.html:16 core/templates/index.html:137
+#: core/templates/index.html:189 manager/templates/calendar/month.html:132
#: manager/templates/schedule/overview.html:28
#: manager/templates/schedule/view.html:146
#: manager/templates/workout/overview.html:28
#: nutrition/templates/ingredient/overview.html:45
#: nutrition/templates/plan/overview.html:23
-#: nutrition/templates/plan/view.html:148
-#: nutrition/templates/plan/view.html:151
-#: nutrition/templates/plan/view.html:189
+#: nutrition/templates/plan/view.html:150
+#: nutrition/templates/plan/view.html:153
+#: nutrition/templates/plan/view.html:191
msgid "Add one now."
msgstr "Legg til en nå."
@@ -85,7 +85,7 @@ msgstr "Legg til en nå."
#: gym/templates/gym/member_list.html:244
#: gym/templates/gym/member_list.html:281
#: mailer/templates/mailer/gym/overview.html:43
-#: weight/templates/overview.html:78
+#: weight/templates/overview.html:61
msgid "Add"
msgstr "Legg til"
@@ -123,14 +123,14 @@ msgstr "Vis"
#: config/templates/language/view.html:91 core/templates/user/api_key.html:44
#: core/templates/user/preferences.html:28
-#: exercises/templates/exercise/view.html:273
-#: exercises/templates/exercise/view.html:296 gym/models/contract.py:200
+#: exercises/templates/exercise/view.html:323
+#: exercises/templates/exercise/view.html:346 gym/models/contract.py:200
#: gym/templates/contract/view.html:41 gym/templates/contract/view.html:106
#: gym/templates/gym/member_list.html:248
#: manager/templates/schedule/view.html:281
#: manager/templates/workout/view.html:206
#: nutrition/templates/ingredient/view.html:226
-#: nutrition/templates/plan/view.html:409 weight/templates/overview.html:62
+#: nutrition/templates/plan/view.html:411 weight/templates/overview.html:45
msgid "Options"
msgstr "Alternativer"
@@ -144,12 +144,12 @@ msgstr "Alternativer"
#: core/templates/weight_unit/list.html:17
#: exercises/templates/categories/admin-overview.html:16
#: exercises/templates/equipment/admin-overview.html:16
-#: exercises/templates/exercise/view.html:180
-#: exercises/templates/exercise/view.html:301
+#: exercises/templates/exercise/view.html:230
+#: exercises/templates/exercise/view.html:351
#: exercises/templates/muscles/admin-overview.html:16
-#: exercises/views/comments.py:63 gallery/views/images.py:96
-#: gym/templates/admin_notes/list.html:32 gym/templates/contract/list.html:31
-#: gym/templates/contract/view.html:107
+#: exercises/views/comments.py:63 exercises/views/videos.py:69
+#: gallery/views/images.py:96 gym/templates/admin_notes/list.html:32
+#: gym/templates/contract/list.html:31 gym/templates/contract/view.html:107
#: gym/templates/contract_option/list.html:31
#: gym/templates/contract_type/list.html:31 gym/templates/document/list.html:38
#: gym/templates/gym/list.html:19 gym/templates/gym/list.html:43
@@ -160,7 +160,7 @@ msgstr "Alternativer"
#: manager/templates/calendar/partial_overview_table.html:18
#: manager/templates/schedule/view.html:121
#: nutrition/templates/ingredient/view.html:198
-#: nutrition/templates/plan/view.html:89 nutrition/templates/plan/view.html:124
+#: nutrition/templates/plan/view.html:89 nutrition/templates/plan/view.html:126
#: nutrition/templates/units/list.html:18
msgid "Edit"
msgstr "Rediger"
@@ -174,9 +174,9 @@ msgstr "Rediger"
#: exercises/templates/categories/admin-overview.html:17
#: exercises/templates/equipment/admin-overview.html:17
#: exercises/templates/exercise/view.html:68
-#: exercises/templates/exercise/view.html:155
-#: exercises/templates/exercise/view.html:185
-#: exercises/templates/exercise/view.html:306
+#: exercises/templates/exercise/view.html:205
+#: exercises/templates/exercise/view.html:235
+#: exercises/templates/exercise/view.html:356
#: exercises/templates/muscles/admin-overview.html:17
#: gym/templates/admin_notes/list.html:40
#: gym/templates/contract_option/list.html:39
@@ -189,7 +189,7 @@ msgstr "Rediger"
#: nutrition/templates/ingredient/view.html:199
#: nutrition/templates/ingredient/view.html:239
#: nutrition/templates/log/detail.html:197
-#: nutrition/templates/plan/view.html:95 nutrition/templates/plan/view.html:130
+#: nutrition/templates/plan/view.html:95 nutrition/templates/plan/view.html:132
#: nutrition/templates/units/list.html:20
msgid "Delete"
msgstr "Slett"
@@ -313,7 +313,7 @@ msgid "Some way of answering you (e-mail, etc.)"
msgstr "En måte å svare deg på (e-post, etc.)"
#: core/forms.py:265 exercises/models/comment.py:40 manager/models/set.py:60
-#: manager/models/setting.py:99 nutrition/models/log.py:61
+#: manager/models/setting.py:99 nutrition/models/log.py:71
msgid "Comment"
msgstr "Kommentar"
@@ -455,7 +455,7 @@ msgstr ""
msgid "Age"
msgstr "Alder"
-#: core/models/profile.py:202 nutrition/forms.py:98
+#: core/models/profile.py:202 nutrition/forms.py:99
msgid "Height (cm)"
msgstr "Høyde (cm)"
@@ -506,7 +506,7 @@ msgid "Total caloric intake, including e.g. any surplus"
msgstr "Totalt kaloriinntak, inkludert f.eks. overskudd"
#: core/models/profile.py:305 nutrition/models/ingredient_weight_unit.py:45
-#: nutrition/models/log.py:80 nutrition/models/meal_item.py:58
+#: nutrition/models/log.py:90 nutrition/models/meal_item.py:58
msgid "Weight unit"
msgstr "Vektenhet"
@@ -545,9 +545,9 @@ msgstr "Summen av antall timer må bli 24"
#: gym/models/user_document.py:87 gym/templates/contract/view.html:50
#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:96
#: gym/views/gym.py:156 manager/models/schedule.py:55
-#: manager/models/workout.py:56 nutrition/models/ingredient.py:96
-#: nutrition/models/ingredient_category.py:26
-#: nutrition/models/weight_unit.py:38
+#: manager/models/workout.py:56 measurements/models/category.py:53
+#: nutrition/models/ingredient.py:96 nutrition/models/ingredient_category.py:26
+#: nutrition/models/meal.py:66 nutrition/models/weight_unit.py:38
#: nutrition/templates/ingredient/pending.html:15
#: nutrition/templates/ingredient/view.html:185
msgid "Name"
@@ -608,11 +608,11 @@ msgstr ""
msgid "Dashboard"
msgstr "Dashboard"
-#: core/templates/index.html:31 manager/templates/calendar/month.html:115
+#: core/templates/index.html:21 manager/templates/calendar/month.html:115
msgid "Add log to day"
msgstr "Legg til logg til dag"
-#: core/templates/index.html:35 manager/templates/calendar/month.html:120
+#: core/templates/index.html:25 manager/templates/calendar/month.html:120
msgid ""
"Click to add weight logs to a training\n"
"day in your current workout:"
@@ -620,7 +620,7 @@ msgstr ""
"Klikk for å legge til vektlogger til en treningsdag i din nåværende "
"treningsøkt:"
-#: core/templates/index.html:43 core/templates/index.html:83
+#: core/templates/index.html:33 core/templates/index.html:73
#: core/templates/misc/fragments/shariff_modal.html:29
#: core/templates/template.html:125 manager/templates/calendar/month.html:138
#: manager/templates/schedule/view.html:246
@@ -630,11 +630,11 @@ msgstr ""
msgid "Close"
msgstr "Lukk"
-#: core/templates/index.html:54 core/templates/index.html:203
+#: core/templates/index.html:44 core/templates/index.html:193
msgid "Add new diary entry"
msgstr "Legg til ny dagbokoppføring"
-#: core/templates/index.html:59
+#: core/templates/index.html:49
msgid ""
"Click to add an entry to your nutrition diary for today. You can either log "
"a meal as you defined it, or entry any number of custom entries."
@@ -643,7 +643,7 @@ msgstr ""
"enten logge et måltid slik du definerte det, eller legge inn et hvilket som "
"helst antall tilpassede oppføringer."
-#: core/templates/index.html:67 core/templates/index.html:171
+#: core/templates/index.html:57 core/templates/index.html:161
#: core/templates/user/overview.html:171
#: nutrition/templates/ingredient/view.html:79
#: nutrition/templates/log/detail.html:40
@@ -652,19 +652,19 @@ msgstr ""
#: nutrition/templates/log/overview.html:7
#: nutrition/templates/log/overview.html:44
#: nutrition/templates/plan/overview.html:17
-#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:242
-#: nutrition/templates/plan/view.html:301
-#: nutrition/templates/plan/view.html:321
-#: nutrition/templates/plan/view.html:363
-#: nutrition/templates/plan/view.html:373
+#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:244
+#: nutrition/templates/plan/view.html:303
+#: nutrition/templates/plan/view.html:323
+#: nutrition/templates/plan/view.html:365
+#: nutrition/templates/plan/view.html:375
msgid "kcal"
msgstr "kcal"
-#: core/templates/index.html:79 nutrition/templates/plan/view.html:348
+#: core/templates/index.html:69 nutrition/templates/plan/view.html:350
msgid "Add custom diary entry"
msgstr "Legg til tilpasset dagbokoppføring"
-#: core/templates/index.html:94 core/templates/index.html:102
+#: core/templates/index.html:84 core/templates/index.html:92
#: manager/models/day.py:34 manager/models/log.py:56
#: manager/models/session.py:60 manager/models/workout.py:109
#: manager/templates/schedule/view.html:105
@@ -675,11 +675,11 @@ msgstr "Legg til tilpasset dagbokoppføring"
msgid "Workout"
msgstr "Treningsøkt"
-#: core/templates/index.html:128
+#: core/templates/index.html:118
msgid "This workout is part of a schedule:"
msgstr "Denne treningsøkten er en del av en plan."
-#: core/templates/index.html:133
+#: core/templates/index.html:123
msgid ""
"The current workout is selected from your active schedule or, if you don't "
"have one, simply by date."
@@ -687,70 +687,70 @@ msgstr ""
"Den aktuelle treningen velges fra den aktive timeplanen din, eller hvis du "
"ikke har en, etter dato."
-#: core/templates/index.html:142 manager/templates/calendar/month.html:188
+#: core/templates/index.html:132 manager/templates/calendar/month.html:188
msgid "Add new log"
msgstr "Legg til logg"
-#: core/templates/index.html:147 core/templates/user/overview.html:58
+#: core/templates/index.html:137 core/templates/user/overview.html:58
#: manager/templates/calendar/month.html:128
#: manager/templates/schedule/view.html:146
#: manager/templates/workout/overview.html:28
msgid "No workouts found."
msgstr "Ingen treningsøkter funnet."
-#: core/templates/index.html:157 nutrition/models/log.py:48
+#: core/templates/index.html:147 nutrition/models/log.py:49
#: nutrition/models/meal.py:49 nutrition/models/meal_item.py:47
#: nutrition/models/plan.py:94 nutrition/templates/plan/view.html:11
#: nutrition/templates/plan/view.html:19
msgid "Nutrition plan"
msgstr "Ernæringsplan"
-#: core/templates/index.html:169 core/templates/user/overview.html:155
+#: core/templates/index.html:159 core/templates/user/overview.html:155
#: nutrition/models/ingredient.py:100
#: nutrition/templates/ingredient/view.html:77
#: nutrition/templates/log/detail.html:39
#: nutrition/templates/log/detail.html:156
-#: nutrition/templates/plan/view.html:53 nutrition/templates/plan/view.html:241
-#: nutrition/templates/plan/view.html:358
-#: nutrition/templates/plan/view.html:362 nutrition/views/plan.py:384
+#: nutrition/templates/plan/view.html:53 nutrition/templates/plan/view.html:243
+#: nutrition/templates/plan/view.html:360
+#: nutrition/templates/plan/view.html:364 nutrition/views/plan.py:384
msgid "Energy"
msgstr "Energi"
-#: core/templates/index.html:175 core/templates/user/overview.html:156
+#: core/templates/index.html:165 core/templates/user/overview.html:156
#: nutrition/models/ingredient.py:105
#: nutrition/templates/ingredient/view.html:84
#: nutrition/templates/log/detail.html:52
#: nutrition/templates/log/detail.html:174
-#: nutrition/templates/plan/view.html:54 nutrition/templates/plan/view.html:249
+#: nutrition/templates/plan/view.html:54 nutrition/templates/plan/view.html:251
#: nutrition/views/plan.py:390
msgid "Protein"
msgstr "Protein"
-#: core/templates/index.html:181 core/templates/user/overview.html:157
+#: core/templates/index.html:171 core/templates/user/overview.html:157
#: nutrition/models/ingredient.py:113
#: nutrition/templates/ingredient/view.html:90
#: nutrition/templates/log/detail.html:65
#: nutrition/templates/log/detail.html:175
-#: nutrition/templates/plan/view.html:55 nutrition/templates/plan/view.html:255
+#: nutrition/templates/plan/view.html:55 nutrition/templates/plan/view.html:257
#: nutrition/views/plan.py:398
msgid "Carbohydrates"
msgstr "Karbohydrater"
-#: core/templates/index.html:187 core/templates/user/overview.html:158
+#: core/templates/index.html:177 core/templates/user/overview.html:158
#: nutrition/models/ingredient.py:131
#: nutrition/templates/ingredient/view.html:106
#: nutrition/templates/log/detail.html:91
#: nutrition/templates/log/detail.html:176
-#: nutrition/templates/plan/view.html:56 nutrition/templates/plan/view.html:268
+#: nutrition/templates/plan/view.html:56 nutrition/templates/plan/view.html:270
#: nutrition/views/plan.py:412
msgid "Fat"
msgstr "Fett"
-#: core/templates/index.html:199 nutrition/templates/plan/overview.html:22
+#: core/templates/index.html:189 nutrition/templates/plan/overview.html:22
msgid "No nutrition plans."
msgstr "Ingen ernæringsplaner."
-#: core/templates/index.html:213 core/templates/user/overview.html:112
+#: core/templates/index.html:203 core/templates/user/overview.html:112
#: core/templates/user/overview.html:121 manager/forms.py:173
#: manager/helpers.py:89 manager/models/log.py:84 manager/models/setting.py:67
#: manager/templates/log/add.html:54 manager/templates/set/formset.html:12
@@ -759,11 +759,7 @@ msgstr "Ingen ernæringsplaner."
msgid "Weight"
msgstr "Vekt"
-#: core/templates/index.html:217
-msgid "Your current weight is: "
-msgstr "Din nåværende vekt er:"
-
-#: core/templates/index.html:248 core/templates/navigation.html:97
+#: core/templates/index.html:210 core/templates/navigation.html:97
#: weight/views.py:70
msgid "Add weight entry"
msgstr "Legg til vekt"
@@ -795,7 +791,7 @@ msgstr "Lisensliste"
msgid "Nothing found"
msgstr "Ingenting funnet"
-#: core/templates/misc/about.html:4 core/templates/template.html:201
+#: core/templates/misc/about.html:4 core/templates/template.html:175
#: core/templates/template_features.html:118
#: core/templates/template_no_context.html:88
msgid "Imprint"
@@ -811,8 +807,8 @@ msgid ""
msgstr "Før du deler lenker på sosiale medier, må du tillate ekstern tilgang."
#: core/templates/misc/fragments/shariff_modal.html:22
-#: nutrition/templates/plan/view.html:385
-#: nutrition/templates/plan/view.html:394
+#: nutrition/templates/plan/view.html:387
+#: nutrition/templates/plan/view.html:396
msgid "That's done here"
msgstr "Det er gjort her"
@@ -904,7 +900,7 @@ msgstr "Øvelser venter på godkjenning"
msgid "Equipment"
msgstr "Utstyr"
-#: core/templates/navigation.html:78 exercises/templates/exercise/view.html:208
+#: core/templates/navigation.html:78 exercises/templates/exercise/view.html:258
msgid "Muscles"
msgstr "Muskler"
@@ -977,7 +973,7 @@ msgstr "Utvikler dokumentasjon"
msgid "Get the code"
msgstr "Få koden"
-#: core/templates/navigation.html:175 core/templates/template.html:193
+#: core/templates/navigation.html:175 core/templates/template.html:205
#: core/templates/template_features.html:100
msgid "Translate"
msgstr "Oversett"
@@ -1130,15 +1126,11 @@ msgstr "Du bruker en gjestekonto, data du fyller ut vil slettes etter en uke."
msgid "Create some demo entries"
msgstr "Lag noen demo oppføringer"
-#: core/templates/template.html:202 core/templates/template_features.html:122
+#: core/templates/template.html:176 core/templates/template_features.html:122
#: core/templates/template_no_context.html:89 software/templates/tos.html:7
msgid "Terms of service"
msgstr "Vilkår for bruk"
-#: core/templates/template.html:209 core/templates/template.html:210
-msgid "Released under the Affero GPL"
-msgstr "Utgitt under Affero GPL"
-
#: core/templates/template_features.html:62 software/templates/features.html:9
#: software/templates/features.html:120
msgid "Features"
@@ -1244,9 +1236,10 @@ msgstr "Legg til treningsøkt"
#: core/templates/user/overview.html:120 core/templates/user/overview.html:153
#: exercises/models/exercise.py:77 gallery/models/image.py:47
#: manager/helpers.py:88 manager/models/log.py:98 manager/models/session.py:67
-#: nutrition/models/ingredient.py:85 nutrition/models/ingredient.py:87
-#: nutrition/models/ingredient.py:190 nutrition/templates/log/overview.html:30
-#: nutrition/templates/plan/view.html:307 weight/models.py:32
+#: measurements/models/measurement.py:64 nutrition/models/ingredient.py:85
+#: nutrition/models/ingredient.py:87 nutrition/models/ingredient.py:190
+#: nutrition/templates/log/overview.html:30
+#: nutrition/templates/plan/view.html:309 weight/models.py:32
#: weight/templates/import_csv_preview.html:13
#: weight/templates/import_csv_preview.html:42 weight/views.py:150
msgid "Date"
@@ -1254,10 +1247,10 @@ msgstr "Dato"
#: core/templates/user/overview.html:35 core/templates/user/overview.html:154
#: exercises/models/exercise.py:61 exercises/templates/exercise/view.html:88
-#: exercises/views/exercises.py:189 gallery/models/image.py:70
+#: exercises/views/exercises.py:190 gallery/models/image.py:70
#: gym/models/contract.py:57 gym/models/contract.py:107
#: manager/models/day.py:37 manager/models/workout.py:62
-#: nutrition/models/plan.py:69
+#: measurements/models/measurement.py:79 nutrition/models/plan.py:69
msgid "Description"
msgstr "Beskrivelse"
@@ -1418,11 +1411,11 @@ msgstr "Preferanser"
msgid "Change password"
msgstr "Endre passord"
-#: core/templatetags/wger_extras.py:217
+#: core/templatetags/wger_extras.py:229
msgid "kg"
msgstr "kg"
-#: core/templatetags/wger_extras.py:219
+#: core/templatetags/wger_extras.py:231
#: nutrition/templates/ingredient/view.html:86
#: nutrition/templates/ingredient/view.html:92
#: nutrition/templates/ingredient/view.html:99
@@ -1434,28 +1427,28 @@ msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr "g"
-#: core/templatetags/wger_extras.py:222
+#: core/templatetags/wger_extras.py:234
msgid "lb"
msgstr "lb"
-#: core/templatetags/wger_extras.py:224
+#: core/templatetags/wger_extras.py:236
msgctxt "weight unit, i.e. ounces"
msgid "oz"
msgstr "oz"
#: core/views/languages.py:85 exercises/views/categories.py:121
-#: exercises/views/equipment.py:106 exercises/views/exercises.py:422
+#: exercises/views/equipment.py:106 exercises/views/exercises.py:423
#: exercises/views/images.py:128 exercises/views/muscles.py:118
-#: manager/views/schedule.py:311 manager/views/schedule_step.py:129
-#: manager/views/workout.py:268 manager/views/workout_session.py:141
-#: nutrition/views/ingredient.py:144 nutrition/views/plan.py:120
-#: nutrition/views/unit.py:111
+#: exercises/views/videos.py:129 manager/views/schedule.py:311
+#: manager/views/schedule_step.py:129 manager/views/workout.py:268
+#: manager/views/workout_session.py:141 nutrition/views/ingredient.py:144
+#: nutrition/views/plan.py:120 nutrition/views/unit.py:111
msgid "Successfully deleted"
msgstr "Slettingen var vellykket"
#: core/views/languages.py:93 core/views/license.py:103
#: core/views/repetition_units.py:115 core/views/weight_units.py:115
-#: exercises/views/categories.py:127 exercises/views/exercises.py:430
+#: exercises/views/categories.py:127 exercises/views/exercises.py:431
#: exercises/views/muscles.py:125 gallery/views/images.py:121
#: gym/views/admin_notes.py:196 gym/views/document.py:206 gym/views/gym.py:486
#: manager/views/schedule.py:318 manager/views/schedule_step.py:139
@@ -1469,7 +1462,7 @@ msgstr "Slett {0}?"
#: core/views/languages.py:111 core/views/license.py:84
#: core/views/repetition_units.py:85 core/views/user.py:456
#: core/views/weight_units.py:85 exercises/views/categories.py:97
-#: exercises/views/equipment.py:83 exercises/views/exercises.py:304
+#: exercises/views/equipment.py:83 exercises/views/exercises.py:305
#: exercises/views/muscles.py:105 gym/views/admin_notes.py:160
#: gym/views/config.py:68 gym/views/contract.py:186
#: gym/views/contract_option.py:123 gym/views/contract_type.py:123
@@ -1559,7 +1552,7 @@ msgstr "Primære muskler"
#: exercises/models/base.py:64 exercises/templates/equipment/overview.html:71
#: exercises/templates/exercise/overview.html:76
-#: exercises/templates/exercise/view.html:218
+#: exercises/templates/exercise/view.html:268
#: exercises/templates/muscles/overview.html:73
msgid "Secondary muscles"
msgstr "Sekundære muskler"
@@ -1572,8 +1565,9 @@ msgstr "Variasjoner"
msgid "Exercise Categories"
msgstr "Øvelses kategorier"
-#: exercises/models/comment.py:34 exercises/models/image.py:62
-#: manager/forms.py:165 manager/helpers.py:89 manager/models/log.py:51
+#: exercises/models/comment.py:34 exercises/models/image.py:75
+#: exercises/models/video.py:82 manager/forms.py:165 manager/helpers.py:89
+#: manager/models/log.py:51
msgid "Exercise"
msgstr "Øvelse"
@@ -1586,32 +1580,54 @@ msgstr "En kommentar for hvordan denne øvelsen utføres korrekt."
msgid "Language"
msgstr "Språk"
-#: exercises/models/exercise.py:233 exercises/views/exercises.py:460
+#: exercises/models/exercise.py:237 exercises/views/exercises.py:461
msgid "Exercise was successfully added to the general database"
msgstr "Øvelsen ble vellykket lagt til i databasen"
-#: exercises/models/exercise.py:261
+#: exercises/models/exercise.py:265
msgid "New user submitted exercise"
msgstr "Ny bruker har sendt inn øvelse"
-#: exercises/models/exercise.py:263
+#: exercises/models/exercise.py:267
#, python-brace-format
msgid "The user {0} submitted a new exercise \"{1}\"."
msgstr "Brukeren {0} sendte inn en ny øvelse \"{1}\"."
-#: exercises/models/image.py:68 gallery/models/image.py:56
+#: exercises/models/image.py:59
+msgid "Line"
+msgstr ""
+
+#: exercises/models/image.py:60
+msgid "3D"
+msgstr ""
+
+#: exercises/models/image.py:61
+msgid "Low-poly"
+msgstr ""
+
+#: exercises/models/image.py:62
+msgid "Photo"
+msgstr ""
+
+#: exercises/models/image.py:63
+#, fuzzy
+#| msgid "Others"
+msgid "Other"
+msgstr "Andre"
+
+#: exercises/models/image.py:81 gallery/models/image.py:56
msgid "Image"
msgstr "Bilde"
-#: exercises/models/image.py:69 gallery/models/image.py:57
+#: exercises/models/image.py:82 gallery/models/image.py:57
msgid "Only PNG and JPEG formats are supported"
msgstr "Bare PNG og JPEG formater støttes"
-#: exercises/models/image.py:75
+#: exercises/models/image.py:88
msgid "Main picture"
msgstr "Hovedbilde"
-#: exercises/models/image.py:78
+#: exercises/models/image.py:91
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 "
@@ -1621,11 +1637,15 @@ msgstr ""
"øvelsen (vil bli vist i søket). Det første bildet blir automatisk markert av "
"systemet."
-#: exercises/models/image.py:166
+#: exercises/models/image.py:100
+msgid "The art style of your image"
+msgstr ""
+
+#: exercises/models/image.py:185
msgid "New user submitted image"
msgstr "Ny bruker har sendt inn bilde"
-#: exercises/models/image.py:167
+#: exercises/models/image.py:186
#, python-brace-format
msgid "The user {0} submitted a new image \"{1}\" for exercise {2}."
msgstr "Brukeren {0} sendte inn et nytt bilde \"{1}\" for øvelsen {2}."
@@ -1634,6 +1654,58 @@ msgstr "Brukeren {0} sendte inn et nytt bilde \"{1}\" for øvelsen {2}."
msgid "In latin, e.g. \"Pectoralis major\""
msgstr "I latin, f.eks \"Pectoralis major\""
+#: exercises/models/video.py:41
+msgid "Maximum file size is 100MB."
+msgstr ""
+
+#: exercises/models/video.py:44 exercises/models/video.py:48
+msgid "File type is not supported"
+msgstr ""
+
+#: exercises/models/video.py:57
+#, fuzzy
+#| msgid "%(birthdate)s is not a valid birthdate"
+msgid "File is not a valid video"
+msgstr "%(birthdate)s er ikke en gyldig fødselsdato"
+
+#: exercises/models/video.py:88
+#, fuzzy
+#| msgid "Main picture"
+msgid "Main video"
+msgstr "Hovedbilde"
+
+#: exercises/models/video.py:94
+msgid "Video"
+msgstr ""
+
+#: exercises/models/video.py:101
+msgid "Size"
+msgstr ""
+
+#: exercises/models/video.py:108 manager/models/schedule_step.py:56
+msgid "Duration"
+msgstr "Varighet"
+
+#: exercises/models/video.py:117
+msgid "Width"
+msgstr ""
+
+#: exercises/models/video.py:124
+#, fuzzy
+#| msgid "Weight"
+msgid "Height"
+msgstr "Vekt"
+
+#: exercises/models/video.py:131
+#, fuzzy
+#| msgid "Code"
+msgid "Codec"
+msgstr "Kode"
+
+#: exercises/models/video.py:139
+msgid "Codec, long name"
+msgstr ""
+
#: exercises/templates/equipment/admin-overview.html:4
msgid "Equipment list"
msgstr "Utstyrsliste"
@@ -1649,7 +1721,7 @@ msgstr "Utstyrsoversikt"
#: exercises/templates/equipment/overview.html:69
#: exercises/templates/exercise/overview.html:74
-#: exercises/templates/exercise/view.html:214
+#: exercises/templates/exercise/view.html:264
#: exercises/templates/muscles/overview.html:71
msgid "Main muscles"
msgstr "Viktigste musklene"
@@ -1776,7 +1848,8 @@ msgstr "Innleveringsdato"
#: gym/templates/gym/new_user.html:22
#: gym/templates/gym/reset_user_password.html:20 manager/models/log.py:45
#: manager/models/schedule.py:44 manager/models/session.py:49
-#: manager/models/workout.py:89 nutrition/models/plan.py:55
+#: manager/models/workout.py:89 measurements/models/category.py:48
+#: measurements/models/measurement.py:59 nutrition/models/plan.py:55
#: nutrition/templates/ingredient/pending.html:16 weight/models.py:41
msgid "User"
msgstr "Bruker"
@@ -1803,13 +1876,13 @@ msgid "Please select one of the options below."
msgstr "Velg ett av alternativene nedenfor."
#: exercises/templates/exercise/view.html:60
-#: exercises/templates/exercise/view.html:153
+#: exercises/templates/exercise/view.html:203
#: nutrition/templates/ingredient/view.html:38
msgid "Accept"
msgstr "Godta"
#: exercises/templates/exercise/view.html:64
-#: exercises/templates/exercise/view.html:154
+#: exercises/templates/exercise/view.html:204
#: nutrition/templates/ingredient/view.html:42
msgid "Decline"
msgstr "Avslå"
@@ -1822,32 +1895,42 @@ msgstr "Bilder"
msgid "Add new image"
msgstr "Legg til nytt bilde"
-#: exercises/templates/exercise/view.html:147
+#: exercises/templates/exercise/view.html:148
+msgid "Videos"
+msgstr ""
+
+#: exercises/templates/exercise/view.html:187 exercises/views/videos.py:94
+#, fuzzy
+#| msgid "Add new image"
+msgid "Add new video"
+msgstr "Legg til nytt bilde"
+
+#: exercises/templates/exercise/view.html:197
msgid "Images pending review"
msgstr "Bilder som venter på godkjenning"
-#: exercises/templates/exercise/view.html:168
+#: exercises/templates/exercise/view.html:218
msgid "Comments for this exercise"
msgstr "Kommentarer for denne øvelsen"
-#: exercises/templates/exercise/view.html:196
+#: exercises/templates/exercise/view.html:246
msgid "Add new comment"
msgstr "Legg til ny kommentar"
-#: exercises/templates/exercise/view.html:210
+#: exercises/templates/exercise/view.html:260
msgid "The diagram shows the most used muscles on this exercise"
msgstr "Diagrammet viser de mest brukte musklene i denne øvelsen"
-#: exercises/templates/exercise/view.html:251
+#: exercises/templates/exercise/view.html:301
#: manager/templates/workout/log.html:10 manager/templates/workout/log.html:11
msgid "Weight log"
msgstr "Vektlogg"
-#: exercises/templates/exercise/view.html:256
+#: exercises/templates/exercise/view.html:306
msgid "Exercise Variations"
msgstr "Treningsvariasjoner"
-#: exercises/templates/exercise/view.html:277
+#: exercises/templates/exercise/view.html:327
msgid "Submit a correction"
msgstr "Send inn en rettelse"
@@ -1883,30 +1966,30 @@ msgstr "Legg til kommentar til øvelsen"
msgid "Delete equipment?"
msgstr "Slett utstyr?"
-#: exercises/views/exercises.py:228
+#: exercises/views/exercises.py:229
#, fuzzy, python-format
msgid ""
"%(name_original)s is too similar to existing exercise \"%(exercise_name)s\""
msgstr "%(name_original)s er for likt eksisterende øvelse «%(exercise_name)s»"
-#: exercises/views/exercises.py:246
+#: exercises/views/exercises.py:247
msgid "Add exercise"
msgstr "Legg til øvelse"
-#: exercises/views/exercises.py:366
+#: exercises/views/exercises.py:367
msgid "Thank you. Once the changes are reviewed the exercise will be updated."
msgstr "Takk. Så fort endringene er godkjent vil øvelsen bli oppdatert."
-#: exercises/views/exercises.py:379
+#: exercises/views/exercises.py:380
#, python-brace-format
msgid "Correct {0}"
msgstr "Korrekt {0}"
-#: exercises/views/exercises.py:421
+#: exercises/views/exercises.py:422
msgid "This will delete the exercise from all workouts."
msgstr "Dette vil slette øvelsen fra alle treningsøktene."
-#: exercises/views/exercises.py:473
+#: exercises/views/exercises.py:474
msgid "Exercise was successfully marked as rejected"
msgstr "Øvelse ble vellykket merket som avvist"
@@ -1918,6 +2001,11 @@ msgstr "Endre bilde for øvelsen"
msgid "Delete exercise image?"
msgstr "Slett bilde for øvelsen?"
+#: exercises/views/videos.py:144 nutrition/views/log.py:230
+#: nutrition/views/unit_ingredient.py:139
+msgid "Delete?"
+msgstr "Slett?"
+
#: gallery/templates/images/overview.html:62
msgid "Add image"
msgstr "Legg til bilde"
@@ -1984,8 +2072,8 @@ msgid "Contract type"
msgstr "Kontraktstype"
#: gym/models/contract.py:208 gym/templates/contract/view.html:59
-#: manager/templates/log/add.html:52 nutrition/forms.py:58
-#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:92
+#: manager/templates/log/add.html:52 nutrition/forms.py:59
+#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:102
#: nutrition/models/meal_item.py:72
msgid "Amount"
msgstr "Beløp"
@@ -2429,6 +2517,7 @@ msgstr ""
"postene"
#: mailer/templates/mailer/gym/preview.html:22
+#: software/templates/about_us.html:59
msgid "Current version"
msgstr "Gjeldene versjon"
@@ -2465,7 +2554,8 @@ msgstr ""
#: manager/models/log.py:90 manager/models/setting.py:47
#: manager/models/setting.py:78 manager/templates/log/add.html:53
#: manager/templates/log/add.html:55 manager/templates/set/formset.html:11
-#: manager/templates/set/formset.html:13 nutrition/forms.py:62
+#: manager/templates/set/formset.html:13 measurements/models/category.py:58
+#: nutrition/forms.py:63
msgid "Unit"
msgstr "Enhet"
@@ -2535,10 +2625,6 @@ msgstr ""
msgid "schedule"
msgstr "timeplan"
-#: manager/models/schedule_step.py:56
-msgid "Duration"
-msgstr "Varighet"
-
#: manager/models/schedule_step.py:57
msgid "The duration in weeks"
msgstr "Varigheten i uker"
@@ -2823,7 +2909,7 @@ msgstr ""
#: manager/templates/schedule/view.html:290
#: manager/templates/workout/view.html:142
#: manager/templates/workout/view.html:217
-#: nutrition/templates/plan/view.html:415
+#: nutrition/templates/plan/view.html:417
msgid "Download as PDF"
msgstr "Last ned som PDF"
@@ -3062,23 +3148,27 @@ msgstr "Nytt inntrykk for øvelsen {0}"
msgid "This will delete all weight logs for this day as well."
msgstr "Dette vil slette alle vekt logger for denne dagen også."
-#: nutrition/forms.py:121
+#: measurements/models/measurement.py:69
+msgid "Value"
+msgstr ""
+
+#: nutrition/forms.py:122
msgid "Calculate"
msgstr "Beregn"
-#: nutrition/forms.py:194 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:195 nutrition/templates/rate/form.html:76
msgid "Basic caloric intake"
msgstr "Grunnleggende kaloriinntak"
-#: nutrition/forms.py:195
+#: nutrition/forms.py:196
msgid "Your basic caloric intake as calculated for your data"
msgstr "Din grunnleggende kaloriinntak beregnet med din data"
-#: nutrition/forms.py:201
+#: nutrition/forms.py:202
msgid "Additional calories"
msgstr "Ekstra kalorier"
-#: nutrition/forms.py:203
+#: nutrition/forms.py:204
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
@@ -3086,8 +3176,8 @@ msgstr ""
"Ekstra kalorier for å legge til base rate (for å trekke fra, legg inn et "
"negativt tall)"
-#: nutrition/forms.py:231 nutrition/models/ingredient_weight_unit.py:39
-#: nutrition/models/log.py:71 nutrition/models/meal_item.py:53
+#: nutrition/forms.py:232 nutrition/models/ingredient_weight_unit.py:39
+#: nutrition/models/log.py:81 nutrition/models/meal_item.py:53
#: nutrition/templates/log/detail.html:155
msgid "Ingredient"
msgstr "Ingrediens"
@@ -3106,14 +3196,14 @@ msgstr "I g per 100g produkt"
#: nutrition/models/ingredient.py:123
#: nutrition/templates/ingredient/view.html:96
#: nutrition/templates/log/detail.html:78
-#: nutrition/templates/plan/view.html:262 nutrition/views/plan.py:406
+#: nutrition/templates/plan/view.html:264 nutrition/views/plan.py:406
msgid "Sugar content in carbohydrates"
msgstr "Sukkerinnholdet i karbohydrater"
#: nutrition/models/ingredient.py:141
#: nutrition/templates/ingredient/view.html:112
#: nutrition/templates/log/detail.html:104
-#: nutrition/templates/plan/view.html:274 nutrition/views/plan.py:420
+#: nutrition/templates/plan/view.html:276 nutrition/views/plan.py:420
msgid "Saturated fat content in fats"
msgstr "Mettet fett i fett"
@@ -3121,7 +3211,7 @@ msgstr "Mettet fett i fett"
#: nutrition/templates/ingredient/view.html:134
#: nutrition/templates/log/detail.html:122
#: nutrition/templates/log/detail.html:178
-#: nutrition/templates/plan/view.html:285 nutrition/views/plan.py:426
+#: nutrition/templates/plan/view.html:287 nutrition/views/plan.py:426
msgid "Fibres"
msgstr "Fiber"
@@ -3129,7 +3219,7 @@ msgstr "Fiber"
#: nutrition/templates/ingredient/view.html:144
#: nutrition/templates/log/detail.html:135
#: nutrition/templates/log/detail.html:181
-#: nutrition/templates/plan/view.html:291 nutrition/views/plan.py:432
+#: nutrition/templates/plan/view.html:293 nutrition/views/plan.py:432
msgid "Sodium"
msgstr "Natrium"
@@ -3176,10 +3266,20 @@ 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:55
+msgid "Meal"
+msgstr "Måltid"
+
#: nutrition/models/meal.py:61
msgid "Time (approx)"
msgstr "Tid (ca)"
+#: nutrition/models/meal.py:68
+msgid ""
+"Give meals a textual description / name such as \"Breakfast\" or \"after "
+"workout\""
+msgstr ""
+
#: nutrition/models/plan.py:71
msgid ""
"A description of the goal of the plan, e.g. \"Gain mass\" or \"Prepare for "
@@ -3330,12 +3430,12 @@ msgstr ""
#: nutrition/templates/ingredient/view.html:71
#: nutrition/templates/log/detail.html:31
-#: nutrition/templates/plan/view.html:227 nutrition/views/plan.py:376
+#: nutrition/templates/plan/view.html:229 nutrition/views/plan.py:376
msgid "Macronutrients"
msgstr "Makronæringsstoffer"
#: nutrition/templates/ingredient/view.html:80
-#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:244
+#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:246
msgid "kJ"
msgstr "kJ"
@@ -3348,7 +3448,7 @@ msgstr "n.A."
#: nutrition/templates/ingredient/view.html:128
#: nutrition/templates/log/detail.html:119
-#: nutrition/templates/plan/view.html:282
+#: nutrition/templates/plan/view.html:284
msgid "Others"
msgstr "Andre"
@@ -3377,7 +3477,7 @@ msgstr "Slett ingrediens"
#: nutrition/templates/log/detail.html:7
#: nutrition/templates/log/overview.html:7
-#: nutrition/templates/plan/view.html:300
+#: nutrition/templates/plan/view.html:302
msgid "Nutrition diary"
msgstr "Ernæringsdagbok"
@@ -3387,13 +3487,13 @@ msgstr "Planlagt"
#: nutrition/templates/log/detail.html:33
#: nutrition/templates/log/overview.html:31
-#: nutrition/templates/plan/view.html:308
+#: nutrition/templates/plan/view.html:310
msgid "Logged"
msgstr "Logget"
#: nutrition/templates/log/detail.html:34
#: nutrition/templates/log/overview.html:32
-#: nutrition/templates/plan/view.html:309
+#: nutrition/templates/plan/view.html:311
msgid "Difference"
msgstr "Forskjell"
@@ -3406,7 +3506,7 @@ msgid "g"
msgstr "g"
#: nutrition/templates/log/overview.html:53
-#: nutrition/templates/plan/view.html:330
+#: nutrition/templates/plan/view.html:332
msgid "nothing found"
msgstr "Ingenting funnet"
@@ -3426,56 +3526,56 @@ msgstr "Logg dette måltidet"
msgid "Add ingredient to meal"
msgstr "Tilsett ingrediens i måltidet"
-#: nutrition/templates/plan/view.html:150
+#: nutrition/templates/plan/view.html:152
msgid "No items for this meal."
msgstr "Ingen elementer for dette måltidet."
-#: nutrition/templates/plan/view.html:188
+#: nutrition/templates/plan/view.html:190
msgid "No meals for this plan."
msgstr "Ingen måltider for denne planen."
-#: nutrition/templates/plan/view.html:200
+#: nutrition/templates/plan/view.html:202
msgid "Log this Plan"
msgstr "Logg denne planen"
-#: nutrition/templates/plan/view.html:206
+#: nutrition/templates/plan/view.html:208
msgid "Add a new meal"
msgstr "Legg til nytt måltid"
-#: nutrition/templates/plan/view.html:216 nutrition/views/plan.py:369
+#: nutrition/templates/plan/view.html:218 nutrition/views/plan.py:369
msgid "Nutritional data"
msgstr "Ernæringsmessige data"
-#: nutrition/templates/plan/view.html:219
+#: nutrition/templates/plan/view.html:221
#, python-format
msgid "Based on the weight entry dated %(date)s (%(weight)s)"
msgstr "Basert på vektoppføringen datert %(date)s (%(weight)s)"
-#: nutrition/templates/plan/view.html:228 nutrition/views/plan.py:377
+#: nutrition/templates/plan/view.html:230 nutrition/views/plan.py:377
msgid "Total"
msgstr "Totalt"
-#: nutrition/templates/plan/view.html:229 nutrition/views/plan.py:378
+#: nutrition/templates/plan/view.html:231 nutrition/views/plan.py:378
msgid "Percent of energy"
msgstr "Prosent av energien"
-#: nutrition/templates/plan/view.html:232 nutrition/views/plan.py:379
+#: nutrition/templates/plan/view.html:234 nutrition/views/plan.py:379
msgid "g per body kg"
msgstr "g per kropps kg"
-#: nutrition/templates/plan/view.html:234
+#: nutrition/templates/plan/view.html:236
msgid "oz per body lb"
msgstr "oz per kropps lb"
-#: nutrition/templates/plan/view.html:338
+#: nutrition/templates/plan/view.html:340
msgid "View complete nutrition log"
msgstr "Se full ernæringslogg"
-#: nutrition/templates/plan/view.html:371
+#: nutrition/templates/plan/view.html:373
msgid "Goal"
msgstr "Mål"
-#: nutrition/templates/plan/view.html:382
+#: nutrition/templates/plan/view.html:384
#, fuzzy
#| msgid ""
#| "You have selected that this nutritional plan has a\n"
@@ -3489,7 +3589,7 @@ msgstr ""
"Du har valgt at denne ernæringsplanen har et\n"
"mål med mengde kalorier. Bruk kalkulatoren eller angi verdien selv."
-#: nutrition/templates/plan/view.html:392
+#: nutrition/templates/plan/view.html:394
msgid ""
"If you find the ingredient list too short, you might want to activate the "
"preference to also show English ingredients."
@@ -3497,15 +3597,15 @@ msgstr ""
"Hvis du finner ingredienslisten for kort, kan det være lurt å aktivere "
"bruken av engelske ingredienser."
-#: nutrition/templates/plan/view.html:421
+#: nutrition/templates/plan/view.html:423
msgid "Edit nutrition plan"
msgstr "Endre ernæring plan"
-#: nutrition/templates/plan/view.html:425
+#: nutrition/templates/plan/view.html:427
msgid "Make a copy of this nutrition plan"
msgstr "Lag en kopi av denne ernærings planen"
-#: nutrition/templates/plan/view.html:431
+#: nutrition/templates/plan/view.html:433
msgid "Delete nutrition plan"
msgstr "Slett ernæringsplan"
@@ -3602,10 +3702,6 @@ msgstr "Legg til ny ingrediens"
msgid "Ingredient was successfully marked as rejected"
msgstr "Ingrediens ble vellykket merket som avvist"
-#: nutrition/views/log.py:229 nutrition/views/unit_ingredient.py:139
-msgid "Delete?"
-msgstr "Slett?"
-
#: nutrition/views/meal.py:55
msgid "Add new meal"
msgstr "Legg til nytt måltid"
@@ -4027,11 +4123,11 @@ msgstr ""
msgid "Re-Submit"
msgstr "Send på nytt"
-#: weight/templates/overview.html:68
+#: weight/templates/overview.html:51
msgid "Export as CSV"
msgstr "Eksporter som CSV"
-#: weight/templates/overview.html:72
+#: weight/templates/overview.html:55
msgid "Import from spreadsheet"
msgstr "Importer fra et regneark"
@@ -4049,6 +4145,12 @@ msgstr "Slettet."
msgid "Delete weight entry for the %s"
msgstr "Slett vektoppføring for %s"
+#~ msgid "Your current weight is: "
+#~ msgstr "Din nåværende vekt er:"
+
+#~ msgid "Released under the Affero GPL"
+#~ msgstr "Utgitt under Affero GPL"
+
#~ msgid "Responsible for the content of this site as per German law §5 TMG:"
#~ msgstr ""
#~ "Ansvarlig for innholdet på dette nettstedet som per tysk lov §5 TMG:"
@@ -4207,9 +4309,6 @@ msgstr "Slett vektoppføring for %s"
#~ "interessert,\n"
#~ "besøk lenken og begynn å oversette."
-#~ msgid "Code"
-#~ msgstr "Kode"
-
#~ msgid ""
#~ "Obviously, you are highly encouraged to clone the\n"
#~ "repo and start hacking! Once you are ready, send a pull request and we\n"
@@ -4358,9 +4457,6 @@ msgstr "Slett vektoppføring for %s"
#~ msgid "Pause!"
#~ msgstr "Pause!"
-#~ msgid "Meal"
-#~ msgstr "Måltid"
-
#~ msgid "There is no chart here because there are no weight entries."
#~ msgstr ""
#~ "Det er ingen diagram her fordi det er ingen vektoppføring opprettet."
diff --git a/wger/locale/os/LC_MESSAGES/django.po b/wger/locale/os/LC_MESSAGES/django.po
index a3d523120..86c6ab6bb 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: 2021-08-17 17:23+0200\n"
+"POT-Creation-Date: 2022-02-15 14:51+0100\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/"
@@ -47,16 +47,16 @@ msgstr ""
msgid "Nothing found."
msgstr ""
-#: config/templates/language/overview.html:16 core/templates/index.html:147
-#: core/templates/index.html:199 manager/templates/calendar/month.html:132
+#: config/templates/language/overview.html:16 core/templates/index.html:137
+#: core/templates/index.html:189 manager/templates/calendar/month.html:132
#: manager/templates/schedule/overview.html:28
#: manager/templates/schedule/view.html:146
#: manager/templates/workout/overview.html:28
#: nutrition/templates/ingredient/overview.html:45
#: nutrition/templates/plan/overview.html:23
-#: nutrition/templates/plan/view.html:148
-#: nutrition/templates/plan/view.html:151
-#: nutrition/templates/plan/view.html:189
+#: nutrition/templates/plan/view.html:150
+#: nutrition/templates/plan/view.html:153
+#: nutrition/templates/plan/view.html:191
msgid "Add one now."
msgstr ""
@@ -77,7 +77,7 @@ msgstr ""
#: gym/templates/gym/member_list.html:244
#: gym/templates/gym/member_list.html:281
#: mailer/templates/mailer/gym/overview.html:43
-#: weight/templates/overview.html:78
+#: weight/templates/overview.html:61
msgid "Add"
msgstr "Бафтауын"
@@ -111,14 +111,14 @@ msgstr ""
#: config/templates/language/view.html:91 core/templates/user/api_key.html:44
#: core/templates/user/preferences.html:28
-#: exercises/templates/exercise/view.html:273
-#: exercises/templates/exercise/view.html:296 gym/models/contract.py:200
+#: exercises/templates/exercise/view.html:323
+#: exercises/templates/exercise/view.html:346 gym/models/contract.py:200
#: gym/templates/contract/view.html:41 gym/templates/contract/view.html:106
#: gym/templates/gym/member_list.html:248
#: manager/templates/schedule/view.html:281
#: manager/templates/workout/view.html:206
#: nutrition/templates/ingredient/view.html:226
-#: nutrition/templates/plan/view.html:409 weight/templates/overview.html:62
+#: nutrition/templates/plan/view.html:411 weight/templates/overview.html:45
msgid "Options"
msgstr "Фадӕттӕ"
@@ -132,12 +132,12 @@ msgstr "Фадӕттӕ"
#: core/templates/weight_unit/list.html:17
#: exercises/templates/categories/admin-overview.html:16
#: exercises/templates/equipment/admin-overview.html:16
-#: exercises/templates/exercise/view.html:180
-#: exercises/templates/exercise/view.html:301
+#: exercises/templates/exercise/view.html:230
+#: exercises/templates/exercise/view.html:351
#: exercises/templates/muscles/admin-overview.html:16
-#: exercises/views/comments.py:63 gallery/views/images.py:96
-#: gym/templates/admin_notes/list.html:32 gym/templates/contract/list.html:31
-#: gym/templates/contract/view.html:107
+#: exercises/views/comments.py:63 exercises/views/videos.py:69
+#: gallery/views/images.py:96 gym/templates/admin_notes/list.html:32
+#: gym/templates/contract/list.html:31 gym/templates/contract/view.html:107
#: gym/templates/contract_option/list.html:31
#: gym/templates/contract_type/list.html:31 gym/templates/document/list.html:38
#: gym/templates/gym/list.html:19 gym/templates/gym/list.html:43
@@ -148,7 +148,7 @@ msgstr "Фадӕттӕ"
#: manager/templates/calendar/partial_overview_table.html:18
#: manager/templates/schedule/view.html:121
#: nutrition/templates/ingredient/view.html:198
-#: nutrition/templates/plan/view.html:89 nutrition/templates/plan/view.html:124
+#: nutrition/templates/plan/view.html:89 nutrition/templates/plan/view.html:126
#: nutrition/templates/units/list.html:18
msgid "Edit"
msgstr "Ивын"
@@ -162,9 +162,9 @@ msgstr "Ивын"
#: exercises/templates/categories/admin-overview.html:17
#: exercises/templates/equipment/admin-overview.html:17
#: exercises/templates/exercise/view.html:68
-#: exercises/templates/exercise/view.html:155
-#: exercises/templates/exercise/view.html:185
-#: exercises/templates/exercise/view.html:306
+#: exercises/templates/exercise/view.html:205
+#: exercises/templates/exercise/view.html:235
+#: exercises/templates/exercise/view.html:356
#: exercises/templates/muscles/admin-overview.html:17
#: gym/templates/admin_notes/list.html:40
#: gym/templates/contract_option/list.html:39
@@ -177,7 +177,7 @@ msgstr "Ивын"
#: nutrition/templates/ingredient/view.html:199
#: nutrition/templates/ingredient/view.html:239
#: nutrition/templates/log/detail.html:197
-#: nutrition/templates/plan/view.html:95 nutrition/templates/plan/view.html:130
+#: nutrition/templates/plan/view.html:95 nutrition/templates/plan/view.html:132
#: nutrition/templates/units/list.html:20
msgid "Delete"
msgstr "Схафын"
@@ -301,7 +301,7 @@ msgid "Some way of answering you (e-mail, etc.)"
msgstr ""
#: core/forms.py:265 exercises/models/comment.py:40 manager/models/set.py:60
-#: manager/models/setting.py:99 nutrition/models/log.py:61
+#: manager/models/setting.py:99 nutrition/models/log.py:71
msgid "Comment"
msgstr "Хъуыды"
@@ -430,7 +430,7 @@ msgstr ""
msgid "Age"
msgstr ""
-#: core/models/profile.py:202 nutrition/forms.py:98
+#: core/models/profile.py:202 nutrition/forms.py:99
msgid "Height (cm)"
msgstr ""
@@ -481,7 +481,7 @@ msgid "Total caloric intake, including e.g. any surplus"
msgstr ""
#: core/models/profile.py:305 nutrition/models/ingredient_weight_unit.py:45
-#: nutrition/models/log.py:80 nutrition/models/meal_item.py:58
+#: nutrition/models/log.py:90 nutrition/models/meal_item.py:58
msgid "Weight unit"
msgstr ""
@@ -516,9 +516,9 @@ msgstr ""
#: gym/models/user_document.py:87 gym/templates/contract/view.html:50
#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:96
#: gym/views/gym.py:156 manager/models/schedule.py:55
-#: manager/models/workout.py:56 nutrition/models/ingredient.py:96
-#: nutrition/models/ingredient_category.py:26
-#: nutrition/models/weight_unit.py:38
+#: manager/models/workout.py:56 measurements/models/category.py:53
+#: nutrition/models/ingredient.py:96 nutrition/models/ingredient_category.py:26
+#: nutrition/models/meal.py:66 nutrition/models/weight_unit.py:38
#: nutrition/templates/ingredient/pending.html:15
#: nutrition/templates/ingredient/view.html:185
msgid "Name"
@@ -574,17 +574,17 @@ msgstr ""
msgid "Dashboard"
msgstr ""
-#: core/templates/index.html:31 manager/templates/calendar/month.html:115
+#: core/templates/index.html:21 manager/templates/calendar/month.html:115
msgid "Add log to day"
msgstr ""
-#: core/templates/index.html:35 manager/templates/calendar/month.html:120
+#: core/templates/index.html:25 manager/templates/calendar/month.html:120
msgid ""
"Click to add weight logs to a training\n"
"day in your current workout:"
msgstr ""
-#: core/templates/index.html:43 core/templates/index.html:83
+#: core/templates/index.html:33 core/templates/index.html:73
#: core/templates/misc/fragments/shariff_modal.html:29
#: core/templates/template.html:125 manager/templates/calendar/month.html:138
#: manager/templates/schedule/view.html:246
@@ -594,17 +594,17 @@ msgstr ""
msgid "Close"
msgstr ""
-#: core/templates/index.html:54 core/templates/index.html:203
+#: core/templates/index.html:44 core/templates/index.html:193
msgid "Add new diary entry"
msgstr ""
-#: core/templates/index.html:59
+#: core/templates/index.html:49
msgid ""
"Click to add an entry to your nutrition diary for today. You can either log "
"a meal as you defined it, or entry any number of custom entries."
msgstr ""
-#: core/templates/index.html:67 core/templates/index.html:171
+#: core/templates/index.html:57 core/templates/index.html:161
#: core/templates/user/overview.html:171
#: nutrition/templates/ingredient/view.html:79
#: nutrition/templates/log/detail.html:40
@@ -613,19 +613,19 @@ msgstr ""
#: nutrition/templates/log/overview.html:7
#: nutrition/templates/log/overview.html:44
#: nutrition/templates/plan/overview.html:17
-#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:242
-#: nutrition/templates/plan/view.html:301
-#: nutrition/templates/plan/view.html:321
-#: nutrition/templates/plan/view.html:363
-#: nutrition/templates/plan/view.html:373
+#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:244
+#: nutrition/templates/plan/view.html:303
+#: nutrition/templates/plan/view.html:323
+#: nutrition/templates/plan/view.html:365
+#: nutrition/templates/plan/view.html:375
msgid "kcal"
msgstr ""
-#: core/templates/index.html:79 nutrition/templates/plan/view.html:348
+#: core/templates/index.html:69 nutrition/templates/plan/view.html:350
msgid "Add custom diary entry"
msgstr ""
-#: core/templates/index.html:94 core/templates/index.html:102
+#: core/templates/index.html:84 core/templates/index.html:92
#: manager/models/day.py:34 manager/models/log.py:56
#: manager/models/session.py:60 manager/models/workout.py:109
#: manager/templates/schedule/view.html:105
@@ -636,80 +636,80 @@ msgstr ""
msgid "Workout"
msgstr ""
-#: core/templates/index.html:128
+#: core/templates/index.html:118
msgid "This workout is part of a schedule:"
msgstr ""
-#: core/templates/index.html:133
+#: core/templates/index.html:123
msgid ""
"The current workout is selected from your active schedule or, if you don't "
"have one, simply by date."
msgstr ""
-#: core/templates/index.html:142 manager/templates/calendar/month.html:188
+#: core/templates/index.html:132 manager/templates/calendar/month.html:188
msgid "Add new log"
msgstr ""
-#: core/templates/index.html:147 core/templates/user/overview.html:58
+#: core/templates/index.html:137 core/templates/user/overview.html:58
#: manager/templates/calendar/month.html:128
#: manager/templates/schedule/view.html:146
#: manager/templates/workout/overview.html:28
msgid "No workouts found."
msgstr ""
-#: core/templates/index.html:157 nutrition/models/log.py:48
+#: core/templates/index.html:147 nutrition/models/log.py:49
#: nutrition/models/meal.py:49 nutrition/models/meal_item.py:47
#: nutrition/models/plan.py:94 nutrition/templates/plan/view.html:11
#: nutrition/templates/plan/view.html:19
msgid "Nutrition plan"
msgstr ""
-#: core/templates/index.html:169 core/templates/user/overview.html:155
+#: core/templates/index.html:159 core/templates/user/overview.html:155
#: nutrition/models/ingredient.py:100
#: nutrition/templates/ingredient/view.html:77
#: nutrition/templates/log/detail.html:39
#: nutrition/templates/log/detail.html:156
-#: nutrition/templates/plan/view.html:53 nutrition/templates/plan/view.html:241
-#: nutrition/templates/plan/view.html:358
-#: nutrition/templates/plan/view.html:362 nutrition/views/plan.py:384
+#: nutrition/templates/plan/view.html:53 nutrition/templates/plan/view.html:243
+#: nutrition/templates/plan/view.html:360
+#: nutrition/templates/plan/view.html:364 nutrition/views/plan.py:384
msgid "Energy"
msgstr ""
-#: core/templates/index.html:175 core/templates/user/overview.html:156
+#: core/templates/index.html:165 core/templates/user/overview.html:156
#: nutrition/models/ingredient.py:105
#: nutrition/templates/ingredient/view.html:84
#: nutrition/templates/log/detail.html:52
#: nutrition/templates/log/detail.html:174
-#: nutrition/templates/plan/view.html:54 nutrition/templates/plan/view.html:249
+#: nutrition/templates/plan/view.html:54 nutrition/templates/plan/view.html:251
#: nutrition/views/plan.py:390
msgid "Protein"
msgstr ""
-#: core/templates/index.html:181 core/templates/user/overview.html:157
+#: core/templates/index.html:171 core/templates/user/overview.html:157
#: nutrition/models/ingredient.py:113
#: nutrition/templates/ingredient/view.html:90
#: nutrition/templates/log/detail.html:65
#: nutrition/templates/log/detail.html:175
-#: nutrition/templates/plan/view.html:55 nutrition/templates/plan/view.html:255
+#: nutrition/templates/plan/view.html:55 nutrition/templates/plan/view.html:257
#: nutrition/views/plan.py:398
msgid "Carbohydrates"
msgstr ""
-#: core/templates/index.html:187 core/templates/user/overview.html:158
+#: core/templates/index.html:177 core/templates/user/overview.html:158
#: nutrition/models/ingredient.py:131
#: nutrition/templates/ingredient/view.html:106
#: nutrition/templates/log/detail.html:91
#: nutrition/templates/log/detail.html:176
-#: nutrition/templates/plan/view.html:56 nutrition/templates/plan/view.html:268
+#: nutrition/templates/plan/view.html:56 nutrition/templates/plan/view.html:270
#: nutrition/views/plan.py:412
msgid "Fat"
msgstr ""
-#: core/templates/index.html:199 nutrition/templates/plan/overview.html:22
+#: core/templates/index.html:189 nutrition/templates/plan/overview.html:22
msgid "No nutrition plans."
msgstr ""
-#: core/templates/index.html:213 core/templates/user/overview.html:112
+#: core/templates/index.html:203 core/templates/user/overview.html:112
#: core/templates/user/overview.html:121 manager/forms.py:173
#: manager/helpers.py:89 manager/models/log.py:84 manager/models/setting.py:67
#: manager/templates/log/add.html:54 manager/templates/set/formset.html:12
@@ -718,11 +718,7 @@ msgstr ""
msgid "Weight"
msgstr ""
-#: core/templates/index.html:217
-msgid "Your current weight is: "
-msgstr ""
-
-#: core/templates/index.html:248 core/templates/navigation.html:97
+#: core/templates/index.html:210 core/templates/navigation.html:97
#: weight/views.py:70
msgid "Add weight entry"
msgstr ""
@@ -754,7 +750,7 @@ msgstr ""
msgid "Nothing found"
msgstr ""
-#: core/templates/misc/about.html:4 core/templates/template.html:201
+#: core/templates/misc/about.html:4 core/templates/template.html:175
#: core/templates/template_features.html:118
#: core/templates/template_no_context.html:88
msgid "Imprint"
@@ -770,8 +766,8 @@ msgid ""
msgstr ""
#: core/templates/misc/fragments/shariff_modal.html:22
-#: nutrition/templates/plan/view.html:385
-#: nutrition/templates/plan/view.html:394
+#: nutrition/templates/plan/view.html:387
+#: nutrition/templates/plan/view.html:396
msgid "That's done here"
msgstr ""
@@ -857,7 +853,7 @@ msgstr ""
msgid "Equipment"
msgstr ""
-#: core/templates/navigation.html:78 exercises/templates/exercise/view.html:208
+#: core/templates/navigation.html:78 exercises/templates/exercise/view.html:258
msgid "Muscles"
msgstr "Мускултӕ"
@@ -930,7 +926,7 @@ msgstr ""
msgid "Get the code"
msgstr ""
-#: core/templates/navigation.html:175 core/templates/template.html:193
+#: core/templates/navigation.html:175 core/templates/template.html:205
#: core/templates/template_features.html:100
msgid "Translate"
msgstr ""
@@ -1079,15 +1075,11 @@ msgstr ""
msgid "Create some demo entries"
msgstr ""
-#: core/templates/template.html:202 core/templates/template_features.html:122
+#: core/templates/template.html:176 core/templates/template_features.html:122
#: core/templates/template_no_context.html:89 software/templates/tos.html:7
msgid "Terms of service"
msgstr ""
-#: core/templates/template.html:209 core/templates/template.html:210
-msgid "Released under the Affero GPL"
-msgstr ""
-
#: core/templates/template_features.html:62 software/templates/features.html:9
#: software/templates/features.html:120
msgid "Features"
@@ -1184,9 +1176,10 @@ msgstr ""
#: core/templates/user/overview.html:120 core/templates/user/overview.html:153
#: exercises/models/exercise.py:77 gallery/models/image.py:47
#: manager/helpers.py:88 manager/models/log.py:98 manager/models/session.py:67
-#: nutrition/models/ingredient.py:85 nutrition/models/ingredient.py:87
-#: nutrition/models/ingredient.py:190 nutrition/templates/log/overview.html:30
-#: nutrition/templates/plan/view.html:307 weight/models.py:32
+#: measurements/models/measurement.py:64 nutrition/models/ingredient.py:85
+#: nutrition/models/ingredient.py:87 nutrition/models/ingredient.py:190
+#: nutrition/templates/log/overview.html:30
+#: nutrition/templates/plan/view.html:309 weight/models.py:32
#: weight/templates/import_csv_preview.html:13
#: weight/templates/import_csv_preview.html:42 weight/views.py:150
msgid "Date"
@@ -1194,10 +1187,10 @@ msgstr "Бон"
#: core/templates/user/overview.html:35 core/templates/user/overview.html:154
#: exercises/models/exercise.py:61 exercises/templates/exercise/view.html:88
-#: exercises/views/exercises.py:189 gallery/models/image.py:70
+#: exercises/views/exercises.py:190 gallery/models/image.py:70
#: gym/models/contract.py:57 gym/models/contract.py:107
#: manager/models/day.py:37 manager/models/workout.py:62
-#: nutrition/models/plan.py:69
+#: measurements/models/measurement.py:79 nutrition/models/plan.py:69
msgid "Description"
msgstr "Ӕмбарынгӕнӕн"
@@ -1358,11 +1351,11 @@ msgstr ""
msgid "Change password"
msgstr ""
-#: core/templatetags/wger_extras.py:217
+#: core/templatetags/wger_extras.py:229
msgid "kg"
msgstr ""
-#: core/templatetags/wger_extras.py:219
+#: core/templatetags/wger_extras.py:231
#: nutrition/templates/ingredient/view.html:86
#: nutrition/templates/ingredient/view.html:92
#: nutrition/templates/ingredient/view.html:99
@@ -1374,28 +1367,28 @@ msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr ""
-#: core/templatetags/wger_extras.py:222
+#: core/templatetags/wger_extras.py:234
msgid "lb"
msgstr ""
-#: core/templatetags/wger_extras.py:224
+#: core/templatetags/wger_extras.py:236
msgctxt "weight unit, i.e. ounces"
msgid "oz"
msgstr ""
#: core/views/languages.py:85 exercises/views/categories.py:121
-#: exercises/views/equipment.py:106 exercises/views/exercises.py:422
+#: exercises/views/equipment.py:106 exercises/views/exercises.py:423
#: exercises/views/images.py:128 exercises/views/muscles.py:118
-#: manager/views/schedule.py:311 manager/views/schedule_step.py:129
-#: manager/views/workout.py:268 manager/views/workout_session.py:141
-#: nutrition/views/ingredient.py:144 nutrition/views/plan.py:120
-#: nutrition/views/unit.py:111
+#: exercises/views/videos.py:129 manager/views/schedule.py:311
+#: manager/views/schedule_step.py:129 manager/views/workout.py:268
+#: manager/views/workout_session.py:141 nutrition/views/ingredient.py:144
+#: nutrition/views/plan.py:120 nutrition/views/unit.py:111
msgid "Successfully deleted"
msgstr ""
#: core/views/languages.py:93 core/views/license.py:103
#: core/views/repetition_units.py:115 core/views/weight_units.py:115
-#: exercises/views/categories.py:127 exercises/views/exercises.py:430
+#: exercises/views/categories.py:127 exercises/views/exercises.py:431
#: exercises/views/muscles.py:125 gallery/views/images.py:121
#: gym/views/admin_notes.py:196 gym/views/document.py:206 gym/views/gym.py:486
#: manager/views/schedule.py:318 manager/views/schedule_step.py:139
@@ -1409,7 +1402,7 @@ msgstr ""
#: core/views/languages.py:111 core/views/license.py:84
#: core/views/repetition_units.py:85 core/views/user.py:456
#: core/views/weight_units.py:85 exercises/views/categories.py:97
-#: exercises/views/equipment.py:83 exercises/views/exercises.py:304
+#: exercises/views/equipment.py:83 exercises/views/exercises.py:305
#: exercises/views/muscles.py:105 gym/views/admin_notes.py:160
#: gym/views/config.py:68 gym/views/contract.py:186
#: gym/views/contract_option.py:123 gym/views/contract_type.py:123
@@ -1496,7 +1489,7 @@ msgstr "Фыццаг мускултӕ"
#: exercises/models/base.py:64 exercises/templates/equipment/overview.html:71
#: exercises/templates/exercise/overview.html:76
-#: exercises/templates/exercise/view.html:218
+#: exercises/templates/exercise/view.html:268
#: exercises/templates/muscles/overview.html:73
msgid "Secondary muscles"
msgstr "Дыггаг мускултӕ"
@@ -1509,8 +1502,9 @@ msgstr ""
msgid "Exercise Categories"
msgstr "Фӕлтӕрӕнты ӕмбырд"
-#: exercises/models/comment.py:34 exercises/models/image.py:62
-#: manager/forms.py:165 manager/helpers.py:89 manager/models/log.py:51
+#: exercises/models/comment.py:34 exercises/models/image.py:75
+#: exercises/models/video.py:82 manager/forms.py:165 manager/helpers.py:89
+#: manager/models/log.py:51
msgid "Exercise"
msgstr "Фӕлтӕрӕн"
@@ -1523,43 +1517,67 @@ msgstr "Ацы фӕлтӕрӕн раст куыд хъӕуы аразын, уы
msgid "Language"
msgstr "Ӕвзаг"
-#: exercises/models/exercise.py:233 exercises/views/exercises.py:460
+#: exercises/models/exercise.py:237 exercises/views/exercises.py:461
msgid "Exercise was successfully added to the general database"
msgstr ""
-#: exercises/models/exercise.py:261
+#: exercises/models/exercise.py:265
msgid "New user submitted exercise"
msgstr ""
-#: exercises/models/exercise.py:263
+#: exercises/models/exercise.py:267
#, python-brace-format
msgid "The user {0} submitted a new exercise \"{1}\"."
msgstr ""
-#: exercises/models/image.py:68 gallery/models/image.py:56
+#: exercises/models/image.py:59
+msgid "Line"
+msgstr ""
+
+#: exercises/models/image.py:60
+msgid "3D"
+msgstr ""
+
+#: exercises/models/image.py:61
+msgid "Low-poly"
+msgstr ""
+
+#: exercises/models/image.py:62
+msgid "Photo"
+msgstr ""
+
+#: exercises/models/image.py:63
+msgid "Other"
+msgstr ""
+
+#: exercises/models/image.py:81 gallery/models/image.py:56
msgid "Image"
msgstr ""
-#: exercises/models/image.py:69 gallery/models/image.py:57
+#: exercises/models/image.py:82 gallery/models/image.py:57
msgid "Only PNG and JPEG formats are supported"
msgstr ""
-#: exercises/models/image.py:75
+#: exercises/models/image.py:88
msgid "Main picture"
msgstr ""
-#: exercises/models/image.py:78
+#: exercises/models/image.py:91
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 "
"by the system."
msgstr ""
-#: exercises/models/image.py:166
+#: exercises/models/image.py:100
+msgid "The art style of your image"
+msgstr ""
+
+#: exercises/models/image.py:185
msgid "New user submitted image"
msgstr ""
-#: exercises/models/image.py:167
+#: exercises/models/image.py:186
#, python-brace-format
msgid "The user {0} submitted a new image \"{1}\" for exercise {2}."
msgstr ""
@@ -1568,6 +1586,50 @@ msgstr ""
msgid "In latin, e.g. \"Pectoralis major\""
msgstr ""
+#: exercises/models/video.py:41
+msgid "Maximum file size is 100MB."
+msgstr ""
+
+#: exercises/models/video.py:44 exercises/models/video.py:48
+msgid "File type is not supported"
+msgstr ""
+
+#: exercises/models/video.py:57
+msgid "File is not a valid video"
+msgstr ""
+
+#: exercises/models/video.py:88
+msgid "Main video"
+msgstr ""
+
+#: exercises/models/video.py:94
+msgid "Video"
+msgstr ""
+
+#: exercises/models/video.py:101
+msgid "Size"
+msgstr ""
+
+#: exercises/models/video.py:108 manager/models/schedule_step.py:56
+msgid "Duration"
+msgstr ""
+
+#: exercises/models/video.py:117
+msgid "Width"
+msgstr ""
+
+#: exercises/models/video.py:124
+msgid "Height"
+msgstr ""
+
+#: exercises/models/video.py:131
+msgid "Codec"
+msgstr ""
+
+#: exercises/models/video.py:139
+msgid "Codec, long name"
+msgstr ""
+
#: exercises/templates/equipment/admin-overview.html:4
msgid "Equipment list"
msgstr ""
@@ -1583,7 +1645,7 @@ msgstr ""
#: exercises/templates/equipment/overview.html:69
#: exercises/templates/exercise/overview.html:74
-#: exercises/templates/exercise/view.html:214
+#: exercises/templates/exercise/view.html:264
#: exercises/templates/muscles/overview.html:71
msgid "Main muscles"
msgstr ""
@@ -1692,7 +1754,8 @@ msgstr ""
#: gym/templates/gym/new_user.html:22
#: gym/templates/gym/reset_user_password.html:20 manager/models/log.py:45
#: manager/models/schedule.py:44 manager/models/session.py:49
-#: manager/models/workout.py:89 nutrition/models/plan.py:55
+#: manager/models/workout.py:89 measurements/models/category.py:48
+#: measurements/models/measurement.py:59 nutrition/models/plan.py:55
#: nutrition/templates/ingredient/pending.html:16 weight/models.py:41
msgid "User"
msgstr "Архайӕг"
@@ -1717,13 +1780,13 @@ msgid "Please select one of the options below."
msgstr ""
#: exercises/templates/exercise/view.html:60
-#: exercises/templates/exercise/view.html:153
+#: exercises/templates/exercise/view.html:203
#: nutrition/templates/ingredient/view.html:38
msgid "Accept"
msgstr ""
#: exercises/templates/exercise/view.html:64
-#: exercises/templates/exercise/view.html:154
+#: exercises/templates/exercise/view.html:204
#: nutrition/templates/ingredient/view.html:42
msgid "Decline"
msgstr ""
@@ -1736,32 +1799,42 @@ msgstr ""
msgid "Add new image"
msgstr ""
-#: exercises/templates/exercise/view.html:147
+#: exercises/templates/exercise/view.html:148
+msgid "Videos"
+msgstr ""
+
+#: exercises/templates/exercise/view.html:187 exercises/views/videos.py:94
+#, fuzzy
+#| msgid "Add new exercise"
+msgid "Add new video"
+msgstr "Ног фӕлтӕрӕн бафтауын"
+
+#: exercises/templates/exercise/view.html:197
msgid "Images pending review"
msgstr ""
-#: exercises/templates/exercise/view.html:168
+#: exercises/templates/exercise/view.html:218
msgid "Comments for this exercise"
msgstr "Ацы фӕлтӕрӕны тыххӕй хъуыдытӕ"
-#: exercises/templates/exercise/view.html:196
+#: exercises/templates/exercise/view.html:246
msgid "Add new comment"
msgstr "Ног хъуыды бафтауын"
-#: exercises/templates/exercise/view.html:210
+#: exercises/templates/exercise/view.html:260
msgid "The diagram shows the most used muscles on this exercise"
msgstr ""
-#: exercises/templates/exercise/view.html:251
+#: exercises/templates/exercise/view.html:301
#: manager/templates/workout/log.html:10 manager/templates/workout/log.html:11
msgid "Weight log"
msgstr ""
-#: exercises/templates/exercise/view.html:256
+#: exercises/templates/exercise/view.html:306
msgid "Exercise Variations"
msgstr ""
-#: exercises/templates/exercise/view.html:277
+#: exercises/templates/exercise/view.html:327
msgid "Submit a correction"
msgstr ""
@@ -1796,30 +1869,30 @@ msgstr ""
msgid "Delete equipment?"
msgstr ""
-#: exercises/views/exercises.py:228
+#: exercises/views/exercises.py:229
#, python-format
msgid ""
"%(name_original)s is too similar to existing exercise \"%(exercise_name)s\""
msgstr ""
-#: exercises/views/exercises.py:246
+#: exercises/views/exercises.py:247
msgid "Add exercise"
msgstr ""
-#: exercises/views/exercises.py:366
+#: exercises/views/exercises.py:367
msgid "Thank you. Once the changes are reviewed the exercise will be updated."
msgstr ""
-#: exercises/views/exercises.py:379
+#: exercises/views/exercises.py:380
#, python-brace-format
msgid "Correct {0}"
msgstr ""
-#: exercises/views/exercises.py:421
+#: exercises/views/exercises.py:422
msgid "This will delete the exercise from all workouts."
msgstr ""
-#: exercises/views/exercises.py:473
+#: exercises/views/exercises.py:474
msgid "Exercise was successfully marked as rejected"
msgstr ""
@@ -1831,6 +1904,11 @@ msgstr ""
msgid "Delete exercise image?"
msgstr ""
+#: exercises/views/videos.py:144 nutrition/views/log.py:230
+#: nutrition/views/unit_ingredient.py:139
+msgid "Delete?"
+msgstr ""
+
#: gallery/templates/images/overview.html:62
#, fuzzy
#| msgid "Add muscle"
@@ -1899,8 +1977,8 @@ msgid "Contract type"
msgstr ""
#: gym/models/contract.py:208 gym/templates/contract/view.html:59
-#: manager/templates/log/add.html:52 nutrition/forms.py:58
-#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:92
+#: manager/templates/log/add.html:52 nutrition/forms.py:59
+#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:102
#: nutrition/models/meal_item.py:72
msgid "Amount"
msgstr ""
@@ -2333,6 +2411,7 @@ msgid ""
msgstr ""
#: mailer/templates/mailer/gym/preview.html:22
+#: software/templates/about_us.html:59
msgid "Current version"
msgstr ""
@@ -2365,7 +2444,8 @@ msgstr ""
#: manager/models/log.py:90 manager/models/setting.py:47
#: manager/models/setting.py:78 manager/templates/log/add.html:53
#: manager/templates/log/add.html:55 manager/templates/set/formset.html:11
-#: manager/templates/set/formset.html:13 nutrition/forms.py:62
+#: manager/templates/set/formset.html:13 measurements/models/category.py:58
+#: nutrition/forms.py:63
msgid "Unit"
msgstr ""
@@ -2428,10 +2508,6 @@ msgstr ""
msgid "schedule"
msgstr ""
-#: manager/models/schedule_step.py:56
-msgid "Duration"
-msgstr ""
-
#: manager/models/schedule_step.py:57
msgid "The duration in weeks"
msgstr ""
@@ -2686,7 +2762,7 @@ msgstr ""
#: manager/templates/schedule/view.html:290
#: manager/templates/workout/view.html:142
#: manager/templates/workout/view.html:217
-#: nutrition/templates/plan/view.html:415
+#: nutrition/templates/plan/view.html:417
msgid "Download as PDF"
msgstr ""
@@ -2903,30 +2979,34 @@ msgstr ""
msgid "This will delete all weight logs for this day as well."
msgstr ""
-#: nutrition/forms.py:121
+#: measurements/models/measurement.py:69
+msgid "Value"
+msgstr ""
+
+#: nutrition/forms.py:122
msgid "Calculate"
msgstr ""
-#: nutrition/forms.py:194 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:195 nutrition/templates/rate/form.html:76
msgid "Basic caloric intake"
msgstr ""
-#: nutrition/forms.py:195
+#: nutrition/forms.py:196
msgid "Your basic caloric intake as calculated for your data"
msgstr ""
-#: nutrition/forms.py:201
+#: nutrition/forms.py:202
msgid "Additional calories"
msgstr ""
-#: nutrition/forms.py:203
+#: nutrition/forms.py:204
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
msgstr ""
-#: nutrition/forms.py:231 nutrition/models/ingredient_weight_unit.py:39
-#: nutrition/models/log.py:71 nutrition/models/meal_item.py:53
+#: nutrition/forms.py:232 nutrition/models/ingredient_weight_unit.py:39
+#: nutrition/models/log.py:81 nutrition/models/meal_item.py:53
#: nutrition/templates/log/detail.html:155
msgid "Ingredient"
msgstr ""
@@ -2945,14 +3025,14 @@ msgstr ""
#: nutrition/models/ingredient.py:123
#: nutrition/templates/ingredient/view.html:96
#: nutrition/templates/log/detail.html:78
-#: nutrition/templates/plan/view.html:262 nutrition/views/plan.py:406
+#: nutrition/templates/plan/view.html:264 nutrition/views/plan.py:406
msgid "Sugar content in carbohydrates"
msgstr ""
#: nutrition/models/ingredient.py:141
#: nutrition/templates/ingredient/view.html:112
#: nutrition/templates/log/detail.html:104
-#: nutrition/templates/plan/view.html:274 nutrition/views/plan.py:420
+#: nutrition/templates/plan/view.html:276 nutrition/views/plan.py:420
msgid "Saturated fat content in fats"
msgstr ""
@@ -2960,7 +3040,7 @@ msgstr ""
#: nutrition/templates/ingredient/view.html:134
#: nutrition/templates/log/detail.html:122
#: nutrition/templates/log/detail.html:178
-#: nutrition/templates/plan/view.html:285 nutrition/views/plan.py:426
+#: nutrition/templates/plan/view.html:287 nutrition/views/plan.py:426
msgid "Fibres"
msgstr ""
@@ -2968,7 +3048,7 @@ msgstr ""
#: nutrition/templates/ingredient/view.html:144
#: nutrition/templates/log/detail.html:135
#: nutrition/templates/log/detail.html:181
-#: nutrition/templates/plan/view.html:291 nutrition/views/plan.py:432
+#: nutrition/templates/plan/view.html:293 nutrition/views/plan.py:432
msgid "Sodium"
msgstr ""
@@ -3013,10 +3093,20 @@ msgstr ""
msgid "Unit amount, e.g. \"1 Cup\" or \"1/2 spoon\""
msgstr ""
+#: nutrition/models/log.py:55
+msgid "Meal"
+msgstr ""
+
#: nutrition/models/meal.py:61
msgid "Time (approx)"
msgstr ""
+#: nutrition/models/meal.py:68
+msgid ""
+"Give meals a textual description / name such as \"Breakfast\" or \"after "
+"workout\""
+msgstr ""
+
#: nutrition/models/plan.py:71
msgid ""
"A description of the goal of the plan, e.g. \"Gain mass\" or \"Prepare for "
@@ -3145,12 +3235,12 @@ msgstr ""
#: nutrition/templates/ingredient/view.html:71
#: nutrition/templates/log/detail.html:31
-#: nutrition/templates/plan/view.html:227 nutrition/views/plan.py:376
+#: nutrition/templates/plan/view.html:229 nutrition/views/plan.py:376
msgid "Macronutrients"
msgstr ""
#: nutrition/templates/ingredient/view.html:80
-#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:244
+#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:246
msgid "kJ"
msgstr ""
@@ -3163,7 +3253,7 @@ msgstr ""
#: nutrition/templates/ingredient/view.html:128
#: nutrition/templates/log/detail.html:119
-#: nutrition/templates/plan/view.html:282
+#: nutrition/templates/plan/view.html:284
msgid "Others"
msgstr ""
@@ -3192,7 +3282,7 @@ msgstr ""
#: nutrition/templates/log/detail.html:7
#: nutrition/templates/log/overview.html:7
-#: nutrition/templates/plan/view.html:300
+#: nutrition/templates/plan/view.html:302
msgid "Nutrition diary"
msgstr ""
@@ -3202,13 +3292,13 @@ msgstr ""
#: nutrition/templates/log/detail.html:33
#: nutrition/templates/log/overview.html:31
-#: nutrition/templates/plan/view.html:308
+#: nutrition/templates/plan/view.html:310
msgid "Logged"
msgstr ""
#: nutrition/templates/log/detail.html:34
#: nutrition/templates/log/overview.html:32
-#: nutrition/templates/plan/view.html:309
+#: nutrition/templates/plan/view.html:311
msgid "Difference"
msgstr ""
@@ -3221,7 +3311,7 @@ msgid "g"
msgstr ""
#: nutrition/templates/log/overview.html:53
-#: nutrition/templates/plan/view.html:330
+#: nutrition/templates/plan/view.html:332
msgid "nothing found"
msgstr ""
@@ -3241,77 +3331,77 @@ msgstr ""
msgid "Add ingredient to meal"
msgstr ""
-#: nutrition/templates/plan/view.html:150
+#: nutrition/templates/plan/view.html:152
msgid "No items for this meal."
msgstr ""
-#: nutrition/templates/plan/view.html:188
+#: nutrition/templates/plan/view.html:190
msgid "No meals for this plan."
msgstr ""
-#: nutrition/templates/plan/view.html:200
+#: nutrition/templates/plan/view.html:202
msgid "Log this Plan"
msgstr ""
-#: nutrition/templates/plan/view.html:206
+#: nutrition/templates/plan/view.html:208
msgid "Add a new meal"
msgstr ""
-#: nutrition/templates/plan/view.html:216 nutrition/views/plan.py:369
+#: nutrition/templates/plan/view.html:218 nutrition/views/plan.py:369
msgid "Nutritional data"
msgstr ""
-#: nutrition/templates/plan/view.html:219
+#: nutrition/templates/plan/view.html:221
#, python-format
msgid "Based on the weight entry dated %(date)s (%(weight)s)"
msgstr ""
-#: nutrition/templates/plan/view.html:228 nutrition/views/plan.py:377
+#: nutrition/templates/plan/view.html:230 nutrition/views/plan.py:377
msgid "Total"
msgstr ""
-#: nutrition/templates/plan/view.html:229 nutrition/views/plan.py:378
+#: nutrition/templates/plan/view.html:231 nutrition/views/plan.py:378
msgid "Percent of energy"
msgstr ""
-#: nutrition/templates/plan/view.html:232 nutrition/views/plan.py:379
+#: nutrition/templates/plan/view.html:234 nutrition/views/plan.py:379
msgid "g per body kg"
msgstr ""
-#: nutrition/templates/plan/view.html:234
+#: nutrition/templates/plan/view.html:236
msgid "oz per body lb"
msgstr ""
-#: nutrition/templates/plan/view.html:338
+#: nutrition/templates/plan/view.html:340
msgid "View complete nutrition log"
msgstr ""
-#: nutrition/templates/plan/view.html:371
+#: nutrition/templates/plan/view.html:373
msgid "Goal"
msgstr ""
-#: nutrition/templates/plan/view.html:382
+#: nutrition/templates/plan/view.html:384
msgid ""
"You have selected that this nutritional plan has a\n"
" goal amount of calories. Use the calculator or enter the value\n"
" yourself."
msgstr ""
-#: nutrition/templates/plan/view.html:392
+#: nutrition/templates/plan/view.html:394
msgid ""
"If you find the ingredient list too short, you might want to activate the "
"preference to also show English ingredients."
msgstr ""
-#: nutrition/templates/plan/view.html:421
+#: nutrition/templates/plan/view.html:423
msgid "Edit nutrition plan"
msgstr ""
-#: nutrition/templates/plan/view.html:425
+#: nutrition/templates/plan/view.html:427
msgid "Make a copy of this nutrition plan"
msgstr ""
-#: nutrition/templates/plan/view.html:431
+#: nutrition/templates/plan/view.html:433
msgid "Delete nutrition plan"
msgstr ""
@@ -3391,10 +3481,6 @@ msgstr ""
msgid "Ingredient was successfully marked as rejected"
msgstr ""
-#: nutrition/views/log.py:229 nutrition/views/unit_ingredient.py:139
-msgid "Delete?"
-msgstr ""
-
#: nutrition/views/meal.py:55
msgid "Add new meal"
msgstr ""
@@ -3750,11 +3836,11 @@ msgstr ""
msgid "Re-Submit"
msgstr ""
-#: weight/templates/overview.html:68
+#: weight/templates/overview.html:51
msgid "Export as CSV"
msgstr ""
-#: weight/templates/overview.html:72
+#: weight/templates/overview.html:55
msgid "Import from spreadsheet"
msgstr ""
diff --git a/wger/locale/pl/LC_MESSAGES/django.po b/wger/locale/pl/LC_MESSAGES/django.po
index 88a4b6aab..148add492 100644
--- a/wger/locale/pl/LC_MESSAGES/django.po
+++ b/wger/locale/pl/LC_MESSAGES/django.po
@@ -13,7 +13,7 @@ msgid ""
msgstr ""
"Project-Id-Version: wger Workout Manager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-17 17:23+0200\n"
+"POT-Creation-Date: 2022-02-15 14:51+0100\n"
"PO-Revision-Date: 2021-10-27 10:48+0000\n"
"Last-Translator: A M <[email protected]>\n"
"Language-Team: Polish <https://hosted.weblate.org/projects/wger/web/pl/>\n"
@@ -57,16 +57,16 @@ msgstr "Języki"
msgid "Nothing found."
msgstr "Nie znaleziono."
-#: config/templates/language/overview.html:16 core/templates/index.html:147
-#: core/templates/index.html:199 manager/templates/calendar/month.html:132
+#: config/templates/language/overview.html:16 core/templates/index.html:137
+#: core/templates/index.html:189 manager/templates/calendar/month.html:132
#: manager/templates/schedule/overview.html:28
#: manager/templates/schedule/view.html:146
#: manager/templates/workout/overview.html:28
#: nutrition/templates/ingredient/overview.html:45
#: nutrition/templates/plan/overview.html:23
-#: nutrition/templates/plan/view.html:148
-#: nutrition/templates/plan/view.html:151
-#: nutrition/templates/plan/view.html:189
+#: nutrition/templates/plan/view.html:150
+#: nutrition/templates/plan/view.html:153
+#: nutrition/templates/plan/view.html:191
msgid "Add one now."
msgstr "Dodaj jeden teraz."
@@ -87,7 +87,7 @@ msgstr "Dodaj jeden teraz."
#: gym/templates/gym/member_list.html:244
#: gym/templates/gym/member_list.html:281
#: mailer/templates/mailer/gym/overview.html:43
-#: weight/templates/overview.html:78
+#: weight/templates/overview.html:61
msgid "Add"
msgstr "Dodaj"
@@ -126,14 +126,14 @@ msgstr "Pokaż"
#: config/templates/language/view.html:91 core/templates/user/api_key.html:44
#: core/templates/user/preferences.html:28
-#: exercises/templates/exercise/view.html:273
-#: exercises/templates/exercise/view.html:296 gym/models/contract.py:200
+#: exercises/templates/exercise/view.html:323
+#: exercises/templates/exercise/view.html:346 gym/models/contract.py:200
#: gym/templates/contract/view.html:41 gym/templates/contract/view.html:106
#: gym/templates/gym/member_list.html:248
#: manager/templates/schedule/view.html:281
#: manager/templates/workout/view.html:206
#: nutrition/templates/ingredient/view.html:226
-#: nutrition/templates/plan/view.html:409 weight/templates/overview.html:62
+#: nutrition/templates/plan/view.html:411 weight/templates/overview.html:45
msgid "Options"
msgstr "Opcje"
@@ -147,12 +147,12 @@ msgstr "Opcje"
#: core/templates/weight_unit/list.html:17
#: exercises/templates/categories/admin-overview.html:16
#: exercises/templates/equipment/admin-overview.html:16
-#: exercises/templates/exercise/view.html:180
-#: exercises/templates/exercise/view.html:301
+#: exercises/templates/exercise/view.html:230
+#: exercises/templates/exercise/view.html:351
#: exercises/templates/muscles/admin-overview.html:16
-#: exercises/views/comments.py:63 gallery/views/images.py:96
-#: gym/templates/admin_notes/list.html:32 gym/templates/contract/list.html:31
-#: gym/templates/contract/view.html:107
+#: exercises/views/comments.py:63 exercises/views/videos.py:69
+#: gallery/views/images.py:96 gym/templates/admin_notes/list.html:32
+#: gym/templates/contract/list.html:31 gym/templates/contract/view.html:107
#: gym/templates/contract_option/list.html:31
#: gym/templates/contract_type/list.html:31 gym/templates/document/list.html:38
#: gym/templates/gym/list.html:19 gym/templates/gym/list.html:43
@@ -163,7 +163,7 @@ msgstr "Opcje"
#: manager/templates/calendar/partial_overview_table.html:18
#: manager/templates/schedule/view.html:121
#: nutrition/templates/ingredient/view.html:198
-#: nutrition/templates/plan/view.html:89 nutrition/templates/plan/view.html:124
+#: nutrition/templates/plan/view.html:89 nutrition/templates/plan/view.html:126
#: nutrition/templates/units/list.html:18
msgid "Edit"
msgstr "Edytuj"
@@ -177,9 +177,9 @@ msgstr "Edytuj"
#: exercises/templates/categories/admin-overview.html:17
#: exercises/templates/equipment/admin-overview.html:17
#: exercises/templates/exercise/view.html:68
-#: exercises/templates/exercise/view.html:155
-#: exercises/templates/exercise/view.html:185
-#: exercises/templates/exercise/view.html:306
+#: exercises/templates/exercise/view.html:205
+#: exercises/templates/exercise/view.html:235
+#: exercises/templates/exercise/view.html:356
#: exercises/templates/muscles/admin-overview.html:17
#: gym/templates/admin_notes/list.html:40
#: gym/templates/contract_option/list.html:39
@@ -192,7 +192,7 @@ msgstr "Edytuj"
#: nutrition/templates/ingredient/view.html:199
#: nutrition/templates/ingredient/view.html:239
#: nutrition/templates/log/detail.html:197
-#: nutrition/templates/plan/view.html:95 nutrition/templates/plan/view.html:130
+#: nutrition/templates/plan/view.html:95 nutrition/templates/plan/view.html:132
#: nutrition/templates/units/list.html:20
msgid "Delete"
msgstr "Usuń"
@@ -316,7 +316,7 @@ msgid "Some way of answering you (e-mail, etc.)"
msgstr "Wybrany sposób kontaktu (e-mail itp.)"
#: core/forms.py:265 exercises/models/comment.py:40 manager/models/set.py:60
-#: manager/models/setting.py:99 nutrition/models/log.py:61
+#: manager/models/setting.py:99 nutrition/models/log.py:71
msgid "Comment"
msgstr "Komentarz"
@@ -459,7 +459,7 @@ msgstr ""
msgid "Age"
msgstr "Wiek"
-#: core/models/profile.py:202 nutrition/forms.py:98
+#: core/models/profile.py:202 nutrition/forms.py:99
msgid "Height (cm)"
msgstr "Wzrost (cm)"
@@ -510,7 +510,7 @@ msgid "Total caloric intake, including e.g. any surplus"
msgstr "Pełne spożycie kalorii, włączając surplus"
#: core/models/profile.py:305 nutrition/models/ingredient_weight_unit.py:45
-#: nutrition/models/log.py:80 nutrition/models/meal_item.py:58
+#: nutrition/models/log.py:90 nutrition/models/meal_item.py:58
msgid "Weight unit"
msgstr "Jednostka wagi"
@@ -548,9 +548,9 @@ msgstr "Godziny muszą sumować się do wartości 24"
#: gym/models/user_document.py:87 gym/templates/contract/view.html:50
#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:96
#: gym/views/gym.py:156 manager/models/schedule.py:55
-#: manager/models/workout.py:56 nutrition/models/ingredient.py:96
-#: nutrition/models/ingredient_category.py:26
-#: nutrition/models/weight_unit.py:38
+#: manager/models/workout.py:56 measurements/models/category.py:53
+#: nutrition/models/ingredient.py:96 nutrition/models/ingredient_category.py:26
+#: nutrition/models/meal.py:66 nutrition/models/weight_unit.py:38
#: nutrition/templates/ingredient/pending.html:15
#: nutrition/templates/ingredient/view.html:185
msgid "Name"
@@ -610,11 +610,11 @@ msgstr "Czy na pewno chcesz to usunąć? Tej czynności nie będzie można cofn
msgid "Dashboard"
msgstr "Kokpit"
-#: core/templates/index.html:31 manager/templates/calendar/month.html:115
+#: core/templates/index.html:21 manager/templates/calendar/month.html:115
msgid "Add log to day"
msgstr "Dodaj komentarz do dnia"
-#: core/templates/index.html:35 manager/templates/calendar/month.html:120
+#: core/templates/index.html:25 manager/templates/calendar/month.html:120
msgid ""
"Click to add weight logs to a training\n"
"day in your current workout:"
@@ -622,7 +622,7 @@ msgstr ""
"Kliknij, aby dodać wartości ciężarów\n"
"do dnia treningowego w obecnym treningu:"
-#: core/templates/index.html:43 core/templates/index.html:83
+#: core/templates/index.html:33 core/templates/index.html:73
#: core/templates/misc/fragments/shariff_modal.html:29
#: core/templates/template.html:125 manager/templates/calendar/month.html:138
#: manager/templates/schedule/view.html:246
@@ -632,11 +632,11 @@ msgstr ""
msgid "Close"
msgstr "Zamknij"
-#: core/templates/index.html:54 core/templates/index.html:203
+#: core/templates/index.html:44 core/templates/index.html:193
msgid "Add new diary entry"
msgstr "Dodaj nowy wpis dziennika"
-#: core/templates/index.html:59
+#: core/templates/index.html:49
msgid ""
"Click to add an entry to your nutrition diary for today. You can either log "
"a meal as you defined it, or entry any number of custom entries."
@@ -644,7 +644,7 @@ msgstr ""
"Kliknij, aby dodać nowy wpis diety. Możesz dodać posiłek, który zdefiniowano "
"wcześniej lub dodać tak wiele pozycji, jak chcesz."
-#: core/templates/index.html:67 core/templates/index.html:171
+#: core/templates/index.html:57 core/templates/index.html:161
#: core/templates/user/overview.html:171
#: nutrition/templates/ingredient/view.html:79
#: nutrition/templates/log/detail.html:40
@@ -653,19 +653,19 @@ msgstr ""
#: nutrition/templates/log/overview.html:7
#: nutrition/templates/log/overview.html:44
#: nutrition/templates/plan/overview.html:17
-#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:242
-#: nutrition/templates/plan/view.html:301
-#: nutrition/templates/plan/view.html:321
-#: nutrition/templates/plan/view.html:363
-#: nutrition/templates/plan/view.html:373
+#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:244
+#: nutrition/templates/plan/view.html:303
+#: nutrition/templates/plan/view.html:323
+#: nutrition/templates/plan/view.html:365
+#: nutrition/templates/plan/view.html:375
msgid "kcal"
msgstr "kilokalorii"
-#: core/templates/index.html:79 nutrition/templates/plan/view.html:348
+#: core/templates/index.html:69 nutrition/templates/plan/view.html:350
msgid "Add custom diary entry"
msgstr "Dodaj niestandardowy wpis"
-#: core/templates/index.html:94 core/templates/index.html:102
+#: core/templates/index.html:84 core/templates/index.html:92
#: manager/models/day.py:34 manager/models/log.py:56
#: manager/models/session.py:60 manager/models/workout.py:109
#: manager/templates/schedule/view.html:105
@@ -676,11 +676,11 @@ msgstr "Dodaj niestandardowy wpis"
msgid "Workout"
msgstr "Trening"
-#: core/templates/index.html:128
+#: core/templates/index.html:118
msgid "This workout is part of a schedule:"
msgstr "To ćwiczenie jest częścią harmonogramu:"
-#: core/templates/index.html:133
+#: core/templates/index.html:123
msgid ""
"The current workout is selected from your active schedule or, if you don't "
"have one, simply by date."
@@ -688,70 +688,70 @@ msgstr ""
"Obecne ćwiczenie jest wybrane z aktywnego harmonogramu, a gdy żadnego nie "
"wybrano, według daty."
-#: core/templates/index.html:142 manager/templates/calendar/month.html:188
+#: core/templates/index.html:132 manager/templates/calendar/month.html:188
msgid "Add new log"
msgstr "Dodaj nowy log"
-#: core/templates/index.html:147 core/templates/user/overview.html:58
+#: core/templates/index.html:137 core/templates/user/overview.html:58
#: manager/templates/calendar/month.html:128
#: manager/templates/schedule/view.html:146
#: manager/templates/workout/overview.html:28
msgid "No workouts found."
msgstr "Nie znaleziono treningu."
-#: core/templates/index.html:157 nutrition/models/log.py:48
+#: core/templates/index.html:147 nutrition/models/log.py:49
#: nutrition/models/meal.py:49 nutrition/models/meal_item.py:47
#: nutrition/models/plan.py:94 nutrition/templates/plan/view.html:11
#: nutrition/templates/plan/view.html:19
msgid "Nutrition plan"
msgstr "Plan żywienia"
-#: core/templates/index.html:169 core/templates/user/overview.html:155
+#: core/templates/index.html:159 core/templates/user/overview.html:155
#: nutrition/models/ingredient.py:100
#: nutrition/templates/ingredient/view.html:77
#: nutrition/templates/log/detail.html:39
#: nutrition/templates/log/detail.html:156
-#: nutrition/templates/plan/view.html:53 nutrition/templates/plan/view.html:241
-#: nutrition/templates/plan/view.html:358
-#: nutrition/templates/plan/view.html:362 nutrition/views/plan.py:384
+#: nutrition/templates/plan/view.html:53 nutrition/templates/plan/view.html:243
+#: nutrition/templates/plan/view.html:360
+#: nutrition/templates/plan/view.html:364 nutrition/views/plan.py:384
msgid "Energy"
msgstr "Energia"
-#: core/templates/index.html:175 core/templates/user/overview.html:156
+#: core/templates/index.html:165 core/templates/user/overview.html:156
#: nutrition/models/ingredient.py:105
#: nutrition/templates/ingredient/view.html:84
#: nutrition/templates/log/detail.html:52
#: nutrition/templates/log/detail.html:174
-#: nutrition/templates/plan/view.html:54 nutrition/templates/plan/view.html:249
+#: nutrition/templates/plan/view.html:54 nutrition/templates/plan/view.html:251
#: nutrition/views/plan.py:390
msgid "Protein"
msgstr "Białko"
-#: core/templates/index.html:181 core/templates/user/overview.html:157
+#: core/templates/index.html:171 core/templates/user/overview.html:157
#: nutrition/models/ingredient.py:113
#: nutrition/templates/ingredient/view.html:90
#: nutrition/templates/log/detail.html:65
#: nutrition/templates/log/detail.html:175
-#: nutrition/templates/plan/view.html:55 nutrition/templates/plan/view.html:255
+#: nutrition/templates/plan/view.html:55 nutrition/templates/plan/view.html:257
#: nutrition/views/plan.py:398
msgid "Carbohydrates"
msgstr "Węglowodany"
-#: core/templates/index.html:187 core/templates/user/overview.html:158
+#: core/templates/index.html:177 core/templates/user/overview.html:158
#: nutrition/models/ingredient.py:131
#: nutrition/templates/ingredient/view.html:106
#: nutrition/templates/log/detail.html:91
#: nutrition/templates/log/detail.html:176
-#: nutrition/templates/plan/view.html:56 nutrition/templates/plan/view.html:268
+#: nutrition/templates/plan/view.html:56 nutrition/templates/plan/view.html:270
#: nutrition/views/plan.py:412
msgid "Fat"
msgstr "Tłuszcz"
-#: core/templates/index.html:199 nutrition/templates/plan/overview.html:22
+#: core/templates/index.html:189 nutrition/templates/plan/overview.html:22
msgid "No nutrition plans."
msgstr "Brak planów żywienia."
-#: core/templates/index.html:213 core/templates/user/overview.html:112
+#: core/templates/index.html:203 core/templates/user/overview.html:112
#: core/templates/user/overview.html:121 manager/forms.py:173
#: manager/helpers.py:89 manager/models/log.py:84 manager/models/setting.py:67
#: manager/templates/log/add.html:54 manager/templates/set/formset.html:12
@@ -760,11 +760,7 @@ msgstr "Brak planów żywienia."
msgid "Weight"
msgstr "Ciężar"
-#: core/templates/index.html:217
-msgid "Your current weight is: "
-msgstr "Twoja obecna waga: "
-
-#: core/templates/index.html:248 core/templates/navigation.html:97
+#: core/templates/index.html:210 core/templates/navigation.html:97
#: weight/views.py:70
msgid "Add weight entry"
msgstr "Dodaj aktualną wagę"
@@ -796,7 +792,7 @@ msgstr "Lista licencji"
msgid "Nothing found"
msgstr "Nic nie znaleziono"
-#: core/templates/misc/about.html:4 core/templates/template.html:201
+#: core/templates/misc/about.html:4 core/templates/template.html:175
#: core/templates/template_features.html:118
#: core/templates/template_no_context.html:88
msgid "Imprint"
@@ -814,8 +810,8 @@ msgstr ""
"umożlwić zewnętrzny dostęp do Twoich danych."
#: core/templates/misc/fragments/shariff_modal.html:22
-#: nutrition/templates/plan/view.html:385
-#: nutrition/templates/plan/view.html:394
+#: nutrition/templates/plan/view.html:387
+#: nutrition/templates/plan/view.html:396
msgid "That's done here"
msgstr "Wykonane tutaj"
@@ -903,7 +899,7 @@ msgstr "Ćwiczenia oczekujące na akceptację"
msgid "Equipment"
msgstr "Sprzęt"
-#: core/templates/navigation.html:78 exercises/templates/exercise/view.html:208
+#: core/templates/navigation.html:78 exercises/templates/exercise/view.html:258
msgid "Muscles"
msgstr "Mięśnie"
@@ -976,7 +972,7 @@ msgstr "Dokumentacja"
msgid "Get the code"
msgstr "Pobierz kod źródłowy"
-#: core/templates/navigation.html:175 core/templates/template.html:193
+#: core/templates/navigation.html:175 core/templates/template.html:205
#: core/templates/template_features.html:100
msgid "Translate"
msgstr "Tłumacz"
@@ -1132,15 +1128,11 @@ msgstr ""
msgid "Create some demo entries"
msgstr "Utwórz kilka przykładowych wpisów"
-#: core/templates/template.html:202 core/templates/template_features.html:122
+#: core/templates/template.html:176 core/templates/template_features.html:122
#: core/templates/template_no_context.html:89 software/templates/tos.html:7
msgid "Terms of service"
msgstr "Warunki świadczenia usługi"
-#: core/templates/template.html:209 core/templates/template.html:210
-msgid "Released under the Affero GPL"
-msgstr "Udostępnione na licencji Affero GPL"
-
#: core/templates/template_features.html:62 software/templates/features.html:9
#: software/templates/features.html:120
msgid "Features"
@@ -1245,9 +1237,10 @@ msgstr "Dodaj trening"
#: core/templates/user/overview.html:120 core/templates/user/overview.html:153
#: exercises/models/exercise.py:77 gallery/models/image.py:47
#: manager/helpers.py:88 manager/models/log.py:98 manager/models/session.py:67
-#: nutrition/models/ingredient.py:85 nutrition/models/ingredient.py:87
-#: nutrition/models/ingredient.py:190 nutrition/templates/log/overview.html:30
-#: nutrition/templates/plan/view.html:307 weight/models.py:32
+#: measurements/models/measurement.py:64 nutrition/models/ingredient.py:85
+#: nutrition/models/ingredient.py:87 nutrition/models/ingredient.py:190
+#: nutrition/templates/log/overview.html:30
+#: nutrition/templates/plan/view.html:309 weight/models.py:32
#: weight/templates/import_csv_preview.html:13
#: weight/templates/import_csv_preview.html:42 weight/views.py:150
msgid "Date"
@@ -1255,10 +1248,10 @@ msgstr "Data"
#: core/templates/user/overview.html:35 core/templates/user/overview.html:154
#: exercises/models/exercise.py:61 exercises/templates/exercise/view.html:88
-#: exercises/views/exercises.py:189 gallery/models/image.py:70
+#: exercises/views/exercises.py:190 gallery/models/image.py:70
#: gym/models/contract.py:57 gym/models/contract.py:107
#: manager/models/day.py:37 manager/models/workout.py:62
-#: nutrition/models/plan.py:69
+#: measurements/models/measurement.py:79 nutrition/models/plan.py:69
msgid "Description"
msgstr "Opis"
@@ -1421,11 +1414,11 @@ msgstr "Preferencje"
msgid "Change password"
msgstr "Zmień hasło"
-#: core/templatetags/wger_extras.py:217
+#: core/templatetags/wger_extras.py:229
msgid "kg"
msgstr "kg"
-#: core/templatetags/wger_extras.py:219
+#: core/templatetags/wger_extras.py:231
#: nutrition/templates/ingredient/view.html:86
#: nutrition/templates/ingredient/view.html:92
#: nutrition/templates/ingredient/view.html:99
@@ -1437,28 +1430,28 @@ msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr "g"
-#: core/templatetags/wger_extras.py:222
+#: core/templatetags/wger_extras.py:234
msgid "lb"
msgstr "lb"
-#: core/templatetags/wger_extras.py:224
+#: core/templatetags/wger_extras.py:236
msgctxt "weight unit, i.e. ounces"
msgid "oz"
msgstr "oz"
#: core/views/languages.py:85 exercises/views/categories.py:121
-#: exercises/views/equipment.py:106 exercises/views/exercises.py:422
+#: exercises/views/equipment.py:106 exercises/views/exercises.py:423
#: exercises/views/images.py:128 exercises/views/muscles.py:118
-#: manager/views/schedule.py:311 manager/views/schedule_step.py:129
-#: manager/views/workout.py:268 manager/views/workout_session.py:141
-#: nutrition/views/ingredient.py:144 nutrition/views/plan.py:120
-#: nutrition/views/unit.py:111
+#: exercises/views/videos.py:129 manager/views/schedule.py:311
+#: manager/views/schedule_step.py:129 manager/views/workout.py:268
+#: manager/views/workout_session.py:141 nutrition/views/ingredient.py:144
+#: nutrition/views/plan.py:120 nutrition/views/unit.py:111
msgid "Successfully deleted"
msgstr "Pomyślnie usunięto"
#: core/views/languages.py:93 core/views/license.py:103
#: core/views/repetition_units.py:115 core/views/weight_units.py:115
-#: exercises/views/categories.py:127 exercises/views/exercises.py:430
+#: exercises/views/categories.py:127 exercises/views/exercises.py:431
#: exercises/views/muscles.py:125 gallery/views/images.py:121
#: gym/views/admin_notes.py:196 gym/views/document.py:206 gym/views/gym.py:486
#: manager/views/schedule.py:318 manager/views/schedule_step.py:139
@@ -1472,7 +1465,7 @@ msgstr "Usunąć {0}?"
#: core/views/languages.py:111 core/views/license.py:84
#: core/views/repetition_units.py:85 core/views/user.py:456
#: core/views/weight_units.py:85 exercises/views/categories.py:97
-#: exercises/views/equipment.py:83 exercises/views/exercises.py:304
+#: exercises/views/equipment.py:83 exercises/views/exercises.py:305
#: exercises/views/muscles.py:105 gym/views/admin_notes.py:160
#: gym/views/config.py:68 gym/views/contract.py:186
#: gym/views/contract_option.py:123 gym/views/contract_type.py:123
@@ -1562,7 +1555,7 @@ msgstr "Mięśnie główne"
#: exercises/models/base.py:64 exercises/templates/equipment/overview.html:71
#: exercises/templates/exercise/overview.html:76
-#: exercises/templates/exercise/view.html:218
+#: exercises/templates/exercise/view.html:268
#: exercises/templates/muscles/overview.html:73
msgid "Secondary muscles"
msgstr "Mięśnie pomocnicze"
@@ -1575,8 +1568,9 @@ msgstr "Możliwości"
msgid "Exercise Categories"
msgstr "Kategorie ćwiczeń"
-#: exercises/models/comment.py:34 exercises/models/image.py:62
-#: manager/forms.py:165 manager/helpers.py:89 manager/models/log.py:51
+#: exercises/models/comment.py:34 exercises/models/image.py:75
+#: exercises/models/video.py:82 manager/forms.py:165 manager/helpers.py:89
+#: manager/models/log.py:51
msgid "Exercise"
msgstr "Ćwiczenie"
@@ -1589,32 +1583,54 @@ msgstr "Komentarz jak poprawnie wykonywać to ćwiczenie."
msgid "Language"
msgstr "Język"
-#: exercises/models/exercise.py:233 exercises/views/exercises.py:460
+#: exercises/models/exercise.py:237 exercises/views/exercises.py:461
msgid "Exercise was successfully added to the general database"
msgstr "Ćwiczenie zostało pomyślnie dodane do bazy danych"
-#: exercises/models/exercise.py:261
+#: exercises/models/exercise.py:265
msgid "New user submitted exercise"
msgstr "Nowe ćwiczenie przesłane przez użytkownika"
-#: exercises/models/exercise.py:263
+#: exercises/models/exercise.py:267
#, python-brace-format
msgid "The user {0} submitted a new exercise \"{1}\"."
msgstr "Użytkownik {0} przesłał nowe ćwiczenie \"{1}\"."
-#: exercises/models/image.py:68 gallery/models/image.py:56
+#: exercises/models/image.py:59
+msgid "Line"
+msgstr ""
+
+#: exercises/models/image.py:60
+msgid "3D"
+msgstr ""
+
+#: exercises/models/image.py:61
+msgid "Low-poly"
+msgstr ""
+
+#: exercises/models/image.py:62
+msgid "Photo"
+msgstr ""
+
+#: exercises/models/image.py:63
+#, fuzzy
+#| msgid "Others"
+msgid "Other"
+msgstr "Inne"
+
+#: exercises/models/image.py:81 gallery/models/image.py:56
msgid "Image"
msgstr "Obraz"
-#: exercises/models/image.py:69 gallery/models/image.py:57
+#: exercises/models/image.py:82 gallery/models/image.py:57
msgid "Only PNG and JPEG formats are supported"
msgstr "Tylko formaty PNG i JPEG są obsługiwane"
-#: exercises/models/image.py:75
+#: exercises/models/image.py:88
msgid "Main picture"
msgstr "Główny obraz"
-#: exercises/models/image.py:78
+#: exercises/models/image.py:91
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 "
@@ -1624,11 +1640,15 @@ msgstr ""
"wyświetlany np. w wyszukiwarce). Pierwszy obraz zostanie automatycznie "
"wykorzystany."
-#: exercises/models/image.py:166
+#: exercises/models/image.py:100
+msgid "The art style of your image"
+msgstr ""
+
+#: exercises/models/image.py:185
msgid "New user submitted image"
msgstr "Nowy dodany obraz"
-#: exercises/models/image.py:167
+#: exercises/models/image.py:186
#, python-brace-format
msgid "The user {0} submitted a new image \"{1}\" for exercise {2}."
msgstr "Użytkownik {0} dodał nowy obraz \"{1}\" dla ćwiczenia {2}."
@@ -1637,6 +1657,58 @@ msgstr "Użytkownik {0} dodał nowy obraz \"{1}\" dla ćwiczenia {2}."
msgid "In latin, e.g. \"Pectoralis major\""
msgstr "Po łacinie, np. \"Pectoralis major\""
+#: exercises/models/video.py:41
+msgid "Maximum file size is 100MB."
+msgstr ""
+
+#: exercises/models/video.py:44 exercises/models/video.py:48
+msgid "File type is not supported"
+msgstr ""
+
+#: exercises/models/video.py:57
+#, fuzzy
+#| msgid "%(birthdate)s is not a valid birthdate"
+msgid "File is not a valid video"
+msgstr "%(birthdate)s jest niepoprawną datą urodzenia"
+
+#: exercises/models/video.py:88
+#, fuzzy
+#| msgid "Main picture"
+msgid "Main video"
+msgstr "Główny obraz"
+
+#: exercises/models/video.py:94
+msgid "Video"
+msgstr ""
+
+#: exercises/models/video.py:101
+msgid "Size"
+msgstr ""
+
+#: exercises/models/video.py:108 manager/models/schedule_step.py:56
+msgid "Duration"
+msgstr "Czas trwania"
+
+#: exercises/models/video.py:117
+msgid "Width"
+msgstr ""
+
+#: exercises/models/video.py:124
+#, fuzzy
+#| msgid "Weight"
+msgid "Height"
+msgstr "Ciężar"
+
+#: exercises/models/video.py:131
+#, fuzzy
+#| msgid "Code"
+msgid "Codec"
+msgstr "Kod"
+
+#: exercises/models/video.py:139
+msgid "Codec, long name"
+msgstr ""
+
#: exercises/templates/equipment/admin-overview.html:4
msgid "Equipment list"
msgstr "Lista sprzętu"
@@ -1652,7 +1724,7 @@ msgstr "Rozpiska sprzętu"
#: exercises/templates/equipment/overview.html:69
#: exercises/templates/exercise/overview.html:74
-#: exercises/templates/exercise/view.html:214
+#: exercises/templates/exercise/view.html:264
#: exercises/templates/muscles/overview.html:71
msgid "Main muscles"
msgstr "Mięśnie główne"
@@ -1777,7 +1849,8 @@ msgstr "Data zgłoszenia"
#: gym/templates/gym/new_user.html:22
#: gym/templates/gym/reset_user_password.html:20 manager/models/log.py:45
#: manager/models/schedule.py:44 manager/models/session.py:49
-#: manager/models/workout.py:89 nutrition/models/plan.py:55
+#: manager/models/workout.py:89 measurements/models/category.py:48
+#: measurements/models/measurement.py:59 nutrition/models/plan.py:55
#: nutrition/templates/ingredient/pending.html:16 weight/models.py:41
msgid "User"
msgstr "Użytkownik"
@@ -1804,13 +1877,13 @@ msgid "Please select one of the options below."
msgstr "Wybierz jedną z opcji poniżej."
#: exercises/templates/exercise/view.html:60
-#: exercises/templates/exercise/view.html:153
+#: exercises/templates/exercise/view.html:203
#: nutrition/templates/ingredient/view.html:38
msgid "Accept"
msgstr "Akceptuj"
#: exercises/templates/exercise/view.html:64
-#: exercises/templates/exercise/view.html:154
+#: exercises/templates/exercise/view.html:204
#: nutrition/templates/ingredient/view.html:42
msgid "Decline"
msgstr "Odrzuć"
@@ -1823,32 +1896,42 @@ msgstr "Obrazy"
msgid "Add new image"
msgstr "Dodaj nowy obraz"
-#: exercises/templates/exercise/view.html:147
+#: exercises/templates/exercise/view.html:148
+msgid "Videos"
+msgstr ""
+
+#: exercises/templates/exercise/view.html:187 exercises/views/videos.py:94
+#, fuzzy
+#| msgid "Add new image"
+msgid "Add new video"
+msgstr "Dodaj nowy obraz"
+
+#: exercises/templates/exercise/view.html:197
msgid "Images pending review"
msgstr "Obrazy oczekujące na akceptację"
-#: exercises/templates/exercise/view.html:168
+#: exercises/templates/exercise/view.html:218
msgid "Comments for this exercise"
msgstr "Komentarze dla tego ćwiczenia"
-#: exercises/templates/exercise/view.html:196
+#: exercises/templates/exercise/view.html:246
msgid "Add new comment"
msgstr "Dodaj nowy komentarz"
-#: exercises/templates/exercise/view.html:210
+#: exercises/templates/exercise/view.html:260
msgid "The diagram shows the most used muscles on this exercise"
msgstr "Diagrm pokazuje najmocniej trenowane mięśnie w tym ćwiczeniu"
-#: exercises/templates/exercise/view.html:251
+#: exercises/templates/exercise/view.html:301
#: manager/templates/workout/log.html:10 manager/templates/workout/log.html:11
msgid "Weight log"
msgstr "Wartości ciężarów"
-#: exercises/templates/exercise/view.html:256
+#: exercises/templates/exercise/view.html:306
msgid "Exercise Variations"
msgstr "Opcje treningów"
-#: exercises/templates/exercise/view.html:277
+#: exercises/templates/exercise/view.html:327
msgid "Submit a correction"
msgstr "Zgłoś korektę"
@@ -1884,7 +1967,7 @@ msgstr "Dodaj komentarz do ćwiczenia"
msgid "Delete equipment?"
msgstr "Usunąć sprzęt?"
-#: exercises/views/exercises.py:228
+#: exercises/views/exercises.py:229
#, python-format
msgid ""
"%(name_original)s is too similar to existing exercise \"%(exercise_name)s\""
@@ -1892,26 +1975,26 @@ msgstr ""
"nazwa %(name_original)s jest podobna do już istniejącego ćwiczenia o nazwie "
"\"%(exercise_name)s\""
-#: exercises/views/exercises.py:246
+#: exercises/views/exercises.py:247
msgid "Add exercise"
msgstr "Dodaj ćwiczenie"
-#: exercises/views/exercises.py:366
+#: exercises/views/exercises.py:367
msgid "Thank you. Once the changes are reviewed the exercise will be updated."
msgstr ""
"Dziękujemy. Gdy zmiany zostaną zaakceptowane, ćwiczenie zostanie "
"zaktualizowane."
-#: exercises/views/exercises.py:379
+#: exercises/views/exercises.py:380
#, python-brace-format
msgid "Correct {0}"
msgstr "Popraw {0}"
-#: exercises/views/exercises.py:421
+#: exercises/views/exercises.py:422
msgid "This will delete the exercise from all workouts."
msgstr "To usunie ćwiczenie ze wszystkich treningów."
-#: exercises/views/exercises.py:473
+#: exercises/views/exercises.py:474
msgid "Exercise was successfully marked as rejected"
msgstr "Ćwiczenie zostało poprawnie oznaczone jako odrzucone"
@@ -1923,6 +2006,11 @@ msgstr "Edytuj obraz ćwiczenia"
msgid "Delete exercise image?"
msgstr "Usunąć obraz ćwiczenia?"
+#: exercises/views/videos.py:144 nutrition/views/log.py:230
+#: nutrition/views/unit_ingredient.py:139
+msgid "Delete?"
+msgstr "Usunąć?"
+
#: gallery/templates/images/overview.html:62
msgid "Add image"
msgstr "Dodaj obraz"
@@ -1989,8 +2077,8 @@ msgid "Contract type"
msgstr "Typ kontraktu"
#: gym/models/contract.py:208 gym/templates/contract/view.html:59
-#: manager/templates/log/add.html:52 nutrition/forms.py:58
-#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:92
+#: manager/templates/log/add.html:52 nutrition/forms.py:59
+#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:102
#: nutrition/models/meal_item.py:72
msgid "Amount"
msgstr "Kwota"
@@ -2433,6 +2521,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:59
msgid "Current version"
msgstr "Aktualna wersja"
@@ -2469,7 +2558,8 @@ msgstr ""
#: manager/models/log.py:90 manager/models/setting.py:47
#: manager/models/setting.py:78 manager/templates/log/add.html:53
#: manager/templates/log/add.html:55 manager/templates/set/formset.html:11
-#: manager/templates/set/formset.html:13 nutrition/forms.py:62
+#: manager/templates/set/formset.html:13 measurements/models/category.py:58
+#: nutrition/forms.py:63
msgid "Unit"
msgstr "Jednostka"
@@ -2538,10 +2628,6 @@ msgstr ""
msgid "schedule"
msgstr "harmonogram"
-#: manager/models/schedule_step.py:56
-msgid "Duration"
-msgstr "Czas trwania"
-
#: manager/models/schedule_step.py:57
msgid "The duration in weeks"
msgstr "Czas trwania w tygodniach"
@@ -2834,7 +2920,7 @@ msgstr ""
#: manager/templates/schedule/view.html:290
#: manager/templates/workout/view.html:142
#: manager/templates/workout/view.html:217
-#: nutrition/templates/plan/view.html:415
+#: nutrition/templates/plan/view.html:417
msgid "Download as PDF"
msgstr "Pobierz jako PDF"
@@ -3079,23 +3165,27 @@ msgid "This will delete all weight logs for this day as well."
msgstr ""
"Ta akcja usunie także wszelkie wartości ciężarów wpisane dla tego dnia."
-#: nutrition/forms.py:121
+#: measurements/models/measurement.py:69
+msgid "Value"
+msgstr ""
+
+#: nutrition/forms.py:122
msgid "Calculate"
msgstr "Oblicz"
-#: nutrition/forms.py:194 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:195 nutrition/templates/rate/form.html:76
msgid "Basic caloric intake"
msgstr "Podstawowe spożycie kalorii"
-#: nutrition/forms.py:195
+#: nutrition/forms.py:196
msgid "Your basic caloric intake as calculated for your data"
msgstr "Twoje podstawowe spożycie kalorii obliczone na podstawie danych"
-#: nutrition/forms.py:201
+#: nutrition/forms.py:202
msgid "Additional calories"
msgstr "Dodatkowe kalorie"
-#: nutrition/forms.py:203
+#: nutrition/forms.py:204
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
@@ -3103,8 +3193,8 @@ msgstr ""
"Dodatkowe kalorie modyfikujące bazową wartość (by odjąć, wpisz ujemną "
"wartość)"
-#: nutrition/forms.py:231 nutrition/models/ingredient_weight_unit.py:39
-#: nutrition/models/log.py:71 nutrition/models/meal_item.py:53
+#: nutrition/forms.py:232 nutrition/models/ingredient_weight_unit.py:39
+#: nutrition/models/log.py:81 nutrition/models/meal_item.py:53
#: nutrition/templates/log/detail.html:155
msgid "Ingredient"
msgstr "Składnik"
@@ -3123,14 +3213,14 @@ msgstr "W g na 100g produktu"
#: nutrition/models/ingredient.py:123
#: nutrition/templates/ingredient/view.html:96
#: nutrition/templates/log/detail.html:78
-#: nutrition/templates/plan/view.html:262 nutrition/views/plan.py:406
+#: nutrition/templates/plan/view.html:264 nutrition/views/plan.py:406
msgid "Sugar content in carbohydrates"
msgstr "Cukry proste"
#: nutrition/models/ingredient.py:141
#: nutrition/templates/ingredient/view.html:112
#: nutrition/templates/log/detail.html:104
-#: nutrition/templates/plan/view.html:274 nutrition/views/plan.py:420
+#: nutrition/templates/plan/view.html:276 nutrition/views/plan.py:420
msgid "Saturated fat content in fats"
msgstr "Tłuszcze nasycone"
@@ -3138,7 +3228,7 @@ msgstr "Tłuszcze nasycone"
#: nutrition/templates/ingredient/view.html:134
#: nutrition/templates/log/detail.html:122
#: nutrition/templates/log/detail.html:178
-#: nutrition/templates/plan/view.html:285 nutrition/views/plan.py:426
+#: nutrition/templates/plan/view.html:287 nutrition/views/plan.py:426
msgid "Fibres"
msgstr "Błonnik"
@@ -3146,7 +3236,7 @@ msgstr "Błonnik"
#: nutrition/templates/ingredient/view.html:144
#: nutrition/templates/log/detail.html:135
#: nutrition/templates/log/detail.html:181
-#: nutrition/templates/plan/view.html:291 nutrition/views/plan.py:432
+#: nutrition/templates/plan/view.html:293 nutrition/views/plan.py:432
msgid "Sodium"
msgstr "Sód"
@@ -3194,10 +3284,20 @@ 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:55
+msgid "Meal"
+msgstr "Posiłek"
+
#: nutrition/models/meal.py:61
msgid "Time (approx)"
msgstr "Czas (przybliżony)"
+#: nutrition/models/meal.py:68
+msgid ""
+"Give meals a textual description / name such as \"Breakfast\" or \"after "
+"workout\""
+msgstr ""
+
#: nutrition/models/plan.py:71
msgid ""
"A description of the goal of the plan, e.g. \"Gain mass\" or \"Prepare for "
@@ -3347,12 +3447,12 @@ msgstr ""
#: nutrition/templates/ingredient/view.html:71
#: nutrition/templates/log/detail.html:31
-#: nutrition/templates/plan/view.html:227 nutrition/views/plan.py:376
+#: nutrition/templates/plan/view.html:229 nutrition/views/plan.py:376
msgid "Macronutrients"
msgstr "Makroelementy"
#: nutrition/templates/ingredient/view.html:80
-#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:244
+#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:246
msgid "kJ"
msgstr "kJ"
@@ -3365,7 +3465,7 @@ msgstr "N/A"
#: nutrition/templates/ingredient/view.html:128
#: nutrition/templates/log/detail.html:119
-#: nutrition/templates/plan/view.html:282
+#: nutrition/templates/plan/view.html:284
msgid "Others"
msgstr "Inne"
@@ -3394,7 +3494,7 @@ msgstr "Usuń składnik"
#: nutrition/templates/log/detail.html:7
#: nutrition/templates/log/overview.html:7
-#: nutrition/templates/plan/view.html:300
+#: nutrition/templates/plan/view.html:302
msgid "Nutrition diary"
msgstr "Dziennik diety"
@@ -3404,13 +3504,13 @@ msgstr "Zaplanowane"
#: nutrition/templates/log/detail.html:33
#: nutrition/templates/log/overview.html:31
-#: nutrition/templates/plan/view.html:308
+#: nutrition/templates/plan/view.html:310
msgid "Logged"
msgstr "Zapisane"
#: nutrition/templates/log/detail.html:34
#: nutrition/templates/log/overview.html:32
-#: nutrition/templates/plan/view.html:309
+#: nutrition/templates/plan/view.html:311
msgid "Difference"
msgstr "Różnice"
@@ -3423,7 +3523,7 @@ msgid "g"
msgstr "g"
#: nutrition/templates/log/overview.html:53
-#: nutrition/templates/plan/view.html:330
+#: nutrition/templates/plan/view.html:332
msgid "nothing found"
msgstr "nic nie znaleziono"
@@ -3443,56 +3543,56 @@ msgstr "Dodaj posiłek"
msgid "Add ingredient to meal"
msgstr "Dodaj składnik posiłku"
-#: nutrition/templates/plan/view.html:150
+#: nutrition/templates/plan/view.html:152
msgid "No items for this meal."
msgstr "Brak składników dla tego posiłku."
-#: nutrition/templates/plan/view.html:188
+#: nutrition/templates/plan/view.html:190
msgid "No meals for this plan."
msgstr "Brak posiłków dla tego planu."
-#: nutrition/templates/plan/view.html:200
+#: nutrition/templates/plan/view.html:202
msgid "Log this Plan"
msgstr "Dodaj ten plan"
-#: nutrition/templates/plan/view.html:206
+#: nutrition/templates/plan/view.html:208
msgid "Add a new meal"
msgstr "Dodaj nowy posiłek"
-#: nutrition/templates/plan/view.html:216 nutrition/views/plan.py:369
+#: nutrition/templates/plan/view.html:218 nutrition/views/plan.py:369
msgid "Nutritional data"
msgstr "Wartości odżywcze"
-#: nutrition/templates/plan/view.html:219
+#: nutrition/templates/plan/view.html:221
#, python-format
msgid "Based on the weight entry dated %(date)s (%(weight)s)"
msgstr "Oparte na wpisie masy z %(date)s (%(weight)s)"
-#: nutrition/templates/plan/view.html:228 nutrition/views/plan.py:377
+#: nutrition/templates/plan/view.html:230 nutrition/views/plan.py:377
msgid "Total"
msgstr "Sumarycznie"
-#: nutrition/templates/plan/view.html:229 nutrition/views/plan.py:378
+#: nutrition/templates/plan/view.html:231 nutrition/views/plan.py:378
msgid "Percent of energy"
msgstr "Procent energii"
-#: nutrition/templates/plan/view.html:232 nutrition/views/plan.py:379
+#: nutrition/templates/plan/view.html:234 nutrition/views/plan.py:379
msgid "g per body kg"
msgstr "g na kg masy ciała"
-#: nutrition/templates/plan/view.html:234
+#: nutrition/templates/plan/view.html:236
msgid "oz per body lb"
msgstr "Uncja na funt ciała"
-#: nutrition/templates/plan/view.html:338
+#: nutrition/templates/plan/view.html:340
msgid "View complete nutrition log"
msgstr "Zobacz pełen dziennik żywieniowy"
-#: nutrition/templates/plan/view.html:371
+#: nutrition/templates/plan/view.html:373
msgid "Goal"
msgstr "Cel"
-#: nutrition/templates/plan/view.html:382
+#: nutrition/templates/plan/view.html:384
#, fuzzy
#| msgid ""
#| "You have selected that this nutritional plan has a\n"
@@ -3506,7 +3606,7 @@ msgstr ""
"Ustaliłeś, że ten plan żywieniowy ma\n"
"określony cel kaloryczny. Użyj kalkulatora lub wpisz wartość samodzielnie."
-#: nutrition/templates/plan/view.html:392
+#: nutrition/templates/plan/view.html:394
msgid ""
"If you find the ingredient list too short, you might want to activate the "
"preference to also show English ingredients."
@@ -3514,15 +3614,15 @@ msgstr ""
"Jeżeli uważasz listę składników za niewystarczającą, możesz aktywować opcję "
"wyświetlania składników po angielsku."
-#: nutrition/templates/plan/view.html:421
+#: nutrition/templates/plan/view.html:423
msgid "Edit nutrition plan"
msgstr "Edytuj plan żywieniowy"
-#: nutrition/templates/plan/view.html:425
+#: nutrition/templates/plan/view.html:427
msgid "Make a copy of this nutrition plan"
msgstr "Skopiuj ten plan żywieniowy"
-#: nutrition/templates/plan/view.html:431
+#: nutrition/templates/plan/view.html:433
msgid "Delete nutrition plan"
msgstr "Usuń plan żywieniowy"
@@ -3621,10 +3721,6 @@ msgstr "Dodaj nowy składnik"
msgid "Ingredient was successfully marked as rejected"
msgstr "Składnik został poprawnie oznaczony jako odrzucony"
-#: nutrition/views/log.py:229 nutrition/views/unit_ingredient.py:139
-msgid "Delete?"
-msgstr "Usunąć?"
-
#: nutrition/views/meal.py:55
msgid "Add new meal"
msgstr "Dodaj nowy posiłek"
@@ -4047,11 +4143,11 @@ msgstr ""
msgid "Re-Submit"
msgstr "Prześlij ponownie"
-#: weight/templates/overview.html:68
+#: weight/templates/overview.html:51
msgid "Export as CSV"
msgstr "Eksportuj do CSV"
-#: weight/templates/overview.html:72
+#: weight/templates/overview.html:55
msgid "Import from spreadsheet"
msgstr "Importuj z arkusza"
@@ -4069,6 +4165,12 @@ msgstr "Usunięto."
msgid "Delete weight entry for the %s"
msgstr "Usuń wpis wagi dla %s"
+#~ msgid "Your current weight is: "
+#~ msgstr "Twoja obecna waga: "
+
+#~ msgid "Released under the Affero GPL"
+#~ msgstr "Udostępnione na licencji Affero GPL"
+
#~ msgid "Responsible for the content of this site as per German law §5 TMG:"
#~ msgstr "Za treść tej strony odpowiada niemieckie prawo §5 TMG:"
@@ -4200,9 +4302,6 @@ msgstr "Usuń wpis wagi dla %s"
#~ "wejdź na stronę transifex, poproś o dostęp, a my ustawimy wszystko dla "
#~ "Ciebie."
-#~ msgid "Code"
-#~ msgstr "Kod"
-
#~ msgid ""
#~ "Obviously, you are highly encouraged to clone the\n"
#~ "repo and start hacking! Once you are ready, send a pull request and we\n"
@@ -4341,9 +4440,6 @@ msgstr "Usuń wpis wagi dla %s"
#~ msgid "Pause!"
#~ msgstr "Pauza!"
-#~ msgid "Meal"
-#~ msgstr "Posiłek"
-
#~ msgid "There is no chart here because there are no weight entries."
#~ msgstr "Nie ma tutaj wykresu, bo nie dodano jeszcze statusu wagi."
diff --git a/wger/locale/pt/LC_MESSAGES/django.po b/wger/locale/pt/LC_MESSAGES/django.po
index 89fdfaedb..29234ffdc 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: 2021-08-17 17:23+0200\n"
+"POT-Creation-Date: 2022-02-15 14:51+0100\n"
"PO-Revision-Date: 2022-02-06 10:57+0000\n"
"Last-Translator: João Goulart <[email protected]>\n"
-"Language-Team: Portuguese <https://hosted.weblate.org/projects/wger/web/pt/>"
-"\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"
@@ -57,16 +57,16 @@ msgstr "Idiomas"
msgid "Nothing found."
msgstr "Não encontrado."
-#: config/templates/language/overview.html:16 core/templates/index.html:147
-#: core/templates/index.html:199 manager/templates/calendar/month.html:132
+#: config/templates/language/overview.html:16 core/templates/index.html:137
+#: core/templates/index.html:189 manager/templates/calendar/month.html:132
#: manager/templates/schedule/overview.html:28
#: manager/templates/schedule/view.html:146
#: manager/templates/workout/overview.html:28
#: nutrition/templates/ingredient/overview.html:45
#: nutrition/templates/plan/overview.html:23
-#: nutrition/templates/plan/view.html:148
-#: nutrition/templates/plan/view.html:151
-#: nutrition/templates/plan/view.html:189
+#: nutrition/templates/plan/view.html:150
+#: nutrition/templates/plan/view.html:153
+#: nutrition/templates/plan/view.html:191
msgid "Add one now."
msgstr "Adicionar um agora."
@@ -87,7 +87,7 @@ msgstr "Adicionar um agora."
#: gym/templates/gym/member_list.html:244
#: gym/templates/gym/member_list.html:281
#: mailer/templates/mailer/gym/overview.html:43
-#: weight/templates/overview.html:78
+#: weight/templates/overview.html:61
msgid "Add"
msgstr "Adicionar"
@@ -126,14 +126,14 @@ msgstr "Mostrar"
#: config/templates/language/view.html:91 core/templates/user/api_key.html:44
#: core/templates/user/preferences.html:28
-#: exercises/templates/exercise/view.html:273
-#: exercises/templates/exercise/view.html:296 gym/models/contract.py:200
+#: exercises/templates/exercise/view.html:323
+#: exercises/templates/exercise/view.html:346 gym/models/contract.py:200
#: gym/templates/contract/view.html:41 gym/templates/contract/view.html:106
#: gym/templates/gym/member_list.html:248
#: manager/templates/schedule/view.html:281
#: manager/templates/workout/view.html:206
#: nutrition/templates/ingredient/view.html:226
-#: nutrition/templates/plan/view.html:409 weight/templates/overview.html:62
+#: nutrition/templates/plan/view.html:411 weight/templates/overview.html:45
msgid "Options"
msgstr "Opções"
@@ -147,12 +147,12 @@ msgstr "Opções"
#: core/templates/weight_unit/list.html:17
#: exercises/templates/categories/admin-overview.html:16
#: exercises/templates/equipment/admin-overview.html:16
-#: exercises/templates/exercise/view.html:180
-#: exercises/templates/exercise/view.html:301
+#: exercises/templates/exercise/view.html:230
+#: exercises/templates/exercise/view.html:351
#: exercises/templates/muscles/admin-overview.html:16
-#: exercises/views/comments.py:63 gallery/views/images.py:96
-#: gym/templates/admin_notes/list.html:32 gym/templates/contract/list.html:31
-#: gym/templates/contract/view.html:107
+#: exercises/views/comments.py:63 exercises/views/videos.py:69
+#: gallery/views/images.py:96 gym/templates/admin_notes/list.html:32
+#: gym/templates/contract/list.html:31 gym/templates/contract/view.html:107
#: gym/templates/contract_option/list.html:31
#: gym/templates/contract_type/list.html:31 gym/templates/document/list.html:38
#: gym/templates/gym/list.html:19 gym/templates/gym/list.html:43
@@ -163,7 +163,7 @@ msgstr "Opções"
#: manager/templates/calendar/partial_overview_table.html:18
#: manager/templates/schedule/view.html:121
#: nutrition/templates/ingredient/view.html:198
-#: nutrition/templates/plan/view.html:89 nutrition/templates/plan/view.html:124
+#: nutrition/templates/plan/view.html:89 nutrition/templates/plan/view.html:126
#: nutrition/templates/units/list.html:18
msgid "Edit"
msgstr "Editar"
@@ -177,9 +177,9 @@ msgstr "Editar"
#: exercises/templates/categories/admin-overview.html:17
#: exercises/templates/equipment/admin-overview.html:17
#: exercises/templates/exercise/view.html:68
-#: exercises/templates/exercise/view.html:155
-#: exercises/templates/exercise/view.html:185
-#: exercises/templates/exercise/view.html:306
+#: exercises/templates/exercise/view.html:205
+#: exercises/templates/exercise/view.html:235
+#: exercises/templates/exercise/view.html:356
#: exercises/templates/muscles/admin-overview.html:17
#: gym/templates/admin_notes/list.html:40
#: gym/templates/contract_option/list.html:39
@@ -192,7 +192,7 @@ msgstr "Editar"
#: nutrition/templates/ingredient/view.html:199
#: nutrition/templates/ingredient/view.html:239
#: nutrition/templates/log/detail.html:197
-#: nutrition/templates/plan/view.html:95 nutrition/templates/plan/view.html:130
+#: nutrition/templates/plan/view.html:95 nutrition/templates/plan/view.html:132
#: nutrition/templates/units/list.html:20
msgid "Delete"
msgstr "Remover"
@@ -317,7 +317,7 @@ msgid "Some way of answering you (e-mail, etc.)"
msgstr "Meios de contato (e-mail, etc.)"
#: core/forms.py:265 exercises/models/comment.py:40 manager/models/set.py:60
-#: manager/models/setting.py:99 nutrition/models/log.py:61
+#: manager/models/setting.py:99 nutrition/models/log.py:71
msgid "Comment"
msgstr "Comentário"
@@ -461,7 +461,7 @@ msgstr ""
msgid "Age"
msgstr "Idade"
-#: core/models/profile.py:202 nutrition/forms.py:98
+#: core/models/profile.py:202 nutrition/forms.py:99
msgid "Height (cm)"
msgstr "Altura (cm)"
@@ -512,7 +512,7 @@ msgid "Total caloric intake, including e.g. any surplus"
msgstr "Total de ingestão calórica, incluindo qualquer excedente"
#: core/models/profile.py:305 nutrition/models/ingredient_weight_unit.py:45
-#: nutrition/models/log.py:80 nutrition/models/meal_item.py:58
+#: nutrition/models/log.py:90 nutrition/models/meal_item.py:58
msgid "Weight unit"
msgstr "Unidade de peso"
@@ -549,9 +549,9 @@ msgstr "A soma de todas as horas deve ser 24"
#: gym/models/user_document.py:87 gym/templates/contract/view.html:50
#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:96
#: gym/views/gym.py:156 manager/models/schedule.py:55
-#: manager/models/workout.py:56 nutrition/models/ingredient.py:96
-#: nutrition/models/ingredient_category.py:26
-#: nutrition/models/weight_unit.py:38
+#: manager/models/workout.py:56 measurements/models/category.py:53
+#: nutrition/models/ingredient.py:96 nutrition/models/ingredient_category.py:26
+#: nutrition/models/meal.py:66 nutrition/models/weight_unit.py:38
#: nutrition/templates/ingredient/pending.html:15
#: nutrition/templates/ingredient/view.html:185
msgid "Name"
@@ -613,11 +613,11 @@ msgstr ""
msgid "Dashboard"
msgstr "Painel"
-#: core/templates/index.html:31 manager/templates/calendar/month.html:115
+#: core/templates/index.html:21 manager/templates/calendar/month.html:115
msgid "Add log to day"
msgstr "Adicionar registro ao dia"
-#: core/templates/index.html:35 manager/templates/calendar/month.html:120
+#: core/templates/index.html:25 manager/templates/calendar/month.html:120
msgid ""
"Click to add weight logs to a training\n"
"day in your current workout:"
@@ -625,7 +625,7 @@ msgstr ""
"Clique para adicionar registros de peso à um \n"
"dia de treino no seu atual exercício:"
-#: core/templates/index.html:43 core/templates/index.html:83
+#: core/templates/index.html:33 core/templates/index.html:73
#: core/templates/misc/fragments/shariff_modal.html:29
#: core/templates/template.html:125 manager/templates/calendar/month.html:138
#: manager/templates/schedule/view.html:246
@@ -635,11 +635,11 @@ msgstr ""
msgid "Close"
msgstr "Fechar"
-#: core/templates/index.html:54 core/templates/index.html:203
+#: core/templates/index.html:44 core/templates/index.html:193
msgid "Add new diary entry"
msgstr "Adicione uma nova entrada diária"
-#: core/templates/index.html:59
+#: core/templates/index.html:49
msgid ""
"Click to add an entry to your nutrition diary for today. You can either log "
"a meal as you defined it, or entry any number of custom entries."
@@ -648,7 +648,7 @@ msgstr ""
"registrar uma refeição como você a definiu ou inserir um número de entradas "
"personalizadas."
-#: core/templates/index.html:67 core/templates/index.html:171
+#: core/templates/index.html:57 core/templates/index.html:161
#: core/templates/user/overview.html:171
#: nutrition/templates/ingredient/view.html:79
#: nutrition/templates/log/detail.html:40
@@ -657,19 +657,19 @@ msgstr ""
#: nutrition/templates/log/overview.html:7
#: nutrition/templates/log/overview.html:44
#: nutrition/templates/plan/overview.html:17
-#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:242
-#: nutrition/templates/plan/view.html:301
-#: nutrition/templates/plan/view.html:321
-#: nutrition/templates/plan/view.html:363
-#: nutrition/templates/plan/view.html:373
+#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:244
+#: nutrition/templates/plan/view.html:303
+#: nutrition/templates/plan/view.html:323
+#: nutrition/templates/plan/view.html:365
+#: nutrition/templates/plan/view.html:375
msgid "kcal"
msgstr "kcal"
-#: core/templates/index.html:79 nutrition/templates/plan/view.html:348
+#: core/templates/index.html:69 nutrition/templates/plan/view.html:350
msgid "Add custom diary entry"
msgstr "Adicionar entrada de diário personalizada"
-#: core/templates/index.html:94 core/templates/index.html:102
+#: core/templates/index.html:84 core/templates/index.html:92
#: manager/models/day.py:34 manager/models/log.py:56
#: manager/models/session.py:60 manager/models/workout.py:109
#: manager/templates/schedule/view.html:105
@@ -680,11 +680,11 @@ msgstr "Adicionar entrada de diário personalizada"
msgid "Workout"
msgstr "Treino"
-#: core/templates/index.html:128
+#: core/templates/index.html:118
msgid "This workout is part of a schedule:"
msgstr "Este treino é parte de um plano:"
-#: core/templates/index.html:133
+#: core/templates/index.html:123
msgid ""
"The current workout is selected from your active schedule or, if you don't "
"have one, simply by date."
@@ -692,70 +692,70 @@ msgstr ""
"O treino atual é selecionado a partir de sua programação ativa ou, se você "
"não tiver, simplesmente por data."
-#: core/templates/index.html:142 manager/templates/calendar/month.html:188
+#: core/templates/index.html:132 manager/templates/calendar/month.html:188
msgid "Add new log"
msgstr "Adicionar um novo registro"
-#: core/templates/index.html:147 core/templates/user/overview.html:58
+#: core/templates/index.html:137 core/templates/user/overview.html:58
#: manager/templates/calendar/month.html:128
#: manager/templates/schedule/view.html:146
#: manager/templates/workout/overview.html:28
msgid "No workouts found."
msgstr "Nenhum treino encontrado."
-#: core/templates/index.html:157 nutrition/models/log.py:48
+#: core/templates/index.html:147 nutrition/models/log.py:49
#: nutrition/models/meal.py:49 nutrition/models/meal_item.py:47
#: nutrition/models/plan.py:94 nutrition/templates/plan/view.html:11
#: nutrition/templates/plan/view.html:19
msgid "Nutrition plan"
msgstr "Plano de nutrição"
-#: core/templates/index.html:169 core/templates/user/overview.html:155
+#: core/templates/index.html:159 core/templates/user/overview.html:155
#: nutrition/models/ingredient.py:100
#: nutrition/templates/ingredient/view.html:77
#: nutrition/templates/log/detail.html:39
#: nutrition/templates/log/detail.html:156
-#: nutrition/templates/plan/view.html:53 nutrition/templates/plan/view.html:241
-#: nutrition/templates/plan/view.html:358
-#: nutrition/templates/plan/view.html:362 nutrition/views/plan.py:384
+#: nutrition/templates/plan/view.html:53 nutrition/templates/plan/view.html:243
+#: nutrition/templates/plan/view.html:360
+#: nutrition/templates/plan/view.html:364 nutrition/views/plan.py:384
msgid "Energy"
msgstr "Energia"
-#: core/templates/index.html:175 core/templates/user/overview.html:156
+#: core/templates/index.html:165 core/templates/user/overview.html:156
#: nutrition/models/ingredient.py:105
#: nutrition/templates/ingredient/view.html:84
#: nutrition/templates/log/detail.html:52
#: nutrition/templates/log/detail.html:174
-#: nutrition/templates/plan/view.html:54 nutrition/templates/plan/view.html:249
+#: nutrition/templates/plan/view.html:54 nutrition/templates/plan/view.html:251
#: nutrition/views/plan.py:390
msgid "Protein"
msgstr "Proteína"
-#: core/templates/index.html:181 core/templates/user/overview.html:157
+#: core/templates/index.html:171 core/templates/user/overview.html:157
#: nutrition/models/ingredient.py:113
#: nutrition/templates/ingredient/view.html:90
#: nutrition/templates/log/detail.html:65
#: nutrition/templates/log/detail.html:175
-#: nutrition/templates/plan/view.html:55 nutrition/templates/plan/view.html:255
+#: nutrition/templates/plan/view.html:55 nutrition/templates/plan/view.html:257
#: nutrition/views/plan.py:398
msgid "Carbohydrates"
msgstr "Carboidratos"
-#: core/templates/index.html:187 core/templates/user/overview.html:158
+#: core/templates/index.html:177 core/templates/user/overview.html:158
#: nutrition/models/ingredient.py:131
#: nutrition/templates/ingredient/view.html:106
#: nutrition/templates/log/detail.html:91
#: nutrition/templates/log/detail.html:176
-#: nutrition/templates/plan/view.html:56 nutrition/templates/plan/view.html:268
+#: nutrition/templates/plan/view.html:56 nutrition/templates/plan/view.html:270
#: nutrition/views/plan.py:412
msgid "Fat"
msgstr "Gordura"
-#: core/templates/index.html:199 nutrition/templates/plan/overview.html:22
+#: core/templates/index.html:189 nutrition/templates/plan/overview.html:22
msgid "No nutrition plans."
msgstr "Nenhum plano de nutrição."
-#: core/templates/index.html:213 core/templates/user/overview.html:112
+#: core/templates/index.html:203 core/templates/user/overview.html:112
#: core/templates/user/overview.html:121 manager/forms.py:173
#: manager/helpers.py:89 manager/models/log.py:84 manager/models/setting.py:67
#: manager/templates/log/add.html:54 manager/templates/set/formset.html:12
@@ -764,11 +764,7 @@ msgstr "Nenhum plano de nutrição."
msgid "Weight"
msgstr "Peso"
-#: core/templates/index.html:217
-msgid "Your current weight is: "
-msgstr "Seu peso atual é: "
-
-#: core/templates/index.html:248 core/templates/navigation.html:97
+#: core/templates/index.html:210 core/templates/navigation.html:97
#: weight/views.py:70
msgid "Add weight entry"
msgstr "Adicionar uma entrada para peso"
@@ -800,7 +796,7 @@ msgstr "Lista de licença"
msgid "Nothing found"
msgstr "Nada encontrado"
-#: core/templates/misc/about.html:4 core/templates/template.html:201
+#: core/templates/misc/about.html:4 core/templates/template.html:175
#: core/templates/template_features.html:118
#: core/templates/template_no_context.html:88
msgid "Imprint"
@@ -818,8 +814,8 @@ msgstr ""
"externo."
#: core/templates/misc/fragments/shariff_modal.html:22
-#: nutrition/templates/plan/view.html:385
-#: nutrition/templates/plan/view.html:394
+#: nutrition/templates/plan/view.html:387
+#: nutrition/templates/plan/view.html:396
msgid "That's done here"
msgstr "Isso é feito aqui"
@@ -907,7 +903,7 @@ msgstr "Exercícios com revisão pendente"
msgid "Equipment"
msgstr "Equipamento"
-#: core/templates/navigation.html:78 exercises/templates/exercise/view.html:208
+#: core/templates/navigation.html:78 exercises/templates/exercise/view.html:258
msgid "Muscles"
msgstr "Músculos"
@@ -980,7 +976,7 @@ msgstr "Documentação do desenvolvedor"
msgid "Get the code"
msgstr "Obtenha o código fonte"
-#: core/templates/navigation.html:175 core/templates/template.html:193
+#: core/templates/navigation.html:175 core/templates/template.html:205
#: core/templates/template_features.html:100
msgid "Translate"
msgstr "Traduzir"
@@ -1136,15 +1132,11 @@ msgstr ""
msgid "Create some demo entries"
msgstr "Crie alguns registros de demonstração"
-#: core/templates/template.html:202 core/templates/template_features.html:122
+#: core/templates/template.html:176 core/templates/template_features.html:122
#: core/templates/template_no_context.html:89 software/templates/tos.html:7
msgid "Terms of service"
msgstr "Termos de uso"
-#: core/templates/template.html:209 core/templates/template.html:210
-msgid "Released under the Affero GPL"
-msgstr "Licenciado usando Affero GPL"
-
#: core/templates/template_features.html:62 software/templates/features.html:9
#: software/templates/features.html:120
msgid "Features"
@@ -1251,9 +1243,10 @@ msgstr "Adicionar treino"
#: core/templates/user/overview.html:120 core/templates/user/overview.html:153
#: exercises/models/exercise.py:77 gallery/models/image.py:47
#: manager/helpers.py:88 manager/models/log.py:98 manager/models/session.py:67
-#: nutrition/models/ingredient.py:85 nutrition/models/ingredient.py:87
-#: nutrition/models/ingredient.py:190 nutrition/templates/log/overview.html:30
-#: nutrition/templates/plan/view.html:307 weight/models.py:32
+#: measurements/models/measurement.py:64 nutrition/models/ingredient.py:85
+#: nutrition/models/ingredient.py:87 nutrition/models/ingredient.py:190
+#: nutrition/templates/log/overview.html:30
+#: nutrition/templates/plan/view.html:309 weight/models.py:32
#: weight/templates/import_csv_preview.html:13
#: weight/templates/import_csv_preview.html:42 weight/views.py:150
msgid "Date"
@@ -1261,10 +1254,10 @@ msgstr "Data"
#: core/templates/user/overview.html:35 core/templates/user/overview.html:154
#: exercises/models/exercise.py:61 exercises/templates/exercise/view.html:88
-#: exercises/views/exercises.py:189 gallery/models/image.py:70
+#: exercises/views/exercises.py:190 gallery/models/image.py:70
#: gym/models/contract.py:57 gym/models/contract.py:107
#: manager/models/day.py:37 manager/models/workout.py:62
-#: nutrition/models/plan.py:69
+#: measurements/models/measurement.py:79 nutrition/models/plan.py:69
msgid "Description"
msgstr "descrição"
@@ -1426,11 +1419,11 @@ msgstr "Preferências"
msgid "Change password"
msgstr "Mudar senha"
-#: core/templatetags/wger_extras.py:217
+#: core/templatetags/wger_extras.py:229
msgid "kg"
msgstr "kg"
-#: core/templatetags/wger_extras.py:219
+#: core/templatetags/wger_extras.py:231
#: nutrition/templates/ingredient/view.html:86
#: nutrition/templates/ingredient/view.html:92
#: nutrition/templates/ingredient/view.html:99
@@ -1442,28 +1435,28 @@ msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr "g"
-#: core/templatetags/wger_extras.py:222
+#: core/templatetags/wger_extras.py:234
msgid "lb"
msgstr "lb"
-#: core/templatetags/wger_extras.py:224
+#: core/templatetags/wger_extras.py:236
msgctxt "weight unit, i.e. ounces"
msgid "oz"
msgstr "oz"
#: core/views/languages.py:85 exercises/views/categories.py:121
-#: exercises/views/equipment.py:106 exercises/views/exercises.py:422
+#: exercises/views/equipment.py:106 exercises/views/exercises.py:423
#: exercises/views/images.py:128 exercises/views/muscles.py:118
-#: manager/views/schedule.py:311 manager/views/schedule_step.py:129
-#: manager/views/workout.py:268 manager/views/workout_session.py:141
-#: nutrition/views/ingredient.py:144 nutrition/views/plan.py:120
-#: nutrition/views/unit.py:111
+#: exercises/views/videos.py:129 manager/views/schedule.py:311
+#: manager/views/schedule_step.py:129 manager/views/workout.py:268
+#: manager/views/workout_session.py:141 nutrition/views/ingredient.py:144
+#: nutrition/views/plan.py:120 nutrition/views/unit.py:111
msgid "Successfully deleted"
msgstr "Apagado com sucesso"
#: core/views/languages.py:93 core/views/license.py:103
#: core/views/repetition_units.py:115 core/views/weight_units.py:115
-#: exercises/views/categories.py:127 exercises/views/exercises.py:430
+#: exercises/views/categories.py:127 exercises/views/exercises.py:431
#: exercises/views/muscles.py:125 gallery/views/images.py:121
#: gym/views/admin_notes.py:196 gym/views/document.py:206 gym/views/gym.py:486
#: manager/views/schedule.py:318 manager/views/schedule_step.py:139
@@ -1477,7 +1470,7 @@ msgstr "Remover {0}?"
#: core/views/languages.py:111 core/views/license.py:84
#: core/views/repetition_units.py:85 core/views/user.py:456
#: core/views/weight_units.py:85 exercises/views/categories.py:97
-#: exercises/views/equipment.py:83 exercises/views/exercises.py:304
+#: exercises/views/equipment.py:83 exercises/views/exercises.py:305
#: exercises/views/muscles.py:105 gym/views/admin_notes.py:160
#: gym/views/config.py:68 gym/views/contract.py:186
#: gym/views/contract_option.py:123 gym/views/contract_type.py:123
@@ -1567,7 +1560,7 @@ msgstr "Músculos primários"
#: exercises/models/base.py:64 exercises/templates/equipment/overview.html:71
#: exercises/templates/exercise/overview.html:76
-#: exercises/templates/exercise/view.html:218
+#: exercises/templates/exercise/view.html:268
#: exercises/templates/muscles/overview.html:73
msgid "Secondary muscles"
msgstr "Músculos secundários"
@@ -1580,8 +1573,9 @@ msgstr "Variações"
msgid "Exercise Categories"
msgstr "Categorias de exercício"
-#: exercises/models/comment.py:34 exercises/models/image.py:62
-#: manager/forms.py:165 manager/helpers.py:89 manager/models/log.py:51
+#: exercises/models/comment.py:34 exercises/models/image.py:75
+#: exercises/models/video.py:82 manager/forms.py:165 manager/helpers.py:89
+#: manager/models/log.py:51
msgid "Exercise"
msgstr "Exercício"
@@ -1594,32 +1588,54 @@ msgstr "Um comentário sobre como executar corretamente este exercício."
msgid "Language"
msgstr "Idioma"
-#: exercises/models/exercise.py:233 exercises/views/exercises.py:460
+#: exercises/models/exercise.py:237 exercises/views/exercises.py:461
msgid "Exercise was successfully added to the general database"
msgstr "Exercício foi adicionado com sucesso ao banco de dados geral"
-#: exercises/models/exercise.py:261
+#: exercises/models/exercise.py:265
msgid "New user submitted exercise"
msgstr "Novo exercício submetido pelo utilizador"
-#: exercises/models/exercise.py:263
+#: exercises/models/exercise.py:267
#, python-brace-format
msgid "The user {0} submitted a new exercise \"{1}\"."
msgstr "O utilizador {0} submete um novo exercício \"{1}\"."
-#: exercises/models/image.py:68 gallery/models/image.py:56
+#: exercises/models/image.py:59
+msgid "Line"
+msgstr ""
+
+#: exercises/models/image.py:60
+msgid "3D"
+msgstr ""
+
+#: exercises/models/image.py:61
+msgid "Low-poly"
+msgstr ""
+
+#: exercises/models/image.py:62
+msgid "Photo"
+msgstr ""
+
+#: exercises/models/image.py:63
+#, fuzzy
+#| msgid "Others"
+msgid "Other"
+msgstr "Outros"
+
+#: exercises/models/image.py:81 gallery/models/image.py:56
msgid "Image"
msgstr "Imagem"
-#: exercises/models/image.py:69 gallery/models/image.py:57
+#: exercises/models/image.py:82 gallery/models/image.py:57
msgid "Only PNG and JPEG formats are supported"
msgstr "Somente os formatos PNG e JPEG são suportados"
-#: exercises/models/image.py:75
+#: exercises/models/image.py:88
msgid "Main picture"
msgstr "Imagem principal"
-#: exercises/models/image.py:78
+#: exercises/models/image.py:91
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 "
@@ -1629,11 +1645,15 @@ msgstr ""
"exercício (irá ser mostrada, por exemplo, na busca). A primeira imagem é "
"automaticamente marcada pelo sistema."
-#: exercises/models/image.py:166
+#: exercises/models/image.py:100
+msgid "The art style of your image"
+msgstr ""
+
+#: exercises/models/image.py:185
msgid "New user submitted image"
msgstr "Nova imagem submetido por utilizador"
-#: exercises/models/image.py:167
+#: exercises/models/image.py:186
#, python-brace-format
msgid "The user {0} submitted a new image \"{1}\" for exercise {2}."
msgstr "uário {0} submeteu uma nova imagem \"{1}\" para o exercício {2}."
@@ -1642,6 +1662,58 @@ msgstr "uário {0} submeteu uma nova imagem \"{1}\" para o exercício {2}."
msgid "In latin, e.g. \"Pectoralis major\""
msgstr "Em latim, ex.: \"Pectoralis major\""
+#: exercises/models/video.py:41
+msgid "Maximum file size is 100MB."
+msgstr ""
+
+#: exercises/models/video.py:44 exercises/models/video.py:48
+msgid "File type is not supported"
+msgstr ""
+
+#: exercises/models/video.py:57
+#, fuzzy
+#| msgid "%(birthdate)s is not a valid birthdate"
+msgid "File is not a valid video"
+msgstr "%(birthdate)s não é uma data de aniversário válida"
+
+#: exercises/models/video.py:88
+#, fuzzy
+#| msgid "Main picture"
+msgid "Main video"
+msgstr "Imagem principal"
+
+#: exercises/models/video.py:94
+msgid "Video"
+msgstr ""
+
+#: exercises/models/video.py:101
+msgid "Size"
+msgstr ""
+
+#: exercises/models/video.py:108 manager/models/schedule_step.py:56
+msgid "Duration"
+msgstr "Duração"
+
+#: exercises/models/video.py:117
+msgid "Width"
+msgstr ""
+
+#: exercises/models/video.py:124
+#, fuzzy
+#| msgid "Weight"
+msgid "Height"
+msgstr "Peso"
+
+#: exercises/models/video.py:131
+#, fuzzy
+#| msgid "Code"
+msgid "Codec"
+msgstr "Código"
+
+#: exercises/models/video.py:139
+msgid "Codec, long name"
+msgstr ""
+
#: exercises/templates/equipment/admin-overview.html:4
msgid "Equipment list"
msgstr "Lista de equipamento"
@@ -1657,7 +1729,7 @@ msgstr "Visão geral do equipamento"
#: exercises/templates/equipment/overview.html:69
#: exercises/templates/exercise/overview.html:74
-#: exercises/templates/exercise/view.html:214
+#: exercises/templates/exercise/view.html:264
#: exercises/templates/muscles/overview.html:71
msgid "Main muscles"
msgstr "Músculos principais"
@@ -1785,7 +1857,8 @@ msgstr "Data de submissão"
#: gym/templates/gym/new_user.html:22
#: gym/templates/gym/reset_user_password.html:20 manager/models/log.py:45
#: manager/models/schedule.py:44 manager/models/session.py:49
-#: manager/models/workout.py:89 nutrition/models/plan.py:55
+#: manager/models/workout.py:89 measurements/models/category.py:48
+#: measurements/models/measurement.py:59 nutrition/models/plan.py:55
#: nutrition/templates/ingredient/pending.html:16 weight/models.py:41
msgid "User"
msgstr "Utilizador"
@@ -1812,13 +1885,13 @@ msgid "Please select one of the options below."
msgstr "Por favor selecione uma das opções abaixo."
#: exercises/templates/exercise/view.html:60
-#: exercises/templates/exercise/view.html:153
+#: exercises/templates/exercise/view.html:203
#: nutrition/templates/ingredient/view.html:38
msgid "Accept"
msgstr "Aceito"
#: exercises/templates/exercise/view.html:64
-#: exercises/templates/exercise/view.html:154
+#: exercises/templates/exercise/view.html:204
#: nutrition/templates/ingredient/view.html:42
msgid "Decline"
msgstr "Recusado"
@@ -1831,32 +1904,42 @@ msgstr "Imagens"
msgid "Add new image"
msgstr "Adicionar nova imagem"
-#: exercises/templates/exercise/view.html:147
+#: exercises/templates/exercise/view.html:148
+msgid "Videos"
+msgstr ""
+
+#: exercises/templates/exercise/view.html:187 exercises/views/videos.py:94
+#, fuzzy
+#| msgid "Add new image"
+msgid "Add new video"
+msgstr "Adicionar nova imagem"
+
+#: exercises/templates/exercise/view.html:197
msgid "Images pending review"
msgstr "Imagens com revisão pendente"
-#: exercises/templates/exercise/view.html:168
+#: exercises/templates/exercise/view.html:218
msgid "Comments for this exercise"
msgstr "Comentários para este exercício"
-#: exercises/templates/exercise/view.html:196
+#: exercises/templates/exercise/view.html:246
msgid "Add new comment"
msgstr "Adicionar novo comentário"
-#: exercises/templates/exercise/view.html:210
+#: exercises/templates/exercise/view.html:260
msgid "The diagram shows the most used muscles on this exercise"
msgstr "O diagrama mostra os músculos mais usados neste exercício"
-#: exercises/templates/exercise/view.html:251
+#: exercises/templates/exercise/view.html:301
#: manager/templates/workout/log.html:10 manager/templates/workout/log.html:11
msgid "Weight log"
msgstr "Log de peso"
-#: exercises/templates/exercise/view.html:256
+#: exercises/templates/exercise/view.html:306
msgid "Exercise Variations"
msgstr "Variações de Exercícios"
-#: exercises/templates/exercise/view.html:277
+#: exercises/templates/exercise/view.html:327
msgid "Submit a correction"
msgstr "Envie uma correção"
@@ -1893,32 +1976,32 @@ msgstr "Adicionar comentário do exercício"
msgid "Delete equipment?"
msgstr "Apagar equipamento?"
-#: exercises/views/exercises.py:228
+#: exercises/views/exercises.py:229
#, python-format
msgid ""
"%(name_original)s is too similar to existing exercise \"%(exercise_name)s\""
msgstr ""
-"%(name_original)s é muito semelhante ao exercício existente \""
-"%(exercise_name)s\""
+"%(name_original)s é muito semelhante ao exercício existente "
+"\"%(exercise_name)s\""
-#: exercises/views/exercises.py:246
+#: exercises/views/exercises.py:247
msgid "Add exercise"
msgstr "Adicionar exercício"
-#: exercises/views/exercises.py:366
+#: exercises/views/exercises.py:367
msgid "Thank you. Once the changes are reviewed the exercise will be updated."
msgstr "Obrigado, uma vez revisadas, as mudanças serão feitas."
-#: exercises/views/exercises.py:379
+#: exercises/views/exercises.py:380
#, python-brace-format
msgid "Correct {0}"
msgstr "Correções {0}"
-#: exercises/views/exercises.py:421
+#: exercises/views/exercises.py:422
msgid "This will delete the exercise from all workouts."
msgstr "Isto irá apagar o exercício de todos os treinos."
-#: exercises/views/exercises.py:473
+#: exercises/views/exercises.py:474
msgid "Exercise was successfully marked as rejected"
msgstr "Exercício foi marcado com rejeitado com sucesso"
@@ -1930,6 +2013,11 @@ msgstr "Editar imagem do exercício"
msgid "Delete exercise image?"
msgstr "Apagar imagem do exercício?"
+#: exercises/views/videos.py:144 nutrition/views/log.py:230
+#: nutrition/views/unit_ingredient.py:139
+msgid "Delete?"
+msgstr "Apagar?"
+
#: gallery/templates/images/overview.html:62
msgid "Add image"
msgstr "Adicionar imagem"
@@ -1996,8 +2084,8 @@ msgid "Contract type"
msgstr "Tipo de contrato"
#: gym/models/contract.py:208 gym/templates/contract/view.html:59
-#: manager/templates/log/add.html:52 nutrition/forms.py:58
-#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:92
+#: manager/templates/log/add.html:52 nutrition/forms.py:59
+#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:102
#: nutrition/models/meal_item.py:72
msgid "Amount"
msgstr "Quantidade"
@@ -2442,6 +2530,7 @@ msgstr ""
"os e-mails"
#: mailer/templates/mailer/gym/preview.html:22
+#: software/templates/about_us.html:59
msgid "Current version"
msgstr "Versão atual"
@@ -2478,7 +2567,8 @@ msgstr ""
#: manager/models/log.py:90 manager/models/setting.py:47
#: manager/models/setting.py:78 manager/templates/log/add.html:53
#: manager/templates/log/add.html:55 manager/templates/set/formset.html:11
-#: manager/templates/set/formset.html:13 nutrition/forms.py:62
+#: manager/templates/set/formset.html:13 measurements/models/category.py:58
+#: nutrition/forms.py:63
msgid "Unit"
msgstr "Unidade"
@@ -2548,10 +2638,6 @@ msgstr ""
msgid "schedule"
msgstr "Cronograma"
-#: manager/models/schedule_step.py:56
-msgid "Duration"
-msgstr "Duração"
-
#: manager/models/schedule_step.py:57
msgid "The duration in weeks"
msgstr "A duração em semanas"
@@ -2642,7 +2728,8 @@ msgstr "Um modelo público está disponível para outros usuários"
#: manager/models/workout.py:114
msgid "You must mark this workout as a template before declaring it public"
-msgstr "Você deve marcar este treino como um modelo antes de declará-lo público"
+msgstr ""
+"Você deve marcar este treino como um modelo antes de declará-lo público"
#: manager/templates/calendar/day.html:9 manager/templates/calendar/day.html:31
msgid "Workout log"
@@ -2837,7 +2924,7 @@ msgstr ""
#: manager/templates/schedule/view.html:290
#: manager/templates/workout/view.html:142
#: manager/templates/workout/view.html:217
-#: nutrition/templates/plan/view.html:415
+#: nutrition/templates/plan/view.html:417
msgid "Download as PDF"
msgstr "Baixe como PDF"
@@ -3077,23 +3164,27 @@ msgstr "Nova impressão do treino para {0}"
msgid "This will delete all weight logs for this day as well."
msgstr "Isto apagará todos os logs de pesos para este dia também."
-#: nutrition/forms.py:121
+#: measurements/models/measurement.py:69
+msgid "Value"
+msgstr ""
+
+#: nutrition/forms.py:122
msgid "Calculate"
msgstr "Calcular"
-#: nutrition/forms.py:194 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:195 nutrition/templates/rate/form.html:76
msgid "Basic caloric intake"
msgstr "Ingestão básica de calorias"
-#: nutrition/forms.py:195
+#: nutrition/forms.py:196
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:201
+#: nutrition/forms.py:202
msgid "Additional calories"
msgstr "Calorias adicionais"
-#: nutrition/forms.py:203
+#: nutrition/forms.py:204
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
@@ -3101,8 +3192,8 @@ msgstr ""
"Calorias adicionais para adicionar à taxa básica (para subtrair, entre com "
"um número negativo)"
-#: nutrition/forms.py:231 nutrition/models/ingredient_weight_unit.py:39
-#: nutrition/models/log.py:71 nutrition/models/meal_item.py:53
+#: nutrition/forms.py:232 nutrition/models/ingredient_weight_unit.py:39
+#: nutrition/models/log.py:81 nutrition/models/meal_item.py:53
#: nutrition/templates/log/detail.html:155
msgid "Ingredient"
msgstr "Ingrediente"
@@ -3121,14 +3212,14 @@ msgstr "Em g por 100g do produto"
#: nutrition/models/ingredient.py:123
#: nutrition/templates/ingredient/view.html:96
#: nutrition/templates/log/detail.html:78
-#: nutrition/templates/plan/view.html:262 nutrition/views/plan.py:406
+#: nutrition/templates/plan/view.html:264 nutrition/views/plan.py:406
msgid "Sugar content in carbohydrates"
msgstr "Açúcar contido nos carboidratos"
#: nutrition/models/ingredient.py:141
#: nutrition/templates/ingredient/view.html:112
#: nutrition/templates/log/detail.html:104
-#: nutrition/templates/plan/view.html:274 nutrition/views/plan.py:420
+#: nutrition/templates/plan/view.html:276 nutrition/views/plan.py:420
msgid "Saturated fat content in fats"
msgstr "Gordura saturada contida nas gorduras"
@@ -3136,7 +3227,7 @@ msgstr "Gordura saturada contida nas gorduras"
#: nutrition/templates/ingredient/view.html:134
#: nutrition/templates/log/detail.html:122
#: nutrition/templates/log/detail.html:178
-#: nutrition/templates/plan/view.html:285 nutrition/views/plan.py:426
+#: nutrition/templates/plan/view.html:287 nutrition/views/plan.py:426
msgid "Fibres"
msgstr "Fibras"
@@ -3144,7 +3235,7 @@ msgstr "Fibras"
#: nutrition/templates/ingredient/view.html:144
#: nutrition/templates/log/detail.html:135
#: nutrition/templates/log/detail.html:181
-#: nutrition/templates/plan/view.html:291 nutrition/views/plan.py:432
+#: nutrition/templates/plan/view.html:293 nutrition/views/plan.py:432
msgid "Sodium"
msgstr "Sódio"
@@ -3164,8 +3255,8 @@ msgid ""
"{energy_approx}%)"
msgstr ""
"A energia total ({energy}kcal) não é a soma aproximada da energia fornecida "
-"por proteínas, carboidratos e gordura ({energy_calculated}kcal "
-"+/-{energy_approx}%)"
+"por proteínas, carboidratos e gordura ({energy_calculated}kcal +/-"
+"{energy_approx}%)"
#: nutrition/models/ingredient.py:357 nutrition/views/ingredient.py:225
msgid "Ingredient was successfully added to the general database"
@@ -3192,10 +3283,20 @@ 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:55
+msgid "Meal"
+msgstr "Refeição"
+
#: nutrition/models/meal.py:61
msgid "Time (approx)"
msgstr "Tempo (aproximado)"
+#: nutrition/models/meal.py:68
+msgid ""
+"Give meals a textual description / name such as \"Breakfast\" or \"after "
+"workout\""
+msgstr ""
+
#: nutrition/models/plan.py:71
msgid ""
"A description of the goal of the plan, e.g. \"Gain mass\" or \"Prepare for "
@@ -3349,12 +3450,12 @@ msgstr ""
#: nutrition/templates/ingredient/view.html:71
#: nutrition/templates/log/detail.html:31
-#: nutrition/templates/plan/view.html:227 nutrition/views/plan.py:376
+#: nutrition/templates/plan/view.html:229 nutrition/views/plan.py:376
msgid "Macronutrients"
msgstr "Macronutrientes"
#: nutrition/templates/ingredient/view.html:80
-#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:244
+#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:246
msgid "kJ"
msgstr "Kj"
@@ -3367,7 +3468,7 @@ msgstr "n.d."
#: nutrition/templates/ingredient/view.html:128
#: nutrition/templates/log/detail.html:119
-#: nutrition/templates/plan/view.html:282
+#: nutrition/templates/plan/view.html:284
msgid "Others"
msgstr "Outros"
@@ -3396,7 +3497,7 @@ msgstr "Apagar ingrediente"
#: nutrition/templates/log/detail.html:7
#: nutrition/templates/log/overview.html:7
-#: nutrition/templates/plan/view.html:300
+#: nutrition/templates/plan/view.html:302
msgid "Nutrition diary"
msgstr "Diário de nutrição"
@@ -3406,13 +3507,13 @@ msgstr "Planejado"
#: nutrition/templates/log/detail.html:33
#: nutrition/templates/log/overview.html:31
-#: nutrition/templates/plan/view.html:308
+#: nutrition/templates/plan/view.html:310
msgid "Logged"
msgstr "Registrado"
#: nutrition/templates/log/detail.html:34
#: nutrition/templates/log/overview.html:32
-#: nutrition/templates/plan/view.html:309
+#: nutrition/templates/plan/view.html:311
msgid "Difference"
msgstr "Diferença"
@@ -3425,7 +3526,7 @@ msgid "g"
msgstr "g"
#: nutrition/templates/log/overview.html:53
-#: nutrition/templates/plan/view.html:330
+#: nutrition/templates/plan/view.html:332
msgid "nothing found"
msgstr "nada encontrado"
@@ -3445,56 +3546,56 @@ msgstr "Registrar esta refeição"
msgid "Add ingredient to meal"
msgstr "Adicionar ingrediente à refeição"
-#: nutrition/templates/plan/view.html:150
+#: nutrition/templates/plan/view.html:152
msgid "No items for this meal."
msgstr "Nenhum item para esta refeição."
-#: nutrition/templates/plan/view.html:188
+#: nutrition/templates/plan/view.html:190
msgid "No meals for this plan."
msgstr "Nenhuma refeição para este plano."
-#: nutrition/templates/plan/view.html:200
+#: nutrition/templates/plan/view.html:202
msgid "Log this Plan"
msgstr "Registrar este plano"
-#: nutrition/templates/plan/view.html:206
+#: nutrition/templates/plan/view.html:208
msgid "Add a new meal"
msgstr "Adicionar uma nova refeição"
-#: nutrition/templates/plan/view.html:216 nutrition/views/plan.py:369
+#: nutrition/templates/plan/view.html:218 nutrition/views/plan.py:369
msgid "Nutritional data"
msgstr "Dados nutricionais"
-#: nutrition/templates/plan/view.html:219
+#: nutrition/templates/plan/view.html:221
#, python-format
msgid "Based on the weight entry dated %(date)s (%(weight)s)"
msgstr "Com base na entrada de peso datada de %(date)s (%(weight)s)"
-#: nutrition/templates/plan/view.html:228 nutrition/views/plan.py:377
+#: nutrition/templates/plan/view.html:230 nutrition/views/plan.py:377
msgid "Total"
msgstr "Total"
-#: nutrition/templates/plan/view.html:229 nutrition/views/plan.py:378
+#: nutrition/templates/plan/view.html:231 nutrition/views/plan.py:378
msgid "Percent of energy"
msgstr "Percentagem de energia"
-#: nutrition/templates/plan/view.html:232 nutrition/views/plan.py:379
+#: nutrition/templates/plan/view.html:234 nutrition/views/plan.py:379
msgid "g per body kg"
msgstr "g por kg de corpo"
-#: nutrition/templates/plan/view.html:234
+#: nutrition/templates/plan/view.html:236
msgid "oz per body lb"
msgstr "oz por libra-peso corporal"
-#: nutrition/templates/plan/view.html:338
+#: nutrition/templates/plan/view.html:340
msgid "View complete nutrition log"
msgstr "Ver o registro nutricional completo"
-#: nutrition/templates/plan/view.html:371
+#: nutrition/templates/plan/view.html:373
msgid "Goal"
msgstr "Objetivo"
-#: nutrition/templates/plan/view.html:382
+#: nutrition/templates/plan/view.html:384
msgid ""
"You have selected that this nutritional plan has a\n"
" goal amount of calories. Use the calculator or enter the value\n"
@@ -3503,7 +3604,7 @@ msgstr ""
"Você selecionou que este plano de nutrição possui\n"
"uma meta de calorias. Use a calculadora ou entre com o valor você mesmo."
-#: nutrition/templates/plan/view.html:392
+#: nutrition/templates/plan/view.html:394
msgid ""
"If you find the ingredient list too short, you might want to activate the "
"preference to also show English ingredients."
@@ -3511,15 +3612,15 @@ msgstr ""
"Se você achar a lista de ingredientes muito curta, você talvez queira ativar "
"a preferência para visualizar os ingrediente em inglês."
-#: nutrition/templates/plan/view.html:421
+#: nutrition/templates/plan/view.html:423
msgid "Edit nutrition plan"
msgstr "Edite plano de nutrição"
-#: nutrition/templates/plan/view.html:425
+#: nutrition/templates/plan/view.html:427
msgid "Make a copy of this nutrition plan"
msgstr "Faça uma cópia deste plano de nutrição"
-#: nutrition/templates/plan/view.html:431
+#: nutrition/templates/plan/view.html:433
msgid "Delete nutrition plan"
msgstr "Apagar plano de nutrição"
@@ -3615,10 +3716,6 @@ msgstr "Adicione um novo ingrediente"
msgid "Ingredient was successfully marked as rejected"
msgstr "Ingrediente foi marcado como rejeitado com sucesso"
-#: nutrition/views/log.py:229 nutrition/views/unit_ingredient.py:139
-msgid "Delete?"
-msgstr "Apagar?"
-
#: nutrition/views/meal.py:55
msgid "Add new meal"
msgstr "Adicionar nova refeição"
@@ -4047,11 +4144,11 @@ msgstr ""
msgid "Re-Submit"
msgstr "Re-submeter"
-#: weight/templates/overview.html:68
+#: weight/templates/overview.html:51
msgid "Export as CSV"
msgstr "Exporte como CSV"
-#: weight/templates/overview.html:72
+#: weight/templates/overview.html:55
msgid "Import from spreadsheet"
msgstr "Importar de planilha"
@@ -4069,6 +4166,12 @@ msgstr "Excluído com sucesso."
msgid "Delete weight entry for the %s"
msgstr "Excluir entrada de peso para %s"
+#~ msgid "Your current weight is: "
+#~ msgstr "Seu peso atual é: "
+
+#~ msgid "Released under the Affero GPL"
+#~ msgstr "Licenciado usando Affero GPL"
+
#~ msgid "Responsible for the content of this site as per German law §5 TMG:"
#~ msgstr ""
#~ "Responsável pelo conteúdo deste site como definido pela Lei Alemã §5 TMG:"
@@ -4212,9 +4315,6 @@ msgstr "Excluir entrada de peso para %s"
#~ "vá até o site transifex, solicite acesso e nós iremos preparar tudo\n"
#~ "para você trabalhar."
-#~ msgid "Code"
-#~ msgstr "Código"
-
#~ msgid ""
#~ "Obviously, you are highly encouraged to clone the\n"
#~ "repo and start hacking! Once you are ready, send a pull request and we\n"
@@ -4355,9 +4455,6 @@ msgstr "Excluir entrada de peso para %s"
#~ msgid "Pause!"
#~ msgstr "Pausa!"
-#~ msgid "Meal"
-#~ msgstr "Refeição"
-
#~ msgid "There is no chart here because there are no weight entries."
#~ msgstr "Não há gráfico aqui pois não há registros de peso."
diff --git a/wger/locale/ro/LC_MESSAGES/django.po b/wger/locale/ro/LC_MESSAGES/django.po
index b09c2edcb..d7d75daed 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: 2021-08-17 17:23+0200\n"
+"POT-Creation-Date: 2022-02-15 14:51+0100\n"
"PO-Revision-Date: 2021-04-15 07:27+0000\n"
"Last-Translator: Allan Nordhøy <[email protected]>\n"
"Language-Team: Romanian <https://hosted.weblate.org/projects/wger/web/ro/>\n"
@@ -51,16 +51,16 @@ msgstr "Limbi"
msgid "Nothing found."
msgstr ""
-#: config/templates/language/overview.html:16 core/templates/index.html:147
-#: core/templates/index.html:199 manager/templates/calendar/month.html:132
+#: config/templates/language/overview.html:16 core/templates/index.html:137
+#: core/templates/index.html:189 manager/templates/calendar/month.html:132
#: manager/templates/schedule/overview.html:28
#: manager/templates/schedule/view.html:146
#: manager/templates/workout/overview.html:28
#: nutrition/templates/ingredient/overview.html:45
#: nutrition/templates/plan/overview.html:23
-#: nutrition/templates/plan/view.html:148
-#: nutrition/templates/plan/view.html:151
-#: nutrition/templates/plan/view.html:189
+#: nutrition/templates/plan/view.html:150
+#: nutrition/templates/plan/view.html:153
+#: nutrition/templates/plan/view.html:191
msgid "Add one now."
msgstr ""
@@ -81,7 +81,7 @@ msgstr ""
#: gym/templates/gym/member_list.html:244
#: gym/templates/gym/member_list.html:281
#: mailer/templates/mailer/gym/overview.html:43
-#: weight/templates/overview.html:78
+#: weight/templates/overview.html:61
msgid "Add"
msgstr "Adăugare"
@@ -115,14 +115,14 @@ msgstr ""
#: config/templates/language/view.html:91 core/templates/user/api_key.html:44
#: core/templates/user/preferences.html:28
-#: exercises/templates/exercise/view.html:273
-#: exercises/templates/exercise/view.html:296 gym/models/contract.py:200
+#: exercises/templates/exercise/view.html:323
+#: exercises/templates/exercise/view.html:346 gym/models/contract.py:200
#: gym/templates/contract/view.html:41 gym/templates/contract/view.html:106
#: gym/templates/gym/member_list.html:248
#: manager/templates/schedule/view.html:281
#: manager/templates/workout/view.html:206
#: nutrition/templates/ingredient/view.html:226
-#: nutrition/templates/plan/view.html:409 weight/templates/overview.html:62
+#: nutrition/templates/plan/view.html:411 weight/templates/overview.html:45
msgid "Options"
msgstr "Opțiuni"
@@ -136,12 +136,12 @@ msgstr "Opțiuni"
#: core/templates/weight_unit/list.html:17
#: exercises/templates/categories/admin-overview.html:16
#: exercises/templates/equipment/admin-overview.html:16
-#: exercises/templates/exercise/view.html:180
-#: exercises/templates/exercise/view.html:301
+#: exercises/templates/exercise/view.html:230
+#: exercises/templates/exercise/view.html:351
#: exercises/templates/muscles/admin-overview.html:16
-#: exercises/views/comments.py:63 gallery/views/images.py:96
-#: gym/templates/admin_notes/list.html:32 gym/templates/contract/list.html:31
-#: gym/templates/contract/view.html:107
+#: exercises/views/comments.py:63 exercises/views/videos.py:69
+#: gallery/views/images.py:96 gym/templates/admin_notes/list.html:32
+#: gym/templates/contract/list.html:31 gym/templates/contract/view.html:107
#: gym/templates/contract_option/list.html:31
#: gym/templates/contract_type/list.html:31 gym/templates/document/list.html:38
#: gym/templates/gym/list.html:19 gym/templates/gym/list.html:43
@@ -152,7 +152,7 @@ msgstr "Opțiuni"
#: manager/templates/calendar/partial_overview_table.html:18
#: manager/templates/schedule/view.html:121
#: nutrition/templates/ingredient/view.html:198
-#: nutrition/templates/plan/view.html:89 nutrition/templates/plan/view.html:124
+#: nutrition/templates/plan/view.html:89 nutrition/templates/plan/view.html:126
#: nutrition/templates/units/list.html:18
msgid "Edit"
msgstr "Editare"
@@ -166,9 +166,9 @@ msgstr "Editare"
#: exercises/templates/categories/admin-overview.html:17
#: exercises/templates/equipment/admin-overview.html:17
#: exercises/templates/exercise/view.html:68
-#: exercises/templates/exercise/view.html:155
-#: exercises/templates/exercise/view.html:185
-#: exercises/templates/exercise/view.html:306
+#: exercises/templates/exercise/view.html:205
+#: exercises/templates/exercise/view.html:235
+#: exercises/templates/exercise/view.html:356
#: exercises/templates/muscles/admin-overview.html:17
#: gym/templates/admin_notes/list.html:40
#: gym/templates/contract_option/list.html:39
@@ -181,7 +181,7 @@ msgstr "Editare"
#: nutrition/templates/ingredient/view.html:199
#: nutrition/templates/ingredient/view.html:239
#: nutrition/templates/log/detail.html:197
-#: nutrition/templates/plan/view.html:95 nutrition/templates/plan/view.html:130
+#: nutrition/templates/plan/view.html:95 nutrition/templates/plan/view.html:132
#: nutrition/templates/units/list.html:20
msgid "Delete"
msgstr "Ștergere"
@@ -315,7 +315,7 @@ msgid "Some way of answering you (e-mail, etc.)"
msgstr "Metodă de contactare (email, etc)"
#: core/forms.py:265 exercises/models/comment.py:40 manager/models/set.py:60
-#: manager/models/setting.py:99 nutrition/models/log.py:61
+#: manager/models/setting.py:99 nutrition/models/log.py:71
msgid "Comment"
msgstr "Comentariu"
@@ -453,7 +453,7 @@ msgstr ""
msgid "Age"
msgstr ""
-#: core/models/profile.py:202 nutrition/forms.py:98
+#: core/models/profile.py:202 nutrition/forms.py:99
msgid "Height (cm)"
msgstr ""
@@ -504,7 +504,7 @@ msgid "Total caloric intake, including e.g. any surplus"
msgstr ""
#: core/models/profile.py:305 nutrition/models/ingredient_weight_unit.py:45
-#: nutrition/models/log.py:80 nutrition/models/meal_item.py:58
+#: nutrition/models/log.py:90 nutrition/models/meal_item.py:58
msgid "Weight unit"
msgstr ""
@@ -539,9 +539,9 @@ msgstr ""
#: gym/models/user_document.py:87 gym/templates/contract/view.html:50
#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:96
#: gym/views/gym.py:156 manager/models/schedule.py:55
-#: manager/models/workout.py:56 nutrition/models/ingredient.py:96
-#: nutrition/models/ingredient_category.py:26
-#: nutrition/models/weight_unit.py:38
+#: manager/models/workout.py:56 measurements/models/category.py:53
+#: nutrition/models/ingredient.py:96 nutrition/models/ingredient_category.py:26
+#: nutrition/models/meal.py:66 nutrition/models/weight_unit.py:38
#: nutrition/templates/ingredient/pending.html:15
#: nutrition/templates/ingredient/view.html:185
msgid "Name"
@@ -597,17 +597,17 @@ msgstr ""
msgid "Dashboard"
msgstr ""
-#: core/templates/index.html:31 manager/templates/calendar/month.html:115
+#: core/templates/index.html:21 manager/templates/calendar/month.html:115
msgid "Add log to day"
msgstr ""
-#: core/templates/index.html:35 manager/templates/calendar/month.html:120
+#: core/templates/index.html:25 manager/templates/calendar/month.html:120
msgid ""
"Click to add weight logs to a training\n"
"day in your current workout:"
msgstr ""
-#: core/templates/index.html:43 core/templates/index.html:83
+#: core/templates/index.html:33 core/templates/index.html:73
#: core/templates/misc/fragments/shariff_modal.html:29
#: core/templates/template.html:125 manager/templates/calendar/month.html:138
#: manager/templates/schedule/view.html:246
@@ -617,17 +617,17 @@ msgstr ""
msgid "Close"
msgstr ""
-#: core/templates/index.html:54 core/templates/index.html:203
+#: core/templates/index.html:44 core/templates/index.html:193
msgid "Add new diary entry"
msgstr ""
-#: core/templates/index.html:59
+#: core/templates/index.html:49
msgid ""
"Click to add an entry to your nutrition diary for today. You can either log "
"a meal as you defined it, or entry any number of custom entries."
msgstr ""
-#: core/templates/index.html:67 core/templates/index.html:171
+#: core/templates/index.html:57 core/templates/index.html:161
#: core/templates/user/overview.html:171
#: nutrition/templates/ingredient/view.html:79
#: nutrition/templates/log/detail.html:40
@@ -636,19 +636,19 @@ msgstr ""
#: nutrition/templates/log/overview.html:7
#: nutrition/templates/log/overview.html:44
#: nutrition/templates/plan/overview.html:17
-#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:242
-#: nutrition/templates/plan/view.html:301
-#: nutrition/templates/plan/view.html:321
-#: nutrition/templates/plan/view.html:363
-#: nutrition/templates/plan/view.html:373
+#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:244
+#: nutrition/templates/plan/view.html:303
+#: nutrition/templates/plan/view.html:323
+#: nutrition/templates/plan/view.html:365
+#: nutrition/templates/plan/view.html:375
msgid "kcal"
msgstr ""
-#: core/templates/index.html:79 nutrition/templates/plan/view.html:348
+#: core/templates/index.html:69 nutrition/templates/plan/view.html:350
msgid "Add custom diary entry"
msgstr ""
-#: core/templates/index.html:94 core/templates/index.html:102
+#: core/templates/index.html:84 core/templates/index.html:92
#: manager/models/day.py:34 manager/models/log.py:56
#: manager/models/session.py:60 manager/models/workout.py:109
#: manager/templates/schedule/view.html:105
@@ -659,80 +659,80 @@ msgstr ""
msgid "Workout"
msgstr ""
-#: core/templates/index.html:128
+#: core/templates/index.html:118
msgid "This workout is part of a schedule:"
msgstr ""
-#: core/templates/index.html:133
+#: core/templates/index.html:123
msgid ""
"The current workout is selected from your active schedule or, if you don't "
"have one, simply by date."
msgstr ""
-#: core/templates/index.html:142 manager/templates/calendar/month.html:188
+#: core/templates/index.html:132 manager/templates/calendar/month.html:188
msgid "Add new log"
msgstr ""
-#: core/templates/index.html:147 core/templates/user/overview.html:58
+#: core/templates/index.html:137 core/templates/user/overview.html:58
#: manager/templates/calendar/month.html:128
#: manager/templates/schedule/view.html:146
#: manager/templates/workout/overview.html:28
msgid "No workouts found."
msgstr ""
-#: core/templates/index.html:157 nutrition/models/log.py:48
+#: core/templates/index.html:147 nutrition/models/log.py:49
#: nutrition/models/meal.py:49 nutrition/models/meal_item.py:47
#: nutrition/models/plan.py:94 nutrition/templates/plan/view.html:11
#: nutrition/templates/plan/view.html:19
msgid "Nutrition plan"
msgstr ""
-#: core/templates/index.html:169 core/templates/user/overview.html:155
+#: core/templates/index.html:159 core/templates/user/overview.html:155
#: nutrition/models/ingredient.py:100
#: nutrition/templates/ingredient/view.html:77
#: nutrition/templates/log/detail.html:39
#: nutrition/templates/log/detail.html:156
-#: nutrition/templates/plan/view.html:53 nutrition/templates/plan/view.html:241
-#: nutrition/templates/plan/view.html:358
-#: nutrition/templates/plan/view.html:362 nutrition/views/plan.py:384
+#: nutrition/templates/plan/view.html:53 nutrition/templates/plan/view.html:243
+#: nutrition/templates/plan/view.html:360
+#: nutrition/templates/plan/view.html:364 nutrition/views/plan.py:384
msgid "Energy"
msgstr ""
-#: core/templates/index.html:175 core/templates/user/overview.html:156
+#: core/templates/index.html:165 core/templates/user/overview.html:156
#: nutrition/models/ingredient.py:105
#: nutrition/templates/ingredient/view.html:84
#: nutrition/templates/log/detail.html:52
#: nutrition/templates/log/detail.html:174
-#: nutrition/templates/plan/view.html:54 nutrition/templates/plan/view.html:249
+#: nutrition/templates/plan/view.html:54 nutrition/templates/plan/view.html:251
#: nutrition/views/plan.py:390
msgid "Protein"
msgstr ""
-#: core/templates/index.html:181 core/templates/user/overview.html:157
+#: core/templates/index.html:171 core/templates/user/overview.html:157
#: nutrition/models/ingredient.py:113
#: nutrition/templates/ingredient/view.html:90
#: nutrition/templates/log/detail.html:65
#: nutrition/templates/log/detail.html:175
-#: nutrition/templates/plan/view.html:55 nutrition/templates/plan/view.html:255
+#: nutrition/templates/plan/view.html:55 nutrition/templates/plan/view.html:257
#: nutrition/views/plan.py:398
msgid "Carbohydrates"
msgstr ""
-#: core/templates/index.html:187 core/templates/user/overview.html:158
+#: core/templates/index.html:177 core/templates/user/overview.html:158
#: nutrition/models/ingredient.py:131
#: nutrition/templates/ingredient/view.html:106
#: nutrition/templates/log/detail.html:91
#: nutrition/templates/log/detail.html:176
-#: nutrition/templates/plan/view.html:56 nutrition/templates/plan/view.html:268
+#: nutrition/templates/plan/view.html:56 nutrition/templates/plan/view.html:270
#: nutrition/views/plan.py:412
msgid "Fat"
msgstr ""
-#: core/templates/index.html:199 nutrition/templates/plan/overview.html:22
+#: core/templates/index.html:189 nutrition/templates/plan/overview.html:22
msgid "No nutrition plans."
msgstr ""
-#: core/templates/index.html:213 core/templates/user/overview.html:112
+#: core/templates/index.html:203 core/templates/user/overview.html:112
#: core/templates/user/overview.html:121 manager/forms.py:173
#: manager/helpers.py:89 manager/models/log.py:84 manager/models/setting.py:67
#: manager/templates/log/add.html:54 manager/templates/set/formset.html:12
@@ -741,11 +741,7 @@ msgstr ""
msgid "Weight"
msgstr ""
-#: core/templates/index.html:217
-msgid "Your current weight is: "
-msgstr ""
-
-#: core/templates/index.html:248 core/templates/navigation.html:97
+#: core/templates/index.html:210 core/templates/navigation.html:97
#: weight/views.py:70
msgid "Add weight entry"
msgstr ""
@@ -777,7 +773,7 @@ msgstr ""
msgid "Nothing found"
msgstr ""
-#: core/templates/misc/about.html:4 core/templates/template.html:201
+#: core/templates/misc/about.html:4 core/templates/template.html:175
#: core/templates/template_features.html:118
#: core/templates/template_no_context.html:88
msgid "Imprint"
@@ -793,8 +789,8 @@ msgid ""
msgstr ""
#: core/templates/misc/fragments/shariff_modal.html:22
-#: nutrition/templates/plan/view.html:385
-#: nutrition/templates/plan/view.html:394
+#: nutrition/templates/plan/view.html:387
+#: nutrition/templates/plan/view.html:396
msgid "That's done here"
msgstr ""
@@ -882,7 +878,7 @@ msgstr ""
msgid "Equipment"
msgstr ""
-#: core/templates/navigation.html:78 exercises/templates/exercise/view.html:208
+#: core/templates/navigation.html:78 exercises/templates/exercise/view.html:258
msgid "Muscles"
msgstr "Mușchii"
@@ -955,7 +951,7 @@ msgstr ""
msgid "Get the code"
msgstr ""
-#: core/templates/navigation.html:175 core/templates/template.html:193
+#: core/templates/navigation.html:175 core/templates/template.html:205
#: core/templates/template_features.html:100
msgid "Translate"
msgstr ""
@@ -1106,15 +1102,11 @@ msgstr ""
msgid "Create some demo entries"
msgstr ""
-#: core/templates/template.html:202 core/templates/template_features.html:122
+#: core/templates/template.html:176 core/templates/template_features.html:122
#: core/templates/template_no_context.html:89 software/templates/tos.html:7
msgid "Terms of service"
msgstr ""
-#: core/templates/template.html:209 core/templates/template.html:210
-msgid "Released under the Affero GPL"
-msgstr ""
-
#: core/templates/template_features.html:62 software/templates/features.html:9
#: software/templates/features.html:120
msgid "Features"
@@ -1211,9 +1203,10 @@ msgstr ""
#: core/templates/user/overview.html:120 core/templates/user/overview.html:153
#: exercises/models/exercise.py:77 gallery/models/image.py:47
#: manager/helpers.py:88 manager/models/log.py:98 manager/models/session.py:67
-#: nutrition/models/ingredient.py:85 nutrition/models/ingredient.py:87
-#: nutrition/models/ingredient.py:190 nutrition/templates/log/overview.html:30
-#: nutrition/templates/plan/view.html:307 weight/models.py:32
+#: measurements/models/measurement.py:64 nutrition/models/ingredient.py:85
+#: nutrition/models/ingredient.py:87 nutrition/models/ingredient.py:190
+#: nutrition/templates/log/overview.html:30
+#: nutrition/templates/plan/view.html:309 weight/models.py:32
#: weight/templates/import_csv_preview.html:13
#: weight/templates/import_csv_preview.html:42 weight/views.py:150
msgid "Date"
@@ -1221,10 +1214,10 @@ msgstr "Data"
#: core/templates/user/overview.html:35 core/templates/user/overview.html:154
#: exercises/models/exercise.py:61 exercises/templates/exercise/view.html:88
-#: exercises/views/exercises.py:189 gallery/models/image.py:70
+#: exercises/views/exercises.py:190 gallery/models/image.py:70
#: gym/models/contract.py:57 gym/models/contract.py:107
#: manager/models/day.py:37 manager/models/workout.py:62
-#: nutrition/models/plan.py:69
+#: measurements/models/measurement.py:79 nutrition/models/plan.py:69
msgid "Description"
msgstr "Descriere"
@@ -1385,11 +1378,11 @@ msgstr ""
msgid "Change password"
msgstr ""
-#: core/templatetags/wger_extras.py:217
+#: core/templatetags/wger_extras.py:229
msgid "kg"
msgstr ""
-#: core/templatetags/wger_extras.py:219
+#: core/templatetags/wger_extras.py:231
#: nutrition/templates/ingredient/view.html:86
#: nutrition/templates/ingredient/view.html:92
#: nutrition/templates/ingredient/view.html:99
@@ -1401,28 +1394,28 @@ msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr ""
-#: core/templatetags/wger_extras.py:222
+#: core/templatetags/wger_extras.py:234
msgid "lb"
msgstr ""
-#: core/templatetags/wger_extras.py:224
+#: core/templatetags/wger_extras.py:236
msgctxt "weight unit, i.e. ounces"
msgid "oz"
msgstr ""
#: core/views/languages.py:85 exercises/views/categories.py:121
-#: exercises/views/equipment.py:106 exercises/views/exercises.py:422
+#: exercises/views/equipment.py:106 exercises/views/exercises.py:423
#: exercises/views/images.py:128 exercises/views/muscles.py:118
-#: manager/views/schedule.py:311 manager/views/schedule_step.py:129
-#: manager/views/workout.py:268 manager/views/workout_session.py:141
-#: nutrition/views/ingredient.py:144 nutrition/views/plan.py:120
-#: nutrition/views/unit.py:111
+#: exercises/views/videos.py:129 manager/views/schedule.py:311
+#: manager/views/schedule_step.py:129 manager/views/workout.py:268
+#: manager/views/workout_session.py:141 nutrition/views/ingredient.py:144
+#: nutrition/views/plan.py:120 nutrition/views/unit.py:111
msgid "Successfully deleted"
msgstr ""
#: core/views/languages.py:93 core/views/license.py:103
#: core/views/repetition_units.py:115 core/views/weight_units.py:115
-#: exercises/views/categories.py:127 exercises/views/exercises.py:430
+#: exercises/views/categories.py:127 exercises/views/exercises.py:431
#: exercises/views/muscles.py:125 gallery/views/images.py:121
#: gym/views/admin_notes.py:196 gym/views/document.py:206 gym/views/gym.py:486
#: manager/views/schedule.py:318 manager/views/schedule_step.py:139
@@ -1436,7 +1429,7 @@ msgstr "Ștergere {0}?"
#: core/views/languages.py:111 core/views/license.py:84
#: core/views/repetition_units.py:85 core/views/user.py:456
#: core/views/weight_units.py:85 exercises/views/categories.py:97
-#: exercises/views/equipment.py:83 exercises/views/exercises.py:304
+#: exercises/views/equipment.py:83 exercises/views/exercises.py:305
#: exercises/views/muscles.py:105 gym/views/admin_notes.py:160
#: gym/views/config.py:68 gym/views/contract.py:186
#: gym/views/contract_option.py:123 gym/views/contract_type.py:123
@@ -1523,7 +1516,7 @@ msgstr "Mușchii primari"
#: exercises/models/base.py:64 exercises/templates/equipment/overview.html:71
#: exercises/templates/exercise/overview.html:76
-#: exercises/templates/exercise/view.html:218
+#: exercises/templates/exercise/view.html:268
#: exercises/templates/muscles/overview.html:73
msgid "Secondary muscles"
msgstr "Mușchii secundari"
@@ -1536,8 +1529,9 @@ msgstr ""
msgid "Exercise Categories"
msgstr "Categorii de Exerciții"
-#: exercises/models/comment.py:34 exercises/models/image.py:62
-#: manager/forms.py:165 manager/helpers.py:89 manager/models/log.py:51
+#: exercises/models/comment.py:34 exercises/models/image.py:75
+#: exercises/models/video.py:82 manager/forms.py:165 manager/helpers.py:89
+#: manager/models/log.py:51
msgid "Exercise"
msgstr "Exercițiu"
@@ -1550,43 +1544,67 @@ msgstr "Comentariu despre modul de a face acest exercițiu corect."
msgid "Language"
msgstr "Limba"
-#: exercises/models/exercise.py:233 exercises/views/exercises.py:460
+#: exercises/models/exercise.py:237 exercises/views/exercises.py:461
msgid "Exercise was successfully added to the general database"
msgstr ""
-#: exercises/models/exercise.py:261
+#: exercises/models/exercise.py:265
msgid "New user submitted exercise"
msgstr ""
-#: exercises/models/exercise.py:263
+#: exercises/models/exercise.py:267
#, python-brace-format
msgid "The user {0} submitted a new exercise \"{1}\"."
msgstr ""
-#: exercises/models/image.py:68 gallery/models/image.py:56
+#: exercises/models/image.py:59
+msgid "Line"
+msgstr ""
+
+#: exercises/models/image.py:60
+msgid "3D"
+msgstr ""
+
+#: exercises/models/image.py:61
+msgid "Low-poly"
+msgstr ""
+
+#: exercises/models/image.py:62
+msgid "Photo"
+msgstr ""
+
+#: exercises/models/image.py:63
+msgid "Other"
+msgstr ""
+
+#: exercises/models/image.py:81 gallery/models/image.py:56
msgid "Image"
msgstr ""
-#: exercises/models/image.py:69 gallery/models/image.py:57
+#: exercises/models/image.py:82 gallery/models/image.py:57
msgid "Only PNG and JPEG formats are supported"
msgstr ""
-#: exercises/models/image.py:75
+#: exercises/models/image.py:88
msgid "Main picture"
msgstr ""
-#: exercises/models/image.py:78
+#: exercises/models/image.py:91
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 "
"by the system."
msgstr ""
-#: exercises/models/image.py:166
+#: exercises/models/image.py:100
+msgid "The art style of your image"
+msgstr ""
+
+#: exercises/models/image.py:185
msgid "New user submitted image"
msgstr ""
-#: exercises/models/image.py:167
+#: exercises/models/image.py:186
#, python-brace-format
msgid "The user {0} submitted a new image \"{1}\" for exercise {2}."
msgstr ""
@@ -1595,6 +1613,54 @@ msgstr ""
msgid "In latin, e.g. \"Pectoralis major\""
msgstr ""
+#: exercises/models/video.py:41
+msgid "Maximum file size is 100MB."
+msgstr ""
+
+#: exercises/models/video.py:44 exercises/models/video.py:48
+msgid "File type is not supported"
+msgstr ""
+
+#: exercises/models/video.py:57
+#, fuzzy
+#| msgid "%(birthdate)s is not a valid birthdate"
+msgid "File is not a valid video"
+msgstr "%(birthdate)s nu este o dată de naștere validă"
+
+#: exercises/models/video.py:88
+msgid "Main video"
+msgstr ""
+
+#: exercises/models/video.py:94
+msgid "Video"
+msgstr ""
+
+#: exercises/models/video.py:101
+msgid "Size"
+msgstr ""
+
+#: exercises/models/video.py:108 manager/models/schedule_step.py:56
+msgid "Duration"
+msgstr ""
+
+#: exercises/models/video.py:117
+msgid "Width"
+msgstr ""
+
+#: exercises/models/video.py:124
+#, fuzzy
+#| msgid "Weight log"
+msgid "Height"
+msgstr "Jurnalul de greutate"
+
+#: exercises/models/video.py:131
+msgid "Codec"
+msgstr ""
+
+#: exercises/models/video.py:139
+msgid "Codec, long name"
+msgstr ""
+
#: exercises/templates/equipment/admin-overview.html:4
msgid "Equipment list"
msgstr ""
@@ -1610,7 +1676,7 @@ msgstr ""
#: exercises/templates/equipment/overview.html:69
#: exercises/templates/exercise/overview.html:74
-#: exercises/templates/exercise/view.html:214
+#: exercises/templates/exercise/view.html:264
#: exercises/templates/muscles/overview.html:71
msgid "Main muscles"
msgstr "Mușchii principali"
@@ -1721,7 +1787,8 @@ msgstr "Data depunerii"
#: gym/templates/gym/new_user.html:22
#: gym/templates/gym/reset_user_password.html:20 manager/models/log.py:45
#: manager/models/schedule.py:44 manager/models/session.py:49
-#: manager/models/workout.py:89 nutrition/models/plan.py:55
+#: manager/models/workout.py:89 measurements/models/category.py:48
+#: measurements/models/measurement.py:59 nutrition/models/plan.py:55
#: nutrition/templates/ingredient/pending.html:16 weight/models.py:41
msgid "User"
msgstr "Utilizator"
@@ -1747,13 +1814,13 @@ msgid "Please select one of the options below."
msgstr "Selectați una dintre opțiunile de mai jos."
#: exercises/templates/exercise/view.html:60
-#: exercises/templates/exercise/view.html:153
+#: exercises/templates/exercise/view.html:203
#: nutrition/templates/ingredient/view.html:38
msgid "Accept"
msgstr "Acceptare"
#: exercises/templates/exercise/view.html:64
-#: exercises/templates/exercise/view.html:154
+#: exercises/templates/exercise/view.html:204
#: nutrition/templates/ingredient/view.html:42
msgid "Decline"
msgstr "Declinare"
@@ -1766,32 +1833,42 @@ msgstr ""
msgid "Add new image"
msgstr ""
-#: exercises/templates/exercise/view.html:147
+#: exercises/templates/exercise/view.html:148
+msgid "Videos"
+msgstr ""
+
+#: exercises/templates/exercise/view.html:187 exercises/views/videos.py:94
+#, fuzzy
+#| msgid "Add new exercise"
+msgid "Add new video"
+msgstr "Adăugați un exercițiu nou"
+
+#: exercises/templates/exercise/view.html:197
msgid "Images pending review"
msgstr ""
-#: exercises/templates/exercise/view.html:168
+#: exercises/templates/exercise/view.html:218
msgid "Comments for this exercise"
msgstr "Comentarii pentru acest exercițiu"
-#: exercises/templates/exercise/view.html:196
+#: exercises/templates/exercise/view.html:246
msgid "Add new comment"
msgstr "Adaugați un comentariu"
-#: exercises/templates/exercise/view.html:210
+#: exercises/templates/exercise/view.html:260
msgid "The diagram shows the most used muscles on this exercise"
msgstr "Diagrama arată cele mai utilizate mușchi la acest exercițiu"
-#: exercises/templates/exercise/view.html:251
+#: exercises/templates/exercise/view.html:301
#: manager/templates/workout/log.html:10 manager/templates/workout/log.html:11
msgid "Weight log"
msgstr "Jurnalul de greutate"
-#: exercises/templates/exercise/view.html:256
+#: exercises/templates/exercise/view.html:306
msgid "Exercise Variations"
msgstr ""
-#: exercises/templates/exercise/view.html:277
+#: exercises/templates/exercise/view.html:327
msgid "Submit a correction"
msgstr ""
@@ -1826,30 +1903,30 @@ msgstr ""
msgid "Delete equipment?"
msgstr ""
-#: exercises/views/exercises.py:228
+#: exercises/views/exercises.py:229
#, python-format
msgid ""
"%(name_original)s is too similar to existing exercise \"%(exercise_name)s\""
msgstr ""
-#: exercises/views/exercises.py:246
+#: exercises/views/exercises.py:247
msgid "Add exercise"
msgstr ""
-#: exercises/views/exercises.py:366
+#: exercises/views/exercises.py:367
msgid "Thank you. Once the changes are reviewed the exercise will be updated."
msgstr ""
-#: exercises/views/exercises.py:379
+#: exercises/views/exercises.py:380
#, python-brace-format
msgid "Correct {0}"
msgstr ""
-#: exercises/views/exercises.py:421
+#: exercises/views/exercises.py:422
msgid "This will delete the exercise from all workouts."
msgstr ""
-#: exercises/views/exercises.py:473
+#: exercises/views/exercises.py:474
msgid "Exercise was successfully marked as rejected"
msgstr ""
@@ -1861,6 +1938,11 @@ msgstr ""
msgid "Delete exercise image?"
msgstr ""
+#: exercises/views/videos.py:144 nutrition/views/log.py:230
+#: nutrition/views/unit_ingredient.py:139
+msgid "Delete?"
+msgstr ""
+
#: gallery/templates/images/overview.html:62
#, fuzzy
#| msgid "Add muscle"
@@ -1929,8 +2011,8 @@ msgid "Contract type"
msgstr ""
#: gym/models/contract.py:208 gym/templates/contract/view.html:59
-#: manager/templates/log/add.html:52 nutrition/forms.py:58
-#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:92
+#: manager/templates/log/add.html:52 nutrition/forms.py:59
+#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:102
#: nutrition/models/meal_item.py:72
msgid "Amount"
msgstr ""
@@ -2363,6 +2445,7 @@ msgid ""
msgstr ""
#: mailer/templates/mailer/gym/preview.html:22
+#: software/templates/about_us.html:59
msgid "Current version"
msgstr ""
@@ -2395,7 +2478,8 @@ msgstr ""
#: manager/models/log.py:90 manager/models/setting.py:47
#: manager/models/setting.py:78 manager/templates/log/add.html:53
#: manager/templates/log/add.html:55 manager/templates/set/formset.html:11
-#: manager/templates/set/formset.html:13 nutrition/forms.py:62
+#: manager/templates/set/formset.html:13 measurements/models/category.py:58
+#: nutrition/forms.py:63
msgid "Unit"
msgstr ""
@@ -2458,10 +2542,6 @@ msgstr ""
msgid "schedule"
msgstr ""
-#: manager/models/schedule_step.py:56
-msgid "Duration"
-msgstr ""
-
#: manager/models/schedule_step.py:57
msgid "The duration in weeks"
msgstr ""
@@ -2719,7 +2799,7 @@ msgstr ""
#: manager/templates/schedule/view.html:290
#: manager/templates/workout/view.html:142
#: manager/templates/workout/view.html:217
-#: nutrition/templates/plan/view.html:415
+#: nutrition/templates/plan/view.html:417
msgid "Download as PDF"
msgstr ""
@@ -2936,30 +3016,34 @@ msgstr ""
msgid "This will delete all weight logs for this day as well."
msgstr ""
-#: nutrition/forms.py:121
+#: measurements/models/measurement.py:69
+msgid "Value"
+msgstr ""
+
+#: nutrition/forms.py:122
msgid "Calculate"
msgstr ""
-#: nutrition/forms.py:194 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:195 nutrition/templates/rate/form.html:76
msgid "Basic caloric intake"
msgstr ""
-#: nutrition/forms.py:195
+#: nutrition/forms.py:196
msgid "Your basic caloric intake as calculated for your data"
msgstr ""
-#: nutrition/forms.py:201
+#: nutrition/forms.py:202
msgid "Additional calories"
msgstr ""
-#: nutrition/forms.py:203
+#: nutrition/forms.py:204
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
msgstr ""
-#: nutrition/forms.py:231 nutrition/models/ingredient_weight_unit.py:39
-#: nutrition/models/log.py:71 nutrition/models/meal_item.py:53
+#: nutrition/forms.py:232 nutrition/models/ingredient_weight_unit.py:39
+#: nutrition/models/log.py:81 nutrition/models/meal_item.py:53
#: nutrition/templates/log/detail.html:155
msgid "Ingredient"
msgstr ""
@@ -2978,14 +3062,14 @@ msgstr ""
#: nutrition/models/ingredient.py:123
#: nutrition/templates/ingredient/view.html:96
#: nutrition/templates/log/detail.html:78
-#: nutrition/templates/plan/view.html:262 nutrition/views/plan.py:406
+#: nutrition/templates/plan/view.html:264 nutrition/views/plan.py:406
msgid "Sugar content in carbohydrates"
msgstr ""
#: nutrition/models/ingredient.py:141
#: nutrition/templates/ingredient/view.html:112
#: nutrition/templates/log/detail.html:104
-#: nutrition/templates/plan/view.html:274 nutrition/views/plan.py:420
+#: nutrition/templates/plan/view.html:276 nutrition/views/plan.py:420
msgid "Saturated fat content in fats"
msgstr ""
@@ -2993,7 +3077,7 @@ msgstr ""
#: nutrition/templates/ingredient/view.html:134
#: nutrition/templates/log/detail.html:122
#: nutrition/templates/log/detail.html:178
-#: nutrition/templates/plan/view.html:285 nutrition/views/plan.py:426
+#: nutrition/templates/plan/view.html:287 nutrition/views/plan.py:426
msgid "Fibres"
msgstr ""
@@ -3001,7 +3085,7 @@ msgstr ""
#: nutrition/templates/ingredient/view.html:144
#: nutrition/templates/log/detail.html:135
#: nutrition/templates/log/detail.html:181
-#: nutrition/templates/plan/view.html:291 nutrition/views/plan.py:432
+#: nutrition/templates/plan/view.html:293 nutrition/views/plan.py:432
msgid "Sodium"
msgstr ""
@@ -3046,10 +3130,20 @@ msgstr ""
msgid "Unit amount, e.g. \"1 Cup\" or \"1/2 spoon\""
msgstr ""
+#: nutrition/models/log.py:55
+msgid "Meal"
+msgstr ""
+
#: nutrition/models/meal.py:61
msgid "Time (approx)"
msgstr ""
+#: nutrition/models/meal.py:68
+msgid ""
+"Give meals a textual description / name such as \"Breakfast\" or \"after "
+"workout\""
+msgstr ""
+
#: nutrition/models/plan.py:71
msgid ""
"A description of the goal of the plan, e.g. \"Gain mass\" or \"Prepare for "
@@ -3183,12 +3277,12 @@ msgstr ""
#: nutrition/templates/ingredient/view.html:71
#: nutrition/templates/log/detail.html:31
-#: nutrition/templates/plan/view.html:227 nutrition/views/plan.py:376
+#: nutrition/templates/plan/view.html:229 nutrition/views/plan.py:376
msgid "Macronutrients"
msgstr ""
#: nutrition/templates/ingredient/view.html:80
-#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:244
+#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:246
msgid "kJ"
msgstr ""
@@ -3201,7 +3295,7 @@ msgstr ""
#: nutrition/templates/ingredient/view.html:128
#: nutrition/templates/log/detail.html:119
-#: nutrition/templates/plan/view.html:282
+#: nutrition/templates/plan/view.html:284
msgid "Others"
msgstr ""
@@ -3230,7 +3324,7 @@ msgstr ""
#: nutrition/templates/log/detail.html:7
#: nutrition/templates/log/overview.html:7
-#: nutrition/templates/plan/view.html:300
+#: nutrition/templates/plan/view.html:302
msgid "Nutrition diary"
msgstr ""
@@ -3240,13 +3334,13 @@ msgstr ""
#: nutrition/templates/log/detail.html:33
#: nutrition/templates/log/overview.html:31
-#: nutrition/templates/plan/view.html:308
+#: nutrition/templates/plan/view.html:310
msgid "Logged"
msgstr ""
#: nutrition/templates/log/detail.html:34
#: nutrition/templates/log/overview.html:32
-#: nutrition/templates/plan/view.html:309
+#: nutrition/templates/plan/view.html:311
msgid "Difference"
msgstr ""
@@ -3259,7 +3353,7 @@ msgid "g"
msgstr ""
#: nutrition/templates/log/overview.html:53
-#: nutrition/templates/plan/view.html:330
+#: nutrition/templates/plan/view.html:332
msgid "nothing found"
msgstr ""
@@ -3279,77 +3373,77 @@ msgstr ""
msgid "Add ingredient to meal"
msgstr ""
-#: nutrition/templates/plan/view.html:150
+#: nutrition/templates/plan/view.html:152
msgid "No items for this meal."
msgstr ""
-#: nutrition/templates/plan/view.html:188
+#: nutrition/templates/plan/view.html:190
msgid "No meals for this plan."
msgstr ""
-#: nutrition/templates/plan/view.html:200
+#: nutrition/templates/plan/view.html:202
msgid "Log this Plan"
msgstr ""
-#: nutrition/templates/plan/view.html:206
+#: nutrition/templates/plan/view.html:208
msgid "Add a new meal"
msgstr ""
-#: nutrition/templates/plan/view.html:216 nutrition/views/plan.py:369
+#: nutrition/templates/plan/view.html:218 nutrition/views/plan.py:369
msgid "Nutritional data"
msgstr ""
-#: nutrition/templates/plan/view.html:219
+#: nutrition/templates/plan/view.html:221
#, python-format
msgid "Based on the weight entry dated %(date)s (%(weight)s)"
msgstr ""
-#: nutrition/templates/plan/view.html:228 nutrition/views/plan.py:377
+#: nutrition/templates/plan/view.html:230 nutrition/views/plan.py:377
msgid "Total"
msgstr ""
-#: nutrition/templates/plan/view.html:229 nutrition/views/plan.py:378
+#: nutrition/templates/plan/view.html:231 nutrition/views/plan.py:378
msgid "Percent of energy"
msgstr ""
-#: nutrition/templates/plan/view.html:232 nutrition/views/plan.py:379
+#: nutrition/templates/plan/view.html:234 nutrition/views/plan.py:379
msgid "g per body kg"
msgstr ""
-#: nutrition/templates/plan/view.html:234
+#: nutrition/templates/plan/view.html:236
msgid "oz per body lb"
msgstr ""
-#: nutrition/templates/plan/view.html:338
+#: nutrition/templates/plan/view.html:340
msgid "View complete nutrition log"
msgstr ""
-#: nutrition/templates/plan/view.html:371
+#: nutrition/templates/plan/view.html:373
msgid "Goal"
msgstr ""
-#: nutrition/templates/plan/view.html:382
+#: nutrition/templates/plan/view.html:384
msgid ""
"You have selected that this nutritional plan has a\n"
" goal amount of calories. Use the calculator or enter the value\n"
" yourself."
msgstr ""
-#: nutrition/templates/plan/view.html:392
+#: nutrition/templates/plan/view.html:394
msgid ""
"If you find the ingredient list too short, you might want to activate the "
"preference to also show English ingredients."
msgstr ""
-#: nutrition/templates/plan/view.html:421
+#: nutrition/templates/plan/view.html:423
msgid "Edit nutrition plan"
msgstr ""
-#: nutrition/templates/plan/view.html:425
+#: nutrition/templates/plan/view.html:427
msgid "Make a copy of this nutrition plan"
msgstr ""
-#: nutrition/templates/plan/view.html:431
+#: nutrition/templates/plan/view.html:433
msgid "Delete nutrition plan"
msgstr ""
@@ -3429,10 +3523,6 @@ msgstr ""
msgid "Ingredient was successfully marked as rejected"
msgstr ""
-#: nutrition/views/log.py:229 nutrition/views/unit_ingredient.py:139
-msgid "Delete?"
-msgstr ""
-
#: nutrition/views/meal.py:55
msgid "Add new meal"
msgstr ""
@@ -3790,11 +3880,11 @@ msgstr ""
msgid "Re-Submit"
msgstr "Retrimiteți"
-#: weight/templates/overview.html:68
+#: weight/templates/overview.html:51
msgid "Export as CSV"
msgstr "Exportați ca CSV"
-#: weight/templates/overview.html:72
+#: weight/templates/overview.html:55
msgid "Import from spreadsheet"
msgstr "Importați din foaie de calcul"
diff --git a/wger/locale/ru/LC_MESSAGES/django.po b/wger/locale/ru/LC_MESSAGES/django.po
index d5848279f..e384df0c3 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: 2021-08-17 17:23+0200\n"
+"POT-Creation-Date: 2022-02-15 14:51+0100\n"
"PO-Revision-Date: 2022-02-15 09:56+0000\n"
"Last-Translator: Nikita Epifanov <[email protected]>\n"
"Language-Team: Russian <https://hosted.weblate.org/projects/wger/web/ru/>\n"
@@ -58,16 +58,16 @@ msgstr "Языки"
msgid "Nothing found."
msgstr "Ничего не найдено"
-#: config/templates/language/overview.html:16 core/templates/index.html:147
-#: core/templates/index.html:199 manager/templates/calendar/month.html:132
+#: config/templates/language/overview.html:16 core/templates/index.html:137
+#: core/templates/index.html:189 manager/templates/calendar/month.html:132
#: manager/templates/schedule/overview.html:28
#: manager/templates/schedule/view.html:146
#: manager/templates/workout/overview.html:28
#: nutrition/templates/ingredient/overview.html:45
#: nutrition/templates/plan/overview.html:23
-#: nutrition/templates/plan/view.html:148
-#: nutrition/templates/plan/view.html:151
-#: nutrition/templates/plan/view.html:189
+#: nutrition/templates/plan/view.html:150
+#: nutrition/templates/plan/view.html:153
+#: nutrition/templates/plan/view.html:191
msgid "Add one now."
msgstr "Добавить одну сейчас."
@@ -88,7 +88,7 @@ msgstr "Добавить одну сейчас."
#: gym/templates/gym/member_list.html:244
#: gym/templates/gym/member_list.html:281
#: mailer/templates/mailer/gym/overview.html:43
-#: weight/templates/overview.html:78
+#: weight/templates/overview.html:61
msgid "Add"
msgstr "Добавить"
@@ -126,14 +126,14 @@ msgstr "Показать"
#: config/templates/language/view.html:91 core/templates/user/api_key.html:44
#: core/templates/user/preferences.html:28
-#: exercises/templates/exercise/view.html:273
-#: exercises/templates/exercise/view.html:296 gym/models/contract.py:200
+#: exercises/templates/exercise/view.html:323
+#: exercises/templates/exercise/view.html:346 gym/models/contract.py:200
#: gym/templates/contract/view.html:41 gym/templates/contract/view.html:106
#: gym/templates/gym/member_list.html:248
#: manager/templates/schedule/view.html:281
#: manager/templates/workout/view.html:206
#: nutrition/templates/ingredient/view.html:226
-#: nutrition/templates/plan/view.html:409 weight/templates/overview.html:62
+#: nutrition/templates/plan/view.html:411 weight/templates/overview.html:45
msgid "Options"
msgstr "Опции"
@@ -147,12 +147,12 @@ msgstr "Опции"
#: core/templates/weight_unit/list.html:17
#: exercises/templates/categories/admin-overview.html:16
#: exercises/templates/equipment/admin-overview.html:16
-#: exercises/templates/exercise/view.html:180
-#: exercises/templates/exercise/view.html:301
+#: exercises/templates/exercise/view.html:230
+#: exercises/templates/exercise/view.html:351
#: exercises/templates/muscles/admin-overview.html:16
-#: exercises/views/comments.py:63 gallery/views/images.py:96
-#: gym/templates/admin_notes/list.html:32 gym/templates/contract/list.html:31
-#: gym/templates/contract/view.html:107
+#: exercises/views/comments.py:63 exercises/views/videos.py:69
+#: gallery/views/images.py:96 gym/templates/admin_notes/list.html:32
+#: gym/templates/contract/list.html:31 gym/templates/contract/view.html:107
#: gym/templates/contract_option/list.html:31
#: gym/templates/contract_type/list.html:31 gym/templates/document/list.html:38
#: gym/templates/gym/list.html:19 gym/templates/gym/list.html:43
@@ -163,7 +163,7 @@ msgstr "Опции"
#: manager/templates/calendar/partial_overview_table.html:18
#: manager/templates/schedule/view.html:121
#: nutrition/templates/ingredient/view.html:198
-#: nutrition/templates/plan/view.html:89 nutrition/templates/plan/view.html:124
+#: nutrition/templates/plan/view.html:89 nutrition/templates/plan/view.html:126
#: nutrition/templates/units/list.html:18
msgid "Edit"
msgstr "Редактировать"
@@ -177,9 +177,9 @@ msgstr "Редактировать"
#: exercises/templates/categories/admin-overview.html:17
#: exercises/templates/equipment/admin-overview.html:17
#: exercises/templates/exercise/view.html:68
-#: exercises/templates/exercise/view.html:155
-#: exercises/templates/exercise/view.html:185
-#: exercises/templates/exercise/view.html:306
+#: exercises/templates/exercise/view.html:205
+#: exercises/templates/exercise/view.html:235
+#: exercises/templates/exercise/view.html:356
#: exercises/templates/muscles/admin-overview.html:17
#: gym/templates/admin_notes/list.html:40
#: gym/templates/contract_option/list.html:39
@@ -192,7 +192,7 @@ msgstr "Редактировать"
#: nutrition/templates/ingredient/view.html:199
#: nutrition/templates/ingredient/view.html:239
#: nutrition/templates/log/detail.html:197
-#: nutrition/templates/plan/view.html:95 nutrition/templates/plan/view.html:130
+#: nutrition/templates/plan/view.html:95 nutrition/templates/plan/view.html:132
#: nutrition/templates/units/list.html:20
msgid "Delete"
msgstr "Удалить"
@@ -318,7 +318,7 @@ msgid "Some way of answering you (e-mail, etc.)"
msgstr "Обратная связь с вами (электронная почта, и т.д.)"
#: core/forms.py:265 exercises/models/comment.py:40 manager/models/set.py:60
-#: manager/models/setting.py:99 nutrition/models/log.py:61
+#: manager/models/setting.py:99 nutrition/models/log.py:71
msgid "Comment"
msgstr "Комментарий"
@@ -464,7 +464,7 @@ msgstr ""
msgid "Age"
msgstr "Возраст"
-#: core/models/profile.py:202 nutrition/forms.py:98
+#: core/models/profile.py:202 nutrition/forms.py:99
msgid "Height (cm)"
msgstr "Рост (см)"
@@ -515,7 +515,7 @@ msgid "Total caloric intake, including e.g. any surplus"
msgstr "Общее потребление калорий, в том числе, любой излишек"
#: core/models/profile.py:305 nutrition/models/ingredient_weight_unit.py:45
-#: nutrition/models/log.py:80 nutrition/models/meal_item.py:58
+#: nutrition/models/log.py:90 nutrition/models/meal_item.py:58
msgid "Weight unit"
msgstr "Единица веса"
@@ -553,9 +553,9 @@ msgstr "Сумма всех часов должна быть 24"
#: gym/models/user_document.py:87 gym/templates/contract/view.html:50
#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:96
#: gym/views/gym.py:156 manager/models/schedule.py:55
-#: manager/models/workout.py:56 nutrition/models/ingredient.py:96
-#: nutrition/models/ingredient_category.py:26
-#: nutrition/models/weight_unit.py:38
+#: manager/models/workout.py:56 measurements/models/category.py:53
+#: nutrition/models/ingredient.py:96 nutrition/models/ingredient_category.py:26
+#: nutrition/models/meal.py:66 nutrition/models/weight_unit.py:38
#: nutrition/templates/ingredient/pending.html:15
#: nutrition/templates/ingredient/view.html:185
msgid "Name"
@@ -615,11 +615,11 @@ msgstr "Вы уверены что хотите это удалить? Это д
msgid "Dashboard"
msgstr "Панель управления"
-#: core/templates/index.html:31 manager/templates/calendar/month.html:115
+#: core/templates/index.html:21 manager/templates/calendar/month.html:115
msgid "Add log to day"
msgstr "Добавить журнал к дню"
-#: core/templates/index.html:35 manager/templates/calendar/month.html:120
+#: core/templates/index.html:25 manager/templates/calendar/month.html:120
msgid ""
"Click to add weight logs to a training\n"
"day in your current workout:"
@@ -627,7 +627,7 @@ msgstr ""
"Нажмите, чтобы добавить записи в журнале весов на этот тренировочный день "
"для текущей тренировке:"
-#: core/templates/index.html:43 core/templates/index.html:83
+#: core/templates/index.html:33 core/templates/index.html:73
#: core/templates/misc/fragments/shariff_modal.html:29
#: core/templates/template.html:125 manager/templates/calendar/month.html:138
#: manager/templates/schedule/view.html:246
@@ -637,11 +637,11 @@ msgstr ""
msgid "Close"
msgstr "Закрыть"
-#: core/templates/index.html:54 core/templates/index.html:203
+#: core/templates/index.html:44 core/templates/index.html:193
msgid "Add new diary entry"
msgstr "Добавить новую запись в дневник"
-#: core/templates/index.html:59
+#: core/templates/index.html:49
msgid ""
"Click to add an entry to your nutrition diary for today. You can either log "
"a meal as you defined it, or entry any number of custom entries."
@@ -650,7 +650,7 @@ msgstr ""
"записать прием пищи в том виде, в котором вы его определили, либо ввести "
"любое количество пользовательских записей."
-#: core/templates/index.html:67 core/templates/index.html:171
+#: core/templates/index.html:57 core/templates/index.html:161
#: core/templates/user/overview.html:171
#: nutrition/templates/ingredient/view.html:79
#: nutrition/templates/log/detail.html:40
@@ -659,19 +659,19 @@ msgstr ""
#: nutrition/templates/log/overview.html:7
#: nutrition/templates/log/overview.html:44
#: nutrition/templates/plan/overview.html:17
-#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:242
-#: nutrition/templates/plan/view.html:301
-#: nutrition/templates/plan/view.html:321
-#: nutrition/templates/plan/view.html:363
-#: nutrition/templates/plan/view.html:373
+#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:244
+#: nutrition/templates/plan/view.html:303
+#: nutrition/templates/plan/view.html:323
+#: nutrition/templates/plan/view.html:365
+#: nutrition/templates/plan/view.html:375
msgid "kcal"
msgstr "ккал"
-#: core/templates/index.html:79 nutrition/templates/plan/view.html:348
+#: core/templates/index.html:69 nutrition/templates/plan/view.html:350
msgid "Add custom diary entry"
msgstr "Добавить пользовательскую запись в дневник"
-#: core/templates/index.html:94 core/templates/index.html:102
+#: core/templates/index.html:84 core/templates/index.html:92
#: manager/models/day.py:34 manager/models/log.py:56
#: manager/models/session.py:60 manager/models/workout.py:109
#: manager/templates/schedule/view.html:105
@@ -682,11 +682,11 @@ msgstr "Добавить пользовательскую запись в дне
msgid "Workout"
msgstr "Тренировка"
-#: core/templates/index.html:128
+#: core/templates/index.html:118
msgid "This workout is part of a schedule:"
msgstr "Эта тренировка - часть программы:"
-#: core/templates/index.html:133
+#: core/templates/index.html:123
msgid ""
"The current workout is selected from your active schedule or, if you don't "
"have one, simply by date."
@@ -694,70 +694,70 @@ msgstr ""
"Текущая тренировка выбирается из вашего активного расписания или, если у вас "
"его нет, просто по дате."
-#: core/templates/index.html:142 manager/templates/calendar/month.html:188
+#: core/templates/index.html:132 manager/templates/calendar/month.html:188
msgid "Add new log"
msgstr "Добавить новый журнал"
-#: core/templates/index.html:147 core/templates/user/overview.html:58
+#: core/templates/index.html:137 core/templates/user/overview.html:58
#: manager/templates/calendar/month.html:128
#: manager/templates/schedule/view.html:146
#: manager/templates/workout/overview.html:28
msgid "No workouts found."
msgstr "Тренировок не найдено."
-#: core/templates/index.html:157 nutrition/models/log.py:48
+#: core/templates/index.html:147 nutrition/models/log.py:49
#: nutrition/models/meal.py:49 nutrition/models/meal_item.py:47
#: nutrition/models/plan.py:94 nutrition/templates/plan/view.html:11
#: nutrition/templates/plan/view.html:19
msgid "Nutrition plan"
msgstr "Программа питания"
-#: core/templates/index.html:169 core/templates/user/overview.html:155
+#: core/templates/index.html:159 core/templates/user/overview.html:155
#: nutrition/models/ingredient.py:100
#: nutrition/templates/ingredient/view.html:77
#: nutrition/templates/log/detail.html:39
#: nutrition/templates/log/detail.html:156
-#: nutrition/templates/plan/view.html:53 nutrition/templates/plan/view.html:241
-#: nutrition/templates/plan/view.html:358
-#: nutrition/templates/plan/view.html:362 nutrition/views/plan.py:384
+#: nutrition/templates/plan/view.html:53 nutrition/templates/plan/view.html:243
+#: nutrition/templates/plan/view.html:360
+#: nutrition/templates/plan/view.html:364 nutrition/views/plan.py:384
msgid "Energy"
msgstr "Энергия"
-#: core/templates/index.html:175 core/templates/user/overview.html:156
+#: core/templates/index.html:165 core/templates/user/overview.html:156
#: nutrition/models/ingredient.py:105
#: nutrition/templates/ingredient/view.html:84
#: nutrition/templates/log/detail.html:52
#: nutrition/templates/log/detail.html:174
-#: nutrition/templates/plan/view.html:54 nutrition/templates/plan/view.html:249
+#: nutrition/templates/plan/view.html:54 nutrition/templates/plan/view.html:251
#: nutrition/views/plan.py:390
msgid "Protein"
msgstr "Белки"
-#: core/templates/index.html:181 core/templates/user/overview.html:157
+#: core/templates/index.html:171 core/templates/user/overview.html:157
#: nutrition/models/ingredient.py:113
#: nutrition/templates/ingredient/view.html:90
#: nutrition/templates/log/detail.html:65
#: nutrition/templates/log/detail.html:175
-#: nutrition/templates/plan/view.html:55 nutrition/templates/plan/view.html:255
+#: nutrition/templates/plan/view.html:55 nutrition/templates/plan/view.html:257
#: nutrition/views/plan.py:398
msgid "Carbohydrates"
msgstr "Углеводы"
-#: core/templates/index.html:187 core/templates/user/overview.html:158
+#: core/templates/index.html:177 core/templates/user/overview.html:158
#: nutrition/models/ingredient.py:131
#: nutrition/templates/ingredient/view.html:106
#: nutrition/templates/log/detail.html:91
#: nutrition/templates/log/detail.html:176
-#: nutrition/templates/plan/view.html:56 nutrition/templates/plan/view.html:268
+#: nutrition/templates/plan/view.html:56 nutrition/templates/plan/view.html:270
#: nutrition/views/plan.py:412
msgid "Fat"
msgstr "Жиры"
-#: core/templates/index.html:199 nutrition/templates/plan/overview.html:22
+#: core/templates/index.html:189 nutrition/templates/plan/overview.html:22
msgid "No nutrition plans."
msgstr "Программ питания нет."
-#: core/templates/index.html:213 core/templates/user/overview.html:112
+#: core/templates/index.html:203 core/templates/user/overview.html:112
#: core/templates/user/overview.html:121 manager/forms.py:173
#: manager/helpers.py:89 manager/models/log.py:84 manager/models/setting.py:67
#: manager/templates/log/add.html:54 manager/templates/set/formset.html:12
@@ -766,11 +766,7 @@ msgstr "Программ питания нет."
msgid "Weight"
msgstr "Вес"
-#: core/templates/index.html:217
-msgid "Your current weight is: "
-msgstr "Ваш вес на данный момент:"
-
-#: core/templates/index.html:248 core/templates/navigation.html:97
+#: core/templates/index.html:210 core/templates/navigation.html:97
#: weight/views.py:70
msgid "Add weight entry"
msgstr "Добавить запись веса"
@@ -802,7 +798,7 @@ msgstr "Список лицензий"
msgid "Nothing found"
msgstr "Ничего не найдено"
-#: core/templates/misc/about.html:4 core/templates/template.html:201
+#: core/templates/misc/about.html:4 core/templates/template.html:175
#: core/templates/template_features.html:118
#: core/templates/template_no_context.html:88
msgid "Imprint"
@@ -819,8 +815,8 @@ msgstr ""
"Для публикации ссылок в социальных сетях необходимо разрешить внешний доступ."
#: core/templates/misc/fragments/shariff_modal.html:22
-#: nutrition/templates/plan/view.html:385
-#: nutrition/templates/plan/view.html:394
+#: nutrition/templates/plan/view.html:387
+#: nutrition/templates/plan/view.html:396
msgid "That's done here"
msgstr "Это можно сделать тут"
@@ -908,7 +904,7 @@ msgstr "Упражнения ожидающие рассмотрения"
msgid "Equipment"
msgstr "Спортивное оборудование"
-#: core/templates/navigation.html:78 exercises/templates/exercise/view.html:208
+#: core/templates/navigation.html:78 exercises/templates/exercise/view.html:258
msgid "Muscles"
msgstr "Мышцы"
@@ -981,7 +977,7 @@ msgstr "Документация для разработчиков"
msgid "Get the code"
msgstr "Получить код"
-#: core/templates/navigation.html:175 core/templates/template.html:193
+#: core/templates/navigation.html:175 core/templates/template.html:205
#: core/templates/template_features.html:100
msgid "Translate"
msgstr "Перевести"
@@ -1137,15 +1133,11 @@ msgstr ""
msgid "Create some demo entries"
msgstr "Создайте демо-записи"
-#: core/templates/template.html:202 core/templates/template_features.html:122
+#: core/templates/template.html:176 core/templates/template_features.html:122
#: core/templates/template_no_context.html:89 software/templates/tos.html:7
msgid "Terms of service"
msgstr "Условия обслуживания"
-#: core/templates/template.html:209 core/templates/template.html:210
-msgid "Released under the Affero GPL"
-msgstr "Выпущено под Affero GPL"
-
#: core/templates/template_features.html:62 software/templates/features.html:9
#: software/templates/features.html:120
msgid "Features"
@@ -1253,9 +1245,10 @@ msgstr "Добавить тренировку"
#: core/templates/user/overview.html:120 core/templates/user/overview.html:153
#: exercises/models/exercise.py:77 gallery/models/image.py:47
#: manager/helpers.py:88 manager/models/log.py:98 manager/models/session.py:67
-#: nutrition/models/ingredient.py:85 nutrition/models/ingredient.py:87
-#: nutrition/models/ingredient.py:190 nutrition/templates/log/overview.html:30
-#: nutrition/templates/plan/view.html:307 weight/models.py:32
+#: measurements/models/measurement.py:64 nutrition/models/ingredient.py:85
+#: nutrition/models/ingredient.py:87 nutrition/models/ingredient.py:190
+#: nutrition/templates/log/overview.html:30
+#: nutrition/templates/plan/view.html:309 weight/models.py:32
#: weight/templates/import_csv_preview.html:13
#: weight/templates/import_csv_preview.html:42 weight/views.py:150
msgid "Date"
@@ -1263,10 +1256,10 @@ msgstr "Дата"
#: core/templates/user/overview.html:35 core/templates/user/overview.html:154
#: exercises/models/exercise.py:61 exercises/templates/exercise/view.html:88
-#: exercises/views/exercises.py:189 gallery/models/image.py:70
+#: exercises/views/exercises.py:190 gallery/models/image.py:70
#: gym/models/contract.py:57 gym/models/contract.py:107
#: manager/models/day.py:37 manager/models/workout.py:62
-#: nutrition/models/plan.py:69
+#: measurements/models/measurement.py:79 nutrition/models/plan.py:69
msgid "Description"
msgstr "Описание"
@@ -1427,11 +1420,11 @@ msgstr "Настройки"
msgid "Change password"
msgstr "Изменить"
-#: core/templatetags/wger_extras.py:217
+#: core/templatetags/wger_extras.py:229
msgid "kg"
msgstr "кг"
-#: core/templatetags/wger_extras.py:219
+#: core/templatetags/wger_extras.py:231
#: nutrition/templates/ingredient/view.html:86
#: nutrition/templates/ingredient/view.html:92
#: nutrition/templates/ingredient/view.html:99
@@ -1443,28 +1436,28 @@ msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr "г"
-#: core/templatetags/wger_extras.py:222
+#: core/templatetags/wger_extras.py:234
msgid "lb"
msgstr "lb"
-#: core/templatetags/wger_extras.py:224
+#: core/templatetags/wger_extras.py:236
msgctxt "weight unit, i.e. ounces"
msgid "oz"
msgstr "oz"
#: core/views/languages.py:85 exercises/views/categories.py:121
-#: exercises/views/equipment.py:106 exercises/views/exercises.py:422
+#: exercises/views/equipment.py:106 exercises/views/exercises.py:423
#: exercises/views/images.py:128 exercises/views/muscles.py:118
-#: manager/views/schedule.py:311 manager/views/schedule_step.py:129
-#: manager/views/workout.py:268 manager/views/workout_session.py:141
-#: nutrition/views/ingredient.py:144 nutrition/views/plan.py:120
-#: nutrition/views/unit.py:111
+#: exercises/views/videos.py:129 manager/views/schedule.py:311
+#: manager/views/schedule_step.py:129 manager/views/workout.py:268
+#: manager/views/workout_session.py:141 nutrition/views/ingredient.py:144
+#: nutrition/views/plan.py:120 nutrition/views/unit.py:111
msgid "Successfully deleted"
msgstr "Успешно удалено"
#: core/views/languages.py:93 core/views/license.py:103
#: core/views/repetition_units.py:115 core/views/weight_units.py:115
-#: exercises/views/categories.py:127 exercises/views/exercises.py:430
+#: exercises/views/categories.py:127 exercises/views/exercises.py:431
#: exercises/views/muscles.py:125 gallery/views/images.py:121
#: gym/views/admin_notes.py:196 gym/views/document.py:206 gym/views/gym.py:486
#: manager/views/schedule.py:318 manager/views/schedule_step.py:139
@@ -1478,7 +1471,7 @@ msgstr "Удалить {0}?"
#: core/views/languages.py:111 core/views/license.py:84
#: core/views/repetition_units.py:85 core/views/user.py:456
#: core/views/weight_units.py:85 exercises/views/categories.py:97
-#: exercises/views/equipment.py:83 exercises/views/exercises.py:304
+#: exercises/views/equipment.py:83 exercises/views/exercises.py:305
#: exercises/views/muscles.py:105 gym/views/admin_notes.py:160
#: gym/views/config.py:68 gym/views/contract.py:186
#: gym/views/contract_option.py:123 gym/views/contract_type.py:123
@@ -1568,7 +1561,7 @@ msgstr "Основные мышцы"
#: exercises/models/base.py:64 exercises/templates/equipment/overview.html:71
#: exercises/templates/exercise/overview.html:76
-#: exercises/templates/exercise/view.html:218
+#: exercises/templates/exercise/view.html:268
#: exercises/templates/muscles/overview.html:73
msgid "Secondary muscles"
msgstr "Второстепенные мышцы"
@@ -1581,8 +1574,9 @@ msgstr "Вариации"
msgid "Exercise Categories"
msgstr "Категории упражнений"
-#: exercises/models/comment.py:34 exercises/models/image.py:62
-#: manager/forms.py:165 manager/helpers.py:89 manager/models/log.py:51
+#: exercises/models/comment.py:34 exercises/models/image.py:75
+#: exercises/models/video.py:82 manager/forms.py:165 manager/helpers.py:89
+#: manager/models/log.py:51
msgid "Exercise"
msgstr "Упражнение"
@@ -1595,32 +1589,54 @@ msgstr "Коментарий о том, как правильно выполня
msgid "Language"
msgstr "Язык"
-#: exercises/models/exercise.py:233 exercises/views/exercises.py:460
+#: exercises/models/exercise.py:237 exercises/views/exercises.py:461
msgid "Exercise was successfully added to the general database"
msgstr "Упражнение добавлено в общую базу данных"
-#: exercises/models/exercise.py:261
+#: exercises/models/exercise.py:265
msgid "New user submitted exercise"
msgstr "Новый пользователь добавил упражнение"
-#: exercises/models/exercise.py:263
+#: exercises/models/exercise.py:267
#, python-brace-format
msgid "The user {0} submitted a new exercise \"{1}\"."
msgstr "Пользователь {0} представил новое упражнение \"{1}\"."
-#: exercises/models/image.py:68 gallery/models/image.py:56
+#: exercises/models/image.py:59
+msgid "Line"
+msgstr ""
+
+#: exercises/models/image.py:60
+msgid "3D"
+msgstr ""
+
+#: exercises/models/image.py:61
+msgid "Low-poly"
+msgstr ""
+
+#: exercises/models/image.py:62
+msgid "Photo"
+msgstr ""
+
+#: exercises/models/image.py:63
+#, fuzzy
+#| msgid "Others"
+msgid "Other"
+msgstr "Другие"
+
+#: exercises/models/image.py:81 gallery/models/image.py:56
msgid "Image"
msgstr "Изображение"
-#: exercises/models/image.py:69 gallery/models/image.py:57
+#: exercises/models/image.py:82 gallery/models/image.py:57
msgid "Only PNG and JPEG formats are supported"
msgstr "Поддерживаются только форматы PNG и JPEG"
-#: exercises/models/image.py:75
+#: exercises/models/image.py:88
msgid "Main picture"
msgstr "Основное изображение"
-#: exercises/models/image.py:78
+#: exercises/models/image.py:91
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 "
@@ -1630,11 +1646,15 @@ msgstr ""
"основного упражнения (будет показано, например в поиске). Первое изображение "
"автоматически помечается системой."
-#: exercises/models/image.py:166
+#: exercises/models/image.py:100
+msgid "The art style of your image"
+msgstr ""
+
+#: exercises/models/image.py:185
msgid "New user submitted image"
msgstr "Изображение предоставлено новым пользователем "
-#: exercises/models/image.py:167
+#: exercises/models/image.py:186
#, python-brace-format
msgid "The user {0} submitted a new image \"{1}\" for exercise {2}."
msgstr ""
@@ -1644,6 +1664,58 @@ msgstr ""
msgid "In latin, e.g. \"Pectoralis major\""
msgstr "Латинское название (например: \"Pectoralis major\")"
+#: exercises/models/video.py:41
+msgid "Maximum file size is 100MB."
+msgstr ""
+
+#: exercises/models/video.py:44 exercises/models/video.py:48
+msgid "File type is not supported"
+msgstr ""
+
+#: exercises/models/video.py:57
+#, fuzzy
+#| msgid "%(birthdate)s is not a valid birthdate"
+msgid "File is not a valid video"
+msgstr "%(birthdate)s это неверно указанная дата рождения"
+
+#: exercises/models/video.py:88
+#, fuzzy
+#| msgid "Main picture"
+msgid "Main video"
+msgstr "Основное изображение"
+
+#: exercises/models/video.py:94
+msgid "Video"
+msgstr ""
+
+#: exercises/models/video.py:101
+msgid "Size"
+msgstr ""
+
+#: exercises/models/video.py:108 manager/models/schedule_step.py:56
+msgid "Duration"
+msgstr "Продолжительность"
+
+#: exercises/models/video.py:117
+msgid "Width"
+msgstr ""
+
+#: exercises/models/video.py:124
+#, fuzzy
+#| msgid "Weight"
+msgid "Height"
+msgstr "Вес"
+
+#: exercises/models/video.py:131
+#, fuzzy
+#| msgid "Code"
+msgid "Codec"
+msgstr "Код"
+
+#: exercises/models/video.py:139
+msgid "Codec, long name"
+msgstr ""
+
#: exercises/templates/equipment/admin-overview.html:4
msgid "Equipment list"
msgstr "Перечень оборудования"
@@ -1659,7 +1731,7 @@ msgstr "Обзор оборудования"
#: exercises/templates/equipment/overview.html:69
#: exercises/templates/exercise/overview.html:74
-#: exercises/templates/exercise/view.html:214
+#: exercises/templates/exercise/view.html:264
#: exercises/templates/muscles/overview.html:71
msgid "Main muscles"
msgstr "Основные мышцы"
@@ -1780,7 +1852,8 @@ msgstr "Дата представления"
#: gym/templates/gym/new_user.html:22
#: gym/templates/gym/reset_user_password.html:20 manager/models/log.py:45
#: manager/models/schedule.py:44 manager/models/session.py:49
-#: manager/models/workout.py:89 nutrition/models/plan.py:55
+#: manager/models/workout.py:89 measurements/models/category.py:48
+#: measurements/models/measurement.py:59 nutrition/models/plan.py:55
#: nutrition/templates/ingredient/pending.html:16 weight/models.py:41
msgid "User"
msgstr "Пользователь"
@@ -1807,13 +1880,13 @@ msgid "Please select one of the options below."
msgstr "Пожалуйста, выберите одну из опций ниже."
#: exercises/templates/exercise/view.html:60
-#: exercises/templates/exercise/view.html:153
+#: exercises/templates/exercise/view.html:203
#: nutrition/templates/ingredient/view.html:38
msgid "Accept"
msgstr "Принять"
#: exercises/templates/exercise/view.html:64
-#: exercises/templates/exercise/view.html:154
+#: exercises/templates/exercise/view.html:204
#: nutrition/templates/ingredient/view.html:42
msgid "Decline"
msgstr "Отклонить"
@@ -1826,32 +1899,42 @@ msgstr "Изображения"
msgid "Add new image"
msgstr "Добавить новое изображение"
-#: exercises/templates/exercise/view.html:147
+#: exercises/templates/exercise/view.html:148
+msgid "Videos"
+msgstr ""
+
+#: exercises/templates/exercise/view.html:187 exercises/views/videos.py:94
+#, fuzzy
+#| msgid "Add new image"
+msgid "Add new video"
+msgstr "Добавить новое изображение"
+
+#: exercises/templates/exercise/view.html:197
msgid "Images pending review"
msgstr "Изображения, ожидающие рассмотрения"
-#: exercises/templates/exercise/view.html:168
+#: exercises/templates/exercise/view.html:218
msgid "Comments for this exercise"
msgstr "Комментарии к этому упражнению"
-#: exercises/templates/exercise/view.html:196
+#: exercises/templates/exercise/view.html:246
msgid "Add new comment"
msgstr "Добавить новый комментарий"
-#: exercises/templates/exercise/view.html:210
+#: exercises/templates/exercise/view.html:260
msgid "The diagram shows the most used muscles on this exercise"
msgstr "Диаграмма показывает самые используемые мышцы в этом упражнении"
-#: exercises/templates/exercise/view.html:251
+#: exercises/templates/exercise/view.html:301
#: manager/templates/workout/log.html:10 manager/templates/workout/log.html:11
msgid "Weight log"
msgstr "Регистрация веса"
-#: exercises/templates/exercise/view.html:256
+#: exercises/templates/exercise/view.html:306
msgid "Exercise Variations"
msgstr "Вариации упражнений"
-#: exercises/templates/exercise/view.html:277
+#: exercises/templates/exercise/view.html:327
msgid "Submit a correction"
msgstr "Отправить поправку"
@@ -1888,32 +1971,32 @@ msgstr "Добавить комментарий к упражнению"
msgid "Delete equipment?"
msgstr "Удалить оборудование?"
-#: exercises/views/exercises.py:228
+#: exercises/views/exercises.py:229
#, python-format
msgid ""
"%(name_original)s is too similar to existing exercise \"%(exercise_name)s\""
msgstr ""
-"%(name_original)s слишком похоже на существующее упражнение \""
-"%(exercise_name)s\""
+"%(name_original)s слишком похоже на существующее упражнение "
+"\"%(exercise_name)s\""
-#: exercises/views/exercises.py:246
+#: exercises/views/exercises.py:247
msgid "Add exercise"
msgstr "Добавить упражнение"
-#: exercises/views/exercises.py:366
+#: exercises/views/exercises.py:367
msgid "Thank you. Once the changes are reviewed the exercise will be updated."
msgstr "Спасибо. Как только изменения будут рассмотрены упражнение обновится."
-#: exercises/views/exercises.py:379
+#: exercises/views/exercises.py:380
#, python-brace-format
msgid "Correct {0}"
msgstr "Исправить {0}"
-#: exercises/views/exercises.py:421
+#: exercises/views/exercises.py:422
msgid "This will delete the exercise from all workouts."
msgstr "Это удалит упражнение из всех тренировок."
-#: exercises/views/exercises.py:473
+#: exercises/views/exercises.py:474
msgid "Exercise was successfully marked as rejected"
msgstr "Упражнение было отмечено как отвергнутое."
@@ -1925,6 +2008,11 @@ msgstr "Редактировать изображение упражнения"
msgid "Delete exercise image?"
msgstr "Удалить изображение упражнения?"
+#: exercises/views/videos.py:144 nutrition/views/log.py:230
+#: nutrition/views/unit_ingredient.py:139
+msgid "Delete?"
+msgstr "Удалить?"
+
#: gallery/templates/images/overview.html:62
msgid "Add image"
msgstr "Добавить изображение"
@@ -1993,8 +2081,8 @@ msgid "Contract type"
msgstr "Форма контракта"
#: gym/models/contract.py:208 gym/templates/contract/view.html:59
-#: manager/templates/log/add.html:52 nutrition/forms.py:58
-#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:92
+#: manager/templates/log/add.html:52 nutrition/forms.py:59
+#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:102
#: nutrition/models/meal_item.py:72
msgid "Amount"
msgstr "Количество"
@@ -2439,6 +2527,7 @@ msgstr ""
"перед отправкой писем"
#: mailer/templates/mailer/gym/preview.html:22
+#: software/templates/about_us.html:59
msgid "Current version"
msgstr "Текущая версия"
@@ -2475,7 +2564,8 @@ msgstr ""
#: manager/models/log.py:90 manager/models/setting.py:47
#: manager/models/setting.py:78 manager/templates/log/add.html:53
#: manager/templates/log/add.html:55 manager/templates/set/formset.html:11
-#: manager/templates/set/formset.html:13 nutrition/forms.py:62
+#: manager/templates/set/formset.html:13 measurements/models/category.py:58
+#: nutrition/forms.py:63
msgid "Unit"
msgstr "Секция"
@@ -2545,10 +2635,6 @@ msgstr ""
msgid "schedule"
msgstr "программа"
-#: manager/models/schedule_step.py:56
-msgid "Duration"
-msgstr "Продолжительность"
-
#: manager/models/schedule_step.py:57
msgid "The duration in weeks"
msgstr "Длительность в неделях"
@@ -2835,7 +2921,7 @@ msgstr ""
#: manager/templates/schedule/view.html:290
#: manager/templates/workout/view.html:142
#: manager/templates/workout/view.html:217
-#: nutrition/templates/plan/view.html:415
+#: nutrition/templates/plan/view.html:417
msgid "Download as PDF"
msgstr "Скачать в формате PDF"
@@ -3076,23 +3162,27 @@ msgstr "Новое впечатление от тренировки для {0}"
msgid "This will delete all weight logs for this day as well."
msgstr "Это приведет также к удалению всех записей весов за этот день."
-#: nutrition/forms.py:121
+#: measurements/models/measurement.py:69
+msgid "Value"
+msgstr ""
+
+#: nutrition/forms.py:122
msgid "Calculate"
msgstr "Рассчитать"
-#: nutrition/forms.py:194 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:195 nutrition/templates/rate/form.html:76
msgid "Basic caloric intake"
msgstr "Основное потребление калорий"
-#: nutrition/forms.py:195
+#: nutrition/forms.py:196
msgid "Your basic caloric intake as calculated for your data"
msgstr "Ваше основное потребление калорий, рассчитанное для ваших данных"
-#: nutrition/forms.py:201
+#: nutrition/forms.py:202
msgid "Additional calories"
msgstr "Дополнительные калории"
-#: nutrition/forms.py:203
+#: nutrition/forms.py:204
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
@@ -3100,8 +3190,8 @@ msgstr ""
"Дополнительные калории для добавления к базовой ставке (для вычитывания, "
"введите отрицательное число)"
-#: nutrition/forms.py:231 nutrition/models/ingredient_weight_unit.py:39
-#: nutrition/models/log.py:71 nutrition/models/meal_item.py:53
+#: nutrition/forms.py:232 nutrition/models/ingredient_weight_unit.py:39
+#: nutrition/models/log.py:81 nutrition/models/meal_item.py:53
#: nutrition/templates/log/detail.html:155
msgid "Ingredient"
msgstr "Ингредиент"
@@ -3120,14 +3210,14 @@ msgstr "В г на 100г продукта"
#: nutrition/models/ingredient.py:123
#: nutrition/templates/ingredient/view.html:96
#: nutrition/templates/log/detail.html:78
-#: nutrition/templates/plan/view.html:262 nutrition/views/plan.py:406
+#: nutrition/templates/plan/view.html:264 nutrition/views/plan.py:406
msgid "Sugar content in carbohydrates"
msgstr "Содержание сахара в углеводах"
#: nutrition/models/ingredient.py:141
#: nutrition/templates/ingredient/view.html:112
#: nutrition/templates/log/detail.html:104
-#: nutrition/templates/plan/view.html:274 nutrition/views/plan.py:420
+#: nutrition/templates/plan/view.html:276 nutrition/views/plan.py:420
msgid "Saturated fat content in fats"
msgstr "Содержание насыщенных жиров в жирах"
@@ -3135,7 +3225,7 @@ msgstr "Содержание насыщенных жиров в жирах"
#: nutrition/templates/ingredient/view.html:134
#: nutrition/templates/log/detail.html:122
#: nutrition/templates/log/detail.html:178
-#: nutrition/templates/plan/view.html:285 nutrition/views/plan.py:426
+#: nutrition/templates/plan/view.html:287 nutrition/views/plan.py:426
msgid "Fibres"
msgstr "Клетчатка (пищевые волокна)"
@@ -3143,7 +3233,7 @@ msgstr "Клетчатка (пищевые волокна)"
#: nutrition/templates/ingredient/view.html:144
#: nutrition/templates/log/detail.html:135
#: nutrition/templates/log/detail.html:181
-#: nutrition/templates/plan/view.html:291 nutrition/views/plan.py:432
+#: nutrition/templates/plan/view.html:293 nutrition/views/plan.py:432
msgid "Sodium"
msgstr "Натрий"
@@ -3191,10 +3281,20 @@ msgstr "Количество в граммах"
msgid "Unit amount, e.g. \"1 Cup\" or \"1/2 spoon\""
msgstr "Единица измерения количества, например \"1 чашка\" или \"1/2 ложки\""
+#: nutrition/models/log.py:55
+msgid "Meal"
+msgstr "Прием пищи"
+
#: nutrition/models/meal.py:61
msgid "Time (approx)"
msgstr "Время (приблизительно)"
+#: nutrition/models/meal.py:68
+msgid ""
+"Give meals a textual description / name such as \"Breakfast\" or \"after "
+"workout\""
+msgstr ""
+
#: nutrition/models/plan.py:71
msgid ""
"A description of the goal of the plan, e.g. \"Gain mass\" or \"Prepare for "
@@ -3341,12 +3441,12 @@ msgstr ""
#: nutrition/templates/ingredient/view.html:71
#: nutrition/templates/log/detail.html:31
-#: nutrition/templates/plan/view.html:227 nutrition/views/plan.py:376
+#: nutrition/templates/plan/view.html:229 nutrition/views/plan.py:376
msgid "Macronutrients"
msgstr "Макронутриенты"
#: nutrition/templates/ingredient/view.html:80
-#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:244
+#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:246
msgid "kJ"
msgstr "кДж"
@@ -3359,7 +3459,7 @@ msgstr "не имеется в наличии"
#: nutrition/templates/ingredient/view.html:128
#: nutrition/templates/log/detail.html:119
-#: nutrition/templates/plan/view.html:282
+#: nutrition/templates/plan/view.html:284
msgid "Others"
msgstr "Другие"
@@ -3388,7 +3488,7 @@ msgstr "Удалить ингредиент"
#: nutrition/templates/log/detail.html:7
#: nutrition/templates/log/overview.html:7
-#: nutrition/templates/plan/view.html:300
+#: nutrition/templates/plan/view.html:302
msgid "Nutrition diary"
msgstr "Дневник питания"
@@ -3398,13 +3498,13 @@ msgstr "Запланировано"
#: nutrition/templates/log/detail.html:33
#: nutrition/templates/log/overview.html:31
-#: nutrition/templates/plan/view.html:308
+#: nutrition/templates/plan/view.html:310
msgid "Logged"
msgstr "Записано"
#: nutrition/templates/log/detail.html:34
#: nutrition/templates/log/overview.html:32
-#: nutrition/templates/plan/view.html:309
+#: nutrition/templates/plan/view.html:311
msgid "Difference"
msgstr "Разница"
@@ -3417,7 +3517,7 @@ msgid "g"
msgstr "г"
#: nutrition/templates/log/overview.html:53
-#: nutrition/templates/plan/view.html:330
+#: nutrition/templates/plan/view.html:332
msgid "nothing found"
msgstr "ничего не найдено"
@@ -3437,56 +3537,56 @@ msgstr "Записать это блюдо"
msgid "Add ingredient to meal"
msgstr "Добавить ингредиент к блюду"
-#: nutrition/templates/plan/view.html:150
+#: nutrition/templates/plan/view.html:152
msgid "No items for this meal."
msgstr "Нет элементов для этого блюда."
-#: nutrition/templates/plan/view.html:188
+#: nutrition/templates/plan/view.html:190
msgid "No meals for this plan."
msgstr "Нет блюд для этого плана."
-#: nutrition/templates/plan/view.html:200
+#: nutrition/templates/plan/view.html:202
msgid "Log this Plan"
msgstr "Записать этот план"
-#: nutrition/templates/plan/view.html:206
+#: nutrition/templates/plan/view.html:208
msgid "Add a new meal"
msgstr "Добавить новое блюдо"
-#: nutrition/templates/plan/view.html:216 nutrition/views/plan.py:369
+#: nutrition/templates/plan/view.html:218 nutrition/views/plan.py:369
msgid "Nutritional data"
msgstr "Пищевые данные"
-#: nutrition/templates/plan/view.html:219
+#: nutrition/templates/plan/view.html:221
#, python-format
msgid "Based on the weight entry dated %(date)s (%(weight)s)"
msgstr "На основании записи веса от %(date)s (%(weight)s)"
-#: nutrition/templates/plan/view.html:228 nutrition/views/plan.py:377
+#: nutrition/templates/plan/view.html:230 nutrition/views/plan.py:377
msgid "Total"
msgstr "Итого"
-#: nutrition/templates/plan/view.html:229 nutrition/views/plan.py:378
+#: nutrition/templates/plan/view.html:231 nutrition/views/plan.py:378
msgid "Percent of energy"
msgstr "Процент энергии"
-#: nutrition/templates/plan/view.html:232 nutrition/views/plan.py:379
+#: nutrition/templates/plan/view.html:234 nutrition/views/plan.py:379
msgid "g per body kg"
msgstr "г на кг тела"
-#: nutrition/templates/plan/view.html:234
+#: nutrition/templates/plan/view.html:236
msgid "oz per body lb"
msgstr "oz на lb тела"
-#: nutrition/templates/plan/view.html:338
+#: nutrition/templates/plan/view.html:340
msgid "View complete nutrition log"
msgstr "Просмотреть полный журнал питания"
-#: nutrition/templates/plan/view.html:371
+#: nutrition/templates/plan/view.html:373
msgid "Goal"
msgstr "Цель"
-#: nutrition/templates/plan/view.html:382
+#: nutrition/templates/plan/view.html:384
msgid ""
"You have selected that this nutritional plan has a\n"
" goal amount of calories. Use the calculator or enter the value\n"
@@ -3497,7 +3597,7 @@ msgstr ""
"значение\n"
" самостоятельно."
-#: nutrition/templates/plan/view.html:392
+#: nutrition/templates/plan/view.html:394
msgid ""
"If you find the ingredient list too short, you might want to activate the "
"preference to also show English ingredients."
@@ -3505,15 +3605,15 @@ msgstr ""
"Если вы находите список ингредиентов слишком коротким, вы можете включить "
"предпочтение для просмотра ингредиентов также на английском языке."
-#: nutrition/templates/plan/view.html:421
+#: nutrition/templates/plan/view.html:423
msgid "Edit nutrition plan"
msgstr "Изменить план питания"
-#: nutrition/templates/plan/view.html:425
+#: nutrition/templates/plan/view.html:427
msgid "Make a copy of this nutrition plan"
msgstr "Сделать копию этого плана питания"
-#: nutrition/templates/plan/view.html:431
+#: nutrition/templates/plan/view.html:433
msgid "Delete nutrition plan"
msgstr "Удалить план питания"
@@ -3609,10 +3709,6 @@ msgstr "Добавить новый ингредиент"
msgid "Ingredient was successfully marked as rejected"
msgstr "Ингредиент был успешно отмечен как отвергнутый."
-#: nutrition/views/log.py:229 nutrition/views/unit_ingredient.py:139
-msgid "Delete?"
-msgstr "Удалить?"
-
#: nutrition/views/meal.py:55
msgid "Add new meal"
msgstr "Добавить новое блюдо"
@@ -4038,11 +4134,11 @@ msgstr ""
msgid "Re-Submit"
msgstr "Повторно отправить"
-#: weight/templates/overview.html:68
+#: weight/templates/overview.html:51
msgid "Export as CSV"
msgstr "Экспортировать в формате CSV"
-#: weight/templates/overview.html:72
+#: weight/templates/overview.html:55
msgid "Import from spreadsheet"
msgstr "Импортировать из электронной таблицы"
@@ -4060,6 +4156,12 @@ msgstr "Успешно удалено."
msgid "Delete weight entry for the %s"
msgstr "Удалить запись о весе для %s"
+#~ msgid "Your current weight is: "
+#~ msgstr "Ваш вес на данный момент:"
+
+#~ msgid "Released under the Affero GPL"
+#~ msgstr "Выпущено под Affero GPL"
+
#~ msgid "Responsible for the content of this site as per German law §5 TMG:"
#~ msgstr ""
#~ "Ответственный за содержимое этой страницы, соответственно немецкому праву "
@@ -4204,9 +4306,6 @@ msgstr "Удалить запись о весе для %s"
#~ "заинтересованы, \n"
#~ "перейдите на сайт transifex, запросите доступ и мы все настроим."
-#~ msgid "Code"
-#~ msgstr "Код"
-
#~ msgid ""
#~ "Obviously, you are highly encouraged to clone the\n"
#~ "repo and start hacking! Once you are ready, send a pull request and we\n"
@@ -4336,9 +4435,6 @@ msgstr "Удалить запись о весе для %s"
#~ msgid "Pause!"
#~ msgstr "Пауза!"
-#~ msgid "Meal"
-#~ msgstr "Прием пищи"
-
#~ msgid "There is no chart here because there are no weight entries."
#~ msgstr "Здесь нет диаграммы, потому что нет записей веса."
diff --git a/wger/locale/sv/LC_MESSAGES/django.po b/wger/locale/sv/LC_MESSAGES/django.po
index b9977bf6f..59558ff5d 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: 2021-08-17 17:23+0200\n"
+"POT-Creation-Date: 2022-02-15 14:51+0100\n"
"PO-Revision-Date: 2021-04-15 07:27+0000\n"
"Last-Translator: Allan Nordhøy <[email protected]>\n"
"Language-Team: Swedish <https://hosted.weblate.org/projects/wger/web/sv/>\n"
@@ -53,16 +53,16 @@ msgstr "Språk"
msgid "Nothing found."
msgstr "Ingenting hittades"
-#: config/templates/language/overview.html:16 core/templates/index.html:147
-#: core/templates/index.html:199 manager/templates/calendar/month.html:132
+#: config/templates/language/overview.html:16 core/templates/index.html:137
+#: core/templates/index.html:189 manager/templates/calendar/month.html:132
#: manager/templates/schedule/overview.html:28
#: manager/templates/schedule/view.html:146
#: manager/templates/workout/overview.html:28
#: nutrition/templates/ingredient/overview.html:45
#: nutrition/templates/plan/overview.html:23
-#: nutrition/templates/plan/view.html:148
-#: nutrition/templates/plan/view.html:151
-#: nutrition/templates/plan/view.html:189
+#: nutrition/templates/plan/view.html:150
+#: nutrition/templates/plan/view.html:153
+#: nutrition/templates/plan/view.html:191
msgid "Add one now."
msgstr "Lägg till ett nu."
@@ -83,7 +83,7 @@ msgstr "Lägg till ett nu."
#: gym/templates/gym/member_list.html:244
#: gym/templates/gym/member_list.html:281
#: mailer/templates/mailer/gym/overview.html:43
-#: weight/templates/overview.html:78
+#: weight/templates/overview.html:61
msgid "Add"
msgstr "Lägg till"
@@ -120,14 +120,14 @@ msgstr "Visa"
#: config/templates/language/view.html:91 core/templates/user/api_key.html:44
#: core/templates/user/preferences.html:28
-#: exercises/templates/exercise/view.html:273
-#: exercises/templates/exercise/view.html:296 gym/models/contract.py:200
+#: exercises/templates/exercise/view.html:323
+#: exercises/templates/exercise/view.html:346 gym/models/contract.py:200
#: gym/templates/contract/view.html:41 gym/templates/contract/view.html:106
#: gym/templates/gym/member_list.html:248
#: manager/templates/schedule/view.html:281
#: manager/templates/workout/view.html:206
#: nutrition/templates/ingredient/view.html:226
-#: nutrition/templates/plan/view.html:409 weight/templates/overview.html:62
+#: nutrition/templates/plan/view.html:411 weight/templates/overview.html:45
msgid "Options"
msgstr "Alternativ"
@@ -141,12 +141,12 @@ msgstr "Alternativ"
#: core/templates/weight_unit/list.html:17
#: exercises/templates/categories/admin-overview.html:16
#: exercises/templates/equipment/admin-overview.html:16
-#: exercises/templates/exercise/view.html:180
-#: exercises/templates/exercise/view.html:301
+#: exercises/templates/exercise/view.html:230
+#: exercises/templates/exercise/view.html:351
#: exercises/templates/muscles/admin-overview.html:16
-#: exercises/views/comments.py:63 gallery/views/images.py:96
-#: gym/templates/admin_notes/list.html:32 gym/templates/contract/list.html:31
-#: gym/templates/contract/view.html:107
+#: exercises/views/comments.py:63 exercises/views/videos.py:69
+#: gallery/views/images.py:96 gym/templates/admin_notes/list.html:32
+#: gym/templates/contract/list.html:31 gym/templates/contract/view.html:107
#: gym/templates/contract_option/list.html:31
#: gym/templates/contract_type/list.html:31 gym/templates/document/list.html:38
#: gym/templates/gym/list.html:19 gym/templates/gym/list.html:43
@@ -157,7 +157,7 @@ msgstr "Alternativ"
#: manager/templates/calendar/partial_overview_table.html:18
#: manager/templates/schedule/view.html:121
#: nutrition/templates/ingredient/view.html:198
-#: nutrition/templates/plan/view.html:89 nutrition/templates/plan/view.html:124
+#: nutrition/templates/plan/view.html:89 nutrition/templates/plan/view.html:126
#: nutrition/templates/units/list.html:18
msgid "Edit"
msgstr "Redigera"
@@ -171,9 +171,9 @@ msgstr "Redigera"
#: exercises/templates/categories/admin-overview.html:17
#: exercises/templates/equipment/admin-overview.html:17
#: exercises/templates/exercise/view.html:68
-#: exercises/templates/exercise/view.html:155
-#: exercises/templates/exercise/view.html:185
-#: exercises/templates/exercise/view.html:306
+#: exercises/templates/exercise/view.html:205
+#: exercises/templates/exercise/view.html:235
+#: exercises/templates/exercise/view.html:356
#: exercises/templates/muscles/admin-overview.html:17
#: gym/templates/admin_notes/list.html:40
#: gym/templates/contract_option/list.html:39
@@ -186,7 +186,7 @@ msgstr "Redigera"
#: nutrition/templates/ingredient/view.html:199
#: nutrition/templates/ingredient/view.html:239
#: nutrition/templates/log/detail.html:197
-#: nutrition/templates/plan/view.html:95 nutrition/templates/plan/view.html:130
+#: nutrition/templates/plan/view.html:95 nutrition/templates/plan/view.html:132
#: nutrition/templates/units/list.html:20
msgid "Delete"
msgstr "Ta bort"
@@ -318,7 +318,7 @@ msgid "Some way of answering you (e-mail, etc.)"
msgstr "Något sätt besvara dig (e-post, etc.)"
#: core/forms.py:265 exercises/models/comment.py:40 manager/models/set.py:60
-#: manager/models/setting.py:99 nutrition/models/log.py:61
+#: manager/models/setting.py:99 nutrition/models/log.py:71
msgid "Comment"
msgstr "Kommentar"
@@ -458,7 +458,7 @@ msgstr ""
msgid "Age"
msgstr "Ålder"
-#: core/models/profile.py:202 nutrition/forms.py:98
+#: core/models/profile.py:202 nutrition/forms.py:99
msgid "Height (cm)"
msgstr "Längd (cm)"
@@ -509,7 +509,7 @@ msgid "Total caloric intake, including e.g. any surplus"
msgstr "Totala kaloriintaget, inklusive t.ex. eventuellt överskott"
#: core/models/profile.py:305 nutrition/models/ingredient_weight_unit.py:45
-#: nutrition/models/log.py:80 nutrition/models/meal_item.py:58
+#: nutrition/models/log.py:90 nutrition/models/meal_item.py:58
msgid "Weight unit"
msgstr "Viktenhet"
@@ -547,9 +547,9 @@ msgstr "Summan av alla timmar måste vara 24"
#: gym/models/user_document.py:87 gym/templates/contract/view.html:50
#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:96
#: gym/views/gym.py:156 manager/models/schedule.py:55
-#: manager/models/workout.py:56 nutrition/models/ingredient.py:96
-#: nutrition/models/ingredient_category.py:26
-#: nutrition/models/weight_unit.py:38
+#: manager/models/workout.py:56 measurements/models/category.py:53
+#: nutrition/models/ingredient.py:96 nutrition/models/ingredient_category.py:26
+#: nutrition/models/meal.py:66 nutrition/models/weight_unit.py:38
#: nutrition/templates/ingredient/pending.html:15
#: nutrition/templates/ingredient/view.html:185
msgid "Name"
@@ -606,18 +606,18 @@ msgstr ""
msgid "Dashboard"
msgstr "Instrumentpanel"
-#: core/templates/index.html:31 manager/templates/calendar/month.html:115
+#: core/templates/index.html:21 manager/templates/calendar/month.html:115
msgid "Add log to day"
msgstr "Lägg till logg till dag"
-#: core/templates/index.html:35 manager/templates/calendar/month.html:120
+#: core/templates/index.html:25 manager/templates/calendar/month.html:120
msgid ""
"Click to add weight logs to a training\n"
"day in your current workout:"
msgstr ""
"Klicka för att lägga viktloggar till en träningsdag i din nuvarande träning:"
-#: core/templates/index.html:43 core/templates/index.html:83
+#: core/templates/index.html:33 core/templates/index.html:73
#: core/templates/misc/fragments/shariff_modal.html:29
#: core/templates/template.html:125 manager/templates/calendar/month.html:138
#: manager/templates/schedule/view.html:246
@@ -627,17 +627,17 @@ msgstr ""
msgid "Close"
msgstr "Stäng"
-#: core/templates/index.html:54 core/templates/index.html:203
+#: core/templates/index.html:44 core/templates/index.html:193
msgid "Add new diary entry"
msgstr ""
-#: core/templates/index.html:59
+#: core/templates/index.html:49
msgid ""
"Click to add an entry to your nutrition diary for today. You can either log "
"a meal as you defined it, or entry any number of custom entries."
msgstr ""
-#: core/templates/index.html:67 core/templates/index.html:171
+#: core/templates/index.html:57 core/templates/index.html:161
#: core/templates/user/overview.html:171
#: nutrition/templates/ingredient/view.html:79
#: nutrition/templates/log/detail.html:40
@@ -646,19 +646,19 @@ msgstr ""
#: nutrition/templates/log/overview.html:7
#: nutrition/templates/log/overview.html:44
#: nutrition/templates/plan/overview.html:17
-#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:242
-#: nutrition/templates/plan/view.html:301
-#: nutrition/templates/plan/view.html:321
-#: nutrition/templates/plan/view.html:363
-#: nutrition/templates/plan/view.html:373
+#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:244
+#: nutrition/templates/plan/view.html:303
+#: nutrition/templates/plan/view.html:323
+#: nutrition/templates/plan/view.html:365
+#: nutrition/templates/plan/view.html:375
msgid "kcal"
msgstr "kcal"
-#: core/templates/index.html:79 nutrition/templates/plan/view.html:348
+#: core/templates/index.html:69 nutrition/templates/plan/view.html:350
msgid "Add custom diary entry"
msgstr ""
-#: core/templates/index.html:94 core/templates/index.html:102
+#: core/templates/index.html:84 core/templates/index.html:92
#: manager/models/day.py:34 manager/models/log.py:56
#: manager/models/session.py:60 manager/models/workout.py:109
#: manager/templates/schedule/view.html:105
@@ -669,80 +669,80 @@ msgstr ""
msgid "Workout"
msgstr "Träning"
-#: core/templates/index.html:128
+#: core/templates/index.html:118
msgid "This workout is part of a schedule:"
msgstr "Detta träningspass är del av ett schema:"
-#: core/templates/index.html:133
+#: core/templates/index.html:123
msgid ""
"The current workout is selected from your active schedule or, if you don't "
"have one, simply by date."
msgstr ""
-#: core/templates/index.html:142 manager/templates/calendar/month.html:188
+#: core/templates/index.html:132 manager/templates/calendar/month.html:188
msgid "Add new log"
msgstr "Lägg till ny logg"
-#: core/templates/index.html:147 core/templates/user/overview.html:58
+#: core/templates/index.html:137 core/templates/user/overview.html:58
#: manager/templates/calendar/month.html:128
#: manager/templates/schedule/view.html:146
#: manager/templates/workout/overview.html:28
msgid "No workouts found."
msgstr "Inga träningspass hittade."
-#: core/templates/index.html:157 nutrition/models/log.py:48
+#: core/templates/index.html:147 nutrition/models/log.py:49
#: nutrition/models/meal.py:49 nutrition/models/meal_item.py:47
#: nutrition/models/plan.py:94 nutrition/templates/plan/view.html:11
#: nutrition/templates/plan/view.html:19
msgid "Nutrition plan"
msgstr "Kostplan"
-#: core/templates/index.html:169 core/templates/user/overview.html:155
+#: core/templates/index.html:159 core/templates/user/overview.html:155
#: nutrition/models/ingredient.py:100
#: nutrition/templates/ingredient/view.html:77
#: nutrition/templates/log/detail.html:39
#: nutrition/templates/log/detail.html:156
-#: nutrition/templates/plan/view.html:53 nutrition/templates/plan/view.html:241
-#: nutrition/templates/plan/view.html:358
-#: nutrition/templates/plan/view.html:362 nutrition/views/plan.py:384
+#: nutrition/templates/plan/view.html:53 nutrition/templates/plan/view.html:243
+#: nutrition/templates/plan/view.html:360
+#: nutrition/templates/plan/view.html:364 nutrition/views/plan.py:384
msgid "Energy"
msgstr "Energi"
-#: core/templates/index.html:175 core/templates/user/overview.html:156
+#: core/templates/index.html:165 core/templates/user/overview.html:156
#: nutrition/models/ingredient.py:105
#: nutrition/templates/ingredient/view.html:84
#: nutrition/templates/log/detail.html:52
#: nutrition/templates/log/detail.html:174
-#: nutrition/templates/plan/view.html:54 nutrition/templates/plan/view.html:249
+#: nutrition/templates/plan/view.html:54 nutrition/templates/plan/view.html:251
#: nutrition/views/plan.py:390
msgid "Protein"
msgstr "Protein"
-#: core/templates/index.html:181 core/templates/user/overview.html:157
+#: core/templates/index.html:171 core/templates/user/overview.html:157
#: nutrition/models/ingredient.py:113
#: nutrition/templates/ingredient/view.html:90
#: nutrition/templates/log/detail.html:65
#: nutrition/templates/log/detail.html:175
-#: nutrition/templates/plan/view.html:55 nutrition/templates/plan/view.html:255
+#: nutrition/templates/plan/view.html:55 nutrition/templates/plan/view.html:257
#: nutrition/views/plan.py:398
msgid "Carbohydrates"
msgstr "Kolhydrater"
-#: core/templates/index.html:187 core/templates/user/overview.html:158
+#: core/templates/index.html:177 core/templates/user/overview.html:158
#: nutrition/models/ingredient.py:131
#: nutrition/templates/ingredient/view.html:106
#: nutrition/templates/log/detail.html:91
#: nutrition/templates/log/detail.html:176
-#: nutrition/templates/plan/view.html:56 nutrition/templates/plan/view.html:268
+#: nutrition/templates/plan/view.html:56 nutrition/templates/plan/view.html:270
#: nutrition/views/plan.py:412
msgid "Fat"
msgstr "Fett"
-#: core/templates/index.html:199 nutrition/templates/plan/overview.html:22
+#: core/templates/index.html:189 nutrition/templates/plan/overview.html:22
msgid "No nutrition plans."
msgstr "Inga kostplaner."
-#: core/templates/index.html:213 core/templates/user/overview.html:112
+#: core/templates/index.html:203 core/templates/user/overview.html:112
#: core/templates/user/overview.html:121 manager/forms.py:173
#: manager/helpers.py:89 manager/models/log.py:84 manager/models/setting.py:67
#: manager/templates/log/add.html:54 manager/templates/set/formset.html:12
@@ -751,11 +751,7 @@ msgstr "Inga kostplaner."
msgid "Weight"
msgstr "Vikt"
-#: core/templates/index.html:217
-msgid "Your current weight is: "
-msgstr "Din nuvarande vikt är: "
-
-#: core/templates/index.html:248 core/templates/navigation.html:97
+#: core/templates/index.html:210 core/templates/navigation.html:97
#: weight/views.py:70
msgid "Add weight entry"
msgstr "Lägg till vikt"
@@ -787,7 +783,7 @@ msgstr "Licens lista"
msgid "Nothing found"
msgstr "Ingenting hittades"
-#: core/templates/misc/about.html:4 core/templates/template.html:201
+#: core/templates/misc/about.html:4 core/templates/template.html:175
#: core/templates/template_features.html:118
#: core/templates/template_no_context.html:88
msgid "Imprint"
@@ -804,8 +800,8 @@ msgstr ""
"Innan du delar länkar till sociala medier måste du tillåta extern åtkoms."
#: core/templates/misc/fragments/shariff_modal.html:22
-#: nutrition/templates/plan/view.html:385
-#: nutrition/templates/plan/view.html:394
+#: nutrition/templates/plan/view.html:387
+#: nutrition/templates/plan/view.html:396
msgid "That's done here"
msgstr "Det är gjort här"
@@ -897,7 +893,7 @@ msgstr "Övningar som avaktar genomgång"
msgid "Equipment"
msgstr "Utrustning"
-#: core/templates/navigation.html:78 exercises/templates/exercise/view.html:208
+#: core/templates/navigation.html:78 exercises/templates/exercise/view.html:258
msgid "Muscles"
msgstr "Muskler"
@@ -970,7 +966,7 @@ msgstr "Dokument för utvecklare"
msgid "Get the code"
msgstr "Hämta koden"
-#: core/templates/navigation.html:175 core/templates/template.html:193
+#: core/templates/navigation.html:175 core/templates/template.html:205
#: core/templates/template_features.html:100
msgid "Translate"
msgstr "Översätt"
@@ -1123,15 +1119,11 @@ msgstr "Du använder ett gästkonto, data som anges tas bort efter en vecka."
msgid "Create some demo entries"
msgstr "Skapa några demoposter"
-#: core/templates/template.html:202 core/templates/template_features.html:122
+#: core/templates/template.html:176 core/templates/template_features.html:122
#: core/templates/template_no_context.html:89 software/templates/tos.html:7
msgid "Terms of service"
msgstr "Villkor för tjänsten"
-#: core/templates/template.html:209 core/templates/template.html:210
-msgid "Released under the Affero GPL"
-msgstr "Släppt under GPL Affero"
-
#: core/templates/template_features.html:62 software/templates/features.html:9
#: software/templates/features.html:120
msgid "Features"
@@ -1236,9 +1228,10 @@ msgstr "Lägg till träningspass"
#: core/templates/user/overview.html:120 core/templates/user/overview.html:153
#: exercises/models/exercise.py:77 gallery/models/image.py:47
#: manager/helpers.py:88 manager/models/log.py:98 manager/models/session.py:67
-#: nutrition/models/ingredient.py:85 nutrition/models/ingredient.py:87
-#: nutrition/models/ingredient.py:190 nutrition/templates/log/overview.html:30
-#: nutrition/templates/plan/view.html:307 weight/models.py:32
+#: measurements/models/measurement.py:64 nutrition/models/ingredient.py:85
+#: nutrition/models/ingredient.py:87 nutrition/models/ingredient.py:190
+#: nutrition/templates/log/overview.html:30
+#: nutrition/templates/plan/view.html:309 weight/models.py:32
#: weight/templates/import_csv_preview.html:13
#: weight/templates/import_csv_preview.html:42 weight/views.py:150
msgid "Date"
@@ -1246,10 +1239,10 @@ msgstr "Datum"
#: core/templates/user/overview.html:35 core/templates/user/overview.html:154
#: exercises/models/exercise.py:61 exercises/templates/exercise/view.html:88
-#: exercises/views/exercises.py:189 gallery/models/image.py:70
+#: exercises/views/exercises.py:190 gallery/models/image.py:70
#: gym/models/contract.py:57 gym/models/contract.py:107
#: manager/models/day.py:37 manager/models/workout.py:62
-#: nutrition/models/plan.py:69
+#: measurements/models/measurement.py:79 nutrition/models/plan.py:69
msgid "Description"
msgstr "Beskrivning"
@@ -1410,11 +1403,11 @@ msgstr "Preferenser"
msgid "Change password"
msgstr "Ändra lösenord"
-#: core/templatetags/wger_extras.py:217
+#: core/templatetags/wger_extras.py:229
msgid "kg"
msgstr "kg"
-#: core/templatetags/wger_extras.py:219
+#: core/templatetags/wger_extras.py:231
#: nutrition/templates/ingredient/view.html:86
#: nutrition/templates/ingredient/view.html:92
#: nutrition/templates/ingredient/view.html:99
@@ -1426,28 +1419,28 @@ msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr "g"
-#: core/templatetags/wger_extras.py:222
+#: core/templatetags/wger_extras.py:234
msgid "lb"
msgstr "lb"
-#: core/templatetags/wger_extras.py:224
+#: core/templatetags/wger_extras.py:236
msgctxt "weight unit, i.e. ounces"
msgid "oz"
msgstr "oz"
#: core/views/languages.py:85 exercises/views/categories.py:121
-#: exercises/views/equipment.py:106 exercises/views/exercises.py:422
+#: exercises/views/equipment.py:106 exercises/views/exercises.py:423
#: exercises/views/images.py:128 exercises/views/muscles.py:118
-#: manager/views/schedule.py:311 manager/views/schedule_step.py:129
-#: manager/views/workout.py:268 manager/views/workout_session.py:141
-#: nutrition/views/ingredient.py:144 nutrition/views/plan.py:120
-#: nutrition/views/unit.py:111
+#: exercises/views/videos.py:129 manager/views/schedule.py:311
+#: manager/views/schedule_step.py:129 manager/views/workout.py:268
+#: manager/views/workout_session.py:141 nutrition/views/ingredient.py:144
+#: nutrition/views/plan.py:120 nutrition/views/unit.py:111
msgid "Successfully deleted"
msgstr "Borttagning genomförd"
#: core/views/languages.py:93 core/views/license.py:103
#: core/views/repetition_units.py:115 core/views/weight_units.py:115
-#: exercises/views/categories.py:127 exercises/views/exercises.py:430
+#: exercises/views/categories.py:127 exercises/views/exercises.py:431
#: exercises/views/muscles.py:125 gallery/views/images.py:121
#: gym/views/admin_notes.py:196 gym/views/document.py:206 gym/views/gym.py:486
#: manager/views/schedule.py:318 manager/views/schedule_step.py:139
@@ -1461,7 +1454,7 @@ msgstr "Ta bort {0}?"
#: core/views/languages.py:111 core/views/license.py:84
#: core/views/repetition_units.py:85 core/views/user.py:456
#: core/views/weight_units.py:85 exercises/views/categories.py:97
-#: exercises/views/equipment.py:83 exercises/views/exercises.py:304
+#: exercises/views/equipment.py:83 exercises/views/exercises.py:305
#: exercises/views/muscles.py:105 gym/views/admin_notes.py:160
#: gym/views/config.py:68 gym/views/contract.py:186
#: gym/views/contract_option.py:123 gym/views/contract_type.py:123
@@ -1551,7 +1544,7 @@ msgstr "Primära muskler"
#: exercises/models/base.py:64 exercises/templates/equipment/overview.html:71
#: exercises/templates/exercise/overview.html:76
-#: exercises/templates/exercise/view.html:218
+#: exercises/templates/exercise/view.html:268
#: exercises/templates/muscles/overview.html:73
msgid "Secondary muscles"
msgstr "Sekundära muskler"
@@ -1564,8 +1557,9 @@ msgstr ""
msgid "Exercise Categories"
msgstr "Övningskategorier"
-#: exercises/models/comment.py:34 exercises/models/image.py:62
-#: manager/forms.py:165 manager/helpers.py:89 manager/models/log.py:51
+#: exercises/models/comment.py:34 exercises/models/image.py:75
+#: exercises/models/video.py:82 manager/forms.py:165 manager/helpers.py:89
+#: manager/models/log.py:51
msgid "Exercise"
msgstr "Träning"
@@ -1578,32 +1572,54 @@ msgstr "En kommentar om hur man utför denna övning korrekt."
msgid "Language"
msgstr "Språk"
-#: exercises/models/exercise.py:233 exercises/views/exercises.py:460
+#: exercises/models/exercise.py:237 exercises/views/exercises.py:461
msgid "Exercise was successfully added to the general database"
msgstr "Övningen har lagts till den allmänna databasen"
-#: exercises/models/exercise.py:261
+#: exercises/models/exercise.py:265
msgid "New user submitted exercise"
msgstr "Ny användarskapad övning"
-#: exercises/models/exercise.py:263
+#: exercises/models/exercise.py:267
#, python-brace-format
msgid "The user {0} submitted a new exercise \"{1}\"."
msgstr "Användaren {0} har laggt in en ny övning \"{1}\"."
-#: exercises/models/image.py:68 gallery/models/image.py:56
+#: exercises/models/image.py:59
+msgid "Line"
+msgstr ""
+
+#: exercises/models/image.py:60
+msgid "3D"
+msgstr ""
+
+#: exercises/models/image.py:61
+msgid "Low-poly"
+msgstr ""
+
+#: exercises/models/image.py:62
+msgid "Photo"
+msgstr ""
+
+#: exercises/models/image.py:63
+#, fuzzy
+#| msgid "Others"
+msgid "Other"
+msgstr "Andra"
+
+#: exercises/models/image.py:81 gallery/models/image.py:56
msgid "Image"
msgstr "Bild"
-#: exercises/models/image.py:69 gallery/models/image.py:57
+#: exercises/models/image.py:82 gallery/models/image.py:57
msgid "Only PNG and JPEG formats are supported"
msgstr "PNG- och JPEG-format som stöds"
-#: exercises/models/image.py:75
+#: exercises/models/image.py:88
msgid "Main picture"
msgstr "Huvudbild"
-#: exercises/models/image.py:78
+#: exercises/models/image.py:91
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 "
@@ -1613,11 +1629,15 @@ msgstr ""
"(kommer visar i t.ex. sökresultaten). Den första bilden markeras automatiskt "
"av systemet."
-#: exercises/models/image.py:166
+#: exercises/models/image.py:100
+msgid "The art style of your image"
+msgstr ""
+
+#: exercises/models/image.py:185
msgid "New user submitted image"
msgstr "Ny användaruppladdad bild"
-#: exercises/models/image.py:167
+#: exercises/models/image.py:186
#, python-brace-format
msgid "The user {0} submitted a new image \"{1}\" for exercise {2}."
msgstr "Användaren {0} har laggt in en ny bild {1} för övning {2}."
@@ -1626,6 +1646,56 @@ msgstr "Användaren {0} har laggt in en ny bild {1} för övning {2}."
msgid "In latin, e.g. \"Pectoralis major\""
msgstr "På latin, e.g. \"Pectoralis major\""
+#: exercises/models/video.py:41
+msgid "Maximum file size is 100MB."
+msgstr ""
+
+#: exercises/models/video.py:44 exercises/models/video.py:48
+msgid "File type is not supported"
+msgstr ""
+
+#: exercises/models/video.py:57
+msgid "File is not a valid video"
+msgstr ""
+
+#: exercises/models/video.py:88
+#, fuzzy
+#| msgid "Main picture"
+msgid "Main video"
+msgstr "Huvudbild"
+
+#: exercises/models/video.py:94
+msgid "Video"
+msgstr ""
+
+#: exercises/models/video.py:101
+msgid "Size"
+msgstr ""
+
+#: exercises/models/video.py:108 manager/models/schedule_step.py:56
+msgid "Duration"
+msgstr "Längd"
+
+#: exercises/models/video.py:117
+msgid "Width"
+msgstr ""
+
+#: exercises/models/video.py:124
+#, fuzzy
+#| msgid "Weight"
+msgid "Height"
+msgstr "Vikt"
+
+#: exercises/models/video.py:131
+#, fuzzy
+#| msgid "Code"
+msgid "Codec"
+msgstr "Kod"
+
+#: exercises/models/video.py:139
+msgid "Codec, long name"
+msgstr ""
+
#: exercises/templates/equipment/admin-overview.html:4
msgid "Equipment list"
msgstr "Utrustningslista"
@@ -1641,7 +1711,7 @@ msgstr "Utrustningsöversikt"
#: exercises/templates/equipment/overview.html:69
#: exercises/templates/exercise/overview.html:74
-#: exercises/templates/exercise/view.html:214
+#: exercises/templates/exercise/view.html:264
#: exercises/templates/muscles/overview.html:71
msgid "Main muscles"
msgstr "Huvudsakliga muskler"
@@ -1764,7 +1834,8 @@ msgstr "Inlämningsdatum"
#: gym/templates/gym/new_user.html:22
#: gym/templates/gym/reset_user_password.html:20 manager/models/log.py:45
#: manager/models/schedule.py:44 manager/models/session.py:49
-#: manager/models/workout.py:89 nutrition/models/plan.py:55
+#: manager/models/workout.py:89 measurements/models/category.py:48
+#: measurements/models/measurement.py:59 nutrition/models/plan.py:55
#: nutrition/templates/ingredient/pending.html:16 weight/models.py:41
msgid "User"
msgstr "Användare"
@@ -1790,13 +1861,13 @@ msgid "Please select one of the options below."
msgstr "Vänligen välj ett av alternativen nedan."
#: exercises/templates/exercise/view.html:60
-#: exercises/templates/exercise/view.html:153
+#: exercises/templates/exercise/view.html:203
#: nutrition/templates/ingredient/view.html:38
msgid "Accept"
msgstr "Acceptera"
#: exercises/templates/exercise/view.html:64
-#: exercises/templates/exercise/view.html:154
+#: exercises/templates/exercise/view.html:204
#: nutrition/templates/ingredient/view.html:42
msgid "Decline"
msgstr "Neka"
@@ -1809,32 +1880,42 @@ msgstr "Bilder"
msgid "Add new image"
msgstr "Lägg till ny bild"
-#: exercises/templates/exercise/view.html:147
+#: exercises/templates/exercise/view.html:148
+msgid "Videos"
+msgstr ""
+
+#: exercises/templates/exercise/view.html:187 exercises/views/videos.py:94
+#, fuzzy
+#| msgid "Add new image"
+msgid "Add new video"
+msgstr "Lägg till ny bild"
+
+#: exercises/templates/exercise/view.html:197
msgid "Images pending review"
msgstr "Bilder i avvaktan på översyn"
-#: exercises/templates/exercise/view.html:168
+#: exercises/templates/exercise/view.html:218
msgid "Comments for this exercise"
msgstr "Kommentarer för denna övning"
-#: exercises/templates/exercise/view.html:196
+#: exercises/templates/exercise/view.html:246
msgid "Add new comment"
msgstr "Lägg till ny kommentar"
-#: exercises/templates/exercise/view.html:210
+#: exercises/templates/exercise/view.html:260
msgid "The diagram shows the most used muscles on this exercise"
msgstr "Diagrammet visar de mest använda musklerna i denna övning"
-#: exercises/templates/exercise/view.html:251
+#: exercises/templates/exercise/view.html:301
#: manager/templates/workout/log.html:10 manager/templates/workout/log.html:11
msgid "Weight log"
msgstr "Viktlogg"
-#: exercises/templates/exercise/view.html:256
+#: exercises/templates/exercise/view.html:306
msgid "Exercise Variations"
msgstr ""
-#: exercises/templates/exercise/view.html:277
+#: exercises/templates/exercise/view.html:327
msgid "Submit a correction"
msgstr "Skicka en korregering"
@@ -1869,30 +1950,30 @@ msgstr "Lägg till övningskommentar"
msgid "Delete equipment?"
msgstr "Ta bort utrustning?"
-#: exercises/views/exercises.py:228
+#: exercises/views/exercises.py:229
#, python-format
msgid ""
"%(name_original)s is too similar to existing exercise \"%(exercise_name)s\""
msgstr ""
-#: exercises/views/exercises.py:246
+#: exercises/views/exercises.py:247
msgid "Add exercise"
msgstr "Lägg till övning"
-#: exercises/views/exercises.py:366
+#: exercises/views/exercises.py:367
msgid "Thank you. Once the changes are reviewed the exercise will be updated."
msgstr "Tack. När ändringarna är översedda kommer övningen att uppdateras."
-#: exercises/views/exercises.py:379
+#: exercises/views/exercises.py:380
#, python-brace-format
msgid "Correct {0}"
msgstr "Korrekt {0}"
-#: exercises/views/exercises.py:421
+#: exercises/views/exercises.py:422
msgid "This will delete the exercise from all workouts."
msgstr "Detta kommer att radera övningen från alla pass."
-#: exercises/views/exercises.py:473
+#: exercises/views/exercises.py:474
msgid "Exercise was successfully marked as rejected"
msgstr "Övningen har markerats som avvisad"
@@ -1904,6 +1985,11 @@ msgstr "Redigera övningsbild"
msgid "Delete exercise image?"
msgstr "Ta bort övingsbild?"
+#: exercises/views/videos.py:144 nutrition/views/log.py:230
+#: nutrition/views/unit_ingredient.py:139
+msgid "Delete?"
+msgstr "Ta bort?"
+
#: gallery/templates/images/overview.html:62
#, fuzzy
#| msgid "Add new image"
@@ -1975,8 +2061,8 @@ msgid "Contract type"
msgstr "Kontrakttyp"
#: gym/models/contract.py:208 gym/templates/contract/view.html:59
-#: manager/templates/log/add.html:52 nutrition/forms.py:58
-#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:92
+#: manager/templates/log/add.html:52 nutrition/forms.py:59
+#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:102
#: nutrition/models/meal_item.py:72
msgid "Amount"
msgstr "Mängd"
@@ -2420,6 +2506,7 @@ msgstr ""
"mailen"
#: mailer/templates/mailer/gym/preview.html:22
+#: software/templates/about_us.html:59
msgid "Current version"
msgstr "Aktuell version"
@@ -2458,7 +2545,8 @@ msgstr ""
#: manager/models/log.py:90 manager/models/setting.py:47
#: manager/models/setting.py:78 manager/templates/log/add.html:53
#: manager/templates/log/add.html:55 manager/templates/set/formset.html:11
-#: manager/templates/set/formset.html:13 nutrition/forms.py:62
+#: manager/templates/set/formset.html:13 measurements/models/category.py:58
+#: nutrition/forms.py:63
msgid "Unit"
msgstr "Enhet"
@@ -2528,10 +2616,6 @@ msgstr ""
msgid "schedule"
msgstr "schema"
-#: manager/models/schedule_step.py:56
-msgid "Duration"
-msgstr "Längd"
-
#: manager/models/schedule_step.py:57
msgid "The duration in weeks"
msgstr "Varaktighet i veckor"
@@ -2807,7 +2891,7 @@ msgstr ""
#: manager/templates/schedule/view.html:290
#: manager/templates/workout/view.html:142
#: manager/templates/workout/view.html:217
-#: nutrition/templates/plan/view.html:415
+#: nutrition/templates/plan/view.html:417
msgid "Download as PDF"
msgstr "Ladda ner som PDF"
@@ -3051,23 +3135,27 @@ msgstr "Nytt träningspassintryck för {0}"
msgid "This will delete all weight logs for this day as well."
msgstr "Detta kommer ta bort alla viktloggar för denna dag med."
-#: nutrition/forms.py:121
+#: measurements/models/measurement.py:69
+msgid "Value"
+msgstr ""
+
+#: nutrition/forms.py:122
msgid "Calculate"
msgstr "Beräkna"
-#: nutrition/forms.py:194 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:195 nutrition/templates/rate/form.html:76
msgid "Basic caloric intake"
msgstr "Grundläggande kaloriintag"
-#: nutrition/forms.py:195
+#: nutrition/forms.py:196
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:201
+#: nutrition/forms.py:202
msgid "Additional calories"
msgstr "Extra kalorier"
-#: nutrition/forms.py:203
+#: nutrition/forms.py:204
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
@@ -3075,8 +3163,8 @@ msgstr ""
"Extra kalorier att lägga till basen (för att subtrahera, ange ett negativt "
"tal)"
-#: nutrition/forms.py:231 nutrition/models/ingredient_weight_unit.py:39
-#: nutrition/models/log.py:71 nutrition/models/meal_item.py:53
+#: nutrition/forms.py:232 nutrition/models/ingredient_weight_unit.py:39
+#: nutrition/models/log.py:81 nutrition/models/meal_item.py:53
#: nutrition/templates/log/detail.html:155
msgid "Ingredient"
msgstr "Ingrediens"
@@ -3095,14 +3183,14 @@ msgstr "I g per 100g av produkt"
#: nutrition/models/ingredient.py:123
#: nutrition/templates/ingredient/view.html:96
#: nutrition/templates/log/detail.html:78
-#: nutrition/templates/plan/view.html:262 nutrition/views/plan.py:406
+#: nutrition/templates/plan/view.html:264 nutrition/views/plan.py:406
msgid "Sugar content in carbohydrates"
msgstr "Sockerinehåll i kolhydraterna"
#: nutrition/models/ingredient.py:141
#: nutrition/templates/ingredient/view.html:112
#: nutrition/templates/log/detail.html:104
-#: nutrition/templates/plan/view.html:274 nutrition/views/plan.py:420
+#: nutrition/templates/plan/view.html:276 nutrition/views/plan.py:420
msgid "Saturated fat content in fats"
msgstr "Mättat-fett innehåll i fettet"
@@ -3110,7 +3198,7 @@ msgstr "Mättat-fett innehåll i fettet"
#: nutrition/templates/ingredient/view.html:134
#: nutrition/templates/log/detail.html:122
#: nutrition/templates/log/detail.html:178
-#: nutrition/templates/plan/view.html:285 nutrition/views/plan.py:426
+#: nutrition/templates/plan/view.html:287 nutrition/views/plan.py:426
msgid "Fibres"
msgstr "Fibrer"
@@ -3118,7 +3206,7 @@ msgstr "Fibrer"
#: nutrition/templates/ingredient/view.html:144
#: nutrition/templates/log/detail.html:135
#: nutrition/templates/log/detail.html:181
-#: nutrition/templates/plan/view.html:291 nutrition/views/plan.py:432
+#: nutrition/templates/plan/view.html:293 nutrition/views/plan.py:432
msgid "Sodium"
msgstr "Natrium"
@@ -3163,10 +3251,20 @@ 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:55
+msgid "Meal"
+msgstr "Måltid"
+
#: nutrition/models/meal.py:61
msgid "Time (approx)"
msgstr "Tid (ca)"
+#: nutrition/models/meal.py:68
+msgid ""
+"Give meals a textual description / name such as \"Breakfast\" or \"after "
+"workout\""
+msgstr ""
+
#: nutrition/models/plan.py:71
msgid ""
"A description of the goal of the plan, e.g. \"Gain mass\" or \"Prepare for "
@@ -3313,12 +3411,12 @@ msgstr ""
#: nutrition/templates/ingredient/view.html:71
#: nutrition/templates/log/detail.html:31
-#: nutrition/templates/plan/view.html:227 nutrition/views/plan.py:376
+#: nutrition/templates/plan/view.html:229 nutrition/views/plan.py:376
msgid "Macronutrients"
msgstr "Makronäringsämnen"
#: nutrition/templates/ingredient/view.html:80
-#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:244
+#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:246
msgid "kJ"
msgstr ""
@@ -3331,7 +3429,7 @@ msgstr "n.A."
#: nutrition/templates/ingredient/view.html:128
#: nutrition/templates/log/detail.html:119
-#: nutrition/templates/plan/view.html:282
+#: nutrition/templates/plan/view.html:284
msgid "Others"
msgstr "Andra"
@@ -3360,7 +3458,7 @@ msgstr "Ta bort ingrediens"
#: nutrition/templates/log/detail.html:7
#: nutrition/templates/log/overview.html:7
-#: nutrition/templates/plan/view.html:300
+#: nutrition/templates/plan/view.html:302
msgid "Nutrition diary"
msgstr ""
@@ -3370,13 +3468,13 @@ msgstr ""
#: nutrition/templates/log/detail.html:33
#: nutrition/templates/log/overview.html:31
-#: nutrition/templates/plan/view.html:308
+#: nutrition/templates/plan/view.html:310
msgid "Logged"
msgstr ""
#: nutrition/templates/log/detail.html:34
#: nutrition/templates/log/overview.html:32
-#: nutrition/templates/plan/view.html:309
+#: nutrition/templates/plan/view.html:311
msgid "Difference"
msgstr ""
@@ -3389,7 +3487,7 @@ msgid "g"
msgstr "g"
#: nutrition/templates/log/overview.html:53
-#: nutrition/templates/plan/view.html:330
+#: nutrition/templates/plan/view.html:332
msgid "nothing found"
msgstr ""
@@ -3409,56 +3507,56 @@ msgstr ""
msgid "Add ingredient to meal"
msgstr ""
-#: nutrition/templates/plan/view.html:150
+#: nutrition/templates/plan/view.html:152
msgid "No items for this meal."
msgstr "Inga objekt i denna måltid."
-#: nutrition/templates/plan/view.html:188
+#: nutrition/templates/plan/view.html:190
msgid "No meals for this plan."
msgstr "Inga måltider i denna plan."
-#: nutrition/templates/plan/view.html:200
+#: nutrition/templates/plan/view.html:202
msgid "Log this Plan"
msgstr ""
-#: nutrition/templates/plan/view.html:206
+#: nutrition/templates/plan/view.html:208
msgid "Add a new meal"
msgstr "Lägg till en ny måltid"
-#: nutrition/templates/plan/view.html:216 nutrition/views/plan.py:369
+#: nutrition/templates/plan/view.html:218 nutrition/views/plan.py:369
msgid "Nutritional data"
msgstr "Näringsdata"
-#: nutrition/templates/plan/view.html:219
+#: nutrition/templates/plan/view.html:221
#, python-format
msgid "Based on the weight entry dated %(date)s (%(weight)s)"
msgstr ""
-#: nutrition/templates/plan/view.html:228 nutrition/views/plan.py:377
+#: nutrition/templates/plan/view.html:230 nutrition/views/plan.py:377
msgid "Total"
msgstr "Totalt"
-#: nutrition/templates/plan/view.html:229 nutrition/views/plan.py:378
+#: nutrition/templates/plan/view.html:231 nutrition/views/plan.py:378
msgid "Percent of energy"
msgstr "Procent av energi"
-#: nutrition/templates/plan/view.html:232 nutrition/views/plan.py:379
+#: nutrition/templates/plan/view.html:234 nutrition/views/plan.py:379
msgid "g per body kg"
msgstr "g / kroppsvikt (kg)"
-#: nutrition/templates/plan/view.html:234
+#: nutrition/templates/plan/view.html:236
msgid "oz per body lb"
msgstr "oz / kroppsvikt (lb)"
-#: nutrition/templates/plan/view.html:338
+#: nutrition/templates/plan/view.html:340
msgid "View complete nutrition log"
msgstr ""
-#: nutrition/templates/plan/view.html:371
+#: nutrition/templates/plan/view.html:373
msgid "Goal"
msgstr "Mål"
-#: nutrition/templates/plan/view.html:382
+#: nutrition/templates/plan/view.html:384
#, fuzzy
#| msgid ""
#| "You have selected that this nutritional plan has a\n"
@@ -3472,7 +3570,7 @@ msgstr ""
"Du har valt att denna näringsplan ska ha ett kalorimål. Använd kalkylatorn "
"eller ange värdet själv."
-#: nutrition/templates/plan/view.html:392
+#: nutrition/templates/plan/view.html:394
msgid ""
"If you find the ingredient list too short, you might want to activate the "
"preference to also show English ingredients."
@@ -3480,15 +3578,15 @@ msgstr ""
"Om du finner ingredienslistan för kort kanske du vill aktivera inställningen "
"att också visa ingredienser på engelska."
-#: nutrition/templates/plan/view.html:421
+#: nutrition/templates/plan/view.html:423
msgid "Edit nutrition plan"
msgstr "Redigera kost plan"
-#: nutrition/templates/plan/view.html:425
+#: nutrition/templates/plan/view.html:427
msgid "Make a copy of this nutrition plan"
msgstr "Skapa en kopia av denna kostplan"
-#: nutrition/templates/plan/view.html:431
+#: nutrition/templates/plan/view.html:433
msgid "Delete nutrition plan"
msgstr "Ta bort kostplan"
@@ -3583,10 +3681,6 @@ msgstr "Lägg till en ny ingrediens"
msgid "Ingredient was successfully marked as rejected"
msgstr "Ingrediensen har markerats som nekad"
-#: nutrition/views/log.py:229 nutrition/views/unit_ingredient.py:139
-msgid "Delete?"
-msgstr "Ta bort?"
-
#: nutrition/views/meal.py:55
msgid "Add new meal"
msgstr "Lägg till ny måltid"
@@ -3999,11 +4093,11 @@ msgstr "Du kan korrigera listan här och skicka om den så ofta du vill."
msgid "Re-Submit"
msgstr "Skicka igen"
-#: weight/templates/overview.html:68
+#: weight/templates/overview.html:51
msgid "Export as CSV"
msgstr "Exportera som CSV"
-#: weight/templates/overview.html:72
+#: weight/templates/overview.html:55
msgid "Import from spreadsheet"
msgstr "Importera från kalkylblad"
@@ -4021,6 +4115,12 @@ msgstr ""
msgid "Delete weight entry for the %s"
msgstr ""
+#~ msgid "Your current weight is: "
+#~ msgstr "Din nuvarande vikt är: "
+
+#~ msgid "Released under the Affero GPL"
+#~ msgstr "Släppt under GPL Affero"
+
#~ msgid "Responsible for the content of this site as per German law §5 TMG:"
#~ msgstr "Ansvarig för innehållet på denna webbplats enligt tysk lag §5 TMG:"
@@ -4155,9 +4255,6 @@ msgstr ""
#~ "intresserad, gå till webbplatsen transifex, begär åtkomst så kommer vi "
#~ "att inrätta allt. "
-#~ msgid "Code"
-#~ msgstr "Kod"
-
#~ msgid ""
#~ "Obviously, you are highly encouraged to clone the\n"
#~ "repo and start hacking! Once you are ready, send a pull request and we\n"
@@ -4284,9 +4381,6 @@ msgstr ""
#~ msgid "Pause!"
#~ msgstr "Pausa!"
-#~ msgid "Meal"
-#~ msgstr "Måltid"
-
#~ msgid "There is no chart here because there are no weight entries."
#~ msgstr ""
#~ "Det finns inga diagram här eftersom det inte finns några viktinträden."
diff --git a/wger/locale/tr/LC_MESSAGES/django.po b/wger/locale/tr/LC_MESSAGES/django.po
index 188f90315..caa3763cb 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: 2021-08-17 17:23+0200\n"
+"POT-Creation-Date: 2022-02-15 14:51+0100\n"
"PO-Revision-Date: 2021-08-27 19:38+0000\n"
"Last-Translator: Oğuz Ersen <[email protected]>\n"
"Language-Team: Turkish <https://hosted.weblate.org/projects/wger/web/tr/>\n"
@@ -52,16 +52,16 @@ msgstr "Diller"
msgid "Nothing found."
msgstr "Bulunamadı."
-#: config/templates/language/overview.html:16 core/templates/index.html:147
-#: core/templates/index.html:199 manager/templates/calendar/month.html:132
+#: config/templates/language/overview.html:16 core/templates/index.html:137
+#: core/templates/index.html:189 manager/templates/calendar/month.html:132
#: manager/templates/schedule/overview.html:28
#: manager/templates/schedule/view.html:146
#: manager/templates/workout/overview.html:28
#: nutrition/templates/ingredient/overview.html:45
#: nutrition/templates/plan/overview.html:23
-#: nutrition/templates/plan/view.html:148
-#: nutrition/templates/plan/view.html:151
-#: nutrition/templates/plan/view.html:189
+#: nutrition/templates/plan/view.html:150
+#: nutrition/templates/plan/view.html:153
+#: nutrition/templates/plan/view.html:191
msgid "Add one now."
msgstr "Yeni ekle."
@@ -82,7 +82,7 @@ msgstr "Yeni ekle."
#: gym/templates/gym/member_list.html:244
#: gym/templates/gym/member_list.html:281
#: mailer/templates/mailer/gym/overview.html:43
-#: weight/templates/overview.html:78
+#: weight/templates/overview.html:61
msgid "Add"
msgstr "Ekle"
@@ -121,14 +121,14 @@ msgstr "Göster"
#: config/templates/language/view.html:91 core/templates/user/api_key.html:44
#: core/templates/user/preferences.html:28
-#: exercises/templates/exercise/view.html:273
-#: exercises/templates/exercise/view.html:296 gym/models/contract.py:200
+#: exercises/templates/exercise/view.html:323
+#: exercises/templates/exercise/view.html:346 gym/models/contract.py:200
#: gym/templates/contract/view.html:41 gym/templates/contract/view.html:106
#: gym/templates/gym/member_list.html:248
#: manager/templates/schedule/view.html:281
#: manager/templates/workout/view.html:206
#: nutrition/templates/ingredient/view.html:226
-#: nutrition/templates/plan/view.html:409 weight/templates/overview.html:62
+#: nutrition/templates/plan/view.html:411 weight/templates/overview.html:45
msgid "Options"
msgstr "Seçenekler"
@@ -142,12 +142,12 @@ msgstr "Seçenekler"
#: core/templates/weight_unit/list.html:17
#: exercises/templates/categories/admin-overview.html:16
#: exercises/templates/equipment/admin-overview.html:16
-#: exercises/templates/exercise/view.html:180
-#: exercises/templates/exercise/view.html:301
+#: exercises/templates/exercise/view.html:230
+#: exercises/templates/exercise/view.html:351
#: exercises/templates/muscles/admin-overview.html:16
-#: exercises/views/comments.py:63 gallery/views/images.py:96
-#: gym/templates/admin_notes/list.html:32 gym/templates/contract/list.html:31
-#: gym/templates/contract/view.html:107
+#: exercises/views/comments.py:63 exercises/views/videos.py:69
+#: gallery/views/images.py:96 gym/templates/admin_notes/list.html:32
+#: gym/templates/contract/list.html:31 gym/templates/contract/view.html:107
#: gym/templates/contract_option/list.html:31
#: gym/templates/contract_type/list.html:31 gym/templates/document/list.html:38
#: gym/templates/gym/list.html:19 gym/templates/gym/list.html:43
@@ -158,7 +158,7 @@ msgstr "Seçenekler"
#: manager/templates/calendar/partial_overview_table.html:18
#: manager/templates/schedule/view.html:121
#: nutrition/templates/ingredient/view.html:198
-#: nutrition/templates/plan/view.html:89 nutrition/templates/plan/view.html:124
+#: nutrition/templates/plan/view.html:89 nutrition/templates/plan/view.html:126
#: nutrition/templates/units/list.html:18
msgid "Edit"
msgstr "Düzenle"
@@ -172,9 +172,9 @@ msgstr "Düzenle"
#: exercises/templates/categories/admin-overview.html:17
#: exercises/templates/equipment/admin-overview.html:17
#: exercises/templates/exercise/view.html:68
-#: exercises/templates/exercise/view.html:155
-#: exercises/templates/exercise/view.html:185
-#: exercises/templates/exercise/view.html:306
+#: exercises/templates/exercise/view.html:205
+#: exercises/templates/exercise/view.html:235
+#: exercises/templates/exercise/view.html:356
#: exercises/templates/muscles/admin-overview.html:17
#: gym/templates/admin_notes/list.html:40
#: gym/templates/contract_option/list.html:39
@@ -187,7 +187,7 @@ msgstr "Düzenle"
#: nutrition/templates/ingredient/view.html:199
#: nutrition/templates/ingredient/view.html:239
#: nutrition/templates/log/detail.html:197
-#: nutrition/templates/plan/view.html:95 nutrition/templates/plan/view.html:130
+#: nutrition/templates/plan/view.html:95 nutrition/templates/plan/view.html:132
#: nutrition/templates/units/list.html:20
msgid "Delete"
msgstr "Sil"
@@ -315,7 +315,7 @@ msgid "Some way of answering you (e-mail, etc.)"
msgstr "Size cevap vermenin bir yolu (e-posta vb.)"
#: core/forms.py:265 exercises/models/comment.py:40 manager/models/set.py:60
-#: manager/models/setting.py:99 nutrition/models/log.py:61
+#: manager/models/setting.py:99 nutrition/models/log.py:71
msgid "Comment"
msgstr "Yorum"
@@ -457,7 +457,7 @@ msgstr ""
msgid "Age"
msgstr "Yaş"
-#: core/models/profile.py:202 nutrition/forms.py:98
+#: core/models/profile.py:202 nutrition/forms.py:99
msgid "Height (cm)"
msgstr "Boy (cm)"
@@ -508,7 +508,7 @@ msgid "Total caloric intake, including e.g. any surplus"
msgstr "Toplam kalori alımı, örn. herhangi bir fazlalık"
#: core/models/profile.py:305 nutrition/models/ingredient_weight_unit.py:45
-#: nutrition/models/log.py:80 nutrition/models/meal_item.py:58
+#: nutrition/models/log.py:90 nutrition/models/meal_item.py:58
msgid "Weight unit"
msgstr "Ağırlık birimi"
@@ -547,9 +547,9 @@ msgstr "Tüm saatlerin toplamı 24 olmalıdır"
#: gym/models/user_document.py:87 gym/templates/contract/view.html:50
#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:96
#: gym/views/gym.py:156 manager/models/schedule.py:55
-#: manager/models/workout.py:56 nutrition/models/ingredient.py:96
-#: nutrition/models/ingredient_category.py:26
-#: nutrition/models/weight_unit.py:38
+#: manager/models/workout.py:56 measurements/models/category.py:53
+#: nutrition/models/ingredient.py:96 nutrition/models/ingredient_category.py:26
+#: nutrition/models/meal.py:66 nutrition/models/weight_unit.py:38
#: nutrition/templates/ingredient/pending.html:15
#: nutrition/templates/ingredient/view.html:185
msgid "Name"
@@ -609,11 +609,11 @@ msgstr "Bunu silmek istediğinizden emin misiniz? Bu eylem geri alınamaz."
msgid "Dashboard"
msgstr "Gösterge Paneli"
-#: core/templates/index.html:31 manager/templates/calendar/month.html:115
+#: core/templates/index.html:21 manager/templates/calendar/month.html:115
msgid "Add log to day"
msgstr "Günlüğü güne ekle"
-#: core/templates/index.html:35 manager/templates/calendar/month.html:120
+#: core/templates/index.html:25 manager/templates/calendar/month.html:120
msgid ""
"Click to add weight logs to a training\n"
"day in your current workout:"
@@ -621,7 +621,7 @@ msgstr ""
"Bir egzersize ağırlık günlükleri eklemek için tıklayın\n"
"mevcut antrenmanınızdaki gün:"
-#: core/templates/index.html:43 core/templates/index.html:83
+#: core/templates/index.html:33 core/templates/index.html:73
#: core/templates/misc/fragments/shariff_modal.html:29
#: core/templates/template.html:125 manager/templates/calendar/month.html:138
#: manager/templates/schedule/view.html:246
@@ -631,11 +631,11 @@ msgstr ""
msgid "Close"
msgstr "Kapat"
-#: core/templates/index.html:54 core/templates/index.html:203
+#: core/templates/index.html:44 core/templates/index.html:193
msgid "Add new diary entry"
msgstr "Yeni günlük girişi ekle"
-#: core/templates/index.html:59
+#: core/templates/index.html:49
msgid ""
"Click to add an entry to your nutrition diary for today. You can either log "
"a meal as you defined it, or entry any number of custom entries."
@@ -644,7 +644,7 @@ msgstr ""
"tanımladığınız şekilde günlüğe kaydedebilir veya herhangi bir sayıda özel "
"giriş girebilirsiniz."
-#: core/templates/index.html:67 core/templates/index.html:171
+#: core/templates/index.html:57 core/templates/index.html:161
#: core/templates/user/overview.html:171
#: nutrition/templates/ingredient/view.html:79
#: nutrition/templates/log/detail.html:40
@@ -653,19 +653,19 @@ msgstr ""
#: nutrition/templates/log/overview.html:7
#: nutrition/templates/log/overview.html:44
#: nutrition/templates/plan/overview.html:17
-#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:242
-#: nutrition/templates/plan/view.html:301
-#: nutrition/templates/plan/view.html:321
-#: nutrition/templates/plan/view.html:363
-#: nutrition/templates/plan/view.html:373
+#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:244
+#: nutrition/templates/plan/view.html:303
+#: nutrition/templates/plan/view.html:323
+#: nutrition/templates/plan/view.html:365
+#: nutrition/templates/plan/view.html:375
msgid "kcal"
msgstr "kcal"
-#: core/templates/index.html:79 nutrition/templates/plan/view.html:348
+#: core/templates/index.html:69 nutrition/templates/plan/view.html:350
msgid "Add custom diary entry"
msgstr "Özel günlük girişi ekle"
-#: core/templates/index.html:94 core/templates/index.html:102
+#: core/templates/index.html:84 core/templates/index.html:92
#: manager/models/day.py:34 manager/models/log.py:56
#: manager/models/session.py:60 manager/models/workout.py:109
#: manager/templates/schedule/view.html:105
@@ -676,11 +676,11 @@ msgstr "Özel günlük girişi ekle"
msgid "Workout"
msgstr "Antrenman"
-#: core/templates/index.html:128
+#: core/templates/index.html:118
msgid "This workout is part of a schedule:"
msgstr "Bu antrenman bir programın parçasıdır:"
-#: core/templates/index.html:133
+#: core/templates/index.html:123
msgid ""
"The current workout is selected from your active schedule or, if you don't "
"have one, simply by date."
@@ -688,70 +688,70 @@ msgstr ""
"Mevcut antrenman, aktif programınızdan veya eğer yoksa sadece tarihe göre "
"seçilir."
-#: core/templates/index.html:142 manager/templates/calendar/month.html:188
+#: core/templates/index.html:132 manager/templates/calendar/month.html:188
msgid "Add new log"
msgstr "Yeni günlük ekle"
-#: core/templates/index.html:147 core/templates/user/overview.html:58
+#: core/templates/index.html:137 core/templates/user/overview.html:58
#: manager/templates/calendar/month.html:128
#: manager/templates/schedule/view.html:146
#: manager/templates/workout/overview.html:28
msgid "No workouts found."
msgstr "Antrenman bulunamadı."
-#: core/templates/index.html:157 nutrition/models/log.py:48
+#: core/templates/index.html:147 nutrition/models/log.py:49
#: nutrition/models/meal.py:49 nutrition/models/meal_item.py:47
#: nutrition/models/plan.py:94 nutrition/templates/plan/view.html:11
#: nutrition/templates/plan/view.html:19
msgid "Nutrition plan"
msgstr "Beslenme planı"
-#: core/templates/index.html:169 core/templates/user/overview.html:155
+#: core/templates/index.html:159 core/templates/user/overview.html:155
#: nutrition/models/ingredient.py:100
#: nutrition/templates/ingredient/view.html:77
#: nutrition/templates/log/detail.html:39
#: nutrition/templates/log/detail.html:156
-#: nutrition/templates/plan/view.html:53 nutrition/templates/plan/view.html:241
-#: nutrition/templates/plan/view.html:358
-#: nutrition/templates/plan/view.html:362 nutrition/views/plan.py:384
+#: nutrition/templates/plan/view.html:53 nutrition/templates/plan/view.html:243
+#: nutrition/templates/plan/view.html:360
+#: nutrition/templates/plan/view.html:364 nutrition/views/plan.py:384
msgid "Energy"
msgstr "Enerji"
-#: core/templates/index.html:175 core/templates/user/overview.html:156
+#: core/templates/index.html:165 core/templates/user/overview.html:156
#: nutrition/models/ingredient.py:105
#: nutrition/templates/ingredient/view.html:84
#: nutrition/templates/log/detail.html:52
#: nutrition/templates/log/detail.html:174
-#: nutrition/templates/plan/view.html:54 nutrition/templates/plan/view.html:249
+#: nutrition/templates/plan/view.html:54 nutrition/templates/plan/view.html:251
#: nutrition/views/plan.py:390
msgid "Protein"
msgstr "Protein"
-#: core/templates/index.html:181 core/templates/user/overview.html:157
+#: core/templates/index.html:171 core/templates/user/overview.html:157
#: nutrition/models/ingredient.py:113
#: nutrition/templates/ingredient/view.html:90
#: nutrition/templates/log/detail.html:65
#: nutrition/templates/log/detail.html:175
-#: nutrition/templates/plan/view.html:55 nutrition/templates/plan/view.html:255
+#: nutrition/templates/plan/view.html:55 nutrition/templates/plan/view.html:257
#: nutrition/views/plan.py:398
msgid "Carbohydrates"
msgstr "Karbonhidratlar"
-#: core/templates/index.html:187 core/templates/user/overview.html:158
+#: core/templates/index.html:177 core/templates/user/overview.html:158
#: nutrition/models/ingredient.py:131
#: nutrition/templates/ingredient/view.html:106
#: nutrition/templates/log/detail.html:91
#: nutrition/templates/log/detail.html:176
-#: nutrition/templates/plan/view.html:56 nutrition/templates/plan/view.html:268
+#: nutrition/templates/plan/view.html:56 nutrition/templates/plan/view.html:270
#: nutrition/views/plan.py:412
msgid "Fat"
msgstr "Yağ"
-#: core/templates/index.html:199 nutrition/templates/plan/overview.html:22
+#: core/templates/index.html:189 nutrition/templates/plan/overview.html:22
msgid "No nutrition plans."
msgstr "Beslenme planı yok."
-#: core/templates/index.html:213 core/templates/user/overview.html:112
+#: core/templates/index.html:203 core/templates/user/overview.html:112
#: core/templates/user/overview.html:121 manager/forms.py:173
#: manager/helpers.py:89 manager/models/log.py:84 manager/models/setting.py:67
#: manager/templates/log/add.html:54 manager/templates/set/formset.html:12
@@ -760,11 +760,7 @@ msgstr "Beslenme planı yok."
msgid "Weight"
msgstr "Kilo"
-#: core/templates/index.html:217
-msgid "Your current weight is: "
-msgstr "Şu anki kilonuz: "
-
-#: core/templates/index.html:248 core/templates/navigation.html:97
+#: core/templates/index.html:210 core/templates/navigation.html:97
#: weight/views.py:70
msgid "Add weight entry"
msgstr "Kilo girişi ekleyin"
@@ -796,7 +792,7 @@ msgstr "Lisans listesi"
msgid "Nothing found"
msgstr "Hiçbir şey Bulunamadı"
-#: core/templates/misc/about.html:4 core/templates/template.html:201
+#: core/templates/misc/about.html:4 core/templates/template.html:175
#: core/templates/template_features.html:118
#: core/templates/template_no_context.html:88
msgid "Imprint"
@@ -814,8 +810,8 @@ msgstr ""
"gerekir."
#: core/templates/misc/fragments/shariff_modal.html:22
-#: nutrition/templates/plan/view.html:385
-#: nutrition/templates/plan/view.html:394
+#: nutrition/templates/plan/view.html:387
+#: nutrition/templates/plan/view.html:396
msgid "That's done here"
msgstr "Bu burada yapılır"
@@ -903,7 +899,7 @@ msgstr "Egzersiz kontrol edilmek için bekliyor"
msgid "Equipment"
msgstr "Ekipman"
-#: core/templates/navigation.html:78 exercises/templates/exercise/view.html:208
+#: core/templates/navigation.html:78 exercises/templates/exercise/view.html:258
msgid "Muscles"
msgstr "Kaslar"
@@ -976,7 +972,7 @@ msgstr "Geliştirici belgeleri"
msgid "Get the code"
msgstr "Kodu alın"
-#: core/templates/navigation.html:175 core/templates/template.html:193
+#: core/templates/navigation.html:175 core/templates/template.html:205
#: core/templates/template_features.html:100
msgid "Translate"
msgstr "Çevir"
@@ -1130,15 +1126,11 @@ msgstr ""
msgid "Create some demo entries"
msgstr "Bazı demo girişleri oluşturun"
-#: core/templates/template.html:202 core/templates/template_features.html:122
+#: core/templates/template.html:176 core/templates/template_features.html:122
#: core/templates/template_no_context.html:89 software/templates/tos.html:7
msgid "Terms of service"
msgstr "Kullanım Şartları"
-#: core/templates/template.html:209 core/templates/template.html:210
-msgid "Released under the Affero GPL"
-msgstr "Affero GPL altında yayınlandı"
-
#: core/templates/template_features.html:62 software/templates/features.html:9
#: software/templates/features.html:120
msgid "Features"
@@ -1245,9 +1237,10 @@ msgstr "Antrenman ekle"
#: core/templates/user/overview.html:120 core/templates/user/overview.html:153
#: exercises/models/exercise.py:77 gallery/models/image.py:47
#: manager/helpers.py:88 manager/models/log.py:98 manager/models/session.py:67
-#: nutrition/models/ingredient.py:85 nutrition/models/ingredient.py:87
-#: nutrition/models/ingredient.py:190 nutrition/templates/log/overview.html:30
-#: nutrition/templates/plan/view.html:307 weight/models.py:32
+#: measurements/models/measurement.py:64 nutrition/models/ingredient.py:85
+#: nutrition/models/ingredient.py:87 nutrition/models/ingredient.py:190
+#: nutrition/templates/log/overview.html:30
+#: nutrition/templates/plan/view.html:309 weight/models.py:32
#: weight/templates/import_csv_preview.html:13
#: weight/templates/import_csv_preview.html:42 weight/views.py:150
msgid "Date"
@@ -1255,10 +1248,10 @@ msgstr "Tarih"
#: core/templates/user/overview.html:35 core/templates/user/overview.html:154
#: exercises/models/exercise.py:61 exercises/templates/exercise/view.html:88
-#: exercises/views/exercises.py:189 gallery/models/image.py:70
+#: exercises/views/exercises.py:190 gallery/models/image.py:70
#: gym/models/contract.py:57 gym/models/contract.py:107
#: manager/models/day.py:37 manager/models/workout.py:62
-#: nutrition/models/plan.py:69
+#: measurements/models/measurement.py:79 nutrition/models/plan.py:69
msgid "Description"
msgstr "Açıklama"
@@ -1421,11 +1414,11 @@ msgstr "Tercihler"
msgid "Change password"
msgstr "Parola değiştir"
-#: core/templatetags/wger_extras.py:217
+#: core/templatetags/wger_extras.py:229
msgid "kg"
msgstr "kilogram"
-#: core/templatetags/wger_extras.py:219
+#: core/templatetags/wger_extras.py:231
#: nutrition/templates/ingredient/view.html:86
#: nutrition/templates/ingredient/view.html:92
#: nutrition/templates/ingredient/view.html:99
@@ -1437,28 +1430,28 @@ msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr "g"
-#: core/templatetags/wger_extras.py:222
+#: core/templatetags/wger_extras.py:234
msgid "lb"
msgstr "1 pound = 0.45 kg"
-#: core/templatetags/wger_extras.py:224
+#: core/templatetags/wger_extras.py:236
msgctxt "weight unit, i.e. ounces"
msgid "oz"
msgstr "oz"
#: core/views/languages.py:85 exercises/views/categories.py:121
-#: exercises/views/equipment.py:106 exercises/views/exercises.py:422
+#: exercises/views/equipment.py:106 exercises/views/exercises.py:423
#: exercises/views/images.py:128 exercises/views/muscles.py:118
-#: manager/views/schedule.py:311 manager/views/schedule_step.py:129
-#: manager/views/workout.py:268 manager/views/workout_session.py:141
-#: nutrition/views/ingredient.py:144 nutrition/views/plan.py:120
-#: nutrition/views/unit.py:111
+#: exercises/views/videos.py:129 manager/views/schedule.py:311
+#: manager/views/schedule_step.py:129 manager/views/workout.py:268
+#: manager/views/workout_session.py:141 nutrition/views/ingredient.py:144
+#: nutrition/views/plan.py:120 nutrition/views/unit.py:111
msgid "Successfully deleted"
msgstr "Başarıyla silindi"
#: core/views/languages.py:93 core/views/license.py:103
#: core/views/repetition_units.py:115 core/views/weight_units.py:115
-#: exercises/views/categories.py:127 exercises/views/exercises.py:430
+#: exercises/views/categories.py:127 exercises/views/exercises.py:431
#: exercises/views/muscles.py:125 gallery/views/images.py:121
#: gym/views/admin_notes.py:196 gym/views/document.py:206 gym/views/gym.py:486
#: manager/views/schedule.py:318 manager/views/schedule_step.py:139
@@ -1472,7 +1465,7 @@ msgstr "{0} silinsin mi?"
#: core/views/languages.py:111 core/views/license.py:84
#: core/views/repetition_units.py:85 core/views/user.py:456
#: core/views/weight_units.py:85 exercises/views/categories.py:97
-#: exercises/views/equipment.py:83 exercises/views/exercises.py:304
+#: exercises/views/equipment.py:83 exercises/views/exercises.py:305
#: exercises/views/muscles.py:105 gym/views/admin_notes.py:160
#: gym/views/config.py:68 gym/views/contract.py:186
#: gym/views/contract_option.py:123 gym/views/contract_type.py:123
@@ -1562,7 +1555,7 @@ msgstr "Birincil kaslar"
#: exercises/models/base.py:64 exercises/templates/equipment/overview.html:71
#: exercises/templates/exercise/overview.html:76
-#: exercises/templates/exercise/view.html:218
+#: exercises/templates/exercise/view.html:268
#: exercises/templates/muscles/overview.html:73
msgid "Secondary muscles"
msgstr "İkincil kaslar"
@@ -1575,8 +1568,9 @@ msgstr "Varyasyonlar"
msgid "Exercise Categories"
msgstr "Egzersiz Kategorileri"
-#: exercises/models/comment.py:34 exercises/models/image.py:62
-#: manager/forms.py:165 manager/helpers.py:89 manager/models/log.py:51
+#: exercises/models/comment.py:34 exercises/models/image.py:75
+#: exercises/models/video.py:82 manager/forms.py:165 manager/helpers.py:89
+#: manager/models/log.py:51
msgid "Exercise"
msgstr "Egzersiz"
@@ -1589,32 +1583,54 @@ msgstr "Bu alıştırmanın nasıl doğru bir şekilde yapılacağına dair bir
msgid "Language"
msgstr "Dil"
-#: exercises/models/exercise.py:233 exercises/views/exercises.py:460
+#: exercises/models/exercise.py:237 exercises/views/exercises.py:461
msgid "Exercise was successfully added to the general database"
msgstr "Egzersiz genel veri tabanına başarıyla eklendi"
-#: exercises/models/exercise.py:261
+#: exercises/models/exercise.py:265
msgid "New user submitted exercise"
msgstr "Yeni kullanıcı gönderilen egzersiz"
-#: exercises/models/exercise.py:263
+#: exercises/models/exercise.py:267
#, python-brace-format
msgid "The user {0} submitted a new exercise \"{1}\"."
msgstr "{0} kullanıcısı yeni bir \"{1}\" alıştırması gönderdi."
-#: exercises/models/image.py:68 gallery/models/image.py:56
+#: exercises/models/image.py:59
+msgid "Line"
+msgstr ""
+
+#: exercises/models/image.py:60
+msgid "3D"
+msgstr ""
+
+#: exercises/models/image.py:61
+msgid "Low-poly"
+msgstr ""
+
+#: exercises/models/image.py:62
+msgid "Photo"
+msgstr ""
+
+#: exercises/models/image.py:63
+#, fuzzy
+#| msgid "Others"
+msgid "Other"
+msgstr "Diğerleri"
+
+#: exercises/models/image.py:81 gallery/models/image.py:56
msgid "Image"
msgstr "Resim"
-#: exercises/models/image.py:69 gallery/models/image.py:57
+#: exercises/models/image.py:82 gallery/models/image.py:57
msgid "Only PNG and JPEG formats are supported"
msgstr "Yalnızca PNG ve JPEG formatları desteklenir"
-#: exercises/models/image.py:75
+#: exercises/models/image.py:88
msgid "Main picture"
msgstr "Ana resim"
-#: exercises/models/image.py:78
+#: exercises/models/image.py:91
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 "
@@ -1624,11 +1640,15 @@ msgstr ""
"işaretleyin (örneğin aramada gösterilecektir). İlk görüntü sistem tarafından "
"otomatik olarak işaretlenir."
-#: exercises/models/image.py:166
+#: exercises/models/image.py:100
+msgid "The art style of your image"
+msgstr ""
+
+#: exercises/models/image.py:185
msgid "New user submitted image"
msgstr "Yeni kullanıcı tarafından gönderilen resim"
-#: exercises/models/image.py:167
+#: exercises/models/image.py:186
#, python-brace-format
msgid "The user {0} submitted a new image \"{1}\" for exercise {2}."
msgstr ""
@@ -1638,6 +1658,58 @@ msgstr ""
msgid "In latin, e.g. \"Pectoralis major\""
msgstr "Latince, ör. \"Büyük pektoralis\""
+#: exercises/models/video.py:41
+msgid "Maximum file size is 100MB."
+msgstr ""
+
+#: exercises/models/video.py:44 exercises/models/video.py:48
+msgid "File type is not supported"
+msgstr ""
+
+#: exercises/models/video.py:57
+#, fuzzy
+#| msgid "%(birthdate)s is not a valid birthdate"
+msgid "File is not a valid video"
+msgstr "%(birthdate)s geçerli bir doğum tarihi değil"
+
+#: exercises/models/video.py:88
+#, fuzzy
+#| msgid "Main picture"
+msgid "Main video"
+msgstr "Ana resim"
+
+#: exercises/models/video.py:94
+msgid "Video"
+msgstr ""
+
+#: exercises/models/video.py:101
+msgid "Size"
+msgstr ""
+
+#: exercises/models/video.py:108 manager/models/schedule_step.py:56
+msgid "Duration"
+msgstr "Süresi"
+
+#: exercises/models/video.py:117
+msgid "Width"
+msgstr ""
+
+#: exercises/models/video.py:124
+#, fuzzy
+#| msgid "Weight"
+msgid "Height"
+msgstr "Kilo"
+
+#: exercises/models/video.py:131
+#, fuzzy
+#| msgid "Code"
+msgid "Codec"
+msgstr "Kod"
+
+#: exercises/models/video.py:139
+msgid "Codec, long name"
+msgstr ""
+
#: exercises/templates/equipment/admin-overview.html:4
msgid "Equipment list"
msgstr "Ekipman listesi"
@@ -1653,7 +1725,7 @@ msgstr "Ekipmana genel bakış"
#: exercises/templates/equipment/overview.html:69
#: exercises/templates/exercise/overview.html:74
-#: exercises/templates/exercise/view.html:214
+#: exercises/templates/exercise/view.html:264
#: exercises/templates/muscles/overview.html:71
msgid "Main muscles"
msgstr "Ana kaslar"
@@ -1780,7 +1852,8 @@ msgstr "Teslim tarihi"
#: gym/templates/gym/new_user.html:22
#: gym/templates/gym/reset_user_password.html:20 manager/models/log.py:45
#: manager/models/schedule.py:44 manager/models/session.py:49
-#: manager/models/workout.py:89 nutrition/models/plan.py:55
+#: manager/models/workout.py:89 measurements/models/category.py:48
+#: measurements/models/measurement.py:59 nutrition/models/plan.py:55
#: nutrition/templates/ingredient/pending.html:16 weight/models.py:41
msgid "User"
msgstr "Kullanıcı"
@@ -1808,13 +1881,13 @@ msgid "Please select one of the options below."
msgstr "Lütfen aşağıdaki seçeneklerden birini seçin."
#: exercises/templates/exercise/view.html:60
-#: exercises/templates/exercise/view.html:153
+#: exercises/templates/exercise/view.html:203
#: nutrition/templates/ingredient/view.html:38
msgid "Accept"
msgstr "Kabul etmek"
#: exercises/templates/exercise/view.html:64
-#: exercises/templates/exercise/view.html:154
+#: exercises/templates/exercise/view.html:204
#: nutrition/templates/ingredient/view.html:42
msgid "Decline"
msgstr "Reddet"
@@ -1827,32 +1900,42 @@ msgstr "Görüntüler"
msgid "Add new image"
msgstr "Yeni resim ekle"
-#: exercises/templates/exercise/view.html:147
+#: exercises/templates/exercise/view.html:148
+msgid "Videos"
+msgstr ""
+
+#: exercises/templates/exercise/view.html:187 exercises/views/videos.py:94
+#, fuzzy
+#| msgid "Add new image"
+msgid "Add new video"
+msgstr "Yeni resim ekle"
+
+#: exercises/templates/exercise/view.html:197
msgid "Images pending review"
msgstr "İncelenmeyi bekleyen resimler"
-#: exercises/templates/exercise/view.html:168
+#: exercises/templates/exercise/view.html:218
msgid "Comments for this exercise"
msgstr "Bu egzersiz için yorum yapın"
-#: exercises/templates/exercise/view.html:196
+#: exercises/templates/exercise/view.html:246
msgid "Add new comment"
msgstr "Yeni yorum ekle"
-#: exercises/templates/exercise/view.html:210
+#: exercises/templates/exercise/view.html:260
msgid "The diagram shows the most used muscles on this exercise"
msgstr "Şema, bu egzersizde en çok kullanılan kasları göstermektedir"
-#: exercises/templates/exercise/view.html:251
+#: exercises/templates/exercise/view.html:301
#: manager/templates/workout/log.html:10 manager/templates/workout/log.html:11
msgid "Weight log"
msgstr "Ağırlık günlüğü"
-#: exercises/templates/exercise/view.html:256
+#: exercises/templates/exercise/view.html:306
msgid "Exercise Variations"
msgstr "Egzersiz Varyasyonları"
-#: exercises/templates/exercise/view.html:277
+#: exercises/templates/exercise/view.html:327
msgid "Submit a correction"
msgstr "Düzeltme gönderin"
@@ -1889,33 +1972,33 @@ msgstr "Egzersiz yorumu ekle"
msgid "Delete equipment?"
msgstr "Ekipman silinsin mi?"
-#: exercises/views/exercises.py:228
+#: exercises/views/exercises.py:229
#, python-format
msgid ""
"%(name_original)s is too similar to existing exercise \"%(exercise_name)s\""
msgstr ""
"%(name_original)s, mevcut \"%(exercise_name)s\" egzersizine çok benziyor"
-#: exercises/views/exercises.py:246
+#: exercises/views/exercises.py:247
msgid "Add exercise"
msgstr "Egzersiz ekle"
-#: exercises/views/exercises.py:366
+#: exercises/views/exercises.py:367
msgid "Thank you. Once the changes are reviewed the exercise will be updated."
msgstr ""
"Teşekkür ederim. Değişiklikler gözden geçirildikten sonra egzersiz "
"güncellenecektir."
-#: exercises/views/exercises.py:379
+#: exercises/views/exercises.py:380
#, python-brace-format
msgid "Correct {0}"
msgstr "Doğru {0}"
-#: exercises/views/exercises.py:421
+#: exercises/views/exercises.py:422
msgid "This will delete the exercise from all workouts."
msgstr "Bu, egzersizi tüm egzersiz programlarından silecektir."
-#: exercises/views/exercises.py:473
+#: exercises/views/exercises.py:474
msgid "Exercise was successfully marked as rejected"
msgstr "Egzersiz başarıyla reddedildi olarak işaretlendi"
@@ -1927,6 +2010,11 @@ msgstr "Egzersiz görüntüsünü düzenleyin"
msgid "Delete exercise image?"
msgstr "Egzersiz görüntüsü silinsin mi?"
+#: exercises/views/videos.py:144 nutrition/views/log.py:230
+#: nutrition/views/unit_ingredient.py:139
+msgid "Delete?"
+msgstr "Sil?"
+
#: gallery/templates/images/overview.html:62
msgid "Add image"
msgstr "Resim ekle"
@@ -1996,8 +2084,8 @@ msgid "Contract type"
msgstr "Sözleşme tipi"
#: gym/models/contract.py:208 gym/templates/contract/view.html:59
-#: manager/templates/log/add.html:52 nutrition/forms.py:58
-#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:92
+#: manager/templates/log/add.html:52 nutrition/forms.py:59
+#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:102
#: nutrition/models/meal_item.py:72
msgid "Amount"
msgstr "Miktar"
@@ -2442,6 +2530,7 @@ msgstr ""
"güncelleyebilir ve düzeltebilirsiniz"
#: mailer/templates/mailer/gym/preview.html:22
+#: software/templates/about_us.html:59
msgid "Current version"
msgstr "Şimdiki versiyonu"
@@ -2478,7 +2567,8 @@ msgstr ""
#: manager/models/log.py:90 manager/models/setting.py:47
#: manager/models/setting.py:78 manager/templates/log/add.html:53
#: manager/templates/log/add.html:55 manager/templates/set/formset.html:11
-#: manager/templates/set/formset.html:13 nutrition/forms.py:62
+#: manager/templates/set/formset.html:13 measurements/models/category.py:58
+#: nutrition/forms.py:63
msgid "Unit"
msgstr "Birim"
@@ -2548,10 +2638,6 @@ msgstr ""
msgid "schedule"
msgstr "program"
-#: manager/models/schedule_step.py:56
-msgid "Duration"
-msgstr "Süresi"
-
#: manager/models/schedule_step.py:57
msgid "The duration in weeks"
msgstr "Hafta cinsinden süre"
@@ -2840,7 +2926,7 @@ msgstr ""
#: manager/templates/schedule/view.html:290
#: manager/templates/workout/view.html:142
#: manager/templates/workout/view.html:217
-#: nutrition/templates/plan/view.html:415
+#: nutrition/templates/plan/view.html:417
msgid "Download as PDF"
msgstr "PDF olarak indir"
@@ -3084,31 +3170,35 @@ msgstr "{0} için yeni antrenman izlenimi"
msgid "This will delete all weight logs for this day as well."
msgstr "Bu, o gün için tüm ağırlık günlüklerini de siler."
-#: nutrition/forms.py:121
+#: measurements/models/measurement.py:69
+msgid "Value"
+msgstr ""
+
+#: nutrition/forms.py:122
msgid "Calculate"
msgstr "Hesaplamak"
-#: nutrition/forms.py:194 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:195 nutrition/templates/rate/form.html:76
msgid "Basic caloric intake"
msgstr "Temel kalori alımı"
-#: nutrition/forms.py:195
+#: nutrition/forms.py:196
msgid "Your basic caloric intake as calculated for your data"
msgstr "Verileriniz için hesaplanan temel kalori alımınız"
-#: nutrition/forms.py:201
+#: nutrition/forms.py:202
msgid "Additional calories"
msgstr "Ek kaloriler"
-#: nutrition/forms.py:203
+#: nutrition/forms.py:204
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:231 nutrition/models/ingredient_weight_unit.py:39
-#: nutrition/models/log.py:71 nutrition/models/meal_item.py:53
+#: nutrition/forms.py:232 nutrition/models/ingredient_weight_unit.py:39
+#: nutrition/models/log.py:81 nutrition/models/meal_item.py:53
#: nutrition/templates/log/detail.html:155
msgid "Ingredient"
msgstr "Bileşen"
@@ -3127,14 +3217,14 @@ msgstr "100 g ürün başına g cinsinden"
#: nutrition/models/ingredient.py:123
#: nutrition/templates/ingredient/view.html:96
#: nutrition/templates/log/detail.html:78
-#: nutrition/templates/plan/view.html:262 nutrition/views/plan.py:406
+#: nutrition/templates/plan/view.html:264 nutrition/views/plan.py:406
msgid "Sugar content in carbohydrates"
msgstr "Karbonhidratlardaki şeker içeriği"
#: nutrition/models/ingredient.py:141
#: nutrition/templates/ingredient/view.html:112
#: nutrition/templates/log/detail.html:104
-#: nutrition/templates/plan/view.html:274 nutrition/views/plan.py:420
+#: nutrition/templates/plan/view.html:276 nutrition/views/plan.py:420
msgid "Saturated fat content in fats"
msgstr "Yağlarda doymuş yağ içeriği"
@@ -3142,7 +3232,7 @@ msgstr "Yağlarda doymuş yağ içeriği"
#: nutrition/templates/ingredient/view.html:134
#: nutrition/templates/log/detail.html:122
#: nutrition/templates/log/detail.html:178
-#: nutrition/templates/plan/view.html:285 nutrition/views/plan.py:426
+#: nutrition/templates/plan/view.html:287 nutrition/views/plan.py:426
msgid "Fibres"
msgstr "Lifler"
@@ -3150,7 +3240,7 @@ msgstr "Lifler"
#: nutrition/templates/ingredient/view.html:144
#: nutrition/templates/log/detail.html:135
#: nutrition/templates/log/detail.html:181
-#: nutrition/templates/plan/view.html:291 nutrition/views/plan.py:432
+#: nutrition/templates/plan/view.html:293 nutrition/views/plan.py:432
msgid "Sodium"
msgstr "Sodyum"
@@ -3198,10 +3288,20 @@ 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:55
+msgid "Meal"
+msgstr "Yemek"
+
#: nutrition/models/meal.py:61
msgid "Time (approx)"
msgstr "Zaman (yaklaşık)"
+#: nutrition/models/meal.py:68
+msgid ""
+"Give meals a textual description / name such as \"Breakfast\" or \"after "
+"workout\""
+msgstr ""
+
#: nutrition/models/plan.py:71
msgid ""
"A description of the goal of the plan, e.g. \"Gain mass\" or \"Prepare for "
@@ -3354,12 +3454,12 @@ msgstr ""
#: nutrition/templates/ingredient/view.html:71
#: nutrition/templates/log/detail.html:31
-#: nutrition/templates/plan/view.html:227 nutrition/views/plan.py:376
+#: nutrition/templates/plan/view.html:229 nutrition/views/plan.py:376
msgid "Macronutrients"
msgstr "Makrobesinler"
#: nutrition/templates/ingredient/view.html:80
-#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:244
+#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:246
msgid "kJ"
msgstr "kJ"
@@ -3372,7 +3472,7 @@ msgstr "n.A."
#: nutrition/templates/ingredient/view.html:128
#: nutrition/templates/log/detail.html:119
-#: nutrition/templates/plan/view.html:282
+#: nutrition/templates/plan/view.html:284
msgid "Others"
msgstr "Diğerleri"
@@ -3401,7 +3501,7 @@ msgstr "Malzemeyi sil"
#: nutrition/templates/log/detail.html:7
#: nutrition/templates/log/overview.html:7
-#: nutrition/templates/plan/view.html:300
+#: nutrition/templates/plan/view.html:302
msgid "Nutrition diary"
msgstr "Beslenme günlüğü"
@@ -3411,13 +3511,13 @@ msgstr "Planlı"
#: nutrition/templates/log/detail.html:33
#: nutrition/templates/log/overview.html:31
-#: nutrition/templates/plan/view.html:308
+#: nutrition/templates/plan/view.html:310
msgid "Logged"
msgstr "Kayıtlı"
#: nutrition/templates/log/detail.html:34
#: nutrition/templates/log/overview.html:32
-#: nutrition/templates/plan/view.html:309
+#: nutrition/templates/plan/view.html:311
msgid "Difference"
msgstr "Fark"
@@ -3430,7 +3530,7 @@ msgid "g"
msgstr "g"
#: nutrition/templates/log/overview.html:53
-#: nutrition/templates/plan/view.html:330
+#: nutrition/templates/plan/view.html:332
msgid "nothing found"
msgstr "Hiçbirşey Bulunamadı"
@@ -3450,56 +3550,56 @@ msgstr "Bu yemeği günlüğe kaydet"
msgid "Add ingredient to meal"
msgstr "Yemeğe malzeme ekleyin"
-#: nutrition/templates/plan/view.html:150
+#: nutrition/templates/plan/view.html:152
msgid "No items for this meal."
msgstr "Bu yemek için hiçbir öğe yok."
-#: nutrition/templates/plan/view.html:188
+#: nutrition/templates/plan/view.html:190
msgid "No meals for this plan."
msgstr "Bu plan için yemek yok."
-#: nutrition/templates/plan/view.html:200
+#: nutrition/templates/plan/view.html:202
msgid "Log this Plan"
msgstr "Bu Planı günlüğe kaydet"
-#: nutrition/templates/plan/view.html:206
+#: nutrition/templates/plan/view.html:208
msgid "Add a new meal"
msgstr "Yeni bir yemek ekle"
-#: nutrition/templates/plan/view.html:216 nutrition/views/plan.py:369
+#: nutrition/templates/plan/view.html:218 nutrition/views/plan.py:369
msgid "Nutritional data"
msgstr "Beslenme verileri"
-#: nutrition/templates/plan/view.html:219
+#: nutrition/templates/plan/view.html:221
#, python-format
msgid "Based on the weight entry dated %(date)s (%(weight)s)"
msgstr "%(date)s (%(weight)s) tarihli ağırlık girdisine göre"
-#: nutrition/templates/plan/view.html:228 nutrition/views/plan.py:377
+#: nutrition/templates/plan/view.html:230 nutrition/views/plan.py:377
msgid "Total"
msgstr "Toplamda"
-#: nutrition/templates/plan/view.html:229 nutrition/views/plan.py:378
+#: nutrition/templates/plan/view.html:231 nutrition/views/plan.py:378
msgid "Percent of energy"
msgstr "Enerji yüzdesi"
-#: nutrition/templates/plan/view.html:232 nutrition/views/plan.py:379
+#: nutrition/templates/plan/view.html:234 nutrition/views/plan.py:379
msgid "g per body kg"
msgstr "g vücut kg"
-#: nutrition/templates/plan/view.html:234
+#: nutrition/templates/plan/view.html:236
msgid "oz per body lb"
msgstr "vücut lb başına oz"
-#: nutrition/templates/plan/view.html:338
+#: nutrition/templates/plan/view.html:340
msgid "View complete nutrition log"
msgstr "Tam beslenme günlüğünü görüntüleyin"
-#: nutrition/templates/plan/view.html:371
+#: nutrition/templates/plan/view.html:373
msgid "Goal"
msgstr "Hedef"
-#: nutrition/templates/plan/view.html:382
+#: nutrition/templates/plan/view.html:384
msgid ""
"You have selected that this nutritional plan has a\n"
" goal amount of calories. Use the calculator or enter the value\n"
@@ -3509,7 +3609,7 @@ msgstr ""
" sahip olduğunu seçtiniz. Hesap makinesini kullanın veya değeri\n"
" kendiniz girin."
-#: nutrition/templates/plan/view.html:392
+#: nutrition/templates/plan/view.html:394
msgid ""
"If you find the ingredient list too short, you might want to activate the "
"preference to also show English ingredients."
@@ -3517,15 +3617,15 @@ msgstr ""
"İçindekiler listesini çok kısa bulursan, İngilizce malzemeleri de gösterme "
"tercihini etkinleştirmek isteyebilirsin."
-#: nutrition/templates/plan/view.html:421
+#: nutrition/templates/plan/view.html:423
msgid "Edit nutrition plan"
msgstr "Beslenme planını düzenleyin"
-#: nutrition/templates/plan/view.html:425
+#: nutrition/templates/plan/view.html:427
msgid "Make a copy of this nutrition plan"
msgstr "Bu beslenme planının bir kopyasını alın"
-#: nutrition/templates/plan/view.html:431
+#: nutrition/templates/plan/view.html:433
msgid "Delete nutrition plan"
msgstr "Beslenme planını sil"
@@ -3621,10 +3721,6 @@ msgstr "Yeni bir malzeme ekle"
msgid "Ingredient was successfully marked as rejected"
msgstr "İçerik başarıyla reddedildi olarak işaretlendi"
-#: nutrition/views/log.py:229 nutrition/views/unit_ingredient.py:139
-msgid "Delete?"
-msgstr "Sil?"
-
#: nutrition/views/meal.py:55
msgid "Add new meal"
msgstr "Yeni yemek ekle"
@@ -4053,11 +4149,11 @@ msgstr ""
msgid "Re-Submit"
msgstr "Yeniden Gönder"
-#: weight/templates/overview.html:68
+#: weight/templates/overview.html:51
msgid "Export as CSV"
msgstr "CSV olarak dışa aktar"
-#: weight/templates/overview.html:72
+#: weight/templates/overview.html:55
msgid "Import from spreadsheet"
msgstr "Elektronik tablodan içe aktar"
@@ -4075,6 +4171,12 @@ msgstr "Başarıyla silindi."
msgid "Delete weight entry for the %s"
msgstr "%s için ağırlık girişini silin"
+#~ msgid "Your current weight is: "
+#~ msgstr "Şu anki kilonuz: "
+
+#~ msgid "Released under the Affero GPL"
+#~ msgstr "Affero GPL altında yayınlandı"
+
#~ msgid "Responsible for the content of this site as per German law §5 TMG:"
#~ msgstr "Alman yasaları §5 TMG uyarınca bu sitenin içeriğinden sorumlu:"
@@ -4231,9 +4333,6 @@ msgstr "%s için ağırlık girişini silin"
#~ "Çeviriler çevrim içi olarak kolayca yönetilir ve düzenlenir, eğer\n"
#~ "ilgileniyorsanız bağlantıyı ziyaret edin ve çeviriye başlayın."
-#~ msgid "Code"
-#~ msgstr "Kod"
-
#~ msgid ""
#~ "Obviously, you are highly encouraged to clone the\n"
#~ "repo and start hacking! Once you are ready, send a pull request and we\n"
@@ -4387,9 +4486,6 @@ msgstr "%s için ağırlık girişini silin"
#~ msgid "Pause!"
#~ msgstr "Duraklat!"
-#~ msgid "Meal"
-#~ msgstr "Yemek"
-
#~ msgid "There is no chart here because there are no weight entries."
#~ msgstr "Ağırlık girişi olmadığı için burada grafik yok."
diff --git a/wger/locale/uk/LC_MESSAGES/django.po b/wger/locale/uk/LC_MESSAGES/django.po
index abf794c97..652758ac4 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: 2021-08-17 17:23+0200\n"
+"POT-Creation-Date: 2022-02-15 14:51+0100\n"
"PO-Revision-Date: 2021-09-19 02:37+0000\n"
"Last-Translator: kvinto <[email protected]>\n"
"Language-Team: Ukrainian <https://hosted.weblate.org/projects/wger/web/uk/>\n"
@@ -20,10 +20,10 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n % 10 == 1 && n % 100 != 11 "
-"? 0 : n % 1 == 0 && n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 12 || n % 100 > "
-"14) ? 1 : n % 1 == 0 && (n % 10 ==0 || (n % 10 >=5 && n % 10 <=9) || (n % "
-"100 >=11 && n % 100 <=14 )) ? 2: 3);\n"
+"Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n % 10 == 1 && n % 100 != "
+"11 ? 0 : n % 1 == 0 && n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 12 || n % "
+"100 > 14) ? 1 : n % 1 == 0 && (n % 10 ==0 || (n % 10 >=5 && n % 10 <=9) || "
+"(n % 100 >=11 && n % 100 <=14 )) ? 2: 3);\n"
"X-Generator: Weblate 4.9-dev\n"
#: config/models/gym_config.py:46 gym/templates/gym/list.html:50
@@ -57,16 +57,16 @@ msgstr "Мови"
msgid "Nothing found."
msgstr "Нічого не знайдено."
-#: config/templates/language/overview.html:16 core/templates/index.html:147
-#: core/templates/index.html:199 manager/templates/calendar/month.html:132
+#: config/templates/language/overview.html:16 core/templates/index.html:137
+#: core/templates/index.html:189 manager/templates/calendar/month.html:132
#: manager/templates/schedule/overview.html:28
#: manager/templates/schedule/view.html:146
#: manager/templates/workout/overview.html:28
#: nutrition/templates/ingredient/overview.html:45
#: nutrition/templates/plan/overview.html:23
-#: nutrition/templates/plan/view.html:148
-#: nutrition/templates/plan/view.html:151
-#: nutrition/templates/plan/view.html:189
+#: nutrition/templates/plan/view.html:150
+#: nutrition/templates/plan/view.html:153
+#: nutrition/templates/plan/view.html:191
msgid "Add one now."
msgstr "Додати зараз."
@@ -87,7 +87,7 @@ msgstr "Додати зараз."
#: gym/templates/gym/member_list.html:244
#: gym/templates/gym/member_list.html:281
#: mailer/templates/mailer/gym/overview.html:43
-#: weight/templates/overview.html:78
+#: weight/templates/overview.html:61
msgid "Add"
msgstr "Додати"
@@ -125,14 +125,14 @@ msgstr "Показати"
#: config/templates/language/view.html:91 core/templates/user/api_key.html:44
#: core/templates/user/preferences.html:28
-#: exercises/templates/exercise/view.html:273
-#: exercises/templates/exercise/view.html:296 gym/models/contract.py:200
+#: exercises/templates/exercise/view.html:323
+#: exercises/templates/exercise/view.html:346 gym/models/contract.py:200
#: gym/templates/contract/view.html:41 gym/templates/contract/view.html:106
#: gym/templates/gym/member_list.html:248
#: manager/templates/schedule/view.html:281
#: manager/templates/workout/view.html:206
#: nutrition/templates/ingredient/view.html:226
-#: nutrition/templates/plan/view.html:409 weight/templates/overview.html:62
+#: nutrition/templates/plan/view.html:411 weight/templates/overview.html:45
msgid "Options"
msgstr "Параметри"
@@ -146,12 +146,12 @@ msgstr "Параметри"
#: core/templates/weight_unit/list.html:17
#: exercises/templates/categories/admin-overview.html:16
#: exercises/templates/equipment/admin-overview.html:16
-#: exercises/templates/exercise/view.html:180
-#: exercises/templates/exercise/view.html:301
+#: exercises/templates/exercise/view.html:230
+#: exercises/templates/exercise/view.html:351
#: exercises/templates/muscles/admin-overview.html:16
-#: exercises/views/comments.py:63 gallery/views/images.py:96
-#: gym/templates/admin_notes/list.html:32 gym/templates/contract/list.html:31
-#: gym/templates/contract/view.html:107
+#: exercises/views/comments.py:63 exercises/views/videos.py:69
+#: gallery/views/images.py:96 gym/templates/admin_notes/list.html:32
+#: gym/templates/contract/list.html:31 gym/templates/contract/view.html:107
#: gym/templates/contract_option/list.html:31
#: gym/templates/contract_type/list.html:31 gym/templates/document/list.html:38
#: gym/templates/gym/list.html:19 gym/templates/gym/list.html:43
@@ -162,7 +162,7 @@ msgstr "Параметри"
#: manager/templates/calendar/partial_overview_table.html:18
#: manager/templates/schedule/view.html:121
#: nutrition/templates/ingredient/view.html:198
-#: nutrition/templates/plan/view.html:89 nutrition/templates/plan/view.html:124
+#: nutrition/templates/plan/view.html:89 nutrition/templates/plan/view.html:126
#: nutrition/templates/units/list.html:18
msgid "Edit"
msgstr "Змінити"
@@ -176,9 +176,9 @@ msgstr "Змінити"
#: exercises/templates/categories/admin-overview.html:17
#: exercises/templates/equipment/admin-overview.html:17
#: exercises/templates/exercise/view.html:68
-#: exercises/templates/exercise/view.html:155
-#: exercises/templates/exercise/view.html:185
-#: exercises/templates/exercise/view.html:306
+#: exercises/templates/exercise/view.html:205
+#: exercises/templates/exercise/view.html:235
+#: exercises/templates/exercise/view.html:356
#: exercises/templates/muscles/admin-overview.html:17
#: gym/templates/admin_notes/list.html:40
#: gym/templates/contract_option/list.html:39
@@ -191,7 +191,7 @@ msgstr "Змінити"
#: nutrition/templates/ingredient/view.html:199
#: nutrition/templates/ingredient/view.html:239
#: nutrition/templates/log/detail.html:197
-#: nutrition/templates/plan/view.html:95 nutrition/templates/plan/view.html:130
+#: nutrition/templates/plan/view.html:95 nutrition/templates/plan/view.html:132
#: nutrition/templates/units/list.html:20
msgid "Delete"
msgstr "Вилучити"
@@ -319,7 +319,7 @@ msgid "Some way of answering you (e-mail, etc.)"
msgstr "Яким чином відповідати вам (електронна пошта, тощо)"
#: core/forms.py:265 exercises/models/comment.py:40 manager/models/set.py:60
-#: manager/models/setting.py:99 nutrition/models/log.py:61
+#: manager/models/setting.py:99 nutrition/models/log.py:71
msgid "Comment"
msgstr "Коментар"
@@ -460,7 +460,7 @@ msgstr ""
msgid "Age"
msgstr "Вік"
-#: core/models/profile.py:202 nutrition/forms.py:98
+#: core/models/profile.py:202 nutrition/forms.py:99
msgid "Height (cm)"
msgstr "Зріст (см)"
@@ -511,7 +511,7 @@ msgid "Total caloric intake, including e.g. any surplus"
msgstr "Загальне споживання калорій, в тому числі, будь-який надлишок"
#: core/models/profile.py:305 nutrition/models/ingredient_weight_unit.py:45
-#: nutrition/models/log.py:80 nutrition/models/meal_item.py:58
+#: nutrition/models/log.py:90 nutrition/models/meal_item.py:58
msgid "Weight unit"
msgstr "Одиниця ваги"
@@ -550,9 +550,9 @@ msgstr "Сума всіх годин повинна дорівнювати 24"
#: gym/models/user_document.py:87 gym/templates/contract/view.html:50
#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:96
#: gym/views/gym.py:156 manager/models/schedule.py:55
-#: manager/models/workout.py:56 nutrition/models/ingredient.py:96
-#: nutrition/models/ingredient_category.py:26
-#: nutrition/models/weight_unit.py:38
+#: manager/models/workout.py:56 measurements/models/category.py:53
+#: nutrition/models/ingredient.py:96 nutrition/models/ingredient_category.py:26
+#: nutrition/models/meal.py:66 nutrition/models/weight_unit.py:38
#: nutrition/templates/ingredient/pending.html:15
#: nutrition/templates/ingredient/view.html:185
msgid "Name"
@@ -612,11 +612,11 @@ msgstr "Ви дійсно хочете вилучити це? Цю дію нем
msgid "Dashboard"
msgstr "Панель"
-#: core/templates/index.html:31 manager/templates/calendar/month.html:115
+#: core/templates/index.html:21 manager/templates/calendar/month.html:115
msgid "Add log to day"
msgstr "Додати журнал до дня"
-#: core/templates/index.html:35 manager/templates/calendar/month.html:120
+#: core/templates/index.html:25 manager/templates/calendar/month.html:120
msgid ""
"Click to add weight logs to a training\n"
"day in your current workout:"
@@ -624,7 +624,7 @@ msgstr ""
"Натисніть, щоб додати записи в журналі ваг на\n"
"цей тренувальний день для поточного тренування:"
-#: core/templates/index.html:43 core/templates/index.html:83
+#: core/templates/index.html:33 core/templates/index.html:73
#: core/templates/misc/fragments/shariff_modal.html:29
#: core/templates/template.html:125 manager/templates/calendar/month.html:138
#: manager/templates/schedule/view.html:246
@@ -634,11 +634,11 @@ msgstr ""
msgid "Close"
msgstr "Закрити"
-#: core/templates/index.html:54 core/templates/index.html:203
+#: core/templates/index.html:44 core/templates/index.html:193
msgid "Add new diary entry"
msgstr "Додати новий запис щоденника"
-#: core/templates/index.html:59
+#: core/templates/index.html:49
msgid ""
"Click to add an entry to your nutrition diary for today. You can either log "
"a meal as you defined it, or entry any number of custom entries."
@@ -647,7 +647,7 @@ msgstr ""
"можете або записати їжу, як ви її визначили, або ввести будь-яку кількість "
"власних записів."
-#: core/templates/index.html:67 core/templates/index.html:171
+#: core/templates/index.html:57 core/templates/index.html:161
#: core/templates/user/overview.html:171
#: nutrition/templates/ingredient/view.html:79
#: nutrition/templates/log/detail.html:40
@@ -656,19 +656,19 @@ msgstr ""
#: nutrition/templates/log/overview.html:7
#: nutrition/templates/log/overview.html:44
#: nutrition/templates/plan/overview.html:17
-#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:242
-#: nutrition/templates/plan/view.html:301
-#: nutrition/templates/plan/view.html:321
-#: nutrition/templates/plan/view.html:363
-#: nutrition/templates/plan/view.html:373
+#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:244
+#: nutrition/templates/plan/view.html:303
+#: nutrition/templates/plan/view.html:323
+#: nutrition/templates/plan/view.html:365
+#: nutrition/templates/plan/view.html:375
msgid "kcal"
msgstr "ккал"
-#: core/templates/index.html:79 nutrition/templates/plan/view.html:348
+#: core/templates/index.html:69 nutrition/templates/plan/view.html:350
msgid "Add custom diary entry"
msgstr "Додати власний запис щоденника"
-#: core/templates/index.html:94 core/templates/index.html:102
+#: core/templates/index.html:84 core/templates/index.html:92
#: manager/models/day.py:34 manager/models/log.py:56
#: manager/models/session.py:60 manager/models/workout.py:109
#: manager/templates/schedule/view.html:105
@@ -679,11 +679,11 @@ msgstr "Додати власний запис щоденника"
msgid "Workout"
msgstr "Тренування"
-#: core/templates/index.html:128
+#: core/templates/index.html:118
msgid "This workout is part of a schedule:"
msgstr "Це тренування є частиною програми:"
-#: core/templates/index.html:133
+#: core/templates/index.html:123
msgid ""
"The current workout is selected from your active schedule or, if you don't "
"have one, simply by date."
@@ -691,70 +691,70 @@ msgstr ""
"Поточне тренування вибирається з вашого активного розкладу або, якщо у вас "
"його немає, просто за датою."
-#: core/templates/index.html:142 manager/templates/calendar/month.html:188
+#: core/templates/index.html:132 manager/templates/calendar/month.html:188
msgid "Add new log"
msgstr "Додати новий журнал"
-#: core/templates/index.html:147 core/templates/user/overview.html:58
+#: core/templates/index.html:137 core/templates/user/overview.html:58
#: manager/templates/calendar/month.html:128
#: manager/templates/schedule/view.html:146
#: manager/templates/workout/overview.html:28
msgid "No workouts found."
msgstr "Не знайдено жодних тренувань."
-#: core/templates/index.html:157 nutrition/models/log.py:48
+#: core/templates/index.html:147 nutrition/models/log.py:49
#: nutrition/models/meal.py:49 nutrition/models/meal_item.py:47
#: nutrition/models/plan.py:94 nutrition/templates/plan/view.html:11
#: nutrition/templates/plan/view.html:19
msgid "Nutrition plan"
msgstr "План харчування"
-#: core/templates/index.html:169 core/templates/user/overview.html:155
+#: core/templates/index.html:159 core/templates/user/overview.html:155
#: nutrition/models/ingredient.py:100
#: nutrition/templates/ingredient/view.html:77
#: nutrition/templates/log/detail.html:39
#: nutrition/templates/log/detail.html:156
-#: nutrition/templates/plan/view.html:53 nutrition/templates/plan/view.html:241
-#: nutrition/templates/plan/view.html:358
-#: nutrition/templates/plan/view.html:362 nutrition/views/plan.py:384
+#: nutrition/templates/plan/view.html:53 nutrition/templates/plan/view.html:243
+#: nutrition/templates/plan/view.html:360
+#: nutrition/templates/plan/view.html:364 nutrition/views/plan.py:384
msgid "Energy"
msgstr "Енергія"
-#: core/templates/index.html:175 core/templates/user/overview.html:156
+#: core/templates/index.html:165 core/templates/user/overview.html:156
#: nutrition/models/ingredient.py:105
#: nutrition/templates/ingredient/view.html:84
#: nutrition/templates/log/detail.html:52
#: nutrition/templates/log/detail.html:174
-#: nutrition/templates/plan/view.html:54 nutrition/templates/plan/view.html:249
+#: nutrition/templates/plan/view.html:54 nutrition/templates/plan/view.html:251
#: nutrition/views/plan.py:390
msgid "Protein"
msgstr "Протеїн"
-#: core/templates/index.html:181 core/templates/user/overview.html:157
+#: core/templates/index.html:171 core/templates/user/overview.html:157
#: nutrition/models/ingredient.py:113
#: nutrition/templates/ingredient/view.html:90
#: nutrition/templates/log/detail.html:65
#: nutrition/templates/log/detail.html:175
-#: nutrition/templates/plan/view.html:55 nutrition/templates/plan/view.html:255
+#: nutrition/templates/plan/view.html:55 nutrition/templates/plan/view.html:257
#: nutrition/views/plan.py:398
msgid "Carbohydrates"
msgstr "Вуглеводи"
-#: core/templates/index.html:187 core/templates/user/overview.html:158
+#: core/templates/index.html:177 core/templates/user/overview.html:158
#: nutrition/models/ingredient.py:131
#: nutrition/templates/ingredient/view.html:106
#: nutrition/templates/log/detail.html:91
#: nutrition/templates/log/detail.html:176
-#: nutrition/templates/plan/view.html:56 nutrition/templates/plan/view.html:268
+#: nutrition/templates/plan/view.html:56 nutrition/templates/plan/view.html:270
#: nutrition/views/plan.py:412
msgid "Fat"
msgstr "Жир"
-#: core/templates/index.html:199 nutrition/templates/plan/overview.html:22
+#: core/templates/index.html:189 nutrition/templates/plan/overview.html:22
msgid "No nutrition plans."
msgstr "Немає планів харчування."
-#: core/templates/index.html:213 core/templates/user/overview.html:112
+#: core/templates/index.html:203 core/templates/user/overview.html:112
#: core/templates/user/overview.html:121 manager/forms.py:173
#: manager/helpers.py:89 manager/models/log.py:84 manager/models/setting.py:67
#: manager/templates/log/add.html:54 manager/templates/set/formset.html:12
@@ -763,11 +763,7 @@ msgstr "Немає планів харчування."
msgid "Weight"
msgstr "Вага"
-#: core/templates/index.html:217
-msgid "Your current weight is: "
-msgstr "Ваша поточна вага: "
-
-#: core/templates/index.html:248 core/templates/navigation.html:97
+#: core/templates/index.html:210 core/templates/navigation.html:97
#: weight/views.py:70
msgid "Add weight entry"
msgstr "Додати запис ваги"
@@ -799,7 +795,7 @@ msgstr "Список ліцензій"
msgid "Nothing found"
msgstr "Нічого не знайдено"
-#: core/templates/misc/about.html:4 core/templates/template.html:201
+#: core/templates/misc/about.html:4 core/templates/template.html:175
#: core/templates/template_features.html:118
#: core/templates/template_no_context.html:88
msgid "Imprint"
@@ -817,8 +813,8 @@ msgstr ""
"зовнішній доступ."
#: core/templates/misc/fragments/shariff_modal.html:22
-#: nutrition/templates/plan/view.html:385
-#: nutrition/templates/plan/view.html:394
+#: nutrition/templates/plan/view.html:387
+#: nutrition/templates/plan/view.html:396
msgid "That's done here"
msgstr "Це зроблено тут"
@@ -906,7 +902,7 @@ msgstr "Вправи, що очікують на розгляд"
msgid "Equipment"
msgstr "Обладнання"
-#: core/templates/navigation.html:78 exercises/templates/exercise/view.html:208
+#: core/templates/navigation.html:78 exercises/templates/exercise/view.html:258
msgid "Muscles"
msgstr "М'язи"
@@ -979,7 +975,7 @@ msgstr "Документація для розробників"
msgid "Get the code"
msgstr "Отримати код"
-#: core/templates/navigation.html:175 core/templates/template.html:193
+#: core/templates/navigation.html:175 core/templates/template.html:205
#: core/templates/template_features.html:100
msgid "Translate"
msgstr "Перекласти"
@@ -1134,15 +1130,11 @@ msgstr ""
msgid "Create some demo entries"
msgstr "Створіть деякі демонстраційні записи"
-#: core/templates/template.html:202 core/templates/template_features.html:122
+#: core/templates/template.html:176 core/templates/template_features.html:122
#: core/templates/template_no_context.html:89 software/templates/tos.html:7
msgid "Terms of service"
msgstr "Умови надання послуг"
-#: core/templates/template.html:209 core/templates/template.html:210
-msgid "Released under the Affero GPL"
-msgstr "Випущено згідно з Affero GPL"
-
#: core/templates/template_features.html:62 software/templates/features.html:9
#: software/templates/features.html:120
msgid "Features"
@@ -1162,8 +1154,8 @@ msgid ""
"anything). You must pass this information in the header in the format shown "
"below."
msgstr ""
-"Згенерувати ключ API, якщо ви хочете взаємодіяти з wger через <a href=\""
-"%(url)s\"\n"
+"Згенерувати ключ API, якщо ви хочете взаємодіяти з wger через <a href="
+"\"%(url)s\"\n"
"rel=\"nofollow\">REST API</a>, який він надає (для загальнодоступних "
"ресурсів, таких\n"
"як вправи або інгредієнти, вам не потрібно нічого надавати). Ви повинні "
@@ -1250,9 +1242,10 @@ msgstr "Додати тренування"
#: core/templates/user/overview.html:120 core/templates/user/overview.html:153
#: exercises/models/exercise.py:77 gallery/models/image.py:47
#: manager/helpers.py:88 manager/models/log.py:98 manager/models/session.py:67
-#: nutrition/models/ingredient.py:85 nutrition/models/ingredient.py:87
-#: nutrition/models/ingredient.py:190 nutrition/templates/log/overview.html:30
-#: nutrition/templates/plan/view.html:307 weight/models.py:32
+#: measurements/models/measurement.py:64 nutrition/models/ingredient.py:85
+#: nutrition/models/ingredient.py:87 nutrition/models/ingredient.py:190
+#: nutrition/templates/log/overview.html:30
+#: nutrition/templates/plan/view.html:309 weight/models.py:32
#: weight/templates/import_csv_preview.html:13
#: weight/templates/import_csv_preview.html:42 weight/views.py:150
msgid "Date"
@@ -1260,10 +1253,10 @@ msgstr "Дата"
#: core/templates/user/overview.html:35 core/templates/user/overview.html:154
#: exercises/models/exercise.py:61 exercises/templates/exercise/view.html:88
-#: exercises/views/exercises.py:189 gallery/models/image.py:70
+#: exercises/views/exercises.py:190 gallery/models/image.py:70
#: gym/models/contract.py:57 gym/models/contract.py:107
#: manager/models/day.py:37 manager/models/workout.py:62
-#: nutrition/models/plan.py:69
+#: measurements/models/measurement.py:79 nutrition/models/plan.py:69
msgid "Description"
msgstr "Опис"
@@ -1424,11 +1417,11 @@ msgstr "Налаштування"
msgid "Change password"
msgstr "Змінити пароль"
-#: core/templatetags/wger_extras.py:217
+#: core/templatetags/wger_extras.py:229
msgid "kg"
msgstr "кг"
-#: core/templatetags/wger_extras.py:219
+#: core/templatetags/wger_extras.py:231
#: nutrition/templates/ingredient/view.html:86
#: nutrition/templates/ingredient/view.html:92
#: nutrition/templates/ingredient/view.html:99
@@ -1440,28 +1433,28 @@ msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr "г"
-#: core/templatetags/wger_extras.py:222
+#: core/templatetags/wger_extras.py:234
msgid "lb"
msgstr "фунт"
-#: core/templatetags/wger_extras.py:224
+#: core/templatetags/wger_extras.py:236
msgctxt "weight unit, i.e. ounces"
msgid "oz"
msgstr "унцій"
#: core/views/languages.py:85 exercises/views/categories.py:121
-#: exercises/views/equipment.py:106 exercises/views/exercises.py:422
+#: exercises/views/equipment.py:106 exercises/views/exercises.py:423
#: exercises/views/images.py:128 exercises/views/muscles.py:118
-#: manager/views/schedule.py:311 manager/views/schedule_step.py:129
-#: manager/views/workout.py:268 manager/views/workout_session.py:141
-#: nutrition/views/ingredient.py:144 nutrition/views/plan.py:120
-#: nutrition/views/unit.py:111
+#: exercises/views/videos.py:129 manager/views/schedule.py:311
+#: manager/views/schedule_step.py:129 manager/views/workout.py:268
+#: manager/views/workout_session.py:141 nutrition/views/ingredient.py:144
+#: nutrition/views/plan.py:120 nutrition/views/unit.py:111
msgid "Successfully deleted"
msgstr "Успішно вилучено"
#: core/views/languages.py:93 core/views/license.py:103
#: core/views/repetition_units.py:115 core/views/weight_units.py:115
-#: exercises/views/categories.py:127 exercises/views/exercises.py:430
+#: exercises/views/categories.py:127 exercises/views/exercises.py:431
#: exercises/views/muscles.py:125 gallery/views/images.py:121
#: gym/views/admin_notes.py:196 gym/views/document.py:206 gym/views/gym.py:486
#: manager/views/schedule.py:318 manager/views/schedule_step.py:139
@@ -1475,7 +1468,7 @@ msgstr "Вилучити {0}?"
#: core/views/languages.py:111 core/views/license.py:84
#: core/views/repetition_units.py:85 core/views/user.py:456
#: core/views/weight_units.py:85 exercises/views/categories.py:97
-#: exercises/views/equipment.py:83 exercises/views/exercises.py:304
+#: exercises/views/equipment.py:83 exercises/views/exercises.py:305
#: exercises/views/muscles.py:105 gym/views/admin_notes.py:160
#: gym/views/config.py:68 gym/views/contract.py:186
#: gym/views/contract_option.py:123 gym/views/contract_type.py:123
@@ -1565,7 +1558,7 @@ msgstr "Основні м'язи"
#: exercises/models/base.py:64 exercises/templates/equipment/overview.html:71
#: exercises/templates/exercise/overview.html:76
-#: exercises/templates/exercise/view.html:218
+#: exercises/templates/exercise/view.html:268
#: exercises/templates/muscles/overview.html:73
msgid "Secondary muscles"
msgstr "Другорядні м'язи"
@@ -1578,8 +1571,9 @@ msgstr "Варіації"
msgid "Exercise Categories"
msgstr "Категорії вправ"
-#: exercises/models/comment.py:34 exercises/models/image.py:62
-#: manager/forms.py:165 manager/helpers.py:89 manager/models/log.py:51
+#: exercises/models/comment.py:34 exercises/models/image.py:75
+#: exercises/models/video.py:82 manager/forms.py:165 manager/helpers.py:89
+#: manager/models/log.py:51
msgid "Exercise"
msgstr "Вправа"
@@ -1592,32 +1586,54 @@ msgstr "Коментар про те, як правильно виконуват
msgid "Language"
msgstr "Мова"
-#: exercises/models/exercise.py:233 exercises/views/exercises.py:460
+#: exercises/models/exercise.py:237 exercises/views/exercises.py:461
msgid "Exercise was successfully added to the general database"
msgstr "Вправу успішно додано до загальної бази даних"
-#: exercises/models/exercise.py:261
+#: exercises/models/exercise.py:265
msgid "New user submitted exercise"
msgstr "Нова вправа надіслана користувачем"
-#: exercises/models/exercise.py:263
+#: exercises/models/exercise.py:267
#, python-brace-format
msgid "The user {0} submitted a new exercise \"{1}\"."
msgstr "Користувач {0} подав нову вправу \"{1}\"."
-#: exercises/models/image.py:68 gallery/models/image.py:56
+#: exercises/models/image.py:59
+msgid "Line"
+msgstr ""
+
+#: exercises/models/image.py:60
+msgid "3D"
+msgstr ""
+
+#: exercises/models/image.py:61
+msgid "Low-poly"
+msgstr ""
+
+#: exercises/models/image.py:62
+msgid "Photo"
+msgstr ""
+
+#: exercises/models/image.py:63
+#, fuzzy
+#| msgid "Others"
+msgid "Other"
+msgstr "Інші"
+
+#: exercises/models/image.py:81 gallery/models/image.py:56
msgid "Image"
msgstr "Зображення"
-#: exercises/models/image.py:69 gallery/models/image.py:57
+#: exercises/models/image.py:82 gallery/models/image.py:57
msgid "Only PNG and JPEG formats are supported"
msgstr "Підтримуються лише формати PNG і JPEG"
-#: exercises/models/image.py:75
+#: exercises/models/image.py:88
msgid "Main picture"
msgstr "Головне зображення"
-#: exercises/models/image.py:78
+#: exercises/models/image.py:91
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 "
@@ -1627,11 +1643,15 @@ msgstr ""
"вправи (буде показано, наприклад, у пошуку). Перше зображення автоматично "
"позначається системою."
-#: exercises/models/image.py:166
+#: exercises/models/image.py:100
+msgid "The art style of your image"
+msgstr ""
+
+#: exercises/models/image.py:185
msgid "New user submitted image"
msgstr "Нове зображення надіслане користувачем"
-#: exercises/models/image.py:167
+#: exercises/models/image.py:186
#, python-brace-format
msgid "The user {0} submitted a new image \"{1}\" for exercise {2}."
msgstr "Користувач {0} подав нове зображення \"{1}\" для вправи {2}."
@@ -1640,6 +1660,58 @@ msgstr "Користувач {0} подав нове зображення \"{1}\
msgid "In latin, e.g. \"Pectoralis major\""
msgstr "На латині, напр. \"Pectoralis major\""
+#: exercises/models/video.py:41
+msgid "Maximum file size is 100MB."
+msgstr ""
+
+#: exercises/models/video.py:44 exercises/models/video.py:48
+msgid "File type is not supported"
+msgstr ""
+
+#: exercises/models/video.py:57
+#, fuzzy
+#| msgid "%(birthdate)s is not a valid birthdate"
+msgid "File is not a valid video"
+msgstr "%(birthdate)s це недійсно вказана дата народження"
+
+#: exercises/models/video.py:88
+#, fuzzy
+#| msgid "Main picture"
+msgid "Main video"
+msgstr "Головне зображення"
+
+#: exercises/models/video.py:94
+msgid "Video"
+msgstr ""
+
+#: exercises/models/video.py:101
+msgid "Size"
+msgstr ""
+
+#: exercises/models/video.py:108 manager/models/schedule_step.py:56
+msgid "Duration"
+msgstr "Тривалість"
+
+#: exercises/models/video.py:117
+msgid "Width"
+msgstr ""
+
+#: exercises/models/video.py:124
+#, fuzzy
+#| msgid "Weight"
+msgid "Height"
+msgstr "Вага"
+
+#: exercises/models/video.py:131
+#, fuzzy
+#| msgid "Code"
+msgid "Codec"
+msgstr "Код"
+
+#: exercises/models/video.py:139
+msgid "Codec, long name"
+msgstr ""
+
#: exercises/templates/equipment/admin-overview.html:4
msgid "Equipment list"
msgstr "Список обладнання"
@@ -1655,7 +1727,7 @@ msgstr "Огляд обладнання"
#: exercises/templates/equipment/overview.html:69
#: exercises/templates/exercise/overview.html:74
-#: exercises/templates/exercise/view.html:214
+#: exercises/templates/exercise/view.html:264
#: exercises/templates/muscles/overview.html:71
msgid "Main muscles"
msgstr "Основні м'язи"
@@ -1781,7 +1853,8 @@ msgstr "Дата подання"
#: gym/templates/gym/new_user.html:22
#: gym/templates/gym/reset_user_password.html:20 manager/models/log.py:45
#: manager/models/schedule.py:44 manager/models/session.py:49
-#: manager/models/workout.py:89 nutrition/models/plan.py:55
+#: manager/models/workout.py:89 measurements/models/category.py:48
+#: measurements/models/measurement.py:59 nutrition/models/plan.py:55
#: nutrition/templates/ingredient/pending.html:16 weight/models.py:41
msgid "User"
msgstr "Користувач"
@@ -1808,13 +1881,13 @@ msgid "Please select one of the options below."
msgstr "Виберіть один із наведених нижче варіантів."
#: exercises/templates/exercise/view.html:60
-#: exercises/templates/exercise/view.html:153
+#: exercises/templates/exercise/view.html:203
#: nutrition/templates/ingredient/view.html:38
msgid "Accept"
msgstr "Прийняти"
#: exercises/templates/exercise/view.html:64
-#: exercises/templates/exercise/view.html:154
+#: exercises/templates/exercise/view.html:204
#: nutrition/templates/ingredient/view.html:42
msgid "Decline"
msgstr "Відхилити"
@@ -1827,32 +1900,42 @@ msgstr "Зображення"
msgid "Add new image"
msgstr "Додати нове зображення"
-#: exercises/templates/exercise/view.html:147
+#: exercises/templates/exercise/view.html:148
+msgid "Videos"
+msgstr ""
+
+#: exercises/templates/exercise/view.html:187 exercises/views/videos.py:94
+#, fuzzy
+#| msgid "Add new image"
+msgid "Add new video"
+msgstr "Додати нове зображення"
+
+#: exercises/templates/exercise/view.html:197
msgid "Images pending review"
msgstr "Зображення очікують на розгляд"
-#: exercises/templates/exercise/view.html:168
+#: exercises/templates/exercise/view.html:218
msgid "Comments for this exercise"
msgstr "Коментарі до цієї вправи"
-#: exercises/templates/exercise/view.html:196
+#: exercises/templates/exercise/view.html:246
msgid "Add new comment"
msgstr "Додати новий коментар"
-#: exercises/templates/exercise/view.html:210
+#: exercises/templates/exercise/view.html:260
msgid "The diagram shows the most used muscles on this exercise"
msgstr "Ця діаграма показує найбільш використовувані м'язи у цій вправі"
-#: exercises/templates/exercise/view.html:251
+#: exercises/templates/exercise/view.html:301
#: manager/templates/workout/log.html:10 manager/templates/workout/log.html:11
msgid "Weight log"
msgstr "Журнал ваги"
-#: exercises/templates/exercise/view.html:256
+#: exercises/templates/exercise/view.html:306
msgid "Exercise Variations"
msgstr "Варіації вправ"
-#: exercises/templates/exercise/view.html:277
+#: exercises/templates/exercise/view.html:327
msgid "Submit a correction"
msgstr "Надіслати виправлення"
@@ -1889,30 +1972,30 @@ msgstr "Додати коментар до вправ"
msgid "Delete equipment?"
msgstr "Видалити обладнання?"
-#: exercises/views/exercises.py:228
+#: exercises/views/exercises.py:229
#, python-format
msgid ""
"%(name_original)s is too similar to existing exercise \"%(exercise_name)s\""
msgstr "%(name_original)s занадто схоже на наявну вправу \"%(exercise_name)s\""
-#: exercises/views/exercises.py:246
+#: exercises/views/exercises.py:247
msgid "Add exercise"
msgstr "Додати вправу"
-#: exercises/views/exercises.py:366
+#: exercises/views/exercises.py:367
msgid "Thank you. Once the changes are reviewed the exercise will be updated."
msgstr "Дякуємо. Після перегляду змін вправу буде оновлено."
-#: exercises/views/exercises.py:379
+#: exercises/views/exercises.py:380
#, python-brace-format
msgid "Correct {0}"
msgstr "Виправити {0}"
-#: exercises/views/exercises.py:421
+#: exercises/views/exercises.py:422
msgid "This will delete the exercise from all workouts."
msgstr "Це призведе до видалення вправи з усіх тренувань."
-#: exercises/views/exercises.py:473
+#: exercises/views/exercises.py:474
msgid "Exercise was successfully marked as rejected"
msgstr "Вправу успішно позначено як відхилена"
@@ -1924,6 +2007,11 @@ msgstr "Змінити зображення вправи"
msgid "Delete exercise image?"
msgstr "Видалити зображення вправи?"
+#: exercises/views/videos.py:144 nutrition/views/log.py:230
+#: nutrition/views/unit_ingredient.py:139
+msgid "Delete?"
+msgstr "Видалити?"
+
#: gallery/templates/images/overview.html:62
msgid "Add image"
msgstr "Додати зображення"
@@ -1990,8 +2078,8 @@ msgid "Contract type"
msgstr "Тип контракту"
#: gym/models/contract.py:208 gym/templates/contract/view.html:59
-#: manager/templates/log/add.html:52 nutrition/forms.py:58
-#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:92
+#: manager/templates/log/add.html:52 nutrition/forms.py:59
+#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:102
#: nutrition/models/meal_item.py:72
msgid "Amount"
msgstr "Сума"
@@ -2435,6 +2523,7 @@ msgstr ""
"надсилати електронні листи"
#: mailer/templates/mailer/gym/preview.html:22
+#: software/templates/about_us.html:59
msgid "Current version"
msgstr "Поточна версія"
@@ -2470,7 +2559,8 @@ msgstr ""
#: manager/models/log.py:90 manager/models/setting.py:47
#: manager/models/setting.py:78 manager/templates/log/add.html:53
#: manager/templates/log/add.html:55 manager/templates/set/formset.html:11
-#: manager/templates/set/formset.html:13 nutrition/forms.py:62
+#: manager/templates/set/formset.html:13 measurements/models/category.py:58
+#: nutrition/forms.py:63
msgid "Unit"
msgstr "Одиниця"
@@ -2540,10 +2630,6 @@ msgstr ""
msgid "schedule"
msgstr "програма"
-#: manager/models/schedule_step.py:56
-msgid "Duration"
-msgstr "Тривалість"
-
#: manager/models/schedule_step.py:57
msgid "The duration in weeks"
msgstr "Тривалість в тижнях"
@@ -2834,7 +2920,7 @@ msgstr ""
#: manager/templates/schedule/view.html:290
#: manager/templates/workout/view.html:142
#: manager/templates/workout/view.html:217
-#: nutrition/templates/plan/view.html:415
+#: nutrition/templates/plan/view.html:417
msgid "Download as PDF"
msgstr "Завантажити як PDF"
@@ -3076,23 +3162,27 @@ msgstr "Нове враження від тренування для {0}"
msgid "This will delete all weight logs for this day as well."
msgstr "Також буде видалено всі записи ваги для цього дня."
-#: nutrition/forms.py:121
+#: measurements/models/measurement.py:69
+msgid "Value"
+msgstr ""
+
+#: nutrition/forms.py:122
msgid "Calculate"
msgstr "Обчислити"
-#: nutrition/forms.py:194 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:195 nutrition/templates/rate/form.html:76
msgid "Basic caloric intake"
msgstr "Основне споживання калорій"
-#: nutrition/forms.py:195
+#: nutrition/forms.py:196
msgid "Your basic caloric intake as calculated for your data"
msgstr "Ваше основне споживання калорій, розраховане для ваших даних"
-#: nutrition/forms.py:201
+#: nutrition/forms.py:202
msgid "Additional calories"
msgstr "Додаткові калорії"
-#: nutrition/forms.py:203
+#: nutrition/forms.py:204
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
@@ -3100,8 +3190,8 @@ msgstr ""
"Додаткові калорії для додавання до базової ставки (для віднімання, введіть "
"від'ємне число)"
-#: nutrition/forms.py:231 nutrition/models/ingredient_weight_unit.py:39
-#: nutrition/models/log.py:71 nutrition/models/meal_item.py:53
+#: nutrition/forms.py:232 nutrition/models/ingredient_weight_unit.py:39
+#: nutrition/models/log.py:81 nutrition/models/meal_item.py:53
#: nutrition/templates/log/detail.html:155
msgid "Ingredient"
msgstr "Інгредієнт"
@@ -3120,14 +3210,14 @@ msgstr "В г на 100г продукту"
#: nutrition/models/ingredient.py:123
#: nutrition/templates/ingredient/view.html:96
#: nutrition/templates/log/detail.html:78
-#: nutrition/templates/plan/view.html:262 nutrition/views/plan.py:406
+#: nutrition/templates/plan/view.html:264 nutrition/views/plan.py:406
msgid "Sugar content in carbohydrates"
msgstr "Вміст цукру в вуглеводах"
#: nutrition/models/ingredient.py:141
#: nutrition/templates/ingredient/view.html:112
#: nutrition/templates/log/detail.html:104
-#: nutrition/templates/plan/view.html:274 nutrition/views/plan.py:420
+#: nutrition/templates/plan/view.html:276 nutrition/views/plan.py:420
msgid "Saturated fat content in fats"
msgstr "Вміст жиру у жирах"
@@ -3135,7 +3225,7 @@ msgstr "Вміст жиру у жирах"
#: nutrition/templates/ingredient/view.html:134
#: nutrition/templates/log/detail.html:122
#: nutrition/templates/log/detail.html:178
-#: nutrition/templates/plan/view.html:285 nutrition/views/plan.py:426
+#: nutrition/templates/plan/view.html:287 nutrition/views/plan.py:426
msgid "Fibres"
msgstr "Волокна"
@@ -3143,7 +3233,7 @@ msgstr "Волокна"
#: nutrition/templates/ingredient/view.html:144
#: nutrition/templates/log/detail.html:135
#: nutrition/templates/log/detail.html:181
-#: nutrition/templates/plan/view.html:291 nutrition/views/plan.py:432
+#: nutrition/templates/plan/view.html:293 nutrition/views/plan.py:432
msgid "Sodium"
msgstr "Натрій"
@@ -3191,10 +3281,20 @@ msgstr "Кількість в грамах"
msgid "Unit amount, e.g. \"1 Cup\" or \"1/2 spoon\""
msgstr "Одиниця кількісті, напр. \"1 чашка\" або \"1/2 ложки\""
+#: nutrition/models/log.py:55
+msgid "Meal"
+msgstr "Приймання їжі"
+
#: nutrition/models/meal.py:61
msgid "Time (approx)"
msgstr "Час (приблизно)"
+#: nutrition/models/meal.py:68
+msgid ""
+"Give meals a textual description / name such as \"Breakfast\" or \"after "
+"workout\""
+msgstr ""
+
#: nutrition/models/plan.py:71
msgid ""
"A description of the goal of the plan, e.g. \"Gain mass\" or \"Prepare for "
@@ -3345,12 +3445,12 @@ msgstr ""
#: nutrition/templates/ingredient/view.html:71
#: nutrition/templates/log/detail.html:31
-#: nutrition/templates/plan/view.html:227 nutrition/views/plan.py:376
+#: nutrition/templates/plan/view.html:229 nutrition/views/plan.py:376
msgid "Macronutrients"
msgstr "Макроелементи"
#: nutrition/templates/ingredient/view.html:80
-#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:244
+#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:246
msgid "kJ"
msgstr "кДж"
@@ -3363,7 +3463,7 @@ msgstr "немає в наявності"
#: nutrition/templates/ingredient/view.html:128
#: nutrition/templates/log/detail.html:119
-#: nutrition/templates/plan/view.html:282
+#: nutrition/templates/plan/view.html:284
msgid "Others"
msgstr "Інші"
@@ -3392,7 +3492,7 @@ msgstr "Видалити інгредієнт"
#: nutrition/templates/log/detail.html:7
#: nutrition/templates/log/overview.html:7
-#: nutrition/templates/plan/view.html:300
+#: nutrition/templates/plan/view.html:302
msgid "Nutrition diary"
msgstr "Щоденник харчування"
@@ -3402,13 +3502,13 @@ msgstr "Заплановано"
#: nutrition/templates/log/detail.html:33
#: nutrition/templates/log/overview.html:31
-#: nutrition/templates/plan/view.html:308
+#: nutrition/templates/plan/view.html:310
msgid "Logged"
msgstr "Записано"
#: nutrition/templates/log/detail.html:34
#: nutrition/templates/log/overview.html:32
-#: nutrition/templates/plan/view.html:309
+#: nutrition/templates/plan/view.html:311
msgid "Difference"
msgstr "Різниця"
@@ -3421,7 +3521,7 @@ msgid "g"
msgstr "г"
#: nutrition/templates/log/overview.html:53
-#: nutrition/templates/plan/view.html:330
+#: nutrition/templates/plan/view.html:332
msgid "nothing found"
msgstr "нічого не знайдено"
@@ -3441,56 +3541,56 @@ msgstr "Записати цю їжу"
msgid "Add ingredient to meal"
msgstr "Додати інгредієнт до їжі"
-#: nutrition/templates/plan/view.html:150
+#: nutrition/templates/plan/view.html:152
msgid "No items for this meal."
msgstr "Немає елементів для цього прийому їжі."
-#: nutrition/templates/plan/view.html:188
+#: nutrition/templates/plan/view.html:190
msgid "No meals for this plan."
msgstr "Немає харчування для цього плану."
-#: nutrition/templates/plan/view.html:200
+#: nutrition/templates/plan/view.html:202
msgid "Log this Plan"
msgstr "Записати цей План"
-#: nutrition/templates/plan/view.html:206
+#: nutrition/templates/plan/view.html:208
msgid "Add a new meal"
msgstr "Додати новий прийом їжі"
-#: nutrition/templates/plan/view.html:216 nutrition/views/plan.py:369
+#: nutrition/templates/plan/view.html:218 nutrition/views/plan.py:369
msgid "Nutritional data"
msgstr "Харчові дані"
-#: nutrition/templates/plan/view.html:219
+#: nutrition/templates/plan/view.html:221
#, python-format
msgid "Based on the weight entry dated %(date)s (%(weight)s)"
msgstr "На основі запису про вагу від %(date)s (%(weight)s)"
-#: nutrition/templates/plan/view.html:228 nutrition/views/plan.py:377
+#: nutrition/templates/plan/view.html:230 nutrition/views/plan.py:377
msgid "Total"
msgstr "Разом"
-#: nutrition/templates/plan/view.html:229 nutrition/views/plan.py:378
+#: nutrition/templates/plan/view.html:231 nutrition/views/plan.py:378
msgid "Percent of energy"
msgstr "Відсоток енергії"
-#: nutrition/templates/plan/view.html:232 nutrition/views/plan.py:379
+#: nutrition/templates/plan/view.html:234 nutrition/views/plan.py:379
msgid "g per body kg"
msgstr "г на кг маси тіли"
-#: nutrition/templates/plan/view.html:234
+#: nutrition/templates/plan/view.html:236
msgid "oz per body lb"
msgstr "унції на фунт маси тіли"
-#: nutrition/templates/plan/view.html:338
+#: nutrition/templates/plan/view.html:340
msgid "View complete nutrition log"
msgstr "Переглянути повний журнал харчування"
-#: nutrition/templates/plan/view.html:371
+#: nutrition/templates/plan/view.html:373
msgid "Goal"
msgstr "Ціль"
-#: nutrition/templates/plan/view.html:382
+#: nutrition/templates/plan/view.html:384
msgid ""
"You have selected that this nutritional plan has a\n"
" goal amount of calories. Use the calculator or enter the value\n"
@@ -3501,7 +3601,7 @@ msgstr ""
"введіть значення\n"
" себе."
-#: nutrition/templates/plan/view.html:392
+#: nutrition/templates/plan/view.html:394
msgid ""
"If you find the ingredient list too short, you might want to activate the "
"preference to also show English ingredients."
@@ -3509,15 +3609,15 @@ msgstr ""
"Якщо список компонентів виявився занадто коротким, можна активувати "
"налаштування, щоб також показати англійські інгредієнти."
-#: nutrition/templates/plan/view.html:421
+#: nutrition/templates/plan/view.html:423
msgid "Edit nutrition plan"
msgstr "Редагувати план харчування"
-#: nutrition/templates/plan/view.html:425
+#: nutrition/templates/plan/view.html:427
msgid "Make a copy of this nutrition plan"
msgstr "Зробити копію цього плану харчування"
-#: nutrition/templates/plan/view.html:431
+#: nutrition/templates/plan/view.html:433
msgid "Delete nutrition plan"
msgstr "Видалити план харчування"
@@ -3616,10 +3716,6 @@ msgstr "Додати новий інгредієнт"
msgid "Ingredient was successfully marked as rejected"
msgstr "Інгредієнт успішно позначений як відхилений"
-#: nutrition/views/log.py:229 nutrition/views/unit_ingredient.py:139
-msgid "Delete?"
-msgstr "Видалити?"
-
#: nutrition/views/meal.py:55
msgid "Add new meal"
msgstr "Додати новий прийом їжі"
@@ -4025,8 +4121,8 @@ msgid ""
msgstr ""
"Продовжуйте тут, якщо ви бажаєте імпортувати до вашого журналу ваги всі\n"
"записи, які були успішно перетворені. Всі записи, які викликали помилку,\n"
-"просто проігноруються. Ви повинні вирішити, чи є вони корисними ("
-"нерозпізнані записи)\n"
+"просто проігноруються. Ви повинні вирішити, чи є вони корисними "
+"(нерозпізнані записи)\n"
"чи ні (наприклад, заголовки, коментарі тощо)."
#: weight/templates/import_csv_preview.html:69
@@ -4049,11 +4145,11 @@ msgstr ""
msgid "Re-Submit"
msgstr "Повторно подати"
-#: weight/templates/overview.html:68
+#: weight/templates/overview.html:51
msgid "Export as CSV"
msgstr "Експортувати в CSV"
-#: weight/templates/overview.html:72
+#: weight/templates/overview.html:55
msgid "Import from spreadsheet"
msgstr "Імпортувати з електронної таблиці"
@@ -4071,6 +4167,12 @@ msgstr "Успішно видалено."
msgid "Delete weight entry for the %s"
msgstr "Видалити запис ваги для %s"
+#~ msgid "Your current weight is: "
+#~ msgstr "Ваша поточна вага: "
+
+#~ msgid "Released under the Affero GPL"
+#~ msgstr "Випущено згідно з Affero GPL"
+
#~ msgid "Responsible for the content of this site as per German law §5 TMG:"
#~ msgstr ""
#~ "Відповідальний за зміст цього сайту, відповідно до німецького "
@@ -4207,9 +4309,6 @@ msgstr "Видалити запис ваги для %s"
#~ "Якщо ви зацікавлені, перейдіть на сайт transifex, запитайте про доступ і "
#~ "ми все встановимо."
-#~ msgid "Code"
-#~ msgstr "Код"
-
#~ msgid ""
#~ "Obviously, you are highly encouraged to clone the\n"
#~ "repo and start hacking! Once you are ready, send a pull request and we\n"
@@ -4341,9 +4440,6 @@ msgstr "Видалити запис ваги для %s"
#~ msgid "Pause!"
#~ msgstr "Пауза!"
-#~ msgid "Meal"
-#~ msgstr "Приймання їжі"
-
#~ msgid "There is no chart here because there are no weight entries."
#~ msgstr "Тут немає діаграми, оскільки немає записів ваги."
diff --git a/wger/locale/zh_CN/LC_MESSAGES/django.po b/wger/locale/zh_CN/LC_MESSAGES/django.po
index 87168bd95..3c03b980b 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: 2021-08-17 17:23+0200\n"
+"POT-Creation-Date: 2022-02-15 14:51+0100\n"
"PO-Revision-Date: 2021-12-07 17:53+0000\n"
"Last-Translator: tony <[email protected]>\n"
"Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/"
@@ -56,16 +56,16 @@ msgstr "语言"
msgid "Nothing found."
msgstr "未找到匹配项。"
-#: config/templates/language/overview.html:16 core/templates/index.html:147
-#: core/templates/index.html:199 manager/templates/calendar/month.html:132
+#: config/templates/language/overview.html:16 core/templates/index.html:137
+#: core/templates/index.html:189 manager/templates/calendar/month.html:132
#: manager/templates/schedule/overview.html:28
#: manager/templates/schedule/view.html:146
#: manager/templates/workout/overview.html:28
#: nutrition/templates/ingredient/overview.html:45
#: nutrition/templates/plan/overview.html:23
-#: nutrition/templates/plan/view.html:148
-#: nutrition/templates/plan/view.html:151
-#: nutrition/templates/plan/view.html:189
+#: nutrition/templates/plan/view.html:150
+#: nutrition/templates/plan/view.html:153
+#: nutrition/templates/plan/view.html:191
msgid "Add one now."
msgstr "现在就新增一个。"
@@ -86,7 +86,7 @@ msgstr "现在就新增一个。"
#: gym/templates/gym/member_list.html:244
#: gym/templates/gym/member_list.html:281
#: mailer/templates/mailer/gym/overview.html:43
-#: weight/templates/overview.html:78
+#: weight/templates/overview.html:61
msgid "Add"
msgstr "新增"
@@ -124,14 +124,14 @@ msgstr "展示"
#: config/templates/language/view.html:91 core/templates/user/api_key.html:44
#: core/templates/user/preferences.html:28
-#: exercises/templates/exercise/view.html:273
-#: exercises/templates/exercise/view.html:296 gym/models/contract.py:200
+#: exercises/templates/exercise/view.html:323
+#: exercises/templates/exercise/view.html:346 gym/models/contract.py:200
#: gym/templates/contract/view.html:41 gym/templates/contract/view.html:106
#: gym/templates/gym/member_list.html:248
#: manager/templates/schedule/view.html:281
#: manager/templates/workout/view.html:206
#: nutrition/templates/ingredient/view.html:226
-#: nutrition/templates/plan/view.html:409 weight/templates/overview.html:62
+#: nutrition/templates/plan/view.html:411 weight/templates/overview.html:45
msgid "Options"
msgstr "选项"
@@ -145,12 +145,12 @@ msgstr "选项"
#: core/templates/weight_unit/list.html:17
#: exercises/templates/categories/admin-overview.html:16
#: exercises/templates/equipment/admin-overview.html:16
-#: exercises/templates/exercise/view.html:180
-#: exercises/templates/exercise/view.html:301
+#: exercises/templates/exercise/view.html:230
+#: exercises/templates/exercise/view.html:351
#: exercises/templates/muscles/admin-overview.html:16
-#: exercises/views/comments.py:63 gallery/views/images.py:96
-#: gym/templates/admin_notes/list.html:32 gym/templates/contract/list.html:31
-#: gym/templates/contract/view.html:107
+#: exercises/views/comments.py:63 exercises/views/videos.py:69
+#: gallery/views/images.py:96 gym/templates/admin_notes/list.html:32
+#: gym/templates/contract/list.html:31 gym/templates/contract/view.html:107
#: gym/templates/contract_option/list.html:31
#: gym/templates/contract_type/list.html:31 gym/templates/document/list.html:38
#: gym/templates/gym/list.html:19 gym/templates/gym/list.html:43
@@ -161,7 +161,7 @@ msgstr "选项"
#: manager/templates/calendar/partial_overview_table.html:18
#: manager/templates/schedule/view.html:121
#: nutrition/templates/ingredient/view.html:198
-#: nutrition/templates/plan/view.html:89 nutrition/templates/plan/view.html:124
+#: nutrition/templates/plan/view.html:89 nutrition/templates/plan/view.html:126
#: nutrition/templates/units/list.html:18
msgid "Edit"
msgstr "编辑"
@@ -175,9 +175,9 @@ msgstr "编辑"
#: exercises/templates/categories/admin-overview.html:17
#: exercises/templates/equipment/admin-overview.html:17
#: exercises/templates/exercise/view.html:68
-#: exercises/templates/exercise/view.html:155
-#: exercises/templates/exercise/view.html:185
-#: exercises/templates/exercise/view.html:306
+#: exercises/templates/exercise/view.html:205
+#: exercises/templates/exercise/view.html:235
+#: exercises/templates/exercise/view.html:356
#: exercises/templates/muscles/admin-overview.html:17
#: gym/templates/admin_notes/list.html:40
#: gym/templates/contract_option/list.html:39
@@ -190,7 +190,7 @@ msgstr "编辑"
#: nutrition/templates/ingredient/view.html:199
#: nutrition/templates/ingredient/view.html:239
#: nutrition/templates/log/detail.html:197
-#: nutrition/templates/plan/view.html:95 nutrition/templates/plan/view.html:130
+#: nutrition/templates/plan/view.html:95 nutrition/templates/plan/view.html:132
#: nutrition/templates/units/list.html:20
msgid "Delete"
msgstr "删除"
@@ -314,7 +314,7 @@ msgid "Some way of answering you (e-mail, etc.)"
msgstr "回复你问题的方式(邮件等)"
#: core/forms.py:265 exercises/models/comment.py:40 manager/models/set.py:60
-#: manager/models/setting.py:99 nutrition/models/log.py:61
+#: manager/models/setting.py:99 nutrition/models/log.py:71
msgid "Comment"
msgstr "评论"
@@ -453,7 +453,7 @@ msgstr ""
msgid "Age"
msgstr "年龄"
-#: core/models/profile.py:202 nutrition/forms.py:98
+#: core/models/profile.py:202 nutrition/forms.py:99
msgid "Height (cm)"
msgstr "身高(cm)"
@@ -504,7 +504,7 @@ msgid "Total caloric intake, including e.g. any surplus"
msgstr "总卡路里摄取量,包括例如:任何过量的卡路里"
#: core/models/profile.py:305 nutrition/models/ingredient_weight_unit.py:45
-#: nutrition/models/log.py:80 nutrition/models/meal_item.py:58
+#: nutrition/models/log.py:90 nutrition/models/meal_item.py:58
msgid "Weight unit"
msgstr "重量单位"
@@ -541,9 +541,9 @@ msgstr "所有时长的和应该是24"
#: gym/models/user_document.py:87 gym/templates/contract/view.html:50
#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:96
#: gym/views/gym.py:156 manager/models/schedule.py:55
-#: manager/models/workout.py:56 nutrition/models/ingredient.py:96
-#: nutrition/models/ingredient_category.py:26
-#: nutrition/models/weight_unit.py:38
+#: manager/models/workout.py:56 measurements/models/category.py:53
+#: nutrition/models/ingredient.py:96 nutrition/models/ingredient_category.py:26
+#: nutrition/models/meal.py:66 nutrition/models/weight_unit.py:38
#: nutrition/templates/ingredient/pending.html:15
#: nutrition/templates/ingredient/view.html:185
msgid "Name"
@@ -599,11 +599,11 @@ msgstr "你确定要删除这条记录?删除动作是不可撤销的。"
msgid "Dashboard"
msgstr "管理面板"
-#: core/templates/index.html:31 manager/templates/calendar/month.html:115
+#: core/templates/index.html:21 manager/templates/calendar/month.html:115
msgid "Add log to day"
msgstr ""
-#: core/templates/index.html:35 manager/templates/calendar/month.html:120
+#: core/templates/index.html:25 manager/templates/calendar/month.html:120
msgid ""
"Click to add weight logs to a training\n"
"day in your current workout:"
@@ -611,7 +611,7 @@ msgstr ""
"点击添加体重日志到\n"
"现时锻炼计划的一个训练日:"
-#: core/templates/index.html:43 core/templates/index.html:83
+#: core/templates/index.html:33 core/templates/index.html:73
#: core/templates/misc/fragments/shariff_modal.html:29
#: core/templates/template.html:125 manager/templates/calendar/month.html:138
#: manager/templates/schedule/view.html:246
@@ -621,11 +621,11 @@ msgstr ""
msgid "Close"
msgstr "关闭"
-#: core/templates/index.html:54 core/templates/index.html:203
+#: core/templates/index.html:44 core/templates/index.html:193
msgid "Add new diary entry"
msgstr "添加新的日记条目"
-#: core/templates/index.html:59
+#: core/templates/index.html:49
msgid ""
"Click to add an entry to your nutrition diary for today. You can either log "
"a meal as you defined it, or entry any number of custom entries."
@@ -633,7 +633,7 @@ msgstr ""
"点击添加一个条目到你今天的营养日记。您可以按照自己的定义记录一餐,也可以输入"
"任意数量的自定义条目。"
-#: core/templates/index.html:67 core/templates/index.html:171
+#: core/templates/index.html:57 core/templates/index.html:161
#: core/templates/user/overview.html:171
#: nutrition/templates/ingredient/view.html:79
#: nutrition/templates/log/detail.html:40
@@ -642,19 +642,19 @@ msgstr ""
#: nutrition/templates/log/overview.html:7
#: nutrition/templates/log/overview.html:44
#: nutrition/templates/plan/overview.html:17
-#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:242
-#: nutrition/templates/plan/view.html:301
-#: nutrition/templates/plan/view.html:321
-#: nutrition/templates/plan/view.html:363
-#: nutrition/templates/plan/view.html:373
+#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:244
+#: nutrition/templates/plan/view.html:303
+#: nutrition/templates/plan/view.html:323
+#: nutrition/templates/plan/view.html:365
+#: nutrition/templates/plan/view.html:375
msgid "kcal"
msgstr "大卡"
-#: core/templates/index.html:79 nutrition/templates/plan/view.html:348
+#: core/templates/index.html:69 nutrition/templates/plan/view.html:350
msgid "Add custom diary entry"
msgstr "添加自定义日记条目"
-#: core/templates/index.html:94 core/templates/index.html:102
+#: core/templates/index.html:84 core/templates/index.html:92
#: manager/models/day.py:34 manager/models/log.py:56
#: manager/models/session.py:60 manager/models/workout.py:109
#: manager/templates/schedule/view.html:105
@@ -665,81 +665,81 @@ msgstr "添加自定义日记条目"
msgid "Workout"
msgstr "健身"
-#: core/templates/index.html:128
+#: core/templates/index.html:118
msgid "This workout is part of a schedule:"
msgstr "这个健身是日程的一部分:"
-#: core/templates/index.html:133
+#: core/templates/index.html:123
msgid ""
"The current workout is selected from your active schedule or, if you don't "
"have one, simply by date."
msgstr ""
"当前的锻炼是从您的健身计划中选择的,如果您没有活动计划,则只需按日期选择。"
-#: core/templates/index.html:142 manager/templates/calendar/month.html:188
+#: core/templates/index.html:132 manager/templates/calendar/month.html:188
msgid "Add new log"
msgstr "新增日志"
-#: core/templates/index.html:147 core/templates/user/overview.html:58
+#: core/templates/index.html:137 core/templates/user/overview.html:58
#: manager/templates/calendar/month.html:128
#: manager/templates/schedule/view.html:146
#: manager/templates/workout/overview.html:28
msgid "No workouts found."
msgstr "没有健身记录。"
-#: core/templates/index.html:157 nutrition/models/log.py:48
+#: core/templates/index.html:147 nutrition/models/log.py:49
#: nutrition/models/meal.py:49 nutrition/models/meal_item.py:47
#: nutrition/models/plan.py:94 nutrition/templates/plan/view.html:11
#: nutrition/templates/plan/view.html:19
msgid "Nutrition plan"
msgstr "营养计划"
-#: core/templates/index.html:169 core/templates/user/overview.html:155
+#: core/templates/index.html:159 core/templates/user/overview.html:155
#: nutrition/models/ingredient.py:100
#: nutrition/templates/ingredient/view.html:77
#: nutrition/templates/log/detail.html:39
#: nutrition/templates/log/detail.html:156
-#: nutrition/templates/plan/view.html:53 nutrition/templates/plan/view.html:241
-#: nutrition/templates/plan/view.html:358
-#: nutrition/templates/plan/view.html:362 nutrition/views/plan.py:384
+#: nutrition/templates/plan/view.html:53 nutrition/templates/plan/view.html:243
+#: nutrition/templates/plan/view.html:360
+#: nutrition/templates/plan/view.html:364 nutrition/views/plan.py:384
msgid "Energy"
msgstr "能量"
-#: core/templates/index.html:175 core/templates/user/overview.html:156
+#: core/templates/index.html:165 core/templates/user/overview.html:156
#: nutrition/models/ingredient.py:105
#: nutrition/templates/ingredient/view.html:84
#: nutrition/templates/log/detail.html:52
#: nutrition/templates/log/detail.html:174
-#: nutrition/templates/plan/view.html:54 nutrition/templates/plan/view.html:249
+#: nutrition/templates/plan/view.html:54 nutrition/templates/plan/view.html:251
#: nutrition/views/plan.py:390
msgid "Protein"
msgstr "蛋白质"
-#: core/templates/index.html:181 core/templates/user/overview.html:157
+#: core/templates/index.html:171 core/templates/user/overview.html:157
#: nutrition/models/ingredient.py:113
#: nutrition/templates/ingredient/view.html:90
#: nutrition/templates/log/detail.html:65
#: nutrition/templates/log/detail.html:175
-#: nutrition/templates/plan/view.html:55 nutrition/templates/plan/view.html:255
+#: nutrition/templates/plan/view.html:55 nutrition/templates/plan/view.html:257
#: nutrition/views/plan.py:398
msgid "Carbohydrates"
msgstr "碳水化合物"
-#: core/templates/index.html:187 core/templates/user/overview.html:158
+#: core/templates/index.html:177 core/templates/user/overview.html:158
#: nutrition/models/ingredient.py:131
#: nutrition/templates/ingredient/view.html:106
#: nutrition/templates/log/detail.html:91
#: nutrition/templates/log/detail.html:176
-#: nutrition/templates/plan/view.html:56 nutrition/templates/plan/view.html:268
+#: nutrition/templates/plan/view.html:56 nutrition/templates/plan/view.html:270
#: nutrition/views/plan.py:412
msgid "Fat"
msgstr "脂肪"
-#: core/templates/index.html:199 nutrition/templates/plan/overview.html:22
+#: core/templates/index.html:189 nutrition/templates/plan/overview.html:22
msgid "No nutrition plans."
msgstr "没有健身计划."
-#: core/templates/index.html:213 core/templates/user/overview.html:112
+#: core/templates/index.html:203 core/templates/user/overview.html:112
#: core/templates/user/overview.html:121 manager/forms.py:173
#: manager/helpers.py:89 manager/models/log.py:84 manager/models/setting.py:67
#: manager/templates/log/add.html:54 manager/templates/set/formset.html:12
@@ -748,11 +748,7 @@ msgstr "没有健身计划."
msgid "Weight"
msgstr "体重"
-#: core/templates/index.html:217
-msgid "Your current weight is: "
-msgstr "你现在的体重是: "
-
-#: core/templates/index.html:248 core/templates/navigation.html:97
+#: core/templates/index.html:210 core/templates/navigation.html:97
#: weight/views.py:70
msgid "Add weight entry"
msgstr "新增体重记录"
@@ -784,7 +780,7 @@ msgstr "许可协议列表"
msgid "Nothing found"
msgstr "没有找到任何内容"
-#: core/templates/misc/about.html:4 core/templates/template.html:201
+#: core/templates/misc/about.html:4 core/templates/template.html:175
#: core/templates/template_features.html:118
#: core/templates/template_no_context.html:88
msgid "Imprint"
@@ -800,8 +796,8 @@ msgid ""
msgstr "在你分享链接到社交媒体之前,你需要允许外部访问."
#: core/templates/misc/fragments/shariff_modal.html:22
-#: nutrition/templates/plan/view.html:385
-#: nutrition/templates/plan/view.html:394
+#: nutrition/templates/plan/view.html:387
+#: nutrition/templates/plan/view.html:396
msgid "That's done here"
msgstr "已经完成"
@@ -889,7 +885,7 @@ msgstr "健身项目审核"
msgid "Equipment"
msgstr "器材"
-#: core/templates/navigation.html:78 exercises/templates/exercise/view.html:208
+#: core/templates/navigation.html:78 exercises/templates/exercise/view.html:258
msgid "Muscles"
msgstr "肌肉"
@@ -962,7 +958,7 @@ msgstr "开发者文档"
msgid "Get the code"
msgstr "获取源码"
-#: core/templates/navigation.html:175 core/templates/template.html:193
+#: core/templates/navigation.html:175 core/templates/template.html:205
#: core/templates/template_features.html:100
msgid "Translate"
msgstr "翻译"
@@ -1029,7 +1025,8 @@ msgstr ""
msgid ""
"You're receiving this e-mail because you requested a password reset for your "
"user account at %(site_name)s."
-msgstr "你收到这封邮件是因为你在%(site_name)s站点为你的账户提交了重置密码的请求。"
+msgstr ""
+"你收到这封邮件是因为你在%(site_name)s站点为你的账户提交了重置密码的请求。"
#: core/templates/registration/password_reset_email.html:4
msgid "Please go to the following page and choose a new password:"
@@ -1112,15 +1109,11 @@ msgstr "你正在以访客模式浏览,输入的数据会在一周后删除."
msgid "Create some demo entries"
msgstr "创建一些示例项"
-#: core/templates/template.html:202 core/templates/template_features.html:122
+#: core/templates/template.html:176 core/templates/template_features.html:122
#: core/templates/template_no_context.html:89 software/templates/tos.html:7
msgid "Terms of service"
msgstr "服务条款"
-#: core/templates/template.html:209 core/templates/template.html:210
-msgid "Released under the Affero GPL"
-msgstr "以Affero GPL许可协议发行"
-
#: core/templates/template_features.html:62 software/templates/features.html:9
#: software/templates/features.html:120
msgid "Features"
@@ -1224,9 +1217,10 @@ msgstr "新增健身"
#: core/templates/user/overview.html:120 core/templates/user/overview.html:153
#: exercises/models/exercise.py:77 gallery/models/image.py:47
#: manager/helpers.py:88 manager/models/log.py:98 manager/models/session.py:67
-#: nutrition/models/ingredient.py:85 nutrition/models/ingredient.py:87
-#: nutrition/models/ingredient.py:190 nutrition/templates/log/overview.html:30
-#: nutrition/templates/plan/view.html:307 weight/models.py:32
+#: measurements/models/measurement.py:64 nutrition/models/ingredient.py:85
+#: nutrition/models/ingredient.py:87 nutrition/models/ingredient.py:190
+#: nutrition/templates/log/overview.html:30
+#: nutrition/templates/plan/view.html:309 weight/models.py:32
#: weight/templates/import_csv_preview.html:13
#: weight/templates/import_csv_preview.html:42 weight/views.py:150
msgid "Date"
@@ -1234,10 +1228,10 @@ msgstr "日期"
#: core/templates/user/overview.html:35 core/templates/user/overview.html:154
#: exercises/models/exercise.py:61 exercises/templates/exercise/view.html:88
-#: exercises/views/exercises.py:189 gallery/models/image.py:70
+#: exercises/views/exercises.py:190 gallery/models/image.py:70
#: gym/models/contract.py:57 gym/models/contract.py:107
#: manager/models/day.py:37 manager/models/workout.py:62
-#: nutrition/models/plan.py:69
+#: measurements/models/measurement.py:79 nutrition/models/plan.py:69
msgid "Description"
msgstr "目标"
@@ -1398,11 +1392,11 @@ msgstr "首选项"
msgid "Change password"
msgstr "修改密码"
-#: core/templatetags/wger_extras.py:217
+#: core/templatetags/wger_extras.py:229
msgid "kg"
msgstr "千克"
-#: core/templatetags/wger_extras.py:219
+#: core/templatetags/wger_extras.py:231
#: nutrition/templates/ingredient/view.html:86
#: nutrition/templates/ingredient/view.html:92
#: nutrition/templates/ingredient/view.html:99
@@ -1414,28 +1408,28 @@ msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr "克"
-#: core/templatetags/wger_extras.py:222
+#: core/templatetags/wger_extras.py:234
msgid "lb"
msgstr "磅"
-#: core/templatetags/wger_extras.py:224
+#: core/templatetags/wger_extras.py:236
msgctxt "weight unit, i.e. ounces"
msgid "oz"
msgstr "盎司"
#: core/views/languages.py:85 exercises/views/categories.py:121
-#: exercises/views/equipment.py:106 exercises/views/exercises.py:422
+#: exercises/views/equipment.py:106 exercises/views/exercises.py:423
#: exercises/views/images.py:128 exercises/views/muscles.py:118
-#: manager/views/schedule.py:311 manager/views/schedule_step.py:129
-#: manager/views/workout.py:268 manager/views/workout_session.py:141
-#: nutrition/views/ingredient.py:144 nutrition/views/plan.py:120
-#: nutrition/views/unit.py:111
+#: exercises/views/videos.py:129 manager/views/schedule.py:311
+#: manager/views/schedule_step.py:129 manager/views/workout.py:268
+#: manager/views/workout_session.py:141 nutrition/views/ingredient.py:144
+#: nutrition/views/plan.py:120 nutrition/views/unit.py:111
msgid "Successfully deleted"
msgstr "删除成功"
#: core/views/languages.py:93 core/views/license.py:103
#: core/views/repetition_units.py:115 core/views/weight_units.py:115
-#: exercises/views/categories.py:127 exercises/views/exercises.py:430
+#: exercises/views/categories.py:127 exercises/views/exercises.py:431
#: exercises/views/muscles.py:125 gallery/views/images.py:121
#: gym/views/admin_notes.py:196 gym/views/document.py:206 gym/views/gym.py:486
#: manager/views/schedule.py:318 manager/views/schedule_step.py:139
@@ -1449,7 +1443,7 @@ msgstr "删除 {0}?"
#: core/views/languages.py:111 core/views/license.py:84
#: core/views/repetition_units.py:85 core/views/user.py:456
#: core/views/weight_units.py:85 exercises/views/categories.py:97
-#: exercises/views/equipment.py:83 exercises/views/exercises.py:304
+#: exercises/views/equipment.py:83 exercises/views/exercises.py:305
#: exercises/views/muscles.py:105 gym/views/admin_notes.py:160
#: gym/views/config.py:68 gym/views/contract.py:186
#: gym/views/contract_option.py:123 gym/views/contract_type.py:123
@@ -1539,7 +1533,7 @@ msgstr ""
#: exercises/models/base.py:64 exercises/templates/equipment/overview.html:71
#: exercises/templates/exercise/overview.html:76
-#: exercises/templates/exercise/view.html:218
+#: exercises/templates/exercise/view.html:268
#: exercises/templates/muscles/overview.html:73
msgid "Secondary muscles"
msgstr "次要肌肉"
@@ -1552,8 +1546,9 @@ msgstr ""
msgid "Exercise Categories"
msgstr ""
-#: exercises/models/comment.py:34 exercises/models/image.py:62
-#: manager/forms.py:165 manager/helpers.py:89 manager/models/log.py:51
+#: exercises/models/comment.py:34 exercises/models/image.py:75
+#: exercises/models/video.py:82 manager/forms.py:165 manager/helpers.py:89
+#: manager/models/log.py:51
msgid "Exercise"
msgstr ""
@@ -1566,32 +1561,54 @@ msgstr "关于如何正确做这个健身项目的评论."
msgid "Language"
msgstr "语言"
-#: exercises/models/exercise.py:233 exercises/views/exercises.py:460
+#: exercises/models/exercise.py:237 exercises/views/exercises.py:461
msgid "Exercise was successfully added to the general database"
msgstr "健身项目被成功添加到通用数据库中"
-#: exercises/models/exercise.py:261
+#: exercises/models/exercise.py:265
msgid "New user submitted exercise"
msgstr ""
-#: exercises/models/exercise.py:263
+#: exercises/models/exercise.py:267
#, python-brace-format
msgid "The user {0} submitted a new exercise \"{1}\"."
msgstr ""
-#: exercises/models/image.py:68 gallery/models/image.py:56
+#: exercises/models/image.py:59
+msgid "Line"
+msgstr ""
+
+#: exercises/models/image.py:60
+msgid "3D"
+msgstr ""
+
+#: exercises/models/image.py:61
+msgid "Low-poly"
+msgstr ""
+
+#: exercises/models/image.py:62
+msgid "Photo"
+msgstr ""
+
+#: exercises/models/image.py:63
+#, fuzzy
+#| msgid "Others"
+msgid "Other"
+msgstr "其它"
+
+#: exercises/models/image.py:81 gallery/models/image.py:56
msgid "Image"
msgstr "图片"
-#: exercises/models/image.py:69 gallery/models/image.py:57
+#: exercises/models/image.py:82 gallery/models/image.py:57
msgid "Only PNG and JPEG formats are supported"
msgstr "只支持PNG和JPEG格式的图片"
-#: exercises/models/image.py:75
+#: exercises/models/image.py:88
msgid "Main picture"
msgstr "首图"
-#: exercises/models/image.py:78
+#: exercises/models/image.py:91
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 "
@@ -1600,11 +1617,15 @@ msgstr ""
"勾选方格,如果你想把这张图片设置为这个健身项目的主图(会在搜索等地方显示).第一"
"张图片会被系统自动标记为主图."
-#: exercises/models/image.py:166
+#: exercises/models/image.py:100
+msgid "The art style of your image"
+msgstr ""
+
+#: exercises/models/image.py:185
msgid "New user submitted image"
msgstr "新用户提交的图片"
-#: exercises/models/image.py:167
+#: exercises/models/image.py:186
#, python-brace-format
msgid "The user {0} submitted a new image \"{1}\" for exercise {2}."
msgstr "用户{0}为健身项目{2}提交了一个新图片\"{1}\"."
@@ -1613,6 +1634,56 @@ msgstr "用户{0}为健身项目{2}提交了一个新图片\"{1}\"."
msgid "In latin, e.g. \"Pectoralis major\""
msgstr ""
+#: exercises/models/video.py:41
+msgid "Maximum file size is 100MB."
+msgstr ""
+
+#: exercises/models/video.py:44 exercises/models/video.py:48
+msgid "File type is not supported"
+msgstr ""
+
+#: exercises/models/video.py:57
+#, fuzzy
+#| msgid "%(birthdate)s is not a valid birthdate"
+msgid "File is not a valid video"
+msgstr "%(birthdate)s不是一个有效的出生日期"
+
+#: exercises/models/video.py:88
+#, fuzzy
+#| msgid "Main picture"
+msgid "Main video"
+msgstr "首图"
+
+#: exercises/models/video.py:94
+msgid "Video"
+msgstr ""
+
+#: exercises/models/video.py:101
+msgid "Size"
+msgstr ""
+
+#: exercises/models/video.py:108 manager/models/schedule_step.py:56
+msgid "Duration"
+msgstr ""
+
+#: exercises/models/video.py:117
+msgid "Width"
+msgstr ""
+
+#: exercises/models/video.py:124
+#, fuzzy
+#| msgid "Weight"
+msgid "Height"
+msgstr "体重"
+
+#: exercises/models/video.py:131
+msgid "Codec"
+msgstr ""
+
+#: exercises/models/video.py:139
+msgid "Codec, long name"
+msgstr ""
+
#: exercises/templates/equipment/admin-overview.html:4
msgid "Equipment list"
msgstr "器材列表"
@@ -1628,7 +1699,7 @@ msgstr "器材总览"
#: exercises/templates/equipment/overview.html:69
#: exercises/templates/exercise/overview.html:74
-#: exercises/templates/exercise/view.html:214
+#: exercises/templates/exercise/view.html:264
#: exercises/templates/muscles/overview.html:71
msgid "Main muscles"
msgstr "主要肌肉"
@@ -1745,7 +1816,8 @@ msgstr "提交日期"
#: gym/templates/gym/new_user.html:22
#: gym/templates/gym/reset_user_password.html:20 manager/models/log.py:45
#: manager/models/schedule.py:44 manager/models/session.py:49
-#: manager/models/workout.py:89 nutrition/models/plan.py:55
+#: manager/models/workout.py:89 measurements/models/category.py:48
+#: measurements/models/measurement.py:59 nutrition/models/plan.py:55
#: nutrition/templates/ingredient/pending.html:16 weight/models.py:41
msgid "User"
msgstr "用户"
@@ -1770,13 +1842,13 @@ msgid "Please select one of the options below."
msgstr "请选择通过或者拒绝."
#: exercises/templates/exercise/view.html:60
-#: exercises/templates/exercise/view.html:153
+#: exercises/templates/exercise/view.html:203
#: nutrition/templates/ingredient/view.html:38
msgid "Accept"
msgstr "接受"
#: exercises/templates/exercise/view.html:64
-#: exercises/templates/exercise/view.html:154
+#: exercises/templates/exercise/view.html:204
#: nutrition/templates/ingredient/view.html:42
msgid "Decline"
msgstr "拒绝"
@@ -1789,32 +1861,42 @@ msgstr "图片"
msgid "Add new image"
msgstr "新增图片"
-#: exercises/templates/exercise/view.html:147
+#: exercises/templates/exercise/view.html:148
+msgid "Videos"
+msgstr ""
+
+#: exercises/templates/exercise/view.html:187 exercises/views/videos.py:94
+#, fuzzy
+#| msgid "Add new image"
+msgid "Add new video"
+msgstr "新增图片"
+
+#: exercises/templates/exercise/view.html:197
msgid "Images pending review"
msgstr "待审核的图片"
-#: exercises/templates/exercise/view.html:168
+#: exercises/templates/exercise/view.html:218
msgid "Comments for this exercise"
msgstr "健身项目的评论"
-#: exercises/templates/exercise/view.html:196
+#: exercises/templates/exercise/view.html:246
msgid "Add new comment"
msgstr "新增评论"
-#: exercises/templates/exercise/view.html:210
+#: exercises/templates/exercise/view.html:260
msgid "The diagram shows the most used muscles on this exercise"
msgstr "下面的简图展示在这次练习中使用最多的肌肉群"
-#: exercises/templates/exercise/view.html:251
+#: exercises/templates/exercise/view.html:301
#: manager/templates/workout/log.html:10 manager/templates/workout/log.html:11
msgid "Weight log"
msgstr "体重日志"
-#: exercises/templates/exercise/view.html:256
+#: exercises/templates/exercise/view.html:306
msgid "Exercise Variations"
msgstr ""
-#: exercises/templates/exercise/view.html:277
+#: exercises/templates/exercise/view.html:327
msgid "Submit a correction"
msgstr "提交修正"
@@ -1849,30 +1931,30 @@ msgstr "新增健身项目的评论"
msgid "Delete equipment?"
msgstr "删除器材?"
-#: exercises/views/exercises.py:228
+#: exercises/views/exercises.py:229
#, python-format
msgid ""
"%(name_original)s is too similar to existing exercise \"%(exercise_name)s\""
msgstr ""
-#: exercises/views/exercises.py:246
+#: exercises/views/exercises.py:247
msgid "Add exercise"
msgstr "新增健身项目"
-#: exercises/views/exercises.py:366
+#: exercises/views/exercises.py:367
msgid "Thank you. Once the changes are reviewed the exercise will be updated."
msgstr "谢谢你. 一旦修改被审核通过,那么该健身项目也会随之更新."
-#: exercises/views/exercises.py:379
+#: exercises/views/exercises.py:380
#, python-brace-format
msgid "Correct {0}"
msgstr "修正{0}"
-#: exercises/views/exercises.py:421
+#: exercises/views/exercises.py:422
msgid "This will delete the exercise from all workouts."
msgstr "这会从所有的健身中删除该健身项目."
-#: exercises/views/exercises.py:473
+#: exercises/views/exercises.py:474
msgid "Exercise was successfully marked as rejected"
msgstr "健身项目被成功标记为拒绝."
@@ -1884,6 +1966,11 @@ msgstr "编辑健身项目图片"
msgid "Delete exercise image?"
msgstr "删除健身项目图片?"
+#: exercises/views/videos.py:144 nutrition/views/log.py:230
+#: nutrition/views/unit_ingredient.py:139
+msgid "Delete?"
+msgstr "删除?"
+
#: gallery/templates/images/overview.html:62
#, fuzzy
#| msgid "Add new image"
@@ -1952,8 +2039,8 @@ msgid "Contract type"
msgstr "合同类型"
#: gym/models/contract.py:208 gym/templates/contract/view.html:59
-#: manager/templates/log/add.html:52 nutrition/forms.py:58
-#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:92
+#: manager/templates/log/add.html:52 nutrition/forms.py:59
+#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:102
#: nutrition/models/meal_item.py:72
msgid "Amount"
msgstr "数量"
@@ -2390,6 +2477,7 @@ msgid ""
msgstr "你可以按照你的需要在邮件发送之前随时更新或修正邮件的内容"
#: mailer/templates/mailer/gym/preview.html:22
+#: software/templates/about_us.html:59
msgid "Current version"
msgstr "当前版本"
@@ -2424,7 +2512,8 @@ msgstr "你可以搜索多个健身项目,它们将会被聚合成一个超集."
#: manager/models/log.py:90 manager/models/setting.py:47
#: manager/models/setting.py:78 manager/templates/log/add.html:53
#: manager/templates/log/add.html:55 manager/templates/set/formset.html:11
-#: manager/templates/set/formset.html:13 nutrition/forms.py:62
+#: manager/templates/set/formset.html:13 measurements/models/category.py:58
+#: nutrition/forms.py:63
msgid "Unit"
msgstr ""
@@ -2489,10 +2578,6 @@ msgstr ""
msgid "schedule"
msgstr "日程表"
-#: manager/models/schedule_step.py:56
-msgid "Duration"
-msgstr ""
-
#: manager/models/schedule_step.py:57
msgid "The duration in weeks"
msgstr "每周持续时间"
@@ -2750,7 +2835,7 @@ msgstr ""
#: manager/templates/schedule/view.html:290
#: manager/templates/workout/view.html:142
#: manager/templates/workout/view.html:217
-#: nutrition/templates/plan/view.html:415
+#: nutrition/templates/plan/view.html:417
msgid "Download as PDF"
msgstr "下载为PDF"
@@ -2973,30 +3058,34 @@ msgstr "{0}的新的健身印象"
msgid "This will delete all weight logs for this day as well."
msgstr ""
-#: nutrition/forms.py:121
+#: measurements/models/measurement.py:69
+msgid "Value"
+msgstr ""
+
+#: nutrition/forms.py:122
msgid "Calculate"
msgstr "计算"
-#: nutrition/forms.py:194 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:195 nutrition/templates/rate/form.html:76
msgid "Basic caloric intake"
msgstr ""
-#: nutrition/forms.py:195
+#: nutrition/forms.py:196
msgid "Your basic caloric intake as calculated for your data"
msgstr ""
-#: nutrition/forms.py:201
+#: nutrition/forms.py:202
msgid "Additional calories"
msgstr "额外卡路里"
-#: nutrition/forms.py:203
+#: nutrition/forms.py:204
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
msgstr ""
-#: nutrition/forms.py:231 nutrition/models/ingredient_weight_unit.py:39
-#: nutrition/models/log.py:71 nutrition/models/meal_item.py:53
+#: nutrition/forms.py:232 nutrition/models/ingredient_weight_unit.py:39
+#: nutrition/models/log.py:81 nutrition/models/meal_item.py:53
#: nutrition/templates/log/detail.html:155
msgid "Ingredient"
msgstr "食谱"
@@ -3015,14 +3104,14 @@ msgstr ""
#: nutrition/models/ingredient.py:123
#: nutrition/templates/ingredient/view.html:96
#: nutrition/templates/log/detail.html:78
-#: nutrition/templates/plan/view.html:262 nutrition/views/plan.py:406
+#: nutrition/templates/plan/view.html:264 nutrition/views/plan.py:406
msgid "Sugar content in carbohydrates"
msgstr ""
#: nutrition/models/ingredient.py:141
#: nutrition/templates/ingredient/view.html:112
#: nutrition/templates/log/detail.html:104
-#: nutrition/templates/plan/view.html:274 nutrition/views/plan.py:420
+#: nutrition/templates/plan/view.html:276 nutrition/views/plan.py:420
msgid "Saturated fat content in fats"
msgstr ""
@@ -3030,7 +3119,7 @@ msgstr ""
#: nutrition/templates/ingredient/view.html:134
#: nutrition/templates/log/detail.html:122
#: nutrition/templates/log/detail.html:178
-#: nutrition/templates/plan/view.html:285 nutrition/views/plan.py:426
+#: nutrition/templates/plan/view.html:287 nutrition/views/plan.py:426
msgid "Fibres"
msgstr "纤维"
@@ -3038,7 +3127,7 @@ msgstr "纤维"
#: nutrition/templates/ingredient/view.html:144
#: nutrition/templates/log/detail.html:135
#: nutrition/templates/log/detail.html:181
-#: nutrition/templates/plan/view.html:291 nutrition/views/plan.py:432
+#: nutrition/templates/plan/view.html:293 nutrition/views/plan.py:432
msgid "Sodium"
msgstr "钠"
@@ -3083,10 +3172,20 @@ msgstr ""
msgid "Unit amount, e.g. \"1 Cup\" or \"1/2 spoon\""
msgstr ""
+#: nutrition/models/log.py:55
+msgid "Meal"
+msgstr ""
+
#: nutrition/models/meal.py:61
msgid "Time (approx)"
msgstr ""
+#: nutrition/models/meal.py:68
+msgid ""
+"Give meals a textual description / name such as \"Breakfast\" or \"after "
+"workout\""
+msgstr ""
+
#: nutrition/models/plan.py:71
msgid ""
"A description of the goal of the plan, e.g. \"Gain mass\" or \"Prepare for "
@@ -3221,12 +3320,12 @@ msgstr ""
#: nutrition/templates/ingredient/view.html:71
#: nutrition/templates/log/detail.html:31
-#: nutrition/templates/plan/view.html:227 nutrition/views/plan.py:376
+#: nutrition/templates/plan/view.html:229 nutrition/views/plan.py:376
msgid "Macronutrients"
msgstr "常量营养物"
#: nutrition/templates/ingredient/view.html:80
-#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:244
+#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:246
msgid "kJ"
msgstr ""
@@ -3239,7 +3338,7 @@ msgstr ""
#: nutrition/templates/ingredient/view.html:128
#: nutrition/templates/log/detail.html:119
-#: nutrition/templates/plan/view.html:282
+#: nutrition/templates/plan/view.html:284
msgid "Others"
msgstr "其它"
@@ -3268,7 +3367,7 @@ msgstr "删除食谱"
#: nutrition/templates/log/detail.html:7
#: nutrition/templates/log/overview.html:7
-#: nutrition/templates/plan/view.html:300
+#: nutrition/templates/plan/view.html:302
msgid "Nutrition diary"
msgstr ""
@@ -3278,13 +3377,13 @@ msgstr ""
#: nutrition/templates/log/detail.html:33
#: nutrition/templates/log/overview.html:31
-#: nutrition/templates/plan/view.html:308
+#: nutrition/templates/plan/view.html:310
msgid "Logged"
msgstr ""
#: nutrition/templates/log/detail.html:34
#: nutrition/templates/log/overview.html:32
-#: nutrition/templates/plan/view.html:309
+#: nutrition/templates/plan/view.html:311
msgid "Difference"
msgstr ""
@@ -3297,7 +3396,7 @@ msgid "g"
msgstr "克"
#: nutrition/templates/log/overview.html:53
-#: nutrition/templates/plan/view.html:330
+#: nutrition/templates/plan/view.html:332
msgid "nothing found"
msgstr ""
@@ -3317,77 +3416,77 @@ msgstr ""
msgid "Add ingredient to meal"
msgstr ""
-#: nutrition/templates/plan/view.html:150
+#: nutrition/templates/plan/view.html:152
msgid "No items for this meal."
msgstr ""
-#: nutrition/templates/plan/view.html:188
+#: nutrition/templates/plan/view.html:190
msgid "No meals for this plan."
msgstr ""
-#: nutrition/templates/plan/view.html:200
+#: nutrition/templates/plan/view.html:202
msgid "Log this Plan"
msgstr ""
-#: nutrition/templates/plan/view.html:206
+#: nutrition/templates/plan/view.html:208
msgid "Add a new meal"
msgstr ""
-#: nutrition/templates/plan/view.html:216 nutrition/views/plan.py:369
+#: nutrition/templates/plan/view.html:218 nutrition/views/plan.py:369
msgid "Nutritional data"
msgstr "营养数据"
-#: nutrition/templates/plan/view.html:219
+#: nutrition/templates/plan/view.html:221
#, python-format
msgid "Based on the weight entry dated %(date)s (%(weight)s)"
msgstr ""
-#: nutrition/templates/plan/view.html:228 nutrition/views/plan.py:377
+#: nutrition/templates/plan/view.html:230 nutrition/views/plan.py:377
msgid "Total"
msgstr "总量"
-#: nutrition/templates/plan/view.html:229 nutrition/views/plan.py:378
+#: nutrition/templates/plan/view.html:231 nutrition/views/plan.py:378
msgid "Percent of energy"
msgstr ""
-#: nutrition/templates/plan/view.html:232 nutrition/views/plan.py:379
+#: nutrition/templates/plan/view.html:234 nutrition/views/plan.py:379
msgid "g per body kg"
msgstr ""
-#: nutrition/templates/plan/view.html:234
+#: nutrition/templates/plan/view.html:236
msgid "oz per body lb"
msgstr ""
-#: nutrition/templates/plan/view.html:338
+#: nutrition/templates/plan/view.html:340
msgid "View complete nutrition log"
msgstr ""
-#: nutrition/templates/plan/view.html:371
+#: nutrition/templates/plan/view.html:373
msgid "Goal"
msgstr "目标"
-#: nutrition/templates/plan/view.html:382
+#: nutrition/templates/plan/view.html:384
msgid ""
"You have selected that this nutritional plan has a\n"
" goal amount of calories. Use the calculator or enter the value\n"
" yourself."
msgstr ""
-#: nutrition/templates/plan/view.html:392
+#: nutrition/templates/plan/view.html:394
msgid ""
"If you find the ingredient list too short, you might want to activate the "
"preference to also show English ingredients."
msgstr ""
-#: nutrition/templates/plan/view.html:421
+#: nutrition/templates/plan/view.html:423
msgid "Edit nutrition plan"
msgstr "编辑营养计划"
-#: nutrition/templates/plan/view.html:425
+#: nutrition/templates/plan/view.html:427
msgid "Make a copy of this nutrition plan"
msgstr "复制该营养计划"
-#: nutrition/templates/plan/view.html:431
+#: nutrition/templates/plan/view.html:433
msgid "Delete nutrition plan"
msgstr "删除营养计划"
@@ -3472,10 +3571,6 @@ msgstr "新增一个食谱"
msgid "Ingredient was successfully marked as rejected"
msgstr ""
-#: nutrition/views/log.py:229 nutrition/views/unit_ingredient.py:139
-msgid "Delete?"
-msgstr "删除?"
-
#: nutrition/views/meal.py:55
msgid "Add new meal"
msgstr ""
@@ -3839,11 +3934,11 @@ msgstr ""
msgid "Re-Submit"
msgstr "重新提交"
-#: weight/templates/overview.html:68
+#: weight/templates/overview.html:51
msgid "Export as CSV"
msgstr "导出为CSV文件"
-#: weight/templates/overview.html:72
+#: weight/templates/overview.html:55
msgid "Import from spreadsheet"
msgstr "从电子表格导入"
@@ -3861,6 +3956,12 @@ msgstr ""
msgid "Delete weight entry for the %s"
msgstr ""
+#~ msgid "Your current weight is: "
+#~ msgstr "你现在的体重是: "
+
+#~ msgid "Released under the Affero GPL"
+#~ msgstr "以Affero GPL许可协议发行"
+
#~ msgid "Responsible for the content of this site as per German law §5 TMG:"
#~ msgstr "根据德国法律§5 TMG,对本网站的内容负责。"