Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Update language files

Roland Geiderd944d04f9f33
diff --git a/wger/i18n.tpl b/wger/i18n.tpl
index 7d7a3cca9..a33e81cf1 100644
--- a/wger/i18n.tpl
+++ b/wger/i18n.tpl
@@ -1,31 +1,31 @@
{% load i18n %}
-{% translate "Lower back" %}
-{% translate "Seconds" %}
+{% translate "Until Failure" %}
{% translate "Repetitions" %}
-{% translate "Dumbbell" %}
{% translate "Abs" %}
+{% translate "Arms" %}
+{% translate "Legs" %}
+{% translate "Dumbbell" %}
+{% translate "Biceps" %}
{% translate "SZ-Bar" %}
-{% translate "Miles" %}
+{% translate "Kettlebell" %}
+{% translate "Swiss Ball" %}
+{% translate "none (bodyweight exercise)" %}
+{% translate "Calves" %}
+{% translate "Back" %}
+{% translate "Lower back" %}
+{% translate "Lats" %}
+{% translate "Hamstrings" %}
+{% translate "Bench" %}
+{% translate "Glutes" %}
{% translate "Kilometers" %}
{% translate "Shoulders" %}
-{% translate "Triceps" %}
+{% translate "Seconds" %}
+{% translate "Miles" %}
+{% translate "Incline bench" %}
{% translate "Quads" %}
-{% translate "none (bodyweight exercise)" %}
-{% translate "Barbell" %}
-{% translate "Lats" %}
-{% translate "Until Failure" %}
+{% translate "Minutes" %}
+{% translate "Chest" %}
{% translate "Gym mat" %}
-{% translate "Glutes" %}
-{% translate "Bench" %}
{% translate "Pull-up bar" %}
-{% translate "Calves" %}
-{% translate "Arms" %}
-{% translate "Biceps" %}
-{% translate "Kettlebell" %}
-{% translate "Back" %}
-{% translate "Chest" %}
-{% translate "Swiss Ball" %}
-{% translate "Minutes" %}
-{% translate "Incline bench" %}
-{% translate "Hamstrings" %}
-{% translate "Legs" %}
+{% translate "Barbell" %}
+{% translate "Triceps" %}
diff --git a/wger/locale/ar_SA/LC_MESSAGES/django.po b/wger/locale/ar_SA/LC_MESSAGES/django.po
index 1f14f3614..7efe22d1a 100644
--- a/wger/locale/ar_SA/LC_MESSAGES/django.po
+++ b/wger/locale/ar_SA/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: wger Workout Manager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-14 12:01+0200\n"
+"POT-Creation-Date: 2022-11-10 16:03+0100\n"
"PO-Revision-Date: 2022-10-17 00:56+0000\n"
"Last-Translator: Hissabat Manager <[email protected]>\n"
"Language-Team: Arabic (Saudi Arabia) <https://hosted.weblate.org/projects/"
@@ -34,109 +34,8 @@ msgstr ""
"المستخدمين المسجلين الجدد في هذه الصالة الرياضية وتحديث جميع المستخدمين "
"الحاليين بدون صالة رياضية."
-#: 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:226
-msgid "Languages"
-msgstr "اللغات"
-
-#: config/templates/language/overview.html:16
-msgid "Nothing found."
-msgstr "لم يتم العثور على شيء."
-
-#: 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:150
-#: nutrition/templates/plan/view.html:153
-#: nutrition/templates/plan/view.html:191
-#, fuzzy
-msgid "Add one now."
-msgstr "أضف واحدة الآن."
-
-#: config/templates/language/overview.html:29
-#: core/templates/license/list.html:38 core/templates/misc/license/list.html:41
-#: core/templates/repetition_unit/list.html:41
-#: core/templates/user/overview.html:327 core/templates/user/overview.html:366
-#: core/templates/user/overview.html:402
-#: core/templates/weight_unit/list.html:41 core/views/languages.py:73
-#: core/views/license.py:65 core/views/repetition_units.py:65
-#: core/views/weight_units.py:65
-#: exercises/templates/categories/admin-overview.html:36
-#: 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:61
-msgid "Add"
-msgstr "اضف"
-
-#: 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/language.py:32
-msgid "Language full name"
-msgstr "الاسم الكامل للغة"
-
-#: config/templates/language/view.html:34 core/templates/user/overview.html:451
-#: gym/views/admin_config.py:44 gym/views/admin_config.py:58
-#: gym/views/user_config.py:46
-#, fuzzy
-msgid "Configuration"
-msgstr "إعدادات"
-
-#: config/templates/language/view.html:35
-#, fuzzy
-msgid ""
-"Use the configuration to select in what languages the\n"
-"exercises and ingredients will be shown for the current language (for "
-"example\n"
-"the exercises should be shown in languages A, B and C; the ingredients only\n"
-"in A)."
-msgstr ""
-"استخدم إعدادات لتحديد اللغات\n"
-"سيتم عرض التمارين والمكونات للغة الحالية (على سبيل المثال\n"
-"يجب أن تكون التدريبات باللغات أ ، ب ، ج ؛ المكونات فقط\n"
-"في اللغة أ )."
-
-#: config/templates/language/view.html:44 gym/templates/contract/list.html:36
-msgid "Show"
-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: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:45
-msgid "Options"
-msgstr "الخيارات"
-
-#: config/templates/language/view.html:96 config/views/gym_config.py:41
-#: config/views/language_config.py:49 core/templates/license/list.html:16
-#: core/templates/misc/license/list.html:17
+#: config/views/gym_config.py:41 core/templates/language/view.html:57
+#: 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:39
#: core/templates/tags/render_day.html:75 core/templates/user/overview.html:205
@@ -144,12 +43,10 @@ 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:230
-#: exercises/templates/exercise/view.html:351
#: exercises/templates/muscles/admin-overview.html:16
-#: 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
+#: 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
#: 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
@@ -165,81 +62,54 @@ msgstr "الخيارات"
msgid "Edit"
msgstr "تعديل"
-#: 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: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: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
-#: gym/templates/contract_type/list.html:39 gym/templates/document/list.html:46
-#: gym/templates/gym/list.html:20 manager/templates/calendar/day.html:69
-#: 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:231
-#: 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:132
-#: nutrition/templates/units/list.html:20
-msgid "Delete"
-msgstr "حذف"
-
-#: core/demo.py:86
+#: core/demo.py:95
msgid "Sample workout"
msgstr "عينة تمارين"
-#: core/demo.py:90
+#: core/demo.py:99
msgid "Sample day"
msgstr "عينة يوم"
-#: core/demo.py:94
+#: core/demo.py:103
msgid "Another sample day"
msgstr "عينة يوم أخرى"
-#: core/demo.py:217
-msgid "Sample nutrional plan"
+#: core/demo.py:211
+#, fuzzy
+#| msgid "Sample nutrional plan"
+msgid "Sample nutritional plan"
msgstr "عينة خطة غذائية"
-#: core/demo.py:349 core/demo.py:351 core/demo.py:353
+#: core/demo.py:343 core/demo.py:345 core/demo.py:347
#, python-brace-format
msgid "Placeholder workout nr {0} for schedule"
msgstr ""
-#: core/demo.py:358
+#: core/demo.py:352
msgid "My cool workout schedule"
msgstr "جدول تماريني الرائع"
-#: core/demo.py:397 core/demo.py:412
+#: core/demo.py:391 core/demo.py:406
msgid "Empty placeholder schedule"
msgstr "حامل جدول فارغ"
-#: core/forms.py:61 core/templates/navigation.html:188
-#: core/templates/navigation.html:192 core/templates/user/login.html:4
+#: core/forms.py:64 core/templates/navigation.html:179
+#: core/templates/navigation.html:183 core/templates/user/login.html:4
#: software/templates/features.html:43
msgid "Login"
msgstr "تسجيل الدخول"
-#: core/forms.py:73 core/forms.py:164 gym/views/export.py:63
+#: core/forms.py:76 core/forms.py:177 gym/views/export.py:63
#: gym/views/gym.py:218
msgid "First name"
msgstr ""
-#: core/forms.py:74 core/forms.py:165 core/templates/user/overview.html:267
+#: core/forms.py:77 core/forms.py:178 core/templates/user/overview.html:267
#: gym/views/export.py:64 gym/views/gym.py:218
msgid "Last name"
msgstr ""
-#: core/forms.py:76 core/forms.py:131 core/templates/user/overview.html:271
+#: core/forms.py:79 core/forms.py:144 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
@@ -249,75 +119,105 @@ msgstr ""
msgid "Email"
msgstr ""
-#: core/forms.py:77
+#: core/forms.py:80
msgid "Used for password resets and, optionally, e-mail reminders."
msgstr ""
-#: core/forms.py:102
+#: core/forms.py:84 core/models/profile.py:220
+#: gym/templates/gym/new_user.html:38
+msgid "Date of Birth"
+msgstr ""
+
+#: core/forms.py:116
msgid "Personal data"
msgstr ""
-#: core/forms.py:110
+#: core/forms.py:124
msgid "Workout reminders"
msgstr ""
-#: core/forms.py:117
+#: core/forms.py:131
msgid "Other settings"
msgstr ""
-#: 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
+#: core/forms.py:138 core/views/user.py:615 core/views/user.py:630
+#: core/views/user.py:642 gym/forms.py:72 manager/templates/log/add.html:65
+#: manager/templates/set/add.html:69 manager/views/workout.py:222
+#: utils/generic_views.py:143
msgid "Save"
msgstr ""
-#: core/forms.py:132
+#: core/forms.py:145
msgid "Used for password resets and, optionally, email reminders."
msgstr ""
-#: core/forms.py:160
+#: core/forms.py:173
msgid "This e-mail address is already in use."
msgstr ""
-#: core/forms.py:180 gym/templates/gym/new_user.html:26
+#: core/forms.py:193 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:182
+#: core/forms.py:195
msgid "Please enter your current password."
msgstr ""
-#: core/forms.py:200
+#: core/forms.py:204 core/templates/language/view.html:62
+#: 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: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/muscles/admin-overview.html:17
+#: gym/templates/admin_notes/list.html:40
+#: gym/templates/contract_option/list.html:39
+#: gym/templates/contract_type/list.html:39 gym/templates/document/list.html:46
+#: gym/templates/gym/list.html:20 manager/templates/calendar/day.html:69
+#: 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:231
+#: 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:132
+#: nutrition/templates/units/list.html:20
+msgid "Delete"
+msgstr "حذف"
+
+#: core/forms.py:213
msgid "Invalid password"
msgstr ""
-#: core/forms.py:212 core/forms.py:278
+#: core/forms.py:225 core/forms.py:291
msgid "The form is secured with reCAPTCHA"
msgstr ""
-#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:188
-#: core/templates/navigation.html:193 core/templates/template.html:149
-#: core/templates/user/login.html:20 core/views/user.py:293
+#: core/forms.py:239 core/forms.py:258 core/templates/navigation.html:179
+#: core/templates/navigation.html:184 core/templates/template.html:149
+#: core/templates/user/login.html:20 core/views/user.py:300
#: software/templates/features.html:38
msgid "Register"
msgstr ""
-#: core/forms.py:256
+#: core/forms.py:269
msgid "Contact"
msgstr ""
-#: core/forms.py:257
+#: core/forms.py:270
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:71
+#: core/forms.py:278 exercises/models/comment.py:42 manager/models/set.py:60
+#: manager/models/setting.py:111 nutrition/models/log.py:71
msgid "Comment"
msgstr ""
-#: core/forms.py:266
+#: core/forms.py:279
msgid "What do you want to say?"
msgstr ""
@@ -325,6 +225,14 @@ msgstr ""
msgid "Day of the week"
msgstr ""
+#: core/models/language.py:31 core/templates/language/view.html:21
+msgid "Language short name"
+msgstr "اسم قصير للغة"
+
+#: core/models/language.py:36 core/templates/language/view.html:22
+msgid "Language full name"
+msgstr "الاسم الكامل للغة"
+
#: core/models/license.py:29
msgid "Full name"
msgstr ""
@@ -380,19 +288,19 @@ msgstr ""
msgid "Imperial (pound)"
msgstr ""
-#: core/models/profile.py:111
+#: core/models/profile.py:114
msgid "Show exercise comments"
msgstr ""
-#: core/models/profile.py:112
+#: core/models/profile.py:115
msgid "Check to show exercise comments on the workout view"
msgstr ""
-#: core/models/profile.py:123
+#: core/models/profile.py:126
msgid "Also use ingredients in English"
msgstr ""
-#: core/models/profile.py:125
+#: core/models/profile.py:128
msgid ""
"Check to also show ingredients in English while creating\n"
"a nutritional plan. These ingredients are extracted from a list provided\n"
@@ -400,130 +308,129 @@ msgid ""
"7000 entries, but can be somewhat overwhelming and make the search difficult."
msgstr ""
-#: core/models/profile.py:134
+#: core/models/profile.py:137
msgid "Activate workout reminders"
msgstr ""
-#: core/models/profile.py:136
+#: core/models/profile.py:139
msgid ""
"Check to activate automatic reminders for workouts. You need to provide a "
"valid email for this to work."
msgstr ""
-#: core/models/profile.py:145
+#: core/models/profile.py:148
msgid "Remind before expiration"
msgstr ""
-#: core/models/profile.py:146
+#: core/models/profile.py:149
msgid "The number of days you want to be reminded before a workout expires."
msgstr ""
-#: core/models/profile.py:152
+#: core/models/profile.py:155
msgid "Default duration of workouts"
msgstr ""
-#: core/models/profile.py:154
+#: core/models/profile.py:157
msgid ""
"Default duration in weeks of workouts not in a schedule. Used for email "
"workout reminders."
msgstr ""
-#: core/models/profile.py:171
+#: core/models/profile.py:174
msgid "Notification language"
msgstr ""
-#: core/models/profile.py:173
+#: core/models/profile.py:176
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/profile.py:186 gym/views/export.py:66
+#: core/models/profile.py:212 gym/views/export.py:66
msgid "Age"
msgstr ""
-#: core/models/profile.py:202 nutrition/forms.py:99
+#: core/models/profile.py:228 nutrition/forms.py:100
msgid "Height (cm)"
msgstr ""
-#: core/models/profile.py:219
+#: core/models/profile.py:245
msgid "Hours of sleep"
msgstr ""
-#: core/models/profile.py:220
+#: core/models/profile.py:246
msgid "The average hours of sleep per day"
msgstr ""
-#: core/models/profile.py:229
+#: core/models/profile.py:255
msgid "Work"
msgstr ""
-#: core/models/profile.py:230 core/models/profile.py:272
+#: core/models/profile.py:256 core/models/profile.py:298
msgid "Average hours per day"
msgstr ""
-#: core/models/profile.py:239 core/models/profile.py:260
-#: core/models/profile.py:281
+#: core/models/profile.py:265 core/models/profile.py:286
+#: core/models/profile.py:307
msgid "Physical intensity"
msgstr ""
-#: core/models/profile.py:240 core/models/profile.py:261
-#: core/models/profile.py:282
+#: core/models/profile.py:266 core/models/profile.py:287
+#: core/models/profile.py:308
msgid "Approximately"
msgstr ""
-#: core/models/profile.py:250
+#: core/models/profile.py:276
msgid "Sport"
msgstr ""
-#: core/models/profile.py:251
+#: core/models/profile.py:277
msgid "Average hours per week"
msgstr ""
-#: core/models/profile.py:271
+#: core/models/profile.py:297
msgid "Free time"
msgstr ""
-#: core/models/profile.py:292 nutrition/templates/rate/form.html:66
+#: core/models/profile.py:318 nutrition/templates/rate/form.html:66
msgid "Total daily calories"
msgstr ""
-#: core/models/profile.py:293
+#: core/models/profile.py:319
msgid "Total caloric intake, including e.g. any surplus"
msgstr ""
-#: core/models/profile.py:305 nutrition/models/ingredient_weight_unit.py:45
+#: core/models/profile.py:331 nutrition/models/ingredient_weight_unit.py:45
#: nutrition/models/log.py:90 nutrition/models/meal_item.py:58
msgid "Weight unit"
msgstr ""
-#: core/models/profile.py:313
+#: core/models/profile.py:339
msgid "Allow external access"
msgstr ""
-#: core/models/profile.py:315
+#: core/models/profile.py:341
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/profile.py:324
+#: core/models/profile.py:350
msgid "Automatic reminders for weight entries"
msgstr ""
-#: core/models/profile.py:326
+#: core/models/profile.py:352
msgid "Number of days after the last weight entry (enter 0 to deactivate)"
msgstr ""
-#: core/models/profile.py:392
+#: core/models/profile.py:418
msgid "The sum of all hours has to be 24"
msgstr ""
#: core/models/rep_unit.py:35 core/models/weight_unit.py:35
-#: core/templates/user/overview.html:263 core/views/user.py:575
+#: core/templates/user/overview.html:263 core/views/user.py:591
#: 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
+#: exercises/models/exercise.py:64 exercises/models/muscle.py:36
#: 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
@@ -582,6 +489,51 @@ msgstr ""
msgid "Are you sure you want to delete this? This action cannot be undone."
msgstr ""
+#: core/templates/email_verification/confirm_template.html:4
+msgid "Email verified"
+msgstr ""
+
+#: core/templates/email_verification/confirm_template.html:18
+#, python-format
+msgid "%(username)s, your email was verified"
+msgstr ""
+
+#: core/templates/email_verification/confirm_template.html:22
+msgid "Error, invalid verification token"
+msgstr ""
+
+#: core/templates/email_verification/email_body_html.tpl:6
+#, fuzzy
+msgid "Email Confirmation"
+msgstr "إعدادات"
+
+#: core/templates/email_verification/email_body_html.tpl:9
+#: core/templates/email_verification/email_body_txt.tpl:3
+#, python-format
+msgid "You are almost there, %(username)s!"
+msgstr ""
+
+#: core/templates/email_verification/email_body_html.tpl:11
+#, python-format
+msgid "Please click <a href=\"%(link)s\">here</a> to confirm your email"
+msgstr ""
+
+#: core/templates/email_verification/email_body_html.tpl:12
+#: core/templates/email_verification/email_body_txt.tpl:5
+#, python-format
+msgid "The token expires on %(time)s"
+msgstr ""
+
+#: core/templates/email_verification/email_body_html.tpl:14
+#: core/templates/email_verification/email_body_txt.tpl:8
+msgid "the wger Team"
+msgstr ""
+
+#: core/templates/email_verification/email_body_txt.tpl:4
+#, python-format
+msgid "Please click the following link to confirm your email: %(link)s"
+msgstr ""
+
#: core/templates/index.html:4
msgid "Dashboard"
msgstr ""
@@ -638,7 +590,7 @@ msgid "Add custom diary entry"
msgstr ""
#: core/templates/index.html:84 core/templates/index.html:92
-#: manager/models/day.py:34 manager/models/log.py:56
+#: manager/models/day.py:34 manager/models/log.py:58
#: manager/models/session.py:60 manager/models/workout.py:109
#: manager/templates/schedule/view.html:105
#: manager/templates/workout/view.html:11
@@ -669,6 +621,21 @@ msgstr ""
msgid "No workouts found."
msgstr ""
+#: core/templates/index.html:137 core/templates/index.html:189
+#: core/templates/language/overview.html:23
+#: 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:150
+#: nutrition/templates/plan/view.html:153
+#: nutrition/templates/plan/view.html:191
+#, fuzzy
+msgid "Add one now."
+msgstr "أضف واحدة الآن."
+
#: 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
@@ -722,19 +689,59 @@ msgid "No nutrition plans."
msgstr ""
#: 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
+#: core/templates/user/overview.html:121 manager/forms.py:184
+#: manager/helpers.py:89 manager/models/log.py:86 manager/models/setting.py:79
+#: manager/templates/log/add.html:54 manager/templates/set/formset.html:11
#: weight/models.py: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:210 core/templates/navigation.html:135
+#: core/templates/index.html:210 core/templates/navigation.html:126
#: weight/views.py:70
msgid "Add weight entry"
msgstr ""
+#: core/templates/language/overview.html:4 core/templates/navigation.html:217
+msgid "Languages"
+msgstr "اللغات"
+
+#: core/templates/language/overview.html:23
+msgid "Nothing found."
+msgstr "لم يتم العثور على شيء."
+
+#: core/templates/language/overview.html:36 core/templates/license/list.html:38
+#: core/templates/misc/license/list.html:41
+#: core/templates/repetition_unit/list.html:41
+#: core/templates/user/overview.html:327 core/templates/user/overview.html:366
+#: core/templates/user/overview.html:402
+#: core/templates/weight_unit/list.html:41 core/views/languages.py:73
+#: core/views/license.py:65 core/views/repetition_units.py:65
+#: core/views/weight_units.py:65
+#: exercises/templates/categories/admin-overview.html:36
+#: 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:61
+msgid "Add"
+msgstr "اضف"
+
+#: core/templates/language/view.html:52 core/templates/user/api_key.html:44
+#: core/templates/user/preferences.html:44 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:45
+msgid "Options"
+msgstr "الخيارات"
+
#: core/templates/license/list.html:4 core/templates/misc/license/list.html:4
msgid "License list"
msgstr ""
@@ -747,7 +754,6 @@ msgstr ""
#: core/templates/weight_unit/list.html:26
#: exercises/templates/categories/admin-overview.html:24
#: exercises/templates/equipment/admin-overview.html:24
-#: exercises/templates/exercise/pending.html:30
#: exercises/templates/muscles/admin-overview.html:24
#: gym/templates/admin_notes/list.html:52 gym/templates/contract/list.html:60
#: gym/templates/contract_option/list.html:56
@@ -825,155 +831,135 @@ msgstr ""
msgid "Public templates"
msgstr ""
-#: core/templates/navigation.html:64
-msgctxt "as in sorted by category"
-msgid "by category"
-msgstr ""
-
-#: core/templates/navigation.html:65
-msgctxt "as in sorted by muscle"
-msgid "by muscle"
-msgstr ""
-
-#: core/templates/navigation.html:66
-msgctxt "as in sorted by equipment"
-msgid "by equipment"
-msgstr ""
-
-#: core/templates/navigation.html:70
-#: exercises/templates/equipment/overview.html:109
-#: exercises/templates/equipment/overview.html:113
-#: exercises/templates/exercise/overview.html:112
-#: exercises/templates/exercise/overview.html:116
-#: exercises/templates/muscles/overview.html:112
-#: exercises/templates/muscles/overview.html:116
-msgid "Add new exercise"
-msgstr ""
+#: core/templates/navigation.html:63 manager/forms.py:133
+#: manager/models/setting.py:54
+msgid "Exercises"
+msgstr "تمارين"
-#: core/templates/navigation.html:75 core/templates/navigation.html:116
-#: core/templates/navigation.html:224
+#: core/templates/navigation.html:67 core/templates/navigation.html:107
+#: core/templates/navigation.html:215
msgid "Administration"
msgstr ""
-#: core/templates/navigation.html:76
-#: exercises/templates/exercise/pending.html:6
-msgid "Exercises pending review"
-msgstr ""
+#: core/templates/navigation.html:68
+#, fuzzy
+#| msgid "Exercises"
+msgid "Exercise edit history"
+msgstr "تمارين"
-#: core/templates/navigation.html:77 exercises/models/base.py:72
-#: exercises/templates/exercise/view.html:80
+#: core/templates/navigation.html:69 exercises/models/base.py:84
msgid "Equipment"
msgstr ""
-#: core/templates/navigation.html:78 exercises/templates/exercise/view.html:258
+#: core/templates/navigation.html:70
msgid "Muscles"
msgstr ""
-#: core/templates/navigation.html:79
+#: core/templates/navigation.html:71
#: exercises/templates/categories/admin-overview.html:4
msgid "Categories"
msgstr ""
-#: core/templates/navigation.html:93 software/templates/features.html:87
+#: core/templates/navigation.html:84 software/templates/features.html:87
msgid "Nutrition"
msgstr ""
-#: core/templates/navigation.html:99 core/templates/user/overview.html:144
+#: core/templates/navigation.html:90 core/templates/user/overview.html:144
msgid "Nutrition plans"
msgstr ""
-#: core/templates/navigation.html:105 nutrition/templates/bmi/form.html:50
+#: core/templates/navigation.html:96 nutrition/templates/bmi/form.html:50
msgid "BMI calculator"
msgstr ""
-#: core/templates/navigation.html:111 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:102 nutrition/templates/rate/form.html:17
msgid "Daily calories calculator"
msgstr ""
-#: core/templates/navigation.html:113
+#: core/templates/navigation.html:104
#: nutrition/templates/ingredient/overview.html:29
msgid "Ingredient overview"
msgstr ""
-#: core/templates/navigation.html:117 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:108 nutrition/templates/units/list.html:6
msgid "Ingredient weight units"
msgstr ""
-#: core/templates/navigation.html:118
+#: core/templates/navigation.html:109
#: nutrition/templates/ingredient/pending.html:6
msgid "Ingredients pending review"
msgstr ""
-#: core/templates/navigation.html:132
+#: core/templates/navigation.html:123
msgid "Body weight"
msgstr ""
-#: core/templates/navigation.html:134 core/templates/user/overview.html:114
+#: core/templates/navigation.html:125 core/templates/user/overview.html:114
#: weight/templates/overview.html:7
msgid "Weight overview"
msgstr ""
-#: core/templates/navigation.html:147
+#: core/templates/navigation.html:138
msgid "About this software"
msgstr ""
-#: core/templates/navigation.html:149 core/templates/template_features.html:82
+#: core/templates/navigation.html:140 core/templates/template_features.html:82
#: software/templates/about_us.html:5
msgid "About us"
msgstr ""
-#: core/templates/navigation.html:151 software/templates/features.html:209
+#: core/templates/navigation.html:142 software/templates/features.html:209
msgid "REST API"
msgstr ""
-#: core/templates/navigation.html:155 utils/models.py:40
+#: core/templates/navigation.html:146 utils/models.py:41
msgid "License"
msgstr ""
-#: core/templates/navigation.html:161
+#: core/templates/navigation.html:152
msgid "Developer documentation"
msgstr ""
-#: core/templates/navigation.html:167
+#: core/templates/navigation.html:158
msgid "Get the code"
msgstr ""
-#: core/templates/navigation.html:173 core/templates/template.html:204
+#: core/templates/navigation.html:164 core/templates/template.html:203
#: core/templates/template_features.html:99
msgid "Translate"
msgstr ""
-#: core/templates/navigation.html:194 core/templates/user/login.html:28
+#: core/templates/navigation.html:185 core/templates/user/login.html:28
msgid "Reset password"
msgstr ""
-#: core/templates/navigation.html:207
+#: core/templates/navigation.html:198
msgid "My preferences"
msgstr ""
-#: core/templates/navigation.html:214
+#: core/templates/navigation.html:205
msgid "Logout"
msgstr ""
-#: core/templates/navigation.html:229
+#: core/templates/navigation.html:220
msgid "Licenses"
msgstr ""
-#: core/templates/navigation.html:232
+#: core/templates/navigation.html:223
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr ""
-#: core/templates/navigation.html:235 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:226 core/templates/weight_unit/list.html:4
#: nutrition/templates/ingredient/view.html:174
msgid "Weight units"
msgstr ""
-#: core/templates/navigation.html:238 core/templates/user/list.html:4
+#: core/templates/navigation.html:229 core/templates/user/list.html:4
msgid "User list"
msgstr ""
-#: core/templates/navigation.html:239
+#: core/templates/navigation.html:230
msgid "Gyms"
msgstr ""
@@ -1048,33 +1034,30 @@ msgstr ""
msgid "Add weight log"
msgstr ""
-#: core/templates/tags/render_day.html:114
-#: exercises/templates/equipment/overview.html:59
-#: exercises/templates/exercise/overview.html:63
-#: exercises/templates/muscles/overview.html:65
+#: core/templates/tags/render_day.html:116
msgid "Placeholder image for exercise"
msgstr ""
-#: core/templates/tags/render_day.html:131
+#: core/templates/tags/render_day.html:133
msgid "This exercise has no repetitions."
msgstr ""
-#: core/templates/tags/render_day.html:134
+#: core/templates/tags/render_day.html:136
msgid "Edit them now."
msgstr ""
-#: core/templates/tags/render_day.html:159
+#: core/templates/tags/render_day.html:162
msgid "Add exercises to this workout day"
msgstr ""
#: core/templates/tags/render_weight_log.html:17 manager/helpers.py:89
-#: manager/models/setting.py:57 manager/templates/set/formset.html:10
+#: manager/models/setting.py:69 manager/templates/set/formset.html:9
msgid "Reps"
msgstr ""
-#: 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
+#: core/templates/tags/render_weight_log.html:30 manager/forms.py:189
+#: manager/models/log.py:103 manager/models/setting.py:99
+#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
msgid "RiR"
msgstr ""
@@ -1097,7 +1080,7 @@ msgstr ""
msgid "Features"
msgstr ""
-#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:37
+#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:53
msgid "API key"
msgstr ""
@@ -1137,11 +1120,12 @@ msgid "Documentation"
msgstr ""
#: core/templates/user/delete_account.html:4
-#: core/templates/user/preferences.html:42
+#: core/templates/user/preferences.html:58
msgid "Delete account"
msgstr ""
#: core/templates/user/delete_account.html:17
+#: exercises/templates/history/overview.html:93
msgid "Are you sure?"
msgstr ""
@@ -1186,11 +1170,12 @@ 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/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
+#: exercises/models/base.py:99 exercises/models/base.py:104
+#: exercises/models/exercise.py:69 exercises/models/exercise.py:76
+#: gallery/models/image.py:47 manager/helpers.py:88 manager/models/log.py:100
+#: 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/views.py:150
@@ -1198,11 +1183,11 @@ msgid "Date"
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: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
+#: exercises/models/exercise.py:57 exercises/views/exercises.py:123
+#: 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 ""
@@ -1210,12 +1195,12 @@ msgstr ""
msgid "Number of logs (days)"
msgstr ""
-#: core/templates/user/overview.html:37 core/views/user.py:576
+#: core/templates/user/overview.html:37 core/views/user.py:592
#: 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:267
+#: core/templates/user/overview.html:68 manager/forms.py:278
#: manager/templates/workout/view.html:151
msgid "Log"
msgstr ""
@@ -1233,6 +1218,7 @@ msgid "Notes"
msgstr ""
#: core/templates/user/overview.html:79
+#: exercises/templates/history/overview.html:30
#: manager/templates/calendar/partial_overview_table.html:42
#: nutrition/templates/log/detail.html:154
msgid "Time"
@@ -1280,10 +1266,12 @@ msgid "Do you really want to change this user&#39;s password?"
msgstr ""
#: core/templates/user/overview.html:233
+#: exercises/templates/history/overview.html:106
msgid "No"
msgstr ""
#: core/templates/user/overview.html:234
+#: exercises/templates/history/overview.html:99
msgid "Yes"
msgstr ""
@@ -1338,10 +1326,16 @@ msgid "Documents"
msgstr ""
#: core/templates/user/overview.html:413 gym/templates/document/list.html:32
-#: manager/forms.py:279 manager/templates/workout/view.html:176
+#: manager/forms.py:290 manager/templates/workout/view.html:176
msgid "Download"
msgstr ""
+#: core/templates/user/overview.html:451 gym/views/admin_config.py:44
+#: gym/views/admin_config.py:58 gym/views/user_config.py:46
+#, fuzzy
+msgid "Configuration"
+msgstr "إعدادات"
+
#: core/templates/user/overview.html:454 gym/models/user_config.py:92
msgid "Include in inactive overview"
msgstr ""
@@ -1359,7 +1353,23 @@ msgstr ""
msgid "Preferences"
msgstr ""
-#: core/templates/user/preferences.html:33 core/views/user.py:587
+#: core/templates/user/preferences.html:19
+msgid "Verified email"
+msgstr ""
+
+#: core/templates/user/preferences.html:24
+msgid "Unverified email"
+msgstr ""
+
+#: core/templates/user/preferences.html:26
+msgid "Send verification email"
+msgstr ""
+
+#: core/templates/user/preferences.html:30
+msgid "You need to verify your email to contribute exercises"
+msgstr ""
+
+#: core/templates/user/preferences.html:49 core/views/user.py:603
msgid "Change password"
msgstr ""
@@ -1389,39 +1399,37 @@ msgid "oz"
msgstr ""
#: 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
+#: exercises/views/equipment.py:104 exercises/views/exercises.py:185
+#: exercises/views/muscles.py:99 manager/views/schedule.py:311
+#: manager/views/schedule_step.py:129 manager/views/workout.py:269
+#: manager/views/workout_session.py:141 nutrition/views/ingredient.py:138
#: 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:431
-#: exercises/views/muscles.py:125 gallery/views/images.py:121
+#: exercises/views/categories.py:127 exercises/views/exercises.py:193
+#: exercises/views/muscles.py:106 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
+#: manager/views/workout.py:273 manager/views/workout_session.py:156
+#: nutrition/views/ingredient.py:145 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:456
+#: core/views/repetition_units.py:85 core/views/user.py:472
#: 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: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
+#: exercises/views/equipment.py:81 exercises/views/muscles.py:86
+#: 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:170
+#: gym/views/gym.py:459 manager/views/day.py:100 manager/views/schedule.py:335
+#: manager/views/workout.py:287 nutrition/views/ingredient.py:164
+#: nutrition/views/plan.py:144 nutrition/views/unit.py:144
#, python-brace-format
msgid "Edit {0}"
msgstr ""
@@ -1449,64 +1457,65 @@ msgstr ""
msgid "Your feedback was successfully sent. Thank you!"
msgstr ""
-#: core/views/user.py:156
+#: core/views/user.py:157
#, python-brace-format
msgid "Account \"{0}\" was successfully deleted"
msgstr ""
-#: core/views/user.py:287
+#: core/views/user.py:294
msgid "You were successfully registered"
msgstr ""
-#: core/views/user.py:339
+#: core/views/user.py:355
msgid "Settings successfully updated"
msgstr ""
-#: core/views/user.py:376
+#: core/views/user.py:392
msgid "The user was successfully deactivated"
msgstr ""
-#: core/views/user.py:411
+#: core/views/user.py:427
msgid "The user was successfully activated"
msgstr ""
-#: core/views/user.py:426
+#: core/views/user.py:442
msgid "Edit user"
msgstr ""
-#: core/views/user.py:573 gym/templates/gym/member_list.html:26
+#: core/views/user.py:589 gym/templates/gym/member_list.html:26
#: gym/views/gym.py:156
msgid "ID"
msgstr ""
-#: core/views/user.py:574 gym/forms.py:94 gym/templates/contract/view.html:55
+#: core/views/user.py:590 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:577 gym/templates/gym/new_user.html:34
+#: core/views/user.py:593 gym/templates/gym/new_user.html:34
#: gym/views/export.py:60 gym/views/gym.py:218
msgid "Gym"
msgstr ""
-#: exercises/models/base.py:51 exercises/templates/exercise/view.html:76
-#: nutrition/models/ingredient.py:204
+#: core/views/user.py:652
+#, python-format
+msgid "A verification email was sent to %(email)s"
+msgstr ""
+
+#: exercises/models/base.py:63 nutrition/models/ingredient.py:204
msgid "Category"
msgstr ""
-#: exercises/models/base.py:58
+#: exercises/models/base.py:70
msgid "Primary muscles"
msgstr ""
-#: exercises/models/base.py:64 exercises/templates/equipment/overview.html:71
-#: exercises/templates/exercise/overview.html:76
-#: exercises/templates/exercise/view.html:268
-#: exercises/templates/muscles/overview.html:77
+#: exercises/models/base.py:76
msgid "Secondary muscles"
msgstr ""
-#: exercises/models/base.py:79
+#: exercises/models/base.py:91
msgid "Variations"
msgstr ""
@@ -1514,90 +1523,68 @@ msgstr ""
msgid "Exercise Categories"
msgstr ""
-#: exercises/models/comment.py:34 exercises/models/exercise_alias.py:32
-#: exercises/models/image.py:75 exercises/models/video.py:82
-#: manager/forms.py:165 manager/helpers.py:89 manager/models/log.py:51
+#: exercises/models/comment.py:37 exercises/models/exercise_alias.py:35
+#: exercises/models/image.py:71 exercises/models/video.py:95
+#: manager/forms.py:176 manager/helpers.py:89 manager/models/log.py:52
msgid "Exercise"
msgstr ""
-#: exercises/models/comment.py:41
+#: exercises/models/comment.py:43
msgid "A comment about how to correctly do this exercise."
msgstr ""
-#: exercises/models/exercise.py:86 nutrition/models/ingredient.py:80
+#: exercises/models/exercise.py:81 nutrition/models/ingredient.py:80
#: nutrition/models/plan.py:61 nutrition/models/weight_unit.py:32
msgid "Language"
msgstr ""
-#: exercises/models/exercise.py:237 exercises/views/exercises.py:461
-msgid "Exercise was successfully added to the general database"
-msgstr ""
-
-#: exercises/models/exercise.py:265
-msgid "New user submitted exercise"
-msgstr ""
-
-#: exercises/models/exercise.py:267
-#, python-brace-format
-msgid "The user {0} submitted a new exercise \"{1}\"."
-msgstr ""
-
-#: exercises/models/exercise_alias.py:35
+#: exercises/models/exercise_alias.py:38
msgid "Alias for an exercise"
msgstr ""
-#: exercises/models/image.py:59
+#: exercises/models/image.py:55
msgid "Line"
msgstr ""
-#: exercises/models/image.py:60
+#: exercises/models/image.py:56
msgid "3D"
msgstr ""
-#: exercises/models/image.py:61
+#: exercises/models/image.py:57
msgid "Low-poly"
msgstr ""
-#: exercises/models/image.py:62
+#: exercises/models/image.py:58
msgid "Photo"
msgstr ""
-#: exercises/models/image.py:63
+#: exercises/models/image.py:59
msgid "Other"
msgstr ""
-#: exercises/models/image.py:81 gallery/models/image.py:56
+#: exercises/models/image.py:77 gallery/models/image.py:56
msgid "Image"
msgstr ""
-#: exercises/models/image.py:82 gallery/models/image.py:57
+#: exercises/models/image.py:78 gallery/models/image.py:57
msgid "Only PNG and JPEG formats are supported"
msgstr ""
-#: exercises/models/image.py:88
+#: exercises/models/image.py:84
msgid "Main picture"
msgstr ""
-#: exercises/models/image.py:91
+#: exercises/models/image.py:87
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:100
+#: exercises/models/image.py:96
msgid "The art style of your image"
msgstr ""
-#: exercises/models/image.py:185
-msgid "New user submitted image"
-msgstr ""
-
-#: exercises/models/image.py:186
-#, python-brace-format
-msgid "The user {0} submitted a new image \"{1}\" for exercise {2}."
-msgstr ""
-
#: exercises/models/muscle.py:37
msgid "In latin, e.g. \"Pectoralis major\""
msgstr ""
@@ -1610,47 +1597,48 @@ msgstr ""
msgid "A more basic name for the muscle"
msgstr ""
-#: exercises/models/video.py:41
-msgid "Maximum file size is 100MB."
+#: exercises/models/video.py:50
+#, python-format
+msgid "Maximum file size is %(size)sMB."
msgstr ""
-#: exercises/models/video.py:44 exercises/models/video.py:48
+#: exercises/models/video.py:57 exercises/models/video.py:65
msgid "File type is not supported"
msgstr ""
-#: exercises/models/video.py:57
+#: exercises/models/video.py:70
msgid "File is not a valid video"
msgstr ""
-#: exercises/models/video.py:88
+#: exercises/models/video.py:101
msgid "Main video"
msgstr ""
-#: exercises/models/video.py:94
+#: exercises/models/video.py:107
msgid "Video"
msgstr ""
-#: exercises/models/video.py:101
+#: exercises/models/video.py:114
msgid "Size"
msgstr ""
-#: exercises/models/video.py:108 manager/models/schedule_step.py:56
+#: exercises/models/video.py:121 manager/models/schedule_step.py:56
msgid "Duration"
msgstr ""
-#: exercises/models/video.py:117
+#: exercises/models/video.py:130
msgid "Width"
msgstr ""
-#: exercises/models/video.py:124
+#: exercises/models/video.py:137
msgid "Height"
msgstr ""
-#: exercises/models/video.py:131
+#: exercises/models/video.py:144
msgid "Codec"
msgstr ""
-#: exercises/models/video.py:139
+#: exercises/models/video.py:152
msgid "Codec, long name"
msgstr ""
@@ -1659,121 +1647,21 @@ msgid "Equipment list"
msgstr ""
#: exercises/templates/equipment/admin-overview.html:37
-#: exercises/views/equipment.py:94
+#: exercises/views/equipment.py:92
msgid "Add new equipment"
msgstr ""
-#: exercises/templates/equipment/overview.html:11
-msgid "Equipment overview"
+#: exercises/templates/history/overview.html:11
+msgid "Exercise admin history"
msgstr ""
-#: exercises/templates/equipment/overview.html:69
-#: exercises/templates/exercise/overview.html:74
-#: exercises/templates/exercise/view.html:264
-#: exercises/templates/muscles/overview.html:75
-msgid "Main muscles"
-msgstr ""
-
-#: exercises/templates/equipment/overview.html:79
-msgid ""
-"No exercises for this equipment. Add or edit an exercise and set the "
-"equipment."
-msgstr ""
-
-#: exercises/templates/equipment/overview.html:96
-#: exercises/templates/exercise/overview.html:99
-#: nutrition/templates/ingredient/overview.html:57
-msgid "Search"
-msgstr ""
-
-#: exercises/templates/equipment/overview.html:101
-#: exercises/templates/exercise/overview.html:104
-msgid "exercise name"
-msgstr ""
-
-#: exercises/templates/equipment/overview.html:115
-#: exercises/templates/exercise/overview.html:118
-#: exercises/templates/muscles/overview.html:118
-#: nutrition/templates/ingredient/overview.html:85
-msgid "Only registered users can do this"
-msgstr ""
-
-#: exercises/templates/exercise/email_new.tpl:1
-#, python-format
-msgid ""
-"Your exercise '%(exercise)s' was successfully added to the general\n"
-"database."
-msgstr ""
-
-#: exercises/templates/exercise/email_new.tpl:4
-msgid ""
-"It is now available on the exercise and muscle overview and can be\n"
-"added to workouts. You can access it on this address:"
-msgstr ""
-
-#: exercises/templates/exercise/email_new.tpl:8
-#: nutrition/templates/ingredient/email_new.tpl:8
-msgid "Thank you for contributing and making this site better!"
-msgstr ""
-
-#: exercises/templates/exercise/email_new.tpl:9
-#: manager/templates/workout/email_reminder.tpl:15
-#: manager/templates/workout/email_weight_reminder.tpl:12
-#: nutrition/templates/ingredient/email_new.tpl:9
-#, python-format
-msgid "The %(site)s team"
-msgstr ""
-
-#: exercises/templates/exercise/form.html:4
-msgid "Submitting an exercise"
-msgstr ""
-
-#: exercises/templates/exercise/form.html:5
-msgid ""
-"Thank you for submitting an exercise. This is much\n"
-"appreciated!"
-msgstr ""
-
-#: exercises/templates/exercise/form.html:8
-msgid ""
-"After you submit the form, the administrators will be notified.\n"
-"Once it is reviewed, it will be added to the database. Till this happens,\n"
-"it will not be visible in the overview or the search. In case you added your "
-"email\n"
-"when you registered, you will get notified when the process is completed "
-"successfully."
-msgstr ""
-
-#: exercises/templates/exercise/form_correct.html:4
-msgid "Correcting an exercise"
-msgstr ""
-
-#: exercises/templates/exercise/form_correct.html:5
-msgid ""
-"Thank you for correcting and improving this exercise.\n"
-"This is much appreciated!"
-msgstr ""
-
-#: exercises/templates/exercise/form_correct.html:8
-msgid ""
-"After you submit the form, the administrators will be notified.\n"
-"Once the changes are reviewed the exercise will be updated."
-msgstr ""
-
-#: exercises/templates/exercise/overview.html:88
-msgid "No categories."
-msgstr ""
-
-#: exercises/templates/exercise/overview.html:88
-msgid "Use link to create one"
-msgstr ""
-
-#: exercises/templates/exercise/pending.html:14
-#: nutrition/templates/ingredient/pending.html:14
-msgid "Submission date"
-msgstr ""
+#: exercises/templates/history/overview.html:27
+#, fuzzy
+#| msgid "Options"
+msgid "Action"
+msgstr "الخيارات"
-#: exercises/templates/exercise/pending.html:16 gallery/models/image.py:51
+#: exercises/templates/history/overview.html:28 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/log.py:45
@@ -1784,98 +1672,39 @@ msgstr ""
msgid "User"
msgstr ""
-#: exercises/templates/exercise/view.html:48
-msgid "Exercise is pending review"
+#: exercises/templates/history/overview.html:29
+msgid "Object"
msgstr ""
-#: exercises/templates/exercise/view.html:51
-msgid ""
-"This user submitted exercise is pending a decision to be\n"
-" included in the database."
+#: exercises/templates/history/overview.html:31
+msgid "Changes"
msgstr ""
-#: exercises/templates/exercise/view.html:53
-msgid "Till then, it will not be shown in the overview or the search."
+#: exercises/templates/history/overview.html:32
+msgid "Revert"
msgstr ""
-#: exercises/templates/exercise/view.html:54
-#: nutrition/templates/ingredient/view.html:31
-msgid "Please select one of the options below."
+#: exercises/templates/history/overview.html:64
+msgid "View Object"
msgstr ""
-#: exercises/templates/exercise/view.html:60
-#: exercises/templates/exercise/view.html:203
-#: nutrition/templates/ingredient/view.html:38
-msgid "Accept"
+#: exercises/templates/history/overview.html:75
+msgid "View changes"
msgstr ""
-#: exercises/templates/exercise/view.html:64
-#: exercises/templates/exercise/view.html:204
-#: nutrition/templates/ingredient/view.html:42
-msgid "Decline"
-msgstr ""
-
-#: exercises/templates/exercise/view.html:96
-msgid "Images"
-msgstr ""
-
-#: exercises/templates/exercise/view.html:137 exercises/views/images.py:93
-msgid "Add new image"
-msgstr ""
-
-#: 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:218
-msgid "Comments for this exercise"
-msgstr ""
-
-#: exercises/templates/exercise/view.html:246
-msgid "Add new comment"
-msgstr ""
-
-#: exercises/templates/exercise/view.html:260
-msgid "The diagram shows the most used muscles on this exercise"
-msgstr ""
-
-#: 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:306
-msgid "Exercise Variations"
-msgstr ""
-
-#: exercises/templates/exercise/view.html:327
-msgid "Submit a correction"
+#: exercises/templates/history/overview.html:86
+msgid "Revert changes"
msgstr ""
#: exercises/templates/muscles/admin-overview.html:4
-#: exercises/templates/muscles/overview.html:7
msgid "Muscle overview"
msgstr ""
#: exercises/templates/muscles/admin-overview.html:36
-#: exercises/views/muscles.py:86
+#: exercises/views/muscles.py:67
msgid "Add muscle"
msgstr ""
-#: exercises/templates/muscles/overview.html:85
-msgid ""
-"No exercises for this muscle. Add or edit an exercise and set the muscle."
-msgstr ""
-
#: exercises/views/categories.py:71
msgid "Add category"
msgstr ""
@@ -1888,50 +1717,19 @@ msgstr ""
msgid "Add exercise comment"
msgstr ""
-#: exercises/views/equipment.py:107 exercises/views/equipment.py:118
+#: exercises/views/equipment.py:105 exercises/views/equipment.py:116
msgid "Delete equipment?"
msgstr ""
-#: exercises/views/exercises.py:229
+#: exercises/views/exercises.py:161
#, python-format
-msgid ""
-"%(name_original)s is too similar to existing exercise \"%(exercise_name)s\""
+msgid "%(name)s is too similar to existing exercise \"%(exercise_name)s\""
msgstr ""
-#: exercises/views/exercises.py:247
-msgid "Add exercise"
-msgstr ""
-
-#: exercises/views/exercises.py:367
-msgid "Thank you. Once the changes are reviewed the exercise will be updated."
-msgstr ""
-
-#: exercises/views/exercises.py:380
-#, python-brace-format
-msgid "Correct {0}"
-msgstr ""
-
-#: exercises/views/exercises.py:422
+#: exercises/views/exercises.py:184
msgid "This will delete the exercise from all workouts."
msgstr ""
-#: exercises/views/exercises.py:474
-msgid "Exercise was successfully marked as rejected"
-msgstr ""
-
-#: exercises/views/images.py:68
-msgid "Edit exercise image"
-msgstr ""
-
-#: exercises/views/images.py:143
-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 ""
@@ -1998,7 +1796,7 @@ msgid "Contract type"
msgstr ""
#: gym/models/contract.py:208 gym/templates/contract/view.html:59
-#: manager/templates/log/add.html:52 nutrition/forms.py:59
+#: manager/templates/log/add.html:52 nutrition/forms.py:60
#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:102
#: nutrition/models/meal_item.py:72
msgid "Amount"
@@ -2099,6 +1897,10 @@ msgstr ""
msgid "User notes"
msgstr ""
+#: gym/templates/contract/list.html:36
+msgid "Show"
+msgstr "العرض"
+
#: gym/templates/contract/view.html:4
msgid "Contract"
msgstr ""
@@ -2177,10 +1979,6 @@ msgstr ""
msgid "Add member"
msgstr ""
-#: gym/templates/gym/new_user.html:38
-msgid "Date of Birth"
-msgstr ""
-
#: gym/templates/gym/new_user.html:48 manager/templates/calendar/month.html:144
#: manager/templates/log/add.html:75 nutrition/templates/rate/form.html:120
msgid "Info"
@@ -2237,125 +2035,125 @@ msgstr ""
msgid "Edit gym"
msgstr ""
-#: i18n.tpl:2 i18n.tpl:28
-msgid "Abs"
+#: i18n.tpl:2
+msgid "Until Failure"
msgstr ""
-#: i18n.tpl:3
-msgid "Arms"
+#: i18n.tpl:3 manager/forms.py:180 manager/models/log.py:73
+#: manager/templates/set/add.html:53
+msgid "Repetitions"
msgstr ""
#: i18n.tpl:4
-msgid "Back"
+msgid "Abs"
msgstr ""
-#: i18n.tpl:5 i18n.tpl:23
-msgid "Calves"
+#: i18n.tpl:5
+msgid "Arms"
msgstr ""
-#: i18n.tpl:6 i18n.tpl:26
-msgid "Chest"
+#: i18n.tpl:6
+msgid "Legs"
msgstr ""
#: i18n.tpl:7
-msgid "Legs"
+msgid "Dumbbell"
msgstr ""
-#: i18n.tpl:8 i18n.tpl:19
-msgid "Shoulders"
+#: i18n.tpl:8
+msgid "Biceps"
msgstr ""
#: i18n.tpl:9
-msgid "Barbell"
+msgid "SZ-Bar"
msgstr ""
#: i18n.tpl:10
-msgid "Bench"
+msgid "Kettlebell"
msgstr ""
#: i18n.tpl:11
-msgid "Dumbbell"
+msgid "Swiss Ball"
msgstr ""
#: i18n.tpl:12
-msgid "Gym mat"
+msgid "none (bodyweight exercise)"
msgstr ""
#: i18n.tpl:13
-msgid "Incline bench"
+msgid "Calves"
msgstr ""
#: i18n.tpl:14
-msgid "Kettlebell"
+msgid "Back"
msgstr ""
#: i18n.tpl:15
-msgid "Pull-up bar"
+msgid "Lower back"
msgstr ""
#: i18n.tpl:16
-msgid "SZ-Bar"
+msgid "Lats"
msgstr ""
#: i18n.tpl:17
-msgid "Swiss Ball"
+msgid "Hamstrings"
msgstr ""
#: i18n.tpl:18
-msgid "none (bodyweight exercise)"
+msgid "Bench"
+msgstr ""
+
+#: i18n.tpl:19
+msgid "Glutes"
msgstr ""
#: i18n.tpl:20
-msgid "Biceps"
+msgid "Kilometers"
msgstr ""
#: i18n.tpl:21
-msgid "Hamstrings"
+msgid "Shoulders"
msgstr ""
#: i18n.tpl:22
-msgid "Lower back"
+msgid "Seconds"
msgstr ""
-#: i18n.tpl:24
-msgid "Glutes"
+#: i18n.tpl:23
+msgid "Miles"
msgstr ""
-#: i18n.tpl:25
-msgid "Lats"
+#: i18n.tpl:24
+msgid "Incline bench"
msgstr ""
-#: i18n.tpl:27
+#: i18n.tpl:25
msgid "Quads"
msgstr ""
-#: i18n.tpl:29
-msgid "Triceps"
-msgstr ""
-
-#: i18n.tpl:30
-msgid "Kilometers"
+#: i18n.tpl:26
+msgid "Minutes"
msgstr ""
-#: i18n.tpl:31
-msgid "Miles"
+#: i18n.tpl:27
+msgid "Chest"
msgstr ""
-#: i18n.tpl:32
-msgid "Minutes"
+#: i18n.tpl:28
+msgid "Gym mat"
msgstr ""
-#: i18n.tpl:33 manager/forms.py:169 manager/models/log.py:71
-#: manager/templates/set/add.html:53
-msgid "Repetitions"
+#: i18n.tpl:29
+msgid "Pull-up bar"
msgstr ""
-#: i18n.tpl:34
-msgid "Seconds"
+#: i18n.tpl:30
+msgid "Barbell"
msgstr ""
-#: i18n.tpl:35
-msgid "Until Failure"
+#: i18n.tpl:31
+msgid "Triceps"
msgstr ""
#: mailer/forms.py:34 mailer/templates/mailer/gym/preview.html:32
@@ -2409,44 +2207,44 @@ msgstr ""
msgid "Correction"
msgstr ""
-#: manager/forms.py:89 manager/models/workout.py:59
+#: manager/forms.py:92 manager/models/workout.py:59
msgid "The name of the workout"
msgstr ""
-#: manager/forms.py:93 manager/models/workout.py:66
+#: manager/forms.py:96 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
+#: manager/forms.py:137
msgid ""
"You can search for more than one exercise, they will be grouped together for "
"a superset."
msgstr ""
-#: 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
+#: manager/forms.py:166 manager/forms.py:171 manager/models/log.py:64
+#: manager/models/log.py:92 manager/models/setting.py:59
+#: manager/models/setting.py:90 manager/templates/log/add.html:53
+#: manager/templates/log/add.html:55 manager/templates/set/formset.html:10
+#: manager/templates/set/formset.html:12 measurements/models/category.py:58
+#: nutrition/forms.py:64
msgid "Unit"
msgstr ""
-#: manager/forms.py:266
+#: manager/forms.py:277
msgid "Type"
msgstr ""
-#: manager/forms.py:267 manager/templates/workout/view.html:157
+#: manager/forms.py:278 manager/templates/workout/view.html:157
msgid "Table"
msgstr ""
-#: manager/forms.py:269 manager/templates/workout/view.html:163
+#: manager/forms.py:280 manager/templates/workout/view.html:163
msgid "with images"
msgstr ""
-#: manager/forms.py:270 manager/templates/workout/view.html:169
+#: manager/forms.py:281 manager/templates/workout/view.html:169
msgid "with comments"
msgstr ""
@@ -2498,7 +2296,7 @@ msgid "The duration in weeks"
msgstr ""
#: manager/models/schedule_step.py:63 manager/models/set.py:52
-#: manager/models/setting.py:98 nutrition/models/meal.py:54
+#: manager/models/setting.py:110 nutrition/models/meal.py:54
#: nutrition/models/meal_item.py:65
msgid "Order"
msgstr ""
@@ -2549,7 +2347,7 @@ msgstr ""
msgid "Number of sets"
msgstr ""
-#: manager/models/setting.py:43
+#: manager/models/setting.py:48
msgid "Sets"
msgstr ""
@@ -2808,6 +2606,13 @@ msgid ""
"option in your settings."
msgstr ""
+#: manager/templates/workout/email_reminder.tpl:15
+#: manager/templates/workout/email_weight_reminder.tpl:12
+#: nutrition/templates/ingredient/email_new.tpl:9
+#, python-format
+msgid "The %(site)s team"
+msgstr ""
+
#: manager/templates/workout/email_weight_reminder.tpl:3
#, python-format
msgid ""
@@ -2820,6 +2625,10 @@ msgid ""
"You will regularly receive such reminders till you enter your current weight."
msgstr ""
+#: manager/templates/workout/log.html:10 manager/templates/workout/log.html:11
+msgid "Weight log"
+msgstr ""
+
#: manager/templates/workout/log.html:29
msgid "Weight log for workout"
msgstr ""
@@ -2916,7 +2725,7 @@ msgstr ""
msgid "Edit workout"
msgstr ""
-#: manager/templates/workout/view.html:225 manager/views/workout.py:300
+#: manager/templates/workout/view.html:225 manager/views/workout.py:301
msgid "Mark as template"
msgstr ""
@@ -2924,11 +2733,6 @@ msgstr ""
msgid "Add workout day"
msgstr ""
-#: manager/views/log.py:92
-#, python-format
-msgid "Edit log entry for %s"
-msgstr ""
-
#: manager/views/log.py:111
msgid "Delete workout log"
msgstr ""
@@ -2946,11 +2750,11 @@ msgstr ""
msgid "Your workouts"
msgstr ""
-#: manager/views/workout.py:227
+#: manager/views/workout.py:228
msgid "Copy workout"
msgstr ""
-#: manager/views/workout.py:230
+#: manager/views/workout.py:231
msgid "Copy"
msgstr ""
@@ -2972,29 +2776,29 @@ msgstr ""
msgid "Value"
msgstr ""
-#: nutrition/forms.py:122
+#: nutrition/forms.py:123
msgid "Calculate"
msgstr ""
-#: nutrition/forms.py:195 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:196 nutrition/templates/rate/form.html:76
msgid "Basic caloric intake"
msgstr ""
-#: nutrition/forms.py:196
+#: nutrition/forms.py:197
msgid "Your basic caloric intake as calculated for your data"
msgstr ""
-#: nutrition/forms.py:202
+#: nutrition/forms.py:203
msgid "Additional calories"
msgstr ""
-#: nutrition/forms.py:204
+#: nutrition/forms.py:205
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
msgstr ""
-#: nutrition/forms.py:232 nutrition/models/ingredient_weight_unit.py:39
+#: nutrition/forms.py:233 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"
@@ -3057,7 +2861,7 @@ msgid ""
"{energy_approx}%)"
msgstr ""
-#: nutrition/models/ingredient.py:357 nutrition/views/ingredient.py:225
+#: nutrition/models/ingredient.py:357 nutrition/views/ingredient.py:219
msgid "Ingredient was successfully added to the general database"
msgstr ""
@@ -3086,6 +2890,10 @@ msgstr ""
msgid "Meal"
msgstr ""
+#: nutrition/models/log.py:65
+msgid "Date and Time (Approx.)"
+msgstr ""
+
#: nutrition/models/meal.py:61
msgid "Time (approx)"
msgstr ""
@@ -3177,6 +2985,10 @@ msgid ""
"added to nutrition plans. You can access it on this address:"
msgstr ""
+#: nutrition/templates/ingredient/email_new.tpl:8
+msgid "Thank you for contributing and making this site better!"
+msgstr ""
+
#: nutrition/templates/ingredient/form.html:4
msgid "Submitting an ingredient"
msgstr ""
@@ -3201,6 +3013,10 @@ msgstr ""
msgid "No ingredients."
msgstr ""
+#: nutrition/templates/ingredient/overview.html:57
+msgid "Search"
+msgstr ""
+
#: nutrition/templates/ingredient/overview.html:66
msgid "ingredient name"
msgstr ""
@@ -3210,6 +3026,14 @@ msgstr ""
msgid "Add ingredient"
msgstr ""
+#: nutrition/templates/ingredient/overview.html:85
+msgid "Only registered users can do this"
+msgstr ""
+
+#: nutrition/templates/ingredient/pending.html:14
+msgid "Submission date"
+msgstr ""
+
#: nutrition/templates/ingredient/view.html:27
msgid "Ingredient is pending review"
msgstr ""
@@ -3222,6 +3046,18 @@ msgid ""
"the search."
msgstr ""
+#: nutrition/templates/ingredient/view.html:31
+msgid "Please select one of the options below."
+msgstr ""
+
+#: nutrition/templates/ingredient/view.html:38
+msgid "Accept"
+msgstr ""
+
+#: nutrition/templates/ingredient/view.html:42
+msgid "Decline"
+msgstr ""
+
#: nutrition/templates/ingredient/view.html:71
#: nutrition/templates/log/detail.html:31
#: nutrition/templates/plan/view.html:229 nutrition/views/plan.py:376
@@ -3462,14 +3298,18 @@ msgid ""
"yourself for some weeks and change the total amount if needed."
msgstr ""
-#: nutrition/views/ingredient.py:181
+#: nutrition/views/ingredient.py:175
msgid "Add a new ingredient"
msgstr ""
-#: nutrition/views/ingredient.py:238
+#: nutrition/views/ingredient.py:232
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 ""
@@ -3684,29 +3524,29 @@ msgstr ""
msgid "100%% Free <br>and <br>Open Source"
msgstr ""
-#: utils/generic_views.py:261
+#: utils/generic_views.py:262
msgid "Yes, delete"
msgstr ""
-#: utils/models.py:47
+#: utils/models.py:48
msgid "Author"
msgstr ""
-#: utils/models.py:52
+#: utils/models.py:53
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:77
+#: utils/models.py:78
msgid "Pending"
msgstr ""
-#: utils/models.py:78
+#: utils/models.py:79
msgid "Accepted"
msgstr ""
-#: utils/models.py:79
+#: utils/models.py:80
msgid "Declined"
msgstr ""
@@ -3846,3 +3686,24 @@ msgstr ""
#, python-format
msgid "Delete weight entry for the %s"
msgstr ""
+
+#~ msgid "Ingredients"
+#~ msgstr "مقادير"
+
+#, fuzzy
+#~ msgid ""
+#~ "Use the configuration to select in what languages the\n"
+#~ "exercises and ingredients will be shown for the current language (for "
+#~ "example\n"
+#~ "the exercises should be shown in languages A, B and C; the ingredients "
+#~ "only\n"
+#~ "in A)."
+#~ msgstr ""
+#~ "استخدم إعدادات لتحديد اللغات\n"
+#~ "سيتم عرض التمارين والمكونات للغة الحالية (على سبيل المثال\n"
+#~ "يجب أن تكون التدريبات باللغات أ ، ب ، ج ؛ المكونات فقط\n"
+#~ "في اللغة أ )."
+
+#, fuzzy
+#~ msgid "Add new video"
+#~ msgstr "أضف واحدة الآن."
diff --git a/wger/locale/bg/LC_MESSAGES/django.po b/wger/locale/bg/LC_MESSAGES/django.po
index 2dd78152b..9e344fc05 100644
--- a/wger/locale/bg/LC_MESSAGES/django.po
+++ b/wger/locale/bg/LC_MESSAGES/django.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: wger Workout Manager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-14 12:01+0200\n"
+"POT-Creation-Date: 2022-11-10 16:03+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"
@@ -32,102 +32,8 @@ msgid ""
"registered users to this gym and update all existing users without a gym."
msgstr ""
-#: 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:226
-msgid "Languages"
-msgstr ""
-
-#: config/templates/language/overview.html:16
-msgid "Nothing found."
-msgstr ""
-
-#: 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:150
-#: nutrition/templates/plan/view.html:153
-#: nutrition/templates/plan/view.html:191
-msgid "Add one now."
-msgstr "Добави сега."
-
-#: config/templates/language/overview.html:29
-#: core/templates/license/list.html:38 core/templates/misc/license/list.html:41
-#: core/templates/repetition_unit/list.html:41
-#: core/templates/user/overview.html:327 core/templates/user/overview.html:366
-#: core/templates/user/overview.html:402
-#: core/templates/weight_unit/list.html:41 core/views/languages.py:73
-#: core/views/license.py:65 core/views/repetition_units.py:65
-#: core/views/weight_units.py:65
-#: exercises/templates/categories/admin-overview.html:36
-#: 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:61
-msgid "Add"
-msgstr "Добави"
-
-#: 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/language.py:32
-msgid "Language full name"
-msgstr "Пълно име на език"
-
-#: config/templates/language/view.html:34 core/templates/user/overview.html:451
-#: gym/views/admin_config.py:44 gym/views/admin_config.py:58
-#: gym/views/user_config.py:46
-msgid "Configuration"
-msgstr ""
-
-#: config/templates/language/view.html:35
-msgid ""
-"Use the configuration to select in what languages the\n"
-"exercises and ingredients will be shown for the current language (for "
-"example\n"
-"the exercises should be shown in languages A, B and C; the ingredients only\n"
-"in A)."
-msgstr ""
-
-#: config/templates/language/view.html:44 gym/templates/contract/list.html:36
-msgid "Show"
-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: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:45
-msgid "Options"
-msgstr "Опции"
-
-#: config/templates/language/view.html:96 config/views/gym_config.py:41
-#: config/views/language_config.py:49 core/templates/license/list.html:16
-#: core/templates/misc/license/list.html:17
+#: config/views/gym_config.py:41 core/templates/language/view.html:57
+#: 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:39
#: core/templates/tags/render_day.html:75 core/templates/user/overview.html:205
@@ -135,12 +41,10 @@ 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:230
-#: exercises/templates/exercise/view.html:351
#: exercises/templates/muscles/admin-overview.html:16
-#: 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
+#: 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
#: 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,81 +60,54 @@ msgstr "Опции"
msgid "Edit"
msgstr "Поправи"
-#: 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: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: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
-#: gym/templates/contract_type/list.html:39 gym/templates/document/list.html:46
-#: gym/templates/gym/list.html:20 manager/templates/calendar/day.html:69
-#: 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:231
-#: 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:132
-#: nutrition/templates/units/list.html:20
-msgid "Delete"
-msgstr "Изтрии"
-
-#: core/demo.py:86
+#: core/demo.py:95
msgid "Sample workout"
msgstr "Примерна тренировка"
-#: core/demo.py:90
+#: core/demo.py:99
msgid "Sample day"
msgstr "Примерен ден"
-#: core/demo.py:94
+#: core/demo.py:103
msgid "Another sample day"
msgstr "Друг примерен ден"
-#: core/demo.py:217
-msgid "Sample nutrional plan"
+#: core/demo.py:211
+#, fuzzy
+#| msgid "Sample nutrional plan"
+msgid "Sample nutritional plan"
msgstr "Примерен план за хранене"
-#: core/demo.py:349 core/demo.py:351 core/demo.py:353
+#: core/demo.py:343 core/demo.py:345 core/demo.py:347
#, python-brace-format
msgid "Placeholder workout nr {0} for schedule"
msgstr "Място за тренировка № {0} по план"
-#: core/demo.py:358
+#: core/demo.py:352
msgid "My cool workout schedule"
msgstr "Моята готина тренировъчна схема"
-#: core/demo.py:397 core/demo.py:412
+#: core/demo.py:391 core/demo.py:406
msgid "Empty placeholder schedule"
msgstr "Празно място за тренировъчен план"
-#: core/forms.py:61 core/templates/navigation.html:188
-#: core/templates/navigation.html:192 core/templates/user/login.html:4
+#: core/forms.py:64 core/templates/navigation.html:179
+#: core/templates/navigation.html:183 core/templates/user/login.html:4
#: software/templates/features.html:43
msgid "Login"
msgstr "Вход"
-#: core/forms.py:73 core/forms.py:164 gym/views/export.py:63
+#: core/forms.py:76 core/forms.py:177 gym/views/export.py:63
#: gym/views/gym.py:218
msgid "First name"
msgstr ""
-#: core/forms.py:74 core/forms.py:165 core/templates/user/overview.html:267
+#: core/forms.py:77 core/forms.py:178 core/templates/user/overview.html:267
#: gym/views/export.py:64 gym/views/gym.py:218
msgid "Last name"
msgstr ""
-#: core/forms.py:76 core/forms.py:131 core/templates/user/overview.html:271
+#: core/forms.py:79 core/forms.py:144 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
@@ -240,77 +117,107 @@ msgstr ""
msgid "Email"
msgstr "Е-мейл"
-#: core/forms.py:77
+#: core/forms.py:80
msgid "Used for password resets and, optionally, e-mail reminders."
msgstr ""
-#: core/forms.py:102
+#: core/forms.py:84 core/models/profile.py:220
+#: gym/templates/gym/new_user.html:38
+msgid "Date of Birth"
+msgstr ""
+
+#: core/forms.py:116
msgid "Personal data"
msgstr ""
-#: core/forms.py:110
+#: core/forms.py:124
msgid "Workout reminders"
msgstr ""
-#: core/forms.py:117
+#: core/forms.py:131
msgid "Other settings"
msgstr ""
-#: 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
+#: core/forms.py:138 core/views/user.py:615 core/views/user.py:630
+#: core/views/user.py:642 gym/forms.py:72 manager/templates/log/add.html:65
+#: manager/templates/set/add.html:69 manager/views/workout.py:222
+#: utils/generic_views.py:143
msgid "Save"
msgstr "Запази"
-#: core/forms.py:132
+#: core/forms.py:145
msgid "Used for password resets and, optionally, email reminders."
msgstr ""
-#: core/forms.py:160
+#: core/forms.py:173
#, fuzzy
#| msgid "This email is already used."
msgid "This e-mail address is already in use."
msgstr "Този email е вече използван."
-#: core/forms.py:180 gym/templates/gym/new_user.html:26
+#: core/forms.py:193 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:182
+#: core/forms.py:195
msgid "Please enter your current password."
msgstr ""
-#: core/forms.py:200
+#: core/forms.py:204 core/templates/language/view.html:62
+#: 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: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/muscles/admin-overview.html:17
+#: gym/templates/admin_notes/list.html:40
+#: gym/templates/contract_option/list.html:39
+#: gym/templates/contract_type/list.html:39 gym/templates/document/list.html:46
+#: gym/templates/gym/list.html:20 manager/templates/calendar/day.html:69
+#: 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:231
+#: 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:132
+#: nutrition/templates/units/list.html:20
+msgid "Delete"
+msgstr "Изтрии"
+
+#: core/forms.py:213
msgid "Invalid password"
msgstr ""
-#: core/forms.py:212 core/forms.py:278
+#: core/forms.py:225 core/forms.py:291
msgid "The form is secured with reCAPTCHA"
msgstr ""
-#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:188
-#: core/templates/navigation.html:193 core/templates/template.html:149
-#: core/templates/user/login.html:20 core/views/user.py:293
+#: core/forms.py:239 core/forms.py:258 core/templates/navigation.html:179
+#: core/templates/navigation.html:184 core/templates/template.html:149
+#: core/templates/user/login.html:20 core/views/user.py:300
#: software/templates/features.html:38
msgid "Register"
msgstr "Регистрация"
-#: core/forms.py:256
+#: core/forms.py:269
msgid "Contact"
msgstr ""
-#: core/forms.py:257
+#: core/forms.py:270
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:71
+#: core/forms.py:278 exercises/models/comment.py:42 manager/models/set.py:60
+#: manager/models/setting.py:111 nutrition/models/log.py:71
msgid "Comment"
msgstr "Коментирай"
-#: core/forms.py:266
+#: core/forms.py:279
msgid "What do you want to say?"
msgstr "Какво искаш да кажеш?"
@@ -318,6 +225,14 @@ msgstr "Какво искаш да кажеш?"
msgid "Day of the week"
msgstr "Ден от седмица"
+#: core/models/language.py:31 core/templates/language/view.html:21
+msgid "Language short name"
+msgstr "Съкратено име на езика"
+
+#: core/models/language.py:36 core/templates/language/view.html:22
+msgid "Language full name"
+msgstr "Пълно име на език"
+
#: core/models/license.py:29
msgid "Full name"
msgstr ""
@@ -373,21 +288,21 @@ msgstr ""
msgid "Imperial (pound)"
msgstr ""
-#: core/models/profile.py:111
+#: core/models/profile.py:114
msgid "Show exercise comments"
msgstr "Покажи коментарите на упражнението"
-#: core/models/profile.py:112
+#: core/models/profile.py:115
msgid "Check to show exercise comments on the workout view"
msgstr ""
"Отбележи, за да се покажат коментарите от упражнението да прегледа за "
"тренировката"
-#: core/models/profile.py:123
+#: core/models/profile.py:126
msgid "Also use ingredients in English"
msgstr "Също използвай съставки на Английски"
-#: core/models/profile.py:125
+#: core/models/profile.py:128
msgid ""
"Check to also show ingredients in English while creating\n"
"a nutritional plan. These ingredients are extracted from a list provided\n"
@@ -400,130 +315,129 @@ msgstr ""
"7000 въведения, но също може да се окаже прекалено голям и да направи "
"търсенето дълго."
-#: core/models/profile.py:134
+#: core/models/profile.py:137
msgid "Activate workout reminders"
msgstr ""
-#: core/models/profile.py:136
+#: core/models/profile.py:139
msgid ""
"Check to activate automatic reminders for workouts. You need to provide a "
"valid email for this to work."
msgstr ""
-#: core/models/profile.py:145
+#: core/models/profile.py:148
msgid "Remind before expiration"
msgstr ""
-#: core/models/profile.py:146
+#: core/models/profile.py:149
msgid "The number of days you want to be reminded before a workout expires."
msgstr ""
-#: core/models/profile.py:152
+#: core/models/profile.py:155
msgid "Default duration of workouts"
msgstr ""
-#: core/models/profile.py:154
+#: core/models/profile.py:157
msgid ""
"Default duration in weeks of workouts not in a schedule. Used for email "
"workout reminders."
msgstr ""
-#: core/models/profile.py:171
+#: core/models/profile.py:174
msgid "Notification language"
msgstr ""
-#: core/models/profile.py:173
+#: core/models/profile.py:176
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/profile.py:186 gym/views/export.py:66
+#: core/models/profile.py:212 gym/views/export.py:66
msgid "Age"
msgstr ""
-#: core/models/profile.py:202 nutrition/forms.py:99
+#: core/models/profile.py:228 nutrition/forms.py:100
msgid "Height (cm)"
msgstr ""
-#: core/models/profile.py:219
+#: core/models/profile.py:245
msgid "Hours of sleep"
msgstr ""
-#: core/models/profile.py:220
+#: core/models/profile.py:246
msgid "The average hours of sleep per day"
msgstr ""
-#: core/models/profile.py:229
+#: core/models/profile.py:255
msgid "Work"
msgstr ""
-#: core/models/profile.py:230 core/models/profile.py:272
+#: core/models/profile.py:256 core/models/profile.py:298
msgid "Average hours per day"
msgstr ""
-#: core/models/profile.py:239 core/models/profile.py:260
-#: core/models/profile.py:281
+#: core/models/profile.py:265 core/models/profile.py:286
+#: core/models/profile.py:307
msgid "Physical intensity"
msgstr ""
-#: core/models/profile.py:240 core/models/profile.py:261
-#: core/models/profile.py:282
+#: core/models/profile.py:266 core/models/profile.py:287
+#: core/models/profile.py:308
msgid "Approximately"
msgstr ""
-#: core/models/profile.py:250
+#: core/models/profile.py:276
msgid "Sport"
msgstr ""
-#: core/models/profile.py:251
+#: core/models/profile.py:277
msgid "Average hours per week"
msgstr ""
-#: core/models/profile.py:271
+#: core/models/profile.py:297
msgid "Free time"
msgstr ""
-#: core/models/profile.py:292 nutrition/templates/rate/form.html:66
+#: core/models/profile.py:318 nutrition/templates/rate/form.html:66
msgid "Total daily calories"
msgstr ""
-#: core/models/profile.py:293
+#: core/models/profile.py:319
msgid "Total caloric intake, including e.g. any surplus"
msgstr ""
-#: core/models/profile.py:305 nutrition/models/ingredient_weight_unit.py:45
+#: core/models/profile.py:331 nutrition/models/ingredient_weight_unit.py:45
#: nutrition/models/log.py:90 nutrition/models/meal_item.py:58
msgid "Weight unit"
msgstr "Единица за тегло"
-#: core/models/profile.py:313
+#: core/models/profile.py:339
msgid "Allow external access"
msgstr ""
-#: core/models/profile.py:315
+#: core/models/profile.py:341
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/profile.py:324
+#: core/models/profile.py:350
msgid "Automatic reminders for weight entries"
msgstr ""
-#: core/models/profile.py:326
+#: core/models/profile.py:352
msgid "Number of days after the last weight entry (enter 0 to deactivate)"
msgstr ""
-#: core/models/profile.py:392
+#: core/models/profile.py:418
msgid "The sum of all hours has to be 24"
msgstr ""
#: core/models/rep_unit.py:35 core/models/weight_unit.py:35
-#: core/templates/user/overview.html:263 core/views/user.py:575
+#: core/templates/user/overview.html:263 core/views/user.py:591
#: 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
+#: exercises/models/exercise.py:64 exercises/models/muscle.py:36
#: 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
@@ -582,6 +496,52 @@ msgstr ""
msgid "Are you sure you want to delete this? This action cannot be undone."
msgstr "Сигурен ли си, че искаш да изтриеш това? Това действие е невъзвратимо!"
+#: core/templates/email_verification/confirm_template.html:4
+msgid "Email verified"
+msgstr ""
+
+#: core/templates/email_verification/confirm_template.html:18
+#, python-format
+msgid "%(username)s, your email was verified"
+msgstr ""
+
+#: core/templates/email_verification/confirm_template.html:22
+msgid "Error, invalid verification token"
+msgstr ""
+
+#: core/templates/email_verification/email_body_html.tpl:6
+#, fuzzy
+#| msgid "Administration"
+msgid "Email Confirmation"
+msgstr "Администрация"
+
+#: core/templates/email_verification/email_body_html.tpl:9
+#: core/templates/email_verification/email_body_txt.tpl:3
+#, python-format
+msgid "You are almost there, %(username)s!"
+msgstr ""
+
+#: core/templates/email_verification/email_body_html.tpl:11
+#, python-format
+msgid "Please click <a href=\"%(link)s\">here</a> to confirm your email"
+msgstr ""
+
+#: core/templates/email_verification/email_body_html.tpl:12
+#: core/templates/email_verification/email_body_txt.tpl:5
+#, python-format
+msgid "The token expires on %(time)s"
+msgstr ""
+
+#: core/templates/email_verification/email_body_html.tpl:14
+#: core/templates/email_verification/email_body_txt.tpl:8
+msgid "the wger Team"
+msgstr ""
+
+#: core/templates/email_verification/email_body_txt.tpl:4
+#, python-format
+msgid "Please click the following link to confirm your email: %(link)s"
+msgstr ""
+
#: core/templates/index.html:4
msgid "Dashboard"
msgstr "Табло"
@@ -638,7 +598,7 @@ msgid "Add custom diary entry"
msgstr ""
#: core/templates/index.html:84 core/templates/index.html:92
-#: manager/models/day.py:34 manager/models/log.py:56
+#: manager/models/day.py:34 manager/models/log.py:58
#: manager/models/session.py:60 manager/models/workout.py:109
#: manager/templates/schedule/view.html:105
#: manager/templates/workout/view.html:11
@@ -669,6 +629,20 @@ msgstr ""
msgid "No workouts found."
msgstr "Не са намерени тренировки."
+#: core/templates/index.html:137 core/templates/index.html:189
+#: core/templates/language/overview.html:23
+#: 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:150
+#: nutrition/templates/plan/view.html:153
+#: nutrition/templates/plan/view.html:191
+msgid "Add one now."
+msgstr "Добави сега."
+
#: 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
@@ -722,19 +696,59 @@ msgid "No nutrition plans."
msgstr "Няма план за хранене"
#: 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
+#: core/templates/user/overview.html:121 manager/forms.py:184
+#: manager/helpers.py:89 manager/models/log.py:86 manager/models/setting.py:79
+#: manager/templates/log/add.html:54 manager/templates/set/formset.html:11
#: weight/models.py: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:210 core/templates/navigation.html:135
+#: core/templates/index.html:210 core/templates/navigation.html:126
#: weight/views.py:70
msgid "Add weight entry"
msgstr "Добави тегло"
+#: core/templates/language/overview.html:4 core/templates/navigation.html:217
+msgid "Languages"
+msgstr ""
+
+#: core/templates/language/overview.html:23
+msgid "Nothing found."
+msgstr ""
+
+#: core/templates/language/overview.html:36 core/templates/license/list.html:38
+#: core/templates/misc/license/list.html:41
+#: core/templates/repetition_unit/list.html:41
+#: core/templates/user/overview.html:327 core/templates/user/overview.html:366
+#: core/templates/user/overview.html:402
+#: core/templates/weight_unit/list.html:41 core/views/languages.py:73
+#: core/views/license.py:65 core/views/repetition_units.py:65
+#: core/views/weight_units.py:65
+#: exercises/templates/categories/admin-overview.html:36
+#: 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:61
+msgid "Add"
+msgstr "Добави"
+
+#: core/templates/language/view.html:52 core/templates/user/api_key.html:44
+#: core/templates/user/preferences.html:44 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:45
+msgid "Options"
+msgstr "Опции"
+
#: core/templates/license/list.html:4 core/templates/misc/license/list.html:4
msgid "License list"
msgstr ""
@@ -747,7 +761,6 @@ msgstr ""
#: core/templates/weight_unit/list.html:26
#: exercises/templates/categories/admin-overview.html:24
#: exercises/templates/equipment/admin-overview.html:24
-#: exercises/templates/exercise/pending.html:30
#: exercises/templates/muscles/admin-overview.html:24
#: gym/templates/admin_notes/list.html:52 gym/templates/contract/list.html:60
#: gym/templates/contract_option/list.html:56
@@ -829,155 +842,135 @@ msgstr "Твоите графици"
msgid "Public templates"
msgstr ""
-#: core/templates/navigation.html:64
-msgctxt "as in sorted by category"
-msgid "by category"
-msgstr ""
-
-#: core/templates/navigation.html:65
-msgctxt "as in sorted by muscle"
-msgid "by muscle"
-msgstr ""
-
-#: core/templates/navigation.html:66
-msgctxt "as in sorted by equipment"
-msgid "by equipment"
-msgstr ""
-
-#: core/templates/navigation.html:70
-#: exercises/templates/equipment/overview.html:109
-#: exercises/templates/equipment/overview.html:113
-#: exercises/templates/exercise/overview.html:112
-#: exercises/templates/exercise/overview.html:116
-#: exercises/templates/muscles/overview.html:112
-#: exercises/templates/muscles/overview.html:116
-msgid "Add new exercise"
-msgstr "Добави ново упражнение"
+#: core/templates/navigation.html:63 manager/forms.py:133
+#: manager/models/setting.py:54
+msgid "Exercises"
+msgstr "Упражнения"
-#: core/templates/navigation.html:75 core/templates/navigation.html:116
-#: core/templates/navigation.html:224
+#: core/templates/navigation.html:67 core/templates/navigation.html:107
+#: core/templates/navigation.html:215
msgid "Administration"
msgstr "Администрация"
-#: core/templates/navigation.html:76
-#: exercises/templates/exercise/pending.html:6
-msgid "Exercises pending review"
-msgstr "Упражненията "
+#: core/templates/navigation.html:68
+#, fuzzy
+#| msgid "Exercise day"
+msgid "Exercise edit history"
+msgstr "Ден за упражнение"
-#: core/templates/navigation.html:77 exercises/models/base.py:72
-#: exercises/templates/exercise/view.html:80
+#: core/templates/navigation.html:69 exercises/models/base.py:84
msgid "Equipment"
msgstr ""
-#: core/templates/navigation.html:78 exercises/templates/exercise/view.html:258
+#: core/templates/navigation.html:70
msgid "Muscles"
msgstr "Мускули"
-#: core/templates/navigation.html:79
+#: core/templates/navigation.html:71
#: exercises/templates/categories/admin-overview.html:4
msgid "Categories"
msgstr ""
-#: core/templates/navigation.html:93 software/templates/features.html:87
+#: core/templates/navigation.html:84 software/templates/features.html:87
msgid "Nutrition"
msgstr "Хранене"
-#: core/templates/navigation.html:99 core/templates/user/overview.html:144
+#: core/templates/navigation.html:90 core/templates/user/overview.html:144
msgid "Nutrition plans"
msgstr "План за хранене"
-#: core/templates/navigation.html:105 nutrition/templates/bmi/form.html:50
+#: core/templates/navigation.html:96 nutrition/templates/bmi/form.html:50
msgid "BMI calculator"
msgstr ""
-#: core/templates/navigation.html:111 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:102 nutrition/templates/rate/form.html:17
msgid "Daily calories calculator"
msgstr ""
-#: core/templates/navigation.html:113
+#: core/templates/navigation.html:104
#: nutrition/templates/ingredient/overview.html:29
msgid "Ingredient overview"
msgstr "Преглед на съставките"
-#: core/templates/navigation.html:117 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:108 nutrition/templates/units/list.html:6
msgid "Ingredient weight units"
msgstr "Единици за тежест на съставки"
-#: core/templates/navigation.html:118
+#: core/templates/navigation.html:109
#: nutrition/templates/ingredient/pending.html:6
msgid "Ingredients pending review"
msgstr "Съставки без преглед"
-#: core/templates/navigation.html:132
+#: core/templates/navigation.html:123
msgid "Body weight"
msgstr ""
-#: core/templates/navigation.html:134 core/templates/user/overview.html:114
+#: core/templates/navigation.html:125 core/templates/user/overview.html:114
#: weight/templates/overview.html:7
msgid "Weight overview"
msgstr "Преглед на тегло"
-#: core/templates/navigation.html:147
+#: core/templates/navigation.html:138
msgid "About this software"
msgstr "Относно този код"
-#: core/templates/navigation.html:149 core/templates/template_features.html:82
+#: core/templates/navigation.html:140 core/templates/template_features.html:82
#: software/templates/about_us.html:5
msgid "About us"
msgstr "За нас"
-#: core/templates/navigation.html:151 software/templates/features.html:209
+#: core/templates/navigation.html:142 software/templates/features.html:209
msgid "REST API"
msgstr ""
-#: core/templates/navigation.html:155 utils/models.py:40
+#: core/templates/navigation.html:146 utils/models.py:41
msgid "License"
msgstr "Лиценз"
-#: core/templates/navigation.html:161
+#: core/templates/navigation.html:152
msgid "Developer documentation"
msgstr ""
-#: core/templates/navigation.html:167
+#: core/templates/navigation.html:158
msgid "Get the code"
msgstr "Грабни кода"
-#: core/templates/navigation.html:173 core/templates/template.html:204
+#: core/templates/navigation.html:164 core/templates/template.html:203
#: core/templates/template_features.html:99
msgid "Translate"
msgstr "Преведи"
-#: core/templates/navigation.html:194 core/templates/user/login.html:28
+#: core/templates/navigation.html:185 core/templates/user/login.html:28
msgid "Reset password"
msgstr "Промени парола"
-#: core/templates/navigation.html:207
+#: core/templates/navigation.html:198
msgid "My preferences"
msgstr "Моите преференции"
-#: core/templates/navigation.html:214
+#: core/templates/navigation.html:205
msgid "Logout"
msgstr "Изход"
-#: core/templates/navigation.html:229
+#: core/templates/navigation.html:220
msgid "Licenses"
msgstr ""
-#: core/templates/navigation.html:232
+#: core/templates/navigation.html:223
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr ""
-#: core/templates/navigation.html:235 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:226 core/templates/weight_unit/list.html:4
#: nutrition/templates/ingredient/view.html:174
msgid "Weight units"
msgstr "Единици за тегло"
-#: core/templates/navigation.html:238 core/templates/user/list.html:4
+#: core/templates/navigation.html:229 core/templates/user/list.html:4
msgid "User list"
msgstr ""
-#: core/templates/navigation.html:239
+#: core/templates/navigation.html:230
msgid "Gyms"
msgstr ""
@@ -1056,33 +1049,30 @@ msgstr "следващо"
msgid "Add weight log"
msgstr ""
-#: core/templates/tags/render_day.html:114
-#: exercises/templates/equipment/overview.html:59
-#: exercises/templates/exercise/overview.html:63
-#: exercises/templates/muscles/overview.html:65
+#: core/templates/tags/render_day.html:116
msgid "Placeholder image for exercise"
msgstr ""
-#: core/templates/tags/render_day.html:131
+#: core/templates/tags/render_day.html:133
msgid "This exercise has no repetitions."
msgstr "Това упражнение няма повторения."
-#: core/templates/tags/render_day.html:134
+#: core/templates/tags/render_day.html:136
msgid "Edit them now."
msgstr "Поправи сега."
-#: core/templates/tags/render_day.html:159
+#: core/templates/tags/render_day.html:162
msgid "Add exercises to this workout day"
msgstr "Добави упражнения за този тренировъчен ден"
#: core/templates/tags/render_weight_log.html:17 manager/helpers.py:89
-#: manager/models/setting.py:57 manager/templates/set/formset.html:10
+#: manager/models/setting.py:69 manager/templates/set/formset.html:9
msgid "Reps"
msgstr "Повторения"
-#: 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
+#: core/templates/tags/render_weight_log.html:30 manager/forms.py:189
+#: manager/models/log.py:103 manager/models/setting.py:99
+#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
msgid "RiR"
msgstr ""
@@ -1107,7 +1097,7 @@ msgstr ""
msgid "Features"
msgstr "Особености"
-#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:37
+#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:53
msgid "API key"
msgstr ""
@@ -1147,11 +1137,12 @@ msgid "Documentation"
msgstr ""
#: core/templates/user/delete_account.html:4
-#: core/templates/user/preferences.html:42
+#: core/templates/user/preferences.html:58
msgid "Delete account"
msgstr ""
#: core/templates/user/delete_account.html:17
+#: exercises/templates/history/overview.html:93
msgid "Are you sure?"
msgstr ""
@@ -1196,11 +1187,12 @@ 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/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
+#: exercises/models/base.py:99 exercises/models/base.py:104
+#: exercises/models/exercise.py:69 exercises/models/exercise.py:76
+#: gallery/models/image.py:47 manager/helpers.py:88 manager/models/log.py:100
+#: 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/views.py:150
@@ -1208,11 +1200,11 @@ msgid "Date"
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: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
+#: exercises/models/exercise.py:57 exercises/views/exercises.py:123
+#: 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 "Описание"
@@ -1220,12 +1212,12 @@ msgstr "Описание"
msgid "Number of logs (days)"
msgstr ""
-#: core/templates/user/overview.html:37 core/views/user.py:576
+#: core/templates/user/overview.html:37 core/views/user.py:592
#: 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:267
+#: core/templates/user/overview.html:68 manager/forms.py:278
#: manager/templates/workout/view.html:151
msgid "Log"
msgstr ""
@@ -1243,6 +1235,7 @@ msgid "Notes"
msgstr "Бележки"
#: core/templates/user/overview.html:79
+#: exercises/templates/history/overview.html:30
#: manager/templates/calendar/partial_overview_table.html:42
#: nutrition/templates/log/detail.html:154
msgid "Time"
@@ -1290,10 +1283,12 @@ msgid "Do you really want to change this user&#39;s password?"
msgstr ""
#: core/templates/user/overview.html:233
+#: exercises/templates/history/overview.html:106
msgid "No"
msgstr ""
#: core/templates/user/overview.html:234
+#: exercises/templates/history/overview.html:99
msgid "Yes"
msgstr ""
@@ -1348,10 +1343,15 @@ msgid "Documents"
msgstr ""
#: core/templates/user/overview.html:413 gym/templates/document/list.html:32
-#: manager/forms.py:279 manager/templates/workout/view.html:176
+#: manager/forms.py:290 manager/templates/workout/view.html:176
msgid "Download"
msgstr ""
+#: core/templates/user/overview.html:451 gym/views/admin_config.py:44
+#: gym/views/admin_config.py:58 gym/views/user_config.py:46
+msgid "Configuration"
+msgstr ""
+
#: core/templates/user/overview.html:454 gym/models/user_config.py:92
msgid "Include in inactive overview"
msgstr ""
@@ -1369,7 +1369,23 @@ msgstr ""
msgid "Preferences"
msgstr "Преференции"
-#: core/templates/user/preferences.html:33 core/views/user.py:587
+#: core/templates/user/preferences.html:19
+msgid "Verified email"
+msgstr ""
+
+#: core/templates/user/preferences.html:24
+msgid "Unverified email"
+msgstr ""
+
+#: core/templates/user/preferences.html:26
+msgid "Send verification email"
+msgstr ""
+
+#: core/templates/user/preferences.html:30
+msgid "You need to verify your email to contribute exercises"
+msgstr ""
+
+#: core/templates/user/preferences.html:49 core/views/user.py:603
msgid "Change password"
msgstr "Смени парола"
@@ -1399,39 +1415,37 @@ msgid "oz"
msgstr ""
#: 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
+#: exercises/views/equipment.py:104 exercises/views/exercises.py:185
+#: exercises/views/muscles.py:99 manager/views/schedule.py:311
+#: manager/views/schedule_step.py:129 manager/views/workout.py:269
+#: manager/views/workout_session.py:141 nutrition/views/ingredient.py:138
#: 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:431
-#: exercises/views/muscles.py:125 gallery/views/images.py:121
+#: exercises/views/categories.py:127 exercises/views/exercises.py:193
+#: exercises/views/muscles.py:106 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
+#: manager/views/workout.py:273 manager/views/workout_session.py:156
+#: nutrition/views/ingredient.py:145 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:456
+#: core/views/repetition_units.py:85 core/views/user.py:472
#: 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: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
+#: exercises/views/equipment.py:81 exercises/views/muscles.py:86
+#: 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:170
+#: gym/views/gym.py:459 manager/views/day.py:100 manager/views/schedule.py:335
+#: manager/views/workout.py:287 nutrition/views/ingredient.py:164
+#: nutrition/views/plan.py:144 nutrition/views/unit.py:144
#, python-brace-format
msgid "Edit {0}"
msgstr ""
@@ -1463,64 +1477,65 @@ msgstr ""
msgid "Your feedback was successfully sent. Thank you!"
msgstr "Вашият съвет/коментар бе изпратен успешно. Благодарим ви!"
-#: core/views/user.py:156
+#: core/views/user.py:157
#, python-brace-format
msgid "Account \"{0}\" was successfully deleted"
msgstr ""
-#: core/views/user.py:287
+#: core/views/user.py:294
msgid "You were successfully registered"
msgstr "Вие се регистрирахте успешно"
-#: core/views/user.py:339
+#: core/views/user.py:355
msgid "Settings successfully updated"
msgstr "Настройките бяха успешно обновени"
-#: core/views/user.py:376
+#: core/views/user.py:392
msgid "The user was successfully deactivated"
msgstr ""
-#: core/views/user.py:411
+#: core/views/user.py:427
msgid "The user was successfully activated"
msgstr ""
-#: core/views/user.py:426
+#: core/views/user.py:442
msgid "Edit user"
msgstr ""
-#: core/views/user.py:573 gym/templates/gym/member_list.html:26
+#: core/views/user.py:589 gym/templates/gym/member_list.html:26
#: gym/views/gym.py:156
msgid "ID"
msgstr ""
-#: core/views/user.py:574 gym/forms.py:94 gym/templates/contract/view.html:55
+#: core/views/user.py:590 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:577 gym/templates/gym/new_user.html:34
+#: core/views/user.py:593 gym/templates/gym/new_user.html:34
#: gym/views/export.py:60 gym/views/gym.py:218
msgid "Gym"
msgstr ""
-#: exercises/models/base.py:51 exercises/templates/exercise/view.html:76
-#: nutrition/models/ingredient.py:204
+#: core/views/user.py:652
+#, python-format
+msgid "A verification email was sent to %(email)s"
+msgstr ""
+
+#: exercises/models/base.py:63 nutrition/models/ingredient.py:204
msgid "Category"
msgstr "Категория"
-#: exercises/models/base.py:58
+#: exercises/models/base.py:70
msgid "Primary muscles"
msgstr "Основни мускули"
-#: exercises/models/base.py:64 exercises/templates/equipment/overview.html:71
-#: exercises/templates/exercise/overview.html:76
-#: exercises/templates/exercise/view.html:268
-#: exercises/templates/muscles/overview.html:77
+#: exercises/models/base.py:76
msgid "Secondary muscles"
msgstr "Второстепенни мускули"
-#: exercises/models/base.py:79
+#: exercises/models/base.py:91
msgid "Variations"
msgstr ""
@@ -1528,94 +1543,72 @@ msgstr ""
msgid "Exercise Categories"
msgstr "Категории на упражнения"
-#: exercises/models/comment.py:34 exercises/models/exercise_alias.py:32
-#: exercises/models/image.py:75 exercises/models/video.py:82
-#: manager/forms.py:165 manager/helpers.py:89 manager/models/log.py:51
+#: exercises/models/comment.py:37 exercises/models/exercise_alias.py:35
+#: exercises/models/image.py:71 exercises/models/video.py:95
+#: manager/forms.py:176 manager/helpers.py:89 manager/models/log.py:52
msgid "Exercise"
msgstr "Упражнение"
-#: exercises/models/comment.py:41
+#: exercises/models/comment.py:43
msgid "A comment about how to correctly do this exercise."
msgstr "Коментар как да се направи упражнението правилно."
-#: exercises/models/exercise.py:86 nutrition/models/ingredient.py:80
+#: exercises/models/exercise.py:81 nutrition/models/ingredient.py:80
#: nutrition/models/plan.py:61 nutrition/models/weight_unit.py:32
msgid "Language"
msgstr "Език"
-#: exercises/models/exercise.py:237 exercises/views/exercises.py:461
-msgid "Exercise was successfully added to the general database"
-msgstr "Упражнението беше успешно прибавено към датабазата"
-
-#: exercises/models/exercise.py:265
-msgid "New user submitted exercise"
-msgstr "Ново упражнение добавено от потребител"
-
-#: exercises/models/exercise.py:267
-#, python-brace-format
-msgid "The user {0} submitted a new exercise \"{1}\"."
-msgstr "Потребителя {0} предостави ново упражнение \"{1}\"."
-
-#: exercises/models/exercise_alias.py:35
+#: exercises/models/exercise_alias.py:38
#, fuzzy
#| msgid "Add new exercise"
msgid "Alias for an exercise"
msgstr "Добави ново упражнение"
-#: exercises/models/image.py:59
+#: exercises/models/image.py:55
msgid "Line"
msgstr ""
-#: exercises/models/image.py:60
+#: exercises/models/image.py:56
msgid "3D"
msgstr ""
-#: exercises/models/image.py:61
+#: exercises/models/image.py:57
msgid "Low-poly"
msgstr ""
-#: exercises/models/image.py:62
+#: exercises/models/image.py:58
msgid "Photo"
msgstr ""
-#: exercises/models/image.py:63
+#: exercises/models/image.py:59
#, fuzzy
#| msgid "Others"
msgid "Other"
msgstr "Други"
-#: exercises/models/image.py:81 gallery/models/image.py:56
+#: exercises/models/image.py:77 gallery/models/image.py:56
msgid "Image"
msgstr ""
-#: exercises/models/image.py:82 gallery/models/image.py:57
+#: exercises/models/image.py:78 gallery/models/image.py:57
msgid "Only PNG and JPEG formats are supported"
msgstr ""
-#: exercises/models/image.py:88
+#: exercises/models/image.py:84
msgid "Main picture"
msgstr ""
-#: exercises/models/image.py:91
+#: exercises/models/image.py:87
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:100
+#: exercises/models/image.py:96
msgid "The art style of your image"
msgstr ""
-#: exercises/models/image.py:185
-msgid "New user submitted image"
-msgstr ""
-
-#: exercises/models/image.py:186
-#, python-brace-format
-msgid "The user {0} submitted a new image \"{1}\" for exercise {2}."
-msgstr ""
-
#: exercises/models/muscle.py:37
msgid "In latin, e.g. \"Pectoralis major\""
msgstr ""
@@ -1630,182 +1623,77 @@ msgstr "име на упражнение"
msgid "A more basic name for the muscle"
msgstr ""
-#: exercises/models/video.py:41
-msgid "Maximum file size is 100MB."
+#: exercises/models/video.py:50
+#, python-format
+msgid "Maximum file size is %(size)sMB."
msgstr ""
-#: exercises/models/video.py:44 exercises/models/video.py:48
+#: exercises/models/video.py:57 exercises/models/video.py:65
msgid "File type is not supported"
msgstr ""
-#: exercises/models/video.py:57
+#: exercises/models/video.py:70
msgid "File is not a valid video"
msgstr ""
-#: exercises/models/video.py:88
+#: exercises/models/video.py:101
msgid "Main video"
msgstr ""
-#: exercises/models/video.py:94
+#: exercises/models/video.py:107
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 ""
-
-#: exercises/templates/equipment/admin-overview.html:37
-#: exercises/views/equipment.py:94
-msgid "Add new equipment"
-msgstr ""
-
-#: exercises/templates/equipment/overview.html:11
-msgid "Equipment overview"
-msgstr ""
-
-#: exercises/templates/equipment/overview.html:69
-#: exercises/templates/exercise/overview.html:74
-#: exercises/templates/exercise/view.html:264
-#: exercises/templates/muscles/overview.html:75
-msgid "Main muscles"
-msgstr "Основни мускули"
-
-#: exercises/templates/equipment/overview.html:79
-msgid ""
-"No exercises for this equipment. Add or edit an exercise and set the "
-"equipment."
-msgstr ""
-
-#: exercises/templates/equipment/overview.html:96
-#: exercises/templates/exercise/overview.html:99
-#: nutrition/templates/ingredient/overview.html:57
-msgid "Search"
-msgstr "Търси"
-
-#: exercises/templates/equipment/overview.html:101
-#: exercises/templates/exercise/overview.html:104
-msgid "exercise name"
-msgstr "име на упражнение"
-
-#: exercises/templates/equipment/overview.html:115
-#: exercises/templates/exercise/overview.html:118
-#: exercises/templates/muscles/overview.html:118
-#: nutrition/templates/ingredient/overview.html:85
-msgid "Only registered users can do this"
-msgstr "Само за регистрирани потребители"
-
-#: exercises/templates/exercise/email_new.tpl:1
-#, python-format
-msgid ""
-"Your exercise '%(exercise)s' was successfully added to the general\n"
-"database."
-msgstr ""
-
-#: exercises/templates/exercise/email_new.tpl:4
-msgid ""
-"It is now available on the exercise and muscle overview and can be\n"
-"added to workouts. You can access it on this address:"
-msgstr ""
-
-#: exercises/templates/exercise/email_new.tpl:8
-#: nutrition/templates/ingredient/email_new.tpl:8
-msgid "Thank you for contributing and making this site better!"
-msgstr ""
-
-#: exercises/templates/exercise/email_new.tpl:9
-#: manager/templates/workout/email_reminder.tpl:15
-#: manager/templates/workout/email_weight_reminder.tpl:12
-#: nutrition/templates/ingredient/email_new.tpl:9
-#, python-format
-msgid "The %(site)s team"
-msgstr ""
-
-#: exercises/templates/exercise/form.html:4
-msgid "Submitting an exercise"
-msgstr "Добавяне на упражнение"
-
-#: exercises/templates/exercise/form.html:5
-msgid ""
-"Thank you for submitting an exercise. This is much\n"
-"appreciated!"
-msgstr ""
-"Благодаря ти че добави упражнение. Това е много\n"
-"ценно за нас!"
-
-#: exercises/templates/exercise/form.html:8
-msgid ""
-"After you submit the form, the administrators will be notified.\n"
-"Once it is reviewed, it will be added to the database. Till this happens,\n"
-"it will not be visible in the overview or the search. In case you added your "
-"email\n"
-"when you registered, you will get notified when the process is completed "
-"successfully."
-msgstr ""
-"След като изпратиш формуляра, администраторите ще бъдат уведомени.\n"
-"Веднъж като е прегледан, ще бъде добавен в датабазата. Докато стане дова,\n"
-"няма да бъде видимо в прегледа или в търсачката. В случай че си добавил "
-"електронната си поща\n"
-"когато си се регистрирал, ще бъдеш уведомен когато процеса е завършил "
-"успешно."
-
-#: exercises/templates/exercise/form_correct.html:4
-msgid "Correcting an exercise"
+#: exercises/models/video.py:114
+msgid "Size"
msgstr ""
-#: exercises/templates/exercise/form_correct.html:5
-msgid ""
-"Thank you for correcting and improving this exercise.\n"
-"This is much appreciated!"
+#: exercises/models/video.py:121 manager/models/schedule_step.py:56
+msgid "Duration"
+msgstr "Времетраене"
+
+#: exercises/models/video.py:130
+msgid "Width"
msgstr ""
-#: exercises/templates/exercise/form_correct.html:8
-msgid ""
-"After you submit the form, the administrators will be notified.\n"
-"Once the changes are reviewed the exercise will be updated."
+#: exercises/models/video.py:137
+#, fuzzy
+#| msgid "Weight"
+msgid "Height"
+msgstr "Тегло"
+
+#: exercises/models/video.py:144
+#, fuzzy
+#| msgid "Code"
+msgid "Codec"
+msgstr "Код"
+
+#: exercises/models/video.py:152
+msgid "Codec, long name"
msgstr ""
-#: exercises/templates/exercise/overview.html:88
-msgid "No categories."
-msgstr "Няма категории."
+#: exercises/templates/equipment/admin-overview.html:4
+msgid "Equipment list"
+msgstr ""
-#: exercises/templates/exercise/overview.html:88
-msgid "Use link to create one"
-msgstr "Използвай връзката за да създадеш"
+#: exercises/templates/equipment/admin-overview.html:37
+#: exercises/views/equipment.py:92
+msgid "Add new equipment"
+msgstr ""
-#: exercises/templates/exercise/pending.html:14
-#: nutrition/templates/ingredient/pending.html:14
-msgid "Submission date"
-msgstr "Дата на подаване"
+#: exercises/templates/history/overview.html:11
+#, fuzzy
+#| msgid "Exercise day"
+msgid "Exercise admin history"
+msgstr "Ден за упражнение"
-#: exercises/templates/exercise/pending.html:16 gallery/models/image.py:51
+#: exercises/templates/history/overview.html:27
+#, fuzzy
+#| msgid "Actions"
+msgid "Action"
+msgstr "Действия"
+
+#: exercises/templates/history/overview.html:28 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/log.py:45
@@ -1816,99 +1704,41 @@ msgstr "Дата на подаване"
msgid "User"
msgstr "Потребител"
-#: exercises/templates/exercise/view.html:48
-msgid "Exercise is pending review"
-msgstr "Упражнението подлежи на проверка"
-
-#: exercises/templates/exercise/view.html:51
-msgid ""
-"This user submitted exercise is pending a decision to be\n"
-" included in the database."
-msgstr ""
-
-#: exercises/templates/exercise/view.html:53
-msgid "Till then, it will not be shown in the overview or the search."
-msgstr "Дотогава то няма да бъде показано в прегледа или в търсачката."
-
-#: exercises/templates/exercise/view.html:54
-#: nutrition/templates/ingredient/view.html:31
-msgid "Please select one of the options below."
-msgstr "Моля изберете една опция от изброените по-долу."
-
-#: exercises/templates/exercise/view.html:60
-#: 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:204
-#: nutrition/templates/ingredient/view.html:42
-msgid "Decline"
-msgstr "Отказвам"
-
-#: exercises/templates/exercise/view.html:96
-msgid "Images"
+#: exercises/templates/history/overview.html:29
+msgid "Object"
msgstr ""
-#: exercises/templates/exercise/view.html:137 exercises/views/images.py:93
-msgid "Add new image"
-msgstr ""
-
-#: exercises/templates/exercise/view.html:148
-msgid "Videos"
-msgstr ""
-
-#: exercises/templates/exercise/view.html:187 exercises/views/videos.py:94
+#: exercises/templates/history/overview.html:31
#, fuzzy
-#| msgid "Add new meal"
-msgid "Add new video"
-msgstr "Добави ново ядене"
+#| msgid "Change password"
+msgid "Changes"
+msgstr "Смени парола"
-#: exercises/templates/exercise/view.html:197
-msgid "Images pending review"
+#: exercises/templates/history/overview.html:32
+msgid "Revert"
msgstr ""
-#: exercises/templates/exercise/view.html:218
-msgid "Comments for this exercise"
-msgstr "Коментари за упражнението"
-
-#: exercises/templates/exercise/view.html:246
-msgid "Add new comment"
-msgstr "Добави нов коментар"
-
-#: exercises/templates/exercise/view.html:260
-msgid "The diagram shows the most used muscles on this exercise"
-msgstr "Диаграмата показва най-натоварваните мускули при това упражнение."
-
-#: exercises/templates/exercise/view.html:301
-#: manager/templates/workout/log.html:10 manager/templates/workout/log.html:11
-msgid "Weight log"
-msgstr "Запис на тегло"
+#: exercises/templates/history/overview.html:64
+msgid "View Object"
+msgstr ""
-#: exercises/templates/exercise/view.html:306
-msgid "Exercise Variations"
+#: exercises/templates/history/overview.html:75
+msgid "View changes"
msgstr ""
-#: exercises/templates/exercise/view.html:327
-msgid "Submit a correction"
+#: exercises/templates/history/overview.html:86
+msgid "Revert changes"
msgstr ""
#: exercises/templates/muscles/admin-overview.html:4
-#: exercises/templates/muscles/overview.html:7
msgid "Muscle overview"
msgstr "Преглед на мускулите"
#: exercises/templates/muscles/admin-overview.html:36
-#: exercises/views/muscles.py:86
+#: exercises/views/muscles.py:67
msgid "Add muscle"
msgstr "Добави мускул"
-#: exercises/templates/muscles/overview.html:85
-msgid ""
-"No exercises for this muscle. Add or edit an exercise and set the muscle."
-msgstr ""
-
#: exercises/views/categories.py:71
msgid "Add category"
msgstr "Добави категория"
@@ -1921,50 +1751,19 @@ msgstr "Това също ще изтрие всички упражнения в
msgid "Add exercise comment"
msgstr "Добави коментар към упражнение"
-#: exercises/views/equipment.py:107 exercises/views/equipment.py:118
+#: exercises/views/equipment.py:105 exercises/views/equipment.py:116
msgid "Delete equipment?"
msgstr ""
-#: exercises/views/exercises.py:229
+#: exercises/views/exercises.py:161
#, python-format
-msgid ""
-"%(name_original)s is too similar to existing exercise \"%(exercise_name)s\""
-msgstr ""
-
-#: exercises/views/exercises.py:247
-msgid "Add exercise"
-msgstr "Добави упражнение"
-
-#: exercises/views/exercises.py:367
-msgid "Thank you. Once the changes are reviewed the exercise will be updated."
-msgstr ""
-
-#: exercises/views/exercises.py:380
-#, python-brace-format
-msgid "Correct {0}"
+msgid "%(name)s is too similar to existing exercise \"%(exercise_name)s\""
msgstr ""
-#: exercises/views/exercises.py:422
+#: exercises/views/exercises.py:184
msgid "This will delete the exercise from all workouts."
msgstr "Това ще изтрие упражнението от всички тренировки."
-#: exercises/views/exercises.py:474
-msgid "Exercise was successfully marked as rejected"
-msgstr "Упражнението бе успешно маркирано като отхвърлено"
-
-#: exercises/views/images.py:68
-msgid "Edit exercise image"
-msgstr ""
-
-#: exercises/views/images.py:143
-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"
@@ -2033,7 +1832,7 @@ msgid "Contract type"
msgstr ""
#: gym/models/contract.py:208 gym/templates/contract/view.html:59
-#: manager/templates/log/add.html:52 nutrition/forms.py:59
+#: manager/templates/log/add.html:52 nutrition/forms.py:60
#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:102
#: nutrition/models/meal_item.py:72
msgid "Amount"
@@ -2134,6 +1933,10 @@ msgstr ""
msgid "User notes"
msgstr ""
+#: gym/templates/contract/list.html:36
+msgid "Show"
+msgstr ""
+
#: gym/templates/contract/view.html:4
msgid "Contract"
msgstr ""
@@ -2212,10 +2015,6 @@ msgstr ""
msgid "Add member"
msgstr ""
-#: gym/templates/gym/new_user.html:38
-msgid "Date of Birth"
-msgstr ""
-
#: gym/templates/gym/new_user.html:48 manager/templates/calendar/month.html:144
#: manager/templates/log/add.html:75 nutrition/templates/rate/form.html:120
msgid "Info"
@@ -2272,125 +2071,125 @@ msgstr ""
msgid "Edit gym"
msgstr ""
-#: i18n.tpl:2 i18n.tpl:28
-msgid "Abs"
+#: i18n.tpl:2
+msgid "Until Failure"
msgstr ""
-#: i18n.tpl:3
-msgid "Arms"
-msgstr ""
+#: i18n.tpl:3 manager/forms.py:180 manager/models/log.py:73
+#: manager/templates/set/add.html:53
+msgid "Repetitions"
+msgstr "Повторения"
#: i18n.tpl:4
-msgid "Back"
-msgstr "Назад"
+msgid "Abs"
+msgstr ""
-#: i18n.tpl:5 i18n.tpl:23
-msgid "Calves"
+#: i18n.tpl:5
+msgid "Arms"
msgstr ""
-#: i18n.tpl:6 i18n.tpl:26
-msgid "Chest"
+#: i18n.tpl:6
+msgid "Legs"
msgstr ""
#: i18n.tpl:7
-msgid "Legs"
+msgid "Dumbbell"
msgstr ""
-#: i18n.tpl:8 i18n.tpl:19
-msgid "Shoulders"
+#: i18n.tpl:8
+msgid "Biceps"
msgstr ""
#: i18n.tpl:9
-msgid "Barbell"
+msgid "SZ-Bar"
msgstr ""
#: i18n.tpl:10
-msgid "Bench"
+msgid "Kettlebell"
msgstr ""
#: i18n.tpl:11
-msgid "Dumbbell"
+msgid "Swiss Ball"
msgstr ""
#: i18n.tpl:12
-msgid "Gym mat"
+msgid "none (bodyweight exercise)"
msgstr ""
#: i18n.tpl:13
-msgid "Incline bench"
+msgid "Calves"
msgstr ""
#: i18n.tpl:14
-msgid "Kettlebell"
-msgstr ""
+msgid "Back"
+msgstr "Назад"
#: i18n.tpl:15
-msgid "Pull-up bar"
+msgid "Lower back"
msgstr ""
#: i18n.tpl:16
-msgid "SZ-Bar"
+msgid "Lats"
msgstr ""
#: i18n.tpl:17
-msgid "Swiss Ball"
+msgid "Hamstrings"
msgstr ""
#: i18n.tpl:18
-msgid "none (bodyweight exercise)"
+msgid "Bench"
+msgstr ""
+
+#: i18n.tpl:19
+msgid "Glutes"
msgstr ""
#: i18n.tpl:20
-msgid "Biceps"
+msgid "Kilometers"
msgstr ""
#: i18n.tpl:21
-msgid "Hamstrings"
+msgid "Shoulders"
msgstr ""
#: i18n.tpl:22
-msgid "Lower back"
+msgid "Seconds"
msgstr ""
-#: i18n.tpl:24
-msgid "Glutes"
+#: i18n.tpl:23
+msgid "Miles"
msgstr ""
-#: i18n.tpl:25
-msgid "Lats"
+#: i18n.tpl:24
+msgid "Incline bench"
msgstr ""
-#: i18n.tpl:27
+#: i18n.tpl:25
msgid "Quads"
msgstr ""
-#: i18n.tpl:29
-msgid "Triceps"
+#: i18n.tpl:26
+msgid "Minutes"
msgstr ""
-#: i18n.tpl:30
-msgid "Kilometers"
+#: i18n.tpl:27
+msgid "Chest"
msgstr ""
-#: i18n.tpl:31
-msgid "Miles"
+#: i18n.tpl:28
+msgid "Gym mat"
msgstr ""
-#: i18n.tpl:32
-msgid "Minutes"
+#: i18n.tpl:29
+msgid "Pull-up bar"
msgstr ""
-#: i18n.tpl:33 manager/forms.py:169 manager/models/log.py:71
-#: manager/templates/set/add.html:53
-msgid "Repetitions"
-msgstr "Повторения"
-
-#: i18n.tpl:34
-msgid "Seconds"
+#: i18n.tpl:30
+msgid "Barbell"
msgstr ""
-#: i18n.tpl:35
-msgid "Until Failure"
+#: i18n.tpl:31
+msgid "Triceps"
msgstr ""
#: mailer/forms.py:34 mailer/templates/mailer/gym/preview.html:32
@@ -2444,13 +2243,13 @@ msgstr ""
msgid "Correction"
msgstr ""
-#: manager/forms.py:89 manager/models/workout.py:59
+#: manager/forms.py:92 manager/models/workout.py:59
#, fuzzy
#| msgid "Make a copy of this workout"
msgid "The name of the workout"
msgstr "Направи копие на тренировката"
-#: manager/forms.py:93 manager/models/workout.py:66
+#: manager/forms.py:96 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'."
@@ -2458,7 +2257,7 @@ msgstr ""
"Кратко описание или цел на тренировката. Например \"Работа с Гръб\" или "
"\"Седмица 1 по схема XY\"."
-#: manager/forms.py:126
+#: manager/forms.py:137
msgid ""
"You can search for more than one exercise, they will be grouped together for "
"a superset."
@@ -2466,28 +2265,28 @@ msgstr ""
"Можеш да потърсиш повече от едно упражнение, като те ще бъдат групирани в "
"суперсет."
-#: 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
+#: manager/forms.py:166 manager/forms.py:171 manager/models/log.py:64
+#: manager/models/log.py:92 manager/models/setting.py:59
+#: manager/models/setting.py:90 manager/templates/log/add.html:53
+#: manager/templates/log/add.html:55 manager/templates/set/formset.html:10
+#: manager/templates/set/formset.html:12 measurements/models/category.py:58
+#: nutrition/forms.py:64
msgid "Unit"
msgstr ""
-#: manager/forms.py:266
+#: manager/forms.py:277
msgid "Type"
msgstr ""
-#: manager/forms.py:267 manager/templates/workout/view.html:157
+#: manager/forms.py:278 manager/templates/workout/view.html:157
msgid "Table"
msgstr ""
-#: manager/forms.py:269 manager/templates/workout/view.html:163
+#: manager/forms.py:280 manager/templates/workout/view.html:163
msgid "with images"
msgstr ""
-#: manager/forms.py:270 manager/templates/workout/view.html:169
+#: manager/forms.py:281 manager/templates/workout/view.html:169
msgid "with comments"
msgstr ""
@@ -2545,7 +2344,7 @@ msgid "The duration in weeks"
msgstr "Времетраене в седмици"
#: manager/models/schedule_step.py:63 manager/models/set.py:52
-#: manager/models/setting.py:98 nutrition/models/meal.py:54
+#: manager/models/setting.py:110 nutrition/models/meal.py:54
#: nutrition/models/meal_item.py:65
msgid "Order"
msgstr "Ред"
@@ -2596,7 +2395,7 @@ msgstr "Ден за упражнение"
msgid "Number of sets"
msgstr "Номер на серии"
-#: manager/models/setting.py:43
+#: manager/models/setting.py:48
msgid "Sets"
msgstr "Серии"
@@ -2862,6 +2661,13 @@ msgid ""
"option in your settings."
msgstr ""
+#: manager/templates/workout/email_reminder.tpl:15
+#: manager/templates/workout/email_weight_reminder.tpl:12
+#: nutrition/templates/ingredient/email_new.tpl:9
+#, python-format
+msgid "The %(site)s team"
+msgstr ""
+
#: manager/templates/workout/email_weight_reminder.tpl:3
#, python-format
msgid ""
@@ -2874,6 +2680,10 @@ msgid ""
"You will regularly receive such reminders till you enter your current weight."
msgstr ""
+#: manager/templates/workout/log.html:10 manager/templates/workout/log.html:11
+msgid "Weight log"
+msgstr "Запис на тегло"
+
#: manager/templates/workout/log.html:29
msgid "Weight log for workout"
msgstr "Запис за тежести на тренировка"
@@ -2986,7 +2796,7 @@ msgstr ""
msgid "Edit workout"
msgstr "Редактирай тренировката"
-#: manager/templates/workout/view.html:225 manager/views/workout.py:300
+#: manager/templates/workout/view.html:225 manager/views/workout.py:301
msgid "Mark as template"
msgstr ""
@@ -2994,11 +2804,6 @@ msgstr ""
msgid "Add workout day"
msgstr "Добави тренировъчен ден"
-#: manager/views/log.py:92
-#, python-format
-msgid "Edit log entry for %s"
-msgstr "Промени дневника за %s"
-
#: manager/views/log.py:111
msgid "Delete workout log"
msgstr ""
@@ -3016,11 +2821,11 @@ msgstr "Направи график"
msgid "Your workouts"
msgstr "Твоите тренировки"
-#: manager/views/workout.py:227
+#: manager/views/workout.py:228
msgid "Copy workout"
msgstr "Копирай тренировка"
-#: manager/views/workout.py:230
+#: manager/views/workout.py:231
msgid "Copy"
msgstr ""
@@ -3042,29 +2847,29 @@ msgstr ""
msgid "Value"
msgstr ""
-#: nutrition/forms.py:122
+#: nutrition/forms.py:123
msgid "Calculate"
msgstr ""
-#: nutrition/forms.py:195 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:196 nutrition/templates/rate/form.html:76
msgid "Basic caloric intake"
msgstr ""
-#: nutrition/forms.py:196
+#: nutrition/forms.py:197
msgid "Your basic caloric intake as calculated for your data"
msgstr ""
-#: nutrition/forms.py:202
+#: nutrition/forms.py:203
msgid "Additional calories"
msgstr ""
-#: nutrition/forms.py:204
+#: nutrition/forms.py:205
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
msgstr ""
-#: nutrition/forms.py:232 nutrition/models/ingredient_weight_unit.py:39
+#: nutrition/forms.py:233 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"
@@ -3127,7 +2932,7 @@ msgid ""
"{energy_approx}%)"
msgstr ""
-#: nutrition/models/ingredient.py:357 nutrition/views/ingredient.py:225
+#: nutrition/models/ingredient.py:357 nutrition/views/ingredient.py:219
msgid "Ingredient was successfully added to the general database"
msgstr "Съставката е успешно добавен към общата база данни."
@@ -3156,6 +2961,12 @@ msgstr "Единица количество, напр. \"1 Чаша\" или \"1
msgid "Meal"
msgstr "Ядене"
+#: nutrition/models/log.py:65
+#, fuzzy
+#| msgid "Time (approx)"
+msgid "Date and Time (Approx.)"
+msgstr "Време (приблизително)"
+
#: nutrition/models/meal.py:61
msgid "Time (approx)"
msgstr "Време (приблизително)"
@@ -3249,6 +3060,10 @@ msgid ""
"added to nutrition plans. You can access it on this address:"
msgstr ""
+#: nutrition/templates/ingredient/email_new.tpl:8
+msgid "Thank you for contributing and making this site better!"
+msgstr ""
+
#: nutrition/templates/ingredient/form.html:4
msgid "Submitting an ingredient"
msgstr "Добавяне на съставка"
@@ -3281,6 +3096,10 @@ msgstr ""
msgid "No ingredients."
msgstr "Няма съставки."
+#: nutrition/templates/ingredient/overview.html:57
+msgid "Search"
+msgstr "Търси"
+
#: nutrition/templates/ingredient/overview.html:66
msgid "ingredient name"
msgstr "Име на съставка"
@@ -3290,6 +3109,14 @@ msgstr "Име на съставка"
msgid "Add ingredient"
msgstr "Добави съставка"
+#: nutrition/templates/ingredient/overview.html:85
+msgid "Only registered users can do this"
+msgstr "Само за регистрирани потребители"
+
+#: nutrition/templates/ingredient/pending.html:14
+msgid "Submission date"
+msgstr "Дата на подаване"
+
#: nutrition/templates/ingredient/view.html:27
msgid "Ingredient is pending review"
msgstr "Съставките подлежат на преглед"
@@ -3305,6 +3132,18 @@ msgstr ""
"бъде добавена в датабазата. Дотогава, тя няма да бъде показвана в прегледа\n"
"или търсачката."
+#: nutrition/templates/ingredient/view.html:31
+msgid "Please select one of the options below."
+msgstr "Моля изберете една опция от изброените по-долу."
+
+#: nutrition/templates/ingredient/view.html:38
+msgid "Accept"
+msgstr "Приемам"
+
+#: nutrition/templates/ingredient/view.html:42
+msgid "Decline"
+msgstr "Отказвам"
+
#: nutrition/templates/ingredient/view.html:71
#: nutrition/templates/log/detail.html:31
#: nutrition/templates/plan/view.html:229 nutrition/views/plan.py:376
@@ -3547,14 +3386,18 @@ msgid ""
"yourself for some weeks and change the total amount if needed."
msgstr ""
-#: nutrition/views/ingredient.py:181
+#: nutrition/views/ingredient.py:175
msgid "Add a new ingredient"
msgstr "Добави нова съставка"
-#: nutrition/views/ingredient.py:238
+#: nutrition/views/ingredient.py:232
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 "Добави ново ядене"
@@ -3775,29 +3618,29 @@ msgstr ""
msgid "100%% Free <br>and <br>Open Source"
msgstr ""
-#: utils/generic_views.py:261
+#: utils/generic_views.py:262
msgid "Yes, delete"
msgstr ""
-#: utils/models.py:47
+#: utils/models.py:48
msgid "Author"
msgstr ""
-#: utils/models.py:52
+#: utils/models.py:53
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:77
+#: utils/models.py:78
msgid "Pending"
msgstr "В очакване"
-#: utils/models.py:78
+#: utils/models.py:79
msgid "Accepted"
msgstr "Прието"
-#: utils/models.py:79
+#: utils/models.py:80
msgid "Declined"
msgstr "Отказано"
@@ -3938,6 +3781,91 @@ msgstr ""
msgid "Delete weight entry for the %s"
msgstr ""
+#~ msgid "Add new exercise"
+#~ msgstr "Добави ново упражнение"
+
+#~ msgid "Exercises pending review"
+#~ msgstr "Упражненията "
+
+#~ msgid "Exercise was successfully added to the general database"
+#~ msgstr "Упражнението беше успешно прибавено към датабазата"
+
+#~ msgid "New user submitted exercise"
+#~ msgstr "Ново упражнение добавено от потребител"
+
+#, python-brace-format
+#~ msgid "The user {0} submitted a new exercise \"{1}\"."
+#~ msgstr "Потребителя {0} предостави ново упражнение \"{1}\"."
+
+#~ msgid "Main muscles"
+#~ msgstr "Основни мускули"
+
+#~ msgid "exercise name"
+#~ msgstr "име на упражнение"
+
+#~ msgid "Submitting an exercise"
+#~ msgstr "Добавяне на упражнение"
+
+#~ msgid ""
+#~ "Thank you for submitting an exercise. This is much\n"
+#~ "appreciated!"
+#~ msgstr ""
+#~ "Благодаря ти че добави упражнение. Това е много\n"
+#~ "ценно за нас!"
+
+#~ msgid ""
+#~ "After you submit the form, the administrators will be notified.\n"
+#~ "Once it is reviewed, it will be added to the database. Till this "
+#~ "happens,\n"
+#~ "it will not be visible in the overview or the search. In case you added "
+#~ "your email\n"
+#~ "when you registered, you will get notified when the process is completed "
+#~ "successfully."
+#~ msgstr ""
+#~ "След като изпратиш формуляра, администраторите ще бъдат уведомени.\n"
+#~ "Веднъж като е прегледан, ще бъде добавен в датабазата. Докато стане "
+#~ "дова,\n"
+#~ "няма да бъде видимо в прегледа или в търсачката. В случай че си добавил "
+#~ "електронната си поща\n"
+#~ "когато си се регистрирал, ще бъдеш уведомен когато процеса е завършил "
+#~ "успешно."
+
+#~ msgid "No categories."
+#~ msgstr "Няма категории."
+
+#~ msgid "Use link to create one"
+#~ msgstr "Използвай връзката за да създадеш"
+
+#~ msgid "Exercise is pending review"
+#~ msgstr "Упражнението подлежи на проверка"
+
+#~ msgid "Till then, it will not be shown in the overview or the search."
+#~ msgstr "Дотогава то няма да бъде показано в прегледа или в търсачката."
+
+#, fuzzy
+#~| msgid "Add new meal"
+#~ msgid "Add new video"
+#~ msgstr "Добави ново ядене"
+
+#~ msgid "Comments for this exercise"
+#~ msgstr "Коментари за упражнението"
+
+#~ msgid "Add new comment"
+#~ msgstr "Добави нов коментар"
+
+#~ msgid "The diagram shows the most used muscles on this exercise"
+#~ msgstr "Диаграмата показва най-натоварваните мускули при това упражнение."
+
+#~ msgid "Add exercise"
+#~ msgstr "Добави упражнение"
+
+#~ msgid "Exercise was successfully marked as rejected"
+#~ msgstr "Упражнението бе успешно маркирано като отхвърлено"
+
+#, python-format
+#~ msgid "Edit log entry for %s"
+#~ msgstr "Промени дневника за %s"
+
#, fuzzy
#~| msgid "Reps"
#~ msgid "Max Reps"
diff --git a/wger/locale/ca/LC_MESSAGES/django.po b/wger/locale/ca/LC_MESSAGES/django.po
index 13c59815c..4593c7b3b 100644
--- a/wger/locale/ca/LC_MESSAGES/django.po
+++ b/wger/locale/ca/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-14 12:01+0200\n"
+"POT-Creation-Date: 2022-11-10 16:03+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"
@@ -31,106 +31,8 @@ msgstr ""
"tot nou usuari que es registri a dit gimnàs i actualitzarà tots els usuaris "
"existents que no en tinguin."
-#: 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 "Exercicis"
-
-#: config/models/language_config.py:42
-msgid "Ingredients"
-msgstr "Ingredients"
-
-#: config/templates/language/overview.html:4 core/templates/navigation.html:226
-msgid "Languages"
-msgstr "Llengües"
-
-#: config/templates/language/overview.html:16
-msgid "Nothing found."
-msgstr "No s'ha trobat res."
-
-#: 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:150
-#: nutrition/templates/plan/view.html:153
-#: nutrition/templates/plan/view.html:191
-msgid "Add one now."
-msgstr "Afegeix-ne un ara."
-
-#: config/templates/language/overview.html:29
-#: core/templates/license/list.html:38 core/templates/misc/license/list.html:41
-#: core/templates/repetition_unit/list.html:41
-#: core/templates/user/overview.html:327 core/templates/user/overview.html:366
-#: core/templates/user/overview.html:402
-#: core/templates/weight_unit/list.html:41 core/views/languages.py:73
-#: core/views/license.py:65 core/views/repetition_units.py:65
-#: core/views/weight_units.py:65
-#: exercises/templates/categories/admin-overview.html:36
-#: 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:61
-msgid "Add"
-msgstr "Afegeix"
-
-#: config/templates/language/view.html:21 core/models/language.py:29
-msgid "Language short name"
-msgstr "Nom curt de la llengua"
-
-#: config/templates/language/view.html:22
-#: config/templates/language/view.html:43 core/models/language.py:32
-msgid "Language full name"
-msgstr "Nom llarg de la llengua"
-
-#: config/templates/language/view.html:34 core/templates/user/overview.html:451
-#: gym/views/admin_config.py:44 gym/views/admin_config.py:58
-#: gym/views/user_config.py:46
-msgid "Configuration"
-msgstr "Configuració"
-
-#: config/templates/language/view.html:35
-msgid ""
-"Use the configuration to select in what languages the\n"
-"exercises and ingredients will be shown for the current language (for "
-"example\n"
-"the exercises should be shown in languages A, B and C; the ingredients only\n"
-"in A)."
-msgstr ""
-"Useu la configuració per a seleccionar en quines llengües es mostraran els\n"
-"exercicis i ingredients per a la llengua actual (p. e. els exercicis s'han "
-"de mostrar\n"
-"en les llengües A, B i C; els ingredients només en A."
-
-#: config/templates/language/view.html:44 gym/templates/contract/list.html:36
-msgid "Show"
-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: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:45
-msgid "Options"
-msgstr "Opcions"
-
-#: config/templates/language/view.html:96 config/views/gym_config.py:41
-#: config/views/language_config.py:49 core/templates/license/list.html:16
-#: core/templates/misc/license/list.html:17
+#: config/views/gym_config.py:41 core/templates/language/view.html:57
+#: 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:39
#: core/templates/tags/render_day.html:75 core/templates/user/overview.html:205
@@ -138,12 +40,10 @@ 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:230
-#: exercises/templates/exercise/view.html:351
#: exercises/templates/muscles/admin-overview.html:16
-#: 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
+#: 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
#: 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,81 +59,54 @@ msgstr "Opcions"
msgid "Edit"
msgstr "Edita"
-#: 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: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: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
-#: gym/templates/contract_type/list.html:39 gym/templates/document/list.html:46
-#: gym/templates/gym/list.html:20 manager/templates/calendar/day.html:69
-#: 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:231
-#: 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:132
-#: nutrition/templates/units/list.html:20
-msgid "Delete"
-msgstr "Esborra"
-
-#: core/demo.py:86
+#: core/demo.py:95
msgid "Sample workout"
msgstr "Entrenament de mostra"
-#: core/demo.py:90
+#: core/demo.py:99
msgid "Sample day"
msgstr "Dia de mostra"
-#: core/demo.py:94
+#: core/demo.py:103
msgid "Another sample day"
msgstr "Un altre dia de mostra"
-#: core/demo.py:217
-msgid "Sample nutrional plan"
+#: core/demo.py:211
+#, fuzzy
+#| msgid "Sample nutrional plan"
+msgid "Sample nutritional plan"
msgstr "Pla nutricional de mostra"
-#: core/demo.py:349 core/demo.py:351 core/demo.py:353
+#: core/demo.py:343 core/demo.py:345 core/demo.py:347
#, python-brace-format
msgid "Placeholder workout nr {0} for schedule"
msgstr "Reserva d'espai per l'entrenament núm. {0} per al programa"
-#: core/demo.py:358
+#: core/demo.py:352
msgid "My cool workout schedule"
msgstr "El meu programa d'entrenament xamós"
-#: core/demo.py:397 core/demo.py:412
+#: core/demo.py:391 core/demo.py:406
msgid "Empty placeholder schedule"
msgstr "Programa buit per a reservar l'espai"
-#: core/forms.py:61 core/templates/navigation.html:188
-#: core/templates/navigation.html:192 core/templates/user/login.html:4
+#: core/forms.py:64 core/templates/navigation.html:179
+#: core/templates/navigation.html:183 core/templates/user/login.html:4
#: software/templates/features.html:43
msgid "Login"
msgstr "Accedeix"
-#: core/forms.py:73 core/forms.py:164 gym/views/export.py:63
+#: core/forms.py:76 core/forms.py:177 gym/views/export.py:63
#: gym/views/gym.py:218
msgid "First name"
msgstr "Nom"
-#: core/forms.py:74 core/forms.py:165 core/templates/user/overview.html:267
+#: core/forms.py:77 core/forms.py:178 core/templates/user/overview.html:267
#: gym/views/export.py:64 gym/views/gym.py:218
msgid "Last name"
msgstr "Cognom"
-#: core/forms.py:76 core/forms.py:131 core/templates/user/overview.html:271
+#: core/forms.py:79 core/forms.py:144 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
@@ -243,79 +116,109 @@ msgstr "Cognom"
msgid "Email"
msgstr "Adreça electrònica"
-#: core/forms.py:77
+#: core/forms.py:80
msgid "Used for password resets and, optionally, e-mail reminders."
msgstr ""
"Usada per a reinicialitzar contrasenyes i, opcionalment, recordatoris per "
"correu."
-#: core/forms.py:102
+#: core/forms.py:84 core/models/profile.py:220
+#: gym/templates/gym/new_user.html:38
+msgid "Date of Birth"
+msgstr "Data de naixement"
+
+#: core/forms.py:116
msgid "Personal data"
msgstr "Dades personals"
-#: core/forms.py:110
+#: core/forms.py:124
msgid "Workout reminders"
msgstr "Recordatoris d'entrenament"
-#: core/forms.py:117
+#: core/forms.py:131
msgid "Other settings"
msgstr "Altres configuracions"
-#: 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
+#: core/forms.py:138 core/views/user.py:615 core/views/user.py:630
+#: core/views/user.py:642 gym/forms.py:72 manager/templates/log/add.html:65
+#: manager/templates/set/add.html:69 manager/views/workout.py:222
+#: utils/generic_views.py:143
msgid "Save"
msgstr "Desa"
-#: core/forms.py:132
+#: core/forms.py:145
msgid "Used for password resets and, optionally, email reminders."
msgstr ""
"Usada per a reinicialitzar contrasenyes i, opcionalment, recordatoris per "
"correu."
-#: core/forms.py:160
+#: core/forms.py:173
msgid "This e-mail address is already in use."
msgstr "Aquesta adreça ja s'està usant."
-#: core/forms.py:180 gym/templates/gym/new_user.html:26
+#: core/forms.py:193 gym/templates/gym/new_user.html:26
#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:218
msgid "Password"
msgstr "Contrasenya"
-#: core/forms.py:182
+#: core/forms.py:195
msgid "Please enter your current password."
msgstr "Introduïu la contrasenya actual."
-#: core/forms.py:200
+#: core/forms.py:204 core/templates/language/view.html:62
+#: 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: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/muscles/admin-overview.html:17
+#: gym/templates/admin_notes/list.html:40
+#: gym/templates/contract_option/list.html:39
+#: gym/templates/contract_type/list.html:39 gym/templates/document/list.html:46
+#: gym/templates/gym/list.html:20 manager/templates/calendar/day.html:69
+#: 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:231
+#: 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:132
+#: nutrition/templates/units/list.html:20
+msgid "Delete"
+msgstr "Esborra"
+
+#: core/forms.py:213
msgid "Invalid password"
msgstr "Contrasenya invàlida"
-#: core/forms.py:212 core/forms.py:278
+#: core/forms.py:225 core/forms.py:291
msgid "The form is secured with reCAPTCHA"
msgstr "El formulari està protegit amb reCAPTCHA"
-#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:188
-#: core/templates/navigation.html:193 core/templates/template.html:149
-#: core/templates/user/login.html:20 core/views/user.py:293
+#: core/forms.py:239 core/forms.py:258 core/templates/navigation.html:179
+#: core/templates/navigation.html:184 core/templates/template.html:149
+#: core/templates/user/login.html:20 core/views/user.py:300
#: software/templates/features.html:38
msgid "Register"
msgstr "Enregistreu-vos"
-#: core/forms.py:256
+#: core/forms.py:269
msgid "Contact"
msgstr "Contacte"
-#: core/forms.py:257
+#: core/forms.py:270
msgid "Some way of answering you (e-mail, etc.)"
msgstr "Algun medi per respondre-us (adreça electrònica, etc.)"
-#: core/forms.py:265 exercises/models/comment.py:40 manager/models/set.py:60
-#: manager/models/setting.py:99 nutrition/models/log.py:71
+#: core/forms.py:278 exercises/models/comment.py:42 manager/models/set.py:60
+#: manager/models/setting.py:111 nutrition/models/log.py:71
msgid "Comment"
msgstr "Comentari"
-#: core/forms.py:266
+#: core/forms.py:279
msgid "What do you want to say?"
msgstr "Què voleu dir?"
@@ -323,6 +226,14 @@ msgstr "Què voleu dir?"
msgid "Day of the week"
msgstr "Dia de la setmana"
+#: core/models/language.py:31 core/templates/language/view.html:21
+msgid "Language short name"
+msgstr "Nom curt de la llengua"
+
+#: core/models/language.py:36 core/templates/language/view.html:22
+msgid "Language full name"
+msgstr "Nom llarg de la llengua"
+
#: core/models/license.py:29
msgid "Full name"
msgstr "Nom complet"
@@ -380,20 +291,20 @@ msgstr "Mètriques (kilogram)"
msgid "Imperial (pound)"
msgstr "Imperials (lliura)"
-#: core/models/profile.py:111
+#: core/models/profile.py:114
msgid "Show exercise comments"
msgstr "Mostra comentaris dels exercicis"
-#: core/models/profile.py:112
+#: core/models/profile.py:115
msgid "Check to show exercise comments on the workout view"
msgstr ""
"Marqueu per a mostrar els comentaris dels exercicis a la vista d'entrenament"
-#: core/models/profile.py:123
+#: core/models/profile.py:126
msgid "Also use ingredients in English"
msgstr "Usa també ingredients en anglès"
-#: core/models/profile.py:125
+#: core/models/profile.py:128
msgid ""
"Check to also show ingredients in English while creating\n"
"a nutritional plan. These ingredients are extracted from a list provided\n"
@@ -406,11 +317,11 @@ msgstr ""
"d'Agricultura dels EUA. És extremadament completa, amb unes 7000 entrades,\n"
"però pot ser una mica massa extensa i dificultar les cerques."
-#: core/models/profile.py:134
+#: core/models/profile.py:137
msgid "Activate workout reminders"
msgstr "Activa recordatoris d'entrenament"
-#: core/models/profile.py:136
+#: core/models/profile.py:139
msgid ""
"Check to activate automatic reminders for workouts. You need to provide a "
"valid email for this to work."
@@ -418,21 +329,21 @@ msgstr ""
"Marqueu per a activar els recordatoris automàtics per als entrenaments. Cal "
"que proporcioneu una adreça electrònica vàlida per a que funcionin."
-#: core/models/profile.py:145
+#: core/models/profile.py:148
msgid "Remind before expiration"
msgstr "Avisa'm abans que no expiri"
-#: core/models/profile.py:146
+#: core/models/profile.py:149
msgid "The number of days you want to be reminded before a workout expires."
msgstr ""
"Nombre de dies abans de l'expiració d'un entrenament amb què voleu ser "
"avisat."
-#: core/models/profile.py:152
+#: core/models/profile.py:155
msgid "Default duration of workouts"
msgstr "Duració per defecte dels entrenaments"
-#: core/models/profile.py:154
+#: core/models/profile.py:157
msgid ""
"Default duration in weeks of workouts not in a schedule. Used for email "
"workout reminders."
@@ -440,11 +351,11 @@ msgstr ""
"Duració per defecte en setmanes per als entrenaments no programats. Usada "
"pels recordatoris d'entrenament per correu."
-#: core/models/profile.py:171
+#: core/models/profile.py:174
msgid "Notification language"
msgstr "Llengua de notificació"
-#: core/models/profile.py:173
+#: core/models/profile.py:176
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."
@@ -452,70 +363,70 @@ msgstr ""
"Llengua que s'usa quan se us enviïn notificacions per correu, p. e. "
"recordatoris per entrenaments. No afecta la llengua usada en el web."
-#: core/models/profile.py:186 gym/views/export.py:66
+#: core/models/profile.py:212 gym/views/export.py:66
msgid "Age"
msgstr "Edat"
-#: core/models/profile.py:202 nutrition/forms.py:99
+#: core/models/profile.py:228 nutrition/forms.py:100
msgid "Height (cm)"
msgstr "Alçada (cm)"
-#: core/models/profile.py:219
+#: core/models/profile.py:245
msgid "Hours of sleep"
msgstr "Hores de son"
-#: core/models/profile.py:220
+#: core/models/profile.py:246
msgid "The average hours of sleep per day"
msgstr "Mitjana d'hores de son al dia"
-#: core/models/profile.py:229
+#: core/models/profile.py:255
msgid "Work"
msgstr "Feina"
-#: core/models/profile.py:230 core/models/profile.py:272
+#: core/models/profile.py:256 core/models/profile.py:298
msgid "Average hours per day"
msgstr "Mitjana d'hores diàries"
-#: core/models/profile.py:239 core/models/profile.py:260
-#: core/models/profile.py:281
+#: core/models/profile.py:265 core/models/profile.py:286
+#: core/models/profile.py:307
msgid "Physical intensity"
msgstr "Intensitat física"
-#: core/models/profile.py:240 core/models/profile.py:261
-#: core/models/profile.py:282
+#: core/models/profile.py:266 core/models/profile.py:287
+#: core/models/profile.py:308
msgid "Approximately"
msgstr "Aproximadament"
-#: core/models/profile.py:250
+#: core/models/profile.py:276
msgid "Sport"
msgstr "Esport"
-#: core/models/profile.py:251
+#: core/models/profile.py:277
msgid "Average hours per week"
msgstr "Mitjana d'hores setmanals"
-#: core/models/profile.py:271
+#: core/models/profile.py:297
msgid "Free time"
msgstr "Temps lliure"
-#: core/models/profile.py:292 nutrition/templates/rate/form.html:66
+#: core/models/profile.py:318 nutrition/templates/rate/form.html:66
msgid "Total daily calories"
msgstr "Calories diàries totals"
-#: core/models/profile.py:293
+#: core/models/profile.py:319
msgid "Total caloric intake, including e.g. any surplus"
msgstr "Ingesta calòrica total, inclosos p. e. qualsevol extra"
-#: core/models/profile.py:305 nutrition/models/ingredient_weight_unit.py:45
+#: core/models/profile.py:331 nutrition/models/ingredient_weight_unit.py:45
#: nutrition/models/log.py:90 nutrition/models/meal_item.py:58
msgid "Weight unit"
msgstr "Unitat de pes"
-#: core/models/profile.py:313
+#: core/models/profile.py:339
msgid "Allow external access"
msgstr "Permet accés extern"
-#: core/models/profile.py:315
+#: core/models/profile.py:341
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."
@@ -524,25 +435,24 @@ msgstr ""
"en mode de només lectura. Cal que ho activeu abans que podeu compartir "
"vincles p. e. a xarxes socials."
-#: core/models/profile.py:324
+#: core/models/profile.py:350
msgid "Automatic reminders for weight entries"
msgstr "Recordatoris automàtics per a entrades de pes"
-#: core/models/profile.py:326
+#: core/models/profile.py:352
msgid "Number of days after the last weight entry (enter 0 to deactivate)"
msgstr ""
"Nombre de dies des de la darrera entrada de pes (introduïu 0 per a "
"desactivar)"
-#: core/models/profile.py:392
+#: core/models/profile.py:418
msgid "The sum of all hours has to be 24"
msgstr "La suma de totes les hores ha de ser 24"
#: core/models/rep_unit.py:35 core/models/weight_unit.py:35
-#: core/templates/user/overview.html:263 core/views/user.py:575
+#: core/templates/user/overview.html:263 core/views/user.py:591
#: 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
+#: exercises/models/exercise.py:64 exercises/models/muscle.py:36
#: 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
@@ -605,6 +515,53 @@ msgstr "Comparteix"
msgid "Are you sure you want to delete this? This action cannot be undone."
msgstr "Esteu segur que voleu esborrar això? Aquesta acció no es pot desfer."
+#: core/templates/email_verification/confirm_template.html:4
+msgid "Email verified"
+msgstr ""
+
+#: core/templates/email_verification/confirm_template.html:18
+#, python-format
+msgid "%(username)s, your email was verified"
+msgstr ""
+
+#: core/templates/email_verification/confirm_template.html:22
+msgid "Error, invalid verification token"
+msgstr ""
+
+#: core/templates/email_verification/email_body_html.tpl:6
+#, fuzzy
+#| msgid "Configuration"
+msgid "Email Confirmation"
+msgstr "Configuració"
+
+#: core/templates/email_verification/email_body_html.tpl:9
+#: core/templates/email_verification/email_body_txt.tpl:3
+#, fuzzy, python-format
+#| msgid "Calendar for %(username)s"
+msgid "You are almost there, %(username)s!"
+msgstr "Calendari per a %(username)s"
+
+#: core/templates/email_verification/email_body_html.tpl:11
+#, python-format
+msgid "Please click <a href=\"%(link)s\">here</a> to confirm your email"
+msgstr ""
+
+#: core/templates/email_verification/email_body_html.tpl:12
+#: core/templates/email_verification/email_body_txt.tpl:5
+#, python-format
+msgid "The token expires on %(time)s"
+msgstr ""
+
+#: core/templates/email_verification/email_body_html.tpl:14
+#: core/templates/email_verification/email_body_txt.tpl:8
+msgid "the wger Team"
+msgstr ""
+
+#: core/templates/email_verification/email_body_txt.tpl:4
+#, python-format
+msgid "Please click the following link to confirm your email: %(link)s"
+msgstr ""
+
#: core/templates/index.html:4
msgid "Dashboard"
msgstr "Consola"
@@ -666,7 +623,7 @@ msgid "Add custom diary entry"
msgstr "Afegeix entrada de diari personalitzada"
#: core/templates/index.html:84 core/templates/index.html:92
-#: manager/models/day.py:34 manager/models/log.py:56
+#: manager/models/day.py:34 manager/models/log.py:58
#: manager/models/session.py:60 manager/models/workout.py:109
#: manager/templates/schedule/view.html:105
#: manager/templates/workout/view.html:11
@@ -699,6 +656,20 @@ msgstr "Afegeix nou registre"
msgid "No workouts found."
msgstr "No s'han trobat entrenaments."
+#: core/templates/index.html:137 core/templates/index.html:189
+#: core/templates/language/overview.html:23
+#: 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:150
+#: nutrition/templates/plan/view.html:153
+#: nutrition/templates/plan/view.html:191
+msgid "Add one now."
+msgstr "Afegeix-ne un ara."
+
#: 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
@@ -752,19 +723,59 @@ msgid "No nutrition plans."
msgstr "No s'han trobat plans nutricionals."
#: 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
+#: core/templates/user/overview.html:121 manager/forms.py:184
+#: manager/helpers.py:89 manager/models/log.py:86 manager/models/setting.py:79
+#: manager/templates/log/add.html:54 manager/templates/set/formset.html:11
#: weight/models.py:34 weight/templates/import_csv_preview.html:14
#: weight/templates/import_csv_preview.html:43 weight/views.py:150
msgid "Weight"
msgstr "Pes"
-#: core/templates/index.html:210 core/templates/navigation.html:135
+#: core/templates/index.html:210 core/templates/navigation.html:126
#: weight/views.py:70
msgid "Add weight entry"
msgstr "Afegeix entrada de pes"
+#: core/templates/language/overview.html:4 core/templates/navigation.html:217
+msgid "Languages"
+msgstr "Llengües"
+
+#: core/templates/language/overview.html:23
+msgid "Nothing found."
+msgstr "No s'ha trobat res."
+
+#: core/templates/language/overview.html:36 core/templates/license/list.html:38
+#: core/templates/misc/license/list.html:41
+#: core/templates/repetition_unit/list.html:41
+#: core/templates/user/overview.html:327 core/templates/user/overview.html:366
+#: core/templates/user/overview.html:402
+#: core/templates/weight_unit/list.html:41 core/views/languages.py:73
+#: core/views/license.py:65 core/views/repetition_units.py:65
+#: core/views/weight_units.py:65
+#: exercises/templates/categories/admin-overview.html:36
+#: 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:61
+msgid "Add"
+msgstr "Afegeix"
+
+#: core/templates/language/view.html:52 core/templates/user/api_key.html:44
+#: core/templates/user/preferences.html:44 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:45
+msgid "Options"
+msgstr "Opcions"
+
#: core/templates/license/list.html:4 core/templates/misc/license/list.html:4
msgid "License list"
msgstr "Llista de llicències"
@@ -777,7 +788,6 @@ msgstr "Llista de llicències"
#: core/templates/weight_unit/list.html:26
#: exercises/templates/categories/admin-overview.html:24
#: exercises/templates/equipment/admin-overview.html:24
-#: exercises/templates/exercise/pending.html:30
#: exercises/templates/muscles/admin-overview.html:24
#: gym/templates/admin_notes/list.html:52 gym/templates/contract/list.html:60
#: gym/templates/contract_option/list.html:56
@@ -858,155 +868,135 @@ msgstr "Les vostres plantilles"
msgid "Public templates"
msgstr "Plantilles públiques"
-#: core/templates/navigation.html:64
-msgctxt "as in sorted by category"
-msgid "by category"
-msgstr "per categoria"
-
-#: core/templates/navigation.html:65
-msgctxt "as in sorted by muscle"
-msgid "by muscle"
-msgstr "per muscle"
-
-#: core/templates/navigation.html:66
-msgctxt "as in sorted by equipment"
-msgid "by equipment"
-msgstr "per equipament"
+#: core/templates/navigation.html:63 manager/forms.py:133
+#: manager/models/setting.py:54
+msgid "Exercises"
+msgstr "Exercicis"
-#: core/templates/navigation.html:70
-#: exercises/templates/equipment/overview.html:109
-#: exercises/templates/equipment/overview.html:113
-#: exercises/templates/exercise/overview.html:112
-#: exercises/templates/exercise/overview.html:116
-#: exercises/templates/muscles/overview.html:112
-#: exercises/templates/muscles/overview.html:116
-msgid "Add new exercise"
-msgstr "Afegeix un nou exercici"
-
-#: core/templates/navigation.html:75 core/templates/navigation.html:116
-#: core/templates/navigation.html:224
+#: core/templates/navigation.html:67 core/templates/navigation.html:107
+#: core/templates/navigation.html:215
msgid "Administration"
msgstr "Administració"
-#: core/templates/navigation.html:76
-#: exercises/templates/exercise/pending.html:6
-msgid "Exercises pending review"
-msgstr "Exercicis pendents de revisar"
+#: core/templates/navigation.html:68
+#, fuzzy
+#| msgid "Exercise day"
+msgid "Exercise edit history"
+msgstr "Dia d'entrenament"
-#: core/templates/navigation.html:77 exercises/models/base.py:72
-#: exercises/templates/exercise/view.html:80
+#: core/templates/navigation.html:69 exercises/models/base.py:84
msgid "Equipment"
msgstr "Equipament"
-#: core/templates/navigation.html:78 exercises/templates/exercise/view.html:258
+#: core/templates/navigation.html:70
msgid "Muscles"
msgstr "Músculs"
-#: core/templates/navigation.html:79
+#: core/templates/navigation.html:71
#: exercises/templates/categories/admin-overview.html:4
msgid "Categories"
msgstr "Categories"
-#: core/templates/navigation.html:93 software/templates/features.html:87
+#: core/templates/navigation.html:84 software/templates/features.html:87
msgid "Nutrition"
msgstr "Nutrició"
-#: core/templates/navigation.html:99 core/templates/user/overview.html:144
+#: core/templates/navigation.html:90 core/templates/user/overview.html:144
msgid "Nutrition plans"
msgstr "Plans de nutrició"
-#: core/templates/navigation.html:105 nutrition/templates/bmi/form.html:50
+#: core/templates/navigation.html:96 nutrition/templates/bmi/form.html:50
msgid "BMI calculator"
msgstr "Calculadora de l'IMC"
-#: core/templates/navigation.html:111 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:102 nutrition/templates/rate/form.html:17
msgid "Daily calories calculator"
msgstr "Calculadora de calories diàries"
-#: core/templates/navigation.html:113
+#: core/templates/navigation.html:104
#: nutrition/templates/ingredient/overview.html:29
msgid "Ingredient overview"
msgstr "Ingredients en un cop d'ull"
-#: core/templates/navigation.html:117 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:108 nutrition/templates/units/list.html:6
msgid "Ingredient weight units"
msgstr "Unitats de pes dels ingredients"
-#: core/templates/navigation.html:118
+#: core/templates/navigation.html:109
#: nutrition/templates/ingredient/pending.html:6
msgid "Ingredients pending review"
msgstr "Ingredients pendents de revisar"
-#: core/templates/navigation.html:132
+#: core/templates/navigation.html:123
msgid "Body weight"
msgstr "Pes corporal"
-#: core/templates/navigation.html:134 core/templates/user/overview.html:114
+#: core/templates/navigation.html:125 core/templates/user/overview.html:114
#: weight/templates/overview.html:7
msgid "Weight overview"
msgstr "El pes en un cop d'ull"
-#: core/templates/navigation.html:147
+#: core/templates/navigation.html:138
msgid "About this software"
msgstr "Quant a aquest programari"
-#: core/templates/navigation.html:149 core/templates/template_features.html:82
+#: core/templates/navigation.html:140 core/templates/template_features.html:82
#: software/templates/about_us.html:5
msgid "About us"
msgstr "Quant a nosaltres"
-#: core/templates/navigation.html:151 software/templates/features.html:209
+#: core/templates/navigation.html:142 software/templates/features.html:209
msgid "REST API"
msgstr "API REST"
-#: core/templates/navigation.html:155 utils/models.py:40
+#: core/templates/navigation.html:146 utils/models.py:41
msgid "License"
msgstr "Llicència"
-#: core/templates/navigation.html:161
+#: core/templates/navigation.html:152
msgid "Developer documentation"
msgstr "Documentació per a desenvolupadors"
-#: core/templates/navigation.html:167
+#: core/templates/navigation.html:158
msgid "Get the code"
msgstr "Obteniu el codi font"
-#: core/templates/navigation.html:173 core/templates/template.html:204
+#: core/templates/navigation.html:164 core/templates/template.html:203
#: core/templates/template_features.html:99
msgid "Translate"
msgstr "Traduïu"
-#: core/templates/navigation.html:194 core/templates/user/login.html:28
+#: core/templates/navigation.html:185 core/templates/user/login.html:28
msgid "Reset password"
msgstr "Reinicialitza la contrasenya"
-#: core/templates/navigation.html:207
+#: core/templates/navigation.html:198
msgid "My preferences"
msgstr "Les meves preferències"
-#: core/templates/navigation.html:214
+#: core/templates/navigation.html:205
msgid "Logout"
msgstr "Surt"
-#: core/templates/navigation.html:229
+#: core/templates/navigation.html:220
msgid "Licenses"
msgstr "Llicències"
-#: core/templates/navigation.html:232
+#: core/templates/navigation.html:223
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr "Unitats de repetició"
-#: core/templates/navigation.html:235 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:226 core/templates/weight_unit/list.html:4
#: nutrition/templates/ingredient/view.html:174
msgid "Weight units"
msgstr "Unitats de pes"
-#: core/templates/navigation.html:238 core/templates/user/list.html:4
+#: core/templates/navigation.html:229 core/templates/user/list.html:4
msgid "User list"
msgstr "Llista d'usuaris"
-#: core/templates/navigation.html:239
+#: core/templates/navigation.html:230
msgid "Gyms"
msgstr "Gimnasos"
@@ -1085,33 +1075,30 @@ msgstr "següent"
msgid "Add weight log"
msgstr "Afegeix registre de pes"
-#: core/templates/tags/render_day.html:114
-#: exercises/templates/equipment/overview.html:59
-#: exercises/templates/exercise/overview.html:63
-#: exercises/templates/muscles/overview.html:65
+#: core/templates/tags/render_day.html:116
msgid "Placeholder image for exercise"
msgstr "Imatge provisional per al vostre exercici"
-#: core/templates/tags/render_day.html:131
+#: core/templates/tags/render_day.html:133
msgid "This exercise has no repetitions."
msgstr "Aquest exercici no té repeticions."
-#: core/templates/tags/render_day.html:134
+#: core/templates/tags/render_day.html:136
msgid "Edit them now."
msgstr "Edita-les."
-#: core/templates/tags/render_day.html:159
+#: core/templates/tags/render_day.html:162
msgid "Add exercises to this workout day"
msgstr "Afegeix exercicis a aquest dia d'entrenament"
#: core/templates/tags/render_weight_log.html:17 manager/helpers.py:89
-#: manager/models/setting.py:57 manager/templates/set/formset.html:10
+#: manager/models/setting.py:69 manager/templates/set/formset.html:9
msgid "Reps"
msgstr "Repeticions"
-#: 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
+#: core/templates/tags/render_weight_log.html:30 manager/forms.py:189
+#: manager/models/log.py:103 manager/models/setting.py:99
+#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
msgid "RiR"
msgstr "RER"
@@ -1136,7 +1123,7 @@ msgstr "Condicions del servei"
msgid "Features"
msgstr "Funcions"
-#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:37
+#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:53
msgid "API key"
msgstr "Clau API"
@@ -1182,11 +1169,12 @@ msgid "Documentation"
msgstr "Documentació"
#: core/templates/user/delete_account.html:4
-#: core/templates/user/preferences.html:42
+#: core/templates/user/preferences.html:58
msgid "Delete account"
msgstr "Cancel·la el compte"
#: core/templates/user/delete_account.html:17
+#: exercises/templates/history/overview.html:93
msgid "Are you sure?"
msgstr "Esteu segur?"
@@ -1235,11 +1223,12 @@ msgstr "Afegeix entrenament"
#: core/templates/user/overview.html:34 core/templates/user/overview.html:76
#: core/templates/user/overview.html:120 core/templates/user/overview.html: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
-#: 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
+#: exercises/models/base.py:99 exercises/models/base.py:104
+#: exercises/models/exercise.py:69 exercises/models/exercise.py:76
+#: gallery/models/image.py:47 manager/helpers.py:88 manager/models/log.py:100
+#: 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/views.py:150
@@ -1247,11 +1236,11 @@ msgid "Date"
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: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
+#: exercises/models/exercise.py:57 exercises/views/exercises.py:123
+#: 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 "Descripció"
@@ -1259,12 +1248,12 @@ msgstr "Descripció"
msgid "Number of logs (days)"
msgstr "Nombre de registres (dies)"
-#: core/templates/user/overview.html:37 core/views/user.py:576
+#: core/templates/user/overview.html:37 core/views/user.py:592
#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:157
msgid "Last activity"
msgstr "Darrera activitat"
-#: core/templates/user/overview.html:68 manager/forms.py:267
+#: core/templates/user/overview.html:68 manager/forms.py:278
#: manager/templates/workout/view.html:151
msgid "Log"
msgstr "Registre"
@@ -1282,6 +1271,7 @@ msgid "Notes"
msgstr "Notes"
#: core/templates/user/overview.html:79
+#: exercises/templates/history/overview.html:30
#: manager/templates/calendar/partial_overview_table.html:42
#: nutrition/templates/log/detail.html:154
msgid "Time"
@@ -1329,10 +1319,12 @@ msgid "Do you really want to change this user&#39;s password?"
msgstr "Voleu canviar la contrasenya d'aquest usuari?"
#: core/templates/user/overview.html:233
+#: exercises/templates/history/overview.html:106
msgid "No"
msgstr "No"
#: core/templates/user/overview.html:234
+#: exercises/templates/history/overview.html:99
msgid "Yes"
msgstr "Sí"
@@ -1387,10 +1379,15 @@ msgid "Documents"
msgstr "Documents"
#: core/templates/user/overview.html:413 gym/templates/document/list.html:32
-#: manager/forms.py:279 manager/templates/workout/view.html:176
+#: manager/forms.py:290 manager/templates/workout/view.html:176
msgid "Download"
msgstr "Descarrega"
+#: core/templates/user/overview.html:451 gym/views/admin_config.py:44
+#: gym/views/admin_config.py:58 gym/views/user_config.py:46
+msgid "Configuration"
+msgstr "Configuració"
+
#: core/templates/user/overview.html:454 gym/models/user_config.py:92
msgid "Include in inactive overview"
msgstr "Inclou a la vista general d'inactius"
@@ -1410,7 +1407,25 @@ msgstr "Connecta amb aquest compte"
msgid "Preferences"
msgstr "Opcions"
-#: core/templates/user/preferences.html:33 core/views/user.py:587
+#: core/templates/user/preferences.html:19
+#, fuzzy
+#| msgid "Send emails"
+msgid "Verified email"
+msgstr "Envia correus"
+
+#: core/templates/user/preferences.html:24
+msgid "Unverified email"
+msgstr ""
+
+#: core/templates/user/preferences.html:26
+msgid "Send verification email"
+msgstr ""
+
+#: core/templates/user/preferences.html:30
+msgid "You need to verify your email to contribute exercises"
+msgstr ""
+
+#: core/templates/user/preferences.html:49 core/views/user.py:603
msgid "Change password"
msgstr "Canvia la contrasenya"
@@ -1440,39 +1455,37 @@ msgid "oz"
msgstr "oz"
#: 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
+#: exercises/views/equipment.py:104 exercises/views/exercises.py:185
+#: exercises/views/muscles.py:99 manager/views/schedule.py:311
+#: manager/views/schedule_step.py:129 manager/views/workout.py:269
+#: manager/views/workout_session.py:141 nutrition/views/ingredient.py:138
#: 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:431
-#: exercises/views/muscles.py:125 gallery/views/images.py:121
+#: exercises/views/categories.py:127 exercises/views/exercises.py:193
+#: exercises/views/muscles.py:106 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
+#: manager/views/workout.py:273 manager/views/workout_session.py:156
+#: nutrition/views/ingredient.py:145 nutrition/views/plan.py:127
#: nutrition/views/unit.py:118
#, python-brace-format
msgid "Delete {0}?"
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/repetition_units.py:85 core/views/user.py:472
#: 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: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
+#: exercises/views/equipment.py:81 exercises/views/muscles.py:86
+#: 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:170
+#: gym/views/gym.py:459 manager/views/day.py:100 manager/views/schedule.py:335
+#: manager/views/workout.py:287 nutrition/views/ingredient.py:164
+#: nutrition/views/plan.py:144 nutrition/views/unit.py:144
#, python-brace-format
msgid "Edit {0}"
msgstr "Edita {0}"
@@ -1503,64 +1516,65 @@ msgstr "Envia"
msgid "Your feedback was successfully sent. Thank you!"
msgstr "Els vostres comentaris s'han enviat amb èxit. Gràcies!"
-#: core/views/user.py:156
+#: core/views/user.py:157
#, python-brace-format
msgid "Account \"{0}\" was successfully deleted"
msgstr "El compte «{0}» s'ha esborrat amb èxit"
-#: core/views/user.py:287
+#: core/views/user.py:294
msgid "You were successfully registered"
msgstr "Us heu registrat amb èxit"
-#: core/views/user.py:339
+#: core/views/user.py:355
msgid "Settings successfully updated"
msgstr "Opcions actualitzades amb èxit"
-#: core/views/user.py:376
+#: core/views/user.py:392
msgid "The user was successfully deactivated"
msgstr "S'ha desactivat l'usuari amb èxit"
-#: core/views/user.py:411
+#: core/views/user.py:427
msgid "The user was successfully activated"
msgstr "S'ha activat l'usuari amb èxit"
-#: core/views/user.py:426
+#: core/views/user.py:442
msgid "Edit user"
msgstr "Edita l'usuari"
-#: core/views/user.py:573 gym/templates/gym/member_list.html:26
+#: core/views/user.py:589 gym/templates/gym/member_list.html:26
#: gym/views/gym.py:156
msgid "ID"
msgstr "ID"
-#: core/views/user.py:574 gym/forms.py:94 gym/templates/contract/view.html:55
+#: core/views/user.py:590 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 "Nom d'usuari"
-#: core/views/user.py:577 gym/templates/gym/new_user.html:34
+#: core/views/user.py:593 gym/templates/gym/new_user.html:34
#: gym/views/export.py:60 gym/views/gym.py:218
msgid "Gym"
msgstr "Gimnàs"
-#: exercises/models/base.py:51 exercises/templates/exercise/view.html:76
-#: nutrition/models/ingredient.py:204
+#: core/views/user.py:652
+#, python-format
+msgid "A verification email was sent to %(email)s"
+msgstr ""
+
+#: exercises/models/base.py:63 nutrition/models/ingredient.py:204
msgid "Category"
msgstr "Categoria"
-#: exercises/models/base.py:58
+#: exercises/models/base.py:70
msgid "Primary muscles"
msgstr "Músculs primaris"
-#: exercises/models/base.py:64 exercises/templates/equipment/overview.html:71
-#: exercises/templates/exercise/overview.html:76
-#: exercises/templates/exercise/view.html:268
-#: exercises/templates/muscles/overview.html:77
+#: exercises/models/base.py:76
msgid "Secondary muscles"
msgstr "Músculs secundaris"
-#: exercises/models/base.py:79
+#: exercises/models/base.py:91
msgid "Variations"
msgstr "Variacions"
@@ -1568,73 +1582,60 @@ msgstr "Variacions"
msgid "Exercise Categories"
msgstr "Categories d'exercicis"
-#: exercises/models/comment.py:34 exercises/models/exercise_alias.py:32
-#: exercises/models/image.py:75 exercises/models/video.py:82
-#: manager/forms.py:165 manager/helpers.py:89 manager/models/log.py:51
+#: exercises/models/comment.py:37 exercises/models/exercise_alias.py:35
+#: exercises/models/image.py:71 exercises/models/video.py:95
+#: manager/forms.py:176 manager/helpers.py:89 manager/models/log.py:52
msgid "Exercise"
msgstr "Exercici"
-#: exercises/models/comment.py:41
+#: exercises/models/comment.py:43
msgid "A comment about how to correctly do this exercise."
msgstr "Un comentari sobre com fer aquest exercici correctament."
-#: exercises/models/exercise.py:86 nutrition/models/ingredient.py:80
+#: exercises/models/exercise.py:81 nutrition/models/ingredient.py:80
#: nutrition/models/plan.py:61 nutrition/models/weight_unit.py:32
msgid "Language"
msgstr "Llengua"
-#: 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:265
-msgid "New user submitted exercise"
-msgstr "Nou exercici proposat per un usuari"
-
-#: 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}»."
-
-#: exercises/models/exercise_alias.py:35
+#: exercises/models/exercise_alias.py:38
#, fuzzy
#| msgid "Correcting an exercise"
msgid "Alias for an exercise"
msgstr "Corregint un exercici"
-#: exercises/models/image.py:59
+#: exercises/models/image.py:55
msgid "Line"
msgstr "Lineal"
-#: exercises/models/image.py:60
+#: exercises/models/image.py:56
msgid "3D"
msgstr "3D"
-#: exercises/models/image.py:61
+#: exercises/models/image.py:57
msgid "Low-poly"
msgstr "«Low-poly»"
-#: exercises/models/image.py:62
+#: exercises/models/image.py:58
msgid "Photo"
msgstr "Foto"
-#: exercises/models/image.py:63
+#: exercises/models/image.py:59
msgid "Other"
msgstr "Altres"
-#: exercises/models/image.py:81 gallery/models/image.py:56
+#: exercises/models/image.py:77 gallery/models/image.py:56
msgid "Image"
msgstr "Imatge"
-#: exercises/models/image.py:82 gallery/models/image.py:57
+#: exercises/models/image.py:78 gallery/models/image.py:57
msgid "Only PNG and JPEG formats are supported"
msgstr "Només se suporten els formats PNG i JPEG"
-#: exercises/models/image.py:88
+#: exercises/models/image.py:84
msgid "Main picture"
msgstr "Imatge principal"
-#: exercises/models/image.py:91
+#: exercises/models/image.py:87
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 "
@@ -1644,19 +1645,10 @@ msgstr ""
"aquest exercici (es mostrarà p. e. a la cerca). El sistema marca "
"automàticament la primera imatge com a principal."
-#: exercises/models/image.py:100
+#: exercises/models/image.py:96
msgid "The art style of your image"
msgstr "La tècnica estilística de la vostra imatge"
-#: exercises/models/image.py:185
-msgid "New user submitted image"
-msgstr "Nova imatge proposada per un usuari"
-
-#: exercises/models/image.py:186
-#, python-brace-format
-msgid "The user {0} submitted a new image \"{1}\" for exercise {2}."
-msgstr "L'usuari {0} ha proposat una nova imatge «{1}» per a l'exercici {2}."
-
#: exercises/models/muscle.py:37
msgid "In latin, e.g. \"Pectoralis major\""
msgstr "En llatí, p. e. «Pectoralis major»"
@@ -1671,192 +1663,79 @@ msgstr "nom de l'exercici"
msgid "A more basic name for the muscle"
msgstr ""
-#: exercises/models/video.py:41
-msgid "Maximum file size is 100MB."
+#: exercises/models/video.py:50
+#, python-format
+msgid "Maximum file size is %(size)sMB."
msgstr ""
-#: exercises/models/video.py:44 exercises/models/video.py:48
+#: exercises/models/video.py:57 exercises/models/video.py:65
msgid "File type is not supported"
msgstr ""
-#: exercises/models/video.py:57
+#: exercises/models/video.py:70
#, 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
+#: exercises/models/video.py:101
#, fuzzy
#| msgid "Main picture"
msgid "Main video"
msgstr "Imatge principal"
-#: exercises/models/video.py:94
+#: exercises/models/video.py:107
msgid "Video"
msgstr ""
-#: exercises/models/video.py:101
+#: exercises/models/video.py:114
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"
-
-#: exercises/templates/equipment/admin-overview.html:37
-#: exercises/views/equipment.py:94
-msgid "Add new equipment"
-msgstr "Afegeix un nou equipament"
-
-#: exercises/templates/equipment/overview.html:11
-msgid "Equipment overview"
-msgstr "Vista general d'equipaments"
-
-#: exercises/templates/equipment/overview.html:69
-#: exercises/templates/exercise/overview.html:74
-#: exercises/templates/exercise/view.html:264
-#: exercises/templates/muscles/overview.html:75
-msgid "Main muscles"
-msgstr "Músculs principals"
-
-#: exercises/templates/equipment/overview.html:79
-msgid ""
-"No exercises for this equipment. Add or edit an exercise and set the "
-"equipment."
-msgstr ""
-"No hi ha exercicis per a aquest equipament. Afegiu o editeu un exercici i "
-"definiu-ne l'equipament."
-
-#: exercises/templates/equipment/overview.html:96
-#: exercises/templates/exercise/overview.html:99
-#: nutrition/templates/ingredient/overview.html:57
-msgid "Search"
-msgstr "Cerca"
-
-#: exercises/templates/equipment/overview.html:101
-#: exercises/templates/exercise/overview.html:104
-msgid "exercise name"
-msgstr "nom de l'exercici"
-
-#: exercises/templates/equipment/overview.html:115
-#: exercises/templates/exercise/overview.html:118
-#: exercises/templates/muscles/overview.html:118
-#: nutrition/templates/ingredient/overview.html:85
-msgid "Only registered users can do this"
-msgstr "Només els usuaris registrats poden fer això"
-
-#: exercises/templates/exercise/email_new.tpl:1
-#, python-format
-msgid ""
-"Your exercise '%(exercise)s' was successfully added to the general\n"
-"database."
-msgstr ""
-"El vostre exercici «%(exercise)s» s'ha afegit a la base de dades\n"
-"general amb èxit."
-
-#: exercises/templates/exercise/email_new.tpl:4
-msgid ""
-"It is now available on the exercise and muscle overview and can be\n"
-"added to workouts. You can access it on this address:"
-msgstr ""
-"Ja està disponible a la vista general d'exercicis i la de músculs i es\n"
-"pot afegir a entrenaments. Podeu accedir-hi amb aquesta adreça:"
-
-#: exercises/templates/exercise/email_new.tpl:8
-#: nutrition/templates/ingredient/email_new.tpl:8
-msgid "Thank you for contributing and making this site better!"
-msgstr "Gràcies per ajudar a millorar aquest lloc web!"
-
-#: exercises/templates/exercise/email_new.tpl:9
-#: manager/templates/workout/email_reminder.tpl:15
-#: manager/templates/workout/email_weight_reminder.tpl:12
-#: nutrition/templates/ingredient/email_new.tpl:9
-#, python-format
-msgid "The %(site)s team"
-msgstr "L'equip de %(site)s"
-
-#: exercises/templates/exercise/form.html:4
-msgid "Submitting an exercise"
-msgstr "Proposeu un nou exercici"
-
-#: exercises/templates/exercise/form.html:5
-msgid ""
-"Thank you for submitting an exercise. This is much\n"
-"appreciated!"
-msgstr "Gràcies per proposar un nou exercici. Ho apreciem molt!"
-
-#: exercises/templates/exercise/form.html:8
-msgid ""
-"After you submit the form, the administrators will be notified.\n"
-"Once it is reviewed, it will be added to the database. Till this happens,\n"
-"it will not be visible in the overview or the search. In case you added your "
-"email\n"
-"when you registered, you will get notified when the process is completed "
-"successfully."
+#: exercises/models/video.py:121 manager/models/schedule_step.py:56
+msgid "Duration"
+msgstr "Duració"
+
+#: exercises/models/video.py:130
+msgid "Width"
msgstr ""
-"Quan envieu el formulari, l'administració rebrà un avís.\n"
-"Un cop el revisin, l'afegiran a la base de dades. Fins llavors, no serà "
-"visible\n"
-"a la vista general ni a la cerca. Si vau afegir una adreça electrònica quan "
-"us\n"
-"vau registrar, rebreu un avís quan aquest procés es completi amb èxit."
-#: exercises/templates/exercise/form_correct.html:4
-msgid "Correcting an exercise"
-msgstr "Corregint un exercici"
+#: exercises/models/video.py:137
+#, fuzzy
+#| msgid "Weight"
+msgid "Height"
+msgstr "Pes"
-#: exercises/templates/exercise/form_correct.html:5
-msgid ""
-"Thank you for correcting and improving this exercise.\n"
-"This is much appreciated!"
+#: exercises/models/video.py:144
+msgid "Codec"
msgstr ""
-"Gràcies per corregir i millorar aquest exercici.\n"
-"Ho apreciem molt!"
-#: exercises/templates/exercise/form_correct.html:8
-msgid ""
-"After you submit the form, the administrators will be notified.\n"
-"Once the changes are reviewed the exercise will be updated."
+#: exercises/models/video.py:152
+msgid "Codec, long name"
msgstr ""
-"Quan envieu el formulari, l'administració rebrà un avís.\n"
-"Un cop els canvis s'hagin revisat, s'actualitzarà l'exercici."
-#: exercises/templates/exercise/overview.html:88
-msgid "No categories."
-msgstr "Sense categories."
+#: exercises/templates/equipment/admin-overview.html:4
+msgid "Equipment list"
+msgstr "Llista d'equipaments"
+
+#: exercises/templates/equipment/admin-overview.html:37
+#: exercises/views/equipment.py:92
+msgid "Add new equipment"
+msgstr "Afegeix un nou equipament"
-#: exercises/templates/exercise/overview.html:88
-msgid "Use link to create one"
-msgstr "Useu el vincle per a afegir-ne una"
+#: exercises/templates/history/overview.html:11
+#, fuzzy
+#| msgid "Exercise day"
+msgid "Exercise admin history"
+msgstr "Dia d'entrenament"
-#: exercises/templates/exercise/pending.html:14
-#: nutrition/templates/ingredient/pending.html:14
-msgid "Submission date"
-msgstr "Data d'inserció"
+#: exercises/templates/history/overview.html:27
+#, fuzzy
+#| msgid "Actions"
+msgid "Action"
+msgstr "Accions"
-#: exercises/templates/exercise/pending.html:16 gallery/models/image.py:51
+#: exercises/templates/history/overview.html:28 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/log.py:45
@@ -1867,103 +1746,46 @@ msgstr "Data d'inserció"
msgid "User"
msgstr "Usuari"
-#: exercises/templates/exercise/view.html:48
-msgid "Exercise is pending review"
-msgstr "L'exercici està pendent de revisió"
-
-#: exercises/templates/exercise/view.html:51
-msgid ""
-"This user submitted exercise is pending a decision to be\n"
-" included in the database."
-msgstr ""
-"Aquest exercici enviat per un usuari està pendent\n"
-"d'una decisió per a ser inclòs a la base de dades."
-
-#: exercises/templates/exercise/view.html:53
-msgid "Till then, it will not be shown in the overview or the search."
-msgstr "Fins llavors, no es mostrarà a la vista general ni a la cerca."
-
-#: exercises/templates/exercise/view.html:54
-#: nutrition/templates/ingredient/view.html:31
-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:203
-#: nutrition/templates/ingredient/view.html:38
-msgid "Accept"
-msgstr "Accepta"
-
-#: exercises/templates/exercise/view.html:64
-#: exercises/templates/exercise/view.html:204
-#: nutrition/templates/ingredient/view.html:42
-msgid "Decline"
-msgstr "Refusa"
+#: exercises/templates/history/overview.html:29
+#, fuzzy
+#| msgctxt "As in \"email subject\""
+#| msgid "Subject"
+msgid "Object"
+msgstr "Assumpte"
-#: exercises/templates/exercise/view.html:96
-msgid "Images"
-msgstr "Imatges"
+#: exercises/templates/history/overview.html:31
+#, fuzzy
+#| msgid "Change password"
+msgid "Changes"
+msgstr "Canvia la contrasenya"
-#: exercises/templates/exercise/view.html:137 exercises/views/images.py:93
-msgid "Add new image"
-msgstr "Afegeix una nova imatge"
+#: exercises/templates/history/overview.html:32
+msgid "Revert"
+msgstr ""
-#: exercises/templates/exercise/view.html:148
-msgid "Videos"
+#: exercises/templates/history/overview.html:64
+msgid "View Object"
msgstr ""
-#: exercises/templates/exercise/view.html:187 exercises/views/videos.py:94
+#: exercises/templates/history/overview.html:75
#, 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:218
-msgid "Comments for this exercise"
-msgstr "Comentaris per a aquest exercici"
-
-#: exercises/templates/exercise/view.html:246
-msgid "Add new comment"
-msgstr "Afegeix un nou comentari"
-
-#: 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: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:306
-msgid "Exercise Variations"
-msgstr "Variacions de l'exercici"
+#| msgid "View logs"
+msgid "View changes"
+msgstr "Veure registres"
-#: exercises/templates/exercise/view.html:327
-msgid "Submit a correction"
-msgstr "Envia una esmena"
+#: exercises/templates/history/overview.html:86
+msgid "Revert changes"
+msgstr ""
#: exercises/templates/muscles/admin-overview.html:4
-#: exercises/templates/muscles/overview.html:7
msgid "Muscle overview"
msgstr "Vista general del músculs"
#: exercises/templates/muscles/admin-overview.html:36
-#: exercises/views/muscles.py:86
+#: exercises/views/muscles.py:67
msgid "Add muscle"
msgstr "Afegeix múscul"
-#: exercises/templates/muscles/overview.html:85
-msgid ""
-"No exercises for this muscle. Add or edit an exercise and set the muscle."
-msgstr ""
-"No hi ha exercicis per a aquest múscul. Afegiu o editeu un exercici i "
-"especifiqueu-l'hi."
-
#: exercises/views/categories.py:71
msgid "Add category"
msgstr "Afegeix categoria"
@@ -1976,51 +1798,23 @@ msgstr "Això també esborrarà tots els exercicis d'aquesta categoria."
msgid "Add exercise comment"
msgstr "Afegeix comentari de l'exercici"
-#: exercises/views/equipment.py:107 exercises/views/equipment.py:118
+#: exercises/views/equipment.py:105 exercises/views/equipment.py:116
msgid "Delete equipment?"
msgstr "Voleu esborrar l'equipament?"
-#: exercises/views/exercises.py:229
-#, python-format
-msgid ""
-"%(name_original)s is too similar to existing exercise \"%(exercise_name)s\""
+#: exercises/views/exercises.py:161
+#, fuzzy, python-format
+#| msgid ""
+#| "%(name_original)s is too similar to existing exercise "
+#| "\"%(exercise_name)s\""
+msgid "%(name)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:247
-msgid "Add exercise"
-msgstr "Afegeix exercici"
-
-#: 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:380
-#, python-brace-format
-msgid "Correct {0}"
-msgstr "Corregeix {0}"
-
-#: exercises/views/exercises.py:422
+#: exercises/views/exercises.py:184
msgid "This will delete the exercise from all workouts."
msgstr "Això esborrarà l'exercici de tots els entrenaments."
-#: exercises/views/exercises.py:474
-msgid "Exercise was successfully marked as rejected"
-msgstr "L'exercici s'ha marcat amb èxit com a refusat"
-
-#: exercises/views/images.py:68
-msgid "Edit exercise image"
-msgstr "Edita imatge de l'exercici"
-
-#: exercises/views/images.py:143
-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"
@@ -2087,7 +1881,7 @@ msgid "Contract type"
msgstr "Tipus de contracte"
#: gym/models/contract.py:208 gym/templates/contract/view.html:59
-#: manager/templates/log/add.html:52 nutrition/forms.py:59
+#: manager/templates/log/add.html:52 nutrition/forms.py:60
#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:102
#: nutrition/models/meal_item.py:72
msgid "Amount"
@@ -2190,6 +1984,10 @@ msgstr "S'usarà el nom del fitxer si no es facilita una altra cosa"
msgid "User notes"
msgstr "Notes de l'usuari"
+#: gym/templates/contract/list.html:36
+msgid "Show"
+msgstr "Mostra"
+
#: gym/templates/contract/view.html:4
msgid "Contract"
msgstr "Contracte"
@@ -2270,10 +2068,6 @@ msgstr "Adreces electròniques"
msgid "Add member"
msgstr "Afegeix un membre"
-#: gym/templates/gym/new_user.html:38
-msgid "Date of Birth"
-msgstr "Data de naixement"
-
#: gym/templates/gym/new_user.html:48 manager/templates/calendar/month.html:144
#: manager/templates/log/add.html:75 nutrition/templates/rate/form.html:120
msgid "Info"
@@ -2336,127 +2130,127 @@ msgstr "Afegeix usuari al gimnàs"
msgid "Edit gym"
msgstr "Edita el gimnàs"
-#: i18n.tpl:2 i18n.tpl:28
-msgid "Abs"
+#: i18n.tpl:2
+msgid "Until Failure"
msgstr ""
-#: i18n.tpl:3
-msgid "Arms"
-msgstr ""
+#: i18n.tpl:3 manager/forms.py:180 manager/models/log.py:73
+#: manager/templates/set/add.html:53
+msgid "Repetitions"
+msgstr "Repeticions"
#: i18n.tpl:4
-msgid "Back"
+msgid "Abs"
msgstr ""
-#: i18n.tpl:5 i18n.tpl:23
-msgid "Calves"
+#: i18n.tpl:5
+msgid "Arms"
msgstr ""
-#: i18n.tpl:6 i18n.tpl:26
-msgid "Chest"
+#: i18n.tpl:6
+msgid "Legs"
msgstr ""
#: i18n.tpl:7
-msgid "Legs"
+msgid "Dumbbell"
msgstr ""
-#: i18n.tpl:8 i18n.tpl:19
-msgid "Shoulders"
+#: i18n.tpl:8
+msgid "Biceps"
msgstr ""
#: i18n.tpl:9
-msgid "Barbell"
+msgid "SZ-Bar"
msgstr ""
#: i18n.tpl:10
-msgid "Bench"
+msgid "Kettlebell"
msgstr ""
#: i18n.tpl:11
-msgid "Dumbbell"
+msgid "Swiss Ball"
msgstr ""
#: i18n.tpl:12
-#, fuzzy
-#| msgid "Gym manager"
-msgid "Gym mat"
-msgstr "Director del gimnàs"
+msgid "none (bodyweight exercise)"
+msgstr ""
#: i18n.tpl:13
-msgid "Incline bench"
+msgid "Calves"
msgstr ""
#: i18n.tpl:14
-msgid "Kettlebell"
+msgid "Back"
msgstr ""
#: i18n.tpl:15
-msgid "Pull-up bar"
+msgid "Lower back"
msgstr ""
#: i18n.tpl:16
-msgid "SZ-Bar"
+msgid "Lats"
msgstr ""
#: i18n.tpl:17
-msgid "Swiss Ball"
+msgid "Hamstrings"
msgstr ""
#: i18n.tpl:18
-msgid "none (bodyweight exercise)"
+msgid "Bench"
+msgstr ""
+
+#: i18n.tpl:19
+msgid "Glutes"
msgstr ""
#: i18n.tpl:20
-msgid "Biceps"
+msgid "Kilometers"
msgstr ""
#: i18n.tpl:21
-msgid "Hamstrings"
+msgid "Shoulders"
msgstr ""
#: i18n.tpl:22
-msgid "Lower back"
+msgid "Seconds"
msgstr ""
-#: i18n.tpl:24
-msgid "Glutes"
+#: i18n.tpl:23
+msgid "Miles"
msgstr ""
-#: i18n.tpl:25
-msgid "Lats"
+#: i18n.tpl:24
+msgid "Incline bench"
msgstr ""
-#: i18n.tpl:27
+#: i18n.tpl:25
msgid "Quads"
msgstr ""
-#: i18n.tpl:29
-msgid "Triceps"
+#: i18n.tpl:26
+msgid "Minutes"
msgstr ""
-#: i18n.tpl:30
-msgid "Kilometers"
+#: i18n.tpl:27
+msgid "Chest"
msgstr ""
-#: i18n.tpl:31
-msgid "Miles"
-msgstr ""
+#: i18n.tpl:28
+#, fuzzy
+#| msgid "Gym manager"
+msgid "Gym mat"
+msgstr "Director del gimnàs"
-#: i18n.tpl:32
-msgid "Minutes"
+#: i18n.tpl:29
+msgid "Pull-up bar"
msgstr ""
-#: i18n.tpl:33 manager/forms.py:169 manager/models/log.py:71
-#: manager/templates/set/add.html:53
-msgid "Repetitions"
-msgstr "Repeticions"
-
-#: i18n.tpl:34
-msgid "Seconds"
+#: i18n.tpl:30
+msgid "Barbell"
msgstr ""
-#: i18n.tpl:35
-msgid "Until Failure"
+#: i18n.tpl:31
+msgid "Triceps"
msgstr ""
#: mailer/forms.py:34 mailer/templates/mailer/gym/preview.html:32
@@ -2512,11 +2306,11 @@ msgstr "Envia correus"
msgid "Correction"
msgstr "Correcció"
-#: manager/forms.py:89 manager/models/workout.py:59
+#: manager/forms.py:92 manager/models/workout.py:59
msgid "The name of the workout"
msgstr "El nom de l'entrenament"
-#: manager/forms.py:93 manager/models/workout.py:66
+#: manager/forms.py:96 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'."
@@ -2524,34 +2318,34 @@ msgstr ""
"Una curta descripció o l'objectiu del pla d'entrenament, p. e. «Focus a "
"l'esquena» o «Semana 1 del Programa XY»."
-#: manager/forms.py:126
+#: manager/forms.py:137
msgid ""
"You can search for more than one exercise, they will be grouped together for "
"a superset."
msgstr "Podeu cercar més d'un exercici, s'agruparan en un conjunt."
-#: 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
+#: manager/forms.py:166 manager/forms.py:171 manager/models/log.py:64
+#: manager/models/log.py:92 manager/models/setting.py:59
+#: manager/models/setting.py:90 manager/templates/log/add.html:53
+#: manager/templates/log/add.html:55 manager/templates/set/formset.html:10
+#: manager/templates/set/formset.html:12 measurements/models/category.py:58
+#: nutrition/forms.py:64
msgid "Unit"
msgstr "Unitat"
-#: manager/forms.py:266
+#: manager/forms.py:277
msgid "Type"
msgstr "Tipus"
-#: manager/forms.py:267 manager/templates/workout/view.html:157
+#: manager/forms.py:278 manager/templates/workout/view.html:157
msgid "Table"
msgstr "Taula"
-#: manager/forms.py:269 manager/templates/workout/view.html:163
+#: manager/forms.py:280 manager/templates/workout/view.html:163
msgid "with images"
msgstr "amb imatges"
-#: manager/forms.py:270 manager/templates/workout/view.html:169
+#: manager/forms.py:281 manager/templates/workout/view.html:169
msgid "with comments"
msgstr "amb comentaris"
@@ -2610,7 +2404,7 @@ msgid "The duration in weeks"
msgstr "La duració en setmanes"
#: manager/models/schedule_step.py:63 manager/models/set.py:52
-#: manager/models/setting.py:98 nutrition/models/meal.py:54
+#: manager/models/setting.py:110 nutrition/models/meal.py:54
#: nutrition/models/meal_item.py:65
msgid "Order"
msgstr "Ordre"
@@ -2663,7 +2457,7 @@ msgstr "Dia d'entrenament"
msgid "Number of sets"
msgstr "Nombre de sèries"
-#: manager/models/setting.py:43
+#: manager/models/setting.py:48
msgid "Sets"
msgstr "Sèries"
@@ -2953,6 +2747,13 @@ msgstr ""
"Si no voleu rebre mai més recordatoris per correu, desactiveu\n"
"l'opció a la configuració."
+#: manager/templates/workout/email_reminder.tpl:15
+#: manager/templates/workout/email_weight_reminder.tpl:12
+#: nutrition/templates/ingredient/email_new.tpl:9
+#, python-format
+msgid "The %(site)s team"
+msgstr "L'equip de %(site)s"
+
#: manager/templates/workout/email_weight_reminder.tpl:3
#, python-format
msgid ""
@@ -2969,6 +2770,10 @@ msgstr ""
"Rebreu aquests recordatoris regularment fins que hagueu introduït el vostre "
"pes actual."
+#: manager/templates/workout/log.html:10 manager/templates/workout/log.html:11
+msgid "Weight log"
+msgstr "Registre del pes"
+
#: manager/templates/workout/log.html:29
msgid "Weight log for workout"
msgstr "Registre d'entrenament"
@@ -3076,7 +2881,7 @@ msgstr "Veure registres"
msgid "Edit workout"
msgstr "Edita el pla d'entrenament"
-#: manager/templates/workout/view.html:225 manager/views/workout.py:300
+#: manager/templates/workout/view.html:225 manager/views/workout.py:301
msgid "Mark as template"
msgstr "Marca com a plantilla"
@@ -3084,11 +2889,6 @@ msgstr "Marca com a plantilla"
msgid "Add workout day"
msgstr "Afegeix dis d'entrenament"
-#: manager/views/log.py:92
-#, python-format
-msgid "Edit log entry for %s"
-msgstr "Edita entrada del registre per a %s"
-
#: manager/views/log.py:111
msgid "Delete workout log"
msgstr "Esborra registre d'entrenament"
@@ -3106,11 +2906,11 @@ msgstr "Crea un programa"
msgid "Your workouts"
msgstr "Els vostres plans d'entrenament"
-#: manager/views/workout.py:227
+#: manager/views/workout.py:228
msgid "Copy workout"
msgstr "Copia pla d'entrenament"
-#: manager/views/workout.py:230
+#: manager/views/workout.py:231
msgid "Copy"
msgstr "Copia"
@@ -3132,23 +2932,23 @@ msgstr "Això esborrarà també tots els registres de pes per a aquest dia."
msgid "Value"
msgstr "Valor"
-#: nutrition/forms.py:122
+#: nutrition/forms.py:123
msgid "Calculate"
msgstr "Calcula"
-#: nutrition/forms.py:195 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:196 nutrition/templates/rate/form.html:76
msgid "Basic caloric intake"
msgstr "Ingesta energètica bàsica"
-#: nutrition/forms.py:196
+#: nutrition/forms.py:197
msgid "Your basic caloric intake as calculated for your data"
msgstr "La vostra ingesta energètica bàsica calculada segons les vostres dades"
-#: nutrition/forms.py:202
+#: nutrition/forms.py:203
msgid "Additional calories"
msgstr "Calories addicionals"
-#: nutrition/forms.py:204
+#: nutrition/forms.py:205
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
@@ -3156,7 +2956,7 @@ msgstr ""
"Calories addicionals a afegir a la base (per a sostreure-les-en, introduïu "
"un número negatiu)"
-#: nutrition/forms.py:232 nutrition/models/ingredient_weight_unit.py:39
+#: nutrition/forms.py:233 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"
@@ -3219,7 +3019,7 @@ msgid ""
"{energy_approx}%)"
msgstr ""
-#: nutrition/models/ingredient.py:357 nutrition/views/ingredient.py:225
+#: nutrition/models/ingredient.py:357 nutrition/views/ingredient.py:219
msgid "Ingredient was successfully added to the general database"
msgstr ""
@@ -3248,6 +3048,10 @@ msgstr ""
msgid "Meal"
msgstr ""
+#: nutrition/models/log.py:65
+msgid "Date and Time (Approx.)"
+msgstr ""
+
#: nutrition/models/meal.py:61
msgid "Time (approx)"
msgstr ""
@@ -3339,6 +3143,10 @@ msgid ""
"added to nutrition plans. You can access it on this address:"
msgstr ""
+#: nutrition/templates/ingredient/email_new.tpl:8
+msgid "Thank you for contributing and making this site better!"
+msgstr "Gràcies per ajudar a millorar aquest lloc web!"
+
#: nutrition/templates/ingredient/form.html:4
msgid "Submitting an ingredient"
msgstr ""
@@ -3363,6 +3171,10 @@ msgstr ""
msgid "No ingredients."
msgstr ""
+#: nutrition/templates/ingredient/overview.html:57
+msgid "Search"
+msgstr "Cerca"
+
#: nutrition/templates/ingredient/overview.html:66
msgid "ingredient name"
msgstr ""
@@ -3372,6 +3184,14 @@ msgstr ""
msgid "Add ingredient"
msgstr ""
+#: nutrition/templates/ingredient/overview.html:85
+msgid "Only registered users can do this"
+msgstr "Només els usuaris registrats poden fer això"
+
+#: nutrition/templates/ingredient/pending.html:14
+msgid "Submission date"
+msgstr "Data d'inserció"
+
#: nutrition/templates/ingredient/view.html:27
msgid "Ingredient is pending review"
msgstr ""
@@ -3384,6 +3204,18 @@ msgid ""
"the search."
msgstr ""
+#: nutrition/templates/ingredient/view.html:31
+msgid "Please select one of the options below."
+msgstr "Seleccioneu una de les opcions següents."
+
+#: nutrition/templates/ingredient/view.html:38
+msgid "Accept"
+msgstr "Accepta"
+
+#: nutrition/templates/ingredient/view.html:42
+msgid "Decline"
+msgstr "Refusa"
+
#: nutrition/templates/ingredient/view.html:71
#: nutrition/templates/log/detail.html:31
#: nutrition/templates/plan/view.html:229 nutrition/views/plan.py:376
@@ -3624,14 +3456,18 @@ msgid ""
"yourself for some weeks and change the total amount if needed."
msgstr ""
-#: nutrition/views/ingredient.py:181
+#: nutrition/views/ingredient.py:175
msgid "Add a new ingredient"
msgstr ""
-#: nutrition/views/ingredient.py:238
+#: nutrition/views/ingredient.py:232
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 ""
@@ -3846,29 +3682,29 @@ msgstr ""
msgid "100%% Free <br>and <br>Open Source"
msgstr ""
-#: utils/generic_views.py:261
+#: utils/generic_views.py:262
msgid "Yes, delete"
msgstr ""
-#: utils/models.py:47
+#: utils/models.py:48
msgid "Author"
msgstr ""
-#: utils/models.py:52
+#: utils/models.py:53
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:77
+#: utils/models.py:78
msgid "Pending"
msgstr ""
-#: utils/models.py:78
+#: utils/models.py:79
msgid "Accepted"
msgstr ""
-#: utils/models.py:79
+#: utils/models.py:80
msgid "Declined"
msgstr ""
@@ -4009,6 +3845,209 @@ msgstr ""
msgid "Delete weight entry for the %s"
msgstr ""
+#~ msgid "Ingredients"
+#~ msgstr "Ingredients"
+
+#~ msgid ""
+#~ "Use the configuration to select in what languages the\n"
+#~ "exercises and ingredients will be shown for the current language (for "
+#~ "example\n"
+#~ "the exercises should be shown in languages A, B and C; the ingredients "
+#~ "only\n"
+#~ "in A)."
+#~ msgstr ""
+#~ "Useu la configuració per a seleccionar en quines llengües es mostraran "
+#~ "els\n"
+#~ "exercicis i ingredients per a la llengua actual (p. e. els exercicis "
+#~ "s'han de mostrar\n"
+#~ "en les llengües A, B i C; els ingredients només en A."
+
+#~ msgctxt "as in sorted by category"
+#~ msgid "by category"
+#~ msgstr "per categoria"
+
+#~ msgctxt "as in sorted by muscle"
+#~ msgid "by muscle"
+#~ msgstr "per muscle"
+
+#~ msgctxt "as in sorted by equipment"
+#~ msgid "by equipment"
+#~ msgstr "per equipament"
+
+#~ msgid "Add new exercise"
+#~ msgstr "Afegeix un nou exercici"
+
+#~ msgid "Exercises pending review"
+#~ msgstr "Exercicis pendents de revisar"
+
+#~ msgid "Exercise was successfully added to the general database"
+#~ msgstr "L'exercici s'ha afegit amb èxit a la base de dades general"
+
+#~ msgid "New user submitted exercise"
+#~ msgstr "Nou exercici proposat per un usuari"
+
+#, python-brace-format
+#~ msgid "The user {0} submitted a new exercise \"{1}\"."
+#~ msgstr "L'usuari {0} ha proposat un nou exercici «{1}»."
+
+#~ msgid "New user submitted image"
+#~ msgstr "Nova imatge proposada per un usuari"
+
+#, python-brace-format
+#~ msgid "The user {0} submitted a new image \"{1}\" for exercise {2}."
+#~ msgstr ""
+#~ "L'usuari {0} ha proposat una nova imatge «{1}» per a l'exercici {2}."
+
+#~ msgid "Equipment overview"
+#~ msgstr "Vista general d'equipaments"
+
+#~ msgid "Main muscles"
+#~ msgstr "Músculs principals"
+
+#~ msgid ""
+#~ "No exercises for this equipment. Add or edit an exercise and set the "
+#~ "equipment."
+#~ msgstr ""
+#~ "No hi ha exercicis per a aquest equipament. Afegiu o editeu un exercici i "
+#~ "definiu-ne l'equipament."
+
+#~ msgid "exercise name"
+#~ msgstr "nom de l'exercici"
+
+#, python-format
+#~ msgid ""
+#~ "Your exercise '%(exercise)s' was successfully added to the general\n"
+#~ "database."
+#~ msgstr ""
+#~ "El vostre exercici «%(exercise)s» s'ha afegit a la base de dades\n"
+#~ "general amb èxit."
+
+#~ msgid ""
+#~ "It is now available on the exercise and muscle overview and can be\n"
+#~ "added to workouts. You can access it on this address:"
+#~ msgstr ""
+#~ "Ja està disponible a la vista general d'exercicis i la de músculs i es\n"
+#~ "pot afegir a entrenaments. Podeu accedir-hi amb aquesta adreça:"
+
+#~ msgid "Submitting an exercise"
+#~ msgstr "Proposeu un nou exercici"
+
+#~ msgid ""
+#~ "Thank you for submitting an exercise. This is much\n"
+#~ "appreciated!"
+#~ msgstr "Gràcies per proposar un nou exercici. Ho apreciem molt!"
+
+#~ msgid ""
+#~ "After you submit the form, the administrators will be notified.\n"
+#~ "Once it is reviewed, it will be added to the database. Till this "
+#~ "happens,\n"
+#~ "it will not be visible in the overview or the search. In case you added "
+#~ "your email\n"
+#~ "when you registered, you will get notified when the process is completed "
+#~ "successfully."
+#~ msgstr ""
+#~ "Quan envieu el formulari, l'administració rebrà un avís.\n"
+#~ "Un cop el revisin, l'afegiran a la base de dades. Fins llavors, no serà "
+#~ "visible\n"
+#~ "a la vista general ni a la cerca. Si vau afegir una adreça electrònica "
+#~ "quan us\n"
+#~ "vau registrar, rebreu un avís quan aquest procés es completi amb èxit."
+
+#~ msgid "Correcting an exercise"
+#~ msgstr "Corregint un exercici"
+
+#~ msgid ""
+#~ "Thank you for correcting and improving this exercise.\n"
+#~ "This is much appreciated!"
+#~ msgstr ""
+#~ "Gràcies per corregir i millorar aquest exercici.\n"
+#~ "Ho apreciem molt!"
+
+#~ msgid ""
+#~ "After you submit the form, the administrators will be notified.\n"
+#~ "Once the changes are reviewed the exercise will be updated."
+#~ msgstr ""
+#~ "Quan envieu el formulari, l'administració rebrà un avís.\n"
+#~ "Un cop els canvis s'hagin revisat, s'actualitzarà l'exercici."
+
+#~ msgid "No categories."
+#~ msgstr "Sense categories."
+
+#~ msgid "Use link to create one"
+#~ msgstr "Useu el vincle per a afegir-ne una"
+
+#~ msgid "Exercise is pending review"
+#~ msgstr "L'exercici està pendent de revisió"
+
+#~ msgid ""
+#~ "This user submitted exercise is pending a decision to be\n"
+#~ " included in the database."
+#~ msgstr ""
+#~ "Aquest exercici enviat per un usuari està pendent\n"
+#~ "d'una decisió per a ser inclòs a la base de dades."
+
+#~ msgid "Till then, it will not be shown in the overview or the search."
+#~ msgstr "Fins llavors, no es mostrarà a la vista general ni a la cerca."
+
+#~ msgid "Images"
+#~ msgstr "Imatges"
+
+#~ msgid "Add new image"
+#~ msgstr "Afegeix una nova imatge"
+
+#, fuzzy
+#~| msgid "Add new image"
+#~ msgid "Add new video"
+#~ msgstr "Afegeix una nova imatge"
+
+#~ msgid "Images pending review"
+#~ msgstr "Imatges pendents de revisió"
+
+#~ msgid "Comments for this exercise"
+#~ msgstr "Comentaris per a aquest exercici"
+
+#~ msgid "Add new comment"
+#~ msgstr "Afegeix un nou comentari"
+
+#~ msgid "The diagram shows the most used muscles on this exercise"
+#~ msgstr "El diagrama mostra els músculs més usats en aquest exercici"
+
+#~ msgid "Exercise Variations"
+#~ msgstr "Variacions de l'exercici"
+
+#~ msgid "Submit a correction"
+#~ msgstr "Envia una esmena"
+
+#~ msgid ""
+#~ "No exercises for this muscle. Add or edit an exercise and set the muscle."
+#~ msgstr ""
+#~ "No hi ha exercicis per a aquest múscul. Afegiu o editeu un exercici i "
+#~ "especifiqueu-l'hi."
+
+#~ msgid "Add exercise"
+#~ msgstr "Afegeix exercici"
+
+#~ 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à."
+
+#, python-brace-format
+#~ msgid "Correct {0}"
+#~ msgstr "Corregeix {0}"
+
+#~ msgid "Exercise was successfully marked as rejected"
+#~ msgstr "L'exercici s'ha marcat amb èxit com a refusat"
+
+#~ msgid "Edit exercise image"
+#~ msgstr "Edita imatge de l'exercici"
+
+#~ msgid "Delete exercise image?"
+#~ msgstr "Voleu esborrar la imatge de l'exercici?"
+
+#, python-format
+#~ msgid "Edit log entry for %s"
+#~ msgstr "Edita entrada del registre per a %s"
+
#, fuzzy
#~| msgid "In latin, e.g. \"Pectoralis major\""
#~ msgid "Pectoralis major"
diff --git a/wger/locale/cs/LC_MESSAGES/django.po b/wger/locale/cs/LC_MESSAGES/django.po
index ce231f392..1302b13e8 100644
--- a/wger/locale/cs/LC_MESSAGES/django.po
+++ b/wger/locale/cs/LC_MESSAGES/django.po
@@ -13,7 +13,7 @@ msgid ""
msgstr ""
"Project-Id-Version: wger Workout Manager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-14 12:01+0200\n"
+"POT-Creation-Date: 2022-11-10 16:03+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"
@@ -38,106 +38,8 @@ msgstr ""
"všem nově registrovaným uživatelům a uživatelům, kteří nemají posilovnu "
"zvolenou."
-#: 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 "Cviky"
-
-#: config/models/language_config.py:42
-msgid "Ingredients"
-msgstr "Potraviny"
-
-#: config/templates/language/overview.html:4 core/templates/navigation.html:226
-msgid "Languages"
-msgstr "Jazyky"
-
-#: config/templates/language/overview.html:16
-msgid "Nothing found."
-msgstr "Nic nenalezeno"
-
-#: 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:150
-#: nutrition/templates/plan/view.html:153
-#: nutrition/templates/plan/view.html:191
-msgid "Add one now."
-msgstr "Přidat nyní"
-
-#: config/templates/language/overview.html:29
-#: core/templates/license/list.html:38 core/templates/misc/license/list.html:41
-#: core/templates/repetition_unit/list.html:41
-#: core/templates/user/overview.html:327 core/templates/user/overview.html:366
-#: core/templates/user/overview.html:402
-#: core/templates/weight_unit/list.html:41 core/views/languages.py:73
-#: core/views/license.py:65 core/views/repetition_units.py:65
-#: core/views/weight_units.py:65
-#: exercises/templates/categories/admin-overview.html:36
-#: 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:61
-msgid "Add"
-msgstr "Přidat"
-
-#: config/templates/language/view.html:21 core/models/language.py:29
-msgid "Language short name"
-msgstr "Krátký název jazyka"
-
-#: config/templates/language/view.html:22
-#: config/templates/language/view.html:43 core/models/language.py:32
-msgid "Language full name"
-msgstr "Plný název jazyka"
-
-#: config/templates/language/view.html:34 core/templates/user/overview.html:451
-#: gym/views/admin_config.py:44 gym/views/admin_config.py:58
-#: gym/views/user_config.py:46
-msgid "Configuration"
-msgstr "Konfigurace"
-
-#: config/templates/language/view.html:35
-msgid ""
-"Use the configuration to select in what languages the\n"
-"exercises and ingredients will be shown for the current language (for "
-"example\n"
-"the exercises should be shown in languages A, B and C; the ingredients only\n"
-"in A)."
-msgstr ""
-"Uveďte v nastavení, jaké jazyky budou použity pro\n"
-"cviky a složky pro aktuální jazyk (například\n"
-"Cviky mají být uvedeny v jazycích A, B a C; pouze složky\n"
-"v A)."
-
-#: config/templates/language/view.html:44 gym/templates/contract/list.html:36
-msgid "Show"
-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: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:45
-msgid "Options"
-msgstr "Nastavení"
-
-#: config/templates/language/view.html:96 config/views/gym_config.py:41
-#: config/views/language_config.py:49 core/templates/license/list.html:16
-#: core/templates/misc/license/list.html:17
+#: config/views/gym_config.py:41 core/templates/language/view.html:57
+#: 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:39
#: core/templates/tags/render_day.html:75 core/templates/user/overview.html:205
@@ -145,12 +47,10 @@ 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:230
-#: exercises/templates/exercise/view.html:351
#: exercises/templates/muscles/admin-overview.html:16
-#: 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
+#: 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
#: 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
@@ -166,81 +66,54 @@ msgstr "Nastavení"
msgid "Edit"
msgstr "Upravit"
-#: 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: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: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
-#: gym/templates/contract_type/list.html:39 gym/templates/document/list.html:46
-#: gym/templates/gym/list.html:20 manager/templates/calendar/day.html:69
-#: 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:231
-#: 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:132
-#: nutrition/templates/units/list.html:20
-msgid "Delete"
-msgstr "Smazat"
-
-#: core/demo.py:86
+#: core/demo.py:95
msgid "Sample workout"
msgstr "Ukázkový trénink"
-#: core/demo.py:90
+#: core/demo.py:99
msgid "Sample day"
msgstr "Ukázkový den"
-#: core/demo.py:94
+#: core/demo.py:103
msgid "Another sample day"
msgstr "Další ukázkový den"
-#: core/demo.py:217
-msgid "Sample nutrional plan"
+#: core/demo.py:211
+#, fuzzy
+#| msgid "Sample nutrional plan"
+msgid "Sample nutritional plan"
msgstr "Ukázkový nutriční plán."
-#: core/demo.py:349 core/demo.py:351 core/demo.py:353
+#: core/demo.py:343 core/demo.py:345 core/demo.py:347
#, python-brace-format
msgid "Placeholder workout nr {0} for schedule"
msgstr "Ukázkový trénink č.{0} pro rozvrh"
-#: core/demo.py:358
+#: core/demo.py:352
msgid "My cool workout schedule"
msgstr "Můj suprový tréninkový rozvrh"
-#: core/demo.py:397 core/demo.py:412
+#: core/demo.py:391 core/demo.py:406
msgid "Empty placeholder schedule"
msgstr "Prázdný ukázkový rozvrh"
-#: core/forms.py:61 core/templates/navigation.html:188
-#: core/templates/navigation.html:192 core/templates/user/login.html:4
+#: core/forms.py:64 core/templates/navigation.html:179
+#: core/templates/navigation.html:183 core/templates/user/login.html:4
#: software/templates/features.html:43
msgid "Login"
msgstr "Přihlášení"
-#: core/forms.py:73 core/forms.py:164 gym/views/export.py:63
+#: core/forms.py:76 core/forms.py:177 gym/views/export.py:63
#: gym/views/gym.py:218
msgid "First name"
msgstr "Jméno"
-#: core/forms.py:74 core/forms.py:165 core/templates/user/overview.html:267
+#: core/forms.py:77 core/forms.py:178 core/templates/user/overview.html:267
#: gym/views/export.py:64 gym/views/gym.py:218
msgid "Last name"
msgstr "Příjmení"
-#: core/forms.py:76 core/forms.py:131 core/templates/user/overview.html:271
+#: core/forms.py:79 core/forms.py:144 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
@@ -250,83 +123,113 @@ msgstr "Příjmení"
msgid "Email"
msgstr "Email"
-#: core/forms.py:77
+#: core/forms.py:80
#, fuzzy
#| msgid "Used for password resets and, optionally, email reminders."
msgid "Used for password resets and, optionally, e-mail reminders."
msgstr "Je využíván k obnově hesla a případně k připomínkám pomocí emailu."
-#: core/forms.py:102
+#: core/forms.py:84 core/models/profile.py:220
+#: gym/templates/gym/new_user.html:38
+msgid "Date of Birth"
+msgstr "Datum narození"
+
+#: core/forms.py:116
msgid "Personal data"
msgstr "Osobní data"
-#: core/forms.py:110
+#: core/forms.py:124
msgid "Workout reminders"
msgstr "Připomenutí tréninku"
-#: core/forms.py:117
+#: core/forms.py:131
msgid "Other settings"
msgstr "Další nastavení"
-#: 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
+#: core/forms.py:138 core/views/user.py:615 core/views/user.py:630
+#: core/views/user.py:642 gym/forms.py:72 manager/templates/log/add.html:65
+#: manager/templates/set/add.html:69 manager/views/workout.py:222
+#: utils/generic_views.py:143
msgid "Save"
msgstr "Uložit"
-#: core/forms.py:132
+#: core/forms.py:145
msgid "Used for password resets and, optionally, email reminders."
msgstr "Je využíván k obnově hesla a případně k připomínkám pomocí emailu."
-#: core/forms.py:160
+#: core/forms.py:173
#, fuzzy
#| msgid "This email is already used."
msgid "This e-mail address is already in use."
msgstr "Tento email je již registrován."
-#: core/forms.py:180 gym/templates/gym/new_user.html:26
+#: core/forms.py:193 gym/templates/gym/new_user.html:26
#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:218
msgid "Password"
msgstr "Heslo"
-#: core/forms.py:182
+#: core/forms.py:195
msgid "Please enter your current password."
msgstr "Zadejte prosím vaše současné heslo."
-#: core/forms.py:200
+#: core/forms.py:204 core/templates/language/view.html:62
+#: 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: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/muscles/admin-overview.html:17
+#: gym/templates/admin_notes/list.html:40
+#: gym/templates/contract_option/list.html:39
+#: gym/templates/contract_type/list.html:39 gym/templates/document/list.html:46
+#: gym/templates/gym/list.html:20 manager/templates/calendar/day.html:69
+#: 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:231
+#: 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:132
+#: nutrition/templates/units/list.html:20
+msgid "Delete"
+msgstr "Smazat"
+
+#: core/forms.py:213
msgid "Invalid password"
msgstr "Chybné heslo"
-#: core/forms.py:212 core/forms.py:278
+#: core/forms.py:225 core/forms.py:291
#, fuzzy
#| msgid "Form is secured with reCaptcha"
msgid "The form is secured with reCAPTCHA"
msgstr "Zabezpečeno reCaptcha"
-#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:188
-#: core/templates/navigation.html:193 core/templates/template.html:149
-#: core/templates/user/login.html:20 core/views/user.py:293
+#: core/forms.py:239 core/forms.py:258 core/templates/navigation.html:179
+#: core/templates/navigation.html:184 core/templates/template.html:149
+#: core/templates/user/login.html:20 core/views/user.py:300
#: software/templates/features.html:38
msgid "Register"
msgstr "Registrace"
-#: core/forms.py:256
+#: core/forms.py:269
msgid "Contact"
msgstr "Kontakt"
-#: core/forms.py:257
+#: core/forms.py:270
#, fuzzy
#| msgid "Some way of answering you (email, etc.)"
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:71
+#: core/forms.py:278 exercises/models/comment.py:42 manager/models/set.py:60
+#: manager/models/setting.py:111 nutrition/models/log.py:71
msgid "Comment"
msgstr "Komentář"
-#: core/forms.py:266
+#: core/forms.py:279
msgid "What do you want to say?"
msgstr "Co cheš říci?"
@@ -334,6 +237,14 @@ msgstr "Co cheš říci?"
msgid "Day of the week"
msgstr "Den v týdnu"
+#: core/models/language.py:31 core/templates/language/view.html:21
+msgid "Language short name"
+msgstr "Krátký název jazyka"
+
+#: core/models/language.py:36 core/templates/language/view.html:22
+msgid "Language full name"
+msgstr "Plný název jazyka"
+
#: core/models/license.py:29
msgid "Full name"
msgstr "Plné jméno"
@@ -391,19 +302,19 @@ msgstr "Metrické (kilogramy)"
msgid "Imperial (pound)"
msgstr "Imperiální (libra)"
-#: core/models/profile.py:111
+#: core/models/profile.py:114
msgid "Show exercise comments"
msgstr "Zobrazit komentáře ke cviku."
-#: core/models/profile.py:112
+#: core/models/profile.py:115
msgid "Check to show exercise comments on the workout view"
msgstr "Podívejte se na komentáře ke cviku v zobrazení tréninku."
-#: core/models/profile.py:123
+#: core/models/profile.py:126
msgid "Also use ingredients in English"
msgstr "Použít také složky v Angličtině"
-#: core/models/profile.py:125
+#: core/models/profile.py:128
msgid ""
"Check to also show ingredients in English while creating\n"
"a nutritional plan. These ingredients are extracted from a list provided\n"
@@ -415,11 +326,11 @@ msgstr ""
"Ministerstva zemědělství USA. Tento seznam je velmi komplexní a \n"
"obsahuje přes 7000 položek, ale může to vést k těžšímu vyhledávání."
-#: core/models/profile.py:134
+#: core/models/profile.py:137
msgid "Activate workout reminders"
msgstr "Zapnout připomenutí tréninku."
-#: core/models/profile.py:136
+#: core/models/profile.py:139
msgid ""
"Check to activate automatic reminders for workouts. You need to provide a "
"valid email for this to work."
@@ -427,19 +338,19 @@ msgstr ""
"Zkontrolujte si, jestli máte zapnuté automatické připomenutí tréninku. Je "
"nutné mít zadaný platný email."
-#: core/models/profile.py:145
+#: core/models/profile.py:148
msgid "Remind before expiration"
msgstr "Připomenout před expirací"
-#: core/models/profile.py:146
+#: core/models/profile.py:149
msgid "The number of days you want to be reminded before a workout expires."
msgstr "Počet dní před expirací, kdy bude trénink připomenut."
-#: core/models/profile.py:152
+#: core/models/profile.py:155
msgid "Default duration of workouts"
msgstr "Základní délka tréninku"
-#: core/models/profile.py:154
+#: core/models/profile.py:157
msgid ""
"Default duration in weeks of workouts not in a schedule. Used for email "
"workout reminders."
@@ -447,11 +358,11 @@ msgstr ""
"Neníli nastavena běžná délka týdenního tréninku v rozvrhu. Bude použito "
"emailové připomenutí tréninku."
-#: core/models/profile.py:171
+#: core/models/profile.py:174
msgid "Notification language"
msgstr "Jazyk notifikací"
-#: core/models/profile.py:173
+#: core/models/profile.py:176
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."
@@ -460,70 +371,70 @@ msgstr ""
"připomenutí tréninku. Tohle nebude mít vliv na použitý jazyk na webové "
"stránce."
-#: core/models/profile.py:186 gym/views/export.py:66
+#: core/models/profile.py:212 gym/views/export.py:66
msgid "Age"
msgstr "Věk"
-#: core/models/profile.py:202 nutrition/forms.py:99
+#: core/models/profile.py:228 nutrition/forms.py:100
msgid "Height (cm)"
msgstr "Výška (cm)"
-#: core/models/profile.py:219
+#: core/models/profile.py:245
msgid "Hours of sleep"
msgstr "Spánek"
-#: core/models/profile.py:220
+#: core/models/profile.py:246
msgid "The average hours of sleep per day"
msgstr "Průměrné hodiny spánku za den."
-#: core/models/profile.py:229
+#: core/models/profile.py:255
msgid "Work"
msgstr "Práce"
-#: core/models/profile.py:230 core/models/profile.py:272
+#: core/models/profile.py:256 core/models/profile.py:298
msgid "Average hours per day"
msgstr "Průměrně hodin denně."
-#: core/models/profile.py:239 core/models/profile.py:260
-#: core/models/profile.py:281
+#: core/models/profile.py:265 core/models/profile.py:286
+#: core/models/profile.py:307
msgid "Physical intensity"
msgstr "Fyzická náročnost"
-#: core/models/profile.py:240 core/models/profile.py:261
-#: core/models/profile.py:282
+#: core/models/profile.py:266 core/models/profile.py:287
+#: core/models/profile.py:308
msgid "Approximately"
msgstr "Přibližně"
-#: core/models/profile.py:250
+#: core/models/profile.py:276
msgid "Sport"
msgstr "Sport"
-#: core/models/profile.py:251
+#: core/models/profile.py:277
msgid "Average hours per week"
msgstr "Průměrně hodin za týden."
-#: core/models/profile.py:271
+#: core/models/profile.py:297
msgid "Free time"
msgstr "Volný čas"
-#: core/models/profile.py:292 nutrition/templates/rate/form.html:66
+#: core/models/profile.py:318 nutrition/templates/rate/form.html:66
msgid "Total daily calories"
msgstr "Celkové denní kalorie"
-#: core/models/profile.py:293
+#: core/models/profile.py:319
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
+#: core/models/profile.py:331 nutrition/models/ingredient_weight_unit.py:45
#: nutrition/models/log.py:90 nutrition/models/meal_item.py:58
msgid "Weight unit"
msgstr "Jednotka váhy"
-#: core/models/profile.py:313
+#: core/models/profile.py:339
msgid "Allow external access"
msgstr "Povolit externí přístup"
-#: core/models/profile.py:315
+#: core/models/profile.py:341
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."
@@ -532,25 +443,24 @@ msgstr ""
"čtení. Je tžřeba nastavit, než budete moci sdílet odkazy, například na "
"sociální sítě."
-#: core/models/profile.py:324
+#: core/models/profile.py:350
msgid "Automatic reminders for weight entries"
msgstr "Automaticky připomenout zadání váhy"
-#: core/models/profile.py:326
+#: core/models/profile.py:352
msgid "Number of days after the last weight entry (enter 0 to deactivate)"
msgstr ""
"Počet dní, kdy má být připomenuto provedení vážení a zápisu hodnoty (pro "
"vypnutí napište 0 )"
-#: core/models/profile.py:392
+#: core/models/profile.py:418
msgid "The sum of all hours has to be 24"
msgstr "Součet všech hodin musí být 24"
#: core/models/rep_unit.py:35 core/models/weight_unit.py:35
-#: core/templates/user/overview.html:263 core/views/user.py:575
+#: core/templates/user/overview.html:263 core/views/user.py:591
#: 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
+#: exercises/models/exercise.py:64 exercises/models/muscle.py:36
#: 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
@@ -612,6 +522,53 @@ msgstr "Sdílet"
msgid "Are you sure you want to delete this? This action cannot be undone."
msgstr "Jsi si jistý, že to chceš smazat? Tuhle akci už nejde pak odvolat."
+#: core/templates/email_verification/confirm_template.html:4
+msgid "Email verified"
+msgstr ""
+
+#: core/templates/email_verification/confirm_template.html:18
+#, python-format
+msgid "%(username)s, your email was verified"
+msgstr ""
+
+#: core/templates/email_verification/confirm_template.html:22
+msgid "Error, invalid verification token"
+msgstr ""
+
+#: core/templates/email_verification/email_body_html.tpl:6
+#, fuzzy
+#| msgid "Configuration"
+msgid "Email Confirmation"
+msgstr "Konfigurace"
+
+#: core/templates/email_verification/email_body_html.tpl:9
+#: core/templates/email_verification/email_body_txt.tpl:3
+#, fuzzy, python-format
+#| msgid "Calendar for %(username)s"
+msgid "You are almost there, %(username)s!"
+msgstr "Kalendář uživatele %(username)s"
+
+#: core/templates/email_verification/email_body_html.tpl:11
+#, python-format
+msgid "Please click <a href=\"%(link)s\">here</a> to confirm your email"
+msgstr ""
+
+#: core/templates/email_verification/email_body_html.tpl:12
+#: core/templates/email_verification/email_body_txt.tpl:5
+#, python-format
+msgid "The token expires on %(time)s"
+msgstr ""
+
+#: core/templates/email_verification/email_body_html.tpl:14
+#: core/templates/email_verification/email_body_txt.tpl:8
+msgid "the wger Team"
+msgstr ""
+
+#: core/templates/email_verification/email_body_txt.tpl:4
+#, python-format
+msgid "Please click the following link to confirm your email: %(link)s"
+msgstr ""
+
#: core/templates/index.html:4
msgid "Dashboard"
msgstr "Nástěnka"
@@ -672,7 +629,7 @@ msgid "Add custom diary entry"
msgstr "Vložit vlastní záznam"
#: core/templates/index.html:84 core/templates/index.html:92
-#: manager/models/day.py:34 manager/models/log.py:56
+#: manager/models/day.py:34 manager/models/log.py:58
#: manager/models/session.py:60 manager/models/workout.py:109
#: manager/templates/schedule/view.html:105
#: manager/templates/workout/view.html:11
@@ -705,6 +662,20 @@ msgstr "Přidat nový záznam"
msgid "No workouts found."
msgstr "Žádný trénink"
+#: core/templates/index.html:137 core/templates/index.html:189
+#: core/templates/language/overview.html:23
+#: 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:150
+#: nutrition/templates/plan/view.html:153
+#: nutrition/templates/plan/view.html:191
+msgid "Add one now."
+msgstr "Přidat nyní"
+
#: 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
@@ -758,19 +729,59 @@ msgid "No nutrition plans."
msgstr "Žádný nutriční plán."
#: 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
+#: core/templates/user/overview.html:121 manager/forms.py:184
+#: manager/helpers.py:89 manager/models/log.py:86 manager/models/setting.py:79
+#: manager/templates/log/add.html:54 manager/templates/set/formset.html:11
#: weight/models.py:34 weight/templates/import_csv_preview.html:14
#: weight/templates/import_csv_preview.html:43 weight/views.py:150
msgid "Weight"
msgstr "Váha"
-#: core/templates/index.html:210 core/templates/navigation.html:135
+#: core/templates/index.html:210 core/templates/navigation.html:126
#: weight/views.py:70
msgid "Add weight entry"
msgstr "Zaznamenat váhu"
+#: core/templates/language/overview.html:4 core/templates/navigation.html:217
+msgid "Languages"
+msgstr "Jazyky"
+
+#: core/templates/language/overview.html:23
+msgid "Nothing found."
+msgstr "Nic nenalezeno"
+
+#: core/templates/language/overview.html:36 core/templates/license/list.html:38
+#: core/templates/misc/license/list.html:41
+#: core/templates/repetition_unit/list.html:41
+#: core/templates/user/overview.html:327 core/templates/user/overview.html:366
+#: core/templates/user/overview.html:402
+#: core/templates/weight_unit/list.html:41 core/views/languages.py:73
+#: core/views/license.py:65 core/views/repetition_units.py:65
+#: core/views/weight_units.py:65
+#: exercises/templates/categories/admin-overview.html:36
+#: 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:61
+msgid "Add"
+msgstr "Přidat"
+
+#: core/templates/language/view.html:52 core/templates/user/api_key.html:44
+#: core/templates/user/preferences.html:44 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:45
+msgid "Options"
+msgstr "Nastavení"
+
#: core/templates/license/list.html:4 core/templates/misc/license/list.html:4
msgid "License list"
msgstr "Seznam licencí"
@@ -783,7 +794,6 @@ msgstr "Seznam licencí"
#: core/templates/weight_unit/list.html:26
#: exercises/templates/categories/admin-overview.html:24
#: exercises/templates/equipment/admin-overview.html:24
-#: exercises/templates/exercise/pending.html:30
#: exercises/templates/muscles/admin-overview.html:24
#: gym/templates/admin_notes/list.html:52 gym/templates/contract/list.html:60
#: gym/templates/contract_option/list.html:56
@@ -869,155 +879,135 @@ msgstr "Tvé rozvrhy"
msgid "Public templates"
msgstr ""
-#: core/templates/navigation.html:64
-msgctxt "as in sorted by category"
-msgid "by category"
-msgstr "podle kategorie"
-
-#: core/templates/navigation.html:65
-msgctxt "as in sorted by muscle"
-msgid "by muscle"
-msgstr "podle svalu"
-
-#: core/templates/navigation.html:66
-msgctxt "as in sorted by equipment"
-msgid "by equipment"
-msgstr "podle nářadí"
+#: core/templates/navigation.html:63 manager/forms.py:133
+#: manager/models/setting.py:54
+msgid "Exercises"
+msgstr "Cviky"
-#: core/templates/navigation.html:70
-#: exercises/templates/equipment/overview.html:109
-#: exercises/templates/equipment/overview.html:113
-#: exercises/templates/exercise/overview.html:112
-#: exercises/templates/exercise/overview.html:116
-#: exercises/templates/muscles/overview.html:112
-#: exercises/templates/muscles/overview.html:116
-msgid "Add new exercise"
-msgstr "Přidat nový cvik"
-
-#: core/templates/navigation.html:75 core/templates/navigation.html:116
-#: core/templates/navigation.html:224
+#: core/templates/navigation.html:67 core/templates/navigation.html:107
+#: core/templates/navigation.html:215
msgid "Administration"
msgstr "Administrace"
-#: core/templates/navigation.html:76
-#: exercises/templates/exercise/pending.html:6
-msgid "Exercises pending review"
-msgstr "Cvik čeká na zkontrolování"
+#: core/templates/navigation.html:68
+#, fuzzy
+#| msgid "Exercise day"
+msgid "Exercise edit history"
+msgstr "Cvičební den"
-#: core/templates/navigation.html:77 exercises/models/base.py:72
-#: exercises/templates/exercise/view.html:80
+#: core/templates/navigation.html:69 exercises/models/base.py:84
msgid "Equipment"
msgstr "Nářadí"
-#: core/templates/navigation.html:78 exercises/templates/exercise/view.html:258
+#: core/templates/navigation.html:70
msgid "Muscles"
msgstr "Svaly"
-#: core/templates/navigation.html:79
+#: core/templates/navigation.html:71
#: exercises/templates/categories/admin-overview.html:4
msgid "Categories"
msgstr "Kategorie"
-#: core/templates/navigation.html:93 software/templates/features.html:87
+#: core/templates/navigation.html:84 software/templates/features.html:87
msgid "Nutrition"
msgstr "Výživa"
-#: core/templates/navigation.html:99 core/templates/user/overview.html:144
+#: core/templates/navigation.html:90 core/templates/user/overview.html:144
msgid "Nutrition plans"
msgstr "Nutriční plány"
-#: core/templates/navigation.html:105 nutrition/templates/bmi/form.html:50
+#: core/templates/navigation.html:96 nutrition/templates/bmi/form.html:50
msgid "BMI calculator"
msgstr "Kalkulačka BMI"
-#: core/templates/navigation.html:111 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:102 nutrition/templates/rate/form.html:17
msgid "Daily calories calculator"
msgstr "Kalkulačka denních kalorii"
-#: core/templates/navigation.html:113
+#: core/templates/navigation.html:104
#: nutrition/templates/ingredient/overview.html:29
msgid "Ingredient overview"
msgstr "Přehled jídel"
-#: core/templates/navigation.html:117 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:108 nutrition/templates/units/list.html:6
msgid "Ingredient weight units"
msgstr "Jednotka váhy položek"
-#: core/templates/navigation.html:118
+#: core/templates/navigation.html:109
#: nutrition/templates/ingredient/pending.html:6
msgid "Ingredients pending review"
msgstr "Potraviny čekající na kontrolu"
-#: core/templates/navigation.html:132
+#: core/templates/navigation.html:123
msgid "Body weight"
msgstr "Tělesná hmotnost"
-#: core/templates/navigation.html:134 core/templates/user/overview.html:114
+#: core/templates/navigation.html:125 core/templates/user/overview.html:114
#: weight/templates/overview.html:7
msgid "Weight overview"
msgstr "Přehled váhy"
-#: core/templates/navigation.html:147
+#: core/templates/navigation.html:138
msgid "About this software"
msgstr "O programu"
-#: core/templates/navigation.html:149 core/templates/template_features.html:82
+#: core/templates/navigation.html:140 core/templates/template_features.html:82
#: software/templates/about_us.html:5
msgid "About us"
msgstr "O nás"
-#: core/templates/navigation.html:151 software/templates/features.html:209
+#: core/templates/navigation.html:142 software/templates/features.html:209
msgid "REST API"
msgstr "REST API"
-#: core/templates/navigation.html:155 utils/models.py:40
+#: core/templates/navigation.html:146 utils/models.py:41
msgid "License"
msgstr "Licence"
-#: core/templates/navigation.html:161
+#: core/templates/navigation.html:152
msgid "Developer documentation"
msgstr "Dokumentace vývojáře"
-#: core/templates/navigation.html:167
+#: core/templates/navigation.html:158
msgid "Get the code"
msgstr "Získat kód."
-#: core/templates/navigation.html:173 core/templates/template.html:204
+#: core/templates/navigation.html:164 core/templates/template.html:203
#: core/templates/template_features.html:99
msgid "Translate"
msgstr "Překlad"
-#: core/templates/navigation.html:194 core/templates/user/login.html:28
+#: core/templates/navigation.html:185 core/templates/user/login.html:28
msgid "Reset password"
msgstr "Reset hesla"
-#: core/templates/navigation.html:207
+#: core/templates/navigation.html:198
msgid "My preferences"
msgstr "Má nastavení"
-#: core/templates/navigation.html:214
+#: core/templates/navigation.html:205
msgid "Logout"
msgstr "Odhlásit"
-#: core/templates/navigation.html:229
+#: core/templates/navigation.html:220
msgid "Licenses"
msgstr "Licence"
-#: core/templates/navigation.html:232
+#: core/templates/navigation.html:223
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr "Opakující jednotky"
-#: core/templates/navigation.html:235 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:226 core/templates/weight_unit/list.html:4
#: nutrition/templates/ingredient/view.html:174
msgid "Weight units"
msgstr "Jednotka hmostnosti"
-#: core/templates/navigation.html:238 core/templates/user/list.html:4
+#: core/templates/navigation.html:229 core/templates/user/list.html:4
msgid "User list"
msgstr "Uživatelský seznam"
-#: core/templates/navigation.html:239
+#: core/templates/navigation.html:230
msgid "Gyms"
msgstr "Posilovny"
@@ -1097,33 +1087,30 @@ msgstr "další"
msgid "Add weight log"
msgstr "Přidat záznam váhy"
-#: core/templates/tags/render_day.html:114
-#: exercises/templates/equipment/overview.html:59
-#: exercises/templates/exercise/overview.html:63
-#: exercises/templates/muscles/overview.html:65
+#: core/templates/tags/render_day.html:116
msgid "Placeholder image for exercise"
msgstr "Ukázkový obrázek pro cvik"
-#: core/templates/tags/render_day.html:131
+#: core/templates/tags/render_day.html:133
msgid "This exercise has no repetitions."
msgstr "Tento cvik je bez opakování"
-#: core/templates/tags/render_day.html:134
+#: core/templates/tags/render_day.html:136
msgid "Edit them now."
msgstr "Upravit je teď"
-#: core/templates/tags/render_day.html:159
+#: core/templates/tags/render_day.html:162
msgid "Add exercises to this workout day"
msgstr "Přidat k tomuto dni cviky"
#: core/templates/tags/render_weight_log.html:17 manager/helpers.py:89
-#: manager/models/setting.py:57 manager/templates/set/formset.html:10
+#: manager/models/setting.py:69 manager/templates/set/formset.html:9
msgid "Reps"
msgstr "Opakování"
-#: 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
+#: core/templates/tags/render_weight_log.html:30 manager/forms.py:189
+#: manager/models/log.py:103 manager/models/setting.py:99
+#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
msgid "RiR"
msgstr "RiR"
@@ -1146,7 +1133,7 @@ msgstr "Obecná pravidla."
msgid "Features"
msgstr "Funkce"
-#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:37
+#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:53
msgid "API key"
msgstr "API key"
@@ -1191,11 +1178,12 @@ msgid "Documentation"
msgstr "Dokumentace"
#: core/templates/user/delete_account.html:4
-#: core/templates/user/preferences.html:42
+#: core/templates/user/preferences.html:58
msgid "Delete account"
msgstr "Smazání účtu"
#: core/templates/user/delete_account.html:17
+#: exercises/templates/history/overview.html:93
msgid "Are you sure?"
msgstr "Jste si jistý?"
@@ -1244,11 +1232,12 @@ msgstr "Přidat trénink"
#: core/templates/user/overview.html:34 core/templates/user/overview.html:76
#: core/templates/user/overview.html:120 core/templates/user/overview.html: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
-#: 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
+#: exercises/models/base.py:99 exercises/models/base.py:104
+#: exercises/models/exercise.py:69 exercises/models/exercise.py:76
+#: gallery/models/image.py:47 manager/helpers.py:88 manager/models/log.py:100
+#: 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/views.py:150
@@ -1256,11 +1245,11 @@ msgid "Date"
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: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
+#: exercises/models/exercise.py:57 exercises/views/exercises.py:123
+#: 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 "Popis"
@@ -1268,12 +1257,12 @@ msgstr "Popis"
msgid "Number of logs (days)"
msgstr "Počet záznamů (za den)"
-#: core/templates/user/overview.html:37 core/views/user.py:576
+#: core/templates/user/overview.html:37 core/views/user.py:592
#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:157
msgid "Last activity"
msgstr "Poslední aktivita"
-#: core/templates/user/overview.html:68 manager/forms.py:267
+#: core/templates/user/overview.html:68 manager/forms.py:278
#: manager/templates/workout/view.html:151
msgid "Log"
msgstr "Záznam"
@@ -1291,6 +1280,7 @@ msgid "Notes"
msgstr "Poznámky"
#: core/templates/user/overview.html:79
+#: exercises/templates/history/overview.html:30
#: manager/templates/calendar/partial_overview_table.html:42
#: nutrition/templates/log/detail.html:154
msgid "Time"
@@ -1338,10 +1328,12 @@ msgid "Do you really want to change this user&#39;s password?"
msgstr "Opravdu chcete změnit těmto uživatelům&#39;s hesla?"
#: core/templates/user/overview.html:233
+#: exercises/templates/history/overview.html:106
msgid "No"
msgstr "Ne"
#: core/templates/user/overview.html:234
+#: exercises/templates/history/overview.html:99
msgid "Yes"
msgstr "Ano"
@@ -1396,10 +1388,15 @@ msgid "Documents"
msgstr "Dokumenty"
#: core/templates/user/overview.html:413 gym/templates/document/list.html:32
-#: manager/forms.py:279 manager/templates/workout/view.html:176
+#: manager/forms.py:290 manager/templates/workout/view.html:176
msgid "Download"
msgstr "Stáhnout"
+#: core/templates/user/overview.html:451 gym/views/admin_config.py:44
+#: gym/views/admin_config.py:58 gym/views/user_config.py:46
+msgid "Configuration"
+msgstr "Konfigurace"
+
#: core/templates/user/overview.html:454 gym/models/user_config.py:92
msgid "Include in inactive overview"
msgstr "Zahrnout v přehledu neaktivních"
@@ -1417,7 +1414,25 @@ msgstr "Přihlásit se jako tento uživatel"
msgid "Preferences"
msgstr "Nastavení"
-#: core/templates/user/preferences.html:33 core/views/user.py:587
+#: core/templates/user/preferences.html:19
+#, fuzzy
+#| msgid "Send emails"
+msgid "Verified email"
+msgstr "Odeslat emaily"
+
+#: core/templates/user/preferences.html:24
+msgid "Unverified email"
+msgstr ""
+
+#: core/templates/user/preferences.html:26
+msgid "Send verification email"
+msgstr ""
+
+#: core/templates/user/preferences.html:30
+msgid "You need to verify your email to contribute exercises"
+msgstr ""
+
+#: core/templates/user/preferences.html:49 core/views/user.py:603
msgid "Change password"
msgstr "Změna hesla"
@@ -1447,39 +1462,37 @@ msgid "oz"
msgstr "oz"
#: 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
+#: exercises/views/equipment.py:104 exercises/views/exercises.py:185
+#: exercises/views/muscles.py:99 manager/views/schedule.py:311
+#: manager/views/schedule_step.py:129 manager/views/workout.py:269
+#: manager/views/workout_session.py:141 nutrition/views/ingredient.py:138
#: 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:431
-#: exercises/views/muscles.py:125 gallery/views/images.py:121
+#: exercises/views/categories.py:127 exercises/views/exercises.py:193
+#: exercises/views/muscles.py:106 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
+#: manager/views/workout.py:273 manager/views/workout_session.py:156
+#: nutrition/views/ingredient.py:145 nutrition/views/plan.py:127
#: nutrition/views/unit.py:118
#, python-brace-format
msgid "Delete {0}?"
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/repetition_units.py:85 core/views/user.py:472
#: 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: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
+#: exercises/views/equipment.py:81 exercises/views/muscles.py:86
+#: 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:170
+#: gym/views/gym.py:459 manager/views/day.py:100 manager/views/schedule.py:335
+#: manager/views/workout.py:287 nutrition/views/ingredient.py:164
+#: nutrition/views/plan.py:144 nutrition/views/unit.py:144
#, python-brace-format
msgid "Edit {0}"
msgstr "Upravit {0}"
@@ -1510,64 +1523,65 @@ msgstr "Zaslat"
msgid "Your feedback was successfully sent. Thank you!"
msgstr "Vaše zpětná vazba byla zaslána. Děkujeme."
-#: core/views/user.py:156
+#: core/views/user.py:157
#, python-brace-format
msgid "Account \"{0}\" was successfully deleted"
msgstr "Účet \"{0}\" byl smazán"
-#: core/views/user.py:287
+#: core/views/user.py:294
msgid "You were successfully registered"
msgstr "Byl jste úspěšně zaregistrován"
-#: core/views/user.py:339
+#: core/views/user.py:355
msgid "Settings successfully updated"
msgstr "Nastavení bylo aktualizováno"
-#: core/views/user.py:376
+#: core/views/user.py:392
msgid "The user was successfully deactivated"
msgstr "Uživatel byl deaktivován"
-#: core/views/user.py:411
+#: core/views/user.py:427
msgid "The user was successfully activated"
msgstr "Uživatel byl aktivován"
-#: core/views/user.py:426
+#: core/views/user.py:442
msgid "Edit user"
msgstr "Upravit uživatele"
-#: core/views/user.py:573 gym/templates/gym/member_list.html:26
+#: core/views/user.py:589 gym/templates/gym/member_list.html:26
#: gym/views/gym.py:156
msgid "ID"
msgstr "ID"
-#: core/views/user.py:574 gym/forms.py:94 gym/templates/contract/view.html:55
+#: core/views/user.py:590 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 "Uživatel"
-#: core/views/user.py:577 gym/templates/gym/new_user.html:34
+#: core/views/user.py:593 gym/templates/gym/new_user.html:34
#: gym/views/export.py:60 gym/views/gym.py:218
msgid "Gym"
msgstr "Posilovna"
-#: exercises/models/base.py:51 exercises/templates/exercise/view.html:76
-#: nutrition/models/ingredient.py:204
+#: core/views/user.py:652
+#, python-format
+msgid "A verification email was sent to %(email)s"
+msgstr ""
+
+#: exercises/models/base.py:63 nutrition/models/ingredient.py:204
msgid "Category"
msgstr "Kategorie"
-#: exercises/models/base.py:58
+#: exercises/models/base.py:70
msgid "Primary muscles"
msgstr "Hlavní svaly"
-#: exercises/models/base.py:64 exercises/templates/equipment/overview.html:71
-#: exercises/templates/exercise/overview.html:76
-#: exercises/templates/exercise/view.html:268
-#: exercises/templates/muscles/overview.html:77
+#: exercises/models/base.py:76
msgid "Secondary muscles"
msgstr "Vedlejší svaly"
-#: exercises/models/base.py:79
+#: exercises/models/base.py:91
msgid "Variations"
msgstr "Variace"
@@ -1575,75 +1589,62 @@ msgstr "Variace"
msgid "Exercise Categories"
msgstr "Kategorie cviků"
-#: exercises/models/comment.py:34 exercises/models/exercise_alias.py:32
-#: exercises/models/image.py:75 exercises/models/video.py:82
-#: manager/forms.py:165 manager/helpers.py:89 manager/models/log.py:51
+#: exercises/models/comment.py:37 exercises/models/exercise_alias.py:35
+#: exercises/models/image.py:71 exercises/models/video.py:95
+#: manager/forms.py:176 manager/helpers.py:89 manager/models/log.py:52
msgid "Exercise"
msgstr "Cvik"
-#: exercises/models/comment.py:41
+#: exercises/models/comment.py:43
msgid "A comment about how to correctly do this exercise."
msgstr "Komentář o tom, jak správně provést tento cvik"
-#: exercises/models/exercise.py:86 nutrition/models/ingredient.py:80
+#: exercises/models/exercise.py:81 nutrition/models/ingredient.py:80
#: nutrition/models/plan.py:61 nutrition/models/weight_unit.py:32
msgid "Language"
msgstr "Jazyk"
-#: 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:265
-msgid "New user submitted exercise"
-msgstr "Uživatel zaslal nový cvik"
-
-#: 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/exercise_alias.py:35
+#: exercises/models/exercise_alias.py:38
#, fuzzy
#| msgid "Correcting an exercise"
msgid "Alias for an exercise"
msgstr "Oprava cviku"
-#: exercises/models/image.py:59
+#: exercises/models/image.py:55
msgid "Line"
msgstr ""
-#: exercises/models/image.py:60
+#: exercises/models/image.py:56
msgid "3D"
msgstr ""
-#: exercises/models/image.py:61
+#: exercises/models/image.py:57
msgid "Low-poly"
msgstr ""
-#: exercises/models/image.py:62
+#: exercises/models/image.py:58
msgid "Photo"
msgstr ""
-#: exercises/models/image.py:63
+#: exercises/models/image.py:59
#, fuzzy
#| msgid "Others"
msgid "Other"
msgstr "Další"
-#: exercises/models/image.py:81 gallery/models/image.py:56
+#: exercises/models/image.py:77 gallery/models/image.py:56
msgid "Image"
msgstr "Obrázek"
-#: exercises/models/image.py:82 gallery/models/image.py:57
+#: exercises/models/image.py:78 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:88
+#: exercises/models/image.py:84
msgid "Main picture"
msgstr "Hlavní obrázek"
-#: exercises/models/image.py:91
+#: exercises/models/image.py:87
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 "
@@ -1653,19 +1654,10 @@ msgstr ""
"(například se zobrazí při hledání). Hlavní obrázek bude automaticky "
"zvýrazněn systémem."
-#: exercises/models/image.py:100
+#: exercises/models/image.py:96
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: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}."
-
#: exercises/models/muscle.py:37
msgid "In latin, e.g. \"Pectoralis major\""
msgstr "v latině, např. \"Pectoralis major\""
@@ -1680,55 +1672,56 @@ msgstr "jméno cviku"
msgid "A more basic name for the muscle"
msgstr ""
-#: exercises/models/video.py:41
-msgid "Maximum file size is 100MB."
+#: exercises/models/video.py:50
+#, python-format
+msgid "Maximum file size is %(size)sMB."
msgstr ""
-#: exercises/models/video.py:44 exercises/models/video.py:48
+#: exercises/models/video.py:57 exercises/models/video.py:65
msgid "File type is not supported"
msgstr ""
-#: exercises/models/video.py:57
+#: exercises/models/video.py:70
#, 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
+#: exercises/models/video.py:101
#, fuzzy
#| msgid "Main picture"
msgid "Main video"
msgstr "Hlavní obrázek"
-#: exercises/models/video.py:94
+#: exercises/models/video.py:107
msgid "Video"
msgstr ""
-#: exercises/models/video.py:101
+#: exercises/models/video.py:114
msgid "Size"
msgstr ""
-#: exercises/models/video.py:108 manager/models/schedule_step.py:56
+#: exercises/models/video.py:121 manager/models/schedule_step.py:56
msgid "Duration"
msgstr "Trvání"
-#: exercises/models/video.py:117
+#: exercises/models/video.py:130
msgid "Width"
msgstr ""
-#: exercises/models/video.py:124
+#: exercises/models/video.py:137
#, fuzzy
#| msgid "Weight"
msgid "Height"
msgstr "Váha"
-#: exercises/models/video.py:131
+#: exercises/models/video.py:144
#, fuzzy
#| msgid "Code"
msgid "Codec"
msgstr "Kód"
-#: exercises/models/video.py:139
+#: exercises/models/video.py:152
msgid "Codec, long name"
msgstr ""
@@ -1737,135 +1730,23 @@ msgid "Equipment list"
msgstr "Seznam nářadí"
#: exercises/templates/equipment/admin-overview.html:37
-#: exercises/views/equipment.py:94
+#: exercises/views/equipment.py:92
msgid "Add new equipment"
msgstr "Přidat nové nářadí"
-#: exercises/templates/equipment/overview.html:11
-msgid "Equipment overview"
-msgstr "Přehled přístrojů"
-
-#: exercises/templates/equipment/overview.html:69
-#: exercises/templates/exercise/overview.html:74
-#: exercises/templates/exercise/view.html:264
-#: exercises/templates/muscles/overview.html:75
-msgid "Main muscles"
-msgstr "Hlavní svaly"
-
-#: exercises/templates/equipment/overview.html:79
-msgid ""
-"No exercises for this equipment. Add or edit an exercise and set the "
-"equipment."
-msgstr ""
-"Pro nářadí nejsou dostupné cviky. Přidejte, nebo upravte cvik a zvolte "
-"nářadí, které se má použít."
-
-#: exercises/templates/equipment/overview.html:96
-#: exercises/templates/exercise/overview.html:99
-#: nutrition/templates/ingredient/overview.html:57
-msgid "Search"
-msgstr "Vyhledat"
-
-#: exercises/templates/equipment/overview.html:101
-#: exercises/templates/exercise/overview.html:104
-msgid "exercise name"
-msgstr "jméno cviku"
-
-#: exercises/templates/equipment/overview.html:115
-#: exercises/templates/exercise/overview.html:118
-#: exercises/templates/muscles/overview.html:118
-#: nutrition/templates/ingredient/overview.html:85
-msgid "Only registered users can do this"
-msgstr "Tohle je jen pro registrované uživatele"
-
-#: exercises/templates/exercise/email_new.tpl:1
-#, python-format
-msgid ""
-"Your exercise '%(exercise)s' was successfully added to the general\n"
-"database."
-msgstr ""
-"Váš cvik '%(exercise)s' byl přidán do základní\n"
-"databáze."
-
-#: exercises/templates/exercise/email_new.tpl:4
-msgid ""
-"It is now available on the exercise and muscle overview and can be\n"
-"added to workouts. You can access it on this address:"
-msgstr ""
-"Nyní je dostupný v seznamu cviků a svalů a může být\n"
-"přidán do tréninku. Můžete si jej probéhldnout na adrese:"
-
-#: exercises/templates/exercise/email_new.tpl:8
-#: nutrition/templates/ingredient/email_new.tpl:8
-msgid "Thank you for contributing and making this site better!"
-msgstr "Děkujeme vám za příspěvek, který umožní vylepšit tuto stránku!"
-
-#: exercises/templates/exercise/email_new.tpl:9
-#: manager/templates/workout/email_reminder.tpl:15
-#: manager/templates/workout/email_weight_reminder.tpl:12
-#: nutrition/templates/ingredient/email_new.tpl:9
-#, python-format
-msgid "The %(site)s team"
-msgstr "Tým stránky %(site)s"
-
-#: exercises/templates/exercise/form.html:4
-msgid "Submitting an exercise"
-msgstr "Vložit cvik"
-
-#: exercises/templates/exercise/form.html:5
-msgid ""
-"Thank you for submitting an exercise. This is much\n"
-"appreciated!"
-msgstr "Děkujeme že jste vložili cvik. Vážíme si toho!"
-
-#: exercises/templates/exercise/form.html:8
-msgid ""
-"After you submit the form, the administrators will be notified.\n"
-"Once it is reviewed, it will be added to the database. Till this happens,\n"
-"it will not be visible in the overview or the search. In case you added your "
-"email\n"
-"when you registered, you will get notified when the process is completed "
-"successfully."
-msgstr ""
-"Po odeslání formuláře budou administrátoři upozorněni.\n"
-"Následně dojde ke kontrole údajů a případně k přidání do databáze. Než se "
-"tak stane\n"
-"nebude viditelný v přehledu a ve vyhledávání. V případě, že jste přidali při "
-"registraci\n"
-"email, budete o dokončení informováni."
-
-#: exercises/templates/exercise/form_correct.html:4
-msgid "Correcting an exercise"
-msgstr "Oprava cviku"
-
-#: exercises/templates/exercise/form_correct.html:5
-msgid ""
-"Thank you for correcting and improving this exercise.\n"
-"This is much appreciated!"
-msgstr "Děkujeme za kontrolu a opravu tohoto cviku. Vážíme si toho!"
-
-#: exercises/templates/exercise/form_correct.html:8
-msgid ""
-"After you submit the form, the administrators will be notified.\n"
-"Once the changes are reviewed the exercise will be updated."
-msgstr ""
-"Po odeslání formuláře, budou administrátoři upozorněni.\n"
-"Jakmile dojde ke kontrole změny, dojde k aktualizaci."
-
-#: exercises/templates/exercise/overview.html:88
-msgid "No categories."
-msgstr "Bez kategorie"
-
-#: exercises/templates/exercise/overview.html:88
-msgid "Use link to create one"
-msgstr "Pro vytvoření použijte odkaz."
+#: exercises/templates/history/overview.html:11
+#, fuzzy
+#| msgid "Exercise day"
+msgid "Exercise admin history"
+msgstr "Cvičební den"
-#: exercises/templates/exercise/pending.html:14
-#: nutrition/templates/ingredient/pending.html:14
-msgid "Submission date"
-msgstr "Datum zaslání"
+#: exercises/templates/history/overview.html:27
+#, fuzzy
+#| msgid "Actions"
+msgid "Action"
+msgstr "Akce"
-#: exercises/templates/exercise/pending.html:16 gallery/models/image.py:51
+#: exercises/templates/history/overview.html:28 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/log.py:45
@@ -1876,103 +1757,47 @@ msgstr "Datum zaslání"
msgid "User"
msgstr "Uživatel"
-#: exercises/templates/exercise/view.html:48
-msgid "Exercise is pending review"
-msgstr "Cvik čeká na zkontrolování"
-
-#: exercises/templates/exercise/view.html:51
-msgid ""
-"This user submitted exercise is pending a decision to be\n"
-" included in the database."
-msgstr ""
-"Uživatel předložil cvik, a čeká se na rozhodnutí jestli má být zahrnut v "
-"databázi."
-
-#: exercises/templates/exercise/view.html:53
-msgid "Till then, it will not be shown in the overview or the search."
-msgstr "Do té doby nebude uveden v přehledu, nebo ve vyhledávání."
-
-#: exercises/templates/exercise/view.html:54
-#: nutrition/templates/ingredient/view.html:31
-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:203
-#: nutrition/templates/ingredient/view.html:38
-msgid "Accept"
-msgstr "Povolit"
-
-#: exercises/templates/exercise/view.html:64
-#: exercises/templates/exercise/view.html:204
-#: nutrition/templates/ingredient/view.html:42
-msgid "Decline"
-msgstr "Zamítnout"
+#: exercises/templates/history/overview.html:29
+#, fuzzy
+#| msgctxt "As in \"email subject\""
+#| msgid "Subject"
+msgid "Object"
+msgstr "Předmět"
-#: exercises/templates/exercise/view.html:96
-msgid "Images"
-msgstr "Obrázky"
+#: exercises/templates/history/overview.html:31
+#, fuzzy
+#| msgctxt "Noun, not verb"
+#| msgid "Change"
+msgid "Changes"
+msgstr "Změna"
-#: exercises/templates/exercise/view.html:137 exercises/views/images.py:93
-msgid "Add new image"
-msgstr "Přidat nový obrázek"
+#: exercises/templates/history/overview.html:32
+msgid "Revert"
+msgstr ""
-#: exercises/templates/exercise/view.html:148
-msgid "Videos"
+#: exercises/templates/history/overview.html:64
+msgid "View Object"
msgstr ""
-#: exercises/templates/exercise/view.html:187 exercises/views/videos.py:94
+#: exercises/templates/history/overview.html:75
#, 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:218
-msgid "Comments for this exercise"
-msgstr "Komentáře pro tento cvik"
-
-#: exercises/templates/exercise/view.html:246
-msgid "Add new comment"
-msgstr "Přidat nový komentář"
-
-#: 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: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:306
-msgid "Exercise Variations"
-msgstr "Variace cvičení"
+#| msgid "View logs"
+msgid "View changes"
+msgstr "Zobrazit záznamy"
-#: exercises/templates/exercise/view.html:327
-msgid "Submit a correction"
-msgstr "Zaslat opravu"
+#: exercises/templates/history/overview.html:86
+msgid "Revert changes"
+msgstr ""
#: exercises/templates/muscles/admin-overview.html:4
-#: exercises/templates/muscles/overview.html:7
msgid "Muscle overview"
msgstr "Přehled svalů"
#: exercises/templates/muscles/admin-overview.html:36
-#: exercises/views/muscles.py:86
+#: exercises/views/muscles.py:67
msgid "Add muscle"
msgstr "Přidat sval"
-#: exercises/templates/muscles/overview.html:85
-msgid ""
-"No exercises for this muscle. Add or edit an exercise and set the muscle."
-msgstr ""
-"Pro tento sval není nastavený žádný cvik. Přidejte, nebo upravte cvik a "
-"nastavte mu i sval."
-
#: exercises/views/categories.py:71
msgid "Add category"
msgstr "Přidat kategorie"
@@ -1985,52 +1810,24 @@ msgstr "Budou také smazány všechny cviky v této kategorii."
msgid "Add exercise comment"
msgstr "Přidat komentář ke cviku"
-#: exercises/views/equipment.py:107 exercises/views/equipment.py:118
+#: exercises/views/equipment.py:105 exercises/views/equipment.py:116
msgid "Delete equipment?"
msgstr "Smazat nářadí?"
-#: exercises/views/exercises.py:229
-#, python-format
-msgid ""
-"%(name_original)s is too similar to existing exercise \"%(exercise_name)s\""
+#: exercises/views/exercises.py:161
+#, fuzzy, python-format
+#| msgid ""
+#| "%(name_original)s is too similar to existing exercise "
+#| "\"%(exercise_name)s\""
+msgid "%(name)s is too similar to existing exercise \"%(exercise_name)s\""
msgstr ""
"%(name_original)sje příliš podobné již existujícímu cvičení "
"\"%(exercise_name)s\""
-#: exercises/views/exercises.py:247
-msgid "Add exercise"
-msgstr "Přidat cvik"
-
-#: 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:380
-#, python-brace-format
-msgid "Correct {0}"
-msgstr "Správné {0}"
-
-#: exercises/views/exercises.py:422
+#: exercises/views/exercises.py:184
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:474
-msgid "Exercise was successfully marked as rejected"
-msgstr "Cvik byl označen jako zamítnutý"
-
-#: exercises/views/images.py:68
-msgid "Edit exercise image"
-msgstr "Upravit obrázek cviku"
-
-#: exercises/views/images.py:143
-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"
@@ -2099,7 +1896,7 @@ 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:59
+#: manager/templates/log/add.html:52 nutrition/forms.py:60
#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:102
#: nutrition/models/meal_item.py:72
msgid "Amount"
@@ -2202,6 +1999,10 @@ msgstr "Bude použit název souboru, pokud neuvedete jinak"
msgid "User notes"
msgstr "Uživatelské poznámky"
+#: gym/templates/contract/list.html:36
+msgid "Show"
+msgstr "Zobrazit"
+
#: gym/templates/contract/view.html:4
msgid "Contract"
msgstr "Zakázka"
@@ -2282,10 +2083,6 @@ msgstr "Emaily"
msgid "Add member"
msgstr "Přidat uživatele"
-#: gym/templates/gym/new_user.html:38
-msgid "Date of Birth"
-msgstr "Datum narození"
-
#: gym/templates/gym/new_user.html:48 manager/templates/calendar/month.html:144
#: manager/templates/log/add.html:75 nutrition/templates/rate/form.html:120
msgid "Info"
@@ -2348,132 +2145,132 @@ msgstr "Přidat uživatele do posilovny"
msgid "Edit gym"
msgstr "Upravit posilovnu"
-#: i18n.tpl:2 i18n.tpl:28
+#: i18n.tpl:2
+msgid "Until Failure"
+msgstr "Do Selhání"
+
+#: i18n.tpl:3 manager/forms.py:180 manager/models/log.py:73
+#: manager/templates/set/add.html:53
+msgid "Repetitions"
+msgstr "Opakování"
+
+#: i18n.tpl:4
msgid "Abs"
msgstr "Břicho"
-#: i18n.tpl:3
+#: i18n.tpl:5
msgid "Arms"
msgstr "Paže"
-#: i18n.tpl:4
-msgid "Back"
-msgstr "Záda"
-
-#: i18n.tpl:5 i18n.tpl:23
-msgid "Calves"
-msgstr "Lýtko"
-
-#: i18n.tpl:6 i18n.tpl:26
-msgid "Chest"
-msgstr "Prsa"
-
-#: i18n.tpl:7
+#: i18n.tpl:6
msgid "Legs"
msgstr "Nohy"
-#: i18n.tpl:8 i18n.tpl:19
-msgid "Shoulders"
-msgstr "Ramena"
+#: i18n.tpl:7
+msgid "Dumbbell"
+msgstr "Jednoruční činka"
+
+#: i18n.tpl:8
+#, fuzzy
+#| msgid "Biceps brachii"
+msgid "Biceps"
+msgstr "Dvouhlasý sval pažní"
#: i18n.tpl:9
-msgid "Barbell"
-msgstr "Vzpěračská činka"
+msgid "SZ-Bar"
+msgstr "SZ-Bar"
#: i18n.tpl:10
-msgid "Bench"
-msgstr "Lavice"
+msgid "Kettlebell"
+msgstr "Kettlebell"
#: i18n.tpl:11
-msgid "Dumbbell"
-msgstr "Jednoruční činka"
+msgid "Swiss Ball"
+msgstr "Gymnastický míč"
#: i18n.tpl:12
-msgid "Gym mat"
-msgstr "Gymnastická podložka"
+msgid "none (bodyweight exercise)"
+msgstr "nic (cvičení s tělesnou váhou)"
#: i18n.tpl:13
-msgid "Incline bench"
-msgstr "Šikmá lavice"
+msgid "Calves"
+msgstr "Lýtko"
#: i18n.tpl:14
-msgid "Kettlebell"
-msgstr "Kettlebell"
+msgid "Back"
+msgstr "Záda"
#: i18n.tpl:15
-msgid "Pull-up bar"
-msgstr "Hrazda"
+msgid "Lower back"
+msgstr ""
#: i18n.tpl:16
-msgid "SZ-Bar"
-msgstr "SZ-Bar"
+msgid "Lats"
+msgstr ""
#: i18n.tpl:17
-msgid "Swiss Ball"
-msgstr "Gymnastický míč"
+msgid "Hamstrings"
+msgstr ""
#: i18n.tpl:18
-msgid "none (bodyweight exercise)"
-msgstr "nic (cvičení s tělesnou váhou)"
+msgid "Bench"
+msgstr "Lavice"
-#: i18n.tpl:20
+#: i18n.tpl:19
#, fuzzy
-#| msgid "Biceps brachii"
-msgid "Biceps"
-msgstr "Dvouhlasý sval pažní"
+#| msgid "Minutes"
+msgid "Glutes"
+msgstr "Minuty"
+
+#: i18n.tpl:20
+msgid "Kilometers"
+msgstr "Kilometry"
#: i18n.tpl:21
-msgid "Hamstrings"
-msgstr ""
+msgid "Shoulders"
+msgstr "Ramena"
#: i18n.tpl:22
-msgid "Lower back"
-msgstr ""
+msgid "Seconds"
+msgstr "Sekundy"
+
+#: i18n.tpl:23
+msgid "Miles"
+msgstr "Míle"
#: i18n.tpl:24
-#, fuzzy
-#| msgid "Minutes"
-msgid "Glutes"
-msgstr "Minuty"
+msgid "Incline bench"
+msgstr "Šikmá lavice"
#: i18n.tpl:25
-msgid "Lats"
+msgid "Quads"
msgstr ""
+#: i18n.tpl:26
+msgid "Minutes"
+msgstr "Minuty"
+
#: i18n.tpl:27
-msgid "Quads"
-msgstr ""
+msgid "Chest"
+msgstr "Prsa"
+
+#: i18n.tpl:28
+msgid "Gym mat"
+msgstr "Gymnastická podložka"
#: i18n.tpl:29
-#, fuzzy
-#| msgid "Triceps brachii"
-msgid "Triceps"
-msgstr "Trojhlavý sval pažní"
+msgid "Pull-up bar"
+msgstr "Hrazda"
#: i18n.tpl:30
-msgid "Kilometers"
-msgstr "Kilometry"
+msgid "Barbell"
+msgstr "Vzpěračská činka"
#: i18n.tpl:31
-msgid "Miles"
-msgstr "Míle"
-
-#: i18n.tpl:32
-msgid "Minutes"
-msgstr "Minuty"
-
-#: i18n.tpl:33 manager/forms.py:169 manager/models/log.py:71
-#: manager/templates/set/add.html:53
-msgid "Repetitions"
-msgstr "Opakování"
-
-#: i18n.tpl:34
-msgid "Seconds"
-msgstr "Sekundy"
-
-#: i18n.tpl:35
-msgid "Until Failure"
-msgstr "Do Selhání"
+#, fuzzy
+#| msgid "Triceps brachii"
+msgid "Triceps"
+msgstr "Trojhlavý sval pažní"
#: mailer/forms.py:34 mailer/templates/mailer/gym/preview.html:32
msgctxt "As in \"email subject\""
@@ -2528,13 +2325,13 @@ msgstr "Odeslat emaily"
msgid "Correction"
msgstr "Oprava"
-#: manager/forms.py:89 manager/models/workout.py:59
+#: manager/forms.py:92 manager/models/workout.py:59
#, fuzzy
#| msgid "Make a copy of this workout"
msgid "The name of the workout"
msgstr "Vytvořit kopii tohoto tréninku"
-#: manager/forms.py:93 manager/models/workout.py:66
+#: manager/forms.py:96 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'."
@@ -2542,35 +2339,35 @@ msgstr ""
"Krátký popis cíle tréninku. Například 'Zaměřit se na zadní stranu' nebo '1 "
"týden programu xy."
-#: manager/forms.py:126
+#: manager/forms.py:137
msgid ""
"You can search for more than one exercise, they will be grouped together for "
"a superset."
msgstr ""
"Můžete vyhledat více jak jeden cvik. Cviky pak budou zařazeny do supersérie."
-#: 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
+#: manager/forms.py:166 manager/forms.py:171 manager/models/log.py:64
+#: manager/models/log.py:92 manager/models/setting.py:59
+#: manager/models/setting.py:90 manager/templates/log/add.html:53
+#: manager/templates/log/add.html:55 manager/templates/set/formset.html:10
+#: manager/templates/set/formset.html:12 measurements/models/category.py:58
+#: nutrition/forms.py:64
msgid "Unit"
msgstr "Jednotka"
-#: manager/forms.py:266
+#: manager/forms.py:277
msgid "Type"
msgstr "Typ"
-#: manager/forms.py:267 manager/templates/workout/view.html:157
+#: manager/forms.py:278 manager/templates/workout/view.html:157
msgid "Table"
msgstr "Tabulka"
-#: manager/forms.py:269 manager/templates/workout/view.html:163
+#: manager/forms.py:280 manager/templates/workout/view.html:163
msgid "with images"
msgstr "s obrázky"
-#: manager/forms.py:270 manager/templates/workout/view.html:169
+#: manager/forms.py:281 manager/templates/workout/view.html:169
msgid "with comments"
msgstr "s komentáři"
@@ -2629,7 +2426,7 @@ msgid "The duration in weeks"
msgstr "Trvání v týdnech"
#: manager/models/schedule_step.py:63 manager/models/set.py:52
-#: manager/models/setting.py:98 nutrition/models/meal.py:54
+#: manager/models/setting.py:110 nutrition/models/meal.py:54
#: nutrition/models/meal_item.py:65
msgid "Order"
msgstr "Řazení"
@@ -2683,7 +2480,7 @@ msgstr "Cvičební den"
msgid "Number of sets"
msgstr "Počet sad"
-#: manager/models/setting.py:43
+#: manager/models/setting.py:48
msgid "Sets"
msgstr "Sady"
@@ -2974,6 +2771,13 @@ msgstr ""
"Pokud už nechcete dostávat emailem upozornění, vypněte si tuto\n"
"možnost v nastavení."
+#: manager/templates/workout/email_reminder.tpl:15
+#: manager/templates/workout/email_weight_reminder.tpl:12
+#: nutrition/templates/ingredient/email_new.tpl:9
+#, python-format
+msgid "The %(site)s team"
+msgstr "Tým stránky %(site)s"
+
#: manager/templates/workout/email_weight_reminder.tpl:3
#, python-format
msgid ""
@@ -2991,6 +2795,10 @@ msgid ""
msgstr ""
"Pravidelná upozornění vám budou zasílána, dokud nezadáte aktuální hmotnost."
+#: manager/templates/workout/log.html:10 manager/templates/workout/log.html:11
+msgid "Weight log"
+msgstr "Záznam váhy"
+
#: manager/templates/workout/log.html:29
msgid "Weight log for workout"
msgstr "Záznam váhy pro trénink"
@@ -3102,7 +2910,7 @@ msgstr "Zobrazit záznamy"
msgid "Edit workout"
msgstr "Upravit trénink"
-#: manager/templates/workout/view.html:225 manager/views/workout.py:300
+#: manager/templates/workout/view.html:225 manager/views/workout.py:301
msgid "Mark as template"
msgstr ""
@@ -3110,11 +2918,6 @@ msgstr ""
msgid "Add workout day"
msgstr "Přidat tréninkový den"
-#: manager/views/log.py:92
-#, python-format
-msgid "Edit log entry for %s"
-msgstr "Upraivit záznam pro %s"
-
#: manager/views/log.py:111
msgid "Delete workout log"
msgstr "Smazat záznam tréninku"
@@ -3132,11 +2935,11 @@ msgstr "Vytvořit rozvrh"
msgid "Your workouts"
msgstr "Tvé tréninky"
-#: manager/views/workout.py:227
+#: manager/views/workout.py:228
msgid "Copy workout"
msgstr "Kopírovat trénink"
-#: manager/views/workout.py:230
+#: manager/views/workout.py:231
msgid "Copy"
msgstr "Kopírovat"
@@ -3158,23 +2961,23 @@ msgstr "Toto smaže všechny záznamy váhy pro tento den"
msgid "Value"
msgstr ""
-#: nutrition/forms.py:122
+#: nutrition/forms.py:123
msgid "Calculate"
msgstr "Výpočet"
-#: nutrition/forms.py:195 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:196 nutrition/templates/rate/form.html:76
msgid "Basic caloric intake"
msgstr "Základní energetický příjem"
-#: nutrition/forms.py:196
+#: nutrition/forms.py:197
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:202
+#: nutrition/forms.py:203
msgid "Additional calories"
msgstr "Přidat kalorie"
-#: nutrition/forms.py:204
+#: nutrition/forms.py:205
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
@@ -3182,7 +2985,7 @@ msgstr ""
"Další kalorie můžete přidat k základní hodnotě (pokud chcete odečíst, "
"zadejte záporné číslo)"
-#: nutrition/forms.py:232 nutrition/models/ingredient_weight_unit.py:39
+#: nutrition/forms.py:233 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"
@@ -3247,7 +3050,7 @@ msgstr ""
"Celková energie ({energy}kcal) není přibližná energie, kterou poskytují "
"bílkoviny, sacharidy a tuky ({energy_calculated}kcal +/-{energy_approx}%)"
-#: nutrition/models/ingredient.py:357 nutrition/views/ingredient.py:225
+#: nutrition/models/ingredient.py:357 nutrition/views/ingredient.py:219
msgid "Ingredient was successfully added to the general database"
msgstr "Potravina byla přidána do základní databáze"
@@ -3276,6 +3079,12 @@ msgstr "Jednotka množství, např. \"1 pohár\" nebo \"1/2 lžíce\""
msgid "Meal"
msgstr "Jídlo"
+#: nutrition/models/log.py:65
+#, fuzzy
+#| msgid "Time (approx)"
+msgid "Date and Time (Approx.)"
+msgstr "Čas (cca)"
+
#: nutrition/models/meal.py:61
msgid "Time (approx)"
msgstr "Čas (cca)"
@@ -3379,6 +3188,10 @@ msgstr ""
"Nyní je v přehledu složek jídla a může být \n"
"přidána do nutrničních plánů. Můžete jí najít na adrese:"
+#: nutrition/templates/ingredient/email_new.tpl:8
+msgid "Thank you for contributing and making this site better!"
+msgstr "Děkujeme vám za příspěvek, který umožní vylepšit tuto stránku!"
+
#: nutrition/templates/ingredient/form.html:4
msgid "Submitting an ingredient"
msgstr "Zaslání složky"
@@ -3409,6 +3222,10 @@ msgstr ""
msgid "No ingredients."
msgstr "Bez položek."
+#: nutrition/templates/ingredient/overview.html:57
+msgid "Search"
+msgstr "Vyhledat"
+
#: nutrition/templates/ingredient/overview.html:66
msgid "ingredient name"
msgstr "název potraviny"
@@ -3418,6 +3235,14 @@ msgstr "název potraviny"
msgid "Add ingredient"
msgstr "Přidat položku"
+#: nutrition/templates/ingredient/overview.html:85
+msgid "Only registered users can do this"
+msgstr "Tohle je jen pro registrované uživatele"
+
+#: nutrition/templates/ingredient/pending.html:14
+msgid "Submission date"
+msgstr "Datum zaslání"
+
#: nutrition/templates/ingredient/view.html:27
msgid "Ingredient is pending review"
msgstr "Potravina čeká na schválení"
@@ -3433,6 +3258,18 @@ msgstr ""
"jestli bude zahrnuta v databázi. Do doby, než bude zkontrolována,\n"
"nebude se zobrazovat v přehledu, nebo ve vyhledávání."
+#: nutrition/templates/ingredient/view.html:31
+msgid "Please select one of the options below."
+msgstr "Prosím vyberte jednu z níže uvedených možností"
+
+#: nutrition/templates/ingredient/view.html:38
+msgid "Accept"
+msgstr "Povolit"
+
+#: nutrition/templates/ingredient/view.html:42
+msgid "Decline"
+msgstr "Zamítnout"
+
#: nutrition/templates/ingredient/view.html:71
#: nutrition/templates/log/detail.html:31
#: nutrition/templates/plan/view.html:229 nutrition/views/plan.py:376
@@ -3696,14 +3533,18 @@ msgstr ""
"být pouze přibližné. Pokud založíte nutriční plán na těchto hontocáh, \n"
"dodržujte jej několik týdnů a v případě potřeby změňte celkovou výši."
-#: nutrition/views/ingredient.py:181
+#: nutrition/views/ingredient.py:175
msgid "Add a new ingredient"
msgstr "Přidat novou složku"
-#: nutrition/views/ingredient.py:238
+#: nutrition/views/ingredient.py:232
msgid "Ingredient was successfully marked as rejected"
msgstr "Složka byla označena jako zamítnuta"
+#: nutrition/views/log.py:230 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"
@@ -3950,15 +3791,15 @@ msgstr ""
msgid "100%% Free <br>and <br>Open Source"
msgstr "100%% Zdarma <br>a<br>Open Source"
-#: utils/generic_views.py:261
+#: utils/generic_views.py:262
msgid "Yes, delete"
msgstr "Ano, smazat"
-#: utils/models.py:47
+#: utils/models.py:48
msgid "Author"
msgstr "Autor"
-#: utils/models.py:52
+#: utils/models.py:53
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."
@@ -3966,15 +3807,15 @@ msgstr ""
"Pokud nejste autorem, zadejte zde název nebo zdroj. To je nutné pro některé "
"licence, např. CC-BY-SA."
-#: utils/models.py:77
+#: utils/models.py:78
msgid "Pending"
msgstr "Čekájící"
-#: utils/models.py:78
+#: utils/models.py:79
msgid "Accepted"
msgstr "Schváleno"
-#: utils/models.py:79
+#: utils/models.py:80
msgid "Declined"
msgstr "Zamítnuto"
@@ -4140,6 +3981,205 @@ msgstr "Úspěšně smazáno."
msgid "Delete weight entry for the %s"
msgstr "Vymazat záznam váhy pro %s"
+#~ msgid "Ingredients"
+#~ msgstr "Potraviny"
+
+#~ msgid ""
+#~ "Use the configuration to select in what languages the\n"
+#~ "exercises and ingredients will be shown for the current language (for "
+#~ "example\n"
+#~ "the exercises should be shown in languages A, B and C; the ingredients "
+#~ "only\n"
+#~ "in A)."
+#~ msgstr ""
+#~ "Uveďte v nastavení, jaké jazyky budou použity pro\n"
+#~ "cviky a složky pro aktuální jazyk (například\n"
+#~ "Cviky mají být uvedeny v jazycích A, B a C; pouze složky\n"
+#~ "v A)."
+
+#~ msgctxt "as in sorted by category"
+#~ msgid "by category"
+#~ msgstr "podle kategorie"
+
+#~ msgctxt "as in sorted by muscle"
+#~ msgid "by muscle"
+#~ msgstr "podle svalu"
+
+#~ msgctxt "as in sorted by equipment"
+#~ msgid "by equipment"
+#~ msgstr "podle nářadí"
+
+#~ msgid "Add new exercise"
+#~ msgstr "Přidat nový cvik"
+
+#~ msgid "Exercises pending review"
+#~ msgstr "Cvik čeká na zkontrolování"
+
+#~ msgid "Exercise was successfully added to the general database"
+#~ msgstr "Cvičení bylo přidáno do základní databáze"
+
+#~ msgid "New user submitted exercise"
+#~ msgstr "Uživatel zaslal nový cvik"
+
+#, python-brace-format
+#~ msgid "The user {0} submitted a new exercise \"{1}\"."
+#~ msgstr "Uživatel {0} zaslal nový cvik \"{1}\"."
+
+#~ msgid "New user submitted image"
+#~ msgstr "Uživatel zaslal nový obrázek"
+
+#, 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}."
+
+#~ msgid "Equipment overview"
+#~ msgstr "Přehled přístrojů"
+
+#~ msgid "Main muscles"
+#~ msgstr "Hlavní svaly"
+
+#~ msgid ""
+#~ "No exercises for this equipment. Add or edit an exercise and set the "
+#~ "equipment."
+#~ msgstr ""
+#~ "Pro nářadí nejsou dostupné cviky. Přidejte, nebo upravte cvik a zvolte "
+#~ "nářadí, které se má použít."
+
+#~ msgid "exercise name"
+#~ msgstr "jméno cviku"
+
+#, python-format
+#~ msgid ""
+#~ "Your exercise '%(exercise)s' was successfully added to the general\n"
+#~ "database."
+#~ msgstr ""
+#~ "Váš cvik '%(exercise)s' byl přidán do základní\n"
+#~ "databáze."
+
+#~ msgid ""
+#~ "It is now available on the exercise and muscle overview and can be\n"
+#~ "added to workouts. You can access it on this address:"
+#~ msgstr ""
+#~ "Nyní je dostupný v seznamu cviků a svalů a může být\n"
+#~ "přidán do tréninku. Můžete si jej probéhldnout na adrese:"
+
+#~ msgid "Submitting an exercise"
+#~ msgstr "Vložit cvik"
+
+#~ msgid ""
+#~ "Thank you for submitting an exercise. This is much\n"
+#~ "appreciated!"
+#~ msgstr "Děkujeme že jste vložili cvik. Vážíme si toho!"
+
+#~ msgid ""
+#~ "After you submit the form, the administrators will be notified.\n"
+#~ "Once it is reviewed, it will be added to the database. Till this "
+#~ "happens,\n"
+#~ "it will not be visible in the overview or the search. In case you added "
+#~ "your email\n"
+#~ "when you registered, you will get notified when the process is completed "
+#~ "successfully."
+#~ msgstr ""
+#~ "Po odeslání formuláře budou administrátoři upozorněni.\n"
+#~ "Následně dojde ke kontrole údajů a případně k přidání do databáze. Než se "
+#~ "tak stane\n"
+#~ "nebude viditelný v přehledu a ve vyhledávání. V případě, že jste přidali "
+#~ "při registraci\n"
+#~ "email, budete o dokončení informováni."
+
+#~ msgid "Correcting an exercise"
+#~ msgstr "Oprava cviku"
+
+#~ msgid ""
+#~ "Thank you for correcting and improving this exercise.\n"
+#~ "This is much appreciated!"
+#~ msgstr "Děkujeme za kontrolu a opravu tohoto cviku. Vážíme si toho!"
+
+#~ msgid ""
+#~ "After you submit the form, the administrators will be notified.\n"
+#~ "Once the changes are reviewed the exercise will be updated."
+#~ msgstr ""
+#~ "Po odeslání formuláře, budou administrátoři upozorněni.\n"
+#~ "Jakmile dojde ke kontrole změny, dojde k aktualizaci."
+
+#~ msgid "No categories."
+#~ msgstr "Bez kategorie"
+
+#~ msgid "Use link to create one"
+#~ msgstr "Pro vytvoření použijte odkaz."
+
+#~ msgid "Exercise is pending review"
+#~ msgstr "Cvik čeká na zkontrolování"
+
+#~ msgid ""
+#~ "This user submitted exercise is pending a decision to be\n"
+#~ " included in the database."
+#~ msgstr ""
+#~ "Uživatel předložil cvik, a čeká se na rozhodnutí jestli má být zahrnut v "
+#~ "databázi."
+
+#~ msgid "Till then, it will not be shown in the overview or the search."
+#~ msgstr "Do té doby nebude uveden v přehledu, nebo ve vyhledávání."
+
+#~ msgid "Images"
+#~ msgstr "Obrázky"
+
+#~ msgid "Add new image"
+#~ msgstr "Přidat nový obrázek"
+
+#, fuzzy
+#~| msgid "Add new image"
+#~ msgid "Add new video"
+#~ msgstr "Přidat nový obrázek"
+
+#~ msgid "Images pending review"
+#~ msgstr "Obrázky čekající na zkontrolování"
+
+#~ msgid "Comments for this exercise"
+#~ msgstr "Komentáře pro tento cvik"
+
+#~ msgid "Add new comment"
+#~ msgstr "Přidat nový komentář"
+
+#~ 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"
+
+#~ msgid "Exercise Variations"
+#~ msgstr "Variace cvičení"
+
+#~ msgid "Submit a correction"
+#~ msgstr "Zaslat opravu"
+
+#~ msgid ""
+#~ "No exercises for this muscle. Add or edit an exercise and set the muscle."
+#~ msgstr ""
+#~ "Pro tento sval není nastavený žádný cvik. Přidejte, nebo upravte cvik a "
+#~ "nastavte mu i sval."
+
+#~ msgid "Add exercise"
+#~ msgstr "Přidat cvik"
+
+#~ 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."
+
+#, python-brace-format
+#~ msgid "Correct {0}"
+#~ msgstr "Správné {0}"
+
+#~ msgid "Exercise was successfully marked as rejected"
+#~ msgstr "Cvik byl označen jako zamítnutý"
+
+#~ msgid "Edit exercise image"
+#~ msgstr "Upravit obrázek cviku"
+
+#~ msgid "Delete exercise image?"
+#~ msgstr "Smazat obrázek cviku?"
+
+#, python-format
+#~ msgid "Edit log entry for %s"
+#~ msgstr "Upraivit záznam pro %s"
+
#~ msgid "Anterior deltoid"
#~ msgstr "Přední deltový sval"
@@ -4512,10 +4552,6 @@ msgstr "Vymazat záznam váhy pro %s"
#~ msgid "No filter"
#~ msgstr "Bez filtru"
-#~ msgctxt "Noun, not verb"
-#~ msgid "Change"
-#~ msgstr "Změna"
-
#~ msgid "Days"
#~ msgstr "Dny"
diff --git a/wger/locale/da/LC_MESSAGES/django.po b/wger/locale/da/LC_MESSAGES/django.po
index 28fad89ba..ccadfadda 100644
--- a/wger/locale/da/LC_MESSAGES/django.po
+++ b/wger/locale/da/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: wger Workout Manager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-14 12:01+0200\n"
+"POT-Creation-Date: 2022-11-10 16:03+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"
@@ -33,106 +33,8 @@ msgstr ""
"tilknyttet dette fitnesscenter, og allerede eksisterende brugere der ikke er "
"tilknyttet et center vil tilknyttes dette."
-#: 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 "Øvelser"
-
-#: config/models/language_config.py:42
-msgid "Ingredients"
-msgstr "Ingredienser"
-
-#: config/templates/language/overview.html:4 core/templates/navigation.html:226
-msgid "Languages"
-msgstr "Sprog"
-
-#: config/templates/language/overview.html:16
-msgid "Nothing found."
-msgstr "Intet fundet."
-
-#: 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:150
-#: nutrition/templates/plan/view.html:153
-#: nutrition/templates/plan/view.html:191
-msgid "Add one now."
-msgstr "Tilføj en ny."
-
-#: config/templates/language/overview.html:29
-#: core/templates/license/list.html:38 core/templates/misc/license/list.html:41
-#: core/templates/repetition_unit/list.html:41
-#: core/templates/user/overview.html:327 core/templates/user/overview.html:366
-#: core/templates/user/overview.html:402
-#: core/templates/weight_unit/list.html:41 core/views/languages.py:73
-#: core/views/license.py:65 core/views/repetition_units.py:65
-#: core/views/weight_units.py:65
-#: exercises/templates/categories/admin-overview.html:36
-#: 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:61
-msgid "Add"
-msgstr "Tilføj"
-
-#: config/templates/language/view.html:21 core/models/language.py:29
-msgid "Language short name"
-msgstr "Sprogets korte navn"
-
-#: config/templates/language/view.html:22
-#: config/templates/language/view.html:43 core/models/language.py:32
-msgid "Language full name"
-msgstr "Sprogets fulde navn"
-
-#: config/templates/language/view.html:34 core/templates/user/overview.html:451
-#: gym/views/admin_config.py:44 gym/views/admin_config.py:58
-#: gym/views/user_config.py:46
-msgid "Configuration"
-msgstr "Konfiguration"
-
-#: config/templates/language/view.html:35
-msgid ""
-"Use the configuration to select in what languages the\n"
-"exercises and ingredients will be shown for the current language (for "
-"example\n"
-"the exercises should be shown in languages A, B and C; the ingredients only\n"
-"in A)."
-msgstr ""
-"Brug konfigurationen til at vælge i hvilket sprog øvelserne og "
-"ingredienserne skal vises i for det nuværende sprog (for eksempel kan\n"
-"øvelserne vises i sprog A, B og C; ingredienserne kun\n"
-"i A)."
-
-#: config/templates/language/view.html:44 gym/templates/contract/list.html:36
-msgid "Show"
-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: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:45
-msgid "Options"
-msgstr "Indstillinger"
-
-#: config/templates/language/view.html:96 config/views/gym_config.py:41
-#: config/views/language_config.py:49 core/templates/license/list.html:16
-#: core/templates/misc/license/list.html:17
+#: config/views/gym_config.py:41 core/templates/language/view.html:57
+#: 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:39
#: core/templates/tags/render_day.html:75 core/templates/user/overview.html:205
@@ -140,12 +42,10 @@ 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:230
-#: exercises/templates/exercise/view.html:351
#: exercises/templates/muscles/admin-overview.html:16
-#: 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
+#: 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
#: 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,81 +61,54 @@ msgstr "Indstillinger"
msgid "Edit"
msgstr "Rediger"
-#: 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: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: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
-#: gym/templates/contract_type/list.html:39 gym/templates/document/list.html:46
-#: gym/templates/gym/list.html:20 manager/templates/calendar/day.html:69
-#: 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:231
-#: 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:132
-#: nutrition/templates/units/list.html:20
-msgid "Delete"
-msgstr "Slet"
-
-#: core/demo.py:86
+#: core/demo.py:95
msgid "Sample workout"
msgstr "Eksempel-træning"
-#: core/demo.py:90
+#: core/demo.py:99
msgid "Sample day"
msgstr "Eksempel-dag"
-#: core/demo.py:94
+#: core/demo.py:103
msgid "Another sample day"
msgstr "Anden eksempel-dag"
-#: core/demo.py:217
-msgid "Sample nutrional plan"
+#: core/demo.py:211
+#, fuzzy
+#| msgid "Sample nutrional plan"
+msgid "Sample nutritional plan"
msgstr "Eksempel-ernæringsplan"
-#: core/demo.py:349 core/demo.py:351 core/demo.py:353
+#: core/demo.py:343 core/demo.py:345 core/demo.py:347
#, python-brace-format
msgid "Placeholder workout nr {0} for schedule"
msgstr "Tom træning nr. {0} for plan"
-#: core/demo.py:358
+#: core/demo.py:352
msgid "My cool workout schedule"
msgstr "Min seje trænings-plan"
-#: core/demo.py:397 core/demo.py:412
+#: core/demo.py:391 core/demo.py:406
msgid "Empty placeholder schedule"
msgstr "Tom plan"
-#: core/forms.py:61 core/templates/navigation.html:188
-#: core/templates/navigation.html:192 core/templates/user/login.html:4
+#: core/forms.py:64 core/templates/navigation.html:179
+#: core/templates/navigation.html:183 core/templates/user/login.html:4
#: software/templates/features.html:43
msgid "Login"
msgstr ""
-#: core/forms.py:73 core/forms.py:164 gym/views/export.py:63
+#: core/forms.py:76 core/forms.py:177 gym/views/export.py:63
#: gym/views/gym.py:218
msgid "First name"
msgstr "Fornavn"
-#: core/forms.py:74 core/forms.py:165 core/templates/user/overview.html:267
+#: core/forms.py:77 core/forms.py:178 core/templates/user/overview.html:267
#: gym/views/export.py:64 gym/views/gym.py:218
msgid "Last name"
msgstr "Efternavn"
-#: core/forms.py:76 core/forms.py:131 core/templates/user/overview.html:271
+#: core/forms.py:79 core/forms.py:144 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
@@ -245,79 +118,109 @@ msgstr "Efternavn"
msgid "Email"
msgstr "Email"
-#: core/forms.py:77
+#: core/forms.py:80
#, fuzzy
#| msgid "Used for password resets and, optionally, email reminders."
msgid "Used for password resets and, optionally, e-mail reminders."
msgstr "Bruges til kode-nulstilling og, hvis ønsket, påmindelser."
-#: core/forms.py:102
+#: core/forms.py:84 core/models/profile.py:220
+#: gym/templates/gym/new_user.html:38
+msgid "Date of Birth"
+msgstr ""
+
+#: core/forms.py:116
msgid "Personal data"
msgstr "Personlige oplysninger"
-#: core/forms.py:110
+#: core/forms.py:124
msgid "Workout reminders"
msgstr "Træningspåmindelser"
-#: core/forms.py:117
+#: core/forms.py:131
msgid "Other settings"
msgstr "Andre indstillinger"
-#: 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
+#: core/forms.py:138 core/views/user.py:615 core/views/user.py:630
+#: core/views/user.py:642 gym/forms.py:72 manager/templates/log/add.html:65
+#: manager/templates/set/add.html:69 manager/views/workout.py:222
+#: utils/generic_views.py:143
msgid "Save"
msgstr "Gem"
-#: core/forms.py:132
+#: core/forms.py:145
msgid "Used for password resets and, optionally, email reminders."
msgstr "Bruges til kode-nulstilling og, hvis ønsket, påmindelser."
-#: core/forms.py:160
+#: core/forms.py:173
msgid "This e-mail address is already in use."
msgstr "Denne emailadresse er allerede i brug."
-#: core/forms.py:180 gym/templates/gym/new_user.html:26
+#: core/forms.py:193 gym/templates/gym/new_user.html:26
#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:218
msgid "Password"
msgstr "Kodeord"
-#: core/forms.py:182
+#: core/forms.py:195
msgid "Please enter your current password."
msgstr "Indtast venligst dit nuværende kodeord."
-#: core/forms.py:200
+#: core/forms.py:204 core/templates/language/view.html:62
+#: 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: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/muscles/admin-overview.html:17
+#: gym/templates/admin_notes/list.html:40
+#: gym/templates/contract_option/list.html:39
+#: gym/templates/contract_type/list.html:39 gym/templates/document/list.html:46
+#: gym/templates/gym/list.html:20 manager/templates/calendar/day.html:69
+#: 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:231
+#: 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:132
+#: nutrition/templates/units/list.html:20
+msgid "Delete"
+msgstr "Slet"
+
+#: core/forms.py:213
msgid "Invalid password"
msgstr "Ukorrekt kodeord"
-#: core/forms.py:212 core/forms.py:278
+#: core/forms.py:225 core/forms.py:291
msgid "The form is secured with reCAPTCHA"
msgstr "Denne formular er sikret med reCAPTCHA"
-#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:188
-#: core/templates/navigation.html:193 core/templates/template.html:149
-#: core/templates/user/login.html:20 core/views/user.py:293
+#: core/forms.py:239 core/forms.py:258 core/templates/navigation.html:179
+#: core/templates/navigation.html:184 core/templates/template.html:149
+#: core/templates/user/login.html:20 core/views/user.py:300
#: software/templates/features.html:38
msgid "Register"
msgstr "Registrer"
-#: core/forms.py:256
+#: core/forms.py:269
msgid "Contact"
msgstr "Kontakt"
-#: core/forms.py:257
+#: core/forms.py:270
#, fuzzy
#| msgid "Some way of answering you (email, etc.)"
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:71
+#: core/forms.py:278 exercises/models/comment.py:42 manager/models/set.py:60
+#: manager/models/setting.py:111 nutrition/models/log.py:71
msgid "Comment"
msgstr "Kommentar"
-#: core/forms.py:266
+#: core/forms.py:279
msgid "What do you want to say?"
msgstr "Hvad vil du gerne sige?"
@@ -325,6 +228,14 @@ msgstr "Hvad vil du gerne sige?"
msgid "Day of the week"
msgstr "Ugedag"
+#: core/models/language.py:31 core/templates/language/view.html:21
+msgid "Language short name"
+msgstr "Sprogets korte navn"
+
+#: core/models/language.py:36 core/templates/language/view.html:22
+msgid "Language full name"
+msgstr "Sprogets fulde navn"
+
#: core/models/license.py:29
msgid "Full name"
msgstr "Fulde navn"
@@ -380,19 +291,19 @@ msgstr "Metrisk (kilogram)"
msgid "Imperial (pound)"
msgstr "Engelsk (pund)"
-#: core/models/profile.py:111
+#: core/models/profile.py:114
msgid "Show exercise comments"
msgstr "Vis øvelses-kommentarer"
-#: core/models/profile.py:112
+#: core/models/profile.py:115
msgid "Check to show exercise comments on the workout view"
msgstr "Marker for at vise øvelseskommentarer i trænings-visningen"
-#: core/models/profile.py:123
+#: core/models/profile.py:126
msgid "Also use ingredients in English"
msgstr "Brug også ingredienser på Engelsk"
-#: core/models/profile.py:125
+#: core/models/profile.py:128
msgid ""
"Check to also show ingredients in English while creating\n"
"a nutritional plan. These ingredients are extracted from a list provided\n"
@@ -400,130 +311,129 @@ msgid ""
"7000 entries, but can be somewhat overwhelming and make the search difficult."
msgstr ""
-#: core/models/profile.py:134
+#: core/models/profile.py:137
msgid "Activate workout reminders"
msgstr ""
-#: core/models/profile.py:136
+#: core/models/profile.py:139
msgid ""
"Check to activate automatic reminders for workouts. You need to provide a "
"valid email for this to work."
msgstr ""
-#: core/models/profile.py:145
+#: core/models/profile.py:148
msgid "Remind before expiration"
msgstr ""
-#: core/models/profile.py:146
+#: core/models/profile.py:149
msgid "The number of days you want to be reminded before a workout expires."
msgstr ""
-#: core/models/profile.py:152
+#: core/models/profile.py:155
msgid "Default duration of workouts"
msgstr ""
-#: core/models/profile.py:154
+#: core/models/profile.py:157
msgid ""
"Default duration in weeks of workouts not in a schedule. Used for email "
"workout reminders."
msgstr ""
-#: core/models/profile.py:171
+#: core/models/profile.py:174
msgid "Notification language"
msgstr ""
-#: core/models/profile.py:173
+#: core/models/profile.py:176
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/profile.py:186 gym/views/export.py:66
+#: core/models/profile.py:212 gym/views/export.py:66
msgid "Age"
msgstr ""
-#: core/models/profile.py:202 nutrition/forms.py:99
+#: core/models/profile.py:228 nutrition/forms.py:100
msgid "Height (cm)"
msgstr ""
-#: core/models/profile.py:219
+#: core/models/profile.py:245
msgid "Hours of sleep"
msgstr ""
-#: core/models/profile.py:220
+#: core/models/profile.py:246
msgid "The average hours of sleep per day"
msgstr ""
-#: core/models/profile.py:229
+#: core/models/profile.py:255
msgid "Work"
msgstr ""
-#: core/models/profile.py:230 core/models/profile.py:272
+#: core/models/profile.py:256 core/models/profile.py:298
msgid "Average hours per day"
msgstr ""
-#: core/models/profile.py:239 core/models/profile.py:260
-#: core/models/profile.py:281
+#: core/models/profile.py:265 core/models/profile.py:286
+#: core/models/profile.py:307
msgid "Physical intensity"
msgstr ""
-#: core/models/profile.py:240 core/models/profile.py:261
-#: core/models/profile.py:282
+#: core/models/profile.py:266 core/models/profile.py:287
+#: core/models/profile.py:308
msgid "Approximately"
msgstr ""
-#: core/models/profile.py:250
+#: core/models/profile.py:276
msgid "Sport"
msgstr ""
-#: core/models/profile.py:251
+#: core/models/profile.py:277
msgid "Average hours per week"
msgstr ""
-#: core/models/profile.py:271
+#: core/models/profile.py:297
msgid "Free time"
msgstr ""
-#: core/models/profile.py:292 nutrition/templates/rate/form.html:66
+#: core/models/profile.py:318 nutrition/templates/rate/form.html:66
msgid "Total daily calories"
msgstr ""
-#: core/models/profile.py:293
+#: core/models/profile.py:319
msgid "Total caloric intake, including e.g. any surplus"
msgstr ""
-#: core/models/profile.py:305 nutrition/models/ingredient_weight_unit.py:45
+#: core/models/profile.py:331 nutrition/models/ingredient_weight_unit.py:45
#: nutrition/models/log.py:90 nutrition/models/meal_item.py:58
msgid "Weight unit"
msgstr ""
-#: core/models/profile.py:313
+#: core/models/profile.py:339
msgid "Allow external access"
msgstr ""
-#: core/models/profile.py:315
+#: core/models/profile.py:341
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/profile.py:324
+#: core/models/profile.py:350
msgid "Automatic reminders for weight entries"
msgstr ""
-#: core/models/profile.py:326
+#: core/models/profile.py:352
msgid "Number of days after the last weight entry (enter 0 to deactivate)"
msgstr ""
-#: core/models/profile.py:392
+#: core/models/profile.py:418
msgid "The sum of all hours has to be 24"
msgstr ""
#: core/models/rep_unit.py:35 core/models/weight_unit.py:35
-#: core/templates/user/overview.html:263 core/views/user.py:575
+#: core/templates/user/overview.html:263 core/views/user.py:591
#: 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
+#: exercises/models/exercise.py:64 exercises/models/muscle.py:36
#: 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
@@ -582,6 +492,52 @@ msgstr ""
msgid "Are you sure you want to delete this? This action cannot be undone."
msgstr ""
+#: core/templates/email_verification/confirm_template.html:4
+msgid "Email verified"
+msgstr ""
+
+#: core/templates/email_verification/confirm_template.html:18
+#, python-format
+msgid "%(username)s, your email was verified"
+msgstr ""
+
+#: core/templates/email_verification/confirm_template.html:22
+msgid "Error, invalid verification token"
+msgstr ""
+
+#: core/templates/email_verification/email_body_html.tpl:6
+#, fuzzy
+#| msgid "Configuration"
+msgid "Email Confirmation"
+msgstr "Konfiguration"
+
+#: core/templates/email_verification/email_body_html.tpl:9
+#: core/templates/email_verification/email_body_txt.tpl:3
+#, python-format
+msgid "You are almost there, %(username)s!"
+msgstr ""
+
+#: core/templates/email_verification/email_body_html.tpl:11
+#, python-format
+msgid "Please click <a href=\"%(link)s\">here</a> to confirm your email"
+msgstr ""
+
+#: core/templates/email_verification/email_body_html.tpl:12
+#: core/templates/email_verification/email_body_txt.tpl:5
+#, python-format
+msgid "The token expires on %(time)s"
+msgstr ""
+
+#: core/templates/email_verification/email_body_html.tpl:14
+#: core/templates/email_verification/email_body_txt.tpl:8
+msgid "the wger Team"
+msgstr ""
+
+#: core/templates/email_verification/email_body_txt.tpl:4
+#, python-format
+msgid "Please click the following link to confirm your email: %(link)s"
+msgstr ""
+
#: core/templates/index.html:4
msgid "Dashboard"
msgstr ""
@@ -638,7 +594,7 @@ msgid "Add custom diary entry"
msgstr ""
#: core/templates/index.html:84 core/templates/index.html:92
-#: manager/models/day.py:34 manager/models/log.py:56
+#: manager/models/day.py:34 manager/models/log.py:58
#: manager/models/session.py:60 manager/models/workout.py:109
#: manager/templates/schedule/view.html:105
#: manager/templates/workout/view.html:11
@@ -669,6 +625,20 @@ msgstr ""
msgid "No workouts found."
msgstr ""
+#: core/templates/index.html:137 core/templates/index.html:189
+#: core/templates/language/overview.html:23
+#: 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:150
+#: nutrition/templates/plan/view.html:153
+#: nutrition/templates/plan/view.html:191
+msgid "Add one now."
+msgstr "Tilføj en ny."
+
#: 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
@@ -722,19 +692,59 @@ msgid "No nutrition plans."
msgstr ""
#: 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
+#: core/templates/user/overview.html:121 manager/forms.py:184
+#: manager/helpers.py:89 manager/models/log.py:86 manager/models/setting.py:79
+#: manager/templates/log/add.html:54 manager/templates/set/formset.html:11
#: weight/models.py: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:210 core/templates/navigation.html:135
+#: core/templates/index.html:210 core/templates/navigation.html:126
#: weight/views.py:70
msgid "Add weight entry"
msgstr ""
+#: core/templates/language/overview.html:4 core/templates/navigation.html:217
+msgid "Languages"
+msgstr "Sprog"
+
+#: core/templates/language/overview.html:23
+msgid "Nothing found."
+msgstr "Intet fundet."
+
+#: core/templates/language/overview.html:36 core/templates/license/list.html:38
+#: core/templates/misc/license/list.html:41
+#: core/templates/repetition_unit/list.html:41
+#: core/templates/user/overview.html:327 core/templates/user/overview.html:366
+#: core/templates/user/overview.html:402
+#: core/templates/weight_unit/list.html:41 core/views/languages.py:73
+#: core/views/license.py:65 core/views/repetition_units.py:65
+#: core/views/weight_units.py:65
+#: exercises/templates/categories/admin-overview.html:36
+#: 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:61
+msgid "Add"
+msgstr "Tilføj"
+
+#: core/templates/language/view.html:52 core/templates/user/api_key.html:44
+#: core/templates/user/preferences.html:44 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:45
+msgid "Options"
+msgstr "Indstillinger"
+
#: core/templates/license/list.html:4 core/templates/misc/license/list.html:4
msgid "License list"
msgstr ""
@@ -747,7 +757,6 @@ msgstr ""
#: core/templates/weight_unit/list.html:26
#: exercises/templates/categories/admin-overview.html:24
#: exercises/templates/equipment/admin-overview.html:24
-#: exercises/templates/exercise/pending.html:30
#: exercises/templates/muscles/admin-overview.html:24
#: gym/templates/admin_notes/list.html:52 gym/templates/contract/list.html:60
#: gym/templates/contract_option/list.html:56
@@ -825,155 +834,135 @@ msgstr ""
msgid "Public templates"
msgstr ""
-#: core/templates/navigation.html:64
-msgctxt "as in sorted by category"
-msgid "by category"
-msgstr ""
-
-#: core/templates/navigation.html:65
-msgctxt "as in sorted by muscle"
-msgid "by muscle"
-msgstr ""
-
-#: core/templates/navigation.html:66
-msgctxt "as in sorted by equipment"
-msgid "by equipment"
-msgstr ""
-
-#: core/templates/navigation.html:70
-#: exercises/templates/equipment/overview.html:109
-#: exercises/templates/equipment/overview.html:113
-#: exercises/templates/exercise/overview.html:112
-#: exercises/templates/exercise/overview.html:116
-#: exercises/templates/muscles/overview.html:112
-#: exercises/templates/muscles/overview.html:116
-msgid "Add new exercise"
-msgstr ""
+#: core/templates/navigation.html:63 manager/forms.py:133
+#: manager/models/setting.py:54
+msgid "Exercises"
+msgstr "Øvelser"
-#: core/templates/navigation.html:75 core/templates/navigation.html:116
-#: core/templates/navigation.html:224
+#: core/templates/navigation.html:67 core/templates/navigation.html:107
+#: core/templates/navigation.html:215
msgid "Administration"
msgstr ""
-#: core/templates/navigation.html:76
-#: exercises/templates/exercise/pending.html:6
-msgid "Exercises pending review"
-msgstr ""
+#: core/templates/navigation.html:68
+#, fuzzy
+#| msgid "Exercises"
+msgid "Exercise edit history"
+msgstr "Øvelser"
-#: core/templates/navigation.html:77 exercises/models/base.py:72
-#: exercises/templates/exercise/view.html:80
+#: core/templates/navigation.html:69 exercises/models/base.py:84
msgid "Equipment"
msgstr ""
-#: core/templates/navigation.html:78 exercises/templates/exercise/view.html:258
+#: core/templates/navigation.html:70
msgid "Muscles"
msgstr ""
-#: core/templates/navigation.html:79
+#: core/templates/navigation.html:71
#: exercises/templates/categories/admin-overview.html:4
msgid "Categories"
msgstr ""
-#: core/templates/navigation.html:93 software/templates/features.html:87
+#: core/templates/navigation.html:84 software/templates/features.html:87
msgid "Nutrition"
msgstr ""
-#: core/templates/navigation.html:99 core/templates/user/overview.html:144
+#: core/templates/navigation.html:90 core/templates/user/overview.html:144
msgid "Nutrition plans"
msgstr ""
-#: core/templates/navigation.html:105 nutrition/templates/bmi/form.html:50
+#: core/templates/navigation.html:96 nutrition/templates/bmi/form.html:50
msgid "BMI calculator"
msgstr ""
-#: core/templates/navigation.html:111 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:102 nutrition/templates/rate/form.html:17
msgid "Daily calories calculator"
msgstr ""
-#: core/templates/navigation.html:113
+#: core/templates/navigation.html:104
#: nutrition/templates/ingredient/overview.html:29
msgid "Ingredient overview"
msgstr ""
-#: core/templates/navigation.html:117 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:108 nutrition/templates/units/list.html:6
msgid "Ingredient weight units"
msgstr ""
-#: core/templates/navigation.html:118
+#: core/templates/navigation.html:109
#: nutrition/templates/ingredient/pending.html:6
msgid "Ingredients pending review"
msgstr ""
-#: core/templates/navigation.html:132
+#: core/templates/navigation.html:123
msgid "Body weight"
msgstr ""
-#: core/templates/navigation.html:134 core/templates/user/overview.html:114
+#: core/templates/navigation.html:125 core/templates/user/overview.html:114
#: weight/templates/overview.html:7
msgid "Weight overview"
msgstr ""
-#: core/templates/navigation.html:147
+#: core/templates/navigation.html:138
msgid "About this software"
msgstr ""
-#: core/templates/navigation.html:149 core/templates/template_features.html:82
+#: core/templates/navigation.html:140 core/templates/template_features.html:82
#: software/templates/about_us.html:5
msgid "About us"
msgstr ""
-#: core/templates/navigation.html:151 software/templates/features.html:209
+#: core/templates/navigation.html:142 software/templates/features.html:209
msgid "REST API"
msgstr ""
-#: core/templates/navigation.html:155 utils/models.py:40
+#: core/templates/navigation.html:146 utils/models.py:41
msgid "License"
msgstr ""
-#: core/templates/navigation.html:161
+#: core/templates/navigation.html:152
msgid "Developer documentation"
msgstr ""
-#: core/templates/navigation.html:167
+#: core/templates/navigation.html:158
msgid "Get the code"
msgstr ""
-#: core/templates/navigation.html:173 core/templates/template.html:204
+#: core/templates/navigation.html:164 core/templates/template.html:203
#: core/templates/template_features.html:99
msgid "Translate"
msgstr ""
-#: core/templates/navigation.html:194 core/templates/user/login.html:28
+#: core/templates/navigation.html:185 core/templates/user/login.html:28
msgid "Reset password"
msgstr ""
-#: core/templates/navigation.html:207
+#: core/templates/navigation.html:198
msgid "My preferences"
msgstr ""
-#: core/templates/navigation.html:214
+#: core/templates/navigation.html:205
msgid "Logout"
msgstr ""
-#: core/templates/navigation.html:229
+#: core/templates/navigation.html:220
msgid "Licenses"
msgstr ""
-#: core/templates/navigation.html:232
+#: core/templates/navigation.html:223
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr ""
-#: core/templates/navigation.html:235 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:226 core/templates/weight_unit/list.html:4
#: nutrition/templates/ingredient/view.html:174
msgid "Weight units"
msgstr ""
-#: core/templates/navigation.html:238 core/templates/user/list.html:4
+#: core/templates/navigation.html:229 core/templates/user/list.html:4
msgid "User list"
msgstr ""
-#: core/templates/navigation.html:239
+#: core/templates/navigation.html:230
msgid "Gyms"
msgstr ""
@@ -1048,33 +1037,30 @@ msgstr ""
msgid "Add weight log"
msgstr ""
-#: core/templates/tags/render_day.html:114
-#: exercises/templates/equipment/overview.html:59
-#: exercises/templates/exercise/overview.html:63
-#: exercises/templates/muscles/overview.html:65
+#: core/templates/tags/render_day.html:116
msgid "Placeholder image for exercise"
msgstr ""
-#: core/templates/tags/render_day.html:131
+#: core/templates/tags/render_day.html:133
msgid "This exercise has no repetitions."
msgstr ""
-#: core/templates/tags/render_day.html:134
+#: core/templates/tags/render_day.html:136
msgid "Edit them now."
msgstr ""
-#: core/templates/tags/render_day.html:159
+#: core/templates/tags/render_day.html:162
msgid "Add exercises to this workout day"
msgstr ""
#: core/templates/tags/render_weight_log.html:17 manager/helpers.py:89
-#: manager/models/setting.py:57 manager/templates/set/formset.html:10
+#: manager/models/setting.py:69 manager/templates/set/formset.html:9
msgid "Reps"
msgstr ""
-#: 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
+#: core/templates/tags/render_weight_log.html:30 manager/forms.py:189
+#: manager/models/log.py:103 manager/models/setting.py:99
+#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
msgid "RiR"
msgstr ""
@@ -1097,7 +1083,7 @@ msgstr ""
msgid "Features"
msgstr ""
-#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:37
+#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:53
msgid "API key"
msgstr ""
@@ -1137,11 +1123,12 @@ msgid "Documentation"
msgstr ""
#: core/templates/user/delete_account.html:4
-#: core/templates/user/preferences.html:42
+#: core/templates/user/preferences.html:58
msgid "Delete account"
msgstr ""
#: core/templates/user/delete_account.html:17
+#: exercises/templates/history/overview.html:93
msgid "Are you sure?"
msgstr ""
@@ -1186,11 +1173,12 @@ 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/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
+#: exercises/models/base.py:99 exercises/models/base.py:104
+#: exercises/models/exercise.py:69 exercises/models/exercise.py:76
+#: gallery/models/image.py:47 manager/helpers.py:88 manager/models/log.py:100
+#: 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/views.py:150
@@ -1198,11 +1186,11 @@ msgid "Date"
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: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
+#: exercises/models/exercise.py:57 exercises/views/exercises.py:123
+#: 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 ""
@@ -1210,12 +1198,12 @@ msgstr ""
msgid "Number of logs (days)"
msgstr ""
-#: core/templates/user/overview.html:37 core/views/user.py:576
+#: core/templates/user/overview.html:37 core/views/user.py:592
#: 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:267
+#: core/templates/user/overview.html:68 manager/forms.py:278
#: manager/templates/workout/view.html:151
msgid "Log"
msgstr ""
@@ -1233,6 +1221,7 @@ msgid "Notes"
msgstr ""
#: core/templates/user/overview.html:79
+#: exercises/templates/history/overview.html:30
#: manager/templates/calendar/partial_overview_table.html:42
#: nutrition/templates/log/detail.html:154
msgid "Time"
@@ -1280,10 +1269,12 @@ msgid "Do you really want to change this user&#39;s password?"
msgstr ""
#: core/templates/user/overview.html:233
+#: exercises/templates/history/overview.html:106
msgid "No"
msgstr ""
#: core/templates/user/overview.html:234
+#: exercises/templates/history/overview.html:99
msgid "Yes"
msgstr ""
@@ -1338,10 +1329,15 @@ msgid "Documents"
msgstr ""
#: core/templates/user/overview.html:413 gym/templates/document/list.html:32
-#: manager/forms.py:279 manager/templates/workout/view.html:176
+#: manager/forms.py:290 manager/templates/workout/view.html:176
msgid "Download"
msgstr ""
+#: core/templates/user/overview.html:451 gym/views/admin_config.py:44
+#: gym/views/admin_config.py:58 gym/views/user_config.py:46
+msgid "Configuration"
+msgstr "Konfiguration"
+
#: core/templates/user/overview.html:454 gym/models/user_config.py:92
msgid "Include in inactive overview"
msgstr ""
@@ -1359,7 +1355,23 @@ msgstr ""
msgid "Preferences"
msgstr ""
-#: core/templates/user/preferences.html:33 core/views/user.py:587
+#: core/templates/user/preferences.html:19
+msgid "Verified email"
+msgstr ""
+
+#: core/templates/user/preferences.html:24
+msgid "Unverified email"
+msgstr ""
+
+#: core/templates/user/preferences.html:26
+msgid "Send verification email"
+msgstr ""
+
+#: core/templates/user/preferences.html:30
+msgid "You need to verify your email to contribute exercises"
+msgstr ""
+
+#: core/templates/user/preferences.html:49 core/views/user.py:603
msgid "Change password"
msgstr ""
@@ -1389,39 +1401,37 @@ msgid "oz"
msgstr ""
#: 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
+#: exercises/views/equipment.py:104 exercises/views/exercises.py:185
+#: exercises/views/muscles.py:99 manager/views/schedule.py:311
+#: manager/views/schedule_step.py:129 manager/views/workout.py:269
+#: manager/views/workout_session.py:141 nutrition/views/ingredient.py:138
#: 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:431
-#: exercises/views/muscles.py:125 gallery/views/images.py:121
+#: exercises/views/categories.py:127 exercises/views/exercises.py:193
+#: exercises/views/muscles.py:106 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
+#: manager/views/workout.py:273 manager/views/workout_session.py:156
+#: nutrition/views/ingredient.py:145 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:456
+#: core/views/repetition_units.py:85 core/views/user.py:472
#: 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: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
+#: exercises/views/equipment.py:81 exercises/views/muscles.py:86
+#: 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:170
+#: gym/views/gym.py:459 manager/views/day.py:100 manager/views/schedule.py:335
+#: manager/views/workout.py:287 nutrition/views/ingredient.py:164
+#: nutrition/views/plan.py:144 nutrition/views/unit.py:144
#, python-brace-format
msgid "Edit {0}"
msgstr ""
@@ -1449,64 +1459,65 @@ msgstr ""
msgid "Your feedback was successfully sent. Thank you!"
msgstr ""
-#: core/views/user.py:156
+#: core/views/user.py:157
#, python-brace-format
msgid "Account \"{0}\" was successfully deleted"
msgstr ""
-#: core/views/user.py:287
+#: core/views/user.py:294
msgid "You were successfully registered"
msgstr ""
-#: core/views/user.py:339
+#: core/views/user.py:355
msgid "Settings successfully updated"
msgstr ""
-#: core/views/user.py:376
+#: core/views/user.py:392
msgid "The user was successfully deactivated"
msgstr ""
-#: core/views/user.py:411
+#: core/views/user.py:427
msgid "The user was successfully activated"
msgstr ""
-#: core/views/user.py:426
+#: core/views/user.py:442
msgid "Edit user"
msgstr ""
-#: core/views/user.py:573 gym/templates/gym/member_list.html:26
+#: core/views/user.py:589 gym/templates/gym/member_list.html:26
#: gym/views/gym.py:156
msgid "ID"
msgstr ""
-#: core/views/user.py:574 gym/forms.py:94 gym/templates/contract/view.html:55
+#: core/views/user.py:590 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:577 gym/templates/gym/new_user.html:34
+#: core/views/user.py:593 gym/templates/gym/new_user.html:34
#: gym/views/export.py:60 gym/views/gym.py:218
msgid "Gym"
msgstr ""
-#: exercises/models/base.py:51 exercises/templates/exercise/view.html:76
-#: nutrition/models/ingredient.py:204
+#: core/views/user.py:652
+#, python-format
+msgid "A verification email was sent to %(email)s"
+msgstr ""
+
+#: exercises/models/base.py:63 nutrition/models/ingredient.py:204
msgid "Category"
msgstr ""
-#: exercises/models/base.py:58
+#: exercises/models/base.py:70
msgid "Primary muscles"
msgstr ""
-#: exercises/models/base.py:64 exercises/templates/equipment/overview.html:71
-#: exercises/templates/exercise/overview.html:76
-#: exercises/templates/exercise/view.html:268
-#: exercises/templates/muscles/overview.html:77
+#: exercises/models/base.py:76
msgid "Secondary muscles"
msgstr ""
-#: exercises/models/base.py:79
+#: exercises/models/base.py:91
msgid "Variations"
msgstr ""
@@ -1514,90 +1525,68 @@ msgstr ""
msgid "Exercise Categories"
msgstr ""
-#: exercises/models/comment.py:34 exercises/models/exercise_alias.py:32
-#: exercises/models/image.py:75 exercises/models/video.py:82
-#: manager/forms.py:165 manager/helpers.py:89 manager/models/log.py:51
+#: exercises/models/comment.py:37 exercises/models/exercise_alias.py:35
+#: exercises/models/image.py:71 exercises/models/video.py:95
+#: manager/forms.py:176 manager/helpers.py:89 manager/models/log.py:52
msgid "Exercise"
msgstr ""
-#: exercises/models/comment.py:41
+#: exercises/models/comment.py:43
msgid "A comment about how to correctly do this exercise."
msgstr ""
-#: exercises/models/exercise.py:86 nutrition/models/ingredient.py:80
+#: exercises/models/exercise.py:81 nutrition/models/ingredient.py:80
#: nutrition/models/plan.py:61 nutrition/models/weight_unit.py:32
msgid "Language"
msgstr ""
-#: exercises/models/exercise.py:237 exercises/views/exercises.py:461
-msgid "Exercise was successfully added to the general database"
-msgstr ""
-
-#: exercises/models/exercise.py:265
-msgid "New user submitted exercise"
-msgstr ""
-
-#: exercises/models/exercise.py:267
-#, python-brace-format
-msgid "The user {0} submitted a new exercise \"{1}\"."
-msgstr ""
-
-#: exercises/models/exercise_alias.py:35
+#: exercises/models/exercise_alias.py:38
msgid "Alias for an exercise"
msgstr ""
-#: exercises/models/image.py:59
+#: exercises/models/image.py:55
msgid "Line"
msgstr ""
-#: exercises/models/image.py:60
+#: exercises/models/image.py:56
msgid "3D"
msgstr ""
-#: exercises/models/image.py:61
+#: exercises/models/image.py:57
msgid "Low-poly"
msgstr ""
-#: exercises/models/image.py:62
+#: exercises/models/image.py:58
msgid "Photo"
msgstr ""
-#: exercises/models/image.py:63
+#: exercises/models/image.py:59
msgid "Other"
msgstr ""
-#: exercises/models/image.py:81 gallery/models/image.py:56
+#: exercises/models/image.py:77 gallery/models/image.py:56
msgid "Image"
msgstr ""
-#: exercises/models/image.py:82 gallery/models/image.py:57
+#: exercises/models/image.py:78 gallery/models/image.py:57
msgid "Only PNG and JPEG formats are supported"
msgstr ""
-#: exercises/models/image.py:88
+#: exercises/models/image.py:84
msgid "Main picture"
msgstr ""
-#: exercises/models/image.py:91
+#: exercises/models/image.py:87
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:100
+#: exercises/models/image.py:96
msgid "The art style of your image"
msgstr ""
-#: exercises/models/image.py:185
-msgid "New user submitted image"
-msgstr ""
-
-#: exercises/models/image.py:186
-#, python-brace-format
-msgid "The user {0} submitted a new image \"{1}\" for exercise {2}."
-msgstr ""
-
#: exercises/models/muscle.py:37
msgid "In latin, e.g. \"Pectoralis major\""
msgstr ""
@@ -1610,47 +1599,48 @@ msgstr ""
msgid "A more basic name for the muscle"
msgstr ""
-#: exercises/models/video.py:41
-msgid "Maximum file size is 100MB."
+#: exercises/models/video.py:50
+#, python-format
+msgid "Maximum file size is %(size)sMB."
msgstr ""
-#: exercises/models/video.py:44 exercises/models/video.py:48
+#: exercises/models/video.py:57 exercises/models/video.py:65
msgid "File type is not supported"
msgstr ""
-#: exercises/models/video.py:57
+#: exercises/models/video.py:70
msgid "File is not a valid video"
msgstr ""
-#: exercises/models/video.py:88
+#: exercises/models/video.py:101
msgid "Main video"
msgstr ""
-#: exercises/models/video.py:94
+#: exercises/models/video.py:107
msgid "Video"
msgstr ""
-#: exercises/models/video.py:101
+#: exercises/models/video.py:114
msgid "Size"
msgstr ""
-#: exercises/models/video.py:108 manager/models/schedule_step.py:56
+#: exercises/models/video.py:121 manager/models/schedule_step.py:56
msgid "Duration"
msgstr ""
-#: exercises/models/video.py:117
+#: exercises/models/video.py:130
msgid "Width"
msgstr ""
-#: exercises/models/video.py:124
+#: exercises/models/video.py:137
msgid "Height"
msgstr ""
-#: exercises/models/video.py:131
+#: exercises/models/video.py:144
msgid "Codec"
msgstr ""
-#: exercises/models/video.py:139
+#: exercises/models/video.py:152
msgid "Codec, long name"
msgstr ""
@@ -1659,121 +1649,21 @@ msgid "Equipment list"
msgstr ""
#: exercises/templates/equipment/admin-overview.html:37
-#: exercises/views/equipment.py:94
+#: exercises/views/equipment.py:92
msgid "Add new equipment"
msgstr ""
-#: exercises/templates/equipment/overview.html:11
-msgid "Equipment overview"
-msgstr ""
-
-#: exercises/templates/equipment/overview.html:69
-#: exercises/templates/exercise/overview.html:74
-#: exercises/templates/exercise/view.html:264
-#: exercises/templates/muscles/overview.html:75
-msgid "Main muscles"
+#: exercises/templates/history/overview.html:11
+msgid "Exercise admin history"
msgstr ""
-#: exercises/templates/equipment/overview.html:79
-msgid ""
-"No exercises for this equipment. Add or edit an exercise and set the "
-"equipment."
-msgstr ""
-
-#: exercises/templates/equipment/overview.html:96
-#: exercises/templates/exercise/overview.html:99
-#: nutrition/templates/ingredient/overview.html:57
-msgid "Search"
-msgstr ""
-
-#: exercises/templates/equipment/overview.html:101
-#: exercises/templates/exercise/overview.html:104
-msgid "exercise name"
-msgstr ""
-
-#: exercises/templates/equipment/overview.html:115
-#: exercises/templates/exercise/overview.html:118
-#: exercises/templates/muscles/overview.html:118
-#: nutrition/templates/ingredient/overview.html:85
-msgid "Only registered users can do this"
-msgstr ""
-
-#: exercises/templates/exercise/email_new.tpl:1
-#, python-format
-msgid ""
-"Your exercise '%(exercise)s' was successfully added to the general\n"
-"database."
-msgstr ""
-
-#: exercises/templates/exercise/email_new.tpl:4
-msgid ""
-"It is now available on the exercise and muscle overview and can be\n"
-"added to workouts. You can access it on this address:"
-msgstr ""
-
-#: exercises/templates/exercise/email_new.tpl:8
-#: nutrition/templates/ingredient/email_new.tpl:8
-msgid "Thank you for contributing and making this site better!"
-msgstr ""
-
-#: exercises/templates/exercise/email_new.tpl:9
-#: manager/templates/workout/email_reminder.tpl:15
-#: manager/templates/workout/email_weight_reminder.tpl:12
-#: nutrition/templates/ingredient/email_new.tpl:9
-#, python-format
-msgid "The %(site)s team"
-msgstr ""
-
-#: exercises/templates/exercise/form.html:4
-msgid "Submitting an exercise"
-msgstr ""
-
-#: exercises/templates/exercise/form.html:5
-msgid ""
-"Thank you for submitting an exercise. This is much\n"
-"appreciated!"
-msgstr ""
-
-#: exercises/templates/exercise/form.html:8
-msgid ""
-"After you submit the form, the administrators will be notified.\n"
-"Once it is reviewed, it will be added to the database. Till this happens,\n"
-"it will not be visible in the overview or the search. In case you added your "
-"email\n"
-"when you registered, you will get notified when the process is completed "
-"successfully."
-msgstr ""
-
-#: exercises/templates/exercise/form_correct.html:4
-msgid "Correcting an exercise"
-msgstr ""
-
-#: exercises/templates/exercise/form_correct.html:5
-msgid ""
-"Thank you for correcting and improving this exercise.\n"
-"This is much appreciated!"
-msgstr ""
-
-#: exercises/templates/exercise/form_correct.html:8
-msgid ""
-"After you submit the form, the administrators will be notified.\n"
-"Once the changes are reviewed the exercise will be updated."
-msgstr ""
-
-#: exercises/templates/exercise/overview.html:88
-msgid "No categories."
-msgstr ""
-
-#: exercises/templates/exercise/overview.html:88
-msgid "Use link to create one"
-msgstr ""
-
-#: exercises/templates/exercise/pending.html:14
-#: nutrition/templates/ingredient/pending.html:14
-msgid "Submission date"
-msgstr ""
+#: exercises/templates/history/overview.html:27
+#, fuzzy
+#| msgid "Options"
+msgid "Action"
+msgstr "Indstillinger"
-#: exercises/templates/exercise/pending.html:16 gallery/models/image.py:51
+#: exercises/templates/history/overview.html:28 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/log.py:45
@@ -1784,99 +1674,39 @@ msgstr ""
msgid "User"
msgstr "Bruger"
-#: exercises/templates/exercise/view.html:48
-msgid "Exercise is pending review"
+#: exercises/templates/history/overview.html:29
+msgid "Object"
msgstr ""
-#: exercises/templates/exercise/view.html:51
-msgid ""
-"This user submitted exercise is pending a decision to be\n"
-" included in the database."
+#: exercises/templates/history/overview.html:31
+msgid "Changes"
msgstr ""
-#: exercises/templates/exercise/view.html:53
-msgid "Till then, it will not be shown in the overview or the search."
+#: exercises/templates/history/overview.html:32
+msgid "Revert"
msgstr ""
-#: exercises/templates/exercise/view.html:54
-#: nutrition/templates/ingredient/view.html:31
-msgid "Please select one of the options below."
+#: exercises/templates/history/overview.html:64
+msgid "View Object"
msgstr ""
-#: exercises/templates/exercise/view.html:60
-#: exercises/templates/exercise/view.html:203
-#: nutrition/templates/ingredient/view.html:38
-msgid "Accept"
+#: exercises/templates/history/overview.html:75
+msgid "View changes"
msgstr ""
-#: exercises/templates/exercise/view.html:64
-#: exercises/templates/exercise/view.html:204
-#: nutrition/templates/ingredient/view.html:42
-msgid "Decline"
-msgstr ""
-
-#: exercises/templates/exercise/view.html:96
-msgid "Images"
-msgstr ""
-
-#: exercises/templates/exercise/view.html:137 exercises/views/images.py:93
-msgid "Add new image"
-msgstr ""
-
-#: 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:218
-msgid "Comments for this exercise"
-msgstr ""
-
-#: exercises/templates/exercise/view.html:246
-msgid "Add new comment"
-msgstr ""
-
-#: exercises/templates/exercise/view.html:260
-msgid "The diagram shows the most used muscles on this exercise"
-msgstr ""
-
-#: 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:306
-msgid "Exercise Variations"
-msgstr ""
-
-#: exercises/templates/exercise/view.html:327
-msgid "Submit a correction"
+#: exercises/templates/history/overview.html:86
+msgid "Revert changes"
msgstr ""
#: exercises/templates/muscles/admin-overview.html:4
-#: exercises/templates/muscles/overview.html:7
msgid "Muscle overview"
msgstr ""
#: exercises/templates/muscles/admin-overview.html:36
-#: exercises/views/muscles.py:86
+#: exercises/views/muscles.py:67
msgid "Add muscle"
msgstr ""
-#: exercises/templates/muscles/overview.html:85
-msgid ""
-"No exercises for this muscle. Add or edit an exercise and set the muscle."
-msgstr ""
-
#: exercises/views/categories.py:71
msgid "Add category"
msgstr ""
@@ -1889,50 +1719,19 @@ msgstr ""
msgid "Add exercise comment"
msgstr ""
-#: exercises/views/equipment.py:107 exercises/views/equipment.py:118
+#: exercises/views/equipment.py:105 exercises/views/equipment.py:116
msgid "Delete equipment?"
msgstr ""
-#: exercises/views/exercises.py:229
+#: exercises/views/exercises.py:161
#, python-format
-msgid ""
-"%(name_original)s is too similar to existing exercise \"%(exercise_name)s\""
+msgid "%(name)s is too similar to existing exercise \"%(exercise_name)s\""
msgstr ""
-#: exercises/views/exercises.py:247
-msgid "Add exercise"
-msgstr ""
-
-#: exercises/views/exercises.py:367
-msgid "Thank you. Once the changes are reviewed the exercise will be updated."
-msgstr ""
-
-#: exercises/views/exercises.py:380
-#, python-brace-format
-msgid "Correct {0}"
-msgstr ""
-
-#: exercises/views/exercises.py:422
+#: exercises/views/exercises.py:184
msgid "This will delete the exercise from all workouts."
msgstr ""
-#: exercises/views/exercises.py:474
-msgid "Exercise was successfully marked as rejected"
-msgstr ""
-
-#: exercises/views/images.py:68
-msgid "Edit exercise image"
-msgstr ""
-
-#: exercises/views/images.py:143
-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 ""
@@ -1999,7 +1798,7 @@ msgid "Contract type"
msgstr ""
#: gym/models/contract.py:208 gym/templates/contract/view.html:59
-#: manager/templates/log/add.html:52 nutrition/forms.py:59
+#: manager/templates/log/add.html:52 nutrition/forms.py:60
#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:102
#: nutrition/models/meal_item.py:72
msgid "Amount"
@@ -2100,6 +1899,10 @@ msgstr ""
msgid "User notes"
msgstr ""
+#: gym/templates/contract/list.html:36
+msgid "Show"
+msgstr "Vis"
+
#: gym/templates/contract/view.html:4
msgid "Contract"
msgstr ""
@@ -2178,10 +1981,6 @@ msgstr ""
msgid "Add member"
msgstr ""
-#: gym/templates/gym/new_user.html:38
-msgid "Date of Birth"
-msgstr ""
-
#: gym/templates/gym/new_user.html:48 manager/templates/calendar/month.html:144
#: manager/templates/log/add.html:75 nutrition/templates/rate/form.html:120
msgid "Info"
@@ -2238,125 +2037,125 @@ msgstr ""
msgid "Edit gym"
msgstr ""
-#: i18n.tpl:2 i18n.tpl:28
-msgid "Abs"
+#: i18n.tpl:2
+msgid "Until Failure"
msgstr ""
-#: i18n.tpl:3
-msgid "Arms"
+#: i18n.tpl:3 manager/forms.py:180 manager/models/log.py:73
+#: manager/templates/set/add.html:53
+msgid "Repetitions"
msgstr ""
#: i18n.tpl:4
-msgid "Back"
+msgid "Abs"
msgstr ""
-#: i18n.tpl:5 i18n.tpl:23
-msgid "Calves"
+#: i18n.tpl:5
+msgid "Arms"
msgstr ""
-#: i18n.tpl:6 i18n.tpl:26
-msgid "Chest"
+#: i18n.tpl:6
+msgid "Legs"
msgstr ""
#: i18n.tpl:7
-msgid "Legs"
+msgid "Dumbbell"
msgstr ""
-#: i18n.tpl:8 i18n.tpl:19
-msgid "Shoulders"
+#: i18n.tpl:8
+msgid "Biceps"
msgstr ""
#: i18n.tpl:9
-msgid "Barbell"
+msgid "SZ-Bar"
msgstr ""
#: i18n.tpl:10
-msgid "Bench"
+msgid "Kettlebell"
msgstr ""
#: i18n.tpl:11
-msgid "Dumbbell"
+msgid "Swiss Ball"
msgstr ""
#: i18n.tpl:12
-msgid "Gym mat"
+msgid "none (bodyweight exercise)"
msgstr ""
#: i18n.tpl:13
-msgid "Incline bench"
+msgid "Calves"
msgstr ""
#: i18n.tpl:14
-msgid "Kettlebell"
+msgid "Back"
msgstr ""
#: i18n.tpl:15
-msgid "Pull-up bar"
+msgid "Lower back"
msgstr ""
#: i18n.tpl:16
-msgid "SZ-Bar"
+msgid "Lats"
msgstr ""
#: i18n.tpl:17
-msgid "Swiss Ball"
+msgid "Hamstrings"
msgstr ""
#: i18n.tpl:18
-msgid "none (bodyweight exercise)"
+msgid "Bench"
+msgstr ""
+
+#: i18n.tpl:19
+msgid "Glutes"
msgstr ""
#: i18n.tpl:20
-msgid "Biceps"
+msgid "Kilometers"
msgstr ""
#: i18n.tpl:21
-msgid "Hamstrings"
+msgid "Shoulders"
msgstr ""
#: i18n.tpl:22
-msgid "Lower back"
+msgid "Seconds"
msgstr ""
-#: i18n.tpl:24
-msgid "Glutes"
+#: i18n.tpl:23
+msgid "Miles"
msgstr ""
-#: i18n.tpl:25
-msgid "Lats"
+#: i18n.tpl:24
+msgid "Incline bench"
msgstr ""
-#: i18n.tpl:27
+#: i18n.tpl:25
msgid "Quads"
msgstr ""
-#: i18n.tpl:29
-msgid "Triceps"
-msgstr ""
-
-#: i18n.tpl:30
-msgid "Kilometers"
+#: i18n.tpl:26
+msgid "Minutes"
msgstr ""
-#: i18n.tpl:31
-msgid "Miles"
+#: i18n.tpl:27
+msgid "Chest"
msgstr ""
-#: i18n.tpl:32
-msgid "Minutes"
+#: i18n.tpl:28
+msgid "Gym mat"
msgstr ""
-#: i18n.tpl:33 manager/forms.py:169 manager/models/log.py:71
-#: manager/templates/set/add.html:53
-msgid "Repetitions"
+#: i18n.tpl:29
+msgid "Pull-up bar"
msgstr ""
-#: i18n.tpl:34
-msgid "Seconds"
+#: i18n.tpl:30
+msgid "Barbell"
msgstr ""
-#: i18n.tpl:35
-msgid "Until Failure"
+#: i18n.tpl:31
+msgid "Triceps"
msgstr ""
#: mailer/forms.py:34 mailer/templates/mailer/gym/preview.html:32
@@ -2410,44 +2209,44 @@ msgstr ""
msgid "Correction"
msgstr ""
-#: manager/forms.py:89 manager/models/workout.py:59
+#: manager/forms.py:92 manager/models/workout.py:59
msgid "The name of the workout"
msgstr ""
-#: manager/forms.py:93 manager/models/workout.py:66
+#: manager/forms.py:96 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
+#: manager/forms.py:137
msgid ""
"You can search for more than one exercise, they will be grouped together for "
"a superset."
msgstr ""
-#: 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
+#: manager/forms.py:166 manager/forms.py:171 manager/models/log.py:64
+#: manager/models/log.py:92 manager/models/setting.py:59
+#: manager/models/setting.py:90 manager/templates/log/add.html:53
+#: manager/templates/log/add.html:55 manager/templates/set/formset.html:10
+#: manager/templates/set/formset.html:12 measurements/models/category.py:58
+#: nutrition/forms.py:64
msgid "Unit"
msgstr ""
-#: manager/forms.py:266
+#: manager/forms.py:277
msgid "Type"
msgstr ""
-#: manager/forms.py:267 manager/templates/workout/view.html:157
+#: manager/forms.py:278 manager/templates/workout/view.html:157
msgid "Table"
msgstr ""
-#: manager/forms.py:269 manager/templates/workout/view.html:163
+#: manager/forms.py:280 manager/templates/workout/view.html:163
msgid "with images"
msgstr ""
-#: manager/forms.py:270 manager/templates/workout/view.html:169
+#: manager/forms.py:281 manager/templates/workout/view.html:169
msgid "with comments"
msgstr ""
@@ -2499,7 +2298,7 @@ msgid "The duration in weeks"
msgstr ""
#: manager/models/schedule_step.py:63 manager/models/set.py:52
-#: manager/models/setting.py:98 nutrition/models/meal.py:54
+#: manager/models/setting.py:110 nutrition/models/meal.py:54
#: nutrition/models/meal_item.py:65
msgid "Order"
msgstr ""
@@ -2550,7 +2349,7 @@ msgstr ""
msgid "Number of sets"
msgstr ""
-#: manager/models/setting.py:43
+#: manager/models/setting.py:48
msgid "Sets"
msgstr ""
@@ -2805,6 +2604,13 @@ msgid ""
"option in your settings."
msgstr ""
+#: manager/templates/workout/email_reminder.tpl:15
+#: manager/templates/workout/email_weight_reminder.tpl:12
+#: nutrition/templates/ingredient/email_new.tpl:9
+#, python-format
+msgid "The %(site)s team"
+msgstr ""
+
#: manager/templates/workout/email_weight_reminder.tpl:3
#, python-format
msgid ""
@@ -2817,6 +2623,10 @@ msgid ""
"You will regularly receive such reminders till you enter your current weight."
msgstr ""
+#: manager/templates/workout/log.html:10 manager/templates/workout/log.html:11
+msgid "Weight log"
+msgstr ""
+
#: manager/templates/workout/log.html:29
msgid "Weight log for workout"
msgstr ""
@@ -2917,7 +2727,7 @@ msgstr ""
msgid "Edit workout"
msgstr ""
-#: manager/templates/workout/view.html:225 manager/views/workout.py:300
+#: manager/templates/workout/view.html:225 manager/views/workout.py:301
msgid "Mark as template"
msgstr ""
@@ -2925,11 +2735,6 @@ msgstr ""
msgid "Add workout day"
msgstr ""
-#: manager/views/log.py:92
-#, python-format
-msgid "Edit log entry for %s"
-msgstr ""
-
#: manager/views/log.py:111
msgid "Delete workout log"
msgstr ""
@@ -2947,11 +2752,11 @@ msgstr ""
msgid "Your workouts"
msgstr ""
-#: manager/views/workout.py:227
+#: manager/views/workout.py:228
msgid "Copy workout"
msgstr ""
-#: manager/views/workout.py:230
+#: manager/views/workout.py:231
msgid "Copy"
msgstr ""
@@ -2973,29 +2778,29 @@ msgstr ""
msgid "Value"
msgstr ""
-#: nutrition/forms.py:122
+#: nutrition/forms.py:123
msgid "Calculate"
msgstr ""
-#: nutrition/forms.py:195 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:196 nutrition/templates/rate/form.html:76
msgid "Basic caloric intake"
msgstr ""
-#: nutrition/forms.py:196
+#: nutrition/forms.py:197
msgid "Your basic caloric intake as calculated for your data"
msgstr ""
-#: nutrition/forms.py:202
+#: nutrition/forms.py:203
msgid "Additional calories"
msgstr ""
-#: nutrition/forms.py:204
+#: nutrition/forms.py:205
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
msgstr ""
-#: nutrition/forms.py:232 nutrition/models/ingredient_weight_unit.py:39
+#: nutrition/forms.py:233 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"
@@ -3058,7 +2863,7 @@ msgid ""
"{energy_approx}%)"
msgstr ""
-#: nutrition/models/ingredient.py:357 nutrition/views/ingredient.py:225
+#: nutrition/models/ingredient.py:357 nutrition/views/ingredient.py:219
msgid "Ingredient was successfully added to the general database"
msgstr ""
@@ -3087,6 +2892,10 @@ msgstr ""
msgid "Meal"
msgstr ""
+#: nutrition/models/log.py:65
+msgid "Date and Time (Approx.)"
+msgstr ""
+
#: nutrition/models/meal.py:61
msgid "Time (approx)"
msgstr ""
@@ -3178,6 +2987,10 @@ msgid ""
"added to nutrition plans. You can access it on this address:"
msgstr ""
+#: nutrition/templates/ingredient/email_new.tpl:8
+msgid "Thank you for contributing and making this site better!"
+msgstr ""
+
#: nutrition/templates/ingredient/form.html:4
msgid "Submitting an ingredient"
msgstr ""
@@ -3202,6 +3015,10 @@ msgstr ""
msgid "No ingredients."
msgstr ""
+#: nutrition/templates/ingredient/overview.html:57
+msgid "Search"
+msgstr ""
+
#: nutrition/templates/ingredient/overview.html:66
msgid "ingredient name"
msgstr ""
@@ -3211,6 +3028,14 @@ msgstr ""
msgid "Add ingredient"
msgstr ""
+#: nutrition/templates/ingredient/overview.html:85
+msgid "Only registered users can do this"
+msgstr ""
+
+#: nutrition/templates/ingredient/pending.html:14
+msgid "Submission date"
+msgstr ""
+
#: nutrition/templates/ingredient/view.html:27
msgid "Ingredient is pending review"
msgstr ""
@@ -3223,6 +3048,18 @@ msgid ""
"the search."
msgstr ""
+#: nutrition/templates/ingredient/view.html:31
+msgid "Please select one of the options below."
+msgstr ""
+
+#: nutrition/templates/ingredient/view.html:38
+msgid "Accept"
+msgstr ""
+
+#: nutrition/templates/ingredient/view.html:42
+msgid "Decline"
+msgstr ""
+
#: nutrition/templates/ingredient/view.html:71
#: nutrition/templates/log/detail.html:31
#: nutrition/templates/plan/view.html:229 nutrition/views/plan.py:376
@@ -3463,14 +3300,18 @@ msgid ""
"yourself for some weeks and change the total amount if needed."
msgstr ""
-#: nutrition/views/ingredient.py:181
+#: nutrition/views/ingredient.py:175
msgid "Add a new ingredient"
msgstr ""
-#: nutrition/views/ingredient.py:238
+#: nutrition/views/ingredient.py:232
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 ""
@@ -3685,29 +3526,29 @@ msgstr ""
msgid "100%% Free <br>and <br>Open Source"
msgstr ""
-#: utils/generic_views.py:261
+#: utils/generic_views.py:262
msgid "Yes, delete"
msgstr ""
-#: utils/models.py:47
+#: utils/models.py:48
msgid "Author"
msgstr ""
-#: utils/models.py:52
+#: utils/models.py:53
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:77
+#: utils/models.py:78
msgid "Pending"
msgstr ""
-#: utils/models.py:78
+#: utils/models.py:79
msgid "Accepted"
msgstr ""
-#: utils/models.py:79
+#: utils/models.py:80
msgid "Declined"
msgstr ""
@@ -3847,3 +3688,24 @@ msgstr ""
#, python-format
msgid "Delete weight entry for the %s"
msgstr ""
+
+#~ msgid "Ingredients"
+#~ msgstr "Ingredienser"
+
+#~ msgid ""
+#~ "Use the configuration to select in what languages the\n"
+#~ "exercises and ingredients will be shown for the current language (for "
+#~ "example\n"
+#~ "the exercises should be shown in languages A, B and C; the ingredients "
+#~ "only\n"
+#~ "in A)."
+#~ msgstr ""
+#~ "Brug konfigurationen til at vælge i hvilket sprog øvelserne og "
+#~ "ingredienserne skal vises i for det nuværende sprog (for eksempel kan\n"
+#~ "øvelserne vises i sprog A, B og C; ingredienserne kun\n"
+#~ "i A)."
+
+#, fuzzy
+#~| msgid "Add one now."
+#~ msgid "Add new video"
+#~ msgstr "Tilføj en ny."
diff --git a/wger/locale/de/LC_MESSAGES/django.po b/wger/locale/de/LC_MESSAGES/django.po
index fcf9d4b2e..6bfc35996 100644
--- a/wger/locale/de/LC_MESSAGES/django.po
+++ b/wger/locale/de/LC_MESSAGES/django.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: wger Workout Manager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-14 12:01+0200\n"
+"POT-Creation-Date: 2022-11-10 16:03+0100\n"
"PO-Revision-Date: 2022-08-31 10:16+0000\n"
"Last-Translator: KneeClass03 <[email protected]>\n"
"Language-Team: German <https://hosted.weblate.org/projects/wger/web/de/>\n"
@@ -35,107 +35,8 @@ msgstr ""
"registrierten Benutzer diesem Studio zuweisen und alle Anwender ohne ein "
"Studio aktualisieren."
-#: 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 "Übungen"
-
-#: config/models/language_config.py:42
-msgid "Ingredients"
-msgstr "Zutaten"
-
-#: config/templates/language/overview.html:4 core/templates/navigation.html:226
-msgid "Languages"
-msgstr "Sprachen"
-
-#: config/templates/language/overview.html:16
-msgid "Nothing found."
-msgstr "Nichts gefunden."
-
-#: 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:150
-#: nutrition/templates/plan/view.html:153
-#: nutrition/templates/plan/view.html:191
-msgid "Add one now."
-msgstr "Jetzt hinzufügen."
-
-#: config/templates/language/overview.html:29
-#: core/templates/license/list.html:38 core/templates/misc/license/list.html:41
-#: core/templates/repetition_unit/list.html:41
-#: core/templates/user/overview.html:327 core/templates/user/overview.html:366
-#: core/templates/user/overview.html:402
-#: core/templates/weight_unit/list.html:41 core/views/languages.py:73
-#: core/views/license.py:65 core/views/repetition_units.py:65
-#: core/views/weight_units.py:65
-#: exercises/templates/categories/admin-overview.html:36
-#: 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:61
-msgid "Add"
-msgstr "Hinzufügen"
-
-#: config/templates/language/view.html:21 core/models/language.py:29
-msgid "Language short name"
-msgstr "Name der Sprache - kurz"
-
-#: config/templates/language/view.html:22
-#: config/templates/language/view.html:43 core/models/language.py:32
-msgid "Language full name"
-msgstr "Name der Sprache - lang"
-
-#: config/templates/language/view.html:34 core/templates/user/overview.html:451
-#: gym/views/admin_config.py:44 gym/views/admin_config.py:58
-#: gym/views/user_config.py:46
-msgid "Configuration"
-msgstr "Konfiguration"
-
-#: config/templates/language/view.html:35
-msgid ""
-"Use the configuration to select in what languages the\n"
-"exercises and ingredients will be shown for the current language (for "
-"example\n"
-"the exercises should be shown in languages A, B and C; the ingredients only\n"
-"in A)."
-msgstr ""
-"Benutze die Konfiguration um auszuwählen, in welchen Sprachen die \n"
-"Übungen und Zutaten für die gerade ausgewählte Sprache dargestellt werden "
-"sollen. (z.B. \n"
-"sollten die Übungen in Sprachen A, B und C, die Zutaten nur \n"
-"in A angezeigt werden)."
-
-#: config/templates/language/view.html:44 gym/templates/contract/list.html:36
-msgid "Show"
-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: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:45
-msgid "Options"
-msgstr "Optionen"
-
-#: config/templates/language/view.html:96 config/views/gym_config.py:41
-#: config/views/language_config.py:49 core/templates/license/list.html:16
-#: core/templates/misc/license/list.html:17
+#: config/views/gym_config.py:41 core/templates/language/view.html:57
+#: 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:39
#: core/templates/tags/render_day.html:75 core/templates/user/overview.html:205
@@ -143,12 +44,10 @@ 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:230
-#: exercises/templates/exercise/view.html:351
#: exercises/templates/muscles/admin-overview.html:16
-#: 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
+#: 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
#: 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,81 +63,54 @@ msgstr "Optionen"
msgid "Edit"
msgstr "Bearbeiten"
-#: 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: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: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
-#: gym/templates/contract_type/list.html:39 gym/templates/document/list.html:46
-#: gym/templates/gym/list.html:20 manager/templates/calendar/day.html:69
-#: 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:231
-#: 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:132
-#: nutrition/templates/units/list.html:20
-msgid "Delete"
-msgstr "Löschen"
-
-#: core/demo.py:86
+#: core/demo.py:95
msgid "Sample workout"
msgstr "Beispiel Trainingsplan"
-#: core/demo.py:90
+#: core/demo.py:99
msgid "Sample day"
msgstr "Beispieltag"
-#: core/demo.py:94
+#: core/demo.py:103
msgid "Another sample day"
msgstr "Noch ein Beispieltag"
-#: core/demo.py:217
-msgid "Sample nutrional plan"
+#: core/demo.py:211
+#, fuzzy
+#| msgid "Sample nutrional plan"
+msgid "Sample nutritional plan"
msgstr "Beispiel Ernährungplan"
-#: core/demo.py:349 core/demo.py:351 core/demo.py:353
+#: core/demo.py:343 core/demo.py:345 core/demo.py:347
#, python-brace-format
msgid "Placeholder workout nr {0} for schedule"
msgstr "Platzhalter Trainingsplan {0} für Zeitplan"
-#: core/demo.py:358
+#: core/demo.py:352
msgid "My cool workout schedule"
msgstr "Mein cooler Zeitplan"
-#: core/demo.py:397 core/demo.py:412
+#: core/demo.py:391 core/demo.py:406
msgid "Empty placeholder schedule"
msgstr "Leerer Platzhalter Zeitplan"
-#: core/forms.py:61 core/templates/navigation.html:188
-#: core/templates/navigation.html:192 core/templates/user/login.html:4
+#: core/forms.py:64 core/templates/navigation.html:179
+#: core/templates/navigation.html:183 core/templates/user/login.html:4
#: software/templates/features.html:43
msgid "Login"
msgstr "Anmelden"
-#: core/forms.py:73 core/forms.py:164 gym/views/export.py:63
+#: core/forms.py:76 core/forms.py:177 gym/views/export.py:63
#: gym/views/gym.py:218
msgid "First name"
msgstr "Vorname"
-#: core/forms.py:74 core/forms.py:165 core/templates/user/overview.html:267
+#: core/forms.py:77 core/forms.py:178 core/templates/user/overview.html:267
#: gym/views/export.py:64 gym/views/gym.py:218
msgid "Last name"
msgstr "Nachname"
-#: core/forms.py:76 core/forms.py:131 core/templates/user/overview.html:271
+#: core/forms.py:79 core/forms.py:144 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
@@ -248,79 +120,109 @@ msgstr "Nachname"
msgid "Email"
msgstr "E-Mail"
-#: core/forms.py:77
+#: core/forms.py:80
msgid "Used for password resets and, optionally, e-mail reminders."
msgstr ""
"Wird für das Zurücksetzen von Passwörter und, optional, für E-Mail-"
"Erinnerungen verwendet."
-#: core/forms.py:102
+#: core/forms.py:84 core/models/profile.py:220
+#: gym/templates/gym/new_user.html:38
+msgid "Date of Birth"
+msgstr "Geburtsdatum"
+
+#: core/forms.py:116
msgid "Personal data"
msgstr "Persönliche Daten"
-#: core/forms.py:110
+#: core/forms.py:124
msgid "Workout reminders"
msgstr "Trainingsplanerinnerungen"
-#: core/forms.py:117
+#: core/forms.py:131
msgid "Other settings"
msgstr "Andere Einstellungen"
-#: 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
+#: core/forms.py:138 core/views/user.py:615 core/views/user.py:630
+#: core/views/user.py:642 gym/forms.py:72 manager/templates/log/add.html:65
+#: manager/templates/set/add.html:69 manager/views/workout.py:222
+#: utils/generic_views.py:143
msgid "Save"
msgstr "Speichern"
-#: core/forms.py:132
+#: core/forms.py:145
msgid "Used for password resets and, optionally, email reminders."
msgstr ""
"Wird für das Zurücksetzen von Passwörter und, optional, für E-Mail-"
"Erinnerungen verwendet."
-#: core/forms.py:160
+#: core/forms.py:173
msgid "This e-mail address is already in use."
msgstr "Diese E-Mail-Adresse wird bereits verwendet."
-#: core/forms.py:180 gym/templates/gym/new_user.html:26
+#: core/forms.py:193 gym/templates/gym/new_user.html:26
#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:218
msgid "Password"
msgstr "Passwort"
-#: core/forms.py:182
+#: core/forms.py:195
msgid "Please enter your current password."
msgstr "Bitte dein aktuelles Passwort eingeben."
-#: core/forms.py:200
+#: core/forms.py:204 core/templates/language/view.html:62
+#: 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: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/muscles/admin-overview.html:17
+#: gym/templates/admin_notes/list.html:40
+#: gym/templates/contract_option/list.html:39
+#: gym/templates/contract_type/list.html:39 gym/templates/document/list.html:46
+#: gym/templates/gym/list.html:20 manager/templates/calendar/day.html:69
+#: 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:231
+#: 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:132
+#: nutrition/templates/units/list.html:20
+msgid "Delete"
+msgstr "Löschen"
+
+#: core/forms.py:213
msgid "Invalid password"
msgstr "Ungültiges Passwort"
-#: core/forms.py:212 core/forms.py:278
+#: core/forms.py:225 core/forms.py:291
msgid "The form is secured with reCAPTCHA"
msgstr "Das Formular ist mit reCaptcha gesichert"
-#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:188
-#: core/templates/navigation.html:193 core/templates/template.html:149
-#: core/templates/user/login.html:20 core/views/user.py:293
+#: core/forms.py:239 core/forms.py:258 core/templates/navigation.html:179
+#: core/templates/navigation.html:184 core/templates/template.html:149
+#: core/templates/user/login.html:20 core/views/user.py:300
#: software/templates/features.html:38
msgid "Register"
msgstr "Registrieren"
-#: core/forms.py:256
+#: core/forms.py:269
msgid "Contact"
msgstr "Kontakt"
-#: core/forms.py:257
+#: core/forms.py:270
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:71
+#: core/forms.py:278 exercises/models/comment.py:42 manager/models/set.py:60
+#: manager/models/setting.py:111 nutrition/models/log.py:71
msgid "Comment"
msgstr "Kommentar"
-#: core/forms.py:266
+#: core/forms.py:279
msgid "What do you want to say?"
msgstr "Was willst du sagen?"
@@ -328,6 +230,14 @@ msgstr "Was willst du sagen?"
msgid "Day of the week"
msgstr "Wochentag"
+#: core/models/language.py:31 core/templates/language/view.html:21
+msgid "Language short name"
+msgstr "Name der Sprache - kurz"
+
+#: core/models/language.py:36 core/templates/language/view.html:22
+msgid "Language full name"
+msgstr "Name der Sprache - lang"
+
#: core/models/license.py:29
msgid "Full name"
msgstr "Name"
@@ -385,19 +295,19 @@ msgstr "Metrisch (Kilogramm)"
msgid "Imperial (pound)"
msgstr "Imperial (Pfund)"
-#: core/models/profile.py:111
+#: core/models/profile.py:114
msgid "Show exercise comments"
msgstr "Übungskommentare ein/ausblenden"
-#: core/models/profile.py:112
+#: core/models/profile.py:115
msgid "Check to show exercise comments on the workout view"
msgstr "Auswählen, um Übungskommentare auf der Trainingsplanseite anzuzeigen"
-#: core/models/profile.py:123
+#: core/models/profile.py:126
msgid "Also use ingredients in English"
msgstr "Auch Zutaten auf Englisch anzeigen"
-#: core/models/profile.py:125
+#: core/models/profile.py:128
msgid ""
"Check to also show ingredients in English while creating\n"
"a nutritional plan. These ingredients are extracted from a list provided\n"
@@ -410,11 +320,11 @@ msgstr ""
"Einträge und ist extrem vollständig, \n"
"kann aber die Suche etwas unübersichtlich machen."
-#: core/models/profile.py:134
+#: core/models/profile.py:137
msgid "Activate workout reminders"
msgstr "Trainingsplanerinnerungen aktivieren"
-#: core/models/profile.py:136
+#: core/models/profile.py:139
msgid ""
"Check to activate automatic reminders for workouts. You need to provide a "
"valid email for this to work."
@@ -422,21 +332,21 @@ msgstr ""
"Auswählen, um automatische Erinnerungen für Trainingspläne zu aktivieren. Du "
"wirst eine korrekte E-Mail-Adresse dafür brauchen."
-#: core/models/profile.py:145
+#: core/models/profile.py:148
msgid "Remind before expiration"
msgstr "Vor Ablauf erinnern"
-#: core/models/profile.py:146
+#: core/models/profile.py:149
msgid "The number of days you want to be reminded before a workout expires."
msgstr ""
"Die Anzahl der Tage, die du vor dem Ablauf des Trainingsplanes erinnert "
"werden möchtest."
-#: core/models/profile.py:152
+#: core/models/profile.py:155
msgid "Default duration of workouts"
msgstr "Standardwert der Trainingsplandauer"
-#: core/models/profile.py:154
+#: core/models/profile.py:157
msgid ""
"Default duration in weeks of workouts not in a schedule. Used for email "
"workout reminders."
@@ -444,11 +354,11 @@ msgstr ""
"Standardwert in Wochen für Trainingspläne, die nicht in einem Zeitplan sind. "
"Wird für E-Mail-Erinnerungen benutzt."
-#: core/models/profile.py:171
+#: core/models/profile.py:174
msgid "Notification language"
msgstr "Sprache für Benachrichtigungen"
-#: core/models/profile.py:173
+#: core/models/profile.py:176
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."
@@ -457,70 +367,70 @@ msgstr ""
"Erinnerungs-E-Mails für Trainingspläne. Diese Angabe beeinflusst die Sprache "
"der Website nicht."
-#: core/models/profile.py:186 gym/views/export.py:66
+#: core/models/profile.py:212 gym/views/export.py:66
msgid "Age"
msgstr "Alter"
-#: core/models/profile.py:202 nutrition/forms.py:99
+#: core/models/profile.py:228 nutrition/forms.py:100
msgid "Height (cm)"
msgstr "Größe (cm)"
-#: core/models/profile.py:219
+#: core/models/profile.py:245
msgid "Hours of sleep"
msgstr "Stunden Schlaf"
-#: core/models/profile.py:220
+#: core/models/profile.py:246
msgid "The average hours of sleep per day"
msgstr "Durschnitliche Stunden Schlaf pro Tag"
-#: core/models/profile.py:229
+#: core/models/profile.py:255
msgid "Work"
msgstr "Arbeit"
-#: core/models/profile.py:230 core/models/profile.py:272
+#: core/models/profile.py:256 core/models/profile.py:298
msgid "Average hours per day"
msgstr "Durschnittliche Stunden pro Tag"
-#: core/models/profile.py:239 core/models/profile.py:260
-#: core/models/profile.py:281
+#: core/models/profile.py:265 core/models/profile.py:286
+#: core/models/profile.py:307
msgid "Physical intensity"
msgstr "Körperliche Intensität"
-#: core/models/profile.py:240 core/models/profile.py:261
-#: core/models/profile.py:282
+#: core/models/profile.py:266 core/models/profile.py:287
+#: core/models/profile.py:308
msgid "Approximately"
msgstr "Ungefähr"
-#: core/models/profile.py:250
+#: core/models/profile.py:276
msgid "Sport"
msgstr "Sport"
-#: core/models/profile.py:251
+#: core/models/profile.py:277
msgid "Average hours per week"
msgstr "Durschnittliche Stunden pro Woche"
-#: core/models/profile.py:271
+#: core/models/profile.py:297
msgid "Free time"
msgstr "Freizeit"
-#: core/models/profile.py:292 nutrition/templates/rate/form.html:66
+#: core/models/profile.py:318 nutrition/templates/rate/form.html:66
msgid "Total daily calories"
msgstr "Gesamte tägliche Kalorien"
-#: core/models/profile.py:293
+#: core/models/profile.py:319
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
+#: core/models/profile.py:331 nutrition/models/ingredient_weight_unit.py:45
#: nutrition/models/log.py:90 nutrition/models/meal_item.py:58
msgid "Weight unit"
msgstr "Gewichtseinheit"
-#: core/models/profile.py:313
+#: core/models/profile.py:339
msgid "Allow external access"
msgstr "Externen Zugriff zulassen"
-#: core/models/profile.py:315
+#: core/models/profile.py:341
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."
@@ -529,25 +439,24 @@ msgstr ""
"Lese-Modus. Du musst das aktivieren, bevor du Links z.B. über soziale Medien "
"freigeben kannst."
-#: core/models/profile.py:324
+#: core/models/profile.py:350
msgid "Automatic reminders for weight entries"
msgstr "Automatische E-Mail-Erinnerungen für Gewichtseinträge"
-#: core/models/profile.py:326
+#: core/models/profile.py:352
msgid "Number of days after the last weight entry (enter 0 to deactivate)"
msgstr ""
"Anzahl der Tage nach dem letzten Gewichtseintrag (0 eingeben zum "
"deaktivieren)"
-#: core/models/profile.py:392
+#: core/models/profile.py:418
msgid "The sum of all hours has to be 24"
msgstr "Die Summe aller Stunden muss 24 sein"
#: core/models/rep_unit.py:35 core/models/weight_unit.py:35
-#: core/templates/user/overview.html:263 core/views/user.py:575
+#: core/templates/user/overview.html:263 core/views/user.py:591
#: 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
+#: exercises/models/exercise.py:64 exercises/models/muscle.py:36
#: 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
@@ -611,6 +520,53 @@ msgstr ""
"Bist du sicher, dass du das löschen willst? Diese Aktion kann nicht "
"rückgängig gemacht werden."
+#: core/templates/email_verification/confirm_template.html:4
+msgid "Email verified"
+msgstr ""
+
+#: core/templates/email_verification/confirm_template.html:18
+#, python-format
+msgid "%(username)s, your email was verified"
+msgstr ""
+
+#: core/templates/email_verification/confirm_template.html:22
+msgid "Error, invalid verification token"
+msgstr ""
+
+#: core/templates/email_verification/email_body_html.tpl:6
+#, fuzzy
+#| msgid "Configuration"
+msgid "Email Confirmation"
+msgstr "Konfiguration"
+
+#: core/templates/email_verification/email_body_html.tpl:9
+#: core/templates/email_verification/email_body_txt.tpl:3
+#, fuzzy, python-format
+#| msgid "Calendar for %(username)s"
+msgid "You are almost there, %(username)s!"
+msgstr "Kalender für %(username)s"
+
+#: core/templates/email_verification/email_body_html.tpl:11
+#, python-format
+msgid "Please click <a href=\"%(link)s\">here</a> to confirm your email"
+msgstr ""
+
+#: core/templates/email_verification/email_body_html.tpl:12
+#: core/templates/email_verification/email_body_txt.tpl:5
+#, python-format
+msgid "The token expires on %(time)s"
+msgstr ""
+
+#: core/templates/email_verification/email_body_html.tpl:14
+#: core/templates/email_verification/email_body_txt.tpl:8
+msgid "the wger Team"
+msgstr ""
+
+#: core/templates/email_verification/email_body_txt.tpl:4
+#, python-format
+msgid "Please click the following link to confirm your email: %(link)s"
+msgstr ""
+
#: core/templates/index.html:4
msgid "Dashboard"
msgstr "Übersicht"
@@ -673,7 +629,7 @@ msgid "Add custom diary entry"
msgstr "Benutzerdefinierten Tagebucheintrag hinzufügen"
#: core/templates/index.html:84 core/templates/index.html:92
-#: manager/models/day.py:34 manager/models/log.py:56
+#: manager/models/day.py:34 manager/models/log.py:58
#: manager/models/session.py:60 manager/models/workout.py:109
#: manager/templates/schedule/view.html:105
#: manager/templates/workout/view.html:11
@@ -706,6 +662,20 @@ msgstr "Neuen Tagebucheintrag hinzufügen"
msgid "No workouts found."
msgstr "Keine Trainingspläne gefunden."
+#: core/templates/index.html:137 core/templates/index.html:189
+#: core/templates/language/overview.html:23
+#: 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:150
+#: nutrition/templates/plan/view.html:153
+#: nutrition/templates/plan/view.html:191
+msgid "Add one now."
+msgstr "Jetzt hinzufügen."
+
#: 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
@@ -759,19 +729,59 @@ msgid "No nutrition plans."
msgstr "Keine Ernährungspläne."
#: 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
+#: core/templates/user/overview.html:121 manager/forms.py:184
+#: manager/helpers.py:89 manager/models/log.py:86 manager/models/setting.py:79
+#: manager/templates/log/add.html:54 manager/templates/set/formset.html:11
#: weight/models.py:34 weight/templates/import_csv_preview.html:14
#: weight/templates/import_csv_preview.html:43 weight/views.py:150
msgid "Weight"
msgstr "Gewicht"
-#: core/templates/index.html:210 core/templates/navigation.html:135
+#: core/templates/index.html:210 core/templates/navigation.html:126
#: weight/views.py:70
msgid "Add weight entry"
msgstr "Gewichtseintrag hinzufügen"
+#: core/templates/language/overview.html:4 core/templates/navigation.html:217
+msgid "Languages"
+msgstr "Sprachen"
+
+#: core/templates/language/overview.html:23
+msgid "Nothing found."
+msgstr "Nichts gefunden."
+
+#: core/templates/language/overview.html:36 core/templates/license/list.html:38
+#: core/templates/misc/license/list.html:41
+#: core/templates/repetition_unit/list.html:41
+#: core/templates/user/overview.html:327 core/templates/user/overview.html:366
+#: core/templates/user/overview.html:402
+#: core/templates/weight_unit/list.html:41 core/views/languages.py:73
+#: core/views/license.py:65 core/views/repetition_units.py:65
+#: core/views/weight_units.py:65
+#: exercises/templates/categories/admin-overview.html:36
+#: 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:61
+msgid "Add"
+msgstr "Hinzufügen"
+
+#: core/templates/language/view.html:52 core/templates/user/api_key.html:44
+#: core/templates/user/preferences.html:44 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:45
+msgid "Options"
+msgstr "Optionen"
+
#: core/templates/license/list.html:4 core/templates/misc/license/list.html:4
msgid "License list"
msgstr "Lizenzliste"
@@ -784,7 +794,6 @@ msgstr "Lizenzliste"
#: core/templates/weight_unit/list.html:26
#: exercises/templates/categories/admin-overview.html:24
#: exercises/templates/equipment/admin-overview.html:24
-#: exercises/templates/exercise/pending.html:30
#: exercises/templates/muscles/admin-overview.html:24
#: gym/templates/admin_notes/list.html:52 gym/templates/contract/list.html:60
#: gym/templates/contract_option/list.html:56
@@ -866,155 +875,135 @@ msgstr "Ihre Vorlagen"
msgid "Public templates"
msgstr "Öffentliche Vorlagen"
-#: core/templates/navigation.html:64
-msgctxt "as in sorted by category"
-msgid "by category"
-msgstr "nach Kategorie"
-
-#: core/templates/navigation.html:65
-msgctxt "as in sorted by muscle"
-msgid "by muscle"
-msgstr "nach Muskeln"
-
-#: core/templates/navigation.html:66
-msgctxt "as in sorted by equipment"
-msgid "by equipment"
-msgstr "nach Ausrüstung"
+#: core/templates/navigation.html:63 manager/forms.py:133
+#: manager/models/setting.py:54
+msgid "Exercises"
+msgstr "Übungen"
-#: core/templates/navigation.html:70
-#: exercises/templates/equipment/overview.html:109
-#: exercises/templates/equipment/overview.html:113
-#: exercises/templates/exercise/overview.html:112
-#: exercises/templates/exercise/overview.html:116
-#: exercises/templates/muscles/overview.html:112
-#: exercises/templates/muscles/overview.html:116
-msgid "Add new exercise"
-msgstr "Neue Übung hinzufügen"
-
-#: core/templates/navigation.html:75 core/templates/navigation.html:116
-#: core/templates/navigation.html:224
+#: core/templates/navigation.html:67 core/templates/navigation.html:107
+#: core/templates/navigation.html:215
msgid "Administration"
msgstr "Administration"
-#: core/templates/navigation.html:76
-#: exercises/templates/exercise/pending.html:6
-msgid "Exercises pending review"
-msgstr "Übungen ohne Freigabe"
+#: core/templates/navigation.html:68
+#, fuzzy
+#| msgid "Exercise day"
+msgid "Exercise edit history"
+msgstr "Übungstag"
-#: core/templates/navigation.html:77 exercises/models/base.py:72
-#: exercises/templates/exercise/view.html:80
+#: core/templates/navigation.html:69 exercises/models/base.py:84
msgid "Equipment"
msgstr "Gerät"
-#: core/templates/navigation.html:78 exercises/templates/exercise/view.html:258
+#: core/templates/navigation.html:70
msgid "Muscles"
msgstr "Muskeln"
-#: core/templates/navigation.html:79
+#: core/templates/navigation.html:71
#: exercises/templates/categories/admin-overview.html:4
msgid "Categories"
msgstr "Kategorien"
-#: core/templates/navigation.html:93 software/templates/features.html:87
+#: core/templates/navigation.html:84 software/templates/features.html:87
msgid "Nutrition"
msgstr "Ernährung"
-#: core/templates/navigation.html:99 core/templates/user/overview.html:144
+#: core/templates/navigation.html:90 core/templates/user/overview.html:144
msgid "Nutrition plans"
msgstr "Ernährungspläne"
-#: core/templates/navigation.html:105 nutrition/templates/bmi/form.html:50
+#: core/templates/navigation.html:96 nutrition/templates/bmi/form.html:50
msgid "BMI calculator"
msgstr "BMI-Rechner"
-#: core/templates/navigation.html:111 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:102 nutrition/templates/rate/form.html:17
msgid "Daily calories calculator"
msgstr "Kalorienrechner"
-#: core/templates/navigation.html:113
+#: core/templates/navigation.html:104
#: nutrition/templates/ingredient/overview.html:29
msgid "Ingredient overview"
msgstr "Zutatenübersicht"
-#: core/templates/navigation.html:117 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:108 nutrition/templates/units/list.html:6
msgid "Ingredient weight units"
msgstr "Gewichtseinheiten für Zutaten"
-#: core/templates/navigation.html:118
+#: core/templates/navigation.html:109
#: nutrition/templates/ingredient/pending.html:6
msgid "Ingredients pending review"
msgstr "Zutaten ohne Freigabe"
-#: core/templates/navigation.html:132
+#: core/templates/navigation.html:123
msgid "Body weight"
msgstr "Körpergewicht"
-#: core/templates/navigation.html:134 core/templates/user/overview.html:114
+#: core/templates/navigation.html:125 core/templates/user/overview.html:114
#: weight/templates/overview.html:7
msgid "Weight overview"
msgstr "Gewichtsübersicht"
-#: core/templates/navigation.html:147
+#: core/templates/navigation.html:138
msgid "About this software"
msgstr "Über diese Software"
-#: core/templates/navigation.html:149 core/templates/template_features.html:82
+#: core/templates/navigation.html:140 core/templates/template_features.html:82
#: software/templates/about_us.html:5
msgid "About us"
msgstr "Über uns"
-#: core/templates/navigation.html:151 software/templates/features.html:209
+#: core/templates/navigation.html:142 software/templates/features.html:209
msgid "REST API"
msgstr "REST API"
-#: core/templates/navigation.html:155 utils/models.py:40
+#: core/templates/navigation.html:146 utils/models.py:41
msgid "License"
msgstr "Lizenz"
-#: core/templates/navigation.html:161
+#: core/templates/navigation.html:152
msgid "Developer documentation"
msgstr "Entwickler-Dokumentation"
-#: core/templates/navigation.html:167
+#: core/templates/navigation.html:158
msgid "Get the code"
msgstr "Quellcode"
-#: core/templates/navigation.html:173 core/templates/template.html:204
+#: core/templates/navigation.html:164 core/templates/template.html:203
#: core/templates/template_features.html:99
msgid "Translate"
msgstr "Übersetze"
-#: core/templates/navigation.html:194 core/templates/user/login.html:28
+#: core/templates/navigation.html:185 core/templates/user/login.html:28
msgid "Reset password"
msgstr "Passwort zurücketzen"
-#: core/templates/navigation.html:207
+#: core/templates/navigation.html:198
msgid "My preferences"
msgstr "Meine Einstellungen"
-#: core/templates/navigation.html:214
+#: core/templates/navigation.html:205
msgid "Logout"
msgstr "Abmelden"
-#: core/templates/navigation.html:229
+#: core/templates/navigation.html:220
msgid "Licenses"
msgstr "Lizenzen"
-#: core/templates/navigation.html:232
+#: core/templates/navigation.html:223
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr "Wiederholungs-Einheiten"
-#: core/templates/navigation.html:235 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:226 core/templates/weight_unit/list.html:4
#: nutrition/templates/ingredient/view.html:174
msgid "Weight units"
msgstr "Gewichtseinheiten"
-#: core/templates/navigation.html:238 core/templates/user/list.html:4
+#: core/templates/navigation.html:229 core/templates/user/list.html:4
msgid "User list"
msgstr "Benutzerliste"
-#: core/templates/navigation.html:239
+#: core/templates/navigation.html:230
msgid "Gyms"
msgstr "Studios"
@@ -1093,33 +1082,30 @@ msgstr "vor"
msgid "Add weight log"
msgstr "Gewichtslog hinzufügen"
-#: core/templates/tags/render_day.html:114
-#: exercises/templates/equipment/overview.html:59
-#: exercises/templates/exercise/overview.html:63
-#: exercises/templates/muscles/overview.html:65
+#: core/templates/tags/render_day.html:116
msgid "Placeholder image for exercise"
msgstr "Platzhalter-Bild für Übung"
-#: core/templates/tags/render_day.html:131
+#: core/templates/tags/render_day.html:133
msgid "This exercise has no repetitions."
msgstr "Diese Übung hat keine Wiederholungen."
-#: core/templates/tags/render_day.html:134
+#: core/templates/tags/render_day.html:136
msgid "Edit them now."
msgstr "Jetzt bearbeiten."
-#: core/templates/tags/render_day.html:159
+#: core/templates/tags/render_day.html:162
msgid "Add exercises to this workout day"
msgstr "Übungen zu diesem Trainingstag hinzufügen"
#: core/templates/tags/render_weight_log.html:17 manager/helpers.py:89
-#: manager/models/setting.py:57 manager/templates/set/formset.html:10
+#: manager/models/setting.py:69 manager/templates/set/formset.html:9
msgid "Reps"
msgstr "Wdh."
-#: 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
+#: core/templates/tags/render_weight_log.html:30 manager/forms.py:189
+#: manager/models/log.py:103 manager/models/setting.py:99
+#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
msgid "RiR"
msgstr "RiR"
@@ -1144,7 +1130,7 @@ msgstr "Allgemeine Nutzungsbedingungen"
msgid "Features"
msgstr "Funktionen"
-#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:37
+#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:53
msgid "API key"
msgstr "API-Schlüssel"
@@ -1159,8 +1145,8 @@ msgid ""
"below."
msgstr ""
"Erstelle ein API-Schlüssel wenn du mit wger über \n"
-"die <a href=\"%(url)s\" rel=\"nofollow\">REST API</a> interagieren willst ("
-"für \n"
+"die <a href=\"%(url)s\" rel=\"nofollow\">REST API</a> interagieren willst "
+"(für \n"
"öffentliche Ressourcen wie die Übungen oder Zutaten brauchst du nichts "
"mitzusenden). \n"
"Du musst diesen Schlüssel zusammen im Request-Header mitgeben."
@@ -1191,11 +1177,12 @@ msgid "Documentation"
msgstr "Dokumentation"
#: core/templates/user/delete_account.html:4
-#: core/templates/user/preferences.html:42
+#: core/templates/user/preferences.html:58
msgid "Delete account"
msgstr "Konto löschen"
#: core/templates/user/delete_account.html:17
+#: exercises/templates/history/overview.html:93
msgid "Are you sure?"
msgstr "Bist du sicher?"
@@ -1244,11 +1231,12 @@ msgstr "Trainingsplan hinzufügen"
#: core/templates/user/overview.html:34 core/templates/user/overview.html:76
#: core/templates/user/overview.html:120 core/templates/user/overview.html: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
-#: 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
+#: exercises/models/base.py:99 exercises/models/base.py:104
+#: exercises/models/exercise.py:69 exercises/models/exercise.py:76
+#: gallery/models/image.py:47 manager/helpers.py:88 manager/models/log.py:100
+#: 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/views.py:150
@@ -1256,11 +1244,11 @@ msgid "Date"
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: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
+#: exercises/models/exercise.py:57 exercises/views/exercises.py:123
+#: 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 "Beschreibung"
@@ -1268,12 +1256,12 @@ msgstr "Beschreibung"
msgid "Number of logs (days)"
msgstr "Anzahl der Protokolle (Tage)"
-#: core/templates/user/overview.html:37 core/views/user.py:576
+#: core/templates/user/overview.html:37 core/views/user.py:592
#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:157
msgid "Last activity"
msgstr "Letzte Aktivität"
-#: core/templates/user/overview.html:68 manager/forms.py:267
+#: core/templates/user/overview.html:68 manager/forms.py:278
#: manager/templates/workout/view.html:151
msgid "Log"
msgstr "Tagebucheintrag"
@@ -1291,6 +1279,7 @@ msgid "Notes"
msgstr "Notizen"
#: core/templates/user/overview.html:79
+#: exercises/templates/history/overview.html:30
#: manager/templates/calendar/partial_overview_table.html:42
#: nutrition/templates/log/detail.html:154
msgid "Time"
@@ -1338,10 +1327,12 @@ msgid "Do you really want to change this user&#39;s password?"
msgstr "Möchtest du wirklich das Passwort vom diesem Benutzer zurücksetzen?"
#: core/templates/user/overview.html:233
+#: exercises/templates/history/overview.html:106
msgid "No"
msgstr "Nein"
#: core/templates/user/overview.html:234
+#: exercises/templates/history/overview.html:99
msgid "Yes"
msgstr "Ja"
@@ -1396,10 +1387,15 @@ msgid "Documents"
msgstr "Dokumente"
#: core/templates/user/overview.html:413 gym/templates/document/list.html:32
-#: manager/forms.py:279 manager/templates/workout/view.html:176
+#: manager/forms.py:290 manager/templates/workout/view.html:176
msgid "Download"
msgstr "Runterladen"
+#: core/templates/user/overview.html:451 gym/views/admin_config.py:44
+#: gym/views/admin_config.py:58 gym/views/user_config.py:46
+msgid "Configuration"
+msgstr "Konfiguration"
+
#: core/templates/user/overview.html:454 gym/models/user_config.py:92
msgid "Include in inactive overview"
msgstr "In Inaktivübersicht aufnehmen"
@@ -1417,7 +1413,25 @@ msgstr "Als diesen Benutzer einloggen"
msgid "Preferences"
msgstr "Einstellungen"
-#: core/templates/user/preferences.html:33 core/views/user.py:587
+#: core/templates/user/preferences.html:19
+#, fuzzy
+#| msgid "Send emails"
+msgid "Verified email"
+msgstr "E-Mails senden"
+
+#: core/templates/user/preferences.html:24
+msgid "Unverified email"
+msgstr ""
+
+#: core/templates/user/preferences.html:26
+msgid "Send verification email"
+msgstr ""
+
+#: core/templates/user/preferences.html:30
+msgid "You need to verify your email to contribute exercises"
+msgstr ""
+
+#: core/templates/user/preferences.html:49 core/views/user.py:603
msgid "Change password"
msgstr "Passwort ändern"
@@ -1447,39 +1461,37 @@ msgid "oz"
msgstr "oz"
#: 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
+#: exercises/views/equipment.py:104 exercises/views/exercises.py:185
+#: exercises/views/muscles.py:99 manager/views/schedule.py:311
+#: manager/views/schedule_step.py:129 manager/views/workout.py:269
+#: manager/views/workout_session.py:141 nutrition/views/ingredient.py:138
#: 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:431
-#: exercises/views/muscles.py:125 gallery/views/images.py:121
+#: exercises/views/categories.py:127 exercises/views/exercises.py:193
+#: exercises/views/muscles.py:106 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
+#: manager/views/workout.py:273 manager/views/workout_session.py:156
+#: nutrition/views/ingredient.py:145 nutrition/views/plan.py:127
#: nutrition/views/unit.py:118
#, python-brace-format
msgid "Delete {0}?"
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/repetition_units.py:85 core/views/user.py:472
#: 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: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
+#: exercises/views/equipment.py:81 exercises/views/muscles.py:86
+#: 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:170
+#: gym/views/gym.py:459 manager/views/day.py:100 manager/views/schedule.py:335
+#: manager/views/workout.py:287 nutrition/views/ingredient.py:164
+#: nutrition/views/plan.py:144 nutrition/views/unit.py:144
#, python-brace-format
msgid "Edit {0}"
msgstr "{0} bearbeiten"
@@ -1511,64 +1523,65 @@ msgstr "Abschicken"
msgid "Your feedback was successfully sent. Thank you!"
msgstr "Dein Feedback wurde erfolgeich versendet. Danke!"
-#: core/views/user.py:156
+#: core/views/user.py:157
#, python-brace-format
msgid "Account \"{0}\" was successfully deleted"
msgstr "Konto „{0}“ wurde erfolgreich gelöscht"
-#: core/views/user.py:287
+#: core/views/user.py:294
msgid "You were successfully registered"
msgstr "Du hast dich erfolgreich registriert"
-#: core/views/user.py:339
+#: core/views/user.py:355
msgid "Settings successfully updated"
msgstr "Einstellungen erfolgreich aktualisiert"
-#: core/views/user.py:376
+#: core/views/user.py:392
msgid "The user was successfully deactivated"
msgstr "Der Benutzer wurde erfolgreich deaktiviert"
-#: core/views/user.py:411
+#: core/views/user.py:427
msgid "The user was successfully activated"
msgstr "Der Benutzer wurde erfolgreich aktiviert"
-#: core/views/user.py:426
+#: core/views/user.py:442
msgid "Edit user"
msgstr "Benutzer bearbeiten"
-#: core/views/user.py:573 gym/templates/gym/member_list.html:26
+#: core/views/user.py:589 gym/templates/gym/member_list.html:26
#: gym/views/gym.py:156
msgid "ID"
msgstr "ID"
-#: core/views/user.py:574 gym/forms.py:94 gym/templates/contract/view.html:55
+#: core/views/user.py:590 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 "Benutzername"
-#: core/views/user.py:577 gym/templates/gym/new_user.html:34
+#: core/views/user.py:593 gym/templates/gym/new_user.html:34
#: gym/views/export.py:60 gym/views/gym.py:218
msgid "Gym"
msgstr "Studio"
-#: exercises/models/base.py:51 exercises/templates/exercise/view.html:76
-#: nutrition/models/ingredient.py:204
+#: core/views/user.py:652
+#, python-format
+msgid "A verification email was sent to %(email)s"
+msgstr ""
+
+#: exercises/models/base.py:63 nutrition/models/ingredient.py:204
msgid "Category"
msgstr "Kategorie"
-#: exercises/models/base.py:58
+#: exercises/models/base.py:70
msgid "Primary muscles"
msgstr "Primärmuskeln"
-#: exercises/models/base.py:64 exercises/templates/equipment/overview.html:71
-#: exercises/templates/exercise/overview.html:76
-#: exercises/templates/exercise/view.html:268
-#: exercises/templates/muscles/overview.html:77
+#: exercises/models/base.py:76
msgid "Secondary muscles"
msgstr "Sekundärmuskeln"
-#: exercises/models/base.py:79
+#: exercises/models/base.py:91
msgid "Variations"
msgstr "Variationen"
@@ -1576,71 +1589,58 @@ msgstr "Variationen"
msgid "Exercise Categories"
msgstr "Kategorie Übung"
-#: exercises/models/comment.py:34 exercises/models/exercise_alias.py:32
-#: exercises/models/image.py:75 exercises/models/video.py:82
-#: manager/forms.py:165 manager/helpers.py:89 manager/models/log.py:51
+#: exercises/models/comment.py:37 exercises/models/exercise_alias.py:35
+#: exercises/models/image.py:71 exercises/models/video.py:95
+#: manager/forms.py:176 manager/helpers.py:89 manager/models/log.py:52
msgid "Exercise"
msgstr "Übung"
-#: exercises/models/comment.py:41
+#: exercises/models/comment.py:43
msgid "A comment about how to correctly do this exercise."
msgstr "Ein Kommentar über die korrekte Durchführung der Übung."
-#: exercises/models/exercise.py:86 nutrition/models/ingredient.py:80
+#: exercises/models/exercise.py:81 nutrition/models/ingredient.py:80
#: nutrition/models/plan.py:61 nutrition/models/weight_unit.py:32
msgid "Language"
msgstr "Sprache"
-#: 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:265
-msgid "New user submitted exercise"
-msgstr "Neue eingereichte Übung"
-
-#: 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/exercise_alias.py:35
+#: exercises/models/exercise_alias.py:38
msgid "Alias for an exercise"
msgstr "Alias für eine Übung"
-#: exercises/models/image.py:59
+#: exercises/models/image.py:55
msgid "Line"
msgstr "Linie"
-#: exercises/models/image.py:60
+#: exercises/models/image.py:56
msgid "3D"
msgstr "3D"
-#: exercises/models/image.py:61
+#: exercises/models/image.py:57
msgid "Low-poly"
msgstr ""
-#: exercises/models/image.py:62
+#: exercises/models/image.py:58
msgid "Photo"
msgstr "Foto"
-#: exercises/models/image.py:63
+#: exercises/models/image.py:59
msgid "Other"
msgstr "Andere"
-#: exercises/models/image.py:81 gallery/models/image.py:56
+#: exercises/models/image.py:77 gallery/models/image.py:56
msgid "Image"
msgstr "Bild"
-#: exercises/models/image.py:82 gallery/models/image.py:57
+#: exercises/models/image.py:78 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:88
+#: exercises/models/image.py:84
msgid "Main picture"
msgstr "Hauptbild"
-#: exercises/models/image.py:91
+#: exercises/models/image.py:87
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 "
@@ -1651,20 +1651,10 @@ msgstr ""
"(wird dann z.B. auf Übersichten angezeigt). Das erste Bild wird automatisch "
"als Hauptbild ausgewählt."
-#: exercises/models/image.py:100
+#: exercises/models/image.py:96
msgid "The art style of your image"
msgstr "Der Stil deines Bildes"
-#: exercises/models/image.py:185
-msgid "New user submitted image"
-msgstr "Neuer User hat ein Bild eingereicht"
-
-#: exercises/models/image.py:186
-#, python-brace-format
-msgid "The user {0} submitted a new image \"{1}\" for exercise {2}."
-msgstr ""
-"Der Benutzer {0} hat ein Bild „{1}“ für folgende Übung eingereicht {2}."
-
#: exercises/models/muscle.py:37
msgid "In latin, e.g. \"Pectoralis major\""
msgstr "Auf latein, z.B. „Pectoralis major“"
@@ -1677,47 +1667,49 @@ msgstr "Alternative Bezeichnung"
msgid "A more basic name for the muscle"
msgstr "Einfacher Name füür den Muskel"
-#: exercises/models/video.py:41
-msgid "Maximum file size is 100MB."
+#: exercises/models/video.py:50
+#, fuzzy, python-format
+#| msgid "Maximum file size is 100MB."
+msgid "Maximum file size is %(size)sMB."
msgstr "Die maximale Dateigröße beträgt 100 MB."
-#: exercises/models/video.py:44 exercises/models/video.py:48
+#: exercises/models/video.py:57 exercises/models/video.py:65
msgid "File type is not supported"
msgstr "Dateityp wird nicht unterstützt"
-#: exercises/models/video.py:57
+#: exercises/models/video.py:70
msgid "File is not a valid video"
msgstr "Die Datei ist kein gültiges Video"
-#: exercises/models/video.py:88
+#: exercises/models/video.py:101
msgid "Main video"
msgstr "Hauptvideo"
-#: exercises/models/video.py:94
+#: exercises/models/video.py:107
msgid "Video"
msgstr "Video"
-#: exercises/models/video.py:101
+#: exercises/models/video.py:114
msgid "Size"
msgstr "Größe"
-#: exercises/models/video.py:108 manager/models/schedule_step.py:56
+#: exercises/models/video.py:121 manager/models/schedule_step.py:56
msgid "Duration"
msgstr "Dauer"
-#: exercises/models/video.py:117
+#: exercises/models/video.py:130
msgid "Width"
msgstr "Breite"
-#: exercises/models/video.py:124
+#: exercises/models/video.py:137
msgid "Height"
msgstr "Höhe"
-#: exercises/models/video.py:131
+#: exercises/models/video.py:144
msgid "Codec"
msgstr "Codec"
-#: exercises/models/video.py:139
+#: exercises/models/video.py:152
msgid "Codec, long name"
msgstr "Codec, langer Name"
@@ -1726,138 +1718,23 @@ msgid "Equipment list"
msgstr "Geräteliste"
#: exercises/templates/equipment/admin-overview.html:37
-#: exercises/views/equipment.py:94
+#: exercises/views/equipment.py:92
msgid "Add new equipment"
msgstr "Neues Gerät hinzufügen"
-#: exercises/templates/equipment/overview.html:11
-msgid "Equipment overview"
-msgstr "Geräteübersicht"
-
-#: exercises/templates/equipment/overview.html:69
-#: exercises/templates/exercise/overview.html:74
-#: exercises/templates/exercise/view.html:264
-#: exercises/templates/muscles/overview.html:75
-msgid "Main muscles"
-msgstr "Hauptmuskeln"
-
-#: exercises/templates/equipment/overview.html:79
-msgid ""
-"No exercises for this equipment. Add or edit an exercise and set the "
-"equipment."
-msgstr ""
-"Keine Übungen für dieses Geräte. Füge eine Übung hinzu oder bearbeite eine "
-"bestehende."
-
-#: exercises/templates/equipment/overview.html:96
-#: exercises/templates/exercise/overview.html:99
-#: nutrition/templates/ingredient/overview.html:57
-msgid "Search"
-msgstr "Suchen"
-
-#: exercises/templates/equipment/overview.html:101
-#: exercises/templates/exercise/overview.html:104
-msgid "exercise name"
-msgstr "Übung"
-
-#: exercises/templates/equipment/overview.html:115
-#: exercises/templates/exercise/overview.html:118
-#: exercises/templates/muscles/overview.html:118
-#: nutrition/templates/ingredient/overview.html:85
-msgid "Only registered users can do this"
-msgstr "Nur registrierte Benutzer dürfen das"
-
-#: exercises/templates/exercise/email_new.tpl:1
-#, python-format
-msgid ""
-"Your exercise '%(exercise)s' was successfully added to the general\n"
-"database."
-msgstr ""
-"Die Übung „%(exercise)s“ wurde erfolgreich zur\n"
-"Datenbank hinzugefügt."
-
-#: exercises/templates/exercise/email_new.tpl:4
-msgid ""
-"It is now available on the exercise and muscle overview and can be\n"
-"added to workouts. You can access it on this address:"
-msgstr ""
-"Sie ist jetzt in der Übungs- und Muskelübersicht verfügbar und kann \n"
-"zu Trainingspläne hinzugefügt werden. Du kannst sie unter der folgenden \n"
-"Adresse erreichen:"
-
-#: exercises/templates/exercise/email_new.tpl:8
-#: nutrition/templates/ingredient/email_new.tpl:8
-msgid "Thank you for contributing and making this site better!"
-msgstr "Danke fürs Mitmachen und diese Seite besser zu machen!"
-
-#: exercises/templates/exercise/email_new.tpl:9
-#: manager/templates/workout/email_reminder.tpl:15
-#: manager/templates/workout/email_weight_reminder.tpl:12
-#: nutrition/templates/ingredient/email_new.tpl:9
-#, python-format
-msgid "The %(site)s team"
-msgstr "Das %(site)s-Team"
-
-#: exercises/templates/exercise/form.html:4
-msgid "Submitting an exercise"
-msgstr "Eine Übung einreichen"
-
-#: exercises/templates/exercise/form.html:5
-msgid ""
-"Thank you for submitting an exercise. This is much\n"
-"appreciated!"
-msgstr "Danke, dass du eine Übung eingereicht hast. Das schätzen wir sehr!"
-
-#: exercises/templates/exercise/form.html:8
-msgid ""
-"After you submit the form, the administrators will be notified.\n"
-"Once it is reviewed, it will be added to the database. Till this happens,\n"
-"it will not be visible in the overview or the search. In case you added your "
-"email\n"
-"when you registered, you will get notified when the process is completed "
-"successfully."
-msgstr ""
-"Nachdem du das Formular abschickst werden die Administratoren "
-"benachrichtigt.\n"
-"Bis die Freigabe erfolgt, wird es nicht in Übersichten oder Suchen\n"
-"erscheinen. Falls du bei der Anmeldung deine E-Mail angegeben hast, \n"
-"wirst du auch benachrichtigt."
-
-#: exercises/templates/exercise/form_correct.html:4
-msgid "Correcting an exercise"
-msgstr "Eine Übung korrigieren"
-
-#: exercises/templates/exercise/form_correct.html:5
-msgid ""
-"Thank you for correcting and improving this exercise.\n"
-"This is much appreciated!"
-msgstr ""
-"Vielen Dank für die Korrektur und Verbesserung dieser Übung.\n"
-"Das schätzen wir sehr!"
-
-#: exercises/templates/exercise/form_correct.html:8
-msgid ""
-"After you submit the form, the administrators will be notified.\n"
-"Once the changes are reviewed the exercise will be updated."
-msgstr ""
-"Nachdem du das Formular abgeschickt hast, werden die Administratoren "
-"benachrichtigt. Die Übung wird aktualisiert, sobald die Änderungen überprüft "
-"wurden."
-
-#: exercises/templates/exercise/overview.html:88
-msgid "No categories."
-msgstr "Keine Kategorien."
-
-#: exercises/templates/exercise/overview.html:88
-msgid "Use link to create one"
-msgstr "Benutze den Verweis zum Hinzufügen"
+#: exercises/templates/history/overview.html:11
+#, fuzzy
+#| msgid "Exercise day"
+msgid "Exercise admin history"
+msgstr "Übungstag"
-#: exercises/templates/exercise/pending.html:14
-#: nutrition/templates/ingredient/pending.html:14
-msgid "Submission date"
-msgstr "Datum der Einreichung"
+#: exercises/templates/history/overview.html:27
+#, fuzzy
+#| msgid "Actions"
+msgid "Action"
+msgstr "Aktionen"
-#: exercises/templates/exercise/pending.html:16 gallery/models/image.py:51
+#: exercises/templates/history/overview.html:28 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/log.py:45
@@ -1868,101 +1745,47 @@ msgstr "Datum der Einreichung"
msgid "User"
msgstr "Benutzer"
-#: exercises/templates/exercise/view.html:48
-msgid "Exercise is pending review"
-msgstr "Übung wartet auf Freigabe"
+#: exercises/templates/history/overview.html:29
+#, fuzzy
+#| msgctxt "As in \"email subject\""
+#| msgid "Subject"
+msgid "Object"
+msgstr "Betreff"
-#: exercises/templates/exercise/view.html:51
-msgid ""
-"This user submitted exercise is pending a decision to be\n"
-" included in the database."
-msgstr ""
-"Diese von einem Benutzer eingereichte Übung ist noch nicht freigegeben."
+#: exercises/templates/history/overview.html:31
+#, fuzzy
+#| msgctxt "Noun, not verb"
+#| msgid "Change"
+msgid "Changes"
+msgstr "Änderung"
-#: exercises/templates/exercise/view.html:53
-msgid "Till then, it will not be shown in the overview or the search."
+#: exercises/templates/history/overview.html:32
+msgid "Revert"
msgstr ""
-"Bis dann wird sie weder in den Übersichten noch in der Suche erscheinen."
-
-#: exercises/templates/exercise/view.html:54
-#: nutrition/templates/ingredient/view.html:31
-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:203
-#: nutrition/templates/ingredient/view.html:38
-msgid "Accept"
-msgstr "Freigeben"
-
-#: exercises/templates/exercise/view.html:64
-#: exercises/templates/exercise/view.html:204
-#: nutrition/templates/ingredient/view.html:42
-msgid "Decline"
-msgstr "Ablehnen"
-
-#: exercises/templates/exercise/view.html:96
-msgid "Images"
-msgstr "Bilder"
-#: exercises/templates/exercise/view.html:137 exercises/views/images.py:93
-msgid "Add new image"
-msgstr "Neues Bild hinzufügen"
-
-#: exercises/templates/exercise/view.html:148
-msgid "Videos"
-msgstr "Videos"
-
-#: exercises/templates/exercise/view.html:187 exercises/views/videos.py:94
-msgid "Add new video"
-msgstr "Neues Video hinzufügen"
-
-#: exercises/templates/exercise/view.html:197
-msgid "Images pending review"
-msgstr "Bilder ohne Freigabe"
-
-#: exercises/templates/exercise/view.html:218
-msgid "Comments for this exercise"
-msgstr "Kommentare für diese Übung"
-
-#: exercises/templates/exercise/view.html:246
-msgid "Add new comment"
-msgstr "Kommentar hinzufügen"
-
-#: 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:301
-#: manager/templates/workout/log.html:10 manager/templates/workout/log.html:11
-msgid "Weight log"
-msgstr "Gewichtslog"
+#: exercises/templates/history/overview.html:64
+msgid "View Object"
+msgstr ""
-#: exercises/templates/exercise/view.html:306
-msgid "Exercise Variations"
-msgstr "Übungsvariationen"
+#: exercises/templates/history/overview.html:75
+#, fuzzy
+#| msgid "View logs"
+msgid "View changes"
+msgstr "Logs anzeigen"
-#: exercises/templates/exercise/view.html:327
-msgid "Submit a correction"
-msgstr "Eine Korrektur einreichen"
+#: exercises/templates/history/overview.html:86
+msgid "Revert changes"
+msgstr ""
#: exercises/templates/muscles/admin-overview.html:4
-#: exercises/templates/muscles/overview.html:7
msgid "Muscle overview"
msgstr "Muskelübersicht"
#: exercises/templates/muscles/admin-overview.html:36
-#: exercises/views/muscles.py:86
+#: exercises/views/muscles.py:67
msgid "Add muscle"
msgstr "Muskel hinzufügen"
-#: exercises/templates/muscles/overview.html:85
-msgid ""
-"No exercises for this muscle. Add or edit an exercise and set the muscle."
-msgstr ""
-"Keine Übungen für diesen Muskel. Füge eine Übung hinzu oder bearbeite sie "
-"und stelle den Muskel ein."
-
#: exercises/views/categories.py:71
msgid "Add category"
msgstr "Kategorie hinzufügen"
@@ -1975,53 +1798,24 @@ msgstr "Das wird auch alle Übungen in der Kategorie löschen."
msgid "Add exercise comment"
msgstr "Übungskommentar hinzufügen"
-#: exercises/views/equipment.py:107 exercises/views/equipment.py:118
+#: exercises/views/equipment.py:105 exercises/views/equipment.py:116
msgid "Delete equipment?"
msgstr "Gerät löschen?"
-#: exercises/views/exercises.py:229
-#, python-format
-msgid ""
-"%(name_original)s is too similar to existing exercise \"%(exercise_name)s\""
+#: exercises/views/exercises.py:161
+#, fuzzy, python-format
+#| msgid ""
+#| "%(name_original)s is too similar to existing exercise "
+#| "\"%(exercise_name)s\""
+msgid "%(name)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:247
-msgid "Add exercise"
-msgstr "Neue Übung hinzufügen"
-
-#: 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:380
-#, python-brace-format
-msgid "Correct {0}"
-msgstr "{0} korrigieren"
-
-#: exercises/views/exercises.py:422
+#: exercises/views/exercises.py:184
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:474
-msgid "Exercise was successfully marked as rejected"
-msgstr "Die Übung wurde erfolgreich abgelehnt"
-
-#: exercises/views/images.py:68
-msgid "Edit exercise image"
-msgstr "Übungsbild bearbeiten"
-
-#: exercises/views/images.py:143
-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"
@@ -2090,7 +1884,7 @@ 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:59
+#: manager/templates/log/add.html:52 nutrition/forms.py:60
#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:102
#: nutrition/models/meal_item.py:72
msgid "Amount"
@@ -2193,6 +1987,10 @@ msgstr "Werde Dateinamen benutzen falls nichts angegeben"
msgid "User notes"
msgstr "Benutzernotizen"
+#: gym/templates/contract/list.html:36
+msgid "Show"
+msgstr "Anzeigen"
+
#: gym/templates/contract/view.html:4
msgid "Contract"
msgstr "Vertrag"
@@ -2273,10 +2071,6 @@ msgstr "E-Mails"
msgid "Add member"
msgstr "Mitglied hinzufügen"
-#: gym/templates/gym/new_user.html:38
-msgid "Date of Birth"
-msgstr "Geburtsdatum"
-
#: gym/templates/gym/new_user.html:48 manager/templates/calendar/month.html:144
#: manager/templates/log/add.html:75 nutrition/templates/rate/form.html:120
msgid "Info"
@@ -2338,130 +2132,130 @@ msgstr "Benutzer zu Studio hinzufügen"
msgid "Edit gym"
msgstr "Studio bearbeiten"
-#: i18n.tpl:2 i18n.tpl:28
+#: i18n.tpl:2
+msgid "Until Failure"
+msgstr "Bis zum Muskelversagen"
+
+#: i18n.tpl:3 manager/forms.py:180 manager/models/log.py:73
+#: manager/templates/set/add.html:53
+msgid "Repetitions"
+msgstr "Wiederholungen"
+
+#: i18n.tpl:4
msgid "Abs"
msgstr "Bauch"
-#: i18n.tpl:3
+#: i18n.tpl:5
msgid "Arms"
msgstr "Arme"
-#: i18n.tpl:4
-msgid "Back"
-msgstr "Rücken"
-
-#: i18n.tpl:5 i18n.tpl:23
-msgid "Calves"
-msgstr "Waden"
-
-#: i18n.tpl:6 i18n.tpl:26
-msgid "Chest"
-msgstr "Brust"
-
-#: i18n.tpl:7
+#: i18n.tpl:6
msgid "Legs"
msgstr "Beine"
-#: i18n.tpl:8 i18n.tpl:19
-msgid "Shoulders"
-msgstr "Schultern"
+#: i18n.tpl:7
+msgid "Dumbbell"
+msgstr "Kurzhantel"
+
+#: i18n.tpl:8
+#, fuzzy
+#| msgid "Biceps brachii"
+msgid "Biceps"
+msgstr "Armbeuger"
#: i18n.tpl:9
-msgid "Barbell"
-msgstr "Langhantel"
+msgid "SZ-Bar"
+msgstr "ß-Stange"
#: i18n.tpl:10
-msgid "Bench"
-msgstr "(Flach)Bank"
+msgid "Kettlebell"
+msgstr "Kugelhantel"
#: i18n.tpl:11
-msgid "Dumbbell"
-msgstr "Kurzhantel"
+msgid "Swiss Ball"
+msgstr "Swissball"
#: i18n.tpl:12
-msgid "Gym mat"
-msgstr "Bodenmatte"
+msgid "none (bodyweight exercise)"
+msgstr "keine (Körpergewichtübung)"
#: i18n.tpl:13
-msgid "Incline bench"
-msgstr "Schrägbank"
+msgid "Calves"
+msgstr "Waden"
#: i18n.tpl:14
-msgid "Kettlebell"
-msgstr "Kugelhantel"
+msgid "Back"
+msgstr "Rücken"
#: i18n.tpl:15
-msgid "Pull-up bar"
-msgstr "Klimmzugstange"
+msgid "Lower back"
+msgstr "Unterer Rücken"
#: i18n.tpl:16
-msgid "SZ-Bar"
-msgstr "ß-Stange"
+msgid "Lats"
+msgstr "Latissimus"
#: i18n.tpl:17
-msgid "Swiss Ball"
-msgstr "Swissball"
+msgid "Hamstrings"
+msgstr "Kniebeuger"
#: i18n.tpl:18
-msgid "none (bodyweight exercise)"
-msgstr "keine (Körpergewichtübung)"
+msgid "Bench"
+msgstr "(Flach)Bank"
+
+#: i18n.tpl:19
+msgid "Glutes"
+msgstr "Gesäßmuskeln"
#: i18n.tpl:20
-#, fuzzy
-#| msgid "Biceps brachii"
-msgid "Biceps"
-msgstr "Armbeuger"
+msgid "Kilometers"
+msgstr "Kilometer"
#: i18n.tpl:21
-msgid "Hamstrings"
-msgstr "Kniebeuger"
+msgid "Shoulders"
+msgstr "Schultern"
#: i18n.tpl:22
-msgid "Lower back"
-msgstr "Unterer Rücken"
+msgid "Seconds"
+msgstr "Sekunden"
+
+#: i18n.tpl:23
+msgid "Miles"
+msgstr "Meilen"
#: i18n.tpl:24
-msgid "Glutes"
-msgstr "Gesäßmuskeln"
+msgid "Incline bench"
+msgstr "Schrägbank"
#: i18n.tpl:25
-msgid "Lats"
-msgstr "Latissimus"
-
-#: i18n.tpl:27
msgid "Quads"
msgstr "Quadrizeps"
-#: i18n.tpl:29
-#, fuzzy
-#| msgid "Triceps brachii"
-msgid "Triceps"
-msgstr "Armstrecker"
-
-#: i18n.tpl:30
-msgid "Kilometers"
-msgstr "Kilometer"
-
-#: i18n.tpl:31
-msgid "Miles"
-msgstr "Meilen"
-
-#: i18n.tpl:32
+#: i18n.tpl:26
msgid "Minutes"
msgstr "Minuten"
-#: i18n.tpl:33 manager/forms.py:169 manager/models/log.py:71
-#: manager/templates/set/add.html:53
-msgid "Repetitions"
-msgstr "Wiederholungen"
+#: i18n.tpl:27
+msgid "Chest"
+msgstr "Brust"
-#: i18n.tpl:34
-msgid "Seconds"
-msgstr "Sekunden"
+#: i18n.tpl:28
+msgid "Gym mat"
+msgstr "Bodenmatte"
-#: i18n.tpl:35
-msgid "Until Failure"
-msgstr "Bis zum Muskelversagen"
+#: i18n.tpl:29
+msgid "Pull-up bar"
+msgstr "Klimmzugstange"
+
+#: i18n.tpl:30
+msgid "Barbell"
+msgstr "Langhantel"
+
+#: i18n.tpl:31
+#, fuzzy
+#| msgid "Triceps brachii"
+msgid "Triceps"
+msgstr "Armstrecker"
#: mailer/forms.py:34 mailer/templates/mailer/gym/preview.html:32
msgctxt "As in \"email subject\""
@@ -2516,11 +2310,11 @@ msgstr "E-Mails senden"
msgid "Correction"
msgstr "Korrektur"
-#: manager/forms.py:89 manager/models/workout.py:59
+#: manager/forms.py:92 manager/models/workout.py:59
msgid "The name of the workout"
msgstr "Der Name der Trainingseinheit"
-#: manager/forms.py:93 manager/models/workout.py:66
+#: manager/forms.py:96 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'."
@@ -2528,7 +2322,7 @@ msgstr ""
"Eine kurze Beschreibung oder Ziel des Trainingplans.\n"
" Zum Beispiel 'Fokus auf Rücken' oder 'Woche 1 von Programm XY'."
-#: manager/forms.py:126
+#: manager/forms.py:137
msgid ""
"You can search for more than one exercise, they will be grouped together for "
"a superset."
@@ -2536,28 +2330,28 @@ msgstr ""
"Du kannst mehr als eine Übung auswählen/suchen, sie werden dann z.B. für "
"einen Supersatz gruppiert."
-#: 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
+#: manager/forms.py:166 manager/forms.py:171 manager/models/log.py:64
+#: manager/models/log.py:92 manager/models/setting.py:59
+#: manager/models/setting.py:90 manager/templates/log/add.html:53
+#: manager/templates/log/add.html:55 manager/templates/set/formset.html:10
+#: manager/templates/set/formset.html:12 measurements/models/category.py:58
+#: nutrition/forms.py:64
msgid "Unit"
msgstr "Einheit"
-#: manager/forms.py:266
+#: manager/forms.py:277
msgid "Type"
msgstr "Typ"
-#: manager/forms.py:267 manager/templates/workout/view.html:157
+#: manager/forms.py:278 manager/templates/workout/view.html:157
msgid "Table"
msgstr "Tabelle"
-#: manager/forms.py:269 manager/templates/workout/view.html:163
+#: manager/forms.py:280 manager/templates/workout/view.html:163
msgid "with images"
msgstr "mit Bilder"
-#: manager/forms.py:270 manager/templates/workout/view.html:169
+#: manager/forms.py:281 manager/templates/workout/view.html:169
msgid "with comments"
msgstr "mit Kommentare"
@@ -2617,7 +2411,7 @@ msgid "The duration in weeks"
msgstr "Die Dauer in Wochen"
#: manager/models/schedule_step.py:63 manager/models/set.py:52
-#: manager/models/setting.py:98 nutrition/models/meal.py:54
+#: manager/models/setting.py:110 nutrition/models/meal.py:54
#: nutrition/models/meal_item.py:65
msgid "Order"
msgstr "Reihenfolge"
@@ -2671,7 +2465,7 @@ msgstr "Übungstag"
msgid "Number of sets"
msgstr "Anzahl der Sätze"
-#: manager/models/setting.py:43
+#: manager/models/setting.py:48
msgid "Sets"
msgstr "Sätze"
@@ -2969,6 +2763,13 @@ msgstr ""
"Wenn du in Zukunft keine weiteren E-Mails bekommen willst, kannst du die "
"entsprechende Option in deinen Einstellungen deaktivieren."
+#: manager/templates/workout/email_reminder.tpl:15
+#: manager/templates/workout/email_weight_reminder.tpl:12
+#: nutrition/templates/ingredient/email_new.tpl:9
+#, python-format
+msgid "The %(site)s team"
+msgstr "Das %(site)s-Team"
+
#: manager/templates/workout/email_weight_reminder.tpl:3
#, python-format
msgid ""
@@ -2986,6 +2787,10 @@ msgstr ""
"Du erhält regelmäßig solche Erinnerungen, bis du dein aktuelles Gewicht "
"eingibst."
+#: manager/templates/workout/log.html:10 manager/templates/workout/log.html:11
+msgid "Weight log"
+msgstr "Gewichtslog"
+
#: manager/templates/workout/log.html:29
msgid "Weight log for workout"
msgstr "Gewichtslog für Trainigsplan"
@@ -3096,7 +2901,7 @@ msgstr "Logs anzeigen"
msgid "Edit workout"
msgstr "Trainingsplan bearbeiten"
-#: manager/templates/workout/view.html:225 manager/views/workout.py:300
+#: manager/templates/workout/view.html:225 manager/views/workout.py:301
msgid "Mark as template"
msgstr "Als Vorlage markieren"
@@ -3104,11 +2909,6 @@ msgstr "Als Vorlage markieren"
msgid "Add workout day"
msgstr "Trainingstag hinzufügen"
-#: manager/views/log.py:92
-#, python-format
-msgid "Edit log entry for %s"
-msgstr "Eintrag für %s bearbeiten"
-
#: manager/views/log.py:111
msgid "Delete workout log"
msgstr "Logeintrag löschen"
@@ -3126,11 +2926,11 @@ msgstr "Zeitplan erstellen"
msgid "Your workouts"
msgstr "Deine Trainingspläne"
-#: manager/views/workout.py:227
+#: manager/views/workout.py:228
msgid "Copy workout"
msgstr "Trainingsplan kopieren"
-#: manager/views/workout.py:230
+#: manager/views/workout.py:231
msgid "Copy"
msgstr "Kopieren"
@@ -3152,29 +2952,29 @@ msgstr "Dies wird ebenfalls alle Gewichtslogs für diesen Tag löschen."
msgid "Value"
msgstr "Wert"
-#: nutrition/forms.py:122
+#: nutrition/forms.py:123
msgid "Calculate"
msgstr "Berechnen"
-#: nutrition/forms.py:195 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:196 nutrition/templates/rate/form.html:76
msgid "Basic caloric intake"
msgstr "Basis-Kalorienzufuhr"
-#: nutrition/forms.py:196
+#: nutrition/forms.py:197
msgid "Your basic caloric intake as calculated for your data"
msgstr "Deine Basis-Kalorienzufuhr wird aus deinen Angaben berechnet"
-#: nutrition/forms.py:202
+#: nutrition/forms.py:203
msgid "Additional calories"
msgstr "Zusätzliche Kalorien"
-#: nutrition/forms.py:204
+#: nutrition/forms.py:205
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
msgstr "Zusat"
-#: nutrition/forms.py:232 nutrition/models/ingredient_weight_unit.py:39
+#: nutrition/forms.py:233 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"
@@ -3240,7 +3040,7 @@ msgstr ""
"aus Eiweiß, Kohlenhydraten und Fett ({energy_calculated} kcal +/-"
"{energy_approx} %)"
-#: nutrition/models/ingredient.py:357 nutrition/views/ingredient.py:225
+#: nutrition/models/ingredient.py:357 nutrition/views/ingredient.py:219
msgid "Ingredient was successfully added to the general database"
msgstr "Die Zutat wurde erfolgreich zur Datenbank hinzugefügt"
@@ -3269,6 +3069,12 @@ msgstr "Menge der Einheit, z.B. „1 Tasse“ or „1/2 Löffel“"
msgid "Meal"
msgstr "Mahlzeit"
+#: nutrition/models/log.py:65
+#, fuzzy
+#| msgid "Time (approx)"
+msgid "Date and Time (Approx.)"
+msgstr "Uhrzeit (ca.)"
+
#: nutrition/models/meal.py:61
msgid "Time (approx)"
msgstr "Uhrzeit (ca.)"
@@ -3374,6 +3180,10 @@ msgstr ""
"Ernährungspläne hinzugefügt werden. Du kannst sie unter der folgenden "
"Adresse erreichen:"
+#: nutrition/templates/ingredient/email_new.tpl:8
+msgid "Thank you for contributing and making this site better!"
+msgstr "Danke fürs Mitmachen und diese Seite besser zu machen!"
+
#: nutrition/templates/ingredient/form.html:4
msgid "Submitting an ingredient"
msgstr "Eine Zutat einreichen"
@@ -3405,6 +3215,10 @@ msgstr ""
msgid "No ingredients."
msgstr "Keine Zutaten."
+#: nutrition/templates/ingredient/overview.html:57
+msgid "Search"
+msgstr "Suchen"
+
#: nutrition/templates/ingredient/overview.html:66
msgid "ingredient name"
msgstr "Name der Zutat"
@@ -3414,6 +3228,14 @@ msgstr "Name der Zutat"
msgid "Add ingredient"
msgstr "Zutat hinzufügen"
+#: nutrition/templates/ingredient/overview.html:85
+msgid "Only registered users can do this"
+msgstr "Nur registrierte Benutzer dürfen das"
+
+#: nutrition/templates/ingredient/pending.html:14
+msgid "Submission date"
+msgstr "Datum der Einreichung"
+
#: nutrition/templates/ingredient/view.html:27
msgid "Ingredient is pending review"
msgstr "Zutat noch nicht freigegeben"
@@ -3428,6 +3250,18 @@ msgstr ""
"Diese von einem Benutzer eingereichte Zutat ist noch nicht freigegeben.\n"
"Bis dann, wird sie weder in der Übersicht, noch in der Suche erscheinen."
+#: nutrition/templates/ingredient/view.html:31
+msgid "Please select one of the options below."
+msgstr "Wähle bitte eine der folgenden Optionen."
+
+#: nutrition/templates/ingredient/view.html:38
+msgid "Accept"
+msgstr "Freigeben"
+
+#: nutrition/templates/ingredient/view.html:42
+msgid "Decline"
+msgstr "Ablehnen"
+
#: nutrition/templates/ingredient/view.html:71
#: nutrition/templates/log/detail.html:31
#: nutrition/templates/plan/view.html:229 nutrition/views/plan.py:376
@@ -3690,14 +3524,18 @@ msgstr ""
"Wenn du deine Ernährung auf diese Werte basierst, beobachte dich selbst\n"
"einige Wochen und ändere deine Diät falls nötig."
-#: nutrition/views/ingredient.py:181
+#: nutrition/views/ingredient.py:175
msgid "Add a new ingredient"
msgstr "Zutat hinzufügen"
-#: nutrition/views/ingredient.py:238
+#: nutrition/views/ingredient.py:232
msgid "Ingredient was successfully marked as rejected"
msgstr "Zutat wurde erfolgreich als abgelehnt markiert"
+#: nutrition/views/log.py:230 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"
@@ -3960,15 +3798,15 @@ msgstr ""
msgid "100%% Free <br>and <br>Open Source"
msgstr "100 %% frei <br>und <br>quelloffen"
-#: utils/generic_views.py:261
+#: utils/generic_views.py:262
msgid "Yes, delete"
msgstr "Löschen bestätigen"
-#: utils/models.py:47
+#: utils/models.py:48
msgid "Author"
msgstr "Urheber"
-#: utils/models.py:52
+#: utils/models.py:53
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."
@@ -3976,15 +3814,15 @@ msgstr ""
"Wenn du nicht der Urheber bist, gebe den Namen hier ein. Das wird bei "
"manchen Lizenzen benötigt, z.B. die CC-BY-SA."
-#: utils/models.py:77
+#: utils/models.py:78
msgid "Pending"
msgstr "In Bearbeitung"
-#: utils/models.py:78
+#: utils/models.py:79
msgid "Accepted"
msgstr "Angenommen"
-#: utils/models.py:79
+#: utils/models.py:80
msgid "Declined"
msgstr "Abgelehnt"
@@ -4150,6 +3988,213 @@ msgstr "Erfolgreich gelöscht."
msgid "Delete weight entry for the %s"
msgstr "Gewichtseintrag für den %s löschen"
+#~ msgid "Ingredients"
+#~ msgstr "Zutaten"
+
+#~ msgid ""
+#~ "Use the configuration to select in what languages the\n"
+#~ "exercises and ingredients will be shown for the current language (for "
+#~ "example\n"
+#~ "the exercises should be shown in languages A, B and C; the ingredients "
+#~ "only\n"
+#~ "in A)."
+#~ msgstr ""
+#~ "Benutze die Konfiguration um auszuwählen, in welchen Sprachen die \n"
+#~ "Übungen und Zutaten für die gerade ausgewählte Sprache dargestellt werden "
+#~ "sollen. (z.B. \n"
+#~ "sollten die Übungen in Sprachen A, B und C, die Zutaten nur \n"
+#~ "in A angezeigt werden)."
+
+#~ msgctxt "as in sorted by category"
+#~ msgid "by category"
+#~ msgstr "nach Kategorie"
+
+#~ msgctxt "as in sorted by muscle"
+#~ msgid "by muscle"
+#~ msgstr "nach Muskeln"
+
+#~ msgctxt "as in sorted by equipment"
+#~ msgid "by equipment"
+#~ msgstr "nach Ausrüstung"
+
+#~ msgid "Add new exercise"
+#~ msgstr "Neue Übung hinzufügen"
+
+#~ msgid "Exercises pending review"
+#~ msgstr "Übungen ohne Freigabe"
+
+#~ msgid "Exercise was successfully added to the general database"
+#~ msgstr "Übung wurde erfolgreich zur Datenbank hinzugefügt"
+
+#~ msgid "New user submitted exercise"
+#~ msgstr "Neue eingereichte Übung"
+
+#, python-brace-format
+#~ msgid "The user {0} submitted a new exercise \"{1}\"."
+#~ msgstr "Der Benutzer {0} hat die Übung „{1}“ eingereicht."
+
+#~ msgid "New user submitted image"
+#~ msgstr "Neuer User hat ein Bild eingereicht"
+
+#, python-brace-format
+#~ msgid "The user {0} submitted a new image \"{1}\" for exercise {2}."
+#~ msgstr ""
+#~ "Der Benutzer {0} hat ein Bild „{1}“ für folgende Übung eingereicht {2}."
+
+#~ msgid "Equipment overview"
+#~ msgstr "Geräteübersicht"
+
+#~ msgid "Main muscles"
+#~ msgstr "Hauptmuskeln"
+
+#~ msgid ""
+#~ "No exercises for this equipment. Add or edit an exercise and set the "
+#~ "equipment."
+#~ msgstr ""
+#~ "Keine Übungen für dieses Geräte. Füge eine Übung hinzu oder bearbeite "
+#~ "eine bestehende."
+
+#~ msgid "exercise name"
+#~ msgstr "Übung"
+
+#, python-format
+#~ msgid ""
+#~ "Your exercise '%(exercise)s' was successfully added to the general\n"
+#~ "database."
+#~ msgstr ""
+#~ "Die Übung „%(exercise)s“ wurde erfolgreich zur\n"
+#~ "Datenbank hinzugefügt."
+
+#~ msgid ""
+#~ "It is now available on the exercise and muscle overview and can be\n"
+#~ "added to workouts. You can access it on this address:"
+#~ msgstr ""
+#~ "Sie ist jetzt in der Übungs- und Muskelübersicht verfügbar und kann \n"
+#~ "zu Trainingspläne hinzugefügt werden. Du kannst sie unter der folgenden \n"
+#~ "Adresse erreichen:"
+
+#~ msgid "Submitting an exercise"
+#~ msgstr "Eine Übung einreichen"
+
+#~ msgid ""
+#~ "Thank you for submitting an exercise. This is much\n"
+#~ "appreciated!"
+#~ msgstr "Danke, dass du eine Übung eingereicht hast. Das schätzen wir sehr!"
+
+#~ msgid ""
+#~ "After you submit the form, the administrators will be notified.\n"
+#~ "Once it is reviewed, it will be added to the database. Till this "
+#~ "happens,\n"
+#~ "it will not be visible in the overview or the search. In case you added "
+#~ "your email\n"
+#~ "when you registered, you will get notified when the process is completed "
+#~ "successfully."
+#~ msgstr ""
+#~ "Nachdem du das Formular abschickst werden die Administratoren "
+#~ "benachrichtigt.\n"
+#~ "Bis die Freigabe erfolgt, wird es nicht in Übersichten oder Suchen\n"
+#~ "erscheinen. Falls du bei der Anmeldung deine E-Mail angegeben hast, \n"
+#~ "wirst du auch benachrichtigt."
+
+#~ msgid "Correcting an exercise"
+#~ msgstr "Eine Übung korrigieren"
+
+#~ msgid ""
+#~ "Thank you for correcting and improving this exercise.\n"
+#~ "This is much appreciated!"
+#~ msgstr ""
+#~ "Vielen Dank für die Korrektur und Verbesserung dieser Übung.\n"
+#~ "Das schätzen wir sehr!"
+
+#~ msgid ""
+#~ "After you submit the form, the administrators will be notified.\n"
+#~ "Once the changes are reviewed the exercise will be updated."
+#~ msgstr ""
+#~ "Nachdem du das Formular abgeschickt hast, werden die Administratoren "
+#~ "benachrichtigt. Die Übung wird aktualisiert, sobald die Änderungen "
+#~ "überprüft wurden."
+
+#~ msgid "No categories."
+#~ msgstr "Keine Kategorien."
+
+#~ msgid "Use link to create one"
+#~ msgstr "Benutze den Verweis zum Hinzufügen"
+
+#~ msgid "Exercise is pending review"
+#~ msgstr "Übung wartet auf Freigabe"
+
+#~ msgid ""
+#~ "This user submitted exercise is pending a decision to be\n"
+#~ " included in the database."
+#~ msgstr ""
+#~ "Diese von einem Benutzer eingereichte Übung ist noch nicht freigegeben."
+
+#~ msgid "Till then, it will not be shown in the overview or the search."
+#~ msgstr ""
+#~ "Bis dann wird sie weder in den Übersichten noch in der Suche erscheinen."
+
+#~ msgid "Images"
+#~ msgstr "Bilder"
+
+#~ msgid "Add new image"
+#~ msgstr "Neues Bild hinzufügen"
+
+#~ msgid "Videos"
+#~ msgstr "Videos"
+
+#~ msgid "Add new video"
+#~ msgstr "Neues Video hinzufügen"
+
+#~ msgid "Images pending review"
+#~ msgstr "Bilder ohne Freigabe"
+
+#~ msgid "Comments for this exercise"
+#~ msgstr "Kommentare für diese Übung"
+
+#~ msgid "Add new comment"
+#~ msgstr "Kommentar hinzufügen"
+
+#~ msgid "The diagram shows the most used muscles on this exercise"
+#~ msgstr "Das Diagramm zeigt die meistbeanspruchten Muskeln"
+
+#~ msgid "Exercise Variations"
+#~ msgstr "Übungsvariationen"
+
+#~ msgid "Submit a correction"
+#~ msgstr "Eine Korrektur einreichen"
+
+#~ msgid ""
+#~ "No exercises for this muscle. Add or edit an exercise and set the muscle."
+#~ msgstr ""
+#~ "Keine Übungen für diesen Muskel. Füge eine Übung hinzu oder bearbeite sie "
+#~ "und stelle den Muskel ein."
+
+#~ msgid "Add exercise"
+#~ msgstr "Neue Übung hinzufügen"
+
+#~ 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."
+
+#, python-brace-format
+#~ msgid "Correct {0}"
+#~ msgstr "{0} korrigieren"
+
+#~ msgid "Exercise was successfully marked as rejected"
+#~ msgstr "Die Übung wurde erfolgreich abgelehnt"
+
+#~ msgid "Edit exercise image"
+#~ msgstr "Übungsbild bearbeiten"
+
+#~ msgid "Delete exercise image?"
+#~ msgstr "Übungsbild wirklich löschten?"
+
+#, python-format
+#~ msgid "Edit log entry for %s"
+#~ msgstr "Eintrag für %s bearbeiten"
+
#~ msgid "Anterior deltoid"
#~ msgstr "Anterior deltoid"
@@ -4514,10 +4559,6 @@ msgstr "Gewichtseintrag für den %s löschen"
#~ msgid "No filter"
#~ msgstr "Kein filter"
-#~ msgctxt "Noun, not verb"
-#~ msgid "Change"
-#~ msgstr "Änderung"
-
#~ msgid "Days"
#~ msgstr "Tage"
diff --git a/wger/locale/el/LC_MESSAGES/django.po b/wger/locale/el/LC_MESSAGES/django.po
index b8624f748..341565e95 100644
--- a/wger/locale/el/LC_MESSAGES/django.po
+++ b/wger/locale/el/LC_MESSAGES/django.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: wger Workout Manager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-14 12:01+0200\n"
+"POT-Creation-Date: 2022-11-10 16:03+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"
@@ -34,107 +34,8 @@ msgstr ""
"νέα εγγεγραμμένα μέλη και θα ενημερώσει τα υπάρχοντα μέλη που δεν έχουν "
"γυμναστήριο."
-#: 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:226
-msgid "Languages"
-msgstr "Γλώσσες"
-
-#: config/templates/language/overview.html:16
-msgid "Nothing found."
-msgstr "Δεν βρέθηκε τίποτα."
-
-#: 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:150
-#: nutrition/templates/plan/view.html:153
-#: nutrition/templates/plan/view.html:191
-msgid "Add one now."
-msgstr "Προσθήκη τώρα."
-
-#: config/templates/language/overview.html:29
-#: core/templates/license/list.html:38 core/templates/misc/license/list.html:41
-#: core/templates/repetition_unit/list.html:41
-#: core/templates/user/overview.html:327 core/templates/user/overview.html:366
-#: core/templates/user/overview.html:402
-#: core/templates/weight_unit/list.html:41 core/views/languages.py:73
-#: core/views/license.py:65 core/views/repetition_units.py:65
-#: core/views/weight_units.py:65
-#: exercises/templates/categories/admin-overview.html:36
-#: 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:61
-msgid "Add"
-msgstr "Προσθήκη"
-
-#: 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/language.py:32
-msgid "Language full name"
-msgstr "Γλώσσα κανονική ονομασία"
-
-#: config/templates/language/view.html:34 core/templates/user/overview.html:451
-#: gym/views/admin_config.py:44 gym/views/admin_config.py:58
-#: gym/views/user_config.py:46
-msgid "Configuration"
-msgstr "Παραμετροποίηση"
-
-#: config/templates/language/view.html:35
-msgid ""
-"Use the configuration to select in what languages the\n"
-"exercises and ingredients will be shown for the current language (for "
-"example\n"
-"the exercises should be shown in languages A, B and C; the ingredients only\n"
-"in A)."
-msgstr ""
-"Χρησιμοποιήστε την παραμετροποίηση για να επιλέξετε σε ποιές γλώσσες\n"
-"οι ασκήσεις και τα συστατικά θα εμφανίζονται για την τρέχουσα γλώσσα (για\n"
-"παράδειγμα\n"
-"οι ασκήσεις θα πρέπει να εμφανίζονται στις γλώσσες A, B και Γ, τα συστατικά\n"
-"μόνο στην Α)."
-
-#: config/templates/language/view.html:44 gym/templates/contract/list.html:36
-msgid "Show"
-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: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:45
-msgid "Options"
-msgstr "Επιλογές"
-
-#: config/templates/language/view.html:96 config/views/gym_config.py:41
-#: config/views/language_config.py:49 core/templates/license/list.html:16
-#: core/templates/misc/license/list.html:17
+#: config/views/gym_config.py:41 core/templates/language/view.html:57
+#: 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:39
#: core/templates/tags/render_day.html:75 core/templates/user/overview.html:205
@@ -142,12 +43,10 @@ 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:230
-#: exercises/templates/exercise/view.html:351
#: exercises/templates/muscles/admin-overview.html:16
-#: 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
+#: 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
#: 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,81 +62,54 @@ msgstr "Επιλογές"
msgid "Edit"
msgstr "Επεξεργασία"
-#: 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: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: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
-#: gym/templates/contract_type/list.html:39 gym/templates/document/list.html:46
-#: gym/templates/gym/list.html:20 manager/templates/calendar/day.html:69
-#: 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:231
-#: 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:132
-#: nutrition/templates/units/list.html:20
-msgid "Delete"
-msgstr "Διαγραφή"
-
-#: core/demo.py:86
+#: core/demo.py:95
msgid "Sample workout"
msgstr "Δείγμα προπόνησης"
-#: core/demo.py:90
+#: core/demo.py:99
msgid "Sample day"
msgstr "Δείγμα ημέρας"
-#: core/demo.py:94
+#: core/demo.py:103
msgid "Another sample day"
msgstr "Άλλο δείγμα ημέρας"
-#: core/demo.py:217
-msgid "Sample nutrional plan"
+#: core/demo.py:211
+#, fuzzy
+#| msgid "Sample nutrional plan"
+msgid "Sample nutritional plan"
msgstr "Δείγμα πλάνου διατροφής"
-#: core/demo.py:349 core/demo.py:351 core/demo.py:353
+#: core/demo.py:343 core/demo.py:345 core/demo.py:347
#, python-brace-format
msgid "Placeholder workout nr {0} for schedule"
msgstr ""
-#: core/demo.py:358
+#: core/demo.py:352
msgid "My cool workout schedule"
msgstr "Το τέλειο πρόγραμμα γυμναστικής μου"
-#: core/demo.py:397 core/demo.py:412
+#: core/demo.py:391 core/demo.py:406
msgid "Empty placeholder schedule"
msgstr "Άδειο placeholder ημερολογίου"
-#: core/forms.py:61 core/templates/navigation.html:188
-#: core/templates/navigation.html:192 core/templates/user/login.html:4
+#: core/forms.py:64 core/templates/navigation.html:179
+#: core/templates/navigation.html:183 core/templates/user/login.html:4
#: software/templates/features.html:43
msgid "Login"
msgstr "Σύνδεση"
-#: core/forms.py:73 core/forms.py:164 gym/views/export.py:63
+#: core/forms.py:76 core/forms.py:177 gym/views/export.py:63
#: gym/views/gym.py:218
msgid "First name"
msgstr "Όνομα"
-#: core/forms.py:74 core/forms.py:165 core/templates/user/overview.html:267
+#: core/forms.py:77 core/forms.py:178 core/templates/user/overview.html:267
#: gym/views/export.py:64 gym/views/gym.py:218
msgid "Last name"
msgstr "Επίθετο"
-#: core/forms.py:76 core/forms.py:131 core/templates/user/overview.html:271
+#: core/forms.py:79 core/forms.py:144 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
@@ -247,7 +119,7 @@ msgstr "Επίθετο"
msgid "Email"
msgstr "Email"
-#: core/forms.py:77
+#: core/forms.py:80
#, fuzzy
#| msgid "Used for password resets and, optionally, email reminders."
msgid "Used for password resets and, optionally, e-mail reminders."
@@ -255,77 +127,107 @@ msgstr ""
"Χρησιμοποιείται για ανάκτηση κωδικού και κατα περίπτωση, υπενθυμίσεις "
"μηνυμάτων"
-#: core/forms.py:102
+#: core/forms.py:84 core/models/profile.py:220
+#: gym/templates/gym/new_user.html:38
+msgid "Date of Birth"
+msgstr ""
+
+#: core/forms.py:116
msgid "Personal data"
msgstr "Προσωπικά δεδομένα"
-#: core/forms.py:110
+#: core/forms.py:124
msgid "Workout reminders"
msgstr "Υπενθύμιση προπόνησης"
-#: core/forms.py:117
+#: core/forms.py:131
msgid "Other settings"
msgstr "Άλλες ρυθμίσεις"
-#: 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
+#: core/forms.py:138 core/views/user.py:615 core/views/user.py:630
+#: core/views/user.py:642 gym/forms.py:72 manager/templates/log/add.html:65
+#: manager/templates/set/add.html:69 manager/views/workout.py:222
+#: utils/generic_views.py:143
msgid "Save"
msgstr "Αποθήκευση"
-#: core/forms.py:132
+#: core/forms.py:145
msgid "Used for password resets and, optionally, email reminders."
msgstr ""
"Χρησιμοποιείται για επαναφορά κωδικού πρόσβασης και, προαιρετικά, "
"υπενθυμίσεις ηλεκτρονικού ταχυδρομείου."
-#: core/forms.py:160
+#: core/forms.py:173
#, fuzzy
#| msgid "This email is already used."
msgid "This e-mail address is already in use."
msgstr "Αυτή η διεύθυνση email χρησιμοποιείται ήδη."
-#: core/forms.py:180 gym/templates/gym/new_user.html:26
+#: core/forms.py:193 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:182
+#: core/forms.py:195
msgid "Please enter your current password."
msgstr "Παρακαλώ πληκτρολογήστε τον τρέχων κωδικό σας."
-#: core/forms.py:200
+#: core/forms.py:204 core/templates/language/view.html:62
+#: 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: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/muscles/admin-overview.html:17
+#: gym/templates/admin_notes/list.html:40
+#: gym/templates/contract_option/list.html:39
+#: gym/templates/contract_type/list.html:39 gym/templates/document/list.html:46
+#: gym/templates/gym/list.html:20 manager/templates/calendar/day.html:69
+#: 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:231
+#: 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:132
+#: nutrition/templates/units/list.html:20
+msgid "Delete"
+msgstr "Διαγραφή"
+
+#: core/forms.py:213
msgid "Invalid password"
msgstr "Λάθος κωδικός"
-#: core/forms.py:212 core/forms.py:278
+#: core/forms.py:225 core/forms.py:291
msgid "The form is secured with reCAPTCHA"
msgstr ""
-#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:188
-#: core/templates/navigation.html:193 core/templates/template.html:149
-#: core/templates/user/login.html:20 core/views/user.py:293
+#: core/forms.py:239 core/forms.py:258 core/templates/navigation.html:179
+#: core/templates/navigation.html:184 core/templates/template.html:149
+#: core/templates/user/login.html:20 core/views/user.py:300
#: software/templates/features.html:38
msgid "Register"
msgstr "Εγγραφή"
-#: core/forms.py:256
+#: core/forms.py:269
msgid "Contact"
msgstr "Επικοινωνία"
-#: core/forms.py:257
+#: core/forms.py:270
#, fuzzy
#| msgid "Some way of answering you (email, etc.)"
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:71
+#: core/forms.py:278 exercises/models/comment.py:42 manager/models/set.py:60
+#: manager/models/setting.py:111 nutrition/models/log.py:71
msgid "Comment"
msgstr "Σχόλια"
-#: core/forms.py:266
+#: core/forms.py:279
msgid "What do you want to say?"
msgstr "Τί θέλετε να πείτε;"
@@ -333,6 +235,14 @@ msgstr "Τί θέλετε να πείτε;"
msgid "Day of the week"
msgstr "Ημέρα εβδομάδας"
+#: core/models/language.py:31 core/templates/language/view.html:21
+msgid "Language short name"
+msgstr "Γλώσσα μικρή ονομασία"
+
+#: core/models/language.py:36 core/templates/language/view.html:22
+msgid "Language full name"
+msgstr "Γλώσσα κανονική ονομασία"
+
#: core/models/license.py:29
msgid "Full name"
msgstr "Ονοματεπώνυμο"
@@ -388,19 +298,19 @@ msgstr "Μετρικό (χιλιόγραμμα)"
msgid "Imperial (pound)"
msgstr "Αγγλικό (λίβρες)"
-#: core/models/profile.py:111
+#: core/models/profile.py:114
msgid "Show exercise comments"
msgstr "Εμφάνιση σχολίων άσκησης"
-#: core/models/profile.py:112
+#: core/models/profile.py:115
msgid "Check to show exercise comments on the workout view"
msgstr "Επιλέξτε για την εμφάνιση σχολίων άσκησης στην εμφάνιση της προπόνησης"
-#: core/models/profile.py:123
+#: core/models/profile.py:126
msgid "Also use ingredients in English"
msgstr "Εμφάνιση των συστατικών και στα Αγγλικά"
-#: core/models/profile.py:125
+#: core/models/profile.py:128
msgid ""
"Check to also show ingredients in English while creating\n"
"a nutritional plan. These ingredients are extracted from a list provided\n"
@@ -412,11 +322,11 @@ msgstr ""
"παρέχεται απο το Αμερικάνικο Υπουργείο Αγροτικής Ανάπτυξης. Είναι εξαιρετικά "
"ολοκληρωμένο, όμως μπορεί να φανεί δύσκολο στην ανεύρεση."
-#: core/models/profile.py:134
+#: core/models/profile.py:137
msgid "Activate workout reminders"
msgstr "Ενεργοποίηση υπενθύμισης προπόνησης"
-#: core/models/profile.py:136
+#: core/models/profile.py:139
msgid ""
"Check to activate automatic reminders for workouts. You need to provide a "
"valid email for this to work."
@@ -424,19 +334,19 @@ msgstr ""
"Επιλογή ενεργοποίησης αυτόματων υπενθυμίσεων για την προπόνηση. Θα πρέπει να "
"παρέχετε ένα email για να λειτουργήσει."
-#: core/models/profile.py:145
+#: core/models/profile.py:148
msgid "Remind before expiration"
msgstr "Υπενθύμιση πριν την λήξη"
-#: core/models/profile.py:146
+#: core/models/profile.py:149
msgid "The number of days you want to be reminded before a workout expires."
msgstr "Ημέρες που θέλετε να σας υπενθυμίσουμε πριν λήξει μια προπόνηση."
-#: core/models/profile.py:152
+#: core/models/profile.py:155
msgid "Default duration of workouts"
msgstr "Προκαθορισμένη διάρκεια προπόνησης"
-#: core/models/profile.py:154
+#: core/models/profile.py:157
msgid ""
"Default duration in weeks of workouts not in a schedule. Used for email "
"workout reminders."
@@ -444,11 +354,11 @@ msgstr ""
"Η προκαθορισμένη διάρκεια των προπονήσεων σε εβδομάδες που δεν είναι σε "
"πρόγραμμα. Χρησιμοποιείται στην αποστολή email υπενθυμίσεων προπόνησης."
-#: core/models/profile.py:171
+#: core/models/profile.py:174
msgid "Notification language"
msgstr "Γλώσσα ειδοποιήσεων"
-#: core/models/profile.py:173
+#: core/models/profile.py:176
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."
@@ -456,93 +366,92 @@ msgstr ""
"Η γλώσσα που θα χρησιμοποιηθεί για την αποστολή email ειδοποιήσεων, π.χ. "
"email υπενθυμίσεων για προπονήσεις. Δεν επηρεάζει την γλώσσα της εφαρμογής."
-#: core/models/profile.py:186 gym/views/export.py:66
+#: core/models/profile.py:212 gym/views/export.py:66
msgid "Age"
msgstr "Ηλικία"
-#: core/models/profile.py:202 nutrition/forms.py:99
+#: core/models/profile.py:228 nutrition/forms.py:100
msgid "Height (cm)"
msgstr "Ύψος (cm)"
-#: core/models/profile.py:219
+#: core/models/profile.py:245
msgid "Hours of sleep"
msgstr "Ώρες ύπνου"
-#: core/models/profile.py:220
+#: core/models/profile.py:246
msgid "The average hours of sleep per day"
msgstr "Οι μέσες ώρες ύπνου ανα μέρα"
-#: core/models/profile.py:229
+#: core/models/profile.py:255
msgid "Work"
msgstr "Εργασία"
-#: core/models/profile.py:230 core/models/profile.py:272
+#: core/models/profile.py:256 core/models/profile.py:298
msgid "Average hours per day"
msgstr "Μέσες ώρες ανα μέρα"
-#: core/models/profile.py:239 core/models/profile.py:260
-#: core/models/profile.py:281
+#: core/models/profile.py:265 core/models/profile.py:286
+#: core/models/profile.py:307
msgid "Physical intensity"
msgstr "Φυσική ένταση"
-#: core/models/profile.py:240 core/models/profile.py:261
-#: core/models/profile.py:282
+#: core/models/profile.py:266 core/models/profile.py:287
+#: core/models/profile.py:308
msgid "Approximately"
msgstr "Περίπου"
-#: core/models/profile.py:250
+#: core/models/profile.py:276
msgid "Sport"
msgstr "Άθληση"
-#: core/models/profile.py:251
+#: core/models/profile.py:277
msgid "Average hours per week"
msgstr "Μέσες ώρες ανα εβδομάδα"
-#: core/models/profile.py:271
+#: core/models/profile.py:297
msgid "Free time"
msgstr "Ελεύθερη ώρα"
-#: core/models/profile.py:292 nutrition/templates/rate/form.html:66
+#: core/models/profile.py:318 nutrition/templates/rate/form.html:66
msgid "Total daily calories"
msgstr "Συνολικές ημερήσιες θερμίδες"
-#: core/models/profile.py:293
+#: core/models/profile.py:319
msgid "Total caloric intake, including e.g. any surplus"
msgstr ""
"Συνολική εισαγωγή θερμίδων, συμπεριλαμβάνοντας π.χ. οποιαδήποτε υπερβολή"
-#: core/models/profile.py:305 nutrition/models/ingredient_weight_unit.py:45
+#: core/models/profile.py:331 nutrition/models/ingredient_weight_unit.py:45
#: nutrition/models/log.py:90 nutrition/models/meal_item.py:58
msgid "Weight unit"
msgstr "Μονάδα βάρους"
-#: core/models/profile.py:313
+#: core/models/profile.py:339
msgid "Allow external access"
msgstr "Να επιτρέπεται η εξωτερική πρόσβαση"
-#: core/models/profile.py:315
+#: core/models/profile.py:341
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/profile.py:324
+#: core/models/profile.py:350
msgid "Automatic reminders for weight entries"
msgstr ""
-#: core/models/profile.py:326
+#: core/models/profile.py:352
msgid "Number of days after the last weight entry (enter 0 to deactivate)"
msgstr ""
-#: core/models/profile.py:392
+#: core/models/profile.py:418
msgid "The sum of all hours has to be 24"
msgstr "Το σύνολο όλων των ωρών θα πρέπει να είναι 24"
#: core/models/rep_unit.py:35 core/models/weight_unit.py:35
-#: core/templates/user/overview.html:263 core/views/user.py:575
+#: core/templates/user/overview.html:263 core/views/user.py:591
#: 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
+#: exercises/models/exercise.py:64 exercises/models/muscle.py:36
#: 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
@@ -602,6 +511,52 @@ msgid "Are you sure you want to delete this? This action cannot be undone."
msgstr ""
"Θέλετε σίγουρα να διαγράψετε αυτό; Αυτή η ενέργεια δεν μπορεί να αναιρεθεί."
+#: core/templates/email_verification/confirm_template.html:4
+msgid "Email verified"
+msgstr ""
+
+#: core/templates/email_verification/confirm_template.html:18
+#, python-format
+msgid "%(username)s, your email was verified"
+msgstr ""
+
+#: core/templates/email_verification/confirm_template.html:22
+msgid "Error, invalid verification token"
+msgstr ""
+
+#: core/templates/email_verification/email_body_html.tpl:6
+#, fuzzy
+#| msgid "Configuration"
+msgid "Email Confirmation"
+msgstr "Παραμετροποίηση"
+
+#: core/templates/email_verification/email_body_html.tpl:9
+#: core/templates/email_verification/email_body_txt.tpl:3
+#, python-format
+msgid "You are almost there, %(username)s!"
+msgstr ""
+
+#: core/templates/email_verification/email_body_html.tpl:11
+#, python-format
+msgid "Please click <a href=\"%(link)s\">here</a> to confirm your email"
+msgstr ""
+
+#: core/templates/email_verification/email_body_html.tpl:12
+#: core/templates/email_verification/email_body_txt.tpl:5
+#, python-format
+msgid "The token expires on %(time)s"
+msgstr ""
+
+#: core/templates/email_verification/email_body_html.tpl:14
+#: core/templates/email_verification/email_body_txt.tpl:8
+msgid "the wger Team"
+msgstr ""
+
+#: core/templates/email_verification/email_body_txt.tpl:4
+#, python-format
+msgid "Please click the following link to confirm your email: %(link)s"
+msgstr ""
+
#: core/templates/index.html:4
msgid "Dashboard"
msgstr "Πίνακας Ελέγχου"
@@ -660,7 +615,7 @@ msgid "Add custom diary entry"
msgstr ""
#: core/templates/index.html:84 core/templates/index.html:92
-#: manager/models/day.py:34 manager/models/log.py:56
+#: manager/models/day.py:34 manager/models/log.py:58
#: manager/models/session.py:60 manager/models/workout.py:109
#: manager/templates/schedule/view.html:105
#: manager/templates/workout/view.html:11
@@ -691,6 +646,20 @@ msgstr "Νέα εγγραφή"
msgid "No workouts found."
msgstr "Δεν βρέθηκαν προπονήσεις."
+#: core/templates/index.html:137 core/templates/index.html:189
+#: core/templates/language/overview.html:23
+#: 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:150
+#: nutrition/templates/plan/view.html:153
+#: nutrition/templates/plan/view.html:191
+msgid "Add one now."
+msgstr "Προσθήκη τώρα."
+
#: 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
@@ -744,19 +713,59 @@ msgid "No nutrition plans."
msgstr "Κανένα πρόγραμμα διατροφής."
#: 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
+#: core/templates/user/overview.html:121 manager/forms.py:184
+#: manager/helpers.py:89 manager/models/log.py:86 manager/models/setting.py:79
+#: manager/templates/log/add.html:54 manager/templates/set/formset.html:11
#: weight/models.py: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:210 core/templates/navigation.html:135
+#: core/templates/index.html:210 core/templates/navigation.html:126
#: weight/views.py:70
msgid "Add weight entry"
msgstr "Νέα εγγραφή βάρους"
+#: core/templates/language/overview.html:4 core/templates/navigation.html:217
+msgid "Languages"
+msgstr "Γλώσσες"
+
+#: core/templates/language/overview.html:23
+msgid "Nothing found."
+msgstr "Δεν βρέθηκε τίποτα."
+
+#: core/templates/language/overview.html:36 core/templates/license/list.html:38
+#: core/templates/misc/license/list.html:41
+#: core/templates/repetition_unit/list.html:41
+#: core/templates/user/overview.html:327 core/templates/user/overview.html:366
+#: core/templates/user/overview.html:402
+#: core/templates/weight_unit/list.html:41 core/views/languages.py:73
+#: core/views/license.py:65 core/views/repetition_units.py:65
+#: core/views/weight_units.py:65
+#: exercises/templates/categories/admin-overview.html:36
+#: 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:61
+msgid "Add"
+msgstr "Προσθήκη"
+
+#: core/templates/language/view.html:52 core/templates/user/api_key.html:44
+#: core/templates/user/preferences.html:44 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:45
+msgid "Options"
+msgstr "Επιλογές"
+
#: core/templates/license/list.html:4 core/templates/misc/license/list.html:4
msgid "License list"
msgstr "Λίστα αδειών"
@@ -769,7 +778,6 @@ msgstr "Λίστα αδειών"
#: core/templates/weight_unit/list.html:26
#: exercises/templates/categories/admin-overview.html:24
#: exercises/templates/equipment/admin-overview.html:24
-#: exercises/templates/exercise/pending.html:30
#: exercises/templates/muscles/admin-overview.html:24
#: gym/templates/admin_notes/list.html:52 gym/templates/contract/list.html:60
#: gym/templates/contract_option/list.html:56
@@ -851,155 +859,135 @@ msgstr "Τα προγράμματα σας"
msgid "Public templates"
msgstr ""
-#: core/templates/navigation.html:64
-msgctxt "as in sorted by category"
-msgid "by category"
-msgstr ""
-
-#: core/templates/navigation.html:65
-msgctxt "as in sorted by muscle"
-msgid "by muscle"
-msgstr ""
-
-#: core/templates/navigation.html:66
-msgctxt "as in sorted by equipment"
-msgid "by equipment"
-msgstr ""
-
-#: core/templates/navigation.html:70
-#: exercises/templates/equipment/overview.html:109
-#: exercises/templates/equipment/overview.html:113
-#: exercises/templates/exercise/overview.html:112
-#: exercises/templates/exercise/overview.html:116
-#: exercises/templates/muscles/overview.html:112
-#: exercises/templates/muscles/overview.html:116
-msgid "Add new exercise"
-msgstr "Νέα άσκηση"
+#: core/templates/navigation.html:63 manager/forms.py:133
+#: manager/models/setting.py:54
+msgid "Exercises"
+msgstr "Ασκήσεις"
-#: core/templates/navigation.html:75 core/templates/navigation.html:116
-#: core/templates/navigation.html:224
+#: core/templates/navigation.html:67 core/templates/navigation.html:107
+#: core/templates/navigation.html:215
msgid "Administration"
msgstr "Διαχείριση"
-#: core/templates/navigation.html:76
-#: exercises/templates/exercise/pending.html:6
-msgid "Exercises pending review"
-msgstr "Ασκήσεις που αναμένουν εξέταση"
+#: core/templates/navigation.html:68
+#, fuzzy
+#| msgid "Exercise day"
+msgid "Exercise edit history"
+msgstr "Μέρα προπόνησης"
-#: core/templates/navigation.html:77 exercises/models/base.py:72
-#: exercises/templates/exercise/view.html:80
+#: core/templates/navigation.html:69 exercises/models/base.py:84
msgid "Equipment"
msgstr "Όργανα"
-#: core/templates/navigation.html:78 exercises/templates/exercise/view.html:258
+#: core/templates/navigation.html:70
msgid "Muscles"
msgstr "Μύες"
-#: core/templates/navigation.html:79
+#: core/templates/navigation.html:71
#: exercises/templates/categories/admin-overview.html:4
msgid "Categories"
msgstr "Κατηγορίες"
-#: core/templates/navigation.html:93 software/templates/features.html:87
+#: core/templates/navigation.html:84 software/templates/features.html:87
msgid "Nutrition"
msgstr "Διατροφή"
-#: core/templates/navigation.html:99 core/templates/user/overview.html:144
+#: core/templates/navigation.html:90 core/templates/user/overview.html:144
msgid "Nutrition plans"
msgstr "Προγράμματα διατροφής"
-#: core/templates/navigation.html:105 nutrition/templates/bmi/form.html:50
+#: core/templates/navigation.html:96 nutrition/templates/bmi/form.html:50
msgid "BMI calculator"
msgstr "Υπολογιστής BMI"
-#: core/templates/navigation.html:111 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:102 nutrition/templates/rate/form.html:17
msgid "Daily calories calculator"
msgstr "Υπολογιστής ημερήσιων θερμίδων"
-#: core/templates/navigation.html:113
+#: core/templates/navigation.html:104
#: nutrition/templates/ingredient/overview.html:29
msgid "Ingredient overview"
msgstr "Επισκόπηση συστατικών"
-#: core/templates/navigation.html:117 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:108 nutrition/templates/units/list.html:6
msgid "Ingredient weight units"
msgstr "Μονάδες βάρους συστατικών"
-#: core/templates/navigation.html:118
+#: core/templates/navigation.html:109
#: nutrition/templates/ingredient/pending.html:6
msgid "Ingredients pending review"
msgstr "Συστατικά που αναμένουν εξέταση"
-#: core/templates/navigation.html:132
+#: core/templates/navigation.html:123
msgid "Body weight"
msgstr ""
-#: core/templates/navigation.html:134 core/templates/user/overview.html:114
+#: core/templates/navigation.html:125 core/templates/user/overview.html:114
#: weight/templates/overview.html:7
msgid "Weight overview"
msgstr "Επισκόπηση βάρους"
-#: core/templates/navigation.html:147
+#: core/templates/navigation.html:138
msgid "About this software"
msgstr "Σχετικά"
-#: core/templates/navigation.html:149 core/templates/template_features.html:82
+#: core/templates/navigation.html:140 core/templates/template_features.html:82
#: software/templates/about_us.html:5
msgid "About us"
msgstr "Σχετικά με μας"
-#: core/templates/navigation.html:151 software/templates/features.html:209
+#: core/templates/navigation.html:142 software/templates/features.html:209
msgid "REST API"
msgstr "REST API"
-#: core/templates/navigation.html:155 utils/models.py:40
+#: core/templates/navigation.html:146 utils/models.py:41
msgid "License"
msgstr "Άδεια"
-#: core/templates/navigation.html:161
+#: core/templates/navigation.html:152
msgid "Developer documentation"
msgstr ""
-#: core/templates/navigation.html:167
+#: core/templates/navigation.html:158
msgid "Get the code"
msgstr "Κατεβάστε τον κώδικα"
-#: core/templates/navigation.html:173 core/templates/template.html:204
+#: core/templates/navigation.html:164 core/templates/template.html:203
#: core/templates/template_features.html:99
msgid "Translate"
msgstr "Μετάφραση"
-#: core/templates/navigation.html:194 core/templates/user/login.html:28
+#: core/templates/navigation.html:185 core/templates/user/login.html:28
msgid "Reset password"
msgstr "Αλλαγή κωδικού"
-#: core/templates/navigation.html:207
+#: core/templates/navigation.html:198
msgid "My preferences"
msgstr "Οι προτιμήσεις μου"
-#: core/templates/navigation.html:214
+#: core/templates/navigation.html:205
msgid "Logout"
msgstr "Έξοδος"
-#: core/templates/navigation.html:229
+#: core/templates/navigation.html:220
msgid "Licenses"
msgstr "Άδειες"
-#: core/templates/navigation.html:232
+#: core/templates/navigation.html:223
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr ""
-#: core/templates/navigation.html:235 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:226 core/templates/weight_unit/list.html:4
#: nutrition/templates/ingredient/view.html:174
msgid "Weight units"
msgstr "Μονάδες βάρους"
-#: core/templates/navigation.html:238 core/templates/user/list.html:4
+#: core/templates/navigation.html:229 core/templates/user/list.html:4
msgid "User list"
msgstr ""
-#: core/templates/navigation.html:239
+#: core/templates/navigation.html:230
msgid "Gyms"
msgstr "Γυμναστήρια"
@@ -1082,33 +1070,30 @@ msgstr "επόμενο"
msgid "Add weight log"
msgstr ""
-#: core/templates/tags/render_day.html:114
-#: exercises/templates/equipment/overview.html:59
-#: exercises/templates/exercise/overview.html:63
-#: exercises/templates/muscles/overview.html:65
+#: core/templates/tags/render_day.html:116
msgid "Placeholder image for exercise"
msgstr "Εικονίδιο placeholder για άσκηση"
-#: core/templates/tags/render_day.html:131
+#: core/templates/tags/render_day.html:133
msgid "This exercise has no repetitions."
msgstr "Αυτή η άσκηση δεν έχει επαναλήψεις."
-#: core/templates/tags/render_day.html:134
+#: core/templates/tags/render_day.html:136
msgid "Edit them now."
msgstr "Επεξεργαστείτε τώρα."
-#: core/templates/tags/render_day.html:159
+#: core/templates/tags/render_day.html:162
msgid "Add exercises to this workout day"
msgstr "Προσθέστε ασκήσεις για την προπόνηση σε αυτήν την μέρα"
#: core/templates/tags/render_weight_log.html:17 manager/helpers.py:89
-#: manager/models/setting.py:57 manager/templates/set/formset.html:10
+#: manager/models/setting.py:69 manager/templates/set/formset.html:9
msgid "Reps"
msgstr "Επαναλήψεις"
-#: 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
+#: core/templates/tags/render_weight_log.html:30 manager/forms.py:189
+#: manager/models/log.py:103 manager/models/setting.py:99
+#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
msgid "RiR"
msgstr ""
@@ -1133,7 +1118,7 @@ msgstr ""
msgid "Features"
msgstr "Δυνατότητες"
-#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:37
+#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:53
msgid "API key"
msgstr "Κλειδί API"
@@ -1179,11 +1164,12 @@ msgid "Documentation"
msgstr "Βιβλιογραφία"
#: core/templates/user/delete_account.html:4
-#: core/templates/user/preferences.html:42
+#: core/templates/user/preferences.html:58
msgid "Delete account"
msgstr "Διαγραφή λογαριασμού"
#: core/templates/user/delete_account.html:17
+#: exercises/templates/history/overview.html:93
msgid "Are you sure?"
msgstr "Σίγουρα;"
@@ -1232,11 +1218,12 @@ 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/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
+#: exercises/models/base.py:99 exercises/models/base.py:104
+#: exercises/models/exercise.py:69 exercises/models/exercise.py:76
+#: gallery/models/image.py:47 manager/helpers.py:88 manager/models/log.py:100
+#: 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/views.py:150
@@ -1244,11 +1231,11 @@ msgid "Date"
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: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
+#: exercises/models/exercise.py:57 exercises/views/exercises.py:123
+#: 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 "Περιγραφή"
@@ -1256,12 +1243,12 @@ msgstr "Περιγραφή"
msgid "Number of logs (days)"
msgstr "Αριθμός ιστορικών (ημέρες)"
-#: core/templates/user/overview.html:37 core/views/user.py:576
+#: core/templates/user/overview.html:37 core/views/user.py:592
#: 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:267
+#: core/templates/user/overview.html:68 manager/forms.py:278
#: manager/templates/workout/view.html:151
msgid "Log"
msgstr "Ιστορικό"
@@ -1279,6 +1266,7 @@ msgid "Notes"
msgstr "Σημειώσεις"
#: core/templates/user/overview.html:79
+#: exercises/templates/history/overview.html:30
#: manager/templates/calendar/partial_overview_table.html:42
#: nutrition/templates/log/detail.html:154
msgid "Time"
@@ -1326,10 +1314,12 @@ msgid "Do you really want to change this user&#39;s password?"
msgstr ""
#: core/templates/user/overview.html:233
+#: exercises/templates/history/overview.html:106
msgid "No"
msgstr ""
#: core/templates/user/overview.html:234
+#: exercises/templates/history/overview.html:99
msgid "Yes"
msgstr ""
@@ -1384,10 +1374,15 @@ msgid "Documents"
msgstr "Έγγραφα"
#: core/templates/user/overview.html:413 gym/templates/document/list.html:32
-#: manager/forms.py:279 manager/templates/workout/view.html:176
+#: manager/forms.py:290 manager/templates/workout/view.html:176
msgid "Download"
msgstr "Μεταφόρτωση"
+#: core/templates/user/overview.html:451 gym/views/admin_config.py:44
+#: gym/views/admin_config.py:58 gym/views/user_config.py:46
+msgid "Configuration"
+msgstr "Παραμετροποίηση"
+
#: core/templates/user/overview.html:454 gym/models/user_config.py:92
msgid "Include in inactive overview"
msgstr "Να συμπεριλαμβάνεται στην μη ενεργή επισκόπηση"
@@ -1405,7 +1400,23 @@ msgstr "Είσοδος ως αυτόν τον χρήστη"
msgid "Preferences"
msgstr "Προτιμήσεις"
-#: core/templates/user/preferences.html:33 core/views/user.py:587
+#: core/templates/user/preferences.html:19
+msgid "Verified email"
+msgstr ""
+
+#: core/templates/user/preferences.html:24
+msgid "Unverified email"
+msgstr ""
+
+#: core/templates/user/preferences.html:26
+msgid "Send verification email"
+msgstr ""
+
+#: core/templates/user/preferences.html:30
+msgid "You need to verify your email to contribute exercises"
+msgstr ""
+
+#: core/templates/user/preferences.html:49 core/views/user.py:603
msgid "Change password"
msgstr "Αλλαγή κωδικού"
@@ -1435,39 +1446,37 @@ msgid "oz"
msgstr "oz"
#: 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
+#: exercises/views/equipment.py:104 exercises/views/exercises.py:185
+#: exercises/views/muscles.py:99 manager/views/schedule.py:311
+#: manager/views/schedule_step.py:129 manager/views/workout.py:269
+#: manager/views/workout_session.py:141 nutrition/views/ingredient.py:138
#: 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:431
-#: exercises/views/muscles.py:125 gallery/views/images.py:121
+#: exercises/views/categories.py:127 exercises/views/exercises.py:193
+#: exercises/views/muscles.py:106 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
+#: manager/views/workout.py:273 manager/views/workout_session.py:156
+#: nutrition/views/ingredient.py:145 nutrition/views/plan.py:127
#: nutrition/views/unit.py:118
#, python-brace-format
msgid "Delete {0}?"
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/repetition_units.py:85 core/views/user.py:472
#: 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: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
+#: exercises/views/equipment.py:81 exercises/views/muscles.py:86
+#: 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:170
+#: gym/views/gym.py:459 manager/views/day.py:100 manager/views/schedule.py:335
+#: manager/views/workout.py:287 nutrition/views/ingredient.py:164
+#: nutrition/views/plan.py:144 nutrition/views/unit.py:144
#, python-brace-format
msgid "Edit {0}"
msgstr "Επεξεργασία {0}"
@@ -1499,64 +1508,65 @@ msgstr "Υποβολ΄"
msgid "Your feedback was successfully sent. Thank you!"
msgstr "Το feedback σας αποστάλθηκε με επιτυχία. Ευχαριστούμε!"
-#: core/views/user.py:156
+#: core/views/user.py:157
#, python-brace-format
msgid "Account \"{0}\" was successfully deleted"
msgstr "Ο λογαριασμός \"{0}\" διαγράφηκε με επιτυχία"
-#: core/views/user.py:287
+#: core/views/user.py:294
msgid "You were successfully registered"
msgstr "Εγγραφήκατε με επιτυχία"
-#: core/views/user.py:339
+#: core/views/user.py:355
msgid "Settings successfully updated"
msgstr "Οι ρυθμίσεις ανανεώθηκαν με επιτυχία"
-#: core/views/user.py:376
+#: core/views/user.py:392
msgid "The user was successfully deactivated"
msgstr "Ο χρήστης απενεργοποιήθηκε με επιτυχία"
-#: core/views/user.py:411
+#: core/views/user.py:427
msgid "The user was successfully activated"
msgstr "Ο χρήστης ενεργοποιήθηκε με επιτυχία"
-#: core/views/user.py:426
+#: core/views/user.py:442
msgid "Edit user"
msgstr "Επεξεργασία χρήστη"
-#: core/views/user.py:573 gym/templates/gym/member_list.html:26
+#: core/views/user.py:589 gym/templates/gym/member_list.html:26
#: gym/views/gym.py:156
msgid "ID"
msgstr "ID"
-#: core/views/user.py:574 gym/forms.py:94 gym/templates/contract/view.html:55
+#: core/views/user.py:590 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:577 gym/templates/gym/new_user.html:34
+#: core/views/user.py:593 gym/templates/gym/new_user.html:34
#: gym/views/export.py:60 gym/views/gym.py:218
msgid "Gym"
msgstr "Γυμναστήριο"
-#: exercises/models/base.py:51 exercises/templates/exercise/view.html:76
-#: nutrition/models/ingredient.py:204
+#: core/views/user.py:652
+#, python-format
+msgid "A verification email was sent to %(email)s"
+msgstr ""
+
+#: exercises/models/base.py:63 nutrition/models/ingredient.py:204
msgid "Category"
msgstr "Κατηγορία"
-#: exercises/models/base.py:58
+#: exercises/models/base.py:70
msgid "Primary muscles"
msgstr "Κύριοι μύς"
-#: exercises/models/base.py:64 exercises/templates/equipment/overview.html:71
-#: exercises/templates/exercise/overview.html:76
-#: exercises/templates/exercise/view.html:268
-#: exercises/templates/muscles/overview.html:77
+#: exercises/models/base.py:76
msgid "Secondary muscles"
msgstr "Δευτερεύοντες μύς"
-#: exercises/models/base.py:79
+#: exercises/models/base.py:91
msgid "Variations"
msgstr ""
@@ -1564,75 +1574,62 @@ msgstr ""
msgid "Exercise Categories"
msgstr "Κατηγορίες ασκήσεων"
-#: exercises/models/comment.py:34 exercises/models/exercise_alias.py:32
-#: exercises/models/image.py:75 exercises/models/video.py:82
-#: manager/forms.py:165 manager/helpers.py:89 manager/models/log.py:51
+#: exercises/models/comment.py:37 exercises/models/exercise_alias.py:35
+#: exercises/models/image.py:71 exercises/models/video.py:95
+#: manager/forms.py:176 manager/helpers.py:89 manager/models/log.py:52
msgid "Exercise"
msgstr "Άσκηση"
-#: exercises/models/comment.py:41
+#: exercises/models/comment.py:43
msgid "A comment about how to correctly do this exercise."
msgstr "Ένα σχόλιο για τον σωστό τρόπο εφαρμογής της άσκησης."
-#: exercises/models/exercise.py:86 nutrition/models/ingredient.py:80
+#: exercises/models/exercise.py:81 nutrition/models/ingredient.py:80
#: nutrition/models/plan.py:61 nutrition/models/weight_unit.py:32
msgid "Language"
msgstr "Γλώσσα"
-#: exercises/models/exercise.py:237 exercises/views/exercises.py:461
-msgid "Exercise was successfully added to the general database"
-msgstr "Η άσκηση προστέθηκε με επιτυχία στην γενική βάση δεδομένων"
-
-#: exercises/models/exercise.py:265
-msgid "New user submitted exercise"
-msgstr "Ένας νέος χρήστης πρόσθεσε μια άσκηση"
-
-#: exercises/models/exercise.py:267
-#, python-brace-format
-msgid "The user {0} submitted a new exercise \"{1}\"."
-msgstr "Ο χρήστης {0} πρόσθεσε μια νέα άσκηση \"{1}\"."
-
-#: exercises/models/exercise_alias.py:35
+#: exercises/models/exercise_alias.py:38
#, fuzzy
#| msgid "Add new exercise"
msgid "Alias for an exercise"
msgstr "Νέα άσκηση"
-#: exercises/models/image.py:59
+#: exercises/models/image.py:55
msgid "Line"
msgstr ""
-#: exercises/models/image.py:60
+#: exercises/models/image.py:56
msgid "3D"
msgstr ""
-#: exercises/models/image.py:61
+#: exercises/models/image.py:57
msgid "Low-poly"
msgstr ""
-#: exercises/models/image.py:62
+#: exercises/models/image.py:58
msgid "Photo"
msgstr ""
-#: exercises/models/image.py:63
+#: exercises/models/image.py:59
#, fuzzy
#| msgid "Others"
msgid "Other"
msgstr "Άλλα"
-#: exercises/models/image.py:81 gallery/models/image.py:56
+#: exercises/models/image.py:77 gallery/models/image.py:56
msgid "Image"
msgstr "Εικόνα"
-#: exercises/models/image.py:82 gallery/models/image.py:57
+#: exercises/models/image.py:78 gallery/models/image.py:57
msgid "Only PNG and JPEG formats are supported"
msgstr "Μόνο PNG και JPEG εικόνες υποστηρίζονται"
-#: exercises/models/image.py:88
+#: exercises/models/image.py:84
msgid "Main picture"
msgstr ""
-#: exercises/models/image.py:91
+#: exercises/models/image.py:87
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 "
@@ -1642,19 +1639,10 @@ msgstr ""
"αυτήν την άσκηση (θα εμφανίζεται π.χ. στην εύρεση). Η πρώτη εικόνα αυτόματα "
"μαρκάρεται απο το σύστημα."
-#: exercises/models/image.py:100
+#: exercises/models/image.py:96
msgid "The art style of your image"
msgstr ""
-#: exercises/models/image.py:185
-msgid "New user submitted image"
-msgstr "Ένας νέος χρήστης υπέβαλε εικόνα"
-
-#: exercises/models/image.py:186
-#, python-brace-format
-msgid "The user {0} submitted a new image \"{1}\" for exercise {2}."
-msgstr "Ο χρήστης {0} υπέβαλλε μιά νέα εικόνα \"{1}\" για την άσκηση {2}."
-
#: exercises/models/muscle.py:37
msgid "In latin, e.g. \"Pectoralis major\""
msgstr "Στα λατινικά, π.χ. \"Pectoralis major\""
@@ -1669,53 +1657,54 @@ msgstr "ονομασία άσκησης"
msgid "A more basic name for the muscle"
msgstr ""
-#: exercises/models/video.py:41
-msgid "Maximum file size is 100MB."
+#: exercises/models/video.py:50
+#, python-format
+msgid "Maximum file size is %(size)sMB."
msgstr ""
-#: exercises/models/video.py:44 exercises/models/video.py:48
+#: exercises/models/video.py:57 exercises/models/video.py:65
msgid "File type is not supported"
msgstr ""
-#: exercises/models/video.py:57
+#: exercises/models/video.py:70
#, fuzzy
#| msgid "%(birthdate)s is not a valid birthdate"
msgid "File is not a valid video"
msgstr "%(birthdate)s δεν είναι σωστή ημερομηνία γέννησης"
-#: exercises/models/video.py:88
+#: exercises/models/video.py:101
msgid "Main video"
msgstr ""
-#: exercises/models/video.py:94
+#: exercises/models/video.py:107
msgid "Video"
msgstr ""
-#: exercises/models/video.py:101
+#: exercises/models/video.py:114
msgid "Size"
msgstr ""
-#: exercises/models/video.py:108 manager/models/schedule_step.py:56
+#: exercises/models/video.py:121 manager/models/schedule_step.py:56
msgid "Duration"
msgstr "Διάρκεια"
-#: exercises/models/video.py:117
+#: exercises/models/video.py:130
msgid "Width"
msgstr ""
-#: exercises/models/video.py:124
+#: exercises/models/video.py:137
#, fuzzy
#| msgid "Weight"
msgid "Height"
msgstr "Βάρος"
-#: exercises/models/video.py:131
+#: exercises/models/video.py:144
#, fuzzy
#| msgid "Code"
msgid "Codec"
msgstr "Κώδικας"
-#: exercises/models/video.py:139
+#: exercises/models/video.py:152
msgid "Codec, long name"
msgstr ""
@@ -1724,240 +1713,68 @@ msgid "Equipment list"
msgstr "Λίστα οργάνων"
#: exercises/templates/equipment/admin-overview.html:37
-#: exercises/views/equipment.py:94
+#: exercises/views/equipment.py:92
msgid "Add new equipment"
msgstr "Νέο όργανο"
-#: exercises/templates/equipment/overview.html:11
-msgid "Equipment overview"
-msgstr "Επισκόπηση οργάνων"
-
-#: exercises/templates/equipment/overview.html:69
-#: exercises/templates/exercise/overview.html:74
-#: exercises/templates/exercise/view.html:264
-#: exercises/templates/muscles/overview.html:75
-msgid "Main muscles"
-msgstr "Κύριοι μύες"
-
-#: exercises/templates/equipment/overview.html:79
-msgid ""
-"No exercises for this equipment. Add or edit an exercise and set the "
-"equipment."
-msgstr ""
-"Δεν υπάρχουν ασκήσεις για αυτόν τον εξοπλισμό. Προσθέστε ή επεξεργαστείτε "
-"κάποια και ρυθμίστε την για τον εξοπλισμό αυτόν."
-
-#: exercises/templates/equipment/overview.html:96
-#: exercises/templates/exercise/overview.html:99
-#: nutrition/templates/ingredient/overview.html:57
-msgid "Search"
-msgstr "Εύρεση"
-
-#: exercises/templates/equipment/overview.html:101
-#: exercises/templates/exercise/overview.html:104
-msgid "exercise name"
-msgstr "ονομασία άσκησης"
-
-#: exercises/templates/equipment/overview.html:115
-#: exercises/templates/exercise/overview.html:118
-#: exercises/templates/muscles/overview.html:118
-#: nutrition/templates/ingredient/overview.html:85
-msgid "Only registered users can do this"
-msgstr "Μόνο εγγεγραμμένοι χρήστες μπορούν να το κάνουν αυτό"
-
-#: exercises/templates/exercise/email_new.tpl:1
-#, python-format
-msgid ""
-"Your exercise '%(exercise)s' was successfully added to the general\n"
-"database."
-msgstr ""
-"Η άσκηση '%(exercise)s' σας προστέθηκε με επιτυχία στην γενική βάση "
-"δεδομένων."
-
-#: exercises/templates/exercise/email_new.tpl:4
-msgid ""
-"It is now available on the exercise and muscle overview and can be\n"
-"added to workouts. You can access it on this address:"
-msgstr ""
-"Είναι τώρα διαθέσιμη στην άσκηση και επισκόπηση μυών και μπορεί να προστεθεί "
-"στις προπονήσεις. Μπορείτε να την βρείτε στην διεύθυνση:"
-
-#: exercises/templates/exercise/email_new.tpl:8
-#: nutrition/templates/ingredient/email_new.tpl:8
-msgid "Thank you for contributing and making this site better!"
-msgstr ""
-"Ευχαριστούμε για την συμβολή σας και κάνοντας την υπηρεσία μας καλύτερη!"
-
-#: exercises/templates/exercise/email_new.tpl:9
-#: manager/templates/workout/email_reminder.tpl:15
-#: manager/templates/workout/email_weight_reminder.tpl:12
-#: nutrition/templates/ingredient/email_new.tpl:9
-#, python-format
-msgid "The %(site)s team"
-msgstr ""
-
-#: exercises/templates/exercise/form.html:4
-msgid "Submitting an exercise"
-msgstr "Υποβολή μιας άσκησης"
-
-#: exercises/templates/exercise/form.html:5
-msgid ""
-"Thank you for submitting an exercise. This is much\n"
-"appreciated!"
-msgstr ""
-"Ευχαριστούμε που υποβάλλατε μια άσκηση. Το εκτιμούμε\n"
-"πολύ!"
-
-#: exercises/templates/exercise/form.html:8
-msgid ""
-"After you submit the form, the administrators will be notified.\n"
-"Once it is reviewed, it will be added to the database. Till this happens,\n"
-"it will not be visible in the overview or the search. In case you added your "
-"email\n"
-"when you registered, you will get notified when the process is completed "
-"successfully."
-msgstr ""
-"Μετά την υποβολή της φόρμας, οι διαχειριστές θα ειδοποιηθούν.\n"
-"Μόλις εξεταστεί, θα προστεθεί στην βάση δεδομένων. Έως ότου γίνει, δεν θα "
-"είναι ορατό στην επισκόπηση και στις ανευρέσεις. Σε περίπτωση που εισάγατε "
-"το email σας όταν εγγραφήκατε, θα ειδοποιηθείτε για την εξέλιξη της όταν "
-"ολοκληρωθεί με επιτυχία."
-
-#: exercises/templates/exercise/form_correct.html:4
-msgid "Correcting an exercise"
-msgstr ""
-
-#: exercises/templates/exercise/form_correct.html:5
-msgid ""
-"Thank you for correcting and improving this exercise.\n"
-"This is much appreciated!"
-msgstr ""
-
-#: exercises/templates/exercise/form_correct.html:8
-msgid ""
-"After you submit the form, the administrators will be notified.\n"
-"Once the changes are reviewed the exercise will be updated."
-msgstr ""
-
-#: exercises/templates/exercise/overview.html:88
-msgid "No categories."
-msgstr "Δεν υπάρχουν κατηγορίες."
-
-#: exercises/templates/exercise/overview.html:88
-msgid "Use link to create one"
-msgstr "Χρήση συνδέσμου για την δημιουργία ενός"
-
-#: exercises/templates/exercise/pending.html:14
-#: nutrition/templates/ingredient/pending.html:14
-msgid "Submission date"
-msgstr "Ημερομηνία υποβολής"
-
-#: 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/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 "Χρήστης"
-
-#: exercises/templates/exercise/view.html:48
-msgid "Exercise is pending review"
-msgstr "Αυτή η άσκηση αναμένει έγκριση"
-
-#: exercises/templates/exercise/view.html:51
-msgid ""
-"This user submitted exercise is pending a decision to be\n"
-" included in the database."
-msgstr ""
-
-#: exercises/templates/exercise/view.html:53
-msgid "Till then, it will not be shown in the overview or the search."
-msgstr "Έως τότε, δεν θα εμφανίζεται στην επισκόπηση ή στις ανευρέσεις."
-
-#: exercises/templates/exercise/view.html:54
-#: nutrition/templates/ingredient/view.html:31
-msgid "Please select one of the options below."
-msgstr "Παρακαλούμε επιλέξτε μια επιλογή απο τις παρακάτω."
-
-#: exercises/templates/exercise/view.html:60
-#: 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:204
-#: nutrition/templates/ingredient/view.html:42
-msgid "Decline"
-msgstr "Άρνηση"
+#: exercises/templates/history/overview.html:11
+#, fuzzy
+#| msgid "Exercise day"
+msgid "Exercise admin history"
+msgstr "Μέρα προπόνησης"
-#: exercises/templates/exercise/view.html:96
-msgid "Images"
-msgstr "Εικόνες"
+#: exercises/templates/history/overview.html:27
+#, fuzzy
+#| msgid "Actions"
+msgid "Action"
+msgstr "Ενέργειες"
-#: exercises/templates/exercise/view.html:137 exercises/views/images.py:93
-msgid "Add new image"
-msgstr "Νέας εικόνα"
+#: exercises/templates/history/overview.html:28 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/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 "Χρήστης"
-#: exercises/templates/exercise/view.html:148
-msgid "Videos"
+#: exercises/templates/history/overview.html:29
+msgid "Object"
msgstr ""
-#: exercises/templates/exercise/view.html:187 exercises/views/videos.py:94
+#: exercises/templates/history/overview.html:31
#, fuzzy
-#| msgid "Add new image"
-msgid "Add new video"
-msgstr "Νέας εικόνα"
+#| msgid "Change password"
+msgid "Changes"
+msgstr "Αλλαγή κωδικού"
-#: exercises/templates/exercise/view.html:197
-msgid "Images pending review"
+#: exercises/templates/history/overview.html:32
+msgid "Revert"
msgstr ""
-#: exercises/templates/exercise/view.html:218
-msgid "Comments for this exercise"
-msgstr "Σχόλια για αυτήν την άσκηση"
-
-#: exercises/templates/exercise/view.html:246
-msgid "Add new comment"
-msgstr "Νέο σχόλιο"
-
-#: exercises/templates/exercise/view.html:260
-msgid "The diagram shows the most used muscles on this exercise"
+#: exercises/templates/history/overview.html:64
+msgid "View Object"
msgstr ""
-"Το διάγραμμα εμφανίζει τους μύς με την μεγαλύτερη δραστηριότητα σε αυτήν την "
-"άσκηση"
-
-#: 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:306
-msgid "Exercise Variations"
+#: exercises/templates/history/overview.html:75
+msgid "View changes"
msgstr ""
-#: exercises/templates/exercise/view.html:327
-msgid "Submit a correction"
+#: exercises/templates/history/overview.html:86
+msgid "Revert changes"
msgstr ""
#: exercises/templates/muscles/admin-overview.html:4
-#: exercises/templates/muscles/overview.html:7
msgid "Muscle overview"
msgstr "Επισκόπηση μυών"
#: exercises/templates/muscles/admin-overview.html:36
-#: exercises/views/muscles.py:86
+#: exercises/views/muscles.py:67
msgid "Add muscle"
msgstr "Νέος μύς"
-#: exercises/templates/muscles/overview.html:85
-msgid ""
-"No exercises for this muscle. Add or edit an exercise and set the muscle."
-msgstr ""
-
#: exercises/views/categories.py:71
msgid "Add category"
msgstr "Νέα κατηγορία"
@@ -1971,50 +1788,19 @@ msgstr ""
msgid "Add exercise comment"
msgstr "Νέο σχόλιο άσκησης"
-#: exercises/views/equipment.py:107 exercises/views/equipment.py:118
+#: exercises/views/equipment.py:105 exercises/views/equipment.py:116
msgid "Delete equipment?"
msgstr "Διαγραφή οργάνου"
-#: exercises/views/exercises.py:229
+#: exercises/views/exercises.py:161
#, python-format
-msgid ""
-"%(name_original)s is too similar to existing exercise \"%(exercise_name)s\""
-msgstr ""
-
-#: exercises/views/exercises.py:247
-msgid "Add exercise"
-msgstr "Νέα άσκηση"
-
-#: exercises/views/exercises.py:367
-msgid "Thank you. Once the changes are reviewed the exercise will be updated."
-msgstr ""
-
-#: exercises/views/exercises.py:380
-#, python-brace-format
-msgid "Correct {0}"
+msgid "%(name)s is too similar to existing exercise \"%(exercise_name)s\""
msgstr ""
-#: exercises/views/exercises.py:422
+#: exercises/views/exercises.py:184
msgid "This will delete the exercise from all workouts."
msgstr "Αυτή η λειτουργία θα διαγράψει την άσκηση απο όλες τις προπονήσεις"
-#: exercises/views/exercises.py:474
-msgid "Exercise was successfully marked as rejected"
-msgstr "Η άσκηση απορρίφθηκε με επιτυχία"
-
-#: exercises/views/images.py:68
-msgid "Edit exercise image"
-msgstr "Επεξεργασία εικόνας άσκησης"
-
-#: exercises/views/images.py:143
-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"
@@ -2086,7 +1872,7 @@ msgid "Contract type"
msgstr ""
#: gym/models/contract.py:208 gym/templates/contract/view.html:59
-#: manager/templates/log/add.html:52 nutrition/forms.py:59
+#: manager/templates/log/add.html:52 nutrition/forms.py:60
#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:102
#: nutrition/models/meal_item.py:72
msgid "Amount"
@@ -2188,6 +1974,10 @@ msgstr "Χρήση του ονόματος αρχείου αν δεν παρασ
msgid "User notes"
msgstr "Σημειώσεις χρήστη"
+#: gym/templates/contract/list.html:36
+msgid "Show"
+msgstr "Εμφάνιση"
+
#: gym/templates/contract/view.html:4
msgid "Contract"
msgstr ""
@@ -2268,10 +2058,6 @@ msgstr ""
msgid "Add member"
msgstr "Νέο μέλος"
-#: gym/templates/gym/new_user.html:38
-msgid "Date of Birth"
-msgstr ""
-
#: gym/templates/gym/new_user.html:48 manager/templates/calendar/month.html:144
#: manager/templates/log/add.html:75 nutrition/templates/rate/form.html:120
msgid "Info"
@@ -2331,125 +2117,125 @@ msgstr "Προσθήκη χρήστη στο γυμναστήριο"
msgid "Edit gym"
msgstr "Επεξεργασία γυμναστηρίου"
-#: i18n.tpl:2 i18n.tpl:28
+#: i18n.tpl:2
+msgid "Until Failure"
+msgstr ""
+
+#: i18n.tpl:3 manager/forms.py:180 manager/models/log.py:73
+#: manager/templates/set/add.html:53
+msgid "Repetitions"
+msgstr "Επαναλήψεις"
+
+#: i18n.tpl:4
msgid "Abs"
msgstr "Κοιλιακοί"
-#: i18n.tpl:3
+#: i18n.tpl:5
msgid "Arms"
msgstr "Χέρια"
-#: i18n.tpl:4
-msgid "Back"
-msgstr "Πλάτη"
-
-#: i18n.tpl:5 i18n.tpl:23
-msgid "Calves"
-msgstr "Μηροί"
-
-#: i18n.tpl:6 i18n.tpl:26
-msgid "Chest"
-msgstr "Στήθος"
-
-#: i18n.tpl:7
+#: i18n.tpl:6
msgid "Legs"
msgstr "Πόδια"
-#: i18n.tpl:8 i18n.tpl:19
-msgid "Shoulders"
-msgstr "Ώμοι"
+#: i18n.tpl:7
+msgid "Dumbbell"
+msgstr "Αλτήρες"
+
+#: i18n.tpl:8
+msgid "Biceps"
+msgstr ""
#: i18n.tpl:9
-msgid "Barbell"
+msgid "SZ-Bar"
msgstr ""
#: i18n.tpl:10
-msgid "Bench"
-msgstr "Πάγκος"
+msgid "Kettlebell"
+msgstr ""
#: i18n.tpl:11
-msgid "Dumbbell"
-msgstr "Αλτήρες"
+msgid "Swiss Ball"
+msgstr ""
#: i18n.tpl:12
-msgid "Gym mat"
-msgstr "Πατάκι γυμναστηρίου"
+msgid "none (bodyweight exercise)"
+msgstr "κανένα (άσκηση με το βάρος σώματος)"
#: i18n.tpl:13
-msgid "Incline bench"
-msgstr "Πάγκος με κλίση"
+msgid "Calves"
+msgstr "Μηροί"
#: i18n.tpl:14
-msgid "Kettlebell"
-msgstr ""
+msgid "Back"
+msgstr "Πλάτη"
#: i18n.tpl:15
-msgid "Pull-up bar"
+msgid "Lower back"
msgstr ""
#: i18n.tpl:16
-msgid "SZ-Bar"
+msgid "Lats"
msgstr ""
#: i18n.tpl:17
-msgid "Swiss Ball"
+msgid "Hamstrings"
msgstr ""
#: i18n.tpl:18
-msgid "none (bodyweight exercise)"
-msgstr "κανένα (άσκηση με το βάρος σώματος)"
+msgid "Bench"
+msgstr "Πάγκος"
+
+#: i18n.tpl:19
+msgid "Glutes"
+msgstr ""
#: i18n.tpl:20
-msgid "Biceps"
+msgid "Kilometers"
msgstr ""
#: i18n.tpl:21
-msgid "Hamstrings"
-msgstr ""
+msgid "Shoulders"
+msgstr "Ώμοι"
#: i18n.tpl:22
-msgid "Lower back"
+msgid "Seconds"
msgstr ""
-#: i18n.tpl:24
-msgid "Glutes"
+#: i18n.tpl:23
+msgid "Miles"
msgstr ""
-#: i18n.tpl:25
-msgid "Lats"
-msgstr ""
+#: i18n.tpl:24
+msgid "Incline bench"
+msgstr "Πάγκος με κλίση"
-#: i18n.tpl:27
+#: i18n.tpl:25
msgid "Quads"
msgstr ""
-#: i18n.tpl:29
-msgid "Triceps"
+#: i18n.tpl:26
+msgid "Minutes"
msgstr ""
-#: i18n.tpl:30
-msgid "Kilometers"
-msgstr ""
+#: i18n.tpl:27
+msgid "Chest"
+msgstr "Στήθος"
-#: i18n.tpl:31
-msgid "Miles"
-msgstr ""
+#: i18n.tpl:28
+msgid "Gym mat"
+msgstr "Πατάκι γυμναστηρίου"
-#: i18n.tpl:32
-msgid "Minutes"
+#: i18n.tpl:29
+msgid "Pull-up bar"
msgstr ""
-#: i18n.tpl:33 manager/forms.py:169 manager/models/log.py:71
-#: manager/templates/set/add.html:53
-msgid "Repetitions"
-msgstr "Επαναλήψεις"
-
-#: i18n.tpl:34
-msgid "Seconds"
+#: i18n.tpl:30
+msgid "Barbell"
msgstr ""
-#: i18n.tpl:35
-msgid "Until Failure"
+#: i18n.tpl:31
+msgid "Triceps"
msgstr ""
#: mailer/forms.py:34 mailer/templates/mailer/gym/preview.html:32
@@ -2503,13 +2289,13 @@ msgstr ""
msgid "Correction"
msgstr ""
-#: manager/forms.py:89 manager/models/workout.py:59
+#: manager/forms.py:92 manager/models/workout.py:59
#, fuzzy
#| msgid "Make a copy of this workout"
msgid "The name of the workout"
msgstr "Δημιουργήστε ένα αντίγραφο αυτής της προπόνησης"
-#: manager/forms.py:93 manager/models/workout.py:66
+#: manager/forms.py:96 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'."
@@ -2517,7 +2303,7 @@ msgstr ""
"Μια μικρή περιγραφή ή στόχος της προπόνησης. Για παράδειγμα \"Συγκεντρωθείτε "
"στην πλάτη\" ή \"Εβδομάδα 1 του προγράμματος Χ\"."
-#: manager/forms.py:126
+#: manager/forms.py:137
msgid ""
"You can search for more than one exercise, they will be grouped together for "
"a superset."
@@ -2525,28 +2311,28 @@ msgstr ""
"Μπορείτε να ψάξετε για περισσότερες από μία ασκήσεις, θα ομαδοποιηθούν σε "
"μια ομάδα."
-#: 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
+#: manager/forms.py:166 manager/forms.py:171 manager/models/log.py:64
+#: manager/models/log.py:92 manager/models/setting.py:59
+#: manager/models/setting.py:90 manager/templates/log/add.html:53
+#: manager/templates/log/add.html:55 manager/templates/set/formset.html:10
+#: manager/templates/set/formset.html:12 measurements/models/category.py:58
+#: nutrition/forms.py:64
msgid "Unit"
msgstr ""
-#: manager/forms.py:266
+#: manager/forms.py:277
msgid "Type"
msgstr ""
-#: manager/forms.py:267 manager/templates/workout/view.html:157
+#: manager/forms.py:278 manager/templates/workout/view.html:157
msgid "Table"
msgstr "Πίνακας"
-#: manager/forms.py:269 manager/templates/workout/view.html:163
+#: manager/forms.py:280 manager/templates/workout/view.html:163
msgid "with images"
msgstr ""
-#: manager/forms.py:270 manager/templates/workout/view.html:169
+#: manager/forms.py:281 manager/templates/workout/view.html:169
msgid "with comments"
msgstr ""
@@ -2567,8 +2353,8 @@ msgstr "Μέρα"
#: manager/models/schedule.py:57
msgid "Name or short description of the schedule. For example 'Program XYZ'."
msgstr ""
-"Ονομασία ή μικρή περιγραφή του προγράμματος. Για παράδειγμα \"Πρόγραμμα XYZ"
-"\"."
+"Ονομασία ή μικρή περιγραφή του προγράμματος. Για παράδειγμα \"Πρόγραμμα "
+"XYZ\"."
#: manager/models/schedule.py:66 manager/templates/schedule/view.html:74
msgid "Schedule active"
@@ -2605,7 +2391,7 @@ msgid "The duration in weeks"
msgstr "Η διάρκεια σε εβδομάδες"
#: manager/models/schedule_step.py:63 manager/models/set.py:52
-#: manager/models/setting.py:98 nutrition/models/meal.py:54
+#: manager/models/setting.py:110 nutrition/models/meal.py:54
#: nutrition/models/meal_item.py:65
msgid "Order"
msgstr "Διάταξη"
@@ -2661,7 +2447,7 @@ msgstr "Μέρα προπόνησης"
msgid "Number of sets"
msgstr "Αριθμός σέτ"
-#: manager/models/setting.py:43
+#: manager/models/setting.py:48
msgid "Sets"
msgstr "Σετ"
@@ -2944,6 +2730,13 @@ msgid ""
"option in your settings."
msgstr ""
+#: manager/templates/workout/email_reminder.tpl:15
+#: manager/templates/workout/email_weight_reminder.tpl:12
+#: nutrition/templates/ingredient/email_new.tpl:9
+#, python-format
+msgid "The %(site)s team"
+msgstr ""
+
#: manager/templates/workout/email_weight_reminder.tpl:3
#, python-format
msgid ""
@@ -2956,6 +2749,10 @@ msgid ""
"You will regularly receive such reminders till you enter your current weight."
msgstr ""
+#: manager/templates/workout/log.html:10 manager/templates/workout/log.html:11
+msgid "Weight log"
+msgstr "Εγγραφή βάρους"
+
#: manager/templates/workout/log.html:29
msgid "Weight log for workout"
msgstr "Εγγραφή βάρους για προπόνηση"
@@ -3066,7 +2863,7 @@ msgstr ""
msgid "Edit workout"
msgstr "Επεξεργασία προπόνησης"
-#: manager/templates/workout/view.html:225 manager/views/workout.py:300
+#: manager/templates/workout/view.html:225 manager/views/workout.py:301
msgid "Mark as template"
msgstr ""
@@ -3074,11 +2871,6 @@ msgstr ""
msgid "Add workout day"
msgstr "Προσθήκη ημέρας προπόνησης"
-#: manager/views/log.py:92
-#, python-format
-msgid "Edit log entry for %s"
-msgstr "Επεξεργασία εγγραφής ιστορικού για %s"
-
#: manager/views/log.py:111
msgid "Delete workout log"
msgstr "Διαγραφή ιστορικού προπόνησης"
@@ -3096,11 +2888,11 @@ msgstr "Δημιουργία προγράμματος"
msgid "Your workouts"
msgstr "Οι προπονήσεις σας"
-#: manager/views/workout.py:227
+#: manager/views/workout.py:228
msgid "Copy workout"
msgstr "Αντιγραφή προπόνησης"
-#: manager/views/workout.py:230
+#: manager/views/workout.py:231
msgid "Copy"
msgstr "Αντιγραφή"
@@ -3123,23 +2915,23 @@ msgstr ""
msgid "Value"
msgstr ""
-#: nutrition/forms.py:122
+#: nutrition/forms.py:123
msgid "Calculate"
msgstr "Υπολογισμός"
-#: nutrition/forms.py:195 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:196 nutrition/templates/rate/form.html:76
msgid "Basic caloric intake"
msgstr "Βασική εισαγωγή θερμίδων"
-#: nutrition/forms.py:196
+#: nutrition/forms.py:197
msgid "Your basic caloric intake as calculated for your data"
msgstr "Η βασική σας εισαγωγή θερμίδων όπως υπολογίστηκε απο τα δεδομένα σας"
-#: nutrition/forms.py:202
+#: nutrition/forms.py:203
msgid "Additional calories"
msgstr "Επιπλέον θερμίδες"
-#: nutrition/forms.py:204
+#: nutrition/forms.py:205
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
@@ -3147,7 +2939,7 @@ msgstr ""
"Επιπλέον θερμίδες θα προστεθούν στην βασική τάση (για αφαίρεση, εισάγετε "
"αρνητικό αριθμό)"
-#: nutrition/forms.py:232 nutrition/models/ingredient_weight_unit.py:39
+#: nutrition/forms.py:233 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"
@@ -3210,7 +3002,7 @@ msgid ""
"{energy_approx}%)"
msgstr ""
-#: nutrition/models/ingredient.py:357 nutrition/views/ingredient.py:225
+#: nutrition/models/ingredient.py:357 nutrition/views/ingredient.py:219
msgid "Ingredient was successfully added to the general database"
msgstr "Το συστατικό προστέθηκε με επιτυχία στην γενική βάση δεδομένων"
@@ -3239,6 +3031,12 @@ msgstr "Μονάδα ποσότητας, π.χ. \"1 Φλιτζάνι\" ή \"1/2
msgid "Meal"
msgstr "Γεύμα"
+#: nutrition/models/log.py:65
+#, fuzzy
+#| msgid "Time (approx)"
+msgid "Date and Time (Approx.)"
+msgstr "Ώρα (περίπου)"
+
#: nutrition/models/meal.py:61
msgid "Time (approx)"
msgstr "Ώρα (περίπου)"
@@ -3343,6 +3141,11 @@ msgstr ""
"να το προσθέσετε στα προγράμματα διατροφής. Μπορείτε να δείτε περισσότερα σε "
"αυτήν την διεύθυνση:"
+#: nutrition/templates/ingredient/email_new.tpl:8
+msgid "Thank you for contributing and making this site better!"
+msgstr ""
+"Ευχαριστούμε για την συμβολή σας και κάνοντας την υπηρεσία μας καλύτερη!"
+
#: nutrition/templates/ingredient/form.html:4
msgid "Submitting an ingredient"
msgstr "Υποβολή ενός συστατικού"
@@ -3375,6 +3178,10 @@ msgstr ""
msgid "No ingredients."
msgstr "Δεν υπάρχουν συστατικά."
+#: nutrition/templates/ingredient/overview.html:57
+msgid "Search"
+msgstr "Εύρεση"
+
#: nutrition/templates/ingredient/overview.html:66
msgid "ingredient name"
msgstr "Ονομασία συστατικού"
@@ -3384,6 +3191,14 @@ msgstr "Ονομασία συστατικού"
msgid "Add ingredient"
msgstr "Προσθήκη συστατικών"
+#: nutrition/templates/ingredient/overview.html:85
+msgid "Only registered users can do this"
+msgstr "Μόνο εγγεγραμμένοι χρήστες μπορούν να το κάνουν αυτό"
+
+#: nutrition/templates/ingredient/pending.html:14
+msgid "Submission date"
+msgstr "Ημερομηνία υποβολής"
+
#: nutrition/templates/ingredient/view.html:27
msgid "Ingredient is pending review"
msgstr "Συστατικά που αναμένουν εξέταση"
@@ -3399,6 +3214,18 @@ msgstr ""
"συμπεριληφθεί στην βάση δεδομένων. Έως τότε, δεν θα εμφανίζεται στην\n"
"επισκόπηση ή στις ανευρέσεις."
+#: nutrition/templates/ingredient/view.html:31
+msgid "Please select one of the options below."
+msgstr "Παρακαλούμε επιλέξτε μια επιλογή απο τις παρακάτω."
+
+#: nutrition/templates/ingredient/view.html:38
+msgid "Accept"
+msgstr "Αποδοχή"
+
+#: nutrition/templates/ingredient/view.html:42
+msgid "Decline"
+msgstr "Άρνηση"
+
#: nutrition/templates/ingredient/view.html:71
#: nutrition/templates/log/detail.html:31
#: nutrition/templates/plan/view.html:229 nutrition/views/plan.py:376
@@ -3666,14 +3493,18 @@ msgstr ""
"τον εαυτό σας τις προσεχείς εβδομάδες και αλλάξτε την συνολική ποσότητα\n"
"αν απαιτείται."
-#: nutrition/views/ingredient.py:181
+#: nutrition/views/ingredient.py:175
msgid "Add a new ingredient"
msgstr "Προσθήκη νέου συστατικού"
-#: nutrition/views/ingredient.py:238
+#: nutrition/views/ingredient.py:232
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 "Προσθήκη νέου γεύματος"
@@ -3897,29 +3728,29 @@ msgstr ""
msgid "100%% Free <br>and <br>Open Source"
msgstr ""
-#: utils/generic_views.py:261
+#: utils/generic_views.py:262
msgid "Yes, delete"
msgstr "Ναί, διαγραφή"
-#: utils/models.py:47
+#: utils/models.py:48
msgid "Author"
msgstr ""
-#: utils/models.py:52
+#: utils/models.py:53
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:77
+#: utils/models.py:78
msgid "Pending"
msgstr "Προς έγκριση"
-#: utils/models.py:78
+#: utils/models.py:79
msgid "Accepted"
msgstr "Αποδοχή"
-#: utils/models.py:79
+#: utils/models.py:80
msgid "Declined"
msgstr "Απόρριψη"
@@ -4078,6 +3909,154 @@ msgstr ""
msgid "Delete weight entry for the %s"
msgstr ""
+#~ msgid "Ingredients"
+#~ msgstr "Συστατικά"
+
+#~ msgid ""
+#~ "Use the configuration to select in what languages the\n"
+#~ "exercises and ingredients will be shown for the current language (for "
+#~ "example\n"
+#~ "the exercises should be shown in languages A, B and C; the ingredients "
+#~ "only\n"
+#~ "in A)."
+#~ msgstr ""
+#~ "Χρησιμοποιήστε την παραμετροποίηση για να επιλέξετε σε ποιές γλώσσες\n"
+#~ "οι ασκήσεις και τα συστατικά θα εμφανίζονται για την τρέχουσα γλώσσα "
+#~ "(για\n"
+#~ "παράδειγμα\n"
+#~ "οι ασκήσεις θα πρέπει να εμφανίζονται στις γλώσσες A, B και Γ, τα "
+#~ "συστατικά\n"
+#~ "μόνο στην Α)."
+
+#~ msgid "Add new exercise"
+#~ msgstr "Νέα άσκηση"
+
+#~ msgid "Exercises pending review"
+#~ msgstr "Ασκήσεις που αναμένουν εξέταση"
+
+#~ msgid "Exercise was successfully added to the general database"
+#~ msgstr "Η άσκηση προστέθηκε με επιτυχία στην γενική βάση δεδομένων"
+
+#~ msgid "New user submitted exercise"
+#~ msgstr "Ένας νέος χρήστης πρόσθεσε μια άσκηση"
+
+#, python-brace-format
+#~ msgid "The user {0} submitted a new exercise \"{1}\"."
+#~ msgstr "Ο χρήστης {0} πρόσθεσε μια νέα άσκηση \"{1}\"."
+
+#~ msgid "New user submitted image"
+#~ msgstr "Ένας νέος χρήστης υπέβαλε εικόνα"
+
+#, python-brace-format
+#~ msgid "The user {0} submitted a new image \"{1}\" for exercise {2}."
+#~ msgstr "Ο χρήστης {0} υπέβαλλε μιά νέα εικόνα \"{1}\" για την άσκηση {2}."
+
+#~ msgid "Equipment overview"
+#~ msgstr "Επισκόπηση οργάνων"
+
+#~ msgid "Main muscles"
+#~ msgstr "Κύριοι μύες"
+
+#~ msgid ""
+#~ "No exercises for this equipment. Add or edit an exercise and set the "
+#~ "equipment."
+#~ msgstr ""
+#~ "Δεν υπάρχουν ασκήσεις για αυτόν τον εξοπλισμό. Προσθέστε ή επεξεργαστείτε "
+#~ "κάποια και ρυθμίστε την για τον εξοπλισμό αυτόν."
+
+#~ msgid "exercise name"
+#~ msgstr "ονομασία άσκησης"
+
+#, python-format
+#~ msgid ""
+#~ "Your exercise '%(exercise)s' was successfully added to the general\n"
+#~ "database."
+#~ msgstr ""
+#~ "Η άσκηση '%(exercise)s' σας προστέθηκε με επιτυχία στην γενική βάση "
+#~ "δεδομένων."
+
+#~ msgid ""
+#~ "It is now available on the exercise and muscle overview and can be\n"
+#~ "added to workouts. You can access it on this address:"
+#~ msgstr ""
+#~ "Είναι τώρα διαθέσιμη στην άσκηση και επισκόπηση μυών και μπορεί να "
+#~ "προστεθεί στις προπονήσεις. Μπορείτε να την βρείτε στην διεύθυνση:"
+
+#~ msgid "Submitting an exercise"
+#~ msgstr "Υποβολή μιας άσκησης"
+
+#~ msgid ""
+#~ "Thank you for submitting an exercise. This is much\n"
+#~ "appreciated!"
+#~ msgstr ""
+#~ "Ευχαριστούμε που υποβάλλατε μια άσκηση. Το εκτιμούμε\n"
+#~ "πολύ!"
+
+#~ msgid ""
+#~ "After you submit the form, the administrators will be notified.\n"
+#~ "Once it is reviewed, it will be added to the database. Till this "
+#~ "happens,\n"
+#~ "it will not be visible in the overview or the search. In case you added "
+#~ "your email\n"
+#~ "when you registered, you will get notified when the process is completed "
+#~ "successfully."
+#~ msgstr ""
+#~ "Μετά την υποβολή της φόρμας, οι διαχειριστές θα ειδοποιηθούν.\n"
+#~ "Μόλις εξεταστεί, θα προστεθεί στην βάση δεδομένων. Έως ότου γίνει, δεν θα "
+#~ "είναι ορατό στην επισκόπηση και στις ανευρέσεις. Σε περίπτωση που "
+#~ "εισάγατε το email σας όταν εγγραφήκατε, θα ειδοποιηθείτε για την εξέλιξη "
+#~ "της όταν ολοκληρωθεί με επιτυχία."
+
+#~ msgid "No categories."
+#~ msgstr "Δεν υπάρχουν κατηγορίες."
+
+#~ msgid "Use link to create one"
+#~ msgstr "Χρήση συνδέσμου για την δημιουργία ενός"
+
+#~ msgid "Exercise is pending review"
+#~ msgstr "Αυτή η άσκηση αναμένει έγκριση"
+
+#~ msgid "Till then, it will not be shown in the overview or the search."
+#~ msgstr "Έως τότε, δεν θα εμφανίζεται στην επισκόπηση ή στις ανευρέσεις."
+
+#~ msgid "Images"
+#~ msgstr "Εικόνες"
+
+#~ msgid "Add new image"
+#~ msgstr "Νέας εικόνα"
+
+#, fuzzy
+#~| msgid "Add new image"
+#~ msgid "Add new video"
+#~ msgstr "Νέας εικόνα"
+
+#~ msgid "Comments for this exercise"
+#~ msgstr "Σχόλια για αυτήν την άσκηση"
+
+#~ msgid "Add new comment"
+#~ msgstr "Νέο σχόλιο"
+
+#~ msgid "The diagram shows the most used muscles on this exercise"
+#~ msgstr ""
+#~ "Το διάγραμμα εμφανίζει τους μύς με την μεγαλύτερη δραστηριότητα σε αυτήν "
+#~ "την άσκηση"
+
+#~ msgid "Add exercise"
+#~ msgstr "Νέα άσκηση"
+
+#~ msgid "Exercise was successfully marked as rejected"
+#~ msgstr "Η άσκηση απορρίφθηκε με επιτυχία"
+
+#~ msgid "Edit exercise image"
+#~ msgstr "Επεξεργασία εικόνας άσκησης"
+
+#~ msgid "Delete exercise image?"
+#~ msgstr "Διαγραφή εικόνας άσκησης;"
+
+#, python-format
+#~ msgid "Edit log entry for %s"
+#~ msgstr "Επεξεργασία εγγραφής ιστορικού για %s"
+
#, fuzzy
#~| msgid "Reps"
#~ msgid "Max Reps"
diff --git a/wger/locale/es/LC_MESSAGES/django.po b/wger/locale/es/LC_MESSAGES/django.po
index 558d7c5ab..097917bf8 100644
--- a/wger/locale/es/LC_MESSAGES/django.po
+++ b/wger/locale/es/LC_MESSAGES/django.po
@@ -15,7 +15,7 @@ msgid ""
msgstr ""
"Project-Id-Version: wger Workout Manager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-14 12:01+0200\n"
+"POT-Creation-Date: 2022-11-10 16:03+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"
@@ -39,106 +39,8 @@ msgstr ""
"todos los nuevos usuarios registrados a este gimnasio y actualizará todos "
"los usuarios existentes sin gimnasio."
-#: 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 "Ejercicios"
-
-#: config/models/language_config.py:42
-msgid "Ingredients"
-msgstr "Ingredientes"
-
-#: config/templates/language/overview.html:4 core/templates/navigation.html:226
-msgid "Languages"
-msgstr "Idiomas"
-
-#: config/templates/language/overview.html:16
-msgid "Nothing found."
-msgstr "No se ha encontrado nada."
-
-#: 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:150
-#: nutrition/templates/plan/view.html:153
-#: nutrition/templates/plan/view.html:191
-msgid "Add one now."
-msgstr "Añadir ahora."
-
-#: config/templates/language/overview.html:29
-#: core/templates/license/list.html:38 core/templates/misc/license/list.html:41
-#: core/templates/repetition_unit/list.html:41
-#: core/templates/user/overview.html:327 core/templates/user/overview.html:366
-#: core/templates/user/overview.html:402
-#: core/templates/weight_unit/list.html:41 core/views/languages.py:73
-#: core/views/license.py:65 core/views/repetition_units.py:65
-#: core/views/weight_units.py:65
-#: exercises/templates/categories/admin-overview.html:36
-#: 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:61
-msgid "Add"
-msgstr "Añadir"
-
-#: config/templates/language/view.html:21 core/models/language.py:29
-msgid "Language short name"
-msgstr "Idioma - nombre corto"
-
-#: config/templates/language/view.html:22
-#: config/templates/language/view.html:43 core/models/language.py:32
-msgid "Language full name"
-msgstr "Idioma - nombre largo"
-
-#: config/templates/language/view.html:34 core/templates/user/overview.html:451
-#: gym/views/admin_config.py:44 gym/views/admin_config.py:58
-#: gym/views/user_config.py:46
-msgid "Configuration"
-msgstr "Configuración"
-
-#: config/templates/language/view.html:35
-msgid ""
-"Use the configuration to select in what languages the\n"
-"exercises and ingredients will be shown for the current language (for "
-"example\n"
-"the exercises should be shown in languages A, B and C; the ingredients only\n"
-"in A)."
-msgstr ""
-"Usa la configuración para elegir en que idiomas se muestran los\n"
-"ingredientes y los ejercicios para el idioma actual (por ejemplo,\n"
-"mostrar los ejercicios en los idiomas A, B y C; los ingredientes\n"
-"sólo en A)."
-
-#: config/templates/language/view.html:44 gym/templates/contract/list.html:36
-msgid "Show"
-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: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:45
-msgid "Options"
-msgstr "Opciones"
-
-#: config/templates/language/view.html:96 config/views/gym_config.py:41
-#: config/views/language_config.py:49 core/templates/license/list.html:16
-#: core/templates/misc/license/list.html:17
+#: config/views/gym_config.py:41 core/templates/language/view.html:57
+#: 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:39
#: core/templates/tags/render_day.html:75 core/templates/user/overview.html:205
@@ -146,12 +48,10 @@ 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:230
-#: exercises/templates/exercise/view.html:351
#: exercises/templates/muscles/admin-overview.html:16
-#: 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
+#: 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
#: 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
@@ -167,81 +67,54 @@ msgstr "Opciones"
msgid "Edit"
msgstr "Editar"
-#: 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: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: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
-#: gym/templates/contract_type/list.html:39 gym/templates/document/list.html:46
-#: gym/templates/gym/list.html:20 manager/templates/calendar/day.html:69
-#: 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:231
-#: 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:132
-#: nutrition/templates/units/list.html:20
-msgid "Delete"
-msgstr "Borrar"
-
-#: core/demo.py:86
+#: core/demo.py:95
msgid "Sample workout"
msgstr "Rutina de ejemplo"
-#: core/demo.py:90
+#: core/demo.py:99
msgid "Sample day"
msgstr "Día de ejemplo"
-#: core/demo.py:94
+#: core/demo.py:103
msgid "Another sample day"
msgstr "Otro día de ejemplo"
-#: core/demo.py:217
-msgid "Sample nutrional plan"
+#: core/demo.py:211
+#, fuzzy
+#| msgid "Sample nutrional plan"
+msgid "Sample nutritional plan"
msgstr "Ejemplo de plan nutricional"
-#: core/demo.py:349 core/demo.py:351 core/demo.py:353
+#: core/demo.py:343 core/demo.py:345 core/demo.py:347
#, python-brace-format
msgid "Placeholder workout nr {0} for schedule"
msgstr "Entrenamiento marcador de posición nº {0} para la programación"
-#: core/demo.py:358
+#: core/demo.py:352
msgid "My cool workout schedule"
msgstr "Mi programa de rutinas"
-#: core/demo.py:397 core/demo.py:412
+#: core/demo.py:391 core/demo.py:406
msgid "Empty placeholder schedule"
msgstr "Programación de marcador posición vacía"
-#: core/forms.py:61 core/templates/navigation.html:188
-#: core/templates/navigation.html:192 core/templates/user/login.html:4
+#: core/forms.py:64 core/templates/navigation.html:179
+#: core/templates/navigation.html:183 core/templates/user/login.html:4
#: software/templates/features.html:43
msgid "Login"
msgstr "Ingresar"
-#: core/forms.py:73 core/forms.py:164 gym/views/export.py:63
+#: core/forms.py:76 core/forms.py:177 gym/views/export.py:63
#: gym/views/gym.py:218
msgid "First name"
msgstr "Nombre"
-#: core/forms.py:74 core/forms.py:165 core/templates/user/overview.html:267
+#: core/forms.py:77 core/forms.py:178 core/templates/user/overview.html:267
#: gym/views/export.py:64 gym/views/gym.py:218
msgid "Last name"
msgstr "Apellido"
-#: core/forms.py:76 core/forms.py:131 core/templates/user/overview.html:271
+#: core/forms.py:79 core/forms.py:144 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
@@ -251,79 +124,109 @@ msgstr "Apellido"
msgid "Email"
msgstr "Correo electrónico"
-#: core/forms.py:77
+#: core/forms.py:80
msgid "Used for password resets and, optionally, e-mail reminders."
msgstr ""
"Se usa para restablecer contraseñas y opcionalmente para enviar avisos por "
"correo electrónico."
-#: core/forms.py:102
+#: core/forms.py:84 core/models/profile.py:220
+#: gym/templates/gym/new_user.html:38
+msgid "Date of Birth"
+msgstr "Fecha de cumpleaños"
+
+#: core/forms.py:116
msgid "Personal data"
msgstr "Datos personales"
-#: core/forms.py:110
+#: core/forms.py:124
msgid "Workout reminders"
msgstr "Recordatorios de entrenamiento"
-#: core/forms.py:117
+#: core/forms.py:131
msgid "Other settings"
msgstr "Otras configuraciones"
-#: 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
+#: core/forms.py:138 core/views/user.py:615 core/views/user.py:630
+#: core/views/user.py:642 gym/forms.py:72 manager/templates/log/add.html:65
+#: manager/templates/set/add.html:69 manager/views/workout.py:222
+#: utils/generic_views.py:143
msgid "Save"
msgstr "Guardar"
-#: core/forms.py:132
+#: core/forms.py:145
msgid "Used for password resets and, optionally, email reminders."
msgstr ""
"Se usa para restablecer constraseñas y, opcionalmente, para enviar avisos "
"por correo electrónico."
-#: core/forms.py:160
+#: core/forms.py:173
msgid "This e-mail address is already in use."
msgstr "Esta dirección de correo ya está en uso."
-#: core/forms.py:180 gym/templates/gym/new_user.html:26
+#: core/forms.py:193 gym/templates/gym/new_user.html:26
#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:218
msgid "Password"
msgstr "Contraseña"
-#: core/forms.py:182
+#: core/forms.py:195
msgid "Please enter your current password."
msgstr "Por favor, ingrese su contraseña actual."
-#: core/forms.py:200
+#: core/forms.py:204 core/templates/language/view.html:62
+#: 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: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/muscles/admin-overview.html:17
+#: gym/templates/admin_notes/list.html:40
+#: gym/templates/contract_option/list.html:39
+#: gym/templates/contract_type/list.html:39 gym/templates/document/list.html:46
+#: gym/templates/gym/list.html:20 manager/templates/calendar/day.html:69
+#: 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:231
+#: 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:132
+#: nutrition/templates/units/list.html:20
+msgid "Delete"
+msgstr "Borrar"
+
+#: core/forms.py:213
msgid "Invalid password"
msgstr "Contraseña incorrecta"
-#: core/forms.py:212 core/forms.py:278
+#: core/forms.py:225 core/forms.py:291
msgid "The form is secured with reCAPTCHA"
msgstr "El Formulario está asegurado por recaptcha"
-#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:188
-#: core/templates/navigation.html:193 core/templates/template.html:149
-#: core/templates/user/login.html:20 core/views/user.py:293
+#: core/forms.py:239 core/forms.py:258 core/templates/navigation.html:179
+#: core/templates/navigation.html:184 core/templates/template.html:149
+#: core/templates/user/login.html:20 core/views/user.py:300
#: software/templates/features.html:38
msgid "Register"
msgstr "Registrarse"
-#: core/forms.py:256
+#: core/forms.py:269
msgid "Contact"
msgstr "Contacto"
-#: core/forms.py:257
+#: core/forms.py:270
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:71
+#: core/forms.py:278 exercises/models/comment.py:42 manager/models/set.py:60
+#: manager/models/setting.py:111 nutrition/models/log.py:71
msgid "Comment"
msgstr "Comentario"
-#: core/forms.py:266
+#: core/forms.py:279
msgid "What do you want to say?"
msgstr "¿Qué quieres decir?"
@@ -331,6 +234,14 @@ msgstr "¿Qué quieres decir?"
msgid "Day of the week"
msgstr "Día de la semana"
+#: core/models/language.py:31 core/templates/language/view.html:21
+msgid "Language short name"
+msgstr "Idioma - nombre corto"
+
+#: core/models/language.py:36 core/templates/language/view.html:22
+msgid "Language full name"
+msgstr "Idioma - nombre largo"
+
#: core/models/license.py:29
msgid "Full name"
msgstr "Nombre completo"
@@ -388,19 +299,19 @@ msgstr "Métrico (kilogramos)"
msgid "Imperial (pound)"
msgstr "Imperial (libra)"
-#: core/models/profile.py:111
+#: core/models/profile.py:114
msgid "Show exercise comments"
msgstr "Muestra los comentarios de los ejercicios"
-#: core/models/profile.py:112
+#: core/models/profile.py:115
msgid "Check to show exercise comments on the workout view"
msgstr "Activa para mostrar los comentarios para los ejercicios"
-#: core/models/profile.py:123
+#: core/models/profile.py:126
msgid "Also use ingredients in English"
msgstr "Usa también los ingredientes en inglés"
-#: core/models/profile.py:125
+#: core/models/profile.py:128
msgid ""
"Check to also show ingredients in English while creating\n"
"a nutritional plan. These ingredients are extracted from a list provided\n"
@@ -415,11 +326,11 @@ msgstr ""
"completa,\n"
"con aproximadamente 7000 elementos, pero puede hacer la búsqueda más difícil."
-#: core/models/profile.py:134
+#: core/models/profile.py:137
msgid "Activate workout reminders"
msgstr "Activa recordatorios automáticos para rutinas"
-#: core/models/profile.py:136
+#: core/models/profile.py:139
msgid ""
"Check to activate automatic reminders for workouts. You need to provide a "
"valid email for this to work."
@@ -428,21 +339,21 @@ msgstr ""
"proporcionar una dirección de correo electrónico válida para que estos "
"funcionen."
-#: core/models/profile.py:145
+#: core/models/profile.py:148
msgid "Remind before expiration"
msgstr "Recordar antes de expiración"
-#: core/models/profile.py:146
+#: core/models/profile.py:149
msgid "The number of days you want to be reminded before a workout expires."
msgstr ""
"El número de días que quieres que se te recuerde antes de que un "
"entrenamiento expire."
-#: core/models/profile.py:152
+#: core/models/profile.py:155
msgid "Default duration of workouts"
msgstr "Duración por defecto de rutinas"
-#: core/models/profile.py:154
+#: core/models/profile.py:157
msgid ""
"Default duration in weeks of workouts not in a schedule. Used for email "
"workout reminders."
@@ -450,11 +361,11 @@ msgstr ""
"Duración por defecto en semanas para las rutinas que no pertenezcan a una "
"programación. Usado para los recordatorios de rutinas expiradas."
-#: core/models/profile.py:171
+#: core/models/profile.py:174
msgid "Notification language"
msgstr "Idioma de notificación"
-#: core/models/profile.py:173
+#: core/models/profile.py:176
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."
@@ -463,70 +374,70 @@ msgstr ""
"ejemplo, recordatorios para los entrenamientos. Esto no afecta al idioma "
"utilizado en la web."
-#: core/models/profile.py:186 gym/views/export.py:66
+#: core/models/profile.py:212 gym/views/export.py:66
msgid "Age"
msgstr "Edad"
-#: core/models/profile.py:202 nutrition/forms.py:99
+#: core/models/profile.py:228 nutrition/forms.py:100
msgid "Height (cm)"
msgstr "Altura (cm)"
-#: core/models/profile.py:219
+#: core/models/profile.py:245
msgid "Hours of sleep"
msgstr "Horas de sueño"
-#: core/models/profile.py:220
+#: core/models/profile.py:246
msgid "The average hours of sleep per day"
msgstr "Media de horas por día"
-#: core/models/profile.py:229
+#: core/models/profile.py:255
msgid "Work"
msgstr "Trabajo"
-#: core/models/profile.py:230 core/models/profile.py:272
+#: core/models/profile.py:256 core/models/profile.py:298
msgid "Average hours per day"
msgstr "Horas por día, promedio"
-#: core/models/profile.py:239 core/models/profile.py:260
-#: core/models/profile.py:281
+#: core/models/profile.py:265 core/models/profile.py:286
+#: core/models/profile.py:307
msgid "Physical intensity"
msgstr "Intensidad física"
-#: core/models/profile.py:240 core/models/profile.py:261
-#: core/models/profile.py:282
+#: core/models/profile.py:266 core/models/profile.py:287
+#: core/models/profile.py:308
msgid "Approximately"
msgstr "Aproximado"
-#: core/models/profile.py:250
+#: core/models/profile.py:276
msgid "Sport"
msgstr "Deporte"
-#: core/models/profile.py:251
+#: core/models/profile.py:277
msgid "Average hours per week"
msgstr "Media de horas por día"
-#: core/models/profile.py:271
+#: core/models/profile.py:297
msgid "Free time"
msgstr "Tiempo libre"
-#: core/models/profile.py:292 nutrition/templates/rate/form.html:66
+#: core/models/profile.py:318 nutrition/templates/rate/form.html:66
msgid "Total daily calories"
msgstr "Calorías totales diarias"
-#: core/models/profile.py:293
+#: core/models/profile.py:319
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
+#: core/models/profile.py:331 nutrition/models/ingredient_weight_unit.py:45
#: nutrition/models/log.py:90 nutrition/models/meal_item.py:58
msgid "Weight unit"
msgstr "Unidad de peso"
-#: core/models/profile.py:313
+#: core/models/profile.py:339
msgid "Allow external access"
msgstr "Permitir acceso externo"
-#: core/models/profile.py:315
+#: core/models/profile.py:341
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."
@@ -535,25 +446,24 @@ msgstr ""
"en modo de sólo lectura. Es necesario configurar esto antes de que poder "
"compartir enlaces por ejemplo, en los medios de comunicación social."
-#: core/models/profile.py:324
+#: core/models/profile.py:350
msgid "Automatic reminders for weight entries"
msgstr "Avisos automáticos para las entradas de peso"
-#: core/models/profile.py:326
+#: core/models/profile.py:352
msgid "Number of days after the last weight entry (enter 0 to deactivate)"
msgstr ""
"Días que han pasado desde el ingreso del último peso (ingrese 0 para "
"desactivar)"
-#: core/models/profile.py:392
+#: core/models/profile.py:418
msgid "The sum of all hours has to be 24"
msgstr "La suma de todas las horas tiene que ser 24"
#: core/models/rep_unit.py:35 core/models/weight_unit.py:35
-#: core/templates/user/overview.html:263 core/views/user.py:575
+#: core/templates/user/overview.html:263 core/views/user.py:591
#: 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
+#: exercises/models/exercise.py:64 exercises/models/muscle.py:36
#: 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
@@ -617,6 +527,53 @@ msgid "Are you sure you want to delete this? This action cannot be undone."
msgstr ""
"¿Estás seguro de que quieres borrar esto? Esta acción no se puede deshacer."
+#: core/templates/email_verification/confirm_template.html:4
+msgid "Email verified"
+msgstr ""
+
+#: core/templates/email_verification/confirm_template.html:18
+#, python-format
+msgid "%(username)s, your email was verified"
+msgstr ""
+
+#: core/templates/email_verification/confirm_template.html:22
+msgid "Error, invalid verification token"
+msgstr ""
+
+#: core/templates/email_verification/email_body_html.tpl:6
+#, fuzzy
+#| msgid "Configuration"
+msgid "Email Confirmation"
+msgstr "Configuración"
+
+#: core/templates/email_verification/email_body_html.tpl:9
+#: core/templates/email_verification/email_body_txt.tpl:3
+#, fuzzy, python-format
+#| msgid "Calendar for %(username)s"
+msgid "You are almost there, %(username)s!"
+msgstr "Calendario de %(username)s"
+
+#: core/templates/email_verification/email_body_html.tpl:11
+#, python-format
+msgid "Please click <a href=\"%(link)s\">here</a> to confirm your email"
+msgstr ""
+
+#: core/templates/email_verification/email_body_html.tpl:12
+#: core/templates/email_verification/email_body_txt.tpl:5
+#, python-format
+msgid "The token expires on %(time)s"
+msgstr ""
+
+#: core/templates/email_verification/email_body_html.tpl:14
+#: core/templates/email_verification/email_body_txt.tpl:8
+msgid "the wger Team"
+msgstr ""
+
+#: core/templates/email_verification/email_body_txt.tpl:4
+#, python-format
+msgid "Please click the following link to confirm your email: %(link)s"
+msgstr ""
+
#: core/templates/index.html:4
msgid "Dashboard"
msgstr "Escritorio"
@@ -678,7 +635,7 @@ msgid "Add custom diary entry"
msgstr "Añadir una entrada personalizada"
#: core/templates/index.html:84 core/templates/index.html:92
-#: manager/models/day.py:34 manager/models/log.py:56
+#: manager/models/day.py:34 manager/models/log.py:58
#: manager/models/session.py:60 manager/models/workout.py:109
#: manager/templates/schedule/view.html:105
#: manager/templates/workout/view.html:11
@@ -711,6 +668,20 @@ msgstr "Agregar nuevo registro"
msgid "No workouts found."
msgstr "No se han encontrado rutinas."
+#: core/templates/index.html:137 core/templates/index.html:189
+#: core/templates/language/overview.html:23
+#: 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:150
+#: nutrition/templates/plan/view.html:153
+#: nutrition/templates/plan/view.html:191
+msgid "Add one now."
+msgstr "Añadir ahora."
+
#: 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
@@ -764,19 +735,59 @@ msgid "No nutrition plans."
msgstr "No hay planes nutricionales."
#: 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
+#: core/templates/user/overview.html:121 manager/forms.py:184
+#: manager/helpers.py:89 manager/models/log.py:86 manager/models/setting.py:79
+#: manager/templates/log/add.html:54 manager/templates/set/formset.html:11
#: weight/models.py:34 weight/templates/import_csv_preview.html:14
#: weight/templates/import_csv_preview.html:43 weight/views.py:150
msgid "Weight"
msgstr "Peso"
-#: core/templates/index.html:210 core/templates/navigation.html:135
+#: core/templates/index.html:210 core/templates/navigation.html:126
#: weight/views.py:70
msgid "Add weight entry"
msgstr "Añadir entrada de peso"
+#: core/templates/language/overview.html:4 core/templates/navigation.html:217
+msgid "Languages"
+msgstr "Idiomas"
+
+#: core/templates/language/overview.html:23
+msgid "Nothing found."
+msgstr "No se ha encontrado nada."
+
+#: core/templates/language/overview.html:36 core/templates/license/list.html:38
+#: core/templates/misc/license/list.html:41
+#: core/templates/repetition_unit/list.html:41
+#: core/templates/user/overview.html:327 core/templates/user/overview.html:366
+#: core/templates/user/overview.html:402
+#: core/templates/weight_unit/list.html:41 core/views/languages.py:73
+#: core/views/license.py:65 core/views/repetition_units.py:65
+#: core/views/weight_units.py:65
+#: exercises/templates/categories/admin-overview.html:36
+#: 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:61
+msgid "Add"
+msgstr "Añadir"
+
+#: core/templates/language/view.html:52 core/templates/user/api_key.html:44
+#: core/templates/user/preferences.html:44 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:45
+msgid "Options"
+msgstr "Opciones"
+
#: core/templates/license/list.html:4 core/templates/misc/license/list.html:4
msgid "License list"
msgstr "Listado de licencias"
@@ -789,7 +800,6 @@ msgstr "Listado de licencias"
#: core/templates/weight_unit/list.html:26
#: exercises/templates/categories/admin-overview.html:24
#: exercises/templates/equipment/admin-overview.html:24
-#: exercises/templates/exercise/pending.html:30
#: exercises/templates/muscles/admin-overview.html:24
#: gym/templates/admin_notes/list.html:52 gym/templates/contract/list.html:60
#: gym/templates/contract_option/list.html:56
@@ -872,155 +882,135 @@ msgstr "Tus plantillas"
msgid "Public templates"
msgstr "Plantillas públicas"
-#: core/templates/navigation.html:64
-msgctxt "as in sorted by category"
-msgid "by category"
-msgstr "por categoría"
-
-#: core/templates/navigation.html:65
-msgctxt "as in sorted by muscle"
-msgid "by muscle"
-msgstr "por músculos"
-
-#: core/templates/navigation.html:66
-msgctxt "as in sorted by equipment"
-msgid "by equipment"
-msgstr "por equipamiento"
+#: core/templates/navigation.html:63 manager/forms.py:133
+#: manager/models/setting.py:54
+msgid "Exercises"
+msgstr "Ejercicios"
-#: core/templates/navigation.html:70
-#: exercises/templates/equipment/overview.html:109
-#: exercises/templates/equipment/overview.html:113
-#: exercises/templates/exercise/overview.html:112
-#: exercises/templates/exercise/overview.html:116
-#: exercises/templates/muscles/overview.html:112
-#: exercises/templates/muscles/overview.html:116
-msgid "Add new exercise"
-msgstr "Añadir nuevo ejercicio"
-
-#: core/templates/navigation.html:75 core/templates/navigation.html:116
-#: core/templates/navigation.html:224
+#: core/templates/navigation.html:67 core/templates/navigation.html:107
+#: core/templates/navigation.html:215
msgid "Administration"
msgstr "Administración"
-#: core/templates/navigation.html:76
-#: exercises/templates/exercise/pending.html:6
-msgid "Exercises pending review"
-msgstr "Ejercicios pendientes de revisión"
+#: core/templates/navigation.html:68
+#, fuzzy
+#| msgid "Exercise day"
+msgid "Exercise edit history"
+msgstr "Día de ejercicio"
-#: core/templates/navigation.html:77 exercises/models/base.py:72
-#: exercises/templates/exercise/view.html:80
+#: core/templates/navigation.html:69 exercises/models/base.py:84
msgid "Equipment"
msgstr "Equipo"
-#: core/templates/navigation.html:78 exercises/templates/exercise/view.html:258
+#: core/templates/navigation.html:70
msgid "Muscles"
msgstr "Músculos"
-#: core/templates/navigation.html:79
+#: core/templates/navigation.html:71
#: exercises/templates/categories/admin-overview.html:4
msgid "Categories"
msgstr "Categorias"
-#: core/templates/navigation.html:93 software/templates/features.html:87
+#: core/templates/navigation.html:84 software/templates/features.html:87
msgid "Nutrition"
msgstr "Nutrición"
-#: core/templates/navigation.html:99 core/templates/user/overview.html:144
+#: core/templates/navigation.html:90 core/templates/user/overview.html:144
msgid "Nutrition plans"
msgstr "Planes nutritionales"
-#: core/templates/navigation.html:105 nutrition/templates/bmi/form.html:50
+#: core/templates/navigation.html:96 nutrition/templates/bmi/form.html:50
msgid "BMI calculator"
msgstr "Calculadora de IMC"
-#: core/templates/navigation.html:111 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:102 nutrition/templates/rate/form.html:17
msgid "Daily calories calculator"
msgstr "Caluladora de calorias diarias"
-#: core/templates/navigation.html:113
+#: core/templates/navigation.html:104
#: nutrition/templates/ingredient/overview.html:29
msgid "Ingredient overview"
msgstr "Índice de ingredientes"
-#: core/templates/navigation.html:117 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:108 nutrition/templates/units/list.html:6
msgid "Ingredient weight units"
msgstr "Unidades de peso de los ingredientes"
-#: core/templates/navigation.html:118
+#: core/templates/navigation.html:109
#: nutrition/templates/ingredient/pending.html:6
msgid "Ingredients pending review"
msgstr "Ingredientes esperando revisión"
-#: core/templates/navigation.html:132
+#: core/templates/navigation.html:123
msgid "Body weight"
msgstr "Peso corporal"
-#: core/templates/navigation.html:134 core/templates/user/overview.html:114
+#: core/templates/navigation.html:125 core/templates/user/overview.html:114
#: weight/templates/overview.html:7
msgid "Weight overview"
msgstr "Índice de peso"
-#: core/templates/navigation.html:147
+#: core/templates/navigation.html:138
msgid "About this software"
msgstr "Sobre este programa"
-#: core/templates/navigation.html:149 core/templates/template_features.html:82
+#: core/templates/navigation.html:140 core/templates/template_features.html:82
#: software/templates/about_us.html:5
msgid "About us"
msgstr "Sobre nosotros"
-#: core/templates/navigation.html:151 software/templates/features.html:209
+#: core/templates/navigation.html:142 software/templates/features.html:209
msgid "REST API"
msgstr "REST API"
-#: core/templates/navigation.html:155 utils/models.py:40
+#: core/templates/navigation.html:146 utils/models.py:41
msgid "License"
msgstr "Licencia"
-#: core/templates/navigation.html:161
+#: core/templates/navigation.html:152
msgid "Developer documentation"
msgstr "Documentación para desarrolladores"
-#: core/templates/navigation.html:167
+#: core/templates/navigation.html:158
msgid "Get the code"
msgstr "Código fuente"
-#: core/templates/navigation.html:173 core/templates/template.html:204
+#: core/templates/navigation.html:164 core/templates/template.html:203
#: core/templates/template_features.html:99
msgid "Translate"
msgstr "Traduce"
-#: core/templates/navigation.html:194 core/templates/user/login.html:28
+#: core/templates/navigation.html:185 core/templates/user/login.html:28
msgid "Reset password"
msgstr "Restablecer la contraseña"
-#: core/templates/navigation.html:207
+#: core/templates/navigation.html:198
msgid "My preferences"
msgstr "Mis preferencias"
-#: core/templates/navigation.html:214
+#: core/templates/navigation.html:205
msgid "Logout"
msgstr "Cerrar sesión"
-#: core/templates/navigation.html:229
+#: core/templates/navigation.html:220
msgid "Licenses"
msgstr "Licencias"
-#: core/templates/navigation.html:232
+#: core/templates/navigation.html:223
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr "Unidades de repetición"
-#: core/templates/navigation.html:235 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:226 core/templates/weight_unit/list.html:4
#: nutrition/templates/ingredient/view.html:174
msgid "Weight units"
msgstr "Unidades de peso"
-#: core/templates/navigation.html:238 core/templates/user/list.html:4
+#: core/templates/navigation.html:229 core/templates/user/list.html:4
msgid "User list"
msgstr "Lista de usuarios"
-#: core/templates/navigation.html:239
+#: core/templates/navigation.html:230
msgid "Gyms"
msgstr "Gimnasios"
@@ -1102,33 +1092,30 @@ msgstr "siguiente"
msgid "Add weight log"
msgstr "Añader registro de peso"
-#: core/templates/tags/render_day.html:114
-#: exercises/templates/equipment/overview.html:59
-#: exercises/templates/exercise/overview.html:63
-#: exercises/templates/muscles/overview.html:65
+#: core/templates/tags/render_day.html:116
msgid "Placeholder image for exercise"
msgstr "Marcador de imagen para ejercicio"
-#: core/templates/tags/render_day.html:131
+#: core/templates/tags/render_day.html:133
msgid "This exercise has no repetitions."
msgstr "Este ejercicio no tiene repeticiones."
-#: core/templates/tags/render_day.html:134
+#: core/templates/tags/render_day.html:136
msgid "Edit them now."
msgstr "Editar ahora."
-#: core/templates/tags/render_day.html:159
+#: core/templates/tags/render_day.html:162
msgid "Add exercises to this workout day"
msgstr "Añadir ejercicios a este dia"
#: core/templates/tags/render_weight_log.html:17 manager/helpers.py:89
-#: manager/models/setting.py:57 manager/templates/set/formset.html:10
+#: manager/models/setting.py:69 manager/templates/set/formset.html:9
msgid "Reps"
msgstr "Repeticiones"
-#: 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
+#: core/templates/tags/render_weight_log.html:30 manager/forms.py:189
+#: manager/models/log.py:103 manager/models/setting.py:99
+#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
msgid "RiR"
msgstr "ReR"
@@ -1153,7 +1140,7 @@ msgstr "Términos de servicio"
msgid "Features"
msgstr "Funciones"
-#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:37
+#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:53
msgid "API key"
msgstr "LLave de API"
@@ -1198,11 +1185,12 @@ msgid "Documentation"
msgstr "Documentación"
#: core/templates/user/delete_account.html:4
-#: core/templates/user/preferences.html:42
+#: core/templates/user/preferences.html:58
msgid "Delete account"
msgstr "Eliminar cuenta"
#: core/templates/user/delete_account.html:17
+#: exercises/templates/history/overview.html:93
msgid "Are you sure?"
msgstr "¿Estas seguro?"
@@ -1251,11 +1239,12 @@ msgstr "Añadir rutina"
#: core/templates/user/overview.html:34 core/templates/user/overview.html:76
#: core/templates/user/overview.html:120 core/templates/user/overview.html: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
-#: 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
+#: exercises/models/base.py:99 exercises/models/base.py:104
+#: exercises/models/exercise.py:69 exercises/models/exercise.py:76
+#: gallery/models/image.py:47 manager/helpers.py:88 manager/models/log.py:100
+#: 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/views.py:150
@@ -1263,11 +1252,11 @@ msgid "Date"
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: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
+#: exercises/models/exercise.py:57 exercises/views/exercises.py:123
+#: 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 "Descripción"
@@ -1275,12 +1264,12 @@ msgstr "Descripción"
msgid "Number of logs (days)"
msgstr "Número de registros (días)"
-#: core/templates/user/overview.html:37 core/views/user.py:576
+#: core/templates/user/overview.html:37 core/views/user.py:592
#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:157
msgid "Last activity"
msgstr "Última actividad"
-#: core/templates/user/overview.html:68 manager/forms.py:267
+#: core/templates/user/overview.html:68 manager/forms.py:278
#: manager/templates/workout/view.html:151
msgid "Log"
msgstr "Registro"
@@ -1298,6 +1287,7 @@ msgid "Notes"
msgstr "Notas"
#: core/templates/user/overview.html:79
+#: exercises/templates/history/overview.html:30
#: manager/templates/calendar/partial_overview_table.html:42
#: nutrition/templates/log/detail.html:154
msgid "Time"
@@ -1345,10 +1335,12 @@ msgid "Do you really want to change this user&#39;s password?"
msgstr "¿Realmente quieres cambiar la contraseña de este usuario?"
#: core/templates/user/overview.html:233
+#: exercises/templates/history/overview.html:106
msgid "No"
msgstr "No"
#: core/templates/user/overview.html:234
+#: exercises/templates/history/overview.html:99
msgid "Yes"
msgstr "Sí"
@@ -1403,10 +1395,15 @@ msgid "Documents"
msgstr "Documentos"
#: core/templates/user/overview.html:413 gym/templates/document/list.html:32
-#: manager/forms.py:279 manager/templates/workout/view.html:176
+#: manager/forms.py:290 manager/templates/workout/view.html:176
msgid "Download"
msgstr "Bajar"
+#: core/templates/user/overview.html:451 gym/views/admin_config.py:44
+#: gym/views/admin_config.py:58 gym/views/user_config.py:46
+msgid "Configuration"
+msgstr "Configuración"
+
#: core/templates/user/overview.html:454 gym/models/user_config.py:92
msgid "Include in inactive overview"
msgstr "Incluir en lista de inactivos"
@@ -1426,7 +1423,25 @@ msgstr "Inicia sesión como este usuario"
msgid "Preferences"
msgstr "Preferencias"
-#: core/templates/user/preferences.html:33 core/views/user.py:587
+#: core/templates/user/preferences.html:19
+#, fuzzy
+#| msgid "Send emails"
+msgid "Verified email"
+msgstr "Enviar email"
+
+#: core/templates/user/preferences.html:24
+msgid "Unverified email"
+msgstr ""
+
+#: core/templates/user/preferences.html:26
+msgid "Send verification email"
+msgstr ""
+
+#: core/templates/user/preferences.html:30
+msgid "You need to verify your email to contribute exercises"
+msgstr ""
+
+#: core/templates/user/preferences.html:49 core/views/user.py:603
msgid "Change password"
msgstr "Cambiar contraseña"
@@ -1456,39 +1471,37 @@ msgid "oz"
msgstr "oz"
#: 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
+#: exercises/views/equipment.py:104 exercises/views/exercises.py:185
+#: exercises/views/muscles.py:99 manager/views/schedule.py:311
+#: manager/views/schedule_step.py:129 manager/views/workout.py:269
+#: manager/views/workout_session.py:141 nutrition/views/ingredient.py:138
#: 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:431
-#: exercises/views/muscles.py:125 gallery/views/images.py:121
+#: exercises/views/categories.py:127 exercises/views/exercises.py:193
+#: exercises/views/muscles.py:106 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
+#: manager/views/workout.py:273 manager/views/workout_session.py:156
+#: nutrition/views/ingredient.py:145 nutrition/views/plan.py:127
#: nutrition/views/unit.py:118
#, python-brace-format
msgid "Delete {0}?"
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/repetition_units.py:85 core/views/user.py:472
#: 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: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
+#: exercises/views/equipment.py:81 exercises/views/muscles.py:86
+#: 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:170
+#: gym/views/gym.py:459 manager/views/day.py:100 manager/views/schedule.py:335
+#: manager/views/workout.py:287 nutrition/views/ingredient.py:164
+#: nutrition/views/plan.py:144 nutrition/views/unit.py:144
#, python-brace-format
msgid "Edit {0}"
msgstr "Editar {0}"
@@ -1519,64 +1532,65 @@ msgstr "Enviar"
msgid "Your feedback was successfully sent. Thank you!"
msgstr "Tu comentario ha sido enviado con éxito, ¡gracias!"
-#: core/views/user.py:156
+#: core/views/user.py:157
#, python-brace-format
msgid "Account \"{0}\" was successfully deleted"
msgstr "La cuenta \"{0}\" ha sido borrada con éxito"
-#: core/views/user.py:287
+#: core/views/user.py:294
msgid "You were successfully registered"
msgstr "Te has registrado con éxito"
-#: core/views/user.py:339
+#: core/views/user.py:355
msgid "Settings successfully updated"
msgstr "Preferecias actualizadas con éxito"
-#: core/views/user.py:376
+#: core/views/user.py:392
msgid "The user was successfully deactivated"
msgstr "El usuario ha sido desactivado con éxito"
-#: core/views/user.py:411
+#: core/views/user.py:427
msgid "The user was successfully activated"
msgstr "El usuario ha sido activado con éxito"
-#: core/views/user.py:426
+#: core/views/user.py:442
msgid "Edit user"
msgstr "Editar usuario"
-#: core/views/user.py:573 gym/templates/gym/member_list.html:26
+#: core/views/user.py:589 gym/templates/gym/member_list.html:26
#: gym/views/gym.py:156
msgid "ID"
msgstr "ID"
-#: core/views/user.py:574 gym/forms.py:94 gym/templates/contract/view.html:55
+#: core/views/user.py:590 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 "Nombre de usuario"
-#: core/views/user.py:577 gym/templates/gym/new_user.html:34
+#: core/views/user.py:593 gym/templates/gym/new_user.html:34
#: gym/views/export.py:60 gym/views/gym.py:218
msgid "Gym"
msgstr "Gimnasio"
-#: exercises/models/base.py:51 exercises/templates/exercise/view.html:76
-#: nutrition/models/ingredient.py:204
+#: core/views/user.py:652
+#, python-format
+msgid "A verification email was sent to %(email)s"
+msgstr ""
+
+#: exercises/models/base.py:63 nutrition/models/ingredient.py:204
msgid "Category"
msgstr "Categoría"
-#: exercises/models/base.py:58
+#: exercises/models/base.py:70
msgid "Primary muscles"
msgstr "Músculos primarios"
-#: exercises/models/base.py:64 exercises/templates/equipment/overview.html:71
-#: exercises/templates/exercise/overview.html:76
-#: exercises/templates/exercise/view.html:268
-#: exercises/templates/muscles/overview.html:77
+#: exercises/models/base.py:76
msgid "Secondary muscles"
msgstr "Músculos secundarios"
-#: exercises/models/base.py:79
+#: exercises/models/base.py:91
msgid "Variations"
msgstr "Variantes"
@@ -1584,75 +1598,62 @@ msgstr "Variantes"
msgid "Exercise Categories"
msgstr "Categorías de ejercicios"
-#: exercises/models/comment.py:34 exercises/models/exercise_alias.py:32
-#: exercises/models/image.py:75 exercises/models/video.py:82
-#: manager/forms.py:165 manager/helpers.py:89 manager/models/log.py:51
+#: exercises/models/comment.py:37 exercises/models/exercise_alias.py:35
+#: exercises/models/image.py:71 exercises/models/video.py:95
+#: manager/forms.py:176 manager/helpers.py:89 manager/models/log.py:52
msgid "Exercise"
msgstr "Ejercicio"
-#: exercises/models/comment.py:41
+#: exercises/models/comment.py:43
msgid "A comment about how to correctly do this exercise."
msgstr "Comentario describiendo como hacer correctamente el ejercicio."
-#: exercises/models/exercise.py:86 nutrition/models/ingredient.py:80
+#: exercises/models/exercise.py:81 nutrition/models/ingredient.py:80
#: nutrition/models/plan.py:61 nutrition/models/weight_unit.py:32
msgid "Language"
msgstr "Idioma"
-#: 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:265
-msgid "New user submitted exercise"
-msgstr "Nuevo ejercicio enviado por un usuario"
-
-#: 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/exercise_alias.py:35
+#: exercises/models/exercise_alias.py:38
#, fuzzy
#| msgid "Correcting an exercise"
msgid "Alias for an exercise"
msgstr "Corregir un ejercicio"
-#: exercises/models/image.py:59
+#: exercises/models/image.py:55
msgid "Line"
msgstr ""
-#: exercises/models/image.py:60
+#: exercises/models/image.py:56
msgid "3D"
msgstr ""
-#: exercises/models/image.py:61
+#: exercises/models/image.py:57
msgid "Low-poly"
msgstr ""
-#: exercises/models/image.py:62
+#: exercises/models/image.py:58
msgid "Photo"
msgstr ""
-#: exercises/models/image.py:63
+#: exercises/models/image.py:59
#, fuzzy
#| msgid "Others"
msgid "Other"
msgstr "Otros"
-#: exercises/models/image.py:81 gallery/models/image.py:56
+#: exercises/models/image.py:77 gallery/models/image.py:56
msgid "Image"
msgstr "Imagen"
-#: exercises/models/image.py:82 gallery/models/image.py:57
+#: exercises/models/image.py:78 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:88
+#: exercises/models/image.py:84
msgid "Main picture"
msgstr "Imagen principal"
-#: exercises/models/image.py:91
+#: exercises/models/image.py:87
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 "
@@ -1662,19 +1663,10 @@ msgstr ""
"ejercicio (aparecerá por ejemplo en la búsqueda). La primera imagen es "
"marcada automáticamente por el sistema."
-#: exercises/models/image.py:100
+#: exercises/models/image.py:96
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: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}."
-
#: exercises/models/muscle.py:37
msgid "In latin, e.g. \"Pectoralis major\""
msgstr "En latín, p.ej. \"Pectoralis major\""
@@ -1689,55 +1681,56 @@ msgstr "nombre del ejercicio"
msgid "A more basic name for the muscle"
msgstr ""
-#: exercises/models/video.py:41
-msgid "Maximum file size is 100MB."
+#: exercises/models/video.py:50
+#, python-format
+msgid "Maximum file size is %(size)sMB."
msgstr ""
-#: exercises/models/video.py:44 exercises/models/video.py:48
+#: exercises/models/video.py:57 exercises/models/video.py:65
msgid "File type is not supported"
msgstr ""
-#: exercises/models/video.py:57
+#: exercises/models/video.py:70
#, 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
+#: exercises/models/video.py:101
#, fuzzy
#| msgid "Main picture"
msgid "Main video"
msgstr "Imagen principal"
-#: exercises/models/video.py:94
+#: exercises/models/video.py:107
msgid "Video"
msgstr ""
-#: exercises/models/video.py:101
+#: exercises/models/video.py:114
msgid "Size"
msgstr ""
-#: exercises/models/video.py:108 manager/models/schedule_step.py:56
+#: exercises/models/video.py:121 manager/models/schedule_step.py:56
msgid "Duration"
msgstr "Duración"
-#: exercises/models/video.py:117
+#: exercises/models/video.py:130
msgid "Width"
msgstr ""
-#: exercises/models/video.py:124
+#: exercises/models/video.py:137
#, fuzzy
#| msgid "Weight"
msgid "Height"
msgstr "Peso"
-#: exercises/models/video.py:131
+#: exercises/models/video.py:144
#, fuzzy
#| msgid "Code"
msgid "Codec"
msgstr "Código"
-#: exercises/models/video.py:139
+#: exercises/models/video.py:152
msgid "Codec, long name"
msgstr ""
@@ -1746,138 +1739,23 @@ msgid "Equipment list"
msgstr "Lista de equipos"
#: exercises/templates/equipment/admin-overview.html:37
-#: exercises/views/equipment.py:94
+#: exercises/views/equipment.py:92
msgid "Add new equipment"
msgstr "Agregar nuevo equipo"
-#: exercises/templates/equipment/overview.html:11
-msgid "Equipment overview"
-msgstr "Resumen de equipos"
-
-#: exercises/templates/equipment/overview.html:69
-#: exercises/templates/exercise/overview.html:74
-#: exercises/templates/exercise/view.html:264
-#: exercises/templates/muscles/overview.html:75
-msgid "Main muscles"
-msgstr "Músculos principales"
-
-#: exercises/templates/equipment/overview.html:79
-msgid ""
-"No exercises for this equipment. Add or edit an exercise and set the "
-"equipment."
-msgstr ""
-"No hay ejercicios para este equipo. Agregue o edite un ejercicio para "
-"agregar a este equipo."
-
-#: exercises/templates/equipment/overview.html:96
-#: exercises/templates/exercise/overview.html:99
-#: nutrition/templates/ingredient/overview.html:57
-msgid "Search"
-msgstr "Buscar"
-
-#: exercises/templates/equipment/overview.html:101
-#: exercises/templates/exercise/overview.html:104
-msgid "exercise name"
-msgstr "nombre del ejercicio"
-
-#: exercises/templates/equipment/overview.html:115
-#: exercises/templates/exercise/overview.html:118
-#: exercises/templates/muscles/overview.html:118
-#: nutrition/templates/ingredient/overview.html:85
-msgid "Only registered users can do this"
-msgstr "Sólo usuarios registrados pueden hacer esto"
-
-#: exercises/templates/exercise/email_new.tpl:1
-#, python-format
-msgid ""
-"Your exercise '%(exercise)s' was successfully added to the general\n"
-"database."
-msgstr ""
-"El ejercicio '%(exercise)s' se agrego exitosamente a la base de datos\n"
-"general."
-
-#: exercises/templates/exercise/email_new.tpl:4
-msgid ""
-"It is now available on the exercise and muscle overview and can be\n"
-"added to workouts. You can access it on this address:"
-msgstr ""
-"Ahora está disponible en el resumen de ejercicios y músculos y puede ser\n"
-"añadido a rutinas. Puedes acceder en esta dirección:"
-
-#: exercises/templates/exercise/email_new.tpl:8
-#: nutrition/templates/ingredient/email_new.tpl:8
-msgid "Thank you for contributing and making this site better!"
-msgstr "¡Gracias por contribuir y hacer esta página mejor!"
-
-#: exercises/templates/exercise/email_new.tpl:9
-#: manager/templates/workout/email_reminder.tpl:15
-#: manager/templates/workout/email_weight_reminder.tpl:12
-#: nutrition/templates/ingredient/email_new.tpl:9
-#, python-format
-msgid "The %(site)s team"
-msgstr "El equipo de %(site)s"
-
-#: exercises/templates/exercise/form.html:4
-msgid "Submitting an exercise"
-msgstr "Enviar un ejercicio"
-
-#: exercises/templates/exercise/form.html:5
-msgid ""
-"Thank you for submitting an exercise. This is much\n"
-"appreciated!"
-msgstr "Gracias por enviar un ejercicio. ¡Lo apreciamos mucho!"
-
-#: exercises/templates/exercise/form.html:8
-msgid ""
-"After you submit the form, the administrators will be notified.\n"
-"Once it is reviewed, it will be added to the database. Till this happens,\n"
-"it will not be visible in the overview or the search. In case you added your "
-"email\n"
-"when you registered, you will get notified when the process is completed "
-"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"
-"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."
-
-#: exercises/templates/exercise/form_correct.html:4
-msgid "Correcting an exercise"
-msgstr "Corregir un ejercicio"
-
-#: exercises/templates/exercise/form_correct.html:5
-msgid ""
-"Thank you for correcting and improving this exercise.\n"
-"This is much appreciated!"
-msgstr ""
-"Gracias por corregir y mejorar este ejercicio.\n"
-"¡Lo apreciamos mucho!"
-
-#: exercises/templates/exercise/form_correct.html:8
-msgid ""
-"After you submit the form, the administrators will be notified.\n"
-"Once the changes are reviewed the exercise will be updated."
-msgstr ""
-"Después que la forma ha sido enviada, los administradores serán "
-"notificados.\n"
-"Una vez los cambios hayan sido revisados, los ejercicios serán actualizados."
-
-#: exercises/templates/exercise/overview.html:88
-msgid "No categories."
-msgstr "No hay categorías."
-
-#: exercises/templates/exercise/overview.html:88
-msgid "Use link to create one"
-msgstr "Usa el enlace para crear uno"
+#: exercises/templates/history/overview.html:11
+#, fuzzy
+#| msgid "Exercise day"
+msgid "Exercise admin history"
+msgstr "Día de ejercicio"
-#: exercises/templates/exercise/pending.html:14
-#: nutrition/templates/ingredient/pending.html:14
-msgid "Submission date"
-msgstr "Fecha de sumisión"
+#: exercises/templates/history/overview.html:27
+#, fuzzy
+#| msgid "Actions"
+msgid "Action"
+msgstr "Acciones"
-#: exercises/templates/exercise/pending.html:16 gallery/models/image.py:51
+#: exercises/templates/history/overview.html:28 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/log.py:45
@@ -1888,103 +1766,47 @@ msgstr "Fecha de sumisión"
msgid "User"
msgstr "Usuario"
-#: exercises/templates/exercise/view.html:48
-msgid "Exercise is pending review"
-msgstr "Ejercicio pendiente de revisión"
-
-#: exercises/templates/exercise/view.html:51
-msgid ""
-"This user submitted exercise is pending a decision to be\n"
-" included in the database."
-msgstr ""
-"El ejercicio enviado por este usuario esta pendiente por decidir para ser\n"
-" incluido en la base de datos."
-
-#: exercises/templates/exercise/view.html:53
-msgid "Till then, it will not be shown in the overview or the search."
-msgstr "Hasta entonces, no se mostrará en índices o en la búsqueda."
-
-#: exercises/templates/exercise/view.html:54
-#: nutrition/templates/ingredient/view.html:31
-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:203
-#: nutrition/templates/ingredient/view.html:38
-msgid "Accept"
-msgstr "Aceptar"
-
-#: exercises/templates/exercise/view.html:64
-#: exercises/templates/exercise/view.html:204
-#: nutrition/templates/ingredient/view.html:42
-msgid "Decline"
-msgstr "Rechazar"
+#: exercises/templates/history/overview.html:29
+#, fuzzy
+#| msgctxt "As in \"email subject\""
+#| msgid "Subject"
+msgid "Object"
+msgstr "Tema"
-#: exercises/templates/exercise/view.html:96
-msgid "Images"
-msgstr "Imágenes"
+#: exercises/templates/history/overview.html:31
+#, fuzzy
+#| msgctxt "Noun, not verb"
+#| msgid "Change"
+msgid "Changes"
+msgstr "Cambio"
-#: exercises/templates/exercise/view.html:137 exercises/views/images.py:93
-msgid "Add new image"
-msgstr "Añadir nueva imagen"
+#: exercises/templates/history/overview.html:32
+msgid "Revert"
+msgstr ""
-#: exercises/templates/exercise/view.html:148
-msgid "Videos"
+#: exercises/templates/history/overview.html:64
+msgid "View Object"
msgstr ""
-#: exercises/templates/exercise/view.html:187 exercises/views/videos.py:94
+#: exercises/templates/history/overview.html:75
#, 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:218
-msgid "Comments for this exercise"
-msgstr "Comentarios para este ejercicio"
-
-#: exercises/templates/exercise/view.html:246
-msgid "Add new comment"
-msgstr "Añadir nuevo comentario"
-
-#: 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: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:306
-msgid "Exercise Variations"
-msgstr "Variantes de ejercicios"
+#| msgid "View logs"
+msgid "View changes"
+msgstr "Ver registro de peso"
-#: exercises/templates/exercise/view.html:327
-msgid "Submit a correction"
-msgstr "Enviar una corrección"
+#: exercises/templates/history/overview.html:86
+msgid "Revert changes"
+msgstr ""
#: exercises/templates/muscles/admin-overview.html:4
-#: exercises/templates/muscles/overview.html:7
msgid "Muscle overview"
msgstr "Índice de músculos"
#: exercises/templates/muscles/admin-overview.html:36
-#: exercises/views/muscles.py:86
+#: exercises/views/muscles.py:67
msgid "Add muscle"
msgstr "Añadir músculo"
-#: exercises/templates/muscles/overview.html:85
-msgid ""
-"No exercises for this muscle. Add or edit an exercise and set the muscle."
-msgstr ""
-"No hay ejercicios para este músculo. Agregue o edite un ejercicio y "
-"configure el músculo."
-
#: exercises/views/categories.py:71
msgid "Add category"
msgstr "Añadir categoría"
@@ -1997,53 +1819,23 @@ msgstr "Esto también borrará todos los ejercicios en esta categoría."
msgid "Add exercise comment"
msgstr "Añadir comentario al ejercicio"
-#: exercises/views/equipment.py:107 exercises/views/equipment.py:118
+#: exercises/views/equipment.py:105 exercises/views/equipment.py:116
msgid "Delete equipment?"
msgstr "¿Borrar equipo?"
-#: exercises/views/exercises.py:229
-#, python-format
-msgid ""
-"%(name_original)s is too similar to existing exercise \"%(exercise_name)s\""
+#: exercises/views/exercises.py:161
+#, fuzzy, python-format
+#| msgid ""
+#| "%(name_original)s is too similar to existing exercise "
+#| "\"%(exercise_name)s\""
+msgid "%(name)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:247
-msgid "Add exercise"
-msgstr "Añadir ejercicio"
-
-#: 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:380
-#, python-brace-format
-msgid "Correct {0}"
-msgstr "Corregir {0}"
-
-#: exercises/views/exercises.py:422
+#: exercises/views/exercises.py:184
msgid "This will delete the exercise from all workouts."
msgstr "Esto también borrará el ejercicio de todas las rutinas."
-#: exercises/views/exercises.py:474
-msgid "Exercise was successfully marked as rejected"
-msgstr "El ejercicio se ha marcado como rechazado con éxito"
-
-#: exercises/views/images.py:68
-msgid "Edit exercise image"
-msgstr "Editar imagen de ejercicio"
-
-#: exercises/views/images.py:143
-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"
@@ -2111,7 +1903,7 @@ 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:59
+#: manager/templates/log/add.html:52 nutrition/forms.py:60
#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:102
#: nutrition/models/meal_item.py:72
msgid "Amount"
@@ -2214,6 +2006,10 @@ msgstr "Se usará el nombre del fichero si no se introduce nada"
msgid "User notes"
msgstr "Notas de usuario"
+#: gym/templates/contract/list.html:36
+msgid "Show"
+msgstr "Mostrar"
+
#: gym/templates/contract/view.html:4
msgid "Contract"
msgstr "Contrato"
@@ -2294,10 +2090,6 @@ msgstr "Emails"
msgid "Add member"
msgstr "Añadir miembro"
-#: gym/templates/gym/new_user.html:38
-msgid "Date of Birth"
-msgstr "Fecha de cumpleaños"
-
#: gym/templates/gym/new_user.html:48 manager/templates/calendar/month.html:144
#: manager/templates/log/add.html:75 nutrition/templates/rate/form.html:120
msgid "Info"
@@ -2360,132 +2152,132 @@ msgstr "Añadir usuario al gimnasio"
msgid "Edit gym"
msgstr "Editar gimnasio"
-#: i18n.tpl:2 i18n.tpl:28
+#: i18n.tpl:2
+msgid "Until Failure"
+msgstr "Hasta fallo muscular"
+
+#: i18n.tpl:3 manager/forms.py:180 manager/models/log.py:73
+#: manager/templates/set/add.html:53
+msgid "Repetitions"
+msgstr "Repeticiones"
+
+#: i18n.tpl:4
msgid "Abs"
msgstr "Abdominales"
-#: i18n.tpl:3
+#: i18n.tpl:5
msgid "Arms"
msgstr "Brazos"
-#: i18n.tpl:4
-msgid "Back"
-msgstr "Espalda"
-
-#: i18n.tpl:5 i18n.tpl:23
-msgid "Calves"
-msgstr "Pantorrillas"
-
-#: i18n.tpl:6 i18n.tpl:26
-msgid "Chest"
-msgstr "Pectorales"
-
-#: i18n.tpl:7
+#: i18n.tpl:6
msgid "Legs"
msgstr "Piernas"
-#: i18n.tpl:8 i18n.tpl:19
-msgid "Shoulders"
-msgstr "Hombros"
+#: i18n.tpl:7
+msgid "Dumbbell"
+msgstr "Mancuerna"
+
+#: i18n.tpl:8
+#, fuzzy
+#| msgid "Biceps brachii"
+msgid "Biceps"
+msgstr "Bíceps"
#: i18n.tpl:9
-msgid "Barbell"
-msgstr "Barra olímpica"
+msgid "SZ-Bar"
+msgstr "Barra de curl"
#: i18n.tpl:10
-msgid "Bench"
-msgstr "Banco"
+msgid "Kettlebell"
+msgstr "Pesa rusa"
#: i18n.tpl:11
-msgid "Dumbbell"
-msgstr "Mancuerna"
+msgid "Swiss Ball"
+msgstr "Balón suizo"
#: i18n.tpl:12
-msgid "Gym mat"
-msgstr "Estera de gimnasio"
+msgid "none (bodyweight exercise)"
+msgstr "ninguno (ejercicio de peso corporal)"
#: i18n.tpl:13
-msgid "Incline bench"
-msgstr "Banco inclinado"
+msgid "Calves"
+msgstr "Pantorrillas"
#: i18n.tpl:14
-msgid "Kettlebell"
-msgstr "Pesa rusa"
+msgid "Back"
+msgstr "Espalda"
#: i18n.tpl:15
-msgid "Pull-up bar"
-msgstr "Barra hacia arriba"
+msgid "Lower back"
+msgstr ""
#: i18n.tpl:16
-msgid "SZ-Bar"
-msgstr "Barra de curl"
+msgid "Lats"
+msgstr ""
#: i18n.tpl:17
-msgid "Swiss Ball"
-msgstr "Balón suizo"
+msgid "Hamstrings"
+msgstr ""
#: i18n.tpl:18
-msgid "none (bodyweight exercise)"
-msgstr "ninguno (ejercicio de peso corporal)"
+msgid "Bench"
+msgstr "Banco"
-#: i18n.tpl:20
+#: i18n.tpl:19
#, fuzzy
-#| msgid "Biceps brachii"
-msgid "Biceps"
-msgstr "Bíceps"
+#| msgid "Minutes"
+msgid "Glutes"
+msgstr "Minutos"
+
+#: i18n.tpl:20
+msgid "Kilometers"
+msgstr "Kilómetros"
#: i18n.tpl:21
-msgid "Hamstrings"
-msgstr ""
+msgid "Shoulders"
+msgstr "Hombros"
#: i18n.tpl:22
-msgid "Lower back"
-msgstr ""
+msgid "Seconds"
+msgstr "Segundos"
+
+#: i18n.tpl:23
+msgid "Miles"
+msgstr "Millas"
#: i18n.tpl:24
-#, fuzzy
-#| msgid "Minutes"
-msgid "Glutes"
-msgstr "Minutos"
+msgid "Incline bench"
+msgstr "Banco inclinado"
#: i18n.tpl:25
-msgid "Lats"
+msgid "Quads"
msgstr ""
+#: i18n.tpl:26
+msgid "Minutes"
+msgstr "Minutos"
+
#: i18n.tpl:27
-msgid "Quads"
-msgstr ""
+msgid "Chest"
+msgstr "Pectorales"
+
+#: i18n.tpl:28
+msgid "Gym mat"
+msgstr "Estera de gimnasio"
#: i18n.tpl:29
-#, fuzzy
-#| msgid "Triceps brachii"
-msgid "Triceps"
-msgstr "Tríceps braquial"
+msgid "Pull-up bar"
+msgstr "Barra hacia arriba"
#: i18n.tpl:30
-msgid "Kilometers"
-msgstr "Kilómetros"
+msgid "Barbell"
+msgstr "Barra olímpica"
#: i18n.tpl:31
-msgid "Miles"
-msgstr "Millas"
-
-#: i18n.tpl:32
-msgid "Minutes"
-msgstr "Minutos"
-
-#: i18n.tpl:33 manager/forms.py:169 manager/models/log.py:71
-#: manager/templates/set/add.html:53
-msgid "Repetitions"
-msgstr "Repeticiones"
-
-#: i18n.tpl:34
-msgid "Seconds"
-msgstr "Segundos"
-
-#: i18n.tpl:35
-msgid "Until Failure"
-msgstr "Hasta fallo muscular"
+#, fuzzy
+#| msgid "Triceps brachii"
+msgid "Triceps"
+msgstr "Tríceps braquial"
#: mailer/forms.py:34 mailer/templates/mailer/gym/preview.html:32
msgctxt "As in \"email subject\""
@@ -2540,11 +2332,11 @@ msgstr "Enviar email"
msgid "Correction"
msgstr "Corrección"
-#: manager/forms.py:89 manager/models/workout.py:59
+#: manager/forms.py:92 manager/models/workout.py:59
msgid "The name of the workout"
msgstr "El nombre del entrenamiento"
-#: manager/forms.py:93 manager/models/workout.py:66
+#: manager/forms.py:96 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'."
@@ -2552,7 +2344,7 @@ msgstr ""
"Descripción u objetivo de la rutina. Por ejemplo \"Foco en espalda\" o "
"\"Semana 1 de programa xy\"."
-#: manager/forms.py:126
+#: manager/forms.py:137
msgid ""
"You can search for more than one exercise, they will be grouped together for "
"a superset."
@@ -2560,28 +2352,28 @@ msgstr ""
"Puedes buscar y seleccionar más de un ejercicio, se agruparán juntos para "
"una superserie."
-#: 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
+#: manager/forms.py:166 manager/forms.py:171 manager/models/log.py:64
+#: manager/models/log.py:92 manager/models/setting.py:59
+#: manager/models/setting.py:90 manager/templates/log/add.html:53
+#: manager/templates/log/add.html:55 manager/templates/set/formset.html:10
+#: manager/templates/set/formset.html:12 measurements/models/category.py:58
+#: nutrition/forms.py:64
msgid "Unit"
msgstr "Unidad"
-#: manager/forms.py:266
+#: manager/forms.py:277
msgid "Type"
msgstr "Tipo"
-#: manager/forms.py:267 manager/templates/workout/view.html:157
+#: manager/forms.py:278 manager/templates/workout/view.html:157
msgid "Table"
msgstr "Tabla"
-#: manager/forms.py:269 manager/templates/workout/view.html:163
+#: manager/forms.py:280 manager/templates/workout/view.html:163
msgid "with images"
msgstr "con imágenes"
-#: manager/forms.py:270 manager/templates/workout/view.html:169
+#: manager/forms.py:281 manager/templates/workout/view.html:169
msgid "with comments"
msgstr "con comentarios"
@@ -2638,7 +2430,7 @@ msgid "The duration in weeks"
msgstr "La duración, en semanas"
#: manager/models/schedule_step.py:63 manager/models/set.py:52
-#: manager/models/setting.py:98 nutrition/models/meal.py:54
+#: manager/models/setting.py:110 nutrition/models/meal.py:54
#: nutrition/models/meal_item.py:65
msgid "Order"
msgstr "Orden"
@@ -2693,7 +2485,7 @@ msgstr "Día de ejercicio"
msgid "Number of sets"
msgstr "Número de series"
-#: manager/models/setting.py:43
+#: manager/models/setting.py:48
msgid "Sets"
msgstr "Series"
@@ -2987,6 +2779,13 @@ msgstr ""
"Si no quieres recibir nunca estos emails recordatorios, desactiva la\n"
" opción en tus preferencias."
+#: manager/templates/workout/email_reminder.tpl:15
+#: manager/templates/workout/email_weight_reminder.tpl:12
+#: nutrition/templates/ingredient/email_new.tpl:9
+#, python-format
+msgid "The %(site)s team"
+msgstr "El equipo de %(site)s"
+
#: manager/templates/workout/email_weight_reminder.tpl:3
#, python-format
msgid ""
@@ -3003,6 +2802,10 @@ msgid ""
msgstr ""
"Recibirás regularmente estor recordatorios hasta que ingreses tu peso actual."
+#: manager/templates/workout/log.html:10 manager/templates/workout/log.html:11
+msgid "Weight log"
+msgstr "Registro de peso"
+
#: manager/templates/workout/log.html:29
msgid "Weight log for workout"
msgstr "Registro de peso para rutina"
@@ -3110,7 +2913,7 @@ msgstr "Ver registro de peso"
msgid "Edit workout"
msgstr "Editar rutina"
-#: manager/templates/workout/view.html:225 manager/views/workout.py:300
+#: manager/templates/workout/view.html:225 manager/views/workout.py:301
msgid "Mark as template"
msgstr "Marcar como plantilla"
@@ -3118,11 +2921,6 @@ msgstr "Marcar como plantilla"
msgid "Add workout day"
msgstr "Añadir día de entrenamiento"
-#: manager/views/log.py:92
-#, python-format
-msgid "Edit log entry for %s"
-msgstr "Editar entrada de registro para %s"
-
#: manager/views/log.py:111
msgid "Delete workout log"
msgstr "Eliminar registro de rutina"
@@ -3140,11 +2938,11 @@ msgstr "Crear programa"
msgid "Your workouts"
msgstr "Tus rutinas"
-#: manager/views/workout.py:227
+#: manager/views/workout.py:228
msgid "Copy workout"
msgstr "Copiar rutina"
-#: manager/views/workout.py:230
+#: manager/views/workout.py:231
msgid "Copy"
msgstr "Copiar"
@@ -3166,23 +2964,23 @@ msgstr "Esto también eliminará todos los registros de peso de este día."
msgid "Value"
msgstr ""
-#: nutrition/forms.py:122
+#: nutrition/forms.py:123
msgid "Calculate"
msgstr "Calcular"
-#: nutrition/forms.py:195 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:196 nutrition/templates/rate/form.html:76
msgid "Basic caloric intake"
msgstr "Ingesta básica de calorías"
-#: nutrition/forms.py:196
+#: nutrition/forms.py:197
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:202
+#: nutrition/forms.py:203
msgid "Additional calories"
msgstr "Calorias adicionales"
-#: nutrition/forms.py:204
+#: nutrition/forms.py:205
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
@@ -3190,7 +2988,7 @@ msgstr ""
"Calorías adicionales para agregar a la tasa básica (para restar, introduce "
"un número negativo)"
-#: nutrition/forms.py:232 nutrition/models/ingredient_weight_unit.py:39
+#: nutrition/forms.py:233 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"
@@ -3256,7 +3054,7 @@ msgstr ""
"aportada por las proteínas, carbohidratos y grasas ({energy_calculated}kcal "
"+/-{energy_approx}%)"
-#: nutrition/models/ingredient.py:357 nutrition/views/ingredient.py:225
+#: nutrition/models/ingredient.py:357 nutrition/views/ingredient.py:219
msgid "Ingredient was successfully added to the general database"
msgstr "El ingrediente se ha añadido con éxito a la base de datos"
@@ -3285,6 +3083,12 @@ msgstr "Unidad, p.ej. \"1 taza\" o \"1/2 cuchara\""
msgid "Meal"
msgstr "Comida"
+#: nutrition/models/log.py:65
+#, fuzzy
+#| msgid "Time (approx)"
+msgid "Date and Time (Approx.)"
+msgstr "Hora (aprox.)"
+
#: nutrition/models/meal.py:61
msgid "Time (approx)"
msgstr "Hora (aprox.)"
@@ -3388,6 +3192,10 @@ msgstr ""
"Está disponible en el resumen de ingredientes y puede ser añadido\n"
"a planes de nutrición. Puedes acceder a él con esta dirección:"
+#: nutrition/templates/ingredient/email_new.tpl:8
+msgid "Thank you for contributing and making this site better!"
+msgstr "¡Gracias por contribuir y hacer esta página mejor!"
+
#: nutrition/templates/ingredient/form.html:4
msgid "Submitting an ingredient"
msgstr "Enviar un ingrediente"
@@ -3418,6 +3226,10 @@ msgstr ""
msgid "No ingredients."
msgstr "No hay ingredientes."
+#: nutrition/templates/ingredient/overview.html:57
+msgid "Search"
+msgstr "Buscar"
+
#: nutrition/templates/ingredient/overview.html:66
msgid "ingredient name"
msgstr "nombre del ingrediente"
@@ -3427,6 +3239,14 @@ msgstr "nombre del ingrediente"
msgid "Add ingredient"
msgstr "Añadir ingrediente"
+#: nutrition/templates/ingredient/overview.html:85
+msgid "Only registered users can do this"
+msgstr "Sólo usuarios registrados pueden hacer esto"
+
+#: nutrition/templates/ingredient/pending.html:14
+msgid "Submission date"
+msgstr "Fecha de sumisión"
+
#: nutrition/templates/ingredient/view.html:27
msgid "Ingredient is pending review"
msgstr "Ingrediente pendiente de revisión"
@@ -3442,6 +3262,18 @@ msgstr ""
"de ser incluido en la base de datos. Hasta entonces no se mostrará en el\n"
"índice o la búsqueda."
+#: nutrition/templates/ingredient/view.html:31
+msgid "Please select one of the options below."
+msgstr "Por favor, selecciona una de las opciones de abajo."
+
+#: nutrition/templates/ingredient/view.html:38
+msgid "Accept"
+msgstr "Aceptar"
+
+#: nutrition/templates/ingredient/view.html:42
+msgid "Decline"
+msgstr "Rechazar"
+
#: nutrition/templates/ingredient/view.html:71
#: nutrition/templates/log/detail.html:31
#: nutrition/templates/plan/view.html:229 nutrition/views/plan.py:376
@@ -3704,14 +3536,18 @@ msgstr ""
"aproximación. Si basas tu plan de nutrición en estos valores, obsérvate\n"
"durante algunas semanas y cambia la cantidad total si es necesario."
-#: nutrition/views/ingredient.py:181
+#: nutrition/views/ingredient.py:175
msgid "Add a new ingredient"
msgstr "Añadir nuevo ingrediente"
-#: nutrition/views/ingredient.py:238
+#: nutrition/views/ingredient.py:232
msgid "Ingredient was successfully marked as rejected"
msgstr "El ingrediente se ha marcado como rechazado con éxito"
+#: nutrition/views/log.py:230 nutrition/views/unit_ingredient.py:139
+msgid "Delete?"
+msgstr "¿Borrar?"
+
#: nutrition/views/meal.py:55
msgid "Add new meal"
msgstr "Añadir nueva comida"
@@ -3968,15 +3804,15 @@ msgstr ""
msgid "100%% Free <br>and <br>Open Source"
msgstr "100%% Libre <br>y <br>Open Source"
-#: utils/generic_views.py:261
+#: utils/generic_views.py:262
msgid "Yes, delete"
msgstr "Sí, eliminar"
-#: utils/models.py:47
+#: utils/models.py:48
msgid "Author"
msgstr "Autor"
-#: utils/models.py:52
+#: utils/models.py:53
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."
@@ -3984,15 +3820,15 @@ msgstr ""
"Si no eres el autor, ingresa el nombre del mismo o la fuente. Es necesario "
"para algunas licencias, ej.: CC-BY-SA."
-#: utils/models.py:77
+#: utils/models.py:78
msgid "Pending"
msgstr "Pendiente"
-#: utils/models.py:78
+#: utils/models.py:79
msgid "Accepted"
msgstr "Aceptado"
-#: utils/models.py:79
+#: utils/models.py:80
msgid "Declined"
msgstr "Rechazado"
@@ -4158,6 +3994,213 @@ msgstr "Borrado con éxito."
msgid "Delete weight entry for the %s"
msgstr "Eliminar la entrada de peso para el %s"
+#~ msgid "Ingredients"
+#~ msgstr "Ingredientes"
+
+#~ msgid ""
+#~ "Use the configuration to select in what languages the\n"
+#~ "exercises and ingredients will be shown for the current language (for "
+#~ "example\n"
+#~ "the exercises should be shown in languages A, B and C; the ingredients "
+#~ "only\n"
+#~ "in A)."
+#~ msgstr ""
+#~ "Usa la configuración para elegir en que idiomas se muestran los\n"
+#~ "ingredientes y los ejercicios para el idioma actual (por ejemplo,\n"
+#~ "mostrar los ejercicios en los idiomas A, B y C; los ingredientes\n"
+#~ "sólo en A)."
+
+#~ msgctxt "as in sorted by category"
+#~ msgid "by category"
+#~ msgstr "por categoría"
+
+#~ msgctxt "as in sorted by muscle"
+#~ msgid "by muscle"
+#~ msgstr "por músculos"
+
+#~ msgctxt "as in sorted by equipment"
+#~ msgid "by equipment"
+#~ msgstr "por equipamiento"
+
+#~ msgid "Add new exercise"
+#~ msgstr "Añadir nuevo ejercicio"
+
+#~ msgid "Exercises pending review"
+#~ msgstr "Ejercicios pendientes de revisión"
+
+#~ msgid "Exercise was successfully added to the general database"
+#~ msgstr "El ejercicio se ha añadido con éxito a la base de datos"
+
+#~ msgid "New user submitted exercise"
+#~ msgstr "Nuevo ejercicio enviado por un usuario"
+
+#, python-brace-format
+#~ msgid "The user {0} submitted a new exercise \"{1}\"."
+#~ msgstr "El usuario {0} ha enviado un nuevo ejercicio \"{1}\"."
+
+#~ msgid "New user submitted image"
+#~ msgstr "Nueva imagen enviada por un usuario"
+
+#, 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}."
+
+#~ msgid "Equipment overview"
+#~ msgstr "Resumen de equipos"
+
+#~ msgid "Main muscles"
+#~ msgstr "Músculos principales"
+
+#~ msgid ""
+#~ "No exercises for this equipment. Add or edit an exercise and set the "
+#~ "equipment."
+#~ msgstr ""
+#~ "No hay ejercicios para este equipo. Agregue o edite un ejercicio para "
+#~ "agregar a este equipo."
+
+#~ msgid "exercise name"
+#~ msgstr "nombre del ejercicio"
+
+#, python-format
+#~ msgid ""
+#~ "Your exercise '%(exercise)s' was successfully added to the general\n"
+#~ "database."
+#~ msgstr ""
+#~ "El ejercicio '%(exercise)s' se agrego exitosamente a la base de datos\n"
+#~ "general."
+
+#~ msgid ""
+#~ "It is now available on the exercise and muscle overview and can be\n"
+#~ "added to workouts. You can access it on this address:"
+#~ msgstr ""
+#~ "Ahora está disponible en el resumen de ejercicios y músculos y puede ser\n"
+#~ "añadido a rutinas. Puedes acceder en esta dirección:"
+
+#~ msgid "Submitting an exercise"
+#~ msgstr "Enviar un ejercicio"
+
+#~ msgid ""
+#~ "Thank you for submitting an exercise. This is much\n"
+#~ "appreciated!"
+#~ msgstr "Gracias por enviar un ejercicio. ¡Lo apreciamos mucho!"
+
+#~ msgid ""
+#~ "After you submit the form, the administrators will be notified.\n"
+#~ "Once it is reviewed, it will be added to the database. Till this "
+#~ "happens,\n"
+#~ "it will not be visible in the overview or the search. In case you added "
+#~ "your email\n"
+#~ "when you registered, you will get notified when the process is completed "
+#~ "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"
+#~ "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."
+
+#~ msgid "Correcting an exercise"
+#~ msgstr "Corregir un ejercicio"
+
+#~ msgid ""
+#~ "Thank you for correcting and improving this exercise.\n"
+#~ "This is much appreciated!"
+#~ msgstr ""
+#~ "Gracias por corregir y mejorar este ejercicio.\n"
+#~ "¡Lo apreciamos mucho!"
+
+#~ msgid ""
+#~ "After you submit the form, the administrators will be notified.\n"
+#~ "Once the changes are reviewed the exercise will be updated."
+#~ msgstr ""
+#~ "Después que la forma ha sido enviada, los administradores serán "
+#~ "notificados.\n"
+#~ "Una vez los cambios hayan sido revisados, los ejercicios serán "
+#~ "actualizados."
+
+#~ msgid "No categories."
+#~ msgstr "No hay categorías."
+
+#~ msgid "Use link to create one"
+#~ msgstr "Usa el enlace para crear uno"
+
+#~ msgid "Exercise is pending review"
+#~ msgstr "Ejercicio pendiente de revisión"
+
+#~ msgid ""
+#~ "This user submitted exercise is pending a decision to be\n"
+#~ " included in the database."
+#~ msgstr ""
+#~ "El ejercicio enviado por este usuario esta pendiente por decidir para "
+#~ "ser\n"
+#~ " incluido en la base de datos."
+
+#~ msgid "Till then, it will not be shown in the overview or the search."
+#~ msgstr "Hasta entonces, no se mostrará en índices o en la búsqueda."
+
+#~ msgid "Images"
+#~ msgstr "Imágenes"
+
+#~ msgid "Add new image"
+#~ msgstr "Añadir nueva imagen"
+
+#, fuzzy
+#~| msgid "Add new image"
+#~ msgid "Add new video"
+#~ msgstr "Añadir nueva imagen"
+
+#~ msgid "Images pending review"
+#~ msgstr "Imágenes pendientes de revisión"
+
+#~ msgid "Comments for this exercise"
+#~ msgstr "Comentarios para este ejercicio"
+
+#~ msgid "Add new comment"
+#~ msgstr "Añadir nuevo comentario"
+
+#~ msgid "The diagram shows the most used muscles on this exercise"
+#~ msgstr "El diagrama muestra los músculos más usados en este ejercicio"
+
+#~ msgid "Exercise Variations"
+#~ msgstr "Variantes de ejercicios"
+
+#~ msgid "Submit a correction"
+#~ msgstr "Enviar una corrección"
+
+#~ msgid ""
+#~ "No exercises for this muscle. Add or edit an exercise and set the muscle."
+#~ msgstr ""
+#~ "No hay ejercicios para este músculo. Agregue o edite un ejercicio y "
+#~ "configure el músculo."
+
+#~ msgid "Add exercise"
+#~ msgstr "Añadir ejercicio"
+
+#~ 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."
+
+#, python-brace-format
+#~ msgid "Correct {0}"
+#~ msgstr "Corregir {0}"
+
+#~ msgid "Exercise was successfully marked as rejected"
+#~ msgstr "El ejercicio se ha marcado como rechazado con éxito"
+
+#~ msgid "Edit exercise image"
+#~ msgstr "Editar imagen de ejercicio"
+
+#~ msgid "Delete exercise image?"
+#~ msgstr "¿Borrar imagen de ejercicio?"
+
+#, python-format
+#~ msgid "Edit log entry for %s"
+#~ msgstr "Editar entrada de registro para %s"
+
#~ msgid "Anterior deltoid"
#~ msgstr "Hombro"
@@ -4498,10 +4541,6 @@ msgstr "Eliminar la entrada de peso para el %s"
#~ msgid "No filter"
#~ msgstr "Sin filtro"
-#~ msgctxt "Noun, not verb"
-#~ msgid "Change"
-#~ msgstr "Cambio"
-
#~ msgid "Days"
#~ msgstr "Días"
diff --git a/wger/locale/fa/LC_MESSAGES/django.po b/wger/locale/fa/LC_MESSAGES/django.po
index 8d591f3c4..8690f4b95 100644
--- a/wger/locale/fa/LC_MESSAGES/django.po
+++ b/wger/locale/fa/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: wger Workout Manager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-14 12:01+0200\n"
+"POT-Creation-Date: 2022-11-10 16:03+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"
@@ -32,106 +32,8 @@ msgstr ""
"کاربران جدید و کاربران قدیدمی که باشگاه پیش فرض ندارند به این باشگاه اضافه "
"میشوند."
-#: 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:226
-msgid "Languages"
-msgstr "زبان ها"
-
-#: config/templates/language/overview.html:16
-msgid "Nothing found."
-msgstr "چیزی یافت نشد!"
-
-#: 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:150
-#: nutrition/templates/plan/view.html:153
-#: nutrition/templates/plan/view.html:191
-msgid "Add one now."
-msgstr "اضافه کن"
-
-#: config/templates/language/overview.html:29
-#: core/templates/license/list.html:38 core/templates/misc/license/list.html:41
-#: core/templates/repetition_unit/list.html:41
-#: core/templates/user/overview.html:327 core/templates/user/overview.html:366
-#: core/templates/user/overview.html:402
-#: core/templates/weight_unit/list.html:41 core/views/languages.py:73
-#: core/views/license.py:65 core/views/repetition_units.py:65
-#: core/views/weight_units.py:65
-#: exercises/templates/categories/admin-overview.html:36
-#: 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:61
-msgid "Add"
-msgstr "اضافه کردن"
-
-#: 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/language.py:32
-msgid "Language full name"
-msgstr "نام زبان"
-
-#: config/templates/language/view.html:34 core/templates/user/overview.html:451
-#: gym/views/admin_config.py:44 gym/views/admin_config.py:58
-#: gym/views/user_config.py:46
-msgid "Configuration"
-msgstr "تنظیمات"
-
-#: config/templates/language/view.html:35
-#, fuzzy
-msgid ""
-"Use the configuration to select in what languages the\n"
-"exercises and ingredients will be shown for the current language (for "
-"example\n"
-"the exercises should be shown in languages A, B and C; the ingredients only\n"
-"in A)."
-msgstr ""
-"از تنظیمات استفاده کنید \n"
-"برای انتخاب اینکه از چه زبانی برای نمایش تمرینات و عناصر استفاده شود (برای "
-"مثال تمرینات باید با زبان A, B و C نمایش داده شود، اما عناصر فقط با زبان A)"
-
-#: config/templates/language/view.html:44 gym/templates/contract/list.html:36
-msgid "Show"
-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: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:45
-msgid "Options"
-msgstr "امکانات"
-
-#: config/templates/language/view.html:96 config/views/gym_config.py:41
-#: config/views/language_config.py:49 core/templates/license/list.html:16
-#: core/templates/misc/license/list.html:17
+#: config/views/gym_config.py:41 core/templates/language/view.html:57
+#: 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:39
#: core/templates/tags/render_day.html:75 core/templates/user/overview.html:205
@@ -139,12 +41,10 @@ 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:230
-#: exercises/templates/exercise/view.html:351
#: exercises/templates/muscles/admin-overview.html:16
-#: 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
+#: 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
#: 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,81 +60,54 @@ msgstr "امکانات"
msgid "Edit"
msgstr "ویرایش"
-#: 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: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: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
-#: gym/templates/contract_type/list.html:39 gym/templates/document/list.html:46
-#: gym/templates/gym/list.html:20 manager/templates/calendar/day.html:69
-#: 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:231
-#: 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:132
-#: nutrition/templates/units/list.html:20
-msgid "Delete"
-msgstr "حذف"
-
-#: core/demo.py:86
+#: core/demo.py:95
msgid "Sample workout"
msgstr "نمونه تمرینات"
-#: core/demo.py:90
+#: core/demo.py:99
msgid "Sample day"
msgstr "روز نمونه"
-#: core/demo.py:94
+#: core/demo.py:103
msgid "Another sample day"
msgstr "یک روز نمونه دیگر"
-#: core/demo.py:217
-msgid "Sample nutrional plan"
+#: core/demo.py:211
+#, fuzzy
+#| msgid "Sample nutrional plan"
+msgid "Sample nutritional plan"
msgstr "نمونه برنامه غذایی"
-#: core/demo.py:349 core/demo.py:351 core/demo.py:353
+#: core/demo.py:343 core/demo.py:345 core/demo.py:347
#, python-brace-format
msgid "Placeholder workout nr {0} for schedule"
msgstr "تمرین نگه دارنده مکان شماره {0} برای برنامه"
-#: core/demo.py:358
+#: core/demo.py:352
msgid "My cool workout schedule"
msgstr "برنامه تمرینی جالب من"
-#: core/demo.py:397 core/demo.py:412
+#: core/demo.py:391 core/demo.py:406
msgid "Empty placeholder schedule"
msgstr "برنامه خالی"
-#: core/forms.py:61 core/templates/navigation.html:188
-#: core/templates/navigation.html:192 core/templates/user/login.html:4
+#: core/forms.py:64 core/templates/navigation.html:179
+#: core/templates/navigation.html:183 core/templates/user/login.html:4
#: software/templates/features.html:43
msgid "Login"
msgstr "ورود"
-#: core/forms.py:73 core/forms.py:164 gym/views/export.py:63
+#: core/forms.py:76 core/forms.py:177 gym/views/export.py:63
#: gym/views/gym.py:218
msgid "First name"
msgstr "نام"
-#: core/forms.py:74 core/forms.py:165 core/templates/user/overview.html:267
+#: core/forms.py:77 core/forms.py:178 core/templates/user/overview.html:267
#: gym/views/export.py:64 gym/views/gym.py:218
msgid "Last name"
msgstr "نام خانوادگی"
-#: core/forms.py:76 core/forms.py:131 core/templates/user/overview.html:271
+#: core/forms.py:79 core/forms.py:144 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
@@ -244,78 +117,108 @@ msgstr "نام خانوادگی"
msgid "Email"
msgstr "ایمیل"
-#: core/forms.py:77
+#: core/forms.py:80
msgid "Used for password resets and, optionally, e-mail reminders."
msgstr ""
"برای بازنشانی رمز عبور استفاده می شود، به صورت اختیاری، یادآوری های ایمیل."
-#: core/forms.py:102
+#: core/forms.py:84 core/models/profile.py:220
+#: gym/templates/gym/new_user.html:38
+msgid "Date of Birth"
+msgstr ""
+
+#: core/forms.py:116
msgid "Personal data"
msgstr "اطلاعات شخصی"
-#: core/forms.py:110
+#: core/forms.py:124
msgid "Workout reminders"
msgstr "یاداوری تمرین"
-#: core/forms.py:117
+#: core/forms.py:131
msgid "Other settings"
msgstr "تنظیمات دیگر"
-#: 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
+#: core/forms.py:138 core/views/user.py:615 core/views/user.py:630
+#: core/views/user.py:642 gym/forms.py:72 manager/templates/log/add.html:65
+#: manager/templates/set/add.html:69 manager/views/workout.py:222
+#: utils/generic_views.py:143
msgid "Save"
msgstr "ذخیره"
-#: core/forms.py:132
+#: core/forms.py:145
msgid "Used for password resets and, optionally, email reminders."
msgstr "استفاده شده برای بازیابی رمز عبور و به صورت اختیاری, یادآوری ایمیل"
-#: core/forms.py:160
+#: core/forms.py:173
#, fuzzy
#| msgid "This email is already used."
msgid "This e-mail address is already in use."
msgstr "این ایمیل قبلا استفاده شده است"
-#: core/forms.py:180 gym/templates/gym/new_user.html:26
+#: core/forms.py:193 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:182
+#: core/forms.py:195
msgid "Please enter your current password."
msgstr "لطفا رمز عبور فعلی خود را وارد کنید."
-#: core/forms.py:200
+#: core/forms.py:204 core/templates/language/view.html:62
+#: 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: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/muscles/admin-overview.html:17
+#: gym/templates/admin_notes/list.html:40
+#: gym/templates/contract_option/list.html:39
+#: gym/templates/contract_type/list.html:39 gym/templates/document/list.html:46
+#: gym/templates/gym/list.html:20 manager/templates/calendar/day.html:69
+#: 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:231
+#: 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:132
+#: nutrition/templates/units/list.html:20
+msgid "Delete"
+msgstr "حذف"
+
+#: core/forms.py:213
msgid "Invalid password"
msgstr "رمز نامعتبر"
-#: core/forms.py:212 core/forms.py:278
+#: core/forms.py:225 core/forms.py:291
msgid "The form is secured with reCAPTCHA"
msgstr "این فرم با ریکپچا امن شده است"
-#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:188
-#: core/templates/navigation.html:193 core/templates/template.html:149
-#: core/templates/user/login.html:20 core/views/user.py:293
+#: core/forms.py:239 core/forms.py:258 core/templates/navigation.html:179
+#: core/templates/navigation.html:184 core/templates/template.html:149
+#: core/templates/user/login.html:20 core/views/user.py:300
#: software/templates/features.html:38
msgid "Register"
msgstr "ثبت"
-#: core/forms.py:256
+#: core/forms.py:269
msgid "Contact"
msgstr "ارتباط"
-#: core/forms.py:257
+#: core/forms.py:270
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:71
+#: core/forms.py:278 exercises/models/comment.py:42 manager/models/set.py:60
+#: manager/models/setting.py:111 nutrition/models/log.py:71
msgid "Comment"
msgstr "نظر"
-#: core/forms.py:266
+#: core/forms.py:279
msgid "What do you want to say?"
msgstr "چه میخواهید بگویید؟"
@@ -323,6 +226,14 @@ msgstr "چه میخواهید بگویید؟"
msgid "Day of the week"
msgstr "روز در هفته"
+#: core/models/language.py:31 core/templates/language/view.html:21
+msgid "Language short name"
+msgstr "نام مخفف زبان "
+
+#: core/models/language.py:36 core/templates/language/view.html:22
+msgid "Language full name"
+msgstr "نام زبان"
+
#: core/models/license.py:29
msgid "Full name"
msgstr "نام و نام خانوادگی"
@@ -381,19 +292,19 @@ msgstr "متریک (کیلو گرم)"
msgid "Imperial (pound)"
msgstr "امپریال (پوند)"
-#: core/models/profile.py:111
+#: core/models/profile.py:114
msgid "Show exercise comments"
msgstr "نمایش نظرات تمرینات"
-#: core/models/profile.py:112
+#: core/models/profile.py:115
msgid "Check to show exercise comments on the workout view"
msgstr "بررسی کنید تا نظرات تمرینات در بخش تمرین نمایش داده شود."
-#: core/models/profile.py:123
+#: core/models/profile.py:126
msgid "Also use ingredients in English"
msgstr "همچنین عناصر مورد نیاز را به انگلیسی نمایش بده"
-#: core/models/profile.py:125
+#: core/models/profile.py:128
msgid ""
"Check to also show ingredients in English while creating\n"
"a nutritional plan. These ingredients are extracted from a list provided\n"
@@ -406,11 +317,11 @@ msgstr ""
"بسیار کامل است و شامل 7000 داده می باشد اما می تواند تا حدودی طاقت فرسا باشد "
"و جستجو را دشوار کند."
-#: core/models/profile.py:134
+#: core/models/profile.py:137
msgid "Activate workout reminders"
msgstr "یاد اوری تمرینات فعال"
-#: core/models/profile.py:136
+#: core/models/profile.py:139
msgid ""
"Check to activate automatic reminders for workouts. You need to provide a "
"valid email for this to work."
@@ -418,19 +329,19 @@ msgstr ""
"یادآور خودکار تمرینات را فعال کنید. برای استفاده از این بخش نیاز است ایمیل "
"معتبر خود را ارائه کنید."
-#: core/models/profile.py:145
+#: core/models/profile.py:148
msgid "Remind before expiration"
msgstr "قبل از انقضا یادآوری کن"
-#: core/models/profile.py:146
+#: core/models/profile.py:149
msgid "The number of days you want to be reminded before a workout expires."
msgstr "تعداد روزهایی را که میخواهید یادآوری به شما قبل از تمرین انجام شود"
-#: core/models/profile.py:152
+#: core/models/profile.py:155
msgid "Default duration of workouts"
msgstr "مدت زمان پیش فرض زمان تمرین"
-#: core/models/profile.py:154
+#: core/models/profile.py:157
msgid ""
"Default duration in weeks of workouts not in a schedule. Used for email "
"workout reminders."
@@ -438,11 +349,11 @@ msgstr ""
"مدت زمان پیش فرض در هفته های تمرین نه در برنامه. برای یادآوری تمرینات ایمیل "
"استفاده می شود."
-#: core/models/profile.py:171
+#: core/models/profile.py:174
msgid "Notification language"
msgstr "زبان اعلان ها"
-#: core/models/profile.py:173
+#: core/models/profile.py:176
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."
@@ -451,70 +362,70 @@ msgstr ""
"یادآوری ایمیل برای تمرینات این بر زبان مورد استفاده در وب سایت تأثیر نمی "
"گذارد."
-#: core/models/profile.py:186 gym/views/export.py:66
+#: core/models/profile.py:212 gym/views/export.py:66
msgid "Age"
msgstr "سن"
-#: core/models/profile.py:202 nutrition/forms.py:99
+#: core/models/profile.py:228 nutrition/forms.py:100
msgid "Height (cm)"
msgstr "قد (سانتی متر)"
-#: core/models/profile.py:219
+#: core/models/profile.py:245
msgid "Hours of sleep"
msgstr "چند ساعت میخوابید"
-#: core/models/profile.py:220
+#: core/models/profile.py:246
msgid "The average hours of sleep per day"
msgstr "میانگین خواب شما در روز"
-#: core/models/profile.py:229
+#: core/models/profile.py:255
msgid "Work"
msgstr "کار"
-#: core/models/profile.py:230 core/models/profile.py:272
+#: core/models/profile.py:256 core/models/profile.py:298
msgid "Average hours per day"
msgstr "میانگین زمان کار در روز"
-#: core/models/profile.py:239 core/models/profile.py:260
-#: core/models/profile.py:281
+#: core/models/profile.py:265 core/models/profile.py:286
+#: core/models/profile.py:307
msgid "Physical intensity"
msgstr "شدت جسمی"
-#: core/models/profile.py:240 core/models/profile.py:261
-#: core/models/profile.py:282
+#: core/models/profile.py:266 core/models/profile.py:287
+#: core/models/profile.py:308
msgid "Approximately"
msgstr "تقریبا"
-#: core/models/profile.py:250
+#: core/models/profile.py:276
msgid "Sport"
msgstr "ورزش"
-#: core/models/profile.py:251
+#: core/models/profile.py:277
msgid "Average hours per week"
msgstr "میانگین ساعت کار در هفته"
-#: core/models/profile.py:271
+#: core/models/profile.py:297
msgid "Free time"
msgstr "زمان آزاد"
-#: core/models/profile.py:292 nutrition/templates/rate/form.html:66
+#: core/models/profile.py:318 nutrition/templates/rate/form.html:66
msgid "Total daily calories"
msgstr "مجموع کالری روزانه"
-#: core/models/profile.py:293
+#: core/models/profile.py:319
msgid "Total caloric intake, including e.g. any surplus"
msgstr "مصرف کل کالری"
-#: core/models/profile.py:305 nutrition/models/ingredient_weight_unit.py:45
+#: core/models/profile.py:331 nutrition/models/ingredient_weight_unit.py:45
#: nutrition/models/log.py:90 nutrition/models/meal_item.py:58
msgid "Weight unit"
msgstr "واحد وزن"
-#: core/models/profile.py:313
+#: core/models/profile.py:339
msgid "Allow external access"
msgstr "اجازه دست رسی خارجی"
-#: core/models/profile.py:315
+#: core/models/profile.py:341
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."
@@ -523,24 +434,23 @@ msgstr ""
"قابلیت را فعال کنید تا بتوانید لابک های خود را در شبکه های اجتماعی به اشتراک "
"بگذارید."
-#: core/models/profile.py:324
+#: core/models/profile.py:350
msgid "Automatic reminders for weight entries"
msgstr "یادآوری خودکار برای وزن کشی"
-#: core/models/profile.py:326
+#: core/models/profile.py:352
msgid "Number of days after the last weight entry (enter 0 to deactivate)"
msgstr ""
"چند روز از آخرین وزن کشی شما میگذرد (0 را برای غیر فعال کردن وارد کنید)"
-#: core/models/profile.py:392
+#: core/models/profile.py:418
msgid "The sum of all hours has to be 24"
msgstr "مجموع تمام ساعت ها باید 24 باشد"
#: core/models/rep_unit.py:35 core/models/weight_unit.py:35
-#: core/templates/user/overview.html:263 core/views/user.py:575
+#: core/templates/user/overview.html:263 core/views/user.py:591
#: 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
+#: exercises/models/exercise.py:64 exercises/models/muscle.py:36
#: 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
@@ -601,6 +511,52 @@ msgstr ""
"آیا مطمئن هستید که میخواهید این کار را انجام دهید؟ بعد پاک کردن قابل برگشت "
"نخواهد بود"
+#: core/templates/email_verification/confirm_template.html:4
+msgid "Email verified"
+msgstr ""
+
+#: core/templates/email_verification/confirm_template.html:18
+#, python-format
+msgid "%(username)s, your email was verified"
+msgstr ""
+
+#: core/templates/email_verification/confirm_template.html:22
+msgid "Error, invalid verification token"
+msgstr ""
+
+#: core/templates/email_verification/email_body_html.tpl:6
+#, fuzzy
+#| msgid "Configuration"
+msgid "Email Confirmation"
+msgstr "تنظیمات"
+
+#: core/templates/email_verification/email_body_html.tpl:9
+#: core/templates/email_verification/email_body_txt.tpl:3
+#, python-format
+msgid "You are almost there, %(username)s!"
+msgstr ""
+
+#: core/templates/email_verification/email_body_html.tpl:11
+#, python-format
+msgid "Please click <a href=\"%(link)s\">here</a> to confirm your email"
+msgstr ""
+
+#: core/templates/email_verification/email_body_html.tpl:12
+#: core/templates/email_verification/email_body_txt.tpl:5
+#, python-format
+msgid "The token expires on %(time)s"
+msgstr ""
+
+#: core/templates/email_verification/email_body_html.tpl:14
+#: core/templates/email_verification/email_body_txt.tpl:8
+msgid "the wger Team"
+msgstr ""
+
+#: core/templates/email_verification/email_body_txt.tpl:4
+#, python-format
+msgid "Please click the following link to confirm your email: %(link)s"
+msgstr ""
+
#: core/templates/index.html:4
msgid "Dashboard"
msgstr "داشبورد"
@@ -657,7 +613,7 @@ msgid "Add custom diary entry"
msgstr ""
#: core/templates/index.html:84 core/templates/index.html:92
-#: manager/models/day.py:34 manager/models/log.py:56
+#: manager/models/day.py:34 manager/models/log.py:58
#: manager/models/session.py:60 manager/models/workout.py:109
#: manager/templates/schedule/view.html:105
#: manager/templates/workout/view.html:11
@@ -688,6 +644,20 @@ msgstr "اضافه کردن گزارش جدید"
msgid "No workouts found."
msgstr "تمرین یافت نشد"
+#: core/templates/index.html:137 core/templates/index.html:189
+#: core/templates/language/overview.html:23
+#: 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:150
+#: nutrition/templates/plan/view.html:153
+#: nutrition/templates/plan/view.html:191
+msgid "Add one now."
+msgstr "اضافه کن"
+
#: 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
@@ -741,19 +711,59 @@ msgid "No nutrition plans."
msgstr "برنامه وجود ندارد"
#: 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
+#: core/templates/user/overview.html:121 manager/forms.py:184
+#: manager/helpers.py:89 manager/models/log.py:86 manager/models/setting.py:79
+#: manager/templates/log/add.html:54 manager/templates/set/formset.html:11
#: weight/models.py: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:210 core/templates/navigation.html:135
+#: core/templates/index.html:210 core/templates/navigation.html:126
#: weight/views.py:70
msgid "Add weight entry"
msgstr "وزن را وارد کنید"
+#: core/templates/language/overview.html:4 core/templates/navigation.html:217
+msgid "Languages"
+msgstr "زبان ها"
+
+#: core/templates/language/overview.html:23
+msgid "Nothing found."
+msgstr "چیزی یافت نشد!"
+
+#: core/templates/language/overview.html:36 core/templates/license/list.html:38
+#: core/templates/misc/license/list.html:41
+#: core/templates/repetition_unit/list.html:41
+#: core/templates/user/overview.html:327 core/templates/user/overview.html:366
+#: core/templates/user/overview.html:402
+#: core/templates/weight_unit/list.html:41 core/views/languages.py:73
+#: core/views/license.py:65 core/views/repetition_units.py:65
+#: core/views/weight_units.py:65
+#: exercises/templates/categories/admin-overview.html:36
+#: 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:61
+msgid "Add"
+msgstr "اضافه کردن"
+
+#: core/templates/language/view.html:52 core/templates/user/api_key.html:44
+#: core/templates/user/preferences.html:44 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:45
+msgid "Options"
+msgstr "امکانات"
+
#: core/templates/license/list.html:4 core/templates/misc/license/list.html:4
msgid "License list"
msgstr "لیست مجوز ها"
@@ -766,7 +776,6 @@ msgstr "لیست مجوز ها"
#: core/templates/weight_unit/list.html:26
#: exercises/templates/categories/admin-overview.html:24
#: exercises/templates/equipment/admin-overview.html:24
-#: exercises/templates/exercise/pending.html:30
#: exercises/templates/muscles/admin-overview.html:24
#: gym/templates/admin_notes/list.html:52 gym/templates/contract/list.html:60
#: gym/templates/contract_option/list.html:56
@@ -846,155 +855,135 @@ msgstr ""
msgid "Public templates"
msgstr ""
-#: core/templates/navigation.html:64
-msgctxt "as in sorted by category"
-msgid "by category"
-msgstr ""
-
-#: core/templates/navigation.html:65
-msgctxt "as in sorted by muscle"
-msgid "by muscle"
-msgstr ""
-
-#: core/templates/navigation.html:66
-msgctxt "as in sorted by equipment"
-msgid "by equipment"
-msgstr ""
-
-#: core/templates/navigation.html:70
-#: exercises/templates/equipment/overview.html:109
-#: exercises/templates/equipment/overview.html:113
-#: exercises/templates/exercise/overview.html:112
-#: exercises/templates/exercise/overview.html:116
-#: exercises/templates/muscles/overview.html:112
-#: exercises/templates/muscles/overview.html:116
-msgid "Add new exercise"
-msgstr ""
+#: core/templates/navigation.html:63 manager/forms.py:133
+#: manager/models/setting.py:54
+msgid "Exercises"
+msgstr "تمرینات"
-#: core/templates/navigation.html:75 core/templates/navigation.html:116
-#: core/templates/navigation.html:224
+#: core/templates/navigation.html:67 core/templates/navigation.html:107
+#: core/templates/navigation.html:215
msgid "Administration"
msgstr ""
-#: core/templates/navigation.html:76
-#: exercises/templates/exercise/pending.html:6
-msgid "Exercises pending review"
-msgstr ""
+#: core/templates/navigation.html:68
+#, fuzzy
+#| msgid "Exercises"
+msgid "Exercise edit history"
+msgstr "تمرینات"
-#: core/templates/navigation.html:77 exercises/models/base.py:72
-#: exercises/templates/exercise/view.html:80
+#: core/templates/navigation.html:69 exercises/models/base.py:84
msgid "Equipment"
msgstr ""
-#: core/templates/navigation.html:78 exercises/templates/exercise/view.html:258
+#: core/templates/navigation.html:70
msgid "Muscles"
msgstr ""
-#: core/templates/navigation.html:79
+#: core/templates/navigation.html:71
#: exercises/templates/categories/admin-overview.html:4
msgid "Categories"
msgstr ""
-#: core/templates/navigation.html:93 software/templates/features.html:87
+#: core/templates/navigation.html:84 software/templates/features.html:87
msgid "Nutrition"
msgstr "مواد غذایی"
-#: core/templates/navigation.html:99 core/templates/user/overview.html:144
+#: core/templates/navigation.html:90 core/templates/user/overview.html:144
msgid "Nutrition plans"
msgstr ""
-#: core/templates/navigation.html:105 nutrition/templates/bmi/form.html:50
+#: core/templates/navigation.html:96 nutrition/templates/bmi/form.html:50
msgid "BMI calculator"
msgstr ""
-#: core/templates/navigation.html:111 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:102 nutrition/templates/rate/form.html:17
msgid "Daily calories calculator"
msgstr ""
-#: core/templates/navigation.html:113
+#: core/templates/navigation.html:104
#: nutrition/templates/ingredient/overview.html:29
msgid "Ingredient overview"
msgstr ""
-#: core/templates/navigation.html:117 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:108 nutrition/templates/units/list.html:6
msgid "Ingredient weight units"
msgstr ""
-#: core/templates/navigation.html:118
+#: core/templates/navigation.html:109
#: nutrition/templates/ingredient/pending.html:6
msgid "Ingredients pending review"
msgstr ""
-#: core/templates/navigation.html:132
+#: core/templates/navigation.html:123
msgid "Body weight"
msgstr ""
-#: core/templates/navigation.html:134 core/templates/user/overview.html:114
+#: core/templates/navigation.html:125 core/templates/user/overview.html:114
#: weight/templates/overview.html:7
msgid "Weight overview"
msgstr "بازنگری وزن "
-#: core/templates/navigation.html:147
+#: core/templates/navigation.html:138
msgid "About this software"
msgstr ""
-#: core/templates/navigation.html:149 core/templates/template_features.html:82
+#: core/templates/navigation.html:140 core/templates/template_features.html:82
#: software/templates/about_us.html:5
msgid "About us"
msgstr "درباره ما"
-#: core/templates/navigation.html:151 software/templates/features.html:209
+#: core/templates/navigation.html:142 software/templates/features.html:209
msgid "REST API"
msgstr ""
-#: core/templates/navigation.html:155 utils/models.py:40
+#: core/templates/navigation.html:146 utils/models.py:41
msgid "License"
msgstr ""
-#: core/templates/navigation.html:161
+#: core/templates/navigation.html:152
msgid "Developer documentation"
msgstr ""
-#: core/templates/navigation.html:167
+#: core/templates/navigation.html:158
msgid "Get the code"
msgstr ""
-#: core/templates/navigation.html:173 core/templates/template.html:204
+#: core/templates/navigation.html:164 core/templates/template.html:203
#: core/templates/template_features.html:99
msgid "Translate"
msgstr ""
-#: core/templates/navigation.html:194 core/templates/user/login.html:28
+#: core/templates/navigation.html:185 core/templates/user/login.html:28
msgid "Reset password"
msgstr ""
-#: core/templates/navigation.html:207
+#: core/templates/navigation.html:198
msgid "My preferences"
msgstr ""
-#: core/templates/navigation.html:214
+#: core/templates/navigation.html:205
msgid "Logout"
msgstr ""
-#: core/templates/navigation.html:229
+#: core/templates/navigation.html:220
msgid "Licenses"
msgstr ""
-#: core/templates/navigation.html:232
+#: core/templates/navigation.html:223
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr ""
-#: core/templates/navigation.html:235 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:226 core/templates/weight_unit/list.html:4
#: nutrition/templates/ingredient/view.html:174
msgid "Weight units"
msgstr ""
-#: core/templates/navigation.html:238 core/templates/user/list.html:4
+#: core/templates/navigation.html:229 core/templates/user/list.html:4
msgid "User list"
msgstr ""
-#: core/templates/navigation.html:239
+#: core/templates/navigation.html:230
msgid "Gyms"
msgstr ""
@@ -1071,33 +1060,30 @@ msgstr ""
msgid "Add weight log"
msgstr ""
-#: core/templates/tags/render_day.html:114
-#: exercises/templates/equipment/overview.html:59
-#: exercises/templates/exercise/overview.html:63
-#: exercises/templates/muscles/overview.html:65
+#: core/templates/tags/render_day.html:116
msgid "Placeholder image for exercise"
msgstr ""
-#: core/templates/tags/render_day.html:131
+#: core/templates/tags/render_day.html:133
msgid "This exercise has no repetitions."
msgstr ""
-#: core/templates/tags/render_day.html:134
+#: core/templates/tags/render_day.html:136
msgid "Edit them now."
msgstr ""
-#: core/templates/tags/render_day.html:159
+#: core/templates/tags/render_day.html:162
msgid "Add exercises to this workout day"
msgstr ""
#: core/templates/tags/render_weight_log.html:17 manager/helpers.py:89
-#: manager/models/setting.py:57 manager/templates/set/formset.html:10
+#: manager/models/setting.py:69 manager/templates/set/formset.html:9
msgid "Reps"
msgstr ""
-#: 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
+#: core/templates/tags/render_weight_log.html:30 manager/forms.py:189
+#: manager/models/log.py:103 manager/models/setting.py:99
+#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
msgid "RiR"
msgstr ""
@@ -1120,7 +1106,7 @@ msgstr ""
msgid "Features"
msgstr "امکانات"
-#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:37
+#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:53
msgid "API key"
msgstr ""
@@ -1160,11 +1146,12 @@ msgid "Documentation"
msgstr ""
#: core/templates/user/delete_account.html:4
-#: core/templates/user/preferences.html:42
+#: core/templates/user/preferences.html:58
msgid "Delete account"
msgstr ""
#: core/templates/user/delete_account.html:17
+#: exercises/templates/history/overview.html:93
msgid "Are you sure?"
msgstr ""
@@ -1209,11 +1196,12 @@ 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/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
+#: exercises/models/base.py:99 exercises/models/base.py:104
+#: exercises/models/exercise.py:69 exercises/models/exercise.py:76
+#: gallery/models/image.py:47 manager/helpers.py:88 manager/models/log.py:100
+#: 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/views.py:150
@@ -1221,11 +1209,11 @@ msgid "Date"
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: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
+#: exercises/models/exercise.py:57 exercises/views/exercises.py:123
+#: 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 ""
@@ -1233,12 +1221,12 @@ msgstr ""
msgid "Number of logs (days)"
msgstr ""
-#: core/templates/user/overview.html:37 core/views/user.py:576
+#: core/templates/user/overview.html:37 core/views/user.py:592
#: 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:267
+#: core/templates/user/overview.html:68 manager/forms.py:278
#: manager/templates/workout/view.html:151
msgid "Log"
msgstr ""
@@ -1256,6 +1244,7 @@ msgid "Notes"
msgstr ""
#: core/templates/user/overview.html:79
+#: exercises/templates/history/overview.html:30
#: manager/templates/calendar/partial_overview_table.html:42
#: nutrition/templates/log/detail.html:154
msgid "Time"
@@ -1303,10 +1292,12 @@ msgid "Do you really want to change this user&#39;s password?"
msgstr ""
#: core/templates/user/overview.html:233
+#: exercises/templates/history/overview.html:106
msgid "No"
msgstr ""
#: core/templates/user/overview.html:234
+#: exercises/templates/history/overview.html:99
msgid "Yes"
msgstr ""
@@ -1361,10 +1352,15 @@ msgid "Documents"
msgstr ""
#: core/templates/user/overview.html:413 gym/templates/document/list.html:32
-#: manager/forms.py:279 manager/templates/workout/view.html:176
+#: manager/forms.py:290 manager/templates/workout/view.html:176
msgid "Download"
msgstr ""
+#: core/templates/user/overview.html:451 gym/views/admin_config.py:44
+#: gym/views/admin_config.py:58 gym/views/user_config.py:46
+msgid "Configuration"
+msgstr "تنظیمات"
+
#: core/templates/user/overview.html:454 gym/models/user_config.py:92
msgid "Include in inactive overview"
msgstr ""
@@ -1382,7 +1378,23 @@ msgstr ""
msgid "Preferences"
msgstr "عملکرد"
-#: core/templates/user/preferences.html:33 core/views/user.py:587
+#: core/templates/user/preferences.html:19
+msgid "Verified email"
+msgstr ""
+
+#: core/templates/user/preferences.html:24
+msgid "Unverified email"
+msgstr ""
+
+#: core/templates/user/preferences.html:26
+msgid "Send verification email"
+msgstr ""
+
+#: core/templates/user/preferences.html:30
+msgid "You need to verify your email to contribute exercises"
+msgstr ""
+
+#: core/templates/user/preferences.html:49 core/views/user.py:603
msgid "Change password"
msgstr ""
@@ -1412,39 +1424,37 @@ msgid "oz"
msgstr ""
#: 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
+#: exercises/views/equipment.py:104 exercises/views/exercises.py:185
+#: exercises/views/muscles.py:99 manager/views/schedule.py:311
+#: manager/views/schedule_step.py:129 manager/views/workout.py:269
+#: manager/views/workout_session.py:141 nutrition/views/ingredient.py:138
#: 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:431
-#: exercises/views/muscles.py:125 gallery/views/images.py:121
+#: exercises/views/categories.py:127 exercises/views/exercises.py:193
+#: exercises/views/muscles.py:106 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
+#: manager/views/workout.py:273 manager/views/workout_session.py:156
+#: nutrition/views/ingredient.py:145 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:456
+#: core/views/repetition_units.py:85 core/views/user.py:472
#: 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: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
+#: exercises/views/equipment.py:81 exercises/views/muscles.py:86
+#: 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:170
+#: gym/views/gym.py:459 manager/views/day.py:100 manager/views/schedule.py:335
+#: manager/views/workout.py:287 nutrition/views/ingredient.py:164
+#: nutrition/views/plan.py:144 nutrition/views/unit.py:144
#, python-brace-format
msgid "Edit {0}"
msgstr ""
@@ -1472,64 +1482,65 @@ msgstr ""
msgid "Your feedback was successfully sent. Thank you!"
msgstr ""
-#: core/views/user.py:156
+#: core/views/user.py:157
#, python-brace-format
msgid "Account \"{0}\" was successfully deleted"
msgstr ""
-#: core/views/user.py:287
+#: core/views/user.py:294
msgid "You were successfully registered"
msgstr ""
-#: core/views/user.py:339
+#: core/views/user.py:355
msgid "Settings successfully updated"
msgstr ""
-#: core/views/user.py:376
+#: core/views/user.py:392
msgid "The user was successfully deactivated"
msgstr ""
-#: core/views/user.py:411
+#: core/views/user.py:427
msgid "The user was successfully activated"
msgstr ""
-#: core/views/user.py:426
+#: core/views/user.py:442
msgid "Edit user"
msgstr ""
-#: core/views/user.py:573 gym/templates/gym/member_list.html:26
+#: core/views/user.py:589 gym/templates/gym/member_list.html:26
#: gym/views/gym.py:156
msgid "ID"
msgstr ""
-#: core/views/user.py:574 gym/forms.py:94 gym/templates/contract/view.html:55
+#: core/views/user.py:590 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:577 gym/templates/gym/new_user.html:34
+#: core/views/user.py:593 gym/templates/gym/new_user.html:34
#: gym/views/export.py:60 gym/views/gym.py:218
msgid "Gym"
msgstr ""
-#: exercises/models/base.py:51 exercises/templates/exercise/view.html:76
-#: nutrition/models/ingredient.py:204
+#: core/views/user.py:652
+#, python-format
+msgid "A verification email was sent to %(email)s"
+msgstr ""
+
+#: exercises/models/base.py:63 nutrition/models/ingredient.py:204
msgid "Category"
msgstr ""
-#: exercises/models/base.py:58
+#: exercises/models/base.py:70
msgid "Primary muscles"
msgstr ""
-#: exercises/models/base.py:64 exercises/templates/equipment/overview.html:71
-#: exercises/templates/exercise/overview.html:76
-#: exercises/templates/exercise/view.html:268
-#: exercises/templates/muscles/overview.html:77
+#: exercises/models/base.py:76
msgid "Secondary muscles"
msgstr ""
-#: exercises/models/base.py:79
+#: exercises/models/base.py:91
msgid "Variations"
msgstr ""
@@ -1537,373 +1548,192 @@ msgstr ""
msgid "Exercise Categories"
msgstr ""
-#: exercises/models/comment.py:34 exercises/models/exercise_alias.py:32
-#: exercises/models/image.py:75 exercises/models/video.py:82
-#: manager/forms.py:165 manager/helpers.py:89 manager/models/log.py:51
+#: exercises/models/comment.py:37 exercises/models/exercise_alias.py:35
+#: exercises/models/image.py:71 exercises/models/video.py:95
+#: manager/forms.py:176 manager/helpers.py:89 manager/models/log.py:52
msgid "Exercise"
msgstr ""
-#: exercises/models/comment.py:41
+#: exercises/models/comment.py:43
msgid "A comment about how to correctly do this exercise."
msgstr ""
-#: exercises/models/exercise.py:86 nutrition/models/ingredient.py:80
+#: exercises/models/exercise.py:81 nutrition/models/ingredient.py:80
#: nutrition/models/plan.py:61 nutrition/models/weight_unit.py:32
msgid "Language"
msgstr "زبان"
-#: exercises/models/exercise.py:237 exercises/views/exercises.py:461
-msgid "Exercise was successfully added to the general database"
-msgstr ""
-
-#: exercises/models/exercise.py:265
-msgid "New user submitted exercise"
-msgstr ""
-
-#: exercises/models/exercise.py:267
-#, python-brace-format
-msgid "The user {0} submitted a new exercise \"{1}\"."
-msgstr ""
-
-#: exercises/models/exercise_alias.py:35
+#: exercises/models/exercise_alias.py:38
msgid "Alias for an exercise"
msgstr ""
-#: exercises/models/image.py:59
+#: exercises/models/image.py:55
msgid "Line"
msgstr ""
-#: exercises/models/image.py:60
+#: exercises/models/image.py:56
msgid "3D"
msgstr ""
-#: exercises/models/image.py:61
+#: exercises/models/image.py:57
msgid "Low-poly"
msgstr ""
-#: exercises/models/image.py:62
+#: exercises/models/image.py:58
msgid "Photo"
msgstr ""
-#: exercises/models/image.py:63
+#: exercises/models/image.py:59
msgid "Other"
msgstr ""
-#: exercises/models/image.py:81 gallery/models/image.py:56
+#: exercises/models/image.py:77 gallery/models/image.py:56
msgid "Image"
msgstr ""
-#: exercises/models/image.py:82 gallery/models/image.py:57
+#: exercises/models/image.py:78 gallery/models/image.py:57
msgid "Only PNG and JPEG formats are supported"
msgstr ""
-#: exercises/models/image.py:88
+#: exercises/models/image.py:84
msgid "Main picture"
msgstr ""
-#: 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:100
-msgid "The art style of your image"
-msgstr ""
-
-#: exercises/models/image.py:185
-msgid "New user submitted image"
-msgstr ""
-
-#: exercises/models/image.py:186
-#, python-brace-format
-msgid "The user {0} submitted a new image \"{1}\" for exercise {2}."
-msgstr ""
-
-#: exercises/models/muscle.py:37
-msgid "In latin, e.g. \"Pectoralis major\""
-msgstr ""
-
-#: exercises/models/muscle.py:47
-msgid "Alternative name"
-msgstr ""
-
-#: exercises/models/muscle.py:48
-msgid "A more basic name for the muscle"
-msgstr ""
-
-#: exercises/models/video.py:41
-msgid "Maximum file size is 100MB."
-msgstr ""
-
-#: 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 ""
-
-#: exercises/templates/equipment/admin-overview.html:37
-#: exercises/views/equipment.py:94
-msgid "Add new equipment"
-msgstr ""
-
-#: exercises/templates/equipment/overview.html:11
-msgid "Equipment overview"
-msgstr ""
-
-#: exercises/templates/equipment/overview.html:69
-#: exercises/templates/exercise/overview.html:74
-#: exercises/templates/exercise/view.html:264
-#: exercises/templates/muscles/overview.html:75
-msgid "Main muscles"
-msgstr ""
-
-#: exercises/templates/equipment/overview.html:79
-msgid ""
-"No exercises for this equipment. Add or edit an exercise and set the "
-"equipment."
-msgstr ""
-
-#: exercises/templates/equipment/overview.html:96
-#: exercises/templates/exercise/overview.html:99
-#: nutrition/templates/ingredient/overview.html:57
-msgid "Search"
-msgstr ""
-
-#: exercises/templates/equipment/overview.html:101
-#: exercises/templates/exercise/overview.html:104
-msgid "exercise name"
-msgstr ""
-
-#: exercises/templates/equipment/overview.html:115
-#: exercises/templates/exercise/overview.html:118
-#: exercises/templates/muscles/overview.html:118
-#: nutrition/templates/ingredient/overview.html:85
-msgid "Only registered users can do this"
-msgstr ""
-
-#: exercises/templates/exercise/email_new.tpl:1
-#, python-format
-msgid ""
-"Your exercise '%(exercise)s' was successfully added to the general\n"
-"database."
-msgstr ""
-
-#: exercises/templates/exercise/email_new.tpl:4
-msgid ""
-"It is now available on the exercise and muscle overview and can be\n"
-"added to workouts. You can access it on this address:"
-msgstr ""
-
-#: exercises/templates/exercise/email_new.tpl:8
-#: nutrition/templates/ingredient/email_new.tpl:8
-msgid "Thank you for contributing and making this site better!"
-msgstr ""
-
-#: exercises/templates/exercise/email_new.tpl:9
-#: manager/templates/workout/email_reminder.tpl:15
-#: manager/templates/workout/email_weight_reminder.tpl:12
-#: nutrition/templates/ingredient/email_new.tpl:9
-#, python-format
-msgid "The %(site)s team"
-msgstr ""
-
-#: exercises/templates/exercise/form.html:4
-msgid "Submitting an exercise"
-msgstr ""
-
-#: exercises/templates/exercise/form.html:5
+#: exercises/models/image.py:87
msgid ""
-"Thank you for submitting an exercise. This is much\n"
-"appreciated!"
+"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/templates/exercise/form.html:8
-msgid ""
-"After you submit the form, the administrators will be notified.\n"
-"Once it is reviewed, it will be added to the database. Till this happens,\n"
-"it will not be visible in the overview or the search. In case you added your "
-"email\n"
-"when you registered, you will get notified when the process is completed "
-"successfully."
+#: exercises/models/image.py:96
+msgid "The art style of your image"
msgstr ""
-#: exercises/templates/exercise/form_correct.html:4
-msgid "Correcting an exercise"
+#: exercises/models/muscle.py:37
+msgid "In latin, e.g. \"Pectoralis major\""
msgstr ""
-#: exercises/templates/exercise/form_correct.html:5
-msgid ""
-"Thank you for correcting and improving this exercise.\n"
-"This is much appreciated!"
+#: exercises/models/muscle.py:47
+msgid "Alternative name"
msgstr ""
-#: exercises/templates/exercise/form_correct.html:8
-msgid ""
-"After you submit the form, the administrators will be notified.\n"
-"Once the changes are reviewed the exercise will be updated."
+#: exercises/models/muscle.py:48
+msgid "A more basic name for the muscle"
msgstr ""
-#: exercises/templates/exercise/overview.html:88
-msgid "No categories."
+#: exercises/models/video.py:50
+#, python-format
+msgid "Maximum file size is %(size)sMB."
msgstr ""
-#: exercises/templates/exercise/overview.html:88
-msgid "Use link to create one"
+#: exercises/models/video.py:57 exercises/models/video.py:65
+msgid "File type is not supported"
msgstr ""
-#: exercises/templates/exercise/pending.html:14
-#: nutrition/templates/ingredient/pending.html:14
-msgid "Submission date"
-msgstr ""
+#: exercises/models/video.py:70
+#, fuzzy
+#| msgid "%(birthdate)s is not a valid birthdate"
+msgid "File is not a valid video"
+msgstr "%(birthdate)s روز تولد معتبر نمی باشد"
-#: 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/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"
+#: exercises/models/video.py:101
+msgid "Main video"
msgstr ""
-#: exercises/templates/exercise/view.html:48
-msgid "Exercise is pending review"
+#: exercises/models/video.py:107
+msgid "Video"
msgstr ""
-#: exercises/templates/exercise/view.html:51
-msgid ""
-"This user submitted exercise is pending a decision to be\n"
-" included in the database."
+#: exercises/models/video.py:114
+msgid "Size"
msgstr ""
-#: exercises/templates/exercise/view.html:53
-msgid "Till then, it will not be shown in the overview or the search."
+#: exercises/models/video.py:121 manager/models/schedule_step.py:56
+msgid "Duration"
msgstr ""
-#: exercises/templates/exercise/view.html:54
-#: nutrition/templates/ingredient/view.html:31
-msgid "Please select one of the options below."
+#: exercises/models/video.py:130
+msgid "Width"
msgstr ""
-#: exercises/templates/exercise/view.html:60
-#: exercises/templates/exercise/view.html:203
-#: nutrition/templates/ingredient/view.html:38
-msgid "Accept"
+#: exercises/models/video.py:137
+#, fuzzy
+#| msgid "Weight"
+msgid "Height"
+msgstr "وزن"
+
+#: exercises/models/video.py:144
+msgid "Codec"
msgstr ""
-#: exercises/templates/exercise/view.html:64
-#: exercises/templates/exercise/view.html:204
-#: nutrition/templates/ingredient/view.html:42
-msgid "Decline"
+#: exercises/models/video.py:152
+msgid "Codec, long name"
msgstr ""
-#: exercises/templates/exercise/view.html:96
-msgid "Images"
+#: exercises/templates/equipment/admin-overview.html:4
+msgid "Equipment list"
msgstr ""
-#: exercises/templates/exercise/view.html:137 exercises/views/images.py:93
-msgid "Add new image"
+#: exercises/templates/equipment/admin-overview.html:37
+#: exercises/views/equipment.py:92
+msgid "Add new equipment"
msgstr ""
-#: exercises/templates/exercise/view.html:148
-msgid "Videos"
+#: exercises/templates/history/overview.html:11
+msgid "Exercise admin history"
msgstr ""
-#: exercises/templates/exercise/view.html:187 exercises/views/videos.py:94
+#: exercises/templates/history/overview.html:27
#, fuzzy
-#| msgid "Add new log"
-msgid "Add new video"
-msgstr "اضافه کردن گزارش جدید"
+#| msgid "Options"
+msgid "Action"
+msgstr "امکانات"
-#: exercises/templates/exercise/view.html:197
-msgid "Images pending review"
+#: exercises/templates/history/overview.html:28 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/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 ""
-#: exercises/templates/exercise/view.html:218
-msgid "Comments for this exercise"
+#: exercises/templates/history/overview.html:29
+msgid "Object"
msgstr ""
-#: exercises/templates/exercise/view.html:246
-msgid "Add new comment"
+#: exercises/templates/history/overview.html:31
+msgid "Changes"
msgstr ""
-#: exercises/templates/exercise/view.html:260
-msgid "The diagram shows the most used muscles on this exercise"
+#: exercises/templates/history/overview.html:32
+msgid "Revert"
msgstr ""
-#: exercises/templates/exercise/view.html:301
-#: manager/templates/workout/log.html:10 manager/templates/workout/log.html:11
-msgid "Weight log"
+#: exercises/templates/history/overview.html:64
+msgid "View Object"
msgstr ""
-#: exercises/templates/exercise/view.html:306
-msgid "Exercise Variations"
+#: exercises/templates/history/overview.html:75
+msgid "View changes"
msgstr ""
-#: exercises/templates/exercise/view.html:327
-msgid "Submit a correction"
+#: exercises/templates/history/overview.html:86
+msgid "Revert changes"
msgstr ""
#: exercises/templates/muscles/admin-overview.html:4
-#: exercises/templates/muscles/overview.html:7
msgid "Muscle overview"
msgstr "بررسی عضله"
#: exercises/templates/muscles/admin-overview.html:36
-#: exercises/views/muscles.py:86
+#: exercises/views/muscles.py:67
msgid "Add muscle"
msgstr ""
-#: exercises/templates/muscles/overview.html:85
-msgid ""
-"No exercises for this muscle. Add or edit an exercise and set the muscle."
-msgstr ""
-
#: exercises/views/categories.py:71
msgid "Add category"
msgstr ""
@@ -1916,50 +1746,19 @@ msgstr ""
msgid "Add exercise comment"
msgstr ""
-#: exercises/views/equipment.py:107 exercises/views/equipment.py:118
+#: exercises/views/equipment.py:105 exercises/views/equipment.py:116
msgid "Delete equipment?"
msgstr ""
-#: exercises/views/exercises.py:229
+#: exercises/views/exercises.py:161
#, python-format
-msgid ""
-"%(name_original)s is too similar to existing exercise \"%(exercise_name)s\""
-msgstr ""
-
-#: exercises/views/exercises.py:247
-msgid "Add exercise"
-msgstr ""
-
-#: exercises/views/exercises.py:367
-msgid "Thank you. Once the changes are reviewed the exercise will be updated."
-msgstr ""
-
-#: exercises/views/exercises.py:380
-#, python-brace-format
-msgid "Correct {0}"
+msgid "%(name)s is too similar to existing exercise \"%(exercise_name)s\""
msgstr ""
-#: exercises/views/exercises.py:422
+#: exercises/views/exercises.py:184
msgid "This will delete the exercise from all workouts."
msgstr ""
-#: exercises/views/exercises.py:474
-msgid "Exercise was successfully marked as rejected"
-msgstr ""
-
-#: exercises/views/images.py:68
-msgid "Edit exercise image"
-msgstr ""
-
-#: exercises/views/images.py:143
-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 ""
@@ -2026,7 +1825,7 @@ msgid "Contract type"
msgstr ""
#: gym/models/contract.py:208 gym/templates/contract/view.html:59
-#: manager/templates/log/add.html:52 nutrition/forms.py:59
+#: manager/templates/log/add.html:52 nutrition/forms.py:60
#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:102
#: nutrition/models/meal_item.py:72
msgid "Amount"
@@ -2127,6 +1926,10 @@ msgstr ""
msgid "User notes"
msgstr ""
+#: gym/templates/contract/list.html:36
+msgid "Show"
+msgstr "نمایش"
+
#: gym/templates/contract/view.html:4
msgid "Contract"
msgstr ""
@@ -2205,10 +2008,6 @@ msgstr ""
msgid "Add member"
msgstr ""
-#: gym/templates/gym/new_user.html:38
-msgid "Date of Birth"
-msgstr ""
-
#: gym/templates/gym/new_user.html:48 manager/templates/calendar/month.html:144
#: manager/templates/log/add.html:75 nutrition/templates/rate/form.html:120
msgid "Info"
@@ -2265,130 +2064,130 @@ msgstr ""
msgid "Edit gym"
msgstr ""
-#: i18n.tpl:2 i18n.tpl:28
-msgid "Abs"
-msgstr ""
+#: i18n.tpl:2
+msgid "Until Failure"
+msgstr "تا حد ناتوانی"
-#: i18n.tpl:3
-msgid "Arms"
+#: i18n.tpl:3 manager/forms.py:180 manager/models/log.py:73
+#: manager/templates/set/add.html:53
+msgid "Repetitions"
msgstr ""
#: i18n.tpl:4
-msgid "Back"
+msgid "Abs"
msgstr ""
-#: i18n.tpl:5 i18n.tpl:23
-msgid "Calves"
+#: i18n.tpl:5
+msgid "Arms"
msgstr ""
-#: i18n.tpl:6 i18n.tpl:26
-msgid "Chest"
+#: i18n.tpl:6
+msgid "Legs"
msgstr ""
#: i18n.tpl:7
-msgid "Legs"
+msgid "Dumbbell"
msgstr ""
-#: i18n.tpl:8 i18n.tpl:19
-msgid "Shoulders"
+#: i18n.tpl:8
+msgid "Biceps"
msgstr ""
#: i18n.tpl:9
-msgid "Barbell"
+msgid "SZ-Bar"
msgstr ""
#: i18n.tpl:10
-msgid "Bench"
+msgid "Kettlebell"
msgstr ""
#: i18n.tpl:11
-msgid "Dumbbell"
+msgid "Swiss Ball"
msgstr ""
#: i18n.tpl:12
-msgid "Gym mat"
+msgid "none (bodyweight exercise)"
msgstr ""
#: i18n.tpl:13
-msgid "Incline bench"
+msgid "Calves"
msgstr ""
#: i18n.tpl:14
-msgid "Kettlebell"
+msgid "Back"
msgstr ""
#: i18n.tpl:15
-msgid "Pull-up bar"
+msgid "Lower back"
msgstr ""
#: i18n.tpl:16
-msgid "SZ-Bar"
+msgid "Lats"
msgstr ""
#: i18n.tpl:17
-msgid "Swiss Ball"
+msgid "Hamstrings"
msgstr ""
#: i18n.tpl:18
-msgid "none (bodyweight exercise)"
+msgid "Bench"
msgstr ""
+#: i18n.tpl:19
+#, fuzzy
+#| msgid "Minutes"
+msgid "Glutes"
+msgstr "دقیقه"
+
#: i18n.tpl:20
-msgid "Biceps"
-msgstr ""
+msgid "Kilometers"
+msgstr "کیلوگرم"
#: i18n.tpl:21
-msgid "Hamstrings"
+msgid "Shoulders"
msgstr ""
#: i18n.tpl:22
-msgid "Lower back"
-msgstr ""
+msgid "Seconds"
+msgstr "دومین"
+
+#: i18n.tpl:23
+msgid "Miles"
+msgstr "مایل"
#: i18n.tpl:24
-#, fuzzy
-#| msgid "Minutes"
-msgid "Glutes"
-msgstr "دقیقه"
+msgid "Incline bench"
+msgstr ""
#: i18n.tpl:25
-msgid "Lats"
+msgid "Quads"
msgstr ""
+#: i18n.tpl:26
+msgid "Minutes"
+msgstr "دقیقه"
+
#: i18n.tpl:27
-msgid "Quads"
+msgid "Chest"
+msgstr ""
+
+#: i18n.tpl:28
+msgid "Gym mat"
msgstr ""
#: i18n.tpl:29
-#, fuzzy
-#| msgid "Triceps brachii"
-msgid "Triceps"
-msgstr "سه سر بازو"
+msgid "Pull-up bar"
+msgstr ""
#: i18n.tpl:30
-msgid "Kilometers"
-msgstr "کیلوگرم"
-
-#: i18n.tpl:31
-msgid "Miles"
-msgstr "مایل"
-
-#: i18n.tpl:32
-msgid "Minutes"
-msgstr "دقیقه"
-
-#: i18n.tpl:33 manager/forms.py:169 manager/models/log.py:71
-#: manager/templates/set/add.html:53
-msgid "Repetitions"
+msgid "Barbell"
msgstr ""
-#: i18n.tpl:34
-msgid "Seconds"
-msgstr "دومین"
-
-#: i18n.tpl:35
-msgid "Until Failure"
-msgstr "تا حد ناتوانی"
+#: i18n.tpl:31
+#, fuzzy
+#| msgid "Triceps brachii"
+msgid "Triceps"
+msgstr "سه سر بازو"
#: mailer/forms.py:34 mailer/templates/mailer/gym/preview.html:32
msgctxt "As in \"email subject\""
@@ -2441,44 +2240,44 @@ msgstr ""
msgid "Correction"
msgstr ""
-#: manager/forms.py:89 manager/models/workout.py:59
+#: manager/forms.py:92 manager/models/workout.py:59
msgid "The name of the workout"
msgstr ""
-#: manager/forms.py:93 manager/models/workout.py:66
+#: manager/forms.py:96 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
+#: manager/forms.py:137
msgid ""
"You can search for more than one exercise, they will be grouped together for "
"a superset."
msgstr ""
-#: 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
+#: manager/forms.py:166 manager/forms.py:171 manager/models/log.py:64
+#: manager/models/log.py:92 manager/models/setting.py:59
+#: manager/models/setting.py:90 manager/templates/log/add.html:53
+#: manager/templates/log/add.html:55 manager/templates/set/formset.html:10
+#: manager/templates/set/formset.html:12 measurements/models/category.py:58
+#: nutrition/forms.py:64
msgid "Unit"
msgstr ""
-#: manager/forms.py:266
+#: manager/forms.py:277
msgid "Type"
msgstr ""
-#: manager/forms.py:267 manager/templates/workout/view.html:157
+#: manager/forms.py:278 manager/templates/workout/view.html:157
msgid "Table"
msgstr ""
-#: manager/forms.py:269 manager/templates/workout/view.html:163
+#: manager/forms.py:280 manager/templates/workout/view.html:163
msgid "with images"
msgstr ""
-#: manager/forms.py:270 manager/templates/workout/view.html:169
+#: manager/forms.py:281 manager/templates/workout/view.html:169
msgid "with comments"
msgstr ""
@@ -2530,7 +2329,7 @@ msgid "The duration in weeks"
msgstr ""
#: manager/models/schedule_step.py:63 manager/models/set.py:52
-#: manager/models/setting.py:98 nutrition/models/meal.py:54
+#: manager/models/setting.py:110 nutrition/models/meal.py:54
#: nutrition/models/meal_item.py:65
msgid "Order"
msgstr ""
@@ -2581,7 +2380,7 @@ msgstr ""
msgid "Number of sets"
msgstr ""
-#: manager/models/setting.py:43
+#: manager/models/setting.py:48
msgid "Sets"
msgstr ""
@@ -2838,6 +2637,13 @@ msgid ""
"option in your settings."
msgstr ""
+#: manager/templates/workout/email_reminder.tpl:15
+#: manager/templates/workout/email_weight_reminder.tpl:12
+#: nutrition/templates/ingredient/email_new.tpl:9
+#, python-format
+msgid "The %(site)s team"
+msgstr ""
+
#: manager/templates/workout/email_weight_reminder.tpl:3
#, python-format
msgid ""
@@ -2850,6 +2656,10 @@ msgid ""
"You will regularly receive such reminders till you enter your current weight."
msgstr ""
+#: manager/templates/workout/log.html:10 manager/templates/workout/log.html:11
+msgid "Weight log"
+msgstr ""
+
#: manager/templates/workout/log.html:29
msgid "Weight log for workout"
msgstr ""
@@ -2952,7 +2762,7 @@ msgstr ""
msgid "Edit workout"
msgstr ""
-#: manager/templates/workout/view.html:225 manager/views/workout.py:300
+#: manager/templates/workout/view.html:225 manager/views/workout.py:301
msgid "Mark as template"
msgstr ""
@@ -2960,11 +2770,6 @@ msgstr ""
msgid "Add workout day"
msgstr ""
-#: manager/views/log.py:92
-#, python-format
-msgid "Edit log entry for %s"
-msgstr ""
-
#: manager/views/log.py:111
msgid "Delete workout log"
msgstr ""
@@ -2982,11 +2787,11 @@ msgstr ""
msgid "Your workouts"
msgstr ""
-#: manager/views/workout.py:227
+#: manager/views/workout.py:228
msgid "Copy workout"
msgstr ""
-#: manager/views/workout.py:230
+#: manager/views/workout.py:231
msgid "Copy"
msgstr ""
@@ -3008,29 +2813,29 @@ msgstr ""
msgid "Value"
msgstr ""
-#: nutrition/forms.py:122
+#: nutrition/forms.py:123
msgid "Calculate"
msgstr ""
-#: nutrition/forms.py:195 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:196 nutrition/templates/rate/form.html:76
msgid "Basic caloric intake"
msgstr ""
-#: nutrition/forms.py:196
+#: nutrition/forms.py:197
msgid "Your basic caloric intake as calculated for your data"
msgstr ""
-#: nutrition/forms.py:202
+#: nutrition/forms.py:203
msgid "Additional calories"
msgstr ""
-#: nutrition/forms.py:204
+#: nutrition/forms.py:205
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
msgstr ""
-#: nutrition/forms.py:232 nutrition/models/ingredient_weight_unit.py:39
+#: nutrition/forms.py:233 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"
@@ -3093,7 +2898,7 @@ msgid ""
"{energy_approx}%)"
msgstr ""
-#: nutrition/models/ingredient.py:357 nutrition/views/ingredient.py:225
+#: nutrition/models/ingredient.py:357 nutrition/views/ingredient.py:219
msgid "Ingredient was successfully added to the general database"
msgstr ""
@@ -3122,6 +2927,10 @@ msgstr ""
msgid "Meal"
msgstr ""
+#: nutrition/models/log.py:65
+msgid "Date and Time (Approx.)"
+msgstr ""
+
#: nutrition/models/meal.py:61
msgid "Time (approx)"
msgstr ""
@@ -3213,6 +3022,10 @@ msgid ""
"added to nutrition plans. You can access it on this address:"
msgstr ""
+#: nutrition/templates/ingredient/email_new.tpl:8
+msgid "Thank you for contributing and making this site better!"
+msgstr ""
+
#: nutrition/templates/ingredient/form.html:4
msgid "Submitting an ingredient"
msgstr ""
@@ -3237,6 +3050,10 @@ msgstr ""
msgid "No ingredients."
msgstr ""
+#: nutrition/templates/ingredient/overview.html:57
+msgid "Search"
+msgstr ""
+
#: nutrition/templates/ingredient/overview.html:66
msgid "ingredient name"
msgstr ""
@@ -3246,6 +3063,14 @@ msgstr ""
msgid "Add ingredient"
msgstr ""
+#: nutrition/templates/ingredient/overview.html:85
+msgid "Only registered users can do this"
+msgstr ""
+
+#: nutrition/templates/ingredient/pending.html:14
+msgid "Submission date"
+msgstr ""
+
#: nutrition/templates/ingredient/view.html:27
msgid "Ingredient is pending review"
msgstr ""
@@ -3258,6 +3083,18 @@ msgid ""
"the search."
msgstr ""
+#: nutrition/templates/ingredient/view.html:31
+msgid "Please select one of the options below."
+msgstr ""
+
+#: nutrition/templates/ingredient/view.html:38
+msgid "Accept"
+msgstr ""
+
+#: nutrition/templates/ingredient/view.html:42
+msgid "Decline"
+msgstr ""
+
#: nutrition/templates/ingredient/view.html:71
#: nutrition/templates/log/detail.html:31
#: nutrition/templates/plan/view.html:229 nutrition/views/plan.py:376
@@ -3498,14 +3335,18 @@ msgid ""
"yourself for some weeks and change the total amount if needed."
msgstr ""
-#: nutrition/views/ingredient.py:181
+#: nutrition/views/ingredient.py:175
msgid "Add a new ingredient"
msgstr ""
-#: nutrition/views/ingredient.py:238
+#: nutrition/views/ingredient.py:232
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 ""
@@ -3720,29 +3561,29 @@ msgstr ""
msgid "100%% Free <br>and <br>Open Source"
msgstr ""
-#: utils/generic_views.py:261
+#: utils/generic_views.py:262
msgid "Yes, delete"
msgstr "بله، حذف"
-#: utils/models.py:47
+#: utils/models.py:48
msgid "Author"
msgstr ""
-#: utils/models.py:52
+#: utils/models.py:53
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:77
+#: utils/models.py:78
msgid "Pending"
msgstr ""
-#: utils/models.py:78
+#: utils/models.py:79
msgid "Accepted"
msgstr ""
-#: utils/models.py:79
+#: utils/models.py:80
msgid "Declined"
msgstr ""
@@ -3883,6 +3724,28 @@ msgstr ""
msgid "Delete weight entry for the %s"
msgstr ""
+#~ msgid "Ingredients"
+#~ msgstr "عناصر"
+
+#, fuzzy
+#~ msgid ""
+#~ "Use the configuration to select in what languages the\n"
+#~ "exercises and ingredients will be shown for the current language (for "
+#~ "example\n"
+#~ "the exercises should be shown in languages A, B and C; the ingredients "
+#~ "only\n"
+#~ "in A)."
+#~ msgstr ""
+#~ "از تنظیمات استفاده کنید \n"
+#~ "برای انتخاب اینکه از چه زبانی برای نمایش تمرینات و عناصر استفاده شود "
+#~ "(برای مثال تمرینات باید با زبان A, B و C نمایش داده شود، اما عناصر فقط با "
+#~ "زبان A)"
+
+#, fuzzy
+#~| msgid "Add new log"
+#~ msgid "Add new video"
+#~ msgstr "اضافه کردن گزارش جدید"
+
#~ msgid "Soleus"
#~ msgstr "سولوس"
diff --git a/wger/locale/fi/LC_MESSAGES/django.po b/wger/locale/fi/LC_MESSAGES/django.po
index e9c8b98ab..cdf7db68c 100644
--- a/wger/locale/fi/LC_MESSAGES/django.po
+++ b/wger/locale/fi/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: wger Workout Manager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-14 12:01+0200\n"
+"POT-Creation-Date: 2022-11-10 16:03+0100\n"
"PO-Revision-Date: 2022-08-31 10:16+0000\n"
"Last-Translator: Juuso Haapanen <[email protected]>\n"
"Language-Team: Finnish <https://hosted.weblate.org/projects/wger/web/fi/>\n"
@@ -32,106 +32,8 @@ msgstr ""
"Valitse oletussali tälle asennukselle. Tämä sali asetetaan kaikille uusille "
"käyttäjille ja päivitetään niille käyttäjille joilta sali vielä puuttuu."
-#: config/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 "Harjoitukset"
-
-#: config/models/language_config.py:42
-msgid "Ingredients"
-msgstr "Raaka-aineet"
-
-#: config/templates/language/overview.html:4 core/templates/navigation.html:226
-msgid "Languages"
-msgstr "Kielet"
-
-#: config/templates/language/overview.html:16
-msgid "Nothing found."
-msgstr "Mitään ei löytynyt."
-
-#: 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:150
-#: nutrition/templates/plan/view.html:153
-#: nutrition/templates/plan/view.html:191
-msgid "Add one now."
-msgstr ""
-
-#: config/templates/language/overview.html:29
-#: core/templates/license/list.html:38 core/templates/misc/license/list.html:41
-#: core/templates/repetition_unit/list.html:41
-#: core/templates/user/overview.html:327 core/templates/user/overview.html:366
-#: core/templates/user/overview.html:402
-#: core/templates/weight_unit/list.html:41 core/views/languages.py:73
-#: core/views/license.py:65 core/views/repetition_units.py:65
-#: core/views/weight_units.py:65
-#: exercises/templates/categories/admin-overview.html:36
-#: 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:61
-msgid "Add"
-msgstr "Lisää"
-
-#: config/templates/language/view.html:21 core/models/language.py:29
-msgid "Language short name"
-msgstr "Kielen lyhenne"
-
-#: config/templates/language/view.html:22
-#: config/templates/language/view.html:43 core/models/language.py:32
-msgid "Language full name"
-msgstr "Kielen koko nimi"
-
-#: config/templates/language/view.html:34 core/templates/user/overview.html:451
-#: gym/views/admin_config.py:44 gym/views/admin_config.py:58
-#: gym/views/user_config.py:46
-msgid "Configuration"
-msgstr "Asetukset"
-
-#: config/templates/language/view.html:35
-msgid ""
-"Use the configuration to select in what languages the\n"
-"exercises and ingredients will be shown for the current language (for "
-"example\n"
-"the exercises should be shown in languages A, B and C; the ingredients only\n"
-"in A)."
-msgstr ""
-"Käytä asetuksia valitaksesi millä kielillä\n"
-"harjoitukset ja raaka-aineet näytetään nykyisellä kieli-asetuksella.\n"
-"(Esimerkiksi harjoitukset näytetään kielillä A, B ja C; raaka-aineet vain "
-"kielellä A)."
-
-#: config/templates/language/view.html:44 gym/templates/contract/list.html:36
-msgid "Show"
-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: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:45
-msgid "Options"
-msgstr "Asetukset"
-
-#: config/templates/language/view.html:96 config/views/gym_config.py:41
-#: config/views/language_config.py:49 core/templates/license/list.html:16
-#: core/templates/misc/license/list.html:17
+#: config/views/gym_config.py:41 core/templates/language/view.html:57
+#: 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:39
#: core/templates/tags/render_day.html:75 core/templates/user/overview.html:205
@@ -139,12 +41,10 @@ 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:230
-#: exercises/templates/exercise/view.html:351
#: exercises/templates/muscles/admin-overview.html:16
-#: 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
+#: 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
#: 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,81 +60,54 @@ msgstr "Asetukset"
msgid "Edit"
msgstr "Muokkaa"
-#: 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: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: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
-#: gym/templates/contract_type/list.html:39 gym/templates/document/list.html:46
-#: gym/templates/gym/list.html:20 manager/templates/calendar/day.html:69
-#: 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:231
-#: 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:132
-#: nutrition/templates/units/list.html:20
-msgid "Delete"
-msgstr "Poista"
-
-#: core/demo.py:86
+#: core/demo.py:95
msgid "Sample workout"
msgstr "Esimerkkiharjoitus"
-#: core/demo.py:90
+#: core/demo.py:99
msgid "Sample day"
msgstr "Esimerkkipäivä"
-#: core/demo.py:94
+#: core/demo.py:103
msgid "Another sample day"
msgstr "Toinen esimerkkipäivä"
-#: core/demo.py:217
-msgid "Sample nutrional plan"
+#: core/demo.py:211
+#, fuzzy
+#| msgid "Sample nutrional plan"
+msgid "Sample nutritional plan"
msgstr "esimerkkiravinto-ohjelma"
-#: core/demo.py:349 core/demo.py:351 core/demo.py:353
+#: core/demo.py:343 core/demo.py:345 core/demo.py:347
#, python-brace-format
msgid "Placeholder workout nr {0} for schedule"
msgstr ""
-#: core/demo.py:358
+#: core/demo.py:352
msgid "My cool workout schedule"
msgstr "Minun hieno harjoitusohjelmani"
-#: core/demo.py:397 core/demo.py:412
+#: core/demo.py:391 core/demo.py:406
msgid "Empty placeholder schedule"
msgstr "Tyhjä tilanvaraaja-aikataulu"
-#: core/forms.py:61 core/templates/navigation.html:188
-#: core/templates/navigation.html:192 core/templates/user/login.html:4
+#: core/forms.py:64 core/templates/navigation.html:179
+#: core/templates/navigation.html:183 core/templates/user/login.html:4
#: software/templates/features.html:43
msgid "Login"
msgstr "Kirjaudu sisään"
-#: core/forms.py:73 core/forms.py:164 gym/views/export.py:63
+#: core/forms.py:76 core/forms.py:177 gym/views/export.py:63
#: gym/views/gym.py:218
msgid "First name"
msgstr "Etunimi"
-#: core/forms.py:74 core/forms.py:165 core/templates/user/overview.html:267
+#: core/forms.py:77 core/forms.py:178 core/templates/user/overview.html:267
#: gym/views/export.py:64 gym/views/gym.py:218
msgid "Last name"
msgstr "Sukunimi"
-#: core/forms.py:76 core/forms.py:131 core/templates/user/overview.html:271
+#: core/forms.py:79 core/forms.py:144 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
@@ -244,7 +117,7 @@ msgstr "Sukunimi"
msgid "Email"
msgstr "Sähköposti"
-#: core/forms.py:77
+#: core/forms.py:80
#, fuzzy
#| msgid "Used for password resets and, optionally, email reminders."
msgid "Used for password resets and, optionally, e-mail reminders."
@@ -252,77 +125,107 @@ msgstr ""
"Käytetään uuden salasanan hankkimiseen ja valinnaisesti "
"sähköpostimuistutuksiin."
-#: core/forms.py:102
+#: core/forms.py:84 core/models/profile.py:220
+#: gym/templates/gym/new_user.html:38
+msgid "Date of Birth"
+msgstr ""
+
+#: core/forms.py:116
msgid "Personal data"
msgstr "Henkilökohtaiset tiedot"
-#: core/forms.py:110
+#: core/forms.py:124
msgid "Workout reminders"
msgstr "Harjoitusmuistutukset"
-#: core/forms.py:117
+#: core/forms.py:131
msgid "Other settings"
msgstr "Muut asetukset"
-#: 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
+#: core/forms.py:138 core/views/user.py:615 core/views/user.py:630
+#: core/views/user.py:642 gym/forms.py:72 manager/templates/log/add.html:65
+#: manager/templates/set/add.html:69 manager/views/workout.py:222
+#: utils/generic_views.py:143
msgid "Save"
msgstr "Tallenna"
-#: core/forms.py:132
+#: core/forms.py:145
msgid "Used for password resets and, optionally, email reminders."
msgstr ""
"Käytetään uuden salasanan hankkimiseen ja valinnaisesti "
"sähköpostimuistutuksiin."
-#: core/forms.py:160
+#: core/forms.py:173
#, fuzzy
#| msgid "This email is already used."
msgid "This e-mail address is already in use."
msgstr "Tämä sähköpostiosoite on jo käytössä."
-#: core/forms.py:180 gym/templates/gym/new_user.html:26
+#: core/forms.py:193 gym/templates/gym/new_user.html:26
#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:218
msgid "Password"
msgstr "Salasana"
-#: core/forms.py:182
+#: core/forms.py:195
msgid "Please enter your current password."
msgstr "Anna nykyinen salasanasi."
-#: core/forms.py:200
+#: core/forms.py:204 core/templates/language/view.html:62
+#: 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: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/muscles/admin-overview.html:17
+#: gym/templates/admin_notes/list.html:40
+#: gym/templates/contract_option/list.html:39
+#: gym/templates/contract_type/list.html:39 gym/templates/document/list.html:46
+#: gym/templates/gym/list.html:20 manager/templates/calendar/day.html:69
+#: 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:231
+#: 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:132
+#: nutrition/templates/units/list.html:20
+msgid "Delete"
+msgstr "Poista"
+
+#: core/forms.py:213
msgid "Invalid password"
msgstr "Väärä salasana"
-#: core/forms.py:212 core/forms.py:278
+#: core/forms.py:225 core/forms.py:291
msgid "The form is secured with reCAPTCHA"
msgstr "Lomake on suojattu reCAPTCHA:lla"
-#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:188
-#: core/templates/navigation.html:193 core/templates/template.html:149
-#: core/templates/user/login.html:20 core/views/user.py:293
+#: core/forms.py:239 core/forms.py:258 core/templates/navigation.html:179
+#: core/templates/navigation.html:184 core/templates/template.html:149
+#: core/templates/user/login.html:20 core/views/user.py:300
#: software/templates/features.html:38
msgid "Register"
msgstr "Rekisteröidy"
-#: core/forms.py:256
+#: core/forms.py:269
msgid "Contact"
msgstr "Yhteydenotto"
-#: core/forms.py:257
+#: core/forms.py:270
#, fuzzy
#| msgid "Some way of answering you (email, etc.)"
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:71
+#: core/forms.py:278 exercises/models/comment.py:42 manager/models/set.py:60
+#: manager/models/setting.py:111 nutrition/models/log.py:71
msgid "Comment"
msgstr "Kommentti"
-#: core/forms.py:266
+#: core/forms.py:279
msgid "What do you want to say?"
msgstr "Mitä haluat sanoa?"
@@ -330,6 +233,14 @@ msgstr "Mitä haluat sanoa?"
msgid "Day of the week"
msgstr "Viikonpäivä"
+#: core/models/language.py:31 core/templates/language/view.html:21
+msgid "Language short name"
+msgstr "Kielen lyhenne"
+
+#: core/models/language.py:36 core/templates/language/view.html:22
+msgid "Language full name"
+msgstr "Kielen koko nimi"
+
#: core/models/license.py:29
msgid "Full name"
msgstr "Koko nimi"
@@ -385,19 +296,19 @@ msgstr "Metriset (kilogramma)"
msgid "Imperial (pound)"
msgstr "Brittiläinen (pauna)"
-#: core/models/profile.py:111
+#: core/models/profile.py:114
msgid "Show exercise comments"
msgstr "Näytä harjoituskommentit"
-#: core/models/profile.py:112
+#: core/models/profile.py:115
msgid "Check to show exercise comments on the workout view"
msgstr "Valitsä näyttääksesi harjoituskommentit treeninäkymässä"
-#: core/models/profile.py:123
+#: core/models/profile.py:126
msgid "Also use ingredients in English"
msgstr "Näytä raaka-aineet myös englanniksi"
-#: core/models/profile.py:125
+#: core/models/profile.py:128
msgid ""
"Check to also show ingredients in English while creating\n"
"a nutritional plan. These ingredients are extracted from a list provided\n"
@@ -405,11 +316,11 @@ msgid ""
"7000 entries, but can be somewhat overwhelming and make the search difficult."
msgstr ""
-#: core/models/profile.py:134
+#: core/models/profile.py:137
msgid "Activate workout reminders"
msgstr "Käytä treenimuistutuksia"
-#: core/models/profile.py:136
+#: core/models/profile.py:139
msgid ""
"Check to activate automatic reminders for workouts. You need to provide a "
"valid email for this to work."
@@ -417,30 +328,30 @@ msgstr ""
"Käytä automaattisia treenimuistutuksia. Sinun täytyy olla antanut käytössä "
"oleva sähköpostiosoite tätä varten."
-#: core/models/profile.py:145
+#: core/models/profile.py:148
msgid "Remind before expiration"
msgstr "Muistuta ennen vanhenemista"
-#: core/models/profile.py:146
+#: core/models/profile.py:149
msgid "The number of days you want to be reminded before a workout expires."
msgstr ""
-#: core/models/profile.py:152
+#: core/models/profile.py:155
msgid "Default duration of workouts"
msgstr "Treeniohjelman oletuskesto"
-#: core/models/profile.py:154
+#: core/models/profile.py:157
msgid ""
"Default duration in weeks of workouts not in a schedule. Used for email "
"workout reminders."
msgstr ""
"Oletuskesto treeniohjelmalle viikoissa. Käytetään sähköpostimuistutuksiin."
-#: core/models/profile.py:171
+#: core/models/profile.py:174
msgid "Notification language"
msgstr "Muistutuskieli"
-#: core/models/profile.py:173
+#: core/models/profile.py:176
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."
@@ -448,70 +359,70 @@ msgstr ""
"Kieli jota käytetään sähköpostimuistutuksiin, esim. treenimuistutuksiin.\n"
"Tämä ei vaikuta sivulla käytettävään kieleen."
-#: core/models/profile.py:186 gym/views/export.py:66
+#: core/models/profile.py:212 gym/views/export.py:66
msgid "Age"
msgstr "Ikä"
-#: core/models/profile.py:202 nutrition/forms.py:99
+#: core/models/profile.py:228 nutrition/forms.py:100
msgid "Height (cm)"
msgstr "Pituus (cm)"
-#: core/models/profile.py:219
+#: core/models/profile.py:245
msgid "Hours of sleep"
msgstr "Unen määrä"
-#: core/models/profile.py:220
+#: core/models/profile.py:246
msgid "The average hours of sleep per day"
msgstr "Keskimääräinen unen määrä päivässä"
-#: core/models/profile.py:229
+#: core/models/profile.py:255
msgid "Work"
msgstr "Työ"
-#: core/models/profile.py:230 core/models/profile.py:272
+#: core/models/profile.py:256 core/models/profile.py:298
msgid "Average hours per day"
msgstr "Keskimääräinen tuntien määrä päivässä"
-#: core/models/profile.py:239 core/models/profile.py:260
-#: core/models/profile.py:281
+#: core/models/profile.py:265 core/models/profile.py:286
+#: core/models/profile.py:307
msgid "Physical intensity"
msgstr "Fyysinen vaativuus"
-#: core/models/profile.py:240 core/models/profile.py:261
-#: core/models/profile.py:282
+#: core/models/profile.py:266 core/models/profile.py:287
+#: core/models/profile.py:308
msgid "Approximately"
msgstr "Arviolta"
-#: core/models/profile.py:250
+#: core/models/profile.py:276
msgid "Sport"
msgstr "Urheilu"
-#: core/models/profile.py:251
+#: core/models/profile.py:277
msgid "Average hours per week"
msgstr "Keskimäärin tunteja viikossa"
-#: core/models/profile.py:271
+#: core/models/profile.py:297
msgid "Free time"
msgstr "Vapaa-aika"
-#: core/models/profile.py:292 nutrition/templates/rate/form.html:66
+#: core/models/profile.py:318 nutrition/templates/rate/form.html:66
msgid "Total daily calories"
msgstr "Päivittäisiä kaloreita yhteensä"
-#: core/models/profile.py:293
+#: core/models/profile.py:319
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
+#: core/models/profile.py:331 nutrition/models/ingredient_weight_unit.py:45
#: nutrition/models/log.py:90 nutrition/models/meal_item.py:58
msgid "Weight unit"
msgstr "Painoyksikkö"
-#: core/models/profile.py:313
+#: core/models/profile.py:339
msgid "Allow external access"
msgstr "Salli ulkoinen pääsy"
-#: core/models/profile.py:315
+#: core/models/profile.py:341
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."
@@ -520,24 +431,23 @@ msgstr ""
"tilassa. Sinun täytyy käyttää tätä jos haluat jakaa linkkejä treeneihisi "
"esim. sosiaaliseen mediaan."
-#: core/models/profile.py:324
+#: core/models/profile.py:350
msgid "Automatic reminders for weight entries"
msgstr "Automaattiset muistutukset painomerkinnöistä"
-#: core/models/profile.py:326
+#: core/models/profile.py:352
msgid "Number of days after the last weight entry (enter 0 to deactivate)"
msgstr ""
"Päivien määrä edellisestä painomerkinnästä (aseta 0 ottaaksesi pois päältä)"
-#: core/models/profile.py:392
+#: core/models/profile.py:418
msgid "The sum of all hours has to be 24"
msgstr "Tuntien summa tarvitsee olla 24"
#: core/models/rep_unit.py:35 core/models/weight_unit.py:35
-#: core/templates/user/overview.html:263 core/views/user.py:575
+#: core/templates/user/overview.html:263 core/views/user.py:591
#: 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
+#: exercises/models/exercise.py:64 exercises/models/muscle.py:36
#: 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
@@ -599,6 +509,52 @@ msgstr "Jaa"
msgid "Are you sure you want to delete this? This action cannot be undone."
msgstr "Oletko varma, että haluat poistaa tämän? Toimintoa ei voi perua."
+#: core/templates/email_verification/confirm_template.html:4
+msgid "Email verified"
+msgstr ""
+
+#: core/templates/email_verification/confirm_template.html:18
+#, python-format
+msgid "%(username)s, your email was verified"
+msgstr ""
+
+#: core/templates/email_verification/confirm_template.html:22
+msgid "Error, invalid verification token"
+msgstr ""
+
+#: core/templates/email_verification/email_body_html.tpl:6
+#, fuzzy
+#| msgid "Configuration"
+msgid "Email Confirmation"
+msgstr "Asetukset"
+
+#: core/templates/email_verification/email_body_html.tpl:9
+#: core/templates/email_verification/email_body_txt.tpl:3
+#, python-format
+msgid "You are almost there, %(username)s!"
+msgstr ""
+
+#: core/templates/email_verification/email_body_html.tpl:11
+#, python-format
+msgid "Please click <a href=\"%(link)s\">here</a> to confirm your email"
+msgstr ""
+
+#: core/templates/email_verification/email_body_html.tpl:12
+#: core/templates/email_verification/email_body_txt.tpl:5
+#, python-format
+msgid "The token expires on %(time)s"
+msgstr ""
+
+#: core/templates/email_verification/email_body_html.tpl:14
+#: core/templates/email_verification/email_body_txt.tpl:8
+msgid "the wger Team"
+msgstr ""
+
+#: core/templates/email_verification/email_body_txt.tpl:4
+#, python-format
+msgid "Please click the following link to confirm your email: %(link)s"
+msgstr ""
+
#: core/templates/index.html:4
msgid "Dashboard"
msgstr ""
@@ -655,7 +611,7 @@ msgid "Add custom diary entry"
msgstr ""
#: core/templates/index.html:84 core/templates/index.html:92
-#: manager/models/day.py:34 manager/models/log.py:56
+#: manager/models/day.py:34 manager/models/log.py:58
#: manager/models/session.py:60 manager/models/workout.py:109
#: manager/templates/schedule/view.html:105
#: manager/templates/workout/view.html:11
@@ -686,6 +642,20 @@ msgstr ""
msgid "No workouts found."
msgstr ""
+#: core/templates/index.html:137 core/templates/index.html:189
+#: core/templates/language/overview.html:23
+#: 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:150
+#: nutrition/templates/plan/view.html:153
+#: nutrition/templates/plan/view.html:191
+msgid "Add one now."
+msgstr ""
+
#: 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
@@ -739,19 +709,59 @@ msgid "No nutrition plans."
msgstr ""
#: 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
+#: core/templates/user/overview.html:121 manager/forms.py:184
+#: manager/helpers.py:89 manager/models/log.py:86 manager/models/setting.py:79
+#: manager/templates/log/add.html:54 manager/templates/set/formset.html:11
#: weight/models.py: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:210 core/templates/navigation.html:135
+#: core/templates/index.html:210 core/templates/navigation.html:126
#: weight/views.py:70
msgid "Add weight entry"
msgstr ""
+#: core/templates/language/overview.html:4 core/templates/navigation.html:217
+msgid "Languages"
+msgstr "Kielet"
+
+#: core/templates/language/overview.html:23
+msgid "Nothing found."
+msgstr "Mitään ei löytynyt."
+
+#: core/templates/language/overview.html:36 core/templates/license/list.html:38
+#: core/templates/misc/license/list.html:41
+#: core/templates/repetition_unit/list.html:41
+#: core/templates/user/overview.html:327 core/templates/user/overview.html:366
+#: core/templates/user/overview.html:402
+#: core/templates/weight_unit/list.html:41 core/views/languages.py:73
+#: core/views/license.py:65 core/views/repetition_units.py:65
+#: core/views/weight_units.py:65
+#: exercises/templates/categories/admin-overview.html:36
+#: 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:61
+msgid "Add"
+msgstr "Lisää"
+
+#: core/templates/language/view.html:52 core/templates/user/api_key.html:44
+#: core/templates/user/preferences.html:44 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:45
+msgid "Options"
+msgstr "Asetukset"
+
#: core/templates/license/list.html:4 core/templates/misc/license/list.html:4
msgid "License list"
msgstr ""
@@ -764,7 +774,6 @@ msgstr ""
#: core/templates/weight_unit/list.html:26
#: exercises/templates/categories/admin-overview.html:24
#: exercises/templates/equipment/admin-overview.html:24
-#: exercises/templates/exercise/pending.html:30
#: exercises/templates/muscles/admin-overview.html:24
#: gym/templates/admin_notes/list.html:52 gym/templates/contract/list.html:60
#: gym/templates/contract_option/list.html:56
@@ -842,155 +851,135 @@ msgstr ""
msgid "Public templates"
msgstr ""
-#: core/templates/navigation.html:64
-msgctxt "as in sorted by category"
-msgid "by category"
-msgstr ""
-
-#: core/templates/navigation.html:65
-msgctxt "as in sorted by muscle"
-msgid "by muscle"
-msgstr ""
-
-#: core/templates/navigation.html:66
-msgctxt "as in sorted by equipment"
-msgid "by equipment"
-msgstr ""
-
-#: core/templates/navigation.html:70
-#: exercises/templates/equipment/overview.html:109
-#: exercises/templates/equipment/overview.html:113
-#: exercises/templates/exercise/overview.html:112
-#: exercises/templates/exercise/overview.html:116
-#: exercises/templates/muscles/overview.html:112
-#: exercises/templates/muscles/overview.html:116
-msgid "Add new exercise"
-msgstr ""
+#: core/templates/navigation.html:63 manager/forms.py:133
+#: manager/models/setting.py:54
+msgid "Exercises"
+msgstr "Harjoitukset"
-#: core/templates/navigation.html:75 core/templates/navigation.html:116
-#: core/templates/navigation.html:224
+#: core/templates/navigation.html:67 core/templates/navigation.html:107
+#: core/templates/navigation.html:215
msgid "Administration"
msgstr ""
-#: core/templates/navigation.html:76
-#: exercises/templates/exercise/pending.html:6
-msgid "Exercises pending review"
-msgstr ""
+#: core/templates/navigation.html:68
+#, fuzzy
+#| msgid "Exercises"
+msgid "Exercise edit history"
+msgstr "Harjoitukset"
-#: core/templates/navigation.html:77 exercises/models/base.py:72
-#: exercises/templates/exercise/view.html:80
+#: core/templates/navigation.html:69 exercises/models/base.py:84
msgid "Equipment"
msgstr ""
-#: core/templates/navigation.html:78 exercises/templates/exercise/view.html:258
+#: core/templates/navigation.html:70
msgid "Muscles"
msgstr ""
-#: core/templates/navigation.html:79
+#: core/templates/navigation.html:71
#: exercises/templates/categories/admin-overview.html:4
msgid "Categories"
msgstr ""
-#: core/templates/navigation.html:93 software/templates/features.html:87
+#: core/templates/navigation.html:84 software/templates/features.html:87
msgid "Nutrition"
msgstr ""
-#: core/templates/navigation.html:99 core/templates/user/overview.html:144
+#: core/templates/navigation.html:90 core/templates/user/overview.html:144
msgid "Nutrition plans"
msgstr ""
-#: core/templates/navigation.html:105 nutrition/templates/bmi/form.html:50
+#: core/templates/navigation.html:96 nutrition/templates/bmi/form.html:50
msgid "BMI calculator"
msgstr "Painoindeksilaskuri"
-#: core/templates/navigation.html:111 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:102 nutrition/templates/rate/form.html:17
msgid "Daily calories calculator"
msgstr ""
-#: core/templates/navigation.html:113
+#: core/templates/navigation.html:104
#: nutrition/templates/ingredient/overview.html:29
msgid "Ingredient overview"
msgstr ""
-#: core/templates/navigation.html:117 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:108 nutrition/templates/units/list.html:6
msgid "Ingredient weight units"
msgstr ""
-#: core/templates/navigation.html:118
+#: core/templates/navigation.html:109
#: nutrition/templates/ingredient/pending.html:6
msgid "Ingredients pending review"
msgstr ""
-#: core/templates/navigation.html:132
+#: core/templates/navigation.html:123
msgid "Body weight"
msgstr ""
-#: core/templates/navigation.html:134 core/templates/user/overview.html:114
+#: core/templates/navigation.html:125 core/templates/user/overview.html:114
#: weight/templates/overview.html:7
msgid "Weight overview"
msgstr ""
-#: core/templates/navigation.html:147
+#: core/templates/navigation.html:138
msgid "About this software"
msgstr ""
-#: core/templates/navigation.html:149 core/templates/template_features.html:82
+#: core/templates/navigation.html:140 core/templates/template_features.html:82
#: software/templates/about_us.html:5
msgid "About us"
msgstr "Meistä"
-#: core/templates/navigation.html:151 software/templates/features.html:209
+#: core/templates/navigation.html:142 software/templates/features.html:209
msgid "REST API"
msgstr ""
-#: core/templates/navigation.html:155 utils/models.py:40
+#: core/templates/navigation.html:146 utils/models.py:41
msgid "License"
msgstr ""
-#: core/templates/navigation.html:161
+#: core/templates/navigation.html:152
msgid "Developer documentation"
msgstr ""
-#: core/templates/navigation.html:167
+#: core/templates/navigation.html:158
msgid "Get the code"
msgstr ""
-#: core/templates/navigation.html:173 core/templates/template.html:204
+#: core/templates/navigation.html:164 core/templates/template.html:203
#: core/templates/template_features.html:99
msgid "Translate"
msgstr ""
-#: core/templates/navigation.html:194 core/templates/user/login.html:28
+#: core/templates/navigation.html:185 core/templates/user/login.html:28
msgid "Reset password"
msgstr ""
-#: core/templates/navigation.html:207
+#: core/templates/navigation.html:198
msgid "My preferences"
msgstr ""
-#: core/templates/navigation.html:214
+#: core/templates/navigation.html:205
msgid "Logout"
msgstr ""
-#: core/templates/navigation.html:229
+#: core/templates/navigation.html:220
msgid "Licenses"
msgstr ""
-#: core/templates/navigation.html:232
+#: core/templates/navigation.html:223
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr ""
-#: core/templates/navigation.html:235 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:226 core/templates/weight_unit/list.html:4
#: nutrition/templates/ingredient/view.html:174
msgid "Weight units"
msgstr ""
-#: core/templates/navigation.html:238 core/templates/user/list.html:4
+#: core/templates/navigation.html:229 core/templates/user/list.html:4
msgid "User list"
msgstr ""
-#: core/templates/navigation.html:239
+#: core/templates/navigation.html:230
msgid "Gyms"
msgstr ""
@@ -1065,33 +1054,30 @@ msgstr "seuraava"
msgid "Add weight log"
msgstr ""
-#: core/templates/tags/render_day.html:114
-#: exercises/templates/equipment/overview.html:59
-#: exercises/templates/exercise/overview.html:63
-#: exercises/templates/muscles/overview.html:65
+#: core/templates/tags/render_day.html:116
msgid "Placeholder image for exercise"
msgstr ""
-#: core/templates/tags/render_day.html:131
+#: core/templates/tags/render_day.html:133
msgid "This exercise has no repetitions."
msgstr ""
-#: core/templates/tags/render_day.html:134
+#: core/templates/tags/render_day.html:136
msgid "Edit them now."
msgstr ""
-#: core/templates/tags/render_day.html:159
+#: core/templates/tags/render_day.html:162
msgid "Add exercises to this workout day"
msgstr ""
#: core/templates/tags/render_weight_log.html:17 manager/helpers.py:89
-#: manager/models/setting.py:57 manager/templates/set/formset.html:10
+#: manager/models/setting.py:69 manager/templates/set/formset.html:9
msgid "Reps"
msgstr "Toistot"
-#: 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
+#: core/templates/tags/render_weight_log.html:30 manager/forms.py:189
+#: manager/models/log.py:103 manager/models/setting.py:99
+#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
msgid "RiR"
msgstr ""
@@ -1114,7 +1100,7 @@ msgstr "Käyttöehdot"
msgid "Features"
msgstr ""
-#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:37
+#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:53
msgid "API key"
msgstr ""
@@ -1154,11 +1140,12 @@ msgid "Documentation"
msgstr ""
#: core/templates/user/delete_account.html:4
-#: core/templates/user/preferences.html:42
+#: core/templates/user/preferences.html:58
msgid "Delete account"
msgstr ""
#: core/templates/user/delete_account.html:17
+#: exercises/templates/history/overview.html:93
msgid "Are you sure?"
msgstr "Oletko varma?"
@@ -1203,11 +1190,12 @@ 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/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
+#: exercises/models/base.py:99 exercises/models/base.py:104
+#: exercises/models/exercise.py:69 exercises/models/exercise.py:76
+#: gallery/models/image.py:47 manager/helpers.py:88 manager/models/log.py:100
+#: 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/views.py:150
@@ -1215,11 +1203,11 @@ msgid "Date"
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: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
+#: exercises/models/exercise.py:57 exercises/views/exercises.py:123
+#: 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 ""
@@ -1227,12 +1215,12 @@ msgstr ""
msgid "Number of logs (days)"
msgstr ""
-#: core/templates/user/overview.html:37 core/views/user.py:576
+#: core/templates/user/overview.html:37 core/views/user.py:592
#: 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:267
+#: core/templates/user/overview.html:68 manager/forms.py:278
#: manager/templates/workout/view.html:151
msgid "Log"
msgstr ""
@@ -1250,6 +1238,7 @@ msgid "Notes"
msgstr ""
#: core/templates/user/overview.html:79
+#: exercises/templates/history/overview.html:30
#: manager/templates/calendar/partial_overview_table.html:42
#: nutrition/templates/log/detail.html:154
msgid "Time"
@@ -1297,10 +1286,12 @@ msgid "Do you really want to change this user&#39;s password?"
msgstr ""
#: core/templates/user/overview.html:233
+#: exercises/templates/history/overview.html:106
msgid "No"
msgstr ""
#: core/templates/user/overview.html:234
+#: exercises/templates/history/overview.html:99
msgid "Yes"
msgstr ""
@@ -1355,10 +1346,15 @@ msgid "Documents"
msgstr ""
#: core/templates/user/overview.html:413 gym/templates/document/list.html:32
-#: manager/forms.py:279 manager/templates/workout/view.html:176
+#: manager/forms.py:290 manager/templates/workout/view.html:176
msgid "Download"
msgstr ""
+#: core/templates/user/overview.html:451 gym/views/admin_config.py:44
+#: gym/views/admin_config.py:58 gym/views/user_config.py:46
+msgid "Configuration"
+msgstr "Asetukset"
+
#: core/templates/user/overview.html:454 gym/models/user_config.py:92
msgid "Include in inactive overview"
msgstr ""
@@ -1376,7 +1372,23 @@ msgstr ""
msgid "Preferences"
msgstr ""
-#: core/templates/user/preferences.html:33 core/views/user.py:587
+#: core/templates/user/preferences.html:19
+msgid "Verified email"
+msgstr ""
+
+#: core/templates/user/preferences.html:24
+msgid "Unverified email"
+msgstr ""
+
+#: core/templates/user/preferences.html:26
+msgid "Send verification email"
+msgstr ""
+
+#: core/templates/user/preferences.html:30
+msgid "You need to verify your email to contribute exercises"
+msgstr ""
+
+#: core/templates/user/preferences.html:49 core/views/user.py:603
msgid "Change password"
msgstr ""
@@ -1406,39 +1418,37 @@ msgid "oz"
msgstr ""
#: 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
+#: exercises/views/equipment.py:104 exercises/views/exercises.py:185
+#: exercises/views/muscles.py:99 manager/views/schedule.py:311
+#: manager/views/schedule_step.py:129 manager/views/workout.py:269
+#: manager/views/workout_session.py:141 nutrition/views/ingredient.py:138
#: 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:431
-#: exercises/views/muscles.py:125 gallery/views/images.py:121
+#: exercises/views/categories.py:127 exercises/views/exercises.py:193
+#: exercises/views/muscles.py:106 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
+#: manager/views/workout.py:273 manager/views/workout_session.py:156
+#: nutrition/views/ingredient.py:145 nutrition/views/plan.py:127
#: nutrition/views/unit.py:118
#, python-brace-format
msgid "Delete {0}?"
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/repetition_units.py:85 core/views/user.py:472
#: 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: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
+#: exercises/views/equipment.py:81 exercises/views/muscles.py:86
+#: 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:170
+#: gym/views/gym.py:459 manager/views/day.py:100 manager/views/schedule.py:335
+#: manager/views/workout.py:287 nutrition/views/ingredient.py:164
+#: nutrition/views/plan.py:144 nutrition/views/unit.py:144
#, python-brace-format
msgid "Edit {0}"
msgstr "Muokkaa {0}"
@@ -1466,64 +1476,65 @@ msgstr ""
msgid "Your feedback was successfully sent. Thank you!"
msgstr ""
-#: core/views/user.py:156
+#: core/views/user.py:157
#, python-brace-format
msgid "Account \"{0}\" was successfully deleted"
msgstr ""
-#: core/views/user.py:287
+#: core/views/user.py:294
msgid "You were successfully registered"
msgstr ""
-#: core/views/user.py:339
+#: core/views/user.py:355
msgid "Settings successfully updated"
msgstr ""
-#: core/views/user.py:376
+#: core/views/user.py:392
msgid "The user was successfully deactivated"
msgstr ""
-#: core/views/user.py:411
+#: core/views/user.py:427
msgid "The user was successfully activated"
msgstr ""
-#: core/views/user.py:426
+#: core/views/user.py:442
msgid "Edit user"
msgstr ""
-#: core/views/user.py:573 gym/templates/gym/member_list.html:26
+#: core/views/user.py:589 gym/templates/gym/member_list.html:26
#: gym/views/gym.py:156
msgid "ID"
msgstr ""
-#: core/views/user.py:574 gym/forms.py:94 gym/templates/contract/view.html:55
+#: core/views/user.py:590 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:577 gym/templates/gym/new_user.html:34
+#: core/views/user.py:593 gym/templates/gym/new_user.html:34
#: gym/views/export.py:60 gym/views/gym.py:218
msgid "Gym"
msgstr ""
-#: exercises/models/base.py:51 exercises/templates/exercise/view.html:76
-#: nutrition/models/ingredient.py:204
+#: core/views/user.py:652
+#, python-format
+msgid "A verification email was sent to %(email)s"
+msgstr ""
+
+#: exercises/models/base.py:63 nutrition/models/ingredient.py:204
msgid "Category"
msgstr ""
-#: exercises/models/base.py:58
+#: exercises/models/base.py:70
msgid "Primary muscles"
msgstr ""
-#: exercises/models/base.py:64 exercises/templates/equipment/overview.html:71
-#: exercises/templates/exercise/overview.html:76
-#: exercises/templates/exercise/view.html:268
-#: exercises/templates/muscles/overview.html:77
+#: exercises/models/base.py:76
msgid "Secondary muscles"
msgstr ""
-#: exercises/models/base.py:79
+#: exercises/models/base.py:91
msgid "Variations"
msgstr ""
@@ -1531,369 +1542,190 @@ msgstr ""
msgid "Exercise Categories"
msgstr ""
-#: exercises/models/comment.py:34 exercises/models/exercise_alias.py:32
-#: exercises/models/image.py:75 exercises/models/video.py:82
-#: manager/forms.py:165 manager/helpers.py:89 manager/models/log.py:51
+#: exercises/models/comment.py:37 exercises/models/exercise_alias.py:35
+#: exercises/models/image.py:71 exercises/models/video.py:95
+#: manager/forms.py:176 manager/helpers.py:89 manager/models/log.py:52
msgid "Exercise"
msgstr ""
-#: exercises/models/comment.py:41
+#: exercises/models/comment.py:43
msgid "A comment about how to correctly do this exercise."
msgstr ""
-#: exercises/models/exercise.py:86 nutrition/models/ingredient.py:80
+#: exercises/models/exercise.py:81 nutrition/models/ingredient.py:80
#: nutrition/models/plan.py:61 nutrition/models/weight_unit.py:32
msgid "Language"
msgstr ""
-#: exercises/models/exercise.py:237 exercises/views/exercises.py:461
-msgid "Exercise was successfully added to the general database"
-msgstr ""
-
-#: exercises/models/exercise.py:265
-msgid "New user submitted exercise"
-msgstr ""
-
-#: exercises/models/exercise.py:267
-#, python-brace-format
-msgid "The user {0} submitted a new exercise \"{1}\"."
-msgstr ""
-
-#: exercises/models/exercise_alias.py:35
+#: exercises/models/exercise_alias.py:38
msgid "Alias for an exercise"
msgstr ""
-#: exercises/models/image.py:59
+#: exercises/models/image.py:55
msgid "Line"
msgstr ""
-#: exercises/models/image.py:60
+#: exercises/models/image.py:56
msgid "3D"
msgstr ""
-#: exercises/models/image.py:61
+#: exercises/models/image.py:57
msgid "Low-poly"
msgstr ""
-#: exercises/models/image.py:62
+#: exercises/models/image.py:58
msgid "Photo"
msgstr ""
-#: exercises/models/image.py:63
+#: exercises/models/image.py:59
msgid "Other"
msgstr ""
-#: exercises/models/image.py:81 gallery/models/image.py:56
+#: exercises/models/image.py:77 gallery/models/image.py:56
msgid "Image"
msgstr ""
-#: exercises/models/image.py:82 gallery/models/image.py:57
+#: exercises/models/image.py:78 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:88
+#: exercises/models/image.py:84
msgid "Main picture"
msgstr ""
-#: exercises/models/image.py:91
+#: exercises/models/image.py:87
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: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:186
-#, python-brace-format
-msgid "The user {0} submitted a new image \"{1}\" for exercise {2}."
-msgstr ""
-
-#: exercises/models/muscle.py:37
-msgid "In latin, e.g. \"Pectoralis major\""
-msgstr ""
-
-#: exercises/models/muscle.py:47
-msgid "Alternative name"
-msgstr ""
-
-#: exercises/models/muscle.py:48
-msgid "A more basic name for the muscle"
-msgstr ""
-
-#: exercises/models/video.py:41
-msgid "Maximum file size is 100MB."
-msgstr ""
-
-#: 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 ""
-
-#: exercises/templates/equipment/admin-overview.html:37
-#: exercises/views/equipment.py:94
-msgid "Add new equipment"
-msgstr ""
-
-#: exercises/templates/equipment/overview.html:11
-msgid "Equipment overview"
-msgstr ""
-
-#: exercises/templates/equipment/overview.html:69
-#: exercises/templates/exercise/overview.html:74
-#: exercises/templates/exercise/view.html:264
-#: exercises/templates/muscles/overview.html:75
-msgid "Main muscles"
-msgstr ""
-
-#: exercises/templates/equipment/overview.html:79
-msgid ""
-"No exercises for this equipment. Add or edit an exercise and set the "
-"equipment."
-msgstr ""
-
-#: exercises/templates/equipment/overview.html:96
-#: exercises/templates/exercise/overview.html:99
-#: nutrition/templates/ingredient/overview.html:57
-msgid "Search"
-msgstr ""
-
-#: exercises/templates/equipment/overview.html:101
-#: exercises/templates/exercise/overview.html:104
-msgid "exercise name"
-msgstr ""
-
-#: exercises/templates/equipment/overview.html:115
-#: exercises/templates/exercise/overview.html:118
-#: exercises/templates/muscles/overview.html:118
-#: nutrition/templates/ingredient/overview.html:85
-msgid "Only registered users can do this"
-msgstr ""
-
-#: exercises/templates/exercise/email_new.tpl:1
-#, python-format
-msgid ""
-"Your exercise '%(exercise)s' was successfully added to the general\n"
-"database."
-msgstr ""
-
-#: exercises/templates/exercise/email_new.tpl:4
-msgid ""
-"It is now available on the exercise and muscle overview and can be\n"
-"added to workouts. You can access it on this address:"
-msgstr ""
-
-#: exercises/templates/exercise/email_new.tpl:8
-#: nutrition/templates/ingredient/email_new.tpl:8
-msgid "Thank you for contributing and making this site better!"
-msgstr ""
-
-#: exercises/templates/exercise/email_new.tpl:9
-#: manager/templates/workout/email_reminder.tpl:15
-#: manager/templates/workout/email_weight_reminder.tpl:12
-#: nutrition/templates/ingredient/email_new.tpl:9
-#, python-format
-msgid "The %(site)s team"
-msgstr ""
-
-#: exercises/templates/exercise/form.html:4
-msgid "Submitting an exercise"
-msgstr ""
-
-#: exercises/templates/exercise/form.html:5
-msgid ""
-"Thank you for submitting an exercise. This is much\n"
-"appreciated!"
+"by the system."
msgstr ""
-#: exercises/templates/exercise/form.html:8
-msgid ""
-"After you submit the form, the administrators will be notified.\n"
-"Once it is reviewed, it will be added to the database. Till this happens,\n"
-"it will not be visible in the overview or the search. In case you added your "
-"email\n"
-"when you registered, you will get notified when the process is completed "
-"successfully."
+#: exercises/models/image.py:96
+msgid "The art style of your image"
msgstr ""
-#: exercises/templates/exercise/form_correct.html:4
-msgid "Correcting an exercise"
+#: exercises/models/muscle.py:37
+msgid "In latin, e.g. \"Pectoralis major\""
msgstr ""
-#: exercises/templates/exercise/form_correct.html:5
-msgid ""
-"Thank you for correcting and improving this exercise.\n"
-"This is much appreciated!"
+#: exercises/models/muscle.py:47
+msgid "Alternative name"
msgstr ""
-#: exercises/templates/exercise/form_correct.html:8
-msgid ""
-"After you submit the form, the administrators will be notified.\n"
-"Once the changes are reviewed the exercise will be updated."
+#: exercises/models/muscle.py:48
+msgid "A more basic name for the muscle"
msgstr ""
-#: exercises/templates/exercise/overview.html:88
-msgid "No categories."
+#: exercises/models/video.py:50
+#, python-format
+msgid "Maximum file size is %(size)sMB."
msgstr ""
-#: exercises/templates/exercise/overview.html:88
-msgid "Use link to create one"
+#: exercises/models/video.py:57 exercises/models/video.py:65
+msgid "File type is not supported"
msgstr ""
-#: exercises/templates/exercise/pending.html:14
-#: nutrition/templates/ingredient/pending.html:14
-msgid "Submission date"
+#: exercises/models/video.py:70
+msgid "File is not a valid video"
msgstr ""
-#: 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/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"
+#: exercises/models/video.py:101
+msgid "Main video"
msgstr ""
-#: exercises/templates/exercise/view.html:48
-msgid "Exercise is pending review"
+#: exercises/models/video.py:107
+msgid "Video"
msgstr ""
-#: exercises/templates/exercise/view.html:51
-msgid ""
-"This user submitted exercise is pending a decision to be\n"
-" included in the database."
+#: exercises/models/video.py:114
+msgid "Size"
msgstr ""
-#: exercises/templates/exercise/view.html:53
-msgid "Till then, it will not be shown in the overview or the search."
+#: exercises/models/video.py:121 manager/models/schedule_step.py:56
+msgid "Duration"
msgstr ""
-#: exercises/templates/exercise/view.html:54
-#: nutrition/templates/ingredient/view.html:31
-msgid "Please select one of the options below."
+#: exercises/models/video.py:130
+msgid "Width"
msgstr ""
-#: exercises/templates/exercise/view.html:60
-#: exercises/templates/exercise/view.html:203
-#: nutrition/templates/ingredient/view.html:38
-msgid "Accept"
-msgstr ""
+#: exercises/models/video.py:137
+#, fuzzy
+#| msgid "Height (cm)"
+msgid "Height"
+msgstr "Pituus (cm)"
-#: exercises/templates/exercise/view.html:64
-#: exercises/templates/exercise/view.html:204
-#: nutrition/templates/ingredient/view.html:42
-msgid "Decline"
+#: exercises/models/video.py:144
+msgid "Codec"
msgstr ""
-#: exercises/templates/exercise/view.html:96
-msgid "Images"
+#: exercises/models/video.py:152
+msgid "Codec, long name"
msgstr ""
-#: exercises/templates/exercise/view.html:137 exercises/views/images.py:93
-msgid "Add new image"
+#: exercises/templates/equipment/admin-overview.html:4
+msgid "Equipment list"
msgstr ""
-#: exercises/templates/exercise/view.html:148
-msgid "Videos"
+#: exercises/templates/equipment/admin-overview.html:37
+#: exercises/views/equipment.py:92
+msgid "Add new equipment"
msgstr ""
-#: exercises/templates/exercise/view.html:187 exercises/views/videos.py:94
-msgid "Add new video"
+#: exercises/templates/history/overview.html:11
+msgid "Exercise admin history"
msgstr ""
-#: exercises/templates/exercise/view.html:197
-msgid "Images pending review"
+#: exercises/templates/history/overview.html:27
+#, fuzzy
+#| msgid "Options"
+msgid "Action"
+msgstr "Asetukset"
+
+#: exercises/templates/history/overview.html:28 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/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 ""
-#: exercises/templates/exercise/view.html:218
-msgid "Comments for this exercise"
+#: exercises/templates/history/overview.html:29
+msgid "Object"
msgstr ""
-#: exercises/templates/exercise/view.html:246
-msgid "Add new comment"
+#: exercises/templates/history/overview.html:31
+msgid "Changes"
msgstr ""
-#: exercises/templates/exercise/view.html:260
-msgid "The diagram shows the most used muscles on this exercise"
+#: exercises/templates/history/overview.html:32
+msgid "Revert"
msgstr ""
-#: exercises/templates/exercise/view.html:301
-#: manager/templates/workout/log.html:10 manager/templates/workout/log.html:11
-msgid "Weight log"
+#: exercises/templates/history/overview.html:64
+msgid "View Object"
msgstr ""
-#: exercises/templates/exercise/view.html:306
-msgid "Exercise Variations"
+#: exercises/templates/history/overview.html:75
+msgid "View changes"
msgstr ""
-#: exercises/templates/exercise/view.html:327
-msgid "Submit a correction"
+#: exercises/templates/history/overview.html:86
+msgid "Revert changes"
msgstr ""
#: exercises/templates/muscles/admin-overview.html:4
-#: exercises/templates/muscles/overview.html:7
msgid "Muscle overview"
msgstr ""
#: exercises/templates/muscles/admin-overview.html:36
-#: exercises/views/muscles.py:86
+#: exercises/views/muscles.py:67
msgid "Add muscle"
msgstr ""
-#: exercises/templates/muscles/overview.html:85
-msgid ""
-"No exercises for this muscle. Add or edit an exercise and set the muscle."
-msgstr ""
-
#: exercises/views/categories.py:71
msgid "Add category"
msgstr ""
@@ -1906,50 +1738,19 @@ msgstr ""
msgid "Add exercise comment"
msgstr ""
-#: exercises/views/equipment.py:107 exercises/views/equipment.py:118
+#: exercises/views/equipment.py:105 exercises/views/equipment.py:116
msgid "Delete equipment?"
msgstr ""
-#: exercises/views/exercises.py:229
+#: exercises/views/exercises.py:161
#, python-format
-msgid ""
-"%(name_original)s is too similar to existing exercise \"%(exercise_name)s\""
-msgstr ""
-
-#: exercises/views/exercises.py:247
-msgid "Add exercise"
-msgstr ""
-
-#: exercises/views/exercises.py:367
-msgid "Thank you. Once the changes are reviewed the exercise will be updated."
-msgstr ""
-
-#: exercises/views/exercises.py:380
-#, python-brace-format
-msgid "Correct {0}"
+msgid "%(name)s is too similar to existing exercise \"%(exercise_name)s\""
msgstr ""
-#: exercises/views/exercises.py:422
+#: exercises/views/exercises.py:184
msgid "This will delete the exercise from all workouts."
msgstr ""
-#: exercises/views/exercises.py:474
-msgid "Exercise was successfully marked as rejected"
-msgstr ""
-
-#: exercises/views/images.py:68
-msgid "Edit exercise image"
-msgstr ""
-
-#: exercises/views/images.py:143
-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 ""
@@ -2016,7 +1817,7 @@ msgid "Contract type"
msgstr ""
#: gym/models/contract.py:208 gym/templates/contract/view.html:59
-#: manager/templates/log/add.html:52 nutrition/forms.py:59
+#: manager/templates/log/add.html:52 nutrition/forms.py:60
#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:102
#: nutrition/models/meal_item.py:72
msgid "Amount"
@@ -2117,6 +1918,10 @@ msgstr ""
msgid "User notes"
msgstr ""
+#: gym/templates/contract/list.html:36
+msgid "Show"
+msgstr "Näytä"
+
#: gym/templates/contract/view.html:4
msgid "Contract"
msgstr ""
@@ -2195,10 +2000,6 @@ msgstr ""
msgid "Add member"
msgstr ""
-#: gym/templates/gym/new_user.html:38
-msgid "Date of Birth"
-msgstr ""
-
#: gym/templates/gym/new_user.html:48 manager/templates/calendar/month.html:144
#: manager/templates/log/add.html:75 nutrition/templates/rate/form.html:120
msgid "Info"
@@ -2255,125 +2056,125 @@ msgstr ""
msgid "Edit gym"
msgstr ""
-#: i18n.tpl:2 i18n.tpl:28
+#: i18n.tpl:2
+msgid "Until Failure"
+msgstr ""
+
+#: i18n.tpl:3 manager/forms.py:180 manager/models/log.py:73
+#: manager/templates/set/add.html:53
+msgid "Repetitions"
+msgstr ""
+
+#: i18n.tpl:4
msgid "Abs"
msgstr "Vatsalihakset"
-#: i18n.tpl:3
+#: i18n.tpl:5
msgid "Arms"
msgstr "Kädet"
-#: i18n.tpl:4
-msgid "Back"
-msgstr "Selkä"
-
-#: i18n.tpl:5 i18n.tpl:23
-msgid "Calves"
-msgstr "Pohkeet"
-
-#: i18n.tpl:6 i18n.tpl:26
-msgid "Chest"
-msgstr "Rinta"
-
-#: i18n.tpl:7
+#: i18n.tpl:6
msgid "Legs"
msgstr "Jalat"
-#: i18n.tpl:8 i18n.tpl:19
-msgid "Shoulders"
-msgstr "Hartiat"
+#: i18n.tpl:7
+msgid "Dumbbell"
+msgstr "Käsipaino"
+
+#: i18n.tpl:8
+msgid "Biceps"
+msgstr ""
#: i18n.tpl:9
-msgid "Barbell"
-msgstr "Levytanko"
+msgid "SZ-Bar"
+msgstr ""
#: i18n.tpl:10
-msgid "Bench"
-msgstr ""
+msgid "Kettlebell"
+msgstr "Kahvakuula"
#: i18n.tpl:11
-msgid "Dumbbell"
-msgstr "Käsipaino"
+msgid "Swiss Ball"
+msgstr ""
#: i18n.tpl:12
-msgid "Gym mat"
+msgid "none (bodyweight exercise)"
msgstr ""
#: i18n.tpl:13
-msgid "Incline bench"
-msgstr ""
+msgid "Calves"
+msgstr "Pohkeet"
#: i18n.tpl:14
-msgid "Kettlebell"
-msgstr "Kahvakuula"
+msgid "Back"
+msgstr "Selkä"
#: i18n.tpl:15
-msgid "Pull-up bar"
-msgstr "Leuanvetotanko"
+msgid "Lower back"
+msgstr ""
#: i18n.tpl:16
-msgid "SZ-Bar"
+msgid "Lats"
msgstr ""
#: i18n.tpl:17
-msgid "Swiss Ball"
+msgid "Hamstrings"
msgstr ""
#: i18n.tpl:18
-msgid "none (bodyweight exercise)"
+msgid "Bench"
+msgstr ""
+
+#: i18n.tpl:19
+msgid "Glutes"
msgstr ""
#: i18n.tpl:20
-msgid "Biceps"
+msgid "Kilometers"
msgstr ""
#: i18n.tpl:21
-msgid "Hamstrings"
-msgstr ""
+msgid "Shoulders"
+msgstr "Hartiat"
#: i18n.tpl:22
-msgid "Lower back"
+msgid "Seconds"
msgstr ""
-#: i18n.tpl:24
-msgid "Glutes"
+#: i18n.tpl:23
+msgid "Miles"
msgstr ""
-#: i18n.tpl:25
-msgid "Lats"
+#: i18n.tpl:24
+msgid "Incline bench"
msgstr ""
-#: i18n.tpl:27
+#: i18n.tpl:25
msgid "Quads"
msgstr ""
-#: i18n.tpl:29
-msgid "Triceps"
-msgstr ""
-
-#: i18n.tpl:30
-msgid "Kilometers"
+#: i18n.tpl:26
+msgid "Minutes"
msgstr ""
-#: i18n.tpl:31
-msgid "Miles"
-msgstr ""
+#: i18n.tpl:27
+msgid "Chest"
+msgstr "Rinta"
-#: i18n.tpl:32
-msgid "Minutes"
+#: i18n.tpl:28
+msgid "Gym mat"
msgstr ""
-#: i18n.tpl:33 manager/forms.py:169 manager/models/log.py:71
-#: manager/templates/set/add.html:53
-msgid "Repetitions"
-msgstr ""
+#: i18n.tpl:29
+msgid "Pull-up bar"
+msgstr "Leuanvetotanko"
-#: i18n.tpl:34
-msgid "Seconds"
-msgstr ""
+#: i18n.tpl:30
+msgid "Barbell"
+msgstr "Levytanko"
-#: i18n.tpl:35
-msgid "Until Failure"
+#: i18n.tpl:31
+msgid "Triceps"
msgstr ""
#: mailer/forms.py:34 mailer/templates/mailer/gym/preview.html:32
@@ -2427,44 +2228,44 @@ msgstr ""
msgid "Correction"
msgstr ""
-#: manager/forms.py:89 manager/models/workout.py:59
+#: manager/forms.py:92 manager/models/workout.py:59
msgid "The name of the workout"
msgstr ""
-#: manager/forms.py:93 manager/models/workout.py:66
+#: manager/forms.py:96 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
+#: manager/forms.py:137
msgid ""
"You can search for more than one exercise, they will be grouped together for "
"a superset."
msgstr ""
-#: 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
+#: manager/forms.py:166 manager/forms.py:171 manager/models/log.py:64
+#: manager/models/log.py:92 manager/models/setting.py:59
+#: manager/models/setting.py:90 manager/templates/log/add.html:53
+#: manager/templates/log/add.html:55 manager/templates/set/formset.html:10
+#: manager/templates/set/formset.html:12 measurements/models/category.py:58
+#: nutrition/forms.py:64
msgid "Unit"
msgstr ""
-#: manager/forms.py:266
+#: manager/forms.py:277
msgid "Type"
msgstr ""
-#: manager/forms.py:267 manager/templates/workout/view.html:157
+#: manager/forms.py:278 manager/templates/workout/view.html:157
msgid "Table"
msgstr ""
-#: manager/forms.py:269 manager/templates/workout/view.html:163
+#: manager/forms.py:280 manager/templates/workout/view.html:163
msgid "with images"
msgstr ""
-#: manager/forms.py:270 manager/templates/workout/view.html:169
+#: manager/forms.py:281 manager/templates/workout/view.html:169
msgid "with comments"
msgstr ""
@@ -2516,7 +2317,7 @@ msgid "The duration in weeks"
msgstr ""
#: manager/models/schedule_step.py:63 manager/models/set.py:52
-#: manager/models/setting.py:98 nutrition/models/meal.py:54
+#: manager/models/setting.py:110 nutrition/models/meal.py:54
#: nutrition/models/meal_item.py:65
msgid "Order"
msgstr ""
@@ -2567,7 +2368,7 @@ msgstr ""
msgid "Number of sets"
msgstr "Sarjojen määrä"
-#: manager/models/setting.py:43
+#: manager/models/setting.py:48
msgid "Sets"
msgstr "Sarjat"
@@ -2822,6 +2623,13 @@ msgid ""
"option in your settings."
msgstr ""
+#: manager/templates/workout/email_reminder.tpl:15
+#: manager/templates/workout/email_weight_reminder.tpl:12
+#: nutrition/templates/ingredient/email_new.tpl:9
+#, python-format
+msgid "The %(site)s team"
+msgstr ""
+
#: manager/templates/workout/email_weight_reminder.tpl:3
#, python-format
msgid ""
@@ -2834,6 +2642,10 @@ msgid ""
"You will regularly receive such reminders till you enter your current weight."
msgstr ""
+#: manager/templates/workout/log.html:10 manager/templates/workout/log.html:11
+msgid "Weight log"
+msgstr ""
+
#: manager/templates/workout/log.html:29
msgid "Weight log for workout"
msgstr ""
@@ -2934,7 +2746,7 @@ msgstr ""
msgid "Edit workout"
msgstr ""
-#: manager/templates/workout/view.html:225 manager/views/workout.py:300
+#: manager/templates/workout/view.html:225 manager/views/workout.py:301
msgid "Mark as template"
msgstr ""
@@ -2942,11 +2754,6 @@ msgstr ""
msgid "Add workout day"
msgstr ""
-#: manager/views/log.py:92
-#, python-format
-msgid "Edit log entry for %s"
-msgstr ""
-
#: manager/views/log.py:111
msgid "Delete workout log"
msgstr ""
@@ -2964,11 +2771,11 @@ msgstr ""
msgid "Your workouts"
msgstr ""
-#: manager/views/workout.py:227
+#: manager/views/workout.py:228
msgid "Copy workout"
msgstr ""
-#: manager/views/workout.py:230
+#: manager/views/workout.py:231
msgid "Copy"
msgstr ""
@@ -2990,29 +2797,29 @@ msgstr ""
msgid "Value"
msgstr ""
-#: nutrition/forms.py:122
+#: nutrition/forms.py:123
msgid "Calculate"
msgstr ""
-#: nutrition/forms.py:195 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:196 nutrition/templates/rate/form.html:76
msgid "Basic caloric intake"
msgstr ""
-#: nutrition/forms.py:196
+#: nutrition/forms.py:197
msgid "Your basic caloric intake as calculated for your data"
msgstr ""
-#: nutrition/forms.py:202
+#: nutrition/forms.py:203
msgid "Additional calories"
msgstr ""
-#: nutrition/forms.py:204
+#: nutrition/forms.py:205
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
msgstr ""
-#: nutrition/forms.py:232 nutrition/models/ingredient_weight_unit.py:39
+#: nutrition/forms.py:233 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"
@@ -3075,7 +2882,7 @@ msgid ""
"{energy_approx}%)"
msgstr ""
-#: nutrition/models/ingredient.py:357 nutrition/views/ingredient.py:225
+#: nutrition/models/ingredient.py:357 nutrition/views/ingredient.py:219
msgid "Ingredient was successfully added to the general database"
msgstr ""
@@ -3104,6 +2911,10 @@ msgstr ""
msgid "Meal"
msgstr ""
+#: nutrition/models/log.py:65
+msgid "Date and Time (Approx.)"
+msgstr ""
+
#: nutrition/models/meal.py:61
msgid "Time (approx)"
msgstr ""
@@ -3199,6 +3010,10 @@ msgid ""
"added to nutrition plans. You can access it on this address:"
msgstr ""
+#: nutrition/templates/ingredient/email_new.tpl:8
+msgid "Thank you for contributing and making this site better!"
+msgstr ""
+
#: nutrition/templates/ingredient/form.html:4
msgid "Submitting an ingredient"
msgstr ""
@@ -3223,6 +3038,10 @@ msgstr ""
msgid "No ingredients."
msgstr ""
+#: nutrition/templates/ingredient/overview.html:57
+msgid "Search"
+msgstr ""
+
#: nutrition/templates/ingredient/overview.html:66
msgid "ingredient name"
msgstr ""
@@ -3232,6 +3051,14 @@ msgstr ""
msgid "Add ingredient"
msgstr ""
+#: nutrition/templates/ingredient/overview.html:85
+msgid "Only registered users can do this"
+msgstr ""
+
+#: nutrition/templates/ingredient/pending.html:14
+msgid "Submission date"
+msgstr ""
+
#: nutrition/templates/ingredient/view.html:27
msgid "Ingredient is pending review"
msgstr ""
@@ -3244,6 +3071,18 @@ msgid ""
"the search."
msgstr ""
+#: nutrition/templates/ingredient/view.html:31
+msgid "Please select one of the options below."
+msgstr ""
+
+#: nutrition/templates/ingredient/view.html:38
+msgid "Accept"
+msgstr ""
+
+#: nutrition/templates/ingredient/view.html:42
+msgid "Decline"
+msgstr ""
+
#: nutrition/templates/ingredient/view.html:71
#: nutrition/templates/log/detail.html:31
#: nutrition/templates/plan/view.html:229 nutrition/views/plan.py:376
@@ -3484,14 +3323,18 @@ msgid ""
"yourself for some weeks and change the total amount if needed."
msgstr ""
-#: nutrition/views/ingredient.py:181
+#: nutrition/views/ingredient.py:175
msgid "Add a new ingredient"
msgstr ""
-#: nutrition/views/ingredient.py:238
+#: nutrition/views/ingredient.py:232
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 ""
@@ -3706,29 +3549,29 @@ msgstr ""
msgid "100%% Free <br>and <br>Open Source"
msgstr ""
-#: utils/generic_views.py:261
+#: utils/generic_views.py:262
msgid "Yes, delete"
msgstr ""
-#: utils/models.py:47
+#: utils/models.py:48
msgid "Author"
msgstr ""
-#: utils/models.py:52
+#: utils/models.py:53
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:77
+#: utils/models.py:78
msgid "Pending"
msgstr ""
-#: utils/models.py:78
+#: utils/models.py:79
msgid "Accepted"
msgstr ""
-#: utils/models.py:79
+#: utils/models.py:80
msgid "Declined"
msgstr ""
@@ -3869,6 +3712,25 @@ msgstr ""
msgid "Delete weight entry for the %s"
msgstr ""
+#~ msgid "Ingredients"
+#~ msgstr "Raaka-aineet"
+
+#~ msgid ""
+#~ "Use the configuration to select in what languages the\n"
+#~ "exercises and ingredients will be shown for the current language (for "
+#~ "example\n"
+#~ "the exercises should be shown in languages A, B and C; the ingredients "
+#~ "only\n"
+#~ "in A)."
+#~ msgstr ""
+#~ "Käytä asetuksia valitaksesi millä kielillä\n"
+#~ "harjoitukset ja raaka-aineet näytetään nykyisellä kieli-asetuksella.\n"
+#~ "(Esimerkiksi harjoitukset näytetään kielillä A, B ja C; raaka-aineet vain "
+#~ "kielellä A)."
+
+#~ msgid "New user submitted image"
+#~ msgstr "Uusi käyttäjän lisäämä kuva"
+
#, fuzzy
#~| msgid "Reps"
#~ msgid "Max Reps"
diff --git a/wger/locale/fr/LC_MESSAGES/django.po b/wger/locale/fr/LC_MESSAGES/django.po
index af1a5964b..4bfda5554 100644
--- a/wger/locale/fr/LC_MESSAGES/django.po
+++ b/wger/locale/fr/LC_MESSAGES/django.po
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: wger Workout Manager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-14 12:01+0200\n"
+"POT-Creation-Date: 2022-11-10 16:03+0100\n"
"PO-Revision-Date: 2022-08-24 21:17+0000\n"
"Last-Translator: MrSniikyz <[email protected]>\n"
"Language-Team: French <https://hosted.weblate.org/projects/wger/web/fr/>\n"
@@ -45,106 +45,8 @@ msgstr ""
"assigner à chaque utilisateur non enregistré ainsi qu'aux utilisateurs sans "
"activités."
-#: 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 "Exercices"
-
-#: config/models/language_config.py:42
-msgid "Ingredients"
-msgstr "Ingrédients"
-
-#: config/templates/language/overview.html:4 core/templates/navigation.html:226
-msgid "Languages"
-msgstr "Langues"
-
-#: config/templates/language/overview.html:16
-msgid "Nothing found."
-msgstr "Rien trouvé."
-
-#: 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:150
-#: nutrition/templates/plan/view.html:153
-#: nutrition/templates/plan/view.html:191
-msgid "Add one now."
-msgstr "En ajouter une."
-
-#: config/templates/language/overview.html:29
-#: core/templates/license/list.html:38 core/templates/misc/license/list.html:41
-#: core/templates/repetition_unit/list.html:41
-#: core/templates/user/overview.html:327 core/templates/user/overview.html:366
-#: core/templates/user/overview.html:402
-#: core/templates/weight_unit/list.html:41 core/views/languages.py:73
-#: core/views/license.py:65 core/views/repetition_units.py:65
-#: core/views/weight_units.py:65
-#: exercises/templates/categories/admin-overview.html:36
-#: 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:61
-msgid "Add"
-msgstr "Ajouter"
-
-#: config/templates/language/view.html:21 core/models/language.py:29
-msgid "Language short name"
-msgstr "Nom court de la langue"
-
-#: config/templates/language/view.html:22
-#: config/templates/language/view.html:43 core/models/language.py:32
-msgid "Language full name"
-msgstr "Nom complet de la langue"
-
-#: config/templates/language/view.html:34 core/templates/user/overview.html:451
-#: gym/views/admin_config.py:44 gym/views/admin_config.py:58
-#: gym/views/user_config.py:46
-msgid "Configuration"
-msgstr "Configuration"
-
-#: config/templates/language/view.html:35
-msgid ""
-"Use the configuration to select in what languages the\n"
-"exercises and ingredients will be shown for the current language (for "
-"example\n"
-"the exercises should be shown in languages A, B and C; the ingredients only\n"
-"in A)."
-msgstr ""
-"Utiliser la configuration pour sélectionner dans quelles langues\n"
-"les exercices et les ingrédients seront affichés (par exemple\n"
-"les exercices seront affichés dans la langues A, B et C ; les ingrédients\n"
-"seulement en A)."
-
-#: config/templates/language/view.html:44 gym/templates/contract/list.html:36
-msgid "Show"
-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: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:45
-msgid "Options"
-msgstr "Options"
-
-#: config/templates/language/view.html:96 config/views/gym_config.py:41
-#: config/views/language_config.py:49 core/templates/license/list.html:16
-#: core/templates/misc/license/list.html:17
+#: config/views/gym_config.py:41 core/templates/language/view.html:57
+#: 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:39
#: core/templates/tags/render_day.html:75 core/templates/user/overview.html:205
@@ -152,12 +54,10 @@ 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:230
-#: exercises/templates/exercise/view.html:351
#: exercises/templates/muscles/admin-overview.html:16
-#: 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
+#: 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
#: 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
@@ -173,81 +73,54 @@ msgstr "Options"
msgid "Edit"
msgstr "Modifier"
-#: 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: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: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
-#: gym/templates/contract_type/list.html:39 gym/templates/document/list.html:46
-#: gym/templates/gym/list.html:20 manager/templates/calendar/day.html:69
-#: 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:231
-#: 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:132
-#: nutrition/templates/units/list.html:20
-msgid "Delete"
-msgstr "Supprimer"
-
-#: core/demo.py:86
+#: core/demo.py:95
msgid "Sample workout"
msgstr "Exemple de séance"
-#: core/demo.py:90
+#: core/demo.py:99
msgid "Sample day"
msgstr "Exemple de jour"
-#: core/demo.py:94
+#: core/demo.py:103
msgid "Another sample day"
msgstr "Autre exemple de jour"
-#: core/demo.py:217
-msgid "Sample nutrional plan"
+#: core/demo.py:211
+#, fuzzy
+#| msgid "Sample nutrional plan"
+msgid "Sample nutritional plan"
msgstr "Exemple de plan de nutrition"
-#: core/demo.py:349 core/demo.py:351 core/demo.py:353
+#: core/demo.py:343 core/demo.py:345 core/demo.py:347
#, python-brace-format
msgid "Placeholder workout nr {0} for schedule"
msgstr "Séance d'exemple n° {0} pour programmation"
-#: core/demo.py:358
+#: core/demo.py:352
msgid "My cool workout schedule"
msgstr "Mon programme d’entraînement"
-#: core/demo.py:397 core/demo.py:412
+#: core/demo.py:391 core/demo.py:406
msgid "Empty placeholder schedule"
msgstr "Programme vide de démonstration"
-#: core/forms.py:61 core/templates/navigation.html:188
-#: core/templates/navigation.html:192 core/templates/user/login.html:4
+#: core/forms.py:64 core/templates/navigation.html:179
+#: core/templates/navigation.html:183 core/templates/user/login.html:4
#: software/templates/features.html:43
msgid "Login"
msgstr "Se connecter"
-#: core/forms.py:73 core/forms.py:164 gym/views/export.py:63
+#: core/forms.py:76 core/forms.py:177 gym/views/export.py:63
#: gym/views/gym.py:218
msgid "First name"
msgstr "Prénom"
-#: core/forms.py:74 core/forms.py:165 core/templates/user/overview.html:267
+#: core/forms.py:77 core/forms.py:178 core/templates/user/overview.html:267
#: gym/views/export.py:64 gym/views/gym.py:218
msgid "Last name"
msgstr "Nom"
-#: core/forms.py:76 core/forms.py:131 core/templates/user/overview.html:271
+#: core/forms.py:79 core/forms.py:144 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
@@ -257,79 +130,109 @@ msgstr "Nom"
msgid "Email"
msgstr "Courriel"
-#: core/forms.py:77
+#: core/forms.py:80
msgid "Used for password resets and, optionally, e-mail reminders."
msgstr ""
"Utilisé pour réinitialiser votre mot de passe et, optionnellement, vous "
"envoyer des rappels par courriel."
-#: core/forms.py:102
+#: core/forms.py:84 core/models/profile.py:220
+#: gym/templates/gym/new_user.html:38
+msgid "Date of Birth"
+msgstr "Date de naissance"
+
+#: core/forms.py:116
msgid "Personal data"
msgstr "Données personnelles"
-#: core/forms.py:110
+#: core/forms.py:124
msgid "Workout reminders"
msgstr "Rappels d’entraînement"
-#: core/forms.py:117
+#: core/forms.py:131
msgid "Other settings"
msgstr "Autres paramètres"
-#: 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
+#: core/forms.py:138 core/views/user.py:615 core/views/user.py:630
+#: core/views/user.py:642 gym/forms.py:72 manager/templates/log/add.html:65
+#: manager/templates/set/add.html:69 manager/views/workout.py:222
+#: utils/generic_views.py:143
msgid "Save"
msgstr "Sauvegarder"
-#: core/forms.py:132
+#: core/forms.py:145
msgid "Used for password resets and, optionally, email reminders."
msgstr ""
"Utilisé pour réinitialiser votre mot de passe et, optionnellement, vous "
"envoyer des rappels par courriel."
-#: core/forms.py:160
+#: core/forms.py:173
msgid "This e-mail address is already in use."
msgstr "Cette adresse courriel est déjà utilisée."
-#: core/forms.py:180 gym/templates/gym/new_user.html:26
+#: core/forms.py:193 gym/templates/gym/new_user.html:26
#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:218
msgid "Password"
msgstr "Mot de passe"
-#: core/forms.py:182
+#: core/forms.py:195
msgid "Please enter your current password."
msgstr "Veuillez entrer votre mot de passe actuel."
-#: core/forms.py:200
+#: core/forms.py:204 core/templates/language/view.html:62
+#: 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: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/muscles/admin-overview.html:17
+#: gym/templates/admin_notes/list.html:40
+#: gym/templates/contract_option/list.html:39
+#: gym/templates/contract_type/list.html:39 gym/templates/document/list.html:46
+#: gym/templates/gym/list.html:20 manager/templates/calendar/day.html:69
+#: 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:231
+#: 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:132
+#: nutrition/templates/units/list.html:20
+msgid "Delete"
+msgstr "Supprimer"
+
+#: core/forms.py:213
msgid "Invalid password"
msgstr "Mot de passe invalide"
-#: core/forms.py:212 core/forms.py:278
+#: core/forms.py:225 core/forms.py:291
msgid "The form is secured with reCAPTCHA"
msgstr "Le formulaire est sécurisé avec reCAPTCHA"
-#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:188
-#: core/templates/navigation.html:193 core/templates/template.html:149
-#: core/templates/user/login.html:20 core/views/user.py:293
+#: core/forms.py:239 core/forms.py:258 core/templates/navigation.html:179
+#: core/templates/navigation.html:184 core/templates/template.html:149
+#: core/templates/user/login.html:20 core/views/user.py:300
#: software/templates/features.html:38
msgid "Register"
msgstr "S’inscrire"
-#: core/forms.py:256
+#: core/forms.py:269
msgid "Contact"
msgstr "Contact"
-#: core/forms.py:257
+#: core/forms.py:270
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:71
+#: core/forms.py:278 exercises/models/comment.py:42 manager/models/set.py:60
+#: manager/models/setting.py:111 nutrition/models/log.py:71
msgid "Comment"
msgstr "Commentaire"
-#: core/forms.py:266
+#: core/forms.py:279
msgid "What do you want to say?"
msgstr "Que voulez-vous nous dire ?"
@@ -337,6 +240,14 @@ msgstr "Que voulez-vous nous dire ?"
msgid "Day of the week"
msgstr "Jour de la semaine"
+#: core/models/language.py:31 core/templates/language/view.html:21
+msgid "Language short name"
+msgstr "Nom court de la langue"
+
+#: core/models/language.py:36 core/templates/language/view.html:22
+msgid "Language full name"
+msgstr "Nom complet de la langue"
+
#: core/models/license.py:29
msgid "Full name"
msgstr "Nom complet"
@@ -394,19 +305,19 @@ msgstr "Métrique (kilogramme)"
msgid "Imperial (pound)"
msgstr "Impérial (livre)"
-#: core/models/profile.py:111
+#: core/models/profile.py:114
msgid "Show exercise comments"
msgstr "Afficher les commentaires"
-#: core/models/profile.py:112
+#: core/models/profile.py:115
msgid "Check to show exercise comments on the workout view"
msgstr "Cochez pour montrer les commentaires sur la vue des séances"
-#: core/models/profile.py:123
+#: core/models/profile.py:126
msgid "Also use ingredients in English"
msgstr "Afficher les ingrédients en anglais"
-#: core/models/profile.py:125
+#: core/models/profile.py:128
msgid ""
"Check to also show ingredients in English while creating\n"
"a nutritional plan. These ingredients are extracted from a list provided\n"
@@ -421,11 +332,11 @@ msgstr ""
"avec près de 7 000 entrées, mais ceci peut être trop et rendre la recherche "
"difficile."
-#: core/models/profile.py:134
+#: core/models/profile.py:137
msgid "Activate workout reminders"
msgstr "Activer le rappel de séance"
-#: core/models/profile.py:136
+#: core/models/profile.py:139
msgid ""
"Check to activate automatic reminders for workouts. You need to provide a "
"valid email for this to work."
@@ -433,21 +344,21 @@ msgstr ""
"Cliquez pour activer les rappels automatiques des entraînements. Vous devez "
"fournir une adresse courriel valide pour que ceci fonctionne."
-#: core/models/profile.py:145
+#: core/models/profile.py:148
msgid "Remind before expiration"
msgstr "Rappeler avant l’expiration"
-#: core/models/profile.py:146
+#: core/models/profile.py:149
msgid "The number of days you want to be reminded before a workout expires."
msgstr ""
"Le nombre de jours avant l’expiration d’une séance d’entraînement pour "
"l’envoi d’un rappel."
-#: core/models/profile.py:152
+#: core/models/profile.py:155
msgid "Default duration of workouts"
msgstr "Durée par défaut des entraînements"
-#: core/models/profile.py:154
+#: core/models/profile.py:157
msgid ""
"Default duration in weeks of workouts not in a schedule. Used for email "
"workout reminders."
@@ -455,11 +366,11 @@ msgstr ""
"La durée par défaut en semaine des séances, pas dans un calendrier. Utilisé "
"pour les rappels de séance par courriel."
-#: core/models/profile.py:171
+#: core/models/profile.py:174
msgid "Notification language"
msgstr "Langue de notification"
-#: core/models/profile.py:173
+#: core/models/profile.py:176
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."
@@ -467,70 +378,70 @@ msgstr ""
"Langue à utiliser lors de l’envoi de courriels de notification, par ex. les "
"rappels de séance. Ceci n’affecte pas la langue utilisée sur le site."
-#: core/models/profile.py:186 gym/views/export.py:66
+#: core/models/profile.py:212 gym/views/export.py:66
msgid "Age"
msgstr "Âge"
-#: core/models/profile.py:202 nutrition/forms.py:99
+#: core/models/profile.py:228 nutrition/forms.py:100
msgid "Height (cm)"
msgstr "Taille (cm)"
-#: core/models/profile.py:219
+#: core/models/profile.py:245
msgid "Hours of sleep"
msgstr "Heures de sommeil"
-#: core/models/profile.py:220
+#: core/models/profile.py:246
msgid "The average hours of sleep per day"
msgstr "Le nombre d'heure moyen de sommeil par jour"
-#: core/models/profile.py:229
+#: core/models/profile.py:255
msgid "Work"
msgstr "Travail"
-#: core/models/profile.py:230 core/models/profile.py:272
+#: core/models/profile.py:256 core/models/profile.py:298
msgid "Average hours per day"
msgstr "Nombre d’heures moyen par jour"
-#: core/models/profile.py:239 core/models/profile.py:260
-#: core/models/profile.py:281
+#: core/models/profile.py:265 core/models/profile.py:286
+#: core/models/profile.py:307
msgid "Physical intensity"
msgstr "Intensité physique"
-#: core/models/profile.py:240 core/models/profile.py:261
-#: core/models/profile.py:282
+#: core/models/profile.py:266 core/models/profile.py:287
+#: core/models/profile.py:308
msgid "Approximately"
msgstr "Environs"
-#: core/models/profile.py:250
+#: core/models/profile.py:276
msgid "Sport"
msgstr "Sport"
-#: core/models/profile.py:251
+#: core/models/profile.py:277
msgid "Average hours per week"
msgstr "Heures par semaine (moy.)"
-#: core/models/profile.py:271
+#: core/models/profile.py:297
msgid "Free time"
msgstr "Temps libre"
-#: core/models/profile.py:292 nutrition/templates/rate/form.html:66
+#: core/models/profile.py:318 nutrition/templates/rate/form.html:66
msgid "Total daily calories"
msgstr "Nombre total de calories par jour"
-#: core/models/profile.py:293
+#: core/models/profile.py:319
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
+#: core/models/profile.py:331 nutrition/models/ingredient_weight_unit.py:45
#: nutrition/models/log.py:90 nutrition/models/meal_item.py:58
msgid "Weight unit"
msgstr "Unité de poids"
-#: core/models/profile.py:313
+#: core/models/profile.py:339
msgid "Allow external access"
msgstr "Autoriser les accès extérieurs"
-#: core/models/profile.py:315
+#: core/models/profile.py:341
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."
@@ -539,25 +450,24 @@ msgstr ""
"en mode lecture seule. Vous devez activer cette option avant de pouvoir "
"partager des liens e.g. sur les réseaux sociaux."
-#: core/models/profile.py:324
+#: core/models/profile.py:350
msgid "Automatic reminders for weight entries"
msgstr "Sauvegarder les poids entrés"
-#: core/models/profile.py:326
+#: core/models/profile.py:352
msgid "Number of days after the last weight entry (enter 0 to deactivate)"
msgstr ""
"Durée en jour de la sauvegarde à partir de la dernière entrée de poids "
"(mettre 0 pour désactiver)"
-#: core/models/profile.py:392
+#: core/models/profile.py:418
msgid "The sum of all hours has to be 24"
msgstr "La somme des heures doit être de 24"
#: core/models/rep_unit.py:35 core/models/weight_unit.py:35
-#: core/templates/user/overview.html:263 core/views/user.py:575
+#: core/templates/user/overview.html:263 core/views/user.py:591
#: 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
+#: exercises/models/exercise.py:64 exercises/models/muscle.py:36
#: 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
@@ -620,6 +530,53 @@ msgstr "Partager"
msgid "Are you sure you want to delete this? This action cannot be undone."
msgstr "Êtes-vous sûr·e de vouloir supprimer ceci ? C’est irréversible."
+#: core/templates/email_verification/confirm_template.html:4
+msgid "Email verified"
+msgstr ""
+
+#: core/templates/email_verification/confirm_template.html:18
+#, python-format
+msgid "%(username)s, your email was verified"
+msgstr ""
+
+#: core/templates/email_verification/confirm_template.html:22
+msgid "Error, invalid verification token"
+msgstr ""
+
+#: core/templates/email_verification/email_body_html.tpl:6
+#, fuzzy
+#| msgid "Configuration"
+msgid "Email Confirmation"
+msgstr "Configuration"
+
+#: core/templates/email_verification/email_body_html.tpl:9
+#: core/templates/email_verification/email_body_txt.tpl:3
+#, fuzzy, python-format
+#| msgid "Calendar for %(username)s"
+msgid "You are almost there, %(username)s!"
+msgstr "Calendrier pour %(username)s"
+
+#: core/templates/email_verification/email_body_html.tpl:11
+#, python-format
+msgid "Please click <a href=\"%(link)s\">here</a> to confirm your email"
+msgstr ""
+
+#: core/templates/email_verification/email_body_html.tpl:12
+#: core/templates/email_verification/email_body_txt.tpl:5
+#, python-format
+msgid "The token expires on %(time)s"
+msgstr ""
+
+#: core/templates/email_verification/email_body_html.tpl:14
+#: core/templates/email_verification/email_body_txt.tpl:8
+msgid "the wger Team"
+msgstr ""
+
+#: core/templates/email_verification/email_body_txt.tpl:4
+#, python-format
+msgid "Please click the following link to confirm your email: %(link)s"
+msgstr ""
+
#: core/templates/index.html:4
msgid "Dashboard"
msgstr "Tableau de bord"
@@ -679,7 +636,7 @@ msgid "Add custom diary entry"
msgstr "Ajouter item personnalisé dans le journal"
#: core/templates/index.html:84 core/templates/index.html:92
-#: manager/models/day.py:34 manager/models/log.py:56
+#: manager/models/day.py:34 manager/models/log.py:58
#: manager/models/session.py:60 manager/models/workout.py:109
#: manager/templates/schedule/view.html:105
#: manager/templates/workout/view.html:11
@@ -712,6 +669,20 @@ msgstr "Ajouter un journal"
msgid "No workouts found."
msgstr "Pas de séance trouvée."
+#: core/templates/index.html:137 core/templates/index.html:189
+#: core/templates/language/overview.html:23
+#: 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:150
+#: nutrition/templates/plan/view.html:153
+#: nutrition/templates/plan/view.html:191
+msgid "Add one now."
+msgstr "En ajouter une."
+
#: 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
@@ -765,19 +736,59 @@ msgid "No nutrition plans."
msgstr "Aucun plan de nutrition."
#: 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
+#: core/templates/user/overview.html:121 manager/forms.py:184
+#: manager/helpers.py:89 manager/models/log.py:86 manager/models/setting.py:79
+#: manager/templates/log/add.html:54 manager/templates/set/formset.html:11
#: weight/models.py:34 weight/templates/import_csv_preview.html:14
#: weight/templates/import_csv_preview.html:43 weight/views.py:150
msgid "Weight"
msgstr "Poids"
-#: core/templates/index.html:210 core/templates/navigation.html:135
+#: core/templates/index.html:210 core/templates/navigation.html:126
#: weight/views.py:70
msgid "Add weight entry"
msgstr "Ajouter une entrée"
+#: core/templates/language/overview.html:4 core/templates/navigation.html:217
+msgid "Languages"
+msgstr "Langues"
+
+#: core/templates/language/overview.html:23
+msgid "Nothing found."
+msgstr "Rien trouvé."
+
+#: core/templates/language/overview.html:36 core/templates/license/list.html:38
+#: core/templates/misc/license/list.html:41
+#: core/templates/repetition_unit/list.html:41
+#: core/templates/user/overview.html:327 core/templates/user/overview.html:366
+#: core/templates/user/overview.html:402
+#: core/templates/weight_unit/list.html:41 core/views/languages.py:73
+#: core/views/license.py:65 core/views/repetition_units.py:65
+#: core/views/weight_units.py:65
+#: exercises/templates/categories/admin-overview.html:36
+#: 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:61
+msgid "Add"
+msgstr "Ajouter"
+
+#: core/templates/language/view.html:52 core/templates/user/api_key.html:44
+#: core/templates/user/preferences.html:44 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:45
+msgid "Options"
+msgstr "Options"
+
#: core/templates/license/list.html:4 core/templates/misc/license/list.html:4
msgid "License list"
msgstr "Liste des licences"
@@ -790,7 +801,6 @@ msgstr "Liste des licences"
#: core/templates/weight_unit/list.html:26
#: exercises/templates/categories/admin-overview.html:24
#: exercises/templates/equipment/admin-overview.html:24
-#: exercises/templates/exercise/pending.html:30
#: exercises/templates/muscles/admin-overview.html:24
#: gym/templates/admin_notes/list.html:52 gym/templates/contract/list.html:60
#: gym/templates/contract_option/list.html:56
@@ -872,155 +882,135 @@ msgstr "Vos modèles"
msgid "Public templates"
msgstr "Modèles publics"
-#: core/templates/navigation.html:64
-msgctxt "as in sorted by category"
-msgid "by category"
-msgstr "Par catégorie"
-
-#: core/templates/navigation.html:65
-msgctxt "as in sorted by muscle"
-msgid "by muscle"
-msgstr "par muscle"
-
-#: core/templates/navigation.html:66
-msgctxt "as in sorted by equipment"
-msgid "by equipment"
-msgstr "par équipement"
+#: core/templates/navigation.html:63 manager/forms.py:133
+#: manager/models/setting.py:54
+msgid "Exercises"
+msgstr "Exercices"
-#: core/templates/navigation.html:70
-#: exercises/templates/equipment/overview.html:109
-#: exercises/templates/equipment/overview.html:113
-#: exercises/templates/exercise/overview.html:112
-#: exercises/templates/exercise/overview.html:116
-#: exercises/templates/muscles/overview.html:112
-#: exercises/templates/muscles/overview.html:116
-msgid "Add new exercise"
-msgstr "Ajouter nouvel exercice"
-
-#: core/templates/navigation.html:75 core/templates/navigation.html:116
-#: core/templates/navigation.html:224
+#: core/templates/navigation.html:67 core/templates/navigation.html:107
+#: core/templates/navigation.html:215
msgid "Administration"
msgstr "Administration"
-#: core/templates/navigation.html:76
-#: exercises/templates/exercise/pending.html:6
-msgid "Exercises pending review"
-msgstr "L'exercice est en attente de relecture"
+#: core/templates/navigation.html:68
+#, fuzzy
+#| msgid "Exercise day"
+msgid "Exercise edit history"
+msgstr "Jour d'exercice"
-#: core/templates/navigation.html:77 exercises/models/base.py:72
-#: exercises/templates/exercise/view.html:80
+#: core/templates/navigation.html:69 exercises/models/base.py:84
msgid "Equipment"
msgstr "Équipement"
-#: core/templates/navigation.html:78 exercises/templates/exercise/view.html:258
+#: core/templates/navigation.html:70
msgid "Muscles"
msgstr "Muscles"
-#: core/templates/navigation.html:79
+#: core/templates/navigation.html:71
#: exercises/templates/categories/admin-overview.html:4
msgid "Categories"
msgstr "Catégories"
-#: core/templates/navigation.html:93 software/templates/features.html:87
+#: core/templates/navigation.html:84 software/templates/features.html:87
msgid "Nutrition"
msgstr "Nutrition"
-#: core/templates/navigation.html:99 core/templates/user/overview.html:144
+#: core/templates/navigation.html:90 core/templates/user/overview.html:144
msgid "Nutrition plans"
msgstr "Plans de nutrition"
-#: core/templates/navigation.html:105 nutrition/templates/bmi/form.html:50
+#: core/templates/navigation.html:96 nutrition/templates/bmi/form.html:50
msgid "BMI calculator"
msgstr "Calculateur d’IMC"
-#: core/templates/navigation.html:111 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:102 nutrition/templates/rate/form.html:17
msgid "Daily calories calculator"
msgstr "Calculateur de calories quotidiennes"
-#: core/templates/navigation.html:113
+#: core/templates/navigation.html:104
#: nutrition/templates/ingredient/overview.html:29
msgid "Ingredient overview"
msgstr "Aperçu ingrédients"
-#: core/templates/navigation.html:117 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:108 nutrition/templates/units/list.html:6
msgid "Ingredient weight units"
msgstr "Unité de poids des ingrédients"
-#: core/templates/navigation.html:118
+#: core/templates/navigation.html:109
#: nutrition/templates/ingredient/pending.html:6
msgid "Ingredients pending review"
msgstr "Ingrédients en attente d'examen"
-#: core/templates/navigation.html:132
+#: core/templates/navigation.html:123
msgid "Body weight"
msgstr "Poids corporel"
-#: core/templates/navigation.html:134 core/templates/user/overview.html:114
+#: core/templates/navigation.html:125 core/templates/user/overview.html:114
#: weight/templates/overview.html:7
msgid "Weight overview"
msgstr "Aperçu poids"
-#: core/templates/navigation.html:147
+#: core/templates/navigation.html:138
msgid "About this software"
msgstr "À propos de ce logiciel"
-#: core/templates/navigation.html:149 core/templates/template_features.html:82
+#: core/templates/navigation.html:140 core/templates/template_features.html:82
#: software/templates/about_us.html:5
msgid "About us"
msgstr "À propos de nous"
-#: core/templates/navigation.html:151 software/templates/features.html:209
+#: core/templates/navigation.html:142 software/templates/features.html:209
msgid "REST API"
msgstr "API REST"
-#: core/templates/navigation.html:155 utils/models.py:40
+#: core/templates/navigation.html:146 utils/models.py:41
msgid "License"
msgstr "Licence"
-#: core/templates/navigation.html:161
+#: core/templates/navigation.html:152
msgid "Developer documentation"
msgstr "Documentation du développeur"
-#: core/templates/navigation.html:167
+#: core/templates/navigation.html:158
msgid "Get the code"
msgstr "Récupérer le code"
-#: core/templates/navigation.html:173 core/templates/template.html:204
+#: core/templates/navigation.html:164 core/templates/template.html:203
#: core/templates/template_features.html:99
msgid "Translate"
msgstr "Traduire"
-#: core/templates/navigation.html:194 core/templates/user/login.html:28
+#: core/templates/navigation.html:185 core/templates/user/login.html:28
msgid "Reset password"
msgstr "Réinitialiser le mot de passe"
-#: core/templates/navigation.html:207
+#: core/templates/navigation.html:198
msgid "My preferences"
msgstr "Mes préférences"
-#: core/templates/navigation.html:214
+#: core/templates/navigation.html:205
msgid "Logout"
msgstr "Se déconnecter"
-#: core/templates/navigation.html:229
+#: core/templates/navigation.html:220
msgid "Licenses"
msgstr "Licences"
-#: core/templates/navigation.html:232
+#: core/templates/navigation.html:223
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr "Unités de répétition"
-#: core/templates/navigation.html:235 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:226 core/templates/weight_unit/list.html:4
#: nutrition/templates/ingredient/view.html:174
msgid "Weight units"
msgstr "Unité de poids"
-#: core/templates/navigation.html:238 core/templates/user/list.html:4
+#: core/templates/navigation.html:229 core/templates/user/list.html:4
msgid "User list"
msgstr "Liste des utilisateurs"
-#: core/templates/navigation.html:239
+#: core/templates/navigation.html:230
msgid "Gyms"
msgstr "Activités"
@@ -1102,33 +1092,30 @@ msgstr "suivant"
msgid "Add weight log"
msgstr "Ajouter un journal de poids"
-#: core/templates/tags/render_day.html:114
-#: exercises/templates/equipment/overview.html:59
-#: exercises/templates/exercise/overview.html:63
-#: exercises/templates/muscles/overview.html:65
+#: core/templates/tags/render_day.html:116
msgid "Placeholder image for exercise"
msgstr "Espace réservé pour l'image de l'exercice"
-#: core/templates/tags/render_day.html:131
+#: core/templates/tags/render_day.html:133
msgid "This exercise has no repetitions."
msgstr "Cet exercice n'a pas de répétition."
-#: core/templates/tags/render_day.html:134
+#: core/templates/tags/render_day.html:136
msgid "Edit them now."
msgstr "Modifiez-les maintenant."
-#: core/templates/tags/render_day.html:159
+#: core/templates/tags/render_day.html:162
msgid "Add exercises to this workout day"
msgstr "Ajouter des exercices à cette séance"
#: core/templates/tags/render_weight_log.html:17 manager/helpers.py:89
-#: manager/models/setting.py:57 manager/templates/set/formset.html:10
+#: manager/models/setting.py:69 manager/templates/set/formset.html:9
msgid "Reps"
msgstr "Reps"
-#: 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
+#: core/templates/tags/render_weight_log.html:30 manager/forms.py:189
+#: manager/models/log.py:103 manager/models/setting.py:99
+#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
msgid "RiR"
msgstr "ReR"
@@ -1153,7 +1140,7 @@ msgstr "Conditions d’utilisation"
msgid "Features"
msgstr "Fonctionnalités"
-#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:37
+#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:53
msgid "API key"
msgstr "Clé API"
@@ -1200,11 +1187,12 @@ msgid "Documentation"
msgstr "Documentation"
#: core/templates/user/delete_account.html:4
-#: core/templates/user/preferences.html:42
+#: core/templates/user/preferences.html:58
msgid "Delete account"
msgstr "Supprimer votre compte"
#: core/templates/user/delete_account.html:17
+#: exercises/templates/history/overview.html:93
msgid "Are you sure?"
msgstr "Êtes-vous sûr·e ?"
@@ -1253,11 +1241,12 @@ msgstr "Ajouter une séance"
#: core/templates/user/overview.html:34 core/templates/user/overview.html:76
#: core/templates/user/overview.html:120 core/templates/user/overview.html: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
-#: 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
+#: exercises/models/base.py:99 exercises/models/base.py:104
+#: exercises/models/exercise.py:69 exercises/models/exercise.py:76
+#: gallery/models/image.py:47 manager/helpers.py:88 manager/models/log.py:100
+#: 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/views.py:150
@@ -1265,11 +1254,11 @@ msgid "Date"
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: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
+#: exercises/models/exercise.py:57 exercises/views/exercises.py:123
+#: 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 "Description"
@@ -1277,12 +1266,12 @@ msgstr "Description"
msgid "Number of logs (days)"
msgstr "Nombre de journaux (jours)"
-#: core/templates/user/overview.html:37 core/views/user.py:576
+#: core/templates/user/overview.html:37 core/views/user.py:592
#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:157
msgid "Last activity"
msgstr "Dernière activité"
-#: core/templates/user/overview.html:68 manager/forms.py:267
+#: core/templates/user/overview.html:68 manager/forms.py:278
#: manager/templates/workout/view.html:151
msgid "Log"
msgstr "Journal"
@@ -1300,6 +1289,7 @@ msgid "Notes"
msgstr "Notes"
#: core/templates/user/overview.html:79
+#: exercises/templates/history/overview.html:30
#: manager/templates/calendar/partial_overview_table.html:42
#: nutrition/templates/log/detail.html:154
msgid "Time"
@@ -1347,10 +1337,12 @@ msgid "Do you really want to change this user&#39;s password?"
msgstr "Voulez-vous vraiment changer ce mot de passe utilisateur&#39;s ?"
#: core/templates/user/overview.html:233
+#: exercises/templates/history/overview.html:106
msgid "No"
msgstr "Non"
#: core/templates/user/overview.html:234
+#: exercises/templates/history/overview.html:99
msgid "Yes"
msgstr "Oui"
@@ -1405,10 +1397,15 @@ msgid "Documents"
msgstr "Documents"
#: core/templates/user/overview.html:413 gym/templates/document/list.html:32
-#: manager/forms.py:279 manager/templates/workout/view.html:176
+#: manager/forms.py:290 manager/templates/workout/view.html:176
msgid "Download"
msgstr "Télécharger"
+#: core/templates/user/overview.html:451 gym/views/admin_config.py:44
+#: gym/views/admin_config.py:58 gym/views/user_config.py:46
+msgid "Configuration"
+msgstr "Configuration"
+
#: core/templates/user/overview.html:454 gym/models/user_config.py:92
msgid "Include in inactive overview"
msgstr "Inclure dans un aperçu inactif"
@@ -1428,7 +1425,25 @@ msgstr "Connectez-vous en tant que cet utilisateur"
msgid "Preferences"
msgstr "Préférences"
-#: core/templates/user/preferences.html:33 core/views/user.py:587
+#: core/templates/user/preferences.html:19
+#, fuzzy
+#| msgid "Send emails"
+msgid "Verified email"
+msgstr "Envoyer les courriels"
+
+#: core/templates/user/preferences.html:24
+msgid "Unverified email"
+msgstr ""
+
+#: core/templates/user/preferences.html:26
+msgid "Send verification email"
+msgstr ""
+
+#: core/templates/user/preferences.html:30
+msgid "You need to verify your email to contribute exercises"
+msgstr ""
+
+#: core/templates/user/preferences.html:49 core/views/user.py:603
msgid "Change password"
msgstr "Changer le mot de passe"
@@ -1458,39 +1473,37 @@ msgid "oz"
msgstr "oz"
#: 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
+#: exercises/views/equipment.py:104 exercises/views/exercises.py:185
+#: exercises/views/muscles.py:99 manager/views/schedule.py:311
+#: manager/views/schedule_step.py:129 manager/views/workout.py:269
+#: manager/views/workout_session.py:141 nutrition/views/ingredient.py:138
#: 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:431
-#: exercises/views/muscles.py:125 gallery/views/images.py:121
+#: exercises/views/categories.py:127 exercises/views/exercises.py:193
+#: exercises/views/muscles.py:106 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
+#: manager/views/workout.py:273 manager/views/workout_session.py:156
+#: nutrition/views/ingredient.py:145 nutrition/views/plan.py:127
#: nutrition/views/unit.py:118
#, python-brace-format
msgid "Delete {0}?"
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/repetition_units.py:85 core/views/user.py:472
#: 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: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
+#: exercises/views/equipment.py:81 exercises/views/muscles.py:86
+#: 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:170
+#: gym/views/gym.py:459 manager/views/day.py:100 manager/views/schedule.py:335
+#: manager/views/workout.py:287 nutrition/views/ingredient.py:164
+#: nutrition/views/plan.py:144 nutrition/views/unit.py:144
#, python-brace-format
msgid "Edit {0}"
msgstr "Modifier {0}"
@@ -1522,64 +1535,65 @@ msgstr "Envoyer"
msgid "Your feedback was successfully sent. Thank you!"
msgstr "Votrecommentaire a été envoyé avec succès. Merci !"
-#: core/views/user.py:156
+#: core/views/user.py:157
#, python-brace-format
msgid "Account \"{0}\" was successfully deleted"
msgstr "Le compte « {0} » a été supprimé avec succès"
-#: core/views/user.py:287
+#: core/views/user.py:294
msgid "You were successfully registered"
msgstr "Vous avez été enregistré·e avec succès"
-#: core/views/user.py:339
+#: core/views/user.py:355
msgid "Settings successfully updated"
msgstr "Paramètres mis à jour"
-#: core/views/user.py:376
+#: core/views/user.py:392
msgid "The user was successfully deactivated"
msgstr "L'utilisateur a été correctement désactivé"
-#: core/views/user.py:411
+#: core/views/user.py:427
msgid "The user was successfully activated"
msgstr "L'utilisateur a été activé avec succès"
-#: core/views/user.py:426
+#: core/views/user.py:442
msgid "Edit user"
msgstr "Modifier l’utilisateur"
-#: core/views/user.py:573 gym/templates/gym/member_list.html:26
+#: core/views/user.py:589 gym/templates/gym/member_list.html:26
#: gym/views/gym.py:156
msgid "ID"
msgstr "ID"
-#: core/views/user.py:574 gym/forms.py:94 gym/templates/contract/view.html:55
+#: core/views/user.py:590 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 "Nom d’utilisateur"
-#: core/views/user.py:577 gym/templates/gym/new_user.html:34
+#: core/views/user.py:593 gym/templates/gym/new_user.html:34
#: gym/views/export.py:60 gym/views/gym.py:218
msgid "Gym"
msgstr "Activités"
-#: exercises/models/base.py:51 exercises/templates/exercise/view.html:76
-#: nutrition/models/ingredient.py:204
+#: core/views/user.py:652
+#, python-format
+msgid "A verification email was sent to %(email)s"
+msgstr ""
+
+#: exercises/models/base.py:63 nutrition/models/ingredient.py:204
msgid "Category"
msgstr "Catégorie"
-#: exercises/models/base.py:58
+#: exercises/models/base.py:70
msgid "Primary muscles"
msgstr "Muscles primaires"
-#: exercises/models/base.py:64 exercises/templates/equipment/overview.html:71
-#: exercises/templates/exercise/overview.html:76
-#: exercises/templates/exercise/view.html:268
-#: exercises/templates/muscles/overview.html:77
+#: exercises/models/base.py:76
msgid "Secondary muscles"
msgstr "Muscles secondaires"
-#: exercises/models/base.py:79
+#: exercises/models/base.py:91
msgid "Variations"
msgstr "Variations"
@@ -1587,71 +1601,58 @@ msgstr "Variations"
msgid "Exercise Categories"
msgstr "Catégorie d'exercices"
-#: exercises/models/comment.py:34 exercises/models/exercise_alias.py:32
-#: exercises/models/image.py:75 exercises/models/video.py:82
-#: manager/forms.py:165 manager/helpers.py:89 manager/models/log.py:51
+#: exercises/models/comment.py:37 exercises/models/exercise_alias.py:35
+#: exercises/models/image.py:71 exercises/models/video.py:95
+#: manager/forms.py:176 manager/helpers.py:89 manager/models/log.py:52
msgid "Exercise"
msgstr "Exercice"
-#: exercises/models/comment.py:41
+#: exercises/models/comment.py:43
msgid "A comment about how to correctly do this exercise."
msgstr "Un commentaire sur la meilleure manière de réaliser cet exercice."
-#: exercises/models/exercise.py:86 nutrition/models/ingredient.py:80
+#: exercises/models/exercise.py:81 nutrition/models/ingredient.py:80
#: nutrition/models/plan.py:61 nutrition/models/weight_unit.py:32
msgid "Language"
msgstr "Langue"
-#: 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:265
-msgid "New user submitted exercise"
-msgstr "Nouvel exercice proposé par un utilisateur"
-
-#: 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/exercise_alias.py:35
+#: exercises/models/exercise_alias.py:38
msgid "Alias for an exercise"
msgstr "Alias pour un exercice"
-#: exercises/models/image.py:59
+#: exercises/models/image.py:55
msgid "Line"
msgstr "Ligne"
-#: exercises/models/image.py:60
+#: exercises/models/image.py:56
msgid "3D"
msgstr "3D"
-#: exercises/models/image.py:61
+#: exercises/models/image.py:57
msgid "Low-poly"
msgstr ""
-#: exercises/models/image.py:62
+#: exercises/models/image.py:58
msgid "Photo"
msgstr "Photo"
-#: exercises/models/image.py:63
+#: exercises/models/image.py:59
msgid "Other"
msgstr "Autres"
-#: exercises/models/image.py:81 gallery/models/image.py:56
+#: exercises/models/image.py:77 gallery/models/image.py:56
msgid "Image"
msgstr "Image"
-#: exercises/models/image.py:82 gallery/models/image.py:57
+#: exercises/models/image.py:78 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:88
+#: exercises/models/image.py:84
msgid "Main picture"
msgstr "Image principale"
-#: exercises/models/image.py:91
+#: exercises/models/image.py:87
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 "
@@ -1661,20 +1662,10 @@ 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:100
+#: exercises/models/image.py:96
msgid "The art style of your image"
msgstr "Le style d'art de votre image"
-#: exercises/models/image.py:185
-msgid "New user submitted image"
-msgstr "Nouvelle image soumise par un utilisateur"
-
-#: exercises/models/image.py:186
-#, python-brace-format
-msgid "The user {0} submitted a new image \"{1}\" for exercise {2}."
-msgstr ""
-"L’utilisateur {0} a soumis une nouvelle image « {1} » pour l’exercice {2}."
-
#: exercises/models/muscle.py:37
msgid "In latin, e.g. \"Pectoralis major\""
msgstr "En latin, par ex. « Pectoralis major »"
@@ -1687,51 +1678,53 @@ msgstr "Nom alternatif"
msgid "A more basic name for the muscle"
msgstr "Un nom plus basique pour le muscle"
-#: exercises/models/video.py:41
-msgid "Maximum file size is 100MB."
+#: exercises/models/video.py:50
+#, fuzzy, python-format
+#| msgid "Maximum file size is 100MB."
+msgid "Maximum file size is %(size)sMB."
msgstr "La taille maximum du fichier est 100MB."
-#: exercises/models/video.py:44 exercises/models/video.py:48
+#: exercises/models/video.py:57 exercises/models/video.py:65
msgid "File type is not supported"
msgstr "Le type de fichier n'est pas supporté"
-#: exercises/models/video.py:57
+#: exercises/models/video.py:70
msgid "File is not a valid video"
msgstr "Le fichier n'est pas une vidéo valide"
-#: exercises/models/video.py:88
+#: exercises/models/video.py:101
msgid "Main video"
msgstr "Vidéo principale"
-#: exercises/models/video.py:94
+#: exercises/models/video.py:107
msgid "Video"
msgstr "Vidéo"
-#: exercises/models/video.py:101
+#: exercises/models/video.py:114
msgid "Size"
msgstr "Taille"
-#: exercises/models/video.py:108 manager/models/schedule_step.py:56
+#: exercises/models/video.py:121 manager/models/schedule_step.py:56
msgid "Duration"
msgstr "Durée"
-#: exercises/models/video.py:117
+#: exercises/models/video.py:130
msgid "Width"
msgstr "Largeur"
-#: exercises/models/video.py:124
+#: exercises/models/video.py:137
#, fuzzy
#| msgid "Weight"
msgid "Height"
msgstr "Poids"
-#: exercises/models/video.py:131
+#: exercises/models/video.py:144
#, fuzzy
#| msgid "Code"
msgid "Codec"
msgstr "Code"
-#: exercises/models/video.py:139
+#: exercises/models/video.py:152
msgid "Codec, long name"
msgstr ""
@@ -1740,141 +1733,23 @@ msgid "Equipment list"
msgstr "Liste d'équipement"
#: exercises/templates/equipment/admin-overview.html:37
-#: exercises/views/equipment.py:94
+#: exercises/views/equipment.py:92
msgid "Add new equipment"
msgstr "Ajouter de nouveaux équipements"
-#: exercises/templates/equipment/overview.html:11
-msgid "Equipment overview"
-msgstr "Résumé de l'équipement"
-
-#: exercises/templates/equipment/overview.html:69
-#: exercises/templates/exercise/overview.html:74
-#: exercises/templates/exercise/view.html:264
-#: exercises/templates/muscles/overview.html:75
-msgid "Main muscles"
-msgstr "Muscles principaux"
-
-#: exercises/templates/equipment/overview.html:79
-msgid ""
-"No exercises for this equipment. Add or edit an exercise and set the "
-"equipment."
-msgstr ""
-"Aucun exercices pour cet équipement. Ajoutez ou modifiez un exercice pour "
-"utiliser cet équipement."
-
-#: exercises/templates/equipment/overview.html:96
-#: exercises/templates/exercise/overview.html:99
-#: nutrition/templates/ingredient/overview.html:57
-msgid "Search"
-msgstr "Recherche"
-
-#: exercises/templates/equipment/overview.html:101
-#: exercises/templates/exercise/overview.html:104
-msgid "exercise name"
-msgstr "nom de l'exercice"
-
-#: exercises/templates/equipment/overview.html:115
-#: exercises/templates/exercise/overview.html:118
-#: exercises/templates/muscles/overview.html:118
-#: nutrition/templates/ingredient/overview.html:85
-msgid "Only registered users can do this"
-msgstr "Seul les utilisateurs enregistrés peuvent faire ça"
-
-#: exercises/templates/exercise/email_new.tpl:1
-#, python-format
-msgid ""
-"Your exercise '%(exercise)s' was successfully added to the general\n"
-"database."
-msgstr ""
-"Votre exercice « %(exercise)s » a été rajouté avec succès à\n"
-"la base de donnée."
-
-#: exercises/templates/exercise/email_new.tpl:4
-msgid ""
-"It is now available on the exercise and muscle overview and can be\n"
-"added to workouts. You can access it on this address:"
-msgstr ""
-"Il est maintenant disponible dans la vue d'ensemble des exercices\n"
-"et peut être ajouté à des séances. Vous pouvez y accéder à cette adresse :"
-
-#: exercises/templates/exercise/email_new.tpl:8
-#: nutrition/templates/ingredient/email_new.tpl:8
-msgid "Thank you for contributing and making this site better!"
-msgstr "Merci de votre contribution et de rendre ce site meilleur !"
-
-#: exercises/templates/exercise/email_new.tpl:9
-#: manager/templates/workout/email_reminder.tpl:15
-#: manager/templates/workout/email_weight_reminder.tpl:12
-#: nutrition/templates/ingredient/email_new.tpl:9
-#, python-format
-msgid "The %(site)s team"
-msgstr "L’équipe de %(site)s"
-
-#: exercises/templates/exercise/form.html:4
-msgid "Submitting an exercise"
-msgstr "Proposer un exercice"
-
-#: exercises/templates/exercise/form.html:5
-msgid ""
-"Thank you for submitting an exercise. This is much\n"
-"appreciated!"
-msgstr ""
-"Merci d'avoir proposé un exercice.\n"
-"Ceci nous\n"
-"aide beaucoup !"
-
-#: exercises/templates/exercise/form.html:8
-msgid ""
-"After you submit the form, the administrators will be notified.\n"
-"Once it is reviewed, it will be added to the database. Till this happens,\n"
-"it will not be visible in the overview or the search. In case you added your "
-"email\n"
-"when you registered, you will get notified when the process is completed "
-"successfully."
-msgstr ""
-"Après avoir soumis le formulaire, les administrateurs en seront informés.\n"
-"Une fois qu’il sera vérifié, il sera ajouter à la base de données. En "
-"attendant, \n"
-"il ne sera pas visible dans l'aperçu ou dans les recherches. Dans le cas où "
-"vous avez\n"
-"renseigné votre courriel lors de votre inscription, vous serez informé·e une "
-"fois le processus fini avec succès."
-
-#: exercises/templates/exercise/form_correct.html:4
-msgid "Correcting an exercise"
-msgstr "Corriger un exercice"
-
-#: exercises/templates/exercise/form_correct.html:5
-msgid ""
-"Thank you for correcting and improving this exercise.\n"
-"This is much appreciated!"
-msgstr ""
-"Merci pour avoir corrigé et amélioré cet exercice.\n"
-"Ceci nous aide beaucoup !"
-
-#: exercises/templates/exercise/form_correct.html:8
-msgid ""
-"After you submit the form, the administrators will be notified.\n"
-"Once the changes are reviewed the exercise will be updated."
-msgstr ""
-"Après avoir soumis le formulaire, un administrateur sera averti.\n"
-"Une fois que les modifications seront vérifiées, l'exercice sera mis à jour."
-
-#: exercises/templates/exercise/overview.html:88
-msgid "No categories."
-msgstr "Pas de catégorie."
-
-#: exercises/templates/exercise/overview.html:88
-msgid "Use link to create one"
-msgstr "Utilisez le lien pour en créer"
+#: exercises/templates/history/overview.html:11
+#, fuzzy
+#| msgid "Exercise day"
+msgid "Exercise admin history"
+msgstr "Jour d'exercice"
-#: exercises/templates/exercise/pending.html:14
-#: nutrition/templates/ingredient/pending.html:14
-msgid "Submission date"
-msgstr "Date de proposition"
+#: exercises/templates/history/overview.html:27
+#, fuzzy
+#| msgid "Actions"
+msgid "Action"
+msgstr "Actions"
-#: exercises/templates/exercise/pending.html:16 gallery/models/image.py:51
+#: exercises/templates/history/overview.html:28 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/log.py:45
@@ -1885,104 +1760,47 @@ msgstr "Date de proposition"
msgid "User"
msgstr "Utilisateur"
-#: exercises/templates/exercise/view.html:48
-msgid "Exercise is pending review"
-msgstr "L'exercice est en attente de relecture"
-
-#: exercises/templates/exercise/view.html:51
-msgid ""
-"This user submitted exercise is pending a decision to be\n"
-" included in the database."
-msgstr ""
-"Cet utilisateur a soumis l’exercice et est en attente d’une décision avant "
-"de\n"
-"figurer dans la base de données."
-
-#: exercises/templates/exercise/view.html:53
-msgid "Till then, it will not be shown in the overview or the search."
-msgstr "En attendant, il ne sera pas affiché dans l'overview ou la recherche."
-
-#: exercises/templates/exercise/view.html:54
-#: nutrition/templates/ingredient/view.html:31
-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:203
-#: nutrition/templates/ingredient/view.html:38
-msgid "Accept"
-msgstr "Accepter"
-
-#: exercises/templates/exercise/view.html:64
-#: exercises/templates/exercise/view.html:204
-#: nutrition/templates/ingredient/view.html:42
-msgid "Decline"
-msgstr "Refuser"
+#: exercises/templates/history/overview.html:29
+#, fuzzy
+#| msgctxt "As in \"email subject\""
+#| msgid "Subject"
+msgid "Object"
+msgstr "Objet"
-#: exercises/templates/exercise/view.html:96
-msgid "Images"
-msgstr "Images"
+#: exercises/templates/history/overview.html:31
+#, fuzzy
+#| msgctxt "Noun, not verb"
+#| msgid "Change"
+msgid "Changes"
+msgstr "Changer"
-#: exercises/templates/exercise/view.html:137 exercises/views/images.py:93
-msgid "Add new image"
-msgstr "Ajouter une nouvelle image"
+#: exercises/templates/history/overview.html:32
+msgid "Revert"
+msgstr ""
-#: exercises/templates/exercise/view.html:148
-msgid "Videos"
+#: exercises/templates/history/overview.html:64
+msgid "View Object"
msgstr ""
-#: exercises/templates/exercise/view.html:187 exercises/views/videos.py:94
+#: exercises/templates/history/overview.html:75
#, 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:218
-msgid "Comments for this exercise"
-msgstr "Commentaires sur l'exercice"
-
-#: exercises/templates/exercise/view.html:246
-msgid "Add new comment"
-msgstr "Commenter"
-
-#: 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: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:306
-msgid "Exercise Variations"
-msgstr "Variations de l'exercice"
+#| msgid "View logs"
+msgid "View changes"
+msgstr "Voir les journaux"
-#: exercises/templates/exercise/view.html:327
-msgid "Submit a correction"
-msgstr "Proposer une correction"
+#: exercises/templates/history/overview.html:86
+msgid "Revert changes"
+msgstr ""
#: exercises/templates/muscles/admin-overview.html:4
-#: exercises/templates/muscles/overview.html:7
msgid "Muscle overview"
msgstr "Résumé du muscle"
#: exercises/templates/muscles/admin-overview.html:36
-#: exercises/views/muscles.py:86
+#: exercises/views/muscles.py:67
msgid "Add muscle"
msgstr "Ajouter un muscle"
-#: exercises/templates/muscles/overview.html:85
-msgid ""
-"No exercises for this muscle. Add or edit an exercise and set the muscle."
-msgstr ""
-"Aucun exercice pour ce muscle. Ajoutez ou modifiez un exercice et définissez "
-"le muscle."
-
#: exercises/views/categories.py:71
msgid "Add category"
msgstr "Ajouter catégorie"
@@ -1995,52 +1813,24 @@ msgstr "Ceci supprimera également tous les exercices de la catégorie."
msgid "Add exercise comment"
msgstr "Ajouter un commentaire à l'exercice"
-#: exercises/views/equipment.py:107 exercises/views/equipment.py:118
+#: exercises/views/equipment.py:105 exercises/views/equipment.py:116
msgid "Delete equipment?"
msgstr "Supprimer équipement ?"
-#: exercises/views/exercises.py:229
-#, python-format
-msgid ""
-"%(name_original)s is too similar to existing exercise \"%(exercise_name)s\""
+#: exercises/views/exercises.py:161
+#, fuzzy, python-format
+#| msgid ""
+#| "%(name_original)s is too similar to existing exercise "
+#| "\"%(exercise_name)s\""
+msgid "%(name)s is too similar to existing exercise \"%(exercise_name)s\""
msgstr ""
"%(name_original)s est trop similaire à l’exercice existant "
"« %(exercise_name)s »"
-#: exercises/views/exercises.py:247
-msgid "Add exercise"
-msgstr "Ajouter un exercice"
-
-#: 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:380
-#, python-brace-format
-msgid "Correct {0}"
-msgstr "Corriger {0}"
-
-#: exercises/views/exercises.py:422
+#: exercises/views/exercises.py:184
msgid "This will delete the exercise from all workouts."
msgstr "Ceci supprimera l'exercice de toutes les séances."
-#: exercises/views/exercises.py:474
-msgid "Exercise was successfully marked as rejected"
-msgstr "L'exercice a été marqué comme rejeté"
-
-#: exercises/views/images.py:68
-msgid "Edit exercise image"
-msgstr "Modifier l’image de l’exercice"
-
-#: exercises/views/images.py:143
-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"
@@ -2111,7 +1901,7 @@ 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:59
+#: manager/templates/log/add.html:52 nutrition/forms.py:60
#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:102
#: nutrition/models/meal_item.py:72
msgid "Amount"
@@ -2215,6 +2005,10 @@ msgstr "Utilisera le nom du fichier si rien n'est renseigné"
msgid "User notes"
msgstr "Notes de l'utilisateur"
+#: gym/templates/contract/list.html:36
+msgid "Show"
+msgstr "Afficher"
+
#: gym/templates/contract/view.html:4
msgid "Contract"
msgstr "Contrat"
@@ -2295,10 +2089,6 @@ msgstr "Courriels"
msgid "Add member"
msgstr "Ajouter un membre"
-#: gym/templates/gym/new_user.html:38
-msgid "Date of Birth"
-msgstr "Date de naissance"
-
#: gym/templates/gym/new_user.html:48 manager/templates/calendar/month.html:144
#: manager/templates/log/add.html:75 nutrition/templates/rate/form.html:120
msgid "Info"
@@ -2362,132 +2152,132 @@ msgstr "Ajouter un utilisateur à l'activité"
msgid "Edit gym"
msgstr "Modifier l’activité"
-#: i18n.tpl:2 i18n.tpl:28
-msgid "Abs"
-msgstr "Abdominaux"
-
-#: i18n.tpl:3
-msgid "Arms"
-msgstr "Bras"
+#: i18n.tpl:2
+msgid "Until Failure"
+msgstr "Jusqu'à l'échec"
-#: i18n.tpl:4
-msgid "Back"
-msgstr "Dos"
+#: i18n.tpl:3 manager/forms.py:180 manager/models/log.py:73
+#: manager/templates/set/add.html:53
+msgid "Repetitions"
+msgstr "Répétitions"
-#: i18n.tpl:5 i18n.tpl:23
-msgid "Calves"
-msgstr "Mollets"
+#: i18n.tpl:4
+msgid "Abs"
+msgstr "Abdominaux"
-#: i18n.tpl:6 i18n.tpl:26
-msgid "Chest"
-msgstr "Torse"
+#: i18n.tpl:5
+msgid "Arms"
+msgstr "Bras"
-#: i18n.tpl:7
+#: i18n.tpl:6
msgid "Legs"
msgstr "Jambes"
-#: i18n.tpl:8 i18n.tpl:19
-msgid "Shoulders"
-msgstr "Épaules"
+#: i18n.tpl:7
+msgid "Dumbbell"
+msgstr "Haltère"
+
+#: i18n.tpl:8
+#, fuzzy
+#| msgid "Biceps brachii"
+msgid "Biceps"
+msgstr "Biceps brachial"
#: i18n.tpl:9
-msgid "Barbell"
-msgstr "Barre"
+msgid "SZ-Bar"
+msgstr "Barre Ez"
#: i18n.tpl:10
-msgid "Bench"
-msgstr "Banc"
+msgid "Kettlebell"
+msgstr "Kettlebell"
#: i18n.tpl:11
-msgid "Dumbbell"
-msgstr "Haltère"
+msgid "Swiss Ball"
+msgstr "Médecine ball"
#: i18n.tpl:12
-msgid "Gym mat"
-msgstr "Tapis de gym"
+msgid "none (bodyweight exercise)"
+msgstr "aucun (poids du corps)"
#: i18n.tpl:13
-msgid "Incline bench"
-msgstr "Banc inclinable"
+msgid "Calves"
+msgstr "Mollets"
#: i18n.tpl:14
-msgid "Kettlebell"
-msgstr "Kettlebell"
+msgid "Back"
+msgstr "Dos"
#: i18n.tpl:15
-msgid "Pull-up bar"
-msgstr "Barre de traction"
+msgid "Lower back"
+msgstr ""
#: i18n.tpl:16
-msgid "SZ-Bar"
-msgstr "Barre Ez"
+msgid "Lats"
+msgstr ""
#: i18n.tpl:17
-msgid "Swiss Ball"
-msgstr "Médecine ball"
+msgid "Hamstrings"
+msgstr ""
#: i18n.tpl:18
-msgid "none (bodyweight exercise)"
-msgstr "aucun (poids du corps)"
+msgid "Bench"
+msgstr "Banc"
-#: i18n.tpl:20
+#: i18n.tpl:19
#, fuzzy
-#| msgid "Biceps brachii"
-msgid "Biceps"
-msgstr "Biceps brachial"
+#| msgid "Minutes"
+msgid "Glutes"
+msgstr "minutes"
+
+#: i18n.tpl:20
+msgid "Kilometers"
+msgstr "kilomètres"
#: i18n.tpl:21
-msgid "Hamstrings"
-msgstr ""
+msgid "Shoulders"
+msgstr "Épaules"
#: i18n.tpl:22
-msgid "Lower back"
-msgstr ""
+msgid "Seconds"
+msgstr "Secondes"
+
+#: i18n.tpl:23
+msgid "Miles"
+msgstr "Miles"
#: i18n.tpl:24
-#, fuzzy
-#| msgid "Minutes"
-msgid "Glutes"
-msgstr "minutes"
+msgid "Incline bench"
+msgstr "Banc inclinable"
#: i18n.tpl:25
-msgid "Lats"
+msgid "Quads"
msgstr ""
+#: i18n.tpl:26
+msgid "Minutes"
+msgstr "Minutes"
+
#: i18n.tpl:27
-msgid "Quads"
-msgstr ""
+msgid "Chest"
+msgstr "Torse"
+
+#: i18n.tpl:28
+msgid "Gym mat"
+msgstr "Tapis de gym"
#: i18n.tpl:29
-#, fuzzy
-#| msgid "Triceps brachii"
-msgid "Triceps"
-msgstr "Triceps brachial"
+msgid "Pull-up bar"
+msgstr "Barre de traction"
#: i18n.tpl:30
-msgid "Kilometers"
-msgstr "kilomètres"
+msgid "Barbell"
+msgstr "Barre"
#: i18n.tpl:31
-msgid "Miles"
-msgstr "Miles"
-
-#: i18n.tpl:32
-msgid "Minutes"
-msgstr "Minutes"
-
-#: i18n.tpl:33 manager/forms.py:169 manager/models/log.py:71
-#: manager/templates/set/add.html:53
-msgid "Repetitions"
-msgstr "Répétitions"
-
-#: i18n.tpl:34
-msgid "Seconds"
-msgstr "Secondes"
-
-#: i18n.tpl:35
-msgid "Until Failure"
-msgstr "Jusqu'à l'échec"
+#, fuzzy
+#| msgid "Triceps brachii"
+msgid "Triceps"
+msgstr "Triceps brachial"
#: mailer/forms.py:34 mailer/templates/mailer/gym/preview.html:32
msgctxt "As in \"email subject\""
@@ -2543,11 +2333,11 @@ msgstr "Envoyer les courriels"
msgid "Correction"
msgstr "Correction"
-#: manager/forms.py:89 manager/models/workout.py:59
+#: manager/forms.py:92 manager/models/workout.py:59
msgid "The name of the workout"
msgstr "Le nom de la séance d'entraînement"
-#: manager/forms.py:93 manager/models/workout.py:66
+#: manager/forms.py:96 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'."
@@ -2555,7 +2345,7 @@ msgstr ""
"Une courte description du but de la séance. Par exemple « Focus sur le dos » "
"ou « Semaine 1 du programme xy »."
-#: manager/forms.py:126
+#: manager/forms.py:137
msgid ""
"You can search for more than one exercise, they will be grouped together for "
"a superset."
@@ -2563,28 +2353,28 @@ msgstr ""
"Vous pouvez rechercher plus d'un exercice à la fois, ils seront groupés "
"ensemble."
-#: 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
+#: manager/forms.py:166 manager/forms.py:171 manager/models/log.py:64
+#: manager/models/log.py:92 manager/models/setting.py:59
+#: manager/models/setting.py:90 manager/templates/log/add.html:53
+#: manager/templates/log/add.html:55 manager/templates/set/formset.html:10
+#: manager/templates/set/formset.html:12 measurements/models/category.py:58
+#: nutrition/forms.py:64
msgid "Unit"
msgstr "Unité"
-#: manager/forms.py:266
+#: manager/forms.py:277
msgid "Type"
msgstr "Type"
-#: manager/forms.py:267 manager/templates/workout/view.html:157
+#: manager/forms.py:278 manager/templates/workout/view.html:157
msgid "Table"
msgstr "Tableau"
-#: manager/forms.py:269 manager/templates/workout/view.html:163
+#: manager/forms.py:280 manager/templates/workout/view.html:163
msgid "with images"
msgstr "avec des images"
-#: manager/forms.py:270 manager/templates/workout/view.html:169
+#: manager/forms.py:281 manager/templates/workout/view.html:169
msgid "with comments"
msgstr "avec commentaires"
@@ -2644,7 +2434,7 @@ msgid "The duration in weeks"
msgstr "Durée en semaines"
#: manager/models/schedule_step.py:63 manager/models/set.py:52
-#: manager/models/setting.py:98 nutrition/models/meal.py:54
+#: manager/models/setting.py:110 nutrition/models/meal.py:54
#: nutrition/models/meal_item.py:65
msgid "Order"
msgstr "Ordre"
@@ -2698,7 +2488,7 @@ msgstr "Jour d'exercice"
msgid "Number of sets"
msgstr "Nombre de séries"
-#: manager/models/setting.py:43
+#: manager/models/setting.py:48
msgid "Sets"
msgstr "Séries"
@@ -2999,6 +2789,13 @@ msgstr ""
"Si vous ne voulez plus recevoir de rappels par courriel, désactivez l’option "
"dans vos paramètres."
+#: manager/templates/workout/email_reminder.tpl:15
+#: manager/templates/workout/email_weight_reminder.tpl:12
+#: nutrition/templates/ingredient/email_new.tpl:9
+#, python-format
+msgid "The %(site)s team"
+msgstr "L’équipe de %(site)s"
+
#: manager/templates/workout/email_weight_reminder.tpl:3
#, python-format
msgid ""
@@ -3016,6 +2813,10 @@ msgstr ""
"Vous allez régulièrement recevoir ces rappels jusqu'à ce que vous entrez "
"votre poids actuel."
+#: manager/templates/workout/log.html:10 manager/templates/workout/log.html:11
+msgid "Weight log"
+msgstr "Journal de pesée"
+
#: manager/templates/workout/log.html:29
msgid "Weight log for workout"
msgstr "Journal de poids pour la séance"
@@ -3122,7 +2923,7 @@ msgstr "Voir les journaux"
msgid "Edit workout"
msgstr "Modifier la séance"
-#: manager/templates/workout/view.html:225 manager/views/workout.py:300
+#: manager/templates/workout/view.html:225 manager/views/workout.py:301
msgid "Mark as template"
msgstr "Marquer comme modèle"
@@ -3130,11 +2931,6 @@ msgstr "Marquer comme modèle"
msgid "Add workout day"
msgstr "Ajouter un jour d'entrainement"
-#: manager/views/log.py:92
-#, python-format
-msgid "Edit log entry for %s"
-msgstr "Modifier les entrées de journal pour %s"
-
#: manager/views/log.py:111
msgid "Delete workout log"
msgstr "Supprimer le journal de la séance"
@@ -3152,11 +2948,11 @@ msgstr "Créer un programme"
msgid "Your workouts"
msgstr "Vos séances"
-#: manager/views/workout.py:227
+#: manager/views/workout.py:228
msgid "Copy workout"
msgstr "Copier une séance"
-#: manager/views/workout.py:230
+#: manager/views/workout.py:231
msgid "Copy"
msgstr "Copier"
@@ -3178,23 +2974,23 @@ msgstr "Ceci supprimera également tous les exercices de la catégorie."
msgid "Value"
msgstr ""
-#: nutrition/forms.py:122
+#: nutrition/forms.py:123
msgid "Calculate"
msgstr "Calculer"
-#: nutrition/forms.py:195 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:196 nutrition/templates/rate/form.html:76
msgid "Basic caloric intake"
msgstr "Apport calorique de base"
-#: nutrition/forms.py:196
+#: nutrition/forms.py:197
msgid "Your basic caloric intake as calculated for your data"
msgstr "Votre apport calorique de base calculé avec vos données"
-#: nutrition/forms.py:202
+#: nutrition/forms.py:203
msgid "Additional calories"
msgstr "Calories supplémentaires"
-#: nutrition/forms.py:204
+#: nutrition/forms.py:205
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
@@ -3202,7 +2998,7 @@ msgstr ""
"Les calories supplémentaires à ajouter au taux de base (pour soustraire, "
"entrez un nombre négatif)"
-#: nutrition/forms.py:232 nutrition/models/ingredient_weight_unit.py:39
+#: nutrition/forms.py:233 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"
@@ -3268,7 +3064,7 @@ msgstr ""
"l’énergie fournie par les protéines, les glucides et les lipides "
"({energy_calculated} kcal +/-{energy_approx} %)"
-#: nutrition/models/ingredient.py:357 nutrition/views/ingredient.py:225
+#: nutrition/models/ingredient.py:357 nutrition/views/ingredient.py:219
msgid "Ingredient was successfully added to the general database"
msgstr "L’ingrédient a été ajouté avec succès à la base de données général"
@@ -3297,6 +3093,12 @@ msgstr "Quantité, par exemple « 1 tasse » ou « 1/2 cuillère »"
msgid "Meal"
msgstr "Repas"
+#: nutrition/models/log.py:65
+#, fuzzy
+#| msgid "Time (approx)"
+msgid "Date and Time (Approx.)"
+msgstr "Temps (approx.)"
+
#: nutrition/models/meal.py:61
msgid "Time (approx)"
msgstr "Temps (approx.)"
@@ -3402,6 +3204,10 @@ msgstr ""
"Il est maintenant disponible sur la vue d'ensemble des ingrédients\n"
"et peut être ajouté aux régimes. Vous pouvez y accéder à cette adresse :"
+#: nutrition/templates/ingredient/email_new.tpl:8
+msgid "Thank you for contributing and making this site better!"
+msgstr "Merci de votre contribution et de rendre ce site meilleur !"
+
#: nutrition/templates/ingredient/form.html:4
msgid "Submitting an ingredient"
msgstr "Soumettre un ingrédient"
@@ -3433,6 +3239,10 @@ msgstr ""
msgid "No ingredients."
msgstr "Aucun ingrédient."
+#: nutrition/templates/ingredient/overview.html:57
+msgid "Search"
+msgstr "Recherche"
+
#: nutrition/templates/ingredient/overview.html:66
msgid "ingredient name"
msgstr "nom de l'ingrédient"
@@ -3442,6 +3252,14 @@ msgstr "nom de l'ingrédient"
msgid "Add ingredient"
msgstr "Ajouter un ingrédient"
+#: nutrition/templates/ingredient/overview.html:85
+msgid "Only registered users can do this"
+msgstr "Seul les utilisateurs enregistrés peuvent faire ça"
+
+#: nutrition/templates/ingredient/pending.html:14
+msgid "Submission date"
+msgstr "Date de proposition"
+
#: nutrition/templates/ingredient/view.html:27
msgid "Ingredient is pending review"
msgstr "L'ingrédient est en attente d'examen"
@@ -3457,6 +3275,18 @@ msgstr ""
"pour figurer dans la base de données. En attendant, il ne sera pas montré "
"dans la vue d’ensemble ou lors de la recherche."
+#: nutrition/templates/ingredient/view.html:31
+msgid "Please select one of the options below."
+msgstr "Merci de choisir une des options suivantes."
+
+#: nutrition/templates/ingredient/view.html:38
+msgid "Accept"
+msgstr "Accepter"
+
+#: nutrition/templates/ingredient/view.html:42
+msgid "Decline"
+msgstr "Refuser"
+
#: nutrition/templates/ingredient/view.html:71
#: nutrition/templates/log/detail.html:31
#: nutrition/templates/plan/view.html:229 nutrition/views/plan.py:376
@@ -3719,14 +3549,18 @@ msgstr ""
"basez votre plan de nutrition sur ces valeurs, observez pendant quelques "
"semaines et changer le montant total si nécessaire."
-#: nutrition/views/ingredient.py:181
+#: nutrition/views/ingredient.py:175
msgid "Add a new ingredient"
msgstr "Ajouter un nouvel ingrédient"
-#: nutrition/views/ingredient.py:238
+#: nutrition/views/ingredient.py:232
msgid "Ingredient was successfully marked as rejected"
msgstr "L'ingrédient a été marqué avec succès comme rejeté"
+#: nutrition/views/log.py:230 nutrition/views/unit_ingredient.py:139
+msgid "Delete?"
+msgstr "Supprimer ?"
+
#: nutrition/views/meal.py:55
msgid "Add new meal"
msgstr "Ajouter un nouveau repas"
@@ -3992,15 +3826,15 @@ msgstr ""
msgid "100%% Free <br>and <br>Open Source"
msgstr "100 %% gratuit <br>et <br>à code ouvert"
-#: utils/generic_views.py:261
+#: utils/generic_views.py:262
msgid "Yes, delete"
msgstr "Oui, supprimer"
-#: utils/models.py:47
+#: utils/models.py:48
msgid "Author"
msgstr "Auteur"
-#: utils/models.py:52
+#: utils/models.py:53
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."
@@ -4008,15 +3842,15 @@ msgstr ""
"Si vous n’êtes pas l’auteur, entrez le nom ou la source ici. Ceci est "
"nécessaire pour certaines licences par exemple la CC-BY-SA."
-#: utils/models.py:77
+#: utils/models.py:78
msgid "Pending"
msgstr "En attente"
-#: utils/models.py:78
+#: utils/models.py:79
msgid "Accepted"
msgstr "Accepté"
-#: utils/models.py:79
+#: utils/models.py:80
msgid "Declined"
msgstr "Refusé"
@@ -4180,6 +4014,218 @@ msgstr "Supprimé avec succès."
msgid "Delete weight entry for the %s"
msgstr "Supprimer l’entrée de poids pour le %s"
+#~ msgid "Ingredients"
+#~ msgstr "Ingrédients"
+
+#~ msgid ""
+#~ "Use the configuration to select in what languages the\n"
+#~ "exercises and ingredients will be shown for the current language (for "
+#~ "example\n"
+#~ "the exercises should be shown in languages A, B and C; the ingredients "
+#~ "only\n"
+#~ "in A)."
+#~ msgstr ""
+#~ "Utiliser la configuration pour sélectionner dans quelles langues\n"
+#~ "les exercices et les ingrédients seront affichés (par exemple\n"
+#~ "les exercices seront affichés dans la langues A, B et C ; les "
+#~ "ingrédients\n"
+#~ "seulement en A)."
+
+#~ msgctxt "as in sorted by category"
+#~ msgid "by category"
+#~ msgstr "Par catégorie"
+
+#~ msgctxt "as in sorted by muscle"
+#~ msgid "by muscle"
+#~ msgstr "par muscle"
+
+#~ msgctxt "as in sorted by equipment"
+#~ msgid "by equipment"
+#~ msgstr "par équipement"
+
+#~ msgid "Add new exercise"
+#~ msgstr "Ajouter nouvel exercice"
+
+#~ msgid "Exercises pending review"
+#~ msgstr "L'exercice est en attente de relecture"
+
+#~ msgid "Exercise was successfully added to the general database"
+#~ msgstr "L'exercice a été ajouté avec succès à la base de données"
+
+#~ msgid "New user submitted exercise"
+#~ msgstr "Nouvel exercice proposé par un utilisateur"
+
+#, python-brace-format
+#~ msgid "The user {0} submitted a new exercise \"{1}\"."
+#~ msgstr "L'utilisateur {0} a proposé un nouvel exercice « {1} »."
+
+#~ msgid "New user submitted image"
+#~ msgstr "Nouvelle image soumise par un utilisateur"
+
+#, python-brace-format
+#~ msgid "The user {0} submitted a new image \"{1}\" for exercise {2}."
+#~ msgstr ""
+#~ "L’utilisateur {0} a soumis une nouvelle image « {1} » pour l’exercice {2}."
+
+#~ msgid "Equipment overview"
+#~ msgstr "Résumé de l'équipement"
+
+#~ msgid "Main muscles"
+#~ msgstr "Muscles principaux"
+
+#~ msgid ""
+#~ "No exercises for this equipment. Add or edit an exercise and set the "
+#~ "equipment."
+#~ msgstr ""
+#~ "Aucun exercices pour cet équipement. Ajoutez ou modifiez un exercice pour "
+#~ "utiliser cet équipement."
+
+#~ msgid "exercise name"
+#~ msgstr "nom de l'exercice"
+
+#, python-format
+#~ msgid ""
+#~ "Your exercise '%(exercise)s' was successfully added to the general\n"
+#~ "database."
+#~ msgstr ""
+#~ "Votre exercice « %(exercise)s » a été rajouté avec succès à\n"
+#~ "la base de donnée."
+
+#~ msgid ""
+#~ "It is now available on the exercise and muscle overview and can be\n"
+#~ "added to workouts. You can access it on this address:"
+#~ msgstr ""
+#~ "Il est maintenant disponible dans la vue d'ensemble des exercices\n"
+#~ "et peut être ajouté à des séances. Vous pouvez y accéder à cette adresse :"
+
+#~ msgid "Submitting an exercise"
+#~ msgstr "Proposer un exercice"
+
+#~ msgid ""
+#~ "Thank you for submitting an exercise. This is much\n"
+#~ "appreciated!"
+#~ msgstr ""
+#~ "Merci d'avoir proposé un exercice.\n"
+#~ "Ceci nous\n"
+#~ "aide beaucoup !"
+
+#~ msgid ""
+#~ "After you submit the form, the administrators will be notified.\n"
+#~ "Once it is reviewed, it will be added to the database. Till this "
+#~ "happens,\n"
+#~ "it will not be visible in the overview or the search. In case you added "
+#~ "your email\n"
+#~ "when you registered, you will get notified when the process is completed "
+#~ "successfully."
+#~ msgstr ""
+#~ "Après avoir soumis le formulaire, les administrateurs en seront "
+#~ "informés.\n"
+#~ "Une fois qu’il sera vérifié, il sera ajouter à la base de données. En "
+#~ "attendant, \n"
+#~ "il ne sera pas visible dans l'aperçu ou dans les recherches. Dans le cas "
+#~ "où vous avez\n"
+#~ "renseigné votre courriel lors de votre inscription, vous serez informé·e "
+#~ "une fois le processus fini avec succès."
+
+#~ msgid "Correcting an exercise"
+#~ msgstr "Corriger un exercice"
+
+#~ msgid ""
+#~ "Thank you for correcting and improving this exercise.\n"
+#~ "This is much appreciated!"
+#~ msgstr ""
+#~ "Merci pour avoir corrigé et amélioré cet exercice.\n"
+#~ "Ceci nous aide beaucoup !"
+
+#~ msgid ""
+#~ "After you submit the form, the administrators will be notified.\n"
+#~ "Once the changes are reviewed the exercise will be updated."
+#~ msgstr ""
+#~ "Après avoir soumis le formulaire, un administrateur sera averti.\n"
+#~ "Une fois que les modifications seront vérifiées, l'exercice sera mis à "
+#~ "jour."
+
+#~ msgid "No categories."
+#~ msgstr "Pas de catégorie."
+
+#~ msgid "Use link to create one"
+#~ msgstr "Utilisez le lien pour en créer"
+
+#~ msgid "Exercise is pending review"
+#~ msgstr "L'exercice est en attente de relecture"
+
+#~ msgid ""
+#~ "This user submitted exercise is pending a decision to be\n"
+#~ " included in the database."
+#~ msgstr ""
+#~ "Cet utilisateur a soumis l’exercice et est en attente d’une décision "
+#~ "avant de\n"
+#~ "figurer dans la base de données."
+
+#~ msgid "Till then, it will not be shown in the overview or the search."
+#~ msgstr ""
+#~ "En attendant, il ne sera pas affiché dans l'overview ou la recherche."
+
+#~ msgid "Images"
+#~ msgstr "Images"
+
+#~ msgid "Add new image"
+#~ msgstr "Ajouter une nouvelle image"
+
+#, fuzzy
+#~| msgid "Add new image"
+#~ msgid "Add new video"
+#~ msgstr "Ajouter une nouvelle image"
+
+#~ msgid "Images pending review"
+#~ msgstr "Images en attente de l’examen"
+
+#~ msgid "Comments for this exercise"
+#~ msgstr "Commentaires sur l'exercice"
+
+#~ msgid "Add new comment"
+#~ msgstr "Commenter"
+
+#~ msgid "The diagram shows the most used muscles on this exercise"
+#~ msgstr "Le diagramme montre les muscles les plus sollicités par l'exercice"
+
+#~ msgid "Exercise Variations"
+#~ msgstr "Variations de l'exercice"
+
+#~ msgid "Submit a correction"
+#~ msgstr "Proposer une correction"
+
+#~ msgid ""
+#~ "No exercises for this muscle. Add or edit an exercise and set the muscle."
+#~ msgstr ""
+#~ "Aucun exercice pour ce muscle. Ajoutez ou modifiez un exercice et "
+#~ "définissez le muscle."
+
+#~ msgid "Add exercise"
+#~ msgstr "Ajouter un exercice"
+
+#~ 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."
+
+#, python-brace-format
+#~ msgid "Correct {0}"
+#~ msgstr "Corriger {0}"
+
+#~ msgid "Exercise was successfully marked as rejected"
+#~ msgstr "L'exercice a été marqué comme rejeté"
+
+#~ msgid "Edit exercise image"
+#~ msgstr "Modifier l’image de l’exercice"
+
+#~ msgid "Delete exercise image?"
+#~ msgstr "Supprimer l'image de l'exercice ?"
+
+#, python-format
+#~ msgid "Edit log entry for %s"
+#~ msgstr "Modifier les entrées de journal pour %s"
+
#~ msgid "Anterior deltoid"
#~ msgstr "Deltoïde antérieur"
@@ -4329,9 +4375,9 @@ msgstr "Supprimer l’entrée de poids pour le %s"
#~ "intéressée.\n"
#~ "Si vous êtes nouveau/nouvelle dans le monde du logiciel libre, nous vous "
#~ "recommandons de jeter un coup d’œil <a href=\"http://schlitt.info/"
-#~ "opensource/blog/0541_10_golden_rules_for_starting_with_open_source.html"
-#~ "\"> cet article</a> qui résume la manière dont les projets à code source "
-#~ "ouvert fonctionnent. "
+#~ "opensource/blog/0541_10_golden_rules_for_starting_with_open_source."
+#~ "html\"> cet article</a> qui résume la manière dont les projets à code "
+#~ "source ouvert fonctionnent. "
#~ msgid ""
#~ "Any kind of contribution is appreciated and welcome.\n"
@@ -4452,8 +4498,8 @@ msgstr "Supprimer l’entrée de poids pour le %s"
#~ "<a href=\"https://groups.google.com/group/wger\">the mailing list</a>."
#~ msgstr ""
#~ "Un problème nécessite un compte Github, si vous n’en avez pas et que vous "
-#~ "ne voulez pas vous inscrire, vous pouvez également l’envoyer à <a href="
-#~ "\"https://groups.google.com/group/wger\"> la liste de diffusion</a>."
+#~ "ne voulez pas vous inscrire, vous pouvez également l’envoyer à <a "
+#~ "href=\"https://groups.google.com/group/wger\"> la liste de diffusion</a>."
#~ msgid ""
#~ "wger Workout Manager is Free/Libre Open Source\n"
@@ -4545,10 +4591,6 @@ msgstr "Supprimer l’entrée de poids pour le %s"
#~ msgid "No filter"
#~ msgstr "Pas de filtre"
-#~ msgctxt "Noun, not verb"
-#~ msgid "Change"
-#~ msgstr "Changer"
-
#~ msgid "Days"
#~ msgstr "Jours"
diff --git a/wger/locale/he/LC_MESSAGES/django.po b/wger/locale/he/LC_MESSAGES/django.po
index f997df826..39e3849e0 100644
--- a/wger/locale/he/LC_MESSAGES/django.po
+++ b/wger/locale/he/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-14 12:01+0200\n"
+"POT-Creation-Date: 2022-11-10 16:03+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"
@@ -28,102 +28,8 @@ msgid ""
"registered users to this gym and update all existing users without a gym."
msgstr ""
-#: 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:226
-msgid "Languages"
-msgstr ""
-
-#: config/templates/language/overview.html:16
-msgid "Nothing found."
-msgstr ""
-
-#: 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:150
-#: nutrition/templates/plan/view.html:153
-#: nutrition/templates/plan/view.html:191
-msgid "Add one now."
-msgstr ""
-
-#: config/templates/language/overview.html:29
-#: core/templates/license/list.html:38 core/templates/misc/license/list.html:41
-#: core/templates/repetition_unit/list.html:41
-#: core/templates/user/overview.html:327 core/templates/user/overview.html:366
-#: core/templates/user/overview.html:402
-#: core/templates/weight_unit/list.html:41 core/views/languages.py:73
-#: core/views/license.py:65 core/views/repetition_units.py:65
-#: core/views/weight_units.py:65
-#: exercises/templates/categories/admin-overview.html:36
-#: 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:61
-msgid "Add"
-msgstr ""
-
-#: 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/language.py:32
-msgid "Language full name"
-msgstr ""
-
-#: config/templates/language/view.html:34 core/templates/user/overview.html:451
-#: gym/views/admin_config.py:44 gym/views/admin_config.py:58
-#: gym/views/user_config.py:46
-msgid "Configuration"
-msgstr ""
-
-#: config/templates/language/view.html:35
-msgid ""
-"Use the configuration to select in what languages the\n"
-"exercises and ingredients will be shown for the current language (for "
-"example\n"
-"the exercises should be shown in languages A, B and C; the ingredients only\n"
-"in A)."
-msgstr ""
-
-#: config/templates/language/view.html:44 gym/templates/contract/list.html:36
-msgid "Show"
-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: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:45
-msgid "Options"
-msgstr ""
-
-#: config/templates/language/view.html:96 config/views/gym_config.py:41
-#: config/views/language_config.py:49 core/templates/license/list.html:16
-#: core/templates/misc/license/list.html:17
+#: config/views/gym_config.py:41 core/templates/language/view.html:57
+#: 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:39
#: core/templates/tags/render_day.html:75 core/templates/user/overview.html:205
@@ -131,12 +37,10 @@ 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:230
-#: exercises/templates/exercise/view.html:351
#: exercises/templates/muscles/admin-overview.html:16
-#: 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
+#: 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
#: 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,81 +56,52 @@ msgstr ""
msgid "Edit"
msgstr ""
-#: 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: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: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
-#: gym/templates/contract_type/list.html:39 gym/templates/document/list.html:46
-#: gym/templates/gym/list.html:20 manager/templates/calendar/day.html:69
-#: 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:231
-#: 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:132
-#: nutrition/templates/units/list.html:20
-msgid "Delete"
-msgstr ""
-
-#: core/demo.py:86
+#: core/demo.py:95
msgid "Sample workout"
msgstr ""
-#: core/demo.py:90
+#: core/demo.py:99
msgid "Sample day"
msgstr ""
-#: core/demo.py:94
+#: core/demo.py:103
msgid "Another sample day"
msgstr ""
-#: core/demo.py:217
-msgid "Sample nutrional plan"
+#: core/demo.py:211
+msgid "Sample nutritional plan"
msgstr ""
-#: core/demo.py:349 core/demo.py:351 core/demo.py:353
+#: core/demo.py:343 core/demo.py:345 core/demo.py:347
#, python-brace-format
msgid "Placeholder workout nr {0} for schedule"
msgstr ""
-#: core/demo.py:358
+#: core/demo.py:352
msgid "My cool workout schedule"
msgstr ""
-#: core/demo.py:397 core/demo.py:412
+#: core/demo.py:391 core/demo.py:406
msgid "Empty placeholder schedule"
msgstr ""
-#: core/forms.py:61 core/templates/navigation.html:188
-#: core/templates/navigation.html:192 core/templates/user/login.html:4
+#: core/forms.py:64 core/templates/navigation.html:179
+#: core/templates/navigation.html:183 core/templates/user/login.html:4
#: software/templates/features.html:43
msgid "Login"
msgstr ""
-#: core/forms.py:73 core/forms.py:164 gym/views/export.py:63
+#: core/forms.py:76 core/forms.py:177 gym/views/export.py:63
#: gym/views/gym.py:218
msgid "First name"
msgstr ""
-#: core/forms.py:74 core/forms.py:165 core/templates/user/overview.html:267
+#: core/forms.py:77 core/forms.py:178 core/templates/user/overview.html:267
#: gym/views/export.py:64 gym/views/gym.py:218
msgid "Last name"
msgstr ""
-#: core/forms.py:76 core/forms.py:131 core/templates/user/overview.html:271
+#: core/forms.py:79 core/forms.py:144 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
@@ -236,75 +111,105 @@ msgstr ""
msgid "Email"
msgstr ""
-#: core/forms.py:77
+#: core/forms.py:80
msgid "Used for password resets and, optionally, e-mail reminders."
msgstr ""
-#: core/forms.py:102
+#: core/forms.py:84 core/models/profile.py:220
+#: gym/templates/gym/new_user.html:38
+msgid "Date of Birth"
+msgstr ""
+
+#: core/forms.py:116
msgid "Personal data"
msgstr ""
-#: core/forms.py:110
+#: core/forms.py:124
msgid "Workout reminders"
msgstr ""
-#: core/forms.py:117
+#: core/forms.py:131
msgid "Other settings"
msgstr ""
-#: 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
+#: core/forms.py:138 core/views/user.py:615 core/views/user.py:630
+#: core/views/user.py:642 gym/forms.py:72 manager/templates/log/add.html:65
+#: manager/templates/set/add.html:69 manager/views/workout.py:222
+#: utils/generic_views.py:143
msgid "Save"
msgstr ""
-#: core/forms.py:132
+#: core/forms.py:145
msgid "Used for password resets and, optionally, email reminders."
msgstr ""
-#: core/forms.py:160
+#: core/forms.py:173
msgid "This e-mail address is already in use."
msgstr ""
-#: core/forms.py:180 gym/templates/gym/new_user.html:26
+#: core/forms.py:193 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:182
+#: core/forms.py:195
msgid "Please enter your current password."
msgstr ""
-#: core/forms.py:200
+#: core/forms.py:204 core/templates/language/view.html:62
+#: 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: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/muscles/admin-overview.html:17
+#: gym/templates/admin_notes/list.html:40
+#: gym/templates/contract_option/list.html:39
+#: gym/templates/contract_type/list.html:39 gym/templates/document/list.html:46
+#: gym/templates/gym/list.html:20 manager/templates/calendar/day.html:69
+#: 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:231
+#: 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:132
+#: nutrition/templates/units/list.html:20
+msgid "Delete"
+msgstr ""
+
+#: core/forms.py:213
msgid "Invalid password"
msgstr ""
-#: core/forms.py:212 core/forms.py:278
+#: core/forms.py:225 core/forms.py:291
msgid "The form is secured with reCAPTCHA"
msgstr ""
-#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:188
-#: core/templates/navigation.html:193 core/templates/template.html:149
-#: core/templates/user/login.html:20 core/views/user.py:293
+#: core/forms.py:239 core/forms.py:258 core/templates/navigation.html:179
+#: core/templates/navigation.html:184 core/templates/template.html:149
+#: core/templates/user/login.html:20 core/views/user.py:300
#: software/templates/features.html:38
msgid "Register"
msgstr ""
-#: core/forms.py:256
+#: core/forms.py:269
msgid "Contact"
msgstr ""
-#: core/forms.py:257
+#: core/forms.py:270
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:71
+#: core/forms.py:278 exercises/models/comment.py:42 manager/models/set.py:60
+#: manager/models/setting.py:111 nutrition/models/log.py:71
msgid "Comment"
msgstr ""
-#: core/forms.py:266
+#: core/forms.py:279
msgid "What do you want to say?"
msgstr ""
@@ -312,6 +217,14 @@ msgstr ""
msgid "Day of the week"
msgstr ""
+#: core/models/language.py:31 core/templates/language/view.html:21
+msgid "Language short name"
+msgstr ""
+
+#: core/models/language.py:36 core/templates/language/view.html:22
+msgid "Language full name"
+msgstr ""
+
#: core/models/license.py:29
msgid "Full name"
msgstr ""
@@ -367,19 +280,19 @@ msgstr ""
msgid "Imperial (pound)"
msgstr ""
-#: core/models/profile.py:111
+#: core/models/profile.py:114
msgid "Show exercise comments"
msgstr ""
-#: core/models/profile.py:112
+#: core/models/profile.py:115
msgid "Check to show exercise comments on the workout view"
msgstr ""
-#: core/models/profile.py:123
+#: core/models/profile.py:126
msgid "Also use ingredients in English"
msgstr ""
-#: core/models/profile.py:125
+#: core/models/profile.py:128
msgid ""
"Check to also show ingredients in English while creating\n"
"a nutritional plan. These ingredients are extracted from a list provided\n"
@@ -387,130 +300,129 @@ msgid ""
"7000 entries, but can be somewhat overwhelming and make the search difficult."
msgstr ""
-#: core/models/profile.py:134
+#: core/models/profile.py:137
msgid "Activate workout reminders"
msgstr ""
-#: core/models/profile.py:136
+#: core/models/profile.py:139
msgid ""
"Check to activate automatic reminders for workouts. You need to provide a "
"valid email for this to work."
msgstr ""
-#: core/models/profile.py:145
+#: core/models/profile.py:148
msgid "Remind before expiration"
msgstr ""
-#: core/models/profile.py:146
+#: core/models/profile.py:149
msgid "The number of days you want to be reminded before a workout expires."
msgstr ""
-#: core/models/profile.py:152
+#: core/models/profile.py:155
msgid "Default duration of workouts"
msgstr ""
-#: core/models/profile.py:154
+#: core/models/profile.py:157
msgid ""
"Default duration in weeks of workouts not in a schedule. Used for email "
"workout reminders."
msgstr ""
-#: core/models/profile.py:171
+#: core/models/profile.py:174
msgid "Notification language"
msgstr ""
-#: core/models/profile.py:173
+#: core/models/profile.py:176
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/profile.py:186 gym/views/export.py:66
+#: core/models/profile.py:212 gym/views/export.py:66
msgid "Age"
msgstr ""
-#: core/models/profile.py:202 nutrition/forms.py:99
+#: core/models/profile.py:228 nutrition/forms.py:100
msgid "Height (cm)"
msgstr ""
-#: core/models/profile.py:219
+#: core/models/profile.py:245
msgid "Hours of sleep"
msgstr ""
-#: core/models/profile.py:220
+#: core/models/profile.py:246
msgid "The average hours of sleep per day"
msgstr ""
-#: core/models/profile.py:229
+#: core/models/profile.py:255
msgid "Work"
msgstr ""
-#: core/models/profile.py:230 core/models/profile.py:272
+#: core/models/profile.py:256 core/models/profile.py:298
msgid "Average hours per day"
msgstr ""
-#: core/models/profile.py:239 core/models/profile.py:260
-#: core/models/profile.py:281
+#: core/models/profile.py:265 core/models/profile.py:286
+#: core/models/profile.py:307
msgid "Physical intensity"
msgstr ""
-#: core/models/profile.py:240 core/models/profile.py:261
-#: core/models/profile.py:282
+#: core/models/profile.py:266 core/models/profile.py:287
+#: core/models/profile.py:308
msgid "Approximately"
msgstr ""
-#: core/models/profile.py:250
+#: core/models/profile.py:276
msgid "Sport"
msgstr ""
-#: core/models/profile.py:251
+#: core/models/profile.py:277
msgid "Average hours per week"
msgstr ""
-#: core/models/profile.py:271
+#: core/models/profile.py:297
msgid "Free time"
msgstr ""
-#: core/models/profile.py:292 nutrition/templates/rate/form.html:66
+#: core/models/profile.py:318 nutrition/templates/rate/form.html:66
msgid "Total daily calories"
msgstr ""
-#: core/models/profile.py:293
+#: core/models/profile.py:319
msgid "Total caloric intake, including e.g. any surplus"
msgstr ""
-#: core/models/profile.py:305 nutrition/models/ingredient_weight_unit.py:45
+#: core/models/profile.py:331 nutrition/models/ingredient_weight_unit.py:45
#: nutrition/models/log.py:90 nutrition/models/meal_item.py:58
msgid "Weight unit"
msgstr ""
-#: core/models/profile.py:313
+#: core/models/profile.py:339
msgid "Allow external access"
msgstr ""
-#: core/models/profile.py:315
+#: core/models/profile.py:341
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/profile.py:324
+#: core/models/profile.py:350
msgid "Automatic reminders for weight entries"
msgstr ""
-#: core/models/profile.py:326
+#: core/models/profile.py:352
msgid "Number of days after the last weight entry (enter 0 to deactivate)"
msgstr ""
-#: core/models/profile.py:392
+#: core/models/profile.py:418
msgid "The sum of all hours has to be 24"
msgstr ""
#: core/models/rep_unit.py:35 core/models/weight_unit.py:35
-#: core/templates/user/overview.html:263 core/views/user.py:575
+#: core/templates/user/overview.html:263 core/views/user.py:591
#: 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
+#: exercises/models/exercise.py:64 exercises/models/muscle.py:36
#: 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
@@ -569,6 +481,50 @@ msgstr ""
msgid "Are you sure you want to delete this? This action cannot be undone."
msgstr ""
+#: core/templates/email_verification/confirm_template.html:4
+msgid "Email verified"
+msgstr ""
+
+#: core/templates/email_verification/confirm_template.html:18
+#, python-format
+msgid "%(username)s, your email was verified"
+msgstr ""
+
+#: core/templates/email_verification/confirm_template.html:22
+msgid "Error, invalid verification token"
+msgstr ""
+
+#: core/templates/email_verification/email_body_html.tpl:6
+msgid "Email Confirmation"
+msgstr ""
+
+#: core/templates/email_verification/email_body_html.tpl:9
+#: core/templates/email_verification/email_body_txt.tpl:3
+#, python-format
+msgid "You are almost there, %(username)s!"
+msgstr ""
+
+#: core/templates/email_verification/email_body_html.tpl:11
+#, python-format
+msgid "Please click <a href=\"%(link)s\">here</a> to confirm your email"
+msgstr ""
+
+#: core/templates/email_verification/email_body_html.tpl:12
+#: core/templates/email_verification/email_body_txt.tpl:5
+#, python-format
+msgid "The token expires on %(time)s"
+msgstr ""
+
+#: core/templates/email_verification/email_body_html.tpl:14
+#: core/templates/email_verification/email_body_txt.tpl:8
+msgid "the wger Team"
+msgstr ""
+
+#: core/templates/email_verification/email_body_txt.tpl:4
+#, python-format
+msgid "Please click the following link to confirm your email: %(link)s"
+msgstr ""
+
#: core/templates/index.html:4
msgid "Dashboard"
msgstr ""
@@ -625,7 +581,7 @@ msgid "Add custom diary entry"
msgstr ""
#: core/templates/index.html:84 core/templates/index.html:92
-#: manager/models/day.py:34 manager/models/log.py:56
+#: manager/models/day.py:34 manager/models/log.py:58
#: manager/models/session.py:60 manager/models/workout.py:109
#: manager/templates/schedule/view.html:105
#: manager/templates/workout/view.html:11
@@ -656,6 +612,20 @@ msgstr ""
msgid "No workouts found."
msgstr ""
+#: core/templates/index.html:137 core/templates/index.html:189
+#: core/templates/language/overview.html:23
+#: 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:150
+#: nutrition/templates/plan/view.html:153
+#: nutrition/templates/plan/view.html:191
+msgid "Add one now."
+msgstr ""
+
#: 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
@@ -709,19 +679,59 @@ msgid "No nutrition plans."
msgstr ""
#: 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
+#: core/templates/user/overview.html:121 manager/forms.py:184
+#: manager/helpers.py:89 manager/models/log.py:86 manager/models/setting.py:79
+#: manager/templates/log/add.html:54 manager/templates/set/formset.html:11
#: weight/models.py: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:210 core/templates/navigation.html:135
+#: core/templates/index.html:210 core/templates/navigation.html:126
#: weight/views.py:70
msgid "Add weight entry"
msgstr ""
+#: core/templates/language/overview.html:4 core/templates/navigation.html:217
+msgid "Languages"
+msgstr ""
+
+#: core/templates/language/overview.html:23
+msgid "Nothing found."
+msgstr ""
+
+#: core/templates/language/overview.html:36 core/templates/license/list.html:38
+#: core/templates/misc/license/list.html:41
+#: core/templates/repetition_unit/list.html:41
+#: core/templates/user/overview.html:327 core/templates/user/overview.html:366
+#: core/templates/user/overview.html:402
+#: core/templates/weight_unit/list.html:41 core/views/languages.py:73
+#: core/views/license.py:65 core/views/repetition_units.py:65
+#: core/views/weight_units.py:65
+#: exercises/templates/categories/admin-overview.html:36
+#: 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:61
+msgid "Add"
+msgstr ""
+
+#: core/templates/language/view.html:52 core/templates/user/api_key.html:44
+#: core/templates/user/preferences.html:44 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:45
+msgid "Options"
+msgstr ""
+
#: core/templates/license/list.html:4 core/templates/misc/license/list.html:4
msgid "License list"
msgstr ""
@@ -734,7 +744,6 @@ msgstr ""
#: core/templates/weight_unit/list.html:26
#: exercises/templates/categories/admin-overview.html:24
#: exercises/templates/equipment/admin-overview.html:24
-#: exercises/templates/exercise/pending.html:30
#: exercises/templates/muscles/admin-overview.html:24
#: gym/templates/admin_notes/list.html:52 gym/templates/contract/list.html:60
#: gym/templates/contract_option/list.html:56
@@ -812,155 +821,133 @@ msgstr ""
msgid "Public templates"
msgstr ""
-#: core/templates/navigation.html:64
-msgctxt "as in sorted by category"
-msgid "by category"
-msgstr ""
-
-#: core/templates/navigation.html:65
-msgctxt "as in sorted by muscle"
-msgid "by muscle"
-msgstr ""
-
-#: core/templates/navigation.html:66
-msgctxt "as in sorted by equipment"
-msgid "by equipment"
-msgstr ""
-
-#: core/templates/navigation.html:70
-#: exercises/templates/equipment/overview.html:109
-#: exercises/templates/equipment/overview.html:113
-#: exercises/templates/exercise/overview.html:112
-#: exercises/templates/exercise/overview.html:116
-#: exercises/templates/muscles/overview.html:112
-#: exercises/templates/muscles/overview.html:116
-msgid "Add new exercise"
+#: core/templates/navigation.html:63 manager/forms.py:133
+#: manager/models/setting.py:54
+msgid "Exercises"
msgstr ""
-#: core/templates/navigation.html:75 core/templates/navigation.html:116
-#: core/templates/navigation.html:224
+#: core/templates/navigation.html:67 core/templates/navigation.html:107
+#: core/templates/navigation.html:215
msgid "Administration"
msgstr ""
-#: core/templates/navigation.html:76
-#: exercises/templates/exercise/pending.html:6
-msgid "Exercises pending review"
+#: core/templates/navigation.html:68
+msgid "Exercise edit history"
msgstr ""
-#: core/templates/navigation.html:77 exercises/models/base.py:72
-#: exercises/templates/exercise/view.html:80
+#: core/templates/navigation.html:69 exercises/models/base.py:84
msgid "Equipment"
msgstr ""
-#: core/templates/navigation.html:78 exercises/templates/exercise/view.html:258
+#: core/templates/navigation.html:70
msgid "Muscles"
msgstr ""
-#: core/templates/navigation.html:79
+#: core/templates/navigation.html:71
#: exercises/templates/categories/admin-overview.html:4
msgid "Categories"
msgstr ""
-#: core/templates/navigation.html:93 software/templates/features.html:87
+#: core/templates/navigation.html:84 software/templates/features.html:87
msgid "Nutrition"
msgstr ""
-#: core/templates/navigation.html:99 core/templates/user/overview.html:144
+#: core/templates/navigation.html:90 core/templates/user/overview.html:144
msgid "Nutrition plans"
msgstr ""
-#: core/templates/navigation.html:105 nutrition/templates/bmi/form.html:50
+#: core/templates/navigation.html:96 nutrition/templates/bmi/form.html:50
msgid "BMI calculator"
msgstr ""
-#: core/templates/navigation.html:111 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:102 nutrition/templates/rate/form.html:17
msgid "Daily calories calculator"
msgstr ""
-#: core/templates/navigation.html:113
+#: core/templates/navigation.html:104
#: nutrition/templates/ingredient/overview.html:29
msgid "Ingredient overview"
msgstr ""
-#: core/templates/navigation.html:117 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:108 nutrition/templates/units/list.html:6
msgid "Ingredient weight units"
msgstr ""
-#: core/templates/navigation.html:118
+#: core/templates/navigation.html:109
#: nutrition/templates/ingredient/pending.html:6
msgid "Ingredients pending review"
msgstr ""
-#: core/templates/navigation.html:132
+#: core/templates/navigation.html:123
msgid "Body weight"
msgstr ""
-#: core/templates/navigation.html:134 core/templates/user/overview.html:114
+#: core/templates/navigation.html:125 core/templates/user/overview.html:114
#: weight/templates/overview.html:7
msgid "Weight overview"
msgstr ""
-#: core/templates/navigation.html:147
+#: core/templates/navigation.html:138
msgid "About this software"
msgstr ""
-#: core/templates/navigation.html:149 core/templates/template_features.html:82
+#: core/templates/navigation.html:140 core/templates/template_features.html:82
#: software/templates/about_us.html:5
msgid "About us"
msgstr ""
-#: core/templates/navigation.html:151 software/templates/features.html:209
+#: core/templates/navigation.html:142 software/templates/features.html:209
msgid "REST API"
msgstr ""
-#: core/templates/navigation.html:155 utils/models.py:40
+#: core/templates/navigation.html:146 utils/models.py:41
msgid "License"
msgstr ""
-#: core/templates/navigation.html:161
+#: core/templates/navigation.html:152
msgid "Developer documentation"
msgstr ""
-#: core/templates/navigation.html:167
+#: core/templates/navigation.html:158
msgid "Get the code"
msgstr ""
-#: core/templates/navigation.html:173 core/templates/template.html:204
+#: core/templates/navigation.html:164 core/templates/template.html:203
#: core/templates/template_features.html:99
msgid "Translate"
msgstr ""
-#: core/templates/navigation.html:194 core/templates/user/login.html:28
+#: core/templates/navigation.html:185 core/templates/user/login.html:28
msgid "Reset password"
msgstr ""
-#: core/templates/navigation.html:207
+#: core/templates/navigation.html:198
msgid "My preferences"
msgstr ""
-#: core/templates/navigation.html:214
+#: core/templates/navigation.html:205
msgid "Logout"
msgstr ""
-#: core/templates/navigation.html:229
+#: core/templates/navigation.html:220
msgid "Licenses"
msgstr ""
-#: core/templates/navigation.html:232
+#: core/templates/navigation.html:223
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr ""
-#: core/templates/navigation.html:235 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:226 core/templates/weight_unit/list.html:4
#: nutrition/templates/ingredient/view.html:174
msgid "Weight units"
msgstr ""
-#: core/templates/navigation.html:238 core/templates/user/list.html:4
+#: core/templates/navigation.html:229 core/templates/user/list.html:4
msgid "User list"
msgstr ""
-#: core/templates/navigation.html:239
+#: core/templates/navigation.html:230
msgid "Gyms"
msgstr ""
@@ -1035,33 +1022,30 @@ msgstr ""
msgid "Add weight log"
msgstr ""
-#: core/templates/tags/render_day.html:114
-#: exercises/templates/equipment/overview.html:59
-#: exercises/templates/exercise/overview.html:63
-#: exercises/templates/muscles/overview.html:65
+#: core/templates/tags/render_day.html:116
msgid "Placeholder image for exercise"
msgstr ""
-#: core/templates/tags/render_day.html:131
+#: core/templates/tags/render_day.html:133
msgid "This exercise has no repetitions."
msgstr ""
-#: core/templates/tags/render_day.html:134
+#: core/templates/tags/render_day.html:136
msgid "Edit them now."
msgstr ""
-#: core/templates/tags/render_day.html:159
+#: core/templates/tags/render_day.html:162
msgid "Add exercises to this workout day"
msgstr ""
#: core/templates/tags/render_weight_log.html:17 manager/helpers.py:89
-#: manager/models/setting.py:57 manager/templates/set/formset.html:10
+#: manager/models/setting.py:69 manager/templates/set/formset.html:9
msgid "Reps"
msgstr ""
-#: 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
+#: core/templates/tags/render_weight_log.html:30 manager/forms.py:189
+#: manager/models/log.py:103 manager/models/setting.py:99
+#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
msgid "RiR"
msgstr ""
@@ -1084,7 +1068,7 @@ msgstr ""
msgid "Features"
msgstr ""
-#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:37
+#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:53
msgid "API key"
msgstr ""
@@ -1124,11 +1108,12 @@ msgid "Documentation"
msgstr ""
#: core/templates/user/delete_account.html:4
-#: core/templates/user/preferences.html:42
+#: core/templates/user/preferences.html:58
msgid "Delete account"
msgstr ""
#: core/templates/user/delete_account.html:17
+#: exercises/templates/history/overview.html:93
msgid "Are you sure?"
msgstr ""
@@ -1173,11 +1158,12 @@ 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/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
+#: exercises/models/base.py:99 exercises/models/base.py:104
+#: exercises/models/exercise.py:69 exercises/models/exercise.py:76
+#: gallery/models/image.py:47 manager/helpers.py:88 manager/models/log.py:100
+#: 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/views.py:150
@@ -1185,11 +1171,11 @@ msgid "Date"
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: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
+#: exercises/models/exercise.py:57 exercises/views/exercises.py:123
+#: 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 ""
@@ -1197,12 +1183,12 @@ msgstr ""
msgid "Number of logs (days)"
msgstr ""
-#: core/templates/user/overview.html:37 core/views/user.py:576
+#: core/templates/user/overview.html:37 core/views/user.py:592
#: 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:267
+#: core/templates/user/overview.html:68 manager/forms.py:278
#: manager/templates/workout/view.html:151
msgid "Log"
msgstr ""
@@ -1220,6 +1206,7 @@ msgid "Notes"
msgstr ""
#: core/templates/user/overview.html:79
+#: exercises/templates/history/overview.html:30
#: manager/templates/calendar/partial_overview_table.html:42
#: nutrition/templates/log/detail.html:154
msgid "Time"
@@ -1267,10 +1254,12 @@ msgid "Do you really want to change this user&#39;s password?"
msgstr ""
#: core/templates/user/overview.html:233
+#: exercises/templates/history/overview.html:106
msgid "No"
msgstr ""
#: core/templates/user/overview.html:234
+#: exercises/templates/history/overview.html:99
msgid "Yes"
msgstr ""
@@ -1325,10 +1314,15 @@ msgid "Documents"
msgstr ""
#: core/templates/user/overview.html:413 gym/templates/document/list.html:32
-#: manager/forms.py:279 manager/templates/workout/view.html:176
+#: manager/forms.py:290 manager/templates/workout/view.html:176
msgid "Download"
msgstr ""
+#: core/templates/user/overview.html:451 gym/views/admin_config.py:44
+#: gym/views/admin_config.py:58 gym/views/user_config.py:46
+msgid "Configuration"
+msgstr ""
+
#: core/templates/user/overview.html:454 gym/models/user_config.py:92
msgid "Include in inactive overview"
msgstr ""
@@ -1346,7 +1340,23 @@ msgstr ""
msgid "Preferences"
msgstr ""
-#: core/templates/user/preferences.html:33 core/views/user.py:587
+#: core/templates/user/preferences.html:19
+msgid "Verified email"
+msgstr ""
+
+#: core/templates/user/preferences.html:24
+msgid "Unverified email"
+msgstr ""
+
+#: core/templates/user/preferences.html:26
+msgid "Send verification email"
+msgstr ""
+
+#: core/templates/user/preferences.html:30
+msgid "You need to verify your email to contribute exercises"
+msgstr ""
+
+#: core/templates/user/preferences.html:49 core/views/user.py:603
msgid "Change password"
msgstr ""
@@ -1376,39 +1386,37 @@ msgid "oz"
msgstr ""
#: 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
+#: exercises/views/equipment.py:104 exercises/views/exercises.py:185
+#: exercises/views/muscles.py:99 manager/views/schedule.py:311
+#: manager/views/schedule_step.py:129 manager/views/workout.py:269
+#: manager/views/workout_session.py:141 nutrition/views/ingredient.py:138
#: 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:431
-#: exercises/views/muscles.py:125 gallery/views/images.py:121
+#: exercises/views/categories.py:127 exercises/views/exercises.py:193
+#: exercises/views/muscles.py:106 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
+#: manager/views/workout.py:273 manager/views/workout_session.py:156
+#: nutrition/views/ingredient.py:145 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:456
+#: core/views/repetition_units.py:85 core/views/user.py:472
#: 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: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
+#: exercises/views/equipment.py:81 exercises/views/muscles.py:86
+#: 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:170
+#: gym/views/gym.py:459 manager/views/day.py:100 manager/views/schedule.py:335
+#: manager/views/workout.py:287 nutrition/views/ingredient.py:164
+#: nutrition/views/plan.py:144 nutrition/views/unit.py:144
#, python-brace-format
msgid "Edit {0}"
msgstr ""
@@ -1436,64 +1444,65 @@ msgstr ""
msgid "Your feedback was successfully sent. Thank you!"
msgstr ""
-#: core/views/user.py:156
+#: core/views/user.py:157
#, python-brace-format
msgid "Account \"{0}\" was successfully deleted"
msgstr ""
-#: core/views/user.py:287
+#: core/views/user.py:294
msgid "You were successfully registered"
msgstr ""
-#: core/views/user.py:339
+#: core/views/user.py:355
msgid "Settings successfully updated"
msgstr ""
-#: core/views/user.py:376
+#: core/views/user.py:392
msgid "The user was successfully deactivated"
msgstr ""
-#: core/views/user.py:411
+#: core/views/user.py:427
msgid "The user was successfully activated"
msgstr ""
-#: core/views/user.py:426
+#: core/views/user.py:442
msgid "Edit user"
msgstr ""
-#: core/views/user.py:573 gym/templates/gym/member_list.html:26
+#: core/views/user.py:589 gym/templates/gym/member_list.html:26
#: gym/views/gym.py:156
msgid "ID"
msgstr ""
-#: core/views/user.py:574 gym/forms.py:94 gym/templates/contract/view.html:55
+#: core/views/user.py:590 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:577 gym/templates/gym/new_user.html:34
+#: core/views/user.py:593 gym/templates/gym/new_user.html:34
#: gym/views/export.py:60 gym/views/gym.py:218
msgid "Gym"
msgstr ""
-#: exercises/models/base.py:51 exercises/templates/exercise/view.html:76
-#: nutrition/models/ingredient.py:204
+#: core/views/user.py:652
+#, python-format
+msgid "A verification email was sent to %(email)s"
+msgstr ""
+
+#: exercises/models/base.py:63 nutrition/models/ingredient.py:204
msgid "Category"
msgstr ""
-#: exercises/models/base.py:58
+#: exercises/models/base.py:70
msgid "Primary muscles"
msgstr ""
-#: exercises/models/base.py:64 exercises/templates/equipment/overview.html:71
-#: exercises/templates/exercise/overview.html:76
-#: exercises/templates/exercise/view.html:268
-#: exercises/templates/muscles/overview.html:77
+#: exercises/models/base.py:76
msgid "Secondary muscles"
msgstr ""
-#: exercises/models/base.py:79
+#: exercises/models/base.py:91
msgid "Variations"
msgstr ""
@@ -1501,90 +1510,68 @@ msgstr ""
msgid "Exercise Categories"
msgstr ""
-#: exercises/models/comment.py:34 exercises/models/exercise_alias.py:32
-#: exercises/models/image.py:75 exercises/models/video.py:82
-#: manager/forms.py:165 manager/helpers.py:89 manager/models/log.py:51
+#: exercises/models/comment.py:37 exercises/models/exercise_alias.py:35
+#: exercises/models/image.py:71 exercises/models/video.py:95
+#: manager/forms.py:176 manager/helpers.py:89 manager/models/log.py:52
msgid "Exercise"
msgstr ""
-#: exercises/models/comment.py:41
+#: exercises/models/comment.py:43
msgid "A comment about how to correctly do this exercise."
msgstr ""
-#: exercises/models/exercise.py:86 nutrition/models/ingredient.py:80
+#: exercises/models/exercise.py:81 nutrition/models/ingredient.py:80
#: nutrition/models/plan.py:61 nutrition/models/weight_unit.py:32
msgid "Language"
msgstr ""
-#: exercises/models/exercise.py:237 exercises/views/exercises.py:461
-msgid "Exercise was successfully added to the general database"
-msgstr ""
-
-#: exercises/models/exercise.py:265
-msgid "New user submitted exercise"
-msgstr ""
-
-#: exercises/models/exercise.py:267
-#, python-brace-format
-msgid "The user {0} submitted a new exercise \"{1}\"."
-msgstr ""
-
-#: exercises/models/exercise_alias.py:35
+#: exercises/models/exercise_alias.py:38
msgid "Alias for an exercise"
msgstr ""
-#: exercises/models/image.py:59
+#: exercises/models/image.py:55
msgid "Line"
msgstr ""
-#: exercises/models/image.py:60
+#: exercises/models/image.py:56
msgid "3D"
msgstr ""
-#: exercises/models/image.py:61
+#: exercises/models/image.py:57
msgid "Low-poly"
msgstr ""
-#: exercises/models/image.py:62
+#: exercises/models/image.py:58
msgid "Photo"
msgstr ""
-#: exercises/models/image.py:63
+#: exercises/models/image.py:59
msgid "Other"
msgstr ""
-#: exercises/models/image.py:81 gallery/models/image.py:56
+#: exercises/models/image.py:77 gallery/models/image.py:56
msgid "Image"
msgstr ""
-#: exercises/models/image.py:82 gallery/models/image.py:57
+#: exercises/models/image.py:78 gallery/models/image.py:57
msgid "Only PNG and JPEG formats are supported"
msgstr ""
-#: exercises/models/image.py:88
+#: exercises/models/image.py:84
msgid "Main picture"
msgstr ""
-#: exercises/models/image.py:91
+#: exercises/models/image.py:87
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:100
+#: exercises/models/image.py:96
msgid "The art style of your image"
msgstr ""
-#: exercises/models/image.py:185
-msgid "New user submitted image"
-msgstr ""
-
-#: exercises/models/image.py:186
-#, python-brace-format
-msgid "The user {0} submitted a new image \"{1}\" for exercise {2}."
-msgstr ""
-
#: exercises/models/muscle.py:37
msgid "In latin, e.g. \"Pectoralis major\""
msgstr ""
@@ -1597,47 +1584,48 @@ msgstr ""
msgid "A more basic name for the muscle"
msgstr ""
-#: exercises/models/video.py:41
-msgid "Maximum file size is 100MB."
+#: exercises/models/video.py:50
+#, python-format
+msgid "Maximum file size is %(size)sMB."
msgstr ""
-#: exercises/models/video.py:44 exercises/models/video.py:48
+#: exercises/models/video.py:57 exercises/models/video.py:65
msgid "File type is not supported"
msgstr ""
-#: exercises/models/video.py:57
+#: exercises/models/video.py:70
msgid "File is not a valid video"
msgstr ""
-#: exercises/models/video.py:88
+#: exercises/models/video.py:101
msgid "Main video"
msgstr ""
-#: exercises/models/video.py:94
+#: exercises/models/video.py:107
msgid "Video"
msgstr ""
-#: exercises/models/video.py:101
+#: exercises/models/video.py:114
msgid "Size"
msgstr ""
-#: exercises/models/video.py:108 manager/models/schedule_step.py:56
+#: exercises/models/video.py:121 manager/models/schedule_step.py:56
msgid "Duration"
msgstr ""
-#: exercises/models/video.py:117
+#: exercises/models/video.py:130
msgid "Width"
msgstr ""
-#: exercises/models/video.py:124
+#: exercises/models/video.py:137
msgid "Height"
msgstr ""
-#: exercises/models/video.py:131
+#: exercises/models/video.py:144
msgid "Codec"
msgstr ""
-#: exercises/models/video.py:139
+#: exercises/models/video.py:152
msgid "Codec, long name"
msgstr ""
@@ -1646,121 +1634,19 @@ msgid "Equipment list"
msgstr ""
#: exercises/templates/equipment/admin-overview.html:37
-#: exercises/views/equipment.py:94
+#: exercises/views/equipment.py:92
msgid "Add new equipment"
msgstr ""
-#: exercises/templates/equipment/overview.html:11
-msgid "Equipment overview"
-msgstr ""
-
-#: exercises/templates/equipment/overview.html:69
-#: exercises/templates/exercise/overview.html:74
-#: exercises/templates/exercise/view.html:264
-#: exercises/templates/muscles/overview.html:75
-msgid "Main muscles"
-msgstr ""
-
-#: exercises/templates/equipment/overview.html:79
-msgid ""
-"No exercises for this equipment. Add or edit an exercise and set the "
-"equipment."
-msgstr ""
-
-#: exercises/templates/equipment/overview.html:96
-#: exercises/templates/exercise/overview.html:99
-#: nutrition/templates/ingredient/overview.html:57
-msgid "Search"
+#: exercises/templates/history/overview.html:11
+msgid "Exercise admin history"
msgstr ""
-#: exercises/templates/equipment/overview.html:101
-#: exercises/templates/exercise/overview.html:104
-msgid "exercise name"
+#: exercises/templates/history/overview.html:27
+msgid "Action"
msgstr ""
-#: exercises/templates/equipment/overview.html:115
-#: exercises/templates/exercise/overview.html:118
-#: exercises/templates/muscles/overview.html:118
-#: nutrition/templates/ingredient/overview.html:85
-msgid "Only registered users can do this"
-msgstr ""
-
-#: exercises/templates/exercise/email_new.tpl:1
-#, python-format
-msgid ""
-"Your exercise '%(exercise)s' was successfully added to the general\n"
-"database."
-msgstr ""
-
-#: exercises/templates/exercise/email_new.tpl:4
-msgid ""
-"It is now available on the exercise and muscle overview and can be\n"
-"added to workouts. You can access it on this address:"
-msgstr ""
-
-#: exercises/templates/exercise/email_new.tpl:8
-#: nutrition/templates/ingredient/email_new.tpl:8
-msgid "Thank you for contributing and making this site better!"
-msgstr ""
-
-#: exercises/templates/exercise/email_new.tpl:9
-#: manager/templates/workout/email_reminder.tpl:15
-#: manager/templates/workout/email_weight_reminder.tpl:12
-#: nutrition/templates/ingredient/email_new.tpl:9
-#, python-format
-msgid "The %(site)s team"
-msgstr ""
-
-#: exercises/templates/exercise/form.html:4
-msgid "Submitting an exercise"
-msgstr ""
-
-#: exercises/templates/exercise/form.html:5
-msgid ""
-"Thank you for submitting an exercise. This is much\n"
-"appreciated!"
-msgstr ""
-
-#: exercises/templates/exercise/form.html:8
-msgid ""
-"After you submit the form, the administrators will be notified.\n"
-"Once it is reviewed, it will be added to the database. Till this happens,\n"
-"it will not be visible in the overview or the search. In case you added your "
-"email\n"
-"when you registered, you will get notified when the process is completed "
-"successfully."
-msgstr ""
-
-#: exercises/templates/exercise/form_correct.html:4
-msgid "Correcting an exercise"
-msgstr ""
-
-#: exercises/templates/exercise/form_correct.html:5
-msgid ""
-"Thank you for correcting and improving this exercise.\n"
-"This is much appreciated!"
-msgstr ""
-
-#: exercises/templates/exercise/form_correct.html:8
-msgid ""
-"After you submit the form, the administrators will be notified.\n"
-"Once the changes are reviewed the exercise will be updated."
-msgstr ""
-
-#: exercises/templates/exercise/overview.html:88
-msgid "No categories."
-msgstr ""
-
-#: exercises/templates/exercise/overview.html:88
-msgid "Use link to create one"
-msgstr ""
-
-#: exercises/templates/exercise/pending.html:14
-#: nutrition/templates/ingredient/pending.html:14
-msgid "Submission date"
-msgstr ""
-
-#: exercises/templates/exercise/pending.html:16 gallery/models/image.py:51
+#: exercises/templates/history/overview.html:28 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/log.py:45
@@ -1771,97 +1657,39 @@ msgstr ""
msgid "User"
msgstr ""
-#: exercises/templates/exercise/view.html:48
-msgid "Exercise is pending review"
-msgstr ""
-
-#: exercises/templates/exercise/view.html:51
-msgid ""
-"This user submitted exercise is pending a decision to be\n"
-" included in the database."
-msgstr ""
-
-#: exercises/templates/exercise/view.html:53
-msgid "Till then, it will not be shown in the overview or the search."
-msgstr ""
-
-#: exercises/templates/exercise/view.html:54
-#: nutrition/templates/ingredient/view.html:31
-msgid "Please select one of the options below."
-msgstr ""
-
-#: exercises/templates/exercise/view.html:60
-#: 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:204
-#: nutrition/templates/ingredient/view.html:42
-msgid "Decline"
-msgstr ""
-
-#: exercises/templates/exercise/view.html:96
-msgid "Images"
-msgstr ""
-
-#: exercises/templates/exercise/view.html:137 exercises/views/images.py:93
-msgid "Add new image"
+#: exercises/templates/history/overview.html:29
+msgid "Object"
msgstr ""
-#: exercises/templates/exercise/view.html:148
-msgid "Videos"
+#: exercises/templates/history/overview.html:31
+msgid "Changes"
msgstr ""
-#: exercises/templates/exercise/view.html:187 exercises/views/videos.py:94
-msgid "Add new video"
+#: exercises/templates/history/overview.html:32
+msgid "Revert"
msgstr ""
-#: exercises/templates/exercise/view.html:197
-msgid "Images pending review"
+#: exercises/templates/history/overview.html:64
+msgid "View Object"
msgstr ""
-#: exercises/templates/exercise/view.html:218
-msgid "Comments for this exercise"
+#: exercises/templates/history/overview.html:75
+msgid "View changes"
msgstr ""
-#: exercises/templates/exercise/view.html:246
-msgid "Add new comment"
-msgstr ""
-
-#: exercises/templates/exercise/view.html:260
-msgid "The diagram shows the most used muscles on this exercise"
-msgstr ""
-
-#: 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:306
-msgid "Exercise Variations"
-msgstr ""
-
-#: exercises/templates/exercise/view.html:327
-msgid "Submit a correction"
+#: exercises/templates/history/overview.html:86
+msgid "Revert changes"
msgstr ""
#: exercises/templates/muscles/admin-overview.html:4
-#: exercises/templates/muscles/overview.html:7
msgid "Muscle overview"
msgstr ""
#: exercises/templates/muscles/admin-overview.html:36
-#: exercises/views/muscles.py:86
+#: exercises/views/muscles.py:67
msgid "Add muscle"
msgstr ""
-#: exercises/templates/muscles/overview.html:85
-msgid ""
-"No exercises for this muscle. Add or edit an exercise and set the muscle."
-msgstr ""
-
#: exercises/views/categories.py:71
msgid "Add category"
msgstr ""
@@ -1874,50 +1702,19 @@ msgstr ""
msgid "Add exercise comment"
msgstr ""
-#: exercises/views/equipment.py:107 exercises/views/equipment.py:118
+#: exercises/views/equipment.py:105 exercises/views/equipment.py:116
msgid "Delete equipment?"
msgstr ""
-#: exercises/views/exercises.py:229
+#: exercises/views/exercises.py:161
#, python-format
-msgid ""
-"%(name_original)s is too similar to existing exercise \"%(exercise_name)s\""
-msgstr ""
-
-#: exercises/views/exercises.py:247
-msgid "Add exercise"
-msgstr ""
-
-#: exercises/views/exercises.py:367
-msgid "Thank you. Once the changes are reviewed the exercise will be updated."
-msgstr ""
-
-#: exercises/views/exercises.py:380
-#, python-brace-format
-msgid "Correct {0}"
+msgid "%(name)s is too similar to existing exercise \"%(exercise_name)s\""
msgstr ""
-#: exercises/views/exercises.py:422
+#: exercises/views/exercises.py:184
msgid "This will delete the exercise from all workouts."
msgstr ""
-#: exercises/views/exercises.py:474
-msgid "Exercise was successfully marked as rejected"
-msgstr ""
-
-#: exercises/views/images.py:68
-msgid "Edit exercise image"
-msgstr ""
-
-#: exercises/views/images.py:143
-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 ""
@@ -1984,7 +1781,7 @@ msgid "Contract type"
msgstr ""
#: gym/models/contract.py:208 gym/templates/contract/view.html:59
-#: manager/templates/log/add.html:52 nutrition/forms.py:59
+#: manager/templates/log/add.html:52 nutrition/forms.py:60
#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:102
#: nutrition/models/meal_item.py:72
msgid "Amount"
@@ -2085,6 +1882,10 @@ msgstr ""
msgid "User notes"
msgstr ""
+#: gym/templates/contract/list.html:36
+msgid "Show"
+msgstr ""
+
#: gym/templates/contract/view.html:4
msgid "Contract"
msgstr ""
@@ -2163,10 +1964,6 @@ msgstr ""
msgid "Add member"
msgstr ""
-#: gym/templates/gym/new_user.html:38
-msgid "Date of Birth"
-msgstr ""
-
#: gym/templates/gym/new_user.html:48 manager/templates/calendar/month.html:144
#: manager/templates/log/add.html:75 nutrition/templates/rate/form.html:120
msgid "Info"
@@ -2223,125 +2020,125 @@ msgstr ""
msgid "Edit gym"
msgstr ""
-#: i18n.tpl:2 i18n.tpl:28
-msgid "Abs"
+#: i18n.tpl:2
+msgid "Until Failure"
msgstr ""
-#: i18n.tpl:3
-msgid "Arms"
+#: i18n.tpl:3 manager/forms.py:180 manager/models/log.py:73
+#: manager/templates/set/add.html:53
+msgid "Repetitions"
msgstr ""
#: i18n.tpl:4
-msgid "Back"
+msgid "Abs"
msgstr ""
-#: i18n.tpl:5 i18n.tpl:23
-msgid "Calves"
+#: i18n.tpl:5
+msgid "Arms"
msgstr ""
-#: i18n.tpl:6 i18n.tpl:26
-msgid "Chest"
+#: i18n.tpl:6
+msgid "Legs"
msgstr ""
#: i18n.tpl:7
-msgid "Legs"
+msgid "Dumbbell"
msgstr ""
-#: i18n.tpl:8 i18n.tpl:19
-msgid "Shoulders"
+#: i18n.tpl:8
+msgid "Biceps"
msgstr ""
#: i18n.tpl:9
-msgid "Barbell"
+msgid "SZ-Bar"
msgstr ""
#: i18n.tpl:10
-msgid "Bench"
+msgid "Kettlebell"
msgstr ""
#: i18n.tpl:11
-msgid "Dumbbell"
+msgid "Swiss Ball"
msgstr ""
#: i18n.tpl:12
-msgid "Gym mat"
+msgid "none (bodyweight exercise)"
msgstr ""
#: i18n.tpl:13
-msgid "Incline bench"
+msgid "Calves"
msgstr ""
#: i18n.tpl:14
-msgid "Kettlebell"
+msgid "Back"
msgstr ""
#: i18n.tpl:15
-msgid "Pull-up bar"
+msgid "Lower back"
msgstr ""
#: i18n.tpl:16
-msgid "SZ-Bar"
+msgid "Lats"
msgstr ""
#: i18n.tpl:17
-msgid "Swiss Ball"
+msgid "Hamstrings"
msgstr ""
#: i18n.tpl:18
-msgid "none (bodyweight exercise)"
+msgid "Bench"
+msgstr ""
+
+#: i18n.tpl:19
+msgid "Glutes"
msgstr ""
#: i18n.tpl:20
-msgid "Biceps"
+msgid "Kilometers"
msgstr ""
#: i18n.tpl:21
-msgid "Hamstrings"
+msgid "Shoulders"
msgstr ""
#: i18n.tpl:22
-msgid "Lower back"
+msgid "Seconds"
msgstr ""
-#: i18n.tpl:24
-msgid "Glutes"
+#: i18n.tpl:23
+msgid "Miles"
msgstr ""
-#: i18n.tpl:25
-msgid "Lats"
+#: i18n.tpl:24
+msgid "Incline bench"
msgstr ""
-#: i18n.tpl:27
+#: i18n.tpl:25
msgid "Quads"
msgstr ""
-#: i18n.tpl:29
-msgid "Triceps"
-msgstr ""
-
-#: i18n.tpl:30
-msgid "Kilometers"
+#: i18n.tpl:26
+msgid "Minutes"
msgstr ""
-#: i18n.tpl:31
-msgid "Miles"
+#: i18n.tpl:27
+msgid "Chest"
msgstr ""
-#: i18n.tpl:32
-msgid "Minutes"
+#: i18n.tpl:28
+msgid "Gym mat"
msgstr ""
-#: i18n.tpl:33 manager/forms.py:169 manager/models/log.py:71
-#: manager/templates/set/add.html:53
-msgid "Repetitions"
+#: i18n.tpl:29
+msgid "Pull-up bar"
msgstr ""
-#: i18n.tpl:34
-msgid "Seconds"
+#: i18n.tpl:30
+msgid "Barbell"
msgstr ""
-#: i18n.tpl:35
-msgid "Until Failure"
+#: i18n.tpl:31
+msgid "Triceps"
msgstr ""
#: mailer/forms.py:34 mailer/templates/mailer/gym/preview.html:32
@@ -2395,44 +2192,44 @@ msgstr ""
msgid "Correction"
msgstr ""
-#: manager/forms.py:89 manager/models/workout.py:59
+#: manager/forms.py:92 manager/models/workout.py:59
msgid "The name of the workout"
msgstr ""
-#: manager/forms.py:93 manager/models/workout.py:66
+#: manager/forms.py:96 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
+#: manager/forms.py:137
msgid ""
"You can search for more than one exercise, they will be grouped together for "
"a superset."
msgstr ""
-#: 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
+#: manager/forms.py:166 manager/forms.py:171 manager/models/log.py:64
+#: manager/models/log.py:92 manager/models/setting.py:59
+#: manager/models/setting.py:90 manager/templates/log/add.html:53
+#: manager/templates/log/add.html:55 manager/templates/set/formset.html:10
+#: manager/templates/set/formset.html:12 measurements/models/category.py:58
+#: nutrition/forms.py:64
msgid "Unit"
msgstr ""
-#: manager/forms.py:266
+#: manager/forms.py:277
msgid "Type"
msgstr ""
-#: manager/forms.py:267 manager/templates/workout/view.html:157
+#: manager/forms.py:278 manager/templates/workout/view.html:157
msgid "Table"
msgstr ""
-#: manager/forms.py:269 manager/templates/workout/view.html:163
+#: manager/forms.py:280 manager/templates/workout/view.html:163
msgid "with images"
msgstr ""
-#: manager/forms.py:270 manager/templates/workout/view.html:169
+#: manager/forms.py:281 manager/templates/workout/view.html:169
msgid "with comments"
msgstr ""
@@ -2484,7 +2281,7 @@ msgid "The duration in weeks"
msgstr ""
#: manager/models/schedule_step.py:63 manager/models/set.py:52
-#: manager/models/setting.py:98 nutrition/models/meal.py:54
+#: manager/models/setting.py:110 nutrition/models/meal.py:54
#: nutrition/models/meal_item.py:65
msgid "Order"
msgstr ""
@@ -2535,7 +2332,7 @@ msgstr ""
msgid "Number of sets"
msgstr ""
-#: manager/models/setting.py:43
+#: manager/models/setting.py:48
msgid "Sets"
msgstr ""
@@ -2790,6 +2587,13 @@ msgid ""
"option in your settings."
msgstr ""
+#: manager/templates/workout/email_reminder.tpl:15
+#: manager/templates/workout/email_weight_reminder.tpl:12
+#: nutrition/templates/ingredient/email_new.tpl:9
+#, python-format
+msgid "The %(site)s team"
+msgstr ""
+
#: manager/templates/workout/email_weight_reminder.tpl:3
#, python-format
msgid ""
@@ -2802,6 +2606,10 @@ msgid ""
"You will regularly receive such reminders till you enter your current weight."
msgstr ""
+#: manager/templates/workout/log.html:10 manager/templates/workout/log.html:11
+msgid "Weight log"
+msgstr ""
+
#: manager/templates/workout/log.html:29
msgid "Weight log for workout"
msgstr ""
@@ -2898,7 +2706,7 @@ msgstr ""
msgid "Edit workout"
msgstr ""
-#: manager/templates/workout/view.html:225 manager/views/workout.py:300
+#: manager/templates/workout/view.html:225 manager/views/workout.py:301
msgid "Mark as template"
msgstr ""
@@ -2906,11 +2714,6 @@ msgstr ""
msgid "Add workout day"
msgstr ""
-#: manager/views/log.py:92
-#, python-format
-msgid "Edit log entry for %s"
-msgstr ""
-
#: manager/views/log.py:111
msgid "Delete workout log"
msgstr ""
@@ -2928,11 +2731,11 @@ msgstr ""
msgid "Your workouts"
msgstr ""
-#: manager/views/workout.py:227
+#: manager/views/workout.py:228
msgid "Copy workout"
msgstr ""
-#: manager/views/workout.py:230
+#: manager/views/workout.py:231
msgid "Copy"
msgstr ""
@@ -2954,29 +2757,29 @@ msgstr ""
msgid "Value"
msgstr ""
-#: nutrition/forms.py:122
+#: nutrition/forms.py:123
msgid "Calculate"
msgstr ""
-#: nutrition/forms.py:195 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:196 nutrition/templates/rate/form.html:76
msgid "Basic caloric intake"
msgstr ""
-#: nutrition/forms.py:196
+#: nutrition/forms.py:197
msgid "Your basic caloric intake as calculated for your data"
msgstr ""
-#: nutrition/forms.py:202
+#: nutrition/forms.py:203
msgid "Additional calories"
msgstr ""
-#: nutrition/forms.py:204
+#: nutrition/forms.py:205
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
msgstr ""
-#: nutrition/forms.py:232 nutrition/models/ingredient_weight_unit.py:39
+#: nutrition/forms.py:233 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"
@@ -3039,7 +2842,7 @@ msgid ""
"{energy_approx}%)"
msgstr ""
-#: nutrition/models/ingredient.py:357 nutrition/views/ingredient.py:225
+#: nutrition/models/ingredient.py:357 nutrition/views/ingredient.py:219
msgid "Ingredient was successfully added to the general database"
msgstr ""
@@ -3068,6 +2871,10 @@ msgstr ""
msgid "Meal"
msgstr ""
+#: nutrition/models/log.py:65
+msgid "Date and Time (Approx.)"
+msgstr ""
+
#: nutrition/models/meal.py:61
msgid "Time (approx)"
msgstr ""
@@ -3159,6 +2966,10 @@ msgid ""
"added to nutrition plans. You can access it on this address:"
msgstr ""
+#: nutrition/templates/ingredient/email_new.tpl:8
+msgid "Thank you for contributing and making this site better!"
+msgstr ""
+
#: nutrition/templates/ingredient/form.html:4
msgid "Submitting an ingredient"
msgstr ""
@@ -3183,6 +2994,10 @@ msgstr ""
msgid "No ingredients."
msgstr ""
+#: nutrition/templates/ingredient/overview.html:57
+msgid "Search"
+msgstr ""
+
#: nutrition/templates/ingredient/overview.html:66
msgid "ingredient name"
msgstr ""
@@ -3192,6 +3007,14 @@ msgstr ""
msgid "Add ingredient"
msgstr ""
+#: nutrition/templates/ingredient/overview.html:85
+msgid "Only registered users can do this"
+msgstr ""
+
+#: nutrition/templates/ingredient/pending.html:14
+msgid "Submission date"
+msgstr ""
+
#: nutrition/templates/ingredient/view.html:27
msgid "Ingredient is pending review"
msgstr ""
@@ -3204,6 +3027,18 @@ msgid ""
"the search."
msgstr ""
+#: nutrition/templates/ingredient/view.html:31
+msgid "Please select one of the options below."
+msgstr ""
+
+#: nutrition/templates/ingredient/view.html:38
+msgid "Accept"
+msgstr ""
+
+#: nutrition/templates/ingredient/view.html:42
+msgid "Decline"
+msgstr ""
+
#: nutrition/templates/ingredient/view.html:71
#: nutrition/templates/log/detail.html:31
#: nutrition/templates/plan/view.html:229 nutrition/views/plan.py:376
@@ -3444,14 +3279,18 @@ msgid ""
"yourself for some weeks and change the total amount if needed."
msgstr ""
-#: nutrition/views/ingredient.py:181
+#: nutrition/views/ingredient.py:175
msgid "Add a new ingredient"
msgstr ""
-#: nutrition/views/ingredient.py:238
+#: nutrition/views/ingredient.py:232
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 ""
@@ -3666,29 +3505,29 @@ msgstr ""
msgid "100%% Free <br>and <br>Open Source"
msgstr ""
-#: utils/generic_views.py:261
+#: utils/generic_views.py:262
msgid "Yes, delete"
msgstr ""
-#: utils/models.py:47
+#: utils/models.py:48
msgid "Author"
msgstr ""
-#: utils/models.py:52
+#: utils/models.py:53
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:77
+#: utils/models.py:78
msgid "Pending"
msgstr ""
-#: utils/models.py:78
+#: utils/models.py:79
msgid "Accepted"
msgstr ""
-#: utils/models.py:79
+#: utils/models.py:80
msgid "Declined"
msgstr ""
diff --git a/wger/locale/hi/LC_MESSAGES/django.po b/wger/locale/hi/LC_MESSAGES/django.po
index 1b95c6d0d..eec298d7a 100644
--- a/wger/locale/hi/LC_MESSAGES/django.po
+++ b/wger/locale/hi/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-14 12:01+0200\n"
+"POT-Creation-Date: 2022-11-10 16:03+0100\n"
"PO-Revision-Date: 2022-10-05 20:25+0000\n"
"Last-Translator: Ritish Bhardwaj <[email protected]>\n"
"Language-Team: Hindi <https://hosted.weblate.org/projects/wger/web/hi/>\n"
@@ -28,102 +28,8 @@ msgid ""
"registered users to this gym and update all existing users without a gym."
msgstr ""
-#: 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:226
-msgid "Languages"
-msgstr "भाषाएँ"
-
-#: config/templates/language/overview.html:16
-msgid "Nothing found."
-msgstr "कुछ नहीं मिला"
-
-#: 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:150
-#: nutrition/templates/plan/view.html:153
-#: nutrition/templates/plan/view.html:191
-msgid "Add one now."
-msgstr "एक नया जोड़ें |"
-
-#: config/templates/language/overview.html:29
-#: core/templates/license/list.html:38 core/templates/misc/license/list.html:41
-#: core/templates/repetition_unit/list.html:41
-#: core/templates/user/overview.html:327 core/templates/user/overview.html:366
-#: core/templates/user/overview.html:402
-#: core/templates/weight_unit/list.html:41 core/views/languages.py:73
-#: core/views/license.py:65 core/views/repetition_units.py:65
-#: core/views/weight_units.py:65
-#: exercises/templates/categories/admin-overview.html:36
-#: 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:61
-msgid "Add"
-msgstr "जोड़ें"
-
-#: 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/language.py:32
-msgid "Language full name"
-msgstr ""
-
-#: config/templates/language/view.html:34 core/templates/user/overview.html:451
-#: gym/views/admin_config.py:44 gym/views/admin_config.py:58
-#: gym/views/user_config.py:46
-msgid "Configuration"
-msgstr ""
-
-#: config/templates/language/view.html:35
-msgid ""
-"Use the configuration to select in what languages the\n"
-"exercises and ingredients will be shown for the current language (for "
-"example\n"
-"the exercises should be shown in languages A, B and C; the ingredients only\n"
-"in A)."
-msgstr ""
-
-#: config/templates/language/view.html:44 gym/templates/contract/list.html:36
-msgid "Show"
-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: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:45
-msgid "Options"
-msgstr ""
-
-#: config/templates/language/view.html:96 config/views/gym_config.py:41
-#: config/views/language_config.py:49 core/templates/license/list.html:16
-#: core/templates/misc/license/list.html:17
+#: config/views/gym_config.py:41 core/templates/language/view.html:57
+#: 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:39
#: core/templates/tags/render_day.html:75 core/templates/user/overview.html:205
@@ -131,12 +37,10 @@ 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:230
-#: exercises/templates/exercise/view.html:351
#: exercises/templates/muscles/admin-overview.html:16
-#: 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
+#: 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
#: 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,81 +56,52 @@ msgstr ""
msgid "Edit"
msgstr ""
-#: 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: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: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
-#: gym/templates/contract_type/list.html:39 gym/templates/document/list.html:46
-#: gym/templates/gym/list.html:20 manager/templates/calendar/day.html:69
-#: 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:231
-#: 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:132
-#: nutrition/templates/units/list.html:20
-msgid "Delete"
-msgstr "मिटादे"
-
-#: core/demo.py:86
+#: core/demo.py:95
msgid "Sample workout"
msgstr ""
-#: core/demo.py:90
+#: core/demo.py:99
msgid "Sample day"
msgstr ""
-#: core/demo.py:94
+#: core/demo.py:103
msgid "Another sample day"
msgstr ""
-#: core/demo.py:217
-msgid "Sample nutrional plan"
+#: core/demo.py:211
+msgid "Sample nutritional plan"
msgstr ""
-#: core/demo.py:349 core/demo.py:351 core/demo.py:353
+#: core/demo.py:343 core/demo.py:345 core/demo.py:347
#, python-brace-format
msgid "Placeholder workout nr {0} for schedule"
msgstr ""
-#: core/demo.py:358
+#: core/demo.py:352
msgid "My cool workout schedule"
msgstr ""
-#: core/demo.py:397 core/demo.py:412
+#: core/demo.py:391 core/demo.py:406
msgid "Empty placeholder schedule"
msgstr ""
-#: core/forms.py:61 core/templates/navigation.html:188
-#: core/templates/navigation.html:192 core/templates/user/login.html:4
+#: core/forms.py:64 core/templates/navigation.html:179
+#: core/templates/navigation.html:183 core/templates/user/login.html:4
#: software/templates/features.html:43
msgid "Login"
msgstr ""
-#: core/forms.py:73 core/forms.py:164 gym/views/export.py:63
+#: core/forms.py:76 core/forms.py:177 gym/views/export.py:63
#: gym/views/gym.py:218
msgid "First name"
msgstr ""
-#: core/forms.py:74 core/forms.py:165 core/templates/user/overview.html:267
+#: core/forms.py:77 core/forms.py:178 core/templates/user/overview.html:267
#: gym/views/export.py:64 gym/views/gym.py:218
msgid "Last name"
msgstr ""
-#: core/forms.py:76 core/forms.py:131 core/templates/user/overview.html:271
+#: core/forms.py:79 core/forms.py:144 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
@@ -236,75 +111,105 @@ msgstr ""
msgid "Email"
msgstr ""
-#: core/forms.py:77
+#: core/forms.py:80
msgid "Used for password resets and, optionally, e-mail reminders."
msgstr ""
-#: core/forms.py:102
+#: core/forms.py:84 core/models/profile.py:220
+#: gym/templates/gym/new_user.html:38
+msgid "Date of Birth"
+msgstr ""
+
+#: core/forms.py:116
msgid "Personal data"
msgstr ""
-#: core/forms.py:110
+#: core/forms.py:124
msgid "Workout reminders"
msgstr ""
-#: core/forms.py:117
+#: core/forms.py:131
msgid "Other settings"
msgstr ""
-#: 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
+#: core/forms.py:138 core/views/user.py:615 core/views/user.py:630
+#: core/views/user.py:642 gym/forms.py:72 manager/templates/log/add.html:65
+#: manager/templates/set/add.html:69 manager/views/workout.py:222
+#: utils/generic_views.py:143
msgid "Save"
msgstr ""
-#: core/forms.py:132
+#: core/forms.py:145
msgid "Used for password resets and, optionally, email reminders."
msgstr ""
-#: core/forms.py:160
+#: core/forms.py:173
msgid "This e-mail address is already in use."
msgstr ""
-#: core/forms.py:180 gym/templates/gym/new_user.html:26
+#: core/forms.py:193 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:182
+#: core/forms.py:195
msgid "Please enter your current password."
msgstr ""
-#: core/forms.py:200
+#: core/forms.py:204 core/templates/language/view.html:62
+#: 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: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/muscles/admin-overview.html:17
+#: gym/templates/admin_notes/list.html:40
+#: gym/templates/contract_option/list.html:39
+#: gym/templates/contract_type/list.html:39 gym/templates/document/list.html:46
+#: gym/templates/gym/list.html:20 manager/templates/calendar/day.html:69
+#: 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:231
+#: 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:132
+#: nutrition/templates/units/list.html:20
+msgid "Delete"
+msgstr "मिटादे"
+
+#: core/forms.py:213
msgid "Invalid password"
msgstr ""
-#: core/forms.py:212 core/forms.py:278
+#: core/forms.py:225 core/forms.py:291
msgid "The form is secured with reCAPTCHA"
msgstr ""
-#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:188
-#: core/templates/navigation.html:193 core/templates/template.html:149
-#: core/templates/user/login.html:20 core/views/user.py:293
+#: core/forms.py:239 core/forms.py:258 core/templates/navigation.html:179
+#: core/templates/navigation.html:184 core/templates/template.html:149
+#: core/templates/user/login.html:20 core/views/user.py:300
#: software/templates/features.html:38
msgid "Register"
msgstr ""
-#: core/forms.py:256
+#: core/forms.py:269
msgid "Contact"
msgstr ""
-#: core/forms.py:257
+#: core/forms.py:270
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:71
+#: core/forms.py:278 exercises/models/comment.py:42 manager/models/set.py:60
+#: manager/models/setting.py:111 nutrition/models/log.py:71
msgid "Comment"
msgstr ""
-#: core/forms.py:266
+#: core/forms.py:279
msgid "What do you want to say?"
msgstr ""
@@ -312,6 +217,14 @@ msgstr ""
msgid "Day of the week"
msgstr ""
+#: core/models/language.py:31 core/templates/language/view.html:21
+msgid "Language short name"
+msgstr ""
+
+#: core/models/language.py:36 core/templates/language/view.html:22
+msgid "Language full name"
+msgstr ""
+
#: core/models/license.py:29
msgid "Full name"
msgstr ""
@@ -367,19 +280,19 @@ msgstr ""
msgid "Imperial (pound)"
msgstr ""
-#: core/models/profile.py:111
+#: core/models/profile.py:114
msgid "Show exercise comments"
msgstr ""
-#: core/models/profile.py:112
+#: core/models/profile.py:115
msgid "Check to show exercise comments on the workout view"
msgstr ""
-#: core/models/profile.py:123
+#: core/models/profile.py:126
msgid "Also use ingredients in English"
msgstr ""
-#: core/models/profile.py:125
+#: core/models/profile.py:128
msgid ""
"Check to also show ingredients in English while creating\n"
"a nutritional plan. These ingredients are extracted from a list provided\n"
@@ -387,130 +300,129 @@ msgid ""
"7000 entries, but can be somewhat overwhelming and make the search difficult."
msgstr ""
-#: core/models/profile.py:134
+#: core/models/profile.py:137
msgid "Activate workout reminders"
msgstr ""
-#: core/models/profile.py:136
+#: core/models/profile.py:139
msgid ""
"Check to activate automatic reminders for workouts. You need to provide a "
"valid email for this to work."
msgstr ""
-#: core/models/profile.py:145
+#: core/models/profile.py:148
msgid "Remind before expiration"
msgstr ""
-#: core/models/profile.py:146
+#: core/models/profile.py:149
msgid "The number of days you want to be reminded before a workout expires."
msgstr ""
-#: core/models/profile.py:152
+#: core/models/profile.py:155
msgid "Default duration of workouts"
msgstr ""
-#: core/models/profile.py:154
+#: core/models/profile.py:157
msgid ""
"Default duration in weeks of workouts not in a schedule. Used for email "
"workout reminders."
msgstr ""
-#: core/models/profile.py:171
+#: core/models/profile.py:174
msgid "Notification language"
msgstr ""
-#: core/models/profile.py:173
+#: core/models/profile.py:176
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/profile.py:186 gym/views/export.py:66
+#: core/models/profile.py:212 gym/views/export.py:66
msgid "Age"
msgstr ""
-#: core/models/profile.py:202 nutrition/forms.py:99
+#: core/models/profile.py:228 nutrition/forms.py:100
msgid "Height (cm)"
msgstr ""
-#: core/models/profile.py:219
+#: core/models/profile.py:245
msgid "Hours of sleep"
msgstr ""
-#: core/models/profile.py:220
+#: core/models/profile.py:246
msgid "The average hours of sleep per day"
msgstr ""
-#: core/models/profile.py:229
+#: core/models/profile.py:255
msgid "Work"
msgstr ""
-#: core/models/profile.py:230 core/models/profile.py:272
+#: core/models/profile.py:256 core/models/profile.py:298
msgid "Average hours per day"
msgstr ""
-#: core/models/profile.py:239 core/models/profile.py:260
-#: core/models/profile.py:281
+#: core/models/profile.py:265 core/models/profile.py:286
+#: core/models/profile.py:307
msgid "Physical intensity"
msgstr ""
-#: core/models/profile.py:240 core/models/profile.py:261
-#: core/models/profile.py:282
+#: core/models/profile.py:266 core/models/profile.py:287
+#: core/models/profile.py:308
msgid "Approximately"
msgstr ""
-#: core/models/profile.py:250
+#: core/models/profile.py:276
msgid "Sport"
msgstr ""
-#: core/models/profile.py:251
+#: core/models/profile.py:277
msgid "Average hours per week"
msgstr ""
-#: core/models/profile.py:271
+#: core/models/profile.py:297
msgid "Free time"
msgstr ""
-#: core/models/profile.py:292 nutrition/templates/rate/form.html:66
+#: core/models/profile.py:318 nutrition/templates/rate/form.html:66
msgid "Total daily calories"
msgstr ""
-#: core/models/profile.py:293
+#: core/models/profile.py:319
msgid "Total caloric intake, including e.g. any surplus"
msgstr ""
-#: core/models/profile.py:305 nutrition/models/ingredient_weight_unit.py:45
+#: core/models/profile.py:331 nutrition/models/ingredient_weight_unit.py:45
#: nutrition/models/log.py:90 nutrition/models/meal_item.py:58
msgid "Weight unit"
msgstr ""
-#: core/models/profile.py:313
+#: core/models/profile.py:339
msgid "Allow external access"
msgstr ""
-#: core/models/profile.py:315
+#: core/models/profile.py:341
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/profile.py:324
+#: core/models/profile.py:350
msgid "Automatic reminders for weight entries"
msgstr ""
-#: core/models/profile.py:326
+#: core/models/profile.py:352
msgid "Number of days after the last weight entry (enter 0 to deactivate)"
msgstr ""
-#: core/models/profile.py:392
+#: core/models/profile.py:418
msgid "The sum of all hours has to be 24"
msgstr ""
#: core/models/rep_unit.py:35 core/models/weight_unit.py:35
-#: core/templates/user/overview.html:263 core/views/user.py:575
+#: core/templates/user/overview.html:263 core/views/user.py:591
#: 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
+#: exercises/models/exercise.py:64 exercises/models/muscle.py:36
#: 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
@@ -569,6 +481,50 @@ msgstr ""
msgid "Are you sure you want to delete this? This action cannot be undone."
msgstr ""
+#: core/templates/email_verification/confirm_template.html:4
+msgid "Email verified"
+msgstr ""
+
+#: core/templates/email_verification/confirm_template.html:18
+#, python-format
+msgid "%(username)s, your email was verified"
+msgstr ""
+
+#: core/templates/email_verification/confirm_template.html:22
+msgid "Error, invalid verification token"
+msgstr ""
+
+#: core/templates/email_verification/email_body_html.tpl:6
+msgid "Email Confirmation"
+msgstr ""
+
+#: core/templates/email_verification/email_body_html.tpl:9
+#: core/templates/email_verification/email_body_txt.tpl:3
+#, python-format
+msgid "You are almost there, %(username)s!"
+msgstr ""
+
+#: core/templates/email_verification/email_body_html.tpl:11
+#, python-format
+msgid "Please click <a href=\"%(link)s\">here</a> to confirm your email"
+msgstr ""
+
+#: core/templates/email_verification/email_body_html.tpl:12
+#: core/templates/email_verification/email_body_txt.tpl:5
+#, python-format
+msgid "The token expires on %(time)s"
+msgstr ""
+
+#: core/templates/email_verification/email_body_html.tpl:14
+#: core/templates/email_verification/email_body_txt.tpl:8
+msgid "the wger Team"
+msgstr ""
+
+#: core/templates/email_verification/email_body_txt.tpl:4
+#, python-format
+msgid "Please click the following link to confirm your email: %(link)s"
+msgstr ""
+
#: core/templates/index.html:4
msgid "Dashboard"
msgstr ""
@@ -625,7 +581,7 @@ msgid "Add custom diary entry"
msgstr ""
#: core/templates/index.html:84 core/templates/index.html:92
-#: manager/models/day.py:34 manager/models/log.py:56
+#: manager/models/day.py:34 manager/models/log.py:58
#: manager/models/session.py:60 manager/models/workout.py:109
#: manager/templates/schedule/view.html:105
#: manager/templates/workout/view.html:11
@@ -656,6 +612,20 @@ msgstr ""
msgid "No workouts found."
msgstr ""
+#: core/templates/index.html:137 core/templates/index.html:189
+#: core/templates/language/overview.html:23
+#: 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:150
+#: nutrition/templates/plan/view.html:153
+#: nutrition/templates/plan/view.html:191
+msgid "Add one now."
+msgstr "एक नया जोड़ें |"
+
#: 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
@@ -709,19 +679,59 @@ msgid "No nutrition plans."
msgstr ""
#: 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
+#: core/templates/user/overview.html:121 manager/forms.py:184
+#: manager/helpers.py:89 manager/models/log.py:86 manager/models/setting.py:79
+#: manager/templates/log/add.html:54 manager/templates/set/formset.html:11
#: weight/models.py: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:210 core/templates/navigation.html:135
+#: core/templates/index.html:210 core/templates/navigation.html:126
#: weight/views.py:70
msgid "Add weight entry"
msgstr ""
+#: core/templates/language/overview.html:4 core/templates/navigation.html:217
+msgid "Languages"
+msgstr "भाषाएँ"
+
+#: core/templates/language/overview.html:23
+msgid "Nothing found."
+msgstr "कुछ नहीं मिला"
+
+#: core/templates/language/overview.html:36 core/templates/license/list.html:38
+#: core/templates/misc/license/list.html:41
+#: core/templates/repetition_unit/list.html:41
+#: core/templates/user/overview.html:327 core/templates/user/overview.html:366
+#: core/templates/user/overview.html:402
+#: core/templates/weight_unit/list.html:41 core/views/languages.py:73
+#: core/views/license.py:65 core/views/repetition_units.py:65
+#: core/views/weight_units.py:65
+#: exercises/templates/categories/admin-overview.html:36
+#: 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:61
+msgid "Add"
+msgstr "जोड़ें"
+
+#: core/templates/language/view.html:52 core/templates/user/api_key.html:44
+#: core/templates/user/preferences.html:44 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:45
+msgid "Options"
+msgstr ""
+
#: core/templates/license/list.html:4 core/templates/misc/license/list.html:4
msgid "License list"
msgstr ""
@@ -734,7 +744,6 @@ msgstr ""
#: core/templates/weight_unit/list.html:26
#: exercises/templates/categories/admin-overview.html:24
#: exercises/templates/equipment/admin-overview.html:24
-#: exercises/templates/exercise/pending.html:30
#: exercises/templates/muscles/admin-overview.html:24
#: gym/templates/admin_notes/list.html:52 gym/templates/contract/list.html:60
#: gym/templates/contract_option/list.html:56
@@ -812,155 +821,135 @@ msgstr ""
msgid "Public templates"
msgstr ""
-#: core/templates/navigation.html:64
-msgctxt "as in sorted by category"
-msgid "by category"
-msgstr ""
-
-#: core/templates/navigation.html:65
-msgctxt "as in sorted by muscle"
-msgid "by muscle"
-msgstr ""
-
-#: core/templates/navigation.html:66
-msgctxt "as in sorted by equipment"
-msgid "by equipment"
-msgstr ""
-
-#: core/templates/navigation.html:70
-#: exercises/templates/equipment/overview.html:109
-#: exercises/templates/equipment/overview.html:113
-#: exercises/templates/exercise/overview.html:112
-#: exercises/templates/exercise/overview.html:116
-#: exercises/templates/muscles/overview.html:112
-#: exercises/templates/muscles/overview.html:116
-msgid "Add new exercise"
-msgstr ""
+#: core/templates/navigation.html:63 manager/forms.py:133
+#: manager/models/setting.py:54
+msgid "Exercises"
+msgstr "व्यायाम"
-#: core/templates/navigation.html:75 core/templates/navigation.html:116
-#: core/templates/navigation.html:224
+#: core/templates/navigation.html:67 core/templates/navigation.html:107
+#: core/templates/navigation.html:215
msgid "Administration"
msgstr ""
-#: core/templates/navigation.html:76
-#: exercises/templates/exercise/pending.html:6
-msgid "Exercises pending review"
-msgstr ""
+#: core/templates/navigation.html:68
+#, fuzzy
+#| msgid "Exercises"
+msgid "Exercise edit history"
+msgstr "व्यायाम"
-#: core/templates/navigation.html:77 exercises/models/base.py:72
-#: exercises/templates/exercise/view.html:80
+#: core/templates/navigation.html:69 exercises/models/base.py:84
msgid "Equipment"
msgstr ""
-#: core/templates/navigation.html:78 exercises/templates/exercise/view.html:258
+#: core/templates/navigation.html:70
msgid "Muscles"
msgstr ""
-#: core/templates/navigation.html:79
+#: core/templates/navigation.html:71
#: exercises/templates/categories/admin-overview.html:4
msgid "Categories"
msgstr ""
-#: core/templates/navigation.html:93 software/templates/features.html:87
+#: core/templates/navigation.html:84 software/templates/features.html:87
msgid "Nutrition"
msgstr ""
-#: core/templates/navigation.html:99 core/templates/user/overview.html:144
+#: core/templates/navigation.html:90 core/templates/user/overview.html:144
msgid "Nutrition plans"
msgstr ""
-#: core/templates/navigation.html:105 nutrition/templates/bmi/form.html:50
+#: core/templates/navigation.html:96 nutrition/templates/bmi/form.html:50
msgid "BMI calculator"
msgstr ""
-#: core/templates/navigation.html:111 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:102 nutrition/templates/rate/form.html:17
msgid "Daily calories calculator"
msgstr ""
-#: core/templates/navigation.html:113
+#: core/templates/navigation.html:104
#: nutrition/templates/ingredient/overview.html:29
msgid "Ingredient overview"
msgstr ""
-#: core/templates/navigation.html:117 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:108 nutrition/templates/units/list.html:6
msgid "Ingredient weight units"
msgstr ""
-#: core/templates/navigation.html:118
+#: core/templates/navigation.html:109
#: nutrition/templates/ingredient/pending.html:6
msgid "Ingredients pending review"
msgstr ""
-#: core/templates/navigation.html:132
+#: core/templates/navigation.html:123
msgid "Body weight"
msgstr ""
-#: core/templates/navigation.html:134 core/templates/user/overview.html:114
+#: core/templates/navigation.html:125 core/templates/user/overview.html:114
#: weight/templates/overview.html:7
msgid "Weight overview"
msgstr ""
-#: core/templates/navigation.html:147
+#: core/templates/navigation.html:138
msgid "About this software"
msgstr ""
-#: core/templates/navigation.html:149 core/templates/template_features.html:82
+#: core/templates/navigation.html:140 core/templates/template_features.html:82
#: software/templates/about_us.html:5
msgid "About us"
msgstr ""
-#: core/templates/navigation.html:151 software/templates/features.html:209
+#: core/templates/navigation.html:142 software/templates/features.html:209
msgid "REST API"
msgstr ""
-#: core/templates/navigation.html:155 utils/models.py:40
+#: core/templates/navigation.html:146 utils/models.py:41
msgid "License"
msgstr ""
-#: core/templates/navigation.html:161
+#: core/templates/navigation.html:152
msgid "Developer documentation"
msgstr ""
-#: core/templates/navigation.html:167
+#: core/templates/navigation.html:158
msgid "Get the code"
msgstr ""
-#: core/templates/navigation.html:173 core/templates/template.html:204
+#: core/templates/navigation.html:164 core/templates/template.html:203
#: core/templates/template_features.html:99
msgid "Translate"
msgstr ""
-#: core/templates/navigation.html:194 core/templates/user/login.html:28
+#: core/templates/navigation.html:185 core/templates/user/login.html:28
msgid "Reset password"
msgstr ""
-#: core/templates/navigation.html:207
+#: core/templates/navigation.html:198
msgid "My preferences"
msgstr ""
-#: core/templates/navigation.html:214
+#: core/templates/navigation.html:205
msgid "Logout"
msgstr ""
-#: core/templates/navigation.html:229
+#: core/templates/navigation.html:220
msgid "Licenses"
msgstr ""
-#: core/templates/navigation.html:232
+#: core/templates/navigation.html:223
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr ""
-#: core/templates/navigation.html:235 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:226 core/templates/weight_unit/list.html:4
#: nutrition/templates/ingredient/view.html:174
msgid "Weight units"
msgstr ""
-#: core/templates/navigation.html:238 core/templates/user/list.html:4
+#: core/templates/navigation.html:229 core/templates/user/list.html:4
msgid "User list"
msgstr ""
-#: core/templates/navigation.html:239
+#: core/templates/navigation.html:230
msgid "Gyms"
msgstr ""
@@ -1035,33 +1024,30 @@ msgstr ""
msgid "Add weight log"
msgstr ""
-#: core/templates/tags/render_day.html:114
-#: exercises/templates/equipment/overview.html:59
-#: exercises/templates/exercise/overview.html:63
-#: exercises/templates/muscles/overview.html:65
+#: core/templates/tags/render_day.html:116
msgid "Placeholder image for exercise"
msgstr ""
-#: core/templates/tags/render_day.html:131
+#: core/templates/tags/render_day.html:133
msgid "This exercise has no repetitions."
msgstr ""
-#: core/templates/tags/render_day.html:134
+#: core/templates/tags/render_day.html:136
msgid "Edit them now."
msgstr ""
-#: core/templates/tags/render_day.html:159
+#: core/templates/tags/render_day.html:162
msgid "Add exercises to this workout day"
msgstr ""
#: core/templates/tags/render_weight_log.html:17 manager/helpers.py:89
-#: manager/models/setting.py:57 manager/templates/set/formset.html:10
+#: manager/models/setting.py:69 manager/templates/set/formset.html:9
msgid "Reps"
msgstr ""
-#: 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
+#: core/templates/tags/render_weight_log.html:30 manager/forms.py:189
+#: manager/models/log.py:103 manager/models/setting.py:99
+#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
msgid "RiR"
msgstr ""
@@ -1084,7 +1070,7 @@ msgstr ""
msgid "Features"
msgstr ""
-#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:37
+#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:53
msgid "API key"
msgstr ""
@@ -1124,11 +1110,12 @@ msgid "Documentation"
msgstr ""
#: core/templates/user/delete_account.html:4
-#: core/templates/user/preferences.html:42
+#: core/templates/user/preferences.html:58
msgid "Delete account"
msgstr ""
#: core/templates/user/delete_account.html:17
+#: exercises/templates/history/overview.html:93
msgid "Are you sure?"
msgstr ""
@@ -1173,11 +1160,12 @@ 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/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
+#: exercises/models/base.py:99 exercises/models/base.py:104
+#: exercises/models/exercise.py:69 exercises/models/exercise.py:76
+#: gallery/models/image.py:47 manager/helpers.py:88 manager/models/log.py:100
+#: 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/views.py:150
@@ -1185,11 +1173,11 @@ msgid "Date"
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: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
+#: exercises/models/exercise.py:57 exercises/views/exercises.py:123
+#: 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 ""
@@ -1197,12 +1185,12 @@ msgstr ""
msgid "Number of logs (days)"
msgstr ""
-#: core/templates/user/overview.html:37 core/views/user.py:576
+#: core/templates/user/overview.html:37 core/views/user.py:592
#: 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:267
+#: core/templates/user/overview.html:68 manager/forms.py:278
#: manager/templates/workout/view.html:151
msgid "Log"
msgstr ""
@@ -1220,6 +1208,7 @@ msgid "Notes"
msgstr ""
#: core/templates/user/overview.html:79
+#: exercises/templates/history/overview.html:30
#: manager/templates/calendar/partial_overview_table.html:42
#: nutrition/templates/log/detail.html:154
msgid "Time"
@@ -1267,10 +1256,12 @@ msgid "Do you really want to change this user&#39;s password?"
msgstr ""
#: core/templates/user/overview.html:233
+#: exercises/templates/history/overview.html:106
msgid "No"
msgstr ""
#: core/templates/user/overview.html:234
+#: exercises/templates/history/overview.html:99
msgid "Yes"
msgstr ""
@@ -1325,10 +1316,15 @@ msgid "Documents"
msgstr ""
#: core/templates/user/overview.html:413 gym/templates/document/list.html:32
-#: manager/forms.py:279 manager/templates/workout/view.html:176
+#: manager/forms.py:290 manager/templates/workout/view.html:176
msgid "Download"
msgstr ""
+#: core/templates/user/overview.html:451 gym/views/admin_config.py:44
+#: gym/views/admin_config.py:58 gym/views/user_config.py:46
+msgid "Configuration"
+msgstr ""
+
#: core/templates/user/overview.html:454 gym/models/user_config.py:92
msgid "Include in inactive overview"
msgstr ""
@@ -1346,7 +1342,23 @@ msgstr ""
msgid "Preferences"
msgstr ""
-#: core/templates/user/preferences.html:33 core/views/user.py:587
+#: core/templates/user/preferences.html:19
+msgid "Verified email"
+msgstr ""
+
+#: core/templates/user/preferences.html:24
+msgid "Unverified email"
+msgstr ""
+
+#: core/templates/user/preferences.html:26
+msgid "Send verification email"
+msgstr ""
+
+#: core/templates/user/preferences.html:30
+msgid "You need to verify your email to contribute exercises"
+msgstr ""
+
+#: core/templates/user/preferences.html:49 core/views/user.py:603
msgid "Change password"
msgstr ""
@@ -1376,39 +1388,37 @@ msgid "oz"
msgstr ""
#: 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
+#: exercises/views/equipment.py:104 exercises/views/exercises.py:185
+#: exercises/views/muscles.py:99 manager/views/schedule.py:311
+#: manager/views/schedule_step.py:129 manager/views/workout.py:269
+#: manager/views/workout_session.py:141 nutrition/views/ingredient.py:138
#: 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:431
-#: exercises/views/muscles.py:125 gallery/views/images.py:121
+#: exercises/views/categories.py:127 exercises/views/exercises.py:193
+#: exercises/views/muscles.py:106 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
+#: manager/views/workout.py:273 manager/views/workout_session.py:156
+#: nutrition/views/ingredient.py:145 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:456
+#: core/views/repetition_units.py:85 core/views/user.py:472
#: 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: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
+#: exercises/views/equipment.py:81 exercises/views/muscles.py:86
+#: 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:170
+#: gym/views/gym.py:459 manager/views/day.py:100 manager/views/schedule.py:335
+#: manager/views/workout.py:287 nutrition/views/ingredient.py:164
+#: nutrition/views/plan.py:144 nutrition/views/unit.py:144
#, python-brace-format
msgid "Edit {0}"
msgstr ""
@@ -1436,64 +1446,65 @@ msgstr ""
msgid "Your feedback was successfully sent. Thank you!"
msgstr ""
-#: core/views/user.py:156
+#: core/views/user.py:157
#, python-brace-format
msgid "Account \"{0}\" was successfully deleted"
msgstr ""
-#: core/views/user.py:287
+#: core/views/user.py:294
msgid "You were successfully registered"
msgstr ""
-#: core/views/user.py:339
+#: core/views/user.py:355
msgid "Settings successfully updated"
msgstr ""
-#: core/views/user.py:376
+#: core/views/user.py:392
msgid "The user was successfully deactivated"
msgstr ""
-#: core/views/user.py:411
+#: core/views/user.py:427
msgid "The user was successfully activated"
msgstr ""
-#: core/views/user.py:426
+#: core/views/user.py:442
msgid "Edit user"
msgstr ""
-#: core/views/user.py:573 gym/templates/gym/member_list.html:26
+#: core/views/user.py:589 gym/templates/gym/member_list.html:26
#: gym/views/gym.py:156
msgid "ID"
msgstr ""
-#: core/views/user.py:574 gym/forms.py:94 gym/templates/contract/view.html:55
+#: core/views/user.py:590 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:577 gym/templates/gym/new_user.html:34
+#: core/views/user.py:593 gym/templates/gym/new_user.html:34
#: gym/views/export.py:60 gym/views/gym.py:218
msgid "Gym"
msgstr ""
-#: exercises/models/base.py:51 exercises/templates/exercise/view.html:76
-#: nutrition/models/ingredient.py:204
+#: core/views/user.py:652
+#, python-format
+msgid "A verification email was sent to %(email)s"
+msgstr ""
+
+#: exercises/models/base.py:63 nutrition/models/ingredient.py:204
msgid "Category"
msgstr ""
-#: exercises/models/base.py:58
+#: exercises/models/base.py:70
msgid "Primary muscles"
msgstr ""
-#: exercises/models/base.py:64 exercises/templates/equipment/overview.html:71
-#: exercises/templates/exercise/overview.html:76
-#: exercises/templates/exercise/view.html:268
-#: exercises/templates/muscles/overview.html:77
+#: exercises/models/base.py:76
msgid "Secondary muscles"
msgstr ""
-#: exercises/models/base.py:79
+#: exercises/models/base.py:91
msgid "Variations"
msgstr ""
@@ -1501,90 +1512,68 @@ msgstr ""
msgid "Exercise Categories"
msgstr ""
-#: exercises/models/comment.py:34 exercises/models/exercise_alias.py:32
-#: exercises/models/image.py:75 exercises/models/video.py:82
-#: manager/forms.py:165 manager/helpers.py:89 manager/models/log.py:51
+#: exercises/models/comment.py:37 exercises/models/exercise_alias.py:35
+#: exercises/models/image.py:71 exercises/models/video.py:95
+#: manager/forms.py:176 manager/helpers.py:89 manager/models/log.py:52
msgid "Exercise"
msgstr ""
-#: exercises/models/comment.py:41
+#: exercises/models/comment.py:43
msgid "A comment about how to correctly do this exercise."
msgstr ""
-#: exercises/models/exercise.py:86 nutrition/models/ingredient.py:80
+#: exercises/models/exercise.py:81 nutrition/models/ingredient.py:80
#: nutrition/models/plan.py:61 nutrition/models/weight_unit.py:32
msgid "Language"
msgstr ""
-#: exercises/models/exercise.py:237 exercises/views/exercises.py:461
-msgid "Exercise was successfully added to the general database"
-msgstr ""
-
-#: exercises/models/exercise.py:265
-msgid "New user submitted exercise"
-msgstr ""
-
-#: exercises/models/exercise.py:267
-#, python-brace-format
-msgid "The user {0} submitted a new exercise \"{1}\"."
-msgstr ""
-
-#: exercises/models/exercise_alias.py:35
+#: exercises/models/exercise_alias.py:38
msgid "Alias for an exercise"
msgstr ""
-#: exercises/models/image.py:59
+#: exercises/models/image.py:55
msgid "Line"
msgstr ""
-#: exercises/models/image.py:60
+#: exercises/models/image.py:56
msgid "3D"
msgstr ""
-#: exercises/models/image.py:61
+#: exercises/models/image.py:57
msgid "Low-poly"
msgstr ""
-#: exercises/models/image.py:62
+#: exercises/models/image.py:58
msgid "Photo"
msgstr ""
-#: exercises/models/image.py:63
+#: exercises/models/image.py:59
msgid "Other"
msgstr ""
-#: exercises/models/image.py:81 gallery/models/image.py:56
+#: exercises/models/image.py:77 gallery/models/image.py:56
msgid "Image"
msgstr ""
-#: exercises/models/image.py:82 gallery/models/image.py:57
+#: exercises/models/image.py:78 gallery/models/image.py:57
msgid "Only PNG and JPEG formats are supported"
msgstr ""
-#: exercises/models/image.py:88
+#: exercises/models/image.py:84
msgid "Main picture"
msgstr ""
-#: exercises/models/image.py:91
+#: exercises/models/image.py:87
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:100
+#: exercises/models/image.py:96
msgid "The art style of your image"
msgstr ""
-#: exercises/models/image.py:185
-msgid "New user submitted image"
-msgstr ""
-
-#: exercises/models/image.py:186
-#, python-brace-format
-msgid "The user {0} submitted a new image \"{1}\" for exercise {2}."
-msgstr ""
-
#: exercises/models/muscle.py:37
msgid "In latin, e.g. \"Pectoralis major\""
msgstr ""
@@ -1597,47 +1586,48 @@ msgstr ""
msgid "A more basic name for the muscle"
msgstr ""
-#: exercises/models/video.py:41
-msgid "Maximum file size is 100MB."
+#: exercises/models/video.py:50
+#, python-format
+msgid "Maximum file size is %(size)sMB."
msgstr ""
-#: exercises/models/video.py:44 exercises/models/video.py:48
+#: exercises/models/video.py:57 exercises/models/video.py:65
msgid "File type is not supported"
msgstr ""
-#: exercises/models/video.py:57
+#: exercises/models/video.py:70
msgid "File is not a valid video"
msgstr ""
-#: exercises/models/video.py:88
+#: exercises/models/video.py:101
msgid "Main video"
msgstr ""
-#: exercises/models/video.py:94
+#: exercises/models/video.py:107
msgid "Video"
msgstr ""
-#: exercises/models/video.py:101
+#: exercises/models/video.py:114
msgid "Size"
msgstr ""
-#: exercises/models/video.py:108 manager/models/schedule_step.py:56
+#: exercises/models/video.py:121 manager/models/schedule_step.py:56
msgid "Duration"
msgstr ""
-#: exercises/models/video.py:117
+#: exercises/models/video.py:130
msgid "Width"
msgstr ""
-#: exercises/models/video.py:124
+#: exercises/models/video.py:137
msgid "Height"
msgstr ""
-#: exercises/models/video.py:131
+#: exercises/models/video.py:144
msgid "Codec"
msgstr ""
-#: exercises/models/video.py:139
+#: exercises/models/video.py:152
msgid "Codec, long name"
msgstr ""
@@ -1646,121 +1636,19 @@ msgid "Equipment list"
msgstr ""
#: exercises/templates/equipment/admin-overview.html:37
-#: exercises/views/equipment.py:94
+#: exercises/views/equipment.py:92
msgid "Add new equipment"
msgstr ""
-#: exercises/templates/equipment/overview.html:11
-msgid "Equipment overview"
+#: exercises/templates/history/overview.html:11
+msgid "Exercise admin history"
msgstr ""
-#: exercises/templates/equipment/overview.html:69
-#: exercises/templates/exercise/overview.html:74
-#: exercises/templates/exercise/view.html:264
-#: exercises/templates/muscles/overview.html:75
-msgid "Main muscles"
+#: exercises/templates/history/overview.html:27
+msgid "Action"
msgstr ""
-#: exercises/templates/equipment/overview.html:79
-msgid ""
-"No exercises for this equipment. Add or edit an exercise and set the "
-"equipment."
-msgstr ""
-
-#: exercises/templates/equipment/overview.html:96
-#: exercises/templates/exercise/overview.html:99
-#: nutrition/templates/ingredient/overview.html:57
-msgid "Search"
-msgstr ""
-
-#: exercises/templates/equipment/overview.html:101
-#: exercises/templates/exercise/overview.html:104
-msgid "exercise name"
-msgstr ""
-
-#: exercises/templates/equipment/overview.html:115
-#: exercises/templates/exercise/overview.html:118
-#: exercises/templates/muscles/overview.html:118
-#: nutrition/templates/ingredient/overview.html:85
-msgid "Only registered users can do this"
-msgstr ""
-
-#: exercises/templates/exercise/email_new.tpl:1
-#, python-format
-msgid ""
-"Your exercise '%(exercise)s' was successfully added to the general\n"
-"database."
-msgstr ""
-
-#: exercises/templates/exercise/email_new.tpl:4
-msgid ""
-"It is now available on the exercise and muscle overview and can be\n"
-"added to workouts. You can access it on this address:"
-msgstr ""
-
-#: exercises/templates/exercise/email_new.tpl:8
-#: nutrition/templates/ingredient/email_new.tpl:8
-msgid "Thank you for contributing and making this site better!"
-msgstr ""
-
-#: exercises/templates/exercise/email_new.tpl:9
-#: manager/templates/workout/email_reminder.tpl:15
-#: manager/templates/workout/email_weight_reminder.tpl:12
-#: nutrition/templates/ingredient/email_new.tpl:9
-#, python-format
-msgid "The %(site)s team"
-msgstr ""
-
-#: exercises/templates/exercise/form.html:4
-msgid "Submitting an exercise"
-msgstr ""
-
-#: exercises/templates/exercise/form.html:5
-msgid ""
-"Thank you for submitting an exercise. This is much\n"
-"appreciated!"
-msgstr ""
-
-#: exercises/templates/exercise/form.html:8
-msgid ""
-"After you submit the form, the administrators will be notified.\n"
-"Once it is reviewed, it will be added to the database. Till this happens,\n"
-"it will not be visible in the overview or the search. In case you added your "
-"email\n"
-"when you registered, you will get notified when the process is completed "
-"successfully."
-msgstr ""
-
-#: exercises/templates/exercise/form_correct.html:4
-msgid "Correcting an exercise"
-msgstr ""
-
-#: exercises/templates/exercise/form_correct.html:5
-msgid ""
-"Thank you for correcting and improving this exercise.\n"
-"This is much appreciated!"
-msgstr ""
-
-#: exercises/templates/exercise/form_correct.html:8
-msgid ""
-"After you submit the form, the administrators will be notified.\n"
-"Once the changes are reviewed the exercise will be updated."
-msgstr ""
-
-#: exercises/templates/exercise/overview.html:88
-msgid "No categories."
-msgstr ""
-
-#: exercises/templates/exercise/overview.html:88
-msgid "Use link to create one"
-msgstr ""
-
-#: exercises/templates/exercise/pending.html:14
-#: nutrition/templates/ingredient/pending.html:14
-msgid "Submission date"
-msgstr ""
-
-#: exercises/templates/exercise/pending.html:16 gallery/models/image.py:51
+#: exercises/templates/history/overview.html:28 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/log.py:45
@@ -1771,97 +1659,39 @@ msgstr ""
msgid "User"
msgstr ""
-#: exercises/templates/exercise/view.html:48
-msgid "Exercise is pending review"
+#: exercises/templates/history/overview.html:29
+msgid "Object"
msgstr ""
-#: exercises/templates/exercise/view.html:51
-msgid ""
-"This user submitted exercise is pending a decision to be\n"
-" included in the database."
+#: exercises/templates/history/overview.html:31
+msgid "Changes"
msgstr ""
-#: exercises/templates/exercise/view.html:53
-msgid "Till then, it will not be shown in the overview or the search."
+#: exercises/templates/history/overview.html:32
+msgid "Revert"
msgstr ""
-#: exercises/templates/exercise/view.html:54
-#: nutrition/templates/ingredient/view.html:31
-msgid "Please select one of the options below."
+#: exercises/templates/history/overview.html:64
+msgid "View Object"
msgstr ""
-#: exercises/templates/exercise/view.html:60
-#: exercises/templates/exercise/view.html:203
-#: nutrition/templates/ingredient/view.html:38
-msgid "Accept"
+#: exercises/templates/history/overview.html:75
+msgid "View changes"
msgstr ""
-#: exercises/templates/exercise/view.html:64
-#: exercises/templates/exercise/view.html:204
-#: nutrition/templates/ingredient/view.html:42
-msgid "Decline"
-msgstr ""
-
-#: exercises/templates/exercise/view.html:96
-msgid "Images"
-msgstr ""
-
-#: exercises/templates/exercise/view.html:137 exercises/views/images.py:93
-msgid "Add new image"
-msgstr ""
-
-#: 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:218
-msgid "Comments for this exercise"
-msgstr ""
-
-#: exercises/templates/exercise/view.html:246
-msgid "Add new comment"
-msgstr ""
-
-#: exercises/templates/exercise/view.html:260
-msgid "The diagram shows the most used muscles on this exercise"
-msgstr ""
-
-#: 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:306
-msgid "Exercise Variations"
-msgstr ""
-
-#: exercises/templates/exercise/view.html:327
-msgid "Submit a correction"
+#: exercises/templates/history/overview.html:86
+msgid "Revert changes"
msgstr ""
#: exercises/templates/muscles/admin-overview.html:4
-#: exercises/templates/muscles/overview.html:7
msgid "Muscle overview"
msgstr ""
#: exercises/templates/muscles/admin-overview.html:36
-#: exercises/views/muscles.py:86
+#: exercises/views/muscles.py:67
msgid "Add muscle"
msgstr ""
-#: exercises/templates/muscles/overview.html:85
-msgid ""
-"No exercises for this muscle. Add or edit an exercise and set the muscle."
-msgstr ""
-
#: exercises/views/categories.py:71
msgid "Add category"
msgstr ""
@@ -1874,50 +1704,19 @@ msgstr ""
msgid "Add exercise comment"
msgstr ""
-#: exercises/views/equipment.py:107 exercises/views/equipment.py:118
+#: exercises/views/equipment.py:105 exercises/views/equipment.py:116
msgid "Delete equipment?"
msgstr ""
-#: exercises/views/exercises.py:229
+#: exercises/views/exercises.py:161
#, python-format
-msgid ""
-"%(name_original)s is too similar to existing exercise \"%(exercise_name)s\""
-msgstr ""
-
-#: exercises/views/exercises.py:247
-msgid "Add exercise"
-msgstr ""
-
-#: exercises/views/exercises.py:367
-msgid "Thank you. Once the changes are reviewed the exercise will be updated."
-msgstr ""
-
-#: exercises/views/exercises.py:380
-#, python-brace-format
-msgid "Correct {0}"
+msgid "%(name)s is too similar to existing exercise \"%(exercise_name)s\""
msgstr ""
-#: exercises/views/exercises.py:422
+#: exercises/views/exercises.py:184
msgid "This will delete the exercise from all workouts."
msgstr ""
-#: exercises/views/exercises.py:474
-msgid "Exercise was successfully marked as rejected"
-msgstr ""
-
-#: exercises/views/images.py:68
-msgid "Edit exercise image"
-msgstr ""
-
-#: exercises/views/images.py:143
-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 ""
@@ -1984,7 +1783,7 @@ msgid "Contract type"
msgstr ""
#: gym/models/contract.py:208 gym/templates/contract/view.html:59
-#: manager/templates/log/add.html:52 nutrition/forms.py:59
+#: manager/templates/log/add.html:52 nutrition/forms.py:60
#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:102
#: nutrition/models/meal_item.py:72
msgid "Amount"
@@ -2085,6 +1884,10 @@ msgstr ""
msgid "User notes"
msgstr ""
+#: gym/templates/contract/list.html:36
+msgid "Show"
+msgstr ""
+
#: gym/templates/contract/view.html:4
msgid "Contract"
msgstr ""
@@ -2163,10 +1966,6 @@ msgstr ""
msgid "Add member"
msgstr ""
-#: gym/templates/gym/new_user.html:38
-msgid "Date of Birth"
-msgstr ""
-
#: gym/templates/gym/new_user.html:48 manager/templates/calendar/month.html:144
#: manager/templates/log/add.html:75 nutrition/templates/rate/form.html:120
msgid "Info"
@@ -2223,125 +2022,125 @@ msgstr ""
msgid "Edit gym"
msgstr ""
-#: i18n.tpl:2 i18n.tpl:28
-msgid "Abs"
+#: i18n.tpl:2
+msgid "Until Failure"
msgstr ""
-#: i18n.tpl:3
-msgid "Arms"
+#: i18n.tpl:3 manager/forms.py:180 manager/models/log.py:73
+#: manager/templates/set/add.html:53
+msgid "Repetitions"
msgstr ""
#: i18n.tpl:4
-msgid "Back"
+msgid "Abs"
msgstr ""
-#: i18n.tpl:5 i18n.tpl:23
-msgid "Calves"
+#: i18n.tpl:5
+msgid "Arms"
msgstr ""
-#: i18n.tpl:6 i18n.tpl:26
-msgid "Chest"
+#: i18n.tpl:6
+msgid "Legs"
msgstr ""
#: i18n.tpl:7
-msgid "Legs"
+msgid "Dumbbell"
msgstr ""
-#: i18n.tpl:8 i18n.tpl:19
-msgid "Shoulders"
+#: i18n.tpl:8
+msgid "Biceps"
msgstr ""
#: i18n.tpl:9
-msgid "Barbell"
+msgid "SZ-Bar"
msgstr ""
#: i18n.tpl:10
-msgid "Bench"
+msgid "Kettlebell"
msgstr ""
#: i18n.tpl:11
-msgid "Dumbbell"
+msgid "Swiss Ball"
msgstr ""
#: i18n.tpl:12
-msgid "Gym mat"
+msgid "none (bodyweight exercise)"
msgstr ""
#: i18n.tpl:13
-msgid "Incline bench"
+msgid "Calves"
msgstr ""
#: i18n.tpl:14
-msgid "Kettlebell"
+msgid "Back"
msgstr ""
#: i18n.tpl:15
-msgid "Pull-up bar"
+msgid "Lower back"
msgstr ""
#: i18n.tpl:16
-msgid "SZ-Bar"
+msgid "Lats"
msgstr ""
#: i18n.tpl:17
-msgid "Swiss Ball"
+msgid "Hamstrings"
msgstr ""
#: i18n.tpl:18
-msgid "none (bodyweight exercise)"
+msgid "Bench"
+msgstr ""
+
+#: i18n.tpl:19
+msgid "Glutes"
msgstr ""
#: i18n.tpl:20
-msgid "Biceps"
+msgid "Kilometers"
msgstr ""
#: i18n.tpl:21
-msgid "Hamstrings"
+msgid "Shoulders"
msgstr ""
#: i18n.tpl:22
-msgid "Lower back"
+msgid "Seconds"
msgstr ""
-#: i18n.tpl:24
-msgid "Glutes"
+#: i18n.tpl:23
+msgid "Miles"
msgstr ""
-#: i18n.tpl:25
-msgid "Lats"
+#: i18n.tpl:24
+msgid "Incline bench"
msgstr ""
-#: i18n.tpl:27
+#: i18n.tpl:25
msgid "Quads"
msgstr ""
-#: i18n.tpl:29
-msgid "Triceps"
-msgstr ""
-
-#: i18n.tpl:30
-msgid "Kilometers"
+#: i18n.tpl:26
+msgid "Minutes"
msgstr ""
-#: i18n.tpl:31
-msgid "Miles"
+#: i18n.tpl:27
+msgid "Chest"
msgstr ""
-#: i18n.tpl:32
-msgid "Minutes"
+#: i18n.tpl:28
+msgid "Gym mat"
msgstr ""
-#: i18n.tpl:33 manager/forms.py:169 manager/models/log.py:71
-#: manager/templates/set/add.html:53
-msgid "Repetitions"
+#: i18n.tpl:29
+msgid "Pull-up bar"
msgstr ""
-#: i18n.tpl:34
-msgid "Seconds"
+#: i18n.tpl:30
+msgid "Barbell"
msgstr ""
-#: i18n.tpl:35
-msgid "Until Failure"
+#: i18n.tpl:31
+msgid "Triceps"
msgstr ""
#: mailer/forms.py:34 mailer/templates/mailer/gym/preview.html:32
@@ -2395,44 +2194,44 @@ msgstr ""
msgid "Correction"
msgstr ""
-#: manager/forms.py:89 manager/models/workout.py:59
+#: manager/forms.py:92 manager/models/workout.py:59
msgid "The name of the workout"
msgstr ""
-#: manager/forms.py:93 manager/models/workout.py:66
+#: manager/forms.py:96 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
+#: manager/forms.py:137
msgid ""
"You can search for more than one exercise, they will be grouped together for "
"a superset."
msgstr ""
-#: 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
+#: manager/forms.py:166 manager/forms.py:171 manager/models/log.py:64
+#: manager/models/log.py:92 manager/models/setting.py:59
+#: manager/models/setting.py:90 manager/templates/log/add.html:53
+#: manager/templates/log/add.html:55 manager/templates/set/formset.html:10
+#: manager/templates/set/formset.html:12 measurements/models/category.py:58
+#: nutrition/forms.py:64
msgid "Unit"
msgstr ""
-#: manager/forms.py:266
+#: manager/forms.py:277
msgid "Type"
msgstr ""
-#: manager/forms.py:267 manager/templates/workout/view.html:157
+#: manager/forms.py:278 manager/templates/workout/view.html:157
msgid "Table"
msgstr ""
-#: manager/forms.py:269 manager/templates/workout/view.html:163
+#: manager/forms.py:280 manager/templates/workout/view.html:163
msgid "with images"
msgstr ""
-#: manager/forms.py:270 manager/templates/workout/view.html:169
+#: manager/forms.py:281 manager/templates/workout/view.html:169
msgid "with comments"
msgstr ""
@@ -2484,7 +2283,7 @@ msgid "The duration in weeks"
msgstr ""
#: manager/models/schedule_step.py:63 manager/models/set.py:52
-#: manager/models/setting.py:98 nutrition/models/meal.py:54
+#: manager/models/setting.py:110 nutrition/models/meal.py:54
#: nutrition/models/meal_item.py:65
msgid "Order"
msgstr ""
@@ -2535,7 +2334,7 @@ msgstr ""
msgid "Number of sets"
msgstr ""
-#: manager/models/setting.py:43
+#: manager/models/setting.py:48
msgid "Sets"
msgstr ""
@@ -2790,6 +2589,13 @@ msgid ""
"option in your settings."
msgstr ""
+#: manager/templates/workout/email_reminder.tpl:15
+#: manager/templates/workout/email_weight_reminder.tpl:12
+#: nutrition/templates/ingredient/email_new.tpl:9
+#, python-format
+msgid "The %(site)s team"
+msgstr ""
+
#: manager/templates/workout/email_weight_reminder.tpl:3
#, python-format
msgid ""
@@ -2802,6 +2608,10 @@ msgid ""
"You will regularly receive such reminders till you enter your current weight."
msgstr ""
+#: manager/templates/workout/log.html:10 manager/templates/workout/log.html:11
+msgid "Weight log"
+msgstr ""
+
#: manager/templates/workout/log.html:29
msgid "Weight log for workout"
msgstr ""
@@ -2898,7 +2708,7 @@ msgstr ""
msgid "Edit workout"
msgstr ""
-#: manager/templates/workout/view.html:225 manager/views/workout.py:300
+#: manager/templates/workout/view.html:225 manager/views/workout.py:301
msgid "Mark as template"
msgstr ""
@@ -2906,11 +2716,6 @@ msgstr ""
msgid "Add workout day"
msgstr ""
-#: manager/views/log.py:92
-#, python-format
-msgid "Edit log entry for %s"
-msgstr ""
-
#: manager/views/log.py:111
msgid "Delete workout log"
msgstr ""
@@ -2928,11 +2733,11 @@ msgstr ""
msgid "Your workouts"
msgstr ""
-#: manager/views/workout.py:227
+#: manager/views/workout.py:228
msgid "Copy workout"
msgstr ""
-#: manager/views/workout.py:230
+#: manager/views/workout.py:231
msgid "Copy"
msgstr ""
@@ -2954,29 +2759,29 @@ msgstr ""
msgid "Value"
msgstr ""
-#: nutrition/forms.py:122
+#: nutrition/forms.py:123
msgid "Calculate"
msgstr ""
-#: nutrition/forms.py:195 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:196 nutrition/templates/rate/form.html:76
msgid "Basic caloric intake"
msgstr ""
-#: nutrition/forms.py:196
+#: nutrition/forms.py:197
msgid "Your basic caloric intake as calculated for your data"
msgstr ""
-#: nutrition/forms.py:202
+#: nutrition/forms.py:203
msgid "Additional calories"
msgstr ""
-#: nutrition/forms.py:204
+#: nutrition/forms.py:205
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
msgstr ""
-#: nutrition/forms.py:232 nutrition/models/ingredient_weight_unit.py:39
+#: nutrition/forms.py:233 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"
@@ -3039,7 +2844,7 @@ msgid ""
"{energy_approx}%)"
msgstr ""
-#: nutrition/models/ingredient.py:357 nutrition/views/ingredient.py:225
+#: nutrition/models/ingredient.py:357 nutrition/views/ingredient.py:219
msgid "Ingredient was successfully added to the general database"
msgstr ""
@@ -3068,6 +2873,10 @@ msgstr ""
msgid "Meal"
msgstr ""
+#: nutrition/models/log.py:65
+msgid "Date and Time (Approx.)"
+msgstr ""
+
#: nutrition/models/meal.py:61
msgid "Time (approx)"
msgstr ""
@@ -3159,6 +2968,10 @@ msgid ""
"added to nutrition plans. You can access it on this address:"
msgstr ""
+#: nutrition/templates/ingredient/email_new.tpl:8
+msgid "Thank you for contributing and making this site better!"
+msgstr ""
+
#: nutrition/templates/ingredient/form.html:4
msgid "Submitting an ingredient"
msgstr ""
@@ -3183,6 +2996,10 @@ msgstr ""
msgid "No ingredients."
msgstr ""
+#: nutrition/templates/ingredient/overview.html:57
+msgid "Search"
+msgstr ""
+
#: nutrition/templates/ingredient/overview.html:66
msgid "ingredient name"
msgstr ""
@@ -3192,6 +3009,14 @@ msgstr ""
msgid "Add ingredient"
msgstr ""
+#: nutrition/templates/ingredient/overview.html:85
+msgid "Only registered users can do this"
+msgstr ""
+
+#: nutrition/templates/ingredient/pending.html:14
+msgid "Submission date"
+msgstr ""
+
#: nutrition/templates/ingredient/view.html:27
msgid "Ingredient is pending review"
msgstr ""
@@ -3204,6 +3029,18 @@ msgid ""
"the search."
msgstr ""
+#: nutrition/templates/ingredient/view.html:31
+msgid "Please select one of the options below."
+msgstr ""
+
+#: nutrition/templates/ingredient/view.html:38
+msgid "Accept"
+msgstr ""
+
+#: nutrition/templates/ingredient/view.html:42
+msgid "Decline"
+msgstr ""
+
#: nutrition/templates/ingredient/view.html:71
#: nutrition/templates/log/detail.html:31
#: nutrition/templates/plan/view.html:229 nutrition/views/plan.py:376
@@ -3444,14 +3281,18 @@ msgid ""
"yourself for some weeks and change the total amount if needed."
msgstr ""
-#: nutrition/views/ingredient.py:181
+#: nutrition/views/ingredient.py:175
msgid "Add a new ingredient"
msgstr ""
-#: nutrition/views/ingredient.py:238
+#: nutrition/views/ingredient.py:232
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 ""
@@ -3666,29 +3507,29 @@ msgstr ""
msgid "100%% Free <br>and <br>Open Source"
msgstr ""
-#: utils/generic_views.py:261
+#: utils/generic_views.py:262
msgid "Yes, delete"
msgstr ""
-#: utils/models.py:47
+#: utils/models.py:48
msgid "Author"
msgstr ""
-#: utils/models.py:52
+#: utils/models.py:53
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:77
+#: utils/models.py:78
msgid "Pending"
msgstr ""
-#: utils/models.py:78
+#: utils/models.py:79
msgid "Accepted"
msgstr ""
-#: utils/models.py:79
+#: utils/models.py:80
msgid "Declined"
msgstr ""
@@ -3828,3 +3669,6 @@ msgstr ""
#, python-format
msgid "Delete weight entry for the %s"
msgstr ""
+
+#~ msgid "Ingredients"
+#~ msgstr "सामग्री"
diff --git a/wger/locale/hu/LC_MESSAGES/django.po b/wger/locale/hu/LC_MESSAGES/django.po
index 96275a19f..7443af27a 100644
--- a/wger/locale/hu/LC_MESSAGES/django.po
+++ b/wger/locale/hu/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: wger Workout Manager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-14 12:01+0200\n"
+"POT-Creation-Date: 2022-11-10 16:03+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"
@@ -30,102 +30,8 @@ msgid ""
"registered users to this gym and update all existing users without a gym."
msgstr ""
-#: 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 "Gyakorlatok"
-
-#: config/models/language_config.py:42
-msgid "Ingredients"
-msgstr "Összetevők"
-
-#: config/templates/language/overview.html:4 core/templates/navigation.html:226
-msgid "Languages"
-msgstr "Nyelvek"
-
-#: config/templates/language/overview.html:16
-msgid "Nothing found."
-msgstr "Nincs találat."
-
-#: 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:150
-#: nutrition/templates/plan/view.html:153
-#: nutrition/templates/plan/view.html:191
-msgid "Add one now."
-msgstr "Adj hozzá egyet most."
-
-#: config/templates/language/overview.html:29
-#: core/templates/license/list.html:38 core/templates/misc/license/list.html:41
-#: core/templates/repetition_unit/list.html:41
-#: core/templates/user/overview.html:327 core/templates/user/overview.html:366
-#: core/templates/user/overview.html:402
-#: core/templates/weight_unit/list.html:41 core/views/languages.py:73
-#: core/views/license.py:65 core/views/repetition_units.py:65
-#: core/views/weight_units.py:65
-#: exercises/templates/categories/admin-overview.html:36
-#: 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:61
-msgid "Add"
-msgstr "Hozzáadás"
-
-#: config/templates/language/view.html:21 core/models/language.py:29
-msgid "Language short name"
-msgstr "Nyelv rövid neve"
-
-#: config/templates/language/view.html:22
-#: config/templates/language/view.html:43 core/models/language.py:32
-msgid "Language full name"
-msgstr "Nyelv teljes neve"
-
-#: config/templates/language/view.html:34 core/templates/user/overview.html:451
-#: gym/views/admin_config.py:44 gym/views/admin_config.py:58
-#: gym/views/user_config.py:46
-msgid "Configuration"
-msgstr "Beállítás"
-
-#: config/templates/language/view.html:35
-msgid ""
-"Use the configuration to select in what languages the\n"
-"exercises and ingredients will be shown for the current language (for "
-"example\n"
-"the exercises should be shown in languages A, B and C; the ingredients only\n"
-"in A)."
-msgstr ""
-
-#: config/templates/language/view.html:44 gym/templates/contract/list.html:36
-msgid "Show"
-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: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:45
-msgid "Options"
-msgstr "Beállítások"
-
-#: config/templates/language/view.html:96 config/views/gym_config.py:41
-#: config/views/language_config.py:49 core/templates/license/list.html:16
-#: core/templates/misc/license/list.html:17
+#: config/views/gym_config.py:41 core/templates/language/view.html:57
+#: 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:39
#: core/templates/tags/render_day.html:75 core/templates/user/overview.html:205
@@ -133,12 +39,10 @@ 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:230
-#: exercises/templates/exercise/view.html:351
#: exercises/templates/muscles/admin-overview.html:16
-#: 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
+#: 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
#: 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
@@ -154,81 +58,54 @@ msgstr "Beállítások"
msgid "Edit"
msgstr "Módosítás"
-#: 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: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: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
-#: gym/templates/contract_type/list.html:39 gym/templates/document/list.html:46
-#: gym/templates/gym/list.html:20 manager/templates/calendar/day.html:69
-#: 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:231
-#: 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:132
-#: nutrition/templates/units/list.html:20
-msgid "Delete"
-msgstr "Törlés"
-
-#: core/demo.py:86
+#: core/demo.py:95
msgid "Sample workout"
msgstr "Minta edzés"
-#: core/demo.py:90
+#: core/demo.py:99
msgid "Sample day"
msgstr "Minta nap"
-#: core/demo.py:94
+#: core/demo.py:103
msgid "Another sample day"
msgstr "Egy másik minta nap"
-#: core/demo.py:217
-msgid "Sample nutrional plan"
+#: core/demo.py:211
+#, fuzzy
+#| msgid "Sample nutrional plan"
+msgid "Sample nutritional plan"
msgstr "Minta tápanyagterv"
-#: core/demo.py:349 core/demo.py:351 core/demo.py:353
+#: core/demo.py:343 core/demo.py:345 core/demo.py:347
#, python-brace-format
msgid "Placeholder workout nr {0} for schedule"
msgstr "Helyfoglaló edzés a(z) {0} számú ütemtervhez"
-#: core/demo.py:358
+#: core/demo.py:352
msgid "My cool workout schedule"
msgstr "Az én király edzés ütemtervem"
-#: core/demo.py:397 core/demo.py:412
+#: core/demo.py:391 core/demo.py:406
msgid "Empty placeholder schedule"
msgstr "Üres helyfoglaló ütemterv"
-#: core/forms.py:61 core/templates/navigation.html:188
-#: core/templates/navigation.html:192 core/templates/user/login.html:4
+#: core/forms.py:64 core/templates/navigation.html:179
+#: core/templates/navigation.html:183 core/templates/user/login.html:4
#: software/templates/features.html:43
msgid "Login"
msgstr "Bejelentkezés"
-#: core/forms.py:73 core/forms.py:164 gym/views/export.py:63
+#: core/forms.py:76 core/forms.py:177 gym/views/export.py:63
#: gym/views/gym.py:218
msgid "First name"
msgstr "Keresztnév"
-#: core/forms.py:74 core/forms.py:165 core/templates/user/overview.html:267
+#: core/forms.py:77 core/forms.py:178 core/templates/user/overview.html:267
#: gym/views/export.py:64 gym/views/gym.py:218
msgid "Last name"
msgstr "Vezetéknév"
-#: core/forms.py:76 core/forms.py:131 core/templates/user/overview.html:271
+#: core/forms.py:79 core/forms.py:144 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
@@ -238,77 +115,107 @@ msgstr "Vezetéknév"
msgid "Email"
msgstr "Email"
-#: core/forms.py:77
+#: core/forms.py:80
msgid "Used for password resets and, optionally, e-mail reminders."
msgstr ""
"Jelszó visszaállításokhoz és opcionálisan, e-mail emlékeztetőkhöz használják."
-#: core/forms.py:102
+#: core/forms.py:84 core/models/profile.py:220
+#: gym/templates/gym/new_user.html:38
+msgid "Date of Birth"
+msgstr ""
+
+#: core/forms.py:116
msgid "Personal data"
msgstr "Személyes adat"
-#: core/forms.py:110
+#: core/forms.py:124
msgid "Workout reminders"
msgstr "Edzés emlékeztetők"
-#: core/forms.py:117
+#: core/forms.py:131
msgid "Other settings"
msgstr "Egyéb beállítások"
-#: 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
+#: core/forms.py:138 core/views/user.py:615 core/views/user.py:630
+#: core/views/user.py:642 gym/forms.py:72 manager/templates/log/add.html:65
+#: manager/templates/set/add.html:69 manager/views/workout.py:222
+#: utils/generic_views.py:143
msgid "Save"
msgstr "Mentés"
-#: core/forms.py:132
+#: core/forms.py:145
msgid "Used for password resets and, optionally, email reminders."
msgstr ""
"Jelszó visszaállításokhoz és opcionálisan, e-mail emlékeztetőkhöz használják."
-#: core/forms.py:160
+#: core/forms.py:173
msgid "This e-mail address is already in use."
msgstr "Ez az e-mail cím már használatban van."
-#: core/forms.py:180 gym/templates/gym/new_user.html:26
+#: core/forms.py:193 gym/templates/gym/new_user.html:26
#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:218
msgid "Password"
msgstr "Jelszó"
-#: core/forms.py:182
+#: core/forms.py:195
msgid "Please enter your current password."
msgstr "Kérlek írd be a jelenlegi jelszavad."
-#: core/forms.py:200
+#: core/forms.py:204 core/templates/language/view.html:62
+#: 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: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/muscles/admin-overview.html:17
+#: gym/templates/admin_notes/list.html:40
+#: gym/templates/contract_option/list.html:39
+#: gym/templates/contract_type/list.html:39 gym/templates/document/list.html:46
+#: gym/templates/gym/list.html:20 manager/templates/calendar/day.html:69
+#: 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:231
+#: 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:132
+#: nutrition/templates/units/list.html:20
+msgid "Delete"
+msgstr "Törlés"
+
+#: core/forms.py:213
msgid "Invalid password"
msgstr "Érvénytelen jelszó"
-#: core/forms.py:212 core/forms.py:278
+#: core/forms.py:225 core/forms.py:291
msgid "The form is secured with reCAPTCHA"
msgstr "Ez az űrlap reCAPTCHA-val van biztosítva"
-#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:188
-#: core/templates/navigation.html:193 core/templates/template.html:149
-#: core/templates/user/login.html:20 core/views/user.py:293
+#: core/forms.py:239 core/forms.py:258 core/templates/navigation.html:179
+#: core/templates/navigation.html:184 core/templates/template.html:149
+#: core/templates/user/login.html:20 core/views/user.py:300
#: software/templates/features.html:38
msgid "Register"
msgstr "Regisztráció"
-#: core/forms.py:256
+#: core/forms.py:269
msgid "Contact"
msgstr "Kapcsolat"
-#: core/forms.py:257
+#: core/forms.py:270
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:71
+#: core/forms.py:278 exercises/models/comment.py:42 manager/models/set.py:60
+#: manager/models/setting.py:111 nutrition/models/log.py:71
msgid "Comment"
msgstr "Hozzászólás"
-#: core/forms.py:266
+#: core/forms.py:279
msgid "What do you want to say?"
msgstr "Mit szeretnél mondani?"
@@ -316,6 +223,14 @@ msgstr "Mit szeretnél mondani?"
msgid "Day of the week"
msgstr "A hét napja"
+#: core/models/language.py:31 core/templates/language/view.html:21
+msgid "Language short name"
+msgstr "Nyelv rövid neve"
+
+#: core/models/language.py:36 core/templates/language/view.html:22
+msgid "Language full name"
+msgstr "Nyelv teljes neve"
+
#: core/models/license.py:29
msgid "Full name"
msgstr "Teljes név"
@@ -371,20 +286,20 @@ msgstr "Metrikus (kilogramm)"
msgid "Imperial (pound)"
msgstr "Birodalmi (font)"
-#: core/models/profile.py:111
+#: core/models/profile.py:114
msgid "Show exercise comments"
msgstr "Gyakorlat hozzászólások megjelenítése"
-#: core/models/profile.py:112
+#: core/models/profile.py:115
msgid "Check to show exercise comments on the workout view"
msgstr ""
"Jelöld be, hogy megjelenjenek a gyakorlatok hozzászólásai az edzések nézetben"
-#: core/models/profile.py:123
+#: core/models/profile.py:126
msgid "Also use ingredients in English"
msgstr "Használjon hozzávalókat Angolul is"
-#: core/models/profile.py:125
+#: core/models/profile.py:128
msgid ""
"Check to also show ingredients in English while creating\n"
"a nutritional plan. These ingredients are extracted from a list provided\n"
@@ -392,11 +307,11 @@ msgid ""
"7000 entries, but can be somewhat overwhelming and make the search difficult."
msgstr ""
-#: core/models/profile.py:134
+#: core/models/profile.py:137
msgid "Activate workout reminders"
msgstr "Edzés emlékeztetők aktiválása"
-#: core/models/profile.py:136
+#: core/models/profile.py:139
msgid ""
"Check to activate automatic reminders for workouts. You need to provide a "
"valid email for this to work."
@@ -404,29 +319,29 @@ msgstr ""
"Jelöld be, hogy aktiváljuk az automatikus emlékeztetőket az edzésekhez. "
"Ennek a működéséhez meg kell adnod egy érvényes email címet."
-#: core/models/profile.py:145
+#: core/models/profile.py:148
msgid "Remind before expiration"
msgstr "Emlékeztess a lejárat előtt"
-#: core/models/profile.py:146
+#: core/models/profile.py:149
msgid "The number of days you want to be reminded before a workout expires."
msgstr "A napok száma, amivel az edzés lejárta előtt értesítsünk."
-#: core/models/profile.py:152
+#: core/models/profile.py:155
msgid "Default duration of workouts"
msgstr "Edzések alapértelmezett időtartama"
-#: core/models/profile.py:154
+#: core/models/profile.py:157
msgid ""
"Default duration in weeks of workouts not in a schedule. Used for email "
"workout reminders."
msgstr ""
-#: core/models/profile.py:171
+#: core/models/profile.py:174
msgid "Notification language"
msgstr "Értesítési nyelv"
-#: core/models/profile.py:173
+#: core/models/profile.py:176
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."
@@ -434,92 +349,91 @@ msgstr ""
"A nyelv amit használunk az email értesítésekhez, pl.: edzés email "
"emlékeztetők. Ez nem befolyásolj a weboldalon használt nyelvet."
-#: core/models/profile.py:186 gym/views/export.py:66
+#: core/models/profile.py:212 gym/views/export.py:66
msgid "Age"
msgstr "Kor"
-#: core/models/profile.py:202 nutrition/forms.py:99
+#: core/models/profile.py:228 nutrition/forms.py:100
msgid "Height (cm)"
msgstr "Magasság (cm)"
-#: core/models/profile.py:219
+#: core/models/profile.py:245
msgid "Hours of sleep"
msgstr "Napi alvás órában"
-#: core/models/profile.py:220
+#: core/models/profile.py:246
msgid "The average hours of sleep per day"
msgstr "Az átlag alvás órában per nap"
-#: core/models/profile.py:229
+#: core/models/profile.py:255
msgid "Work"
msgstr "Munka"
-#: core/models/profile.py:230 core/models/profile.py:272
+#: core/models/profile.py:256 core/models/profile.py:298
msgid "Average hours per day"
msgstr "Átlag órák száma per nap"
-#: core/models/profile.py:239 core/models/profile.py:260
-#: core/models/profile.py:281
+#: core/models/profile.py:265 core/models/profile.py:286
+#: core/models/profile.py:307
msgid "Physical intensity"
msgstr "Fizikai megterhelés mértéke"
-#: core/models/profile.py:240 core/models/profile.py:261
-#: core/models/profile.py:282
+#: core/models/profile.py:266 core/models/profile.py:287
+#: core/models/profile.py:308
msgid "Approximately"
msgstr "Megközelítőleg"
-#: core/models/profile.py:250
+#: core/models/profile.py:276
msgid "Sport"
msgstr "Sport"
-#: core/models/profile.py:251
+#: core/models/profile.py:277
msgid "Average hours per week"
msgstr "Átlag órák száma per hét"
-#: core/models/profile.py:271
+#: core/models/profile.py:297
msgid "Free time"
msgstr "Szabadidő"
-#: core/models/profile.py:292 nutrition/templates/rate/form.html:66
+#: core/models/profile.py:318 nutrition/templates/rate/form.html:66
msgid "Total daily calories"
msgstr "Teljes napi kalória"
-#: core/models/profile.py:293
+#: core/models/profile.py:319
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
+#: core/models/profile.py:331 nutrition/models/ingredient_weight_unit.py:45
#: nutrition/models/log.py:90 nutrition/models/meal_item.py:58
msgid "Weight unit"
msgstr "Súly egység"
-#: core/models/profile.py:313
+#: core/models/profile.py:339
msgid "Allow external access"
msgstr "Külső hozzáférés engedélyezése"
-#: core/models/profile.py:315
+#: core/models/profile.py:341
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/profile.py:324
+#: core/models/profile.py:350
msgid "Automatic reminders for weight entries"
msgstr ""
-#: core/models/profile.py:326
+#: core/models/profile.py:352
msgid "Number of days after the last weight entry (enter 0 to deactivate)"
msgstr ""
-#: core/models/profile.py:392
+#: core/models/profile.py:418
msgid "The sum of all hours has to be 24"
msgstr "Az órák összegének meg kell egyeznie 24-el"
#: core/models/rep_unit.py:35 core/models/weight_unit.py:35
-#: core/templates/user/overview.html:263 core/views/user.py:575
+#: core/templates/user/overview.html:263 core/views/user.py:591
#: 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
+#: exercises/models/exercise.py:64 exercises/models/muscle.py:36
#: 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
@@ -578,6 +492,52 @@ msgstr ""
msgid "Are you sure you want to delete this? This action cannot be undone."
msgstr "Biztosan törölni akarod? Ez a művelet nem visszavonható."
+#: core/templates/email_verification/confirm_template.html:4
+msgid "Email verified"
+msgstr ""
+
+#: core/templates/email_verification/confirm_template.html:18
+#, python-format
+msgid "%(username)s, your email was verified"
+msgstr ""
+
+#: core/templates/email_verification/confirm_template.html:22
+msgid "Error, invalid verification token"
+msgstr ""
+
+#: core/templates/email_verification/email_body_html.tpl:6
+#, fuzzy
+#| msgid "Configuration"
+msgid "Email Confirmation"
+msgstr "Beállítás"
+
+#: core/templates/email_verification/email_body_html.tpl:9
+#: core/templates/email_verification/email_body_txt.tpl:3
+#, python-format
+msgid "You are almost there, %(username)s!"
+msgstr ""
+
+#: core/templates/email_verification/email_body_html.tpl:11
+#, python-format
+msgid "Please click <a href=\"%(link)s\">here</a> to confirm your email"
+msgstr ""
+
+#: core/templates/email_verification/email_body_html.tpl:12
+#: core/templates/email_verification/email_body_txt.tpl:5
+#, python-format
+msgid "The token expires on %(time)s"
+msgstr ""
+
+#: core/templates/email_verification/email_body_html.tpl:14
+#: core/templates/email_verification/email_body_txt.tpl:8
+msgid "the wger Team"
+msgstr ""
+
+#: core/templates/email_verification/email_body_txt.tpl:4
+#, python-format
+msgid "Please click the following link to confirm your email: %(link)s"
+msgstr ""
+
#: core/templates/index.html:4
msgid "Dashboard"
msgstr "Irányítópult"
@@ -634,7 +594,7 @@ msgid "Add custom diary entry"
msgstr ""
#: core/templates/index.html:84 core/templates/index.html:92
-#: manager/models/day.py:34 manager/models/log.py:56
+#: manager/models/day.py:34 manager/models/log.py:58
#: manager/models/session.py:60 manager/models/workout.py:109
#: manager/templates/schedule/view.html:105
#: manager/templates/workout/view.html:11
@@ -665,6 +625,20 @@ msgstr "Új naplóbejegyzés hozzáadása"
msgid "No workouts found."
msgstr "Nem található edzés."
+#: core/templates/index.html:137 core/templates/index.html:189
+#: core/templates/language/overview.html:23
+#: 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:150
+#: nutrition/templates/plan/view.html:153
+#: nutrition/templates/plan/view.html:191
+msgid "Add one now."
+msgstr "Adj hozzá egyet most."
+
#: 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
@@ -718,19 +692,59 @@ msgid "No nutrition plans."
msgstr "Nincs táplálkozási terv."
#: 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
+#: core/templates/user/overview.html:121 manager/forms.py:184
+#: manager/helpers.py:89 manager/models/log.py:86 manager/models/setting.py:79
+#: manager/templates/log/add.html:54 manager/templates/set/formset.html:11
#: weight/models.py:34 weight/templates/import_csv_preview.html:14
#: weight/templates/import_csv_preview.html:43 weight/views.py:150
msgid "Weight"
msgstr "Súly"
-#: core/templates/index.html:210 core/templates/navigation.html:135
+#: core/templates/index.html:210 core/templates/navigation.html:126
#: weight/views.py:70
msgid "Add weight entry"
msgstr "Új súly bejegyzés hozzáadása"
+#: core/templates/language/overview.html:4 core/templates/navigation.html:217
+msgid "Languages"
+msgstr "Nyelvek"
+
+#: core/templates/language/overview.html:23
+msgid "Nothing found."
+msgstr "Nincs találat."
+
+#: core/templates/language/overview.html:36 core/templates/license/list.html:38
+#: core/templates/misc/license/list.html:41
+#: core/templates/repetition_unit/list.html:41
+#: core/templates/user/overview.html:327 core/templates/user/overview.html:366
+#: core/templates/user/overview.html:402
+#: core/templates/weight_unit/list.html:41 core/views/languages.py:73
+#: core/views/license.py:65 core/views/repetition_units.py:65
+#: core/views/weight_units.py:65
+#: exercises/templates/categories/admin-overview.html:36
+#: 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:61
+msgid "Add"
+msgstr "Hozzáadás"
+
+#: core/templates/language/view.html:52 core/templates/user/api_key.html:44
+#: core/templates/user/preferences.html:44 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:45
+msgid "Options"
+msgstr "Beállítások"
+
#: core/templates/license/list.html:4 core/templates/misc/license/list.html:4
msgid "License list"
msgstr "Licenc lista"
@@ -743,7 +757,6 @@ msgstr "Licenc lista"
#: core/templates/weight_unit/list.html:26
#: exercises/templates/categories/admin-overview.html:24
#: exercises/templates/equipment/admin-overview.html:24
-#: exercises/templates/exercise/pending.html:30
#: exercises/templates/muscles/admin-overview.html:24
#: gym/templates/admin_notes/list.html:52 gym/templates/contract/list.html:60
#: gym/templates/contract_option/list.html:56
@@ -825,155 +838,135 @@ msgstr "Ütemterveid"
msgid "Public templates"
msgstr ""
-#: core/templates/navigation.html:64
-msgctxt "as in sorted by category"
-msgid "by category"
-msgstr ""
-
-#: core/templates/navigation.html:65
-msgctxt "as in sorted by muscle"
-msgid "by muscle"
-msgstr ""
-
-#: core/templates/navigation.html:66
-msgctxt "as in sorted by equipment"
-msgid "by equipment"
-msgstr ""
-
-#: core/templates/navigation.html:70
-#: exercises/templates/equipment/overview.html:109
-#: exercises/templates/equipment/overview.html:113
-#: exercises/templates/exercise/overview.html:112
-#: exercises/templates/exercise/overview.html:116
-#: exercises/templates/muscles/overview.html:112
-#: exercises/templates/muscles/overview.html:116
-msgid "Add new exercise"
-msgstr "Új gyakorlat hozzáadása"
+#: core/templates/navigation.html:63 manager/forms.py:133
+#: manager/models/setting.py:54
+msgid "Exercises"
+msgstr "Gyakorlatok"
-#: core/templates/navigation.html:75 core/templates/navigation.html:116
-#: core/templates/navigation.html:224
+#: core/templates/navigation.html:67 core/templates/navigation.html:107
+#: core/templates/navigation.html:215
msgid "Administration"
msgstr "Adminisztráció"
-#: core/templates/navigation.html:76
-#: exercises/templates/exercise/pending.html:6
-msgid "Exercises pending review"
+#: core/templates/navigation.html:68
+#, fuzzy
+#| msgid "Exercises pending review"
+msgid "Exercise edit history"
msgstr "Ellenőrzésre váró gyakorlatok"
-#: core/templates/navigation.html:77 exercises/models/base.py:72
-#: exercises/templates/exercise/view.html:80
+#: core/templates/navigation.html:69 exercises/models/base.py:84
msgid "Equipment"
msgstr "Felszerelés"
-#: core/templates/navigation.html:78 exercises/templates/exercise/view.html:258
+#: core/templates/navigation.html:70
msgid "Muscles"
msgstr "Izmok"
-#: core/templates/navigation.html:79
+#: core/templates/navigation.html:71
#: exercises/templates/categories/admin-overview.html:4
msgid "Categories"
msgstr "Kategóriák"
-#: core/templates/navigation.html:93 software/templates/features.html:87
+#: core/templates/navigation.html:84 software/templates/features.html:87
msgid "Nutrition"
msgstr "Táplálkozás"
-#: core/templates/navigation.html:99 core/templates/user/overview.html:144
+#: core/templates/navigation.html:90 core/templates/user/overview.html:144
msgid "Nutrition plans"
msgstr "Táplálkozási tervek"
-#: core/templates/navigation.html:105 nutrition/templates/bmi/form.html:50
+#: core/templates/navigation.html:96 nutrition/templates/bmi/form.html:50
msgid "BMI calculator"
msgstr "BMI kalkulátor"
-#: core/templates/navigation.html:111 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:102 nutrition/templates/rate/form.html:17
msgid "Daily calories calculator"
msgstr "Napi kalória kalkulátor"
-#: core/templates/navigation.html:113
+#: core/templates/navigation.html:104
#: nutrition/templates/ingredient/overview.html:29
msgid "Ingredient overview"
msgstr "Összetevő áttekintés"
-#: core/templates/navigation.html:117 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:108 nutrition/templates/units/list.html:6
msgid "Ingredient weight units"
msgstr "Összetevő súly egységek"
-#: core/templates/navigation.html:118
+#: core/templates/navigation.html:109
#: nutrition/templates/ingredient/pending.html:6
msgid "Ingredients pending review"
msgstr "Ellenőrzésre váró összetevők"
-#: core/templates/navigation.html:132
+#: core/templates/navigation.html:123
msgid "Body weight"
msgstr ""
-#: core/templates/navigation.html:134 core/templates/user/overview.html:114
+#: core/templates/navigation.html:125 core/templates/user/overview.html:114
#: weight/templates/overview.html:7
msgid "Weight overview"
msgstr "Súly áttekintés"
-#: core/templates/navigation.html:147
+#: core/templates/navigation.html:138
msgid "About this software"
msgstr "Erről a szoftverről"
-#: core/templates/navigation.html:149 core/templates/template_features.html:82
+#: core/templates/navigation.html:140 core/templates/template_features.html:82
#: software/templates/about_us.html:5
msgid "About us"
msgstr "Rólunk"
-#: core/templates/navigation.html:151 software/templates/features.html:209
+#: core/templates/navigation.html:142 software/templates/features.html:209
msgid "REST API"
msgstr "REST API"
-#: core/templates/navigation.html:155 utils/models.py:40
+#: core/templates/navigation.html:146 utils/models.py:41
msgid "License"
msgstr "Licenc"
-#: core/templates/navigation.html:161
+#: core/templates/navigation.html:152
msgid "Developer documentation"
msgstr ""
-#: core/templates/navigation.html:167
+#: core/templates/navigation.html:158
msgid "Get the code"
msgstr "Szerezd meg a kódot"
-#: core/templates/navigation.html:173 core/templates/template.html:204
+#: core/templates/navigation.html:164 core/templates/template.html:203
#: core/templates/template_features.html:99
msgid "Translate"
msgstr "Lefordítás"
-#: core/templates/navigation.html:194 core/templates/user/login.html:28
+#: core/templates/navigation.html:185 core/templates/user/login.html:28
msgid "Reset password"
msgstr "Új jelszó igénylése"
-#: core/templates/navigation.html:207
+#: core/templates/navigation.html:198
msgid "My preferences"
msgstr "Beállításaim"
-#: core/templates/navigation.html:214
+#: core/templates/navigation.html:205
msgid "Logout"
msgstr "Kijelentkezés"
-#: core/templates/navigation.html:229
+#: core/templates/navigation.html:220
msgid "Licenses"
msgstr "Licencek"
-#: core/templates/navigation.html:232
+#: core/templates/navigation.html:223
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr ""
-#: core/templates/navigation.html:235 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:226 core/templates/weight_unit/list.html:4
#: nutrition/templates/ingredient/view.html:174
msgid "Weight units"
msgstr ""
-#: core/templates/navigation.html:238 core/templates/user/list.html:4
+#: core/templates/navigation.html:229 core/templates/user/list.html:4
msgid "User list"
msgstr ""
-#: core/templates/navigation.html:239
+#: core/templates/navigation.html:230
msgid "Gyms"
msgstr "Edzőtermek"
@@ -1048,33 +1041,30 @@ msgstr "következő"
msgid "Add weight log"
msgstr ""
-#: core/templates/tags/render_day.html:114
-#: exercises/templates/equipment/overview.html:59
-#: exercises/templates/exercise/overview.html:63
-#: exercises/templates/muscles/overview.html:65
+#: core/templates/tags/render_day.html:116
msgid "Placeholder image for exercise"
msgstr "Helyfoglaló kép a gyakorlathoz"
-#: core/templates/tags/render_day.html:131
+#: core/templates/tags/render_day.html:133
msgid "This exercise has no repetitions."
msgstr "A gyakorlatnak nincsenek ismétlései."
-#: core/templates/tags/render_day.html:134
+#: core/templates/tags/render_day.html:136
msgid "Edit them now."
msgstr ""
-#: core/templates/tags/render_day.html:159
+#: core/templates/tags/render_day.html:162
msgid "Add exercises to this workout day"
msgstr "Gyakorlat hozzáadása ehhez az edzés naphoz"
#: core/templates/tags/render_weight_log.html:17 manager/helpers.py:89
-#: manager/models/setting.py:57 manager/templates/set/formset.html:10
+#: manager/models/setting.py:69 manager/templates/set/formset.html:9
msgid "Reps"
msgstr "Ismétlés"
-#: 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
+#: core/templates/tags/render_weight_log.html:30 manager/forms.py:189
+#: manager/models/log.py:103 manager/models/setting.py:99
+#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
msgid "RiR"
msgstr ""
@@ -1099,7 +1089,7 @@ msgstr ""
msgid "Features"
msgstr "Funkciók"
-#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:37
+#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:53
msgid "API key"
msgstr "API kulcs"
@@ -1139,11 +1129,12 @@ msgid "Documentation"
msgstr "Dokumentáció"
#: core/templates/user/delete_account.html:4
-#: core/templates/user/preferences.html:42
+#: core/templates/user/preferences.html:58
msgid "Delete account"
msgstr "Fiók törlése"
#: core/templates/user/delete_account.html:17
+#: exercises/templates/history/overview.html:93
msgid "Are you sure?"
msgstr "Biztos vagy benne?"
@@ -1188,11 +1179,12 @@ msgstr "Edzés hozzáadása"
#: core/templates/user/overview.html:34 core/templates/user/overview.html:76
#: core/templates/user/overview.html:120 core/templates/user/overview.html: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
-#: 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
+#: exercises/models/base.py:99 exercises/models/base.py:104
+#: exercises/models/exercise.py:69 exercises/models/exercise.py:76
+#: gallery/models/image.py:47 manager/helpers.py:88 manager/models/log.py:100
+#: 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/views.py:150
@@ -1200,11 +1192,11 @@ msgid "Date"
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: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
+#: exercises/models/exercise.py:57 exercises/views/exercises.py:123
+#: 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 "Leírás"
@@ -1212,12 +1204,12 @@ msgstr "Leírás"
msgid "Number of logs (days)"
msgstr "Bejegyzések száma (napok)"
-#: core/templates/user/overview.html:37 core/views/user.py:576
+#: core/templates/user/overview.html:37 core/views/user.py:592
#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:157
msgid "Last activity"
msgstr "Utolsó tevékenység"
-#: core/templates/user/overview.html:68 manager/forms.py:267
+#: core/templates/user/overview.html:68 manager/forms.py:278
#: manager/templates/workout/view.html:151
msgid "Log"
msgstr "Bejegyzések"
@@ -1235,6 +1227,7 @@ msgid "Notes"
msgstr "Megjegyzések"
#: core/templates/user/overview.html:79
+#: exercises/templates/history/overview.html:30
#: manager/templates/calendar/partial_overview_table.html:42
#: nutrition/templates/log/detail.html:154
msgid "Time"
@@ -1282,10 +1275,12 @@ msgid "Do you really want to change this user&#39;s password?"
msgstr ""
#: core/templates/user/overview.html:233
+#: exercises/templates/history/overview.html:106
msgid "No"
msgstr ""
#: core/templates/user/overview.html:234
+#: exercises/templates/history/overview.html:99
msgid "Yes"
msgstr ""
@@ -1340,10 +1335,15 @@ msgid "Documents"
msgstr "Dokumentumok"
#: core/templates/user/overview.html:413 gym/templates/document/list.html:32
-#: manager/forms.py:279 manager/templates/workout/view.html:176
+#: manager/forms.py:290 manager/templates/workout/view.html:176
msgid "Download"
msgstr "Letöltés"
+#: core/templates/user/overview.html:451 gym/views/admin_config.py:44
+#: gym/views/admin_config.py:58 gym/views/user_config.py:46
+msgid "Configuration"
+msgstr "Beállítás"
+
#: core/templates/user/overview.html:454 gym/models/user_config.py:92
msgid "Include in inactive overview"
msgstr ""
@@ -1361,7 +1361,23 @@ msgstr "Bejelentkezés mint ez a felhasználó"
msgid "Preferences"
msgstr "Beállítások"
-#: core/templates/user/preferences.html:33 core/views/user.py:587
+#: core/templates/user/preferences.html:19
+msgid "Verified email"
+msgstr ""
+
+#: core/templates/user/preferences.html:24
+msgid "Unverified email"
+msgstr ""
+
+#: core/templates/user/preferences.html:26
+msgid "Send verification email"
+msgstr ""
+
+#: core/templates/user/preferences.html:30
+msgid "You need to verify your email to contribute exercises"
+msgstr ""
+
+#: core/templates/user/preferences.html:49 core/views/user.py:603
msgid "Change password"
msgstr "Jelszó megváltoztatása"
@@ -1391,39 +1407,37 @@ msgid "oz"
msgstr ""
#: 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
+#: exercises/views/equipment.py:104 exercises/views/exercises.py:185
+#: exercises/views/muscles.py:99 manager/views/schedule.py:311
+#: manager/views/schedule_step.py:129 manager/views/workout.py:269
+#: manager/views/workout_session.py:141 nutrition/views/ingredient.py:138
#: 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:431
-#: exercises/views/muscles.py:125 gallery/views/images.py:121
+#: exercises/views/categories.py:127 exercises/views/exercises.py:193
+#: exercises/views/muscles.py:106 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
+#: manager/views/workout.py:273 manager/views/workout_session.py:156
+#: nutrition/views/ingredient.py:145 nutrition/views/plan.py:127
#: nutrition/views/unit.py:118
#, python-brace-format
msgid "Delete {0}?"
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/repetition_units.py:85 core/views/user.py:472
#: 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: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
+#: exercises/views/equipment.py:81 exercises/views/muscles.py:86
+#: 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:170
+#: gym/views/gym.py:459 manager/views/day.py:100 manager/views/schedule.py:335
+#: manager/views/workout.py:287 nutrition/views/ingredient.py:164
+#: nutrition/views/plan.py:144 nutrition/views/unit.py:144
#, python-brace-format
msgid "Edit {0}"
msgstr "{0} módosítása"
@@ -1451,64 +1465,65 @@ msgstr ""
msgid "Your feedback was successfully sent. Thank you!"
msgstr "A visszajelzésed sikeresen elküldtük. Köszönjük!"
-#: core/views/user.py:156
+#: core/views/user.py:157
#, python-brace-format
msgid "Account \"{0}\" was successfully deleted"
msgstr "A \"{0}\" fiók sikeresen törölve"
-#: core/views/user.py:287
+#: core/views/user.py:294
msgid "You were successfully registered"
msgstr "Sikeresen regisztráltál"
-#: core/views/user.py:339
+#: core/views/user.py:355
msgid "Settings successfully updated"
msgstr "Beállítások sikeresen frissítve"
-#: core/views/user.py:376
+#: core/views/user.py:392
msgid "The user was successfully deactivated"
msgstr "A felhasználó sikeresen deaktiválva"
-#: core/views/user.py:411
+#: core/views/user.py:427
msgid "The user was successfully activated"
msgstr "A felhasználó sikeresen aktiválva"
-#: core/views/user.py:426
+#: core/views/user.py:442
msgid "Edit user"
msgstr "Felhasználó módosítása"
-#: core/views/user.py:573 gym/templates/gym/member_list.html:26
+#: core/views/user.py:589 gym/templates/gym/member_list.html:26
#: gym/views/gym.py:156
msgid "ID"
msgstr "ID"
-#: core/views/user.py:574 gym/forms.py:94 gym/templates/contract/view.html:55
+#: core/views/user.py:590 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 "Felhasználónév"
-#: core/views/user.py:577 gym/templates/gym/new_user.html:34
+#: core/views/user.py:593 gym/templates/gym/new_user.html:34
#: gym/views/export.py:60 gym/views/gym.py:218
msgid "Gym"
msgstr "Edzőterem"
-#: exercises/models/base.py:51 exercises/templates/exercise/view.html:76
-#: nutrition/models/ingredient.py:204
+#: core/views/user.py:652
+#, python-format
+msgid "A verification email was sent to %(email)s"
+msgstr ""
+
+#: exercises/models/base.py:63 nutrition/models/ingredient.py:204
msgid "Category"
msgstr "Kategória"
-#: exercises/models/base.py:58
+#: exercises/models/base.py:70
msgid "Primary muscles"
msgstr "Elsődleges izmok"
-#: exercises/models/base.py:64 exercises/templates/equipment/overview.html:71
-#: exercises/templates/exercise/overview.html:76
-#: exercises/templates/exercise/view.html:268
-#: exercises/templates/muscles/overview.html:77
+#: exercises/models/base.py:76
msgid "Secondary muscles"
msgstr "Másodlagos izmok"
-#: exercises/models/base.py:79
+#: exercises/models/base.py:91
msgid "Variations"
msgstr ""
@@ -1516,93 +1531,70 @@ msgstr ""
msgid "Exercise Categories"
msgstr "Gyakorlati kategóriák"
-#: exercises/models/comment.py:34 exercises/models/exercise_alias.py:32
-#: exercises/models/image.py:75 exercises/models/video.py:82
-#: manager/forms.py:165 manager/helpers.py:89 manager/models/log.py:51
+#: exercises/models/comment.py:37 exercises/models/exercise_alias.py:35
+#: exercises/models/image.py:71 exercises/models/video.py:95
+#: manager/forms.py:176 manager/helpers.py:89 manager/models/log.py:52
msgid "Exercise"
msgstr "Gyakorlat"
-#: exercises/models/comment.py:41
+#: exercises/models/comment.py:43
msgid "A comment about how to correctly do this exercise."
msgstr "Megjegyzés, hogy hogyan kell helyesen csinálni ezt a gyakorlatot."
-#: exercises/models/exercise.py:86 nutrition/models/ingredient.py:80
+#: exercises/models/exercise.py:81 nutrition/models/ingredient.py:80
#: nutrition/models/plan.py:61 nutrition/models/weight_unit.py:32
msgid "Language"
msgstr "Nyelv"
-#: 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:265
-msgid "New user submitted exercise"
-msgstr "Új felhasználó által javasolt gyakorlat"
-
-#: 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/exercise_alias.py:35
+#: exercises/models/exercise_alias.py:38
#, fuzzy
#| msgid "Add new exercise"
msgid "Alias for an exercise"
msgstr "Új gyakorlat hozzáadása"
-#: exercises/models/image.py:59
+#: exercises/models/image.py:55
msgid "Line"
msgstr ""
-#: exercises/models/image.py:60
+#: exercises/models/image.py:56
msgid "3D"
msgstr ""
-#: exercises/models/image.py:61
+#: exercises/models/image.py:57
msgid "Low-poly"
msgstr ""
-#: exercises/models/image.py:62
+#: exercises/models/image.py:58
msgid "Photo"
msgstr ""
-#: exercises/models/image.py:63
+#: exercises/models/image.py:59
msgid "Other"
msgstr ""
-#: exercises/models/image.py:81 gallery/models/image.py:56
+#: exercises/models/image.py:77 gallery/models/image.py:56
msgid "Image"
msgstr "Kép"
-#: exercises/models/image.py:82 gallery/models/image.py:57
+#: exercises/models/image.py:78 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:88
+#: exercises/models/image.py:84
msgid "Main picture"
msgstr ""
-#: exercises/models/image.py:91
+#: exercises/models/image.py:87
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:100
+#: exercises/models/image.py:96
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:186
-#, python-brace-format
-msgid "The user {0} submitted a new image \"{1}\" for exercise {2}."
-msgstr ""
-"A felhasználó {0} javasolt egy új képet {1} a következő gyakorlathoz {2}."
-
#: exercises/models/muscle.py:37
msgid "In latin, e.g. \"Pectoralis major\""
msgstr "Latinul, pl.: \"Pectoralis major\""
@@ -1617,176 +1609,75 @@ msgstr "gyakorlat neve"
msgid "A more basic name for the muscle"
msgstr ""
-#: exercises/models/video.py:41
-msgid "Maximum file size is 100MB."
+#: exercises/models/video.py:50
+#, python-format
+msgid "Maximum file size is %(size)sMB."
msgstr ""
-#: exercises/models/video.py:44 exercises/models/video.py:48
+#: exercises/models/video.py:57 exercises/models/video.py:65
msgid "File type is not supported"
msgstr ""
-#: exercises/models/video.py:57
+#: exercises/models/video.py:70
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"
-
-#: exercises/templates/equipment/admin-overview.html:37
-#: exercises/views/equipment.py:94
-msgid "Add new equipment"
-msgstr "Új felszerelés hozzáadása"
-
-#: exercises/templates/equipment/overview.html:11
-msgid "Equipment overview"
-msgstr "Felszerelés áttekintés"
-
-#: exercises/templates/equipment/overview.html:69
-#: exercises/templates/exercise/overview.html:74
-#: exercises/templates/exercise/view.html:264
-#: exercises/templates/muscles/overview.html:75
-msgid "Main muscles"
-msgstr "Fő izmok"
-
-#: exercises/templates/equipment/overview.html:79
-msgid ""
-"No exercises for this equipment. Add or edit an exercise and set the "
-"equipment."
-msgstr ""
-"Nincs gyakorlat ehhez a felszereléshez. Adj hozzá vagy szerkessz egy "
-"gyakorlatot és állítsd be ezt a felszerelést."
-
-#: exercises/templates/equipment/overview.html:96
-#: exercises/templates/exercise/overview.html:99
-#: nutrition/templates/ingredient/overview.html:57
-msgid "Search"
-msgstr "Keresés"
-
-#: exercises/templates/equipment/overview.html:101
-#: exercises/templates/exercise/overview.html:104
-msgid "exercise name"
-msgstr "gyakorlat neve"
-
-#: exercises/templates/equipment/overview.html:115
-#: exercises/templates/exercise/overview.html:118
-#: exercises/templates/muscles/overview.html:118
-#: nutrition/templates/ingredient/overview.html:85
-msgid "Only registered users can do this"
-msgstr "Csak regisztrált felhasználók láthatják"
-
-#: exercises/templates/exercise/email_new.tpl:1
-#, python-format
-msgid ""
-"Your exercise '%(exercise)s' was successfully added to the general\n"
-"database."
-msgstr ""
-"A gyakorlatod „%(exercise)s” sikeresen hozzá lett adva az általános\n"
-"adatbázishoz."
-
-#: exercises/templates/exercise/email_new.tpl:4
-msgid ""
-"It is now available on the exercise and muscle overview and can be\n"
-"added to workouts. You can access it on this address:"
-msgstr ""
-
-#: exercises/templates/exercise/email_new.tpl:8
-#: nutrition/templates/ingredient/email_new.tpl:8
-msgid "Thank you for contributing and making this site better!"
-msgstr "Köszönjük, hogy hozzájárulsz az oldal jobbá tételéhez!"
-
-#: exercises/templates/exercise/email_new.tpl:9
-#: manager/templates/workout/email_reminder.tpl:15
-#: manager/templates/workout/email_weight_reminder.tpl:12
-#: nutrition/templates/ingredient/email_new.tpl:9
-#, python-format
-msgid "The %(site)s team"
-msgstr ""
-
-#: exercises/templates/exercise/form.html:4
-msgid "Submitting an exercise"
-msgstr "Új gyakorlat beküldése"
-
-#: exercises/templates/exercise/form.html:5
-msgid ""
-"Thank you for submitting an exercise. This is much\n"
-"appreciated!"
-msgstr "Köszönjük, hogy javasoltál egy új gyakorlatot. Nagyra értékeljük!"
-
-#: exercises/templates/exercise/form.html:8
-msgid ""
-"After you submit the form, the administrators will be notified.\n"
-"Once it is reviewed, it will be added to the database. Till this happens,\n"
-"it will not be visible in the overview or the search. In case you added your "
-"email\n"
-"when you registered, you will get notified when the process is completed "
-"successfully."
+msgid "Main video"
msgstr ""
-#: exercises/templates/exercise/form_correct.html:4
-msgid "Correcting an exercise"
+#: exercises/models/video.py:107
+msgid "Video"
msgstr ""
-#: exercises/templates/exercise/form_correct.html:5
-msgid ""
-"Thank you for correcting and improving this exercise.\n"
-"This is much appreciated!"
+#: exercises/models/video.py:114
+msgid "Size"
msgstr ""
-#: exercises/templates/exercise/form_correct.html:8
-msgid ""
-"After you submit the form, the administrators will be notified.\n"
-"Once the changes are reviewed the exercise will be updated."
+#: exercises/models/video.py:121 manager/models/schedule_step.py:56
+msgid "Duration"
+msgstr "Időtartam"
+
+#: exercises/models/video.py:130
+msgid "Width"
msgstr ""
-#: exercises/templates/exercise/overview.html:88
-msgid "No categories."
-msgstr "Nincsenek kategóriák."
+#: exercises/models/video.py:137
+#, fuzzy
+#| msgid "Weight"
+msgid "Height"
+msgstr "Súly"
-#: exercises/templates/exercise/overview.html:88
-msgid "Use link to create one"
-msgstr "Használd a linket a rögzítéshez"
+#: exercises/models/video.py:144
+msgid "Codec"
+msgstr ""
-#: exercises/templates/exercise/pending.html:14
-#: nutrition/templates/ingredient/pending.html:14
-msgid "Submission date"
-msgstr "Beküldési dátum"
+#: exercises/models/video.py:152
+msgid "Codec, long name"
+msgstr ""
+
+#: exercises/templates/equipment/admin-overview.html:4
+msgid "Equipment list"
+msgstr "Felszerelés lista"
+
+#: exercises/templates/equipment/admin-overview.html:37
+#: exercises/views/equipment.py:92
+msgid "Add new equipment"
+msgstr "Új felszerelés hozzáadása"
+
+#: exercises/templates/history/overview.html:11
+#, fuzzy
+#| msgid "Exercise Categories"
+msgid "Exercise admin history"
+msgstr "Gyakorlati kategóriák"
+
+#: exercises/templates/history/overview.html:27
+#, fuzzy
+#| msgid "Actions"
+msgid "Action"
+msgstr "Műveletek"
-#: exercises/templates/exercise/pending.html:16 gallery/models/image.py:51
+#: exercises/templates/history/overview.html:28 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/log.py:45
@@ -1797,99 +1688,41 @@ msgstr "Beküldési dátum"
msgid "User"
msgstr "Felhasználó"
-#: exercises/templates/exercise/view.html:48
-msgid "Exercise is pending review"
-msgstr "Ellenőrzésre váró gyakorlat"
-
-#: exercises/templates/exercise/view.html:51
-msgid ""
-"This user submitted exercise is pending a decision to be\n"
-" included in the database."
-msgstr ""
-
-#: exercises/templates/exercise/view.html:53
-msgid "Till then, it will not be shown in the overview or the search."
-msgstr ""
-
-#: exercises/templates/exercise/view.html:54
-#: nutrition/templates/ingredient/view.html:31
-msgid "Please select one of the options below."
-msgstr "Kérlek válassz egyet az alábbi lehetőség közül."
-
-#: exercises/templates/exercise/view.html:60
-#: 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:204
-#: nutrition/templates/ingredient/view.html:42
-msgid "Decline"
-msgstr "Elutasít"
-
-#: exercises/templates/exercise/view.html:96
-msgid "Images"
-msgstr "Képek"
-
-#: exercises/templates/exercise/view.html:137 exercises/views/images.py:93
-msgid "Add new image"
-msgstr "Új kép hozzáadása"
-
-#: exercises/templates/exercise/view.html:148
-msgid "Videos"
+#: exercises/templates/history/overview.html:29
+msgid "Object"
msgstr ""
-#: exercises/templates/exercise/view.html:187 exercises/views/videos.py:94
+#: exercises/templates/history/overview.html:31
#, fuzzy
-#| msgid "Add new image"
-msgid "Add new video"
-msgstr "Új kép hozzáadása"
+#| msgid "Change password"
+msgid "Changes"
+msgstr "Jelszó megváltoztatása"
-#: exercises/templates/exercise/view.html:197
-msgid "Images pending review"
+#: exercises/templates/history/overview.html:32
+msgid "Revert"
msgstr ""
-#: exercises/templates/exercise/view.html:218
-msgid "Comments for this exercise"
-msgstr "Megjegyzések a gyakorlathoz"
-
-#: exercises/templates/exercise/view.html:246
-msgid "Add new comment"
-msgstr "Új hozzászólás"
-
-#: 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:301
-#: manager/templates/workout/log.html:10 manager/templates/workout/log.html:11
-msgid "Weight log"
-msgstr "Testsúly napló"
+#: exercises/templates/history/overview.html:64
+msgid "View Object"
+msgstr ""
-#: exercises/templates/exercise/view.html:306
-msgid "Exercise Variations"
+#: exercises/templates/history/overview.html:75
+msgid "View changes"
msgstr ""
-#: exercises/templates/exercise/view.html:327
-msgid "Submit a correction"
+#: exercises/templates/history/overview.html:86
+msgid "Revert changes"
msgstr ""
#: exercises/templates/muscles/admin-overview.html:4
-#: exercises/templates/muscles/overview.html:7
msgid "Muscle overview"
msgstr "Izom áttekintés"
#: exercises/templates/muscles/admin-overview.html:36
-#: exercises/views/muscles.py:86
+#: exercises/views/muscles.py:67
msgid "Add muscle"
msgstr "Izom hozzáadása"
-#: exercises/templates/muscles/overview.html:85
-msgid ""
-"No exercises for this muscle. Add or edit an exercise and set the muscle."
-msgstr ""
-
#: exercises/views/categories.py:71
msgid "Add category"
msgstr "Kategória hozzáadása"
@@ -1902,50 +1735,19 @@ msgstr "Ez a művelet az összes a kategóriában lévő gyakorlatot törölni f
msgid "Add exercise comment"
msgstr "Adj hozzá megjegyzést a gyakorlathoz"
-#: exercises/views/equipment.py:107 exercises/views/equipment.py:118
+#: exercises/views/equipment.py:105 exercises/views/equipment.py:116
msgid "Delete equipment?"
msgstr "Felszerelés törlése?"
-#: exercises/views/exercises.py:229
+#: exercises/views/exercises.py:161
#, python-format
-msgid ""
-"%(name_original)s is too similar to existing exercise \"%(exercise_name)s\""
-msgstr ""
-
-#: exercises/views/exercises.py:247
-msgid "Add exercise"
-msgstr "Új gyakorlat hozzáadása"
-
-#: exercises/views/exercises.py:367
-msgid "Thank you. Once the changes are reviewed the exercise will be updated."
-msgstr ""
-
-#: exercises/views/exercises.py:380
-#, python-brace-format
-msgid "Correct {0}"
+msgid "%(name)s is too similar to existing exercise \"%(exercise_name)s\""
msgstr ""
-#: exercises/views/exercises.py:422
+#: exercises/views/exercises.py:184
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:474
-msgid "Exercise was successfully marked as rejected"
-msgstr "A gyakorlat sikeresen meg lett jelölve visszautasítottként."
-
-#: exercises/views/images.py:68
-msgid "Edit exercise image"
-msgstr "Gyakorlat képének szerkesztése"
-
-#: exercises/views/images.py:143
-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"
@@ -2016,7 +1818,7 @@ msgid "Contract type"
msgstr ""
#: gym/models/contract.py:208 gym/templates/contract/view.html:59
-#: manager/templates/log/add.html:52 nutrition/forms.py:59
+#: manager/templates/log/add.html:52 nutrition/forms.py:60
#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:102
#: nutrition/models/meal_item.py:72
msgid "Amount"
@@ -2117,6 +1919,10 @@ msgstr ""
msgid "User notes"
msgstr "Felhasználói megjegyzések"
+#: gym/templates/contract/list.html:36
+msgid "Show"
+msgstr "Megmutat"
+
#: gym/templates/contract/view.html:4
msgid "Contract"
msgstr ""
@@ -2195,10 +2001,6 @@ msgstr ""
msgid "Add member"
msgstr "Tag hozzáadása"
-#: gym/templates/gym/new_user.html:38
-msgid "Date of Birth"
-msgstr ""
-
#: gym/templates/gym/new_user.html:48 manager/templates/calendar/month.html:144
#: manager/templates/log/add.html:75 nutrition/templates/rate/form.html:120
msgid "Info"
@@ -2255,125 +2057,125 @@ msgstr "Felhasználó hozzáadása az edzőteremhez"
msgid "Edit gym"
msgstr "Edzőterem módosítása"
-#: i18n.tpl:2 i18n.tpl:28
-msgid "Abs"
+#: i18n.tpl:2
+msgid "Until Failure"
msgstr ""
-#: i18n.tpl:3
-msgid "Arms"
-msgstr ""
+#: i18n.tpl:3 manager/forms.py:180 manager/models/log.py:73
+#: manager/templates/set/add.html:53
+msgid "Repetitions"
+msgstr "Ismétlések"
#: i18n.tpl:4
-msgid "Back"
+msgid "Abs"
msgstr ""
-#: i18n.tpl:5 i18n.tpl:23
-msgid "Calves"
+#: i18n.tpl:5
+msgid "Arms"
msgstr ""
-#: i18n.tpl:6 i18n.tpl:26
-msgid "Chest"
+#: i18n.tpl:6
+msgid "Legs"
msgstr ""
#: i18n.tpl:7
-msgid "Legs"
+msgid "Dumbbell"
msgstr ""
-#: i18n.tpl:8 i18n.tpl:19
-msgid "Shoulders"
+#: i18n.tpl:8
+msgid "Biceps"
msgstr ""
#: i18n.tpl:9
-msgid "Barbell"
+msgid "SZ-Bar"
msgstr ""
#: i18n.tpl:10
-msgid "Bench"
+msgid "Kettlebell"
msgstr ""
#: i18n.tpl:11
-msgid "Dumbbell"
+msgid "Swiss Ball"
msgstr ""
#: i18n.tpl:12
-msgid "Gym mat"
+msgid "none (bodyweight exercise)"
msgstr ""
#: i18n.tpl:13
-msgid "Incline bench"
+msgid "Calves"
msgstr ""
#: i18n.tpl:14
-msgid "Kettlebell"
+msgid "Back"
msgstr ""
#: i18n.tpl:15
-msgid "Pull-up bar"
+msgid "Lower back"
msgstr ""
#: i18n.tpl:16
-msgid "SZ-Bar"
+msgid "Lats"
msgstr ""
#: i18n.tpl:17
-msgid "Swiss Ball"
+msgid "Hamstrings"
msgstr ""
#: i18n.tpl:18
-msgid "none (bodyweight exercise)"
+msgid "Bench"
+msgstr ""
+
+#: i18n.tpl:19
+msgid "Glutes"
msgstr ""
#: i18n.tpl:20
-msgid "Biceps"
+msgid "Kilometers"
msgstr ""
#: i18n.tpl:21
-msgid "Hamstrings"
+msgid "Shoulders"
msgstr ""
#: i18n.tpl:22
-msgid "Lower back"
+msgid "Seconds"
msgstr ""
-#: i18n.tpl:24
-msgid "Glutes"
+#: i18n.tpl:23
+msgid "Miles"
msgstr ""
-#: i18n.tpl:25
-msgid "Lats"
+#: i18n.tpl:24
+msgid "Incline bench"
msgstr ""
-#: i18n.tpl:27
+#: i18n.tpl:25
msgid "Quads"
msgstr ""
-#: i18n.tpl:29
-msgid "Triceps"
+#: i18n.tpl:26
+msgid "Minutes"
msgstr ""
-#: i18n.tpl:30
-msgid "Kilometers"
+#: i18n.tpl:27
+msgid "Chest"
msgstr ""
-#: i18n.tpl:31
-msgid "Miles"
+#: i18n.tpl:28
+msgid "Gym mat"
msgstr ""
-#: i18n.tpl:32
-msgid "Minutes"
+#: i18n.tpl:29
+msgid "Pull-up bar"
msgstr ""
-#: i18n.tpl:33 manager/forms.py:169 manager/models/log.py:71
-#: manager/templates/set/add.html:53
-msgid "Repetitions"
-msgstr "Ismétlések"
-
-#: i18n.tpl:34
-msgid "Seconds"
+#: i18n.tpl:30
+msgid "Barbell"
msgstr ""
-#: i18n.tpl:35
-msgid "Until Failure"
+#: i18n.tpl:31
+msgid "Triceps"
msgstr ""
#: mailer/forms.py:34 mailer/templates/mailer/gym/preview.html:32
@@ -2427,46 +2229,46 @@ msgstr ""
msgid "Correction"
msgstr ""
-#: manager/forms.py:89 manager/models/workout.py:59
+#: manager/forms.py:92 manager/models/workout.py:59
#, fuzzy
#| msgid "The goal or description of the new workout."
msgid "The name of the workout"
msgstr "Az új edzés célja vagy leírása."
-#: manager/forms.py:93 manager/models/workout.py:66
+#: manager/forms.py:96 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
+#: manager/forms.py:137
msgid ""
"You can search for more than one exercise, they will be grouped together for "
"a superset."
msgstr ""
-#: 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
+#: manager/forms.py:166 manager/forms.py:171 manager/models/log.py:64
+#: manager/models/log.py:92 manager/models/setting.py:59
+#: manager/models/setting.py:90 manager/templates/log/add.html:53
+#: manager/templates/log/add.html:55 manager/templates/set/formset.html:10
+#: manager/templates/set/formset.html:12 measurements/models/category.py:58
+#: nutrition/forms.py:64
msgid "Unit"
msgstr ""
-#: manager/forms.py:266
+#: manager/forms.py:277
msgid "Type"
msgstr ""
-#: manager/forms.py:267 manager/templates/workout/view.html:157
+#: manager/forms.py:278 manager/templates/workout/view.html:157
msgid "Table"
msgstr ""
-#: manager/forms.py:269 manager/templates/workout/view.html:163
+#: manager/forms.py:280 manager/templates/workout/view.html:163
msgid "with images"
msgstr ""
-#: manager/forms.py:270 manager/templates/workout/view.html:169
+#: manager/forms.py:281 manager/templates/workout/view.html:169
msgid "with comments"
msgstr ""
@@ -2518,7 +2320,7 @@ msgid "The duration in weeks"
msgstr "Az időtartam hetekben"
#: manager/models/schedule_step.py:63 manager/models/set.py:52
-#: manager/models/setting.py:98 nutrition/models/meal.py:54
+#: manager/models/setting.py:110 nutrition/models/meal.py:54
#: nutrition/models/meal_item.py:65
msgid "Order"
msgstr "Sorrend"
@@ -2569,7 +2371,7 @@ msgstr ""
msgid "Number of sets"
msgstr "Sorozatok száma"
-#: manager/models/setting.py:43
+#: manager/models/setting.py:48
msgid "Sets"
msgstr "Sorozatok"
@@ -2826,6 +2628,13 @@ msgid ""
"option in your settings."
msgstr ""
+#: manager/templates/workout/email_reminder.tpl:15
+#: manager/templates/workout/email_weight_reminder.tpl:12
+#: nutrition/templates/ingredient/email_new.tpl:9
+#, python-format
+msgid "The %(site)s team"
+msgstr ""
+
#: manager/templates/workout/email_weight_reminder.tpl:3
#, python-format
msgid ""
@@ -2838,6 +2647,10 @@ msgid ""
"You will regularly receive such reminders till you enter your current weight."
msgstr ""
+#: manager/templates/workout/log.html:10 manager/templates/workout/log.html:11
+msgid "Weight log"
+msgstr "Testsúly napló"
+
#: manager/templates/workout/log.html:29
msgid "Weight log for workout"
msgstr ""
@@ -2938,7 +2751,7 @@ msgstr ""
msgid "Edit workout"
msgstr "Edzés módosítása"
-#: manager/templates/workout/view.html:225 manager/views/workout.py:300
+#: manager/templates/workout/view.html:225 manager/views/workout.py:301
msgid "Mark as template"
msgstr ""
@@ -2946,11 +2759,6 @@ msgstr ""
msgid "Add workout day"
msgstr ""
-#: manager/views/log.py:92
-#, python-format
-msgid "Edit log entry for %s"
-msgstr ""
-
#: manager/views/log.py:111
msgid "Delete workout log"
msgstr ""
@@ -2968,11 +2776,11 @@ msgstr "Ütemterv létrehozása"
msgid "Your workouts"
msgstr "Edzéseid"
-#: manager/views/workout.py:227
+#: manager/views/workout.py:228
msgid "Copy workout"
msgstr "Edzés másolása"
-#: manager/views/workout.py:230
+#: manager/views/workout.py:231
msgid "Copy"
msgstr "Másolás"
@@ -2994,29 +2802,29 @@ msgstr ""
msgid "Value"
msgstr ""
-#: nutrition/forms.py:122
+#: nutrition/forms.py:123
msgid "Calculate"
msgstr ""
-#: nutrition/forms.py:195 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:196 nutrition/templates/rate/form.html:76
msgid "Basic caloric intake"
msgstr ""
-#: nutrition/forms.py:196
+#: nutrition/forms.py:197
msgid "Your basic caloric intake as calculated for your data"
msgstr ""
-#: nutrition/forms.py:202
+#: nutrition/forms.py:203
msgid "Additional calories"
msgstr ""
-#: nutrition/forms.py:204
+#: nutrition/forms.py:205
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
msgstr ""
-#: nutrition/forms.py:232 nutrition/models/ingredient_weight_unit.py:39
+#: nutrition/forms.py:233 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"
@@ -3079,7 +2887,7 @@ msgid ""
"{energy_approx}%)"
msgstr ""
-#: nutrition/models/ingredient.py:357 nutrition/views/ingredient.py:225
+#: nutrition/models/ingredient.py:357 nutrition/views/ingredient.py:219
msgid "Ingredient was successfully added to the general database"
msgstr ""
@@ -3108,6 +2916,10 @@ msgstr ""
msgid "Meal"
msgstr ""
+#: nutrition/models/log.py:65
+msgid "Date and Time (Approx.)"
+msgstr ""
+
#: nutrition/models/meal.py:61
msgid "Time (approx)"
msgstr ""
@@ -3199,6 +3011,10 @@ msgid ""
"added to nutrition plans. You can access it on this address:"
msgstr ""
+#: nutrition/templates/ingredient/email_new.tpl:8
+msgid "Thank you for contributing and making this site better!"
+msgstr "Köszönjük, hogy hozzájárulsz az oldal jobbá tételéhez!"
+
#: nutrition/templates/ingredient/form.html:4
msgid "Submitting an ingredient"
msgstr ""
@@ -3223,6 +3039,10 @@ msgstr ""
msgid "No ingredients."
msgstr "Nincs összetevő."
+#: nutrition/templates/ingredient/overview.html:57
+msgid "Search"
+msgstr "Keresés"
+
#: nutrition/templates/ingredient/overview.html:66
msgid "ingredient name"
msgstr "összetevő neve"
@@ -3232,6 +3052,14 @@ msgstr "összetevő neve"
msgid "Add ingredient"
msgstr "Összetevő hozzáadása"
+#: nutrition/templates/ingredient/overview.html:85
+msgid "Only registered users can do this"
+msgstr "Csak regisztrált felhasználók láthatják"
+
+#: nutrition/templates/ingredient/pending.html:14
+msgid "Submission date"
+msgstr "Beküldési dátum"
+
#: nutrition/templates/ingredient/view.html:27
msgid "Ingredient is pending review"
msgstr ""
@@ -3244,6 +3072,18 @@ msgid ""
"the search."
msgstr ""
+#: nutrition/templates/ingredient/view.html:31
+msgid "Please select one of the options below."
+msgstr "Kérlek válassz egyet az alábbi lehetőség közül."
+
+#: nutrition/templates/ingredient/view.html:38
+msgid "Accept"
+msgstr "Elfogad"
+
+#: nutrition/templates/ingredient/view.html:42
+msgid "Decline"
+msgstr "Elutasít"
+
#: nutrition/templates/ingredient/view.html:71
#: nutrition/templates/log/detail.html:31
#: nutrition/templates/plan/view.html:229 nutrition/views/plan.py:376
@@ -3484,14 +3324,18 @@ msgid ""
"yourself for some weeks and change the total amount if needed."
msgstr ""
-#: nutrition/views/ingredient.py:181
+#: nutrition/views/ingredient.py:175
msgid "Add a new ingredient"
msgstr ""
-#: nutrition/views/ingredient.py:238
+#: nutrition/views/ingredient.py:232
msgid "Ingredient was successfully marked as rejected"
msgstr ""
+#: nutrition/views/log.py:230 nutrition/views/unit_ingredient.py:139
+msgid "Delete?"
+msgstr "Törlés?"
+
#: nutrition/views/meal.py:55
msgid "Add new meal"
msgstr ""
@@ -3708,29 +3552,29 @@ msgstr ""
msgid "100%% Free <br>and <br>Open Source"
msgstr ""
-#: utils/generic_views.py:261
+#: utils/generic_views.py:262
msgid "Yes, delete"
msgstr "Igen, töröld"
-#: utils/models.py:47
+#: utils/models.py:48
msgid "Author"
msgstr ""
-#: utils/models.py:52
+#: utils/models.py:53
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:77
+#: utils/models.py:78
msgid "Pending"
msgstr "Függő"
-#: utils/models.py:78
+#: utils/models.py:79
msgid "Accepted"
msgstr "Elfogadott"
-#: utils/models.py:79
+#: utils/models.py:80
msgid "Declined"
msgstr "Elutasított"
@@ -3871,6 +3715,103 @@ msgstr ""
msgid "Delete weight entry for the %s"
msgstr ""
+#~ msgid "Ingredients"
+#~ msgstr "Összetevők"
+
+#~ msgid "Add new exercise"
+#~ msgstr "Új gyakorlat hozzáadása"
+
+#~ msgid "Exercise was successfully added to the general database"
+#~ msgstr "Gyakorlat sikeresen hozzáadva az általános adatbázishoz"
+
+#~ msgid "New user submitted exercise"
+#~ msgstr "Új felhasználó által javasolt gyakorlat"
+
+#, python-brace-format
+#~ msgid "The user {0} submitted a new exercise \"{1}\"."
+#~ msgstr "A {0} felhasználó javasolt egy új gyakorlatot \"{1}\"."
+
+#~ msgid "New user submitted image"
+#~ msgstr "Új felhasználó által javasolt kép"
+
+#, python-brace-format
+#~ msgid "The user {0} submitted a new image \"{1}\" for exercise {2}."
+#~ msgstr ""
+#~ "A felhasználó {0} javasolt egy új képet {1} a következő gyakorlathoz {2}."
+
+#~ msgid "Equipment overview"
+#~ msgstr "Felszerelés áttekintés"
+
+#~ msgid "Main muscles"
+#~ msgstr "Fő izmok"
+
+#~ msgid ""
+#~ "No exercises for this equipment. Add or edit an exercise and set the "
+#~ "equipment."
+#~ msgstr ""
+#~ "Nincs gyakorlat ehhez a felszereléshez. Adj hozzá vagy szerkessz egy "
+#~ "gyakorlatot és állítsd be ezt a felszerelést."
+
+#~ msgid "exercise name"
+#~ msgstr "gyakorlat neve"
+
+#, python-format
+#~ msgid ""
+#~ "Your exercise '%(exercise)s' was successfully added to the general\n"
+#~ "database."
+#~ msgstr ""
+#~ "A gyakorlatod „%(exercise)s” sikeresen hozzá lett adva az általános\n"
+#~ "adatbázishoz."
+
+#~ msgid "Submitting an exercise"
+#~ msgstr "Új gyakorlat beküldése"
+
+#~ msgid ""
+#~ "Thank you for submitting an exercise. This is much\n"
+#~ "appreciated!"
+#~ msgstr "Köszönjük, hogy javasoltál egy új gyakorlatot. Nagyra értékeljük!"
+
+#~ msgid "No categories."
+#~ msgstr "Nincsenek kategóriák."
+
+#~ msgid "Use link to create one"
+#~ msgstr "Használd a linket a rögzítéshez"
+
+#~ msgid "Exercise is pending review"
+#~ msgstr "Ellenőrzésre váró gyakorlat"
+
+#~ msgid "Images"
+#~ msgstr "Képek"
+
+#~ msgid "Add new image"
+#~ msgstr "Új kép hozzáadása"
+
+#, fuzzy
+#~| msgid "Add new image"
+#~ msgid "Add new video"
+#~ msgstr "Új kép hozzáadása"
+
+#~ msgid "Comments for this exercise"
+#~ msgstr "Megjegyzések a gyakorlathoz"
+
+#~ msgid "Add new comment"
+#~ msgstr "Új hozzászólás"
+
+#~ msgid "The diagram shows the most used muscles on this exercise"
+#~ msgstr "Az ábra mutatja a gyakorlat által legjobban igénybe vett izmokat "
+
+#~ msgid "Add exercise"
+#~ msgstr "Új gyakorlat hozzáadása"
+
+#~ msgid "Exercise was successfully marked as rejected"
+#~ msgstr "A gyakorlat sikeresen meg lett jelölve visszautasítottként."
+
+#~ msgid "Edit exercise image"
+#~ msgstr "Gyakorlat képének szerkesztése"
+
+#~ msgid "Delete exercise image?"
+#~ msgstr "Gyakorlat képének törlése?"
+
#, fuzzy
#~| msgid "Reps"
#~ msgid "Max Reps"
diff --git a/wger/locale/it/LC_MESSAGES/django.po b/wger/locale/it/LC_MESSAGES/django.po
index 6cacde7eb..facda5afa 100644
--- a/wger/locale/it/LC_MESSAGES/django.po
+++ b/wger/locale/it/LC_MESSAGES/django.po
@@ -15,7 +15,7 @@ msgid ""
msgstr ""
"Project-Id-Version: wger Workout Manager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-14 12:01+0200\n"
+"POT-Creation-Date: 2022-11-10 16:03+0100\n"
"PO-Revision-Date: 2022-06-13 13:14+0000\n"
"Last-Translator: DT <[email protected]>\n"
"Language-Team: Italian <https://hosted.weblate.org/projects/wger/web/it/>\n"
@@ -39,108 +39,8 @@ msgstr ""
"sarà assegnata a tutti i nuovi utenti e a tutti gli utenti già registrati "
"che non ne hanno una."
-#: 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 "Esercizi"
-
-#: config/models/language_config.py:42
-msgid "Ingredients"
-msgstr "Ingredienti"
-
-#: config/templates/language/overview.html:4 core/templates/navigation.html:226
-msgid "Languages"
-msgstr "Lingue"
-
-#: config/templates/language/overview.html:16
-msgid "Nothing found."
-msgstr "Nessun risultato."
-
-#: 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:150
-#: nutrition/templates/plan/view.html:153
-#: nutrition/templates/plan/view.html:191
-msgid "Add one now."
-msgstr "Aggiungine uno adesso."
-
-#: config/templates/language/overview.html:29
-#: core/templates/license/list.html:38 core/templates/misc/license/list.html:41
-#: core/templates/repetition_unit/list.html:41
-#: core/templates/user/overview.html:327 core/templates/user/overview.html:366
-#: core/templates/user/overview.html:402
-#: core/templates/weight_unit/list.html:41 core/views/languages.py:73
-#: core/views/license.py:65 core/views/repetition_units.py:65
-#: core/views/weight_units.py:65
-#: exercises/templates/categories/admin-overview.html:36
-#: 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:61
-msgid "Add"
-msgstr "Aggiungi"
-
-#: config/templates/language/view.html:21 core/models/language.py:29
-msgid "Language short name"
-msgstr "Nome breve Lingua"
-
-#: config/templates/language/view.html:22
-#: config/templates/language/view.html:43 core/models/language.py:32
-msgid "Language full name"
-msgstr "Nome completo Lingua"
-
-#: config/templates/language/view.html:34 core/templates/user/overview.html:451
-#: gym/views/admin_config.py:44 gym/views/admin_config.py:58
-#: gym/views/user_config.py:46
-msgid "Configuration"
-msgstr "Configurazione"
-
-#: config/templates/language/view.html:35
-msgid ""
-"Use the configuration to select in what languages the\n"
-"exercises and ingredients will be shown for the current language (for "
-"example\n"
-"the exercises should be shown in languages A, B and C; the ingredients only\n"
-"in A)."
-msgstr ""
-"Usa la configurazione per selezionare in quali lingue\n"
-"gli esercizi e gli ingredienti saranno mostrati per la lingua corrente (per "
-"esempio\n"
-"gli esercizi dovrebbero essere mostrati nelle lingue A, B e C; gli "
-"ingredienti solo\n"
-"in A)."
-
-#: config/templates/language/view.html:44 gym/templates/contract/list.html:36
-msgid "Show"
-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: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:45
-msgid "Options"
-msgstr "Opzioni"
-
-#: config/templates/language/view.html:96 config/views/gym_config.py:41
-#: config/views/language_config.py:49 core/templates/license/list.html:16
-#: core/templates/misc/license/list.html:17
+#: config/views/gym_config.py:41 core/templates/language/view.html:57
+#: 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:39
#: core/templates/tags/render_day.html:75 core/templates/user/overview.html:205
@@ -148,12 +48,10 @@ 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:230
-#: exercises/templates/exercise/view.html:351
#: exercises/templates/muscles/admin-overview.html:16
-#: 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
+#: 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
#: 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
@@ -169,81 +67,54 @@ msgstr "Opzioni"
msgid "Edit"
msgstr "Modifica"
-#: 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: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: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
-#: gym/templates/contract_type/list.html:39 gym/templates/document/list.html:46
-#: gym/templates/gym/list.html:20 manager/templates/calendar/day.html:69
-#: 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:231
-#: 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:132
-#: nutrition/templates/units/list.html:20
-msgid "Delete"
-msgstr "Elimina"
-
-#: core/demo.py:86
+#: core/demo.py:95
msgid "Sample workout"
msgstr "Esempio di allenamento"
-#: core/demo.py:90
+#: core/demo.py:99
msgid "Sample day"
msgstr "Esempio di giorno"
-#: core/demo.py:94
+#: core/demo.py:103
msgid "Another sample day"
msgstr "Altro esempio di giorno"
-#: core/demo.py:217
-msgid "Sample nutrional plan"
+#: core/demo.py:211
+#, fuzzy
+#| msgid "Sample nutrional plan"
+msgid "Sample nutritional plan"
msgstr "Esempio di piano nutrizionale"
-#: core/demo.py:349 core/demo.py:351 core/demo.py:353
+#: core/demo.py:343 core/demo.py:345 core/demo.py:347
#, python-brace-format
msgid "Placeholder workout nr {0} for schedule"
msgstr "Segnaposto allenamento nr {0} per il programma"
-#: core/demo.py:358
+#: core/demo.py:352
msgid "My cool workout schedule"
msgstr "Il mio programma di allenamento"
-#: core/demo.py:397 core/demo.py:412
+#: core/demo.py:391 core/demo.py:406
msgid "Empty placeholder schedule"
msgstr "Programma segnaposto vuoto"
-#: core/forms.py:61 core/templates/navigation.html:188
-#: core/templates/navigation.html:192 core/templates/user/login.html:4
+#: core/forms.py:64 core/templates/navigation.html:179
+#: core/templates/navigation.html:183 core/templates/user/login.html:4
#: software/templates/features.html:43
msgid "Login"
msgstr "Entra"
-#: core/forms.py:73 core/forms.py:164 gym/views/export.py:63
+#: core/forms.py:76 core/forms.py:177 gym/views/export.py:63
#: gym/views/gym.py:218
msgid "First name"
msgstr "Nome"
-#: core/forms.py:74 core/forms.py:165 core/templates/user/overview.html:267
+#: core/forms.py:77 core/forms.py:178 core/templates/user/overview.html:267
#: gym/views/export.py:64 gym/views/gym.py:218
msgid "Last name"
msgstr "Cognome"
-#: core/forms.py:76 core/forms.py:131 core/templates/user/overview.html:271
+#: core/forms.py:79 core/forms.py:144 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
@@ -253,79 +124,109 @@ msgstr "Cognome"
msgid "Email"
msgstr "E-mail"
-#: core/forms.py:77
+#: core/forms.py:80
msgid "Used for password resets and, optionally, e-mail reminders."
msgstr ""
"Usato per reimpostare la password e, opzionalmente, per i promemoria via e-"
"mail."
-#: core/forms.py:102
+#: core/forms.py:84 core/models/profile.py:220
+#: gym/templates/gym/new_user.html:38
+msgid "Date of Birth"
+msgstr "Data di nascita"
+
+#: core/forms.py:116
msgid "Personal data"
msgstr "Dati personali"
-#: core/forms.py:110
+#: core/forms.py:124
msgid "Workout reminders"
msgstr "Promemoria allenamento"
-#: core/forms.py:117
+#: core/forms.py:131
msgid "Other settings"
msgstr "Altre impostazioni"
-#: 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
+#: core/forms.py:138 core/views/user.py:615 core/views/user.py:630
+#: core/views/user.py:642 gym/forms.py:72 manager/templates/log/add.html:65
+#: manager/templates/set/add.html:69 manager/views/workout.py:222
+#: utils/generic_views.py:143
msgid "Save"
msgstr "Salva"
-#: core/forms.py:132
+#: core/forms.py:145
msgid "Used for password resets and, optionally, email reminders."
msgstr ""
"Usato per reimpostare la password e, opzionalmente, per i promemoria via e-"
"mail."
-#: core/forms.py:160
+#: core/forms.py:173
msgid "This e-mail address is already in use."
msgstr "Questo indirizzo e-mail è già in uso."
-#: core/forms.py:180 gym/templates/gym/new_user.html:26
+#: core/forms.py:193 gym/templates/gym/new_user.html:26
#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:218
msgid "Password"
msgstr "Password"
-#: core/forms.py:182
+#: core/forms.py:195
msgid "Please enter your current password."
msgstr "Si prega di inserire la tua password attuale."
-#: core/forms.py:200
+#: core/forms.py:204 core/templates/language/view.html:62
+#: 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: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/muscles/admin-overview.html:17
+#: gym/templates/admin_notes/list.html:40
+#: gym/templates/contract_option/list.html:39
+#: gym/templates/contract_type/list.html:39 gym/templates/document/list.html:46
+#: gym/templates/gym/list.html:20 manager/templates/calendar/day.html:69
+#: 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:231
+#: 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:132
+#: nutrition/templates/units/list.html:20
+msgid "Delete"
+msgstr "Elimina"
+
+#: core/forms.py:213
msgid "Invalid password"
msgstr "Password non valida"
-#: core/forms.py:212 core/forms.py:278
+#: core/forms.py:225 core/forms.py:291
msgid "The form is secured with reCAPTCHA"
msgstr "Quest formulario è protetto con reCAPTCHA"
-#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:188
-#: core/templates/navigation.html:193 core/templates/template.html:149
-#: core/templates/user/login.html:20 core/views/user.py:293
+#: core/forms.py:239 core/forms.py:258 core/templates/navigation.html:179
+#: core/templates/navigation.html:184 core/templates/template.html:149
+#: core/templates/user/login.html:20 core/views/user.py:300
#: software/templates/features.html:38
msgid "Register"
msgstr "Registrati"
-#: core/forms.py:256
+#: core/forms.py:269
msgid "Contact"
msgstr "Contatto"
-#: core/forms.py:257
+#: core/forms.py:270
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:71
+#: core/forms.py:278 exercises/models/comment.py:42 manager/models/set.py:60
+#: manager/models/setting.py:111 nutrition/models/log.py:71
msgid "Comment"
msgstr "Commento"
-#: core/forms.py:266
+#: core/forms.py:279
msgid "What do you want to say?"
msgstr "Che cosa vuoi dire?"
@@ -333,6 +234,14 @@ msgstr "Che cosa vuoi dire?"
msgid "Day of the week"
msgstr "Giorno della settimana"
+#: core/models/language.py:31 core/templates/language/view.html:21
+msgid "Language short name"
+msgstr "Nome breve Lingua"
+
+#: core/models/language.py:36 core/templates/language/view.html:22
+msgid "Language full name"
+msgstr "Nome completo Lingua"
+
#: core/models/license.py:29
msgid "Full name"
msgstr "Nome completo"
@@ -390,20 +299,20 @@ msgstr "Metrico (kilogrammi)"
msgid "Imperial (pound)"
msgstr "Imperiali (libbra)"
-#: core/models/profile.py:111
+#: core/models/profile.py:114
msgid "Show exercise comments"
msgstr "Mostra commenti agli esercizi"
-#: core/models/profile.py:112
+#: core/models/profile.py:115
msgid "Check to show exercise comments on the workout view"
msgstr ""
"Spunta per vedere i commenti sugli esercizi nel programma di allenamento"
-#: core/models/profile.py:123
+#: core/models/profile.py:126
msgid "Also use ingredients in English"
msgstr "Usa anche gli ingredienti in inglese"
-#: core/models/profile.py:125
+#: core/models/profile.py:128
msgid ""
"Check to also show ingredients in English while creating\n"
"a nutritional plan. These ingredients are extracted from a list provided\n"
@@ -417,11 +326,11 @@ msgstr ""
"completo, con in giro\n"
"7000 voci, ma può essere alquanto travolgente e rendere la ricerca difficile."
-#: core/models/profile.py:134
+#: core/models/profile.py:137
msgid "Activate workout reminders"
msgstr "Attiva i promemoria per l'allenamento"
-#: core/models/profile.py:136
+#: core/models/profile.py:139
msgid ""
"Check to activate automatic reminders for workouts. You need to provide a "
"valid email for this to work."
@@ -429,21 +338,21 @@ msgstr ""
"Spunta per attivare i promemoria automatici per gli allenamenti. Devi "
"inserire una e-mail valida perché funzioni."
-#: core/models/profile.py:145
+#: core/models/profile.py:148
msgid "Remind before expiration"
msgstr "Ricorda prima della scadenza"
-#: core/models/profile.py:146
+#: core/models/profile.py:149
msgid "The number of days you want to be reminded before a workout expires."
msgstr ""
"Il numero di giorni che si desidera essere informati prima che un "
"allenamento scada."
-#: core/models/profile.py:152
+#: core/models/profile.py:155
msgid "Default duration of workouts"
msgstr "errore durata di allenamento"
-#: core/models/profile.py:154
+#: core/models/profile.py:157
msgid ""
"Default duration in weeks of workouts not in a schedule. Used for email "
"workout reminders."
@@ -451,11 +360,11 @@ msgstr ""
"Durata predefinita in settimane di allenamenti non in programma. Utilizzato "
"per i promemoria dell'allenamento tramite e-mail."
-#: core/models/profile.py:171
+#: core/models/profile.py:174
msgid "Notification language"
msgstr "Lingua di notifica"
-#: core/models/profile.py:173
+#: core/models/profile.py:176
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."
@@ -464,70 +373,70 @@ msgstr ""
"promemoria per l'allenamento. Questo non modifica il linguaggio usato nel "
"sito web."
-#: core/models/profile.py:186 gym/views/export.py:66
+#: core/models/profile.py:212 gym/views/export.py:66
msgid "Age"
msgstr "Età"
-#: core/models/profile.py:202 nutrition/forms.py:99
+#: core/models/profile.py:228 nutrition/forms.py:100
msgid "Height (cm)"
msgstr "Altezza (cm)"
-#: core/models/profile.py:219
+#: core/models/profile.py:245
msgid "Hours of sleep"
msgstr "Ore di sonno"
-#: core/models/profile.py:220
+#: core/models/profile.py:246
msgid "The average hours of sleep per day"
msgstr "La media delle ore di sonno giornaliere"
-#: core/models/profile.py:229
+#: core/models/profile.py:255
msgid "Work"
msgstr "Lavoro"
-#: core/models/profile.py:230 core/models/profile.py:272
+#: core/models/profile.py:256 core/models/profile.py:298
msgid "Average hours per day"
msgstr "Media ore per giorno"
-#: core/models/profile.py:239 core/models/profile.py:260
-#: core/models/profile.py:281
+#: core/models/profile.py:265 core/models/profile.py:286
+#: core/models/profile.py:307
msgid "Physical intensity"
msgstr "Intensità fisica"
-#: core/models/profile.py:240 core/models/profile.py:261
-#: core/models/profile.py:282
+#: core/models/profile.py:266 core/models/profile.py:287
+#: core/models/profile.py:308
msgid "Approximately"
msgstr "Circa"
-#: core/models/profile.py:250
+#: core/models/profile.py:276
msgid "Sport"
msgstr "Sport"
-#: core/models/profile.py:251
+#: core/models/profile.py:277
msgid "Average hours per week"
msgstr "Media ore per settimana"
-#: core/models/profile.py:271
+#: core/models/profile.py:297
msgid "Free time"
msgstr "Tempo libero"
-#: core/models/profile.py:292 nutrition/templates/rate/form.html:66
+#: core/models/profile.py:318 nutrition/templates/rate/form.html:66
msgid "Total daily calories"
msgstr "Totale giornaliero calorico"
-#: core/models/profile.py:293
+#: core/models/profile.py:319
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
+#: core/models/profile.py:331 nutrition/models/ingredient_weight_unit.py:45
#: nutrition/models/log.py:90 nutrition/models/meal_item.py:58
msgid "Weight unit"
msgstr "Unità"
-#: core/models/profile.py:313
+#: core/models/profile.py:339
msgid "Allow external access"
msgstr "Permetti accessi esterni"
-#: core/models/profile.py:315
+#: core/models/profile.py:341
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."
@@ -536,25 +445,24 @@ msgstr ""
"modalità di sola lettura. È necessario impostarlo prima di poter condividere "
"i collegamenti, ad es. sui social media."
-#: core/models/profile.py:324
+#: core/models/profile.py:350
msgid "Automatic reminders for weight entries"
msgstr "Promemoria automatici per voci sul peso"
-#: core/models/profile.py:326
+#: core/models/profile.py:352
msgid "Number of days after the last weight entry (enter 0 to deactivate)"
msgstr ""
"Numero di giorni dopo l'ultimo inserimento del peso (immettere 0 per "
"disattivare)"
-#: core/models/profile.py:392
+#: core/models/profile.py:418
msgid "The sum of all hours has to be 24"
msgstr "La somma di tutte le ore deve essere 24"
#: core/models/rep_unit.py:35 core/models/weight_unit.py:35
-#: core/templates/user/overview.html:263 core/views/user.py:575
+#: core/templates/user/overview.html:263 core/views/user.py:591
#: 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
+#: exercises/models/exercise.py:64 exercises/models/muscle.py:36
#: 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
@@ -617,6 +525,53 @@ msgstr "Condividi"
msgid "Are you sure you want to delete this? This action cannot be undone."
msgstr "Sei sicuro/a di volerlo eliminare? Questa azione sarà permanente."
+#: core/templates/email_verification/confirm_template.html:4
+msgid "Email verified"
+msgstr ""
+
+#: core/templates/email_verification/confirm_template.html:18
+#, python-format
+msgid "%(username)s, your email was verified"
+msgstr ""
+
+#: core/templates/email_verification/confirm_template.html:22
+msgid "Error, invalid verification token"
+msgstr ""
+
+#: core/templates/email_verification/email_body_html.tpl:6
+#, fuzzy
+#| msgid "Configuration"
+msgid "Email Confirmation"
+msgstr "Configurazione"
+
+#: core/templates/email_verification/email_body_html.tpl:9
+#: core/templates/email_verification/email_body_txt.tpl:3
+#, fuzzy, python-format
+#| msgid "Calendar for %(username)s"
+msgid "You are almost there, %(username)s!"
+msgstr "Calendario per %(username)s"
+
+#: core/templates/email_verification/email_body_html.tpl:11
+#, python-format
+msgid "Please click <a href=\"%(link)s\">here</a> to confirm your email"
+msgstr ""
+
+#: core/templates/email_verification/email_body_html.tpl:12
+#: core/templates/email_verification/email_body_txt.tpl:5
+#, python-format
+msgid "The token expires on %(time)s"
+msgstr ""
+
+#: core/templates/email_verification/email_body_html.tpl:14
+#: core/templates/email_verification/email_body_txt.tpl:8
+msgid "the wger Team"
+msgstr ""
+
+#: core/templates/email_verification/email_body_txt.tpl:4
+#, python-format
+msgid "Please click the following link to confirm your email: %(link)s"
+msgstr ""
+
#: core/templates/index.html:4
msgid "Dashboard"
msgstr "Pagina principale"
@@ -678,7 +633,7 @@ msgid "Add custom diary entry"
msgstr "Aggiungi record personalizzato"
#: core/templates/index.html:84 core/templates/index.html:92
-#: manager/models/day.py:34 manager/models/log.py:56
+#: manager/models/day.py:34 manager/models/log.py:58
#: manager/models/session.py:60 manager/models/workout.py:109
#: manager/templates/schedule/view.html:105
#: manager/templates/workout/view.html:11
@@ -711,6 +666,20 @@ msgstr "Aggiorna diario di allenamento"
msgid "No workouts found."
msgstr "Nessun allenamento trovato."
+#: core/templates/index.html:137 core/templates/index.html:189
+#: core/templates/language/overview.html:23
+#: 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:150
+#: nutrition/templates/plan/view.html:153
+#: nutrition/templates/plan/view.html:191
+msgid "Add one now."
+msgstr "Aggiungine uno adesso."
+
#: 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
@@ -764,19 +733,59 @@ msgid "No nutrition plans."
msgstr "Nessun piano nutrizionale trovato."
#: 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
+#: core/templates/user/overview.html:121 manager/forms.py:184
+#: manager/helpers.py:89 manager/models/log.py:86 manager/models/setting.py:79
+#: manager/templates/log/add.html:54 manager/templates/set/formset.html:11
#: weight/models.py:34 weight/templates/import_csv_preview.html:14
#: weight/templates/import_csv_preview.html:43 weight/views.py:150
msgid "Weight"
msgstr "Peso"
-#: core/templates/index.html:210 core/templates/navigation.html:135
+#: core/templates/index.html:210 core/templates/navigation.html:126
#: weight/views.py:70
msgid "Add weight entry"
msgstr "Aggiungi peso corporeo"
+#: core/templates/language/overview.html:4 core/templates/navigation.html:217
+msgid "Languages"
+msgstr "Lingue"
+
+#: core/templates/language/overview.html:23
+msgid "Nothing found."
+msgstr "Nessun risultato."
+
+#: core/templates/language/overview.html:36 core/templates/license/list.html:38
+#: core/templates/misc/license/list.html:41
+#: core/templates/repetition_unit/list.html:41
+#: core/templates/user/overview.html:327 core/templates/user/overview.html:366
+#: core/templates/user/overview.html:402
+#: core/templates/weight_unit/list.html:41 core/views/languages.py:73
+#: core/views/license.py:65 core/views/repetition_units.py:65
+#: core/views/weight_units.py:65
+#: exercises/templates/categories/admin-overview.html:36
+#: 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:61
+msgid "Add"
+msgstr "Aggiungi"
+
+#: core/templates/language/view.html:52 core/templates/user/api_key.html:44
+#: core/templates/user/preferences.html:44 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:45
+msgid "Options"
+msgstr "Opzioni"
+
#: core/templates/license/list.html:4 core/templates/misc/license/list.html:4
msgid "License list"
msgstr "Elenco delle licenze"
@@ -789,7 +798,6 @@ msgstr "Elenco delle licenze"
#: core/templates/weight_unit/list.html:26
#: exercises/templates/categories/admin-overview.html:24
#: exercises/templates/equipment/admin-overview.html:24
-#: exercises/templates/exercise/pending.html:30
#: exercises/templates/muscles/admin-overview.html:24
#: gym/templates/admin_notes/list.html:52 gym/templates/contract/list.html:60
#: gym/templates/contract_option/list.html:56
@@ -871,155 +879,135 @@ msgstr "I tuoi modelli"
msgid "Public templates"
msgstr "Modelli pubblici"
-#: core/templates/navigation.html:64
-msgctxt "as in sorted by category"
-msgid "by category"
-msgstr "per categoria"
-
-#: core/templates/navigation.html:65
-msgctxt "as in sorted by muscle"
-msgid "by muscle"
-msgstr "per muscolo"
-
-#: core/templates/navigation.html:66
-msgctxt "as in sorted by equipment"
-msgid "by equipment"
-msgstr "per equipaggiamento"
+#: core/templates/navigation.html:63 manager/forms.py:133
+#: manager/models/setting.py:54
+msgid "Exercises"
+msgstr "Esercizi"
-#: core/templates/navigation.html:70
-#: exercises/templates/equipment/overview.html:109
-#: exercises/templates/equipment/overview.html:113
-#: exercises/templates/exercise/overview.html:112
-#: exercises/templates/exercise/overview.html:116
-#: exercises/templates/muscles/overview.html:112
-#: exercises/templates/muscles/overview.html:116
-msgid "Add new exercise"
-msgstr "Aggiungi un nuovo esercizio"
-
-#: core/templates/navigation.html:75 core/templates/navigation.html:116
-#: core/templates/navigation.html:224
+#: core/templates/navigation.html:67 core/templates/navigation.html:107
+#: core/templates/navigation.html:215
msgid "Administration"
msgstr "Amministrazione"
-#: core/templates/navigation.html:76
-#: exercises/templates/exercise/pending.html:6
-msgid "Exercises pending review"
-msgstr "Esercizi in attesa di revisione"
+#: core/templates/navigation.html:68
+#, fuzzy
+#| msgid "Exercise day"
+msgid "Exercise edit history"
+msgstr "Giorno di allenamento"
-#: core/templates/navigation.html:77 exercises/models/base.py:72
-#: exercises/templates/exercise/view.html:80
+#: core/templates/navigation.html:69 exercises/models/base.py:84
msgid "Equipment"
msgstr "Attrezzatura"
-#: core/templates/navigation.html:78 exercises/templates/exercise/view.html:258
+#: core/templates/navigation.html:70
msgid "Muscles"
msgstr "Muscoli"
-#: core/templates/navigation.html:79
+#: core/templates/navigation.html:71
#: exercises/templates/categories/admin-overview.html:4
msgid "Categories"
msgstr "Categorie"
-#: core/templates/navigation.html:93 software/templates/features.html:87
+#: core/templates/navigation.html:84 software/templates/features.html:87
msgid "Nutrition"
msgstr "Piano nutrizionale"
-#: core/templates/navigation.html:99 core/templates/user/overview.html:144
+#: core/templates/navigation.html:90 core/templates/user/overview.html:144
msgid "Nutrition plans"
msgstr "Piani nutrizionali"
-#: core/templates/navigation.html:105 nutrition/templates/bmi/form.html:50
+#: core/templates/navigation.html:96 nutrition/templates/bmi/form.html:50
msgid "BMI calculator"
msgstr "Calcolatore IMC"
-#: core/templates/navigation.html:111 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:102 nutrition/templates/rate/form.html:17
msgid "Daily calories calculator"
msgstr "Calcolo calorie giornaliere"
-#: core/templates/navigation.html:113
+#: core/templates/navigation.html:104
#: nutrition/templates/ingredient/overview.html:29
msgid "Ingredient overview"
msgstr "Panoramica alimenti"
-#: core/templates/navigation.html:117 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:108 nutrition/templates/units/list.html:6
msgid "Ingredient weight units"
msgstr "Unità di peso ingrediente"
-#: core/templates/navigation.html:118
+#: core/templates/navigation.html:109
#: nutrition/templates/ingredient/pending.html:6
msgid "Ingredients pending review"
msgstr "Ingredienti in attesa di revisione"
-#: core/templates/navigation.html:132
+#: core/templates/navigation.html:123
msgid "Body weight"
msgstr "Peso corporeo"
-#: core/templates/navigation.html:134 core/templates/user/overview.html:114
+#: core/templates/navigation.html:125 core/templates/user/overview.html:114
#: weight/templates/overview.html:7
msgid "Weight overview"
msgstr "Panoramica peso corporeo"
-#: core/templates/navigation.html:147
+#: core/templates/navigation.html:138
msgid "About this software"
msgstr "Informazioni"
-#: core/templates/navigation.html:149 core/templates/template_features.html:82
+#: core/templates/navigation.html:140 core/templates/template_features.html:82
#: software/templates/about_us.html:5
msgid "About us"
msgstr "Chi siamo"
-#: core/templates/navigation.html:151 software/templates/features.html:209
+#: core/templates/navigation.html:142 software/templates/features.html:209
msgid "REST API"
msgstr "REST API"
-#: core/templates/navigation.html:155 utils/models.py:40
+#: core/templates/navigation.html:146 utils/models.py:41
msgid "License"
msgstr "Licenza"
-#: core/templates/navigation.html:161
+#: core/templates/navigation.html:152
msgid "Developer documentation"
msgstr "Documentazione dello sviluppatore"
-#: core/templates/navigation.html:167
+#: core/templates/navigation.html:158
msgid "Get the code"
msgstr "Ottieni il codice"
-#: core/templates/navigation.html:173 core/templates/template.html:204
+#: core/templates/navigation.html:164 core/templates/template.html:203
#: core/templates/template_features.html:99
msgid "Translate"
msgstr "Traduci"
-#: core/templates/navigation.html:194 core/templates/user/login.html:28
+#: core/templates/navigation.html:185 core/templates/user/login.html:28
msgid "Reset password"
msgstr "Reimposta la password"
-#: core/templates/navigation.html:207
+#: core/templates/navigation.html:198
msgid "My preferences"
msgstr "Preferenze"
-#: core/templates/navigation.html:214
+#: core/templates/navigation.html:205
msgid "Logout"
msgstr "Esci"
-#: core/templates/navigation.html:229
+#: core/templates/navigation.html:220
msgid "Licenses"
msgstr "Licenza"
-#: core/templates/navigation.html:232
+#: core/templates/navigation.html:223
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr "Unità di ripetizione"
-#: core/templates/navigation.html:235 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:226 core/templates/weight_unit/list.html:4
#: nutrition/templates/ingredient/view.html:174
msgid "Weight units"
msgstr "Unità peso"
-#: core/templates/navigation.html:238 core/templates/user/list.html:4
+#: core/templates/navigation.html:229 core/templates/user/list.html:4
msgid "User list"
msgstr "Lista utenti"
-#: core/templates/navigation.html:239
+#: core/templates/navigation.html:230
msgid "Gyms"
msgstr "Palestre"
@@ -1099,33 +1087,30 @@ msgstr "successivo"
msgid "Add weight log"
msgstr "Aggiungi record peso"
-#: core/templates/tags/render_day.html:114
-#: exercises/templates/equipment/overview.html:59
-#: exercises/templates/exercise/overview.html:63
-#: exercises/templates/muscles/overview.html:65
+#: core/templates/tags/render_day.html:116
msgid "Placeholder image for exercise"
msgstr "Immagine segnaposto per l'esercizio"
-#: core/templates/tags/render_day.html:131
+#: core/templates/tags/render_day.html:133
msgid "This exercise has no repetitions."
msgstr "Questo esercizio non ha ripetizioni."
-#: core/templates/tags/render_day.html:134
+#: core/templates/tags/render_day.html:136
msgid "Edit them now."
msgstr "Modificali ora."
-#: core/templates/tags/render_day.html:159
+#: core/templates/tags/render_day.html:162
msgid "Add exercises to this workout day"
msgstr "Aggiungi esercizi per questo giorno di allenamento"
#: core/templates/tags/render_weight_log.html:17 manager/helpers.py:89
-#: manager/models/setting.py:57 manager/templates/set/formset.html:10
+#: manager/models/setting.py:69 manager/templates/set/formset.html:9
msgid "Reps"
msgstr "Ripetizioni"
-#: 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
+#: core/templates/tags/render_weight_log.html:30 manager/forms.py:189
+#: manager/models/log.py:103 manager/models/setting.py:99
+#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
msgid "RiR"
msgstr "RiR"
@@ -1150,7 +1135,7 @@ msgstr "Termini di servizio"
msgid "Features"
msgstr "Caratteristiche"
-#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:37
+#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:53
msgid "API key"
msgstr "Chiave API"
@@ -1196,11 +1181,12 @@ msgid "Documentation"
msgstr "Documentazione"
#: core/templates/user/delete_account.html:4
-#: core/templates/user/preferences.html:42
+#: core/templates/user/preferences.html:58
msgid "Delete account"
msgstr "Cancella account"
#: core/templates/user/delete_account.html:17
+#: exercises/templates/history/overview.html:93
msgid "Are you sure?"
msgstr "Sei sicuro/a?"
@@ -1249,11 +1235,12 @@ msgstr "Aggiungi allenamento"
#: core/templates/user/overview.html:34 core/templates/user/overview.html:76
#: core/templates/user/overview.html:120 core/templates/user/overview.html: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
-#: 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
+#: exercises/models/base.py:99 exercises/models/base.py:104
+#: exercises/models/exercise.py:69 exercises/models/exercise.py:76
+#: gallery/models/image.py:47 manager/helpers.py:88 manager/models/log.py:100
+#: 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/views.py:150
@@ -1261,11 +1248,11 @@ msgid "Date"
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: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
+#: exercises/models/exercise.py:57 exercises/views/exercises.py:123
+#: 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 "Descrizione"
@@ -1273,12 +1260,12 @@ msgstr "Descrizione"
msgid "Number of logs (days)"
msgstr "Numero di registri (giorni)"
-#: core/templates/user/overview.html:37 core/views/user.py:576
+#: core/templates/user/overview.html:37 core/views/user.py:592
#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:157
msgid "Last activity"
msgstr "Ultima attività"
-#: core/templates/user/overview.html:68 manager/forms.py:267
+#: core/templates/user/overview.html:68 manager/forms.py:278
#: manager/templates/workout/view.html:151
msgid "Log"
msgstr "Diario"
@@ -1296,6 +1283,7 @@ msgid "Notes"
msgstr "Note"
#: core/templates/user/overview.html:79
+#: exercises/templates/history/overview.html:30
#: manager/templates/calendar/partial_overview_table.html:42
#: nutrition/templates/log/detail.html:154
msgid "Time"
@@ -1343,10 +1331,12 @@ msgid "Do you really want to change this user&#39;s password?"
msgstr "Vuoi veramente cambiare la password di questo user&#39;s?"
#: core/templates/user/overview.html:233
+#: exercises/templates/history/overview.html:106
msgid "No"
msgstr "No"
#: core/templates/user/overview.html:234
+#: exercises/templates/history/overview.html:99
msgid "Yes"
msgstr "Si"
@@ -1401,10 +1391,15 @@ msgid "Documents"
msgstr "Documenti"
#: core/templates/user/overview.html:413 gym/templates/document/list.html:32
-#: manager/forms.py:279 manager/templates/workout/view.html:176
+#: manager/forms.py:290 manager/templates/workout/view.html:176
msgid "Download"
msgstr "Scarica"
+#: core/templates/user/overview.html:451 gym/views/admin_config.py:44
+#: gym/views/admin_config.py:58 gym/views/user_config.py:46
+msgid "Configuration"
+msgstr "Configurazione"
+
#: core/templates/user/overview.html:454 gym/models/user_config.py:92
msgid "Include in inactive overview"
msgstr "Includi in una panoramica inattiva"
@@ -1422,7 +1417,25 @@ msgstr "Entra come questo utente"
msgid "Preferences"
msgstr "Preferenze"
-#: core/templates/user/preferences.html:33 core/views/user.py:587
+#: core/templates/user/preferences.html:19
+#, fuzzy
+#| msgid "Send emails"
+msgid "Verified email"
+msgstr "Invia e-mail"
+
+#: core/templates/user/preferences.html:24
+msgid "Unverified email"
+msgstr ""
+
+#: core/templates/user/preferences.html:26
+msgid "Send verification email"
+msgstr ""
+
+#: core/templates/user/preferences.html:30
+msgid "You need to verify your email to contribute exercises"
+msgstr ""
+
+#: core/templates/user/preferences.html:49 core/views/user.py:603
msgid "Change password"
msgstr "Cambia la password"
@@ -1452,39 +1465,37 @@ msgid "oz"
msgstr "oz"
#: 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
+#: exercises/views/equipment.py:104 exercises/views/exercises.py:185
+#: exercises/views/muscles.py:99 manager/views/schedule.py:311
+#: manager/views/schedule_step.py:129 manager/views/workout.py:269
+#: manager/views/workout_session.py:141 nutrition/views/ingredient.py:138
#: 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:431
-#: exercises/views/muscles.py:125 gallery/views/images.py:121
+#: exercises/views/categories.py:127 exercises/views/exercises.py:193
+#: exercises/views/muscles.py:106 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
+#: manager/views/workout.py:273 manager/views/workout_session.py:156
+#: nutrition/views/ingredient.py:145 nutrition/views/plan.py:127
#: nutrition/views/unit.py:118
#, python-brace-format
msgid "Delete {0}?"
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/repetition_units.py:85 core/views/user.py:472
#: 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: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
+#: exercises/views/equipment.py:81 exercises/views/muscles.py:86
+#: 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:170
+#: gym/views/gym.py:459 manager/views/day.py:100 manager/views/schedule.py:335
+#: manager/views/workout.py:287 nutrition/views/ingredient.py:164
+#: nutrition/views/plan.py:144 nutrition/views/unit.py:144
#, python-brace-format
msgid "Edit {0}"
msgstr "Modifica {0}"
@@ -1516,64 +1527,65 @@ msgstr "Invia"
msgid "Your feedback was successfully sent. Thank you!"
msgstr "Il tuo commento è stato mandato con successo. Grazie!"
-#: core/views/user.py:156
+#: core/views/user.py:157
#, python-brace-format
msgid "Account \"{0}\" was successfully deleted"
msgstr "L'account «{0}» è stato eliminato con successo"
-#: core/views/user.py:287
+#: core/views/user.py:294
msgid "You were successfully registered"
msgstr "Ti sei registrato/a con successo"
-#: core/views/user.py:339
+#: core/views/user.py:355
msgid "Settings successfully updated"
msgstr "Impostazioni aggiornate con successo"
-#: core/views/user.py:376
+#: core/views/user.py:392
msgid "The user was successfully deactivated"
msgstr "Utente è stato disattivato con successo"
-#: core/views/user.py:411
+#: core/views/user.py:427
msgid "The user was successfully activated"
msgstr "Utente è stato attivato con successo"
-#: core/views/user.py:426
+#: core/views/user.py:442
msgid "Edit user"
msgstr "Modifica utente"
-#: core/views/user.py:573 gym/templates/gym/member_list.html:26
+#: core/views/user.py:589 gym/templates/gym/member_list.html:26
#: gym/views/gym.py:156
msgid "ID"
msgstr "ID"
-#: core/views/user.py:574 gym/forms.py:94 gym/templates/contract/view.html:55
+#: core/views/user.py:590 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 "Nome utente"
-#: core/views/user.py:577 gym/templates/gym/new_user.html:34
+#: core/views/user.py:593 gym/templates/gym/new_user.html:34
#: gym/views/export.py:60 gym/views/gym.py:218
msgid "Gym"
msgstr "Palestra"
-#: exercises/models/base.py:51 exercises/templates/exercise/view.html:76
-#: nutrition/models/ingredient.py:204
+#: core/views/user.py:652
+#, python-format
+msgid "A verification email was sent to %(email)s"
+msgstr ""
+
+#: exercises/models/base.py:63 nutrition/models/ingredient.py:204
msgid "Category"
msgstr "Categoria"
-#: exercises/models/base.py:58
+#: exercises/models/base.py:70
msgid "Primary muscles"
msgstr "Muscoli primari"
-#: exercises/models/base.py:64 exercises/templates/equipment/overview.html:71
-#: exercises/templates/exercise/overview.html:76
-#: exercises/templates/exercise/view.html:268
-#: exercises/templates/muscles/overview.html:77
+#: exercises/models/base.py:76
msgid "Secondary muscles"
msgstr "Muscoli secondari"
-#: exercises/models/base.py:79
+#: exercises/models/base.py:91
msgid "Variations"
msgstr "Variazioni"
@@ -1581,73 +1593,60 @@ msgstr "Variazioni"
msgid "Exercise Categories"
msgstr "Categorie esercizi"
-#: exercises/models/comment.py:34 exercises/models/exercise_alias.py:32
-#: exercises/models/image.py:75 exercises/models/video.py:82
-#: manager/forms.py:165 manager/helpers.py:89 manager/models/log.py:51
+#: exercises/models/comment.py:37 exercises/models/exercise_alias.py:35
+#: exercises/models/image.py:71 exercises/models/video.py:95
+#: manager/forms.py:176 manager/helpers.py:89 manager/models/log.py:52
msgid "Exercise"
msgstr "Esercizio"
-#: exercises/models/comment.py:41
+#: exercises/models/comment.py:43
msgid "A comment about how to correctly do this exercise."
msgstr "Un commento su come eseguire correttamente l'esercizio."
-#: exercises/models/exercise.py:86 nutrition/models/ingredient.py:80
+#: exercises/models/exercise.py:81 nutrition/models/ingredient.py:80
#: nutrition/models/plan.py:61 nutrition/models/weight_unit.py:32
msgid "Language"
msgstr "Lingua"
-#: 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:265
-msgid "New user submitted exercise"
-msgstr "Un nuovo utente ha inserito un esercizio"
-
-#: 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/exercise_alias.py:35
+#: exercises/models/exercise_alias.py:38
#, fuzzy
#| msgid "Correcting an exercise"
msgid "Alias for an exercise"
msgstr "Correggere un esercizio"
-#: exercises/models/image.py:59
+#: exercises/models/image.py:55
msgid "Line"
msgstr "Linea"
-#: exercises/models/image.py:60
+#: exercises/models/image.py:56
msgid "3D"
msgstr "3D"
-#: exercises/models/image.py:61
+#: exercises/models/image.py:57
msgid "Low-poly"
msgstr "Basso numero di poligoni"
-#: exercises/models/image.py:62
+#: exercises/models/image.py:58
msgid "Photo"
msgstr "Foto"
-#: exercises/models/image.py:63
+#: exercises/models/image.py:59
msgid "Other"
msgstr "Altro"
-#: exercises/models/image.py:81 gallery/models/image.py:56
+#: exercises/models/image.py:77 gallery/models/image.py:56
msgid "Image"
msgstr "Immagine"
-#: exercises/models/image.py:82 gallery/models/image.py:57
+#: exercises/models/image.py:78 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:88
+#: exercises/models/image.py:84
msgid "Main picture"
msgstr "Immagine principale"
-#: exercises/models/image.py:91
+#: exercises/models/image.py:87
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 "
@@ -1657,19 +1656,10 @@ msgstr ""
"l'esercizio (verrà mostrata ad es. Nella ricerca). La prima immagine viene "
"automaticamente contrassegnata dal sistema."
-#: exercises/models/image.py:100
+#: exercises/models/image.py:96
msgid "The art style of your image"
msgstr "Lo stile artistico della tua immagine"
-#: exercises/models/image.py:185
-msgid "New user submitted image"
-msgstr "Nuovo utente immagine inviata"
-
-#: 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}."
-
#: exercises/models/muscle.py:37
msgid "In latin, e.g. \"Pectoralis major\""
msgstr "In latino es. «Pectoralis major»"
@@ -1684,47 +1674,49 @@ msgstr "Nome esercizio"
msgid "A more basic name for the muscle"
msgstr ""
-#: exercises/models/video.py:41
-msgid "Maximum file size is 100MB."
+#: exercises/models/video.py:50
+#, fuzzy, python-format
+#| msgid "Maximum file size is 100MB."
+msgid "Maximum file size is %(size)sMB."
msgstr "La dimensione massima del file è 100 MB."
-#: exercises/models/video.py:44 exercises/models/video.py:48
+#: exercises/models/video.py:57 exercises/models/video.py:65
msgid "File type is not supported"
msgstr "Il tipo di file non è supportato"
-#: exercises/models/video.py:57
+#: exercises/models/video.py:70
msgid "File is not a valid video"
msgstr "Il file non è un video valido"
-#: exercises/models/video.py:88
+#: exercises/models/video.py:101
msgid "Main video"
msgstr "Video principale"
-#: exercises/models/video.py:94
+#: exercises/models/video.py:107
msgid "Video"
msgstr "Video"
-#: exercises/models/video.py:101
+#: exercises/models/video.py:114
msgid "Size"
msgstr "Dimensione"
-#: exercises/models/video.py:108 manager/models/schedule_step.py:56
+#: exercises/models/video.py:121 manager/models/schedule_step.py:56
msgid "Duration"
msgstr "Durata"
-#: exercises/models/video.py:117
+#: exercises/models/video.py:130
msgid "Width"
msgstr "Larghezza"
-#: exercises/models/video.py:124
+#: exercises/models/video.py:137
msgid "Height"
msgstr "Altezza"
-#: exercises/models/video.py:131
+#: exercises/models/video.py:144
msgid "Codec"
msgstr "Codec"
-#: exercises/models/video.py:139
+#: exercises/models/video.py:152
msgid "Codec, long name"
msgstr "Codec, nome completo"
@@ -1733,140 +1725,23 @@ msgid "Equipment list"
msgstr "Lista attrezzatura"
#: exercises/templates/equipment/admin-overview.html:37
-#: exercises/views/equipment.py:94
+#: exercises/views/equipment.py:92
msgid "Add new equipment"
msgstr "Aggiungi nuova attrezzatura"
-#: exercises/templates/equipment/overview.html:11
-msgid "Equipment overview"
-msgstr "Prospetto dell'attrezzatura"
-
-#: exercises/templates/equipment/overview.html:69
-#: exercises/templates/exercise/overview.html:74
-#: exercises/templates/exercise/view.html:264
-#: exercises/templates/muscles/overview.html:75
-msgid "Main muscles"
-msgstr "Muscoli principali"
-
-#: exercises/templates/equipment/overview.html:79
-msgid ""
-"No exercises for this equipment. Add or edit an exercise and set the "
-"equipment."
-msgstr ""
-"Nessun esercizio per questa attrezzatura. Aggiungere o modificare un "
-"esercizio ed imposta l'attrezzatura."
-
-#: exercises/templates/equipment/overview.html:96
-#: exercises/templates/exercise/overview.html:99
-#: nutrition/templates/ingredient/overview.html:57
-msgid "Search"
-msgstr "Ricerca"
-
-#: exercises/templates/equipment/overview.html:101
-#: exercises/templates/exercise/overview.html:104
-msgid "exercise name"
-msgstr "Nome esercizio"
-
-#: exercises/templates/equipment/overview.html:115
-#: exercises/templates/exercise/overview.html:118
-#: exercises/templates/muscles/overview.html:118
-#: nutrition/templates/ingredient/overview.html:85
-msgid "Only registered users can do this"
-msgstr "Soli gli utenti registrato possono fare questo"
-
-#: exercises/templates/exercise/email_new.tpl:1
-#, python-format
-msgid ""
-"Your exercise '%(exercise)s' was successfully added to the general\n"
-"database."
-msgstr ""
-"Il tuo esercizio «%(exercise)s» è stato aggiunto con successo al database\n"
-"generale."
-
-#: exercises/templates/exercise/email_new.tpl:4
-msgid ""
-"It is now available on the exercise and muscle overview and can be\n"
-"added to workouts. You can access it on this address:"
-msgstr ""
-"È ora disponibile sull'esercizio e la panoramica muscolare e può essere\n"
-"aggiunto agli allenamenti. Puoi accedervi da questo indirizzo:"
-
-#: exercises/templates/exercise/email_new.tpl:8
-#: nutrition/templates/ingredient/email_new.tpl:8
-msgid "Thank you for contributing and making this site better!"
-msgstr "Grazie per avere contribuito e reso questo sito migliore!"
-
-#: exercises/templates/exercise/email_new.tpl:9
-#: manager/templates/workout/email_reminder.tpl:15
-#: manager/templates/workout/email_weight_reminder.tpl:12
-#: nutrition/templates/ingredient/email_new.tpl:9
-#, python-format
-msgid "The %(site)s team"
-msgstr "Il %(site)s team"
-
-#: exercises/templates/exercise/form.html:4
-msgid "Submitting an exercise"
-msgstr "Inserendo un esercizio"
-
-#: exercises/templates/exercise/form.html:5
-msgid ""
-"Thank you for submitting an exercise. This is much\n"
-"appreciated!"
-msgstr ""
-"Grazie per aver inserito un esercizio.\n"
-"Lo apprezziamo davvero!"
-
-#: exercises/templates/exercise/form.html:8
-msgid ""
-"After you submit the form, the administrators will be notified.\n"
-"Once it is reviewed, it will be added to the database. Till this happens,\n"
-"it will not be visible in the overview or the search. In case you added your "
-"email\n"
-"when you registered, you will get notified when the process is completed "
-"successfully."
-msgstr ""
-"Dopo aver inviato il modulo, gli amministratori verranno avvisati.\n"
-"Una volta esaminato, verrà aggiunto al database. Fin quando questo non "
-"succede,\n"
-"non sarà visibile nella panoramica o nella ricerca. Nel caso in cui hai "
-"aggiunto la tua e-mail\n"
-"quando ti sei registrato, riceverai una notifica quando il processo è "
-"completato con successo."
-
-#: exercises/templates/exercise/form_correct.html:4
-msgid "Correcting an exercise"
-msgstr "Correggere un esercizio"
-
-#: exercises/templates/exercise/form_correct.html:5
-msgid ""
-"Thank you for correcting and improving this exercise.\n"
-"This is much appreciated!"
-msgstr ""
-"Grazie per aver corretto e migliorato questo esercizio.\n"
-"Lo apprezziamo molto!"
-
-#: exercises/templates/exercise/form_correct.html:8
-msgid ""
-"After you submit the form, the administrators will be notified.\n"
-"Once the changes are reviewed the exercise will be updated."
-msgstr ""
-"Dopo aver inviato il modulo, gli amministratori verranno avvisati.\n"
-"Una volta che le modifiche sono state riviste, l'esercizio verrà aggiornato."
-
-#: exercises/templates/exercise/overview.html:88
-msgid "No categories."
-msgstr "Nessuna categoria."
-
-#: exercises/templates/exercise/overview.html:88
-msgid "Use link to create one"
-msgstr "Usa l'indirizzo per crearne una"
+#: exercises/templates/history/overview.html:11
+#, fuzzy
+#| msgid "Exercise day"
+msgid "Exercise admin history"
+msgstr "Giorno di allenamento"
-#: exercises/templates/exercise/pending.html:14
-#: nutrition/templates/ingredient/pending.html:14
-msgid "Submission date"
-msgstr "Data di inserimento"
+#: exercises/templates/history/overview.html:27
+#, fuzzy
+#| msgid "Actions"
+msgid "Action"
+msgstr "Azioni"
-#: exercises/templates/exercise/pending.html:16 gallery/models/image.py:51
+#: exercises/templates/history/overview.html:28 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/log.py:45
@@ -1877,101 +1752,47 @@ msgstr "Data di inserimento"
msgid "User"
msgstr "Utente"
-#: exercises/templates/exercise/view.html:48
-msgid "Exercise is pending review"
-msgstr "L'esercizio è in attesa di revisione"
-
-#: exercises/templates/exercise/view.html:51
-msgid ""
-"This user submitted exercise is pending a decision to be\n"
-" included in the database."
-msgstr ""
-"L'esercizio presentato dall'utente è in attesa di decisione\n"
-"         incluso nel database."
-
-#: exercises/templates/exercise/view.html:53
-msgid "Till then, it will not be shown in the overview or the search."
-msgstr "Fino ad allora, non sarà mostrato nel prospetto o nella ricerca."
-
-#: exercises/templates/exercise/view.html:54
-#: nutrition/templates/ingredient/view.html:31
-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:203
-#: nutrition/templates/ingredient/view.html:38
-msgid "Accept"
-msgstr "Accetta"
-
-#: exercises/templates/exercise/view.html:64
-#: exercises/templates/exercise/view.html:204
-#: nutrition/templates/ingredient/view.html:42
-msgid "Decline"
-msgstr "Rifiuta"
-
-#: exercises/templates/exercise/view.html:96
-msgid "Images"
-msgstr "Immagini"
-
-#: exercises/templates/exercise/view.html:137 exercises/views/images.py:93
-msgid "Add new image"
-msgstr "Aggiungi nuova immagine"
-
-#: exercises/templates/exercise/view.html:148
-msgid "Videos"
-msgstr "Video"
-
-#: exercises/templates/exercise/view.html:187 exercises/views/videos.py:94
-msgid "Add new video"
-msgstr "Aggiungi nuovo video"
-
-#: exercises/templates/exercise/view.html:197
-msgid "Images pending review"
-msgstr "Immagini in attesa di revisione"
-
-#: exercises/templates/exercise/view.html:218
-msgid "Comments for this exercise"
-msgstr "Commenti all'esercizio"
+#: exercises/templates/history/overview.html:29
+#, fuzzy
+#| msgctxt "As in \"email subject\""
+#| msgid "Subject"
+msgid "Object"
+msgstr "Oggetto"
-#: exercises/templates/exercise/view.html:246
-msgid "Add new comment"
-msgstr "Aggiungi un nuovo commento"
+#: exercises/templates/history/overview.html:31
+#, fuzzy
+#| msgctxt "Noun, not verb"
+#| msgid "Change"
+msgid "Changes"
+msgstr "Variazione"
-#: 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/history/overview.html:32
+msgid "Revert"
+msgstr ""
-#: 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/history/overview.html:64
+msgid "View Object"
+msgstr ""
-#: exercises/templates/exercise/view.html:306
-msgid "Exercise Variations"
-msgstr "Variazioni esercizio"
+#: exercises/templates/history/overview.html:75
+#, fuzzy
+#| msgid "View logs"
+msgid "View changes"
+msgstr "Guarda records"
-#: exercises/templates/exercise/view.html:327
-msgid "Submit a correction"
-msgstr "Invia una correzione"
+#: exercises/templates/history/overview.html:86
+msgid "Revert changes"
+msgstr ""
#: exercises/templates/muscles/admin-overview.html:4
-#: exercises/templates/muscles/overview.html:7
msgid "Muscle overview"
msgstr "Prospetto dei muscoli"
#: exercises/templates/muscles/admin-overview.html:36
-#: exercises/views/muscles.py:86
+#: exercises/views/muscles.py:67
msgid "Add muscle"
msgstr "Aggiungi muscolo"
-#: exercises/templates/muscles/overview.html:85
-msgid ""
-"No exercises for this muscle. Add or edit an exercise and set the muscle."
-msgstr ""
-"Nessun esercizio per questo muscolo. Aggiungi un esercizio e imposta il "
-"muscolo."
-
#: exercises/views/categories.py:71
msgid "Add category"
msgstr "Aggiungi categoria"
@@ -1984,52 +1805,22 @@ msgstr "Saranno cancellati tutti gli esercizi della categoria."
msgid "Add exercise comment"
msgstr "Aggiungi commento esercizio"
-#: exercises/views/equipment.py:107 exercises/views/equipment.py:118
+#: exercises/views/equipment.py:105 exercises/views/equipment.py:116
msgid "Delete equipment?"
msgstr "Cancella attrezzatura?"
-#: exercises/views/exercises.py:229
-#, python-format
-msgid ""
-"%(name_original)s is too similar to existing exercise \"%(exercise_name)s\""
+#: exercises/views/exercises.py:161
+#, fuzzy, python-format
+#| msgid ""
+#| "%(name_original)s is too similar to existing exercise "
+#| "\"%(exercise_name)s\""
+msgid "%(name)s is too similar to existing exercise \"%(exercise_name)s\""
msgstr "%(name_original)s è troppo simile a «%(exercise_name)s»"
-#: exercises/views/exercises.py:247
-msgid "Add exercise"
-msgstr "Aggiungi esercizio"
-
-#: 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:380
-#, python-brace-format
-msgid "Correct {0}"
-msgstr "Corretto {0}"
-
-#: exercises/views/exercises.py:422
+#: exercises/views/exercises.py:184
msgid "This will delete the exercise from all workouts."
msgstr "L'esercizio sarà eliminato da tutti gli allenamenti."
-#: exercises/views/exercises.py:474
-msgid "Exercise was successfully marked as rejected"
-msgstr "L'esercizio è stato contrassegnato con successo come respinto"
-
-#: exercises/views/images.py:68
-msgid "Edit exercise image"
-msgstr "Modifica immagine esercizio"
-
-#: exercises/views/images.py:143
-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
msgid "Add image"
msgstr "Aggiungi immagine"
@@ -2096,7 +1887,7 @@ 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:59
+#: manager/templates/log/add.html:52 nutrition/forms.py:60
#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:102
#: nutrition/models/meal_item.py:72
msgid "Amount"
@@ -2199,6 +1990,10 @@ msgstr "Userà il nome del file se non viene fornito nulla"
msgid "User notes"
msgstr "Note utente"
+#: gym/templates/contract/list.html:36
+msgid "Show"
+msgstr "Mostra"
+
#: gym/templates/contract/view.html:4
msgid "Contract"
msgstr "Contratto"
@@ -2279,10 +2074,6 @@ msgstr "E-mail"
msgid "Add member"
msgstr "Aggiungi membro"
-#: gym/templates/gym/new_user.html:38
-msgid "Date of Birth"
-msgstr "Data di nascita"
-
#: gym/templates/gym/new_user.html:48 manager/templates/calendar/month.html:144
#: manager/templates/log/add.html:75 nutrition/templates/rate/form.html:120
msgid "Info"
@@ -2345,132 +2136,132 @@ msgstr "Aggiungi membro alla palestra"
msgid "Edit gym"
msgstr "Modifica palestra"
-#: i18n.tpl:2 i18n.tpl:28
-msgid "Abs"
-msgstr "Addome"
-
-#: i18n.tpl:3
-msgid "Arms"
-msgstr "Braccia"
+#: i18n.tpl:2
+msgid "Until Failure"
+msgstr "Fino al Fallimento"
-#: i18n.tpl:4
-msgid "Back"
-msgstr "Dorso"
+#: i18n.tpl:3 manager/forms.py:180 manager/models/log.py:73
+#: manager/templates/set/add.html:53
+msgid "Repetitions"
+msgstr "Ripetizioni"
-#: i18n.tpl:5 i18n.tpl:23
-msgid "Calves"
-msgstr "Polpacci"
+#: i18n.tpl:4
+msgid "Abs"
+msgstr "Addome"
-#: i18n.tpl:6 i18n.tpl:26
-msgid "Chest"
-msgstr "Petto"
+#: i18n.tpl:5
+msgid "Arms"
+msgstr "Braccia"
-#: i18n.tpl:7
+#: i18n.tpl:6
msgid "Legs"
msgstr "Gambe"
-#: i18n.tpl:8 i18n.tpl:19
-msgid "Shoulders"
-msgstr "Spalle"
+#: i18n.tpl:7
+msgid "Dumbbell"
+msgstr "Manubrio"
+
+#: i18n.tpl:8
+#, fuzzy
+#| msgid "Biceps brachii"
+msgid "Biceps"
+msgstr "Bicipite brachiale"
#: i18n.tpl:9
-msgid "Barbell"
-msgstr "Bilanciere"
+msgid "SZ-Bar"
+msgstr "Bilanaciere Obliquo SZ"
#: i18n.tpl:10
-msgid "Bench"
-msgstr "Panca Orizzontale"
+msgid "Kettlebell"
+msgstr "Kettlebell"
#: i18n.tpl:11
-msgid "Dumbbell"
-msgstr "Manubrio"
+msgid "Swiss Ball"
+msgstr "Palla Da Ginnastica"
#: i18n.tpl:12
-msgid "Gym mat"
-msgstr "Tappetino"
+msgid "none (bodyweight exercise)"
+msgstr "nessuno (esercizio a corpo libero)"
#: i18n.tpl:13
-msgid "Incline bench"
-msgstr "Panca inclinata"
+msgid "Calves"
+msgstr "Polpacci"
#: i18n.tpl:14
-msgid "Kettlebell"
-msgstr "Kettlebell"
+msgid "Back"
+msgstr "Dorso"
#: i18n.tpl:15
-msgid "Pull-up bar"
-msgstr "Spalliera"
+msgid "Lower back"
+msgstr ""
#: i18n.tpl:16
-msgid "SZ-Bar"
-msgstr "Bilanaciere Obliquo SZ"
+msgid "Lats"
+msgstr ""
#: i18n.tpl:17
-msgid "Swiss Ball"
-msgstr "Palla Da Ginnastica"
+msgid "Hamstrings"
+msgstr ""
#: i18n.tpl:18
-msgid "none (bodyweight exercise)"
-msgstr "nessuno (esercizio a corpo libero)"
+msgid "Bench"
+msgstr "Panca Orizzontale"
-#: i18n.tpl:20
+#: i18n.tpl:19
#, fuzzy
-#| msgid "Biceps brachii"
-msgid "Biceps"
-msgstr "Bicipite brachiale"
+#| msgid "Minutes"
+msgid "Glutes"
+msgstr "Minuti"
+
+#: i18n.tpl:20
+msgid "Kilometers"
+msgstr "Chilometri"
#: i18n.tpl:21
-msgid "Hamstrings"
-msgstr ""
+msgid "Shoulders"
+msgstr "Spalle"
#: i18n.tpl:22
-msgid "Lower back"
-msgstr ""
+msgid "Seconds"
+msgstr "Secondi"
+
+#: i18n.tpl:23
+msgid "Miles"
+msgstr "Miglia"
#: i18n.tpl:24
-#, fuzzy
-#| msgid "Minutes"
-msgid "Glutes"
-msgstr "Minuti"
+msgid "Incline bench"
+msgstr "Panca inclinata"
#: i18n.tpl:25
-msgid "Lats"
+msgid "Quads"
msgstr ""
+#: i18n.tpl:26
+msgid "Minutes"
+msgstr "Minuti"
+
#: i18n.tpl:27
-msgid "Quads"
-msgstr ""
+msgid "Chest"
+msgstr "Petto"
+
+#: i18n.tpl:28
+msgid "Gym mat"
+msgstr "Tappetino"
#: i18n.tpl:29
-#, fuzzy
-#| msgid "Triceps brachii"
-msgid "Triceps"
-msgstr "Tricipite brachiale"
+msgid "Pull-up bar"
+msgstr "Spalliera"
#: i18n.tpl:30
-msgid "Kilometers"
-msgstr "Chilometri"
+msgid "Barbell"
+msgstr "Bilanciere"
#: i18n.tpl:31
-msgid "Miles"
-msgstr "Miglia"
-
-#: i18n.tpl:32
-msgid "Minutes"
-msgstr "Minuti"
-
-#: i18n.tpl:33 manager/forms.py:169 manager/models/log.py:71
-#: manager/templates/set/add.html:53
-msgid "Repetitions"
-msgstr "Ripetizioni"
-
-#: i18n.tpl:34
-msgid "Seconds"
-msgstr "Secondi"
-
-#: i18n.tpl:35
-msgid "Until Failure"
-msgstr "Fino al Fallimento"
+#, fuzzy
+#| msgid "Triceps brachii"
+msgid "Triceps"
+msgstr "Tricipite brachiale"
#: mailer/forms.py:34 mailer/templates/mailer/gym/preview.html:32
msgctxt "As in \"email subject\""
@@ -2525,11 +2316,11 @@ msgstr "Invia e-mail"
msgid "Correction"
msgstr "Correzione"
-#: manager/forms.py:89 manager/models/workout.py:59
+#: manager/forms.py:92 manager/models/workout.py:59
msgid "The name of the workout"
msgstr "Nome dell'allenamento"
-#: manager/forms.py:93 manager/models/workout.py:66
+#: manager/forms.py:96 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'."
@@ -2537,34 +2328,34 @@ msgstr ""
"Una breve descrizione o scopo dell'allenamento. Per esempio «Dedicato al "
"dorso» o «Settimana 1 del programma xy»."
-#: manager/forms.py:126
+#: manager/forms.py:137
msgid ""
"You can search for more than one exercise, they will be grouped together for "
"a superset."
msgstr "Puoi cercare più di un esercizio, saranno raggruppati in un Superset."
-#: 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
+#: manager/forms.py:166 manager/forms.py:171 manager/models/log.py:64
+#: manager/models/log.py:92 manager/models/setting.py:59
+#: manager/models/setting.py:90 manager/templates/log/add.html:53
+#: manager/templates/log/add.html:55 manager/templates/set/formset.html:10
+#: manager/templates/set/formset.html:12 measurements/models/category.py:58
+#: nutrition/forms.py:64
msgid "Unit"
msgstr "Unità"
-#: manager/forms.py:266
+#: manager/forms.py:277
msgid "Type"
msgstr "Tipo"
-#: manager/forms.py:267 manager/templates/workout/view.html:157
+#: manager/forms.py:278 manager/templates/workout/view.html:157
msgid "Table"
msgstr "Tabella"
-#: manager/forms.py:269 manager/templates/workout/view.html:163
+#: manager/forms.py:280 manager/templates/workout/view.html:163
msgid "with images"
msgstr "con immagini"
-#: manager/forms.py:270 manager/templates/workout/view.html:169
+#: manager/forms.py:281 manager/templates/workout/view.html:169
msgid "with comments"
msgstr "con commenti"
@@ -2624,7 +2415,7 @@ msgid "The duration in weeks"
msgstr "Durata in settimane"
#: manager/models/schedule_step.py:63 manager/models/set.py:52
-#: manager/models/setting.py:98 nutrition/models/meal.py:54
+#: manager/models/setting.py:110 nutrition/models/meal.py:54
#: nutrition/models/meal_item.py:65
msgid "Order"
msgstr "Ordine"
@@ -2679,7 +2470,7 @@ msgstr "Giorno di allenamento"
msgid "Number of sets"
msgstr "Numero di serie"
-#: manager/models/setting.py:43
+#: manager/models/setting.py:48
msgid "Sets"
msgstr "Serie"
@@ -2980,6 +2771,13 @@ msgstr ""
"Se non si desidera ricevere mai promemoria via e-mail, disattivare\n"
"l'opzione nelle tue impostazioni."
+#: manager/templates/workout/email_reminder.tpl:15
+#: manager/templates/workout/email_weight_reminder.tpl:12
+#: nutrition/templates/ingredient/email_new.tpl:9
+#, python-format
+msgid "The %(site)s team"
+msgstr "Il %(site)s team"
+
#: manager/templates/workout/email_weight_reminder.tpl:3
#, python-format
msgid ""
@@ -2996,6 +2794,10 @@ msgid ""
msgstr ""
"Riceverai regolarmente tali promemoria finché non inserisci il peso corrente."
+#: manager/templates/workout/log.html:10 manager/templates/workout/log.html:11
+msgid "Weight log"
+msgstr "Diario dei pesi"
+
#: manager/templates/workout/log.html:29
msgid "Weight log for workout"
msgstr "Registro di peso per allenamento"
@@ -3104,7 +2906,7 @@ msgstr "Guarda records"
msgid "Edit workout"
msgstr "Modifica allenamento"
-#: manager/templates/workout/view.html:225 manager/views/workout.py:300
+#: manager/templates/workout/view.html:225 manager/views/workout.py:301
msgid "Mark as template"
msgstr "Contrassegna come modello"
@@ -3112,11 +2914,6 @@ msgstr "Contrassegna come modello"
msgid "Add workout day"
msgstr "Aggiungi giorno di allenamento"
-#: manager/views/log.py:92
-#, python-format
-msgid "Edit log entry for %s"
-msgstr "Modifica la voce del registro per %s"
-
#: manager/views/log.py:111
msgid "Delete workout log"
msgstr "Elimina registro allenamento"
@@ -3134,11 +2931,11 @@ msgstr "Crea programmazione"
msgid "Your workouts"
msgstr "Il tuo allenamento"
-#: manager/views/workout.py:227
+#: manager/views/workout.py:228
msgid "Copy workout"
msgstr "Copia allenamento"
-#: manager/views/workout.py:230
+#: manager/views/workout.py:231
msgid "Copy"
msgstr "Copia"
@@ -3160,23 +2957,23 @@ msgstr "Questo cancellerà anche tutti i log del peso per questo giorno."
msgid "Value"
msgstr "Valore"
-#: nutrition/forms.py:122
+#: nutrition/forms.py:123
msgid "Calculate"
msgstr "Calcola"
-#: nutrition/forms.py:195 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:196 nutrition/templates/rate/form.html:76
msgid "Basic caloric intake"
msgstr "Assunzione calorica di base"
-#: nutrition/forms.py:196
+#: nutrition/forms.py:197
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:202
+#: nutrition/forms.py:203
msgid "Additional calories"
msgstr "Calorie aggiuntive"
-#: nutrition/forms.py:204
+#: nutrition/forms.py:205
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
@@ -3184,7 +2981,7 @@ msgstr ""
"Calorie aggiuntive da aggiungere alla tariffa base (per sottrarre, inserire "
"un numero negativo)"
-#: nutrition/forms.py:232 nutrition/models/ingredient_weight_unit.py:39
+#: nutrition/forms.py:233 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"
@@ -3250,7 +3047,7 @@ msgstr ""
"delle proteine, carboidrati e grasso. ({energy_calculated} kcal +/- "
"{energy_approx}%)"
-#: nutrition/models/ingredient.py:357 nutrition/views/ingredient.py:225
+#: nutrition/models/ingredient.py:357 nutrition/views/ingredient.py:219
msgid "Ingredient was successfully added to the general database"
msgstr "L'ingrediente è stato aggiunto con successo al database generale"
@@ -3279,6 +3076,12 @@ msgstr "Importo unitario, ad es. «1 tazza» o «1/2 cucchiaio»"
msgid "Meal"
msgstr "Pasto"
+#: nutrition/models/log.py:65
+#, fuzzy
+#| msgid "Time (approx)"
+msgid "Date and Time (Approx.)"
+msgstr "Orario (approssimativo)"
+
#: nutrition/models/meal.py:61
msgid "Time (approx)"
msgstr "Orario (approssimativo)"
@@ -3387,6 +3190,10 @@ msgstr ""
"È ora disponibile nella panoramica degli ingredienti e può essere\n"
"aggiunto a piani nutrizionali. Puoi accedervi da questo indirizzo:"
+#: nutrition/templates/ingredient/email_new.tpl:8
+msgid "Thank you for contributing and making this site better!"
+msgstr "Grazie per avere contribuito e reso questo sito migliore!"
+
#: nutrition/templates/ingredient/form.html:4
msgid "Submitting an ingredient"
msgstr "Invio di un ingrediente"
@@ -3420,6 +3227,10 @@ msgstr ""
msgid "No ingredients."
msgstr "Nessun ingrediente."
+#: nutrition/templates/ingredient/overview.html:57
+msgid "Search"
+msgstr "Ricerca"
+
#: nutrition/templates/ingredient/overview.html:66
msgid "ingredient name"
msgstr "Nome alimento"
@@ -3429,6 +3240,14 @@ msgstr "Nome alimento"
msgid "Add ingredient"
msgstr "Aggiungi ingrediente"
+#: nutrition/templates/ingredient/overview.html:85
+msgid "Only registered users can do this"
+msgstr "Soli gli utenti registrato possono fare questo"
+
+#: nutrition/templates/ingredient/pending.html:14
+msgid "Submission date"
+msgstr "Data di inserimento"
+
#: nutrition/templates/ingredient/view.html:27
msgid "Ingredient is pending review"
msgstr "L'ingrediente è in attesa di revisione"
@@ -3444,6 +3263,18 @@ msgstr ""
"incluso nel database. Fino ad allora, non sarà mostrato nella panoramica o\n"
"la ricerca."
+#: nutrition/templates/ingredient/view.html:31
+msgid "Please select one of the options below."
+msgstr "Per favore seleziona una delle opzione specificate."
+
+#: nutrition/templates/ingredient/view.html:38
+msgid "Accept"
+msgstr "Accetta"
+
+#: nutrition/templates/ingredient/view.html:42
+msgid "Decline"
+msgstr "Rifiuta"
+
#: nutrition/templates/ingredient/view.html:71
#: nutrition/templates/log/detail.html:31
#: nutrition/templates/plan/view.html:229 nutrition/views/plan.py:376
@@ -3709,14 +3540,18 @@ msgstr ""
"osserva\n"
"te stesso per alcune settimane e modificare l'importo totale, se necessario."
-#: nutrition/views/ingredient.py:181
+#: nutrition/views/ingredient.py:175
msgid "Add a new ingredient"
msgstr "Aggiungi un nuovo ingrediente"
-#: nutrition/views/ingredient.py:238
+#: nutrition/views/ingredient.py:232
msgid "Ingredient was successfully marked as rejected"
msgstr "L'ingrediente è stato contrassegnato con successo come rifiutato"
+#: nutrition/views/log.py:230 nutrition/views/unit_ingredient.py:139
+msgid "Delete?"
+msgstr "Elimina?"
+
#: nutrition/views/meal.py:55
msgid "Add new meal"
msgstr "Aggiungi un nuovo pasto"
@@ -3978,15 +3813,15 @@ msgstr ""
msgid "100%% Free <br>and <br>Open Source"
msgstr "100%% gratuito <br>e <br>aperto"
-#: utils/generic_views.py:261
+#: utils/generic_views.py:262
msgid "Yes, delete"
msgstr "Sì, elimina"
-#: utils/models.py:47
+#: utils/models.py:48
msgid "Author"
msgstr "Autore"
-#: utils/models.py:52
+#: utils/models.py:53
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."
@@ -3994,15 +3829,15 @@ msgstr ""
"Se non sei l'autore, inserisci qui il nome o la fonte. Questo è necessario "
"per alcune licenze, ad es. il CC-BY-SA."
-#: utils/models.py:77
+#: utils/models.py:78
msgid "Pending"
msgstr "In attesa"
-#: utils/models.py:78
+#: utils/models.py:79
msgid "Accepted"
msgstr "Accettato"
-#: utils/models.py:79
+#: utils/models.py:80
msgid "Declined"
msgstr "Rifiutato"
@@ -4169,6 +4004,218 @@ msgstr "Cancellato con successo."
msgid "Delete weight entry for the %s"
msgstr "Cancellato il peso inserito di %s"
+#~ msgid "Ingredients"
+#~ msgstr "Ingredienti"
+
+#~ msgid ""
+#~ "Use the configuration to select in what languages the\n"
+#~ "exercises and ingredients will be shown for the current language (for "
+#~ "example\n"
+#~ "the exercises should be shown in languages A, B and C; the ingredients "
+#~ "only\n"
+#~ "in A)."
+#~ msgstr ""
+#~ "Usa la configurazione per selezionare in quali lingue\n"
+#~ "gli esercizi e gli ingredienti saranno mostrati per la lingua corrente "
+#~ "(per esempio\n"
+#~ "gli esercizi dovrebbero essere mostrati nelle lingue A, B e C; gli "
+#~ "ingredienti solo\n"
+#~ "in A)."
+
+#~ msgctxt "as in sorted by category"
+#~ msgid "by category"
+#~ msgstr "per categoria"
+
+#~ msgctxt "as in sorted by muscle"
+#~ msgid "by muscle"
+#~ msgstr "per muscolo"
+
+#~ msgctxt "as in sorted by equipment"
+#~ msgid "by equipment"
+#~ msgstr "per equipaggiamento"
+
+#~ msgid "Add new exercise"
+#~ msgstr "Aggiungi un nuovo esercizio"
+
+#~ msgid "Exercises pending review"
+#~ msgstr "Esercizi in attesa di revisione"
+
+#~ msgid "Exercise was successfully added to the general database"
+#~ msgstr "L'esercizio è stato aggiunto con successo al database generale"
+
+#~ msgid "New user submitted exercise"
+#~ msgstr "Un nuovo utente ha inserito un esercizio"
+
+#, python-brace-format
+#~ msgid "The user {0} submitted a new exercise \"{1}\"."
+#~ msgstr "L'utente {0} ha inserito un nuovo esercizio «{1}»."
+
+#~ msgid "New user submitted image"
+#~ msgstr "Nuovo utente immagine inviata"
+
+#, 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}."
+
+#~ msgid "Equipment overview"
+#~ msgstr "Prospetto dell'attrezzatura"
+
+#~ msgid "Main muscles"
+#~ msgstr "Muscoli principali"
+
+#~ msgid ""
+#~ "No exercises for this equipment. Add or edit an exercise and set the "
+#~ "equipment."
+#~ msgstr ""
+#~ "Nessun esercizio per questa attrezzatura. Aggiungere o modificare un "
+#~ "esercizio ed imposta l'attrezzatura."
+
+#~ msgid "exercise name"
+#~ msgstr "Nome esercizio"
+
+#, python-format
+#~ msgid ""
+#~ "Your exercise '%(exercise)s' was successfully added to the general\n"
+#~ "database."
+#~ msgstr ""
+#~ "Il tuo esercizio «%(exercise)s» è stato aggiunto con successo al "
+#~ "database\n"
+#~ "generale."
+
+#~ msgid ""
+#~ "It is now available on the exercise and muscle overview and can be\n"
+#~ "added to workouts. You can access it on this address:"
+#~ msgstr ""
+#~ "È ora disponibile sull'esercizio e la panoramica muscolare e può essere\n"
+#~ "aggiunto agli allenamenti. Puoi accedervi da questo indirizzo:"
+
+#~ msgid "Submitting an exercise"
+#~ msgstr "Inserendo un esercizio"
+
+#~ msgid ""
+#~ "Thank you for submitting an exercise. This is much\n"
+#~ "appreciated!"
+#~ msgstr ""
+#~ "Grazie per aver inserito un esercizio.\n"
+#~ "Lo apprezziamo davvero!"
+
+#~ msgid ""
+#~ "After you submit the form, the administrators will be notified.\n"
+#~ "Once it is reviewed, it will be added to the database. Till this "
+#~ "happens,\n"
+#~ "it will not be visible in the overview or the search. In case you added "
+#~ "your email\n"
+#~ "when you registered, you will get notified when the process is completed "
+#~ "successfully."
+#~ msgstr ""
+#~ "Dopo aver inviato il modulo, gli amministratori verranno avvisati.\n"
+#~ "Una volta esaminato, verrà aggiunto al database. Fin quando questo non "
+#~ "succede,\n"
+#~ "non sarà visibile nella panoramica o nella ricerca. Nel caso in cui hai "
+#~ "aggiunto la tua e-mail\n"
+#~ "quando ti sei registrato, riceverai una notifica quando il processo è "
+#~ "completato con successo."
+
+#~ msgid "Correcting an exercise"
+#~ msgstr "Correggere un esercizio"
+
+#~ msgid ""
+#~ "Thank you for correcting and improving this exercise.\n"
+#~ "This is much appreciated!"
+#~ msgstr ""
+#~ "Grazie per aver corretto e migliorato questo esercizio.\n"
+#~ "Lo apprezziamo molto!"
+
+#~ msgid ""
+#~ "After you submit the form, the administrators will be notified.\n"
+#~ "Once the changes are reviewed the exercise will be updated."
+#~ msgstr ""
+#~ "Dopo aver inviato il modulo, gli amministratori verranno avvisati.\n"
+#~ "Una volta che le modifiche sono state riviste, l'esercizio verrà "
+#~ "aggiornato."
+
+#~ msgid "No categories."
+#~ msgstr "Nessuna categoria."
+
+#~ msgid "Use link to create one"
+#~ msgstr "Usa l'indirizzo per crearne una"
+
+#~ msgid "Exercise is pending review"
+#~ msgstr "L'esercizio è in attesa di revisione"
+
+#~ msgid ""
+#~ "This user submitted exercise is pending a decision to be\n"
+#~ " included in the database."
+#~ msgstr ""
+#~ "L'esercizio presentato dall'utente è in attesa di decisione\n"
+#~ "         incluso nel database."
+
+#~ msgid "Till then, it will not be shown in the overview or the search."
+#~ msgstr "Fino ad allora, non sarà mostrato nel prospetto o nella ricerca."
+
+#~ msgid "Images"
+#~ msgstr "Immagini"
+
+#~ msgid "Add new image"
+#~ msgstr "Aggiungi nuova immagine"
+
+#~ msgid "Videos"
+#~ msgstr "Video"
+
+#~ msgid "Add new video"
+#~ msgstr "Aggiungi nuovo video"
+
+#~ msgid "Images pending review"
+#~ msgstr "Immagini in attesa di revisione"
+
+#~ msgid "Comments for this exercise"
+#~ msgstr "Commenti all'esercizio"
+
+#~ msgid "Add new comment"
+#~ msgstr "Aggiungi un nuovo commento"
+
+#~ msgid "The diagram shows the most used muscles on this exercise"
+#~ msgstr "Il diagramma mostra i muscoli più usati durante l'esercizio"
+
+#~ msgid "Exercise Variations"
+#~ msgstr "Variazioni esercizio"
+
+#~ msgid "Submit a correction"
+#~ msgstr "Invia una correzione"
+
+#~ msgid ""
+#~ "No exercises for this muscle. Add or edit an exercise and set the muscle."
+#~ msgstr ""
+#~ "Nessun esercizio per questo muscolo. Aggiungi un esercizio e imposta il "
+#~ "muscolo."
+
+#~ msgid "Add exercise"
+#~ msgstr "Aggiungi esercizio"
+
+#~ 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."
+
+#, python-brace-format
+#~ msgid "Correct {0}"
+#~ msgstr "Corretto {0}"
+
+#~ msgid "Exercise was successfully marked as rejected"
+#~ msgstr "L'esercizio è stato contrassegnato con successo come respinto"
+
+#~ msgid "Edit exercise image"
+#~ msgstr "Modifica immagine esercizio"
+
+#~ msgid "Delete exercise image?"
+#~ msgstr "Eliminare l'immagine dell'esercizio?"
+
+#, python-format
+#~ msgid "Edit log entry for %s"
+#~ msgstr "Modifica la voce del registro per %s"
+
#~ msgid "Anterior deltoid"
#~ msgstr "Deltoide anteriore"
@@ -4546,10 +4593,6 @@ msgstr "Cancellato il peso inserito di %s"
#~ msgid "No filter"
#~ msgstr "Nessun filtro"
-#~ msgctxt "Noun, not verb"
-#~ msgid "Change"
-#~ msgstr "Variazione"
-
#~ msgid "Days"
#~ msgstr "Giorni"
diff --git a/wger/locale/ja/LC_MESSAGES/django.po b/wger/locale/ja/LC_MESSAGES/django.po
index c4cc3c264..a210424c0 100644
--- a/wger/locale/ja/LC_MESSAGES/django.po
+++ b/wger/locale/ja/LC_MESSAGES/django.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: wger Workout Manager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-14 12:01+0200\n"
+"POT-Creation-Date: 2022-11-10 16:03+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"
@@ -32,102 +32,8 @@ msgid ""
"registered users to this gym and update all existing users without a gym."
msgstr ""
-#: 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:226
-msgid "Languages"
-msgstr "言語"
-
-#: config/templates/language/overview.html:16
-msgid "Nothing found."
-msgstr ""
-
-#: 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:150
-#: nutrition/templates/plan/view.html:153
-#: nutrition/templates/plan/view.html:191
-msgid "Add one now."
-msgstr "今すぐ追加する"
-
-#: config/templates/language/overview.html:29
-#: core/templates/license/list.html:38 core/templates/misc/license/list.html:41
-#: core/templates/repetition_unit/list.html:41
-#: core/templates/user/overview.html:327 core/templates/user/overview.html:366
-#: core/templates/user/overview.html:402
-#: core/templates/weight_unit/list.html:41 core/views/languages.py:73
-#: core/views/license.py:65 core/views/repetition_units.py:65
-#: core/views/weight_units.py:65
-#: exercises/templates/categories/admin-overview.html:36
-#: 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:61
-msgid "Add"
-msgstr "追加"
-
-#: 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/language.py:32
-msgid "Language full name"
-msgstr "言語正式名"
-
-#: config/templates/language/view.html:34 core/templates/user/overview.html:451
-#: gym/views/admin_config.py:44 gym/views/admin_config.py:58
-#: gym/views/user_config.py:46
-msgid "Configuration"
-msgstr "設定"
-
-#: config/templates/language/view.html:35
-msgid ""
-"Use the configuration to select in what languages the\n"
-"exercises and ingredients will be shown for the current language (for "
-"example\n"
-"the exercises should be shown in languages A, B and C; the ingredients only\n"
-"in A)."
-msgstr ""
-
-#: config/templates/language/view.html:44 gym/templates/contract/list.html:36
-msgid "Show"
-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: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:45
-msgid "Options"
-msgstr "オプション"
-
-#: config/templates/language/view.html:96 config/views/gym_config.py:41
-#: config/views/language_config.py:49 core/templates/license/list.html:16
-#: core/templates/misc/license/list.html:17
+#: config/views/gym_config.py:41 core/templates/language/view.html:57
+#: 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:39
#: core/templates/tags/render_day.html:75 core/templates/user/overview.html:205
@@ -135,12 +41,10 @@ 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:230
-#: exercises/templates/exercise/view.html:351
#: exercises/templates/muscles/admin-overview.html:16
-#: 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
+#: 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
#: 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,81 +60,52 @@ msgstr "オプション"
msgid "Edit"
msgstr "編集"
-#: 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: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: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
-#: gym/templates/contract_type/list.html:39 gym/templates/document/list.html:46
-#: gym/templates/gym/list.html:20 manager/templates/calendar/day.html:69
-#: 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:231
-#: 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:132
-#: nutrition/templates/units/list.html:20
-msgid "Delete"
-msgstr "削除"
-
-#: core/demo.py:86
+#: core/demo.py:95
msgid "Sample workout"
msgstr ""
-#: core/demo.py:90
+#: core/demo.py:99
msgid "Sample day"
msgstr ""
-#: core/demo.py:94
+#: core/demo.py:103
msgid "Another sample day"
msgstr ""
-#: core/demo.py:217
-msgid "Sample nutrional plan"
+#: core/demo.py:211
+msgid "Sample nutritional plan"
msgstr ""
-#: core/demo.py:349 core/demo.py:351 core/demo.py:353
+#: core/demo.py:343 core/demo.py:345 core/demo.py:347
#, python-brace-format
msgid "Placeholder workout nr {0} for schedule"
msgstr ""
-#: core/demo.py:358
+#: core/demo.py:352
msgid "My cool workout schedule"
msgstr ""
-#: core/demo.py:397 core/demo.py:412
+#: core/demo.py:391 core/demo.py:406
msgid "Empty placeholder schedule"
msgstr ""
-#: core/forms.py:61 core/templates/navigation.html:188
-#: core/templates/navigation.html:192 core/templates/user/login.html:4
+#: core/forms.py:64 core/templates/navigation.html:179
+#: core/templates/navigation.html:183 core/templates/user/login.html:4
#: software/templates/features.html:43
msgid "Login"
msgstr "ログイン"
-#: core/forms.py:73 core/forms.py:164 gym/views/export.py:63
+#: core/forms.py:76 core/forms.py:177 gym/views/export.py:63
#: gym/views/gym.py:218
msgid "First name"
msgstr "名前"
-#: core/forms.py:74 core/forms.py:165 core/templates/user/overview.html:267
+#: core/forms.py:77 core/forms.py:178 core/templates/user/overview.html:267
#: gym/views/export.py:64 gym/views/gym.py:218
msgid "Last name"
msgstr "名字"
-#: core/forms.py:76 core/forms.py:131 core/templates/user/overview.html:271
+#: core/forms.py:79 core/forms.py:144 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
@@ -240,77 +115,107 @@ msgstr "名字"
msgid "Email"
msgstr "メール"
-#: core/forms.py:77
+#: core/forms.py:80
msgid "Used for password resets and, optionally, e-mail reminders."
msgstr ""
-#: core/forms.py:102
+#: core/forms.py:84 core/models/profile.py:220
+#: gym/templates/gym/new_user.html:38
+msgid "Date of Birth"
+msgstr ""
+
+#: core/forms.py:116
msgid "Personal data"
msgstr "パーソナルデータ"
-#: core/forms.py:110
+#: core/forms.py:124
msgid "Workout reminders"
msgstr ""
-#: core/forms.py:117
+#: core/forms.py:131
msgid "Other settings"
msgstr "その他の設定"
-#: 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
+#: core/forms.py:138 core/views/user.py:615 core/views/user.py:630
+#: core/views/user.py:642 gym/forms.py:72 manager/templates/log/add.html:65
+#: manager/templates/set/add.html:69 manager/views/workout.py:222
+#: utils/generic_views.py:143
msgid "Save"
msgstr "保存"
-#: core/forms.py:132
+#: core/forms.py:145
msgid "Used for password resets and, optionally, email reminders."
msgstr ""
-#: core/forms.py:160
+#: core/forms.py:173
#, fuzzy
#| msgid "This email is already used."
msgid "This e-mail address is already in use."
msgstr "このメールアドレスは既に登録済みです。"
-#: core/forms.py:180 gym/templates/gym/new_user.html:26
+#: core/forms.py:193 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:182
+#: core/forms.py:195
msgid "Please enter your current password."
msgstr "現在のパスワードを入力してください。"
-#: core/forms.py:200
+#: core/forms.py:204 core/templates/language/view.html:62
+#: 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: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/muscles/admin-overview.html:17
+#: gym/templates/admin_notes/list.html:40
+#: gym/templates/contract_option/list.html:39
+#: gym/templates/contract_type/list.html:39 gym/templates/document/list.html:46
+#: gym/templates/gym/list.html:20 manager/templates/calendar/day.html:69
+#: 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:231
+#: 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:132
+#: nutrition/templates/units/list.html:20
+msgid "Delete"
+msgstr "削除"
+
+#: core/forms.py:213
msgid "Invalid password"
msgstr "パスワードは無効です。"
-#: core/forms.py:212 core/forms.py:278
+#: core/forms.py:225 core/forms.py:291
msgid "The form is secured with reCAPTCHA"
msgstr ""
-#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:188
-#: core/templates/navigation.html:193 core/templates/template.html:149
-#: core/templates/user/login.html:20 core/views/user.py:293
+#: core/forms.py:239 core/forms.py:258 core/templates/navigation.html:179
+#: core/templates/navigation.html:184 core/templates/template.html:149
+#: core/templates/user/login.html:20 core/views/user.py:300
#: software/templates/features.html:38
msgid "Register"
msgstr "登録"
-#: core/forms.py:256
+#: core/forms.py:269
msgid "Contact"
msgstr "問い合わせ"
-#: core/forms.py:257
+#: core/forms.py:270
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:71
+#: core/forms.py:278 exercises/models/comment.py:42 manager/models/set.py:60
+#: manager/models/setting.py:111 nutrition/models/log.py:71
msgid "Comment"
msgstr "コメント"
-#: core/forms.py:266
+#: core/forms.py:279
msgid "What do you want to say?"
msgstr ""
@@ -318,6 +223,14 @@ msgstr ""
msgid "Day of the week"
msgstr ""
+#: core/models/language.py:31 core/templates/language/view.html:21
+msgid "Language short name"
+msgstr "言語省略名"
+
+#: core/models/language.py:36 core/templates/language/view.html:22
+msgid "Language full name"
+msgstr "言語正式名"
+
#: core/models/license.py:29
msgid "Full name"
msgstr ""
@@ -373,19 +286,19 @@ msgstr "メートル法 (キログラム)"
msgid "Imperial (pound)"
msgstr ""
-#: core/models/profile.py:111
+#: core/models/profile.py:114
msgid "Show exercise comments"
msgstr ""
-#: core/models/profile.py:112
+#: core/models/profile.py:115
msgid "Check to show exercise comments on the workout view"
msgstr ""
-#: core/models/profile.py:123
+#: core/models/profile.py:126
msgid "Also use ingredients in English"
msgstr ""
-#: core/models/profile.py:125
+#: core/models/profile.py:128
msgid ""
"Check to also show ingredients in English while creating\n"
"a nutritional plan. These ingredients are extracted from a list provided\n"
@@ -393,130 +306,129 @@ msgid ""
"7000 entries, but can be somewhat overwhelming and make the search difficult."
msgstr ""
-#: core/models/profile.py:134
+#: core/models/profile.py:137
msgid "Activate workout reminders"
msgstr ""
-#: core/models/profile.py:136
+#: core/models/profile.py:139
msgid ""
"Check to activate automatic reminders for workouts. You need to provide a "
"valid email for this to work."
msgstr ""
-#: core/models/profile.py:145
+#: core/models/profile.py:148
msgid "Remind before expiration"
msgstr ""
-#: core/models/profile.py:146
+#: core/models/profile.py:149
msgid "The number of days you want to be reminded before a workout expires."
msgstr ""
-#: core/models/profile.py:152
+#: core/models/profile.py:155
msgid "Default duration of workouts"
msgstr ""
-#: core/models/profile.py:154
+#: core/models/profile.py:157
msgid ""
"Default duration in weeks of workouts not in a schedule. Used for email "
"workout reminders."
msgstr ""
-#: core/models/profile.py:171
+#: core/models/profile.py:174
msgid "Notification language"
msgstr "通知言語"
-#: core/models/profile.py:173
+#: core/models/profile.py:176
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/profile.py:186 gym/views/export.py:66
+#: core/models/profile.py:212 gym/views/export.py:66
msgid "Age"
msgstr "年齢"
-#: core/models/profile.py:202 nutrition/forms.py:99
+#: core/models/profile.py:228 nutrition/forms.py:100
msgid "Height (cm)"
msgstr "身長(cm)"
-#: core/models/profile.py:219
+#: core/models/profile.py:245
msgid "Hours of sleep"
msgstr "睡眠時間"
-#: core/models/profile.py:220
+#: core/models/profile.py:246
msgid "The average hours of sleep per day"
msgstr "一日あたりの平均睡眠時間"
-#: core/models/profile.py:229
+#: core/models/profile.py:255
msgid "Work"
msgstr ""
-#: core/models/profile.py:230 core/models/profile.py:272
+#: core/models/profile.py:256 core/models/profile.py:298
msgid "Average hours per day"
msgstr ""
-#: core/models/profile.py:239 core/models/profile.py:260
-#: core/models/profile.py:281
+#: core/models/profile.py:265 core/models/profile.py:286
+#: core/models/profile.py:307
msgid "Physical intensity"
msgstr ""
-#: core/models/profile.py:240 core/models/profile.py:261
-#: core/models/profile.py:282
+#: core/models/profile.py:266 core/models/profile.py:287
+#: core/models/profile.py:308
msgid "Approximately"
msgstr ""
-#: core/models/profile.py:250
+#: core/models/profile.py:276
msgid "Sport"
msgstr "スポーツ"
-#: core/models/profile.py:251
+#: core/models/profile.py:277
msgid "Average hours per week"
msgstr ""
-#: core/models/profile.py:271
+#: core/models/profile.py:297
msgid "Free time"
msgstr ""
-#: core/models/profile.py:292 nutrition/templates/rate/form.html:66
+#: core/models/profile.py:318 nutrition/templates/rate/form.html:66
msgid "Total daily calories"
msgstr ""
-#: core/models/profile.py:293
+#: core/models/profile.py:319
msgid "Total caloric intake, including e.g. any surplus"
msgstr ""
-#: core/models/profile.py:305 nutrition/models/ingredient_weight_unit.py:45
+#: core/models/profile.py:331 nutrition/models/ingredient_weight_unit.py:45
#: nutrition/models/log.py:90 nutrition/models/meal_item.py:58
msgid "Weight unit"
msgstr "体重の単位"
-#: core/models/profile.py:313
+#: core/models/profile.py:339
msgid "Allow external access"
msgstr ""
-#: core/models/profile.py:315
+#: core/models/profile.py:341
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/profile.py:324
+#: core/models/profile.py:350
msgid "Automatic reminders for weight entries"
msgstr ""
-#: core/models/profile.py:326
+#: core/models/profile.py:352
msgid "Number of days after the last weight entry (enter 0 to deactivate)"
msgstr ""
-#: core/models/profile.py:392
+#: core/models/profile.py:418
msgid "The sum of all hours has to be 24"
msgstr ""
#: core/models/rep_unit.py:35 core/models/weight_unit.py:35
-#: core/templates/user/overview.html:263 core/views/user.py:575
+#: core/templates/user/overview.html:263 core/views/user.py:591
#: 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
+#: exercises/models/exercise.py:64 exercises/models/muscle.py:36
#: 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
@@ -575,6 +487,52 @@ msgstr "共有する"
msgid "Are you sure you want to delete this? This action cannot be undone."
msgstr ""
+#: core/templates/email_verification/confirm_template.html:4
+msgid "Email verified"
+msgstr ""
+
+#: core/templates/email_verification/confirm_template.html:18
+#, python-format
+msgid "%(username)s, your email was verified"
+msgstr ""
+
+#: core/templates/email_verification/confirm_template.html:22
+msgid "Error, invalid verification token"
+msgstr ""
+
+#: core/templates/email_verification/email_body_html.tpl:6
+#, fuzzy
+#| msgid "Configuration"
+msgid "Email Confirmation"
+msgstr "設定"
+
+#: core/templates/email_verification/email_body_html.tpl:9
+#: core/templates/email_verification/email_body_txt.tpl:3
+#, python-format
+msgid "You are almost there, %(username)s!"
+msgstr ""
+
+#: core/templates/email_verification/email_body_html.tpl:11
+#, python-format
+msgid "Please click <a href=\"%(link)s\">here</a> to confirm your email"
+msgstr ""
+
+#: core/templates/email_verification/email_body_html.tpl:12
+#: core/templates/email_verification/email_body_txt.tpl:5
+#, python-format
+msgid "The token expires on %(time)s"
+msgstr ""
+
+#: core/templates/email_verification/email_body_html.tpl:14
+#: core/templates/email_verification/email_body_txt.tpl:8
+msgid "the wger Team"
+msgstr ""
+
+#: core/templates/email_verification/email_body_txt.tpl:4
+#, python-format
+msgid "Please click the following link to confirm your email: %(link)s"
+msgstr ""
+
#: core/templates/index.html:4
msgid "Dashboard"
msgstr "ダッシュボード"
@@ -631,7 +589,7 @@ msgid "Add custom diary entry"
msgstr ""
#: core/templates/index.html:84 core/templates/index.html:92
-#: manager/models/day.py:34 manager/models/log.py:56
+#: manager/models/day.py:34 manager/models/log.py:58
#: manager/models/session.py:60 manager/models/workout.py:109
#: manager/templates/schedule/view.html:105
#: manager/templates/workout/view.html:11
@@ -662,6 +620,20 @@ msgstr ""
msgid "No workouts found."
msgstr ""
+#: core/templates/index.html:137 core/templates/index.html:189
+#: core/templates/language/overview.html:23
+#: 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:150
+#: nutrition/templates/plan/view.html:153
+#: nutrition/templates/plan/view.html:191
+msgid "Add one now."
+msgstr "今すぐ追加する"
+
#: 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
@@ -715,19 +687,59 @@ msgid "No nutrition plans."
msgstr ""
#: 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
+#: core/templates/user/overview.html:121 manager/forms.py:184
+#: manager/helpers.py:89 manager/models/log.py:86 manager/models/setting.py:79
+#: manager/templates/log/add.html:54 manager/templates/set/formset.html:11
#: weight/models.py: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:210 core/templates/navigation.html:135
+#: core/templates/index.html:210 core/templates/navigation.html:126
#: weight/views.py:70
msgid "Add weight entry"
msgstr ""
+#: core/templates/language/overview.html:4 core/templates/navigation.html:217
+msgid "Languages"
+msgstr "言語"
+
+#: core/templates/language/overview.html:23
+msgid "Nothing found."
+msgstr ""
+
+#: core/templates/language/overview.html:36 core/templates/license/list.html:38
+#: core/templates/misc/license/list.html:41
+#: core/templates/repetition_unit/list.html:41
+#: core/templates/user/overview.html:327 core/templates/user/overview.html:366
+#: core/templates/user/overview.html:402
+#: core/templates/weight_unit/list.html:41 core/views/languages.py:73
+#: core/views/license.py:65 core/views/repetition_units.py:65
+#: core/views/weight_units.py:65
+#: exercises/templates/categories/admin-overview.html:36
+#: 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:61
+msgid "Add"
+msgstr "追加"
+
+#: core/templates/language/view.html:52 core/templates/user/api_key.html:44
+#: core/templates/user/preferences.html:44 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:45
+msgid "Options"
+msgstr "オプション"
+
#: core/templates/license/list.html:4 core/templates/misc/license/list.html:4
msgid "License list"
msgstr ""
@@ -740,7 +752,6 @@ msgstr ""
#: core/templates/weight_unit/list.html:26
#: exercises/templates/categories/admin-overview.html:24
#: exercises/templates/equipment/admin-overview.html:24
-#: exercises/templates/exercise/pending.html:30
#: exercises/templates/muscles/admin-overview.html:24
#: gym/templates/admin_notes/list.html:52 gym/templates/contract/list.html:60
#: gym/templates/contract_option/list.html:56
@@ -818,155 +829,135 @@ msgstr ""
msgid "Public templates"
msgstr ""
-#: core/templates/navigation.html:64
-msgctxt "as in sorted by category"
-msgid "by category"
-msgstr ""
-
-#: core/templates/navigation.html:65
-msgctxt "as in sorted by muscle"
-msgid "by muscle"
-msgstr ""
-
-#: core/templates/navigation.html:66
-msgctxt "as in sorted by equipment"
-msgid "by equipment"
-msgstr ""
-
-#: core/templates/navigation.html:70
-#: exercises/templates/equipment/overview.html:109
-#: exercises/templates/equipment/overview.html:113
-#: exercises/templates/exercise/overview.html:112
-#: exercises/templates/exercise/overview.html:116
-#: exercises/templates/muscles/overview.html:112
-#: exercises/templates/muscles/overview.html:116
-msgid "Add new exercise"
-msgstr ""
+#: core/templates/navigation.html:63 manager/forms.py:133
+#: manager/models/setting.py:54
+msgid "Exercises"
+msgstr "運動"
-#: core/templates/navigation.html:75 core/templates/navigation.html:116
-#: core/templates/navigation.html:224
+#: core/templates/navigation.html:67 core/templates/navigation.html:107
+#: core/templates/navigation.html:215
msgid "Administration"
msgstr ""
-#: core/templates/navigation.html:76
-#: exercises/templates/exercise/pending.html:6
-msgid "Exercises pending review"
-msgstr ""
+#: core/templates/navigation.html:68
+#, fuzzy
+#| msgid "Exercises"
+msgid "Exercise edit history"
+msgstr "運動"
-#: core/templates/navigation.html:77 exercises/models/base.py:72
-#: exercises/templates/exercise/view.html:80
+#: core/templates/navigation.html:69 exercises/models/base.py:84
msgid "Equipment"
msgstr ""
-#: core/templates/navigation.html:78 exercises/templates/exercise/view.html:258
+#: core/templates/navigation.html:70
msgid "Muscles"
msgstr "筋肉"
-#: core/templates/navigation.html:79
+#: core/templates/navigation.html:71
#: exercises/templates/categories/admin-overview.html:4
msgid "Categories"
msgstr ""
-#: core/templates/navigation.html:93 software/templates/features.html:87
+#: core/templates/navigation.html:84 software/templates/features.html:87
msgid "Nutrition"
msgstr ""
-#: core/templates/navigation.html:99 core/templates/user/overview.html:144
+#: core/templates/navigation.html:90 core/templates/user/overview.html:144
msgid "Nutrition plans"
msgstr ""
-#: core/templates/navigation.html:105 nutrition/templates/bmi/form.html:50
+#: core/templates/navigation.html:96 nutrition/templates/bmi/form.html:50
msgid "BMI calculator"
msgstr "BMI計算"
-#: core/templates/navigation.html:111 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:102 nutrition/templates/rate/form.html:17
msgid "Daily calories calculator"
msgstr ""
-#: core/templates/navigation.html:113
+#: core/templates/navigation.html:104
#: nutrition/templates/ingredient/overview.html:29
msgid "Ingredient overview"
msgstr ""
-#: core/templates/navigation.html:117 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:108 nutrition/templates/units/list.html:6
msgid "Ingredient weight units"
msgstr ""
-#: core/templates/navigation.html:118
+#: core/templates/navigation.html:109
#: nutrition/templates/ingredient/pending.html:6
msgid "Ingredients pending review"
msgstr ""
-#: core/templates/navigation.html:132
+#: core/templates/navigation.html:123
msgid "Body weight"
msgstr ""
-#: core/templates/navigation.html:134 core/templates/user/overview.html:114
+#: core/templates/navigation.html:125 core/templates/user/overview.html:114
#: weight/templates/overview.html:7
msgid "Weight overview"
msgstr ""
-#: core/templates/navigation.html:147
+#: core/templates/navigation.html:138
msgid "About this software"
msgstr ""
-#: core/templates/navigation.html:149 core/templates/template_features.html:82
+#: core/templates/navigation.html:140 core/templates/template_features.html:82
#: software/templates/about_us.html:5
msgid "About us"
msgstr ""
-#: core/templates/navigation.html:151 software/templates/features.html:209
+#: core/templates/navigation.html:142 software/templates/features.html:209
msgid "REST API"
msgstr ""
-#: core/templates/navigation.html:155 utils/models.py:40
+#: core/templates/navigation.html:146 utils/models.py:41
msgid "License"
msgstr "ライセンス"
-#: core/templates/navigation.html:161
+#: core/templates/navigation.html:152
msgid "Developer documentation"
msgstr ""
-#: core/templates/navigation.html:167
+#: core/templates/navigation.html:158
msgid "Get the code"
msgstr ""
-#: core/templates/navigation.html:173 core/templates/template.html:204
+#: core/templates/navigation.html:164 core/templates/template.html:203
#: core/templates/template_features.html:99
msgid "Translate"
msgstr "翻訳"
-#: core/templates/navigation.html:194 core/templates/user/login.html:28
+#: core/templates/navigation.html:185 core/templates/user/login.html:28
msgid "Reset password"
msgstr "パスワード再設定"
-#: core/templates/navigation.html:207
+#: core/templates/navigation.html:198
msgid "My preferences"
msgstr ""
-#: core/templates/navigation.html:214
+#: core/templates/navigation.html:205
msgid "Logout"
msgstr "ロッグアウト"
-#: core/templates/navigation.html:229
+#: core/templates/navigation.html:220
msgid "Licenses"
msgstr ""
-#: core/templates/navigation.html:232
+#: core/templates/navigation.html:223
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr ""
-#: core/templates/navigation.html:235 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:226 core/templates/weight_unit/list.html:4
#: nutrition/templates/ingredient/view.html:174
msgid "Weight units"
msgstr ""
-#: core/templates/navigation.html:238 core/templates/user/list.html:4
+#: core/templates/navigation.html:229 core/templates/user/list.html:4
msgid "User list"
msgstr ""
-#: core/templates/navigation.html:239
+#: core/templates/navigation.html:230
msgid "Gyms"
msgstr ""
@@ -1041,33 +1032,30 @@ msgstr ""
msgid "Add weight log"
msgstr ""
-#: core/templates/tags/render_day.html:114
-#: exercises/templates/equipment/overview.html:59
-#: exercises/templates/exercise/overview.html:63
-#: exercises/templates/muscles/overview.html:65
+#: core/templates/tags/render_day.html:116
msgid "Placeholder image for exercise"
msgstr ""
-#: core/templates/tags/render_day.html:131
+#: core/templates/tags/render_day.html:133
msgid "This exercise has no repetitions."
msgstr ""
-#: core/templates/tags/render_day.html:134
+#: core/templates/tags/render_day.html:136
msgid "Edit them now."
msgstr ""
-#: core/templates/tags/render_day.html:159
+#: core/templates/tags/render_day.html:162
msgid "Add exercises to this workout day"
msgstr ""
#: core/templates/tags/render_weight_log.html:17 manager/helpers.py:89
-#: manager/models/setting.py:57 manager/templates/set/formset.html:10
+#: manager/models/setting.py:69 manager/templates/set/formset.html:9
msgid "Reps"
msgstr "回"
-#: 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
+#: core/templates/tags/render_weight_log.html:30 manager/forms.py:189
+#: manager/models/log.py:103 manager/models/setting.py:99
+#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
msgid "RiR"
msgstr ""
@@ -1090,7 +1078,7 @@ msgstr "使用条件"
msgid "Features"
msgstr ""
-#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:37
+#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:53
msgid "API key"
msgstr "APIキー"
@@ -1130,11 +1118,12 @@ msgid "Documentation"
msgstr ""
#: core/templates/user/delete_account.html:4
-#: core/templates/user/preferences.html:42
+#: core/templates/user/preferences.html:58
msgid "Delete account"
msgstr ""
#: core/templates/user/delete_account.html:17
+#: exercises/templates/history/overview.html:93
msgid "Are you sure?"
msgstr ""
@@ -1179,11 +1168,12 @@ 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/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
+#: exercises/models/base.py:99 exercises/models/base.py:104
+#: exercises/models/exercise.py:69 exercises/models/exercise.py:76
+#: gallery/models/image.py:47 manager/helpers.py:88 manager/models/log.py:100
+#: 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/views.py:150
@@ -1191,11 +1181,11 @@ msgid "Date"
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: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
+#: exercises/models/exercise.py:57 exercises/views/exercises.py:123
+#: 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 ""
@@ -1203,12 +1193,12 @@ msgstr ""
msgid "Number of logs (days)"
msgstr ""
-#: core/templates/user/overview.html:37 core/views/user.py:576
+#: core/templates/user/overview.html:37 core/views/user.py:592
#: 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:267
+#: core/templates/user/overview.html:68 manager/forms.py:278
#: manager/templates/workout/view.html:151
msgid "Log"
msgstr ""
@@ -1226,6 +1216,7 @@ msgid "Notes"
msgstr ""
#: core/templates/user/overview.html:79
+#: exercises/templates/history/overview.html:30
#: manager/templates/calendar/partial_overview_table.html:42
#: nutrition/templates/log/detail.html:154
msgid "Time"
@@ -1273,10 +1264,12 @@ msgid "Do you really want to change this user&#39;s password?"
msgstr ""
#: core/templates/user/overview.html:233
+#: exercises/templates/history/overview.html:106
msgid "No"
msgstr ""
#: core/templates/user/overview.html:234
+#: exercises/templates/history/overview.html:99
msgid "Yes"
msgstr ""
@@ -1331,10 +1324,15 @@ msgid "Documents"
msgstr ""
#: core/templates/user/overview.html:413 gym/templates/document/list.html:32
-#: manager/forms.py:279 manager/templates/workout/view.html:176
+#: manager/forms.py:290 manager/templates/workout/view.html:176
msgid "Download"
msgstr "ダウンロード"
+#: core/templates/user/overview.html:451 gym/views/admin_config.py:44
+#: gym/views/admin_config.py:58 gym/views/user_config.py:46
+msgid "Configuration"
+msgstr "設定"
+
#: core/templates/user/overview.html:454 gym/models/user_config.py:92
msgid "Include in inactive overview"
msgstr ""
@@ -1352,7 +1350,23 @@ msgstr ""
msgid "Preferences"
msgstr ""
-#: core/templates/user/preferences.html:33 core/views/user.py:587
+#: core/templates/user/preferences.html:19
+msgid "Verified email"
+msgstr ""
+
+#: core/templates/user/preferences.html:24
+msgid "Unverified email"
+msgstr ""
+
+#: core/templates/user/preferences.html:26
+msgid "Send verification email"
+msgstr ""
+
+#: core/templates/user/preferences.html:30
+msgid "You need to verify your email to contribute exercises"
+msgstr ""
+
+#: core/templates/user/preferences.html:49 core/views/user.py:603
msgid "Change password"
msgstr ""
@@ -1382,39 +1396,37 @@ msgid "oz"
msgstr "oz"
#: 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
+#: exercises/views/equipment.py:104 exercises/views/exercises.py:185
+#: exercises/views/muscles.py:99 manager/views/schedule.py:311
+#: manager/views/schedule_step.py:129 manager/views/workout.py:269
+#: manager/views/workout_session.py:141 nutrition/views/ingredient.py:138
#: 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:431
-#: exercises/views/muscles.py:125 gallery/views/images.py:121
+#: exercises/views/categories.py:127 exercises/views/exercises.py:193
+#: exercises/views/muscles.py:106 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
+#: manager/views/workout.py:273 manager/views/workout_session.py:156
+#: nutrition/views/ingredient.py:145 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:456
+#: core/views/repetition_units.py:85 core/views/user.py:472
#: 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: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
+#: exercises/views/equipment.py:81 exercises/views/muscles.py:86
+#: 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:170
+#: gym/views/gym.py:459 manager/views/day.py:100 manager/views/schedule.py:335
+#: manager/views/workout.py:287 nutrition/views/ingredient.py:164
+#: nutrition/views/plan.py:144 nutrition/views/unit.py:144
#, python-brace-format
msgid "Edit {0}"
msgstr ""
@@ -1442,64 +1454,65 @@ msgstr ""
msgid "Your feedback was successfully sent. Thank you!"
msgstr ""
-#: core/views/user.py:156
+#: core/views/user.py:157
#, python-brace-format
msgid "Account \"{0}\" was successfully deleted"
msgstr ""
-#: core/views/user.py:287
+#: core/views/user.py:294
msgid "You were successfully registered"
msgstr ""
-#: core/views/user.py:339
+#: core/views/user.py:355
msgid "Settings successfully updated"
msgstr ""
-#: core/views/user.py:376
+#: core/views/user.py:392
msgid "The user was successfully deactivated"
msgstr ""
-#: core/views/user.py:411
+#: core/views/user.py:427
msgid "The user was successfully activated"
msgstr ""
-#: core/views/user.py:426
+#: core/views/user.py:442
msgid "Edit user"
msgstr ""
-#: core/views/user.py:573 gym/templates/gym/member_list.html:26
+#: core/views/user.py:589 gym/templates/gym/member_list.html:26
#: gym/views/gym.py:156
msgid "ID"
msgstr ""
-#: core/views/user.py:574 gym/forms.py:94 gym/templates/contract/view.html:55
+#: core/views/user.py:590 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:577 gym/templates/gym/new_user.html:34
+#: core/views/user.py:593 gym/templates/gym/new_user.html:34
#: gym/views/export.py:60 gym/views/gym.py:218
msgid "Gym"
msgstr ""
-#: exercises/models/base.py:51 exercises/templates/exercise/view.html:76
-#: nutrition/models/ingredient.py:204
+#: core/views/user.py:652
+#, python-format
+msgid "A verification email was sent to %(email)s"
+msgstr ""
+
+#: exercises/models/base.py:63 nutrition/models/ingredient.py:204
msgid "Category"
msgstr ""
-#: exercises/models/base.py:58
+#: exercises/models/base.py:70
msgid "Primary muscles"
msgstr ""
-#: exercises/models/base.py:64 exercises/templates/equipment/overview.html:71
-#: exercises/templates/exercise/overview.html:76
-#: exercises/templates/exercise/view.html:268
-#: exercises/templates/muscles/overview.html:77
+#: exercises/models/base.py:76
msgid "Secondary muscles"
msgstr ""
-#: exercises/models/base.py:79
+#: exercises/models/base.py:91
msgid "Variations"
msgstr ""
@@ -1507,90 +1520,68 @@ msgstr ""
msgid "Exercise Categories"
msgstr ""
-#: exercises/models/comment.py:34 exercises/models/exercise_alias.py:32
-#: exercises/models/image.py:75 exercises/models/video.py:82
-#: manager/forms.py:165 manager/helpers.py:89 manager/models/log.py:51
+#: exercises/models/comment.py:37 exercises/models/exercise_alias.py:35
+#: exercises/models/image.py:71 exercises/models/video.py:95
+#: manager/forms.py:176 manager/helpers.py:89 manager/models/log.py:52
msgid "Exercise"
msgstr ""
-#: exercises/models/comment.py:41
+#: exercises/models/comment.py:43
msgid "A comment about how to correctly do this exercise."
msgstr ""
-#: exercises/models/exercise.py:86 nutrition/models/ingredient.py:80
+#: exercises/models/exercise.py:81 nutrition/models/ingredient.py:80
#: nutrition/models/plan.py:61 nutrition/models/weight_unit.py:32
msgid "Language"
msgstr "表示言語"
-#: exercises/models/exercise.py:237 exercises/views/exercises.py:461
-msgid "Exercise was successfully added to the general database"
-msgstr ""
-
-#: exercises/models/exercise.py:265
-msgid "New user submitted exercise"
-msgstr ""
-
-#: exercises/models/exercise.py:267
-#, python-brace-format
-msgid "The user {0} submitted a new exercise \"{1}\"."
-msgstr ""
-
-#: exercises/models/exercise_alias.py:35
+#: exercises/models/exercise_alias.py:38
msgid "Alias for an exercise"
msgstr ""
-#: exercises/models/image.py:59
+#: exercises/models/image.py:55
msgid "Line"
msgstr ""
-#: exercises/models/image.py:60
+#: exercises/models/image.py:56
msgid "3D"
msgstr ""
-#: exercises/models/image.py:61
+#: exercises/models/image.py:57
msgid "Low-poly"
msgstr ""
-#: exercises/models/image.py:62
+#: exercises/models/image.py:58
msgid "Photo"
msgstr ""
-#: exercises/models/image.py:63
+#: exercises/models/image.py:59
msgid "Other"
msgstr ""
-#: exercises/models/image.py:81 gallery/models/image.py:56
+#: exercises/models/image.py:77 gallery/models/image.py:56
msgid "Image"
msgstr ""
-#: exercises/models/image.py:82 gallery/models/image.py:57
+#: exercises/models/image.py:78 gallery/models/image.py:57
msgid "Only PNG and JPEG formats are supported"
msgstr ""
-#: exercises/models/image.py:88
+#: exercises/models/image.py:84
msgid "Main picture"
msgstr ""
-#: exercises/models/image.py:91
+#: exercises/models/image.py:87
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:100
+#: exercises/models/image.py:96
msgid "The art style of your image"
msgstr ""
-#: exercises/models/image.py:185
-msgid "New user submitted image"
-msgstr ""
-
-#: exercises/models/image.py:186
-#, python-brace-format
-msgid "The user {0} submitted a new image \"{1}\" for exercise {2}."
-msgstr ""
-
#: exercises/models/muscle.py:37
msgid "In latin, e.g. \"Pectoralis major\""
msgstr ""
@@ -1603,275 +1594,116 @@ msgstr ""
msgid "A more basic name for the muscle"
msgstr ""
-#: exercises/models/video.py:41
-msgid "Maximum file size is 100MB."
+#: exercises/models/video.py:50
+#, python-format
+msgid "Maximum file size is %(size)sMB."
msgstr ""
-#: exercises/models/video.py:44 exercises/models/video.py:48
+#: exercises/models/video.py:57 exercises/models/video.py:65
msgid "File type is not supported"
msgstr ""
-#: exercises/models/video.py:57
+#: exercises/models/video.py:70
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 ""
-
-#: exercises/templates/equipment/admin-overview.html:37
-#: exercises/views/equipment.py:94
-msgid "Add new equipment"
-msgstr ""
-
-#: exercises/templates/equipment/overview.html:11
-msgid "Equipment overview"
-msgstr ""
-
-#: exercises/templates/equipment/overview.html:69
-#: exercises/templates/exercise/overview.html:74
-#: exercises/templates/exercise/view.html:264
-#: exercises/templates/muscles/overview.html:75
-msgid "Main muscles"
-msgstr ""
-
-#: exercises/templates/equipment/overview.html:79
-msgid ""
-"No exercises for this equipment. Add or edit an exercise and set the "
-"equipment."
-msgstr ""
-
-#: exercises/templates/equipment/overview.html:96
-#: exercises/templates/exercise/overview.html:99
-#: nutrition/templates/ingredient/overview.html:57
-msgid "Search"
-msgstr ""
-
-#: exercises/templates/equipment/overview.html:101
-#: exercises/templates/exercise/overview.html:104
-msgid "exercise name"
-msgstr ""
-
-#: exercises/templates/equipment/overview.html:115
-#: exercises/templates/exercise/overview.html:118
-#: exercises/templates/muscles/overview.html:118
-#: nutrition/templates/ingredient/overview.html:85
-msgid "Only registered users can do this"
-msgstr ""
-
-#: exercises/templates/exercise/email_new.tpl:1
-#, python-format
-msgid ""
-"Your exercise '%(exercise)s' was successfully added to the general\n"
-"database."
-msgstr ""
-
-#: exercises/templates/exercise/email_new.tpl:4
-msgid ""
-"It is now available on the exercise and muscle overview and can be\n"
-"added to workouts. You can access it on this address:"
-msgstr ""
-
-#: exercises/templates/exercise/email_new.tpl:8
-#: nutrition/templates/ingredient/email_new.tpl:8
-msgid "Thank you for contributing and making this site better!"
-msgstr ""
-
-#: exercises/templates/exercise/email_new.tpl:9
-#: manager/templates/workout/email_reminder.tpl:15
-#: manager/templates/workout/email_weight_reminder.tpl:12
-#: nutrition/templates/ingredient/email_new.tpl:9
-#, python-format
-msgid "The %(site)s team"
-msgstr ""
-
-#: exercises/templates/exercise/form.html:4
-msgid "Submitting an exercise"
-msgstr ""
-
-#: exercises/templates/exercise/form.html:5
-msgid ""
-"Thank you for submitting an exercise. This is much\n"
-"appreciated!"
-msgstr ""
-
-#: exercises/templates/exercise/form.html:8
-msgid ""
-"After you submit the form, the administrators will be notified.\n"
-"Once it is reviewed, it will be added to the database. Till this happens,\n"
-"it will not be visible in the overview or the search. In case you added your "
-"email\n"
-"when you registered, you will get notified when the process is completed "
-"successfully."
-msgstr ""
-
-#: exercises/templates/exercise/form_correct.html:4
-msgid "Correcting an exercise"
-msgstr ""
-
-#: exercises/templates/exercise/form_correct.html:5
-msgid ""
-"Thank you for correcting and improving this exercise.\n"
-"This is much appreciated!"
-msgstr ""
-
-#: exercises/templates/exercise/form_correct.html:8
-msgid ""
-"After you submit the form, the administrators will be notified.\n"
-"Once the changes are reviewed the exercise will be updated."
-msgstr ""
-
-#: exercises/templates/exercise/overview.html:88
-msgid "No categories."
-msgstr ""
-
-#: exercises/templates/exercise/overview.html:88
-msgid "Use link to create one"
-msgstr ""
-
-#: exercises/templates/exercise/pending.html:14
-#: nutrition/templates/ingredient/pending.html:14
-msgid "Submission date"
-msgstr ""
-
-#: 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/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"
+#: exercises/models/video.py:101
+msgid "Main video"
msgstr ""
-#: exercises/templates/exercise/view.html:48
-msgid "Exercise is pending review"
+#: exercises/models/video.py:107
+msgid "Video"
msgstr ""
-#: exercises/templates/exercise/view.html:51
-msgid ""
-"This user submitted exercise is pending a decision to be\n"
-" included in the database."
+#: exercises/models/video.py:114
+msgid "Size"
msgstr ""
-#: exercises/templates/exercise/view.html:53
-msgid "Till then, it will not be shown in the overview or the search."
+#: exercises/models/video.py:121 manager/models/schedule_step.py:56
+msgid "Duration"
msgstr ""
-#: exercises/templates/exercise/view.html:54
-#: nutrition/templates/ingredient/view.html:31
-msgid "Please select one of the options below."
+#: exercises/models/video.py:130
+msgid "Width"
msgstr ""
-#: exercises/templates/exercise/view.html:60
-#: exercises/templates/exercise/view.html:203
-#: nutrition/templates/ingredient/view.html:38
-msgid "Accept"
+#: exercises/models/video.py:137
+#, fuzzy
+#| msgid "Weight"
+msgid "Height"
+msgstr "体重"
+
+#: exercises/models/video.py:144
+msgid "Codec"
msgstr ""
-#: exercises/templates/exercise/view.html:64
-#: exercises/templates/exercise/view.html:204
-#: nutrition/templates/ingredient/view.html:42
-msgid "Decline"
+#: exercises/models/video.py:152
+msgid "Codec, long name"
msgstr ""
-#: exercises/templates/exercise/view.html:96
-msgid "Images"
+#: exercises/templates/equipment/admin-overview.html:4
+msgid "Equipment list"
msgstr ""
-#: exercises/templates/exercise/view.html:137 exercises/views/images.py:93
-msgid "Add new image"
+#: exercises/templates/equipment/admin-overview.html:37
+#: exercises/views/equipment.py:92
+msgid "Add new equipment"
msgstr ""
-#: exercises/templates/exercise/view.html:148
-msgid "Videos"
+#: exercises/templates/history/overview.html:11
+msgid "Exercise admin history"
msgstr ""
-#: exercises/templates/exercise/view.html:187 exercises/views/videos.py:94
+#: exercises/templates/history/overview.html:27
#, fuzzy
-#| msgid "Add one now."
-msgid "Add new video"
-msgstr "今すぐ追加する"
+#| msgid "Options"
+msgid "Action"
+msgstr "オプション"
-#: exercises/templates/exercise/view.html:197
-msgid "Images pending review"
+#: exercises/templates/history/overview.html:28 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/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 ""
-#: exercises/templates/exercise/view.html:218
-msgid "Comments for this exercise"
+#: exercises/templates/history/overview.html:29
+msgid "Object"
msgstr ""
-#: exercises/templates/exercise/view.html:246
-msgid "Add new comment"
+#: exercises/templates/history/overview.html:31
+msgid "Changes"
msgstr ""
-#: exercises/templates/exercise/view.html:260
-msgid "The diagram shows the most used muscles on this exercise"
+#: exercises/templates/history/overview.html:32
+msgid "Revert"
msgstr ""
-#: exercises/templates/exercise/view.html:301
-#: manager/templates/workout/log.html:10 manager/templates/workout/log.html:11
-msgid "Weight log"
+#: exercises/templates/history/overview.html:64
+msgid "View Object"
msgstr ""
-#: exercises/templates/exercise/view.html:306
-msgid "Exercise Variations"
+#: exercises/templates/history/overview.html:75
+msgid "View changes"
msgstr ""
-#: exercises/templates/exercise/view.html:327
-msgid "Submit a correction"
+#: exercises/templates/history/overview.html:86
+msgid "Revert changes"
msgstr ""
#: exercises/templates/muscles/admin-overview.html:4
-#: exercises/templates/muscles/overview.html:7
msgid "Muscle overview"
msgstr ""
#: exercises/templates/muscles/admin-overview.html:36
-#: exercises/views/muscles.py:86
+#: exercises/views/muscles.py:67
msgid "Add muscle"
msgstr ""
-#: exercises/templates/muscles/overview.html:85
-msgid ""
-"No exercises for this muscle. Add or edit an exercise and set the muscle."
-msgstr ""
-
#: exercises/views/categories.py:71
msgid "Add category"
msgstr ""
@@ -1884,50 +1716,19 @@ msgstr ""
msgid "Add exercise comment"
msgstr ""
-#: exercises/views/equipment.py:107 exercises/views/equipment.py:118
+#: exercises/views/equipment.py:105 exercises/views/equipment.py:116
msgid "Delete equipment?"
msgstr ""
-#: exercises/views/exercises.py:229
+#: exercises/views/exercises.py:161
#, python-format
-msgid ""
-"%(name_original)s is too similar to existing exercise \"%(exercise_name)s\""
+msgid "%(name)s is too similar to existing exercise \"%(exercise_name)s\""
msgstr ""
-#: exercises/views/exercises.py:247
-msgid "Add exercise"
-msgstr ""
-
-#: exercises/views/exercises.py:367
-msgid "Thank you. Once the changes are reviewed the exercise will be updated."
-msgstr ""
-
-#: exercises/views/exercises.py:380
-#, python-brace-format
-msgid "Correct {0}"
-msgstr "{0}を訂正する"
-
-#: exercises/views/exercises.py:422
+#: exercises/views/exercises.py:184
msgid "This will delete the exercise from all workouts."
msgstr ""
-#: exercises/views/exercises.py:474
-msgid "Exercise was successfully marked as rejected"
-msgstr ""
-
-#: exercises/views/images.py:68
-msgid "Edit exercise image"
-msgstr ""
-
-#: exercises/views/images.py:143
-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"
@@ -1996,7 +1797,7 @@ msgid "Contract type"
msgstr ""
#: gym/models/contract.py:208 gym/templates/contract/view.html:59
-#: manager/templates/log/add.html:52 nutrition/forms.py:59
+#: manager/templates/log/add.html:52 nutrition/forms.py:60
#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:102
#: nutrition/models/meal_item.py:72
msgid "Amount"
@@ -2097,6 +1898,10 @@ msgstr ""
msgid "User notes"
msgstr ""
+#: gym/templates/contract/list.html:36
+msgid "Show"
+msgstr "表示"
+
#: gym/templates/contract/view.html:4
msgid "Contract"
msgstr ""
@@ -2175,10 +1980,6 @@ msgstr ""
msgid "Add member"
msgstr "メンバーを追加"
-#: gym/templates/gym/new_user.html:38
-msgid "Date of Birth"
-msgstr ""
-
#: gym/templates/gym/new_user.html:48 manager/templates/calendar/month.html:144
#: manager/templates/log/add.html:75 nutrition/templates/rate/form.html:120
msgid "Info"
@@ -2235,130 +2036,130 @@ msgstr ""
msgid "Edit gym"
msgstr ""
-#: i18n.tpl:2 i18n.tpl:28
+#: i18n.tpl:2
+msgid "Until Failure"
+msgstr ""
+
+#: i18n.tpl:3 manager/forms.py:180 manager/models/log.py:73
+#: manager/templates/set/add.html:53
+msgid "Repetitions"
+msgstr "回数"
+
+#: i18n.tpl:4
msgid "Abs"
msgstr "腹"
-#: i18n.tpl:3
+#: i18n.tpl:5
msgid "Arms"
msgstr "腕"
-#: i18n.tpl:4
-msgid "Back"
-msgstr "背中"
-
-#: i18n.tpl:5 i18n.tpl:23
-msgid "Calves"
-msgstr "ふくらはぎ"
-
-#: i18n.tpl:6 i18n.tpl:26
-msgid "Chest"
-msgstr "胸"
-
-#: i18n.tpl:7
+#: i18n.tpl:6
msgid "Legs"
msgstr "脚"
-#: i18n.tpl:8 i18n.tpl:19
-msgid "Shoulders"
-msgstr "肩"
+#: i18n.tpl:7
+msgid "Dumbbell"
+msgstr "ダンベル"
+
+#: i18n.tpl:8
+#, fuzzy
+#| msgid "Biceps brachii"
+msgid "Biceps"
+msgstr "上腕二頭筋"
#: i18n.tpl:9
-msgid "Barbell"
-msgstr "バーベル"
+msgid "SZ-Bar"
+msgstr "EZバー"
#: i18n.tpl:10
-msgid "Bench"
-msgstr "ベンチ"
+msgid "Kettlebell"
+msgstr "ケトルベル"
#: i18n.tpl:11
-msgid "Dumbbell"
-msgstr "ダンベル"
+msgid "Swiss Ball"
+msgstr "バランスボール"
#: i18n.tpl:12
-msgid "Gym mat"
-msgstr "ジムマット"
+msgid "none (bodyweight exercise)"
+msgstr ""
#: i18n.tpl:13
-msgid "Incline bench"
-msgstr "インクライン・ベンチ"
+msgid "Calves"
+msgstr "ふくらはぎ"
#: i18n.tpl:14
-msgid "Kettlebell"
-msgstr "ケトルベル"
+msgid "Back"
+msgstr "背中"
#: i18n.tpl:15
-msgid "Pull-up bar"
-msgstr "プルアップ・バー"
+msgid "Lower back"
+msgstr ""
#: i18n.tpl:16
-msgid "SZ-Bar"
-msgstr "EZバー"
+msgid "Lats"
+msgstr ""
#: i18n.tpl:17
-msgid "Swiss Ball"
-msgstr "バランスボール"
+msgid "Hamstrings"
+msgstr ""
#: i18n.tpl:18
-msgid "none (bodyweight exercise)"
+msgid "Bench"
+msgstr "ベンチ"
+
+#: i18n.tpl:19
+msgid "Glutes"
msgstr ""
#: i18n.tpl:20
-#, fuzzy
-#| msgid "Biceps brachii"
-msgid "Biceps"
-msgstr "上腕二頭筋"
+msgid "Kilometers"
+msgstr ""
#: i18n.tpl:21
-msgid "Hamstrings"
-msgstr ""
+msgid "Shoulders"
+msgstr "肩"
#: i18n.tpl:22
-msgid "Lower back"
+msgid "Seconds"
msgstr ""
-#: i18n.tpl:24
-msgid "Glutes"
+#: i18n.tpl:23
+msgid "Miles"
msgstr ""
-#: i18n.tpl:25
-msgid "Lats"
-msgstr ""
+#: i18n.tpl:24
+msgid "Incline bench"
+msgstr "インクライン・ベンチ"
-#: i18n.tpl:27
+#: i18n.tpl:25
msgid "Quads"
msgstr ""
-#: i18n.tpl:29
-#, fuzzy
-#| msgid "Triceps brachii"
-msgid "Triceps"
-msgstr "上腕三頭筋"
-
-#: i18n.tpl:30
-msgid "Kilometers"
+#: i18n.tpl:26
+msgid "Minutes"
msgstr ""
-#: i18n.tpl:31
-msgid "Miles"
-msgstr ""
+#: i18n.tpl:27
+msgid "Chest"
+msgstr "胸"
-#: i18n.tpl:32
-msgid "Minutes"
-msgstr ""
+#: i18n.tpl:28
+msgid "Gym mat"
+msgstr "ジムマット"
-#: i18n.tpl:33 manager/forms.py:169 manager/models/log.py:71
-#: manager/templates/set/add.html:53
-msgid "Repetitions"
-msgstr "回数"
+#: i18n.tpl:29
+msgid "Pull-up bar"
+msgstr "プルアップ・バー"
-#: i18n.tpl:34
-msgid "Seconds"
-msgstr ""
+#: i18n.tpl:30
+msgid "Barbell"
+msgstr "バーベル"
-#: i18n.tpl:35
-msgid "Until Failure"
-msgstr ""
+#: i18n.tpl:31
+#, fuzzy
+#| msgid "Triceps brachii"
+msgid "Triceps"
+msgstr "上腕三頭筋"
#: mailer/forms.py:34 mailer/templates/mailer/gym/preview.html:32
msgctxt "As in \"email subject\""
@@ -2411,44 +2212,44 @@ msgstr ""
msgid "Correction"
msgstr ""
-#: manager/forms.py:89 manager/models/workout.py:59
+#: manager/forms.py:92 manager/models/workout.py:59
msgid "The name of the workout"
msgstr ""
-#: manager/forms.py:93 manager/models/workout.py:66
+#: manager/forms.py:96 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
+#: manager/forms.py:137
msgid ""
"You can search for more than one exercise, they will be grouped together for "
"a superset."
msgstr ""
-#: 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
+#: manager/forms.py:166 manager/forms.py:171 manager/models/log.py:64
+#: manager/models/log.py:92 manager/models/setting.py:59
+#: manager/models/setting.py:90 manager/templates/log/add.html:53
+#: manager/templates/log/add.html:55 manager/templates/set/formset.html:10
+#: manager/templates/set/formset.html:12 measurements/models/category.py:58
+#: nutrition/forms.py:64
msgid "Unit"
msgstr "単位"
-#: manager/forms.py:266
+#: manager/forms.py:277
msgid "Type"
msgstr ""
-#: manager/forms.py:267 manager/templates/workout/view.html:157
+#: manager/forms.py:278 manager/templates/workout/view.html:157
msgid "Table"
msgstr ""
-#: manager/forms.py:269 manager/templates/workout/view.html:163
+#: manager/forms.py:280 manager/templates/workout/view.html:163
msgid "with images"
msgstr ""
-#: manager/forms.py:270 manager/templates/workout/view.html:169
+#: manager/forms.py:281 manager/templates/workout/view.html:169
msgid "with comments"
msgstr ""
@@ -2500,7 +2301,7 @@ msgid "The duration in weeks"
msgstr ""
#: manager/models/schedule_step.py:63 manager/models/set.py:52
-#: manager/models/setting.py:98 nutrition/models/meal.py:54
+#: manager/models/setting.py:110 nutrition/models/meal.py:54
#: nutrition/models/meal_item.py:65
msgid "Order"
msgstr ""
@@ -2551,7 +2352,7 @@ msgstr ""
msgid "Number of sets"
msgstr "セット数"
-#: manager/models/setting.py:43
+#: manager/models/setting.py:48
msgid "Sets"
msgstr "セット"
@@ -2805,6 +2606,13 @@ msgid ""
"option in your settings."
msgstr ""
+#: manager/templates/workout/email_reminder.tpl:15
+#: manager/templates/workout/email_weight_reminder.tpl:12
+#: nutrition/templates/ingredient/email_new.tpl:9
+#, python-format
+msgid "The %(site)s team"
+msgstr ""
+
#: manager/templates/workout/email_weight_reminder.tpl:3
#, python-format
msgid ""
@@ -2817,6 +2625,10 @@ msgid ""
"You will regularly receive such reminders till you enter your current weight."
msgstr ""
+#: manager/templates/workout/log.html:10 manager/templates/workout/log.html:11
+msgid "Weight log"
+msgstr ""
+
#: manager/templates/workout/log.html:29
msgid "Weight log for workout"
msgstr ""
@@ -2915,7 +2727,7 @@ msgstr ""
msgid "Edit workout"
msgstr ""
-#: manager/templates/workout/view.html:225 manager/views/workout.py:300
+#: manager/templates/workout/view.html:225 manager/views/workout.py:301
msgid "Mark as template"
msgstr ""
@@ -2923,11 +2735,6 @@ msgstr ""
msgid "Add workout day"
msgstr ""
-#: manager/views/log.py:92
-#, python-format
-msgid "Edit log entry for %s"
-msgstr ""
-
#: manager/views/log.py:111
msgid "Delete workout log"
msgstr ""
@@ -2945,11 +2752,11 @@ msgstr ""
msgid "Your workouts"
msgstr ""
-#: manager/views/workout.py:227
+#: manager/views/workout.py:228
msgid "Copy workout"
msgstr ""
-#: manager/views/workout.py:230
+#: manager/views/workout.py:231
msgid "Copy"
msgstr "コピー"
@@ -2971,29 +2778,29 @@ msgstr ""
msgid "Value"
msgstr ""
-#: nutrition/forms.py:122
+#: nutrition/forms.py:123
msgid "Calculate"
msgstr ""
-#: nutrition/forms.py:195 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:196 nutrition/templates/rate/form.html:76
msgid "Basic caloric intake"
msgstr "基礎カロリー摂取量"
-#: nutrition/forms.py:196
+#: nutrition/forms.py:197
msgid "Your basic caloric intake as calculated for your data"
msgstr ""
-#: nutrition/forms.py:202
+#: nutrition/forms.py:203
msgid "Additional calories"
msgstr ""
-#: nutrition/forms.py:204
+#: nutrition/forms.py:205
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
msgstr ""
-#: nutrition/forms.py:232 nutrition/models/ingredient_weight_unit.py:39
+#: nutrition/forms.py:233 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"
@@ -3056,7 +2863,7 @@ msgid ""
"{energy_approx}%)"
msgstr ""
-#: nutrition/models/ingredient.py:357 nutrition/views/ingredient.py:225
+#: nutrition/models/ingredient.py:357 nutrition/views/ingredient.py:219
msgid "Ingredient was successfully added to the general database"
msgstr ""
@@ -3085,6 +2892,10 @@ msgstr ""
msgid "Meal"
msgstr ""
+#: nutrition/models/log.py:65
+msgid "Date and Time (Approx.)"
+msgstr ""
+
#: nutrition/models/meal.py:61
msgid "Time (approx)"
msgstr ""
@@ -3176,6 +2987,10 @@ msgid ""
"added to nutrition plans. You can access it on this address:"
msgstr ""
+#: nutrition/templates/ingredient/email_new.tpl:8
+msgid "Thank you for contributing and making this site better!"
+msgstr ""
+
#: nutrition/templates/ingredient/form.html:4
msgid "Submitting an ingredient"
msgstr ""
@@ -3200,6 +3015,10 @@ msgstr ""
msgid "No ingredients."
msgstr ""
+#: nutrition/templates/ingredient/overview.html:57
+msgid "Search"
+msgstr ""
+
#: nutrition/templates/ingredient/overview.html:66
msgid "ingredient name"
msgstr ""
@@ -3209,6 +3028,14 @@ msgstr ""
msgid "Add ingredient"
msgstr ""
+#: nutrition/templates/ingredient/overview.html:85
+msgid "Only registered users can do this"
+msgstr ""
+
+#: nutrition/templates/ingredient/pending.html:14
+msgid "Submission date"
+msgstr ""
+
#: nutrition/templates/ingredient/view.html:27
msgid "Ingredient is pending review"
msgstr ""
@@ -3221,6 +3048,18 @@ msgid ""
"the search."
msgstr ""
+#: nutrition/templates/ingredient/view.html:31
+msgid "Please select one of the options below."
+msgstr ""
+
+#: nutrition/templates/ingredient/view.html:38
+msgid "Accept"
+msgstr ""
+
+#: nutrition/templates/ingredient/view.html:42
+msgid "Decline"
+msgstr ""
+
#: nutrition/templates/ingredient/view.html:71
#: nutrition/templates/log/detail.html:31
#: nutrition/templates/plan/view.html:229 nutrition/views/plan.py:376
@@ -3461,14 +3300,18 @@ msgid ""
"yourself for some weeks and change the total amount if needed."
msgstr ""
-#: nutrition/views/ingredient.py:181
+#: nutrition/views/ingredient.py:175
msgid "Add a new ingredient"
msgstr ""
-#: nutrition/views/ingredient.py:238
+#: nutrition/views/ingredient.py:232
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 ""
@@ -3685,29 +3528,29 @@ msgstr ""
msgid "100%% Free <br>and <br>Open Source"
msgstr ""
-#: utils/generic_views.py:261
+#: utils/generic_views.py:262
msgid "Yes, delete"
msgstr ""
-#: utils/models.py:47
+#: utils/models.py:48
msgid "Author"
msgstr ""
-#: utils/models.py:52
+#: utils/models.py:53
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:77
+#: utils/models.py:78
msgid "Pending"
msgstr ""
-#: utils/models.py:78
+#: utils/models.py:79
msgid "Accepted"
msgstr ""
-#: utils/models.py:79
+#: utils/models.py:80
msgid "Declined"
msgstr ""
@@ -3848,6 +3691,18 @@ msgstr ""
msgid "Delete weight entry for the %s"
msgstr ""
+#~ msgid "Ingredients"
+#~ msgstr "材料"
+
+#, fuzzy
+#~| msgid "Add one now."
+#~ msgid "Add new video"
+#~ msgstr "今すぐ追加する"
+
+#, python-brace-format
+#~ msgid "Correct {0}"
+#~ msgstr "{0}を訂正する"
+
#~ msgid "Anterior deltoid"
#~ msgstr "三角筋前部"
diff --git a/wger/locale/ko/LC_MESSAGES/django.po b/wger/locale/ko/LC_MESSAGES/django.po
index 53090c332..72ce700c2 100644
--- a/wger/locale/ko/LC_MESSAGES/django.po
+++ b/wger/locale/ko/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: wger Workout Manager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-14 12:01+0200\n"
+"POT-Creation-Date: 2022-11-10 16:03+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"
@@ -31,102 +31,8 @@ msgstr ""
"이 설치에 대한 기본 Gym을 선택하십시오. 새로 등록된 모든 사용자가 이 Gym에 할"
"당되고, Gym이 없는 모든 기존 사용자가 업데이트됩니다."
-#: 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:226
-msgid "Languages"
-msgstr "언어"
-
-#: config/templates/language/overview.html:16
-msgid "Nothing found."
-msgstr "찾을 수 없음."
-
-#: 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:150
-#: nutrition/templates/plan/view.html:153
-#: nutrition/templates/plan/view.html:191
-msgid "Add one now."
-msgstr "추가하세요."
-
-#: config/templates/language/overview.html:29
-#: core/templates/license/list.html:38 core/templates/misc/license/list.html:41
-#: core/templates/repetition_unit/list.html:41
-#: core/templates/user/overview.html:327 core/templates/user/overview.html:366
-#: core/templates/user/overview.html:402
-#: core/templates/weight_unit/list.html:41 core/views/languages.py:73
-#: core/views/license.py:65 core/views/repetition_units.py:65
-#: core/views/weight_units.py:65
-#: exercises/templates/categories/admin-overview.html:36
-#: 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:61
-msgid "Add"
-msgstr "추가"
-
-#: 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/language.py:32
-msgid "Language full name"
-msgstr "언어명"
-
-#: config/templates/language/view.html:34 core/templates/user/overview.html:451
-#: gym/views/admin_config.py:44 gym/views/admin_config.py:58
-#: gym/views/user_config.py:46
-msgid "Configuration"
-msgstr "설정"
-
-#: config/templates/language/view.html:35
-msgid ""
-"Use the configuration to select in what languages the\n"
-"exercises and ingredients will be shown for the current language (for "
-"example\n"
-"the exercises should be shown in languages A, B and C; the ingredients only\n"
-"in A)."
-msgstr ""
-
-#: config/templates/language/view.html:44 gym/templates/contract/list.html:36
-msgid "Show"
-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: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:45
-msgid "Options"
-msgstr "옵션"
-
-#: config/templates/language/view.html:96 config/views/gym_config.py:41
-#: config/views/language_config.py:49 core/templates/license/list.html:16
-#: core/templates/misc/license/list.html:17
+#: config/views/gym_config.py:41 core/templates/language/view.html:57
+#: 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:39
#: core/templates/tags/render_day.html:75 core/templates/user/overview.html:205
@@ -134,12 +40,10 @@ 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:230
-#: exercises/templates/exercise/view.html:351
#: exercises/templates/muscles/admin-overview.html:16
-#: 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
+#: 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
#: 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,81 +59,54 @@ msgstr "옵션"
msgid "Edit"
msgstr "수정"
-#: 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: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: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
-#: gym/templates/contract_type/list.html:39 gym/templates/document/list.html:46
-#: gym/templates/gym/list.html:20 manager/templates/calendar/day.html:69
-#: 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:231
-#: 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:132
-#: nutrition/templates/units/list.html:20
-msgid "Delete"
-msgstr "삭제"
-
-#: core/demo.py:86
+#: core/demo.py:95
msgid "Sample workout"
msgstr "샘플 Workout"
-#: core/demo.py:90
+#: core/demo.py:99
msgid "Sample day"
msgstr "예시 일"
-#: core/demo.py:94
+#: core/demo.py:103
msgid "Another sample day"
msgstr "다른 예시 일"
-#: core/demo.py:217
-msgid "Sample nutrional plan"
+#: core/demo.py:211
+#, fuzzy
+#| msgid "Sample nutrional plan"
+msgid "Sample nutritional plan"
msgstr "영양 섭취 계획 예시"
-#: core/demo.py:349 core/demo.py:351 core/demo.py:353
+#: core/demo.py:343 core/demo.py:345 core/demo.py:347
#, python-brace-format
msgid "Placeholder workout nr {0} for schedule"
msgstr ""
-#: core/demo.py:358
+#: core/demo.py:352
msgid "My cool workout schedule"
msgstr ""
-#: core/demo.py:397 core/demo.py:412
+#: core/demo.py:391 core/demo.py:406
msgid "Empty placeholder schedule"
msgstr ""
-#: core/forms.py:61 core/templates/navigation.html:188
-#: core/templates/navigation.html:192 core/templates/user/login.html:4
+#: core/forms.py:64 core/templates/navigation.html:179
+#: core/templates/navigation.html:183 core/templates/user/login.html:4
#: software/templates/features.html:43
msgid "Login"
msgstr "로그인"
-#: core/forms.py:73 core/forms.py:164 gym/views/export.py:63
+#: core/forms.py:76 core/forms.py:177 gym/views/export.py:63
#: gym/views/gym.py:218
msgid "First name"
msgstr "이름"
-#: core/forms.py:74 core/forms.py:165 core/templates/user/overview.html:267
+#: core/forms.py:77 core/forms.py:178 core/templates/user/overview.html:267
#: gym/views/export.py:64 gym/views/gym.py:218
msgid "Last name"
msgstr "성"
-#: core/forms.py:76 core/forms.py:131 core/templates/user/overview.html:271
+#: core/forms.py:79 core/forms.py:144 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
@@ -239,81 +116,111 @@ msgstr "성"
msgid "Email"
msgstr "이메일"
-#: core/forms.py:77
+#: core/forms.py:80
#, fuzzy
#| msgid "Used for password resets and, optionally, email reminders."
msgid "Used for password resets and, optionally, e-mail reminders."
msgstr "비밀번호 재설정 및 이메일 알람(option)에 사용됩니다."
-#: core/forms.py:102
+#: core/forms.py:84 core/models/profile.py:220
+#: gym/templates/gym/new_user.html:38
+msgid "Date of Birth"
+msgstr "생일"
+
+#: core/forms.py:116
msgid "Personal data"
msgstr "개인 정보"
-#: core/forms.py:110
+#: core/forms.py:124
msgid "Workout reminders"
msgstr "Workout 리마인더"
-#: core/forms.py:117
+#: core/forms.py:131
msgid "Other settings"
msgstr "기타 설정"
-#: 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
+#: core/forms.py:138 core/views/user.py:615 core/views/user.py:630
+#: core/views/user.py:642 gym/forms.py:72 manager/templates/log/add.html:65
+#: manager/templates/set/add.html:69 manager/views/workout.py:222
+#: utils/generic_views.py:143
msgid "Save"
msgstr "저장"
-#: core/forms.py:132
+#: core/forms.py:145
msgid "Used for password resets and, optionally, email reminders."
msgstr "비밀번호 재설정 및 이메일 알람(option)에 사용됩니다."
-#: core/forms.py:160
+#: core/forms.py:173
#, fuzzy
#| msgid "This email is already used."
msgid "This e-mail address is already in use."
msgstr "이 이메일은 사용중입니다."
-#: core/forms.py:180 gym/templates/gym/new_user.html:26
+#: core/forms.py:193 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:182
+#: core/forms.py:195
msgid "Please enter your current password."
msgstr "현재 비밀번호를 입력해주세요."
-#: core/forms.py:200
+#: core/forms.py:204 core/templates/language/view.html:62
+#: 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: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/muscles/admin-overview.html:17
+#: gym/templates/admin_notes/list.html:40
+#: gym/templates/contract_option/list.html:39
+#: gym/templates/contract_type/list.html:39 gym/templates/document/list.html:46
+#: gym/templates/gym/list.html:20 manager/templates/calendar/day.html:69
+#: 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:231
+#: 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:132
+#: nutrition/templates/units/list.html:20
+msgid "Delete"
+msgstr "삭제"
+
+#: core/forms.py:213
msgid "Invalid password"
msgstr "유효하지 않은 비밀번호"
-#: core/forms.py:212 core/forms.py:278
+#: core/forms.py:225 core/forms.py:291
msgid "The form is secured with reCAPTCHA"
msgstr ""
-#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:188
-#: core/templates/navigation.html:193 core/templates/template.html:149
-#: core/templates/user/login.html:20 core/views/user.py:293
+#: core/forms.py:239 core/forms.py:258 core/templates/navigation.html:179
+#: core/templates/navigation.html:184 core/templates/template.html:149
+#: core/templates/user/login.html:20 core/views/user.py:300
#: software/templates/features.html:38
msgid "Register"
msgstr "등록"
-#: core/forms.py:256
+#: core/forms.py:269
msgid "Contact"
msgstr "연락"
-#: core/forms.py:257
+#: core/forms.py:270
#, fuzzy
#| msgid "Some way of answering you (email, etc.)"
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:71
+#: core/forms.py:278 exercises/models/comment.py:42 manager/models/set.py:60
+#: manager/models/setting.py:111 nutrition/models/log.py:71
msgid "Comment"
msgstr "Comment"
-#: core/forms.py:266
+#: core/forms.py:279
msgid "What do you want to say?"
msgstr ""
@@ -321,6 +228,14 @@ msgstr ""
msgid "Day of the week"
msgstr ""
+#: core/models/language.py:31 core/templates/language/view.html:21
+msgid "Language short name"
+msgstr "언어 코드"
+
+#: core/models/language.py:36 core/templates/language/view.html:22
+msgid "Language full name"
+msgstr "언어명"
+
#: core/models/license.py:29
msgid "Full name"
msgstr ""
@@ -376,19 +291,19 @@ msgstr "미터법 (kg)"
msgid "Imperial (pound)"
msgstr "야드파운드법 (pound)"
-#: core/models/profile.py:111
+#: core/models/profile.py:114
msgid "Show exercise comments"
msgstr ""
-#: core/models/profile.py:112
+#: core/models/profile.py:115
msgid "Check to show exercise comments on the workout view"
msgstr ""
-#: core/models/profile.py:123
+#: core/models/profile.py:126
msgid "Also use ingredients in English"
msgstr ""
-#: core/models/profile.py:125
+#: core/models/profile.py:128
msgid ""
"Check to also show ingredients in English while creating\n"
"a nutritional plan. These ingredients are extracted from a list provided\n"
@@ -396,130 +311,129 @@ msgid ""
"7000 entries, but can be somewhat overwhelming and make the search difficult."
msgstr ""
-#: core/models/profile.py:134
+#: core/models/profile.py:137
msgid "Activate workout reminders"
msgstr "Workout 리마인더 활성화"
-#: core/models/profile.py:136
+#: core/models/profile.py:139
msgid ""
"Check to activate automatic reminders for workouts. You need to provide a "
"valid email for this to work."
msgstr ""
-#: core/models/profile.py:145
+#: core/models/profile.py:148
msgid "Remind before expiration"
msgstr ""
-#: core/models/profile.py:146
+#: core/models/profile.py:149
msgid "The number of days you want to be reminded before a workout expires."
msgstr ""
-#: core/models/profile.py:152
+#: core/models/profile.py:155
msgid "Default duration of workouts"
msgstr ""
-#: core/models/profile.py:154
+#: core/models/profile.py:157
msgid ""
"Default duration in weeks of workouts not in a schedule. Used for email "
"workout reminders."
msgstr ""
-#: core/models/profile.py:171
+#: core/models/profile.py:174
msgid "Notification language"
msgstr "알람 언어"
-#: core/models/profile.py:173
+#: core/models/profile.py:176
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/profile.py:186 gym/views/export.py:66
+#: core/models/profile.py:212 gym/views/export.py:66
msgid "Age"
msgstr "나이"
-#: core/models/profile.py:202 nutrition/forms.py:99
+#: core/models/profile.py:228 nutrition/forms.py:100
msgid "Height (cm)"
msgstr "키 (cm)"
-#: core/models/profile.py:219
+#: core/models/profile.py:245
msgid "Hours of sleep"
msgstr "수면시간"
-#: core/models/profile.py:220
+#: core/models/profile.py:246
msgid "The average hours of sleep per day"
msgstr "일 평균 수면시간"
-#: core/models/profile.py:229
+#: core/models/profile.py:255
msgid "Work"
msgstr "운동"
-#: core/models/profile.py:230 core/models/profile.py:272
+#: core/models/profile.py:256 core/models/profile.py:298
msgid "Average hours per day"
msgstr ""
-#: core/models/profile.py:239 core/models/profile.py:260
-#: core/models/profile.py:281
+#: core/models/profile.py:265 core/models/profile.py:286
+#: core/models/profile.py:307
msgid "Physical intensity"
msgstr ""
-#: core/models/profile.py:240 core/models/profile.py:261
-#: core/models/profile.py:282
+#: core/models/profile.py:266 core/models/profile.py:287
+#: core/models/profile.py:308
msgid "Approximately"
msgstr ""
-#: core/models/profile.py:250
+#: core/models/profile.py:276
msgid "Sport"
msgstr ""
-#: core/models/profile.py:251
+#: core/models/profile.py:277
msgid "Average hours per week"
msgstr ""
-#: core/models/profile.py:271
+#: core/models/profile.py:297
msgid "Free time"
msgstr ""
-#: core/models/profile.py:292 nutrition/templates/rate/form.html:66
+#: core/models/profile.py:318 nutrition/templates/rate/form.html:66
msgid "Total daily calories"
msgstr ""
-#: core/models/profile.py:293
+#: core/models/profile.py:319
msgid "Total caloric intake, including e.g. any surplus"
msgstr ""
-#: core/models/profile.py:305 nutrition/models/ingredient_weight_unit.py:45
+#: core/models/profile.py:331 nutrition/models/ingredient_weight_unit.py:45
#: nutrition/models/log.py:90 nutrition/models/meal_item.py:58
msgid "Weight unit"
msgstr ""
-#: core/models/profile.py:313
+#: core/models/profile.py:339
msgid "Allow external access"
msgstr ""
-#: core/models/profile.py:315
+#: core/models/profile.py:341
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/profile.py:324
+#: core/models/profile.py:350
msgid "Automatic reminders for weight entries"
msgstr ""
-#: core/models/profile.py:326
+#: core/models/profile.py:352
msgid "Number of days after the last weight entry (enter 0 to deactivate)"
msgstr ""
-#: core/models/profile.py:392
+#: core/models/profile.py:418
msgid "The sum of all hours has to be 24"
msgstr ""
#: core/models/rep_unit.py:35 core/models/weight_unit.py:35
-#: core/templates/user/overview.html:263 core/views/user.py:575
+#: core/templates/user/overview.html:263 core/views/user.py:591
#: 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
+#: exercises/models/exercise.py:64 exercises/models/muscle.py:36
#: 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
@@ -578,6 +492,53 @@ msgstr ""
msgid "Are you sure you want to delete this? This action cannot be undone."
msgstr ""
+#: core/templates/email_verification/confirm_template.html:4
+msgid "Email verified"
+msgstr ""
+
+#: core/templates/email_verification/confirm_template.html:18
+#, python-format
+msgid "%(username)s, your email was verified"
+msgstr ""
+
+#: core/templates/email_verification/confirm_template.html:22
+msgid "Error, invalid verification token"
+msgstr ""
+
+#: core/templates/email_verification/email_body_html.tpl:6
+#, fuzzy
+#| msgid "Configuration"
+msgid "Email Confirmation"
+msgstr "설정"
+
+#: core/templates/email_verification/email_body_html.tpl:9
+#: core/templates/email_verification/email_body_txt.tpl:3
+#, fuzzy, python-format
+#| msgid "Calendar for %(username)s"
+msgid "You are almost there, %(username)s!"
+msgstr "달력 (%(username)s)"
+
+#: core/templates/email_verification/email_body_html.tpl:11
+#, python-format
+msgid "Please click <a href=\"%(link)s\">here</a> to confirm your email"
+msgstr ""
+
+#: core/templates/email_verification/email_body_html.tpl:12
+#: core/templates/email_verification/email_body_txt.tpl:5
+#, python-format
+msgid "The token expires on %(time)s"
+msgstr ""
+
+#: core/templates/email_verification/email_body_html.tpl:14
+#: core/templates/email_verification/email_body_txt.tpl:8
+msgid "the wger Team"
+msgstr ""
+
+#: core/templates/email_verification/email_body_txt.tpl:4
+#, python-format
+msgid "Please click the following link to confirm your email: %(link)s"
+msgstr ""
+
#: core/templates/index.html:4
msgid "Dashboard"
msgstr "대시보드"
@@ -634,7 +595,7 @@ msgid "Add custom diary entry"
msgstr ""
#: core/templates/index.html:84 core/templates/index.html:92
-#: manager/models/day.py:34 manager/models/log.py:56
+#: manager/models/day.py:34 manager/models/log.py:58
#: manager/models/session.py:60 manager/models/workout.py:109
#: manager/templates/schedule/view.html:105
#: manager/templates/workout/view.html:11
@@ -665,6 +626,20 @@ msgstr ""
msgid "No workouts found."
msgstr "Workout을 찾을 수 없음."
+#: core/templates/index.html:137 core/templates/index.html:189
+#: core/templates/language/overview.html:23
+#: 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:150
+#: nutrition/templates/plan/view.html:153
+#: nutrition/templates/plan/view.html:191
+msgid "Add one now."
+msgstr "추가하세요."
+
#: 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
@@ -718,19 +693,59 @@ msgid "No nutrition plans."
msgstr ""
#: 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
+#: core/templates/user/overview.html:121 manager/forms.py:184
+#: manager/helpers.py:89 manager/models/log.py:86 manager/models/setting.py:79
+#: manager/templates/log/add.html:54 manager/templates/set/formset.html:11
#: weight/models.py: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:210 core/templates/navigation.html:135
+#: core/templates/index.html:210 core/templates/navigation.html:126
#: weight/views.py:70
msgid "Add weight entry"
msgstr "체중 기록 추가"
+#: core/templates/language/overview.html:4 core/templates/navigation.html:217
+msgid "Languages"
+msgstr "언어"
+
+#: core/templates/language/overview.html:23
+msgid "Nothing found."
+msgstr "찾을 수 없음."
+
+#: core/templates/language/overview.html:36 core/templates/license/list.html:38
+#: core/templates/misc/license/list.html:41
+#: core/templates/repetition_unit/list.html:41
+#: core/templates/user/overview.html:327 core/templates/user/overview.html:366
+#: core/templates/user/overview.html:402
+#: core/templates/weight_unit/list.html:41 core/views/languages.py:73
+#: core/views/license.py:65 core/views/repetition_units.py:65
+#: core/views/weight_units.py:65
+#: exercises/templates/categories/admin-overview.html:36
+#: 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:61
+msgid "Add"
+msgstr "추가"
+
+#: core/templates/language/view.html:52 core/templates/user/api_key.html:44
+#: core/templates/user/preferences.html:44 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:45
+msgid "Options"
+msgstr "옵션"
+
#: core/templates/license/list.html:4 core/templates/misc/license/list.html:4
msgid "License list"
msgstr "라이센스 리스트"
@@ -743,7 +758,6 @@ msgstr "라이센스 리스트"
#: core/templates/weight_unit/list.html:26
#: exercises/templates/categories/admin-overview.html:24
#: exercises/templates/equipment/admin-overview.html:24
-#: exercises/templates/exercise/pending.html:30
#: exercises/templates/muscles/admin-overview.html:24
#: gym/templates/admin_notes/list.html:52 gym/templates/contract/list.html:60
#: gym/templates/contract_option/list.html:56
@@ -825,155 +839,135 @@ msgstr "일정"
msgid "Public templates"
msgstr ""
-#: core/templates/navigation.html:64
-msgctxt "as in sorted by category"
-msgid "by category"
-msgstr "by 카테고리"
-
-#: core/templates/navigation.html:65
-msgctxt "as in sorted by muscle"
-msgid "by muscle"
-msgstr "by 근육"
-
-#: core/templates/navigation.html:66
-msgctxt "as in sorted by equipment"
-msgid "by equipment"
-msgstr "by 장비"
-
-#: core/templates/navigation.html:70
-#: exercises/templates/equipment/overview.html:109
-#: exercises/templates/equipment/overview.html:113
-#: exercises/templates/exercise/overview.html:112
-#: exercises/templates/exercise/overview.html:116
-#: exercises/templates/muscles/overview.html:112
-#: exercises/templates/muscles/overview.html:116
-msgid "Add new exercise"
-msgstr "새 Exercise 추가"
+#: core/templates/navigation.html:63 manager/forms.py:133
+#: manager/models/setting.py:54
+msgid "Exercises"
+msgstr "운동"
-#: core/templates/navigation.html:75 core/templates/navigation.html:116
-#: core/templates/navigation.html:224
+#: core/templates/navigation.html:67 core/templates/navigation.html:107
+#: core/templates/navigation.html:215
msgid "Administration"
msgstr ""
-#: core/templates/navigation.html:76
-#: exercises/templates/exercise/pending.html:6
-msgid "Exercises pending review"
-msgstr ""
+#: core/templates/navigation.html:68
+#, fuzzy
+#| msgid "Exercise day"
+msgid "Exercise edit history"
+msgstr "운동한 날"
-#: core/templates/navigation.html:77 exercises/models/base.py:72
-#: exercises/templates/exercise/view.html:80
+#: core/templates/navigation.html:69 exercises/models/base.py:84
msgid "Equipment"
msgstr ""
-#: core/templates/navigation.html:78 exercises/templates/exercise/view.html:258
+#: core/templates/navigation.html:70
msgid "Muscles"
msgstr ""
-#: core/templates/navigation.html:79
+#: core/templates/navigation.html:71
#: exercises/templates/categories/admin-overview.html:4
msgid "Categories"
msgstr ""
-#: core/templates/navigation.html:93 software/templates/features.html:87
+#: core/templates/navigation.html:84 software/templates/features.html:87
msgid "Nutrition"
msgstr "영양"
-#: core/templates/navigation.html:99 core/templates/user/overview.html:144
+#: core/templates/navigation.html:90 core/templates/user/overview.html:144
msgid "Nutrition plans"
msgstr ""
-#: core/templates/navigation.html:105 nutrition/templates/bmi/form.html:50
+#: core/templates/navigation.html:96 nutrition/templates/bmi/form.html:50
msgid "BMI calculator"
msgstr ""
-#: core/templates/navigation.html:111 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:102 nutrition/templates/rate/form.html:17
msgid "Daily calories calculator"
msgstr ""
-#: core/templates/navigation.html:113
+#: core/templates/navigation.html:104
#: nutrition/templates/ingredient/overview.html:29
msgid "Ingredient overview"
msgstr ""
-#: core/templates/navigation.html:117 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:108 nutrition/templates/units/list.html:6
msgid "Ingredient weight units"
msgstr ""
-#: core/templates/navigation.html:118
+#: core/templates/navigation.html:109
#: nutrition/templates/ingredient/pending.html:6
msgid "Ingredients pending review"
msgstr ""
-#: core/templates/navigation.html:132
+#: core/templates/navigation.html:123
msgid "Body weight"
msgstr "체중"
-#: core/templates/navigation.html:134 core/templates/user/overview.html:114
+#: core/templates/navigation.html:125 core/templates/user/overview.html:114
#: weight/templates/overview.html:7
msgid "Weight overview"
msgstr "체중 개요"
-#: core/templates/navigation.html:147
+#: core/templates/navigation.html:138
msgid "About this software"
msgstr ""
-#: core/templates/navigation.html:149 core/templates/template_features.html:82
+#: core/templates/navigation.html:140 core/templates/template_features.html:82
#: software/templates/about_us.html:5
msgid "About us"
msgstr ""
-#: core/templates/navigation.html:151 software/templates/features.html:209
+#: core/templates/navigation.html:142 software/templates/features.html:209
msgid "REST API"
msgstr ""
-#: core/templates/navigation.html:155 utils/models.py:40
+#: core/templates/navigation.html:146 utils/models.py:41
msgid "License"
msgstr ""
-#: core/templates/navigation.html:161
+#: core/templates/navigation.html:152
msgid "Developer documentation"
msgstr ""
-#: core/templates/navigation.html:167
+#: core/templates/navigation.html:158
msgid "Get the code"
msgstr ""
-#: core/templates/navigation.html:173 core/templates/template.html:204
+#: core/templates/navigation.html:164 core/templates/template.html:203
#: core/templates/template_features.html:99
msgid "Translate"
msgstr ""
-#: core/templates/navigation.html:194 core/templates/user/login.html:28
+#: core/templates/navigation.html:185 core/templates/user/login.html:28
msgid "Reset password"
msgstr ""
-#: core/templates/navigation.html:207
+#: core/templates/navigation.html:198
msgid "My preferences"
msgstr "내 환경설정"
-#: core/templates/navigation.html:214
+#: core/templates/navigation.html:205
msgid "Logout"
msgstr "로그아웃"
-#: core/templates/navigation.html:229
+#: core/templates/navigation.html:220
msgid "Licenses"
msgstr ""
-#: core/templates/navigation.html:232
+#: core/templates/navigation.html:223
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr ""
-#: core/templates/navigation.html:235 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:226 core/templates/weight_unit/list.html:4
#: nutrition/templates/ingredient/view.html:174
msgid "Weight units"
msgstr "무게 단위"
-#: core/templates/navigation.html:238 core/templates/user/list.html:4
+#: core/templates/navigation.html:229 core/templates/user/list.html:4
msgid "User list"
msgstr "사용자 리스트"
-#: core/templates/navigation.html:239
+#: core/templates/navigation.html:230
msgid "Gyms"
msgstr "Gyms"
@@ -1048,33 +1042,30 @@ msgstr ""
msgid "Add weight log"
msgstr "체중 기록 추가"
-#: core/templates/tags/render_day.html:114
-#: exercises/templates/equipment/overview.html:59
-#: exercises/templates/exercise/overview.html:63
-#: exercises/templates/muscles/overview.html:65
+#: core/templates/tags/render_day.html:116
msgid "Placeholder image for exercise"
msgstr ""
-#: core/templates/tags/render_day.html:131
+#: core/templates/tags/render_day.html:133
msgid "This exercise has no repetitions."
msgstr ""
-#: core/templates/tags/render_day.html:134
+#: core/templates/tags/render_day.html:136
msgid "Edit them now."
msgstr ""
-#: core/templates/tags/render_day.html:159
+#: core/templates/tags/render_day.html:162
msgid "Add exercises to this workout day"
msgstr ""
#: core/templates/tags/render_weight_log.html:17 manager/helpers.py:89
-#: manager/models/setting.py:57 manager/templates/set/formset.html:10
+#: manager/models/setting.py:69 manager/templates/set/formset.html:9
msgid "Reps"
msgstr ""
-#: 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
+#: core/templates/tags/render_weight_log.html:30 manager/forms.py:189
+#: manager/models/log.py:103 manager/models/setting.py:99
+#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
msgid "RiR"
msgstr ""
@@ -1097,7 +1088,7 @@ msgstr ""
msgid "Features"
msgstr ""
-#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:37
+#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:53
msgid "API key"
msgstr ""
@@ -1137,11 +1128,12 @@ msgid "Documentation"
msgstr ""
#: core/templates/user/delete_account.html:4
-#: core/templates/user/preferences.html:42
+#: core/templates/user/preferences.html:58
msgid "Delete account"
msgstr ""
#: core/templates/user/delete_account.html:17
+#: exercises/templates/history/overview.html:93
msgid "Are you sure?"
msgstr ""
@@ -1189,11 +1181,12 @@ msgstr "Workout 추가"
#: core/templates/user/overview.html:34 core/templates/user/overview.html:76
#: core/templates/user/overview.html:120 core/templates/user/overview.html: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
-#: 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
+#: exercises/models/base.py:99 exercises/models/base.py:104
+#: exercises/models/exercise.py:69 exercises/models/exercise.py:76
+#: gallery/models/image.py:47 manager/helpers.py:88 manager/models/log.py:100
+#: 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/views.py:150
@@ -1201,11 +1194,11 @@ msgid "Date"
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: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
+#: exercises/models/exercise.py:57 exercises/views/exercises.py:123
+#: 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 ""
@@ -1213,12 +1206,12 @@ msgstr ""
msgid "Number of logs (days)"
msgstr ""
-#: core/templates/user/overview.html:37 core/views/user.py:576
+#: core/templates/user/overview.html:37 core/views/user.py:592
#: 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:267
+#: core/templates/user/overview.html:68 manager/forms.py:278
#: manager/templates/workout/view.html:151
msgid "Log"
msgstr ""
@@ -1236,6 +1229,7 @@ msgid "Notes"
msgstr ""
#: core/templates/user/overview.html:79
+#: exercises/templates/history/overview.html:30
#: manager/templates/calendar/partial_overview_table.html:42
#: nutrition/templates/log/detail.html:154
msgid "Time"
@@ -1283,10 +1277,12 @@ msgid "Do you really want to change this user&#39;s password?"
msgstr ""
#: core/templates/user/overview.html:233
+#: exercises/templates/history/overview.html:106
msgid "No"
msgstr ""
#: core/templates/user/overview.html:234
+#: exercises/templates/history/overview.html:99
msgid "Yes"
msgstr ""
@@ -1341,10 +1337,15 @@ msgid "Documents"
msgstr ""
#: core/templates/user/overview.html:413 gym/templates/document/list.html:32
-#: manager/forms.py:279 manager/templates/workout/view.html:176
+#: manager/forms.py:290 manager/templates/workout/view.html:176
msgid "Download"
msgstr ""
+#: core/templates/user/overview.html:451 gym/views/admin_config.py:44
+#: gym/views/admin_config.py:58 gym/views/user_config.py:46
+msgid "Configuration"
+msgstr "설정"
+
#: core/templates/user/overview.html:454 gym/models/user_config.py:92
msgid "Include in inactive overview"
msgstr ""
@@ -1362,7 +1363,25 @@ msgstr ""
msgid "Preferences"
msgstr "환경설정"
-#: core/templates/user/preferences.html:33 core/views/user.py:587
+#: core/templates/user/preferences.html:19
+#, fuzzy
+#| msgid "Send emails"
+msgid "Verified email"
+msgstr "이메일 보내기"
+
+#: core/templates/user/preferences.html:24
+msgid "Unverified email"
+msgstr ""
+
+#: core/templates/user/preferences.html:26
+msgid "Send verification email"
+msgstr ""
+
+#: core/templates/user/preferences.html:30
+msgid "You need to verify your email to contribute exercises"
+msgstr ""
+
+#: core/templates/user/preferences.html:49 core/views/user.py:603
msgid "Change password"
msgstr ""
@@ -1392,39 +1411,37 @@ msgid "oz"
msgstr ""
#: 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
+#: exercises/views/equipment.py:104 exercises/views/exercises.py:185
+#: exercises/views/muscles.py:99 manager/views/schedule.py:311
+#: manager/views/schedule_step.py:129 manager/views/workout.py:269
+#: manager/views/workout_session.py:141 nutrition/views/ingredient.py:138
#: 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:431
-#: exercises/views/muscles.py:125 gallery/views/images.py:121
+#: exercises/views/categories.py:127 exercises/views/exercises.py:193
+#: exercises/views/muscles.py:106 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
+#: manager/views/workout.py:273 manager/views/workout_session.py:156
+#: nutrition/views/ingredient.py:145 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:456
+#: core/views/repetition_units.py:85 core/views/user.py:472
#: 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: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
+#: exercises/views/equipment.py:81 exercises/views/muscles.py:86
+#: 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:170
+#: gym/views/gym.py:459 manager/views/day.py:100 manager/views/schedule.py:335
+#: manager/views/workout.py:287 nutrition/views/ingredient.py:164
+#: nutrition/views/plan.py:144 nutrition/views/unit.py:144
#, python-brace-format
msgid "Edit {0}"
msgstr ""
@@ -1452,64 +1469,65 @@ msgstr ""
msgid "Your feedback was successfully sent. Thank you!"
msgstr ""
-#: core/views/user.py:156
+#: core/views/user.py:157
#, python-brace-format
msgid "Account \"{0}\" was successfully deleted"
msgstr ""
-#: core/views/user.py:287
+#: core/views/user.py:294
msgid "You were successfully registered"
msgstr ""
-#: core/views/user.py:339
+#: core/views/user.py:355
msgid "Settings successfully updated"
msgstr "설정이 업데이트 되었습니다."
-#: core/views/user.py:376
+#: core/views/user.py:392
msgid "The user was successfully deactivated"
msgstr ""
-#: core/views/user.py:411
+#: core/views/user.py:427
msgid "The user was successfully activated"
msgstr ""
-#: core/views/user.py:426
+#: core/views/user.py:442
msgid "Edit user"
msgstr ""
-#: core/views/user.py:573 gym/templates/gym/member_list.html:26
+#: core/views/user.py:589 gym/templates/gym/member_list.html:26
#: gym/views/gym.py:156
msgid "ID"
msgstr ""
-#: core/views/user.py:574 gym/forms.py:94 gym/templates/contract/view.html:55
+#: core/views/user.py:590 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:577 gym/templates/gym/new_user.html:34
+#: core/views/user.py:593 gym/templates/gym/new_user.html:34
#: gym/views/export.py:60 gym/views/gym.py:218
msgid "Gym"
msgstr "Gym"
-#: exercises/models/base.py:51 exercises/templates/exercise/view.html:76
-#: nutrition/models/ingredient.py:204
+#: core/views/user.py:652
+#, python-format
+msgid "A verification email was sent to %(email)s"
+msgstr ""
+
+#: exercises/models/base.py:63 nutrition/models/ingredient.py:204
msgid "Category"
msgstr ""
-#: exercises/models/base.py:58
+#: exercises/models/base.py:70
msgid "Primary muscles"
msgstr ""
-#: exercises/models/base.py:64 exercises/templates/equipment/overview.html:71
-#: exercises/templates/exercise/overview.html:76
-#: exercises/templates/exercise/view.html:268
-#: exercises/templates/muscles/overview.html:77
+#: exercises/models/base.py:76
msgid "Secondary muscles"
msgstr ""
-#: exercises/models/base.py:79
+#: exercises/models/base.py:91
msgid "Variations"
msgstr ""
@@ -1517,92 +1535,70 @@ msgstr ""
msgid "Exercise Categories"
msgstr ""
-#: exercises/models/comment.py:34 exercises/models/exercise_alias.py:32
-#: exercises/models/image.py:75 exercises/models/video.py:82
-#: manager/forms.py:165 manager/helpers.py:89 manager/models/log.py:51
+#: exercises/models/comment.py:37 exercises/models/exercise_alias.py:35
+#: exercises/models/image.py:71 exercises/models/video.py:95
+#: manager/forms.py:176 manager/helpers.py:89 manager/models/log.py:52
msgid "Exercise"
msgstr ""
-#: exercises/models/comment.py:41
+#: exercises/models/comment.py:43
msgid "A comment about how to correctly do this exercise."
msgstr ""
-#: exercises/models/exercise.py:86 nutrition/models/ingredient.py:80
+#: exercises/models/exercise.py:81 nutrition/models/ingredient.py:80
#: nutrition/models/plan.py:61 nutrition/models/weight_unit.py:32
msgid "Language"
msgstr ""
-#: exercises/models/exercise.py:237 exercises/views/exercises.py:461
-msgid "Exercise was successfully added to the general database"
-msgstr ""
-
-#: exercises/models/exercise.py:265
-msgid "New user submitted exercise"
-msgstr ""
-
-#: exercises/models/exercise.py:267
-#, python-brace-format
-msgid "The user {0} submitted a new exercise \"{1}\"."
-msgstr ""
-
-#: exercises/models/exercise_alias.py:35
+#: exercises/models/exercise_alias.py:38
#, fuzzy
#| msgid "Add new exercise"
msgid "Alias for an exercise"
msgstr "새 Exercise 추가"
-#: exercises/models/image.py:59
+#: exercises/models/image.py:55
msgid "Line"
msgstr ""
-#: exercises/models/image.py:60
+#: exercises/models/image.py:56
msgid "3D"
msgstr ""
-#: exercises/models/image.py:61
+#: exercises/models/image.py:57
msgid "Low-poly"
msgstr ""
-#: exercises/models/image.py:62
+#: exercises/models/image.py:58
msgid "Photo"
msgstr ""
-#: exercises/models/image.py:63
+#: exercises/models/image.py:59
msgid "Other"
msgstr ""
-#: exercises/models/image.py:81 gallery/models/image.py:56
+#: exercises/models/image.py:77 gallery/models/image.py:56
msgid "Image"
msgstr ""
-#: exercises/models/image.py:82 gallery/models/image.py:57
+#: exercises/models/image.py:78 gallery/models/image.py:57
msgid "Only PNG and JPEG formats are supported"
msgstr ""
-#: exercises/models/image.py:88
+#: exercises/models/image.py:84
msgid "Main picture"
msgstr ""
-#: exercises/models/image.py:91
+#: exercises/models/image.py:87
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:100
+#: exercises/models/image.py:96
msgid "The art style of your image"
msgstr ""
-#: exercises/models/image.py:185
-msgid "New user submitted image"
-msgstr ""
-
-#: exercises/models/image.py:186
-#, python-brace-format
-msgid "The user {0} submitted a new image \"{1}\" for exercise {2}."
-msgstr ""
-
#: exercises/models/muscle.py:37
msgid "In latin, e.g. \"Pectoralis major\""
msgstr ""
@@ -1615,283 +1611,120 @@ msgstr ""
msgid "A more basic name for the muscle"
msgstr ""
-#: exercises/models/video.py:41
-msgid "Maximum file size is 100MB."
+#: exercises/models/video.py:50
+#, python-format
+msgid "Maximum file size is %(size)sMB."
msgstr ""
-#: exercises/models/video.py:44 exercises/models/video.py:48
+#: exercises/models/video.py:57 exercises/models/video.py:65
msgid "File type is not supported"
msgstr ""
-#: exercises/models/video.py:57
+#: exercises/models/video.py:70
#, fuzzy
#| msgid "%(birthdate)s is not a valid birthdate"
msgid "File is not a valid video"
msgstr "%(birthdate)s은 유효하지 않은 생년월일입니다."
-#: exercises/models/video.py:88
+#: exercises/models/video.py:101
msgid "Main video"
msgstr ""
-#: exercises/models/video.py:94
+#: exercises/models/video.py:107
msgid "Video"
msgstr ""
-#: exercises/models/video.py:101
+#: exercises/models/video.py:114
msgid "Size"
msgstr ""
-#: exercises/models/video.py:108 manager/models/schedule_step.py:56
+#: exercises/models/video.py:121 manager/models/schedule_step.py:56
msgid "Duration"
msgstr ""
-#: exercises/models/video.py:117
+#: exercises/models/video.py:130
msgid "Width"
msgstr ""
-#: exercises/models/video.py:124
+#: exercises/models/video.py:137
#, fuzzy
#| msgid "Height (cm)"
msgid "Height"
msgstr "키 (cm)"
-#: exercises/models/video.py:131
+#: exercises/models/video.py:144
msgid "Codec"
msgstr ""
-#: exercises/models/video.py:139
-msgid "Codec, long name"
-msgstr ""
-
-#: exercises/templates/equipment/admin-overview.html:4
-msgid "Equipment list"
-msgstr "장비 리스트"
-
-#: exercises/templates/equipment/admin-overview.html:37
-#: exercises/views/equipment.py:94
-msgid "Add new equipment"
-msgstr "새 장비 추가"
-
-#: exercises/templates/equipment/overview.html:11
-msgid "Equipment overview"
-msgstr ""
-
-#: exercises/templates/equipment/overview.html:69
-#: exercises/templates/exercise/overview.html:74
-#: exercises/templates/exercise/view.html:264
-#: exercises/templates/muscles/overview.html:75
-msgid "Main muscles"
-msgstr ""
-
-#: exercises/templates/equipment/overview.html:79
-msgid ""
-"No exercises for this equipment. Add or edit an exercise and set the "
-"equipment."
-msgstr ""
-
-#: exercises/templates/equipment/overview.html:96
-#: exercises/templates/exercise/overview.html:99
-#: nutrition/templates/ingredient/overview.html:57
-msgid "Search"
-msgstr ""
-
-#: exercises/templates/equipment/overview.html:101
-#: exercises/templates/exercise/overview.html:104
-msgid "exercise name"
-msgstr ""
-
-#: exercises/templates/equipment/overview.html:115
-#: exercises/templates/exercise/overview.html:118
-#: exercises/templates/muscles/overview.html:118
-#: nutrition/templates/ingredient/overview.html:85
-msgid "Only registered users can do this"
-msgstr ""
-
-#: exercises/templates/exercise/email_new.tpl:1
-#, python-format
-msgid ""
-"Your exercise '%(exercise)s' was successfully added to the general\n"
-"database."
-msgstr ""
-
-#: exercises/templates/exercise/email_new.tpl:4
-msgid ""
-"It is now available on the exercise and muscle overview and can be\n"
-"added to workouts. You can access it on this address:"
-msgstr ""
-
-#: exercises/templates/exercise/email_new.tpl:8
-#: nutrition/templates/ingredient/email_new.tpl:8
-msgid "Thank you for contributing and making this site better!"
-msgstr ""
-
-#: exercises/templates/exercise/email_new.tpl:9
-#: manager/templates/workout/email_reminder.tpl:15
-#: manager/templates/workout/email_weight_reminder.tpl:12
-#: nutrition/templates/ingredient/email_new.tpl:9
-#, python-format
-msgid "The %(site)s team"
-msgstr ""
-
-#: exercises/templates/exercise/form.html:4
-msgid "Submitting an exercise"
-msgstr ""
-
-#: exercises/templates/exercise/form.html:5
-msgid ""
-"Thank you for submitting an exercise. This is much\n"
-"appreciated!"
-msgstr ""
-
-#: exercises/templates/exercise/form.html:8
-msgid ""
-"After you submit the form, the administrators will be notified.\n"
-"Once it is reviewed, it will be added to the database. Till this happens,\n"
-"it will not be visible in the overview or the search. In case you added your "
-"email\n"
-"when you registered, you will get notified when the process is completed "
-"successfully."
-msgstr ""
-"양식을 제출하면 관리자에게 알람이 전송됩니다. \n"
-"검토가 완료되면 데이터베이스에 추가됩니다. \n"
-"추가 완료 전까지는 개요 또는 검색에 표시되지 않습니다. \n"
-"등록할 때 이메일을 추가한 경우, 성공적으로 완료되면 알림을 받습니다."
-
-#: exercises/templates/exercise/form_correct.html:4
-msgid "Correcting an exercise"
-msgstr ""
-
-#: exercises/templates/exercise/form_correct.html:5
-msgid ""
-"Thank you for correcting and improving this exercise.\n"
-"This is much appreciated!"
-msgstr ""
-
-#: exercises/templates/exercise/form_correct.html:8
-msgid ""
-"After you submit the form, the administrators will be notified.\n"
-"Once the changes are reviewed the exercise will be updated."
-msgstr ""
-"양식을 제출하면 관리자에게 알람이 전송됩니다.\n"
-"변경 사항을 검토하면 운동이 업데이트 됩니다."
-
-#: exercises/templates/exercise/overview.html:88
-msgid "No categories."
-msgstr ""
-
-#: exercises/templates/exercise/overview.html:88
-msgid "Use link to create one"
-msgstr ""
-
-#: exercises/templates/exercise/pending.html:14
-#: nutrition/templates/ingredient/pending.html:14
-msgid "Submission date"
-msgstr "제출일"
-
-#: 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/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 ""
-
-#: exercises/templates/exercise/view.html:48
-msgid "Exercise is pending review"
-msgstr ""
-
-#: exercises/templates/exercise/view.html:51
-msgid ""
-"This user submitted exercise is pending a decision to be\n"
-" included in the database."
-msgstr ""
-
-#: exercises/templates/exercise/view.html:53
-msgid "Till then, it will not be shown in the overview or the search."
-msgstr ""
-
-#: exercises/templates/exercise/view.html:54
-#: nutrition/templates/ingredient/view.html:31
-msgid "Please select one of the options below."
-msgstr ""
-
-#: exercises/templates/exercise/view.html:60
-#: 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:204
-#: nutrition/templates/ingredient/view.html:42
-msgid "Decline"
-msgstr ""
-
-#: exercises/templates/exercise/view.html:96
-msgid "Images"
+#: exercises/models/video.py:152
+msgid "Codec, long name"
msgstr ""
-#: exercises/templates/exercise/view.html:137 exercises/views/images.py:93
-msgid "Add new image"
-msgstr "새 이미지 추가"
+#: exercises/templates/equipment/admin-overview.html:4
+msgid "Equipment list"
+msgstr "장비 리스트"
-#: exercises/templates/exercise/view.html:148
-msgid "Videos"
-msgstr ""
+#: exercises/templates/equipment/admin-overview.html:37
+#: exercises/views/equipment.py:92
+msgid "Add new equipment"
+msgstr "새 장비 추가"
-#: exercises/templates/exercise/view.html:187 exercises/views/videos.py:94
+#: exercises/templates/history/overview.html:11
#, fuzzy
-#| msgid "Add new image"
-msgid "Add new video"
-msgstr "새 이미지 추가"
+#| msgid "Exercise day"
+msgid "Exercise admin history"
+msgstr "운동한 날"
-#: exercises/templates/exercise/view.html:197
-msgid "Images pending review"
+#: exercises/templates/history/overview.html:27
+#, fuzzy
+#| msgid "Actions"
+msgid "Action"
+msgstr "Actions"
+
+#: exercises/templates/history/overview.html:28 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/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 ""
-#: exercises/templates/exercise/view.html:218
-msgid "Comments for this exercise"
+#: exercises/templates/history/overview.html:29
+msgid "Object"
msgstr ""
-#: exercises/templates/exercise/view.html:246
-msgid "Add new comment"
-msgstr "새 Comment 추가"
+#: exercises/templates/history/overview.html:31
+msgid "Changes"
+msgstr ""
-#: exercises/templates/exercise/view.html:260
-msgid "The diagram shows the most used muscles on this exercise"
+#: exercises/templates/history/overview.html:32
+msgid "Revert"
msgstr ""
-#: exercises/templates/exercise/view.html:301
-#: manager/templates/workout/log.html:10 manager/templates/workout/log.html:11
-msgid "Weight log"
+#: exercises/templates/history/overview.html:64
+msgid "View Object"
msgstr ""
-#: exercises/templates/exercise/view.html:306
-msgid "Exercise Variations"
+#: exercises/templates/history/overview.html:75
+msgid "View changes"
msgstr ""
-#: exercises/templates/exercise/view.html:327
-msgid "Submit a correction"
+#: exercises/templates/history/overview.html:86
+msgid "Revert changes"
msgstr ""
#: exercises/templates/muscles/admin-overview.html:4
-#: exercises/templates/muscles/overview.html:7
msgid "Muscle overview"
msgstr ""
#: exercises/templates/muscles/admin-overview.html:36
-#: exercises/views/muscles.py:86
+#: exercises/views/muscles.py:67
msgid "Add muscle"
msgstr "근육 추가"
-#: exercises/templates/muscles/overview.html:85
-msgid ""
-"No exercises for this muscle. Add or edit an exercise and set the muscle."
-msgstr ""
-
#: exercises/views/categories.py:71
msgid "Add category"
msgstr "카테고리 추가"
@@ -1904,50 +1737,19 @@ msgstr ""
msgid "Add exercise comment"
msgstr "Exercise comment 추가"
-#: exercises/views/equipment.py:107 exercises/views/equipment.py:118
+#: exercises/views/equipment.py:105 exercises/views/equipment.py:116
msgid "Delete equipment?"
msgstr ""
-#: exercises/views/exercises.py:229
+#: exercises/views/exercises.py:161
#, python-format
-msgid ""
-"%(name_original)s is too similar to existing exercise \"%(exercise_name)s\""
-msgstr ""
-
-#: exercises/views/exercises.py:247
-msgid "Add exercise"
-msgstr "Exercise 추가"
-
-#: exercises/views/exercises.py:367
-msgid "Thank you. Once the changes are reviewed the exercise will be updated."
-msgstr "감사합니다. 변경 사항을 검토 후, Exercise가 업데이트됩니다."
-
-#: exercises/views/exercises.py:380
-#, python-brace-format
-msgid "Correct {0}"
+msgid "%(name)s is too similar to existing exercise \"%(exercise_name)s\""
msgstr ""
-#: exercises/views/exercises.py:422
+#: exercises/views/exercises.py:184
msgid "This will delete the exercise from all workouts."
msgstr ""
-#: exercises/views/exercises.py:474
-msgid "Exercise was successfully marked as rejected"
-msgstr ""
-
-#: exercises/views/images.py:68
-msgid "Edit exercise image"
-msgstr ""
-
-#: exercises/views/images.py:143
-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"
@@ -2016,7 +1818,7 @@ msgid "Contract type"
msgstr ""
#: gym/models/contract.py:208 gym/templates/contract/view.html:59
-#: manager/templates/log/add.html:52 nutrition/forms.py:59
+#: manager/templates/log/add.html:52 nutrition/forms.py:60
#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:102
#: nutrition/models/meal_item.py:72
msgid "Amount"
@@ -2117,6 +1919,10 @@ msgstr ""
msgid "User notes"
msgstr ""
+#: gym/templates/contract/list.html:36
+msgid "Show"
+msgstr "보기"
+
#: gym/templates/contract/view.html:4
msgid "Contract"
msgstr ""
@@ -2195,10 +2001,6 @@ msgstr "이메일"
msgid "Add member"
msgstr "멤버 추가"
-#: gym/templates/gym/new_user.html:38
-msgid "Date of Birth"
-msgstr "생일"
-
#: gym/templates/gym/new_user.html:48 manager/templates/calendar/month.html:144
#: manager/templates/log/add.html:75 nutrition/templates/rate/form.html:120
msgid "Info"
@@ -2258,132 +2060,132 @@ msgstr "Gym에 사용자 추가"
msgid "Edit gym"
msgstr ""
-#: i18n.tpl:2 i18n.tpl:28
+#: i18n.tpl:2
+msgid "Until Failure"
+msgstr "실패 전까지"
+
+#: i18n.tpl:3 manager/forms.py:180 manager/models/log.py:73
+#: manager/templates/set/add.html:53
+msgid "Repetitions"
+msgstr ""
+
+#: i18n.tpl:4
msgid "Abs"
msgstr "복근"
-#: i18n.tpl:3
+#: i18n.tpl:5
msgid "Arms"
msgstr "팔"
-#: i18n.tpl:4
-msgid "Back"
-msgstr "등"
-
-#: i18n.tpl:5 i18n.tpl:23
-msgid "Calves"
-msgstr "종아리"
-
-#: i18n.tpl:6 i18n.tpl:26
-msgid "Chest"
-msgstr "가슴"
-
-#: i18n.tpl:7
+#: i18n.tpl:6
msgid "Legs"
msgstr "다리"
-#: i18n.tpl:8 i18n.tpl:19
-msgid "Shoulders"
-msgstr "어깨"
+#: i18n.tpl:7
+msgid "Dumbbell"
+msgstr "덤벨"
+
+#: i18n.tpl:8
+#, fuzzy
+#| msgid "Biceps brachii"
+msgid "Biceps"
+msgstr "상완 이두근 (Biceps brachii)"
#: i18n.tpl:9
-msgid "Barbell"
-msgstr "바벨"
+msgid "SZ-Bar"
+msgstr "SZ바"
#: i18n.tpl:10
-msgid "Bench"
-msgstr "벤치"
+msgid "Kettlebell"
+msgstr "캐틀벨"
#: i18n.tpl:11
-msgid "Dumbbell"
-msgstr "덤벨"
+msgid "Swiss Ball"
+msgstr "스위스볼"
#: i18n.tpl:12
-msgid "Gym mat"
-msgstr "매트"
+msgid "none (bodyweight exercise)"
+msgstr ""
#: i18n.tpl:13
-msgid "Incline bench"
-msgstr "인클라인 벤치"
+msgid "Calves"
+msgstr "종아리"
#: i18n.tpl:14
-msgid "Kettlebell"
-msgstr "캐틀벨"
+msgid "Back"
+msgstr "등"
#: i18n.tpl:15
-msgid "Pull-up bar"
-msgstr "풀업바"
+msgid "Lower back"
+msgstr ""
#: i18n.tpl:16
-msgid "SZ-Bar"
-msgstr "SZ바"
+msgid "Lats"
+msgstr ""
#: i18n.tpl:17
-msgid "Swiss Ball"
-msgstr "스위스볼"
+msgid "Hamstrings"
+msgstr ""
#: i18n.tpl:18
-msgid "none (bodyweight exercise)"
-msgstr ""
+msgid "Bench"
+msgstr "벤치"
-#: i18n.tpl:20
+#: i18n.tpl:19
#, fuzzy
-#| msgid "Biceps brachii"
-msgid "Biceps"
-msgstr "상완 이두근 (Biceps brachii)"
+#| msgid "Minutes"
+msgid "Glutes"
+msgstr "분"
+
+#: i18n.tpl:20
+msgid "Kilometers"
+msgstr "킬로미터"
#: i18n.tpl:21
-msgid "Hamstrings"
-msgstr ""
+msgid "Shoulders"
+msgstr "어깨"
#: i18n.tpl:22
-msgid "Lower back"
-msgstr ""
+msgid "Seconds"
+msgstr "초"
+
+#: i18n.tpl:23
+msgid "Miles"
+msgstr "마일"
#: i18n.tpl:24
-#, fuzzy
-#| msgid "Minutes"
-msgid "Glutes"
-msgstr "분"
+msgid "Incline bench"
+msgstr "인클라인 벤치"
#: i18n.tpl:25
-msgid "Lats"
+msgid "Quads"
msgstr ""
+#: i18n.tpl:26
+msgid "Minutes"
+msgstr "분"
+
#: i18n.tpl:27
-msgid "Quads"
-msgstr ""
+msgid "Chest"
+msgstr "가슴"
+
+#: i18n.tpl:28
+msgid "Gym mat"
+msgstr "매트"
#: i18n.tpl:29
-#, fuzzy
-#| msgid "Triceps brachii"
-msgid "Triceps"
-msgstr "상완 삼두근 (Triceps brachii)"
+msgid "Pull-up bar"
+msgstr "풀업바"
#: i18n.tpl:30
-msgid "Kilometers"
-msgstr "킬로미터"
+msgid "Barbell"
+msgstr "바벨"
#: i18n.tpl:31
-msgid "Miles"
-msgstr "마일"
-
-#: i18n.tpl:32
-msgid "Minutes"
-msgstr "분"
-
-#: i18n.tpl:33 manager/forms.py:169 manager/models/log.py:71
-#: manager/templates/set/add.html:53
-msgid "Repetitions"
-msgstr ""
-
-#: i18n.tpl:34
-msgid "Seconds"
-msgstr "초"
-
-#: i18n.tpl:35
-msgid "Until Failure"
-msgstr "실패 전까지"
+#, fuzzy
+#| msgid "Triceps brachii"
+msgid "Triceps"
+msgstr "상완 삼두근 (Triceps brachii)"
#: mailer/forms.py:34 mailer/templates/mailer/gym/preview.html:32
msgctxt "As in \"email subject\""
@@ -2436,44 +2238,44 @@ msgstr "이메일 보내기"
msgid "Correction"
msgstr ""
-#: manager/forms.py:89 manager/models/workout.py:59
+#: manager/forms.py:92 manager/models/workout.py:59
msgid "The name of the workout"
msgstr ""
-#: manager/forms.py:93 manager/models/workout.py:66
+#: manager/forms.py:96 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
+#: manager/forms.py:137
msgid ""
"You can search for more than one exercise, they will be grouped together for "
"a superset."
msgstr ""
-#: 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
+#: manager/forms.py:166 manager/forms.py:171 manager/models/log.py:64
+#: manager/models/log.py:92 manager/models/setting.py:59
+#: manager/models/setting.py:90 manager/templates/log/add.html:53
+#: manager/templates/log/add.html:55 manager/templates/set/formset.html:10
+#: manager/templates/set/formset.html:12 measurements/models/category.py:58
+#: nutrition/forms.py:64
msgid "Unit"
msgstr ""
-#: manager/forms.py:266
+#: manager/forms.py:277
msgid "Type"
msgstr ""
-#: manager/forms.py:267 manager/templates/workout/view.html:157
+#: manager/forms.py:278 manager/templates/workout/view.html:157
msgid "Table"
msgstr ""
-#: manager/forms.py:269 manager/templates/workout/view.html:163
+#: manager/forms.py:280 manager/templates/workout/view.html:163
msgid "with images"
msgstr ""
-#: manager/forms.py:270 manager/templates/workout/view.html:169
+#: manager/forms.py:281 manager/templates/workout/view.html:169
msgid "with comments"
msgstr ""
@@ -2525,7 +2327,7 @@ msgid "The duration in weeks"
msgstr ""
#: manager/models/schedule_step.py:63 manager/models/set.py:52
-#: manager/models/setting.py:98 nutrition/models/meal.py:54
+#: manager/models/setting.py:110 nutrition/models/meal.py:54
#: nutrition/models/meal_item.py:65
msgid "Order"
msgstr ""
@@ -2576,7 +2378,7 @@ msgstr "운동한 날"
msgid "Number of sets"
msgstr ""
-#: manager/models/setting.py:43
+#: manager/models/setting.py:48
msgid "Sets"
msgstr ""
@@ -2841,6 +2643,13 @@ msgid ""
"option in your settings."
msgstr "이메일 알람을 받지 않으려면, 설정에서 옵션을 비활성화 하십시오."
+#: manager/templates/workout/email_reminder.tpl:15
+#: manager/templates/workout/email_weight_reminder.tpl:12
+#: nutrition/templates/ingredient/email_new.tpl:9
+#, python-format
+msgid "The %(site)s team"
+msgstr ""
+
#: manager/templates/workout/email_weight_reminder.tpl:3
#, python-format
msgid ""
@@ -2853,6 +2662,10 @@ msgid ""
"You will regularly receive such reminders till you enter your current weight."
msgstr ""
+#: manager/templates/workout/log.html:10 manager/templates/workout/log.html:11
+msgid "Weight log"
+msgstr ""
+
#: manager/templates/workout/log.html:29
msgid "Weight log for workout"
msgstr ""
@@ -2955,7 +2768,7 @@ msgstr ""
msgid "Edit workout"
msgstr ""
-#: manager/templates/workout/view.html:225 manager/views/workout.py:300
+#: manager/templates/workout/view.html:225 manager/views/workout.py:301
msgid "Mark as template"
msgstr ""
@@ -2963,11 +2776,6 @@ msgstr ""
msgid "Add workout day"
msgstr ""
-#: manager/views/log.py:92
-#, python-format
-msgid "Edit log entry for %s"
-msgstr ""
-
#: manager/views/log.py:111
msgid "Delete workout log"
msgstr ""
@@ -2985,11 +2793,11 @@ msgstr "일정 생성"
msgid "Your workouts"
msgstr ""
-#: manager/views/workout.py:227
+#: manager/views/workout.py:228
msgid "Copy workout"
msgstr ""
-#: manager/views/workout.py:230
+#: manager/views/workout.py:231
msgid "Copy"
msgstr ""
@@ -3011,29 +2819,29 @@ msgstr ""
msgid "Value"
msgstr ""
-#: nutrition/forms.py:122
+#: nutrition/forms.py:123
msgid "Calculate"
msgstr ""
-#: nutrition/forms.py:195 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:196 nutrition/templates/rate/form.html:76
msgid "Basic caloric intake"
msgstr ""
-#: nutrition/forms.py:196
+#: nutrition/forms.py:197
msgid "Your basic caloric intake as calculated for your data"
msgstr ""
-#: nutrition/forms.py:202
+#: nutrition/forms.py:203
msgid "Additional calories"
msgstr ""
-#: nutrition/forms.py:204
+#: nutrition/forms.py:205
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
msgstr ""
-#: nutrition/forms.py:232 nutrition/models/ingredient_weight_unit.py:39
+#: nutrition/forms.py:233 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"
@@ -3096,7 +2904,7 @@ msgid ""
"{energy_approx}%)"
msgstr ""
-#: nutrition/models/ingredient.py:357 nutrition/views/ingredient.py:225
+#: nutrition/models/ingredient.py:357 nutrition/views/ingredient.py:219
msgid "Ingredient was successfully added to the general database"
msgstr ""
@@ -3125,6 +2933,10 @@ msgstr ""
msgid "Meal"
msgstr ""
+#: nutrition/models/log.py:65
+msgid "Date and Time (Approx.)"
+msgstr ""
+
#: nutrition/models/meal.py:61
msgid "Time (approx)"
msgstr ""
@@ -3216,6 +3028,10 @@ msgid ""
"added to nutrition plans. You can access it on this address:"
msgstr ""
+#: nutrition/templates/ingredient/email_new.tpl:8
+msgid "Thank you for contributing and making this site better!"
+msgstr ""
+
#: nutrition/templates/ingredient/form.html:4
msgid "Submitting an ingredient"
msgstr ""
@@ -3244,6 +3060,10 @@ msgstr ""
msgid "No ingredients."
msgstr ""
+#: nutrition/templates/ingredient/overview.html:57
+msgid "Search"
+msgstr ""
+
#: nutrition/templates/ingredient/overview.html:66
msgid "ingredient name"
msgstr ""
@@ -3253,6 +3073,14 @@ msgstr ""
msgid "Add ingredient"
msgstr ""
+#: nutrition/templates/ingredient/overview.html:85
+msgid "Only registered users can do this"
+msgstr ""
+
+#: nutrition/templates/ingredient/pending.html:14
+msgid "Submission date"
+msgstr "제출일"
+
#: nutrition/templates/ingredient/view.html:27
msgid "Ingredient is pending review"
msgstr ""
@@ -3265,6 +3093,18 @@ msgid ""
"the search."
msgstr ""
+#: nutrition/templates/ingredient/view.html:31
+msgid "Please select one of the options below."
+msgstr ""
+
+#: nutrition/templates/ingredient/view.html:38
+msgid "Accept"
+msgstr ""
+
+#: nutrition/templates/ingredient/view.html:42
+msgid "Decline"
+msgstr ""
+
#: nutrition/templates/ingredient/view.html:71
#: nutrition/templates/log/detail.html:31
#: nutrition/templates/plan/view.html:229 nutrition/views/plan.py:376
@@ -3505,14 +3345,18 @@ msgid ""
"yourself for some weeks and change the total amount if needed."
msgstr ""
-#: nutrition/views/ingredient.py:181
+#: nutrition/views/ingredient.py:175
msgid "Add a new ingredient"
msgstr ""
-#: nutrition/views/ingredient.py:238
+#: nutrition/views/ingredient.py:232
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 ""
@@ -3732,29 +3576,29 @@ msgstr ""
msgid "100%% Free <br>and <br>Open Source"
msgstr ""
-#: utils/generic_views.py:261
+#: utils/generic_views.py:262
msgid "Yes, delete"
msgstr ""
-#: utils/models.py:47
+#: utils/models.py:48
msgid "Author"
msgstr ""
-#: utils/models.py:52
+#: utils/models.py:53
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:77
+#: utils/models.py:78
msgid "Pending"
msgstr ""
-#: utils/models.py:78
+#: utils/models.py:79
msgid "Accepted"
msgstr ""
-#: utils/models.py:79
+#: utils/models.py:80
msgid "Declined"
msgstr ""
@@ -3895,6 +3739,63 @@ msgstr "삭제되었습니다."
msgid "Delete weight entry for the %s"
msgstr ""
+#~ msgid "Ingredients"
+#~ msgstr "영양성분"
+
+#~ msgctxt "as in sorted by category"
+#~ msgid "by category"
+#~ msgstr "by 카테고리"
+
+#~ msgctxt "as in sorted by muscle"
+#~ msgid "by muscle"
+#~ msgstr "by 근육"
+
+#~ msgctxt "as in sorted by equipment"
+#~ msgid "by equipment"
+#~ msgstr "by 장비"
+
+#~ msgid "Add new exercise"
+#~ msgstr "새 Exercise 추가"
+
+#~ msgid ""
+#~ "After you submit the form, the administrators will be notified.\n"
+#~ "Once it is reviewed, it will be added to the database. Till this "
+#~ "happens,\n"
+#~ "it will not be visible in the overview or the search. In case you added "
+#~ "your email\n"
+#~ "when you registered, you will get notified when the process is completed "
+#~ "successfully."
+#~ msgstr ""
+#~ "양식을 제출하면 관리자에게 알람이 전송됩니다. \n"
+#~ "검토가 완료되면 데이터베이스에 추가됩니다. \n"
+#~ "추가 완료 전까지는 개요 또는 검색에 표시되지 않습니다. \n"
+#~ "등록할 때 이메일을 추가한 경우, 성공적으로 완료되면 알림을 받습니다."
+
+#~ msgid ""
+#~ "After you submit the form, the administrators will be notified.\n"
+#~ "Once the changes are reviewed the exercise will be updated."
+#~ msgstr ""
+#~ "양식을 제출하면 관리자에게 알람이 전송됩니다.\n"
+#~ "변경 사항을 검토하면 운동이 업데이트 됩니다."
+
+#~ msgid "Add new image"
+#~ msgstr "새 이미지 추가"
+
+#, fuzzy
+#~| msgid "Add new image"
+#~ msgid "Add new video"
+#~ msgstr "새 이미지 추가"
+
+#~ msgid "Add new comment"
+#~ msgstr "새 Comment 추가"
+
+#~ msgid "Add exercise"
+#~ msgstr "Exercise 추가"
+
+#~ msgid ""
+#~ "Thank you. Once the changes are reviewed the exercise will be updated."
+#~ msgstr "감사합니다. 변경 사항을 검토 후, Exercise가 업데이트됩니다."
+
#~ msgid "Anterior deltoid"
#~ msgstr "전삼각근 (Anterior deltoid)"
diff --git a/wger/locale/nl/LC_MESSAGES/django.po b/wger/locale/nl/LC_MESSAGES/django.po
index ad54391a7..f5f9b4ff8 100644
--- a/wger/locale/nl/LC_MESSAGES/django.po
+++ b/wger/locale/nl/LC_MESSAGES/django.po
@@ -14,7 +14,7 @@ msgid ""
msgstr ""
"Project-Id-Version: wger Workout Manager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-14 12:01+0200\n"
+"POT-Creation-Date: 2022-11-10 16:03+0100\n"
"PO-Revision-Date: 2022-07-24 12:21+0000\n"
"Last-Translator: Remco Schrijver <[email protected]>\n"
"Language-Team: Dutch <https://hosted.weblate.org/projects/wger/web/nl/>\n"
@@ -38,107 +38,8 @@ msgstr ""
"nieuwe geregistreerde gebruikers aan deze sportschool toevoegen en alle "
"bestaande gebruikers zonder sportschool bijwerken."
-#: 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 "Oefeningen"
-
-#: config/models/language_config.py:42
-msgid "Ingredients"
-msgstr "Ingrediënten"
-
-#: config/templates/language/overview.html:4 core/templates/navigation.html:226
-msgid "Languages"
-msgstr "Talen"
-
-#: config/templates/language/overview.html:16
-msgid "Nothing found."
-msgstr "Niets gevonden."
-
-#: 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:150
-#: nutrition/templates/plan/view.html:153
-#: nutrition/templates/plan/view.html:191
-msgid "Add one now."
-msgstr "Voeg er een toe."
-
-#: config/templates/language/overview.html:29
-#: core/templates/license/list.html:38 core/templates/misc/license/list.html:41
-#: core/templates/repetition_unit/list.html:41
-#: core/templates/user/overview.html:327 core/templates/user/overview.html:366
-#: core/templates/user/overview.html:402
-#: core/templates/weight_unit/list.html:41 core/views/languages.py:73
-#: core/views/license.py:65 core/views/repetition_units.py:65
-#: core/views/weight_units.py:65
-#: exercises/templates/categories/admin-overview.html:36
-#: 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:61
-msgid "Add"
-msgstr "Aanmaken"
-
-#: config/templates/language/view.html:21 core/models/language.py:29
-msgid "Language short name"
-msgstr "Taal korte notatie"
-
-#: config/templates/language/view.html:22
-#: config/templates/language/view.html:43 core/models/language.py:32
-msgid "Language full name"
-msgstr "Taal lange notatie"
-
-#: config/templates/language/view.html:34 core/templates/user/overview.html:451
-#: gym/views/admin_config.py:44 gym/views/admin_config.py:58
-#: gym/views/user_config.py:46
-msgid "Configuration"
-msgstr "Configuratie"
-
-#: config/templates/language/view.html:35
-msgid ""
-"Use the configuration to select in what languages the\n"
-"exercises and ingredients will be shown for the current language (for "
-"example\n"
-"the exercises should be shown in languages A, B and C; the ingredients only\n"
-"in A)."
-msgstr ""
-"Gebruik de configuratie om te selecteren in welke talen de\n"
-"oefeningen en ingrediënten getoond zullne worden voor de huidige taal (bvb\n"
-"deo efeningen kunnen getoond worden in talen A, B en C; de ingrediënten "
-"enkel\n"
-"in A)."
-
-#: config/templates/language/view.html:44 gym/templates/contract/list.html:36
-msgid "Show"
-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: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:45
-msgid "Options"
-msgstr "Opties"
-
-#: config/templates/language/view.html:96 config/views/gym_config.py:41
-#: config/views/language_config.py:49 core/templates/license/list.html:16
-#: core/templates/misc/license/list.html:17
+#: config/views/gym_config.py:41 core/templates/language/view.html:57
+#: 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:39
#: core/templates/tags/render_day.html:75 core/templates/user/overview.html:205
@@ -146,12 +47,10 @@ 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:230
-#: exercises/templates/exercise/view.html:351
#: exercises/templates/muscles/admin-overview.html:16
-#: 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
+#: 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
#: 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
@@ -167,81 +66,54 @@ msgstr "Opties"
msgid "Edit"
msgstr "Bewerk"
-#: 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: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: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
-#: gym/templates/contract_type/list.html:39 gym/templates/document/list.html:46
-#: gym/templates/gym/list.html:20 manager/templates/calendar/day.html:69
-#: 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:231
-#: 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:132
-#: nutrition/templates/units/list.html:20
-msgid "Delete"
-msgstr "Verwijder"
-
-#: core/demo.py:86
+#: core/demo.py:95
msgid "Sample workout"
msgstr "Voorbeeldworkout"
-#: core/demo.py:90
+#: core/demo.py:99
msgid "Sample day"
msgstr "Voorbeelddag"
-#: core/demo.py:94
+#: core/demo.py:103
msgid "Another sample day"
msgstr "Nog een voorbeelddag"
-#: core/demo.py:217
-msgid "Sample nutrional plan"
+#: core/demo.py:211
+#, fuzzy
+#| msgid "Sample nutrional plan"
+msgid "Sample nutritional plan"
msgstr "Voorbeeld voedingsplan"
-#: core/demo.py:349 core/demo.py:351 core/demo.py:353
+#: core/demo.py:343 core/demo.py:345 core/demo.py:347
#, python-brace-format
msgid "Placeholder workout nr {0} for schedule"
msgstr "Tijdelijke workout nr {0} voor schema"
-#: core/demo.py:358
+#: core/demo.py:352
msgid "My cool workout schedule"
msgstr "Mijn hip workoutschema"
-#: core/demo.py:397 core/demo.py:412
+#: core/demo.py:391 core/demo.py:406
msgid "Empty placeholder schedule"
msgstr "Leeg tijdelijk schema"
-#: core/forms.py:61 core/templates/navigation.html:188
-#: core/templates/navigation.html:192 core/templates/user/login.html:4
+#: core/forms.py:64 core/templates/navigation.html:179
+#: core/templates/navigation.html:183 core/templates/user/login.html:4
#: software/templates/features.html:43
msgid "Login"
msgstr "Aanmelden"
-#: core/forms.py:73 core/forms.py:164 gym/views/export.py:63
+#: core/forms.py:76 core/forms.py:177 gym/views/export.py:63
#: gym/views/gym.py:218
msgid "First name"
msgstr "Voornaam"
-#: core/forms.py:74 core/forms.py:165 core/templates/user/overview.html:267
+#: core/forms.py:77 core/forms.py:178 core/templates/user/overview.html:267
#: gym/views/export.py:64 gym/views/gym.py:218
msgid "Last name"
msgstr "Achternaam"
-#: core/forms.py:76 core/forms.py:131 core/templates/user/overview.html:271
+#: core/forms.py:79 core/forms.py:144 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
@@ -251,79 +123,109 @@ msgstr "Achternaam"
msgid "Email"
msgstr "E-mail"
-#: core/forms.py:77
+#: core/forms.py:80
msgid "Used for password resets and, optionally, e-mail reminders."
msgstr ""
"Gebruikt voor het her-instellen van wachtwoorden en, optioneel, voor e-"
"mailherinneringen."
-#: core/forms.py:102
+#: core/forms.py:84 core/models/profile.py:220
+#: gym/templates/gym/new_user.html:38
+msgid "Date of Birth"
+msgstr "Geboortedatum"
+
+#: core/forms.py:116
msgid "Personal data"
msgstr "Persoonlijke gegevens"
-#: core/forms.py:110
+#: core/forms.py:124
msgid "Workout reminders"
msgstr "Workout-herinneringen"
-#: core/forms.py:117
+#: core/forms.py:131
msgid "Other settings"
msgstr "Overige instellingen"
-#: 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
+#: core/forms.py:138 core/views/user.py:615 core/views/user.py:630
+#: core/views/user.py:642 gym/forms.py:72 manager/templates/log/add.html:65
+#: manager/templates/set/add.html:69 manager/views/workout.py:222
+#: utils/generic_views.py:143
msgid "Save"
msgstr "Opslaan"
-#: core/forms.py:132
+#: core/forms.py:145
msgid "Used for password resets and, optionally, email reminders."
msgstr ""
"Wordt gebruikt voor het resetten van een wachtwoord en optioneel voor e-mail "
"herinneringen."
-#: core/forms.py:160
+#: core/forms.py:173
msgid "This e-mail address is already in use."
msgstr "Dit e-mailadres wordt al gebruikt."
-#: core/forms.py:180 gym/templates/gym/new_user.html:26
+#: core/forms.py:193 gym/templates/gym/new_user.html:26
#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:218
msgid "Password"
msgstr "Wachtwoord"
-#: core/forms.py:182
+#: core/forms.py:195
msgid "Please enter your current password."
msgstr "Gelieve je huidige wachtwoord in te geven."
-#: core/forms.py:200
+#: core/forms.py:204 core/templates/language/view.html:62
+#: 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: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/muscles/admin-overview.html:17
+#: gym/templates/admin_notes/list.html:40
+#: gym/templates/contract_option/list.html:39
+#: gym/templates/contract_type/list.html:39 gym/templates/document/list.html:46
+#: gym/templates/gym/list.html:20 manager/templates/calendar/day.html:69
+#: 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:231
+#: 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:132
+#: nutrition/templates/units/list.html:20
+msgid "Delete"
+msgstr "Verwijder"
+
+#: core/forms.py:213
msgid "Invalid password"
msgstr "Ongeldig wachtwoord"
-#: core/forms.py:212 core/forms.py:278
+#: core/forms.py:225 core/forms.py:291
msgid "The form is secured with reCAPTCHA"
msgstr "Dit formulier is beveiligd met reCAPTCHA"
-#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:188
-#: core/templates/navigation.html:193 core/templates/template.html:149
-#: core/templates/user/login.html:20 core/views/user.py:293
+#: core/forms.py:239 core/forms.py:258 core/templates/navigation.html:179
+#: core/templates/navigation.html:184 core/templates/template.html:149
+#: core/templates/user/login.html:20 core/views/user.py:300
#: software/templates/features.html:38
msgid "Register"
msgstr "Registreer"
-#: core/forms.py:256
+#: core/forms.py:269
msgid "Contact"
msgstr "Contact"
-#: core/forms.py:257
+#: core/forms.py:270
msgid "Some way of answering you (e-mail, etc.)"
msgstr "Een manier om je te beantwoorden (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:71
+#: core/forms.py:278 exercises/models/comment.py:42 manager/models/set.py:60
+#: manager/models/setting.py:111 nutrition/models/log.py:71
msgid "Comment"
msgstr "Opmerking"
-#: core/forms.py:266
+#: core/forms.py:279
msgid "What do you want to say?"
msgstr "Wat wil je zeggen?"
@@ -331,6 +233,14 @@ msgstr "Wat wil je zeggen?"
msgid "Day of the week"
msgstr "Weekdag"
+#: core/models/language.py:31 core/templates/language/view.html:21
+msgid "Language short name"
+msgstr "Taal korte notatie"
+
+#: core/models/language.py:36 core/templates/language/view.html:22
+msgid "Language full name"
+msgstr "Taal lange notatie"
+
#: core/models/license.py:29
msgid "Full name"
msgstr "Volledige naam"
@@ -389,19 +299,19 @@ msgstr "Metrisch (kilogram)"
msgid "Imperial (pound)"
msgstr "Imperiaal (pond)"
-#: core/models/profile.py:111
+#: core/models/profile.py:114
msgid "Show exercise comments"
msgstr "Toon opmerkingen oefening"
-#: core/models/profile.py:112
+#: core/models/profile.py:115
msgid "Check to show exercise comments on the workout view"
msgstr "Vink aan om oefeningopmerkingen te tonen in de workout view."
-#: core/models/profile.py:123
+#: core/models/profile.py:126
msgid "Also use ingredients in English"
msgstr "Gebruik ook engelstalige ingrediënten"
-#: core/models/profile.py:125
+#: core/models/profile.py:128
msgid ""
"Check to also show ingredients in English while creating\n"
"a nutritional plan. These ingredients are extracted from a list provided\n"
@@ -414,11 +324,11 @@ msgstr ""
"compleet, met ongeveer 7000 elementen, maar kan ook overweldigend zijn en je "
"zoektocht bemoeilijken"
-#: core/models/profile.py:134
+#: core/models/profile.py:137
msgid "Activate workout reminders"
msgstr "Activeer workout-herinneringen"
-#: core/models/profile.py:136
+#: core/models/profile.py:139
msgid ""
"Check to activate automatic reminders for workouts. You need to provide a "
"valid email for this to work."
@@ -426,20 +336,20 @@ msgstr ""
"Aanvinken om automatische herinneringen voor je workouts te activeren. Je "
"moet een geldig e-mailadres invoeren om hiervan gebruik te maken."
-#: core/models/profile.py:145
+#: core/models/profile.py:148
msgid "Remind before expiration"
msgstr "Herinner voor vervaldatum"
-#: core/models/profile.py:146
+#: core/models/profile.py:149
msgid "The number of days you want to be reminded before a workout expires."
msgstr ""
"Het aantal dagen dat je wil herinnerd worden vooraleer een workout vervalt."
-#: core/models/profile.py:152
+#: core/models/profile.py:155
msgid "Default duration of workouts"
msgstr "Standaard duurtijd van workouts"
-#: core/models/profile.py:154
+#: core/models/profile.py:157
msgid ""
"Default duration in weeks of workouts not in a schedule. Used for email "
"workout reminders."
@@ -447,11 +357,11 @@ msgstr ""
"Standaard duurtijd in weken voor workouts die geen deel uitmaken van een "
"schema. Gebruikt voor e-mailherinneringen."
-#: core/models/profile.py:171
+#: core/models/profile.py:174
msgid "Notification language"
msgstr "Taal meldingen"
-#: core/models/profile.py:173
+#: core/models/profile.py:176
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."
@@ -460,70 +370,70 @@ msgstr ""
"herinneringen voor workouts. Dit beïnvloedt niet de taal die wordt gebruikt "
"op de website."
-#: core/models/profile.py:186 gym/views/export.py:66
+#: core/models/profile.py:212 gym/views/export.py:66
msgid "Age"
msgstr "Leeftijd"
-#: core/models/profile.py:202 nutrition/forms.py:99
+#: core/models/profile.py:228 nutrition/forms.py:100
msgid "Height (cm)"
msgstr "Hoogte (cm)"
-#: core/models/profile.py:219
+#: core/models/profile.py:245
msgid "Hours of sleep"
msgstr "Uren slaap"
-#: core/models/profile.py:220
+#: core/models/profile.py:246
msgid "The average hours of sleep per day"
msgstr "De gemiddelde uren slaap per dag"
-#: core/models/profile.py:229
+#: core/models/profile.py:255
msgid "Work"
msgstr "Werk"
-#: core/models/profile.py:230 core/models/profile.py:272
+#: core/models/profile.py:256 core/models/profile.py:298
msgid "Average hours per day"
msgstr "Gemiddelde uren per dag"
-#: core/models/profile.py:239 core/models/profile.py:260
-#: core/models/profile.py:281
+#: core/models/profile.py:265 core/models/profile.py:286
+#: core/models/profile.py:307
msgid "Physical intensity"
msgstr "Fysieke intensiteit"
-#: core/models/profile.py:240 core/models/profile.py:261
-#: core/models/profile.py:282
+#: core/models/profile.py:266 core/models/profile.py:287
+#: core/models/profile.py:308
msgid "Approximately"
msgstr "Ongeveer"
-#: core/models/profile.py:250
+#: core/models/profile.py:276
msgid "Sport"
msgstr "Sport"
-#: core/models/profile.py:251
+#: core/models/profile.py:277
msgid "Average hours per week"
msgstr "Gemiddeld aantal uren per week"
-#: core/models/profile.py:271
+#: core/models/profile.py:297
msgid "Free time"
msgstr "Vrije tijd"
-#: core/models/profile.py:292 nutrition/templates/rate/form.html:66
+#: core/models/profile.py:318 nutrition/templates/rate/form.html:66
msgid "Total daily calories"
msgstr "Totale dagelijkse calorieën"
-#: core/models/profile.py:293
+#: core/models/profile.py:319
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
+#: core/models/profile.py:331 nutrition/models/ingredient_weight_unit.py:45
#: nutrition/models/log.py:90 nutrition/models/meal_item.py:58
msgid "Weight unit"
msgstr "Gewichteenheid"
-#: core/models/profile.py:313
+#: core/models/profile.py:339
msgid "Allow external access"
msgstr "Externe toegang toestaan"
-#: core/models/profile.py:315
+#: core/models/profile.py:341
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."
@@ -532,24 +442,23 @@ msgstr ""
"lezen modus. Je moet dit instellen voordat je links kan delen in "
"bijvoorbeeld social media."
-#: core/models/profile.py:324
+#: core/models/profile.py:350
msgid "Automatic reminders for weight entries"
msgstr "Automatische herinneringen voor gewichtsingave"
-#: core/models/profile.py:326
+#: core/models/profile.py:352
msgid "Number of days after the last weight entry (enter 0 to deactivate)"
msgstr ""
"Aantal dagen na de laatste gewichtsingave ( geef 0 in om te deactiveren )"
-#: core/models/profile.py:392
+#: core/models/profile.py:418
msgid "The sum of all hours has to be 24"
msgstr "Het toaal van alle uren moet 24 zijn"
#: core/models/rep_unit.py:35 core/models/weight_unit.py:35
-#: core/templates/user/overview.html:263 core/views/user.py:575
+#: core/templates/user/overview.html:263 core/views/user.py:591
#: 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
+#: exercises/models/exercise.py:64 exercises/models/muscle.py:36
#: 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
@@ -614,6 +523,52 @@ msgstr ""
"Ben je zeker dat je dit wil verwijderen? Deze actie kan niet ongedaan worden "
"gemaakt."
+#: core/templates/email_verification/confirm_template.html:4
+msgid "Email verified"
+msgstr ""
+
+#: core/templates/email_verification/confirm_template.html:18
+#, python-format
+msgid "%(username)s, your email was verified"
+msgstr ""
+
+#: core/templates/email_verification/confirm_template.html:22
+msgid "Error, invalid verification token"
+msgstr ""
+
+#: core/templates/email_verification/email_body_html.tpl:6
+#, fuzzy
+#| msgid "Configuration"
+msgid "Email Confirmation"
+msgstr "Configuratie"
+
+#: core/templates/email_verification/email_body_html.tpl:9
+#: core/templates/email_verification/email_body_txt.tpl:3
+#, python-format
+msgid "You are almost there, %(username)s!"
+msgstr ""
+
+#: core/templates/email_verification/email_body_html.tpl:11
+#, python-format
+msgid "Please click <a href=\"%(link)s\">here</a> to confirm your email"
+msgstr ""
+
+#: core/templates/email_verification/email_body_html.tpl:12
+#: core/templates/email_verification/email_body_txt.tpl:5
+#, python-format
+msgid "The token expires on %(time)s"
+msgstr ""
+
+#: core/templates/email_verification/email_body_html.tpl:14
+#: core/templates/email_verification/email_body_txt.tpl:8
+msgid "the wger Team"
+msgstr ""
+
+#: core/templates/email_verification/email_body_txt.tpl:4
+#, python-format
+msgid "Please click the following link to confirm your email: %(link)s"
+msgstr ""
+
#: core/templates/index.html:4
msgid "Dashboard"
msgstr "Dashboard"
@@ -675,7 +630,7 @@ msgid "Add custom diary entry"
msgstr "Voeg dagboekitem op maat toe"
#: core/templates/index.html:84 core/templates/index.html:92
-#: manager/models/day.py:34 manager/models/log.py:56
+#: manager/models/day.py:34 manager/models/log.py:58
#: manager/models/session.py:60 manager/models/workout.py:109
#: manager/templates/schedule/view.html:105
#: manager/templates/workout/view.html:11
@@ -708,6 +663,20 @@ msgstr "Nieuw log toevoegen"
msgid "No workouts found."
msgstr "Geen workouts gevonden."
+#: core/templates/index.html:137 core/templates/index.html:189
+#: core/templates/language/overview.html:23
+#: 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:150
+#: nutrition/templates/plan/view.html:153
+#: nutrition/templates/plan/view.html:191
+msgid "Add one now."
+msgstr "Voeg er een toe."
+
#: 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
@@ -761,19 +730,59 @@ msgid "No nutrition plans."
msgstr "Geen voedingsplannen."
#: 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
+#: core/templates/user/overview.html:121 manager/forms.py:184
+#: manager/helpers.py:89 manager/models/log.py:86 manager/models/setting.py:79
+#: manager/templates/log/add.html:54 manager/templates/set/formset.html:11
#: weight/models.py:34 weight/templates/import_csv_preview.html:14
#: weight/templates/import_csv_preview.html:43 weight/views.py:150
msgid "Weight"
msgstr "Gewicht"
-#: core/templates/index.html:210 core/templates/navigation.html:135
+#: core/templates/index.html:210 core/templates/navigation.html:126
#: weight/views.py:70
msgid "Add weight entry"
msgstr "Voeg gewichtmeting toe"
+#: core/templates/language/overview.html:4 core/templates/navigation.html:217
+msgid "Languages"
+msgstr "Talen"
+
+#: core/templates/language/overview.html:23
+msgid "Nothing found."
+msgstr "Niets gevonden."
+
+#: core/templates/language/overview.html:36 core/templates/license/list.html:38
+#: core/templates/misc/license/list.html:41
+#: core/templates/repetition_unit/list.html:41
+#: core/templates/user/overview.html:327 core/templates/user/overview.html:366
+#: core/templates/user/overview.html:402
+#: core/templates/weight_unit/list.html:41 core/views/languages.py:73
+#: core/views/license.py:65 core/views/repetition_units.py:65
+#: core/views/weight_units.py:65
+#: exercises/templates/categories/admin-overview.html:36
+#: 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:61
+msgid "Add"
+msgstr "Aanmaken"
+
+#: core/templates/language/view.html:52 core/templates/user/api_key.html:44
+#: core/templates/user/preferences.html:44 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:45
+msgid "Options"
+msgstr "Opties"
+
#: core/templates/license/list.html:4 core/templates/misc/license/list.html:4
msgid "License list"
msgstr "Licentielijst"
@@ -786,7 +795,6 @@ msgstr "Licentielijst"
#: core/templates/weight_unit/list.html:26
#: exercises/templates/categories/admin-overview.html:24
#: exercises/templates/equipment/admin-overview.html:24
-#: exercises/templates/exercise/pending.html:30
#: exercises/templates/muscles/admin-overview.html:24
#: gym/templates/admin_notes/list.html:52 gym/templates/contract/list.html:60
#: gym/templates/contract_option/list.html:56
@@ -869,155 +877,135 @@ msgstr "Je sjablonen"
msgid "Public templates"
msgstr "Publieke schemas"
-#: core/templates/navigation.html:64
-msgctxt "as in sorted by category"
-msgid "by category"
-msgstr "per categorie"
-
-#: core/templates/navigation.html:65
-msgctxt "as in sorted by muscle"
-msgid "by muscle"
-msgstr "per spiergroep"
-
-#: core/templates/navigation.html:66
-msgctxt "as in sorted by equipment"
-msgid "by equipment"
-msgstr "per materiaal"
+#: core/templates/navigation.html:63 manager/forms.py:133
+#: manager/models/setting.py:54
+msgid "Exercises"
+msgstr "Oefeningen"
-#: core/templates/navigation.html:70
-#: exercises/templates/equipment/overview.html:109
-#: exercises/templates/equipment/overview.html:113
-#: exercises/templates/exercise/overview.html:112
-#: exercises/templates/exercise/overview.html:116
-#: exercises/templates/muscles/overview.html:112
-#: exercises/templates/muscles/overview.html:116
-msgid "Add new exercise"
-msgstr "Creëer oefening"
-
-#: core/templates/navigation.html:75 core/templates/navigation.html:116
-#: core/templates/navigation.html:224
+#: core/templates/navigation.html:67 core/templates/navigation.html:107
+#: core/templates/navigation.html:215
msgid "Administration"
msgstr "Administratie"
-#: core/templates/navigation.html:76
-#: exercises/templates/exercise/pending.html:6
-msgid "Exercises pending review"
-msgstr "Oefeningen wachtend op goedkeuring"
+#: core/templates/navigation.html:68
+#, fuzzy
+#| msgid "Exercise day"
+msgid "Exercise edit history"
+msgstr "Oefeningdag"
-#: core/templates/navigation.html:77 exercises/models/base.py:72
-#: exercises/templates/exercise/view.html:80
+#: core/templates/navigation.html:69 exercises/models/base.py:84
msgid "Equipment"
msgstr "Materiaal"
-#: core/templates/navigation.html:78 exercises/templates/exercise/view.html:258
+#: core/templates/navigation.html:70
msgid "Muscles"
msgstr "Spieren"
-#: core/templates/navigation.html:79
+#: core/templates/navigation.html:71
#: exercises/templates/categories/admin-overview.html:4
msgid "Categories"
msgstr "Categorieën"
-#: core/templates/navigation.html:93 software/templates/features.html:87
+#: core/templates/navigation.html:84 software/templates/features.html:87
msgid "Nutrition"
msgstr "Voeding"
-#: core/templates/navigation.html:99 core/templates/user/overview.html:144
+#: core/templates/navigation.html:90 core/templates/user/overview.html:144
msgid "Nutrition plans"
msgstr "Voedingsplannen"
-#: core/templates/navigation.html:105 nutrition/templates/bmi/form.html:50
+#: core/templates/navigation.html:96 nutrition/templates/bmi/form.html:50
msgid "BMI calculator"
msgstr "BMI-calculator"
-#: core/templates/navigation.html:111 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:102 nutrition/templates/rate/form.html:17
msgid "Daily calories calculator"
msgstr "Dagelijkse calorieëncalculator"
-#: core/templates/navigation.html:113
+#: core/templates/navigation.html:104
#: nutrition/templates/ingredient/overview.html:29
msgid "Ingredient overview"
msgstr "Ingrediëntenoverzicht"
-#: core/templates/navigation.html:117 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:108 nutrition/templates/units/list.html:6
msgid "Ingredient weight units"
msgstr "Gewichteenheden ingrediënt"
-#: core/templates/navigation.html:118
+#: core/templates/navigation.html:109
#: nutrition/templates/ingredient/pending.html:6
msgid "Ingredients pending review"
msgstr "Ingrediënten in overweging"
-#: core/templates/navigation.html:132
+#: core/templates/navigation.html:123
msgid "Body weight"
msgstr "Lichaamsgewicht"
-#: core/templates/navigation.html:134 core/templates/user/overview.html:114
+#: core/templates/navigation.html:125 core/templates/user/overview.html:114
#: weight/templates/overview.html:7
msgid "Weight overview"
msgstr "Gewichtsoverzicht"
-#: core/templates/navigation.html:147
+#: core/templates/navigation.html:138
msgid "About this software"
msgstr "Over deze software"
-#: core/templates/navigation.html:149 core/templates/template_features.html:82
+#: core/templates/navigation.html:140 core/templates/template_features.html:82
#: software/templates/about_us.html:5
msgid "About us"
msgstr "Over ons"
-#: core/templates/navigation.html:151 software/templates/features.html:209
+#: core/templates/navigation.html:142 software/templates/features.html:209
msgid "REST API"
msgstr "REST API"
-#: core/templates/navigation.html:155 utils/models.py:40
+#: core/templates/navigation.html:146 utils/models.py:41
msgid "License"
msgstr "Licentie"
-#: core/templates/navigation.html:161
+#: core/templates/navigation.html:152
msgid "Developer documentation"
msgstr "Developer documentatie"
-#: core/templates/navigation.html:167
+#: core/templates/navigation.html:158
msgid "Get the code"
msgstr "Download de code"
-#: core/templates/navigation.html:173 core/templates/template.html:204
+#: core/templates/navigation.html:164 core/templates/template.html:203
#: core/templates/template_features.html:99
msgid "Translate"
msgstr "Vertaal"
-#: core/templates/navigation.html:194 core/templates/user/login.html:28
+#: core/templates/navigation.html:185 core/templates/user/login.html:28
msgid "Reset password"
msgstr "Reset wachtwoord"
-#: core/templates/navigation.html:207
+#: core/templates/navigation.html:198
msgid "My preferences"
msgstr "Mijn voorkeuren"
-#: core/templates/navigation.html:214
+#: core/templates/navigation.html:205
msgid "Logout"
msgstr "Afmelden"
-#: core/templates/navigation.html:229
+#: core/templates/navigation.html:220
msgid "Licenses"
msgstr "Licenties"
-#: core/templates/navigation.html:232
+#: core/templates/navigation.html:223
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr "Herhalingen"
-#: core/templates/navigation.html:235 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:226 core/templates/weight_unit/list.html:4
#: nutrition/templates/ingredient/view.html:174
msgid "Weight units"
msgstr "Gewichteenheden"
-#: core/templates/navigation.html:238 core/templates/user/list.html:4
+#: core/templates/navigation.html:229 core/templates/user/list.html:4
msgid "User list"
msgstr "Gebruikerslijst"
-#: core/templates/navigation.html:239
+#: core/templates/navigation.html:230
msgid "Gyms"
msgstr "Gyms"
@@ -1097,33 +1085,30 @@ msgstr "volgende"
msgid "Add weight log"
msgstr "Voeg gewichtlog toe"
-#: core/templates/tags/render_day.html:114
-#: exercises/templates/equipment/overview.html:59
-#: exercises/templates/exercise/overview.html:63
-#: exercises/templates/muscles/overview.html:65
+#: core/templates/tags/render_day.html:116
msgid "Placeholder image for exercise"
msgstr "Placeholder afbeelding voor oefening"
-#: core/templates/tags/render_day.html:131
+#: core/templates/tags/render_day.html:133
msgid "This exercise has no repetitions."
msgstr "Deze oefening heeft geen herhalingen."
-#: core/templates/tags/render_day.html:134
+#: core/templates/tags/render_day.html:136
msgid "Edit them now."
msgstr "Bewerk ze nu."
-#: core/templates/tags/render_day.html:159
+#: core/templates/tags/render_day.html:162
msgid "Add exercises to this workout day"
msgstr "Oefeningen toevoegen aan deze workout-dag."
#: core/templates/tags/render_weight_log.html:17 manager/helpers.py:89
-#: manager/models/setting.py:57 manager/templates/set/formset.html:10
+#: manager/models/setting.py:69 manager/templates/set/formset.html:9
msgid "Reps"
msgstr "Herhalingen"
-#: 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
+#: core/templates/tags/render_weight_log.html:30 manager/forms.py:189
+#: manager/models/log.py:103 manager/models/setting.py:99
+#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
msgid "RiR"
msgstr "RiR"
@@ -1147,7 +1132,7 @@ msgstr "Algemene voorwaarden"
msgid "Features"
msgstr "Functies"
-#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:37
+#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:53
msgid "API key"
msgstr "API sleutel"
@@ -1161,9 +1146,9 @@ msgid ""
"anything). You must pass this information in the header in the format shown "
"below."
msgstr ""
-"Genereer een API-sleutel als je wil interageren met wger via de <a href="
-"\"%(url)s\" rel=\"nofollow\">REST API</a> die ter beschikking wordt gesteld "
-"(voor publieke bronnen als oefeningen of ingrediënten moet je niets "
+"Genereer een API-sleutel als je wil interageren met wger via de <a "
+"href=\"%(url)s\" rel=\"nofollow\">REST API</a> die ter beschikking wordt "
+"gesteld (voor publieke bronnen als oefeningen of ingrediënten moet je niets "
"invullen). Je moet deze informatie doorgeven in de header."
#: core/templates/user/api_key.html:15
@@ -1193,11 +1178,12 @@ msgid "Documentation"
msgstr "Documentatie"
#: core/templates/user/delete_account.html:4
-#: core/templates/user/preferences.html:42
+#: core/templates/user/preferences.html:58
msgid "Delete account"
msgstr "Verwijder account"
#: core/templates/user/delete_account.html:17
+#: exercises/templates/history/overview.html:93
msgid "Are you sure?"
msgstr "Ben je zeker?"
@@ -1244,11 +1230,12 @@ msgstr "Workout toevoegen"
#: core/templates/user/overview.html:34 core/templates/user/overview.html:76
#: core/templates/user/overview.html:120 core/templates/user/overview.html: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
-#: 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
+#: exercises/models/base.py:99 exercises/models/base.py:104
+#: exercises/models/exercise.py:69 exercises/models/exercise.py:76
+#: gallery/models/image.py:47 manager/helpers.py:88 manager/models/log.py:100
+#: 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/views.py:150
@@ -1256,11 +1243,11 @@ msgid "Date"
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: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
+#: exercises/models/exercise.py:57 exercises/views/exercises.py:123
+#: 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 "Beschrijving"
@@ -1268,12 +1255,12 @@ msgstr "Beschrijving"
msgid "Number of logs (days)"
msgstr "Aantal logs (dagen)"
-#: core/templates/user/overview.html:37 core/views/user.py:576
+#: core/templates/user/overview.html:37 core/views/user.py:592
#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:157
msgid "Last activity"
msgstr "Laatste activiteit"
-#: core/templates/user/overview.html:68 manager/forms.py:267
+#: core/templates/user/overview.html:68 manager/forms.py:278
#: manager/templates/workout/view.html:151
msgid "Log"
msgstr "Log"
@@ -1291,6 +1278,7 @@ msgid "Notes"
msgstr "Notities"
#: core/templates/user/overview.html:79
+#: exercises/templates/history/overview.html:30
#: manager/templates/calendar/partial_overview_table.html:42
#: nutrition/templates/log/detail.html:154
msgid "Time"
@@ -1338,10 +1326,12 @@ msgid "Do you really want to change this user&#39;s password?"
msgstr "Weet je zeker dat je het wachtwoord van deze gebruiker wilt wijzigen?"
#: core/templates/user/overview.html:233
+#: exercises/templates/history/overview.html:106
msgid "No"
msgstr "Nee"
#: core/templates/user/overview.html:234
+#: exercises/templates/history/overview.html:99
msgid "Yes"
msgstr "Ja"
@@ -1396,10 +1386,15 @@ msgid "Documents"
msgstr "Documenten"
#: core/templates/user/overview.html:413 gym/templates/document/list.html:32
-#: manager/forms.py:279 manager/templates/workout/view.html:176
+#: manager/forms.py:290 manager/templates/workout/view.html:176
msgid "Download"
msgstr "Download"
+#: core/templates/user/overview.html:451 gym/views/admin_config.py:44
+#: gym/views/admin_config.py:58 gym/views/user_config.py:46
+msgid "Configuration"
+msgstr "Configuratie"
+
#: core/templates/user/overview.html:454 gym/models/user_config.py:92
msgid "Include in inactive overview"
msgstr "Opnemen in inactief overzicht"
@@ -1417,7 +1412,25 @@ msgstr "Aanmelden als deze gebruiker"
msgid "Preferences"
msgstr "Voorkeuren"
-#: core/templates/user/preferences.html:33 core/views/user.py:587
+#: core/templates/user/preferences.html:19
+#, fuzzy
+#| msgid "Send emails"
+msgid "Verified email"
+msgstr "Verzend e-mails"
+
+#: core/templates/user/preferences.html:24
+msgid "Unverified email"
+msgstr ""
+
+#: core/templates/user/preferences.html:26
+msgid "Send verification email"
+msgstr ""
+
+#: core/templates/user/preferences.html:30
+msgid "You need to verify your email to contribute exercises"
+msgstr ""
+
+#: core/templates/user/preferences.html:49 core/views/user.py:603
msgid "Change password"
msgstr "Verander wachtwoord"
@@ -1447,39 +1460,37 @@ msgid "oz"
msgstr "oz"
#: 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
+#: exercises/views/equipment.py:104 exercises/views/exercises.py:185
+#: exercises/views/muscles.py:99 manager/views/schedule.py:311
+#: manager/views/schedule_step.py:129 manager/views/workout.py:269
+#: manager/views/workout_session.py:141 nutrition/views/ingredient.py:138
#: 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:431
-#: exercises/views/muscles.py:125 gallery/views/images.py:121
+#: exercises/views/categories.py:127 exercises/views/exercises.py:193
+#: exercises/views/muscles.py:106 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
+#: manager/views/workout.py:273 manager/views/workout_session.py:156
+#: nutrition/views/ingredient.py:145 nutrition/views/plan.py:127
#: nutrition/views/unit.py:118
#, python-brace-format
msgid "Delete {0}?"
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/repetition_units.py:85 core/views/user.py:472
#: 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: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
+#: exercises/views/equipment.py:81 exercises/views/muscles.py:86
+#: 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:170
+#: gym/views/gym.py:459 manager/views/day.py:100 manager/views/schedule.py:335
+#: manager/views/workout.py:287 nutrition/views/ingredient.py:164
+#: nutrition/views/plan.py:144 nutrition/views/unit.py:144
#, python-brace-format
msgid "Edit {0}"
msgstr "Bewerk {0}"
@@ -1510,64 +1521,65 @@ msgstr "Insturen"
msgid "Your feedback was successfully sent. Thank you!"
msgstr "Je feedback werd met succes verzonden. Bedankt!"
-#: core/views/user.py:156
+#: core/views/user.py:157
#, python-brace-format
msgid "Account \"{0}\" was successfully deleted"
msgstr "Account \"{0}\" werd met succes verwijderd"
-#: core/views/user.py:287
+#: core/views/user.py:294
msgid "You were successfully registered"
msgstr "Je bent met succes geregistreerd"
-#: core/views/user.py:339
+#: core/views/user.py:355
msgid "Settings successfully updated"
msgstr "Instellingen met succes aangepast"
-#: core/views/user.py:376
+#: core/views/user.py:392
msgid "The user was successfully deactivated"
msgstr "De gebruiker werd met succes gedeactiveerd"
-#: core/views/user.py:411
+#: core/views/user.py:427
msgid "The user was successfully activated"
msgstr "De gebruiker werd met succes geactiveerd"
-#: core/views/user.py:426
+#: core/views/user.py:442
msgid "Edit user"
msgstr "Bewerk gebruiker"
-#: core/views/user.py:573 gym/templates/gym/member_list.html:26
+#: core/views/user.py:589 gym/templates/gym/member_list.html:26
#: gym/views/gym.py:156
msgid "ID"
msgstr "ID"
-#: core/views/user.py:574 gym/forms.py:94 gym/templates/contract/view.html:55
+#: core/views/user.py:590 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 "Gebruikersnaam"
-#: core/views/user.py:577 gym/templates/gym/new_user.html:34
+#: core/views/user.py:593 gym/templates/gym/new_user.html:34
#: gym/views/export.py:60 gym/views/gym.py:218
msgid "Gym"
msgstr "Gym"
-#: exercises/models/base.py:51 exercises/templates/exercise/view.html:76
-#: nutrition/models/ingredient.py:204
+#: core/views/user.py:652
+#, python-format
+msgid "A verification email was sent to %(email)s"
+msgstr ""
+
+#: exercises/models/base.py:63 nutrition/models/ingredient.py:204
msgid "Category"
msgstr "Categorie"
-#: exercises/models/base.py:58
+#: exercises/models/base.py:70
msgid "Primary muscles"
msgstr "Primaire spieren"
-#: exercises/models/base.py:64 exercises/templates/equipment/overview.html:71
-#: exercises/templates/exercise/overview.html:76
-#: exercises/templates/exercise/view.html:268
-#: exercises/templates/muscles/overview.html:77
+#: exercises/models/base.py:76
msgid "Secondary muscles"
msgstr "Secundaire spieren"
-#: exercises/models/base.py:79
+#: exercises/models/base.py:91
msgid "Variations"
msgstr "Variaties"
@@ -1575,71 +1587,58 @@ msgstr "Variaties"
msgid "Exercise Categories"
msgstr "Oefeningcategorieën"
-#: exercises/models/comment.py:34 exercises/models/exercise_alias.py:32
-#: exercises/models/image.py:75 exercises/models/video.py:82
-#: manager/forms.py:165 manager/helpers.py:89 manager/models/log.py:51
+#: exercises/models/comment.py:37 exercises/models/exercise_alias.py:35
+#: exercises/models/image.py:71 exercises/models/video.py:95
+#: manager/forms.py:176 manager/helpers.py:89 manager/models/log.py:52
msgid "Exercise"
msgstr "Oefening"
-#: exercises/models/comment.py:41
+#: exercises/models/comment.py:43
msgid "A comment about how to correctly do this exercise."
msgstr "Een opmerking over hoe je deze oefening correct kan uitvoeren."
-#: exercises/models/exercise.py:86 nutrition/models/ingredient.py:80
+#: exercises/models/exercise.py:81 nutrition/models/ingredient.py:80
#: nutrition/models/plan.py:61 nutrition/models/weight_unit.py:32
msgid "Language"
msgstr "Taal"
-#: 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:265
-msgid "New user submitted exercise"
-msgstr "Nieuwe door gebruiker toegevoegde oefening"
-
-#: 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/exercise_alias.py:35
+#: exercises/models/exercise_alias.py:38
msgid "Alias for an exercise"
msgstr "Andere naam voor een oefening"
-#: exercises/models/image.py:59
+#: exercises/models/image.py:55
msgid "Line"
msgstr "Regel"
-#: exercises/models/image.py:60
+#: exercises/models/image.py:56
msgid "3D"
msgstr "3D"
-#: exercises/models/image.py:61
+#: exercises/models/image.py:57
msgid "Low-poly"
msgstr ""
-#: exercises/models/image.py:62
+#: exercises/models/image.py:58
msgid "Photo"
msgstr "Foto"
-#: exercises/models/image.py:63
+#: exercises/models/image.py:59
msgid "Other"
msgstr "Andere"
-#: exercises/models/image.py:81 gallery/models/image.py:56
+#: exercises/models/image.py:77 gallery/models/image.py:56
msgid "Image"
msgstr "Afbeelding"
-#: exercises/models/image.py:82 gallery/models/image.py:57
+#: exercises/models/image.py:78 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:88
+#: exercises/models/image.py:84
msgid "Main picture"
msgstr "Hoofdafbeelding"
-#: exercises/models/image.py:91
+#: exercises/models/image.py:87
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 "
@@ -1649,20 +1648,11 @@ msgstr ""
"stellen voor de oefening (zal oa. getoond worden in zoekresultaten). De "
"eerste afbeelding wordt automatisch aangeduid door het systeem."
-#: exercises/models/image.py:100
+#: exercises/models/image.py:96
#, fuzzy
msgid "The art style of your image"
msgstr "De artistieke stijl van je plaatje"
-#: exercises/models/image.py:185
-msgid "New user submitted image"
-msgstr "Nieuwe door gebruiker toegevoegde afbeelding."
-
-#: 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}."
-
#: exercises/models/muscle.py:37
msgid "In latin, e.g. \"Pectoralis major\""
msgstr "Latijns, bvb. \"Pectoralis major\""
@@ -1677,51 +1667,53 @@ msgstr "naam oefening"
msgid "A more basic name for the muscle"
msgstr ""
-#: exercises/models/video.py:41
-msgid "Maximum file size is 100MB."
+#: exercises/models/video.py:50
+#, fuzzy, python-format
+#| msgid "Maximum file size is 100MB."
+msgid "Maximum file size is %(size)sMB."
msgstr "Maximale bestandsgrootte is 100MB"
-#: exercises/models/video.py:44 exercises/models/video.py:48
+#: exercises/models/video.py:57 exercises/models/video.py:65
msgid "File type is not supported"
msgstr "Bestandstype wordt niet ondersteund"
-#: exercises/models/video.py:57
+#: exercises/models/video.py:70
#, fuzzy
#| msgid "%(birthdate)s is not a valid birthdate"
msgid "File is not a valid video"
msgstr "Bestand is geen geldige video"
-#: exercises/models/video.py:88
+#: exercises/models/video.py:101
#, fuzzy
#| msgid "Main picture"
msgid "Main video"
msgstr "Hoofdvideo"
-#: exercises/models/video.py:94
+#: exercises/models/video.py:107
msgid "Video"
msgstr "Video"
-#: exercises/models/video.py:101
+#: exercises/models/video.py:114
msgid "Size"
msgstr "Grootte"
-#: exercises/models/video.py:108 manager/models/schedule_step.py:56
+#: exercises/models/video.py:121 manager/models/schedule_step.py:56
msgid "Duration"
msgstr "Duur"
-#: exercises/models/video.py:117
+#: exercises/models/video.py:130
msgid "Width"
msgstr "Breedte"
-#: exercises/models/video.py:124
+#: exercises/models/video.py:137
msgid "Height"
msgstr "Hoogte"
-#: exercises/models/video.py:131
+#: exercises/models/video.py:144
msgid "Codec"
msgstr "Codec"
-#: exercises/models/video.py:139
+#: exercises/models/video.py:152
msgid "Codec, long name"
msgstr "Codec, lange naam"
@@ -1730,139 +1722,23 @@ msgid "Equipment list"
msgstr "Materiaallijst"
#: exercises/templates/equipment/admin-overview.html:37
-#: exercises/views/equipment.py:94
+#: exercises/views/equipment.py:92
msgid "Add new equipment"
msgstr "Materiaal toevoegen"
-#: exercises/templates/equipment/overview.html:11
-msgid "Equipment overview"
-msgstr "Materiaaloverzicht"
-
-#: exercises/templates/equipment/overview.html:69
-#: exercises/templates/exercise/overview.html:74
-#: exercises/templates/exercise/view.html:264
-#: exercises/templates/muscles/overview.html:75
-msgid "Main muscles"
-msgstr "Primaire spieren"
-
-#: exercises/templates/equipment/overview.html:79
-msgid ""
-"No exercises for this equipment. Add or edit an exercise and set the "
-"equipment."
-msgstr ""
-"Geen oefeningen voor dit materiaal. Creëer of bewerk een oefening en stel "
-"dit materiaal in."
-
-#: exercises/templates/equipment/overview.html:96
-#: exercises/templates/exercise/overview.html:99
-#: nutrition/templates/ingredient/overview.html:57
-msgid "Search"
-msgstr "Zoek"
-
-#: exercises/templates/equipment/overview.html:101
-#: exercises/templates/exercise/overview.html:104
-msgid "exercise name"
-msgstr "naam oefening"
-
-#: exercises/templates/equipment/overview.html:115
-#: exercises/templates/exercise/overview.html:118
-#: exercises/templates/muscles/overview.html:118
-#: nutrition/templates/ingredient/overview.html:85
-msgid "Only registered users can do this"
-msgstr "Enkel geregistreerde gebruikers kunnen dit"
-
-#: exercises/templates/exercise/email_new.tpl:1
-#, python-format
-msgid ""
-"Your exercise '%(exercise)s' was successfully added to the general\n"
-"database."
-msgstr "Oefening '%(exercise)s' met succes toegevoegd aan de algemene databank"
-
-#: exercises/templates/exercise/email_new.tpl:4
-msgid ""
-"It is now available on the exercise and muscle overview and can be\n"
-"added to workouts. You can access it on this address:"
-msgstr ""
-"Het is nu beschikbaar op het oefeningen- en spierenoverzicht en kan\n"
-"worden toegevoegd aan je workouts. Je kan het terugvinden op dit adres:"
-
-#: exercises/templates/exercise/email_new.tpl:8
-#: nutrition/templates/ingredient/email_new.tpl:8
-msgid "Thank you for contributing and making this site better!"
-msgstr "Bedankt voor je bijdrage en om deze site beter te maken!"
-
-#: exercises/templates/exercise/email_new.tpl:9
-#: manager/templates/workout/email_reminder.tpl:15
-#: manager/templates/workout/email_weight_reminder.tpl:12
-#: nutrition/templates/ingredient/email_new.tpl:9
-#, python-format
-msgid "The %(site)s team"
-msgstr "De %(site)s team"
-
-#: exercises/templates/exercise/form.html:4
-msgid "Submitting an exercise"
-msgstr "Een oefening indienen"
-
-#: exercises/templates/exercise/form.html:5
-msgid ""
-"Thank you for submitting an exercise. This is much\n"
-"appreciated!"
-msgstr ""
-"Bedankt voor het indienen van een oefening. Dit wordt erg geapprecieerd!"
-
-#: exercises/templates/exercise/form.html:8
-msgid ""
-"After you submit the form, the administrators will be notified.\n"
-"Once it is reviewed, it will be added to the database. Till this happens,\n"
-"it will not be visible in the overview or the search. In case you added your "
-"email\n"
-"when you registered, you will get notified when the process is completed "
-"successfully."
-msgstr ""
-"Nadat je het formulier instuurt, zal een administrator worden ingelicht.\n"
-"Zodra je insturing is beoordeeld, zal deze worden toegevoegd aan de "
-"databank.\n"
-"Totdat dit is gebeurd, zal deze niet zichtbaar zijn in het overzicht of de "
-"zoekresultaten.\n"
-"In geval je je e-mailadres hebt toegevoegd bij het registeren, zal je op de "
-"hoogte worden\n"
-"gebracht wanneer het proces met succes voltooid werd."
-
-#: exercises/templates/exercise/form_correct.html:4
-msgid "Correcting an exercise"
-msgstr "Een oefening indienen"
-
-#: exercises/templates/exercise/form_correct.html:5
-msgid ""
-"Thank you for correcting and improving this exercise.\n"
-"This is much appreciated!"
-msgstr ""
-"Bedankt voor het verbeteren van deze oefening.\n"
-"Wij waarderen dit enorm!"
-
-#: exercises/templates/exercise/form_correct.html:8
-msgid ""
-"After you submit the form, the administrators will be notified.\n"
-"Once the changes are reviewed the exercise will be updated."
-msgstr ""
-"Nadat je het formulier hebt verzonden, zullen de beheerders worden "
-"verwittigd.\n"
-"Zodra de wijzigingen zijn nagekeken zal de oefening worden bijgewerkt."
-
-#: exercises/templates/exercise/overview.html:88
-msgid "No categories."
-msgstr "Geen categorieën."
-
-#: exercises/templates/exercise/overview.html:88
-msgid "Use link to create one"
-msgstr "Link gebruiken om er een te creëren"
+#: exercises/templates/history/overview.html:11
+#, fuzzy
+#| msgid "Exercise day"
+msgid "Exercise admin history"
+msgstr "Oefeningdag"
-#: exercises/templates/exercise/pending.html:14
-#: nutrition/templates/ingredient/pending.html:14
-msgid "Submission date"
-msgstr "Instuurdatum"
+#: exercises/templates/history/overview.html:27
+#, fuzzy
+#| msgid "Actions"
+msgid "Action"
+msgstr "Acties"
-#: exercises/templates/exercise/pending.html:16 gallery/models/image.py:51
+#: exercises/templates/history/overview.html:28 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/log.py:45
@@ -1873,101 +1749,47 @@ msgstr "Instuurdatum"
msgid "User"
msgstr "Gebruiker"
-#: exercises/templates/exercise/view.html:48
-msgid "Exercise is pending review"
-msgstr "Oefening wacht op goedkeuring"
+#: exercises/templates/history/overview.html:29
+#, fuzzy
+#| msgctxt "As in \"email subject\""
+#| msgid "Subject"
+msgid "Object"
+msgstr "Onderwerp"
-#: exercises/templates/exercise/view.html:51
-msgid ""
-"This user submitted exercise is pending a decision to be\n"
-" included in the database."
-msgstr ""
-"Deze door de gebruiker ingediende oefening wacht op een beslissing \n"
-"alvorens toegevoegd te worden in de databank."
+#: exercises/templates/history/overview.html:31
+#, fuzzy
+#| msgctxt "Noun, not verb"
+#| msgid "Change"
+msgid "Changes"
+msgstr "Verander"
-#: exercises/templates/exercise/view.html:53
-msgid "Till then, it will not be shown in the overview or the search."
+#: exercises/templates/history/overview.html:32
+msgid "Revert"
msgstr ""
-"Tot dat moment zal deze niet zichtbaar zijn in het overzicht of de "
-"zoekresultaten."
-
-#: exercises/templates/exercise/view.html:54
-#: nutrition/templates/ingredient/view.html:31
-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:203
-#: nutrition/templates/ingredient/view.html:38
-msgid "Accept"
-msgstr "Aanvaard"
-
-#: exercises/templates/exercise/view.html:64
-#: exercises/templates/exercise/view.html:204
-#: nutrition/templates/ingredient/view.html:42
-msgid "Decline"
-msgstr "Weiger"
-#: exercises/templates/exercise/view.html:96
-msgid "Images"
-msgstr "Afbeeldingen"
-
-#: exercises/templates/exercise/view.html:137 exercises/views/images.py:93
-msgid "Add new image"
-msgstr "Voeg afbeelding toe"
-
-#: exercises/templates/exercise/view.html:148
-msgid "Videos"
-msgstr "Video's"
-
-#: exercises/templates/exercise/view.html:187 exercises/views/videos.py:94
-msgid "Add new video"
-msgstr "Voeg video toe"
-
-#: exercises/templates/exercise/view.html:197
-msgid "Images pending review"
-msgstr "Afbeelding wacht op goedkeuring"
-
-#: exercises/templates/exercise/view.html:218
-msgid "Comments for this exercise"
-msgstr "Opmerkingen voor deze oefening"
-
-#: exercises/templates/exercise/view.html:246
-msgid "Add new comment"
-msgstr "Voeg opmerking toe"
-
-#: 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:301
-#: manager/templates/workout/log.html:10 manager/templates/workout/log.html:11
-msgid "Weight log"
-msgstr "Gewichtlog"
+#: exercises/templates/history/overview.html:64
+msgid "View Object"
+msgstr ""
-#: exercises/templates/exercise/view.html:306
-msgid "Exercise Variations"
-msgstr "Oefeningvariaties"
+#: exercises/templates/history/overview.html:75
+#, fuzzy
+#| msgid "View logs"
+msgid "View changes"
+msgstr "Bekijk logs"
-#: exercises/templates/exercise/view.html:327
-msgid "Submit a correction"
-msgstr "Voeg een correctie toe"
+#: exercises/templates/history/overview.html:86
+msgid "Revert changes"
+msgstr ""
#: exercises/templates/muscles/admin-overview.html:4
-#: exercises/templates/muscles/overview.html:7
msgid "Muscle overview"
msgstr "Spieroverzicht"
#: exercises/templates/muscles/admin-overview.html:36
-#: exercises/views/muscles.py:86
+#: exercises/views/muscles.py:67
msgid "Add muscle"
msgstr "Creëer spier"
-#: exercises/templates/muscles/overview.html:85
-msgid ""
-"No exercises for this muscle. Add or edit an exercise and set the muscle."
-msgstr ""
-
#: exercises/views/categories.py:71
msgid "Add category"
msgstr "Creëer categorie"
@@ -1980,52 +1802,19 @@ msgstr "Dit zal ook alle oefeningen in deze categorie verwijderen."
msgid "Add exercise comment"
msgstr "Voeg opmerking oefening toe"
-#: exercises/views/equipment.py:107 exercises/views/equipment.py:118
+#: exercises/views/equipment.py:105 exercises/views/equipment.py:116
msgid "Delete equipment?"
msgstr "Materiaal verwijderen?"
-#: exercises/views/exercises.py:229
+#: exercises/views/exercises.py:161
#, python-format
-msgid ""
-"%(name_original)s is too similar to existing exercise \"%(exercise_name)s\""
-msgstr ""
-
-#: exercises/views/exercises.py:247
-msgid "Add exercise"
-msgstr "Creëer oefening"
-
-#: exercises/views/exercises.py:367
-msgid "Thank you. Once the changes are reviewed the exercise will be updated."
+msgid "%(name)s is too similar to existing exercise \"%(exercise_name)s\""
msgstr ""
-"Bedankt. Wanneer de verandering is goedgekeurd zal de oefening worden "
-"geupdate."
-
-#: exercises/views/exercises.py:380
-#, python-brace-format
-msgid "Correct {0}"
-msgstr "Juist {0}"
-#: exercises/views/exercises.py:422
+#: exercises/views/exercises.py:184
msgid "This will delete the exercise from all workouts."
msgstr "Dit zal de oefening van alle workouts verwijderen."
-#: exercises/views/exercises.py:474
-msgid "Exercise was successfully marked as rejected"
-msgstr "Oefening met succes gemarkeerd als afgewezen"
-
-#: exercises/views/images.py:68
-msgid "Edit exercise image"
-msgstr "Bewerk afbeelding oefening"
-
-#: exercises/views/images.py:143
-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"
@@ -2095,7 +1884,7 @@ 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:59
+#: manager/templates/log/add.html:52 nutrition/forms.py:60
#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:102
#: nutrition/models/meal_item.py:72
msgid "Amount"
@@ -2198,6 +1987,10 @@ msgstr "Zal bestandsnaam gebruiken indien niets voorzien"
msgid "User notes"
msgstr "Gebruikersnotities"
+#: gym/templates/contract/list.html:36
+msgid "Show"
+msgstr "Toon"
+
#: gym/templates/contract/view.html:4
msgid "Contract"
msgstr "Contract"
@@ -2276,10 +2069,6 @@ msgstr "E-mails"
msgid "Add member"
msgstr "Lid toevoegen"
-#: gym/templates/gym/new_user.html:38
-msgid "Date of Birth"
-msgstr "Geboortedatum"
-
#: gym/templates/gym/new_user.html:48 manager/templates/calendar/month.html:144
#: manager/templates/log/add.html:75 nutrition/templates/rate/form.html:120
msgid "Info"
@@ -2341,132 +2130,132 @@ msgstr "Gebruiker aan gym toevoegen"
msgid "Edit gym"
msgstr "Gym bewerken"
-#: i18n.tpl:2 i18n.tpl:28
+#: i18n.tpl:2
+msgid "Until Failure"
+msgstr "Tot je faalt"
+
+#: i18n.tpl:3 manager/forms.py:180 manager/models/log.py:73
+#: manager/templates/set/add.html:53
+msgid "Repetitions"
+msgstr "Herhalingen"
+
+#: i18n.tpl:4
msgid "Abs"
msgstr "Buikspieren"
-#: i18n.tpl:3
+#: i18n.tpl:5
msgid "Arms"
msgstr "Armen"
-#: i18n.tpl:4
-msgid "Back"
-msgstr "Rug"
-
-#: i18n.tpl:5 i18n.tpl:23
-msgid "Calves"
-msgstr "Kuiten"
-
-#: i18n.tpl:6 i18n.tpl:26
-msgid "Chest"
-msgstr "Borstkas"
-
-#: i18n.tpl:7
+#: i18n.tpl:6
msgid "Legs"
msgstr "Benen"
-#: i18n.tpl:8 i18n.tpl:19
-msgid "Shoulders"
-msgstr "Schouders"
+#: i18n.tpl:7
+msgid "Dumbbell"
+msgstr "Vrije halter"
+
+#: i18n.tpl:8
+#, fuzzy
+#| msgid "Biceps brachii"
+msgid "Biceps"
+msgstr "Biceps brachii"
#: i18n.tpl:9
-msgid "Barbell"
-msgstr "Halter"
+msgid "SZ-Bar"
+msgstr "SZ-staaf"
#: i18n.tpl:10
-msgid "Bench"
-msgstr "Bank"
+msgid "Kettlebell"
+msgstr "Kettlebell"
#: i18n.tpl:11
-msgid "Dumbbell"
-msgstr "Vrije halter"
+msgid "Swiss Ball"
+msgstr "Kogelgewicht"
#: i18n.tpl:12
-msgid "Gym mat"
-msgstr "Gym-matje"
+msgid "none (bodyweight exercise)"
+msgstr "Geen (oefening met lichaamsgewicht)"
#: i18n.tpl:13
-msgid "Incline bench"
-msgstr "Hellende bank"
+msgid "Calves"
+msgstr "Kuiten"
#: i18n.tpl:14
-msgid "Kettlebell"
-msgstr "Kettlebell"
+msgid "Back"
+msgstr "Rug"
#: i18n.tpl:15
-msgid "Pull-up bar"
-msgstr "Optrekstaaf"
+msgid "Lower back"
+msgstr ""
#: i18n.tpl:16
-msgid "SZ-Bar"
-msgstr "SZ-staaf"
+msgid "Lats"
+msgstr ""
#: i18n.tpl:17
-msgid "Swiss Ball"
-msgstr "Kogelgewicht"
+msgid "Hamstrings"
+msgstr ""
#: i18n.tpl:18
-msgid "none (bodyweight exercise)"
-msgstr "Geen (oefening met lichaamsgewicht)"
+msgid "Bench"
+msgstr "Bank"
-#: i18n.tpl:20
+#: i18n.tpl:19
#, fuzzy
-#| msgid "Biceps brachii"
-msgid "Biceps"
-msgstr "Biceps brachii"
+#| msgid "Minutes"
+msgid "Glutes"
+msgstr "Minuten"
+
+#: i18n.tpl:20
+msgid "Kilometers"
+msgstr "Kilometer"
#: i18n.tpl:21
-msgid "Hamstrings"
-msgstr ""
+msgid "Shoulders"
+msgstr "Schouders"
#: i18n.tpl:22
-msgid "Lower back"
-msgstr ""
+msgid "Seconds"
+msgstr "Seconden"
+
+#: i18n.tpl:23
+msgid "Miles"
+msgstr "Mijl"
#: i18n.tpl:24
-#, fuzzy
-#| msgid "Minutes"
-msgid "Glutes"
-msgstr "Minuten"
+msgid "Incline bench"
+msgstr "Hellende bank"
#: i18n.tpl:25
-msgid "Lats"
+msgid "Quads"
msgstr ""
+#: i18n.tpl:26
+msgid "Minutes"
+msgstr "Minuten"
+
#: i18n.tpl:27
-msgid "Quads"
-msgstr ""
+msgid "Chest"
+msgstr "Borstkas"
+
+#: i18n.tpl:28
+msgid "Gym mat"
+msgstr "Gym-matje"
#: i18n.tpl:29
-#, fuzzy
-#| msgid "Triceps brachii"
-msgid "Triceps"
-msgstr "Triceps brachii"
+msgid "Pull-up bar"
+msgstr "Optrekstaaf"
#: i18n.tpl:30
-msgid "Kilometers"
-msgstr "Kilometer"
+msgid "Barbell"
+msgstr "Halter"
#: i18n.tpl:31
-msgid "Miles"
-msgstr "Mijl"
-
-#: i18n.tpl:32
-msgid "Minutes"
-msgstr "Minuten"
-
-#: i18n.tpl:33 manager/forms.py:169 manager/models/log.py:71
-#: manager/templates/set/add.html:53
-msgid "Repetitions"
-msgstr "Herhalingen"
-
-#: i18n.tpl:34
-msgid "Seconds"
-msgstr "Seconden"
-
-#: i18n.tpl:35
-msgid "Until Failure"
-msgstr "Tot je faalt"
+#, fuzzy
+#| msgid "Triceps brachii"
+msgid "Triceps"
+msgstr "Triceps brachii"
#: mailer/forms.py:34 mailer/templates/mailer/gym/preview.html:32
msgctxt "As in \"email subject\""
@@ -2521,13 +2310,13 @@ msgstr "Verzend e-mails"
msgid "Correction"
msgstr "Verbetering"
-#: manager/forms.py:89 manager/models/workout.py:59
+#: manager/forms.py:92 manager/models/workout.py:59
#, fuzzy
#| msgid "Make a copy of this workout"
msgid "The name of the workout"
msgstr "Kopieer deze workout"
-#: manager/forms.py:93 manager/models/workout.py:66
+#: manager/forms.py:96 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'."
@@ -2535,7 +2324,7 @@ msgstr ""
"Een korte beschrijving of doel van de workout. Bijvoorbeeld \"Focus op rug\" "
"of \"Week 1 van programma X\"."
-#: manager/forms.py:126
+#: manager/forms.py:137
msgid ""
"You can search for more than one exercise, they will be grouped together for "
"a superset."
@@ -2543,28 +2332,28 @@ msgstr ""
"Je kan zoeken naar meer dan één oefening, ze zullen gegroepeerd worden in "
"een supserset."
-#: 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
+#: manager/forms.py:166 manager/forms.py:171 manager/models/log.py:64
+#: manager/models/log.py:92 manager/models/setting.py:59
+#: manager/models/setting.py:90 manager/templates/log/add.html:53
+#: manager/templates/log/add.html:55 manager/templates/set/formset.html:10
+#: manager/templates/set/formset.html:12 measurements/models/category.py:58
+#: nutrition/forms.py:64
msgid "Unit"
msgstr "Eenheid"
-#: manager/forms.py:266
+#: manager/forms.py:277
msgid "Type"
msgstr "Type"
-#: manager/forms.py:267 manager/templates/workout/view.html:157
+#: manager/forms.py:278 manager/templates/workout/view.html:157
msgid "Table"
msgstr "Tabel"
-#: manager/forms.py:269 manager/templates/workout/view.html:163
+#: manager/forms.py:280 manager/templates/workout/view.html:163
msgid "with images"
msgstr "met afbeelding"
-#: manager/forms.py:270 manager/templates/workout/view.html:169
+#: manager/forms.py:281 manager/templates/workout/view.html:169
msgid "with comments"
msgstr "met reacties"
@@ -2624,7 +2413,7 @@ msgid "The duration in weeks"
msgstr "De duurtijd in weken"
#: manager/models/schedule_step.py:63 manager/models/set.py:52
-#: manager/models/setting.py:98 nutrition/models/meal.py:54
+#: manager/models/setting.py:110 nutrition/models/meal.py:54
#: nutrition/models/meal_item.py:65
msgid "Order"
msgstr "Volgorde"
@@ -2677,7 +2466,7 @@ msgstr "Oefeningdag"
msgid "Number of sets"
msgstr "Aantal sets"
-#: manager/models/setting.py:43
+#: manager/models/setting.py:48
msgid "Sets"
msgstr "Sets"
@@ -2962,6 +2751,13 @@ msgstr ""
"Als je nooit e-mailherinneringen wenst te ontvangen, deactiveer je de optie "
"in je instellingen."
+#: manager/templates/workout/email_reminder.tpl:15
+#: manager/templates/workout/email_weight_reminder.tpl:12
+#: nutrition/templates/ingredient/email_new.tpl:9
+#, python-format
+msgid "The %(site)s team"
+msgstr "De %(site)s team"
+
#: manager/templates/workout/email_weight_reminder.tpl:3
#, python-format
msgid ""
@@ -2974,6 +2770,10 @@ msgid ""
"You will regularly receive such reminders till you enter your current weight."
msgstr ""
+#: manager/templates/workout/log.html:10 manager/templates/workout/log.html:11
+msgid "Weight log"
+msgstr "Gewichtlog"
+
#: manager/templates/workout/log.html:29
msgid "Weight log for workout"
msgstr "Gewichtlog voor workout"
@@ -3084,7 +2884,7 @@ msgstr "Bekijk logs"
msgid "Edit workout"
msgstr "Bewerk workout"
-#: manager/templates/workout/view.html:225 manager/views/workout.py:300
+#: manager/templates/workout/view.html:225 manager/views/workout.py:301
msgid "Mark as template"
msgstr ""
@@ -3092,11 +2892,6 @@ msgstr ""
msgid "Add workout day"
msgstr "Voeg workout-dag toe"
-#: manager/views/log.py:92
-#, python-format
-msgid "Edit log entry for %s"
-msgstr "Bewerk logingave voor %s"
-
#: manager/views/log.py:111
msgid "Delete workout log"
msgstr "Verwijder workout-log"
@@ -3114,11 +2909,11 @@ msgstr "Schema aanmaken"
msgid "Your workouts"
msgstr "Je workouts"
-#: manager/views/workout.py:227
+#: manager/views/workout.py:228
msgid "Copy workout"
msgstr "Kopieer workout"
-#: manager/views/workout.py:230
+#: manager/views/workout.py:231
msgid "Copy"
msgstr "Kopieer"
@@ -3140,23 +2935,23 @@ msgstr ""
msgid "Value"
msgstr ""
-#: nutrition/forms.py:122
+#: nutrition/forms.py:123
msgid "Calculate"
msgstr "Bereken"
-#: nutrition/forms.py:195 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:196 nutrition/templates/rate/form.html:76
msgid "Basic caloric intake"
msgstr "Basis calorie-inname"
-#: nutrition/forms.py:196
+#: nutrition/forms.py:197
msgid "Your basic caloric intake as calculated for your data"
msgstr "Je basis calorie-inname zoals berekend voor je data"
-#: nutrition/forms.py:202
+#: nutrition/forms.py:203
msgid "Additional calories"
msgstr "Bijkomende calorieën"
-#: nutrition/forms.py:204
+#: nutrition/forms.py:205
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
@@ -3164,7 +2959,7 @@ msgstr ""
"Bijkomende calorieën om toe te voegen aan het basisaantal (om af te trekken, "
"voer een negatief cijfer in)"
-#: nutrition/forms.py:232 nutrition/models/ingredient_weight_unit.py:39
+#: nutrition/forms.py:233 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"
@@ -3227,7 +3022,7 @@ msgid ""
"{energy_approx}%)"
msgstr ""
-#: nutrition/models/ingredient.py:357 nutrition/views/ingredient.py:225
+#: nutrition/models/ingredient.py:357 nutrition/views/ingredient.py:219
msgid "Ingredient was successfully added to the general database"
msgstr "Ingrediënt met succes toegevoegd aan de algemene databank"
@@ -3256,6 +3051,12 @@ msgstr "Eenheidshoeveelheid, bvb. \"1 kopje\" of \"1/2 lepel\""
msgid "Meal"
msgstr "Maaltijd"
+#: nutrition/models/log.py:65
+#, fuzzy
+#| msgid "Time (approx)"
+msgid "Date and Time (Approx.)"
+msgstr "Tijd (ongeveer)"
+
#: nutrition/models/meal.py:61
msgid "Time (approx)"
msgstr "Tijd (ongeveer)"
@@ -3359,6 +3160,10 @@ msgstr ""
"worden toegevoegd aan voedingsplannen. Je kan het \n"
"terugvinden op dit adres: "
+#: nutrition/templates/ingredient/email_new.tpl:8
+msgid "Thank you for contributing and making this site better!"
+msgstr "Bedankt voor je bijdrage en om deze site beter te maken!"
+
#: nutrition/templates/ingredient/form.html:4
msgid "Submitting an ingredient"
msgstr "Een ingrediënt toevoegen"
@@ -3393,6 +3198,10 @@ msgstr ""
msgid "No ingredients."
msgstr "Geen ingrediënten."
+#: nutrition/templates/ingredient/overview.html:57
+msgid "Search"
+msgstr "Zoek"
+
#: nutrition/templates/ingredient/overview.html:66
msgid "ingredient name"
msgstr "Naam ingrediënt"
@@ -3402,6 +3211,14 @@ msgstr "Naam ingrediënt"
msgid "Add ingredient"
msgstr "Ingrediënt toevoegen"
+#: nutrition/templates/ingredient/overview.html:85
+msgid "Only registered users can do this"
+msgstr "Enkel geregistreerde gebruikers kunnen dit"
+
+#: nutrition/templates/ingredient/pending.html:14
+msgid "Submission date"
+msgstr "Instuurdatum"
+
#: nutrition/templates/ingredient/view.html:27
msgid "Ingredient is pending review"
msgstr "Ingrediënt in overweging"
@@ -3417,6 +3234,18 @@ msgstr ""
"een goedkeuring om toegevoegd te worden aan de databank. Tot dat moment\n"
"zal deze niet worden getoond in het overzicht of de zoekresultaten."
+#: nutrition/templates/ingredient/view.html:31
+msgid "Please select one of the options below."
+msgstr "Gelieve één van de opties hieronder te kiezen."
+
+#: nutrition/templates/ingredient/view.html:38
+msgid "Accept"
+msgstr "Aanvaard"
+
+#: nutrition/templates/ingredient/view.html:42
+msgid "Decline"
+msgstr "Weiger"
+
#: nutrition/templates/ingredient/view.html:71
#: nutrition/templates/log/detail.html:31
#: nutrition/templates/plan/view.html:229 nutrition/views/plan.py:376
@@ -3684,14 +3513,18 @@ msgstr ""
"schatting zijn. Als je je voedingsplan op deze waarden baseert, observeer "
"jezelf dan voor enkele weken en verander de totale hoeveelheid indien nodig."
-#: nutrition/views/ingredient.py:181
+#: nutrition/views/ingredient.py:175
msgid "Add a new ingredient"
msgstr "Nieuw ingrediënt toevoegen"
-#: nutrition/views/ingredient.py:238
+#: nutrition/views/ingredient.py:232
msgid "Ingredient was successfully marked as rejected"
msgstr "Ingrediënt met succes gemarkeerd als afgewezen"
+#: nutrition/views/log.py:230 nutrition/views/unit_ingredient.py:139
+msgid "Delete?"
+msgstr "Verwijderen?"
+
#: nutrition/views/meal.py:55
msgid "Add new meal"
msgstr "Maaltijd toevoegen"
@@ -3913,15 +3746,15 @@ msgstr ""
msgid "100%% Free <br>and <br>Open Source"
msgstr "100%%Gratis<br>en<br>Open Source"
-#: utils/generic_views.py:261
+#: utils/generic_views.py:262
msgid "Yes, delete"
msgstr "Ja, verwijder"
-#: utils/models.py:47
+#: utils/models.py:48
msgid "Author"
msgstr "Auteur"
-#: utils/models.py:52
+#: utils/models.py:53
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."
@@ -3929,15 +3762,15 @@ msgstr ""
"Als je niet de auteur bent, voeg dan de naam of bron hier toe. Dit is nodig "
"voor sommige licenties, oa. de CC-BY-SA."
-#: utils/models.py:77
+#: utils/models.py:78
msgid "Pending"
msgstr "In overweging"
-#: utils/models.py:78
+#: utils/models.py:79
msgid "Accepted"
msgstr "Aanvaard"
-#: utils/models.py:79
+#: utils/models.py:80
msgid "Declined"
msgstr "Afgewezen"
@@ -4095,6 +3928,212 @@ msgstr "Met succes verwijderd."
msgid "Delete weight entry for the %s"
msgstr "Verwijder gewichtsingave voor de %s"
+#~ msgid "Ingredients"
+#~ msgstr "Ingrediënten"
+
+#~ msgid ""
+#~ "Use the configuration to select in what languages the\n"
+#~ "exercises and ingredients will be shown for the current language (for "
+#~ "example\n"
+#~ "the exercises should be shown in languages A, B and C; the ingredients "
+#~ "only\n"
+#~ "in A)."
+#~ msgstr ""
+#~ "Gebruik de configuratie om te selecteren in welke talen de\n"
+#~ "oefeningen en ingrediënten getoond zullne worden voor de huidige taal "
+#~ "(bvb\n"
+#~ "deo efeningen kunnen getoond worden in talen A, B en C; de ingrediënten "
+#~ "enkel\n"
+#~ "in A)."
+
+#~ msgctxt "as in sorted by category"
+#~ msgid "by category"
+#~ msgstr "per categorie"
+
+#~ msgctxt "as in sorted by muscle"
+#~ msgid "by muscle"
+#~ msgstr "per spiergroep"
+
+#~ msgctxt "as in sorted by equipment"
+#~ msgid "by equipment"
+#~ msgstr "per materiaal"
+
+#~ msgid "Add new exercise"
+#~ msgstr "Creëer oefening"
+
+#~ msgid "Exercises pending review"
+#~ msgstr "Oefeningen wachtend op goedkeuring"
+
+#~ msgid "Exercise was successfully added to the general database"
+#~ msgstr "Oefening met succes toegevoegd aan de algemene databank"
+
+#~ msgid "New user submitted exercise"
+#~ msgstr "Nieuwe door gebruiker toegevoegde oefening"
+
+#, python-brace-format
+#~ msgid "The user {0} submitted a new exercise \"{1}\"."
+#~ msgstr "Gebruiker {0} voegde een nieuwe oefening \"{1}\" toe."
+
+#~ msgid "New user submitted image"
+#~ msgstr "Nieuwe door gebruiker toegevoegde afbeelding."
+
+#, 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}."
+
+#~ msgid "Equipment overview"
+#~ msgstr "Materiaaloverzicht"
+
+#~ msgid "Main muscles"
+#~ msgstr "Primaire spieren"
+
+#~ msgid ""
+#~ "No exercises for this equipment. Add or edit an exercise and set the "
+#~ "equipment."
+#~ msgstr ""
+#~ "Geen oefeningen voor dit materiaal. Creëer of bewerk een oefening en stel "
+#~ "dit materiaal in."
+
+#~ msgid "exercise name"
+#~ msgstr "naam oefening"
+
+#, python-format
+#~ msgid ""
+#~ "Your exercise '%(exercise)s' was successfully added to the general\n"
+#~ "database."
+#~ msgstr ""
+#~ "Oefening '%(exercise)s' met succes toegevoegd aan de algemene databank"
+
+#~ msgid ""
+#~ "It is now available on the exercise and muscle overview and can be\n"
+#~ "added to workouts. You can access it on this address:"
+#~ msgstr ""
+#~ "Het is nu beschikbaar op het oefeningen- en spierenoverzicht en kan\n"
+#~ "worden toegevoegd aan je workouts. Je kan het terugvinden op dit adres:"
+
+#~ msgid "Submitting an exercise"
+#~ msgstr "Een oefening indienen"
+
+#~ msgid ""
+#~ "Thank you for submitting an exercise. This is much\n"
+#~ "appreciated!"
+#~ msgstr ""
+#~ "Bedankt voor het indienen van een oefening. Dit wordt erg geapprecieerd!"
+
+#~ msgid ""
+#~ "After you submit the form, the administrators will be notified.\n"
+#~ "Once it is reviewed, it will be added to the database. Till this "
+#~ "happens,\n"
+#~ "it will not be visible in the overview or the search. In case you added "
+#~ "your email\n"
+#~ "when you registered, you will get notified when the process is completed "
+#~ "successfully."
+#~ msgstr ""
+#~ "Nadat je het formulier instuurt, zal een administrator worden ingelicht.\n"
+#~ "Zodra je insturing is beoordeeld, zal deze worden toegevoegd aan de "
+#~ "databank.\n"
+#~ "Totdat dit is gebeurd, zal deze niet zichtbaar zijn in het overzicht of "
+#~ "de zoekresultaten.\n"
+#~ "In geval je je e-mailadres hebt toegevoegd bij het registeren, zal je op "
+#~ "de hoogte worden\n"
+#~ "gebracht wanneer het proces met succes voltooid werd."
+
+#~ msgid "Correcting an exercise"
+#~ msgstr "Een oefening indienen"
+
+#~ msgid ""
+#~ "Thank you for correcting and improving this exercise.\n"
+#~ "This is much appreciated!"
+#~ msgstr ""
+#~ "Bedankt voor het verbeteren van deze oefening.\n"
+#~ "Wij waarderen dit enorm!"
+
+#~ msgid ""
+#~ "After you submit the form, the administrators will be notified.\n"
+#~ "Once the changes are reviewed the exercise will be updated."
+#~ msgstr ""
+#~ "Nadat je het formulier hebt verzonden, zullen de beheerders worden "
+#~ "verwittigd.\n"
+#~ "Zodra de wijzigingen zijn nagekeken zal de oefening worden bijgewerkt."
+
+#~ msgid "No categories."
+#~ msgstr "Geen categorieën."
+
+#~ msgid "Use link to create one"
+#~ msgstr "Link gebruiken om er een te creëren"
+
+#~ msgid "Exercise is pending review"
+#~ msgstr "Oefening wacht op goedkeuring"
+
+#~ msgid ""
+#~ "This user submitted exercise is pending a decision to be\n"
+#~ " included in the database."
+#~ msgstr ""
+#~ "Deze door de gebruiker ingediende oefening wacht op een beslissing \n"
+#~ "alvorens toegevoegd te worden in de databank."
+
+#~ msgid "Till then, it will not be shown in the overview or the search."
+#~ msgstr ""
+#~ "Tot dat moment zal deze niet zichtbaar zijn in het overzicht of de "
+#~ "zoekresultaten."
+
+#~ msgid "Images"
+#~ msgstr "Afbeeldingen"
+
+#~ msgid "Add new image"
+#~ msgstr "Voeg afbeelding toe"
+
+#~ msgid "Videos"
+#~ msgstr "Video's"
+
+#~ msgid "Add new video"
+#~ msgstr "Voeg video toe"
+
+#~ msgid "Images pending review"
+#~ msgstr "Afbeelding wacht op goedkeuring"
+
+#~ msgid "Comments for this exercise"
+#~ msgstr "Opmerkingen voor deze oefening"
+
+#~ msgid "Add new comment"
+#~ msgstr "Voeg opmerking toe"
+
+#~ msgid "The diagram shows the most used muscles on this exercise"
+#~ msgstr "Het diagram toont de meest gebruikte spieren in deze oefening"
+
+#~ msgid "Exercise Variations"
+#~ msgstr "Oefeningvariaties"
+
+#~ msgid "Submit a correction"
+#~ msgstr "Voeg een correctie toe"
+
+#~ msgid "Add exercise"
+#~ msgstr "Creëer oefening"
+
+#~ 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."
+
+#, python-brace-format
+#~ msgid "Correct {0}"
+#~ msgstr "Juist {0}"
+
+#~ msgid "Exercise was successfully marked as rejected"
+#~ msgstr "Oefening met succes gemarkeerd als afgewezen"
+
+#~ msgid "Edit exercise image"
+#~ msgstr "Bewerk afbeelding oefening"
+
+#~ msgid "Delete exercise image?"
+#~ msgstr "Afbeelding oefening verwijderen?"
+
+#, python-format
+#~ msgid "Edit log entry for %s"
+#~ msgstr "Bewerk logingave voor %s"
+
#~ msgid "Anterior deltoid"
#~ msgstr "Voorste deltaspier"
@@ -4167,10 +4206,10 @@ msgstr "Verwijder gewichtsingave voor de %s"
#~ "Bedankt voor je interesse. Voel je vrij om één\n"
#~ "van de manieren hieronder te gebruiken om feedback te sturen over eender "
#~ "welk aspect van de site.\n"
-#~ "Voor ondersteuning kan je hallo zeggen in het <a href=\"%(discord)s"
-#~ "\">Discord-kanaal</a>,\n"
-#~ "om een fout te melden kan je dit doen in onze <a href=\"%(issues)s"
-#~ "\">issue tracker</a>."
+#~ "Voor ondersteuning kan je hallo zeggen in het <a "
+#~ "href=\"%(discord)s\">Discord-kanaal</a>,\n"
+#~ "om een fout te melden kan je dit doen in onze <a "
+#~ "href=\"%(issues)s\">issue tracker</a>."
#~ msgid ""
#~ "If you want to further help and improve this project,\n"
@@ -4457,10 +4496,6 @@ msgstr "Verwijder gewichtsingave voor de %s"
#~ msgid "No filter"
#~ msgstr "Geen filter"
-#~ msgctxt "Noun, not verb"
-#~ msgid "Change"
-#~ msgstr "Verander"
-
#~ msgid "Days"
#~ msgstr "Dag"
diff --git a/wger/locale/no/LC_MESSAGES/django.po b/wger/locale/no/LC_MESSAGES/django.po
index 8391be3cb..556832385 100644
--- a/wger/locale/no/LC_MESSAGES/django.po
+++ b/wger/locale/no/LC_MESSAGES/django.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: wger Workout Manager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-14 12:01+0200\n"
+"POT-Creation-Date: 2022-11-10 16:03+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/"
@@ -37,106 +37,8 @@ msgstr ""
"brukere som ikke er tildelt et treningsstudio vil også bli tildelt dette "
"treningsstudioet."
-#: 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 "Øvelser"
-
-#: config/models/language_config.py:42
-msgid "Ingredients"
-msgstr "Ingredienser"
-
-#: config/templates/language/overview.html:4 core/templates/navigation.html:226
-msgid "Languages"
-msgstr "Språk"
-
-#: config/templates/language/overview.html:16
-msgid "Nothing found."
-msgstr "Resultatløst."
-
-#: 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:150
-#: nutrition/templates/plan/view.html:153
-#: nutrition/templates/plan/view.html:191
-msgid "Add one now."
-msgstr "Legg til en nå."
-
-#: config/templates/language/overview.html:29
-#: core/templates/license/list.html:38 core/templates/misc/license/list.html:41
-#: core/templates/repetition_unit/list.html:41
-#: core/templates/user/overview.html:327 core/templates/user/overview.html:366
-#: core/templates/user/overview.html:402
-#: core/templates/weight_unit/list.html:41 core/views/languages.py:73
-#: core/views/license.py:65 core/views/repetition_units.py:65
-#: core/views/weight_units.py:65
-#: exercises/templates/categories/admin-overview.html:36
-#: 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:61
-msgid "Add"
-msgstr "Legg til"
-
-#: config/templates/language/view.html:21 core/models/language.py:29
-msgid "Language short name"
-msgstr "Språk, forkortet navn"
-
-#: config/templates/language/view.html:22
-#: config/templates/language/view.html:43 core/models/language.py:32
-msgid "Language full name"
-msgstr "Språk, fullt navn"
-
-#: config/templates/language/view.html:34 core/templates/user/overview.html:451
-#: gym/views/admin_config.py:44 gym/views/admin_config.py:58
-#: gym/views/user_config.py:46
-msgid "Configuration"
-msgstr "Konfiguarsjon"
-
-#: config/templates/language/view.html:35
-msgid ""
-"Use the configuration to select in what languages the\n"
-"exercises and ingredients will be shown for the current language (for "
-"example\n"
-"the exercises should be shown in languages A, B and C; the ingredients only\n"
-"in A)."
-msgstr ""
-"Bruk konfigurasjonen til å velge hvilke språk øvelsene og ingrediensene skal "
-"vises med.\n"
-"(for eksempel:\n"
-"Øvelsene skal bli vist i språk A, B og C; ingrediensene bare i A)."
-
-#: config/templates/language/view.html:44 gym/templates/contract/list.html:36
-msgid "Show"
-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: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:45
-msgid "Options"
-msgstr "Alternativer"
-
-#: config/templates/language/view.html:96 config/views/gym_config.py:41
-#: config/views/language_config.py:49 core/templates/license/list.html:16
-#: core/templates/misc/license/list.html:17
+#: config/views/gym_config.py:41 core/templates/language/view.html:57
+#: 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:39
#: core/templates/tags/render_day.html:75 core/templates/user/overview.html:205
@@ -144,12 +46,10 @@ 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:230
-#: exercises/templates/exercise/view.html:351
#: exercises/templates/muscles/admin-overview.html:16
-#: 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
+#: 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
#: 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
@@ -165,81 +65,54 @@ msgstr "Alternativer"
msgid "Edit"
msgstr "Rediger"
-#: 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: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: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
-#: gym/templates/contract_type/list.html:39 gym/templates/document/list.html:46
-#: gym/templates/gym/list.html:20 manager/templates/calendar/day.html:69
-#: 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:231
-#: 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:132
-#: nutrition/templates/units/list.html:20
-msgid "Delete"
-msgstr "Slett"
-
-#: core/demo.py:86
+#: core/demo.py:95
msgid "Sample workout"
msgstr "Eksempel treningsøkt"
-#: core/demo.py:90
+#: core/demo.py:99
msgid "Sample day"
msgstr "Eksempel dag"
-#: core/demo.py:94
+#: core/demo.py:103
msgid "Another sample day"
msgstr "En annen eksempel-dag"
-#: core/demo.py:217
-msgid "Sample nutrional plan"
+#: core/demo.py:211
+#, fuzzy
+#| msgid "Sample nutrional plan"
+msgid "Sample nutritional plan"
msgstr "Eksempel ærnæringsplan"
-#: core/demo.py:349 core/demo.py:351 core/demo.py:353
+#: core/demo.py:343 core/demo.py:345 core/demo.py:347
#, python-brace-format
msgid "Placeholder workout nr {0} for schedule"
msgstr "Plassholder for treningsøkt nr {0} for timeplanen"
-#: core/demo.py:358
+#: core/demo.py:352
msgid "My cool workout schedule"
msgstr "Mitt kule treningsprogram"
-#: core/demo.py:397 core/demo.py:412
+#: core/demo.py:391 core/demo.py:406
msgid "Empty placeholder schedule"
msgstr "Tom plassholder for timeplanen"
-#: core/forms.py:61 core/templates/navigation.html:188
-#: core/templates/navigation.html:192 core/templates/user/login.html:4
+#: core/forms.py:64 core/templates/navigation.html:179
+#: core/templates/navigation.html:183 core/templates/user/login.html:4
#: software/templates/features.html:43
msgid "Login"
msgstr "Logg inn"
-#: core/forms.py:73 core/forms.py:164 gym/views/export.py:63
+#: core/forms.py:76 core/forms.py:177 gym/views/export.py:63
#: gym/views/gym.py:218
msgid "First name"
msgstr "Fornavn"
-#: core/forms.py:74 core/forms.py:165 core/templates/user/overview.html:267
+#: core/forms.py:77 core/forms.py:178 core/templates/user/overview.html:267
#: gym/views/export.py:64 gym/views/gym.py:218
msgid "Last name"
msgstr "Etternavn"
-#: core/forms.py:76 core/forms.py:131 core/templates/user/overview.html:271
+#: core/forms.py:79 core/forms.py:144 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
@@ -249,75 +122,105 @@ msgstr "Etternavn"
msgid "Email"
msgstr "E-post"
-#: core/forms.py:77
+#: core/forms.py:80
msgid "Used for password resets and, optionally, e-mail reminders."
msgstr "Brukes for passordtilbakestillinger og eventuelt e-postpåminnelser."
-#: core/forms.py:102
+#: core/forms.py:84 core/models/profile.py:220
+#: gym/templates/gym/new_user.html:38
+msgid "Date of Birth"
+msgstr "Fødselsdato"
+
+#: core/forms.py:116
msgid "Personal data"
msgstr "Personlig data"
-#: core/forms.py:110
+#: core/forms.py:124
msgid "Workout reminders"
msgstr "Treningsvarsler"
-#: core/forms.py:117
+#: core/forms.py:131
msgid "Other settings"
msgstr "Andre innstillinger"
-#: 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
+#: core/forms.py:138 core/views/user.py:615 core/views/user.py:630
+#: core/views/user.py:642 gym/forms.py:72 manager/templates/log/add.html:65
+#: manager/templates/set/add.html:69 manager/views/workout.py:222
+#: utils/generic_views.py:143
msgid "Save"
msgstr "Lagre"
-#: core/forms.py:132
+#: core/forms.py:145
msgid "Used for password resets and, optionally, email reminders."
msgstr "Brukes for passordtilbakestillinger og eventuelt e-postpåminnelser."
-#: core/forms.py:160
+#: core/forms.py:173
msgid "This e-mail address is already in use."
msgstr "Denne e-posten er allerede i bruk."
-#: core/forms.py:180 gym/templates/gym/new_user.html:26
+#: core/forms.py:193 gym/templates/gym/new_user.html:26
#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:218
msgid "Password"
msgstr "Passord"
-#: core/forms.py:182
+#: core/forms.py:195
msgid "Please enter your current password."
msgstr "Skriv inn ditt nåværende passord."
-#: core/forms.py:200
+#: core/forms.py:204 core/templates/language/view.html:62
+#: 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: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/muscles/admin-overview.html:17
+#: gym/templates/admin_notes/list.html:40
+#: gym/templates/contract_option/list.html:39
+#: gym/templates/contract_type/list.html:39 gym/templates/document/list.html:46
+#: gym/templates/gym/list.html:20 manager/templates/calendar/day.html:69
+#: 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:231
+#: 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:132
+#: nutrition/templates/units/list.html:20
+msgid "Delete"
+msgstr "Slett"
+
+#: core/forms.py:213
msgid "Invalid password"
msgstr "Ugyldig passord"
-#: core/forms.py:212 core/forms.py:278
+#: core/forms.py:225 core/forms.py:291
msgid "The form is secured with reCAPTCHA"
msgstr "Skjemaet er sikret med reCAPTCHA"
-#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:188
-#: core/templates/navigation.html:193 core/templates/template.html:149
-#: core/templates/user/login.html:20 core/views/user.py:293
+#: core/forms.py:239 core/forms.py:258 core/templates/navigation.html:179
+#: core/templates/navigation.html:184 core/templates/template.html:149
+#: core/templates/user/login.html:20 core/views/user.py:300
#: software/templates/features.html:38
msgid "Register"
msgstr "Registrer"
-#: core/forms.py:256
+#: core/forms.py:269
msgid "Contact"
msgstr "Kontakt"
-#: core/forms.py:257
+#: core/forms.py:270
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:71
+#: core/forms.py:278 exercises/models/comment.py:42 manager/models/set.py:60
+#: manager/models/setting.py:111 nutrition/models/log.py:71
msgid "Comment"
msgstr "Kommentar"
-#: core/forms.py:266
+#: core/forms.py:279
msgid "What do you want to say?"
msgstr "Hva vil du si?"
@@ -325,6 +228,14 @@ msgstr "Hva vil du si?"
msgid "Day of the week"
msgstr "Dag i uken"
+#: core/models/language.py:31 core/templates/language/view.html:21
+msgid "Language short name"
+msgstr "Språk, forkortet navn"
+
+#: core/models/language.py:36 core/templates/language/view.html:22
+msgid "Language full name"
+msgstr "Språk, fullt navn"
+
#: core/models/license.py:29
msgid "Full name"
msgstr "Fullt navn"
@@ -382,19 +293,19 @@ msgstr "Metrisk (kg)"
msgid "Imperial (pound)"
msgstr "Britisk enhetssystem (pund)"
-#: core/models/profile.py:111
+#: core/models/profile.py:114
msgid "Show exercise comments"
msgstr "Vis øvelseskommentarer"
-#: core/models/profile.py:112
+#: core/models/profile.py:115
msgid "Check to show exercise comments on the workout view"
msgstr "Kryss av for å vise øvelseskommentarer i trenings-visning"
-#: core/models/profile.py:123
+#: core/models/profile.py:126
msgid "Also use ingredients in English"
msgstr "Bruk også ingredienser på engelsk"
-#: core/models/profile.py:125
+#: core/models/profile.py:128
msgid ""
"Check to also show ingredients in English while creating\n"
"a nutritional plan. These ingredients are extracted from a list provided\n"
@@ -406,11 +317,11 @@ msgstr ""
"amerikanske landbruksdepartementet. Denne listen er veldig utfyllende, med "
"ca. 7000 oppføringer, men kan bli litt overveldende og gjøre søket vanskelig."
-#: core/models/profile.py:134
+#: core/models/profile.py:137
msgid "Activate workout reminders"
msgstr "Aktiver treningsvarsler"
-#: core/models/profile.py:136
+#: core/models/profile.py:139
msgid ""
"Check to activate automatic reminders for workouts. You need to provide a "
"valid email for this to work."
@@ -418,19 +329,19 @@ msgstr ""
"Kryss av for å aktivere automatiske påminnelser for treningsøkter. Du må "
"legge inn en gyldig e-post for at dette skal fungere."
-#: core/models/profile.py:145
+#: core/models/profile.py:148
msgid "Remind before expiration"
msgstr "Påminnelse før utløp"
-#: core/models/profile.py:146
+#: core/models/profile.py:149
msgid "The number of days you want to be reminded before a workout expires."
msgstr "Antall dager i forveien å varsle om at en trening utløper."
-#: core/models/profile.py:152
+#: core/models/profile.py:155
msgid "Default duration of workouts"
msgstr "Standard varighet på treningsøkter"
-#: core/models/profile.py:154
+#: core/models/profile.py:157
msgid ""
"Default duration in weeks of workouts not in a schedule. Used for email "
"workout reminders."
@@ -438,11 +349,11 @@ msgstr ""
"Standard varighet i uker for treningsøkter som ikke er med i en plan. Dette "
"blir brukt for treningsvarsler."
-#: core/models/profile.py:171
+#: core/models/profile.py:174
msgid "Notification language"
msgstr "Varslingsspråk"
-#: core/models/profile.py:173
+#: core/models/profile.py:176
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."
@@ -451,70 +362,70 @@ msgstr ""
"påminnelser for treningsøkter. Dette påvirker ikke språket som blir brukt på "
"hjemmesiden."
-#: core/models/profile.py:186 gym/views/export.py:66
+#: core/models/profile.py:212 gym/views/export.py:66
msgid "Age"
msgstr "Alder"
-#: core/models/profile.py:202 nutrition/forms.py:99
+#: core/models/profile.py:228 nutrition/forms.py:100
msgid "Height (cm)"
msgstr "Høyde (cm)"
-#: core/models/profile.py:219
+#: core/models/profile.py:245
msgid "Hours of sleep"
msgstr "Timer med søvn"
-#: core/models/profile.py:220
+#: core/models/profile.py:246
msgid "The average hours of sleep per day"
msgstr "Antall timer med søvn per dag, i gjennomsnitt."
-#: core/models/profile.py:229
+#: core/models/profile.py:255
msgid "Work"
msgstr "Arbeid"
-#: core/models/profile.py:230 core/models/profile.py:272
+#: core/models/profile.py:256 core/models/profile.py:298
msgid "Average hours per day"
msgstr "Gjennomsnittstimer per dag"
-#: core/models/profile.py:239 core/models/profile.py:260
-#: core/models/profile.py:281
+#: core/models/profile.py:265 core/models/profile.py:286
+#: core/models/profile.py:307
msgid "Physical intensity"
msgstr "Fysisk intensitet"
-#: core/models/profile.py:240 core/models/profile.py:261
-#: core/models/profile.py:282
+#: core/models/profile.py:266 core/models/profile.py:287
+#: core/models/profile.py:308
msgid "Approximately"
msgstr "Omtrent"
-#: core/models/profile.py:250
+#: core/models/profile.py:276
msgid "Sport"
msgstr "Sport"
-#: core/models/profile.py:251
+#: core/models/profile.py:277
msgid "Average hours per week"
msgstr "Gjennomsnittstimer per uke"
-#: core/models/profile.py:271
+#: core/models/profile.py:297
msgid "Free time"
msgstr "Ledig tid"
-#: core/models/profile.py:292 nutrition/templates/rate/form.html:66
+#: core/models/profile.py:318 nutrition/templates/rate/form.html:66
msgid "Total daily calories"
msgstr "Antall kalorier daglig"
-#: core/models/profile.py:293
+#: core/models/profile.py:319
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
+#: core/models/profile.py:331 nutrition/models/ingredient_weight_unit.py:45
#: nutrition/models/log.py:90 nutrition/models/meal_item.py:58
msgid "Weight unit"
msgstr "Vektenhet"
-#: core/models/profile.py:313
+#: core/models/profile.py:339
msgid "Allow external access"
msgstr "Tilltatt ekstern tilgang"
-#: core/models/profile.py:315
+#: core/models/profile.py:341
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."
@@ -523,24 +434,23 @@ msgstr ""
"skrivebeskyttet modus. Du må sette dette før du kan dele linker f.eks til "
"sosiale medier."
-#: core/models/profile.py:324
+#: core/models/profile.py:350
msgid "Automatic reminders for weight entries"
msgstr "Automatiske påminnelser for vekt oppføringer"
-#: core/models/profile.py:326
+#: core/models/profile.py:352
msgid "Number of days after the last weight entry (enter 0 to deactivate)"
msgstr ""
"Antall dager etter den siste vekten oppføringen (skriv 0 for å deaktivere)"
-#: core/models/profile.py:392
+#: core/models/profile.py:418
msgid "The sum of all hours has to be 24"
msgstr "Summen av antall timer må bli 24"
#: core/models/rep_unit.py:35 core/models/weight_unit.py:35
-#: core/templates/user/overview.html:263 core/views/user.py:575
+#: core/templates/user/overview.html:263 core/views/user.py:591
#: 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
+#: exercises/models/exercise.py:64 exercises/models/muscle.py:36
#: 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
@@ -604,6 +514,53 @@ msgid "Are you sure you want to delete this? This action cannot be undone."
msgstr ""
"Er du sikker på at du vil slette dette? Denne handlingen kan ikke angres."
+#: core/templates/email_verification/confirm_template.html:4
+msgid "Email verified"
+msgstr ""
+
+#: core/templates/email_verification/confirm_template.html:18
+#, python-format
+msgid "%(username)s, your email was verified"
+msgstr ""
+
+#: core/templates/email_verification/confirm_template.html:22
+msgid "Error, invalid verification token"
+msgstr ""
+
+#: core/templates/email_verification/email_body_html.tpl:6
+#, fuzzy
+#| msgid "Configuration"
+msgid "Email Confirmation"
+msgstr "Konfiguarsjon"
+
+#: core/templates/email_verification/email_body_html.tpl:9
+#: core/templates/email_verification/email_body_txt.tpl:3
+#, fuzzy, python-format
+#| msgid "Calendar for %(username)s"
+msgid "You are almost there, %(username)s!"
+msgstr "kalender for %(username)s"
+
+#: core/templates/email_verification/email_body_html.tpl:11
+#, python-format
+msgid "Please click <a href=\"%(link)s\">here</a> to confirm your email"
+msgstr ""
+
+#: core/templates/email_verification/email_body_html.tpl:12
+#: core/templates/email_verification/email_body_txt.tpl:5
+#, python-format
+msgid "The token expires on %(time)s"
+msgstr ""
+
+#: core/templates/email_verification/email_body_html.tpl:14
+#: core/templates/email_verification/email_body_txt.tpl:8
+msgid "the wger Team"
+msgstr ""
+
+#: core/templates/email_verification/email_body_txt.tpl:4
+#, python-format
+msgid "Please click the following link to confirm your email: %(link)s"
+msgstr ""
+
#: core/templates/index.html:4
msgid "Dashboard"
msgstr "Dashboard"
@@ -665,7 +622,7 @@ msgid "Add custom diary entry"
msgstr "Legg til tilpasset dagbokoppføring"
#: core/templates/index.html:84 core/templates/index.html:92
-#: manager/models/day.py:34 manager/models/log.py:56
+#: manager/models/day.py:34 manager/models/log.py:58
#: manager/models/session.py:60 manager/models/workout.py:109
#: manager/templates/schedule/view.html:105
#: manager/templates/workout/view.html:11
@@ -698,6 +655,20 @@ msgstr "Legg til logg"
msgid "No workouts found."
msgstr "Ingen treningsøkter funnet."
+#: core/templates/index.html:137 core/templates/index.html:189
+#: core/templates/language/overview.html:23
+#: 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:150
+#: nutrition/templates/plan/view.html:153
+#: nutrition/templates/plan/view.html:191
+msgid "Add one now."
+msgstr "Legg til en nå."
+
#: 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
@@ -751,19 +722,59 @@ msgid "No nutrition plans."
msgstr "Ingen ernæringsplaner."
#: 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
+#: core/templates/user/overview.html:121 manager/forms.py:184
+#: manager/helpers.py:89 manager/models/log.py:86 manager/models/setting.py:79
+#: manager/templates/log/add.html:54 manager/templates/set/formset.html:11
#: weight/models.py:34 weight/templates/import_csv_preview.html:14
#: weight/templates/import_csv_preview.html:43 weight/views.py:150
msgid "Weight"
msgstr "Vekt"
-#: core/templates/index.html:210 core/templates/navigation.html:135
+#: core/templates/index.html:210 core/templates/navigation.html:126
#: weight/views.py:70
msgid "Add weight entry"
msgstr "Legg til vekt"
+#: core/templates/language/overview.html:4 core/templates/navigation.html:217
+msgid "Languages"
+msgstr "Språk"
+
+#: core/templates/language/overview.html:23
+msgid "Nothing found."
+msgstr "Resultatløst."
+
+#: core/templates/language/overview.html:36 core/templates/license/list.html:38
+#: core/templates/misc/license/list.html:41
+#: core/templates/repetition_unit/list.html:41
+#: core/templates/user/overview.html:327 core/templates/user/overview.html:366
+#: core/templates/user/overview.html:402
+#: core/templates/weight_unit/list.html:41 core/views/languages.py:73
+#: core/views/license.py:65 core/views/repetition_units.py:65
+#: core/views/weight_units.py:65
+#: exercises/templates/categories/admin-overview.html:36
+#: 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:61
+msgid "Add"
+msgstr "Legg til"
+
+#: core/templates/language/view.html:52 core/templates/user/api_key.html:44
+#: core/templates/user/preferences.html:44 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:45
+msgid "Options"
+msgstr "Alternativer"
+
#: core/templates/license/list.html:4 core/templates/misc/license/list.html:4
msgid "License list"
msgstr "Lisensliste"
@@ -776,7 +787,6 @@ msgstr "Lisensliste"
#: core/templates/weight_unit/list.html:26
#: exercises/templates/categories/admin-overview.html:24
#: exercises/templates/equipment/admin-overview.html:24
-#: exercises/templates/exercise/pending.html:30
#: exercises/templates/muscles/admin-overview.html:24
#: gym/templates/admin_notes/list.html:52 gym/templates/contract/list.html:60
#: gym/templates/contract_option/list.html:56
@@ -860,155 +870,135 @@ msgstr "Dine timeplaner"
msgid "Public templates"
msgstr "Offentlige maler"
-#: core/templates/navigation.html:64
-msgctxt "as in sorted by category"
-msgid "by category"
-msgstr "etter kategori"
-
-#: core/templates/navigation.html:65
-msgctxt "as in sorted by muscle"
-msgid "by muscle"
-msgstr "etter muskler"
-
-#: core/templates/navigation.html:66
-msgctxt "as in sorted by equipment"
-msgid "by equipment"
-msgstr "etter apperat"
+#: core/templates/navigation.html:63 manager/forms.py:133
+#: manager/models/setting.py:54
+msgid "Exercises"
+msgstr "Øvelser"
-#: core/templates/navigation.html:70
-#: exercises/templates/equipment/overview.html:109
-#: exercises/templates/equipment/overview.html:113
-#: exercises/templates/exercise/overview.html:112
-#: exercises/templates/exercise/overview.html:116
-#: exercises/templates/muscles/overview.html:112
-#: exercises/templates/muscles/overview.html:116
-msgid "Add new exercise"
-msgstr "Legg til ny øvelse"
-
-#: core/templates/navigation.html:75 core/templates/navigation.html:116
-#: core/templates/navigation.html:224
+#: core/templates/navigation.html:67 core/templates/navigation.html:107
+#: core/templates/navigation.html:215
msgid "Administration"
msgstr "Administrasjon"
-#: core/templates/navigation.html:76
-#: exercises/templates/exercise/pending.html:6
-msgid "Exercises pending review"
-msgstr "Øvelser venter på godkjenning"
+#: core/templates/navigation.html:68
+#, fuzzy
+#| msgid "Exercise day"
+msgid "Exercise edit history"
+msgstr "Treningsdag"
-#: core/templates/navigation.html:77 exercises/models/base.py:72
-#: exercises/templates/exercise/view.html:80
+#: core/templates/navigation.html:69 exercises/models/base.py:84
msgid "Equipment"
msgstr "Utstyr"
-#: core/templates/navigation.html:78 exercises/templates/exercise/view.html:258
+#: core/templates/navigation.html:70
msgid "Muscles"
msgstr "Muskler"
-#: core/templates/navigation.html:79
+#: core/templates/navigation.html:71
#: exercises/templates/categories/admin-overview.html:4
msgid "Categories"
msgstr "Kategorier"
-#: core/templates/navigation.html:93 software/templates/features.html:87
+#: core/templates/navigation.html:84 software/templates/features.html:87
msgid "Nutrition"
msgstr "Ernæring"
-#: core/templates/navigation.html:99 core/templates/user/overview.html:144
+#: core/templates/navigation.html:90 core/templates/user/overview.html:144
msgid "Nutrition plans"
msgstr "Ernæringsplaner"
-#: core/templates/navigation.html:105 nutrition/templates/bmi/form.html:50
+#: core/templates/navigation.html:96 nutrition/templates/bmi/form.html:50
msgid "BMI calculator"
msgstr "BMI-kalkulator"
-#: core/templates/navigation.html:111 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:102 nutrition/templates/rate/form.html:17
msgid "Daily calories calculator"
msgstr "Daglig kalorikalkulator"
-#: core/templates/navigation.html:113
+#: core/templates/navigation.html:104
#: nutrition/templates/ingredient/overview.html:29
msgid "Ingredient overview"
msgstr "Ingrediensoversikt"
-#: core/templates/navigation.html:117 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:108 nutrition/templates/units/list.html:6
msgid "Ingredient weight units"
msgstr "Vektenheter for ingredienser"
-#: core/templates/navigation.html:118
+#: core/templates/navigation.html:109
#: nutrition/templates/ingredient/pending.html:6
msgid "Ingredients pending review"
msgstr "Ingredienser som venter på godkjenning"
-#: core/templates/navigation.html:132
+#: core/templates/navigation.html:123
msgid "Body weight"
msgstr "Kropsvekt"
-#: core/templates/navigation.html:134 core/templates/user/overview.html:114
+#: core/templates/navigation.html:125 core/templates/user/overview.html:114
#: weight/templates/overview.html:7
msgid "Weight overview"
msgstr "Vektoversikt"
-#: core/templates/navigation.html:147
+#: core/templates/navigation.html:138
msgid "About this software"
msgstr "Om denne programvaren"
-#: core/templates/navigation.html:149 core/templates/template_features.html:82
+#: core/templates/navigation.html:140 core/templates/template_features.html:82
#: software/templates/about_us.html:5
msgid "About us"
msgstr "Om oss"
-#: core/templates/navigation.html:151 software/templates/features.html:209
+#: core/templates/navigation.html:142 software/templates/features.html:209
msgid "REST API"
msgstr "REST API"
-#: core/templates/navigation.html:155 utils/models.py:40
+#: core/templates/navigation.html:146 utils/models.py:41
msgid "License"
msgstr "Lisens"
-#: core/templates/navigation.html:161
+#: core/templates/navigation.html:152
msgid "Developer documentation"
msgstr "Utvikler dokumentasjon"
-#: core/templates/navigation.html:167
+#: core/templates/navigation.html:158
msgid "Get the code"
msgstr "Få koden"
-#: core/templates/navigation.html:173 core/templates/template.html:204
+#: core/templates/navigation.html:164 core/templates/template.html:203
#: core/templates/template_features.html:99
msgid "Translate"
msgstr "Oversett"
-#: core/templates/navigation.html:194 core/templates/user/login.html:28
+#: core/templates/navigation.html:185 core/templates/user/login.html:28
msgid "Reset password"
msgstr "Tilbakestill passord"
-#: core/templates/navigation.html:207
+#: core/templates/navigation.html:198
msgid "My preferences"
msgstr "Mine innstillinger"
-#: core/templates/navigation.html:214
+#: core/templates/navigation.html:205
msgid "Logout"
msgstr "Logg ut"
-#: core/templates/navigation.html:229
+#: core/templates/navigation.html:220
msgid "Licenses"
msgstr "Lisenser"
-#: core/templates/navigation.html:232
+#: core/templates/navigation.html:223
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr "Repetisjonsenheter"
-#: core/templates/navigation.html:235 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:226 core/templates/weight_unit/list.html:4
#: nutrition/templates/ingredient/view.html:174
msgid "Weight units"
msgstr "Vektenheter"
-#: core/templates/navigation.html:238 core/templates/user/list.html:4
+#: core/templates/navigation.html:229 core/templates/user/list.html:4
msgid "User list"
msgstr "Brukerliste"
-#: core/templates/navigation.html:239
+#: core/templates/navigation.html:230
msgid "Gyms"
msgstr "Treningsstudioer"
@@ -1087,33 +1077,30 @@ msgstr "neste"
msgid "Add weight log"
msgstr "Legg til vektlogg"
-#: core/templates/tags/render_day.html:114
-#: exercises/templates/equipment/overview.html:59
-#: exercises/templates/exercise/overview.html:63
-#: exercises/templates/muscles/overview.html:65
+#: core/templates/tags/render_day.html:116
msgid "Placeholder image for exercise"
msgstr "Plassholder for bilde for øvelsen"
-#: core/templates/tags/render_day.html:131
+#: core/templates/tags/render_day.html:133
msgid "This exercise has no repetitions."
msgstr "Denne øvelsen har ingen repetisjoner."
-#: core/templates/tags/render_day.html:134
+#: core/templates/tags/render_day.html:136
msgid "Edit them now."
msgstr "Rediger dem nå."
-#: core/templates/tags/render_day.html:159
+#: core/templates/tags/render_day.html:162
msgid "Add exercises to this workout day"
msgstr "Legg til øvelser for denne treningsdagen"
#: core/templates/tags/render_weight_log.html:17 manager/helpers.py:89
-#: manager/models/setting.py:57 manager/templates/set/formset.html:10
+#: manager/models/setting.py:69 manager/templates/set/formset.html:9
msgid "Reps"
msgstr "Repetisjoner"
-#: 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
+#: core/templates/tags/render_weight_log.html:30 manager/forms.py:189
+#: manager/models/log.py:103 manager/models/setting.py:99
+#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
msgid "RiR"
msgstr "RiR"
@@ -1136,7 +1123,7 @@ msgstr "Vilkår for bruk"
msgid "Features"
msgstr "Funksjoner"
-#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:37
+#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:53
msgid "API key"
msgstr "API kode"
@@ -1182,11 +1169,12 @@ msgid "Documentation"
msgstr "Dokumentasjon"
#: core/templates/user/delete_account.html:4
-#: core/templates/user/preferences.html:42
+#: core/templates/user/preferences.html:58
msgid "Delete account"
msgstr "Slett konto"
#: core/templates/user/delete_account.html:17
+#: exercises/templates/history/overview.html:93
msgid "Are you sure?"
msgstr "Er du sikker?"
@@ -1234,11 +1222,12 @@ msgstr "Legg til treningsøkt"
#: core/templates/user/overview.html:34 core/templates/user/overview.html:76
#: core/templates/user/overview.html:120 core/templates/user/overview.html: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
-#: 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
+#: exercises/models/base.py:99 exercises/models/base.py:104
+#: exercises/models/exercise.py:69 exercises/models/exercise.py:76
+#: gallery/models/image.py:47 manager/helpers.py:88 manager/models/log.py:100
+#: 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/views.py:150
@@ -1246,11 +1235,11 @@ msgid "Date"
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: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
+#: exercises/models/exercise.py:57 exercises/views/exercises.py:123
+#: 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 "Beskrivelse"
@@ -1258,12 +1247,12 @@ msgstr "Beskrivelse"
msgid "Number of logs (days)"
msgstr "Antall logger (dager)"
-#: core/templates/user/overview.html:37 core/views/user.py:576
+#: core/templates/user/overview.html:37 core/views/user.py:592
#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:157
msgid "Last activity"
msgstr "Siste aktivitet"
-#: core/templates/user/overview.html:68 manager/forms.py:267
+#: core/templates/user/overview.html:68 manager/forms.py:278
#: manager/templates/workout/view.html:151
msgid "Log"
msgstr "Logg"
@@ -1281,6 +1270,7 @@ msgid "Notes"
msgstr "Notater"
#: core/templates/user/overview.html:79
+#: exercises/templates/history/overview.html:30
#: manager/templates/calendar/partial_overview_table.html:42
#: nutrition/templates/log/detail.html:154
msgid "Time"
@@ -1328,10 +1318,12 @@ msgid "Do you really want to change this user&#39;s password?"
msgstr "Vil du virkelig endre denne brukeren&#39;s passord?"
#: core/templates/user/overview.html:233
+#: exercises/templates/history/overview.html:106
msgid "No"
msgstr "Nei"
#: core/templates/user/overview.html:234
+#: exercises/templates/history/overview.html:99
msgid "Yes"
msgstr "Ja"
@@ -1386,10 +1378,15 @@ msgid "Documents"
msgstr "Dokumenter"
#: core/templates/user/overview.html:413 gym/templates/document/list.html:32
-#: manager/forms.py:279 manager/templates/workout/view.html:176
+#: manager/forms.py:290 manager/templates/workout/view.html:176
msgid "Download"
msgstr "Last ned"
+#: core/templates/user/overview.html:451 gym/views/admin_config.py:44
+#: gym/views/admin_config.py:58 gym/views/user_config.py:46
+msgid "Configuration"
+msgstr "Konfiguarsjon"
+
#: core/templates/user/overview.html:454 gym/models/user_config.py:92
msgid "Include in inactive overview"
msgstr "Inkluder i inaktiv oversikt"
@@ -1407,7 +1404,25 @@ msgstr "Logg inn som denne brukeren"
msgid "Preferences"
msgstr "Preferanser"
-#: core/templates/user/preferences.html:33 core/views/user.py:587
+#: core/templates/user/preferences.html:19
+#, fuzzy
+#| msgid "Send emails"
+msgid "Verified email"
+msgstr "Sende e-poster"
+
+#: core/templates/user/preferences.html:24
+msgid "Unverified email"
+msgstr ""
+
+#: core/templates/user/preferences.html:26
+msgid "Send verification email"
+msgstr ""
+
+#: core/templates/user/preferences.html:30
+msgid "You need to verify your email to contribute exercises"
+msgstr ""
+
+#: core/templates/user/preferences.html:49 core/views/user.py:603
msgid "Change password"
msgstr "Endre passord"
@@ -1437,39 +1452,37 @@ msgid "oz"
msgstr "oz"
#: 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
+#: exercises/views/equipment.py:104 exercises/views/exercises.py:185
+#: exercises/views/muscles.py:99 manager/views/schedule.py:311
+#: manager/views/schedule_step.py:129 manager/views/workout.py:269
+#: manager/views/workout_session.py:141 nutrition/views/ingredient.py:138
#: 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:431
-#: exercises/views/muscles.py:125 gallery/views/images.py:121
+#: exercises/views/categories.py:127 exercises/views/exercises.py:193
+#: exercises/views/muscles.py:106 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
+#: manager/views/workout.py:273 manager/views/workout_session.py:156
+#: nutrition/views/ingredient.py:145 nutrition/views/plan.py:127
#: nutrition/views/unit.py:118
#, python-brace-format
msgid "Delete {0}?"
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/repetition_units.py:85 core/views/user.py:472
#: 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: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
+#: exercises/views/equipment.py:81 exercises/views/muscles.py:86
+#: 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:170
+#: gym/views/gym.py:459 manager/views/day.py:100 manager/views/schedule.py:335
+#: manager/views/workout.py:287 nutrition/views/ingredient.py:164
+#: nutrition/views/plan.py:144 nutrition/views/unit.py:144
#, python-brace-format
msgid "Edit {0}"
msgstr "Rediger {0}"
@@ -1500,64 +1513,65 @@ msgstr "Send"
msgid "Your feedback was successfully sent. Thank you!"
msgstr "Din tilbakemelding har blitt sendt. Takk!"
-#: core/views/user.py:156
+#: core/views/user.py:157
#, python-brace-format
msgid "Account \"{0}\" was successfully deleted"
msgstr "Slettingen av konto \"{0}\" var vellykket"
-#: core/views/user.py:287
+#: core/views/user.py:294
msgid "You were successfully registered"
msgstr "Din registrering var vellykket"
-#: core/views/user.py:339
+#: core/views/user.py:355
msgid "Settings successfully updated"
msgstr "Innstillinger ble vellykket oppdatert"
-#: core/views/user.py:376
+#: core/views/user.py:392
msgid "The user was successfully deactivated"
msgstr "Brukeren ble vellykket deaktivert"
-#: core/views/user.py:411
+#: core/views/user.py:427
msgid "The user was successfully activated"
msgstr "Brukeren ble vellykket aktivert"
-#: core/views/user.py:426
+#: core/views/user.py:442
msgid "Edit user"
msgstr "Rediger bruker"
-#: core/views/user.py:573 gym/templates/gym/member_list.html:26
+#: core/views/user.py:589 gym/templates/gym/member_list.html:26
#: gym/views/gym.py:156
msgid "ID"
msgstr "ID"
-#: core/views/user.py:574 gym/forms.py:94 gym/templates/contract/view.html:55
+#: core/views/user.py:590 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 "Brukernavn"
-#: core/views/user.py:577 gym/templates/gym/new_user.html:34
+#: core/views/user.py:593 gym/templates/gym/new_user.html:34
#: gym/views/export.py:60 gym/views/gym.py:218
msgid "Gym"
msgstr "treningsstudio"
-#: exercises/models/base.py:51 exercises/templates/exercise/view.html:76
-#: nutrition/models/ingredient.py:204
+#: core/views/user.py:652
+#, python-format
+msgid "A verification email was sent to %(email)s"
+msgstr ""
+
+#: exercises/models/base.py:63 nutrition/models/ingredient.py:204
msgid "Category"
msgstr "Kategori"
-#: exercises/models/base.py:58
+#: exercises/models/base.py:70
msgid "Primary muscles"
msgstr "Primære muskler"
-#: exercises/models/base.py:64 exercises/templates/equipment/overview.html:71
-#: exercises/templates/exercise/overview.html:76
-#: exercises/templates/exercise/view.html:268
-#: exercises/templates/muscles/overview.html:77
+#: exercises/models/base.py:76
msgid "Secondary muscles"
msgstr "Sekundære muskler"
-#: exercises/models/base.py:79
+#: exercises/models/base.py:91
msgid "Variations"
msgstr "Variasjoner"
@@ -1565,75 +1579,62 @@ msgstr "Variasjoner"
msgid "Exercise Categories"
msgstr "Øvelses kategorier"
-#: exercises/models/comment.py:34 exercises/models/exercise_alias.py:32
-#: exercises/models/image.py:75 exercises/models/video.py:82
-#: manager/forms.py:165 manager/helpers.py:89 manager/models/log.py:51
+#: exercises/models/comment.py:37 exercises/models/exercise_alias.py:35
+#: exercises/models/image.py:71 exercises/models/video.py:95
+#: manager/forms.py:176 manager/helpers.py:89 manager/models/log.py:52
msgid "Exercise"
msgstr "Øvelse"
-#: exercises/models/comment.py:41
+#: exercises/models/comment.py:43
msgid "A comment about how to correctly do this exercise."
msgstr "En kommentar for hvordan denne øvelsen utføres korrekt."
-#: exercises/models/exercise.py:86 nutrition/models/ingredient.py:80
+#: exercises/models/exercise.py:81 nutrition/models/ingredient.py:80
#: nutrition/models/plan.py:61 nutrition/models/weight_unit.py:32
msgid "Language"
msgstr "Språk"
-#: 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:265
-msgid "New user submitted exercise"
-msgstr "Ny bruker har sendt inn øvelse"
-
-#: 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/exercise_alias.py:35
+#: exercises/models/exercise_alias.py:38
#, fuzzy
#| msgid "Correcting an exercise"
msgid "Alias for an exercise"
msgstr "Retter en øvelse"
-#: exercises/models/image.py:59
+#: exercises/models/image.py:55
msgid "Line"
msgstr ""
-#: exercises/models/image.py:60
+#: exercises/models/image.py:56
msgid "3D"
msgstr ""
-#: exercises/models/image.py:61
+#: exercises/models/image.py:57
msgid "Low-poly"
msgstr ""
-#: exercises/models/image.py:62
+#: exercises/models/image.py:58
msgid "Photo"
msgstr ""
-#: exercises/models/image.py:63
+#: exercises/models/image.py:59
#, fuzzy
#| msgid "Others"
msgid "Other"
msgstr "Andre"
-#: exercises/models/image.py:81 gallery/models/image.py:56
+#: exercises/models/image.py:77 gallery/models/image.py:56
msgid "Image"
msgstr "Bilde"
-#: exercises/models/image.py:82 gallery/models/image.py:57
+#: exercises/models/image.py:78 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:88
+#: exercises/models/image.py:84
msgid "Main picture"
msgstr "Hovedbilde"
-#: exercises/models/image.py:91
+#: exercises/models/image.py:87
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,19 +1644,10 @@ msgstr ""
"øvelsen (vil bli vist i søket). Det første bildet blir automatisk markert av "
"systemet."
-#: exercises/models/image.py:100
+#: exercises/models/image.py:96
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: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}."
-
#: exercises/models/muscle.py:37
msgid "In latin, e.g. \"Pectoralis major\""
msgstr "I latin, f.eks \"Pectoralis major\""
@@ -1670,55 +1662,56 @@ msgstr "Navn på øvelsen"
msgid "A more basic name for the muscle"
msgstr ""
-#: exercises/models/video.py:41
-msgid "Maximum file size is 100MB."
+#: exercises/models/video.py:50
+#, python-format
+msgid "Maximum file size is %(size)sMB."
msgstr ""
-#: exercises/models/video.py:44 exercises/models/video.py:48
+#: exercises/models/video.py:57 exercises/models/video.py:65
msgid "File type is not supported"
msgstr ""
-#: exercises/models/video.py:57
+#: exercises/models/video.py:70
#, 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
+#: exercises/models/video.py:101
#, fuzzy
#| msgid "Main picture"
msgid "Main video"
msgstr "Hovedbilde"
-#: exercises/models/video.py:94
+#: exercises/models/video.py:107
msgid "Video"
msgstr ""
-#: exercises/models/video.py:101
+#: exercises/models/video.py:114
msgid "Size"
msgstr ""
-#: exercises/models/video.py:108 manager/models/schedule_step.py:56
+#: exercises/models/video.py:121 manager/models/schedule_step.py:56
msgid "Duration"
msgstr "Varighet"
-#: exercises/models/video.py:117
+#: exercises/models/video.py:130
msgid "Width"
msgstr ""
-#: exercises/models/video.py:124
+#: exercises/models/video.py:137
#, fuzzy
#| msgid "Weight"
msgid "Height"
msgstr "Vekt"
-#: exercises/models/video.py:131
+#: exercises/models/video.py:144
#, fuzzy
#| msgid "Code"
msgid "Codec"
msgstr "Kode"
-#: exercises/models/video.py:139
+#: exercises/models/video.py:152
msgid "Codec, long name"
msgstr ""
@@ -1727,139 +1720,23 @@ msgid "Equipment list"
msgstr "Utstyrsliste"
#: exercises/templates/equipment/admin-overview.html:37
-#: exercises/views/equipment.py:94
+#: exercises/views/equipment.py:92
msgid "Add new equipment"
msgstr "Legg til nytt utstyr"
-#: exercises/templates/equipment/overview.html:11
-msgid "Equipment overview"
-msgstr "Utstyrsoversikt"
-
-#: exercises/templates/equipment/overview.html:69
-#: exercises/templates/exercise/overview.html:74
-#: exercises/templates/exercise/view.html:264
-#: exercises/templates/muscles/overview.html:75
-msgid "Main muscles"
-msgstr "Viktigste musklene"
-
-#: exercises/templates/equipment/overview.html:79
-msgid ""
-"No exercises for this equipment. Add or edit an exercise and set the "
-"equipment."
-msgstr ""
-"Ingen øvelse for dette utstyret. Legg til eller endre en øvelse og legg til "
-"utstyret."
-
-#: exercises/templates/equipment/overview.html:96
-#: exercises/templates/exercise/overview.html:99
-#: nutrition/templates/ingredient/overview.html:57
-msgid "Search"
-msgstr "Søk"
-
-#: exercises/templates/equipment/overview.html:101
-#: exercises/templates/exercise/overview.html:104
-msgid "exercise name"
-msgstr "Navn på øvelsen"
-
-#: exercises/templates/equipment/overview.html:115
-#: exercises/templates/exercise/overview.html:118
-#: exercises/templates/muscles/overview.html:118
-#: nutrition/templates/ingredient/overview.html:85
-msgid "Only registered users can do this"
-msgstr "Kun registrerte brukere kan utføre dette"
-
-#: exercises/templates/exercise/email_new.tpl:1
-#, python-format
-msgid ""
-"Your exercise '%(exercise)s' was successfully added to the general\n"
-"database."
-msgstr ""
-"Din øvelse «%(exercise)s» ble lagt til i\n"
-"databasen."
-
-#: exercises/templates/exercise/email_new.tpl:4
-msgid ""
-"It is now available on the exercise and muscle overview and can be\n"
-"added to workouts. You can access it on this address:"
-msgstr ""
-"Det er nå tilgjengelig på trening og muskleloversikt og kan bli\n"
-"lagt til i treningsøktene. Du får tilgang til den på denne adressen:"
-
-#: exercises/templates/exercise/email_new.tpl:8
-#: nutrition/templates/ingredient/email_new.tpl:8
-msgid "Thank you for contributing and making this site better!"
-msgstr "Takk for at du bidrar og lager denne siden bedre!"
-
-#: exercises/templates/exercise/email_new.tpl:9
-#: manager/templates/workout/email_reminder.tpl:15
-#: manager/templates/workout/email_weight_reminder.tpl:12
-#: nutrition/templates/ingredient/email_new.tpl:9
-#, python-format
-msgid "The %(site)s team"
-msgstr "%(site)s laget"
-
-#: exercises/templates/exercise/form.html:4
-msgid "Submitting an exercise"
-msgstr "Sender inn en øvelse"
-
-#: exercises/templates/exercise/form.html:5
-msgid ""
-"Thank you for submitting an exercise. This is much\n"
-"appreciated!"
-msgstr ""
-"Takk for at du sender inn en øvelse. Dette er veldig \n"
-"verdsatt!"
-
-#: exercises/templates/exercise/form.html:8
-msgid ""
-"After you submit the form, the administrators will be notified.\n"
-"Once it is reviewed, it will be added to the database. Till this happens,\n"
-"it will not be visible in the overview or the search. In case you added your "
-"email\n"
-"when you registered, you will get notified when the process is completed "
-"successfully."
-msgstr ""
-"Når du har sendt skjemaet, vil administratorer bli varslet.\n"
-"Når den er gjennomgått , vil det bli lagt til i databasen. Til dette\n"
-"skjer,\n"
-"vil ikke dette være synlig i oversikten eller søk. Om du la igjen din e-"
-"postadresse\n"
-"når du registrerte kontoen, vil du få beskjed når prosessen er fullført."
-
-#: exercises/templates/exercise/form_correct.html:4
-msgid "Correcting an exercise"
-msgstr "Retter en øvelse"
-
-#: exercises/templates/exercise/form_correct.html:5
-msgid ""
-"Thank you for correcting and improving this exercise.\n"
-"This is much appreciated!"
-msgstr ""
-"Takk for at du korrigerer og forbedrer denne øvelsen.\n"
-"Dette er mye verdsatt!"
-
-#: exercises/templates/exercise/form_correct.html:8
-msgid ""
-"After you submit the form, the administrators will be notified.\n"
-"Once the changes are reviewed the exercise will be updated."
-msgstr ""
-"Når du har sendt skjemaet, vil en administratorer bli varslet.\n"
-"Når endringene er blitt godkjent vil øvelsen bli oppdatert."
-
-#: exercises/templates/exercise/overview.html:88
-msgid "No categories."
-msgstr "Ingen kategorier."
-
-#: exercises/templates/exercise/overview.html:88
-msgid "Use link to create one"
-msgstr "Bruk lenken for å opprette"
+#: exercises/templates/history/overview.html:11
+#, fuzzy
+#| msgid "Exercise day"
+msgid "Exercise admin history"
+msgstr "Treningsdag"
-#: exercises/templates/exercise/pending.html:14
-#: nutrition/templates/ingredient/pending.html:14
-msgid "Submission date"
-msgstr "Innleveringsdato"
+#: exercises/templates/history/overview.html:27
+#, fuzzy
+#| msgid "Actions"
+msgid "Action"
+msgstr "Handlinger"
-#: exercises/templates/exercise/pending.html:16 gallery/models/image.py:51
+#: exercises/templates/history/overview.html:28 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/log.py:45
@@ -1870,102 +1747,47 @@ msgstr "Innleveringsdato"
msgid "User"
msgstr "Bruker"
-#: exercises/templates/exercise/view.html:48
-msgid "Exercise is pending review"
-msgstr "Øvelse venter på godkjenning"
-
-#: exercises/templates/exercise/view.html:51
-msgid ""
-"This user submitted exercise is pending a decision to be\n"
-" included in the database."
-msgstr ""
-"Denne brukerinnsendte øvelsen venter på at beslutningen skal være\n"
-" inkludert i databasen."
-
-#: exercises/templates/exercise/view.html:53
-msgid "Till then, it will not be shown in the overview or the search."
-msgstr "Inntil da, vil det ikke bli vist i oversikten eller søk."
-
-#: exercises/templates/exercise/view.html:54
-#: nutrition/templates/ingredient/view.html:31
-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:203
-#: nutrition/templates/ingredient/view.html:38
-msgid "Accept"
-msgstr "Godta"
-
-#: exercises/templates/exercise/view.html:64
-#: exercises/templates/exercise/view.html:204
-#: nutrition/templates/ingredient/view.html:42
-msgid "Decline"
-msgstr "Avslå"
+#: exercises/templates/history/overview.html:29
+#, fuzzy
+#| msgctxt "As in \"email subject\""
+#| msgid "Subject"
+msgid "Object"
+msgstr "Subjekt"
-#: exercises/templates/exercise/view.html:96
-msgid "Images"
-msgstr "Bilder"
+#: exercises/templates/history/overview.html:31
+#, fuzzy
+#| msgctxt "Noun, not verb"
+#| msgid "Change"
+msgid "Changes"
+msgstr "Endre"
-#: exercises/templates/exercise/view.html:137 exercises/views/images.py:93
-msgid "Add new image"
-msgstr "Legg til nytt bilde"
+#: exercises/templates/history/overview.html:32
+msgid "Revert"
+msgstr ""
-#: exercises/templates/exercise/view.html:148
-msgid "Videos"
+#: exercises/templates/history/overview.html:64
+msgid "View Object"
msgstr ""
-#: exercises/templates/exercise/view.html:187 exercises/views/videos.py:94
+#: exercises/templates/history/overview.html:75
#, 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:218
-msgid "Comments for this exercise"
-msgstr "Kommentarer for denne øvelsen"
-
-#: exercises/templates/exercise/view.html:246
-msgid "Add new comment"
-msgstr "Legg til ny kommentar"
-
-#: 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:301
-#: manager/templates/workout/log.html:10 manager/templates/workout/log.html:11
-msgid "Weight log"
-msgstr "Vektlogg"
-
-#: exercises/templates/exercise/view.html:306
-msgid "Exercise Variations"
-msgstr "Treningsvariasjoner"
+#| msgid "View logs"
+msgid "View changes"
+msgstr "Vis logger"
-#: exercises/templates/exercise/view.html:327
-msgid "Submit a correction"
-msgstr "Send inn en rettelse"
+#: exercises/templates/history/overview.html:86
+msgid "Revert changes"
+msgstr ""
#: exercises/templates/muscles/admin-overview.html:4
-#: exercises/templates/muscles/overview.html:7
msgid "Muscle overview"
msgstr "Muskeloversikt"
#: exercises/templates/muscles/admin-overview.html:36
-#: exercises/views/muscles.py:86
+#: exercises/views/muscles.py:67
msgid "Add muscle"
msgstr "Legg til muskel"
-#: exercises/templates/muscles/overview.html:85
-#, fuzzy
-msgid ""
-"No exercises for this muscle. Add or edit an exercise and set the muscle."
-msgstr "Ingen øvelser for denne muskelen. Legg til en øvelse og angi muskelen."
-
#: exercises/views/categories.py:71
msgid "Add category"
msgstr "Legg til kategori"
@@ -1978,50 +1800,19 @@ msgstr "Dette vil også slette alle øvelsene i denne kategorien."
msgid "Add exercise comment"
msgstr "Legg til kommentar til øvelsen"
-#: exercises/views/equipment.py:107 exercises/views/equipment.py:118
+#: exercises/views/equipment.py:105 exercises/views/equipment.py:116
msgid "Delete equipment?"
msgstr "Slett utstyr?"
-#: exercises/views/exercises.py:229
+#: exercises/views/exercises.py:161
#, fuzzy, python-format
-msgid ""
-"%(name_original)s is too similar to existing exercise \"%(exercise_name)s\""
+msgid "%(name)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:247
-msgid "Add exercise"
-msgstr "Legg til øvelse"
-
-#: 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:380
-#, python-brace-format
-msgid "Correct {0}"
-msgstr "Korrekt {0}"
-
-#: exercises/views/exercises.py:422
+#: exercises/views/exercises.py:184
msgid "This will delete the exercise from all workouts."
msgstr "Dette vil slette øvelsen fra alle treningsøktene."
-#: exercises/views/exercises.py:474
-msgid "Exercise was successfully marked as rejected"
-msgstr "Øvelse ble vellykket merket som avvist"
-
-#: exercises/views/images.py:68
-msgid "Edit exercise image"
-msgstr "Endre bilde for øvelsen"
-
-#: exercises/views/images.py:143
-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"
@@ -2088,7 +1879,7 @@ 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:59
+#: manager/templates/log/add.html:52 nutrition/forms.py:60
#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:102
#: nutrition/models/meal_item.py:72
msgid "Amount"
@@ -2191,6 +1982,10 @@ msgstr "Vil bruke filnavn om ingen ting annet er angitt"
msgid "User notes"
msgstr "Bruker notater"
+#: gym/templates/contract/list.html:36
+msgid "Show"
+msgstr "Vis"
+
#: gym/templates/contract/view.html:4
msgid "Contract"
msgstr "Kontrakt"
@@ -2270,10 +2065,6 @@ msgstr "E-poster"
msgid "Add member"
msgstr "Legg til medlem"
-#: gym/templates/gym/new_user.html:38
-msgid "Date of Birth"
-msgstr "Fødselsdato"
-
#: gym/templates/gym/new_user.html:48 manager/templates/calendar/month.html:144
#: manager/templates/log/add.html:75 nutrition/templates/rate/form.html:120
msgid "Info"
@@ -2336,132 +2127,132 @@ msgstr "Legg til brukere til treningsstudio"
msgid "Edit gym"
msgstr "Rediger treningsstudio"
-#: i18n.tpl:2 i18n.tpl:28
+#: i18n.tpl:2
+msgid "Until Failure"
+msgstr "Til Utmattelse"
+
+#: i18n.tpl:3 manager/forms.py:180 manager/models/log.py:73
+#: manager/templates/set/add.html:53
+msgid "Repetitions"
+msgstr "Repetisjoner"
+
+#: i18n.tpl:4
msgid "Abs"
msgstr "Mage"
-#: i18n.tpl:3
+#: i18n.tpl:5
msgid "Arms"
msgstr "Armer"
-#: i18n.tpl:4
-msgid "Back"
-msgstr "Rygg"
-
-#: i18n.tpl:5 i18n.tpl:23
-msgid "Calves"
-msgstr "Legg"
-
-#: i18n.tpl:6 i18n.tpl:26
-msgid "Chest"
-msgstr "Bryst"
-
-#: i18n.tpl:7
+#: i18n.tpl:6
msgid "Legs"
msgstr "Bein"
-#: i18n.tpl:8 i18n.tpl:19
-msgid "Shoulders"
-msgstr "Skuldre"
+#: i18n.tpl:7
+msgid "Dumbbell"
+msgstr "Manual"
+
+#: i18n.tpl:8
+#, fuzzy
+#| msgid "Biceps brachii"
+msgid "Biceps"
+msgstr "Biceps brachii"
#: i18n.tpl:9
-msgid "Barbell"
-msgstr "Vektstang"
+msgid "SZ-Bar"
+msgstr "SZ-stang"
#: i18n.tpl:10
-msgid "Bench"
-msgstr "Benk"
+msgid "Kettlebell"
+msgstr "Kettlebell"
#: i18n.tpl:11
-msgid "Dumbbell"
-msgstr "Manual"
+msgid "Swiss Ball"
+msgstr "Gymball"
#: i18n.tpl:12
-msgid "Gym mat"
-msgstr "Treningsmatte"
+msgid "none (bodyweight exercise)"
+msgstr "ingen (kroppsvekt øvelse)"
#: i18n.tpl:13
-msgid "Incline bench"
-msgstr "Skråbenk"
+msgid "Calves"
+msgstr "Legg"
#: i18n.tpl:14
-msgid "Kettlebell"
-msgstr "Kettlebell"
+msgid "Back"
+msgstr "Rygg"
#: i18n.tpl:15
-msgid "Pull-up bar"
-msgstr "Pull-up stang"
+msgid "Lower back"
+msgstr ""
#: i18n.tpl:16
-msgid "SZ-Bar"
-msgstr "SZ-stang"
+msgid "Lats"
+msgstr ""
#: i18n.tpl:17
-msgid "Swiss Ball"
-msgstr "Gymball"
+msgid "Hamstrings"
+msgstr ""
#: i18n.tpl:18
-msgid "none (bodyweight exercise)"
-msgstr "ingen (kroppsvekt øvelse)"
+msgid "Bench"
+msgstr "Benk"
-#: i18n.tpl:20
+#: i18n.tpl:19
#, fuzzy
-#| msgid "Biceps brachii"
-msgid "Biceps"
-msgstr "Biceps brachii"
+#| msgid "Minutes"
+msgid "Glutes"
+msgstr "Minutter"
+
+#: i18n.tpl:20
+msgid "Kilometers"
+msgstr "Kilometer"
#: i18n.tpl:21
-msgid "Hamstrings"
-msgstr ""
+msgid "Shoulders"
+msgstr "Skuldre"
#: i18n.tpl:22
-msgid "Lower back"
-msgstr ""
+msgid "Seconds"
+msgstr "Sekunder"
+
+#: i18n.tpl:23
+msgid "Miles"
+msgstr "Miles"
#: i18n.tpl:24
-#, fuzzy
-#| msgid "Minutes"
-msgid "Glutes"
-msgstr "Minutter"
+msgid "Incline bench"
+msgstr "Skråbenk"
#: i18n.tpl:25
-msgid "Lats"
+msgid "Quads"
msgstr ""
+#: i18n.tpl:26
+msgid "Minutes"
+msgstr "Minutter"
+
#: i18n.tpl:27
-msgid "Quads"
-msgstr ""
+msgid "Chest"
+msgstr "Bryst"
+
+#: i18n.tpl:28
+msgid "Gym mat"
+msgstr "Treningsmatte"
#: i18n.tpl:29
-#, fuzzy
-#| msgid "Triceps brachii"
-msgid "Triceps"
-msgstr "Triceps brachii"
+msgid "Pull-up bar"
+msgstr "Pull-up stang"
#: i18n.tpl:30
-msgid "Kilometers"
-msgstr "Kilometer"
+msgid "Barbell"
+msgstr "Vektstang"
#: i18n.tpl:31
-msgid "Miles"
-msgstr "Miles"
-
-#: i18n.tpl:32
-msgid "Minutes"
-msgstr "Minutter"
-
-#: i18n.tpl:33 manager/forms.py:169 manager/models/log.py:71
-#: manager/templates/set/add.html:53
-msgid "Repetitions"
-msgstr "Repetisjoner"
-
-#: i18n.tpl:34
-msgid "Seconds"
-msgstr "Sekunder"
-
-#: i18n.tpl:35
-msgid "Until Failure"
-msgstr "Til Utmattelse"
+#, fuzzy
+#| msgid "Triceps brachii"
+msgid "Triceps"
+msgstr "Triceps brachii"
#: mailer/forms.py:34 mailer/templates/mailer/gym/preview.html:32
msgctxt "As in \"email subject\""
@@ -2516,19 +2307,19 @@ msgstr "Sende e-poster"
msgid "Correction"
msgstr "Korreksjon"
-#: manager/forms.py:89 manager/models/workout.py:59
+#: manager/forms.py:92 manager/models/workout.py:59
msgid "The name of the workout"
msgstr "Navnet på treningsøkten"
-#: manager/forms.py:93 manager/models/workout.py:66
+#: manager/forms.py:96 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 ""
-"En kort beskrivelse eller målet med treningen. For eksempel \"Fokus på ryggen"
-"\" eller \"Uke 1 av programmet xy '."
+"En kort beskrivelse eller målet med treningen. For eksempel \"Fokus på "
+"ryggen\" eller \"Uke 1 av programmet xy '."
-#: manager/forms.py:126
+#: manager/forms.py:137
msgid ""
"You can search for more than one exercise, they will be grouped together for "
"a superset."
@@ -2536,28 +2327,28 @@ msgstr ""
"Du kan søke etter mer enn en øvelse, de vil bli gruppert sammen til et "
"supersett."
-#: 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
+#: manager/forms.py:166 manager/forms.py:171 manager/models/log.py:64
+#: manager/models/log.py:92 manager/models/setting.py:59
+#: manager/models/setting.py:90 manager/templates/log/add.html:53
+#: manager/templates/log/add.html:55 manager/templates/set/formset.html:10
+#: manager/templates/set/formset.html:12 measurements/models/category.py:58
+#: nutrition/forms.py:64
msgid "Unit"
msgstr "Enhet"
-#: manager/forms.py:266
+#: manager/forms.py:277
msgid "Type"
msgstr "Type"
-#: manager/forms.py:267 manager/templates/workout/view.html:157
+#: manager/forms.py:278 manager/templates/workout/view.html:157
msgid "Table"
msgstr "Tabell"
-#: manager/forms.py:269 manager/templates/workout/view.html:163
+#: manager/forms.py:280 manager/templates/workout/view.html:163
msgid "with images"
msgstr "med bilder"
-#: manager/forms.py:270 manager/templates/workout/view.html:169
+#: manager/forms.py:281 manager/templates/workout/view.html:169
msgid "with comments"
msgstr "med kommentarer"
@@ -2616,7 +2407,7 @@ msgid "The duration in weeks"
msgstr "Varigheten i uker"
#: manager/models/schedule_step.py:63 manager/models/set.py:52
-#: manager/models/setting.py:98 nutrition/models/meal.py:54
+#: manager/models/setting.py:110 nutrition/models/meal.py:54
#: nutrition/models/meal_item.py:65
msgid "Order"
msgstr "Rekkefølge"
@@ -2667,7 +2458,7 @@ msgstr "Treningsdag"
msgid "Number of sets"
msgstr "Antall sett"
-#: manager/models/setting.py:43
+#: manager/models/setting.py:48
msgid "Sets"
msgstr "Sett"
@@ -2962,6 +2753,13 @@ msgstr ""
"Hvis du ikke ønsker å stadig motta e-postpåminnelser , deaktivere\n"
"alternativet i innstillingene."
+#: manager/templates/workout/email_reminder.tpl:15
+#: manager/templates/workout/email_weight_reminder.tpl:12
+#: nutrition/templates/ingredient/email_new.tpl:9
+#, python-format
+msgid "The %(site)s team"
+msgstr "%(site)s laget"
+
#: manager/templates/workout/email_weight_reminder.tpl:3
#, python-format
msgid ""
@@ -2977,6 +2775,10 @@ msgid ""
msgstr ""
"Du vil jevnlig motta slike påminnelser til du skriver inn din nåværende vekt."
+#: manager/templates/workout/log.html:10 manager/templates/workout/log.html:11
+msgid "Weight log"
+msgstr "Vektlogg"
+
#: manager/templates/workout/log.html:29
msgid "Weight log for workout"
msgstr "Vektlogg for denne treningsøkten"
@@ -3082,7 +2884,7 @@ msgstr "Vis logger"
msgid "Edit workout"
msgstr "Endre treningsøkt"
-#: manager/templates/workout/view.html:225 manager/views/workout.py:300
+#: manager/templates/workout/view.html:225 manager/views/workout.py:301
msgid "Mark as template"
msgstr "Marker som mal"
@@ -3090,11 +2892,6 @@ msgstr "Marker som mal"
msgid "Add workout day"
msgstr "Legg til treningsdag"
-#: manager/views/log.py:92
-#, python-format
-msgid "Edit log entry for %s"
-msgstr "Endre loggoppføring for %s"
-
#: manager/views/log.py:111
msgid "Delete workout log"
msgstr "Slett treningslogg"
@@ -3112,11 +2909,11 @@ msgstr "Opprett timeplan"
msgid "Your workouts"
msgstr "Dine treningsøkter"
-#: manager/views/workout.py:227
+#: manager/views/workout.py:228
msgid "Copy workout"
msgstr "Kopier treningsøkt"
-#: manager/views/workout.py:230
+#: manager/views/workout.py:231
msgid "Copy"
msgstr "Kopier"
@@ -3138,23 +2935,23 @@ msgstr "Dette vil slette alle vekt logger for denne dagen også."
msgid "Value"
msgstr ""
-#: nutrition/forms.py:122
+#: nutrition/forms.py:123
msgid "Calculate"
msgstr "Beregn"
-#: nutrition/forms.py:195 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:196 nutrition/templates/rate/form.html:76
msgid "Basic caloric intake"
msgstr "Grunnleggende kaloriinntak"
-#: nutrition/forms.py:196
+#: nutrition/forms.py:197
msgid "Your basic caloric intake as calculated for your data"
msgstr "Din grunnleggende kaloriinntak beregnet med din data"
-#: nutrition/forms.py:202
+#: nutrition/forms.py:203
msgid "Additional calories"
msgstr "Ekstra kalorier"
-#: nutrition/forms.py:204
+#: nutrition/forms.py:205
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
@@ -3162,7 +2959,7 @@ msgstr ""
"Ekstra kalorier for å legge til base rate (for å trekke fra, legg inn et "
"negativt tall)"
-#: nutrition/forms.py:232 nutrition/models/ingredient_weight_unit.py:39
+#: nutrition/forms.py:233 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"
@@ -3227,7 +3024,7 @@ msgstr ""
"Total energi ({energy}kcal) er ikke anslagsvis sum av energi som stammer fra "
"protein, karbohydrater og fett ({energy_calculated}kcal +/-{energy_approx}%)"
-#: nutrition/models/ingredient.py:357 nutrition/views/ingredient.py:225
+#: nutrition/models/ingredient.py:357 nutrition/views/ingredient.py:219
msgid "Ingredient was successfully added to the general database"
msgstr "Ingrediens ble lagt til i databasen"
@@ -3256,6 +3053,12 @@ msgstr "Enhetsmengde , f.eks \"1 kopp\" eller \"1/2 skje\""
msgid "Meal"
msgstr "Måltid"
+#: nutrition/models/log.py:65
+#, fuzzy
+#| msgid "Time (approx)"
+msgid "Date and Time (Approx.)"
+msgstr "Tid (ca)"
+
#: nutrition/models/meal.py:61
msgid "Time (approx)"
msgstr "Tid (ca)"
@@ -3357,6 +3160,10 @@ msgstr ""
"Den er nå tilgjengelig på ingrediensoversikten, og kan nå bli\n"
"lagt til i ernæringsplanen. Du får tilgang til den på denne adressen:"
+#: nutrition/templates/ingredient/email_new.tpl:8
+msgid "Thank you for contributing and making this site better!"
+msgstr "Takk for at du bidrar og lager denne siden bedre!"
+
#: nutrition/templates/ingredient/form.html:4
msgid "Submitting an ingredient"
msgstr "Sender inn en ingrediens"
@@ -3390,6 +3197,10 @@ msgstr ""
msgid "No ingredients."
msgstr "Ingen ingredienser."
+#: nutrition/templates/ingredient/overview.html:57
+msgid "Search"
+msgstr "Søk"
+
#: nutrition/templates/ingredient/overview.html:66
msgid "ingredient name"
msgstr "Navn på ingrediens"
@@ -3399,6 +3210,14 @@ msgstr "Navn på ingrediens"
msgid "Add ingredient"
msgstr "Legg til ingrediens"
+#: nutrition/templates/ingredient/overview.html:85
+msgid "Only registered users can do this"
+msgstr "Kun registrerte brukere kan utføre dette"
+
+#: nutrition/templates/ingredient/pending.html:14
+msgid "Submission date"
+msgstr "Innleveringsdato"
+
#: nutrition/templates/ingredient/view.html:27
msgid "Ingredient is pending review"
msgstr "Ingrediens venter på godkjenning"
@@ -3414,6 +3233,18 @@ msgstr ""
"inkludert i databasen. Inntil da, vil den ikke bli vist i oversikten eller\n"
"søket."
+#: nutrition/templates/ingredient/view.html:31
+msgid "Please select one of the options below."
+msgstr "Velg ett av alternativene nedenfor."
+
+#: nutrition/templates/ingredient/view.html:38
+msgid "Accept"
+msgstr "Godta"
+
+#: nutrition/templates/ingredient/view.html:42
+msgid "Decline"
+msgstr "Avslå"
+
#: nutrition/templates/ingredient/view.html:71
#: nutrition/templates/log/detail.html:31
#: nutrition/templates/plan/view.html:229 nutrition/views/plan.py:376
@@ -3680,14 +3511,18 @@ msgstr ""
"nødvendig\n"
"selv i noen uker om det totale beløpet må endres."
-#: nutrition/views/ingredient.py:181
+#: nutrition/views/ingredient.py:175
msgid "Add a new ingredient"
msgstr "Legg til ny ingrediens"
-#: nutrition/views/ingredient.py:238
+#: nutrition/views/ingredient.py:232
msgid "Ingredient was successfully marked as rejected"
msgstr "Ingrediens ble vellykket merket som avvist"
+#: nutrition/views/log.py:230 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"
@@ -3940,15 +3775,15 @@ msgstr ""
msgid "100%% Free <br>and <br>Open Source"
msgstr "100%% Fri <br> og <br> Åpen Kildekode"
-#: utils/generic_views.py:261
+#: utils/generic_views.py:262
msgid "Yes, delete"
msgstr "Ja, slett det"
-#: utils/models.py:47
+#: utils/models.py:48
msgid "Author"
msgstr "Forfatter"
-#: utils/models.py:52
+#: utils/models.py:53
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."
@@ -3956,15 +3791,15 @@ msgstr ""
"Hvis du ikke er forfatteren, skriver du inn navnet eller kilden her. Dette "
"er nødvendig for noen lisenser f.eks CC-BY-SA."
-#: utils/models.py:77
+#: utils/models.py:78
msgid "Pending"
msgstr "Avventer"
-#: utils/models.py:78
+#: utils/models.py:79
msgid "Accepted"
msgstr "Godkjent"
-#: utils/models.py:79
+#: utils/models.py:80
msgid "Declined"
msgstr "Ikke godkjent"
@@ -4131,6 +3966,209 @@ msgstr "Slettet."
msgid "Delete weight entry for the %s"
msgstr "Slett vektoppføring for %s"
+#~ msgid "Ingredients"
+#~ msgstr "Ingredienser"
+
+#~ msgid ""
+#~ "Use the configuration to select in what languages the\n"
+#~ "exercises and ingredients will be shown for the current language (for "
+#~ "example\n"
+#~ "the exercises should be shown in languages A, B and C; the ingredients "
+#~ "only\n"
+#~ "in A)."
+#~ msgstr ""
+#~ "Bruk konfigurasjonen til å velge hvilke språk øvelsene og ingrediensene "
+#~ "skal vises med.\n"
+#~ "(for eksempel:\n"
+#~ "Øvelsene skal bli vist i språk A, B og C; ingrediensene bare i A)."
+
+#~ msgctxt "as in sorted by category"
+#~ msgid "by category"
+#~ msgstr "etter kategori"
+
+#~ msgctxt "as in sorted by muscle"
+#~ msgid "by muscle"
+#~ msgstr "etter muskler"
+
+#~ msgctxt "as in sorted by equipment"
+#~ msgid "by equipment"
+#~ msgstr "etter apperat"
+
+#~ msgid "Add new exercise"
+#~ msgstr "Legg til ny øvelse"
+
+#~ msgid "Exercises pending review"
+#~ msgstr "Øvelser venter på godkjenning"
+
+#~ msgid "Exercise was successfully added to the general database"
+#~ msgstr "Øvelsen ble vellykket lagt til i databasen"
+
+#~ msgid "New user submitted exercise"
+#~ msgstr "Ny bruker har sendt inn øvelse"
+
+#, python-brace-format
+#~ msgid "The user {0} submitted a new exercise \"{1}\"."
+#~ msgstr "Brukeren {0} sendte inn en ny øvelse \"{1}\"."
+
+#~ msgid "New user submitted image"
+#~ msgstr "Ny bruker har sendt inn bilde"
+
+#, 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}."
+
+#~ msgid "Equipment overview"
+#~ msgstr "Utstyrsoversikt"
+
+#~ msgid "Main muscles"
+#~ msgstr "Viktigste musklene"
+
+#~ msgid ""
+#~ "No exercises for this equipment. Add or edit an exercise and set the "
+#~ "equipment."
+#~ msgstr ""
+#~ "Ingen øvelse for dette utstyret. Legg til eller endre en øvelse og legg "
+#~ "til utstyret."
+
+#~ msgid "exercise name"
+#~ msgstr "Navn på øvelsen"
+
+#, python-format
+#~ msgid ""
+#~ "Your exercise '%(exercise)s' was successfully added to the general\n"
+#~ "database."
+#~ msgstr ""
+#~ "Din øvelse «%(exercise)s» ble lagt til i\n"
+#~ "databasen."
+
+#~ msgid ""
+#~ "It is now available on the exercise and muscle overview and can be\n"
+#~ "added to workouts. You can access it on this address:"
+#~ msgstr ""
+#~ "Det er nå tilgjengelig på trening og muskleloversikt og kan bli\n"
+#~ "lagt til i treningsøktene. Du får tilgang til den på denne adressen:"
+
+#~ msgid "Submitting an exercise"
+#~ msgstr "Sender inn en øvelse"
+
+#~ msgid ""
+#~ "Thank you for submitting an exercise. This is much\n"
+#~ "appreciated!"
+#~ msgstr ""
+#~ "Takk for at du sender inn en øvelse. Dette er veldig \n"
+#~ "verdsatt!"
+
+#~ msgid ""
+#~ "After you submit the form, the administrators will be notified.\n"
+#~ "Once it is reviewed, it will be added to the database. Till this "
+#~ "happens,\n"
+#~ "it will not be visible in the overview or the search. In case you added "
+#~ "your email\n"
+#~ "when you registered, you will get notified when the process is completed "
+#~ "successfully."
+#~ msgstr ""
+#~ "Når du har sendt skjemaet, vil administratorer bli varslet.\n"
+#~ "Når den er gjennomgått , vil det bli lagt til i databasen. Til dette\n"
+#~ "skjer,\n"
+#~ "vil ikke dette være synlig i oversikten eller søk. Om du la igjen din e-"
+#~ "postadresse\n"
+#~ "når du registrerte kontoen, vil du få beskjed når prosessen er fullført."
+
+#~ msgid "Correcting an exercise"
+#~ msgstr "Retter en øvelse"
+
+#~ msgid ""
+#~ "Thank you for correcting and improving this exercise.\n"
+#~ "This is much appreciated!"
+#~ msgstr ""
+#~ "Takk for at du korrigerer og forbedrer denne øvelsen.\n"
+#~ "Dette er mye verdsatt!"
+
+#~ msgid ""
+#~ "After you submit the form, the administrators will be notified.\n"
+#~ "Once the changes are reviewed the exercise will be updated."
+#~ msgstr ""
+#~ "Når du har sendt skjemaet, vil en administratorer bli varslet.\n"
+#~ "Når endringene er blitt godkjent vil øvelsen bli oppdatert."
+
+#~ msgid "No categories."
+#~ msgstr "Ingen kategorier."
+
+#~ msgid "Use link to create one"
+#~ msgstr "Bruk lenken for å opprette"
+
+#~ msgid "Exercise is pending review"
+#~ msgstr "Øvelse venter på godkjenning"
+
+#~ msgid ""
+#~ "This user submitted exercise is pending a decision to be\n"
+#~ " included in the database."
+#~ msgstr ""
+#~ "Denne brukerinnsendte øvelsen venter på at beslutningen skal være\n"
+#~ " inkludert i databasen."
+
+#~ msgid "Till then, it will not be shown in the overview or the search."
+#~ msgstr "Inntil da, vil det ikke bli vist i oversikten eller søk."
+
+#~ msgid "Images"
+#~ msgstr "Bilder"
+
+#~ msgid "Add new image"
+#~ msgstr "Legg til nytt bilde"
+
+#, fuzzy
+#~| msgid "Add new image"
+#~ msgid "Add new video"
+#~ msgstr "Legg til nytt bilde"
+
+#~ msgid "Images pending review"
+#~ msgstr "Bilder som venter på godkjenning"
+
+#~ msgid "Comments for this exercise"
+#~ msgstr "Kommentarer for denne øvelsen"
+
+#~ msgid "Add new comment"
+#~ msgstr "Legg til ny kommentar"
+
+#~ msgid "The diagram shows the most used muscles on this exercise"
+#~ msgstr "Diagrammet viser de mest brukte musklene i denne øvelsen"
+
+#~ msgid "Exercise Variations"
+#~ msgstr "Treningsvariasjoner"
+
+#~ msgid "Submit a correction"
+#~ msgstr "Send inn en rettelse"
+
+#, fuzzy
+#~ msgid ""
+#~ "No exercises for this muscle. Add or edit an exercise and set the muscle."
+#~ msgstr ""
+#~ "Ingen øvelser for denne muskelen. Legg til en øvelse og angi muskelen."
+
+#~ msgid "Add exercise"
+#~ msgstr "Legg til øvelse"
+
+#~ msgid ""
+#~ "Thank you. Once the changes are reviewed the exercise will be updated."
+#~ msgstr "Takk. Så fort endringene er godkjent vil øvelsen bli oppdatert."
+
+#, python-brace-format
+#~ msgid "Correct {0}"
+#~ msgstr "Korrekt {0}"
+
+#~ msgid "Exercise was successfully marked as rejected"
+#~ msgstr "Øvelse ble vellykket merket som avvist"
+
+#~ msgid "Edit exercise image"
+#~ msgstr "Endre bilde for øvelsen"
+
+#~ msgid "Delete exercise image?"
+#~ msgstr "Slett bilde for øvelsen?"
+
+#, python-format
+#~ msgid "Edit log entry for %s"
+#~ msgstr "Endre loggoppføring for %s"
+
#~ msgid "Anterior deltoid"
#~ msgstr "Anterior deltoid"
@@ -4213,8 +4251,8 @@ msgstr "Slett vektoppføring for %s"
#~ "a>."
#~ msgstr ""
#~ "Hvis du ønsker å ytterligere hjelpe og forbedre dette prosjektet,\n"
-#~ "kan det hende du også er interessert i å <a href=\"%(contribute)s"
-#~ "\">bidra</a>."
+#~ "kan det hende du også er interessert i å <a "
+#~ "href=\"%(contribute)s\">bidra</a>."
#~ msgid "Feedback form"
#~ msgstr "Tilbakemeldings-skjema"
@@ -4504,10 +4542,6 @@ msgstr "Slett vektoppføring for %s"
#~ msgid "No filter"
#~ msgstr "Ingen filter"
-#~ msgctxt "Noun, not verb"
-#~ msgid "Change"
-#~ msgstr "Endre"
-
#~ msgid "Days"
#~ msgstr "Dager"
diff --git a/wger/locale/os/LC_MESSAGES/django.po b/wger/locale/os/LC_MESSAGES/django.po
index ead926b15..ac17dccc0 100644
--- a/wger/locale/os/LC_MESSAGES/django.po
+++ b/wger/locale/os/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: wger Workout Manager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-14 12:01+0200\n"
+"POT-Creation-Date: 2022-11-10 16:03+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/"
@@ -29,102 +29,8 @@ msgid ""
"registered users to this gym and update all existing users without a gym."
msgstr ""
-#: 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:226
-msgid "Languages"
-msgstr ""
-
-#: config/templates/language/overview.html:16
-msgid "Nothing found."
-msgstr ""
-
-#: 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:150
-#: nutrition/templates/plan/view.html:153
-#: nutrition/templates/plan/view.html:191
-msgid "Add one now."
-msgstr ""
-
-#: config/templates/language/overview.html:29
-#: core/templates/license/list.html:38 core/templates/misc/license/list.html:41
-#: core/templates/repetition_unit/list.html:41
-#: core/templates/user/overview.html:327 core/templates/user/overview.html:366
-#: core/templates/user/overview.html:402
-#: core/templates/weight_unit/list.html:41 core/views/languages.py:73
-#: core/views/license.py:65 core/views/repetition_units.py:65
-#: core/views/weight_units.py:65
-#: exercises/templates/categories/admin-overview.html:36
-#: 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:61
-msgid "Add"
-msgstr "Бафтауын"
-
-#: 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/language.py:32
-msgid "Language full name"
-msgstr "Ӕвзаджы ӕнӕхъӕн ном"
-
-#: config/templates/language/view.html:34 core/templates/user/overview.html:451
-#: gym/views/admin_config.py:44 gym/views/admin_config.py:58
-#: gym/views/user_config.py:46
-msgid "Configuration"
-msgstr ""
-
-#: config/templates/language/view.html:35
-msgid ""
-"Use the configuration to select in what languages the\n"
-"exercises and ingredients will be shown for the current language (for "
-"example\n"
-"the exercises should be shown in languages A, B and C; the ingredients only\n"
-"in A)."
-msgstr ""
-
-#: config/templates/language/view.html:44 gym/templates/contract/list.html:36
-msgid "Show"
-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: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:45
-msgid "Options"
-msgstr "Фадӕттӕ"
-
-#: config/templates/language/view.html:96 config/views/gym_config.py:41
-#: config/views/language_config.py:49 core/templates/license/list.html:16
-#: core/templates/misc/license/list.html:17
+#: config/views/gym_config.py:41 core/templates/language/view.html:57
+#: 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:39
#: core/templates/tags/render_day.html:75 core/templates/user/overview.html:205
@@ -132,12 +38,10 @@ 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:230
-#: exercises/templates/exercise/view.html:351
#: exercises/templates/muscles/admin-overview.html:16
-#: 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
+#: 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
#: 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
@@ -153,81 +57,52 @@ msgstr "Фадӕттӕ"
msgid "Edit"
msgstr "Ивын"
-#: 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: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: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
-#: gym/templates/contract_type/list.html:39 gym/templates/document/list.html:46
-#: gym/templates/gym/list.html:20 manager/templates/calendar/day.html:69
-#: 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:231
-#: 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:132
-#: nutrition/templates/units/list.html:20
-msgid "Delete"
-msgstr "Схафын"
-
-#: core/demo.py:86
+#: core/demo.py:95
msgid "Sample workout"
msgstr ""
-#: core/demo.py:90
+#: core/demo.py:99
msgid "Sample day"
msgstr ""
-#: core/demo.py:94
+#: core/demo.py:103
msgid "Another sample day"
msgstr ""
-#: core/demo.py:217
-msgid "Sample nutrional plan"
+#: core/demo.py:211
+msgid "Sample nutritional plan"
msgstr ""
-#: core/demo.py:349 core/demo.py:351 core/demo.py:353
+#: core/demo.py:343 core/demo.py:345 core/demo.py:347
#, python-brace-format
msgid "Placeholder workout nr {0} for schedule"
msgstr ""
-#: core/demo.py:358
+#: core/demo.py:352
msgid "My cool workout schedule"
msgstr ""
-#: core/demo.py:397 core/demo.py:412
+#: core/demo.py:391 core/demo.py:406
msgid "Empty placeholder schedule"
msgstr ""
-#: core/forms.py:61 core/templates/navigation.html:188
-#: core/templates/navigation.html:192 core/templates/user/login.html:4
+#: core/forms.py:64 core/templates/navigation.html:179
+#: core/templates/navigation.html:183 core/templates/user/login.html:4
#: software/templates/features.html:43
msgid "Login"
msgstr ""
-#: core/forms.py:73 core/forms.py:164 gym/views/export.py:63
+#: core/forms.py:76 core/forms.py:177 gym/views/export.py:63
#: gym/views/gym.py:218
msgid "First name"
msgstr ""
-#: core/forms.py:74 core/forms.py:165 core/templates/user/overview.html:267
+#: core/forms.py:77 core/forms.py:178 core/templates/user/overview.html:267
#: gym/views/export.py:64 gym/views/gym.py:218
msgid "Last name"
msgstr ""
-#: core/forms.py:76 core/forms.py:131 core/templates/user/overview.html:271
+#: core/forms.py:79 core/forms.py:144 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
@@ -237,75 +112,105 @@ msgstr ""
msgid "Email"
msgstr "Email"
-#: core/forms.py:77
+#: core/forms.py:80
msgid "Used for password resets and, optionally, e-mail reminders."
msgstr ""
-#: core/forms.py:102
+#: core/forms.py:84 core/models/profile.py:220
+#: gym/templates/gym/new_user.html:38
+msgid "Date of Birth"
+msgstr ""
+
+#: core/forms.py:116
msgid "Personal data"
msgstr ""
-#: core/forms.py:110
+#: core/forms.py:124
msgid "Workout reminders"
msgstr ""
-#: core/forms.py:117
+#: core/forms.py:131
msgid "Other settings"
msgstr ""
-#: 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
+#: core/forms.py:138 core/views/user.py:615 core/views/user.py:630
+#: core/views/user.py:642 gym/forms.py:72 manager/templates/log/add.html:65
+#: manager/templates/set/add.html:69 manager/views/workout.py:222
+#: utils/generic_views.py:143
msgid "Save"
msgstr ""
-#: core/forms.py:132
+#: core/forms.py:145
msgid "Used for password resets and, optionally, email reminders."
msgstr ""
-#: core/forms.py:160
+#: core/forms.py:173
msgid "This e-mail address is already in use."
msgstr ""
-#: core/forms.py:180 gym/templates/gym/new_user.html:26
+#: core/forms.py:193 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:182
+#: core/forms.py:195
msgid "Please enter your current password."
msgstr ""
-#: core/forms.py:200
+#: core/forms.py:204 core/templates/language/view.html:62
+#: 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: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/muscles/admin-overview.html:17
+#: gym/templates/admin_notes/list.html:40
+#: gym/templates/contract_option/list.html:39
+#: gym/templates/contract_type/list.html:39 gym/templates/document/list.html:46
+#: gym/templates/gym/list.html:20 manager/templates/calendar/day.html:69
+#: 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:231
+#: 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:132
+#: nutrition/templates/units/list.html:20
+msgid "Delete"
+msgstr "Схафын"
+
+#: core/forms.py:213
msgid "Invalid password"
msgstr ""
-#: core/forms.py:212 core/forms.py:278
+#: core/forms.py:225 core/forms.py:291
msgid "The form is secured with reCAPTCHA"
msgstr ""
-#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:188
-#: core/templates/navigation.html:193 core/templates/template.html:149
-#: core/templates/user/login.html:20 core/views/user.py:293
+#: core/forms.py:239 core/forms.py:258 core/templates/navigation.html:179
+#: core/templates/navigation.html:184 core/templates/template.html:149
+#: core/templates/user/login.html:20 core/views/user.py:300
#: software/templates/features.html:38
msgid "Register"
msgstr ""
-#: core/forms.py:256
+#: core/forms.py:269
msgid "Contact"
msgstr ""
-#: core/forms.py:257
+#: core/forms.py:270
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:71
+#: core/forms.py:278 exercises/models/comment.py:42 manager/models/set.py:60
+#: manager/models/setting.py:111 nutrition/models/log.py:71
msgid "Comment"
msgstr "Хъуыды"
-#: core/forms.py:266
+#: core/forms.py:279
msgid "What do you want to say?"
msgstr ""
@@ -313,6 +218,14 @@ msgstr ""
msgid "Day of the week"
msgstr ""
+#: core/models/language.py:31 core/templates/language/view.html:21
+msgid "Language short name"
+msgstr "Ӕвзаджы цыбыр ном"
+
+#: core/models/language.py:36 core/templates/language/view.html:22
+msgid "Language full name"
+msgstr "Ӕвзаджы ӕнӕхъӕн ном"
+
#: core/models/license.py:29
msgid "Full name"
msgstr ""
@@ -368,19 +281,19 @@ msgstr ""
msgid "Imperial (pound)"
msgstr ""
-#: core/models/profile.py:111
+#: core/models/profile.py:114
msgid "Show exercise comments"
msgstr ""
-#: core/models/profile.py:112
+#: core/models/profile.py:115
msgid "Check to show exercise comments on the workout view"
msgstr ""
-#: core/models/profile.py:123
+#: core/models/profile.py:126
msgid "Also use ingredients in English"
msgstr ""
-#: core/models/profile.py:125
+#: core/models/profile.py:128
msgid ""
"Check to also show ingredients in English while creating\n"
"a nutritional plan. These ingredients are extracted from a list provided\n"
@@ -388,130 +301,129 @@ msgid ""
"7000 entries, but can be somewhat overwhelming and make the search difficult."
msgstr ""
-#: core/models/profile.py:134
+#: core/models/profile.py:137
msgid "Activate workout reminders"
msgstr ""
-#: core/models/profile.py:136
+#: core/models/profile.py:139
msgid ""
"Check to activate automatic reminders for workouts. You need to provide a "
"valid email for this to work."
msgstr ""
-#: core/models/profile.py:145
+#: core/models/profile.py:148
msgid "Remind before expiration"
msgstr ""
-#: core/models/profile.py:146
+#: core/models/profile.py:149
msgid "The number of days you want to be reminded before a workout expires."
msgstr ""
-#: core/models/profile.py:152
+#: core/models/profile.py:155
msgid "Default duration of workouts"
msgstr ""
-#: core/models/profile.py:154
+#: core/models/profile.py:157
msgid ""
"Default duration in weeks of workouts not in a schedule. Used for email "
"workout reminders."
msgstr ""
-#: core/models/profile.py:171
+#: core/models/profile.py:174
msgid "Notification language"
msgstr ""
-#: core/models/profile.py:173
+#: core/models/profile.py:176
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/profile.py:186 gym/views/export.py:66
+#: core/models/profile.py:212 gym/views/export.py:66
msgid "Age"
msgstr ""
-#: core/models/profile.py:202 nutrition/forms.py:99
+#: core/models/profile.py:228 nutrition/forms.py:100
msgid "Height (cm)"
msgstr ""
-#: core/models/profile.py:219
+#: core/models/profile.py:245
msgid "Hours of sleep"
msgstr ""
-#: core/models/profile.py:220
+#: core/models/profile.py:246
msgid "The average hours of sleep per day"
msgstr ""
-#: core/models/profile.py:229
+#: core/models/profile.py:255
msgid "Work"
msgstr ""
-#: core/models/profile.py:230 core/models/profile.py:272
+#: core/models/profile.py:256 core/models/profile.py:298
msgid "Average hours per day"
msgstr ""
-#: core/models/profile.py:239 core/models/profile.py:260
-#: core/models/profile.py:281
+#: core/models/profile.py:265 core/models/profile.py:286
+#: core/models/profile.py:307
msgid "Physical intensity"
msgstr ""
-#: core/models/profile.py:240 core/models/profile.py:261
-#: core/models/profile.py:282
+#: core/models/profile.py:266 core/models/profile.py:287
+#: core/models/profile.py:308
msgid "Approximately"
msgstr ""
-#: core/models/profile.py:250
+#: core/models/profile.py:276
msgid "Sport"
msgstr ""
-#: core/models/profile.py:251
+#: core/models/profile.py:277
msgid "Average hours per week"
msgstr ""
-#: core/models/profile.py:271
+#: core/models/profile.py:297
msgid "Free time"
msgstr ""
-#: core/models/profile.py:292 nutrition/templates/rate/form.html:66
+#: core/models/profile.py:318 nutrition/templates/rate/form.html:66
msgid "Total daily calories"
msgstr ""
-#: core/models/profile.py:293
+#: core/models/profile.py:319
msgid "Total caloric intake, including e.g. any surplus"
msgstr ""
-#: core/models/profile.py:305 nutrition/models/ingredient_weight_unit.py:45
+#: core/models/profile.py:331 nutrition/models/ingredient_weight_unit.py:45
#: nutrition/models/log.py:90 nutrition/models/meal_item.py:58
msgid "Weight unit"
msgstr ""
-#: core/models/profile.py:313
+#: core/models/profile.py:339
msgid "Allow external access"
msgstr ""
-#: core/models/profile.py:315
+#: core/models/profile.py:341
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/profile.py:324
+#: core/models/profile.py:350
msgid "Automatic reminders for weight entries"
msgstr ""
-#: core/models/profile.py:326
+#: core/models/profile.py:352
msgid "Number of days after the last weight entry (enter 0 to deactivate)"
msgstr ""
-#: core/models/profile.py:392
+#: core/models/profile.py:418
msgid "The sum of all hours has to be 24"
msgstr ""
#: core/models/rep_unit.py:35 core/models/weight_unit.py:35
-#: core/templates/user/overview.html:263 core/views/user.py:575
+#: core/templates/user/overview.html:263 core/views/user.py:591
#: 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
+#: exercises/models/exercise.py:64 exercises/models/muscle.py:36
#: 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
@@ -570,6 +482,52 @@ msgstr ""
msgid "Are you sure you want to delete this? This action cannot be undone."
msgstr ""
+#: core/templates/email_verification/confirm_template.html:4
+msgid "Email verified"
+msgstr ""
+
+#: core/templates/email_verification/confirm_template.html:18
+#, python-format
+msgid "%(username)s, your email was verified"
+msgstr ""
+
+#: core/templates/email_verification/confirm_template.html:22
+msgid "Error, invalid verification token"
+msgstr ""
+
+#: core/templates/email_verification/email_body_html.tpl:6
+#, fuzzy
+#| msgid "Administration"
+msgid "Email Confirmation"
+msgstr "Администраци"
+
+#: core/templates/email_verification/email_body_html.tpl:9
+#: core/templates/email_verification/email_body_txt.tpl:3
+#, python-format
+msgid "You are almost there, %(username)s!"
+msgstr ""
+
+#: core/templates/email_verification/email_body_html.tpl:11
+#, python-format
+msgid "Please click <a href=\"%(link)s\">here</a> to confirm your email"
+msgstr ""
+
+#: core/templates/email_verification/email_body_html.tpl:12
+#: core/templates/email_verification/email_body_txt.tpl:5
+#, python-format
+msgid "The token expires on %(time)s"
+msgstr ""
+
+#: core/templates/email_verification/email_body_html.tpl:14
+#: core/templates/email_verification/email_body_txt.tpl:8
+msgid "the wger Team"
+msgstr ""
+
+#: core/templates/email_verification/email_body_txt.tpl:4
+#, python-format
+msgid "Please click the following link to confirm your email: %(link)s"
+msgstr ""
+
#: core/templates/index.html:4
msgid "Dashboard"
msgstr ""
@@ -626,7 +584,7 @@ msgid "Add custom diary entry"
msgstr ""
#: core/templates/index.html:84 core/templates/index.html:92
-#: manager/models/day.py:34 manager/models/log.py:56
+#: manager/models/day.py:34 manager/models/log.py:58
#: manager/models/session.py:60 manager/models/workout.py:109
#: manager/templates/schedule/view.html:105
#: manager/templates/workout/view.html:11
@@ -657,6 +615,20 @@ msgstr ""
msgid "No workouts found."
msgstr ""
+#: core/templates/index.html:137 core/templates/index.html:189
+#: core/templates/language/overview.html:23
+#: 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:150
+#: nutrition/templates/plan/view.html:153
+#: nutrition/templates/plan/view.html:191
+msgid "Add one now."
+msgstr ""
+
#: 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
@@ -710,19 +682,59 @@ msgid "No nutrition plans."
msgstr ""
#: 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
+#: core/templates/user/overview.html:121 manager/forms.py:184
+#: manager/helpers.py:89 manager/models/log.py:86 manager/models/setting.py:79
+#: manager/templates/log/add.html:54 manager/templates/set/formset.html:11
#: weight/models.py: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:210 core/templates/navigation.html:135
+#: core/templates/index.html:210 core/templates/navigation.html:126
#: weight/views.py:70
msgid "Add weight entry"
msgstr ""
+#: core/templates/language/overview.html:4 core/templates/navigation.html:217
+msgid "Languages"
+msgstr ""
+
+#: core/templates/language/overview.html:23
+msgid "Nothing found."
+msgstr ""
+
+#: core/templates/language/overview.html:36 core/templates/license/list.html:38
+#: core/templates/misc/license/list.html:41
+#: core/templates/repetition_unit/list.html:41
+#: core/templates/user/overview.html:327 core/templates/user/overview.html:366
+#: core/templates/user/overview.html:402
+#: core/templates/weight_unit/list.html:41 core/views/languages.py:73
+#: core/views/license.py:65 core/views/repetition_units.py:65
+#: core/views/weight_units.py:65
+#: exercises/templates/categories/admin-overview.html:36
+#: 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:61
+msgid "Add"
+msgstr "Бафтауын"
+
+#: core/templates/language/view.html:52 core/templates/user/api_key.html:44
+#: core/templates/user/preferences.html:44 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:45
+msgid "Options"
+msgstr "Фадӕттӕ"
+
#: core/templates/license/list.html:4 core/templates/misc/license/list.html:4
msgid "License list"
msgstr ""
@@ -735,7 +747,6 @@ msgstr ""
#: core/templates/weight_unit/list.html:26
#: exercises/templates/categories/admin-overview.html:24
#: exercises/templates/equipment/admin-overview.html:24
-#: exercises/templates/exercise/pending.html:30
#: exercises/templates/muscles/admin-overview.html:24
#: gym/templates/admin_notes/list.html:52 gym/templates/contract/list.html:60
#: gym/templates/contract_option/list.html:56
@@ -813,155 +824,135 @@ msgstr ""
msgid "Public templates"
msgstr ""
-#: core/templates/navigation.html:64
-msgctxt "as in sorted by category"
-msgid "by category"
-msgstr ""
-
-#: core/templates/navigation.html:65
-msgctxt "as in sorted by muscle"
-msgid "by muscle"
-msgstr ""
-
-#: core/templates/navigation.html:66
-msgctxt "as in sorted by equipment"
-msgid "by equipment"
-msgstr ""
-
-#: core/templates/navigation.html:70
-#: exercises/templates/equipment/overview.html:109
-#: exercises/templates/equipment/overview.html:113
-#: exercises/templates/exercise/overview.html:112
-#: exercises/templates/exercise/overview.html:116
-#: exercises/templates/muscles/overview.html:112
-#: exercises/templates/muscles/overview.html:116
-msgid "Add new exercise"
-msgstr "Ног фӕлтӕрӕн бафтауын"
+#: core/templates/navigation.html:63 manager/forms.py:133
+#: manager/models/setting.py:54
+msgid "Exercises"
+msgstr "Фӕлтӕрӕнтӕ"
-#: core/templates/navigation.html:75 core/templates/navigation.html:116
-#: core/templates/navigation.html:224
+#: core/templates/navigation.html:67 core/templates/navigation.html:107
+#: core/templates/navigation.html:215
msgid "Administration"
msgstr "Администраци"
-#: core/templates/navigation.html:76
-#: exercises/templates/exercise/pending.html:6
-msgid "Exercises pending review"
-msgstr ""
+#: core/templates/navigation.html:68
+#, fuzzy
+#| msgid "Exercise Categories"
+msgid "Exercise edit history"
+msgstr "Фӕлтӕрӕнты ӕмбырд"
-#: core/templates/navigation.html:77 exercises/models/base.py:72
-#: exercises/templates/exercise/view.html:80
+#: core/templates/navigation.html:69 exercises/models/base.py:84
msgid "Equipment"
msgstr ""
-#: core/templates/navigation.html:78 exercises/templates/exercise/view.html:258
+#: core/templates/navigation.html:70
msgid "Muscles"
msgstr "Мускултӕ"
-#: core/templates/navigation.html:79
+#: core/templates/navigation.html:71
#: exercises/templates/categories/admin-overview.html:4
msgid "Categories"
msgstr ""
-#: core/templates/navigation.html:93 software/templates/features.html:87
+#: core/templates/navigation.html:84 software/templates/features.html:87
msgid "Nutrition"
msgstr ""
-#: core/templates/navigation.html:99 core/templates/user/overview.html:144
+#: core/templates/navigation.html:90 core/templates/user/overview.html:144
msgid "Nutrition plans"
msgstr ""
-#: core/templates/navigation.html:105 nutrition/templates/bmi/form.html:50
+#: core/templates/navigation.html:96 nutrition/templates/bmi/form.html:50
msgid "BMI calculator"
msgstr ""
-#: core/templates/navigation.html:111 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:102 nutrition/templates/rate/form.html:17
msgid "Daily calories calculator"
msgstr ""
-#: core/templates/navigation.html:113
+#: core/templates/navigation.html:104
#: nutrition/templates/ingredient/overview.html:29
msgid "Ingredient overview"
msgstr ""
-#: core/templates/navigation.html:117 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:108 nutrition/templates/units/list.html:6
msgid "Ingredient weight units"
msgstr ""
-#: core/templates/navigation.html:118
+#: core/templates/navigation.html:109
#: nutrition/templates/ingredient/pending.html:6
msgid "Ingredients pending review"
msgstr ""
-#: core/templates/navigation.html:132
+#: core/templates/navigation.html:123
msgid "Body weight"
msgstr ""
-#: core/templates/navigation.html:134 core/templates/user/overview.html:114
+#: core/templates/navigation.html:125 core/templates/user/overview.html:114
#: weight/templates/overview.html:7
msgid "Weight overview"
msgstr ""
-#: core/templates/navigation.html:147
+#: core/templates/navigation.html:138
msgid "About this software"
msgstr ""
-#: core/templates/navigation.html:149 core/templates/template_features.html:82
+#: core/templates/navigation.html:140 core/templates/template_features.html:82
#: software/templates/about_us.html:5
msgid "About us"
msgstr ""
-#: core/templates/navigation.html:151 software/templates/features.html:209
+#: core/templates/navigation.html:142 software/templates/features.html:209
msgid "REST API"
msgstr ""
-#: core/templates/navigation.html:155 utils/models.py:40
+#: core/templates/navigation.html:146 utils/models.py:41
msgid "License"
msgstr ""
-#: core/templates/navigation.html:161
+#: core/templates/navigation.html:152
msgid "Developer documentation"
msgstr ""
-#: core/templates/navigation.html:167
+#: core/templates/navigation.html:158
msgid "Get the code"
msgstr ""
-#: core/templates/navigation.html:173 core/templates/template.html:204
+#: core/templates/navigation.html:164 core/templates/template.html:203
#: core/templates/template_features.html:99
msgid "Translate"
msgstr ""
-#: core/templates/navigation.html:194 core/templates/user/login.html:28
+#: core/templates/navigation.html:185 core/templates/user/login.html:28
msgid "Reset password"
msgstr ""
-#: core/templates/navigation.html:207
+#: core/templates/navigation.html:198
msgid "My preferences"
msgstr ""
-#: core/templates/navigation.html:214
+#: core/templates/navigation.html:205
msgid "Logout"
msgstr ""
-#: core/templates/navigation.html:229
+#: core/templates/navigation.html:220
msgid "Licenses"
msgstr ""
-#: core/templates/navigation.html:232
+#: core/templates/navigation.html:223
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr ""
-#: core/templates/navigation.html:235 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:226 core/templates/weight_unit/list.html:4
#: nutrition/templates/ingredient/view.html:174
msgid "Weight units"
msgstr ""
-#: core/templates/navigation.html:238 core/templates/user/list.html:4
+#: core/templates/navigation.html:229 core/templates/user/list.html:4
msgid "User list"
msgstr ""
-#: core/templates/navigation.html:239
+#: core/templates/navigation.html:230
msgid "Gyms"
msgstr ""
@@ -1036,33 +1027,30 @@ msgstr ""
msgid "Add weight log"
msgstr ""
-#: core/templates/tags/render_day.html:114
-#: exercises/templates/equipment/overview.html:59
-#: exercises/templates/exercise/overview.html:63
-#: exercises/templates/muscles/overview.html:65
+#: core/templates/tags/render_day.html:116
msgid "Placeholder image for exercise"
msgstr ""
-#: core/templates/tags/render_day.html:131
+#: core/templates/tags/render_day.html:133
msgid "This exercise has no repetitions."
msgstr ""
-#: core/templates/tags/render_day.html:134
+#: core/templates/tags/render_day.html:136
msgid "Edit them now."
msgstr ""
-#: core/templates/tags/render_day.html:159
+#: core/templates/tags/render_day.html:162
msgid "Add exercises to this workout day"
msgstr ""
#: core/templates/tags/render_weight_log.html:17 manager/helpers.py:89
-#: manager/models/setting.py:57 manager/templates/set/formset.html:10
+#: manager/models/setting.py:69 manager/templates/set/formset.html:9
msgid "Reps"
msgstr ""
-#: 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
+#: core/templates/tags/render_weight_log.html:30 manager/forms.py:189
+#: manager/models/log.py:103 manager/models/setting.py:99
+#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
msgid "RiR"
msgstr ""
@@ -1085,7 +1073,7 @@ msgstr ""
msgid "Features"
msgstr ""
-#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:37
+#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:53
msgid "API key"
msgstr ""
@@ -1125,11 +1113,12 @@ msgid "Documentation"
msgstr ""
#: core/templates/user/delete_account.html:4
-#: core/templates/user/preferences.html:42
+#: core/templates/user/preferences.html:58
msgid "Delete account"
msgstr ""
#: core/templates/user/delete_account.html:17
+#: exercises/templates/history/overview.html:93
msgid "Are you sure?"
msgstr ""
@@ -1174,11 +1163,12 @@ 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/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
+#: exercises/models/base.py:99 exercises/models/base.py:104
+#: exercises/models/exercise.py:69 exercises/models/exercise.py:76
+#: gallery/models/image.py:47 manager/helpers.py:88 manager/models/log.py:100
+#: 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/views.py:150
@@ -1186,11 +1176,11 @@ msgid "Date"
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: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
+#: exercises/models/exercise.py:57 exercises/views/exercises.py:123
+#: 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 "Ӕмбарынгӕнӕн"
@@ -1198,12 +1188,12 @@ msgstr "Ӕмбарынгӕнӕн"
msgid "Number of logs (days)"
msgstr ""
-#: core/templates/user/overview.html:37 core/views/user.py:576
+#: core/templates/user/overview.html:37 core/views/user.py:592
#: 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:267
+#: core/templates/user/overview.html:68 manager/forms.py:278
#: manager/templates/workout/view.html:151
msgid "Log"
msgstr ""
@@ -1221,6 +1211,7 @@ msgid "Notes"
msgstr ""
#: core/templates/user/overview.html:79
+#: exercises/templates/history/overview.html:30
#: manager/templates/calendar/partial_overview_table.html:42
#: nutrition/templates/log/detail.html:154
msgid "Time"
@@ -1268,10 +1259,12 @@ msgid "Do you really want to change this user&#39;s password?"
msgstr ""
#: core/templates/user/overview.html:233
+#: exercises/templates/history/overview.html:106
msgid "No"
msgstr ""
#: core/templates/user/overview.html:234
+#: exercises/templates/history/overview.html:99
msgid "Yes"
msgstr ""
@@ -1326,10 +1319,15 @@ msgid "Documents"
msgstr ""
#: core/templates/user/overview.html:413 gym/templates/document/list.html:32
-#: manager/forms.py:279 manager/templates/workout/view.html:176
+#: manager/forms.py:290 manager/templates/workout/view.html:176
msgid "Download"
msgstr ""
+#: core/templates/user/overview.html:451 gym/views/admin_config.py:44
+#: gym/views/admin_config.py:58 gym/views/user_config.py:46
+msgid "Configuration"
+msgstr ""
+
#: core/templates/user/overview.html:454 gym/models/user_config.py:92
msgid "Include in inactive overview"
msgstr ""
@@ -1347,7 +1345,23 @@ msgstr ""
msgid "Preferences"
msgstr ""
-#: core/templates/user/preferences.html:33 core/views/user.py:587
+#: core/templates/user/preferences.html:19
+msgid "Verified email"
+msgstr ""
+
+#: core/templates/user/preferences.html:24
+msgid "Unverified email"
+msgstr ""
+
+#: core/templates/user/preferences.html:26
+msgid "Send verification email"
+msgstr ""
+
+#: core/templates/user/preferences.html:30
+msgid "You need to verify your email to contribute exercises"
+msgstr ""
+
+#: core/templates/user/preferences.html:49 core/views/user.py:603
msgid "Change password"
msgstr ""
@@ -1377,39 +1391,37 @@ msgid "oz"
msgstr ""
#: 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
+#: exercises/views/equipment.py:104 exercises/views/exercises.py:185
+#: exercises/views/muscles.py:99 manager/views/schedule.py:311
+#: manager/views/schedule_step.py:129 manager/views/workout.py:269
+#: manager/views/workout_session.py:141 nutrition/views/ingredient.py:138
#: 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:431
-#: exercises/views/muscles.py:125 gallery/views/images.py:121
+#: exercises/views/categories.py:127 exercises/views/exercises.py:193
+#: exercises/views/muscles.py:106 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
+#: manager/views/workout.py:273 manager/views/workout_session.py:156
+#: nutrition/views/ingredient.py:145 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:456
+#: core/views/repetition_units.py:85 core/views/user.py:472
#: 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: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
+#: exercises/views/equipment.py:81 exercises/views/muscles.py:86
+#: 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:170
+#: gym/views/gym.py:459 manager/views/day.py:100 manager/views/schedule.py:335
+#: manager/views/workout.py:287 nutrition/views/ingredient.py:164
+#: nutrition/views/plan.py:144 nutrition/views/unit.py:144
#, python-brace-format
msgid "Edit {0}"
msgstr ""
@@ -1437,64 +1449,65 @@ msgstr ""
msgid "Your feedback was successfully sent. Thank you!"
msgstr ""
-#: core/views/user.py:156
+#: core/views/user.py:157
#, python-brace-format
msgid "Account \"{0}\" was successfully deleted"
msgstr ""
-#: core/views/user.py:287
+#: core/views/user.py:294
msgid "You were successfully registered"
msgstr ""
-#: core/views/user.py:339
+#: core/views/user.py:355
msgid "Settings successfully updated"
msgstr ""
-#: core/views/user.py:376
+#: core/views/user.py:392
msgid "The user was successfully deactivated"
msgstr ""
-#: core/views/user.py:411
+#: core/views/user.py:427
msgid "The user was successfully activated"
msgstr ""
-#: core/views/user.py:426
+#: core/views/user.py:442
msgid "Edit user"
msgstr ""
-#: core/views/user.py:573 gym/templates/gym/member_list.html:26
+#: core/views/user.py:589 gym/templates/gym/member_list.html:26
#: gym/views/gym.py:156
msgid "ID"
msgstr ""
-#: core/views/user.py:574 gym/forms.py:94 gym/templates/contract/view.html:55
+#: core/views/user.py:590 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:577 gym/templates/gym/new_user.html:34
+#: core/views/user.py:593 gym/templates/gym/new_user.html:34
#: gym/views/export.py:60 gym/views/gym.py:218
msgid "Gym"
msgstr ""
-#: exercises/models/base.py:51 exercises/templates/exercise/view.html:76
-#: nutrition/models/ingredient.py:204
+#: core/views/user.py:652
+#, python-format
+msgid "A verification email was sent to %(email)s"
+msgstr ""
+
+#: exercises/models/base.py:63 nutrition/models/ingredient.py:204
msgid "Category"
msgstr "Ӕмбырд"
-#: exercises/models/base.py:58
+#: exercises/models/base.py:70
msgid "Primary muscles"
msgstr "Фыццаг мускултӕ"
-#: exercises/models/base.py:64 exercises/templates/equipment/overview.html:71
-#: exercises/templates/exercise/overview.html:76
-#: exercises/templates/exercise/view.html:268
-#: exercises/templates/muscles/overview.html:77
+#: exercises/models/base.py:76
msgid "Secondary muscles"
msgstr "Дыггаг мускултӕ"
-#: exercises/models/base.py:79
+#: exercises/models/base.py:91
msgid "Variations"
msgstr ""
@@ -1502,92 +1515,70 @@ msgstr ""
msgid "Exercise Categories"
msgstr "Фӕлтӕрӕнты ӕмбырд"
-#: exercises/models/comment.py:34 exercises/models/exercise_alias.py:32
-#: exercises/models/image.py:75 exercises/models/video.py:82
-#: manager/forms.py:165 manager/helpers.py:89 manager/models/log.py:51
+#: exercises/models/comment.py:37 exercises/models/exercise_alias.py:35
+#: exercises/models/image.py:71 exercises/models/video.py:95
+#: manager/forms.py:176 manager/helpers.py:89 manager/models/log.py:52
msgid "Exercise"
msgstr "Фӕлтӕрӕн"
-#: exercises/models/comment.py:41
+#: exercises/models/comment.py:43
msgid "A comment about how to correctly do this exercise."
msgstr "Ацы фӕлтӕрӕн раст куыд хъӕуы аразын, уый тыххӕй хъуыды."
-#: exercises/models/exercise.py:86 nutrition/models/ingredient.py:80
+#: exercises/models/exercise.py:81 nutrition/models/ingredient.py:80
#: nutrition/models/plan.py:61 nutrition/models/weight_unit.py:32
msgid "Language"
msgstr "Ӕвзаг"
-#: exercises/models/exercise.py:237 exercises/views/exercises.py:461
-msgid "Exercise was successfully added to the general database"
-msgstr ""
-
-#: exercises/models/exercise.py:265
-msgid "New user submitted exercise"
-msgstr ""
-
-#: exercises/models/exercise.py:267
-#, python-brace-format
-msgid "The user {0} submitted a new exercise \"{1}\"."
-msgstr ""
-
-#: exercises/models/exercise_alias.py:35
+#: exercises/models/exercise_alias.py:38
#, fuzzy
#| msgid "Add new exercise"
msgid "Alias for an exercise"
msgstr "Ног фӕлтӕрӕн бафтауын"
-#: exercises/models/image.py:59
+#: exercises/models/image.py:55
msgid "Line"
msgstr ""
-#: exercises/models/image.py:60
+#: exercises/models/image.py:56
msgid "3D"
msgstr ""
-#: exercises/models/image.py:61
+#: exercises/models/image.py:57
msgid "Low-poly"
msgstr ""
-#: exercises/models/image.py:62
+#: exercises/models/image.py:58
msgid "Photo"
msgstr ""
-#: exercises/models/image.py:63
+#: exercises/models/image.py:59
msgid "Other"
msgstr ""
-#: exercises/models/image.py:81 gallery/models/image.py:56
+#: exercises/models/image.py:77 gallery/models/image.py:56
msgid "Image"
msgstr ""
-#: exercises/models/image.py:82 gallery/models/image.py:57
+#: exercises/models/image.py:78 gallery/models/image.py:57
msgid "Only PNG and JPEG formats are supported"
msgstr ""
-#: exercises/models/image.py:88
+#: exercises/models/image.py:84
msgid "Main picture"
msgstr ""
-#: exercises/models/image.py:91
+#: exercises/models/image.py:87
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:100
+#: exercises/models/image.py:96
msgid "The art style of your image"
msgstr ""
-#: exercises/models/image.py:185
-msgid "New user submitted image"
-msgstr ""
-
-#: exercises/models/image.py:186
-#, python-brace-format
-msgid "The user {0} submitted a new image \"{1}\" for exercise {2}."
-msgstr ""
-
#: exercises/models/muscle.py:37
msgid "In latin, e.g. \"Pectoralis major\""
msgstr ""
@@ -1602,47 +1593,48 @@ msgstr "фӕлтӕрӕны ном"
msgid "A more basic name for the muscle"
msgstr ""
-#: exercises/models/video.py:41
-msgid "Maximum file size is 100MB."
+#: exercises/models/video.py:50
+#, python-format
+msgid "Maximum file size is %(size)sMB."
msgstr ""
-#: exercises/models/video.py:44 exercises/models/video.py:48
+#: exercises/models/video.py:57 exercises/models/video.py:65
msgid "File type is not supported"
msgstr ""
-#: exercises/models/video.py:57
+#: exercises/models/video.py:70
msgid "File is not a valid video"
msgstr ""
-#: exercises/models/video.py:88
+#: exercises/models/video.py:101
msgid "Main video"
msgstr ""
-#: exercises/models/video.py:94
+#: exercises/models/video.py:107
msgid "Video"
msgstr ""
-#: exercises/models/video.py:101
+#: exercises/models/video.py:114
msgid "Size"
msgstr ""
-#: exercises/models/video.py:108 manager/models/schedule_step.py:56
+#: exercises/models/video.py:121 manager/models/schedule_step.py:56
msgid "Duration"
msgstr ""
-#: exercises/models/video.py:117
+#: exercises/models/video.py:130
msgid "Width"
msgstr ""
-#: exercises/models/video.py:124
+#: exercises/models/video.py:137
msgid "Height"
msgstr ""
-#: exercises/models/video.py:131
+#: exercises/models/video.py:144
msgid "Codec"
msgstr ""
-#: exercises/models/video.py:139
+#: exercises/models/video.py:152
msgid "Codec, long name"
msgstr ""
@@ -1651,121 +1643,23 @@ msgid "Equipment list"
msgstr ""
#: exercises/templates/equipment/admin-overview.html:37
-#: exercises/views/equipment.py:94
+#: exercises/views/equipment.py:92
msgid "Add new equipment"
msgstr ""
-#: exercises/templates/equipment/overview.html:11
-msgid "Equipment overview"
-msgstr ""
-
-#: exercises/templates/equipment/overview.html:69
-#: exercises/templates/exercise/overview.html:74
-#: exercises/templates/exercise/view.html:264
-#: exercises/templates/muscles/overview.html:75
-msgid "Main muscles"
-msgstr ""
-
-#: exercises/templates/equipment/overview.html:79
-msgid ""
-"No exercises for this equipment. Add or edit an exercise and set the "
-"equipment."
-msgstr ""
-
-#: exercises/templates/equipment/overview.html:96
-#: exercises/templates/exercise/overview.html:99
-#: nutrition/templates/ingredient/overview.html:57
-msgid "Search"
-msgstr "Агурын"
-
-#: exercises/templates/equipment/overview.html:101
-#: exercises/templates/exercise/overview.html:104
-msgid "exercise name"
-msgstr "фӕлтӕрӕны ном"
-
-#: exercises/templates/equipment/overview.html:115
-#: exercises/templates/exercise/overview.html:118
-#: exercises/templates/muscles/overview.html:118
-#: nutrition/templates/ingredient/overview.html:85
-msgid "Only registered users can do this"
-msgstr ""
-
-#: exercises/templates/exercise/email_new.tpl:1
-#, python-format
-msgid ""
-"Your exercise '%(exercise)s' was successfully added to the general\n"
-"database."
-msgstr ""
-
-#: exercises/templates/exercise/email_new.tpl:4
-msgid ""
-"It is now available on the exercise and muscle overview and can be\n"
-"added to workouts. You can access it on this address:"
-msgstr ""
-
-#: exercises/templates/exercise/email_new.tpl:8
-#: nutrition/templates/ingredient/email_new.tpl:8
-msgid "Thank you for contributing and making this site better!"
-msgstr ""
-
-#: exercises/templates/exercise/email_new.tpl:9
-#: manager/templates/workout/email_reminder.tpl:15
-#: manager/templates/workout/email_weight_reminder.tpl:12
-#: nutrition/templates/ingredient/email_new.tpl:9
-#, python-format
-msgid "The %(site)s team"
-msgstr ""
-
-#: exercises/templates/exercise/form.html:4
-msgid "Submitting an exercise"
-msgstr ""
-
-#: exercises/templates/exercise/form.html:5
-msgid ""
-"Thank you for submitting an exercise. This is much\n"
-"appreciated!"
-msgstr ""
-
-#: exercises/templates/exercise/form.html:8
-msgid ""
-"After you submit the form, the administrators will be notified.\n"
-"Once it is reviewed, it will be added to the database. Till this happens,\n"
-"it will not be visible in the overview or the search. In case you added your "
-"email\n"
-"when you registered, you will get notified when the process is completed "
-"successfully."
-msgstr ""
-
-#: exercises/templates/exercise/form_correct.html:4
-msgid "Correcting an exercise"
-msgstr ""
-
-#: exercises/templates/exercise/form_correct.html:5
-msgid ""
-"Thank you for correcting and improving this exercise.\n"
-"This is much appreciated!"
-msgstr ""
-
-#: exercises/templates/exercise/form_correct.html:8
-msgid ""
-"After you submit the form, the administrators will be notified.\n"
-"Once the changes are reviewed the exercise will be updated."
-msgstr ""
-
-#: exercises/templates/exercise/overview.html:88
-msgid "No categories."
-msgstr "Нӕй ӕмбырд."
-
-#: exercises/templates/exercise/overview.html:88
-msgid "Use link to create one"
-msgstr "Спайда кӕн ӕрвитӕнӕй, цӕмӕй дзы саразай"
+#: exercises/templates/history/overview.html:11
+#, fuzzy
+#| msgid "Exercise Categories"
+msgid "Exercise admin history"
+msgstr "Фӕлтӕрӕнты ӕмбырд"
-#: exercises/templates/exercise/pending.html:14
-#: nutrition/templates/ingredient/pending.html:14
-msgid "Submission date"
-msgstr ""
+#: exercises/templates/history/overview.html:27
+#, fuzzy
+#| msgid "Options"
+msgid "Action"
+msgstr "Фадӕттӕ"
-#: exercises/templates/exercise/pending.html:16 gallery/models/image.py:51
+#: exercises/templates/history/overview.html:28 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/log.py:45
@@ -1776,99 +1670,39 @@ msgstr ""
msgid "User"
msgstr "Архайӕг"
-#: exercises/templates/exercise/view.html:48
-msgid "Exercise is pending review"
+#: exercises/templates/history/overview.html:29
+msgid "Object"
msgstr ""
-#: exercises/templates/exercise/view.html:51
-msgid ""
-"This user submitted exercise is pending a decision to be\n"
-" included in the database."
+#: exercises/templates/history/overview.html:31
+msgid "Changes"
msgstr ""
-#: exercises/templates/exercise/view.html:53
-msgid "Till then, it will not be shown in the overview or the search."
+#: exercises/templates/history/overview.html:32
+msgid "Revert"
msgstr ""
-#: exercises/templates/exercise/view.html:54
-#: nutrition/templates/ingredient/view.html:31
-msgid "Please select one of the options below."
+#: exercises/templates/history/overview.html:64
+msgid "View Object"
msgstr ""
-#: exercises/templates/exercise/view.html:60
-#: exercises/templates/exercise/view.html:203
-#: nutrition/templates/ingredient/view.html:38
-msgid "Accept"
+#: exercises/templates/history/overview.html:75
+msgid "View changes"
msgstr ""
-#: exercises/templates/exercise/view.html:64
-#: exercises/templates/exercise/view.html:204
-#: nutrition/templates/ingredient/view.html:42
-msgid "Decline"
-msgstr ""
-
-#: exercises/templates/exercise/view.html:96
-msgid "Images"
-msgstr ""
-
-#: exercises/templates/exercise/view.html:137 exercises/views/images.py:93
-msgid "Add new image"
-msgstr ""
-
-#: 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:218
-msgid "Comments for this exercise"
-msgstr "Ацы фӕлтӕрӕны тыххӕй хъуыдытӕ"
-
-#: exercises/templates/exercise/view.html:246
-msgid "Add new comment"
-msgstr "Ног хъуыды бафтауын"
-
-#: exercises/templates/exercise/view.html:260
-msgid "The diagram shows the most used muscles on this exercise"
-msgstr ""
-
-#: 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:306
-msgid "Exercise Variations"
-msgstr ""
-
-#: exercises/templates/exercise/view.html:327
-msgid "Submit a correction"
+#: exercises/templates/history/overview.html:86
+msgid "Revert changes"
msgstr ""
#: exercises/templates/muscles/admin-overview.html:4
-#: exercises/templates/muscles/overview.html:7
msgid "Muscle overview"
msgstr ""
#: exercises/templates/muscles/admin-overview.html:36
-#: exercises/views/muscles.py:86
+#: exercises/views/muscles.py:67
msgid "Add muscle"
msgstr "Мускул бафтауын"
-#: exercises/templates/muscles/overview.html:85
-msgid ""
-"No exercises for this muscle. Add or edit an exercise and set the muscle."
-msgstr ""
-
#: exercises/views/categories.py:71
msgid "Add category"
msgstr "Ӕмбырд бафтауын"
@@ -1881,50 +1715,19 @@ msgstr ""
msgid "Add exercise comment"
msgstr ""
-#: exercises/views/equipment.py:107 exercises/views/equipment.py:118
+#: exercises/views/equipment.py:105 exercises/views/equipment.py:116
msgid "Delete equipment?"
msgstr ""
-#: exercises/views/exercises.py:229
+#: exercises/views/exercises.py:161
#, python-format
-msgid ""
-"%(name_original)s is too similar to existing exercise \"%(exercise_name)s\""
-msgstr ""
-
-#: exercises/views/exercises.py:247
-msgid "Add exercise"
-msgstr ""
-
-#: exercises/views/exercises.py:367
-msgid "Thank you. Once the changes are reviewed the exercise will be updated."
-msgstr ""
-
-#: exercises/views/exercises.py:380
-#, python-brace-format
-msgid "Correct {0}"
+msgid "%(name)s is too similar to existing exercise \"%(exercise_name)s\""
msgstr ""
-#: exercises/views/exercises.py:422
+#: exercises/views/exercises.py:184
msgid "This will delete the exercise from all workouts."
msgstr ""
-#: exercises/views/exercises.py:474
-msgid "Exercise was successfully marked as rejected"
-msgstr ""
-
-#: exercises/views/images.py:68
-msgid "Edit exercise image"
-msgstr ""
-
-#: exercises/views/images.py:143
-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"
@@ -1993,7 +1796,7 @@ msgid "Contract type"
msgstr ""
#: gym/models/contract.py:208 gym/templates/contract/view.html:59
-#: manager/templates/log/add.html:52 nutrition/forms.py:59
+#: manager/templates/log/add.html:52 nutrition/forms.py:60
#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:102
#: nutrition/models/meal_item.py:72
msgid "Amount"
@@ -2094,6 +1897,10 @@ msgstr ""
msgid "User notes"
msgstr ""
+#: gym/templates/contract/list.html:36
+msgid "Show"
+msgstr ""
+
#: gym/templates/contract/view.html:4
msgid "Contract"
msgstr ""
@@ -2172,10 +1979,6 @@ msgstr ""
msgid "Add member"
msgstr ""
-#: gym/templates/gym/new_user.html:38
-msgid "Date of Birth"
-msgstr ""
-
#: gym/templates/gym/new_user.html:48 manager/templates/calendar/month.html:144
#: manager/templates/log/add.html:75 nutrition/templates/rate/form.html:120
msgid "Info"
@@ -2232,125 +2035,125 @@ msgstr ""
msgid "Edit gym"
msgstr ""
-#: i18n.tpl:2 i18n.tpl:28
-msgid "Abs"
+#: i18n.tpl:2
+msgid "Until Failure"
msgstr ""
-#: i18n.tpl:3
-msgid "Arms"
+#: i18n.tpl:3 manager/forms.py:180 manager/models/log.py:73
+#: manager/templates/set/add.html:53
+msgid "Repetitions"
msgstr ""
#: i18n.tpl:4
-msgid "Back"
-msgstr "Фӕсонтӕ"
+msgid "Abs"
+msgstr ""
-#: i18n.tpl:5 i18n.tpl:23
-msgid "Calves"
+#: i18n.tpl:5
+msgid "Arms"
msgstr ""
-#: i18n.tpl:6 i18n.tpl:26
-msgid "Chest"
+#: i18n.tpl:6
+msgid "Legs"
msgstr ""
#: i18n.tpl:7
-msgid "Legs"
+msgid "Dumbbell"
msgstr ""
-#: i18n.tpl:8 i18n.tpl:19
-msgid "Shoulders"
+#: i18n.tpl:8
+msgid "Biceps"
msgstr ""
#: i18n.tpl:9
-msgid "Barbell"
+msgid "SZ-Bar"
msgstr ""
#: i18n.tpl:10
-msgid "Bench"
+msgid "Kettlebell"
msgstr ""
#: i18n.tpl:11
-msgid "Dumbbell"
+msgid "Swiss Ball"
msgstr ""
#: i18n.tpl:12
-msgid "Gym mat"
+msgid "none (bodyweight exercise)"
msgstr ""
#: i18n.tpl:13
-msgid "Incline bench"
+msgid "Calves"
msgstr ""
#: i18n.tpl:14
-msgid "Kettlebell"
-msgstr ""
+msgid "Back"
+msgstr "Фӕсонтӕ"
#: i18n.tpl:15
-msgid "Pull-up bar"
+msgid "Lower back"
msgstr ""
#: i18n.tpl:16
-msgid "SZ-Bar"
+msgid "Lats"
msgstr ""
#: i18n.tpl:17
-msgid "Swiss Ball"
+msgid "Hamstrings"
msgstr ""
#: i18n.tpl:18
-msgid "none (bodyweight exercise)"
+msgid "Bench"
+msgstr ""
+
+#: i18n.tpl:19
+msgid "Glutes"
msgstr ""
#: i18n.tpl:20
-msgid "Biceps"
+msgid "Kilometers"
msgstr ""
#: i18n.tpl:21
-msgid "Hamstrings"
+msgid "Shoulders"
msgstr ""
#: i18n.tpl:22
-msgid "Lower back"
+msgid "Seconds"
msgstr ""
-#: i18n.tpl:24
-msgid "Glutes"
+#: i18n.tpl:23
+msgid "Miles"
msgstr ""
-#: i18n.tpl:25
-msgid "Lats"
+#: i18n.tpl:24
+msgid "Incline bench"
msgstr ""
-#: i18n.tpl:27
+#: i18n.tpl:25
msgid "Quads"
msgstr ""
-#: i18n.tpl:29
-msgid "Triceps"
-msgstr ""
-
-#: i18n.tpl:30
-msgid "Kilometers"
+#: i18n.tpl:26
+msgid "Minutes"
msgstr ""
-#: i18n.tpl:31
-msgid "Miles"
+#: i18n.tpl:27
+msgid "Chest"
msgstr ""
-#: i18n.tpl:32
-msgid "Minutes"
+#: i18n.tpl:28
+msgid "Gym mat"
msgstr ""
-#: i18n.tpl:33 manager/forms.py:169 manager/models/log.py:71
-#: manager/templates/set/add.html:53
-msgid "Repetitions"
+#: i18n.tpl:29
+msgid "Pull-up bar"
msgstr ""
-#: i18n.tpl:34
-msgid "Seconds"
+#: i18n.tpl:30
+msgid "Barbell"
msgstr ""
-#: i18n.tpl:35
-msgid "Until Failure"
+#: i18n.tpl:31
+msgid "Triceps"
msgstr ""
#: mailer/forms.py:34 mailer/templates/mailer/gym/preview.html:32
@@ -2404,44 +2207,44 @@ msgstr ""
msgid "Correction"
msgstr ""
-#: manager/forms.py:89 manager/models/workout.py:59
+#: manager/forms.py:92 manager/models/workout.py:59
msgid "The name of the workout"
msgstr ""
-#: manager/forms.py:93 manager/models/workout.py:66
+#: manager/forms.py:96 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
+#: manager/forms.py:137
msgid ""
"You can search for more than one exercise, they will be grouped together for "
"a superset."
msgstr ""
-#: 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
+#: manager/forms.py:166 manager/forms.py:171 manager/models/log.py:64
+#: manager/models/log.py:92 manager/models/setting.py:59
+#: manager/models/setting.py:90 manager/templates/log/add.html:53
+#: manager/templates/log/add.html:55 manager/templates/set/formset.html:10
+#: manager/templates/set/formset.html:12 measurements/models/category.py:58
+#: nutrition/forms.py:64
msgid "Unit"
msgstr ""
-#: manager/forms.py:266
+#: manager/forms.py:277
msgid "Type"
msgstr ""
-#: manager/forms.py:267 manager/templates/workout/view.html:157
+#: manager/forms.py:278 manager/templates/workout/view.html:157
msgid "Table"
msgstr ""
-#: manager/forms.py:269 manager/templates/workout/view.html:163
+#: manager/forms.py:280 manager/templates/workout/view.html:163
msgid "with images"
msgstr ""
-#: manager/forms.py:270 manager/templates/workout/view.html:169
+#: manager/forms.py:281 manager/templates/workout/view.html:169
msgid "with comments"
msgstr ""
@@ -2493,7 +2296,7 @@ msgid "The duration in weeks"
msgstr ""
#: manager/models/schedule_step.py:63 manager/models/set.py:52
-#: manager/models/setting.py:98 nutrition/models/meal.py:54
+#: manager/models/setting.py:110 nutrition/models/meal.py:54
#: nutrition/models/meal_item.py:65
msgid "Order"
msgstr ""
@@ -2544,7 +2347,7 @@ msgstr ""
msgid "Number of sets"
msgstr ""
-#: manager/models/setting.py:43
+#: manager/models/setting.py:48
msgid "Sets"
msgstr ""
@@ -2799,6 +2602,13 @@ msgid ""
"option in your settings."
msgstr ""
+#: manager/templates/workout/email_reminder.tpl:15
+#: manager/templates/workout/email_weight_reminder.tpl:12
+#: nutrition/templates/ingredient/email_new.tpl:9
+#, python-format
+msgid "The %(site)s team"
+msgstr ""
+
#: manager/templates/workout/email_weight_reminder.tpl:3
#, python-format
msgid ""
@@ -2811,6 +2621,10 @@ msgid ""
"You will regularly receive such reminders till you enter your current weight."
msgstr ""
+#: manager/templates/workout/log.html:10 manager/templates/workout/log.html:11
+msgid "Weight log"
+msgstr ""
+
#: manager/templates/workout/log.html:29
msgid "Weight log for workout"
msgstr ""
@@ -2907,7 +2721,7 @@ msgstr ""
msgid "Edit workout"
msgstr ""
-#: manager/templates/workout/view.html:225 manager/views/workout.py:300
+#: manager/templates/workout/view.html:225 manager/views/workout.py:301
msgid "Mark as template"
msgstr ""
@@ -2915,11 +2729,6 @@ msgstr ""
msgid "Add workout day"
msgstr ""
-#: manager/views/log.py:92
-#, python-format
-msgid "Edit log entry for %s"
-msgstr ""
-
#: manager/views/log.py:111
msgid "Delete workout log"
msgstr ""
@@ -2937,11 +2746,11 @@ msgstr ""
msgid "Your workouts"
msgstr ""
-#: manager/views/workout.py:227
+#: manager/views/workout.py:228
msgid "Copy workout"
msgstr ""
-#: manager/views/workout.py:230
+#: manager/views/workout.py:231
msgid "Copy"
msgstr ""
@@ -2963,29 +2772,29 @@ msgstr ""
msgid "Value"
msgstr ""
-#: nutrition/forms.py:122
+#: nutrition/forms.py:123
msgid "Calculate"
msgstr ""
-#: nutrition/forms.py:195 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:196 nutrition/templates/rate/form.html:76
msgid "Basic caloric intake"
msgstr ""
-#: nutrition/forms.py:196
+#: nutrition/forms.py:197
msgid "Your basic caloric intake as calculated for your data"
msgstr ""
-#: nutrition/forms.py:202
+#: nutrition/forms.py:203
msgid "Additional calories"
msgstr ""
-#: nutrition/forms.py:204
+#: nutrition/forms.py:205
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
msgstr ""
-#: nutrition/forms.py:232 nutrition/models/ingredient_weight_unit.py:39
+#: nutrition/forms.py:233 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"
@@ -3048,7 +2857,7 @@ msgid ""
"{energy_approx}%)"
msgstr ""
-#: nutrition/models/ingredient.py:357 nutrition/views/ingredient.py:225
+#: nutrition/models/ingredient.py:357 nutrition/views/ingredient.py:219
msgid "Ingredient was successfully added to the general database"
msgstr ""
@@ -3077,6 +2886,10 @@ msgstr ""
msgid "Meal"
msgstr ""
+#: nutrition/models/log.py:65
+msgid "Date and Time (Approx.)"
+msgstr ""
+
#: nutrition/models/meal.py:61
msgid "Time (approx)"
msgstr ""
@@ -3168,6 +2981,10 @@ msgid ""
"added to nutrition plans. You can access it on this address:"
msgstr ""
+#: nutrition/templates/ingredient/email_new.tpl:8
+msgid "Thank you for contributing and making this site better!"
+msgstr ""
+
#: nutrition/templates/ingredient/form.html:4
msgid "Submitting an ingredient"
msgstr ""
@@ -3192,6 +3009,10 @@ msgstr ""
msgid "No ingredients."
msgstr ""
+#: nutrition/templates/ingredient/overview.html:57
+msgid "Search"
+msgstr "Агурын"
+
#: nutrition/templates/ingredient/overview.html:66
msgid "ingredient name"
msgstr ""
@@ -3201,6 +3022,14 @@ msgstr ""
msgid "Add ingredient"
msgstr ""
+#: nutrition/templates/ingredient/overview.html:85
+msgid "Only registered users can do this"
+msgstr ""
+
+#: nutrition/templates/ingredient/pending.html:14
+msgid "Submission date"
+msgstr ""
+
#: nutrition/templates/ingredient/view.html:27
msgid "Ingredient is pending review"
msgstr ""
@@ -3213,6 +3042,18 @@ msgid ""
"the search."
msgstr ""
+#: nutrition/templates/ingredient/view.html:31
+msgid "Please select one of the options below."
+msgstr ""
+
+#: nutrition/templates/ingredient/view.html:38
+msgid "Accept"
+msgstr ""
+
+#: nutrition/templates/ingredient/view.html:42
+msgid "Decline"
+msgstr ""
+
#: nutrition/templates/ingredient/view.html:71
#: nutrition/templates/log/detail.html:31
#: nutrition/templates/plan/view.html:229 nutrition/views/plan.py:376
@@ -3453,14 +3294,18 @@ msgid ""
"yourself for some weeks and change the total amount if needed."
msgstr ""
-#: nutrition/views/ingredient.py:181
+#: nutrition/views/ingredient.py:175
msgid "Add a new ingredient"
msgstr ""
-#: nutrition/views/ingredient.py:238
+#: nutrition/views/ingredient.py:232
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 ""
@@ -3675,29 +3520,29 @@ msgstr ""
msgid "100%% Free <br>and <br>Open Source"
msgstr ""
-#: utils/generic_views.py:261
+#: utils/generic_views.py:262
msgid "Yes, delete"
msgstr ""
-#: utils/models.py:47
+#: utils/models.py:48
msgid "Author"
msgstr ""
-#: utils/models.py:52
+#: utils/models.py:53
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:77
+#: utils/models.py:78
msgid "Pending"
msgstr "Лӕууы"
-#: utils/models.py:78
+#: utils/models.py:79
msgid "Accepted"
msgstr "Бӕлвырд"
-#: utils/models.py:79
+#: utils/models.py:80
msgid "Declined"
msgstr "Ӕздӕхт"
@@ -3838,5 +3683,28 @@ msgstr ""
msgid "Delete weight entry for the %s"
msgstr ""
+#~ msgid "Add new exercise"
+#~ msgstr "Ног фӕлтӕрӕн бафтауын"
+
+#~ msgid "exercise name"
+#~ msgstr "фӕлтӕрӕны ном"
+
+#~ msgid "No categories."
+#~ msgstr "Нӕй ӕмбырд."
+
+#~ msgid "Use link to create one"
+#~ msgstr "Спайда кӕн ӕрвитӕнӕй, цӕмӕй дзы саразай"
+
+#, fuzzy
+#~| msgid "Add new exercise"
+#~ msgid "Add new video"
+#~ msgstr "Ног фӕлтӕрӕн бафтауын"
+
+#~ msgid "Comments for this exercise"
+#~ msgstr "Ацы фӕлтӕрӕны тыххӕй хъуыдытӕ"
+
+#~ msgid "Add new comment"
+#~ msgstr "Ног хъуыды бафтауын"
+
#~ msgid "Twitter"
#~ msgstr "Twitter"
diff --git a/wger/locale/pl/LC_MESSAGES/django.po b/wger/locale/pl/LC_MESSAGES/django.po
index 7f38e5810..c68f3404f 100644
--- a/wger/locale/pl/LC_MESSAGES/django.po
+++ b/wger/locale/pl/LC_MESSAGES/django.po
@@ -13,7 +13,7 @@ msgid ""
msgstr ""
"Project-Id-Version: wger Workout Manager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-14 12:01+0200\n"
+"POT-Creation-Date: 2022-11-10 16:03+0100\n"
"PO-Revision-Date: 2022-08-24 21:17+0000\n"
"Last-Translator: Dawid Panyło <[email protected]>\n"
"Language-Team: Polish <https://hosted.weblate.org/projects/wger/web/pl/>\n"
@@ -21,9 +21,9 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n"
-"%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n"
-"%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && "
+"(n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && "
+"n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
"X-Generator: Weblate 4.14-dev\n"
#: config/models/gym_config.py:46 gym/templates/gym/list.html:50
@@ -39,107 +39,8 @@ msgstr ""
"przypisywani wszyscy nowi użytkownicy oraz obecni użytkownicy bez określonej "
"siłowni."
-#: 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 "Ćwiczenia"
-
-#: config/models/language_config.py:42
-msgid "Ingredients"
-msgstr "Składniki"
-
-#: config/templates/language/overview.html:4 core/templates/navigation.html:226
-msgid "Languages"
-msgstr "Języki"
-
-#: config/templates/language/overview.html:16
-msgid "Nothing found."
-msgstr "Nie znaleziono."
-
-#: 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:150
-#: nutrition/templates/plan/view.html:153
-#: nutrition/templates/plan/view.html:191
-msgid "Add one now."
-msgstr "Dodaj jeden teraz."
-
-#: config/templates/language/overview.html:29
-#: core/templates/license/list.html:38 core/templates/misc/license/list.html:41
-#: core/templates/repetition_unit/list.html:41
-#: core/templates/user/overview.html:327 core/templates/user/overview.html:366
-#: core/templates/user/overview.html:402
-#: core/templates/weight_unit/list.html:41 core/views/languages.py:73
-#: core/views/license.py:65 core/views/repetition_units.py:65
-#: core/views/weight_units.py:65
-#: exercises/templates/categories/admin-overview.html:36
-#: 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:61
-msgid "Add"
-msgstr "Dodaj"
-
-#: config/templates/language/view.html:21 core/models/language.py:29
-msgid "Language short name"
-msgstr "Skrócona nazwa języka"
-
-#: config/templates/language/view.html:22
-#: config/templates/language/view.html:43 core/models/language.py:32
-msgid "Language full name"
-msgstr "Pełna nazwa języka"
-
-#: config/templates/language/view.html:34 core/templates/user/overview.html:451
-#: gym/views/admin_config.py:44 gym/views/admin_config.py:58
-#: gym/views/user_config.py:46
-msgid "Configuration"
-msgstr "Konfiguracja"
-
-#: config/templates/language/view.html:35
-msgid ""
-"Use the configuration to select in what languages the\n"
-"exercises and ingredients will be shown for the current language (for "
-"example\n"
-"the exercises should be shown in languages A, B and C; the ingredients only\n"
-"in A)."
-msgstr ""
-"Skonfiguruj by wybrać języki,\n"
-"w których zostaną wyświetlone ćwiczenia i składniki dla obecnie wybranego "
-"języka (przykładowo,\n"
-"ćwiczenia powinny być wyświetlane w językach A, B i C; składniki zaś tylko\n"
-"w A)."
-
-#: config/templates/language/view.html:44 gym/templates/contract/list.html:36
-msgid "Show"
-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: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:45
-msgid "Options"
-msgstr "Opcje"
-
-#: config/templates/language/view.html:96 config/views/gym_config.py:41
-#: config/views/language_config.py:49 core/templates/license/list.html:16
-#: core/templates/misc/license/list.html:17
+#: config/views/gym_config.py:41 core/templates/language/view.html:57
+#: 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:39
#: core/templates/tags/render_day.html:75 core/templates/user/overview.html:205
@@ -147,12 +48,10 @@ 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:230
-#: exercises/templates/exercise/view.html:351
#: exercises/templates/muscles/admin-overview.html:16
-#: 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
+#: 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
#: 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,81 +67,54 @@ msgstr "Opcje"
msgid "Edit"
msgstr "Edytuj"
-#: 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: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: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
-#: gym/templates/contract_type/list.html:39 gym/templates/document/list.html:46
-#: gym/templates/gym/list.html:20 manager/templates/calendar/day.html:69
-#: 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:231
-#: 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:132
-#: nutrition/templates/units/list.html:20
-msgid "Delete"
-msgstr "Usuń"
-
-#: core/demo.py:86
+#: core/demo.py:95
msgid "Sample workout"
msgstr "Przykładowy trening"
-#: core/demo.py:90
+#: core/demo.py:99
msgid "Sample day"
msgstr "Przykładowy dzień"
-#: core/demo.py:94
+#: core/demo.py:103
msgid "Another sample day"
msgstr "Jeszcze jeden przykładowy dzień"
-#: core/demo.py:217
-msgid "Sample nutrional plan"
+#: core/demo.py:211
+#, fuzzy
+#| msgid "Sample nutrional plan"
+msgid "Sample nutritional plan"
msgstr "Przykładowy plan odżywiania"
-#: core/demo.py:349 core/demo.py:351 core/demo.py:353
+#: core/demo.py:343 core/demo.py:345 core/demo.py:347
#, python-brace-format
msgid "Placeholder workout nr {0} for schedule"
msgstr "Zapychacz treningu nr {0} w harmonogramie"
-#: core/demo.py:358
+#: core/demo.py:352
msgid "My cool workout schedule"
msgstr "Mój fajny harmonogram treningu"
-#: core/demo.py:397 core/demo.py:412
+#: core/demo.py:391 core/demo.py:406
msgid "Empty placeholder schedule"
msgstr "Pusty zapychacz harmonogramu"
-#: core/forms.py:61 core/templates/navigation.html:188
-#: core/templates/navigation.html:192 core/templates/user/login.html:4
+#: core/forms.py:64 core/templates/navigation.html:179
+#: core/templates/navigation.html:183 core/templates/user/login.html:4
#: software/templates/features.html:43
msgid "Login"
msgstr "Zaloguj"
-#: core/forms.py:73 core/forms.py:164 gym/views/export.py:63
+#: core/forms.py:76 core/forms.py:177 gym/views/export.py:63
#: gym/views/gym.py:218
msgid "First name"
msgstr "Imię"
-#: core/forms.py:74 core/forms.py:165 core/templates/user/overview.html:267
+#: core/forms.py:77 core/forms.py:178 core/templates/user/overview.html:267
#: gym/views/export.py:64 gym/views/gym.py:218
msgid "Last name"
msgstr "Nazwisko"
-#: core/forms.py:76 core/forms.py:131 core/templates/user/overview.html:271
+#: core/forms.py:79 core/forms.py:144 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
@@ -252,75 +124,105 @@ msgstr "Nazwisko"
msgid "Email"
msgstr "Email"
-#: core/forms.py:77
+#: core/forms.py:80
msgid "Used for password resets and, optionally, e-mail reminders."
msgstr "Używany do resetowania hasła i przypomnień e-mail."
-#: core/forms.py:102
+#: core/forms.py:84 core/models/profile.py:220
+#: gym/templates/gym/new_user.html:38
+msgid "Date of Birth"
+msgstr "Data urodzenia"
+
+#: core/forms.py:116
msgid "Personal data"
msgstr "Dane personalne"
-#: core/forms.py:110
+#: core/forms.py:124
msgid "Workout reminders"
msgstr "Przypomnienia treningowe"
-#: core/forms.py:117
+#: core/forms.py:131
msgid "Other settings"
msgstr "Inne ustawienia"
-#: 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
+#: core/forms.py:138 core/views/user.py:615 core/views/user.py:630
+#: core/views/user.py:642 gym/forms.py:72 manager/templates/log/add.html:65
+#: manager/templates/set/add.html:69 manager/views/workout.py:222
+#: utils/generic_views.py:143
msgid "Save"
msgstr "Zapisz"
-#: core/forms.py:132
+#: core/forms.py:145
msgid "Used for password resets and, optionally, email reminders."
msgstr "Używany do resetowania hasła i przypomnień."
-#: core/forms.py:160
+#: core/forms.py:173
msgid "This e-mail address is already in use."
msgstr "Ten adres e-mail jest już zajęty."
-#: core/forms.py:180 gym/templates/gym/new_user.html:26
+#: core/forms.py:193 gym/templates/gym/new_user.html:26
#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:218
msgid "Password"
msgstr "Hasło"
-#: core/forms.py:182
+#: core/forms.py:195
msgid "Please enter your current password."
msgstr "Wprowadź swoje aktualne hasło."
-#: core/forms.py:200
+#: core/forms.py:204 core/templates/language/view.html:62
+#: 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: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/muscles/admin-overview.html:17
+#: gym/templates/admin_notes/list.html:40
+#: gym/templates/contract_option/list.html:39
+#: gym/templates/contract_type/list.html:39 gym/templates/document/list.html:46
+#: gym/templates/gym/list.html:20 manager/templates/calendar/day.html:69
+#: 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:231
+#: 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:132
+#: nutrition/templates/units/list.html:20
+msgid "Delete"
+msgstr "Usuń"
+
+#: core/forms.py:213
msgid "Invalid password"
msgstr "Hasło nieprawidłowe"
-#: core/forms.py:212 core/forms.py:278
+#: core/forms.py:225 core/forms.py:291
msgid "The form is secured with reCAPTCHA"
msgstr "Formularz jest chroniony przez reCaptcha"
-#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:188
-#: core/templates/navigation.html:193 core/templates/template.html:149
-#: core/templates/user/login.html:20 core/views/user.py:293
+#: core/forms.py:239 core/forms.py:258 core/templates/navigation.html:179
+#: core/templates/navigation.html:184 core/templates/template.html:149
+#: core/templates/user/login.html:20 core/views/user.py:300
#: software/templates/features.html:38
msgid "Register"
msgstr "Zarejestruj"
-#: core/forms.py:256
+#: core/forms.py:269
msgid "Contact"
msgstr "Kontakt"
-#: core/forms.py:257
+#: core/forms.py:270
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:71
+#: core/forms.py:278 exercises/models/comment.py:42 manager/models/set.py:60
+#: manager/models/setting.py:111 nutrition/models/log.py:71
msgid "Comment"
msgstr "Komentarz"
-#: core/forms.py:266
+#: core/forms.py:279
msgid "What do you want to say?"
msgstr "Co chcesz powiedzieć?"
@@ -328,6 +230,14 @@ msgstr "Co chcesz powiedzieć?"
msgid "Day of the week"
msgstr "Dzień tygodnia"
+#: core/models/language.py:31 core/templates/language/view.html:21
+msgid "Language short name"
+msgstr "Skrócona nazwa języka"
+
+#: core/models/language.py:36 core/templates/language/view.html:22
+msgid "Language full name"
+msgstr "Pełna nazwa języka"
+
#: core/models/license.py:29
msgid "Full name"
msgstr "Pełna nazwa"
@@ -385,19 +295,19 @@ msgstr "Metryczny (kilogramy)"
msgid "Imperial (pound)"
msgstr "Imperialny (funty)"
-#: core/models/profile.py:111
+#: core/models/profile.py:114
msgid "Show exercise comments"
msgstr "Pokaż komentarze ćwiczenia"
-#: core/models/profile.py:112
+#: core/models/profile.py:115
msgid "Check to show exercise comments on the workout view"
msgstr "Zaznacz, by pokazać komentarze do ćwiczeń na podglądzie treningu"
-#: core/models/profile.py:123
+#: core/models/profile.py:126
msgid "Also use ingredients in English"
msgstr "Używaj także nazw składników po angielsku"
-#: core/models/profile.py:125
+#: core/models/profile.py:128
msgid ""
"Check to also show ingredients in English while creating\n"
"a nutritional plan. These ingredients are extracted from a list provided\n"
@@ -411,11 +321,11 @@ msgstr ""
"z około\n"
"7000 wpisów, ale może być nieco przytłaczająca i utrudniać wyszukiwanie."
-#: core/models/profile.py:134
+#: core/models/profile.py:137
msgid "Activate workout reminders"
msgstr "Aktywuj powiadomienia treningowe"
-#: core/models/profile.py:136
+#: core/models/profile.py:139
msgid ""
"Check to activate automatic reminders for workouts. You need to provide a "
"valid email for this to work."
@@ -423,19 +333,19 @@ msgstr ""
"Zaznacz, by aktywować automatyczne powiadomienia dla treningów. Aby wszystko "
"działało poprawnie, musisz podać poprawny adres email."
-#: core/models/profile.py:145
+#: core/models/profile.py:148
msgid "Remind before expiration"
msgstr "Przypomnij przed wygaśnięciem"
-#: core/models/profile.py:146
+#: core/models/profile.py:149
msgid "The number of days you want to be reminded before a workout expires."
msgstr "Ile dni przed wygaśnięciem treningu chcesz być o tym powiadomiony."
-#: core/models/profile.py:152
+#: core/models/profile.py:155
msgid "Default duration of workouts"
msgstr "Domyślna długość treningu"
-#: core/models/profile.py:154
+#: core/models/profile.py:157
msgid ""
"Default duration in weeks of workouts not in a schedule. Used for email "
"workout reminders."
@@ -443,11 +353,11 @@ msgstr ""
"Domyślna długość treningu (w tygodniach) niewpisanych do harmonogramu. "
"Używane dla powiadomień e-mailowych."
-#: core/models/profile.py:171
+#: core/models/profile.py:174
msgid "Notification language"
msgstr "Język powiadomień"
-#: core/models/profile.py:173
+#: core/models/profile.py:176
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."
@@ -455,70 +365,70 @@ msgstr ""
"Język używany w e-mailach, np. powiadomieniach o treningach. Ustawienie nie "
"wpływa na język strony."
-#: core/models/profile.py:186 gym/views/export.py:66
+#: core/models/profile.py:212 gym/views/export.py:66
msgid "Age"
msgstr "Wiek"
-#: core/models/profile.py:202 nutrition/forms.py:99
+#: core/models/profile.py:228 nutrition/forms.py:100
msgid "Height (cm)"
msgstr "Wzrost (cm)"
-#: core/models/profile.py:219
+#: core/models/profile.py:245
msgid "Hours of sleep"
msgstr "Godzin snu"
-#: core/models/profile.py:220
+#: core/models/profile.py:246
msgid "The average hours of sleep per day"
msgstr "Średnia długość snu w ciągu dnia"
-#: core/models/profile.py:229
+#: core/models/profile.py:255
msgid "Work"
msgstr "Praca"
-#: core/models/profile.py:230 core/models/profile.py:272
+#: core/models/profile.py:256 core/models/profile.py:298
msgid "Average hours per day"
msgstr "Średnia ilość godzin w ciągu dnia"
-#: core/models/profile.py:239 core/models/profile.py:260
-#: core/models/profile.py:281
+#: core/models/profile.py:265 core/models/profile.py:286
+#: core/models/profile.py:307
msgid "Physical intensity"
msgstr "Natężenie fizyczne"
-#: core/models/profile.py:240 core/models/profile.py:261
-#: core/models/profile.py:282
+#: core/models/profile.py:266 core/models/profile.py:287
+#: core/models/profile.py:308
msgid "Approximately"
msgstr "W przybliżeniu"
-#: core/models/profile.py:250
+#: core/models/profile.py:276
msgid "Sport"
msgstr "Sport"
-#: core/models/profile.py:251
+#: core/models/profile.py:277
msgid "Average hours per week"
msgstr "Średnia liczba godzin na tydzień"
-#: core/models/profile.py:271
+#: core/models/profile.py:297
msgid "Free time"
msgstr "Czas wolny"
-#: core/models/profile.py:292 nutrition/templates/rate/form.html:66
+#: core/models/profile.py:318 nutrition/templates/rate/form.html:66
msgid "Total daily calories"
msgstr "Dzienna całkowita liczba kalorii"
-#: core/models/profile.py:293
+#: core/models/profile.py:319
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
+#: core/models/profile.py:331 nutrition/models/ingredient_weight_unit.py:45
#: nutrition/models/log.py:90 nutrition/models/meal_item.py:58
msgid "Weight unit"
msgstr "Jednostka wagi"
-#: core/models/profile.py:313
+#: core/models/profile.py:339
msgid "Allow external access"
msgstr "Pozwól na dostęp zewnętrzny"
-#: core/models/profile.py:315
+#: core/models/profile.py:341
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."
@@ -527,23 +437,22 @@ msgstr ""
"zewnętrznym. Musisz to włączyć zanim będziesz mógł dzielić się linkami np. "
"na mediach społecznościowych."
-#: core/models/profile.py:324
+#: core/models/profile.py:350
msgid "Automatic reminders for weight entries"
msgstr "Przypominanie o uzupełnieniu aktualnej wagi"
-#: core/models/profile.py:326
+#: core/models/profile.py:352
msgid "Number of days after the last weight entry (enter 0 to deactivate)"
msgstr "Liczba dni od ostatniego wpisu wagi (wpisz 0 by deaktywować)"
-#: core/models/profile.py:392
+#: core/models/profile.py:418
msgid "The sum of all hours has to be 24"
msgstr "Godziny muszą sumować się do wartości 24"
#: core/models/rep_unit.py:35 core/models/weight_unit.py:35
-#: core/templates/user/overview.html:263 core/views/user.py:575
+#: core/templates/user/overview.html:263 core/views/user.py:591
#: 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
+#: exercises/models/exercise.py:64 exercises/models/muscle.py:36
#: 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
@@ -606,6 +515,53 @@ msgstr "Udostępnij"
msgid "Are you sure you want to delete this? This action cannot be undone."
msgstr "Czy na pewno chcesz to usunąć? Tej czynności nie będzie można cofnąć."
+#: core/templates/email_verification/confirm_template.html:4
+msgid "Email verified"
+msgstr ""
+
+#: core/templates/email_verification/confirm_template.html:18
+#, python-format
+msgid "%(username)s, your email was verified"
+msgstr ""
+
+#: core/templates/email_verification/confirm_template.html:22
+msgid "Error, invalid verification token"
+msgstr ""
+
+#: core/templates/email_verification/email_body_html.tpl:6
+#, fuzzy
+#| msgid "Configuration"
+msgid "Email Confirmation"
+msgstr "Konfiguracja"
+
+#: core/templates/email_verification/email_body_html.tpl:9
+#: core/templates/email_verification/email_body_txt.tpl:3
+#, fuzzy, python-format
+#| msgid "Calendar for %(username)s"
+msgid "You are almost there, %(username)s!"
+msgstr "Kalendarz dla %(username)s"
+
+#: core/templates/email_verification/email_body_html.tpl:11
+#, python-format
+msgid "Please click <a href=\"%(link)s\">here</a> to confirm your email"
+msgstr ""
+
+#: core/templates/email_verification/email_body_html.tpl:12
+#: core/templates/email_verification/email_body_txt.tpl:5
+#, python-format
+msgid "The token expires on %(time)s"
+msgstr ""
+
+#: core/templates/email_verification/email_body_html.tpl:14
+#: core/templates/email_verification/email_body_txt.tpl:8
+msgid "the wger Team"
+msgstr ""
+
+#: core/templates/email_verification/email_body_txt.tpl:4
+#, python-format
+msgid "Please click the following link to confirm your email: %(link)s"
+msgstr ""
+
#: core/templates/index.html:4
msgid "Dashboard"
msgstr "Pulpit"
@@ -666,7 +622,7 @@ msgid "Add custom diary entry"
msgstr "Dodaj niestandardowy wpis"
#: core/templates/index.html:84 core/templates/index.html:92
-#: manager/models/day.py:34 manager/models/log.py:56
+#: manager/models/day.py:34 manager/models/log.py:58
#: manager/models/session.py:60 manager/models/workout.py:109
#: manager/templates/schedule/view.html:105
#: manager/templates/workout/view.html:11
@@ -699,6 +655,20 @@ msgstr "Dodaj nowy log"
msgid "No workouts found."
msgstr "Nie znaleziono treningu."
+#: core/templates/index.html:137 core/templates/index.html:189
+#: core/templates/language/overview.html:23
+#: 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:150
+#: nutrition/templates/plan/view.html:153
+#: nutrition/templates/plan/view.html:191
+msgid "Add one now."
+msgstr "Dodaj jeden teraz."
+
#: 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
@@ -752,19 +722,59 @@ msgid "No nutrition plans."
msgstr "Brak planów żywienia."
#: 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
+#: core/templates/user/overview.html:121 manager/forms.py:184
+#: manager/helpers.py:89 manager/models/log.py:86 manager/models/setting.py:79
+#: manager/templates/log/add.html:54 manager/templates/set/formset.html:11
#: weight/models.py:34 weight/templates/import_csv_preview.html:14
#: weight/templates/import_csv_preview.html:43 weight/views.py:150
msgid "Weight"
msgstr "Ciężar"
-#: core/templates/index.html:210 core/templates/navigation.html:135
+#: core/templates/index.html:210 core/templates/navigation.html:126
#: weight/views.py:70
msgid "Add weight entry"
msgstr "Dodaj aktualną wagę"
+#: core/templates/language/overview.html:4 core/templates/navigation.html:217
+msgid "Languages"
+msgstr "Języki"
+
+#: core/templates/language/overview.html:23
+msgid "Nothing found."
+msgstr "Nie znaleziono."
+
+#: core/templates/language/overview.html:36 core/templates/license/list.html:38
+#: core/templates/misc/license/list.html:41
+#: core/templates/repetition_unit/list.html:41
+#: core/templates/user/overview.html:327 core/templates/user/overview.html:366
+#: core/templates/user/overview.html:402
+#: core/templates/weight_unit/list.html:41 core/views/languages.py:73
+#: core/views/license.py:65 core/views/repetition_units.py:65
+#: core/views/weight_units.py:65
+#: exercises/templates/categories/admin-overview.html:36
+#: 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:61
+msgid "Add"
+msgstr "Dodaj"
+
+#: core/templates/language/view.html:52 core/templates/user/api_key.html:44
+#: core/templates/user/preferences.html:44 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:45
+msgid "Options"
+msgstr "Opcje"
+
#: core/templates/license/list.html:4 core/templates/misc/license/list.html:4
msgid "License list"
msgstr "Lista licencji"
@@ -777,7 +787,6 @@ msgstr "Lista licencji"
#: core/templates/weight_unit/list.html:26
#: exercises/templates/categories/admin-overview.html:24
#: exercises/templates/equipment/admin-overview.html:24
-#: exercises/templates/exercise/pending.html:30
#: exercises/templates/muscles/admin-overview.html:24
#: gym/templates/admin_notes/list.html:52 gym/templates/contract/list.html:60
#: gym/templates/contract_option/list.html:56
@@ -859,155 +868,135 @@ msgstr "Twoje schematy"
msgid "Public templates"
msgstr "Publiczne szablony"
-#: core/templates/navigation.html:64
-msgctxt "as in sorted by category"
-msgid "by category"
-msgstr "po kategorii"
-
-#: core/templates/navigation.html:65
-msgctxt "as in sorted by muscle"
-msgid "by muscle"
-msgstr "po parti mięśni"
-
-#: core/templates/navigation.html:66
-msgctxt "as in sorted by equipment"
-msgid "by equipment"
-msgstr "po ekwipunku"
+#: core/templates/navigation.html:63 manager/forms.py:133
+#: manager/models/setting.py:54
+msgid "Exercises"
+msgstr "Ćwiczenia"
-#: core/templates/navigation.html:70
-#: exercises/templates/equipment/overview.html:109
-#: exercises/templates/equipment/overview.html:113
-#: exercises/templates/exercise/overview.html:112
-#: exercises/templates/exercise/overview.html:116
-#: exercises/templates/muscles/overview.html:112
-#: exercises/templates/muscles/overview.html:116
-msgid "Add new exercise"
-msgstr "Dodaj nowe ćwiczenie"
-
-#: core/templates/navigation.html:75 core/templates/navigation.html:116
-#: core/templates/navigation.html:224
+#: core/templates/navigation.html:67 core/templates/navigation.html:107
+#: core/templates/navigation.html:215
msgid "Administration"
msgstr "Zarządzanie"
-#: core/templates/navigation.html:76
-#: exercises/templates/exercise/pending.html:6
-msgid "Exercises pending review"
-msgstr "Ćwiczenia oczekujące na akceptację"
+#: core/templates/navigation.html:68
+#, fuzzy
+#| msgid "Exercise day"
+msgid "Exercise edit history"
+msgstr "Dzień treningu"
-#: core/templates/navigation.html:77 exercises/models/base.py:72
-#: exercises/templates/exercise/view.html:80
+#: core/templates/navigation.html:69 exercises/models/base.py:84
msgid "Equipment"
msgstr "Sprzęt"
-#: core/templates/navigation.html:78 exercises/templates/exercise/view.html:258
+#: core/templates/navigation.html:70
msgid "Muscles"
msgstr "Mięśnie"
-#: core/templates/navigation.html:79
+#: core/templates/navigation.html:71
#: exercises/templates/categories/admin-overview.html:4
msgid "Categories"
msgstr "Kategorie"
-#: core/templates/navigation.html:93 software/templates/features.html:87
+#: core/templates/navigation.html:84 software/templates/features.html:87
msgid "Nutrition"
msgstr "Żywienie"
-#: core/templates/navigation.html:99 core/templates/user/overview.html:144
+#: core/templates/navigation.html:90 core/templates/user/overview.html:144
msgid "Nutrition plans"
msgstr "Plany żywienia"
-#: core/templates/navigation.html:105 nutrition/templates/bmi/form.html:50
+#: core/templates/navigation.html:96 nutrition/templates/bmi/form.html:50
msgid "BMI calculator"
msgstr "Kalkulator BMI"
-#: core/templates/navigation.html:111 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:102 nutrition/templates/rate/form.html:17
msgid "Daily calories calculator"
msgstr "Kalkulator dziennych kalorii"
-#: core/templates/navigation.html:113
+#: core/templates/navigation.html:104
#: nutrition/templates/ingredient/overview.html:29
msgid "Ingredient overview"
msgstr "Rozpiska składników"
-#: core/templates/navigation.html:117 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:108 nutrition/templates/units/list.html:6
msgid "Ingredient weight units"
msgstr "Jednostka wagowa składników"
-#: core/templates/navigation.html:118
+#: core/templates/navigation.html:109
#: nutrition/templates/ingredient/pending.html:6
msgid "Ingredients pending review"
msgstr "Składniki oczekujące na akceptację"
-#: core/templates/navigation.html:132
+#: core/templates/navigation.html:123
msgid "Body weight"
msgstr "Waga ciała"
-#: core/templates/navigation.html:134 core/templates/user/overview.html:114
+#: core/templates/navigation.html:125 core/templates/user/overview.html:114
#: weight/templates/overview.html:7
msgid "Weight overview"
msgstr "Wykres masy ciała"
-#: core/templates/navigation.html:147
+#: core/templates/navigation.html:138
msgid "About this software"
msgstr "O tym programie"
-#: core/templates/navigation.html:149 core/templates/template_features.html:82
+#: core/templates/navigation.html:140 core/templates/template_features.html:82
#: software/templates/about_us.html:5
msgid "About us"
msgstr "O nas"
-#: core/templates/navigation.html:151 software/templates/features.html:209
+#: core/templates/navigation.html:142 software/templates/features.html:209
msgid "REST API"
msgstr "REST API"
-#: core/templates/navigation.html:155 utils/models.py:40
+#: core/templates/navigation.html:146 utils/models.py:41
msgid "License"
msgstr "Licencja"
-#: core/templates/navigation.html:161
+#: core/templates/navigation.html:152
msgid "Developer documentation"
msgstr "Dokumentacja"
-#: core/templates/navigation.html:167
+#: core/templates/navigation.html:158
msgid "Get the code"
msgstr "Pobierz kod źródłowy"
-#: core/templates/navigation.html:173 core/templates/template.html:204
+#: core/templates/navigation.html:164 core/templates/template.html:203
#: core/templates/template_features.html:99
msgid "Translate"
msgstr "Tłumacz"
-#: core/templates/navigation.html:194 core/templates/user/login.html:28
+#: core/templates/navigation.html:185 core/templates/user/login.html:28
msgid "Reset password"
msgstr "Resetuj hasło"
-#: core/templates/navigation.html:207
+#: core/templates/navigation.html:198
msgid "My preferences"
msgstr "Moje preferencje"
-#: core/templates/navigation.html:214
+#: core/templates/navigation.html:205
msgid "Logout"
msgstr "Wyloguj"
-#: core/templates/navigation.html:229
+#: core/templates/navigation.html:220
msgid "Licenses"
msgstr "Licencje"
-#: core/templates/navigation.html:232
+#: core/templates/navigation.html:223
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr "Jednostki potwórzeń"
-#: core/templates/navigation.html:235 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:226 core/templates/weight_unit/list.html:4
#: nutrition/templates/ingredient/view.html:174
msgid "Weight units"
msgstr "Jednostki wagi"
-#: core/templates/navigation.html:238 core/templates/user/list.html:4
+#: core/templates/navigation.html:229 core/templates/user/list.html:4
msgid "User list"
msgstr "Lista użytkowników"
-#: core/templates/navigation.html:239
+#: core/templates/navigation.html:230
msgid "Gyms"
msgstr "Siłownie"
@@ -1086,33 +1075,30 @@ msgstr "następne"
msgid "Add weight log"
msgstr "Dodaj wpis dot. wagi"
-#: core/templates/tags/render_day.html:114
-#: exercises/templates/equipment/overview.html:59
-#: exercises/templates/exercise/overview.html:63
-#: exercises/templates/muscles/overview.html:65
+#: core/templates/tags/render_day.html:116
msgid "Placeholder image for exercise"
msgstr "Zapychacz obrazka dla ćwiczenia"
-#: core/templates/tags/render_day.html:131
+#: core/templates/tags/render_day.html:133
msgid "This exercise has no repetitions."
msgstr "To ćwiczenie nie ma powtórzeń."
-#: core/templates/tags/render_day.html:134
+#: core/templates/tags/render_day.html:136
msgid "Edit them now."
msgstr "Edytuj je teraz."
-#: core/templates/tags/render_day.html:159
+#: core/templates/tags/render_day.html:162
msgid "Add exercises to this workout day"
msgstr "Dodaj ćwiczenia do tego dnia treningowego"
#: core/templates/tags/render_weight_log.html:17 manager/helpers.py:89
-#: manager/models/setting.py:57 manager/templates/set/formset.html:10
+#: manager/models/setting.py:69 manager/templates/set/formset.html:9
msgid "Reps"
msgstr "Powtórzenia"
-#: 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
+#: core/templates/tags/render_weight_log.html:30 manager/forms.py:189
+#: manager/models/log.py:103 manager/models/setting.py:99
+#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
msgid "RiR"
msgstr "Rezerwa powtórzeń"
@@ -1137,7 +1123,7 @@ msgstr "Warunki świadczenia usługi"
msgid "Features"
msgstr "Cechy"
-#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:37
+#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:53
msgid "API key"
msgstr "Klucz API"
@@ -1182,11 +1168,12 @@ msgid "Documentation"
msgstr "Dokumentacja"
#: core/templates/user/delete_account.html:4
-#: core/templates/user/preferences.html:42
+#: core/templates/user/preferences.html:58
msgid "Delete account"
msgstr "Usuń konto"
#: core/templates/user/delete_account.html:17
+#: exercises/templates/history/overview.html:93
msgid "Are you sure?"
msgstr "Czy na pewno?"
@@ -1234,11 +1221,12 @@ msgstr "Dodaj trening"
#: core/templates/user/overview.html:34 core/templates/user/overview.html:76
#: core/templates/user/overview.html:120 core/templates/user/overview.html: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
-#: 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
+#: exercises/models/base.py:99 exercises/models/base.py:104
+#: exercises/models/exercise.py:69 exercises/models/exercise.py:76
+#: gallery/models/image.py:47 manager/helpers.py:88 manager/models/log.py:100
+#: 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/views.py:150
@@ -1246,11 +1234,11 @@ msgid "Date"
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: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
+#: exercises/models/exercise.py:57 exercises/views/exercises.py:123
+#: 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 "Opis"
@@ -1258,12 +1246,12 @@ msgstr "Opis"
msgid "Number of logs (days)"
msgstr "Liczba logów (dni)"
-#: core/templates/user/overview.html:37 core/views/user.py:576
+#: core/templates/user/overview.html:37 core/views/user.py:592
#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:157
msgid "Last activity"
msgstr "Ostatnia aktywność"
-#: core/templates/user/overview.html:68 manager/forms.py:267
+#: core/templates/user/overview.html:68 manager/forms.py:278
#: manager/templates/workout/view.html:151
msgid "Log"
msgstr "Log"
@@ -1281,6 +1269,7 @@ msgid "Notes"
msgstr "Notatki"
#: core/templates/user/overview.html:79
+#: exercises/templates/history/overview.html:30
#: manager/templates/calendar/partial_overview_table.html:42
#: nutrition/templates/log/detail.html:154
msgid "Time"
@@ -1328,10 +1317,12 @@ msgid "Do you really want to change this user&#39;s password?"
msgstr "Czy naprawdę chcesz zmienić hasło tego użytkownika?"
#: core/templates/user/overview.html:233
+#: exercises/templates/history/overview.html:106
msgid "No"
msgstr "Nie"
#: core/templates/user/overview.html:234
+#: exercises/templates/history/overview.html:99
msgid "Yes"
msgstr "Tak"
@@ -1386,10 +1377,15 @@ msgid "Documents"
msgstr "Dokumenty"
#: core/templates/user/overview.html:413 gym/templates/document/list.html:32
-#: manager/forms.py:279 manager/templates/workout/view.html:176
+#: manager/forms.py:290 manager/templates/workout/view.html:176
msgid "Download"
msgstr "Pobierz"
+#: core/templates/user/overview.html:451 gym/views/admin_config.py:44
+#: gym/views/admin_config.py:58 gym/views/user_config.py:46
+msgid "Configuration"
+msgstr "Konfiguracja"
+
#: core/templates/user/overview.html:454 gym/models/user_config.py:92
msgid "Include in inactive overview"
msgstr "Uwzględnij w podglądzie nieaktywnych"
@@ -1409,7 +1405,25 @@ msgstr "Zaloguj się jako ten użytkownik"
msgid "Preferences"
msgstr "Preferencje"
-#: core/templates/user/preferences.html:33 core/views/user.py:587
+#: core/templates/user/preferences.html:19
+#, fuzzy
+#| msgid "Send emails"
+msgid "Verified email"
+msgstr "Wyślij e-maile"
+
+#: core/templates/user/preferences.html:24
+msgid "Unverified email"
+msgstr ""
+
+#: core/templates/user/preferences.html:26
+msgid "Send verification email"
+msgstr ""
+
+#: core/templates/user/preferences.html:30
+msgid "You need to verify your email to contribute exercises"
+msgstr ""
+
+#: core/templates/user/preferences.html:49 core/views/user.py:603
msgid "Change password"
msgstr "Zmień hasło"
@@ -1439,39 +1453,37 @@ msgid "oz"
msgstr "oz"
#: 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
+#: exercises/views/equipment.py:104 exercises/views/exercises.py:185
+#: exercises/views/muscles.py:99 manager/views/schedule.py:311
+#: manager/views/schedule_step.py:129 manager/views/workout.py:269
+#: manager/views/workout_session.py:141 nutrition/views/ingredient.py:138
#: 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:431
-#: exercises/views/muscles.py:125 gallery/views/images.py:121
+#: exercises/views/categories.py:127 exercises/views/exercises.py:193
+#: exercises/views/muscles.py:106 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
+#: manager/views/workout.py:273 manager/views/workout_session.py:156
+#: nutrition/views/ingredient.py:145 nutrition/views/plan.py:127
#: nutrition/views/unit.py:118
#, python-brace-format
msgid "Delete {0}?"
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/repetition_units.py:85 core/views/user.py:472
#: 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: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
+#: exercises/views/equipment.py:81 exercises/views/muscles.py:86
+#: 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:170
+#: gym/views/gym.py:459 manager/views/day.py:100 manager/views/schedule.py:335
+#: manager/views/workout.py:287 nutrition/views/ingredient.py:164
+#: nutrition/views/plan.py:144 nutrition/views/unit.py:144
#, python-brace-format
msgid "Edit {0}"
msgstr "Edytuj {0}"
@@ -1502,64 +1514,65 @@ msgstr "Zapisz"
msgid "Your feedback was successfully sent. Thank you!"
msgstr "Twoja opinia została poprawnie wysłana. Dziękujemy!"
-#: core/views/user.py:156
+#: core/views/user.py:157
#, python-brace-format
msgid "Account \"{0}\" was successfully deleted"
msgstr "Konto \"{0}\" zostało poprawnie skasowane"
-#: core/views/user.py:287
+#: core/views/user.py:294
msgid "You were successfully registered"
msgstr "Zostałeś poprawnie zarejestrowany"
-#: core/views/user.py:339
+#: core/views/user.py:355
msgid "Settings successfully updated"
msgstr "Ustawienia pomyślnie zaktualizowane"
-#: core/views/user.py:376
+#: core/views/user.py:392
msgid "The user was successfully deactivated"
msgstr "Użytkownik pomyślnie zdezaktywowany"
-#: core/views/user.py:411
+#: core/views/user.py:427
msgid "The user was successfully activated"
msgstr "Użytkownik pomyślnie aktywowany"
-#: core/views/user.py:426
+#: core/views/user.py:442
msgid "Edit user"
msgstr "Edytuj użytkownika"
-#: core/views/user.py:573 gym/templates/gym/member_list.html:26
+#: core/views/user.py:589 gym/templates/gym/member_list.html:26
#: gym/views/gym.py:156
msgid "ID"
msgstr "ID"
-#: core/views/user.py:574 gym/forms.py:94 gym/templates/contract/view.html:55
+#: core/views/user.py:590 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 "Nazwa użytkownika"
-#: core/views/user.py:577 gym/templates/gym/new_user.html:34
+#: core/views/user.py:593 gym/templates/gym/new_user.html:34
#: gym/views/export.py:60 gym/views/gym.py:218
msgid "Gym"
msgstr "Siłownia"
-#: exercises/models/base.py:51 exercises/templates/exercise/view.html:76
-#: nutrition/models/ingredient.py:204
+#: core/views/user.py:652
+#, python-format
+msgid "A verification email was sent to %(email)s"
+msgstr ""
+
+#: exercises/models/base.py:63 nutrition/models/ingredient.py:204
msgid "Category"
msgstr "Kategoria"
-#: exercises/models/base.py:58
+#: exercises/models/base.py:70
msgid "Primary muscles"
msgstr "Mięśnie główne"
-#: exercises/models/base.py:64 exercises/templates/equipment/overview.html:71
-#: exercises/templates/exercise/overview.html:76
-#: exercises/templates/exercise/view.html:268
-#: exercises/templates/muscles/overview.html:77
+#: exercises/models/base.py:76
msgid "Secondary muscles"
msgstr "Mięśnie pomocnicze"
-#: exercises/models/base.py:79
+#: exercises/models/base.py:91
msgid "Variations"
msgstr "Możliwości"
@@ -1567,71 +1580,58 @@ msgstr "Możliwości"
msgid "Exercise Categories"
msgstr "Kategorie ćwiczeń"
-#: exercises/models/comment.py:34 exercises/models/exercise_alias.py:32
-#: exercises/models/image.py:75 exercises/models/video.py:82
-#: manager/forms.py:165 manager/helpers.py:89 manager/models/log.py:51
+#: exercises/models/comment.py:37 exercises/models/exercise_alias.py:35
+#: exercises/models/image.py:71 exercises/models/video.py:95
+#: manager/forms.py:176 manager/helpers.py:89 manager/models/log.py:52
msgid "Exercise"
msgstr "Ćwiczenie"
-#: exercises/models/comment.py:41
+#: exercises/models/comment.py:43
msgid "A comment about how to correctly do this exercise."
msgstr "Komentarz jak poprawnie wykonywać to ćwiczenie."
-#: exercises/models/exercise.py:86 nutrition/models/ingredient.py:80
+#: exercises/models/exercise.py:81 nutrition/models/ingredient.py:80
#: nutrition/models/plan.py:61 nutrition/models/weight_unit.py:32
msgid "Language"
msgstr "Język"
-#: 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:265
-msgid "New user submitted exercise"
-msgstr "Nowe ćwiczenie przesłane przez użytkownika"
-
-#: 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/exercise_alias.py:35
+#: exercises/models/exercise_alias.py:38
msgid "Alias for an exercise"
msgstr "Nacisk na ćwiczenie"
-#: exercises/models/image.py:59
+#: exercises/models/image.py:55
msgid "Line"
msgstr "Linia"
-#: exercises/models/image.py:60
+#: exercises/models/image.py:56
msgid "3D"
msgstr "3D"
-#: exercises/models/image.py:61
+#: exercises/models/image.py:57
msgid "Low-poly"
msgstr "Mało powtórzeń"
-#: exercises/models/image.py:62
+#: exercises/models/image.py:58
msgid "Photo"
msgstr "Zdjęcie"
-#: exercises/models/image.py:63
+#: exercises/models/image.py:59
msgid "Other"
msgstr "Inny"
-#: exercises/models/image.py:81 gallery/models/image.py:56
+#: exercises/models/image.py:77 gallery/models/image.py:56
msgid "Image"
msgstr "Obraz"
-#: exercises/models/image.py:82 gallery/models/image.py:57
+#: exercises/models/image.py:78 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:88
+#: exercises/models/image.py:84
msgid "Main picture"
msgstr "Główny obraz"
-#: exercises/models/image.py:91
+#: exercises/models/image.py:87
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,19 +1641,10 @@ msgstr ""
"wyświetlany np. w wyszukiwarce). Pierwszy obraz zostanie automatycznie "
"wykorzystany."
-#: exercises/models/image.py:100
+#: exercises/models/image.py:96
msgid "The art style of your image"
msgstr "Styl zdjęcia"
-#: exercises/models/image.py:185
-msgid "New user submitted image"
-msgstr "Nowy dodany obraz"
-
-#: 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}."
-
#: exercises/models/muscle.py:37
msgid "In latin, e.g. \"Pectoralis major\""
msgstr "Po łacinie, np. \"Pectoralis major\""
@@ -1666,47 +1657,49 @@ msgstr "Alternatywna nazwa"
msgid "A more basic name for the muscle"
msgstr "Bardziej podstawowa nazwa mięśnia"
-#: exercises/models/video.py:41
-msgid "Maximum file size is 100MB."
+#: exercises/models/video.py:50
+#, fuzzy, python-format
+#| msgid "Maximum file size is 100MB."
+msgid "Maximum file size is %(size)sMB."
msgstr "Maksymalny rozmiar pliku wynosi 100MB."
-#: exercises/models/video.py:44 exercises/models/video.py:48
+#: exercises/models/video.py:57 exercises/models/video.py:65
msgid "File type is not supported"
msgstr "Typ pliku nie jest obsługiwany"
-#: exercises/models/video.py:57
+#: exercises/models/video.py:70
msgid "File is not a valid video"
msgstr "Plik nie jest prawidłowym filmem"
-#: exercises/models/video.py:88
+#: exercises/models/video.py:101
msgid "Main video"
msgstr "Główne wideo"
-#: exercises/models/video.py:94
+#: exercises/models/video.py:107
msgid "Video"
msgstr "Wideo"
-#: exercises/models/video.py:101
+#: exercises/models/video.py:114
msgid "Size"
msgstr "Rozmiar"
-#: exercises/models/video.py:108 manager/models/schedule_step.py:56
+#: exercises/models/video.py:121 manager/models/schedule_step.py:56
msgid "Duration"
msgstr "Czas trwania"
-#: exercises/models/video.py:117
+#: exercises/models/video.py:130
msgid "Width"
msgstr "Szerokość"
-#: exercises/models/video.py:124
+#: exercises/models/video.py:137
msgid "Height"
msgstr "Wzrost"
-#: exercises/models/video.py:131
+#: exercises/models/video.py:144
msgid "Codec"
msgstr "Kod"
-#: exercises/models/video.py:139
+#: exercises/models/video.py:152
msgid "Codec, long name"
msgstr "Kod, długa nazwa"
@@ -1715,137 +1708,23 @@ msgid "Equipment list"
msgstr "Lista sprzętu"
#: exercises/templates/equipment/admin-overview.html:37
-#: exercises/views/equipment.py:94
+#: exercises/views/equipment.py:92
msgid "Add new equipment"
msgstr "Dodaj nowy sprzęt"
-#: exercises/templates/equipment/overview.html:11
-msgid "Equipment overview"
-msgstr "Rozpiska sprzętu"
-
-#: exercises/templates/equipment/overview.html:69
-#: exercises/templates/exercise/overview.html:74
-#: exercises/templates/exercise/view.html:264
-#: exercises/templates/muscles/overview.html:75
-msgid "Main muscles"
-msgstr "Mięśnie główne"
-
-#: exercises/templates/equipment/overview.html:79
-msgid ""
-"No exercises for this equipment. Add or edit an exercise and set the "
-"equipment."
-msgstr ""
-"Brak ćwiczeń dla tego sprzętu. Dodaj lub edytuj ćwiczenie i ustaw sprzęt."
-
-#: exercises/templates/equipment/overview.html:96
-#: exercises/templates/exercise/overview.html:99
-#: nutrition/templates/ingredient/overview.html:57
-msgid "Search"
-msgstr "Szukaj"
-
-#: exercises/templates/equipment/overview.html:101
-#: exercises/templates/exercise/overview.html:104
-msgid "exercise name"
-msgstr "nazwa ćwiczenia"
-
-#: exercises/templates/equipment/overview.html:115
-#: exercises/templates/exercise/overview.html:118
-#: exercises/templates/muscles/overview.html:118
-#: nutrition/templates/ingredient/overview.html:85
-msgid "Only registered users can do this"
-msgstr "Tylko zarejestrowani użytkownicy mogą wykonać tą akcję"
-
-#: exercises/templates/exercise/email_new.tpl:1
-#, python-format
-msgid ""
-"Your exercise '%(exercise)s' was successfully added to the general\n"
-"database."
-msgstr ""
-"Twoje ćwiczenie \" %(exercise)s\" zostało pomyślnie dodane do\n"
-"bazy danych."
-
-#: exercises/templates/exercise/email_new.tpl:4
-msgid ""
-"It is now available on the exercise and muscle overview and can be\n"
-"added to workouts. You can access it on this address:"
-msgstr ""
-"Jest teraz dostępne na rozpisce ćwiczeń i mięśni i może być\n"
-"dodane do treningów. Możesz się do niego dostać pod adresem:"
-
-#: exercises/templates/exercise/email_new.tpl:8
-#: nutrition/templates/ingredient/email_new.tpl:8
-msgid "Thank you for contributing and making this site better!"
-msgstr "Dziękujemy za pomoc w rozwijaniu strony!"
-
-#: exercises/templates/exercise/email_new.tpl:9
-#: manager/templates/workout/email_reminder.tpl:15
-#: manager/templates/workout/email_weight_reminder.tpl:12
-#: nutrition/templates/ingredient/email_new.tpl:9
-#, python-format
-msgid "The %(site)s team"
-msgstr "Zespół %(site)s"
-
-#: exercises/templates/exercise/form.html:4
-msgid "Submitting an exercise"
-msgstr "Dodawanie ćwiczenia"
-
-#: exercises/templates/exercise/form.html:5
-msgid ""
-"Thank you for submitting an exercise. This is much\n"
-"appreciated!"
-msgstr ""
-"Dziękujemy za dodanie ćwiczenia! Bardzo to\n"
-"doceniamy!"
-
-#: exercises/templates/exercise/form.html:8
-msgid ""
-"After you submit the form, the administrators will be notified.\n"
-"Once it is reviewed, it will be added to the database. Till this happens,\n"
-"it will not be visible in the overview or the search. In case you added your "
-"email\n"
-"when you registered, you will get notified when the process is completed "
-"successfully."
-msgstr ""
-"Po wysłaniu formularza, powiadomieni zostaną administratorzy strony.\n"
-"Po akceptacji, wpis zostanie dodany do bazy danych. Zanim to nastąpi,\n"
-"nie będzie on widoczny w wynikach wyszukiwania. Jeżeli dodałeś swój adres e-"
-"mail,\n"
-"zostaniesz powiadomiony o zakończonej procedurze."
-
-#: exercises/templates/exercise/form_correct.html:4
-msgid "Correcting an exercise"
-msgstr "Poprawianie ćwiczenia"
-
-#: exercises/templates/exercise/form_correct.html:5
-msgid ""
-"Thank you for correcting and improving this exercise.\n"
-"This is much appreciated!"
-msgstr ""
-"Dziękujemy za poprawienie i ulepszenie tego ćwiczenia!\n"
-"Doceniamy twoją pomoc!"
-
-#: exercises/templates/exercise/form_correct.html:8
-msgid ""
-"After you submit the form, the administrators will be notified.\n"
-"Once the changes are reviewed the exercise will be updated."
-msgstr ""
-"Po wysłaniu formularza, powiadomieni zostaną administratorzy strony.\n"
-"Gdy zmiany zostaną zaakceptowane, ćwiczenie zostanie zaktualizowane."
-
-#: exercises/templates/exercise/overview.html:88
-msgid "No categories."
-msgstr "Brak kategorii."
-
-#: exercises/templates/exercise/overview.html:88
-msgid "Use link to create one"
-msgstr "Skorzystaj z linka by stworzyć nowy"
+#: exercises/templates/history/overview.html:11
+#, fuzzy
+#| msgid "Exercise day"
+msgid "Exercise admin history"
+msgstr "Dzień treningu"
-#: exercises/templates/exercise/pending.html:14
-#: nutrition/templates/ingredient/pending.html:14
-msgid "Submission date"
-msgstr "Data zgłoszenia"
+#: exercises/templates/history/overview.html:27
+#, fuzzy
+#| msgid "Actions"
+msgid "Action"
+msgstr "Akcje"
-#: exercises/templates/exercise/pending.html:16 gallery/models/image.py:51
+#: exercises/templates/history/overview.html:28 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/log.py:45
@@ -1856,100 +1735,47 @@ msgstr "Data zgłoszenia"
msgid "User"
msgstr "Użytkownik"
-#: exercises/templates/exercise/view.html:48
-msgid "Exercise is pending review"
-msgstr "Ćwiczenie oczekuje na akceptację"
-
-#: exercises/templates/exercise/view.html:51
-msgid ""
-"This user submitted exercise is pending a decision to be\n"
-" included in the database."
-msgstr ""
-"To ćwiczenie przesłane przez użytkownika czeka na\n"
-"dodanie do bazy danych."
-
-#: exercises/templates/exercise/view.html:53
-msgid "Till then, it will not be shown in the overview or the search."
-msgstr "Do tego czasu, nie zostanie on wyświetlony w wynikach wyszukiwania."
-
-#: exercises/templates/exercise/view.html:54
-#: nutrition/templates/ingredient/view.html:31
-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:203
-#: nutrition/templates/ingredient/view.html:38
-msgid "Accept"
-msgstr "Akceptuj"
-
-#: exercises/templates/exercise/view.html:64
-#: exercises/templates/exercise/view.html:204
-#: nutrition/templates/ingredient/view.html:42
-msgid "Decline"
-msgstr "Odrzuć"
-
-#: exercises/templates/exercise/view.html:96
-msgid "Images"
-msgstr "Obrazy"
-
-#: exercises/templates/exercise/view.html:137 exercises/views/images.py:93
-msgid "Add new image"
-msgstr "Dodaj nowy obraz"
-
-#: exercises/templates/exercise/view.html:148
-msgid "Videos"
-msgstr "Film"
-
-#: exercises/templates/exercise/view.html:187 exercises/views/videos.py:94
-msgid "Add new video"
-msgstr "Dodaj nowy film"
-
-#: exercises/templates/exercise/view.html:197
-msgid "Images pending review"
-msgstr "Obrazy oczekujące na akceptację"
-
-#: exercises/templates/exercise/view.html:218
-msgid "Comments for this exercise"
-msgstr "Komentarze dla tego ćwiczenia"
+#: exercises/templates/history/overview.html:29
+#, fuzzy
+#| msgctxt "As in \"email subject\""
+#| msgid "Subject"
+msgid "Object"
+msgstr "Temat"
-#: exercises/templates/exercise/view.html:246
-msgid "Add new comment"
-msgstr "Dodaj nowy komentarz"
+#: exercises/templates/history/overview.html:31
+#, fuzzy
+#| msgctxt "Noun, not verb"
+#| msgid "Change"
+msgid "Changes"
+msgstr "Zmień"
-#: 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/history/overview.html:32
+msgid "Revert"
+msgstr ""
-#: 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/history/overview.html:64
+msgid "View Object"
+msgstr ""
-#: exercises/templates/exercise/view.html:306
-msgid "Exercise Variations"
-msgstr "Opcje treningów"
+#: exercises/templates/history/overview.html:75
+#, fuzzy
+#| msgid "View logs"
+msgid "View changes"
+msgstr "Pokaż wpisy"
-#: exercises/templates/exercise/view.html:327
-msgid "Submit a correction"
-msgstr "Zgłoś korektę"
+#: exercises/templates/history/overview.html:86
+msgid "Revert changes"
+msgstr ""
#: exercises/templates/muscles/admin-overview.html:4
-#: exercises/templates/muscles/overview.html:7
msgid "Muscle overview"
msgstr "Rozpiska mieśni"
#: exercises/templates/muscles/admin-overview.html:36
-#: exercises/views/muscles.py:86
+#: exercises/views/muscles.py:67
msgid "Add muscle"
msgstr "Dodaj mięsień"
-#: exercises/templates/muscles/overview.html:85
-msgid ""
-"No exercises for this muscle. Add or edit an exercise and set the muscle."
-msgstr ""
-"Brak ćwiczeń dla tego mięśnia. Dodaj lub edytuj ćwiczenie i wybierz mięsień."
-
#: exercises/views/categories.py:71
msgid "Add category"
msgstr "Dodaj kategorię"
@@ -1962,54 +1788,24 @@ msgstr "To również usunie ćwiczenia w tej kategorii."
msgid "Add exercise comment"
msgstr "Dodaj komentarz do ćwiczenia"
-#: exercises/views/equipment.py:107 exercises/views/equipment.py:118
+#: exercises/views/equipment.py:105 exercises/views/equipment.py:116
msgid "Delete equipment?"
msgstr "Usunąć sprzęt?"
-#: exercises/views/exercises.py:229
-#, python-format
-msgid ""
-"%(name_original)s is too similar to existing exercise \"%(exercise_name)s\""
+#: exercises/views/exercises.py:161
+#, fuzzy, python-format
+#| msgid ""
+#| "%(name_original)s is too similar to existing exercise "
+#| "\"%(exercise_name)s\""
+msgid "%(name)s is too similar to existing exercise \"%(exercise_name)s\""
msgstr ""
"nazwa %(name_original)s jest podobna do już istniejącego ćwiczenia o nazwie "
"\"%(exercise_name)s\""
-#: exercises/views/exercises.py:247
-msgid "Add exercise"
-msgstr "Dodaj ćwiczenie"
-
-#: 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:380
-#, python-brace-format
-msgid "Correct {0}"
-msgstr "Popraw {0}"
-
-#: exercises/views/exercises.py:422
+#: exercises/views/exercises.py:184
msgid "This will delete the exercise from all workouts."
msgstr "To usunie ćwiczenie ze wszystkich treningów."
-#: exercises/views/exercises.py:474
-msgid "Exercise was successfully marked as rejected"
-msgstr "Ćwiczenie zostało poprawnie oznaczone jako odrzucone"
-
-#: exercises/views/images.py:68
-msgid "Edit exercise image"
-msgstr "Edytuj obraz ćwiczenia"
-
-#: exercises/views/images.py:143
-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"
@@ -2076,7 +1872,7 @@ 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:59
+#: manager/templates/log/add.html:52 nutrition/forms.py:60
#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:102
#: nutrition/models/meal_item.py:72
msgid "Amount"
@@ -2179,6 +1975,10 @@ msgstr "Użyje nazwy pliku jeżeli nic nie zostanie wpisane"
msgid "User notes"
msgstr "Notatki użytkownika"
+#: gym/templates/contract/list.html:36
+msgid "Show"
+msgstr "Pokaż"
+
#: gym/templates/contract/view.html:4
msgid "Contract"
msgstr "Kontrakt"
@@ -2255,12 +2055,8 @@ msgid "Emails"
msgstr "Emaile"
#: gym/templates/gym/member_list.html:315
-msgid "Add member"
-msgstr "Dodaj członka"
-
-#: gym/templates/gym/new_user.html:38
-msgid "Date of Birth"
-msgstr "Data urodzenia"
+msgid "Add member"
+msgstr "Dodaj członka"
#: gym/templates/gym/new_user.html:48 manager/templates/calendar/month.html:144
#: manager/templates/log/add.html:75 nutrition/templates/rate/form.html:120
@@ -2323,126 +2119,126 @@ msgstr "Dodaj członka do siłowni"
msgid "Edit gym"
msgstr "Edytuj siłownię"
-#: i18n.tpl:2 i18n.tpl:28
+#: i18n.tpl:2
+msgid "Until Failure"
+msgstr "Do porażki"
+
+#: i18n.tpl:3 manager/forms.py:180 manager/models/log.py:73
+#: manager/templates/set/add.html:53
+msgid "Repetitions"
+msgstr "Powtórzenia"
+
+#: i18n.tpl:4
msgid "Abs"
msgstr "Brzuch"
-#: i18n.tpl:3
+#: i18n.tpl:5
msgid "Arms"
msgstr "Ramiona"
-#: i18n.tpl:4
-msgid "Back"
-msgstr "Plecy"
-
-#: i18n.tpl:5 i18n.tpl:23
-msgid "Calves"
-msgstr "Łydki"
-
-#: i18n.tpl:6 i18n.tpl:26
-msgid "Chest"
-msgstr "Klatka piersiowa"
-
-#: i18n.tpl:7
+#: i18n.tpl:6
msgid "Legs"
msgstr "Nogi"
-#: i18n.tpl:8 i18n.tpl:19
-msgid "Shoulders"
-msgstr "Barki"
+#: i18n.tpl:7
+msgid "Dumbbell"
+msgstr "Hantle"
+
+#: i18n.tpl:8
+msgid "Biceps"
+msgstr "Biceps"
#: i18n.tpl:9
-msgid "Barbell"
-msgstr "Sztanga"
+msgid "SZ-Bar"
+msgstr "Sztanga łamana"
#: i18n.tpl:10
-msgid "Bench"
-msgstr "Ławka"
+msgid "Kettlebell"
+msgstr "Odważniki"
#: i18n.tpl:11
-msgid "Dumbbell"
-msgstr "Hantle"
+msgid "Swiss Ball"
+msgstr "Piłka do ćwiczeń"
#: i18n.tpl:12
-msgid "Gym mat"
-msgstr "Mata gimnastyczna"
+msgid "none (bodyweight exercise)"
+msgstr "żaden (własny ciężar ciała)"
#: i18n.tpl:13
-msgid "Incline bench"
-msgstr "Ławka skośna"
+msgid "Calves"
+msgstr "Łydki"
#: i18n.tpl:14
-msgid "Kettlebell"
-msgstr "Odważniki"
+msgid "Back"
+msgstr "Plecy"
#: i18n.tpl:15
-msgid "Pull-up bar"
-msgstr "Drążek"
+msgid "Lower back"
+msgstr "Mięsień pleców"
#: i18n.tpl:16
-msgid "SZ-Bar"
-msgstr "Sztanga łamana"
+msgid "Lats"
+msgstr "mięsień najszerszy grzbietu"
#: i18n.tpl:17
-msgid "Swiss Ball"
-msgstr "Piłka do ćwiczeń"
+msgid "Hamstrings"
+msgstr "Tył uda"
#: i18n.tpl:18
-msgid "none (bodyweight exercise)"
-msgstr "żaden (własny ciężar ciała)"
+msgid "Bench"
+msgstr "Ławka"
+
+#: i18n.tpl:19
+msgid "Glutes"
+msgstr "Pośladki"
#: i18n.tpl:20
-msgid "Biceps"
-msgstr "Biceps"
+msgid "Kilometers"
+msgstr "Kilometry"
#: i18n.tpl:21
-msgid "Hamstrings"
-msgstr "Tył uda"
+msgid "Shoulders"
+msgstr "Barki"
#: i18n.tpl:22
-msgid "Lower back"
-msgstr "Mięsień pleców"
+msgid "Seconds"
+msgstr "Sekundy"
+
+#: i18n.tpl:23
+msgid "Miles"
+msgstr "Mile"
#: i18n.tpl:24
-msgid "Glutes"
-msgstr "Pośladki"
+msgid "Incline bench"
+msgstr "Ławka skośna"
#: i18n.tpl:25
-msgid "Lats"
-msgstr "mięsień najszerszy grzbietu"
-
-#: i18n.tpl:27
msgid "Quads"
msgstr "Mięsień czworogłowy"
-#: i18n.tpl:29
-msgid "Triceps"
-msgstr "Triceps"
-
-#: i18n.tpl:30
-msgid "Kilometers"
-msgstr "Kilometry"
-
-#: i18n.tpl:31
-msgid "Miles"
-msgstr "Mile"
-
-#: i18n.tpl:32
+#: i18n.tpl:26
msgid "Minutes"
msgstr "Minuty"
-#: i18n.tpl:33 manager/forms.py:169 manager/models/log.py:71
-#: manager/templates/set/add.html:53
-msgid "Repetitions"
-msgstr "Powtórzenia"
+#: i18n.tpl:27
+msgid "Chest"
+msgstr "Klatka piersiowa"
-#: i18n.tpl:34
-msgid "Seconds"
-msgstr "Sekundy"
+#: i18n.tpl:28
+msgid "Gym mat"
+msgstr "Mata gimnastyczna"
-#: i18n.tpl:35
-msgid "Until Failure"
-msgstr "Do porażki"
+#: i18n.tpl:29
+msgid "Pull-up bar"
+msgstr "Drążek"
+
+#: i18n.tpl:30
+msgid "Barbell"
+msgstr "Sztanga"
+
+#: i18n.tpl:31
+msgid "Triceps"
+msgstr "Triceps"
#: mailer/forms.py:34 mailer/templates/mailer/gym/preview.html:32
msgctxt "As in \"email subject\""
@@ -2495,11 +2291,11 @@ msgstr "Wyślij e-maile"
msgid "Correction"
msgstr "Korekta"
-#: manager/forms.py:89 manager/models/workout.py:59
+#: manager/forms.py:92 manager/models/workout.py:59
msgid "The name of the workout"
msgstr "Nazwa treningu"
-#: manager/forms.py:93 manager/models/workout.py:66
+#: manager/forms.py:96 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'."
@@ -2507,7 +2303,7 @@ msgstr ""
"Krótki opis bądź cel treningu. Przykładowo: \"Nacisk na mięśnie pleców\" lub "
"\"Tydzień 1 programu XYZ\"."
-#: manager/forms.py:126
+#: manager/forms.py:137
msgid ""
"You can search for more than one exercise, they will be grouped together for "
"a superset."
@@ -2515,28 +2311,28 @@ msgstr ""
"Możesz szukać więcej niż jednego ćwiczenia, zostaną one zebrane w jedną "
"supergrupę."
-#: 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
+#: manager/forms.py:166 manager/forms.py:171 manager/models/log.py:64
+#: manager/models/log.py:92 manager/models/setting.py:59
+#: manager/models/setting.py:90 manager/templates/log/add.html:53
+#: manager/templates/log/add.html:55 manager/templates/set/formset.html:10
+#: manager/templates/set/formset.html:12 measurements/models/category.py:58
+#: nutrition/forms.py:64
msgid "Unit"
msgstr "Jednostka"
-#: manager/forms.py:266
+#: manager/forms.py:277
msgid "Type"
msgstr "Typ"
-#: manager/forms.py:267 manager/templates/workout/view.html:157
+#: manager/forms.py:278 manager/templates/workout/view.html:157
msgid "Table"
msgstr "Tabela"
-#: manager/forms.py:269 manager/templates/workout/view.html:163
+#: manager/forms.py:280 manager/templates/workout/view.html:163
msgid "with images"
msgstr "z obrazami"
-#: manager/forms.py:270 manager/templates/workout/view.html:169
+#: manager/forms.py:281 manager/templates/workout/view.html:169
msgid "with comments"
msgstr "z komentarzami"
@@ -2594,7 +2390,7 @@ msgid "The duration in weeks"
msgstr "Czas trwania w tygodniach"
#: manager/models/schedule_step.py:63 manager/models/set.py:52
-#: manager/models/setting.py:98 nutrition/models/meal.py:54
+#: manager/models/setting.py:110 nutrition/models/meal.py:54
#: nutrition/models/meal_item.py:65
msgid "Order"
msgstr "Kolejność"
@@ -2648,7 +2444,7 @@ msgstr "Dzień treningu"
msgid "Number of sets"
msgstr "Liczba serii"
-#: manager/models/setting.py:43
+#: manager/models/setting.py:48
msgid "Sets"
msgstr "Serie"
@@ -2949,6 +2745,13 @@ msgstr ""
"Jeżeli nie chcesz już więcej otrzymywać powiadomień, deaktywuj je\n"
"w ustawieniach."
+#: manager/templates/workout/email_reminder.tpl:15
+#: manager/templates/workout/email_weight_reminder.tpl:12
+#: nutrition/templates/ingredient/email_new.tpl:9
+#, python-format
+msgid "The %(site)s team"
+msgstr "Zespół %(site)s"
+
#: manager/templates/workout/email_weight_reminder.tpl:3
#, python-format
msgid ""
@@ -2964,6 +2767,10 @@ msgid ""
msgstr ""
"Zawsze będziesz widział te powiadomienia, dopóki nie wpiszesz aktualnej wagi."
+#: manager/templates/workout/log.html:10 manager/templates/workout/log.html:11
+msgid "Weight log"
+msgstr "Wartości ciężarów"
+
#: manager/templates/workout/log.html:29
msgid "Weight log for workout"
msgstr "Wartości ciężarów podczas treningu"
@@ -3071,7 +2878,7 @@ msgstr "Pokaż wpisy"
msgid "Edit workout"
msgstr "Edytuj trening"
-#: manager/templates/workout/view.html:225 manager/views/workout.py:300
+#: manager/templates/workout/view.html:225 manager/views/workout.py:301
msgid "Mark as template"
msgstr "Oznacz jako szablon"
@@ -3079,11 +2886,6 @@ msgstr "Oznacz jako szablon"
msgid "Add workout day"
msgstr "Dodaj dzień treningowy"
-#: manager/views/log.py:92
-#, python-format
-msgid "Edit log entry for %s"
-msgstr "Edytuj wpis dla %s"
-
#: manager/views/log.py:111
msgid "Delete workout log"
msgstr "Usuń log treningowy"
@@ -3101,11 +2903,11 @@ msgstr "Utwórz harmonogram"
msgid "Your workouts"
msgstr "Twoje treningi"
-#: manager/views/workout.py:227
+#: manager/views/workout.py:228
msgid "Copy workout"
msgstr "Kopiuj trening"
-#: manager/views/workout.py:230
+#: manager/views/workout.py:231
msgid "Copy"
msgstr "Kopiuj"
@@ -3128,23 +2930,23 @@ msgstr ""
msgid "Value"
msgstr "Wartość"
-#: nutrition/forms.py:122
+#: nutrition/forms.py:123
msgid "Calculate"
msgstr "Oblicz"
-#: nutrition/forms.py:195 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:196 nutrition/templates/rate/form.html:76
msgid "Basic caloric intake"
msgstr "Podstawowe spożycie kalorii"
-#: nutrition/forms.py:196
+#: nutrition/forms.py:197
msgid "Your basic caloric intake as calculated for your data"
msgstr "Twoje podstawowe spożycie kalorii obliczone na podstawie danych"
-#: nutrition/forms.py:202
+#: nutrition/forms.py:203
msgid "Additional calories"
msgstr "Dodatkowe kalorie"
-#: nutrition/forms.py:204
+#: nutrition/forms.py:205
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
@@ -3152,7 +2954,7 @@ msgstr ""
"Dodatkowe kalorie modyfikujące bazową wartość (by odjąć, wpisz ujemną "
"wartość)"
-#: nutrition/forms.py:232 nutrition/models/ingredient_weight_unit.py:39
+#: nutrition/forms.py:233 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"
@@ -3218,7 +3020,7 @@ msgstr ""
"dostarczonej przez białka, węglowodany i tłuszcze ({energy_calculated}kcal "
"+/-{energy_approx}%)"
-#: nutrition/models/ingredient.py:357 nutrition/views/ingredient.py:225
+#: nutrition/models/ingredient.py:357 nutrition/views/ingredient.py:219
msgid "Ingredient was successfully added to the general database"
msgstr "Składnik został pomyślnie dodany do bazy danych"
@@ -3247,6 +3049,12 @@ msgstr "Jednostka ilości, np. \"1 kubek\" lub \"1/2 łyżki\""
msgid "Meal"
msgstr "Posiłek"
+#: nutrition/models/log.py:65
+#, fuzzy
+#| msgid "Time (approx)"
+msgid "Date and Time (Approx.)"
+msgstr "Czas (przybliżony)"
+
#: nutrition/models/meal.py:61
msgid "Time (approx)"
msgstr "Czas (przybliżony)"
@@ -3349,6 +3157,10 @@ msgstr ""
"Jest teraz dostępny na liście składników i może być\n"
"dodawany do planów żywieniowych. Składnik jest dostępny pod adresem:"
+#: nutrition/templates/ingredient/email_new.tpl:8
+msgid "Thank you for contributing and making this site better!"
+msgstr "Dziękujemy za pomoc w rozwijaniu strony!"
+
#: nutrition/templates/ingredient/form.html:4
msgid "Submitting an ingredient"
msgstr "Dodawanie składnika"
@@ -3380,6 +3192,10 @@ msgstr ""
msgid "No ingredients."
msgstr "Brak składników."
+#: nutrition/templates/ingredient/overview.html:57
+msgid "Search"
+msgstr "Szukaj"
+
#: nutrition/templates/ingredient/overview.html:66
msgid "ingredient name"
msgstr "nazwa składnika"
@@ -3389,6 +3205,14 @@ msgstr "nazwa składnika"
msgid "Add ingredient"
msgstr "Dodaj składnik"
+#: nutrition/templates/ingredient/overview.html:85
+msgid "Only registered users can do this"
+msgstr "Tylko zarejestrowani użytkownicy mogą wykonać tą akcję"
+
+#: nutrition/templates/ingredient/pending.html:14
+msgid "Submission date"
+msgstr "Data zgłoszenia"
+
#: nutrition/templates/ingredient/view.html:27
msgid "Ingredient is pending review"
msgstr "Składnik czeka na akceptację"
@@ -3404,6 +3228,18 @@ msgstr ""
"umieszczenie w bazie danych. Do tego czasu, nie będzie on umieszczony w\n"
"wynikach wyszukiwania."
+#: nutrition/templates/ingredient/view.html:31
+msgid "Please select one of the options below."
+msgstr "Wybierz jedną z opcji poniżej."
+
+#: nutrition/templates/ingredient/view.html:38
+msgid "Accept"
+msgstr "Akceptuj"
+
+#: nutrition/templates/ingredient/view.html:42
+msgid "Decline"
+msgstr "Odrzuć"
+
#: nutrition/templates/ingredient/view.html:71
#: nutrition/templates/log/detail.html:31
#: nutrition/templates/plan/view.html:229 nutrition/views/plan.py:376
@@ -3668,14 +3504,18 @@ msgstr ""
"swój organizm przez kilka tygodni i w razie potrzeby dostosuj odpowiednie "
"wartości."
-#: nutrition/views/ingredient.py:181
+#: nutrition/views/ingredient.py:175
msgid "Add a new ingredient"
msgstr "Dodaj nowy składnik"
-#: nutrition/views/ingredient.py:238
+#: nutrition/views/ingredient.py:232
msgid "Ingredient was successfully marked as rejected"
msgstr "Składnik został poprawnie oznaczony jako odrzucony"
+#: nutrition/views/log.py:230 nutrition/views/unit_ingredient.py:139
+msgid "Delete?"
+msgstr "Usunąć?"
+
#: nutrition/views/meal.py:55
msgid "Add new meal"
msgstr "Dodaj nowy posiłek"
@@ -3932,15 +3772,15 @@ msgstr ""
msgid "100%% Free <br>and <br>Open Source"
msgstr "100%% Darmo <br>i <br>Open Source"
-#: utils/generic_views.py:261
+#: utils/generic_views.py:262
msgid "Yes, delete"
msgstr "Tak, usuń"
-#: utils/models.py:47
+#: utils/models.py:48
msgid "Author"
msgstr "Autor"
-#: utils/models.py:52
+#: utils/models.py:53
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."
@@ -3948,15 +3788,15 @@ msgstr ""
"Jeżeli nie jesteś autorem, wpisz tutaj nazwę lub źródło. jest to konieczne "
"dla niektórych licencji, np. CC-BY-SA."
-#: utils/models.py:77
+#: utils/models.py:78
msgid "Pending"
msgstr "Oczekujące"
-#: utils/models.py:78
+#: utils/models.py:79
msgid "Accepted"
msgstr "Zaakceptowano"
-#: utils/models.py:79
+#: utils/models.py:80
msgid "Declined"
msgstr "Odrzucono"
@@ -4120,6 +3960,212 @@ msgstr "Usunięto."
msgid "Delete weight entry for the %s"
msgstr "Usuń wpis wagi dla %s"
+#~ msgid "Ingredients"
+#~ msgstr "Składniki"
+
+#~ msgid ""
+#~ "Use the configuration to select in what languages the\n"
+#~ "exercises and ingredients will be shown for the current language (for "
+#~ "example\n"
+#~ "the exercises should be shown in languages A, B and C; the ingredients "
+#~ "only\n"
+#~ "in A)."
+#~ msgstr ""
+#~ "Skonfiguruj by wybrać języki,\n"
+#~ "w których zostaną wyświetlone ćwiczenia i składniki dla obecnie wybranego "
+#~ "języka (przykładowo,\n"
+#~ "ćwiczenia powinny być wyświetlane w językach A, B i C; składniki zaś "
+#~ "tylko\n"
+#~ "w A)."
+
+#~ msgctxt "as in sorted by category"
+#~ msgid "by category"
+#~ msgstr "po kategorii"
+
+#~ msgctxt "as in sorted by muscle"
+#~ msgid "by muscle"
+#~ msgstr "po parti mięśni"
+
+#~ msgctxt "as in sorted by equipment"
+#~ msgid "by equipment"
+#~ msgstr "po ekwipunku"
+
+#~ msgid "Add new exercise"
+#~ msgstr "Dodaj nowe ćwiczenie"
+
+#~ msgid "Exercises pending review"
+#~ msgstr "Ćwiczenia oczekujące na akceptację"
+
+#~ msgid "Exercise was successfully added to the general database"
+#~ msgstr "Ćwiczenie zostało pomyślnie dodane do bazy danych"
+
+#~ msgid "New user submitted exercise"
+#~ msgstr "Nowe ćwiczenie przesłane przez użytkownika"
+
+#, python-brace-format
+#~ msgid "The user {0} submitted a new exercise \"{1}\"."
+#~ msgstr "Użytkownik {0} przesłał nowe ćwiczenie \"{1}\"."
+
+#~ msgid "New user submitted image"
+#~ msgstr "Nowy dodany obraz"
+
+#, 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}."
+
+#~ msgid "Equipment overview"
+#~ msgstr "Rozpiska sprzętu"
+
+#~ msgid "Main muscles"
+#~ msgstr "Mięśnie główne"
+
+#~ msgid ""
+#~ "No exercises for this equipment. Add or edit an exercise and set the "
+#~ "equipment."
+#~ msgstr ""
+#~ "Brak ćwiczeń dla tego sprzętu. Dodaj lub edytuj ćwiczenie i ustaw sprzęt."
+
+#~ msgid "exercise name"
+#~ msgstr "nazwa ćwiczenia"
+
+#, python-format
+#~ msgid ""
+#~ "Your exercise '%(exercise)s' was successfully added to the general\n"
+#~ "database."
+#~ msgstr ""
+#~ "Twoje ćwiczenie \" %(exercise)s\" zostało pomyślnie dodane do\n"
+#~ "bazy danych."
+
+#~ msgid ""
+#~ "It is now available on the exercise and muscle overview and can be\n"
+#~ "added to workouts. You can access it on this address:"
+#~ msgstr ""
+#~ "Jest teraz dostępne na rozpisce ćwiczeń i mięśni i może być\n"
+#~ "dodane do treningów. Możesz się do niego dostać pod adresem:"
+
+#~ msgid "Submitting an exercise"
+#~ msgstr "Dodawanie ćwiczenia"
+
+#~ msgid ""
+#~ "Thank you for submitting an exercise. This is much\n"
+#~ "appreciated!"
+#~ msgstr ""
+#~ "Dziękujemy za dodanie ćwiczenia! Bardzo to\n"
+#~ "doceniamy!"
+
+#~ msgid ""
+#~ "After you submit the form, the administrators will be notified.\n"
+#~ "Once it is reviewed, it will be added to the database. Till this "
+#~ "happens,\n"
+#~ "it will not be visible in the overview or the search. In case you added "
+#~ "your email\n"
+#~ "when you registered, you will get notified when the process is completed "
+#~ "successfully."
+#~ msgstr ""
+#~ "Po wysłaniu formularza, powiadomieni zostaną administratorzy strony.\n"
+#~ "Po akceptacji, wpis zostanie dodany do bazy danych. Zanim to nastąpi,\n"
+#~ "nie będzie on widoczny w wynikach wyszukiwania. Jeżeli dodałeś swój adres "
+#~ "e-mail,\n"
+#~ "zostaniesz powiadomiony o zakończonej procedurze."
+
+#~ msgid "Correcting an exercise"
+#~ msgstr "Poprawianie ćwiczenia"
+
+#~ msgid ""
+#~ "Thank you for correcting and improving this exercise.\n"
+#~ "This is much appreciated!"
+#~ msgstr ""
+#~ "Dziękujemy za poprawienie i ulepszenie tego ćwiczenia!\n"
+#~ "Doceniamy twoją pomoc!"
+
+#~ msgid ""
+#~ "After you submit the form, the administrators will be notified.\n"
+#~ "Once the changes are reviewed the exercise will be updated."
+#~ msgstr ""
+#~ "Po wysłaniu formularza, powiadomieni zostaną administratorzy strony.\n"
+#~ "Gdy zmiany zostaną zaakceptowane, ćwiczenie zostanie zaktualizowane."
+
+#~ msgid "No categories."
+#~ msgstr "Brak kategorii."
+
+#~ msgid "Use link to create one"
+#~ msgstr "Skorzystaj z linka by stworzyć nowy"
+
+#~ msgid "Exercise is pending review"
+#~ msgstr "Ćwiczenie oczekuje na akceptację"
+
+#~ msgid ""
+#~ "This user submitted exercise is pending a decision to be\n"
+#~ " included in the database."
+#~ msgstr ""
+#~ "To ćwiczenie przesłane przez użytkownika czeka na\n"
+#~ "dodanie do bazy danych."
+
+#~ msgid "Till then, it will not be shown in the overview or the search."
+#~ msgstr "Do tego czasu, nie zostanie on wyświetlony w wynikach wyszukiwania."
+
+#~ msgid "Images"
+#~ msgstr "Obrazy"
+
+#~ msgid "Add new image"
+#~ msgstr "Dodaj nowy obraz"
+
+#~ msgid "Videos"
+#~ msgstr "Film"
+
+#~ msgid "Add new video"
+#~ msgstr "Dodaj nowy film"
+
+#~ msgid "Images pending review"
+#~ msgstr "Obrazy oczekujące na akceptację"
+
+#~ msgid "Comments for this exercise"
+#~ msgstr "Komentarze dla tego ćwiczenia"
+
+#~ msgid "Add new comment"
+#~ msgstr "Dodaj nowy komentarz"
+
+#~ msgid "The diagram shows the most used muscles on this exercise"
+#~ msgstr "Diagrm pokazuje najmocniej trenowane mięśnie w tym ćwiczeniu"
+
+#~ msgid "Exercise Variations"
+#~ msgstr "Opcje treningów"
+
+#~ msgid "Submit a correction"
+#~ msgstr "Zgłoś korektę"
+
+#~ msgid ""
+#~ "No exercises for this muscle. Add or edit an exercise and set the muscle."
+#~ msgstr ""
+#~ "Brak ćwiczeń dla tego mięśnia. Dodaj lub edytuj ćwiczenie i wybierz "
+#~ "mięsień."
+
+#~ msgid "Add exercise"
+#~ msgstr "Dodaj ćwiczenie"
+
+#~ msgid ""
+#~ "Thank you. Once the changes are reviewed the exercise will be updated."
+#~ msgstr ""
+#~ "Dziękujemy. Gdy zmiany zostaną zaakceptowane, ćwiczenie zostanie "
+#~ "zaktualizowane."
+
+#, python-brace-format
+#~ msgid "Correct {0}"
+#~ msgstr "Popraw {0}"
+
+#~ msgid "Exercise was successfully marked as rejected"
+#~ msgstr "Ćwiczenie zostało poprawnie oznaczone jako odrzucone"
+
+#~ msgid "Edit exercise image"
+#~ msgstr "Edytuj obraz ćwiczenia"
+
+#~ msgid "Delete exercise image?"
+#~ msgstr "Usunąć obraz ćwiczenia?"
+
+#, python-format
+#~ msgid "Edit log entry for %s"
+#~ msgstr "Edytuj wpis dla %s"
+
#~ msgid "Anterior deltoid"
#~ msgstr "Barki"
@@ -4454,10 +4500,6 @@ msgstr "Usuń wpis wagi dla %s"
#~ msgid "No filter"
#~ msgstr "Brak filta"
-#~ msgctxt "Noun, not verb"
-#~ msgid "Change"
-#~ msgstr "Zmień"
-
#~ msgid "Days"
#~ msgstr "Dni"
diff --git a/wger/locale/pt/LC_MESSAGES/django.po b/wger/locale/pt/LC_MESSAGES/django.po
index d8ca7adc7..a31b6575d 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: 2022-05-14 12:01+0200\n"
+"POT-Creation-Date: 2022-11-10 16:03+0100\n"
"PO-Revision-Date: 2022-08-07 23:18+0000\n"
"Last-Translator: Eduardo Menges Mattje <[email protected]>\n"
-"Language-Team: Portuguese <https://hosted.weblate.org/projects/wger/web/pt/>"
-"\n"
+"Language-Team: Portuguese <https://hosted.weblate.org/projects/wger/web/pt/"
+">\n"
"Language: pt\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -39,107 +39,8 @@ msgstr ""
"Selecione a academia principal para essa instalação. Isto atribuirá todos os "
"novos utilizadores registados e os utilizadores sem academia à essa academia."
-#: 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 "Exercícios"
-
-#: config/models/language_config.py:42
-msgid "Ingredients"
-msgstr "Ingredientes"
-
-#: config/templates/language/overview.html:4 core/templates/navigation.html:226
-msgid "Languages"
-msgstr "Idiomas"
-
-#: config/templates/language/overview.html:16
-msgid "Nothing found."
-msgstr "Não encontrado."
-
-#: 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:150
-#: nutrition/templates/plan/view.html:153
-#: nutrition/templates/plan/view.html:191
-msgid "Add one now."
-msgstr "Adicionar um agora."
-
-#: config/templates/language/overview.html:29
-#: core/templates/license/list.html:38 core/templates/misc/license/list.html:41
-#: core/templates/repetition_unit/list.html:41
-#: core/templates/user/overview.html:327 core/templates/user/overview.html:366
-#: core/templates/user/overview.html:402
-#: core/templates/weight_unit/list.html:41 core/views/languages.py:73
-#: core/views/license.py:65 core/views/repetition_units.py:65
-#: core/views/weight_units.py:65
-#: exercises/templates/categories/admin-overview.html:36
-#: 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:61
-msgid "Add"
-msgstr "Adicionar"
-
-#: config/templates/language/view.html:21 core/models/language.py:29
-msgid "Language short name"
-msgstr "Abreviação do idioma"
-
-#: config/templates/language/view.html:22
-#: config/templates/language/view.html:43 core/models/language.py:32
-msgid "Language full name"
-msgstr "Nome completo idioma"
-
-#: config/templates/language/view.html:34 core/templates/user/overview.html:451
-#: gym/views/admin_config.py:44 gym/views/admin_config.py:58
-#: gym/views/user_config.py:46
-msgid "Configuration"
-msgstr "Configuração"
-
-#: config/templates/language/view.html:35
-msgid ""
-"Use the configuration to select in what languages the\n"
-"exercises and ingredients will be shown for the current language (for "
-"example\n"
-"the exercises should be shown in languages A, B and C; the ingredients only\n"
-"in A)."
-msgstr ""
-"Use a configuração para selecionar em qual idioma os\n"
-"exercícios e ingredientes serão mostrados para o idioma atual (por exemplo,\n"
-"os exercícios devem ser mostrados nas linguagens A, B, C; os ingredientes "
-"somente\n"
-"no A)."
-
-#: config/templates/language/view.html:44 gym/templates/contract/list.html:36
-msgid "Show"
-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: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:45
-msgid "Options"
-msgstr "Opções"
-
-#: config/templates/language/view.html:96 config/views/gym_config.py:41
-#: config/views/language_config.py:49 core/templates/license/list.html:16
-#: core/templates/misc/license/list.html:17
+#: config/views/gym_config.py:41 core/templates/language/view.html:57
+#: 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:39
#: core/templates/tags/render_day.html:75 core/templates/user/overview.html:205
@@ -147,12 +48,10 @@ 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:230
-#: exercises/templates/exercise/view.html:351
#: exercises/templates/muscles/admin-overview.html:16
-#: 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
+#: 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
#: 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,81 +67,54 @@ msgstr "Opções"
msgid "Edit"
msgstr "Editar"
-#: 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: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: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
-#: gym/templates/contract_type/list.html:39 gym/templates/document/list.html:46
-#: gym/templates/gym/list.html:20 manager/templates/calendar/day.html:69
-#: 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:231
-#: 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:132
-#: nutrition/templates/units/list.html:20
-msgid "Delete"
-msgstr "Remover"
-
-#: core/demo.py:86
+#: core/demo.py:95
msgid "Sample workout"
msgstr "Treino de exemplo"
-#: core/demo.py:90
+#: core/demo.py:99
msgid "Sample day"
msgstr "Dia de exemplo"
-#: core/demo.py:94
+#: core/demo.py:103
msgid "Another sample day"
msgstr "Outro dia de exemplo"
-#: core/demo.py:217
-msgid "Sample nutrional plan"
+#: core/demo.py:211
+#, fuzzy
+#| msgid "Sample nutrional plan"
+msgid "Sample nutritional plan"
msgstr "Exemplo de plano nutricional"
-#: core/demo.py:349 core/demo.py:351 core/demo.py:353
+#: core/demo.py:343 core/demo.py:345 core/demo.py:347
#, python-brace-format
msgid "Placeholder workout nr {0} for schedule"
msgstr "Espaço reservado para treino nº {0} para agendamento"
-#: core/demo.py:358
+#: core/demo.py:352
msgid "My cool workout schedule"
msgstr "Minha agenda de treino"
-#: core/demo.py:397 core/demo.py:412
+#: core/demo.py:391 core/demo.py:406
msgid "Empty placeholder schedule"
msgstr "Agenda de espaço reservado vazia"
-#: core/forms.py:61 core/templates/navigation.html:188
-#: core/templates/navigation.html:192 core/templates/user/login.html:4
+#: core/forms.py:64 core/templates/navigation.html:179
+#: core/templates/navigation.html:183 core/templates/user/login.html:4
#: software/templates/features.html:43
msgid "Login"
msgstr "Login"
-#: core/forms.py:73 core/forms.py:164 gym/views/export.py:63
+#: core/forms.py:76 core/forms.py:177 gym/views/export.py:63
#: gym/views/gym.py:218
msgid "First name"
msgstr "Primeiro nome"
-#: core/forms.py:74 core/forms.py:165 core/templates/user/overview.html:267
+#: core/forms.py:77 core/forms.py:178 core/templates/user/overview.html:267
#: gym/views/export.py:64 gym/views/gym.py:218
msgid "Last name"
msgstr "Último nome"
-#: core/forms.py:76 core/forms.py:131 core/templates/user/overview.html:271
+#: core/forms.py:79 core/forms.py:144 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
@@ -252,77 +124,107 @@ msgstr "Último nome"
msgid "Email"
msgstr "Email"
-#: core/forms.py:77
+#: core/forms.py:80
msgid "Used for password resets and, optionally, e-mail reminders."
msgstr ""
"Usado para redefinições de senha e, opcionalmente, lembretes por e-mail."
-#: core/forms.py:102
+#: core/forms.py:84 core/models/profile.py:220
+#: gym/templates/gym/new_user.html:38
+msgid "Date of Birth"
+msgstr "Data de Nascimento"
+
+#: core/forms.py:116
msgid "Personal data"
msgstr "Dados pessoais"
-#: core/forms.py:110
+#: core/forms.py:124
msgid "Workout reminders"
msgstr "Lembretes de treino"
-#: core/forms.py:117
+#: core/forms.py:131
msgid "Other settings"
msgstr "Outras configurações"
-#: 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
+#: core/forms.py:138 core/views/user.py:615 core/views/user.py:630
+#: core/views/user.py:642 gym/forms.py:72 manager/templates/log/add.html:65
+#: manager/templates/set/add.html:69 manager/views/workout.py:222
+#: utils/generic_views.py:143
msgid "Save"
msgstr "Salvar"
-#: core/forms.py:132
+#: core/forms.py:145
msgid "Used for password resets and, optionally, email reminders."
msgstr ""
"Usado para redefinições de senha e, opcionalmente, lembretes por e-mail."
-#: core/forms.py:160
+#: core/forms.py:173
msgid "This e-mail address is already in use."
msgstr "Este endereço de e-mail já está sendo usado."
-#: core/forms.py:180 gym/templates/gym/new_user.html:26
+#: core/forms.py:193 gym/templates/gym/new_user.html:26
#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:218
msgid "Password"
msgstr "Senha"
-#: core/forms.py:182
+#: core/forms.py:195
msgid "Please enter your current password."
msgstr "Por favor informe a sua senha atual."
-#: core/forms.py:200
+#: core/forms.py:204 core/templates/language/view.html:62
+#: 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: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/muscles/admin-overview.html:17
+#: gym/templates/admin_notes/list.html:40
+#: gym/templates/contract_option/list.html:39
+#: gym/templates/contract_type/list.html:39 gym/templates/document/list.html:46
+#: gym/templates/gym/list.html:20 manager/templates/calendar/day.html:69
+#: 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:231
+#: 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:132
+#: nutrition/templates/units/list.html:20
+msgid "Delete"
+msgstr "Remover"
+
+#: core/forms.py:213
msgid "Invalid password"
msgstr "Senha inválida"
-#: core/forms.py:212 core/forms.py:278
+#: core/forms.py:225 core/forms.py:291
msgid "The form is secured with reCAPTCHA"
msgstr "O formulário está seguro com o reCAPTCHA"
-#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:188
-#: core/templates/navigation.html:193 core/templates/template.html:149
-#: core/templates/user/login.html:20 core/views/user.py:293
+#: core/forms.py:239 core/forms.py:258 core/templates/navigation.html:179
+#: core/templates/navigation.html:184 core/templates/template.html:149
+#: core/templates/user/login.html:20 core/views/user.py:300
#: software/templates/features.html:38
msgid "Register"
msgstr "Cadastro"
-#: core/forms.py:256
+#: core/forms.py:269
msgid "Contact"
msgstr "Contato"
-#: core/forms.py:257
+#: core/forms.py:270
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:71
+#: core/forms.py:278 exercises/models/comment.py:42 manager/models/set.py:60
+#: manager/models/setting.py:111 nutrition/models/log.py:71
msgid "Comment"
msgstr "Comentário"
-#: core/forms.py:266
+#: core/forms.py:279
msgid "What do you want to say?"
msgstr "O que você quer dizer?"
@@ -330,6 +232,14 @@ msgstr "O que você quer dizer?"
msgid "Day of the week"
msgstr "Dia da semana"
+#: core/models/language.py:31 core/templates/language/view.html:21
+msgid "Language short name"
+msgstr "Abreviação do idioma"
+
+#: core/models/language.py:36 core/templates/language/view.html:22
+msgid "Language full name"
+msgstr "Nome completo idioma"
+
#: core/models/license.py:29
msgid "Full name"
msgstr "Nome completo"
@@ -387,20 +297,20 @@ msgstr "Métrico (kg)"
msgid "Imperial (pound)"
msgstr "Imperial (lb)"
-#: core/models/profile.py:111
+#: core/models/profile.py:114
msgid "Show exercise comments"
msgstr "Mostrar comentários do exercício"
-#: core/models/profile.py:112
+#: core/models/profile.py:115
msgid "Check to show exercise comments on the workout view"
msgstr ""
"Marque para mostrar os comentários do exercício na visualização do treino"
-#: core/models/profile.py:123
+#: core/models/profile.py:126
msgid "Also use ingredients in English"
msgstr "Também use ingredientes em Inglês"
-#: core/models/profile.py:125
+#: core/models/profile.py:128
msgid ""
"Check to also show ingredients in English while creating\n"
"a nutritional plan. These ingredients are extracted from a list provided\n"
@@ -413,11 +323,11 @@ msgstr ""
"extremamente completa, com aproximadamente 7000 itens, mas pode ser um pouco "
"grande e torna a pesquisa complicada."
-#: core/models/profile.py:134
+#: core/models/profile.py:137
msgid "Activate workout reminders"
msgstr "Lembretes de treino ativo"
-#: core/models/profile.py:136
+#: core/models/profile.py:139
msgid ""
"Check to activate automatic reminders for workouts. You need to provide a "
"valid email for this to work."
@@ -425,20 +335,20 @@ msgstr ""
"Marque para ativar automaticamente os lembretes de treino. Você precisa "
"fornecer um e-mail válido para que isso funcione."
-#: core/models/profile.py:145
+#: core/models/profile.py:148
msgid "Remind before expiration"
msgstr "Lembrar antes do vencimento"
-#: core/models/profile.py:146
+#: core/models/profile.py:149
msgid "The number of days you want to be reminded before a workout expires."
msgstr ""
"O número de dias que você deseja ser lembrado antes que o treino expire."
-#: core/models/profile.py:152
+#: core/models/profile.py:155
msgid "Default duration of workouts"
msgstr "Duração padrão do treino"
-#: core/models/profile.py:154
+#: core/models/profile.py:157
msgid ""
"Default duration in weeks of workouts not in a schedule. Used for email "
"workout reminders."
@@ -446,11 +356,11 @@ msgstr ""
"Duração padrão em semanas dos treinos não agendados. Usado para enviar e-"
"mail de aviso de treino."
-#: core/models/profile.py:171
+#: core/models/profile.py:174
msgid "Notification language"
msgstr "Notificação de idioma"
-#: core/models/profile.py:173
+#: core/models/profile.py:176
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."
@@ -458,70 +368,70 @@ msgstr ""
"Idioma usado durante o envio de e-mail de notificação, por exemplo, e-mail "
"de lembrete de treinos. Isso não afeta o idioma usado no site."
-#: core/models/profile.py:186 gym/views/export.py:66
+#: core/models/profile.py:212 gym/views/export.py:66
msgid "Age"
msgstr "Idade"
-#: core/models/profile.py:202 nutrition/forms.py:99
+#: core/models/profile.py:228 nutrition/forms.py:100
msgid "Height (cm)"
msgstr "Altura (cm)"
-#: core/models/profile.py:219
+#: core/models/profile.py:245
msgid "Hours of sleep"
msgstr "Horas de sono"
-#: core/models/profile.py:220
+#: core/models/profile.py:246
msgid "The average hours of sleep per day"
msgstr "Média de horas dormidas por dia"
-#: core/models/profile.py:229
+#: core/models/profile.py:255
msgid "Work"
msgstr "Trabalho"
-#: core/models/profile.py:230 core/models/profile.py:272
+#: core/models/profile.py:256 core/models/profile.py:298
msgid "Average hours per day"
msgstr "Média de horas por dia"
-#: core/models/profile.py:239 core/models/profile.py:260
-#: core/models/profile.py:281
+#: core/models/profile.py:265 core/models/profile.py:286
+#: core/models/profile.py:307
msgid "Physical intensity"
msgstr "Intensidade física"
-#: core/models/profile.py:240 core/models/profile.py:261
-#: core/models/profile.py:282
+#: core/models/profile.py:266 core/models/profile.py:287
+#: core/models/profile.py:308
msgid "Approximately"
msgstr "Aproximadamente"
-#: core/models/profile.py:250
+#: core/models/profile.py:276
msgid "Sport"
msgstr "Esporte"
-#: core/models/profile.py:251
+#: core/models/profile.py:277
msgid "Average hours per week"
msgstr "Média de horas por semana"
-#: core/models/profile.py:271
+#: core/models/profile.py:297
msgid "Free time"
msgstr "Tempo livre"
-#: core/models/profile.py:292 nutrition/templates/rate/form.html:66
+#: core/models/profile.py:318 nutrition/templates/rate/form.html:66
msgid "Total daily calories"
msgstr "Total calorias diária"
-#: core/models/profile.py:293
+#: core/models/profile.py:319
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
+#: core/models/profile.py:331 nutrition/models/ingredient_weight_unit.py:45
#: nutrition/models/log.py:90 nutrition/models/meal_item.py:58
msgid "Weight unit"
msgstr "Unidade de peso"
-#: core/models/profile.py:313
+#: core/models/profile.py:339
msgid "Allow external access"
msgstr "Permite acesso externo"
-#: core/models/profile.py:315
+#: core/models/profile.py:341
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."
@@ -529,23 +439,22 @@ msgstr ""
"Permite acesso externo de leitura aos treinos e logs. Você precisa ligar "
"para poder compartilhar links."
-#: core/models/profile.py:324
+#: core/models/profile.py:350
msgid "Automatic reminders for weight entries"
msgstr "Lembretes automáticos para entradas de peso"
-#: core/models/profile.py:326
+#: core/models/profile.py:352
msgid "Number of days after the last weight entry (enter 0 to deactivate)"
msgstr "Número de dias após o último peso digitado (0 para desativar)"
-#: core/models/profile.py:392
+#: core/models/profile.py:418
msgid "The sum of all hours has to be 24"
msgstr "A soma de todas as horas deve ser 24"
#: core/models/rep_unit.py:35 core/models/weight_unit.py:35
-#: core/templates/user/overview.html:263 core/views/user.py:575
+#: core/templates/user/overview.html:263 core/views/user.py:591
#: 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
+#: exercises/models/exercise.py:64 exercises/models/muscle.py:36
#: 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
@@ -609,6 +518,53 @@ msgid "Are you sure you want to delete this? This action cannot be undone."
msgstr ""
"Você tem certeza que quer remover isto? Esta ação não pode ser desfeita."
+#: core/templates/email_verification/confirm_template.html:4
+msgid "Email verified"
+msgstr ""
+
+#: core/templates/email_verification/confirm_template.html:18
+#, python-format
+msgid "%(username)s, your email was verified"
+msgstr ""
+
+#: core/templates/email_verification/confirm_template.html:22
+msgid "Error, invalid verification token"
+msgstr ""
+
+#: core/templates/email_verification/email_body_html.tpl:6
+#, fuzzy
+#| msgid "Configuration"
+msgid "Email Confirmation"
+msgstr "Configuração"
+
+#: core/templates/email_verification/email_body_html.tpl:9
+#: core/templates/email_verification/email_body_txt.tpl:3
+#, fuzzy, python-format
+#| msgid "Calendar for %(username)s"
+msgid "You are almost there, %(username)s!"
+msgstr "Calendário de %(username)s"
+
+#: core/templates/email_verification/email_body_html.tpl:11
+#, python-format
+msgid "Please click <a href=\"%(link)s\">here</a> to confirm your email"
+msgstr ""
+
+#: core/templates/email_verification/email_body_html.tpl:12
+#: core/templates/email_verification/email_body_txt.tpl:5
+#, python-format
+msgid "The token expires on %(time)s"
+msgstr ""
+
+#: core/templates/email_verification/email_body_html.tpl:14
+#: core/templates/email_verification/email_body_txt.tpl:8
+msgid "the wger Team"
+msgstr ""
+
+#: core/templates/email_verification/email_body_txt.tpl:4
+#, python-format
+msgid "Please click the following link to confirm your email: %(link)s"
+msgstr ""
+
#: core/templates/index.html:4
msgid "Dashboard"
msgstr "Painel"
@@ -670,7 +626,7 @@ msgid "Add custom diary entry"
msgstr "Adicionar entrada de diário personalizada"
#: core/templates/index.html:84 core/templates/index.html:92
-#: manager/models/day.py:34 manager/models/log.py:56
+#: manager/models/day.py:34 manager/models/log.py:58
#: manager/models/session.py:60 manager/models/workout.py:109
#: manager/templates/schedule/view.html:105
#: manager/templates/workout/view.html:11
@@ -703,6 +659,20 @@ msgstr "Adicionar um novo registro"
msgid "No workouts found."
msgstr "Nenhum treino encontrado."
+#: core/templates/index.html:137 core/templates/index.html:189
+#: core/templates/language/overview.html:23
+#: 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:150
+#: nutrition/templates/plan/view.html:153
+#: nutrition/templates/plan/view.html:191
+msgid "Add one now."
+msgstr "Adicionar um agora."
+
#: 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
@@ -756,19 +726,59 @@ msgid "No nutrition plans."
msgstr "Nenhum plano de nutrição."
#: 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
+#: core/templates/user/overview.html:121 manager/forms.py:184
+#: manager/helpers.py:89 manager/models/log.py:86 manager/models/setting.py:79
+#: manager/templates/log/add.html:54 manager/templates/set/formset.html:11
#: weight/models.py:34 weight/templates/import_csv_preview.html:14
#: weight/templates/import_csv_preview.html:43 weight/views.py:150
msgid "Weight"
msgstr "Peso"
-#: core/templates/index.html:210 core/templates/navigation.html:135
+#: core/templates/index.html:210 core/templates/navigation.html:126
#: weight/views.py:70
msgid "Add weight entry"
msgstr "Adicionar uma entrada para peso"
+#: core/templates/language/overview.html:4 core/templates/navigation.html:217
+msgid "Languages"
+msgstr "Idiomas"
+
+#: core/templates/language/overview.html:23
+msgid "Nothing found."
+msgstr "Não encontrado."
+
+#: core/templates/language/overview.html:36 core/templates/license/list.html:38
+#: core/templates/misc/license/list.html:41
+#: core/templates/repetition_unit/list.html:41
+#: core/templates/user/overview.html:327 core/templates/user/overview.html:366
+#: core/templates/user/overview.html:402
+#: core/templates/weight_unit/list.html:41 core/views/languages.py:73
+#: core/views/license.py:65 core/views/repetition_units.py:65
+#: core/views/weight_units.py:65
+#: exercises/templates/categories/admin-overview.html:36
+#: 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:61
+msgid "Add"
+msgstr "Adicionar"
+
+#: core/templates/language/view.html:52 core/templates/user/api_key.html:44
+#: core/templates/user/preferences.html:44 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:45
+msgid "Options"
+msgstr "Opções"
+
#: core/templates/license/list.html:4 core/templates/misc/license/list.html:4
msgid "License list"
msgstr "Lista de licença"
@@ -781,7 +791,6 @@ msgstr "Lista de licença"
#: core/templates/weight_unit/list.html:26
#: exercises/templates/categories/admin-overview.html:24
#: exercises/templates/equipment/admin-overview.html:24
-#: exercises/templates/exercise/pending.html:30
#: exercises/templates/muscles/admin-overview.html:24
#: gym/templates/admin_notes/list.html:52 gym/templates/contract/list.html:60
#: gym/templates/contract_option/list.html:56
@@ -863,155 +872,135 @@ msgstr "Seus modelos"
msgid "Public templates"
msgstr "Modelos públicos"
-#: core/templates/navigation.html:64
-msgctxt "as in sorted by category"
-msgid "by category"
-msgstr "por categoria"
-
-#: core/templates/navigation.html:65
-msgctxt "as in sorted by muscle"
-msgid "by muscle"
-msgstr "pelo músculo"
-
-#: core/templates/navigation.html:66
-msgctxt "as in sorted by equipment"
-msgid "by equipment"
-msgstr "por equipamento"
+#: core/templates/navigation.html:63 manager/forms.py:133
+#: manager/models/setting.py:54
+msgid "Exercises"
+msgstr "Exercícios"
-#: core/templates/navigation.html:70
-#: exercises/templates/equipment/overview.html:109
-#: exercises/templates/equipment/overview.html:113
-#: exercises/templates/exercise/overview.html:112
-#: exercises/templates/exercise/overview.html:116
-#: exercises/templates/muscles/overview.html:112
-#: exercises/templates/muscles/overview.html:116
-msgid "Add new exercise"
-msgstr "adicionar novo exercício"
-
-#: core/templates/navigation.html:75 core/templates/navigation.html:116
-#: core/templates/navigation.html:224
+#: core/templates/navigation.html:67 core/templates/navigation.html:107
+#: core/templates/navigation.html:215
msgid "Administration"
msgstr "Administração"
-#: core/templates/navigation.html:76
-#: exercises/templates/exercise/pending.html:6
-msgid "Exercises pending review"
-msgstr "Exercícios com revisão pendente"
+#: core/templates/navigation.html:68
+#, fuzzy
+#| msgid "Exercise day"
+msgid "Exercise edit history"
+msgstr "Dia do exercício"
-#: core/templates/navigation.html:77 exercises/models/base.py:72
-#: exercises/templates/exercise/view.html:80
+#: core/templates/navigation.html:69 exercises/models/base.py:84
msgid "Equipment"
msgstr "Equipamento"
-#: core/templates/navigation.html:78 exercises/templates/exercise/view.html:258
+#: core/templates/navigation.html:70
msgid "Muscles"
msgstr "Músculos"
-#: core/templates/navigation.html:79
+#: core/templates/navigation.html:71
#: exercises/templates/categories/admin-overview.html:4
msgid "Categories"
msgstr "Categorias"
-#: core/templates/navigation.html:93 software/templates/features.html:87
+#: core/templates/navigation.html:84 software/templates/features.html:87
msgid "Nutrition"
msgstr "Nutrição"
-#: core/templates/navigation.html:99 core/templates/user/overview.html:144
+#: core/templates/navigation.html:90 core/templates/user/overview.html:144
msgid "Nutrition plans"
msgstr "Planos de nutrição"
-#: core/templates/navigation.html:105 nutrition/templates/bmi/form.html:50
+#: core/templates/navigation.html:96 nutrition/templates/bmi/form.html:50
msgid "BMI calculator"
msgstr "Calculadora IMC"
-#: core/templates/navigation.html:111 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:102 nutrition/templates/rate/form.html:17
msgid "Daily calories calculator"
msgstr "Calculador de calorias diárias"
-#: core/templates/navigation.html:113
+#: core/templates/navigation.html:104
#: nutrition/templates/ingredient/overview.html:29
msgid "Ingredient overview"
msgstr "Visão geral do ingrediente"
-#: core/templates/navigation.html:117 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:108 nutrition/templates/units/list.html:6
msgid "Ingredient weight units"
msgstr "Unidade de peso dos ingredientes"
-#: core/templates/navigation.html:118
+#: core/templates/navigation.html:109
#: nutrition/templates/ingredient/pending.html:6
msgid "Ingredients pending review"
msgstr "Ingredientes pendendo revisão"
-#: core/templates/navigation.html:132
+#: core/templates/navigation.html:123
msgid "Body weight"
msgstr "Peso Corporal"
-#: core/templates/navigation.html:134 core/templates/user/overview.html:114
+#: core/templates/navigation.html:125 core/templates/user/overview.html:114
#: weight/templates/overview.html:7
msgid "Weight overview"
msgstr "Visão geral do peso"
-#: core/templates/navigation.html:147
+#: core/templates/navigation.html:138
msgid "About this software"
msgstr "Sobre este software"
-#: core/templates/navigation.html:149 core/templates/template_features.html:82
+#: core/templates/navigation.html:140 core/templates/template_features.html:82
#: software/templates/about_us.html:5
msgid "About us"
msgstr "Sobre nós"
-#: core/templates/navigation.html:151 software/templates/features.html:209
+#: core/templates/navigation.html:142 software/templates/features.html:209
msgid "REST API"
msgstr "API REST"
-#: core/templates/navigation.html:155 utils/models.py:40
+#: core/templates/navigation.html:146 utils/models.py:41
msgid "License"
msgstr "Licença"
-#: core/templates/navigation.html:161
+#: core/templates/navigation.html:152
msgid "Developer documentation"
msgstr "Documentação do desenvolvedor"
-#: core/templates/navigation.html:167
+#: core/templates/navigation.html:158
msgid "Get the code"
msgstr "Obtenha o código fonte"
-#: core/templates/navigation.html:173 core/templates/template.html:204
+#: core/templates/navigation.html:164 core/templates/template.html:203
#: core/templates/template_features.html:99
msgid "Translate"
msgstr "Traduzir"
-#: core/templates/navigation.html:194 core/templates/user/login.html:28
+#: core/templates/navigation.html:185 core/templates/user/login.html:28
msgid "Reset password"
msgstr "Redefinr a senha"
-#: core/templates/navigation.html:207
+#: core/templates/navigation.html:198
msgid "My preferences"
msgstr "Minhas preferências"
-#: core/templates/navigation.html:214
+#: core/templates/navigation.html:205
msgid "Logout"
msgstr "Sair"
-#: core/templates/navigation.html:229
+#: core/templates/navigation.html:220
msgid "Licenses"
msgstr "Licenças"
-#: core/templates/navigation.html:232
+#: core/templates/navigation.html:223
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr "Unidades de repetição"
-#: core/templates/navigation.html:235 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:226 core/templates/weight_unit/list.html:4
#: nutrition/templates/ingredient/view.html:174
msgid "Weight units"
msgstr "Unidade de peso"
-#: core/templates/navigation.html:238 core/templates/user/list.html:4
+#: core/templates/navigation.html:229 core/templates/user/list.html:4
msgid "User list"
msgstr "Lista de utilizadores"
-#: core/templates/navigation.html:239
+#: core/templates/navigation.html:230
msgid "Gyms"
msgstr "Academias"
@@ -1091,33 +1080,30 @@ msgstr "Próximo"
msgid "Add weight log"
msgstr "Adicionar registro de peso"
-#: core/templates/tags/render_day.html:114
-#: exercises/templates/equipment/overview.html:59
-#: exercises/templates/exercise/overview.html:63
-#: exercises/templates/muscles/overview.html:65
+#: core/templates/tags/render_day.html:116
msgid "Placeholder image for exercise"
msgstr "Espaço reservado para imagem do exercício"
-#: core/templates/tags/render_day.html:131
+#: core/templates/tags/render_day.html:133
msgid "This exercise has no repetitions."
msgstr "Este exercício não possui repetições."
-#: core/templates/tags/render_day.html:134
+#: core/templates/tags/render_day.html:136
msgid "Edit them now."
msgstr "Edite-os agora."
-#: core/templates/tags/render_day.html:159
+#: core/templates/tags/render_day.html:162
msgid "Add exercises to this workout day"
msgstr "Adicione exercícios para este dia de treino"
#: core/templates/tags/render_weight_log.html:17 manager/helpers.py:89
-#: manager/models/setting.py:57 manager/templates/set/formset.html:10
+#: manager/models/setting.py:69 manager/templates/set/formset.html:9
msgid "Reps"
msgstr "Repetições"
-#: 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
+#: core/templates/tags/render_weight_log.html:30 manager/forms.py:189
+#: manager/models/log.py:103 manager/models/setting.py:99
+#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
msgid "RiR"
msgstr "ReR"
@@ -1142,7 +1128,7 @@ msgstr "Termos de uso"
msgid "Features"
msgstr "Funcionalidades"
-#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:37
+#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:53
msgid "API key"
msgstr "API key"
@@ -1188,11 +1174,12 @@ msgid "Documentation"
msgstr "Documentação"
#: core/templates/user/delete_account.html:4
-#: core/templates/user/preferences.html:42
+#: core/templates/user/preferences.html:58
msgid "Delete account"
msgstr "Apagar conta"
#: core/templates/user/delete_account.html:17
+#: exercises/templates/history/overview.html:93
msgid "Are you sure?"
msgstr "Você tem certeza?"
@@ -1241,11 +1228,12 @@ msgstr "Adicionar treino"
#: core/templates/user/overview.html:34 core/templates/user/overview.html:76
#: core/templates/user/overview.html:120 core/templates/user/overview.html: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
-#: 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
+#: exercises/models/base.py:99 exercises/models/base.py:104
+#: exercises/models/exercise.py:69 exercises/models/exercise.py:76
+#: gallery/models/image.py:47 manager/helpers.py:88 manager/models/log.py:100
+#: 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/views.py:150
@@ -1253,11 +1241,11 @@ msgid "Date"
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: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
+#: exercises/models/exercise.py:57 exercises/views/exercises.py:123
+#: 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 "descrição"
@@ -1265,12 +1253,12 @@ msgstr "descrição"
msgid "Number of logs (days)"
msgstr "Número de registros (dias)"
-#: core/templates/user/overview.html:37 core/views/user.py:576
+#: core/templates/user/overview.html:37 core/views/user.py:592
#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:157
msgid "Last activity"
msgstr "Última atividade"
-#: core/templates/user/overview.html:68 manager/forms.py:267
+#: core/templates/user/overview.html:68 manager/forms.py:278
#: manager/templates/workout/view.html:151
msgid "Log"
msgstr "Log"
@@ -1288,6 +1276,7 @@ msgid "Notes"
msgstr "Notas"
#: core/templates/user/overview.html:79
+#: exercises/templates/history/overview.html:30
#: manager/templates/calendar/partial_overview_table.html:42
#: nutrition/templates/log/detail.html:154
msgid "Time"
@@ -1335,10 +1324,12 @@ msgid "Do you really want to change this user&#39;s password?"
msgstr "Você realmente deseja alterar a senha deste utilizador&#39; ?"
#: core/templates/user/overview.html:233
+#: exercises/templates/history/overview.html:106
msgid "No"
msgstr "Não"
#: core/templates/user/overview.html:234
+#: exercises/templates/history/overview.html:99
msgid "Yes"
msgstr "Sim"
@@ -1393,10 +1384,15 @@ msgid "Documents"
msgstr "Documentos"
#: core/templates/user/overview.html:413 gym/templates/document/list.html:32
-#: manager/forms.py:279 manager/templates/workout/view.html:176
+#: manager/forms.py:290 manager/templates/workout/view.html:176
msgid "Download"
msgstr "Descarregar"
+#: core/templates/user/overview.html:451 gym/views/admin_config.py:44
+#: gym/views/admin_config.py:58 gym/views/user_config.py:46
+msgid "Configuration"
+msgstr "Configuração"
+
#: core/templates/user/overview.html:454 gym/models/user_config.py:92
msgid "Include in inactive overview"
msgstr "Incluir na visão geral inativa"
@@ -1415,7 +1411,25 @@ msgstr "Logado como este utilizador"
msgid "Preferences"
msgstr "Preferências"
-#: core/templates/user/preferences.html:33 core/views/user.py:587
+#: core/templates/user/preferences.html:19
+#, fuzzy
+#| msgid "Send emails"
+msgid "Verified email"
+msgstr "Enviar e-mails"
+
+#: core/templates/user/preferences.html:24
+msgid "Unverified email"
+msgstr ""
+
+#: core/templates/user/preferences.html:26
+msgid "Send verification email"
+msgstr ""
+
+#: core/templates/user/preferences.html:30
+msgid "You need to verify your email to contribute exercises"
+msgstr ""
+
+#: core/templates/user/preferences.html:49 core/views/user.py:603
msgid "Change password"
msgstr "Mudar senha"
@@ -1445,39 +1459,37 @@ msgid "oz"
msgstr "oz"
#: 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
+#: exercises/views/equipment.py:104 exercises/views/exercises.py:185
+#: exercises/views/muscles.py:99 manager/views/schedule.py:311
+#: manager/views/schedule_step.py:129 manager/views/workout.py:269
+#: manager/views/workout_session.py:141 nutrition/views/ingredient.py:138
#: 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:431
-#: exercises/views/muscles.py:125 gallery/views/images.py:121
+#: exercises/views/categories.py:127 exercises/views/exercises.py:193
+#: exercises/views/muscles.py:106 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
+#: manager/views/workout.py:273 manager/views/workout_session.py:156
+#: nutrition/views/ingredient.py:145 nutrition/views/plan.py:127
#: nutrition/views/unit.py:118
#, python-brace-format
msgid "Delete {0}?"
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/repetition_units.py:85 core/views/user.py:472
#: 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: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
+#: exercises/views/equipment.py:81 exercises/views/muscles.py:86
+#: 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:170
+#: gym/views/gym.py:459 manager/views/day.py:100 manager/views/schedule.py:335
+#: manager/views/workout.py:287 nutrition/views/ingredient.py:164
+#: nutrition/views/plan.py:144 nutrition/views/unit.py:144
#, python-brace-format
msgid "Edit {0}"
msgstr "Editar {0}"
@@ -1508,64 +1520,65 @@ msgstr "Submeter"
msgid "Your feedback was successfully sent. Thank you!"
msgstr "O seu feedback foi enviado com sucesso. Obrigado!"
-#: core/views/user.py:156
+#: core/views/user.py:157
#, python-brace-format
msgid "Account \"{0}\" was successfully deleted"
msgstr "Conta \"{0}\" deletada com sucesso"
-#: core/views/user.py:287
+#: core/views/user.py:294
msgid "You were successfully registered"
msgstr "Você foi registrado com sucesso"
-#: core/views/user.py:339
+#: core/views/user.py:355
msgid "Settings successfully updated"
msgstr "Configurações atualizadas com sucesso"
-#: core/views/user.py:376
+#: core/views/user.py:392
msgid "The user was successfully deactivated"
msgstr "O utilizador foi desativado com sucesso"
-#: core/views/user.py:411
+#: core/views/user.py:427
msgid "The user was successfully activated"
msgstr "O utilizador foi ativado com sucesso"
-#: core/views/user.py:426
+#: core/views/user.py:442
msgid "Edit user"
msgstr "Editar utilizador"
-#: core/views/user.py:573 gym/templates/gym/member_list.html:26
+#: core/views/user.py:589 gym/templates/gym/member_list.html:26
#: gym/views/gym.py:156
msgid "ID"
msgstr "Identificação"
-#: core/views/user.py:574 gym/forms.py:94 gym/templates/contract/view.html:55
+#: core/views/user.py:590 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 "utilizador"
-#: core/views/user.py:577 gym/templates/gym/new_user.html:34
+#: core/views/user.py:593 gym/templates/gym/new_user.html:34
#: gym/views/export.py:60 gym/views/gym.py:218
msgid "Gym"
msgstr "Academia"
-#: exercises/models/base.py:51 exercises/templates/exercise/view.html:76
-#: nutrition/models/ingredient.py:204
+#: core/views/user.py:652
+#, python-format
+msgid "A verification email was sent to %(email)s"
+msgstr ""
+
+#: exercises/models/base.py:63 nutrition/models/ingredient.py:204
msgid "Category"
msgstr "Categoria"
-#: exercises/models/base.py:58
+#: exercises/models/base.py:70
msgid "Primary muscles"
msgstr "Músculos primários"
-#: exercises/models/base.py:64 exercises/templates/equipment/overview.html:71
-#: exercises/templates/exercise/overview.html:76
-#: exercises/templates/exercise/view.html:268
-#: exercises/templates/muscles/overview.html:77
+#: exercises/models/base.py:76
msgid "Secondary muscles"
msgstr "Músculos secundários"
-#: exercises/models/base.py:79
+#: exercises/models/base.py:91
msgid "Variations"
msgstr "Variações"
@@ -1573,71 +1586,58 @@ msgstr "Variações"
msgid "Exercise Categories"
msgstr "Categorias de exercício"
-#: exercises/models/comment.py:34 exercises/models/exercise_alias.py:32
-#: exercises/models/image.py:75 exercises/models/video.py:82
-#: manager/forms.py:165 manager/helpers.py:89 manager/models/log.py:51
+#: exercises/models/comment.py:37 exercises/models/exercise_alias.py:35
+#: exercises/models/image.py:71 exercises/models/video.py:95
+#: manager/forms.py:176 manager/helpers.py:89 manager/models/log.py:52
msgid "Exercise"
msgstr "Exercício"
-#: exercises/models/comment.py:41
+#: exercises/models/comment.py:43
msgid "A comment about how to correctly do this exercise."
msgstr "Um comentário sobre como executar corretamente este exercício."
-#: exercises/models/exercise.py:86 nutrition/models/ingredient.py:80
+#: exercises/models/exercise.py:81 nutrition/models/ingredient.py:80
#: nutrition/models/plan.py:61 nutrition/models/weight_unit.py:32
msgid "Language"
msgstr "Idioma"
-#: 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:265
-msgid "New user submitted exercise"
-msgstr "Novo exercício submetido pelo utilizador"
-
-#: 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/exercise_alias.py:35
+#: exercises/models/exercise_alias.py:38
msgid "Alias for an exercise"
msgstr "Outro nome para um exercício"
-#: exercises/models/image.py:59
+#: exercises/models/image.py:55
msgid "Line"
msgstr "Linha"
-#: exercises/models/image.py:60
+#: exercises/models/image.py:56
msgid "3D"
msgstr "3D"
-#: exercises/models/image.py:61
+#: exercises/models/image.py:57
msgid "Low-poly"
msgstr "Poucos polígonos"
-#: exercises/models/image.py:62
+#: exercises/models/image.py:58
msgid "Photo"
msgstr "Foto"
-#: exercises/models/image.py:63
+#: exercises/models/image.py:59
msgid "Other"
msgstr "Outro"
-#: exercises/models/image.py:81 gallery/models/image.py:56
+#: exercises/models/image.py:77 gallery/models/image.py:56
msgid "Image"
msgstr "Imagem"
-#: exercises/models/image.py:82 gallery/models/image.py:57
+#: exercises/models/image.py:78 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:88
+#: exercises/models/image.py:84
msgid "Main picture"
msgstr "Imagem principal"
-#: exercises/models/image.py:91
+#: exercises/models/image.py:87
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 "
@@ -1647,19 +1647,10 @@ msgstr ""
"exercício (irá ser mostrada, por exemplo, na busca). A primeira imagem é "
"automaticamente marcada pelo sistema."
-#: exercises/models/image.py:100
+#: exercises/models/image.py:96
msgid "The art style of your image"
msgstr "O estilo da sua imagem"
-#: exercises/models/image.py:185
-msgid "New user submitted image"
-msgstr "Nova imagem submetido por utilizador"
-
-#: 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}."
-
#: exercises/models/muscle.py:37
msgid "In latin, e.g. \"Pectoralis major\""
msgstr "Em latim, ex.: \"Pectoralis major\""
@@ -1672,47 +1663,49 @@ msgstr "Nome alternativo"
msgid "A more basic name for the muscle"
msgstr "Um nome mais básico para o músculo"
-#: exercises/models/video.py:41
-msgid "Maximum file size is 100MB."
+#: exercises/models/video.py:50
+#, fuzzy, python-format
+#| msgid "Maximum file size is 100MB."
+msgid "Maximum file size is %(size)sMB."
msgstr "O tamanho máximo de arquivo é 100 MB."
-#: exercises/models/video.py:44 exercises/models/video.py:48
+#: exercises/models/video.py:57 exercises/models/video.py:65
msgid "File type is not supported"
msgstr "Tipo de arquivo não suportado"
-#: exercises/models/video.py:57
+#: exercises/models/video.py:70
msgid "File is not a valid video"
msgstr "O arquivo não é um vídeo válido"
-#: exercises/models/video.py:88
+#: exercises/models/video.py:101
msgid "Main video"
msgstr "Vídeo principal"
-#: exercises/models/video.py:94
+#: exercises/models/video.py:107
msgid "Video"
msgstr "Vídeo"
-#: exercises/models/video.py:101
+#: exercises/models/video.py:114
msgid "Size"
msgstr "Tamanho"
-#: exercises/models/video.py:108 manager/models/schedule_step.py:56
+#: exercises/models/video.py:121 manager/models/schedule_step.py:56
msgid "Duration"
msgstr "Duração"
-#: exercises/models/video.py:117
+#: exercises/models/video.py:130
msgid "Width"
msgstr "Largura"
-#: exercises/models/video.py:124
+#: exercises/models/video.py:137
msgid "Height"
msgstr "Altura"
-#: exercises/models/video.py:131
+#: exercises/models/video.py:144
msgid "Codec"
msgstr "Codec"
-#: exercises/models/video.py:139
+#: exercises/models/video.py:152
msgid "Codec, long name"
msgstr "Codec, nome longo"
@@ -1721,140 +1714,23 @@ msgid "Equipment list"
msgstr "Lista de equipamento"
#: exercises/templates/equipment/admin-overview.html:37
-#: exercises/views/equipment.py:94
+#: exercises/views/equipment.py:92
msgid "Add new equipment"
msgstr "Adicionar novo equipamento"
-#: exercises/templates/equipment/overview.html:11
-msgid "Equipment overview"
-msgstr "Visão geral do equipamento"
-
-#: exercises/templates/equipment/overview.html:69
-#: exercises/templates/exercise/overview.html:74
-#: exercises/templates/exercise/view.html:264
-#: exercises/templates/muscles/overview.html:75
-msgid "Main muscles"
-msgstr "Músculos principais"
-
-#: exercises/templates/equipment/overview.html:79
-msgid ""
-"No exercises for this equipment. Add or edit an exercise and set the "
-"equipment."
-msgstr ""
-"Nenhum exercício para este equipamento. Adicione ou edite um exercício e "
-"marque o equipamento."
-
-#: exercises/templates/equipment/overview.html:96
-#: exercises/templates/exercise/overview.html:99
-#: nutrition/templates/ingredient/overview.html:57
-msgid "Search"
-msgstr "Pesquisa"
-
-#: exercises/templates/equipment/overview.html:101
-#: exercises/templates/exercise/overview.html:104
-msgid "exercise name"
-msgstr "nome do exercício"
-
-#: exercises/templates/equipment/overview.html:115
-#: exercises/templates/exercise/overview.html:118
-#: exercises/templates/muscles/overview.html:118
-#: nutrition/templates/ingredient/overview.html:85
-msgid "Only registered users can do this"
-msgstr "Somente utilizadores cadastrados podem fazer isto"
-
-#: exercises/templates/exercise/email_new.tpl:1
-#, python-format
-msgid ""
-"Your exercise '%(exercise)s' was successfully added to the general\n"
-"database."
-msgstr ""
-"Seu exercício '%(exercise)s' foi adicionado ao banco de dados geral \n"
-"com sucesso."
-
-#: exercises/templates/exercise/email_new.tpl:4
-msgid ""
-"It is now available on the exercise and muscle overview and can be\n"
-"added to workouts. You can access it on this address:"
-msgstr ""
-"Está disponível agora na visãop geral do exercício ou do músculo e pode ser\n"
-"adicionado aos treinos. Você pode acessa-lo neste endereço:"
-
-#: exercises/templates/exercise/email_new.tpl:8
-#: nutrition/templates/ingredient/email_new.tpl:8
-msgid "Thank you for contributing and making this site better!"
-msgstr "Obrigado pela sua contribuição epor tornar este site melhor!"
-
-#: exercises/templates/exercise/email_new.tpl:9
-#: manager/templates/workout/email_reminder.tpl:15
-#: manager/templates/workout/email_weight_reminder.tpl:12
-#: nutrition/templates/ingredient/email_new.tpl:9
-#, python-format
-msgid "The %(site)s team"
-msgstr "O time %(site)s"
-
-#: exercises/templates/exercise/form.html:4
-msgid "Submitting an exercise"
-msgstr "Submetendo um exercício"
-
-#: exercises/templates/exercise/form.html:5
-msgid ""
-"Thank you for submitting an exercise. This is much\n"
-"appreciated!"
-msgstr ""
-"Obrigado por submeter um exercício. Isto é muito\n"
-"apreciado!"
-
-#: exercises/templates/exercise/form.html:8
-msgid ""
-"After you submit the form, the administrators will be notified.\n"
-"Once it is reviewed, it will be added to the database. Till this happens,\n"
-"it will not be visible in the overview or the search. In case you added your "
-"email\n"
-"when you registered, you will get notified when the process is completed "
-"successfully."
-msgstr ""
-"Depois de submeter o formulário, o administrador será notificado.\n"
-"Uma vez que seja revisado, ele será adicionado ao banco de dados. Até isto "
-"acontecer,\n"
-"ele não será visível na visão geral ou na pesquisa. Caso você tenha "
-"adicionado seu email\n"
-"quando você se registrou, você será notificado quando o processo for "
-"completo com sucesso."
-
-#: exercises/templates/exercise/form_correct.html:4
-msgid "Correcting an exercise"
-msgstr "Corrige um exercício"
-
-#: exercises/templates/exercise/form_correct.html:5
-msgid ""
-"Thank you for correcting and improving this exercise.\n"
-"This is much appreciated!"
-msgstr ""
-"Obrigado por corrigir e melhorar este exercício.\n"
-"Isto é muito gratificante!"
-
-#: exercises/templates/exercise/form_correct.html:8
-msgid ""
-"After you submit the form, the administrators will be notified.\n"
-"Once the changes are reviewed the exercise will be updated."
-msgstr ""
-"Após você enviar o formulário os administradores serão notificados.\n"
-"Assim que revisadas, as mudanças serão feitas."
-
-#: exercises/templates/exercise/overview.html:88
-msgid "No categories."
-msgstr "Sem categorias."
-
-#: exercises/templates/exercise/overview.html:88
-msgid "Use link to create one"
-msgstr "Use link para criar um"
+#: exercises/templates/history/overview.html:11
+#, fuzzy
+#| msgid "Exercise day"
+msgid "Exercise admin history"
+msgstr "Dia do exercício"
-#: exercises/templates/exercise/pending.html:14
-#: nutrition/templates/ingredient/pending.html:14
-msgid "Submission date"
-msgstr "Data de submissão"
+#: exercises/templates/history/overview.html:27
+#, fuzzy
+#| msgid "Actions"
+msgid "Action"
+msgstr "Ações"
-#: exercises/templates/exercise/pending.html:16 gallery/models/image.py:51
+#: exercises/templates/history/overview.html:28 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/log.py:45
@@ -1865,101 +1741,47 @@ msgstr "Data de submissão"
msgid "User"
msgstr "Utilizador"
-#: exercises/templates/exercise/view.html:48
-msgid "Exercise is pending review"
-msgstr "Está pendendo revisão do exercício"
-
-#: exercises/templates/exercise/view.html:51
-msgid ""
-"This user submitted exercise is pending a decision to be\n"
-" included in the database."
-msgstr ""
-"Esse exercício enviado pelo utilizador está pendendo uma decisão para\n"
-"ser incluído no banco de dados."
-
-#: exercises/templates/exercise/view.html:53
-msgid "Till then, it will not be shown in the overview or the search."
-msgstr "Até lá, não será mostrado na visão geral ou na pesquisa."
-
-#: exercises/templates/exercise/view.html:54
-#: nutrition/templates/ingredient/view.html:31
-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:203
-#: nutrition/templates/ingredient/view.html:38
-msgid "Accept"
-msgstr "Aceito"
-
-#: exercises/templates/exercise/view.html:64
-#: exercises/templates/exercise/view.html:204
-#: nutrition/templates/ingredient/view.html:42
-msgid "Decline"
-msgstr "Recusado"
-
-#: exercises/templates/exercise/view.html:96
-msgid "Images"
-msgstr "Imagens"
-
-#: exercises/templates/exercise/view.html:137 exercises/views/images.py:93
-msgid "Add new image"
-msgstr "Adicionar nova imagem"
-
-#: exercises/templates/exercise/view.html:148
-msgid "Videos"
-msgstr "Vídeos"
-
-#: exercises/templates/exercise/view.html:187 exercises/views/videos.py:94
-msgid "Add new video"
-msgstr "Adicionar novo vídeo"
-
-#: exercises/templates/exercise/view.html:197
-msgid "Images pending review"
-msgstr "Imagens com revisão pendente"
-
-#: exercises/templates/exercise/view.html:218
-msgid "Comments for this exercise"
-msgstr "Comentários para este exercício"
+#: exercises/templates/history/overview.html:29
+#, fuzzy
+#| msgctxt "As in \"email subject\""
+#| msgid "Subject"
+msgid "Object"
+msgstr "Assunto"
-#: exercises/templates/exercise/view.html:246
-msgid "Add new comment"
-msgstr "Adicionar novo comentário"
+#: exercises/templates/history/overview.html:31
+#, fuzzy
+#| msgctxt "Noun, not verb"
+#| msgid "Change"
+msgid "Changes"
+msgstr "Mudança"
-#: 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/history/overview.html:32
+msgid "Revert"
+msgstr ""
-#: 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/history/overview.html:64
+msgid "View Object"
+msgstr ""
-#: exercises/templates/exercise/view.html:306
-msgid "Exercise Variations"
-msgstr "Variações de Exercícios"
+#: exercises/templates/history/overview.html:75
+#, fuzzy
+#| msgid "View logs"
+msgid "View changes"
+msgstr "Ver registros"
-#: exercises/templates/exercise/view.html:327
-msgid "Submit a correction"
-msgstr "Envie uma correção"
+#: exercises/templates/history/overview.html:86
+msgid "Revert changes"
+msgstr ""
#: exercises/templates/muscles/admin-overview.html:4
-#: exercises/templates/muscles/overview.html:7
msgid "Muscle overview"
msgstr "Visão geral do músculo"
#: exercises/templates/muscles/admin-overview.html:36
-#: exercises/views/muscles.py:86
+#: exercises/views/muscles.py:67
msgid "Add muscle"
msgstr "Adicionar músculo"
-#: exercises/templates/muscles/overview.html:85
-msgid ""
-"No exercises for this muscle. Add or edit an exercise and set the muscle."
-msgstr ""
-"Não há exercícios para este músculo. Adicione ou edite um exercício e defina "
-"o músculo."
-
#: exercises/views/categories.py:71
msgid "Add category"
msgstr "Adicionar categoria"
@@ -1972,52 +1794,24 @@ msgstr "Isto irá, também, apagar todos os exercícios nesta categoria."
msgid "Add exercise comment"
msgstr "Adicionar comentário do exercício"
-#: exercises/views/equipment.py:107 exercises/views/equipment.py:118
+#: exercises/views/equipment.py:105 exercises/views/equipment.py:116
msgid "Delete equipment?"
msgstr "Apagar equipamento?"
-#: exercises/views/exercises.py:229
-#, python-format
-msgid ""
-"%(name_original)s is too similar to existing exercise \"%(exercise_name)s\""
+#: exercises/views/exercises.py:161
+#, fuzzy, python-format
+#| msgid ""
+#| "%(name_original)s is too similar to existing exercise "
+#| "\"%(exercise_name)s\""
+msgid "%(name)s is too similar to existing exercise \"%(exercise_name)s\""
msgstr ""
"%(name_original)s é muito semelhante ao exercício existente "
"\"%(exercise_name)s\""
-#: exercises/views/exercises.py:247
-msgid "Add exercise"
-msgstr "Adicionar exercício"
-
-#: 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:380
-#, python-brace-format
-msgid "Correct {0}"
-msgstr "Correções {0}"
-
-#: exercises/views/exercises.py:422
+#: exercises/views/exercises.py:184
msgid "This will delete the exercise from all workouts."
msgstr "Isto irá apagar o exercício de todos os treinos."
-#: exercises/views/exercises.py:474
-msgid "Exercise was successfully marked as rejected"
-msgstr "Exercício foi marcado com rejeitado com sucesso"
-
-#: exercises/views/images.py:68
-msgid "Edit exercise image"
-msgstr "Editar imagem do exercício"
-
-#: exercises/views/images.py:143
-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"
@@ -2085,7 +1879,7 @@ 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:59
+#: manager/templates/log/add.html:52 nutrition/forms.py:60
#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:102
#: nutrition/models/meal_item.py:72
msgid "Amount"
@@ -2188,6 +1982,10 @@ msgstr "Será usado o nome do ficheiro se nada for informado"
msgid "User notes"
msgstr "Notas de utilizador"
+#: gym/templates/contract/list.html:36
+msgid "Show"
+msgstr "Mostrar"
+
#: gym/templates/contract/view.html:4
msgid "Contract"
msgstr "Contrato"
@@ -2264,13 +2062,9 @@ msgstr "Tipos"
msgid "Emails"
msgstr "E-mails"
-#: gym/templates/gym/member_list.html:315
-msgid "Add member"
-msgstr "Adicionar membro"
-
-#: gym/templates/gym/new_user.html:38
-msgid "Date of Birth"
-msgstr "Data de Nascimento"
+#: gym/templates/gym/member_list.html:315
+msgid "Add member"
+msgstr "Adicionar membro"
#: gym/templates/gym/new_user.html:48 manager/templates/calendar/month.html:144
#: manager/templates/log/add.html:75 nutrition/templates/rate/form.html:120
@@ -2334,126 +2128,126 @@ msgstr "Adicionar utilizador à academia"
msgid "Edit gym"
msgstr "Editar academia"
-#: i18n.tpl:2 i18n.tpl:28
+#: i18n.tpl:2
+msgid "Until Failure"
+msgstr "Até falhar"
+
+#: i18n.tpl:3 manager/forms.py:180 manager/models/log.py:73
+#: manager/templates/set/add.html:53
+msgid "Repetitions"
+msgstr "Repeticões"
+
+#: i18n.tpl:4
msgid "Abs"
msgstr "Abdominal"
-#: i18n.tpl:3
+#: i18n.tpl:5
msgid "Arms"
msgstr "Braços"
-#: i18n.tpl:4
-msgid "Back"
-msgstr "Costas"
-
-#: i18n.tpl:5 i18n.tpl:23
-msgid "Calves"
-msgstr "Panturrilha"
-
-#: i18n.tpl:6 i18n.tpl:26
-msgid "Chest"
-msgstr "Peito"
-
-#: i18n.tpl:7
+#: i18n.tpl:6
msgid "Legs"
msgstr "Pernas"
-#: i18n.tpl:8 i18n.tpl:19
-msgid "Shoulders"
-msgstr "Ombros"
+#: i18n.tpl:7
+msgid "Dumbbell"
+msgstr "Haltere"
+
+#: i18n.tpl:8
+msgid "Biceps"
+msgstr "Bíceps"
#: i18n.tpl:9
-msgid "Barbell"
-msgstr "Halteres"
+msgid "SZ-Bar"
+msgstr "Barra SZ"
#: i18n.tpl:10
-msgid "Bench"
-msgstr "Banco"
+msgid "Kettlebell"
+msgstr "Kettlebell"
#: i18n.tpl:11
-msgid "Dumbbell"
-msgstr "Haltere"
+msgid "Swiss Ball"
+msgstr "Bola Suíça"
#: i18n.tpl:12
-msgid "Gym mat"
-msgstr "Esteira de ginástica"
+msgid "none (bodyweight exercise)"
+msgstr "nenhum (exercício corporal)"
#: i18n.tpl:13
-msgid "Incline bench"
-msgstr "Banco inclinado"
+msgid "Calves"
+msgstr "Panturrilha"
#: i18n.tpl:14
-msgid "Kettlebell"
-msgstr "Kettlebell"
+msgid "Back"
+msgstr "Costas"
#: i18n.tpl:15
-msgid "Pull-up bar"
-msgstr "Barra de puxar"
+msgid "Lower back"
+msgstr "Lombar"
#: i18n.tpl:16
-msgid "SZ-Bar"
-msgstr "Barra SZ"
+msgid "Lats"
+msgstr "Dorsal"
#: i18n.tpl:17
-msgid "Swiss Ball"
-msgstr "Bola Suíça"
+msgid "Hamstrings"
+msgstr "Isquiossurais"
#: i18n.tpl:18
-msgid "none (bodyweight exercise)"
-msgstr "nenhum (exercício corporal)"
+msgid "Bench"
+msgstr "Banco"
+
+#: i18n.tpl:19
+msgid "Glutes"
+msgstr "Glúteos"
#: i18n.tpl:20
-msgid "Biceps"
-msgstr "Bíceps"
+msgid "Kilometers"
+msgstr "Kilometros"
#: i18n.tpl:21
-msgid "Hamstrings"
-msgstr "Isquiossurais"
+msgid "Shoulders"
+msgstr "Ombros"
#: i18n.tpl:22
-msgid "Lower back"
-msgstr "Lombar"
+msgid "Seconds"
+msgstr "Segundos"
+
+#: i18n.tpl:23
+msgid "Miles"
+msgstr "Milhas"
#: i18n.tpl:24
-msgid "Glutes"
-msgstr "Glúteos"
+msgid "Incline bench"
+msgstr "Banco inclinado"
#: i18n.tpl:25
-msgid "Lats"
-msgstr "Dorsal"
-
-#: i18n.tpl:27
msgid "Quads"
msgstr "Quadríceps"
-#: i18n.tpl:29
-msgid "Triceps"
-msgstr "Tríceps"
-
-#: i18n.tpl:30
-msgid "Kilometers"
-msgstr "Kilometros"
-
-#: i18n.tpl:31
-msgid "Miles"
-msgstr "Milhas"
-
-#: i18n.tpl:32
+#: i18n.tpl:26
msgid "Minutes"
msgstr "Minutos"
-#: i18n.tpl:33 manager/forms.py:169 manager/models/log.py:71
-#: manager/templates/set/add.html:53
-msgid "Repetitions"
-msgstr "Repeticões"
+#: i18n.tpl:27
+msgid "Chest"
+msgstr "Peito"
-#: i18n.tpl:34
-msgid "Seconds"
-msgstr "Segundos"
+#: i18n.tpl:28
+msgid "Gym mat"
+msgstr "Esteira de ginástica"
-#: i18n.tpl:35
-msgid "Until Failure"
-msgstr "Até falhar"
+#: i18n.tpl:29
+msgid "Pull-up bar"
+msgstr "Barra de puxar"
+
+#: i18n.tpl:30
+msgid "Barbell"
+msgstr "Halteres"
+
+#: i18n.tpl:31
+msgid "Triceps"
+msgstr "Tríceps"
#: mailer/forms.py:34 mailer/templates/mailer/gym/preview.html:32
msgctxt "As in \"email subject\""
@@ -2508,11 +2302,11 @@ msgstr "Enviar e-mails"
msgid "Correction"
msgstr "Correção"
-#: manager/forms.py:89 manager/models/workout.py:59
+#: manager/forms.py:92 manager/models/workout.py:59
msgid "The name of the workout"
msgstr "Nome do treino"
-#: manager/forms.py:93 manager/models/workout.py:66
+#: manager/forms.py:96 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'."
@@ -2520,7 +2314,7 @@ msgstr ""
"Uma descrição curta ou objetivo do treino. Por exemplo 'Focar nas costas' ou "
"'Semana 1 do programa XY'."
-#: manager/forms.py:126
+#: manager/forms.py:137
msgid ""
"You can search for more than one exercise, they will be grouped together for "
"a superset."
@@ -2528,28 +2322,28 @@ msgstr ""
"Pode pesquisar para mais de um exercício, eles irão ser agrupados juntos num "
"superconjunto."
-#: 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
+#: manager/forms.py:166 manager/forms.py:171 manager/models/log.py:64
+#: manager/models/log.py:92 manager/models/setting.py:59
+#: manager/models/setting.py:90 manager/templates/log/add.html:53
+#: manager/templates/log/add.html:55 manager/templates/set/formset.html:10
+#: manager/templates/set/formset.html:12 measurements/models/category.py:58
+#: nutrition/forms.py:64
msgid "Unit"
msgstr "Unidade"
-#: manager/forms.py:266
+#: manager/forms.py:277
msgid "Type"
msgstr "Tipo"
-#: manager/forms.py:267 manager/templates/workout/view.html:157
+#: manager/forms.py:278 manager/templates/workout/view.html:157
msgid "Table"
msgstr "Tabela"
-#: manager/forms.py:269 manager/templates/workout/view.html:163
+#: manager/forms.py:280 manager/templates/workout/view.html:163
msgid "with images"
msgstr "com imagens"
-#: manager/forms.py:270 manager/templates/workout/view.html:169
+#: manager/forms.py:281 manager/templates/workout/view.html:169
msgid "with comments"
msgstr "com comentários"
@@ -2608,7 +2402,7 @@ msgid "The duration in weeks"
msgstr "A duração em semanas"
#: manager/models/schedule_step.py:63 manager/models/set.py:52
-#: manager/models/setting.py:98 nutrition/models/meal.py:54
+#: manager/models/setting.py:110 nutrition/models/meal.py:54
#: nutrition/models/meal_item.py:65
msgid "Order"
msgstr "Ordem"
@@ -2662,7 +2456,7 @@ msgstr "Dia do exercício"
msgid "Number of sets"
msgstr "Número de conjuntos"
-#: manager/models/setting.py:43
+#: manager/models/setting.py:48
msgid "Sets"
msgstr "Conjuntos"
@@ -2955,6 +2749,13 @@ msgstr ""
"Se você não quiser nunca receber lembrete por e-mail, desative a opção nas "
"suas configurações."
+#: manager/templates/workout/email_reminder.tpl:15
+#: manager/templates/workout/email_weight_reminder.tpl:12
+#: nutrition/templates/ingredient/email_new.tpl:9
+#, python-format
+msgid "The %(site)s team"
+msgstr "O time %(site)s"
+
#: manager/templates/workout/email_weight_reminder.tpl:3
#, python-format
msgid ""
@@ -2971,6 +2772,10 @@ msgid ""
"You will regularly receive such reminders till you enter your current weight."
msgstr "Você receberá esses lembretes até que indique a sua massa atual."
+#: manager/templates/workout/log.html:10 manager/templates/workout/log.html:11
+msgid "Weight log"
+msgstr "Log de peso"
+
#: manager/templates/workout/log.html:29
msgid "Weight log for workout"
msgstr "Registro de peso para o treino"
@@ -3077,7 +2882,7 @@ msgstr "Ver registros"
msgid "Edit workout"
msgstr "Edite treino"
-#: manager/templates/workout/view.html:225 manager/views/workout.py:300
+#: manager/templates/workout/view.html:225 manager/views/workout.py:301
msgid "Mark as template"
msgstr "Marcar como modelo"
@@ -3085,11 +2890,6 @@ msgstr "Marcar como modelo"
msgid "Add workout day"
msgstr "Adicione dia de treino"
-#: manager/views/log.py:92
-#, python-format
-msgid "Edit log entry for %s"
-msgstr "Edite registro de log para %s"
-
#: manager/views/log.py:111
msgid "Delete workout log"
msgstr "Excliur log de treino"
@@ -3107,11 +2907,11 @@ msgstr "Criar cronograma"
msgid "Your workouts"
msgstr "Seus treinos"
-#: manager/views/workout.py:227
+#: manager/views/workout.py:228
msgid "Copy workout"
msgstr "Copiar treino"
-#: manager/views/workout.py:230
+#: manager/views/workout.py:231
msgid "Copy"
msgstr "Copiar"
@@ -3133,23 +2933,23 @@ msgstr "Isto apagará todos os logs de pesos para este dia também."
msgid "Value"
msgstr "Valor"
-#: nutrition/forms.py:122
+#: nutrition/forms.py:123
msgid "Calculate"
msgstr "Calcular"
-#: nutrition/forms.py:195 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:196 nutrition/templates/rate/form.html:76
msgid "Basic caloric intake"
msgstr "Ingestão básica de calorias"
-#: nutrition/forms.py:196
+#: nutrition/forms.py:197
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:202
+#: nutrition/forms.py:203
msgid "Additional calories"
msgstr "Calorias adicionais"
-#: nutrition/forms.py:204
+#: nutrition/forms.py:205
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
@@ -3157,7 +2957,7 @@ msgstr ""
"Calorias adicionais para adicionar à taxa básica (para subtrair, entre com "
"um número negativo)"
-#: nutrition/forms.py:232 nutrition/models/ingredient_weight_unit.py:39
+#: nutrition/forms.py:233 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"
@@ -3223,7 +3023,7 @@ msgstr ""
"por proteínas, carboidratos e gordura ({energy_calculated}kcal +/-"
"{energy_approx}%)"
-#: nutrition/models/ingredient.py:357 nutrition/views/ingredient.py:225
+#: nutrition/models/ingredient.py:357 nutrition/views/ingredient.py:219
msgid "Ingredient was successfully added to the general database"
msgstr "Ingrediente foi adicionado ao banco de dados geral com sucesso"
@@ -3252,6 +3052,12 @@ msgstr "Unidade para quantidade, ex. \"1 xícara\" ou \"1/2 colher\""
msgid "Meal"
msgstr "Refeição"
+#: nutrition/models/log.py:65
+#, fuzzy
+#| msgid "Time (approx)"
+msgid "Date and Time (Approx.)"
+msgstr "Tempo (aproximado)"
+
#: nutrition/models/meal.py:61
msgid "Time (approx)"
msgstr "Tempo (aproximado)"
@@ -3261,8 +3067,8 @@ msgid ""
"Give meals a textual description / name such as \"Breakfast\" or \"after "
"workout\""
msgstr ""
-"Dar às refeições uma descrição textual / nome como \"Café da manhã\" ou \"pós"
-"-treino\""
+"Dar às refeições uma descrição textual / nome como \"Café da manhã\" ou "
+"\"pós-treino\""
#: nutrition/models/plan.py:71
msgid ""
@@ -3359,6 +3165,10 @@ msgstr ""
"Está disponível agora na visão geral dos ingredientes e pode ser\n"
"adicinado aos planos de nutrição. Você pode acessá-lo neste endereço:"
+#: nutrition/templates/ingredient/email_new.tpl:8
+msgid "Thank you for contributing and making this site better!"
+msgstr "Obrigado pela sua contribuição epor tornar este site melhor!"
+
#: nutrition/templates/ingredient/form.html:4
msgid "Submitting an ingredient"
msgstr "Submeta um ingrediente"
@@ -3391,6 +3201,10 @@ msgstr ""
msgid "No ingredients."
msgstr "Nenhum ingrediente."
+#: nutrition/templates/ingredient/overview.html:57
+msgid "Search"
+msgstr "Pesquisa"
+
#: nutrition/templates/ingredient/overview.html:66
msgid "ingredient name"
msgstr "nome do ingrediente"
@@ -3400,6 +3214,14 @@ msgstr "nome do ingrediente"
msgid "Add ingredient"
msgstr "Adicione um ingrediente"
+#: nutrition/templates/ingredient/overview.html:85
+msgid "Only registered users can do this"
+msgstr "Somente utilizadores cadastrados podem fazer isto"
+
+#: nutrition/templates/ingredient/pending.html:14
+msgid "Submission date"
+msgstr "Data de submissão"
+
#: nutrition/templates/ingredient/view.html:27
msgid "Ingredient is pending review"
msgstr "Ingrediente está com a revisão pendente"
@@ -3415,6 +3237,18 @@ msgstr ""
"a inclusão no banco de dados. Até então, não será mostrado na visão geral ou "
"na busca."
+#: nutrition/templates/ingredient/view.html:31
+msgid "Please select one of the options below."
+msgstr "Por favor selecione uma das opções abaixo."
+
+#: nutrition/templates/ingredient/view.html:38
+msgid "Accept"
+msgstr "Aceito"
+
+#: nutrition/templates/ingredient/view.html:42
+msgid "Decline"
+msgstr "Recusado"
+
#: nutrition/templates/ingredient/view.html:71
#: nutrition/templates/log/detail.html:31
#: nutrition/templates/plan/view.html:229 nutrition/views/plan.py:376
@@ -3675,14 +3509,18 @@ msgstr ""
"uma aproximação. Se você basear o seu plano de nutrição nestes valores, \n"
"observe seu desempenho por algumas semanas e faça os ajustes necessários."
-#: nutrition/views/ingredient.py:181
+#: nutrition/views/ingredient.py:175
msgid "Add a new ingredient"
msgstr "Adicione um novo ingrediente"
-#: nutrition/views/ingredient.py:238
+#: nutrition/views/ingredient.py:232
msgid "Ingredient was successfully marked as rejected"
msgstr "Ingrediente foi marcado como rejeitado com sucesso"
+#: nutrition/views/log.py:230 nutrition/views/unit_ingredient.py:139
+msgid "Delete?"
+msgstr "Apagar?"
+
#: nutrition/views/meal.py:55
msgid "Add new meal"
msgstr "Adicionar nova refeição"
@@ -3941,15 +3779,15 @@ msgstr ""
msgid "100%% Free <br>and <br>Open Source"
msgstr "100%% livre<br>e <br>código aberto"
-#: utils/generic_views.py:261
+#: utils/generic_views.py:262
msgid "Yes, delete"
msgstr "Sim, apagar"
-#: utils/models.py:47
+#: utils/models.py:48
msgid "Author"
msgstr "Autor"
-#: utils/models.py:52
+#: utils/models.py:53
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."
@@ -3957,15 +3795,15 @@ msgstr ""
"Se você não é o autor, entre com o nome ou fonte aqui. Isso é necessário "
"para algumas licenças, por exemplo a CC-BY-SA."
-#: utils/models.py:77
+#: utils/models.py:78
msgid "Pending"
msgstr "Pendente"
-#: utils/models.py:78
+#: utils/models.py:79
msgid "Accepted"
msgstr "Aceito"
-#: utils/models.py:79
+#: utils/models.py:80
msgid "Declined"
msgstr "Recusado"
@@ -4133,6 +3971,214 @@ msgstr "Excluído com sucesso."
msgid "Delete weight entry for the %s"
msgstr "Excluir entrada de peso para %s"
+#~ msgid "Ingredients"
+#~ msgstr "Ingredientes"
+
+#~ msgid ""
+#~ "Use the configuration to select in what languages the\n"
+#~ "exercises and ingredients will be shown for the current language (for "
+#~ "example\n"
+#~ "the exercises should be shown in languages A, B and C; the ingredients "
+#~ "only\n"
+#~ "in A)."
+#~ msgstr ""
+#~ "Use a configuração para selecionar em qual idioma os\n"
+#~ "exercícios e ingredientes serão mostrados para o idioma atual (por "
+#~ "exemplo,\n"
+#~ "os exercícios devem ser mostrados nas linguagens A, B, C; os ingredientes "
+#~ "somente\n"
+#~ "no A)."
+
+#~ msgctxt "as in sorted by category"
+#~ msgid "by category"
+#~ msgstr "por categoria"
+
+#~ msgctxt "as in sorted by muscle"
+#~ msgid "by muscle"
+#~ msgstr "pelo músculo"
+
+#~ msgctxt "as in sorted by equipment"
+#~ msgid "by equipment"
+#~ msgstr "por equipamento"
+
+#~ msgid "Add new exercise"
+#~ msgstr "adicionar novo exercício"
+
+#~ msgid "Exercises pending review"
+#~ msgstr "Exercícios com revisão pendente"
+
+#~ msgid "Exercise was successfully added to the general database"
+#~ msgstr "Exercício foi adicionado com sucesso ao banco de dados geral"
+
+#~ msgid "New user submitted exercise"
+#~ msgstr "Novo exercício submetido pelo utilizador"
+
+#, python-brace-format
+#~ msgid "The user {0} submitted a new exercise \"{1}\"."
+#~ msgstr "O utilizador {0} submete um novo exercício \"{1}\"."
+
+#~ msgid "New user submitted image"
+#~ msgstr "Nova imagem submetido por utilizador"
+
+#, 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}."
+
+#~ msgid "Equipment overview"
+#~ msgstr "Visão geral do equipamento"
+
+#~ msgid "Main muscles"
+#~ msgstr "Músculos principais"
+
+#~ msgid ""
+#~ "No exercises for this equipment. Add or edit an exercise and set the "
+#~ "equipment."
+#~ msgstr ""
+#~ "Nenhum exercício para este equipamento. Adicione ou edite um exercício e "
+#~ "marque o equipamento."
+
+#~ msgid "exercise name"
+#~ msgstr "nome do exercício"
+
+#, python-format
+#~ msgid ""
+#~ "Your exercise '%(exercise)s' was successfully added to the general\n"
+#~ "database."
+#~ msgstr ""
+#~ "Seu exercício '%(exercise)s' foi adicionado ao banco de dados geral \n"
+#~ "com sucesso."
+
+#~ msgid ""
+#~ "It is now available on the exercise and muscle overview and can be\n"
+#~ "added to workouts. You can access it on this address:"
+#~ msgstr ""
+#~ "Está disponível agora na visãop geral do exercício ou do músculo e pode "
+#~ "ser\n"
+#~ "adicionado aos treinos. Você pode acessa-lo neste endereço:"
+
+#~ msgid "Submitting an exercise"
+#~ msgstr "Submetendo um exercício"
+
+#~ msgid ""
+#~ "Thank you for submitting an exercise. This is much\n"
+#~ "appreciated!"
+#~ msgstr ""
+#~ "Obrigado por submeter um exercício. Isto é muito\n"
+#~ "apreciado!"
+
+#~ msgid ""
+#~ "After you submit the form, the administrators will be notified.\n"
+#~ "Once it is reviewed, it will be added to the database. Till this "
+#~ "happens,\n"
+#~ "it will not be visible in the overview or the search. In case you added "
+#~ "your email\n"
+#~ "when you registered, you will get notified when the process is completed "
+#~ "successfully."
+#~ msgstr ""
+#~ "Depois de submeter o formulário, o administrador será notificado.\n"
+#~ "Uma vez que seja revisado, ele será adicionado ao banco de dados. Até "
+#~ "isto acontecer,\n"
+#~ "ele não será visível na visão geral ou na pesquisa. Caso você tenha "
+#~ "adicionado seu email\n"
+#~ "quando você se registrou, você será notificado quando o processo for "
+#~ "completo com sucesso."
+
+#~ msgid "Correcting an exercise"
+#~ msgstr "Corrige um exercício"
+
+#~ msgid ""
+#~ "Thank you for correcting and improving this exercise.\n"
+#~ "This is much appreciated!"
+#~ msgstr ""
+#~ "Obrigado por corrigir e melhorar este exercício.\n"
+#~ "Isto é muito gratificante!"
+
+#~ msgid ""
+#~ "After you submit the form, the administrators will be notified.\n"
+#~ "Once the changes are reviewed the exercise will be updated."
+#~ msgstr ""
+#~ "Após você enviar o formulário os administradores serão notificados.\n"
+#~ "Assim que revisadas, as mudanças serão feitas."
+
+#~ msgid "No categories."
+#~ msgstr "Sem categorias."
+
+#~ msgid "Use link to create one"
+#~ msgstr "Use link para criar um"
+
+#~ msgid "Exercise is pending review"
+#~ msgstr "Está pendendo revisão do exercício"
+
+#~ msgid ""
+#~ "This user submitted exercise is pending a decision to be\n"
+#~ " included in the database."
+#~ msgstr ""
+#~ "Esse exercício enviado pelo utilizador está pendendo uma decisão para\n"
+#~ "ser incluído no banco de dados."
+
+#~ msgid "Till then, it will not be shown in the overview or the search."
+#~ msgstr "Até lá, não será mostrado na visão geral ou na pesquisa."
+
+#~ msgid "Images"
+#~ msgstr "Imagens"
+
+#~ msgid "Add new image"
+#~ msgstr "Adicionar nova imagem"
+
+#~ msgid "Videos"
+#~ msgstr "Vídeos"
+
+#~ msgid "Add new video"
+#~ msgstr "Adicionar novo vídeo"
+
+#~ msgid "Images pending review"
+#~ msgstr "Imagens com revisão pendente"
+
+#~ msgid "Comments for this exercise"
+#~ msgstr "Comentários para este exercício"
+
+#~ msgid "Add new comment"
+#~ msgstr "Adicionar novo comentário"
+
+#~ msgid "The diagram shows the most used muscles on this exercise"
+#~ msgstr "O diagrama mostra os músculos mais usados neste exercício"
+
+#~ msgid "Exercise Variations"
+#~ msgstr "Variações de Exercícios"
+
+#~ msgid "Submit a correction"
+#~ msgstr "Envie uma correção"
+
+#~ msgid ""
+#~ "No exercises for this muscle. Add or edit an exercise and set the muscle."
+#~ msgstr ""
+#~ "Não há exercícios para este músculo. Adicione ou edite um exercício e "
+#~ "defina o músculo."
+
+#~ msgid "Add exercise"
+#~ msgstr "Adicionar exercício"
+
+#~ msgid ""
+#~ "Thank you. Once the changes are reviewed the exercise will be updated."
+#~ msgstr "Obrigado, uma vez revisadas, as mudanças serão feitas."
+
+#, python-brace-format
+#~ msgid "Correct {0}"
+#~ msgstr "Correções {0}"
+
+#~ msgid "Exercise was successfully marked as rejected"
+#~ msgstr "Exercício foi marcado com rejeitado com sucesso"
+
+#~ msgid "Edit exercise image"
+#~ msgstr "Editar imagem do exercício"
+
+#~ msgid "Delete exercise image?"
+#~ msgstr "Apagar imagem do exercício?"
+
+#, python-format
+#~ msgid "Edit log entry for %s"
+#~ msgstr "Edite registro de log para %s"
+
#~ msgid "Anterior deltoid"
#~ msgstr "Deltóide anterior"
@@ -4479,10 +4525,6 @@ msgstr "Excluir entrada de peso para %s"
#~ msgid "No filter"
#~ msgstr "Sem filtro"
-#~ msgctxt "Noun, not verb"
-#~ msgid "Change"
-#~ msgstr "Mudança"
-
#~ msgid "Days"
#~ msgstr "Dias"
diff --git a/wger/locale/ro/LC_MESSAGES/django.po b/wger/locale/ro/LC_MESSAGES/django.po
index 8616bf31e..40800056c 100644
--- a/wger/locale/ro/LC_MESSAGES/django.po
+++ b/wger/locale/ro/LC_MESSAGES/django.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: wger Workout Manager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-14 12:01+0200\n"
+"POT-Creation-Date: 2022-11-10 16:03+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"
@@ -33,102 +33,8 @@ msgid ""
"registered users to this gym and update all existing users without a gym."
msgstr ""
-#: 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 "Exerciții"
-
-#: config/models/language_config.py:42
-msgid "Ingredients"
-msgstr "Ingrediente"
-
-#: config/templates/language/overview.html:4 core/templates/navigation.html:226
-msgid "Languages"
-msgstr "Limbi"
-
-#: config/templates/language/overview.html:16
-msgid "Nothing found."
-msgstr ""
-
-#: 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:150
-#: nutrition/templates/plan/view.html:153
-#: nutrition/templates/plan/view.html:191
-msgid "Add one now."
-msgstr ""
-
-#: config/templates/language/overview.html:29
-#: core/templates/license/list.html:38 core/templates/misc/license/list.html:41
-#: core/templates/repetition_unit/list.html:41
-#: core/templates/user/overview.html:327 core/templates/user/overview.html:366
-#: core/templates/user/overview.html:402
-#: core/templates/weight_unit/list.html:41 core/views/languages.py:73
-#: core/views/license.py:65 core/views/repetition_units.py:65
-#: core/views/weight_units.py:65
-#: exercises/templates/categories/admin-overview.html:36
-#: 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:61
-msgid "Add"
-msgstr "Adăugare"
-
-#: config/templates/language/view.html:21 core/models/language.py:29
-msgid "Language short name"
-msgstr "Denumirea limbii scurt"
-
-#: config/templates/language/view.html:22
-#: config/templates/language/view.html:43 core/models/language.py:32
-msgid "Language full name"
-msgstr "Denumirea limbii complet"
-
-#: config/templates/language/view.html:34 core/templates/user/overview.html:451
-#: gym/views/admin_config.py:44 gym/views/admin_config.py:58
-#: gym/views/user_config.py:46
-msgid "Configuration"
-msgstr ""
-
-#: config/templates/language/view.html:35
-msgid ""
-"Use the configuration to select in what languages the\n"
-"exercises and ingredients will be shown for the current language (for "
-"example\n"
-"the exercises should be shown in languages A, B and C; the ingredients only\n"
-"in A)."
-msgstr ""
-
-#: config/templates/language/view.html:44 gym/templates/contract/list.html:36
-msgid "Show"
-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: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:45
-msgid "Options"
-msgstr "Opțiuni"
-
-#: config/templates/language/view.html:96 config/views/gym_config.py:41
-#: config/views/language_config.py:49 core/templates/license/list.html:16
-#: core/templates/misc/license/list.html:17
+#: config/views/gym_config.py:41 core/templates/language/view.html:57
+#: 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:39
#: core/templates/tags/render_day.html:75 core/templates/user/overview.html:205
@@ -136,12 +42,10 @@ 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:230
-#: exercises/templates/exercise/view.html:351
#: exercises/templates/muscles/admin-overview.html:16
-#: 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
+#: 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
#: 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,81 +61,52 @@ msgstr "Opțiuni"
msgid "Edit"
msgstr "Editare"
-#: 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: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: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
-#: gym/templates/contract_type/list.html:39 gym/templates/document/list.html:46
-#: gym/templates/gym/list.html:20 manager/templates/calendar/day.html:69
-#: 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:231
-#: 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:132
-#: nutrition/templates/units/list.html:20
-msgid "Delete"
-msgstr "Ștergere"
-
-#: core/demo.py:86
+#: core/demo.py:95
msgid "Sample workout"
msgstr ""
-#: core/demo.py:90
+#: core/demo.py:99
msgid "Sample day"
msgstr ""
-#: core/demo.py:94
+#: core/demo.py:103
msgid "Another sample day"
msgstr ""
-#: core/demo.py:217
-msgid "Sample nutrional plan"
+#: core/demo.py:211
+msgid "Sample nutritional plan"
msgstr ""
-#: core/demo.py:349 core/demo.py:351 core/demo.py:353
+#: core/demo.py:343 core/demo.py:345 core/demo.py:347
#, python-brace-format
msgid "Placeholder workout nr {0} for schedule"
msgstr ""
-#: core/demo.py:358
+#: core/demo.py:352
msgid "My cool workout schedule"
msgstr ""
-#: core/demo.py:397 core/demo.py:412
+#: core/demo.py:391 core/demo.py:406
msgid "Empty placeholder schedule"
msgstr ""
-#: core/forms.py:61 core/templates/navigation.html:188
-#: core/templates/navigation.html:192 core/templates/user/login.html:4
+#: core/forms.py:64 core/templates/navigation.html:179
+#: core/templates/navigation.html:183 core/templates/user/login.html:4
#: software/templates/features.html:43
msgid "Login"
msgstr ""
-#: core/forms.py:73 core/forms.py:164 gym/views/export.py:63
+#: core/forms.py:76 core/forms.py:177 gym/views/export.py:63
#: gym/views/gym.py:218
msgid "First name"
msgstr "Prenume"
-#: core/forms.py:74 core/forms.py:165 core/templates/user/overview.html:267
+#: core/forms.py:77 core/forms.py:178 core/templates/user/overview.html:267
#: gym/views/export.py:64 gym/views/gym.py:218
msgid "Last name"
msgstr "Nume"
-#: core/forms.py:76 core/forms.py:131 core/templates/user/overview.html:271
+#: core/forms.py:79 core/forms.py:144 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
@@ -241,7 +116,7 @@ msgstr "Nume"
msgid "Email"
msgstr "Adresa de email"
-#: core/forms.py:77
+#: core/forms.py:80
#, fuzzy
#| msgid "Used for password resets and, optionally, email reminders."
msgid "Used for password resets and, optionally, e-mail reminders."
@@ -249,77 +124,107 @@ msgstr ""
"Folosit pentru resetarea parolei și, opțional, pentru memento-uri prin e-"
"mail."
-#: core/forms.py:102
+#: core/forms.py:84 core/models/profile.py:220
+#: gym/templates/gym/new_user.html:38
+msgid "Date of Birth"
+msgstr ""
+
+#: core/forms.py:116
msgid "Personal data"
msgstr "Date personale"
-#: core/forms.py:110
+#: core/forms.py:124
msgid "Workout reminders"
msgstr "Mementouri de antrenament"
-#: core/forms.py:117
+#: core/forms.py:131
msgid "Other settings"
msgstr "Alte setari"
-#: 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
+#: core/forms.py:138 core/views/user.py:615 core/views/user.py:630
+#: core/views/user.py:642 gym/forms.py:72 manager/templates/log/add.html:65
+#: manager/templates/set/add.html:69 manager/views/workout.py:222
+#: utils/generic_views.py:143
msgid "Save"
msgstr "Salvează"
-#: core/forms.py:132
+#: core/forms.py:145
msgid "Used for password resets and, optionally, email reminders."
msgstr ""
"Folosit pentru resetarea parolei și, opțional, pentru memento-uri prin e-"
"mail."
-#: core/forms.py:160
+#: core/forms.py:173
#, fuzzy
#| msgid "This email is already used."
msgid "This e-mail address is already in use."
msgstr "Acest email este deja folosit."
-#: core/forms.py:180 gym/templates/gym/new_user.html:26
+#: core/forms.py:193 gym/templates/gym/new_user.html:26
#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:218
msgid "Password"
msgstr "Parola"
-#: core/forms.py:182
+#: core/forms.py:195
msgid "Please enter your current password."
msgstr "Te rog introdu parola curentă"
-#: core/forms.py:200
+#: core/forms.py:204 core/templates/language/view.html:62
+#: 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: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/muscles/admin-overview.html:17
+#: gym/templates/admin_notes/list.html:40
+#: gym/templates/contract_option/list.html:39
+#: gym/templates/contract_type/list.html:39 gym/templates/document/list.html:46
+#: gym/templates/gym/list.html:20 manager/templates/calendar/day.html:69
+#: 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:231
+#: 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:132
+#: nutrition/templates/units/list.html:20
+msgid "Delete"
+msgstr "Ștergere"
+
+#: core/forms.py:213
msgid "Invalid password"
msgstr "Parola incorectă"
-#: core/forms.py:212 core/forms.py:278
+#: core/forms.py:225 core/forms.py:291
msgid "The form is secured with reCAPTCHA"
msgstr ""
-#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:188
-#: core/templates/navigation.html:193 core/templates/template.html:149
-#: core/templates/user/login.html:20 core/views/user.py:293
+#: core/forms.py:239 core/forms.py:258 core/templates/navigation.html:179
+#: core/templates/navigation.html:184 core/templates/template.html:149
+#: core/templates/user/login.html:20 core/views/user.py:300
#: software/templates/features.html:38
msgid "Register"
msgstr "Inregistreaza-te"
-#: core/forms.py:256
+#: core/forms.py:269
msgid "Contact"
msgstr "Contact"
-#: core/forms.py:257
+#: core/forms.py:270
#, fuzzy
#| msgid "Some way of answering you (email, etc.)"
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:71
+#: core/forms.py:278 exercises/models/comment.py:42 manager/models/set.py:60
+#: manager/models/setting.py:111 nutrition/models/log.py:71
msgid "Comment"
msgstr "Comentariu"
-#: core/forms.py:266
+#: core/forms.py:279
msgid "What do you want to say?"
msgstr "Ce vrei să spui?"
@@ -327,6 +232,14 @@ msgstr "Ce vrei să spui?"
msgid "Day of the week"
msgstr ""
+#: core/models/language.py:31 core/templates/language/view.html:21
+msgid "Language short name"
+msgstr "Denumirea limbii scurt"
+
+#: core/models/language.py:36 core/templates/language/view.html:22
+msgid "Language full name"
+msgstr "Denumirea limbii complet"
+
#: core/models/license.py:29
msgid "Full name"
msgstr ""
@@ -382,21 +295,21 @@ msgstr "Metric (kilogram)"
msgid "Imperial (pound)"
msgstr "Imperial (pound)"
-#: core/models/profile.py:111
+#: core/models/profile.py:114
msgid "Show exercise comments"
msgstr "Arată comentariile exercițiilor"
-#: core/models/profile.py:112
+#: core/models/profile.py:115
msgid "Check to show exercise comments on the workout view"
msgstr ""
"Bifați pentru a afișa comentarii despre exerciții în vizualizarea "
"antrenamentului"
-#: core/models/profile.py:123
+#: core/models/profile.py:126
msgid "Also use ingredients in English"
msgstr "Folosește și ingrediente din limba Engleză"
-#: core/models/profile.py:125
+#: core/models/profile.py:128
msgid ""
"Check to also show ingredients in English while creating\n"
"a nutritional plan. These ingredients are extracted from a list provided\n"
@@ -411,130 +324,129 @@ msgstr ""
"7000 de intrări, dar pot fi oarecum copleșitoare și pot face căutarea "
"dificilă."
-#: core/models/profile.py:134
+#: core/models/profile.py:137
msgid "Activate workout reminders"
msgstr "Activați mementourile de antrenament"
-#: core/models/profile.py:136
+#: core/models/profile.py:139
msgid ""
"Check to activate automatic reminders for workouts. You need to provide a "
"valid email for this to work."
msgstr ""
-#: core/models/profile.py:145
+#: core/models/profile.py:148
msgid "Remind before expiration"
msgstr ""
-#: core/models/profile.py:146
+#: core/models/profile.py:149
msgid "The number of days you want to be reminded before a workout expires."
msgstr ""
-#: core/models/profile.py:152
+#: core/models/profile.py:155
msgid "Default duration of workouts"
msgstr ""
-#: core/models/profile.py:154
+#: core/models/profile.py:157
msgid ""
"Default duration in weeks of workouts not in a schedule. Used for email "
"workout reminders."
msgstr ""
-#: core/models/profile.py:171
+#: core/models/profile.py:174
msgid "Notification language"
msgstr ""
-#: core/models/profile.py:173
+#: core/models/profile.py:176
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/profile.py:186 gym/views/export.py:66
+#: core/models/profile.py:212 gym/views/export.py:66
msgid "Age"
msgstr ""
-#: core/models/profile.py:202 nutrition/forms.py:99
+#: core/models/profile.py:228 nutrition/forms.py:100
msgid "Height (cm)"
msgstr ""
-#: core/models/profile.py:219
+#: core/models/profile.py:245
msgid "Hours of sleep"
msgstr ""
-#: core/models/profile.py:220
+#: core/models/profile.py:246
msgid "The average hours of sleep per day"
msgstr ""
-#: core/models/profile.py:229
+#: core/models/profile.py:255
msgid "Work"
msgstr ""
-#: core/models/profile.py:230 core/models/profile.py:272
+#: core/models/profile.py:256 core/models/profile.py:298
msgid "Average hours per day"
msgstr ""
-#: core/models/profile.py:239 core/models/profile.py:260
-#: core/models/profile.py:281
+#: core/models/profile.py:265 core/models/profile.py:286
+#: core/models/profile.py:307
msgid "Physical intensity"
msgstr ""
-#: core/models/profile.py:240 core/models/profile.py:261
-#: core/models/profile.py:282
+#: core/models/profile.py:266 core/models/profile.py:287
+#: core/models/profile.py:308
msgid "Approximately"
msgstr ""
-#: core/models/profile.py:250
+#: core/models/profile.py:276
msgid "Sport"
msgstr ""
-#: core/models/profile.py:251
+#: core/models/profile.py:277
msgid "Average hours per week"
msgstr ""
-#: core/models/profile.py:271
+#: core/models/profile.py:297
msgid "Free time"
msgstr ""
-#: core/models/profile.py:292 nutrition/templates/rate/form.html:66
+#: core/models/profile.py:318 nutrition/templates/rate/form.html:66
msgid "Total daily calories"
msgstr ""
-#: core/models/profile.py:293
+#: core/models/profile.py:319
msgid "Total caloric intake, including e.g. any surplus"
msgstr ""
-#: core/models/profile.py:305 nutrition/models/ingredient_weight_unit.py:45
+#: core/models/profile.py:331 nutrition/models/ingredient_weight_unit.py:45
#: nutrition/models/log.py:90 nutrition/models/meal_item.py:58
msgid "Weight unit"
msgstr ""
-#: core/models/profile.py:313
+#: core/models/profile.py:339
msgid "Allow external access"
msgstr ""
-#: core/models/profile.py:315
+#: core/models/profile.py:341
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/profile.py:324
+#: core/models/profile.py:350
msgid "Automatic reminders for weight entries"
msgstr ""
-#: core/models/profile.py:326
+#: core/models/profile.py:352
msgid "Number of days after the last weight entry (enter 0 to deactivate)"
msgstr ""
-#: core/models/profile.py:392
+#: core/models/profile.py:418
msgid "The sum of all hours has to be 24"
msgstr ""
#: core/models/rep_unit.py:35 core/models/weight_unit.py:35
-#: core/templates/user/overview.html:263 core/views/user.py:575
+#: core/templates/user/overview.html:263 core/views/user.py:591
#: 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
+#: exercises/models/exercise.py:64 exercises/models/muscle.py:36
#: 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
@@ -593,6 +505,52 @@ msgstr ""
msgid "Are you sure you want to delete this? This action cannot be undone."
msgstr ""
+#: core/templates/email_verification/confirm_template.html:4
+msgid "Email verified"
+msgstr ""
+
+#: core/templates/email_verification/confirm_template.html:18
+#, python-format
+msgid "%(username)s, your email was verified"
+msgstr ""
+
+#: core/templates/email_verification/confirm_template.html:22
+msgid "Error, invalid verification token"
+msgstr ""
+
+#: core/templates/email_verification/email_body_html.tpl:6
+#, fuzzy
+#| msgid "Administration"
+msgid "Email Confirmation"
+msgstr "Administrație"
+
+#: core/templates/email_verification/email_body_html.tpl:9
+#: core/templates/email_verification/email_body_txt.tpl:3
+#, python-format
+msgid "You are almost there, %(username)s!"
+msgstr ""
+
+#: core/templates/email_verification/email_body_html.tpl:11
+#, python-format
+msgid "Please click <a href=\"%(link)s\">here</a> to confirm your email"
+msgstr ""
+
+#: core/templates/email_verification/email_body_html.tpl:12
+#: core/templates/email_verification/email_body_txt.tpl:5
+#, python-format
+msgid "The token expires on %(time)s"
+msgstr ""
+
+#: core/templates/email_verification/email_body_html.tpl:14
+#: core/templates/email_verification/email_body_txt.tpl:8
+msgid "the wger Team"
+msgstr ""
+
+#: core/templates/email_verification/email_body_txt.tpl:4
+#, python-format
+msgid "Please click the following link to confirm your email: %(link)s"
+msgstr ""
+
#: core/templates/index.html:4
msgid "Dashboard"
msgstr ""
@@ -649,7 +607,7 @@ msgid "Add custom diary entry"
msgstr ""
#: core/templates/index.html:84 core/templates/index.html:92
-#: manager/models/day.py:34 manager/models/log.py:56
+#: manager/models/day.py:34 manager/models/log.py:58
#: manager/models/session.py:60 manager/models/workout.py:109
#: manager/templates/schedule/view.html:105
#: manager/templates/workout/view.html:11
@@ -680,6 +638,20 @@ msgstr ""
msgid "No workouts found."
msgstr ""
+#: core/templates/index.html:137 core/templates/index.html:189
+#: core/templates/language/overview.html:23
+#: 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:150
+#: nutrition/templates/plan/view.html:153
+#: nutrition/templates/plan/view.html:191
+msgid "Add one now."
+msgstr ""
+
#: 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
@@ -733,19 +705,59 @@ msgid "No nutrition plans."
msgstr ""
#: 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
+#: core/templates/user/overview.html:121 manager/forms.py:184
+#: manager/helpers.py:89 manager/models/log.py:86 manager/models/setting.py:79
+#: manager/templates/log/add.html:54 manager/templates/set/formset.html:11
#: weight/models.py: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:210 core/templates/navigation.html:135
+#: core/templates/index.html:210 core/templates/navigation.html:126
#: weight/views.py:70
msgid "Add weight entry"
msgstr ""
+#: core/templates/language/overview.html:4 core/templates/navigation.html:217
+msgid "Languages"
+msgstr "Limbi"
+
+#: core/templates/language/overview.html:23
+msgid "Nothing found."
+msgstr ""
+
+#: core/templates/language/overview.html:36 core/templates/license/list.html:38
+#: core/templates/misc/license/list.html:41
+#: core/templates/repetition_unit/list.html:41
+#: core/templates/user/overview.html:327 core/templates/user/overview.html:366
+#: core/templates/user/overview.html:402
+#: core/templates/weight_unit/list.html:41 core/views/languages.py:73
+#: core/views/license.py:65 core/views/repetition_units.py:65
+#: core/views/weight_units.py:65
+#: exercises/templates/categories/admin-overview.html:36
+#: 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:61
+msgid "Add"
+msgstr "Adăugare"
+
+#: core/templates/language/view.html:52 core/templates/user/api_key.html:44
+#: core/templates/user/preferences.html:44 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:45
+msgid "Options"
+msgstr "Opțiuni"
+
#: core/templates/license/list.html:4 core/templates/misc/license/list.html:4
msgid "License list"
msgstr ""
@@ -758,7 +770,6 @@ msgstr ""
#: core/templates/weight_unit/list.html:26
#: exercises/templates/categories/admin-overview.html:24
#: exercises/templates/equipment/admin-overview.html:24
-#: exercises/templates/exercise/pending.html:30
#: exercises/templates/muscles/admin-overview.html:24
#: gym/templates/admin_notes/list.html:52 gym/templates/contract/list.html:60
#: gym/templates/contract_option/list.html:56
@@ -838,155 +849,135 @@ msgstr ""
msgid "Public templates"
msgstr ""
-#: core/templates/navigation.html:64
-msgctxt "as in sorted by category"
-msgid "by category"
-msgstr ""
-
-#: core/templates/navigation.html:65
-msgctxt "as in sorted by muscle"
-msgid "by muscle"
-msgstr ""
-
-#: core/templates/navigation.html:66
-msgctxt "as in sorted by equipment"
-msgid "by equipment"
-msgstr ""
-
-#: core/templates/navigation.html:70
-#: exercises/templates/equipment/overview.html:109
-#: exercises/templates/equipment/overview.html:113
-#: exercises/templates/exercise/overview.html:112
-#: exercises/templates/exercise/overview.html:116
-#: exercises/templates/muscles/overview.html:112
-#: exercises/templates/muscles/overview.html:116
-msgid "Add new exercise"
-msgstr "Adăugați un exercițiu nou"
+#: core/templates/navigation.html:63 manager/forms.py:133
+#: manager/models/setting.py:54
+msgid "Exercises"
+msgstr "Exerciții"
-#: core/templates/navigation.html:75 core/templates/navigation.html:116
-#: core/templates/navigation.html:224
+#: core/templates/navigation.html:67 core/templates/navigation.html:107
+#: core/templates/navigation.html:215
msgid "Administration"
msgstr "Administrație"
-#: core/templates/navigation.html:76
-#: exercises/templates/exercise/pending.html:6
-msgid "Exercises pending review"
-msgstr ""
+#: core/templates/navigation.html:68
+#, fuzzy
+#| msgid "Exercise Categories"
+msgid "Exercise edit history"
+msgstr "Categorii de Exerciții"
-#: core/templates/navigation.html:77 exercises/models/base.py:72
-#: exercises/templates/exercise/view.html:80
+#: core/templates/navigation.html:69 exercises/models/base.py:84
msgid "Equipment"
msgstr ""
-#: core/templates/navigation.html:78 exercises/templates/exercise/view.html:258
+#: core/templates/navigation.html:70
msgid "Muscles"
msgstr "Mușchii"
-#: core/templates/navigation.html:79
+#: core/templates/navigation.html:71
#: exercises/templates/categories/admin-overview.html:4
msgid "Categories"
msgstr ""
-#: core/templates/navigation.html:93 software/templates/features.html:87
+#: core/templates/navigation.html:84 software/templates/features.html:87
msgid "Nutrition"
msgstr ""
-#: core/templates/navigation.html:99 core/templates/user/overview.html:144
+#: core/templates/navigation.html:90 core/templates/user/overview.html:144
msgid "Nutrition plans"
msgstr ""
-#: core/templates/navigation.html:105 nutrition/templates/bmi/form.html:50
+#: core/templates/navigation.html:96 nutrition/templates/bmi/form.html:50
msgid "BMI calculator"
msgstr ""
-#: core/templates/navigation.html:111 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:102 nutrition/templates/rate/form.html:17
msgid "Daily calories calculator"
msgstr ""
-#: core/templates/navigation.html:113
+#: core/templates/navigation.html:104
#: nutrition/templates/ingredient/overview.html:29
msgid "Ingredient overview"
msgstr ""
-#: core/templates/navigation.html:117 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:108 nutrition/templates/units/list.html:6
msgid "Ingredient weight units"
msgstr ""
-#: core/templates/navigation.html:118
+#: core/templates/navigation.html:109
#: nutrition/templates/ingredient/pending.html:6
msgid "Ingredients pending review"
msgstr ""
-#: core/templates/navigation.html:132
+#: core/templates/navigation.html:123
msgid "Body weight"
msgstr ""
-#: core/templates/navigation.html:134 core/templates/user/overview.html:114
+#: core/templates/navigation.html:125 core/templates/user/overview.html:114
#: weight/templates/overview.html:7
msgid "Weight overview"
msgstr ""
-#: core/templates/navigation.html:147
+#: core/templates/navigation.html:138
msgid "About this software"
msgstr ""
-#: core/templates/navigation.html:149 core/templates/template_features.html:82
+#: core/templates/navigation.html:140 core/templates/template_features.html:82
#: software/templates/about_us.html:5
msgid "About us"
msgstr ""
-#: core/templates/navigation.html:151 software/templates/features.html:209
+#: core/templates/navigation.html:142 software/templates/features.html:209
msgid "REST API"
msgstr ""
-#: core/templates/navigation.html:155 utils/models.py:40
+#: core/templates/navigation.html:146 utils/models.py:41
msgid "License"
msgstr ""
-#: core/templates/navigation.html:161
+#: core/templates/navigation.html:152
msgid "Developer documentation"
msgstr ""
-#: core/templates/navigation.html:167
+#: core/templates/navigation.html:158
msgid "Get the code"
msgstr ""
-#: core/templates/navigation.html:173 core/templates/template.html:204
+#: core/templates/navigation.html:164 core/templates/template.html:203
#: core/templates/template_features.html:99
msgid "Translate"
msgstr ""
-#: core/templates/navigation.html:194 core/templates/user/login.html:28
+#: core/templates/navigation.html:185 core/templates/user/login.html:28
msgid "Reset password"
msgstr ""
-#: core/templates/navigation.html:207
+#: core/templates/navigation.html:198
msgid "My preferences"
msgstr ""
-#: core/templates/navigation.html:214
+#: core/templates/navigation.html:205
msgid "Logout"
msgstr ""
-#: core/templates/navigation.html:229
+#: core/templates/navigation.html:220
msgid "Licenses"
msgstr ""
-#: core/templates/navigation.html:232
+#: core/templates/navigation.html:223
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr ""
-#: core/templates/navigation.html:235 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:226 core/templates/weight_unit/list.html:4
#: nutrition/templates/ingredient/view.html:174
msgid "Weight units"
msgstr ""
-#: core/templates/navigation.html:238 core/templates/user/list.html:4
+#: core/templates/navigation.html:229 core/templates/user/list.html:4
msgid "User list"
msgstr ""
-#: core/templates/navigation.html:239
+#: core/templates/navigation.html:230
msgid "Gyms"
msgstr ""
@@ -1063,33 +1054,30 @@ msgstr ""
msgid "Add weight log"
msgstr ""
-#: core/templates/tags/render_day.html:114
-#: exercises/templates/equipment/overview.html:59
-#: exercises/templates/exercise/overview.html:63
-#: exercises/templates/muscles/overview.html:65
+#: core/templates/tags/render_day.html:116
msgid "Placeholder image for exercise"
msgstr ""
-#: core/templates/tags/render_day.html:131
+#: core/templates/tags/render_day.html:133
msgid "This exercise has no repetitions."
msgstr ""
-#: core/templates/tags/render_day.html:134
+#: core/templates/tags/render_day.html:136
msgid "Edit them now."
msgstr ""
-#: core/templates/tags/render_day.html:159
+#: core/templates/tags/render_day.html:162
msgid "Add exercises to this workout day"
msgstr ""
#: core/templates/tags/render_weight_log.html:17 manager/helpers.py:89
-#: manager/models/setting.py:57 manager/templates/set/formset.html:10
+#: manager/models/setting.py:69 manager/templates/set/formset.html:9
msgid "Reps"
msgstr ""
-#: 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
+#: core/templates/tags/render_weight_log.html:30 manager/forms.py:189
+#: manager/models/log.py:103 manager/models/setting.py:99
+#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
msgid "RiR"
msgstr ""
@@ -1112,7 +1100,7 @@ msgstr ""
msgid "Features"
msgstr ""
-#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:37
+#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:53
msgid "API key"
msgstr ""
@@ -1152,11 +1140,12 @@ msgid "Documentation"
msgstr ""
#: core/templates/user/delete_account.html:4
-#: core/templates/user/preferences.html:42
+#: core/templates/user/preferences.html:58
msgid "Delete account"
msgstr ""
#: core/templates/user/delete_account.html:17
+#: exercises/templates/history/overview.html:93
msgid "Are you sure?"
msgstr ""
@@ -1201,11 +1190,12 @@ 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/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
+#: exercises/models/base.py:99 exercises/models/base.py:104
+#: exercises/models/exercise.py:69 exercises/models/exercise.py:76
+#: gallery/models/image.py:47 manager/helpers.py:88 manager/models/log.py:100
+#: 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/views.py:150
@@ -1213,11 +1203,11 @@ msgid "Date"
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: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
+#: exercises/models/exercise.py:57 exercises/views/exercises.py:123
+#: 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 "Descriere"
@@ -1225,12 +1215,12 @@ msgstr "Descriere"
msgid "Number of logs (days)"
msgstr ""
-#: core/templates/user/overview.html:37 core/views/user.py:576
+#: core/templates/user/overview.html:37 core/views/user.py:592
#: 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:267
+#: core/templates/user/overview.html:68 manager/forms.py:278
#: manager/templates/workout/view.html:151
msgid "Log"
msgstr ""
@@ -1248,6 +1238,7 @@ msgid "Notes"
msgstr ""
#: core/templates/user/overview.html:79
+#: exercises/templates/history/overview.html:30
#: manager/templates/calendar/partial_overview_table.html:42
#: nutrition/templates/log/detail.html:154
msgid "Time"
@@ -1295,10 +1286,12 @@ msgid "Do you really want to change this user&#39;s password?"
msgstr ""
#: core/templates/user/overview.html:233
+#: exercises/templates/history/overview.html:106
msgid "No"
msgstr ""
#: core/templates/user/overview.html:234
+#: exercises/templates/history/overview.html:99
msgid "Yes"
msgstr ""
@@ -1353,10 +1346,15 @@ msgid "Documents"
msgstr ""
#: core/templates/user/overview.html:413 gym/templates/document/list.html:32
-#: manager/forms.py:279 manager/templates/workout/view.html:176
+#: manager/forms.py:290 manager/templates/workout/view.html:176
msgid "Download"
msgstr ""
+#: core/templates/user/overview.html:451 gym/views/admin_config.py:44
+#: gym/views/admin_config.py:58 gym/views/user_config.py:46
+msgid "Configuration"
+msgstr ""
+
#: core/templates/user/overview.html:454 gym/models/user_config.py:92
msgid "Include in inactive overview"
msgstr ""
@@ -1374,7 +1372,23 @@ msgstr ""
msgid "Preferences"
msgstr ""
-#: core/templates/user/preferences.html:33 core/views/user.py:587
+#: core/templates/user/preferences.html:19
+msgid "Verified email"
+msgstr ""
+
+#: core/templates/user/preferences.html:24
+msgid "Unverified email"
+msgstr ""
+
+#: core/templates/user/preferences.html:26
+msgid "Send verification email"
+msgstr ""
+
+#: core/templates/user/preferences.html:30
+msgid "You need to verify your email to contribute exercises"
+msgstr ""
+
+#: core/templates/user/preferences.html:49 core/views/user.py:603
msgid "Change password"
msgstr ""
@@ -1404,39 +1418,37 @@ msgid "oz"
msgstr ""
#: 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
+#: exercises/views/equipment.py:104 exercises/views/exercises.py:185
+#: exercises/views/muscles.py:99 manager/views/schedule.py:311
+#: manager/views/schedule_step.py:129 manager/views/workout.py:269
+#: manager/views/workout_session.py:141 nutrition/views/ingredient.py:138
#: 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:431
-#: exercises/views/muscles.py:125 gallery/views/images.py:121
+#: exercises/views/categories.py:127 exercises/views/exercises.py:193
+#: exercises/views/muscles.py:106 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
+#: manager/views/workout.py:273 manager/views/workout_session.py:156
+#: nutrition/views/ingredient.py:145 nutrition/views/plan.py:127
#: nutrition/views/unit.py:118
#, python-brace-format
msgid "Delete {0}?"
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/repetition_units.py:85 core/views/user.py:472
#: 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: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
+#: exercises/views/equipment.py:81 exercises/views/muscles.py:86
+#: 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:170
+#: gym/views/gym.py:459 manager/views/day.py:100 manager/views/schedule.py:335
+#: manager/views/workout.py:287 nutrition/views/ingredient.py:164
+#: nutrition/views/plan.py:144 nutrition/views/unit.py:144
#, python-brace-format
msgid "Edit {0}"
msgstr "Editare {0}?"
@@ -1464,64 +1476,65 @@ msgstr ""
msgid "Your feedback was successfully sent. Thank you!"
msgstr ""
-#: core/views/user.py:156
+#: core/views/user.py:157
#, python-brace-format
msgid "Account \"{0}\" was successfully deleted"
msgstr ""
-#: core/views/user.py:287
+#: core/views/user.py:294
msgid "You were successfully registered"
msgstr ""
-#: core/views/user.py:339
+#: core/views/user.py:355
msgid "Settings successfully updated"
msgstr ""
-#: core/views/user.py:376
+#: core/views/user.py:392
msgid "The user was successfully deactivated"
msgstr ""
-#: core/views/user.py:411
+#: core/views/user.py:427
msgid "The user was successfully activated"
msgstr ""
-#: core/views/user.py:426
+#: core/views/user.py:442
msgid "Edit user"
msgstr ""
-#: core/views/user.py:573 gym/templates/gym/member_list.html:26
+#: core/views/user.py:589 gym/templates/gym/member_list.html:26
#: gym/views/gym.py:156
msgid "ID"
msgstr ""
-#: core/views/user.py:574 gym/forms.py:94 gym/templates/contract/view.html:55
+#: core/views/user.py:590 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:577 gym/templates/gym/new_user.html:34
+#: core/views/user.py:593 gym/templates/gym/new_user.html:34
#: gym/views/export.py:60 gym/views/gym.py:218
msgid "Gym"
msgstr ""
-#: exercises/models/base.py:51 exercises/templates/exercise/view.html:76
-#: nutrition/models/ingredient.py:204
+#: core/views/user.py:652
+#, python-format
+msgid "A verification email was sent to %(email)s"
+msgstr ""
+
+#: exercises/models/base.py:63 nutrition/models/ingredient.py:204
msgid "Category"
msgstr "Categoria"
-#: exercises/models/base.py:58
+#: exercises/models/base.py:70
msgid "Primary muscles"
msgstr "Mușchii primari"
-#: exercises/models/base.py:64 exercises/templates/equipment/overview.html:71
-#: exercises/templates/exercise/overview.html:76
-#: exercises/templates/exercise/view.html:268
-#: exercises/templates/muscles/overview.html:77
+#: exercises/models/base.py:76
msgid "Secondary muscles"
msgstr "Mușchii secundari"
-#: exercises/models/base.py:79
+#: exercises/models/base.py:91
msgid "Variations"
msgstr ""
@@ -1529,92 +1542,70 @@ msgstr ""
msgid "Exercise Categories"
msgstr "Categorii de Exerciții"
-#: exercises/models/comment.py:34 exercises/models/exercise_alias.py:32
-#: exercises/models/image.py:75 exercises/models/video.py:82
-#: manager/forms.py:165 manager/helpers.py:89 manager/models/log.py:51
+#: exercises/models/comment.py:37 exercises/models/exercise_alias.py:35
+#: exercises/models/image.py:71 exercises/models/video.py:95
+#: manager/forms.py:176 manager/helpers.py:89 manager/models/log.py:52
msgid "Exercise"
msgstr "Exercițiu"
-#: exercises/models/comment.py:41
+#: exercises/models/comment.py:43
msgid "A comment about how to correctly do this exercise."
msgstr "Comentariu despre modul de a face acest exercițiu corect."
-#: exercises/models/exercise.py:86 nutrition/models/ingredient.py:80
+#: exercises/models/exercise.py:81 nutrition/models/ingredient.py:80
#: nutrition/models/plan.py:61 nutrition/models/weight_unit.py:32
msgid "Language"
msgstr "Limba"
-#: exercises/models/exercise.py:237 exercises/views/exercises.py:461
-msgid "Exercise was successfully added to the general database"
-msgstr ""
-
-#: exercises/models/exercise.py:265
-msgid "New user submitted exercise"
-msgstr ""
-
-#: exercises/models/exercise.py:267
-#, python-brace-format
-msgid "The user {0} submitted a new exercise \"{1}\"."
-msgstr ""
-
-#: exercises/models/exercise_alias.py:35
+#: exercises/models/exercise_alias.py:38
#, fuzzy
#| msgid "Add new exercise"
msgid "Alias for an exercise"
msgstr "Adăugați un exercițiu nou"
-#: exercises/models/image.py:59
+#: exercises/models/image.py:55
msgid "Line"
msgstr ""
-#: exercises/models/image.py:60
+#: exercises/models/image.py:56
msgid "3D"
msgstr ""
-#: exercises/models/image.py:61
+#: exercises/models/image.py:57
msgid "Low-poly"
msgstr ""
-#: exercises/models/image.py:62
+#: exercises/models/image.py:58
msgid "Photo"
msgstr ""
-#: exercises/models/image.py:63
+#: exercises/models/image.py:59
msgid "Other"
msgstr ""
-#: exercises/models/image.py:81 gallery/models/image.py:56
+#: exercises/models/image.py:77 gallery/models/image.py:56
msgid "Image"
msgstr ""
-#: exercises/models/image.py:82 gallery/models/image.py:57
+#: exercises/models/image.py:78 gallery/models/image.py:57
msgid "Only PNG and JPEG formats are supported"
msgstr ""
-#: exercises/models/image.py:88
+#: exercises/models/image.py:84
msgid "Main picture"
msgstr ""
-#: exercises/models/image.py:91
+#: exercises/models/image.py:87
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:100
+#: exercises/models/image.py:96
msgid "The art style of your image"
msgstr ""
-#: exercises/models/image.py:185
-msgid "New user submitted image"
-msgstr ""
-
-#: exercises/models/image.py:186
-#, python-brace-format
-msgid "The user {0} submitted a new image \"{1}\" for exercise {2}."
-msgstr ""
-
#: exercises/models/muscle.py:37
msgid "In latin, e.g. \"Pectoralis major\""
msgstr ""
@@ -1629,51 +1620,52 @@ msgstr "numele exercițiului"
msgid "A more basic name for the muscle"
msgstr ""
-#: exercises/models/video.py:41
-msgid "Maximum file size is 100MB."
+#: exercises/models/video.py:50
+#, python-format
+msgid "Maximum file size is %(size)sMB."
msgstr ""
-#: exercises/models/video.py:44 exercises/models/video.py:48
+#: exercises/models/video.py:57 exercises/models/video.py:65
msgid "File type is not supported"
msgstr ""
-#: exercises/models/video.py:57
+#: exercises/models/video.py:70
#, 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
+#: exercises/models/video.py:101
msgid "Main video"
msgstr ""
-#: exercises/models/video.py:94
+#: exercises/models/video.py:107
msgid "Video"
msgstr ""
-#: exercises/models/video.py:101
+#: exercises/models/video.py:114
msgid "Size"
msgstr ""
-#: exercises/models/video.py:108 manager/models/schedule_step.py:56
+#: exercises/models/video.py:121 manager/models/schedule_step.py:56
msgid "Duration"
msgstr ""
-#: exercises/models/video.py:117
+#: exercises/models/video.py:130
msgid "Width"
msgstr ""
-#: exercises/models/video.py:124
+#: exercises/models/video.py:137
#, fuzzy
#| msgid "Weight log"
msgid "Height"
msgstr "Jurnalul de greutate"
-#: exercises/models/video.py:131
+#: exercises/models/video.py:144
msgid "Codec"
msgstr ""
-#: exercises/models/video.py:139
+#: exercises/models/video.py:152
msgid "Codec, long name"
msgstr ""
@@ -1682,227 +1674,69 @@ msgid "Equipment list"
msgstr ""
#: exercises/templates/equipment/admin-overview.html:37
-#: exercises/views/equipment.py:94
+#: exercises/views/equipment.py:92
msgid "Add new equipment"
msgstr ""
-#: exercises/templates/equipment/overview.html:11
-msgid "Equipment overview"
-msgstr ""
-
-#: exercises/templates/equipment/overview.html:69
-#: exercises/templates/exercise/overview.html:74
-#: exercises/templates/exercise/view.html:264
-#: exercises/templates/muscles/overview.html:75
-msgid "Main muscles"
-msgstr "Mușchii principali"
-
-#: exercises/templates/equipment/overview.html:79
-msgid ""
-"No exercises for this equipment. Add or edit an exercise and set the "
-"equipment."
-msgstr ""
-
-#: exercises/templates/equipment/overview.html:96
-#: exercises/templates/exercise/overview.html:99
-#: nutrition/templates/ingredient/overview.html:57
-msgid "Search"
-msgstr "Căutare"
-
-#: exercises/templates/equipment/overview.html:101
-#: exercises/templates/exercise/overview.html:104
-msgid "exercise name"
-msgstr "numele exercițiului"
-
-#: exercises/templates/equipment/overview.html:115
-#: exercises/templates/exercise/overview.html:118
-#: exercises/templates/muscles/overview.html:118
-#: nutrition/templates/ingredient/overview.html:85
-msgid "Only registered users can do this"
-msgstr ""
-
-#: exercises/templates/exercise/email_new.tpl:1
-#, python-format
-msgid ""
-"Your exercise '%(exercise)s' was successfully added to the general\n"
-"database."
-msgstr ""
-
-#: exercises/templates/exercise/email_new.tpl:4
-msgid ""
-"It is now available on the exercise and muscle overview and can be\n"
-"added to workouts. You can access it on this address:"
-msgstr ""
-
-#: exercises/templates/exercise/email_new.tpl:8
-#: nutrition/templates/ingredient/email_new.tpl:8
-msgid "Thank you for contributing and making this site better!"
-msgstr ""
-
-#: exercises/templates/exercise/email_new.tpl:9
-#: manager/templates/workout/email_reminder.tpl:15
-#: manager/templates/workout/email_weight_reminder.tpl:12
-#: nutrition/templates/ingredient/email_new.tpl:9
-#, python-format
-msgid "The %(site)s team"
-msgstr ""
-
-#: exercises/templates/exercise/form.html:4
-msgid "Submitting an exercise"
-msgstr "Depunerea unui exercițiu"
-
-#: exercises/templates/exercise/form.html:5
-msgid ""
-"Thank you for submitting an exercise. This is much\n"
-"appreciated!"
-msgstr ""
-"Vă mulțumim pentru trimiterea unui exercițiu. E mult ⏎\n"
-"apreciat!"
-
-#: exercises/templates/exercise/form.html:8
-msgid ""
-"After you submit the form, the administrators will be notified.\n"
-"Once it is reviewed, it will be added to the database. Till this happens,\n"
-"it will not be visible in the overview or the search. In case you added your "
-"email\n"
-"when you registered, you will get notified when the process is completed "
-"successfully."
-msgstr ""
-
-#: exercises/templates/exercise/form_correct.html:4
-msgid "Correcting an exercise"
-msgstr ""
-
-#: exercises/templates/exercise/form_correct.html:5
-msgid ""
-"Thank you for correcting and improving this exercise.\n"
-"This is much appreciated!"
-msgstr ""
-
-#: exercises/templates/exercise/form_correct.html:8
-msgid ""
-"After you submit the form, the administrators will be notified.\n"
-"Once the changes are reviewed the exercise will be updated."
-msgstr ""
-
-#: exercises/templates/exercise/overview.html:88
-msgid "No categories."
-msgstr "Nici o categorie."
-
-#: exercises/templates/exercise/overview.html:88
-msgid "Use link to create one"
-msgstr "Folosiți link-ul pentru a crea una"
-
-#: exercises/templates/exercise/pending.html:14
-#: nutrition/templates/ingredient/pending.html:14
-msgid "Submission date"
-msgstr "Data depunerii"
-
-#: 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/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 "Utilizator"
-
-#: exercises/templates/exercise/view.html:48
-msgid "Exercise is pending review"
-msgstr "Exercițiul este în așteptare revizuire"
-
-#: exercises/templates/exercise/view.html:51
-msgid ""
-"This user submitted exercise is pending a decision to be\n"
-" included in the database."
-msgstr ""
-
-#: exercises/templates/exercise/view.html:53
-msgid "Till then, it will not be shown in the overview or the search."
-msgstr ""
-"Până atunci el nu va fi indicat in prezentarea generală sau in căutare."
-
-#: exercises/templates/exercise/view.html:54
-#: nutrition/templates/ingredient/view.html:31
-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:203
-#: nutrition/templates/ingredient/view.html:38
-msgid "Accept"
-msgstr "Acceptare"
-
-#: exercises/templates/exercise/view.html:64
-#: exercises/templates/exercise/view.html:204
-#: nutrition/templates/ingredient/view.html:42
-msgid "Decline"
-msgstr "Declinare"
+#: exercises/templates/history/overview.html:11
+#, fuzzy
+#| msgid "Exercise Categories"
+msgid "Exercise admin history"
+msgstr "Categorii de Exerciții"
-#: exercises/templates/exercise/view.html:96
-msgid "Images"
-msgstr ""
+#: exercises/templates/history/overview.html:27
+#, fuzzy
+#| msgid "Options"
+msgid "Action"
+msgstr "Opțiuni"
-#: exercises/templates/exercise/view.html:137 exercises/views/images.py:93
-msgid "Add new image"
-msgstr ""
+#: exercises/templates/history/overview.html:28 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/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 "Utilizator"
-#: exercises/templates/exercise/view.html:148
-msgid "Videos"
+#: exercises/templates/history/overview.html:29
+msgid "Object"
msgstr ""
-#: exercises/templates/exercise/view.html:187 exercises/views/videos.py:94
+#: exercises/templates/history/overview.html:31
#, fuzzy
-#| msgid "Add new exercise"
-msgid "Add new video"
-msgstr "Adăugați un exercițiu nou"
+#| msgctxt "Noun, not verb"
+#| msgid "Change"
+msgid "Changes"
+msgstr "Schimba"
-#: exercises/templates/exercise/view.html:197
-msgid "Images pending review"
+#: exercises/templates/history/overview.html:32
+msgid "Revert"
msgstr ""
-#: exercises/templates/exercise/view.html:218
-msgid "Comments for this exercise"
-msgstr "Comentarii pentru acest exercițiu"
-
-#: exercises/templates/exercise/view.html:246
-msgid "Add new comment"
-msgstr "Adaugați un comentariu"
-
-#: 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:301
-#: manager/templates/workout/log.html:10 manager/templates/workout/log.html:11
-msgid "Weight log"
-msgstr "Jurnalul de greutate"
+#: exercises/templates/history/overview.html:64
+msgid "View Object"
+msgstr ""
-#: exercises/templates/exercise/view.html:306
-msgid "Exercise Variations"
+#: exercises/templates/history/overview.html:75
+msgid "View changes"
msgstr ""
-#: exercises/templates/exercise/view.html:327
-msgid "Submit a correction"
+#: exercises/templates/history/overview.html:86
+msgid "Revert changes"
msgstr ""
#: exercises/templates/muscles/admin-overview.html:4
-#: exercises/templates/muscles/overview.html:7
msgid "Muscle overview"
msgstr "Prezentarea generală de muschi"
#: exercises/templates/muscles/admin-overview.html:36
-#: exercises/views/muscles.py:86
+#: exercises/views/muscles.py:67
msgid "Add muscle"
msgstr "Adaugă un mușchi"
-#: exercises/templates/muscles/overview.html:85
-msgid ""
-"No exercises for this muscle. Add or edit an exercise and set the muscle."
-msgstr ""
-
#: exercises/views/categories.py:71
msgid "Add category"
msgstr "Adăugați categoria"
@@ -1915,50 +1749,19 @@ msgstr ""
msgid "Add exercise comment"
msgstr ""
-#: exercises/views/equipment.py:107 exercises/views/equipment.py:118
+#: exercises/views/equipment.py:105 exercises/views/equipment.py:116
msgid "Delete equipment?"
msgstr ""
-#: exercises/views/exercises.py:229
+#: exercises/views/exercises.py:161
#, python-format
-msgid ""
-"%(name_original)s is too similar to existing exercise \"%(exercise_name)s\""
-msgstr ""
-
-#: exercises/views/exercises.py:247
-msgid "Add exercise"
-msgstr ""
-
-#: exercises/views/exercises.py:367
-msgid "Thank you. Once the changes are reviewed the exercise will be updated."
-msgstr ""
-
-#: exercises/views/exercises.py:380
-#, python-brace-format
-msgid "Correct {0}"
+msgid "%(name)s is too similar to existing exercise \"%(exercise_name)s\""
msgstr ""
-#: exercises/views/exercises.py:422
+#: exercises/views/exercises.py:184
msgid "This will delete the exercise from all workouts."
msgstr ""
-#: exercises/views/exercises.py:474
-msgid "Exercise was successfully marked as rejected"
-msgstr ""
-
-#: exercises/views/images.py:68
-msgid "Edit exercise image"
-msgstr ""
-
-#: exercises/views/images.py:143
-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"
@@ -2027,7 +1830,7 @@ msgid "Contract type"
msgstr ""
#: gym/models/contract.py:208 gym/templates/contract/view.html:59
-#: manager/templates/log/add.html:52 nutrition/forms.py:59
+#: manager/templates/log/add.html:52 nutrition/forms.py:60
#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:102
#: nutrition/models/meal_item.py:72
msgid "Amount"
@@ -2128,6 +1931,10 @@ msgstr ""
msgid "User notes"
msgstr ""
+#: gym/templates/contract/list.html:36
+msgid "Show"
+msgstr ""
+
#: gym/templates/contract/view.html:4
msgid "Contract"
msgstr ""
@@ -2206,10 +2013,6 @@ msgstr ""
msgid "Add member"
msgstr ""
-#: gym/templates/gym/new_user.html:38
-msgid "Date of Birth"
-msgstr ""
-
#: gym/templates/gym/new_user.html:48 manager/templates/calendar/month.html:144
#: manager/templates/log/add.html:75 nutrition/templates/rate/form.html:120
msgid "Info"
@@ -2266,132 +2069,132 @@ msgstr ""
msgid "Edit gym"
msgstr ""
-#: i18n.tpl:2 i18n.tpl:28
+#: i18n.tpl:2
+msgid "Until Failure"
+msgstr "Până la eșec"
+
+#: i18n.tpl:3 manager/forms.py:180 manager/models/log.py:73
+#: manager/templates/set/add.html:53
+msgid "Repetitions"
+msgstr ""
+
+#: i18n.tpl:4
msgid "Abs"
msgstr "Abdomen"
-#: i18n.tpl:3
+#: i18n.tpl:5
msgid "Arms"
msgstr "Brate"
-#: i18n.tpl:4
-msgid "Back"
-msgstr "Înapoi"
-
-#: i18n.tpl:5 i18n.tpl:23
-msgid "Calves"
-msgstr ""
-
-#: i18n.tpl:6 i18n.tpl:26
-msgid "Chest"
-msgstr "Piept"
-
-#: i18n.tpl:7
+#: i18n.tpl:6
msgid "Legs"
msgstr "Picioare"
-#: i18n.tpl:8 i18n.tpl:19
-msgid "Shoulders"
-msgstr "Umeri"
+#: i18n.tpl:7
+msgid "Dumbbell"
+msgstr "Haltere"
+
+#: i18n.tpl:8
+#, fuzzy
+#| msgid "Biceps brachii"
+msgid "Biceps"
+msgstr "Biceps brachii"
#: i18n.tpl:9
-msgid "Barbell"
-msgstr "Barbell"
+msgid "SZ-Bar"
+msgstr "SZ-Bar"
#: i18n.tpl:10
-msgid "Bench"
-msgstr "Bancă"
+msgid "Kettlebell"
+msgstr "Kettlebell"
#: i18n.tpl:11
-msgid "Dumbbell"
-msgstr "Haltere"
+msgid "Swiss Ball"
+msgstr "Minge Elvețiană"
#: i18n.tpl:12
-msgid "Gym mat"
-msgstr "Saltea de gimnastica"
+msgid "none (bodyweight exercise)"
+msgstr "nici unul (exercițiu cu greutate corporală)"
#: i18n.tpl:13
-msgid "Incline bench"
-msgstr "Bancă înclinată"
+msgid "Calves"
+msgstr ""
#: i18n.tpl:14
-msgid "Kettlebell"
-msgstr "Kettlebell"
+msgid "Back"
+msgstr "Înapoi"
#: i18n.tpl:15
-msgid "Pull-up bar"
-msgstr "Bara de tragere"
+msgid "Lower back"
+msgstr ""
#: i18n.tpl:16
-msgid "SZ-Bar"
-msgstr "SZ-Bar"
+msgid "Lats"
+msgstr ""
#: i18n.tpl:17
-msgid "Swiss Ball"
-msgstr "Minge Elvețiană"
+msgid "Hamstrings"
+msgstr ""
#: i18n.tpl:18
-msgid "none (bodyweight exercise)"
-msgstr "nici unul (exercițiu cu greutate corporală)"
+msgid "Bench"
+msgstr "Bancă"
-#: i18n.tpl:20
+#: i18n.tpl:19
#, fuzzy
-#| msgid "Biceps brachii"
-msgid "Biceps"
-msgstr "Biceps brachii"
+#| msgid "Minutes"
+msgid "Glutes"
+msgstr "Minute"
+
+#: i18n.tpl:20
+msgid "Kilometers"
+msgstr "Kilometri"
#: i18n.tpl:21
-msgid "Hamstrings"
-msgstr ""
+msgid "Shoulders"
+msgstr "Umeri"
#: i18n.tpl:22
-msgid "Lower back"
-msgstr ""
+msgid "Seconds"
+msgstr "Secunde"
+
+#: i18n.tpl:23
+msgid "Miles"
+msgstr "Mile"
#: i18n.tpl:24
-#, fuzzy
-#| msgid "Minutes"
-msgid "Glutes"
-msgstr "Minute"
+msgid "Incline bench"
+msgstr "Bancă înclinată"
#: i18n.tpl:25
-msgid "Lats"
+msgid "Quads"
msgstr ""
+#: i18n.tpl:26
+msgid "Minutes"
+msgstr "Minute"
+
#: i18n.tpl:27
-msgid "Quads"
-msgstr ""
+msgid "Chest"
+msgstr "Piept"
+
+#: i18n.tpl:28
+msgid "Gym mat"
+msgstr "Saltea de gimnastica"
#: i18n.tpl:29
-#, fuzzy
-#| msgid "Triceps brachii"
-msgid "Triceps"
-msgstr "Triceps brachii"
+msgid "Pull-up bar"
+msgstr "Bara de tragere"
#: i18n.tpl:30
-msgid "Kilometers"
-msgstr "Kilometri"
+msgid "Barbell"
+msgstr "Barbell"
#: i18n.tpl:31
-msgid "Miles"
-msgstr "Mile"
-
-#: i18n.tpl:32
-msgid "Minutes"
-msgstr "Minute"
-
-#: i18n.tpl:33 manager/forms.py:169 manager/models/log.py:71
-#: manager/templates/set/add.html:53
-msgid "Repetitions"
-msgstr ""
-
-#: i18n.tpl:34
-msgid "Seconds"
-msgstr "Secunde"
-
-#: i18n.tpl:35
-msgid "Until Failure"
-msgstr "Până la eșec"
+#, fuzzy
+#| msgid "Triceps brachii"
+msgid "Triceps"
+msgstr "Triceps brachii"
#: mailer/forms.py:34 mailer/templates/mailer/gym/preview.html:32
msgctxt "As in \"email subject\""
@@ -2444,44 +2247,44 @@ msgstr ""
msgid "Correction"
msgstr ""
-#: manager/forms.py:89 manager/models/workout.py:59
+#: manager/forms.py:92 manager/models/workout.py:59
msgid "The name of the workout"
msgstr ""
-#: manager/forms.py:93 manager/models/workout.py:66
+#: manager/forms.py:96 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
+#: manager/forms.py:137
msgid ""
"You can search for more than one exercise, they will be grouped together for "
"a superset."
msgstr ""
-#: 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
+#: manager/forms.py:166 manager/forms.py:171 manager/models/log.py:64
+#: manager/models/log.py:92 manager/models/setting.py:59
+#: manager/models/setting.py:90 manager/templates/log/add.html:53
+#: manager/templates/log/add.html:55 manager/templates/set/formset.html:10
+#: manager/templates/set/formset.html:12 measurements/models/category.py:58
+#: nutrition/forms.py:64
msgid "Unit"
msgstr ""
-#: manager/forms.py:266
+#: manager/forms.py:277
msgid "Type"
msgstr ""
-#: manager/forms.py:267 manager/templates/workout/view.html:157
+#: manager/forms.py:278 manager/templates/workout/view.html:157
msgid "Table"
msgstr ""
-#: manager/forms.py:269 manager/templates/workout/view.html:163
+#: manager/forms.py:280 manager/templates/workout/view.html:163
msgid "with images"
msgstr ""
-#: manager/forms.py:270 manager/templates/workout/view.html:169
+#: manager/forms.py:281 manager/templates/workout/view.html:169
msgid "with comments"
msgstr ""
@@ -2533,7 +2336,7 @@ msgid "The duration in weeks"
msgstr ""
#: manager/models/schedule_step.py:63 manager/models/set.py:52
-#: manager/models/setting.py:98 nutrition/models/meal.py:54
+#: manager/models/setting.py:110 nutrition/models/meal.py:54
#: nutrition/models/meal_item.py:65
msgid "Order"
msgstr ""
@@ -2584,7 +2387,7 @@ msgstr ""
msgid "Number of sets"
msgstr ""
-#: manager/models/setting.py:43
+#: manager/models/setting.py:48
msgid "Sets"
msgstr ""
@@ -2842,6 +2645,13 @@ msgid ""
"option in your settings."
msgstr ""
+#: manager/templates/workout/email_reminder.tpl:15
+#: manager/templates/workout/email_weight_reminder.tpl:12
+#: nutrition/templates/ingredient/email_new.tpl:9
+#, python-format
+msgid "The %(site)s team"
+msgstr ""
+
#: manager/templates/workout/email_weight_reminder.tpl:3
#, python-format
msgid ""
@@ -2854,6 +2664,10 @@ msgid ""
"You will regularly receive such reminders till you enter your current weight."
msgstr ""
+#: manager/templates/workout/log.html:10 manager/templates/workout/log.html:11
+msgid "Weight log"
+msgstr "Jurnalul de greutate"
+
#: manager/templates/workout/log.html:29
msgid "Weight log for workout"
msgstr ""
@@ -2950,7 +2764,7 @@ msgstr ""
msgid "Edit workout"
msgstr ""
-#: manager/templates/workout/view.html:225 manager/views/workout.py:300
+#: manager/templates/workout/view.html:225 manager/views/workout.py:301
msgid "Mark as template"
msgstr ""
@@ -2958,11 +2772,6 @@ msgstr ""
msgid "Add workout day"
msgstr ""
-#: manager/views/log.py:92
-#, python-format
-msgid "Edit log entry for %s"
-msgstr ""
-
#: manager/views/log.py:111
msgid "Delete workout log"
msgstr ""
@@ -2980,11 +2789,11 @@ msgstr ""
msgid "Your workouts"
msgstr ""
-#: manager/views/workout.py:227
+#: manager/views/workout.py:228
msgid "Copy workout"
msgstr ""
-#: manager/views/workout.py:230
+#: manager/views/workout.py:231
msgid "Copy"
msgstr ""
@@ -3006,29 +2815,29 @@ msgstr ""
msgid "Value"
msgstr ""
-#: nutrition/forms.py:122
+#: nutrition/forms.py:123
msgid "Calculate"
msgstr ""
-#: nutrition/forms.py:195 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:196 nutrition/templates/rate/form.html:76
msgid "Basic caloric intake"
msgstr ""
-#: nutrition/forms.py:196
+#: nutrition/forms.py:197
msgid "Your basic caloric intake as calculated for your data"
msgstr ""
-#: nutrition/forms.py:202
+#: nutrition/forms.py:203
msgid "Additional calories"
msgstr ""
-#: nutrition/forms.py:204
+#: nutrition/forms.py:205
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
msgstr ""
-#: nutrition/forms.py:232 nutrition/models/ingredient_weight_unit.py:39
+#: nutrition/forms.py:233 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"
@@ -3091,7 +2900,7 @@ msgid ""
"{energy_approx}%)"
msgstr ""
-#: nutrition/models/ingredient.py:357 nutrition/views/ingredient.py:225
+#: nutrition/models/ingredient.py:357 nutrition/views/ingredient.py:219
msgid "Ingredient was successfully added to the general database"
msgstr ""
@@ -3120,6 +2929,10 @@ msgstr ""
msgid "Meal"
msgstr ""
+#: nutrition/models/log.py:65
+msgid "Date and Time (Approx.)"
+msgstr ""
+
#: nutrition/models/meal.py:61
msgid "Time (approx)"
msgstr ""
@@ -3211,6 +3024,10 @@ msgid ""
"added to nutrition plans. You can access it on this address:"
msgstr ""
+#: nutrition/templates/ingredient/email_new.tpl:8
+msgid "Thank you for contributing and making this site better!"
+msgstr ""
+
#: nutrition/templates/ingredient/form.html:4
msgid "Submitting an ingredient"
msgstr ""
@@ -3240,6 +3057,10 @@ msgstr ""
msgid "No ingredients."
msgstr ""
+#: nutrition/templates/ingredient/overview.html:57
+msgid "Search"
+msgstr "Căutare"
+
#: nutrition/templates/ingredient/overview.html:66
msgid "ingredient name"
msgstr ""
@@ -3249,6 +3070,14 @@ msgstr ""
msgid "Add ingredient"
msgstr ""
+#: nutrition/templates/ingredient/overview.html:85
+msgid "Only registered users can do this"
+msgstr ""
+
+#: nutrition/templates/ingredient/pending.html:14
+msgid "Submission date"
+msgstr "Data depunerii"
+
#: nutrition/templates/ingredient/view.html:27
msgid "Ingredient is pending review"
msgstr ""
@@ -3261,6 +3090,18 @@ msgid ""
"the search."
msgstr ""
+#: nutrition/templates/ingredient/view.html:31
+msgid "Please select one of the options below."
+msgstr "Selectați una dintre opțiunile de mai jos."
+
+#: nutrition/templates/ingredient/view.html:38
+msgid "Accept"
+msgstr "Acceptare"
+
+#: nutrition/templates/ingredient/view.html:42
+msgid "Decline"
+msgstr "Declinare"
+
#: nutrition/templates/ingredient/view.html:71
#: nutrition/templates/log/detail.html:31
#: nutrition/templates/plan/view.html:229 nutrition/views/plan.py:376
@@ -3501,14 +3342,18 @@ msgid ""
"yourself for some weeks and change the total amount if needed."
msgstr ""
-#: nutrition/views/ingredient.py:181
+#: nutrition/views/ingredient.py:175
msgid "Add a new ingredient"
msgstr ""
-#: nutrition/views/ingredient.py:238
+#: nutrition/views/ingredient.py:232
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 ""
@@ -3723,29 +3568,29 @@ msgstr ""
msgid "100%% Free <br>and <br>Open Source"
msgstr ""
-#: utils/generic_views.py:261
+#: utils/generic_views.py:262
msgid "Yes, delete"
msgstr ""
-#: utils/models.py:47
+#: utils/models.py:48
msgid "Author"
msgstr ""
-#: utils/models.py:52
+#: utils/models.py:53
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:77
+#: utils/models.py:78
msgid "Pending"
msgstr "în așteptare"
-#: utils/models.py:78
+#: utils/models.py:79
msgid "Accepted"
msgstr "Acceptat"
-#: utils/models.py:79
+#: utils/models.py:80
msgid "Declined"
msgstr "Declinat"
@@ -3888,6 +3733,55 @@ msgstr "Șters cu succes."
msgid "Delete weight entry for the %s"
msgstr "Ștergeți greutatea pentru %s"
+#~ msgid "Ingredients"
+#~ msgstr "Ingrediente"
+
+#~ msgid "Add new exercise"
+#~ msgstr "Adăugați un exercițiu nou"
+
+#~ msgid "Main muscles"
+#~ msgstr "Mușchii principali"
+
+#~ msgid "exercise name"
+#~ msgstr "numele exercițiului"
+
+#~ msgid "Submitting an exercise"
+#~ msgstr "Depunerea unui exercițiu"
+
+#~ msgid ""
+#~ "Thank you for submitting an exercise. This is much\n"
+#~ "appreciated!"
+#~ msgstr ""
+#~ "Vă mulțumim pentru trimiterea unui exercițiu. E mult ⏎\n"
+#~ "apreciat!"
+
+#~ msgid "No categories."
+#~ msgstr "Nici o categorie."
+
+#~ msgid "Use link to create one"
+#~ msgstr "Folosiți link-ul pentru a crea una"
+
+#~ msgid "Exercise is pending review"
+#~ msgstr "Exercițiul este în așteptare revizuire"
+
+#~ msgid "Till then, it will not be shown in the overview or the search."
+#~ msgstr ""
+#~ "Până atunci el nu va fi indicat in prezentarea generală sau in căutare."
+
+#, fuzzy
+#~| msgid "Add new exercise"
+#~ msgid "Add new video"
+#~ msgstr "Adăugați un exercițiu nou"
+
+#~ msgid "Comments for this exercise"
+#~ msgstr "Comentarii pentru acest exercițiu"
+
+#~ msgid "Add new comment"
+#~ msgstr "Adaugați un comentariu"
+
+#~ msgid "The diagram shows the most used muscles on this exercise"
+#~ msgstr "Diagrama arată cele mai utilizate mușchi la acest exercițiu"
+
#~ msgid "Anterior deltoid"
#~ msgstr "Deltoidul anterior"
@@ -3946,10 +3840,6 @@ msgstr "Ștergeți greutatea pentru %s"
#~ msgid "No filter"
#~ msgstr "Fără filtru"
-#~ msgctxt "Noun, not verb"
-#~ msgid "Change"
-#~ msgstr "Schimba"
-
#~ msgid "Days"
#~ msgstr "Zile"
diff --git a/wger/locale/ru/LC_MESSAGES/django.po b/wger/locale/ru/LC_MESSAGES/django.po
index 6b9d3b3a8..afaebf882 100644
--- a/wger/locale/ru/LC_MESSAGES/django.po
+++ b/wger/locale/ru/LC_MESSAGES/django.po
@@ -14,7 +14,7 @@ msgid ""
msgstr ""
"Project-Id-Version: wger Workout Manager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-14 12:01+0200\n"
+"POT-Creation-Date: 2022-11-10 16:03+0100\n"
"PO-Revision-Date: 2022-05-24 21:14+0000\n"
"Last-Translator: Konstantin <[email protected]>\n"
"Language-Team: Russian <https://hosted.weblate.org/projects/wger/web/ru/>\n"
@@ -22,9 +22,9 @@ 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%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n"
-"%100>=11 && n%100<=14)? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || "
+"(n%100>=11 && n%100<=14)? 2 : 3);\n"
"X-Generator: Weblate 4.13-dev\n"
#: config/models/gym_config.py:46 gym/templates/gym/list.html:50
@@ -40,106 +40,8 @@ msgstr ""
"новых зарегистрированных пользователей в этот спортзал и обновит всех "
"существующих пользователей без тренажерный зала."
-#: 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:226
-msgid "Languages"
-msgstr "Языки"
-
-#: config/templates/language/overview.html:16
-msgid "Nothing found."
-msgstr "Ничего не найдено."
-
-#: 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:150
-#: nutrition/templates/plan/view.html:153
-#: nutrition/templates/plan/view.html:191
-msgid "Add one now."
-msgstr "Добавить одну сейчас."
-
-#: config/templates/language/overview.html:29
-#: core/templates/license/list.html:38 core/templates/misc/license/list.html:41
-#: core/templates/repetition_unit/list.html:41
-#: core/templates/user/overview.html:327 core/templates/user/overview.html:366
-#: core/templates/user/overview.html:402
-#: core/templates/weight_unit/list.html:41 core/views/languages.py:73
-#: core/views/license.py:65 core/views/repetition_units.py:65
-#: core/views/weight_units.py:65
-#: exercises/templates/categories/admin-overview.html:36
-#: 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:61
-msgid "Add"
-msgstr "Добавить"
-
-#: 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/language.py:32
-msgid "Language full name"
-msgstr "Полное обозночение языка"
-
-#: config/templates/language/view.html:34 core/templates/user/overview.html:451
-#: gym/views/admin_config.py:44 gym/views/admin_config.py:58
-#: gym/views/user_config.py:46
-msgid "Configuration"
-msgstr "Конфигурация"
-
-#: config/templates/language/view.html:35
-msgid ""
-"Use the configuration to select in what languages the\n"
-"exercises and ingredients will be shown for the current language (for "
-"example\n"
-"the exercises should be shown in languages A, B and C; the ingredients only\n"
-"in A)."
-msgstr ""
-"Используйте настройки, чтобы выбрать языки на которых\n"
-"упражнения и ингредиенты будут показаны\n"
-"(например упражнения должны быть показаны на языках\n"
-"A, B и C; а ингредиенты только на А)."
-
-#: config/templates/language/view.html:44 gym/templates/contract/list.html:36
-msgid "Show"
-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: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:45
-msgid "Options"
-msgstr "Опции"
-
-#: config/templates/language/view.html:96 config/views/gym_config.py:41
-#: config/views/language_config.py:49 core/templates/license/list.html:16
-#: core/templates/misc/license/list.html:17
+#: config/views/gym_config.py:41 core/templates/language/view.html:57
+#: 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:39
#: core/templates/tags/render_day.html:75 core/templates/user/overview.html:205
@@ -147,12 +49,10 @@ 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:230
-#: exercises/templates/exercise/view.html:351
#: exercises/templates/muscles/admin-overview.html:16
-#: 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
+#: 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
#: 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,81 +68,54 @@ msgstr "Опции"
msgid "Edit"
msgstr "Редактировать"
-#: 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: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: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
-#: gym/templates/contract_type/list.html:39 gym/templates/document/list.html:46
-#: gym/templates/gym/list.html:20 manager/templates/calendar/day.html:69
-#: 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:231
-#: 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:132
-#: nutrition/templates/units/list.html:20
-msgid "Delete"
-msgstr "Удалить"
-
-#: core/demo.py:86
+#: core/demo.py:95
msgid "Sample workout"
msgstr "Пример тренировки"
-#: core/demo.py:90
+#: core/demo.py:99
msgid "Sample day"
msgstr "Пример дня"
-#: core/demo.py:94
+#: core/demo.py:103
msgid "Another sample day"
msgstr "Другой пример дня"
-#: core/demo.py:217
-msgid "Sample nutrional plan"
+#: core/demo.py:211
+#, fuzzy
+#| msgid "Sample nutrional plan"
+msgid "Sample nutritional plan"
msgstr "Пример плана питания"
-#: core/demo.py:349 core/demo.py:351 core/demo.py:353
+#: core/demo.py:343 core/demo.py:345 core/demo.py:347
#, python-brace-format
msgid "Placeholder workout nr {0} for schedule"
msgstr "«Заполнитель» тренировки № {0} для программы"
-#: core/demo.py:358
+#: core/demo.py:352
msgid "My cool workout schedule"
msgstr "Моя прикольная программа тренировки"
-#: core/demo.py:397 core/demo.py:412
+#: core/demo.py:391 core/demo.py:406
msgid "Empty placeholder schedule"
msgstr "Пустая программа-«заполнитель»"
-#: core/forms.py:61 core/templates/navigation.html:188
-#: core/templates/navigation.html:192 core/templates/user/login.html:4
+#: core/forms.py:64 core/templates/navigation.html:179
+#: core/templates/navigation.html:183 core/templates/user/login.html:4
#: software/templates/features.html:43
msgid "Login"
msgstr "Войти"
-#: core/forms.py:73 core/forms.py:164 gym/views/export.py:63
+#: core/forms.py:76 core/forms.py:177 gym/views/export.py:63
#: gym/views/gym.py:218
msgid "First name"
msgstr "Имя"
-#: core/forms.py:74 core/forms.py:165 core/templates/user/overview.html:267
+#: core/forms.py:77 core/forms.py:178 core/templates/user/overview.html:267
#: gym/views/export.py:64 gym/views/gym.py:218
msgid "Last name"
msgstr "Фамилия"
-#: core/forms.py:76 core/forms.py:131 core/templates/user/overview.html:271
+#: core/forms.py:79 core/forms.py:144 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
@@ -252,77 +125,107 @@ msgstr "Фамилия"
msgid "Email"
msgstr "Электронный адрес"
-#: core/forms.py:77
+#: core/forms.py:80
msgid "Used for password resets and, optionally, e-mail reminders."
msgstr "Используется для сброса пароля и опциональных уведомлений по e-mail."
-#: core/forms.py:102
+#: core/forms.py:84 core/models/profile.py:220
+#: gym/templates/gym/new_user.html:38
+msgid "Date of Birth"
+msgstr "Дата рождения"
+
+#: core/forms.py:116
msgid "Personal data"
msgstr "Персональные данные"
-#: core/forms.py:110
+#: core/forms.py:124
msgid "Workout reminders"
msgstr "Напоминания тренировок"
-#: core/forms.py:117
+#: core/forms.py:131
msgid "Other settings"
msgstr "Другие настройки"
-#: 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
+#: core/forms.py:138 core/views/user.py:615 core/views/user.py:630
+#: core/views/user.py:642 gym/forms.py:72 manager/templates/log/add.html:65
+#: manager/templates/set/add.html:69 manager/views/workout.py:222
+#: utils/generic_views.py:143
msgid "Save"
msgstr "Сохранить"
-#: core/forms.py:132
+#: core/forms.py:145
msgid "Used for password resets and, optionally, email reminders."
msgstr ""
"Необходимо для возобновлений пароля, и выборочно, напоминаний по электронной "
"почте."
-#: core/forms.py:160
+#: core/forms.py:173
msgid "This e-mail address is already in use."
msgstr "Этот электронный адрес уже используется."
-#: core/forms.py:180 gym/templates/gym/new_user.html:26
+#: core/forms.py:193 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:182
+#: core/forms.py:195
msgid "Please enter your current password."
msgstr "Пожалуйста, введите ваш пароль."
-#: core/forms.py:200
+#: core/forms.py:204 core/templates/language/view.html:62
+#: 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: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/muscles/admin-overview.html:17
+#: gym/templates/admin_notes/list.html:40
+#: gym/templates/contract_option/list.html:39
+#: gym/templates/contract_type/list.html:39 gym/templates/document/list.html:46
+#: gym/templates/gym/list.html:20 manager/templates/calendar/day.html:69
+#: 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:231
+#: 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:132
+#: nutrition/templates/units/list.html:20
+msgid "Delete"
+msgstr "Удалить"
+
+#: core/forms.py:213
msgid "Invalid password"
msgstr "Неверный пароль"
-#: core/forms.py:212 core/forms.py:278
+#: core/forms.py:225 core/forms.py:291
msgid "The form is secured with reCAPTCHA"
msgstr "Данная форма защищена reCAPTCHA"
-#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:188
-#: core/templates/navigation.html:193 core/templates/template.html:149
-#: core/templates/user/login.html:20 core/views/user.py:293
+#: core/forms.py:239 core/forms.py:258 core/templates/navigation.html:179
+#: core/templates/navigation.html:184 core/templates/template.html:149
+#: core/templates/user/login.html:20 core/views/user.py:300
#: software/templates/features.html:38
msgid "Register"
msgstr "Зарегистрироваться"
-#: core/forms.py:256
+#: core/forms.py:269
msgid "Contact"
msgstr "Контакт"
-#: core/forms.py:257
+#: core/forms.py:270
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:71
+#: core/forms.py:278 exercises/models/comment.py:42 manager/models/set.py:60
+#: manager/models/setting.py:111 nutrition/models/log.py:71
msgid "Comment"
msgstr "Комментарий"
-#: core/forms.py:266
+#: core/forms.py:279
msgid "What do you want to say?"
msgstr "Что Вы имеете в виду?"
@@ -330,6 +233,14 @@ msgstr "Что Вы имеете в виду?"
msgid "Day of the week"
msgstr "День недели"
+#: core/models/language.py:31 core/templates/language/view.html:21
+msgid "Language short name"
+msgstr "Короткое обозночение языка"
+
+#: core/models/language.py:36 core/templates/language/view.html:22
+msgid "Language full name"
+msgstr "Полное обозночение языка"
+
#: core/models/license.py:29
msgid "Full name"
msgstr "Полное название"
@@ -387,20 +298,20 @@ msgstr "Метрика (килограммы)"
msgid "Imperial (pound)"
msgstr "Империал (фунты)"
-#: core/models/profile.py:111
+#: core/models/profile.py:114
msgid "Show exercise comments"
msgstr "Показать комментарии к упражнению"
-#: core/models/profile.py:112
+#: core/models/profile.py:115
msgid "Check to show exercise comments on the workout view"
msgstr ""
"Поставьте галочку, для показа комментариев к упражнению в обзоре тренировки"
-#: core/models/profile.py:123
+#: core/models/profile.py:126
msgid "Also use ingredients in English"
msgstr "Компоненты также на английском языке"
-#: core/models/profile.py:125
+#: core/models/profile.py:128
msgid ""
"Check to also show ingredients in English while creating\n"
"a nutritional plan. These ingredients are extracted from a list provided\n"
@@ -412,11 +323,11 @@ msgstr ""
"списка Департамента Сельского Хозяйства США. Список\n"
"довольно обширный (около 7000 записей), что может усложнить поиск."
-#: core/models/profile.py:134
+#: core/models/profile.py:137
msgid "Activate workout reminders"
msgstr "Активировать напоминания для тренировок"
-#: core/models/profile.py:136
+#: core/models/profile.py:139
msgid ""
"Check to activate automatic reminders for workouts. You need to provide a "
"valid email for this to work."
@@ -425,21 +336,21 @@ msgstr ""
"тренировок. Для этого необходимо предоставить действительный электронный "
"адрес."
-#: core/models/profile.py:145
+#: core/models/profile.py:148
msgid "Remind before expiration"
msgstr "Напомнить до истечения срока действия"
-#: core/models/profile.py:146
+#: core/models/profile.py:149
msgid "The number of days you want to be reminded before a workout expires."
msgstr ""
"Количество дней до истечении срока действия тренировки, на которое вы хотите "
"установить напоминание."
-#: core/models/profile.py:152
+#: core/models/profile.py:155
msgid "Default duration of workouts"
msgstr "Стандартная продолжительность тренировок"
-#: core/models/profile.py:154
+#: core/models/profile.py:157
msgid ""
"Default duration in weeks of workouts not in a schedule. Used for email "
"workout reminders."
@@ -447,11 +358,11 @@ msgstr ""
"Стандартная продолжительность тренировок в неделях вне графика. Используется "
"для напоминания тренировок."
-#: core/models/profile.py:171
+#: core/models/profile.py:174
msgid "Notification language"
msgstr "Язык уведомлений"
-#: core/models/profile.py:173
+#: core/models/profile.py:176
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."
@@ -460,70 +371,70 @@ msgstr ""
"например напоминание о тренировке. Это не влияет на язык, используемый на "
"веб-сайте."
-#: core/models/profile.py:186 gym/views/export.py:66
+#: core/models/profile.py:212 gym/views/export.py:66
msgid "Age"
msgstr "Возраст"
-#: core/models/profile.py:202 nutrition/forms.py:99
+#: core/models/profile.py:228 nutrition/forms.py:100
msgid "Height (cm)"
msgstr "Рост (см)"
-#: core/models/profile.py:219
+#: core/models/profile.py:245
msgid "Hours of sleep"
msgstr "Количество часов сна"
-#: core/models/profile.py:220
+#: core/models/profile.py:246
msgid "The average hours of sleep per day"
msgstr "Среднее количество часов сна в сутки"
-#: core/models/profile.py:229
+#: core/models/profile.py:255
msgid "Work"
msgstr "Работа"
-#: core/models/profile.py:230 core/models/profile.py:272
+#: core/models/profile.py:256 core/models/profile.py:298
msgid "Average hours per day"
msgstr "Среднее количество часов в день"
-#: core/models/profile.py:239 core/models/profile.py:260
-#: core/models/profile.py:281
+#: core/models/profile.py:265 core/models/profile.py:286
+#: core/models/profile.py:307
msgid "Physical intensity"
msgstr "Физическая напряженность"
-#: core/models/profile.py:240 core/models/profile.py:261
-#: core/models/profile.py:282
+#: core/models/profile.py:266 core/models/profile.py:287
+#: core/models/profile.py:308
msgid "Approximately"
msgstr "Приблизительно"
-#: core/models/profile.py:250
+#: core/models/profile.py:276
msgid "Sport"
msgstr "Спорт"
-#: core/models/profile.py:251
+#: core/models/profile.py:277
msgid "Average hours per week"
msgstr "Среднее количество часов в неделю"
-#: core/models/profile.py:271
+#: core/models/profile.py:297
msgid "Free time"
msgstr "Свободное время"
-#: core/models/profile.py:292 nutrition/templates/rate/form.html:66
+#: core/models/profile.py:318 nutrition/templates/rate/form.html:66
msgid "Total daily calories"
msgstr "Общая суточная калорийность"
-#: core/models/profile.py:293
+#: core/models/profile.py:319
msgid "Total caloric intake, including e.g. any surplus"
msgstr "Общее потребление калорий, в том числе, любой излишек"
-#: core/models/profile.py:305 nutrition/models/ingredient_weight_unit.py:45
+#: core/models/profile.py:331 nutrition/models/ingredient_weight_unit.py:45
#: nutrition/models/log.py:90 nutrition/models/meal_item.py:58
msgid "Weight unit"
msgstr "Единица веса"
-#: core/models/profile.py:313
+#: core/models/profile.py:339
msgid "Allow external access"
msgstr "Разрешить внешний доступ"
-#: core/models/profile.py:315
+#: core/models/profile.py:341
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."
@@ -532,23 +443,22 @@ msgstr ""
"режиме только для чтения. Вы должны установить это прежде, чем вы можете "
"поделиться ссылками например в социальных сетях."
-#: core/models/profile.py:324
+#: core/models/profile.py:350
msgid "Automatic reminders for weight entries"
msgstr "Автоматические напоминания для записей веса"
-#: core/models/profile.py:326
+#: core/models/profile.py:352
msgid "Number of days after the last weight entry (enter 0 to deactivate)"
msgstr "Количество дней после последней записи веса (введите 0 для отключения)"
-#: core/models/profile.py:392
+#: core/models/profile.py:418
msgid "The sum of all hours has to be 24"
msgstr "Сумма всех часов должна быть 24"
#: core/models/rep_unit.py:35 core/models/weight_unit.py:35
-#: core/templates/user/overview.html:263 core/views/user.py:575
+#: core/templates/user/overview.html:263 core/views/user.py:591
#: 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
+#: exercises/models/exercise.py:64 exercises/models/muscle.py:36
#: 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
@@ -611,6 +521,53 @@ msgstr "Поделиться"
msgid "Are you sure you want to delete this? This action cannot be undone."
msgstr "Вы уверены что хотите это удалить? Это действие необратимо."
+#: core/templates/email_verification/confirm_template.html:4
+msgid "Email verified"
+msgstr ""
+
+#: core/templates/email_verification/confirm_template.html:18
+#, python-format
+msgid "%(username)s, your email was verified"
+msgstr ""
+
+#: core/templates/email_verification/confirm_template.html:22
+msgid "Error, invalid verification token"
+msgstr ""
+
+#: core/templates/email_verification/email_body_html.tpl:6
+#, fuzzy
+#| msgid "Configuration"
+msgid "Email Confirmation"
+msgstr "Конфигурация"
+
+#: core/templates/email_verification/email_body_html.tpl:9
+#: core/templates/email_verification/email_body_txt.tpl:3
+#, fuzzy, python-format
+#| msgid "Calendar for %(username)s"
+msgid "You are almost there, %(username)s!"
+msgstr "Календарь для %(username)s"
+
+#: core/templates/email_verification/email_body_html.tpl:11
+#, python-format
+msgid "Please click <a href=\"%(link)s\">here</a> to confirm your email"
+msgstr ""
+
+#: core/templates/email_verification/email_body_html.tpl:12
+#: core/templates/email_verification/email_body_txt.tpl:5
+#, python-format
+msgid "The token expires on %(time)s"
+msgstr ""
+
+#: core/templates/email_verification/email_body_html.tpl:14
+#: core/templates/email_verification/email_body_txt.tpl:8
+msgid "the wger Team"
+msgstr ""
+
+#: core/templates/email_verification/email_body_txt.tpl:4
+#, python-format
+msgid "Please click the following link to confirm your email: %(link)s"
+msgstr ""
+
#: core/templates/index.html:4
msgid "Dashboard"
msgstr "Панель управления"
@@ -672,7 +629,7 @@ msgid "Add custom diary entry"
msgstr "Добавить пользовательскую запись в дневник"
#: core/templates/index.html:84 core/templates/index.html:92
-#: manager/models/day.py:34 manager/models/log.py:56
+#: manager/models/day.py:34 manager/models/log.py:58
#: manager/models/session.py:60 manager/models/workout.py:109
#: manager/templates/schedule/view.html:105
#: manager/templates/workout/view.html:11
@@ -705,6 +662,20 @@ msgstr "Добавить новый журнал"
msgid "No workouts found."
msgstr "Тренировок не найдено."
+#: core/templates/index.html:137 core/templates/index.html:189
+#: core/templates/language/overview.html:23
+#: 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:150
+#: nutrition/templates/plan/view.html:153
+#: nutrition/templates/plan/view.html:191
+msgid "Add one now."
+msgstr "Добавить одну сейчас."
+
#: 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
@@ -758,19 +729,59 @@ msgid "No nutrition plans."
msgstr "Программ питания нет."
#: 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
+#: core/templates/user/overview.html:121 manager/forms.py:184
+#: manager/helpers.py:89 manager/models/log.py:86 manager/models/setting.py:79
+#: manager/templates/log/add.html:54 manager/templates/set/formset.html:11
#: weight/models.py: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:210 core/templates/navigation.html:135
+#: core/templates/index.html:210 core/templates/navigation.html:126
#: weight/views.py:70
msgid "Add weight entry"
msgstr "Добавить запись веса"
+#: core/templates/language/overview.html:4 core/templates/navigation.html:217
+msgid "Languages"
+msgstr "Языки"
+
+#: core/templates/language/overview.html:23
+msgid "Nothing found."
+msgstr "Ничего не найдено."
+
+#: core/templates/language/overview.html:36 core/templates/license/list.html:38
+#: core/templates/misc/license/list.html:41
+#: core/templates/repetition_unit/list.html:41
+#: core/templates/user/overview.html:327 core/templates/user/overview.html:366
+#: core/templates/user/overview.html:402
+#: core/templates/weight_unit/list.html:41 core/views/languages.py:73
+#: core/views/license.py:65 core/views/repetition_units.py:65
+#: core/views/weight_units.py:65
+#: exercises/templates/categories/admin-overview.html:36
+#: 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:61
+msgid "Add"
+msgstr "Добавить"
+
+#: core/templates/language/view.html:52 core/templates/user/api_key.html:44
+#: core/templates/user/preferences.html:44 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:45
+msgid "Options"
+msgstr "Опции"
+
#: core/templates/license/list.html:4 core/templates/misc/license/list.html:4
msgid "License list"
msgstr "Список лицензий"
@@ -783,7 +794,6 @@ msgstr "Список лицензий"
#: core/templates/weight_unit/list.html:26
#: exercises/templates/categories/admin-overview.html:24
#: exercises/templates/equipment/admin-overview.html:24
-#: exercises/templates/exercise/pending.html:30
#: exercises/templates/muscles/admin-overview.html:24
#: gym/templates/admin_notes/list.html:52 gym/templates/contract/list.html:60
#: gym/templates/contract_option/list.html:56
@@ -864,155 +874,135 @@ msgstr "Ваши шаблоны"
msgid "Public templates"
msgstr "Общедоступные шаблоны"
-#: core/templates/navigation.html:64
-msgctxt "as in sorted by category"
-msgid "by category"
-msgstr "по категориям"
-
-#: core/templates/navigation.html:65
-msgctxt "as in sorted by muscle"
-msgid "by muscle"
-msgstr "по мышечным группам"
-
-#: core/templates/navigation.html:66
-msgctxt "as in sorted by equipment"
-msgid "by equipment"
-msgstr "по инвентарю"
+#: core/templates/navigation.html:63 manager/forms.py:133
+#: manager/models/setting.py:54
+msgid "Exercises"
+msgstr "Упражнения"
-#: core/templates/navigation.html:70
-#: exercises/templates/equipment/overview.html:109
-#: exercises/templates/equipment/overview.html:113
-#: exercises/templates/exercise/overview.html:112
-#: exercises/templates/exercise/overview.html:116
-#: exercises/templates/muscles/overview.html:112
-#: exercises/templates/muscles/overview.html:116
-msgid "Add new exercise"
-msgstr "Добавить новое упражнение"
-
-#: core/templates/navigation.html:75 core/templates/navigation.html:116
-#: core/templates/navigation.html:224
+#: core/templates/navigation.html:67 core/templates/navigation.html:107
+#: core/templates/navigation.html:215
msgid "Administration"
msgstr "Администрация"
-#: core/templates/navigation.html:76
-#: exercises/templates/exercise/pending.html:6
-msgid "Exercises pending review"
-msgstr "Упражнения ожидающие рассмотрения"
+#: core/templates/navigation.html:68
+#, fuzzy
+#| msgid "Exercise day"
+msgid "Exercise edit history"
+msgstr "День упражнений"
-#: core/templates/navigation.html:77 exercises/models/base.py:72
-#: exercises/templates/exercise/view.html:80
+#: core/templates/navigation.html:69 exercises/models/base.py:84
msgid "Equipment"
msgstr "Спортивное оборудование"
-#: core/templates/navigation.html:78 exercises/templates/exercise/view.html:258
+#: core/templates/navigation.html:70
msgid "Muscles"
msgstr "Мышцы"
-#: core/templates/navigation.html:79
+#: core/templates/navigation.html:71
#: exercises/templates/categories/admin-overview.html:4
msgid "Categories"
msgstr "Категории"
-#: core/templates/navigation.html:93 software/templates/features.html:87
+#: core/templates/navigation.html:84 software/templates/features.html:87
msgid "Nutrition"
msgstr "Питание"
-#: core/templates/navigation.html:99 core/templates/user/overview.html:144
+#: core/templates/navigation.html:90 core/templates/user/overview.html:144
msgid "Nutrition plans"
msgstr "Программы питания"
-#: core/templates/navigation.html:105 nutrition/templates/bmi/form.html:50
+#: core/templates/navigation.html:96 nutrition/templates/bmi/form.html:50
msgid "BMI calculator"
msgstr "Калькулятор индекса массы тела"
-#: core/templates/navigation.html:111 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:102 nutrition/templates/rate/form.html:17
msgid "Daily calories calculator"
msgstr "Калькулятор ежедневных калорий"
-#: core/templates/navigation.html:113
+#: core/templates/navigation.html:104
#: nutrition/templates/ingredient/overview.html:29
msgid "Ingredient overview"
msgstr "Обзор ингредиентов"
-#: core/templates/navigation.html:117 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:108 nutrition/templates/units/list.html:6
msgid "Ingredient weight units"
msgstr "Единицы веса ингредиентов"
-#: core/templates/navigation.html:118
+#: core/templates/navigation.html:109
#: nutrition/templates/ingredient/pending.html:6
msgid "Ingredients pending review"
msgstr "Ингредиенты ожидающие рассмотрения"
-#: core/templates/navigation.html:132
+#: core/templates/navigation.html:123
msgid "Body weight"
msgstr "Вес тела"
-#: core/templates/navigation.html:134 core/templates/user/overview.html:114
+#: core/templates/navigation.html:125 core/templates/user/overview.html:114
#: weight/templates/overview.html:7
msgid "Weight overview"
msgstr "Обзор веса"
-#: core/templates/navigation.html:147
+#: core/templates/navigation.html:138
msgid "About this software"
msgstr "Об этой программе"
-#: core/templates/navigation.html:149 core/templates/template_features.html:82
+#: core/templates/navigation.html:140 core/templates/template_features.html:82
#: software/templates/about_us.html:5
msgid "About us"
msgstr "О нас"
-#: core/templates/navigation.html:151 software/templates/features.html:209
+#: core/templates/navigation.html:142 software/templates/features.html:209
msgid "REST API"
msgstr "REST API"
-#: core/templates/navigation.html:155 utils/models.py:40
+#: core/templates/navigation.html:146 utils/models.py:41
msgid "License"
msgstr "Лицензия"
-#: core/templates/navigation.html:161
+#: core/templates/navigation.html:152
msgid "Developer documentation"
msgstr "Документация для разработчиков"
-#: core/templates/navigation.html:167
+#: core/templates/navigation.html:158
msgid "Get the code"
msgstr "Получить код"
-#: core/templates/navigation.html:173 core/templates/template.html:204
+#: core/templates/navigation.html:164 core/templates/template.html:203
#: core/templates/template_features.html:99
msgid "Translate"
msgstr "Перевести"
-#: core/templates/navigation.html:194 core/templates/user/login.html:28
+#: core/templates/navigation.html:185 core/templates/user/login.html:28
msgid "Reset password"
msgstr "Восстановить пароль"
-#: core/templates/navigation.html:207
+#: core/templates/navigation.html:198
msgid "My preferences"
msgstr "Мои настройки"
-#: core/templates/navigation.html:214
+#: core/templates/navigation.html:205
msgid "Logout"
msgstr "Выйти"
-#: core/templates/navigation.html:229
+#: core/templates/navigation.html:220
msgid "Licenses"
msgstr "Лицензии"
-#: core/templates/navigation.html:232
+#: core/templates/navigation.html:223
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr "Единицы повторения"
-#: core/templates/navigation.html:235 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:226 core/templates/weight_unit/list.html:4
#: nutrition/templates/ingredient/view.html:174
msgid "Weight units"
msgstr "Единицы веса"
-#: core/templates/navigation.html:238 core/templates/user/list.html:4
+#: core/templates/navigation.html:229 core/templates/user/list.html:4
msgid "User list"
msgstr "Список пользователей"
-#: core/templates/navigation.html:239
+#: core/templates/navigation.html:230
msgid "Gyms"
msgstr "Тренажерные залы"
@@ -1091,33 +1081,30 @@ msgstr "следующий"
msgid "Add weight log"
msgstr "Добавить журнал веса"
-#: core/templates/tags/render_day.html:114
-#: exercises/templates/equipment/overview.html:59
-#: exercises/templates/exercise/overview.html:63
-#: exercises/templates/muscles/overview.html:65
+#: core/templates/tags/render_day.html:116
msgid "Placeholder image for exercise"
msgstr "Заполнитель изображения для упражнения"
-#: core/templates/tags/render_day.html:131
+#: core/templates/tags/render_day.html:133
msgid "This exercise has no repetitions."
msgstr "Это упражнение не имеет повторений."
-#: core/templates/tags/render_day.html:134
+#: core/templates/tags/render_day.html:136
msgid "Edit them now."
msgstr "Измените их сейчас."
-#: core/templates/tags/render_day.html:159
+#: core/templates/tags/render_day.html:162
msgid "Add exercises to this workout day"
msgstr "Добавить упражнения к этому тренировочному дню"
#: core/templates/tags/render_weight_log.html:17 manager/helpers.py:89
-#: manager/models/setting.py:57 manager/templates/set/formset.html:10
+#: manager/models/setting.py:69 manager/templates/set/formset.html:9
msgid "Reps"
msgstr "Повтор"
-#: 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
+#: core/templates/tags/render_weight_log.html:30 manager/forms.py:189
+#: manager/models/log.py:103 manager/models/setting.py:99
+#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
#, fuzzy
msgid "RiR"
msgstr "ПвЗ"
@@ -1143,7 +1130,7 @@ msgstr "Условия обслуживания"
msgid "Features"
msgstr "Особенности"
-#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:37
+#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:53
msgid "API key"
msgstr "Ключ API"
@@ -1189,11 +1176,12 @@ msgid "Documentation"
msgstr "Документация"
#: core/templates/user/delete_account.html:4
-#: core/templates/user/preferences.html:42
+#: core/templates/user/preferences.html:58
msgid "Delete account"
msgstr "Удалить аккаунт"
#: core/templates/user/delete_account.html:17
+#: exercises/templates/history/overview.html:93
msgid "Are you sure?"
msgstr "Вы уверены?"
@@ -1205,8 +1193,8 @@ msgid ""
"logs, etc.)\n"
"and can't be undone. "
msgstr ""
-"Это действие приведет к удалению учетной записи пользователя \"%(username)s"
-"\".\n"
+"Это действие приведет к удалению учетной записи пользователя "
+"\"%(username)s\".\n"
"Оно также безвозвратно удалит все данные, связанные с ним (тренировки, "
"журналы и т.д.) и не может быть отменено.\n"
" "
@@ -1243,11 +1231,12 @@ 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/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
+#: exercises/models/base.py:99 exercises/models/base.py:104
+#: exercises/models/exercise.py:69 exercises/models/exercise.py:76
+#: gallery/models/image.py:47 manager/helpers.py:88 manager/models/log.py:100
+#: 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/views.py:150
@@ -1255,11 +1244,11 @@ msgid "Date"
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: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
+#: exercises/models/exercise.py:57 exercises/views/exercises.py:123
+#: 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 "Описание"
@@ -1267,12 +1256,12 @@ msgstr "Описание"
msgid "Number of logs (days)"
msgstr "Количество записей (дней)"
-#: core/templates/user/overview.html:37 core/views/user.py:576
+#: core/templates/user/overview.html:37 core/views/user.py:592
#: 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:267
+#: core/templates/user/overview.html:68 manager/forms.py:278
#: manager/templates/workout/view.html:151
msgid "Log"
msgstr "Журнал"
@@ -1290,6 +1279,7 @@ msgid "Notes"
msgstr "Заметки"
#: core/templates/user/overview.html:79
+#: exercises/templates/history/overview.html:30
#: manager/templates/calendar/partial_overview_table.html:42
#: nutrition/templates/log/detail.html:154
msgid "Time"
@@ -1337,10 +1327,12 @@ msgid "Do you really want to change this user&#39;s password?"
msgstr "Вы действительно хотите изменить пароль этого пользователя?"
#: core/templates/user/overview.html:233
+#: exercises/templates/history/overview.html:106
msgid "No"
msgstr "Нет"
#: core/templates/user/overview.html:234
+#: exercises/templates/history/overview.html:99
msgid "Yes"
msgstr "Да"
@@ -1395,10 +1387,15 @@ msgid "Documents"
msgstr "Документы"
#: core/templates/user/overview.html:413 gym/templates/document/list.html:32
-#: manager/forms.py:279 manager/templates/workout/view.html:176
+#: manager/forms.py:290 manager/templates/workout/view.html:176
msgid "Download"
msgstr "Загрузка"
+#: core/templates/user/overview.html:451 gym/views/admin_config.py:44
+#: gym/views/admin_config.py:58 gym/views/user_config.py:46
+msgid "Configuration"
+msgstr "Конфигурация"
+
#: core/templates/user/overview.html:454 gym/models/user_config.py:92
msgid "Include in inactive overview"
msgstr "Включить в обзор неактивных"
@@ -1416,7 +1413,25 @@ msgstr "Войти в систему как этот пользователь"
msgid "Preferences"
msgstr "Настройки"
-#: core/templates/user/preferences.html:33 core/views/user.py:587
+#: core/templates/user/preferences.html:19
+#, fuzzy
+#| msgid "Send emails"
+msgid "Verified email"
+msgstr "Отправить письма"
+
+#: core/templates/user/preferences.html:24
+msgid "Unverified email"
+msgstr ""
+
+#: core/templates/user/preferences.html:26
+msgid "Send verification email"
+msgstr ""
+
+#: core/templates/user/preferences.html:30
+msgid "You need to verify your email to contribute exercises"
+msgstr ""
+
+#: core/templates/user/preferences.html:49 core/views/user.py:603
msgid "Change password"
msgstr "Изменить"
@@ -1446,39 +1461,37 @@ msgid "oz"
msgstr "oz"
#: 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
+#: exercises/views/equipment.py:104 exercises/views/exercises.py:185
+#: exercises/views/muscles.py:99 manager/views/schedule.py:311
+#: manager/views/schedule_step.py:129 manager/views/workout.py:269
+#: manager/views/workout_session.py:141 nutrition/views/ingredient.py:138
#: 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:431
-#: exercises/views/muscles.py:125 gallery/views/images.py:121
+#: exercises/views/categories.py:127 exercises/views/exercises.py:193
+#: exercises/views/muscles.py:106 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
+#: manager/views/workout.py:273 manager/views/workout_session.py:156
+#: nutrition/views/ingredient.py:145 nutrition/views/plan.py:127
#: nutrition/views/unit.py:118
#, python-brace-format
msgid "Delete {0}?"
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/repetition_units.py:85 core/views/user.py:472
#: 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: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
+#: exercises/views/equipment.py:81 exercises/views/muscles.py:86
+#: 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:170
+#: gym/views/gym.py:459 manager/views/day.py:100 manager/views/schedule.py:335
+#: manager/views/workout.py:287 nutrition/views/ingredient.py:164
+#: nutrition/views/plan.py:144 nutrition/views/unit.py:144
#, python-brace-format
msgid "Edit {0}"
msgstr "Редактировать {0}"
@@ -1509,64 +1522,65 @@ msgstr "Отправить"
msgid "Your feedback was successfully sent. Thank you!"
msgstr "Ваш отзыв был успешно отправлен. Спасибо!"
-#: core/views/user.py:156
+#: core/views/user.py:157
#, python-brace-format
msgid "Account \"{0}\" was successfully deleted"
msgstr "Аккаунт \"{0}\" успешно удален"
-#: core/views/user.py:287
+#: core/views/user.py:294
msgid "You were successfully registered"
msgstr "Вы были успешно зарегистрированы"
-#: core/views/user.py:339
+#: core/views/user.py:355
msgid "Settings successfully updated"
msgstr "Настройки успешно обновлены"
-#: core/views/user.py:376
+#: core/views/user.py:392
msgid "The user was successfully deactivated"
msgstr "Пользователь был успешно отключен"
-#: core/views/user.py:411
+#: core/views/user.py:427
msgid "The user was successfully activated"
msgstr "Пользователь был успешно активирован"
-#: core/views/user.py:426
+#: core/views/user.py:442
msgid "Edit user"
msgstr "Редактирование пользователя"
-#: core/views/user.py:573 gym/templates/gym/member_list.html:26
+#: core/views/user.py:589 gym/templates/gym/member_list.html:26
#: gym/views/gym.py:156
msgid "ID"
msgstr "Идентификация"
-#: core/views/user.py:574 gym/forms.py:94 gym/templates/contract/view.html:55
+#: core/views/user.py:590 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:577 gym/templates/gym/new_user.html:34
+#: core/views/user.py:593 gym/templates/gym/new_user.html:34
#: gym/views/export.py:60 gym/views/gym.py:218
msgid "Gym"
msgstr "Тренажерный зал"
-#: exercises/models/base.py:51 exercises/templates/exercise/view.html:76
-#: nutrition/models/ingredient.py:204
+#: core/views/user.py:652
+#, python-format
+msgid "A verification email was sent to %(email)s"
+msgstr ""
+
+#: exercises/models/base.py:63 nutrition/models/ingredient.py:204
msgid "Category"
msgstr "Категория"
-#: exercises/models/base.py:58
+#: exercises/models/base.py:70
msgid "Primary muscles"
msgstr "Основные мышцы"
-#: exercises/models/base.py:64 exercises/templates/equipment/overview.html:71
-#: exercises/templates/exercise/overview.html:76
-#: exercises/templates/exercise/view.html:268
-#: exercises/templates/muscles/overview.html:77
+#: exercises/models/base.py:76
msgid "Secondary muscles"
msgstr "Второстепенные мышцы"
-#: exercises/models/base.py:79
+#: exercises/models/base.py:91
msgid "Variations"
msgstr "Вариации"
@@ -1574,75 +1588,62 @@ msgstr "Вариации"
msgid "Exercise Categories"
msgstr "Категории упражнений"
-#: exercises/models/comment.py:34 exercises/models/exercise_alias.py:32
-#: exercises/models/image.py:75 exercises/models/video.py:82
-#: manager/forms.py:165 manager/helpers.py:89 manager/models/log.py:51
+#: exercises/models/comment.py:37 exercises/models/exercise_alias.py:35
+#: exercises/models/image.py:71 exercises/models/video.py:95
+#: manager/forms.py:176 manager/helpers.py:89 manager/models/log.py:52
msgid "Exercise"
msgstr "Упражнение"
-#: exercises/models/comment.py:41
+#: exercises/models/comment.py:43
msgid "A comment about how to correctly do this exercise."
msgstr "Коментарий о том, как правильно выполнять это упражнение."
-#: exercises/models/exercise.py:86 nutrition/models/ingredient.py:80
+#: exercises/models/exercise.py:81 nutrition/models/ingredient.py:80
#: nutrition/models/plan.py:61 nutrition/models/weight_unit.py:32
msgid "Language"
msgstr "Язык"
-#: exercises/models/exercise.py:237 exercises/views/exercises.py:461
-msgid "Exercise was successfully added to the general database"
-msgstr "Упражнение добавлено в общую базу данных"
-
-#: exercises/models/exercise.py:265
-msgid "New user submitted exercise"
-msgstr "Новый пользователь добавил упражнение"
-
-#: exercises/models/exercise.py:267
-#, python-brace-format
-msgid "The user {0} submitted a new exercise \"{1}\"."
-msgstr "Пользователь {0} представил новое упражнение \"{1}\"."
-
-#: exercises/models/exercise_alias.py:35
+#: exercises/models/exercise_alias.py:38
#, fuzzy
#| msgid "Correcting an exercise"
msgid "Alias for an exercise"
msgstr "Исправить упражнение"
-#: exercises/models/image.py:59
+#: exercises/models/image.py:55
#, fuzzy
msgid "Line"
msgstr "Линия"
-#: exercises/models/image.py:60
+#: exercises/models/image.py:56
msgid "3D"
msgstr "3D"
-#: exercises/models/image.py:61
+#: exercises/models/image.py:57
#, fuzzy
msgid "Low-poly"
msgstr "Низкополигональный"
-#: exercises/models/image.py:62
+#: exercises/models/image.py:58
msgid "Photo"
msgstr "Фото"
-#: exercises/models/image.py:63
+#: exercises/models/image.py:59
msgid "Other"
msgstr "Другое"
-#: exercises/models/image.py:81 gallery/models/image.py:56
+#: exercises/models/image.py:77 gallery/models/image.py:56
msgid "Image"
msgstr "Изображение"
-#: exercises/models/image.py:82 gallery/models/image.py:57
+#: exercises/models/image.py:78 gallery/models/image.py:57
msgid "Only PNG and JPEG formats are supported"
msgstr "Поддерживаются только форматы PNG и JPEG"
-#: exercises/models/image.py:88
+#: exercises/models/image.py:84
msgid "Main picture"
msgstr "Основное изображение"
-#: exercises/models/image.py:91
+#: exercises/models/image.py:87
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 "
@@ -1652,20 +1653,10 @@ msgstr ""
"основного упражнения (будет показано, например в поиске). Первое изображение "
"автоматически помечается системой."
-#: exercises/models/image.py:100
+#: exercises/models/image.py:96
msgid "The art style of your image"
msgstr "Художественный стиль вашего изображения"
-#: exercises/models/image.py:185
-msgid "New user submitted image"
-msgstr "Изображение предоставлено новым пользователем"
-
-#: exercises/models/image.py:186
-#, python-brace-format
-msgid "The user {0} submitted a new image \"{1}\" for exercise {2}."
-msgstr ""
-"Пользователь {0} представил новое изображение \"{1}\" для упражнения {2}."
-
#: exercises/models/muscle.py:37
msgid "In latin, e.g. \"Pectoralis major\""
msgstr "Латинское название (например: \"Pectoralis major\")"
@@ -1680,47 +1671,49 @@ msgstr "название упражнения"
msgid "A more basic name for the muscle"
msgstr ""
-#: exercises/models/video.py:41
-msgid "Maximum file size is 100MB."
+#: exercises/models/video.py:50
+#, fuzzy, python-format
+#| msgid "Maximum file size is 100MB."
+msgid "Maximum file size is %(size)sMB."
msgstr "Максимальный размер файла - 100 МБ."
-#: exercises/models/video.py:44 exercises/models/video.py:48
+#: exercises/models/video.py:57 exercises/models/video.py:65
msgid "File type is not supported"
msgstr "Тип файла не поддерживается"
-#: exercises/models/video.py:57
+#: exercises/models/video.py:70
msgid "File is not a valid video"
msgstr "Файл не содержит видеодорожку"
-#: exercises/models/video.py:88
+#: exercises/models/video.py:101
msgid "Main video"
msgstr "Основное видео"
-#: exercises/models/video.py:94
+#: exercises/models/video.py:107
msgid "Video"
msgstr "Видео"
-#: exercises/models/video.py:101
+#: exercises/models/video.py:114
msgid "Size"
msgstr "Размер"
-#: exercises/models/video.py:108 manager/models/schedule_step.py:56
+#: exercises/models/video.py:121 manager/models/schedule_step.py:56
msgid "Duration"
msgstr "Продолжительность"
-#: exercises/models/video.py:117
+#: exercises/models/video.py:130
msgid "Width"
msgstr "Ширина"
-#: exercises/models/video.py:124
+#: exercises/models/video.py:137
msgid "Height"
msgstr "Высота"
-#: exercises/models/video.py:131
+#: exercises/models/video.py:144
msgid "Codec"
msgstr "Кодек"
-#: exercises/models/video.py:139
+#: exercises/models/video.py:152
msgid "Codec, long name"
msgstr "Кодек, длинное название"
@@ -1729,135 +1722,23 @@ msgid "Equipment list"
msgstr "Перечень оборудования"
#: exercises/templates/equipment/admin-overview.html:37
-#: exercises/views/equipment.py:94
+#: exercises/views/equipment.py:92
msgid "Add new equipment"
msgstr "Добавить новое оборудование"
-#: exercises/templates/equipment/overview.html:11
-msgid "Equipment overview"
-msgstr "Обзор оборудования"
-
-#: exercises/templates/equipment/overview.html:69
-#: exercises/templates/exercise/overview.html:74
-#: exercises/templates/exercise/view.html:264
-#: exercises/templates/muscles/overview.html:75
-msgid "Main muscles"
-msgstr "Основные мышцы"
-
-#: exercises/templates/equipment/overview.html:79
-msgid ""
-"No exercises for this equipment. Add or edit an exercise and set the "
-"equipment."
-msgstr ""
-"Упражнений для этого оборудования нет. Добавить или изменить упражнение и "
-"установить оборудование."
-
-#: exercises/templates/equipment/overview.html:96
-#: exercises/templates/exercise/overview.html:99
-#: nutrition/templates/ingredient/overview.html:57
-msgid "Search"
-msgstr "Поиск"
-
-#: exercises/templates/equipment/overview.html:101
-#: exercises/templates/exercise/overview.html:104
-msgid "exercise name"
-msgstr "название упражнения"
-
-#: exercises/templates/equipment/overview.html:115
-#: exercises/templates/exercise/overview.html:118
-#: exercises/templates/muscles/overview.html:118
-#: nutrition/templates/ingredient/overview.html:85
-msgid "Only registered users can do this"
-msgstr "Это разрешается только зарегистрированным пользователям"
-
-#: exercises/templates/exercise/email_new.tpl:1
-#, python-format
-msgid ""
-"Your exercise '%(exercise)s' was successfully added to the general\n"
-"database."
-msgstr "Упражнение '%(exercise)s' успешно добавлено в общую базу данных."
-
-#: exercises/templates/exercise/email_new.tpl:4
-msgid ""
-"It is now available on the exercise and muscle overview and can be\n"
-"added to workouts. You can access it on this address:"
-msgstr ""
-"Оно сейчас находится в обзоре упражнений и мышц и может быть добавлено к "
-"тренировкам. В сможете найти его следуя этой ссылке:"
-
-#: exercises/templates/exercise/email_new.tpl:8
-#: nutrition/templates/ingredient/email_new.tpl:8
-msgid "Thank you for contributing and making this site better!"
-msgstr "Спасибо за содействие и улучшение этой странички!"
-
-#: exercises/templates/exercise/email_new.tpl:9
-#: manager/templates/workout/email_reminder.tpl:15
-#: manager/templates/workout/email_weight_reminder.tpl:12
-#: nutrition/templates/ingredient/email_new.tpl:9
-#, python-format
-msgid "The %(site)s team"
-msgstr "Команда %(site)s"
-
-#: exercises/templates/exercise/form.html:4
-msgid "Submitting an exercise"
-msgstr "Представление упражнения"
-
-#: exercises/templates/exercise/form.html:5
-msgid ""
-"Thank you for submitting an exercise. This is much\n"
-"appreciated!"
-msgstr ""
-"Спасибо за добавление упражнения.\n"
-"Мы вам очень признательны!"
-
-#: exercises/templates/exercise/form.html:8
-msgid ""
-"After you submit the form, the administrators will be notified.\n"
-"Once it is reviewed, it will be added to the database. Till this happens,\n"
-"it will not be visible in the overview or the search. In case you added your "
-"email\n"
-"when you registered, you will get notified when the process is completed "
-"successfully."
-msgstr ""
-"После отправки формы администраторы получат уведомление. Оно будет\n"
-"добавлено в базу после рассмотрения. Упражнение не будет доступно в обзоре\n"
-"или при поиске, пока это не произойдёт. Если вы указывали адрес электронной\n"
-"почты при регистрации, вы получите уведомление после успешного добавления."
-
-#: exercises/templates/exercise/form_correct.html:4
-msgid "Correcting an exercise"
-msgstr "Исправить упражнение"
-
-#: exercises/templates/exercise/form_correct.html:5
-msgid ""
-"Thank you for correcting and improving this exercise.\n"
-"This is much appreciated!"
-msgstr ""
-"Спасибо за помощь в исправлении и улучшении этого упражнения.\n"
-"Это высоко ценится!"
-
-#: exercises/templates/exercise/form_correct.html:8
-msgid ""
-"After you submit the form, the administrators will be notified.\n"
-"Once the changes are reviewed the exercise will be updated."
-msgstr ""
-"После отправки формы, администраторы будут уведомлены.\n"
-"Как только изменения будут рассмотрены, упражнение обновится."
-
-#: exercises/templates/exercise/overview.html:88
-msgid "No categories."
-msgstr "Категорий нет."
-
-#: exercises/templates/exercise/overview.html:88
-msgid "Use link to create one"
-msgstr "Воспользуйтесь ссылкой для ее создания"
+#: exercises/templates/history/overview.html:11
+#, fuzzy
+#| msgid "Exercise day"
+msgid "Exercise admin history"
+msgstr "День упражнений"
-#: exercises/templates/exercise/pending.html:14
-#: nutrition/templates/ingredient/pending.html:14
-msgid "Submission date"
-msgstr "Дата представления"
+#: exercises/templates/history/overview.html:27
+#, fuzzy
+#| msgid "Actions"
+msgid "Action"
+msgstr "Действия"
-#: exercises/templates/exercise/pending.html:16 gallery/models/image.py:51
+#: exercises/templates/history/overview.html:28 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/log.py:45
@@ -1868,101 +1749,47 @@ msgstr "Дата представления"
msgid "User"
msgstr "Пользователь"
-#: exercises/templates/exercise/view.html:48
-msgid "Exercise is pending review"
-msgstr "Упражнение находится в ожидании рассмотрения"
-
-#: exercises/templates/exercise/view.html:51
-msgid ""
-"This user submitted exercise is pending a decision to be\n"
-" included in the database."
-msgstr ""
-"Это упражнение, которое было представлено пользователем, находится в "
-"ожидании решения относительно его добавления в базу данных."
-
-#: exercises/templates/exercise/view.html:53
-msgid "Till then, it will not be shown in the overview or the search."
-msgstr "До этого времени его не будет показано ни в обзоре, ни в поиске."
-
-#: exercises/templates/exercise/view.html:54
-#: nutrition/templates/ingredient/view.html:31
-msgid "Please select one of the options below."
-msgstr "Пожалуйста, выберите одну из опций ниже."
-
-#: exercises/templates/exercise/view.html:60
-#: 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:204
-#: nutrition/templates/ingredient/view.html:42
-msgid "Decline"
-msgstr "Отклонить"
-
-#: exercises/templates/exercise/view.html:96
-msgid "Images"
-msgstr "Изображения"
-
-#: exercises/templates/exercise/view.html:137 exercises/views/images.py:93
-msgid "Add new image"
-msgstr "Добавить новое изображение"
-
-#: 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:218
-msgid "Comments for this exercise"
-msgstr "Комментарии к этому упражнению"
+#: exercises/templates/history/overview.html:29
+#, fuzzy
+#| msgctxt "As in \"email subject\""
+#| msgid "Subject"
+msgid "Object"
+msgstr "Тема"
-#: exercises/templates/exercise/view.html:246
-msgid "Add new comment"
-msgstr "Добавить новый комментарий"
+#: exercises/templates/history/overview.html:31
+#, fuzzy
+#| msgctxt "Noun, not verb"
+#| msgid "Change"
+msgid "Changes"
+msgstr "Изменить"
-#: exercises/templates/exercise/view.html:260
-msgid "The diagram shows the most used muscles on this exercise"
-msgstr "Диаграмма показывает самые используемые мышцы в этом упражнении"
+#: exercises/templates/history/overview.html:32
+msgid "Revert"
+msgstr ""
-#: exercises/templates/exercise/view.html:301
-#: manager/templates/workout/log.html:10 manager/templates/workout/log.html:11
-msgid "Weight log"
-msgstr "Регистрация веса"
+#: exercises/templates/history/overview.html:64
+msgid "View Object"
+msgstr ""
-#: exercises/templates/exercise/view.html:306
-msgid "Exercise Variations"
-msgstr "Вариации упражнений"
+#: exercises/templates/history/overview.html:75
+#, fuzzy
+#| msgid "View logs"
+msgid "View changes"
+msgstr "Просмотр журналов"
-#: exercises/templates/exercise/view.html:327
-msgid "Submit a correction"
-msgstr "Отправить поправку"
+#: exercises/templates/history/overview.html:86
+msgid "Revert changes"
+msgstr ""
#: exercises/templates/muscles/admin-overview.html:4
-#: exercises/templates/muscles/overview.html:7
msgid "Muscle overview"
msgstr "Обзор мыщц"
#: exercises/templates/muscles/admin-overview.html:36
-#: exercises/views/muscles.py:86
+#: exercises/views/muscles.py:67
msgid "Add muscle"
msgstr "Добавить мышцу"
-#: exercises/templates/muscles/overview.html:85
-msgid ""
-"No exercises for this muscle. Add or edit an exercise and set the muscle."
-msgstr ""
-"Для этой мышцы нет упражнений. Добавьте или отредактируйте упражнение и "
-"задайте мышцу."
-
#: exercises/views/categories.py:71
msgid "Add category"
msgstr "Добавить категорию"
@@ -1975,52 +1802,24 @@ msgstr "Это также удалит все упражнения в этой
msgid "Add exercise comment"
msgstr "Добавить комментарий к упражнению"
-#: exercises/views/equipment.py:107 exercises/views/equipment.py:118
+#: exercises/views/equipment.py:105 exercises/views/equipment.py:116
msgid "Delete equipment?"
msgstr "Удалить оборудование?"
-#: exercises/views/exercises.py:229
-#, python-format
-msgid ""
-"%(name_original)s is too similar to existing exercise \"%(exercise_name)s\""
+#: exercises/views/exercises.py:161
+#, fuzzy, python-format
+#| msgid ""
+#| "%(name_original)s is too similar to existing exercise "
+#| "\"%(exercise_name)s\""
+msgid "%(name)s is too similar to existing exercise \"%(exercise_name)s\""
msgstr ""
"%(name_original)s слишком похоже на существующее упражнение "
"\"%(exercise_name)s\""
-#: exercises/views/exercises.py:247
-msgid "Add exercise"
-msgstr "Добавить упражнение"
-
-#: exercises/views/exercises.py:367
-msgid "Thank you. Once the changes are reviewed the exercise will be updated."
-msgstr "Спасибо. Как только изменения будут рассмотрены упражнение обновится."
-
-#: exercises/views/exercises.py:380
-#, python-brace-format
-msgid "Correct {0}"
-msgstr "Исправить {0}"
-
-#: exercises/views/exercises.py:422
+#: exercises/views/exercises.py:184
msgid "This will delete the exercise from all workouts."
msgstr "Это удалит упражнение из всех тренировок."
-#: exercises/views/exercises.py:474
-msgid "Exercise was successfully marked as rejected"
-msgstr "Упражнение было помечено как отклонённое"
-
-#: exercises/views/images.py:68
-msgid "Edit exercise image"
-msgstr "Редактировать изображение упражнения"
-
-#: exercises/views/images.py:143
-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 "Добавить изображение"
@@ -2089,7 +1888,7 @@ msgid "Contract type"
msgstr "Форма контракта"
#: gym/models/contract.py:208 gym/templates/contract/view.html:59
-#: manager/templates/log/add.html:52 nutrition/forms.py:59
+#: manager/templates/log/add.html:52 nutrition/forms.py:60
#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:102
#: nutrition/models/meal_item.py:72
msgid "Amount"
@@ -2192,6 +1991,10 @@ msgstr "Будет использоваться имя файла, если ни
msgid "User notes"
msgstr "Заметки пользователя"
+#: gym/templates/contract/list.html:36
+msgid "Show"
+msgstr "Показать"
+
#: gym/templates/contract/view.html:4
msgid "Contract"
msgstr "Контракт"
@@ -2272,10 +2075,6 @@ msgstr "Электронные почты"
msgid "Add member"
msgstr "Добавить члена"
-#: gym/templates/gym/new_user.html:38
-msgid "Date of Birth"
-msgstr "Дата рождения"
-
#: gym/templates/gym/new_user.html:48 manager/templates/calendar/month.html:144
#: manager/templates/log/add.html:75 nutrition/templates/rate/form.html:120
msgid "Info"
@@ -2337,133 +2136,133 @@ msgstr "Добавить пользователя в тренажерный за
msgid "Edit gym"
msgstr "Редактировать тренажерный зал"
-#: i18n.tpl:2 i18n.tpl:28
-msgid "Abs"
-msgstr "Пресс"
-
-#: i18n.tpl:3
-msgid "Arms"
-msgstr "Руки"
-
-#: i18n.tpl:4
-msgid "Back"
-msgstr "Спина"
+#: i18n.tpl:2
+msgid "Until Failure"
+msgstr "До отказа"
-#: i18n.tpl:5 i18n.tpl:23
-msgid "Calves"
-msgstr "Икры"
+#: i18n.tpl:3 manager/forms.py:180 manager/models/log.py:73
+#: manager/templates/set/add.html:53
+msgid "Repetitions"
+msgstr "Повторений"
-#: i18n.tpl:6 i18n.tpl:26
-msgid "Chest"
-msgstr "Грудь"
+#: i18n.tpl:4
+msgid "Abs"
+msgstr "Пресс"
-#: i18n.tpl:7
+#: i18n.tpl:5
+msgid "Arms"
+msgstr "Руки"
+
+#: i18n.tpl:6
msgid "Legs"
msgstr "Ноги"
-#: i18n.tpl:8 i18n.tpl:19
-msgid "Shoulders"
-msgstr "Плечи"
+#: i18n.tpl:7
+msgid "Dumbbell"
+msgstr "Гантель"
+
+#: i18n.tpl:8
+#, fuzzy
+#| msgid "Biceps brachii"
+msgid "Biceps"
+msgstr "Бицепс"
#: i18n.tpl:9
-msgid "Barbell"
-msgstr "Штанга"
+msgid "SZ-Bar"
+msgstr "SZ-Штанга"
#: i18n.tpl:10
-msgid "Bench"
-msgstr "Скамейка"
+msgid "Kettlebell"
+msgstr "Гиря"
#: i18n.tpl:11
-msgid "Dumbbell"
-msgstr "Гантель"
+msgid "Swiss Ball"
+msgstr "Фитбол"
#: i18n.tpl:12
-msgid "Gym mat"
-msgstr "Мат"
+msgid "none (bodyweight exercise)"
+msgstr "Никакое (упражнение с весом тела)"
#: i18n.tpl:13
-msgid "Incline bench"
-msgstr "Наклонная скамья"
+msgid "Calves"
+msgstr "Икры"
#: i18n.tpl:14
-msgid "Kettlebell"
-msgstr "Гиря"
+msgid "Back"
+msgstr "Спина"
#: i18n.tpl:15
-msgid "Pull-up bar"
-msgstr "Брус для подтягивания"
+msgid "Lower back"
+msgstr "Поясница"
#: i18n.tpl:16
-msgid "SZ-Bar"
-msgstr "SZ-Штанга"
+msgid "Lats"
+msgstr "Широчайшие мышцы спины"
#: i18n.tpl:17
-msgid "Swiss Ball"
-msgstr "Фитбол"
-
-#: i18n.tpl:18
-msgid "none (bodyweight exercise)"
-msgstr "Никакое (упражнение с весом тела)"
-
-#: i18n.tpl:20
-#, fuzzy
-#| msgid "Biceps brachii"
-msgid "Biceps"
-msgstr "Бицепс"
-
-#: i18n.tpl:21
#, fuzzy
msgid "Hamstrings"
msgstr "Подколенные сухожилия"
-#: i18n.tpl:22
-msgid "Lower back"
-msgstr "Поясница"
+#: i18n.tpl:18
+msgid "Bench"
+msgstr "Скамейка"
-#: i18n.tpl:24
+#: i18n.tpl:19
#, fuzzy
#| msgid "Minutes"
msgid "Glutes"
msgstr "Минут"
-#: i18n.tpl:25
-msgid "Lats"
-msgstr "Широчайшие мышцы спины"
-
-#: i18n.tpl:27
-msgid "Quads"
-msgstr ""
-
-#: i18n.tpl:29
-#, fuzzy
-#| msgid "Triceps brachii"
-msgid "Triceps"
-msgstr "Трицепс"
-
-#: i18n.tpl:30
+#: i18n.tpl:20
msgid "Kilometers"
msgstr "Километров"
-#: i18n.tpl:31
+#: i18n.tpl:21
+msgid "Shoulders"
+msgstr "Плечи"
+
+#: i18n.tpl:22
+msgid "Seconds"
+msgstr "Секунд"
+
+#: i18n.tpl:23
msgid "Miles"
msgstr "Миль"
-#: i18n.tpl:32
+#: i18n.tpl:24
+msgid "Incline bench"
+msgstr "Наклонная скамья"
+
+#: i18n.tpl:25
+msgid "Quads"
+msgstr ""
+
+#: i18n.tpl:26
msgid "Minutes"
msgstr "Минут"
-#: i18n.tpl:33 manager/forms.py:169 manager/models/log.py:71
-#: manager/templates/set/add.html:53
-msgid "Repetitions"
-msgstr "Повторений"
+#: i18n.tpl:27
+msgid "Chest"
+msgstr "Грудь"
-#: i18n.tpl:34
-msgid "Seconds"
-msgstr "Секунд"
+#: i18n.tpl:28
+msgid "Gym mat"
+msgstr "Мат"
-#: i18n.tpl:35
-msgid "Until Failure"
-msgstr "До отказа"
+#: i18n.tpl:29
+msgid "Pull-up bar"
+msgstr "Брус для подтягивания"
+
+#: i18n.tpl:30
+msgid "Barbell"
+msgstr "Штанга"
+
+#: i18n.tpl:31
+#, fuzzy
+#| msgid "Triceps brachii"
+msgid "Triceps"
+msgstr "Трицепс"
#: mailer/forms.py:34 mailer/templates/mailer/gym/preview.html:32
msgctxt "As in \"email subject\""
@@ -2518,11 +2317,11 @@ msgstr "Отправить письма"
msgid "Correction"
msgstr "Исправление"
-#: manager/forms.py:89 manager/models/workout.py:59
+#: manager/forms.py:92 manager/models/workout.py:59
msgid "The name of the workout"
msgstr "Название тренировки"
-#: manager/forms.py:93 manager/models/workout.py:66
+#: manager/forms.py:96 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'."
@@ -2530,7 +2329,7 @@ msgstr ""
"Короткое описание или цель тренировки. Например 'Сосредоточьтесь на спине' "
"или 'Неделя 1 программы xy'."
-#: manager/forms.py:126
+#: manager/forms.py:137
msgid ""
"You can search for more than one exercise, they will be grouped together for "
"a superset."
@@ -2538,28 +2337,28 @@ msgstr ""
"Вы можете искать больше одного упражнения, они будут сгруппированы в "
"расширенном наборе."
-#: 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
+#: manager/forms.py:166 manager/forms.py:171 manager/models/log.py:64
+#: manager/models/log.py:92 manager/models/setting.py:59
+#: manager/models/setting.py:90 manager/templates/log/add.html:53
+#: manager/templates/log/add.html:55 manager/templates/set/formset.html:10
+#: manager/templates/set/formset.html:12 measurements/models/category.py:58
+#: nutrition/forms.py:64
msgid "Unit"
msgstr "Секция"
-#: manager/forms.py:266
+#: manager/forms.py:277
msgid "Type"
msgstr "Тип"
-#: manager/forms.py:267 manager/templates/workout/view.html:157
+#: manager/forms.py:278 manager/templates/workout/view.html:157
msgid "Table"
msgstr "Таблица"
-#: manager/forms.py:269 manager/templates/workout/view.html:163
+#: manager/forms.py:280 manager/templates/workout/view.html:163
msgid "with images"
msgstr "с изображениями"
-#: manager/forms.py:270 manager/templates/workout/view.html:169
+#: manager/forms.py:281 manager/templates/workout/view.html:169
msgid "with comments"
msgstr "с комментариями"
@@ -2618,7 +2417,7 @@ msgid "The duration in weeks"
msgstr "Длительность в неделях"
#: manager/models/schedule_step.py:63 manager/models/set.py:52
-#: manager/models/setting.py:98 nutrition/models/meal.py:54
+#: manager/models/setting.py:110 nutrition/models/meal.py:54
#: nutrition/models/meal_item.py:65
msgid "Order"
msgstr "Порядок"
@@ -2669,7 +2468,7 @@ msgstr "День упражнений"
msgid "Number of sets"
msgstr "Количество подходов"
-#: manager/models/setting.py:43
+#: manager/models/setting.py:48
msgid "Sets"
msgstr "Подходы"
@@ -2965,6 +2764,13 @@ msgstr ""
"опцию\n"
"в настройках."
+#: manager/templates/workout/email_reminder.tpl:15
+#: manager/templates/workout/email_weight_reminder.tpl:12
+#: nutrition/templates/ingredient/email_new.tpl:9
+#, python-format
+msgid "The %(site)s team"
+msgstr "Команда %(site)s"
+
#: manager/templates/workout/email_weight_reminder.tpl:3
#, python-format
msgid ""
@@ -2981,6 +2787,10 @@ msgstr ""
"Вы будете регулярно получать такие напоминания, пока не укажете свой текущий "
"вес."
+#: manager/templates/workout/log.html:10 manager/templates/workout/log.html:11
+msgid "Weight log"
+msgstr "Регистрация веса"
+
#: manager/templates/workout/log.html:29
msgid "Weight log for workout"
msgstr "Регистрация веса для тренировки"
@@ -3088,7 +2898,7 @@ msgstr "Просмотр журналов"
msgid "Edit workout"
msgstr "Изменить тренировку"
-#: manager/templates/workout/view.html:225 manager/views/workout.py:300
+#: manager/templates/workout/view.html:225 manager/views/workout.py:301
msgid "Mark as template"
msgstr "Пометить как шаблон"
@@ -3096,11 +2906,6 @@ msgstr "Пометить как шаблон"
msgid "Add workout day"
msgstr "Добавить тренировочный день"
-#: manager/views/log.py:92
-#, python-format
-msgid "Edit log entry for %s"
-msgstr "Изменить запись в журнале для %s"
-
#: manager/views/log.py:111
msgid "Delete workout log"
msgstr "Удалить запись тренировки"
@@ -3118,11 +2923,11 @@ msgstr "Создать программу"
msgid "Your workouts"
msgstr "Ваши тренировки"
-#: manager/views/workout.py:227
+#: manager/views/workout.py:228
msgid "Copy workout"
msgstr "Копировать тренировку"
-#: manager/views/workout.py:230
+#: manager/views/workout.py:231
msgid "Copy"
msgstr "Копировать"
@@ -3145,23 +2950,23 @@ msgstr "Это приведет также к удалению всех запи
msgid "Value"
msgstr "Значение"
-#: nutrition/forms.py:122
+#: nutrition/forms.py:123
msgid "Calculate"
msgstr "Рассчитать"
-#: nutrition/forms.py:195 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:196 nutrition/templates/rate/form.html:76
msgid "Basic caloric intake"
msgstr "Основное потребление калорий"
-#: nutrition/forms.py:196
+#: nutrition/forms.py:197
msgid "Your basic caloric intake as calculated for your data"
msgstr "Ваше основное потребление калорий, рассчитанное для ваших данных"
-#: nutrition/forms.py:202
+#: nutrition/forms.py:203
msgid "Additional calories"
msgstr "Дополнительные калории"
-#: nutrition/forms.py:204
+#: nutrition/forms.py:205
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
@@ -3169,7 +2974,7 @@ msgstr ""
"Дополнительные калории для добавления к базовой ставке (для вычитывания, "
"введите отрицательное число)"
-#: nutrition/forms.py:232 nutrition/models/ingredient_weight_unit.py:39
+#: nutrition/forms.py:233 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"
@@ -3235,7 +3040,7 @@ msgstr ""
"обеспечиваемой белками, углеводами и жирами ({energy_calculated} ккал +/- "
"{energy_approx} %)"
-#: nutrition/models/ingredient.py:357 nutrition/views/ingredient.py:225
+#: nutrition/models/ingredient.py:357 nutrition/views/ingredient.py:219
msgid "Ingredient was successfully added to the general database"
msgstr "Ингредиент успешно добавлен в общую базу данных"
@@ -3264,6 +3069,12 @@ msgstr "Единица измерения количества, например
msgid "Meal"
msgstr "Прием пищи"
+#: nutrition/models/log.py:65
+#, fuzzy
+#| msgid "Time (approx)"
+msgid "Date and Time (Approx.)"
+msgstr "Время (приблизительно)"
+
#: nutrition/models/meal.py:61
msgid "Time (approx)"
msgstr "Время (приблизительно)"
@@ -3368,6 +3179,10 @@ msgstr ""
"Он теперь доступен в обзоре ингредиентов и может быть добавлен к планам "
"питания. Вы сможете найти его по этой ссылке:"
+#: nutrition/templates/ingredient/email_new.tpl:8
+msgid "Thank you for contributing and making this site better!"
+msgstr "Спасибо за содействие и улучшение этой странички!"
+
#: nutrition/templates/ingredient/form.html:4
msgid "Submitting an ingredient"
msgstr "Отправка ингредиента"
@@ -3396,6 +3211,10 @@ msgstr ""
msgid "No ingredients."
msgstr "Ингредиентов нет."
+#: nutrition/templates/ingredient/overview.html:57
+msgid "Search"
+msgstr "Поиск"
+
#: nutrition/templates/ingredient/overview.html:66
msgid "ingredient name"
msgstr "Название ингредиента"
@@ -3405,6 +3224,14 @@ msgstr "Название ингредиента"
msgid "Add ingredient"
msgstr "Добавить ингредиент"
+#: nutrition/templates/ingredient/overview.html:85
+msgid "Only registered users can do this"
+msgstr "Это разрешается только зарегистрированным пользователям"
+
+#: nutrition/templates/ingredient/pending.html:14
+msgid "Submission date"
+msgstr "Дата представления"
+
#: nutrition/templates/ingredient/view.html:27
msgid "Ingredient is pending review"
msgstr "Ингредиент находится в ожидании рассмотрения"
@@ -3420,6 +3247,18 @@ msgstr ""
"ожидании решения относительно его добавления в базу данных. До этого, его не "
"будет показано ни в обзоре, ни в поиске."
+#: nutrition/templates/ingredient/view.html:31
+msgid "Please select one of the options below."
+msgstr "Пожалуйста, выберите одну из опций ниже."
+
+#: nutrition/templates/ingredient/view.html:38
+msgid "Accept"
+msgstr "Принять"
+
+#: nutrition/templates/ingredient/view.html:42
+msgid "Decline"
+msgstr "Отклонить"
+
#: nutrition/templates/ingredient/view.html:71
#: nutrition/templates/log/detail.html:31
#: nutrition/templates/plan/view.html:229 nutrition/views/plan.py:376
@@ -3682,14 +3521,18 @@ msgstr ""
"вы создаете ваш план питания на этих значениях, понаблюдайте за собой "
"несколько недель и при необходимости измените общее количество."
-#: nutrition/views/ingredient.py:181
+#: nutrition/views/ingredient.py:175
msgid "Add a new ingredient"
msgstr "Добавить новый ингредиент"
-#: nutrition/views/ingredient.py:238
+#: nutrition/views/ingredient.py:232
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 "Добавить новое блюдо"
@@ -3949,15 +3792,15 @@ msgstr ""
msgid "100%% Free <br>and <br>Open Source"
msgstr "На 100%% бесплатное <br>и <br>с открытым исходным кодом"
-#: utils/generic_views.py:261
+#: utils/generic_views.py:262
msgid "Yes, delete"
msgstr "Да, удалить"
-#: utils/models.py:47
+#: utils/models.py:48
msgid "Author"
msgstr "Автор"
-#: utils/models.py:52
+#: utils/models.py:53
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."
@@ -3965,15 +3808,15 @@ msgstr ""
"Если вы не являетесь автором, введите имя или источник здесь. Это необходимо "
"для некоторых лицензий, таких как CC-BY-SA."
-#: utils/models.py:77
+#: utils/models.py:78
msgid "Pending"
msgstr "В ожидании"
-#: utils/models.py:78
+#: utils/models.py:79
msgid "Accepted"
msgstr "Принятый"
-#: utils/models.py:79
+#: utils/models.py:80
msgid "Declined"
msgstr "Непринятый"
@@ -4139,6 +3982,210 @@ msgstr "Успешно удалено."
msgid "Delete weight entry for the %s"
msgstr "Удалить запись о весе для %s"
+#~ msgid "Ingredients"
+#~ msgstr "Ингредиенты"
+
+#~ msgid ""
+#~ "Use the configuration to select in what languages the\n"
+#~ "exercises and ingredients will be shown for the current language (for "
+#~ "example\n"
+#~ "the exercises should be shown in languages A, B and C; the ingredients "
+#~ "only\n"
+#~ "in A)."
+#~ msgstr ""
+#~ "Используйте настройки, чтобы выбрать языки на которых\n"
+#~ "упражнения и ингредиенты будут показаны\n"
+#~ "(например упражнения должны быть показаны на языках\n"
+#~ "A, B и C; а ингредиенты только на А)."
+
+#~ msgctxt "as in sorted by category"
+#~ msgid "by category"
+#~ msgstr "по категориям"
+
+#~ msgctxt "as in sorted by muscle"
+#~ msgid "by muscle"
+#~ msgstr "по мышечным группам"
+
+#~ msgctxt "as in sorted by equipment"
+#~ msgid "by equipment"
+#~ msgstr "по инвентарю"
+
+#~ msgid "Add new exercise"
+#~ msgstr "Добавить новое упражнение"
+
+#~ msgid "Exercises pending review"
+#~ msgstr "Упражнения ожидающие рассмотрения"
+
+#~ msgid "Exercise was successfully added to the general database"
+#~ msgstr "Упражнение добавлено в общую базу данных"
+
+#~ msgid "New user submitted exercise"
+#~ msgstr "Новый пользователь добавил упражнение"
+
+#, python-brace-format
+#~ msgid "The user {0} submitted a new exercise \"{1}\"."
+#~ msgstr "Пользователь {0} представил новое упражнение \"{1}\"."
+
+#~ msgid "New user submitted image"
+#~ msgstr "Изображение предоставлено новым пользователем"
+
+#, python-brace-format
+#~ msgid "The user {0} submitted a new image \"{1}\" for exercise {2}."
+#~ msgstr ""
+#~ "Пользователь {0} представил новое изображение \"{1}\" для упражнения {2}."
+
+#~ msgid "Equipment overview"
+#~ msgstr "Обзор оборудования"
+
+#~ msgid "Main muscles"
+#~ msgstr "Основные мышцы"
+
+#~ msgid ""
+#~ "No exercises for this equipment. Add or edit an exercise and set the "
+#~ "equipment."
+#~ msgstr ""
+#~ "Упражнений для этого оборудования нет. Добавить или изменить упражнение и "
+#~ "установить оборудование."
+
+#~ msgid "exercise name"
+#~ msgstr "название упражнения"
+
+#, python-format
+#~ msgid ""
+#~ "Your exercise '%(exercise)s' was successfully added to the general\n"
+#~ "database."
+#~ msgstr "Упражнение '%(exercise)s' успешно добавлено в общую базу данных."
+
+#~ msgid ""
+#~ "It is now available on the exercise and muscle overview and can be\n"
+#~ "added to workouts. You can access it on this address:"
+#~ msgstr ""
+#~ "Оно сейчас находится в обзоре упражнений и мышц и может быть добавлено к "
+#~ "тренировкам. В сможете найти его следуя этой ссылке:"
+
+#~ msgid "Submitting an exercise"
+#~ msgstr "Представление упражнения"
+
+#~ msgid ""
+#~ "Thank you for submitting an exercise. This is much\n"
+#~ "appreciated!"
+#~ msgstr ""
+#~ "Спасибо за добавление упражнения.\n"
+#~ "Мы вам очень признательны!"
+
+#~ msgid ""
+#~ "After you submit the form, the administrators will be notified.\n"
+#~ "Once it is reviewed, it will be added to the database. Till this "
+#~ "happens,\n"
+#~ "it will not be visible in the overview or the search. In case you added "
+#~ "your email\n"
+#~ "when you registered, you will get notified when the process is completed "
+#~ "successfully."
+#~ msgstr ""
+#~ "После отправки формы администраторы получат уведомление. Оно будет\n"
+#~ "добавлено в базу после рассмотрения. Упражнение не будет доступно в "
+#~ "обзоре\n"
+#~ "или при поиске, пока это не произойдёт. Если вы указывали адрес "
+#~ "электронной\n"
+#~ "почты при регистрации, вы получите уведомление после успешного добавления."
+
+#~ msgid "Correcting an exercise"
+#~ msgstr "Исправить упражнение"
+
+#~ msgid ""
+#~ "Thank you for correcting and improving this exercise.\n"
+#~ "This is much appreciated!"
+#~ msgstr ""
+#~ "Спасибо за помощь в исправлении и улучшении этого упражнения.\n"
+#~ "Это высоко ценится!"
+
+#~ msgid ""
+#~ "After you submit the form, the administrators will be notified.\n"
+#~ "Once the changes are reviewed the exercise will be updated."
+#~ msgstr ""
+#~ "После отправки формы, администраторы будут уведомлены.\n"
+#~ "Как только изменения будут рассмотрены, упражнение обновится."
+
+#~ msgid "No categories."
+#~ msgstr "Категорий нет."
+
+#~ msgid "Use link to create one"
+#~ msgstr "Воспользуйтесь ссылкой для ее создания"
+
+#~ msgid "Exercise is pending review"
+#~ msgstr "Упражнение находится в ожидании рассмотрения"
+
+#~ msgid ""
+#~ "This user submitted exercise is pending a decision to be\n"
+#~ " included in the database."
+#~ msgstr ""
+#~ "Это упражнение, которое было представлено пользователем, находится в "
+#~ "ожидании решения относительно его добавления в базу данных."
+
+#~ msgid "Till then, it will not be shown in the overview or the search."
+#~ msgstr "До этого времени его не будет показано ни в обзоре, ни в поиске."
+
+#~ msgid "Images"
+#~ msgstr "Изображения"
+
+#~ msgid "Add new image"
+#~ msgstr "Добавить новое изображение"
+
+#~ msgid "Videos"
+#~ msgstr "Видео"
+
+#~ msgid "Add new video"
+#~ msgstr "Добавить новое видео"
+
+#~ msgid "Images pending review"
+#~ msgstr "Изображения, ожидающие рассмотрения"
+
+#~ msgid "Comments for this exercise"
+#~ msgstr "Комментарии к этому упражнению"
+
+#~ msgid "Add new comment"
+#~ msgstr "Добавить новый комментарий"
+
+#~ msgid "The diagram shows the most used muscles on this exercise"
+#~ msgstr "Диаграмма показывает самые используемые мышцы в этом упражнении"
+
+#~ msgid "Exercise Variations"
+#~ msgstr "Вариации упражнений"
+
+#~ msgid "Submit a correction"
+#~ msgstr "Отправить поправку"
+
+#~ msgid ""
+#~ "No exercises for this muscle. Add or edit an exercise and set the muscle."
+#~ msgstr ""
+#~ "Для этой мышцы нет упражнений. Добавьте или отредактируйте упражнение и "
+#~ "задайте мышцу."
+
+#~ msgid "Add exercise"
+#~ msgstr "Добавить упражнение"
+
+#~ msgid ""
+#~ "Thank you. Once the changes are reviewed the exercise will be updated."
+#~ msgstr ""
+#~ "Спасибо. Как только изменения будут рассмотрены упражнение обновится."
+
+#, python-brace-format
+#~ msgid "Correct {0}"
+#~ msgstr "Исправить {0}"
+
+#~ msgid "Exercise was successfully marked as rejected"
+#~ msgstr "Упражнение было помечено как отклонённое"
+
+#~ msgid "Edit exercise image"
+#~ msgstr "Редактировать изображение упражнения"
+
+#~ msgid "Delete exercise image?"
+#~ msgstr "Удалить изображение упражнения?"
+
+#, python-format
+#~ msgid "Edit log entry for %s"
+#~ msgstr "Изменить запись в журнале для %s"
+
#~ msgid "Anterior deltoid"
#~ msgstr "Дельтовидная мышца"
@@ -4401,8 +4448,8 @@ msgstr "Удалить запись о весе для %s"
#~ "<a href=\"https://groups.google.com/group/wger\">the mailing list</a>."
#~ msgstr ""
#~ "Подача вопроса требует наличие аккаунта в github, если его у вас нет или "
-#~ "вы не хотите регистрироваться, вы можете его также выслать в<a href="
-#~ "\"https://groups.google.com/group/wger\">список рассылки</a>."
+#~ "вы не хотите регистрироваться, вы можете его также выслать в<a "
+#~ "href=\"https://groups.google.com/group/wger\">список рассылки</a>."
#, fuzzy
#~ msgid ""
@@ -4478,10 +4525,6 @@ msgstr "Удалить запись о весе для %s"
#~ msgid "No filter"
#~ msgstr "Без фильтров"
-#~ msgctxt "Noun, not verb"
-#~ msgid "Change"
-#~ msgstr "Изменить"
-
#~ msgid "Days"
#~ msgstr "Дни"
diff --git a/wger/locale/sv/LC_MESSAGES/django.po b/wger/locale/sv/LC_MESSAGES/django.po
index ed49bfa5c..8a17e74cd 100644
--- a/wger/locale/sv/LC_MESSAGES/django.po
+++ b/wger/locale/sv/LC_MESSAGES/django.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: wger Workout Manager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-14 12:01+0200\n"
+"POT-Creation-Date: 2022-11-10 16:03+0100\n"
"PO-Revision-Date: 2022-04-20 20:12+0000\n"
"Last-Translator: stefan <[email protected]>\n"
"Language-Team: Swedish <https://hosted.weblate.org/projects/wger/web/sv/>\n"
@@ -35,105 +35,8 @@ msgstr ""
"alla nya registrerade användare här gym och uppdatera alla befintliga "
"användare utan ett gym."
-#: 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 "Övningar"
-
-#: config/models/language_config.py:42
-msgid "Ingredients"
-msgstr "Ingredienser"
-
-#: config/templates/language/overview.html:4 core/templates/navigation.html:226
-msgid "Languages"
-msgstr "Språk"
-
-#: config/templates/language/overview.html:16
-msgid "Nothing found."
-msgstr "Ingenting hittades"
-
-#: 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:150
-#: nutrition/templates/plan/view.html:153
-#: nutrition/templates/plan/view.html:191
-msgid "Add one now."
-msgstr "Lägg till ett nu."
-
-#: config/templates/language/overview.html:29
-#: core/templates/license/list.html:38 core/templates/misc/license/list.html:41
-#: core/templates/repetition_unit/list.html:41
-#: core/templates/user/overview.html:327 core/templates/user/overview.html:366
-#: core/templates/user/overview.html:402
-#: core/templates/weight_unit/list.html:41 core/views/languages.py:73
-#: core/views/license.py:65 core/views/repetition_units.py:65
-#: core/views/weight_units.py:65
-#: exercises/templates/categories/admin-overview.html:36
-#: 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:61
-msgid "Add"
-msgstr "Lägg till"
-
-#: config/templates/language/view.html:21 core/models/language.py:29
-msgid "Language short name"
-msgstr "Språk kort namn"
-
-#: config/templates/language/view.html:22
-#: config/templates/language/view.html:43 core/models/language.py:32
-msgid "Language full name"
-msgstr "Språk fullständigt namn"
-
-#: config/templates/language/view.html:34 core/templates/user/overview.html:451
-#: gym/views/admin_config.py:44 gym/views/admin_config.py:58
-#: gym/views/user_config.py:46
-msgid "Configuration"
-msgstr "Konfiguration"
-
-#: config/templates/language/view.html:35
-msgid ""
-"Use the configuration to select in what languages the\n"
-"exercises and ingredients will be shown for the current language (for "
-"example\n"
-"the exercises should be shown in languages A, B and C; the ingredients only\n"
-"in A)."
-msgstr ""
-"Använd konfigurationen för att välja vilket språk övningar och ingredienser "
-"ska visas i. (T.ex. Övningar kan visas i språk A, B och C; Ingredienser "
-"endast i språk A)"
-
-#: config/templates/language/view.html:44 gym/templates/contract/list.html:36
-msgid "Show"
-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: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:45
-msgid "Options"
-msgstr "Alternativ"
-
-#: config/templates/language/view.html:96 config/views/gym_config.py:41
-#: config/views/language_config.py:49 core/templates/license/list.html:16
-#: core/templates/misc/license/list.html:17
+#: config/views/gym_config.py:41 core/templates/language/view.html:57
+#: 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:39
#: core/templates/tags/render_day.html:75 core/templates/user/overview.html:205
@@ -141,12 +44,10 @@ 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:230
-#: exercises/templates/exercise/view.html:351
#: exercises/templates/muscles/admin-overview.html:16
-#: 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
+#: 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
#: 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,81 +63,54 @@ msgstr "Alternativ"
msgid "Edit"
msgstr "Redigera"
-#: 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: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: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
-#: gym/templates/contract_type/list.html:39 gym/templates/document/list.html:46
-#: gym/templates/gym/list.html:20 manager/templates/calendar/day.html:69
-#: 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:231
-#: 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:132
-#: nutrition/templates/units/list.html:20
-msgid "Delete"
-msgstr "Ta bort"
-
-#: core/demo.py:86
+#: core/demo.py:95
msgid "Sample workout"
msgstr "Exempelpass"
-#: core/demo.py:90
+#: core/demo.py:99
msgid "Sample day"
msgstr "Exempeldag"
-#: core/demo.py:94
+#: core/demo.py:103
msgid "Another sample day"
msgstr "Annan exempeldag"
-#: core/demo.py:217
-msgid "Sample nutrional plan"
+#: core/demo.py:211
+#, fuzzy
+#| msgid "Sample nutrional plan"
+msgid "Sample nutritional plan"
msgstr "Exempel kostplan"
-#: core/demo.py:349 core/demo.py:351 core/demo.py:353
+#: core/demo.py:343 core/demo.py:345 core/demo.py:347
#, python-brace-format
msgid "Placeholder workout nr {0} for schedule"
msgstr "Platshållarpass nr {0} till schema"
-#: core/demo.py:358
+#: core/demo.py:352
msgid "My cool workout schedule"
msgstr "Mitt coola träningsschema"
-#: core/demo.py:397 core/demo.py:412
+#: core/demo.py:391 core/demo.py:406
msgid "Empty placeholder schedule"
msgstr "Tom platshållarschema"
-#: core/forms.py:61 core/templates/navigation.html:188
-#: core/templates/navigation.html:192 core/templates/user/login.html:4
+#: core/forms.py:64 core/templates/navigation.html:179
+#: core/templates/navigation.html:183 core/templates/user/login.html:4
#: software/templates/features.html:43
msgid "Login"
msgstr "Logga in"
-#: core/forms.py:73 core/forms.py:164 gym/views/export.py:63
+#: core/forms.py:76 core/forms.py:177 gym/views/export.py:63
#: gym/views/gym.py:218
msgid "First name"
msgstr "Förnamn"
-#: core/forms.py:74 core/forms.py:165 core/templates/user/overview.html:267
+#: core/forms.py:77 core/forms.py:178 core/templates/user/overview.html:267
#: gym/views/export.py:64 gym/views/gym.py:218
msgid "Last name"
msgstr "Efternamn"
-#: core/forms.py:76 core/forms.py:131 core/templates/user/overview.html:271
+#: core/forms.py:79 core/forms.py:144 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
@@ -246,76 +120,106 @@ msgstr "Efternamn"
msgid "Email"
msgstr "E-post"
-#: core/forms.py:77
+#: core/forms.py:80
msgid "Used for password resets and, optionally, e-mail reminders."
msgstr "Används för lösenordsåterställning, alternativt påminnelser."
-#: core/forms.py:102
+#: core/forms.py:84 core/models/profile.py:220
+#: gym/templates/gym/new_user.html:38
+msgid "Date of Birth"
+msgstr ""
+
+#: core/forms.py:116
msgid "Personal data"
msgstr "Personlig data"
-#: core/forms.py:110
+#: core/forms.py:124
msgid "Workout reminders"
msgstr "Träningspåminnelser"
-#: core/forms.py:117
+#: core/forms.py:131
msgid "Other settings"
msgstr "Andra inställningar"
-#: 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
+#: core/forms.py:138 core/views/user.py:615 core/views/user.py:630
+#: core/views/user.py:642 gym/forms.py:72 manager/templates/log/add.html:65
+#: manager/templates/set/add.html:69 manager/views/workout.py:222
+#: utils/generic_views.py:143
msgid "Save"
msgstr "Spara"
-#: core/forms.py:132
+#: core/forms.py:145
msgid "Used for password resets and, optionally, email reminders."
msgstr ""
"Används för lösenordsåterställning och, frivilligt, för epostpåminnelser"
-#: core/forms.py:160
+#: core/forms.py:173
msgid "This e-mail address is already in use."
msgstr "Denna mail används redan."
-#: core/forms.py:180 gym/templates/gym/new_user.html:26
+#: core/forms.py:193 gym/templates/gym/new_user.html:26
#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:218
msgid "Password"
msgstr "Lösenord"
-#: core/forms.py:182
+#: core/forms.py:195
msgid "Please enter your current password."
msgstr "Vänligen ange ditt nuvarande lösenord."
-#: core/forms.py:200
+#: core/forms.py:204 core/templates/language/view.html:62
+#: 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: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/muscles/admin-overview.html:17
+#: gym/templates/admin_notes/list.html:40
+#: gym/templates/contract_option/list.html:39
+#: gym/templates/contract_type/list.html:39 gym/templates/document/list.html:46
+#: gym/templates/gym/list.html:20 manager/templates/calendar/day.html:69
+#: 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:231
+#: 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:132
+#: nutrition/templates/units/list.html:20
+msgid "Delete"
+msgstr "Ta bort"
+
+#: core/forms.py:213
msgid "Invalid password"
msgstr "Ogiltigt lösenord"
-#: core/forms.py:212 core/forms.py:278
+#: core/forms.py:225 core/forms.py:291
msgid "The form is secured with reCAPTCHA"
msgstr "Denna formen är säkrad med reCAPTCHA"
-#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:188
-#: core/templates/navigation.html:193 core/templates/template.html:149
-#: core/templates/user/login.html:20 core/views/user.py:293
+#: core/forms.py:239 core/forms.py:258 core/templates/navigation.html:179
+#: core/templates/navigation.html:184 core/templates/template.html:149
+#: core/templates/user/login.html:20 core/views/user.py:300
#: software/templates/features.html:38
msgid "Register"
msgstr "Registrera dig"
-#: core/forms.py:256
+#: core/forms.py:269
msgid "Contact"
msgstr "Kontakt"
-#: core/forms.py:257
+#: core/forms.py:270
msgid "Some way of answering you (e-mail, etc.)"
msgstr "Något sätt svara 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:71
+#: core/forms.py:278 exercises/models/comment.py:42 manager/models/set.py:60
+#: manager/models/setting.py:111 nutrition/models/log.py:71
msgid "Comment"
msgstr "Kommentar"
-#: core/forms.py:266
+#: core/forms.py:279
msgid "What do you want to say?"
msgstr "Vad vill du säga?"
@@ -323,6 +227,14 @@ msgstr "Vad vill du säga?"
msgid "Day of the week"
msgstr "Veckodag"
+#: core/models/language.py:31 core/templates/language/view.html:21
+msgid "Language short name"
+msgstr "Språk kort namn"
+
+#: core/models/language.py:36 core/templates/language/view.html:22
+msgid "Language full name"
+msgstr "Språk fullständigt namn"
+
#: core/models/license.py:29
msgid "Full name"
msgstr "Fullständigt namn"
@@ -380,19 +292,19 @@ msgstr "Metriska (kg)"
msgid "Imperial (pound)"
msgstr "Imperial (pund)"
-#: core/models/profile.py:111
+#: core/models/profile.py:114
msgid "Show exercise comments"
msgstr "Visa träningskommentarer"
-#: core/models/profile.py:112
+#: core/models/profile.py:115
msgid "Check to show exercise comments on the workout view"
msgstr "Välj för att visa övningskommentarer i träningsvyn"
-#: core/models/profile.py:123
+#: core/models/profile.py:126
msgid "Also use ingredients in English"
msgstr "Också använda ingredienser i Svenska"
-#: core/models/profile.py:125
+#: core/models/profile.py:128
msgid ""
"Check to also show ingredients in English while creating\n"
"a nutritional plan. These ingredients are extracted from a list provided\n"
@@ -404,11 +316,11 @@ msgstr ""
"Agriculture\". Denna lista är väldigt övergripande, med runt 7000 objekt, "
"men kan bli överväldigande och göra det svårt att söka."
-#: core/models/profile.py:134
+#: core/models/profile.py:137
msgid "Activate workout reminders"
msgstr "Aktivera träningspåminnelser"
-#: core/models/profile.py:136
+#: core/models/profile.py:139
msgid ""
"Check to activate automatic reminders for workouts. You need to provide a "
"valid email for this to work."
@@ -416,19 +328,19 @@ msgstr ""
"Välj för att aktivera automatiska träningspåminnelser. Du behöver ange en "
"giltig e-postadress för att detta ska fungera."
-#: core/models/profile.py:145
+#: core/models/profile.py:148
msgid "Remind before expiration"
msgstr "Påminn före förfallodagen"
-#: core/models/profile.py:146
+#: core/models/profile.py:149
msgid "The number of days you want to be reminded before a workout expires."
msgstr "Antalet dagar du vill bli påmind innan ett träningspass löper ut."
-#: core/models/profile.py:152
+#: core/models/profile.py:155
msgid "Default duration of workouts"
msgstr "Standardvaraktigheten för träningspass"
-#: core/models/profile.py:154
+#: core/models/profile.py:157
msgid ""
"Default duration in weeks of workouts not in a schedule. Used for email "
"workout reminders."
@@ -436,81 +348,81 @@ msgstr ""
"Standardlängden i veckor av träningspass utanför ett schema. Används för e-"
"postpåminnelser."
-#: core/models/profile.py:171
+#: core/models/profile.py:174
msgid "Notification language"
msgstr "Notisspråk"
-#: core/models/profile.py:173
+#: core/models/profile.py:176
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 ""
"Språk som används i e-postnotiser. Detta påverkar inte språket på hemsidan."
-#: core/models/profile.py:186 gym/views/export.py:66
+#: core/models/profile.py:212 gym/views/export.py:66
msgid "Age"
msgstr "Ålder"
-#: core/models/profile.py:202 nutrition/forms.py:99
+#: core/models/profile.py:228 nutrition/forms.py:100
msgid "Height (cm)"
msgstr "Längd (cm)"
-#: core/models/profile.py:219
+#: core/models/profile.py:245
msgid "Hours of sleep"
msgstr "Timmars sömn"
-#: core/models/profile.py:220
+#: core/models/profile.py:246
msgid "The average hours of sleep per day"
msgstr "Genomsnittlig sömntid per natt"
-#: core/models/profile.py:229
+#: core/models/profile.py:255
msgid "Work"
msgstr "Arbete"
-#: core/models/profile.py:230 core/models/profile.py:272
+#: core/models/profile.py:256 core/models/profile.py:298
msgid "Average hours per day"
msgstr "Timmar per dag i genomsnitt"
-#: core/models/profile.py:239 core/models/profile.py:260
-#: core/models/profile.py:281
+#: core/models/profile.py:265 core/models/profile.py:286
+#: core/models/profile.py:307
msgid "Physical intensity"
msgstr "Fysisk intensitet"
-#: core/models/profile.py:240 core/models/profile.py:261
-#: core/models/profile.py:282
+#: core/models/profile.py:266 core/models/profile.py:287
+#: core/models/profile.py:308
msgid "Approximately"
msgstr "Cirka"
-#: core/models/profile.py:250
+#: core/models/profile.py:276
msgid "Sport"
msgstr "Sport"
-#: core/models/profile.py:251
+#: core/models/profile.py:277
msgid "Average hours per week"
msgstr "Timmar per vecka i genomsnitt"
-#: core/models/profile.py:271
+#: core/models/profile.py:297
msgid "Free time"
msgstr "Fritid"
-#: core/models/profile.py:292 nutrition/templates/rate/form.html:66
+#: core/models/profile.py:318 nutrition/templates/rate/form.html:66
msgid "Total daily calories"
msgstr "Totala dagliga kalorier"
-#: core/models/profile.py:293
+#: core/models/profile.py:319
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
+#: core/models/profile.py:331 nutrition/models/ingredient_weight_unit.py:45
#: nutrition/models/log.py:90 nutrition/models/meal_item.py:58
msgid "Weight unit"
msgstr "Viktenhet"
-#: core/models/profile.py:313
+#: core/models/profile.py:339
msgid "Allow external access"
msgstr "TIllåt extern tillgång"
-#: core/models/profile.py:315
+#: core/models/profile.py:341
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."
@@ -519,23 +431,22 @@ msgstr ""
"läge. Du behöver tillåta detta innan du kan dela länkar, t.ex. till social "
"media."
-#: core/models/profile.py:324
+#: core/models/profile.py:350
msgid "Automatic reminders for weight entries"
msgstr "Automatiska påminnleser för viktnoteringar"
-#: core/models/profile.py:326
+#: core/models/profile.py:352
msgid "Number of days after the last weight entry (enter 0 to deactivate)"
msgstr "Antal dagar sedan senaste viktnotering (Ange 0 för att avaktivera)"
-#: core/models/profile.py:392
+#: core/models/profile.py:418
msgid "The sum of all hours has to be 24"
msgstr "Summan av alla timmar måste vara 24"
#: core/models/rep_unit.py:35 core/models/weight_unit.py:35
-#: core/templates/user/overview.html:263 core/views/user.py:575
+#: core/templates/user/overview.html:263 core/views/user.py:591
#: 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
+#: exercises/models/exercise.py:64 exercises/models/muscle.py:36
#: 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
@@ -595,6 +506,53 @@ msgid "Are you sure you want to delete this? This action cannot be undone."
msgstr ""
"Är du säkes på att du vill ta bort detta? Denna handilng kan ej ångras."
+#: core/templates/email_verification/confirm_template.html:4
+msgid "Email verified"
+msgstr ""
+
+#: core/templates/email_verification/confirm_template.html:18
+#, python-format
+msgid "%(username)s, your email was verified"
+msgstr ""
+
+#: core/templates/email_verification/confirm_template.html:22
+msgid "Error, invalid verification token"
+msgstr ""
+
+#: core/templates/email_verification/email_body_html.tpl:6
+#, fuzzy
+#| msgid "Configuration"
+msgid "Email Confirmation"
+msgstr "Konfiguration"
+
+#: core/templates/email_verification/email_body_html.tpl:9
+#: core/templates/email_verification/email_body_txt.tpl:3
+#, fuzzy, python-format
+#| msgid "Calendar for %(username)s"
+msgid "You are almost there, %(username)s!"
+msgstr "Kalender för %(username)s"
+
+#: core/templates/email_verification/email_body_html.tpl:11
+#, python-format
+msgid "Please click <a href=\"%(link)s\">here</a> to confirm your email"
+msgstr ""
+
+#: core/templates/email_verification/email_body_html.tpl:12
+#: core/templates/email_verification/email_body_txt.tpl:5
+#, python-format
+msgid "The token expires on %(time)s"
+msgstr ""
+
+#: core/templates/email_verification/email_body_html.tpl:14
+#: core/templates/email_verification/email_body_txt.tpl:8
+msgid "the wger Team"
+msgstr ""
+
+#: core/templates/email_verification/email_body_txt.tpl:4
+#, python-format
+msgid "Please click the following link to confirm your email: %(link)s"
+msgstr ""
+
#: core/templates/index.html:4
msgid "Dashboard"
msgstr "Instrumentpanel"
@@ -652,7 +610,7 @@ msgid "Add custom diary entry"
msgstr ""
#: core/templates/index.html:84 core/templates/index.html:92
-#: manager/models/day.py:34 manager/models/log.py:56
+#: manager/models/day.py:34 manager/models/log.py:58
#: manager/models/session.py:60 manager/models/workout.py:109
#: manager/templates/schedule/view.html:105
#: manager/templates/workout/view.html:11
@@ -683,6 +641,20 @@ msgstr "Lägg till ny logg"
msgid "No workouts found."
msgstr "Inga träningspass hittade."
+#: core/templates/index.html:137 core/templates/index.html:189
+#: core/templates/language/overview.html:23
+#: 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:150
+#: nutrition/templates/plan/view.html:153
+#: nutrition/templates/plan/view.html:191
+msgid "Add one now."
+msgstr "Lägg till ett nu."
+
#: 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
@@ -736,19 +708,59 @@ msgid "No nutrition plans."
msgstr "Inga kostplaner."
#: 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
+#: core/templates/user/overview.html:121 manager/forms.py:184
+#: manager/helpers.py:89 manager/models/log.py:86 manager/models/setting.py:79
+#: manager/templates/log/add.html:54 manager/templates/set/formset.html:11
#: weight/models.py:34 weight/templates/import_csv_preview.html:14
#: weight/templates/import_csv_preview.html:43 weight/views.py:150
msgid "Weight"
msgstr "Vikt"
-#: core/templates/index.html:210 core/templates/navigation.html:135
+#: core/templates/index.html:210 core/templates/navigation.html:126
#: weight/views.py:70
msgid "Add weight entry"
msgstr "Lägg till vikt"
+#: core/templates/language/overview.html:4 core/templates/navigation.html:217
+msgid "Languages"
+msgstr "Språk"
+
+#: core/templates/language/overview.html:23
+msgid "Nothing found."
+msgstr "Ingenting hittades"
+
+#: core/templates/language/overview.html:36 core/templates/license/list.html:38
+#: core/templates/misc/license/list.html:41
+#: core/templates/repetition_unit/list.html:41
+#: core/templates/user/overview.html:327 core/templates/user/overview.html:366
+#: core/templates/user/overview.html:402
+#: core/templates/weight_unit/list.html:41 core/views/languages.py:73
+#: core/views/license.py:65 core/views/repetition_units.py:65
+#: core/views/weight_units.py:65
+#: exercises/templates/categories/admin-overview.html:36
+#: 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:61
+msgid "Add"
+msgstr "Lägg till"
+
+#: core/templates/language/view.html:52 core/templates/user/api_key.html:44
+#: core/templates/user/preferences.html:44 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:45
+msgid "Options"
+msgstr "Alternativ"
+
#: core/templates/license/list.html:4 core/templates/misc/license/list.html:4
msgid "License list"
msgstr "Licens lista"
@@ -761,7 +773,6 @@ msgstr "Licens lista"
#: core/templates/weight_unit/list.html:26
#: exercises/templates/categories/admin-overview.html:24
#: exercises/templates/equipment/admin-overview.html:24
-#: exercises/templates/exercise/pending.html:30
#: exercises/templates/muscles/admin-overview.html:24
#: gym/templates/admin_notes/list.html:52 gym/templates/contract/list.html:60
#: gym/templates/contract_option/list.html:56
@@ -844,155 +855,135 @@ msgstr "Dina mallar"
msgid "Public templates"
msgstr "Publika mallar"
-#: core/templates/navigation.html:64
-msgctxt "as in sorted by category"
-msgid "by category"
-msgstr ""
-
-#: core/templates/navigation.html:65
-msgctxt "as in sorted by muscle"
-msgid "by muscle"
-msgstr ""
-
-#: core/templates/navigation.html:66
-msgctxt "as in sorted by equipment"
-msgid "by equipment"
-msgstr ""
+#: core/templates/navigation.html:63 manager/forms.py:133
+#: manager/models/setting.py:54
+msgid "Exercises"
+msgstr "Övningar"
-#: core/templates/navigation.html:70
-#: exercises/templates/equipment/overview.html:109
-#: exercises/templates/equipment/overview.html:113
-#: exercises/templates/exercise/overview.html:112
-#: exercises/templates/exercise/overview.html:116
-#: exercises/templates/muscles/overview.html:112
-#: exercises/templates/muscles/overview.html:116
-msgid "Add new exercise"
-msgstr "Lägg till ny övning"
-
-#: core/templates/navigation.html:75 core/templates/navigation.html:116
-#: core/templates/navigation.html:224
+#: core/templates/navigation.html:67 core/templates/navigation.html:107
+#: core/templates/navigation.html:215
msgid "Administration"
msgstr "Administration"
-#: core/templates/navigation.html:76
-#: exercises/templates/exercise/pending.html:6
-msgid "Exercises pending review"
-msgstr "Övningar som avaktar genomgång"
+#: core/templates/navigation.html:68
+#, fuzzy
+#| msgid "Exercise day"
+msgid "Exercise edit history"
+msgstr "Träningsdag"
-#: core/templates/navigation.html:77 exercises/models/base.py:72
-#: exercises/templates/exercise/view.html:80
+#: core/templates/navigation.html:69 exercises/models/base.py:84
msgid "Equipment"
msgstr "Utrustning"
-#: core/templates/navigation.html:78 exercises/templates/exercise/view.html:258
+#: core/templates/navigation.html:70
msgid "Muscles"
msgstr "Muskler"
-#: core/templates/navigation.html:79
+#: core/templates/navigation.html:71
#: exercises/templates/categories/admin-overview.html:4
msgid "Categories"
msgstr "Kategorier"
-#: core/templates/navigation.html:93 software/templates/features.html:87
+#: core/templates/navigation.html:84 software/templates/features.html:87
msgid "Nutrition"
msgstr "Kost"
-#: core/templates/navigation.html:99 core/templates/user/overview.html:144
+#: core/templates/navigation.html:90 core/templates/user/overview.html:144
msgid "Nutrition plans"
msgstr "Kostplaner"
-#: core/templates/navigation.html:105 nutrition/templates/bmi/form.html:50
+#: core/templates/navigation.html:96 nutrition/templates/bmi/form.html:50
msgid "BMI calculator"
msgstr "BMI-kalkylator"
-#: core/templates/navigation.html:111 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:102 nutrition/templates/rate/form.html:17
msgid "Daily calories calculator"
msgstr "Dagliga-kalorier-kalkylator"
-#: core/templates/navigation.html:113
+#: core/templates/navigation.html:104
#: nutrition/templates/ingredient/overview.html:29
msgid "Ingredient overview"
msgstr "Ingrediensöversikt"
-#: core/templates/navigation.html:117 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:108 nutrition/templates/units/list.html:6
msgid "Ingredient weight units"
msgstr "Ingrediens viktenheter"
-#: core/templates/navigation.html:118
+#: core/templates/navigation.html:109
#: nutrition/templates/ingredient/pending.html:6
msgid "Ingredients pending review"
msgstr "Ingredienser i avvaktan på översyn"
-#: core/templates/navigation.html:132
+#: core/templates/navigation.html:123
msgid "Body weight"
msgstr ""
-#: core/templates/navigation.html:134 core/templates/user/overview.html:114
+#: core/templates/navigation.html:125 core/templates/user/overview.html:114
#: weight/templates/overview.html:7
msgid "Weight overview"
msgstr "Viktöversikt"
-#: core/templates/navigation.html:147
+#: core/templates/navigation.html:138
msgid "About this software"
msgstr "Om programvaran"
-#: core/templates/navigation.html:149 core/templates/template_features.html:82
+#: core/templates/navigation.html:140 core/templates/template_features.html:82
#: software/templates/about_us.html:5
msgid "About us"
msgstr "Om oss"
-#: core/templates/navigation.html:151 software/templates/features.html:209
+#: core/templates/navigation.html:142 software/templates/features.html:209
msgid "REST API"
msgstr "REST API"
-#: core/templates/navigation.html:155 utils/models.py:40
+#: core/templates/navigation.html:146 utils/models.py:41
msgid "License"
msgstr "Licens"
-#: core/templates/navigation.html:161
+#: core/templates/navigation.html:152
msgid "Developer documentation"
msgstr "Dokument för utvecklare"
-#: core/templates/navigation.html:167
+#: core/templates/navigation.html:158
msgid "Get the code"
msgstr "Hämta koden"
-#: core/templates/navigation.html:173 core/templates/template.html:204
+#: core/templates/navigation.html:164 core/templates/template.html:203
#: core/templates/template_features.html:99
msgid "Translate"
msgstr "Översätt"
-#: core/templates/navigation.html:194 core/templates/user/login.html:28
+#: core/templates/navigation.html:185 core/templates/user/login.html:28
msgid "Reset password"
msgstr "Återställ lösenord"
-#: core/templates/navigation.html:207
+#: core/templates/navigation.html:198
msgid "My preferences"
msgstr "Mina preferenser"
-#: core/templates/navigation.html:214
+#: core/templates/navigation.html:205
msgid "Logout"
msgstr "Logga ut"
-#: core/templates/navigation.html:229
+#: core/templates/navigation.html:220
msgid "Licenses"
msgstr "Licenser"
-#: core/templates/navigation.html:232
+#: core/templates/navigation.html:223
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr "Repetitioner"
-#: core/templates/navigation.html:235 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:226 core/templates/weight_unit/list.html:4
#: nutrition/templates/ingredient/view.html:174
msgid "Weight units"
msgstr "Viktenheter"
-#: core/templates/navigation.html:238 core/templates/user/list.html:4
+#: core/templates/navigation.html:229 core/templates/user/list.html:4
msgid "User list"
msgstr "Användarlista"
-#: core/templates/navigation.html:239
+#: core/templates/navigation.html:230
msgid "Gyms"
msgstr "Gym"
@@ -1071,33 +1062,30 @@ msgstr "nästa"
msgid "Add weight log"
msgstr ""
-#: core/templates/tags/render_day.html:114
-#: exercises/templates/equipment/overview.html:59
-#: exercises/templates/exercise/overview.html:63
-#: exercises/templates/muscles/overview.html:65
+#: core/templates/tags/render_day.html:116
msgid "Placeholder image for exercise"
msgstr "Platshållarbild för övning"
-#: core/templates/tags/render_day.html:131
+#: core/templates/tags/render_day.html:133
msgid "This exercise has no repetitions."
msgstr "Denna övning har inga upprepningar."
-#: core/templates/tags/render_day.html:134
+#: core/templates/tags/render_day.html:136
msgid "Edit them now."
msgstr "Redigera dom nu."
-#: core/templates/tags/render_day.html:159
+#: core/templates/tags/render_day.html:162
msgid "Add exercises to this workout day"
msgstr "Lägg till övningar i denna träningsdag"
#: core/templates/tags/render_weight_log.html:17 manager/helpers.py:89
-#: manager/models/setting.py:57 manager/templates/set/formset.html:10
+#: manager/models/setting.py:69 manager/templates/set/formset.html:9
msgid "Reps"
msgstr "Reps"
-#: 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
+#: core/templates/tags/render_weight_log.html:30 manager/forms.py:189
+#: manager/models/log.py:103 manager/models/setting.py:99
+#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
msgid "RiR"
msgstr ""
@@ -1120,7 +1108,7 @@ msgstr "Villkor för tjänsten"
msgid "Features"
msgstr "Funktioner"
-#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:37
+#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:53
msgid "API key"
msgstr "API key"
@@ -1134,8 +1122,8 @@ msgid ""
"anything). You must pass this information in the header in the format shown "
"below."
msgstr ""
-"Generera en API key om du vill interagera med wger via vårat <a href="
-"\"%(url)s\" rel=\"nofollow\"> REST API</a>. Denna ger tillgång till "
+"Generera en API key om du vill interagera med wger via vårat <a "
+"href=\"%(url)s\" rel=\"nofollow\"> REST API</a>. Denna ger tillgång till "
"offentliga resurser som övningar eller ingredienser, du behöver inte ange "
"något. Du måste ange denna information i headern i formatet som visas nedan."
@@ -1164,11 +1152,12 @@ msgid "Documentation"
msgstr "Dokumentation"
#: core/templates/user/delete_account.html:4
-#: core/templates/user/preferences.html:42
+#: core/templates/user/preferences.html:58
msgid "Delete account"
msgstr "Ta bort konto"
#: core/templates/user/delete_account.html:17
+#: exercises/templates/history/overview.html:93
msgid "Are you sure?"
msgstr "Är du säker?"
@@ -1217,11 +1206,12 @@ msgstr "Lägg till träningspass"
#: core/templates/user/overview.html:34 core/templates/user/overview.html:76
#: core/templates/user/overview.html:120 core/templates/user/overview.html: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
-#: 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
+#: exercises/models/base.py:99 exercises/models/base.py:104
+#: exercises/models/exercise.py:69 exercises/models/exercise.py:76
+#: gallery/models/image.py:47 manager/helpers.py:88 manager/models/log.py:100
+#: 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/views.py:150
@@ -1229,11 +1219,11 @@ msgid "Date"
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: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
+#: exercises/models/exercise.py:57 exercises/views/exercises.py:123
+#: 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 "Beskrivning"
@@ -1241,12 +1231,12 @@ msgstr "Beskrivning"
msgid "Number of logs (days)"
msgstr "Antal loggar (dagar)"
-#: core/templates/user/overview.html:37 core/views/user.py:576
+#: core/templates/user/overview.html:37 core/views/user.py:592
#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:157
msgid "Last activity"
msgstr "Senaste aktiviteten"
-#: core/templates/user/overview.html:68 manager/forms.py:267
+#: core/templates/user/overview.html:68 manager/forms.py:278
#: manager/templates/workout/view.html:151
msgid "Log"
msgstr "Log"
@@ -1264,6 +1254,7 @@ msgid "Notes"
msgstr "Anteckningar"
#: core/templates/user/overview.html:79
+#: exercises/templates/history/overview.html:30
#: manager/templates/calendar/partial_overview_table.html:42
#: nutrition/templates/log/detail.html:154
msgid "Time"
@@ -1311,10 +1302,12 @@ msgid "Do you really want to change this user&#39;s password?"
msgstr "Vill du verkligen ändra denna användares lösenord?"
#: core/templates/user/overview.html:233
+#: exercises/templates/history/overview.html:106
msgid "No"
msgstr "Nej"
#: core/templates/user/overview.html:234
+#: exercises/templates/history/overview.html:99
msgid "Yes"
msgstr "Ja"
@@ -1369,10 +1362,15 @@ msgid "Documents"
msgstr "Dokument"
#: core/templates/user/overview.html:413 gym/templates/document/list.html:32
-#: manager/forms.py:279 manager/templates/workout/view.html:176
+#: manager/forms.py:290 manager/templates/workout/view.html:176
msgid "Download"
msgstr "Hämta"
+#: core/templates/user/overview.html:451 gym/views/admin_config.py:44
+#: gym/views/admin_config.py:58 gym/views/user_config.py:46
+msgid "Configuration"
+msgstr "Konfiguration"
+
#: core/templates/user/overview.html:454 gym/models/user_config.py:92
msgid "Include in inactive overview"
msgstr "Inkludera i inaktiv överblick"
@@ -1390,7 +1388,23 @@ msgstr "Logga in som denna användare"
msgid "Preferences"
msgstr "Preferenser"
-#: core/templates/user/preferences.html:33 core/views/user.py:587
+#: core/templates/user/preferences.html:19
+msgid "Verified email"
+msgstr ""
+
+#: core/templates/user/preferences.html:24
+msgid "Unverified email"
+msgstr ""
+
+#: core/templates/user/preferences.html:26
+msgid "Send verification email"
+msgstr ""
+
+#: core/templates/user/preferences.html:30
+msgid "You need to verify your email to contribute exercises"
+msgstr ""
+
+#: core/templates/user/preferences.html:49 core/views/user.py:603
msgid "Change password"
msgstr "Ändra lösenord"
@@ -1420,39 +1434,37 @@ msgid "oz"
msgstr "oz"
#: 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
+#: exercises/views/equipment.py:104 exercises/views/exercises.py:185
+#: exercises/views/muscles.py:99 manager/views/schedule.py:311
+#: manager/views/schedule_step.py:129 manager/views/workout.py:269
+#: manager/views/workout_session.py:141 nutrition/views/ingredient.py:138
#: 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:431
-#: exercises/views/muscles.py:125 gallery/views/images.py:121
+#: exercises/views/categories.py:127 exercises/views/exercises.py:193
+#: exercises/views/muscles.py:106 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
+#: manager/views/workout.py:273 manager/views/workout_session.py:156
+#: nutrition/views/ingredient.py:145 nutrition/views/plan.py:127
#: nutrition/views/unit.py:118
#, python-brace-format
msgid "Delete {0}?"
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/repetition_units.py:85 core/views/user.py:472
#: 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: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
+#: exercises/views/equipment.py:81 exercises/views/muscles.py:86
+#: 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:170
+#: gym/views/gym.py:459 manager/views/day.py:100 manager/views/schedule.py:335
+#: manager/views/workout.py:287 nutrition/views/ingredient.py:164
+#: nutrition/views/plan.py:144 nutrition/views/unit.py:144
#, python-brace-format
msgid "Edit {0}"
msgstr "Redigera {0}"
@@ -1483,64 +1495,65 @@ msgstr "Ladda upp"
msgid "Your feedback was successfully sent. Thank you!"
msgstr "Din feedback skickades. Tack!"
-#: core/views/user.py:156
+#: core/views/user.py:157
#, python-brace-format
msgid "Account \"{0}\" was successfully deleted"
msgstr "Konto \"{0}\" är nu borttaget"
-#: core/views/user.py:287
+#: core/views/user.py:294
msgid "You were successfully registered"
msgstr "Du är nu registrerad"
-#: core/views/user.py:339
+#: core/views/user.py:355
msgid "Settings successfully updated"
msgstr "Inställningar uppdaterade"
-#: core/views/user.py:376
+#: core/views/user.py:392
msgid "The user was successfully deactivated"
msgstr "Användaren har nu tagits bort"
-#: core/views/user.py:411
+#: core/views/user.py:427
msgid "The user was successfully activated"
msgstr "Användaren har nu aktiverats"
-#: core/views/user.py:426
+#: core/views/user.py:442
msgid "Edit user"
msgstr "Redigera användare"
-#: core/views/user.py:573 gym/templates/gym/member_list.html:26
+#: core/views/user.py:589 gym/templates/gym/member_list.html:26
#: gym/views/gym.py:156
msgid "ID"
msgstr "ID"
-#: core/views/user.py:574 gym/forms.py:94 gym/templates/contract/view.html:55
+#: core/views/user.py:590 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 "Användarnamn"
-#: core/views/user.py:577 gym/templates/gym/new_user.html:34
+#: core/views/user.py:593 gym/templates/gym/new_user.html:34
#: gym/views/export.py:60 gym/views/gym.py:218
msgid "Gym"
msgstr "Gym"
-#: exercises/models/base.py:51 exercises/templates/exercise/view.html:76
-#: nutrition/models/ingredient.py:204
+#: core/views/user.py:652
+#, python-format
+msgid "A verification email was sent to %(email)s"
+msgstr ""
+
+#: exercises/models/base.py:63 nutrition/models/ingredient.py:204
msgid "Category"
msgstr "Kategori"
-#: exercises/models/base.py:58
+#: exercises/models/base.py:70
msgid "Primary muscles"
msgstr "Primära muskler"
-#: exercises/models/base.py:64 exercises/templates/equipment/overview.html:71
-#: exercises/templates/exercise/overview.html:76
-#: exercises/templates/exercise/view.html:268
-#: exercises/templates/muscles/overview.html:77
+#: exercises/models/base.py:76
msgid "Secondary muscles"
msgstr "Sekundära muskler"
-#: exercises/models/base.py:79
+#: exercises/models/base.py:91
msgid "Variations"
msgstr ""
@@ -1548,75 +1561,62 @@ msgstr ""
msgid "Exercise Categories"
msgstr "Övningskategorier"
-#: exercises/models/comment.py:34 exercises/models/exercise_alias.py:32
-#: exercises/models/image.py:75 exercises/models/video.py:82
-#: manager/forms.py:165 manager/helpers.py:89 manager/models/log.py:51
+#: exercises/models/comment.py:37 exercises/models/exercise_alias.py:35
+#: exercises/models/image.py:71 exercises/models/video.py:95
+#: manager/forms.py:176 manager/helpers.py:89 manager/models/log.py:52
msgid "Exercise"
msgstr "Träning"
-#: exercises/models/comment.py:41
+#: exercises/models/comment.py:43
msgid "A comment about how to correctly do this exercise."
msgstr "En kommentar om hur man utför denna övning korrekt."
-#: exercises/models/exercise.py:86 nutrition/models/ingredient.py:80
+#: exercises/models/exercise.py:81 nutrition/models/ingredient.py:80
#: nutrition/models/plan.py:61 nutrition/models/weight_unit.py:32
msgid "Language"
msgstr "Språk"
-#: 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:265
-msgid "New user submitted exercise"
-msgstr "Ny användarskapad övning"
-
-#: 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/exercise_alias.py:35
+#: exercises/models/exercise_alias.py:38
#, fuzzy
#| msgid "Correcting an exercise"
msgid "Alias for an exercise"
msgstr "Korrigera en övning"
-#: exercises/models/image.py:59
+#: exercises/models/image.py:55
msgid "Line"
msgstr ""
-#: exercises/models/image.py:60
+#: exercises/models/image.py:56
msgid "3D"
msgstr ""
-#: exercises/models/image.py:61
+#: exercises/models/image.py:57
msgid "Low-poly"
msgstr ""
-#: exercises/models/image.py:62
+#: exercises/models/image.py:58
msgid "Photo"
msgstr ""
-#: exercises/models/image.py:63
+#: exercises/models/image.py:59
#, fuzzy
#| msgid "Others"
msgid "Other"
msgstr "Andra"
-#: exercises/models/image.py:81 gallery/models/image.py:56
+#: exercises/models/image.py:77 gallery/models/image.py:56
msgid "Image"
msgstr "Bild"
-#: exercises/models/image.py:82 gallery/models/image.py:57
+#: exercises/models/image.py:78 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:88
+#: exercises/models/image.py:84
msgid "Main picture"
msgstr "Huvudbild"
-#: exercises/models/image.py:91
+#: exercises/models/image.py:87
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 "
@@ -1626,19 +1626,10 @@ msgstr ""
"(kommer visar i t.ex. sökresultaten). Den första bilden markeras automatiskt "
"av systemet."
-#: exercises/models/image.py:100
+#: exercises/models/image.py:96
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: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}."
-
#: exercises/models/muscle.py:37
msgid "In latin, e.g. \"Pectoralis major\""
msgstr "På latin, e.g. \"Pectoralis major\""
@@ -1653,53 +1644,54 @@ msgstr "Övningsnamn"
msgid "A more basic name for the muscle"
msgstr ""
-#: exercises/models/video.py:41
-msgid "Maximum file size is 100MB."
+#: exercises/models/video.py:50
+#, python-format
+msgid "Maximum file size is %(size)sMB."
msgstr ""
-#: exercises/models/video.py:44 exercises/models/video.py:48
+#: exercises/models/video.py:57 exercises/models/video.py:65
msgid "File type is not supported"
msgstr ""
-#: exercises/models/video.py:57
+#: exercises/models/video.py:70
msgid "File is not a valid video"
msgstr ""
-#: exercises/models/video.py:88
+#: exercises/models/video.py:101
#, fuzzy
#| msgid "Main picture"
msgid "Main video"
msgstr "Huvudbild"
-#: exercises/models/video.py:94
+#: exercises/models/video.py:107
msgid "Video"
msgstr ""
-#: exercises/models/video.py:101
+#: exercises/models/video.py:114
msgid "Size"
msgstr ""
-#: exercises/models/video.py:108 manager/models/schedule_step.py:56
+#: exercises/models/video.py:121 manager/models/schedule_step.py:56
msgid "Duration"
msgstr "Längd"
-#: exercises/models/video.py:117
+#: exercises/models/video.py:130
msgid "Width"
msgstr ""
-#: exercises/models/video.py:124
+#: exercises/models/video.py:137
#, fuzzy
#| msgid "Weight"
msgid "Height"
msgstr "Vikt"
-#: exercises/models/video.py:131
+#: exercises/models/video.py:144
#, fuzzy
#| msgid "Code"
msgid "Codec"
msgstr "Kod"
-#: exercises/models/video.py:139
+#: exercises/models/video.py:152
msgid "Codec, long name"
msgstr ""
@@ -1708,135 +1700,23 @@ msgid "Equipment list"
msgstr "Utrustningslista"
#: exercises/templates/equipment/admin-overview.html:37
-#: exercises/views/equipment.py:94
+#: exercises/views/equipment.py:92
msgid "Add new equipment"
msgstr "Lägg till ny utrustning"
-#: exercises/templates/equipment/overview.html:11
-msgid "Equipment overview"
-msgstr "Utrustningsöversikt"
-
-#: exercises/templates/equipment/overview.html:69
-#: exercises/templates/exercise/overview.html:74
-#: exercises/templates/exercise/view.html:264
-#: exercises/templates/muscles/overview.html:75
-msgid "Main muscles"
-msgstr "Huvudsakliga muskler"
-
-#: exercises/templates/equipment/overview.html:79
-msgid ""
-"No exercises for this equipment. Add or edit an exercise and set the "
-"equipment."
-msgstr ""
-"Inga övningar för denna utrustning. Lägg till eller redigera en övning och "
-"välj utrustning."
-
-#: exercises/templates/equipment/overview.html:96
-#: exercises/templates/exercise/overview.html:99
-#: nutrition/templates/ingredient/overview.html:57
-msgid "Search"
-msgstr "Sök"
-
-#: exercises/templates/equipment/overview.html:101
-#: exercises/templates/exercise/overview.html:104
-msgid "exercise name"
-msgstr "Övningsnamn"
-
-#: exercises/templates/equipment/overview.html:115
-#: exercises/templates/exercise/overview.html:118
-#: exercises/templates/muscles/overview.html:118
-#: nutrition/templates/ingredient/overview.html:85
-msgid "Only registered users can do this"
-msgstr "Endast registrerade användare kan göra detta"
-
-#: exercises/templates/exercise/email_new.tpl:1
-#, python-format
-msgid ""
-"Your exercise '%(exercise)s' was successfully added to the general\n"
-"database."
-msgstr ""
-"Din övning %(exercise)s' har nu laddats upp till den generella databasen."
-
-#: exercises/templates/exercise/email_new.tpl:4
-msgid ""
-"It is now available on the exercise and muscle overview and can be\n"
-"added to workouts. You can access it on this address:"
-msgstr ""
-"Den finns nu tillgänglig på övnings- och muskelöverblicken och kan användas "
-"i träningspass. Du kan få tillgång till den på denna adress:"
-
-#: exercises/templates/exercise/email_new.tpl:8
-#: nutrition/templates/ingredient/email_new.tpl:8
-msgid "Thank you for contributing and making this site better!"
-msgstr "Tack för att du bidrar och gör sidan bättre!"
-
-#: exercises/templates/exercise/email_new.tpl:9
-#: manager/templates/workout/email_reminder.tpl:15
-#: manager/templates/workout/email_weight_reminder.tpl:12
-#: nutrition/templates/ingredient/email_new.tpl:9
-#, python-format
-msgid "The %(site)s team"
-msgstr "1%(site)s lag"
-
-#: exercises/templates/exercise/form.html:4
-msgid "Submitting an exercise"
-msgstr "Ladda upp övning"
-
-#: exercises/templates/exercise/form.html:5
-msgid ""
-"Thank you for submitting an exercise. This is much\n"
-"appreciated!"
-msgstr "Tack för din uppladdade övning. Vi uppskattar det verkligen!"
-
-#: exercises/templates/exercise/form.html:8
-msgid ""
-"After you submit the form, the administrators will be notified.\n"
-"Once it is reviewed, it will be added to the database. Till this happens,\n"
-"it will not be visible in the overview or the search. In case you added your "
-"email\n"
-"when you registered, you will get notified when the process is completed "
-"successfully."
-msgstr ""
-"När du har skickat formuläret, kommer administratörerna att meddelas.\n"
-"När det är granskat, kommer det att läggas till i databasen. Tills detta "
-"händer syns det inte i översikten eller sökningen. Om du lagt till din e-"
-"postadress när du registrerade dig kommer att du meddelas när processen har "
-"slutförts."
-
-#: exercises/templates/exercise/form_correct.html:4
-msgid "Correcting an exercise"
-msgstr "Korrigera en övning"
-
-#: exercises/templates/exercise/form_correct.html:5
-msgid ""
-"Thank you for correcting and improving this exercise.\n"
-"This is much appreciated!"
-msgstr ""
-"Tack för att du korrigerar och förbättrar denna övning. Vi uppskattar det "
-"verkligen!"
-
-#: exercises/templates/exercise/form_correct.html:8
-msgid ""
-"After you submit the form, the administrators will be notified.\n"
-"Once the changes are reviewed the exercise will be updated."
-msgstr ""
-"Efter att du skickat formuläret kommer administratörerna bli meddelade. När "
-"ändringarna granskats kommer övningen bli uppdaterad. "
-
-#: exercises/templates/exercise/overview.html:88
-msgid "No categories."
-msgstr "Inga kategorier."
-
-#: exercises/templates/exercise/overview.html:88
-msgid "Use link to create one"
-msgstr "Använd länk för att skapa en"
+#: exercises/templates/history/overview.html:11
+#, fuzzy
+#| msgid "Exercise day"
+msgid "Exercise admin history"
+msgstr "Träningsdag"
-#: exercises/templates/exercise/pending.html:14
-#: nutrition/templates/ingredient/pending.html:14
-msgid "Submission date"
-msgstr "Inlämningsdatum"
+#: exercises/templates/history/overview.html:27
+#, fuzzy
+#| msgid "Actions"
+msgid "Action"
+msgstr "Åtgärder"
-#: exercises/templates/exercise/pending.html:16 gallery/models/image.py:51
+#: exercises/templates/history/overview.html:28 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/log.py:45
@@ -1847,100 +1727,45 @@ msgstr "Inlämningsdatum"
msgid "User"
msgstr "Användare"
-#: exercises/templates/exercise/view.html:48
-msgid "Exercise is pending review"
-msgstr "Övning avvaktar översyn"
+#: exercises/templates/history/overview.html:29
+#, fuzzy
+#| msgctxt "As in \"email subject\""
+#| msgid "Subject"
+msgid "Object"
+msgstr "Ämne"
-#: exercises/templates/exercise/view.html:51
-msgid ""
-"This user submitted exercise is pending a decision to be\n"
-" included in the database."
-msgstr "Denna övning är i väntan på att inkluderas i databasen."
+#: exercises/templates/history/overview.html:31
+#, fuzzy
+#| msgctxt "Noun, not verb"
+#| msgid "Change"
+msgid "Changes"
+msgstr "Ändra"
-#: exercises/templates/exercise/view.html:53
-msgid "Till then, it will not be shown in the overview or the search."
+#: exercises/templates/history/overview.html:32
+msgid "Revert"
msgstr ""
-"Tills dess kommer den inte att visas i överblicken eller i sökresultaten."
-
-#: exercises/templates/exercise/view.html:54
-#: nutrition/templates/ingredient/view.html:31
-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:203
-#: nutrition/templates/ingredient/view.html:38
-msgid "Accept"
-msgstr "Acceptera"
-
-#: exercises/templates/exercise/view.html:64
-#: exercises/templates/exercise/view.html:204
-#: nutrition/templates/ingredient/view.html:42
-msgid "Decline"
-msgstr "Neka"
-
-#: exercises/templates/exercise/view.html:96
-msgid "Images"
-msgstr "Bilder"
-#: exercises/templates/exercise/view.html:137 exercises/views/images.py:93
-msgid "Add new image"
-msgstr "Lägg till ny bild"
-
-#: exercises/templates/exercise/view.html:148
-msgid "Videos"
+#: exercises/templates/history/overview.html:64
+msgid "View Object"
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:218
-msgid "Comments for this exercise"
-msgstr "Kommentarer för denna övning"
-
-#: exercises/templates/exercise/view.html:246
-msgid "Add new comment"
-msgstr "Lägg till ny kommentar"
-
-#: 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:301
-#: manager/templates/workout/log.html:10 manager/templates/workout/log.html:11
-msgid "Weight log"
-msgstr "Viktlogg"
-
-#: exercises/templates/exercise/view.html:306
-msgid "Exercise Variations"
+#: exercises/templates/history/overview.html:75
+msgid "View changes"
msgstr ""
-#: exercises/templates/exercise/view.html:327
-msgid "Submit a correction"
-msgstr "Skicka en korregering"
+#: exercises/templates/history/overview.html:86
+msgid "Revert changes"
+msgstr ""
#: exercises/templates/muscles/admin-overview.html:4
-#: exercises/templates/muscles/overview.html:7
msgid "Muscle overview"
msgstr "Muskelöversikt"
#: exercises/templates/muscles/admin-overview.html:36
-#: exercises/views/muscles.py:86
+#: exercises/views/muscles.py:67
msgid "Add muscle"
msgstr "Lägg till muskel"
-#: exercises/templates/muscles/overview.html:85
-msgid ""
-"No exercises for this muscle. Add or edit an exercise and set the muscle."
-msgstr ""
-
#: exercises/views/categories.py:71
msgid "Add category"
msgstr "Lägg till kategori"
@@ -1953,50 +1778,19 @@ msgstr "Detta tar också bort alla övningar i denna kategori."
msgid "Add exercise comment"
msgstr "Lägg till övningskommentar"
-#: exercises/views/equipment.py:107 exercises/views/equipment.py:118
+#: exercises/views/equipment.py:105 exercises/views/equipment.py:116
msgid "Delete equipment?"
msgstr "Ta bort utrustning?"
-#: exercises/views/exercises.py:229
+#: exercises/views/exercises.py:161
#, python-format
-msgid ""
-"%(name_original)s is too similar to existing exercise \"%(exercise_name)s\""
+msgid "%(name)s is too similar to existing exercise \"%(exercise_name)s\""
msgstr ""
-#: exercises/views/exercises.py:247
-msgid "Add exercise"
-msgstr "Lägg till övning"
-
-#: 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:380
-#, python-brace-format
-msgid "Correct {0}"
-msgstr "Korrekt {0}"
-
-#: exercises/views/exercises.py:422
+#: exercises/views/exercises.py:184
msgid "This will delete the exercise from all workouts."
msgstr "Detta kommer att radera övningen från alla pass."
-#: exercises/views/exercises.py:474
-msgid "Exercise was successfully marked as rejected"
-msgstr "Övningen har markerats som avvisad"
-
-#: exercises/views/images.py:68
-msgid "Edit exercise image"
-msgstr "Redigera övningsbild"
-
-#: exercises/views/images.py:143
-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"
@@ -2068,7 +1862,7 @@ 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:59
+#: manager/templates/log/add.html:52 nutrition/forms.py:60
#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:102
#: nutrition/models/meal_item.py:72
msgid "Amount"
@@ -2171,6 +1965,10 @@ msgstr "Kommer att använda filnamn om ingenting anges"
msgid "User notes"
msgstr "Användaranteckningar"
+#: gym/templates/contract/list.html:36
+msgid "Show"
+msgstr "Visa"
+
#: gym/templates/contract/view.html:4
msgid "Contract"
msgstr "Avtal"
@@ -2247,11 +2045,7 @@ msgstr "E-postmeddelanden"
#: gym/templates/gym/member_list.html:315
msgid "Add member"
-msgstr "Lägg till medlem"
-
-#: gym/templates/gym/new_user.html:38
-msgid "Date of Birth"
-msgstr ""
+msgstr "Lägg till medlem"
#: gym/templates/gym/new_user.html:48 manager/templates/calendar/month.html:144
#: manager/templates/log/add.html:75 nutrition/templates/rate/form.html:120
@@ -2314,132 +2108,132 @@ msgstr "Lägg till användare till gym"
msgid "Edit gym"
msgstr "Redigera gym"
-#: i18n.tpl:2 i18n.tpl:28
+#: i18n.tpl:2
+msgid "Until Failure"
+msgstr "Tills Misslyckande"
+
+#: i18n.tpl:3 manager/forms.py:180 manager/models/log.py:73
+#: manager/templates/set/add.html:53
+msgid "Repetitions"
+msgstr "Repetitioner"
+
+#: i18n.tpl:4
msgid "Abs"
msgstr "Magmuskler"
-#: i18n.tpl:3
+#: i18n.tpl:5
msgid "Arms"
msgstr "Armar"
-#: i18n.tpl:4
-msgid "Back"
-msgstr "Rygg"
-
-#: i18n.tpl:5 i18n.tpl:23
-msgid "Calves"
-msgstr "Vader"
-
-#: i18n.tpl:6 i18n.tpl:26
-msgid "Chest"
-msgstr "Bröst"
-
-#: i18n.tpl:7
+#: i18n.tpl:6
msgid "Legs"
msgstr "Ben"
-#: i18n.tpl:8 i18n.tpl:19
-msgid "Shoulders"
-msgstr "Axlar"
+#: i18n.tpl:7
+msgid "Dumbbell"
+msgstr "Hantel"
+
+#: i18n.tpl:8
+#, fuzzy
+#| msgid "Biceps brachii"
+msgid "Biceps"
+msgstr "Biceps brachii"
#: i18n.tpl:9
-msgid "Barbell"
-msgstr "Skivstång"
+msgid "SZ-Bar"
+msgstr "SZ-Bar"
#: i18n.tpl:10
-msgid "Bench"
-msgstr "Bänk"
+msgid "Kettlebell"
+msgstr "Kettlebell"
#: i18n.tpl:11
-msgid "Dumbbell"
-msgstr "Hantel"
+msgid "Swiss Ball"
+msgstr "Schweizisk boll"
#: i18n.tpl:12
-msgid "Gym mat"
-msgstr "Gym mat"
+msgid "none (bodyweight exercise)"
+msgstr "ingen (kroppsvikt träning)"
#: i18n.tpl:13
-msgid "Incline bench"
-msgstr "Luta bänken"
+msgid "Calves"
+msgstr "Vader"
#: i18n.tpl:14
-msgid "Kettlebell"
-msgstr "Kettlebell"
+msgid "Back"
+msgstr "Rygg"
#: i18n.tpl:15
-msgid "Pull-up bar"
-msgstr "Pull-up bar"
+msgid "Lower back"
+msgstr ""
#: i18n.tpl:16
-msgid "SZ-Bar"
-msgstr "SZ-Bar"
+msgid "Lats"
+msgstr ""
#: i18n.tpl:17
-msgid "Swiss Ball"
-msgstr "Schweizisk boll"
+msgid "Hamstrings"
+msgstr ""
#: i18n.tpl:18
-msgid "none (bodyweight exercise)"
-msgstr "ingen (kroppsvikt träning)"
+msgid "Bench"
+msgstr "Bänk"
-#: i18n.tpl:20
+#: i18n.tpl:19
#, fuzzy
-#| msgid "Biceps brachii"
-msgid "Biceps"
-msgstr "Biceps brachii"
+#| msgid "Minutes"
+msgid "Glutes"
+msgstr "Minuter"
+
+#: i18n.tpl:20
+msgid "Kilometers"
+msgstr "Kilometer"
#: i18n.tpl:21
-msgid "Hamstrings"
-msgstr ""
+msgid "Shoulders"
+msgstr "Axlar"
#: i18n.tpl:22
-msgid "Lower back"
-msgstr ""
+msgid "Seconds"
+msgstr "Sekunder"
+
+#: i18n.tpl:23
+msgid "Miles"
+msgstr "Mil"
#: i18n.tpl:24
-#, fuzzy
-#| msgid "Minutes"
-msgid "Glutes"
-msgstr "Minuter"
+msgid "Incline bench"
+msgstr "Luta bänken"
#: i18n.tpl:25
-msgid "Lats"
+msgid "Quads"
msgstr ""
+#: i18n.tpl:26
+msgid "Minutes"
+msgstr "Minuter"
+
#: i18n.tpl:27
-msgid "Quads"
-msgstr ""
+msgid "Chest"
+msgstr "Bröst"
+
+#: i18n.tpl:28
+msgid "Gym mat"
+msgstr "Gym mat"
#: i18n.tpl:29
-#, fuzzy
-#| msgid "Triceps brachii"
-msgid "Triceps"
-msgstr "Tricepsbrachii"
+msgid "Pull-up bar"
+msgstr "Pull-up bar"
#: i18n.tpl:30
-msgid "Kilometers"
-msgstr "Kilometer"
+msgid "Barbell"
+msgstr "Skivstång"
#: i18n.tpl:31
-msgid "Miles"
-msgstr "Mil"
-
-#: i18n.tpl:32
-msgid "Minutes"
-msgstr "Minuter"
-
-#: i18n.tpl:33 manager/forms.py:169 manager/models/log.py:71
-#: manager/templates/set/add.html:53
-msgid "Repetitions"
-msgstr "Repetitioner"
-
-#: i18n.tpl:34
-msgid "Seconds"
-msgstr "Sekunder"
-
-#: i18n.tpl:35
-msgid "Until Failure"
-msgstr "Tills Misslyckande"
+#, fuzzy
+#| msgid "Triceps brachii"
+msgid "Triceps"
+msgstr "Tricepsbrachii"
#: mailer/forms.py:34 mailer/templates/mailer/gym/preview.html:32
msgctxt "As in \"email subject\""
@@ -2494,11 +2288,11 @@ msgstr ""
msgid "Correction"
msgstr "Korrigering"
-#: manager/forms.py:89 manager/models/workout.py:59
+#: manager/forms.py:92 manager/models/workout.py:59
msgid "The name of the workout"
msgstr "Namnet på din workout"
-#: manager/forms.py:93 manager/models/workout.py:66
+#: manager/forms.py:96 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'."
@@ -2506,7 +2300,7 @@ msgstr ""
"En kort beskrivning eller ett mål med träningen. Till exempel \"fokus på "
"ryggen\" eller \"Vecka 1 av program xy\"."
-#: manager/forms.py:126
+#: manager/forms.py:137
msgid ""
"You can search for more than one exercise, they will be grouped together for "
"a superset."
@@ -2514,28 +2308,28 @@ msgstr ""
"Du kan söka efter mer än en övning, dessa kommer att grupperas för ett "
"superset."
-#: 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
+#: manager/forms.py:166 manager/forms.py:171 manager/models/log.py:64
+#: manager/models/log.py:92 manager/models/setting.py:59
+#: manager/models/setting.py:90 manager/templates/log/add.html:53
+#: manager/templates/log/add.html:55 manager/templates/set/formset.html:10
+#: manager/templates/set/formset.html:12 measurements/models/category.py:58
+#: nutrition/forms.py:64
msgid "Unit"
msgstr "Enhet"
-#: manager/forms.py:266
+#: manager/forms.py:277
msgid "Type"
msgstr "Typ"
-#: manager/forms.py:267 manager/templates/workout/view.html:157
+#: manager/forms.py:278 manager/templates/workout/view.html:157
msgid "Table"
msgstr "Tabell"
-#: manager/forms.py:269 manager/templates/workout/view.html:163
+#: manager/forms.py:280 manager/templates/workout/view.html:163
msgid "with images"
msgstr "med bilder"
-#: manager/forms.py:270 manager/templates/workout/view.html:169
+#: manager/forms.py:281 manager/templates/workout/view.html:169
msgid "with comments"
msgstr "med kommentarer"
@@ -2594,7 +2388,7 @@ msgid "The duration in weeks"
msgstr "Varaktighet i veckor"
#: manager/models/schedule_step.py:63 manager/models/set.py:52
-#: manager/models/setting.py:98 nutrition/models/meal.py:54
+#: manager/models/setting.py:110 nutrition/models/meal.py:54
#: nutrition/models/meal_item.py:65
msgid "Order"
msgstr "Ordning"
@@ -2645,7 +2439,7 @@ msgstr "Träningsdag"
msgid "Number of sets"
msgstr "Antal set"
-#: manager/models/setting.py:43
+#: manager/models/setting.py:48
msgid "Sets"
msgstr "Set"
@@ -2929,6 +2723,13 @@ msgstr ""
"Om du inte vill ta emot e-post påminnelser någonsin, avaktivera alternativet "
"i inställningarna."
+#: manager/templates/workout/email_reminder.tpl:15
+#: manager/templates/workout/email_weight_reminder.tpl:12
+#: nutrition/templates/ingredient/email_new.tpl:9
+#, python-format
+msgid "The %(site)s team"
+msgstr "1%(site)s lag"
+
#: manager/templates/workout/email_weight_reminder.tpl:3
#, python-format
msgid ""
@@ -2945,6 +2746,10 @@ msgstr ""
"Du kommes regelbundet få sådana påminnelser tills du anger din nuvarande "
"vikt."
+#: manager/templates/workout/log.html:10 manager/templates/workout/log.html:11
+msgid "Weight log"
+msgstr "Viktlogg"
+
#: manager/templates/workout/log.html:29
msgid "Weight log for workout"
msgstr "Viktlogg för träningspass"
@@ -3054,7 +2859,7 @@ msgstr ""
msgid "Edit workout"
msgstr "Redigera träningspass"
-#: manager/templates/workout/view.html:225 manager/views/workout.py:300
+#: manager/templates/workout/view.html:225 manager/views/workout.py:301
msgid "Mark as template"
msgstr ""
@@ -3062,11 +2867,6 @@ msgstr ""
msgid "Add workout day"
msgstr "Lägg till träningsdag"
-#: manager/views/log.py:92
-#, python-format
-msgid "Edit log entry for %s"
-msgstr "Redigera logginträde för %s"
-
#: manager/views/log.py:111
msgid "Delete workout log"
msgstr "Ta bort träningslogg"
@@ -3084,11 +2884,11 @@ msgstr "Skapa schema"
msgid "Your workouts"
msgstr "Dina träningspass"
-#: manager/views/workout.py:227
+#: manager/views/workout.py:228
msgid "Copy workout"
msgstr "Kopiera träningspass"
-#: manager/views/workout.py:230
+#: manager/views/workout.py:231
msgid "Copy"
msgstr "Kopiera"
@@ -3110,23 +2910,23 @@ msgstr "Detta kommer ta bort alla viktloggar för denna dag med."
msgid "Value"
msgstr ""
-#: nutrition/forms.py:122
+#: nutrition/forms.py:123
msgid "Calculate"
msgstr "Beräkna"
-#: nutrition/forms.py:195 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:196 nutrition/templates/rate/form.html:76
msgid "Basic caloric intake"
msgstr "Grundläggande kaloriintag"
-#: nutrition/forms.py:196
+#: nutrition/forms.py:197
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:202
+#: nutrition/forms.py:203
msgid "Additional calories"
msgstr "Extra kalorier"
-#: nutrition/forms.py:204
+#: nutrition/forms.py:205
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
@@ -3134,7 +2934,7 @@ msgstr ""
"Extra kalorier att lägga till basen (för att subtrahera, ange ett negativt "
"tal)"
-#: nutrition/forms.py:232 nutrition/models/ingredient_weight_unit.py:39
+#: nutrition/forms.py:233 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"
@@ -3197,7 +2997,7 @@ msgid ""
"{energy_approx}%)"
msgstr ""
-#: nutrition/models/ingredient.py:357 nutrition/views/ingredient.py:225
+#: nutrition/models/ingredient.py:357 nutrition/views/ingredient.py:219
msgid "Ingredient was successfully added to the general database"
msgstr "Ingrediensen lades till den allmänna databasen"
@@ -3226,6 +3026,12 @@ msgstr "Enhetsmängd (e.g. \"1 DL\" eller \"1/2 tesked\")"
msgid "Meal"
msgstr "Måltid"
+#: nutrition/models/log.py:65
+#, fuzzy
+#| msgid "Time (approx)"
+msgid "Date and Time (Approx.)"
+msgstr "Tid (ca)"
+
#: nutrition/models/meal.py:61
msgid "Time (approx)"
msgstr "Tid (ca)"
@@ -3327,6 +3133,10 @@ msgstr ""
"Det är nu tillgänglig på ingrediensöversikten och kan användas i kostplaner. "
"Du kan finna den på denna adress:"
+#: nutrition/templates/ingredient/email_new.tpl:8
+msgid "Thank you for contributing and making this site better!"
+msgstr "Tack för att du bidrar och gör sidan bättre!"
+
#: nutrition/templates/ingredient/form.html:4
msgid "Submitting an ingredient"
msgstr "Ladda upp ingredient"
@@ -3356,6 +3166,10 @@ msgstr ""
msgid "No ingredients."
msgstr "Inga ingredienser."
+#: nutrition/templates/ingredient/overview.html:57
+msgid "Search"
+msgstr "Sök"
+
#: nutrition/templates/ingredient/overview.html:66
msgid "ingredient name"
msgstr "ingrediensnamn"
@@ -3365,6 +3179,14 @@ msgstr "ingrediensnamn"
msgid "Add ingredient"
msgstr "Lägg till ingrediens"
+#: nutrition/templates/ingredient/overview.html:85
+msgid "Only registered users can do this"
+msgstr "Endast registrerade användare kan göra detta"
+
+#: nutrition/templates/ingredient/pending.html:14
+msgid "Submission date"
+msgstr "Inlämningsdatum"
+
#: nutrition/templates/ingredient/view.html:27
msgid "Ingredient is pending review"
msgstr "Ingrediensen är i väntan på granskning"
@@ -3380,6 +3202,18 @@ msgstr ""
"databasen. Tills dess kommed den inte visas i översikten eller i "
"sökresultaten."
+#: nutrition/templates/ingredient/view.html:31
+msgid "Please select one of the options below."
+msgstr "Vänligen välj ett av alternativen nedan."
+
+#: nutrition/templates/ingredient/view.html:38
+msgid "Accept"
+msgstr "Acceptera"
+
+#: nutrition/templates/ingredient/view.html:42
+msgid "Decline"
+msgstr "Neka"
+
#: nutrition/templates/ingredient/view.html:71
#: nutrition/templates/log/detail.html:31
#: nutrition/templates/plan/view.html:229 nutrition/views/plan.py:376
@@ -3644,14 +3478,18 @@ msgstr ""
"på dessa värden borde du observera dig själv under några veckor och ändra "
"det totala beloppet om det behövs."
-#: nutrition/views/ingredient.py:181
+#: nutrition/views/ingredient.py:175
msgid "Add a new ingredient"
msgstr "Lägg till en ny ingrediens"
-#: nutrition/views/ingredient.py:238
+#: nutrition/views/ingredient.py:232
msgid "Ingredient was successfully marked as rejected"
msgstr "Ingrediensen har markerats som nekad"
+#: nutrition/views/log.py:230 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"
@@ -3904,15 +3742,15 @@ msgstr ""
msgid "100%% Free <br>and <br>Open Source"
msgstr "100%% Fri och Öppen källkod"
-#: utils/generic_views.py:261
+#: utils/generic_views.py:262
msgid "Yes, delete"
msgstr "Ja, ta bort"
-#: utils/models.py:47
+#: utils/models.py:48
msgid "Author"
msgstr "Skapare"
-#: utils/models.py:52
+#: utils/models.py:53
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."
@@ -3920,15 +3758,15 @@ msgstr ""
"Om du inte är skapaen, ange namn eller källa här. Detta är nödvändigt för "
"vissa licenser e.g. CC-BY-SA."
-#: utils/models.py:77
+#: utils/models.py:78
msgid "Pending"
msgstr "I väntan"
-#: utils/models.py:78
+#: utils/models.py:79
msgid "Accepted"
msgstr "Accepterat"
-#: utils/models.py:79
+#: utils/models.py:80
msgid "Declined"
msgstr "Nekad"
@@ -4086,6 +3924,182 @@ msgstr ""
msgid "Delete weight entry for the %s"
msgstr ""
+#~ msgid "Ingredients"
+#~ msgstr "Ingredienser"
+
+#~ msgid ""
+#~ "Use the configuration to select in what languages the\n"
+#~ "exercises and ingredients will be shown for the current language (for "
+#~ "example\n"
+#~ "the exercises should be shown in languages A, B and C; the ingredients "
+#~ "only\n"
+#~ "in A)."
+#~ msgstr ""
+#~ "Använd konfigurationen för att välja vilket språk övningar och "
+#~ "ingredienser ska visas i. (T.ex. Övningar kan visas i språk A, B och C; "
+#~ "Ingredienser endast i språk A)"
+
+#~ msgid "Add new exercise"
+#~ msgstr "Lägg till ny övning"
+
+#~ msgid "Exercises pending review"
+#~ msgstr "Övningar som avaktar genomgång"
+
+#~ msgid "Exercise was successfully added to the general database"
+#~ msgstr "Övningen har lagts till den allmänna databasen"
+
+#~ msgid "New user submitted exercise"
+#~ msgstr "Ny användarskapad övning"
+
+#, python-brace-format
+#~ msgid "The user {0} submitted a new exercise \"{1}\"."
+#~ msgstr "Användaren {0} har laggt in en ny övning \"{1}\"."
+
+#~ msgid "New user submitted image"
+#~ msgstr "Ny användaruppladdad bild"
+
+#, 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}."
+
+#~ msgid "Equipment overview"
+#~ msgstr "Utrustningsöversikt"
+
+#~ msgid "Main muscles"
+#~ msgstr "Huvudsakliga muskler"
+
+#~ msgid ""
+#~ "No exercises for this equipment. Add or edit an exercise and set the "
+#~ "equipment."
+#~ msgstr ""
+#~ "Inga övningar för denna utrustning. Lägg till eller redigera en övning "
+#~ "och välj utrustning."
+
+#~ msgid "exercise name"
+#~ msgstr "Övningsnamn"
+
+#, python-format
+#~ msgid ""
+#~ "Your exercise '%(exercise)s' was successfully added to the general\n"
+#~ "database."
+#~ msgstr ""
+#~ "Din övning %(exercise)s' har nu laddats upp till den generella databasen."
+
+#~ msgid ""
+#~ "It is now available on the exercise and muscle overview and can be\n"
+#~ "added to workouts. You can access it on this address:"
+#~ msgstr ""
+#~ "Den finns nu tillgänglig på övnings- och muskelöverblicken och kan "
+#~ "användas i träningspass. Du kan få tillgång till den på denna adress:"
+
+#~ msgid "Submitting an exercise"
+#~ msgstr "Ladda upp övning"
+
+#~ msgid ""
+#~ "Thank you for submitting an exercise. This is much\n"
+#~ "appreciated!"
+#~ msgstr "Tack för din uppladdade övning. Vi uppskattar det verkligen!"
+
+#~ msgid ""
+#~ "After you submit the form, the administrators will be notified.\n"
+#~ "Once it is reviewed, it will be added to the database. Till this "
+#~ "happens,\n"
+#~ "it will not be visible in the overview or the search. In case you added "
+#~ "your email\n"
+#~ "when you registered, you will get notified when the process is completed "
+#~ "successfully."
+#~ msgstr ""
+#~ "När du har skickat formuläret, kommer administratörerna att meddelas.\n"
+#~ "När det är granskat, kommer det att läggas till i databasen. Tills detta "
+#~ "händer syns det inte i översikten eller sökningen. Om du lagt till din e-"
+#~ "postadress när du registrerade dig kommer att du meddelas när processen "
+#~ "har slutförts."
+
+#~ msgid "Correcting an exercise"
+#~ msgstr "Korrigera en övning"
+
+#~ msgid ""
+#~ "Thank you for correcting and improving this exercise.\n"
+#~ "This is much appreciated!"
+#~ msgstr ""
+#~ "Tack för att du korrigerar och förbättrar denna övning. Vi uppskattar det "
+#~ "verkligen!"
+
+#~ msgid ""
+#~ "After you submit the form, the administrators will be notified.\n"
+#~ "Once the changes are reviewed the exercise will be updated."
+#~ msgstr ""
+#~ "Efter att du skickat formuläret kommer administratörerna bli meddelade. "
+#~ "När ändringarna granskats kommer övningen bli uppdaterad. "
+
+#~ msgid "No categories."
+#~ msgstr "Inga kategorier."
+
+#~ msgid "Use link to create one"
+#~ msgstr "Använd länk för att skapa en"
+
+#~ msgid "Exercise is pending review"
+#~ msgstr "Övning avvaktar översyn"
+
+#~ msgid ""
+#~ "This user submitted exercise is pending a decision to be\n"
+#~ " included in the database."
+#~ msgstr "Denna övning är i väntan på att inkluderas i databasen."
+
+#~ msgid "Till then, it will not be shown in the overview or the search."
+#~ msgstr ""
+#~ "Tills dess kommer den inte att visas i överblicken eller i sökresultaten."
+
+#~ msgid "Images"
+#~ msgstr "Bilder"
+
+#~ msgid "Add new image"
+#~ msgstr "Lägg till ny bild"
+
+#, fuzzy
+#~| msgid "Add new image"
+#~ msgid "Add new video"
+#~ msgstr "Lägg till ny bild"
+
+#~ msgid "Images pending review"
+#~ msgstr "Bilder i avvaktan på översyn"
+
+#~ msgid "Comments for this exercise"
+#~ msgstr "Kommentarer för denna övning"
+
+#~ msgid "Add new comment"
+#~ msgstr "Lägg till ny kommentar"
+
+#~ msgid "The diagram shows the most used muscles on this exercise"
+#~ msgstr "Diagrammet visar de mest använda musklerna i denna övning"
+
+#~ msgid "Submit a correction"
+#~ msgstr "Skicka en korregering"
+
+#~ msgid "Add exercise"
+#~ msgstr "Lägg till övning"
+
+#~ msgid ""
+#~ "Thank you. Once the changes are reviewed the exercise will be updated."
+#~ msgstr "Tack. När ändringarna är översedda kommer övningen att uppdateras."
+
+#, python-brace-format
+#~ msgid "Correct {0}"
+#~ msgstr "Korrekt {0}"
+
+#~ msgid "Exercise was successfully marked as rejected"
+#~ msgstr "Övningen har markerats som avvisad"
+
+#~ msgid "Edit exercise image"
+#~ msgstr "Redigera övningsbild"
+
+#~ msgid "Delete exercise image?"
+#~ msgstr "Ta bort övingsbild?"
+
+#, python-format
+#~ msgid "Edit log entry for %s"
+#~ msgstr "Redigera logginträde för %s"
+
#~ msgid "Anterior deltoid"
#~ msgstr "Främre deltamuskeln"
@@ -4410,10 +4424,6 @@ msgstr ""
#~ msgid "No filter"
#~ msgstr "Ingen filter"
-#~ msgctxt "Noun, not verb"
-#~ msgid "Change"
-#~ msgstr "Ändra"
-
#~ msgid "Days"
#~ msgstr "Dagar"
diff --git a/wger/locale/tr/LC_MESSAGES/django.po b/wger/locale/tr/LC_MESSAGES/django.po
index 7289c7af6..c61963671 100644
--- a/wger/locale/tr/LC_MESSAGES/django.po
+++ b/wger/locale/tr/LC_MESSAGES/django.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: wger Workout Manager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-14 12:01+0200\n"
+"POT-Creation-Date: 2022-11-10 16:03+0100\n"
"PO-Revision-Date: 2022-10-17 00:56+0000\n"
"Last-Translator: Cem Avcı <[email protected]>\n"
"Language-Team: Turkish <https://hosted.weblate.org/projects/wger/web/tr/>\n"
@@ -34,107 +34,8 @@ msgstr ""
"kullanıcıları bu spor salonuna atayacak ve spor salonu olmayan tüm mevcut "
"kullanıcıları güncelleyecektir."
-#: 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 "Egzersizler"
-
-#: config/models/language_config.py:42
-msgid "Ingredients"
-msgstr "Bileşimindekiler"
-
-#: config/templates/language/overview.html:4 core/templates/navigation.html:226
-msgid "Languages"
-msgstr "Diller"
-
-#: config/templates/language/overview.html:16
-msgid "Nothing found."
-msgstr "Bulunamadı."
-
-#: 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:150
-#: nutrition/templates/plan/view.html:153
-#: nutrition/templates/plan/view.html:191
-msgid "Add one now."
-msgstr "Yeni ekle."
-
-#: config/templates/language/overview.html:29
-#: core/templates/license/list.html:38 core/templates/misc/license/list.html:41
-#: core/templates/repetition_unit/list.html:41
-#: core/templates/user/overview.html:327 core/templates/user/overview.html:366
-#: core/templates/user/overview.html:402
-#: core/templates/weight_unit/list.html:41 core/views/languages.py:73
-#: core/views/license.py:65 core/views/repetition_units.py:65
-#: core/views/weight_units.py:65
-#: exercises/templates/categories/admin-overview.html:36
-#: 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:61
-msgid "Add"
-msgstr "Ekle"
-
-#: config/templates/language/view.html:21 core/models/language.py:29
-msgid "Language short name"
-msgstr "Dilin kısa adı"
-
-#: config/templates/language/view.html:22
-#: config/templates/language/view.html:43 core/models/language.py:32
-msgid "Language full name"
-msgstr "Dilin tam adı"
-
-#: config/templates/language/view.html:34 core/templates/user/overview.html:451
-#: gym/views/admin_config.py:44 gym/views/admin_config.py:58
-#: gym/views/user_config.py:46
-msgid "Configuration"
-msgstr "Yapılandırma"
-
-#: config/templates/language/view.html:35
-msgid ""
-"Use the configuration to select in what languages the\n"
-"exercises and ingredients will be shown for the current language (for "
-"example\n"
-"the exercises should be shown in languages A, B and C; the ingredients only\n"
-"in A)."
-msgstr ""
-"Geçerli dil için egzersizlerin ve bileşenlerin hangi\n"
-"dillerde gösterileceğini seçmek için yapılandırmayı kullanın (örneğin, "
-"egzersizler\n"
-"A, B ve C dillerinde gösterilmelidir; bileşenler yalnızca A "
-"dilindegösterilmelidir)."
-
-#: config/templates/language/view.html:44 gym/templates/contract/list.html:36
-msgid "Show"
-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: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:45
-msgid "Options"
-msgstr "Seçenekler"
-
-#: config/templates/language/view.html:96 config/views/gym_config.py:41
-#: config/views/language_config.py:49 core/templates/license/list.html:16
-#: core/templates/misc/license/list.html:17
+#: config/views/gym_config.py:41 core/templates/language/view.html:57
+#: 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:39
#: core/templates/tags/render_day.html:75 core/templates/user/overview.html:205
@@ -142,12 +43,10 @@ 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:230
-#: exercises/templates/exercise/view.html:351
#: exercises/templates/muscles/admin-overview.html:16
-#: 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
+#: 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
#: 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,81 +62,54 @@ msgstr "Seçenekler"
msgid "Edit"
msgstr "Düzenle"
-#: 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: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: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
-#: gym/templates/contract_type/list.html:39 gym/templates/document/list.html:46
-#: gym/templates/gym/list.html:20 manager/templates/calendar/day.html:69
-#: 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:231
-#: 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:132
-#: nutrition/templates/units/list.html:20
-msgid "Delete"
-msgstr "Sil"
-
-#: core/demo.py:86
+#: core/demo.py:95
msgid "Sample workout"
msgstr "Örnek antrenman"
-#: core/demo.py:90
+#: core/demo.py:99
msgid "Sample day"
msgstr "Örnek gün"
-#: core/demo.py:94
+#: core/demo.py:103
msgid "Another sample day"
msgstr "Başka bir örnek gün"
-#: core/demo.py:217
-msgid "Sample nutrional plan"
+#: core/demo.py:211
+#, fuzzy
+#| msgid "Sample nutrional plan"
+msgid "Sample nutritional plan"
msgstr "Örnek beslenme planı"
-#: core/demo.py:349 core/demo.py:351 core/demo.py:353
+#: core/demo.py:343 core/demo.py:345 core/demo.py:347
#, python-brace-format
msgid "Placeholder workout nr {0} for schedule"
msgstr "Program için yer tutucu antrenman no {0}"
-#: core/demo.py:358
+#: core/demo.py:352
msgid "My cool workout schedule"
msgstr "Harika antrenman programım"
-#: core/demo.py:397 core/demo.py:412
+#: core/demo.py:391 core/demo.py:406
msgid "Empty placeholder schedule"
msgstr "Yer tutucu planı boş"
-#: core/forms.py:61 core/templates/navigation.html:188
-#: core/templates/navigation.html:192 core/templates/user/login.html:4
+#: core/forms.py:64 core/templates/navigation.html:179
+#: core/templates/navigation.html:183 core/templates/user/login.html:4
#: software/templates/features.html:43
msgid "Login"
msgstr "Oturum aç"
-#: core/forms.py:73 core/forms.py:164 gym/views/export.py:63
+#: core/forms.py:76 core/forms.py:177 gym/views/export.py:63
#: gym/views/gym.py:218
msgid "First name"
msgstr "İsim"
-#: core/forms.py:74 core/forms.py:165 core/templates/user/overview.html:267
+#: core/forms.py:77 core/forms.py:178 core/templates/user/overview.html:267
#: gym/views/export.py:64 gym/views/gym.py:218
msgid "Last name"
msgstr "Soyisim"
-#: core/forms.py:76 core/forms.py:131 core/templates/user/overview.html:271
+#: core/forms.py:79 core/forms.py:144 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
@@ -247,79 +119,109 @@ msgstr "Soyisim"
msgid "Email"
msgstr "E-posta"
-#: core/forms.py:77
+#: core/forms.py:80
msgid "Used for password resets and, optionally, e-mail reminders."
msgstr ""
"Parola sıfırlamaları ve isteğe bağlı olarak e-posta hatırlatıcıları için "
"kullanılır."
-#: core/forms.py:102
+#: core/forms.py:84 core/models/profile.py:220
+#: gym/templates/gym/new_user.html:38
+msgid "Date of Birth"
+msgstr "Doğum tarihi"
+
+#: core/forms.py:116
msgid "Personal data"
msgstr "Kişisel bilgiler"
-#: core/forms.py:110
+#: core/forms.py:124
msgid "Workout reminders"
msgstr "Antrenman hatırlatıcıları"
-#: core/forms.py:117
+#: core/forms.py:131
msgid "Other settings"
msgstr "Diğer ayarlar"
-#: 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
+#: core/forms.py:138 core/views/user.py:615 core/views/user.py:630
+#: core/views/user.py:642 gym/forms.py:72 manager/templates/log/add.html:65
+#: manager/templates/set/add.html:69 manager/views/workout.py:222
+#: utils/generic_views.py:143
msgid "Save"
msgstr "Kaydet"
-#: core/forms.py:132
+#: core/forms.py:145
msgid "Used for password resets and, optionally, email reminders."
msgstr ""
"Parola sıfırlamaları ve isteğe bağlı olarak e-posta hatırlatıcıları için "
"kullanılır."
-#: core/forms.py:160
+#: core/forms.py:173
msgid "This e-mail address is already in use."
msgstr "Bu e-posta adresi zaten kullanılıyor."
-#: core/forms.py:180 gym/templates/gym/new_user.html:26
+#: core/forms.py:193 gym/templates/gym/new_user.html:26
#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:218
msgid "Password"
msgstr "Parola"
-#: core/forms.py:182
+#: core/forms.py:195
msgid "Please enter your current password."
msgstr "Lütfen geçerli parolanızı girin."
-#: core/forms.py:200
+#: core/forms.py:204 core/templates/language/view.html:62
+#: 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: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/muscles/admin-overview.html:17
+#: gym/templates/admin_notes/list.html:40
+#: gym/templates/contract_option/list.html:39
+#: gym/templates/contract_type/list.html:39 gym/templates/document/list.html:46
+#: gym/templates/gym/list.html:20 manager/templates/calendar/day.html:69
+#: 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:231
+#: 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:132
+#: nutrition/templates/units/list.html:20
+msgid "Delete"
+msgstr "Sil"
+
+#: core/forms.py:213
msgid "Invalid password"
msgstr "Geçersiz parola"
-#: core/forms.py:212 core/forms.py:278
+#: core/forms.py:225 core/forms.py:291
msgid "The form is secured with reCAPTCHA"
msgstr "Form reCAPTCHA ile güvence altına alındı"
-#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:188
-#: core/templates/navigation.html:193 core/templates/template.html:149
-#: core/templates/user/login.html:20 core/views/user.py:293
+#: core/forms.py:239 core/forms.py:258 core/templates/navigation.html:179
+#: core/templates/navigation.html:184 core/templates/template.html:149
+#: core/templates/user/login.html:20 core/views/user.py:300
#: software/templates/features.html:38
msgid "Register"
msgstr "Kayıt ol"
-#: core/forms.py:256
+#: core/forms.py:269
msgid "Contact"
msgstr "İletişim"
-#: core/forms.py:257
+#: core/forms.py:270
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:71
+#: core/forms.py:278 exercises/models/comment.py:42 manager/models/set.py:60
+#: manager/models/setting.py:111 nutrition/models/log.py:71
msgid "Comment"
msgstr "Yorum"
-#: core/forms.py:266
+#: core/forms.py:279
msgid "What do you want to say?"
msgstr "Ne söylemek istiyorsun?"
@@ -327,6 +229,14 @@ msgstr "Ne söylemek istiyorsun?"
msgid "Day of the week"
msgstr "Haftanın günü"
+#: core/models/language.py:31 core/templates/language/view.html:21
+msgid "Language short name"
+msgstr "Dilin kısa adı"
+
+#: core/models/language.py:36 core/templates/language/view.html:22
+msgid "Language full name"
+msgstr "Dilin tam adı"
+
#: core/models/license.py:29
msgid "Full name"
msgstr "Ad Soyad"
@@ -384,19 +294,19 @@ msgstr "Metrik (kilogram)"
msgid "Imperial (pound)"
msgstr "İngiliz (paunt)"
-#: core/models/profile.py:111
+#: core/models/profile.py:114
msgid "Show exercise comments"
msgstr "Egzersiz yorumlarını göster"
-#: core/models/profile.py:112
+#: core/models/profile.py:115
msgid "Check to show exercise comments on the workout view"
msgstr "Antrenman görünümünde egzersiz yorumlarını göstermek için işaretleyin"
-#: core/models/profile.py:123
+#: core/models/profile.py:126
msgid "Also use ingredients in English"
msgstr "İngilizce malzemeleri de kullanın"
-#: core/models/profile.py:125
+#: core/models/profile.py:128
msgid ""
"Check to also show ingredients in English while creating\n"
"a nutritional plan. These ingredients are extracted from a list provided\n"
@@ -408,11 +318,11 @@ msgstr ""
"ABD Tarım Bakanlığı tarafından. Çevresinde son derece eksiksiz\n"
"7000 giriş, ancak biraz bunaltıcı olabilir ve aramayı zorlaştırabilir."
-#: core/models/profile.py:134
+#: core/models/profile.py:137
msgid "Activate workout reminders"
msgstr "Antrenman hatırlatıcılarını aktifleştir"
-#: core/models/profile.py:136
+#: core/models/profile.py:139
msgid ""
"Check to activate automatic reminders for workouts. You need to provide a "
"valid email for this to work."
@@ -420,20 +330,20 @@ msgstr ""
"Antrenmanlar için otomatik hatırlatıcıları etkinleştirmek için işaretleyin. "
"Bunun çalışması için geçerli bir e-posta sağlamanız gerekiyor."
-#: core/models/profile.py:145
+#: core/models/profile.py:148
msgid "Remind before expiration"
msgstr "Son kullanma tarihinden önce hatırlat"
-#: core/models/profile.py:146
+#: core/models/profile.py:149
msgid "The number of days you want to be reminded before a workout expires."
msgstr ""
"Bir antrenman sona ermeden önce hatırlatılmasını istediğiniz gün sayısı."
-#: core/models/profile.py:152
+#: core/models/profile.py:155
msgid "Default duration of workouts"
msgstr "Varsayılan antrenman süresi"
-#: core/models/profile.py:154
+#: core/models/profile.py:157
msgid ""
"Default duration in weeks of workouts not in a schedule. Used for email "
"workout reminders."
@@ -441,11 +351,11 @@ msgstr ""
"Bir programda olmayan antrenman haftaları için varsayılan süre. E-posta "
"egzersiz hatırlatıcıları için kullanılır."
-#: core/models/profile.py:171
+#: core/models/profile.py:174
msgid "Notification language"
msgstr "Bildirim dili"
-#: core/models/profile.py:173
+#: core/models/profile.py:176
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."
@@ -453,70 +363,70 @@ msgstr ""
"Size e-posta bildirimleri gönderirken kullanılacak dil, ör. egzersizler için "
"e-posta hatırlatıcıları. Bu, web sitesinde kullanılan dili etkilemez."
-#: core/models/profile.py:186 gym/views/export.py:66
+#: core/models/profile.py:212 gym/views/export.py:66
msgid "Age"
msgstr "Yaş"
-#: core/models/profile.py:202 nutrition/forms.py:99
+#: core/models/profile.py:228 nutrition/forms.py:100
msgid "Height (cm)"
msgstr "Boy (cm)"
-#: core/models/profile.py:219
+#: core/models/profile.py:245
msgid "Hours of sleep"
msgstr "Uyku saatleri"
-#: core/models/profile.py:220
+#: core/models/profile.py:246
msgid "The average hours of sleep per day"
msgstr "Günlük ortalama uyuma süresi"
-#: core/models/profile.py:229
+#: core/models/profile.py:255
msgid "Work"
msgstr "İş"
-#: core/models/profile.py:230 core/models/profile.py:272
+#: core/models/profile.py:256 core/models/profile.py:298
msgid "Average hours per day"
msgstr "Günlük ortalama saat"
-#: core/models/profile.py:239 core/models/profile.py:260
-#: core/models/profile.py:281
+#: core/models/profile.py:265 core/models/profile.py:286
+#: core/models/profile.py:307
msgid "Physical intensity"
msgstr "Fiziksel yoğunluk"
-#: core/models/profile.py:240 core/models/profile.py:261
-#: core/models/profile.py:282
+#: core/models/profile.py:266 core/models/profile.py:287
+#: core/models/profile.py:308
msgid "Approximately"
msgstr "Yaklaşık olarak"
-#: core/models/profile.py:250
+#: core/models/profile.py:276
msgid "Sport"
msgstr "Spor"
-#: core/models/profile.py:251
+#: core/models/profile.py:277
msgid "Average hours per week"
msgstr "Haftalık ortalama saat"
-#: core/models/profile.py:271
+#: core/models/profile.py:297
msgid "Free time"
msgstr "Boş zaman"
-#: core/models/profile.py:292 nutrition/templates/rate/form.html:66
+#: core/models/profile.py:318 nutrition/templates/rate/form.html:66
msgid "Total daily calories"
msgstr "Toplam günlük kalori"
-#: core/models/profile.py:293
+#: core/models/profile.py:319
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
+#: core/models/profile.py:331 nutrition/models/ingredient_weight_unit.py:45
#: nutrition/models/log.py:90 nutrition/models/meal_item.py:58
msgid "Weight unit"
msgstr "Ağırlık birimi"
-#: core/models/profile.py:313
+#: core/models/profile.py:339
msgid "Allow external access"
msgstr "Harici erişime izin ver"
-#: core/models/profile.py:315
+#: core/models/profile.py:341
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."
@@ -525,24 +435,23 @@ msgstr ""
"modda erişmesine izin verin. Bağlantıları paylaşmadan önce bunu ayarlamanız "
"gerekir, ör. sosyal medyaya."
-#: core/models/profile.py:324
+#: core/models/profile.py:350
msgid "Automatic reminders for weight entries"
msgstr "Kilo girişleri için otomatik hatırlatıcılar"
-#: core/models/profile.py:326
+#: core/models/profile.py:352
msgid "Number of days after the last weight entry (enter 0 to deactivate)"
msgstr ""
"Son ağırlık girişinden sonraki gün sayısı (devre dışı bırakmak için 0 girin)"
-#: core/models/profile.py:392
+#: core/models/profile.py:418
msgid "The sum of all hours has to be 24"
msgstr "Tüm saatlerin toplamı 24 olmalıdır"
#: core/models/rep_unit.py:35 core/models/weight_unit.py:35
-#: core/templates/user/overview.html:263 core/views/user.py:575
+#: core/templates/user/overview.html:263 core/views/user.py:591
#: 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
+#: exercises/models/exercise.py:64 exercises/models/muscle.py:36
#: 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
@@ -605,6 +514,53 @@ msgstr "Paylaş"
msgid "Are you sure you want to delete this? This action cannot be undone."
msgstr "Bunu silmek istediğinizden emin misiniz? Bu eylem geri alınamaz."
+#: core/templates/email_verification/confirm_template.html:4
+msgid "Email verified"
+msgstr ""
+
+#: core/templates/email_verification/confirm_template.html:18
+#, python-format
+msgid "%(username)s, your email was verified"
+msgstr ""
+
+#: core/templates/email_verification/confirm_template.html:22
+msgid "Error, invalid verification token"
+msgstr ""
+
+#: core/templates/email_verification/email_body_html.tpl:6
+#, fuzzy
+#| msgid "Configuration"
+msgid "Email Confirmation"
+msgstr "Yapılandırma"
+
+#: core/templates/email_verification/email_body_html.tpl:9
+#: core/templates/email_verification/email_body_txt.tpl:3
+#, fuzzy, python-format
+#| msgid "Calendar for %(username)s"
+msgid "You are almost there, %(username)s!"
+msgstr "%(username)s için takvim"
+
+#: core/templates/email_verification/email_body_html.tpl:11
+#, python-format
+msgid "Please click <a href=\"%(link)s\">here</a> to confirm your email"
+msgstr ""
+
+#: core/templates/email_verification/email_body_html.tpl:12
+#: core/templates/email_verification/email_body_txt.tpl:5
+#, python-format
+msgid "The token expires on %(time)s"
+msgstr ""
+
+#: core/templates/email_verification/email_body_html.tpl:14
+#: core/templates/email_verification/email_body_txt.tpl:8
+msgid "the wger Team"
+msgstr ""
+
+#: core/templates/email_verification/email_body_txt.tpl:4
+#, python-format
+msgid "Please click the following link to confirm your email: %(link)s"
+msgstr ""
+
#: core/templates/index.html:4
msgid "Dashboard"
msgstr "Gösterge Paneli"
@@ -666,7 +622,7 @@ msgid "Add custom diary entry"
msgstr "Özel günlük girişi ekle"
#: core/templates/index.html:84 core/templates/index.html:92
-#: manager/models/day.py:34 manager/models/log.py:56
+#: manager/models/day.py:34 manager/models/log.py:58
#: manager/models/session.py:60 manager/models/workout.py:109
#: manager/templates/schedule/view.html:105
#: manager/templates/workout/view.html:11
@@ -699,6 +655,20 @@ msgstr "Yeni günlük ekle"
msgid "No workouts found."
msgstr "Antrenman bulunamadı."
+#: core/templates/index.html:137 core/templates/index.html:189
+#: core/templates/language/overview.html:23
+#: 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:150
+#: nutrition/templates/plan/view.html:153
+#: nutrition/templates/plan/view.html:191
+msgid "Add one now."
+msgstr "Yeni ekle."
+
#: 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
@@ -752,19 +722,59 @@ msgid "No nutrition plans."
msgstr "Beslenme planı yok."
#: 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
+#: core/templates/user/overview.html:121 manager/forms.py:184
+#: manager/helpers.py:89 manager/models/log.py:86 manager/models/setting.py:79
+#: manager/templates/log/add.html:54 manager/templates/set/formset.html:11
#: weight/models.py:34 weight/templates/import_csv_preview.html:14
#: weight/templates/import_csv_preview.html:43 weight/views.py:150
msgid "Weight"
msgstr "Kilo"
-#: core/templates/index.html:210 core/templates/navigation.html:135
+#: core/templates/index.html:210 core/templates/navigation.html:126
#: weight/views.py:70
msgid "Add weight entry"
msgstr "Kilo girişi ekleyin"
+#: core/templates/language/overview.html:4 core/templates/navigation.html:217
+msgid "Languages"
+msgstr "Diller"
+
+#: core/templates/language/overview.html:23
+msgid "Nothing found."
+msgstr "Bulunamadı."
+
+#: core/templates/language/overview.html:36 core/templates/license/list.html:38
+#: core/templates/misc/license/list.html:41
+#: core/templates/repetition_unit/list.html:41
+#: core/templates/user/overview.html:327 core/templates/user/overview.html:366
+#: core/templates/user/overview.html:402
+#: core/templates/weight_unit/list.html:41 core/views/languages.py:73
+#: core/views/license.py:65 core/views/repetition_units.py:65
+#: core/views/weight_units.py:65
+#: exercises/templates/categories/admin-overview.html:36
+#: 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:61
+msgid "Add"
+msgstr "Ekle"
+
+#: core/templates/language/view.html:52 core/templates/user/api_key.html:44
+#: core/templates/user/preferences.html:44 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:45
+msgid "Options"
+msgstr "Seçenekler"
+
#: core/templates/license/list.html:4 core/templates/misc/license/list.html:4
msgid "License list"
msgstr "Lisans listesi"
@@ -777,7 +787,6 @@ msgstr "Lisans listesi"
#: core/templates/weight_unit/list.html:26
#: exercises/templates/categories/admin-overview.html:24
#: exercises/templates/equipment/admin-overview.html:24
-#: exercises/templates/exercise/pending.html:30
#: exercises/templates/muscles/admin-overview.html:24
#: gym/templates/admin_notes/list.html:52 gym/templates/contract/list.html:60
#: gym/templates/contract_option/list.html:56
@@ -859,155 +868,135 @@ msgstr "Şablonlarınız"
msgid "Public templates"
msgstr "Herkese açık şablonlar"
-#: core/templates/navigation.html:64
-msgctxt "as in sorted by category"
-msgid "by category"
-msgstr "kategoriye göre"
-
-#: core/templates/navigation.html:65
-msgctxt "as in sorted by muscle"
-msgid "by muscle"
-msgstr "kasa göre"
-
-#: core/templates/navigation.html:66
-msgctxt "as in sorted by equipment"
-msgid "by equipment"
-msgstr "ekipmana göre"
+#: core/templates/navigation.html:63 manager/forms.py:133
+#: manager/models/setting.py:54
+msgid "Exercises"
+msgstr "Egzersizler"
-#: core/templates/navigation.html:70
-#: exercises/templates/equipment/overview.html:109
-#: exercises/templates/equipment/overview.html:113
-#: exercises/templates/exercise/overview.html:112
-#: exercises/templates/exercise/overview.html:116
-#: exercises/templates/muscles/overview.html:112
-#: exercises/templates/muscles/overview.html:116
-msgid "Add new exercise"
-msgstr "Yeni egzersiz ekleyin"
-
-#: core/templates/navigation.html:75 core/templates/navigation.html:116
-#: core/templates/navigation.html:224
+#: core/templates/navigation.html:67 core/templates/navigation.html:107
+#: core/templates/navigation.html:215
msgid "Administration"
msgstr "Yönetim"
-#: core/templates/navigation.html:76
-#: exercises/templates/exercise/pending.html:6
-msgid "Exercises pending review"
-msgstr "Egzersiz kontrol edilmek için bekliyor"
+#: core/templates/navigation.html:68
+#, fuzzy
+#| msgid "Exercise day"
+msgid "Exercise edit history"
+msgstr "Egzersiz günü"
-#: core/templates/navigation.html:77 exercises/models/base.py:72
-#: exercises/templates/exercise/view.html:80
+#: core/templates/navigation.html:69 exercises/models/base.py:84
msgid "Equipment"
msgstr "Ekipman"
-#: core/templates/navigation.html:78 exercises/templates/exercise/view.html:258
+#: core/templates/navigation.html:70
msgid "Muscles"
msgstr "Kaslar"
-#: core/templates/navigation.html:79
+#: core/templates/navigation.html:71
#: exercises/templates/categories/admin-overview.html:4
msgid "Categories"
msgstr "Kategoriler"
-#: core/templates/navigation.html:93 software/templates/features.html:87
+#: core/templates/navigation.html:84 software/templates/features.html:87
msgid "Nutrition"
msgstr "Beslenme"
-#: core/templates/navigation.html:99 core/templates/user/overview.html:144
+#: core/templates/navigation.html:90 core/templates/user/overview.html:144
msgid "Nutrition plans"
msgstr "Beslenme planları"
-#: core/templates/navigation.html:105 nutrition/templates/bmi/form.html:50
+#: core/templates/navigation.html:96 nutrition/templates/bmi/form.html:50
msgid "BMI calculator"
msgstr "BMI hesaplayıcı"
-#: core/templates/navigation.html:111 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:102 nutrition/templates/rate/form.html:17
msgid "Daily calories calculator"
msgstr "Günlük kalori hesaplayıcı"
-#: core/templates/navigation.html:113
+#: core/templates/navigation.html:104
#: nutrition/templates/ingredient/overview.html:29
msgid "Ingredient overview"
msgstr "İçeriğe genel bakış"
-#: core/templates/navigation.html:117 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:108 nutrition/templates/units/list.html:6
msgid "Ingredient weight units"
msgstr "İçerik ağırlık birimleri"
-#: core/templates/navigation.html:118
+#: core/templates/navigation.html:109
#: nutrition/templates/ingredient/pending.html:6
msgid "Ingredients pending review"
msgstr "İncelenmeyi bekleyen malzemeler"
-#: core/templates/navigation.html:132
+#: core/templates/navigation.html:123
msgid "Body weight"
msgstr "Vücut ağırlığı"
-#: core/templates/navigation.html:134 core/templates/user/overview.html:114
+#: core/templates/navigation.html:125 core/templates/user/overview.html:114
#: weight/templates/overview.html:7
msgid "Weight overview"
msgstr "Ağırlığa genel bakış"
-#: core/templates/navigation.html:147
+#: core/templates/navigation.html:138
msgid "About this software"
msgstr "Bu yazılım hakkında"
-#: core/templates/navigation.html:149 core/templates/template_features.html:82
+#: core/templates/navigation.html:140 core/templates/template_features.html:82
#: software/templates/about_us.html:5
msgid "About us"
msgstr "Hakkımızda"
-#: core/templates/navigation.html:151 software/templates/features.html:209
+#: core/templates/navigation.html:142 software/templates/features.html:209
msgid "REST API"
msgstr "REST API"
-#: core/templates/navigation.html:155 utils/models.py:40
+#: core/templates/navigation.html:146 utils/models.py:41
msgid "License"
msgstr "Lisans"
-#: core/templates/navigation.html:161
+#: core/templates/navigation.html:152
msgid "Developer documentation"
msgstr "Geliştirici belgeleri"
-#: core/templates/navigation.html:167
+#: core/templates/navigation.html:158
msgid "Get the code"
msgstr "Kodu alın"
-#: core/templates/navigation.html:173 core/templates/template.html:204
+#: core/templates/navigation.html:164 core/templates/template.html:203
#: core/templates/template_features.html:99
msgid "Translate"
msgstr "Çevir"
-#: core/templates/navigation.html:194 core/templates/user/login.html:28
+#: core/templates/navigation.html:185 core/templates/user/login.html:28
msgid "Reset password"
msgstr "Parolayı sıfırla"
-#: core/templates/navigation.html:207
+#: core/templates/navigation.html:198
msgid "My preferences"
msgstr "Benim tercihlerim"
-#: core/templates/navigation.html:214
+#: core/templates/navigation.html:205
msgid "Logout"
msgstr "Çıkış"
-#: core/templates/navigation.html:229
+#: core/templates/navigation.html:220
msgid "Licenses"
msgstr "Lisanslar"
-#: core/templates/navigation.html:232
+#: core/templates/navigation.html:223
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr "Tekrarlama birimleri"
-#: core/templates/navigation.html:235 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:226 core/templates/weight_unit/list.html:4
#: nutrition/templates/ingredient/view.html:174
msgid "Weight units"
msgstr "Ağırlık birimleri"
-#: core/templates/navigation.html:238 core/templates/user/list.html:4
+#: core/templates/navigation.html:229 core/templates/user/list.html:4
msgid "User list"
msgstr "Kullanıcı listesi"
-#: core/templates/navigation.html:239
+#: core/templates/navigation.html:230
msgid "Gyms"
msgstr "Spor salonları"
@@ -1086,33 +1075,30 @@ msgstr "Sonraki"
msgid "Add weight log"
msgstr "Kilo günlüğü ekle"
-#: core/templates/tags/render_day.html:114
-#: exercises/templates/equipment/overview.html:59
-#: exercises/templates/exercise/overview.html:63
-#: exercises/templates/muscles/overview.html:65
+#: core/templates/tags/render_day.html:116
msgid "Placeholder image for exercise"
msgstr "Egzersiz için yer tutucu resmi"
-#: core/templates/tags/render_day.html:131
+#: core/templates/tags/render_day.html:133
msgid "This exercise has no repetitions."
msgstr "Bu egzersizin tekrarı yoktur."
-#: core/templates/tags/render_day.html:134
+#: core/templates/tags/render_day.html:136
msgid "Edit them now."
msgstr "Şimdi düzenleyin."
-#: core/templates/tags/render_day.html:159
+#: core/templates/tags/render_day.html:162
msgid "Add exercises to this workout day"
msgstr "Bu antrenman gününe egzersiz ekleyin"
#: core/templates/tags/render_weight_log.html:17 manager/helpers.py:89
-#: manager/models/setting.py:57 manager/templates/set/formset.html:10
+#: manager/models/setting.py:69 manager/templates/set/formset.html:9
msgid "Reps"
msgstr "Temsilciler"
-#: 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
+#: core/templates/tags/render_weight_log.html:30 manager/forms.py:189
+#: manager/models/log.py:103 manager/models/setting.py:99
+#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
msgid "RiR"
msgstr "RiR"
@@ -1136,7 +1122,7 @@ msgstr "Kullanım Şartları"
msgid "Features"
msgstr "Özellikleri"
-#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:37
+#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:53
msgid "API key"
msgstr "API anahtarı"
@@ -1182,11 +1168,12 @@ msgid "Documentation"
msgstr "Dokümantasyon"
#: core/templates/user/delete_account.html:4
-#: core/templates/user/preferences.html:42
+#: core/templates/user/preferences.html:58
msgid "Delete account"
msgstr "Hesabı sil"
#: core/templates/user/delete_account.html:17
+#: exercises/templates/history/overview.html:93
msgid "Are you sure?"
msgstr "Emin misiniz?"
@@ -1235,11 +1222,12 @@ msgstr "Antrenman ekle"
#: core/templates/user/overview.html:34 core/templates/user/overview.html:76
#: core/templates/user/overview.html:120 core/templates/user/overview.html: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
-#: 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
+#: exercises/models/base.py:99 exercises/models/base.py:104
+#: exercises/models/exercise.py:69 exercises/models/exercise.py:76
+#: gallery/models/image.py:47 manager/helpers.py:88 manager/models/log.py:100
+#: 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/views.py:150
@@ -1247,11 +1235,11 @@ msgid "Date"
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: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
+#: exercises/models/exercise.py:57 exercises/views/exercises.py:123
+#: 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 "Açıklama"
@@ -1259,12 +1247,12 @@ msgstr "Açıklama"
msgid "Number of logs (days)"
msgstr "Günlük sayısı (gün)"
-#: core/templates/user/overview.html:37 core/views/user.py:576
+#: core/templates/user/overview.html:37 core/views/user.py:592
#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:157
msgid "Last activity"
msgstr "Son Aktivite"
-#: core/templates/user/overview.html:68 manager/forms.py:267
+#: core/templates/user/overview.html:68 manager/forms.py:278
#: manager/templates/workout/view.html:151
msgid "Log"
msgstr "Kayıt"
@@ -1282,6 +1270,7 @@ msgid "Notes"
msgstr "Notlar"
#: core/templates/user/overview.html:79
+#: exercises/templates/history/overview.html:30
#: manager/templates/calendar/partial_overview_table.html:42
#: nutrition/templates/log/detail.html:154
msgid "Time"
@@ -1329,10 +1318,12 @@ msgid "Do you really want to change this user&#39;s password?"
msgstr "Bu kullanıcının parolasını gerçekten değiştirmek istiyor musunuz?"
#: core/templates/user/overview.html:233
+#: exercises/templates/history/overview.html:106
msgid "No"
msgstr "Hayır"
#: core/templates/user/overview.html:234
+#: exercises/templates/history/overview.html:99
msgid "Yes"
msgstr "Evet"
@@ -1387,10 +1378,15 @@ msgid "Documents"
msgstr "Belgeler"
#: core/templates/user/overview.html:413 gym/templates/document/list.html:32
-#: manager/forms.py:279 manager/templates/workout/view.html:176
+#: manager/forms.py:290 manager/templates/workout/view.html:176
msgid "Download"
msgstr "İndir"
+#: core/templates/user/overview.html:451 gym/views/admin_config.py:44
+#: gym/views/admin_config.py:58 gym/views/user_config.py:46
+msgid "Configuration"
+msgstr "Yapılandırma"
+
#: core/templates/user/overview.html:454 gym/models/user_config.py:92
msgid "Include in inactive overview"
msgstr "Etkin olmayan genel bakışa ekle"
@@ -1410,7 +1406,25 @@ msgstr "Bu kullanıcı olarak oturum açın"
msgid "Preferences"
msgstr "Tercihler"
-#: core/templates/user/preferences.html:33 core/views/user.py:587
+#: core/templates/user/preferences.html:19
+#, fuzzy
+#| msgid "Send emails"
+msgid "Verified email"
+msgstr "Mailleri gönder"
+
+#: core/templates/user/preferences.html:24
+msgid "Unverified email"
+msgstr ""
+
+#: core/templates/user/preferences.html:26
+msgid "Send verification email"
+msgstr ""
+
+#: core/templates/user/preferences.html:30
+msgid "You need to verify your email to contribute exercises"
+msgstr ""
+
+#: core/templates/user/preferences.html:49 core/views/user.py:603
msgid "Change password"
msgstr "Parola değiştir"
@@ -1440,39 +1454,37 @@ msgid "oz"
msgstr "oz"
#: 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
+#: exercises/views/equipment.py:104 exercises/views/exercises.py:185
+#: exercises/views/muscles.py:99 manager/views/schedule.py:311
+#: manager/views/schedule_step.py:129 manager/views/workout.py:269
+#: manager/views/workout_session.py:141 nutrition/views/ingredient.py:138
#: 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:431
-#: exercises/views/muscles.py:125 gallery/views/images.py:121
+#: exercises/views/categories.py:127 exercises/views/exercises.py:193
+#: exercises/views/muscles.py:106 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
+#: manager/views/workout.py:273 manager/views/workout_session.py:156
+#: nutrition/views/ingredient.py:145 nutrition/views/plan.py:127
#: nutrition/views/unit.py:118
#, python-brace-format
msgid "Delete {0}?"
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/repetition_units.py:85 core/views/user.py:472
#: 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: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
+#: exercises/views/equipment.py:81 exercises/views/muscles.py:86
+#: 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:170
+#: gym/views/gym.py:459 manager/views/day.py:100 manager/views/schedule.py:335
+#: manager/views/workout.py:287 nutrition/views/ingredient.py:164
+#: nutrition/views/plan.py:144 nutrition/views/unit.py:144
#, python-brace-format
msgid "Edit {0}"
msgstr "{0} düzenleyin"
@@ -1503,64 +1515,65 @@ msgstr "Sunmak"
msgid "Your feedback was successfully sent. Thank you!"
msgstr "Geri bildiriminiz başarıyla gönderildi. Teşekkür ederim!"
-#: core/views/user.py:156
+#: core/views/user.py:157
#, python-brace-format
msgid "Account \"{0}\" was successfully deleted"
msgstr "\"{0}\" hesabı başarıyla silindi"
-#: core/views/user.py:287
+#: core/views/user.py:294
msgid "You were successfully registered"
msgstr "Başarıyla kaydoldunuz"
-#: core/views/user.py:339
+#: core/views/user.py:355
msgid "Settings successfully updated"
msgstr "Ayarlar başarıyla güncellendi"
-#: core/views/user.py:376
+#: core/views/user.py:392
msgid "The user was successfully deactivated"
msgstr "Kullanıcı başarıyla devre dışı bırakıldı"
-#: core/views/user.py:411
+#: core/views/user.py:427
msgid "The user was successfully activated"
msgstr "Kullanıcı başarıyla etkinleştirildi"
-#: core/views/user.py:426
+#: core/views/user.py:442
msgid "Edit user"
msgstr "Kullanıcıyı düzenle"
-#: core/views/user.py:573 gym/templates/gym/member_list.html:26
+#: core/views/user.py:589 gym/templates/gym/member_list.html:26
#: gym/views/gym.py:156
msgid "ID"
msgstr "İD"
-#: core/views/user.py:574 gym/forms.py:94 gym/templates/contract/view.html:55
+#: core/views/user.py:590 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 "Kullanıcı adı"
-#: core/views/user.py:577 gym/templates/gym/new_user.html:34
+#: core/views/user.py:593 gym/templates/gym/new_user.html:34
#: gym/views/export.py:60 gym/views/gym.py:218
msgid "Gym"
msgstr "Jimnastik"
-#: exercises/models/base.py:51 exercises/templates/exercise/view.html:76
-#: nutrition/models/ingredient.py:204
+#: core/views/user.py:652
+#, python-format
+msgid "A verification email was sent to %(email)s"
+msgstr ""
+
+#: exercises/models/base.py:63 nutrition/models/ingredient.py:204
msgid "Category"
msgstr "Kategori"
-#: exercises/models/base.py:58
+#: exercises/models/base.py:70
msgid "Primary muscles"
msgstr "Birincil kaslar"
-#: exercises/models/base.py:64 exercises/templates/equipment/overview.html:71
-#: exercises/templates/exercise/overview.html:76
-#: exercises/templates/exercise/view.html:268
-#: exercises/templates/muscles/overview.html:77
+#: exercises/models/base.py:76
msgid "Secondary muscles"
msgstr "İkincil kaslar"
-#: exercises/models/base.py:79
+#: exercises/models/base.py:91
msgid "Variations"
msgstr "Varyasyonlar"
@@ -1568,71 +1581,58 @@ msgstr "Varyasyonlar"
msgid "Exercise Categories"
msgstr "Egzersiz Kategorileri"
-#: exercises/models/comment.py:34 exercises/models/exercise_alias.py:32
-#: exercises/models/image.py:75 exercises/models/video.py:82
-#: manager/forms.py:165 manager/helpers.py:89 manager/models/log.py:51
+#: exercises/models/comment.py:37 exercises/models/exercise_alias.py:35
+#: exercises/models/image.py:71 exercises/models/video.py:95
+#: manager/forms.py:176 manager/helpers.py:89 manager/models/log.py:52
msgid "Exercise"
msgstr "Egzersiz"
-#: exercises/models/comment.py:41
+#: exercises/models/comment.py:43
msgid "A comment about how to correctly do this exercise."
msgstr "Bu alıştırmanın nasıl doğru bir şekilde yapılacağına dair bir yorum."
-#: exercises/models/exercise.py:86 nutrition/models/ingredient.py:80
+#: exercises/models/exercise.py:81 nutrition/models/ingredient.py:80
#: nutrition/models/plan.py:61 nutrition/models/weight_unit.py:32
msgid "Language"
msgstr "Dil"
-#: 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:265
-msgid "New user submitted exercise"
-msgstr "Yeni kullanıcı gönderilen egzersiz"
-
-#: 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/exercise_alias.py:35
+#: exercises/models/exercise_alias.py:38
msgid "Alias for an exercise"
msgstr "Bir egzersizin takma adı"
-#: exercises/models/image.py:59
+#: exercises/models/image.py:55
msgid "Line"
msgstr "Çizgi"
-#: exercises/models/image.py:60
+#: exercises/models/image.py:56
msgid "3D"
msgstr "3B"
-#: exercises/models/image.py:61
+#: exercises/models/image.py:57
msgid "Low-poly"
msgstr "Düşük poli"
-#: exercises/models/image.py:62
+#: exercises/models/image.py:58
msgid "Photo"
msgstr "Fotoğraf"
-#: exercises/models/image.py:63
+#: exercises/models/image.py:59
msgid "Other"
msgstr "Diğer"
-#: exercises/models/image.py:81 gallery/models/image.py:56
+#: exercises/models/image.py:77 gallery/models/image.py:56
msgid "Image"
msgstr "Resim"
-#: exercises/models/image.py:82 gallery/models/image.py:57
+#: exercises/models/image.py:78 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:88
+#: exercises/models/image.py:84
msgid "Main picture"
msgstr "Ana resim"
-#: exercises/models/image.py:91
+#: exercises/models/image.py:87
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 "
@@ -1642,20 +1642,10 @@ msgstr ""
"işaretleyin (örneğin aramada gösterilecektir). İlk görüntü sistem tarafından "
"otomatik olarak işaretlenir."
-#: exercises/models/image.py:100
+#: exercises/models/image.py:96
msgid "The art style of your image"
msgstr "Resminizin sanat tarzı"
-#: exercises/models/image.py:185
-msgid "New user submitted image"
-msgstr "Yeni kullanıcı tarafından gönderilen resim"
-
-#: exercises/models/image.py:186
-#, python-brace-format
-msgid "The user {0} submitted a new image \"{1}\" for exercise {2}."
-msgstr ""
-"{0} kullanıcısı, {2} alıştırması için yeni bir \"{1}\" görüntüsü gönderdi."
-
#: exercises/models/muscle.py:37
msgid "In latin, e.g. \"Pectoralis major\""
msgstr "Latince, ör. \"Büyük pektoralis\""
@@ -1668,47 +1658,49 @@ msgstr "Alternatif ad"
msgid "A more basic name for the muscle"
msgstr "Kas için daha temel bir isim"
-#: exercises/models/video.py:41
-msgid "Maximum file size is 100MB."
+#: exercises/models/video.py:50
+#, fuzzy, python-format
+#| msgid "Maximum file size is 100MB."
+msgid "Maximum file size is %(size)sMB."
msgstr "Azami dosya boyutu 100MB'dir."
-#: exercises/models/video.py:44 exercises/models/video.py:48
+#: exercises/models/video.py:57 exercises/models/video.py:65
msgid "File type is not supported"
msgstr "Dosya türü desteklenmiyor"
-#: exercises/models/video.py:57
+#: exercises/models/video.py:70
msgid "File is not a valid video"
msgstr "Dosya geçerli bir video değil"
-#: exercises/models/video.py:88
+#: exercises/models/video.py:101
msgid "Main video"
msgstr "Ana video"
-#: exercises/models/video.py:94
+#: exercises/models/video.py:107
msgid "Video"
msgstr "Video"
-#: exercises/models/video.py:101
+#: exercises/models/video.py:114
msgid "Size"
msgstr "Boyut"
-#: exercises/models/video.py:108 manager/models/schedule_step.py:56
+#: exercises/models/video.py:121 manager/models/schedule_step.py:56
msgid "Duration"
msgstr "Süresi"
-#: exercises/models/video.py:117
+#: exercises/models/video.py:130
msgid "Width"
msgstr "Genişlik"
-#: exercises/models/video.py:124
+#: exercises/models/video.py:137
msgid "Height"
msgstr "Yükseklik"
-#: exercises/models/video.py:131
+#: exercises/models/video.py:144
msgid "Codec"
msgstr "Kodek"
-#: exercises/models/video.py:139
+#: exercises/models/video.py:152
msgid "Codec, long name"
msgstr "Kodek, uzun ad"
@@ -1717,139 +1709,23 @@ msgid "Equipment list"
msgstr "Ekipman listesi"
#: exercises/templates/equipment/admin-overview.html:37
-#: exercises/views/equipment.py:94
+#: exercises/views/equipment.py:92
msgid "Add new equipment"
msgstr "Yeni ekipman ekle"
-#: exercises/templates/equipment/overview.html:11
-msgid "Equipment overview"
-msgstr "Ekipmana genel bakış"
-
-#: exercises/templates/equipment/overview.html:69
-#: exercises/templates/exercise/overview.html:74
-#: exercises/templates/exercise/view.html:264
-#: exercises/templates/muscles/overview.html:75
-msgid "Main muscles"
-msgstr "Ana kaslar"
-
-#: exercises/templates/equipment/overview.html:79
-msgid ""
-"No exercises for this equipment. Add or edit an exercise and set the "
-"equipment."
-msgstr ""
-"Bu ekipman için egzersiz yok. Bir egzersiz ekleyin veya düzenleyin ve "
-"ekipmanı ayarlayın."
-
-#: exercises/templates/equipment/overview.html:96
-#: exercises/templates/exercise/overview.html:99
-#: nutrition/templates/ingredient/overview.html:57
-msgid "Search"
-msgstr "Ara"
-
-#: exercises/templates/equipment/overview.html:101
-#: exercises/templates/exercise/overview.html:104
-msgid "exercise name"
-msgstr "egzersiz adı"
-
-#: exercises/templates/equipment/overview.html:115
-#: exercises/templates/exercise/overview.html:118
-#: exercises/templates/muscles/overview.html:118
-#: nutrition/templates/ingredient/overview.html:85
-msgid "Only registered users can do this"
-msgstr "Bunu sadece kayıtlı kullanıcılar yapabilir"
-
-#: exercises/templates/exercise/email_new.tpl:1
-#, python-format
-msgid ""
-"Your exercise '%(exercise)s' was successfully added to the general\n"
-"database."
-msgstr ""
-"'%(exercise)s' alıştırmanız genel olarak başarıyla eklendi\n"
-"veri tabanı."
-
-#: exercises/templates/exercise/email_new.tpl:4
-msgid ""
-"It is now available on the exercise and muscle overview and can be\n"
-"added to workouts. You can access it on this address:"
-msgstr ""
-"Artık egzersiz ve kaslara genel bakışta mevcut ve\n"
-"antrenmanlara eklendi. Ona bu adresten erişebilirsiniz:"
-
-#: exercises/templates/exercise/email_new.tpl:8
-#: nutrition/templates/ingredient/email_new.tpl:8
-msgid "Thank you for contributing and making this site better!"
-msgstr ""
-"Katkıda bulunduğunuz ve bu siteyi daha iyi hale getirdiğiniz için teşekkür "
-"ederiz!"
-
-#: exercises/templates/exercise/email_new.tpl:9
-#: manager/templates/workout/email_reminder.tpl:15
-#: manager/templates/workout/email_weight_reminder.tpl:12
-#: nutrition/templates/ingredient/email_new.tpl:9
-#, python-format
-msgid "The %(site)s team"
-msgstr "%(site)s ekibi"
-
-#: exercises/templates/exercise/form.html:4
-msgid "Submitting an exercise"
-msgstr "Bir egzersiz kaydediliyor"
-
-#: exercises/templates/exercise/form.html:5
-msgid ""
-"Thank you for submitting an exercise. This is much\n"
-"appreciated!"
-msgstr ""
-"Bir egzersiz gönderdiğiniz için teşekkür ederiz. Bu çok\n"
-"takdir!"
-
-#: exercises/templates/exercise/form.html:8
-msgid ""
-"After you submit the form, the administrators will be notified.\n"
-"Once it is reviewed, it will be added to the database. Till this happens,\n"
-"it will not be visible in the overview or the search. In case you added your "
-"email\n"
-"when you registered, you will get notified when the process is completed "
-"successfully."
-msgstr ""
-"Formu gönderdikten sonra yöneticiler bilgilendirilecektir.\n"
-"İncelendikten sonra veri tabanına eklenecektir. Bu olana kadar,\n"
-"genel bakışta veya aramada görünmeyecektir. Kayıt olduğunuzda e-postanızı\n"
-"eklemeniz durumunda, işlem başarıyla tamamlandığında size haber verilecektir."
-
-#: exercises/templates/exercise/form_correct.html:4
-msgid "Correcting an exercise"
-msgstr "Bir egzersizi düzeltme"
-
-#: exercises/templates/exercise/form_correct.html:5
-msgid ""
-"Thank you for correcting and improving this exercise.\n"
-"This is much appreciated!"
-msgstr ""
-"Bu egzersizi düzelttiğiniz ve geliştirdiğiniz için teşekkür ederiz.\n"
-"Bu çok takdir edilmektedir!"
-
-#: exercises/templates/exercise/form_correct.html:8
-msgid ""
-"After you submit the form, the administrators will be notified.\n"
-"Once the changes are reviewed the exercise will be updated."
-msgstr ""
-"Formu gönderdikten sonra, yöneticiler bilgilendirilecektir.\n"
-"Değişiklikler gözden geçirildikten sonra egzersiz güncellenecektir."
-
-#: exercises/templates/exercise/overview.html:88
-msgid "No categories."
-msgstr "Kategori yok."
-
-#: exercises/templates/exercise/overview.html:88
-msgid "Use link to create one"
-msgstr "Bir tane oluşturmak için bağlantıyı kullanın"
+#: exercises/templates/history/overview.html:11
+#, fuzzy
+#| msgid "Exercise day"
+msgid "Exercise admin history"
+msgstr "Egzersiz günü"
-#: exercises/templates/exercise/pending.html:14
-#: nutrition/templates/ingredient/pending.html:14
-msgid "Submission date"
-msgstr "Teslim tarihi"
+#: exercises/templates/history/overview.html:27
+#, fuzzy
+#| msgid "Actions"
+msgid "Action"
+msgstr "Hareketler"
-#: exercises/templates/exercise/pending.html:16 gallery/models/image.py:51
+#: exercises/templates/history/overview.html:28 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/log.py:45
@@ -1860,101 +1736,47 @@ msgstr "Teslim tarihi"
msgid "User"
msgstr "Kullanıcı"
-#: exercises/templates/exercise/view.html:48
-msgid "Exercise is pending review"
-msgstr "Egzersiz ön izlenmek için bekleniyor"
-
-#: exercises/templates/exercise/view.html:51
-msgid ""
-"This user submitted exercise is pending a decision to be\n"
-" included in the database."
-msgstr ""
-"Bu kullanıcı tarafından gönderilen egzersiz, veri tabanına\n"
-" dahil edilmek için bir karar bekliyor."
-
-#: exercises/templates/exercise/view.html:53
-msgid "Till then, it will not be shown in the overview or the search."
-msgstr "O zamana kadar, genel bakışta veya aramada gösterilmeyecek."
-
-#: exercises/templates/exercise/view.html:54
-#: nutrition/templates/ingredient/view.html:31
-msgid "Please select one of the options below."
-msgstr "Lütfen aşağıdaki seçeneklerden birini seçin."
-
-#: exercises/templates/exercise/view.html:60
-#: 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:204
-#: nutrition/templates/ingredient/view.html:42
-msgid "Decline"
-msgstr "Reddet"
-
-#: exercises/templates/exercise/view.html:96
-msgid "Images"
-msgstr "Görüntüler"
-
-#: exercises/templates/exercise/view.html:137 exercises/views/images.py:93
-msgid "Add new image"
-msgstr "Yeni resim ekle"
-
-#: exercises/templates/exercise/view.html:148
-msgid "Videos"
-msgstr "Videolar"
-
-#: exercises/templates/exercise/view.html:187 exercises/views/videos.py:94
-msgid "Add new video"
-msgstr "Yeni video ekle"
-
-#: exercises/templates/exercise/view.html:197
-msgid "Images pending review"
-msgstr "İncelenmeyi bekleyen resimler"
-
-#: exercises/templates/exercise/view.html:218
-msgid "Comments for this exercise"
-msgstr "Bu egzersiz için yorum yapın"
+#: exercises/templates/history/overview.html:29
+#, fuzzy
+#| msgctxt "As in \"email subject\""
+#| msgid "Subject"
+msgid "Object"
+msgstr "Konu"
-#: exercises/templates/exercise/view.html:246
-msgid "Add new comment"
-msgstr "Yeni yorum ekle"
+#: exercises/templates/history/overview.html:31
+#, fuzzy
+#| msgctxt "Noun, not verb"
+#| msgid "Change"
+msgid "Changes"
+msgstr "Değiştir"
-#: 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/history/overview.html:32
+msgid "Revert"
+msgstr ""
-#: 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/history/overview.html:64
+msgid "View Object"
+msgstr ""
-#: exercises/templates/exercise/view.html:306
-msgid "Exercise Variations"
-msgstr "Egzersiz Varyasyonları"
+#: exercises/templates/history/overview.html:75
+#, fuzzy
+#| msgid "View logs"
+msgid "View changes"
+msgstr "Günlükleri görüntüle"
-#: exercises/templates/exercise/view.html:327
-msgid "Submit a correction"
-msgstr "Düzeltme gönderin"
+#: exercises/templates/history/overview.html:86
+msgid "Revert changes"
+msgstr ""
#: exercises/templates/muscles/admin-overview.html:4
-#: exercises/templates/muscles/overview.html:7
msgid "Muscle overview"
msgstr "Kaslara genel bakış"
#: exercises/templates/muscles/admin-overview.html:36
-#: exercises/views/muscles.py:86
+#: exercises/views/muscles.py:67
msgid "Add muscle"
msgstr "Kas ekleyin"
-#: exercises/templates/muscles/overview.html:85
-msgid ""
-"No exercises for this muscle. Add or edit an exercise and set the muscle."
-msgstr ""
-"Bu kas için egzersiz yok. Bir egzersiz ekleyin veya düzenleyin ve kası "
-"ayarlayın."
-
#: exercises/views/categories.py:71
msgid "Add category"
msgstr "Kategori ekle"
@@ -1967,53 +1789,23 @@ msgstr "Bu aynı zamanda bu kategorideki tüm alıştırmaları da silecektir."
msgid "Add exercise comment"
msgstr "Egzersiz yorumu ekle"
-#: exercises/views/equipment.py:107 exercises/views/equipment.py:118
+#: exercises/views/equipment.py:105 exercises/views/equipment.py:116
msgid "Delete equipment?"
msgstr "Ekipman silinsin mi?"
-#: exercises/views/exercises.py:229
-#, python-format
-msgid ""
-"%(name_original)s is too similar to existing exercise \"%(exercise_name)s\""
+#: exercises/views/exercises.py:161
+#, fuzzy, python-format
+#| msgid ""
+#| "%(name_original)s is too similar to existing exercise "
+#| "\"%(exercise_name)s\""
+msgid "%(name)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:247
-msgid "Add exercise"
-msgstr "Egzersiz ekle"
-
-#: 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:380
-#, python-brace-format
-msgid "Correct {0}"
-msgstr "Doğru {0}"
-
-#: exercises/views/exercises.py:422
+#: exercises/views/exercises.py:184
msgid "This will delete the exercise from all workouts."
msgstr "Bu, egzersizi tüm egzersiz programlarından silecektir."
-#: exercises/views/exercises.py:474
-msgid "Exercise was successfully marked as rejected"
-msgstr "Egzersiz başarıyla reddedildi olarak işaretlendi"
-
-#: exercises/views/images.py:68
-msgid "Edit exercise image"
-msgstr "Egzersiz görüntüsünü düzenleyin"
-
-#: exercises/views/images.py:143
-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"
@@ -2083,7 +1875,7 @@ 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:59
+#: manager/templates/log/add.html:52 nutrition/forms.py:60
#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:102
#: nutrition/models/meal_item.py:72
msgid "Amount"
@@ -2186,6 +1978,10 @@ msgstr "Hiçbir şey sağlanmazsa dosya adını kullanacak"
msgid "User notes"
msgstr "Kullanıcı notları"
+#: gym/templates/contract/list.html:36
+msgid "Show"
+msgstr "Göster"
+
#: gym/templates/contract/view.html:4
msgid "Contract"
msgstr "Sözleşme"
@@ -2266,10 +2062,6 @@ msgstr "E-postalar"
msgid "Add member"
msgstr "Üye ekle"
-#: gym/templates/gym/new_user.html:38
-msgid "Date of Birth"
-msgstr "Doğum tarihi"
-
#: gym/templates/gym/new_user.html:48 manager/templates/calendar/month.html:144
#: manager/templates/log/add.html:75 nutrition/templates/rate/form.html:120
msgid "Info"
@@ -2332,126 +2124,126 @@ msgstr "Spor salonuna kullanıcı ekle"
msgid "Edit gym"
msgstr "Spor salonunu düzenle"
-#: i18n.tpl:2 i18n.tpl:28
+#: i18n.tpl:2
+msgid "Until Failure"
+msgstr "Başarısızlığa Kadar"
+
+#: i18n.tpl:3 manager/forms.py:180 manager/models/log.py:73
+#: manager/templates/set/add.html:53
+msgid "Repetitions"
+msgstr "Tekrarlar"
+
+#: i18n.tpl:4
msgid "Abs"
msgstr "Karın Kasları"
-#: i18n.tpl:3
+#: i18n.tpl:5
msgid "Arms"
msgstr "Kollar"
-#: i18n.tpl:4
-msgid "Back"
-msgstr "Sırt"
-
-#: i18n.tpl:5 i18n.tpl:23
-msgid "Calves"
-msgstr "Baldırlar"
-
-#: i18n.tpl:6 i18n.tpl:26
-msgid "Chest"
-msgstr "Göğüs"
-
-#: i18n.tpl:7
+#: i18n.tpl:6
msgid "Legs"
msgstr "Bacaklar"
-#: i18n.tpl:8 i18n.tpl:19
-msgid "Shoulders"
-msgstr "Omuzlar"
+#: i18n.tpl:7
+msgid "Dumbbell"
+msgstr "Dambıl"
+
+#: i18n.tpl:8
+msgid "Biceps"
+msgstr "Pazılar"
#: i18n.tpl:9
-msgid "Barbell"
-msgstr "Halter"
+msgid "SZ-Bar"
+msgstr "SZ-Bar"
#: i18n.tpl:10
-msgid "Bench"
-msgstr "Benç"
+msgid "Kettlebell"
+msgstr "Kettlebell"
#: i18n.tpl:11
-msgid "Dumbbell"
-msgstr "Dambıl"
+msgid "Swiss Ball"
+msgstr "Egzersiz Topu"
#: i18n.tpl:12
-msgid "Gym mat"
-msgstr "Spor paspası"
+msgid "none (bodyweight exercise)"
+msgstr "yok (vücut ağırlığı egzersizi)"
#: i18n.tpl:13
-msgid "Incline bench"
-msgstr "Eğim tezgahı"
+msgid "Calves"
+msgstr "Baldırlar"
#: i18n.tpl:14
-msgid "Kettlebell"
-msgstr "Kettlebell"
+msgid "Back"
+msgstr "Sırt"
#: i18n.tpl:15
-msgid "Pull-up bar"
-msgstr "Barfiks çubuğu"
+msgid "Lower back"
+msgstr "Alt sırt"
#: i18n.tpl:16
-msgid "SZ-Bar"
-msgstr "SZ-Bar"
+msgid "Lats"
+msgstr "Lat kasları"
#: i18n.tpl:17
-msgid "Swiss Ball"
-msgstr "Egzersiz Topu"
+msgid "Hamstrings"
+msgstr "Hamstringler"
#: i18n.tpl:18
-msgid "none (bodyweight exercise)"
-msgstr "yok (vücut ağırlığı egzersizi)"
+msgid "Bench"
+msgstr "Benç"
+
+#: i18n.tpl:19
+msgid "Glutes"
+msgstr "Kalça kasları"
#: i18n.tpl:20
-msgid "Biceps"
-msgstr "Pazılar"
+msgid "Kilometers"
+msgstr "Kilometre"
#: i18n.tpl:21
-msgid "Hamstrings"
-msgstr "Hamstringler"
+msgid "Shoulders"
+msgstr "Omuzlar"
#: i18n.tpl:22
-msgid "Lower back"
-msgstr "Alt sırt"
+msgid "Seconds"
+msgstr "Saniye"
+
+#: i18n.tpl:23
+msgid "Miles"
+msgstr "Mil"
#: i18n.tpl:24
-msgid "Glutes"
-msgstr "Kalça kasları"
+msgid "Incline bench"
+msgstr "Eğim tezgahı"
#: i18n.tpl:25
-msgid "Lats"
-msgstr "Lat kasları"
-
-#: i18n.tpl:27
msgid "Quads"
msgstr "Quads kasları"
-#: i18n.tpl:29
-msgid "Triceps"
-msgstr "Triceps kasları"
-
-#: i18n.tpl:30
-msgid "Kilometers"
-msgstr "Kilometre"
-
-#: i18n.tpl:31
-msgid "Miles"
-msgstr "Mil"
-
-#: i18n.tpl:32
+#: i18n.tpl:26
msgid "Minutes"
msgstr "Dakika"
-#: i18n.tpl:33 manager/forms.py:169 manager/models/log.py:71
-#: manager/templates/set/add.html:53
-msgid "Repetitions"
-msgstr "Tekrarlar"
+#: i18n.tpl:27
+msgid "Chest"
+msgstr "Göğüs"
-#: i18n.tpl:34
-msgid "Seconds"
-msgstr "Saniye"
+#: i18n.tpl:28
+msgid "Gym mat"
+msgstr "Spor paspası"
-#: i18n.tpl:35
-msgid "Until Failure"
-msgstr "Başarısızlığa Kadar"
+#: i18n.tpl:29
+msgid "Pull-up bar"
+msgstr "Barfiks çubuğu"
+
+#: i18n.tpl:30
+msgid "Barbell"
+msgstr "Halter"
+
+#: i18n.tpl:31
+msgid "Triceps"
+msgstr "Triceps kasları"
#: mailer/forms.py:34 mailer/templates/mailer/gym/preview.html:32
msgctxt "As in \"email subject\""
@@ -2506,11 +2298,11 @@ msgstr "Mailleri gönder"
msgid "Correction"
msgstr "Düzeltme"
-#: manager/forms.py:89 manager/models/workout.py:59
+#: manager/forms.py:92 manager/models/workout.py:59
msgid "The name of the workout"
msgstr "Antrenmanın adı"
-#: manager/forms.py:93 manager/models/workout.py:66
+#: manager/forms.py:96 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'."
@@ -2518,7 +2310,7 @@ msgstr ""
"Antrenmanın kısa bir açıklaması veya hedefi. Örneğin, 'Sırta odaklan' veya "
"'xy programının 1. haftası'."
-#: manager/forms.py:126
+#: manager/forms.py:137
msgid ""
"You can search for more than one exercise, they will be grouped together for "
"a superset."
@@ -2526,28 +2318,28 @@ msgstr ""
"Birden fazla egzersiz için arama yapabilirsiniz, bunlar bir üst set için "
"birlikte gruplandırılır."
-#: 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
+#: manager/forms.py:166 manager/forms.py:171 manager/models/log.py:64
+#: manager/models/log.py:92 manager/models/setting.py:59
+#: manager/models/setting.py:90 manager/templates/log/add.html:53
+#: manager/templates/log/add.html:55 manager/templates/set/formset.html:10
+#: manager/templates/set/formset.html:12 measurements/models/category.py:58
+#: nutrition/forms.py:64
msgid "Unit"
msgstr "Birim"
-#: manager/forms.py:266
+#: manager/forms.py:277
msgid "Type"
msgstr "Tür"
-#: manager/forms.py:267 manager/templates/workout/view.html:157
+#: manager/forms.py:278 manager/templates/workout/view.html:157
msgid "Table"
msgstr "Tablo"
-#: manager/forms.py:269 manager/templates/workout/view.html:163
+#: manager/forms.py:280 manager/templates/workout/view.html:163
msgid "with images"
msgstr "resimlerle"
-#: manager/forms.py:270 manager/templates/workout/view.html:169
+#: manager/forms.py:281 manager/templates/workout/view.html:169
msgid "with comments"
msgstr "yorumlarla"
@@ -2606,7 +2398,7 @@ msgid "The duration in weeks"
msgstr "Hafta cinsinden süre"
#: manager/models/schedule_step.py:63 manager/models/set.py:52
-#: manager/models/setting.py:98 nutrition/models/meal.py:54
+#: manager/models/setting.py:110 nutrition/models/meal.py:54
#: nutrition/models/meal_item.py:65
msgid "Order"
msgstr "Sipariş"
@@ -2661,7 +2453,7 @@ msgstr "Egzersiz günü"
msgid "Number of sets"
msgstr "Set sayısı"
-#: manager/models/setting.py:43
+#: manager/models/setting.py:48
msgid "Sets"
msgstr "Setleri"
@@ -2957,6 +2749,13 @@ msgstr ""
"E-posta hatırlatıcılarını hiçbir zaman almak istemiyorsanız,\n"
"ayarlarınızda seçeneği."
+#: manager/templates/workout/email_reminder.tpl:15
+#: manager/templates/workout/email_weight_reminder.tpl:12
+#: nutrition/templates/ingredient/email_new.tpl:9
+#, python-format
+msgid "The %(site)s team"
+msgstr "%(site)s ekibi"
+
#: manager/templates/workout/email_weight_reminder.tpl:3
#, python-format
msgid ""
@@ -2973,6 +2772,10 @@ msgstr ""
"Mevcut kilonuzu girene kadar düzenli olarak bu tür hatırlatıcılar "
"alacaksınız."
+#: manager/templates/workout/log.html:10 manager/templates/workout/log.html:11
+msgid "Weight log"
+msgstr "Ağırlık günlüğü"
+
#: manager/templates/workout/log.html:29
msgid "Weight log for workout"
msgstr "Egzersiz için ağırlık günlüğü"
@@ -3081,7 +2884,7 @@ msgstr "Günlükleri görüntüle"
msgid "Edit workout"
msgstr "Antrenmanı düzenle"
-#: manager/templates/workout/view.html:225 manager/views/workout.py:300
+#: manager/templates/workout/view.html:225 manager/views/workout.py:301
msgid "Mark as template"
msgstr "Şablon olarak işaretle"
@@ -3089,11 +2892,6 @@ msgstr "Şablon olarak işaretle"
msgid "Add workout day"
msgstr "Egzersiz günü ekle"
-#: manager/views/log.py:92
-#, python-format
-msgid "Edit log entry for %s"
-msgstr "%s için günlük girişini düzenleyin"
-
#: manager/views/log.py:111
msgid "Delete workout log"
msgstr "Antrenman günlüğünü sil"
@@ -3111,11 +2909,11 @@ msgstr "Program oluştur"
msgid "Your workouts"
msgstr "Antrenmanlarınız"
-#: manager/views/workout.py:227
+#: manager/views/workout.py:228
msgid "Copy workout"
msgstr "Antrenmanı kopyala"
-#: manager/views/workout.py:230
+#: manager/views/workout.py:231
msgid "Copy"
msgstr "Kopyala"
@@ -3137,30 +2935,30 @@ msgstr "Bu, o gün için tüm ağırlık günlüklerini de siler."
msgid "Value"
msgstr "Değer"
-#: nutrition/forms.py:122
+#: nutrition/forms.py:123
msgid "Calculate"
msgstr "Hesaplamak"
-#: nutrition/forms.py:195 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:196 nutrition/templates/rate/form.html:76
msgid "Basic caloric intake"
msgstr "Temel kalori alımı"
-#: nutrition/forms.py:196
+#: nutrition/forms.py:197
msgid "Your basic caloric intake as calculated for your data"
msgstr "Verileriniz için hesaplanan temel kalori alımınız"
-#: nutrition/forms.py:202
+#: nutrition/forms.py:203
msgid "Additional calories"
msgstr "Ek kaloriler"
-#: nutrition/forms.py:204
+#: nutrition/forms.py:205
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:232 nutrition/models/ingredient_weight_unit.py:39
+#: nutrition/forms.py:233 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"
@@ -3226,7 +3024,7 @@ msgstr ""
"sağlanan enerjinin yaklaşık toplamı değildir ({energy_calculated}kcal +/-"
"{energy_approx}%)"
-#: nutrition/models/ingredient.py:357 nutrition/views/ingredient.py:225
+#: nutrition/models/ingredient.py:357 nutrition/views/ingredient.py:219
msgid "Ingredient was successfully added to the general database"
msgstr "İçerik genel veri tabanına başarıyla eklendi"
@@ -3255,6 +3053,12 @@ msgstr "Birim miktar, ör. \"1 Fincan\" veya \"1/2 kaşık\""
msgid "Meal"
msgstr "Yemek"
+#: nutrition/models/log.py:65
+#, fuzzy
+#| msgid "Time (approx)"
+msgid "Date and Time (Approx.)"
+msgstr "Zaman (yaklaşık)"
+
#: nutrition/models/meal.py:61
msgid "Time (approx)"
msgstr "Zaman (yaklaşık)"
@@ -3272,8 +3076,8 @@ msgid ""
"A description of the goal of the plan, e.g. \"Gain mass\" or \"Prepare for "
"summer\""
msgstr ""
-"Planın amacının bir açıklaması, ör. \"Kitle kazanın\" veya \"Yaza hazırlanın"
-"\""
+"Planın amacının bir açıklaması, ör. \"Kitle kazanın\" veya \"Yaza "
+"hazırlanın\""
#: nutrition/models/plan.py:76
msgid "Use daily calories"
@@ -3362,6 +3166,12 @@ msgstr ""
"Artık içerik genel görünümünde mevcuttur ve\n"
"beslenme planlarına eklendi. Ona bu adresten erişebilirsiniz:"
+#: nutrition/templates/ingredient/email_new.tpl:8
+msgid "Thank you for contributing and making this site better!"
+msgstr ""
+"Katkıda bulunduğunuz ve bu siteyi daha iyi hale getirdiğiniz için teşekkür "
+"ederiz!"
+
#: nutrition/templates/ingredient/form.html:4
msgid "Submitting an ingredient"
msgstr "Bir içerik göndermek"
@@ -3392,6 +3202,10 @@ msgstr ""
msgid "No ingredients."
msgstr "İçerik yok."
+#: nutrition/templates/ingredient/overview.html:57
+msgid "Search"
+msgstr "Ara"
+
#: nutrition/templates/ingredient/overview.html:66
msgid "ingredient name"
msgstr "bileşen adı"
@@ -3401,6 +3215,14 @@ msgstr "bileşen adı"
msgid "Add ingredient"
msgstr "İçerik ekleyin"
+#: nutrition/templates/ingredient/overview.html:85
+msgid "Only registered users can do this"
+msgstr "Bunu sadece kayıtlı kullanıcılar yapabilir"
+
+#: nutrition/templates/ingredient/pending.html:14
+msgid "Submission date"
+msgstr "Teslim tarihi"
+
#: nutrition/templates/ingredient/view.html:27
msgid "Ingredient is pending review"
msgstr "İçerik incelenmeyi bekliyor"
@@ -3416,6 +3238,18 @@ msgstr ""
"dahil edilmek için bir karar bekliyor. Bu olana kadar, genel bakışta veya\n"
"aramada görünmeyecektir."
+#: nutrition/templates/ingredient/view.html:31
+msgid "Please select one of the options below."
+msgstr "Lütfen aşağıdaki seçeneklerden birini seçin."
+
+#: nutrition/templates/ingredient/view.html:38
+msgid "Accept"
+msgstr "Kabul etmek"
+
+#: nutrition/templates/ingredient/view.html:42
+msgid "Decline"
+msgstr "Reddet"
+
#: nutrition/templates/ingredient/view.html:71
#: nutrition/templates/log/detail.html:31
#: nutrition/templates/plan/view.html:229 nutrition/views/plan.py:376
@@ -3677,14 +3511,18 @@ msgstr ""
"yaklaşım. Beslenme planınızı bu değerlere dayandırırsanız,\n"
"birkaç hafta boyunca kendiniz ve gerekirse toplam miktarı değiştirin."
-#: nutrition/views/ingredient.py:181
+#: nutrition/views/ingredient.py:175
msgid "Add a new ingredient"
msgstr "Yeni bir malzeme ekle"
-#: nutrition/views/ingredient.py:238
+#: nutrition/views/ingredient.py:232
msgid "Ingredient was successfully marked as rejected"
msgstr "İçerik başarıyla reddedildi olarak işaretlendi"
+#: nutrition/views/log.py:230 nutrition/views/unit_ingredient.py:139
+msgid "Delete?"
+msgstr "Sil?"
+
#: nutrition/views/meal.py:55
msgid "Add new meal"
msgstr "Yeni yemek ekle"
@@ -3942,15 +3780,15 @@ msgstr ""
msgid "100%% Free <br>and <br>Open Source"
msgstr "100%% Ücretsiz <br> ve <br> Açık Kaynak"
-#: utils/generic_views.py:261
+#: utils/generic_views.py:262
msgid "Yes, delete"
msgstr "Evet, sil"
-#: utils/models.py:47
+#: utils/models.py:48
msgid "Author"
msgstr "Yazar"
-#: utils/models.py:52
+#: utils/models.py:53
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."
@@ -3958,15 +3796,15 @@ msgstr ""
"Yazar değilseniz, adı veya kaynağı buraya girin. Bu, bazı lisanslar için "
"gereklidir, örn. CC-BY-SA."
-#: utils/models.py:77
+#: utils/models.py:78
msgid "Pending"
msgstr "Bekliyor"
-#: utils/models.py:78
+#: utils/models.py:79
msgid "Accepted"
msgstr "Kabul edilmiş"
-#: utils/models.py:79
+#: utils/models.py:80
msgid "Declined"
msgstr "Reddedildi"
@@ -4135,6 +3973,214 @@ msgstr "Başarıyla silindi."
msgid "Delete weight entry for the %s"
msgstr "%s için ağırlık girişini silin"
+#~ msgid "Ingredients"
+#~ msgstr "Bileşimindekiler"
+
+#~ msgid ""
+#~ "Use the configuration to select in what languages the\n"
+#~ "exercises and ingredients will be shown for the current language (for "
+#~ "example\n"
+#~ "the exercises should be shown in languages A, B and C; the ingredients "
+#~ "only\n"
+#~ "in A)."
+#~ msgstr ""
+#~ "Geçerli dil için egzersizlerin ve bileşenlerin hangi\n"
+#~ "dillerde gösterileceğini seçmek için yapılandırmayı kullanın (örneğin, "
+#~ "egzersizler\n"
+#~ "A, B ve C dillerinde gösterilmelidir; bileşenler yalnızca A "
+#~ "dilindegösterilmelidir)."
+
+#~ msgctxt "as in sorted by category"
+#~ msgid "by category"
+#~ msgstr "kategoriye göre"
+
+#~ msgctxt "as in sorted by muscle"
+#~ msgid "by muscle"
+#~ msgstr "kasa göre"
+
+#~ msgctxt "as in sorted by equipment"
+#~ msgid "by equipment"
+#~ msgstr "ekipmana göre"
+
+#~ msgid "Add new exercise"
+#~ msgstr "Yeni egzersiz ekleyin"
+
+#~ msgid "Exercises pending review"
+#~ msgstr "Egzersiz kontrol edilmek için bekliyor"
+
+#~ msgid "Exercise was successfully added to the general database"
+#~ msgstr "Egzersiz genel veri tabanına başarıyla eklendi"
+
+#~ msgid "New user submitted exercise"
+#~ msgstr "Yeni kullanıcı gönderilen egzersiz"
+
+#, 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."
+
+#~ msgid "New user submitted image"
+#~ msgstr "Yeni kullanıcı tarafından gönderilen resim"
+
+#, python-brace-format
+#~ msgid "The user {0} submitted a new image \"{1}\" for exercise {2}."
+#~ msgstr ""
+#~ "{0} kullanıcısı, {2} alıştırması için yeni bir \"{1}\" görüntüsü gönderdi."
+
+#~ msgid "Equipment overview"
+#~ msgstr "Ekipmana genel bakış"
+
+#~ msgid "Main muscles"
+#~ msgstr "Ana kaslar"
+
+#~ msgid ""
+#~ "No exercises for this equipment. Add or edit an exercise and set the "
+#~ "equipment."
+#~ msgstr ""
+#~ "Bu ekipman için egzersiz yok. Bir egzersiz ekleyin veya düzenleyin ve "
+#~ "ekipmanı ayarlayın."
+
+#~ msgid "exercise name"
+#~ msgstr "egzersiz adı"
+
+#, python-format
+#~ msgid ""
+#~ "Your exercise '%(exercise)s' was successfully added to the general\n"
+#~ "database."
+#~ msgstr ""
+#~ "'%(exercise)s' alıştırmanız genel olarak başarıyla eklendi\n"
+#~ "veri tabanı."
+
+#~ msgid ""
+#~ "It is now available on the exercise and muscle overview and can be\n"
+#~ "added to workouts. You can access it on this address:"
+#~ msgstr ""
+#~ "Artık egzersiz ve kaslara genel bakışta mevcut ve\n"
+#~ "antrenmanlara eklendi. Ona bu adresten erişebilirsiniz:"
+
+#~ msgid "Submitting an exercise"
+#~ msgstr "Bir egzersiz kaydediliyor"
+
+#~ msgid ""
+#~ "Thank you for submitting an exercise. This is much\n"
+#~ "appreciated!"
+#~ msgstr ""
+#~ "Bir egzersiz gönderdiğiniz için teşekkür ederiz. Bu çok\n"
+#~ "takdir!"
+
+#~ msgid ""
+#~ "After you submit the form, the administrators will be notified.\n"
+#~ "Once it is reviewed, it will be added to the database. Till this "
+#~ "happens,\n"
+#~ "it will not be visible in the overview or the search. In case you added "
+#~ "your email\n"
+#~ "when you registered, you will get notified when the process is completed "
+#~ "successfully."
+#~ msgstr ""
+#~ "Formu gönderdikten sonra yöneticiler bilgilendirilecektir.\n"
+#~ "İncelendikten sonra veri tabanına eklenecektir. Bu olana kadar,\n"
+#~ "genel bakışta veya aramada görünmeyecektir. Kayıt olduğunuzda e-"
+#~ "postanızı\n"
+#~ "eklemeniz durumunda, işlem başarıyla tamamlandığında size haber "
+#~ "verilecektir."
+
+#~ msgid "Correcting an exercise"
+#~ msgstr "Bir egzersizi düzeltme"
+
+#~ msgid ""
+#~ "Thank you for correcting and improving this exercise.\n"
+#~ "This is much appreciated!"
+#~ msgstr ""
+#~ "Bu egzersizi düzelttiğiniz ve geliştirdiğiniz için teşekkür ederiz.\n"
+#~ "Bu çok takdir edilmektedir!"
+
+#~ msgid ""
+#~ "After you submit the form, the administrators will be notified.\n"
+#~ "Once the changes are reviewed the exercise will be updated."
+#~ msgstr ""
+#~ "Formu gönderdikten sonra, yöneticiler bilgilendirilecektir.\n"
+#~ "Değişiklikler gözden geçirildikten sonra egzersiz güncellenecektir."
+
+#~ msgid "No categories."
+#~ msgstr "Kategori yok."
+
+#~ msgid "Use link to create one"
+#~ msgstr "Bir tane oluşturmak için bağlantıyı kullanın"
+
+#~ msgid "Exercise is pending review"
+#~ msgstr "Egzersiz ön izlenmek için bekleniyor"
+
+#~ msgid ""
+#~ "This user submitted exercise is pending a decision to be\n"
+#~ " included in the database."
+#~ msgstr ""
+#~ "Bu kullanıcı tarafından gönderilen egzersiz, veri tabanına\n"
+#~ " dahil edilmek için bir karar bekliyor."
+
+#~ msgid "Till then, it will not be shown in the overview or the search."
+#~ msgstr "O zamana kadar, genel bakışta veya aramada gösterilmeyecek."
+
+#~ msgid "Images"
+#~ msgstr "Görüntüler"
+
+#~ msgid "Add new image"
+#~ msgstr "Yeni resim ekle"
+
+#~ msgid "Videos"
+#~ msgstr "Videolar"
+
+#~ msgid "Add new video"
+#~ msgstr "Yeni video ekle"
+
+#~ msgid "Images pending review"
+#~ msgstr "İncelenmeyi bekleyen resimler"
+
+#~ msgid "Comments for this exercise"
+#~ msgstr "Bu egzersiz için yorum yapın"
+
+#~ msgid "Add new comment"
+#~ msgstr "Yeni yorum ekle"
+
+#~ msgid "The diagram shows the most used muscles on this exercise"
+#~ msgstr "Şema, bu egzersizde en çok kullanılan kasları göstermektedir"
+
+#~ msgid "Exercise Variations"
+#~ msgstr "Egzersiz Varyasyonları"
+
+#~ msgid "Submit a correction"
+#~ msgstr "Düzeltme gönderin"
+
+#~ msgid ""
+#~ "No exercises for this muscle. Add or edit an exercise and set the muscle."
+#~ msgstr ""
+#~ "Bu kas için egzersiz yok. Bir egzersiz ekleyin veya düzenleyin ve kası "
+#~ "ayarlayın."
+
+#~ msgid "Add exercise"
+#~ msgstr "Egzersiz ekle"
+
+#~ 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."
+
+#, python-brace-format
+#~ msgid "Correct {0}"
+#~ msgstr "Doğru {0}"
+
+#~ msgid "Exercise was successfully marked as rejected"
+#~ msgstr "Egzersiz başarıyla reddedildi olarak işaretlendi"
+
+#~ msgid "Edit exercise image"
+#~ msgstr "Egzersiz görüntüsünü düzenleyin"
+
+#~ msgid "Delete exercise image?"
+#~ msgstr "Egzersiz görüntüsü silinsin mi?"
+
+#, python-format
+#~ msgid "Edit log entry for %s"
+#~ msgstr "%s için günlük girişini düzenleyin"
+
#~ msgid "Anterior deltoid"
#~ msgstr "Ön deltoid"
@@ -4510,10 +4556,6 @@ msgstr "%s için ağırlık girişini silin"
#~ msgid "No filter"
#~ msgstr "Filtresiz"
-#~ msgctxt "Noun, not verb"
-#~ msgid "Change"
-#~ msgstr "Değiştir"
-
#~ msgid "Days"
#~ msgstr "Günler"
diff --git a/wger/locale/uk/LC_MESSAGES/django.po b/wger/locale/uk/LC_MESSAGES/django.po
index 3da97f1a8..5ea91e193 100644
--- a/wger/locale/uk/LC_MESSAGES/django.po
+++ b/wger/locale/uk/LC_MESSAGES/django.po
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: wger Workout Manager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-14 12:01+0200\n"
+"POT-Creation-Date: 2022-11-10 16:03+0100\n"
"PO-Revision-Date: 2022-07-26 02:01+0000\n"
"Last-Translator: Artem <[email protected]>\n"
"Language-Team: Ukrainian <https://hosted.weblate.org/projects/wger/web/uk/>\n"
@@ -20,10 +20,10 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n % 10 == 1 && n % 100 != 11 "
-"? 0 : n % 1 == 0 && n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 12 || n % 100 > "
-"14) ? 1 : n % 1 == 0 && (n % 10 ==0 || (n % 10 >=5 && n % 10 <=9) || (n % "
-"100 >=11 && n % 100 <=14 )) ? 2: 3);\n"
+"Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n % 10 == 1 && n % 100 != "
+"11 ? 0 : n % 1 == 0 && n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 12 || n % "
+"100 > 14) ? 1 : n % 1 == 0 && (n % 10 ==0 || (n % 10 >=5 && n % 10 <=9) || "
+"(n % 100 >=11 && n % 100 <=14 )) ? 2: 3);\n"
"X-Generator: Weblate 4.14-dev\n"
#: config/models/gym_config.py:46 gym/templates/gym/list.html:50
@@ -39,106 +39,8 @@ msgstr ""
"призначений всім новим зареєстрованим користувачам і для всіх існуючих "
"користувачів без тренажерного залу."
-#: 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:226
-msgid "Languages"
-msgstr "Мови"
-
-#: config/templates/language/overview.html:16
-msgid "Nothing found."
-msgstr "Нічого не знайдено."
-
-#: 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:150
-#: nutrition/templates/plan/view.html:153
-#: nutrition/templates/plan/view.html:191
-msgid "Add one now."
-msgstr "Додати зараз."
-
-#: config/templates/language/overview.html:29
-#: core/templates/license/list.html:38 core/templates/misc/license/list.html:41
-#: core/templates/repetition_unit/list.html:41
-#: core/templates/user/overview.html:327 core/templates/user/overview.html:366
-#: core/templates/user/overview.html:402
-#: core/templates/weight_unit/list.html:41 core/views/languages.py:73
-#: core/views/license.py:65 core/views/repetition_units.py:65
-#: core/views/weight_units.py:65
-#: exercises/templates/categories/admin-overview.html:36
-#: 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:61
-msgid "Add"
-msgstr "Додати"
-
-#: 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/language.py:32
-msgid "Language full name"
-msgstr "Довге позначення мови"
-
-#: config/templates/language/view.html:34 core/templates/user/overview.html:451
-#: gym/views/admin_config.py:44 gym/views/admin_config.py:58
-#: gym/views/user_config.py:46
-msgid "Configuration"
-msgstr "Конфігурація"
-
-#: config/templates/language/view.html:35
-msgid ""
-"Use the configuration to select in what languages the\n"
-"exercises and ingredients will be shown for the current language (for "
-"example\n"
-"the exercises should be shown in languages A, B and C; the ingredients only\n"
-"in A)."
-msgstr ""
-"Використовуйте цю конфігурацію щоб вибрати на яких мовах\n"
-"будуть показуватись вправи та інгредієнти для поточної мови (наприклад,\n"
-"вправи повинні бути показані на мовах A, B і C; інгредієнти тільки\n"
-"на A)."
-
-#: config/templates/language/view.html:44 gym/templates/contract/list.html:36
-msgid "Show"
-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: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:45
-msgid "Options"
-msgstr "Параметри"
-
-#: config/templates/language/view.html:96 config/views/gym_config.py:41
-#: config/views/language_config.py:49 core/templates/license/list.html:16
-#: core/templates/misc/license/list.html:17
+#: config/views/gym_config.py:41 core/templates/language/view.html:57
+#: 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:39
#: core/templates/tags/render_day.html:75 core/templates/user/overview.html:205
@@ -146,12 +48,10 @@ 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:230
-#: exercises/templates/exercise/view.html:351
#: exercises/templates/muscles/admin-overview.html:16
-#: 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
+#: 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
#: 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
@@ -167,81 +67,54 @@ msgstr "Параметри"
msgid "Edit"
msgstr "Змінити"
-#: 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: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: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
-#: gym/templates/contract_type/list.html:39 gym/templates/document/list.html:46
-#: gym/templates/gym/list.html:20 manager/templates/calendar/day.html:69
-#: 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:231
-#: 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:132
-#: nutrition/templates/units/list.html:20
-msgid "Delete"
-msgstr "Вилучити"
-
-#: core/demo.py:86
+#: core/demo.py:95
msgid "Sample workout"
msgstr "Пробне тренування"
-#: core/demo.py:90
+#: core/demo.py:99
msgid "Sample day"
msgstr "Пробний день"
-#: core/demo.py:94
+#: core/demo.py:103
msgid "Another sample day"
msgstr "Інший пробний день"
-#: core/demo.py:217
-msgid "Sample nutrional plan"
+#: core/demo.py:211
+#, fuzzy
+#| msgid "Sample nutrional plan"
+msgid "Sample nutritional plan"
msgstr "Пробний план харчування"
-#: core/demo.py:349 core/demo.py:351 core/demo.py:353
+#: core/demo.py:343 core/demo.py:345 core/demo.py:347
#, python-brace-format
msgid "Placeholder workout nr {0} for schedule"
msgstr "\"Заповнювач\" тренування № {0} для програми"
-#: core/demo.py:358
+#: core/demo.py:352
msgid "My cool workout schedule"
msgstr "Моя класна програграма тренувань"
-#: core/demo.py:397 core/demo.py:412
+#: core/demo.py:391 core/demo.py:406
msgid "Empty placeholder schedule"
msgstr "Порожня програма-заповнювач"
-#: core/forms.py:61 core/templates/navigation.html:188
-#: core/templates/navigation.html:192 core/templates/user/login.html:4
+#: core/forms.py:64 core/templates/navigation.html:179
+#: core/templates/navigation.html:183 core/templates/user/login.html:4
#: software/templates/features.html:43
msgid "Login"
msgstr "Вхід"
-#: core/forms.py:73 core/forms.py:164 gym/views/export.py:63
+#: core/forms.py:76 core/forms.py:177 gym/views/export.py:63
#: gym/views/gym.py:218
msgid "First name"
msgstr "Ім'я"
-#: core/forms.py:74 core/forms.py:165 core/templates/user/overview.html:267
+#: core/forms.py:77 core/forms.py:178 core/templates/user/overview.html:267
#: gym/views/export.py:64 gym/views/gym.py:218
msgid "Last name"
msgstr "Прізвище"
-#: core/forms.py:76 core/forms.py:131 core/templates/user/overview.html:271
+#: core/forms.py:79 core/forms.py:144 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
@@ -251,79 +124,109 @@ msgstr "Прізвище"
msgid "Email"
msgstr "Адреса електронної пошти"
-#: core/forms.py:77
+#: core/forms.py:80
msgid "Used for password resets and, optionally, e-mail reminders."
msgstr ""
"Використовується для скидання пароля і, і за необхідності, нагадування "
"електронною поштою."
-#: core/forms.py:102
+#: core/forms.py:84 core/models/profile.py:220
+#: gym/templates/gym/new_user.html:38
+msgid "Date of Birth"
+msgstr "Дата народження"
+
+#: core/forms.py:116
msgid "Personal data"
msgstr "Особисті дані"
-#: core/forms.py:110
+#: core/forms.py:124
msgid "Workout reminders"
msgstr "Нагадування про тренування"
-#: core/forms.py:117
+#: core/forms.py:131
msgid "Other settings"
msgstr "Інші параметри"
-#: 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
+#: core/forms.py:138 core/views/user.py:615 core/views/user.py:630
+#: core/views/user.py:642 gym/forms.py:72 manager/templates/log/add.html:65
+#: manager/templates/set/add.html:69 manager/views/workout.py:222
+#: utils/generic_views.py:143
msgid "Save"
msgstr "Зберегти"
-#: core/forms.py:132
+#: core/forms.py:145
msgid "Used for password resets and, optionally, email reminders."
msgstr ""
"Використовується для скидання пароля і, при необхідності, нагадування "
"електронною поштою."
-#: core/forms.py:160
+#: core/forms.py:173
msgid "This e-mail address is already in use."
msgstr "Ця адреса електронної пошти вже використовується."
-#: core/forms.py:180 gym/templates/gym/new_user.html:26
+#: core/forms.py:193 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:182
+#: core/forms.py:195
msgid "Please enter your current password."
msgstr "Введіть свій поточний пароль."
-#: core/forms.py:200
+#: core/forms.py:204 core/templates/language/view.html:62
+#: 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: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/muscles/admin-overview.html:17
+#: gym/templates/admin_notes/list.html:40
+#: gym/templates/contract_option/list.html:39
+#: gym/templates/contract_type/list.html:39 gym/templates/document/list.html:46
+#: gym/templates/gym/list.html:20 manager/templates/calendar/day.html:69
+#: 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:231
+#: 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:132
+#: nutrition/templates/units/list.html:20
+msgid "Delete"
+msgstr "Вилучити"
+
+#: core/forms.py:213
msgid "Invalid password"
msgstr "Неправильний пароль"
-#: core/forms.py:212 core/forms.py:278
+#: core/forms.py:225 core/forms.py:291
msgid "The form is secured with reCAPTCHA"
msgstr "Форма захищена reCAPTCHA"
-#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:188
-#: core/templates/navigation.html:193 core/templates/template.html:149
-#: core/templates/user/login.html:20 core/views/user.py:293
+#: core/forms.py:239 core/forms.py:258 core/templates/navigation.html:179
+#: core/templates/navigation.html:184 core/templates/template.html:149
+#: core/templates/user/login.html:20 core/views/user.py:300
#: software/templates/features.html:38
msgid "Register"
msgstr "Зареєструватись"
-#: core/forms.py:256
+#: core/forms.py:269
msgid "Contact"
msgstr "Контакт"
-#: core/forms.py:257
+#: core/forms.py:270
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:71
+#: core/forms.py:278 exercises/models/comment.py:42 manager/models/set.py:60
+#: manager/models/setting.py:111 nutrition/models/log.py:71
msgid "Comment"
msgstr "Коментар"
-#: core/forms.py:266
+#: core/forms.py:279
msgid "What do you want to say?"
msgstr "Що ви хочете сказати?"
@@ -331,6 +234,14 @@ msgstr "Що ви хочете сказати?"
msgid "Day of the week"
msgstr "День тижня"
+#: core/models/language.py:31 core/templates/language/view.html:21
+msgid "Language short name"
+msgstr "Коротке позначення мови"
+
+#: core/models/language.py:36 core/templates/language/view.html:22
+msgid "Language full name"
+msgstr "Довге позначення мови"
+
#: core/models/license.py:29
msgid "Full name"
msgstr "Повне ім'я"
@@ -388,19 +299,19 @@ msgstr "Метричні (кілограм)"
msgid "Imperial (pound)"
msgstr "Імперичні (фунт)"
-#: core/models/profile.py:111
+#: core/models/profile.py:114
msgid "Show exercise comments"
msgstr "Показувати коментарі вправи"
-#: core/models/profile.py:112
+#: core/models/profile.py:115
msgid "Check to show exercise comments on the workout view"
msgstr "Відмітьте для показу коментарів вправи при перегляді тренування"
-#: core/models/profile.py:123
+#: core/models/profile.py:126
msgid "Also use ingredients in English"
msgstr "Також використовувати інгредієнти Англійською"
-#: core/models/profile.py:125
+#: core/models/profile.py:128
msgid ""
"Check to also show ingredients in English while creating\n"
"a nutritional plan. These ingredients are extracted from a list provided\n"
@@ -412,11 +323,11 @@ msgstr ""
"зі списку встановленому Департаментом Сільського Господарства США.\n"
"Список досить великий, близько 7000 записів, що може ускладнити пошук."
-#: core/models/profile.py:134
+#: core/models/profile.py:137
msgid "Activate workout reminders"
msgstr "Активувати нагадування про тренування"
-#: core/models/profile.py:136
+#: core/models/profile.py:139
msgid ""
"Check to activate automatic reminders for workouts. You need to provide a "
"valid email for this to work."
@@ -424,19 +335,19 @@ msgstr ""
"Відмітьте для активації автоматичних нагадувань для тренувань. Для роботи "
"цієї функції необхідно вказати дійсну адресу електронної пошти."
-#: core/models/profile.py:145
+#: core/models/profile.py:148
msgid "Remind before expiration"
msgstr "Нагадати перед завершенням"
-#: core/models/profile.py:146
+#: core/models/profile.py:149
msgid "The number of days you want to be reminded before a workout expires."
msgstr "Кількість днів для нагадування перед закінченням тренування."
-#: core/models/profile.py:152
+#: core/models/profile.py:155
msgid "Default duration of workouts"
msgstr "Типова тривалість тренувань"
-#: core/models/profile.py:154
+#: core/models/profile.py:157
msgid ""
"Default duration in weeks of workouts not in a schedule. Used for email "
"workout reminders."
@@ -444,11 +355,11 @@ msgstr ""
"Типова тривалість тренувань в тижнях, які не заплановані. Використовується "
"для нагадувань про тренування."
-#: core/models/profile.py:171
+#: core/models/profile.py:174
msgid "Notification language"
msgstr "Мова сповіщення"
-#: core/models/profile.py:173
+#: core/models/profile.py:176
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."
@@ -456,70 +367,70 @@ msgstr ""
"Мова, яка використовується при надсиланні вам сповіщень електронною поштою, "
"наприклад, нагадування про тренування. Це не стосується мови веб-сайту."
-#: core/models/profile.py:186 gym/views/export.py:66
+#: core/models/profile.py:212 gym/views/export.py:66
msgid "Age"
msgstr "Вік"
-#: core/models/profile.py:202 nutrition/forms.py:99
+#: core/models/profile.py:228 nutrition/forms.py:100
msgid "Height (cm)"
msgstr "Зріст (см)"
-#: core/models/profile.py:219
+#: core/models/profile.py:245
msgid "Hours of sleep"
msgstr "Годин сну"
-#: core/models/profile.py:220
+#: core/models/profile.py:246
msgid "The average hours of sleep per day"
msgstr "Середня кількість годин сну на добу"
-#: core/models/profile.py:229
+#: core/models/profile.py:255
msgid "Work"
msgstr "Робота"
-#: core/models/profile.py:230 core/models/profile.py:272
+#: core/models/profile.py:256 core/models/profile.py:298
msgid "Average hours per day"
msgstr "Середня кількість годин на добу"
-#: core/models/profile.py:239 core/models/profile.py:260
-#: core/models/profile.py:281
+#: core/models/profile.py:265 core/models/profile.py:286
+#: core/models/profile.py:307
msgid "Physical intensity"
msgstr "Фізична інтенсивність"
-#: core/models/profile.py:240 core/models/profile.py:261
-#: core/models/profile.py:282
+#: core/models/profile.py:266 core/models/profile.py:287
+#: core/models/profile.py:308
msgid "Approximately"
msgstr "Приблизно"
-#: core/models/profile.py:250
+#: core/models/profile.py:276
msgid "Sport"
msgstr "Спорт"
-#: core/models/profile.py:251
+#: core/models/profile.py:277
msgid "Average hours per week"
msgstr "Середня кількість годин на тиждень"
-#: core/models/profile.py:271
+#: core/models/profile.py:297
msgid "Free time"
msgstr "Вільний час"
-#: core/models/profile.py:292 nutrition/templates/rate/form.html:66
+#: core/models/profile.py:318 nutrition/templates/rate/form.html:66
msgid "Total daily calories"
msgstr "Денна кількість калорій"
-#: core/models/profile.py:293
+#: core/models/profile.py:319
msgid "Total caloric intake, including e.g. any surplus"
msgstr "Загальне споживання калорій, в тому числі, будь-який надлишок"
-#: core/models/profile.py:305 nutrition/models/ingredient_weight_unit.py:45
+#: core/models/profile.py:331 nutrition/models/ingredient_weight_unit.py:45
#: nutrition/models/log.py:90 nutrition/models/meal_item.py:58
msgid "Weight unit"
msgstr "Одиниця ваги"
-#: core/models/profile.py:313
+#: core/models/profile.py:339
msgid "Allow external access"
msgstr "Дозволити зовнішній доступ"
-#: core/models/profile.py:315
+#: core/models/profile.py:341
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."
@@ -528,24 +439,23 @@ msgstr ""
"режимі лише для читання. Це необхідно встановити для можливості ділитися "
"посиланнями, наприклад в соціальних мережах."
-#: core/models/profile.py:324
+#: core/models/profile.py:350
msgid "Automatic reminders for weight entries"
msgstr "Автоматичні нагадування для записів ваги"
-#: core/models/profile.py:326
+#: core/models/profile.py:352
msgid "Number of days after the last weight entry (enter 0 to deactivate)"
msgstr ""
"Кількість днів після останнього запису ваги (введіть 0 для деактивації)"
-#: core/models/profile.py:392
+#: core/models/profile.py:418
msgid "The sum of all hours has to be 24"
msgstr "Сума всіх годин повинна дорівнювати 24"
#: core/models/rep_unit.py:35 core/models/weight_unit.py:35
-#: core/templates/user/overview.html:263 core/views/user.py:575
+#: core/templates/user/overview.html:263 core/views/user.py:591
#: 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
+#: exercises/models/exercise.py:64 exercises/models/muscle.py:36
#: 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
@@ -608,6 +518,53 @@ msgstr "Поділитися"
msgid "Are you sure you want to delete this? This action cannot be undone."
msgstr "Ви дійсно хочете вилучити це? Цю дію неможливо скасувати."
+#: core/templates/email_verification/confirm_template.html:4
+msgid "Email verified"
+msgstr ""
+
+#: core/templates/email_verification/confirm_template.html:18
+#, python-format
+msgid "%(username)s, your email was verified"
+msgstr ""
+
+#: core/templates/email_verification/confirm_template.html:22
+msgid "Error, invalid verification token"
+msgstr ""
+
+#: core/templates/email_verification/email_body_html.tpl:6
+#, fuzzy
+#| msgid "Configuration"
+msgid "Email Confirmation"
+msgstr "Конфігурація"
+
+#: core/templates/email_verification/email_body_html.tpl:9
+#: core/templates/email_verification/email_body_txt.tpl:3
+#, fuzzy, python-format
+#| msgid "Calendar for %(username)s"
+msgid "You are almost there, %(username)s!"
+msgstr "Календар для %(username)s"
+
+#: core/templates/email_verification/email_body_html.tpl:11
+#, python-format
+msgid "Please click <a href=\"%(link)s\">here</a> to confirm your email"
+msgstr ""
+
+#: core/templates/email_verification/email_body_html.tpl:12
+#: core/templates/email_verification/email_body_txt.tpl:5
+#, python-format
+msgid "The token expires on %(time)s"
+msgstr ""
+
+#: core/templates/email_verification/email_body_html.tpl:14
+#: core/templates/email_verification/email_body_txt.tpl:8
+msgid "the wger Team"
+msgstr ""
+
+#: core/templates/email_verification/email_body_txt.tpl:4
+#, python-format
+msgid "Please click the following link to confirm your email: %(link)s"
+msgstr ""
+
#: core/templates/index.html:4
msgid "Dashboard"
msgstr "Панель"
@@ -669,7 +626,7 @@ msgid "Add custom diary entry"
msgstr "Додати власний запис щоденника"
#: core/templates/index.html:84 core/templates/index.html:92
-#: manager/models/day.py:34 manager/models/log.py:56
+#: manager/models/day.py:34 manager/models/log.py:58
#: manager/models/session.py:60 manager/models/workout.py:109
#: manager/templates/schedule/view.html:105
#: manager/templates/workout/view.html:11
@@ -702,6 +659,20 @@ msgstr "Додати новий журнал"
msgid "No workouts found."
msgstr "Не знайдено жодних тренувань."
+#: core/templates/index.html:137 core/templates/index.html:189
+#: core/templates/language/overview.html:23
+#: 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:150
+#: nutrition/templates/plan/view.html:153
+#: nutrition/templates/plan/view.html:191
+msgid "Add one now."
+msgstr "Додати зараз."
+
#: 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
@@ -755,19 +726,59 @@ msgid "No nutrition plans."
msgstr "Немає планів харчування."
#: 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
+#: core/templates/user/overview.html:121 manager/forms.py:184
+#: manager/helpers.py:89 manager/models/log.py:86 manager/models/setting.py:79
+#: manager/templates/log/add.html:54 manager/templates/set/formset.html:11
#: weight/models.py: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:210 core/templates/navigation.html:135
+#: core/templates/index.html:210 core/templates/navigation.html:126
#: weight/views.py:70
msgid "Add weight entry"
msgstr "Додати запис ваги"
+#: core/templates/language/overview.html:4 core/templates/navigation.html:217
+msgid "Languages"
+msgstr "Мови"
+
+#: core/templates/language/overview.html:23
+msgid "Nothing found."
+msgstr "Нічого не знайдено."
+
+#: core/templates/language/overview.html:36 core/templates/license/list.html:38
+#: core/templates/misc/license/list.html:41
+#: core/templates/repetition_unit/list.html:41
+#: core/templates/user/overview.html:327 core/templates/user/overview.html:366
+#: core/templates/user/overview.html:402
+#: core/templates/weight_unit/list.html:41 core/views/languages.py:73
+#: core/views/license.py:65 core/views/repetition_units.py:65
+#: core/views/weight_units.py:65
+#: exercises/templates/categories/admin-overview.html:36
+#: 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:61
+msgid "Add"
+msgstr "Додати"
+
+#: core/templates/language/view.html:52 core/templates/user/api_key.html:44
+#: core/templates/user/preferences.html:44 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:45
+msgid "Options"
+msgstr "Параметри"
+
#: core/templates/license/list.html:4 core/templates/misc/license/list.html:4
msgid "License list"
msgstr "Список ліцензій"
@@ -780,7 +791,6 @@ msgstr "Список ліцензій"
#: core/templates/weight_unit/list.html:26
#: exercises/templates/categories/admin-overview.html:24
#: exercises/templates/equipment/admin-overview.html:24
-#: exercises/templates/exercise/pending.html:30
#: exercises/templates/muscles/admin-overview.html:24
#: gym/templates/admin_notes/list.html:52 gym/templates/contract/list.html:60
#: gym/templates/contract_option/list.html:56
@@ -862,155 +872,135 @@ msgstr "Ваші шаблони"
msgid "Public templates"
msgstr "Загальнодоступні шаблони"
-#: core/templates/navigation.html:64
-msgctxt "as in sorted by category"
-msgid "by category"
-msgstr "за категоріями"
-
-#: core/templates/navigation.html:65
-msgctxt "as in sorted by muscle"
-msgid "by muscle"
-msgstr "за м'язовими групами"
-
-#: core/templates/navigation.html:66
-msgctxt "as in sorted by equipment"
-msgid "by equipment"
-msgstr "за інвентарем"
+#: core/templates/navigation.html:63 manager/forms.py:133
+#: manager/models/setting.py:54
+msgid "Exercises"
+msgstr "Вправи"
-#: core/templates/navigation.html:70
-#: exercises/templates/equipment/overview.html:109
-#: exercises/templates/equipment/overview.html:113
-#: exercises/templates/exercise/overview.html:112
-#: exercises/templates/exercise/overview.html:116
-#: exercises/templates/muscles/overview.html:112
-#: exercises/templates/muscles/overview.html:116
-msgid "Add new exercise"
-msgstr "Додати нову вправу"
-
-#: core/templates/navigation.html:75 core/templates/navigation.html:116
-#: core/templates/navigation.html:224
+#: core/templates/navigation.html:67 core/templates/navigation.html:107
+#: core/templates/navigation.html:215
msgid "Administration"
msgstr "Адміністрація"
-#: core/templates/navigation.html:76
-#: exercises/templates/exercise/pending.html:6
-msgid "Exercises pending review"
-msgstr "Вправи, що очікують на розгляд"
+#: core/templates/navigation.html:68
+#, fuzzy
+#| msgid "Exercise day"
+msgid "Exercise edit history"
+msgstr "День тренування"
-#: core/templates/navigation.html:77 exercises/models/base.py:72
-#: exercises/templates/exercise/view.html:80
+#: core/templates/navigation.html:69 exercises/models/base.py:84
msgid "Equipment"
msgstr "Обладнання"
-#: core/templates/navigation.html:78 exercises/templates/exercise/view.html:258
+#: core/templates/navigation.html:70
msgid "Muscles"
msgstr "М'язи"
-#: core/templates/navigation.html:79
+#: core/templates/navigation.html:71
#: exercises/templates/categories/admin-overview.html:4
msgid "Categories"
msgstr "Категорії"
-#: core/templates/navigation.html:93 software/templates/features.html:87
+#: core/templates/navigation.html:84 software/templates/features.html:87
msgid "Nutrition"
msgstr "Харчування"
-#: core/templates/navigation.html:99 core/templates/user/overview.html:144
+#: core/templates/navigation.html:90 core/templates/user/overview.html:144
msgid "Nutrition plans"
msgstr "Плани харчування"
-#: core/templates/navigation.html:105 nutrition/templates/bmi/form.html:50
+#: core/templates/navigation.html:96 nutrition/templates/bmi/form.html:50
msgid "BMI calculator"
msgstr "Калькулятор індексу маси тіла"
-#: core/templates/navigation.html:111 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:102 nutrition/templates/rate/form.html:17
msgid "Daily calories calculator"
msgstr "Калькулятор щоденних калорій"
-#: core/templates/navigation.html:113
+#: core/templates/navigation.html:104
#: nutrition/templates/ingredient/overview.html:29
msgid "Ingredient overview"
msgstr "Огляд інгредієнтів"
-#: core/templates/navigation.html:117 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:108 nutrition/templates/units/list.html:6
msgid "Ingredient weight units"
msgstr "Одиниці ваги інгредієнтів"
-#: core/templates/navigation.html:118
+#: core/templates/navigation.html:109
#: nutrition/templates/ingredient/pending.html:6
msgid "Ingredients pending review"
msgstr "Інгредієнти, що очікують розгляду"
-#: core/templates/navigation.html:132
+#: core/templates/navigation.html:123
msgid "Body weight"
msgstr "Вага тіла"
-#: core/templates/navigation.html:134 core/templates/user/overview.html:114
+#: core/templates/navigation.html:125 core/templates/user/overview.html:114
#: weight/templates/overview.html:7
msgid "Weight overview"
msgstr "Огляд ваги"
-#: core/templates/navigation.html:147
+#: core/templates/navigation.html:138
msgid "About this software"
msgstr "Про це програмне забезпечення"
-#: core/templates/navigation.html:149 core/templates/template_features.html:82
+#: core/templates/navigation.html:140 core/templates/template_features.html:82
#: software/templates/about_us.html:5
msgid "About us"
msgstr "Про нас"
-#: core/templates/navigation.html:151 software/templates/features.html:209
+#: core/templates/navigation.html:142 software/templates/features.html:209
msgid "REST API"
msgstr "REST API"
-#: core/templates/navigation.html:155 utils/models.py:40
+#: core/templates/navigation.html:146 utils/models.py:41
msgid "License"
msgstr "Ліцензія"
-#: core/templates/navigation.html:161
+#: core/templates/navigation.html:152
msgid "Developer documentation"
msgstr "Документація для розробників"
-#: core/templates/navigation.html:167
+#: core/templates/navigation.html:158
msgid "Get the code"
msgstr "Отримати код"
-#: core/templates/navigation.html:173 core/templates/template.html:204
+#: core/templates/navigation.html:164 core/templates/template.html:203
#: core/templates/template_features.html:99
msgid "Translate"
msgstr "Перекласти"
-#: core/templates/navigation.html:194 core/templates/user/login.html:28
+#: core/templates/navigation.html:185 core/templates/user/login.html:28
msgid "Reset password"
msgstr "Скинути пароль"
-#: core/templates/navigation.html:207
+#: core/templates/navigation.html:198
msgid "My preferences"
msgstr "Мої налаштування"
-#: core/templates/navigation.html:214
+#: core/templates/navigation.html:205
msgid "Logout"
msgstr "Вийти"
-#: core/templates/navigation.html:229
+#: core/templates/navigation.html:220
msgid "Licenses"
msgstr "Ліцензії"
-#: core/templates/navigation.html:232
+#: core/templates/navigation.html:223
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr "Одиниці повторень"
-#: core/templates/navigation.html:235 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:226 core/templates/weight_unit/list.html:4
#: nutrition/templates/ingredient/view.html:174
msgid "Weight units"
msgstr "Одиниця ваги"
-#: core/templates/navigation.html:238 core/templates/user/list.html:4
+#: core/templates/navigation.html:229 core/templates/user/list.html:4
msgid "User list"
msgstr "Список користувачів"
-#: core/templates/navigation.html:239
+#: core/templates/navigation.html:230
msgid "Gyms"
msgstr "Тренажерні зали"
@@ -1089,33 +1079,30 @@ msgstr "вперед"
msgid "Add weight log"
msgstr "Додати журнал ваги"
-#: core/templates/tags/render_day.html:114
-#: exercises/templates/equipment/overview.html:59
-#: exercises/templates/exercise/overview.html:63
-#: exercises/templates/muscles/overview.html:65
+#: core/templates/tags/render_day.html:116
msgid "Placeholder image for exercise"
msgstr "Заповнювач зображення для вправи"
-#: core/templates/tags/render_day.html:131
+#: core/templates/tags/render_day.html:133
msgid "This exercise has no repetitions."
msgstr "Ця вправа не має повторів."
-#: core/templates/tags/render_day.html:134
+#: core/templates/tags/render_day.html:136
msgid "Edit them now."
msgstr "Редагувати їх зараз."
-#: core/templates/tags/render_day.html:159
+#: core/templates/tags/render_day.html:162
msgid "Add exercises to this workout day"
msgstr "Додати вправи до цього дня тренування"
#: core/templates/tags/render_weight_log.html:17 manager/helpers.py:89
-#: manager/models/setting.py:57 manager/templates/set/formset.html:10
+#: manager/models/setting.py:69 manager/templates/set/formset.html:9
msgid "Reps"
msgstr "Повтори"
-#: 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
+#: core/templates/tags/render_weight_log.html:30 manager/forms.py:189
+#: manager/models/log.py:103 manager/models/setting.py:99
+#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
msgid "RiR"
msgstr "Повторів можете зробити"
@@ -1140,7 +1127,7 @@ msgstr "Умови надання послуг"
msgid "Features"
msgstr "Особливості"
-#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:37
+#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:53
msgid "API key"
msgstr "Ключ API"
@@ -1154,8 +1141,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"
"як вправи або інгредієнти, вам не потрібно нічого надавати). Ви повинні "
@@ -1187,11 +1174,12 @@ msgid "Documentation"
msgstr "Документація"
#: core/templates/user/delete_account.html:4
-#: core/templates/user/preferences.html:42
+#: core/templates/user/preferences.html:58
msgid "Delete account"
msgstr "Видалити обліковий запис"
#: core/templates/user/delete_account.html:17
+#: exercises/templates/history/overview.html:93
msgid "Are you sure?"
msgstr "Ви впевнені?"
@@ -1240,11 +1228,12 @@ 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/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
+#: exercises/models/base.py:99 exercises/models/base.py:104
+#: exercises/models/exercise.py:69 exercises/models/exercise.py:76
+#: gallery/models/image.py:47 manager/helpers.py:88 manager/models/log.py:100
+#: 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/views.py:150
@@ -1252,11 +1241,11 @@ msgid "Date"
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: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
+#: exercises/models/exercise.py:57 exercises/views/exercises.py:123
+#: 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 "Опис"
@@ -1264,12 +1253,12 @@ msgstr "Опис"
msgid "Number of logs (days)"
msgstr "Кількість записів (днів)"
-#: core/templates/user/overview.html:37 core/views/user.py:576
+#: core/templates/user/overview.html:37 core/views/user.py:592
#: 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:267
+#: core/templates/user/overview.html:68 manager/forms.py:278
#: manager/templates/workout/view.html:151
msgid "Log"
msgstr "Журнал"
@@ -1287,6 +1276,7 @@ msgid "Notes"
msgstr "Примітки"
#: core/templates/user/overview.html:79
+#: exercises/templates/history/overview.html:30
#: manager/templates/calendar/partial_overview_table.html:42
#: nutrition/templates/log/detail.html:154
msgid "Time"
@@ -1334,10 +1324,12 @@ msgid "Do you really want to change this user&#39;s password?"
msgstr "Ви дійсно бажаєте змінити пароль цього користувача?"
#: core/templates/user/overview.html:233
+#: exercises/templates/history/overview.html:106
msgid "No"
msgstr "Ні"
#: core/templates/user/overview.html:234
+#: exercises/templates/history/overview.html:99
msgid "Yes"
msgstr "Так"
@@ -1392,10 +1384,15 @@ msgid "Documents"
msgstr "Документи"
#: core/templates/user/overview.html:413 gym/templates/document/list.html:32
-#: manager/forms.py:279 manager/templates/workout/view.html:176
+#: manager/forms.py:290 manager/templates/workout/view.html:176
msgid "Download"
msgstr "Завантажити"
+#: core/templates/user/overview.html:451 gym/views/admin_config.py:44
+#: gym/views/admin_config.py:58 gym/views/user_config.py:46
+msgid "Configuration"
+msgstr "Конфігурація"
+
#: core/templates/user/overview.html:454 gym/models/user_config.py:92
msgid "Include in inactive overview"
msgstr "Включити в огляд неактивних"
@@ -1413,7 +1410,25 @@ msgstr "Увійти як цей користувач"
msgid "Preferences"
msgstr "Налаштування"
-#: core/templates/user/preferences.html:33 core/views/user.py:587
+#: core/templates/user/preferences.html:19
+#, fuzzy
+#| msgid "Send emails"
+msgid "Verified email"
+msgstr "Надсилати електронні листи"
+
+#: core/templates/user/preferences.html:24
+msgid "Unverified email"
+msgstr ""
+
+#: core/templates/user/preferences.html:26
+msgid "Send verification email"
+msgstr ""
+
+#: core/templates/user/preferences.html:30
+msgid "You need to verify your email to contribute exercises"
+msgstr ""
+
+#: core/templates/user/preferences.html:49 core/views/user.py:603
msgid "Change password"
msgstr "Змінити пароль"
@@ -1443,39 +1458,37 @@ msgid "oz"
msgstr "унцій"
#: 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
+#: exercises/views/equipment.py:104 exercises/views/exercises.py:185
+#: exercises/views/muscles.py:99 manager/views/schedule.py:311
+#: manager/views/schedule_step.py:129 manager/views/workout.py:269
+#: manager/views/workout_session.py:141 nutrition/views/ingredient.py:138
#: 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:431
-#: exercises/views/muscles.py:125 gallery/views/images.py:121
+#: exercises/views/categories.py:127 exercises/views/exercises.py:193
+#: exercises/views/muscles.py:106 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
+#: manager/views/workout.py:273 manager/views/workout_session.py:156
+#: nutrition/views/ingredient.py:145 nutrition/views/plan.py:127
#: nutrition/views/unit.py:118
#, python-brace-format
msgid "Delete {0}?"
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/repetition_units.py:85 core/views/user.py:472
#: 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: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
+#: exercises/views/equipment.py:81 exercises/views/muscles.py:86
+#: 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:170
+#: gym/views/gym.py:459 manager/views/day.py:100 manager/views/schedule.py:335
+#: manager/views/workout.py:287 nutrition/views/ingredient.py:164
+#: nutrition/views/plan.py:144 nutrition/views/unit.py:144
#, python-brace-format
msgid "Edit {0}"
msgstr "Змінити {0}"
@@ -1506,64 +1519,65 @@ msgstr "Надіслати"
msgid "Your feedback was successfully sent. Thank you!"
msgstr "Ваш відгук успішно надіслано. Дякуємо!"
-#: core/views/user.py:156
+#: core/views/user.py:157
#, python-brace-format
msgid "Account \"{0}\" was successfully deleted"
msgstr "Обліковий запис \"{0}\" успішно видалено"
-#: core/views/user.py:287
+#: core/views/user.py:294
msgid "You were successfully registered"
msgstr "Ви успішно зареєстровані"
-#: core/views/user.py:339
+#: core/views/user.py:355
msgid "Settings successfully updated"
msgstr "Налаштування успішно оновлено"
-#: core/views/user.py:376
+#: core/views/user.py:392
msgid "The user was successfully deactivated"
msgstr "Користувач був успішно деактивований"
-#: core/views/user.py:411
+#: core/views/user.py:427
msgid "The user was successfully activated"
msgstr "Користувач успішно активований"
-#: core/views/user.py:426
+#: core/views/user.py:442
msgid "Edit user"
msgstr "Редагувати користувача"
-#: core/views/user.py:573 gym/templates/gym/member_list.html:26
+#: core/views/user.py:589 gym/templates/gym/member_list.html:26
#: gym/views/gym.py:156
msgid "ID"
msgstr "ID"
-#: core/views/user.py:574 gym/forms.py:94 gym/templates/contract/view.html:55
+#: core/views/user.py:590 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:577 gym/templates/gym/new_user.html:34
+#: core/views/user.py:593 gym/templates/gym/new_user.html:34
#: gym/views/export.py:60 gym/views/gym.py:218
msgid "Gym"
msgstr "Тренажерний зал"
-#: exercises/models/base.py:51 exercises/templates/exercise/view.html:76
-#: nutrition/models/ingredient.py:204
+#: core/views/user.py:652
+#, python-format
+msgid "A verification email was sent to %(email)s"
+msgstr ""
+
+#: exercises/models/base.py:63 nutrition/models/ingredient.py:204
msgid "Category"
msgstr "Категорія"
-#: exercises/models/base.py:58
+#: exercises/models/base.py:70
msgid "Primary muscles"
msgstr "Основні м'язи"
-#: exercises/models/base.py:64 exercises/templates/equipment/overview.html:71
-#: exercises/templates/exercise/overview.html:76
-#: exercises/templates/exercise/view.html:268
-#: exercises/templates/muscles/overview.html:77
+#: exercises/models/base.py:76
msgid "Secondary muscles"
msgstr "Другорядні м'язи"
-#: exercises/models/base.py:79
+#: exercises/models/base.py:91
msgid "Variations"
msgstr "Варіації"
@@ -1571,71 +1585,58 @@ msgstr "Варіації"
msgid "Exercise Categories"
msgstr "Категорії вправ"
-#: exercises/models/comment.py:34 exercises/models/exercise_alias.py:32
-#: exercises/models/image.py:75 exercises/models/video.py:82
-#: manager/forms.py:165 manager/helpers.py:89 manager/models/log.py:51
+#: exercises/models/comment.py:37 exercises/models/exercise_alias.py:35
+#: exercises/models/image.py:71 exercises/models/video.py:95
+#: manager/forms.py:176 manager/helpers.py:89 manager/models/log.py:52
msgid "Exercise"
msgstr "Вправа"
-#: exercises/models/comment.py:41
+#: exercises/models/comment.py:43
msgid "A comment about how to correctly do this exercise."
msgstr "Коментар про те, як правильно виконувати цю вправу."
-#: exercises/models/exercise.py:86 nutrition/models/ingredient.py:80
+#: exercises/models/exercise.py:81 nutrition/models/ingredient.py:80
#: nutrition/models/plan.py:61 nutrition/models/weight_unit.py:32
msgid "Language"
msgstr "Мова"
-#: exercises/models/exercise.py:237 exercises/views/exercises.py:461
-msgid "Exercise was successfully added to the general database"
-msgstr "Вправу успішно додано до загальної бази даних"
-
-#: exercises/models/exercise.py:265
-msgid "New user submitted exercise"
-msgstr "Нова вправа надіслана користувачем"
-
-#: exercises/models/exercise.py:267
-#, python-brace-format
-msgid "The user {0} submitted a new exercise \"{1}\"."
-msgstr "Користувач {0} подав нову вправу \"{1}\"."
-
-#: exercises/models/exercise_alias.py:35
+#: exercises/models/exercise_alias.py:38
msgid "Alias for an exercise"
msgstr "Псевдонім вправи"
-#: exercises/models/image.py:59
+#: exercises/models/image.py:55
msgid "Line"
msgstr "Лінія"
-#: exercises/models/image.py:60
+#: exercises/models/image.py:56
msgid "3D"
msgstr "3D"
-#: exercises/models/image.py:61
+#: exercises/models/image.py:57
msgid "Low-poly"
msgstr "Малополігональний"
-#: exercises/models/image.py:62
+#: exercises/models/image.py:58
msgid "Photo"
msgstr "Знімок"
-#: exercises/models/image.py:63
+#: exercises/models/image.py:59
msgid "Other"
msgstr "Інше"
-#: exercises/models/image.py:81 gallery/models/image.py:56
+#: exercises/models/image.py:77 gallery/models/image.py:56
msgid "Image"
msgstr "Зображення"
-#: exercises/models/image.py:82 gallery/models/image.py:57
+#: exercises/models/image.py:78 gallery/models/image.py:57
msgid "Only PNG and JPEG formats are supported"
msgstr "Підтримуються лише формати PNG і JPEG"
-#: exercises/models/image.py:88
+#: exercises/models/image.py:84
msgid "Main picture"
msgstr "Головне зображення"
-#: exercises/models/image.py:91
+#: exercises/models/image.py:87
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 "
@@ -1645,19 +1646,10 @@ msgstr ""
"вправи (буде показано, наприклад, у пошуку). Перше зображення автоматично "
"позначається системою."
-#: exercises/models/image.py:100
+#: exercises/models/image.py:96
msgid "The art style of your image"
msgstr "Художній стиль вашого зображення"
-#: exercises/models/image.py:185
-msgid "New user submitted image"
-msgstr "Нове зображення надіслане користувачем"
-
-#: exercises/models/image.py:186
-#, python-brace-format
-msgid "The user {0} submitted a new image \"{1}\" for exercise {2}."
-msgstr "Користувач {0} подав нове зображення \"{1}\" для вправи {2}."
-
#: exercises/models/muscle.py:37
msgid "In latin, e.g. \"Pectoralis major\""
msgstr "На латині, напр. \"Pectoralis major\""
@@ -1670,47 +1662,49 @@ msgstr "Альтернативна назва"
msgid "A more basic name for the muscle"
msgstr "Більш основна назва м'язів"
-#: exercises/models/video.py:41
-msgid "Maximum file size is 100MB."
+#: exercises/models/video.py:50
+#, fuzzy, python-format
+#| msgid "Maximum file size is 100MB."
+msgid "Maximum file size is %(size)sMB."
msgstr "Максимальний розмір файлу - 100 МБ."
-#: exercises/models/video.py:44 exercises/models/video.py:48
+#: exercises/models/video.py:57 exercises/models/video.py:65
msgid "File type is not supported"
msgstr "Тип файлу не підтримується"
-#: exercises/models/video.py:57
+#: exercises/models/video.py:70
msgid "File is not a valid video"
msgstr "Файл не є припустимим відеофайлом"
-#: exercises/models/video.py:88
+#: exercises/models/video.py:101
msgid "Main video"
msgstr "Головне відео"
-#: exercises/models/video.py:94
+#: exercises/models/video.py:107
msgid "Video"
msgstr "Відео"
-#: exercises/models/video.py:101
+#: exercises/models/video.py:114
msgid "Size"
msgstr "Розмір"
-#: exercises/models/video.py:108 manager/models/schedule_step.py:56
+#: exercises/models/video.py:121 manager/models/schedule_step.py:56
msgid "Duration"
msgstr "Тривалість"
-#: exercises/models/video.py:117
+#: exercises/models/video.py:130
msgid "Width"
msgstr "Ширина"
-#: exercises/models/video.py:124
+#: exercises/models/video.py:137
msgid "Height"
msgstr "Висота"
-#: exercises/models/video.py:131
+#: exercises/models/video.py:144
msgid "Codec"
msgstr "Кодек"
-#: exercises/models/video.py:139
+#: exercises/models/video.py:152
msgid "Codec, long name"
msgstr "Кодек, довга назва"
@@ -1719,138 +1713,23 @@ msgid "Equipment list"
msgstr "Список обладнання"
#: exercises/templates/equipment/admin-overview.html:37
-#: exercises/views/equipment.py:94
+#: exercises/views/equipment.py:92
msgid "Add new equipment"
msgstr "Додайте нове обладнання"
-#: exercises/templates/equipment/overview.html:11
-msgid "Equipment overview"
-msgstr "Огляд обладнання"
-
-#: exercises/templates/equipment/overview.html:69
-#: exercises/templates/exercise/overview.html:74
-#: exercises/templates/exercise/view.html:264
-#: exercises/templates/muscles/overview.html:75
-msgid "Main muscles"
-msgstr "Основні м'язи"
-
-#: exercises/templates/equipment/overview.html:79
-msgid ""
-"No exercises for this equipment. Add or edit an exercise and set the "
-"equipment."
-msgstr ""
-"Немає вправ для цього обладнання. Додайте або відредагуйте вправу та "
-"встановіть обладнання."
-
-#: exercises/templates/equipment/overview.html:96
-#: exercises/templates/exercise/overview.html:99
-#: nutrition/templates/ingredient/overview.html:57
-msgid "Search"
-msgstr "Пошук"
-
-#: exercises/templates/equipment/overview.html:101
-#: exercises/templates/exercise/overview.html:104
-msgid "exercise name"
-msgstr "назва вправи"
-
-#: exercises/templates/equipment/overview.html:115
-#: exercises/templates/exercise/overview.html:118
-#: exercises/templates/muscles/overview.html:118
-#: nutrition/templates/ingredient/overview.html:85
-msgid "Only registered users can do this"
-msgstr "Це можуть робити лише зареєстровані користувачі"
-
-#: exercises/templates/exercise/email_new.tpl:1
-#, python-format
-msgid ""
-"Your exercise '%(exercise)s' was successfully added to the general\n"
-"database."
-msgstr ""
-"Ваша вправа '%(exercise)s' була успішно додана до загальної\n"
-"бази даних."
-
-#: exercises/templates/exercise/email_new.tpl:4
-msgid ""
-"It is now available on the exercise and muscle overview and can be\n"
-"added to workouts. You can access it on this address:"
-msgstr ""
-"Це тепер доступно в огляді вправ і м'язів і може бути додано до тренувань.\n"
-"Ви можете отримати доступ до нього за цією адресою:"
-
-#: exercises/templates/exercise/email_new.tpl:8
-#: nutrition/templates/ingredient/email_new.tpl:8
-msgid "Thank you for contributing and making this site better!"
-msgstr "Дякуємо, що зробили цей сайт кращим!"
-
-#: exercises/templates/exercise/email_new.tpl:9
-#: manager/templates/workout/email_reminder.tpl:15
-#: manager/templates/workout/email_weight_reminder.tpl:12
-#: nutrition/templates/ingredient/email_new.tpl:9
-#, python-format
-msgid "The %(site)s team"
-msgstr "Команда %(site)s"
-
-#: exercises/templates/exercise/form.html:4
-msgid "Submitting an exercise"
-msgstr "Відправка вправи"
-
-#: exercises/templates/exercise/form.html:5
-msgid ""
-"Thank you for submitting an exercise. This is much\n"
-"appreciated!"
-msgstr ""
-"Дякуємо за подану вправу. Ми вам дуже\n"
-"вдячні!"
-
-#: exercises/templates/exercise/form.html:8
-msgid ""
-"After you submit the form, the administrators will be notified.\n"
-"Once it is reviewed, it will be added to the database. Till this happens,\n"
-"it will not be visible in the overview or the search. In case you added your "
-"email\n"
-"when you registered, you will get notified when the process is completed "
-"successfully."
-msgstr ""
-"Після того, як ви надішлете форму, адміністратори отримають сповіщення. \n"
-"Після перегляду вона буде додана до бази даних. \n"
-"Доки це не станеться, її не буде видно в огляді або в пошуку. \n"
-"Якщо ви додали електронну пошту при реєстрації, ви отримаєте сповіщення про "
-"успішне завершення процесу."
-
-#: exercises/templates/exercise/form_correct.html:4
-msgid "Correcting an exercise"
-msgstr "Виправлення вправи"
-
-#: exercises/templates/exercise/form_correct.html:5
-msgid ""
-"Thank you for correcting and improving this exercise.\n"
-"This is much appreciated!"
-msgstr ""
-"Дякуємо за виправлення та покращення цієї вправи.\n"
-"Це дуже цінується!"
-
-#: exercises/templates/exercise/form_correct.html:8
-msgid ""
-"After you submit the form, the administrators will be notified.\n"
-"Once the changes are reviewed the exercise will be updated."
-msgstr ""
-"Після надсилання форми, адміністратори отримають сповіщення.\n"
-"Після перегляду змін вправу буде оновлено."
-
-#: exercises/templates/exercise/overview.html:88
-msgid "No categories."
-msgstr "Немає категорій."
-
-#: exercises/templates/exercise/overview.html:88
-msgid "Use link to create one"
-msgstr "Використовуйте посилання, щоб створити "
+#: exercises/templates/history/overview.html:11
+#, fuzzy
+#| msgid "Exercise day"
+msgid "Exercise admin history"
+msgstr "День тренування"
-#: exercises/templates/exercise/pending.html:14
-#: nutrition/templates/ingredient/pending.html:14
-msgid "Submission date"
-msgstr "Дата подання"
+#: exercises/templates/history/overview.html:27
+#, fuzzy
+#| msgid "Actions"
+msgid "Action"
+msgstr "Дії"
-#: exercises/templates/exercise/pending.html:16 gallery/models/image.py:51
+#: exercises/templates/history/overview.html:28 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/log.py:45
@@ -1861,101 +1740,47 @@ msgstr "Дата подання"
msgid "User"
msgstr "Користувач"
-#: exercises/templates/exercise/view.html:48
-msgid "Exercise is pending review"
-msgstr "Вправа очікує на розгляд"
-
-#: exercises/templates/exercise/view.html:51
-msgid ""
-"This user submitted exercise is pending a decision to be\n"
-" included in the database."
-msgstr ""
-"Ця вправа, що була подана користувачем, очікує на прийняття\n"
-"рішення  включення її до бази даних."
-
-#: exercises/templates/exercise/view.html:53
-msgid "Till then, it will not be shown in the overview or the search."
-msgstr "До цього часу вона не відображатиметься в огляді чи пошуку."
-
-#: exercises/templates/exercise/view.html:54
-#: nutrition/templates/ingredient/view.html:31
-msgid "Please select one of the options below."
-msgstr "Виберіть один із наведених нижче варіантів."
-
-#: exercises/templates/exercise/view.html:60
-#: 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:204
-#: nutrition/templates/ingredient/view.html:42
-msgid "Decline"
-msgstr "Відхилити"
-
-#: exercises/templates/exercise/view.html:96
-msgid "Images"
-msgstr "Зображення"
-
-#: exercises/templates/exercise/view.html:137 exercises/views/images.py:93
-msgid "Add new image"
-msgstr "Додати нове зображення"
-
-#: 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:218
-msgid "Comments for this exercise"
-msgstr "Коментарі до цієї вправи"
+#: exercises/templates/history/overview.html:29
+#, fuzzy
+#| msgctxt "As in \"email subject\""
+#| msgid "Subject"
+msgid "Object"
+msgstr "Тема"
-#: exercises/templates/exercise/view.html:246
-msgid "Add new comment"
-msgstr "Додати новий коментар"
+#: exercises/templates/history/overview.html:31
+#, fuzzy
+#| msgctxt "Noun, not verb"
+#| msgid "Change"
+msgid "Changes"
+msgstr "Змінити"
-#: exercises/templates/exercise/view.html:260
-msgid "The diagram shows the most used muscles on this exercise"
-msgstr "Ця діаграма показує найбільш використовувані м'язи у цій вправі"
+#: exercises/templates/history/overview.html:32
+msgid "Revert"
+msgstr ""
-#: exercises/templates/exercise/view.html:301
-#: manager/templates/workout/log.html:10 manager/templates/workout/log.html:11
-msgid "Weight log"
-msgstr "Журнал ваги"
+#: exercises/templates/history/overview.html:64
+msgid "View Object"
+msgstr ""
-#: exercises/templates/exercise/view.html:306
-msgid "Exercise Variations"
-msgstr "Варіації вправ"
+#: exercises/templates/history/overview.html:75
+#, fuzzy
+#| msgid "View logs"
+msgid "View changes"
+msgstr "Перегляд журналів"
-#: exercises/templates/exercise/view.html:327
-msgid "Submit a correction"
-msgstr "Надіслати виправлення"
+#: exercises/templates/history/overview.html:86
+msgid "Revert changes"
+msgstr ""
#: exercises/templates/muscles/admin-overview.html:4
-#: exercises/templates/muscles/overview.html:7
msgid "Muscle overview"
msgstr "Огляд м'язів"
#: exercises/templates/muscles/admin-overview.html:36
-#: exercises/views/muscles.py:86
+#: exercises/views/muscles.py:67
msgid "Add muscle"
msgstr "Додати м'язи"
-#: exercises/templates/muscles/overview.html:85
-msgid ""
-"No exercises for this muscle. Add or edit an exercise and set the muscle."
-msgstr ""
-"Ніяких вправ для цього м’яза. Додайте або відредагуйте вправу і встановіть "
-"м’язи."
-
#: exercises/views/categories.py:71
msgid "Add category"
msgstr "Додати категорію"
@@ -1968,50 +1793,22 @@ msgstr "Також буде видалено всі вправи цієї кат
msgid "Add exercise comment"
msgstr "Додати коментар до вправ"
-#: exercises/views/equipment.py:107 exercises/views/equipment.py:118
+#: exercises/views/equipment.py:105 exercises/views/equipment.py:116
msgid "Delete equipment?"
msgstr "Видалити обладнання?"
-#: exercises/views/exercises.py:229
-#, python-format
-msgid ""
-"%(name_original)s is too similar to existing exercise \"%(exercise_name)s\""
+#: exercises/views/exercises.py:161
+#, fuzzy, python-format
+#| msgid ""
+#| "%(name_original)s is too similar to existing exercise "
+#| "\"%(exercise_name)s\""
+msgid "%(name)s is too similar to existing exercise \"%(exercise_name)s\""
msgstr "%(name_original)s занадто схоже на наявну вправу \"%(exercise_name)s\""
-#: exercises/views/exercises.py:247
-msgid "Add exercise"
-msgstr "Додати вправу"
-
-#: exercises/views/exercises.py:367
-msgid "Thank you. Once the changes are reviewed the exercise will be updated."
-msgstr "Дякуємо. Після перегляду змін вправу буде оновлено."
-
-#: exercises/views/exercises.py:380
-#, python-brace-format
-msgid "Correct {0}"
-msgstr "Виправити {0}"
-
-#: exercises/views/exercises.py:422
+#: exercises/views/exercises.py:184
msgid "This will delete the exercise from all workouts."
msgstr "Це призведе до видалення вправи з усіх тренувань."
-#: exercises/views/exercises.py:474
-msgid "Exercise was successfully marked as rejected"
-msgstr "Вправу успішно позначено як відхилена"
-
-#: exercises/views/images.py:68
-msgid "Edit exercise image"
-msgstr "Змінити зображення вправи"
-
-#: exercises/views/images.py:143
-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 "Додати зображення"
@@ -2078,7 +1875,7 @@ msgid "Contract type"
msgstr "Тип контракту"
#: gym/models/contract.py:208 gym/templates/contract/view.html:59
-#: manager/templates/log/add.html:52 nutrition/forms.py:59
+#: manager/templates/log/add.html:52 nutrition/forms.py:60
#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:102
#: nutrition/models/meal_item.py:72
msgid "Amount"
@@ -2181,6 +1978,10 @@ msgstr "Якщо нічого не вказано, буде використан
msgid "User notes"
msgstr "Примітки користувача"
+#: gym/templates/contract/list.html:36
+msgid "Show"
+msgstr "Показати"
+
#: gym/templates/contract/view.html:4
msgid "Contract"
msgstr "Контракт"
@@ -2257,13 +2058,9 @@ msgstr "Типи"
msgid "Emails"
msgstr "Електронні листи"
-#: gym/templates/gym/member_list.html:315
-msgid "Add member"
-msgstr "Додати учасника"
-
-#: gym/templates/gym/new_user.html:38
-msgid "Date of Birth"
-msgstr "Дата народження"
+#: gym/templates/gym/member_list.html:315
+msgid "Add member"
+msgstr "Додати учасника"
#: gym/templates/gym/new_user.html:48 manager/templates/calendar/month.html:144
#: manager/templates/log/add.html:75 nutrition/templates/rate/form.html:120
@@ -2326,126 +2123,126 @@ msgstr "Додати користувача до залу"
msgid "Edit gym"
msgstr "Редагувати тренажерний зал"
-#: i18n.tpl:2 i18n.tpl:28
+#: i18n.tpl:2
+msgid "Until Failure"
+msgstr "До відмови"
+
+#: i18n.tpl:3 manager/forms.py:180 manager/models/log.py:73
+#: manager/templates/set/add.html:53
+msgid "Repetitions"
+msgstr "Повтори"
+
+#: i18n.tpl:4
msgid "Abs"
msgstr "Прес"
-#: i18n.tpl:3
+#: i18n.tpl:5
msgid "Arms"
msgstr "Руки"
-#: i18n.tpl:4
-msgid "Back"
-msgstr "Спина"
-
-#: i18n.tpl:5 i18n.tpl:23
-msgid "Calves"
-msgstr "Литки"
-
-#: i18n.tpl:6 i18n.tpl:26
-msgid "Chest"
-msgstr "Груди"
-
-#: i18n.tpl:7
+#: i18n.tpl:6
msgid "Legs"
msgstr "Ноги"
-#: i18n.tpl:8 i18n.tpl:19
-msgid "Shoulders"
-msgstr "Плечі"
+#: i18n.tpl:7
+msgid "Dumbbell"
+msgstr "Гантелі"
+
+#: i18n.tpl:8
+msgid "Biceps"
+msgstr "Біцепс"
#: i18n.tpl:9
-msgid "Barbell"
-msgstr "Штанга"
+msgid "SZ-Bar"
+msgstr "SZ-Штанга"
#: i18n.tpl:10
-msgid "Bench"
-msgstr "Лавка"
+msgid "Kettlebell"
+msgstr "Гирі"
#: i18n.tpl:11
-msgid "Dumbbell"
-msgstr "Гантелі"
+msgid "Swiss Ball"
+msgstr "Фітбол"
#: i18n.tpl:12
-msgid "Gym mat"
-msgstr "Мат"
+msgid "none (bodyweight exercise)"
+msgstr "немає (вправа з вагою тіла)"
#: i18n.tpl:13
-msgid "Incline bench"
-msgstr "Лавка похила"
+msgid "Calves"
+msgstr "Литки"
#: i18n.tpl:14
-msgid "Kettlebell"
-msgstr "Гирі"
+msgid "Back"
+msgstr "Спина"
#: i18n.tpl:15
-msgid "Pull-up bar"
-msgstr "Перекладина"
+msgid "Lower back"
+msgstr "Нижня частина спини"
#: i18n.tpl:16
-msgid "SZ-Bar"
-msgstr "SZ-Штанга"
+msgid "Lats"
+msgstr "Найширші м'язи спини"
#: i18n.tpl:17
-msgid "Swiss Ball"
-msgstr "Фітбол"
+msgid "Hamstrings"
+msgstr "Підколінні сухожилля"
#: i18n.tpl:18
-msgid "none (bodyweight exercise)"
-msgstr "немає (вправа з вагою тіла)"
+msgid "Bench"
+msgstr "Лавка"
+
+#: i18n.tpl:19
+msgid "Glutes"
+msgstr "Сідниці"
#: i18n.tpl:20
-msgid "Biceps"
-msgstr "Біцепс"
+msgid "Kilometers"
+msgstr "Кілометри"
#: i18n.tpl:21
-msgid "Hamstrings"
-msgstr "Підколінні сухожилля"
+msgid "Shoulders"
+msgstr "Плечі"
#: i18n.tpl:22
-msgid "Lower back"
-msgstr "Нижня частина спини"
+msgid "Seconds"
+msgstr "Секунди"
+
+#: i18n.tpl:23
+msgid "Miles"
+msgstr "Милі"
#: i18n.tpl:24
-msgid "Glutes"
-msgstr "Сідниці"
+msgid "Incline bench"
+msgstr "Лавка похила"
#: i18n.tpl:25
-msgid "Lats"
-msgstr "Найширші м'язи спини"
-
-#: i18n.tpl:27
msgid "Quads"
msgstr "Чотириголові м'язи стегн"
-#: i18n.tpl:29
-msgid "Triceps"
-msgstr "Трицепси"
-
-#: i18n.tpl:30
-msgid "Kilometers"
-msgstr "Кілометри"
-
-#: i18n.tpl:31
-msgid "Miles"
-msgstr "Милі"
-
-#: i18n.tpl:32
+#: i18n.tpl:26
msgid "Minutes"
msgstr "Хвилини"
-#: i18n.tpl:33 manager/forms.py:169 manager/models/log.py:71
-#: manager/templates/set/add.html:53
-msgid "Repetitions"
-msgstr "Повтори"
+#: i18n.tpl:27
+msgid "Chest"
+msgstr "Груди"
-#: i18n.tpl:34
-msgid "Seconds"
-msgstr "Секунди"
+#: i18n.tpl:28
+msgid "Gym mat"
+msgstr "Мат"
-#: i18n.tpl:35
-msgid "Until Failure"
-msgstr "До відмови"
+#: i18n.tpl:29
+msgid "Pull-up bar"
+msgstr "Перекладина"
+
+#: i18n.tpl:30
+msgid "Barbell"
+msgstr "Штанга"
+
+#: i18n.tpl:31
+msgid "Triceps"
+msgstr "Трицепси"
#: mailer/forms.py:34 mailer/templates/mailer/gym/preview.html:32
msgctxt "As in \"email subject\""
@@ -2500,11 +2297,11 @@ msgstr "Надсилати електронні листи"
msgid "Correction"
msgstr "Виправлення"
-#: manager/forms.py:89 manager/models/workout.py:59
+#: manager/forms.py:92 manager/models/workout.py:59
msgid "The name of the workout"
msgstr "Назва тренування"
-#: manager/forms.py:93 manager/models/workout.py:66
+#: manager/forms.py:96 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'."
@@ -2512,35 +2309,35 @@ msgstr ""
"Короткий опис цілі тренування. Наприклад, 'Робота над спиною' або 'Тиждень 1 "
"програми xy'."
-#: manager/forms.py:126
+#: manager/forms.py:137
msgid ""
"You can search for more than one exercise, they will be grouped together for "
"a superset."
msgstr ""
"Ви можете шукати більше ніж одну вправу, вони будуть згруповані в суперсет."
-#: 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
+#: manager/forms.py:166 manager/forms.py:171 manager/models/log.py:64
+#: manager/models/log.py:92 manager/models/setting.py:59
+#: manager/models/setting.py:90 manager/templates/log/add.html:53
+#: manager/templates/log/add.html:55 manager/templates/set/formset.html:10
+#: manager/templates/set/formset.html:12 measurements/models/category.py:58
+#: nutrition/forms.py:64
msgid "Unit"
msgstr "Одиниця"
-#: manager/forms.py:266
+#: manager/forms.py:277
msgid "Type"
msgstr "Тип"
-#: manager/forms.py:267 manager/templates/workout/view.html:157
+#: manager/forms.py:278 manager/templates/workout/view.html:157
msgid "Table"
msgstr "Таблиця"
-#: manager/forms.py:269 manager/templates/workout/view.html:163
+#: manager/forms.py:280 manager/templates/workout/view.html:163
msgid "with images"
msgstr "із зображеннями"
-#: manager/forms.py:270 manager/templates/workout/view.html:169
+#: manager/forms.py:281 manager/templates/workout/view.html:169
msgid "with comments"
msgstr "з коментарями"
@@ -2599,7 +2396,7 @@ msgid "The duration in weeks"
msgstr "Тривалість в тижнях"
#: manager/models/schedule_step.py:63 manager/models/set.py:52
-#: manager/models/setting.py:98 nutrition/models/meal.py:54
+#: manager/models/setting.py:110 nutrition/models/meal.py:54
#: nutrition/models/meal_item.py:65
msgid "Order"
msgstr "Порядок"
@@ -2650,7 +2447,7 @@ msgstr "День тренування"
msgid "Number of sets"
msgstr "Кількість підходів"
-#: manager/models/setting.py:43
+#: manager/models/setting.py:48
msgid "Sets"
msgstr "Підходи"
@@ -2952,6 +2749,13 @@ msgstr ""
"Якщо Ви не хочете отримувати нагадування електронною поштою,\n"
"деактивуйте цю опцію у ваших налаштуваннях."
+#: manager/templates/workout/email_reminder.tpl:15
+#: manager/templates/workout/email_weight_reminder.tpl:12
+#: nutrition/templates/ingredient/email_new.tpl:9
+#, python-format
+msgid "The %(site)s team"
+msgstr "Команда %(site)s"
+
#: manager/templates/workout/email_weight_reminder.tpl:3
#, python-format
msgid ""
@@ -2968,6 +2772,10 @@ msgstr ""
"Ви будете регулярно отримувати такі нагадування, поки не введете поточну "
"вагу."
+#: manager/templates/workout/log.html:10 manager/templates/workout/log.html:11
+msgid "Weight log"
+msgstr "Журнал ваги"
+
#: manager/templates/workout/log.html:29
msgid "Weight log for workout"
msgstr "Журнал ваги для тренування"
@@ -3074,7 +2882,7 @@ msgstr "Перегляд журналів"
msgid "Edit workout"
msgstr "Змінити тренування"
-#: manager/templates/workout/view.html:225 manager/views/workout.py:300
+#: manager/templates/workout/view.html:225 manager/views/workout.py:301
msgid "Mark as template"
msgstr "Позначити як шаблон"
@@ -3082,11 +2890,6 @@ msgstr "Позначити як шаблон"
msgid "Add workout day"
msgstr "Додати день тренування"
-#: manager/views/log.py:92
-#, python-format
-msgid "Edit log entry for %s"
-msgstr "Змінити запис журналу для %s"
-
#: manager/views/log.py:111
msgid "Delete workout log"
msgstr "Видалити журнал тренування"
@@ -3104,11 +2907,11 @@ msgstr "Створити програму"
msgid "Your workouts"
msgstr "Ваші тренування"
-#: manager/views/workout.py:227
+#: manager/views/workout.py:228
msgid "Copy workout"
msgstr "Копіювати тренування"
-#: manager/views/workout.py:230
+#: manager/views/workout.py:231
msgid "Copy"
msgstr "Копіювати"
@@ -3130,23 +2933,23 @@ msgstr "Також буде видалено всі записи ваги для
msgid "Value"
msgstr "Значення"
-#: nutrition/forms.py:122
+#: nutrition/forms.py:123
msgid "Calculate"
msgstr "Обчислити"
-#: nutrition/forms.py:195 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:196 nutrition/templates/rate/form.html:76
msgid "Basic caloric intake"
msgstr "Основне споживання калорій"
-#: nutrition/forms.py:196
+#: nutrition/forms.py:197
msgid "Your basic caloric intake as calculated for your data"
msgstr "Ваше основне споживання калорій, розраховане для ваших даних"
-#: nutrition/forms.py:202
+#: nutrition/forms.py:203
msgid "Additional calories"
msgstr "Додаткові калорії"
-#: nutrition/forms.py:204
+#: nutrition/forms.py:205
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
@@ -3154,7 +2957,7 @@ msgstr ""
"Додаткові калорії для додавання до базової ставки (для віднімання, введіть "
"від'ємне число)"
-#: nutrition/forms.py:232 nutrition/models/ingredient_weight_unit.py:39
+#: nutrition/forms.py:233 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"
@@ -3220,7 +3023,7 @@ msgstr ""
"забезпечують білки, вуглеводи та жири ({energy_calculated} ккал +/- "
"{energy_approx}%)"
-#: nutrition/models/ingredient.py:357 nutrition/views/ingredient.py:225
+#: nutrition/models/ingredient.py:357 nutrition/views/ingredient.py:219
msgid "Ingredient was successfully added to the general database"
msgstr "Інгредієнт успішно додано до загальної бази даних"
@@ -3249,6 +3052,12 @@ msgstr "Одиниця кількісті, напр. \"1 чашка\" або \"1
msgid "Meal"
msgstr "Приймання їжі"
+#: nutrition/models/log.py:65
+#, fuzzy
+#| msgid "Time (approx)"
+msgid "Date and Time (Approx.)"
+msgstr "Час (приблизно)"
+
#: nutrition/models/meal.py:61
msgid "Time (approx)"
msgstr "Час (приблизно)"
@@ -3354,6 +3163,10 @@ msgstr ""
"харчування.\n"
"Ви можете знайти його за цим посиланням:"
+#: nutrition/templates/ingredient/email_new.tpl:8
+msgid "Thank you for contributing and making this site better!"
+msgstr "Дякуємо, що зробили цей сайт кращим!"
+
#: nutrition/templates/ingredient/form.html:4
msgid "Submitting an ingredient"
msgstr "Подання інгредієнта"
@@ -3385,6 +3198,10 @@ msgstr ""
msgid "No ingredients."
msgstr "Немає інгредієнтів."
+#: nutrition/templates/ingredient/overview.html:57
+msgid "Search"
+msgstr "Пошук"
+
#: nutrition/templates/ingredient/overview.html:66
msgid "ingredient name"
msgstr "назва інгредієнта"
@@ -3394,6 +3211,14 @@ msgstr "назва інгредієнта"
msgid "Add ingredient"
msgstr "Додати інгредієнт"
+#: nutrition/templates/ingredient/overview.html:85
+msgid "Only registered users can do this"
+msgstr "Це можуть робити лише зареєстровані користувачі"
+
+#: nutrition/templates/ingredient/pending.html:14
+msgid "Submission date"
+msgstr "Дата подання"
+
#: nutrition/templates/ingredient/view.html:27
msgid "Ingredient is pending review"
msgstr "Інгредієнт очікує на розгляд"
@@ -3409,6 +3234,18 @@ msgstr ""
"включення до бази даних. До цього часу він не буде показаний в огляді \n"
"або в пошуку."
+#: nutrition/templates/ingredient/view.html:31
+msgid "Please select one of the options below."
+msgstr "Виберіть один із наведених нижче варіантів."
+
+#: nutrition/templates/ingredient/view.html:38
+msgid "Accept"
+msgstr "Прийняти"
+
+#: nutrition/templates/ingredient/view.html:42
+msgid "Decline"
+msgstr "Відхилити"
+
#: nutrition/templates/ingredient/view.html:71
#: nutrition/templates/log/detail.html:31
#: nutrition/templates/plan/view.html:229 nutrition/views/plan.py:376
@@ -3674,14 +3511,18 @@ msgstr ""
"свій план харчування на цих значеннях, поспостерігайте за собою кілька\n"
"тижнів і при необхідності змініть загальну кількість."
-#: nutrition/views/ingredient.py:181
+#: nutrition/views/ingredient.py:175
msgid "Add a new ingredient"
msgstr "Додати новий інгредієнт"
-#: nutrition/views/ingredient.py:238
+#: nutrition/views/ingredient.py:232
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 "Додати новий прийом їжі"
@@ -3942,15 +3783,15 @@ msgstr ""
msgid "100%% Free <br>and <br>Open Source"
msgstr "100%% Безкоштовне <br>і <br>Відкрите програмне забезпечення"
-#: utils/generic_views.py:261
+#: utils/generic_views.py:262
msgid "Yes, delete"
msgstr "Так, вилучити"
-#: utils/models.py:47
+#: utils/models.py:48
msgid "Author"
msgstr "Автор"
-#: utils/models.py:52
+#: utils/models.py:53
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."
@@ -3958,15 +3799,15 @@ msgstr ""
"Якщо ви не є автором, введіть тут ім'я або джерело. Це необхідно для деяких "
"ліцензій, наприклад, CC-BY-SA."
-#: utils/models.py:77
+#: utils/models.py:78
msgid "Pending"
msgstr "В очікуванні"
-#: utils/models.py:78
+#: utils/models.py:79
msgid "Accepted"
msgstr "Прийнято"
-#: utils/models.py:79
+#: utils/models.py:80
msgid "Declined"
msgstr "Відхилено"
@@ -4133,6 +3974,210 @@ msgstr "Успішно видалено."
msgid "Delete weight entry for the %s"
msgstr "Видалити запис ваги для %s"
+#~ msgid "Ingredients"
+#~ msgstr "Інгредієнти"
+
+#~ msgid ""
+#~ "Use the configuration to select in what languages the\n"
+#~ "exercises and ingredients will be shown for the current language (for "
+#~ "example\n"
+#~ "the exercises should be shown in languages A, B and C; the ingredients "
+#~ "only\n"
+#~ "in A)."
+#~ msgstr ""
+#~ "Використовуйте цю конфігурацію щоб вибрати на яких мовах\n"
+#~ "будуть показуватись вправи та інгредієнти для поточної мови (наприклад,\n"
+#~ "вправи повинні бути показані на мовах A, B і C; інгредієнти тільки\n"
+#~ "на A)."
+
+#~ msgctxt "as in sorted by category"
+#~ msgid "by category"
+#~ msgstr "за категоріями"
+
+#~ msgctxt "as in sorted by muscle"
+#~ msgid "by muscle"
+#~ msgstr "за м'язовими групами"
+
+#~ msgctxt "as in sorted by equipment"
+#~ msgid "by equipment"
+#~ msgstr "за інвентарем"
+
+#~ msgid "Add new exercise"
+#~ msgstr "Додати нову вправу"
+
+#~ msgid "Exercises pending review"
+#~ msgstr "Вправи, що очікують на розгляд"
+
+#~ msgid "Exercise was successfully added to the general database"
+#~ msgstr "Вправу успішно додано до загальної бази даних"
+
+#~ msgid "New user submitted exercise"
+#~ msgstr "Нова вправа надіслана користувачем"
+
+#, python-brace-format
+#~ msgid "The user {0} submitted a new exercise \"{1}\"."
+#~ msgstr "Користувач {0} подав нову вправу \"{1}\"."
+
+#~ msgid "New user submitted image"
+#~ msgstr "Нове зображення надіслане користувачем"
+
+#, python-brace-format
+#~ msgid "The user {0} submitted a new image \"{1}\" for exercise {2}."
+#~ msgstr "Користувач {0} подав нове зображення \"{1}\" для вправи {2}."
+
+#~ msgid "Equipment overview"
+#~ msgstr "Огляд обладнання"
+
+#~ msgid "Main muscles"
+#~ msgstr "Основні м'язи"
+
+#~ msgid ""
+#~ "No exercises for this equipment. Add or edit an exercise and set the "
+#~ "equipment."
+#~ msgstr ""
+#~ "Немає вправ для цього обладнання. Додайте або відредагуйте вправу та "
+#~ "встановіть обладнання."
+
+#~ msgid "exercise name"
+#~ msgstr "назва вправи"
+
+#, python-format
+#~ msgid ""
+#~ "Your exercise '%(exercise)s' was successfully added to the general\n"
+#~ "database."
+#~ msgstr ""
+#~ "Ваша вправа '%(exercise)s' була успішно додана до загальної\n"
+#~ "бази даних."
+
+#~ msgid ""
+#~ "It is now available on the exercise and muscle overview and can be\n"
+#~ "added to workouts. You can access it on this address:"
+#~ msgstr ""
+#~ "Це тепер доступно в огляді вправ і м'язів і може бути додано до "
+#~ "тренувань.\n"
+#~ "Ви можете отримати доступ до нього за цією адресою:"
+
+#~ msgid "Submitting an exercise"
+#~ msgstr "Відправка вправи"
+
+#~ msgid ""
+#~ "Thank you for submitting an exercise. This is much\n"
+#~ "appreciated!"
+#~ msgstr ""
+#~ "Дякуємо за подану вправу. Ми вам дуже\n"
+#~ "вдячні!"
+
+#~ msgid ""
+#~ "After you submit the form, the administrators will be notified.\n"
+#~ "Once it is reviewed, it will be added to the database. Till this "
+#~ "happens,\n"
+#~ "it will not be visible in the overview or the search. In case you added "
+#~ "your email\n"
+#~ "when you registered, you will get notified when the process is completed "
+#~ "successfully."
+#~ msgstr ""
+#~ "Після того, як ви надішлете форму, адміністратори отримають сповіщення. \n"
+#~ "Після перегляду вона буде додана до бази даних. \n"
+#~ "Доки це не станеться, її не буде видно в огляді або в пошуку. \n"
+#~ "Якщо ви додали електронну пошту при реєстрації, ви отримаєте сповіщення "
+#~ "про успішне завершення процесу."
+
+#~ msgid "Correcting an exercise"
+#~ msgstr "Виправлення вправи"
+
+#~ msgid ""
+#~ "Thank you for correcting and improving this exercise.\n"
+#~ "This is much appreciated!"
+#~ msgstr ""
+#~ "Дякуємо за виправлення та покращення цієї вправи.\n"
+#~ "Це дуже цінується!"
+
+#~ msgid ""
+#~ "After you submit the form, the administrators will be notified.\n"
+#~ "Once the changes are reviewed the exercise will be updated."
+#~ msgstr ""
+#~ "Після надсилання форми, адміністратори отримають сповіщення.\n"
+#~ "Після перегляду змін вправу буде оновлено."
+
+#~ msgid "No categories."
+#~ msgstr "Немає категорій."
+
+#~ msgid "Use link to create one"
+#~ msgstr "Використовуйте посилання, щоб створити "
+
+#~ msgid "Exercise is pending review"
+#~ msgstr "Вправа очікує на розгляд"
+
+#~ msgid ""
+#~ "This user submitted exercise is pending a decision to be\n"
+#~ " included in the database."
+#~ msgstr ""
+#~ "Ця вправа, що була подана користувачем, очікує на прийняття\n"
+#~ "рішення  включення її до бази даних."
+
+#~ msgid "Till then, it will not be shown in the overview or the search."
+#~ msgstr "До цього часу вона не відображатиметься в огляді чи пошуку."
+
+#~ msgid "Images"
+#~ msgstr "Зображення"
+
+#~ msgid "Add new image"
+#~ msgstr "Додати нове зображення"
+
+#~ msgid "Videos"
+#~ msgstr "Відео"
+
+#~ msgid "Add new video"
+#~ msgstr "Додати нове відео"
+
+#~ msgid "Images pending review"
+#~ msgstr "Зображення очікують на розгляд"
+
+#~ msgid "Comments for this exercise"
+#~ msgstr "Коментарі до цієї вправи"
+
+#~ msgid "Add new comment"
+#~ msgstr "Додати новий коментар"
+
+#~ msgid "The diagram shows the most used muscles on this exercise"
+#~ msgstr "Ця діаграма показує найбільш використовувані м'язи у цій вправі"
+
+#~ msgid "Exercise Variations"
+#~ msgstr "Варіації вправ"
+
+#~ msgid "Submit a correction"
+#~ msgstr "Надіслати виправлення"
+
+#~ msgid ""
+#~ "No exercises for this muscle. Add or edit an exercise and set the muscle."
+#~ msgstr ""
+#~ "Ніяких вправ для цього м’яза. Додайте або відредагуйте вправу і "
+#~ "встановіть м’язи."
+
+#~ msgid "Add exercise"
+#~ msgstr "Додати вправу"
+
+#~ msgid ""
+#~ "Thank you. Once the changes are reviewed the exercise will be updated."
+#~ msgstr "Дякуємо. Після перегляду змін вправу буде оновлено."
+
+#, python-brace-format
+#~ msgid "Correct {0}"
+#~ msgstr "Виправити {0}"
+
+#~ msgid "Exercise was successfully marked as rejected"
+#~ msgstr "Вправу успішно позначено як відхилена"
+
+#~ msgid "Edit exercise image"
+#~ msgstr "Змінити зображення вправи"
+
+#~ msgid "Delete exercise image?"
+#~ msgstr "Видалити зображення вправи?"
+
+#, python-format
+#~ msgid "Edit log entry for %s"
+#~ msgstr "Змінити запис журналу для %s"
+
#~ msgid "Anterior deltoid"
#~ msgstr "Дельтоподібний м'яз"
@@ -4463,10 +4508,6 @@ msgstr "Видалити запис ваги для %s"
#~ msgid "No filter"
#~ msgstr "Без фільтру"
-#~ msgctxt "Noun, not verb"
-#~ msgid "Change"
-#~ msgstr "Змінити"
-
#~ msgid "Days"
#~ msgstr "Дні"
diff --git a/wger/locale/zh_CN/LC_MESSAGES/django.po b/wger/locale/zh_CN/LC_MESSAGES/django.po
index 6df061dcd..014485654 100644
--- a/wger/locale/zh_CN/LC_MESSAGES/django.po
+++ b/wger/locale/zh_CN/LC_MESSAGES/django.po
@@ -14,7 +14,7 @@ msgid ""
msgstr ""
"Project-Id-Version: wger Workout Manager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-14 12:01+0200\n"
+"POT-Creation-Date: 2022-11-10 16:03+0100\n"
"PO-Revision-Date: 2022-08-16 04:15+0000\n"
"Last-Translator: cld4h <[email protected]>\n"
"Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/"
@@ -38,106 +38,8 @@ msgstr ""
"选择默认健身房。所有新注册用户及没有添加健身房的已注册用户会加入此默认健身"
"房。"
-#: 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:226
-msgid "Languages"
-msgstr "语言"
-
-#: config/templates/language/overview.html:16
-msgid "Nothing found."
-msgstr "未找到匹配项。"
-
-#: 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:150
-#: nutrition/templates/plan/view.html:153
-#: nutrition/templates/plan/view.html:191
-msgid "Add one now."
-msgstr "现在就新增一个。"
-
-#: config/templates/language/overview.html:29
-#: core/templates/license/list.html:38 core/templates/misc/license/list.html:41
-#: core/templates/repetition_unit/list.html:41
-#: core/templates/user/overview.html:327 core/templates/user/overview.html:366
-#: core/templates/user/overview.html:402
-#: core/templates/weight_unit/list.html:41 core/views/languages.py:73
-#: core/views/license.py:65 core/views/repetition_units.py:65
-#: core/views/weight_units.py:65
-#: exercises/templates/categories/admin-overview.html:36
-#: 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:61
-msgid "Add"
-msgstr "新增"
-
-#: 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/language.py:32
-msgid "Language full name"
-msgstr "语言全称"
-
-#: config/templates/language/view.html:34 core/templates/user/overview.html:451
-#: gym/views/admin_config.py:44 gym/views/admin_config.py:58
-#: gym/views/user_config.py:46
-msgid "Configuration"
-msgstr "配置"
-
-#: config/templates/language/view.html:35
-msgid ""
-"Use the configuration to select in what languages the\n"
-"exercises and ingredients will be shown for the current language (for "
-"example\n"
-"the exercises should be shown in languages A, B and C; the ingredients only\n"
-"in A)."
-msgstr ""
-"使用这个配置来选择在当前语言环境下,\n"
-"健身项目和食谱应该用什么语言来展示\n"
-"(例如,健身项目应该使用语言A,B,C来展示;而食谱\n"
-"只是用语言A来展示)."
-
-#: config/templates/language/view.html:44 gym/templates/contract/list.html:36
-msgid "Show"
-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: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:45
-msgid "Options"
-msgstr "选项"
-
-#: config/templates/language/view.html:96 config/views/gym_config.py:41
-#: config/views/language_config.py:49 core/templates/license/list.html:16
-#: core/templates/misc/license/list.html:17
+#: config/views/gym_config.py:41 core/templates/language/view.html:57
+#: 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:39
#: core/templates/tags/render_day.html:75 core/templates/user/overview.html:205
@@ -145,12 +47,10 @@ 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:230
-#: exercises/templates/exercise/view.html:351
#: exercises/templates/muscles/admin-overview.html:16
-#: 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
+#: 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
#: 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
@@ -166,81 +66,54 @@ msgstr "选项"
msgid "Edit"
msgstr "编辑"
-#: 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: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: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
-#: gym/templates/contract_type/list.html:39 gym/templates/document/list.html:46
-#: gym/templates/gym/list.html:20 manager/templates/calendar/day.html:69
-#: 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:231
-#: 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:132
-#: nutrition/templates/units/list.html:20
-msgid "Delete"
-msgstr "删除"
-
-#: core/demo.py:86
+#: core/demo.py:95
msgid "Sample workout"
msgstr "健身示例"
-#: core/demo.py:90
+#: core/demo.py:99
msgid "Sample day"
msgstr "示例健身日"
-#: core/demo.py:94
+#: core/demo.py:103
msgid "Another sample day"
msgstr "另一个示例健身日"
-#: core/demo.py:217
-msgid "Sample nutrional plan"
+#: core/demo.py:211
+#, fuzzy
+#| msgid "Sample nutrional plan"
+msgid "Sample nutritional plan"
msgstr "示例营养计划"
-#: core/demo.py:349 core/demo.py:351 core/demo.py:353
+#: core/demo.py:343 core/demo.py:345 core/demo.py:347
#, fuzzy, python-brace-format
msgid "Placeholder workout nr {0} for schedule"
msgstr "健身计划中的占位符{0}"
-#: core/demo.py:358
+#: core/demo.py:352
msgid "My cool workout schedule"
msgstr "我酷酷的健身日程"
-#: core/demo.py:397 core/demo.py:412
+#: core/demo.py:391 core/demo.py:406
msgid "Empty placeholder schedule"
msgstr "空的时间表"
-#: core/forms.py:61 core/templates/navigation.html:188
-#: core/templates/navigation.html:192 core/templates/user/login.html:4
+#: core/forms.py:64 core/templates/navigation.html:179
+#: core/templates/navigation.html:183 core/templates/user/login.html:4
#: software/templates/features.html:43
msgid "Login"
msgstr "登录"
-#: core/forms.py:73 core/forms.py:164 gym/views/export.py:63
+#: core/forms.py:76 core/forms.py:177 gym/views/export.py:63
#: gym/views/gym.py:218
msgid "First name"
msgstr "名字"
-#: core/forms.py:74 core/forms.py:165 core/templates/user/overview.html:267
+#: core/forms.py:77 core/forms.py:178 core/templates/user/overview.html:267
#: gym/views/export.py:64 gym/views/gym.py:218
msgid "Last name"
msgstr "姓氏"
-#: core/forms.py:76 core/forms.py:131 core/templates/user/overview.html:271
+#: core/forms.py:79 core/forms.py:144 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
@@ -250,75 +123,105 @@ msgstr "姓氏"
msgid "Email"
msgstr "邮件"
-#: core/forms.py:77
+#: core/forms.py:80
msgid "Used for password resets and, optionally, e-mail reminders."
msgstr "用来重设密码和邮件提醒,如果你选择了邮件提醒。"
-#: core/forms.py:102
+#: core/forms.py:84 core/models/profile.py:220
+#: gym/templates/gym/new_user.html:38
+msgid "Date of Birth"
+msgstr ""
+
+#: core/forms.py:116
msgid "Personal data"
msgstr "个人数据"
-#: core/forms.py:110
+#: core/forms.py:124
msgid "Workout reminders"
msgstr "健身提醒"
-#: core/forms.py:117
+#: core/forms.py:131
msgid "Other settings"
msgstr "其它设置"
-#: 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
+#: core/forms.py:138 core/views/user.py:615 core/views/user.py:630
+#: core/views/user.py:642 gym/forms.py:72 manager/templates/log/add.html:65
+#: manager/templates/set/add.html:69 manager/views/workout.py:222
+#: utils/generic_views.py:143
msgid "Save"
msgstr "保存"
-#: core/forms.py:132
+#: core/forms.py:145
msgid "Used for password resets and, optionally, email reminders."
msgstr "用来重设密码和邮件提醒,如果你选择了邮件提醒。"
-#: core/forms.py:160
+#: core/forms.py:173
msgid "This e-mail address is already in use."
msgstr "这个邮件地址已经被注册过了。"
-#: core/forms.py:180 gym/templates/gym/new_user.html:26
+#: core/forms.py:193 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:182
+#: core/forms.py:195
msgid "Please enter your current password."
msgstr "请输入你的原密码。"
-#: core/forms.py:200
+#: core/forms.py:204 core/templates/language/view.html:62
+#: 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: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/muscles/admin-overview.html:17
+#: gym/templates/admin_notes/list.html:40
+#: gym/templates/contract_option/list.html:39
+#: gym/templates/contract_type/list.html:39 gym/templates/document/list.html:46
+#: gym/templates/gym/list.html:20 manager/templates/calendar/day.html:69
+#: 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:231
+#: 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:132
+#: nutrition/templates/units/list.html:20
+msgid "Delete"
+msgstr "删除"
+
+#: core/forms.py:213
msgid "Invalid password"
msgstr "密码无效"
-#: core/forms.py:212 core/forms.py:278
+#: core/forms.py:225 core/forms.py:291
msgid "The form is secured with reCAPTCHA"
msgstr "该表格由 reCAPTCHA 保护"
-#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:188
-#: core/templates/navigation.html:193 core/templates/template.html:149
-#: core/templates/user/login.html:20 core/views/user.py:293
+#: core/forms.py:239 core/forms.py:258 core/templates/navigation.html:179
+#: core/templates/navigation.html:184 core/templates/template.html:149
+#: core/templates/user/login.html:20 core/views/user.py:300
#: software/templates/features.html:38
msgid "Register"
msgstr "注册"
-#: core/forms.py:256
+#: core/forms.py:269
msgid "Contact"
msgstr "联系"
-#: core/forms.py:257
+#: core/forms.py:270
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:71
+#: core/forms.py:278 exercises/models/comment.py:42 manager/models/set.py:60
+#: manager/models/setting.py:111 nutrition/models/log.py:71
msgid "Comment"
msgstr "评论"
-#: core/forms.py:266
+#: core/forms.py:279
msgid "What do you want to say?"
msgstr "你怎么看?"
@@ -326,6 +229,14 @@ msgstr "你怎么看?"
msgid "Day of the week"
msgstr "一周中的天"
+#: core/models/language.py:31 core/templates/language/view.html:21
+msgid "Language short name"
+msgstr "语言缩写"
+
+#: core/models/language.py:36 core/templates/language/view.html:22
+msgid "Language full name"
+msgstr "语言全称"
+
#: core/models/license.py:29
msgid "Full name"
msgstr "全称"
@@ -383,19 +294,19 @@ msgstr "公制(千克)"
msgid "Imperial (pound)"
msgstr "英制(磅)"
-#: core/models/profile.py:111
+#: core/models/profile.py:114
msgid "Show exercise comments"
msgstr "显示健身项目的评论"
-#: core/models/profile.py:112
+#: core/models/profile.py:115
msgid "Check to show exercise comments on the workout view"
msgstr "勾选用来在健身版块显示该健身项目的评论"
-#: core/models/profile.py:123
+#: core/models/profile.py:126
msgid "Also use ingredients in English"
msgstr "使用食谱时用英文显示"
-#: core/models/profile.py:125
+#: core/models/profile.py:128
msgid ""
"Check to also show ingredients in English while creating\n"
"a nutritional plan. These ingredients are extracted from a list provided\n"
@@ -407,29 +318,29 @@ msgstr ""
"这是极其完善的,但是,在某些程度上,\n"
"也会让人抓狂并且让搜索变得困难."
-#: core/models/profile.py:134
+#: core/models/profile.py:137
msgid "Activate workout reminders"
msgstr "激活健身提醒"
-#: core/models/profile.py:136
+#: core/models/profile.py:139
msgid ""
"Check to activate automatic reminders for workouts. You need to provide a "
"valid email for this to work."
msgstr "勾选以激活自动健身提醒功能.你需要提供一个有效的电子邮件方能使用."
-#: core/models/profile.py:145
+#: core/models/profile.py:148
msgid "Remind before expiration"
msgstr "健身过期前提醒"
-#: core/models/profile.py:146
+#: core/models/profile.py:149
msgid "The number of days you want to be reminded before a workout expires."
msgstr "在一个健身过期前你希望被提醒的天数。"
-#: core/models/profile.py:152
+#: core/models/profile.py:155
msgid "Default duration of workouts"
msgstr "默认的健身持续时间"
-#: core/models/profile.py:154
+#: core/models/profile.py:157
msgid ""
"Default duration in weeks of workouts not in a schedule. Used for email "
"workout reminders."
@@ -437,11 +348,11 @@ msgstr ""
"默认每周的健身持续时间,需要注意,这不是日程的健身持续时间.健身的邮件提醒中会使"
"用这项内容."
-#: core/models/profile.py:171
+#: core/models/profile.py:174
msgid "Notification language"
msgstr "通知语言"
-#: core/models/profile.py:173
+#: core/models/profile.py:176
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."
@@ -449,70 +360,70 @@ msgstr ""
"发送给你电子邮件通知,包括健身的邮件提醒等所使用的语言.这不会影响到网站使用的"
"语言."
-#: core/models/profile.py:186 gym/views/export.py:66
+#: core/models/profile.py:212 gym/views/export.py:66
msgid "Age"
msgstr "年龄"
-#: core/models/profile.py:202 nutrition/forms.py:99
+#: core/models/profile.py:228 nutrition/forms.py:100
msgid "Height (cm)"
msgstr "身高(cm)"
-#: core/models/profile.py:219
+#: core/models/profile.py:245
msgid "Hours of sleep"
msgstr "睡眠时长"
-#: core/models/profile.py:220
+#: core/models/profile.py:246
msgid "The average hours of sleep per day"
msgstr "每日平均睡眠时长"
-#: core/models/profile.py:229
+#: core/models/profile.py:255
msgid "Work"
msgstr "工作"
-#: core/models/profile.py:230 core/models/profile.py:272
+#: core/models/profile.py:256 core/models/profile.py:298
msgid "Average hours per day"
msgstr "每日平均时长"
-#: core/models/profile.py:239 core/models/profile.py:260
-#: core/models/profile.py:281
+#: core/models/profile.py:265 core/models/profile.py:286
+#: core/models/profile.py:307
msgid "Physical intensity"
msgstr "活动强度"
-#: core/models/profile.py:240 core/models/profile.py:261
-#: core/models/profile.py:282
+#: core/models/profile.py:266 core/models/profile.py:287
+#: core/models/profile.py:308
msgid "Approximately"
msgstr "大约"
-#: core/models/profile.py:250
+#: core/models/profile.py:276
msgid "Sport"
msgstr "运动"
-#: core/models/profile.py:251
+#: core/models/profile.py:277
msgid "Average hours per week"
msgstr "每周平均时长"
-#: core/models/profile.py:271
+#: core/models/profile.py:297
msgid "Free time"
msgstr "自由时间"
-#: core/models/profile.py:292 nutrition/templates/rate/form.html:66
+#: core/models/profile.py:318 nutrition/templates/rate/form.html:66
msgid "Total daily calories"
msgstr "每日总卡路里"
-#: core/models/profile.py:293
+#: core/models/profile.py:319
msgid "Total caloric intake, including e.g. any surplus"
msgstr "总卡路里摄取量,包括例如:任何过量的卡路里"
-#: core/models/profile.py:305 nutrition/models/ingredient_weight_unit.py:45
+#: core/models/profile.py:331 nutrition/models/ingredient_weight_unit.py:45
#: nutrition/models/log.py:90 nutrition/models/meal_item.py:58
msgid "Weight unit"
msgstr "重量单位"
-#: core/models/profile.py:313
+#: core/models/profile.py:339
msgid "Allow external access"
msgstr "允许外部访问"
-#: core/models/profile.py:315
+#: core/models/profile.py:341
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."
@@ -520,23 +431,22 @@ msgstr ""
"允许外网用户以只读模式访问你的健身和日志等数据.在你分享链接到社交媒体之前,你"
"需要勾选这个选项."
-#: core/models/profile.py:324
+#: core/models/profile.py:350
msgid "Automatic reminders for weight entries"
msgstr "为体重记录创建自动提醒"
-#: core/models/profile.py:326
+#: core/models/profile.py:352
msgid "Number of days after the last weight entry (enter 0 to deactivate)"
msgstr "最后一次体重记录之后经过的天数(输入0关闭提醒)"
-#: core/models/profile.py:392
+#: core/models/profile.py:418
msgid "The sum of all hours has to be 24"
msgstr "所有时长的和应该是24"
#: core/models/rep_unit.py:35 core/models/weight_unit.py:35
-#: core/templates/user/overview.html:263 core/views/user.py:575
+#: core/templates/user/overview.html:263 core/views/user.py:591
#: 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
+#: exercises/models/exercise.py:64 exercises/models/muscle.py:36
#: 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
@@ -598,6 +508,52 @@ msgstr "分享"
msgid "Are you sure you want to delete this? This action cannot be undone."
msgstr "你确定要删除这条记录?删除动作是不可撤销的。"
+#: core/templates/email_verification/confirm_template.html:4
+msgid "Email verified"
+msgstr ""
+
+#: core/templates/email_verification/confirm_template.html:18
+#, python-format
+msgid "%(username)s, your email was verified"
+msgstr ""
+
+#: core/templates/email_verification/confirm_template.html:22
+msgid "Error, invalid verification token"
+msgstr ""
+
+#: core/templates/email_verification/email_body_html.tpl:6
+#, fuzzy
+#| msgid "Configuration"
+msgid "Email Confirmation"
+msgstr "配置"
+
+#: core/templates/email_verification/email_body_html.tpl:9
+#: core/templates/email_verification/email_body_txt.tpl:3
+#, python-format
+msgid "You are almost there, %(username)s!"
+msgstr ""
+
+#: core/templates/email_verification/email_body_html.tpl:11
+#, python-format
+msgid "Please click <a href=\"%(link)s\">here</a> to confirm your email"
+msgstr ""
+
+#: core/templates/email_verification/email_body_html.tpl:12
+#: core/templates/email_verification/email_body_txt.tpl:5
+#, python-format
+msgid "The token expires on %(time)s"
+msgstr ""
+
+#: core/templates/email_verification/email_body_html.tpl:14
+#: core/templates/email_verification/email_body_txt.tpl:8
+msgid "the wger Team"
+msgstr ""
+
+#: core/templates/email_verification/email_body_txt.tpl:4
+#, python-format
+msgid "Please click the following link to confirm your email: %(link)s"
+msgstr ""
+
#: core/templates/index.html:4
msgid "Dashboard"
msgstr "管理面板"
@@ -658,7 +614,7 @@ msgid "Add custom diary entry"
msgstr "添加自定义日记条目"
#: core/templates/index.html:84 core/templates/index.html:92
-#: manager/models/day.py:34 manager/models/log.py:56
+#: manager/models/day.py:34 manager/models/log.py:58
#: manager/models/session.py:60 manager/models/workout.py:109
#: manager/templates/schedule/view.html:105
#: manager/templates/workout/view.html:11
@@ -690,6 +646,20 @@ msgstr "新增日志"
msgid "No workouts found."
msgstr "没有健身记录。"
+#: core/templates/index.html:137 core/templates/index.html:189
+#: core/templates/language/overview.html:23
+#: 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:150
+#: nutrition/templates/plan/view.html:153
+#: nutrition/templates/plan/view.html:191
+msgid "Add one now."
+msgstr "现在就新增一个。"
+
#: 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
@@ -743,19 +713,59 @@ msgid "No nutrition plans."
msgstr "没有健身计划."
#: 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
+#: core/templates/user/overview.html:121 manager/forms.py:184
+#: manager/helpers.py:89 manager/models/log.py:86 manager/models/setting.py:79
+#: manager/templates/log/add.html:54 manager/templates/set/formset.html:11
#: weight/models.py: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:210 core/templates/navigation.html:135
+#: core/templates/index.html:210 core/templates/navigation.html:126
#: weight/views.py:70
msgid "Add weight entry"
msgstr "新增体重记录"
+#: core/templates/language/overview.html:4 core/templates/navigation.html:217
+msgid "Languages"
+msgstr "语言"
+
+#: core/templates/language/overview.html:23
+msgid "Nothing found."
+msgstr "未找到匹配项。"
+
+#: core/templates/language/overview.html:36 core/templates/license/list.html:38
+#: core/templates/misc/license/list.html:41
+#: core/templates/repetition_unit/list.html:41
+#: core/templates/user/overview.html:327 core/templates/user/overview.html:366
+#: core/templates/user/overview.html:402
+#: core/templates/weight_unit/list.html:41 core/views/languages.py:73
+#: core/views/license.py:65 core/views/repetition_units.py:65
+#: core/views/weight_units.py:65
+#: exercises/templates/categories/admin-overview.html:36
+#: 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:61
+msgid "Add"
+msgstr "新增"
+
+#: core/templates/language/view.html:52 core/templates/user/api_key.html:44
+#: core/templates/user/preferences.html:44 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:45
+msgid "Options"
+msgstr "选项"
+
#: core/templates/license/list.html:4 core/templates/misc/license/list.html:4
msgid "License list"
msgstr "许可协议列表"
@@ -768,7 +778,6 @@ msgstr "许可协议列表"
#: core/templates/weight_unit/list.html:26
#: exercises/templates/categories/admin-overview.html:24
#: exercises/templates/equipment/admin-overview.html:24
-#: exercises/templates/exercise/pending.html:30
#: exercises/templates/muscles/admin-overview.html:24
#: gym/templates/admin_notes/list.html:52 gym/templates/contract/list.html:60
#: gym/templates/contract_option/list.html:56
@@ -848,155 +857,135 @@ msgstr "你的模板"
msgid "Public templates"
msgstr "公共模板"
-#: core/templates/navigation.html:64
-msgctxt "as in sorted by category"
-msgid "by category"
-msgstr "按类别"
-
-#: core/templates/navigation.html:65
-msgctxt "as in sorted by muscle"
-msgid "by muscle"
-msgstr "按肌肉"
-
-#: core/templates/navigation.html:66
-msgctxt "as in sorted by equipment"
-msgid "by equipment"
-msgstr "按器械"
+#: core/templates/navigation.html:63 manager/forms.py:133
+#: manager/models/setting.py:54
+msgid "Exercises"
+msgstr "练习"
-#: core/templates/navigation.html:70
-#: exercises/templates/equipment/overview.html:109
-#: exercises/templates/equipment/overview.html:113
-#: exercises/templates/exercise/overview.html:112
-#: exercises/templates/exercise/overview.html:116
-#: exercises/templates/muscles/overview.html:112
-#: exercises/templates/muscles/overview.html:116
-msgid "Add new exercise"
-msgstr "新增健身项目"
-
-#: core/templates/navigation.html:75 core/templates/navigation.html:116
-#: core/templates/navigation.html:224
+#: core/templates/navigation.html:67 core/templates/navigation.html:107
+#: core/templates/navigation.html:215
msgid "Administration"
msgstr "管理"
-#: core/templates/navigation.html:76
-#: exercises/templates/exercise/pending.html:6
-msgid "Exercises pending review"
-msgstr "健身项目审核"
+#: core/templates/navigation.html:68
+#, fuzzy
+#| msgid "Exercise day"
+msgid "Exercise edit history"
+msgstr "训练日"
-#: core/templates/navigation.html:77 exercises/models/base.py:72
-#: exercises/templates/exercise/view.html:80
+#: core/templates/navigation.html:69 exercises/models/base.py:84
msgid "Equipment"
msgstr "器材"
-#: core/templates/navigation.html:78 exercises/templates/exercise/view.html:258
+#: core/templates/navigation.html:70
msgid "Muscles"
msgstr "肌肉"
-#: core/templates/navigation.html:79
+#: core/templates/navigation.html:71
#: exercises/templates/categories/admin-overview.html:4
msgid "Categories"
msgstr "类别"
-#: core/templates/navigation.html:93 software/templates/features.html:87
+#: core/templates/navigation.html:84 software/templates/features.html:87
msgid "Nutrition"
msgstr "营养"
-#: core/templates/navigation.html:99 core/templates/user/overview.html:144
+#: core/templates/navigation.html:90 core/templates/user/overview.html:144
msgid "Nutrition plans"
msgstr "营养计划"
-#: core/templates/navigation.html:105 nutrition/templates/bmi/form.html:50
+#: core/templates/navigation.html:96 nutrition/templates/bmi/form.html:50
msgid "BMI calculator"
msgstr "体重指数计算器"
-#: core/templates/navigation.html:111 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:102 nutrition/templates/rate/form.html:17
msgid "Daily calories calculator"
msgstr "每日卡路里计算器"
-#: core/templates/navigation.html:113
+#: core/templates/navigation.html:104
#: nutrition/templates/ingredient/overview.html:29
msgid "Ingredient overview"
msgstr "食谱总览"
-#: core/templates/navigation.html:117 nutrition/templates/units/list.html:6
+#: core/templates/navigation.html:108 nutrition/templates/units/list.html:6
msgid "Ingredient weight units"
msgstr "食谱计量单位"
-#: core/templates/navigation.html:118
+#: core/templates/navigation.html:109
#: nutrition/templates/ingredient/pending.html:6
msgid "Ingredients pending review"
msgstr "食谱审核"
-#: core/templates/navigation.html:132
+#: core/templates/navigation.html:123
msgid "Body weight"
msgstr "体重"
-#: core/templates/navigation.html:134 core/templates/user/overview.html:114
+#: core/templates/navigation.html:125 core/templates/user/overview.html:114
#: weight/templates/overview.html:7
msgid "Weight overview"
msgstr "体重总览"
-#: core/templates/navigation.html:147
+#: core/templates/navigation.html:138
msgid "About this software"
msgstr "关于软件"
-#: core/templates/navigation.html:149 core/templates/template_features.html:82
+#: core/templates/navigation.html:140 core/templates/template_features.html:82
#: software/templates/about_us.html:5
msgid "About us"
msgstr "关于我们"
-#: core/templates/navigation.html:151 software/templates/features.html:209
+#: core/templates/navigation.html:142 software/templates/features.html:209
msgid "REST API"
msgstr "REST API"
-#: core/templates/navigation.html:155 utils/models.py:40
+#: core/templates/navigation.html:146 utils/models.py:41
msgid "License"
msgstr "许可协议"
-#: core/templates/navigation.html:161
+#: core/templates/navigation.html:152
msgid "Developer documentation"
msgstr "开发者文档"
-#: core/templates/navigation.html:167
+#: core/templates/navigation.html:158
msgid "Get the code"
msgstr "获取源码"
-#: core/templates/navigation.html:173 core/templates/template.html:204
+#: core/templates/navigation.html:164 core/templates/template.html:203
#: core/templates/template_features.html:99
msgid "Translate"
msgstr "翻译"
-#: core/templates/navigation.html:194 core/templates/user/login.html:28
+#: core/templates/navigation.html:185 core/templates/user/login.html:28
msgid "Reset password"
msgstr "重设密码"
-#: core/templates/navigation.html:207
+#: core/templates/navigation.html:198
msgid "My preferences"
msgstr "我的首选项"
-#: core/templates/navigation.html:214
+#: core/templates/navigation.html:205
msgid "Logout"
msgstr "退出"
-#: core/templates/navigation.html:229
+#: core/templates/navigation.html:220
msgid "Licenses"
msgstr "许可协议"
-#: core/templates/navigation.html:232
+#: core/templates/navigation.html:223
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr "重复单元"
-#: core/templates/navigation.html:235 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:226 core/templates/weight_unit/list.html:4
#: nutrition/templates/ingredient/view.html:174
msgid "Weight units"
msgstr "重量单位"
-#: core/templates/navigation.html:238 core/templates/user/list.html:4
+#: core/templates/navigation.html:229 core/templates/user/list.html:4
msgid "User list"
msgstr "用户列表"
-#: core/templates/navigation.html:239
+#: core/templates/navigation.html:230
msgid "Gyms"
msgstr "健身房"
@@ -1073,33 +1062,30 @@ msgstr "后一页"
msgid "Add weight log"
msgstr "新增体重记录"
-#: core/templates/tags/render_day.html:114
-#: exercises/templates/equipment/overview.html:59
-#: exercises/templates/exercise/overview.html:63
-#: exercises/templates/muscles/overview.html:65
+#: core/templates/tags/render_day.html:116
msgid "Placeholder image for exercise"
msgstr "健身图片占位符"
-#: core/templates/tags/render_day.html:131
+#: core/templates/tags/render_day.html:133
msgid "This exercise has no repetitions."
msgstr "这个健身项目没有重复次数."
-#: core/templates/tags/render_day.html:134
+#: core/templates/tags/render_day.html:136
msgid "Edit them now."
msgstr "现在编辑它们."
-#: core/templates/tags/render_day.html:159
+#: core/templates/tags/render_day.html:162
msgid "Add exercises to this workout day"
msgstr "新增健身项目到这个健身日"
#: core/templates/tags/render_weight_log.html:17 manager/helpers.py:89
-#: manager/models/setting.py:57 manager/templates/set/formset.html:10
+#: manager/models/setting.py:69 manager/templates/set/formset.html:9
msgid "Reps"
msgstr "重复次数"
-#: 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
+#: core/templates/tags/render_weight_log.html:30 manager/forms.py:189
+#: manager/models/log.py:103 manager/models/setting.py:99
+#: manager/templates/log/add.html:56 manager/templates/set/formset.html:13
msgid "RiR"
msgstr "力竭之前的剩余次数"
@@ -1122,7 +1108,7 @@ msgstr "服务条款"
msgid "Features"
msgstr "特色"
-#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:37
+#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:53
msgid "API key"
msgstr "API密钥"
@@ -1166,11 +1152,12 @@ msgid "Documentation"
msgstr "文档"
#: core/templates/user/delete_account.html:4
-#: core/templates/user/preferences.html:42
+#: core/templates/user/preferences.html:58
msgid "Delete account"
msgstr "删除账户"
#: core/templates/user/delete_account.html:17
+#: exercises/templates/history/overview.html:93
msgid "Are you sure?"
msgstr "你确定吗?"
@@ -1218,11 +1205,12 @@ 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/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
+#: exercises/models/base.py:99 exercises/models/base.py:104
+#: exercises/models/exercise.py:69 exercises/models/exercise.py:76
+#: gallery/models/image.py:47 manager/helpers.py:88 manager/models/log.py:100
+#: 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/views.py:150
@@ -1230,11 +1218,11 @@ msgid "Date"
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: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
+#: exercises/models/exercise.py:57 exercises/views/exercises.py:123
+#: 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 "目标"
@@ -1242,12 +1230,12 @@ msgstr "目标"
msgid "Number of logs (days)"
msgstr "日志数(天)"
-#: core/templates/user/overview.html:37 core/views/user.py:576
+#: core/templates/user/overview.html:37 core/views/user.py:592
#: 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:267
+#: core/templates/user/overview.html:68 manager/forms.py:278
#: manager/templates/workout/view.html:151
msgid "Log"
msgstr "日志"
@@ -1265,6 +1253,7 @@ msgid "Notes"
msgstr "备注"
#: core/templates/user/overview.html:79
+#: exercises/templates/history/overview.html:30
#: manager/templates/calendar/partial_overview_table.html:42
#: nutrition/templates/log/detail.html:154
msgid "Time"
@@ -1312,10 +1301,12 @@ msgid "Do you really want to change this user&#39;s password?"
msgstr "真的要修改用户&#39;的密码?"
#: core/templates/user/overview.html:233
+#: exercises/templates/history/overview.html:106
msgid "No"
msgstr "否"
#: core/templates/user/overview.html:234
+#: exercises/templates/history/overview.html:99
msgid "Yes"
msgstr "是"
@@ -1370,10 +1361,15 @@ msgid "Documents"
msgstr "文档"
#: core/templates/user/overview.html:413 gym/templates/document/list.html:32
-#: manager/forms.py:279 manager/templates/workout/view.html:176
+#: manager/forms.py:290 manager/templates/workout/view.html:176
msgid "Download"
msgstr "下载"
+#: core/templates/user/overview.html:451 gym/views/admin_config.py:44
+#: gym/views/admin_config.py:58 gym/views/user_config.py:46
+msgid "Configuration"
+msgstr "配置"
+
#: core/templates/user/overview.html:454 gym/models/user_config.py:92
msgid "Include in inactive overview"
msgstr ""
@@ -1391,7 +1387,23 @@ msgstr "以该用户登录"
msgid "Preferences"
msgstr "首选项"
-#: core/templates/user/preferences.html:33 core/views/user.py:587
+#: core/templates/user/preferences.html:19
+msgid "Verified email"
+msgstr ""
+
+#: core/templates/user/preferences.html:24
+msgid "Unverified email"
+msgstr ""
+
+#: core/templates/user/preferences.html:26
+msgid "Send verification email"
+msgstr ""
+
+#: core/templates/user/preferences.html:30
+msgid "You need to verify your email to contribute exercises"
+msgstr ""
+
+#: core/templates/user/preferences.html:49 core/views/user.py:603
msgid "Change password"
msgstr "修改密码"
@@ -1421,39 +1433,37 @@ msgid "oz"
msgstr "盎司"
#: 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
+#: exercises/views/equipment.py:104 exercises/views/exercises.py:185
+#: exercises/views/muscles.py:99 manager/views/schedule.py:311
+#: manager/views/schedule_step.py:129 manager/views/workout.py:269
+#: manager/views/workout_session.py:141 nutrition/views/ingredient.py:138
#: 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:431
-#: exercises/views/muscles.py:125 gallery/views/images.py:121
+#: exercises/views/categories.py:127 exercises/views/exercises.py:193
+#: exercises/views/muscles.py:106 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
+#: manager/views/workout.py:273 manager/views/workout_session.py:156
+#: nutrition/views/ingredient.py:145 nutrition/views/plan.py:127
#: nutrition/views/unit.py:118
#, python-brace-format
msgid "Delete {0}?"
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/repetition_units.py:85 core/views/user.py:472
#: 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: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
+#: exercises/views/equipment.py:81 exercises/views/muscles.py:86
+#: 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:170
+#: gym/views/gym.py:459 manager/views/day.py:100 manager/views/schedule.py:335
+#: manager/views/workout.py:287 nutrition/views/ingredient.py:164
+#: nutrition/views/plan.py:144 nutrition/views/unit.py:144
#, python-brace-format
msgid "Edit {0}"
msgstr "编辑 {0}"
@@ -1484,64 +1494,65 @@ msgstr "提交"
msgid "Your feedback was successfully sent. Thank you!"
msgstr "你的反馈已经成功发送.非常感谢!"
-#: core/views/user.py:156
+#: core/views/user.py:157
#, python-brace-format
msgid "Account \"{0}\" was successfully deleted"
msgstr "账户\"{0}\"已经被成功删除"
-#: core/views/user.py:287
+#: core/views/user.py:294
msgid "You were successfully registered"
msgstr "你已成功注册"
-#: core/views/user.py:339
+#: core/views/user.py:355
msgid "Settings successfully updated"
msgstr "设置更新成功"
-#: core/views/user.py:376
+#: core/views/user.py:392
msgid "The user was successfully deactivated"
msgstr "该用户已经被成功置为非活跃"
-#: core/views/user.py:411
+#: core/views/user.py:427
msgid "The user was successfully activated"
msgstr "该用户已经被成功置为活跃"
-#: core/views/user.py:426
+#: core/views/user.py:442
msgid "Edit user"
msgstr "编辑用户"
-#: core/views/user.py:573 gym/templates/gym/member_list.html:26
+#: core/views/user.py:589 gym/templates/gym/member_list.html:26
#: gym/views/gym.py:156
msgid "ID"
msgstr "ID"
-#: core/views/user.py:574 gym/forms.py:94 gym/templates/contract/view.html:55
+#: core/views/user.py:590 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:577 gym/templates/gym/new_user.html:34
+#: core/views/user.py:593 gym/templates/gym/new_user.html:34
#: gym/views/export.py:60 gym/views/gym.py:218
msgid "Gym"
msgstr "健身房"
-#: exercises/models/base.py:51 exercises/templates/exercise/view.html:76
-#: nutrition/models/ingredient.py:204
+#: core/views/user.py:652
+#, python-format
+msgid "A verification email was sent to %(email)s"
+msgstr ""
+
+#: exercises/models/base.py:63 nutrition/models/ingredient.py:204
msgid "Category"
msgstr "类别"
-#: exercises/models/base.py:58
+#: exercises/models/base.py:70
msgid "Primary muscles"
msgstr "主要训练肌肉"
-#: exercises/models/base.py:64 exercises/templates/equipment/overview.html:71
-#: exercises/templates/exercise/overview.html:76
-#: exercises/templates/exercise/view.html:268
-#: exercises/templates/muscles/overview.html:77
+#: exercises/models/base.py:76
msgid "Secondary muscles"
msgstr "次要肌肉"
-#: exercises/models/base.py:79
+#: exercises/models/base.py:91
msgid "Variations"
msgstr "变体"
@@ -1549,73 +1560,60 @@ msgstr "变体"
msgid "Exercise Categories"
msgstr "训练类别"
-#: exercises/models/comment.py:34 exercises/models/exercise_alias.py:32
-#: exercises/models/image.py:75 exercises/models/video.py:82
-#: manager/forms.py:165 manager/helpers.py:89 manager/models/log.py:51
+#: exercises/models/comment.py:37 exercises/models/exercise_alias.py:35
+#: exercises/models/image.py:71 exercises/models/video.py:95
+#: manager/forms.py:176 manager/helpers.py:89 manager/models/log.py:52
msgid "Exercise"
msgstr "训练"
-#: exercises/models/comment.py:41
+#: exercises/models/comment.py:43
msgid "A comment about how to correctly do this exercise."
msgstr "关于如何正确做这个健身项目的评论."
-#: exercises/models/exercise.py:86 nutrition/models/ingredient.py:80
+#: exercises/models/exercise.py:81 nutrition/models/ingredient.py:80
#: nutrition/models/plan.py:61 nutrition/models/weight_unit.py:32
msgid "Language"
msgstr "语言"
-#: exercises/models/exercise.py:237 exercises/views/exercises.py:461
-msgid "Exercise was successfully added to the general database"
-msgstr "健身项目被成功添加到通用数据库中"
-
-#: exercises/models/exercise.py:265
-msgid "New user submitted exercise"
-msgstr "新用户提交锻炼动作"
-
-#: exercises/models/exercise.py:267
-#, python-brace-format
-msgid "The user {0} submitted a new exercise \"{1}\"."
-msgstr "用户{0}提交了一次新训练“{1}”."
-
-#: exercises/models/exercise_alias.py:35
+#: exercises/models/exercise_alias.py:38
#, fuzzy
#| msgid "Correcting an exercise"
msgid "Alias for an exercise"
msgstr "修正健身项目中"
-#: exercises/models/image.py:59
+#: exercises/models/image.py:55
msgid "Line"
msgstr "线条"
-#: exercises/models/image.py:60
+#: exercises/models/image.py:56
msgid "3D"
msgstr "3D"
-#: exercises/models/image.py:61
+#: exercises/models/image.py:57
msgid "Low-poly"
msgstr ""
-#: exercises/models/image.py:62
+#: exercises/models/image.py:58
msgid "Photo"
msgstr "照片"
-#: exercises/models/image.py:63
+#: exercises/models/image.py:59
msgid "Other"
msgstr "其他"
-#: exercises/models/image.py:81 gallery/models/image.py:56
+#: exercises/models/image.py:77 gallery/models/image.py:56
msgid "Image"
msgstr "图片"
-#: exercises/models/image.py:82 gallery/models/image.py:57
+#: exercises/models/image.py:78 gallery/models/image.py:57
msgid "Only PNG and JPEG formats are supported"
msgstr "只支持PNG和JPEG格式的图片"
-#: exercises/models/image.py:88
+#: exercises/models/image.py:84
msgid "Main picture"
msgstr "首图"
-#: exercises/models/image.py:91
+#: exercises/models/image.py:87
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,19 +1622,10 @@ msgstr ""
"勾选方格,如果你想把这张图片设置为这个健身项目的主图(会在搜索等地方显示).第一"
"张图片会被系统自动标记为主图."
-#: exercises/models/image.py:100
+#: exercises/models/image.py:96
msgid "The art style of your image"
msgstr ""
-#: exercises/models/image.py:185
-msgid "New user submitted image"
-msgstr "新用户提交的图片"
-
-#: exercises/models/image.py:186
-#, python-brace-format
-msgid "The user {0} submitted a new image \"{1}\" for exercise {2}."
-msgstr "用户{0}为健身项目{2}提交了一个新图片\"{1}\"."
-
#: exercises/models/muscle.py:37
msgid "In latin, e.g. \"Pectoralis major\""
msgstr ""
@@ -1651,47 +1640,48 @@ msgstr "健身项目名称"
msgid "A more basic name for the muscle"
msgstr ""
-#: exercises/models/video.py:41
-msgid "Maximum file size is 100MB."
+#: exercises/models/video.py:50
+#, python-format
+msgid "Maximum file size is %(size)sMB."
msgstr ""
-#: exercises/models/video.py:44 exercises/models/video.py:48
+#: exercises/models/video.py:57 exercises/models/video.py:65
msgid "File type is not supported"
msgstr "不支持文件类型"
-#: exercises/models/video.py:57
+#: exercises/models/video.py:70
msgid "File is not a valid video"
msgstr "这不是一个有效的视频文件"
-#: exercises/models/video.py:88
+#: exercises/models/video.py:101
msgid "Main video"
msgstr "主视频"
-#: exercises/models/video.py:94
+#: exercises/models/video.py:107
msgid "Video"
msgstr "视频"
-#: exercises/models/video.py:101
+#: exercises/models/video.py:114
msgid "Size"
msgstr "大小"
-#: exercises/models/video.py:108 manager/models/schedule_step.py:56
+#: exercises/models/video.py:121 manager/models/schedule_step.py:56
msgid "Duration"
msgstr "时长"
-#: exercises/models/video.py:117
+#: exercises/models/video.py:130
msgid "Width"
msgstr "宽度"
-#: exercises/models/video.py:124
+#: exercises/models/video.py:137
msgid "Height"
msgstr "身高"
-#: exercises/models/video.py:131
+#: exercises/models/video.py:144
msgid "Codec"
msgstr ""
-#: exercises/models/video.py:139
+#: exercises/models/video.py:152
msgid "Codec, long name"
msgstr ""
@@ -1700,129 +1690,23 @@ msgid "Equipment list"
msgstr "器材列表"
#: exercises/templates/equipment/admin-overview.html:37
-#: exercises/views/equipment.py:94
+#: exercises/views/equipment.py:92
msgid "Add new equipment"
msgstr "新增器材"
-#: exercises/templates/equipment/overview.html:11
-msgid "Equipment overview"
-msgstr "器材总览"
-
-#: exercises/templates/equipment/overview.html:69
-#: exercises/templates/exercise/overview.html:74
-#: exercises/templates/exercise/view.html:264
-#: exercises/templates/muscles/overview.html:75
-msgid "Main muscles"
-msgstr "主要肌肉"
-
-#: exercises/templates/equipment/overview.html:79
-msgid ""
-"No exercises for this equipment. Add or edit an exercise and set the "
-"equipment."
-msgstr "没有健身项目使用这个器材.新增或者编辑健身项目,然后设置使用该器材."
-
-#: exercises/templates/equipment/overview.html:96
-#: exercises/templates/exercise/overview.html:99
-#: nutrition/templates/ingredient/overview.html:57
-msgid "Search"
-msgstr "搜索"
-
-#: exercises/templates/equipment/overview.html:101
-#: exercises/templates/exercise/overview.html:104
-msgid "exercise name"
-msgstr "健身项目名称"
-
-#: exercises/templates/equipment/overview.html:115
-#: exercises/templates/exercise/overview.html:118
-#: exercises/templates/muscles/overview.html:118
-#: nutrition/templates/ingredient/overview.html:85
-msgid "Only registered users can do this"
-msgstr "只有注册用户才可以操作"
-
-#: exercises/templates/exercise/email_new.tpl:1
-#, python-format
-msgid ""
-"Your exercise '%(exercise)s' was successfully added to the general\n"
-"database."
-msgstr "你的健身项目 '%(exercise)s'被成功添加到数据库中."
-
-#: exercises/templates/exercise/email_new.tpl:4
-msgid ""
-"It is now available on the exercise and muscle overview and can be\n"
-"added to workouts. You can access it on this address:"
-msgstr ""
-
-#: exercises/templates/exercise/email_new.tpl:8
-#: nutrition/templates/ingredient/email_new.tpl:8
-msgid "Thank you for contributing and making this site better!"
-msgstr "谢谢你的贡献让网站越来越好."
-
-#: exercises/templates/exercise/email_new.tpl:9
-#: manager/templates/workout/email_reminder.tpl:15
-#: manager/templates/workout/email_weight_reminder.tpl:12
-#: nutrition/templates/ingredient/email_new.tpl:9
-#, python-format
-msgid "The %(site)s team"
-msgstr "%(site)s团队"
-
-#: exercises/templates/exercise/form.html:4
-msgid "Submitting an exercise"
-msgstr "提交健身项目中"
-
-#: exercises/templates/exercise/form.html:5
-msgid ""
-"Thank you for submitting an exercise. This is much\n"
-"appreciated!"
-msgstr ""
-"感谢你提交一个新的健身项目.\n"
-"非常感激你的贡献."
-
-#: exercises/templates/exercise/form.html:8
-msgid ""
-"After you submit the form, the administrators will be notified.\n"
-"Once it is reviewed, it will be added to the database. Till this happens,\n"
-"it will not be visible in the overview or the search. In case you added your "
-"email\n"
-"when you registered, you will get notified when the process is completed "
-"successfully."
-msgstr ""
-"你提交申请表单之后,管理员会收到通知.如果被审核通过,那么就会被添加到数据库"
-"中.\n"
-"管理员审核之前,在总览或者搜索中不会看到.\n"
-"如果你在注册的时候添加了邮件,那么在审核过程成功完成之后,你也会收到通知."
-
-#: exercises/templates/exercise/form_correct.html:4
-msgid "Correcting an exercise"
-msgstr "修正健身项目中"
-
-#: exercises/templates/exercise/form_correct.html:5
-msgid ""
-"Thank you for correcting and improving this exercise.\n"
-"This is much appreciated!"
-msgstr "感谢你修正并改善这个健身项目.感激你的贡献."
-
-#: exercises/templates/exercise/form_correct.html:8
-msgid ""
-"After you submit the form, the administrators will be notified.\n"
-"Once the changes are reviewed the exercise will be updated."
-msgstr ""
-"你提交申请表单之后,管理员会收到通知.\n"
-"一旦修改被审核通过,那么该健身项目也会随之更新."
-
-#: exercises/templates/exercise/overview.html:88
-msgid "No categories."
-msgstr "没有类别."
-
-#: exercises/templates/exercise/overview.html:88
-msgid "Use link to create one"
-msgstr "使用链接来新建一个"
+#: exercises/templates/history/overview.html:11
+#, fuzzy
+#| msgid "Exercise day"
+msgid "Exercise admin history"
+msgstr "训练日"
-#: exercises/templates/exercise/pending.html:14
-#: nutrition/templates/ingredient/pending.html:14
-msgid "Submission date"
-msgstr "提交日期"
+#: exercises/templates/history/overview.html:27
+#, fuzzy
+#| msgid "Actions"
+msgid "Action"
+msgstr "操作"
-#: exercises/templates/exercise/pending.html:16 gallery/models/image.py:51
+#: exercises/templates/history/overview.html:28 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/log.py:45
@@ -1833,97 +1717,41 @@ msgstr "提交日期"
msgid "User"
msgstr "用户"
-#: exercises/templates/exercise/view.html:48
-msgid "Exercise is pending review"
-msgstr "该健身项目待审核"
-
-#: exercises/templates/exercise/view.html:51
-msgid ""
-"This user submitted exercise is pending a decision to be\n"
-" included in the database."
+#: exercises/templates/history/overview.html:29
+msgid "Object"
msgstr ""
-#: exercises/templates/exercise/view.html:53
-msgid "Till then, it will not be shown in the overview or the search."
-msgstr "在这之前,它不会出现在总览和搜索中出现"
-
-#: exercises/templates/exercise/view.html:54
-#: nutrition/templates/ingredient/view.html:31
-msgid "Please select one of the options below."
-msgstr "请选择通过或者拒绝."
-
-#: exercises/templates/exercise/view.html:60
-#: 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:204
-#: nutrition/templates/ingredient/view.html:42
-msgid "Decline"
-msgstr "拒绝"
-
-#: exercises/templates/exercise/view.html:96
-msgid "Images"
-msgstr "图片"
-
-#: exercises/templates/exercise/view.html:137 exercises/views/images.py:93
-msgid "Add new image"
-msgstr "新增图片"
-
-#: 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:218
-msgid "Comments for this exercise"
-msgstr "健身项目的评论"
-
-#: exercises/templates/exercise/view.html:246
-msgid "Add new comment"
-msgstr "新增评论"
+#: exercises/templates/history/overview.html:31
+#, fuzzy
+#| msgid "Change password"
+msgid "Changes"
+msgstr "修改密码"
-#: exercises/templates/exercise/view.html:260
-msgid "The diagram shows the most used muscles on this exercise"
-msgstr "下面的简图展示在这次练习中使用最多的肌肉群"
+#: exercises/templates/history/overview.html:32
+msgid "Revert"
+msgstr ""
-#: exercises/templates/exercise/view.html:301
-#: manager/templates/workout/log.html:10 manager/templates/workout/log.html:11
-msgid "Weight log"
-msgstr "体重日志"
+#: exercises/templates/history/overview.html:64
+msgid "View Object"
+msgstr ""
-#: exercises/templates/exercise/view.html:306
-msgid "Exercise Variations"
-msgstr "动作变体"
+#: exercises/templates/history/overview.html:75
+msgid "View changes"
+msgstr ""
-#: exercises/templates/exercise/view.html:327
-msgid "Submit a correction"
-msgstr "提交修正"
+#: exercises/templates/history/overview.html:86
+msgid "Revert changes"
+msgstr ""
#: exercises/templates/muscles/admin-overview.html:4
-#: exercises/templates/muscles/overview.html:7
msgid "Muscle overview"
msgstr "肌肉总览"
#: exercises/templates/muscles/admin-overview.html:36
-#: exercises/views/muscles.py:86
+#: exercises/views/muscles.py:67
msgid "Add muscle"
msgstr "新增肌肉"
-#: exercises/templates/muscles/overview.html:85
-msgid ""
-"No exercises for this muscle. Add or edit an exercise and set the muscle."
-msgstr ""
-
#: exercises/views/categories.py:71
msgid "Add category"
msgstr "新增类别"
@@ -1936,50 +1764,19 @@ msgstr "这也会删除该类别下的所有健身项目."
msgid "Add exercise comment"
msgstr "新增健身项目的评论"
-#: exercises/views/equipment.py:107 exercises/views/equipment.py:118
+#: exercises/views/equipment.py:105 exercises/views/equipment.py:116
msgid "Delete equipment?"
msgstr "删除器材?"
-#: 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:247
-msgid "Add exercise"
-msgstr "新增健身项目"
-
-#: exercises/views/exercises.py:367
-msgid "Thank you. Once the changes are reviewed the exercise will be updated."
-msgstr "谢谢你. 一旦修改被审核通过,那么该健身项目也会随之更新."
-
-#: exercises/views/exercises.py:380
-#, python-brace-format
-msgid "Correct {0}"
-msgstr "修正{0}"
+#: exercises/views/exercises.py:161
+#, python-format
+msgid "%(name)s is too similar to existing exercise \"%(exercise_name)s\""
+msgstr ""
-#: exercises/views/exercises.py:422
+#: exercises/views/exercises.py:184
msgid "This will delete the exercise from all workouts."
msgstr "这会从所有的健身中删除该健身项目."
-#: exercises/views/exercises.py:474
-msgid "Exercise was successfully marked as rejected"
-msgstr "健身项目被成功标记为拒绝."
-
-#: exercises/views/images.py:68
-msgid "Edit exercise image"
-msgstr "编辑健身项目图片"
-
-#: exercises/views/images.py:143
-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 "添加图片"
@@ -2046,7 +1843,7 @@ msgid "Contract type"
msgstr "合同类型"
#: gym/models/contract.py:208 gym/templates/contract/view.html:59
-#: manager/templates/log/add.html:52 nutrition/forms.py:59
+#: manager/templates/log/add.html:52 nutrition/forms.py:60
#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:102
#: nutrition/models/meal_item.py:72
msgid "Amount"
@@ -2147,6 +1944,10 @@ msgstr "如果什么都不填写将使用文件名"
msgid "User notes"
msgstr "用户备注"
+#: gym/templates/contract/list.html:36
+msgid "Show"
+msgstr "展示"
+
#: gym/templates/contract/view.html:4
msgid "Contract"
msgstr "合同"
@@ -2225,10 +2026,6 @@ msgstr "邮件"
msgid "Add member"
msgstr "新增会员"
-#: gym/templates/gym/new_user.html:38
-msgid "Date of Birth"
-msgstr ""
-
#: gym/templates/gym/new_user.html:48 manager/templates/calendar/month.html:144
#: manager/templates/log/add.html:75 nutrition/templates/rate/form.html:120
msgid "Info"
@@ -2287,130 +2084,130 @@ msgstr "添加用户到健身房"
msgid "Edit gym"
msgstr "编辑健身房"
-#: i18n.tpl:2 i18n.tpl:28
+#: i18n.tpl:2
+msgid "Until Failure"
+msgstr ""
+
+#: i18n.tpl:3 manager/forms.py:180 manager/models/log.py:73
+#: manager/templates/set/add.html:53
+msgid "Repetitions"
+msgstr "重复次数"
+
+#: i18n.tpl:4
msgid "Abs"
msgstr "腹部"
-#: i18n.tpl:3
+#: i18n.tpl:5
msgid "Arms"
msgstr "手臂"
-#: i18n.tpl:4
-msgid "Back"
-msgstr "背部"
-
-#: i18n.tpl:5 i18n.tpl:23
-msgid "Calves"
-msgstr "小腿"
-
-#: i18n.tpl:6 i18n.tpl:26
-msgid "Chest"
-msgstr "胸部"
-
-#: i18n.tpl:7
+#: i18n.tpl:6
msgid "Legs"
msgstr "双腿"
-#: i18n.tpl:8 i18n.tpl:19
-msgid "Shoulders"
-msgstr "肩部"
+#: i18n.tpl:7
+msgid "Dumbbell"
+msgstr "哑铃"
+
+#: i18n.tpl:8
+#, fuzzy
+#| msgid "Biceps brachii"
+msgid "Biceps"
+msgstr "肱二头肌"
#: i18n.tpl:9
-msgid "Barbell"
-msgstr "杠铃"
+msgid "SZ-Bar"
+msgstr "SZ杠"
#: i18n.tpl:10
-msgid "Bench"
-msgstr "长凳"
+msgid "Kettlebell"
+msgstr "壶铃"
#: i18n.tpl:11
-msgid "Dumbbell"
-msgstr "哑铃"
+msgid "Swiss Ball"
+msgstr "平衡球"
#: i18n.tpl:12
-msgid "Gym mat"
-msgstr "体操垫"
+msgid "none (bodyweight exercise)"
+msgstr ""
#: i18n.tpl:13
-msgid "Incline bench"
-msgstr "斜椅"
+msgid "Calves"
+msgstr "小腿"
#: i18n.tpl:14
-msgid "Kettlebell"
-msgstr "壶铃"
+msgid "Back"
+msgstr "背部"
#: i18n.tpl:15
-msgid "Pull-up bar"
-msgstr "上拉杆"
+msgid "Lower back"
+msgstr ""
#: i18n.tpl:16
-msgid "SZ-Bar"
-msgstr "SZ杠"
+msgid "Lats"
+msgstr ""
#: i18n.tpl:17
-msgid "Swiss Ball"
-msgstr "平衡球"
+msgid "Hamstrings"
+msgstr ""
#: i18n.tpl:18
-msgid "none (bodyweight exercise)"
+msgid "Bench"
+msgstr "长凳"
+
+#: i18n.tpl:19
+msgid "Glutes"
msgstr ""
#: i18n.tpl:20
-#, fuzzy
-#| msgid "Biceps brachii"
-msgid "Biceps"
-msgstr "肱二头肌"
+msgid "Kilometers"
+msgstr ""
#: i18n.tpl:21
-msgid "Hamstrings"
-msgstr ""
+msgid "Shoulders"
+msgstr "肩部"
#: i18n.tpl:22
-msgid "Lower back"
+msgid "Seconds"
msgstr ""
-#: i18n.tpl:24
-msgid "Glutes"
+#: i18n.tpl:23
+msgid "Miles"
msgstr ""
-#: i18n.tpl:25
-msgid "Lats"
-msgstr ""
+#: i18n.tpl:24
+msgid "Incline bench"
+msgstr "斜椅"
-#: i18n.tpl:27
+#: i18n.tpl:25
msgid "Quads"
msgstr ""
-#: i18n.tpl:29
-#, fuzzy
-#| msgid "Triceps brachii"
-msgid "Triceps"
-msgstr "肱三头肌"
-
-#: i18n.tpl:30
-msgid "Kilometers"
+#: i18n.tpl:26
+msgid "Minutes"
msgstr ""
-#: i18n.tpl:31
-msgid "Miles"
-msgstr ""
+#: i18n.tpl:27
+msgid "Chest"
+msgstr "胸部"
-#: i18n.tpl:32
-msgid "Minutes"
-msgstr ""
+#: i18n.tpl:28
+msgid "Gym mat"
+msgstr "体操垫"
-#: i18n.tpl:33 manager/forms.py:169 manager/models/log.py:71
-#: manager/templates/set/add.html:53
-msgid "Repetitions"
-msgstr "重复次数"
+#: i18n.tpl:29
+msgid "Pull-up bar"
+msgstr "上拉杆"
-#: i18n.tpl:34
-msgid "Seconds"
-msgstr ""
+#: i18n.tpl:30
+msgid "Barbell"
+msgstr "杠铃"
-#: i18n.tpl:35
-msgid "Until Failure"
-msgstr ""
+#: i18n.tpl:31
+#, fuzzy
+#| msgid "Triceps brachii"
+msgid "Triceps"
+msgstr "肱三头肌"
#: mailer/forms.py:34 mailer/templates/mailer/gym/preview.html:32
msgctxt "As in \"email subject\""
@@ -2463,44 +2260,44 @@ msgstr ""
msgid "Correction"
msgstr "修正"
-#: manager/forms.py:89 manager/models/workout.py:59
+#: manager/forms.py:92 manager/models/workout.py:59
msgid "The name of the workout"
msgstr "健身计划的名称"
-#: manager/forms.py:93 manager/models/workout.py:66
+#: manager/forms.py:96 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 "一个健身的简短描述或者目标.像'专注于背部训练'或者'某某教程第1周'等"
-#: manager/forms.py:126
+#: manager/forms.py:137
msgid ""
"You can search for more than one exercise, they will be grouped together for "
"a superset."
msgstr "你可以搜索多个健身项目,它们将会被聚合成一个超集."
-#: 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
+#: manager/forms.py:166 manager/forms.py:171 manager/models/log.py:64
+#: manager/models/log.py:92 manager/models/setting.py:59
+#: manager/models/setting.py:90 manager/templates/log/add.html:53
+#: manager/templates/log/add.html:55 manager/templates/set/formset.html:10
+#: manager/templates/set/formset.html:12 measurements/models/category.py:58
+#: nutrition/forms.py:64
msgid "Unit"
msgstr ""
-#: manager/forms.py:266
+#: manager/forms.py:277
msgid "Type"
msgstr ""
-#: manager/forms.py:267 manager/templates/workout/view.html:157
+#: manager/forms.py:278 manager/templates/workout/view.html:157
msgid "Table"
msgstr ""
-#: manager/forms.py:269 manager/templates/workout/view.html:163
+#: manager/forms.py:280 manager/templates/workout/view.html:163
msgid "with images"
msgstr ""
-#: manager/forms.py:270 manager/templates/workout/view.html:169
+#: manager/forms.py:281 manager/templates/workout/view.html:169
msgid "with comments"
msgstr ""
@@ -2554,7 +2351,7 @@ msgid "The duration in weeks"
msgstr "每周持续时间"
#: manager/models/schedule_step.py:63 manager/models/set.py:52
-#: manager/models/setting.py:98 nutrition/models/meal.py:54
+#: manager/models/setting.py:110 nutrition/models/meal.py:54
#: nutrition/models/meal_item.py:65
msgid "Order"
msgstr ""
@@ -2605,7 +2402,7 @@ msgstr "训练日"
msgid "Number of sets"
msgstr "组数"
-#: manager/models/setting.py:43
+#: manager/models/setting.py:48
msgid "Sets"
msgstr "组"
@@ -2861,6 +2658,13 @@ msgid ""
"option in your settings."
msgstr ""
+#: manager/templates/workout/email_reminder.tpl:15
+#: manager/templates/workout/email_weight_reminder.tpl:12
+#: nutrition/templates/ingredient/email_new.tpl:9
+#, python-format
+msgid "The %(site)s team"
+msgstr "%(site)s团队"
+
#: manager/templates/workout/email_weight_reminder.tpl:3
#, python-format
msgid ""
@@ -2873,6 +2677,10 @@ msgid ""
"You will regularly receive such reminders till you enter your current weight."
msgstr ""
+#: manager/templates/workout/log.html:10 manager/templates/workout/log.html:11
+msgid "Weight log"
+msgstr "体重日志"
+
#: manager/templates/workout/log.html:29
msgid "Weight log for workout"
msgstr "健身的体重日志"
@@ -2969,7 +2777,7 @@ msgstr ""
msgid "Edit workout"
msgstr "编辑健身"
-#: manager/templates/workout/view.html:225 manager/views/workout.py:300
+#: manager/templates/workout/view.html:225 manager/views/workout.py:301
msgid "Mark as template"
msgstr ""
@@ -2977,11 +2785,6 @@ msgstr ""
msgid "Add workout day"
msgstr "新增健身日"
-#: manager/views/log.py:92
-#, python-format
-msgid "Edit log entry for %s"
-msgstr ""
-
#: manager/views/log.py:111
msgid "Delete workout log"
msgstr "删除健身日志"
@@ -2999,11 +2802,11 @@ msgstr ""
msgid "Your workouts"
msgstr "你的健身"
-#: manager/views/workout.py:227
+#: manager/views/workout.py:228
msgid "Copy workout"
msgstr "拷贝健身"
-#: manager/views/workout.py:230
+#: manager/views/workout.py:231
msgid "Copy"
msgstr ""
@@ -3025,29 +2828,29 @@ msgstr ""
msgid "Value"
msgstr ""
-#: nutrition/forms.py:122
+#: nutrition/forms.py:123
msgid "Calculate"
msgstr "计算"
-#: nutrition/forms.py:195 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:196 nutrition/templates/rate/form.html:76
msgid "Basic caloric intake"
msgstr ""
-#: nutrition/forms.py:196
+#: nutrition/forms.py:197
msgid "Your basic caloric intake as calculated for your data"
msgstr ""
-#: nutrition/forms.py:202
+#: nutrition/forms.py:203
msgid "Additional calories"
msgstr "额外卡路里"
-#: nutrition/forms.py:204
+#: nutrition/forms.py:205
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
msgstr ""
-#: nutrition/forms.py:232 nutrition/models/ingredient_weight_unit.py:39
+#: nutrition/forms.py:233 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"
@@ -3110,7 +2913,7 @@ msgid ""
"{energy_approx}%)"
msgstr ""
-#: nutrition/models/ingredient.py:357 nutrition/views/ingredient.py:225
+#: nutrition/models/ingredient.py:357 nutrition/views/ingredient.py:219
msgid "Ingredient was successfully added to the general database"
msgstr ""
@@ -3139,6 +2942,10 @@ msgstr ""
msgid "Meal"
msgstr ""
+#: nutrition/models/log.py:65
+msgid "Date and Time (Approx.)"
+msgstr ""
+
#: nutrition/models/meal.py:61
msgid "Time (approx)"
msgstr ""
@@ -3233,6 +3040,10 @@ msgid ""
"added to nutrition plans. You can access it on this address:"
msgstr ""
+#: nutrition/templates/ingredient/email_new.tpl:8
+msgid "Thank you for contributing and making this site better!"
+msgstr "谢谢你的贡献让网站越来越好."
+
#: nutrition/templates/ingredient/form.html:4
msgid "Submitting an ingredient"
msgstr ""
@@ -3257,6 +3068,10 @@ msgstr ""
msgid "No ingredients."
msgstr ""
+#: nutrition/templates/ingredient/overview.html:57
+msgid "Search"
+msgstr "搜索"
+
#: nutrition/templates/ingredient/overview.html:66
msgid "ingredient name"
msgstr "食谱名称"
@@ -3266,6 +3081,14 @@ msgstr "食谱名称"
msgid "Add ingredient"
msgstr "新增食谱"
+#: nutrition/templates/ingredient/overview.html:85
+msgid "Only registered users can do this"
+msgstr "只有注册用户才可以操作"
+
+#: nutrition/templates/ingredient/pending.html:14
+msgid "Submission date"
+msgstr "提交日期"
+
#: nutrition/templates/ingredient/view.html:27
msgid "Ingredient is pending review"
msgstr "该食谱待审核"
@@ -3281,6 +3104,18 @@ msgstr ""
"最终来决定是否将申请的食谱添加到数据库中.审核之前,该食谱不会在食谱总览或者\n"
"食谱搜索中出现."
+#: nutrition/templates/ingredient/view.html:31
+msgid "Please select one of the options below."
+msgstr "请选择通过或者拒绝."
+
+#: nutrition/templates/ingredient/view.html:38
+msgid "Accept"
+msgstr "接受"
+
+#: nutrition/templates/ingredient/view.html:42
+msgid "Decline"
+msgstr "拒绝"
+
#: nutrition/templates/ingredient/view.html:71
#: nutrition/templates/log/detail.html:31
#: nutrition/templates/plan/view.html:229 nutrition/views/plan.py:376
@@ -3526,14 +3361,18 @@ msgid ""
"yourself for some weeks and change the total amount if needed."
msgstr ""
-#: nutrition/views/ingredient.py:181
+#: nutrition/views/ingredient.py:175
msgid "Add a new ingredient"
msgstr "新增一个食谱"
-#: nutrition/views/ingredient.py:238
+#: nutrition/views/ingredient.py:232
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 ""
@@ -3754,15 +3593,15 @@ msgstr ""
msgid "100%% Free <br>and <br>Open Source"
msgstr ""
-#: utils/generic_views.py:261
+#: utils/generic_views.py:262
msgid "Yes, delete"
msgstr "是,删除"
-#: utils/models.py:47
+#: utils/models.py:48
msgid "Author"
msgstr "作者"
-#: utils/models.py:52
+#: utils/models.py:53
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."
@@ -3770,15 +3609,15 @@ msgstr ""
"如果你不是作者,请在这儿输入作者的名字或者来源.因为对于像CC-BY-SA一样的协议,这"
"是必须的."
-#: utils/models.py:77
+#: utils/models.py:78
msgid "Pending"
msgstr "审核中"
-#: utils/models.py:78
+#: utils/models.py:79
msgid "Accepted"
msgstr ""
-#: utils/models.py:79
+#: utils/models.py:80
msgid "Declined"
msgstr ""
@@ -3919,6 +3758,178 @@ msgstr ""
msgid "Delete weight entry for the %s"
msgstr ""
+#~ msgid "Ingredients"
+#~ msgstr "食谱"
+
+#~ msgid ""
+#~ "Use the configuration to select in what languages the\n"
+#~ "exercises and ingredients will be shown for the current language (for "
+#~ "example\n"
+#~ "the exercises should be shown in languages A, B and C; the ingredients "
+#~ "only\n"
+#~ "in A)."
+#~ msgstr ""
+#~ "使用这个配置来选择在当前语言环境下,\n"
+#~ "健身项目和食谱应该用什么语言来展示\n"
+#~ "(例如,健身项目应该使用语言A,B,C来展示;而食谱\n"
+#~ "只是用语言A来展示)."
+
+#~ msgctxt "as in sorted by category"
+#~ msgid "by category"
+#~ msgstr "按类别"
+
+#~ msgctxt "as in sorted by muscle"
+#~ msgid "by muscle"
+#~ msgstr "按肌肉"
+
+#~ msgctxt "as in sorted by equipment"
+#~ msgid "by equipment"
+#~ msgstr "按器械"
+
+#~ msgid "Add new exercise"
+#~ msgstr "新增健身项目"
+
+#~ msgid "Exercises pending review"
+#~ msgstr "健身项目审核"
+
+#~ msgid "Exercise was successfully added to the general database"
+#~ msgstr "健身项目被成功添加到通用数据库中"
+
+#~ msgid "New user submitted exercise"
+#~ msgstr "新用户提交锻炼动作"
+
+#, python-brace-format
+#~ msgid "The user {0} submitted a new exercise \"{1}\"."
+#~ msgstr "用户{0}提交了一次新训练“{1}”."
+
+#~ msgid "New user submitted image"
+#~ msgstr "新用户提交的图片"
+
+#, python-brace-format
+#~ msgid "The user {0} submitted a new image \"{1}\" for exercise {2}."
+#~ msgstr "用户{0}为健身项目{2}提交了一个新图片\"{1}\"."
+
+#~ msgid "Equipment overview"
+#~ msgstr "器材总览"
+
+#~ msgid "Main muscles"
+#~ msgstr "主要肌肉"
+
+#~ msgid ""
+#~ "No exercises for this equipment. Add or edit an exercise and set the "
+#~ "equipment."
+#~ msgstr "没有健身项目使用这个器材.新增或者编辑健身项目,然后设置使用该器材."
+
+#~ msgid "exercise name"
+#~ msgstr "健身项目名称"
+
+#, python-format
+#~ msgid ""
+#~ "Your exercise '%(exercise)s' was successfully added to the general\n"
+#~ "database."
+#~ msgstr "你的健身项目 '%(exercise)s'被成功添加到数据库中."
+
+#~ msgid "Submitting an exercise"
+#~ msgstr "提交健身项目中"
+
+#~ msgid ""
+#~ "Thank you for submitting an exercise. This is much\n"
+#~ "appreciated!"
+#~ msgstr ""
+#~ "感谢你提交一个新的健身项目.\n"
+#~ "非常感激你的贡献."
+
+#~ msgid ""
+#~ "After you submit the form, the administrators will be notified.\n"
+#~ "Once it is reviewed, it will be added to the database. Till this "
+#~ "happens,\n"
+#~ "it will not be visible in the overview or the search. In case you added "
+#~ "your email\n"
+#~ "when you registered, you will get notified when the process is completed "
+#~ "successfully."
+#~ msgstr ""
+#~ "你提交申请表单之后,管理员会收到通知.如果被审核通过,那么就会被添加到数据库"
+#~ "中.\n"
+#~ "管理员审核之前,在总览或者搜索中不会看到.\n"
+#~ "如果你在注册的时候添加了邮件,那么在审核过程成功完成之后,你也会收到通知."
+
+#~ msgid "Correcting an exercise"
+#~ msgstr "修正健身项目中"
+
+#~ msgid ""
+#~ "Thank you for correcting and improving this exercise.\n"
+#~ "This is much appreciated!"
+#~ msgstr "感谢你修正并改善这个健身项目.感激你的贡献."
+
+#~ msgid ""
+#~ "After you submit the form, the administrators will be notified.\n"
+#~ "Once the changes are reviewed the exercise will be updated."
+#~ msgstr ""
+#~ "你提交申请表单之后,管理员会收到通知.\n"
+#~ "一旦修改被审核通过,那么该健身项目也会随之更新."
+
+#~ msgid "No categories."
+#~ msgstr "没有类别."
+
+#~ msgid "Use link to create one"
+#~ msgstr "使用链接来新建一个"
+
+#~ msgid "Exercise is pending review"
+#~ msgstr "该健身项目待审核"
+
+#~ msgid "Till then, it will not be shown in the overview or the search."
+#~ msgstr "在这之前,它不会出现在总览和搜索中出现"
+
+#~ msgid "Images"
+#~ msgstr "图片"
+
+#~ msgid "Add new image"
+#~ msgstr "新增图片"
+
+#~ msgid "Videos"
+#~ msgstr "视频"
+
+#~ msgid "Add new video"
+#~ msgstr "添加视频"
+
+#~ msgid "Images pending review"
+#~ msgstr "待审核的图片"
+
+#~ msgid "Comments for this exercise"
+#~ msgstr "健身项目的评论"
+
+#~ msgid "Add new comment"
+#~ msgstr "新增评论"
+
+#~ msgid "The diagram shows the most used muscles on this exercise"
+#~ msgstr "下面的简图展示在这次练习中使用最多的肌肉群"
+
+#~ msgid "Exercise Variations"
+#~ msgstr "动作变体"
+
+#~ msgid "Submit a correction"
+#~ msgstr "提交修正"
+
+#~ msgid "Add exercise"
+#~ msgstr "新增健身项目"
+
+#~ msgid ""
+#~ "Thank you. Once the changes are reviewed the exercise will be updated."
+#~ msgstr "谢谢你. 一旦修改被审核通过,那么该健身项目也会随之更新."
+
+#, python-brace-format
+#~ msgid "Correct {0}"
+#~ msgstr "修正{0}"
+
+#~ msgid "Exercise was successfully marked as rejected"
+#~ msgstr "健身项目被成功标记为拒绝."
+
+#~ msgid "Edit exercise image"
+#~ msgstr "编辑健身项目图片"
+
+#~ msgid "Delete exercise image?"
+#~ msgstr "删除健身项目图片?"
+
#~ msgid "Anterior deltoid"
#~ msgstr "前三角肌"
@@ -3981,8 +3992,8 @@ msgstr ""
#~ "you might also be interested <a href=\"%(contribute)s\">in contributing</"
#~ "a>."
#~ msgstr ""
-#~ "如果你想要更近一步地帮助提升这个项目,你或许也会对 <a href=\"%(contribute)s"
-#~ "\">感兴趣</a>."
+#~ "如果你想要更近一步地帮助提升这个项目,你或许也会对 <a "
+#~ "href=\"%(contribute)s\">感兴趣</a>."
#~ msgid "Feedback form"
#~ msgstr "反馈表格"