Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Update .po files

Roland Geider190865764159
diff --git a/wger/locale/ar_SA/LC_MESSAGES/django.po b/wger/locale/ar_SA/LC_MESSAGES/django.po
index 54384fbfa..65172629b 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: 2026-01-17 14:03+0000\n"
+"POT-Creation-Date: 2026-04-10 10:20+0000\n"
"PO-Revision-Date: 2026-04-07 08:09+0000\n"
"Last-Translator: \"E. Ta.\" <[email protected]>\n"
"Language-Team: Arabic (Saudi Arabia) <https://hosted.weblate.org/projects/"
@@ -37,7 +37,7 @@ msgstr ""
#: config/views/gym_config.py:42 core/templates/language/view.html:64
#: core/templates/license/list.html:17
#: core/templates/repetition_unit/list.html:18
-#: core/templates/user/overview.html:204 core/templates/user/overview.html:467
+#: core/templates/user/overview.html:207 core/templates/user/overview.html:470
#: core/templates/weight_unit/list.html:18
#: exercises/templates/categories/admin-overview.html:17
#: exercises/templates/equipment/admin-overview.html:17
@@ -49,30 +49,29 @@ msgstr ""
#: gym/templates/gym/list.html:19 gym/templates/gym/list.html:48
#: gym/templates/gym/member_list.html:94 gym/templates/gym/member_list.html:152
#: gym/templates/gym/member_list.html:190
-#: nutrition/templates/ingredient/view.html:164
-#: nutrition/templates/ingredient/view.html:209
-#: nutrition/templates/units/list.html:19
+#: nutrition/templates/ingredient/view.html:205
+#: nutrition/templates/ingredient/view.html:248
msgid "Edit"
msgstr "تعديل"
-#: core/forms.py:91 core/templates/navigation.html:271
-#: core/templates/navigation.html:278 core/templates/user/login.html:4
+#: core/forms.py:89 core/templates/navigation.html:268
+#: core/templates/navigation.html:275 core/templates/user/login.html:4
#: core/templates/user/registration_sidebar.html:12
#: software/templates/features.html:82 software/templates/features.html:448
msgid "Login"
msgstr "تسجيل الدخول"
-#: core/forms.py:130 core/forms.py:244 gym/views/export.py:61
+#: core/forms.py:128 core/forms.py:242 gym/views/export.py:61
#: gym/views/gym.py:217
msgid "First name"
msgstr "الاسم الأول"
-#: core/forms.py:131 core/forms.py:245 core/templates/user/overview.html:284
+#: core/forms.py:129 core/forms.py:243 core/templates/user/overview.html:287
#: gym/views/export.py:62 gym/views/gym.py:217
msgid "Last name"
msgstr "الاسم الأخير"
-#: core/forms.py:133 core/forms.py:210 core/templates/user/overview.html:288
+#: core/forms.py:131 core/forms.py:208 core/templates/user/overview.html:291
#: gym/models/contract.py:256 gym/models/gym.py:58
#: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:116
#: gym/templates/gym/new_user.html:30 gym/views/export.py:60
@@ -82,54 +81,55 @@ msgstr "الاسم الأخير"
msgid "Email"
msgstr "البريد الإلكتروني"
-#: core/forms.py:134
+#: core/forms.py:132
msgid "Used for password resets and, optionally, e-mail reminders."
msgstr ""
-"يستخدم لإعادة تعيين كلمة السر، واختياريًا، رسائل التذكير عبر البريد الإلكتروني."
+"يستخدم لإعادة تعيين كلمة السر، واختياريًا، رسائل التذكير عبر البريد "
+"الإلكتروني."
-#: core/forms.py:138 core/models/profile.py:222
+#: core/forms.py:136 core/models/profile.py:222
#: gym/templates/gym/new_user.html:38
msgid "Date of Birth"
msgstr "تاريخ الميلاد"
-#: core/forms.py:177
+#: core/forms.py:175
msgid "Personal data"
msgstr "المعلومات الشخصية"
-#: core/forms.py:189
+#: core/forms.py:187
msgid "Workout reminders"
msgstr "تذكيرات بالتمارين"
-#: core/forms.py:196
+#: core/forms.py:194
msgid "Other settings"
msgstr "إعدادات أخرى"
-#: core/forms.py:204 core/views/user.py:614 core/views/user.py:629
-#: core/views/user.py:641 gym/forms.py:73 utils/generic_views.py:143
+#: core/forms.py:202 core/views/user.py:630 core/views/user.py:654
+#: core/views/user.py:668 gym/forms.py:73 utils/generic_views.py:137
msgid "Save"
msgstr "حفظ"
-#: core/forms.py:211
+#: core/forms.py:209
msgid "Used for password resets and, optionally, email reminders."
msgstr "يستخدم لإعادة تعيين كلمة المرور، ورسائل التذكير عبر البريد الإلكتروني."
-#: core/forms.py:240
+#: core/forms.py:238
msgid "This e-mail address is already in use."
msgstr "هذا البريد مستخدم بالفعل."
-#: core/forms.py:261 gym/templates/gym/new_user.html:26
+#: core/forms.py:259 gym/templates/gym/new_user.html:26
#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:217
msgid "Password"
msgstr "كلمة السر"
-#: core/forms.py:263
+#: core/forms.py:261
msgid "Please enter your current password."
msgstr "الرجاء إدخال كلمة مرورك الحالية."
-#: core/forms.py:272 core/templates/language/view.html:70
+#: core/forms.py:270 core/templates/language/view.html:70
#: core/templates/license/list.html:21
#: core/templates/repetition_unit/list.html:22
-#: core/templates/user/overview.html:233
+#: core/templates/user/overview.html:236
#: core/templates/weight_unit/list.html:22
#: exercises/templates/categories/admin-overview.html:21
#: exercises/templates/equipment/admin-overview.html:21
@@ -137,27 +137,30 @@ msgstr "الرجاء إدخال كلمة مرورك الحالية."
#: gym/templates/admin_notes/list.html:37
#: gym/templates/contract_option/list.html:35
#: gym/templates/contract_type/list.html:36 gym/templates/document/list.html:46
-#: gym/templates/gym/list.html:23 nutrition/templates/ingredient/view.html:168
-#: nutrition/templates/ingredient/view.html:215
-#: nutrition/templates/units/list.html:25
+#: gym/templates/gym/list.html:23 nutrition/templates/ingredient/view.html:209
+#: nutrition/templates/ingredient/view.html:254
msgid "Delete"
msgstr "حذف"
-#: core/forms.py:281
+#: core/forms.py:279
msgid "Invalid password"
msgstr "كلمة مرور غير صالحة"
-#: core/forms.py:293
+#: core/forms.py:291 core/forms.py:349
msgid "The form is secured with reCAPTCHA"
msgstr "النموذج مؤمّن بـ reCAPTCHA"
-#: core/forms.py:314 core/forms.py:341 core/templates/navigation.html:272
-#: core/templates/navigation.html:285 core/templates/template.html:123
-#: core/templates/user/login.html:21 core/views/user.py:285
+#: core/forms.py:312 core/forms.py:339 core/templates/navigation.html:269
+#: core/templates/navigation.html:282 core/templates/template.html:113
+#: core/templates/user/login.html:21 core/views/user.py:293
#: software/templates/features.html:87 software/templates/features.html:442
msgid "Register"
msgstr "تسجيل"
+#: core/forms.py:360 weight/templates/import_csv_form.html:9
+msgid "Submit"
+msgstr ""
+
#: core/models/language.py:31 core/templates/language/view.html:21
msgid "Language short name"
msgstr "اسم اللغة المختصر"
@@ -179,8 +182,8 @@ msgid ""
"If a license has been localized, e.g. the Creative Commons licenses for the "
"different countries, add them as separate entries here."
msgstr ""
-"إذا تم توطين ترخيص ما، على سبيل المثال: تراخيص المشاع الإبداعي للدول المختلفة"
-"، فأضفها كمدخلات منفصلة هنا."
+"إذا تم توطين ترخيص ما، على سبيل المثال: تراخيص المشاع الإبداعي للدول "
+"المختلفة، فأضفها كمدخلات منفصلة هنا."
#: core/models/license.py:40
msgid "Short name, e.g. CC-BY-SA 3"
@@ -194,36 +197,36 @@ msgstr "الرابط"
msgid "Link to license text or other information"
msgstr "رابط لنص الترخيص أو معلومات أخرى"
-#: core/models/profile.py:57
+#: core/models/profile.py:60
#, python-format
msgid "%(birthdate)s is not a valid birthdate"
msgstr "تاريخ الميلاد %(birthdate)s غير صحيح"
-#: core/models/profile.py:66
+#: core/models/profile.py:69
msgid "Male"
msgstr "ذكر"
-#: core/models/profile.py:67
+#: core/models/profile.py:70
msgid "Female"
msgstr "أنثى"
-#: core/models/profile.py:74
+#: core/models/profile.py:77
msgid "Low"
msgstr "منخفض"
-#: core/models/profile.py:75
+#: core/models/profile.py:78
msgid "Medium"
msgstr "متوسط"
-#: core/models/profile.py:76
+#: core/models/profile.py:79
msgid "High"
msgstr "عالي"
-#: core/models/profile.py:82
+#: core/models/profile.py:85
msgid "Metric (kilogram)"
msgstr "النظام المتري (كيلوجرام)"
-#: core/models/profile.py:83
+#: core/models/profile.py:86
msgid "Imperial (pound)"
msgstr "النظام الإمبراطوري (رطل)"
@@ -341,7 +344,7 @@ msgstr "متوسط الساعات في الأسبوع"
msgid "Free time"
msgstr "وقت حر"
-#: core/models/profile.py:320 nutrition/templates/rate/form.html:66
+#: core/models/profile.py:320 nutrition/templates/rate/form.html:67
msgid "Total daily calories"
msgstr "إجمالي السعرات الحرارية اليومية"
@@ -362,9 +365,9 @@ 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:352
msgid "Automatic reminders for weight entries"
@@ -382,20 +385,41 @@ msgstr "فعّل الجوائز"
msgid "Enable or disable the trophy system for this user"
msgstr "تفعيل أو تعطيل نظام الجوائز لهذا المستخدم"
-#: core/models/profile.py:446
+#: core/models/profile.py:457
msgid "The sum of all hours has to be 24"
msgstr "يجب أن يكون مجموع جميع الساعات ٢٤"
-#: core/models/rep_unit.py:36 core/models/weight_unit.py:42
-#: core/templates/user/overview.html:280 core/views/user.py:589
+#: core/models/rep_unit.py:32 i18n.tpl:30
+msgid "Repetitions"
+msgstr ""
+
+#: core/models/rep_unit.py:33 core/templates/user/overview.html:82
+#: exercises/templates/history/overview.html:30
+msgid "Time"
+msgstr "الوقت"
+
+#: core/models/rep_unit.py:34
+msgid "Distance"
+msgstr ""
+
+#: core/models/rep_unit.py:47 core/models/weight_unit.py:42
+#: core/templates/user/overview.html:283 core/views/user.py:605
#: exercises/models/muscle.py:36 gym/models/contract.py:52
#: gym/models/contract.py:103 gym/models/gym.py:46
#: gym/models/user_document.py:84 gym/templates/contract/view.html:50
#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:108
-#: gym/views/gym.py:158 nutrition/templates/ingredient/view.html:151
+#: gym/views/gym.py:158 nutrition/templates/ingredient/view.html:192
msgid "Name"
msgstr "الاسم"
+#: core/models/rep_unit.py:53
+msgid "Unit Type"
+msgstr ""
+
+#: core/models/rep_unit.py:54
+msgid "The type of unit (repetitions, time, or distance)"
+msgstr ""
+
#: core/templates/403.html:4
msgid "Forbidden!"
msgstr "ممنوع!"
@@ -423,8 +447,57 @@ msgid ""
"later time. If the problem persists, you can seek help in ways listed below:"
msgstr ""
"حدث خطأ على الخدمة أثناء معالجة طلبك. حاول تحديث متصفحك، وإذا لم يحل ذلك "
-"المشكلة، يرجى المحاولة مرة أخرى لاحقًا. إذا استمرت المشكلة، يمكنك طلب المساعدة "
-"من الطرق المذكورة أدناه:"
+"المشكلة، يرجى المحاولة مرة أخرى لاحقًا. إذا استمرت المشكلة، يمكنك طلب "
+"المساعدة من الطرق المذكورة أدناه:"
+
+#: core/templates/account/email/email_confirmation_message.html:81
+msgid "Almost there!"
+msgstr ""
+
+#: core/templates/account/email/email_confirmation_message.html:85
+#, fuzzy, python-format
+#| msgid ""
+#| "You're receiving this e-mail because you requested a password reset for "
+#| "your user account at %(site_name)s."
+msgid ""
+"You're receiving this email because the user \"%(user_display)s\" has given "
+"your email address to register an account on %(site_domain)s."
+msgstr ""
+"تتلقى هذه الرسالة الإلكترونية لأنك طلبت إعادة تعيين كلمة المرور لحساب "
+"المستخدم الخاص بك على %(site_name)s."
+
+#: core/templates/account/email/email_confirmation_message.html:93
+msgid ""
+"Your email verification code is listed below. Please enter it in your open "
+"browser window."
+msgstr ""
+
+#: core/templates/account/email/email_confirmation_message.html:100
+#, fuzzy
+#| msgid "Please click the following link to confirm your email: %(link)s"
+msgid "Please click the button below to confirm your email address."
+msgstr "يرجى النقر على الرابط التالي لتأكيد بريدك الإلكتروني: %(link)s"
+
+#: core/templates/account/email/email_confirmation_message.html:106
+#, fuzzy
+#| msgid "Unverified email"
+msgid "Confirm email"
+msgstr "بريد إلكتروني غير موثق"
+
+#: core/templates/account/email/email_confirmation_message.html:110
+#, python-format
+msgid ""
+"The link is valid for %(expire_hours)s hours (until %(date)s, %(time)s). You "
+"can request a new one from your profile settings."
+msgstr ""
+
+#: core/templates/account/email/email_confirmation_message.html:116
+msgid "If the button doesn't work, copy and paste this link into your browser:"
+msgstr ""
+
+#: core/templates/account/email/email_confirmation_message.html:125
+msgid "the wger Team"
+msgstr "فريق wger"
#: core/templates/base.html:10
#, python-format
@@ -457,51 +530,7 @@ 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 verification"
-msgstr "توثيق البريد الإلكتروني"
-
-#: core/templates/email_verification/confirm_template.html:18
-#, python-format
-msgid "%(username)s, your email was verified"
-msgstr "%(username)s، تم توثيق بريدك الإلكتروني"
-
-#: 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 "أنت على وشك الوصول، %(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 "يرجى النقر <a href=\"%(link)s\">هنا</a> لتأكيد بريدك الإلكتروني"
-
-#: 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 "تنتهي صلاحية الرمز في %(time)s"
-
-#: core/templates/email_verification/email_body_html.tpl:14
-#: core/templates/email_verification/email_body_txt.tpl:8
-msgid "the wger Team"
-msgstr "فريق wger"
-
-#: core/templates/email_verification/email_body_txt.tpl:4
-#, python-format
-msgid "Please click the following link to confirm your email: %(link)s"
-msgstr "يرجى النقر على الرابط التالي لتأكيد بريدك الإلكتروني: %(link)s"
-
-#: core/templates/language/overview.html:4 core/templates/navigation.html:344
+#: core/templates/language/overview.html:4 core/templates/navigation.html:341
msgid "Languages"
msgstr "اللغات"
@@ -510,16 +539,16 @@ msgid "Nothing found."
msgstr "لم يتم العثور على شيء."
#: core/templates/language/overview.html:22
-#: nutrition/templates/ingredient/overview.html:38
+#: nutrition/templates/ingredient/overview.html:43
msgid "Add one now."
msgstr "أضف واحدًا الآن."
#: core/templates/language/overview.html:34 core/templates/license/list.html:43
-#: core/templates/repetition_unit/list.html:46
-#: core/templates/user/overview.html:344 core/templates/user/overview.html:384
-#: core/templates/user/overview.html:422
-#: core/templates/weight_unit/list.html:46 core/views/languages.py:74
-#: core/views/license.py:66 core/views/repetition_units.py:66
+#: core/templates/repetition_unit/list.html:44
+#: core/templates/user/overview.html:347 core/templates/user/overview.html:387
+#: core/templates/user/overview.html:425
+#: core/templates/weight_unit/list.html:46 core/views/languages.py:77
+#: core/views/license.py:66 core/views/repetition_units.py:76
#: core/views/weight_units.py:66
#: exercises/templates/categories/admin-overview.html:40
#: exercises/templates/equipment/admin-overview.html:39
@@ -532,14 +561,14 @@ msgstr "أضف واحدًا الآن."
#: gym/templates/gym/member_list.html:264
#: gym/templates/gym/member_list.html:303
#: mailer/templates/mailer/gym/overview.html:43
-#: nutrition/templates/ingredient/overview.html:60
+#: nutrition/templates/ingredient/overview.html:97
msgid "Add"
msgstr "إضافة"
#: core/templates/language/view.html:61 core/templates/user/api_key.html:41
#: core/templates/user/preferences.html:50 gym/models/contract.py:203
#: gym/templates/contract/view.html:41 gym/templates/gym/member_list.html:270
-#: nutrition/templates/ingredient/view.html:206
+#: nutrition/templates/ingredient/view.html:245
msgid "Options"
msgstr "الخيارات"
@@ -549,9 +578,9 @@ msgstr "قائمة التراخيص"
#: core/templates/license/list.html:30
#: core/templates/repetition_unit/list.html:32
-#: core/templates/user/overview.html:104 core/templates/user/overview.html:136
-#: core/templates/user/overview.html:185 core/templates/user/overview.html:365
-#: core/templates/user/overview.html:404 core/templates/user/overview.html:448
+#: core/templates/user/overview.html:107 core/templates/user/overview.html:139
+#: core/templates/user/overview.html:188 core/templates/user/overview.html:368
+#: core/templates/user/overview.html:407 core/templates/user/overview.html:451
#: core/templates/weight_unit/list.html:32
#: exercises/templates/categories/admin-overview.html:30
#: exercises/templates/equipment/admin-overview.html:30
@@ -563,11 +592,10 @@ msgstr "قائمة التراخيص"
#: gym/templates/gym/member_list.html:284
#: gym/templates/gym/member_list.html:321
#: mailer/templates/mailer/gym/overview.html:30
-#: nutrition/templates/units/list.html:34
msgid "Nothing found"
msgstr "لم يتم العثور على شيء"
-#: core/templates/misc/about.html:4 core/templates/template.html:160
+#: core/templates/misc/about.html:4 core/templates/template.html:150
msgid "Imprint"
msgstr "طبع"
@@ -575,162 +603,157 @@ msgstr "طبع"
msgid "Training"
msgstr "تمرين"
-#: core/templates/navigation.html:37 core/templates/user/overview.html:25
+#: core/templates/navigation.html:36 core/templates/user/overview.html:28
msgid "Routines"
msgstr "الروتينات"
-#: core/templates/navigation.html:45 core/templates/user/overview.html:70
+#: core/templates/navigation.html:44 core/templates/user/overview.html:73
msgid "Calendar"
msgstr "التقويم"
-#: core/templates/navigation.html:55
+#: core/templates/navigation.html:53
msgid "Measurements"
msgstr "القياسات"
-#: core/templates/navigation.html:66 gallery/templates/images/overview.html:6
+#: core/templates/navigation.html:64 gallery/templates/images/overview.html:6
msgid "Gallery"
msgstr "المعرض"
-#: core/templates/navigation.html:72
+#: core/templates/navigation.html:74 core/templates/navigation.html:400
+#: trophies/templates/trophies/overview.html:7
+msgid "Trophies"
+msgstr "الجوائز"
+
+#: core/templates/navigation.html:79
msgid "Workout templates"
msgstr "قوالب تمارين"
-#: core/templates/navigation.html:79
+#: core/templates/navigation.html:86
msgid "Your templates"
msgstr "قوالبك"
-#: core/templates/navigation.html:88
+#: core/templates/navigation.html:95
msgid "Public templates"
msgstr "قوالب عامة"
-#: core/templates/navigation.html:96 software/templates/features.html:51
+#: core/templates/navigation.html:103 software/templates/features.html:51
#: software/templates/features.html:480
msgid "Exercises"
msgstr "تمارين"
-#: core/templates/navigation.html:102 core/templates/navigation.html:176
-#: core/templates/navigation.html:339
+#: core/templates/navigation.html:109 core/templates/navigation.html:336
msgid "Administration"
msgstr "إدارة"
-#: core/templates/navigation.html:106
+#: core/templates/navigation.html:113
msgid "Exercise edit history"
msgstr "تاريخ تعديل التمارين"
-#: core/templates/navigation.html:112
+#: core/templates/navigation.html:119
msgid "Equipment"
msgstr "معدات"
-#: core/templates/navigation.html:118
+#: core/templates/navigation.html:125
msgid "Muscles"
msgstr "عضلات"
-#: core/templates/navigation.html:124
+#: core/templates/navigation.html:131
#: exercises/templates/categories/admin-overview.html:4
msgid "Categories"
msgstr "فئات"
-#: core/templates/navigation.html:139 software/templates/features.html:468
+#: core/templates/navigation.html:146 software/templates/features.html:468
msgid "Nutrition"
msgstr "تغذية"
-#: core/templates/navigation.html:147 core/templates/user/overview.html:144
+#: core/templates/navigation.html:154 core/templates/user/overview.html:147
msgid "Nutrition plans"
msgstr "خطط التغذية"
-#: core/templates/navigation.html:156
+#: core/templates/navigation.html:163
msgid "BMI calculator"
msgstr "حاسبة مؤشر كتلة الجسم"
-#: core/templates/navigation.html:165 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:172 nutrition/templates/rate/form.html:18
msgid "Daily calories calculator"
msgstr "حاسبة السعرات الحرارية اليومية"
-#: core/templates/navigation.html:171
+#: core/templates/navigation.html:178
#: nutrition/templates/ingredient/overview.html:10
msgid "Ingredient overview"
msgstr "نظرة عامة على المكونات"
-#: core/templates/navigation.html:180 nutrition/templates/units/list.html:6
-msgid "Ingredient weight units"
-msgstr "وحدات وزن المكون"
-
-#: core/templates/navigation.html:196 software/templates/features.html:463
+#: core/templates/navigation.html:193 software/templates/features.html:463
msgid "Body weight"
msgstr "وزن الجسم"
-#: core/templates/navigation.html:203 core/templates/user/overview.html:114
+#: core/templates/navigation.html:200 core/templates/user/overview.html:117
msgid "Weight overview"
msgstr "نظرة عامة على الوزن"
-#: core/templates/navigation.html:217
+#: core/templates/navigation.html:214
msgid "About this software"
msgstr "حول هذا البرنامج"
-#: core/templates/navigation.html:223 software/templates/about_us.html:5
+#: core/templates/navigation.html:220 software/templates/about_us.html:5
msgid "Support & Get Involved"
msgstr "ادعم وشارك"
-#: core/templates/navigation.html:229 software/templates/features.html:528
+#: core/templates/navigation.html:226 software/templates/features.html:528
msgid "REST API"
msgstr "واجهة برمجة تطبيقات REST"
-#: core/templates/navigation.html:235 utils/models.py:45
+#: core/templates/navigation.html:232 utils/models.py:45
msgid "License"
msgstr "ترخيص"
-#: core/templates/navigation.html:241
+#: core/templates/navigation.html:238
msgid "Developer documentation"
msgstr "وثائق المطور"
-#: core/templates/navigation.html:248
+#: core/templates/navigation.html:245
msgid "Get the code"
msgstr "احصل على الكود"
-#: core/templates/navigation.html:255 core/templates/template.html:199
-#: software/templates/features.html:603
+#: core/templates/navigation.html:252 core/templates/template.html:202
+#: software/templates/features.html:614
msgid "Translate"
msgstr "ترجمة"
-#: core/templates/navigation.html:292 core/templates/user/login.html:30
+#: core/templates/navigation.html:289 core/templates/user/login.html:30
msgid "Reset password"
msgstr "إعادة تعيين كلمة المرور"
-#: core/templates/navigation.html:301 core/templates/navigation.html:329
+#: core/templates/navigation.html:298 core/templates/navigation.html:326
msgid "Logout"
msgstr "تسجيل الخروج"
-#: core/templates/navigation.html:320
+#: core/templates/navigation.html:317
msgid "My preferences"
msgstr "تفضيلاتي"
-#: core/templates/navigation.html:352
+#: core/templates/navigation.html:349
msgid "Licenses"
msgstr "التراخيص"
-#: core/templates/navigation.html:360
+#: core/templates/navigation.html:357
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr "وحدات التكرار"
-#: core/templates/navigation.html:368 core/templates/weight_unit/list.html:4
-#: nutrition/templates/ingredient/view.html:141
+#: core/templates/navigation.html:365 core/templates/weight_unit/list.html:4
+#: nutrition/templates/ingredient/view.html:182
msgid "Weight units"
msgstr "وحدات الوزن"
-#: core/templates/navigation.html:376 core/templates/user/list.html:4
+#: core/templates/navigation.html:373 core/templates/user/list.html:4
msgid "User list"
msgstr "قائمة المستخدمين"
-#: core/templates/navigation.html:382
+#: core/templates/navigation.html:379
msgid "Gyms"
msgstr "الصالات"
-#: core/templates/navigation.html:403
-#: trophies/templates/trophies/overview.html:7
-msgid "Trophies"
-msgstr "الجوائز"
-
#: core/templates/registration/password_reset_complete.html:4
msgid "Password reset complete"
msgstr "تمت إعادة تعيين كلمة المرور"
@@ -761,8 +784,8 @@ msgid ""
"You're receiving this e-mail because you requested a password reset for your "
"user account at %(site_name)s."
msgstr ""
-"تتلقى هذه الرسالة الإلكترونية لأنك طلبت إعادة تعيين كلمة المرور لحساب المستخدم "
-"الخاص بك على %(site_name)s."
+"تتلقى هذه الرسالة الإلكترونية لأنك طلبت إعادة تعيين كلمة المرور لحساب "
+"المستخدم الخاص بك على %(site_name)s."
#: core/templates/registration/password_reset_email.html:4
msgid "Please go to the following page and choose a new password:"
@@ -790,25 +813,29 @@ msgstr "السابق"
msgid "next"
msgstr "التالي"
-#: core/templates/template.html:96
+#: core/templates/template.html:86
msgid "Close"
msgstr "إغلاق"
-#: core/templates/template.html:112
+#: core/templates/template.html:102
msgid ""
"You are using a guest account, data entered will be deleted after a week."
msgstr "أنت تستخدم حساب ضيف، وسيتم حذف البيانات المدخلة بعد أسبوع."
-#: core/templates/template.html:117
+#: core/templates/template.html:107
msgid "Create some demo entries"
msgstr "أنشئ بعض الإدخالات التجريبية"
-#: core/templates/template.html:165 software/templates/features.html:568
+#: core/templates/template.html:155 software/templates/features.html:568
#: software/templates/tos.html:7
msgid "Terms of service"
msgstr "شروط الخدمة"
-#: core/templates/template_features.html:53 software/templates/features.html:9
+#: core/templates/template.html:181 software/templates/features.html:595
+msgid "Browser language"
+msgstr ""
+
+#: core/templates/template_features.html:46 software/templates/features.html:9
msgid "Features"
msgstr "الميزات"
@@ -867,99 +894,94 @@ msgstr "ليس لديك حساب؟"
msgid "Forgot password?"
msgstr "هل نسيت كلمة السر؟"
-#: core/templates/user/overview.html:25 core/templates/user/overview.html:68
-#: core/templates/user/overview.html:112 core/templates/user/overview.html:144
-#: core/templates/user/overview.html:348 core/templates/user/overview.html:390
-#: core/templates/user/overview.html:426
+#: core/templates/user/overview.html:28 core/templates/user/overview.html:71
+#: core/templates/user/overview.html:115 core/templates/user/overview.html:147
+#: core/templates/user/overview.html:351 core/templates/user/overview.html:393
+#: core/templates/user/overview.html:429
#, python-format
msgid "last %(number)s"
msgstr "آخر %(number)s"
-#: core/templates/user/overview.html:27 core/templates/user/overview.html:146
-#: core/templates/user/overview.html:343 core/templates/user/overview.html:382
-#: core/templates/user/overview.html:421 gym/templates/gym/member_list.html:226
+#: core/templates/user/overview.html:30 core/templates/user/overview.html:149
+#: core/templates/user/overview.html:346 core/templates/user/overview.html:385
+#: core/templates/user/overview.html:424 gym/templates/gym/member_list.html:226
#: gym/templates/gym/member_list.html:262
#: gym/templates/gym/member_list.html:302
msgid "Overview"
msgstr "نظرة عامة"
-#: core/templates/user/overview.html:34 core/templates/user/overview.html:76
-#: core/templates/user/overview.html:120 core/templates/user/overview.html:152
+#: core/templates/user/overview.html:37 core/templates/user/overview.html:79
+#: core/templates/user/overview.html:123 core/templates/user/overview.html:155
#: manager/helpers.py:88 software/templates/about_us.html:170
#: weight/templates/import_csv_preview.html:13
#: weight/templates/import_csv_preview.html:42 weight/views.py:54
msgid "Date"
msgstr "التاريخ"
-#: core/templates/user/overview.html:35 core/templates/user/overview.html:153
+#: core/templates/user/overview.html:38 core/templates/user/overview.html:156
#: gym/models/contract.py:58 gym/models/contract.py:109
msgid "Description"
msgstr "الوصف"
-#: core/templates/user/overview.html:36
+#: core/templates/user/overview.html:39
msgid "Number of logs (days)"
msgstr "عدد السجلات (بالأيام)"
-#: core/templates/user/overview.html:37 core/views/user.py:590
+#: core/templates/user/overview.html:40 core/views/user.py:606
#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:158
msgid "Last activity"
msgstr "آخر نشاط"
-#: core/templates/user/overview.html:58
+#: core/templates/user/overview.html:61
msgid "No workouts found."
msgstr "لم يتم العثور على أي تمارين."
-#: core/templates/user/overview.html:68
+#: core/templates/user/overview.html:71
msgid "Log"
msgstr "سجل"
-#: core/templates/user/overview.html:77
+#: core/templates/user/overview.html:80
msgid "General impression"
msgstr "الانطباع العام"
-#: core/templates/user/overview.html:78 core/templates/user/overview.html:390
+#: core/templates/user/overview.html:81 core/templates/user/overview.html:393
msgid "Notes"
msgstr "ملحوظات"
-#: core/templates/user/overview.html:79
-#: exercises/templates/history/overview.html:30
-msgid "Time"
-msgstr "الوقت"
-
-#: core/templates/user/overview.html:112 core/templates/user/overview.html:121
+#: core/templates/user/overview.html:115 core/templates/user/overview.html:124
#: manager/helpers.py:89 weight/templates/import_csv_preview.html:14
#: weight/templates/import_csv_preview.html:43 weight/views.py:54
msgid "Weight"
msgstr "الوزن"
-#: core/templates/user/overview.html:154
-#: nutrition/templates/ingredient/view.html:51 nutrition/views/plan.py:245
+#: core/templates/user/overview.html:157
+#: nutrition/templates/ingredient/view.html:52 nutrition/views/plan.py:244
msgid "Energy"
msgstr "الطاقة"
-#: core/templates/user/overview.html:155
-#: nutrition/templates/ingredient/view.html:58 nutrition/views/plan.py:251
+#: core/templates/user/overview.html:158
+#: nutrition/templates/ingredient/view.html:59 nutrition/views/plan.py:250
msgid "Protein"
msgstr "البروتين"
-#: core/templates/user/overview.html:156
-#: nutrition/templates/ingredient/view.html:64 nutrition/views/plan.py:259
+#: core/templates/user/overview.html:159
+#: nutrition/templates/ingredient/view.html:65 nutrition/views/plan.py:258
msgid "Carbohydrates"
msgstr "الكربوهيدرات"
-#: core/templates/user/overview.html:157
-#: nutrition/templates/ingredient/view.html:80 nutrition/views/plan.py:273
+#: core/templates/user/overview.html:160
+#: nutrition/templates/ingredient/view.html:81 nutrition/views/plan.py:272
msgid "Fat"
msgstr "الدهون"
-#: core/templates/user/overview.html:170
-#: nutrition/templates/ingredient/view.html:53
+#: core/templates/user/overview.html:173
+#: nutrition/templates/ingredient/view.html:54
msgid "kcal"
msgstr "كيلوكالوري"
-#: core/templates/user/overview.html:201 core/templates/user/overview.html:340
-#: core/templates/user/overview.html:379 core/templates/user/overview.html:418
-#: core/templates/user/overview.html:463 gym/templates/gym/list.html:45
+#: core/templates/user/overview.html:204 core/templates/user/overview.html:343
+#: core/templates/user/overview.html:382 core/templates/user/overview.html:421
+#: core/templates/user/overview.html:466 gym/templates/gym/list.html:45
#: gym/templates/gym/member_list.html:91 gym/templates/gym/member_list.html:149
#: gym/templates/gym/member_list.html:187
#: gym/templates/gym/member_list.html:223
@@ -968,109 +990,113 @@ msgstr "كيلوكالوري"
msgid "Actions"
msgstr "الإجراءات"
-#: core/templates/user/overview.html:210
+#: core/templates/user/overview.html:213
msgid "Deactivate user"
msgstr "إلغاء تنشيط المستخدم"
-#: core/templates/user/overview.html:214
+#: core/templates/user/overview.html:217
msgid "Activate user"
msgstr "تنشيط المستخدم"
-#: core/templates/user/overview.html:223
+#: core/templates/user/overview.html:226
msgid "Reset user password"
msgstr "إعادة تعيين كلمة مرور المستخدم"
-#: core/templates/user/overview.html:227 gym/templates/gym/member_list.html:30
+#: core/templates/user/overview.html:230 gym/templates/gym/member_list.html:30
msgid "Roles"
msgstr "الأدوار"
-#: core/templates/user/overview.html:243
+#: core/templates/user/overview.html:246
msgid "Password reset confirmation"
msgstr "تأكيد إعادة تعيين كلمة المرور"
-#: core/templates/user/overview.html:247
+#: core/templates/user/overview.html:250
msgid "Do you really want to change this user&#39;s password?"
msgstr "هل تريد حقًا تغيير كلمة مرور هذا المستخدم؟"
-#: core/templates/user/overview.html:250
+#: core/templates/user/overview.html:253
#: exercises/templates/history/overview.html:106
+#: nutrition/templates/ingredient/view.html:148
+#: nutrition/templates/ingredient/view.html:160
msgid "No"
msgstr "لا"
-#: core/templates/user/overview.html:251
+#: core/templates/user/overview.html:254
#: exercises/templates/history/overview.html:99
+#: nutrition/templates/ingredient/view.html:146
+#: nutrition/templates/ingredient/view.html:158
msgid "Yes"
msgstr "نعم"
-#: core/templates/user/overview.html:272 gym/templates/gym/member_list.html:105
+#: core/templates/user/overview.html:275 gym/templates/gym/member_list.html:105
msgid "Details"
msgstr "التفاصيل"
-#: core/templates/user/overview.html:276 gym/views/export.py:57
-#: manager/helpers.py:89 nutrition/views/plan.py:151
-#: nutrition/views/plan.py:157
+#: core/templates/user/overview.html:279 gym/views/export.py:57
+#: manager/helpers.py:89 nutrition/views/plan.py:150
+#: nutrition/views/plan.py:156
msgid "Nr."
msgstr "Nr."
-#: core/templates/user/overview.html:298 gym/models/contract.py:287
+#: core/templates/user/overview.html:301 gym/models/contract.py:287
#: gym/models/gym.py:50 gym/templates/contract/view.html:75
#: gym/templates/gym/member_list.html:112 gym/views/export.py:68
msgid "Phone"
msgstr "الهاتف"
-#: core/templates/user/overview.html:302 gym/templates/contract/view.html:87
+#: core/templates/user/overview.html:305 gym/templates/contract/view.html:87
#: gym/templates/gym/member_list.html:130
msgid "Address"
msgstr "العنوان"
-#: core/templates/user/overview.html:313
+#: core/templates/user/overview.html:316
msgid "Registered"
msgstr "مسجّل"
-#: core/templates/user/overview.html:317
+#: core/templates/user/overview.html:320
msgid "Last login"
msgstr "آخر تسجيل دخول"
-#: core/templates/user/overview.html:322
+#: core/templates/user/overview.html:325
msgid "Status"
msgstr "الحالة"
-#: core/templates/user/overview.html:325
+#: core/templates/user/overview.html:328
msgid "Active"
msgstr "نشط"
-#: core/templates/user/overview.html:327
+#: core/templates/user/overview.html:330
msgid "Inactive"
msgstr "غير نشط"
-#: core/templates/user/overview.html:348 gym/templates/contract/list.html:4
+#: core/templates/user/overview.html:351 gym/templates/contract/list.html:4
#: gym/templates/gym/member_list.html:218
msgid "Contracts"
msgstr "العقود"
-#: core/templates/user/overview.html:426 gym/templates/document/list.html:4
+#: core/templates/user/overview.html:429 gym/templates/document/list.html:4
msgid "Documents"
msgstr "المستندات"
-#: core/templates/user/overview.html:433 gym/templates/document/list.html:33
+#: core/templates/user/overview.html:436 gym/templates/document/list.html:33
msgid "Download"
msgstr "تحميل"
-#: core/templates/user/overview.html:474 gym/views/admin_config.py:44
+#: core/templates/user/overview.html:477 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:477 gym/models/user_config.py:92
+#: core/templates/user/overview.html:480 gym/models/user_config.py:92
msgid "Include in inactive overview"
msgstr "تضمين في نظرة عامة غير نشطة"
-#: core/templates/user/overview.html:510
+#: core/templates/user/overview.html:513
#, python-format
msgid "Admin login is only available for users in %(gym_name)s"
msgstr "تسجيل دخول المسؤول متاح فقط للمستخدمين في %(gym_name)s"
-#: core/templates/user/overview.html:514
+#: core/templates/user/overview.html:517
msgid "Log in as this user"
msgstr "قم بتسجيل الدخول بهذا المستخدم"
@@ -1094,7 +1120,7 @@ msgstr "إرسال بريد إلكتروني للتوثيق"
msgid "You need to verify your email to contribute exercises"
msgstr "يجب عليك توثيق بريدك الإلكتروني للمساهمة في التمارين"
-#: core/templates/user/preferences.html:55 core/views/user.py:601
+#: core/templates/user/preferences.html:55 core/views/user.py:617
msgid "Change password"
msgstr "تغيير كلمة المرور"
@@ -1102,23 +1128,23 @@ msgstr "تغيير كلمة المرور"
msgid "Already have an account?"
msgstr "هل لديك حساب بالفعل؟"
-#: core/templatetags/wger_extras.py:142 i18n.tpl:38
+#: core/templatetags/wger_extras.py:142 i18n.tpl:39
msgid "kg"
msgstr "كيلوجرام"
#: core/templatetags/wger_extras.py:144
-#: nutrition/templates/ingredient/view.html:60
-#: nutrition/templates/ingredient/view.html:66
-#: nutrition/templates/ingredient/view.html:73
-#: nutrition/templates/ingredient/view.html:82
-#: nutrition/templates/ingredient/view.html:89
-#: nutrition/templates/ingredient/view.html:111
-#: nutrition/templates/ingredient/view.html:121
+#: nutrition/templates/ingredient/view.html:61
+#: nutrition/templates/ingredient/view.html:67
+#: nutrition/templates/ingredient/view.html:74
+#: nutrition/templates/ingredient/view.html:83
+#: nutrition/templates/ingredient/view.html:90
+#: nutrition/templates/ingredient/view.html:112
+#: nutrition/templates/ingredient/view.html:122
msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr "جرام"
-#: core/templatetags/wger_extras.py:147 i18n.tpl:39
+#: core/templatetags/wger_extras.py:147 i18n.tpl:40
msgid "lb"
msgstr "رطل"
@@ -1127,36 +1153,35 @@ msgctxt "weight unit, i.e. ounces"
msgid "oz"
msgstr "أونصة"
-#: core/views/languages.py:85 exercises/views/categories.py:122
+#: core/views/languages.py:88 exercises/views/categories.py:122
#: exercises/views/equipment.py:103 exercises/views/muscles.py:99
-#: nutrition/views/ingredient.py:120 nutrition/views/unit.py:110
+#: nutrition/views/ingredient.py:125
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
+#: core/views/languages.py:96 core/views/license.py:103
+#: core/views/repetition_units.py:114 core/views/weight_units.py:115
#: exercises/views/categories.py:128 exercises/views/muscles.py:106
#: gallery/views/images.py:124 gym/views/admin_notes.py:196
#: gym/views/document.py:206 gym/views/gym.py:481
-#: nutrition/views/ingredient.py:127 nutrition/views/unit.py:117
+#: nutrition/views/ingredient.py:132
#, python-brace-format
msgid "Delete {0}?"
msgstr "حذف {0}؟"
-#: core/views/languages.py:111 core/views/license.py:85
-#: core/views/repetition_units.py:86 core/views/user.py:464
+#: core/views/languages.py:114 core/views/license.py:85
+#: core/views/repetition_units.py:96 core/views/user.py:480
#: core/views/weight_units.py:86 exercises/views/categories.py:98
#: exercises/views/equipment.py:81 exercises/views/muscles.py:87
#: gym/views/admin_notes.py:161 gym/views/config.py:68
#: gym/views/contract.py:186 gym/views/contract_option.py:123
#: gym/views/contract_type.py:123 gym/views/document.py:171
-#: gym/views/gym.py:463 nutrition/views/ingredient.py:146
-#: nutrition/views/unit.py:143
+#: gym/views/gym.py:463 nutrition/views/ingredient.py:151
#, python-brace-format
msgid "Edit {0}"
msgstr "تعديل {0}"
-#: core/views/misc.py:74
+#: core/views/misc.py:73
msgid ""
"We have created sample workout, workout schedules, weight logs, (body) "
"weight and nutrition plan entries so you can better see what this site can "
@@ -1166,48 +1191,48 @@ msgstr ""
"تغذية، لتتمكن من رؤية إمكانيات هذا الموقع بشكل أفضل. لا تتردد في تعديلها أو "
"حذفها!"
-#: core/views/user.py:143
+#: core/views/user.py:145
#, python-brace-format
msgid "Account \"{0}\" was successfully deleted"
msgstr "تم حذف الحساب \"{0}\" بنجاح"
-#: core/views/user.py:279
+#: core/views/user.py:287
msgid "You were successfully registered"
msgstr "تم تسجيلك بنجاح"
-#: core/views/user.py:341
+#: core/views/user.py:357
msgid "Settings successfully updated"
msgstr "تم تحديث الإعدادات بنجاح"
-#: core/views/user.py:380
+#: core/views/user.py:396
msgid "The user was successfully deactivated"
msgstr "تم إلغاء تفعيل المستخدم بنجاح"
-#: core/views/user.py:417
+#: core/views/user.py:433
msgid "The user was successfully activated"
msgstr "تم تفعيل المستخدم بنجاح"
-#: core/views/user.py:432
+#: core/views/user.py:448
msgid "Edit user"
msgstr "تعديل المستخدم"
-#: core/views/user.py:587 gym/templates/gym/member_list.html:26
+#: core/views/user.py:603 gym/templates/gym/member_list.html:26
#: gym/views/gym.py:158
msgid "ID"
msgstr "معرف"
-#: core/views/user.py:588 gym/forms.py:95 gym/templates/contract/view.html:55
+#: core/views/user.py:604 gym/forms.py:95 gym/templates/contract/view.html:55
#: gym/templates/gym/member_list.html:27 gym/views/export.py:59
#: gym/views/gym.py:158 gym/views/gym.py:217
msgid "Username"
msgstr "اسم المستخدم"
-#: core/views/user.py:591 gym/templates/gym/new_user.html:34
+#: core/views/user.py:607 gym/templates/gym/new_user.html:34
#: gym/views/export.py:58 gym/views/gym.py:217
msgid "Gym"
msgstr "الصالة"
-#: core/views/user.py:650
+#: core/views/user.py:678
#, python-format
msgid "A verification email was sent to %(email)s"
msgstr "تم إرسال بريد إلكتروني للتوثيق إلى %(email)s"
@@ -1224,16 +1249,16 @@ msgstr "اسم بديل"
msgid "A more basic name for the muscle"
msgstr "اسمٌ أبسط للعضلة"
-#: exercises/models/video.py:50
+#: exercises/models/video.py:52
#, python-format
msgid "Maximum file size is %(size)sMB."
msgstr "الحد الأقصى لحجم الملف هو %(size)sميجابايت."
-#: exercises/models/video.py:57 exercises/models/video.py:65
+#: exercises/models/video.py:59 exercises/models/video.py:67
msgid "File type is not supported"
msgstr "نوع الملف غير مدعوم"
-#: exercises/models/video.py:70
+#: exercises/models/video.py:72
msgid "File is not a valid video"
msgstr "الملف ليس فيديو صالحًا"
@@ -1304,7 +1329,11 @@ msgstr "حذف المعدات؟"
msgid "Add muscle"
msgstr "إضافة عضلة"
-#: gallery/templates/images/overview.html:72
+#: gallery/forms.py:35
+msgid "If date is left empty, it will be read from the image instead"
+msgstr ""
+
+#: gallery/templates/images/overview.html:69
msgid "Add image"
msgstr "إضافة صورة"
@@ -1370,7 +1399,7 @@ msgid "Contract type"
msgstr "نوع العقد"
#: gym/models/contract.py:211 gym/templates/contract/view.html:59
-#: nutrition/forms.py:58
+#: nutrition/forms.py:67
msgid "Amount"
msgstr "الكمية"
@@ -1546,7 +1575,7 @@ msgstr "البُرُد الإلكترونية"
msgid "Add member"
msgstr "إضافة عضو"
-#: gym/templates/gym/new_user.html:48 nutrition/templates/rate/form.html:120
+#: gym/templates/gym/new_user.html:48 nutrition/templates/rate/form.html:121
msgid "Info"
msgstr "المعلومات"
@@ -1717,10 +1746,6 @@ msgstr ""
msgid "Quads"
msgstr ""
-#: i18n.tpl:30
-msgid "Repetitions"
-msgstr ""
-
#: i18n.tpl:31
msgid "Resistance band"
msgstr ""
@@ -1749,189 +1774,193 @@ msgstr ""
msgid "Until Failure"
msgstr ""
-#: i18n.tpl:40
-msgid "none (bodyweight exercise)"
+#: i18n.tpl:38
+msgid "Meters"
msgstr ""
#: i18n.tpl:41
-msgid "Beginner"
+msgid "none (bodyweight exercise)"
msgstr ""
#: i18n.tpl:42
-msgid "Consistent"
+msgid "Beginner"
msgstr ""
#: i18n.tpl:43
-msgid "Dedicated"
+msgid "Consistent"
msgstr ""
#: i18n.tpl:44
-msgid "Obsessed"
+msgid "Dedicated"
msgstr ""
#: i18n.tpl:45
-msgid "Legend"
+msgid "Obsessed"
msgstr ""
#: i18n.tpl:46
-msgid "Veteran"
+msgid "Legend"
msgstr ""
#: i18n.tpl:47
-msgid "Titan"
+msgid "Veteran"
msgstr ""
#: i18n.tpl:48
-msgid "Unstoppable"
+msgid "Titan"
msgstr ""
#: i18n.tpl:49
-msgid "Weekend Warrior"
+msgid "Unstoppable"
msgstr ""
#: i18n.tpl:50
-msgid "Elephant lifter"
+msgid "Weekend Warrior"
msgstr ""
#: i18n.tpl:51
-msgid "Bus lifter"
+msgid "Elephant lifter"
msgstr ""
#: i18n.tpl:52
-msgid "Plane lifter"
+msgid "Bus lifter"
msgstr ""
#: i18n.tpl:53
-msgid "Blue whale lifter"
+msgid "Plane lifter"
msgstr ""
#: i18n.tpl:54
-msgid "Space Station lifter"
+msgid "Blue whale lifter"
msgstr ""
#: i18n.tpl:55
-msgid "Millionaire"
+msgid "Space Station lifter"
msgstr ""
#: i18n.tpl:56
-msgid "Atlas"
+msgid "Millionaire"
msgstr ""
#: i18n.tpl:57
-msgid "Early Bird"
+msgid "Atlas"
msgstr ""
#: i18n.tpl:58
-msgid "Night Owl"
+msgid "Early Bird"
msgstr ""
#: i18n.tpl:59
-msgid "New Year, New Me"
+msgid "Night Owl"
msgstr ""
#: i18n.tpl:60
-msgid "Phoenix"
+msgid "New Year, New Me"
msgstr ""
#: i18n.tpl:61
+msgid "Phoenix"
+msgstr ""
+
+#: i18n.tpl:62
#, fuzzy
#| msgid "Personal data"
msgid "Personal Record"
msgstr "المعلومات الشخصية"
-#: i18n.tpl:62
+#: i18n.tpl:63
msgid "Complete your first workout"
msgstr ""
-#: i18n.tpl:63
+#: i18n.tpl:64
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 10 workouts"
msgstr "عينة تمارين"
-#: i18n.tpl:64
+#: i18n.tpl:65
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 50 workouts"
msgstr "عينة تمارين"
-#: i18n.tpl:65
+#: i18n.tpl:66
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 100 workouts"
msgstr "عينة تمارين"
-#: i18n.tpl:66
+#: i18n.tpl:67
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 200 workouts"
msgstr "عينة تمارين"
-#: i18n.tpl:67
+#: i18n.tpl:68
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 500 workouts"
msgstr "عينة تمارين"
-#: i18n.tpl:68
+#: i18n.tpl:69
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 1000 workouts"
msgstr "عينة تمارين"
-#: i18n.tpl:69
+#: i18n.tpl:70
msgid "Maintain a 30-day workout streak"
msgstr ""
-#: i18n.tpl:70
+#: i18n.tpl:71
msgid "Work out on Saturday and Sunday for 4 consecutive weekends"
msgstr ""
-#: i18n.tpl:71
+#: i18n.tpl:72
msgid "Lift a cumulative total of 5.000 kg"
msgstr ""
-#: i18n.tpl:72
+#: i18n.tpl:73
msgid "Lift a cumulative total of 20.000 kg"
msgstr ""
-#: i18n.tpl:73
+#: i18n.tpl:74
msgid "Lift a cumulative total of 50.000 kg"
msgstr ""
-#: i18n.tpl:74
+#: i18n.tpl:75
msgid "Lift a cumulative total of 150.000 kg"
msgstr ""
-#: i18n.tpl:75
+#: i18n.tpl:76
msgid "Lift a cumulative total of 450.000 kg"
msgstr ""
-#: i18n.tpl:76
+#: i18n.tpl:77
msgid "Lift a cumulative total of 1.000.000 kg"
msgstr ""
-#: i18n.tpl:77
+#: i18n.tpl:78
msgid "Lift a cumulative total of 10.000.000 kg"
msgstr ""
-#: i18n.tpl:78
+#: i18n.tpl:79
msgid "Complete a workout before 6:00 AM"
msgstr ""
-#: i18n.tpl:79
+#: i18n.tpl:80
msgid "Complete a workout after 9:00 PM"
msgstr ""
-#: i18n.tpl:80
+#: i18n.tpl:81
msgid "Work out on January 1st"
msgstr ""
-#: i18n.tpl:81
+#: i18n.tpl:82
msgid "Return to training after being inactive for 30 days"
msgstr ""
-#: i18n.tpl:82
+#: i18n.tpl:83
msgid "Achieve a new Personal Record on any exercise"
msgstr ""
@@ -2013,7 +2042,7 @@ msgstr ""
msgid "Routine will expire soon"
msgstr ""
-#: manager/models/routine.py:153 manager/models/session.py:145
+#: manager/models/routine.py:154 manager/models/session.py:145
msgid "The start time cannot be after the end time."
msgstr ""
@@ -2085,36 +2114,58 @@ msgstr ""
msgid "Workout for %s"
msgstr ""
-#: nutrition/forms.py:62
+#: nutrition/extract_info/off.py:72 nutrition/extract_info/off.py:91
+msgid "Serving"
+msgstr ""
+
+#: nutrition/forms.py:71 nutrition/forms.py:208
msgid "Unit"
msgstr ""
-#: nutrition/forms.py:170 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:179 nutrition/templates/rate/form.html:77
msgid "Basic caloric intake"
msgstr ""
-#: nutrition/forms.py:171
+#: nutrition/forms.py:180
msgid "Your basic caloric intake as calculated for your data"
msgstr ""
-#: nutrition/forms.py:176
+#: nutrition/forms.py:185
msgid "Additional calories"
msgstr ""
-#: nutrition/forms.py:178
+#: nutrition/forms.py:187
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
msgstr ""
#: nutrition/forms.py:209
+msgid "grams (g)"
+msgstr ""
+
+#: nutrition/forms.py:219
msgid "Ingredient"
msgstr ""
-#: nutrition/forms.py:213
+#: nutrition/forms.py:223
msgid "Also search for names in English"
msgstr ""
+#: nutrition/forms.py:239
+msgid "Quantity"
+msgstr ""
+
+#: nutrition/forms.py:241
+msgid "Enter a quantity and choose grams (g) or one of the serving units."
+msgstr ""
+
+#: nutrition/models/ingredient.py:526
+#, fuzzy
+#| msgid "Nutrition"
+msgid "Portion"
+msgstr "تغذية"
+
#: nutrition/templates/ingredient/email_new.tpl:1
#, python-format
msgid ""
@@ -2152,59 +2203,86 @@ msgid ""
"sucessfully."
msgstr ""
-#: nutrition/templates/ingredient/overview.html:38
+#: nutrition/templates/ingredient/overview.html:32
+#: nutrition/templates/ingredient/overview.html:68
+#: nutrition/templates/ingredient/view.html:143
+msgid "Vegan"
+msgstr ""
+
+#: nutrition/templates/ingredient/overview.html:34
+#: nutrition/templates/ingredient/overview.html:79
+#: nutrition/templates/ingredient/view.html:155
+msgid "Vegetarian"
+msgstr ""
+
+#: nutrition/templates/ingredient/overview.html:43
msgid "No ingredients."
msgstr ""
-#: nutrition/templates/ingredient/overview.html:49
+#: nutrition/templates/ingredient/overview.html:54
msgid "Search"
msgstr ""
-#: nutrition/templates/ingredient/view.html:45 nutrition/views/plan.py:237
+#: nutrition/templates/ingredient/overview.html:57
+msgid "Filter"
+msgstr ""
+
+#: nutrition/templates/ingredient/overview.html:83
+msgid "Apply"
+msgstr ""
+
+#: nutrition/templates/ingredient/overview.html:85
+msgid "Reset"
+msgstr ""
+
+#: nutrition/templates/ingredient/view.html:46 nutrition/views/plan.py:236
msgid "Macronutrients"
msgstr ""
-#: nutrition/templates/ingredient/view.html:54
+#: nutrition/templates/ingredient/view.html:55
msgid "kJ"
msgstr ""
-#: nutrition/templates/ingredient/view.html:70 nutrition/views/plan.py:267
+#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:266
msgid "Sugar content in carbohydrates"
msgstr ""
-#: nutrition/templates/ingredient/view.html:75
-#: nutrition/templates/ingredient/view.html:91
-#: nutrition/templates/ingredient/view.html:113
-#: nutrition/templates/ingredient/view.html:123
+#: nutrition/templates/ingredient/view.html:76
+#: nutrition/templates/ingredient/view.html:92
+#: nutrition/templates/ingredient/view.html:114
+#: nutrition/templates/ingredient/view.html:124
msgid "n.A."
msgstr ""
-#: nutrition/templates/ingredient/view.html:86 nutrition/views/plan.py:281
+#: nutrition/templates/ingredient/view.html:87 nutrition/views/plan.py:280
msgid "Saturated fat content in fats"
msgstr ""
-#: nutrition/templates/ingredient/view.html:102
+#: nutrition/templates/ingredient/view.html:103
msgid "Others"
msgstr ""
-#: nutrition/templates/ingredient/view.html:108 nutrition/views/plan.py:287
+#: nutrition/templates/ingredient/view.html:109 nutrition/views/plan.py:286
msgid "Fiber"
msgstr ""
-#: nutrition/templates/ingredient/view.html:118 nutrition/views/plan.py:293
+#: nutrition/templates/ingredient/view.html:119 nutrition/views/plan.py:292
msgid "Sodium"
msgstr ""
-#: nutrition/templates/ingredient/view.html:143
-#: nutrition/templates/units/list.html:50 nutrition/views/unit.py:86
+#: nutrition/templates/ingredient/view.html:136
+msgid "Dietary information"
+msgstr ""
+
+#: nutrition/templates/ingredient/view.html:184
msgid "Add new weight unit"
msgstr ""
-#: nutrition/templates/rate/form.html:25
+#: nutrition/templates/rate/form.html:26
msgid "Basal metabolic rate"
msgstr ""
-#: nutrition/templates/rate/form.html:26
+#: nutrition/templates/rate/form.html:27
msgid ""
"The basal metabolic rate is the amount of energy expended daily\n"
"at rest. This is the minimum energy needed for the body to function, without "
@@ -2212,36 +2290,36 @@ msgid ""
"additional physical activity."
msgstr ""
-#: nutrition/templates/rate/form.html:37
+#: nutrition/templates/rate/form.html:38
msgid "Your basic metabolic rate is: "
msgstr ""
-#: nutrition/templates/rate/form.html:47
+#: nutrition/templates/rate/form.html:48
msgid "Physical activities"
msgstr ""
-#: nutrition/templates/rate/form.html:48
+#: nutrition/templates/rate/form.html:49
msgid ""
"The physical activity level (PAL) is a factor used to to express\n"
"the additional physical activity and is used to calculate the total energy\n"
"required per day."
msgstr ""
-#: nutrition/templates/rate/form.html:59
+#: nutrition/templates/rate/form.html:60
msgid "Factor for daily activities: "
msgstr ""
-#: nutrition/templates/rate/form.html:67
+#: nutrition/templates/rate/form.html:68
msgid ""
"The base caloric intake is the amount of calories your metabolism\n"
"needs based on your level of physical activity."
msgstr ""
-#: nutrition/templates/rate/form.html:81
+#: nutrition/templates/rate/form.html:82
msgid "Calculate basic caloric intake"
msgstr ""
-#: nutrition/templates/rate/form.html:88
+#: nutrition/templates/rate/form.html:89
msgid ""
"The total calories are the actual total calories per day. This\n"
"might include e.g. a surplus or deficit if you are bulking or cutting. "
@@ -2249,69 +2327,69 @@ msgid ""
"you might just enter yourself the amount of calories if you know the value."
msgstr ""
-#: nutrition/templates/rate/form.html:102
+#: nutrition/templates/rate/form.html:103
msgid "Transfer basic intake to total daily calories"
msgstr ""
-#: nutrition/templates/rate/form.html:106
+#: nutrition/templates/rate/form.html:107
msgid "Add additional calories to total daily calories"
msgstr ""
-#: nutrition/templates/rate/form.html:110
+#: nutrition/templates/rate/form.html:111
msgid "Save total calories to profile"
msgstr ""
-#: nutrition/templates/rate/form.html:121
+#: nutrition/templates/rate/form.html:122
msgid ""
"Please note that these calculations can only be an\n"
"approximation. If you base your nutrition plan on these values, observe\n"
"yourself for some weeks and change the total amount if needed."
msgstr ""
-#: nutrition/views/ingredient.py:158
+#: nutrition/views/ingredient.py:163
msgid "Add a new ingredient"
msgstr ""
-#: nutrition/views/plan.py:128
+#: nutrition/views/plan.py:127
msgid "Nutritional plan"
msgstr ""
-#: nutrition/views/plan.py:130
+#: nutrition/views/plan.py:129
#, python-format
msgid "Nutritional plan for %s"
msgstr ""
-#: nutrition/views/plan.py:202
+#: nutrition/views/plan.py:201
msgid "<i>This is an empty plan, what did you expect on the PDF?</i>"
msgstr ""
-#: nutrition/views/plan.py:230
+#: nutrition/views/plan.py:229
#, fuzzy
#| msgid "Personal data"
msgid "Nutritional data"
msgstr "المعلومات الشخصية"
-#: nutrition/views/plan.py:238
+#: nutrition/views/plan.py:237
msgid "Total"
msgstr ""
-#: nutrition/views/plan.py:239
+#: nutrition/views/plan.py:238
msgid "Percent of energy"
msgstr ""
-#: nutrition/views/plan.py:240
+#: nutrition/views/plan.py:239
msgid "g per body kg"
msgstr ""
-#: nutrition/views/unit_ingredient.py:69
+#: nutrition/views/unit_ingredient.py:64
msgid "Add a new weight unit"
msgstr ""
-#: nutrition/views/unit_ingredient.py:106
+#: nutrition/views/unit_ingredient.py:99
msgid "Edit a weight unit to ingredient connection"
msgstr ""
-#: nutrition/views/unit_ingredient.py:138
+#: nutrition/views/unit_ingredient.py:129
msgid "Delete?"
msgstr ""
@@ -2660,7 +2738,7 @@ msgstr ""
msgid "Translation"
msgstr "الترجمة"
-#: utils/generic_views.py:263
+#: utils/generic_views.py:246
msgid "Yes, delete"
msgstr ""
@@ -2711,10 +2789,6 @@ msgstr ""
msgid "Import weight logs"
msgstr ""
-#: weight/templates/import_csv_form.html:9
-msgid "Submit"
-msgstr ""
-
#: weight/templates/import_csv_form.html:15
msgid ""
"Use this import field to import your weight logs into Workout\n"
@@ -2810,6 +2884,34 @@ msgstr ""
msgid "Re-Submit"
msgstr ""
+#~ msgid "Email verification"
+#~ msgstr "توثيق البريد الإلكتروني"
+
+#, python-format
+#~ msgid "%(username)s, your email was verified"
+#~ msgstr "%(username)s، تم توثيق بريدك الإلكتروني"
+
+#~ msgid "Error, invalid verification token"
+#~ msgstr "خطأ، رمز توثيق غير صالح"
+
+#~ msgid "Email Confirmation"
+#~ msgstr "تأكيد البريد الإلكتروني"
+
+#, python-format
+#~ msgid "You are almost there, %(username)s!"
+#~ msgstr "أنت على وشك الوصول، %(username)s!"
+
+#, python-format
+#~ msgid "Please click <a href=\"%(link)s\">here</a> to confirm your email"
+#~ msgstr "يرجى النقر <a href=\"%(link)s\">هنا</a> لتأكيد بريدك الإلكتروني"
+
+#, python-format
+#~ msgid "The token expires on %(time)s"
+#~ msgstr "تنتهي صلاحية الرمز في %(time)s"
+
+#~ msgid "Ingredient weight units"
+#~ msgstr "وحدات وزن المكون"
+
#~ msgid "Some way of answering you (e-mail, etc.)"
#~ msgstr "طريقة للأجابة على مشكلتك (بريدك الألكتروني أو وسيلة اخرى)"
diff --git a/wger/locale/bg/LC_MESSAGES/django.po b/wger/locale/bg/LC_MESSAGES/django.po
index 38c7d00fd..4e9d21a84 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: 2026-01-17 14:03+0000\n"
+"POT-Creation-Date: 2026-04-10 10:20+0000\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"
@@ -35,7 +35,7 @@ msgstr ""
#: config/views/gym_config.py:42 core/templates/language/view.html:64
#: core/templates/license/list.html:17
#: core/templates/repetition_unit/list.html:18
-#: core/templates/user/overview.html:204 core/templates/user/overview.html:467
+#: core/templates/user/overview.html:207 core/templates/user/overview.html:470
#: core/templates/weight_unit/list.html:18
#: exercises/templates/categories/admin-overview.html:17
#: exercises/templates/equipment/admin-overview.html:17
@@ -47,30 +47,29 @@ msgstr ""
#: gym/templates/gym/list.html:19 gym/templates/gym/list.html:48
#: gym/templates/gym/member_list.html:94 gym/templates/gym/member_list.html:152
#: gym/templates/gym/member_list.html:190
-#: nutrition/templates/ingredient/view.html:164
-#: nutrition/templates/ingredient/view.html:209
-#: nutrition/templates/units/list.html:19
+#: nutrition/templates/ingredient/view.html:205
+#: nutrition/templates/ingredient/view.html:248
msgid "Edit"
msgstr "Поправи"
-#: core/forms.py:91 core/templates/navigation.html:271
-#: core/templates/navigation.html:278 core/templates/user/login.html:4
+#: core/forms.py:89 core/templates/navigation.html:268
+#: core/templates/navigation.html:275 core/templates/user/login.html:4
#: core/templates/user/registration_sidebar.html:12
#: software/templates/features.html:82 software/templates/features.html:448
msgid "Login"
msgstr "Вход"
-#: core/forms.py:130 core/forms.py:244 gym/views/export.py:61
+#: core/forms.py:128 core/forms.py:242 gym/views/export.py:61
#: gym/views/gym.py:217
msgid "First name"
msgstr ""
-#: core/forms.py:131 core/forms.py:245 core/templates/user/overview.html:284
+#: core/forms.py:129 core/forms.py:243 core/templates/user/overview.html:287
#: gym/views/export.py:62 gym/views/gym.py:217
msgid "Last name"
msgstr ""
-#: core/forms.py:133 core/forms.py:210 core/templates/user/overview.html:288
+#: core/forms.py:131 core/forms.py:208 core/templates/user/overview.html:291
#: gym/models/contract.py:256 gym/models/gym.py:58
#: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:116
#: gym/templates/gym/new_user.html:30 gym/views/export.py:60
@@ -80,55 +79,55 @@ msgstr ""
msgid "Email"
msgstr "Е-мейл"
-#: core/forms.py:134
+#: core/forms.py:132
msgid "Used for password resets and, optionally, e-mail reminders."
msgstr ""
-#: core/forms.py:138 core/models/profile.py:222
+#: core/forms.py:136 core/models/profile.py:222
#: gym/templates/gym/new_user.html:38
msgid "Date of Birth"
msgstr ""
-#: core/forms.py:177
+#: core/forms.py:175
msgid "Personal data"
msgstr ""
-#: core/forms.py:189
+#: core/forms.py:187
msgid "Workout reminders"
msgstr ""
-#: core/forms.py:196
+#: core/forms.py:194
msgid "Other settings"
msgstr ""
-#: core/forms.py:204 core/views/user.py:614 core/views/user.py:629
-#: core/views/user.py:641 gym/forms.py:73 utils/generic_views.py:143
+#: core/forms.py:202 core/views/user.py:630 core/views/user.py:654
+#: core/views/user.py:668 gym/forms.py:73 utils/generic_views.py:137
msgid "Save"
msgstr "Запази"
-#: core/forms.py:211
+#: core/forms.py:209
msgid "Used for password resets and, optionally, email reminders."
msgstr ""
-#: core/forms.py:240
+#: core/forms.py:238
#, fuzzy
#| msgid "This email is already used."
msgid "This e-mail address is already in use."
msgstr "Този email е вече използван."
-#: core/forms.py:261 gym/templates/gym/new_user.html:26
+#: core/forms.py:259 gym/templates/gym/new_user.html:26
#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:217
msgid "Password"
msgstr ""
-#: core/forms.py:263
+#: core/forms.py:261
msgid "Please enter your current password."
msgstr ""
-#: core/forms.py:272 core/templates/language/view.html:70
+#: core/forms.py:270 core/templates/language/view.html:70
#: core/templates/license/list.html:21
#: core/templates/repetition_unit/list.html:22
-#: core/templates/user/overview.html:233
+#: core/templates/user/overview.html:236
#: core/templates/weight_unit/list.html:22
#: exercises/templates/categories/admin-overview.html:21
#: exercises/templates/equipment/admin-overview.html:21
@@ -136,27 +135,30 @@ msgstr ""
#: gym/templates/admin_notes/list.html:37
#: gym/templates/contract_option/list.html:35
#: gym/templates/contract_type/list.html:36 gym/templates/document/list.html:46
-#: gym/templates/gym/list.html:23 nutrition/templates/ingredient/view.html:168
-#: nutrition/templates/ingredient/view.html:215
-#: nutrition/templates/units/list.html:25
+#: gym/templates/gym/list.html:23 nutrition/templates/ingredient/view.html:209
+#: nutrition/templates/ingredient/view.html:254
msgid "Delete"
msgstr "Изтрии"
-#: core/forms.py:281
+#: core/forms.py:279
msgid "Invalid password"
msgstr ""
-#: core/forms.py:293
+#: core/forms.py:291 core/forms.py:349
msgid "The form is secured with reCAPTCHA"
msgstr ""
-#: core/forms.py:314 core/forms.py:341 core/templates/navigation.html:272
-#: core/templates/navigation.html:285 core/templates/template.html:123
-#: core/templates/user/login.html:21 core/views/user.py:285
+#: core/forms.py:312 core/forms.py:339 core/templates/navigation.html:269
+#: core/templates/navigation.html:282 core/templates/template.html:113
+#: core/templates/user/login.html:21 core/views/user.py:293
#: software/templates/features.html:87 software/templates/features.html:442
msgid "Register"
msgstr "Регистрация"
+#: core/forms.py:360 weight/templates/import_csv_form.html:9
+msgid "Submit"
+msgstr ""
+
#: core/models/language.py:31 core/templates/language/view.html:21
msgid "Language short name"
msgstr "Съкратено име на езика"
@@ -193,36 +195,36 @@ msgstr ""
msgid "Link to license text or other information"
msgstr ""
-#: core/models/profile.py:57
+#: core/models/profile.py:60
#, python-format
msgid "%(birthdate)s is not a valid birthdate"
msgstr ""
-#: core/models/profile.py:66
+#: core/models/profile.py:69
msgid "Male"
msgstr ""
-#: core/models/profile.py:67
+#: core/models/profile.py:70
msgid "Female"
msgstr ""
-#: core/models/profile.py:74
+#: core/models/profile.py:77
msgid "Low"
msgstr ""
-#: core/models/profile.py:75
+#: core/models/profile.py:78
msgid "Medium"
msgstr ""
-#: core/models/profile.py:76
+#: core/models/profile.py:79
msgid "High"
msgstr ""
-#: core/models/profile.py:82
+#: core/models/profile.py:85
msgid "Metric (kilogram)"
msgstr ""
-#: core/models/profile.py:83
+#: core/models/profile.py:86
msgid "Imperial (pound)"
msgstr ""
@@ -337,7 +339,7 @@ msgstr ""
msgid "Free time"
msgstr ""
-#: core/models/profile.py:320 nutrition/templates/rate/form.html:66
+#: core/models/profile.py:320 nutrition/templates/rate/form.html:67
msgid "Total daily calories"
msgstr ""
@@ -375,20 +377,41 @@ msgstr ""
msgid "Enable or disable the trophy system for this user"
msgstr ""
-#: core/models/profile.py:446
+#: core/models/profile.py:457
msgid "The sum of all hours has to be 24"
msgstr ""
-#: core/models/rep_unit.py:36 core/models/weight_unit.py:42
-#: core/templates/user/overview.html:280 core/views/user.py:589
+#: core/models/rep_unit.py:32 i18n.tpl:30
+msgid "Repetitions"
+msgstr "Повторения"
+
+#: core/models/rep_unit.py:33 core/templates/user/overview.html:82
+#: exercises/templates/history/overview.html:30
+msgid "Time"
+msgstr ""
+
+#: core/models/rep_unit.py:34
+msgid "Distance"
+msgstr ""
+
+#: core/models/rep_unit.py:47 core/models/weight_unit.py:42
+#: core/templates/user/overview.html:283 core/views/user.py:605
#: exercises/models/muscle.py:36 gym/models/contract.py:52
#: gym/models/contract.py:103 gym/models/gym.py:46
#: gym/models/user_document.py:84 gym/templates/contract/view.html:50
#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:108
-#: gym/views/gym.py:158 nutrition/templates/ingredient/view.html:151
+#: gym/views/gym.py:158 nutrition/templates/ingredient/view.html:192
msgid "Name"
msgstr "Име"
+#: core/models/rep_unit.py:53
+msgid "Unit Type"
+msgstr ""
+
+#: core/models/rep_unit.py:54
+msgid "The type of unit (repetitions, time, or distance)"
+msgstr ""
+
#: core/templates/403.html:4
msgid "Forbidden!"
msgstr "Забранено!"
@@ -416,6 +439,51 @@ msgid ""
"later time. If the problem persists, you can seek help in ways listed below:"
msgstr ""
+#: core/templates/account/email/email_confirmation_message.html:81
+msgid "Almost there!"
+msgstr ""
+
+#: core/templates/account/email/email_confirmation_message.html:85
+#, fuzzy, python-format
+#| msgid ""
+#| "You're receiving this e-mail because you requested a password reset for "
+#| "your user account at %(site_name)s."
+msgid ""
+"You're receiving this email because the user \"%(user_display)s\" has given "
+"your email address to register an account on %(site_domain)s."
+msgstr ""
+"Получавате този е-мейл защото сте задали запитване за нулиране на парола за "
+"потребител в %(site_name)s."
+
+#: core/templates/account/email/email_confirmation_message.html:93
+msgid ""
+"Your email verification code is listed below. Please enter it in your open "
+"browser window."
+msgstr ""
+
+#: core/templates/account/email/email_confirmation_message.html:100
+msgid "Please click the button below to confirm your email address."
+msgstr ""
+
+#: core/templates/account/email/email_confirmation_message.html:106
+msgid "Confirm email"
+msgstr ""
+
+#: core/templates/account/email/email_confirmation_message.html:110
+#, python-format
+msgid ""
+"The link is valid for %(expire_hours)s hours (until %(date)s, %(time)s). You "
+"can request a new one from your profile settings."
+msgstr ""
+
+#: core/templates/account/email/email_confirmation_message.html:116
+msgid "If the button doesn't work, copy and paste this link into your browser:"
+msgstr ""
+
+#: core/templates/account/email/email_confirmation_message.html:125
+msgid "the wger Team"
+msgstr ""
+
#: core/templates/base.html:10
#, python-format
msgid ""
@@ -442,55 +510,7 @@ msgstr ""
msgid "Are you sure you want to delete this? This action cannot be undone."
msgstr "Сигурен ли си, че искаш да изтриеш това? Това действие е невъзвратимо!"
-#: core/templates/email_verification/confirm_template.html:4
-#, fuzzy
-#| msgid "Administration"
-msgid "Email verification"
-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/language/overview.html:4 core/templates/navigation.html:344
+#: core/templates/language/overview.html:4 core/templates/navigation.html:341
msgid "Languages"
msgstr ""
@@ -499,16 +519,16 @@ msgid "Nothing found."
msgstr ""
#: core/templates/language/overview.html:22
-#: nutrition/templates/ingredient/overview.html:38
+#: nutrition/templates/ingredient/overview.html:43
msgid "Add one now."
msgstr "Добави сега."
#: core/templates/language/overview.html:34 core/templates/license/list.html:43
-#: core/templates/repetition_unit/list.html:46
-#: core/templates/user/overview.html:344 core/templates/user/overview.html:384
-#: core/templates/user/overview.html:422
-#: core/templates/weight_unit/list.html:46 core/views/languages.py:74
-#: core/views/license.py:66 core/views/repetition_units.py:66
+#: core/templates/repetition_unit/list.html:44
+#: core/templates/user/overview.html:347 core/templates/user/overview.html:387
+#: core/templates/user/overview.html:425
+#: core/templates/weight_unit/list.html:46 core/views/languages.py:77
+#: core/views/license.py:66 core/views/repetition_units.py:76
#: core/views/weight_units.py:66
#: exercises/templates/categories/admin-overview.html:40
#: exercises/templates/equipment/admin-overview.html:39
@@ -521,14 +541,14 @@ msgstr "Добави сега."
#: gym/templates/gym/member_list.html:264
#: gym/templates/gym/member_list.html:303
#: mailer/templates/mailer/gym/overview.html:43
-#: nutrition/templates/ingredient/overview.html:60
+#: nutrition/templates/ingredient/overview.html:97
msgid "Add"
msgstr "Добави"
#: core/templates/language/view.html:61 core/templates/user/api_key.html:41
#: core/templates/user/preferences.html:50 gym/models/contract.py:203
#: gym/templates/contract/view.html:41 gym/templates/gym/member_list.html:270
-#: nutrition/templates/ingredient/view.html:206
+#: nutrition/templates/ingredient/view.html:245
msgid "Options"
msgstr "Опции"
@@ -538,9 +558,9 @@ msgstr ""
#: core/templates/license/list.html:30
#: core/templates/repetition_unit/list.html:32
-#: core/templates/user/overview.html:104 core/templates/user/overview.html:136
-#: core/templates/user/overview.html:185 core/templates/user/overview.html:365
-#: core/templates/user/overview.html:404 core/templates/user/overview.html:448
+#: core/templates/user/overview.html:107 core/templates/user/overview.html:139
+#: core/templates/user/overview.html:188 core/templates/user/overview.html:368
+#: core/templates/user/overview.html:407 core/templates/user/overview.html:451
#: core/templates/weight_unit/list.html:32
#: exercises/templates/categories/admin-overview.html:30
#: exercises/templates/equipment/admin-overview.html:30
@@ -552,11 +572,10 @@ msgstr ""
#: gym/templates/gym/member_list.html:284
#: gym/templates/gym/member_list.html:321
#: mailer/templates/mailer/gym/overview.html:30
-#: nutrition/templates/units/list.html:34
msgid "Nothing found"
msgstr ""
-#: core/templates/misc/about.html:4 core/templates/template.html:160
+#: core/templates/misc/about.html:4 core/templates/template.html:150
msgid "Imprint"
msgstr ""
@@ -564,170 +583,165 @@ msgstr ""
msgid "Training"
msgstr "Тренировка"
-#: core/templates/navigation.html:37 core/templates/user/overview.html:25
+#: core/templates/navigation.html:36 core/templates/user/overview.html:28
msgid "Routines"
msgstr ""
-#: core/templates/navigation.html:45 core/templates/user/overview.html:70
+#: core/templates/navigation.html:44 core/templates/user/overview.html:73
msgid "Calendar"
msgstr ""
-#: core/templates/navigation.html:55
+#: core/templates/navigation.html:53
#, fuzzy
#| msgid "Macronutrients"
msgid "Measurements"
msgstr "Макронутриенти"
-#: core/templates/navigation.html:66 gallery/templates/images/overview.html:6
+#: core/templates/navigation.html:64 gallery/templates/images/overview.html:6
msgid "Gallery"
msgstr ""
-#: core/templates/navigation.html:72
+#: core/templates/navigation.html:74 core/templates/navigation.html:400
+#: trophies/templates/trophies/overview.html:7
+msgid "Trophies"
+msgstr ""
+
+#: core/templates/navigation.html:79
#, fuzzy
#| msgid "Workouts schedules"
msgid "Workout templates"
msgstr "График на тренировки"
-#: core/templates/navigation.html:79
+#: core/templates/navigation.html:86
#, fuzzy
#| msgid "Your schedules"
msgid "Your templates"
msgstr "Твоите графици"
-#: core/templates/navigation.html:88
+#: core/templates/navigation.html:95
msgid "Public templates"
msgstr ""
-#: core/templates/navigation.html:96 software/templates/features.html:51
+#: core/templates/navigation.html:103 software/templates/features.html:51
#: software/templates/features.html:480
msgid "Exercises"
msgstr "Упражнения"
-#: core/templates/navigation.html:102 core/templates/navigation.html:176
-#: core/templates/navigation.html:339
+#: core/templates/navigation.html:109 core/templates/navigation.html:336
msgid "Administration"
msgstr "Администрация"
-#: core/templates/navigation.html:106
+#: core/templates/navigation.html:113
#, fuzzy
#| msgid "Exercise day"
msgid "Exercise edit history"
msgstr "Ден за упражнение"
-#: core/templates/navigation.html:112
+#: core/templates/navigation.html:119
msgid "Equipment"
msgstr ""
-#: core/templates/navigation.html:118
+#: core/templates/navigation.html:125
msgid "Muscles"
msgstr "Мускули"
-#: core/templates/navigation.html:124
+#: core/templates/navigation.html:131
#: exercises/templates/categories/admin-overview.html:4
msgid "Categories"
msgstr ""
-#: core/templates/navigation.html:139 software/templates/features.html:468
+#: core/templates/navigation.html:146 software/templates/features.html:468
msgid "Nutrition"
msgstr "Хранене"
-#: core/templates/navigation.html:147 core/templates/user/overview.html:144
+#: core/templates/navigation.html:154 core/templates/user/overview.html:147
msgid "Nutrition plans"
msgstr "План за хранене"
-#: core/templates/navigation.html:156
+#: core/templates/navigation.html:163
msgid "BMI calculator"
msgstr ""
-#: core/templates/navigation.html:165 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:172 nutrition/templates/rate/form.html:18
msgid "Daily calories calculator"
msgstr ""
-#: core/templates/navigation.html:171
+#: core/templates/navigation.html:178
#: nutrition/templates/ingredient/overview.html:10
msgid "Ingredient overview"
msgstr "Преглед на съставките"
-#: core/templates/navigation.html:180 nutrition/templates/units/list.html:6
-msgid "Ingredient weight units"
-msgstr "Единици за тежест на съставки"
-
-#: core/templates/navigation.html:196 software/templates/features.html:463
+#: core/templates/navigation.html:193 software/templates/features.html:463
msgid "Body weight"
msgstr ""
-#: core/templates/navigation.html:203 core/templates/user/overview.html:114
+#: core/templates/navigation.html:200 core/templates/user/overview.html:117
msgid "Weight overview"
msgstr "Преглед на тегло"
-#: core/templates/navigation.html:217
+#: core/templates/navigation.html:214
msgid "About this software"
msgstr "Относно този код"
-#: core/templates/navigation.html:223 software/templates/about_us.html:5
+#: core/templates/navigation.html:220 software/templates/about_us.html:5
msgid "Support & Get Involved"
msgstr ""
-#: core/templates/navigation.html:229 software/templates/features.html:528
+#: core/templates/navigation.html:226 software/templates/features.html:528
msgid "REST API"
msgstr ""
-#: core/templates/navigation.html:235 utils/models.py:45
+#: core/templates/navigation.html:232 utils/models.py:45
msgid "License"
msgstr "Лиценз"
-#: core/templates/navigation.html:241
+#: core/templates/navigation.html:238
msgid "Developer documentation"
msgstr ""
-#: core/templates/navigation.html:248
+#: core/templates/navigation.html:245
msgid "Get the code"
msgstr "Грабни кода"
-#: core/templates/navigation.html:255 core/templates/template.html:199
-#: software/templates/features.html:603
+#: core/templates/navigation.html:252 core/templates/template.html:202
+#: software/templates/features.html:614
msgid "Translate"
msgstr "Преведи"
-#: core/templates/navigation.html:292 core/templates/user/login.html:30
+#: core/templates/navigation.html:289 core/templates/user/login.html:30
msgid "Reset password"
msgstr "Промени парола"
-#: core/templates/navigation.html:301 core/templates/navigation.html:329
+#: core/templates/navigation.html:298 core/templates/navigation.html:326
msgid "Logout"
msgstr "Изход"
-#: core/templates/navigation.html:320
+#: core/templates/navigation.html:317
msgid "My preferences"
msgstr "Моите преференции"
-#: core/templates/navigation.html:352
+#: core/templates/navigation.html:349
msgid "Licenses"
msgstr ""
-#: core/templates/navigation.html:360
+#: core/templates/navigation.html:357
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr ""
-#: core/templates/navigation.html:368 core/templates/weight_unit/list.html:4
-#: nutrition/templates/ingredient/view.html:141
+#: core/templates/navigation.html:365 core/templates/weight_unit/list.html:4
+#: nutrition/templates/ingredient/view.html:182
msgid "Weight units"
msgstr "Единици за тегло"
-#: core/templates/navigation.html:376 core/templates/user/list.html:4
+#: core/templates/navigation.html:373 core/templates/user/list.html:4
msgid "User list"
msgstr ""
-#: core/templates/navigation.html:382
+#: core/templates/navigation.html:379
msgid "Gyms"
msgstr ""
-#: core/templates/navigation.html:403
-#: trophies/templates/trophies/overview.html:7
-msgid "Trophies"
-msgstr ""
-
#: core/templates/registration/password_reset_complete.html:4
msgid "Password reset complete"
msgstr "Редактирането на паролата завърши"
@@ -787,27 +801,31 @@ msgstr "предишно"
msgid "next"
msgstr "следващо"
-#: core/templates/template.html:96
+#: core/templates/template.html:86
msgid "Close"
msgstr ""
-#: core/templates/template.html:112
+#: core/templates/template.html:102
msgid ""
"You are using a guest account, data entered will be deleted after a week."
msgstr ""
"Вие сте влезли като гост и всички данни, които добавяте ще бъдат изтрити "
"след една седмица."
-#: core/templates/template.html:117
+#: core/templates/template.html:107
msgid "Create some demo entries"
msgstr "Направи демонстративни попълнения"
-#: core/templates/template.html:165 software/templates/features.html:568
+#: core/templates/template.html:155 software/templates/features.html:568
#: software/templates/tos.html:7
msgid "Terms of service"
msgstr ""
-#: core/templates/template_features.html:53 software/templates/features.html:9
+#: core/templates/template.html:181 software/templates/features.html:595
+msgid "Browser language"
+msgstr ""
+
+#: core/templates/template_features.html:46 software/templates/features.html:9
msgid "Features"
msgstr "Особености"
@@ -862,99 +880,94 @@ msgstr "Нямаш акаунт?"
msgid "Forgot password?"
msgstr "Забравена парола?"
-#: core/templates/user/overview.html:25 core/templates/user/overview.html:68
-#: core/templates/user/overview.html:112 core/templates/user/overview.html:144
-#: core/templates/user/overview.html:348 core/templates/user/overview.html:390
-#: core/templates/user/overview.html:426
+#: core/templates/user/overview.html:28 core/templates/user/overview.html:71
+#: core/templates/user/overview.html:115 core/templates/user/overview.html:147
+#: core/templates/user/overview.html:351 core/templates/user/overview.html:393
+#: core/templates/user/overview.html:429
#, python-format
msgid "last %(number)s"
msgstr ""
-#: core/templates/user/overview.html:27 core/templates/user/overview.html:146
-#: core/templates/user/overview.html:343 core/templates/user/overview.html:382
-#: core/templates/user/overview.html:421 gym/templates/gym/member_list.html:226
+#: core/templates/user/overview.html:30 core/templates/user/overview.html:149
+#: core/templates/user/overview.html:346 core/templates/user/overview.html:385
+#: core/templates/user/overview.html:424 gym/templates/gym/member_list.html:226
#: gym/templates/gym/member_list.html:262
#: gym/templates/gym/member_list.html:302
msgid "Overview"
msgstr "Преглед"
-#: core/templates/user/overview.html:34 core/templates/user/overview.html:76
-#: core/templates/user/overview.html:120 core/templates/user/overview.html:152
+#: core/templates/user/overview.html:37 core/templates/user/overview.html:79
+#: core/templates/user/overview.html:123 core/templates/user/overview.html:155
#: manager/helpers.py:88 software/templates/about_us.html:170
#: weight/templates/import_csv_preview.html:13
#: weight/templates/import_csv_preview.html:42 weight/views.py:54
msgid "Date"
msgstr "Дата"
-#: core/templates/user/overview.html:35 core/templates/user/overview.html:153
+#: core/templates/user/overview.html:38 core/templates/user/overview.html:156
#: gym/models/contract.py:58 gym/models/contract.py:109
msgid "Description"
msgstr "Описание"
-#: core/templates/user/overview.html:36
+#: core/templates/user/overview.html:39
msgid "Number of logs (days)"
msgstr ""
-#: core/templates/user/overview.html:37 core/views/user.py:590
+#: core/templates/user/overview.html:40 core/views/user.py:606
#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:158
msgid "Last activity"
msgstr ""
-#: core/templates/user/overview.html:58
+#: core/templates/user/overview.html:61
msgid "No workouts found."
msgstr "Не са намерени тренировки."
-#: core/templates/user/overview.html:68
+#: core/templates/user/overview.html:71
msgid "Log"
msgstr ""
-#: core/templates/user/overview.html:77
+#: core/templates/user/overview.html:80
msgid "General impression"
msgstr ""
-#: core/templates/user/overview.html:78 core/templates/user/overview.html:390
+#: core/templates/user/overview.html:81 core/templates/user/overview.html:393
msgid "Notes"
msgstr "Бележки"
-#: core/templates/user/overview.html:79
-#: exercises/templates/history/overview.html:30
-msgid "Time"
-msgstr ""
-
-#: core/templates/user/overview.html:112 core/templates/user/overview.html:121
+#: core/templates/user/overview.html:115 core/templates/user/overview.html:124
#: manager/helpers.py:89 weight/templates/import_csv_preview.html:14
#: weight/templates/import_csv_preview.html:43 weight/views.py:54
msgid "Weight"
msgstr "Тегло"
-#: core/templates/user/overview.html:154
-#: nutrition/templates/ingredient/view.html:51 nutrition/views/plan.py:245
+#: core/templates/user/overview.html:157
+#: nutrition/templates/ingredient/view.html:52 nutrition/views/plan.py:244
msgid "Energy"
msgstr "Енергия"
-#: core/templates/user/overview.html:155
-#: nutrition/templates/ingredient/view.html:58 nutrition/views/plan.py:251
+#: core/templates/user/overview.html:158
+#: nutrition/templates/ingredient/view.html:59 nutrition/views/plan.py:250
msgid "Protein"
msgstr "Протеин"
-#: core/templates/user/overview.html:156
-#: nutrition/templates/ingredient/view.html:64 nutrition/views/plan.py:259
+#: core/templates/user/overview.html:159
+#: nutrition/templates/ingredient/view.html:65 nutrition/views/plan.py:258
msgid "Carbohydrates"
msgstr "Въглехидрати"
-#: core/templates/user/overview.html:157
-#: nutrition/templates/ingredient/view.html:80 nutrition/views/plan.py:273
+#: core/templates/user/overview.html:160
+#: nutrition/templates/ingredient/view.html:81 nutrition/views/plan.py:272
msgid "Fat"
msgstr "Мазнини"
-#: core/templates/user/overview.html:170
-#: nutrition/templates/ingredient/view.html:53
+#: core/templates/user/overview.html:173
+#: nutrition/templates/ingredient/view.html:54
msgid "kcal"
msgstr ""
-#: core/templates/user/overview.html:201 core/templates/user/overview.html:340
-#: core/templates/user/overview.html:379 core/templates/user/overview.html:418
-#: core/templates/user/overview.html:463 gym/templates/gym/list.html:45
+#: core/templates/user/overview.html:204 core/templates/user/overview.html:343
+#: core/templates/user/overview.html:382 core/templates/user/overview.html:421
+#: core/templates/user/overview.html:466 gym/templates/gym/list.html:45
#: gym/templates/gym/member_list.html:91 gym/templates/gym/member_list.html:149
#: gym/templates/gym/member_list.html:187
#: gym/templates/gym/member_list.html:223
@@ -963,109 +976,113 @@ msgstr ""
msgid "Actions"
msgstr "Действия"
-#: core/templates/user/overview.html:210
+#: core/templates/user/overview.html:213
msgid "Deactivate user"
msgstr ""
-#: core/templates/user/overview.html:214
+#: core/templates/user/overview.html:217
msgid "Activate user"
msgstr ""
-#: core/templates/user/overview.html:223
+#: core/templates/user/overview.html:226
msgid "Reset user password"
msgstr ""
-#: core/templates/user/overview.html:227 gym/templates/gym/member_list.html:30
+#: core/templates/user/overview.html:230 gym/templates/gym/member_list.html:30
msgid "Roles"
msgstr ""
-#: core/templates/user/overview.html:243
+#: core/templates/user/overview.html:246
msgid "Password reset confirmation"
msgstr "Потвърждение за нулиране на паролата"
-#: core/templates/user/overview.html:247
+#: core/templates/user/overview.html:250
msgid "Do you really want to change this user&#39;s password?"
msgstr ""
-#: core/templates/user/overview.html:250
+#: core/templates/user/overview.html:253
#: exercises/templates/history/overview.html:106
+#: nutrition/templates/ingredient/view.html:148
+#: nutrition/templates/ingredient/view.html:160
msgid "No"
msgstr ""
-#: core/templates/user/overview.html:251
+#: core/templates/user/overview.html:254
#: exercises/templates/history/overview.html:99
+#: nutrition/templates/ingredient/view.html:146
+#: nutrition/templates/ingredient/view.html:158
msgid "Yes"
msgstr ""
-#: core/templates/user/overview.html:272 gym/templates/gym/member_list.html:105
+#: core/templates/user/overview.html:275 gym/templates/gym/member_list.html:105
msgid "Details"
msgstr ""
-#: core/templates/user/overview.html:276 gym/views/export.py:57
-#: manager/helpers.py:89 nutrition/views/plan.py:151
-#: nutrition/views/plan.py:157
+#: core/templates/user/overview.html:279 gym/views/export.py:57
+#: manager/helpers.py:89 nutrition/views/plan.py:150
+#: nutrition/views/plan.py:156
msgid "Nr."
msgstr "№"
-#: core/templates/user/overview.html:298 gym/models/contract.py:287
+#: core/templates/user/overview.html:301 gym/models/contract.py:287
#: gym/models/gym.py:50 gym/templates/contract/view.html:75
#: gym/templates/gym/member_list.html:112 gym/views/export.py:68
msgid "Phone"
msgstr ""
-#: core/templates/user/overview.html:302 gym/templates/contract/view.html:87
+#: core/templates/user/overview.html:305 gym/templates/contract/view.html:87
#: gym/templates/gym/member_list.html:130
msgid "Address"
msgstr ""
-#: core/templates/user/overview.html:313
+#: core/templates/user/overview.html:316
msgid "Registered"
msgstr ""
-#: core/templates/user/overview.html:317
+#: core/templates/user/overview.html:320
msgid "Last login"
msgstr ""
-#: core/templates/user/overview.html:322
+#: core/templates/user/overview.html:325
msgid "Status"
msgstr ""
-#: core/templates/user/overview.html:325
+#: core/templates/user/overview.html:328
msgid "Active"
msgstr ""
-#: core/templates/user/overview.html:327
+#: core/templates/user/overview.html:330
msgid "Inactive"
msgstr ""
-#: core/templates/user/overview.html:348 gym/templates/contract/list.html:4
+#: core/templates/user/overview.html:351 gym/templates/contract/list.html:4
#: gym/templates/gym/member_list.html:218
msgid "Contracts"
msgstr ""
-#: core/templates/user/overview.html:426 gym/templates/document/list.html:4
+#: core/templates/user/overview.html:429 gym/templates/document/list.html:4
msgid "Documents"
msgstr ""
-#: core/templates/user/overview.html:433 gym/templates/document/list.html:33
+#: core/templates/user/overview.html:436 gym/templates/document/list.html:33
msgid "Download"
msgstr ""
-#: core/templates/user/overview.html:474 gym/views/admin_config.py:44
+#: core/templates/user/overview.html:477 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:477 gym/models/user_config.py:92
+#: core/templates/user/overview.html:480 gym/models/user_config.py:92
msgid "Include in inactive overview"
msgstr ""
-#: core/templates/user/overview.html:510
+#: core/templates/user/overview.html:513
#, python-format
msgid "Admin login is only available for users in %(gym_name)s"
msgstr ""
-#: core/templates/user/overview.html:514
+#: core/templates/user/overview.html:517
msgid "Log in as this user"
msgstr ""
@@ -1089,7 +1106,7 @@ msgstr ""
msgid "You need to verify your email to contribute exercises"
msgstr ""
-#: core/templates/user/preferences.html:55 core/views/user.py:601
+#: core/templates/user/preferences.html:55 core/views/user.py:617
msgid "Change password"
msgstr "Смени парола"
@@ -1097,23 +1114,23 @@ msgstr "Смени парола"
msgid "Already have an account?"
msgstr ""
-#: core/templatetags/wger_extras.py:142 i18n.tpl:38
+#: core/templatetags/wger_extras.py:142 i18n.tpl:39
msgid "kg"
msgstr ""
#: core/templatetags/wger_extras.py:144
-#: nutrition/templates/ingredient/view.html:60
-#: nutrition/templates/ingredient/view.html:66
-#: nutrition/templates/ingredient/view.html:73
-#: nutrition/templates/ingredient/view.html:82
-#: nutrition/templates/ingredient/view.html:89
-#: nutrition/templates/ingredient/view.html:111
-#: nutrition/templates/ingredient/view.html:121
+#: nutrition/templates/ingredient/view.html:61
+#: nutrition/templates/ingredient/view.html:67
+#: nutrition/templates/ingredient/view.html:74
+#: nutrition/templates/ingredient/view.html:83
+#: nutrition/templates/ingredient/view.html:90
+#: nutrition/templates/ingredient/view.html:112
+#: nutrition/templates/ingredient/view.html:122
msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr ""
-#: core/templatetags/wger_extras.py:147 i18n.tpl:39
+#: core/templatetags/wger_extras.py:147 i18n.tpl:40
msgid "lb"
msgstr ""
@@ -1122,36 +1139,35 @@ msgctxt "weight unit, i.e. ounces"
msgid "oz"
msgstr ""
-#: core/views/languages.py:85 exercises/views/categories.py:122
+#: core/views/languages.py:88 exercises/views/categories.py:122
#: exercises/views/equipment.py:103 exercises/views/muscles.py:99
-#: nutrition/views/ingredient.py:120 nutrition/views/unit.py:110
+#: nutrition/views/ingredient.py:125
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
+#: core/views/languages.py:96 core/views/license.py:103
+#: core/views/repetition_units.py:114 core/views/weight_units.py:115
#: exercises/views/categories.py:128 exercises/views/muscles.py:106
#: gallery/views/images.py:124 gym/views/admin_notes.py:196
#: gym/views/document.py:206 gym/views/gym.py:481
-#: nutrition/views/ingredient.py:127 nutrition/views/unit.py:117
+#: nutrition/views/ingredient.py:132
#, python-brace-format
msgid "Delete {0}?"
msgstr ""
-#: core/views/languages.py:111 core/views/license.py:85
-#: core/views/repetition_units.py:86 core/views/user.py:464
+#: core/views/languages.py:114 core/views/license.py:85
+#: core/views/repetition_units.py:96 core/views/user.py:480
#: core/views/weight_units.py:86 exercises/views/categories.py:98
#: exercises/views/equipment.py:81 exercises/views/muscles.py:87
#: gym/views/admin_notes.py:161 gym/views/config.py:68
#: gym/views/contract.py:186 gym/views/contract_option.py:123
#: gym/views/contract_type.py:123 gym/views/document.py:171
-#: gym/views/gym.py:463 nutrition/views/ingredient.py:146
-#: nutrition/views/unit.py:143
+#: gym/views/gym.py:463 nutrition/views/ingredient.py:151
#, python-brace-format
msgid "Edit {0}"
msgstr ""
-#: core/views/misc.py:74
+#: core/views/misc.py:73
msgid ""
"We have created sample workout, workout schedules, weight logs, (body) "
"weight and nutrition plan entries so you can better see what this site can "
@@ -1162,48 +1178,48 @@ msgstr ""
"този сайт да направи за теб. Чувствай се свободен да ги редактираш или "
"изтриеш!"
-#: core/views/user.py:143
+#: core/views/user.py:145
#, python-brace-format
msgid "Account \"{0}\" was successfully deleted"
msgstr ""
-#: core/views/user.py:279
+#: core/views/user.py:287
msgid "You were successfully registered"
msgstr "Вие се регистрирахте успешно"
-#: core/views/user.py:341
+#: core/views/user.py:357
msgid "Settings successfully updated"
msgstr "Настройките бяха успешно обновени"
-#: core/views/user.py:380
+#: core/views/user.py:396
msgid "The user was successfully deactivated"
msgstr ""
-#: core/views/user.py:417
+#: core/views/user.py:433
msgid "The user was successfully activated"
msgstr ""
-#: core/views/user.py:432
+#: core/views/user.py:448
msgid "Edit user"
msgstr ""
-#: core/views/user.py:587 gym/templates/gym/member_list.html:26
+#: core/views/user.py:603 gym/templates/gym/member_list.html:26
#: gym/views/gym.py:158
msgid "ID"
msgstr ""
-#: core/views/user.py:588 gym/forms.py:95 gym/templates/contract/view.html:55
+#: core/views/user.py:604 gym/forms.py:95 gym/templates/contract/view.html:55
#: gym/templates/gym/member_list.html:27 gym/views/export.py:59
#: gym/views/gym.py:158 gym/views/gym.py:217
msgid "Username"
msgstr ""
-#: core/views/user.py:591 gym/templates/gym/new_user.html:34
+#: core/views/user.py:607 gym/templates/gym/new_user.html:34
#: gym/views/export.py:58 gym/views/gym.py:217
msgid "Gym"
msgstr ""
-#: core/views/user.py:650
+#: core/views/user.py:678
#, python-format
msgid "A verification email was sent to %(email)s"
msgstr ""
@@ -1222,16 +1238,16 @@ msgstr "име на упражнение"
msgid "A more basic name for the muscle"
msgstr ""
-#: exercises/models/video.py:50
+#: exercises/models/video.py:52
#, python-format
msgid "Maximum file size is %(size)sMB."
msgstr ""
-#: exercises/models/video.py:57 exercises/models/video.py:65
+#: exercises/models/video.py:59 exercises/models/video.py:67
msgid "File type is not supported"
msgstr ""
-#: exercises/models/video.py:70
+#: exercises/models/video.py:72
msgid "File is not a valid video"
msgstr ""
@@ -1308,7 +1324,11 @@ msgstr ""
msgid "Add muscle"
msgstr "Добави мускул"
-#: gallery/templates/images/overview.html:72
+#: gallery/forms.py:35
+msgid "If date is left empty, it will be read from the image instead"
+msgstr ""
+
+#: gallery/templates/images/overview.html:69
#, fuzzy
#| msgid "Add muscle"
msgid "Add image"
@@ -1376,7 +1396,7 @@ msgid "Contract type"
msgstr ""
#: gym/models/contract.py:211 gym/templates/contract/view.html:59
-#: nutrition/forms.py:58
+#: nutrition/forms.py:67
msgid "Amount"
msgstr "Количество"
@@ -1552,7 +1572,7 @@ msgstr ""
msgid "Add member"
msgstr ""
-#: gym/templates/gym/new_user.html:48 nutrition/templates/rate/form.html:120
+#: gym/templates/gym/new_user.html:48 nutrition/templates/rate/form.html:121
msgid "Info"
msgstr "Инфо"
@@ -1723,10 +1743,6 @@ msgstr ""
msgid "Quads"
msgstr ""
-#: i18n.tpl:30
-msgid "Repetitions"
-msgstr "Повторения"
-
#: i18n.tpl:31
msgid "Resistance band"
msgstr ""
@@ -1755,195 +1771,199 @@ msgstr ""
msgid "Until Failure"
msgstr ""
-#: i18n.tpl:40
-msgid "none (bodyweight exercise)"
+#: i18n.tpl:38
+msgid "Meters"
msgstr ""
#: i18n.tpl:41
-msgid "Beginner"
+msgid "none (bodyweight exercise)"
msgstr ""
#: i18n.tpl:42
+msgid "Beginner"
+msgstr ""
+
+#: i18n.tpl:43
#, fuzzy
#| msgid "Contents"
msgid "Consistent"
msgstr "Съставки"
-#: i18n.tpl:43
+#: i18n.tpl:44
msgid "Dedicated"
msgstr ""
-#: i18n.tpl:44
+#: i18n.tpl:45
msgid "Obsessed"
msgstr ""
-#: i18n.tpl:45
+#: i18n.tpl:46
msgid "Legend"
msgstr ""
-#: i18n.tpl:46
+#: i18n.tpl:47
msgid "Veteran"
msgstr ""
-#: i18n.tpl:47
+#: i18n.tpl:48
msgid "Titan"
msgstr ""
-#: i18n.tpl:48
+#: i18n.tpl:49
msgid "Unstoppable"
msgstr ""
-#: i18n.tpl:49
+#: i18n.tpl:50
msgid "Weekend Warrior"
msgstr ""
-#: i18n.tpl:50
+#: i18n.tpl:51
msgid "Elephant lifter"
msgstr ""
-#: i18n.tpl:51
+#: i18n.tpl:52
msgid "Bus lifter"
msgstr ""
-#: i18n.tpl:52
+#: i18n.tpl:53
msgid "Plane lifter"
msgstr ""
-#: i18n.tpl:53
+#: i18n.tpl:54
msgid "Blue whale lifter"
msgstr ""
-#: i18n.tpl:54
+#: i18n.tpl:55
msgid "Space Station lifter"
msgstr ""
-#: i18n.tpl:55
+#: i18n.tpl:56
msgid "Millionaire"
msgstr ""
-#: i18n.tpl:56
+#: i18n.tpl:57
msgid "Atlas"
msgstr ""
-#: i18n.tpl:57
+#: i18n.tpl:58
msgid "Early Bird"
msgstr ""
-#: i18n.tpl:58
+#: i18n.tpl:59
#, fuzzy
#| msgid "Weight log"
msgid "Night Owl"
msgstr "Запис на тегло"
-#: i18n.tpl:59
+#: i18n.tpl:60
msgid "New Year, New Me"
msgstr ""
-#: i18n.tpl:60
+#: i18n.tpl:61
msgid "Phoenix"
msgstr ""
-#: i18n.tpl:61
+#: i18n.tpl:62
msgid "Personal Record"
msgstr ""
-#: i18n.tpl:62
+#: i18n.tpl:63
#, fuzzy
#| msgid "Copy workout"
msgid "Complete your first workout"
msgstr "Копирай тренировка"
-#: i18n.tpl:63
+#: i18n.tpl:64
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 10 workouts"
msgstr "Примерна тренировка"
-#: i18n.tpl:64
+#: i18n.tpl:65
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 50 workouts"
msgstr "Примерна тренировка"
-#: i18n.tpl:65
+#: i18n.tpl:66
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 100 workouts"
msgstr "Примерна тренировка"
-#: i18n.tpl:66
+#: i18n.tpl:67
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 200 workouts"
msgstr "Примерна тренировка"
-#: i18n.tpl:67
+#: i18n.tpl:68
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 500 workouts"
msgstr "Примерна тренировка"
-#: i18n.tpl:68
+#: i18n.tpl:69
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 1000 workouts"
msgstr "Примерна тренировка"
-#: i18n.tpl:69
+#: i18n.tpl:70
msgid "Maintain a 30-day workout streak"
msgstr ""
-#: i18n.tpl:70
+#: i18n.tpl:71
msgid "Work out on Saturday and Sunday for 4 consecutive weekends"
msgstr ""
-#: i18n.tpl:71
+#: i18n.tpl:72
msgid "Lift a cumulative total of 5.000 kg"
msgstr ""
-#: i18n.tpl:72
+#: i18n.tpl:73
msgid "Lift a cumulative total of 20.000 kg"
msgstr ""
-#: i18n.tpl:73
+#: i18n.tpl:74
msgid "Lift a cumulative total of 50.000 kg"
msgstr ""
-#: i18n.tpl:74
+#: i18n.tpl:75
msgid "Lift a cumulative total of 150.000 kg"
msgstr ""
-#: i18n.tpl:75
+#: i18n.tpl:76
msgid "Lift a cumulative total of 450.000 kg"
msgstr ""
-#: i18n.tpl:76
+#: i18n.tpl:77
msgid "Lift a cumulative total of 1.000.000 kg"
msgstr ""
-#: i18n.tpl:77
+#: i18n.tpl:78
msgid "Lift a cumulative total of 10.000.000 kg"
msgstr ""
-#: i18n.tpl:78
+#: i18n.tpl:79
msgid "Complete a workout before 6:00 AM"
msgstr ""
-#: i18n.tpl:79
+#: i18n.tpl:80
msgid "Complete a workout after 9:00 PM"
msgstr ""
-#: i18n.tpl:80
+#: i18n.tpl:81
#, fuzzy
#| msgid "Workout for %s"
msgid "Work out on January 1st"
msgstr "Тренировка за %s"
-#: i18n.tpl:81
+#: i18n.tpl:82
msgid "Return to training after being inactive for 30 days"
msgstr ""
-#: i18n.tpl:82
+#: i18n.tpl:83
msgid "Achieve a new Personal Record on any exercise"
msgstr ""
@@ -2025,7 +2045,7 @@ msgstr "Упражнение"
msgid "Routine will expire soon"
msgstr ""
-#: manager/models/routine.py:153 manager/models/session.py:145
+#: manager/models/routine.py:154 manager/models/session.py:145
msgid "The start time cannot be after the end time."
msgstr ""
@@ -2097,38 +2117,60 @@ msgstr "Упражнение"
msgid "Workout for %s"
msgstr "Тренировка за %s"
-#: nutrition/forms.py:62
+#: nutrition/extract_info/off.py:72 nutrition/extract_info/off.py:91
+msgid "Serving"
+msgstr ""
+
+#: nutrition/forms.py:71 nutrition/forms.py:208
msgid "Unit"
msgstr ""
-#: nutrition/forms.py:170 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:179 nutrition/templates/rate/form.html:77
msgid "Basic caloric intake"
msgstr ""
-#: nutrition/forms.py:171
+#: nutrition/forms.py:180
msgid "Your basic caloric intake as calculated for your data"
msgstr ""
-#: nutrition/forms.py:176
+#: nutrition/forms.py:185
msgid "Additional calories"
msgstr ""
-#: nutrition/forms.py:178
+#: nutrition/forms.py:187
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
msgstr ""
#: nutrition/forms.py:209
+msgid "grams (g)"
+msgstr ""
+
+#: nutrition/forms.py:219
msgid "Ingredient"
msgstr "Съставка"
-#: nutrition/forms.py:213
+#: nutrition/forms.py:223
#, fuzzy
#| msgid "Also use ingredients in English"
msgid "Also search for names in English"
msgstr "Също използвай съставки на Английски"
+#: nutrition/forms.py:239
+msgid "Quantity"
+msgstr ""
+
+#: nutrition/forms.py:241
+msgid "Enter a quantity and choose grams (g) or one of the serving units."
+msgstr ""
+
+#: nutrition/models/ingredient.py:526
+#, fuzzy
+#| msgid "Duration"
+msgid "Portion"
+msgstr "Времетраене"
+
#: nutrition/templates/ingredient/email_new.tpl:1
#, python-format
msgid ""
@@ -2174,59 +2216,86 @@ msgstr ""
"когато си се регистрирал, ще бъдеш уведомен когато процеса е завършил "
"успешно."
-#: nutrition/templates/ingredient/overview.html:38
+#: nutrition/templates/ingredient/overview.html:32
+#: nutrition/templates/ingredient/overview.html:68
+#: nutrition/templates/ingredient/view.html:143
+msgid "Vegan"
+msgstr ""
+
+#: nutrition/templates/ingredient/overview.html:34
+#: nutrition/templates/ingredient/overview.html:79
+#: nutrition/templates/ingredient/view.html:155
+msgid "Vegetarian"
+msgstr ""
+
+#: nutrition/templates/ingredient/overview.html:43
msgid "No ingredients."
msgstr "Няма съставки."
-#: nutrition/templates/ingredient/overview.html:49
+#: nutrition/templates/ingredient/overview.html:54
msgid "Search"
msgstr "Търси"
-#: nutrition/templates/ingredient/view.html:45 nutrition/views/plan.py:237
+#: nutrition/templates/ingredient/overview.html:57
+msgid "Filter"
+msgstr ""
+
+#: nutrition/templates/ingredient/overview.html:83
+msgid "Apply"
+msgstr ""
+
+#: nutrition/templates/ingredient/overview.html:85
+msgid "Reset"
+msgstr ""
+
+#: nutrition/templates/ingredient/view.html:46 nutrition/views/plan.py:236
msgid "Macronutrients"
msgstr "Макронутриенти"
-#: nutrition/templates/ingredient/view.html:54
+#: nutrition/templates/ingredient/view.html:55
msgid "kJ"
msgstr ""
-#: nutrition/templates/ingredient/view.html:70 nutrition/views/plan.py:267
+#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:266
msgid "Sugar content in carbohydrates"
msgstr "Състав на захар в въглехидратите"
-#: nutrition/templates/ingredient/view.html:75
-#: nutrition/templates/ingredient/view.html:91
-#: nutrition/templates/ingredient/view.html:113
-#: nutrition/templates/ingredient/view.html:123
+#: nutrition/templates/ingredient/view.html:76
+#: nutrition/templates/ingredient/view.html:92
+#: nutrition/templates/ingredient/view.html:114
+#: nutrition/templates/ingredient/view.html:124
msgid "n.A."
msgstr "Не е налично"
-#: nutrition/templates/ingredient/view.html:86 nutrition/views/plan.py:281
+#: nutrition/templates/ingredient/view.html:87 nutrition/views/plan.py:280
msgid "Saturated fat content in fats"
msgstr "Наситени мазнини в мазнини"
-#: nutrition/templates/ingredient/view.html:102
+#: nutrition/templates/ingredient/view.html:103
msgid "Others"
msgstr "Други"
-#: nutrition/templates/ingredient/view.html:108 nutrition/views/plan.py:287
+#: nutrition/templates/ingredient/view.html:109 nutrition/views/plan.py:286
msgid "Fiber"
msgstr ""
-#: nutrition/templates/ingredient/view.html:118 nutrition/views/plan.py:293
+#: nutrition/templates/ingredient/view.html:119 nutrition/views/plan.py:292
msgid "Sodium"
msgstr "Натрий"
-#: nutrition/templates/ingredient/view.html:143
-#: nutrition/templates/units/list.html:50 nutrition/views/unit.py:86
+#: nutrition/templates/ingredient/view.html:136
+msgid "Dietary information"
+msgstr ""
+
+#: nutrition/templates/ingredient/view.html:184
msgid "Add new weight unit"
msgstr "Добави нова единица за тегло"
-#: nutrition/templates/rate/form.html:25
+#: nutrition/templates/rate/form.html:26
msgid "Basal metabolic rate"
msgstr ""
-#: nutrition/templates/rate/form.html:26
+#: nutrition/templates/rate/form.html:27
msgid ""
"The basal metabolic rate is the amount of energy expended daily\n"
"at rest. This is the minimum energy needed for the body to function, without "
@@ -2234,36 +2303,36 @@ msgid ""
"additional physical activity."
msgstr ""
-#: nutrition/templates/rate/form.html:37
+#: nutrition/templates/rate/form.html:38
msgid "Your basic metabolic rate is: "
msgstr ""
-#: nutrition/templates/rate/form.html:47
+#: nutrition/templates/rate/form.html:48
msgid "Physical activities"
msgstr ""
-#: nutrition/templates/rate/form.html:48
+#: nutrition/templates/rate/form.html:49
msgid ""
"The physical activity level (PAL) is a factor used to to express\n"
"the additional physical activity and is used to calculate the total energy\n"
"required per day."
msgstr ""
-#: nutrition/templates/rate/form.html:59
+#: nutrition/templates/rate/form.html:60
msgid "Factor for daily activities: "
msgstr ""
-#: nutrition/templates/rate/form.html:67
+#: nutrition/templates/rate/form.html:68
msgid ""
"The base caloric intake is the amount of calories your metabolism\n"
"needs based on your level of physical activity."
msgstr ""
-#: nutrition/templates/rate/form.html:81
+#: nutrition/templates/rate/form.html:82
msgid "Calculate basic caloric intake"
msgstr ""
-#: nutrition/templates/rate/form.html:88
+#: nutrition/templates/rate/form.html:89
msgid ""
"The total calories are the actual total calories per day. This\n"
"might include e.g. a surplus or deficit if you are bulking or cutting. "
@@ -2271,67 +2340,67 @@ msgid ""
"you might just enter yourself the amount of calories if you know the value."
msgstr ""
-#: nutrition/templates/rate/form.html:102
+#: nutrition/templates/rate/form.html:103
msgid "Transfer basic intake to total daily calories"
msgstr ""
-#: nutrition/templates/rate/form.html:106
+#: nutrition/templates/rate/form.html:107
msgid "Add additional calories to total daily calories"
msgstr ""
-#: nutrition/templates/rate/form.html:110
+#: nutrition/templates/rate/form.html:111
msgid "Save total calories to profile"
msgstr ""
-#: nutrition/templates/rate/form.html:121
+#: nutrition/templates/rate/form.html:122
msgid ""
"Please note that these calculations can only be an\n"
"approximation. If you base your nutrition plan on these values, observe\n"
"yourself for some weeks and change the total amount if needed."
msgstr ""
-#: nutrition/views/ingredient.py:158
+#: nutrition/views/ingredient.py:163
msgid "Add a new ingredient"
msgstr "Добави нова съставка"
-#: nutrition/views/plan.py:128
+#: nutrition/views/plan.py:127
msgid "Nutritional plan"
msgstr ""
-#: nutrition/views/plan.py:130
+#: nutrition/views/plan.py:129
#, python-format
msgid "Nutritional plan for %s"
msgstr ""
-#: nutrition/views/plan.py:202
+#: nutrition/views/plan.py:201
msgid "<i>This is an empty plan, what did you expect on the PDF?</i>"
msgstr ""
-#: nutrition/views/plan.py:230
+#: nutrition/views/plan.py:229
msgid "Nutritional data"
msgstr "Хранителни данни"
-#: nutrition/views/plan.py:238
+#: nutrition/views/plan.py:237
msgid "Total"
msgstr ""
-#: nutrition/views/plan.py:239
+#: nutrition/views/plan.py:238
msgid "Percent of energy"
msgstr ""
-#: nutrition/views/plan.py:240
+#: nutrition/views/plan.py:239
msgid "g per body kg"
msgstr ""
-#: nutrition/views/unit_ingredient.py:69
+#: nutrition/views/unit_ingredient.py:64
msgid "Add a new weight unit"
msgstr "Добави единица за тегло"
-#: nutrition/views/unit_ingredient.py:106
+#: nutrition/views/unit_ingredient.py:99
msgid "Edit a weight unit to ingredient connection"
msgstr "Промени единица за тегло към хранителната съставка"
-#: nutrition/views/unit_ingredient.py:138
+#: nutrition/views/unit_ingredient.py:129
msgid "Delete?"
msgstr ""
@@ -2712,7 +2781,7 @@ msgstr ""
msgid "Translation"
msgstr "Преведи"
-#: utils/generic_views.py:263
+#: utils/generic_views.py:246
msgid "Yes, delete"
msgstr ""
@@ -2763,10 +2832,6 @@ msgstr ""
msgid "Import weight logs"
msgstr ""
-#: weight/templates/import_csv_form.html:9
-msgid "Submit"
-msgstr ""
-
#: weight/templates/import_csv_form.html:15
msgid ""
"Use this import field to import your weight logs into Workout\n"
@@ -2862,6 +2927,19 @@ msgstr ""
msgid "Re-Submit"
msgstr ""
+#, fuzzy
+#~| msgid "Administration"
+#~ msgid "Email verification"
+#~ msgstr "Администрация"
+
+#, fuzzy
+#~| msgid "Administration"
+#~ msgid "Email Confirmation"
+#~ msgstr "Администрация"
+
+#~ msgid "Ingredient weight units"
+#~ msgstr "Единици за тежест на съставки"
+
#~ msgid "Comment"
#~ msgstr "Коментирай"
@@ -2907,9 +2985,6 @@ msgstr ""
#~ msgid "Language"
#~ msgstr "Език"
-#~ msgid "Duration"
-#~ msgstr "Времетраене"
-
#, fuzzy
#~| msgid "Code"
#~ msgid "Codec"
diff --git a/wger/locale/ca/LC_MESSAGES/django.po b/wger/locale/ca/LC_MESSAGES/django.po
index d2f8390d2..abfb048a6 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: 2026-01-17 14:03+0000\n"
+"POT-Creation-Date: 2026-04-10 10:20+0000\n"
"PO-Revision-Date: 2024-08-04 23:09+0000\n"
"Last-Translator: Zixu Sun <[email protected]>\n"
"Language-Team: Catalan <https://hosted.weblate.org/projects/wger/web/ca/>\n"
@@ -34,7 +34,7 @@ msgstr ""
#: config/views/gym_config.py:42 core/templates/language/view.html:64
#: core/templates/license/list.html:17
#: core/templates/repetition_unit/list.html:18
-#: core/templates/user/overview.html:204 core/templates/user/overview.html:467
+#: core/templates/user/overview.html:207 core/templates/user/overview.html:470
#: core/templates/weight_unit/list.html:18
#: exercises/templates/categories/admin-overview.html:17
#: exercises/templates/equipment/admin-overview.html:17
@@ -46,30 +46,29 @@ msgstr ""
#: gym/templates/gym/list.html:19 gym/templates/gym/list.html:48
#: gym/templates/gym/member_list.html:94 gym/templates/gym/member_list.html:152
#: gym/templates/gym/member_list.html:190
-#: nutrition/templates/ingredient/view.html:164
-#: nutrition/templates/ingredient/view.html:209
-#: nutrition/templates/units/list.html:19
+#: nutrition/templates/ingredient/view.html:205
+#: nutrition/templates/ingredient/view.html:248
msgid "Edit"
msgstr "Edita"
-#: core/forms.py:91 core/templates/navigation.html:271
-#: core/templates/navigation.html:278 core/templates/user/login.html:4
+#: core/forms.py:89 core/templates/navigation.html:268
+#: core/templates/navigation.html:275 core/templates/user/login.html:4
#: core/templates/user/registration_sidebar.html:12
#: software/templates/features.html:82 software/templates/features.html:448
msgid "Login"
msgstr "Accedeix"
-#: core/forms.py:130 core/forms.py:244 gym/views/export.py:61
+#: core/forms.py:128 core/forms.py:242 gym/views/export.py:61
#: gym/views/gym.py:217
msgid "First name"
msgstr "Nom"
-#: core/forms.py:131 core/forms.py:245 core/templates/user/overview.html:284
+#: core/forms.py:129 core/forms.py:243 core/templates/user/overview.html:287
#: gym/views/export.py:62 gym/views/gym.py:217
msgid "Last name"
msgstr "Cognom"
-#: core/forms.py:133 core/forms.py:210 core/templates/user/overview.html:288
+#: core/forms.py:131 core/forms.py:208 core/templates/user/overview.html:291
#: gym/models/contract.py:256 gym/models/gym.py:58
#: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:116
#: gym/templates/gym/new_user.html:30 gym/views/export.py:60
@@ -79,57 +78,57 @@ msgstr "Cognom"
msgid "Email"
msgstr "Adreça electrònica"
-#: core/forms.py:134
+#: core/forms.py:132
msgid "Used for password resets and, optionally, e-mail reminders."
msgstr ""
"Usada per a reinicialitzar contrasenyes i, opcionalment, recordatoris per "
"correu."
-#: core/forms.py:138 core/models/profile.py:222
+#: core/forms.py:136 core/models/profile.py:222
#: gym/templates/gym/new_user.html:38
msgid "Date of Birth"
msgstr "Data de naixement"
-#: core/forms.py:177
+#: core/forms.py:175
msgid "Personal data"
msgstr "Dades personals"
-#: core/forms.py:189
+#: core/forms.py:187
msgid "Workout reminders"
msgstr "Recordatoris d'entrenament"
-#: core/forms.py:196
+#: core/forms.py:194
msgid "Other settings"
msgstr "Altres configuracions"
-#: core/forms.py:204 core/views/user.py:614 core/views/user.py:629
-#: core/views/user.py:641 gym/forms.py:73 utils/generic_views.py:143
+#: core/forms.py:202 core/views/user.py:630 core/views/user.py:654
+#: core/views/user.py:668 gym/forms.py:73 utils/generic_views.py:137
msgid "Save"
msgstr "Desa"
-#: core/forms.py:211
+#: core/forms.py:209
msgid "Used for password resets and, optionally, email reminders."
msgstr ""
"Usada per a reinicialitzar contrasenyes i, opcionalment, recordatoris per "
"correu."
-#: core/forms.py:240
+#: core/forms.py:238
msgid "This e-mail address is already in use."
msgstr "Aquesta adreça ja s'està usant."
-#: core/forms.py:261 gym/templates/gym/new_user.html:26
+#: core/forms.py:259 gym/templates/gym/new_user.html:26
#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:217
msgid "Password"
msgstr "Contrasenya"
-#: core/forms.py:263
+#: core/forms.py:261
msgid "Please enter your current password."
msgstr "Introduïu la contrasenya actual."
-#: core/forms.py:272 core/templates/language/view.html:70
+#: core/forms.py:270 core/templates/language/view.html:70
#: core/templates/license/list.html:21
#: core/templates/repetition_unit/list.html:22
-#: core/templates/user/overview.html:233
+#: core/templates/user/overview.html:236
#: core/templates/weight_unit/list.html:22
#: exercises/templates/categories/admin-overview.html:21
#: exercises/templates/equipment/admin-overview.html:21
@@ -137,27 +136,30 @@ msgstr "Introduïu la contrasenya actual."
#: gym/templates/admin_notes/list.html:37
#: gym/templates/contract_option/list.html:35
#: gym/templates/contract_type/list.html:36 gym/templates/document/list.html:46
-#: gym/templates/gym/list.html:23 nutrition/templates/ingredient/view.html:168
-#: nutrition/templates/ingredient/view.html:215
-#: nutrition/templates/units/list.html:25
+#: gym/templates/gym/list.html:23 nutrition/templates/ingredient/view.html:209
+#: nutrition/templates/ingredient/view.html:254
msgid "Delete"
msgstr "Esborra"
-#: core/forms.py:281
+#: core/forms.py:279
msgid "Invalid password"
msgstr "Contrasenya invàlida"
-#: core/forms.py:293
+#: core/forms.py:291 core/forms.py:349
msgid "The form is secured with reCAPTCHA"
msgstr "El formulari està protegit amb reCAPTCHA"
-#: core/forms.py:314 core/forms.py:341 core/templates/navigation.html:272
-#: core/templates/navigation.html:285 core/templates/template.html:123
-#: core/templates/user/login.html:21 core/views/user.py:285
+#: core/forms.py:312 core/forms.py:339 core/templates/navigation.html:269
+#: core/templates/navigation.html:282 core/templates/template.html:113
+#: core/templates/user/login.html:21 core/views/user.py:293
#: software/templates/features.html:87 software/templates/features.html:442
msgid "Register"
msgstr "Enregistreu-vos"
+#: core/forms.py:360 weight/templates/import_csv_form.html:9
+msgid "Submit"
+msgstr "Envia"
+
#: core/models/language.py:31 core/templates/language/view.html:21
msgid "Language short name"
msgstr "Nom curt de la llengua"
@@ -196,36 +198,36 @@ msgstr "Vincle"
msgid "Link to license text or other information"
msgstr "Vincle al text de la llicència o altra informació"
-#: core/models/profile.py:57
+#: core/models/profile.py:60
#, python-format
msgid "%(birthdate)s is not a valid birthdate"
msgstr "%(birthdate)s no és una data de naixement vàlida"
-#: core/models/profile.py:66
+#: core/models/profile.py:69
msgid "Male"
msgstr "Home"
-#: core/models/profile.py:67
+#: core/models/profile.py:70
msgid "Female"
msgstr "Dona"
-#: core/models/profile.py:74
+#: core/models/profile.py:77
msgid "Low"
msgstr "Baix"
-#: core/models/profile.py:75
+#: core/models/profile.py:78
msgid "Medium"
msgstr "Mitjà"
-#: core/models/profile.py:76
+#: core/models/profile.py:79
msgid "High"
msgstr "Alt"
-#: core/models/profile.py:82
+#: core/models/profile.py:85
msgid "Metric (kilogram)"
msgstr "Mètriques (kilogram)"
-#: core/models/profile.py:83
+#: core/models/profile.py:86
msgid "Imperial (pound)"
msgstr "Imperials (lliura)"
@@ -347,7 +349,7 @@ msgstr "Mitjana d'hores setmanals"
msgid "Free time"
msgstr "Temps lliure"
-#: core/models/profile.py:320 nutrition/templates/rate/form.html:66
+#: core/models/profile.py:320 nutrition/templates/rate/form.html:67
msgid "Total daily calories"
msgstr "Calories diàries totals"
@@ -390,20 +392,43 @@ msgstr ""
msgid "Enable or disable the trophy system for this user"
msgstr ""
-#: core/models/profile.py:446
+#: core/models/profile.py:457
msgid "The sum of all hours has to be 24"
msgstr "La suma de totes les hores ha de ser 24"
-#: core/models/rep_unit.py:36 core/models/weight_unit.py:42
-#: core/templates/user/overview.html:280 core/views/user.py:589
+#: core/models/rep_unit.py:32 i18n.tpl:30
+msgid "Repetitions"
+msgstr "Repeticions"
+
+#: core/models/rep_unit.py:33 core/templates/user/overview.html:82
+#: exercises/templates/history/overview.html:30
+msgid "Time"
+msgstr "Temps"
+
+#: core/models/rep_unit.py:34
+msgid "Distance"
+msgstr ""
+
+#: core/models/rep_unit.py:47 core/models/weight_unit.py:42
+#: core/templates/user/overview.html:283 core/views/user.py:605
#: exercises/models/muscle.py:36 gym/models/contract.py:52
#: gym/models/contract.py:103 gym/models/gym.py:46
#: gym/models/user_document.py:84 gym/templates/contract/view.html:50
#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:108
-#: gym/views/gym.py:158 nutrition/templates/ingredient/view.html:151
+#: gym/views/gym.py:158 nutrition/templates/ingredient/view.html:192
msgid "Name"
msgstr "Nom"
+#: core/models/rep_unit.py:53
+#, fuzzy
+#| msgid "Unit"
+msgid "Unit Type"
+msgstr "Unitat"
+
+#: core/models/rep_unit.py:54
+msgid "The type of unit (repetitions, time, or distance)"
+msgstr ""
+
#: core/templates/403.html:4
msgid "Forbidden!"
msgstr "Prohibit!"
@@ -435,6 +460,53 @@ msgstr ""
"torneu-ho a intentar més tard. Si el problema persisteix, podeu buscar ajuda "
"de les maneres que s'indiquen a continuació:"
+#: core/templates/account/email/email_confirmation_message.html:81
+msgid "Almost there!"
+msgstr ""
+
+#: core/templates/account/email/email_confirmation_message.html:85
+#, fuzzy, python-format
+#| msgid ""
+#| "You're receiving this e-mail because you requested a password reset for "
+#| "your user account at %(site_name)s."
+msgid ""
+"You're receiving this email because the user \"%(user_display)s\" has given "
+"your email address to register an account on %(site_domain)s."
+msgstr ""
+"Esteu rebent aquest correu perquè heu solicitat reinicialitzar la "
+"contrasenya del vostre compte d'usuari a %(site_name)s."
+
+#: core/templates/account/email/email_confirmation_message.html:93
+msgid ""
+"Your email verification code is listed below. Please enter it in your open "
+"browser window."
+msgstr ""
+
+#: core/templates/account/email/email_confirmation_message.html:100
+msgid "Please click the button below to confirm your email address."
+msgstr ""
+
+#: core/templates/account/email/email_confirmation_message.html:106
+#, fuzzy
+#| msgid "Configuration"
+msgid "Confirm email"
+msgstr "Configuració"
+
+#: core/templates/account/email/email_confirmation_message.html:110
+#, python-format
+msgid ""
+"The link is valid for %(expire_hours)s hours (until %(date)s, %(time)s). You "
+"can request a new one from your profile settings."
+msgstr ""
+
+#: core/templates/account/email/email_confirmation_message.html:116
+msgid "If the button doesn't work, copy and paste this link into your browser:"
+msgstr ""
+
+#: core/templates/account/email/email_confirmation_message.html:125
+msgid "the wger Team"
+msgstr ""
+
#: core/templates/base.html:10
#, fuzzy, python-format
#| msgid ""
@@ -479,53 +551,7 @@ msgstr ""
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
-#, fuzzy
-#| msgid "Configuration"
-msgid "Email verification"
-msgstr "Configuració"
-
-#: core/templates/email_verification/confirm_template.html:18
-#, python-format
-msgid "%(username)s, your email was verified"
-msgstr "%(username)s, el teu correu electrònic ha estat verificat"
-
-#: core/templates/email_verification/confirm_template.html:22
-msgid "Error, invalid verification token"
-msgstr "Error, token de verificació invàlid"
-
-#: core/templates/email_verification/email_body_html.tpl:6
-msgid "Email Confirmation"
-msgstr "Confirmació de correu electrònic"
-
-#: 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 "Et queda poc, %(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/language/overview.html:4 core/templates/navigation.html:344
+#: core/templates/language/overview.html:4 core/templates/navigation.html:341
msgid "Languages"
msgstr "Llengües"
@@ -534,16 +560,16 @@ msgid "Nothing found."
msgstr "No s'ha trobat res."
#: core/templates/language/overview.html:22
-#: nutrition/templates/ingredient/overview.html:38
+#: nutrition/templates/ingredient/overview.html:43
msgid "Add one now."
msgstr "Afegeix-ne un ara."
#: core/templates/language/overview.html:34 core/templates/license/list.html:43
-#: core/templates/repetition_unit/list.html:46
-#: core/templates/user/overview.html:344 core/templates/user/overview.html:384
-#: core/templates/user/overview.html:422
-#: core/templates/weight_unit/list.html:46 core/views/languages.py:74
-#: core/views/license.py:66 core/views/repetition_units.py:66
+#: core/templates/repetition_unit/list.html:44
+#: core/templates/user/overview.html:347 core/templates/user/overview.html:387
+#: core/templates/user/overview.html:425
+#: core/templates/weight_unit/list.html:46 core/views/languages.py:77
+#: core/views/license.py:66 core/views/repetition_units.py:76
#: core/views/weight_units.py:66
#: exercises/templates/categories/admin-overview.html:40
#: exercises/templates/equipment/admin-overview.html:39
@@ -556,14 +582,14 @@ msgstr "Afegeix-ne un ara."
#: gym/templates/gym/member_list.html:264
#: gym/templates/gym/member_list.html:303
#: mailer/templates/mailer/gym/overview.html:43
-#: nutrition/templates/ingredient/overview.html:60
+#: nutrition/templates/ingredient/overview.html:97
msgid "Add"
msgstr "Afegeix"
#: core/templates/language/view.html:61 core/templates/user/api_key.html:41
#: core/templates/user/preferences.html:50 gym/models/contract.py:203
#: gym/templates/contract/view.html:41 gym/templates/gym/member_list.html:270
-#: nutrition/templates/ingredient/view.html:206
+#: nutrition/templates/ingredient/view.html:245
msgid "Options"
msgstr "Opcions"
@@ -573,9 +599,9 @@ msgstr "Llista de llicències"
#: core/templates/license/list.html:30
#: core/templates/repetition_unit/list.html:32
-#: core/templates/user/overview.html:104 core/templates/user/overview.html:136
-#: core/templates/user/overview.html:185 core/templates/user/overview.html:365
-#: core/templates/user/overview.html:404 core/templates/user/overview.html:448
+#: core/templates/user/overview.html:107 core/templates/user/overview.html:139
+#: core/templates/user/overview.html:188 core/templates/user/overview.html:368
+#: core/templates/user/overview.html:407 core/templates/user/overview.html:451
#: core/templates/weight_unit/list.html:32
#: exercises/templates/categories/admin-overview.html:30
#: exercises/templates/equipment/admin-overview.html:30
@@ -587,11 +613,10 @@ msgstr "Llista de llicències"
#: gym/templates/gym/member_list.html:284
#: gym/templates/gym/member_list.html:321
#: mailer/templates/mailer/gym/overview.html:30
-#: nutrition/templates/units/list.html:34
msgid "Nothing found"
msgstr "No s'ha trobat res"
-#: core/templates/misc/about.html:4 core/templates/template.html:160
+#: core/templates/misc/about.html:4 core/templates/template.html:150
msgid "Imprint"
msgstr "Colofó"
@@ -599,164 +624,159 @@ msgstr "Colofó"
msgid "Training"
msgstr "Entrenament"
-#: core/templates/navigation.html:37 core/templates/user/overview.html:25
+#: core/templates/navigation.html:36 core/templates/user/overview.html:28
msgid "Routines"
msgstr ""
-#: core/templates/navigation.html:45 core/templates/user/overview.html:70
+#: core/templates/navigation.html:44 core/templates/user/overview.html:73
msgid "Calendar"
msgstr "Calendari"
-#: core/templates/navigation.html:55
+#: core/templates/navigation.html:53
msgid "Measurements"
msgstr ""
-#: core/templates/navigation.html:66 gallery/templates/images/overview.html:6
+#: core/templates/navigation.html:64 gallery/templates/images/overview.html:6
msgid "Gallery"
msgstr "Galeria"
-#: core/templates/navigation.html:72
+#: core/templates/navigation.html:74 core/templates/navigation.html:400
+#: trophies/templates/trophies/overview.html:7
+msgid "Trophies"
+msgstr ""
+
+#: core/templates/navigation.html:79
msgid "Workout templates"
msgstr "Plantilles d'entrenaments"
-#: core/templates/navigation.html:79
+#: core/templates/navigation.html:86
msgid "Your templates"
msgstr "Les vostres plantilles"
-#: core/templates/navigation.html:88
+#: core/templates/navigation.html:95
msgid "Public templates"
msgstr "Plantilles públiques"
-#: core/templates/navigation.html:96 software/templates/features.html:51
+#: core/templates/navigation.html:103 software/templates/features.html:51
#: software/templates/features.html:480
msgid "Exercises"
msgstr "Exercicis"
-#: core/templates/navigation.html:102 core/templates/navigation.html:176
-#: core/templates/navigation.html:339
+#: core/templates/navigation.html:109 core/templates/navigation.html:336
msgid "Administration"
msgstr "Administració"
-#: core/templates/navigation.html:106
+#: core/templates/navigation.html:113
#, fuzzy
#| msgid "Exercise day"
msgid "Exercise edit history"
msgstr "Dia d'entrenament"
-#: core/templates/navigation.html:112
+#: core/templates/navigation.html:119
msgid "Equipment"
msgstr "Equipament"
-#: core/templates/navigation.html:118
+#: core/templates/navigation.html:125
msgid "Muscles"
msgstr "Músculs"
-#: core/templates/navigation.html:124
+#: core/templates/navigation.html:131
#: exercises/templates/categories/admin-overview.html:4
msgid "Categories"
msgstr "Categories"
-#: core/templates/navigation.html:139 software/templates/features.html:468
+#: core/templates/navigation.html:146 software/templates/features.html:468
msgid "Nutrition"
msgstr "Nutrició"
-#: core/templates/navigation.html:147 core/templates/user/overview.html:144
+#: core/templates/navigation.html:154 core/templates/user/overview.html:147
msgid "Nutrition plans"
msgstr "Plans de nutrició"
-#: core/templates/navigation.html:156
+#: core/templates/navigation.html:163
msgid "BMI calculator"
msgstr "Calculadora de l'IMC"
-#: core/templates/navigation.html:165 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:172 nutrition/templates/rate/form.html:18
msgid "Daily calories calculator"
msgstr "Calculadora de calories diàries"
-#: core/templates/navigation.html:171
+#: core/templates/navigation.html:178
#: nutrition/templates/ingredient/overview.html:10
msgid "Ingredient overview"
msgstr "Ingredients en un cop d'ull"
-#: core/templates/navigation.html:180 nutrition/templates/units/list.html:6
-msgid "Ingredient weight units"
-msgstr "Unitats de pes dels ingredients"
-
-#: core/templates/navigation.html:196 software/templates/features.html:463
+#: core/templates/navigation.html:193 software/templates/features.html:463
msgid "Body weight"
msgstr "Pes corporal"
-#: core/templates/navigation.html:203 core/templates/user/overview.html:114
+#: core/templates/navigation.html:200 core/templates/user/overview.html:117
msgid "Weight overview"
msgstr "El pes en un cop d'ull"
-#: core/templates/navigation.html:217
+#: core/templates/navigation.html:214
msgid "About this software"
msgstr "Quant a aquest programari"
-#: core/templates/navigation.html:223 software/templates/about_us.html:5
+#: core/templates/navigation.html:220 software/templates/about_us.html:5
msgid "Support & Get Involved"
msgstr ""
-#: core/templates/navigation.html:229 software/templates/features.html:528
+#: core/templates/navigation.html:226 software/templates/features.html:528
msgid "REST API"
msgstr "API REST"
-#: core/templates/navigation.html:235 utils/models.py:45
+#: core/templates/navigation.html:232 utils/models.py:45
msgid "License"
msgstr "Llicència"
-#: core/templates/navigation.html:241
+#: core/templates/navigation.html:238
msgid "Developer documentation"
msgstr "Documentació per a desenvolupadors"
-#: core/templates/navigation.html:248
+#: core/templates/navigation.html:245
msgid "Get the code"
msgstr "Obteniu el codi font"
-#: core/templates/navigation.html:255 core/templates/template.html:199
-#: software/templates/features.html:603
+#: core/templates/navigation.html:252 core/templates/template.html:202
+#: software/templates/features.html:614
msgid "Translate"
msgstr "Traduïu"
-#: core/templates/navigation.html:292 core/templates/user/login.html:30
+#: core/templates/navigation.html:289 core/templates/user/login.html:30
msgid "Reset password"
msgstr "Reinicialitza la contrasenya"
-#: core/templates/navigation.html:301 core/templates/navigation.html:329
+#: core/templates/navigation.html:298 core/templates/navigation.html:326
msgid "Logout"
msgstr "Surt"
-#: core/templates/navigation.html:320
+#: core/templates/navigation.html:317
msgid "My preferences"
msgstr "Les meves preferències"
-#: core/templates/navigation.html:352
+#: core/templates/navigation.html:349
msgid "Licenses"
msgstr "Llicències"
-#: core/templates/navigation.html:360
+#: core/templates/navigation.html:357
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr "Unitats de repetició"
-#: core/templates/navigation.html:368 core/templates/weight_unit/list.html:4
-#: nutrition/templates/ingredient/view.html:141
+#: core/templates/navigation.html:365 core/templates/weight_unit/list.html:4
+#: nutrition/templates/ingredient/view.html:182
msgid "Weight units"
msgstr "Unitats de pes"
-#: core/templates/navigation.html:376 core/templates/user/list.html:4
+#: core/templates/navigation.html:373 core/templates/user/list.html:4
msgid "User list"
msgstr "Llista d'usuaris"
-#: core/templates/navigation.html:382
+#: core/templates/navigation.html:379
msgid "Gyms"
msgstr "Gimnasos"
-#: core/templates/navigation.html:403
-#: trophies/templates/trophies/overview.html:7
-msgid "Trophies"
-msgstr ""
-
#: core/templates/registration/password_reset_complete.html:4
msgid "Password reset complete"
msgstr "Reinicialització de la contrasenya completada"
@@ -816,27 +836,31 @@ msgstr "enrere"
msgid "next"
msgstr "següent"
-#: core/templates/template.html:96
+#: core/templates/template.html:86
msgid "Close"
msgstr "Tanca"
-#: core/templates/template.html:112
+#: core/templates/template.html:102
msgid ""
"You are using a guest account, data entered will be deleted after a week."
msgstr ""
"Esteu usant un compte de convidat, les dades introduïdes s'esborraran "
"passada una setmana."
-#: core/templates/template.html:117
+#: core/templates/template.html:107
msgid "Create some demo entries"
msgstr "Crea algunes entrades de mostra"
-#: core/templates/template.html:165 software/templates/features.html:568
+#: core/templates/template.html:155 software/templates/features.html:568
#: software/templates/tos.html:7
msgid "Terms of service"
msgstr "Condicions del servei"
-#: core/templates/template_features.html:53 software/templates/features.html:9
+#: core/templates/template.html:181 software/templates/features.html:595
+msgid "Browser language"
+msgstr ""
+
+#: core/templates/template_features.html:46 software/templates/features.html:9
msgid "Features"
msgstr "Funcions"
@@ -895,99 +919,94 @@ msgstr "No teniu cap compte?"
msgid "Forgot password?"
msgstr "Contrasenya oblidada?"
-#: core/templates/user/overview.html:25 core/templates/user/overview.html:68
-#: core/templates/user/overview.html:112 core/templates/user/overview.html:144
-#: core/templates/user/overview.html:348 core/templates/user/overview.html:390
-#: core/templates/user/overview.html:426
+#: core/templates/user/overview.html:28 core/templates/user/overview.html:71
+#: core/templates/user/overview.html:115 core/templates/user/overview.html:147
+#: core/templates/user/overview.html:351 core/templates/user/overview.html:393
+#: core/templates/user/overview.html:429
#, python-format
msgid "last %(number)s"
msgstr "darrers %(number)s"
-#: core/templates/user/overview.html:27 core/templates/user/overview.html:146
-#: core/templates/user/overview.html:343 core/templates/user/overview.html:382
-#: core/templates/user/overview.html:421 gym/templates/gym/member_list.html:226
+#: core/templates/user/overview.html:30 core/templates/user/overview.html:149
+#: core/templates/user/overview.html:346 core/templates/user/overview.html:385
+#: core/templates/user/overview.html:424 gym/templates/gym/member_list.html:226
#: gym/templates/gym/member_list.html:262
#: gym/templates/gym/member_list.html:302
msgid "Overview"
msgstr "Visió general"
-#: core/templates/user/overview.html:34 core/templates/user/overview.html:76
-#: core/templates/user/overview.html:120 core/templates/user/overview.html:152
+#: core/templates/user/overview.html:37 core/templates/user/overview.html:79
+#: core/templates/user/overview.html:123 core/templates/user/overview.html:155
#: manager/helpers.py:88 software/templates/about_us.html:170
#: weight/templates/import_csv_preview.html:13
#: weight/templates/import_csv_preview.html:42 weight/views.py:54
msgid "Date"
msgstr "Data"
-#: core/templates/user/overview.html:35 core/templates/user/overview.html:153
+#: core/templates/user/overview.html:38 core/templates/user/overview.html:156
#: gym/models/contract.py:58 gym/models/contract.py:109
msgid "Description"
msgstr "Descripció"
-#: core/templates/user/overview.html:36
+#: core/templates/user/overview.html:39
msgid "Number of logs (days)"
msgstr "Nombre de registres (dies)"
-#: core/templates/user/overview.html:37 core/views/user.py:590
+#: core/templates/user/overview.html:40 core/views/user.py:606
#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:158
msgid "Last activity"
msgstr "Darrera activitat"
-#: core/templates/user/overview.html:58
+#: core/templates/user/overview.html:61
msgid "No workouts found."
msgstr "No s'han trobat entrenaments."
-#: core/templates/user/overview.html:68
+#: core/templates/user/overview.html:71
msgid "Log"
msgstr "Registre"
-#: core/templates/user/overview.html:77
+#: core/templates/user/overview.html:80
msgid "General impression"
msgstr "Impressió general"
-#: core/templates/user/overview.html:78 core/templates/user/overview.html:390
+#: core/templates/user/overview.html:81 core/templates/user/overview.html:393
msgid "Notes"
msgstr "Notes"
-#: core/templates/user/overview.html:79
-#: exercises/templates/history/overview.html:30
-msgid "Time"
-msgstr "Temps"
-
-#: core/templates/user/overview.html:112 core/templates/user/overview.html:121
+#: core/templates/user/overview.html:115 core/templates/user/overview.html:124
#: manager/helpers.py:89 weight/templates/import_csv_preview.html:14
#: weight/templates/import_csv_preview.html:43 weight/views.py:54
msgid "Weight"
msgstr "Pes"
-#: core/templates/user/overview.html:154
-#: nutrition/templates/ingredient/view.html:51 nutrition/views/plan.py:245
+#: core/templates/user/overview.html:157
+#: nutrition/templates/ingredient/view.html:52 nutrition/views/plan.py:244
msgid "Energy"
msgstr "Energia"
-#: core/templates/user/overview.html:155
-#: nutrition/templates/ingredient/view.html:58 nutrition/views/plan.py:251
+#: core/templates/user/overview.html:158
+#: nutrition/templates/ingredient/view.html:59 nutrition/views/plan.py:250
msgid "Protein"
msgstr "Proteïna"
-#: core/templates/user/overview.html:156
-#: nutrition/templates/ingredient/view.html:64 nutrition/views/plan.py:259
+#: core/templates/user/overview.html:159
+#: nutrition/templates/ingredient/view.html:65 nutrition/views/plan.py:258
msgid "Carbohydrates"
msgstr "Carbohidrats"
-#: core/templates/user/overview.html:157
-#: nutrition/templates/ingredient/view.html:80 nutrition/views/plan.py:273
+#: core/templates/user/overview.html:160
+#: nutrition/templates/ingredient/view.html:81 nutrition/views/plan.py:272
msgid "Fat"
msgstr "Greix"
-#: core/templates/user/overview.html:170
-#: nutrition/templates/ingredient/view.html:53
+#: core/templates/user/overview.html:173
+#: nutrition/templates/ingredient/view.html:54
msgid "kcal"
msgstr "kcal"
-#: core/templates/user/overview.html:201 core/templates/user/overview.html:340
-#: core/templates/user/overview.html:379 core/templates/user/overview.html:418
-#: core/templates/user/overview.html:463 gym/templates/gym/list.html:45
+#: core/templates/user/overview.html:204 core/templates/user/overview.html:343
+#: core/templates/user/overview.html:382 core/templates/user/overview.html:421
+#: core/templates/user/overview.html:466 gym/templates/gym/list.html:45
#: gym/templates/gym/member_list.html:91 gym/templates/gym/member_list.html:149
#: gym/templates/gym/member_list.html:187
#: gym/templates/gym/member_list.html:223
@@ -996,111 +1015,115 @@ msgstr "kcal"
msgid "Actions"
msgstr "Accions"
-#: core/templates/user/overview.html:210
+#: core/templates/user/overview.html:213
msgid "Deactivate user"
msgstr "Desactiva l'usuari"
-#: core/templates/user/overview.html:214
+#: core/templates/user/overview.html:217
msgid "Activate user"
msgstr "Activa l'usuari"
-#: core/templates/user/overview.html:223
+#: core/templates/user/overview.html:226
msgid "Reset user password"
msgstr "Reinicialitza contrasenya de l'usuari"
-#: core/templates/user/overview.html:227 gym/templates/gym/member_list.html:30
+#: core/templates/user/overview.html:230 gym/templates/gym/member_list.html:30
msgid "Roles"
msgstr "Rols"
-#: core/templates/user/overview.html:243
+#: core/templates/user/overview.html:246
msgid "Password reset confirmation"
msgstr "Confirmació de reinicialització de la contrasenya"
-#: core/templates/user/overview.html:247
+#: core/templates/user/overview.html:250
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:250
+#: core/templates/user/overview.html:253
#: exercises/templates/history/overview.html:106
+#: nutrition/templates/ingredient/view.html:148
+#: nutrition/templates/ingredient/view.html:160
msgid "No"
msgstr "No"
-#: core/templates/user/overview.html:251
+#: core/templates/user/overview.html:254
#: exercises/templates/history/overview.html:99
+#: nutrition/templates/ingredient/view.html:146
+#: nutrition/templates/ingredient/view.html:158
msgid "Yes"
msgstr "Sí"
-#: core/templates/user/overview.html:272 gym/templates/gym/member_list.html:105
+#: core/templates/user/overview.html:275 gym/templates/gym/member_list.html:105
msgid "Details"
msgstr "Detalls"
-#: core/templates/user/overview.html:276 gym/views/export.py:57
-#: manager/helpers.py:89 nutrition/views/plan.py:151
-#: nutrition/views/plan.py:157
+#: core/templates/user/overview.html:279 gym/views/export.py:57
+#: manager/helpers.py:89 nutrition/views/plan.py:150
+#: nutrition/views/plan.py:156
msgid "Nr."
msgstr "Núm."
-#: core/templates/user/overview.html:298 gym/models/contract.py:287
+#: core/templates/user/overview.html:301 gym/models/contract.py:287
#: gym/models/gym.py:50 gym/templates/contract/view.html:75
#: gym/templates/gym/member_list.html:112 gym/views/export.py:68
msgid "Phone"
msgstr "Telèfon"
-#: core/templates/user/overview.html:302 gym/templates/contract/view.html:87
+#: core/templates/user/overview.html:305 gym/templates/contract/view.html:87
#: gym/templates/gym/member_list.html:130
msgid "Address"
msgstr "Adreça"
-#: core/templates/user/overview.html:313
+#: core/templates/user/overview.html:316
msgid "Registered"
msgstr "Registrat"
-#: core/templates/user/overview.html:317
+#: core/templates/user/overview.html:320
msgid "Last login"
msgstr "Darrera connexió"
-#: core/templates/user/overview.html:322
+#: core/templates/user/overview.html:325
msgid "Status"
msgstr "Estat"
-#: core/templates/user/overview.html:325
+#: core/templates/user/overview.html:328
msgid "Active"
msgstr "Actiu"
-#: core/templates/user/overview.html:327
+#: core/templates/user/overview.html:330
msgid "Inactive"
msgstr "Inactiu"
-#: core/templates/user/overview.html:348 gym/templates/contract/list.html:4
+#: core/templates/user/overview.html:351 gym/templates/contract/list.html:4
#: gym/templates/gym/member_list.html:218
msgid "Contracts"
msgstr "Contractes"
-#: core/templates/user/overview.html:426 gym/templates/document/list.html:4
+#: core/templates/user/overview.html:429 gym/templates/document/list.html:4
msgid "Documents"
msgstr "Documents"
-#: core/templates/user/overview.html:433 gym/templates/document/list.html:33
+#: core/templates/user/overview.html:436 gym/templates/document/list.html:33
msgid "Download"
msgstr "Descarrega"
-#: core/templates/user/overview.html:474 gym/views/admin_config.py:44
+#: core/templates/user/overview.html:477 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:477 gym/models/user_config.py:92
+#: core/templates/user/overview.html:480 gym/models/user_config.py:92
msgid "Include in inactive overview"
msgstr "Inclou a la vista general d'inactius"
-#: core/templates/user/overview.html:510
+#: core/templates/user/overview.html:513
#, python-format
msgid "Admin login is only available for users in %(gym_name)s"
msgstr ""
"La connexió com a administrador només està disponible per a usuaris de "
"%(gym_name)s"
-#: core/templates/user/overview.html:514
+#: core/templates/user/overview.html:517
msgid "Log in as this user"
msgstr "Connecta amb aquest compte"
@@ -1126,7 +1149,7 @@ msgstr ""
msgid "You need to verify your email to contribute exercises"
msgstr ""
-#: core/templates/user/preferences.html:55 core/views/user.py:601
+#: core/templates/user/preferences.html:55 core/views/user.py:617
msgid "Change password"
msgstr "Canvia la contrasenya"
@@ -1134,23 +1157,23 @@ msgstr "Canvia la contrasenya"
msgid "Already have an account?"
msgstr ""
-#: core/templatetags/wger_extras.py:142 i18n.tpl:38
+#: core/templatetags/wger_extras.py:142 i18n.tpl:39
msgid "kg"
msgstr "kg"
#: core/templatetags/wger_extras.py:144
-#: nutrition/templates/ingredient/view.html:60
-#: nutrition/templates/ingredient/view.html:66
-#: nutrition/templates/ingredient/view.html:73
-#: nutrition/templates/ingredient/view.html:82
-#: nutrition/templates/ingredient/view.html:89
-#: nutrition/templates/ingredient/view.html:111
-#: nutrition/templates/ingredient/view.html:121
+#: nutrition/templates/ingredient/view.html:61
+#: nutrition/templates/ingredient/view.html:67
+#: nutrition/templates/ingredient/view.html:74
+#: nutrition/templates/ingredient/view.html:83
+#: nutrition/templates/ingredient/view.html:90
+#: nutrition/templates/ingredient/view.html:112
+#: nutrition/templates/ingredient/view.html:122
msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr "g"
-#: core/templatetags/wger_extras.py:147 i18n.tpl:39
+#: core/templatetags/wger_extras.py:147 i18n.tpl:40
msgid "lb"
msgstr "lb"
@@ -1159,36 +1182,35 @@ msgctxt "weight unit, i.e. ounces"
msgid "oz"
msgstr "oz"
-#: core/views/languages.py:85 exercises/views/categories.py:122
+#: core/views/languages.py:88 exercises/views/categories.py:122
#: exercises/views/equipment.py:103 exercises/views/muscles.py:99
-#: nutrition/views/ingredient.py:120 nutrition/views/unit.py:110
+#: nutrition/views/ingredient.py:125
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
+#: core/views/languages.py:96 core/views/license.py:103
+#: core/views/repetition_units.py:114 core/views/weight_units.py:115
#: exercises/views/categories.py:128 exercises/views/muscles.py:106
#: gallery/views/images.py:124 gym/views/admin_notes.py:196
#: gym/views/document.py:206 gym/views/gym.py:481
-#: nutrition/views/ingredient.py:127 nutrition/views/unit.py:117
+#: nutrition/views/ingredient.py:132
#, python-brace-format
msgid "Delete {0}?"
msgstr "Esborrar {0}?"
-#: core/views/languages.py:111 core/views/license.py:85
-#: core/views/repetition_units.py:86 core/views/user.py:464
+#: core/views/languages.py:114 core/views/license.py:85
+#: core/views/repetition_units.py:96 core/views/user.py:480
#: core/views/weight_units.py:86 exercises/views/categories.py:98
#: exercises/views/equipment.py:81 exercises/views/muscles.py:87
#: gym/views/admin_notes.py:161 gym/views/config.py:68
#: gym/views/contract.py:186 gym/views/contract_option.py:123
#: gym/views/contract_type.py:123 gym/views/document.py:171
-#: gym/views/gym.py:463 nutrition/views/ingredient.py:146
-#: nutrition/views/unit.py:143
+#: gym/views/gym.py:463 nutrition/views/ingredient.py:151
#, python-brace-format
msgid "Edit {0}"
msgstr "Edita {0}"
-#: core/views/misc.py:74
+#: core/views/misc.py:73
msgid ""
"We have created sample workout, workout schedules, weight logs, (body) "
"weight and nutrition plan entries so you can better see what this site can "
@@ -1198,48 +1220,48 @@ msgstr ""
"entrades de pla nutricional per a que podeu veure millor què pot fer aquest "
"web. Podeu editar-les o esborrar-les!"
-#: core/views/user.py:143
+#: core/views/user.py:145
#, python-brace-format
msgid "Account \"{0}\" was successfully deleted"
msgstr "El compte «{0}» s'ha esborrat amb èxit"
-#: core/views/user.py:279
+#: core/views/user.py:287
msgid "You were successfully registered"
msgstr "Us heu registrat amb èxit"
-#: core/views/user.py:341
+#: core/views/user.py:357
msgid "Settings successfully updated"
msgstr "Opcions actualitzades amb èxit"
-#: core/views/user.py:380
+#: core/views/user.py:396
msgid "The user was successfully deactivated"
msgstr "S'ha desactivat l'usuari amb èxit"
-#: core/views/user.py:417
+#: core/views/user.py:433
msgid "The user was successfully activated"
msgstr "S'ha activat l'usuari amb èxit"
-#: core/views/user.py:432
+#: core/views/user.py:448
msgid "Edit user"
msgstr "Edita l'usuari"
-#: core/views/user.py:587 gym/templates/gym/member_list.html:26
+#: core/views/user.py:603 gym/templates/gym/member_list.html:26
#: gym/views/gym.py:158
msgid "ID"
msgstr "ID"
-#: core/views/user.py:588 gym/forms.py:95 gym/templates/contract/view.html:55
+#: core/views/user.py:604 gym/forms.py:95 gym/templates/contract/view.html:55
#: gym/templates/gym/member_list.html:27 gym/views/export.py:59
#: gym/views/gym.py:158 gym/views/gym.py:217
msgid "Username"
msgstr "Nom d'usuari"
-#: core/views/user.py:591 gym/templates/gym/new_user.html:34
+#: core/views/user.py:607 gym/templates/gym/new_user.html:34
#: gym/views/export.py:58 gym/views/gym.py:217
msgid "Gym"
msgstr "Gimnàs"
-#: core/views/user.py:650
+#: core/views/user.py:678
#, python-format
msgid "A verification email was sent to %(email)s"
msgstr ""
@@ -1258,16 +1280,16 @@ msgstr "nom de l'exercici"
msgid "A more basic name for the muscle"
msgstr ""
-#: exercises/models/video.py:50
+#: exercises/models/video.py:52
#, python-format
msgid "Maximum file size is %(size)sMB."
msgstr ""
-#: exercises/models/video.py:57 exercises/models/video.py:65
+#: exercises/models/video.py:59 exercises/models/video.py:67
msgid "File type is not supported"
msgstr ""
-#: exercises/models/video.py:70
+#: exercises/models/video.py:72
#, fuzzy
#| msgid "%(birthdate)s is not a valid birthdate"
msgid "File is not a valid video"
@@ -1351,7 +1373,11 @@ msgstr "Voleu esborrar l'equipament?"
msgid "Add muscle"
msgstr "Afegeix múscul"
-#: gallery/templates/images/overview.html:72
+#: gallery/forms.py:35
+msgid "If date is left empty, it will be read from the image instead"
+msgstr ""
+
+#: gallery/templates/images/overview.html:69
msgid "Add image"
msgstr "Afegeix imatge"
@@ -1417,7 +1443,7 @@ msgid "Contract type"
msgstr "Tipus de contracte"
#: gym/models/contract.py:211 gym/templates/contract/view.html:59
-#: nutrition/forms.py:58
+#: nutrition/forms.py:67
msgid "Amount"
msgstr "Quantitat"
@@ -1597,7 +1623,7 @@ msgstr "Adreces electròniques"
msgid "Add member"
msgstr "Afegeix un membre"
-#: gym/templates/gym/new_user.html:48 nutrition/templates/rate/form.html:120
+#: gym/templates/gym/new_user.html:48 nutrition/templates/rate/form.html:121
msgid "Info"
msgstr "Informació"
@@ -1776,10 +1802,6 @@ msgstr ""
msgid "Quads"
msgstr ""
-#: i18n.tpl:30
-msgid "Repetitions"
-msgstr "Repeticions"
-
#: i18n.tpl:31
msgid "Resistance band"
msgstr ""
@@ -1808,198 +1830,202 @@ msgstr ""
msgid "Until Failure"
msgstr ""
-#: i18n.tpl:40
-msgid "none (bodyweight exercise)"
+#: i18n.tpl:38
+msgid "Meters"
msgstr ""
#: i18n.tpl:41
-msgid "Beginner"
+msgid "none (bodyweight exercise)"
msgstr ""
#: i18n.tpl:42
+msgid "Beginner"
+msgstr ""
+
+#: i18n.tpl:43
#, fuzzy
#| msgctxt "As in \"content of an email\""
#| msgid "Content"
msgid "Consistent"
msgstr "Contingut"
-#: i18n.tpl:43
+#: i18n.tpl:44
msgid "Dedicated"
msgstr ""
-#: i18n.tpl:44
+#: i18n.tpl:45
msgid "Obsessed"
msgstr ""
-#: i18n.tpl:45
+#: i18n.tpl:46
msgid "Legend"
msgstr ""
-#: i18n.tpl:46
+#: i18n.tpl:47
msgid "Veteran"
msgstr ""
-#: i18n.tpl:47
+#: i18n.tpl:48
msgid "Titan"
msgstr ""
-#: i18n.tpl:48
+#: i18n.tpl:49
msgid "Unstoppable"
msgstr ""
-#: i18n.tpl:49
+#: i18n.tpl:50
msgid "Weekend Warrior"
msgstr ""
-#: i18n.tpl:50
+#: i18n.tpl:51
msgid "Elephant lifter"
msgstr ""
-#: i18n.tpl:51
+#: i18n.tpl:52
msgid "Bus lifter"
msgstr ""
-#: i18n.tpl:52
+#: i18n.tpl:53
msgid "Plane lifter"
msgstr ""
-#: i18n.tpl:53
+#: i18n.tpl:54
msgid "Blue whale lifter"
msgstr ""
-#: i18n.tpl:54
+#: i18n.tpl:55
msgid "Space Station lifter"
msgstr ""
-#: i18n.tpl:55
+#: i18n.tpl:56
msgid "Millionaire"
msgstr ""
-#: i18n.tpl:56
+#: i18n.tpl:57
msgid "Atlas"
msgstr ""
-#: i18n.tpl:57
+#: i18n.tpl:58
msgid "Early Bird"
msgstr ""
-#: i18n.tpl:58
+#: i18n.tpl:59
#, fuzzy
#| msgid "Weight log"
msgid "Night Owl"
msgstr "Registre del pes"
-#: i18n.tpl:59
+#: i18n.tpl:60
msgid "New Year, New Me"
msgstr ""
-#: i18n.tpl:60
+#: i18n.tpl:61
msgid "Phoenix"
msgstr ""
-#: i18n.tpl:61
+#: i18n.tpl:62
#, fuzzy
#| msgid "Personal data"
msgid "Personal Record"
msgstr "Dades personals"
-#: i18n.tpl:62
+#: i18n.tpl:63
#, fuzzy
#| msgid "Copy workout"
msgid "Complete your first workout"
msgstr "Copia pla d'entrenament"
-#: i18n.tpl:63
+#: i18n.tpl:64
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 10 workouts"
msgstr "Entrenament de mostra"
-#: i18n.tpl:64
+#: i18n.tpl:65
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 50 workouts"
msgstr "Entrenament de mostra"
-#: i18n.tpl:65
+#: i18n.tpl:66
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 100 workouts"
msgstr "Entrenament de mostra"
-#: i18n.tpl:66
+#: i18n.tpl:67
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 200 workouts"
msgstr "Entrenament de mostra"
-#: i18n.tpl:67
+#: i18n.tpl:68
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 500 workouts"
msgstr "Entrenament de mostra"
-#: i18n.tpl:68
+#: i18n.tpl:69
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 1000 workouts"
msgstr "Entrenament de mostra"
-#: i18n.tpl:69
+#: i18n.tpl:70
msgid "Maintain a 30-day workout streak"
msgstr ""
-#: i18n.tpl:70
+#: i18n.tpl:71
msgid "Work out on Saturday and Sunday for 4 consecutive weekends"
msgstr ""
-#: i18n.tpl:71
+#: i18n.tpl:72
msgid "Lift a cumulative total of 5.000 kg"
msgstr ""
-#: i18n.tpl:72
+#: i18n.tpl:73
msgid "Lift a cumulative total of 20.000 kg"
msgstr ""
-#: i18n.tpl:73
+#: i18n.tpl:74
msgid "Lift a cumulative total of 50.000 kg"
msgstr ""
-#: i18n.tpl:74
+#: i18n.tpl:75
msgid "Lift a cumulative total of 150.000 kg"
msgstr ""
-#: i18n.tpl:75
+#: i18n.tpl:76
msgid "Lift a cumulative total of 450.000 kg"
msgstr ""
-#: i18n.tpl:76
+#: i18n.tpl:77
msgid "Lift a cumulative total of 1.000.000 kg"
msgstr ""
-#: i18n.tpl:77
+#: i18n.tpl:78
msgid "Lift a cumulative total of 10.000.000 kg"
msgstr ""
-#: i18n.tpl:78
+#: i18n.tpl:79
msgid "Complete a workout before 6:00 AM"
msgstr ""
-#: i18n.tpl:79
+#: i18n.tpl:80
msgid "Complete a workout after 9:00 PM"
msgstr ""
-#: i18n.tpl:80
+#: i18n.tpl:81
#, fuzzy
#| msgid "Workout for %s"
msgid "Work out on January 1st"
msgstr "Pla d'entrenament per a %s"
-#: i18n.tpl:81
+#: i18n.tpl:82
msgid "Return to training after being inactive for 30 days"
msgstr ""
-#: i18n.tpl:82
+#: i18n.tpl:83
msgid "Achieve a new Personal Record on any exercise"
msgstr ""
@@ -2085,7 +2111,7 @@ msgstr "Exercici"
msgid "Routine will expire soon"
msgstr "L'entrenament caducarà aviat"
-#: manager/models/routine.py:153 manager/models/session.py:145
+#: manager/models/routine.py:154 manager/models/session.py:145
msgid "The start time cannot be after the end time."
msgstr "L'hora d'inici no pot ser posterior a la de finalització."
@@ -2169,23 +2195,27 @@ msgstr "Entrenament"
msgid "Workout for %s"
msgstr "Pla d'entrenament per a %s"
-#: nutrition/forms.py:62
+#: nutrition/extract_info/off.py:72 nutrition/extract_info/off.py:91
+msgid "Serving"
+msgstr ""
+
+#: nutrition/forms.py:71 nutrition/forms.py:208
msgid "Unit"
msgstr "Unitat"
-#: nutrition/forms.py:170 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:179 nutrition/templates/rate/form.html:77
msgid "Basic caloric intake"
msgstr "Ingesta energètica bàsica"
-#: nutrition/forms.py:171
+#: nutrition/forms.py:180
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:176
+#: nutrition/forms.py:185
msgid "Additional calories"
msgstr "Calories addicionals"
-#: nutrition/forms.py:178
+#: nutrition/forms.py:187
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
@@ -2194,15 +2224,33 @@ msgstr ""
"un número negatiu)"
#: nutrition/forms.py:209
+msgid "grams (g)"
+msgstr ""
+
+#: nutrition/forms.py:219
msgid "Ingredient"
msgstr "Ingredient"
-#: nutrition/forms.py:213
+#: nutrition/forms.py:223
#, fuzzy
#| msgid "Also use ingredients in English"
msgid "Also search for names in English"
msgstr "Usa també ingredients en anglès"
+#: nutrition/forms.py:239
+msgid "Quantity"
+msgstr ""
+
+#: nutrition/forms.py:241
+msgid "Enter a quantity and choose grams (g) or one of the serving units."
+msgstr ""
+
+#: nutrition/models/ingredient.py:526
+#, fuzzy
+#| msgid "Correction"
+msgid "Portion"
+msgstr "Correcció"
+
#: nutrition/templates/ingredient/email_new.tpl:1
#, python-format
msgid ""
@@ -2240,59 +2288,90 @@ msgid ""
"sucessfully."
msgstr ""
-#: nutrition/templates/ingredient/overview.html:38
+#: nutrition/templates/ingredient/overview.html:32
+#: nutrition/templates/ingredient/overview.html:68
+#: nutrition/templates/ingredient/view.html:143
+msgid "Vegan"
+msgstr ""
+
+#: nutrition/templates/ingredient/overview.html:34
+#: nutrition/templates/ingredient/overview.html:79
+#: nutrition/templates/ingredient/view.html:155
+#, fuzzy
+#| msgid "Variations"
+msgid "Vegetarian"
+msgstr "Variacions"
+
+#: nutrition/templates/ingredient/overview.html:43
msgid "No ingredients."
msgstr ""
-#: nutrition/templates/ingredient/overview.html:49
+#: nutrition/templates/ingredient/overview.html:54
msgid "Search"
msgstr "Cerca"
-#: nutrition/templates/ingredient/view.html:45 nutrition/views/plan.py:237
+#: nutrition/templates/ingredient/overview.html:57
+msgid "Filter"
+msgstr ""
+
+#: nutrition/templates/ingredient/overview.html:83
+msgid "Apply"
+msgstr ""
+
+#: nutrition/templates/ingredient/overview.html:85
+msgid "Reset"
+msgstr ""
+
+#: nutrition/templates/ingredient/view.html:46 nutrition/views/plan.py:236
msgid "Macronutrients"
msgstr ""
-#: nutrition/templates/ingredient/view.html:54
+#: nutrition/templates/ingredient/view.html:55
msgid "kJ"
msgstr ""
-#: nutrition/templates/ingredient/view.html:70 nutrition/views/plan.py:267
+#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:266
msgid "Sugar content in carbohydrates"
msgstr ""
-#: nutrition/templates/ingredient/view.html:75
-#: nutrition/templates/ingredient/view.html:91
-#: nutrition/templates/ingredient/view.html:113
-#: nutrition/templates/ingredient/view.html:123
+#: nutrition/templates/ingredient/view.html:76
+#: nutrition/templates/ingredient/view.html:92
+#: nutrition/templates/ingredient/view.html:114
+#: nutrition/templates/ingredient/view.html:124
msgid "n.A."
msgstr ""
-#: nutrition/templates/ingredient/view.html:86 nutrition/views/plan.py:281
+#: nutrition/templates/ingredient/view.html:87 nutrition/views/plan.py:280
msgid "Saturated fat content in fats"
msgstr ""
-#: nutrition/templates/ingredient/view.html:102
+#: nutrition/templates/ingredient/view.html:103
msgid "Others"
msgstr ""
-#: nutrition/templates/ingredient/view.html:108 nutrition/views/plan.py:287
+#: nutrition/templates/ingredient/view.html:109 nutrition/views/plan.py:286
msgid "Fiber"
msgstr ""
-#: nutrition/templates/ingredient/view.html:118 nutrition/views/plan.py:293
+#: nutrition/templates/ingredient/view.html:119 nutrition/views/plan.py:292
msgid "Sodium"
msgstr ""
-#: nutrition/templates/ingredient/view.html:143
-#: nutrition/templates/units/list.html:50 nutrition/views/unit.py:86
+#: nutrition/templates/ingredient/view.html:136
+#, fuzzy
+#| msgid "Click here for more information"
+msgid "Dietary information"
+msgstr "Feu clic aquí per a més informació"
+
+#: nutrition/templates/ingredient/view.html:184
msgid "Add new weight unit"
msgstr ""
-#: nutrition/templates/rate/form.html:25
+#: nutrition/templates/rate/form.html:26
msgid "Basal metabolic rate"
msgstr ""
-#: nutrition/templates/rate/form.html:26
+#: nutrition/templates/rate/form.html:27
msgid ""
"The basal metabolic rate is the amount of energy expended daily\n"
"at rest. This is the minimum energy needed for the body to function, without "
@@ -2300,36 +2379,36 @@ msgid ""
"additional physical activity."
msgstr ""
-#: nutrition/templates/rate/form.html:37
+#: nutrition/templates/rate/form.html:38
msgid "Your basic metabolic rate is: "
msgstr ""
-#: nutrition/templates/rate/form.html:47
+#: nutrition/templates/rate/form.html:48
msgid "Physical activities"
msgstr ""
-#: nutrition/templates/rate/form.html:48
+#: nutrition/templates/rate/form.html:49
msgid ""
"The physical activity level (PAL) is a factor used to to express\n"
"the additional physical activity and is used to calculate the total energy\n"
"required per day."
msgstr ""
-#: nutrition/templates/rate/form.html:59
+#: nutrition/templates/rate/form.html:60
msgid "Factor for daily activities: "
msgstr ""
-#: nutrition/templates/rate/form.html:67
+#: nutrition/templates/rate/form.html:68
msgid ""
"The base caloric intake is the amount of calories your metabolism\n"
"needs based on your level of physical activity."
msgstr ""
-#: nutrition/templates/rate/form.html:81
+#: nutrition/templates/rate/form.html:82
msgid "Calculate basic caloric intake"
msgstr ""
-#: nutrition/templates/rate/form.html:88
+#: nutrition/templates/rate/form.html:89
msgid ""
"The total calories are the actual total calories per day. This\n"
"might include e.g. a surplus or deficit if you are bulking or cutting. "
@@ -2337,69 +2416,69 @@ msgid ""
"you might just enter yourself the amount of calories if you know the value."
msgstr ""
-#: nutrition/templates/rate/form.html:102
+#: nutrition/templates/rate/form.html:103
msgid "Transfer basic intake to total daily calories"
msgstr ""
-#: nutrition/templates/rate/form.html:106
+#: nutrition/templates/rate/form.html:107
msgid "Add additional calories to total daily calories"
msgstr ""
-#: nutrition/templates/rate/form.html:110
+#: nutrition/templates/rate/form.html:111
msgid "Save total calories to profile"
msgstr ""
-#: nutrition/templates/rate/form.html:121
+#: nutrition/templates/rate/form.html:122
msgid ""
"Please note that these calculations can only be an\n"
"approximation. If you base your nutrition plan on these values, observe\n"
"yourself for some weeks and change the total amount if needed."
msgstr ""
-#: nutrition/views/ingredient.py:158
+#: nutrition/views/ingredient.py:163
msgid "Add a new ingredient"
msgstr ""
-#: nutrition/views/plan.py:128
+#: nutrition/views/plan.py:127
msgid "Nutritional plan"
msgstr ""
-#: nutrition/views/plan.py:130
+#: nutrition/views/plan.py:129
#, python-format
msgid "Nutritional plan for %s"
msgstr ""
-#: nutrition/views/plan.py:202
+#: nutrition/views/plan.py:201
msgid "<i>This is an empty plan, what did you expect on the PDF?</i>"
msgstr ""
-#: nutrition/views/plan.py:230
+#: nutrition/views/plan.py:229
#, fuzzy
#| msgid "Nutrition plan"
msgid "Nutritional data"
msgstr "Pla nutricional"
-#: nutrition/views/plan.py:238
+#: nutrition/views/plan.py:237
msgid "Total"
msgstr ""
-#: nutrition/views/plan.py:239
+#: nutrition/views/plan.py:238
msgid "Percent of energy"
msgstr ""
-#: nutrition/views/plan.py:240
+#: nutrition/views/plan.py:239
msgid "g per body kg"
msgstr ""
-#: nutrition/views/unit_ingredient.py:69
+#: nutrition/views/unit_ingredient.py:64
msgid "Add a new weight unit"
msgstr ""
-#: nutrition/views/unit_ingredient.py:106
+#: nutrition/views/unit_ingredient.py:99
msgid "Edit a weight unit to ingredient connection"
msgstr ""
-#: nutrition/views/unit_ingredient.py:138
+#: nutrition/views/unit_ingredient.py:129
msgid "Delete?"
msgstr ""
@@ -2772,7 +2851,7 @@ msgstr ""
msgid "Translation"
msgstr ""
-#: utils/generic_views.py:263
+#: utils/generic_views.py:246
msgid "Yes, delete"
msgstr ""
@@ -2823,10 +2902,6 @@ msgstr ""
msgid "Import weight logs"
msgstr ""
-#: weight/templates/import_csv_form.html:9
-msgid "Submit"
-msgstr "Envia"
-
#: weight/templates/import_csv_form.html:15
msgid ""
"Use this import field to import your weight logs into Workout\n"
@@ -2922,6 +2997,28 @@ msgstr ""
msgid "Re-Submit"
msgstr ""
+#, fuzzy
+#~| msgid "Configuration"
+#~ msgid "Email verification"
+#~ msgstr "Configuració"
+
+#, python-format
+#~ msgid "%(username)s, your email was verified"
+#~ msgstr "%(username)s, el teu correu electrònic ha estat verificat"
+
+#~ msgid "Error, invalid verification token"
+#~ msgstr "Error, token de verificació invàlid"
+
+#~ msgid "Email Confirmation"
+#~ msgstr "Confirmació de correu electrònic"
+
+#, python-format
+#~ msgid "You are almost there, %(username)s!"
+#~ msgstr "Et queda poc, %(username)s!"
+
+#~ msgid "Ingredient weight units"
+#~ msgstr "Unitats de pes dels ingredients"
+
#~ msgid "Image"
#~ msgstr "Imatge"
@@ -2952,9 +3049,6 @@ msgstr ""
#~ msgid "Secondary muscles"
#~ msgstr "Músculs secundaris"
-#~ msgid "Variations"
-#~ msgstr "Variacions"
-
#~ msgid "Exercise Categories"
#~ msgstr "Categories d'exercicis"
@@ -3712,9 +3806,6 @@ msgstr ""
#~ msgid "This content is available under the following license:"
#~ msgstr "Aquest contingut està disponible sota la llicència següent:"
-#~ msgid "Click here for more information"
-#~ msgstr "Feu clic aquí per a més informació"
-
#, fuzzy, python-format
#~| msgid ""
#~| "%(name_original)s is too similar to existing exercise "
diff --git a/wger/locale/cs/LC_MESSAGES/django.po b/wger/locale/cs/LC_MESSAGES/django.po
index 0d9e7da95..d20524ff8 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: 2026-01-17 14:03+0000\n"
+"POT-Creation-Date: 2026-04-10 10:20+0000\n"
"PO-Revision-Date: 2024-02-21 11:02+0000\n"
"Last-Translator: Fjuro <[email protected]>\n"
"Language-Team: Czech <https://hosted.weblate.org/projects/wger/web/cs/>\n"
@@ -41,7 +41,7 @@ msgstr ""
#: config/views/gym_config.py:42 core/templates/language/view.html:64
#: core/templates/license/list.html:17
#: core/templates/repetition_unit/list.html:18
-#: core/templates/user/overview.html:204 core/templates/user/overview.html:467
+#: core/templates/user/overview.html:207 core/templates/user/overview.html:470
#: core/templates/weight_unit/list.html:18
#: exercises/templates/categories/admin-overview.html:17
#: exercises/templates/equipment/admin-overview.html:17
@@ -53,30 +53,29 @@ msgstr ""
#: gym/templates/gym/list.html:19 gym/templates/gym/list.html:48
#: gym/templates/gym/member_list.html:94 gym/templates/gym/member_list.html:152
#: gym/templates/gym/member_list.html:190
-#: nutrition/templates/ingredient/view.html:164
-#: nutrition/templates/ingredient/view.html:209
-#: nutrition/templates/units/list.html:19
+#: nutrition/templates/ingredient/view.html:205
+#: nutrition/templates/ingredient/view.html:248
msgid "Edit"
msgstr "Upravit"
-#: core/forms.py:91 core/templates/navigation.html:271
-#: core/templates/navigation.html:278 core/templates/user/login.html:4
+#: core/forms.py:89 core/templates/navigation.html:268
+#: core/templates/navigation.html:275 core/templates/user/login.html:4
#: core/templates/user/registration_sidebar.html:12
#: software/templates/features.html:82 software/templates/features.html:448
msgid "Login"
msgstr "Přihlášení"
-#: core/forms.py:130 core/forms.py:244 gym/views/export.py:61
+#: core/forms.py:128 core/forms.py:242 gym/views/export.py:61
#: gym/views/gym.py:217
msgid "First name"
msgstr "Jméno"
-#: core/forms.py:131 core/forms.py:245 core/templates/user/overview.html:284
+#: core/forms.py:129 core/forms.py:243 core/templates/user/overview.html:287
#: gym/views/export.py:62 gym/views/gym.py:217
msgid "Last name"
msgstr "Příjmení"
-#: core/forms.py:133 core/forms.py:210 core/templates/user/overview.html:288
+#: core/forms.py:131 core/forms.py:208 core/templates/user/overview.html:291
#: gym/models/contract.py:256 gym/models/gym.py:58
#: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:116
#: gym/templates/gym/new_user.html:30 gym/views/export.py:60
@@ -86,53 +85,53 @@ msgstr "Příjmení"
msgid "Email"
msgstr "Email"
-#: core/forms.py:134
+#: core/forms.py:132
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í e-mailu."
-#: core/forms.py:138 core/models/profile.py:222
+#: core/forms.py:136 core/models/profile.py:222
#: gym/templates/gym/new_user.html:38
msgid "Date of Birth"
msgstr "Datum narození"
-#: core/forms.py:177
+#: core/forms.py:175
msgid "Personal data"
msgstr "Osobní data"
-#: core/forms.py:189
+#: core/forms.py:187
msgid "Workout reminders"
msgstr "Připomenutí tréninku"
-#: core/forms.py:196
+#: core/forms.py:194
msgid "Other settings"
msgstr "Další nastavení"
-#: core/forms.py:204 core/views/user.py:614 core/views/user.py:629
-#: core/views/user.py:641 gym/forms.py:73 utils/generic_views.py:143
+#: core/forms.py:202 core/views/user.py:630 core/views/user.py:654
+#: core/views/user.py:668 gym/forms.py:73 utils/generic_views.py:137
msgid "Save"
msgstr "Uložit"
-#: core/forms.py:211
+#: core/forms.py:209
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:240
+#: core/forms.py:238
msgid "This e-mail address is already in use."
msgstr "Tato e-mailová adresa je již používána."
-#: core/forms.py:261 gym/templates/gym/new_user.html:26
+#: core/forms.py:259 gym/templates/gym/new_user.html:26
#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:217
msgid "Password"
msgstr "Heslo"
-#: core/forms.py:263
+#: core/forms.py:261
msgid "Please enter your current password."
msgstr "Zadejte prosím vaše současné heslo."
-#: core/forms.py:272 core/templates/language/view.html:70
+#: core/forms.py:270 core/templates/language/view.html:70
#: core/templates/license/list.html:21
#: core/templates/repetition_unit/list.html:22
-#: core/templates/user/overview.html:233
+#: core/templates/user/overview.html:236
#: core/templates/weight_unit/list.html:22
#: exercises/templates/categories/admin-overview.html:21
#: exercises/templates/equipment/admin-overview.html:21
@@ -140,27 +139,30 @@ msgstr "Zadejte prosím vaše současné heslo."
#: gym/templates/admin_notes/list.html:37
#: gym/templates/contract_option/list.html:35
#: gym/templates/contract_type/list.html:36 gym/templates/document/list.html:46
-#: gym/templates/gym/list.html:23 nutrition/templates/ingredient/view.html:168
-#: nutrition/templates/ingredient/view.html:215
-#: nutrition/templates/units/list.html:25
+#: gym/templates/gym/list.html:23 nutrition/templates/ingredient/view.html:209
+#: nutrition/templates/ingredient/view.html:254
msgid "Delete"
msgstr "Smazat"
-#: core/forms.py:281
+#: core/forms.py:279
msgid "Invalid password"
msgstr "Chybné heslo"
-#: core/forms.py:293
+#: core/forms.py:291 core/forms.py:349
msgid "The form is secured with reCAPTCHA"
msgstr "Zabezpečeno službou reCAPTCHA"
-#: core/forms.py:314 core/forms.py:341 core/templates/navigation.html:272
-#: core/templates/navigation.html:285 core/templates/template.html:123
-#: core/templates/user/login.html:21 core/views/user.py:285
+#: core/forms.py:312 core/forms.py:339 core/templates/navigation.html:269
+#: core/templates/navigation.html:282 core/templates/template.html:113
+#: core/templates/user/login.html:21 core/views/user.py:293
#: software/templates/features.html:87 software/templates/features.html:442
msgid "Register"
msgstr "Registrace"
+#: core/forms.py:360 weight/templates/import_csv_form.html:9
+msgid "Submit"
+msgstr "Zaslat"
+
#: core/models/language.py:31 core/templates/language/view.html:21
msgid "Language short name"
msgstr "Krátký název jazyka"
@@ -199,36 +201,36 @@ msgstr "Odkaz"
msgid "Link to license text or other information"
msgstr "Odkaz na text licence nebo další informace"
-#: core/models/profile.py:57
+#: core/models/profile.py:60
#, python-format
msgid "%(birthdate)s is not a valid birthdate"
msgstr "%(birthdate)s není správné datum narození"
-#: core/models/profile.py:66
+#: core/models/profile.py:69
msgid "Male"
msgstr "Muž"
-#: core/models/profile.py:67
+#: core/models/profile.py:70
msgid "Female"
msgstr "Žena"
-#: core/models/profile.py:74
+#: core/models/profile.py:77
msgid "Low"
msgstr "Lehký"
-#: core/models/profile.py:75
+#: core/models/profile.py:78
msgid "Medium"
msgstr "Střední"
-#: core/models/profile.py:76
+#: core/models/profile.py:79
msgid "High"
msgstr "Těžký"
-#: core/models/profile.py:82
+#: core/models/profile.py:85
msgid "Metric (kilogram)"
msgstr "Metrické (kilogramy)"
-#: core/models/profile.py:83
+#: core/models/profile.py:86
msgid "Imperial (pound)"
msgstr "Imperiální (libra)"
@@ -347,7 +349,7 @@ msgstr "Průměrně hodin týdně"
msgid "Free time"
msgstr "Volný čas"
-#: core/models/profile.py:320 nutrition/templates/rate/form.html:66
+#: core/models/profile.py:320 nutrition/templates/rate/form.html:67
msgid "Total daily calories"
msgstr "Celkové denní kalorie"
@@ -390,20 +392,43 @@ msgstr ""
msgid "Enable or disable the trophy system for this user"
msgstr ""
-#: core/models/profile.py:446
+#: core/models/profile.py:457
msgid "The sum of all hours has to be 24"
msgstr "Součet všech hodin musí být 24"
-#: core/models/rep_unit.py:36 core/models/weight_unit.py:42
-#: core/templates/user/overview.html:280 core/views/user.py:589
+#: core/models/rep_unit.py:32 i18n.tpl:30
+msgid "Repetitions"
+msgstr "Opakování"
+
+#: core/models/rep_unit.py:33 core/templates/user/overview.html:82
+#: exercises/templates/history/overview.html:30
+msgid "Time"
+msgstr "Čas"
+
+#: core/models/rep_unit.py:34
+msgid "Distance"
+msgstr ""
+
+#: core/models/rep_unit.py:47 core/models/weight_unit.py:42
+#: core/templates/user/overview.html:283 core/views/user.py:605
#: exercises/models/muscle.py:36 gym/models/contract.py:52
#: gym/models/contract.py:103 gym/models/gym.py:46
#: gym/models/user_document.py:84 gym/templates/contract/view.html:50
#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:108
-#: gym/views/gym.py:158 nutrition/templates/ingredient/view.html:151
+#: gym/views/gym.py:158 nutrition/templates/ingredient/view.html:192
msgid "Name"
msgstr "Název"
+#: core/models/rep_unit.py:53
+#, fuzzy
+#| msgid "Unit"
+msgid "Unit Type"
+msgstr "Jednotka"
+
+#: core/models/rep_unit.py:54
+msgid "The type of unit (repetitions, time, or distance)"
+msgstr ""
+
#: core/templates/403.html:4
msgid "Forbidden!"
msgstr "Zakázané!"
@@ -434,6 +459,55 @@ msgstr ""
"obnovit váš prohlížeč. Pokud to nepomůže, zkuste to prosím znovu později. "
"Pokud problém přetrvává, můžete získat pomoc následujícími způsoby:"
+#: core/templates/account/email/email_confirmation_message.html:81
+msgid "Almost there!"
+msgstr ""
+
+#: core/templates/account/email/email_confirmation_message.html:85
+#, fuzzy, python-format
+#| msgid ""
+#| "You're receiving this e-mail because you requested a password reset for "
+#| "your user account at %(site_name)s."
+msgid ""
+"You're receiving this email because the user \"%(user_display)s\" has given "
+"your email address to register an account on %(site_domain)s."
+msgstr ""
+"Tento email jste obdržel, protože jste na stránce %(site_name)s požádali o "
+"obnovu hesla k uživatelskému účtu."
+
+#: core/templates/account/email/email_confirmation_message.html:93
+msgid ""
+"Your email verification code is listed below. Please enter it in your open "
+"browser window."
+msgstr ""
+
+#: core/templates/account/email/email_confirmation_message.html:100
+#, fuzzy
+#| msgid "Please click the following link to confirm your email: %(link)s"
+msgid "Please click the button below to confirm your email address."
+msgstr "Pro potvrzení e-mailu klikněte na následující odkaz: %(link)s"
+
+#: core/templates/account/email/email_confirmation_message.html:106
+#, fuzzy
+#| msgid "Unverified email"
+msgid "Confirm email"
+msgstr "Neověřený email"
+
+#: core/templates/account/email/email_confirmation_message.html:110
+#, python-format
+msgid ""
+"The link is valid for %(expire_hours)s hours (until %(date)s, %(time)s). You "
+"can request a new one from your profile settings."
+msgstr ""
+
+#: core/templates/account/email/email_confirmation_message.html:116
+msgid "If the button doesn't work, copy and paste this link into your browser:"
+msgstr ""
+
+#: core/templates/account/email/email_confirmation_message.html:125
+msgid "the wger Team"
+msgstr "Tým wger"
+
#: core/templates/base.html:10
#, fuzzy, python-format
#| msgid ""
@@ -478,51 +552,7 @@ msgstr ""
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 verification"
-msgstr "Ověření e-mailu"
-
-#: core/templates/email_verification/confirm_template.html:18
-#, python-format
-msgid "%(username)s, your email was verified"
-msgstr "%(username)s, váš email byl ověřen"
-
-#: core/templates/email_verification/confirm_template.html:22
-msgid "Error, invalid verification token"
-msgstr "Chyba, chybně zadaný ověřovací token"
-
-#: core/templates/email_verification/email_body_html.tpl:6
-msgid "Email Confirmation"
-msgstr "Konfirmační Email"
-
-#: 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 "Už to skoro bude, %(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 "Klikněte <a href=\"%(link)s\">sem</a> pro ověření vašeho e-mailu"
-
-#: 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 "Platnost tohoto tokenu vyprší v %(time)s"
-
-#: core/templates/email_verification/email_body_html.tpl:14
-#: core/templates/email_verification/email_body_txt.tpl:8
-msgid "the wger Team"
-msgstr "Tým wger"
-
-#: core/templates/email_verification/email_body_txt.tpl:4
-#, python-format
-msgid "Please click the following link to confirm your email: %(link)s"
-msgstr "Pro potvrzení e-mailu klikněte na následující odkaz: %(link)s"
-
-#: core/templates/language/overview.html:4 core/templates/navigation.html:344
+#: core/templates/language/overview.html:4 core/templates/navigation.html:341
msgid "Languages"
msgstr "Jazyky"
@@ -531,16 +561,16 @@ msgid "Nothing found."
msgstr "Nic nenalezeno."
#: core/templates/language/overview.html:22
-#: nutrition/templates/ingredient/overview.html:38
+#: nutrition/templates/ingredient/overview.html:43
msgid "Add one now."
msgstr "Přidat nyní."
#: core/templates/language/overview.html:34 core/templates/license/list.html:43
-#: core/templates/repetition_unit/list.html:46
-#: core/templates/user/overview.html:344 core/templates/user/overview.html:384
-#: core/templates/user/overview.html:422
-#: core/templates/weight_unit/list.html:46 core/views/languages.py:74
-#: core/views/license.py:66 core/views/repetition_units.py:66
+#: core/templates/repetition_unit/list.html:44
+#: core/templates/user/overview.html:347 core/templates/user/overview.html:387
+#: core/templates/user/overview.html:425
+#: core/templates/weight_unit/list.html:46 core/views/languages.py:77
+#: core/views/license.py:66 core/views/repetition_units.py:76
#: core/views/weight_units.py:66
#: exercises/templates/categories/admin-overview.html:40
#: exercises/templates/equipment/admin-overview.html:39
@@ -553,14 +583,14 @@ msgstr "Přidat nyní."
#: gym/templates/gym/member_list.html:264
#: gym/templates/gym/member_list.html:303
#: mailer/templates/mailer/gym/overview.html:43
-#: nutrition/templates/ingredient/overview.html:60
+#: nutrition/templates/ingredient/overview.html:97
msgid "Add"
msgstr "Přidat"
#: core/templates/language/view.html:61 core/templates/user/api_key.html:41
#: core/templates/user/preferences.html:50 gym/models/contract.py:203
#: gym/templates/contract/view.html:41 gym/templates/gym/member_list.html:270
-#: nutrition/templates/ingredient/view.html:206
+#: nutrition/templates/ingredient/view.html:245
msgid "Options"
msgstr "Nastavení"
@@ -570,9 +600,9 @@ msgstr "Seznam licencí"
#: core/templates/license/list.html:30
#: core/templates/repetition_unit/list.html:32
-#: core/templates/user/overview.html:104 core/templates/user/overview.html:136
-#: core/templates/user/overview.html:185 core/templates/user/overview.html:365
-#: core/templates/user/overview.html:404 core/templates/user/overview.html:448
+#: core/templates/user/overview.html:107 core/templates/user/overview.html:139
+#: core/templates/user/overview.html:188 core/templates/user/overview.html:368
+#: core/templates/user/overview.html:407 core/templates/user/overview.html:451
#: core/templates/weight_unit/list.html:32
#: exercises/templates/categories/admin-overview.html:30
#: exercises/templates/equipment/admin-overview.html:30
@@ -584,11 +614,10 @@ msgstr "Seznam licencí"
#: gym/templates/gym/member_list.html:284
#: gym/templates/gym/member_list.html:321
#: mailer/templates/mailer/gym/overview.html:30
-#: nutrition/templates/units/list.html:34
msgid "Nothing found"
msgstr "Nic nenalezeno"
-#: core/templates/misc/about.html:4 core/templates/template.html:160
+#: core/templates/misc/about.html:4 core/templates/template.html:150
msgid "Imprint"
msgstr "Tiráž"
@@ -596,162 +625,157 @@ msgstr "Tiráž"
msgid "Training"
msgstr "Trénink"
-#: core/templates/navigation.html:37 core/templates/user/overview.html:25
+#: core/templates/navigation.html:36 core/templates/user/overview.html:28
msgid "Routines"
msgstr ""
-#: core/templates/navigation.html:45 core/templates/user/overview.html:70
+#: core/templates/navigation.html:44 core/templates/user/overview.html:73
msgid "Calendar"
msgstr "Kalendář"
-#: core/templates/navigation.html:55
+#: core/templates/navigation.html:53
msgid "Measurements"
msgstr "Měření"
-#: core/templates/navigation.html:66 gallery/templates/images/overview.html:6
+#: core/templates/navigation.html:64 gallery/templates/images/overview.html:6
msgid "Gallery"
msgstr "Galerie"
-#: core/templates/navigation.html:72
+#: core/templates/navigation.html:74 core/templates/navigation.html:400
+#: trophies/templates/trophies/overview.html:7
+msgid "Trophies"
+msgstr ""
+
+#: core/templates/navigation.html:79
msgid "Workout templates"
msgstr "Tréninkové šablony"
-#: core/templates/navigation.html:79
+#: core/templates/navigation.html:86
msgid "Your templates"
msgstr "Tvé šablony"
-#: core/templates/navigation.html:88
+#: core/templates/navigation.html:95
msgid "Public templates"
msgstr "Veřejné šablony"
-#: core/templates/navigation.html:96 software/templates/features.html:51
+#: core/templates/navigation.html:103 software/templates/features.html:51
#: software/templates/features.html:480
msgid "Exercises"
msgstr "Cviky"
-#: core/templates/navigation.html:102 core/templates/navigation.html:176
-#: core/templates/navigation.html:339
+#: core/templates/navigation.html:109 core/templates/navigation.html:336
msgid "Administration"
msgstr "Administrace"
-#: core/templates/navigation.html:106
+#: core/templates/navigation.html:113
msgid "Exercise edit history"
msgstr "Historie úprav cvičení"
-#: core/templates/navigation.html:112
+#: core/templates/navigation.html:119
msgid "Equipment"
msgstr "Nářadí"
-#: core/templates/navigation.html:118
+#: core/templates/navigation.html:125
msgid "Muscles"
msgstr "Svaly"
-#: core/templates/navigation.html:124
+#: core/templates/navigation.html:131
#: exercises/templates/categories/admin-overview.html:4
msgid "Categories"
msgstr "Kategorie"
-#: core/templates/navigation.html:139 software/templates/features.html:468
+#: core/templates/navigation.html:146 software/templates/features.html:468
msgid "Nutrition"
msgstr "Výživa"
-#: core/templates/navigation.html:147 core/templates/user/overview.html:144
+#: core/templates/navigation.html:154 core/templates/user/overview.html:147
msgid "Nutrition plans"
msgstr "Nutriční plány"
-#: core/templates/navigation.html:156
+#: core/templates/navigation.html:163
msgid "BMI calculator"
msgstr "Kalkulačka BMI"
-#: core/templates/navigation.html:165 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:172 nutrition/templates/rate/form.html:18
msgid "Daily calories calculator"
msgstr "Kalkulačka denních kalorii"
-#: core/templates/navigation.html:171
+#: core/templates/navigation.html:178
#: nutrition/templates/ingredient/overview.html:10
msgid "Ingredient overview"
msgstr "Přehled jídel"
-#: core/templates/navigation.html:180 nutrition/templates/units/list.html:6
-msgid "Ingredient weight units"
-msgstr "Jednotka váhy položek"
-
-#: core/templates/navigation.html:196 software/templates/features.html:463
+#: core/templates/navigation.html:193 software/templates/features.html:463
msgid "Body weight"
msgstr "Tělesná hmotnost"
-#: core/templates/navigation.html:203 core/templates/user/overview.html:114
+#: core/templates/navigation.html:200 core/templates/user/overview.html:117
msgid "Weight overview"
msgstr "Přehled váhy"
-#: core/templates/navigation.html:217
+#: core/templates/navigation.html:214
msgid "About this software"
msgstr "O aplikaci"
-#: core/templates/navigation.html:223 software/templates/about_us.html:5
+#: core/templates/navigation.html:220 software/templates/about_us.html:5
msgid "Support & Get Involved"
msgstr ""
-#: core/templates/navigation.html:229 software/templates/features.html:528
+#: core/templates/navigation.html:226 software/templates/features.html:528
msgid "REST API"
msgstr "REST API"
-#: core/templates/navigation.html:235 utils/models.py:45
+#: core/templates/navigation.html:232 utils/models.py:45
msgid "License"
msgstr "Licence"
-#: core/templates/navigation.html:241
+#: core/templates/navigation.html:238
msgid "Developer documentation"
msgstr "Dokumentace vývojáře"
-#: core/templates/navigation.html:248
+#: core/templates/navigation.html:245
msgid "Get the code"
msgstr "Získejte kód"
-#: core/templates/navigation.html:255 core/templates/template.html:199
-#: software/templates/features.html:603
+#: core/templates/navigation.html:252 core/templates/template.html:202
+#: software/templates/features.html:614
msgid "Translate"
msgstr "Překlad"
-#: core/templates/navigation.html:292 core/templates/user/login.html:30
+#: core/templates/navigation.html:289 core/templates/user/login.html:30
msgid "Reset password"
msgstr "Reset hesla"
-#: core/templates/navigation.html:301 core/templates/navigation.html:329
+#: core/templates/navigation.html:298 core/templates/navigation.html:326
msgid "Logout"
msgstr "Odhlásit"
-#: core/templates/navigation.html:320
+#: core/templates/navigation.html:317
msgid "My preferences"
msgstr "Má nastavení"
-#: core/templates/navigation.html:352
+#: core/templates/navigation.html:349
msgid "Licenses"
msgstr "Licence"
-#: core/templates/navigation.html:360
+#: core/templates/navigation.html:357
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr "Opakující jednotky"
-#: core/templates/navigation.html:368 core/templates/weight_unit/list.html:4
-#: nutrition/templates/ingredient/view.html:141
+#: core/templates/navigation.html:365 core/templates/weight_unit/list.html:4
+#: nutrition/templates/ingredient/view.html:182
msgid "Weight units"
msgstr "Jednotka hmostnosti"
-#: core/templates/navigation.html:376 core/templates/user/list.html:4
+#: core/templates/navigation.html:373 core/templates/user/list.html:4
msgid "User list"
msgstr "Uživatelský seznam"
-#: core/templates/navigation.html:382
+#: core/templates/navigation.html:379
msgid "Gyms"
msgstr "Posilovny"
-#: core/templates/navigation.html:403
-#: trophies/templates/trophies/overview.html:7
-msgid "Trophies"
-msgstr ""
-
#: core/templates/registration/password_reset_complete.html:4
msgid "Password reset complete"
msgstr "Obnova hesla je kompletní"
@@ -812,25 +836,29 @@ msgstr "předchozí"
msgid "next"
msgstr "další"
-#: core/templates/template.html:96
+#: core/templates/template.html:86
msgid "Close"
msgstr "Zavřít"
-#: core/templates/template.html:112
+#: core/templates/template.html:102
msgid ""
"You are using a guest account, data entered will be deleted after a week."
msgstr "Využíváte testovací účet. Data zde vložená budou po týdnu smazána."
-#: core/templates/template.html:117
+#: core/templates/template.html:107
msgid "Create some demo entries"
msgstr "Vytvořit nějaké testovací potraviny"
-#: core/templates/template.html:165 software/templates/features.html:568
+#: core/templates/template.html:155 software/templates/features.html:568
#: software/templates/tos.html:7
msgid "Terms of service"
msgstr "Podmínky služby"
-#: core/templates/template_features.html:53 software/templates/features.html:9
+#: core/templates/template.html:181 software/templates/features.html:595
+msgid "Browser language"
+msgstr ""
+
+#: core/templates/template_features.html:46 software/templates/features.html:9
msgid "Features"
msgstr "Funkce"
@@ -888,99 +916,94 @@ msgstr "Nemáte účet?"
msgid "Forgot password?"
msgstr "Zapomenuté heslo?"
-#: core/templates/user/overview.html:25 core/templates/user/overview.html:68
-#: core/templates/user/overview.html:112 core/templates/user/overview.html:144
-#: core/templates/user/overview.html:348 core/templates/user/overview.html:390
-#: core/templates/user/overview.html:426
+#: core/templates/user/overview.html:28 core/templates/user/overview.html:71
+#: core/templates/user/overview.html:115 core/templates/user/overview.html:147
+#: core/templates/user/overview.html:351 core/templates/user/overview.html:393
+#: core/templates/user/overview.html:429
#, python-format
msgid "last %(number)s"
msgstr "poslední %(number)s"
-#: core/templates/user/overview.html:27 core/templates/user/overview.html:146
-#: core/templates/user/overview.html:343 core/templates/user/overview.html:382
-#: core/templates/user/overview.html:421 gym/templates/gym/member_list.html:226
+#: core/templates/user/overview.html:30 core/templates/user/overview.html:149
+#: core/templates/user/overview.html:346 core/templates/user/overview.html:385
+#: core/templates/user/overview.html:424 gym/templates/gym/member_list.html:226
#: gym/templates/gym/member_list.html:262
#: gym/templates/gym/member_list.html:302
msgid "Overview"
msgstr "Přehled"
-#: core/templates/user/overview.html:34 core/templates/user/overview.html:76
-#: core/templates/user/overview.html:120 core/templates/user/overview.html:152
+#: core/templates/user/overview.html:37 core/templates/user/overview.html:79
+#: core/templates/user/overview.html:123 core/templates/user/overview.html:155
#: manager/helpers.py:88 software/templates/about_us.html:170
#: weight/templates/import_csv_preview.html:13
#: weight/templates/import_csv_preview.html:42 weight/views.py:54
msgid "Date"
msgstr "Datum"
-#: core/templates/user/overview.html:35 core/templates/user/overview.html:153
+#: core/templates/user/overview.html:38 core/templates/user/overview.html:156
#: gym/models/contract.py:58 gym/models/contract.py:109
msgid "Description"
msgstr "Popis"
-#: core/templates/user/overview.html:36
+#: core/templates/user/overview.html:39
msgid "Number of logs (days)"
msgstr "Počet záznamů (za den)"
-#: core/templates/user/overview.html:37 core/views/user.py:590
+#: core/templates/user/overview.html:40 core/views/user.py:606
#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:158
msgid "Last activity"
msgstr "Poslední aktivita"
-#: core/templates/user/overview.html:58
+#: core/templates/user/overview.html:61
msgid "No workouts found."
msgstr "Nenalezeny žádné tréninky."
-#: core/templates/user/overview.html:68
+#: core/templates/user/overview.html:71
msgid "Log"
msgstr "Záznam"
-#: core/templates/user/overview.html:77
+#: core/templates/user/overview.html:80
msgid "General impression"
msgstr "Celkový dojem"
-#: core/templates/user/overview.html:78 core/templates/user/overview.html:390
+#: core/templates/user/overview.html:81 core/templates/user/overview.html:393
msgid "Notes"
msgstr "Poznámky"
-#: core/templates/user/overview.html:79
-#: exercises/templates/history/overview.html:30
-msgid "Time"
-msgstr "Čas"
-
-#: core/templates/user/overview.html:112 core/templates/user/overview.html:121
+#: core/templates/user/overview.html:115 core/templates/user/overview.html:124
#: manager/helpers.py:89 weight/templates/import_csv_preview.html:14
#: weight/templates/import_csv_preview.html:43 weight/views.py:54
msgid "Weight"
msgstr "Váha"
-#: core/templates/user/overview.html:154
-#: nutrition/templates/ingredient/view.html:51 nutrition/views/plan.py:245
+#: core/templates/user/overview.html:157
+#: nutrition/templates/ingredient/view.html:52 nutrition/views/plan.py:244
msgid "Energy"
msgstr "Energie"
-#: core/templates/user/overview.html:155
-#: nutrition/templates/ingredient/view.html:58 nutrition/views/plan.py:251
+#: core/templates/user/overview.html:158
+#: nutrition/templates/ingredient/view.html:59 nutrition/views/plan.py:250
msgid "Protein"
msgstr "Bílkoviny"
-#: core/templates/user/overview.html:156
-#: nutrition/templates/ingredient/view.html:64 nutrition/views/plan.py:259
+#: core/templates/user/overview.html:159
+#: nutrition/templates/ingredient/view.html:65 nutrition/views/plan.py:258
msgid "Carbohydrates"
msgstr "Sacharidy"
-#: core/templates/user/overview.html:157
-#: nutrition/templates/ingredient/view.html:80 nutrition/views/plan.py:273
+#: core/templates/user/overview.html:160
+#: nutrition/templates/ingredient/view.html:81 nutrition/views/plan.py:272
msgid "Fat"
msgstr "Tuky"
-#: core/templates/user/overview.html:170
-#: nutrition/templates/ingredient/view.html:53
+#: core/templates/user/overview.html:173
+#: nutrition/templates/ingredient/view.html:54
msgid "kcal"
msgstr "kcal"
-#: core/templates/user/overview.html:201 core/templates/user/overview.html:340
-#: core/templates/user/overview.html:379 core/templates/user/overview.html:418
-#: core/templates/user/overview.html:463 gym/templates/gym/list.html:45
+#: core/templates/user/overview.html:204 core/templates/user/overview.html:343
+#: core/templates/user/overview.html:382 core/templates/user/overview.html:421
+#: core/templates/user/overview.html:466 gym/templates/gym/list.html:45
#: gym/templates/gym/member_list.html:91 gym/templates/gym/member_list.html:149
#: gym/templates/gym/member_list.html:187
#: gym/templates/gym/member_list.html:223
@@ -989,109 +1012,113 @@ msgstr "kcal"
msgid "Actions"
msgstr "Akce"
-#: core/templates/user/overview.html:210
+#: core/templates/user/overview.html:213
msgid "Deactivate user"
msgstr "Deaktivovat uživatele"
-#: core/templates/user/overview.html:214
+#: core/templates/user/overview.html:217
msgid "Activate user"
msgstr "Aktivovat uživatele"
-#: core/templates/user/overview.html:223
+#: core/templates/user/overview.html:226
msgid "Reset user password"
msgstr "Reset hesla"
-#: core/templates/user/overview.html:227 gym/templates/gym/member_list.html:30
+#: core/templates/user/overview.html:230 gym/templates/gym/member_list.html:30
msgid "Roles"
msgstr "Role"
-#: core/templates/user/overview.html:243
+#: core/templates/user/overview.html:246
msgid "Password reset confirmation"
msgstr "Potvrzení obnovy hesla"
-#: core/templates/user/overview.html:247
+#: core/templates/user/overview.html:250
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:250
+#: core/templates/user/overview.html:253
#: exercises/templates/history/overview.html:106
+#: nutrition/templates/ingredient/view.html:148
+#: nutrition/templates/ingredient/view.html:160
msgid "No"
msgstr "Ne"
-#: core/templates/user/overview.html:251
+#: core/templates/user/overview.html:254
#: exercises/templates/history/overview.html:99
+#: nutrition/templates/ingredient/view.html:146
+#: nutrition/templates/ingredient/view.html:158
msgid "Yes"
msgstr "Ano"
-#: core/templates/user/overview.html:272 gym/templates/gym/member_list.html:105
+#: core/templates/user/overview.html:275 gym/templates/gym/member_list.html:105
msgid "Details"
msgstr "Podrobnosti"
-#: core/templates/user/overview.html:276 gym/views/export.py:57
-#: manager/helpers.py:89 nutrition/views/plan.py:151
-#: nutrition/views/plan.py:157
+#: core/templates/user/overview.html:279 gym/views/export.py:57
+#: manager/helpers.py:89 nutrition/views/plan.py:150
+#: nutrition/views/plan.py:156
msgid "Nr."
msgstr "Č."
-#: core/templates/user/overview.html:298 gym/models/contract.py:287
+#: core/templates/user/overview.html:301 gym/models/contract.py:287
#: gym/models/gym.py:50 gym/templates/contract/view.html:75
#: gym/templates/gym/member_list.html:112 gym/views/export.py:68
msgid "Phone"
msgstr "Telefon"
-#: core/templates/user/overview.html:302 gym/templates/contract/view.html:87
+#: core/templates/user/overview.html:305 gym/templates/contract/view.html:87
#: gym/templates/gym/member_list.html:130
msgid "Address"
msgstr "Adresa"
-#: core/templates/user/overview.html:313
+#: core/templates/user/overview.html:316
msgid "Registered"
msgstr "Registrován"
-#: core/templates/user/overview.html:317
+#: core/templates/user/overview.html:320
msgid "Last login"
msgstr "Poslední příhlášení"
-#: core/templates/user/overview.html:322
+#: core/templates/user/overview.html:325
msgid "Status"
msgstr "Stavy"
-#: core/templates/user/overview.html:325
+#: core/templates/user/overview.html:328
msgid "Active"
msgstr "Aktivní"
-#: core/templates/user/overview.html:327
+#: core/templates/user/overview.html:330
msgid "Inactive"
msgstr "Neaktivní"
-#: core/templates/user/overview.html:348 gym/templates/contract/list.html:4
+#: core/templates/user/overview.html:351 gym/templates/contract/list.html:4
#: gym/templates/gym/member_list.html:218
msgid "Contracts"
msgstr "Zakázky"
-#: core/templates/user/overview.html:426 gym/templates/document/list.html:4
+#: core/templates/user/overview.html:429 gym/templates/document/list.html:4
msgid "Documents"
msgstr "Dokumenty"
-#: core/templates/user/overview.html:433 gym/templates/document/list.html:33
+#: core/templates/user/overview.html:436 gym/templates/document/list.html:33
msgid "Download"
msgstr "Stáhnout"
-#: core/templates/user/overview.html:474 gym/views/admin_config.py:44
+#: core/templates/user/overview.html:477 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:477 gym/models/user_config.py:92
+#: core/templates/user/overview.html:480 gym/models/user_config.py:92
msgid "Include in inactive overview"
msgstr "Zahrnout v přehledu neaktivních"
-#: core/templates/user/overview.html:510
+#: core/templates/user/overview.html:513
#, python-format
msgid "Admin login is only available for users in %(gym_name)s"
msgstr "Admin přihlášení je povoleno pouze pro uživatele v %(gym_name)s"
-#: core/templates/user/overview.html:514
+#: core/templates/user/overview.html:517
msgid "Log in as this user"
msgstr "Přihlásit se jako tento uživatel"
@@ -1115,7 +1142,7 @@ msgstr "Odeslat ověřovací email"
msgid "You need to verify your email to contribute exercises"
msgstr "Abyste mohli přidávat cvičení, musíte ověřit svůj email"
-#: core/templates/user/preferences.html:55 core/views/user.py:601
+#: core/templates/user/preferences.html:55 core/views/user.py:617
msgid "Change password"
msgstr "Změna hesla"
@@ -1123,23 +1150,23 @@ msgstr "Změna hesla"
msgid "Already have an account?"
msgstr ""
-#: core/templatetags/wger_extras.py:142 i18n.tpl:38
+#: core/templatetags/wger_extras.py:142 i18n.tpl:39
msgid "kg"
msgstr "kg"
#: core/templatetags/wger_extras.py:144
-#: nutrition/templates/ingredient/view.html:60
-#: nutrition/templates/ingredient/view.html:66
-#: nutrition/templates/ingredient/view.html:73
-#: nutrition/templates/ingredient/view.html:82
-#: nutrition/templates/ingredient/view.html:89
-#: nutrition/templates/ingredient/view.html:111
-#: nutrition/templates/ingredient/view.html:121
+#: nutrition/templates/ingredient/view.html:61
+#: nutrition/templates/ingredient/view.html:67
+#: nutrition/templates/ingredient/view.html:74
+#: nutrition/templates/ingredient/view.html:83
+#: nutrition/templates/ingredient/view.html:90
+#: nutrition/templates/ingredient/view.html:112
+#: nutrition/templates/ingredient/view.html:122
msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr "g"
-#: core/templatetags/wger_extras.py:147 i18n.tpl:39
+#: core/templatetags/wger_extras.py:147 i18n.tpl:40
msgid "lb"
msgstr "lb"
@@ -1148,36 +1175,35 @@ msgctxt "weight unit, i.e. ounces"
msgid "oz"
msgstr "oz"
-#: core/views/languages.py:85 exercises/views/categories.py:122
+#: core/views/languages.py:88 exercises/views/categories.py:122
#: exercises/views/equipment.py:103 exercises/views/muscles.py:99
-#: nutrition/views/ingredient.py:120 nutrition/views/unit.py:110
+#: nutrition/views/ingredient.py:125
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
+#: core/views/languages.py:96 core/views/license.py:103
+#: core/views/repetition_units.py:114 core/views/weight_units.py:115
#: exercises/views/categories.py:128 exercises/views/muscles.py:106
#: gallery/views/images.py:124 gym/views/admin_notes.py:196
#: gym/views/document.py:206 gym/views/gym.py:481
-#: nutrition/views/ingredient.py:127 nutrition/views/unit.py:117
+#: nutrition/views/ingredient.py:132
#, python-brace-format
msgid "Delete {0}?"
msgstr "Smazat {0}?"
-#: core/views/languages.py:111 core/views/license.py:85
-#: core/views/repetition_units.py:86 core/views/user.py:464
+#: core/views/languages.py:114 core/views/license.py:85
+#: core/views/repetition_units.py:96 core/views/user.py:480
#: core/views/weight_units.py:86 exercises/views/categories.py:98
#: exercises/views/equipment.py:81 exercises/views/muscles.py:87
#: gym/views/admin_notes.py:161 gym/views/config.py:68
#: gym/views/contract.py:186 gym/views/contract_option.py:123
#: gym/views/contract_type.py:123 gym/views/document.py:171
-#: gym/views/gym.py:463 nutrition/views/ingredient.py:146
-#: nutrition/views/unit.py:143
+#: gym/views/gym.py:463 nutrition/views/ingredient.py:151
#, python-brace-format
msgid "Edit {0}"
msgstr "Upravit {0}"
-#: core/views/misc.py:74
+#: core/views/misc.py:73
msgid ""
"We have created sample workout, workout schedules, weight logs, (body) "
"weight and nutrition plan entries so you can better see what this site can "
@@ -1187,48 +1213,48 @@ msgstr ""
"hmotnosti a nutriční plán s potravinami, abyste mohli lépe poznat, jak tento "
"web může fungovat. Neváhejte je upravit, nebo je smazat!"
-#: core/views/user.py:143
+#: core/views/user.py:145
#, python-brace-format
msgid "Account \"{0}\" was successfully deleted"
msgstr "Účet \"{0}\" byl smazán"
-#: core/views/user.py:279
+#: core/views/user.py:287
msgid "You were successfully registered"
msgstr "Byl jste úspěšně zaregistrován"
-#: core/views/user.py:341
+#: core/views/user.py:357
msgid "Settings successfully updated"
msgstr "Nastavení bylo aktualizováno"
-#: core/views/user.py:380
+#: core/views/user.py:396
msgid "The user was successfully deactivated"
msgstr "Uživatel byl deaktivován"
-#: core/views/user.py:417
+#: core/views/user.py:433
msgid "The user was successfully activated"
msgstr "Uživatel byl aktivován"
-#: core/views/user.py:432
+#: core/views/user.py:448
msgid "Edit user"
msgstr "Upravit uživatele"
-#: core/views/user.py:587 gym/templates/gym/member_list.html:26
+#: core/views/user.py:603 gym/templates/gym/member_list.html:26
#: gym/views/gym.py:158
msgid "ID"
msgstr "ID"
-#: core/views/user.py:588 gym/forms.py:95 gym/templates/contract/view.html:55
+#: core/views/user.py:604 gym/forms.py:95 gym/templates/contract/view.html:55
#: gym/templates/gym/member_list.html:27 gym/views/export.py:59
#: gym/views/gym.py:158 gym/views/gym.py:217
msgid "Username"
msgstr "Uživatel"
-#: core/views/user.py:591 gym/templates/gym/new_user.html:34
+#: core/views/user.py:607 gym/templates/gym/new_user.html:34
#: gym/views/export.py:58 gym/views/gym.py:217
msgid "Gym"
msgstr "Posilovna"
-#: core/views/user.py:650
+#: core/views/user.py:678
#, python-format
msgid "A verification email was sent to %(email)s"
msgstr "Ověřovací e-mail byl zaslán na %(email)s"
@@ -1245,16 +1271,16 @@ msgstr "Alternativní jméno"
msgid "A more basic name for the muscle"
msgstr "Obecnější název svalu"
-#: exercises/models/video.py:50
+#: exercises/models/video.py:52
#, python-format
msgid "Maximum file size is %(size)sMB."
msgstr "Maximální velikost souboru je %(size)sMB."
-#: exercises/models/video.py:57 exercises/models/video.py:65
+#: exercises/models/video.py:59 exercises/models/video.py:67
msgid "File type is not supported"
msgstr "Typ souboru není podporován"
-#: exercises/models/video.py:70
+#: exercises/models/video.py:72
msgid "File is not a valid video"
msgstr "Soubor není platným videem"
@@ -1325,7 +1351,11 @@ msgstr "Smazat nářadí?"
msgid "Add muscle"
msgstr "Přidat sval"
-#: gallery/templates/images/overview.html:72
+#: gallery/forms.py:35
+msgid "If date is left empty, it will be read from the image instead"
+msgstr ""
+
+#: gallery/templates/images/overview.html:69
msgid "Add image"
msgstr "Přidat obrázek"
@@ -1392,7 +1422,7 @@ msgid "Contract type"
msgstr "Typ zakázky"
#: gym/models/contract.py:211 gym/templates/contract/view.html:59
-#: nutrition/forms.py:58
+#: nutrition/forms.py:67
msgid "Amount"
msgstr "Množství"
@@ -1572,7 +1602,7 @@ msgstr "Emaily"
msgid "Add member"
msgstr "Přidat uživatele"
-#: gym/templates/gym/new_user.html:48 nutrition/templates/rate/form.html:120
+#: gym/templates/gym/new_user.html:48 nutrition/templates/rate/form.html:121
msgid "Info"
msgstr "Info"
@@ -1745,10 +1775,6 @@ msgstr "Hrazda"
msgid "Quads"
msgstr "Čtyřhlavý sval stehenní"
-#: i18n.tpl:30
-msgid "Repetitions"
-msgstr "Opakování"
-
#: i18n.tpl:31
msgid "Resistance band"
msgstr ""
@@ -1777,198 +1803,204 @@ msgstr "Tricepsy"
msgid "Until Failure"
msgstr "Do selhání"
-#: i18n.tpl:40
+#: i18n.tpl:38
+#, fuzzy
+#| msgid "Kilometers"
+msgid "Meters"
+msgstr "Kilometry"
+
+#: i18n.tpl:41
msgid "none (bodyweight exercise)"
msgstr "žádný (cvičení s vlastní vahou)"
-#: i18n.tpl:41
+#: i18n.tpl:42
msgid "Beginner"
msgstr ""
-#: i18n.tpl:42
+#: i18n.tpl:43
#, fuzzy
#| msgctxt "As in \"content of an email\""
#| msgid "Content"
msgid "Consistent"
msgstr "Obsah"
-#: i18n.tpl:43
+#: i18n.tpl:44
msgid "Dedicated"
msgstr ""
-#: i18n.tpl:44
+#: i18n.tpl:45
msgid "Obsessed"
msgstr ""
-#: i18n.tpl:45
+#: i18n.tpl:46
msgid "Legend"
msgstr "Legenda"
-#: i18n.tpl:46
+#: i18n.tpl:47
msgid "Veteran"
msgstr ""
-#: i18n.tpl:47
+#: i18n.tpl:48
msgid "Titan"
msgstr ""
-#: i18n.tpl:48
+#: i18n.tpl:49
msgid "Unstoppable"
msgstr ""
-#: i18n.tpl:49
+#: i18n.tpl:50
msgid "Weekend Warrior"
msgstr ""
-#: i18n.tpl:50
+#: i18n.tpl:51
msgid "Elephant lifter"
msgstr ""
-#: i18n.tpl:51
+#: i18n.tpl:52
msgid "Bus lifter"
msgstr ""
-#: i18n.tpl:52
+#: i18n.tpl:53
msgid "Plane lifter"
msgstr ""
-#: i18n.tpl:53
+#: i18n.tpl:54
msgid "Blue whale lifter"
msgstr ""
-#: i18n.tpl:54
+#: i18n.tpl:55
msgid "Space Station lifter"
msgstr ""
-#: i18n.tpl:55
+#: i18n.tpl:56
msgid "Millionaire"
msgstr ""
-#: i18n.tpl:56
+#: i18n.tpl:57
msgid "Atlas"
msgstr ""
-#: i18n.tpl:57
+#: i18n.tpl:58
msgid "Early Bird"
msgstr ""
-#: i18n.tpl:58
+#: i18n.tpl:59
#, fuzzy
#| msgid "Weight log"
msgid "Night Owl"
msgstr "Záznam váhy"
-#: i18n.tpl:59
+#: i18n.tpl:60
msgid "New Year, New Me"
msgstr ""
-#: i18n.tpl:60
+#: i18n.tpl:61
msgid "Phoenix"
msgstr ""
-#: i18n.tpl:61
+#: i18n.tpl:62
#, fuzzy
#| msgid "Personal data"
msgid "Personal Record"
msgstr "Osobní data"
-#: i18n.tpl:62
+#: i18n.tpl:63
#, fuzzy
#| msgid "Copy workout"
msgid "Complete your first workout"
msgstr "Kopírovat trénink"
-#: i18n.tpl:63
+#: i18n.tpl:64
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 10 workouts"
msgstr "Ukázkový trénink"
-#: i18n.tpl:64
+#: i18n.tpl:65
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 50 workouts"
msgstr "Ukázkový trénink"
-#: i18n.tpl:65
+#: i18n.tpl:66
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 100 workouts"
msgstr "Ukázkový trénink"
-#: i18n.tpl:66
+#: i18n.tpl:67
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 200 workouts"
msgstr "Ukázkový trénink"
-#: i18n.tpl:67
+#: i18n.tpl:68
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 500 workouts"
msgstr "Ukázkový trénink"
-#: i18n.tpl:68
+#: i18n.tpl:69
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 1000 workouts"
msgstr "Ukázkový trénink"
-#: i18n.tpl:69
+#: i18n.tpl:70
msgid "Maintain a 30-day workout streak"
msgstr ""
-#: i18n.tpl:70
+#: i18n.tpl:71
msgid "Work out on Saturday and Sunday for 4 consecutive weekends"
msgstr ""
-#: i18n.tpl:71
+#: i18n.tpl:72
msgid "Lift a cumulative total of 5.000 kg"
msgstr ""
-#: i18n.tpl:72
+#: i18n.tpl:73
msgid "Lift a cumulative total of 20.000 kg"
msgstr ""
-#: i18n.tpl:73
+#: i18n.tpl:74
msgid "Lift a cumulative total of 50.000 kg"
msgstr ""
-#: i18n.tpl:74
+#: i18n.tpl:75
msgid "Lift a cumulative total of 150.000 kg"
msgstr ""
-#: i18n.tpl:75
+#: i18n.tpl:76
msgid "Lift a cumulative total of 450.000 kg"
msgstr ""
-#: i18n.tpl:76
+#: i18n.tpl:77
msgid "Lift a cumulative total of 1.000.000 kg"
msgstr ""
-#: i18n.tpl:77
+#: i18n.tpl:78
msgid "Lift a cumulative total of 10.000.000 kg"
msgstr ""
-#: i18n.tpl:78
+#: i18n.tpl:79
msgid "Complete a workout before 6:00 AM"
msgstr ""
-#: i18n.tpl:79
+#: i18n.tpl:80
msgid "Complete a workout after 9:00 PM"
msgstr ""
-#: i18n.tpl:80
+#: i18n.tpl:81
#, fuzzy
#| msgid "Workout for %s"
msgid "Work out on January 1st"
msgstr "Trénink pro %s"
-#: i18n.tpl:81
+#: i18n.tpl:82
msgid "Return to training after being inactive for 30 days"
msgstr ""
-#: i18n.tpl:82
+#: i18n.tpl:83
msgid "Achieve a new Personal Record on any exercise"
msgstr ""
@@ -2054,7 +2086,7 @@ msgstr "Cvik"
msgid "Routine will expire soon"
msgstr "Trénink bude brzy expirovat"
-#: manager/models/routine.py:153 manager/models/session.py:145
+#: manager/models/routine.py:154 manager/models/session.py:145
msgid "The start time cannot be after the end time."
msgstr "Čas začátku nemůže být po čase ukončení."
@@ -2139,23 +2171,27 @@ msgstr "Trénink"
msgid "Workout for %s"
msgstr "Trénink pro %s"
-#: nutrition/forms.py:62
+#: nutrition/extract_info/off.py:72 nutrition/extract_info/off.py:91
+msgid "Serving"
+msgstr ""
+
+#: nutrition/forms.py:71 nutrition/forms.py:208
msgid "Unit"
msgstr "Jednotka"
-#: nutrition/forms.py:170 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:179 nutrition/templates/rate/form.html:77
msgid "Basic caloric intake"
msgstr "Základní energetický příjem"
-#: nutrition/forms.py:171
+#: nutrition/forms.py:180
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:176
+#: nutrition/forms.py:185
msgid "Additional calories"
msgstr "Přidat kalorie"
-#: nutrition/forms.py:178
+#: nutrition/forms.py:187
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
@@ -2164,13 +2200,31 @@ msgstr ""
"zadejte záporné číslo)"
#: nutrition/forms.py:209
+msgid "grams (g)"
+msgstr ""
+
+#: nutrition/forms.py:219
msgid "Ingredient"
msgstr "Potravina"
-#: nutrition/forms.py:213
+#: nutrition/forms.py:223
msgid "Also search for names in English"
msgstr "Také hledat názvy v angličtině"
+#: nutrition/forms.py:239
+msgid "Quantity"
+msgstr ""
+
+#: nutrition/forms.py:241
+msgid "Enter a quantity and choose grams (g) or one of the serving units."
+msgstr ""
+
+#: nutrition/models/ingredient.py:526
+#, fuzzy
+#| msgid "Correction"
+msgid "Portion"
+msgstr "Oprava"
+
#: nutrition/templates/ingredient/email_new.tpl:1
#, python-format
msgid ""
@@ -2220,59 +2274,92 @@ msgstr ""
"registraci\n"
"email, budete o dokončení informováni."
-#: nutrition/templates/ingredient/overview.html:38
+#: nutrition/templates/ingredient/overview.html:32
+#: nutrition/templates/ingredient/overview.html:68
+#: nutrition/templates/ingredient/view.html:143
+msgid "Vegan"
+msgstr ""
+
+#: nutrition/templates/ingredient/overview.html:34
+#: nutrition/templates/ingredient/overview.html:79
+#: nutrition/templates/ingredient/view.html:155
+#, fuzzy
+#| msgid "Variations"
+msgid "Vegetarian"
+msgstr "Variace"
+
+#: nutrition/templates/ingredient/overview.html:43
msgid "No ingredients."
msgstr "Bez položek."
-#: nutrition/templates/ingredient/overview.html:49
+#: nutrition/templates/ingredient/overview.html:54
msgid "Search"
msgstr "Vyhledat"
-#: nutrition/templates/ingredient/view.html:45 nutrition/views/plan.py:237
+#: nutrition/templates/ingredient/overview.html:57
+#, fuzzy
+#| msgid "No filter"
+msgid "Filter"
+msgstr "Bez filtru"
+
+#: nutrition/templates/ingredient/overview.html:83
+msgid "Apply"
+msgstr ""
+
+#: nutrition/templates/ingredient/overview.html:85
+msgid "Reset"
+msgstr ""
+
+#: nutrition/templates/ingredient/view.html:46 nutrition/views/plan.py:236
msgid "Macronutrients"
msgstr "Makroživiny"
-#: nutrition/templates/ingredient/view.html:54
+#: nutrition/templates/ingredient/view.html:55
msgid "kJ"
msgstr "kJ"
-#: nutrition/templates/ingredient/view.html:70 nutrition/views/plan.py:267
+#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:266
msgid "Sugar content in carbohydrates"
msgstr "Cukr v sacharidech"
-#: nutrition/templates/ingredient/view.html:75
-#: nutrition/templates/ingredient/view.html:91
-#: nutrition/templates/ingredient/view.html:113
-#: nutrition/templates/ingredient/view.html:123
+#: nutrition/templates/ingredient/view.html:76
+#: nutrition/templates/ingredient/view.html:92
+#: nutrition/templates/ingredient/view.html:114
+#: nutrition/templates/ingredient/view.html:124
msgid "n.A."
msgstr "neuvedeno"
-#: nutrition/templates/ingredient/view.html:86 nutrition/views/plan.py:281
+#: nutrition/templates/ingredient/view.html:87 nutrition/views/plan.py:280
msgid "Saturated fat content in fats"
msgstr "Nasycené mastné kyseliny"
-#: nutrition/templates/ingredient/view.html:102
+#: nutrition/templates/ingredient/view.html:103
msgid "Others"
msgstr "Další"
-#: nutrition/templates/ingredient/view.html:108 nutrition/views/plan.py:287
+#: nutrition/templates/ingredient/view.html:109 nutrition/views/plan.py:286
msgid "Fiber"
msgstr ""
-#: nutrition/templates/ingredient/view.html:118 nutrition/views/plan.py:293
+#: nutrition/templates/ingredient/view.html:119 nutrition/views/plan.py:292
msgid "Sodium"
msgstr "Sodík"
-#: nutrition/templates/ingredient/view.html:143
-#: nutrition/templates/units/list.html:50 nutrition/views/unit.py:86
+#: nutrition/templates/ingredient/view.html:136
+#, fuzzy
+#| msgid "Click here for more information"
+msgid "Dietary information"
+msgstr "Klikněte zde pro více informací"
+
+#: nutrition/templates/ingredient/view.html:184
msgid "Add new weight unit"
msgstr "Přidejte novou jednotku hmostnosti"
-#: nutrition/templates/rate/form.html:25
+#: nutrition/templates/rate/form.html:26
msgid "Basal metabolic rate"
msgstr "Hodnota Bazálního metabolismu"
-#: nutrition/templates/rate/form.html:26
+#: nutrition/templates/rate/form.html:27
msgid ""
"The basal metabolic rate is the amount of energy expended daily\n"
"at rest. This is the minimum energy needed for the body to function, without "
@@ -2283,15 +2370,15 @@ msgstr ""
"klidu. Jedná se o minimum energie potřebné pro základní tělesné funkce, bez\n"
"jakékoli další fyzické aktivity."
-#: nutrition/templates/rate/form.html:37
+#: nutrition/templates/rate/form.html:38
msgid "Your basic metabolic rate is: "
msgstr "Vaše základní hodnota metabolismu je: "
-#: nutrition/templates/rate/form.html:47
+#: nutrition/templates/rate/form.html:48
msgid "Physical activities"
msgstr "Fyzická aktivita"
-#: nutrition/templates/rate/form.html:48
+#: nutrition/templates/rate/form.html:49
msgid ""
"The physical activity level (PAL) is a factor used to to express\n"
"the additional physical activity and is used to calculate the total energy\n"
@@ -2301,11 +2388,11 @@ msgstr ""
"dodatečné fyzické aktivity a používá se k výpočtu celkové energie\n"
"potřebné na den."
-#: nutrition/templates/rate/form.html:59
+#: nutrition/templates/rate/form.html:60
msgid "Factor for daily activities: "
msgstr "Faktor pro kažodenní činnosti: "
-#: nutrition/templates/rate/form.html:67
+#: nutrition/templates/rate/form.html:68
msgid ""
"The base caloric intake is the amount of calories your metabolism\n"
"needs based on your level of physical activity."
@@ -2313,11 +2400,11 @@ msgstr ""
"Základní kalorický příjem je hodnota, kterou váš metabolismus\n"
"potřebuje pro fungování těla při vaší úrovni fyzické aktivity."
-#: nutrition/templates/rate/form.html:81
+#: nutrition/templates/rate/form.html:82
msgid "Calculate basic caloric intake"
msgstr "Spočítat základní kalorický příjem"
-#: nutrition/templates/rate/form.html:88
+#: nutrition/templates/rate/form.html:89
msgid ""
"The total calories are the actual total calories per day. This\n"
"might include e.g. a surplus or deficit if you are bulking or cutting. "
@@ -2328,19 +2415,19 @@ msgstr ""
"může zahrnovat napří. přebytek, nebo deficit. Alternativně\n"
"můžete jen zadat množstv kalorií sami, pokud znáte hodnotu."
-#: nutrition/templates/rate/form.html:102
+#: nutrition/templates/rate/form.html:103
msgid "Transfer basic intake to total daily calories"
msgstr "Přenést základní příjem do celkových denních kalorii"
-#: nutrition/templates/rate/form.html:106
+#: nutrition/templates/rate/form.html:107
msgid "Add additional calories to total daily calories"
msgstr "Do celkových denních kalorii přidat další"
-#: nutrition/templates/rate/form.html:110
+#: nutrition/templates/rate/form.html:111
msgid "Save total calories to profile"
msgstr "Uložit do profilu celkové kalorie"
-#: nutrition/templates/rate/form.html:121
+#: nutrition/templates/rate/form.html:122
msgid ""
"Please note that these calculations can only be an\n"
"approximation. If you base your nutrition plan on these values, observe\n"
@@ -2350,48 +2437,48 @@ 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:158
+#: nutrition/views/ingredient.py:163
msgid "Add a new ingredient"
msgstr "Přidat novou složku"
-#: nutrition/views/plan.py:128
+#: nutrition/views/plan.py:127
msgid "Nutritional plan"
msgstr "Nutriční plán"
-#: nutrition/views/plan.py:130
+#: nutrition/views/plan.py:129
#, python-format
msgid "Nutritional plan for %s"
msgstr "Nutriční plán pro %s"
-#: nutrition/views/plan.py:202
+#: nutrition/views/plan.py:201
msgid "<i>This is an empty plan, what did you expect on the PDF?</i>"
msgstr "<i>Tento plán je prázdný. Co jste očekávali v PDF?</i>"
-#: nutrition/views/plan.py:230
+#: nutrition/views/plan.py:229
msgid "Nutritional data"
msgstr "Nutriční data"
-#: nutrition/views/plan.py:238
+#: nutrition/views/plan.py:237
msgid "Total"
msgstr "Celkem"
-#: nutrition/views/plan.py:239
+#: nutrition/views/plan.py:238
msgid "Percent of energy"
msgstr "Procent z energie"
-#: nutrition/views/plan.py:240
+#: nutrition/views/plan.py:239
msgid "g per body kg"
msgstr "g na kg tělesné váhy"
-#: nutrition/views/unit_ingredient.py:69
+#: nutrition/views/unit_ingredient.py:64
msgid "Add a new weight unit"
msgstr "Přidat novou jednotku váhy"
-#: nutrition/views/unit_ingredient.py:106
+#: nutrition/views/unit_ingredient.py:99
msgid "Edit a weight unit to ingredient connection"
msgstr "Upravit jednotku hmotnosti spojenou se složkou"
-#: nutrition/views/unit_ingredient.py:138
+#: nutrition/views/unit_ingredient.py:129
msgid "Delete?"
msgstr "Smazat?"
@@ -2786,7 +2873,7 @@ msgstr "Zdrojový kód"
msgid "Translation"
msgstr "Překlad"
-#: utils/generic_views.py:263
+#: utils/generic_views.py:246
msgid "Yes, delete"
msgstr "Ano, smazat"
@@ -2840,10 +2927,6 @@ msgstr "Zadejte nový údaj své hmotnosti"
msgid "Import weight logs"
msgstr "Iportovat záznamy váhy"
-#: weight/templates/import_csv_form.html:9
-msgid "Submit"
-msgstr "Zaslat"
-
#: weight/templates/import_csv_form.html:15
msgid ""
"Use this import field to import your weight logs into Workout\n"
@@ -2963,6 +3046,34 @@ msgstr ""
msgid "Re-Submit"
msgstr "Znovu poslat"
+#~ msgid "Email verification"
+#~ msgstr "Ověření e-mailu"
+
+#, python-format
+#~ msgid "%(username)s, your email was verified"
+#~ msgstr "%(username)s, váš email byl ověřen"
+
+#~ msgid "Error, invalid verification token"
+#~ msgstr "Chyba, chybně zadaný ověřovací token"
+
+#~ msgid "Email Confirmation"
+#~ msgstr "Konfirmační Email"
+
+#, python-format
+#~ msgid "You are almost there, %(username)s!"
+#~ msgstr "Už to skoro bude, %(username)s!"
+
+#, python-format
+#~ msgid "Please click <a href=\"%(link)s\">here</a> to confirm your email"
+#~ msgstr "Klikněte <a href=\"%(link)s\">sem</a> pro ověření vašeho e-mailu"
+
+#, python-format
+#~ msgid "The token expires on %(time)s"
+#~ msgstr "Platnost tohoto tokenu vyprší v %(time)s"
+
+#~ msgid "Ingredient weight units"
+#~ msgstr "Jednotka váhy položek"
+
#~ msgid "Image"
#~ msgstr "Obrázek"
@@ -2993,9 +3104,6 @@ msgstr "Znovu poslat"
#~ msgid "Secondary muscles"
#~ msgstr "Vedlejší svaly"
-#~ msgid "Variations"
-#~ msgstr "Variace"
-
#~ msgid "Exercise Categories"
#~ msgstr "Kategorie cviků"
@@ -4049,9 +4157,6 @@ msgstr "Znovu poslat"
#~ msgid "This content is available under the following license:"
#~ msgstr "Obsah je dostupný pod následující licencí:"
-#~ msgid "Click here for more information"
-#~ msgstr "Klikněte zde pro více informací"
-
#, fuzzy, python-format
#~| msgid ""
#~| "%(name_original)s is too similar to existing exercise "
@@ -4752,9 +4857,6 @@ msgstr "Znovu poslat"
#~ msgid "Last 12 months"
#~ msgstr "Posledních 12 měsíců"
-#~ msgid "No filter"
-#~ msgstr "Bez filtru"
-
#~ msgid "Days"
#~ msgstr "Dny"
diff --git a/wger/locale/da/LC_MESSAGES/django.po b/wger/locale/da/LC_MESSAGES/django.po
index 72da064a0..77ee13461 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: 2026-01-17 14:03+0000\n"
+"POT-Creation-Date: 2026-04-10 10:20+0000\n"
"PO-Revision-Date: 2026-03-02 19:12+0000\n"
"Last-Translator: Thomas Hansen <[email protected]>\n"
"Language-Team: Danish <https://hosted.weblate.org/projects/wger/web/da/>\n"
@@ -36,7 +36,7 @@ msgstr ""
#: config/views/gym_config.py:42 core/templates/language/view.html:64
#: core/templates/license/list.html:17
#: core/templates/repetition_unit/list.html:18
-#: core/templates/user/overview.html:204 core/templates/user/overview.html:467
+#: core/templates/user/overview.html:207 core/templates/user/overview.html:470
#: core/templates/weight_unit/list.html:18
#: exercises/templates/categories/admin-overview.html:17
#: exercises/templates/equipment/admin-overview.html:17
@@ -48,30 +48,29 @@ msgstr ""
#: gym/templates/gym/list.html:19 gym/templates/gym/list.html:48
#: gym/templates/gym/member_list.html:94 gym/templates/gym/member_list.html:152
#: gym/templates/gym/member_list.html:190
-#: nutrition/templates/ingredient/view.html:164
-#: nutrition/templates/ingredient/view.html:209
-#: nutrition/templates/units/list.html:19
+#: nutrition/templates/ingredient/view.html:205
+#: nutrition/templates/ingredient/view.html:248
msgid "Edit"
msgstr "Rediger"
-#: core/forms.py:91 core/templates/navigation.html:271
-#: core/templates/navigation.html:278 core/templates/user/login.html:4
+#: core/forms.py:89 core/templates/navigation.html:268
+#: core/templates/navigation.html:275 core/templates/user/login.html:4
#: core/templates/user/registration_sidebar.html:12
#: software/templates/features.html:82 software/templates/features.html:448
msgid "Login"
msgstr "Login"
-#: core/forms.py:130 core/forms.py:244 gym/views/export.py:61
+#: core/forms.py:128 core/forms.py:242 gym/views/export.py:61
#: gym/views/gym.py:217
msgid "First name"
msgstr "Fornavn"
-#: core/forms.py:131 core/forms.py:245 core/templates/user/overview.html:284
+#: core/forms.py:129 core/forms.py:243 core/templates/user/overview.html:287
#: gym/views/export.py:62 gym/views/gym.py:217
msgid "Last name"
msgstr "Efternavn"
-#: core/forms.py:133 core/forms.py:210 core/templates/user/overview.html:288
+#: core/forms.py:131 core/forms.py:208 core/templates/user/overview.html:291
#: gym/models/contract.py:256 gym/models/gym.py:58
#: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:116
#: gym/templates/gym/new_user.html:30 gym/views/export.py:60
@@ -81,53 +80,53 @@ msgstr "Efternavn"
msgid "Email"
msgstr "Email"
-#: core/forms.py:134
+#: core/forms.py:132
msgid "Used for password resets and, optionally, e-mail reminders."
msgstr "Bruges til nulstilling af adgangskode og, valgfrit, e-mailpåmindelser."
-#: core/forms.py:138 core/models/profile.py:222
+#: core/forms.py:136 core/models/profile.py:222
#: gym/templates/gym/new_user.html:38
msgid "Date of Birth"
msgstr "Fødselsdag"
-#: core/forms.py:177
+#: core/forms.py:175
msgid "Personal data"
msgstr "Personlige oplysninger"
-#: core/forms.py:189
+#: core/forms.py:187
msgid "Workout reminders"
msgstr "Træningspåmindelser"
-#: core/forms.py:196
+#: core/forms.py:194
msgid "Other settings"
msgstr "Andre indstillinger"
-#: core/forms.py:204 core/views/user.py:614 core/views/user.py:629
-#: core/views/user.py:641 gym/forms.py:73 utils/generic_views.py:143
+#: core/forms.py:202 core/views/user.py:630 core/views/user.py:654
+#: core/views/user.py:668 gym/forms.py:73 utils/generic_views.py:137
msgid "Save"
msgstr "Gem"
-#: core/forms.py:211
+#: core/forms.py:209
msgid "Used for password resets and, optionally, email reminders."
msgstr "Bruges til kode-nulstilling og, hvis ønsket, email-påmindelser."
-#: core/forms.py:240
+#: core/forms.py:238
msgid "This e-mail address is already in use."
msgstr "Denne emailadresse er allerede i brug."
-#: core/forms.py:261 gym/templates/gym/new_user.html:26
+#: core/forms.py:259 gym/templates/gym/new_user.html:26
#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:217
msgid "Password"
msgstr "Kodeord"
-#: core/forms.py:263
+#: core/forms.py:261
msgid "Please enter your current password."
msgstr "Indtast venligst dit nuværende kodeord."
-#: core/forms.py:272 core/templates/language/view.html:70
+#: core/forms.py:270 core/templates/language/view.html:70
#: core/templates/license/list.html:21
#: core/templates/repetition_unit/list.html:22
-#: core/templates/user/overview.html:233
+#: core/templates/user/overview.html:236
#: core/templates/weight_unit/list.html:22
#: exercises/templates/categories/admin-overview.html:21
#: exercises/templates/equipment/admin-overview.html:21
@@ -135,27 +134,30 @@ msgstr "Indtast venligst dit nuværende kodeord."
#: gym/templates/admin_notes/list.html:37
#: gym/templates/contract_option/list.html:35
#: gym/templates/contract_type/list.html:36 gym/templates/document/list.html:46
-#: gym/templates/gym/list.html:23 nutrition/templates/ingredient/view.html:168
-#: nutrition/templates/ingredient/view.html:215
-#: nutrition/templates/units/list.html:25
+#: gym/templates/gym/list.html:23 nutrition/templates/ingredient/view.html:209
+#: nutrition/templates/ingredient/view.html:254
msgid "Delete"
msgstr "Slet"
-#: core/forms.py:281
+#: core/forms.py:279
msgid "Invalid password"
msgstr "Ukorrekt kodeord"
-#: core/forms.py:293
+#: core/forms.py:291 core/forms.py:349
msgid "The form is secured with reCAPTCHA"
msgstr "Denne formular er sikret med reCAPTCHA"
-#: core/forms.py:314 core/forms.py:341 core/templates/navigation.html:272
-#: core/templates/navigation.html:285 core/templates/template.html:123
-#: core/templates/user/login.html:21 core/views/user.py:285
+#: core/forms.py:312 core/forms.py:339 core/templates/navigation.html:269
+#: core/templates/navigation.html:282 core/templates/template.html:113
+#: core/templates/user/login.html:21 core/views/user.py:293
#: software/templates/features.html:87 software/templates/features.html:442
msgid "Register"
msgstr "Registrer"
+#: core/forms.py:360 weight/templates/import_csv_form.html:9
+msgid "Submit"
+msgstr "Indsend"
+
#: core/models/language.py:31 core/templates/language/view.html:21
msgid "Language short name"
msgstr "Sprogets korte navn"
@@ -192,36 +194,36 @@ msgstr "Link"
msgid "Link to license text or other information"
msgstr "Link til licenstekst eller anden information"
-#: core/models/profile.py:57
+#: core/models/profile.py:60
#, python-format
msgid "%(birthdate)s is not a valid birthdate"
msgstr "%(birthdate)s er ikke en korrekt fødselsdato"
-#: core/models/profile.py:66
+#: core/models/profile.py:69
msgid "Male"
msgstr "Mand"
-#: core/models/profile.py:67
+#: core/models/profile.py:70
msgid "Female"
msgstr "Kvinde"
-#: core/models/profile.py:74
+#: core/models/profile.py:77
msgid "Low"
msgstr "Lav"
-#: core/models/profile.py:75
+#: core/models/profile.py:78
msgid "Medium"
msgstr "Mellem"
-#: core/models/profile.py:76
+#: core/models/profile.py:79
msgid "High"
msgstr "Høj"
-#: core/models/profile.py:82
+#: core/models/profile.py:85
msgid "Metric (kilogram)"
msgstr "Metrisk (kilogram)"
-#: core/models/profile.py:83
+#: core/models/profile.py:86
msgid "Imperial (pound)"
msgstr "Engelsk (pund)"
@@ -342,7 +344,7 @@ msgstr "Timer i gennemsnit per uge"
msgid "Free time"
msgstr "Fritid"
-#: core/models/profile.py:320 nutrition/templates/rate/form.html:66
+#: core/models/profile.py:320 nutrition/templates/rate/form.html:67
msgid "Total daily calories"
msgstr "Total daglige kalorier"
@@ -383,20 +385,45 @@ msgstr ""
msgid "Enable or disable the trophy system for this user"
msgstr ""
-#: core/models/profile.py:446
+#: core/models/profile.py:457
msgid "The sum of all hours has to be 24"
msgstr "Summen af alle timer skal være 24"
-#: core/models/rep_unit.py:36 core/models/weight_unit.py:42
-#: core/templates/user/overview.html:280 core/views/user.py:589
+#: core/models/rep_unit.py:32 i18n.tpl:30
+msgid "Repetitions"
+msgstr "Repetitioner"
+
+#: core/models/rep_unit.py:33 core/templates/user/overview.html:82
+#: exercises/templates/history/overview.html:30
+msgid "Time"
+msgstr "Tid"
+
+#: core/models/rep_unit.py:34
+#, fuzzy
+#| msgid "Resistance band"
+msgid "Distance"
+msgstr "Elastik"
+
+#: core/models/rep_unit.py:47 core/models/weight_unit.py:42
+#: core/templates/user/overview.html:283 core/views/user.py:605
#: exercises/models/muscle.py:36 gym/models/contract.py:52
#: gym/models/contract.py:103 gym/models/gym.py:46
#: gym/models/user_document.py:84 gym/templates/contract/view.html:50
#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:108
-#: gym/views/gym.py:158 nutrition/templates/ingredient/view.html:151
+#: gym/views/gym.py:158 nutrition/templates/ingredient/view.html:192
msgid "Name"
msgstr "Navn"
+#: core/models/rep_unit.py:53
+#, fuzzy
+#| msgid "Unit"
+msgid "Unit Type"
+msgstr "Enhed"
+
+#: core/models/rep_unit.py:54
+msgid "The type of unit (repetitions, time, or distance)"
+msgstr ""
+
#: core/templates/403.html:4
msgid "Forbidden!"
msgstr "Forbudt!"
@@ -428,6 +455,55 @@ msgstr ""
"tidspunkt. Hvis problemet fortsætter, kan du søge hjælp på nedenstående "
"måder:"
+#: core/templates/account/email/email_confirmation_message.html:81
+msgid "Almost there!"
+msgstr ""
+
+#: core/templates/account/email/email_confirmation_message.html:85
+#, fuzzy, python-format
+#| msgid ""
+#| "You're receiving this e-mail because you requested a password reset for "
+#| "your user account at %(site_name)s."
+msgid ""
+"You're receiving this email because the user \"%(user_display)s\" has given "
+"your email address to register an account on %(site_domain)s."
+msgstr ""
+"Du modtager denne email fordi du anmodede om at nulstille dit kodeord for "
+"din bruger på %(site_name)s."
+
+#: core/templates/account/email/email_confirmation_message.html:93
+msgid ""
+"Your email verification code is listed below. Please enter it in your open "
+"browser window."
+msgstr ""
+
+#: core/templates/account/email/email_confirmation_message.html:100
+#, fuzzy
+#| msgid "Please click the following link to confirm your email: %(link)s"
+msgid "Please click the button below to confirm your email address."
+msgstr "Klik venligst følgende link for at bekræfte din email: %(link)s"
+
+#: core/templates/account/email/email_confirmation_message.html:106
+#, fuzzy
+#| msgid "Unverified email"
+msgid "Confirm email"
+msgstr "Email ikke bekræftet"
+
+#: core/templates/account/email/email_confirmation_message.html:110
+#, python-format
+msgid ""
+"The link is valid for %(expire_hours)s hours (until %(date)s, %(time)s). You "
+"can request a new one from your profile settings."
+msgstr ""
+
+#: core/templates/account/email/email_confirmation_message.html:116
+msgid "If the button doesn't work, copy and paste this link into your browser:"
+msgstr ""
+
+#: core/templates/account/email/email_confirmation_message.html:125
+msgid "the wger Team"
+msgstr "wger Holdet"
+
#: core/templates/base.html:10
#, python-format
msgid ""
@@ -460,53 +536,7 @@ msgstr ""
msgid "Are you sure you want to delete this? This action cannot be undone."
msgstr "Er du sikker på at du vil slette dette? Handlingen kan ikke fortrydes."
-#: core/templates/email_verification/confirm_template.html:4
-#, fuzzy
-#| msgid "Email verified"
-msgid "Email verification"
-msgstr "Email bekræftet"
-
-#: core/templates/email_verification/confirm_template.html:18
-#, python-format
-msgid "%(username)s, your email was verified"
-msgstr "%(username)s, din email blev bekræftet"
-
-#: core/templates/email_verification/confirm_template.html:22
-msgid "Error, invalid verification token"
-msgstr "Fejl, ugyldigt verifikationstoken"
-
-#: core/templates/email_verification/email_body_html.tpl:6
-msgid "Email Confirmation"
-msgstr "Email 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 "Du er der næsten, %(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 "Klik venligst <a href=\"%(link)s\">here</a> for at bekræfte din email"
-
-#: 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 "Dette token udløber om %(time)s"
-
-#: core/templates/email_verification/email_body_html.tpl:14
-#: core/templates/email_verification/email_body_txt.tpl:8
-msgid "the wger Team"
-msgstr "wger Holdet"
-
-#: core/templates/email_verification/email_body_txt.tpl:4
-#, python-format
-msgid "Please click the following link to confirm your email: %(link)s"
-msgstr "Klik venligst følgende link for at bekræfte din email: %(link)s"
-
-#: core/templates/language/overview.html:4 core/templates/navigation.html:344
+#: core/templates/language/overview.html:4 core/templates/navigation.html:341
msgid "Languages"
msgstr "Sprog"
@@ -515,16 +545,16 @@ msgid "Nothing found."
msgstr "Intet fundet."
#: core/templates/language/overview.html:22
-#: nutrition/templates/ingredient/overview.html:38
+#: nutrition/templates/ingredient/overview.html:43
msgid "Add one now."
msgstr "Tilføj en ny."
#: core/templates/language/overview.html:34 core/templates/license/list.html:43
-#: core/templates/repetition_unit/list.html:46
-#: core/templates/user/overview.html:344 core/templates/user/overview.html:384
-#: core/templates/user/overview.html:422
-#: core/templates/weight_unit/list.html:46 core/views/languages.py:74
-#: core/views/license.py:66 core/views/repetition_units.py:66
+#: core/templates/repetition_unit/list.html:44
+#: core/templates/user/overview.html:347 core/templates/user/overview.html:387
+#: core/templates/user/overview.html:425
+#: core/templates/weight_unit/list.html:46 core/views/languages.py:77
+#: core/views/license.py:66 core/views/repetition_units.py:76
#: core/views/weight_units.py:66
#: exercises/templates/categories/admin-overview.html:40
#: exercises/templates/equipment/admin-overview.html:39
@@ -537,14 +567,14 @@ msgstr "Tilføj en ny."
#: gym/templates/gym/member_list.html:264
#: gym/templates/gym/member_list.html:303
#: mailer/templates/mailer/gym/overview.html:43
-#: nutrition/templates/ingredient/overview.html:60
+#: nutrition/templates/ingredient/overview.html:97
msgid "Add"
msgstr "Tilføj"
#: core/templates/language/view.html:61 core/templates/user/api_key.html:41
#: core/templates/user/preferences.html:50 gym/models/contract.py:203
#: gym/templates/contract/view.html:41 gym/templates/gym/member_list.html:270
-#: nutrition/templates/ingredient/view.html:206
+#: nutrition/templates/ingredient/view.html:245
msgid "Options"
msgstr "Indstillinger"
@@ -554,9 +584,9 @@ msgstr "Licens liste"
#: core/templates/license/list.html:30
#: core/templates/repetition_unit/list.html:32
-#: core/templates/user/overview.html:104 core/templates/user/overview.html:136
-#: core/templates/user/overview.html:185 core/templates/user/overview.html:365
-#: core/templates/user/overview.html:404 core/templates/user/overview.html:448
+#: core/templates/user/overview.html:107 core/templates/user/overview.html:139
+#: core/templates/user/overview.html:188 core/templates/user/overview.html:368
+#: core/templates/user/overview.html:407 core/templates/user/overview.html:451
#: core/templates/weight_unit/list.html:32
#: exercises/templates/categories/admin-overview.html:30
#: exercises/templates/equipment/admin-overview.html:30
@@ -568,11 +598,10 @@ msgstr "Licens liste"
#: gym/templates/gym/member_list.html:284
#: gym/templates/gym/member_list.html:321
#: mailer/templates/mailer/gym/overview.html:30
-#: nutrition/templates/units/list.html:34
msgid "Nothing found"
msgstr "Ingenting fundet"
-#: core/templates/misc/about.html:4 core/templates/template.html:160
+#: core/templates/misc/about.html:4 core/templates/template.html:150
msgid "Imprint"
msgstr "Aftryk"
@@ -580,164 +609,159 @@ msgstr "Aftryk"
msgid "Training"
msgstr "Træning"
-#: core/templates/navigation.html:37 core/templates/user/overview.html:25
+#: core/templates/navigation.html:36 core/templates/user/overview.html:28
#, fuzzy
msgid "Routines"
msgstr "Rutiner"
-#: core/templates/navigation.html:45 core/templates/user/overview.html:70
+#: core/templates/navigation.html:44 core/templates/user/overview.html:73
msgid "Calendar"
msgstr "Kaldender"
-#: core/templates/navigation.html:55
+#: core/templates/navigation.html:53
msgid "Measurements"
msgstr "Målinger"
-#: core/templates/navigation.html:66 gallery/templates/images/overview.html:6
+#: core/templates/navigation.html:64 gallery/templates/images/overview.html:6
msgid "Gallery"
msgstr "Galleri"
-#: core/templates/navigation.html:72
+#: core/templates/navigation.html:74 core/templates/navigation.html:400
+#: trophies/templates/trophies/overview.html:7
+msgid "Trophies"
+msgstr ""
+
+#: core/templates/navigation.html:79
msgid "Workout templates"
msgstr "Træningsskabeloner"
-#: core/templates/navigation.html:79
+#: core/templates/navigation.html:86
msgid "Your templates"
msgstr "Dine skabeloner"
-#: core/templates/navigation.html:88
+#: core/templates/navigation.html:95
msgid "Public templates"
msgstr "Offentlige skabeloner"
-#: core/templates/navigation.html:96 software/templates/features.html:51
+#: core/templates/navigation.html:103 software/templates/features.html:51
#: software/templates/features.html:480
msgid "Exercises"
msgstr "Øvelser"
-#: core/templates/navigation.html:102 core/templates/navigation.html:176
-#: core/templates/navigation.html:339
+#: core/templates/navigation.html:109 core/templates/navigation.html:336
msgid "Administration"
msgstr "Administration"
-#: core/templates/navigation.html:106
+#: core/templates/navigation.html:113
msgid "Exercise edit history"
msgstr "Øvelsesredigeringshistorik"
-#: core/templates/navigation.html:112
+#: core/templates/navigation.html:119
msgid "Equipment"
msgstr "Udstyr"
-#: core/templates/navigation.html:118
+#: core/templates/navigation.html:125
msgid "Muscles"
msgstr "Muskler"
-#: core/templates/navigation.html:124
+#: core/templates/navigation.html:131
#: exercises/templates/categories/admin-overview.html:4
msgid "Categories"
msgstr "Kategorier"
-#: core/templates/navigation.html:139 software/templates/features.html:468
+#: core/templates/navigation.html:146 software/templates/features.html:468
msgid "Nutrition"
msgstr "Ernæring"
-#: core/templates/navigation.html:147 core/templates/user/overview.html:144
+#: core/templates/navigation.html:154 core/templates/user/overview.html:147
msgid "Nutrition plans"
msgstr "Ernæringsplaner"
-#: core/templates/navigation.html:156
+#: core/templates/navigation.html:163
msgid "BMI calculator"
msgstr "BMI lommeregner"
-#: core/templates/navigation.html:165 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:172 nutrition/templates/rate/form.html:18
msgid "Daily calories calculator"
msgstr "Daglige kalorier lommeregner"
-#: core/templates/navigation.html:171
+#: core/templates/navigation.html:178
#: nutrition/templates/ingredient/overview.html:10
msgid "Ingredient overview"
msgstr "Ingrediensoversigt"
-#: core/templates/navigation.html:180 nutrition/templates/units/list.html:6
-msgid "Ingredient weight units"
-msgstr "Ingrediens vægtenheder"
-
-#: core/templates/navigation.html:196 software/templates/features.html:463
+#: core/templates/navigation.html:193 software/templates/features.html:463
msgid "Body weight"
msgstr "Kropsvægt"
-#: core/templates/navigation.html:203 core/templates/user/overview.html:114
+#: core/templates/navigation.html:200 core/templates/user/overview.html:117
msgid "Weight overview"
msgstr "Vægt oversigt"
-#: core/templates/navigation.html:217
+#: core/templates/navigation.html:214
msgid "About this software"
msgstr "Om denne software"
-#: core/templates/navigation.html:223 software/templates/about_us.html:5
+#: core/templates/navigation.html:220 software/templates/about_us.html:5
#, fuzzy
msgid "Support & Get Involved"
msgstr "Støt & bidrag til fællesskabet"
-#: core/templates/navigation.html:229 software/templates/features.html:528
+#: core/templates/navigation.html:226 software/templates/features.html:528
msgid "REST API"
msgstr "REST API"
-#: core/templates/navigation.html:235 utils/models.py:45
+#: core/templates/navigation.html:232 utils/models.py:45
msgid "License"
msgstr "Licens"
-#: core/templates/navigation.html:241
+#: core/templates/navigation.html:238
msgid "Developer documentation"
msgstr "Udviklerdokumentation"
-#: core/templates/navigation.html:248
+#: core/templates/navigation.html:245
msgid "Get the code"
msgstr "Hent koden"
-#: core/templates/navigation.html:255 core/templates/template.html:199
-#: software/templates/features.html:603
+#: core/templates/navigation.html:252 core/templates/template.html:202
+#: software/templates/features.html:614
msgid "Translate"
msgstr "Oversæt"
-#: core/templates/navigation.html:292 core/templates/user/login.html:30
+#: core/templates/navigation.html:289 core/templates/user/login.html:30
msgid "Reset password"
msgstr "Nulstil kodeord"
-#: core/templates/navigation.html:301 core/templates/navigation.html:329
+#: core/templates/navigation.html:298 core/templates/navigation.html:326
msgid "Logout"
msgstr "Log ud"
-#: core/templates/navigation.html:320
+#: core/templates/navigation.html:317
msgid "My preferences"
msgstr "Mine indstillinger"
-#: core/templates/navigation.html:352
+#: core/templates/navigation.html:349
msgid "Licenses"
msgstr "Licenser"
-#: core/templates/navigation.html:360
+#: core/templates/navigation.html:357
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr "Gentagelsesenheder"
-#: core/templates/navigation.html:368 core/templates/weight_unit/list.html:4
-#: nutrition/templates/ingredient/view.html:141
+#: core/templates/navigation.html:365 core/templates/weight_unit/list.html:4
+#: nutrition/templates/ingredient/view.html:182
msgid "Weight units"
msgstr "Vægtenheder"
-#: core/templates/navigation.html:376 core/templates/user/list.html:4
+#: core/templates/navigation.html:373 core/templates/user/list.html:4
msgid "User list"
msgstr "Brugerliste"
-#: core/templates/navigation.html:382
+#: core/templates/navigation.html:379
msgid "Gyms"
msgstr "Fitnescentre"
-#: core/templates/navigation.html:403
-#: trophies/templates/trophies/overview.html:7
-msgid "Trophies"
-msgstr ""
-
#: core/templates/registration/password_reset_complete.html:4
msgid "Password reset complete"
msgstr "Kodeordsnulstilling udført"
@@ -797,26 +821,30 @@ msgstr "forrige"
msgid "next"
msgstr "næste"
-#: core/templates/template.html:96
+#: core/templates/template.html:86
msgid "Close"
msgstr "Luk"
-#: core/templates/template.html:112
+#: core/templates/template.html:102
msgid ""
"You are using a guest account, data entered will be deleted after a week."
msgstr ""
"Du bruger en gæstekonto, date indtastet vil blive slettet efter en uge."
-#: core/templates/template.html:117
+#: core/templates/template.html:107
msgid "Create some demo entries"
msgstr "Indtast nogle demo-poster"
-#: core/templates/template.html:165 software/templates/features.html:568
+#: core/templates/template.html:155 software/templates/features.html:568
#: software/templates/tos.html:7
msgid "Terms of service"
msgstr "Vilkår for brug"
-#: core/templates/template_features.html:53 software/templates/features.html:9
+#: core/templates/template.html:181 software/templates/features.html:595
+msgid "Browser language"
+msgstr ""
+
+#: core/templates/template_features.html:46 software/templates/features.html:9
msgid "Features"
msgstr "Funktioner"
@@ -875,99 +903,94 @@ msgstr "Ingen konto?"
msgid "Forgot password?"
msgstr "Glemt kodeord?"
-#: core/templates/user/overview.html:25 core/templates/user/overview.html:68
-#: core/templates/user/overview.html:112 core/templates/user/overview.html:144
-#: core/templates/user/overview.html:348 core/templates/user/overview.html:390
-#: core/templates/user/overview.html:426
+#: core/templates/user/overview.html:28 core/templates/user/overview.html:71
+#: core/templates/user/overview.html:115 core/templates/user/overview.html:147
+#: core/templates/user/overview.html:351 core/templates/user/overview.html:393
+#: core/templates/user/overview.html:429
#, python-format
msgid "last %(number)s"
msgstr "sidste %(number)s"
-#: core/templates/user/overview.html:27 core/templates/user/overview.html:146
-#: core/templates/user/overview.html:343 core/templates/user/overview.html:382
-#: core/templates/user/overview.html:421 gym/templates/gym/member_list.html:226
+#: core/templates/user/overview.html:30 core/templates/user/overview.html:149
+#: core/templates/user/overview.html:346 core/templates/user/overview.html:385
+#: core/templates/user/overview.html:424 gym/templates/gym/member_list.html:226
#: gym/templates/gym/member_list.html:262
#: gym/templates/gym/member_list.html:302
msgid "Overview"
msgstr "Oversigt"
-#: core/templates/user/overview.html:34 core/templates/user/overview.html:76
-#: core/templates/user/overview.html:120 core/templates/user/overview.html:152
+#: core/templates/user/overview.html:37 core/templates/user/overview.html:79
+#: core/templates/user/overview.html:123 core/templates/user/overview.html:155
#: manager/helpers.py:88 software/templates/about_us.html:170
#: weight/templates/import_csv_preview.html:13
#: weight/templates/import_csv_preview.html:42 weight/views.py:54
msgid "Date"
msgstr "Dato"
-#: core/templates/user/overview.html:35 core/templates/user/overview.html:153
+#: core/templates/user/overview.html:38 core/templates/user/overview.html:156
#: gym/models/contract.py:58 gym/models/contract.py:109
msgid "Description"
msgstr "Beskrivelse"
-#: core/templates/user/overview.html:36
+#: core/templates/user/overview.html:39
msgid "Number of logs (days)"
msgstr "Antal logs (dage)"
-#: core/templates/user/overview.html:37 core/views/user.py:590
+#: core/templates/user/overview.html:40 core/views/user.py:606
#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:158
msgid "Last activity"
msgstr "Sidste aktivitet"
-#: core/templates/user/overview.html:58
+#: core/templates/user/overview.html:61
msgid "No workouts found."
msgstr "Ingen træninger fundet."
-#: core/templates/user/overview.html:68
+#: core/templates/user/overview.html:71
msgid "Log"
msgstr "Log"
-#: core/templates/user/overview.html:77
+#: core/templates/user/overview.html:80
msgid "General impression"
msgstr "Generelt indtryk"
-#: core/templates/user/overview.html:78 core/templates/user/overview.html:390
+#: core/templates/user/overview.html:81 core/templates/user/overview.html:393
msgid "Notes"
msgstr "Noter"
-#: core/templates/user/overview.html:79
-#: exercises/templates/history/overview.html:30
-msgid "Time"
-msgstr "Tid"
-
-#: core/templates/user/overview.html:112 core/templates/user/overview.html:121
+#: core/templates/user/overview.html:115 core/templates/user/overview.html:124
#: manager/helpers.py:89 weight/templates/import_csv_preview.html:14
#: weight/templates/import_csv_preview.html:43 weight/views.py:54
msgid "Weight"
msgstr "Vægt"
-#: core/templates/user/overview.html:154
-#: nutrition/templates/ingredient/view.html:51 nutrition/views/plan.py:245
+#: core/templates/user/overview.html:157
+#: nutrition/templates/ingredient/view.html:52 nutrition/views/plan.py:244
msgid "Energy"
msgstr "Energi"
-#: core/templates/user/overview.html:155
-#: nutrition/templates/ingredient/view.html:58 nutrition/views/plan.py:251
+#: core/templates/user/overview.html:158
+#: nutrition/templates/ingredient/view.html:59 nutrition/views/plan.py:250
msgid "Protein"
msgstr "Protein"
-#: core/templates/user/overview.html:156
-#: nutrition/templates/ingredient/view.html:64 nutrition/views/plan.py:259
+#: core/templates/user/overview.html:159
+#: nutrition/templates/ingredient/view.html:65 nutrition/views/plan.py:258
msgid "Carbohydrates"
msgstr "Kulhydrater"
-#: core/templates/user/overview.html:157
-#: nutrition/templates/ingredient/view.html:80 nutrition/views/plan.py:273
+#: core/templates/user/overview.html:160
+#: nutrition/templates/ingredient/view.html:81 nutrition/views/plan.py:272
msgid "Fat"
msgstr "Fedt"
-#: core/templates/user/overview.html:170
-#: nutrition/templates/ingredient/view.html:53
+#: core/templates/user/overview.html:173
+#: nutrition/templates/ingredient/view.html:54
msgid "kcal"
msgstr "kcal"
-#: core/templates/user/overview.html:201 core/templates/user/overview.html:340
-#: core/templates/user/overview.html:379 core/templates/user/overview.html:418
-#: core/templates/user/overview.html:463 gym/templates/gym/list.html:45
+#: core/templates/user/overview.html:204 core/templates/user/overview.html:343
+#: core/templates/user/overview.html:382 core/templates/user/overview.html:421
+#: core/templates/user/overview.html:466 gym/templates/gym/list.html:45
#: gym/templates/gym/member_list.html:91 gym/templates/gym/member_list.html:149
#: gym/templates/gym/member_list.html:187
#: gym/templates/gym/member_list.html:223
@@ -976,109 +999,113 @@ msgstr "kcal"
msgid "Actions"
msgstr "Handlinger"
-#: core/templates/user/overview.html:210
+#: core/templates/user/overview.html:213
msgid "Deactivate user"
msgstr "Deaktiver bruger"
-#: core/templates/user/overview.html:214
+#: core/templates/user/overview.html:217
msgid "Activate user"
msgstr "Aktiver bruger"
-#: core/templates/user/overview.html:223
+#: core/templates/user/overview.html:226
msgid "Reset user password"
msgstr "Nulstil brugerens kodeord"
-#: core/templates/user/overview.html:227 gym/templates/gym/member_list.html:30
+#: core/templates/user/overview.html:230 gym/templates/gym/member_list.html:30
msgid "Roles"
msgstr "Roller"
-#: core/templates/user/overview.html:243
+#: core/templates/user/overview.html:246
msgid "Password reset confirmation"
msgstr "Bekræft nulstilling af kodeord"
-#: core/templates/user/overview.html:247
+#: core/templates/user/overview.html:250
msgid "Do you really want to change this user&#39;s password?"
msgstr "Vil du virkelig ændre denne brugers kodeord?"
-#: core/templates/user/overview.html:250
+#: core/templates/user/overview.html:253
#: exercises/templates/history/overview.html:106
+#: nutrition/templates/ingredient/view.html:148
+#: nutrition/templates/ingredient/view.html:160
msgid "No"
msgstr "Nej"
-#: core/templates/user/overview.html:251
+#: core/templates/user/overview.html:254
#: exercises/templates/history/overview.html:99
+#: nutrition/templates/ingredient/view.html:146
+#: nutrition/templates/ingredient/view.html:158
msgid "Yes"
msgstr "Ja"
-#: core/templates/user/overview.html:272 gym/templates/gym/member_list.html:105
+#: core/templates/user/overview.html:275 gym/templates/gym/member_list.html:105
msgid "Details"
msgstr "Detaljer"
-#: core/templates/user/overview.html:276 gym/views/export.py:57
-#: manager/helpers.py:89 nutrition/views/plan.py:151
-#: nutrition/views/plan.py:157
+#: core/templates/user/overview.html:279 gym/views/export.py:57
+#: manager/helpers.py:89 nutrition/views/plan.py:150
+#: nutrition/views/plan.py:156
msgid "Nr."
msgstr "Nr."
-#: core/templates/user/overview.html:298 gym/models/contract.py:287
+#: core/templates/user/overview.html:301 gym/models/contract.py:287
#: gym/models/gym.py:50 gym/templates/contract/view.html:75
#: gym/templates/gym/member_list.html:112 gym/views/export.py:68
msgid "Phone"
msgstr "Telefon"
-#: core/templates/user/overview.html:302 gym/templates/contract/view.html:87
+#: core/templates/user/overview.html:305 gym/templates/contract/view.html:87
#: gym/templates/gym/member_list.html:130
msgid "Address"
msgstr "Adresse"
-#: core/templates/user/overview.html:313
+#: core/templates/user/overview.html:316
msgid "Registered"
msgstr "Registreret"
-#: core/templates/user/overview.html:317
+#: core/templates/user/overview.html:320
msgid "Last login"
msgstr "Sidste login"
-#: core/templates/user/overview.html:322
+#: core/templates/user/overview.html:325
msgid "Status"
msgstr "Status"
-#: core/templates/user/overview.html:325
+#: core/templates/user/overview.html:328
msgid "Active"
msgstr "Aktiv"
-#: core/templates/user/overview.html:327
+#: core/templates/user/overview.html:330
msgid "Inactive"
msgstr "Inaktiv"
-#: core/templates/user/overview.html:348 gym/templates/contract/list.html:4
+#: core/templates/user/overview.html:351 gym/templates/contract/list.html:4
#: gym/templates/gym/member_list.html:218
msgid "Contracts"
msgstr "Kontrakter"
-#: core/templates/user/overview.html:426 gym/templates/document/list.html:4
+#: core/templates/user/overview.html:429 gym/templates/document/list.html:4
msgid "Documents"
msgstr "Dokumenter"
-#: core/templates/user/overview.html:433 gym/templates/document/list.html:33
+#: core/templates/user/overview.html:436 gym/templates/document/list.html:33
msgid "Download"
msgstr "Hent"
-#: core/templates/user/overview.html:474 gym/views/admin_config.py:44
+#: core/templates/user/overview.html:477 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:477 gym/models/user_config.py:92
+#: core/templates/user/overview.html:480 gym/models/user_config.py:92
msgid "Include in inactive overview"
msgstr "Inkluder i inaktiv oversigt"
-#: core/templates/user/overview.html:510
+#: core/templates/user/overview.html:513
#, python-format
msgid "Admin login is only available for users in %(gym_name)s"
msgstr "Administratorlogin er kun tilgængeligt for brugere i %(gym_name)s"
-#: core/templates/user/overview.html:514
+#: core/templates/user/overview.html:517
msgid "Log in as this user"
msgstr "Log ind som bruger"
@@ -1102,7 +1129,7 @@ msgstr "Send bekræftelsesemail"
msgid "You need to verify your email to contribute exercises"
msgstr "Du skal bekræfte din email for at tilføje øvelser"
-#: core/templates/user/preferences.html:55 core/views/user.py:601
+#: core/templates/user/preferences.html:55 core/views/user.py:617
msgid "Change password"
msgstr "Ændre kodeord"
@@ -1110,23 +1137,23 @@ msgstr "Ændre kodeord"
msgid "Already have an account?"
msgstr ""
-#: core/templatetags/wger_extras.py:142 i18n.tpl:38
+#: core/templatetags/wger_extras.py:142 i18n.tpl:39
msgid "kg"
msgstr "kg"
#: core/templatetags/wger_extras.py:144
-#: nutrition/templates/ingredient/view.html:60
-#: nutrition/templates/ingredient/view.html:66
-#: nutrition/templates/ingredient/view.html:73
-#: nutrition/templates/ingredient/view.html:82
-#: nutrition/templates/ingredient/view.html:89
-#: nutrition/templates/ingredient/view.html:111
-#: nutrition/templates/ingredient/view.html:121
+#: nutrition/templates/ingredient/view.html:61
+#: nutrition/templates/ingredient/view.html:67
+#: nutrition/templates/ingredient/view.html:74
+#: nutrition/templates/ingredient/view.html:83
+#: nutrition/templates/ingredient/view.html:90
+#: nutrition/templates/ingredient/view.html:112
+#: nutrition/templates/ingredient/view.html:122
msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr "g"
-#: core/templatetags/wger_extras.py:147 i18n.tpl:39
+#: core/templatetags/wger_extras.py:147 i18n.tpl:40
msgid "lb"
msgstr "lb"
@@ -1135,36 +1162,35 @@ msgctxt "weight unit, i.e. ounces"
msgid "oz"
msgstr "oz"
-#: core/views/languages.py:85 exercises/views/categories.py:122
+#: core/views/languages.py:88 exercises/views/categories.py:122
#: exercises/views/equipment.py:103 exercises/views/muscles.py:99
-#: nutrition/views/ingredient.py:120 nutrition/views/unit.py:110
+#: nutrition/views/ingredient.py:125
msgid "Successfully deleted"
msgstr "Sletning udført"
-#: core/views/languages.py:93 core/views/license.py:103
-#: core/views/repetition_units.py:115 core/views/weight_units.py:115
+#: core/views/languages.py:96 core/views/license.py:103
+#: core/views/repetition_units.py:114 core/views/weight_units.py:115
#: exercises/views/categories.py:128 exercises/views/muscles.py:106
#: gallery/views/images.py:124 gym/views/admin_notes.py:196
#: gym/views/document.py:206 gym/views/gym.py:481
-#: nutrition/views/ingredient.py:127 nutrition/views/unit.py:117
+#: nutrition/views/ingredient.py:132
#, python-brace-format
msgid "Delete {0}?"
msgstr "Slet {0}?"
-#: core/views/languages.py:111 core/views/license.py:85
-#: core/views/repetition_units.py:86 core/views/user.py:464
+#: core/views/languages.py:114 core/views/license.py:85
+#: core/views/repetition_units.py:96 core/views/user.py:480
#: core/views/weight_units.py:86 exercises/views/categories.py:98
#: exercises/views/equipment.py:81 exercises/views/muscles.py:87
#: gym/views/admin_notes.py:161 gym/views/config.py:68
#: gym/views/contract.py:186 gym/views/contract_option.py:123
#: gym/views/contract_type.py:123 gym/views/document.py:171
-#: gym/views/gym.py:463 nutrition/views/ingredient.py:146
-#: nutrition/views/unit.py:143
+#: gym/views/gym.py:463 nutrition/views/ingredient.py:151
#, python-brace-format
msgid "Edit {0}"
msgstr "Rediger {0}"
-#: core/views/misc.py:74
+#: core/views/misc.py:73
msgid ""
"We have created sample workout, workout schedules, weight logs, (body) "
"weight and nutrition plan entries so you can better see what this site can "
@@ -1174,48 +1200,48 @@ msgstr ""
"og ernærningsplanposter så du bedre kan se hvad denne hjemmeside kan. Du kan "
"redigere eller slette dem!"
-#: core/views/user.py:143
+#: core/views/user.py:145
#, python-brace-format
msgid "Account \"{0}\" was successfully deleted"
msgstr "Kontoen \"{0}\" blev slettet"
-#: core/views/user.py:279
+#: core/views/user.py:287
msgid "You were successfully registered"
msgstr "Du er nu registreret"
-#: core/views/user.py:341
+#: core/views/user.py:357
msgid "Settings successfully updated"
msgstr "Indstillinger opdateret"
-#: core/views/user.py:380
+#: core/views/user.py:396
msgid "The user was successfully deactivated"
msgstr "Brugeren blev deaktiveret"
-#: core/views/user.py:417
+#: core/views/user.py:433
msgid "The user was successfully activated"
msgstr "Brugeren blev aktiveret"
-#: core/views/user.py:432
+#: core/views/user.py:448
msgid "Edit user"
msgstr "Rediger bruger"
-#: core/views/user.py:587 gym/templates/gym/member_list.html:26
+#: core/views/user.py:603 gym/templates/gym/member_list.html:26
#: gym/views/gym.py:158
msgid "ID"
msgstr "ID"
-#: core/views/user.py:588 gym/forms.py:95 gym/templates/contract/view.html:55
+#: core/views/user.py:604 gym/forms.py:95 gym/templates/contract/view.html:55
#: gym/templates/gym/member_list.html:27 gym/views/export.py:59
#: gym/views/gym.py:158 gym/views/gym.py:217
msgid "Username"
msgstr "Brugernavn"
-#: core/views/user.py:591 gym/templates/gym/new_user.html:34
+#: core/views/user.py:607 gym/templates/gym/new_user.html:34
#: gym/views/export.py:58 gym/views/gym.py:217
msgid "Gym"
msgstr "Fitnescenter"
-#: core/views/user.py:650
+#: core/views/user.py:678
#, python-format
msgid "A verification email was sent to %(email)s"
msgstr "En bekræftelsesemail blev sendt til %(email)s"
@@ -1232,16 +1258,16 @@ msgstr "Alternativt navn"
msgid "A more basic name for the muscle"
msgstr "Et mere basisk navn for musklen"
-#: exercises/models/video.py:50
+#: exercises/models/video.py:52
#, python-format
msgid "Maximum file size is %(size)sMB."
msgstr "Maksimum filstørrelse er %(size)sMB."
-#: exercises/models/video.py:57 exercises/models/video.py:65
+#: exercises/models/video.py:59 exercises/models/video.py:67
msgid "File type is not supported"
msgstr "Filtypen er ikke understøttet"
-#: exercises/models/video.py:70
+#: exercises/models/video.py:72
msgid "File is not a valid video"
msgstr "Filen er ikke en valid video"
@@ -1312,7 +1338,11 @@ msgstr "Slet udstyr?"
msgid "Add muscle"
msgstr "Tilføj muskler"
-#: gallery/templates/images/overview.html:72
+#: gallery/forms.py:35
+msgid "If date is left empty, it will be read from the image instead"
+msgstr ""
+
+#: gallery/templates/images/overview.html:69
msgid "Add image"
msgstr "Tilføj billede"
@@ -1378,7 +1408,7 @@ msgid "Contract type"
msgstr "Kontrakttype"
#: gym/models/contract.py:211 gym/templates/contract/view.html:59
-#: nutrition/forms.py:58
+#: nutrition/forms.py:67
msgid "Amount"
msgstr "Mængde"
@@ -1558,7 +1588,7 @@ msgstr "Emails"
msgid "Add member"
msgstr "Tilføj medlem"
-#: gym/templates/gym/new_user.html:48 nutrition/templates/rate/form.html:120
+#: gym/templates/gym/new_user.html:48 nutrition/templates/rate/form.html:121
msgid "Info"
msgstr "Information"
@@ -1731,10 +1761,6 @@ msgstr ""
msgid "Quads"
msgstr "Quadmuskler"
-#: i18n.tpl:30
-msgid "Repetitions"
-msgstr "Repetitioner"
-
#: i18n.tpl:31
msgid "Resistance band"
msgstr "Elastik"
@@ -1763,194 +1789,200 @@ msgstr ""
msgid "Until Failure"
msgstr "Indtil Fejl"
-#: i18n.tpl:40
+#: i18n.tpl:38
+#, fuzzy
+#| msgid "Kilometers"
+msgid "Meters"
+msgstr "Kilometre"
+
+#: i18n.tpl:41
msgid "none (bodyweight exercise)"
msgstr "ingen (kropsvægt øvelse)"
-#: i18n.tpl:41
+#: i18n.tpl:42
msgid "Beginner"
msgstr ""
-#: i18n.tpl:42
+#: i18n.tpl:43
#, fuzzy
#| msgctxt "As in \"content of an email\""
#| msgid "Content"
msgid "Consistent"
msgstr "Indhold"
-#: i18n.tpl:43
+#: i18n.tpl:44
msgid "Dedicated"
msgstr ""
-#: i18n.tpl:44
+#: i18n.tpl:45
msgid "Obsessed"
msgstr ""
-#: i18n.tpl:45
+#: i18n.tpl:46
msgid "Legend"
msgstr ""
-#: i18n.tpl:46
+#: i18n.tpl:47
msgid "Veteran"
msgstr ""
-#: i18n.tpl:47
+#: i18n.tpl:48
msgid "Titan"
msgstr ""
-#: i18n.tpl:48
+#: i18n.tpl:49
msgid "Unstoppable"
msgstr ""
-#: i18n.tpl:49
+#: i18n.tpl:50
msgid "Weekend Warrior"
msgstr ""
-#: i18n.tpl:50
+#: i18n.tpl:51
msgid "Elephant lifter"
msgstr ""
-#: i18n.tpl:51
+#: i18n.tpl:52
msgid "Bus lifter"
msgstr ""
-#: i18n.tpl:52
+#: i18n.tpl:53
msgid "Plane lifter"
msgstr ""
-#: i18n.tpl:53
+#: i18n.tpl:54
msgid "Blue whale lifter"
msgstr ""
-#: i18n.tpl:54
+#: i18n.tpl:55
msgid "Space Station lifter"
msgstr ""
-#: i18n.tpl:55
+#: i18n.tpl:56
msgid "Millionaire"
msgstr ""
-#: i18n.tpl:56
+#: i18n.tpl:57
msgid "Atlas"
msgstr ""
-#: i18n.tpl:57
+#: i18n.tpl:58
msgid "Early Bird"
msgstr ""
-#: i18n.tpl:58
+#: i18n.tpl:59
#, fuzzy
#| msgid "New weight log"
msgid "Night Owl"
msgstr "Ny vægtlog"
-#: i18n.tpl:59
+#: i18n.tpl:60
msgid "New Year, New Me"
msgstr ""
-#: i18n.tpl:60
+#: i18n.tpl:61
msgid "Phoenix"
msgstr ""
-#: i18n.tpl:61
+#: i18n.tpl:62
#, fuzzy
#| msgid "Personal data"
msgid "Personal Record"
msgstr "Personlige oplysninger"
-#: i18n.tpl:62
+#: i18n.tpl:63
msgid "Complete your first workout"
msgstr ""
-#: i18n.tpl:63
+#: i18n.tpl:64
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 10 workouts"
msgstr "Eksempel-træning"
-#: i18n.tpl:64
+#: i18n.tpl:65
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 50 workouts"
msgstr "Eksempel-træning"
-#: i18n.tpl:65
+#: i18n.tpl:66
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 100 workouts"
msgstr "Eksempel-træning"
-#: i18n.tpl:66
+#: i18n.tpl:67
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 200 workouts"
msgstr "Eksempel-træning"
-#: i18n.tpl:67
+#: i18n.tpl:68
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 500 workouts"
msgstr "Eksempel-træning"
-#: i18n.tpl:68
+#: i18n.tpl:69
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 1000 workouts"
msgstr "Eksempel-træning"
-#: i18n.tpl:69
+#: i18n.tpl:70
msgid "Maintain a 30-day workout streak"
msgstr ""
-#: i18n.tpl:70
+#: i18n.tpl:71
msgid "Work out on Saturday and Sunday for 4 consecutive weekends"
msgstr ""
-#: i18n.tpl:71
+#: i18n.tpl:72
msgid "Lift a cumulative total of 5.000 kg"
msgstr ""
-#: i18n.tpl:72
+#: i18n.tpl:73
msgid "Lift a cumulative total of 20.000 kg"
msgstr ""
-#: i18n.tpl:73
+#: i18n.tpl:74
msgid "Lift a cumulative total of 50.000 kg"
msgstr ""
-#: i18n.tpl:74
+#: i18n.tpl:75
msgid "Lift a cumulative total of 150.000 kg"
msgstr ""
-#: i18n.tpl:75
+#: i18n.tpl:76
msgid "Lift a cumulative total of 450.000 kg"
msgstr ""
-#: i18n.tpl:76
+#: i18n.tpl:77
msgid "Lift a cumulative total of 1.000.000 kg"
msgstr ""
-#: i18n.tpl:77
+#: i18n.tpl:78
msgid "Lift a cumulative total of 10.000.000 kg"
msgstr ""
-#: i18n.tpl:78
+#: i18n.tpl:79
msgid "Complete a workout before 6:00 AM"
msgstr ""
-#: i18n.tpl:79
+#: i18n.tpl:80
msgid "Complete a workout after 9:00 PM"
msgstr ""
-#: i18n.tpl:80
+#: i18n.tpl:81
msgid "Work out on January 1st"
msgstr ""
-#: i18n.tpl:81
+#: i18n.tpl:82
msgid "Return to training after being inactive for 30 days"
msgstr ""
-#: i18n.tpl:82
+#: i18n.tpl:83
msgid "Achieve a new Personal Record on any exercise"
msgstr ""
@@ -2035,7 +2067,7 @@ msgstr "Øvelse"
msgid "Routine will expire soon"
msgstr "Træning vil udløbe snart"
-#: manager/models/routine.py:153 manager/models/session.py:145
+#: manager/models/routine.py:154 manager/models/session.py:145
msgid "The start time cannot be after the end time."
msgstr "Startiden kan ikke være efter sluttiden."
@@ -2107,36 +2139,58 @@ msgstr "Træning"
msgid "Workout for %s"
msgstr ""
-#: nutrition/forms.py:62
+#: nutrition/extract_info/off.py:72 nutrition/extract_info/off.py:91
+msgid "Serving"
+msgstr ""
+
+#: nutrition/forms.py:71 nutrition/forms.py:208
msgid "Unit"
msgstr "Enhed"
-#: nutrition/forms.py:170 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:179 nutrition/templates/rate/form.html:77
msgid "Basic caloric intake"
msgstr ""
-#: nutrition/forms.py:171
+#: nutrition/forms.py:180
msgid "Your basic caloric intake as calculated for your data"
msgstr ""
-#: nutrition/forms.py:176
+#: nutrition/forms.py:185
msgid "Additional calories"
msgstr ""
-#: nutrition/forms.py:178
+#: nutrition/forms.py:187
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
msgstr ""
#: nutrition/forms.py:209
+msgid "grams (g)"
+msgstr ""
+
+#: nutrition/forms.py:219
msgid "Ingredient"
msgstr ""
-#: nutrition/forms.py:213
+#: nutrition/forms.py:223
msgid "Also search for names in English"
msgstr "Søg også navne på Engelsk"
+#: nutrition/forms.py:239
+msgid "Quantity"
+msgstr ""
+
+#: nutrition/forms.py:241
+msgid "Enter a quantity and choose grams (g) or one of the serving units."
+msgstr ""
+
+#: nutrition/models/ingredient.py:526
+#, fuzzy
+#| msgid "Correction"
+msgid "Portion"
+msgstr "Rettelse"
+
#: nutrition/templates/ingredient/email_new.tpl:1
#, python-format
msgid ""
@@ -2174,59 +2228,88 @@ msgid ""
"sucessfully."
msgstr ""
-#: nutrition/templates/ingredient/overview.html:38
+#: nutrition/templates/ingredient/overview.html:32
+#: nutrition/templates/ingredient/overview.html:68
+#: nutrition/templates/ingredient/view.html:143
+msgid "Vegan"
+msgstr ""
+
+#: nutrition/templates/ingredient/overview.html:34
+#: nutrition/templates/ingredient/overview.html:79
+#: nutrition/templates/ingredient/view.html:155
+#, fuzzy
+#| msgid "Variations"
+msgid "Vegetarian"
+msgstr "Variationer"
+
+#: nutrition/templates/ingredient/overview.html:43
msgid "No ingredients."
msgstr ""
-#: nutrition/templates/ingredient/overview.html:49
+#: nutrition/templates/ingredient/overview.html:54
msgid "Search"
msgstr ""
-#: nutrition/templates/ingredient/view.html:45 nutrition/views/plan.py:237
+#: nutrition/templates/ingredient/overview.html:57
+msgid "Filter"
+msgstr ""
+
+#: nutrition/templates/ingredient/overview.html:83
+msgid "Apply"
+msgstr ""
+
+#: nutrition/templates/ingredient/overview.html:85
+msgid "Reset"
+msgstr ""
+
+#: nutrition/templates/ingredient/view.html:46 nutrition/views/plan.py:236
msgid "Macronutrients"
msgstr ""
-#: nutrition/templates/ingredient/view.html:54
+#: nutrition/templates/ingredient/view.html:55
msgid "kJ"
msgstr ""
-#: nutrition/templates/ingredient/view.html:70 nutrition/views/plan.py:267
+#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:266
msgid "Sugar content in carbohydrates"
msgstr ""
-#: nutrition/templates/ingredient/view.html:75
-#: nutrition/templates/ingredient/view.html:91
-#: nutrition/templates/ingredient/view.html:113
-#: nutrition/templates/ingredient/view.html:123
+#: nutrition/templates/ingredient/view.html:76
+#: nutrition/templates/ingredient/view.html:92
+#: nutrition/templates/ingredient/view.html:114
+#: nutrition/templates/ingredient/view.html:124
msgid "n.A."
msgstr ""
-#: nutrition/templates/ingredient/view.html:86 nutrition/views/plan.py:281
+#: nutrition/templates/ingredient/view.html:87 nutrition/views/plan.py:280
msgid "Saturated fat content in fats"
msgstr ""
-#: nutrition/templates/ingredient/view.html:102
+#: nutrition/templates/ingredient/view.html:103
msgid "Others"
msgstr ""
-#: nutrition/templates/ingredient/view.html:108 nutrition/views/plan.py:287
+#: nutrition/templates/ingredient/view.html:109 nutrition/views/plan.py:286
msgid "Fiber"
msgstr ""
-#: nutrition/templates/ingredient/view.html:118 nutrition/views/plan.py:293
+#: nutrition/templates/ingredient/view.html:119 nutrition/views/plan.py:292
msgid "Sodium"
msgstr ""
-#: nutrition/templates/ingredient/view.html:143
-#: nutrition/templates/units/list.html:50 nutrition/views/unit.py:86
+#: nutrition/templates/ingredient/view.html:136
+msgid "Dietary information"
+msgstr ""
+
+#: nutrition/templates/ingredient/view.html:184
msgid "Add new weight unit"
msgstr ""
-#: nutrition/templates/rate/form.html:25
+#: nutrition/templates/rate/form.html:26
msgid "Basal metabolic rate"
msgstr ""
-#: nutrition/templates/rate/form.html:26
+#: nutrition/templates/rate/form.html:27
msgid ""
"The basal metabolic rate is the amount of energy expended daily\n"
"at rest. This is the minimum energy needed for the body to function, without "
@@ -2234,36 +2317,36 @@ msgid ""
"additional physical activity."
msgstr ""
-#: nutrition/templates/rate/form.html:37
+#: nutrition/templates/rate/form.html:38
msgid "Your basic metabolic rate is: "
msgstr ""
-#: nutrition/templates/rate/form.html:47
+#: nutrition/templates/rate/form.html:48
msgid "Physical activities"
msgstr ""
-#: nutrition/templates/rate/form.html:48
+#: nutrition/templates/rate/form.html:49
msgid ""
"The physical activity level (PAL) is a factor used to to express\n"
"the additional physical activity and is used to calculate the total energy\n"
"required per day."
msgstr ""
-#: nutrition/templates/rate/form.html:59
+#: nutrition/templates/rate/form.html:60
msgid "Factor for daily activities: "
msgstr ""
-#: nutrition/templates/rate/form.html:67
+#: nutrition/templates/rate/form.html:68
msgid ""
"The base caloric intake is the amount of calories your metabolism\n"
"needs based on your level of physical activity."
msgstr ""
-#: nutrition/templates/rate/form.html:81
+#: nutrition/templates/rate/form.html:82
msgid "Calculate basic caloric intake"
msgstr ""
-#: nutrition/templates/rate/form.html:88
+#: nutrition/templates/rate/form.html:89
msgid ""
"The total calories are the actual total calories per day. This\n"
"might include e.g. a surplus or deficit if you are bulking or cutting. "
@@ -2271,69 +2354,69 @@ msgid ""
"you might just enter yourself the amount of calories if you know the value."
msgstr ""
-#: nutrition/templates/rate/form.html:102
+#: nutrition/templates/rate/form.html:103
msgid "Transfer basic intake to total daily calories"
msgstr ""
-#: nutrition/templates/rate/form.html:106
+#: nutrition/templates/rate/form.html:107
msgid "Add additional calories to total daily calories"
msgstr ""
-#: nutrition/templates/rate/form.html:110
+#: nutrition/templates/rate/form.html:111
msgid "Save total calories to profile"
msgstr ""
-#: nutrition/templates/rate/form.html:121
+#: nutrition/templates/rate/form.html:122
msgid ""
"Please note that these calculations can only be an\n"
"approximation. If you base your nutrition plan on these values, observe\n"
"yourself for some weeks and change the total amount if needed."
msgstr ""
-#: nutrition/views/ingredient.py:158
+#: nutrition/views/ingredient.py:163
msgid "Add a new ingredient"
msgstr ""
-#: nutrition/views/plan.py:128
+#: nutrition/views/plan.py:127
msgid "Nutritional plan"
msgstr ""
-#: nutrition/views/plan.py:130
+#: nutrition/views/plan.py:129
#, python-format
msgid "Nutritional plan for %s"
msgstr ""
-#: nutrition/views/plan.py:202
+#: nutrition/views/plan.py:201
msgid "<i>This is an empty plan, what did you expect on the PDF?</i>"
msgstr ""
-#: nutrition/views/plan.py:230
+#: nutrition/views/plan.py:229
#, fuzzy
#| msgid "Nutrition plan"
msgid "Nutritional data"
msgstr "Ernæringsplan"
-#: nutrition/views/plan.py:238
+#: nutrition/views/plan.py:237
msgid "Total"
msgstr ""
-#: nutrition/views/plan.py:239
+#: nutrition/views/plan.py:238
msgid "Percent of energy"
msgstr ""
-#: nutrition/views/plan.py:240
+#: nutrition/views/plan.py:239
msgid "g per body kg"
msgstr ""
-#: nutrition/views/unit_ingredient.py:69
+#: nutrition/views/unit_ingredient.py:64
msgid "Add a new weight unit"
msgstr ""
-#: nutrition/views/unit_ingredient.py:106
+#: nutrition/views/unit_ingredient.py:99
msgid "Edit a weight unit to ingredient connection"
msgstr ""
-#: nutrition/views/unit_ingredient.py:138
+#: nutrition/views/unit_ingredient.py:129
msgid "Delete?"
msgstr ""
@@ -2688,7 +2771,7 @@ msgstr ""
msgid "Translation"
msgstr ""
-#: utils/generic_views.py:263
+#: utils/generic_views.py:246
msgid "Yes, delete"
msgstr ""
@@ -2739,10 +2822,6 @@ msgstr ""
msgid "Import weight logs"
msgstr ""
-#: weight/templates/import_csv_form.html:9
-msgid "Submit"
-msgstr "Indsend"
-
#: weight/templates/import_csv_form.html:15
msgid ""
"Use this import field to import your weight logs into Workout\n"
@@ -2838,6 +2917,37 @@ msgstr ""
msgid "Re-Submit"
msgstr ""
+#, fuzzy
+#~| msgid "Email verified"
+#~ msgid "Email verification"
+#~ msgstr "Email bekræftet"
+
+#, python-format
+#~ msgid "%(username)s, your email was verified"
+#~ msgstr "%(username)s, din email blev bekræftet"
+
+#~ msgid "Error, invalid verification token"
+#~ msgstr "Fejl, ugyldigt verifikationstoken"
+
+#~ msgid "Email Confirmation"
+#~ msgstr "Email Konfiguration"
+
+#, python-format
+#~ msgid "You are almost there, %(username)s!"
+#~ msgstr "Du er der næsten, %(username)s!"
+
+#, python-format
+#~ msgid "Please click <a href=\"%(link)s\">here</a> to confirm your email"
+#~ msgstr ""
+#~ "Klik venligst <a href=\"%(link)s\">here</a> for at bekræfte din email"
+
+#, python-format
+#~ msgid "The token expires on %(time)s"
+#~ msgstr "Dette token udløber om %(time)s"
+
+#~ msgid "Ingredient weight units"
+#~ msgstr "Ingrediens vægtenheder"
+
#~ msgid "Image"
#~ msgstr "Billede"
@@ -2867,9 +2977,6 @@ msgstr ""
#~ msgid "Secondary muscles"
#~ msgstr "Sekundære muskler"
-#~ msgid "Variations"
-#~ msgstr "Variationer"
-
#~ msgid "Exercise Categories"
#~ msgstr "Øvelseskategorier"
diff --git a/wger/locale/de/LC_MESSAGES/django.po b/wger/locale/de/LC_MESSAGES/django.po
index c70932bdf..704528c0e 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: 2026-01-17 14:03+0000\n"
+"POT-Creation-Date: 2026-04-10 10:20+0000\n"
"PO-Revision-Date: 2025-12-08 07:00+0000\n"
"Last-Translator: Elias Lang <[email protected]>\n"
"Language-Team: German <https://hosted.weblate.org/projects/wger/web/de/>\n"
@@ -38,7 +38,7 @@ msgstr ""
#: config/views/gym_config.py:42 core/templates/language/view.html:64
#: core/templates/license/list.html:17
#: core/templates/repetition_unit/list.html:18
-#: core/templates/user/overview.html:204 core/templates/user/overview.html:467
+#: core/templates/user/overview.html:207 core/templates/user/overview.html:470
#: core/templates/weight_unit/list.html:18
#: exercises/templates/categories/admin-overview.html:17
#: exercises/templates/equipment/admin-overview.html:17
@@ -50,30 +50,29 @@ msgstr ""
#: gym/templates/gym/list.html:19 gym/templates/gym/list.html:48
#: gym/templates/gym/member_list.html:94 gym/templates/gym/member_list.html:152
#: gym/templates/gym/member_list.html:190
-#: nutrition/templates/ingredient/view.html:164
-#: nutrition/templates/ingredient/view.html:209
-#: nutrition/templates/units/list.html:19
+#: nutrition/templates/ingredient/view.html:205
+#: nutrition/templates/ingredient/view.html:248
msgid "Edit"
msgstr "Bearbeiten"
-#: core/forms.py:91 core/templates/navigation.html:271
-#: core/templates/navigation.html:278 core/templates/user/login.html:4
+#: core/forms.py:89 core/templates/navigation.html:268
+#: core/templates/navigation.html:275 core/templates/user/login.html:4
#: core/templates/user/registration_sidebar.html:12
#: software/templates/features.html:82 software/templates/features.html:448
msgid "Login"
msgstr "Anmelden"
-#: core/forms.py:130 core/forms.py:244 gym/views/export.py:61
+#: core/forms.py:128 core/forms.py:242 gym/views/export.py:61
#: gym/views/gym.py:217
msgid "First name"
msgstr "Vorname"
-#: core/forms.py:131 core/forms.py:245 core/templates/user/overview.html:284
+#: core/forms.py:129 core/forms.py:243 core/templates/user/overview.html:287
#: gym/views/export.py:62 gym/views/gym.py:217
msgid "Last name"
msgstr "Nachname"
-#: core/forms.py:133 core/forms.py:210 core/templates/user/overview.html:288
+#: core/forms.py:131 core/forms.py:208 core/templates/user/overview.html:291
#: gym/models/contract.py:256 gym/models/gym.py:58
#: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:116
#: gym/templates/gym/new_user.html:30 gym/views/export.py:60
@@ -83,57 +82,57 @@ msgstr "Nachname"
msgid "Email"
msgstr "E-Mail"
-#: core/forms.py:134
+#: core/forms.py:132
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:138 core/models/profile.py:222
+#: core/forms.py:136 core/models/profile.py:222
#: gym/templates/gym/new_user.html:38
msgid "Date of Birth"
msgstr "Geburtsdatum"
-#: core/forms.py:177
+#: core/forms.py:175
msgid "Personal data"
msgstr "Persönliche Daten"
-#: core/forms.py:189
+#: core/forms.py:187
msgid "Workout reminders"
msgstr "Trainingsplanerinnerungen"
-#: core/forms.py:196
+#: core/forms.py:194
msgid "Other settings"
msgstr "Andere Einstellungen"
-#: core/forms.py:204 core/views/user.py:614 core/views/user.py:629
-#: core/views/user.py:641 gym/forms.py:73 utils/generic_views.py:143
+#: core/forms.py:202 core/views/user.py:630 core/views/user.py:654
+#: core/views/user.py:668 gym/forms.py:73 utils/generic_views.py:137
msgid "Save"
msgstr "Speichern"
-#: core/forms.py:211
+#: core/forms.py:209
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:240
+#: core/forms.py:238
msgid "This e-mail address is already in use."
msgstr "Diese E-Mail-Adresse wird bereits verwendet."
-#: core/forms.py:261 gym/templates/gym/new_user.html:26
+#: core/forms.py:259 gym/templates/gym/new_user.html:26
#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:217
msgid "Password"
msgstr "Passwort"
-#: core/forms.py:263
+#: core/forms.py:261
msgid "Please enter your current password."
msgstr "Bitte dein aktuelles Passwort eingeben."
-#: core/forms.py:272 core/templates/language/view.html:70
+#: core/forms.py:270 core/templates/language/view.html:70
#: core/templates/license/list.html:21
#: core/templates/repetition_unit/list.html:22
-#: core/templates/user/overview.html:233
+#: core/templates/user/overview.html:236
#: core/templates/weight_unit/list.html:22
#: exercises/templates/categories/admin-overview.html:21
#: exercises/templates/equipment/admin-overview.html:21
@@ -141,27 +140,30 @@ msgstr "Bitte dein aktuelles Passwort eingeben."
#: gym/templates/admin_notes/list.html:37
#: gym/templates/contract_option/list.html:35
#: gym/templates/contract_type/list.html:36 gym/templates/document/list.html:46
-#: gym/templates/gym/list.html:23 nutrition/templates/ingredient/view.html:168
-#: nutrition/templates/ingredient/view.html:215
-#: nutrition/templates/units/list.html:25
+#: gym/templates/gym/list.html:23 nutrition/templates/ingredient/view.html:209
+#: nutrition/templates/ingredient/view.html:254
msgid "Delete"
msgstr "Löschen"
-#: core/forms.py:281
+#: core/forms.py:279
msgid "Invalid password"
msgstr "Ungültiges Passwort"
-#: core/forms.py:293
+#: core/forms.py:291 core/forms.py:349
msgid "The form is secured with reCAPTCHA"
msgstr "Das Formular ist mit reCaptcha gesichert"
-#: core/forms.py:314 core/forms.py:341 core/templates/navigation.html:272
-#: core/templates/navigation.html:285 core/templates/template.html:123
-#: core/templates/user/login.html:21 core/views/user.py:285
+#: core/forms.py:312 core/forms.py:339 core/templates/navigation.html:269
+#: core/templates/navigation.html:282 core/templates/template.html:113
+#: core/templates/user/login.html:21 core/views/user.py:293
#: software/templates/features.html:87 software/templates/features.html:442
msgid "Register"
msgstr "Registrieren"
+#: core/forms.py:360 weight/templates/import_csv_form.html:9
+msgid "Submit"
+msgstr "Abschicken"
+
#: core/models/language.py:31 core/templates/language/view.html:21
msgid "Language short name"
msgstr "Name der Sprache - kurz"
@@ -198,36 +200,36 @@ msgstr "Verweis"
msgid "Link to license text or other information"
msgstr "Verweis zum Lizenztext oder andere Information"
-#: core/models/profile.py:57
+#: core/models/profile.py:60
#, python-format
msgid "%(birthdate)s is not a valid birthdate"
msgstr "%(birthdate)s ist kein gültiges Geburtsdatum"
-#: core/models/profile.py:66
+#: core/models/profile.py:69
msgid "Male"
msgstr "Männlich"
-#: core/models/profile.py:67
+#: core/models/profile.py:70
msgid "Female"
msgstr "Weiblich"
-#: core/models/profile.py:74
+#: core/models/profile.py:77
msgid "Low"
msgstr "Niedrig"
-#: core/models/profile.py:75
+#: core/models/profile.py:78
msgid "Medium"
msgstr "Mittel"
-#: core/models/profile.py:76
+#: core/models/profile.py:79
msgid "High"
msgstr "Hoch"
-#: core/models/profile.py:82
+#: core/models/profile.py:85
msgid "Metric (kilogram)"
msgstr "Metrisch (Kilogramm)"
-#: core/models/profile.py:83
+#: core/models/profile.py:86
msgid "Imperial (pound)"
msgstr "Imperial (Pfund)"
@@ -349,7 +351,7 @@ msgstr "Durschnittliche Stunden pro Woche"
msgid "Free time"
msgstr "Freizeit"
-#: core/models/profile.py:320 nutrition/templates/rate/form.html:66
+#: core/models/profile.py:320 nutrition/templates/rate/form.html:67
msgid "Total daily calories"
msgstr "Gesamte tägliche Kalorien"
@@ -392,20 +394,45 @@ msgstr ""
msgid "Enable or disable the trophy system for this user"
msgstr ""
-#: core/models/profile.py:446
+#: core/models/profile.py:457
msgid "The sum of all hours has to be 24"
msgstr "Die Summe aller Stunden muss 24 sein"
-#: core/models/rep_unit.py:36 core/models/weight_unit.py:42
-#: core/templates/user/overview.html:280 core/views/user.py:589
+#: core/models/rep_unit.py:32 i18n.tpl:30
+msgid "Repetitions"
+msgstr "Wiederholungen"
+
+#: core/models/rep_unit.py:33 core/templates/user/overview.html:82
+#: exercises/templates/history/overview.html:30
+msgid "Time"
+msgstr "Zeit"
+
+#: core/models/rep_unit.py:34
+#, fuzzy
+#| msgid "Resistance band"
+msgid "Distance"
+msgstr "Widerstandsband"
+
+#: core/models/rep_unit.py:47 core/models/weight_unit.py:42
+#: core/templates/user/overview.html:283 core/views/user.py:605
#: exercises/models/muscle.py:36 gym/models/contract.py:52
#: gym/models/contract.py:103 gym/models/gym.py:46
#: gym/models/user_document.py:84 gym/templates/contract/view.html:50
#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:108
-#: gym/views/gym.py:158 nutrition/templates/ingredient/view.html:151
+#: gym/views/gym.py:158 nutrition/templates/ingredient/view.html:192
msgid "Name"
msgstr "Name"
+#: core/models/rep_unit.py:53
+#, fuzzy
+#| msgid "Unit"
+msgid "Unit Type"
+msgstr "Einheit"
+
+#: core/models/rep_unit.py:54
+msgid "The type of unit (repetitions, time, or distance)"
+msgstr ""
+
#: core/templates/403.html:4
msgid "Forbidden!"
msgstr "Verboten!"
@@ -438,6 +465,57 @@ msgstr ""
"Problem weiterhin besteht, kannst du auf die unten aufgeführten Arten Hilfe "
"suchen:"
+#: core/templates/account/email/email_confirmation_message.html:81
+msgid "Almost there!"
+msgstr ""
+
+#: core/templates/account/email/email_confirmation_message.html:85
+#, fuzzy, python-format
+#| msgid ""
+#| "You're receiving this e-mail because you requested a password reset for "
+#| "your user account at %(site_name)s."
+msgid ""
+"You're receiving this email because the user \"%(user_display)s\" has given "
+"your email address to register an account on %(site_domain)s."
+msgstr ""
+"Diese E-Mail wurde aufgrund einer Anfrage zum Zurücksetzen des Passworts auf "
+"der Website %(site_name)s versendet."
+
+#: core/templates/account/email/email_confirmation_message.html:93
+msgid ""
+"Your email verification code is listed below. Please enter it in your open "
+"browser window."
+msgstr ""
+
+#: core/templates/account/email/email_confirmation_message.html:100
+#, fuzzy
+#| msgid "Please click the following link to confirm your email: %(link)s"
+msgid "Please click the button below to confirm your email address."
+msgstr ""
+"Bitte klicke den folgenden Link, um deine E-Mail-Adresse zu bestätigen: %"
+"(link)s"
+
+#: core/templates/account/email/email_confirmation_message.html:106
+#, fuzzy
+#| msgid "Unverified email"
+msgid "Confirm email"
+msgstr "Nicht verifizierte E-Mail-Adresse"
+
+#: core/templates/account/email/email_confirmation_message.html:110
+#, python-format
+msgid ""
+"The link is valid for %(expire_hours)s hours (until %(date)s, %(time)s). You "
+"can request a new one from your profile settings."
+msgstr ""
+
+#: core/templates/account/email/email_confirmation_message.html:116
+msgid "If the button doesn't work, copy and paste this link into your browser:"
+msgstr ""
+
+#: core/templates/account/email/email_confirmation_message.html:125
+msgid "the wger Team"
+msgstr "Das wger Team"
+
#: core/templates/base.html:10
#, python-format
msgid ""
@@ -471,55 +549,7 @@ 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 verification"
-msgstr "E-Mail-Verifizierung"
-
-#: core/templates/email_verification/confirm_template.html:18
-#, python-format
-msgid "%(username)s, your email was verified"
-msgstr "%(username)s, deine E-Mail-Adresse wurde verifiziert"
-
-#: core/templates/email_verification/confirm_template.html:22
-msgid "Error, invalid verification token"
-msgstr "Fehler, ungültiger Aktivierungs-Token"
-
-#: core/templates/email_verification/email_body_html.tpl:6
-msgid "Email Confirmation"
-msgstr "E-Mail-Bestätigung"
-
-#: 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 "Fast geschafft %(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 ""
-"Bitte klicke <a href=\"%(link)s\">hier</a>, um deine E-Mail-Adresse zu "
-"bestätigen"
-
-#: 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 "Der Token läuft ab am %(time)s"
-
-#: core/templates/email_verification/email_body_html.tpl:14
-#: core/templates/email_verification/email_body_txt.tpl:8
-msgid "the wger Team"
-msgstr "Das wger Team"
-
-#: core/templates/email_verification/email_body_txt.tpl:4
-#, python-format
-msgid "Please click the following link to confirm your email: %(link)s"
-msgstr ""
-"Bitte klicke den folgenden Link, um deine E-Mail-Adresse zu bestätigen: "
-"%(link)s"
-
-#: core/templates/language/overview.html:4 core/templates/navigation.html:344
+#: core/templates/language/overview.html:4 core/templates/navigation.html:341
msgid "Languages"
msgstr "Sprachen"
@@ -528,16 +558,16 @@ msgid "Nothing found."
msgstr "Nichts gefunden."
#: core/templates/language/overview.html:22
-#: nutrition/templates/ingredient/overview.html:38
+#: nutrition/templates/ingredient/overview.html:43
msgid "Add one now."
msgstr "Jetzt hinzufügen."
#: core/templates/language/overview.html:34 core/templates/license/list.html:43
-#: core/templates/repetition_unit/list.html:46
-#: core/templates/user/overview.html:344 core/templates/user/overview.html:384
-#: core/templates/user/overview.html:422
-#: core/templates/weight_unit/list.html:46 core/views/languages.py:74
-#: core/views/license.py:66 core/views/repetition_units.py:66
+#: core/templates/repetition_unit/list.html:44
+#: core/templates/user/overview.html:347 core/templates/user/overview.html:387
+#: core/templates/user/overview.html:425
+#: core/templates/weight_unit/list.html:46 core/views/languages.py:77
+#: core/views/license.py:66 core/views/repetition_units.py:76
#: core/views/weight_units.py:66
#: exercises/templates/categories/admin-overview.html:40
#: exercises/templates/equipment/admin-overview.html:39
@@ -550,14 +580,14 @@ msgstr "Jetzt hinzufügen."
#: gym/templates/gym/member_list.html:264
#: gym/templates/gym/member_list.html:303
#: mailer/templates/mailer/gym/overview.html:43
-#: nutrition/templates/ingredient/overview.html:60
+#: nutrition/templates/ingredient/overview.html:97
msgid "Add"
msgstr "Hinzufügen"
#: core/templates/language/view.html:61 core/templates/user/api_key.html:41
#: core/templates/user/preferences.html:50 gym/models/contract.py:203
#: gym/templates/contract/view.html:41 gym/templates/gym/member_list.html:270
-#: nutrition/templates/ingredient/view.html:206
+#: nutrition/templates/ingredient/view.html:245
msgid "Options"
msgstr "Optionen"
@@ -567,9 +597,9 @@ msgstr "Lizenzliste"
#: core/templates/license/list.html:30
#: core/templates/repetition_unit/list.html:32
-#: core/templates/user/overview.html:104 core/templates/user/overview.html:136
-#: core/templates/user/overview.html:185 core/templates/user/overview.html:365
-#: core/templates/user/overview.html:404 core/templates/user/overview.html:448
+#: core/templates/user/overview.html:107 core/templates/user/overview.html:139
+#: core/templates/user/overview.html:188 core/templates/user/overview.html:368
+#: core/templates/user/overview.html:407 core/templates/user/overview.html:451
#: core/templates/weight_unit/list.html:32
#: exercises/templates/categories/admin-overview.html:30
#: exercises/templates/equipment/admin-overview.html:30
@@ -581,11 +611,10 @@ msgstr "Lizenzliste"
#: gym/templates/gym/member_list.html:284
#: gym/templates/gym/member_list.html:321
#: mailer/templates/mailer/gym/overview.html:30
-#: nutrition/templates/units/list.html:34
msgid "Nothing found"
msgstr "Nichts gefunden"
-#: core/templates/misc/about.html:4 core/templates/template.html:160
+#: core/templates/misc/about.html:4 core/templates/template.html:150
msgid "Imprint"
msgstr "Impressum"
@@ -593,162 +622,157 @@ msgstr "Impressum"
msgid "Training"
msgstr "Training"
-#: core/templates/navigation.html:37 core/templates/user/overview.html:25
+#: core/templates/navigation.html:36 core/templates/user/overview.html:28
msgid "Routines"
msgstr "Routinen"
-#: core/templates/navigation.html:45 core/templates/user/overview.html:70
+#: core/templates/navigation.html:44 core/templates/user/overview.html:73
msgid "Calendar"
msgstr "Kalender"
-#: core/templates/navigation.html:55
+#: core/templates/navigation.html:53
msgid "Measurements"
msgstr "Messungen"
-#: core/templates/navigation.html:66 gallery/templates/images/overview.html:6
+#: core/templates/navigation.html:64 gallery/templates/images/overview.html:6
msgid "Gallery"
msgstr "Galerie"
-#: core/templates/navigation.html:72
+#: core/templates/navigation.html:74 core/templates/navigation.html:400
+#: trophies/templates/trophies/overview.html:7
+msgid "Trophies"
+msgstr ""
+
+#: core/templates/navigation.html:79
msgid "Workout templates"
msgstr "Trainingsvorlagen"
-#: core/templates/navigation.html:79
+#: core/templates/navigation.html:86
msgid "Your templates"
msgstr "Ihre Vorlagen"
-#: core/templates/navigation.html:88
+#: core/templates/navigation.html:95
msgid "Public templates"
msgstr "Öffentliche Vorlagen"
-#: core/templates/navigation.html:96 software/templates/features.html:51
+#: core/templates/navigation.html:103 software/templates/features.html:51
#: software/templates/features.html:480
msgid "Exercises"
msgstr "Übungen"
-#: core/templates/navigation.html:102 core/templates/navigation.html:176
-#: core/templates/navigation.html:339
+#: core/templates/navigation.html:109 core/templates/navigation.html:336
msgid "Administration"
msgstr "Administration"
-#: core/templates/navigation.html:106
+#: core/templates/navigation.html:113
msgid "Exercise edit history"
msgstr "Übungen - Bearbeitungshistorie"
-#: core/templates/navigation.html:112
+#: core/templates/navigation.html:119
msgid "Equipment"
msgstr "Gerät"
-#: core/templates/navigation.html:118
+#: core/templates/navigation.html:125
msgid "Muscles"
msgstr "Muskeln"
-#: core/templates/navigation.html:124
+#: core/templates/navigation.html:131
#: exercises/templates/categories/admin-overview.html:4
msgid "Categories"
msgstr "Kategorien"
-#: core/templates/navigation.html:139 software/templates/features.html:468
+#: core/templates/navigation.html:146 software/templates/features.html:468
msgid "Nutrition"
msgstr "Ernährung"
-#: core/templates/navigation.html:147 core/templates/user/overview.html:144
+#: core/templates/navigation.html:154 core/templates/user/overview.html:147
msgid "Nutrition plans"
msgstr "Ernährungspläne"
-#: core/templates/navigation.html:156
+#: core/templates/navigation.html:163
msgid "BMI calculator"
msgstr "BMI-Rechner"
-#: core/templates/navigation.html:165 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:172 nutrition/templates/rate/form.html:18
msgid "Daily calories calculator"
msgstr "Kalorienrechner"
-#: core/templates/navigation.html:171
+#: core/templates/navigation.html:178
#: nutrition/templates/ingredient/overview.html:10
msgid "Ingredient overview"
msgstr "Zutatenübersicht"
-#: core/templates/navigation.html:180 nutrition/templates/units/list.html:6
-msgid "Ingredient weight units"
-msgstr "Gewichtseinheiten für Zutaten"
-
-#: core/templates/navigation.html:196 software/templates/features.html:463
+#: core/templates/navigation.html:193 software/templates/features.html:463
msgid "Body weight"
msgstr "Körpergewicht"
-#: core/templates/navigation.html:203 core/templates/user/overview.html:114
+#: core/templates/navigation.html:200 core/templates/user/overview.html:117
msgid "Weight overview"
msgstr "Gewichtsübersicht"
-#: core/templates/navigation.html:217
+#: core/templates/navigation.html:214
msgid "About this software"
msgstr "Über diese Software"
-#: core/templates/navigation.html:223 software/templates/about_us.html:5
+#: core/templates/navigation.html:220 software/templates/about_us.html:5
msgid "Support & Get Involved"
msgstr "Support & Mitmachen"
-#: core/templates/navigation.html:229 software/templates/features.html:528
+#: core/templates/navigation.html:226 software/templates/features.html:528
msgid "REST API"
msgstr "REST API"
-#: core/templates/navigation.html:235 utils/models.py:45
+#: core/templates/navigation.html:232 utils/models.py:45
msgid "License"
msgstr "Lizenz"
-#: core/templates/navigation.html:241
+#: core/templates/navigation.html:238
msgid "Developer documentation"
msgstr "Entwickler-Dokumentation"
-#: core/templates/navigation.html:248
+#: core/templates/navigation.html:245
msgid "Get the code"
msgstr "Quellcode"
-#: core/templates/navigation.html:255 core/templates/template.html:199
-#: software/templates/features.html:603
+#: core/templates/navigation.html:252 core/templates/template.html:202
+#: software/templates/features.html:614
msgid "Translate"
msgstr "Übersetze"
-#: core/templates/navigation.html:292 core/templates/user/login.html:30
+#: core/templates/navigation.html:289 core/templates/user/login.html:30
msgid "Reset password"
msgstr "Passwort zurücketzen"
-#: core/templates/navigation.html:301 core/templates/navigation.html:329
+#: core/templates/navigation.html:298 core/templates/navigation.html:326
msgid "Logout"
msgstr "Abmelden"
-#: core/templates/navigation.html:320
+#: core/templates/navigation.html:317
msgid "My preferences"
msgstr "Meine Einstellungen"
-#: core/templates/navigation.html:352
+#: core/templates/navigation.html:349
msgid "Licenses"
msgstr "Lizenzen"
-#: core/templates/navigation.html:360
+#: core/templates/navigation.html:357
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr "Wiederholungs-Einheiten"
-#: core/templates/navigation.html:368 core/templates/weight_unit/list.html:4
-#: nutrition/templates/ingredient/view.html:141
+#: core/templates/navigation.html:365 core/templates/weight_unit/list.html:4
+#: nutrition/templates/ingredient/view.html:182
msgid "Weight units"
msgstr "Gewichtseinheiten"
-#: core/templates/navigation.html:376 core/templates/user/list.html:4
+#: core/templates/navigation.html:373 core/templates/user/list.html:4
msgid "User list"
msgstr "Benutzerliste"
-#: core/templates/navigation.html:382
+#: core/templates/navigation.html:379
msgid "Gyms"
msgstr "Studios"
-#: core/templates/navigation.html:403
-#: trophies/templates/trophies/overview.html:7
-msgid "Trophies"
-msgstr ""
-
#: core/templates/registration/password_reset_complete.html:4
msgid "Password reset complete"
msgstr "Passwort zurücksetzen beendet"
@@ -808,27 +832,31 @@ msgstr "zurück"
msgid "next"
msgstr "nächste"
-#: core/templates/template.html:96
+#: core/templates/template.html:86
msgid "Close"
msgstr "Schließen"
-#: core/templates/template.html:112
+#: core/templates/template.html:102
msgid ""
"You are using a guest account, data entered will be deleted after a week."
msgstr ""
"Du benutzt einen Gastzugang, eingegebene Daten werden nach einer Woche "
"gelöscht."
-#: core/templates/template.html:117
+#: core/templates/template.html:107
msgid "Create some demo entries"
msgstr "Beispieldaten erstellen"
-#: core/templates/template.html:165 software/templates/features.html:568
+#: core/templates/template.html:155 software/templates/features.html:568
#: software/templates/tos.html:7
msgid "Terms of service"
msgstr "Allgemeine Nutzungsbedingungen"
-#: core/templates/template_features.html:53 software/templates/features.html:9
+#: core/templates/template.html:181 software/templates/features.html:595
+msgid "Browser language"
+msgstr ""
+
+#: core/templates/template_features.html:46 software/templates/features.html:9
msgid "Features"
msgstr "Funktionen"
@@ -887,99 +915,94 @@ msgstr "Kein Konto?"
msgid "Forgot password?"
msgstr "Passwort vergessen?"
-#: core/templates/user/overview.html:25 core/templates/user/overview.html:68
-#: core/templates/user/overview.html:112 core/templates/user/overview.html:144
-#: core/templates/user/overview.html:348 core/templates/user/overview.html:390
-#: core/templates/user/overview.html:426
+#: core/templates/user/overview.html:28 core/templates/user/overview.html:71
+#: core/templates/user/overview.html:115 core/templates/user/overview.html:147
+#: core/templates/user/overview.html:351 core/templates/user/overview.html:393
+#: core/templates/user/overview.html:429
#, python-format
msgid "last %(number)s"
msgstr "letzte %(number)s"
-#: core/templates/user/overview.html:27 core/templates/user/overview.html:146
-#: core/templates/user/overview.html:343 core/templates/user/overview.html:382
-#: core/templates/user/overview.html:421 gym/templates/gym/member_list.html:226
+#: core/templates/user/overview.html:30 core/templates/user/overview.html:149
+#: core/templates/user/overview.html:346 core/templates/user/overview.html:385
+#: core/templates/user/overview.html:424 gym/templates/gym/member_list.html:226
#: gym/templates/gym/member_list.html:262
#: gym/templates/gym/member_list.html:302
msgid "Overview"
msgstr "Übersicht"
-#: core/templates/user/overview.html:34 core/templates/user/overview.html:76
-#: core/templates/user/overview.html:120 core/templates/user/overview.html:152
+#: core/templates/user/overview.html:37 core/templates/user/overview.html:79
+#: core/templates/user/overview.html:123 core/templates/user/overview.html:155
#: manager/helpers.py:88 software/templates/about_us.html:170
#: weight/templates/import_csv_preview.html:13
#: weight/templates/import_csv_preview.html:42 weight/views.py:54
msgid "Date"
msgstr "Datum"
-#: core/templates/user/overview.html:35 core/templates/user/overview.html:153
+#: core/templates/user/overview.html:38 core/templates/user/overview.html:156
#: gym/models/contract.py:58 gym/models/contract.py:109
msgid "Description"
msgstr "Beschreibung"
-#: core/templates/user/overview.html:36
+#: core/templates/user/overview.html:39
msgid "Number of logs (days)"
msgstr "Anzahl der Protokolle (Tage)"
-#: core/templates/user/overview.html:37 core/views/user.py:590
+#: core/templates/user/overview.html:40 core/views/user.py:606
#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:158
msgid "Last activity"
msgstr "Letzte Aktivität"
-#: core/templates/user/overview.html:58
+#: core/templates/user/overview.html:61
msgid "No workouts found."
msgstr "Keine Trainingspläne gefunden."
-#: core/templates/user/overview.html:68
+#: core/templates/user/overview.html:71
msgid "Log"
msgstr "Tagebucheintrag"
-#: core/templates/user/overview.html:77
+#: core/templates/user/overview.html:80
msgid "General impression"
msgstr "Allgemeiner Eindruck"
-#: core/templates/user/overview.html:78 core/templates/user/overview.html:390
+#: core/templates/user/overview.html:81 core/templates/user/overview.html:393
msgid "Notes"
msgstr "Notizen"
-#: core/templates/user/overview.html:79
-#: exercises/templates/history/overview.html:30
-msgid "Time"
-msgstr "Zeit"
-
-#: core/templates/user/overview.html:112 core/templates/user/overview.html:121
+#: core/templates/user/overview.html:115 core/templates/user/overview.html:124
#: manager/helpers.py:89 weight/templates/import_csv_preview.html:14
#: weight/templates/import_csv_preview.html:43 weight/views.py:54
msgid "Weight"
msgstr "Gewicht"
-#: core/templates/user/overview.html:154
-#: nutrition/templates/ingredient/view.html:51 nutrition/views/plan.py:245
+#: core/templates/user/overview.html:157
+#: nutrition/templates/ingredient/view.html:52 nutrition/views/plan.py:244
msgid "Energy"
msgstr "Energie"
-#: core/templates/user/overview.html:155
-#: nutrition/templates/ingredient/view.html:58 nutrition/views/plan.py:251
+#: core/templates/user/overview.html:158
+#: nutrition/templates/ingredient/view.html:59 nutrition/views/plan.py:250
msgid "Protein"
msgstr "Eiweiß"
-#: core/templates/user/overview.html:156
-#: nutrition/templates/ingredient/view.html:64 nutrition/views/plan.py:259
+#: core/templates/user/overview.html:159
+#: nutrition/templates/ingredient/view.html:65 nutrition/views/plan.py:258
msgid "Carbohydrates"
msgstr "Kohlenhydrate"
-#: core/templates/user/overview.html:157
-#: nutrition/templates/ingredient/view.html:80 nutrition/views/plan.py:273
+#: core/templates/user/overview.html:160
+#: nutrition/templates/ingredient/view.html:81 nutrition/views/plan.py:272
msgid "Fat"
msgstr "Fett"
-#: core/templates/user/overview.html:170
-#: nutrition/templates/ingredient/view.html:53
+#: core/templates/user/overview.html:173
+#: nutrition/templates/ingredient/view.html:54
msgid "kcal"
msgstr "kcal"
-#: core/templates/user/overview.html:201 core/templates/user/overview.html:340
-#: core/templates/user/overview.html:379 core/templates/user/overview.html:418
-#: core/templates/user/overview.html:463 gym/templates/gym/list.html:45
+#: core/templates/user/overview.html:204 core/templates/user/overview.html:343
+#: core/templates/user/overview.html:382 core/templates/user/overview.html:421
+#: core/templates/user/overview.html:466 gym/templates/gym/list.html:45
#: gym/templates/gym/member_list.html:91 gym/templates/gym/member_list.html:149
#: gym/templates/gym/member_list.html:187
#: gym/templates/gym/member_list.html:223
@@ -988,109 +1011,113 @@ msgstr "kcal"
msgid "Actions"
msgstr "Aktionen"
-#: core/templates/user/overview.html:210
+#: core/templates/user/overview.html:213
msgid "Deactivate user"
msgstr "Benutzer deaktivieren"
-#: core/templates/user/overview.html:214
+#: core/templates/user/overview.html:217
msgid "Activate user"
msgstr "Benutzer aktivieren"
-#: core/templates/user/overview.html:223
+#: core/templates/user/overview.html:226
msgid "Reset user password"
msgstr "Benutzerpasswort zurücksetzen"
-#: core/templates/user/overview.html:227 gym/templates/gym/member_list.html:30
+#: core/templates/user/overview.html:230 gym/templates/gym/member_list.html:30
msgid "Roles"
msgstr "Rollen"
-#: core/templates/user/overview.html:243
+#: core/templates/user/overview.html:246
msgid "Password reset confirmation"
msgstr "Zurücksetzen des Passworts bestätigen"
-#: core/templates/user/overview.html:247
+#: core/templates/user/overview.html:250
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:250
+#: core/templates/user/overview.html:253
#: exercises/templates/history/overview.html:106
+#: nutrition/templates/ingredient/view.html:148
+#: nutrition/templates/ingredient/view.html:160
msgid "No"
msgstr "Nein"
-#: core/templates/user/overview.html:251
+#: core/templates/user/overview.html:254
#: exercises/templates/history/overview.html:99
+#: nutrition/templates/ingredient/view.html:146
+#: nutrition/templates/ingredient/view.html:158
msgid "Yes"
msgstr "Ja"
-#: core/templates/user/overview.html:272 gym/templates/gym/member_list.html:105
+#: core/templates/user/overview.html:275 gym/templates/gym/member_list.html:105
msgid "Details"
msgstr "Details"
-#: core/templates/user/overview.html:276 gym/views/export.py:57
-#: manager/helpers.py:89 nutrition/views/plan.py:151
-#: nutrition/views/plan.py:157
+#: core/templates/user/overview.html:279 gym/views/export.py:57
+#: manager/helpers.py:89 nutrition/views/plan.py:150
+#: nutrition/views/plan.py:156
msgid "Nr."
msgstr "Nr."
-#: core/templates/user/overview.html:298 gym/models/contract.py:287
+#: core/templates/user/overview.html:301 gym/models/contract.py:287
#: gym/models/gym.py:50 gym/templates/contract/view.html:75
#: gym/templates/gym/member_list.html:112 gym/views/export.py:68
msgid "Phone"
msgstr "Telefon"
-#: core/templates/user/overview.html:302 gym/templates/contract/view.html:87
+#: core/templates/user/overview.html:305 gym/templates/contract/view.html:87
#: gym/templates/gym/member_list.html:130
msgid "Address"
msgstr "Adresse"
-#: core/templates/user/overview.html:313
+#: core/templates/user/overview.html:316
msgid "Registered"
msgstr "Registriert"
-#: core/templates/user/overview.html:317
+#: core/templates/user/overview.html:320
msgid "Last login"
msgstr "Letzter Login"
-#: core/templates/user/overview.html:322
+#: core/templates/user/overview.html:325
msgid "Status"
msgstr "Status"
-#: core/templates/user/overview.html:325
+#: core/templates/user/overview.html:328
msgid "Active"
msgstr "Aktiv"
-#: core/templates/user/overview.html:327
+#: core/templates/user/overview.html:330
msgid "Inactive"
msgstr "Inaktiv"
-#: core/templates/user/overview.html:348 gym/templates/contract/list.html:4
+#: core/templates/user/overview.html:351 gym/templates/contract/list.html:4
#: gym/templates/gym/member_list.html:218
msgid "Contracts"
msgstr "Verträge"
-#: core/templates/user/overview.html:426 gym/templates/document/list.html:4
+#: core/templates/user/overview.html:429 gym/templates/document/list.html:4
msgid "Documents"
msgstr "Dokumente"
-#: core/templates/user/overview.html:433 gym/templates/document/list.html:33
+#: core/templates/user/overview.html:436 gym/templates/document/list.html:33
msgid "Download"
msgstr "Runterladen"
-#: core/templates/user/overview.html:474 gym/views/admin_config.py:44
+#: core/templates/user/overview.html:477 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:477 gym/models/user_config.py:92
+#: core/templates/user/overview.html:480 gym/models/user_config.py:92
msgid "Include in inactive overview"
msgstr "In Inaktivübersicht aufnehmen"
-#: core/templates/user/overview.html:510
+#: core/templates/user/overview.html:513
#, python-format
msgid "Admin login is only available for users in %(gym_name)s"
msgstr "Admin-Login ist nur für Benutzer in %(gym_name)s verfügbar"
-#: core/templates/user/overview.html:514
+#: core/templates/user/overview.html:517
msgid "Log in as this user"
msgstr "Als diesen Benutzer einloggen"
@@ -1114,7 +1141,7 @@ msgstr "Sende Bestätigungs-E-Mail"
msgid "You need to verify your email to contribute exercises"
msgstr "Du musst deine E-Mail-Adresse bestätigen, um Übungen beizutragen"
-#: core/templates/user/preferences.html:55 core/views/user.py:601
+#: core/templates/user/preferences.html:55 core/views/user.py:617
msgid "Change password"
msgstr "Passwort ändern"
@@ -1122,23 +1149,23 @@ msgstr "Passwort ändern"
msgid "Already have an account?"
msgstr ""
-#: core/templatetags/wger_extras.py:142 i18n.tpl:38
+#: core/templatetags/wger_extras.py:142 i18n.tpl:39
msgid "kg"
msgstr "kg"
#: core/templatetags/wger_extras.py:144
-#: nutrition/templates/ingredient/view.html:60
-#: nutrition/templates/ingredient/view.html:66
-#: nutrition/templates/ingredient/view.html:73
-#: nutrition/templates/ingredient/view.html:82
-#: nutrition/templates/ingredient/view.html:89
-#: nutrition/templates/ingredient/view.html:111
-#: nutrition/templates/ingredient/view.html:121
+#: nutrition/templates/ingredient/view.html:61
+#: nutrition/templates/ingredient/view.html:67
+#: nutrition/templates/ingredient/view.html:74
+#: nutrition/templates/ingredient/view.html:83
+#: nutrition/templates/ingredient/view.html:90
+#: nutrition/templates/ingredient/view.html:112
+#: nutrition/templates/ingredient/view.html:122
msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr "g"
-#: core/templatetags/wger_extras.py:147 i18n.tpl:39
+#: core/templatetags/wger_extras.py:147 i18n.tpl:40
msgid "lb"
msgstr "lb"
@@ -1147,36 +1174,35 @@ msgctxt "weight unit, i.e. ounces"
msgid "oz"
msgstr "oz"
-#: core/views/languages.py:85 exercises/views/categories.py:122
+#: core/views/languages.py:88 exercises/views/categories.py:122
#: exercises/views/equipment.py:103 exercises/views/muscles.py:99
-#: nutrition/views/ingredient.py:120 nutrition/views/unit.py:110
+#: nutrition/views/ingredient.py:125
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
+#: core/views/languages.py:96 core/views/license.py:103
+#: core/views/repetition_units.py:114 core/views/weight_units.py:115
#: exercises/views/categories.py:128 exercises/views/muscles.py:106
#: gallery/views/images.py:124 gym/views/admin_notes.py:196
#: gym/views/document.py:206 gym/views/gym.py:481
-#: nutrition/views/ingredient.py:127 nutrition/views/unit.py:117
+#: nutrition/views/ingredient.py:132
#, python-brace-format
msgid "Delete {0}?"
msgstr "{0} löschen?"
-#: core/views/languages.py:111 core/views/license.py:85
-#: core/views/repetition_units.py:86 core/views/user.py:464
+#: core/views/languages.py:114 core/views/license.py:85
+#: core/views/repetition_units.py:96 core/views/user.py:480
#: core/views/weight_units.py:86 exercises/views/categories.py:98
#: exercises/views/equipment.py:81 exercises/views/muscles.py:87
#: gym/views/admin_notes.py:161 gym/views/config.py:68
#: gym/views/contract.py:186 gym/views/contract_option.py:123
#: gym/views/contract_type.py:123 gym/views/document.py:171
-#: gym/views/gym.py:463 nutrition/views/ingredient.py:146
-#: nutrition/views/unit.py:143
+#: gym/views/gym.py:463 nutrition/views/ingredient.py:151
#, python-brace-format
msgid "Edit {0}"
msgstr "{0} bearbeiten"
-#: core/views/misc.py:74
+#: core/views/misc.py:73
msgid ""
"We have created sample workout, workout schedules, weight logs, (body) "
"weight and nutrition plan entries so you can better see what this site can "
@@ -1187,48 +1213,48 @@ msgstr ""
"du besser sehen was diese Seite machen kann. Du kannst diese Einträge "
"natürlich bearbeiten oder löschen!"
-#: core/views/user.py:143
+#: core/views/user.py:145
#, python-brace-format
msgid "Account \"{0}\" was successfully deleted"
msgstr "Konto „{0}“ wurde erfolgreich gelöscht"
-#: core/views/user.py:279
+#: core/views/user.py:287
msgid "You were successfully registered"
msgstr "Du hast dich erfolgreich registriert"
-#: core/views/user.py:341
+#: core/views/user.py:357
msgid "Settings successfully updated"
msgstr "Einstellungen erfolgreich aktualisiert"
-#: core/views/user.py:380
+#: core/views/user.py:396
msgid "The user was successfully deactivated"
msgstr "Der Benutzer wurde erfolgreich deaktiviert"
-#: core/views/user.py:417
+#: core/views/user.py:433
msgid "The user was successfully activated"
msgstr "Der Benutzer wurde erfolgreich aktiviert"
-#: core/views/user.py:432
+#: core/views/user.py:448
msgid "Edit user"
msgstr "Benutzer bearbeiten"
-#: core/views/user.py:587 gym/templates/gym/member_list.html:26
+#: core/views/user.py:603 gym/templates/gym/member_list.html:26
#: gym/views/gym.py:158
msgid "ID"
msgstr "ID"
-#: core/views/user.py:588 gym/forms.py:95 gym/templates/contract/view.html:55
+#: core/views/user.py:604 gym/forms.py:95 gym/templates/contract/view.html:55
#: gym/templates/gym/member_list.html:27 gym/views/export.py:59
#: gym/views/gym.py:158 gym/views/gym.py:217
msgid "Username"
msgstr "Benutzername"
-#: core/views/user.py:591 gym/templates/gym/new_user.html:34
+#: core/views/user.py:607 gym/templates/gym/new_user.html:34
#: gym/views/export.py:58 gym/views/gym.py:217
msgid "Gym"
msgstr "Studio"
-#: core/views/user.py:650
+#: core/views/user.py:678
#, python-format
msgid "A verification email was sent to %(email)s"
msgstr "Eine Bestätigungs-E-Mail wurde an %(email)s gesendet"
@@ -1245,16 +1271,16 @@ msgstr "Alternative Bezeichnung"
msgid "A more basic name for the muscle"
msgstr "Einfacherer Name für den Muskel"
-#: exercises/models/video.py:50
+#: exercises/models/video.py:52
#, python-format
msgid "Maximum file size is %(size)sMB."
msgstr "Die maximale Dateigröße beträgt %(size)sMB."
-#: exercises/models/video.py:57 exercises/models/video.py:65
+#: exercises/models/video.py:59 exercises/models/video.py:67
msgid "File type is not supported"
msgstr "Dateityp wird nicht unterstützt"
-#: exercises/models/video.py:70
+#: exercises/models/video.py:72
msgid "File is not a valid video"
msgstr "Die Datei ist kein gültiges Video"
@@ -1325,7 +1351,11 @@ msgstr "Gerät löschen?"
msgid "Add muscle"
msgstr "Muskel hinzufügen"
-#: gallery/templates/images/overview.html:72
+#: gallery/forms.py:35
+msgid "If date is left empty, it will be read from the image instead"
+msgstr ""
+
+#: gallery/templates/images/overview.html:69
msgid "Add image"
msgstr "Bild hinzufügen"
@@ -1393,7 +1423,7 @@ msgid "Contract type"
msgstr "Vertragstyp"
#: gym/models/contract.py:211 gym/templates/contract/view.html:59
-#: nutrition/forms.py:58
+#: nutrition/forms.py:67
msgid "Amount"
msgstr "Menge"
@@ -1573,7 +1603,7 @@ msgstr "E-Mails"
msgid "Add member"
msgstr "Mitglied hinzufügen"
-#: gym/templates/gym/new_user.html:48 nutrition/templates/rate/form.html:120
+#: gym/templates/gym/new_user.html:48 nutrition/templates/rate/form.html:121
msgid "Info"
msgstr "Infos"
@@ -1745,10 +1775,6 @@ msgstr "Klimmzugstange"
msgid "Quads"
msgstr "Quadrizeps"
-#: i18n.tpl:30
-msgid "Repetitions"
-msgstr "Wiederholungen"
-
#: i18n.tpl:31
msgid "Resistance band"
msgstr "Widerstandsband"
@@ -1777,198 +1803,204 @@ msgstr "Trizeps"
msgid "Until Failure"
msgstr "Bis zum Muskelversagen"
-#: i18n.tpl:40
+#: i18n.tpl:38
+#, fuzzy
+#| msgid "Kilometers"
+msgid "Meters"
+msgstr "Kilometer"
+
+#: i18n.tpl:41
msgid "none (bodyweight exercise)"
msgstr "keine (Körpergewichtübung)"
-#: i18n.tpl:41
+#: i18n.tpl:42
msgid "Beginner"
msgstr ""
-#: i18n.tpl:42
+#: i18n.tpl:43
#, fuzzy
#| msgctxt "As in \"content of an email\""
#| msgid "Content"
msgid "Consistent"
msgstr "Inhalt"
-#: i18n.tpl:43
+#: i18n.tpl:44
msgid "Dedicated"
msgstr ""
-#: i18n.tpl:44
+#: i18n.tpl:45
msgid "Obsessed"
msgstr ""
-#: i18n.tpl:45
+#: i18n.tpl:46
msgid "Legend"
msgstr "Legende"
-#: i18n.tpl:46
+#: i18n.tpl:47
msgid "Veteran"
msgstr ""
-#: i18n.tpl:47
+#: i18n.tpl:48
msgid "Titan"
msgstr ""
-#: i18n.tpl:48
+#: i18n.tpl:49
msgid "Unstoppable"
msgstr ""
-#: i18n.tpl:49
+#: i18n.tpl:50
msgid "Weekend Warrior"
msgstr ""
-#: i18n.tpl:50
+#: i18n.tpl:51
msgid "Elephant lifter"
msgstr ""
-#: i18n.tpl:51
+#: i18n.tpl:52
msgid "Bus lifter"
msgstr ""
-#: i18n.tpl:52
+#: i18n.tpl:53
msgid "Plane lifter"
msgstr ""
-#: i18n.tpl:53
+#: i18n.tpl:54
msgid "Blue whale lifter"
msgstr ""
-#: i18n.tpl:54
+#: i18n.tpl:55
msgid "Space Station lifter"
msgstr ""
-#: i18n.tpl:55
+#: i18n.tpl:56
msgid "Millionaire"
msgstr ""
-#: i18n.tpl:56
+#: i18n.tpl:57
msgid "Atlas"
msgstr ""
-#: i18n.tpl:57
+#: i18n.tpl:58
msgid "Early Bird"
msgstr ""
-#: i18n.tpl:58
+#: i18n.tpl:59
#, fuzzy
#| msgid "Weight log"
msgid "Night Owl"
msgstr "Gewichtslog"
-#: i18n.tpl:59
+#: i18n.tpl:60
msgid "New Year, New Me"
msgstr ""
-#: i18n.tpl:60
+#: i18n.tpl:61
msgid "Phoenix"
msgstr ""
-#: i18n.tpl:61
+#: i18n.tpl:62
#, fuzzy
#| msgid "Personal data"
msgid "Personal Record"
msgstr "Persönliche Daten"
-#: i18n.tpl:62
+#: i18n.tpl:63
#, fuzzy
#| msgid "Copy workout"
msgid "Complete your first workout"
msgstr "Trainingsplan kopieren"
-#: i18n.tpl:63
+#: i18n.tpl:64
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 10 workouts"
msgstr "Beispiel Trainingsplan"
-#: i18n.tpl:64
+#: i18n.tpl:65
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 50 workouts"
msgstr "Beispiel Trainingsplan"
-#: i18n.tpl:65
+#: i18n.tpl:66
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 100 workouts"
msgstr "Beispiel Trainingsplan"
-#: i18n.tpl:66
+#: i18n.tpl:67
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 200 workouts"
msgstr "Beispiel Trainingsplan"
-#: i18n.tpl:67
+#: i18n.tpl:68
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 500 workouts"
msgstr "Beispiel Trainingsplan"
-#: i18n.tpl:68
+#: i18n.tpl:69
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 1000 workouts"
msgstr "Beispiel Trainingsplan"
-#: i18n.tpl:69
+#: i18n.tpl:70
msgid "Maintain a 30-day workout streak"
msgstr ""
-#: i18n.tpl:70
+#: i18n.tpl:71
msgid "Work out on Saturday and Sunday for 4 consecutive weekends"
msgstr ""
-#: i18n.tpl:71
+#: i18n.tpl:72
msgid "Lift a cumulative total of 5.000 kg"
msgstr ""
-#: i18n.tpl:72
+#: i18n.tpl:73
msgid "Lift a cumulative total of 20.000 kg"
msgstr ""
-#: i18n.tpl:73
+#: i18n.tpl:74
msgid "Lift a cumulative total of 50.000 kg"
msgstr ""
-#: i18n.tpl:74
+#: i18n.tpl:75
msgid "Lift a cumulative total of 150.000 kg"
msgstr ""
-#: i18n.tpl:75
+#: i18n.tpl:76
msgid "Lift a cumulative total of 450.000 kg"
msgstr ""
-#: i18n.tpl:76
+#: i18n.tpl:77
msgid "Lift a cumulative total of 1.000.000 kg"
msgstr ""
-#: i18n.tpl:77
+#: i18n.tpl:78
msgid "Lift a cumulative total of 10.000.000 kg"
msgstr ""
-#: i18n.tpl:78
+#: i18n.tpl:79
msgid "Complete a workout before 6:00 AM"
msgstr ""
-#: i18n.tpl:79
+#: i18n.tpl:80
msgid "Complete a workout after 9:00 PM"
msgstr ""
-#: i18n.tpl:80
+#: i18n.tpl:81
#, fuzzy
#| msgid "Workout for %s"
msgid "Work out on January 1st"
msgstr "Trainingsplan für %s"
-#: i18n.tpl:81
+#: i18n.tpl:82
msgid "Return to training after being inactive for 30 days"
msgstr ""
-#: i18n.tpl:82
+#: i18n.tpl:83
msgid "Achieve a new Personal Record on any exercise"
msgstr ""
@@ -2052,7 +2084,7 @@ msgstr "Übung"
msgid "Routine will expire soon"
msgstr "Routine wird bald auslaufen"
-#: manager/models/routine.py:153 manager/models/session.py:145
+#: manager/models/routine.py:154 manager/models/session.py:145
msgid "The start time cannot be after the end time."
msgstr "Die Startzeit kann nicht vor der Endzeit liegen."
@@ -2137,36 +2169,58 @@ msgstr "Trainingsplan"
msgid "Workout for %s"
msgstr "Trainingsplan für %s"
-#: nutrition/forms.py:62
+#: nutrition/extract_info/off.py:72 nutrition/extract_info/off.py:91
+msgid "Serving"
+msgstr ""
+
+#: nutrition/forms.py:71 nutrition/forms.py:208
msgid "Unit"
msgstr "Einheit"
-#: nutrition/forms.py:170 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:179 nutrition/templates/rate/form.html:77
msgid "Basic caloric intake"
msgstr "Basis-Kalorienzufuhr"
-#: nutrition/forms.py:171
+#: nutrition/forms.py:180
msgid "Your basic caloric intake as calculated for your data"
msgstr "Deine Basis-Kalorienzufuhr wird aus deinen Angaben berechnet"
-#: nutrition/forms.py:176
+#: nutrition/forms.py:185
msgid "Additional calories"
msgstr "Zusätzliche Kalorien"
-#: nutrition/forms.py:178
+#: nutrition/forms.py:187
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
msgstr "Zusat"
#: nutrition/forms.py:209
+msgid "grams (g)"
+msgstr ""
+
+#: nutrition/forms.py:219
msgid "Ingredient"
msgstr "Zutat"
-#: nutrition/forms.py:213
+#: nutrition/forms.py:223
msgid "Also search for names in English"
msgstr "Auch Zutaten auf Englisch suchen"
+#: nutrition/forms.py:239
+msgid "Quantity"
+msgstr ""
+
+#: nutrition/forms.py:241
+msgid "Enter a quantity and choose grams (g) or one of the serving units."
+msgstr ""
+
+#: nutrition/models/ingredient.py:526
+#, fuzzy
+#| msgid "Correction"
+msgid "Portion"
+msgstr "Korrektur"
+
#: nutrition/templates/ingredient/email_new.tpl:1
#, python-format
msgid ""
@@ -2216,59 +2270,92 @@ msgstr ""
"erscheinen. Falls du bei der Anmeldung deine E-Mail angegeben hast, \n"
"wirst du auch benachrichtigt."
-#: nutrition/templates/ingredient/overview.html:38
+#: nutrition/templates/ingredient/overview.html:32
+#: nutrition/templates/ingredient/overview.html:68
+#: nutrition/templates/ingredient/view.html:143
+msgid "Vegan"
+msgstr ""
+
+#: nutrition/templates/ingredient/overview.html:34
+#: nutrition/templates/ingredient/overview.html:79
+#: nutrition/templates/ingredient/view.html:155
+#, fuzzy
+#| msgid "Variations"
+msgid "Vegetarian"
+msgstr "Variationen"
+
+#: nutrition/templates/ingredient/overview.html:43
msgid "No ingredients."
msgstr "Keine Zutaten."
-#: nutrition/templates/ingredient/overview.html:49
+#: nutrition/templates/ingredient/overview.html:54
msgid "Search"
msgstr "Suchen"
-#: nutrition/templates/ingredient/view.html:45 nutrition/views/plan.py:237
+#: nutrition/templates/ingredient/overview.html:57
+#, fuzzy
+#| msgid "No filter"
+msgid "Filter"
+msgstr "Kein filter"
+
+#: nutrition/templates/ingredient/overview.html:83
+msgid "Apply"
+msgstr ""
+
+#: nutrition/templates/ingredient/overview.html:85
+msgid "Reset"
+msgstr ""
+
+#: nutrition/templates/ingredient/view.html:46 nutrition/views/plan.py:236
msgid "Macronutrients"
msgstr "Makronährstoffe"
-#: nutrition/templates/ingredient/view.html:54
+#: nutrition/templates/ingredient/view.html:55
msgid "kJ"
msgstr "kJ"
-#: nutrition/templates/ingredient/view.html:70 nutrition/views/plan.py:267
+#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:266
msgid "Sugar content in carbohydrates"
msgstr "Davon Zucker"
-#: nutrition/templates/ingredient/view.html:75
-#: nutrition/templates/ingredient/view.html:91
-#: nutrition/templates/ingredient/view.html:113
-#: nutrition/templates/ingredient/view.html:123
+#: nutrition/templates/ingredient/view.html:76
+#: nutrition/templates/ingredient/view.html:92
+#: nutrition/templates/ingredient/view.html:114
+#: nutrition/templates/ingredient/view.html:124
msgid "n.A."
msgstr "k.A."
-#: nutrition/templates/ingredient/view.html:86 nutrition/views/plan.py:281
+#: nutrition/templates/ingredient/view.html:87 nutrition/views/plan.py:280
msgid "Saturated fat content in fats"
msgstr "Davon gesättigte Fettsäuren"
-#: nutrition/templates/ingredient/view.html:102
+#: nutrition/templates/ingredient/view.html:103
msgid "Others"
msgstr "Andere"
-#: nutrition/templates/ingredient/view.html:108 nutrition/views/plan.py:287
+#: nutrition/templates/ingredient/view.html:109 nutrition/views/plan.py:286
msgid "Fiber"
msgstr "Faser"
-#: nutrition/templates/ingredient/view.html:118 nutrition/views/plan.py:293
+#: nutrition/templates/ingredient/view.html:119 nutrition/views/plan.py:292
msgid "Sodium"
msgstr "Natrium"
-#: nutrition/templates/ingredient/view.html:143
-#: nutrition/templates/units/list.html:50 nutrition/views/unit.py:86
+#: nutrition/templates/ingredient/view.html:136
+#, fuzzy
+#| msgid "Click here for more information"
+msgid "Dietary information"
+msgstr "Hier klicken für mehr Informationen"
+
+#: nutrition/templates/ingredient/view.html:184
msgid "Add new weight unit"
msgstr "Gewichtseinheit hinzufügen"
-#: nutrition/templates/rate/form.html:25
+#: nutrition/templates/rate/form.html:26
msgid "Basal metabolic rate"
msgstr "Grundumsatz"
-#: nutrition/templates/rate/form.html:26
+#: nutrition/templates/rate/form.html:27
msgid ""
"The basal metabolic rate is the amount of energy expended daily\n"
"at rest. This is the minimum energy needed for the body to function, without "
@@ -2280,15 +2367,15 @@ msgstr ""
"funktioniert,\n"
"ohne zusätzliche Aktivitäten."
-#: nutrition/templates/rate/form.html:37
+#: nutrition/templates/rate/form.html:38
msgid "Your basic metabolic rate is: "
msgstr "Dein Grundumsatz ist: "
-#: nutrition/templates/rate/form.html:47
+#: nutrition/templates/rate/form.html:48
msgid "Physical activities"
msgstr "Körperliche Betätigung"
-#: nutrition/templates/rate/form.html:48
+#: nutrition/templates/rate/form.html:49
msgid ""
"The physical activity level (PAL) is a factor used to to express\n"
"the additional physical activity and is used to calculate the total energy\n"
@@ -2299,11 +2386,11 @@ msgstr ""
"benutzt wird, um die zusätzlichen körperlichen Betätigungen wiederzugeben\n"
"und die Gesamtmenge an Energie pro Tag zu berechnen."
-#: nutrition/templates/rate/form.html:59
+#: nutrition/templates/rate/form.html:60
msgid "Factor for daily activities: "
msgstr "PAL-Faktor: "
-#: nutrition/templates/rate/form.html:67
+#: nutrition/templates/rate/form.html:68
msgid ""
"The base caloric intake is the amount of calories your metabolism\n"
"needs based on your level of physical activity."
@@ -2311,11 +2398,11 @@ msgstr ""
"Dein Kalorienbedarf, ist die Kalorienmenge, die dein Metabolismus\n"
"täglich braucht, basierend auf deine körperliche Betätigung."
-#: nutrition/templates/rate/form.html:81
+#: nutrition/templates/rate/form.html:82
msgid "Calculate basic caloric intake"
msgstr "Kalorienbedarf berechnen"
-#: nutrition/templates/rate/form.html:88
+#: nutrition/templates/rate/form.html:89
msgid ""
"The total calories are the actual total calories per day. This\n"
"might include e.g. a surplus or deficit if you are bulking or cutting. "
@@ -2329,19 +2416,19 @@ msgstr ""
"Alternativ, kannst du einfach den Kalorienwert hier eingeben, wenn du ihn "
"kennst."
-#: nutrition/templates/rate/form.html:102
+#: nutrition/templates/rate/form.html:103
msgid "Transfer basic intake to total daily calories"
msgstr "Übertrage Kalorienbedarf nach Gesamtkalorien"
-#: nutrition/templates/rate/form.html:106
+#: nutrition/templates/rate/form.html:107
msgid "Add additional calories to total daily calories"
msgstr "Zusatzkalorien zu Gesamtkalorien hinnzufügen"
-#: nutrition/templates/rate/form.html:110
+#: nutrition/templates/rate/form.html:111
msgid "Save total calories to profile"
msgstr "Gesamtkalorien in Benutzerprofil speichern"
-#: nutrition/templates/rate/form.html:121
+#: nutrition/templates/rate/form.html:122
msgid ""
"Please note that these calculations can only be an\n"
"approximation. If you base your nutrition plan on these values, observe\n"
@@ -2351,48 +2438,48 @@ 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:158
+#: nutrition/views/ingredient.py:163
msgid "Add a new ingredient"
msgstr "Zutat hinzufügen"
-#: nutrition/views/plan.py:128
+#: nutrition/views/plan.py:127
msgid "Nutritional plan"
msgstr "Ernährungsplan"
-#: nutrition/views/plan.py:130
+#: nutrition/views/plan.py:129
#, python-format
msgid "Nutritional plan for %s"
msgstr "Ernährungsplan für %s"
-#: nutrition/views/plan.py:202
+#: nutrition/views/plan.py:201
msgid "<i>This is an empty plan, what did you expect on the PDF?</i>"
msgstr "<i>Das ist ein leerer Plan, was hast du im PDF erwartet?</i>"
-#: nutrition/views/plan.py:230
+#: nutrition/views/plan.py:229
msgid "Nutritional data"
msgstr "Ernährungswerte"
-#: nutrition/views/plan.py:238
+#: nutrition/views/plan.py:237
msgid "Total"
msgstr "Gesamt"
-#: nutrition/views/plan.py:239
+#: nutrition/views/plan.py:238
msgid "Percent of energy"
msgstr "Prozent der Energie"
-#: nutrition/views/plan.py:240
+#: nutrition/views/plan.py:239
msgid "g per body kg"
msgstr "g pro Körper-kg"
-#: nutrition/views/unit_ingredient.py:69
+#: nutrition/views/unit_ingredient.py:64
msgid "Add a new weight unit"
msgstr "Eine neue Gewichtseinheit hinzufügen"
-#: nutrition/views/unit_ingredient.py:106
+#: nutrition/views/unit_ingredient.py:99
msgid "Edit a weight unit to ingredient connection"
msgstr "Verbindung Gewichtseinheit-Zutat bearbeiten"
-#: nutrition/views/unit_ingredient.py:138
+#: nutrition/views/unit_ingredient.py:129
msgid "Delete?"
msgstr "Löschen?"
@@ -2793,7 +2880,7 @@ msgstr "Quelltext"
msgid "Translation"
msgstr "Übersetzung"
-#: utils/generic_views.py:263
+#: utils/generic_views.py:246
msgid "Yes, delete"
msgstr "Löschen bestätigen"
@@ -2847,10 +2934,6 @@ msgstr "Du musst dein Gewicht eingeben"
msgid "Import weight logs"
msgstr "Gewichtseinträge importieren"
-#: weight/templates/import_csv_form.html:9
-msgid "Submit"
-msgstr "Abschicken"
-
#: weight/templates/import_csv_form.html:15
msgid ""
"Use this import field to import your weight logs into Workout\n"
@@ -2976,6 +3059,36 @@ msgstr ""
msgid "Re-Submit"
msgstr "Wieder abschicken"
+#~ msgid "Email verification"
+#~ msgstr "E-Mail-Verifizierung"
+
+#, python-format
+#~ msgid "%(username)s, your email was verified"
+#~ msgstr "%(username)s, deine E-Mail-Adresse wurde verifiziert"
+
+#~ msgid "Error, invalid verification token"
+#~ msgstr "Fehler, ungültiger Aktivierungs-Token"
+
+#~ msgid "Email Confirmation"
+#~ msgstr "E-Mail-Bestätigung"
+
+#, python-format
+#~ msgid "You are almost there, %(username)s!"
+#~ msgstr "Fast geschafft %(username)s!"
+
+#, python-format
+#~ msgid "Please click <a href=\"%(link)s\">here</a> to confirm your email"
+#~ msgstr ""
+#~ "Bitte klicke <a href=\"%(link)s\">hier</a>, um deine E-Mail-Adresse zu "
+#~ "bestätigen"
+
+#, python-format
+#~ msgid "The token expires on %(time)s"
+#~ msgstr "Der Token läuft ab am %(time)s"
+
+#~ msgid "Ingredient weight units"
+#~ msgstr "Gewichtseinheiten für Zutaten"
+
#~ msgid "Image"
#~ msgstr "Bild"
@@ -3006,9 +3119,6 @@ msgstr "Wieder abschicken"
#~ msgid "Secondary muscles"
#~ msgstr "Sekundäre Muskeln"
-#~ msgid "Variations"
-#~ msgstr "Variationen"
-
#~ msgid "Exercise Categories"
#~ msgstr "Kategorie Übung"
@@ -4084,9 +4194,6 @@ msgstr "Wieder abschicken"
#~ msgid "This content is available under the following license:"
#~ msgstr "Dieser Inhalt ist unter der folgenden Lizenz verfügbar:"
-#~ msgid "Click here for more information"
-#~ msgstr "Hier klicken für mehr Informationen"
-
#, python-format
#~ msgid "%(name)s is too similar to existing exercise \"%(exercise_name)s\""
#~ msgstr "%(name)s ist zu ähnlich zur bestehenden Übung „%(exercise_name)s“"
@@ -4790,9 +4897,6 @@ msgstr "Wieder abschicken"
#~ msgid "Last 12 months"
#~ msgstr "Letzte 12 Monate"
-#~ msgid "No filter"
-#~ msgstr "Kein filter"
-
#~ msgid "Days"
#~ msgstr "Tage"
diff --git a/wger/locale/el/LC_MESSAGES/django.po b/wger/locale/el/LC_MESSAGES/django.po
index 1f6b21664..ce396d2d6 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: 2026-01-17 14:03+0000\n"
+"POT-Creation-Date: 2026-04-10 10:20+0000\n"
"PO-Revision-Date: 2023-10-01 07:01+0000\n"
"Last-Translator: Antonis-geo <[email protected]>\n"
"Language-Team: Greek <https://hosted.weblate.org/projects/wger/web/el/>\n"
@@ -37,7 +37,7 @@ msgstr ""
#: config/views/gym_config.py:42 core/templates/language/view.html:64
#: core/templates/license/list.html:17
#: core/templates/repetition_unit/list.html:18
-#: core/templates/user/overview.html:204 core/templates/user/overview.html:467
+#: core/templates/user/overview.html:207 core/templates/user/overview.html:470
#: core/templates/weight_unit/list.html:18
#: exercises/templates/categories/admin-overview.html:17
#: exercises/templates/equipment/admin-overview.html:17
@@ -49,30 +49,29 @@ msgstr ""
#: gym/templates/gym/list.html:19 gym/templates/gym/list.html:48
#: gym/templates/gym/member_list.html:94 gym/templates/gym/member_list.html:152
#: gym/templates/gym/member_list.html:190
-#: nutrition/templates/ingredient/view.html:164
-#: nutrition/templates/ingredient/view.html:209
-#: nutrition/templates/units/list.html:19
+#: nutrition/templates/ingredient/view.html:205
+#: nutrition/templates/ingredient/view.html:248
msgid "Edit"
msgstr "Επεξεργασία"
-#: core/forms.py:91 core/templates/navigation.html:271
-#: core/templates/navigation.html:278 core/templates/user/login.html:4
+#: core/forms.py:89 core/templates/navigation.html:268
+#: core/templates/navigation.html:275 core/templates/user/login.html:4
#: core/templates/user/registration_sidebar.html:12
#: software/templates/features.html:82 software/templates/features.html:448
msgid "Login"
msgstr "Σύνδεση"
-#: core/forms.py:130 core/forms.py:244 gym/views/export.py:61
+#: core/forms.py:128 core/forms.py:242 gym/views/export.py:61
#: gym/views/gym.py:217
msgid "First name"
msgstr "Όνομα"
-#: core/forms.py:131 core/forms.py:245 core/templates/user/overview.html:284
+#: core/forms.py:129 core/forms.py:243 core/templates/user/overview.html:287
#: gym/views/export.py:62 gym/views/gym.py:217
msgid "Last name"
msgstr "Επίθετο"
-#: core/forms.py:133 core/forms.py:210 core/templates/user/overview.html:288
+#: core/forms.py:131 core/forms.py:208 core/templates/user/overview.html:291
#: gym/models/contract.py:256 gym/models/gym.py:58
#: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:116
#: gym/templates/gym/new_user.html:30 gym/views/export.py:60
@@ -82,57 +81,57 @@ msgstr "Επίθετο"
msgid "Email"
msgstr "Email"
-#: core/forms.py:134
+#: core/forms.py:132
msgid "Used for password resets and, optionally, e-mail reminders."
msgstr ""
"Χρησιμοποιείται για επαναφορά κωδικού πρόσβασης και, προαιρετικά, "
"υπενθυμίσεις ηλεκτρονικού ταχυδρομείου."
-#: core/forms.py:138 core/models/profile.py:222
+#: core/forms.py:136 core/models/profile.py:222
#: gym/templates/gym/new_user.html:38
msgid "Date of Birth"
msgstr "Ημερομηνία Γέννησης"
-#: core/forms.py:177
+#: core/forms.py:175
msgid "Personal data"
msgstr "Προσωπικά δεδομένα"
-#: core/forms.py:189
+#: core/forms.py:187
msgid "Workout reminders"
msgstr "Υπενθύμιση προπόνησης"
-#: core/forms.py:196
+#: core/forms.py:194
msgid "Other settings"
msgstr "Άλλες ρυθμίσεις"
-#: core/forms.py:204 core/views/user.py:614 core/views/user.py:629
-#: core/views/user.py:641 gym/forms.py:73 utils/generic_views.py:143
+#: core/forms.py:202 core/views/user.py:630 core/views/user.py:654
+#: core/views/user.py:668 gym/forms.py:73 utils/generic_views.py:137
msgid "Save"
msgstr "Αποθήκευση"
-#: core/forms.py:211
+#: core/forms.py:209
msgid "Used for password resets and, optionally, email reminders."
msgstr ""
"Χρησιμοποιείται για επαναφορά κωδικού πρόσβασης και, προαιρετικά, "
"υπενθυμίσεις ηλεκτρονικού ταχυδρομείου."
-#: core/forms.py:240
+#: core/forms.py:238
msgid "This e-mail address is already in use."
msgstr "Αυτή η διεύθυνση email χρησιμοποιείται ήδη."
-#: core/forms.py:261 gym/templates/gym/new_user.html:26
+#: core/forms.py:259 gym/templates/gym/new_user.html:26
#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:217
msgid "Password"
msgstr "Κωδικός"
-#: core/forms.py:263
+#: core/forms.py:261
msgid "Please enter your current password."
msgstr "Παρακαλώ πληκτρολογήστε τον τρέχων κωδικό σας."
-#: core/forms.py:272 core/templates/language/view.html:70
+#: core/forms.py:270 core/templates/language/view.html:70
#: core/templates/license/list.html:21
#: core/templates/repetition_unit/list.html:22
-#: core/templates/user/overview.html:233
+#: core/templates/user/overview.html:236
#: core/templates/weight_unit/list.html:22
#: exercises/templates/categories/admin-overview.html:21
#: exercises/templates/equipment/admin-overview.html:21
@@ -140,27 +139,30 @@ msgstr "Παρακαλώ πληκτρολογήστε τον τρέχων κωδ
#: gym/templates/admin_notes/list.html:37
#: gym/templates/contract_option/list.html:35
#: gym/templates/contract_type/list.html:36 gym/templates/document/list.html:46
-#: gym/templates/gym/list.html:23 nutrition/templates/ingredient/view.html:168
-#: nutrition/templates/ingredient/view.html:215
-#: nutrition/templates/units/list.html:25
+#: gym/templates/gym/list.html:23 nutrition/templates/ingredient/view.html:209
+#: nutrition/templates/ingredient/view.html:254
msgid "Delete"
msgstr "Διαγραφή"
-#: core/forms.py:281
+#: core/forms.py:279
msgid "Invalid password"
msgstr "Λάθος κωδικός"
-#: core/forms.py:293
+#: core/forms.py:291 core/forms.py:349
msgid "The form is secured with reCAPTCHA"
msgstr "Η φόρμα είναι ασφαλισμένη με reCAPTCHA"
-#: core/forms.py:314 core/forms.py:341 core/templates/navigation.html:272
-#: core/templates/navigation.html:285 core/templates/template.html:123
-#: core/templates/user/login.html:21 core/views/user.py:285
+#: core/forms.py:312 core/forms.py:339 core/templates/navigation.html:269
+#: core/templates/navigation.html:282 core/templates/template.html:113
+#: core/templates/user/login.html:21 core/views/user.py:293
#: software/templates/features.html:87 software/templates/features.html:442
msgid "Register"
msgstr "Εγγραφή"
+#: core/forms.py:360 weight/templates/import_csv_form.html:9
+msgid "Submit"
+msgstr "Υποβολή"
+
#: core/models/language.py:31 core/templates/language/view.html:21
msgid "Language short name"
msgstr "Γλώσσα μικρή ονομασία"
@@ -199,36 +201,36 @@ msgstr "Σύνδεσμος"
msgid "Link to license text or other information"
msgstr "Σύνδεσμος σε κείμενο αδειοδότησης ή άλλης πληροφορίας"
-#: core/models/profile.py:57
+#: core/models/profile.py:60
#, python-format
msgid "%(birthdate)s is not a valid birthdate"
msgstr "%(birthdate)s δεν είναι σωστή ημερομηνία γέννησης"
-#: core/models/profile.py:66
+#: core/models/profile.py:69
msgid "Male"
msgstr "Άνδρας"
-#: core/models/profile.py:67
+#: core/models/profile.py:70
msgid "Female"
msgstr "Γυναίκα"
-#: core/models/profile.py:74
+#: core/models/profile.py:77
msgid "Low"
msgstr "Χαμηλό"
-#: core/models/profile.py:75
+#: core/models/profile.py:78
msgid "Medium"
msgstr "Μεσαίο"
-#: core/models/profile.py:76
+#: core/models/profile.py:79
msgid "High"
msgstr "Υψηλό"
-#: core/models/profile.py:82
+#: core/models/profile.py:85
msgid "Metric (kilogram)"
msgstr "Μετρικό (χιλιόγραμμα)"
-#: core/models/profile.py:83
+#: core/models/profile.py:86
msgid "Imperial (pound)"
msgstr "Αγγλικό (λίβρες)"
@@ -350,7 +352,7 @@ msgstr "Μέσες ώρες ανα εβδομάδα"
msgid "Free time"
msgstr "Ελεύθερη ώρα"
-#: core/models/profile.py:320 nutrition/templates/rate/form.html:66
+#: core/models/profile.py:320 nutrition/templates/rate/form.html:67
msgid "Total daily calories"
msgstr "Συνολικές ημερήσιες θερμίδες"
@@ -394,20 +396,43 @@ msgstr ""
msgid "Enable or disable the trophy system for this user"
msgstr ""
-#: core/models/profile.py:446
+#: core/models/profile.py:457
msgid "The sum of all hours has to be 24"
msgstr "Το σύνολο όλων των ωρών θα πρέπει να είναι 24"
-#: core/models/rep_unit.py:36 core/models/weight_unit.py:42
-#: core/templates/user/overview.html:280 core/views/user.py:589
+#: core/models/rep_unit.py:32 i18n.tpl:30
+msgid "Repetitions"
+msgstr "Επαναλήψεις"
+
+#: core/models/rep_unit.py:33 core/templates/user/overview.html:82
+#: exercises/templates/history/overview.html:30
+msgid "Time"
+msgstr "Ώρα"
+
+#: core/models/rep_unit.py:34
+msgid "Distance"
+msgstr ""
+
+#: core/models/rep_unit.py:47 core/models/weight_unit.py:42
+#: core/templates/user/overview.html:283 core/views/user.py:605
#: exercises/models/muscle.py:36 gym/models/contract.py:52
#: gym/models/contract.py:103 gym/models/gym.py:46
#: gym/models/user_document.py:84 gym/templates/contract/view.html:50
#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:108
-#: gym/views/gym.py:158 nutrition/templates/ingredient/view.html:151
+#: gym/views/gym.py:158 nutrition/templates/ingredient/view.html:192
msgid "Name"
msgstr "Όνομα"
+#: core/models/rep_unit.py:53
+#, fuzzy
+#| msgid "Unit"
+msgid "Unit Type"
+msgstr "Μονάδα"
+
+#: core/models/rep_unit.py:54
+msgid "The type of unit (repetitions, time, or distance)"
+msgstr ""
+
#: core/templates/403.html:4
msgid "Forbidden!"
msgstr "Απαγορεύεται!"
@@ -435,6 +460,56 @@ msgid ""
"later time. If the problem persists, you can seek help in ways listed below:"
msgstr ""
+#: core/templates/account/email/email_confirmation_message.html:81
+msgid "Almost there!"
+msgstr ""
+
+#: core/templates/account/email/email_confirmation_message.html:85
+#, fuzzy, python-format
+#| msgid ""
+#| "You're receiving this e-mail because you requested a password reset for "
+#| "your user account at %(site_name)s."
+msgid ""
+"You're receiving this email because the user \"%(user_display)s\" has given "
+"your email address to register an account on %(site_domain)s."
+msgstr ""
+"Λαμβάνετε αυτό το e-mail γιατί έχετε υποβάλλει αίτημα επαναφοράς του κωδικού "
+"για τον λογαριασμό σας στο %(site_name)s."
+
+#: core/templates/account/email/email_confirmation_message.html:93
+msgid ""
+"Your email verification code is listed below. Please enter it in your open "
+"browser window."
+msgstr ""
+
+#: core/templates/account/email/email_confirmation_message.html:100
+#, fuzzy
+#| msgid "Please click the following link to confirm your email: %(link)s"
+msgid "Please click the button below to confirm your email address."
+msgstr ""
+"Κάντε κλικ στον παρακάτω σύνδεσμο για να επιβεβαιώσετε το email σας: %(link)s"
+
+#: core/templates/account/email/email_confirmation_message.html:106
+#, fuzzy
+#| msgid "Unverified email"
+msgid "Confirm email"
+msgstr "Μη επαληθευμένο ηλεκτρονικό ταχυδρομείο"
+
+#: core/templates/account/email/email_confirmation_message.html:110
+#, python-format
+msgid ""
+"The link is valid for %(expire_hours)s hours (until %(date)s, %(time)s). You "
+"can request a new one from your profile settings."
+msgstr ""
+
+#: core/templates/account/email/email_confirmation_message.html:116
+msgid "If the button doesn't work, copy and paste this link into your browser:"
+msgstr ""
+
+#: core/templates/account/email/email_confirmation_message.html:125
+msgid "the wger Team"
+msgstr "η Ομάδα wger"
+
#: core/templates/base.html:10
#, fuzzy, python-format
#| msgid ""
@@ -480,56 +555,7 @@ msgid "Are you sure you want to delete this? This action cannot be undone."
msgstr ""
"Θέλετε σίγουρα να διαγράψετε αυτό; Αυτή η ενέργεια δεν μπορεί να αναιρεθεί."
-#: core/templates/email_verification/confirm_template.html:4
-#, fuzzy
-#| msgid "Email verified"
-msgid "Email verification"
-msgstr "Η διεύθυνση ηλεκτρονικού ταχυδρομίου επιβεβαιώθηκε"
-
-#: core/templates/email_verification/confirm_template.html:18
-#, python-format
-msgid "%(username)s, your email was verified"
-msgstr "%(username)s, το email σας επαληθεύτηκε"
-
-#: 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 "Eπιβεβαίωση ηλεκτρονικού ταχυδρομείου"
-
-#: 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 "Σχεδόν φτάσατε,%(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 ""
-"Παρακαλώ πατήστε <a href=\"%(link)s\">εδώ</a> για να επιβεβαιώσετε το email "
-"σας"
-
-#: 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 "Το διακριτικό λήγει σε %(time)s"
-
-#: core/templates/email_verification/email_body_html.tpl:14
-#: core/templates/email_verification/email_body_txt.tpl:8
-msgid "the wger Team"
-msgstr "η Ομάδα wger"
-
-#: core/templates/email_verification/email_body_txt.tpl:4
-#, python-format
-msgid "Please click the following link to confirm your email: %(link)s"
-msgstr ""
-"Κάντε κλικ στον παρακάτω σύνδεσμο για να επιβεβαιώσετε το email σας: %(link)s"
-
-#: core/templates/language/overview.html:4 core/templates/navigation.html:344
+#: core/templates/language/overview.html:4 core/templates/navigation.html:341
msgid "Languages"
msgstr "Γλώσσες"
@@ -538,16 +564,16 @@ msgid "Nothing found."
msgstr "Δεν βρέθηκε τίποτα."
#: core/templates/language/overview.html:22
-#: nutrition/templates/ingredient/overview.html:38
+#: nutrition/templates/ingredient/overview.html:43
msgid "Add one now."
msgstr "Προσθήκη τώρα."
#: core/templates/language/overview.html:34 core/templates/license/list.html:43
-#: core/templates/repetition_unit/list.html:46
-#: core/templates/user/overview.html:344 core/templates/user/overview.html:384
-#: core/templates/user/overview.html:422
-#: core/templates/weight_unit/list.html:46 core/views/languages.py:74
-#: core/views/license.py:66 core/views/repetition_units.py:66
+#: core/templates/repetition_unit/list.html:44
+#: core/templates/user/overview.html:347 core/templates/user/overview.html:387
+#: core/templates/user/overview.html:425
+#: core/templates/weight_unit/list.html:46 core/views/languages.py:77
+#: core/views/license.py:66 core/views/repetition_units.py:76
#: core/views/weight_units.py:66
#: exercises/templates/categories/admin-overview.html:40
#: exercises/templates/equipment/admin-overview.html:39
@@ -560,14 +586,14 @@ msgstr "Προσθήκη τώρα."
#: gym/templates/gym/member_list.html:264
#: gym/templates/gym/member_list.html:303
#: mailer/templates/mailer/gym/overview.html:43
-#: nutrition/templates/ingredient/overview.html:60
+#: nutrition/templates/ingredient/overview.html:97
msgid "Add"
msgstr "Προσθήκη"
#: core/templates/language/view.html:61 core/templates/user/api_key.html:41
#: core/templates/user/preferences.html:50 gym/models/contract.py:203
#: gym/templates/contract/view.html:41 gym/templates/gym/member_list.html:270
-#: nutrition/templates/ingredient/view.html:206
+#: nutrition/templates/ingredient/view.html:245
msgid "Options"
msgstr "Επιλογές"
@@ -577,9 +603,9 @@ msgstr "Λίστα αδειών"
#: core/templates/license/list.html:30
#: core/templates/repetition_unit/list.html:32
-#: core/templates/user/overview.html:104 core/templates/user/overview.html:136
-#: core/templates/user/overview.html:185 core/templates/user/overview.html:365
-#: core/templates/user/overview.html:404 core/templates/user/overview.html:448
+#: core/templates/user/overview.html:107 core/templates/user/overview.html:139
+#: core/templates/user/overview.html:188 core/templates/user/overview.html:368
+#: core/templates/user/overview.html:407 core/templates/user/overview.html:451
#: core/templates/weight_unit/list.html:32
#: exercises/templates/categories/admin-overview.html:30
#: exercises/templates/equipment/admin-overview.html:30
@@ -591,11 +617,10 @@ msgstr "Λίστα αδειών"
#: gym/templates/gym/member_list.html:284
#: gym/templates/gym/member_list.html:321
#: mailer/templates/mailer/gym/overview.html:30
-#: nutrition/templates/units/list.html:34
msgid "Nothing found"
msgstr "Δεν βρέθηκε τίποτα"
-#: core/templates/misc/about.html:4 core/templates/template.html:160
+#: core/templates/misc/about.html:4 core/templates/template.html:150
msgid "Imprint"
msgstr "Εκτύπωση"
@@ -603,164 +628,159 @@ msgstr "Εκτύπωση"
msgid "Training"
msgstr "Εξάσκηση"
-#: core/templates/navigation.html:37 core/templates/user/overview.html:25
+#: core/templates/navigation.html:36 core/templates/user/overview.html:28
msgid "Routines"
msgstr ""
-#: core/templates/navigation.html:45 core/templates/user/overview.html:70
+#: core/templates/navigation.html:44 core/templates/user/overview.html:73
msgid "Calendar"
msgstr "Ημερολόγιο"
-#: core/templates/navigation.html:55
+#: core/templates/navigation.html:53
#, fuzzy
#| msgid "Macronutrients"
msgid "Measurements"
msgstr "Θρεπτικά στοιχεία"
-#: core/templates/navigation.html:66 gallery/templates/images/overview.html:6
+#: core/templates/navigation.html:64 gallery/templates/images/overview.html:6
msgid "Gallery"
msgstr "Γκαλερί"
-#: core/templates/navigation.html:72
+#: core/templates/navigation.html:74 core/templates/navigation.html:400
+#: trophies/templates/trophies/overview.html:7
+msgid "Trophies"
+msgstr ""
+
+#: core/templates/navigation.html:79
msgid "Workout templates"
msgstr "Πρότυπα προπόνησης"
-#: core/templates/navigation.html:79
+#: core/templates/navigation.html:86
msgid "Your templates"
msgstr "Τα πρότυπά σας"
-#: core/templates/navigation.html:88
+#: core/templates/navigation.html:95
msgid "Public templates"
msgstr "Δημόσια υποδείγματα"
-#: core/templates/navigation.html:96 software/templates/features.html:51
+#: core/templates/navigation.html:103 software/templates/features.html:51
#: software/templates/features.html:480
msgid "Exercises"
msgstr "Ασκήσεις"
-#: core/templates/navigation.html:102 core/templates/navigation.html:176
-#: core/templates/navigation.html:339
+#: core/templates/navigation.html:109 core/templates/navigation.html:336
msgid "Administration"
msgstr "Διαχείριση"
-#: core/templates/navigation.html:106
+#: core/templates/navigation.html:113
msgid "Exercise edit history"
msgstr "Ιστορικό επεξεργασίας της άσκησης"
-#: core/templates/navigation.html:112
+#: core/templates/navigation.html:119
msgid "Equipment"
msgstr "Όργανα"
-#: core/templates/navigation.html:118
+#: core/templates/navigation.html:125
msgid "Muscles"
msgstr "Μύες"
-#: core/templates/navigation.html:124
+#: core/templates/navigation.html:131
#: exercises/templates/categories/admin-overview.html:4
msgid "Categories"
msgstr "Κατηγορίες"
-#: core/templates/navigation.html:139 software/templates/features.html:468
+#: core/templates/navigation.html:146 software/templates/features.html:468
msgid "Nutrition"
msgstr "Διατροφή"
-#: core/templates/navigation.html:147 core/templates/user/overview.html:144
+#: core/templates/navigation.html:154 core/templates/user/overview.html:147
msgid "Nutrition plans"
msgstr "Προγράμματα διατροφής"
-#: core/templates/navigation.html:156
+#: core/templates/navigation.html:163
msgid "BMI calculator"
msgstr "Υπολογιστής BMI"
-#: core/templates/navigation.html:165 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:172 nutrition/templates/rate/form.html:18
msgid "Daily calories calculator"
msgstr "Υπολογιστής ημερήσιων θερμίδων"
-#: core/templates/navigation.html:171
+#: core/templates/navigation.html:178
#: nutrition/templates/ingredient/overview.html:10
msgid "Ingredient overview"
msgstr "Επισκόπηση συστατικών"
-#: core/templates/navigation.html:180 nutrition/templates/units/list.html:6
-msgid "Ingredient weight units"
-msgstr "Μονάδες βάρους συστατικών"
-
-#: core/templates/navigation.html:196 software/templates/features.html:463
+#: core/templates/navigation.html:193 software/templates/features.html:463
msgid "Body weight"
msgstr "Σωματικό βάρος"
-#: core/templates/navigation.html:203 core/templates/user/overview.html:114
+#: core/templates/navigation.html:200 core/templates/user/overview.html:117
msgid "Weight overview"
msgstr "Επισκόπηση βάρους"
-#: core/templates/navigation.html:217
+#: core/templates/navigation.html:214
msgid "About this software"
msgstr "Σχετικά"
-#: core/templates/navigation.html:223 software/templates/about_us.html:5
+#: core/templates/navigation.html:220 software/templates/about_us.html:5
msgid "Support & Get Involved"
msgstr ""
-#: core/templates/navigation.html:229 software/templates/features.html:528
+#: core/templates/navigation.html:226 software/templates/features.html:528
msgid "REST API"
msgstr "REST API"
-#: core/templates/navigation.html:235 utils/models.py:45
+#: core/templates/navigation.html:232 utils/models.py:45
msgid "License"
msgstr "Άδεια"
-#: core/templates/navigation.html:241
+#: core/templates/navigation.html:238
msgid "Developer documentation"
msgstr "Τεκμηρίωση προγραμματιστή"
-#: core/templates/navigation.html:248
+#: core/templates/navigation.html:245
msgid "Get the code"
msgstr "Κατεβάστε τον κώδικα"
-#: core/templates/navigation.html:255 core/templates/template.html:199
-#: software/templates/features.html:603
+#: core/templates/navigation.html:252 core/templates/template.html:202
+#: software/templates/features.html:614
msgid "Translate"
msgstr "Μετάφραση"
-#: core/templates/navigation.html:292 core/templates/user/login.html:30
+#: core/templates/navigation.html:289 core/templates/user/login.html:30
msgid "Reset password"
msgstr "Επαναφορά κωδικού"
-#: core/templates/navigation.html:301 core/templates/navigation.html:329
+#: core/templates/navigation.html:298 core/templates/navigation.html:326
msgid "Logout"
msgstr "Έξοδος"
-#: core/templates/navigation.html:320
+#: core/templates/navigation.html:317
msgid "My preferences"
msgstr "Οι προτιμήσεις μου"
-#: core/templates/navigation.html:352
+#: core/templates/navigation.html:349
msgid "Licenses"
msgstr "Άδειες"
-#: core/templates/navigation.html:360
+#: core/templates/navigation.html:357
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr "Μονάδες επανάληψης"
-#: core/templates/navigation.html:368 core/templates/weight_unit/list.html:4
-#: nutrition/templates/ingredient/view.html:141
+#: core/templates/navigation.html:365 core/templates/weight_unit/list.html:4
+#: nutrition/templates/ingredient/view.html:182
msgid "Weight units"
msgstr "Μονάδες βάρους"
-#: core/templates/navigation.html:376 core/templates/user/list.html:4
+#: core/templates/navigation.html:373 core/templates/user/list.html:4
msgid "User list"
msgstr "Λίστα χρήστη"
-#: core/templates/navigation.html:382
+#: core/templates/navigation.html:379
msgid "Gyms"
msgstr "Γυμναστήρια"
-#: core/templates/navigation.html:403
-#: trophies/templates/trophies/overview.html:7
-msgid "Trophies"
-msgstr ""
-
#: core/templates/registration/password_reset_complete.html:4
msgid "Password reset complete"
msgstr "Ολοκληρώθηκε η αλλαγή κωδικού"
@@ -823,27 +843,31 @@ msgstr "προηγούμενο"
msgid "next"
msgstr "επόμενο"
-#: core/templates/template.html:96
+#: core/templates/template.html:86
msgid "Close"
msgstr "Κλείσιμο"
-#: core/templates/template.html:112
+#: core/templates/template.html:102
msgid ""
"You are using a guest account, data entered will be deleted after a week."
msgstr ""
"Χρησιμοποιείτε έναν λογαριασμό επισκέπτη. Τα δεδομένα που εισάγετε θα "
"διαγραφούν σε μία εβδομάδα."
-#: core/templates/template.html:117
+#: core/templates/template.html:107
msgid "Create some demo entries"
msgstr "Δημιουργήστε μερικές δοκιμαστικές εγγραφές"
-#: core/templates/template.html:165 software/templates/features.html:568
+#: core/templates/template.html:155 software/templates/features.html:568
#: software/templates/tos.html:7
msgid "Terms of service"
msgstr "Όροι χρήσης"
-#: core/templates/template_features.html:53 software/templates/features.html:9
+#: core/templates/template.html:181 software/templates/features.html:595
+msgid "Browser language"
+msgstr ""
+
+#: core/templates/template_features.html:46 software/templates/features.html:9
msgid "Features"
msgstr "Δυνατότητες"
@@ -902,99 +926,94 @@ msgstr "Δεν έχετε λογαριασμό;"
msgid "Forgot password?"
msgstr "Ξεχάσατε τον κωδικό σας;"
-#: core/templates/user/overview.html:25 core/templates/user/overview.html:68
-#: core/templates/user/overview.html:112 core/templates/user/overview.html:144
-#: core/templates/user/overview.html:348 core/templates/user/overview.html:390
-#: core/templates/user/overview.html:426
+#: core/templates/user/overview.html:28 core/templates/user/overview.html:71
+#: core/templates/user/overview.html:115 core/templates/user/overview.html:147
+#: core/templates/user/overview.html:351 core/templates/user/overview.html:393
+#: core/templates/user/overview.html:429
#, python-format
msgid "last %(number)s"
msgstr "τελευταίο %(number)s"
-#: core/templates/user/overview.html:27 core/templates/user/overview.html:146
-#: core/templates/user/overview.html:343 core/templates/user/overview.html:382
-#: core/templates/user/overview.html:421 gym/templates/gym/member_list.html:226
+#: core/templates/user/overview.html:30 core/templates/user/overview.html:149
+#: core/templates/user/overview.html:346 core/templates/user/overview.html:385
+#: core/templates/user/overview.html:424 gym/templates/gym/member_list.html:226
#: gym/templates/gym/member_list.html:262
#: gym/templates/gym/member_list.html:302
msgid "Overview"
msgstr "Έπισκόπηση"
-#: core/templates/user/overview.html:34 core/templates/user/overview.html:76
-#: core/templates/user/overview.html:120 core/templates/user/overview.html:152
+#: core/templates/user/overview.html:37 core/templates/user/overview.html:79
+#: core/templates/user/overview.html:123 core/templates/user/overview.html:155
#: manager/helpers.py:88 software/templates/about_us.html:170
#: weight/templates/import_csv_preview.html:13
#: weight/templates/import_csv_preview.html:42 weight/views.py:54
msgid "Date"
msgstr "Ημερομηνία"
-#: core/templates/user/overview.html:35 core/templates/user/overview.html:153
+#: core/templates/user/overview.html:38 core/templates/user/overview.html:156
#: gym/models/contract.py:58 gym/models/contract.py:109
msgid "Description"
msgstr "Περιγραφή"
-#: core/templates/user/overview.html:36
+#: core/templates/user/overview.html:39
msgid "Number of logs (days)"
msgstr "Αριθμός ιστορικών (ημέρες)"
-#: core/templates/user/overview.html:37 core/views/user.py:590
+#: core/templates/user/overview.html:40 core/views/user.py:606
#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:158
msgid "Last activity"
msgstr "Τελευταία δραστηριότητα"
-#: core/templates/user/overview.html:58
+#: core/templates/user/overview.html:61
msgid "No workouts found."
msgstr "Δεν βρέθηκαν προπονήσεις."
-#: core/templates/user/overview.html:68
+#: core/templates/user/overview.html:71
msgid "Log"
msgstr "Ιστορικό"
-#: core/templates/user/overview.html:77
+#: core/templates/user/overview.html:80
msgid "General impression"
msgstr "Γενική εικόνα"
-#: core/templates/user/overview.html:78 core/templates/user/overview.html:390
+#: core/templates/user/overview.html:81 core/templates/user/overview.html:393
msgid "Notes"
msgstr "Σημειώσεις"
-#: core/templates/user/overview.html:79
-#: exercises/templates/history/overview.html:30
-msgid "Time"
-msgstr "Ώρα"
-
-#: core/templates/user/overview.html:112 core/templates/user/overview.html:121
+#: core/templates/user/overview.html:115 core/templates/user/overview.html:124
#: manager/helpers.py:89 weight/templates/import_csv_preview.html:14
#: weight/templates/import_csv_preview.html:43 weight/views.py:54
msgid "Weight"
msgstr "Βάρος"
-#: core/templates/user/overview.html:154
-#: nutrition/templates/ingredient/view.html:51 nutrition/views/plan.py:245
+#: core/templates/user/overview.html:157
+#: nutrition/templates/ingredient/view.html:52 nutrition/views/plan.py:244
msgid "Energy"
msgstr "Ενέργεια"
-#: core/templates/user/overview.html:155
-#: nutrition/templates/ingredient/view.html:58 nutrition/views/plan.py:251
+#: core/templates/user/overview.html:158
+#: nutrition/templates/ingredient/view.html:59 nutrition/views/plan.py:250
msgid "Protein"
msgstr "Προτεϊνες"
-#: core/templates/user/overview.html:156
-#: nutrition/templates/ingredient/view.html:64 nutrition/views/plan.py:259
+#: core/templates/user/overview.html:159
+#: nutrition/templates/ingredient/view.html:65 nutrition/views/plan.py:258
msgid "Carbohydrates"
msgstr "Υδατάνθρακες"
-#: core/templates/user/overview.html:157
-#: nutrition/templates/ingredient/view.html:80 nutrition/views/plan.py:273
+#: core/templates/user/overview.html:160
+#: nutrition/templates/ingredient/view.html:81 nutrition/views/plan.py:272
msgid "Fat"
msgstr "Λιπαρή ύλη"
-#: core/templates/user/overview.html:170
-#: nutrition/templates/ingredient/view.html:53
+#: core/templates/user/overview.html:173
+#: nutrition/templates/ingredient/view.html:54
msgid "kcal"
msgstr "kcal"
-#: core/templates/user/overview.html:201 core/templates/user/overview.html:340
-#: core/templates/user/overview.html:379 core/templates/user/overview.html:418
-#: core/templates/user/overview.html:463 gym/templates/gym/list.html:45
+#: core/templates/user/overview.html:204 core/templates/user/overview.html:343
+#: core/templates/user/overview.html:382 core/templates/user/overview.html:421
+#: core/templates/user/overview.html:466 gym/templates/gym/list.html:45
#: gym/templates/gym/member_list.html:91 gym/templates/gym/member_list.html:149
#: gym/templates/gym/member_list.html:187
#: gym/templates/gym/member_list.html:223
@@ -1003,109 +1022,113 @@ msgstr "kcal"
msgid "Actions"
msgstr "Ενέργειες"
-#: core/templates/user/overview.html:210
+#: core/templates/user/overview.html:213
msgid "Deactivate user"
msgstr "Απενεργοποίηση χρήστη"
-#: core/templates/user/overview.html:214
+#: core/templates/user/overview.html:217
msgid "Activate user"
msgstr "Ενεργοποίηση χρήστη"
-#: core/templates/user/overview.html:223
+#: core/templates/user/overview.html:226
msgid "Reset user password"
msgstr "Επαναφορά κωδικού πρόσβασης χρήστη"
-#: core/templates/user/overview.html:227 gym/templates/gym/member_list.html:30
+#: core/templates/user/overview.html:230 gym/templates/gym/member_list.html:30
msgid "Roles"
msgstr "Ρόλοι"
-#: core/templates/user/overview.html:243
+#: core/templates/user/overview.html:246
msgid "Password reset confirmation"
msgstr "Επιβεβαίωση αλλαγής κωδικού"
-#: core/templates/user/overview.html:247
+#: core/templates/user/overview.html:250
msgid "Do you really want to change this user&#39;s password?"
msgstr "Θέλετε πραγματικά να αλλάξετε τον κωδικό πρόσβασης αυτού του χρήστη;"
-#: core/templates/user/overview.html:250
+#: core/templates/user/overview.html:253
#: exercises/templates/history/overview.html:106
+#: nutrition/templates/ingredient/view.html:148
+#: nutrition/templates/ingredient/view.html:160
msgid "No"
msgstr "Οχι"
-#: core/templates/user/overview.html:251
+#: core/templates/user/overview.html:254
#: exercises/templates/history/overview.html:99
+#: nutrition/templates/ingredient/view.html:146
+#: nutrition/templates/ingredient/view.html:158
msgid "Yes"
msgstr "Ναι"
-#: core/templates/user/overview.html:272 gym/templates/gym/member_list.html:105
+#: core/templates/user/overview.html:275 gym/templates/gym/member_list.html:105
msgid "Details"
msgstr "Λεπτομέρειες"
-#: core/templates/user/overview.html:276 gym/views/export.py:57
-#: manager/helpers.py:89 nutrition/views/plan.py:151
-#: nutrition/views/plan.py:157
+#: core/templates/user/overview.html:279 gym/views/export.py:57
+#: manager/helpers.py:89 nutrition/views/plan.py:150
+#: nutrition/views/plan.py:156
msgid "Nr."
msgstr "Νο."
-#: core/templates/user/overview.html:298 gym/models/contract.py:287
+#: core/templates/user/overview.html:301 gym/models/contract.py:287
#: gym/models/gym.py:50 gym/templates/contract/view.html:75
#: gym/templates/gym/member_list.html:112 gym/views/export.py:68
msgid "Phone"
msgstr "Τηλέφωνο"
-#: core/templates/user/overview.html:302 gym/templates/contract/view.html:87
+#: core/templates/user/overview.html:305 gym/templates/contract/view.html:87
#: gym/templates/gym/member_list.html:130
msgid "Address"
msgstr "Διεύθυνση"
-#: core/templates/user/overview.html:313
+#: core/templates/user/overview.html:316
msgid "Registered"
msgstr "Εγγεγραμμένοι"
-#: core/templates/user/overview.html:317
+#: core/templates/user/overview.html:320
msgid "Last login"
msgstr "Τελευταία είσοδος"
-#: core/templates/user/overview.html:322
+#: core/templates/user/overview.html:325
msgid "Status"
msgstr "Κατάσταση"
-#: core/templates/user/overview.html:325
+#: core/templates/user/overview.html:328
msgid "Active"
msgstr "Ενεργό"
-#: core/templates/user/overview.html:327
+#: core/templates/user/overview.html:330
msgid "Inactive"
msgstr "Ανενεργό"
-#: core/templates/user/overview.html:348 gym/templates/contract/list.html:4
+#: core/templates/user/overview.html:351 gym/templates/contract/list.html:4
#: gym/templates/gym/member_list.html:218
msgid "Contracts"
msgstr "Συμβόλαια"
-#: core/templates/user/overview.html:426 gym/templates/document/list.html:4
+#: core/templates/user/overview.html:429 gym/templates/document/list.html:4
msgid "Documents"
msgstr "Έγγραφα"
-#: core/templates/user/overview.html:433 gym/templates/document/list.html:33
+#: core/templates/user/overview.html:436 gym/templates/document/list.html:33
msgid "Download"
msgstr "Μεταφόρτωση"
-#: core/templates/user/overview.html:474 gym/views/admin_config.py:44
+#: core/templates/user/overview.html:477 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:477 gym/models/user_config.py:92
+#: core/templates/user/overview.html:480 gym/models/user_config.py:92
msgid "Include in inactive overview"
msgstr "Να συμπεριλαμβάνεται στην μη ενεργή επισκόπηση"
-#: core/templates/user/overview.html:510
+#: core/templates/user/overview.html:513
#, python-format
msgid "Admin login is only available for users in %(gym_name)s"
msgstr "Η σύνδεση διαχειριστή είναι διαθέσιμη μόνο για χρήστες σε%(gym_name)s"
-#: core/templates/user/overview.html:514
+#: core/templates/user/overview.html:517
msgid "Log in as this user"
msgstr "Είσοδος ως αυτόν τον χρήστη"
@@ -1129,7 +1152,7 @@ msgstr "Στείλτε μήνυμα ηλεκτρονικού ταχυδρομε
msgid "You need to verify your email to contribute exercises"
msgstr "Πρέπει να επαληθεύσετε το email σας για να συνεισφέρετε σε ασκήσεις"
-#: core/templates/user/preferences.html:55 core/views/user.py:601
+#: core/templates/user/preferences.html:55 core/views/user.py:617
msgid "Change password"
msgstr "Αλλάξτε κωδικό"
@@ -1137,23 +1160,23 @@ msgstr "Αλλάξτε κωδικό"
msgid "Already have an account?"
msgstr ""
-#: core/templatetags/wger_extras.py:142 i18n.tpl:38
+#: core/templatetags/wger_extras.py:142 i18n.tpl:39
msgid "kg"
msgstr "kg"
#: core/templatetags/wger_extras.py:144
-#: nutrition/templates/ingredient/view.html:60
-#: nutrition/templates/ingredient/view.html:66
-#: nutrition/templates/ingredient/view.html:73
-#: nutrition/templates/ingredient/view.html:82
-#: nutrition/templates/ingredient/view.html:89
-#: nutrition/templates/ingredient/view.html:111
-#: nutrition/templates/ingredient/view.html:121
+#: nutrition/templates/ingredient/view.html:61
+#: nutrition/templates/ingredient/view.html:67
+#: nutrition/templates/ingredient/view.html:74
+#: nutrition/templates/ingredient/view.html:83
+#: nutrition/templates/ingredient/view.html:90
+#: nutrition/templates/ingredient/view.html:112
+#: nutrition/templates/ingredient/view.html:122
msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr "γρ"
-#: core/templatetags/wger_extras.py:147 i18n.tpl:39
+#: core/templatetags/wger_extras.py:147 i18n.tpl:40
msgid "lb"
msgstr "lb"
@@ -1162,36 +1185,35 @@ msgctxt "weight unit, i.e. ounces"
msgid "oz"
msgstr "oz"
-#: core/views/languages.py:85 exercises/views/categories.py:122
+#: core/views/languages.py:88 exercises/views/categories.py:122
#: exercises/views/equipment.py:103 exercises/views/muscles.py:99
-#: nutrition/views/ingredient.py:120 nutrition/views/unit.py:110
+#: nutrition/views/ingredient.py:125
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
+#: core/views/languages.py:96 core/views/license.py:103
+#: core/views/repetition_units.py:114 core/views/weight_units.py:115
#: exercises/views/categories.py:128 exercises/views/muscles.py:106
#: gallery/views/images.py:124 gym/views/admin_notes.py:196
#: gym/views/document.py:206 gym/views/gym.py:481
-#: nutrition/views/ingredient.py:127 nutrition/views/unit.py:117
+#: nutrition/views/ingredient.py:132
#, python-brace-format
msgid "Delete {0}?"
msgstr "Διαγραφή {0};"
-#: core/views/languages.py:111 core/views/license.py:85
-#: core/views/repetition_units.py:86 core/views/user.py:464
+#: core/views/languages.py:114 core/views/license.py:85
+#: core/views/repetition_units.py:96 core/views/user.py:480
#: core/views/weight_units.py:86 exercises/views/categories.py:98
#: exercises/views/equipment.py:81 exercises/views/muscles.py:87
#: gym/views/admin_notes.py:161 gym/views/config.py:68
#: gym/views/contract.py:186 gym/views/contract_option.py:123
#: gym/views/contract_type.py:123 gym/views/document.py:171
-#: gym/views/gym.py:463 nutrition/views/ingredient.py:146
-#: nutrition/views/unit.py:143
+#: gym/views/gym.py:463 nutrition/views/ingredient.py:151
#, python-brace-format
msgid "Edit {0}"
msgstr "Επεξεργασία {0}"
-#: core/views/misc.py:74
+#: core/views/misc.py:73
msgid ""
"We have created sample workout, workout schedules, weight logs, (body) "
"weight and nutrition plan entries so you can better see what this site can "
@@ -1202,48 +1224,48 @@ msgstr ""
"δείτε τι\tμπορεί να κάνει αυτός ο ιστότοπος. Νιώστε ελεύθερος να τις "
"επεξεργαστείτε ή να τις διαγράψετε!"
-#: core/views/user.py:143
+#: core/views/user.py:145
#, python-brace-format
msgid "Account \"{0}\" was successfully deleted"
msgstr "Ο λογαριασμός \"{0}\" διαγράφηκε με επιτυχία"
-#: core/views/user.py:279
+#: core/views/user.py:287
msgid "You were successfully registered"
msgstr "Εγγραφήκατε με επιτυχία"
-#: core/views/user.py:341
+#: core/views/user.py:357
msgid "Settings successfully updated"
msgstr "Οι ρυθμίσεις ανανεώθηκαν με επιτυχία"
-#: core/views/user.py:380
+#: core/views/user.py:396
msgid "The user was successfully deactivated"
msgstr "Ο χρήστης απενεργοποιήθηκε με επιτυχία"
-#: core/views/user.py:417
+#: core/views/user.py:433
msgid "The user was successfully activated"
msgstr "Ο χρήστης ενεργοποιήθηκε με επιτυχία"
-#: core/views/user.py:432
+#: core/views/user.py:448
msgid "Edit user"
msgstr "Επεξεργασία χρήστη"
-#: core/views/user.py:587 gym/templates/gym/member_list.html:26
+#: core/views/user.py:603 gym/templates/gym/member_list.html:26
#: gym/views/gym.py:158
msgid "ID"
msgstr "ID"
-#: core/views/user.py:588 gym/forms.py:95 gym/templates/contract/view.html:55
+#: core/views/user.py:604 gym/forms.py:95 gym/templates/contract/view.html:55
#: gym/templates/gym/member_list.html:27 gym/views/export.py:59
#: gym/views/gym.py:158 gym/views/gym.py:217
msgid "Username"
msgstr "Όνομα χρήστη"
-#: core/views/user.py:591 gym/templates/gym/new_user.html:34
+#: core/views/user.py:607 gym/templates/gym/new_user.html:34
#: gym/views/export.py:58 gym/views/gym.py:217
msgid "Gym"
msgstr "Γυμναστήριο"
-#: core/views/user.py:650
+#: core/views/user.py:678
#, python-format
msgid "A verification email was sent to %(email)s"
msgstr "Ένα μήνυμα ηλεκτρονικού ταχυδρομείου επαλήθευσης εστάλη στον%(email)s"
@@ -1260,16 +1282,16 @@ msgstr "Εναλλακτικό όνομα"
msgid "A more basic name for the muscle"
msgstr "Μια πιο βασική ονομασία για τον μυ"
-#: exercises/models/video.py:50
+#: exercises/models/video.py:52
#, python-format
msgid "Maximum file size is %(size)sMB."
msgstr "Το μέγιστο μέγεθος αρχείου είναι%(size)sΜΒ."
-#: exercises/models/video.py:57 exercises/models/video.py:65
+#: exercises/models/video.py:59 exercises/models/video.py:67
msgid "File type is not supported"
msgstr "Ο τύπος αρχείου δεν υποστηρίζεται"
-#: exercises/models/video.py:70
+#: exercises/models/video.py:72
msgid "File is not a valid video"
msgstr "Το αρχείο δεν είναι έγκυρο βίντεο"
@@ -1341,7 +1363,11 @@ msgstr "Διαγραφή εξοπλισμού;"
msgid "Add muscle"
msgstr "Νέος μύς"
-#: gallery/templates/images/overview.html:72
+#: gallery/forms.py:35
+msgid "If date is left empty, it will be read from the image instead"
+msgstr ""
+
+#: gallery/templates/images/overview.html:69
msgid "Add image"
msgstr "Προσθέστε εικόνα"
@@ -1410,7 +1436,7 @@ msgid "Contract type"
msgstr "Τύπος συμβολαίου"
#: gym/models/contract.py:211 gym/templates/contract/view.html:59
-#: nutrition/forms.py:58
+#: nutrition/forms.py:67
msgid "Amount"
msgstr "Ποσότητα"
@@ -1589,7 +1615,7 @@ msgstr "Μηνύματα ηλεκτρονικού ταχυδρομείου"
msgid "Add member"
msgstr "Νέο μέλος"
-#: gym/templates/gym/new_user.html:48 nutrition/templates/rate/form.html:120
+#: gym/templates/gym/new_user.html:48 nutrition/templates/rate/form.html:121
msgid "Info"
msgstr "Πληροφορίες"
@@ -1762,10 +1788,6 @@ msgstr "Μπάρα έλξης"
msgid "Quads"
msgstr "Τετρακέφαλοι"
-#: i18n.tpl:30
-msgid "Repetitions"
-msgstr "Επαναλήψεις"
-
#: i18n.tpl:31
msgid "Resistance band"
msgstr ""
@@ -1794,198 +1816,204 @@ msgstr "Τρικέφαλοι"
msgid "Until Failure"
msgstr "Μέχρι την αποτυχία"
-#: i18n.tpl:40
+#: i18n.tpl:38
+#, fuzzy
+#| msgid "Kilometers"
+msgid "Meters"
+msgstr "Χιλιόμετρα"
+
+#: i18n.tpl:41
msgid "none (bodyweight exercise)"
msgstr "κανένα (άσκηση με το βάρος σώματος)"
-#: i18n.tpl:41
+#: i18n.tpl:42
msgid "Beginner"
msgstr ""
-#: i18n.tpl:42
+#: i18n.tpl:43
#, fuzzy
#| msgctxt "As in \"content of an email\""
#| msgid "Content"
msgid "Consistent"
msgstr "Περιεχόμενο"
-#: i18n.tpl:43
+#: i18n.tpl:44
msgid "Dedicated"
msgstr ""
-#: i18n.tpl:44
+#: i18n.tpl:45
msgid "Obsessed"
msgstr ""
-#: i18n.tpl:45
+#: i18n.tpl:46
msgid "Legend"
msgstr "Υπόμνημα"
-#: i18n.tpl:46
+#: i18n.tpl:47
msgid "Veteran"
msgstr ""
-#: i18n.tpl:47
+#: i18n.tpl:48
msgid "Titan"
msgstr ""
-#: i18n.tpl:48
+#: i18n.tpl:49
msgid "Unstoppable"
msgstr ""
-#: i18n.tpl:49
+#: i18n.tpl:50
msgid "Weekend Warrior"
msgstr ""
-#: i18n.tpl:50
+#: i18n.tpl:51
msgid "Elephant lifter"
msgstr ""
-#: i18n.tpl:51
+#: i18n.tpl:52
msgid "Bus lifter"
msgstr ""
-#: i18n.tpl:52
+#: i18n.tpl:53
msgid "Plane lifter"
msgstr ""
-#: i18n.tpl:53
+#: i18n.tpl:54
msgid "Blue whale lifter"
msgstr ""
-#: i18n.tpl:54
+#: i18n.tpl:55
msgid "Space Station lifter"
msgstr ""
-#: i18n.tpl:55
+#: i18n.tpl:56
msgid "Millionaire"
msgstr ""
-#: i18n.tpl:56
+#: i18n.tpl:57
msgid "Atlas"
msgstr ""
-#: i18n.tpl:57
+#: i18n.tpl:58
msgid "Early Bird"
msgstr ""
-#: i18n.tpl:58
+#: i18n.tpl:59
#, fuzzy
#| msgid "Weight log"
msgid "Night Owl"
msgstr "Εγγραφή βάρους"
-#: i18n.tpl:59
+#: i18n.tpl:60
msgid "New Year, New Me"
msgstr ""
-#: i18n.tpl:60
+#: i18n.tpl:61
msgid "Phoenix"
msgstr ""
-#: i18n.tpl:61
+#: i18n.tpl:62
#, fuzzy
#| msgid "Personal data"
msgid "Personal Record"
msgstr "Προσωπικά δεδομένα"
-#: i18n.tpl:62
+#: i18n.tpl:63
#, fuzzy
#| msgid "Copy workout"
msgid "Complete your first workout"
msgstr "Αντιγραφή προπόνησης"
-#: i18n.tpl:63
+#: i18n.tpl:64
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 10 workouts"
msgstr "Δείγμα προπόνησης"
-#: i18n.tpl:64
+#: i18n.tpl:65
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 50 workouts"
msgstr "Δείγμα προπόνησης"
-#: i18n.tpl:65
+#: i18n.tpl:66
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 100 workouts"
msgstr "Δείγμα προπόνησης"
-#: i18n.tpl:66
+#: i18n.tpl:67
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 200 workouts"
msgstr "Δείγμα προπόνησης"
-#: i18n.tpl:67
+#: i18n.tpl:68
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 500 workouts"
msgstr "Δείγμα προπόνησης"
-#: i18n.tpl:68
+#: i18n.tpl:69
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 1000 workouts"
msgstr "Δείγμα προπόνησης"
-#: i18n.tpl:69
+#: i18n.tpl:70
msgid "Maintain a 30-day workout streak"
msgstr ""
-#: i18n.tpl:70
+#: i18n.tpl:71
msgid "Work out on Saturday and Sunday for 4 consecutive weekends"
msgstr ""
-#: i18n.tpl:71
+#: i18n.tpl:72
msgid "Lift a cumulative total of 5.000 kg"
msgstr ""
-#: i18n.tpl:72
+#: i18n.tpl:73
msgid "Lift a cumulative total of 20.000 kg"
msgstr ""
-#: i18n.tpl:73
+#: i18n.tpl:74
msgid "Lift a cumulative total of 50.000 kg"
msgstr ""
-#: i18n.tpl:74
+#: i18n.tpl:75
msgid "Lift a cumulative total of 150.000 kg"
msgstr ""
-#: i18n.tpl:75
+#: i18n.tpl:76
msgid "Lift a cumulative total of 450.000 kg"
msgstr ""
-#: i18n.tpl:76
+#: i18n.tpl:77
msgid "Lift a cumulative total of 1.000.000 kg"
msgstr ""
-#: i18n.tpl:77
+#: i18n.tpl:78
msgid "Lift a cumulative total of 10.000.000 kg"
msgstr ""
-#: i18n.tpl:78
+#: i18n.tpl:79
msgid "Complete a workout before 6:00 AM"
msgstr ""
-#: i18n.tpl:79
+#: i18n.tpl:80
msgid "Complete a workout after 9:00 PM"
msgstr ""
-#: i18n.tpl:80
+#: i18n.tpl:81
#, fuzzy
#| msgid "Workout for %s"
msgid "Work out on January 1st"
msgstr "Προπόνηση για %s"
-#: i18n.tpl:81
+#: i18n.tpl:82
msgid "Return to training after being inactive for 30 days"
msgstr ""
-#: i18n.tpl:82
+#: i18n.tpl:83
msgid "Achieve a new Personal Record on any exercise"
msgstr ""
@@ -2073,7 +2101,7 @@ msgstr "Άσκηση"
msgid "Routine will expire soon"
msgstr "Η προπόνηση θα λήξει σε λίγο"
-#: manager/models/routine.py:153 manager/models/session.py:145
+#: manager/models/routine.py:154 manager/models/session.py:145
msgid "The start time cannot be after the end time."
msgstr "Η ώρα έναρξης δεν μπορεί να είναι μετά την ώρα λήξης."
@@ -2164,23 +2192,27 @@ msgstr "Προπόνηση"
msgid "Workout for %s"
msgstr "Προπόνηση για %s"
-#: nutrition/forms.py:62
+#: nutrition/extract_info/off.py:72 nutrition/extract_info/off.py:91
+msgid "Serving"
+msgstr ""
+
+#: nutrition/forms.py:71 nutrition/forms.py:208
msgid "Unit"
msgstr "Μονάδα"
-#: nutrition/forms.py:170 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:179 nutrition/templates/rate/form.html:77
msgid "Basic caloric intake"
msgstr "Βασική εισαγωγή θερμίδων"
-#: nutrition/forms.py:171
+#: nutrition/forms.py:180
msgid "Your basic caloric intake as calculated for your data"
msgstr "Η βασική σας εισαγωγή θερμίδων όπως υπολογίστηκε απο τα δεδομένα σας"
-#: nutrition/forms.py:176
+#: nutrition/forms.py:185
msgid "Additional calories"
msgstr "Επιπλέον θερμίδες"
-#: nutrition/forms.py:178
+#: nutrition/forms.py:187
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
@@ -2189,13 +2221,31 @@ msgstr ""
"αρνητικό αριθμό)"
#: nutrition/forms.py:209
+msgid "grams (g)"
+msgstr ""
+
+#: nutrition/forms.py:219
msgid "Ingredient"
msgstr "Συστατικά"
-#: nutrition/forms.py:213
+#: nutrition/forms.py:223
msgid "Also search for names in English"
msgstr "Αναζητήστε επίσης ονόματα στα αγγλικά"
+#: nutrition/forms.py:239
+msgid "Quantity"
+msgstr ""
+
+#: nutrition/forms.py:241
+msgid "Enter a quantity and choose grams (g) or one of the serving units."
+msgstr ""
+
+#: nutrition/models/ingredient.py:526
+#, fuzzy
+#| msgid "Correction"
+msgid "Portion"
+msgstr "Διόρθωση"
+
#: nutrition/templates/ingredient/email_new.tpl:1
#, python-format
msgid ""
@@ -2247,59 +2297,90 @@ msgstr ""
"όταν εγγραφήκατε, θα ειδοποιηθείτε για την εξέλιξη της όταν ολοκληρωθεί με "
"επιτυχία."
-#: nutrition/templates/ingredient/overview.html:38
+#: nutrition/templates/ingredient/overview.html:32
+#: nutrition/templates/ingredient/overview.html:68
+#: nutrition/templates/ingredient/view.html:143
+msgid "Vegan"
+msgstr ""
+
+#: nutrition/templates/ingredient/overview.html:34
+#: nutrition/templates/ingredient/overview.html:79
+#: nutrition/templates/ingredient/view.html:155
+#, fuzzy
+#| msgid "Variations"
+msgid "Vegetarian"
+msgstr "Διαφοροποιήσεις"
+
+#: nutrition/templates/ingredient/overview.html:43
msgid "No ingredients."
msgstr "Δεν υπάρχουν συστατικά."
-#: nutrition/templates/ingredient/overview.html:49
+#: nutrition/templates/ingredient/overview.html:54
msgid "Search"
msgstr "Εύρεση"
-#: nutrition/templates/ingredient/view.html:45 nutrition/views/plan.py:237
+#: nutrition/templates/ingredient/overview.html:57
+msgid "Filter"
+msgstr ""
+
+#: nutrition/templates/ingredient/overview.html:83
+msgid "Apply"
+msgstr ""
+
+#: nutrition/templates/ingredient/overview.html:85
+msgid "Reset"
+msgstr ""
+
+#: nutrition/templates/ingredient/view.html:46 nutrition/views/plan.py:236
msgid "Macronutrients"
msgstr "Θρεπτικά στοιχεία"
-#: nutrition/templates/ingredient/view.html:54
+#: nutrition/templates/ingredient/view.html:55
msgid "kJ"
msgstr "kJ"
-#: nutrition/templates/ingredient/view.html:70 nutrition/views/plan.py:267
+#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:266
msgid "Sugar content in carbohydrates"
msgstr "Περιεχόμενο σάκχαρων σε υδατάνθρακες"
-#: nutrition/templates/ingredient/view.html:75
-#: nutrition/templates/ingredient/view.html:91
-#: nutrition/templates/ingredient/view.html:113
-#: nutrition/templates/ingredient/view.html:123
+#: nutrition/templates/ingredient/view.html:76
+#: nutrition/templates/ingredient/view.html:92
+#: nutrition/templates/ingredient/view.html:114
+#: nutrition/templates/ingredient/view.html:124
msgid "n.A."
msgstr "Μη διαθέσιμο"
-#: nutrition/templates/ingredient/view.html:86 nutrition/views/plan.py:281
+#: nutrition/templates/ingredient/view.html:87 nutrition/views/plan.py:280
msgid "Saturated fat content in fats"
msgstr "Εκ των οποίων κορεσμένα λίπη"
-#: nutrition/templates/ingredient/view.html:102
+#: nutrition/templates/ingredient/view.html:103
msgid "Others"
msgstr "Άλλα"
-#: nutrition/templates/ingredient/view.html:108 nutrition/views/plan.py:287
+#: nutrition/templates/ingredient/view.html:109 nutrition/views/plan.py:286
msgid "Fiber"
msgstr ""
-#: nutrition/templates/ingredient/view.html:118 nutrition/views/plan.py:293
+#: nutrition/templates/ingredient/view.html:119 nutrition/views/plan.py:292
msgid "Sodium"
msgstr "Νάτριο"
-#: nutrition/templates/ingredient/view.html:143
-#: nutrition/templates/units/list.html:50 nutrition/views/unit.py:86
+#: nutrition/templates/ingredient/view.html:136
+#, fuzzy
+#| msgid "Click here for more information"
+msgid "Dietary information"
+msgstr "Κάντε κλίκ εδώ για περισσότερες πληροφορίες"
+
+#: nutrition/templates/ingredient/view.html:184
msgid "Add new weight unit"
msgstr "Προσθήκη νέας μονάδας βάρους"
-#: nutrition/templates/rate/form.html:25
+#: nutrition/templates/rate/form.html:26
msgid "Basal metabolic rate"
msgstr "Βασικός μεταβολικός ρυθμός"
-#: nutrition/templates/rate/form.html:26
+#: nutrition/templates/rate/form.html:27
msgid ""
"The basal metabolic rate is the amount of energy expended daily\n"
"at rest. This is the minimum energy needed for the body to function, without "
@@ -2312,15 +2393,15 @@ msgstr ""
"λειτουργήσει, χωρίς\n"
"επιπρόσθετες σωματικές δραστηριότητες."
-#: nutrition/templates/rate/form.html:37
+#: nutrition/templates/rate/form.html:38
msgid "Your basic metabolic rate is: "
msgstr "Ο βασικός μεταβολικός ρυθμός σας είναι: "
-#: nutrition/templates/rate/form.html:47
+#: nutrition/templates/rate/form.html:48
msgid "Physical activities"
msgstr "Σωματικές δραστηριότητες"
-#: nutrition/templates/rate/form.html:48
+#: nutrition/templates/rate/form.html:49
msgid ""
"The physical activity level (PAL) is a factor used to to express\n"
"the additional physical activity and is used to calculate the total energy\n"
@@ -2332,11 +2413,11 @@ msgstr ""
"συνολικής ενέργειας\n"
"που απαιτείται ανα μέρα."
-#: nutrition/templates/rate/form.html:59
+#: nutrition/templates/rate/form.html:60
msgid "Factor for daily activities: "
msgstr "Παράγοντας για καθημερινές δραστηριότητες: "
-#: nutrition/templates/rate/form.html:67
+#: nutrition/templates/rate/form.html:68
msgid ""
"The base caloric intake is the amount of calories your metabolism\n"
"needs based on your level of physical activity."
@@ -2344,11 +2425,11 @@ msgstr ""
"Η βασική λήψη θερμίδων είναι η ποσότητα των θερμίδων που ο μεταβολισμός σας\n"
"χρειάζεται βάσει του επιπέδου της φυσικής σας δραστηριότητας."
-#: nutrition/templates/rate/form.html:81
+#: nutrition/templates/rate/form.html:82
msgid "Calculate basic caloric intake"
msgstr "Υπολογισμός βασικής λήψης θερμίδων"
-#: nutrition/templates/rate/form.html:88
+#: nutrition/templates/rate/form.html:89
msgid ""
"The total calories are the actual total calories per day. This\n"
"might include e.g. a surplus or deficit if you are bulking or cutting. "
@@ -2362,19 +2443,19 @@ msgstr ""
"μπορείτε να εισάγετε μόνοι σας την ποσότητα των θερμίδων αν γνωρίζετε την "
"ποσότητα."
-#: nutrition/templates/rate/form.html:102
+#: nutrition/templates/rate/form.html:103
msgid "Transfer basic intake to total daily calories"
msgstr "Μεταφορά βασικής λήψης στις συνολικές ημερήσιες θερμίδες"
-#: nutrition/templates/rate/form.html:106
+#: nutrition/templates/rate/form.html:107
msgid "Add additional calories to total daily calories"
msgstr "Προσθήκη επιπλέον θερμίδες στις ημερήσιες συνολικές θερμίδες"
-#: nutrition/templates/rate/form.html:110
+#: nutrition/templates/rate/form.html:111
msgid "Save total calories to profile"
msgstr "Αποθήκευση συνολικών θερμίδων στο προφίλ"
-#: nutrition/templates/rate/form.html:121
+#: nutrition/templates/rate/form.html:122
msgid ""
"Please note that these calculations can only be an\n"
"approximation. If you base your nutrition plan on these values, observe\n"
@@ -2386,49 +2467,49 @@ msgstr ""
"τον εαυτό σας τις προσεχείς εβδομάδες και αλλάξτε την συνολική ποσότητα αν "
"απαιτείται."
-#: nutrition/views/ingredient.py:158
+#: nutrition/views/ingredient.py:163
msgid "Add a new ingredient"
msgstr "Προσθήκη νέου συστατικού"
-#: nutrition/views/plan.py:128
+#: nutrition/views/plan.py:127
msgid "Nutritional plan"
msgstr "Διατροφικό σχέδιο"
-#: nutrition/views/plan.py:130
+#: nutrition/views/plan.py:129
#, python-format
msgid "Nutritional plan for %s"
msgstr "Διατροφικό σχέδιο για %s"
-#: nutrition/views/plan.py:202
+#: nutrition/views/plan.py:201
msgid "<i>This is an empty plan, what did you expect on the PDF?</i>"
msgstr ""
"<i>Αυτό είναι ένα άδειο πρόγραμμα, τί περιμένατε να δείτε σε αυτό το PDF;</i>"
-#: nutrition/views/plan.py:230
+#: nutrition/views/plan.py:229
msgid "Nutritional data"
msgstr "Διατροφικά δεδομένα"
-#: nutrition/views/plan.py:238
+#: nutrition/views/plan.py:237
msgid "Total"
msgstr "Σύνολο"
-#: nutrition/views/plan.py:239
+#: nutrition/views/plan.py:238
msgid "Percent of energy"
msgstr "Ποσοστό ενέργειας"
-#: nutrition/views/plan.py:240
+#: nutrition/views/plan.py:239
msgid "g per body kg"
msgstr "g ανα kg σώματος"
-#: nutrition/views/unit_ingredient.py:69
+#: nutrition/views/unit_ingredient.py:64
msgid "Add a new weight unit"
msgstr "Προσθήκη μιας νέας μονάδας βάρους"
-#: nutrition/views/unit_ingredient.py:106
+#: nutrition/views/unit_ingredient.py:99
msgid "Edit a weight unit to ingredient connection"
msgstr "Επεξεργασία μια μονάδας βάρους στον συσχετισμό συστατικού"
-#: nutrition/views/unit_ingredient.py:138
+#: nutrition/views/unit_ingredient.py:129
msgid "Delete?"
msgstr "Διαγραφη;"
@@ -2831,7 +2912,7 @@ msgstr "Πηγαίος Κώδικας"
msgid "Translation"
msgstr "Μετάφραση"
-#: utils/generic_views.py:263
+#: utils/generic_views.py:246
msgid "Yes, delete"
msgstr "Ναί, διαγραφή"
@@ -2885,10 +2966,6 @@ msgstr "Πρέπει να εισάγετε το βάρος σας"
msgid "Import weight logs"
msgstr "Εισαγωγή ιστορικών βάρους"
-#: weight/templates/import_csv_form.html:9
-msgid "Submit"
-msgstr "Υποβολή"
-
#: weight/templates/import_csv_form.html:15
msgid ""
"Use this import field to import your weight logs into Workout\n"
@@ -3013,6 +3090,38 @@ msgstr ""
msgid "Re-Submit"
msgstr "Επανυποβολή"
+#, fuzzy
+#~| msgid "Email verified"
+#~ msgid "Email verification"
+#~ msgstr "Η διεύθυνση ηλεκτρονικού ταχυδρομίου επιβεβαιώθηκε"
+
+#, python-format
+#~ msgid "%(username)s, your email was verified"
+#~ msgstr "%(username)s, το email σας επαληθεύτηκε"
+
+#~ msgid "Error, invalid verification token"
+#~ msgstr "Σφάλμα, μη έγκυρο διακριτικό επαλήθευσης"
+
+#~ msgid "Email Confirmation"
+#~ msgstr "Eπιβεβαίωση ηλεκτρονικού ταχυδρομείου"
+
+#, python-format
+#~ msgid "You are almost there, %(username)s!"
+#~ msgstr "Σχεδόν φτάσατε,%(username)s!"
+
+#, python-format
+#~ msgid "Please click <a href=\"%(link)s\">here</a> to confirm your email"
+#~ msgstr ""
+#~ "Παρακαλώ πατήστε <a href=\"%(link)s\">εδώ</a> για να επιβεβαιώσετε το "
+#~ "email σας"
+
+#, python-format
+#~ msgid "The token expires on %(time)s"
+#~ msgstr "Το διακριτικό λήγει σε %(time)s"
+
+#~ msgid "Ingredient weight units"
+#~ msgstr "Μονάδες βάρους συστατικών"
+
#~ msgid "Image"
#~ msgstr "Εικόνα"
@@ -3043,9 +3152,6 @@ msgstr "Επανυποβολή"
#~ msgid "Secondary muscles"
#~ msgstr "Δευτερεύοντες μύς"
-#~ msgid "Variations"
-#~ msgstr "Διαφοροποιήσεις"
-
#~ msgid "Exercise Categories"
#~ msgstr "Κατηγορίες ασκήσεων"
@@ -4105,9 +4211,6 @@ msgstr "Επανυποβολή"
#~ msgid "This content is available under the following license:"
#~ msgstr "Το περιεχόμενο είναι διαθέσιμο κάτω απο τις ακόλουθες άδειες:"
-#~ msgid "Click here for more information"
-#~ msgstr "Κάντε κλίκ εδώ για περισσότερες πληροφορίες"
-
#~ msgid "Add training day"
#~ msgstr "Προσθήκη ημέρας προπόνησης"
diff --git a/wger/locale/es/LC_MESSAGES/django.po b/wger/locale/es/LC_MESSAGES/django.po
index a2c7a07f3..bbbdafb28 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: 2026-01-17 14:03+0000\n"
+"POT-Creation-Date: 2026-04-10 10:20+0000\n"
"PO-Revision-Date: 2026-02-17 22:09+0000\n"
"Last-Translator: David Peñas <[email protected]>\n"
"Language-Team: Spanish <https://hosted.weblate.org/projects/wger/web/es/>\n"
@@ -42,7 +42,7 @@ msgstr ""
#: config/views/gym_config.py:42 core/templates/language/view.html:64
#: core/templates/license/list.html:17
#: core/templates/repetition_unit/list.html:18
-#: core/templates/user/overview.html:204 core/templates/user/overview.html:467
+#: core/templates/user/overview.html:207 core/templates/user/overview.html:470
#: core/templates/weight_unit/list.html:18
#: exercises/templates/categories/admin-overview.html:17
#: exercises/templates/equipment/admin-overview.html:17
@@ -54,30 +54,29 @@ msgstr ""
#: gym/templates/gym/list.html:19 gym/templates/gym/list.html:48
#: gym/templates/gym/member_list.html:94 gym/templates/gym/member_list.html:152
#: gym/templates/gym/member_list.html:190
-#: nutrition/templates/ingredient/view.html:164
-#: nutrition/templates/ingredient/view.html:209
-#: nutrition/templates/units/list.html:19
+#: nutrition/templates/ingredient/view.html:205
+#: nutrition/templates/ingredient/view.html:248
msgid "Edit"
msgstr "Editar"
-#: core/forms.py:91 core/templates/navigation.html:271
-#: core/templates/navigation.html:278 core/templates/user/login.html:4
+#: core/forms.py:89 core/templates/navigation.html:268
+#: core/templates/navigation.html:275 core/templates/user/login.html:4
#: core/templates/user/registration_sidebar.html:12
#: software/templates/features.html:82 software/templates/features.html:448
msgid "Login"
msgstr "Ingresar"
-#: core/forms.py:130 core/forms.py:244 gym/views/export.py:61
+#: core/forms.py:128 core/forms.py:242 gym/views/export.py:61
#: gym/views/gym.py:217
msgid "First name"
msgstr "Nombre"
-#: core/forms.py:131 core/forms.py:245 core/templates/user/overview.html:284
+#: core/forms.py:129 core/forms.py:243 core/templates/user/overview.html:287
#: gym/views/export.py:62 gym/views/gym.py:217
msgid "Last name"
msgstr "Apellido"
-#: core/forms.py:133 core/forms.py:210 core/templates/user/overview.html:288
+#: core/forms.py:131 core/forms.py:208 core/templates/user/overview.html:291
#: gym/models/contract.py:256 gym/models/gym.py:58
#: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:116
#: gym/templates/gym/new_user.html:30 gym/views/export.py:60
@@ -87,57 +86,57 @@ msgstr "Apellido"
msgid "Email"
msgstr "Correo electrónico"
-#: core/forms.py:134
+#: core/forms.py:132
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:138 core/models/profile.py:222
+#: core/forms.py:136 core/models/profile.py:222
#: gym/templates/gym/new_user.html:38
msgid "Date of Birth"
msgstr "Fecha de cumpleaños"
-#: core/forms.py:177
+#: core/forms.py:175
msgid "Personal data"
msgstr "Datos personales"
-#: core/forms.py:189
+#: core/forms.py:187
msgid "Workout reminders"
msgstr "Recordatorios de entrenamiento"
-#: core/forms.py:196
+#: core/forms.py:194
msgid "Other settings"
msgstr "Otras configuraciones"
-#: core/forms.py:204 core/views/user.py:614 core/views/user.py:629
-#: core/views/user.py:641 gym/forms.py:73 utils/generic_views.py:143
+#: core/forms.py:202 core/views/user.py:630 core/views/user.py:654
+#: core/views/user.py:668 gym/forms.py:73 utils/generic_views.py:137
msgid "Save"
msgstr "Guardar"
-#: core/forms.py:211
+#: core/forms.py:209
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:240
+#: core/forms.py:238
msgid "This e-mail address is already in use."
msgstr "Esta dirección de correo ya está en uso."
-#: core/forms.py:261 gym/templates/gym/new_user.html:26
+#: core/forms.py:259 gym/templates/gym/new_user.html:26
#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:217
msgid "Password"
msgstr "Contraseña"
-#: core/forms.py:263
+#: core/forms.py:261
msgid "Please enter your current password."
msgstr "Por favor, ingrese su contraseña actual."
-#: core/forms.py:272 core/templates/language/view.html:70
+#: core/forms.py:270 core/templates/language/view.html:70
#: core/templates/license/list.html:21
#: core/templates/repetition_unit/list.html:22
-#: core/templates/user/overview.html:233
+#: core/templates/user/overview.html:236
#: core/templates/weight_unit/list.html:22
#: exercises/templates/categories/admin-overview.html:21
#: exercises/templates/equipment/admin-overview.html:21
@@ -145,27 +144,30 @@ msgstr "Por favor, ingrese su contraseña actual."
#: gym/templates/admin_notes/list.html:37
#: gym/templates/contract_option/list.html:35
#: gym/templates/contract_type/list.html:36 gym/templates/document/list.html:46
-#: gym/templates/gym/list.html:23 nutrition/templates/ingredient/view.html:168
-#: nutrition/templates/ingredient/view.html:215
-#: nutrition/templates/units/list.html:25
+#: gym/templates/gym/list.html:23 nutrition/templates/ingredient/view.html:209
+#: nutrition/templates/ingredient/view.html:254
msgid "Delete"
msgstr "Borrar"
-#: core/forms.py:281
+#: core/forms.py:279
msgid "Invalid password"
msgstr "Contraseña incorrecta"
-#: core/forms.py:293
+#: core/forms.py:291 core/forms.py:349
msgid "The form is secured with reCAPTCHA"
msgstr "El Formulario está asegurado por recaptcha"
-#: core/forms.py:314 core/forms.py:341 core/templates/navigation.html:272
-#: core/templates/navigation.html:285 core/templates/template.html:123
-#: core/templates/user/login.html:21 core/views/user.py:285
+#: core/forms.py:312 core/forms.py:339 core/templates/navigation.html:269
+#: core/templates/navigation.html:282 core/templates/template.html:113
+#: core/templates/user/login.html:21 core/views/user.py:293
#: software/templates/features.html:87 software/templates/features.html:442
msgid "Register"
msgstr "Registrarse"
+#: core/forms.py:360 weight/templates/import_csv_form.html:9
+msgid "Submit"
+msgstr "Enviar"
+
#: core/models/language.py:31 core/templates/language/view.html:21
msgid "Language short name"
msgstr "Idioma - nombre corto"
@@ -202,36 +204,36 @@ msgstr "Enlace"
msgid "Link to license text or other information"
msgstr "Enlace al texto u otra información de la licencia"
-#: core/models/profile.py:57
+#: core/models/profile.py:60
#, python-format
msgid "%(birthdate)s is not a valid birthdate"
msgstr "%(birthdate)s Fecha de nacimiento no valida"
-#: core/models/profile.py:66
+#: core/models/profile.py:69
msgid "Male"
msgstr "Hombre"
-#: core/models/profile.py:67
+#: core/models/profile.py:70
msgid "Female"
msgstr "Mujer"
-#: core/models/profile.py:74
+#: core/models/profile.py:77
msgid "Low"
msgstr "Bajo"
-#: core/models/profile.py:75
+#: core/models/profile.py:78
msgid "Medium"
msgstr "Medio"
-#: core/models/profile.py:76
+#: core/models/profile.py:79
msgid "High"
msgstr "Alto"
-#: core/models/profile.py:82
+#: core/models/profile.py:85
msgid "Metric (kilogram)"
msgstr "Métrico (kilogramos)"
-#: core/models/profile.py:83
+#: core/models/profile.py:86
msgid "Imperial (pound)"
msgstr "Imperial (libra)"
@@ -356,7 +358,7 @@ msgstr "Media de horas por día"
msgid "Free time"
msgstr "Tiempo libre"
-#: core/models/profile.py:320 nutrition/templates/rate/form.html:66
+#: core/models/profile.py:320 nutrition/templates/rate/form.html:67
msgid "Total daily calories"
msgstr "Calorías totales diarias"
@@ -399,20 +401,45 @@ msgstr "Activar trofeos"
msgid "Enable or disable the trophy system for this user"
msgstr "Activar o desactivar sistema de trofeos para este usuario"
-#: core/models/profile.py:446
+#: core/models/profile.py:457
msgid "The sum of all hours has to be 24"
msgstr "La suma de todas las horas tiene que ser 24"
-#: core/models/rep_unit.py:36 core/models/weight_unit.py:42
-#: core/templates/user/overview.html:280 core/views/user.py:589
+#: core/models/rep_unit.py:32 i18n.tpl:30
+msgid "Repetitions"
+msgstr "Repeticiones"
+
+#: core/models/rep_unit.py:33 core/templates/user/overview.html:82
+#: exercises/templates/history/overview.html:30
+msgid "Time"
+msgstr "Tiempo"
+
+#: core/models/rep_unit.py:34
+#, fuzzy
+#| msgid "Resistance band"
+msgid "Distance"
+msgstr "Banda de resistencia"
+
+#: core/models/rep_unit.py:47 core/models/weight_unit.py:42
+#: core/templates/user/overview.html:283 core/views/user.py:605
#: exercises/models/muscle.py:36 gym/models/contract.py:52
#: gym/models/contract.py:103 gym/models/gym.py:46
#: gym/models/user_document.py:84 gym/templates/contract/view.html:50
#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:108
-#: gym/views/gym.py:158 nutrition/templates/ingredient/view.html:151
+#: gym/views/gym.py:158 nutrition/templates/ingredient/view.html:192
msgid "Name"
msgstr "Nombre"
+#: core/models/rep_unit.py:53
+#, fuzzy
+#| msgid "Unit"
+msgid "Unit Type"
+msgstr "Unidad"
+
+#: core/models/rep_unit.py:54
+msgid "The type of unit (repetitions, time, or distance)"
+msgstr ""
+
#: core/templates/403.html:4
msgid "Forbidden!"
msgstr "¡Prohibido!"
@@ -444,6 +471,57 @@ msgstr ""
"Si el problema persiste, puede solicitar ayuda de las formas que se indican "
"a continuación:"
+#: core/templates/account/email/email_confirmation_message.html:81
+msgid "Almost there!"
+msgstr ""
+
+#: core/templates/account/email/email_confirmation_message.html:85
+#, fuzzy, python-format
+#| msgid ""
+#| "You're receiving this e-mail because you requested a password reset for "
+#| "your user account at %(site_name)s."
+msgid ""
+"You're receiving this email because the user \"%(user_display)s\" has given "
+"your email address to register an account on %(site_domain)s."
+msgstr ""
+"Estás recibiendo este correo electrónico porque has solicitado restablecer "
+"la contraseña para tu cuenta en %(site_name)s."
+
+#: core/templates/account/email/email_confirmation_message.html:93
+msgid ""
+"Your email verification code is listed below. Please enter it in your open "
+"browser window."
+msgstr ""
+
+#: core/templates/account/email/email_confirmation_message.html:100
+#, fuzzy
+#| msgid "Please click the following link to confirm your email: %(link)s"
+msgid "Please click the button below to confirm your email address."
+msgstr ""
+"Haga clic en el siguiente enlace para confirmar su correo electrónico: %"
+"(link)s"
+
+#: core/templates/account/email/email_confirmation_message.html:106
+#, fuzzy
+#| msgid "Unverified email"
+msgid "Confirm email"
+msgstr "Correo electrónico no verificado"
+
+#: core/templates/account/email/email_confirmation_message.html:110
+#, python-format
+msgid ""
+"The link is valid for %(expire_hours)s hours (until %(date)s, %(time)s). You "
+"can request a new one from your profile settings."
+msgstr ""
+
+#: core/templates/account/email/email_confirmation_message.html:116
+msgid "If the button doesn't work, copy and paste this link into your browser:"
+msgstr ""
+
+#: core/templates/account/email/email_confirmation_message.html:125
+msgid "the wger Team"
+msgstr "El Equipo Wger"
+
#: core/templates/base.html:10
#, python-format
msgid ""
@@ -476,54 +554,7 @@ 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 verification"
-msgstr "Verificación del correo electrónico"
-
-#: core/templates/email_verification/confirm_template.html:18
-#, python-format
-msgid "%(username)s, your email was verified"
-msgstr "%(username)s, tu correo electrónico ha sido verificado"
-
-#: core/templates/email_verification/confirm_template.html:22
-msgid "Error, invalid verification token"
-msgstr "Error, token de verificación no válido"
-
-#: core/templates/email_verification/email_body_html.tpl:6
-msgid "Email Confirmation"
-msgstr "Confirmación de correo electrónico"
-
-#: 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 "¡Ya casi estás, %(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 ""
-"Haga clic <a href=\"%(link)s\">aquí</a> para confirmar su correo electrónico"
-
-#: 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 "El token caduca el %(time)s"
-
-#: core/templates/email_verification/email_body_html.tpl:14
-#: core/templates/email_verification/email_body_txt.tpl:8
-msgid "the wger Team"
-msgstr "El Equipo Wger"
-
-#: core/templates/email_verification/email_body_txt.tpl:4
-#, python-format
-msgid "Please click the following link to confirm your email: %(link)s"
-msgstr ""
-"Haga clic en el siguiente enlace para confirmar su correo electrónico: "
-"%(link)s"
-
-#: core/templates/language/overview.html:4 core/templates/navigation.html:344
+#: core/templates/language/overview.html:4 core/templates/navigation.html:341
msgid "Languages"
msgstr "Idiomas"
@@ -532,16 +563,16 @@ msgid "Nothing found."
msgstr "No se ha encontrado nada."
#: core/templates/language/overview.html:22
-#: nutrition/templates/ingredient/overview.html:38
+#: nutrition/templates/ingredient/overview.html:43
msgid "Add one now."
msgstr "Añadir ahora."
#: core/templates/language/overview.html:34 core/templates/license/list.html:43
-#: core/templates/repetition_unit/list.html:46
-#: core/templates/user/overview.html:344 core/templates/user/overview.html:384
-#: core/templates/user/overview.html:422
-#: core/templates/weight_unit/list.html:46 core/views/languages.py:74
-#: core/views/license.py:66 core/views/repetition_units.py:66
+#: core/templates/repetition_unit/list.html:44
+#: core/templates/user/overview.html:347 core/templates/user/overview.html:387
+#: core/templates/user/overview.html:425
+#: core/templates/weight_unit/list.html:46 core/views/languages.py:77
+#: core/views/license.py:66 core/views/repetition_units.py:76
#: core/views/weight_units.py:66
#: exercises/templates/categories/admin-overview.html:40
#: exercises/templates/equipment/admin-overview.html:39
@@ -554,14 +585,14 @@ msgstr "Añadir ahora."
#: gym/templates/gym/member_list.html:264
#: gym/templates/gym/member_list.html:303
#: mailer/templates/mailer/gym/overview.html:43
-#: nutrition/templates/ingredient/overview.html:60
+#: nutrition/templates/ingredient/overview.html:97
msgid "Add"
msgstr "Añadir"
#: core/templates/language/view.html:61 core/templates/user/api_key.html:41
#: core/templates/user/preferences.html:50 gym/models/contract.py:203
#: gym/templates/contract/view.html:41 gym/templates/gym/member_list.html:270
-#: nutrition/templates/ingredient/view.html:206
+#: nutrition/templates/ingredient/view.html:245
msgid "Options"
msgstr "Opciones"
@@ -571,9 +602,9 @@ msgstr "Listado de licencias"
#: core/templates/license/list.html:30
#: core/templates/repetition_unit/list.html:32
-#: core/templates/user/overview.html:104 core/templates/user/overview.html:136
-#: core/templates/user/overview.html:185 core/templates/user/overview.html:365
-#: core/templates/user/overview.html:404 core/templates/user/overview.html:448
+#: core/templates/user/overview.html:107 core/templates/user/overview.html:139
+#: core/templates/user/overview.html:188 core/templates/user/overview.html:368
+#: core/templates/user/overview.html:407 core/templates/user/overview.html:451
#: core/templates/weight_unit/list.html:32
#: exercises/templates/categories/admin-overview.html:30
#: exercises/templates/equipment/admin-overview.html:30
@@ -585,11 +616,10 @@ msgstr "Listado de licencias"
#: gym/templates/gym/member_list.html:284
#: gym/templates/gym/member_list.html:321
#: mailer/templates/mailer/gym/overview.html:30
-#: nutrition/templates/units/list.html:34
msgid "Nothing found"
msgstr "No se ha encontrado nada"
-#: core/templates/misc/about.html:4 core/templates/template.html:160
+#: core/templates/misc/about.html:4 core/templates/template.html:150
msgid "Imprint"
msgstr "Imprimir"
@@ -597,162 +627,157 @@ msgstr "Imprimir"
msgid "Training"
msgstr "Entrenamiento"
-#: core/templates/navigation.html:37 core/templates/user/overview.html:25
+#: core/templates/navigation.html:36 core/templates/user/overview.html:28
msgid "Routines"
msgstr "Rutinas"
-#: core/templates/navigation.html:45 core/templates/user/overview.html:70
+#: core/templates/navigation.html:44 core/templates/user/overview.html:73
msgid "Calendar"
msgstr "Calendario"
-#: core/templates/navigation.html:55
+#: core/templates/navigation.html:53
msgid "Measurements"
msgstr "Mediciones"
-#: core/templates/navigation.html:66 gallery/templates/images/overview.html:6
+#: core/templates/navigation.html:64 gallery/templates/images/overview.html:6
msgid "Gallery"
msgstr "Galería"
-#: core/templates/navigation.html:72
+#: core/templates/navigation.html:74 core/templates/navigation.html:400
+#: trophies/templates/trophies/overview.html:7
+msgid "Trophies"
+msgstr "Trofeos"
+
+#: core/templates/navigation.html:79
msgid "Workout templates"
msgstr "Plantillas de entrenamiento"
-#: core/templates/navigation.html:79
+#: core/templates/navigation.html:86
msgid "Your templates"
msgstr "Tus plantillas"
-#: core/templates/navigation.html:88
+#: core/templates/navigation.html:95
msgid "Public templates"
msgstr "Plantillas públicas"
-#: core/templates/navigation.html:96 software/templates/features.html:51
+#: core/templates/navigation.html:103 software/templates/features.html:51
#: software/templates/features.html:480
msgid "Exercises"
msgstr "Ejercicios"
-#: core/templates/navigation.html:102 core/templates/navigation.html:176
-#: core/templates/navigation.html:339
+#: core/templates/navigation.html:109 core/templates/navigation.html:336
msgid "Administration"
msgstr "Administración"
-#: core/templates/navigation.html:106
+#: core/templates/navigation.html:113
msgid "Exercise edit history"
msgstr "Historial de edición de ejercicios"
-#: core/templates/navigation.html:112
+#: core/templates/navigation.html:119
msgid "Equipment"
msgstr "Equipo"
-#: core/templates/navigation.html:118
+#: core/templates/navigation.html:125
msgid "Muscles"
msgstr "Músculos"
-#: core/templates/navigation.html:124
+#: core/templates/navigation.html:131
#: exercises/templates/categories/admin-overview.html:4
msgid "Categories"
msgstr "Categorias"
-#: core/templates/navigation.html:139 software/templates/features.html:468
+#: core/templates/navigation.html:146 software/templates/features.html:468
msgid "Nutrition"
msgstr "Nutrición"
-#: core/templates/navigation.html:147 core/templates/user/overview.html:144
+#: core/templates/navigation.html:154 core/templates/user/overview.html:147
msgid "Nutrition plans"
msgstr "Planes nutritionales"
-#: core/templates/navigation.html:156
+#: core/templates/navigation.html:163
msgid "BMI calculator"
msgstr "Calculadora de IMC"
-#: core/templates/navigation.html:165 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:172 nutrition/templates/rate/form.html:18
msgid "Daily calories calculator"
msgstr "Caluladora de calorias diarias"
-#: core/templates/navigation.html:171
+#: core/templates/navigation.html:178
#: nutrition/templates/ingredient/overview.html:10
msgid "Ingredient overview"
msgstr "Índice de ingredientes"
-#: core/templates/navigation.html:180 nutrition/templates/units/list.html:6
-msgid "Ingredient weight units"
-msgstr "Unidades de peso de los ingredientes"
-
-#: core/templates/navigation.html:196 software/templates/features.html:463
+#: core/templates/navigation.html:193 software/templates/features.html:463
msgid "Body weight"
msgstr "Peso corporal"
-#: core/templates/navigation.html:203 core/templates/user/overview.html:114
+#: core/templates/navigation.html:200 core/templates/user/overview.html:117
msgid "Weight overview"
msgstr "Índice de peso"
-#: core/templates/navigation.html:217
+#: core/templates/navigation.html:214
msgid "About this software"
msgstr "Sobre este programa"
-#: core/templates/navigation.html:223 software/templates/about_us.html:5
+#: core/templates/navigation.html:220 software/templates/about_us.html:5
msgid "Support & Get Involved"
msgstr "Apoyo y Participación"
-#: core/templates/navigation.html:229 software/templates/features.html:528
+#: core/templates/navigation.html:226 software/templates/features.html:528
msgid "REST API"
msgstr "REST API"
-#: core/templates/navigation.html:235 utils/models.py:45
+#: core/templates/navigation.html:232 utils/models.py:45
msgid "License"
msgstr "Licencia"
-#: core/templates/navigation.html:241
+#: core/templates/navigation.html:238
msgid "Developer documentation"
msgstr "Documentación para desarrolladores"
-#: core/templates/navigation.html:248
+#: core/templates/navigation.html:245
msgid "Get the code"
msgstr "Código fuente"
-#: core/templates/navigation.html:255 core/templates/template.html:199
-#: software/templates/features.html:603
+#: core/templates/navigation.html:252 core/templates/template.html:202
+#: software/templates/features.html:614
msgid "Translate"
msgstr "Traduce"
-#: core/templates/navigation.html:292 core/templates/user/login.html:30
+#: core/templates/navigation.html:289 core/templates/user/login.html:30
msgid "Reset password"
msgstr "Restablecer la contraseña"
-#: core/templates/navigation.html:301 core/templates/navigation.html:329
+#: core/templates/navigation.html:298 core/templates/navigation.html:326
msgid "Logout"
msgstr "Cerrar sesión"
-#: core/templates/navigation.html:320
+#: core/templates/navigation.html:317
msgid "My preferences"
msgstr "Mis preferencias"
-#: core/templates/navigation.html:352
+#: core/templates/navigation.html:349
msgid "Licenses"
msgstr "Licencias"
-#: core/templates/navigation.html:360
+#: core/templates/navigation.html:357
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr "Unidades de repetición"
-#: core/templates/navigation.html:368 core/templates/weight_unit/list.html:4
-#: nutrition/templates/ingredient/view.html:141
+#: core/templates/navigation.html:365 core/templates/weight_unit/list.html:4
+#: nutrition/templates/ingredient/view.html:182
msgid "Weight units"
msgstr "Unidades de peso"
-#: core/templates/navigation.html:376 core/templates/user/list.html:4
+#: core/templates/navigation.html:373 core/templates/user/list.html:4
msgid "User list"
msgstr "Lista de usuarios"
-#: core/templates/navigation.html:382
+#: core/templates/navigation.html:379
msgid "Gyms"
msgstr "Gimnasios"
-#: core/templates/navigation.html:403
-#: trophies/templates/trophies/overview.html:7
-msgid "Trophies"
-msgstr "Trofeos"
-
#: core/templates/registration/password_reset_complete.html:4
msgid "Password reset complete"
msgstr "Restablecimiento de contraseña completado"
@@ -815,27 +840,31 @@ msgstr "anterior"
msgid "next"
msgstr "próximo"
-#: core/templates/template.html:96
+#: core/templates/template.html:86
msgid "Close"
msgstr "Cerrar"
-#: core/templates/template.html:112
+#: core/templates/template.html:102
msgid ""
"You are using a guest account, data entered will be deleted after a week."
msgstr ""
"Estás usando una cuenta de invitado, los datos que introduzcas se borrarán "
"en una semana."
-#: core/templates/template.html:117
+#: core/templates/template.html:107
msgid "Create some demo entries"
msgstr "Crear datos de ejemplo"
-#: core/templates/template.html:165 software/templates/features.html:568
+#: core/templates/template.html:155 software/templates/features.html:568
#: software/templates/tos.html:7
msgid "Terms of service"
msgstr "Términos de servicio"
-#: core/templates/template_features.html:53 software/templates/features.html:9
+#: core/templates/template.html:181 software/templates/features.html:595
+msgid "Browser language"
+msgstr ""
+
+#: core/templates/template_features.html:46 software/templates/features.html:9
msgid "Features"
msgstr "Funciones"
@@ -894,99 +923,94 @@ msgstr "¿No tienes cuenta?"
msgid "Forgot password?"
msgstr "¿Olvidaste tu contraseña?"
-#: core/templates/user/overview.html:25 core/templates/user/overview.html:68
-#: core/templates/user/overview.html:112 core/templates/user/overview.html:144
-#: core/templates/user/overview.html:348 core/templates/user/overview.html:390
-#: core/templates/user/overview.html:426
+#: core/templates/user/overview.html:28 core/templates/user/overview.html:71
+#: core/templates/user/overview.html:115 core/templates/user/overview.html:147
+#: core/templates/user/overview.html:351 core/templates/user/overview.html:393
+#: core/templates/user/overview.html:429
#, python-format
msgid "last %(number)s"
msgstr "últimos %(number)s"
-#: core/templates/user/overview.html:27 core/templates/user/overview.html:146
-#: core/templates/user/overview.html:343 core/templates/user/overview.html:382
-#: core/templates/user/overview.html:421 gym/templates/gym/member_list.html:226
+#: core/templates/user/overview.html:30 core/templates/user/overview.html:149
+#: core/templates/user/overview.html:346 core/templates/user/overview.html:385
+#: core/templates/user/overview.html:424 gym/templates/gym/member_list.html:226
#: gym/templates/gym/member_list.html:262
#: gym/templates/gym/member_list.html:302
msgid "Overview"
msgstr "Resumen"
-#: core/templates/user/overview.html:34 core/templates/user/overview.html:76
-#: core/templates/user/overview.html:120 core/templates/user/overview.html:152
+#: core/templates/user/overview.html:37 core/templates/user/overview.html:79
+#: core/templates/user/overview.html:123 core/templates/user/overview.html:155
#: manager/helpers.py:88 software/templates/about_us.html:170
#: weight/templates/import_csv_preview.html:13
#: weight/templates/import_csv_preview.html:42 weight/views.py:54
msgid "Date"
msgstr "Fecha"
-#: core/templates/user/overview.html:35 core/templates/user/overview.html:153
+#: core/templates/user/overview.html:38 core/templates/user/overview.html:156
#: gym/models/contract.py:58 gym/models/contract.py:109
msgid "Description"
msgstr "Descripción"
-#: core/templates/user/overview.html:36
+#: core/templates/user/overview.html:39
msgid "Number of logs (days)"
msgstr "Número de registros (días)"
-#: core/templates/user/overview.html:37 core/views/user.py:590
+#: core/templates/user/overview.html:40 core/views/user.py:606
#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:158
msgid "Last activity"
msgstr "Última actividad"
-#: core/templates/user/overview.html:58
+#: core/templates/user/overview.html:61
msgid "No workouts found."
msgstr "No se han encontrado rutinas."
-#: core/templates/user/overview.html:68
+#: core/templates/user/overview.html:71
msgid "Log"
msgstr "Registro"
-#: core/templates/user/overview.html:77
+#: core/templates/user/overview.html:80
msgid "General impression"
msgstr "Impresión general"
-#: core/templates/user/overview.html:78 core/templates/user/overview.html:390
+#: core/templates/user/overview.html:81 core/templates/user/overview.html:393
msgid "Notes"
msgstr "Notas"
-#: core/templates/user/overview.html:79
-#: exercises/templates/history/overview.html:30
-msgid "Time"
-msgstr "Tiempo"
-
-#: core/templates/user/overview.html:112 core/templates/user/overview.html:121
+#: core/templates/user/overview.html:115 core/templates/user/overview.html:124
#: manager/helpers.py:89 weight/templates/import_csv_preview.html:14
#: weight/templates/import_csv_preview.html:43 weight/views.py:54
msgid "Weight"
msgstr "Peso"
-#: core/templates/user/overview.html:154
-#: nutrition/templates/ingredient/view.html:51 nutrition/views/plan.py:245
+#: core/templates/user/overview.html:157
+#: nutrition/templates/ingredient/view.html:52 nutrition/views/plan.py:244
msgid "Energy"
msgstr "Energía"
-#: core/templates/user/overview.html:155
-#: nutrition/templates/ingredient/view.html:58 nutrition/views/plan.py:251
+#: core/templates/user/overview.html:158
+#: nutrition/templates/ingredient/view.html:59 nutrition/views/plan.py:250
msgid "Protein"
msgstr "Proteínas"
-#: core/templates/user/overview.html:156
-#: nutrition/templates/ingredient/view.html:64 nutrition/views/plan.py:259
+#: core/templates/user/overview.html:159
+#: nutrition/templates/ingredient/view.html:65 nutrition/views/plan.py:258
msgid "Carbohydrates"
msgstr "Hidratos de carbono"
-#: core/templates/user/overview.html:157
-#: nutrition/templates/ingredient/view.html:80 nutrition/views/plan.py:273
+#: core/templates/user/overview.html:160
+#: nutrition/templates/ingredient/view.html:81 nutrition/views/plan.py:272
msgid "Fat"
msgstr "Grasa"
-#: core/templates/user/overview.html:170
-#: nutrition/templates/ingredient/view.html:53
+#: core/templates/user/overview.html:173
+#: nutrition/templates/ingredient/view.html:54
msgid "kcal"
msgstr "kcal"
-#: core/templates/user/overview.html:201 core/templates/user/overview.html:340
-#: core/templates/user/overview.html:379 core/templates/user/overview.html:418
-#: core/templates/user/overview.html:463 gym/templates/gym/list.html:45
+#: core/templates/user/overview.html:204 core/templates/user/overview.html:343
+#: core/templates/user/overview.html:382 core/templates/user/overview.html:421
+#: core/templates/user/overview.html:466 gym/templates/gym/list.html:45
#: gym/templates/gym/member_list.html:91 gym/templates/gym/member_list.html:149
#: gym/templates/gym/member_list.html:187
#: gym/templates/gym/member_list.html:223
@@ -995,111 +1019,115 @@ msgstr "kcal"
msgid "Actions"
msgstr "Acciones"
-#: core/templates/user/overview.html:210
+#: core/templates/user/overview.html:213
msgid "Deactivate user"
msgstr "Desactivar usuario"
-#: core/templates/user/overview.html:214
+#: core/templates/user/overview.html:217
msgid "Activate user"
msgstr "Activar usuario"
-#: core/templates/user/overview.html:223
+#: core/templates/user/overview.html:226
msgid "Reset user password"
msgstr "Restablecer la contraseña del usuario"
-#: core/templates/user/overview.html:227 gym/templates/gym/member_list.html:30
+#: core/templates/user/overview.html:230 gym/templates/gym/member_list.html:30
msgid "Roles"
msgstr "Roles"
-#: core/templates/user/overview.html:243
+#: core/templates/user/overview.html:246
msgid "Password reset confirmation"
msgstr "Confirmación de restablecimiento de contraseña"
-#: core/templates/user/overview.html:247
+#: core/templates/user/overview.html:250
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:250
+#: core/templates/user/overview.html:253
#: exercises/templates/history/overview.html:106
+#: nutrition/templates/ingredient/view.html:148
+#: nutrition/templates/ingredient/view.html:160
msgid "No"
msgstr "No"
-#: core/templates/user/overview.html:251
+#: core/templates/user/overview.html:254
#: exercises/templates/history/overview.html:99
+#: nutrition/templates/ingredient/view.html:146
+#: nutrition/templates/ingredient/view.html:158
msgid "Yes"
msgstr "Sí"
-#: core/templates/user/overview.html:272 gym/templates/gym/member_list.html:105
+#: core/templates/user/overview.html:275 gym/templates/gym/member_list.html:105
msgid "Details"
msgstr "Detalles"
-#: core/templates/user/overview.html:276 gym/views/export.py:57
-#: manager/helpers.py:89 nutrition/views/plan.py:151
-#: nutrition/views/plan.py:157
+#: core/templates/user/overview.html:279 gym/views/export.py:57
+#: manager/helpers.py:89 nutrition/views/plan.py:150
+#: nutrition/views/plan.py:156
msgid "Nr."
msgstr "Nr."
-#: core/templates/user/overview.html:298 gym/models/contract.py:287
+#: core/templates/user/overview.html:301 gym/models/contract.py:287
#: gym/models/gym.py:50 gym/templates/contract/view.html:75
#: gym/templates/gym/member_list.html:112 gym/views/export.py:68
msgid "Phone"
msgstr "Teléfono"
-#: core/templates/user/overview.html:302 gym/templates/contract/view.html:87
+#: core/templates/user/overview.html:305 gym/templates/contract/view.html:87
#: gym/templates/gym/member_list.html:130
msgid "Address"
msgstr "Dirección"
-#: core/templates/user/overview.html:313
+#: core/templates/user/overview.html:316
msgid "Registered"
msgstr "Registrado"
-#: core/templates/user/overview.html:317
+#: core/templates/user/overview.html:320
msgid "Last login"
msgstr "Último inicio de sesión"
-#: core/templates/user/overview.html:322
+#: core/templates/user/overview.html:325
msgid "Status"
msgstr "Estado"
-#: core/templates/user/overview.html:325
+#: core/templates/user/overview.html:328
msgid "Active"
msgstr "Activo"
-#: core/templates/user/overview.html:327
+#: core/templates/user/overview.html:330
msgid "Inactive"
msgstr "Inactivo"
-#: core/templates/user/overview.html:348 gym/templates/contract/list.html:4
+#: core/templates/user/overview.html:351 gym/templates/contract/list.html:4
#: gym/templates/gym/member_list.html:218
msgid "Contracts"
msgstr "Contratos"
-#: core/templates/user/overview.html:426 gym/templates/document/list.html:4
+#: core/templates/user/overview.html:429 gym/templates/document/list.html:4
msgid "Documents"
msgstr "Documentos"
-#: core/templates/user/overview.html:433 gym/templates/document/list.html:33
+#: core/templates/user/overview.html:436 gym/templates/document/list.html:33
msgid "Download"
msgstr "Bajar"
-#: core/templates/user/overview.html:474 gym/views/admin_config.py:44
+#: core/templates/user/overview.html:477 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:477 gym/models/user_config.py:92
+#: core/templates/user/overview.html:480 gym/models/user_config.py:92
msgid "Include in inactive overview"
msgstr "Incluir en lista de inactivos"
-#: core/templates/user/overview.html:510
+#: core/templates/user/overview.html:513
#, python-format
msgid "Admin login is only available for users in %(gym_name)s"
msgstr ""
"El inicio de sesión de administrador solo está disponible para usuarios en "
"%(gym_name)s"
-#: core/templates/user/overview.html:514
+#: core/templates/user/overview.html:517
msgid "Log in as this user"
msgstr "Inicia sesión como este usuario"
@@ -1124,7 +1152,7 @@ msgid "You need to verify your email to contribute exercises"
msgstr ""
"Necesitas verificar tu correo electrónico para contribuir con ejercicios"
-#: core/templates/user/preferences.html:55 core/views/user.py:601
+#: core/templates/user/preferences.html:55 core/views/user.py:617
msgid "Change password"
msgstr "Cambiar contraseña"
@@ -1132,23 +1160,23 @@ msgstr "Cambiar contraseña"
msgid "Already have an account?"
msgstr "¿Tienes ya una cuenta?"
-#: core/templatetags/wger_extras.py:142 i18n.tpl:38
+#: core/templatetags/wger_extras.py:142 i18n.tpl:39
msgid "kg"
msgstr "kg"
#: core/templatetags/wger_extras.py:144
-#: nutrition/templates/ingredient/view.html:60
-#: nutrition/templates/ingredient/view.html:66
-#: nutrition/templates/ingredient/view.html:73
-#: nutrition/templates/ingredient/view.html:82
-#: nutrition/templates/ingredient/view.html:89
-#: nutrition/templates/ingredient/view.html:111
-#: nutrition/templates/ingredient/view.html:121
+#: nutrition/templates/ingredient/view.html:61
+#: nutrition/templates/ingredient/view.html:67
+#: nutrition/templates/ingredient/view.html:74
+#: nutrition/templates/ingredient/view.html:83
+#: nutrition/templates/ingredient/view.html:90
+#: nutrition/templates/ingredient/view.html:112
+#: nutrition/templates/ingredient/view.html:122
msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr "g"
-#: core/templatetags/wger_extras.py:147 i18n.tpl:39
+#: core/templatetags/wger_extras.py:147 i18n.tpl:40
msgid "lb"
msgstr "lb"
@@ -1157,36 +1185,35 @@ msgctxt "weight unit, i.e. ounces"
msgid "oz"
msgstr "oz"
-#: core/views/languages.py:85 exercises/views/categories.py:122
+#: core/views/languages.py:88 exercises/views/categories.py:122
#: exercises/views/equipment.py:103 exercises/views/muscles.py:99
-#: nutrition/views/ingredient.py:120 nutrition/views/unit.py:110
+#: nutrition/views/ingredient.py:125
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
+#: core/views/languages.py:96 core/views/license.py:103
+#: core/views/repetition_units.py:114 core/views/weight_units.py:115
#: exercises/views/categories.py:128 exercises/views/muscles.py:106
#: gallery/views/images.py:124 gym/views/admin_notes.py:196
#: gym/views/document.py:206 gym/views/gym.py:481
-#: nutrition/views/ingredient.py:127 nutrition/views/unit.py:117
+#: nutrition/views/ingredient.py:132
#, python-brace-format
msgid "Delete {0}?"
msgstr "¿Borrar {0}?"
-#: core/views/languages.py:111 core/views/license.py:85
-#: core/views/repetition_units.py:86 core/views/user.py:464
+#: core/views/languages.py:114 core/views/license.py:85
+#: core/views/repetition_units.py:96 core/views/user.py:480
#: core/views/weight_units.py:86 exercises/views/categories.py:98
#: exercises/views/equipment.py:81 exercises/views/muscles.py:87
#: gym/views/admin_notes.py:161 gym/views/config.py:68
#: gym/views/contract.py:186 gym/views/contract_option.py:123
#: gym/views/contract_type.py:123 gym/views/document.py:171
-#: gym/views/gym.py:463 nutrition/views/ingredient.py:146
-#: nutrition/views/unit.py:143
+#: gym/views/gym.py:463 nutrition/views/ingredient.py:151
#, python-brace-format
msgid "Edit {0}"
msgstr "Editar {0}"
-#: core/views/misc.py:74
+#: core/views/misc.py:73
msgid ""
"We have created sample workout, workout schedules, weight logs, (body) "
"weight and nutrition plan entries so you can better see what this site can "
@@ -1196,48 +1223,48 @@ msgstr ""
"peso y planes nutricionales para que puedas ver mejor lo que puede hacer "
"esta página. ¡No dudes en editar o borrar las entradas!"
-#: core/views/user.py:143
+#: core/views/user.py:145
#, python-brace-format
msgid "Account \"{0}\" was successfully deleted"
msgstr "La cuenta \"{0}\" ha sido borrada con éxito"
-#: core/views/user.py:279
+#: core/views/user.py:287
msgid "You were successfully registered"
msgstr "Te has registrado con éxito"
-#: core/views/user.py:341
+#: core/views/user.py:357
msgid "Settings successfully updated"
msgstr "Preferecias actualizadas con éxito"
-#: core/views/user.py:380
+#: core/views/user.py:396
msgid "The user was successfully deactivated"
msgstr "El usuario ha sido desactivado con éxito"
-#: core/views/user.py:417
+#: core/views/user.py:433
msgid "The user was successfully activated"
msgstr "El usuario ha sido activado con éxito"
-#: core/views/user.py:432
+#: core/views/user.py:448
msgid "Edit user"
msgstr "Editar usuario"
-#: core/views/user.py:587 gym/templates/gym/member_list.html:26
+#: core/views/user.py:603 gym/templates/gym/member_list.html:26
#: gym/views/gym.py:158
msgid "ID"
msgstr "ID"
-#: core/views/user.py:588 gym/forms.py:95 gym/templates/contract/view.html:55
+#: core/views/user.py:604 gym/forms.py:95 gym/templates/contract/view.html:55
#: gym/templates/gym/member_list.html:27 gym/views/export.py:59
#: gym/views/gym.py:158 gym/views/gym.py:217
msgid "Username"
msgstr "Nombre de usuario"
-#: core/views/user.py:591 gym/templates/gym/new_user.html:34
+#: core/views/user.py:607 gym/templates/gym/new_user.html:34
#: gym/views/export.py:58 gym/views/gym.py:217
msgid "Gym"
msgstr "Gimnasio"
-#: core/views/user.py:650
+#: core/views/user.py:678
#, python-format
msgid "A verification email was sent to %(email)s"
msgstr "Se envió un correo electrónico de verificación a %(email)s"
@@ -1254,16 +1281,16 @@ msgstr "Nombre alternativo"
msgid "A more basic name for the muscle"
msgstr "Un nombre más básico para el músculo"
-#: exercises/models/video.py:50
+#: exercises/models/video.py:52
#, python-format
msgid "Maximum file size is %(size)sMB."
msgstr "El tamaño máximo de archivo es %(size)sMB."
-#: exercises/models/video.py:57 exercises/models/video.py:65
+#: exercises/models/video.py:59 exercises/models/video.py:67
msgid "File type is not supported"
msgstr "El tipo de archivo no es compatible"
-#: exercises/models/video.py:70
+#: exercises/models/video.py:72
msgid "File is not a valid video"
msgstr "El archivo no es un video válido"
@@ -1334,7 +1361,11 @@ msgstr "¿Borrar equipo?"
msgid "Add muscle"
msgstr "Añadir músculo"
-#: gallery/templates/images/overview.html:72
+#: gallery/forms.py:35
+msgid "If date is left empty, it will be read from the image instead"
+msgstr ""
+
+#: gallery/templates/images/overview.html:69
msgid "Add image"
msgstr "Añadir imagen"
@@ -1401,7 +1432,7 @@ msgid "Contract type"
msgstr "Tipo de contrato"
#: gym/models/contract.py:211 gym/templates/contract/view.html:59
-#: nutrition/forms.py:58
+#: nutrition/forms.py:67
msgid "Amount"
msgstr "Cantidad"
@@ -1581,7 +1612,7 @@ msgstr "Emails"
msgid "Add member"
msgstr "Añadir miembro"
-#: gym/templates/gym/new_user.html:48 nutrition/templates/rate/form.html:120
+#: gym/templates/gym/new_user.html:48 nutrition/templates/rate/form.html:121
msgid "Info"
msgstr "Información"
@@ -1754,10 +1785,6 @@ msgstr "Barra hacia arriba"
msgid "Quads"
msgstr "Cuádriceps"
-#: i18n.tpl:30
-msgid "Repetitions"
-msgstr "Repeticiones"
-
#: i18n.tpl:31
msgid "Resistance band"
msgstr "Banda de resistencia"
@@ -1786,175 +1813,181 @@ msgstr "Tríceps"
msgid "Until Failure"
msgstr "Hasta fallo muscular"
-#: i18n.tpl:40
+#: i18n.tpl:38
+#, fuzzy
+#| msgid "Kilometers"
+msgid "Meters"
+msgstr "Kilómetros"
+
+#: i18n.tpl:41
msgid "none (bodyweight exercise)"
msgstr "ninguno (ejercicio de peso corporal)"
-#: i18n.tpl:41
+#: i18n.tpl:42
msgid "Beginner"
msgstr "Principiante"
-#: i18n.tpl:42
+#: i18n.tpl:43
msgid "Consistent"
msgstr "Consistente"
-#: i18n.tpl:43
+#: i18n.tpl:44
msgid "Dedicated"
msgstr "Dedicado"
-#: i18n.tpl:44
+#: i18n.tpl:45
msgid "Obsessed"
msgstr "Obsesionado"
-#: i18n.tpl:45
+#: i18n.tpl:46
msgid "Legend"
msgstr "Leyenda"
-#: i18n.tpl:46
+#: i18n.tpl:47
msgid "Veteran"
msgstr "Veterano"
-#: i18n.tpl:47
+#: i18n.tpl:48
msgid "Titan"
msgstr "Titán"
-#: i18n.tpl:48
+#: i18n.tpl:49
msgid "Unstoppable"
msgstr "Imparable"
-#: i18n.tpl:49
+#: i18n.tpl:50
msgid "Weekend Warrior"
msgstr "Guerrero del fin de semana"
-#: i18n.tpl:50
+#: i18n.tpl:51
msgid "Elephant lifter"
msgstr "Levantador de elefantes"
-#: i18n.tpl:51
+#: i18n.tpl:52
msgid "Bus lifter"
msgstr "Levantador de autobuses"
-#: i18n.tpl:52
+#: i18n.tpl:53
msgid "Plane lifter"
msgstr "Levantador de aviones"
-#: i18n.tpl:53
+#: i18n.tpl:54
msgid "Blue whale lifter"
msgstr "Levantador de ballenas azules"
-#: i18n.tpl:54
+#: i18n.tpl:55
msgid "Space Station lifter"
msgstr "Levantador de estación espacial"
-#: i18n.tpl:55
+#: i18n.tpl:56
msgid "Millionaire"
msgstr "Millonario"
-#: i18n.tpl:56
+#: i18n.tpl:57
msgid "Atlas"
msgstr "Atlas"
-#: i18n.tpl:57
+#: i18n.tpl:58
msgid "Early Bird"
msgstr "Madrugador"
-#: i18n.tpl:58
+#: i18n.tpl:59
msgid "Night Owl"
msgstr "Ave nocturna"
-#: i18n.tpl:59
+#: i18n.tpl:60
msgid "New Year, New Me"
msgstr "Año nuevo, nuevo yo"
-#: i18n.tpl:60
+#: i18n.tpl:61
msgid "Phoenix"
msgstr "Fénix"
-#: i18n.tpl:61
+#: i18n.tpl:62
msgid "Personal Record"
msgstr "Récord personal"
-#: i18n.tpl:62
+#: i18n.tpl:63
msgid "Complete your first workout"
msgstr "Completa tu primer entrenamiento"
-#: i18n.tpl:63
+#: i18n.tpl:64
msgid "Complete 10 workouts"
msgstr "Completa 10 entrenamientos"
-#: i18n.tpl:64
+#: i18n.tpl:65
msgid "Complete 50 workouts"
msgstr "Completa 50 entrenamientos"
-#: i18n.tpl:65
+#: i18n.tpl:66
msgid "Complete 100 workouts"
msgstr "Completa 100 entrenamientos"
-#: i18n.tpl:66
+#: i18n.tpl:67
msgid "Complete 200 workouts"
msgstr "Completa 200 entrenamientos"
-#: i18n.tpl:67
+#: i18n.tpl:68
msgid "Complete 500 workouts"
msgstr "Completa 500 entrenamientos"
-#: i18n.tpl:68
+#: i18n.tpl:69
msgid "Complete 1000 workouts"
msgstr "Completa 1000 entrenamientos"
-#: i18n.tpl:69
+#: i18n.tpl:70
msgid "Maintain a 30-day workout streak"
msgstr "Mantener una racha de entrenamiento de 30 días"
-#: i18n.tpl:70
+#: i18n.tpl:71
msgid "Work out on Saturday and Sunday for 4 consecutive weekends"
msgstr "Entrenar en sábado y domingo durante 4 fines de semana consecutivos"
-#: i18n.tpl:71
+#: i18n.tpl:72
msgid "Lift a cumulative total of 5.000 kg"
msgstr "Levantar un peso acumulado de 5000 kg"
-#: i18n.tpl:72
+#: i18n.tpl:73
msgid "Lift a cumulative total of 20.000 kg"
msgstr "Levantar un peso acumulado de 20000 kg"
-#: i18n.tpl:73
+#: i18n.tpl:74
msgid "Lift a cumulative total of 50.000 kg"
msgstr "Levantar un peso acumulado de 50000 kg"
-#: i18n.tpl:74
+#: i18n.tpl:75
msgid "Lift a cumulative total of 150.000 kg"
msgstr "Levantar un peso acumulado de 150000 kg"
-#: i18n.tpl:75
+#: i18n.tpl:76
msgid "Lift a cumulative total of 450.000 kg"
msgstr "Levantar un peso acumulado de 450000 kg"
-#: i18n.tpl:76
+#: i18n.tpl:77
msgid "Lift a cumulative total of 1.000.000 kg"
msgstr "Levantar un peso acumulado de 1000000 kg"
-#: i18n.tpl:77
+#: i18n.tpl:78
msgid "Lift a cumulative total of 10.000.000 kg"
msgstr "Levantar un peso acumulado de 10000000 kg"
-#: i18n.tpl:78
+#: i18n.tpl:79
msgid "Complete a workout before 6:00 AM"
msgstr "Completar un entrenamiento antes de las 6:00 AM"
-#: i18n.tpl:79
+#: i18n.tpl:80
msgid "Complete a workout after 9:00 PM"
msgstr "Completar un entrenamiento después de las 9:00 PM"
-#: i18n.tpl:80
+#: i18n.tpl:81
msgid "Work out on January 1st"
msgstr "Entrenar el 1 de enero"
-#: i18n.tpl:81
+#: i18n.tpl:82
msgid "Return to training after being inactive for 30 days"
msgstr "Volver a entrenar después de 30 días inactivo"
-#: i18n.tpl:82
+#: i18n.tpl:83
msgid "Achieve a new Personal Record on any exercise"
msgstr "Alcanzar un nuevo récord personal en cualquier ejercicio"
@@ -2038,7 +2071,7 @@ msgstr "Ejercicio"
msgid "Routine will expire soon"
msgstr "Rutina expirará pronto"
-#: manager/models/routine.py:153 manager/models/session.py:145
+#: manager/models/routine.py:154 manager/models/session.py:145
msgid "The start time cannot be after the end time."
msgstr "La hora de inicio no puede ser posterior a la hora de finalización."
@@ -2122,23 +2155,27 @@ msgstr "Rutina"
msgid "Workout for %s"
msgstr "Rutina para %s"
-#: nutrition/forms.py:62
+#: nutrition/extract_info/off.py:72 nutrition/extract_info/off.py:91
+msgid "Serving"
+msgstr ""
+
+#: nutrition/forms.py:71 nutrition/forms.py:208
msgid "Unit"
msgstr "Unidad"
-#: nutrition/forms.py:170 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:179 nutrition/templates/rate/form.html:77
msgid "Basic caloric intake"
msgstr "Ingesta básica de calorías"
-#: nutrition/forms.py:171
+#: nutrition/forms.py:180
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:176
+#: nutrition/forms.py:185
msgid "Additional calories"
msgstr "Calorias adicionales"
-#: nutrition/forms.py:178
+#: nutrition/forms.py:187
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
@@ -2147,13 +2184,31 @@ msgstr ""
"un número negativo)"
#: nutrition/forms.py:209
+msgid "grams (g)"
+msgstr ""
+
+#: nutrition/forms.py:219
msgid "Ingredient"
msgstr "Ingrediente"
-#: nutrition/forms.py:213
+#: nutrition/forms.py:223
msgid "Also search for names in English"
msgstr "Busque también los nombres en inglés"
+#: nutrition/forms.py:239
+msgid "Quantity"
+msgstr ""
+
+#: nutrition/forms.py:241
+msgid "Enter a quantity and choose grams (g) or one of the serving units."
+msgstr ""
+
+#: nutrition/models/ingredient.py:526
+#, fuzzy
+#| msgid "Correction"
+msgid "Portion"
+msgstr "Corrección"
+
#: nutrition/templates/ingredient/email_new.tpl:1
#, python-format
msgid ""
@@ -2200,59 +2255,92 @@ msgstr ""
"índice 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."
-#: nutrition/templates/ingredient/overview.html:38
+#: nutrition/templates/ingredient/overview.html:32
+#: nutrition/templates/ingredient/overview.html:68
+#: nutrition/templates/ingredient/view.html:143
+msgid "Vegan"
+msgstr ""
+
+#: nutrition/templates/ingredient/overview.html:34
+#: nutrition/templates/ingredient/overview.html:79
+#: nutrition/templates/ingredient/view.html:155
+#, fuzzy
+#| msgid "Variations"
+msgid "Vegetarian"
+msgstr "Variantes"
+
+#: nutrition/templates/ingredient/overview.html:43
msgid "No ingredients."
msgstr "No hay ingredientes."
-#: nutrition/templates/ingredient/overview.html:49
+#: nutrition/templates/ingredient/overview.html:54
msgid "Search"
msgstr "Buscar"
-#: nutrition/templates/ingredient/view.html:45 nutrition/views/plan.py:237
+#: nutrition/templates/ingredient/overview.html:57
+#, fuzzy
+#| msgid "No filter"
+msgid "Filter"
+msgstr "Sin filtro"
+
+#: nutrition/templates/ingredient/overview.html:83
+msgid "Apply"
+msgstr ""
+
+#: nutrition/templates/ingredient/overview.html:85
+msgid "Reset"
+msgstr ""
+
+#: nutrition/templates/ingredient/view.html:46 nutrition/views/plan.py:236
msgid "Macronutrients"
msgstr "Macronutrientes"
-#: nutrition/templates/ingredient/view.html:54
+#: nutrition/templates/ingredient/view.html:55
msgid "kJ"
msgstr "kJ"
-#: nutrition/templates/ingredient/view.html:70 nutrition/views/plan.py:267
+#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:266
msgid "Sugar content in carbohydrates"
msgstr "Azúcar en los hidratos de carbono"
-#: nutrition/templates/ingredient/view.html:75
-#: nutrition/templates/ingredient/view.html:91
-#: nutrition/templates/ingredient/view.html:113
-#: nutrition/templates/ingredient/view.html:123
+#: nutrition/templates/ingredient/view.html:76
+#: nutrition/templates/ingredient/view.html:92
+#: nutrition/templates/ingredient/view.html:114
+#: nutrition/templates/ingredient/view.html:124
msgid "n.A."
msgstr "n.d."
-#: nutrition/templates/ingredient/view.html:86 nutrition/views/plan.py:281
+#: nutrition/templates/ingredient/view.html:87 nutrition/views/plan.py:280
msgid "Saturated fat content in fats"
msgstr "Contenido de grasas saturadas en grasas"
-#: nutrition/templates/ingredient/view.html:102
+#: nutrition/templates/ingredient/view.html:103
msgid "Others"
msgstr "Otros"
-#: nutrition/templates/ingredient/view.html:108 nutrition/views/plan.py:287
+#: nutrition/templates/ingredient/view.html:109 nutrition/views/plan.py:286
msgid "Fiber"
msgstr "Fibra"
-#: nutrition/templates/ingredient/view.html:118 nutrition/views/plan.py:293
+#: nutrition/templates/ingredient/view.html:119 nutrition/views/plan.py:292
msgid "Sodium"
msgstr "Sodio"
-#: nutrition/templates/ingredient/view.html:143
-#: nutrition/templates/units/list.html:50 nutrition/views/unit.py:86
+#: nutrition/templates/ingredient/view.html:136
+#, fuzzy
+#| msgid "Click here for more information"
+msgid "Dietary information"
+msgstr "Clic aqui para mas informacion"
+
+#: nutrition/templates/ingredient/view.html:184
msgid "Add new weight unit"
msgstr "Añadir nueva unidad de peso"
-#: nutrition/templates/rate/form.html:25
+#: nutrition/templates/rate/form.html:26
msgid "Basal metabolic rate"
msgstr "Metabolismo basal"
-#: nutrition/templates/rate/form.html:26
+#: nutrition/templates/rate/form.html:27
msgid ""
"The basal metabolic rate is the amount of energy expended daily\n"
"at rest. This is the minimum energy needed for the body to function, without "
@@ -2264,15 +2352,15 @@ msgstr ""
"Esta es la energía mínima necesaria para que el cuerpo funcione,\n"
"sin ninguna actividad física adicional."
-#: nutrition/templates/rate/form.html:37
+#: nutrition/templates/rate/form.html:38
msgid "Your basic metabolic rate is: "
msgstr "Tu tasa metabólica básica es: "
-#: nutrition/templates/rate/form.html:47
+#: nutrition/templates/rate/form.html:48
msgid "Physical activities"
msgstr "Actividades físicas"
-#: nutrition/templates/rate/form.html:48
+#: nutrition/templates/rate/form.html:49
msgid ""
"The physical activity level (PAL) is a factor used to to express\n"
"the additional physical activity and is used to calculate the total energy\n"
@@ -2282,11 +2370,11 @@ msgstr ""
"actividad física adicional y se utiliza para calcular la energía total\n"
"requerida por día."
-#: nutrition/templates/rate/form.html:59
+#: nutrition/templates/rate/form.html:60
msgid "Factor for daily activities: "
msgstr "Factor para actividades físicas: "
-#: nutrition/templates/rate/form.html:67
+#: nutrition/templates/rate/form.html:68
msgid ""
"The base caloric intake is the amount of calories your metabolism\n"
"needs based on your level of physical activity."
@@ -2294,11 +2382,11 @@ msgstr ""
"La ingesta base calorica es el total de calorias que tu metabolismo\n"
"necesita en base a tu nivel de actividad física."
-#: nutrition/templates/rate/form.html:81
+#: nutrition/templates/rate/form.html:82
msgid "Calculate basic caloric intake"
msgstr "Calcular la ingesta basica de calorias"
-#: nutrition/templates/rate/form.html:88
+#: nutrition/templates/rate/form.html:89
msgid ""
"The total calories are the actual total calories per day. This\n"
"might include e.g. a surplus or deficit if you are bulking or cutting. "
@@ -2310,19 +2398,19 @@ msgstr ""
"volumen o definición. Alternativamente,\n"
"puedes introducir tú mismo la cantidad de calorías si conoces el valor."
-#: nutrition/templates/rate/form.html:102
+#: nutrition/templates/rate/form.html:103
msgid "Transfer basic intake to total daily calories"
msgstr "Transferir calorías adicionales a las calorías totales diarias"
-#: nutrition/templates/rate/form.html:106
+#: nutrition/templates/rate/form.html:107
msgid "Add additional calories to total daily calories"
msgstr "Añadir calorías adicionales a las calorías totales diarias"
-#: nutrition/templates/rate/form.html:110
+#: nutrition/templates/rate/form.html:111
msgid "Save total calories to profile"
msgstr "Guardar calorias totales al perfil"
-#: nutrition/templates/rate/form.html:121
+#: nutrition/templates/rate/form.html:122
msgid ""
"Please note that these calculations can only be an\n"
"approximation. If you base your nutrition plan on these values, observe\n"
@@ -2332,48 +2420,48 @@ 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:158
+#: nutrition/views/ingredient.py:163
msgid "Add a new ingredient"
msgstr "Añadir nuevo ingrediente"
-#: nutrition/views/plan.py:128
+#: nutrition/views/plan.py:127
msgid "Nutritional plan"
msgstr "Plan nutricional"
-#: nutrition/views/plan.py:130
+#: nutrition/views/plan.py:129
#, python-format
msgid "Nutritional plan for %s"
msgstr "Plan nutricional para %s"
-#: nutrition/views/plan.py:202
+#: nutrition/views/plan.py:201
msgid "<i>This is an empty plan, what did you expect on the PDF?</i>"
msgstr "<i>Esto es un plan vacío, ¿qué esperabas en el PDF?</i>"
-#: nutrition/views/plan.py:230
+#: nutrition/views/plan.py:229
msgid "Nutritional data"
msgstr "Valores nutricionales"
-#: nutrition/views/plan.py:238
+#: nutrition/views/plan.py:237
msgid "Total"
msgstr "Total"
-#: nutrition/views/plan.py:239
+#: nutrition/views/plan.py:238
msgid "Percent of energy"
msgstr "Porcentaje de la energía"
-#: nutrition/views/plan.py:240
+#: nutrition/views/plan.py:239
msgid "g per body kg"
msgstr "g por kg peso"
-#: nutrition/views/unit_ingredient.py:69
+#: nutrition/views/unit_ingredient.py:64
msgid "Add a new weight unit"
msgstr "Añadir una unidad de peso"
-#: nutrition/views/unit_ingredient.py:106
+#: nutrition/views/unit_ingredient.py:99
msgid "Edit a weight unit to ingredient connection"
msgstr "Editar una conexión unidad de peso - ingrediente"
-#: nutrition/views/unit_ingredient.py:138
+#: nutrition/views/unit_ingredient.py:129
msgid "Delete?"
msgstr "¿Borrar?"
@@ -2769,7 +2857,7 @@ msgstr "Código Fuente"
msgid "Translation"
msgstr "Traducción"
-#: utils/generic_views.py:263
+#: utils/generic_views.py:246
msgid "Yes, delete"
msgstr "Sí, eliminar"
@@ -2823,10 +2911,6 @@ msgstr "Tienes que introducir su peso"
msgid "Import weight logs"
msgstr "Importar diario de peso"
-#: weight/templates/import_csv_form.html:9
-msgid "Submit"
-msgstr "Enviar"
-
#: weight/templates/import_csv_form.html:15
msgid ""
"Use this import field to import your weight logs into Workout\n"
@@ -2947,6 +3031,36 @@ msgstr ""
msgid "Re-Submit"
msgstr "Re-enviar"
+#~ msgid "Email verification"
+#~ msgstr "Verificación del correo electrónico"
+
+#, python-format
+#~ msgid "%(username)s, your email was verified"
+#~ msgstr "%(username)s, tu correo electrónico ha sido verificado"
+
+#~ msgid "Error, invalid verification token"
+#~ msgstr "Error, token de verificación no válido"
+
+#~ msgid "Email Confirmation"
+#~ msgstr "Confirmación de correo electrónico"
+
+#, python-format
+#~ msgid "You are almost there, %(username)s!"
+#~ msgstr "¡Ya casi estás, %(username)s!"
+
+#, python-format
+#~ msgid "Please click <a href=\"%(link)s\">here</a> to confirm your email"
+#~ msgstr ""
+#~ "Haga clic <a href=\"%(link)s\">aquí</a> para confirmar su correo "
+#~ "electrónico"
+
+#, python-format
+#~ msgid "The token expires on %(time)s"
+#~ msgstr "El token caduca el %(time)s"
+
+#~ msgid "Ingredient weight units"
+#~ msgstr "Unidades de peso de los ingredientes"
+
#~ msgid "Image"
#~ msgstr "Imagen"
@@ -2977,9 +3091,6 @@ msgstr "Re-enviar"
#~ msgid "Secondary muscles"
#~ msgstr "Músculos secundarios"
-#~ msgid "Variations"
-#~ msgstr "Variantes"
-
#~ msgid "Exercise Categories"
#~ msgstr "Categorías de ejercicios"
@@ -4031,9 +4142,6 @@ msgstr "Re-enviar"
#~ msgid "This content is available under the following license:"
#~ msgstr "El contenido se encuentra disponible bajo la siguiente licencia:"
-#~ msgid "Click here for more information"
-#~ msgstr "Clic aqui para mas informacion"
-
#, python-format
#~ msgid "%(name)s is too similar to existing exercise \"%(exercise_name)s\""
#~ msgstr ""
@@ -4710,8 +4818,5 @@ msgstr "Re-enviar"
#~ msgid "Last 12 months"
#~ msgstr "Últimos 12 meses"
-#~ msgid "No filter"
-#~ msgstr "Sin filtro"
-
#~ msgid "Days"
#~ msgstr "Días"
diff --git a/wger/locale/fa/LC_MESSAGES/django.po b/wger/locale/fa/LC_MESSAGES/django.po
index 4bfb4183e..85de00574 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: 2026-01-17 14:03+0000\n"
+"POT-Creation-Date: 2026-04-10 10:20+0000\n"
"PO-Revision-Date: 2025-10-12 17:07+0000\n"
"Last-Translator: Mahmuoud Salehi <[email protected]>\n"
"Language-Team: Persian <https://hosted.weblate.org/projects/wger/web/fa/>\n"
@@ -35,7 +35,7 @@ msgstr ""
#: config/views/gym_config.py:42 core/templates/language/view.html:64
#: core/templates/license/list.html:17
#: core/templates/repetition_unit/list.html:18
-#: core/templates/user/overview.html:204 core/templates/user/overview.html:467
+#: core/templates/user/overview.html:207 core/templates/user/overview.html:470
#: core/templates/weight_unit/list.html:18
#: exercises/templates/categories/admin-overview.html:17
#: exercises/templates/equipment/admin-overview.html:17
@@ -47,30 +47,29 @@ msgstr ""
#: gym/templates/gym/list.html:19 gym/templates/gym/list.html:48
#: gym/templates/gym/member_list.html:94 gym/templates/gym/member_list.html:152
#: gym/templates/gym/member_list.html:190
-#: nutrition/templates/ingredient/view.html:164
-#: nutrition/templates/ingredient/view.html:209
-#: nutrition/templates/units/list.html:19
+#: nutrition/templates/ingredient/view.html:205
+#: nutrition/templates/ingredient/view.html:248
msgid "Edit"
msgstr "ویرایش"
-#: core/forms.py:91 core/templates/navigation.html:271
-#: core/templates/navigation.html:278 core/templates/user/login.html:4
+#: core/forms.py:89 core/templates/navigation.html:268
+#: core/templates/navigation.html:275 core/templates/user/login.html:4
#: core/templates/user/registration_sidebar.html:12
#: software/templates/features.html:82 software/templates/features.html:448
msgid "Login"
msgstr "ورود"
-#: core/forms.py:130 core/forms.py:244 gym/views/export.py:61
+#: core/forms.py:128 core/forms.py:242 gym/views/export.py:61
#: gym/views/gym.py:217
msgid "First name"
msgstr "نام"
-#: core/forms.py:131 core/forms.py:245 core/templates/user/overview.html:284
+#: core/forms.py:129 core/forms.py:243 core/templates/user/overview.html:287
#: gym/views/export.py:62 gym/views/gym.py:217
msgid "Last name"
msgstr "نام خانوادگی"
-#: core/forms.py:133 core/forms.py:210 core/templates/user/overview.html:288
+#: core/forms.py:131 core/forms.py:208 core/templates/user/overview.html:291
#: gym/models/contract.py:256 gym/models/gym.py:58
#: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:116
#: gym/templates/gym/new_user.html:30 gym/views/export.py:60
@@ -80,54 +79,54 @@ msgstr "نام خانوادگی"
msgid "Email"
msgstr "ایمیل"
-#: core/forms.py:134
+#: core/forms.py:132
msgid "Used for password resets and, optionally, e-mail reminders."
msgstr ""
"برای بازنشانی رمز عبور استفاده می شود، به صورت اختیاری، یادآوری های ایمیل."
-#: core/forms.py:138 core/models/profile.py:222
+#: core/forms.py:136 core/models/profile.py:222
#: gym/templates/gym/new_user.html:38
msgid "Date of Birth"
msgstr "تاریخ تولد"
-#: core/forms.py:177
+#: core/forms.py:175
msgid "Personal data"
msgstr "اطلاعات شخصی"
-#: core/forms.py:189
+#: core/forms.py:187
msgid "Workout reminders"
msgstr "یاداوری تمرین"
-#: core/forms.py:196
+#: core/forms.py:194
msgid "Other settings"
msgstr "تنظیمات دیگر"
-#: core/forms.py:204 core/views/user.py:614 core/views/user.py:629
-#: core/views/user.py:641 gym/forms.py:73 utils/generic_views.py:143
+#: core/forms.py:202 core/views/user.py:630 core/views/user.py:654
+#: core/views/user.py:668 gym/forms.py:73 utils/generic_views.py:137
msgid "Save"
msgstr "ذخیره"
-#: core/forms.py:211
+#: core/forms.py:209
msgid "Used for password resets and, optionally, email reminders."
msgstr "استفاده شده برای بازیابی رمز عبور و به صورت اختیاری, یادآوری ایمیل"
-#: core/forms.py:240
+#: core/forms.py:238
msgid "This e-mail address is already in use."
msgstr "این ایمیل قبلا استفاده شده است."
-#: core/forms.py:261 gym/templates/gym/new_user.html:26
+#: core/forms.py:259 gym/templates/gym/new_user.html:26
#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:217
msgid "Password"
msgstr "پسورد"
-#: core/forms.py:263
+#: core/forms.py:261
msgid "Please enter your current password."
msgstr "لطفا رمز عبور فعلی خود را وارد کنید."
-#: core/forms.py:272 core/templates/language/view.html:70
+#: core/forms.py:270 core/templates/language/view.html:70
#: core/templates/license/list.html:21
#: core/templates/repetition_unit/list.html:22
-#: core/templates/user/overview.html:233
+#: core/templates/user/overview.html:236
#: core/templates/weight_unit/list.html:22
#: exercises/templates/categories/admin-overview.html:21
#: exercises/templates/equipment/admin-overview.html:21
@@ -135,27 +134,30 @@ msgstr "لطفا رمز عبور فعلی خود را وارد کنید."
#: gym/templates/admin_notes/list.html:37
#: gym/templates/contract_option/list.html:35
#: gym/templates/contract_type/list.html:36 gym/templates/document/list.html:46
-#: gym/templates/gym/list.html:23 nutrition/templates/ingredient/view.html:168
-#: nutrition/templates/ingredient/view.html:215
-#: nutrition/templates/units/list.html:25
+#: gym/templates/gym/list.html:23 nutrition/templates/ingredient/view.html:209
+#: nutrition/templates/ingredient/view.html:254
msgid "Delete"
msgstr "حذف"
-#: core/forms.py:281
+#: core/forms.py:279
msgid "Invalid password"
msgstr "رمز نامعتبر"
-#: core/forms.py:293
+#: core/forms.py:291 core/forms.py:349
msgid "The form is secured with reCAPTCHA"
msgstr "این فرم با ریکپچا امن شده است"
-#: core/forms.py:314 core/forms.py:341 core/templates/navigation.html:272
-#: core/templates/navigation.html:285 core/templates/template.html:123
-#: core/templates/user/login.html:21 core/views/user.py:285
+#: core/forms.py:312 core/forms.py:339 core/templates/navigation.html:269
+#: core/templates/navigation.html:282 core/templates/template.html:113
+#: core/templates/user/login.html:21 core/views/user.py:293
#: software/templates/features.html:87 software/templates/features.html:442
msgid "Register"
msgstr "ثبت"
+#: core/forms.py:360 weight/templates/import_csv_form.html:9
+msgid "Submit"
+msgstr ""
+
#: core/models/language.py:31 core/templates/language/view.html:21
msgid "Language short name"
msgstr "نام مخفف زبان "
@@ -192,36 +194,36 @@ msgstr "پیوند"
msgid "Link to license text or other information"
msgstr "پیوند به متن مجوز یا سایر اطلاعات"
-#: core/models/profile.py:57
+#: core/models/profile.py:60
#, python-format
msgid "%(birthdate)s is not a valid birthdate"
msgstr "%(birthdate)s روز تولد معتبر نمی باشد"
-#: core/models/profile.py:66
+#: core/models/profile.py:69
msgid "Male"
msgstr "مرد"
-#: core/models/profile.py:67
+#: core/models/profile.py:70
msgid "Female"
msgstr "زن"
-#: core/models/profile.py:74
+#: core/models/profile.py:77
msgid "Low"
msgstr "کم"
-#: core/models/profile.py:75
+#: core/models/profile.py:78
msgid "Medium"
msgstr "متوسط"
-#: core/models/profile.py:76
+#: core/models/profile.py:79
msgid "High"
msgstr "زیاد"
-#: core/models/profile.py:82
+#: core/models/profile.py:85
msgid "Metric (kilogram)"
msgstr "متریک (کیلو گرم)"
-#: core/models/profile.py:83
+#: core/models/profile.py:86
msgid "Imperial (pound)"
msgstr "امپریال (پوند)"
@@ -341,7 +343,7 @@ msgstr "میانگین ساعت کار در هفته"
msgid "Free time"
msgstr "زمان آزاد"
-#: core/models/profile.py:320 nutrition/templates/rate/form.html:66
+#: core/models/profile.py:320 nutrition/templates/rate/form.html:67
msgid "Total daily calories"
msgstr "مجموع کالری روزانه"
@@ -383,20 +385,41 @@ msgstr ""
msgid "Enable or disable the trophy system for this user"
msgstr ""
-#: core/models/profile.py:446
+#: core/models/profile.py:457
msgid "The sum of all hours has to be 24"
msgstr "مجموع تمام ساعت ها باید 24 باشد"
-#: core/models/rep_unit.py:36 core/models/weight_unit.py:42
-#: core/templates/user/overview.html:280 core/views/user.py:589
+#: core/models/rep_unit.py:32 i18n.tpl:30
+msgid "Repetitions"
+msgstr ""
+
+#: core/models/rep_unit.py:33 core/templates/user/overview.html:82
+#: exercises/templates/history/overview.html:30
+msgid "Time"
+msgstr ""
+
+#: core/models/rep_unit.py:34
+msgid "Distance"
+msgstr ""
+
+#: core/models/rep_unit.py:47 core/models/weight_unit.py:42
+#: core/templates/user/overview.html:283 core/views/user.py:605
#: exercises/models/muscle.py:36 gym/models/contract.py:52
#: gym/models/contract.py:103 gym/models/gym.py:46
#: gym/models/user_document.py:84 gym/templates/contract/view.html:50
#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:108
-#: gym/views/gym.py:158 nutrition/templates/ingredient/view.html:151
+#: gym/views/gym.py:158 nutrition/templates/ingredient/view.html:192
msgid "Name"
msgstr "نام"
+#: core/models/rep_unit.py:53
+msgid "Unit Type"
+msgstr ""
+
+#: core/models/rep_unit.py:54
+msgid "The type of unit (repetitions, time, or distance)"
+msgstr ""
+
#: core/templates/403.html:4
msgid "Forbidden!"
msgstr "ممنوع"
@@ -427,6 +450,55 @@ msgstr ""
"کمکی نکرد، لطفا بعدا دوباره امتحان کنید. اگر مشکل همچنان ادامه داشت، می "
"توانید به روش های ذکر شده در زیر کمک بگیرید:‏"
+#: core/templates/account/email/email_confirmation_message.html:81
+msgid "Almost there!"
+msgstr ""
+
+#: core/templates/account/email/email_confirmation_message.html:85
+#, fuzzy, python-format
+#| msgid ""
+#| "You're receiving this e-mail because you requested a password reset for "
+#| "your user account at %(site_name)s."
+msgid ""
+"You're receiving this email because the user \"%(user_display)s\" has given "
+"your email address to register an account on %(site_domain)s."
+msgstr ""
+"شما این ایمیل را دریافت کردید به دلیل اینکه درخواست تغییر رمز عبور خود را "
+"داشته اید در %(site_name)s"
+
+#: core/templates/account/email/email_confirmation_message.html:93
+msgid ""
+"Your email verification code is listed below. Please enter it in your open "
+"browser window."
+msgstr ""
+
+#: core/templates/account/email/email_confirmation_message.html:100
+#, fuzzy
+#| msgid "Please click the following link to confirm your email: %(link)s"
+msgid "Please click the button below to confirm your email address."
+msgstr "لطفاً برای تأیید ایمیل خود روی لینک زیر کلیک کنید: %(link)s"
+
+#: core/templates/account/email/email_confirmation_message.html:106
+#, fuzzy
+#| msgid "Configuration"
+msgid "Confirm email"
+msgstr "تنظیمات"
+
+#: core/templates/account/email/email_confirmation_message.html:110
+#, python-format
+msgid ""
+"The link is valid for %(expire_hours)s hours (until %(date)s, %(time)s). You "
+"can request a new one from your profile settings."
+msgstr ""
+
+#: core/templates/account/email/email_confirmation_message.html:116
+msgid "If the button doesn't work, copy and paste this link into your browser:"
+msgstr ""
+
+#: core/templates/account/email/email_confirmation_message.html:125
+msgid "the wger Team"
+msgstr "تیم WGER"
+
#: core/templates/base.html:10
#, python-format
msgid ""
@@ -457,51 +529,7 @@ msgstr ""
"آیا مطمئن هستید که میخواهید این کار را انجام دهید؟ بعد پاک کردن قابل برگشت "
"نخواهد بود"
-#: core/templates/email_verification/confirm_template.html:4
-msgid "Email verification"
-msgstr "تأیید ایمیل"
-
-#: core/templates/email_verification/confirm_template.html:18
-#, python-format
-msgid "%(username)s, your email was verified"
-msgstr "%(username)s، ایمیل شما تأیید شد"
-
-#: 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 "%(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 "لطفا برای تایید ایمیلتان <a href=\"%(link)s\">اینجا</a> کلیک کنید"
-
-#: 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 "توکن در %(time)s منقضی میشود"
-
-#: core/templates/email_verification/email_body_html.tpl:14
-#: core/templates/email_verification/email_body_txt.tpl:8
-msgid "the wger Team"
-msgstr "تیم WGER"
-
-#: core/templates/email_verification/email_body_txt.tpl:4
-#, python-format
-msgid "Please click the following link to confirm your email: %(link)s"
-msgstr "لطفاً برای تأیید ایمیل خود روی لینک زیر کلیک کنید: %(link)s"
-
-#: core/templates/language/overview.html:4 core/templates/navigation.html:344
+#: core/templates/language/overview.html:4 core/templates/navigation.html:341
msgid "Languages"
msgstr "زبان ها"
@@ -510,16 +538,16 @@ msgid "Nothing found."
msgstr "چیزی یافت نشد!"
#: core/templates/language/overview.html:22
-#: nutrition/templates/ingredient/overview.html:38
+#: nutrition/templates/ingredient/overview.html:43
msgid "Add one now."
msgstr "اضافه کن"
#: core/templates/language/overview.html:34 core/templates/license/list.html:43
-#: core/templates/repetition_unit/list.html:46
-#: core/templates/user/overview.html:344 core/templates/user/overview.html:384
-#: core/templates/user/overview.html:422
-#: core/templates/weight_unit/list.html:46 core/views/languages.py:74
-#: core/views/license.py:66 core/views/repetition_units.py:66
+#: core/templates/repetition_unit/list.html:44
+#: core/templates/user/overview.html:347 core/templates/user/overview.html:387
+#: core/templates/user/overview.html:425
+#: core/templates/weight_unit/list.html:46 core/views/languages.py:77
+#: core/views/license.py:66 core/views/repetition_units.py:76
#: core/views/weight_units.py:66
#: exercises/templates/categories/admin-overview.html:40
#: exercises/templates/equipment/admin-overview.html:39
@@ -532,14 +560,14 @@ msgstr "اضافه کن"
#: gym/templates/gym/member_list.html:264
#: gym/templates/gym/member_list.html:303
#: mailer/templates/mailer/gym/overview.html:43
-#: nutrition/templates/ingredient/overview.html:60
+#: nutrition/templates/ingredient/overview.html:97
msgid "Add"
msgstr "اضافه کردن"
#: core/templates/language/view.html:61 core/templates/user/api_key.html:41
#: core/templates/user/preferences.html:50 gym/models/contract.py:203
#: gym/templates/contract/view.html:41 gym/templates/gym/member_list.html:270
-#: nutrition/templates/ingredient/view.html:206
+#: nutrition/templates/ingredient/view.html:245
msgid "Options"
msgstr "امکانات"
@@ -549,9 +577,9 @@ msgstr "لیست مجوز ها"
#: core/templates/license/list.html:30
#: core/templates/repetition_unit/list.html:32
-#: core/templates/user/overview.html:104 core/templates/user/overview.html:136
-#: core/templates/user/overview.html:185 core/templates/user/overview.html:365
-#: core/templates/user/overview.html:404 core/templates/user/overview.html:448
+#: core/templates/user/overview.html:107 core/templates/user/overview.html:139
+#: core/templates/user/overview.html:188 core/templates/user/overview.html:368
+#: core/templates/user/overview.html:407 core/templates/user/overview.html:451
#: core/templates/weight_unit/list.html:32
#: exercises/templates/categories/admin-overview.html:30
#: exercises/templates/equipment/admin-overview.html:30
@@ -563,11 +591,10 @@ msgstr "لیست مجوز ها"
#: gym/templates/gym/member_list.html:284
#: gym/templates/gym/member_list.html:321
#: mailer/templates/mailer/gym/overview.html:30
-#: nutrition/templates/units/list.html:34
msgid "Nothing found"
msgstr "چیزی یافت نشد"
-#: core/templates/misc/about.html:4 core/templates/template.html:160
+#: core/templates/misc/about.html:4 core/templates/template.html:150
#, fuzzy
msgid "Imprint"
msgstr "نشان دادن"
@@ -577,170 +604,165 @@ msgstr "نشان دادن"
msgid "Training"
msgstr "تمرینات"
-#: core/templates/navigation.html:37 core/templates/user/overview.html:25
+#: core/templates/navigation.html:36 core/templates/user/overview.html:28
#, fuzzy
msgid "Routines"
msgstr "برنامه ها"
-#: core/templates/navigation.html:45 core/templates/user/overview.html:70
+#: core/templates/navigation.html:44 core/templates/user/overview.html:73
msgid "Calendar"
msgstr "تقویم"
-#: core/templates/navigation.html:55
+#: core/templates/navigation.html:53
msgid "Measurements"
msgstr "اندازه گیری"
-#: core/templates/navigation.html:66 gallery/templates/images/overview.html:6
+#: core/templates/navigation.html:64 gallery/templates/images/overview.html:6
msgid "Gallery"
msgstr "گالری"
-#: core/templates/navigation.html:72
+#: core/templates/navigation.html:74 core/templates/navigation.html:400
+#: trophies/templates/trophies/overview.html:7
+msgid "Trophies"
+msgstr ""
+
+#: core/templates/navigation.html:79
#, fuzzy
#| msgid "Workouts schedules"
msgid "Workout templates"
msgstr "الگو تمرین ورزشی"
-#: core/templates/navigation.html:79
+#: core/templates/navigation.html:86
msgid "Your templates"
msgstr "الگو های شما"
-#: core/templates/navigation.html:88
+#: core/templates/navigation.html:95
#, fuzzy
msgid "Public templates"
msgstr "الگو های عمومی"
-#: core/templates/navigation.html:96 software/templates/features.html:51
+#: core/templates/navigation.html:103 software/templates/features.html:51
#: software/templates/features.html:480
msgid "Exercises"
msgstr "تمرینات"
-#: core/templates/navigation.html:102 core/templates/navigation.html:176
-#: core/templates/navigation.html:339
+#: core/templates/navigation.html:109 core/templates/navigation.html:336
msgid "Administration"
msgstr ""
-#: core/templates/navigation.html:106
+#: core/templates/navigation.html:113
#, fuzzy
#| msgid "Exercises"
msgid "Exercise edit history"
msgstr "تمرینات"
-#: core/templates/navigation.html:112
+#: core/templates/navigation.html:119
msgid "Equipment"
msgstr "تجهیزات"
-#: core/templates/navigation.html:118
+#: core/templates/navigation.html:125
msgid "Muscles"
msgstr "ماهیچه ها"
-#: core/templates/navigation.html:124
+#: core/templates/navigation.html:131
#: exercises/templates/categories/admin-overview.html:4
msgid "Categories"
msgstr "دسته بندی ها"
-#: core/templates/navigation.html:139 software/templates/features.html:468
+#: core/templates/navigation.html:146 software/templates/features.html:468
msgid "Nutrition"
msgstr "مواد غذایی"
-#: core/templates/navigation.html:147 core/templates/user/overview.html:144
+#: core/templates/navigation.html:154 core/templates/user/overview.html:147
msgid "Nutrition plans"
msgstr "برنامه های غذایی"
-#: core/templates/navigation.html:156
+#: core/templates/navigation.html:163
msgid "BMI calculator"
msgstr "حسابگر BMI (شاخص توده بدنی)"
-#: core/templates/navigation.html:165 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:172 nutrition/templates/rate/form.html:18
msgid "Daily calories calculator"
msgstr "حسابگر کالری های روزانه"
-#: core/templates/navigation.html:171
+#: core/templates/navigation.html:178
#: nutrition/templates/ingredient/overview.html:10
msgid "Ingredient overview"
msgstr "نمای کلی مواد تشکیل دهنده"
-#: core/templates/navigation.html:180 nutrition/templates/units/list.html:6
-msgid "Ingredient weight units"
-msgstr "واحدهای وزن مواد تشکیل دهنده"
-
-#: core/templates/navigation.html:196 software/templates/features.html:463
+#: core/templates/navigation.html:193 software/templates/features.html:463
msgid "Body weight"
msgstr "وزن بدن"
-#: core/templates/navigation.html:203 core/templates/user/overview.html:114
+#: core/templates/navigation.html:200 core/templates/user/overview.html:117
msgid "Weight overview"
msgstr "بازنگری وزن "
-#: core/templates/navigation.html:217
+#: core/templates/navigation.html:214
msgid "About this software"
msgstr "درباره این نرم افزار"
-#: core/templates/navigation.html:223 software/templates/about_us.html:5
+#: core/templates/navigation.html:220 software/templates/about_us.html:5
msgid "Support & Get Involved"
msgstr "ما را پشتیبانی کنید و در ارتباط باشید"
-#: core/templates/navigation.html:229 software/templates/features.html:528
+#: core/templates/navigation.html:226 software/templates/features.html:528
msgid "REST API"
msgstr ""
-#: core/templates/navigation.html:235 utils/models.py:45
+#: core/templates/navigation.html:232 utils/models.py:45
msgid "License"
msgstr "مجوز"
-#: core/templates/navigation.html:241
+#: core/templates/navigation.html:238
#, fuzzy
msgid "Developer documentation"
msgstr "مستندات برنامه نوبیسان"
-#: core/templates/navigation.html:248
+#: core/templates/navigation.html:245
msgid "Get the code"
msgstr "کد را دریافت کنید"
-#: core/templates/navigation.html:255 core/templates/template.html:199
-#: software/templates/features.html:603
+#: core/templates/navigation.html:252 core/templates/template.html:202
+#: software/templates/features.html:614
msgid "Translate"
msgstr "ترجمه"
-#: core/templates/navigation.html:292 core/templates/user/login.html:30
+#: core/templates/navigation.html:289 core/templates/user/login.html:30
msgid "Reset password"
msgstr "بازنشانی رمز عبور"
-#: core/templates/navigation.html:301 core/templates/navigation.html:329
+#: core/templates/navigation.html:298 core/templates/navigation.html:326
msgid "Logout"
msgstr "خروج"
-#: core/templates/navigation.html:320
+#: core/templates/navigation.html:317
msgid "My preferences"
msgstr "ترجیحات من"
-#: core/templates/navigation.html:352
+#: core/templates/navigation.html:349
msgid "Licenses"
msgstr "مجوز ها"
-#: core/templates/navigation.html:360
+#: core/templates/navigation.html:357
#: core/templates/repetition_unit/list.html:4
#, fuzzy
msgid "Repetition units"
msgstr "واحد تکرار"
-#: core/templates/navigation.html:368 core/templates/weight_unit/list.html:4
-#: nutrition/templates/ingredient/view.html:141
+#: core/templates/navigation.html:365 core/templates/weight_unit/list.html:4
+#: nutrition/templates/ingredient/view.html:182
msgid "Weight units"
msgstr "واحد های وزن"
-#: core/templates/navigation.html:376 core/templates/user/list.html:4
+#: core/templates/navigation.html:373 core/templates/user/list.html:4
msgid "User list"
msgstr "لیست کاربر"
-#: core/templates/navigation.html:382
+#: core/templates/navigation.html:379
msgid "Gyms"
msgstr "باشگاه ها"
-#: core/templates/navigation.html:403
-#: trophies/templates/trophies/overview.html:7
-msgid "Trophies"
-msgstr ""
-
#: core/templates/registration/password_reset_complete.html:4
msgid "Password reset complete"
msgstr "تنظیم مجدد رمز عبور کامل شد"
@@ -800,25 +822,29 @@ msgstr ""
msgid "next"
msgstr ""
-#: core/templates/template.html:96
+#: core/templates/template.html:86
msgid "Close"
msgstr "بستن"
-#: core/templates/template.html:112
+#: core/templates/template.html:102
msgid ""
"You are using a guest account, data entered will be deleted after a week."
msgstr ""
-#: core/templates/template.html:117
+#: core/templates/template.html:107
msgid "Create some demo entries"
msgstr "چند نمونه پر کنید"
-#: core/templates/template.html:165 software/templates/features.html:568
+#: core/templates/template.html:155 software/templates/features.html:568
#: software/templates/tos.html:7
msgid "Terms of service"
msgstr ""
-#: core/templates/template_features.html:53 software/templates/features.html:9
+#: core/templates/template.html:181 software/templates/features.html:595
+msgid "Browser language"
+msgstr ""
+
+#: core/templates/template_features.html:46 software/templates/features.html:9
msgid "Features"
msgstr "امکانات"
@@ -873,99 +899,94 @@ msgstr ""
msgid "Forgot password?"
msgstr ""
-#: core/templates/user/overview.html:25 core/templates/user/overview.html:68
-#: core/templates/user/overview.html:112 core/templates/user/overview.html:144
-#: core/templates/user/overview.html:348 core/templates/user/overview.html:390
-#: core/templates/user/overview.html:426
+#: core/templates/user/overview.html:28 core/templates/user/overview.html:71
+#: core/templates/user/overview.html:115 core/templates/user/overview.html:147
+#: core/templates/user/overview.html:351 core/templates/user/overview.html:393
+#: core/templates/user/overview.html:429
#, python-format
msgid "last %(number)s"
msgstr ""
-#: core/templates/user/overview.html:27 core/templates/user/overview.html:146
-#: core/templates/user/overview.html:343 core/templates/user/overview.html:382
-#: core/templates/user/overview.html:421 gym/templates/gym/member_list.html:226
+#: core/templates/user/overview.html:30 core/templates/user/overview.html:149
+#: core/templates/user/overview.html:346 core/templates/user/overview.html:385
+#: core/templates/user/overview.html:424 gym/templates/gym/member_list.html:226
#: gym/templates/gym/member_list.html:262
#: gym/templates/gym/member_list.html:302
msgid "Overview"
msgstr "بازنگری"
-#: core/templates/user/overview.html:34 core/templates/user/overview.html:76
-#: core/templates/user/overview.html:120 core/templates/user/overview.html:152
+#: core/templates/user/overview.html:37 core/templates/user/overview.html:79
+#: core/templates/user/overview.html:123 core/templates/user/overview.html:155
#: manager/helpers.py:88 software/templates/about_us.html:170
#: weight/templates/import_csv_preview.html:13
#: weight/templates/import_csv_preview.html:42 weight/views.py:54
msgid "Date"
msgstr ""
-#: core/templates/user/overview.html:35 core/templates/user/overview.html:153
+#: core/templates/user/overview.html:38 core/templates/user/overview.html:156
#: gym/models/contract.py:58 gym/models/contract.py:109
msgid "Description"
msgstr ""
-#: core/templates/user/overview.html:36
+#: core/templates/user/overview.html:39
msgid "Number of logs (days)"
msgstr ""
-#: core/templates/user/overview.html:37 core/views/user.py:590
+#: core/templates/user/overview.html:40 core/views/user.py:606
#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:158
msgid "Last activity"
msgstr ""
-#: core/templates/user/overview.html:58
+#: core/templates/user/overview.html:61
msgid "No workouts found."
msgstr "تمرین یافت نشد"
-#: core/templates/user/overview.html:68
+#: core/templates/user/overview.html:71
msgid "Log"
msgstr ""
-#: core/templates/user/overview.html:77
+#: core/templates/user/overview.html:80
msgid "General impression"
msgstr ""
-#: core/templates/user/overview.html:78 core/templates/user/overview.html:390
+#: core/templates/user/overview.html:81 core/templates/user/overview.html:393
msgid "Notes"
msgstr ""
-#: core/templates/user/overview.html:79
-#: exercises/templates/history/overview.html:30
-msgid "Time"
-msgstr ""
-
-#: core/templates/user/overview.html:112 core/templates/user/overview.html:121
+#: core/templates/user/overview.html:115 core/templates/user/overview.html:124
#: manager/helpers.py:89 weight/templates/import_csv_preview.html:14
#: weight/templates/import_csv_preview.html:43 weight/views.py:54
msgid "Weight"
msgstr "وزن"
-#: core/templates/user/overview.html:154
-#: nutrition/templates/ingredient/view.html:51 nutrition/views/plan.py:245
+#: core/templates/user/overview.html:157
+#: nutrition/templates/ingredient/view.html:52 nutrition/views/plan.py:244
msgid "Energy"
msgstr "انرژی"
-#: core/templates/user/overview.html:155
-#: nutrition/templates/ingredient/view.html:58 nutrition/views/plan.py:251
+#: core/templates/user/overview.html:158
+#: nutrition/templates/ingredient/view.html:59 nutrition/views/plan.py:250
msgid "Protein"
msgstr "پروتئین"
-#: core/templates/user/overview.html:156
-#: nutrition/templates/ingredient/view.html:64 nutrition/views/plan.py:259
+#: core/templates/user/overview.html:159
+#: nutrition/templates/ingredient/view.html:65 nutrition/views/plan.py:258
msgid "Carbohydrates"
msgstr "کربوهیدارت ها"
-#: core/templates/user/overview.html:157
-#: nutrition/templates/ingredient/view.html:80 nutrition/views/plan.py:273
+#: core/templates/user/overview.html:160
+#: nutrition/templates/ingredient/view.html:81 nutrition/views/plan.py:272
msgid "Fat"
msgstr "چربی"
-#: core/templates/user/overview.html:170
-#: nutrition/templates/ingredient/view.html:53
+#: core/templates/user/overview.html:173
+#: nutrition/templates/ingredient/view.html:54
msgid "kcal"
msgstr "کیلو کالری"
-#: core/templates/user/overview.html:201 core/templates/user/overview.html:340
-#: core/templates/user/overview.html:379 core/templates/user/overview.html:418
-#: core/templates/user/overview.html:463 gym/templates/gym/list.html:45
+#: core/templates/user/overview.html:204 core/templates/user/overview.html:343
+#: core/templates/user/overview.html:382 core/templates/user/overview.html:421
+#: core/templates/user/overview.html:466 gym/templates/gym/list.html:45
#: gym/templates/gym/member_list.html:91 gym/templates/gym/member_list.html:149
#: gym/templates/gym/member_list.html:187
#: gym/templates/gym/member_list.html:223
@@ -974,109 +995,113 @@ msgstr "کیلو کالری"
msgid "Actions"
msgstr ""
-#: core/templates/user/overview.html:210
+#: core/templates/user/overview.html:213
msgid "Deactivate user"
msgstr ""
-#: core/templates/user/overview.html:214
+#: core/templates/user/overview.html:217
msgid "Activate user"
msgstr ""
-#: core/templates/user/overview.html:223
+#: core/templates/user/overview.html:226
msgid "Reset user password"
msgstr ""
-#: core/templates/user/overview.html:227 gym/templates/gym/member_list.html:30
+#: core/templates/user/overview.html:230 gym/templates/gym/member_list.html:30
msgid "Roles"
msgstr ""
-#: core/templates/user/overview.html:243
+#: core/templates/user/overview.html:246
msgid "Password reset confirmation"
msgstr ""
-#: core/templates/user/overview.html:247
+#: core/templates/user/overview.html:250
msgid "Do you really want to change this user&#39;s password?"
msgstr ""
-#: core/templates/user/overview.html:250
+#: core/templates/user/overview.html:253
#: exercises/templates/history/overview.html:106
+#: nutrition/templates/ingredient/view.html:148
+#: nutrition/templates/ingredient/view.html:160
msgid "No"
msgstr ""
-#: core/templates/user/overview.html:251
+#: core/templates/user/overview.html:254
#: exercises/templates/history/overview.html:99
+#: nutrition/templates/ingredient/view.html:146
+#: nutrition/templates/ingredient/view.html:158
msgid "Yes"
msgstr ""
-#: core/templates/user/overview.html:272 gym/templates/gym/member_list.html:105
+#: core/templates/user/overview.html:275 gym/templates/gym/member_list.html:105
msgid "Details"
msgstr ""
-#: core/templates/user/overview.html:276 gym/views/export.py:57
-#: manager/helpers.py:89 nutrition/views/plan.py:151
-#: nutrition/views/plan.py:157
+#: core/templates/user/overview.html:279 gym/views/export.py:57
+#: manager/helpers.py:89 nutrition/views/plan.py:150
+#: nutrition/views/plan.py:156
msgid "Nr."
msgstr ""
-#: core/templates/user/overview.html:298 gym/models/contract.py:287
+#: core/templates/user/overview.html:301 gym/models/contract.py:287
#: gym/models/gym.py:50 gym/templates/contract/view.html:75
#: gym/templates/gym/member_list.html:112 gym/views/export.py:68
msgid "Phone"
msgstr ""
-#: core/templates/user/overview.html:302 gym/templates/contract/view.html:87
+#: core/templates/user/overview.html:305 gym/templates/contract/view.html:87
#: gym/templates/gym/member_list.html:130
msgid "Address"
msgstr ""
-#: core/templates/user/overview.html:313
+#: core/templates/user/overview.html:316
msgid "Registered"
msgstr ""
-#: core/templates/user/overview.html:317
+#: core/templates/user/overview.html:320
msgid "Last login"
msgstr ""
-#: core/templates/user/overview.html:322
+#: core/templates/user/overview.html:325
msgid "Status"
msgstr ""
-#: core/templates/user/overview.html:325
+#: core/templates/user/overview.html:328
msgid "Active"
msgstr ""
-#: core/templates/user/overview.html:327
+#: core/templates/user/overview.html:330
msgid "Inactive"
msgstr ""
-#: core/templates/user/overview.html:348 gym/templates/contract/list.html:4
+#: core/templates/user/overview.html:351 gym/templates/contract/list.html:4
#: gym/templates/gym/member_list.html:218
msgid "Contracts"
msgstr ""
-#: core/templates/user/overview.html:426 gym/templates/document/list.html:4
+#: core/templates/user/overview.html:429 gym/templates/document/list.html:4
msgid "Documents"
msgstr ""
-#: core/templates/user/overview.html:433 gym/templates/document/list.html:33
+#: core/templates/user/overview.html:436 gym/templates/document/list.html:33
msgid "Download"
msgstr ""
-#: core/templates/user/overview.html:474 gym/views/admin_config.py:44
+#: core/templates/user/overview.html:477 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:477 gym/models/user_config.py:92
+#: core/templates/user/overview.html:480 gym/models/user_config.py:92
msgid "Include in inactive overview"
msgstr ""
-#: core/templates/user/overview.html:510
+#: core/templates/user/overview.html:513
#, python-format
msgid "Admin login is only available for users in %(gym_name)s"
msgstr ""
-#: core/templates/user/overview.html:514
+#: core/templates/user/overview.html:517
msgid "Log in as this user"
msgstr ""
@@ -1100,7 +1125,7 @@ msgstr ""
msgid "You need to verify your email to contribute exercises"
msgstr ""
-#: core/templates/user/preferences.html:55 core/views/user.py:601
+#: core/templates/user/preferences.html:55 core/views/user.py:617
msgid "Change password"
msgstr ""
@@ -1108,23 +1133,23 @@ msgstr ""
msgid "Already have an account?"
msgstr ""
-#: core/templatetags/wger_extras.py:142 i18n.tpl:38
+#: core/templatetags/wger_extras.py:142 i18n.tpl:39
msgid "kg"
msgstr ""
#: core/templatetags/wger_extras.py:144
-#: nutrition/templates/ingredient/view.html:60
-#: nutrition/templates/ingredient/view.html:66
-#: nutrition/templates/ingredient/view.html:73
-#: nutrition/templates/ingredient/view.html:82
-#: nutrition/templates/ingredient/view.html:89
-#: nutrition/templates/ingredient/view.html:111
-#: nutrition/templates/ingredient/view.html:121
+#: nutrition/templates/ingredient/view.html:61
+#: nutrition/templates/ingredient/view.html:67
+#: nutrition/templates/ingredient/view.html:74
+#: nutrition/templates/ingredient/view.html:83
+#: nutrition/templates/ingredient/view.html:90
+#: nutrition/templates/ingredient/view.html:112
+#: nutrition/templates/ingredient/view.html:122
msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr ""
-#: core/templatetags/wger_extras.py:147 i18n.tpl:39
+#: core/templatetags/wger_extras.py:147 i18n.tpl:40
msgid "lb"
msgstr ""
@@ -1133,84 +1158,83 @@ msgctxt "weight unit, i.e. ounces"
msgid "oz"
msgstr ""
-#: core/views/languages.py:85 exercises/views/categories.py:122
+#: core/views/languages.py:88 exercises/views/categories.py:122
#: exercises/views/equipment.py:103 exercises/views/muscles.py:99
-#: nutrition/views/ingredient.py:120 nutrition/views/unit.py:110
+#: nutrition/views/ingredient.py:125
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
+#: core/views/languages.py:96 core/views/license.py:103
+#: core/views/repetition_units.py:114 core/views/weight_units.py:115
#: exercises/views/categories.py:128 exercises/views/muscles.py:106
#: gallery/views/images.py:124 gym/views/admin_notes.py:196
#: gym/views/document.py:206 gym/views/gym.py:481
-#: nutrition/views/ingredient.py:127 nutrition/views/unit.py:117
+#: nutrition/views/ingredient.py:132
#, python-brace-format
msgid "Delete {0}?"
msgstr ""
-#: core/views/languages.py:111 core/views/license.py:85
-#: core/views/repetition_units.py:86 core/views/user.py:464
+#: core/views/languages.py:114 core/views/license.py:85
+#: core/views/repetition_units.py:96 core/views/user.py:480
#: core/views/weight_units.py:86 exercises/views/categories.py:98
#: exercises/views/equipment.py:81 exercises/views/muscles.py:87
#: gym/views/admin_notes.py:161 gym/views/config.py:68
#: gym/views/contract.py:186 gym/views/contract_option.py:123
#: gym/views/contract_type.py:123 gym/views/document.py:171
-#: gym/views/gym.py:463 nutrition/views/ingredient.py:146
-#: nutrition/views/unit.py:143
+#: gym/views/gym.py:463 nutrition/views/ingredient.py:151
#, python-brace-format
msgid "Edit {0}"
msgstr ""
-#: core/views/misc.py:74
+#: core/views/misc.py:73
msgid ""
"We have created sample workout, workout schedules, weight logs, (body) "
"weight and nutrition plan entries so you can better see what this site can "
"do. Feel free to edit or delete them!"
msgstr ""
-#: core/views/user.py:143
+#: core/views/user.py:145
#, python-brace-format
msgid "Account \"{0}\" was successfully deleted"
msgstr ""
-#: core/views/user.py:279
+#: core/views/user.py:287
msgid "You were successfully registered"
msgstr ""
-#: core/views/user.py:341
+#: core/views/user.py:357
msgid "Settings successfully updated"
msgstr ""
-#: core/views/user.py:380
+#: core/views/user.py:396
msgid "The user was successfully deactivated"
msgstr ""
-#: core/views/user.py:417
+#: core/views/user.py:433
msgid "The user was successfully activated"
msgstr ""
-#: core/views/user.py:432
+#: core/views/user.py:448
msgid "Edit user"
msgstr ""
-#: core/views/user.py:587 gym/templates/gym/member_list.html:26
+#: core/views/user.py:603 gym/templates/gym/member_list.html:26
#: gym/views/gym.py:158
msgid "ID"
msgstr ""
-#: core/views/user.py:588 gym/forms.py:95 gym/templates/contract/view.html:55
+#: core/views/user.py:604 gym/forms.py:95 gym/templates/contract/view.html:55
#: gym/templates/gym/member_list.html:27 gym/views/export.py:59
#: gym/views/gym.py:158 gym/views/gym.py:217
msgid "Username"
msgstr ""
-#: core/views/user.py:591 gym/templates/gym/new_user.html:34
+#: core/views/user.py:607 gym/templates/gym/new_user.html:34
#: gym/views/export.py:58 gym/views/gym.py:217
msgid "Gym"
msgstr ""
-#: core/views/user.py:650
+#: core/views/user.py:678
#, python-format
msgid "A verification email was sent to %(email)s"
msgstr ""
@@ -1227,16 +1251,16 @@ msgstr ""
msgid "A more basic name for the muscle"
msgstr ""
-#: exercises/models/video.py:50
+#: exercises/models/video.py:52
#, python-format
msgid "Maximum file size is %(size)sMB."
msgstr ""
-#: exercises/models/video.py:57 exercises/models/video.py:65
+#: exercises/models/video.py:59 exercises/models/video.py:67
msgid "File type is not supported"
msgstr ""
-#: exercises/models/video.py:70
+#: exercises/models/video.py:72
#, fuzzy
#| msgid "%(birthdate)s is not a valid birthdate"
msgid "File is not a valid video"
@@ -1311,7 +1335,11 @@ msgstr ""
msgid "Add muscle"
msgstr ""
-#: gallery/templates/images/overview.html:72
+#: gallery/forms.py:35
+msgid "If date is left empty, it will be read from the image instead"
+msgstr ""
+
+#: gallery/templates/images/overview.html:69
msgid "Add image"
msgstr ""
@@ -1377,7 +1405,7 @@ msgid "Contract type"
msgstr ""
#: gym/models/contract.py:211 gym/templates/contract/view.html:59
-#: nutrition/forms.py:58
+#: nutrition/forms.py:67
msgid "Amount"
msgstr ""
@@ -1553,7 +1581,7 @@ msgstr ""
msgid "Add member"
msgstr ""
-#: gym/templates/gym/new_user.html:48 nutrition/templates/rate/form.html:120
+#: gym/templates/gym/new_user.html:48 nutrition/templates/rate/form.html:121
msgid "Info"
msgstr "اطلاعات"
@@ -1726,10 +1754,6 @@ msgstr ""
msgid "Quads"
msgstr ""
-#: i18n.tpl:30
-msgid "Repetitions"
-msgstr ""
-
#: i18n.tpl:31
msgid "Resistance band"
msgstr ""
@@ -1760,189 +1784,195 @@ msgstr "سه سر بازو"
msgid "Until Failure"
msgstr "تا حد ناتوانی"
-#: i18n.tpl:40
+#: i18n.tpl:38
+#, fuzzy
+#| msgid "Kilometers"
+msgid "Meters"
+msgstr "کیلوگرم"
+
+#: i18n.tpl:41
msgid "none (bodyweight exercise)"
msgstr ""
-#: i18n.tpl:41
+#: i18n.tpl:42
msgid "Beginner"
msgstr ""
-#: i18n.tpl:42
+#: i18n.tpl:43
msgid "Consistent"
msgstr ""
-#: i18n.tpl:43
+#: i18n.tpl:44
msgid "Dedicated"
msgstr ""
-#: i18n.tpl:44
+#: i18n.tpl:45
msgid "Obsessed"
msgstr ""
-#: i18n.tpl:45
+#: i18n.tpl:46
msgid "Legend"
msgstr ""
-#: i18n.tpl:46
+#: i18n.tpl:47
msgid "Veteran"
msgstr ""
-#: i18n.tpl:47
+#: i18n.tpl:48
msgid "Titan"
msgstr ""
-#: i18n.tpl:48
+#: i18n.tpl:49
msgid "Unstoppable"
msgstr ""
-#: i18n.tpl:49
+#: i18n.tpl:50
msgid "Weekend Warrior"
msgstr ""
-#: i18n.tpl:50
+#: i18n.tpl:51
msgid "Elephant lifter"
msgstr ""
-#: i18n.tpl:51
+#: i18n.tpl:52
msgid "Bus lifter"
msgstr ""
-#: i18n.tpl:52
+#: i18n.tpl:53
msgid "Plane lifter"
msgstr ""
-#: i18n.tpl:53
+#: i18n.tpl:54
msgid "Blue whale lifter"
msgstr ""
-#: i18n.tpl:54
+#: i18n.tpl:55
msgid "Space Station lifter"
msgstr ""
-#: i18n.tpl:55
+#: i18n.tpl:56
msgid "Millionaire"
msgstr ""
-#: i18n.tpl:56
+#: i18n.tpl:57
msgid "Atlas"
msgstr ""
-#: i18n.tpl:57
+#: i18n.tpl:58
msgid "Early Bird"
msgstr ""
-#: i18n.tpl:58
+#: i18n.tpl:59
msgid "Night Owl"
msgstr ""
-#: i18n.tpl:59
+#: i18n.tpl:60
msgid "New Year, New Me"
msgstr ""
-#: i18n.tpl:60
+#: i18n.tpl:61
msgid "Phoenix"
msgstr ""
-#: i18n.tpl:61
+#: i18n.tpl:62
#, fuzzy
#| msgid "Personal data"
msgid "Personal Record"
msgstr "اطلاعات شخصی"
-#: i18n.tpl:62
+#: i18n.tpl:63
msgid "Complete your first workout"
msgstr ""
-#: i18n.tpl:63
+#: i18n.tpl:64
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 10 workouts"
msgstr "نمونه تمرینات"
-#: i18n.tpl:64
+#: i18n.tpl:65
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 50 workouts"
msgstr "نمونه تمرینات"
-#: i18n.tpl:65
+#: i18n.tpl:66
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 100 workouts"
msgstr "نمونه تمرینات"
-#: i18n.tpl:66
+#: i18n.tpl:67
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 200 workouts"
msgstr "نمونه تمرینات"
-#: i18n.tpl:67
+#: i18n.tpl:68
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 500 workouts"
msgstr "نمونه تمرینات"
-#: i18n.tpl:68
+#: i18n.tpl:69
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 1000 workouts"
msgstr "نمونه تمرینات"
-#: i18n.tpl:69
+#: i18n.tpl:70
msgid "Maintain a 30-day workout streak"
msgstr ""
-#: i18n.tpl:70
+#: i18n.tpl:71
msgid "Work out on Saturday and Sunday for 4 consecutive weekends"
msgstr ""
-#: i18n.tpl:71
+#: i18n.tpl:72
msgid "Lift a cumulative total of 5.000 kg"
msgstr ""
-#: i18n.tpl:72
+#: i18n.tpl:73
msgid "Lift a cumulative total of 20.000 kg"
msgstr ""
-#: i18n.tpl:73
+#: i18n.tpl:74
msgid "Lift a cumulative total of 50.000 kg"
msgstr ""
-#: i18n.tpl:74
+#: i18n.tpl:75
msgid "Lift a cumulative total of 150.000 kg"
msgstr ""
-#: i18n.tpl:75
+#: i18n.tpl:76
msgid "Lift a cumulative total of 450.000 kg"
msgstr ""
-#: i18n.tpl:76
+#: i18n.tpl:77
msgid "Lift a cumulative total of 1.000.000 kg"
msgstr ""
-#: i18n.tpl:77
+#: i18n.tpl:78
msgid "Lift a cumulative total of 10.000.000 kg"
msgstr ""
-#: i18n.tpl:78
+#: i18n.tpl:79
msgid "Complete a workout before 6:00 AM"
msgstr ""
-#: i18n.tpl:79
+#: i18n.tpl:80
msgid "Complete a workout after 9:00 PM"
msgstr ""
-#: i18n.tpl:80
+#: i18n.tpl:81
msgid "Work out on January 1st"
msgstr ""
-#: i18n.tpl:81
+#: i18n.tpl:82
msgid "Return to training after being inactive for 30 days"
msgstr ""
-#: i18n.tpl:82
+#: i18n.tpl:83
msgid "Achieve a new Personal Record on any exercise"
msgstr ""
@@ -2024,7 +2054,7 @@ msgstr ""
msgid "Routine will expire soon"
msgstr ""
-#: manager/models/routine.py:153 manager/models/session.py:145
+#: manager/models/routine.py:154 manager/models/session.py:145
msgid "The start time cannot be after the end time."
msgstr ""
@@ -2096,38 +2126,60 @@ msgstr "تمرین"
msgid "Workout for %s"
msgstr ""
-#: nutrition/forms.py:62
+#: nutrition/extract_info/off.py:72 nutrition/extract_info/off.py:91
+msgid "Serving"
+msgstr ""
+
+#: nutrition/forms.py:71 nutrition/forms.py:208
msgid "Unit"
msgstr ""
-#: nutrition/forms.py:170 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:179 nutrition/templates/rate/form.html:77
msgid "Basic caloric intake"
msgstr ""
-#: nutrition/forms.py:171
+#: nutrition/forms.py:180
msgid "Your basic caloric intake as calculated for your data"
msgstr ""
-#: nutrition/forms.py:176
+#: nutrition/forms.py:185
msgid "Additional calories"
msgstr ""
-#: nutrition/forms.py:178
+#: nutrition/forms.py:187
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
msgstr ""
#: nutrition/forms.py:209
+msgid "grams (g)"
+msgstr ""
+
+#: nutrition/forms.py:219
msgid "Ingredient"
msgstr ""
-#: nutrition/forms.py:213
+#: nutrition/forms.py:223
#, fuzzy
#| msgid "Also use ingredients in English"
msgid "Also search for names in English"
msgstr "همچنین عناصر مورد نیاز را به انگلیسی نمایش بده"
+#: nutrition/forms.py:239
+msgid "Quantity"
+msgstr ""
+
+#: nutrition/forms.py:241
+msgid "Enter a quantity and choose grams (g) or one of the serving units."
+msgstr ""
+
+#: nutrition/models/ingredient.py:526
+#, fuzzy
+#| msgid "Nutrition"
+msgid "Portion"
+msgstr "مواد غذایی"
+
#: nutrition/templates/ingredient/email_new.tpl:1
#, python-format
msgid ""
@@ -2165,59 +2217,86 @@ msgid ""
"sucessfully."
msgstr ""
-#: nutrition/templates/ingredient/overview.html:38
+#: nutrition/templates/ingredient/overview.html:32
+#: nutrition/templates/ingredient/overview.html:68
+#: nutrition/templates/ingredient/view.html:143
+msgid "Vegan"
+msgstr ""
+
+#: nutrition/templates/ingredient/overview.html:34
+#: nutrition/templates/ingredient/overview.html:79
+#: nutrition/templates/ingredient/view.html:155
+msgid "Vegetarian"
+msgstr ""
+
+#: nutrition/templates/ingredient/overview.html:43
msgid "No ingredients."
msgstr ""
-#: nutrition/templates/ingredient/overview.html:49
+#: nutrition/templates/ingredient/overview.html:54
msgid "Search"
msgstr ""
-#: nutrition/templates/ingredient/view.html:45 nutrition/views/plan.py:237
+#: nutrition/templates/ingredient/overview.html:57
+msgid "Filter"
+msgstr ""
+
+#: nutrition/templates/ingredient/overview.html:83
+msgid "Apply"
+msgstr ""
+
+#: nutrition/templates/ingredient/overview.html:85
+msgid "Reset"
+msgstr ""
+
+#: nutrition/templates/ingredient/view.html:46 nutrition/views/plan.py:236
msgid "Macronutrients"
msgstr ""
-#: nutrition/templates/ingredient/view.html:54
+#: nutrition/templates/ingredient/view.html:55
msgid "kJ"
msgstr ""
-#: nutrition/templates/ingredient/view.html:70 nutrition/views/plan.py:267
+#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:266
msgid "Sugar content in carbohydrates"
msgstr ""
-#: nutrition/templates/ingredient/view.html:75
-#: nutrition/templates/ingredient/view.html:91
-#: nutrition/templates/ingredient/view.html:113
-#: nutrition/templates/ingredient/view.html:123
+#: nutrition/templates/ingredient/view.html:76
+#: nutrition/templates/ingredient/view.html:92
+#: nutrition/templates/ingredient/view.html:114
+#: nutrition/templates/ingredient/view.html:124
msgid "n.A."
msgstr ""
-#: nutrition/templates/ingredient/view.html:86 nutrition/views/plan.py:281
+#: nutrition/templates/ingredient/view.html:87 nutrition/views/plan.py:280
msgid "Saturated fat content in fats"
msgstr ""
-#: nutrition/templates/ingredient/view.html:102
+#: nutrition/templates/ingredient/view.html:103
msgid "Others"
msgstr ""
-#: nutrition/templates/ingredient/view.html:108 nutrition/views/plan.py:287
+#: nutrition/templates/ingredient/view.html:109 nutrition/views/plan.py:286
msgid "Fiber"
msgstr ""
-#: nutrition/templates/ingredient/view.html:118 nutrition/views/plan.py:293
+#: nutrition/templates/ingredient/view.html:119 nutrition/views/plan.py:292
msgid "Sodium"
msgstr ""
-#: nutrition/templates/ingredient/view.html:143
-#: nutrition/templates/units/list.html:50 nutrition/views/unit.py:86
+#: nutrition/templates/ingredient/view.html:136
+msgid "Dietary information"
+msgstr ""
+
+#: nutrition/templates/ingredient/view.html:184
msgid "Add new weight unit"
msgstr ""
-#: nutrition/templates/rate/form.html:25
+#: nutrition/templates/rate/form.html:26
msgid "Basal metabolic rate"
msgstr ""
-#: nutrition/templates/rate/form.html:26
+#: nutrition/templates/rate/form.html:27
msgid ""
"The basal metabolic rate is the amount of energy expended daily\n"
"at rest. This is the minimum energy needed for the body to function, without "
@@ -2225,36 +2304,36 @@ msgid ""
"additional physical activity."
msgstr ""
-#: nutrition/templates/rate/form.html:37
+#: nutrition/templates/rate/form.html:38
msgid "Your basic metabolic rate is: "
msgstr ""
-#: nutrition/templates/rate/form.html:47
+#: nutrition/templates/rate/form.html:48
msgid "Physical activities"
msgstr ""
-#: nutrition/templates/rate/form.html:48
+#: nutrition/templates/rate/form.html:49
msgid ""
"The physical activity level (PAL) is a factor used to to express\n"
"the additional physical activity and is used to calculate the total energy\n"
"required per day."
msgstr ""
-#: nutrition/templates/rate/form.html:59
+#: nutrition/templates/rate/form.html:60
msgid "Factor for daily activities: "
msgstr ""
-#: nutrition/templates/rate/form.html:67
+#: nutrition/templates/rate/form.html:68
msgid ""
"The base caloric intake is the amount of calories your metabolism\n"
"needs based on your level of physical activity."
msgstr ""
-#: nutrition/templates/rate/form.html:81
+#: nutrition/templates/rate/form.html:82
msgid "Calculate basic caloric intake"
msgstr ""
-#: nutrition/templates/rate/form.html:88
+#: nutrition/templates/rate/form.html:89
msgid ""
"The total calories are the actual total calories per day. This\n"
"might include e.g. a surplus or deficit if you are bulking or cutting. "
@@ -2262,69 +2341,69 @@ msgid ""
"you might just enter yourself the amount of calories if you know the value."
msgstr ""
-#: nutrition/templates/rate/form.html:102
+#: nutrition/templates/rate/form.html:103
msgid "Transfer basic intake to total daily calories"
msgstr ""
-#: nutrition/templates/rate/form.html:106
+#: nutrition/templates/rate/form.html:107
msgid "Add additional calories to total daily calories"
msgstr ""
-#: nutrition/templates/rate/form.html:110
+#: nutrition/templates/rate/form.html:111
msgid "Save total calories to profile"
msgstr ""
-#: nutrition/templates/rate/form.html:121
+#: nutrition/templates/rate/form.html:122
msgid ""
"Please note that these calculations can only be an\n"
"approximation. If you base your nutrition plan on these values, observe\n"
"yourself for some weeks and change the total amount if needed."
msgstr ""
-#: nutrition/views/ingredient.py:158
+#: nutrition/views/ingredient.py:163
msgid "Add a new ingredient"
msgstr ""
-#: nutrition/views/plan.py:128
+#: nutrition/views/plan.py:127
msgid "Nutritional plan"
msgstr ""
-#: nutrition/views/plan.py:130
+#: nutrition/views/plan.py:129
#, python-format
msgid "Nutritional plan for %s"
msgstr ""
-#: nutrition/views/plan.py:202
+#: nutrition/views/plan.py:201
msgid "<i>This is an empty plan, what did you expect on the PDF?</i>"
msgstr ""
-#: nutrition/views/plan.py:230
+#: nutrition/views/plan.py:229
#, fuzzy
#| msgid "Nutrition plan"
msgid "Nutritional data"
msgstr "برنامه غذایی"
-#: nutrition/views/plan.py:238
+#: nutrition/views/plan.py:237
msgid "Total"
msgstr ""
-#: nutrition/views/plan.py:239
+#: nutrition/views/plan.py:238
msgid "Percent of energy"
msgstr ""
-#: nutrition/views/plan.py:240
+#: nutrition/views/plan.py:239
msgid "g per body kg"
msgstr ""
-#: nutrition/views/unit_ingredient.py:69
+#: nutrition/views/unit_ingredient.py:64
msgid "Add a new weight unit"
msgstr ""
-#: nutrition/views/unit_ingredient.py:106
+#: nutrition/views/unit_ingredient.py:99
msgid "Edit a weight unit to ingredient connection"
msgstr ""
-#: nutrition/views/unit_ingredient.py:138
+#: nutrition/views/unit_ingredient.py:129
msgid "Delete?"
msgstr ""
@@ -2677,7 +2756,7 @@ msgstr ""
msgid "Translation"
msgstr ""
-#: utils/generic_views.py:263
+#: utils/generic_views.py:246
msgid "Yes, delete"
msgstr "بله، حذف"
@@ -2728,10 +2807,6 @@ msgstr ""
msgid "Import weight logs"
msgstr ""
-#: weight/templates/import_csv_form.html:9
-msgid "Submit"
-msgstr ""
-
#: weight/templates/import_csv_form.html:15
msgid ""
"Use this import field to import your weight logs into Workout\n"
@@ -2827,6 +2902,34 @@ msgstr ""
msgid "Re-Submit"
msgstr ""
+#~ msgid "Email verification"
+#~ msgstr "تأیید ایمیل"
+
+#, python-format
+#~ msgid "%(username)s, your email was verified"
+#~ msgstr "%(username)s، ایمیل شما تأیید شد"
+
+#~ msgid "Error, invalid verification token"
+#~ msgstr "خطا ، توکن تأیید نامعتبر"
+
+#~ msgid "Email Confirmation"
+#~ msgstr "تأیید ایمیل"
+
+#, python-format
+#~ msgid "You are almost there, %(username)s!"
+#~ msgstr "%(username)s، تقریبا تمومه!"
+
+#, python-format
+#~ msgid "Please click <a href=\"%(link)s\">here</a> to confirm your email"
+#~ msgstr "لطفا برای تایید ایمیلتان <a href=\"%(link)s\">اینجا</a> کلیک کنید"
+
+#, python-format
+#~ msgid "The token expires on %(time)s"
+#~ msgstr "توکن در %(time)s منقضی میشود"
+
+#~ msgid "Ingredient weight units"
+#~ msgstr "واحدهای وزن مواد تشکیل دهنده"
+
#~ msgid "Some way of answering you (e-mail, etc.)"
#~ msgstr "راه های ارتباطی با شما(ایمیل و ... )"
diff --git a/wger/locale/fi/LC_MESSAGES/django.po b/wger/locale/fi/LC_MESSAGES/django.po
index 2960ae9f0..9c0c49069 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: 2026-01-17 14:03+0000\n"
+"POT-Creation-Date: 2026-04-10 10:20+0000\n"
"PO-Revision-Date: 2025-12-08 07:00+0000\n"
"Last-Translator: Petri Hämäläinen <[email protected]>\n"
"Language-Team: Finnish <https://hosted.weblate.org/projects/wger/web/fi/>\n"
@@ -36,7 +36,7 @@ msgstr ""
#: config/views/gym_config.py:42 core/templates/language/view.html:64
#: core/templates/license/list.html:17
#: core/templates/repetition_unit/list.html:18
-#: core/templates/user/overview.html:204 core/templates/user/overview.html:467
+#: core/templates/user/overview.html:207 core/templates/user/overview.html:470
#: core/templates/weight_unit/list.html:18
#: exercises/templates/categories/admin-overview.html:17
#: exercises/templates/equipment/admin-overview.html:17
@@ -48,30 +48,29 @@ msgstr ""
#: gym/templates/gym/list.html:19 gym/templates/gym/list.html:48
#: gym/templates/gym/member_list.html:94 gym/templates/gym/member_list.html:152
#: gym/templates/gym/member_list.html:190
-#: nutrition/templates/ingredient/view.html:164
-#: nutrition/templates/ingredient/view.html:209
-#: nutrition/templates/units/list.html:19
+#: nutrition/templates/ingredient/view.html:205
+#: nutrition/templates/ingredient/view.html:248
msgid "Edit"
msgstr "Muokkaa"
-#: core/forms.py:91 core/templates/navigation.html:271
-#: core/templates/navigation.html:278 core/templates/user/login.html:4
+#: core/forms.py:89 core/templates/navigation.html:268
+#: core/templates/navigation.html:275 core/templates/user/login.html:4
#: core/templates/user/registration_sidebar.html:12
#: software/templates/features.html:82 software/templates/features.html:448
msgid "Login"
msgstr "Kirjaudu sisään"
-#: core/forms.py:130 core/forms.py:244 gym/views/export.py:61
+#: core/forms.py:128 core/forms.py:242 gym/views/export.py:61
#: gym/views/gym.py:217
msgid "First name"
msgstr "Etunimi"
-#: core/forms.py:131 core/forms.py:245 core/templates/user/overview.html:284
+#: core/forms.py:129 core/forms.py:243 core/templates/user/overview.html:287
#: gym/views/export.py:62 gym/views/gym.py:217
msgid "Last name"
msgstr "Sukunimi"
-#: core/forms.py:133 core/forms.py:210 core/templates/user/overview.html:288
+#: core/forms.py:131 core/forms.py:208 core/templates/user/overview.html:291
#: gym/models/contract.py:256 gym/models/gym.py:58
#: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:116
#: gym/templates/gym/new_user.html:30 gym/views/export.py:60
@@ -81,56 +80,56 @@ msgstr "Sukunimi"
msgid "Email"
msgstr "Sähköposti"
-#: core/forms.py:134
+#: core/forms.py:132
msgid "Used for password resets and, optionally, e-mail reminders."
msgstr ""
"Käytetään salasanan nollaukseen ja valinnaisesti sähköpostimuistutuksiin."
-#: core/forms.py:138 core/models/profile.py:222
+#: core/forms.py:136 core/models/profile.py:222
#: gym/templates/gym/new_user.html:38
msgid "Date of Birth"
msgstr "Syntymäpäivä"
-#: core/forms.py:177
+#: core/forms.py:175
msgid "Personal data"
msgstr "Henkilökohtaiset tiedot"
-#: core/forms.py:189
+#: core/forms.py:187
msgid "Workout reminders"
msgstr "Harjoittelumuistutukset"
-#: core/forms.py:196
+#: core/forms.py:194
msgid "Other settings"
msgstr "Muut asetukset"
-#: core/forms.py:204 core/views/user.py:614 core/views/user.py:629
-#: core/views/user.py:641 gym/forms.py:73 utils/generic_views.py:143
+#: core/forms.py:202 core/views/user.py:630 core/views/user.py:654
+#: core/views/user.py:668 gym/forms.py:73 utils/generic_views.py:137
msgid "Save"
msgstr "Tallenna"
-#: core/forms.py:211
+#: core/forms.py:209
msgid "Used for password resets and, optionally, email reminders."
msgstr ""
"Käytetään uuden salasanan hankkimiseen ja valinnaisesti "
"sähköpostimuistutuksiin."
-#: core/forms.py:240
+#: core/forms.py:238
msgid "This e-mail address is already in use."
msgstr "Tämä sähköpostiosoite on jo käytössä."
-#: core/forms.py:261 gym/templates/gym/new_user.html:26
+#: core/forms.py:259 gym/templates/gym/new_user.html:26
#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:217
msgid "Password"
msgstr "Salasana"
-#: core/forms.py:263
+#: core/forms.py:261
msgid "Please enter your current password."
msgstr "Anna nykyinen salasanasi."
-#: core/forms.py:272 core/templates/language/view.html:70
+#: core/forms.py:270 core/templates/language/view.html:70
#: core/templates/license/list.html:21
#: core/templates/repetition_unit/list.html:22
-#: core/templates/user/overview.html:233
+#: core/templates/user/overview.html:236
#: core/templates/weight_unit/list.html:22
#: exercises/templates/categories/admin-overview.html:21
#: exercises/templates/equipment/admin-overview.html:21
@@ -138,27 +137,30 @@ msgstr "Anna nykyinen salasanasi."
#: gym/templates/admin_notes/list.html:37
#: gym/templates/contract_option/list.html:35
#: gym/templates/contract_type/list.html:36 gym/templates/document/list.html:46
-#: gym/templates/gym/list.html:23 nutrition/templates/ingredient/view.html:168
-#: nutrition/templates/ingredient/view.html:215
-#: nutrition/templates/units/list.html:25
+#: gym/templates/gym/list.html:23 nutrition/templates/ingredient/view.html:209
+#: nutrition/templates/ingredient/view.html:254
msgid "Delete"
msgstr "Poista"
-#: core/forms.py:281
+#: core/forms.py:279
msgid "Invalid password"
msgstr "Väärä salasana"
-#: core/forms.py:293
+#: core/forms.py:291 core/forms.py:349
msgid "The form is secured with reCAPTCHA"
msgstr "Lomake on suojattu reCAPTCHA:lla"
-#: core/forms.py:314 core/forms.py:341 core/templates/navigation.html:272
-#: core/templates/navigation.html:285 core/templates/template.html:123
-#: core/templates/user/login.html:21 core/views/user.py:285
+#: core/forms.py:312 core/forms.py:339 core/templates/navigation.html:269
+#: core/templates/navigation.html:282 core/templates/template.html:113
+#: core/templates/user/login.html:21 core/views/user.py:293
#: software/templates/features.html:87 software/templates/features.html:442
msgid "Register"
msgstr "Rekisteröidy"
+#: core/forms.py:360 weight/templates/import_csv_form.html:9
+msgid "Submit"
+msgstr "Lähetä"
+
#: core/models/language.py:31 core/templates/language/view.html:21
msgid "Language short name"
msgstr "Kielen lyhenne"
@@ -195,36 +197,36 @@ msgstr "Linkki"
msgid "Link to license text or other information"
msgstr "Linkki lisenssitekstiin tai muuhun tietoon"
-#: core/models/profile.py:57
+#: core/models/profile.py:60
#, python-format
msgid "%(birthdate)s is not a valid birthdate"
msgstr "%(birthdate)s ei ole kelvollinen syntymäaika"
-#: core/models/profile.py:66
+#: core/models/profile.py:69
msgid "Male"
msgstr "Mies"
-#: core/models/profile.py:67
+#: core/models/profile.py:70
msgid "Female"
msgstr "Nainen"
-#: core/models/profile.py:74
+#: core/models/profile.py:77
msgid "Low"
msgstr "Matala"
-#: core/models/profile.py:75
+#: core/models/profile.py:78
msgid "Medium"
msgstr "Keskitaso"
-#: core/models/profile.py:76
+#: core/models/profile.py:79
msgid "High"
msgstr "Korkea"
-#: core/models/profile.py:82
+#: core/models/profile.py:85
msgid "Metric (kilogram)"
msgstr "Metriset (kilogramma)"
-#: core/models/profile.py:83
+#: core/models/profile.py:86
msgid "Imperial (pound)"
msgstr "Brittiläinen (pauna)"
@@ -347,7 +349,7 @@ msgstr "Keskimäärin tunteja viikossa"
msgid "Free time"
msgstr "Vapaa-aika"
-#: core/models/profile.py:320 nutrition/templates/rate/form.html:66
+#: core/models/profile.py:320 nutrition/templates/rate/form.html:67
msgid "Total daily calories"
msgstr "Päivittäisiä kaloreita yhteensä"
@@ -389,20 +391,45 @@ msgstr ""
msgid "Enable or disable the trophy system for this user"
msgstr ""
-#: core/models/profile.py:446
+#: core/models/profile.py:457
msgid "The sum of all hours has to be 24"
msgstr "Tuntien summa tarvitsee olla 24"
-#: core/models/rep_unit.py:36 core/models/weight_unit.py:42
-#: core/templates/user/overview.html:280 core/views/user.py:589
+#: core/models/rep_unit.py:32 i18n.tpl:30
+msgid "Repetitions"
+msgstr "Toistot"
+
+#: core/models/rep_unit.py:33 core/templates/user/overview.html:82
+#: exercises/templates/history/overview.html:30
+msgid "Time"
+msgstr "Aika"
+
+#: core/models/rep_unit.py:34
+#, fuzzy
+#| msgid "Resistance band"
+msgid "Distance"
+msgstr "Vastuskuminauha"
+
+#: core/models/rep_unit.py:47 core/models/weight_unit.py:42
+#: core/templates/user/overview.html:283 core/views/user.py:605
#: exercises/models/muscle.py:36 gym/models/contract.py:52
#: gym/models/contract.py:103 gym/models/gym.py:46
#: gym/models/user_document.py:84 gym/templates/contract/view.html:50
#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:108
-#: gym/views/gym.py:158 nutrition/templates/ingredient/view.html:151
+#: gym/views/gym.py:158 nutrition/templates/ingredient/view.html:192
msgid "Name"
msgstr "Nimi"
+#: core/models/rep_unit.py:53
+#, fuzzy
+#| msgid "Unit"
+msgid "Unit Type"
+msgstr "Yksikkö"
+
+#: core/models/rep_unit.py:54
+msgid "The type of unit (repetitions, time, or distance)"
+msgstr ""
+
#: core/templates/403.html:4
msgid "Forbidden!"
msgstr "Kielletty!"
@@ -433,6 +460,56 @@ msgstr ""
"selaimesi ja jos se ei auta, yritä myöhemmin uudelleen. Jos ongelma jatkuu, "
"voit hakea apua alla luetelluilla tavoilla:"
+#: core/templates/account/email/email_confirmation_message.html:81
+msgid "Almost there!"
+msgstr ""
+
+#: core/templates/account/email/email_confirmation_message.html:85
+#, fuzzy, python-format
+#| msgid ""
+#| "You're receiving this e-mail because you requested a password reset for "
+#| "your user account at %(site_name)s."
+msgid ""
+"You're receiving this email because the user \"%(user_display)s\" has given "
+"your email address to register an account on %(site_domain)s."
+msgstr ""
+"Sait tämän sähköpostin, koska pyysit salasanan nollaamista käyttäjätilillesi "
+"%(site_name)s:lla."
+
+#: core/templates/account/email/email_confirmation_message.html:93
+msgid ""
+"Your email verification code is listed below. Please enter it in your open "
+"browser window."
+msgstr ""
+
+#: core/templates/account/email/email_confirmation_message.html:100
+#, fuzzy
+#| msgid "Please click the following link to confirm your email: %(link)s"
+msgid "Please click the button below to confirm your email address."
+msgstr ""
+"Napsauta seuraavaa linkkiä vahvistaaksesi sähköpostiosoitteesi: %(link)s"
+
+#: core/templates/account/email/email_confirmation_message.html:106
+#, fuzzy
+#| msgid "Unverified email"
+msgid "Confirm email"
+msgstr "Vahvistamaton sähköpostiosoite"
+
+#: core/templates/account/email/email_confirmation_message.html:110
+#, python-format
+msgid ""
+"The link is valid for %(expire_hours)s hours (until %(date)s, %(time)s). You "
+"can request a new one from your profile settings."
+msgstr ""
+
+#: core/templates/account/email/email_confirmation_message.html:116
+msgid "If the button doesn't work, copy and paste this link into your browser:"
+msgstr ""
+
+#: core/templates/account/email/email_confirmation_message.html:125
+msgid "the wger Team"
+msgstr "wger-joukkue"
+
#: core/templates/base.html:10
#, python-format
msgid ""
@@ -466,53 +543,7 @@ msgstr ""
msgid "Are you sure you want to delete this? This action cannot be undone."
msgstr "Oletko varma, että haluat poistaa tämän? Tätä toimintoa ei voi kumota."
-#: core/templates/email_verification/confirm_template.html:4
-msgid "Email verification"
-msgstr "Sähköpostivahvistus"
-
-#: core/templates/email_verification/confirm_template.html:18
-#, python-format
-msgid "%(username)s, your email was verified"
-msgstr "%(username)s, sähköpostisi on vahvistettu"
-
-#: core/templates/email_verification/confirm_template.html:22
-msgid "Error, invalid verification token"
-msgstr "Virhe, epäkelvollinen vahvistuspoletti"
-
-#: core/templates/email_verification/email_body_html.tpl:6
-msgid "Email Confirmation"
-msgstr "Sähköpostivahvistus"
-
-#: 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 "%(username)s, olet melkein perillä!"
-
-#: 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 ""
-"Napsauta <a href=\"%(link)s\">tätä</a> vahvistaaksesi sähköpostiosoitteesi"
-
-#: 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 "Polettisi vanhenee %(time)s"
-
-#: core/templates/email_verification/email_body_html.tpl:14
-#: core/templates/email_verification/email_body_txt.tpl:8
-msgid "the wger Team"
-msgstr "wger-joukkue"
-
-#: core/templates/email_verification/email_body_txt.tpl:4
-#, python-format
-msgid "Please click the following link to confirm your email: %(link)s"
-msgstr ""
-"Napsauta seuraavaa linkkiä vahvistaaksesi sähköpostiosoitteesi: %(link)s"
-
-#: core/templates/language/overview.html:4 core/templates/navigation.html:344
+#: core/templates/language/overview.html:4 core/templates/navigation.html:341
msgid "Languages"
msgstr "Kielet"
@@ -521,16 +552,16 @@ msgid "Nothing found."
msgstr "Mitään ei löytynyt."
#: core/templates/language/overview.html:22
-#: nutrition/templates/ingredient/overview.html:38
+#: nutrition/templates/ingredient/overview.html:43
msgid "Add one now."
msgstr "Lisää yksi nyt."
#: core/templates/language/overview.html:34 core/templates/license/list.html:43
-#: core/templates/repetition_unit/list.html:46
-#: core/templates/user/overview.html:344 core/templates/user/overview.html:384
-#: core/templates/user/overview.html:422
-#: core/templates/weight_unit/list.html:46 core/views/languages.py:74
-#: core/views/license.py:66 core/views/repetition_units.py:66
+#: core/templates/repetition_unit/list.html:44
+#: core/templates/user/overview.html:347 core/templates/user/overview.html:387
+#: core/templates/user/overview.html:425
+#: core/templates/weight_unit/list.html:46 core/views/languages.py:77
+#: core/views/license.py:66 core/views/repetition_units.py:76
#: core/views/weight_units.py:66
#: exercises/templates/categories/admin-overview.html:40
#: exercises/templates/equipment/admin-overview.html:39
@@ -543,14 +574,14 @@ msgstr "Lisää yksi nyt."
#: gym/templates/gym/member_list.html:264
#: gym/templates/gym/member_list.html:303
#: mailer/templates/mailer/gym/overview.html:43
-#: nutrition/templates/ingredient/overview.html:60
+#: nutrition/templates/ingredient/overview.html:97
msgid "Add"
msgstr "Lisää"
#: core/templates/language/view.html:61 core/templates/user/api_key.html:41
#: core/templates/user/preferences.html:50 gym/models/contract.py:203
#: gym/templates/contract/view.html:41 gym/templates/gym/member_list.html:270
-#: nutrition/templates/ingredient/view.html:206
+#: nutrition/templates/ingredient/view.html:245
msgid "Options"
msgstr "Asetukset"
@@ -560,9 +591,9 @@ msgstr "Lisenssiluettelo"
#: core/templates/license/list.html:30
#: core/templates/repetition_unit/list.html:32
-#: core/templates/user/overview.html:104 core/templates/user/overview.html:136
-#: core/templates/user/overview.html:185 core/templates/user/overview.html:365
-#: core/templates/user/overview.html:404 core/templates/user/overview.html:448
+#: core/templates/user/overview.html:107 core/templates/user/overview.html:139
+#: core/templates/user/overview.html:188 core/templates/user/overview.html:368
+#: core/templates/user/overview.html:407 core/templates/user/overview.html:451
#: core/templates/weight_unit/list.html:32
#: exercises/templates/categories/admin-overview.html:30
#: exercises/templates/equipment/admin-overview.html:30
@@ -574,11 +605,10 @@ msgstr "Lisenssiluettelo"
#: gym/templates/gym/member_list.html:284
#: gym/templates/gym/member_list.html:321
#: mailer/templates/mailer/gym/overview.html:30
-#: nutrition/templates/units/list.html:34
msgid "Nothing found"
msgstr "Mitään ei löytynyt"
-#: core/templates/misc/about.html:4 core/templates/template.html:160
+#: core/templates/misc/about.html:4 core/templates/template.html:150
msgid "Imprint"
msgstr "Jälki"
@@ -586,162 +616,157 @@ msgstr "Jälki"
msgid "Training"
msgstr "Harjoittelu"
-#: core/templates/navigation.html:37 core/templates/user/overview.html:25
+#: core/templates/navigation.html:36 core/templates/user/overview.html:28
msgid "Routines"
msgstr "Rutiinit"
-#: core/templates/navigation.html:45 core/templates/user/overview.html:70
+#: core/templates/navigation.html:44 core/templates/user/overview.html:73
msgid "Calendar"
msgstr "Kalenteri"
-#: core/templates/navigation.html:55
+#: core/templates/navigation.html:53
msgid "Measurements"
msgstr "Mittaukset"
-#: core/templates/navigation.html:66 gallery/templates/images/overview.html:6
+#: core/templates/navigation.html:64 gallery/templates/images/overview.html:6
msgid "Gallery"
msgstr "Galleria"
-#: core/templates/navigation.html:72
+#: core/templates/navigation.html:74 core/templates/navigation.html:400
+#: trophies/templates/trophies/overview.html:7
+msgid "Trophies"
+msgstr ""
+
+#: core/templates/navigation.html:79
msgid "Workout templates"
msgstr "Harjoittelumallit"
-#: core/templates/navigation.html:79
+#: core/templates/navigation.html:86
msgid "Your templates"
msgstr "Mallisi"
-#: core/templates/navigation.html:88
+#: core/templates/navigation.html:95
msgid "Public templates"
msgstr "Julkiset mallit"
-#: core/templates/navigation.html:96 software/templates/features.html:51
+#: core/templates/navigation.html:103 software/templates/features.html:51
#: software/templates/features.html:480
msgid "Exercises"
msgstr "Harjoitukset"
-#: core/templates/navigation.html:102 core/templates/navigation.html:176
-#: core/templates/navigation.html:339
+#: core/templates/navigation.html:109 core/templates/navigation.html:336
msgid "Administration"
msgstr "Hallinto"
-#: core/templates/navigation.html:106
+#: core/templates/navigation.html:113
msgid "Exercise edit history"
msgstr "Harjoituksen muokkaushistoria"
-#: core/templates/navigation.html:112
+#: core/templates/navigation.html:119
msgid "Equipment"
msgstr "Varusteet"
-#: core/templates/navigation.html:118
+#: core/templates/navigation.html:125
msgid "Muscles"
msgstr "Lihakset"
-#: core/templates/navigation.html:124
+#: core/templates/navigation.html:131
#: exercises/templates/categories/admin-overview.html:4
msgid "Categories"
msgstr "Luokat"
-#: core/templates/navigation.html:139 software/templates/features.html:468
+#: core/templates/navigation.html:146 software/templates/features.html:468
msgid "Nutrition"
msgstr "Ravitsemus"
-#: core/templates/navigation.html:147 core/templates/user/overview.html:144
+#: core/templates/navigation.html:154 core/templates/user/overview.html:147
msgid "Nutrition plans"
msgstr "Ravitsemussuunnitelmat"
-#: core/templates/navigation.html:156
+#: core/templates/navigation.html:163
msgid "BMI calculator"
msgstr "Painoindeksilaskuri"
-#: core/templates/navigation.html:165 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:172 nutrition/templates/rate/form.html:18
msgid "Daily calories calculator"
msgstr "Päivittäisten kalorien laskuri"
-#: core/templates/navigation.html:171
+#: core/templates/navigation.html:178
#: nutrition/templates/ingredient/overview.html:10
msgid "Ingredient overview"
msgstr "Ainesosien yleiskatsaus"
-#: core/templates/navigation.html:180 nutrition/templates/units/list.html:6
-msgid "Ingredient weight units"
-msgstr "Ainesosien painoyksiköt"
-
-#: core/templates/navigation.html:196 software/templates/features.html:463
+#: core/templates/navigation.html:193 software/templates/features.html:463
msgid "Body weight"
msgstr "Kehon paino"
-#: core/templates/navigation.html:203 core/templates/user/overview.html:114
+#: core/templates/navigation.html:200 core/templates/user/overview.html:117
msgid "Weight overview"
msgstr "Painon yleiskatsaus"
-#: core/templates/navigation.html:217
+#: core/templates/navigation.html:214
msgid "About this software"
msgstr "Tietoja tästä ohjelmistosta"
-#: core/templates/navigation.html:223 software/templates/about_us.html:5
+#: core/templates/navigation.html:220 software/templates/about_us.html:5
msgid "Support & Get Involved"
msgstr "Tuki ja osallistu"
-#: core/templates/navigation.html:229 software/templates/features.html:528
+#: core/templates/navigation.html:226 software/templates/features.html:528
msgid "REST API"
msgstr "REST-sovellusliittymä"
-#: core/templates/navigation.html:235 utils/models.py:45
+#: core/templates/navigation.html:232 utils/models.py:45
msgid "License"
msgstr "Lisenssi"
-#: core/templates/navigation.html:241
+#: core/templates/navigation.html:238
msgid "Developer documentation"
msgstr "Kehittäjädokumentaatio"
-#: core/templates/navigation.html:248
+#: core/templates/navigation.html:245
msgid "Get the code"
msgstr "Hanki koodi"
-#: core/templates/navigation.html:255 core/templates/template.html:199
-#: software/templates/features.html:603
+#: core/templates/navigation.html:252 core/templates/template.html:202
+#: software/templates/features.html:614
msgid "Translate"
msgstr "Käännä"
-#: core/templates/navigation.html:292 core/templates/user/login.html:30
+#: core/templates/navigation.html:289 core/templates/user/login.html:30
msgid "Reset password"
msgstr "Nollaa salasana"
-#: core/templates/navigation.html:301 core/templates/navigation.html:329
+#: core/templates/navigation.html:298 core/templates/navigation.html:326
msgid "Logout"
msgstr "Kirjaudu ulos"
-#: core/templates/navigation.html:320
+#: core/templates/navigation.html:317
msgid "My preferences"
msgstr "Mieltymykseni"
-#: core/templates/navigation.html:352
+#: core/templates/navigation.html:349
msgid "Licenses"
msgstr "Lisenssit"
-#: core/templates/navigation.html:360
+#: core/templates/navigation.html:357
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr "Toistoyksiköt"
-#: core/templates/navigation.html:368 core/templates/weight_unit/list.html:4
-#: nutrition/templates/ingredient/view.html:141
+#: core/templates/navigation.html:365 core/templates/weight_unit/list.html:4
+#: nutrition/templates/ingredient/view.html:182
msgid "Weight units"
msgstr "Painoyksiköt"
-#: core/templates/navigation.html:376 core/templates/user/list.html:4
+#: core/templates/navigation.html:373 core/templates/user/list.html:4
msgid "User list"
msgstr "Käyttäjäluettelo"
-#: core/templates/navigation.html:382
+#: core/templates/navigation.html:379
msgid "Gyms"
msgstr "Kuntosalit"
-#: core/templates/navigation.html:403
-#: trophies/templates/trophies/overview.html:7
-msgid "Trophies"
-msgstr ""
-
#: core/templates/registration/password_reset_complete.html:4
msgid "Password reset complete"
msgstr "Salasanan nollaus valmis"
@@ -801,25 +826,29 @@ msgstr "edellinen"
msgid "next"
msgstr "seuraava"
-#: core/templates/template.html:96
+#: core/templates/template.html:86
msgid "Close"
msgstr "Sulje"
-#: core/templates/template.html:112
+#: core/templates/template.html:102
msgid ""
"You are using a guest account, data entered will be deleted after a week."
msgstr "Käytät vierastiliä, syöttämäsi tiedot poistetaan viikon kuluttua."
-#: core/templates/template.html:117
+#: core/templates/template.html:107
msgid "Create some demo entries"
msgstr "Luo joitain esittelymerkintöjä"
-#: core/templates/template.html:165 software/templates/features.html:568
+#: core/templates/template.html:155 software/templates/features.html:568
#: software/templates/tos.html:7
msgid "Terms of service"
msgstr "Käyttöehdot"
-#: core/templates/template_features.html:53 software/templates/features.html:9
+#: core/templates/template.html:181 software/templates/features.html:595
+msgid "Browser language"
+msgstr ""
+
+#: core/templates/template_features.html:46 software/templates/features.html:9
msgid "Features"
msgstr "Ominaisuudet"
@@ -878,99 +907,94 @@ msgstr "Ei tiliä?"
msgid "Forgot password?"
msgstr "Salasana unohtunut?"
-#: core/templates/user/overview.html:25 core/templates/user/overview.html:68
-#: core/templates/user/overview.html:112 core/templates/user/overview.html:144
-#: core/templates/user/overview.html:348 core/templates/user/overview.html:390
-#: core/templates/user/overview.html:426
+#: core/templates/user/overview.html:28 core/templates/user/overview.html:71
+#: core/templates/user/overview.html:115 core/templates/user/overview.html:147
+#: core/templates/user/overview.html:351 core/templates/user/overview.html:393
+#: core/templates/user/overview.html:429
#, python-format
msgid "last %(number)s"
msgstr "viimeinen %(number)s"
-#: core/templates/user/overview.html:27 core/templates/user/overview.html:146
-#: core/templates/user/overview.html:343 core/templates/user/overview.html:382
-#: core/templates/user/overview.html:421 gym/templates/gym/member_list.html:226
+#: core/templates/user/overview.html:30 core/templates/user/overview.html:149
+#: core/templates/user/overview.html:346 core/templates/user/overview.html:385
+#: core/templates/user/overview.html:424 gym/templates/gym/member_list.html:226
#: gym/templates/gym/member_list.html:262
#: gym/templates/gym/member_list.html:302
msgid "Overview"
msgstr "Yleiskatsaus"
-#: core/templates/user/overview.html:34 core/templates/user/overview.html:76
-#: core/templates/user/overview.html:120 core/templates/user/overview.html:152
+#: core/templates/user/overview.html:37 core/templates/user/overview.html:79
+#: core/templates/user/overview.html:123 core/templates/user/overview.html:155
#: manager/helpers.py:88 software/templates/about_us.html:170
#: weight/templates/import_csv_preview.html:13
#: weight/templates/import_csv_preview.html:42 weight/views.py:54
msgid "Date"
msgstr "Päivämäärä"
-#: core/templates/user/overview.html:35 core/templates/user/overview.html:153
+#: core/templates/user/overview.html:38 core/templates/user/overview.html:156
#: gym/models/contract.py:58 gym/models/contract.py:109
msgid "Description"
msgstr "Kuvaus"
-#: core/templates/user/overview.html:36
+#: core/templates/user/overview.html:39
msgid "Number of logs (days)"
msgstr "Lokien lukumäärä (päiviä)"
-#: core/templates/user/overview.html:37 core/views/user.py:590
+#: core/templates/user/overview.html:40 core/views/user.py:606
#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:158
msgid "Last activity"
msgstr "Viimeinen toiminta"
-#: core/templates/user/overview.html:58
+#: core/templates/user/overview.html:61
msgid "No workouts found."
msgstr "Harjoituksia ei löytynyt."
-#: core/templates/user/overview.html:68
+#: core/templates/user/overview.html:71
msgid "Log"
msgstr "Loki"
-#: core/templates/user/overview.html:77
+#: core/templates/user/overview.html:80
msgid "General impression"
msgstr "Yleisvaikutelma"
-#: core/templates/user/overview.html:78 core/templates/user/overview.html:390
+#: core/templates/user/overview.html:81 core/templates/user/overview.html:393
msgid "Notes"
msgstr "Huomautukset"
-#: core/templates/user/overview.html:79
-#: exercises/templates/history/overview.html:30
-msgid "Time"
-msgstr "Aika"
-
-#: core/templates/user/overview.html:112 core/templates/user/overview.html:121
+#: core/templates/user/overview.html:115 core/templates/user/overview.html:124
#: manager/helpers.py:89 weight/templates/import_csv_preview.html:14
#: weight/templates/import_csv_preview.html:43 weight/views.py:54
msgid "Weight"
msgstr "Paino"
-#: core/templates/user/overview.html:154
-#: nutrition/templates/ingredient/view.html:51 nutrition/views/plan.py:245
+#: core/templates/user/overview.html:157
+#: nutrition/templates/ingredient/view.html:52 nutrition/views/plan.py:244
msgid "Energy"
msgstr "Energia"
-#: core/templates/user/overview.html:155
-#: nutrition/templates/ingredient/view.html:58 nutrition/views/plan.py:251
+#: core/templates/user/overview.html:158
+#: nutrition/templates/ingredient/view.html:59 nutrition/views/plan.py:250
msgid "Protein"
msgstr "Proteiini"
-#: core/templates/user/overview.html:156
-#: nutrition/templates/ingredient/view.html:64 nutrition/views/plan.py:259
+#: core/templates/user/overview.html:159
+#: nutrition/templates/ingredient/view.html:65 nutrition/views/plan.py:258
msgid "Carbohydrates"
msgstr "Hiilihydraatit"
-#: core/templates/user/overview.html:157
-#: nutrition/templates/ingredient/view.html:80 nutrition/views/plan.py:273
+#: core/templates/user/overview.html:160
+#: nutrition/templates/ingredient/view.html:81 nutrition/views/plan.py:272
msgid "Fat"
msgstr "Rasva"
-#: core/templates/user/overview.html:170
-#: nutrition/templates/ingredient/view.html:53
+#: core/templates/user/overview.html:173
+#: nutrition/templates/ingredient/view.html:54
msgid "kcal"
msgstr "kcal"
-#: core/templates/user/overview.html:201 core/templates/user/overview.html:340
-#: core/templates/user/overview.html:379 core/templates/user/overview.html:418
-#: core/templates/user/overview.html:463 gym/templates/gym/list.html:45
+#: core/templates/user/overview.html:204 core/templates/user/overview.html:343
+#: core/templates/user/overview.html:382 core/templates/user/overview.html:421
+#: core/templates/user/overview.html:466 gym/templates/gym/list.html:45
#: gym/templates/gym/member_list.html:91 gym/templates/gym/member_list.html:149
#: gym/templates/gym/member_list.html:187
#: gym/templates/gym/member_list.html:223
@@ -979,111 +1003,115 @@ msgstr "kcal"
msgid "Actions"
msgstr "Toimet"
-#: core/templates/user/overview.html:210
+#: core/templates/user/overview.html:213
msgid "Deactivate user"
msgstr "Poista käyttäjä käytöstä"
-#: core/templates/user/overview.html:214
+#: core/templates/user/overview.html:217
msgid "Activate user"
msgstr "Ota käyttäjä käyttöön"
-#: core/templates/user/overview.html:223
+#: core/templates/user/overview.html:226
msgid "Reset user password"
msgstr "Nollaa käyttäjän salasana"
-#: core/templates/user/overview.html:227 gym/templates/gym/member_list.html:30
+#: core/templates/user/overview.html:230 gym/templates/gym/member_list.html:30
msgid "Roles"
msgstr "Roolit"
-#: core/templates/user/overview.html:243
+#: core/templates/user/overview.html:246
msgid "Password reset confirmation"
msgstr "Salasanan nollausvahvistus"
-#: core/templates/user/overview.html:247
+#: core/templates/user/overview.html:250
msgid "Do you really want to change this user&#39;s password?"
msgstr "Haluatko todella vaihtaa tämän käyttäjän salasanan?"
-#: core/templates/user/overview.html:250
+#: core/templates/user/overview.html:253
#: exercises/templates/history/overview.html:106
+#: nutrition/templates/ingredient/view.html:148
+#: nutrition/templates/ingredient/view.html:160
msgid "No"
msgstr "Ei"
-#: core/templates/user/overview.html:251
+#: core/templates/user/overview.html:254
#: exercises/templates/history/overview.html:99
+#: nutrition/templates/ingredient/view.html:146
+#: nutrition/templates/ingredient/view.html:158
msgid "Yes"
msgstr "Kyllä"
-#: core/templates/user/overview.html:272 gym/templates/gym/member_list.html:105
+#: core/templates/user/overview.html:275 gym/templates/gym/member_list.html:105
msgid "Details"
msgstr "Yksityiskohdat"
-#: core/templates/user/overview.html:276 gym/views/export.py:57
-#: manager/helpers.py:89 nutrition/views/plan.py:151
-#: nutrition/views/plan.py:157
+#: core/templates/user/overview.html:279 gym/views/export.py:57
+#: manager/helpers.py:89 nutrition/views/plan.py:150
+#: nutrition/views/plan.py:156
msgid "Nr."
msgstr "Nro."
-#: core/templates/user/overview.html:298 gym/models/contract.py:287
+#: core/templates/user/overview.html:301 gym/models/contract.py:287
#: gym/models/gym.py:50 gym/templates/contract/view.html:75
#: gym/templates/gym/member_list.html:112 gym/views/export.py:68
msgid "Phone"
msgstr "Puhelin"
-#: core/templates/user/overview.html:302 gym/templates/contract/view.html:87
+#: core/templates/user/overview.html:305 gym/templates/contract/view.html:87
#: gym/templates/gym/member_list.html:130
msgid "Address"
msgstr "Osoite"
-#: core/templates/user/overview.html:313
+#: core/templates/user/overview.html:316
msgid "Registered"
msgstr "Rekisteröity"
-#: core/templates/user/overview.html:317
+#: core/templates/user/overview.html:320
msgid "Last login"
msgstr "Viimeinen sisäänkirjautuminen"
-#: core/templates/user/overview.html:322
+#: core/templates/user/overview.html:325
msgid "Status"
msgstr "Tila"
-#: core/templates/user/overview.html:325
+#: core/templates/user/overview.html:328
msgid "Active"
msgstr "Aktiivinen"
-#: core/templates/user/overview.html:327
+#: core/templates/user/overview.html:330
msgid "Inactive"
msgstr "Ei-aktiivinen"
-#: core/templates/user/overview.html:348 gym/templates/contract/list.html:4
+#: core/templates/user/overview.html:351 gym/templates/contract/list.html:4
#: gym/templates/gym/member_list.html:218
msgid "Contracts"
msgstr "Sopimukset"
-#: core/templates/user/overview.html:426 gym/templates/document/list.html:4
+#: core/templates/user/overview.html:429 gym/templates/document/list.html:4
msgid "Documents"
msgstr "Asiakirjat"
-#: core/templates/user/overview.html:433 gym/templates/document/list.html:33
+#: core/templates/user/overview.html:436 gym/templates/document/list.html:33
msgid "Download"
msgstr "Lataa"
-#: core/templates/user/overview.html:474 gym/views/admin_config.py:44
+#: core/templates/user/overview.html:477 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:477 gym/models/user_config.py:92
+#: core/templates/user/overview.html:480 gym/models/user_config.py:92
msgid "Include in inactive overview"
msgstr "Sisällytä ei-aktiiviseen yleiskatsaukseen"
-#: core/templates/user/overview.html:510
+#: core/templates/user/overview.html:513
#, python-format
msgid "Admin login is only available for users in %(gym_name)s"
msgstr ""
"Järjestelmänvalvojan sisäänkirjautuminen on saatavilla vain käyttäjille "
"%(gym_name)s:lla"
-#: core/templates/user/overview.html:514
+#: core/templates/user/overview.html:517
msgid "Log in as this user"
msgstr "Kirjaudu sisään tämän käyttäjänä"
@@ -1108,7 +1136,7 @@ msgid "You need to verify your email to contribute exercises"
msgstr ""
"Sinun on vahvistettava sähköpostiosoitteesi osallistuaksesi harjoituksiin"
-#: core/templates/user/preferences.html:55 core/views/user.py:601
+#: core/templates/user/preferences.html:55 core/views/user.py:617
msgid "Change password"
msgstr "Vaihda salasana"
@@ -1116,23 +1144,23 @@ msgstr "Vaihda salasana"
msgid "Already have an account?"
msgstr ""
-#: core/templatetags/wger_extras.py:142 i18n.tpl:38
+#: core/templatetags/wger_extras.py:142 i18n.tpl:39
msgid "kg"
msgstr "kg"
#: core/templatetags/wger_extras.py:144
-#: nutrition/templates/ingredient/view.html:60
-#: nutrition/templates/ingredient/view.html:66
-#: nutrition/templates/ingredient/view.html:73
-#: nutrition/templates/ingredient/view.html:82
-#: nutrition/templates/ingredient/view.html:89
-#: nutrition/templates/ingredient/view.html:111
-#: nutrition/templates/ingredient/view.html:121
+#: nutrition/templates/ingredient/view.html:61
+#: nutrition/templates/ingredient/view.html:67
+#: nutrition/templates/ingredient/view.html:74
+#: nutrition/templates/ingredient/view.html:83
+#: nutrition/templates/ingredient/view.html:90
+#: nutrition/templates/ingredient/view.html:112
+#: nutrition/templates/ingredient/view.html:122
msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr "g"
-#: core/templatetags/wger_extras.py:147 i18n.tpl:39
+#: core/templatetags/wger_extras.py:147 i18n.tpl:40
msgid "lb"
msgstr "lb"
@@ -1141,36 +1169,35 @@ msgctxt "weight unit, i.e. ounces"
msgid "oz"
msgstr "oz"
-#: core/views/languages.py:85 exercises/views/categories.py:122
+#: core/views/languages.py:88 exercises/views/categories.py:122
#: exercises/views/equipment.py:103 exercises/views/muscles.py:99
-#: nutrition/views/ingredient.py:120 nutrition/views/unit.py:110
+#: nutrition/views/ingredient.py:125
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
+#: core/views/languages.py:96 core/views/license.py:103
+#: core/views/repetition_units.py:114 core/views/weight_units.py:115
#: exercises/views/categories.py:128 exercises/views/muscles.py:106
#: gallery/views/images.py:124 gym/views/admin_notes.py:196
#: gym/views/document.py:206 gym/views/gym.py:481
-#: nutrition/views/ingredient.py:127 nutrition/views/unit.py:117
+#: nutrition/views/ingredient.py:132
#, python-brace-format
msgid "Delete {0}?"
msgstr "Poista {0}?"
-#: core/views/languages.py:111 core/views/license.py:85
-#: core/views/repetition_units.py:86 core/views/user.py:464
+#: core/views/languages.py:114 core/views/license.py:85
+#: core/views/repetition_units.py:96 core/views/user.py:480
#: core/views/weight_units.py:86 exercises/views/categories.py:98
#: exercises/views/equipment.py:81 exercises/views/muscles.py:87
#: gym/views/admin_notes.py:161 gym/views/config.py:68
#: gym/views/contract.py:186 gym/views/contract_option.py:123
#: gym/views/contract_type.py:123 gym/views/document.py:171
-#: gym/views/gym.py:463 nutrition/views/ingredient.py:146
-#: nutrition/views/unit.py:143
+#: gym/views/gym.py:463 nutrition/views/ingredient.py:151
#, python-brace-format
msgid "Edit {0}"
msgstr "Muokkaa {0}"
-#: core/views/misc.py:74
+#: core/views/misc.py:73
msgid ""
"We have created sample workout, workout schedules, weight logs, (body) "
"weight and nutrition plan entries so you can better see what this site can "
@@ -1180,48 +1207,48 @@ msgstr ""
"(kehon)paino- ja ravitsemussuunnitelmamerkinnät, jotta näet paremmin, mitä "
"tämä sivusto voi tehdä. Voit vapaasti muokata tai poistaa niitä!"
-#: core/views/user.py:143
+#: core/views/user.py:145
#, python-brace-format
msgid "Account \"{0}\" was successfully deleted"
msgstr "Tili \"{0}\" poistettiin onnistuneesti"
-#: core/views/user.py:279
+#: core/views/user.py:287
msgid "You were successfully registered"
msgstr "Rekisteröidyt onnistuneesti"
-#: core/views/user.py:341
+#: core/views/user.py:357
msgid "Settings successfully updated"
msgstr "Asetukset päivitetty onnistuneesti"
-#: core/views/user.py:380
+#: core/views/user.py:396
msgid "The user was successfully deactivated"
msgstr "Käyttäjän poistaminen käytöstä onnistui"
-#: core/views/user.py:417
+#: core/views/user.py:433
msgid "The user was successfully activated"
msgstr "Käyttäjän käyttöönotto onnistui"
-#: core/views/user.py:432
+#: core/views/user.py:448
msgid "Edit user"
msgstr "Muokkaa käyttäjää"
-#: core/views/user.py:587 gym/templates/gym/member_list.html:26
+#: core/views/user.py:603 gym/templates/gym/member_list.html:26
#: gym/views/gym.py:158
msgid "ID"
msgstr "Tunnus"
-#: core/views/user.py:588 gym/forms.py:95 gym/templates/contract/view.html:55
+#: core/views/user.py:604 gym/forms.py:95 gym/templates/contract/view.html:55
#: gym/templates/gym/member_list.html:27 gym/views/export.py:59
#: gym/views/gym.py:158 gym/views/gym.py:217
msgid "Username"
msgstr "Käyttäjänimi"
-#: core/views/user.py:591 gym/templates/gym/new_user.html:34
+#: core/views/user.py:607 gym/templates/gym/new_user.html:34
#: gym/views/export.py:58 gym/views/gym.py:217
msgid "Gym"
msgstr "Kuntosali"
-#: core/views/user.py:650
+#: core/views/user.py:678
#, python-format
msgid "A verification email was sent to %(email)s"
msgstr "Vahvistussähköposti lähetettiin osoitteeseen %(email)s"
@@ -1238,16 +1265,16 @@ msgstr "Vaihtoehtoinen nimi"
msgid "A more basic name for the muscle"
msgstr "Tavallisempi nimi lihakselle"
-#: exercises/models/video.py:50
+#: exercises/models/video.py:52
#, python-format
msgid "Maximum file size is %(size)sMB."
msgstr "Tiedoston enimmäiskoko on %(size)s Mt."
-#: exercises/models/video.py:57 exercises/models/video.py:65
+#: exercises/models/video.py:59 exercises/models/video.py:67
msgid "File type is not supported"
msgstr "Tiedostotyyppiä ei tueta"
-#: exercises/models/video.py:70
+#: exercises/models/video.py:72
msgid "File is not a valid video"
msgstr "Tiedosto ei ole kelvollinen video"
@@ -1318,7 +1345,11 @@ msgstr "Poistetaanko varuste?"
msgid "Add muscle"
msgstr "Lisää lihas"
-#: gallery/templates/images/overview.html:72
+#: gallery/forms.py:35
+msgid "If date is left empty, it will be read from the image instead"
+msgstr ""
+
+#: gallery/templates/images/overview.html:69
msgid "Add image"
msgstr "Lisää kuva"
@@ -1385,7 +1416,7 @@ msgid "Contract type"
msgstr "Sopimuksen tyyppi"
#: gym/models/contract.py:211 gym/templates/contract/view.html:59
-#: nutrition/forms.py:58
+#: nutrition/forms.py:67
msgid "Amount"
msgstr "Summa"
@@ -1565,7 +1596,7 @@ msgstr "Sähköpostiosoitteet"
msgid "Add member"
msgstr "Lisää jäsen"
-#: gym/templates/gym/new_user.html:48 nutrition/templates/rate/form.html:120
+#: gym/templates/gym/new_user.html:48 nutrition/templates/rate/form.html:121
msgid "Info"
msgstr "Tietoa"
@@ -1737,10 +1768,6 @@ msgstr "Leuanvetotanko"
msgid "Quads"
msgstr "Etureidet"
-#: i18n.tpl:30
-msgid "Repetitions"
-msgstr "Toistot"
-
#: i18n.tpl:31
msgid "Resistance band"
msgstr "Vastuskuminauha"
@@ -1769,194 +1796,200 @@ msgstr "Ojentajat"
msgid "Until Failure"
msgstr "Epäonnistumiseen saakka"
-#: i18n.tpl:40
+#: i18n.tpl:38
+#, fuzzy
+#| msgid "Kilometers"
+msgid "Meters"
+msgstr "Kilometrit"
+
+#: i18n.tpl:41
msgid "none (bodyweight exercise)"
msgstr "ei mitään (kehonpainoharjoittelu)"
-#: i18n.tpl:41
+#: i18n.tpl:42
msgid "Beginner"
msgstr ""
-#: i18n.tpl:42
+#: i18n.tpl:43
#, fuzzy
#| msgctxt "As in \"content of an email\""
#| msgid "Content"
msgid "Consistent"
msgstr "Sisältö"
-#: i18n.tpl:43
+#: i18n.tpl:44
msgid "Dedicated"
msgstr ""
-#: i18n.tpl:44
+#: i18n.tpl:45
msgid "Obsessed"
msgstr ""
-#: i18n.tpl:45
+#: i18n.tpl:46
msgid "Legend"
msgstr ""
-#: i18n.tpl:46
+#: i18n.tpl:47
msgid "Veteran"
msgstr ""
-#: i18n.tpl:47
+#: i18n.tpl:48
msgid "Titan"
msgstr ""
-#: i18n.tpl:48
+#: i18n.tpl:49
msgid "Unstoppable"
msgstr ""
-#: i18n.tpl:49
+#: i18n.tpl:50
msgid "Weekend Warrior"
msgstr ""
-#: i18n.tpl:50
+#: i18n.tpl:51
msgid "Elephant lifter"
msgstr ""
-#: i18n.tpl:51
+#: i18n.tpl:52
msgid "Bus lifter"
msgstr ""
-#: i18n.tpl:52
+#: i18n.tpl:53
msgid "Plane lifter"
msgstr ""
-#: i18n.tpl:53
+#: i18n.tpl:54
msgid "Blue whale lifter"
msgstr ""
-#: i18n.tpl:54
+#: i18n.tpl:55
msgid "Space Station lifter"
msgstr ""
-#: i18n.tpl:55
+#: i18n.tpl:56
msgid "Millionaire"
msgstr ""
-#: i18n.tpl:56
+#: i18n.tpl:57
msgid "Atlas"
msgstr ""
-#: i18n.tpl:57
+#: i18n.tpl:58
msgid "Early Bird"
msgstr ""
-#: i18n.tpl:58
+#: i18n.tpl:59
msgid "Night Owl"
msgstr ""
-#: i18n.tpl:59
+#: i18n.tpl:60
msgid "New Year, New Me"
msgstr ""
-#: i18n.tpl:60
+#: i18n.tpl:61
msgid "Phoenix"
msgstr ""
-#: i18n.tpl:61
+#: i18n.tpl:62
#, fuzzy
#| msgid "Personal data"
msgid "Personal Record"
msgstr "Henkilökohtaiset tiedot"
-#: i18n.tpl:62
+#: i18n.tpl:63
msgid "Complete your first workout"
msgstr ""
-#: i18n.tpl:63
+#: i18n.tpl:64
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 10 workouts"
msgstr "Näyteharjoittelu"
-#: i18n.tpl:64
+#: i18n.tpl:65
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 50 workouts"
msgstr "Näyteharjoittelu"
-#: i18n.tpl:65
+#: i18n.tpl:66
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 100 workouts"
msgstr "Näyteharjoittelu"
-#: i18n.tpl:66
+#: i18n.tpl:67
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 200 workouts"
msgstr "Näyteharjoittelu"
-#: i18n.tpl:67
+#: i18n.tpl:68
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 500 workouts"
msgstr "Näyteharjoittelu"
-#: i18n.tpl:68
+#: i18n.tpl:69
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 1000 workouts"
msgstr "Näyteharjoittelu"
-#: i18n.tpl:69
+#: i18n.tpl:70
msgid "Maintain a 30-day workout streak"
msgstr ""
-#: i18n.tpl:70
+#: i18n.tpl:71
msgid "Work out on Saturday and Sunday for 4 consecutive weekends"
msgstr ""
-#: i18n.tpl:71
+#: i18n.tpl:72
msgid "Lift a cumulative total of 5.000 kg"
msgstr ""
-#: i18n.tpl:72
+#: i18n.tpl:73
msgid "Lift a cumulative total of 20.000 kg"
msgstr ""
-#: i18n.tpl:73
+#: i18n.tpl:74
msgid "Lift a cumulative total of 50.000 kg"
msgstr ""
-#: i18n.tpl:74
+#: i18n.tpl:75
msgid "Lift a cumulative total of 150.000 kg"
msgstr ""
-#: i18n.tpl:75
+#: i18n.tpl:76
msgid "Lift a cumulative total of 450.000 kg"
msgstr ""
-#: i18n.tpl:76
+#: i18n.tpl:77
msgid "Lift a cumulative total of 1.000.000 kg"
msgstr ""
-#: i18n.tpl:77
+#: i18n.tpl:78
msgid "Lift a cumulative total of 10.000.000 kg"
msgstr ""
-#: i18n.tpl:78
+#: i18n.tpl:79
msgid "Complete a workout before 6:00 AM"
msgstr ""
-#: i18n.tpl:79
+#: i18n.tpl:80
msgid "Complete a workout after 9:00 PM"
msgstr ""
-#: i18n.tpl:80
+#: i18n.tpl:81
#, fuzzy
#| msgid "Workout for %s"
msgid "Work out on January 1st"
msgstr "Harjoitus %s"
-#: i18n.tpl:81
+#: i18n.tpl:82
msgid "Return to training after being inactive for 30 days"
msgstr ""
-#: i18n.tpl:82
+#: i18n.tpl:83
msgid "Achieve a new Personal Record on any exercise"
msgstr ""
@@ -2040,7 +2073,7 @@ msgstr "Harjoitus"
msgid "Routine will expire soon"
msgstr "Rutiini päättyy pian"
-#: manager/models/routine.py:153 manager/models/session.py:145
+#: manager/models/routine.py:154 manager/models/session.py:145
msgid "The start time cannot be after the end time."
msgstr "Aloitusaika ei voi olla päättymisajan jälkeen."
@@ -2121,23 +2154,27 @@ msgstr "Harjoittelu"
msgid "Workout for %s"
msgstr "Harjoitus %s"
-#: nutrition/forms.py:62
+#: nutrition/extract_info/off.py:72 nutrition/extract_info/off.py:91
+msgid "Serving"
+msgstr ""
+
+#: nutrition/forms.py:71 nutrition/forms.py:208
msgid "Unit"
msgstr "Yksikkö"
-#: nutrition/forms.py:170 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:179 nutrition/templates/rate/form.html:77
msgid "Basic caloric intake"
msgstr "Perusenergiantarve"
-#: nutrition/forms.py:171
+#: nutrition/forms.py:180
msgid "Your basic caloric intake as calculated for your data"
msgstr "Perusenergiantarpeesi tietojesi perusteella"
-#: nutrition/forms.py:176
+#: nutrition/forms.py:185
msgid "Additional calories"
msgstr "Perustarpeeseen lisättävät kalorit"
-#: nutrition/forms.py:178
+#: nutrition/forms.py:187
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
@@ -2145,13 +2182,31 @@ msgstr ""
"Perustarpeeseen lisättävät kalorit (vähentääksesi, syötä negatiivinen luku)"
#: nutrition/forms.py:209
+msgid "grams (g)"
+msgstr ""
+
+#: nutrition/forms.py:219
msgid "Ingredient"
msgstr "Ainesosa"
-#: nutrition/forms.py:213
+#: nutrition/forms.py:223
msgid "Also search for names in English"
msgstr "Hae myös englanninkieliset nimet"
+#: nutrition/forms.py:239
+msgid "Quantity"
+msgstr ""
+
+#: nutrition/forms.py:241
+msgid "Enter a quantity and choose grams (g) or one of the serving units."
+msgstr ""
+
+#: nutrition/models/ingredient.py:526
+#, fuzzy
+#| msgid "Correction"
+msgid "Portion"
+msgstr "Korjaus"
+
#: nutrition/templates/ingredient/email_new.tpl:1
#, python-format
msgid ""
@@ -2189,59 +2244,88 @@ msgid ""
"sucessfully."
msgstr ""
-#: nutrition/templates/ingredient/overview.html:38
+#: nutrition/templates/ingredient/overview.html:32
+#: nutrition/templates/ingredient/overview.html:68
+#: nutrition/templates/ingredient/view.html:143
+msgid "Vegan"
+msgstr ""
+
+#: nutrition/templates/ingredient/overview.html:34
+#: nutrition/templates/ingredient/overview.html:79
+#: nutrition/templates/ingredient/view.html:155
+#, fuzzy
+#| msgid "Variations"
+msgid "Vegetarian"
+msgstr "Muunnelmat"
+
+#: nutrition/templates/ingredient/overview.html:43
msgid "No ingredients."
msgstr "Ei raaka-aineita."
-#: nutrition/templates/ingredient/overview.html:49
+#: nutrition/templates/ingredient/overview.html:54
msgid "Search"
msgstr "Etsi"
-#: nutrition/templates/ingredient/view.html:45 nutrition/views/plan.py:237
+#: nutrition/templates/ingredient/overview.html:57
+msgid "Filter"
+msgstr ""
+
+#: nutrition/templates/ingredient/overview.html:83
+msgid "Apply"
+msgstr ""
+
+#: nutrition/templates/ingredient/overview.html:85
+msgid "Reset"
+msgstr ""
+
+#: nutrition/templates/ingredient/view.html:46 nutrition/views/plan.py:236
msgid "Macronutrients"
msgstr "Makroravinteet"
-#: nutrition/templates/ingredient/view.html:54
+#: nutrition/templates/ingredient/view.html:55
msgid "kJ"
msgstr "kJ"
-#: nutrition/templates/ingredient/view.html:70 nutrition/views/plan.py:267
+#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:266
msgid "Sugar content in carbohydrates"
msgstr "Sokerin osuus hiilihydraateista"
-#: nutrition/templates/ingredient/view.html:75
-#: nutrition/templates/ingredient/view.html:91
-#: nutrition/templates/ingredient/view.html:113
-#: nutrition/templates/ingredient/view.html:123
+#: nutrition/templates/ingredient/view.html:76
+#: nutrition/templates/ingredient/view.html:92
+#: nutrition/templates/ingredient/view.html:114
+#: nutrition/templates/ingredient/view.html:124
msgid "n.A."
msgstr ""
-#: nutrition/templates/ingredient/view.html:86 nutrition/views/plan.py:281
+#: nutrition/templates/ingredient/view.html:87 nutrition/views/plan.py:280
msgid "Saturated fat content in fats"
msgstr "Tyydyttyneen rasvan osuus rasvoista"
-#: nutrition/templates/ingredient/view.html:102
+#: nutrition/templates/ingredient/view.html:103
msgid "Others"
msgstr "Muut"
-#: nutrition/templates/ingredient/view.html:108 nutrition/views/plan.py:287
+#: nutrition/templates/ingredient/view.html:109 nutrition/views/plan.py:286
msgid "Fiber"
msgstr "Kuitu"
-#: nutrition/templates/ingredient/view.html:118 nutrition/views/plan.py:293
+#: nutrition/templates/ingredient/view.html:119 nutrition/views/plan.py:292
msgid "Sodium"
msgstr "Suola"
-#: nutrition/templates/ingredient/view.html:143
-#: nutrition/templates/units/list.html:50 nutrition/views/unit.py:86
+#: nutrition/templates/ingredient/view.html:136
+msgid "Dietary information"
+msgstr ""
+
+#: nutrition/templates/ingredient/view.html:184
msgid "Add new weight unit"
msgstr "Lisää uusi painoyksikkö"
-#: nutrition/templates/rate/form.html:25
+#: nutrition/templates/rate/form.html:26
msgid "Basal metabolic rate"
msgstr ""
-#: nutrition/templates/rate/form.html:26
+#: nutrition/templates/rate/form.html:27
msgid ""
"The basal metabolic rate is the amount of energy expended daily\n"
"at rest. This is the minimum energy needed for the body to function, without "
@@ -2249,36 +2333,36 @@ msgid ""
"additional physical activity."
msgstr ""
-#: nutrition/templates/rate/form.html:37
+#: nutrition/templates/rate/form.html:38
msgid "Your basic metabolic rate is: "
msgstr ""
-#: nutrition/templates/rate/form.html:47
+#: nutrition/templates/rate/form.html:48
msgid "Physical activities"
msgstr "Fyysiset aktiviteetit"
-#: nutrition/templates/rate/form.html:48
+#: nutrition/templates/rate/form.html:49
msgid ""
"The physical activity level (PAL) is a factor used to to express\n"
"the additional physical activity and is used to calculate the total energy\n"
"required per day."
msgstr ""
-#: nutrition/templates/rate/form.html:59
+#: nutrition/templates/rate/form.html:60
msgid "Factor for daily activities: "
msgstr ""
-#: nutrition/templates/rate/form.html:67
+#: nutrition/templates/rate/form.html:68
msgid ""
"The base caloric intake is the amount of calories your metabolism\n"
"needs based on your level of physical activity."
msgstr ""
-#: nutrition/templates/rate/form.html:81
+#: nutrition/templates/rate/form.html:82
msgid "Calculate basic caloric intake"
msgstr ""
-#: nutrition/templates/rate/form.html:88
+#: nutrition/templates/rate/form.html:89
msgid ""
"The total calories are the actual total calories per day. This\n"
"might include e.g. a surplus or deficit if you are bulking or cutting. "
@@ -2286,69 +2370,69 @@ msgid ""
"you might just enter yourself the amount of calories if you know the value."
msgstr ""
-#: nutrition/templates/rate/form.html:102
+#: nutrition/templates/rate/form.html:103
msgid "Transfer basic intake to total daily calories"
msgstr ""
-#: nutrition/templates/rate/form.html:106
+#: nutrition/templates/rate/form.html:107
msgid "Add additional calories to total daily calories"
msgstr ""
-#: nutrition/templates/rate/form.html:110
+#: nutrition/templates/rate/form.html:111
msgid "Save total calories to profile"
msgstr ""
-#: nutrition/templates/rate/form.html:121
+#: nutrition/templates/rate/form.html:122
msgid ""
"Please note that these calculations can only be an\n"
"approximation. If you base your nutrition plan on these values, observe\n"
"yourself for some weeks and change the total amount if needed."
msgstr ""
-#: nutrition/views/ingredient.py:158
+#: nutrition/views/ingredient.py:163
msgid "Add a new ingredient"
msgstr "Lisää uusi raaka-aine"
-#: nutrition/views/plan.py:128
+#: nutrition/views/plan.py:127
msgid "Nutritional plan"
msgstr ""
-#: nutrition/views/plan.py:130
+#: nutrition/views/plan.py:129
#, python-format
msgid "Nutritional plan for %s"
msgstr ""
-#: nutrition/views/plan.py:202
+#: nutrition/views/plan.py:201
msgid "<i>This is an empty plan, what did you expect on the PDF?</i>"
msgstr ""
-#: nutrition/views/plan.py:230
+#: nutrition/views/plan.py:229
#, fuzzy
#| msgid "Nutrition"
msgid "Nutritional data"
msgstr "Ravitsemus"
-#: nutrition/views/plan.py:238
+#: nutrition/views/plan.py:237
msgid "Total"
msgstr ""
-#: nutrition/views/plan.py:239
+#: nutrition/views/plan.py:238
msgid "Percent of energy"
msgstr ""
-#: nutrition/views/plan.py:240
+#: nutrition/views/plan.py:239
msgid "g per body kg"
msgstr ""
-#: nutrition/views/unit_ingredient.py:69
+#: nutrition/views/unit_ingredient.py:64
msgid "Add a new weight unit"
msgstr ""
-#: nutrition/views/unit_ingredient.py:106
+#: nutrition/views/unit_ingredient.py:99
msgid "Edit a weight unit to ingredient connection"
msgstr ""
-#: nutrition/views/unit_ingredient.py:138
+#: nutrition/views/unit_ingredient.py:129
msgid "Delete?"
msgstr ""
@@ -2699,7 +2783,7 @@ msgstr ""
msgid "Translation"
msgstr ""
-#: utils/generic_views.py:263
+#: utils/generic_views.py:246
msgid "Yes, delete"
msgstr ""
@@ -2750,10 +2834,6 @@ msgstr ""
msgid "Import weight logs"
msgstr ""
-#: weight/templates/import_csv_form.html:9
-msgid "Submit"
-msgstr "Lähetä"
-
#: weight/templates/import_csv_form.html:15
msgid ""
"Use this import field to import your weight logs into Workout\n"
@@ -2849,6 +2929,35 @@ msgstr ""
msgid "Re-Submit"
msgstr ""
+#~ msgid "Email verification"
+#~ msgstr "Sähköpostivahvistus"
+
+#, python-format
+#~ msgid "%(username)s, your email was verified"
+#~ msgstr "%(username)s, sähköpostisi on vahvistettu"
+
+#~ msgid "Error, invalid verification token"
+#~ msgstr "Virhe, epäkelvollinen vahvistuspoletti"
+
+#~ msgid "Email Confirmation"
+#~ msgstr "Sähköpostivahvistus"
+
+#, python-format
+#~ msgid "You are almost there, %(username)s!"
+#~ msgstr "%(username)s, olet melkein perillä!"
+
+#, python-format
+#~ msgid "Please click <a href=\"%(link)s\">here</a> to confirm your email"
+#~ msgstr ""
+#~ "Napsauta <a href=\"%(link)s\">tätä</a> vahvistaaksesi sähköpostiosoitteesi"
+
+#, python-format
+#~ msgid "The token expires on %(time)s"
+#~ msgstr "Polettisi vanhenee %(time)s"
+
+#~ msgid "Ingredient weight units"
+#~ msgstr "Ainesosien painoyksiköt"
+
#~ msgid "Image"
#~ msgstr "Kuva"
@@ -2879,9 +2988,6 @@ msgstr ""
#~ msgid "Secondary muscles"
#~ msgstr "Toissijaiset lihakset"
-#~ msgid "Variations"
-#~ msgstr "Muunnelmat"
-
#~ msgid "Exercise Categories"
#~ msgstr "Harjoitusluokat"
diff --git a/wger/locale/fr/LC_MESSAGES/django.po b/wger/locale/fr/LC_MESSAGES/django.po
index 4761ec8e8..c4f5998e8 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: 2026-01-17 14:03+0000\n"
+"POT-Creation-Date: 2026-04-10 10:20+0000\n"
"PO-Revision-Date: 2026-03-24 09:09+0000\n"
"Last-Translator: Thomas Peyrot <[email protected]>\n"
"Language-Team: French <https://hosted.weblate.org/projects/wger/web/fr/>\n"
@@ -48,7 +48,7 @@ msgstr ""
#: config/views/gym_config.py:42 core/templates/language/view.html:64
#: core/templates/license/list.html:17
#: core/templates/repetition_unit/list.html:18
-#: core/templates/user/overview.html:204 core/templates/user/overview.html:467
+#: core/templates/user/overview.html:207 core/templates/user/overview.html:470
#: core/templates/weight_unit/list.html:18
#: exercises/templates/categories/admin-overview.html:17
#: exercises/templates/equipment/admin-overview.html:17
@@ -60,30 +60,29 @@ msgstr ""
#: gym/templates/gym/list.html:19 gym/templates/gym/list.html:48
#: gym/templates/gym/member_list.html:94 gym/templates/gym/member_list.html:152
#: gym/templates/gym/member_list.html:190
-#: nutrition/templates/ingredient/view.html:164
-#: nutrition/templates/ingredient/view.html:209
-#: nutrition/templates/units/list.html:19
+#: nutrition/templates/ingredient/view.html:205
+#: nutrition/templates/ingredient/view.html:248
msgid "Edit"
msgstr "Modifier"
-#: core/forms.py:91 core/templates/navigation.html:271
-#: core/templates/navigation.html:278 core/templates/user/login.html:4
+#: core/forms.py:89 core/templates/navigation.html:268
+#: core/templates/navigation.html:275 core/templates/user/login.html:4
#: core/templates/user/registration_sidebar.html:12
#: software/templates/features.html:82 software/templates/features.html:448
msgid "Login"
msgstr "Se connecter"
-#: core/forms.py:130 core/forms.py:244 gym/views/export.py:61
+#: core/forms.py:128 core/forms.py:242 gym/views/export.py:61
#: gym/views/gym.py:217
msgid "First name"
msgstr "Prénom"
-#: core/forms.py:131 core/forms.py:245 core/templates/user/overview.html:284
+#: core/forms.py:129 core/forms.py:243 core/templates/user/overview.html:287
#: gym/views/export.py:62 gym/views/gym.py:217
msgid "Last name"
msgstr "Nom"
-#: core/forms.py:133 core/forms.py:210 core/templates/user/overview.html:288
+#: core/forms.py:131 core/forms.py:208 core/templates/user/overview.html:291
#: gym/models/contract.py:256 gym/models/gym.py:58
#: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:116
#: gym/templates/gym/new_user.html:30 gym/views/export.py:60
@@ -93,57 +92,57 @@ msgstr "Nom"
msgid "Email"
msgstr "Courriel"
-#: core/forms.py:134
+#: core/forms.py:132
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:138 core/models/profile.py:222
+#: core/forms.py:136 core/models/profile.py:222
#: gym/templates/gym/new_user.html:38
msgid "Date of Birth"
msgstr "Date de naissance"
-#: core/forms.py:177
+#: core/forms.py:175
msgid "Personal data"
msgstr "Données personnelles"
-#: core/forms.py:189
+#: core/forms.py:187
msgid "Workout reminders"
msgstr "Rappels d’entraînement"
-#: core/forms.py:196
+#: core/forms.py:194
msgid "Other settings"
msgstr "Autres paramètres"
-#: core/forms.py:204 core/views/user.py:614 core/views/user.py:629
-#: core/views/user.py:641 gym/forms.py:73 utils/generic_views.py:143
+#: core/forms.py:202 core/views/user.py:630 core/views/user.py:654
+#: core/views/user.py:668 gym/forms.py:73 utils/generic_views.py:137
msgid "Save"
msgstr "Sauvegarder"
-#: core/forms.py:211
+#: core/forms.py:209
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:240
+#: core/forms.py:238
msgid "This e-mail address is already in use."
msgstr "Cette adresse courriel est déjà utilisée."
-#: core/forms.py:261 gym/templates/gym/new_user.html:26
+#: core/forms.py:259 gym/templates/gym/new_user.html:26
#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:217
msgid "Password"
msgstr "Mot de passe"
-#: core/forms.py:263
+#: core/forms.py:261
msgid "Please enter your current password."
msgstr "Veuillez entrer votre mot de passe actuel."
-#: core/forms.py:272 core/templates/language/view.html:70
+#: core/forms.py:270 core/templates/language/view.html:70
#: core/templates/license/list.html:21
#: core/templates/repetition_unit/list.html:22
-#: core/templates/user/overview.html:233
+#: core/templates/user/overview.html:236
#: core/templates/weight_unit/list.html:22
#: exercises/templates/categories/admin-overview.html:21
#: exercises/templates/equipment/admin-overview.html:21
@@ -151,27 +150,30 @@ msgstr "Veuillez entrer votre mot de passe actuel."
#: gym/templates/admin_notes/list.html:37
#: gym/templates/contract_option/list.html:35
#: gym/templates/contract_type/list.html:36 gym/templates/document/list.html:46
-#: gym/templates/gym/list.html:23 nutrition/templates/ingredient/view.html:168
-#: nutrition/templates/ingredient/view.html:215
-#: nutrition/templates/units/list.html:25
+#: gym/templates/gym/list.html:23 nutrition/templates/ingredient/view.html:209
+#: nutrition/templates/ingredient/view.html:254
msgid "Delete"
msgstr "Supprimer"
-#: core/forms.py:281
+#: core/forms.py:279
msgid "Invalid password"
msgstr "Mot de passe invalide"
-#: core/forms.py:293
+#: core/forms.py:291 core/forms.py:349
msgid "The form is secured with reCAPTCHA"
msgstr "Le formulaire est sécurisé avec reCAPTCHA"
-#: core/forms.py:314 core/forms.py:341 core/templates/navigation.html:272
-#: core/templates/navigation.html:285 core/templates/template.html:123
-#: core/templates/user/login.html:21 core/views/user.py:285
+#: core/forms.py:312 core/forms.py:339 core/templates/navigation.html:269
+#: core/templates/navigation.html:282 core/templates/template.html:113
+#: core/templates/user/login.html:21 core/views/user.py:293
#: software/templates/features.html:87 software/templates/features.html:442
msgid "Register"
msgstr "S’inscrire"
+#: core/forms.py:360 weight/templates/import_csv_form.html:9
+msgid "Submit"
+msgstr "Envoyer"
+
#: core/models/language.py:31 core/templates/language/view.html:21
msgid "Language short name"
msgstr "Nom court de la langue"
@@ -208,36 +210,36 @@ msgstr "Lien"
msgid "Link to license text or other information"
msgstr "Lien vers la licence ou d'autre information"
-#: core/models/profile.py:57
+#: core/models/profile.py:60
#, python-format
msgid "%(birthdate)s is not a valid birthdate"
msgstr "%(birthdate)s n’est pas une date de naissance valide"
-#: core/models/profile.py:66
+#: core/models/profile.py:69
msgid "Male"
msgstr "Homme"
-#: core/models/profile.py:67
+#: core/models/profile.py:70
msgid "Female"
msgstr "Femme"
-#: core/models/profile.py:74
+#: core/models/profile.py:77
msgid "Low"
msgstr "Bas"
-#: core/models/profile.py:75
+#: core/models/profile.py:78
msgid "Medium"
msgstr "Moyen"
-#: core/models/profile.py:76
+#: core/models/profile.py:79
msgid "High"
msgstr "Haut"
-#: core/models/profile.py:82
+#: core/models/profile.py:85
msgid "Metric (kilogram)"
msgstr "Métrique (kilogramme)"
-#: core/models/profile.py:83
+#: core/models/profile.py:86
msgid "Imperial (pound)"
msgstr "Impérial (livre)"
@@ -360,7 +362,7 @@ msgstr "Heures par semaine (moy.)"
msgid "Free time"
msgstr "Temps libre"
-#: core/models/profile.py:320 nutrition/templates/rate/form.html:66
+#: core/models/profile.py:320 nutrition/templates/rate/form.html:67
msgid "Total daily calories"
msgstr "Nombre total de calories par jour"
@@ -403,20 +405,45 @@ msgstr "Activer les trophées"
msgid "Enable or disable the trophy system for this user"
msgstr "Activer ou désactiver le système de trophées pour cet utilisateur"
-#: core/models/profile.py:446
+#: core/models/profile.py:457
msgid "The sum of all hours has to be 24"
msgstr "La somme des heures doit être de 24"
-#: core/models/rep_unit.py:36 core/models/weight_unit.py:42
-#: core/templates/user/overview.html:280 core/views/user.py:589
+#: core/models/rep_unit.py:32 i18n.tpl:30
+msgid "Repetitions"
+msgstr "Répétitions"
+
+#: core/models/rep_unit.py:33 core/templates/user/overview.html:82
+#: exercises/templates/history/overview.html:30
+msgid "Time"
+msgstr "Temps"
+
+#: core/models/rep_unit.py:34
+#, fuzzy
+#| msgid "Resistance band"
+msgid "Distance"
+msgstr "Bande de résistance"
+
+#: core/models/rep_unit.py:47 core/models/weight_unit.py:42
+#: core/templates/user/overview.html:283 core/views/user.py:605
#: exercises/models/muscle.py:36 gym/models/contract.py:52
#: gym/models/contract.py:103 gym/models/gym.py:46
#: gym/models/user_document.py:84 gym/templates/contract/view.html:50
#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:108
-#: gym/views/gym.py:158 nutrition/templates/ingredient/view.html:151
+#: gym/views/gym.py:158 nutrition/templates/ingredient/view.html:192
msgid "Name"
msgstr "Nom"
+#: core/models/rep_unit.py:53
+#, fuzzy
+#| msgid "Unit"
+msgid "Unit Type"
+msgstr "Unité"
+
+#: core/models/rep_unit.py:54
+msgid "The type of unit (repetitions, time, or distance)"
+msgstr ""
+
#: core/templates/403.html:4
msgid "Forbidden!"
msgstr "Interdit !"
@@ -448,6 +475,56 @@ msgstr ""
"problème, veuillez réessayer ultérieurement. Si le problème persiste, vous "
"pouvez demander de l'aide des manières citées ci-dessous :"
+#: core/templates/account/email/email_confirmation_message.html:81
+msgid "Almost there!"
+msgstr ""
+
+#: core/templates/account/email/email_confirmation_message.html:85
+#, fuzzy, python-format
+#| msgid ""
+#| "You're receiving this e-mail because you requested a password reset for "
+#| "your user account at %(site_name)s."
+msgid ""
+"You're receiving this email because the user \"%(user_display)s\" has given "
+"your email address to register an account on %(site_domain)s."
+msgstr ""
+"Vous recevez ce courriel parce que vous avez demandé un nouveau mot de passe "
+"pour votre compte sur %(site_name)s."
+
+#: core/templates/account/email/email_confirmation_message.html:93
+msgid ""
+"Your email verification code is listed below. Please enter it in your open "
+"browser window."
+msgstr ""
+
+#: core/templates/account/email/email_confirmation_message.html:100
+#, fuzzy
+#| msgid "Please click the following link to confirm your email: %(link)s"
+msgid "Please click the button below to confirm your email address."
+msgstr ""
+"Veuillez cliquer sur le lien suivant pour confirmer votre e-mail : %(link)s"
+
+#: core/templates/account/email/email_confirmation_message.html:106
+#, fuzzy
+#| msgid "Unverified email"
+msgid "Confirm email"
+msgstr "Email non vérifié"
+
+#: core/templates/account/email/email_confirmation_message.html:110
+#, python-format
+msgid ""
+"The link is valid for %(expire_hours)s hours (until %(date)s, %(time)s). You "
+"can request a new one from your profile settings."
+msgstr ""
+
+#: core/templates/account/email/email_confirmation_message.html:116
+msgid "If the button doesn't work, copy and paste this link into your browser:"
+msgstr ""
+
+#: core/templates/account/email/email_confirmation_message.html:125
+msgid "the wger Team"
+msgstr "L'équipe wger"
+
#: core/templates/base.html:10
#, python-format
msgid ""
@@ -481,53 +558,7 @@ msgstr ""
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 verification"
-msgstr "Vérification du courriel"
-
-#: core/templates/email_verification/confirm_template.html:18
-#, python-format
-msgid "%(username)s, your email was verified"
-msgstr "%(username)s, votre email a été vérifié"
-
-#: core/templates/email_verification/confirm_template.html:22
-msgid "Error, invalid verification token"
-msgstr "Erreur, token de vérification invalide"
-
-#: core/templates/email_verification/email_body_html.tpl:6
-msgid "Email Confirmation"
-msgstr "Confirmation d'email"
-
-#: 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 "Vous y êtes presque, %(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 ""
-"Veuillez cliquer sur <a href=\"%(link)s\">ici</a> pour confirmer votre email"
-
-#: 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 "Le jeton expire dans %(time)s"
-
-#: core/templates/email_verification/email_body_html.tpl:14
-#: core/templates/email_verification/email_body_txt.tpl:8
-msgid "the wger Team"
-msgstr "L'équipe wger"
-
-#: core/templates/email_verification/email_body_txt.tpl:4
-#, python-format
-msgid "Please click the following link to confirm your email: %(link)s"
-msgstr ""
-"Veuillez cliquer sur le lien suivant pour confirmer votre e-mail : %(link)s"
-
-#: core/templates/language/overview.html:4 core/templates/navigation.html:344
+#: core/templates/language/overview.html:4 core/templates/navigation.html:341
msgid "Languages"
msgstr "Langues"
@@ -536,16 +567,16 @@ msgid "Nothing found."
msgstr "Rien trouvé."
#: core/templates/language/overview.html:22
-#: nutrition/templates/ingredient/overview.html:38
+#: nutrition/templates/ingredient/overview.html:43
msgid "Add one now."
msgstr "En ajouter une."
#: core/templates/language/overview.html:34 core/templates/license/list.html:43
-#: core/templates/repetition_unit/list.html:46
-#: core/templates/user/overview.html:344 core/templates/user/overview.html:384
-#: core/templates/user/overview.html:422
-#: core/templates/weight_unit/list.html:46 core/views/languages.py:74
-#: core/views/license.py:66 core/views/repetition_units.py:66
+#: core/templates/repetition_unit/list.html:44
+#: core/templates/user/overview.html:347 core/templates/user/overview.html:387
+#: core/templates/user/overview.html:425
+#: core/templates/weight_unit/list.html:46 core/views/languages.py:77
+#: core/views/license.py:66 core/views/repetition_units.py:76
#: core/views/weight_units.py:66
#: exercises/templates/categories/admin-overview.html:40
#: exercises/templates/equipment/admin-overview.html:39
@@ -558,14 +589,14 @@ msgstr "En ajouter une."
#: gym/templates/gym/member_list.html:264
#: gym/templates/gym/member_list.html:303
#: mailer/templates/mailer/gym/overview.html:43
-#: nutrition/templates/ingredient/overview.html:60
+#: nutrition/templates/ingredient/overview.html:97
msgid "Add"
msgstr "Ajouter"
#: core/templates/language/view.html:61 core/templates/user/api_key.html:41
#: core/templates/user/preferences.html:50 gym/models/contract.py:203
#: gym/templates/contract/view.html:41 gym/templates/gym/member_list.html:270
-#: nutrition/templates/ingredient/view.html:206
+#: nutrition/templates/ingredient/view.html:245
msgid "Options"
msgstr "Options"
@@ -575,9 +606,9 @@ msgstr "Liste des licences"
#: core/templates/license/list.html:30
#: core/templates/repetition_unit/list.html:32
-#: core/templates/user/overview.html:104 core/templates/user/overview.html:136
-#: core/templates/user/overview.html:185 core/templates/user/overview.html:365
-#: core/templates/user/overview.html:404 core/templates/user/overview.html:448
+#: core/templates/user/overview.html:107 core/templates/user/overview.html:139
+#: core/templates/user/overview.html:188 core/templates/user/overview.html:368
+#: core/templates/user/overview.html:407 core/templates/user/overview.html:451
#: core/templates/weight_unit/list.html:32
#: exercises/templates/categories/admin-overview.html:30
#: exercises/templates/equipment/admin-overview.html:30
@@ -589,11 +620,10 @@ msgstr "Liste des licences"
#: gym/templates/gym/member_list.html:284
#: gym/templates/gym/member_list.html:321
#: mailer/templates/mailer/gym/overview.html:30
-#: nutrition/templates/units/list.html:34
msgid "Nothing found"
msgstr "Rien trouvé"
-#: core/templates/misc/about.html:4 core/templates/template.html:160
+#: core/templates/misc/about.html:4 core/templates/template.html:150
msgid "Imprint"
msgstr "Informations légales"
@@ -601,162 +631,157 @@ msgstr "Informations légales"
msgid "Training"
msgstr "Formation"
-#: core/templates/navigation.html:37 core/templates/user/overview.html:25
+#: core/templates/navigation.html:36 core/templates/user/overview.html:28
msgid "Routines"
msgstr "Routines"
-#: core/templates/navigation.html:45 core/templates/user/overview.html:70
+#: core/templates/navigation.html:44 core/templates/user/overview.html:73
msgid "Calendar"
msgstr "Calendrier"
-#: core/templates/navigation.html:55
+#: core/templates/navigation.html:53
msgid "Measurements"
msgstr "Macronutriments"
-#: core/templates/navigation.html:66 gallery/templates/images/overview.html:6
+#: core/templates/navigation.html:64 gallery/templates/images/overview.html:6
msgid "Gallery"
msgstr "Galerie"
-#: core/templates/navigation.html:72
+#: core/templates/navigation.html:74 core/templates/navigation.html:400
+#: trophies/templates/trophies/overview.html:7
+msgid "Trophies"
+msgstr ""
+
+#: core/templates/navigation.html:79
msgid "Workout templates"
msgstr "Modèles d'entraînement"
-#: core/templates/navigation.html:79
+#: core/templates/navigation.html:86
msgid "Your templates"
msgstr "Vos modèles"
-#: core/templates/navigation.html:88
+#: core/templates/navigation.html:95
msgid "Public templates"
msgstr "Modèles publics"
-#: core/templates/navigation.html:96 software/templates/features.html:51
+#: core/templates/navigation.html:103 software/templates/features.html:51
#: software/templates/features.html:480
msgid "Exercises"
msgstr "Exercices"
-#: core/templates/navigation.html:102 core/templates/navigation.html:176
-#: core/templates/navigation.html:339
+#: core/templates/navigation.html:109 core/templates/navigation.html:336
msgid "Administration"
msgstr "Administration"
-#: core/templates/navigation.html:106
+#: core/templates/navigation.html:113
msgid "Exercise edit history"
msgstr "Historique d'édition d'exercice"
-#: core/templates/navigation.html:112
+#: core/templates/navigation.html:119
msgid "Equipment"
msgstr "Équipement"
-#: core/templates/navigation.html:118
+#: core/templates/navigation.html:125
msgid "Muscles"
msgstr "Muscles"
-#: core/templates/navigation.html:124
+#: core/templates/navigation.html:131
#: exercises/templates/categories/admin-overview.html:4
msgid "Categories"
msgstr "Catégories"
-#: core/templates/navigation.html:139 software/templates/features.html:468
+#: core/templates/navigation.html:146 software/templates/features.html:468
msgid "Nutrition"
msgstr "Nutrition"
-#: core/templates/navigation.html:147 core/templates/user/overview.html:144
+#: core/templates/navigation.html:154 core/templates/user/overview.html:147
msgid "Nutrition plans"
msgstr "Plans de nutrition"
-#: core/templates/navigation.html:156
+#: core/templates/navigation.html:163
msgid "BMI calculator"
msgstr "Calculateur d’IMC"
-#: core/templates/navigation.html:165 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:172 nutrition/templates/rate/form.html:18
msgid "Daily calories calculator"
msgstr "Calculateur de calories quotidiennes"
-#: core/templates/navigation.html:171
+#: core/templates/navigation.html:178
#: nutrition/templates/ingredient/overview.html:10
msgid "Ingredient overview"
msgstr "Aperçu ingrédients"
-#: core/templates/navigation.html:180 nutrition/templates/units/list.html:6
-msgid "Ingredient weight units"
-msgstr "Unité de poids des ingrédients"
-
-#: core/templates/navigation.html:196 software/templates/features.html:463
+#: core/templates/navigation.html:193 software/templates/features.html:463
msgid "Body weight"
msgstr "Poids corporel"
-#: core/templates/navigation.html:203 core/templates/user/overview.html:114
+#: core/templates/navigation.html:200 core/templates/user/overview.html:117
msgid "Weight overview"
msgstr "Aperçu poids"
-#: core/templates/navigation.html:217
+#: core/templates/navigation.html:214
msgid "About this software"
msgstr "À propos de ce logiciel"
-#: core/templates/navigation.html:223 software/templates/about_us.html:5
+#: core/templates/navigation.html:220 software/templates/about_us.html:5
msgid "Support & Get Involved"
msgstr "Soutenez et impliquez-vous"
-#: core/templates/navigation.html:229 software/templates/features.html:528
+#: core/templates/navigation.html:226 software/templates/features.html:528
msgid "REST API"
msgstr "API REST"
-#: core/templates/navigation.html:235 utils/models.py:45
+#: core/templates/navigation.html:232 utils/models.py:45
msgid "License"
msgstr "Licence"
-#: core/templates/navigation.html:241
+#: core/templates/navigation.html:238
msgid "Developer documentation"
msgstr "Documentation du développeur"
-#: core/templates/navigation.html:248
+#: core/templates/navigation.html:245
msgid "Get the code"
msgstr "Récupérer le code"
-#: core/templates/navigation.html:255 core/templates/template.html:199
-#: software/templates/features.html:603
+#: core/templates/navigation.html:252 core/templates/template.html:202
+#: software/templates/features.html:614
msgid "Translate"
msgstr "Traduire"
-#: core/templates/navigation.html:292 core/templates/user/login.html:30
+#: core/templates/navigation.html:289 core/templates/user/login.html:30
msgid "Reset password"
msgstr "Réinitialiser le mot de passe"
-#: core/templates/navigation.html:301 core/templates/navigation.html:329
+#: core/templates/navigation.html:298 core/templates/navigation.html:326
msgid "Logout"
msgstr "Se déconnecter"
-#: core/templates/navigation.html:320
+#: core/templates/navigation.html:317
msgid "My preferences"
msgstr "Mes préférences"
-#: core/templates/navigation.html:352
+#: core/templates/navigation.html:349
msgid "Licenses"
msgstr "Licences"
-#: core/templates/navigation.html:360
+#: core/templates/navigation.html:357
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr "Unités de répétition"
-#: core/templates/navigation.html:368 core/templates/weight_unit/list.html:4
-#: nutrition/templates/ingredient/view.html:141
+#: core/templates/navigation.html:365 core/templates/weight_unit/list.html:4
+#: nutrition/templates/ingredient/view.html:182
msgid "Weight units"
msgstr "Unité de poids"
-#: core/templates/navigation.html:376 core/templates/user/list.html:4
+#: core/templates/navigation.html:373 core/templates/user/list.html:4
msgid "User list"
msgstr "Liste des utilisateurs"
-#: core/templates/navigation.html:382
+#: core/templates/navigation.html:379
msgid "Gyms"
msgstr "Activités"
-#: core/templates/navigation.html:403
-#: trophies/templates/trophies/overview.html:7
-msgid "Trophies"
-msgstr ""
-
#: core/templates/registration/password_reset_complete.html:4
msgid "Password reset complete"
msgstr "Réinitialisation du mot de passe terminée"
@@ -819,27 +844,31 @@ msgstr "précédent"
msgid "next"
msgstr "suivant"
-#: core/templates/template.html:96
+#: core/templates/template.html:86
msgid "Close"
msgstr "Fermer"
-#: core/templates/template.html:112
+#: core/templates/template.html:102
msgid ""
"You are using a guest account, data entered will be deleted after a week."
msgstr ""
"Vous utilisez un compte invité, les données rentrées seront effacées après "
"une semaine."
-#: core/templates/template.html:117
+#: core/templates/template.html:107
msgid "Create some demo entries"
msgstr "Créer des entrées de démo"
-#: core/templates/template.html:165 software/templates/features.html:568
+#: core/templates/template.html:155 software/templates/features.html:568
#: software/templates/tos.html:7
msgid "Terms of service"
msgstr "Conditions d’utilisation"
-#: core/templates/template_features.html:53 software/templates/features.html:9
+#: core/templates/template.html:181 software/templates/features.html:595
+msgid "Browser language"
+msgstr ""
+
+#: core/templates/template_features.html:46 software/templates/features.html:9
msgid "Features"
msgstr "Fonctionnalités"
@@ -898,99 +927,94 @@ msgstr "Pas de compte ?"
msgid "Forgot password?"
msgstr "Mot de passe oublié ?"
-#: core/templates/user/overview.html:25 core/templates/user/overview.html:68
-#: core/templates/user/overview.html:112 core/templates/user/overview.html:144
-#: core/templates/user/overview.html:348 core/templates/user/overview.html:390
-#: core/templates/user/overview.html:426
+#: core/templates/user/overview.html:28 core/templates/user/overview.html:71
+#: core/templates/user/overview.html:115 core/templates/user/overview.html:147
+#: core/templates/user/overview.html:351 core/templates/user/overview.html:393
+#: core/templates/user/overview.html:429
#, python-format
msgid "last %(number)s"
msgstr "dernier %(number)s"
-#: core/templates/user/overview.html:27 core/templates/user/overview.html:146
-#: core/templates/user/overview.html:343 core/templates/user/overview.html:382
-#: core/templates/user/overview.html:421 gym/templates/gym/member_list.html:226
+#: core/templates/user/overview.html:30 core/templates/user/overview.html:149
+#: core/templates/user/overview.html:346 core/templates/user/overview.html:385
+#: core/templates/user/overview.html:424 gym/templates/gym/member_list.html:226
#: gym/templates/gym/member_list.html:262
#: gym/templates/gym/member_list.html:302
msgid "Overview"
msgstr "Aperçu"
-#: core/templates/user/overview.html:34 core/templates/user/overview.html:76
-#: core/templates/user/overview.html:120 core/templates/user/overview.html:152
+#: core/templates/user/overview.html:37 core/templates/user/overview.html:79
+#: core/templates/user/overview.html:123 core/templates/user/overview.html:155
#: manager/helpers.py:88 software/templates/about_us.html:170
#: weight/templates/import_csv_preview.html:13
#: weight/templates/import_csv_preview.html:42 weight/views.py:54
msgid "Date"
msgstr "Date"
-#: core/templates/user/overview.html:35 core/templates/user/overview.html:153
+#: core/templates/user/overview.html:38 core/templates/user/overview.html:156
#: gym/models/contract.py:58 gym/models/contract.py:109
msgid "Description"
msgstr "Description"
-#: core/templates/user/overview.html:36
+#: core/templates/user/overview.html:39
msgid "Number of logs (days)"
msgstr "Nombre de journaux (jours)"
-#: core/templates/user/overview.html:37 core/views/user.py:590
+#: core/templates/user/overview.html:40 core/views/user.py:606
#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:158
msgid "Last activity"
msgstr "Dernière activité"
-#: core/templates/user/overview.html:58
+#: core/templates/user/overview.html:61
msgid "No workouts found."
msgstr "Pas de séance trouvée."
-#: core/templates/user/overview.html:68
+#: core/templates/user/overview.html:71
msgid "Log"
msgstr "Journal"
-#: core/templates/user/overview.html:77
+#: core/templates/user/overview.html:80
msgid "General impression"
msgstr "Impression générale"
-#: core/templates/user/overview.html:78 core/templates/user/overview.html:390
+#: core/templates/user/overview.html:81 core/templates/user/overview.html:393
msgid "Notes"
msgstr "Notes"
-#: core/templates/user/overview.html:79
-#: exercises/templates/history/overview.html:30
-msgid "Time"
-msgstr "Temps"
-
-#: core/templates/user/overview.html:112 core/templates/user/overview.html:121
+#: core/templates/user/overview.html:115 core/templates/user/overview.html:124
#: manager/helpers.py:89 weight/templates/import_csv_preview.html:14
#: weight/templates/import_csv_preview.html:43 weight/views.py:54
msgid "Weight"
msgstr "Poids"
-#: core/templates/user/overview.html:154
-#: nutrition/templates/ingredient/view.html:51 nutrition/views/plan.py:245
+#: core/templates/user/overview.html:157
+#: nutrition/templates/ingredient/view.html:52 nutrition/views/plan.py:244
msgid "Energy"
msgstr "Énergie"
-#: core/templates/user/overview.html:155
-#: nutrition/templates/ingredient/view.html:58 nutrition/views/plan.py:251
+#: core/templates/user/overview.html:158
+#: nutrition/templates/ingredient/view.html:59 nutrition/views/plan.py:250
msgid "Protein"
msgstr "Protéines"
-#: core/templates/user/overview.html:156
-#: nutrition/templates/ingredient/view.html:64 nutrition/views/plan.py:259
+#: core/templates/user/overview.html:159
+#: nutrition/templates/ingredient/view.html:65 nutrition/views/plan.py:258
msgid "Carbohydrates"
msgstr "Glucides"
-#: core/templates/user/overview.html:157
-#: nutrition/templates/ingredient/view.html:80 nutrition/views/plan.py:273
+#: core/templates/user/overview.html:160
+#: nutrition/templates/ingredient/view.html:81 nutrition/views/plan.py:272
msgid "Fat"
msgstr "Lipides"
-#: core/templates/user/overview.html:170
-#: nutrition/templates/ingredient/view.html:53
+#: core/templates/user/overview.html:173
+#: nutrition/templates/ingredient/view.html:54
msgid "kcal"
msgstr "kcal"
-#: core/templates/user/overview.html:201 core/templates/user/overview.html:340
-#: core/templates/user/overview.html:379 core/templates/user/overview.html:418
-#: core/templates/user/overview.html:463 gym/templates/gym/list.html:45
+#: core/templates/user/overview.html:204 core/templates/user/overview.html:343
+#: core/templates/user/overview.html:382 core/templates/user/overview.html:421
+#: core/templates/user/overview.html:466 gym/templates/gym/list.html:45
#: gym/templates/gym/member_list.html:91 gym/templates/gym/member_list.html:149
#: gym/templates/gym/member_list.html:187
#: gym/templates/gym/member_list.html:223
@@ -999,111 +1023,115 @@ msgstr "kcal"
msgid "Actions"
msgstr "Actions"
-#: core/templates/user/overview.html:210
+#: core/templates/user/overview.html:213
msgid "Deactivate user"
msgstr "Désactiver l'utilisateur"
-#: core/templates/user/overview.html:214
+#: core/templates/user/overview.html:217
msgid "Activate user"
msgstr "Activer l'utilisateur"
-#: core/templates/user/overview.html:223
+#: core/templates/user/overview.html:226
msgid "Reset user password"
msgstr "Réinitialiser le mot de passe utilisateur"
-#: core/templates/user/overview.html:227 gym/templates/gym/member_list.html:30
+#: core/templates/user/overview.html:230 gym/templates/gym/member_list.html:30
msgid "Roles"
msgstr "Rôles"
-#: core/templates/user/overview.html:243
+#: core/templates/user/overview.html:246
msgid "Password reset confirmation"
msgstr "Confirmation de mot de passe réinitialisé"
-#: core/templates/user/overview.html:247
+#: core/templates/user/overview.html:250
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:250
+#: core/templates/user/overview.html:253
#: exercises/templates/history/overview.html:106
+#: nutrition/templates/ingredient/view.html:148
+#: nutrition/templates/ingredient/view.html:160
msgid "No"
msgstr "Non"
-#: core/templates/user/overview.html:251
+#: core/templates/user/overview.html:254
#: exercises/templates/history/overview.html:99
+#: nutrition/templates/ingredient/view.html:146
+#: nutrition/templates/ingredient/view.html:158
msgid "Yes"
msgstr "Oui"
-#: core/templates/user/overview.html:272 gym/templates/gym/member_list.html:105
+#: core/templates/user/overview.html:275 gym/templates/gym/member_list.html:105
msgid "Details"
msgstr "Détails"
-#: core/templates/user/overview.html:276 gym/views/export.py:57
-#: manager/helpers.py:89 nutrition/views/plan.py:151
-#: nutrition/views/plan.py:157
+#: core/templates/user/overview.html:279 gym/views/export.py:57
+#: manager/helpers.py:89 nutrition/views/plan.py:150
+#: nutrition/views/plan.py:156
msgid "Nr."
msgstr "N°"
-#: core/templates/user/overview.html:298 gym/models/contract.py:287
+#: core/templates/user/overview.html:301 gym/models/contract.py:287
#: gym/models/gym.py:50 gym/templates/contract/view.html:75
#: gym/templates/gym/member_list.html:112 gym/views/export.py:68
msgid "Phone"
msgstr "Téléphone"
-#: core/templates/user/overview.html:302 gym/templates/contract/view.html:87
+#: core/templates/user/overview.html:305 gym/templates/contract/view.html:87
#: gym/templates/gym/member_list.html:130
msgid "Address"
msgstr "Adresse"
-#: core/templates/user/overview.html:313
+#: core/templates/user/overview.html:316
msgid "Registered"
msgstr "Enregistré"
-#: core/templates/user/overview.html:317
+#: core/templates/user/overview.html:320
msgid "Last login"
msgstr "Dernière connexion"
-#: core/templates/user/overview.html:322
+#: core/templates/user/overview.html:325
msgid "Status"
msgstr "Statut"
-#: core/templates/user/overview.html:325
+#: core/templates/user/overview.html:328
msgid "Active"
msgstr "Actif"
-#: core/templates/user/overview.html:327
+#: core/templates/user/overview.html:330
msgid "Inactive"
msgstr "Inactifs"
-#: core/templates/user/overview.html:348 gym/templates/contract/list.html:4
+#: core/templates/user/overview.html:351 gym/templates/contract/list.html:4
#: gym/templates/gym/member_list.html:218
msgid "Contracts"
msgstr "Contrats"
-#: core/templates/user/overview.html:426 gym/templates/document/list.html:4
+#: core/templates/user/overview.html:429 gym/templates/document/list.html:4
msgid "Documents"
msgstr "Documents"
-#: core/templates/user/overview.html:433 gym/templates/document/list.html:33
+#: core/templates/user/overview.html:436 gym/templates/document/list.html:33
msgid "Download"
msgstr "Télécharger"
-#: core/templates/user/overview.html:474 gym/views/admin_config.py:44
+#: core/templates/user/overview.html:477 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:477 gym/models/user_config.py:92
+#: core/templates/user/overview.html:480 gym/models/user_config.py:92
msgid "Include in inactive overview"
msgstr "Inclure dans un aperçu inactif"
-#: core/templates/user/overview.html:510
+#: core/templates/user/overview.html:513
#, python-format
msgid "Admin login is only available for users in %(gym_name)s"
msgstr ""
"La connexion Admin est uniquement disponible pour les utilisateurs de "
"%(gym_name)s"
-#: core/templates/user/overview.html:514
+#: core/templates/user/overview.html:517
msgid "Log in as this user"
msgstr "Connectez-vous en tant que cet utilisateur"
@@ -1127,7 +1155,7 @@ msgstr "Envoyer un email de vérification"
msgid "You need to verify your email to contribute exercises"
msgstr "Vous devez vérifier votre email pour contribuer aux exercices"
-#: core/templates/user/preferences.html:55 core/views/user.py:601
+#: core/templates/user/preferences.html:55 core/views/user.py:617
msgid "Change password"
msgstr "Changer le mot de passe"
@@ -1135,23 +1163,23 @@ msgstr "Changer le mot de passe"
msgid "Already have an account?"
msgstr ""
-#: core/templatetags/wger_extras.py:142 i18n.tpl:38
+#: core/templatetags/wger_extras.py:142 i18n.tpl:39
msgid "kg"
msgstr "kg"
#: core/templatetags/wger_extras.py:144
-#: nutrition/templates/ingredient/view.html:60
-#: nutrition/templates/ingredient/view.html:66
-#: nutrition/templates/ingredient/view.html:73
-#: nutrition/templates/ingredient/view.html:82
-#: nutrition/templates/ingredient/view.html:89
-#: nutrition/templates/ingredient/view.html:111
-#: nutrition/templates/ingredient/view.html:121
+#: nutrition/templates/ingredient/view.html:61
+#: nutrition/templates/ingredient/view.html:67
+#: nutrition/templates/ingredient/view.html:74
+#: nutrition/templates/ingredient/view.html:83
+#: nutrition/templates/ingredient/view.html:90
+#: nutrition/templates/ingredient/view.html:112
+#: nutrition/templates/ingredient/view.html:122
msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr "g"
-#: core/templatetags/wger_extras.py:147 i18n.tpl:39
+#: core/templatetags/wger_extras.py:147 i18n.tpl:40
msgid "lb"
msgstr "lb"
@@ -1160,36 +1188,35 @@ msgctxt "weight unit, i.e. ounces"
msgid "oz"
msgstr "oz"
-#: core/views/languages.py:85 exercises/views/categories.py:122
+#: core/views/languages.py:88 exercises/views/categories.py:122
#: exercises/views/equipment.py:103 exercises/views/muscles.py:99
-#: nutrition/views/ingredient.py:120 nutrition/views/unit.py:110
+#: nutrition/views/ingredient.py:125
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
+#: core/views/languages.py:96 core/views/license.py:103
+#: core/views/repetition_units.py:114 core/views/weight_units.py:115
#: exercises/views/categories.py:128 exercises/views/muscles.py:106
#: gallery/views/images.py:124 gym/views/admin_notes.py:196
#: gym/views/document.py:206 gym/views/gym.py:481
-#: nutrition/views/ingredient.py:127 nutrition/views/unit.py:117
+#: nutrition/views/ingredient.py:132
#, python-brace-format
msgid "Delete {0}?"
msgstr "Supprimer {0} ?"
-#: core/views/languages.py:111 core/views/license.py:85
-#: core/views/repetition_units.py:86 core/views/user.py:464
+#: core/views/languages.py:114 core/views/license.py:85
+#: core/views/repetition_units.py:96 core/views/user.py:480
#: core/views/weight_units.py:86 exercises/views/categories.py:98
#: exercises/views/equipment.py:81 exercises/views/muscles.py:87
#: gym/views/admin_notes.py:161 gym/views/config.py:68
#: gym/views/contract.py:186 gym/views/contract_option.py:123
#: gym/views/contract_type.py:123 gym/views/document.py:171
-#: gym/views/gym.py:463 nutrition/views/ingredient.py:146
-#: nutrition/views/unit.py:143
+#: gym/views/gym.py:463 nutrition/views/ingredient.py:151
#, python-brace-format
msgid "Edit {0}"
msgstr "Modifier {0}"
-#: core/views/misc.py:74
+#: core/views/misc.py:73
msgid ""
"We have created sample workout, workout schedules, weight logs, (body) "
"weight and nutrition plan entries so you can better see what this site can "
@@ -1200,48 +1227,48 @@ msgstr ""
"vous puissiez mieux voir ce que ce site web peut faire. N’hésitez pas à les "
"modifier ou à les supprimer !"
-#: core/views/user.py:143
+#: core/views/user.py:145
#, python-brace-format
msgid "Account \"{0}\" was successfully deleted"
msgstr "Le compte « {0} » a été supprimé avec succès"
-#: core/views/user.py:279
+#: core/views/user.py:287
msgid "You were successfully registered"
msgstr "Vous avez été enregistré·e avec succès"
-#: core/views/user.py:341
+#: core/views/user.py:357
msgid "Settings successfully updated"
msgstr "Paramètres mis à jour"
-#: core/views/user.py:380
+#: core/views/user.py:396
msgid "The user was successfully deactivated"
msgstr "L'utilisateur a été correctement désactivé"
-#: core/views/user.py:417
+#: core/views/user.py:433
msgid "The user was successfully activated"
msgstr "L'utilisateur a été activé avec succès"
-#: core/views/user.py:432
+#: core/views/user.py:448
msgid "Edit user"
msgstr "Modifier l’utilisateur"
-#: core/views/user.py:587 gym/templates/gym/member_list.html:26
+#: core/views/user.py:603 gym/templates/gym/member_list.html:26
#: gym/views/gym.py:158
msgid "ID"
msgstr "ID"
-#: core/views/user.py:588 gym/forms.py:95 gym/templates/contract/view.html:55
+#: core/views/user.py:604 gym/forms.py:95 gym/templates/contract/view.html:55
#: gym/templates/gym/member_list.html:27 gym/views/export.py:59
#: gym/views/gym.py:158 gym/views/gym.py:217
msgid "Username"
msgstr "Nom d’utilisateur"
-#: core/views/user.py:591 gym/templates/gym/new_user.html:34
+#: core/views/user.py:607 gym/templates/gym/new_user.html:34
#: gym/views/export.py:58 gym/views/gym.py:217
msgid "Gym"
msgstr "Activités"
-#: core/views/user.py:650
+#: core/views/user.py:678
#, python-format
msgid "A verification email was sent to %(email)s"
msgstr "Un email de vérification a été envoyé à %(email)s"
@@ -1258,16 +1285,16 @@ msgstr "Nom alternatif"
msgid "A more basic name for the muscle"
msgstr "Un nom plus basique pour le muscle"
-#: exercises/models/video.py:50
+#: exercises/models/video.py:52
#, python-format
msgid "Maximum file size is %(size)sMB."
msgstr "La taille maximum du fichier est %(size)sMB."
-#: exercises/models/video.py:57 exercises/models/video.py:65
+#: exercises/models/video.py:59 exercises/models/video.py:67
msgid "File type is not supported"
msgstr "Le type de fichier n'est pas supporté"
-#: exercises/models/video.py:70
+#: exercises/models/video.py:72
msgid "File is not a valid video"
msgstr "Le fichier n'est pas une vidéo valide"
@@ -1338,7 +1365,11 @@ msgstr "Supprimer équipement ?"
msgid "Add muscle"
msgstr "Ajouter un muscle"
-#: gallery/templates/images/overview.html:72
+#: gallery/forms.py:35
+msgid "If date is left empty, it will be read from the image instead"
+msgstr ""
+
+#: gallery/templates/images/overview.html:69
msgid "Add image"
msgstr "Ajouter une image"
@@ -1408,7 +1439,7 @@ msgid "Contract type"
msgstr "Type de contrat"
#: gym/models/contract.py:211 gym/templates/contract/view.html:59
-#: nutrition/forms.py:58
+#: nutrition/forms.py:67
msgid "Amount"
msgstr "Quantité"
@@ -1589,7 +1620,7 @@ msgstr "Courriels"
msgid "Add member"
msgstr "Ajouter un membre"
-#: gym/templates/gym/new_user.html:48 nutrition/templates/rate/form.html:120
+#: gym/templates/gym/new_user.html:48 nutrition/templates/rate/form.html:121
msgid "Info"
msgstr "Infos"
@@ -1763,10 +1794,6 @@ msgstr "Barre de traction"
msgid "Quads"
msgstr "Quadriceps"
-#: i18n.tpl:30
-msgid "Repetitions"
-msgstr "Répétitions"
-
#: i18n.tpl:31
msgid "Resistance band"
msgstr "Bande de résistance"
@@ -1795,198 +1822,204 @@ msgstr "Triceps"
msgid "Until Failure"
msgstr "Jusqu'à l'échec"
-#: i18n.tpl:40
+#: i18n.tpl:38
+#, fuzzy
+#| msgid "Kilometers"
+msgid "Meters"
+msgstr "kilomètres"
+
+#: i18n.tpl:41
msgid "none (bodyweight exercise)"
msgstr "aucun (poids du corps)"
-#: i18n.tpl:41
+#: i18n.tpl:42
msgid "Beginner"
msgstr ""
-#: i18n.tpl:42
+#: i18n.tpl:43
#, fuzzy
#| msgctxt "As in \"content of an email\""
#| msgid "Content"
msgid "Consistent"
msgstr "Contenu"
-#: i18n.tpl:43
+#: i18n.tpl:44
msgid "Dedicated"
msgstr ""
-#: i18n.tpl:44
+#: i18n.tpl:45
msgid "Obsessed"
msgstr ""
-#: i18n.tpl:45
+#: i18n.tpl:46
msgid "Legend"
msgstr "Légende"
-#: i18n.tpl:46
+#: i18n.tpl:47
msgid "Veteran"
msgstr ""
-#: i18n.tpl:47
+#: i18n.tpl:48
msgid "Titan"
msgstr ""
-#: i18n.tpl:48
+#: i18n.tpl:49
msgid "Unstoppable"
msgstr ""
-#: i18n.tpl:49
+#: i18n.tpl:50
msgid "Weekend Warrior"
msgstr ""
-#: i18n.tpl:50
+#: i18n.tpl:51
msgid "Elephant lifter"
msgstr ""
-#: i18n.tpl:51
+#: i18n.tpl:52
msgid "Bus lifter"
msgstr ""
-#: i18n.tpl:52
+#: i18n.tpl:53
msgid "Plane lifter"
msgstr ""
-#: i18n.tpl:53
+#: i18n.tpl:54
msgid "Blue whale lifter"
msgstr ""
-#: i18n.tpl:54
+#: i18n.tpl:55
msgid "Space Station lifter"
msgstr ""
-#: i18n.tpl:55
+#: i18n.tpl:56
msgid "Millionaire"
msgstr ""
-#: i18n.tpl:56
+#: i18n.tpl:57
msgid "Atlas"
msgstr ""
-#: i18n.tpl:57
+#: i18n.tpl:58
msgid "Early Bird"
msgstr ""
-#: i18n.tpl:58
+#: i18n.tpl:59
#, fuzzy
#| msgid "Weight log"
msgid "Night Owl"
msgstr "Journal de pesée"
-#: i18n.tpl:59
+#: i18n.tpl:60
msgid "New Year, New Me"
msgstr ""
-#: i18n.tpl:60
+#: i18n.tpl:61
msgid "Phoenix"
msgstr ""
-#: i18n.tpl:61
+#: i18n.tpl:62
#, fuzzy
#| msgid "Personal data"
msgid "Personal Record"
msgstr "Données personnelles"
-#: i18n.tpl:62
+#: i18n.tpl:63
#, fuzzy
#| msgid "Copy workout"
msgid "Complete your first workout"
msgstr "Copier une séance"
-#: i18n.tpl:63
+#: i18n.tpl:64
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 10 workouts"
msgstr "Exemple de séance"
-#: i18n.tpl:64
+#: i18n.tpl:65
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 50 workouts"
msgstr "Exemple de séance"
-#: i18n.tpl:65
+#: i18n.tpl:66
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 100 workouts"
msgstr "Exemple de séance"
-#: i18n.tpl:66
+#: i18n.tpl:67
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 200 workouts"
msgstr "Exemple de séance"
-#: i18n.tpl:67
+#: i18n.tpl:68
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 500 workouts"
msgstr "Exemple de séance"
-#: i18n.tpl:68
+#: i18n.tpl:69
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 1000 workouts"
msgstr "Exemple de séance"
-#: i18n.tpl:69
+#: i18n.tpl:70
msgid "Maintain a 30-day workout streak"
msgstr ""
-#: i18n.tpl:70
+#: i18n.tpl:71
msgid "Work out on Saturday and Sunday for 4 consecutive weekends"
msgstr ""
-#: i18n.tpl:71
+#: i18n.tpl:72
msgid "Lift a cumulative total of 5.000 kg"
msgstr ""
-#: i18n.tpl:72
+#: i18n.tpl:73
msgid "Lift a cumulative total of 20.000 kg"
msgstr ""
-#: i18n.tpl:73
+#: i18n.tpl:74
msgid "Lift a cumulative total of 50.000 kg"
msgstr ""
-#: i18n.tpl:74
+#: i18n.tpl:75
msgid "Lift a cumulative total of 150.000 kg"
msgstr ""
-#: i18n.tpl:75
+#: i18n.tpl:76
msgid "Lift a cumulative total of 450.000 kg"
msgstr ""
-#: i18n.tpl:76
+#: i18n.tpl:77
msgid "Lift a cumulative total of 1.000.000 kg"
msgstr ""
-#: i18n.tpl:77
+#: i18n.tpl:78
msgid "Lift a cumulative total of 10.000.000 kg"
msgstr ""
-#: i18n.tpl:78
+#: i18n.tpl:79
msgid "Complete a workout before 6:00 AM"
msgstr ""
-#: i18n.tpl:79
+#: i18n.tpl:80
msgid "Complete a workout after 9:00 PM"
msgstr ""
-#: i18n.tpl:80
+#: i18n.tpl:81
#, fuzzy
#| msgid "Workout for %s"
msgid "Work out on January 1st"
msgstr "Séance pour %s"
-#: i18n.tpl:81
+#: i18n.tpl:82
msgid "Return to training after being inactive for 30 days"
msgstr ""
-#: i18n.tpl:82
+#: i18n.tpl:83
msgid "Achieve a new Personal Record on any exercise"
msgstr ""
@@ -2071,7 +2104,7 @@ msgstr "Exercice"
msgid "Routine will expire soon"
msgstr "La routine expirera bientôt"
-#: manager/models/routine.py:153 manager/models/session.py:145
+#: manager/models/routine.py:154 manager/models/session.py:145
msgid "The start time cannot be after the end time."
msgstr "L'heure de début ne peut pas être après l'heure de fin."
@@ -2157,23 +2190,27 @@ msgstr "Séance"
msgid "Workout for %s"
msgstr "Séance pour %s"
-#: nutrition/forms.py:62
+#: nutrition/extract_info/off.py:72 nutrition/extract_info/off.py:91
+msgid "Serving"
+msgstr ""
+
+#: nutrition/forms.py:71 nutrition/forms.py:208
msgid "Unit"
msgstr "Unité"
-#: nutrition/forms.py:170 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:179 nutrition/templates/rate/form.html:77
msgid "Basic caloric intake"
msgstr "Apport calorique de base"
-#: nutrition/forms.py:171
+#: nutrition/forms.py:180
msgid "Your basic caloric intake as calculated for your data"
msgstr "Votre apport calorique de base calculé avec vos données"
-#: nutrition/forms.py:176
+#: nutrition/forms.py:185
msgid "Additional calories"
msgstr "Calories supplémentaires"
-#: nutrition/forms.py:178
+#: nutrition/forms.py:187
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
@@ -2182,13 +2219,31 @@ msgstr ""
"entrez un nombre négatif)"
#: nutrition/forms.py:209
+msgid "grams (g)"
+msgstr ""
+
+#: nutrition/forms.py:219
msgid "Ingredient"
msgstr "Ingrédient"
-#: nutrition/forms.py:213
+#: nutrition/forms.py:223
msgid "Also search for names in English"
msgstr "Chercher aussi le nom des ingrédients en anglais"
+#: nutrition/forms.py:239
+msgid "Quantity"
+msgstr ""
+
+#: nutrition/forms.py:241
+msgid "Enter a quantity and choose grams (g) or one of the serving units."
+msgstr ""
+
+#: nutrition/models/ingredient.py:526
+#, fuzzy
+#| msgid "Correction"
+msgid "Portion"
+msgstr "Correction"
+
#: nutrition/templates/ingredient/email_new.tpl:1
#, python-format
msgid ""
@@ -2239,59 +2294,92 @@ msgstr ""
"renseigné votre courriel lors de votre inscription, vous serez informé·e une "
"fois le processus fini avec succès."
-#: nutrition/templates/ingredient/overview.html:38
+#: nutrition/templates/ingredient/overview.html:32
+#: nutrition/templates/ingredient/overview.html:68
+#: nutrition/templates/ingredient/view.html:143
+msgid "Vegan"
+msgstr ""
+
+#: nutrition/templates/ingredient/overview.html:34
+#: nutrition/templates/ingredient/overview.html:79
+#: nutrition/templates/ingredient/view.html:155
+#, fuzzy
+#| msgid "Variations"
+msgid "Vegetarian"
+msgstr "Variations"
+
+#: nutrition/templates/ingredient/overview.html:43
msgid "No ingredients."
msgstr "Aucun ingrédient."
-#: nutrition/templates/ingredient/overview.html:49
+#: nutrition/templates/ingredient/overview.html:54
msgid "Search"
msgstr "Recherche"
-#: nutrition/templates/ingredient/view.html:45 nutrition/views/plan.py:237
+#: nutrition/templates/ingredient/overview.html:57
+#, fuzzy
+#| msgid "No filter"
+msgid "Filter"
+msgstr "Pas de filtre"
+
+#: nutrition/templates/ingredient/overview.html:83
+msgid "Apply"
+msgstr ""
+
+#: nutrition/templates/ingredient/overview.html:85
+msgid "Reset"
+msgstr ""
+
+#: nutrition/templates/ingredient/view.html:46 nutrition/views/plan.py:236
msgid "Macronutrients"
msgstr "Macronutriments"
-#: nutrition/templates/ingredient/view.html:54
+#: nutrition/templates/ingredient/view.html:55
msgid "kJ"
msgstr "kJ"
-#: nutrition/templates/ingredient/view.html:70 nutrition/views/plan.py:267
+#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:266
msgid "Sugar content in carbohydrates"
msgstr "Sucre contenu dans les glucides"
-#: nutrition/templates/ingredient/view.html:75
-#: nutrition/templates/ingredient/view.html:91
-#: nutrition/templates/ingredient/view.html:113
-#: nutrition/templates/ingredient/view.html:123
+#: nutrition/templates/ingredient/view.html:76
+#: nutrition/templates/ingredient/view.html:92
+#: nutrition/templates/ingredient/view.html:114
+#: nutrition/templates/ingredient/view.html:124
msgid "n.A."
msgstr "n.A."
-#: nutrition/templates/ingredient/view.html:86 nutrition/views/plan.py:281
+#: nutrition/templates/ingredient/view.html:87 nutrition/views/plan.py:280
msgid "Saturated fat content in fats"
msgstr "Teneur en acides gras saturés dans les acides gras"
-#: nutrition/templates/ingredient/view.html:102
+#: nutrition/templates/ingredient/view.html:103
msgid "Others"
msgstr "Autres"
-#: nutrition/templates/ingredient/view.html:108 nutrition/views/plan.py:287
+#: nutrition/templates/ingredient/view.html:109 nutrition/views/plan.py:286
msgid "Fiber"
msgstr "Fibre"
-#: nutrition/templates/ingredient/view.html:118 nutrition/views/plan.py:293
+#: nutrition/templates/ingredient/view.html:119 nutrition/views/plan.py:292
msgid "Sodium"
msgstr "Sodium"
-#: nutrition/templates/ingredient/view.html:143
-#: nutrition/templates/units/list.html:50 nutrition/views/unit.py:86
+#: nutrition/templates/ingredient/view.html:136
+#, fuzzy
+#| msgid "Click here for more information"
+msgid "Dietary information"
+msgstr "Cliquez ici pour plus d'informations"
+
+#: nutrition/templates/ingredient/view.html:184
msgid "Add new weight unit"
msgstr "Ajouter une nouvelle unité de poids"
-#: nutrition/templates/rate/form.html:25
+#: nutrition/templates/rate/form.html:26
msgid "Basal metabolic rate"
msgstr "Taux métabolique basal"
-#: nutrition/templates/rate/form.html:26
+#: nutrition/templates/rate/form.html:27
msgid ""
"The basal metabolic rate is the amount of energy expended daily\n"
"at rest. This is the minimum energy needed for the body to function, without "
@@ -2302,15 +2390,15 @@ msgstr ""
"repos. Il s’agit de l’énergie minimale nécessaire pour le fonctionnement du "
"corps, sans aucune activité physique supplémentaire."
-#: nutrition/templates/rate/form.html:37
+#: nutrition/templates/rate/form.html:38
msgid "Your basic metabolic rate is: "
msgstr "Votre taux métabolique est de : "
-#: nutrition/templates/rate/form.html:47
+#: nutrition/templates/rate/form.html:48
msgid "Physical activities"
msgstr "Activités physiques"
-#: nutrition/templates/rate/form.html:48
+#: nutrition/templates/rate/form.html:49
msgid ""
"The physical activity level (PAL) is a factor used to to express\n"
"the additional physical activity and is used to calculate the total energy\n"
@@ -2320,11 +2408,11 @@ msgstr ""
"facteur utilisé pour exprimer l’activité physique supplémentaire et est "
"utilisé pour calculer l’énergie totale nécessaire par jour."
-#: nutrition/templates/rate/form.html:59
+#: nutrition/templates/rate/form.html:60
msgid "Factor for daily activities: "
msgstr "Facteur pour les activités quotidiennes : "
-#: nutrition/templates/rate/form.html:67
+#: nutrition/templates/rate/form.html:68
msgid ""
"The base caloric intake is the amount of calories your metabolism\n"
"needs based on your level of physical activity."
@@ -2332,11 +2420,11 @@ msgstr ""
"L’apport calorique de base est la quantité de calories que votre métabolisme "
"a besoin par rapport à votre niveau d’activité physique."
-#: nutrition/templates/rate/form.html:81
+#: nutrition/templates/rate/form.html:82
msgid "Calculate basic caloric intake"
msgstr "Calculer l'apport calorique de base"
-#: nutrition/templates/rate/form.html:88
+#: nutrition/templates/rate/form.html:89
msgid ""
"The total calories are the actual total calories per day. This\n"
"might include e.g. a surplus or deficit if you are bulking or cutting. "
@@ -2348,20 +2436,20 @@ msgstr ""
"couper. Sinon vous pouvez juste entrer vous-même la quantité de calories si "
"vous connaissez la valeur."
-#: nutrition/templates/rate/form.html:102
+#: nutrition/templates/rate/form.html:103
msgid "Transfer basic intake to total daily calories"
msgstr "transformer des apports de base au total des calories quotidiennes"
-#: nutrition/templates/rate/form.html:106
+#: nutrition/templates/rate/form.html:107
msgid "Add additional calories to total daily calories"
msgstr ""
"Ajoutez des calories supplémentaires au total des calories quotidiennes"
-#: nutrition/templates/rate/form.html:110
+#: nutrition/templates/rate/form.html:111
msgid "Save total calories to profile"
msgstr "Enregistrer les calories totales dans le profil"
-#: nutrition/templates/rate/form.html:121
+#: nutrition/templates/rate/form.html:122
msgid ""
"Please note that these calculations can only be an\n"
"approximation. If you base your nutrition plan on these values, observe\n"
@@ -2371,49 +2459,49 @@ 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:158
+#: nutrition/views/ingredient.py:163
msgid "Add a new ingredient"
msgstr "Ajouter un nouvel ingrédient"
-#: nutrition/views/plan.py:128
+#: nutrition/views/plan.py:127
msgid "Nutritional plan"
msgstr "Plan de nutrition"
-#: nutrition/views/plan.py:130
+#: nutrition/views/plan.py:129
#, python-format
msgid "Nutritional plan for %s"
msgstr "Plan de nutrition pour %s"
-#: nutrition/views/plan.py:202
+#: nutrition/views/plan.py:201
msgid "<i>This is an empty plan, what did you expect on the PDF?</i>"
msgstr ""
"<i>Il s'agit d'un régime vide, à quoi vous attendiez-vous sur le PDF?</i>"
-#: nutrition/views/plan.py:230
+#: nutrition/views/plan.py:229
msgid "Nutritional data"
msgstr "Donnée nutritionnelle"
-#: nutrition/views/plan.py:238
+#: nutrition/views/plan.py:237
msgid "Total"
msgstr "Total"
-#: nutrition/views/plan.py:239
+#: nutrition/views/plan.py:238
msgid "Percent of energy"
msgstr "Pour cent de l'énergie"
-#: nutrition/views/plan.py:240
+#: nutrition/views/plan.py:239
msgid "g per body kg"
msgstr "g par kg de masse corporelle"
-#: nutrition/views/unit_ingredient.py:69
+#: nutrition/views/unit_ingredient.py:64
msgid "Add a new weight unit"
msgstr "Ajouter une nouvelle unité de poids"
-#: nutrition/views/unit_ingredient.py:106
+#: nutrition/views/unit_ingredient.py:99
msgid "Edit a weight unit to ingredient connection"
msgstr "Modifier une unité de poids pour l’ingrédient"
-#: nutrition/views/unit_ingredient.py:138
+#: nutrition/views/unit_ingredient.py:129
msgid "Delete?"
msgstr "Supprimer ?"
@@ -2818,7 +2906,7 @@ msgstr "Code source"
msgid "Translation"
msgstr "Traduction"
-#: utils/generic_views.py:263
+#: utils/generic_views.py:246
msgid "Yes, delete"
msgstr "Oui, supprimer"
@@ -2872,10 +2960,6 @@ msgstr "Vous devez entrer votre poids"
msgid "Import weight logs"
msgstr "Importer vos journaux de poids"
-#: weight/templates/import_csv_form.html:9
-msgid "Submit"
-msgstr "Envoyer"
-
#: weight/templates/import_csv_form.html:15
msgid ""
"Use this import field to import your weight logs into Workout\n"
@@ -2996,6 +3080,36 @@ msgstr ""
msgid "Re-Submit"
msgstr "Renvoyer"
+#~ msgid "Email verification"
+#~ msgstr "Vérification du courriel"
+
+#, python-format
+#~ msgid "%(username)s, your email was verified"
+#~ msgstr "%(username)s, votre email a été vérifié"
+
+#~ msgid "Error, invalid verification token"
+#~ msgstr "Erreur, token de vérification invalide"
+
+#~ msgid "Email Confirmation"
+#~ msgstr "Confirmation d'email"
+
+#, python-format
+#~ msgid "You are almost there, %(username)s!"
+#~ msgstr "Vous y êtes presque, %(username)s !"
+
+#, python-format
+#~ msgid "Please click <a href=\"%(link)s\">here</a> to confirm your email"
+#~ msgstr ""
+#~ "Veuillez cliquer sur <a href=\"%(link)s\">ici</a> pour confirmer votre "
+#~ "email"
+
+#, python-format
+#~ msgid "The token expires on %(time)s"
+#~ msgstr "Le jeton expire dans %(time)s"
+
+#~ msgid "Ingredient weight units"
+#~ msgstr "Unité de poids des ingrédients"
+
#~ msgid "Image"
#~ msgstr "Image"
@@ -3026,9 +3140,6 @@ msgstr "Renvoyer"
#~ msgid "Secondary muscles"
#~ msgstr "Muscles secondaires"
-#~ msgid "Variations"
-#~ msgstr "Variations"
-
#~ msgid "Exercise Categories"
#~ msgstr "Catégorie d'exercices"
@@ -4102,9 +4213,6 @@ msgstr "Renvoyer"
#~ msgid "This content is available under the following license:"
#~ msgstr "Ce contenu est disponible sous la licence suivante :"
-#~ msgid "Click here for more information"
-#~ msgstr "Cliquez ici pour plus d'informations"
-
#, python-format
#~ msgid "%(name)s is too similar to existing exercise \"%(exercise_name)s\""
#~ msgstr ""
@@ -4820,9 +4928,6 @@ msgstr "Renvoyer"
#~ msgid "Last 12 months"
#~ msgstr "Les 12 derniers mois"
-#~ msgid "No filter"
-#~ msgstr "Pas de filtre"
-
#~ msgid "Days"
#~ msgstr "Jours"
diff --git a/wger/locale/he/LC_MESSAGES/django.po b/wger/locale/he/LC_MESSAGES/django.po
index 790c35886..c0775b7b7 100644
--- a/wger/locale/he/LC_MESSAGES/django.po
+++ b/wger/locale/he/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-01-17 14:03+0000\n"
+"POT-Creation-Date: 2026-04-10 10:20+0000\n"
"PO-Revision-Date: 2025-11-17 06:51+0000\n"
"Last-Translator: \"Omer I.S.\" <[email protected]>\n"
"Language-Team: Hebrew <https://hosted.weblate.org/projects/wger/web/he/>\n"
@@ -33,7 +33,7 @@ msgstr ""
#: config/views/gym_config.py:42 core/templates/language/view.html:64
#: core/templates/license/list.html:17
#: core/templates/repetition_unit/list.html:18
-#: core/templates/user/overview.html:204 core/templates/user/overview.html:467
+#: core/templates/user/overview.html:207 core/templates/user/overview.html:470
#: core/templates/weight_unit/list.html:18
#: exercises/templates/categories/admin-overview.html:17
#: exercises/templates/equipment/admin-overview.html:17
@@ -45,30 +45,29 @@ msgstr ""
#: gym/templates/gym/list.html:19 gym/templates/gym/list.html:48
#: gym/templates/gym/member_list.html:94 gym/templates/gym/member_list.html:152
#: gym/templates/gym/member_list.html:190
-#: nutrition/templates/ingredient/view.html:164
-#: nutrition/templates/ingredient/view.html:209
-#: nutrition/templates/units/list.html:19
+#: nutrition/templates/ingredient/view.html:205
+#: nutrition/templates/ingredient/view.html:248
msgid "Edit"
msgstr "עריכה"
-#: core/forms.py:91 core/templates/navigation.html:271
-#: core/templates/navigation.html:278 core/templates/user/login.html:4
+#: core/forms.py:89 core/templates/navigation.html:268
+#: core/templates/navigation.html:275 core/templates/user/login.html:4
#: core/templates/user/registration_sidebar.html:12
#: software/templates/features.html:82 software/templates/features.html:448
msgid "Login"
msgstr "כניסה"
-#: core/forms.py:130 core/forms.py:244 gym/views/export.py:61
+#: core/forms.py:128 core/forms.py:242 gym/views/export.py:61
#: gym/views/gym.py:217
msgid "First name"
msgstr "שם פרטי"
-#: core/forms.py:131 core/forms.py:245 core/templates/user/overview.html:284
+#: core/forms.py:129 core/forms.py:243 core/templates/user/overview.html:287
#: gym/views/export.py:62 gym/views/gym.py:217
msgid "Last name"
msgstr "שם משפחה"
-#: core/forms.py:133 core/forms.py:210 core/templates/user/overview.html:288
+#: core/forms.py:131 core/forms.py:208 core/templates/user/overview.html:291
#: gym/models/contract.py:256 gym/models/gym.py:58
#: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:116
#: gym/templates/gym/new_user.html:30 gym/views/export.py:60
@@ -78,54 +77,54 @@ msgstr "שם משפחה"
msgid "Email"
msgstr "דואר אלקטרוני"
-#: core/forms.py:134
+#: core/forms.py:132
msgid "Used for password resets and, optionally, e-mail reminders."
msgstr ""
"בשימוש עבור איפוס סיסמה וגם, באופן אופציונלי, לתזכורות בדואר האלקטרוני."
-#: core/forms.py:138 core/models/profile.py:222
+#: core/forms.py:136 core/models/profile.py:222
#: gym/templates/gym/new_user.html:38
msgid "Date of Birth"
msgstr "תאריך לידה"
-#: core/forms.py:177
+#: core/forms.py:175
msgid "Personal data"
msgstr "נתונים אישיים"
-#: core/forms.py:189
+#: core/forms.py:187
msgid "Workout reminders"
msgstr "תזכורות לאימונים"
-#: core/forms.py:196
+#: core/forms.py:194
msgid "Other settings"
msgstr "הגדרות אחרות"
-#: core/forms.py:204 core/views/user.py:614 core/views/user.py:629
-#: core/views/user.py:641 gym/forms.py:73 utils/generic_views.py:143
+#: core/forms.py:202 core/views/user.py:630 core/views/user.py:654
+#: core/views/user.py:668 gym/forms.py:73 utils/generic_views.py:137
msgid "Save"
msgstr "שמירה"
-#: core/forms.py:211
+#: core/forms.py:209
msgid "Used for password resets and, optionally, email reminders."
msgstr "משמש לשחזור הסיסמה ולתזכורות אופציונליות."
-#: core/forms.py:240
+#: core/forms.py:238
msgid "This e-mail address is already in use."
msgstr "כתובת דוא״ל זו כבר נמצאת בשימוש."
-#: core/forms.py:261 gym/templates/gym/new_user.html:26
+#: core/forms.py:259 gym/templates/gym/new_user.html:26
#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:217
msgid "Password"
msgstr "סיסמה"
-#: core/forms.py:263
+#: core/forms.py:261
msgid "Please enter your current password."
msgstr "נא להקליד את סיסמתך הנוכחית."
-#: core/forms.py:272 core/templates/language/view.html:70
+#: core/forms.py:270 core/templates/language/view.html:70
#: core/templates/license/list.html:21
#: core/templates/repetition_unit/list.html:22
-#: core/templates/user/overview.html:233
+#: core/templates/user/overview.html:236
#: core/templates/weight_unit/list.html:22
#: exercises/templates/categories/admin-overview.html:21
#: exercises/templates/equipment/admin-overview.html:21
@@ -133,27 +132,30 @@ msgstr "נא להקליד את סיסמתך הנוכחית."
#: gym/templates/admin_notes/list.html:37
#: gym/templates/contract_option/list.html:35
#: gym/templates/contract_type/list.html:36 gym/templates/document/list.html:46
-#: gym/templates/gym/list.html:23 nutrition/templates/ingredient/view.html:168
-#: nutrition/templates/ingredient/view.html:215
-#: nutrition/templates/units/list.html:25
+#: gym/templates/gym/list.html:23 nutrition/templates/ingredient/view.html:209
+#: nutrition/templates/ingredient/view.html:254
msgid "Delete"
msgstr "מחיקה"
-#: core/forms.py:281
+#: core/forms.py:279
msgid "Invalid password"
msgstr "סיסמה שגויה"
-#: core/forms.py:293
+#: core/forms.py:291 core/forms.py:349
msgid "The form is secured with reCAPTCHA"
msgstr "טופס זה מאובטח באמצעות reCAPTCHA"
-#: core/forms.py:314 core/forms.py:341 core/templates/navigation.html:272
-#: core/templates/navigation.html:285 core/templates/template.html:123
-#: core/templates/user/login.html:21 core/views/user.py:285
+#: core/forms.py:312 core/forms.py:339 core/templates/navigation.html:269
+#: core/templates/navigation.html:282 core/templates/template.html:113
+#: core/templates/user/login.html:21 core/views/user.py:293
#: software/templates/features.html:87 software/templates/features.html:442
msgid "Register"
msgstr "הרשמה"
+#: core/forms.py:360 weight/templates/import_csv_form.html:9
+msgid "Submit"
+msgstr ""
+
#: core/models/language.py:31 core/templates/language/view.html:21
msgid "Language short name"
msgstr "שם שפה מקוצר"
@@ -188,36 +190,36 @@ msgstr "קישור"
msgid "Link to license text or other information"
msgstr ""
-#: core/models/profile.py:57
+#: core/models/profile.py:60
#, python-format
msgid "%(birthdate)s is not a valid birthdate"
msgstr "%(birthdate)s אינו תאריך לידה תקין"
-#: core/models/profile.py:66
+#: core/models/profile.py:69
msgid "Male"
msgstr "זכר"
-#: core/models/profile.py:67
+#: core/models/profile.py:70
msgid "Female"
msgstr "נקבה"
-#: core/models/profile.py:74
+#: core/models/profile.py:77
msgid "Low"
msgstr "נמוך"
-#: core/models/profile.py:75
+#: core/models/profile.py:78
msgid "Medium"
msgstr "בינוני"
-#: core/models/profile.py:76
+#: core/models/profile.py:79
msgid "High"
msgstr "גבוה"
-#: core/models/profile.py:82
+#: core/models/profile.py:85
msgid "Metric (kilogram)"
msgstr "השיטה המטרית (קילוגרמים)"
-#: core/models/profile.py:83
+#: core/models/profile.py:86
msgid "Imperial (pound)"
msgstr "השיטה האימפריאליסטית (פאונדים)"
@@ -325,7 +327,7 @@ msgstr "ממוצע שעות בשבוע"
msgid "Free time"
msgstr "זמן פנוי"
-#: core/models/profile.py:320 nutrition/templates/rate/form.html:66
+#: core/models/profile.py:320 nutrition/templates/rate/form.html:67
msgid "Total daily calories"
msgstr "סה״כ קלוריות ביום"
@@ -363,20 +365,41 @@ msgstr ""
msgid "Enable or disable the trophy system for this user"
msgstr ""
-#: core/models/profile.py:446
+#: core/models/profile.py:457
msgid "The sum of all hours has to be 24"
msgstr ""
-#: core/models/rep_unit.py:36 core/models/weight_unit.py:42
-#: core/templates/user/overview.html:280 core/views/user.py:589
+#: core/models/rep_unit.py:32 i18n.tpl:30
+msgid "Repetitions"
+msgstr "חזרות"
+
+#: core/models/rep_unit.py:33 core/templates/user/overview.html:82
+#: exercises/templates/history/overview.html:30
+msgid "Time"
+msgstr "זמן"
+
+#: core/models/rep_unit.py:34
+msgid "Distance"
+msgstr ""
+
+#: core/models/rep_unit.py:47 core/models/weight_unit.py:42
+#: core/templates/user/overview.html:283 core/views/user.py:605
#: exercises/models/muscle.py:36 gym/models/contract.py:52
#: gym/models/contract.py:103 gym/models/gym.py:46
#: gym/models/user_document.py:84 gym/templates/contract/view.html:50
#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:108
-#: gym/views/gym.py:158 nutrition/templates/ingredient/view.html:151
+#: gym/views/gym.py:158 nutrition/templates/ingredient/view.html:192
msgid "Name"
msgstr "שם"
+#: core/models/rep_unit.py:53
+msgid "Unit Type"
+msgstr ""
+
+#: core/models/rep_unit.py:54
+msgid "The type of unit (repetitions, time, or distance)"
+msgstr ""
+
#: core/templates/403.html:4
msgid "Forbidden!"
msgstr "מחוץ לתחום!"
@@ -404,6 +427,48 @@ msgid ""
"later time. If the problem persists, you can seek help in ways listed below:"
msgstr ""
+#: core/templates/account/email/email_confirmation_message.html:81
+msgid "Almost there!"
+msgstr ""
+
+#: core/templates/account/email/email_confirmation_message.html:85
+#, python-format
+msgid ""
+"You're receiving this email because the user \"%(user_display)s\" has given "
+"your email address to register an account on %(site_domain)s."
+msgstr ""
+
+#: core/templates/account/email/email_confirmation_message.html:93
+msgid ""
+"Your email verification code is listed below. Please enter it in your open "
+"browser window."
+msgstr ""
+
+#: core/templates/account/email/email_confirmation_message.html:100
+msgid "Please click the button below to confirm your email address."
+msgstr ""
+
+#: core/templates/account/email/email_confirmation_message.html:106
+#, fuzzy
+#| msgid "Configuration"
+msgid "Confirm email"
+msgstr "הגדרה"
+
+#: core/templates/account/email/email_confirmation_message.html:110
+#, python-format
+msgid ""
+"The link is valid for %(expire_hours)s hours (until %(date)s, %(time)s). You "
+"can request a new one from your profile settings."
+msgstr ""
+
+#: core/templates/account/email/email_confirmation_message.html:116
+msgid "If the button doesn't work, copy and paste this link into your browser:"
+msgstr ""
+
+#: core/templates/account/email/email_confirmation_message.html:125
+msgid "the wger Team"
+msgstr "צוות wger"
+
#: core/templates/base.html:10
#, python-format
msgid ""
@@ -430,51 +495,7 @@ 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 verification"
-msgstr "אימות כתובת דוא״ל"
-
-#: core/templates/email_verification/confirm_template.html:18
-#, python-format
-msgid "%(username)s, your email was verified"
-msgstr "‏%(username)s, כתובת הדוא״ל שלך מאומתת"
-
-#: 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 "כמעט שם, %(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 "צוות wger"
-
-#: 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/language/overview.html:4 core/templates/navigation.html:344
+#: core/templates/language/overview.html:4 core/templates/navigation.html:341
msgid "Languages"
msgstr "שפות"
@@ -483,16 +504,16 @@ msgid "Nothing found."
msgstr "אין תוצאות."
#: core/templates/language/overview.html:22
-#: nutrition/templates/ingredient/overview.html:38
+#: nutrition/templates/ingredient/overview.html:43
msgid "Add one now."
msgstr "להוסיף כעת."
#: core/templates/language/overview.html:34 core/templates/license/list.html:43
-#: core/templates/repetition_unit/list.html:46
-#: core/templates/user/overview.html:344 core/templates/user/overview.html:384
-#: core/templates/user/overview.html:422
-#: core/templates/weight_unit/list.html:46 core/views/languages.py:74
-#: core/views/license.py:66 core/views/repetition_units.py:66
+#: core/templates/repetition_unit/list.html:44
+#: core/templates/user/overview.html:347 core/templates/user/overview.html:387
+#: core/templates/user/overview.html:425
+#: core/templates/weight_unit/list.html:46 core/views/languages.py:77
+#: core/views/license.py:66 core/views/repetition_units.py:76
#: core/views/weight_units.py:66
#: exercises/templates/categories/admin-overview.html:40
#: exercises/templates/equipment/admin-overview.html:39
@@ -505,14 +526,14 @@ msgstr "להוסיף כעת."
#: gym/templates/gym/member_list.html:264
#: gym/templates/gym/member_list.html:303
#: mailer/templates/mailer/gym/overview.html:43
-#: nutrition/templates/ingredient/overview.html:60
+#: nutrition/templates/ingredient/overview.html:97
msgid "Add"
msgstr "הוספה"
#: core/templates/language/view.html:61 core/templates/user/api_key.html:41
#: core/templates/user/preferences.html:50 gym/models/contract.py:203
#: gym/templates/contract/view.html:41 gym/templates/gym/member_list.html:270
-#: nutrition/templates/ingredient/view.html:206
+#: nutrition/templates/ingredient/view.html:245
msgid "Options"
msgstr "אפשרויות"
@@ -522,9 +543,9 @@ msgstr "רשימת רישיונות"
#: core/templates/license/list.html:30
#: core/templates/repetition_unit/list.html:32
-#: core/templates/user/overview.html:104 core/templates/user/overview.html:136
-#: core/templates/user/overview.html:185 core/templates/user/overview.html:365
-#: core/templates/user/overview.html:404 core/templates/user/overview.html:448
+#: core/templates/user/overview.html:107 core/templates/user/overview.html:139
+#: core/templates/user/overview.html:188 core/templates/user/overview.html:368
+#: core/templates/user/overview.html:407 core/templates/user/overview.html:451
#: core/templates/weight_unit/list.html:32
#: exercises/templates/categories/admin-overview.html:30
#: exercises/templates/equipment/admin-overview.html:30
@@ -536,11 +557,10 @@ msgstr "רשימת רישיונות"
#: gym/templates/gym/member_list.html:284
#: gym/templates/gym/member_list.html:321
#: mailer/templates/mailer/gym/overview.html:30
-#: nutrition/templates/units/list.html:34
msgid "Nothing found"
msgstr "לא נמצא דבר"
-#: core/templates/misc/about.html:4 core/templates/template.html:160
+#: core/templates/misc/about.html:4 core/templates/template.html:150
msgid "Imprint"
msgstr ""
@@ -548,162 +568,157 @@ msgstr ""
msgid "Training"
msgstr "אימון"
-#: core/templates/navigation.html:37 core/templates/user/overview.html:25
+#: core/templates/navigation.html:36 core/templates/user/overview.html:28
msgid "Routines"
msgstr "שגרות"
-#: core/templates/navigation.html:45 core/templates/user/overview.html:70
+#: core/templates/navigation.html:44 core/templates/user/overview.html:73
msgid "Calendar"
msgstr "לוח שנה"
-#: core/templates/navigation.html:55
+#: core/templates/navigation.html:53
msgid "Measurements"
msgstr ""
-#: core/templates/navigation.html:66 gallery/templates/images/overview.html:6
+#: core/templates/navigation.html:64 gallery/templates/images/overview.html:6
msgid "Gallery"
msgstr "גלריה"
-#: core/templates/navigation.html:72
+#: core/templates/navigation.html:74 core/templates/navigation.html:400
+#: trophies/templates/trophies/overview.html:7
+msgid "Trophies"
+msgstr ""
+
+#: core/templates/navigation.html:79
msgid "Workout templates"
msgstr "תבניות אימונים"
-#: core/templates/navigation.html:79
+#: core/templates/navigation.html:86
msgid "Your templates"
msgstr "האימונים שלך"
-#: core/templates/navigation.html:88
+#: core/templates/navigation.html:95
msgid "Public templates"
msgstr "אימונים ציבוריים"
-#: core/templates/navigation.html:96 software/templates/features.html:51
+#: core/templates/navigation.html:103 software/templates/features.html:51
#: software/templates/features.html:480
msgid "Exercises"
msgstr "תרגילים"
-#: core/templates/navigation.html:102 core/templates/navigation.html:176
-#: core/templates/navigation.html:339
+#: core/templates/navigation.html:109 core/templates/navigation.html:336
msgid "Administration"
msgstr "ניהול"
-#: core/templates/navigation.html:106
+#: core/templates/navigation.html:113
msgid "Exercise edit history"
msgstr "היסטוריית עריכת התרגיל"
-#: core/templates/navigation.html:112
+#: core/templates/navigation.html:119
msgid "Equipment"
msgstr "ציוד"
-#: core/templates/navigation.html:118
+#: core/templates/navigation.html:125
msgid "Muscles"
msgstr "שרירים"
-#: core/templates/navigation.html:124
+#: core/templates/navigation.html:131
#: exercises/templates/categories/admin-overview.html:4
msgid "Categories"
msgstr "קטגוריות"
-#: core/templates/navigation.html:139 software/templates/features.html:468
+#: core/templates/navigation.html:146 software/templates/features.html:468
msgid "Nutrition"
msgstr "תזונה"
-#: core/templates/navigation.html:147 core/templates/user/overview.html:144
+#: core/templates/navigation.html:154 core/templates/user/overview.html:147
msgid "Nutrition plans"
msgstr "תכנונים תזונתיים"
-#: core/templates/navigation.html:156
+#: core/templates/navigation.html:163
msgid "BMI calculator"
msgstr "מחשבון BMI"
-#: core/templates/navigation.html:165 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:172 nutrition/templates/rate/form.html:18
msgid "Daily calories calculator"
msgstr "מחשבון קלוריות יומיות"
-#: core/templates/navigation.html:171
+#: core/templates/navigation.html:178
#: nutrition/templates/ingredient/overview.html:10
msgid "Ingredient overview"
msgstr ""
-#: core/templates/navigation.html:180 nutrition/templates/units/list.html:6
-msgid "Ingredient weight units"
-msgstr ""
-
-#: core/templates/navigation.html:196 software/templates/features.html:463
+#: core/templates/navigation.html:193 software/templates/features.html:463
msgid "Body weight"
msgstr "משקל גוף"
-#: core/templates/navigation.html:203 core/templates/user/overview.html:114
+#: core/templates/navigation.html:200 core/templates/user/overview.html:117
msgid "Weight overview"
msgstr ""
-#: core/templates/navigation.html:217
+#: core/templates/navigation.html:214
msgid "About this software"
msgstr "מידע כללי על תוכנה זו"
-#: core/templates/navigation.html:223 software/templates/about_us.html:5
+#: core/templates/navigation.html:220 software/templates/about_us.html:5
msgid "Support & Get Involved"
msgstr "תמיכה ולקיחת חלק"
-#: core/templates/navigation.html:229 software/templates/features.html:528
+#: core/templates/navigation.html:226 software/templates/features.html:528
msgid "REST API"
msgstr ""
-#: core/templates/navigation.html:235 utils/models.py:45
+#: core/templates/navigation.html:232 utils/models.py:45
msgid "License"
msgstr "רישיון"
-#: core/templates/navigation.html:241
+#: core/templates/navigation.html:238
msgid "Developer documentation"
msgstr ""
-#: core/templates/navigation.html:248
+#: core/templates/navigation.html:245
msgid "Get the code"
msgstr ""
-#: core/templates/navigation.html:255 core/templates/template.html:199
-#: software/templates/features.html:603
+#: core/templates/navigation.html:252 core/templates/template.html:202
+#: software/templates/features.html:614
msgid "Translate"
msgstr "תרגום"
-#: core/templates/navigation.html:292 core/templates/user/login.html:30
+#: core/templates/navigation.html:289 core/templates/user/login.html:30
msgid "Reset password"
msgstr "איפוס סיסמה"
-#: core/templates/navigation.html:301 core/templates/navigation.html:329
+#: core/templates/navigation.html:298 core/templates/navigation.html:326
msgid "Logout"
msgstr "התנתקות"
-#: core/templates/navigation.html:320
+#: core/templates/navigation.html:317
msgid "My preferences"
msgstr "ההעדפות שלי"
-#: core/templates/navigation.html:352
+#: core/templates/navigation.html:349
msgid "Licenses"
msgstr "רישיונות"
-#: core/templates/navigation.html:360
+#: core/templates/navigation.html:357
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr ""
-#: core/templates/navigation.html:368 core/templates/weight_unit/list.html:4
-#: nutrition/templates/ingredient/view.html:141
+#: core/templates/navigation.html:365 core/templates/weight_unit/list.html:4
+#: nutrition/templates/ingredient/view.html:182
msgid "Weight units"
msgstr ""
-#: core/templates/navigation.html:376 core/templates/user/list.html:4
+#: core/templates/navigation.html:373 core/templates/user/list.html:4
msgid "User list"
msgstr ""
-#: core/templates/navigation.html:382
+#: core/templates/navigation.html:379
msgid "Gyms"
msgstr "מכוני כושר"
-#: core/templates/navigation.html:403
-#: trophies/templates/trophies/overview.html:7
-msgid "Trophies"
-msgstr ""
-
#: core/templates/registration/password_reset_complete.html:4
msgid "Password reset complete"
msgstr "איפוס הסיסמה הושלם"
@@ -759,25 +774,29 @@ msgstr ""
msgid "next"
msgstr ""
-#: core/templates/template.html:96
+#: core/templates/template.html:86
msgid "Close"
msgstr "סגירה"
-#: core/templates/template.html:112
+#: core/templates/template.html:102
msgid ""
"You are using a guest account, data entered will be deleted after a week."
msgstr ""
-#: core/templates/template.html:117
+#: core/templates/template.html:107
msgid "Create some demo entries"
msgstr ""
-#: core/templates/template.html:165 software/templates/features.html:568
+#: core/templates/template.html:155 software/templates/features.html:568
#: software/templates/tos.html:7
msgid "Terms of service"
msgstr "תנאי השימוש"
-#: core/templates/template_features.html:53 software/templates/features.html:9
+#: core/templates/template.html:181 software/templates/features.html:595
+msgid "Browser language"
+msgstr ""
+
+#: core/templates/template_features.html:46 software/templates/features.html:9
msgid "Features"
msgstr ""
@@ -832,99 +851,94 @@ msgstr "אין חשבון?"
msgid "Forgot password?"
msgstr "שכחת את הסיסמה?"
-#: core/templates/user/overview.html:25 core/templates/user/overview.html:68
-#: core/templates/user/overview.html:112 core/templates/user/overview.html:144
-#: core/templates/user/overview.html:348 core/templates/user/overview.html:390
-#: core/templates/user/overview.html:426
+#: core/templates/user/overview.html:28 core/templates/user/overview.html:71
+#: core/templates/user/overview.html:115 core/templates/user/overview.html:147
+#: core/templates/user/overview.html:351 core/templates/user/overview.html:393
+#: core/templates/user/overview.html:429
#, python-format
msgid "last %(number)s"
msgstr ""
-#: core/templates/user/overview.html:27 core/templates/user/overview.html:146
-#: core/templates/user/overview.html:343 core/templates/user/overview.html:382
-#: core/templates/user/overview.html:421 gym/templates/gym/member_list.html:226
+#: core/templates/user/overview.html:30 core/templates/user/overview.html:149
+#: core/templates/user/overview.html:346 core/templates/user/overview.html:385
+#: core/templates/user/overview.html:424 gym/templates/gym/member_list.html:226
#: gym/templates/gym/member_list.html:262
#: gym/templates/gym/member_list.html:302
msgid "Overview"
msgstr ""
-#: core/templates/user/overview.html:34 core/templates/user/overview.html:76
-#: core/templates/user/overview.html:120 core/templates/user/overview.html:152
+#: core/templates/user/overview.html:37 core/templates/user/overview.html:79
+#: core/templates/user/overview.html:123 core/templates/user/overview.html:155
#: manager/helpers.py:88 software/templates/about_us.html:170
#: weight/templates/import_csv_preview.html:13
#: weight/templates/import_csv_preview.html:42 weight/views.py:54
msgid "Date"
msgstr "תאריך"
-#: core/templates/user/overview.html:35 core/templates/user/overview.html:153
+#: core/templates/user/overview.html:38 core/templates/user/overview.html:156
#: gym/models/contract.py:58 gym/models/contract.py:109
msgid "Description"
msgstr "תיאור"
-#: core/templates/user/overview.html:36
+#: core/templates/user/overview.html:39
msgid "Number of logs (days)"
msgstr ""
-#: core/templates/user/overview.html:37 core/views/user.py:590
+#: core/templates/user/overview.html:40 core/views/user.py:606
#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:158
msgid "Last activity"
msgstr "פעילות אחרונה"
-#: core/templates/user/overview.html:58
+#: core/templates/user/overview.html:61
msgid "No workouts found."
msgstr "לא נמצאו אימונים."
-#: core/templates/user/overview.html:68
+#: core/templates/user/overview.html:71
msgid "Log"
msgstr ""
-#: core/templates/user/overview.html:77
+#: core/templates/user/overview.html:80
msgid "General impression"
msgstr ""
-#: core/templates/user/overview.html:78 core/templates/user/overview.html:390
+#: core/templates/user/overview.html:81 core/templates/user/overview.html:393
msgid "Notes"
msgstr "הערות"
-#: core/templates/user/overview.html:79
-#: exercises/templates/history/overview.html:30
-msgid "Time"
-msgstr "זמן"
-
-#: core/templates/user/overview.html:112 core/templates/user/overview.html:121
+#: core/templates/user/overview.html:115 core/templates/user/overview.html:124
#: manager/helpers.py:89 weight/templates/import_csv_preview.html:14
#: weight/templates/import_csv_preview.html:43 weight/views.py:54
msgid "Weight"
msgstr "משקל"
-#: core/templates/user/overview.html:154
-#: nutrition/templates/ingredient/view.html:51 nutrition/views/plan.py:245
+#: core/templates/user/overview.html:157
+#: nutrition/templates/ingredient/view.html:52 nutrition/views/plan.py:244
msgid "Energy"
msgstr "אנרגיה"
-#: core/templates/user/overview.html:155
-#: nutrition/templates/ingredient/view.html:58 nutrition/views/plan.py:251
+#: core/templates/user/overview.html:158
+#: nutrition/templates/ingredient/view.html:59 nutrition/views/plan.py:250
msgid "Protein"
msgstr "חלבונים"
-#: core/templates/user/overview.html:156
-#: nutrition/templates/ingredient/view.html:64 nutrition/views/plan.py:259
+#: core/templates/user/overview.html:159
+#: nutrition/templates/ingredient/view.html:65 nutrition/views/plan.py:258
msgid "Carbohydrates"
msgstr ""
-#: core/templates/user/overview.html:157
-#: nutrition/templates/ingredient/view.html:80 nutrition/views/plan.py:273
+#: core/templates/user/overview.html:160
+#: nutrition/templates/ingredient/view.html:81 nutrition/views/plan.py:272
msgid "Fat"
msgstr "שומנים"
-#: core/templates/user/overview.html:170
-#: nutrition/templates/ingredient/view.html:53
+#: core/templates/user/overview.html:173
+#: nutrition/templates/ingredient/view.html:54
msgid "kcal"
msgstr "ק׳ קלוריות"
-#: core/templates/user/overview.html:201 core/templates/user/overview.html:340
-#: core/templates/user/overview.html:379 core/templates/user/overview.html:418
-#: core/templates/user/overview.html:463 gym/templates/gym/list.html:45
+#: core/templates/user/overview.html:204 core/templates/user/overview.html:343
+#: core/templates/user/overview.html:382 core/templates/user/overview.html:421
+#: core/templates/user/overview.html:466 gym/templates/gym/list.html:45
#: gym/templates/gym/member_list.html:91 gym/templates/gym/member_list.html:149
#: gym/templates/gym/member_list.html:187
#: gym/templates/gym/member_list.html:223
@@ -933,109 +947,113 @@ msgstr "ק׳ קלוריות"
msgid "Actions"
msgstr "פעולו"
-#: core/templates/user/overview.html:210
+#: core/templates/user/overview.html:213
msgid "Deactivate user"
msgstr "נטרול חשבון"
-#: core/templates/user/overview.html:214
+#: core/templates/user/overview.html:217
msgid "Activate user"
msgstr "הפעלת חשבון"
-#: core/templates/user/overview.html:223
+#: core/templates/user/overview.html:226
msgid "Reset user password"
msgstr ""
-#: core/templates/user/overview.html:227 gym/templates/gym/member_list.html:30
+#: core/templates/user/overview.html:230 gym/templates/gym/member_list.html:30
msgid "Roles"
msgstr ""
-#: core/templates/user/overview.html:243
+#: core/templates/user/overview.html:246
msgid "Password reset confirmation"
msgstr ""
-#: core/templates/user/overview.html:247
+#: core/templates/user/overview.html:250
msgid "Do you really want to change this user&#39;s password?"
msgstr ""
-#: core/templates/user/overview.html:250
+#: core/templates/user/overview.html:253
#: exercises/templates/history/overview.html:106
+#: nutrition/templates/ingredient/view.html:148
+#: nutrition/templates/ingredient/view.html:160
msgid "No"
msgstr "לא"
-#: core/templates/user/overview.html:251
+#: core/templates/user/overview.html:254
#: exercises/templates/history/overview.html:99
+#: nutrition/templates/ingredient/view.html:146
+#: nutrition/templates/ingredient/view.html:158
msgid "Yes"
msgstr "כן"
-#: core/templates/user/overview.html:272 gym/templates/gym/member_list.html:105
+#: core/templates/user/overview.html:275 gym/templates/gym/member_list.html:105
msgid "Details"
msgstr "פרטים"
-#: core/templates/user/overview.html:276 gym/views/export.py:57
-#: manager/helpers.py:89 nutrition/views/plan.py:151
-#: nutrition/views/plan.py:157
+#: core/templates/user/overview.html:279 gym/views/export.py:57
+#: manager/helpers.py:89 nutrition/views/plan.py:150
+#: nutrition/views/plan.py:156
msgid "Nr."
msgstr ""
-#: core/templates/user/overview.html:298 gym/models/contract.py:287
+#: core/templates/user/overview.html:301 gym/models/contract.py:287
#: gym/models/gym.py:50 gym/templates/contract/view.html:75
#: gym/templates/gym/member_list.html:112 gym/views/export.py:68
msgid "Phone"
msgstr "טלפון"
-#: core/templates/user/overview.html:302 gym/templates/contract/view.html:87
+#: core/templates/user/overview.html:305 gym/templates/contract/view.html:87
#: gym/templates/gym/member_list.html:130
msgid "Address"
msgstr "כתובת"
-#: core/templates/user/overview.html:313
+#: core/templates/user/overview.html:316
msgid "Registered"
msgstr ""
-#: core/templates/user/overview.html:317
+#: core/templates/user/overview.html:320
msgid "Last login"
msgstr "כניסה אחרונה"
-#: core/templates/user/overview.html:322
+#: core/templates/user/overview.html:325
msgid "Status"
msgstr "סטטוס"
-#: core/templates/user/overview.html:325
+#: core/templates/user/overview.html:328
msgid "Active"
msgstr "פעיל"
-#: core/templates/user/overview.html:327
+#: core/templates/user/overview.html:330
msgid "Inactive"
msgstr "לא פעיל"
-#: core/templates/user/overview.html:348 gym/templates/contract/list.html:4
+#: core/templates/user/overview.html:351 gym/templates/contract/list.html:4
#: gym/templates/gym/member_list.html:218
msgid "Contracts"
msgstr ""
-#: core/templates/user/overview.html:426 gym/templates/document/list.html:4
+#: core/templates/user/overview.html:429 gym/templates/document/list.html:4
msgid "Documents"
msgstr ""
-#: core/templates/user/overview.html:433 gym/templates/document/list.html:33
+#: core/templates/user/overview.html:436 gym/templates/document/list.html:33
msgid "Download"
msgstr "הורדה"
-#: core/templates/user/overview.html:474 gym/views/admin_config.py:44
+#: core/templates/user/overview.html:477 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:477 gym/models/user_config.py:92
+#: core/templates/user/overview.html:480 gym/models/user_config.py:92
msgid "Include in inactive overview"
msgstr ""
-#: core/templates/user/overview.html:510
+#: core/templates/user/overview.html:513
#, python-format
msgid "Admin login is only available for users in %(gym_name)s"
msgstr ""
-#: core/templates/user/overview.html:514
+#: core/templates/user/overview.html:517
msgid "Log in as this user"
msgstr ""
@@ -1059,7 +1077,7 @@ msgstr ""
msgid "You need to verify your email to contribute exercises"
msgstr ""
-#: core/templates/user/preferences.html:55 core/views/user.py:601
+#: core/templates/user/preferences.html:55 core/views/user.py:617
msgid "Change password"
msgstr ""
@@ -1067,23 +1085,23 @@ msgstr ""
msgid "Already have an account?"
msgstr ""
-#: core/templatetags/wger_extras.py:142 i18n.tpl:38
+#: core/templatetags/wger_extras.py:142 i18n.tpl:39
msgid "kg"
msgstr ""
#: core/templatetags/wger_extras.py:144
-#: nutrition/templates/ingredient/view.html:60
-#: nutrition/templates/ingredient/view.html:66
-#: nutrition/templates/ingredient/view.html:73
-#: nutrition/templates/ingredient/view.html:82
-#: nutrition/templates/ingredient/view.html:89
-#: nutrition/templates/ingredient/view.html:111
-#: nutrition/templates/ingredient/view.html:121
+#: nutrition/templates/ingredient/view.html:61
+#: nutrition/templates/ingredient/view.html:67
+#: nutrition/templates/ingredient/view.html:74
+#: nutrition/templates/ingredient/view.html:83
+#: nutrition/templates/ingredient/view.html:90
+#: nutrition/templates/ingredient/view.html:112
+#: nutrition/templates/ingredient/view.html:122
msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr ""
-#: core/templatetags/wger_extras.py:147 i18n.tpl:39
+#: core/templatetags/wger_extras.py:147 i18n.tpl:40
msgid "lb"
msgstr ""
@@ -1092,84 +1110,83 @@ msgctxt "weight unit, i.e. ounces"
msgid "oz"
msgstr ""
-#: core/views/languages.py:85 exercises/views/categories.py:122
+#: core/views/languages.py:88 exercises/views/categories.py:122
#: exercises/views/equipment.py:103 exercises/views/muscles.py:99
-#: nutrition/views/ingredient.py:120 nutrition/views/unit.py:110
+#: nutrition/views/ingredient.py:125
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
+#: core/views/languages.py:96 core/views/license.py:103
+#: core/views/repetition_units.py:114 core/views/weight_units.py:115
#: exercises/views/categories.py:128 exercises/views/muscles.py:106
#: gallery/views/images.py:124 gym/views/admin_notes.py:196
#: gym/views/document.py:206 gym/views/gym.py:481
-#: nutrition/views/ingredient.py:127 nutrition/views/unit.py:117
+#: nutrition/views/ingredient.py:132
#, python-brace-format
msgid "Delete {0}?"
msgstr ""
-#: core/views/languages.py:111 core/views/license.py:85
-#: core/views/repetition_units.py:86 core/views/user.py:464
+#: core/views/languages.py:114 core/views/license.py:85
+#: core/views/repetition_units.py:96 core/views/user.py:480
#: core/views/weight_units.py:86 exercises/views/categories.py:98
#: exercises/views/equipment.py:81 exercises/views/muscles.py:87
#: gym/views/admin_notes.py:161 gym/views/config.py:68
#: gym/views/contract.py:186 gym/views/contract_option.py:123
#: gym/views/contract_type.py:123 gym/views/document.py:171
-#: gym/views/gym.py:463 nutrition/views/ingredient.py:146
-#: nutrition/views/unit.py:143
+#: gym/views/gym.py:463 nutrition/views/ingredient.py:151
#, python-brace-format
msgid "Edit {0}"
msgstr ""
-#: core/views/misc.py:74
+#: core/views/misc.py:73
msgid ""
"We have created sample workout, workout schedules, weight logs, (body) "
"weight and nutrition plan entries so you can better see what this site can "
"do. Feel free to edit or delete them!"
msgstr ""
-#: core/views/user.py:143
+#: core/views/user.py:145
#, python-brace-format
msgid "Account \"{0}\" was successfully deleted"
msgstr ""
-#: core/views/user.py:279
+#: core/views/user.py:287
msgid "You were successfully registered"
msgstr ""
-#: core/views/user.py:341
+#: core/views/user.py:357
msgid "Settings successfully updated"
msgstr ""
-#: core/views/user.py:380
+#: core/views/user.py:396
msgid "The user was successfully deactivated"
msgstr ""
-#: core/views/user.py:417
+#: core/views/user.py:433
msgid "The user was successfully activated"
msgstr ""
-#: core/views/user.py:432
+#: core/views/user.py:448
msgid "Edit user"
msgstr ""
-#: core/views/user.py:587 gym/templates/gym/member_list.html:26
+#: core/views/user.py:603 gym/templates/gym/member_list.html:26
#: gym/views/gym.py:158
msgid "ID"
msgstr ""
-#: core/views/user.py:588 gym/forms.py:95 gym/templates/contract/view.html:55
+#: core/views/user.py:604 gym/forms.py:95 gym/templates/contract/view.html:55
#: gym/templates/gym/member_list.html:27 gym/views/export.py:59
#: gym/views/gym.py:158 gym/views/gym.py:217
msgid "Username"
msgstr ""
-#: core/views/user.py:591 gym/templates/gym/new_user.html:34
+#: core/views/user.py:607 gym/templates/gym/new_user.html:34
#: gym/views/export.py:58 gym/views/gym.py:217
msgid "Gym"
msgstr ""
-#: core/views/user.py:650
+#: core/views/user.py:678
#, python-format
msgid "A verification email was sent to %(email)s"
msgstr ""
@@ -1186,16 +1203,16 @@ msgstr ""
msgid "A more basic name for the muscle"
msgstr ""
-#: exercises/models/video.py:50
+#: exercises/models/video.py:52
#, python-format
msgid "Maximum file size is %(size)sMB."
msgstr ""
-#: exercises/models/video.py:57 exercises/models/video.py:65
+#: exercises/models/video.py:59 exercises/models/video.py:67
msgid "File type is not supported"
msgstr ""
-#: exercises/models/video.py:70
+#: exercises/models/video.py:72
msgid "File is not a valid video"
msgstr ""
@@ -1266,7 +1283,11 @@ msgstr ""
msgid "Add muscle"
msgstr ""
-#: gallery/templates/images/overview.html:72
+#: gallery/forms.py:35
+msgid "If date is left empty, it will be read from the image instead"
+msgstr ""
+
+#: gallery/templates/images/overview.html:69
msgid "Add image"
msgstr ""
@@ -1332,7 +1353,7 @@ msgid "Contract type"
msgstr ""
#: gym/models/contract.py:211 gym/templates/contract/view.html:59
-#: nutrition/forms.py:58
+#: nutrition/forms.py:67
msgid "Amount"
msgstr ""
@@ -1508,7 +1529,7 @@ msgstr ""
msgid "Add member"
msgstr ""
-#: gym/templates/gym/new_user.html:48 nutrition/templates/rate/form.html:120
+#: gym/templates/gym/new_user.html:48 nutrition/templates/rate/form.html:121
msgid "Info"
msgstr ""
@@ -1675,10 +1696,6 @@ msgstr ""
msgid "Quads"
msgstr ""
-#: i18n.tpl:30
-msgid "Repetitions"
-msgstr "חזרות"
-
#: i18n.tpl:31
msgid "Resistance band"
msgstr ""
@@ -1707,189 +1724,193 @@ msgstr ""
msgid "Until Failure"
msgstr ""
-#: i18n.tpl:40
-msgid "none (bodyweight exercise)"
+#: i18n.tpl:38
+msgid "Meters"
msgstr ""
#: i18n.tpl:41
-msgid "Beginner"
+msgid "none (bodyweight exercise)"
msgstr ""
#: i18n.tpl:42
-msgid "Consistent"
+msgid "Beginner"
msgstr ""
#: i18n.tpl:43
-msgid "Dedicated"
+msgid "Consistent"
msgstr ""
#: i18n.tpl:44
-msgid "Obsessed"
+msgid "Dedicated"
msgstr ""
#: i18n.tpl:45
-msgid "Legend"
+msgid "Obsessed"
msgstr ""
#: i18n.tpl:46
-msgid "Veteran"
+msgid "Legend"
msgstr ""
#: i18n.tpl:47
-msgid "Titan"
+msgid "Veteran"
msgstr ""
#: i18n.tpl:48
-msgid "Unstoppable"
+msgid "Titan"
msgstr ""
#: i18n.tpl:49
-msgid "Weekend Warrior"
+msgid "Unstoppable"
msgstr ""
#: i18n.tpl:50
-msgid "Elephant lifter"
+msgid "Weekend Warrior"
msgstr ""
#: i18n.tpl:51
-msgid "Bus lifter"
+msgid "Elephant lifter"
msgstr ""
#: i18n.tpl:52
-msgid "Plane lifter"
+msgid "Bus lifter"
msgstr ""
#: i18n.tpl:53
-msgid "Blue whale lifter"
+msgid "Plane lifter"
msgstr ""
#: i18n.tpl:54
-msgid "Space Station lifter"
+msgid "Blue whale lifter"
msgstr ""
#: i18n.tpl:55
-msgid "Millionaire"
+msgid "Space Station lifter"
msgstr ""
#: i18n.tpl:56
-msgid "Atlas"
+msgid "Millionaire"
msgstr ""
#: i18n.tpl:57
-msgid "Early Bird"
+msgid "Atlas"
msgstr ""
#: i18n.tpl:58
-msgid "Night Owl"
+msgid "Early Bird"
msgstr ""
#: i18n.tpl:59
-msgid "New Year, New Me"
+msgid "Night Owl"
msgstr ""
#: i18n.tpl:60
-msgid "Phoenix"
+msgid "New Year, New Me"
msgstr ""
#: i18n.tpl:61
+msgid "Phoenix"
+msgstr ""
+
+#: i18n.tpl:62
#, fuzzy
#| msgid "Personal data"
msgid "Personal Record"
msgstr "נתונים אישיים"
-#: i18n.tpl:62
+#: i18n.tpl:63
msgid "Complete your first workout"
msgstr ""
-#: i18n.tpl:63
+#: i18n.tpl:64
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 10 workouts"
msgstr "אימון לדוגמא"
-#: i18n.tpl:64
+#: i18n.tpl:65
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 50 workouts"
msgstr "אימון לדוגמא"
-#: i18n.tpl:65
+#: i18n.tpl:66
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 100 workouts"
msgstr "אימון לדוגמא"
-#: i18n.tpl:66
+#: i18n.tpl:67
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 200 workouts"
msgstr "אימון לדוגמא"
-#: i18n.tpl:67
+#: i18n.tpl:68
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 500 workouts"
msgstr "אימון לדוגמא"
-#: i18n.tpl:68
+#: i18n.tpl:69
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 1000 workouts"
msgstr "אימון לדוגמא"
-#: i18n.tpl:69
+#: i18n.tpl:70
msgid "Maintain a 30-day workout streak"
msgstr ""
-#: i18n.tpl:70
+#: i18n.tpl:71
msgid "Work out on Saturday and Sunday for 4 consecutive weekends"
msgstr ""
-#: i18n.tpl:71
+#: i18n.tpl:72
msgid "Lift a cumulative total of 5.000 kg"
msgstr ""
-#: i18n.tpl:72
+#: i18n.tpl:73
msgid "Lift a cumulative total of 20.000 kg"
msgstr ""
-#: i18n.tpl:73
+#: i18n.tpl:74
msgid "Lift a cumulative total of 50.000 kg"
msgstr ""
-#: i18n.tpl:74
+#: i18n.tpl:75
msgid "Lift a cumulative total of 150.000 kg"
msgstr ""
-#: i18n.tpl:75
+#: i18n.tpl:76
msgid "Lift a cumulative total of 450.000 kg"
msgstr ""
-#: i18n.tpl:76
+#: i18n.tpl:77
msgid "Lift a cumulative total of 1.000.000 kg"
msgstr ""
-#: i18n.tpl:77
+#: i18n.tpl:78
msgid "Lift a cumulative total of 10.000.000 kg"
msgstr ""
-#: i18n.tpl:78
+#: i18n.tpl:79
msgid "Complete a workout before 6:00 AM"
msgstr ""
-#: i18n.tpl:79
+#: i18n.tpl:80
msgid "Complete a workout after 9:00 PM"
msgstr ""
-#: i18n.tpl:80
+#: i18n.tpl:81
msgid "Work out on January 1st"
msgstr ""
-#: i18n.tpl:81
+#: i18n.tpl:82
msgid "Return to training after being inactive for 30 days"
msgstr ""
-#: i18n.tpl:82
+#: i18n.tpl:83
msgid "Achieve a new Personal Record on any exercise"
msgstr ""
@@ -1971,7 +1992,7 @@ msgstr ""
msgid "Routine will expire soon"
msgstr ""
-#: manager/models/routine.py:153 manager/models/session.py:145
+#: manager/models/routine.py:154 manager/models/session.py:145
msgid "The start time cannot be after the end time."
msgstr ""
@@ -2043,36 +2064,58 @@ msgstr ""
msgid "Workout for %s"
msgstr ""
-#: nutrition/forms.py:62
+#: nutrition/extract_info/off.py:72 nutrition/extract_info/off.py:91
+msgid "Serving"
+msgstr ""
+
+#: nutrition/forms.py:71 nutrition/forms.py:208
msgid "Unit"
msgstr ""
-#: nutrition/forms.py:170 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:179 nutrition/templates/rate/form.html:77
msgid "Basic caloric intake"
msgstr ""
-#: nutrition/forms.py:171
+#: nutrition/forms.py:180
msgid "Your basic caloric intake as calculated for your data"
msgstr ""
-#: nutrition/forms.py:176
+#: nutrition/forms.py:185
msgid "Additional calories"
msgstr ""
-#: nutrition/forms.py:178
+#: nutrition/forms.py:187
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
msgstr ""
#: nutrition/forms.py:209
+msgid "grams (g)"
+msgstr ""
+
+#: nutrition/forms.py:219
msgid "Ingredient"
msgstr ""
-#: nutrition/forms.py:213
+#: nutrition/forms.py:223
msgid "Also search for names in English"
msgstr ""
+#: nutrition/forms.py:239
+msgid "Quantity"
+msgstr ""
+
+#: nutrition/forms.py:241
+msgid "Enter a quantity and choose grams (g) or one of the serving units."
+msgstr ""
+
+#: nutrition/models/ingredient.py:526
+#, fuzzy
+#| msgid "Nutrition"
+msgid "Portion"
+msgstr "תזונה"
+
#: nutrition/templates/ingredient/email_new.tpl:1
#, python-format
msgid ""
@@ -2110,59 +2153,86 @@ msgid ""
"sucessfully."
msgstr ""
-#: nutrition/templates/ingredient/overview.html:38
+#: nutrition/templates/ingredient/overview.html:32
+#: nutrition/templates/ingredient/overview.html:68
+#: nutrition/templates/ingredient/view.html:143
+msgid "Vegan"
+msgstr ""
+
+#: nutrition/templates/ingredient/overview.html:34
+#: nutrition/templates/ingredient/overview.html:79
+#: nutrition/templates/ingredient/view.html:155
+msgid "Vegetarian"
+msgstr ""
+
+#: nutrition/templates/ingredient/overview.html:43
msgid "No ingredients."
msgstr ""
-#: nutrition/templates/ingredient/overview.html:49
+#: nutrition/templates/ingredient/overview.html:54
msgid "Search"
msgstr ""
-#: nutrition/templates/ingredient/view.html:45 nutrition/views/plan.py:237
+#: nutrition/templates/ingredient/overview.html:57
+msgid "Filter"
+msgstr ""
+
+#: nutrition/templates/ingredient/overview.html:83
+msgid "Apply"
+msgstr ""
+
+#: nutrition/templates/ingredient/overview.html:85
+msgid "Reset"
+msgstr ""
+
+#: nutrition/templates/ingredient/view.html:46 nutrition/views/plan.py:236
msgid "Macronutrients"
msgstr ""
-#: nutrition/templates/ingredient/view.html:54
+#: nutrition/templates/ingredient/view.html:55
msgid "kJ"
msgstr ""
-#: nutrition/templates/ingredient/view.html:70 nutrition/views/plan.py:267
+#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:266
msgid "Sugar content in carbohydrates"
msgstr ""
-#: nutrition/templates/ingredient/view.html:75
-#: nutrition/templates/ingredient/view.html:91
-#: nutrition/templates/ingredient/view.html:113
-#: nutrition/templates/ingredient/view.html:123
+#: nutrition/templates/ingredient/view.html:76
+#: nutrition/templates/ingredient/view.html:92
+#: nutrition/templates/ingredient/view.html:114
+#: nutrition/templates/ingredient/view.html:124
msgid "n.A."
msgstr ""
-#: nutrition/templates/ingredient/view.html:86 nutrition/views/plan.py:281
+#: nutrition/templates/ingredient/view.html:87 nutrition/views/plan.py:280
msgid "Saturated fat content in fats"
msgstr ""
-#: nutrition/templates/ingredient/view.html:102
+#: nutrition/templates/ingredient/view.html:103
msgid "Others"
msgstr ""
-#: nutrition/templates/ingredient/view.html:108 nutrition/views/plan.py:287
+#: nutrition/templates/ingredient/view.html:109 nutrition/views/plan.py:286
msgid "Fiber"
msgstr ""
-#: nutrition/templates/ingredient/view.html:118 nutrition/views/plan.py:293
+#: nutrition/templates/ingredient/view.html:119 nutrition/views/plan.py:292
msgid "Sodium"
msgstr ""
-#: nutrition/templates/ingredient/view.html:143
-#: nutrition/templates/units/list.html:50 nutrition/views/unit.py:86
+#: nutrition/templates/ingredient/view.html:136
+msgid "Dietary information"
+msgstr ""
+
+#: nutrition/templates/ingredient/view.html:184
msgid "Add new weight unit"
msgstr ""
-#: nutrition/templates/rate/form.html:25
+#: nutrition/templates/rate/form.html:26
msgid "Basal metabolic rate"
msgstr ""
-#: nutrition/templates/rate/form.html:26
+#: nutrition/templates/rate/form.html:27
msgid ""
"The basal metabolic rate is the amount of energy expended daily\n"
"at rest. This is the minimum energy needed for the body to function, without "
@@ -2170,36 +2240,36 @@ msgid ""
"additional physical activity."
msgstr ""
-#: nutrition/templates/rate/form.html:37
+#: nutrition/templates/rate/form.html:38
msgid "Your basic metabolic rate is: "
msgstr ""
-#: nutrition/templates/rate/form.html:47
+#: nutrition/templates/rate/form.html:48
msgid "Physical activities"
msgstr ""
-#: nutrition/templates/rate/form.html:48
+#: nutrition/templates/rate/form.html:49
msgid ""
"The physical activity level (PAL) is a factor used to to express\n"
"the additional physical activity and is used to calculate the total energy\n"
"required per day."
msgstr ""
-#: nutrition/templates/rate/form.html:59
+#: nutrition/templates/rate/form.html:60
msgid "Factor for daily activities: "
msgstr ""
-#: nutrition/templates/rate/form.html:67
+#: nutrition/templates/rate/form.html:68
msgid ""
"The base caloric intake is the amount of calories your metabolism\n"
"needs based on your level of physical activity."
msgstr ""
-#: nutrition/templates/rate/form.html:81
+#: nutrition/templates/rate/form.html:82
msgid "Calculate basic caloric intake"
msgstr ""
-#: nutrition/templates/rate/form.html:88
+#: nutrition/templates/rate/form.html:89
msgid ""
"The total calories are the actual total calories per day. This\n"
"might include e.g. a surplus or deficit if you are bulking or cutting. "
@@ -2207,69 +2277,69 @@ msgid ""
"you might just enter yourself the amount of calories if you know the value."
msgstr ""
-#: nutrition/templates/rate/form.html:102
+#: nutrition/templates/rate/form.html:103
msgid "Transfer basic intake to total daily calories"
msgstr ""
-#: nutrition/templates/rate/form.html:106
+#: nutrition/templates/rate/form.html:107
msgid "Add additional calories to total daily calories"
msgstr ""
-#: nutrition/templates/rate/form.html:110
+#: nutrition/templates/rate/form.html:111
msgid "Save total calories to profile"
msgstr ""
-#: nutrition/templates/rate/form.html:121
+#: nutrition/templates/rate/form.html:122
msgid ""
"Please note that these calculations can only be an\n"
"approximation. If you base your nutrition plan on these values, observe\n"
"yourself for some weeks and change the total amount if needed."
msgstr ""
-#: nutrition/views/ingredient.py:158
+#: nutrition/views/ingredient.py:163
msgid "Add a new ingredient"
msgstr ""
-#: nutrition/views/plan.py:128
+#: nutrition/views/plan.py:127
msgid "Nutritional plan"
msgstr ""
-#: nutrition/views/plan.py:130
+#: nutrition/views/plan.py:129
#, python-format
msgid "Nutritional plan for %s"
msgstr ""
-#: nutrition/views/plan.py:202
+#: nutrition/views/plan.py:201
msgid "<i>This is an empty plan, what did you expect on the PDF?</i>"
msgstr ""
-#: nutrition/views/plan.py:230
+#: nutrition/views/plan.py:229
#, fuzzy
#| msgid "Sample nutritional plan"
msgid "Nutritional data"
msgstr "דיאטה לדוגמא"
-#: nutrition/views/plan.py:238
+#: nutrition/views/plan.py:237
msgid "Total"
msgstr ""
-#: nutrition/views/plan.py:239
+#: nutrition/views/plan.py:238
msgid "Percent of energy"
msgstr ""
-#: nutrition/views/plan.py:240
+#: nutrition/views/plan.py:239
msgid "g per body kg"
msgstr ""
-#: nutrition/views/unit_ingredient.py:69
+#: nutrition/views/unit_ingredient.py:64
msgid "Add a new weight unit"
msgstr ""
-#: nutrition/views/unit_ingredient.py:106
+#: nutrition/views/unit_ingredient.py:99
msgid "Edit a weight unit to ingredient connection"
msgstr ""
-#: nutrition/views/unit_ingredient.py:138
+#: nutrition/views/unit_ingredient.py:129
msgid "Delete?"
msgstr ""
@@ -2616,7 +2686,7 @@ msgstr ""
msgid "Translation"
msgstr ""
-#: utils/generic_views.py:263
+#: utils/generic_views.py:246
msgid "Yes, delete"
msgstr ""
@@ -2667,10 +2737,6 @@ msgstr ""
msgid "Import weight logs"
msgstr ""
-#: weight/templates/import_csv_form.html:9
-msgid "Submit"
-msgstr ""
-
#: weight/templates/import_csv_form.html:15
msgid ""
"Use this import field to import your weight logs into Workout\n"
@@ -2766,6 +2832,20 @@ msgstr ""
msgid "Re-Submit"
msgstr ""
+#~ msgid "Email verification"
+#~ msgstr "אימות כתובת דוא״ל"
+
+#, python-format
+#~ msgid "%(username)s, your email was verified"
+#~ msgstr "‏%(username)s, כתובת הדוא״ל שלך מאומתת"
+
+#~ msgid "Email Confirmation"
+#~ msgstr "אימות דוא״ל"
+
+#, python-format
+#~ msgid "You are almost there, %(username)s!"
+#~ msgstr "כמעט שם, %(username)s!"
+
#~ msgid "Comment"
#~ msgstr "הערה"
diff --git a/wger/locale/hi/LC_MESSAGES/django.po b/wger/locale/hi/LC_MESSAGES/django.po
index 342d02f96..a6da4fe15 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: 2026-01-17 14:03+0000\n"
+"POT-Creation-Date: 2026-04-10 10:20+0000\n"
"PO-Revision-Date: 2025-12-01 06:00+0000\n"
"Last-Translator: Madhav Agarwal <[email protected]>\n"
"Language-Team: Hindi <https://hosted.weblate.org/projects/wger/web/hi/>\n"
@@ -33,7 +33,7 @@ msgstr ""
#: config/views/gym_config.py:42 core/templates/language/view.html:64
#: core/templates/license/list.html:17
#: core/templates/repetition_unit/list.html:18
-#: core/templates/user/overview.html:204 core/templates/user/overview.html:467
+#: core/templates/user/overview.html:207 core/templates/user/overview.html:470
#: core/templates/weight_unit/list.html:18
#: exercises/templates/categories/admin-overview.html:17
#: exercises/templates/equipment/admin-overview.html:17
@@ -45,30 +45,29 @@ msgstr ""
#: gym/templates/gym/list.html:19 gym/templates/gym/list.html:48
#: gym/templates/gym/member_list.html:94 gym/templates/gym/member_list.html:152
#: gym/templates/gym/member_list.html:190
-#: nutrition/templates/ingredient/view.html:164
-#: nutrition/templates/ingredient/view.html:209
-#: nutrition/templates/units/list.html:19
+#: nutrition/templates/ingredient/view.html:205
+#: nutrition/templates/ingredient/view.html:248
msgid "Edit"
msgstr "संपादन"
-#: core/forms.py:91 core/templates/navigation.html:271
-#: core/templates/navigation.html:278 core/templates/user/login.html:4
+#: core/forms.py:89 core/templates/navigation.html:268
+#: core/templates/navigation.html:275 core/templates/user/login.html:4
#: core/templates/user/registration_sidebar.html:12
#: software/templates/features.html:82 software/templates/features.html:448
msgid "Login"
msgstr "लॉग इन करें"
-#: core/forms.py:130 core/forms.py:244 gym/views/export.py:61
+#: core/forms.py:128 core/forms.py:242 gym/views/export.py:61
#: gym/views/gym.py:217
msgid "First name"
msgstr "पहला नाम"
-#: core/forms.py:131 core/forms.py:245 core/templates/user/overview.html:284
+#: core/forms.py:129 core/forms.py:243 core/templates/user/overview.html:287
#: gym/views/export.py:62 gym/views/gym.py:217
msgid "Last name"
msgstr "उपनाम"
-#: core/forms.py:133 core/forms.py:210 core/templates/user/overview.html:288
+#: core/forms.py:131 core/forms.py:208 core/templates/user/overview.html:291
#: gym/models/contract.py:256 gym/models/gym.py:58
#: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:116
#: gym/templates/gym/new_user.html:30 gym/views/export.py:60
@@ -78,53 +77,53 @@ msgstr "उपनाम"
msgid "Email"
msgstr "ईमेल"
-#: core/forms.py:134
+#: core/forms.py:132
msgid "Used for password resets and, optionally, e-mail reminders."
msgstr ""
-#: core/forms.py:138 core/models/profile.py:222
+#: core/forms.py:136 core/models/profile.py:222
#: gym/templates/gym/new_user.html:38
msgid "Date of Birth"
msgstr ""
-#: core/forms.py:177
+#: core/forms.py:175
msgid "Personal data"
msgstr ""
-#: core/forms.py:189
+#: core/forms.py:187
msgid "Workout reminders"
msgstr ""
-#: core/forms.py:196
+#: core/forms.py:194
msgid "Other settings"
msgstr ""
-#: core/forms.py:204 core/views/user.py:614 core/views/user.py:629
-#: core/views/user.py:641 gym/forms.py:73 utils/generic_views.py:143
+#: core/forms.py:202 core/views/user.py:630 core/views/user.py:654
+#: core/views/user.py:668 gym/forms.py:73 utils/generic_views.py:137
msgid "Save"
msgstr ""
-#: core/forms.py:211
+#: core/forms.py:209
msgid "Used for password resets and, optionally, email reminders."
msgstr ""
-#: core/forms.py:240
+#: core/forms.py:238
msgid "This e-mail address is already in use."
msgstr ""
-#: core/forms.py:261 gym/templates/gym/new_user.html:26
+#: core/forms.py:259 gym/templates/gym/new_user.html:26
#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:217
msgid "Password"
msgstr ""
-#: core/forms.py:263
+#: core/forms.py:261
msgid "Please enter your current password."
msgstr ""
-#: core/forms.py:272 core/templates/language/view.html:70
+#: core/forms.py:270 core/templates/language/view.html:70
#: core/templates/license/list.html:21
#: core/templates/repetition_unit/list.html:22
-#: core/templates/user/overview.html:233
+#: core/templates/user/overview.html:236
#: core/templates/weight_unit/list.html:22
#: exercises/templates/categories/admin-overview.html:21
#: exercises/templates/equipment/admin-overview.html:21
@@ -132,28 +131,31 @@ msgstr ""
#: gym/templates/admin_notes/list.html:37
#: gym/templates/contract_option/list.html:35
#: gym/templates/contract_type/list.html:36 gym/templates/document/list.html:46
-#: gym/templates/gym/list.html:23 nutrition/templates/ingredient/view.html:168
-#: nutrition/templates/ingredient/view.html:215
-#: nutrition/templates/units/list.html:25
+#: gym/templates/gym/list.html:23 nutrition/templates/ingredient/view.html:209
+#: nutrition/templates/ingredient/view.html:254
#, fuzzy
msgid "Delete"
msgstr "मितादे"
-#: core/forms.py:281
+#: core/forms.py:279
msgid "Invalid password"
msgstr "अवैध पासवर्ड"
-#: core/forms.py:293
+#: core/forms.py:291 core/forms.py:349
msgid "The form is secured with reCAPTCHA"
msgstr "फ़ॉर्म reCAPTCHA द्वारा सुरक्षित है"
-#: core/forms.py:314 core/forms.py:341 core/templates/navigation.html:272
-#: core/templates/navigation.html:285 core/templates/template.html:123
-#: core/templates/user/login.html:21 core/views/user.py:285
+#: core/forms.py:312 core/forms.py:339 core/templates/navigation.html:269
+#: core/templates/navigation.html:282 core/templates/template.html:113
+#: core/templates/user/login.html:21 core/views/user.py:293
#: software/templates/features.html:87 software/templates/features.html:442
msgid "Register"
msgstr "रजिस्टर"
+#: core/forms.py:360 weight/templates/import_csv_form.html:9
+msgid "Submit"
+msgstr ""
+
#: core/models/language.py:31 core/templates/language/view.html:21
msgid "Language short name"
msgstr ""
@@ -188,36 +190,36 @@ msgstr ""
msgid "Link to license text or other information"
msgstr ""
-#: core/models/profile.py:57
+#: core/models/profile.py:60
#, python-format
msgid "%(birthdate)s is not a valid birthdate"
msgstr ""
-#: core/models/profile.py:66
+#: core/models/profile.py:69
msgid "Male"
msgstr "मर्द"
-#: core/models/profile.py:67
+#: core/models/profile.py:70
msgid "Female"
msgstr "महिला"
-#: core/models/profile.py:74
+#: core/models/profile.py:77
msgid "Low"
msgstr ""
-#: core/models/profile.py:75
+#: core/models/profile.py:78
msgid "Medium"
msgstr ""
-#: core/models/profile.py:76
+#: core/models/profile.py:79
msgid "High"
msgstr ""
-#: core/models/profile.py:82
+#: core/models/profile.py:85
msgid "Metric (kilogram)"
msgstr ""
-#: core/models/profile.py:83
+#: core/models/profile.py:86
msgid "Imperial (pound)"
msgstr ""
@@ -325,7 +327,7 @@ msgstr ""
msgid "Free time"
msgstr ""
-#: core/models/profile.py:320 nutrition/templates/rate/form.html:66
+#: core/models/profile.py:320 nutrition/templates/rate/form.html:67
msgid "Total daily calories"
msgstr ""
@@ -363,20 +365,41 @@ msgstr ""
msgid "Enable or disable the trophy system for this user"
msgstr ""
-#: core/models/profile.py:446
+#: core/models/profile.py:457
msgid "The sum of all hours has to be 24"
msgstr ""
-#: core/models/rep_unit.py:36 core/models/weight_unit.py:42
-#: core/templates/user/overview.html:280 core/views/user.py:589
+#: core/models/rep_unit.py:32 i18n.tpl:30
+msgid "Repetitions"
+msgstr ""
+
+#: core/models/rep_unit.py:33 core/templates/user/overview.html:82
+#: exercises/templates/history/overview.html:30
+msgid "Time"
+msgstr ""
+
+#: core/models/rep_unit.py:34
+msgid "Distance"
+msgstr ""
+
+#: core/models/rep_unit.py:47 core/models/weight_unit.py:42
+#: core/templates/user/overview.html:283 core/views/user.py:605
#: exercises/models/muscle.py:36 gym/models/contract.py:52
#: gym/models/contract.py:103 gym/models/gym.py:46
#: gym/models/user_document.py:84 gym/templates/contract/view.html:50
#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:108
-#: gym/views/gym.py:158 nutrition/templates/ingredient/view.html:151
+#: gym/views/gym.py:158 nutrition/templates/ingredient/view.html:192
msgid "Name"
msgstr ""
+#: core/models/rep_unit.py:53
+msgid "Unit Type"
+msgstr ""
+
+#: core/models/rep_unit.py:54
+msgid "The type of unit (repetitions, time, or distance)"
+msgstr ""
+
#: core/templates/403.html:4
msgid "Forbidden!"
msgstr ""
@@ -404,77 +427,73 @@ msgid ""
"later time. If the problem persists, you can seek help in ways listed below:"
msgstr ""
-#: core/templates/base.html:10
-#, python-format
-msgid ""
-"You are browsing the site as the user \"%(current_user)s\", all actions are "
-"performed on their data."
+#: core/templates/account/email/email_confirmation_message.html:81
+msgid "Almost there!"
msgstr ""
-#: core/templates/base.html:15 core/templates/base_wide.html:12
+#: core/templates/account/email/email_confirmation_message.html:85
#, python-format
-msgid "Back to \"%(target)s\""
+msgid ""
+"You're receiving this email because the user \"%(user_display)s\" has given "
+"your email address to register an account on %(site_domain)s."
msgstr ""
-#: core/templates/base_wide.html:7
-#, python-format
+#: core/templates/account/email/email_confirmation_message.html:93
msgid ""
-"You are\n"
-" browsing the site as the user \"%(current_user)s\", all "
-"actions are performed on\n"
-" their data.\n"
-" "
+"Your email verification code is listed below. Please enter it in your open "
+"browser window."
msgstr ""
-#: core/templates/delete.html:4
-msgid "Are you sure you want to delete this? This action cannot be undone."
+#: core/templates/account/email/email_confirmation_message.html:100
+msgid "Please click the button below to confirm your email address."
msgstr ""
-#: core/templates/email_verification/confirm_template.html:4
-msgid "Email verification"
+#: core/templates/account/email/email_confirmation_message.html:106
+msgid "Confirm email"
msgstr ""
-#: core/templates/email_verification/confirm_template.html:18
+#: core/templates/account/email/email_confirmation_message.html:110
#, python-format
-msgid "%(username)s, your email was verified"
+msgid ""
+"The link is valid for %(expire_hours)s hours (until %(date)s, %(time)s). You "
+"can request a new one from your profile settings."
msgstr ""
-#: core/templates/email_verification/confirm_template.html:22
-msgid "Error, invalid verification token"
+#: core/templates/account/email/email_confirmation_message.html:116
+msgid "If the button doesn't work, copy and paste this link into your browser:"
msgstr ""
-#: core/templates/email_verification/email_body_html.tpl:6
-msgid "Email Confirmation"
+#: core/templates/account/email/email_confirmation_message.html:125
+msgid "the wger Team"
msgstr ""
-#: core/templates/email_verification/email_body_html.tpl:9
-#: core/templates/email_verification/email_body_txt.tpl:3
+#: core/templates/base.html:10
#, python-format
-msgid "You are almost there, %(username)s!"
+msgid ""
+"You are browsing the site as the user \"%(current_user)s\", all actions are "
+"performed on their data."
msgstr ""
-#: core/templates/email_verification/email_body_html.tpl:11
+#: core/templates/base.html:15 core/templates/base_wide.html:12
#, python-format
-msgid "Please click <a href=\"%(link)s\">here</a> to confirm your email"
+msgid "Back to \"%(target)s\""
msgstr ""
-#: core/templates/email_verification/email_body_html.tpl:12
-#: core/templates/email_verification/email_body_txt.tpl:5
+#: core/templates/base_wide.html:7
#, 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"
+msgid ""
+"You are\n"
+" browsing the site as the user \"%(current_user)s\", all "
+"actions are performed on\n"
+" their data.\n"
+" "
msgstr ""
-#: core/templates/email_verification/email_body_txt.tpl:4
-#, python-format
-msgid "Please click the following link to confirm your email: %(link)s"
+#: core/templates/delete.html:4
+msgid "Are you sure you want to delete this? This action cannot be undone."
msgstr ""
-#: core/templates/language/overview.html:4 core/templates/navigation.html:344
+#: core/templates/language/overview.html:4 core/templates/navigation.html:341
msgid "Languages"
msgstr "भाषाएँ"
@@ -483,16 +502,16 @@ msgid "Nothing found."
msgstr "कुछ नहीं मिला"
#: core/templates/language/overview.html:22
-#: nutrition/templates/ingredient/overview.html:38
+#: nutrition/templates/ingredient/overview.html:43
msgid "Add one now."
msgstr "एक नया जोड़ें |"
#: core/templates/language/overview.html:34 core/templates/license/list.html:43
-#: core/templates/repetition_unit/list.html:46
-#: core/templates/user/overview.html:344 core/templates/user/overview.html:384
-#: core/templates/user/overview.html:422
-#: core/templates/weight_unit/list.html:46 core/views/languages.py:74
-#: core/views/license.py:66 core/views/repetition_units.py:66
+#: core/templates/repetition_unit/list.html:44
+#: core/templates/user/overview.html:347 core/templates/user/overview.html:387
+#: core/templates/user/overview.html:425
+#: core/templates/weight_unit/list.html:46 core/views/languages.py:77
+#: core/views/license.py:66 core/views/repetition_units.py:76
#: core/views/weight_units.py:66
#: exercises/templates/categories/admin-overview.html:40
#: exercises/templates/equipment/admin-overview.html:39
@@ -505,14 +524,14 @@ msgstr "एक नया जोड़ें |"
#: gym/templates/gym/member_list.html:264
#: gym/templates/gym/member_list.html:303
#: mailer/templates/mailer/gym/overview.html:43
-#: nutrition/templates/ingredient/overview.html:60
+#: nutrition/templates/ingredient/overview.html:97
msgid "Add"
msgstr "जोड़ें"
#: core/templates/language/view.html:61 core/templates/user/api_key.html:41
#: core/templates/user/preferences.html:50 gym/models/contract.py:203
#: gym/templates/contract/view.html:41 gym/templates/gym/member_list.html:270
-#: nutrition/templates/ingredient/view.html:206
+#: nutrition/templates/ingredient/view.html:245
msgid "Options"
msgstr ""
@@ -522,9 +541,9 @@ msgstr ""
#: core/templates/license/list.html:30
#: core/templates/repetition_unit/list.html:32
-#: core/templates/user/overview.html:104 core/templates/user/overview.html:136
-#: core/templates/user/overview.html:185 core/templates/user/overview.html:365
-#: core/templates/user/overview.html:404 core/templates/user/overview.html:448
+#: core/templates/user/overview.html:107 core/templates/user/overview.html:139
+#: core/templates/user/overview.html:188 core/templates/user/overview.html:368
+#: core/templates/user/overview.html:407 core/templates/user/overview.html:451
#: core/templates/weight_unit/list.html:32
#: exercises/templates/categories/admin-overview.html:30
#: exercises/templates/equipment/admin-overview.html:30
@@ -536,11 +555,10 @@ msgstr ""
#: gym/templates/gym/member_list.html:284
#: gym/templates/gym/member_list.html:321
#: mailer/templates/mailer/gym/overview.html:30
-#: nutrition/templates/units/list.html:34
msgid "Nothing found"
msgstr ""
-#: core/templates/misc/about.html:4 core/templates/template.html:160
+#: core/templates/misc/about.html:4 core/templates/template.html:150
msgid "Imprint"
msgstr ""
@@ -548,164 +566,159 @@ msgstr ""
msgid "Training"
msgstr ""
-#: core/templates/navigation.html:37 core/templates/user/overview.html:25
+#: core/templates/navigation.html:36 core/templates/user/overview.html:28
msgid "Routines"
msgstr ""
-#: core/templates/navigation.html:45 core/templates/user/overview.html:70
+#: core/templates/navigation.html:44 core/templates/user/overview.html:73
msgid "Calendar"
msgstr ""
-#: core/templates/navigation.html:55
+#: core/templates/navigation.html:53
msgid "Measurements"
msgstr ""
-#: core/templates/navigation.html:66 gallery/templates/images/overview.html:6
+#: core/templates/navigation.html:64 gallery/templates/images/overview.html:6
msgid "Gallery"
msgstr ""
-#: core/templates/navigation.html:72
-msgid "Workout templates"
+#: core/templates/navigation.html:74 core/templates/navigation.html:400
+#: trophies/templates/trophies/overview.html:7
+msgid "Trophies"
msgstr ""
#: core/templates/navigation.html:79
+msgid "Workout templates"
+msgstr ""
+
+#: core/templates/navigation.html:86
msgid "Your templates"
msgstr ""
-#: core/templates/navigation.html:88
+#: core/templates/navigation.html:95
msgid "Public templates"
msgstr ""
-#: core/templates/navigation.html:96 software/templates/features.html:51
+#: core/templates/navigation.html:103 software/templates/features.html:51
#: software/templates/features.html:480
msgid "Exercises"
msgstr "व्यायाम"
-#: core/templates/navigation.html:102 core/templates/navigation.html:176
-#: core/templates/navigation.html:339
+#: core/templates/navigation.html:109 core/templates/navigation.html:336
msgid "Administration"
msgstr ""
-#: core/templates/navigation.html:106
+#: core/templates/navigation.html:113
#, fuzzy
#| msgid "Exercises"
msgid "Exercise edit history"
msgstr "व्यायाम"
-#: core/templates/navigation.html:112
+#: core/templates/navigation.html:119
msgid "Equipment"
msgstr ""
-#: core/templates/navigation.html:118
+#: core/templates/navigation.html:125
msgid "Muscles"
msgstr ""
-#: core/templates/navigation.html:124
+#: core/templates/navigation.html:131
#: exercises/templates/categories/admin-overview.html:4
msgid "Categories"
msgstr ""
-#: core/templates/navigation.html:139 software/templates/features.html:468
+#: core/templates/navigation.html:146 software/templates/features.html:468
msgid "Nutrition"
msgstr ""
-#: core/templates/navigation.html:147 core/templates/user/overview.html:144
+#: core/templates/navigation.html:154 core/templates/user/overview.html:147
msgid "Nutrition plans"
msgstr ""
-#: core/templates/navigation.html:156
+#: core/templates/navigation.html:163
msgid "BMI calculator"
msgstr ""
-#: core/templates/navigation.html:165 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:172 nutrition/templates/rate/form.html:18
msgid "Daily calories calculator"
msgstr ""
-#: core/templates/navigation.html:171
+#: core/templates/navigation.html:178
#: nutrition/templates/ingredient/overview.html:10
msgid "Ingredient overview"
msgstr ""
-#: core/templates/navigation.html:180 nutrition/templates/units/list.html:6
-msgid "Ingredient weight units"
-msgstr ""
-
-#: core/templates/navigation.html:196 software/templates/features.html:463
+#: core/templates/navigation.html:193 software/templates/features.html:463
msgid "Body weight"
msgstr ""
-#: core/templates/navigation.html:203 core/templates/user/overview.html:114
+#: core/templates/navigation.html:200 core/templates/user/overview.html:117
msgid "Weight overview"
msgstr ""
-#: core/templates/navigation.html:217
+#: core/templates/navigation.html:214
msgid "About this software"
msgstr ""
-#: core/templates/navigation.html:223 software/templates/about_us.html:5
+#: core/templates/navigation.html:220 software/templates/about_us.html:5
msgid "Support & Get Involved"
msgstr ""
-#: core/templates/navigation.html:229 software/templates/features.html:528
+#: core/templates/navigation.html:226 software/templates/features.html:528
msgid "REST API"
msgstr ""
-#: core/templates/navigation.html:235 utils/models.py:45
+#: core/templates/navigation.html:232 utils/models.py:45
msgid "License"
msgstr ""
-#: core/templates/navigation.html:241
+#: core/templates/navigation.html:238
msgid "Developer documentation"
msgstr ""
-#: core/templates/navigation.html:248
+#: core/templates/navigation.html:245
msgid "Get the code"
msgstr ""
-#: core/templates/navigation.html:255 core/templates/template.html:199
-#: software/templates/features.html:603
+#: core/templates/navigation.html:252 core/templates/template.html:202
+#: software/templates/features.html:614
msgid "Translate"
msgstr ""
-#: core/templates/navigation.html:292 core/templates/user/login.html:30
+#: core/templates/navigation.html:289 core/templates/user/login.html:30
msgid "Reset password"
msgstr ""
-#: core/templates/navigation.html:301 core/templates/navigation.html:329
+#: core/templates/navigation.html:298 core/templates/navigation.html:326
msgid "Logout"
msgstr ""
-#: core/templates/navigation.html:320
+#: core/templates/navigation.html:317
msgid "My preferences"
msgstr ""
-#: core/templates/navigation.html:352
+#: core/templates/navigation.html:349
msgid "Licenses"
msgstr ""
-#: core/templates/navigation.html:360
+#: core/templates/navigation.html:357
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr ""
-#: core/templates/navigation.html:368 core/templates/weight_unit/list.html:4
-#: nutrition/templates/ingredient/view.html:141
+#: core/templates/navigation.html:365 core/templates/weight_unit/list.html:4
+#: nutrition/templates/ingredient/view.html:182
msgid "Weight units"
msgstr ""
-#: core/templates/navigation.html:376 core/templates/user/list.html:4
+#: core/templates/navigation.html:373 core/templates/user/list.html:4
msgid "User list"
msgstr ""
-#: core/templates/navigation.html:382
+#: core/templates/navigation.html:379
msgid "Gyms"
msgstr ""
-#: core/templates/navigation.html:403
-#: trophies/templates/trophies/overview.html:7
-msgid "Trophies"
-msgstr ""
-
#: core/templates/registration/password_reset_complete.html:4
msgid "Password reset complete"
msgstr ""
@@ -761,25 +774,29 @@ msgstr ""
msgid "next"
msgstr ""
-#: core/templates/template.html:96
+#: core/templates/template.html:86
msgid "Close"
msgstr ""
-#: core/templates/template.html:112
+#: core/templates/template.html:102
msgid ""
"You are using a guest account, data entered will be deleted after a week."
msgstr ""
-#: core/templates/template.html:117
+#: core/templates/template.html:107
msgid "Create some demo entries"
msgstr ""
-#: core/templates/template.html:165 software/templates/features.html:568
+#: core/templates/template.html:155 software/templates/features.html:568
#: software/templates/tos.html:7
msgid "Terms of service"
msgstr ""
-#: core/templates/template_features.html:53 software/templates/features.html:9
+#: core/templates/template.html:181 software/templates/features.html:595
+msgid "Browser language"
+msgstr ""
+
+#: core/templates/template_features.html:46 software/templates/features.html:9
msgid "Features"
msgstr ""
@@ -834,99 +851,94 @@ msgstr ""
msgid "Forgot password?"
msgstr ""
-#: core/templates/user/overview.html:25 core/templates/user/overview.html:68
-#: core/templates/user/overview.html:112 core/templates/user/overview.html:144
-#: core/templates/user/overview.html:348 core/templates/user/overview.html:390
-#: core/templates/user/overview.html:426
+#: core/templates/user/overview.html:28 core/templates/user/overview.html:71
+#: core/templates/user/overview.html:115 core/templates/user/overview.html:147
+#: core/templates/user/overview.html:351 core/templates/user/overview.html:393
+#: core/templates/user/overview.html:429
#, python-format
msgid "last %(number)s"
msgstr ""
-#: core/templates/user/overview.html:27 core/templates/user/overview.html:146
-#: core/templates/user/overview.html:343 core/templates/user/overview.html:382
-#: core/templates/user/overview.html:421 gym/templates/gym/member_list.html:226
+#: core/templates/user/overview.html:30 core/templates/user/overview.html:149
+#: core/templates/user/overview.html:346 core/templates/user/overview.html:385
+#: core/templates/user/overview.html:424 gym/templates/gym/member_list.html:226
#: gym/templates/gym/member_list.html:262
#: gym/templates/gym/member_list.html:302
msgid "Overview"
msgstr ""
-#: core/templates/user/overview.html:34 core/templates/user/overview.html:76
-#: core/templates/user/overview.html:120 core/templates/user/overview.html:152
+#: core/templates/user/overview.html:37 core/templates/user/overview.html:79
+#: core/templates/user/overview.html:123 core/templates/user/overview.html:155
#: manager/helpers.py:88 software/templates/about_us.html:170
#: weight/templates/import_csv_preview.html:13
#: weight/templates/import_csv_preview.html:42 weight/views.py:54
msgid "Date"
msgstr ""
-#: core/templates/user/overview.html:35 core/templates/user/overview.html:153
+#: core/templates/user/overview.html:38 core/templates/user/overview.html:156
#: gym/models/contract.py:58 gym/models/contract.py:109
msgid "Description"
msgstr ""
-#: core/templates/user/overview.html:36
+#: core/templates/user/overview.html:39
msgid "Number of logs (days)"
msgstr ""
-#: core/templates/user/overview.html:37 core/views/user.py:590
+#: core/templates/user/overview.html:40 core/views/user.py:606
#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:158
msgid "Last activity"
msgstr ""
-#: core/templates/user/overview.html:58
+#: core/templates/user/overview.html:61
msgid "No workouts found."
msgstr ""
-#: core/templates/user/overview.html:68
+#: core/templates/user/overview.html:71
msgid "Log"
msgstr ""
-#: core/templates/user/overview.html:77
+#: core/templates/user/overview.html:80
msgid "General impression"
msgstr ""
-#: core/templates/user/overview.html:78 core/templates/user/overview.html:390
+#: core/templates/user/overview.html:81 core/templates/user/overview.html:393
msgid "Notes"
msgstr ""
-#: core/templates/user/overview.html:79
-#: exercises/templates/history/overview.html:30
-msgid "Time"
-msgstr ""
-
-#: core/templates/user/overview.html:112 core/templates/user/overview.html:121
+#: core/templates/user/overview.html:115 core/templates/user/overview.html:124
#: manager/helpers.py:89 weight/templates/import_csv_preview.html:14
#: weight/templates/import_csv_preview.html:43 weight/views.py:54
msgid "Weight"
msgstr ""
-#: core/templates/user/overview.html:154
-#: nutrition/templates/ingredient/view.html:51 nutrition/views/plan.py:245
+#: core/templates/user/overview.html:157
+#: nutrition/templates/ingredient/view.html:52 nutrition/views/plan.py:244
msgid "Energy"
msgstr ""
-#: core/templates/user/overview.html:155
-#: nutrition/templates/ingredient/view.html:58 nutrition/views/plan.py:251
+#: core/templates/user/overview.html:158
+#: nutrition/templates/ingredient/view.html:59 nutrition/views/plan.py:250
msgid "Protein"
msgstr ""
-#: core/templates/user/overview.html:156
-#: nutrition/templates/ingredient/view.html:64 nutrition/views/plan.py:259
+#: core/templates/user/overview.html:159
+#: nutrition/templates/ingredient/view.html:65 nutrition/views/plan.py:258
msgid "Carbohydrates"
msgstr ""
-#: core/templates/user/overview.html:157
-#: nutrition/templates/ingredient/view.html:80 nutrition/views/plan.py:273
+#: core/templates/user/overview.html:160
+#: nutrition/templates/ingredient/view.html:81 nutrition/views/plan.py:272
msgid "Fat"
msgstr ""
-#: core/templates/user/overview.html:170
-#: nutrition/templates/ingredient/view.html:53
+#: core/templates/user/overview.html:173
+#: nutrition/templates/ingredient/view.html:54
msgid "kcal"
msgstr ""
-#: core/templates/user/overview.html:201 core/templates/user/overview.html:340
-#: core/templates/user/overview.html:379 core/templates/user/overview.html:418
-#: core/templates/user/overview.html:463 gym/templates/gym/list.html:45
+#: core/templates/user/overview.html:204 core/templates/user/overview.html:343
+#: core/templates/user/overview.html:382 core/templates/user/overview.html:421
+#: core/templates/user/overview.html:466 gym/templates/gym/list.html:45
#: gym/templates/gym/member_list.html:91 gym/templates/gym/member_list.html:149
#: gym/templates/gym/member_list.html:187
#: gym/templates/gym/member_list.html:223
@@ -935,109 +947,113 @@ msgstr ""
msgid "Actions"
msgstr ""
-#: core/templates/user/overview.html:210
+#: core/templates/user/overview.html:213
msgid "Deactivate user"
msgstr ""
-#: core/templates/user/overview.html:214
+#: core/templates/user/overview.html:217
msgid "Activate user"
msgstr ""
-#: core/templates/user/overview.html:223
+#: core/templates/user/overview.html:226
msgid "Reset user password"
msgstr ""
-#: core/templates/user/overview.html:227 gym/templates/gym/member_list.html:30
+#: core/templates/user/overview.html:230 gym/templates/gym/member_list.html:30
msgid "Roles"
msgstr ""
-#: core/templates/user/overview.html:243
+#: core/templates/user/overview.html:246
msgid "Password reset confirmation"
msgstr ""
-#: core/templates/user/overview.html:247
+#: core/templates/user/overview.html:250
msgid "Do you really want to change this user&#39;s password?"
msgstr ""
-#: core/templates/user/overview.html:250
+#: core/templates/user/overview.html:253
#: exercises/templates/history/overview.html:106
+#: nutrition/templates/ingredient/view.html:148
+#: nutrition/templates/ingredient/view.html:160
msgid "No"
msgstr ""
-#: core/templates/user/overview.html:251
+#: core/templates/user/overview.html:254
#: exercises/templates/history/overview.html:99
+#: nutrition/templates/ingredient/view.html:146
+#: nutrition/templates/ingredient/view.html:158
msgid "Yes"
msgstr ""
-#: core/templates/user/overview.html:272 gym/templates/gym/member_list.html:105
+#: core/templates/user/overview.html:275 gym/templates/gym/member_list.html:105
msgid "Details"
msgstr ""
-#: core/templates/user/overview.html:276 gym/views/export.py:57
-#: manager/helpers.py:89 nutrition/views/plan.py:151
-#: nutrition/views/plan.py:157
+#: core/templates/user/overview.html:279 gym/views/export.py:57
+#: manager/helpers.py:89 nutrition/views/plan.py:150
+#: nutrition/views/plan.py:156
msgid "Nr."
msgstr ""
-#: core/templates/user/overview.html:298 gym/models/contract.py:287
+#: core/templates/user/overview.html:301 gym/models/contract.py:287
#: gym/models/gym.py:50 gym/templates/contract/view.html:75
#: gym/templates/gym/member_list.html:112 gym/views/export.py:68
msgid "Phone"
msgstr ""
-#: core/templates/user/overview.html:302 gym/templates/contract/view.html:87
+#: core/templates/user/overview.html:305 gym/templates/contract/view.html:87
#: gym/templates/gym/member_list.html:130
msgid "Address"
msgstr ""
-#: core/templates/user/overview.html:313
+#: core/templates/user/overview.html:316
msgid "Registered"
msgstr ""
-#: core/templates/user/overview.html:317
+#: core/templates/user/overview.html:320
msgid "Last login"
msgstr ""
-#: core/templates/user/overview.html:322
+#: core/templates/user/overview.html:325
msgid "Status"
msgstr ""
-#: core/templates/user/overview.html:325
+#: core/templates/user/overview.html:328
msgid "Active"
msgstr ""
-#: core/templates/user/overview.html:327
+#: core/templates/user/overview.html:330
msgid "Inactive"
msgstr ""
-#: core/templates/user/overview.html:348 gym/templates/contract/list.html:4
+#: core/templates/user/overview.html:351 gym/templates/contract/list.html:4
#: gym/templates/gym/member_list.html:218
msgid "Contracts"
msgstr ""
-#: core/templates/user/overview.html:426 gym/templates/document/list.html:4
+#: core/templates/user/overview.html:429 gym/templates/document/list.html:4
msgid "Documents"
msgstr ""
-#: core/templates/user/overview.html:433 gym/templates/document/list.html:33
+#: core/templates/user/overview.html:436 gym/templates/document/list.html:33
msgid "Download"
msgstr ""
-#: core/templates/user/overview.html:474 gym/views/admin_config.py:44
+#: core/templates/user/overview.html:477 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:477 gym/models/user_config.py:92
+#: core/templates/user/overview.html:480 gym/models/user_config.py:92
msgid "Include in inactive overview"
msgstr ""
-#: core/templates/user/overview.html:510
+#: core/templates/user/overview.html:513
#, python-format
msgid "Admin login is only available for users in %(gym_name)s"
msgstr ""
-#: core/templates/user/overview.html:514
+#: core/templates/user/overview.html:517
msgid "Log in as this user"
msgstr ""
@@ -1061,7 +1077,7 @@ msgstr ""
msgid "You need to verify your email to contribute exercises"
msgstr ""
-#: core/templates/user/preferences.html:55 core/views/user.py:601
+#: core/templates/user/preferences.html:55 core/views/user.py:617
msgid "Change password"
msgstr ""
@@ -1069,23 +1085,23 @@ msgstr ""
msgid "Already have an account?"
msgstr ""
-#: core/templatetags/wger_extras.py:142 i18n.tpl:38
+#: core/templatetags/wger_extras.py:142 i18n.tpl:39
msgid "kg"
msgstr ""
#: core/templatetags/wger_extras.py:144
-#: nutrition/templates/ingredient/view.html:60
-#: nutrition/templates/ingredient/view.html:66
-#: nutrition/templates/ingredient/view.html:73
-#: nutrition/templates/ingredient/view.html:82
-#: nutrition/templates/ingredient/view.html:89
-#: nutrition/templates/ingredient/view.html:111
-#: nutrition/templates/ingredient/view.html:121
+#: nutrition/templates/ingredient/view.html:61
+#: nutrition/templates/ingredient/view.html:67
+#: nutrition/templates/ingredient/view.html:74
+#: nutrition/templates/ingredient/view.html:83
+#: nutrition/templates/ingredient/view.html:90
+#: nutrition/templates/ingredient/view.html:112
+#: nutrition/templates/ingredient/view.html:122
msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr ""
-#: core/templatetags/wger_extras.py:147 i18n.tpl:39
+#: core/templatetags/wger_extras.py:147 i18n.tpl:40
msgid "lb"
msgstr ""
@@ -1094,84 +1110,83 @@ msgctxt "weight unit, i.e. ounces"
msgid "oz"
msgstr ""
-#: core/views/languages.py:85 exercises/views/categories.py:122
+#: core/views/languages.py:88 exercises/views/categories.py:122
#: exercises/views/equipment.py:103 exercises/views/muscles.py:99
-#: nutrition/views/ingredient.py:120 nutrition/views/unit.py:110
+#: nutrition/views/ingredient.py:125
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
+#: core/views/languages.py:96 core/views/license.py:103
+#: core/views/repetition_units.py:114 core/views/weight_units.py:115
#: exercises/views/categories.py:128 exercises/views/muscles.py:106
#: gallery/views/images.py:124 gym/views/admin_notes.py:196
#: gym/views/document.py:206 gym/views/gym.py:481
-#: nutrition/views/ingredient.py:127 nutrition/views/unit.py:117
+#: nutrition/views/ingredient.py:132
#, python-brace-format
msgid "Delete {0}?"
msgstr ""
-#: core/views/languages.py:111 core/views/license.py:85
-#: core/views/repetition_units.py:86 core/views/user.py:464
+#: core/views/languages.py:114 core/views/license.py:85
+#: core/views/repetition_units.py:96 core/views/user.py:480
#: core/views/weight_units.py:86 exercises/views/categories.py:98
#: exercises/views/equipment.py:81 exercises/views/muscles.py:87
#: gym/views/admin_notes.py:161 gym/views/config.py:68
#: gym/views/contract.py:186 gym/views/contract_option.py:123
#: gym/views/contract_type.py:123 gym/views/document.py:171
-#: gym/views/gym.py:463 nutrition/views/ingredient.py:146
-#: nutrition/views/unit.py:143
+#: gym/views/gym.py:463 nutrition/views/ingredient.py:151
#, python-brace-format
msgid "Edit {0}"
msgstr ""
-#: core/views/misc.py:74
+#: core/views/misc.py:73
msgid ""
"We have created sample workout, workout schedules, weight logs, (body) "
"weight and nutrition plan entries so you can better see what this site can "
"do. Feel free to edit or delete them!"
msgstr ""
-#: core/views/user.py:143
+#: core/views/user.py:145
#, python-brace-format
msgid "Account \"{0}\" was successfully deleted"
msgstr ""
-#: core/views/user.py:279
+#: core/views/user.py:287
msgid "You were successfully registered"
msgstr ""
-#: core/views/user.py:341
+#: core/views/user.py:357
msgid "Settings successfully updated"
msgstr ""
-#: core/views/user.py:380
+#: core/views/user.py:396
msgid "The user was successfully deactivated"
msgstr ""
-#: core/views/user.py:417
+#: core/views/user.py:433
msgid "The user was successfully activated"
msgstr ""
-#: core/views/user.py:432
+#: core/views/user.py:448
msgid "Edit user"
msgstr ""
-#: core/views/user.py:587 gym/templates/gym/member_list.html:26
+#: core/views/user.py:603 gym/templates/gym/member_list.html:26
#: gym/views/gym.py:158
msgid "ID"
msgstr ""
-#: core/views/user.py:588 gym/forms.py:95 gym/templates/contract/view.html:55
+#: core/views/user.py:604 gym/forms.py:95 gym/templates/contract/view.html:55
#: gym/templates/gym/member_list.html:27 gym/views/export.py:59
#: gym/views/gym.py:158 gym/views/gym.py:217
msgid "Username"
msgstr ""
-#: core/views/user.py:591 gym/templates/gym/new_user.html:34
+#: core/views/user.py:607 gym/templates/gym/new_user.html:34
#: gym/views/export.py:58 gym/views/gym.py:217
msgid "Gym"
msgstr ""
-#: core/views/user.py:650
+#: core/views/user.py:678
#, python-format
msgid "A verification email was sent to %(email)s"
msgstr ""
@@ -1188,16 +1203,16 @@ msgstr ""
msgid "A more basic name for the muscle"
msgstr ""
-#: exercises/models/video.py:50
+#: exercises/models/video.py:52
#, python-format
msgid "Maximum file size is %(size)sMB."
msgstr ""
-#: exercises/models/video.py:57 exercises/models/video.py:65
+#: exercises/models/video.py:59 exercises/models/video.py:67
msgid "File type is not supported"
msgstr ""
-#: exercises/models/video.py:70
+#: exercises/models/video.py:72
msgid "File is not a valid video"
msgstr ""
@@ -1268,7 +1283,11 @@ msgstr ""
msgid "Add muscle"
msgstr ""
-#: gallery/templates/images/overview.html:72
+#: gallery/forms.py:35
+msgid "If date is left empty, it will be read from the image instead"
+msgstr ""
+
+#: gallery/templates/images/overview.html:69
msgid "Add image"
msgstr ""
@@ -1334,7 +1353,7 @@ msgid "Contract type"
msgstr ""
#: gym/models/contract.py:211 gym/templates/contract/view.html:59
-#: nutrition/forms.py:58
+#: nutrition/forms.py:67
msgid "Amount"
msgstr ""
@@ -1510,7 +1529,7 @@ msgstr ""
msgid "Add member"
msgstr ""
-#: gym/templates/gym/new_user.html:48 nutrition/templates/rate/form.html:120
+#: gym/templates/gym/new_user.html:48 nutrition/templates/rate/form.html:121
msgid "Info"
msgstr ""
@@ -1677,10 +1696,6 @@ msgstr ""
msgid "Quads"
msgstr ""
-#: i18n.tpl:30
-msgid "Repetitions"
-msgstr ""
-
#: i18n.tpl:31
msgid "Resistance band"
msgstr ""
@@ -1709,187 +1724,191 @@ msgstr ""
msgid "Until Failure"
msgstr ""
-#: i18n.tpl:40
-msgid "none (bodyweight exercise)"
+#: i18n.tpl:38
+msgid "Meters"
msgstr ""
#: i18n.tpl:41
-msgid "Beginner"
+msgid "none (bodyweight exercise)"
msgstr ""
#: i18n.tpl:42
-msgid "Consistent"
+msgid "Beginner"
msgstr ""
#: i18n.tpl:43
-msgid "Dedicated"
+msgid "Consistent"
msgstr ""
#: i18n.tpl:44
-msgid "Obsessed"
+msgid "Dedicated"
msgstr ""
#: i18n.tpl:45
-msgid "Legend"
+msgid "Obsessed"
msgstr ""
#: i18n.tpl:46
-msgid "Veteran"
+msgid "Legend"
msgstr ""
#: i18n.tpl:47
-msgid "Titan"
+msgid "Veteran"
msgstr ""
#: i18n.tpl:48
-msgid "Unstoppable"
+msgid "Titan"
msgstr ""
#: i18n.tpl:49
-msgid "Weekend Warrior"
+msgid "Unstoppable"
msgstr ""
#: i18n.tpl:50
-msgid "Elephant lifter"
+msgid "Weekend Warrior"
msgstr ""
#: i18n.tpl:51
-msgid "Bus lifter"
+msgid "Elephant lifter"
msgstr ""
#: i18n.tpl:52
-msgid "Plane lifter"
+msgid "Bus lifter"
msgstr ""
#: i18n.tpl:53
-msgid "Blue whale lifter"
+msgid "Plane lifter"
msgstr ""
#: i18n.tpl:54
-msgid "Space Station lifter"
+msgid "Blue whale lifter"
msgstr ""
#: i18n.tpl:55
-msgid "Millionaire"
+msgid "Space Station lifter"
msgstr ""
#: i18n.tpl:56
-msgid "Atlas"
+msgid "Millionaire"
msgstr ""
#: i18n.tpl:57
-msgid "Early Bird"
+msgid "Atlas"
msgstr ""
#: i18n.tpl:58
-msgid "Night Owl"
+msgid "Early Bird"
msgstr ""
#: i18n.tpl:59
-msgid "New Year, New Me"
+msgid "Night Owl"
msgstr ""
#: i18n.tpl:60
-msgid "Phoenix"
+msgid "New Year, New Me"
msgstr ""
#: i18n.tpl:61
-msgid "Personal Record"
+msgid "Phoenix"
msgstr ""
#: i18n.tpl:62
-msgid "Complete your first workout"
+msgid "Personal Record"
msgstr ""
#: i18n.tpl:63
+msgid "Complete your first workout"
+msgstr ""
+
+#: i18n.tpl:64
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 10 workouts"
msgstr "उदाहरणात्मक वर्कआउट"
-#: i18n.tpl:64
+#: i18n.tpl:65
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 50 workouts"
msgstr "उदाहरणात्मक वर्कआउट"
-#: i18n.tpl:65
+#: i18n.tpl:66
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 100 workouts"
msgstr "उदाहरणात्मक वर्कआउट"
-#: i18n.tpl:66
+#: i18n.tpl:67
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 200 workouts"
msgstr "उदाहरणात्मक वर्कआउट"
-#: i18n.tpl:67
+#: i18n.tpl:68
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 500 workouts"
msgstr "उदाहरणात्मक वर्कआउट"
-#: i18n.tpl:68
+#: i18n.tpl:69
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 1000 workouts"
msgstr "उदाहरणात्मक वर्कआउट"
-#: i18n.tpl:69
+#: i18n.tpl:70
msgid "Maintain a 30-day workout streak"
msgstr ""
-#: i18n.tpl:70
+#: i18n.tpl:71
msgid "Work out on Saturday and Sunday for 4 consecutive weekends"
msgstr ""
-#: i18n.tpl:71
+#: i18n.tpl:72
msgid "Lift a cumulative total of 5.000 kg"
msgstr ""
-#: i18n.tpl:72
+#: i18n.tpl:73
msgid "Lift a cumulative total of 20.000 kg"
msgstr ""
-#: i18n.tpl:73
+#: i18n.tpl:74
msgid "Lift a cumulative total of 50.000 kg"
msgstr ""
-#: i18n.tpl:74
+#: i18n.tpl:75
msgid "Lift a cumulative total of 150.000 kg"
msgstr ""
-#: i18n.tpl:75
+#: i18n.tpl:76
msgid "Lift a cumulative total of 450.000 kg"
msgstr ""
-#: i18n.tpl:76
+#: i18n.tpl:77
msgid "Lift a cumulative total of 1.000.000 kg"
msgstr ""
-#: i18n.tpl:77
+#: i18n.tpl:78
msgid "Lift a cumulative total of 10.000.000 kg"
msgstr ""
-#: i18n.tpl:78
+#: i18n.tpl:79
msgid "Complete a workout before 6:00 AM"
msgstr ""
-#: i18n.tpl:79
+#: i18n.tpl:80
msgid "Complete a workout after 9:00 PM"
msgstr ""
-#: i18n.tpl:80
+#: i18n.tpl:81
msgid "Work out on January 1st"
msgstr ""
-#: i18n.tpl:81
+#: i18n.tpl:82
msgid "Return to training after being inactive for 30 days"
msgstr ""
-#: i18n.tpl:82
+#: i18n.tpl:83
msgid "Achieve a new Personal Record on any exercise"
msgstr ""
@@ -1971,7 +1990,7 @@ msgstr ""
msgid "Routine will expire soon"
msgstr ""
-#: manager/models/routine.py:153 manager/models/session.py:145
+#: manager/models/routine.py:154 manager/models/session.py:145
msgid "The start time cannot be after the end time."
msgstr ""
@@ -2043,36 +2062,56 @@ msgstr ""
msgid "Workout for %s"
msgstr ""
-#: nutrition/forms.py:62
+#: nutrition/extract_info/off.py:72 nutrition/extract_info/off.py:91
+msgid "Serving"
+msgstr ""
+
+#: nutrition/forms.py:71 nutrition/forms.py:208
msgid "Unit"
msgstr ""
-#: nutrition/forms.py:170 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:179 nutrition/templates/rate/form.html:77
msgid "Basic caloric intake"
msgstr ""
-#: nutrition/forms.py:171
+#: nutrition/forms.py:180
msgid "Your basic caloric intake as calculated for your data"
msgstr ""
-#: nutrition/forms.py:176
+#: nutrition/forms.py:185
msgid "Additional calories"
msgstr ""
-#: nutrition/forms.py:178
+#: nutrition/forms.py:187
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
msgstr ""
#: nutrition/forms.py:209
+msgid "grams (g)"
+msgstr ""
+
+#: nutrition/forms.py:219
msgid "Ingredient"
msgstr ""
-#: nutrition/forms.py:213
+#: nutrition/forms.py:223
msgid "Also search for names in English"
msgstr ""
+#: nutrition/forms.py:239
+msgid "Quantity"
+msgstr ""
+
+#: nutrition/forms.py:241
+msgid "Enter a quantity and choose grams (g) or one of the serving units."
+msgstr ""
+
+#: nutrition/models/ingredient.py:526
+msgid "Portion"
+msgstr ""
+
#: nutrition/templates/ingredient/email_new.tpl:1
#, python-format
msgid ""
@@ -2110,59 +2149,86 @@ msgid ""
"sucessfully."
msgstr ""
-#: nutrition/templates/ingredient/overview.html:38
+#: nutrition/templates/ingredient/overview.html:32
+#: nutrition/templates/ingredient/overview.html:68
+#: nutrition/templates/ingredient/view.html:143
+msgid "Vegan"
+msgstr ""
+
+#: nutrition/templates/ingredient/overview.html:34
+#: nutrition/templates/ingredient/overview.html:79
+#: nutrition/templates/ingredient/view.html:155
+msgid "Vegetarian"
+msgstr ""
+
+#: nutrition/templates/ingredient/overview.html:43
msgid "No ingredients."
msgstr ""
-#: nutrition/templates/ingredient/overview.html:49
+#: nutrition/templates/ingredient/overview.html:54
msgid "Search"
msgstr ""
-#: nutrition/templates/ingredient/view.html:45 nutrition/views/plan.py:237
+#: nutrition/templates/ingredient/overview.html:57
+msgid "Filter"
+msgstr ""
+
+#: nutrition/templates/ingredient/overview.html:83
+msgid "Apply"
+msgstr ""
+
+#: nutrition/templates/ingredient/overview.html:85
+msgid "Reset"
+msgstr ""
+
+#: nutrition/templates/ingredient/view.html:46 nutrition/views/plan.py:236
msgid "Macronutrients"
msgstr ""
-#: nutrition/templates/ingredient/view.html:54
+#: nutrition/templates/ingredient/view.html:55
msgid "kJ"
msgstr ""
-#: nutrition/templates/ingredient/view.html:70 nutrition/views/plan.py:267
+#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:266
msgid "Sugar content in carbohydrates"
msgstr ""
-#: nutrition/templates/ingredient/view.html:75
-#: nutrition/templates/ingredient/view.html:91
-#: nutrition/templates/ingredient/view.html:113
-#: nutrition/templates/ingredient/view.html:123
+#: nutrition/templates/ingredient/view.html:76
+#: nutrition/templates/ingredient/view.html:92
+#: nutrition/templates/ingredient/view.html:114
+#: nutrition/templates/ingredient/view.html:124
msgid "n.A."
msgstr ""
-#: nutrition/templates/ingredient/view.html:86 nutrition/views/plan.py:281
+#: nutrition/templates/ingredient/view.html:87 nutrition/views/plan.py:280
msgid "Saturated fat content in fats"
msgstr ""
-#: nutrition/templates/ingredient/view.html:102
+#: nutrition/templates/ingredient/view.html:103
msgid "Others"
msgstr ""
-#: nutrition/templates/ingredient/view.html:108 nutrition/views/plan.py:287
+#: nutrition/templates/ingredient/view.html:109 nutrition/views/plan.py:286
msgid "Fiber"
msgstr ""
-#: nutrition/templates/ingredient/view.html:118 nutrition/views/plan.py:293
+#: nutrition/templates/ingredient/view.html:119 nutrition/views/plan.py:292
msgid "Sodium"
msgstr ""
-#: nutrition/templates/ingredient/view.html:143
-#: nutrition/templates/units/list.html:50 nutrition/views/unit.py:86
+#: nutrition/templates/ingredient/view.html:136
+msgid "Dietary information"
+msgstr ""
+
+#: nutrition/templates/ingredient/view.html:184
msgid "Add new weight unit"
msgstr ""
-#: nutrition/templates/rate/form.html:25
+#: nutrition/templates/rate/form.html:26
msgid "Basal metabolic rate"
msgstr ""
-#: nutrition/templates/rate/form.html:26
+#: nutrition/templates/rate/form.html:27
msgid ""
"The basal metabolic rate is the amount of energy expended daily\n"
"at rest. This is the minimum energy needed for the body to function, without "
@@ -2170,36 +2236,36 @@ msgid ""
"additional physical activity."
msgstr ""
-#: nutrition/templates/rate/form.html:37
+#: nutrition/templates/rate/form.html:38
msgid "Your basic metabolic rate is: "
msgstr ""
-#: nutrition/templates/rate/form.html:47
+#: nutrition/templates/rate/form.html:48
msgid "Physical activities"
msgstr ""
-#: nutrition/templates/rate/form.html:48
+#: nutrition/templates/rate/form.html:49
msgid ""
"The physical activity level (PAL) is a factor used to to express\n"
"the additional physical activity and is used to calculate the total energy\n"
"required per day."
msgstr ""
-#: nutrition/templates/rate/form.html:59
+#: nutrition/templates/rate/form.html:60
msgid "Factor for daily activities: "
msgstr ""
-#: nutrition/templates/rate/form.html:67
+#: nutrition/templates/rate/form.html:68
msgid ""
"The base caloric intake is the amount of calories your metabolism\n"
"needs based on your level of physical activity."
msgstr ""
-#: nutrition/templates/rate/form.html:81
+#: nutrition/templates/rate/form.html:82
msgid "Calculate basic caloric intake"
msgstr ""
-#: nutrition/templates/rate/form.html:88
+#: nutrition/templates/rate/form.html:89
msgid ""
"The total calories are the actual total calories per day. This\n"
"might include e.g. a surplus or deficit if you are bulking or cutting. "
@@ -2207,69 +2273,69 @@ msgid ""
"you might just enter yourself the amount of calories if you know the value."
msgstr ""
-#: nutrition/templates/rate/form.html:102
+#: nutrition/templates/rate/form.html:103
msgid "Transfer basic intake to total daily calories"
msgstr ""
-#: nutrition/templates/rate/form.html:106
+#: nutrition/templates/rate/form.html:107
msgid "Add additional calories to total daily calories"
msgstr ""
-#: nutrition/templates/rate/form.html:110
+#: nutrition/templates/rate/form.html:111
msgid "Save total calories to profile"
msgstr ""
-#: nutrition/templates/rate/form.html:121
+#: nutrition/templates/rate/form.html:122
msgid ""
"Please note that these calculations can only be an\n"
"approximation. If you base your nutrition plan on these values, observe\n"
"yourself for some weeks and change the total amount if needed."
msgstr ""
-#: nutrition/views/ingredient.py:158
+#: nutrition/views/ingredient.py:163
msgid "Add a new ingredient"
msgstr ""
-#: nutrition/views/plan.py:128
+#: nutrition/views/plan.py:127
msgid "Nutritional plan"
msgstr ""
-#: nutrition/views/plan.py:130
+#: nutrition/views/plan.py:129
#, python-format
msgid "Nutritional plan for %s"
msgstr ""
-#: nutrition/views/plan.py:202
+#: nutrition/views/plan.py:201
msgid "<i>This is an empty plan, what did you expect on the PDF?</i>"
msgstr ""
-#: nutrition/views/plan.py:230
+#: nutrition/views/plan.py:229
#, fuzzy
#| msgid "Sample nutritional plan"
msgid "Nutritional data"
msgstr "उदाहरणात्मक पोषण योजना"
-#: nutrition/views/plan.py:238
+#: nutrition/views/plan.py:237
msgid "Total"
msgstr ""
-#: nutrition/views/plan.py:239
+#: nutrition/views/plan.py:238
msgid "Percent of energy"
msgstr ""
-#: nutrition/views/plan.py:240
+#: nutrition/views/plan.py:239
msgid "g per body kg"
msgstr ""
-#: nutrition/views/unit_ingredient.py:69
+#: nutrition/views/unit_ingredient.py:64
msgid "Add a new weight unit"
msgstr ""
-#: nutrition/views/unit_ingredient.py:106
+#: nutrition/views/unit_ingredient.py:99
msgid "Edit a weight unit to ingredient connection"
msgstr ""
-#: nutrition/views/unit_ingredient.py:138
+#: nutrition/views/unit_ingredient.py:129
msgid "Delete?"
msgstr ""
@@ -2616,7 +2682,7 @@ msgstr ""
msgid "Translation"
msgstr ""
-#: utils/generic_views.py:263
+#: utils/generic_views.py:246
msgid "Yes, delete"
msgstr ""
@@ -2667,10 +2733,6 @@ msgstr ""
msgid "Import weight logs"
msgstr ""
-#: weight/templates/import_csv_form.html:9
-msgid "Submit"
-msgstr ""
-
#: weight/templates/import_csv_form.html:15
msgid ""
"Use this import field to import your weight logs into Workout\n"
diff --git a/wger/locale/hr/LC_MESSAGES/django.po b/wger/locale/hr/LC_MESSAGES/django.po
index d958dd308..5635df0dc 100644
--- a/wger/locale/hr/LC_MESSAGES/django.po
+++ b/wger/locale/hr/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-01-17 14:03+0000\n"
+"POT-Creation-Date: 2026-04-10 10:20+0000\n"
"PO-Revision-Date: 2026-03-19 12:09+0000\n"
"Last-Translator: Milo Ivir <[email protected]>\n"
"Language-Team: Croatian <https://hosted.weblate.org/projects/wger/web/hr/>\n"
@@ -35,7 +35,7 @@ msgstr ""
#: config/views/gym_config.py:42 core/templates/language/view.html:64
#: core/templates/license/list.html:17
#: core/templates/repetition_unit/list.html:18
-#: core/templates/user/overview.html:204 core/templates/user/overview.html:467
+#: core/templates/user/overview.html:207 core/templates/user/overview.html:470
#: core/templates/weight_unit/list.html:18
#: exercises/templates/categories/admin-overview.html:17
#: exercises/templates/equipment/admin-overview.html:17
@@ -47,30 +47,29 @@ msgstr ""
#: gym/templates/gym/list.html:19 gym/templates/gym/list.html:48
#: gym/templates/gym/member_list.html:94 gym/templates/gym/member_list.html:152
#: gym/templates/gym/member_list.html:190
-#: nutrition/templates/ingredient/view.html:164
-#: nutrition/templates/ingredient/view.html:209
-#: nutrition/templates/units/list.html:19
+#: nutrition/templates/ingredient/view.html:205
+#: nutrition/templates/ingredient/view.html:248
msgid "Edit"
msgstr "Uredi"
-#: core/forms.py:91 core/templates/navigation.html:271
-#: core/templates/navigation.html:278 core/templates/user/login.html:4
+#: core/forms.py:89 core/templates/navigation.html:268
+#: core/templates/navigation.html:275 core/templates/user/login.html:4
#: core/templates/user/registration_sidebar.html:12
#: software/templates/features.html:82 software/templates/features.html:448
msgid "Login"
msgstr "Prijava"
-#: core/forms.py:130 core/forms.py:244 gym/views/export.py:61
+#: core/forms.py:128 core/forms.py:242 gym/views/export.py:61
#: gym/views/gym.py:217
msgid "First name"
msgstr "Ime"
-#: core/forms.py:131 core/forms.py:245 core/templates/user/overview.html:284
+#: core/forms.py:129 core/forms.py:243 core/templates/user/overview.html:287
#: gym/views/export.py:62 gym/views/gym.py:217
msgid "Last name"
msgstr "Prezime"
-#: core/forms.py:133 core/forms.py:210 core/templates/user/overview.html:288
+#: core/forms.py:131 core/forms.py:208 core/templates/user/overview.html:291
#: gym/models/contract.py:256 gym/models/gym.py:58
#: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:116
#: gym/templates/gym/new_user.html:30 gym/views/export.py:60
@@ -80,55 +79,55 @@ msgstr "Prezime"
msgid "Email"
msgstr "E-mail adresa"
-#: core/forms.py:134
+#: core/forms.py:132
msgid "Used for password resets and, optionally, e-mail reminders."
msgstr ""
"Koristi se za obnavljanje lozinki i opcionalno za podsjetnike putem e-pošte."
-#: core/forms.py:138 core/models/profile.py:222
+#: core/forms.py:136 core/models/profile.py:222
#: gym/templates/gym/new_user.html:38
msgid "Date of Birth"
msgstr "Datum rođenja"
-#: core/forms.py:177
+#: core/forms.py:175
msgid "Personal data"
msgstr "Osobni podaci"
-#: core/forms.py:189
+#: core/forms.py:187
msgid "Workout reminders"
msgstr "Podsjetitelji za treninge"
-#: core/forms.py:196
+#: core/forms.py:194
msgid "Other settings"
msgstr "Druge postavke"
-#: core/forms.py:204 core/views/user.py:614 core/views/user.py:629
-#: core/views/user.py:641 gym/forms.py:73 utils/generic_views.py:143
+#: core/forms.py:202 core/views/user.py:630 core/views/user.py:654
+#: core/views/user.py:668 gym/forms.py:73 utils/generic_views.py:137
msgid "Save"
msgstr "Spremi"
-#: core/forms.py:211
+#: core/forms.py:209
msgid "Used for password resets and, optionally, email reminders."
msgstr ""
"Koristi se za obnavljanje lozinki i opcionalno za podsjetnike putem e-pošte."
-#: core/forms.py:240
+#: core/forms.py:238
msgid "This e-mail address is already in use."
msgstr "Ova se e-mail adresa već koristi."
-#: core/forms.py:261 gym/templates/gym/new_user.html:26
+#: core/forms.py:259 gym/templates/gym/new_user.html:26
#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:217
msgid "Password"
msgstr "Lozinka"
-#: core/forms.py:263
+#: core/forms.py:261
msgid "Please enter your current password."
msgstr "Upiši svoju aktualnu lozinku."
-#: core/forms.py:272 core/templates/language/view.html:70
+#: core/forms.py:270 core/templates/language/view.html:70
#: core/templates/license/list.html:21
#: core/templates/repetition_unit/list.html:22
-#: core/templates/user/overview.html:233
+#: core/templates/user/overview.html:236
#: core/templates/weight_unit/list.html:22
#: exercises/templates/categories/admin-overview.html:21
#: exercises/templates/equipment/admin-overview.html:21
@@ -136,27 +135,30 @@ msgstr "Upiši svoju aktualnu lozinku."
#: gym/templates/admin_notes/list.html:37
#: gym/templates/contract_option/list.html:35
#: gym/templates/contract_type/list.html:36 gym/templates/document/list.html:46
-#: gym/templates/gym/list.html:23 nutrition/templates/ingredient/view.html:168
-#: nutrition/templates/ingredient/view.html:215
-#: nutrition/templates/units/list.html:25
+#: gym/templates/gym/list.html:23 nutrition/templates/ingredient/view.html:209
+#: nutrition/templates/ingredient/view.html:254
msgid "Delete"
msgstr "Izbriši"
-#: core/forms.py:281
+#: core/forms.py:279
msgid "Invalid password"
msgstr "Nevaljana lozinka"
-#: core/forms.py:293
+#: core/forms.py:291 core/forms.py:349
msgid "The form is secured with reCAPTCHA"
msgstr "Obrazac je zaštićen pomoću reCAPTCHA"
-#: core/forms.py:314 core/forms.py:341 core/templates/navigation.html:272
-#: core/templates/navigation.html:285 core/templates/template.html:123
-#: core/templates/user/login.html:21 core/views/user.py:285
+#: core/forms.py:312 core/forms.py:339 core/templates/navigation.html:269
+#: core/templates/navigation.html:282 core/templates/template.html:113
+#: core/templates/user/login.html:21 core/views/user.py:293
#: software/templates/features.html:87 software/templates/features.html:442
msgid "Register"
msgstr "Registracija"
+#: core/forms.py:360 weight/templates/import_csv_form.html:9
+msgid "Submit"
+msgstr "Pošalji"
+
#: core/models/language.py:31 core/templates/language/view.html:21
msgid "Language short name"
msgstr "Kratko ime jezika"
@@ -193,36 +195,36 @@ msgstr "Poveznica"
msgid "Link to license text or other information"
msgstr "Poveznica na tekst licence ili druge informacije"
-#: core/models/profile.py:57
+#: core/models/profile.py:60
#, python-format
msgid "%(birthdate)s is not a valid birthdate"
msgstr "%(birthdate)s nije valjani datum rođenja"
-#: core/models/profile.py:66
+#: core/models/profile.py:69
msgid "Male"
msgstr "Muškarac"
-#: core/models/profile.py:67
+#: core/models/profile.py:70
msgid "Female"
msgstr "Žena"
-#: core/models/profile.py:74
+#: core/models/profile.py:77
msgid "Low"
msgstr "Nisko"
-#: core/models/profile.py:75
+#: core/models/profile.py:78
msgid "Medium"
msgstr "Srednje"
-#: core/models/profile.py:76
+#: core/models/profile.py:79
msgid "High"
msgstr "Visoko"
-#: core/models/profile.py:82
+#: core/models/profile.py:85
msgid "Metric (kilogram)"
msgstr "Metrično (kilogram)"
-#: core/models/profile.py:83
+#: core/models/profile.py:86
msgid "Imperial (pound)"
msgstr "Britanski (funta)"
@@ -340,7 +342,7 @@ msgstr "Prosječni broj sati tjedno"
msgid "Free time"
msgstr "Slobodno vrijeme"
-#: core/models/profile.py:320 nutrition/templates/rate/form.html:66
+#: core/models/profile.py:320 nutrition/templates/rate/form.html:67
msgid "Total daily calories"
msgstr "Ukupna dnevna koločina kalorija"
@@ -381,20 +383,45 @@ msgstr "Uključi trofeje"
msgid "Enable or disable the trophy system for this user"
msgstr "Uključi ili isključi sustav trofeja za ovog korisnika"
-#: core/models/profile.py:446
+#: core/models/profile.py:457
msgid "The sum of all hours has to be 24"
msgstr "Zbroj svih sati mora biti 24"
-#: core/models/rep_unit.py:36 core/models/weight_unit.py:42
-#: core/templates/user/overview.html:280 core/views/user.py:589
+#: core/models/rep_unit.py:32 i18n.tpl:30
+msgid "Repetitions"
+msgstr "Ponavljanja"
+
+#: core/models/rep_unit.py:33 core/templates/user/overview.html:82
+#: exercises/templates/history/overview.html:30
+msgid "Time"
+msgstr "Vrijeme"
+
+#: core/models/rep_unit.py:34
+#, fuzzy
+#| msgid "Resistance band"
+msgid "Distance"
+msgstr "Elastična vrpca"
+
+#: core/models/rep_unit.py:47 core/models/weight_unit.py:42
+#: core/templates/user/overview.html:283 core/views/user.py:605
#: exercises/models/muscle.py:36 gym/models/contract.py:52
#: gym/models/contract.py:103 gym/models/gym.py:46
#: gym/models/user_document.py:84 gym/templates/contract/view.html:50
#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:108
-#: gym/views/gym.py:158 nutrition/templates/ingredient/view.html:151
+#: gym/views/gym.py:158 nutrition/templates/ingredient/view.html:192
msgid "Name"
msgstr "Ime"
+#: core/models/rep_unit.py:53
+#, fuzzy
+#| msgid "Unit"
+msgid "Unit Type"
+msgstr "Jedinica"
+
+#: core/models/rep_unit.py:54
+msgid "The type of unit (repetitions, time, or distance)"
+msgstr ""
+
#: core/templates/403.html:4
msgid "Forbidden!"
msgstr "Zabranjeno!"
@@ -425,6 +452,56 @@ msgstr ""
"aktualizirati preglednik i ako to ne pomogne, pokušaj ponovo kasnije. Ako "
"problem ustraje, zatraži pomoć na dolje navedene načine:"
+#: core/templates/account/email/email_confirmation_message.html:81
+msgid "Almost there!"
+msgstr ""
+
+#: core/templates/account/email/email_confirmation_message.html:85
+#, fuzzy, python-format
+#| msgid ""
+#| "You're receiving this e-mail because you requested a password reset for "
+#| "your user account at %(site_name)s."
+msgid ""
+"You're receiving this email because the user \"%(user_display)s\" has given "
+"your email address to register an account on %(site_domain)s."
+msgstr ""
+"Poslali smo ti ovu e-mail poruku jer si zatražio/la ponovno postavljanje "
+"lozinke za tvoj korisnički račun na %(site_name)s."
+
+#: core/templates/account/email/email_confirmation_message.html:93
+msgid ""
+"Your email verification code is listed below. Please enter it in your open "
+"browser window."
+msgstr ""
+
+#: core/templates/account/email/email_confirmation_message.html:100
+#, fuzzy
+#| msgid "Please click the following link to confirm your email: %(link)s"
+msgid "Please click the button below to confirm your email address."
+msgstr ""
+"Pritisni sljedeću poveznicu za potvrđivanje tvoje e-mail adrese: %(link)s"
+
+#: core/templates/account/email/email_confirmation_message.html:106
+#, fuzzy
+#| msgid "Unverified email"
+msgid "Confirm email"
+msgstr "Neovjerena e-mail adresa"
+
+#: core/templates/account/email/email_confirmation_message.html:110
+#, python-format
+msgid ""
+"The link is valid for %(expire_hours)s hours (until %(date)s, %(time)s). You "
+"can request a new one from your profile settings."
+msgstr ""
+
+#: core/templates/account/email/email_confirmation_message.html:116
+msgid "If the button doesn't work, copy and paste this link into your browser:"
+msgstr ""
+
+#: core/templates/account/email/email_confirmation_message.html:125
+msgid "the wger Team"
+msgstr "wger tim"
+
#: core/templates/base.html:10
#, python-format
msgid ""
@@ -458,53 +535,7 @@ msgstr ""
msgid "Are you sure you want to delete this? This action cannot be undone."
msgstr "Stvarno želiš ovo izbrisati? Ova je nepovratna radnja."
-#: core/templates/email_verification/confirm_template.html:4
-msgid "Email verification"
-msgstr "Ovjeravanje e-mail adrese"
-
-#: core/templates/email_verification/confirm_template.html:18
-#, python-format
-msgid "%(username)s, your email was verified"
-msgstr "%(username)s, tvoja je e-mail adresa ovjerena"
-
-#: core/templates/email_verification/confirm_template.html:22
-msgid "Error, invalid verification token"
-msgstr "Greška, nevaljan token ovjere"
-
-#: core/templates/email_verification/email_body_html.tpl:6
-msgid "Email Confirmation"
-msgstr "Potvrđivanje e-mail adrese"
-
-#: 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 "Skoro si gotov/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 ""
-"Pritisni <a href=\"%(link)s\">ovdje</a> za potvrđivanje tvoje e-mail adrese"
-
-#: 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 "Token isteče %(time)s"
-
-#: core/templates/email_verification/email_body_html.tpl:14
-#: core/templates/email_verification/email_body_txt.tpl:8
-msgid "the wger Team"
-msgstr "wger tim"
-
-#: core/templates/email_verification/email_body_txt.tpl:4
-#, python-format
-msgid "Please click the following link to confirm your email: %(link)s"
-msgstr ""
-"Pritisni sljedeću poveznicu za potvrđivanje tvoje e-mail adrese: %(link)s"
-
-#: core/templates/language/overview.html:4 core/templates/navigation.html:344
+#: core/templates/language/overview.html:4 core/templates/navigation.html:341
msgid "Languages"
msgstr "Jezici"
@@ -513,16 +544,16 @@ msgid "Nothing found."
msgstr "Ništa nije pronađeno."
#: core/templates/language/overview.html:22
-#: nutrition/templates/ingredient/overview.html:38
+#: nutrition/templates/ingredient/overview.html:43
msgid "Add one now."
msgstr "Dodaj jedan sastojak."
#: core/templates/language/overview.html:34 core/templates/license/list.html:43
-#: core/templates/repetition_unit/list.html:46
-#: core/templates/user/overview.html:344 core/templates/user/overview.html:384
-#: core/templates/user/overview.html:422
-#: core/templates/weight_unit/list.html:46 core/views/languages.py:74
-#: core/views/license.py:66 core/views/repetition_units.py:66
+#: core/templates/repetition_unit/list.html:44
+#: core/templates/user/overview.html:347 core/templates/user/overview.html:387
+#: core/templates/user/overview.html:425
+#: core/templates/weight_unit/list.html:46 core/views/languages.py:77
+#: core/views/license.py:66 core/views/repetition_units.py:76
#: core/views/weight_units.py:66
#: exercises/templates/categories/admin-overview.html:40
#: exercises/templates/equipment/admin-overview.html:39
@@ -535,14 +566,14 @@ msgstr "Dodaj jedan sastojak."
#: gym/templates/gym/member_list.html:264
#: gym/templates/gym/member_list.html:303
#: mailer/templates/mailer/gym/overview.html:43
-#: nutrition/templates/ingredient/overview.html:60
+#: nutrition/templates/ingredient/overview.html:97
msgid "Add"
msgstr "Dodaj"
#: core/templates/language/view.html:61 core/templates/user/api_key.html:41
#: core/templates/user/preferences.html:50 gym/models/contract.py:203
#: gym/templates/contract/view.html:41 gym/templates/gym/member_list.html:270
-#: nutrition/templates/ingredient/view.html:206
+#: nutrition/templates/ingredient/view.html:245
msgid "Options"
msgstr "Opcije"
@@ -552,9 +583,9 @@ msgstr "Popis licenca"
#: core/templates/license/list.html:30
#: core/templates/repetition_unit/list.html:32
-#: core/templates/user/overview.html:104 core/templates/user/overview.html:136
-#: core/templates/user/overview.html:185 core/templates/user/overview.html:365
-#: core/templates/user/overview.html:404 core/templates/user/overview.html:448
+#: core/templates/user/overview.html:107 core/templates/user/overview.html:139
+#: core/templates/user/overview.html:188 core/templates/user/overview.html:368
+#: core/templates/user/overview.html:407 core/templates/user/overview.html:451
#: core/templates/weight_unit/list.html:32
#: exercises/templates/categories/admin-overview.html:30
#: exercises/templates/equipment/admin-overview.html:30
@@ -566,11 +597,10 @@ msgstr "Popis licenca"
#: gym/templates/gym/member_list.html:284
#: gym/templates/gym/member_list.html:321
#: mailer/templates/mailer/gym/overview.html:30
-#: nutrition/templates/units/list.html:34
msgid "Nothing found"
msgstr "Ništa nije pronađeno"
-#: core/templates/misc/about.html:4 core/templates/template.html:160
+#: core/templates/misc/about.html:4 core/templates/template.html:150
msgid "Imprint"
msgstr "Impresum"
@@ -578,162 +608,157 @@ msgstr "Impresum"
msgid "Training"
msgstr "Treniranje"
-#: core/templates/navigation.html:37 core/templates/user/overview.html:25
+#: core/templates/navigation.html:36 core/templates/user/overview.html:28
msgid "Routines"
msgstr "Rutine"
-#: core/templates/navigation.html:45 core/templates/user/overview.html:70
+#: core/templates/navigation.html:44 core/templates/user/overview.html:73
msgid "Calendar"
msgstr "Kalendar"
-#: core/templates/navigation.html:55
+#: core/templates/navigation.html:53
msgid "Measurements"
msgstr "Mjerenja"
-#: core/templates/navigation.html:66 gallery/templates/images/overview.html:6
+#: core/templates/navigation.html:64 gallery/templates/images/overview.html:6
msgid "Gallery"
msgstr "Galerija"
-#: core/templates/navigation.html:72
+#: core/templates/navigation.html:74 core/templates/navigation.html:400
+#: trophies/templates/trophies/overview.html:7
+msgid "Trophies"
+msgstr "Trofeje"
+
+#: core/templates/navigation.html:79
msgid "Workout templates"
msgstr "Predlošci treninga"
-#: core/templates/navigation.html:79
+#: core/templates/navigation.html:86
msgid "Your templates"
msgstr "Tvoji predlošci"
-#: core/templates/navigation.html:88
+#: core/templates/navigation.html:95
msgid "Public templates"
msgstr "Javni predlošci"
-#: core/templates/navigation.html:96 software/templates/features.html:51
+#: core/templates/navigation.html:103 software/templates/features.html:51
#: software/templates/features.html:480
msgid "Exercises"
msgstr "Vježbe"
-#: core/templates/navigation.html:102 core/templates/navigation.html:176
-#: core/templates/navigation.html:339
+#: core/templates/navigation.html:109 core/templates/navigation.html:336
msgid "Administration"
msgstr "Administracija"
-#: core/templates/navigation.html:106
+#: core/templates/navigation.html:113
msgid "Exercise edit history"
msgstr "Povijest uređivanja vježbe"
-#: core/templates/navigation.html:112
+#: core/templates/navigation.html:119
msgid "Equipment"
msgstr "Oprema"
-#: core/templates/navigation.html:118
+#: core/templates/navigation.html:125
msgid "Muscles"
msgstr "Mišići"
-#: core/templates/navigation.html:124
+#: core/templates/navigation.html:131
#: exercises/templates/categories/admin-overview.html:4
msgid "Categories"
msgstr "Kategorije"
-#: core/templates/navigation.html:139 software/templates/features.html:468
+#: core/templates/navigation.html:146 software/templates/features.html:468
msgid "Nutrition"
msgstr "Prehrana"
-#: core/templates/navigation.html:147 core/templates/user/overview.html:144
+#: core/templates/navigation.html:154 core/templates/user/overview.html:147
msgid "Nutrition plans"
msgstr "Planovi prehrane"
-#: core/templates/navigation.html:156
+#: core/templates/navigation.html:163
msgid "BMI calculator"
msgstr "Kalkulator indeksa tjelesne mase"
-#: core/templates/navigation.html:165 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:172 nutrition/templates/rate/form.html:18
msgid "Daily calories calculator"
msgstr "Kalkulator dnevnih kalorija"
-#: core/templates/navigation.html:171
+#: core/templates/navigation.html:178
#: nutrition/templates/ingredient/overview.html:10
msgid "Ingredient overview"
msgstr "Pregled sastojaka"
-#: core/templates/navigation.html:180 nutrition/templates/units/list.html:6
-msgid "Ingredient weight units"
-msgstr "Jedinica težine sastojka"
-
-#: core/templates/navigation.html:196 software/templates/features.html:463
+#: core/templates/navigation.html:193 software/templates/features.html:463
msgid "Body weight"
msgstr "Tjelesna težina"
-#: core/templates/navigation.html:203 core/templates/user/overview.html:114
+#: core/templates/navigation.html:200 core/templates/user/overview.html:117
msgid "Weight overview"
msgstr "Pregled težine"
-#: core/templates/navigation.html:217
+#: core/templates/navigation.html:214
msgid "About this software"
msgstr "O ovom softveru"
-#: core/templates/navigation.html:223 software/templates/about_us.html:5
+#: core/templates/navigation.html:220 software/templates/about_us.html:5
msgid "Support & Get Involved"
msgstr "Podrška i sudjelovanje"
-#: core/templates/navigation.html:229 software/templates/features.html:528
+#: core/templates/navigation.html:226 software/templates/features.html:528
msgid "REST API"
msgstr "REST API"
-#: core/templates/navigation.html:235 utils/models.py:45
+#: core/templates/navigation.html:232 utils/models.py:45
msgid "License"
msgstr "Licenca"
-#: core/templates/navigation.html:241
+#: core/templates/navigation.html:238
msgid "Developer documentation"
msgstr "Dokumentacija za programere"
-#: core/templates/navigation.html:248
+#: core/templates/navigation.html:245
msgid "Get the code"
msgstr "Nabavi izvorni kod"
-#: core/templates/navigation.html:255 core/templates/template.html:199
-#: software/templates/features.html:603
+#: core/templates/navigation.html:252 core/templates/template.html:202
+#: software/templates/features.html:614
msgid "Translate"
msgstr "Prevedi"
-#: core/templates/navigation.html:292 core/templates/user/login.html:30
+#: core/templates/navigation.html:289 core/templates/user/login.html:30
msgid "Reset password"
msgstr "Obnovi lozinku"
-#: core/templates/navigation.html:301 core/templates/navigation.html:329
+#: core/templates/navigation.html:298 core/templates/navigation.html:326
msgid "Logout"
msgstr "Odjava"
-#: core/templates/navigation.html:320
+#: core/templates/navigation.html:317
msgid "My preferences"
msgstr "Moje postavke"
-#: core/templates/navigation.html:352
+#: core/templates/navigation.html:349
msgid "Licenses"
msgstr "Licence"
-#: core/templates/navigation.html:360
+#: core/templates/navigation.html:357
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr "Jedinice ponavljanja"
-#: core/templates/navigation.html:368 core/templates/weight_unit/list.html:4
-#: nutrition/templates/ingredient/view.html:141
+#: core/templates/navigation.html:365 core/templates/weight_unit/list.html:4
+#: nutrition/templates/ingredient/view.html:182
msgid "Weight units"
msgstr "Jedinice težine"
-#: core/templates/navigation.html:376 core/templates/user/list.html:4
+#: core/templates/navigation.html:373 core/templates/user/list.html:4
msgid "User list"
msgstr "Popis korisnika"
-#: core/templates/navigation.html:382
+#: core/templates/navigation.html:379
msgid "Gyms"
msgstr "Teretane"
-#: core/templates/navigation.html:403
-#: trophies/templates/trophies/overview.html:7
-msgid "Trophies"
-msgstr "Trofeje"
-
#: core/templates/registration/password_reset_complete.html:4
msgid "Password reset complete"
msgstr "Obnavljanje lozinke gotovo"
@@ -793,26 +818,30 @@ msgstr "prethodno"
msgid "next"
msgstr "dalje"
-#: core/templates/template.html:96
+#: core/templates/template.html:86
msgid "Close"
msgstr "Zatvori"
-#: core/templates/template.html:112
+#: core/templates/template.html:102
msgid ""
"You are using a guest account, data entered will be deleted after a week."
msgstr ""
"Koristiš račun gosta, upisani podaci će se izbrisati nakon tjedan dana."
-#: core/templates/template.html:117
+#: core/templates/template.html:107
msgid "Create some demo entries"
msgstr "Stvori neke demo snimke"
-#: core/templates/template.html:165 software/templates/features.html:568
+#: core/templates/template.html:155 software/templates/features.html:568
#: software/templates/tos.html:7
msgid "Terms of service"
msgstr "Uvjeti usluge"
-#: core/templates/template_features.html:53 software/templates/features.html:9
+#: core/templates/template.html:181 software/templates/features.html:595
+msgid "Browser language"
+msgstr ""
+
+#: core/templates/template_features.html:46 software/templates/features.html:9
msgid "Features"
msgstr "Značajke"
@@ -871,99 +900,94 @@ msgstr "Nemaš račun?"
msgid "Forgot password?"
msgstr "Zaboravio/la si lozinku?"
-#: core/templates/user/overview.html:25 core/templates/user/overview.html:68
-#: core/templates/user/overview.html:112 core/templates/user/overview.html:144
-#: core/templates/user/overview.html:348 core/templates/user/overview.html:390
-#: core/templates/user/overview.html:426
+#: core/templates/user/overview.html:28 core/templates/user/overview.html:71
+#: core/templates/user/overview.html:115 core/templates/user/overview.html:147
+#: core/templates/user/overview.html:351 core/templates/user/overview.html:393
+#: core/templates/user/overview.html:429
#, python-format
msgid "last %(number)s"
msgstr "zadnjih %(number)s"
-#: core/templates/user/overview.html:27 core/templates/user/overview.html:146
-#: core/templates/user/overview.html:343 core/templates/user/overview.html:382
-#: core/templates/user/overview.html:421 gym/templates/gym/member_list.html:226
+#: core/templates/user/overview.html:30 core/templates/user/overview.html:149
+#: core/templates/user/overview.html:346 core/templates/user/overview.html:385
+#: core/templates/user/overview.html:424 gym/templates/gym/member_list.html:226
#: gym/templates/gym/member_list.html:262
#: gym/templates/gym/member_list.html:302
msgid "Overview"
msgstr "Pregled"
-#: core/templates/user/overview.html:34 core/templates/user/overview.html:76
-#: core/templates/user/overview.html:120 core/templates/user/overview.html:152
+#: core/templates/user/overview.html:37 core/templates/user/overview.html:79
+#: core/templates/user/overview.html:123 core/templates/user/overview.html:155
#: manager/helpers.py:88 software/templates/about_us.html:170
#: weight/templates/import_csv_preview.html:13
#: weight/templates/import_csv_preview.html:42 weight/views.py:54
msgid "Date"
msgstr "Datum"
-#: core/templates/user/overview.html:35 core/templates/user/overview.html:153
+#: core/templates/user/overview.html:38 core/templates/user/overview.html:156
#: gym/models/contract.py:58 gym/models/contract.py:109
msgid "Description"
msgstr "Opis"
-#: core/templates/user/overview.html:36
+#: core/templates/user/overview.html:39
msgid "Number of logs (days)"
msgstr "Broj dnevnika (dani)"
-#: core/templates/user/overview.html:37 core/views/user.py:590
+#: core/templates/user/overview.html:40 core/views/user.py:606
#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:158
msgid "Last activity"
msgstr "Zadnja aktivnost"
-#: core/templates/user/overview.html:58
+#: core/templates/user/overview.html:61
msgid "No workouts found."
msgstr "Nije pronađen nijedan trening."
-#: core/templates/user/overview.html:68
+#: core/templates/user/overview.html:71
msgid "Log"
msgstr "Zapis"
-#: core/templates/user/overview.html:77
+#: core/templates/user/overview.html:80
msgid "General impression"
msgstr "Opći dojam"
-#: core/templates/user/overview.html:78 core/templates/user/overview.html:390
+#: core/templates/user/overview.html:81 core/templates/user/overview.html:393
msgid "Notes"
msgstr "Bilješke"
-#: core/templates/user/overview.html:79
-#: exercises/templates/history/overview.html:30
-msgid "Time"
-msgstr "Vrijeme"
-
-#: core/templates/user/overview.html:112 core/templates/user/overview.html:121
+#: core/templates/user/overview.html:115 core/templates/user/overview.html:124
#: manager/helpers.py:89 weight/templates/import_csv_preview.html:14
#: weight/templates/import_csv_preview.html:43 weight/views.py:54
msgid "Weight"
msgstr "Težina"
-#: core/templates/user/overview.html:154
-#: nutrition/templates/ingredient/view.html:51 nutrition/views/plan.py:245
+#: core/templates/user/overview.html:157
+#: nutrition/templates/ingredient/view.html:52 nutrition/views/plan.py:244
msgid "Energy"
msgstr "Energija"
-#: core/templates/user/overview.html:155
-#: nutrition/templates/ingredient/view.html:58 nutrition/views/plan.py:251
+#: core/templates/user/overview.html:158
+#: nutrition/templates/ingredient/view.html:59 nutrition/views/plan.py:250
msgid "Protein"
msgstr "Proteini"
-#: core/templates/user/overview.html:156
-#: nutrition/templates/ingredient/view.html:64 nutrition/views/plan.py:259
+#: core/templates/user/overview.html:159
+#: nutrition/templates/ingredient/view.html:65 nutrition/views/plan.py:258
msgid "Carbohydrates"
msgstr "Ugljikohidrati"
-#: core/templates/user/overview.html:157
-#: nutrition/templates/ingredient/view.html:80 nutrition/views/plan.py:273
+#: core/templates/user/overview.html:160
+#: nutrition/templates/ingredient/view.html:81 nutrition/views/plan.py:272
msgid "Fat"
msgstr "Mast"
-#: core/templates/user/overview.html:170
-#: nutrition/templates/ingredient/view.html:53
+#: core/templates/user/overview.html:173
+#: nutrition/templates/ingredient/view.html:54
msgid "kcal"
msgstr "kcal"
-#: core/templates/user/overview.html:201 core/templates/user/overview.html:340
-#: core/templates/user/overview.html:379 core/templates/user/overview.html:418
-#: core/templates/user/overview.html:463 gym/templates/gym/list.html:45
+#: core/templates/user/overview.html:204 core/templates/user/overview.html:343
+#: core/templates/user/overview.html:382 core/templates/user/overview.html:421
+#: core/templates/user/overview.html:466 gym/templates/gym/list.html:45
#: gym/templates/gym/member_list.html:91 gym/templates/gym/member_list.html:149
#: gym/templates/gym/member_list.html:187
#: gym/templates/gym/member_list.html:223
@@ -972,109 +996,113 @@ msgstr "kcal"
msgid "Actions"
msgstr "Radnje"
-#: core/templates/user/overview.html:210
+#: core/templates/user/overview.html:213
msgid "Deactivate user"
msgstr "Deaktiviraj korisnika"
-#: core/templates/user/overview.html:214
+#: core/templates/user/overview.html:217
msgid "Activate user"
msgstr "Aktiviraj korisnika"
-#: core/templates/user/overview.html:223
+#: core/templates/user/overview.html:226
msgid "Reset user password"
msgstr "Obnovi korisničku lozinku"
-#: core/templates/user/overview.html:227 gym/templates/gym/member_list.html:30
+#: core/templates/user/overview.html:230 gym/templates/gym/member_list.html:30
msgid "Roles"
msgstr "Uloge"
-#: core/templates/user/overview.html:243
+#: core/templates/user/overview.html:246
msgid "Password reset confirmation"
msgstr "Potvrda obnavljanja lozinke"
-#: core/templates/user/overview.html:247
+#: core/templates/user/overview.html:250
msgid "Do you really want to change this user&#39;s password?"
msgstr "Stvarno želiš promijeniti lozinku ovog korisnika?"
-#: core/templates/user/overview.html:250
+#: core/templates/user/overview.html:253
#: exercises/templates/history/overview.html:106
+#: nutrition/templates/ingredient/view.html:148
+#: nutrition/templates/ingredient/view.html:160
msgid "No"
msgstr "Ne"
-#: core/templates/user/overview.html:251
+#: core/templates/user/overview.html:254
#: exercises/templates/history/overview.html:99
+#: nutrition/templates/ingredient/view.html:146
+#: nutrition/templates/ingredient/view.html:158
msgid "Yes"
msgstr "Da"
-#: core/templates/user/overview.html:272 gym/templates/gym/member_list.html:105
+#: core/templates/user/overview.html:275 gym/templates/gym/member_list.html:105
msgid "Details"
msgstr "Detalji"
-#: core/templates/user/overview.html:276 gym/views/export.py:57
-#: manager/helpers.py:89 nutrition/views/plan.py:151
-#: nutrition/views/plan.py:157
+#: core/templates/user/overview.html:279 gym/views/export.py:57
+#: manager/helpers.py:89 nutrition/views/plan.py:150
+#: nutrition/views/plan.py:156
msgid "Nr."
msgstr "Br."
-#: core/templates/user/overview.html:298 gym/models/contract.py:287
+#: core/templates/user/overview.html:301 gym/models/contract.py:287
#: gym/models/gym.py:50 gym/templates/contract/view.html:75
#: gym/templates/gym/member_list.html:112 gym/views/export.py:68
msgid "Phone"
msgstr "Telefon"
-#: core/templates/user/overview.html:302 gym/templates/contract/view.html:87
+#: core/templates/user/overview.html:305 gym/templates/contract/view.html:87
#: gym/templates/gym/member_list.html:130
msgid "Address"
msgstr "Adresa"
-#: core/templates/user/overview.html:313
+#: core/templates/user/overview.html:316
msgid "Registered"
msgstr "Registriran/a"
-#: core/templates/user/overview.html:317
+#: core/templates/user/overview.html:320
msgid "Last login"
msgstr "Zadnja prijava"
-#: core/templates/user/overview.html:322
+#: core/templates/user/overview.html:325
msgid "Status"
msgstr "Stanje"
-#: core/templates/user/overview.html:325
+#: core/templates/user/overview.html:328
msgid "Active"
msgstr "Aktivno"
-#: core/templates/user/overview.html:327
+#: core/templates/user/overview.html:330
msgid "Inactive"
msgstr "Neaktivno"
-#: core/templates/user/overview.html:348 gym/templates/contract/list.html:4
+#: core/templates/user/overview.html:351 gym/templates/contract/list.html:4
#: gym/templates/gym/member_list.html:218
msgid "Contracts"
msgstr "Ugovori"
-#: core/templates/user/overview.html:426 gym/templates/document/list.html:4
+#: core/templates/user/overview.html:429 gym/templates/document/list.html:4
msgid "Documents"
msgstr "Dokumenti"
-#: core/templates/user/overview.html:433 gym/templates/document/list.html:33
+#: core/templates/user/overview.html:436 gym/templates/document/list.html:33
msgid "Download"
msgstr "Preuzimanje"
-#: core/templates/user/overview.html:474 gym/views/admin_config.py:44
+#: core/templates/user/overview.html:477 gym/views/admin_config.py:44
#: gym/views/admin_config.py:58 gym/views/user_config.py:46
msgid "Configuration"
msgstr "Konfiguracija"
-#: core/templates/user/overview.html:477 gym/models/user_config.py:92
+#: core/templates/user/overview.html:480 gym/models/user_config.py:92
msgid "Include in inactive overview"
msgstr "Uključi u neaktivni pregled"
-#: core/templates/user/overview.html:510
+#: core/templates/user/overview.html:513
#, python-format
msgid "Admin login is only available for users in %(gym_name)s"
msgstr "Administratorska prijava je dostupna samo korisnicima u %(gym_name)s"
-#: core/templates/user/overview.html:514
+#: core/templates/user/overview.html:517
msgid "Log in as this user"
msgstr "Prijavi se kao ovaj korisnik"
@@ -1098,7 +1126,7 @@ msgstr "Pošalji e-mail za ovjeru"
msgid "You need to verify your email to contribute exercises"
msgstr "Za dodavanje vježbi moraš ovjeriti tvoju e-mail adresu"
-#: core/templates/user/preferences.html:55 core/views/user.py:601
+#: core/templates/user/preferences.html:55 core/views/user.py:617
msgid "Change password"
msgstr "Promjeni lozinku"
@@ -1106,23 +1134,23 @@ msgstr "Promjeni lozinku"
msgid "Already have an account?"
msgstr "Već imaš korisnički račun?"
-#: core/templatetags/wger_extras.py:142 i18n.tpl:38
+#: core/templatetags/wger_extras.py:142 i18n.tpl:39
msgid "kg"
msgstr "kg"
#: core/templatetags/wger_extras.py:144
-#: nutrition/templates/ingredient/view.html:60
-#: nutrition/templates/ingredient/view.html:66
-#: nutrition/templates/ingredient/view.html:73
-#: nutrition/templates/ingredient/view.html:82
-#: nutrition/templates/ingredient/view.html:89
-#: nutrition/templates/ingredient/view.html:111
-#: nutrition/templates/ingredient/view.html:121
+#: nutrition/templates/ingredient/view.html:61
+#: nutrition/templates/ingredient/view.html:67
+#: nutrition/templates/ingredient/view.html:74
+#: nutrition/templates/ingredient/view.html:83
+#: nutrition/templates/ingredient/view.html:90
+#: nutrition/templates/ingredient/view.html:112
+#: nutrition/templates/ingredient/view.html:122
msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr "g"
-#: core/templatetags/wger_extras.py:147 i18n.tpl:39
+#: core/templatetags/wger_extras.py:147 i18n.tpl:40
msgid "lb"
msgstr "lb"
@@ -1131,36 +1159,35 @@ msgctxt "weight unit, i.e. ounces"
msgid "oz"
msgstr "unca"
-#: core/views/languages.py:85 exercises/views/categories.py:122
+#: core/views/languages.py:88 exercises/views/categories.py:122
#: exercises/views/equipment.py:103 exercises/views/muscles.py:99
-#: nutrition/views/ingredient.py:120 nutrition/views/unit.py:110
+#: nutrition/views/ingredient.py:125
msgid "Successfully deleted"
msgstr "Uspješno izbrisano"
-#: core/views/languages.py:93 core/views/license.py:103
-#: core/views/repetition_units.py:115 core/views/weight_units.py:115
+#: core/views/languages.py:96 core/views/license.py:103
+#: core/views/repetition_units.py:114 core/views/weight_units.py:115
#: exercises/views/categories.py:128 exercises/views/muscles.py:106
#: gallery/views/images.py:124 gym/views/admin_notes.py:196
#: gym/views/document.py:206 gym/views/gym.py:481
-#: nutrition/views/ingredient.py:127 nutrition/views/unit.py:117
+#: nutrition/views/ingredient.py:132
#, python-brace-format
msgid "Delete {0}?"
msgstr "Izbrisati {0}?"
-#: core/views/languages.py:111 core/views/license.py:85
-#: core/views/repetition_units.py:86 core/views/user.py:464
+#: core/views/languages.py:114 core/views/license.py:85
+#: core/views/repetition_units.py:96 core/views/user.py:480
#: core/views/weight_units.py:86 exercises/views/categories.py:98
#: exercises/views/equipment.py:81 exercises/views/muscles.py:87
#: gym/views/admin_notes.py:161 gym/views/config.py:68
#: gym/views/contract.py:186 gym/views/contract_option.py:123
#: gym/views/contract_type.py:123 gym/views/document.py:171
-#: gym/views/gym.py:463 nutrition/views/ingredient.py:146
-#: nutrition/views/unit.py:143
+#: gym/views/gym.py:463 nutrition/views/ingredient.py:151
#, python-brace-format
msgid "Edit {0}"
msgstr "Uredi {0}"
-#: core/views/misc.py:74
+#: core/views/misc.py:73
msgid ""
"We have created sample workout, workout schedules, weight logs, (body) "
"weight and nutrition plan entries so you can better see what this site can "
@@ -1170,48 +1197,48 @@ msgstr ""
"(tjelesnu) težinu i unose za planove prehrane za bolji prikaz "
"funkcionalnosti ove stranice. Slobodno ih uredi ili izbriši!"
-#: core/views/user.py:143
+#: core/views/user.py:145
#, python-brace-format
msgid "Account \"{0}\" was successfully deleted"
msgstr "Račun „{0}” je uspješno izbrisan"
-#: core/views/user.py:279
+#: core/views/user.py:287
msgid "You were successfully registered"
msgstr "Uspješno si registriran/a"
-#: core/views/user.py:341
+#: core/views/user.py:357
msgid "Settings successfully updated"
msgstr "Postavke su uspješno aktualizirane"
-#: core/views/user.py:380
+#: core/views/user.py:396
msgid "The user was successfully deactivated"
msgstr "Korisnik je uspješno deaktiviran"
-#: core/views/user.py:417
+#: core/views/user.py:433
msgid "The user was successfully activated"
msgstr "Korisnik je uspješno aktiviran"
-#: core/views/user.py:432
+#: core/views/user.py:448
msgid "Edit user"
msgstr "Uredi korisnika"
-#: core/views/user.py:587 gym/templates/gym/member_list.html:26
+#: core/views/user.py:603 gym/templates/gym/member_list.html:26
#: gym/views/gym.py:158
msgid "ID"
msgstr "ID"
-#: core/views/user.py:588 gym/forms.py:95 gym/templates/contract/view.html:55
+#: core/views/user.py:604 gym/forms.py:95 gym/templates/contract/view.html:55
#: gym/templates/gym/member_list.html:27 gym/views/export.py:59
#: gym/views/gym.py:158 gym/views/gym.py:217
msgid "Username"
msgstr "Korisničko ime"
-#: core/views/user.py:591 gym/templates/gym/new_user.html:34
+#: core/views/user.py:607 gym/templates/gym/new_user.html:34
#: gym/views/export.py:58 gym/views/gym.py:217
msgid "Gym"
msgstr "Teretana"
-#: core/views/user.py:650
+#: core/views/user.py:678
#, python-format
msgid "A verification email was sent to %(email)s"
msgstr "E-mail za ovjeru je poslan na %(email)s"
@@ -1228,16 +1255,16 @@ msgstr "Alternativno ime"
msgid "A more basic name for the muscle"
msgstr "Osnovnije ime za mišić"
-#: exercises/models/video.py:50
+#: exercises/models/video.py:52
#, python-format
msgid "Maximum file size is %(size)sMB."
msgstr "Maks. veličina datoteke je %(size)s MB."
-#: exercises/models/video.py:57 exercises/models/video.py:65
+#: exercises/models/video.py:59 exercises/models/video.py:67
msgid "File type is not supported"
msgstr "Vrsta detoteke se ne podržava"
-#: exercises/models/video.py:70
+#: exercises/models/video.py:72
msgid "File is not a valid video"
msgstr "Datoteka nije valjana video datoteka"
@@ -1308,7 +1335,11 @@ msgstr "Izbrisati opremu?"
msgid "Add muscle"
msgstr "Dodaj mičić"
-#: gallery/templates/images/overview.html:72
+#: gallery/forms.py:35
+msgid "If date is left empty, it will be read from the image instead"
+msgstr ""
+
+#: gallery/templates/images/overview.html:69
msgid "Add image"
msgstr "Dodaj sliku"
@@ -1376,7 +1407,7 @@ msgid "Contract type"
msgstr "Vrsta ugovora"
#: gym/models/contract.py:211 gym/templates/contract/view.html:59
-#: nutrition/forms.py:58
+#: nutrition/forms.py:67
msgid "Amount"
msgstr "Iznos"
@@ -1552,7 +1583,7 @@ msgstr "E-mail adrese"
msgid "Add member"
msgstr "Dodaj člana"
-#: gym/templates/gym/new_user.html:48 nutrition/templates/rate/form.html:120
+#: gym/templates/gym/new_user.html:48 nutrition/templates/rate/form.html:121
msgid "Info"
msgstr "Informacije"
@@ -1724,10 +1755,6 @@ msgstr "Šipka za povlačenje"
msgid "Quads"
msgstr "Kvadriceps"
-#: i18n.tpl:30
-msgid "Repetitions"
-msgstr "Ponavljanja"
-
#: i18n.tpl:31
msgid "Resistance band"
msgstr "Elastična vrpca"
@@ -1756,175 +1783,181 @@ msgstr "Triceps"
msgid "Until Failure"
msgstr "Do neuspjeha"
-#: i18n.tpl:40
+#: i18n.tpl:38
+#, fuzzy
+#| msgid "Kilometers"
+msgid "Meters"
+msgstr "Kilometri"
+
+#: i18n.tpl:41
msgid "none (bodyweight exercise)"
msgstr "bez (vježba za tjelesnu težinu)"
-#: i18n.tpl:41
+#: i18n.tpl:42
msgid "Beginner"
msgstr "Početnik"
-#: i18n.tpl:42
+#: i18n.tpl:43
msgid "Consistent"
msgstr "Redovito"
-#: i18n.tpl:43
+#: i18n.tpl:44
msgid "Dedicated"
msgstr "Posvećen"
-#: i18n.tpl:44
+#: i18n.tpl:45
msgid "Obsessed"
msgstr "Opsesivan"
-#: i18n.tpl:45
+#: i18n.tpl:46
msgid "Legend"
msgstr "Legenda"
-#: i18n.tpl:46
+#: i18n.tpl:47
msgid "Veteran"
msgstr "Veteran"
-#: i18n.tpl:47
+#: i18n.tpl:48
msgid "Titan"
msgstr "Titan"
-#: i18n.tpl:48
+#: i18n.tpl:49
msgid "Unstoppable"
msgstr "Nezaustavljiv"
-#: i18n.tpl:49
+#: i18n.tpl:50
msgid "Weekend Warrior"
msgstr "Vikendaški entuzijast"
-#: i18n.tpl:50
+#: i18n.tpl:51
msgid "Elephant lifter"
msgstr "Dizač slona"
-#: i18n.tpl:51
+#: i18n.tpl:52
msgid "Bus lifter"
msgstr "Dizač autobusa"
-#: i18n.tpl:52
+#: i18n.tpl:53
msgid "Plane lifter"
msgstr "Dizač aviona"
-#: i18n.tpl:53
+#: i18n.tpl:54
msgid "Blue whale lifter"
msgstr "Dizač plavog kita"
-#: i18n.tpl:54
+#: i18n.tpl:55
msgid "Space Station lifter"
msgstr "Dizač svemirske stanice"
-#: i18n.tpl:55
+#: i18n.tpl:56
msgid "Millionaire"
msgstr "Milijunaš"
-#: i18n.tpl:56
+#: i18n.tpl:57
msgid "Atlas"
msgstr "Atlas"
-#: i18n.tpl:57
+#: i18n.tpl:58
msgid "Early Bird"
msgstr "Ranoranilac"
-#: i18n.tpl:58
+#: i18n.tpl:59
msgid "Night Owl"
msgstr "Noćna ptica"
-#: i18n.tpl:59
+#: i18n.tpl:60
msgid "New Year, New Me"
msgstr "Nova Godina, Novi Ja"
-#: i18n.tpl:60
+#: i18n.tpl:61
msgid "Phoenix"
msgstr "Feniks"
-#: i18n.tpl:61
+#: i18n.tpl:62
msgid "Personal Record"
msgstr "Osobni rekord"
-#: i18n.tpl:62
+#: i18n.tpl:63
msgid "Complete your first workout"
msgstr "Završi svoj prvi trening"
-#: i18n.tpl:63
+#: i18n.tpl:64
msgid "Complete 10 workouts"
msgstr "Završi 10 treninga"
-#: i18n.tpl:64
+#: i18n.tpl:65
msgid "Complete 50 workouts"
msgstr "Završi 50 treninga"
-#: i18n.tpl:65
+#: i18n.tpl:66
msgid "Complete 100 workouts"
msgstr "Završi 100 treninga"
-#: i18n.tpl:66
+#: i18n.tpl:67
msgid "Complete 200 workouts"
msgstr "Završi 200 treninga"
-#: i18n.tpl:67
+#: i18n.tpl:68
msgid "Complete 500 workouts"
msgstr "Završi 500 treninga"
-#: i18n.tpl:68
+#: i18n.tpl:69
msgid "Complete 1000 workouts"
msgstr "Završi 1000 treninga"
-#: i18n.tpl:69
+#: i18n.tpl:70
msgid "Maintain a 30-day workout streak"
msgstr "Održi 30-dnevni režim treniranja"
-#: i18n.tpl:70
+#: i18n.tpl:71
msgid "Work out on Saturday and Sunday for 4 consecutive weekends"
msgstr "Treniraj subotom i nedjeljom 4 uzastopna vikenda"
-#: i18n.tpl:71
+#: i18n.tpl:72
msgid "Lift a cumulative total of 5.000 kg"
msgstr "Digni ukupno 5.000 kg"
-#: i18n.tpl:72
+#: i18n.tpl:73
msgid "Lift a cumulative total of 20.000 kg"
msgstr "Digni ukupno 20.000 kg"
-#: i18n.tpl:73
+#: i18n.tpl:74
msgid "Lift a cumulative total of 50.000 kg"
msgstr "Digni ukupno 50.000 kg"
-#: i18n.tpl:74
+#: i18n.tpl:75
msgid "Lift a cumulative total of 150.000 kg"
msgstr "Digni ukupno 150.000 kg"
-#: i18n.tpl:75
+#: i18n.tpl:76
msgid "Lift a cumulative total of 450.000 kg"
msgstr "Digni ukupno 450.000 kg"
-#: i18n.tpl:76
+#: i18n.tpl:77
msgid "Lift a cumulative total of 1.000.000 kg"
msgstr "Digni ukupno 1.000.000 kg"
-#: i18n.tpl:77
+#: i18n.tpl:78
msgid "Lift a cumulative total of 10.000.000 kg"
msgstr "Digni ukupno 10.000.000 kg"
-#: i18n.tpl:78
+#: i18n.tpl:79
msgid "Complete a workout before 6:00 AM"
msgstr "Odradi trening prije 06:00 ujutro"
-#: i18n.tpl:79
+#: i18n.tpl:80
msgid "Complete a workout after 9:00 PM"
msgstr "Odradi trening nakon 21:00 navečer"
-#: i18n.tpl:80
+#: i18n.tpl:81
msgid "Work out on January 1st"
msgstr "Odradi trening 01. siječnja"
-#: i18n.tpl:81
+#: i18n.tpl:82
msgid "Return to training after being inactive for 30 days"
msgstr "Treniraj ponovo nakon 30 dana neaktivnosti"
-#: i18n.tpl:82
+#: i18n.tpl:83
msgid "Achieve a new Personal Record on any exercise"
msgstr "Postigni novi osobni rekord u bilo kojoj vježbi"
@@ -2008,7 +2041,7 @@ msgstr "Vježba"
msgid "Routine will expire soon"
msgstr "Rutina će uskoro isteći"
-#: manager/models/routine.py:153 manager/models/session.py:145
+#: manager/models/routine.py:154 manager/models/session.py:145
msgid "The start time cannot be after the end time."
msgstr "Vrijeme početka ne može biti prije vremena kraja."
@@ -2087,23 +2120,27 @@ msgstr "Trening"
msgid "Workout for %s"
msgstr "Trening za %s"
-#: nutrition/forms.py:62
+#: nutrition/extract_info/off.py:72 nutrition/extract_info/off.py:91
+msgid "Serving"
+msgstr ""
+
+#: nutrition/forms.py:71 nutrition/forms.py:208
msgid "Unit"
msgstr "Jedinica"
-#: nutrition/forms.py:170 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:179 nutrition/templates/rate/form.html:77
msgid "Basic caloric intake"
msgstr "Osnovni unos kalorija"
-#: nutrition/forms.py:171
+#: nutrition/forms.py:180
msgid "Your basic caloric intake as calculated for your data"
msgstr "Osnovni unos kalorija izračunat za tvoje podatke"
-#: nutrition/forms.py:176
+#: nutrition/forms.py:185
msgid "Additional calories"
msgstr "Dodatne kalorije"
-#: nutrition/forms.py:178
+#: nutrition/forms.py:187
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
@@ -2112,13 +2149,31 @@ msgstr ""
"broj)"
#: nutrition/forms.py:209
+msgid "grams (g)"
+msgstr ""
+
+#: nutrition/forms.py:219
msgid "Ingredient"
msgstr "Sastojak"
-#: nutrition/forms.py:213
+#: nutrition/forms.py:223
msgid "Also search for names in English"
msgstr "Također traži imena na engleskom jeziku"
+#: nutrition/forms.py:239
+msgid "Quantity"
+msgstr ""
+
+#: nutrition/forms.py:241
+msgid "Enter a quantity and choose grams (g) or one of the serving units."
+msgstr ""
+
+#: nutrition/models/ingredient.py:526
+#, fuzzy
+#| msgid "Correction"
+msgid "Portion"
+msgstr "Ispravak"
+
#: nutrition/templates/ingredient/email_new.tpl:1
#, python-format
msgid ""
@@ -2166,59 +2221,90 @@ msgstr ""
"adresu\n"
"prilikom registracije, dobit ćeš obavijest kada postupak uspješno završi."
-#: nutrition/templates/ingredient/overview.html:38
+#: nutrition/templates/ingredient/overview.html:32
+#: nutrition/templates/ingredient/overview.html:68
+#: nutrition/templates/ingredient/view.html:143
+msgid "Vegan"
+msgstr ""
+
+#: nutrition/templates/ingredient/overview.html:34
+#: nutrition/templates/ingredient/overview.html:79
+#: nutrition/templates/ingredient/view.html:155
+#, fuzzy
+#| msgid "Variations"
+msgid "Vegetarian"
+msgstr "Varijante"
+
+#: nutrition/templates/ingredient/overview.html:43
msgid "No ingredients."
msgstr "Nema satojaka."
-#: nutrition/templates/ingredient/overview.html:49
+#: nutrition/templates/ingredient/overview.html:54
msgid "Search"
msgstr "Traži"
-#: nutrition/templates/ingredient/view.html:45 nutrition/views/plan.py:237
+#: nutrition/templates/ingredient/overview.html:57
+msgid "Filter"
+msgstr ""
+
+#: nutrition/templates/ingredient/overview.html:83
+msgid "Apply"
+msgstr ""
+
+#: nutrition/templates/ingredient/overview.html:85
+msgid "Reset"
+msgstr ""
+
+#: nutrition/templates/ingredient/view.html:46 nutrition/views/plan.py:236
msgid "Macronutrients"
msgstr "Makronutrijenti"
-#: nutrition/templates/ingredient/view.html:54
+#: nutrition/templates/ingredient/view.html:55
msgid "kJ"
msgstr "kJ"
-#: nutrition/templates/ingredient/view.html:70 nutrition/views/plan.py:267
+#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:266
msgid "Sugar content in carbohydrates"
msgstr "Količina šećera u ugljikohidratima"
-#: nutrition/templates/ingredient/view.html:75
-#: nutrition/templates/ingredient/view.html:91
-#: nutrition/templates/ingredient/view.html:113
-#: nutrition/templates/ingredient/view.html:123
+#: nutrition/templates/ingredient/view.html:76
+#: nutrition/templates/ingredient/view.html:92
+#: nutrition/templates/ingredient/view.html:114
+#: nutrition/templates/ingredient/view.html:124
msgid "n.A."
msgstr "--"
-#: nutrition/templates/ingredient/view.html:86 nutrition/views/plan.py:281
+#: nutrition/templates/ingredient/view.html:87 nutrition/views/plan.py:280
msgid "Saturated fat content in fats"
msgstr "Količina zasićene masti u mastima"
-#: nutrition/templates/ingredient/view.html:102
+#: nutrition/templates/ingredient/view.html:103
msgid "Others"
msgstr "Drugi"
-#: nutrition/templates/ingredient/view.html:108 nutrition/views/plan.py:287
+#: nutrition/templates/ingredient/view.html:109 nutrition/views/plan.py:286
msgid "Fiber"
msgstr "Vlakna"
-#: nutrition/templates/ingredient/view.html:118 nutrition/views/plan.py:293
+#: nutrition/templates/ingredient/view.html:119 nutrition/views/plan.py:292
msgid "Sodium"
msgstr "Natrij"
-#: nutrition/templates/ingredient/view.html:143
-#: nutrition/templates/units/list.html:50 nutrition/views/unit.py:86
+#: nutrition/templates/ingredient/view.html:136
+#, fuzzy
+#| msgid "Date format"
+msgid "Dietary information"
+msgstr "Format datuma"
+
+#: nutrition/templates/ingredient/view.html:184
msgid "Add new weight unit"
msgstr "Dodaj novu jedinicu težine"
-#: nutrition/templates/rate/form.html:25
+#: nutrition/templates/rate/form.html:26
msgid "Basal metabolic rate"
msgstr "Osnovna potreba metabolizma"
-#: nutrition/templates/rate/form.html:26
+#: nutrition/templates/rate/form.html:27
msgid ""
"The basal metabolic rate is the amount of energy expended daily\n"
"at rest. This is the minimum energy needed for the body to function, without "
@@ -2229,15 +2315,15 @@ msgstr ""
"tijekom neaktivnosti. To je najmanja količina energije koja je potrebna za\n"
"funkcioniranje tijela, bez dodatnih fizičkih aktivnosti."
-#: nutrition/templates/rate/form.html:37
+#: nutrition/templates/rate/form.html:38
msgid "Your basic metabolic rate is: "
msgstr "Tvoja osnovna potreba metabolizma je: "
-#: nutrition/templates/rate/form.html:47
+#: nutrition/templates/rate/form.html:48
msgid "Physical activities"
msgstr "Fizičke aktivnosti"
-#: nutrition/templates/rate/form.html:48
+#: nutrition/templates/rate/form.html:49
msgid ""
"The physical activity level (PAL) is a factor used to to express\n"
"the additional physical activity and is used to calculate the total energy\n"
@@ -2247,11 +2333,11 @@ msgstr ""
"fizička aktivnost i koristi se za izračunavanje ukupne potrebne\n"
"energije po danu."
-#: nutrition/templates/rate/form.html:59
+#: nutrition/templates/rate/form.html:60
msgid "Factor for daily activities: "
msgstr "Faktor za dnevne aktivnosti: "
-#: nutrition/templates/rate/form.html:67
+#: nutrition/templates/rate/form.html:68
msgid ""
"The base caloric intake is the amount of calories your metabolism\n"
"needs based on your level of physical activity."
@@ -2260,11 +2346,11 @@ msgstr ""
"metabolizmu\n"
"na temelju razine tvoje fizičke aktivnosti."
-#: nutrition/templates/rate/form.html:81
+#: nutrition/templates/rate/form.html:82
msgid "Calculate basic caloric intake"
msgstr "Izračunaj osnovni unos kalorija"
-#: nutrition/templates/rate/form.html:88
+#: nutrition/templates/rate/form.html:89
msgid ""
"The total calories are the actual total calories per day. This\n"
"might include e.g. a surplus or deficit if you are bulking or cutting. "
@@ -2276,19 +2362,19 @@ msgstr ""
"smršaviti.\n"
"Alternativno, upiši količinu kalorija ako znaš vrijednost."
-#: nutrition/templates/rate/form.html:102
+#: nutrition/templates/rate/form.html:103
msgid "Transfer basic intake to total daily calories"
msgstr "Prenesi osnovni unos kalorija na ukupne dnevne kalorije"
-#: nutrition/templates/rate/form.html:106
+#: nutrition/templates/rate/form.html:107
msgid "Add additional calories to total daily calories"
msgstr "Dodaj dodatne kalorije u ukupne dnevne kalorije"
-#: nutrition/templates/rate/form.html:110
+#: nutrition/templates/rate/form.html:111
msgid "Save total calories to profile"
msgstr "Spremi ukupne kalorije u profil"
-#: nutrition/templates/rate/form.html:121
+#: nutrition/templates/rate/form.html:122
msgid ""
"Please note that these calculations can only be an\n"
"approximation. If you base your nutrition plan on these values, observe\n"
@@ -2298,48 +2384,48 @@ msgstr ""
"temeljiš na ovim vrijednostima, prati razvoj par tjedana i\n"
"po potrebi promijeni ukupnu količinu."
-#: nutrition/views/ingredient.py:158
+#: nutrition/views/ingredient.py:163
msgid "Add a new ingredient"
msgstr "Dodaj novi sastojak"
-#: nutrition/views/plan.py:128
+#: nutrition/views/plan.py:127
msgid "Nutritional plan"
msgstr "Plan prehrane"
-#: nutrition/views/plan.py:130
+#: nutrition/views/plan.py:129
#, python-format
msgid "Nutritional plan for %s"
msgstr "Plan prehrane za %s"
-#: nutrition/views/plan.py:202
+#: nutrition/views/plan.py:201
msgid "<i>This is an empty plan, what did you expect on the PDF?</i>"
msgstr "<i>Ovo je prazan plan. Što si očekivao/la u PDF-u?</i>"
-#: nutrition/views/plan.py:230
+#: nutrition/views/plan.py:229
msgid "Nutritional data"
msgstr "Podaci prehrane"
-#: nutrition/views/plan.py:238
+#: nutrition/views/plan.py:237
msgid "Total"
msgstr "Ukupno"
-#: nutrition/views/plan.py:239
+#: nutrition/views/plan.py:238
msgid "Percent of energy"
msgstr "Postotak energije"
-#: nutrition/views/plan.py:240
+#: nutrition/views/plan.py:239
msgid "g per body kg"
msgstr "g po tjelesnim kg"
-#: nutrition/views/unit_ingredient.py:69
+#: nutrition/views/unit_ingredient.py:64
msgid "Add a new weight unit"
msgstr "Dodaj novu jedinicu težine"
-#: nutrition/views/unit_ingredient.py:106
+#: nutrition/views/unit_ingredient.py:99
msgid "Edit a weight unit to ingredient connection"
msgstr "Uredi vezu između jedinice težine i sastojka"
-#: nutrition/views/unit_ingredient.py:138
+#: nutrition/views/unit_ingredient.py:129
msgid "Delete?"
msgstr "Izbrisati?"
@@ -2729,7 +2815,7 @@ msgstr "Izvorni kod"
msgid "Translation"
msgstr "Prijevod"
-#: utils/generic_views.py:263
+#: utils/generic_views.py:246
msgid "Yes, delete"
msgstr "Da, izbriši"
@@ -2782,10 +2868,6 @@ msgstr "Moraš upisati svoju težinu"
msgid "Import weight logs"
msgstr "Uvezi dnevnike težine"
-#: weight/templates/import_csv_form.html:9
-msgid "Submit"
-msgstr "Pošalji"
-
#: weight/templates/import_csv_form.html:15
msgid ""
"Use this import field to import your weight logs into Workout\n"
@@ -2904,6 +2986,36 @@ msgstr ""
msgid "Re-Submit"
msgstr "Pošalji ponovo"
+#~ msgid "Email verification"
+#~ msgstr "Ovjeravanje e-mail adrese"
+
+#, python-format
+#~ msgid "%(username)s, your email was verified"
+#~ msgstr "%(username)s, tvoja je e-mail adresa ovjerena"
+
+#~ msgid "Error, invalid verification token"
+#~ msgstr "Greška, nevaljan token ovjere"
+
+#~ msgid "Email Confirmation"
+#~ msgstr "Potvrđivanje e-mail adrese"
+
+#, python-format
+#~ msgid "You are almost there, %(username)s!"
+#~ msgstr "Skoro si gotov/a, %(username)s!"
+
+#, python-format
+#~ msgid "Please click <a href=\"%(link)s\">here</a> to confirm your email"
+#~ msgstr ""
+#~ "Pritisni <a href=\"%(link)s\">ovdje</a> za potvrđivanje tvoje e-mail "
+#~ "adrese"
+
+#, python-format
+#~ msgid "The token expires on %(time)s"
+#~ msgstr "Token isteče %(time)s"
+
+#~ msgid "Ingredient weight units"
+#~ msgstr "Jedinica težine sastojka"
+
#~ msgid "Image"
#~ msgstr "Slika"
@@ -2934,9 +3046,6 @@ msgstr "Pošalji ponovo"
#~ msgid "Secondary muscles"
#~ msgstr "Sekundarni mišići"
-#~ msgid "Variations"
-#~ msgstr "Varijante"
-
#~ msgid "Exercise Categories"
#~ msgstr "Kategorije vježbi"
diff --git a/wger/locale/hu/LC_MESSAGES/django.po b/wger/locale/hu/LC_MESSAGES/django.po
index a06dab362..c7b8819d5 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: 2026-01-17 14:03+0000\n"
+"POT-Creation-Date: 2026-04-10 10:20+0000\n"
"PO-Revision-Date: 2023-12-29 22:12+0000\n"
"Last-Translator: Adam Cool <[email protected]>\n"
"Language-Team: Hungarian <https://hosted.weblate.org/projects/wger/web/hu/>\n"
@@ -36,7 +36,7 @@ msgstr ""
#: config/views/gym_config.py:42 core/templates/language/view.html:64
#: core/templates/license/list.html:17
#: core/templates/repetition_unit/list.html:18
-#: core/templates/user/overview.html:204 core/templates/user/overview.html:467
+#: core/templates/user/overview.html:207 core/templates/user/overview.html:470
#: core/templates/weight_unit/list.html:18
#: exercises/templates/categories/admin-overview.html:17
#: exercises/templates/equipment/admin-overview.html:17
@@ -48,30 +48,29 @@ msgstr ""
#: gym/templates/gym/list.html:19 gym/templates/gym/list.html:48
#: gym/templates/gym/member_list.html:94 gym/templates/gym/member_list.html:152
#: gym/templates/gym/member_list.html:190
-#: nutrition/templates/ingredient/view.html:164
-#: nutrition/templates/ingredient/view.html:209
-#: nutrition/templates/units/list.html:19
+#: nutrition/templates/ingredient/view.html:205
+#: nutrition/templates/ingredient/view.html:248
msgid "Edit"
msgstr "Módosítás"
-#: core/forms.py:91 core/templates/navigation.html:271
-#: core/templates/navigation.html:278 core/templates/user/login.html:4
+#: core/forms.py:89 core/templates/navigation.html:268
+#: core/templates/navigation.html:275 core/templates/user/login.html:4
#: core/templates/user/registration_sidebar.html:12
#: software/templates/features.html:82 software/templates/features.html:448
msgid "Login"
msgstr "Bejelentkezés"
-#: core/forms.py:130 core/forms.py:244 gym/views/export.py:61
+#: core/forms.py:128 core/forms.py:242 gym/views/export.py:61
#: gym/views/gym.py:217
msgid "First name"
msgstr "Keresztnév"
-#: core/forms.py:131 core/forms.py:245 core/templates/user/overview.html:284
+#: core/forms.py:129 core/forms.py:243 core/templates/user/overview.html:287
#: gym/views/export.py:62 gym/views/gym.py:217
msgid "Last name"
msgstr "Vezetéknév"
-#: core/forms.py:133 core/forms.py:210 core/templates/user/overview.html:288
+#: core/forms.py:131 core/forms.py:208 core/templates/user/overview.html:291
#: gym/models/contract.py:256 gym/models/gym.py:58
#: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:116
#: gym/templates/gym/new_user.html:30 gym/views/export.py:60
@@ -81,55 +80,55 @@ msgstr "Vezetéknév"
msgid "Email"
msgstr "Email"
-#: core/forms.py:134
+#: core/forms.py:132
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:138 core/models/profile.py:222
+#: core/forms.py:136 core/models/profile.py:222
#: gym/templates/gym/new_user.html:38
msgid "Date of Birth"
msgstr "Születés Időpontja"
-#: core/forms.py:177
+#: core/forms.py:175
msgid "Personal data"
msgstr "Személyes adat"
-#: core/forms.py:189
+#: core/forms.py:187
msgid "Workout reminders"
msgstr "Edzés emlékeztetők"
-#: core/forms.py:196
+#: core/forms.py:194
msgid "Other settings"
msgstr "Egyéb beállítások"
-#: core/forms.py:204 core/views/user.py:614 core/views/user.py:629
-#: core/views/user.py:641 gym/forms.py:73 utils/generic_views.py:143
+#: core/forms.py:202 core/views/user.py:630 core/views/user.py:654
+#: core/views/user.py:668 gym/forms.py:73 utils/generic_views.py:137
msgid "Save"
msgstr "Mentés"
-#: core/forms.py:211
+#: core/forms.py:209
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:240
+#: core/forms.py:238
msgid "This e-mail address is already in use."
msgstr "Ez az e-mail cím már használatban van."
-#: core/forms.py:261 gym/templates/gym/new_user.html:26
+#: core/forms.py:259 gym/templates/gym/new_user.html:26
#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:217
msgid "Password"
msgstr "Jelszó"
-#: core/forms.py:263
+#: core/forms.py:261
msgid "Please enter your current password."
msgstr "Kérlek írd be a jelenlegi jelszavad."
-#: core/forms.py:272 core/templates/language/view.html:70
+#: core/forms.py:270 core/templates/language/view.html:70
#: core/templates/license/list.html:21
#: core/templates/repetition_unit/list.html:22
-#: core/templates/user/overview.html:233
+#: core/templates/user/overview.html:236
#: core/templates/weight_unit/list.html:22
#: exercises/templates/categories/admin-overview.html:21
#: exercises/templates/equipment/admin-overview.html:21
@@ -137,27 +136,30 @@ msgstr "Kérlek írd be a jelenlegi jelszavad."
#: gym/templates/admin_notes/list.html:37
#: gym/templates/contract_option/list.html:35
#: gym/templates/contract_type/list.html:36 gym/templates/document/list.html:46
-#: gym/templates/gym/list.html:23 nutrition/templates/ingredient/view.html:168
-#: nutrition/templates/ingredient/view.html:215
-#: nutrition/templates/units/list.html:25
+#: gym/templates/gym/list.html:23 nutrition/templates/ingredient/view.html:209
+#: nutrition/templates/ingredient/view.html:254
msgid "Delete"
msgstr "Törlés"
-#: core/forms.py:281
+#: core/forms.py:279
msgid "Invalid password"
msgstr "Érvénytelen jelszó"
-#: core/forms.py:293
+#: core/forms.py:291 core/forms.py:349
msgid "The form is secured with reCAPTCHA"
msgstr "Ez az űrlap reCAPTCHA-val van biztosítva"
-#: core/forms.py:314 core/forms.py:341 core/templates/navigation.html:272
-#: core/templates/navigation.html:285 core/templates/template.html:123
-#: core/templates/user/login.html:21 core/views/user.py:285
+#: core/forms.py:312 core/forms.py:339 core/templates/navigation.html:269
+#: core/templates/navigation.html:282 core/templates/template.html:113
+#: core/templates/user/login.html:21 core/views/user.py:293
#: software/templates/features.html:87 software/templates/features.html:442
msgid "Register"
msgstr "Regisztráció"
+#: core/forms.py:360 weight/templates/import_csv_form.html:9
+msgid "Submit"
+msgstr ""
+
#: core/models/language.py:31 core/templates/language/view.html:21
msgid "Language short name"
msgstr "Nyelv rövid neve"
@@ -194,36 +196,36 @@ msgstr "Link"
msgid "Link to license text or other information"
msgstr "Link a licenc szöveghez vagy egyéb információkhoz"
-#: core/models/profile.py:57
+#: core/models/profile.py:60
#, python-format
msgid "%(birthdate)s is not a valid birthdate"
msgstr "%(birthdate)s-ek érvénytelen Születési idő"
-#: core/models/profile.py:66
+#: core/models/profile.py:69
msgid "Male"
msgstr "Férfi"
-#: core/models/profile.py:67
+#: core/models/profile.py:70
msgid "Female"
msgstr "Nő"
-#: core/models/profile.py:74
+#: core/models/profile.py:77
msgid "Low"
msgstr "Alacsony"
-#: core/models/profile.py:75
+#: core/models/profile.py:78
msgid "Medium"
msgstr "Közepes"
-#: core/models/profile.py:76
+#: core/models/profile.py:79
msgid "High"
msgstr "Magas"
-#: core/models/profile.py:82
+#: core/models/profile.py:85
msgid "Metric (kilogram)"
msgstr "Metrikus (kilogramm)"
-#: core/models/profile.py:83
+#: core/models/profile.py:86
msgid "Imperial (pound)"
msgstr "Birodalmi (font)"
@@ -336,7 +338,7 @@ msgstr "Átlag órák száma per hét"
msgid "Free time"
msgstr "Szabadidő"
-#: core/models/profile.py:320 nutrition/templates/rate/form.html:66
+#: core/models/profile.py:320 nutrition/templates/rate/form.html:67
msgid "Total daily calories"
msgstr "Teljes napi kalória"
@@ -374,20 +376,41 @@ msgstr ""
msgid "Enable or disable the trophy system for this user"
msgstr ""
-#: core/models/profile.py:446
+#: core/models/profile.py:457
msgid "The sum of all hours has to be 24"
msgstr "Az órák összegének meg kell egyeznie 24-el"
-#: core/models/rep_unit.py:36 core/models/weight_unit.py:42
-#: core/templates/user/overview.html:280 core/views/user.py:589
+#: core/models/rep_unit.py:32 i18n.tpl:30
+msgid "Repetitions"
+msgstr "Ismétlések"
+
+#: core/models/rep_unit.py:33 core/templates/user/overview.html:82
+#: exercises/templates/history/overview.html:30
+msgid "Time"
+msgstr "Idő"
+
+#: core/models/rep_unit.py:34
+msgid "Distance"
+msgstr ""
+
+#: core/models/rep_unit.py:47 core/models/weight_unit.py:42
+#: core/templates/user/overview.html:283 core/views/user.py:605
#: exercises/models/muscle.py:36 gym/models/contract.py:52
#: gym/models/contract.py:103 gym/models/gym.py:46
#: gym/models/user_document.py:84 gym/templates/contract/view.html:50
#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:108
-#: gym/views/gym.py:158 nutrition/templates/ingredient/view.html:151
+#: gym/views/gym.py:158 nutrition/templates/ingredient/view.html:192
msgid "Name"
msgstr "Név"
+#: core/models/rep_unit.py:53
+msgid "Unit Type"
+msgstr ""
+
+#: core/models/rep_unit.py:54
+msgid "The type of unit (repetitions, time, or distance)"
+msgstr ""
+
#: core/templates/403.html:4
msgid "Forbidden!"
msgstr "Tiltott!"
@@ -415,81 +438,75 @@ msgid ""
"later time. If the problem persists, you can seek help in ways listed below:"
msgstr ""
-#: core/templates/base.html:10
-#, python-format
-msgid ""
-"You are browsing the site as the user \"%(current_user)s\", all actions are "
-"performed on their data."
+#: core/templates/account/email/email_confirmation_message.html:81
+msgid "Almost there!"
msgstr ""
-#: core/templates/base.html:15 core/templates/base_wide.html:12
+#: core/templates/account/email/email_confirmation_message.html:85
#, python-format
-msgid "Back to \"%(target)s\""
-msgstr "Vissza \"%(target)s\""
+msgid ""
+"You're receiving this email because the user \"%(user_display)s\" has given "
+"your email address to register an account on %(site_domain)s."
+msgstr ""
-#: core/templates/base_wide.html:7
-#, python-format
+#: core/templates/account/email/email_confirmation_message.html:93
msgid ""
-"You are\n"
-" browsing the site as the user \"%(current_user)s\", all "
-"actions are performed on\n"
-" their data.\n"
-" "
+"Your email verification code is listed below. Please enter it in your open "
+"browser window."
msgstr ""
-#: core/templates/delete.html:4
-msgid "Are you sure you want to delete this? This action cannot be undone."
-msgstr "Biztosan törölni akarod? Ez a művelet nem visszavonható."
+#: core/templates/account/email/email_confirmation_message.html:100
+msgid "Please click the button below to confirm your email address."
+msgstr ""
-#: core/templates/email_verification/confirm_template.html:4
+#: core/templates/account/email/email_confirmation_message.html:106
#, fuzzy
#| msgid "Configuration"
-msgid "Email verification"
+msgid "Confirm email"
msgstr "Beállítás"
-#: core/templates/email_verification/confirm_template.html:18
+#: core/templates/account/email/email_confirmation_message.html:110
#, python-format
-msgid "%(username)s, your email was verified"
+msgid ""
+"The link is valid for %(expire_hours)s hours (until %(date)s, %(time)s). You "
+"can request a new one from your profile settings."
msgstr ""
-#: core/templates/email_verification/confirm_template.html:22
-msgid "Error, invalid verification token"
+#: core/templates/account/email/email_confirmation_message.html:116
+msgid "If the button doesn't work, copy and paste this link into your browser:"
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!"
+#: core/templates/account/email/email_confirmation_message.html:125
+msgid "the wger Team"
msgstr ""
-#: core/templates/email_verification/email_body_html.tpl:11
+#: core/templates/base.html:10
#, python-format
-msgid "Please click <a href=\"%(link)s\">here</a> to confirm your email"
+msgid ""
+"You are browsing the site as the user \"%(current_user)s\", all actions are "
+"performed on their data."
msgstr ""
-#: core/templates/email_verification/email_body_html.tpl:12
-#: core/templates/email_verification/email_body_txt.tpl:5
+#: core/templates/base.html:15 core/templates/base_wide.html:12
#, 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 ""
+msgid "Back to \"%(target)s\""
+msgstr "Vissza \"%(target)s\""
-#: core/templates/email_verification/email_body_txt.tpl:4
+#: core/templates/base_wide.html:7
#, python-format
-msgid "Please click the following link to confirm your email: %(link)s"
+msgid ""
+"You are\n"
+" browsing the site as the user \"%(current_user)s\", all "
+"actions are performed on\n"
+" their data.\n"
+" "
msgstr ""
-#: core/templates/language/overview.html:4 core/templates/navigation.html:344
+#: core/templates/delete.html:4
+msgid "Are you sure you want to delete this? This action cannot be undone."
+msgstr "Biztosan törölni akarod? Ez a művelet nem visszavonható."
+
+#: core/templates/language/overview.html:4 core/templates/navigation.html:341
msgid "Languages"
msgstr "Nyelvek"
@@ -498,16 +515,16 @@ msgid "Nothing found."
msgstr "Nincs találat."
#: core/templates/language/overview.html:22
-#: nutrition/templates/ingredient/overview.html:38
+#: nutrition/templates/ingredient/overview.html:43
msgid "Add one now."
msgstr "Adj hozzá egyet most."
#: core/templates/language/overview.html:34 core/templates/license/list.html:43
-#: core/templates/repetition_unit/list.html:46
-#: core/templates/user/overview.html:344 core/templates/user/overview.html:384
-#: core/templates/user/overview.html:422
-#: core/templates/weight_unit/list.html:46 core/views/languages.py:74
-#: core/views/license.py:66 core/views/repetition_units.py:66
+#: core/templates/repetition_unit/list.html:44
+#: core/templates/user/overview.html:347 core/templates/user/overview.html:387
+#: core/templates/user/overview.html:425
+#: core/templates/weight_unit/list.html:46 core/views/languages.py:77
+#: core/views/license.py:66 core/views/repetition_units.py:76
#: core/views/weight_units.py:66
#: exercises/templates/categories/admin-overview.html:40
#: exercises/templates/equipment/admin-overview.html:39
@@ -520,14 +537,14 @@ msgstr "Adj hozzá egyet most."
#: gym/templates/gym/member_list.html:264
#: gym/templates/gym/member_list.html:303
#: mailer/templates/mailer/gym/overview.html:43
-#: nutrition/templates/ingredient/overview.html:60
+#: nutrition/templates/ingredient/overview.html:97
msgid "Add"
msgstr "Hozzáadás"
#: core/templates/language/view.html:61 core/templates/user/api_key.html:41
#: core/templates/user/preferences.html:50 gym/models/contract.py:203
#: gym/templates/contract/view.html:41 gym/templates/gym/member_list.html:270
-#: nutrition/templates/ingredient/view.html:206
+#: nutrition/templates/ingredient/view.html:245
msgid "Options"
msgstr "Beállítások"
@@ -537,9 +554,9 @@ msgstr "Licenc lista"
#: core/templates/license/list.html:30
#: core/templates/repetition_unit/list.html:32
-#: core/templates/user/overview.html:104 core/templates/user/overview.html:136
-#: core/templates/user/overview.html:185 core/templates/user/overview.html:365
-#: core/templates/user/overview.html:404 core/templates/user/overview.html:448
+#: core/templates/user/overview.html:107 core/templates/user/overview.html:139
+#: core/templates/user/overview.html:188 core/templates/user/overview.html:368
+#: core/templates/user/overview.html:407 core/templates/user/overview.html:451
#: core/templates/weight_unit/list.html:32
#: exercises/templates/categories/admin-overview.html:30
#: exercises/templates/equipment/admin-overview.html:30
@@ -551,11 +568,10 @@ msgstr "Licenc lista"
#: gym/templates/gym/member_list.html:284
#: gym/templates/gym/member_list.html:321
#: mailer/templates/mailer/gym/overview.html:30
-#: nutrition/templates/units/list.html:34
msgid "Nothing found"
msgstr "Nincs találat"
-#: core/templates/misc/about.html:4 core/templates/template.html:160
+#: core/templates/misc/about.html:4 core/templates/template.html:150
msgid "Imprint"
msgstr ""
@@ -563,168 +579,163 @@ msgstr ""
msgid "Training"
msgstr ""
-#: core/templates/navigation.html:37 core/templates/user/overview.html:25
+#: core/templates/navigation.html:36 core/templates/user/overview.html:28
msgid "Routines"
msgstr ""
-#: core/templates/navigation.html:45 core/templates/user/overview.html:70
+#: core/templates/navigation.html:44 core/templates/user/overview.html:73
msgid "Calendar"
msgstr "Naptár"
-#: core/templates/navigation.html:55
+#: core/templates/navigation.html:53
msgid "Measurements"
msgstr ""
-#: core/templates/navigation.html:66 gallery/templates/images/overview.html:6
+#: core/templates/navigation.html:64 gallery/templates/images/overview.html:6
msgid "Gallery"
msgstr ""
-#: core/templates/navigation.html:72
+#: core/templates/navigation.html:74 core/templates/navigation.html:400
+#: trophies/templates/trophies/overview.html:7
+msgid "Trophies"
+msgstr ""
+
+#: core/templates/navigation.html:79
#, fuzzy
#| msgid "Workout complete!"
msgid "Workout templates"
msgstr "Edzés befejezve!"
-#: core/templates/navigation.html:79
+#: core/templates/navigation.html:86
#, fuzzy
#| msgid "Your schedules"
msgid "Your templates"
msgstr "Ütemterveid"
-#: core/templates/navigation.html:88
+#: core/templates/navigation.html:95
msgid "Public templates"
msgstr ""
-#: core/templates/navigation.html:96 software/templates/features.html:51
+#: core/templates/navigation.html:103 software/templates/features.html:51
#: software/templates/features.html:480
msgid "Exercises"
msgstr "Gyakorlatok"
-#: core/templates/navigation.html:102 core/templates/navigation.html:176
-#: core/templates/navigation.html:339
+#: core/templates/navigation.html:109 core/templates/navigation.html:336
msgid "Administration"
msgstr "Adminisztráció"
-#: core/templates/navigation.html:106
+#: core/templates/navigation.html:113
#, fuzzy
#| msgid "Exercises pending review"
msgid "Exercise edit history"
msgstr "Ellenőrzésre váró gyakorlatok"
-#: core/templates/navigation.html:112
+#: core/templates/navigation.html:119
msgid "Equipment"
msgstr "Felszerelés"
-#: core/templates/navigation.html:118
+#: core/templates/navigation.html:125
msgid "Muscles"
msgstr "Izmok"
-#: core/templates/navigation.html:124
+#: core/templates/navigation.html:131
#: exercises/templates/categories/admin-overview.html:4
msgid "Categories"
msgstr "Kategóriák"
-#: core/templates/navigation.html:139 software/templates/features.html:468
+#: core/templates/navigation.html:146 software/templates/features.html:468
msgid "Nutrition"
msgstr "Táplálkozás"
-#: core/templates/navigation.html:147 core/templates/user/overview.html:144
+#: core/templates/navigation.html:154 core/templates/user/overview.html:147
msgid "Nutrition plans"
msgstr "Táplálkozási tervek"
-#: core/templates/navigation.html:156
+#: core/templates/navigation.html:163
msgid "BMI calculator"
msgstr "BMI kalkulátor"
-#: core/templates/navigation.html:165 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:172 nutrition/templates/rate/form.html:18
msgid "Daily calories calculator"
msgstr "Napi kalória kalkulátor"
-#: core/templates/navigation.html:171
+#: core/templates/navigation.html:178
#: nutrition/templates/ingredient/overview.html:10
msgid "Ingredient overview"
msgstr "Összetevő áttekintés"
-#: core/templates/navigation.html:180 nutrition/templates/units/list.html:6
-msgid "Ingredient weight units"
-msgstr "Összetevő súly egységek"
-
-#: core/templates/navigation.html:196 software/templates/features.html:463
+#: core/templates/navigation.html:193 software/templates/features.html:463
msgid "Body weight"
msgstr ""
-#: core/templates/navigation.html:203 core/templates/user/overview.html:114
+#: core/templates/navigation.html:200 core/templates/user/overview.html:117
msgid "Weight overview"
msgstr "Súly áttekintés"
-#: core/templates/navigation.html:217
+#: core/templates/navigation.html:214
msgid "About this software"
msgstr "Erről a szoftverről"
-#: core/templates/navigation.html:223 software/templates/about_us.html:5
+#: core/templates/navigation.html:220 software/templates/about_us.html:5
msgid "Support & Get Involved"
msgstr ""
-#: core/templates/navigation.html:229 software/templates/features.html:528
+#: core/templates/navigation.html:226 software/templates/features.html:528
msgid "REST API"
msgstr "REST API"
-#: core/templates/navigation.html:235 utils/models.py:45
+#: core/templates/navigation.html:232 utils/models.py:45
msgid "License"
msgstr "Licenc"
-#: core/templates/navigation.html:241
+#: core/templates/navigation.html:238
msgid "Developer documentation"
msgstr ""
-#: core/templates/navigation.html:248
+#: core/templates/navigation.html:245
msgid "Get the code"
msgstr "Szerezd meg a kódot"
-#: core/templates/navigation.html:255 core/templates/template.html:199
-#: software/templates/features.html:603
+#: core/templates/navigation.html:252 core/templates/template.html:202
+#: software/templates/features.html:614
msgid "Translate"
msgstr "Lefordítás"
-#: core/templates/navigation.html:292 core/templates/user/login.html:30
+#: core/templates/navigation.html:289 core/templates/user/login.html:30
msgid "Reset password"
msgstr "Új jelszó igénylése"
-#: core/templates/navigation.html:301 core/templates/navigation.html:329
+#: core/templates/navigation.html:298 core/templates/navigation.html:326
msgid "Logout"
msgstr "Kijelentkezés"
-#: core/templates/navigation.html:320
+#: core/templates/navigation.html:317
msgid "My preferences"
msgstr "Beállításaim"
-#: core/templates/navigation.html:352
+#: core/templates/navigation.html:349
msgid "Licenses"
msgstr "Licencek"
-#: core/templates/navigation.html:360
+#: core/templates/navigation.html:357
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr ""
-#: core/templates/navigation.html:368 core/templates/weight_unit/list.html:4
-#: nutrition/templates/ingredient/view.html:141
+#: core/templates/navigation.html:365 core/templates/weight_unit/list.html:4
+#: nutrition/templates/ingredient/view.html:182
msgid "Weight units"
msgstr ""
-#: core/templates/navigation.html:376 core/templates/user/list.html:4
+#: core/templates/navigation.html:373 core/templates/user/list.html:4
msgid "User list"
msgstr ""
-#: core/templates/navigation.html:382
+#: core/templates/navigation.html:379
msgid "Gyms"
msgstr "Edzőtermek"
-#: core/templates/navigation.html:403
-#: trophies/templates/trophies/overview.html:7
-msgid "Trophies"
-msgstr ""
-
#: core/templates/registration/password_reset_complete.html:4
msgid "Password reset complete"
msgstr "Az új jelszó igénylése sikerült"
@@ -780,27 +791,31 @@ msgstr "előző"
msgid "next"
msgstr "következő"
-#: core/templates/template.html:96
+#: core/templates/template.html:86
msgid "Close"
msgstr "Bezárás"
-#: core/templates/template.html:112
+#: core/templates/template.html:102
msgid ""
"You are using a guest account, data entered will be deleted after a week."
msgstr ""
"Vendég hozzáférést használsz. A használat során bevitt adatok egy hét után "
"törlésre kerülnek."
-#: core/templates/template.html:117
+#: core/templates/template.html:107
msgid "Create some demo entries"
msgstr "Készíts egy pár demó bejegyzést"
-#: core/templates/template.html:165 software/templates/features.html:568
+#: core/templates/template.html:155 software/templates/features.html:568
#: software/templates/tos.html:7
msgid "Terms of service"
msgstr ""
-#: core/templates/template_features.html:53 software/templates/features.html:9
+#: core/templates/template.html:181 software/templates/features.html:595
+msgid "Browser language"
+msgstr ""
+
+#: core/templates/template_features.html:46 software/templates/features.html:9
msgid "Features"
msgstr "Funkciók"
@@ -855,99 +870,94 @@ msgstr "Nincs fiókod?"
msgid "Forgot password?"
msgstr "Elfelejtett jelszó?"
-#: core/templates/user/overview.html:25 core/templates/user/overview.html:68
-#: core/templates/user/overview.html:112 core/templates/user/overview.html:144
-#: core/templates/user/overview.html:348 core/templates/user/overview.html:390
-#: core/templates/user/overview.html:426
+#: core/templates/user/overview.html:28 core/templates/user/overview.html:71
+#: core/templates/user/overview.html:115 core/templates/user/overview.html:147
+#: core/templates/user/overview.html:351 core/templates/user/overview.html:393
+#: core/templates/user/overview.html:429
#, python-format
msgid "last %(number)s"
msgstr "utolsó %(number)s"
-#: core/templates/user/overview.html:27 core/templates/user/overview.html:146
-#: core/templates/user/overview.html:343 core/templates/user/overview.html:382
-#: core/templates/user/overview.html:421 gym/templates/gym/member_list.html:226
+#: core/templates/user/overview.html:30 core/templates/user/overview.html:149
+#: core/templates/user/overview.html:346 core/templates/user/overview.html:385
+#: core/templates/user/overview.html:424 gym/templates/gym/member_list.html:226
#: gym/templates/gym/member_list.html:262
#: gym/templates/gym/member_list.html:302
msgid "Overview"
msgstr "Áttekintés"
-#: core/templates/user/overview.html:34 core/templates/user/overview.html:76
-#: core/templates/user/overview.html:120 core/templates/user/overview.html:152
+#: core/templates/user/overview.html:37 core/templates/user/overview.html:79
+#: core/templates/user/overview.html:123 core/templates/user/overview.html:155
#: manager/helpers.py:88 software/templates/about_us.html:170
#: weight/templates/import_csv_preview.html:13
#: weight/templates/import_csv_preview.html:42 weight/views.py:54
msgid "Date"
msgstr "Dátum"
-#: core/templates/user/overview.html:35 core/templates/user/overview.html:153
+#: core/templates/user/overview.html:38 core/templates/user/overview.html:156
#: gym/models/contract.py:58 gym/models/contract.py:109
msgid "Description"
msgstr "Leírás"
-#: core/templates/user/overview.html:36
+#: core/templates/user/overview.html:39
msgid "Number of logs (days)"
msgstr "Bejegyzések száma (napok)"
-#: core/templates/user/overview.html:37 core/views/user.py:590
+#: core/templates/user/overview.html:40 core/views/user.py:606
#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:158
msgid "Last activity"
msgstr "Utolsó tevékenység"
-#: core/templates/user/overview.html:58
+#: core/templates/user/overview.html:61
msgid "No workouts found."
msgstr "Nem található edzés."
-#: core/templates/user/overview.html:68
+#: core/templates/user/overview.html:71
msgid "Log"
msgstr "Bejegyzések"
-#: core/templates/user/overview.html:77
+#: core/templates/user/overview.html:80
msgid "General impression"
msgstr "Általános benyomás"
-#: core/templates/user/overview.html:78 core/templates/user/overview.html:390
+#: core/templates/user/overview.html:81 core/templates/user/overview.html:393
msgid "Notes"
msgstr "Megjegyzések"
-#: core/templates/user/overview.html:79
-#: exercises/templates/history/overview.html:30
-msgid "Time"
-msgstr "Idő"
-
-#: core/templates/user/overview.html:112 core/templates/user/overview.html:121
+#: core/templates/user/overview.html:115 core/templates/user/overview.html:124
#: manager/helpers.py:89 weight/templates/import_csv_preview.html:14
#: weight/templates/import_csv_preview.html:43 weight/views.py:54
msgid "Weight"
msgstr "Súly"
-#: core/templates/user/overview.html:154
-#: nutrition/templates/ingredient/view.html:51 nutrition/views/plan.py:245
+#: core/templates/user/overview.html:157
+#: nutrition/templates/ingredient/view.html:52 nutrition/views/plan.py:244
msgid "Energy"
msgstr "Energia"
-#: core/templates/user/overview.html:155
-#: nutrition/templates/ingredient/view.html:58 nutrition/views/plan.py:251
+#: core/templates/user/overview.html:158
+#: nutrition/templates/ingredient/view.html:59 nutrition/views/plan.py:250
msgid "Protein"
msgstr "Fehérje"
-#: core/templates/user/overview.html:156
-#: nutrition/templates/ingredient/view.html:64 nutrition/views/plan.py:259
+#: core/templates/user/overview.html:159
+#: nutrition/templates/ingredient/view.html:65 nutrition/views/plan.py:258
msgid "Carbohydrates"
msgstr "Szénhidrát"
-#: core/templates/user/overview.html:157
-#: nutrition/templates/ingredient/view.html:80 nutrition/views/plan.py:273
+#: core/templates/user/overview.html:160
+#: nutrition/templates/ingredient/view.html:81 nutrition/views/plan.py:272
msgid "Fat"
msgstr "Zsír"
-#: core/templates/user/overview.html:170
-#: nutrition/templates/ingredient/view.html:53
+#: core/templates/user/overview.html:173
+#: nutrition/templates/ingredient/view.html:54
msgid "kcal"
msgstr "kcal"
-#: core/templates/user/overview.html:201 core/templates/user/overview.html:340
-#: core/templates/user/overview.html:379 core/templates/user/overview.html:418
-#: core/templates/user/overview.html:463 gym/templates/gym/list.html:45
+#: core/templates/user/overview.html:204 core/templates/user/overview.html:343
+#: core/templates/user/overview.html:382 core/templates/user/overview.html:421
+#: core/templates/user/overview.html:466 gym/templates/gym/list.html:45
#: gym/templates/gym/member_list.html:91 gym/templates/gym/member_list.html:149
#: gym/templates/gym/member_list.html:187
#: gym/templates/gym/member_list.html:223
@@ -956,109 +966,113 @@ msgstr "kcal"
msgid "Actions"
msgstr "Műveletek"
-#: core/templates/user/overview.html:210
+#: core/templates/user/overview.html:213
msgid "Deactivate user"
msgstr "Felhasználó deaktiviálása"
-#: core/templates/user/overview.html:214
+#: core/templates/user/overview.html:217
msgid "Activate user"
msgstr "Felhasználó aktiválása"
-#: core/templates/user/overview.html:223
+#: core/templates/user/overview.html:226
msgid "Reset user password"
msgstr ""
-#: core/templates/user/overview.html:227 gym/templates/gym/member_list.html:30
+#: core/templates/user/overview.html:230 gym/templates/gym/member_list.html:30
msgid "Roles"
msgstr "Szerepek"
-#: core/templates/user/overview.html:243
+#: core/templates/user/overview.html:246
msgid "Password reset confirmation"
msgstr "Jelszó igénylés megerősítése"
-#: core/templates/user/overview.html:247
+#: core/templates/user/overview.html:250
msgid "Do you really want to change this user&#39;s password?"
msgstr ""
-#: core/templates/user/overview.html:250
+#: core/templates/user/overview.html:253
#: exercises/templates/history/overview.html:106
+#: nutrition/templates/ingredient/view.html:148
+#: nutrition/templates/ingredient/view.html:160
msgid "No"
msgstr ""
-#: core/templates/user/overview.html:251
+#: core/templates/user/overview.html:254
#: exercises/templates/history/overview.html:99
+#: nutrition/templates/ingredient/view.html:146
+#: nutrition/templates/ingredient/view.html:158
msgid "Yes"
msgstr ""
-#: core/templates/user/overview.html:272 gym/templates/gym/member_list.html:105
+#: core/templates/user/overview.html:275 gym/templates/gym/member_list.html:105
msgid "Details"
msgstr "Részletek"
-#: core/templates/user/overview.html:276 gym/views/export.py:57
-#: manager/helpers.py:89 nutrition/views/plan.py:151
-#: nutrition/views/plan.py:157
+#: core/templates/user/overview.html:279 gym/views/export.py:57
+#: manager/helpers.py:89 nutrition/views/plan.py:150
+#: nutrition/views/plan.py:156
msgid "Nr."
msgstr "sz."
-#: core/templates/user/overview.html:298 gym/models/contract.py:287
+#: core/templates/user/overview.html:301 gym/models/contract.py:287
#: gym/models/gym.py:50 gym/templates/contract/view.html:75
#: gym/templates/gym/member_list.html:112 gym/views/export.py:68
msgid "Phone"
msgstr "Telefon"
-#: core/templates/user/overview.html:302 gym/templates/contract/view.html:87
+#: core/templates/user/overview.html:305 gym/templates/contract/view.html:87
#: gym/templates/gym/member_list.html:130
msgid "Address"
msgstr "Cím"
-#: core/templates/user/overview.html:313
+#: core/templates/user/overview.html:316
msgid "Registered"
msgstr "Regisztrálva"
-#: core/templates/user/overview.html:317
+#: core/templates/user/overview.html:320
msgid "Last login"
msgstr "Utolsó bejelentkezés"
-#: core/templates/user/overview.html:322
+#: core/templates/user/overview.html:325
msgid "Status"
msgstr "Státusz"
-#: core/templates/user/overview.html:325
+#: core/templates/user/overview.html:328
msgid "Active"
msgstr "Aktív"
-#: core/templates/user/overview.html:327
+#: core/templates/user/overview.html:330
msgid "Inactive"
msgstr "Inaktív"
-#: core/templates/user/overview.html:348 gym/templates/contract/list.html:4
+#: core/templates/user/overview.html:351 gym/templates/contract/list.html:4
#: gym/templates/gym/member_list.html:218
msgid "Contracts"
msgstr ""
-#: core/templates/user/overview.html:426 gym/templates/document/list.html:4
+#: core/templates/user/overview.html:429 gym/templates/document/list.html:4
msgid "Documents"
msgstr "Dokumentumok"
-#: core/templates/user/overview.html:433 gym/templates/document/list.html:33
+#: core/templates/user/overview.html:436 gym/templates/document/list.html:33
msgid "Download"
msgstr "Letöltés"
-#: core/templates/user/overview.html:474 gym/views/admin_config.py:44
+#: core/templates/user/overview.html:477 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:477 gym/models/user_config.py:92
+#: core/templates/user/overview.html:480 gym/models/user_config.py:92
msgid "Include in inactive overview"
msgstr ""
-#: core/templates/user/overview.html:510
+#: core/templates/user/overview.html:513
#, python-format
msgid "Admin login is only available for users in %(gym_name)s"
msgstr ""
-#: core/templates/user/overview.html:514
+#: core/templates/user/overview.html:517
msgid "Log in as this user"
msgstr "Bejelentkezés mint ez a felhasználó"
@@ -1082,7 +1096,7 @@ msgstr ""
msgid "You need to verify your email to contribute exercises"
msgstr ""
-#: core/templates/user/preferences.html:55 core/views/user.py:601
+#: core/templates/user/preferences.html:55 core/views/user.py:617
msgid "Change password"
msgstr "Jelszó megváltoztatása"
@@ -1090,23 +1104,23 @@ msgstr "Jelszó megváltoztatása"
msgid "Already have an account?"
msgstr ""
-#: core/templatetags/wger_extras.py:142 i18n.tpl:38
+#: core/templatetags/wger_extras.py:142 i18n.tpl:39
msgid "kg"
msgstr "kg"
#: core/templatetags/wger_extras.py:144
-#: nutrition/templates/ingredient/view.html:60
-#: nutrition/templates/ingredient/view.html:66
-#: nutrition/templates/ingredient/view.html:73
-#: nutrition/templates/ingredient/view.html:82
-#: nutrition/templates/ingredient/view.html:89
-#: nutrition/templates/ingredient/view.html:111
-#: nutrition/templates/ingredient/view.html:121
+#: nutrition/templates/ingredient/view.html:61
+#: nutrition/templates/ingredient/view.html:67
+#: nutrition/templates/ingredient/view.html:74
+#: nutrition/templates/ingredient/view.html:83
+#: nutrition/templates/ingredient/view.html:90
+#: nutrition/templates/ingredient/view.html:112
+#: nutrition/templates/ingredient/view.html:122
msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr "g"
-#: core/templatetags/wger_extras.py:147 i18n.tpl:39
+#: core/templatetags/wger_extras.py:147 i18n.tpl:40
msgid "lb"
msgstr ""
@@ -1115,84 +1129,83 @@ msgctxt "weight unit, i.e. ounces"
msgid "oz"
msgstr ""
-#: core/views/languages.py:85 exercises/views/categories.py:122
+#: core/views/languages.py:88 exercises/views/categories.py:122
#: exercises/views/equipment.py:103 exercises/views/muscles.py:99
-#: nutrition/views/ingredient.py:120 nutrition/views/unit.py:110
+#: nutrition/views/ingredient.py:125
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
+#: core/views/languages.py:96 core/views/license.py:103
+#: core/views/repetition_units.py:114 core/views/weight_units.py:115
#: exercises/views/categories.py:128 exercises/views/muscles.py:106
#: gallery/views/images.py:124 gym/views/admin_notes.py:196
#: gym/views/document.py:206 gym/views/gym.py:481
-#: nutrition/views/ingredient.py:127 nutrition/views/unit.py:117
+#: nutrition/views/ingredient.py:132
#, python-brace-format
msgid "Delete {0}?"
msgstr "Töröljem {0}?"
-#: core/views/languages.py:111 core/views/license.py:85
-#: core/views/repetition_units.py:86 core/views/user.py:464
+#: core/views/languages.py:114 core/views/license.py:85
+#: core/views/repetition_units.py:96 core/views/user.py:480
#: core/views/weight_units.py:86 exercises/views/categories.py:98
#: exercises/views/equipment.py:81 exercises/views/muscles.py:87
#: gym/views/admin_notes.py:161 gym/views/config.py:68
#: gym/views/contract.py:186 gym/views/contract_option.py:123
#: gym/views/contract_type.py:123 gym/views/document.py:171
-#: gym/views/gym.py:463 nutrition/views/ingredient.py:146
-#: nutrition/views/unit.py:143
+#: gym/views/gym.py:463 nutrition/views/ingredient.py:151
#, python-brace-format
msgid "Edit {0}"
msgstr "{0} módosítása"
-#: core/views/misc.py:74
+#: core/views/misc.py:73
msgid ""
"We have created sample workout, workout schedules, weight logs, (body) "
"weight and nutrition plan entries so you can better see what this site can "
"do. Feel free to edit or delete them!"
msgstr ""
-#: core/views/user.py:143
+#: core/views/user.py:145
#, python-brace-format
msgid "Account \"{0}\" was successfully deleted"
msgstr "A \"{0}\" fiók sikeresen törölve"
-#: core/views/user.py:279
+#: core/views/user.py:287
msgid "You were successfully registered"
msgstr "Sikeresen regisztráltál"
-#: core/views/user.py:341
+#: core/views/user.py:357
msgid "Settings successfully updated"
msgstr "Beállítások sikeresen frissítve"
-#: core/views/user.py:380
+#: core/views/user.py:396
msgid "The user was successfully deactivated"
msgstr "A felhasználó sikeresen deaktiválva"
-#: core/views/user.py:417
+#: core/views/user.py:433
msgid "The user was successfully activated"
msgstr "A felhasználó sikeresen aktiválva"
-#: core/views/user.py:432
+#: core/views/user.py:448
msgid "Edit user"
msgstr "Felhasználó módosítása"
-#: core/views/user.py:587 gym/templates/gym/member_list.html:26
+#: core/views/user.py:603 gym/templates/gym/member_list.html:26
#: gym/views/gym.py:158
msgid "ID"
msgstr "ID"
-#: core/views/user.py:588 gym/forms.py:95 gym/templates/contract/view.html:55
+#: core/views/user.py:604 gym/forms.py:95 gym/templates/contract/view.html:55
#: gym/templates/gym/member_list.html:27 gym/views/export.py:59
#: gym/views/gym.py:158 gym/views/gym.py:217
msgid "Username"
msgstr "Felhasználónév"
-#: core/views/user.py:591 gym/templates/gym/new_user.html:34
+#: core/views/user.py:607 gym/templates/gym/new_user.html:34
#: gym/views/export.py:58 gym/views/gym.py:217
msgid "Gym"
msgstr "Edzőterem"
-#: core/views/user.py:650
+#: core/views/user.py:678
#, python-format
msgid "A verification email was sent to %(email)s"
msgstr ""
@@ -1211,16 +1224,16 @@ msgstr "gyakorlat neve"
msgid "A more basic name for the muscle"
msgstr ""
-#: exercises/models/video.py:50
+#: exercises/models/video.py:52
#, python-format
msgid "Maximum file size is %(size)sMB."
msgstr ""
-#: exercises/models/video.py:57 exercises/models/video.py:65
+#: exercises/models/video.py:59 exercises/models/video.py:67
msgid "File type is not supported"
msgstr ""
-#: exercises/models/video.py:70
+#: exercises/models/video.py:72
msgid "File is not a valid video"
msgstr ""
@@ -1297,7 +1310,11 @@ msgstr "Felszerelés törlése?"
msgid "Add muscle"
msgstr "Izom hozzáadása"
-#: gallery/templates/images/overview.html:72
+#: gallery/forms.py:35
+msgid "If date is left empty, it will be read from the image instead"
+msgstr ""
+
+#: gallery/templates/images/overview.html:69
#, fuzzy
#| msgid "Add new image"
msgid "Add image"
@@ -1367,7 +1384,7 @@ msgid "Contract type"
msgstr ""
#: gym/models/contract.py:211 gym/templates/contract/view.html:59
-#: nutrition/forms.py:58
+#: nutrition/forms.py:67
msgid "Amount"
msgstr ""
@@ -1543,7 +1560,7 @@ msgstr ""
msgid "Add member"
msgstr "Tag hozzáadása"
-#: gym/templates/gym/new_user.html:48 nutrition/templates/rate/form.html:120
+#: gym/templates/gym/new_user.html:48 nutrition/templates/rate/form.html:121
msgid "Info"
msgstr "Információ"
@@ -1714,10 +1731,6 @@ msgstr ""
msgid "Quads"
msgstr ""
-#: i18n.tpl:30
-msgid "Repetitions"
-msgstr "Ismétlések"
-
#: i18n.tpl:31
msgid "Resistance band"
msgstr ""
@@ -1746,193 +1759,197 @@ msgstr ""
msgid "Until Failure"
msgstr ""
-#: i18n.tpl:40
-msgid "none (bodyweight exercise)"
+#: i18n.tpl:38
+msgid "Meters"
msgstr ""
#: i18n.tpl:41
-msgid "Beginner"
+msgid "none (bodyweight exercise)"
msgstr ""
#: i18n.tpl:42
-msgid "Consistent"
+msgid "Beginner"
msgstr ""
#: i18n.tpl:43
-msgid "Dedicated"
+msgid "Consistent"
msgstr ""
#: i18n.tpl:44
-msgid "Obsessed"
+msgid "Dedicated"
msgstr ""
#: i18n.tpl:45
-msgid "Legend"
+msgid "Obsessed"
msgstr ""
#: i18n.tpl:46
-msgid "Veteran"
+msgid "Legend"
msgstr ""
#: i18n.tpl:47
-msgid "Titan"
+msgid "Veteran"
msgstr ""
#: i18n.tpl:48
-msgid "Unstoppable"
+msgid "Titan"
msgstr ""
#: i18n.tpl:49
-msgid "Weekend Warrior"
+msgid "Unstoppable"
msgstr ""
#: i18n.tpl:50
-msgid "Elephant lifter"
+msgid "Weekend Warrior"
msgstr ""
#: i18n.tpl:51
-msgid "Bus lifter"
+msgid "Elephant lifter"
msgstr ""
#: i18n.tpl:52
-msgid "Plane lifter"
+msgid "Bus lifter"
msgstr ""
#: i18n.tpl:53
-msgid "Blue whale lifter"
+msgid "Plane lifter"
msgstr ""
#: i18n.tpl:54
-msgid "Space Station lifter"
+msgid "Blue whale lifter"
msgstr ""
#: i18n.tpl:55
-msgid "Millionaire"
+msgid "Space Station lifter"
msgstr ""
#: i18n.tpl:56
-msgid "Atlas"
+msgid "Millionaire"
msgstr ""
#: i18n.tpl:57
-msgid "Early Bird"
+msgid "Atlas"
msgstr ""
#: i18n.tpl:58
+msgid "Early Bird"
+msgstr ""
+
+#: i18n.tpl:59
#, fuzzy
#| msgid "Weight log"
msgid "Night Owl"
msgstr "Testsúly napló"
-#: i18n.tpl:59
+#: i18n.tpl:60
msgid "New Year, New Me"
msgstr ""
-#: i18n.tpl:60
+#: i18n.tpl:61
msgid "Phoenix"
msgstr ""
-#: i18n.tpl:61
+#: i18n.tpl:62
#, fuzzy
#| msgid "Personal data"
msgid "Personal Record"
msgstr "Személyes adat"
-#: i18n.tpl:62
+#: i18n.tpl:63
#, fuzzy
#| msgid "Copy workout"
msgid "Complete your first workout"
msgstr "Edzés másolása"
-#: i18n.tpl:63
+#: i18n.tpl:64
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 10 workouts"
msgstr "Minta edzés"
-#: i18n.tpl:64
+#: i18n.tpl:65
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 50 workouts"
msgstr "Minta edzés"
-#: i18n.tpl:65
+#: i18n.tpl:66
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 100 workouts"
msgstr "Minta edzés"
-#: i18n.tpl:66
+#: i18n.tpl:67
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 200 workouts"
msgstr "Minta edzés"
-#: i18n.tpl:67
+#: i18n.tpl:68
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 500 workouts"
msgstr "Minta edzés"
-#: i18n.tpl:68
+#: i18n.tpl:69
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 1000 workouts"
msgstr "Minta edzés"
-#: i18n.tpl:69
+#: i18n.tpl:70
msgid "Maintain a 30-day workout streak"
msgstr ""
-#: i18n.tpl:70
+#: i18n.tpl:71
msgid "Work out on Saturday and Sunday for 4 consecutive weekends"
msgstr ""
-#: i18n.tpl:71
+#: i18n.tpl:72
msgid "Lift a cumulative total of 5.000 kg"
msgstr ""
-#: i18n.tpl:72
+#: i18n.tpl:73
msgid "Lift a cumulative total of 20.000 kg"
msgstr ""
-#: i18n.tpl:73
+#: i18n.tpl:74
msgid "Lift a cumulative total of 50.000 kg"
msgstr ""
-#: i18n.tpl:74
+#: i18n.tpl:75
msgid "Lift a cumulative total of 150.000 kg"
msgstr ""
-#: i18n.tpl:75
+#: i18n.tpl:76
msgid "Lift a cumulative total of 450.000 kg"
msgstr ""
-#: i18n.tpl:76
+#: i18n.tpl:77
msgid "Lift a cumulative total of 1.000.000 kg"
msgstr ""
-#: i18n.tpl:77
+#: i18n.tpl:78
msgid "Lift a cumulative total of 10.000.000 kg"
msgstr ""
-#: i18n.tpl:78
+#: i18n.tpl:79
msgid "Complete a workout before 6:00 AM"
msgstr ""
-#: i18n.tpl:79
+#: i18n.tpl:80
msgid "Complete a workout after 9:00 PM"
msgstr ""
-#: i18n.tpl:80
+#: i18n.tpl:81
msgid "Work out on January 1st"
msgstr ""
-#: i18n.tpl:81
+#: i18n.tpl:82
msgid "Return to training after being inactive for 30 days"
msgstr ""
-#: i18n.tpl:82
+#: i18n.tpl:83
msgid "Achieve a new Personal Record on any exercise"
msgstr ""
@@ -2014,7 +2031,7 @@ msgstr "Gyakorlat"
msgid "Routine will expire soon"
msgstr ""
-#: manager/models/routine.py:153 manager/models/session.py:145
+#: manager/models/routine.py:154 manager/models/session.py:145
msgid "The start time cannot be after the end time."
msgstr "A kezdő időpont nem lehet a vég időpont után."
@@ -2086,38 +2103,60 @@ msgstr "Edzés"
msgid "Workout for %s"
msgstr ""
-#: nutrition/forms.py:62
+#: nutrition/extract_info/off.py:72 nutrition/extract_info/off.py:91
+msgid "Serving"
+msgstr ""
+
+#: nutrition/forms.py:71 nutrition/forms.py:208
msgid "Unit"
msgstr ""
-#: nutrition/forms.py:170 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:179 nutrition/templates/rate/form.html:77
msgid "Basic caloric intake"
msgstr ""
-#: nutrition/forms.py:171
+#: nutrition/forms.py:180
msgid "Your basic caloric intake as calculated for your data"
msgstr ""
-#: nutrition/forms.py:176
+#: nutrition/forms.py:185
msgid "Additional calories"
msgstr ""
-#: nutrition/forms.py:178
+#: nutrition/forms.py:187
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
msgstr ""
#: nutrition/forms.py:209
+msgid "grams (g)"
+msgstr ""
+
+#: nutrition/forms.py:219
msgid "Ingredient"
msgstr ""
-#: nutrition/forms.py:213
+#: nutrition/forms.py:223
#, fuzzy
#| msgid "Also use ingredients in English"
msgid "Also search for names in English"
msgstr "Használjon hozzávalókat Angolul is"
+#: nutrition/forms.py:239
+msgid "Quantity"
+msgstr ""
+
+#: nutrition/forms.py:241
+msgid "Enter a quantity and choose grams (g) or one of the serving units."
+msgstr ""
+
+#: nutrition/models/ingredient.py:526
+#, fuzzy
+#| msgid "Duration"
+msgid "Portion"
+msgstr "Időtartam"
+
#: nutrition/templates/ingredient/email_new.tpl:1
#, python-format
msgid ""
@@ -2155,59 +2194,86 @@ msgid ""
"sucessfully."
msgstr ""
-#: nutrition/templates/ingredient/overview.html:38
+#: nutrition/templates/ingredient/overview.html:32
+#: nutrition/templates/ingredient/overview.html:68
+#: nutrition/templates/ingredient/view.html:143
+msgid "Vegan"
+msgstr ""
+
+#: nutrition/templates/ingredient/overview.html:34
+#: nutrition/templates/ingredient/overview.html:79
+#: nutrition/templates/ingredient/view.html:155
+msgid "Vegetarian"
+msgstr ""
+
+#: nutrition/templates/ingredient/overview.html:43
msgid "No ingredients."
msgstr "Nincs összetevő."
-#: nutrition/templates/ingredient/overview.html:49
+#: nutrition/templates/ingredient/overview.html:54
msgid "Search"
msgstr "Keresés"
-#: nutrition/templates/ingredient/view.html:45 nutrition/views/plan.py:237
+#: nutrition/templates/ingredient/overview.html:57
+msgid "Filter"
+msgstr ""
+
+#: nutrition/templates/ingredient/overview.html:83
+msgid "Apply"
+msgstr ""
+
+#: nutrition/templates/ingredient/overview.html:85
+msgid "Reset"
+msgstr ""
+
+#: nutrition/templates/ingredient/view.html:46 nutrition/views/plan.py:236
msgid "Macronutrients"
msgstr ""
-#: nutrition/templates/ingredient/view.html:54
+#: nutrition/templates/ingredient/view.html:55
msgid "kJ"
msgstr ""
-#: nutrition/templates/ingredient/view.html:70 nutrition/views/plan.py:267
+#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:266
msgid "Sugar content in carbohydrates"
msgstr ""
-#: nutrition/templates/ingredient/view.html:75
-#: nutrition/templates/ingredient/view.html:91
-#: nutrition/templates/ingredient/view.html:113
-#: nutrition/templates/ingredient/view.html:123
+#: nutrition/templates/ingredient/view.html:76
+#: nutrition/templates/ingredient/view.html:92
+#: nutrition/templates/ingredient/view.html:114
+#: nutrition/templates/ingredient/view.html:124
msgid "n.A."
msgstr ""
-#: nutrition/templates/ingredient/view.html:86 nutrition/views/plan.py:281
+#: nutrition/templates/ingredient/view.html:87 nutrition/views/plan.py:280
msgid "Saturated fat content in fats"
msgstr ""
-#: nutrition/templates/ingredient/view.html:102
+#: nutrition/templates/ingredient/view.html:103
msgid "Others"
msgstr ""
-#: nutrition/templates/ingredient/view.html:108 nutrition/views/plan.py:287
+#: nutrition/templates/ingredient/view.html:109 nutrition/views/plan.py:286
msgid "Fiber"
msgstr ""
-#: nutrition/templates/ingredient/view.html:118 nutrition/views/plan.py:293
+#: nutrition/templates/ingredient/view.html:119 nutrition/views/plan.py:292
msgid "Sodium"
msgstr ""
-#: nutrition/templates/ingredient/view.html:143
-#: nutrition/templates/units/list.html:50 nutrition/views/unit.py:86
+#: nutrition/templates/ingredient/view.html:136
+msgid "Dietary information"
+msgstr ""
+
+#: nutrition/templates/ingredient/view.html:184
msgid "Add new weight unit"
msgstr ""
-#: nutrition/templates/rate/form.html:25
+#: nutrition/templates/rate/form.html:26
msgid "Basal metabolic rate"
msgstr ""
-#: nutrition/templates/rate/form.html:26
+#: nutrition/templates/rate/form.html:27
msgid ""
"The basal metabolic rate is the amount of energy expended daily\n"
"at rest. This is the minimum energy needed for the body to function, without "
@@ -2215,36 +2281,36 @@ msgid ""
"additional physical activity."
msgstr ""
-#: nutrition/templates/rate/form.html:37
+#: nutrition/templates/rate/form.html:38
msgid "Your basic metabolic rate is: "
msgstr ""
-#: nutrition/templates/rate/form.html:47
+#: nutrition/templates/rate/form.html:48
msgid "Physical activities"
msgstr ""
-#: nutrition/templates/rate/form.html:48
+#: nutrition/templates/rate/form.html:49
msgid ""
"The physical activity level (PAL) is a factor used to to express\n"
"the additional physical activity and is used to calculate the total energy\n"
"required per day."
msgstr ""
-#: nutrition/templates/rate/form.html:59
+#: nutrition/templates/rate/form.html:60
msgid "Factor for daily activities: "
msgstr ""
-#: nutrition/templates/rate/form.html:67
+#: nutrition/templates/rate/form.html:68
msgid ""
"The base caloric intake is the amount of calories your metabolism\n"
"needs based on your level of physical activity."
msgstr ""
-#: nutrition/templates/rate/form.html:81
+#: nutrition/templates/rate/form.html:82
msgid "Calculate basic caloric intake"
msgstr ""
-#: nutrition/templates/rate/form.html:88
+#: nutrition/templates/rate/form.html:89
msgid ""
"The total calories are the actual total calories per day. This\n"
"might include e.g. a surplus or deficit if you are bulking or cutting. "
@@ -2252,69 +2318,69 @@ msgid ""
"you might just enter yourself the amount of calories if you know the value."
msgstr ""
-#: nutrition/templates/rate/form.html:102
+#: nutrition/templates/rate/form.html:103
msgid "Transfer basic intake to total daily calories"
msgstr ""
-#: nutrition/templates/rate/form.html:106
+#: nutrition/templates/rate/form.html:107
msgid "Add additional calories to total daily calories"
msgstr ""
-#: nutrition/templates/rate/form.html:110
+#: nutrition/templates/rate/form.html:111
msgid "Save total calories to profile"
msgstr ""
-#: nutrition/templates/rate/form.html:121
+#: nutrition/templates/rate/form.html:122
msgid ""
"Please note that these calculations can only be an\n"
"approximation. If you base your nutrition plan on these values, observe\n"
"yourself for some weeks and change the total amount if needed."
msgstr ""
-#: nutrition/views/ingredient.py:158
+#: nutrition/views/ingredient.py:163
msgid "Add a new ingredient"
msgstr ""
-#: nutrition/views/plan.py:128
+#: nutrition/views/plan.py:127
msgid "Nutritional plan"
msgstr ""
-#: nutrition/views/plan.py:130
+#: nutrition/views/plan.py:129
#, python-format
msgid "Nutritional plan for %s"
msgstr ""
-#: nutrition/views/plan.py:202
+#: nutrition/views/plan.py:201
msgid "<i>This is an empty plan, what did you expect on the PDF?</i>"
msgstr ""
-#: nutrition/views/plan.py:230
+#: nutrition/views/plan.py:229
#, fuzzy
#| msgid "Nutrition plan"
msgid "Nutritional data"
msgstr "Táplálkozási terv"
-#: nutrition/views/plan.py:238
+#: nutrition/views/plan.py:237
msgid "Total"
msgstr ""
-#: nutrition/views/plan.py:239
+#: nutrition/views/plan.py:238
msgid "Percent of energy"
msgstr ""
-#: nutrition/views/plan.py:240
+#: nutrition/views/plan.py:239
msgid "g per body kg"
msgstr ""
-#: nutrition/views/unit_ingredient.py:69
+#: nutrition/views/unit_ingredient.py:64
msgid "Add a new weight unit"
msgstr ""
-#: nutrition/views/unit_ingredient.py:106
+#: nutrition/views/unit_ingredient.py:99
msgid "Edit a weight unit to ingredient connection"
msgstr ""
-#: nutrition/views/unit_ingredient.py:138
+#: nutrition/views/unit_ingredient.py:129
msgid "Delete?"
msgstr "Törlés?"
@@ -2685,7 +2751,7 @@ msgstr ""
msgid "Translation"
msgstr "Lefordítás"
-#: utils/generic_views.py:263
+#: utils/generic_views.py:246
msgid "Yes, delete"
msgstr "Igen, töröld"
@@ -2736,10 +2802,6 @@ msgstr ""
msgid "Import weight logs"
msgstr ""
-#: weight/templates/import_csv_form.html:9
-msgid "Submit"
-msgstr ""
-
#: weight/templates/import_csv_form.html:15
msgid ""
"Use this import field to import your weight logs into Workout\n"
@@ -2835,6 +2897,19 @@ msgstr ""
msgid "Re-Submit"
msgstr ""
+#, fuzzy
+#~| msgid "Configuration"
+#~ msgid "Email verification"
+#~ msgstr "Beállítás"
+
+#, fuzzy
+#~| msgid "Configuration"
+#~ msgid "Email Confirmation"
+#~ msgstr "Beállítás"
+
+#~ msgid "Ingredient weight units"
+#~ msgstr "Összetevő súly egységek"
+
#~ msgid "Image"
#~ msgstr "Kép"
@@ -2884,9 +2959,6 @@ msgstr ""
#~ msgid "Language"
#~ msgstr "Nyelv"
-#~ msgid "Duration"
-#~ msgstr "Időtartam"
-
#~ msgid "Order"
#~ msgstr "Sorrend"
diff --git a/wger/locale/it/LC_MESSAGES/django.po b/wger/locale/it/LC_MESSAGES/django.po
index 10a9361bf..04ef1f979 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: 2026-01-17 14:03+0000\n"
+"POT-Creation-Date: 2026-04-10 10:20+0000\n"
"PO-Revision-Date: 2025-09-10 09:02+0000\n"
"Last-Translator: Luca Galli <[email protected]>\n"
"Language-Team: Italian <https://hosted.weblate.org/projects/wger/web/it/>\n"
@@ -42,7 +42,7 @@ msgstr ""
#: config/views/gym_config.py:42 core/templates/language/view.html:64
#: core/templates/license/list.html:17
#: core/templates/repetition_unit/list.html:18
-#: core/templates/user/overview.html:204 core/templates/user/overview.html:467
+#: core/templates/user/overview.html:207 core/templates/user/overview.html:470
#: core/templates/weight_unit/list.html:18
#: exercises/templates/categories/admin-overview.html:17
#: exercises/templates/equipment/admin-overview.html:17
@@ -54,30 +54,29 @@ msgstr ""
#: gym/templates/gym/list.html:19 gym/templates/gym/list.html:48
#: gym/templates/gym/member_list.html:94 gym/templates/gym/member_list.html:152
#: gym/templates/gym/member_list.html:190
-#: nutrition/templates/ingredient/view.html:164
-#: nutrition/templates/ingredient/view.html:209
-#: nutrition/templates/units/list.html:19
+#: nutrition/templates/ingredient/view.html:205
+#: nutrition/templates/ingredient/view.html:248
msgid "Edit"
msgstr "Modifica"
-#: core/forms.py:91 core/templates/navigation.html:271
-#: core/templates/navigation.html:278 core/templates/user/login.html:4
+#: core/forms.py:89 core/templates/navigation.html:268
+#: core/templates/navigation.html:275 core/templates/user/login.html:4
#: core/templates/user/registration_sidebar.html:12
#: software/templates/features.html:82 software/templates/features.html:448
msgid "Login"
msgstr "Entra"
-#: core/forms.py:130 core/forms.py:244 gym/views/export.py:61
+#: core/forms.py:128 core/forms.py:242 gym/views/export.py:61
#: gym/views/gym.py:217
msgid "First name"
msgstr "Nome"
-#: core/forms.py:131 core/forms.py:245 core/templates/user/overview.html:284
+#: core/forms.py:129 core/forms.py:243 core/templates/user/overview.html:287
#: gym/views/export.py:62 gym/views/gym.py:217
msgid "Last name"
msgstr "Cognome"
-#: core/forms.py:133 core/forms.py:210 core/templates/user/overview.html:288
+#: core/forms.py:131 core/forms.py:208 core/templates/user/overview.html:291
#: gym/models/contract.py:256 gym/models/gym.py:58
#: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:116
#: gym/templates/gym/new_user.html:30 gym/views/export.py:60
@@ -87,57 +86,57 @@ msgstr "Cognome"
msgid "Email"
msgstr "Email"
-#: core/forms.py:134
+#: core/forms.py:132
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:138 core/models/profile.py:222
+#: core/forms.py:136 core/models/profile.py:222
#: gym/templates/gym/new_user.html:38
msgid "Date of Birth"
msgstr "Data di nascita"
-#: core/forms.py:177
+#: core/forms.py:175
msgid "Personal data"
msgstr "Dati personali"
-#: core/forms.py:189
+#: core/forms.py:187
msgid "Workout reminders"
msgstr "Promemoria allenamento"
-#: core/forms.py:196
+#: core/forms.py:194
msgid "Other settings"
msgstr "Altre impostazioni"
-#: core/forms.py:204 core/views/user.py:614 core/views/user.py:629
-#: core/views/user.py:641 gym/forms.py:73 utils/generic_views.py:143
+#: core/forms.py:202 core/views/user.py:630 core/views/user.py:654
+#: core/views/user.py:668 gym/forms.py:73 utils/generic_views.py:137
msgid "Save"
msgstr "Salva"
-#: core/forms.py:211
+#: core/forms.py:209
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:240
+#: core/forms.py:238
msgid "This e-mail address is already in use."
msgstr "Questo indirizzo e-mail è già in uso."
-#: core/forms.py:261 gym/templates/gym/new_user.html:26
+#: core/forms.py:259 gym/templates/gym/new_user.html:26
#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:217
msgid "Password"
msgstr "Password"
-#: core/forms.py:263
+#: core/forms.py:261
msgid "Please enter your current password."
msgstr "Si prega di inserire la tua password attuale."
-#: core/forms.py:272 core/templates/language/view.html:70
+#: core/forms.py:270 core/templates/language/view.html:70
#: core/templates/license/list.html:21
#: core/templates/repetition_unit/list.html:22
-#: core/templates/user/overview.html:233
+#: core/templates/user/overview.html:236
#: core/templates/weight_unit/list.html:22
#: exercises/templates/categories/admin-overview.html:21
#: exercises/templates/equipment/admin-overview.html:21
@@ -145,27 +144,30 @@ msgstr "Si prega di inserire la tua password attuale."
#: gym/templates/admin_notes/list.html:37
#: gym/templates/contract_option/list.html:35
#: gym/templates/contract_type/list.html:36 gym/templates/document/list.html:46
-#: gym/templates/gym/list.html:23 nutrition/templates/ingredient/view.html:168
-#: nutrition/templates/ingredient/view.html:215
-#: nutrition/templates/units/list.html:25
+#: gym/templates/gym/list.html:23 nutrition/templates/ingredient/view.html:209
+#: nutrition/templates/ingredient/view.html:254
msgid "Delete"
msgstr "Elimina"
-#: core/forms.py:281
+#: core/forms.py:279
msgid "Invalid password"
msgstr "Password non valida"
-#: core/forms.py:293
+#: core/forms.py:291 core/forms.py:349
msgid "The form is secured with reCAPTCHA"
msgstr "Questo modulo è protetto con reCAPTCHA"
-#: core/forms.py:314 core/forms.py:341 core/templates/navigation.html:272
-#: core/templates/navigation.html:285 core/templates/template.html:123
-#: core/templates/user/login.html:21 core/views/user.py:285
+#: core/forms.py:312 core/forms.py:339 core/templates/navigation.html:269
+#: core/templates/navigation.html:282 core/templates/template.html:113
+#: core/templates/user/login.html:21 core/views/user.py:293
#: software/templates/features.html:87 software/templates/features.html:442
msgid "Register"
msgstr "Registrati"
+#: core/forms.py:360 weight/templates/import_csv_form.html:9
+msgid "Submit"
+msgstr "Invia"
+
#: core/models/language.py:31 core/templates/language/view.html:21
msgid "Language short name"
msgstr "Nome breve Lingua"
@@ -202,36 +204,36 @@ msgstr "Link"
msgid "Link to license text or other information"
msgstr "Link al testo della licenza o altre informazioni"
-#: core/models/profile.py:57
+#: core/models/profile.py:60
#, python-format
msgid "%(birthdate)s is not a valid birthdate"
msgstr "%(birthdate)s non è un data di nascita valida"
-#: core/models/profile.py:66
+#: core/models/profile.py:69
msgid "Male"
msgstr "Maschio"
-#: core/models/profile.py:67
+#: core/models/profile.py:70
msgid "Female"
msgstr "Femmina"
-#: core/models/profile.py:74
+#: core/models/profile.py:77
msgid "Low"
msgstr "Basso"
-#: core/models/profile.py:75
+#: core/models/profile.py:78
msgid "Medium"
msgstr "Medio"
-#: core/models/profile.py:76
+#: core/models/profile.py:79
msgid "High"
msgstr "Alto"
-#: core/models/profile.py:82
+#: core/models/profile.py:85
msgid "Metric (kilogram)"
msgstr "Metrico (kilogrammi)"
-#: core/models/profile.py:83
+#: core/models/profile.py:86
msgid "Imperial (pound)"
msgstr "Imperiali (libbra)"
@@ -355,7 +357,7 @@ msgstr "Media ore per settimana"
msgid "Free time"
msgstr "Tempo libero"
-#: core/models/profile.py:320 nutrition/templates/rate/form.html:66
+#: core/models/profile.py:320 nutrition/templates/rate/form.html:67
msgid "Total daily calories"
msgstr "Totale giornaliero calorico"
@@ -398,20 +400,43 @@ msgstr ""
msgid "Enable or disable the trophy system for this user"
msgstr ""
-#: core/models/profile.py:446
+#: core/models/profile.py:457
msgid "The sum of all hours has to be 24"
msgstr "La somma di tutte le ore deve essere 24"
-#: core/models/rep_unit.py:36 core/models/weight_unit.py:42
-#: core/templates/user/overview.html:280 core/views/user.py:589
+#: core/models/rep_unit.py:32 i18n.tpl:30
+msgid "Repetitions"
+msgstr "Ripetizioni"
+
+#: core/models/rep_unit.py:33 core/templates/user/overview.html:82
+#: exercises/templates/history/overview.html:30
+msgid "Time"
+msgstr "Tempo"
+
+#: core/models/rep_unit.py:34
+msgid "Distance"
+msgstr ""
+
+#: core/models/rep_unit.py:47 core/models/weight_unit.py:42
+#: core/templates/user/overview.html:283 core/views/user.py:605
#: exercises/models/muscle.py:36 gym/models/contract.py:52
#: gym/models/contract.py:103 gym/models/gym.py:46
#: gym/models/user_document.py:84 gym/templates/contract/view.html:50
#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:108
-#: gym/views/gym.py:158 nutrition/templates/ingredient/view.html:151
+#: gym/views/gym.py:158 nutrition/templates/ingredient/view.html:192
msgid "Name"
msgstr "Nome"
+#: core/models/rep_unit.py:53
+#, fuzzy
+#| msgid "Unit"
+msgid "Unit Type"
+msgstr "Unità"
+
+#: core/models/rep_unit.py:54
+msgid "The type of unit (repetitions, time, or distance)"
+msgstr ""
+
#: core/templates/403.html:4
msgid "Forbidden!"
msgstr "Proibito!"
@@ -443,6 +468,55 @@ msgstr ""
"riprova più tardi. Se il problema continua, puoi chiedere aiuto nei modi "
"elencati di seguito:"
+#: core/templates/account/email/email_confirmation_message.html:81
+msgid "Almost there!"
+msgstr ""
+
+#: core/templates/account/email/email_confirmation_message.html:85
+#, fuzzy, python-format
+#| msgid ""
+#| "You're receiving this e-mail because you requested a password reset for "
+#| "your user account at %(site_name)s."
+msgid ""
+"You're receiving this email because the user \"%(user_display)s\" has given "
+"your email address to register an account on %(site_domain)s."
+msgstr ""
+"Hai ricevuto questa e-mail perché hai richiesto una reimpostazione della "
+"password per il tuo account utente all'indirizzo %(site_name)s."
+
+#: core/templates/account/email/email_confirmation_message.html:93
+msgid ""
+"Your email verification code is listed below. Please enter it in your open "
+"browser window."
+msgstr ""
+
+#: core/templates/account/email/email_confirmation_message.html:100
+#, fuzzy
+#| msgid "Please click the following link to confirm your email: %(link)s"
+msgid "Please click the button below to confirm your email address."
+msgstr "Clicca sul seguente link per confermare la tua email: %(link)s"
+
+#: core/templates/account/email/email_confirmation_message.html:106
+#, fuzzy
+#| msgid "Unverified email"
+msgid "Confirm email"
+msgstr "Email non verificata"
+
+#: core/templates/account/email/email_confirmation_message.html:110
+#, python-format
+msgid ""
+"The link is valid for %(expire_hours)s hours (until %(date)s, %(time)s). You "
+"can request a new one from your profile settings."
+msgstr ""
+
+#: core/templates/account/email/email_confirmation_message.html:116
+msgid "If the button doesn't work, copy and paste this link into your browser:"
+msgstr ""
+
+#: core/templates/account/email/email_confirmation_message.html:125
+msgid "the wger Team"
+msgstr "Il team wger"
+
#: core/templates/base.html:10
#, python-format
msgid ""
@@ -474,52 +548,7 @@ msgstr ""
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 verification"
-msgstr "Verifica email"
-
-#: core/templates/email_verification/confirm_template.html:18
-#, python-format
-msgid "%(username)s, your email was verified"
-msgstr "%(username)s, la tua email è stata verificata"
-
-#: core/templates/email_verification/confirm_template.html:22
-msgid "Error, invalid verification token"
-msgstr "Errore, token di verifica non valido"
-
-#: core/templates/email_verification/email_body_html.tpl:6
-msgid "Email Confirmation"
-msgstr "Conferma email"
-
-#: 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 "Ci sei quasi, %(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 ""
-"Per favore clicca <a href=\"%(link)s\">qui</a> per confermare la tua email"
-
-#: 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 "Il token scade il %(time)s"
-
-#: core/templates/email_verification/email_body_html.tpl:14
-#: core/templates/email_verification/email_body_txt.tpl:8
-msgid "the wger Team"
-msgstr "Il team wger"
-
-#: core/templates/email_verification/email_body_txt.tpl:4
-#, python-format
-msgid "Please click the following link to confirm your email: %(link)s"
-msgstr "Clicca sul seguente link per confermare la tua email: %(link)s"
-
-#: core/templates/language/overview.html:4 core/templates/navigation.html:344
+#: core/templates/language/overview.html:4 core/templates/navigation.html:341
msgid "Languages"
msgstr "Lingue"
@@ -528,16 +557,16 @@ msgid "Nothing found."
msgstr "Nessun risultato."
#: core/templates/language/overview.html:22
-#: nutrition/templates/ingredient/overview.html:38
+#: nutrition/templates/ingredient/overview.html:43
msgid "Add one now."
msgstr "Aggiungine uno adesso."
#: core/templates/language/overview.html:34 core/templates/license/list.html:43
-#: core/templates/repetition_unit/list.html:46
-#: core/templates/user/overview.html:344 core/templates/user/overview.html:384
-#: core/templates/user/overview.html:422
-#: core/templates/weight_unit/list.html:46 core/views/languages.py:74
-#: core/views/license.py:66 core/views/repetition_units.py:66
+#: core/templates/repetition_unit/list.html:44
+#: core/templates/user/overview.html:347 core/templates/user/overview.html:387
+#: core/templates/user/overview.html:425
+#: core/templates/weight_unit/list.html:46 core/views/languages.py:77
+#: core/views/license.py:66 core/views/repetition_units.py:76
#: core/views/weight_units.py:66
#: exercises/templates/categories/admin-overview.html:40
#: exercises/templates/equipment/admin-overview.html:39
@@ -550,14 +579,14 @@ msgstr "Aggiungine uno adesso."
#: gym/templates/gym/member_list.html:264
#: gym/templates/gym/member_list.html:303
#: mailer/templates/mailer/gym/overview.html:43
-#: nutrition/templates/ingredient/overview.html:60
+#: nutrition/templates/ingredient/overview.html:97
msgid "Add"
msgstr "Aggiungi"
#: core/templates/language/view.html:61 core/templates/user/api_key.html:41
#: core/templates/user/preferences.html:50 gym/models/contract.py:203
#: gym/templates/contract/view.html:41 gym/templates/gym/member_list.html:270
-#: nutrition/templates/ingredient/view.html:206
+#: nutrition/templates/ingredient/view.html:245
msgid "Options"
msgstr "Opzioni"
@@ -567,9 +596,9 @@ msgstr "Elenco delle licenze"
#: core/templates/license/list.html:30
#: core/templates/repetition_unit/list.html:32
-#: core/templates/user/overview.html:104 core/templates/user/overview.html:136
-#: core/templates/user/overview.html:185 core/templates/user/overview.html:365
-#: core/templates/user/overview.html:404 core/templates/user/overview.html:448
+#: core/templates/user/overview.html:107 core/templates/user/overview.html:139
+#: core/templates/user/overview.html:188 core/templates/user/overview.html:368
+#: core/templates/user/overview.html:407 core/templates/user/overview.html:451
#: core/templates/weight_unit/list.html:32
#: exercises/templates/categories/admin-overview.html:30
#: exercises/templates/equipment/admin-overview.html:30
@@ -581,11 +610,10 @@ msgstr "Elenco delle licenze"
#: gym/templates/gym/member_list.html:284
#: gym/templates/gym/member_list.html:321
#: mailer/templates/mailer/gym/overview.html:30
-#: nutrition/templates/units/list.html:34
msgid "Nothing found"
msgstr "Trovato niente"
-#: core/templates/misc/about.html:4 core/templates/template.html:160
+#: core/templates/misc/about.html:4 core/templates/template.html:150
msgid "Imprint"
msgstr "Impressum"
@@ -593,162 +621,157 @@ msgstr "Impressum"
msgid "Training"
msgstr "Allenamento"
-#: core/templates/navigation.html:37 core/templates/user/overview.html:25
+#: core/templates/navigation.html:36 core/templates/user/overview.html:28
msgid "Routines"
msgstr "Programmi"
-#: core/templates/navigation.html:45 core/templates/user/overview.html:70
+#: core/templates/navigation.html:44 core/templates/user/overview.html:73
msgid "Calendar"
msgstr "Calendario"
-#: core/templates/navigation.html:55
+#: core/templates/navigation.html:53
msgid "Measurements"
msgstr "Misure"
-#: core/templates/navigation.html:66 gallery/templates/images/overview.html:6
+#: core/templates/navigation.html:64 gallery/templates/images/overview.html:6
msgid "Gallery"
msgstr "Galleria"
-#: core/templates/navigation.html:72
+#: core/templates/navigation.html:74 core/templates/navigation.html:400
+#: trophies/templates/trophies/overview.html:7
+msgid "Trophies"
+msgstr ""
+
+#: core/templates/navigation.html:79
msgid "Workout templates"
msgstr "Modelli di allenamento"
-#: core/templates/navigation.html:79
+#: core/templates/navigation.html:86
msgid "Your templates"
msgstr "I tuoi modelli"
-#: core/templates/navigation.html:88
+#: core/templates/navigation.html:95
msgid "Public templates"
msgstr "Modelli pubblici"
-#: core/templates/navigation.html:96 software/templates/features.html:51
+#: core/templates/navigation.html:103 software/templates/features.html:51
#: software/templates/features.html:480
msgid "Exercises"
msgstr "Esercizi"
-#: core/templates/navigation.html:102 core/templates/navigation.html:176
-#: core/templates/navigation.html:339
+#: core/templates/navigation.html:109 core/templates/navigation.html:336
msgid "Administration"
msgstr "Amministrazione"
-#: core/templates/navigation.html:106
+#: core/templates/navigation.html:113
msgid "Exercise edit history"
msgstr "Aggiorna storico esercizi"
-#: core/templates/navigation.html:112
+#: core/templates/navigation.html:119
msgid "Equipment"
msgstr "Attrezzatura"
-#: core/templates/navigation.html:118
+#: core/templates/navigation.html:125
msgid "Muscles"
msgstr "Muscoli"
-#: core/templates/navigation.html:124
+#: core/templates/navigation.html:131
#: exercises/templates/categories/admin-overview.html:4
msgid "Categories"
msgstr "Categorie"
-#: core/templates/navigation.html:139 software/templates/features.html:468
+#: core/templates/navigation.html:146 software/templates/features.html:468
msgid "Nutrition"
msgstr "Piano nutrizionale"
-#: core/templates/navigation.html:147 core/templates/user/overview.html:144
+#: core/templates/navigation.html:154 core/templates/user/overview.html:147
msgid "Nutrition plans"
msgstr "Piani nutrizionali"
-#: core/templates/navigation.html:156
+#: core/templates/navigation.html:163
msgid "BMI calculator"
msgstr "Calcolatore IMC"
-#: core/templates/navigation.html:165 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:172 nutrition/templates/rate/form.html:18
msgid "Daily calories calculator"
msgstr "Calcolo calorie giornaliere"
-#: core/templates/navigation.html:171
+#: core/templates/navigation.html:178
#: nutrition/templates/ingredient/overview.html:10
msgid "Ingredient overview"
msgstr "Panoramica alimenti"
-#: core/templates/navigation.html:180 nutrition/templates/units/list.html:6
-msgid "Ingredient weight units"
-msgstr "Unità di peso ingrediente"
-
-#: core/templates/navigation.html:196 software/templates/features.html:463
+#: core/templates/navigation.html:193 software/templates/features.html:463
msgid "Body weight"
msgstr "Peso corporeo"
-#: core/templates/navigation.html:203 core/templates/user/overview.html:114
+#: core/templates/navigation.html:200 core/templates/user/overview.html:117
msgid "Weight overview"
msgstr "Panoramica peso corporeo"
-#: core/templates/navigation.html:217
+#: core/templates/navigation.html:214
msgid "About this software"
msgstr "Informazioni su questo software"
-#: core/templates/navigation.html:223 software/templates/about_us.html:5
+#: core/templates/navigation.html:220 software/templates/about_us.html:5
msgid "Support & Get Involved"
msgstr "Sostieni e partecipa"
-#: core/templates/navigation.html:229 software/templates/features.html:528
+#: core/templates/navigation.html:226 software/templates/features.html:528
msgid "REST API"
msgstr "REST API"
-#: core/templates/navigation.html:235 utils/models.py:45
+#: core/templates/navigation.html:232 utils/models.py:45
msgid "License"
msgstr "Licenza"
-#: core/templates/navigation.html:241
+#: core/templates/navigation.html:238
msgid "Developer documentation"
msgstr "Documentazione dello sviluppatore"
-#: core/templates/navigation.html:248
+#: core/templates/navigation.html:245
msgid "Get the code"
msgstr "Ottieni il codice"
-#: core/templates/navigation.html:255 core/templates/template.html:199
-#: software/templates/features.html:603
+#: core/templates/navigation.html:252 core/templates/template.html:202
+#: software/templates/features.html:614
msgid "Translate"
msgstr "Traduci"
-#: core/templates/navigation.html:292 core/templates/user/login.html:30
+#: core/templates/navigation.html:289 core/templates/user/login.html:30
msgid "Reset password"
msgstr "Reimposta la password"
-#: core/templates/navigation.html:301 core/templates/navigation.html:329
+#: core/templates/navigation.html:298 core/templates/navigation.html:326
msgid "Logout"
msgstr "Esci"
-#: core/templates/navigation.html:320
+#: core/templates/navigation.html:317
msgid "My preferences"
msgstr "Preferenze"
-#: core/templates/navigation.html:352
+#: core/templates/navigation.html:349
msgid "Licenses"
msgstr "Licenza"
-#: core/templates/navigation.html:360
+#: core/templates/navigation.html:357
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr "Unità di ripetizione"
-#: core/templates/navigation.html:368 core/templates/weight_unit/list.html:4
-#: nutrition/templates/ingredient/view.html:141
+#: core/templates/navigation.html:365 core/templates/weight_unit/list.html:4
+#: nutrition/templates/ingredient/view.html:182
msgid "Weight units"
msgstr "Unità peso"
-#: core/templates/navigation.html:376 core/templates/user/list.html:4
+#: core/templates/navigation.html:373 core/templates/user/list.html:4
msgid "User list"
msgstr "Lista utenti"
-#: core/templates/navigation.html:382
+#: core/templates/navigation.html:379
msgid "Gyms"
msgstr "Palestre"
-#: core/templates/navigation.html:403
-#: trophies/templates/trophies/overview.html:7
-msgid "Trophies"
-msgstr ""
-
#: core/templates/registration/password_reset_complete.html:4
msgid "Password reset complete"
msgstr "reimpostazione password completata"
@@ -809,27 +832,31 @@ msgstr "precedente"
msgid "next"
msgstr "successivo"
-#: core/templates/template.html:96
+#: core/templates/template.html:86
msgid "Close"
msgstr "Chiudi"
-#: core/templates/template.html:112
+#: core/templates/template.html:102
msgid ""
"You are using a guest account, data entered will be deleted after a week."
msgstr ""
"Stai usando un account ospite, i dati inseriti verranno cancellati dopo una "
"settimana."
-#: core/templates/template.html:117
+#: core/templates/template.html:107
msgid "Create some demo entries"
msgstr "Crea alcune voci demo"
-#: core/templates/template.html:165 software/templates/features.html:568
+#: core/templates/template.html:155 software/templates/features.html:568
#: software/templates/tos.html:7
msgid "Terms of service"
msgstr "Termini di servizio"
-#: core/templates/template_features.html:53 software/templates/features.html:9
+#: core/templates/template.html:181 software/templates/features.html:595
+msgid "Browser language"
+msgstr ""
+
+#: core/templates/template_features.html:46 software/templates/features.html:9
msgid "Features"
msgstr "Caratteristiche"
@@ -888,99 +915,94 @@ msgstr "Nessun account?"
msgid "Forgot password?"
msgstr "Password dimenticata?"
-#: core/templates/user/overview.html:25 core/templates/user/overview.html:68
-#: core/templates/user/overview.html:112 core/templates/user/overview.html:144
-#: core/templates/user/overview.html:348 core/templates/user/overview.html:390
-#: core/templates/user/overview.html:426
+#: core/templates/user/overview.html:28 core/templates/user/overview.html:71
+#: core/templates/user/overview.html:115 core/templates/user/overview.html:147
+#: core/templates/user/overview.html:351 core/templates/user/overview.html:393
+#: core/templates/user/overview.html:429
#, python-format
msgid "last %(number)s"
msgstr "ultimo %(number)s"
-#: core/templates/user/overview.html:27 core/templates/user/overview.html:146
-#: core/templates/user/overview.html:343 core/templates/user/overview.html:382
-#: core/templates/user/overview.html:421 gym/templates/gym/member_list.html:226
+#: core/templates/user/overview.html:30 core/templates/user/overview.html:149
+#: core/templates/user/overview.html:346 core/templates/user/overview.html:385
+#: core/templates/user/overview.html:424 gym/templates/gym/member_list.html:226
#: gym/templates/gym/member_list.html:262
#: gym/templates/gym/member_list.html:302
msgid "Overview"
msgstr "Panoramica"
-#: core/templates/user/overview.html:34 core/templates/user/overview.html:76
-#: core/templates/user/overview.html:120 core/templates/user/overview.html:152
+#: core/templates/user/overview.html:37 core/templates/user/overview.html:79
+#: core/templates/user/overview.html:123 core/templates/user/overview.html:155
#: manager/helpers.py:88 software/templates/about_us.html:170
#: weight/templates/import_csv_preview.html:13
#: weight/templates/import_csv_preview.html:42 weight/views.py:54
msgid "Date"
msgstr "Data"
-#: core/templates/user/overview.html:35 core/templates/user/overview.html:153
+#: core/templates/user/overview.html:38 core/templates/user/overview.html:156
#: gym/models/contract.py:58 gym/models/contract.py:109
msgid "Description"
msgstr "Descrizione"
-#: core/templates/user/overview.html:36
+#: core/templates/user/overview.html:39
msgid "Number of logs (days)"
msgstr "Numero di registri (giorni)"
-#: core/templates/user/overview.html:37 core/views/user.py:590
+#: core/templates/user/overview.html:40 core/views/user.py:606
#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:158
msgid "Last activity"
msgstr "Ultima attività"
-#: core/templates/user/overview.html:58
+#: core/templates/user/overview.html:61
msgid "No workouts found."
msgstr "Nessun allenamento trovato."
-#: core/templates/user/overview.html:68
+#: core/templates/user/overview.html:71
msgid "Log"
msgstr "Diario"
-#: core/templates/user/overview.html:77
+#: core/templates/user/overview.html:80
msgid "General impression"
msgstr "Impressioni generali"
-#: core/templates/user/overview.html:78 core/templates/user/overview.html:390
+#: core/templates/user/overview.html:81 core/templates/user/overview.html:393
msgid "Notes"
msgstr "Note"
-#: core/templates/user/overview.html:79
-#: exercises/templates/history/overview.html:30
-msgid "Time"
-msgstr "Tempo"
-
-#: core/templates/user/overview.html:112 core/templates/user/overview.html:121
+#: core/templates/user/overview.html:115 core/templates/user/overview.html:124
#: manager/helpers.py:89 weight/templates/import_csv_preview.html:14
#: weight/templates/import_csv_preview.html:43 weight/views.py:54
msgid "Weight"
msgstr "Peso"
-#: core/templates/user/overview.html:154
-#: nutrition/templates/ingredient/view.html:51 nutrition/views/plan.py:245
+#: core/templates/user/overview.html:157
+#: nutrition/templates/ingredient/view.html:52 nutrition/views/plan.py:244
msgid "Energy"
msgstr "Energie"
-#: core/templates/user/overview.html:155
-#: nutrition/templates/ingredient/view.html:58 nutrition/views/plan.py:251
+#: core/templates/user/overview.html:158
+#: nutrition/templates/ingredient/view.html:59 nutrition/views/plan.py:250
msgid "Protein"
msgstr "Proteine"
-#: core/templates/user/overview.html:156
-#: nutrition/templates/ingredient/view.html:64 nutrition/views/plan.py:259
+#: core/templates/user/overview.html:159
+#: nutrition/templates/ingredient/view.html:65 nutrition/views/plan.py:258
msgid "Carbohydrates"
msgstr "Carboidrati"
-#: core/templates/user/overview.html:157
-#: nutrition/templates/ingredient/view.html:80 nutrition/views/plan.py:273
+#: core/templates/user/overview.html:160
+#: nutrition/templates/ingredient/view.html:81 nutrition/views/plan.py:272
msgid "Fat"
msgstr "Grassi"
-#: core/templates/user/overview.html:170
-#: nutrition/templates/ingredient/view.html:53
+#: core/templates/user/overview.html:173
+#: nutrition/templates/ingredient/view.html:54
msgid "kcal"
msgstr "kcal"
-#: core/templates/user/overview.html:201 core/templates/user/overview.html:340
-#: core/templates/user/overview.html:379 core/templates/user/overview.html:418
-#: core/templates/user/overview.html:463 gym/templates/gym/list.html:45
+#: core/templates/user/overview.html:204 core/templates/user/overview.html:343
+#: core/templates/user/overview.html:382 core/templates/user/overview.html:421
+#: core/templates/user/overview.html:466 gym/templates/gym/list.html:45
#: gym/templates/gym/member_list.html:91 gym/templates/gym/member_list.html:149
#: gym/templates/gym/member_list.html:187
#: gym/templates/gym/member_list.html:223
@@ -989,109 +1011,113 @@ msgstr "kcal"
msgid "Actions"
msgstr "Azioni"
-#: core/templates/user/overview.html:210
+#: core/templates/user/overview.html:213
msgid "Deactivate user"
msgstr "Disattiva utente"
-#: core/templates/user/overview.html:214
+#: core/templates/user/overview.html:217
msgid "Activate user"
msgstr "Attiva utente"
-#: core/templates/user/overview.html:223
+#: core/templates/user/overview.html:226
msgid "Reset user password"
msgstr "Reset password utente"
-#: core/templates/user/overview.html:227 gym/templates/gym/member_list.html:30
+#: core/templates/user/overview.html:230 gym/templates/gym/member_list.html:30
msgid "Roles"
msgstr "Ruoli"
-#: core/templates/user/overview.html:243
+#: core/templates/user/overview.html:246
msgid "Password reset confirmation"
msgstr "Reset password confermato"
-#: core/templates/user/overview.html:247
+#: core/templates/user/overview.html:250
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:250
+#: core/templates/user/overview.html:253
#: exercises/templates/history/overview.html:106
+#: nutrition/templates/ingredient/view.html:148
+#: nutrition/templates/ingredient/view.html:160
msgid "No"
msgstr "No"
-#: core/templates/user/overview.html:251
+#: core/templates/user/overview.html:254
#: exercises/templates/history/overview.html:99
+#: nutrition/templates/ingredient/view.html:146
+#: nutrition/templates/ingredient/view.html:158
msgid "Yes"
msgstr "Si"
-#: core/templates/user/overview.html:272 gym/templates/gym/member_list.html:105
+#: core/templates/user/overview.html:275 gym/templates/gym/member_list.html:105
msgid "Details"
msgstr "Dettagli"
-#: core/templates/user/overview.html:276 gym/views/export.py:57
-#: manager/helpers.py:89 nutrition/views/plan.py:151
-#: nutrition/views/plan.py:157
+#: core/templates/user/overview.html:279 gym/views/export.py:57
+#: manager/helpers.py:89 nutrition/views/plan.py:150
+#: nutrition/views/plan.py:156
msgid "Nr."
msgstr "Numero"
-#: core/templates/user/overview.html:298 gym/models/contract.py:287
+#: core/templates/user/overview.html:301 gym/models/contract.py:287
#: gym/models/gym.py:50 gym/templates/contract/view.html:75
#: gym/templates/gym/member_list.html:112 gym/views/export.py:68
msgid "Phone"
msgstr "Numero"
-#: core/templates/user/overview.html:302 gym/templates/contract/view.html:87
+#: core/templates/user/overview.html:305 gym/templates/contract/view.html:87
#: gym/templates/gym/member_list.html:130
msgid "Address"
msgstr "Via"
-#: core/templates/user/overview.html:313
+#: core/templates/user/overview.html:316
msgid "Registered"
msgstr "Registrato"
-#: core/templates/user/overview.html:317
+#: core/templates/user/overview.html:320
msgid "Last login"
msgstr "Ultimo login"
-#: core/templates/user/overview.html:322
+#: core/templates/user/overview.html:325
msgid "Status"
msgstr "Stato"
-#: core/templates/user/overview.html:325
+#: core/templates/user/overview.html:328
msgid "Active"
msgstr "Attivo"
-#: core/templates/user/overview.html:327
+#: core/templates/user/overview.html:330
msgid "Inactive"
msgstr "Inattivo"
-#: core/templates/user/overview.html:348 gym/templates/contract/list.html:4
+#: core/templates/user/overview.html:351 gym/templates/contract/list.html:4
#: gym/templates/gym/member_list.html:218
msgid "Contracts"
msgstr "Contratti"
-#: core/templates/user/overview.html:426 gym/templates/document/list.html:4
+#: core/templates/user/overview.html:429 gym/templates/document/list.html:4
msgid "Documents"
msgstr "Documenti"
-#: core/templates/user/overview.html:433 gym/templates/document/list.html:33
+#: core/templates/user/overview.html:436 gym/templates/document/list.html:33
msgid "Download"
msgstr "Scarica"
-#: core/templates/user/overview.html:474 gym/views/admin_config.py:44
+#: core/templates/user/overview.html:477 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:477 gym/models/user_config.py:92
+#: core/templates/user/overview.html:480 gym/models/user_config.py:92
msgid "Include in inactive overview"
msgstr "Includi in una panoramica inattiva"
-#: core/templates/user/overview.html:510
+#: core/templates/user/overview.html:513
#, python-format
msgid "Admin login is only available for users in %(gym_name)s"
msgstr "Accesso amministratore disponibile per %(gym_name)s"
-#: core/templates/user/overview.html:514
+#: core/templates/user/overview.html:517
msgid "Log in as this user"
msgstr "Entra come questo utente"
@@ -1115,7 +1141,7 @@ msgstr "Invia email di verifica"
msgid "You need to verify your email to contribute exercises"
msgstr "Devi confermare l'email per contribuire agli esercizi"
-#: core/templates/user/preferences.html:55 core/views/user.py:601
+#: core/templates/user/preferences.html:55 core/views/user.py:617
msgid "Change password"
msgstr "Cambia la password"
@@ -1123,23 +1149,23 @@ msgstr "Cambia la password"
msgid "Already have an account?"
msgstr ""
-#: core/templatetags/wger_extras.py:142 i18n.tpl:38
+#: core/templatetags/wger_extras.py:142 i18n.tpl:39
msgid "kg"
msgstr "kg"
#: core/templatetags/wger_extras.py:144
-#: nutrition/templates/ingredient/view.html:60
-#: nutrition/templates/ingredient/view.html:66
-#: nutrition/templates/ingredient/view.html:73
-#: nutrition/templates/ingredient/view.html:82
-#: nutrition/templates/ingredient/view.html:89
-#: nutrition/templates/ingredient/view.html:111
-#: nutrition/templates/ingredient/view.html:121
+#: nutrition/templates/ingredient/view.html:61
+#: nutrition/templates/ingredient/view.html:67
+#: nutrition/templates/ingredient/view.html:74
+#: nutrition/templates/ingredient/view.html:83
+#: nutrition/templates/ingredient/view.html:90
+#: nutrition/templates/ingredient/view.html:112
+#: nutrition/templates/ingredient/view.html:122
msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr "g"
-#: core/templatetags/wger_extras.py:147 i18n.tpl:39
+#: core/templatetags/wger_extras.py:147 i18n.tpl:40
msgid "lb"
msgstr "lb"
@@ -1148,36 +1174,35 @@ msgctxt "weight unit, i.e. ounces"
msgid "oz"
msgstr "oz"
-#: core/views/languages.py:85 exercises/views/categories.py:122
+#: core/views/languages.py:88 exercises/views/categories.py:122
#: exercises/views/equipment.py:103 exercises/views/muscles.py:99
-#: nutrition/views/ingredient.py:120 nutrition/views/unit.py:110
+#: nutrition/views/ingredient.py:125
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
+#: core/views/languages.py:96 core/views/license.py:103
+#: core/views/repetition_units.py:114 core/views/weight_units.py:115
#: exercises/views/categories.py:128 exercises/views/muscles.py:106
#: gallery/views/images.py:124 gym/views/admin_notes.py:196
#: gym/views/document.py:206 gym/views/gym.py:481
-#: nutrition/views/ingredient.py:127 nutrition/views/unit.py:117
+#: nutrition/views/ingredient.py:132
#, python-brace-format
msgid "Delete {0}?"
msgstr "Eliminare {0}?"
-#: core/views/languages.py:111 core/views/license.py:85
-#: core/views/repetition_units.py:86 core/views/user.py:464
+#: core/views/languages.py:114 core/views/license.py:85
+#: core/views/repetition_units.py:96 core/views/user.py:480
#: core/views/weight_units.py:86 exercises/views/categories.py:98
#: exercises/views/equipment.py:81 exercises/views/muscles.py:87
#: gym/views/admin_notes.py:161 gym/views/config.py:68
#: gym/views/contract.py:186 gym/views/contract_option.py:123
#: gym/views/contract_type.py:123 gym/views/document.py:171
-#: gym/views/gym.py:463 nutrition/views/ingredient.py:146
-#: nutrition/views/unit.py:143
+#: gym/views/gym.py:463 nutrition/views/ingredient.py:151
#, python-brace-format
msgid "Edit {0}"
msgstr "Modifica {0}"
-#: core/views/misc.py:74
+#: core/views/misc.py:73
msgid ""
"We have created sample workout, workout schedules, weight logs, (body) "
"weight and nutrition plan entries so you can better see what this site can "
@@ -1188,48 +1213,48 @@ msgstr ""
"vedere meglio ciò che questo sito può fare. Sentiti libero di modificarli o "
"cancellarli!"
-#: core/views/user.py:143
+#: core/views/user.py:145
#, python-brace-format
msgid "Account \"{0}\" was successfully deleted"
msgstr "L'account «{0}» è stato eliminato con successo"
-#: core/views/user.py:279
+#: core/views/user.py:287
msgid "You were successfully registered"
msgstr "Ti sei registrato/a con successo"
-#: core/views/user.py:341
+#: core/views/user.py:357
msgid "Settings successfully updated"
msgstr "Impostazioni aggiornate con successo"
-#: core/views/user.py:380
+#: core/views/user.py:396
msgid "The user was successfully deactivated"
msgstr "Utente è stato disattivato con successo"
-#: core/views/user.py:417
+#: core/views/user.py:433
msgid "The user was successfully activated"
msgstr "Utente è stato attivato con successo"
-#: core/views/user.py:432
+#: core/views/user.py:448
msgid "Edit user"
msgstr "Modifica utente"
-#: core/views/user.py:587 gym/templates/gym/member_list.html:26
+#: core/views/user.py:603 gym/templates/gym/member_list.html:26
#: gym/views/gym.py:158
msgid "ID"
msgstr "ID"
-#: core/views/user.py:588 gym/forms.py:95 gym/templates/contract/view.html:55
+#: core/views/user.py:604 gym/forms.py:95 gym/templates/contract/view.html:55
#: gym/templates/gym/member_list.html:27 gym/views/export.py:59
#: gym/views/gym.py:158 gym/views/gym.py:217
msgid "Username"
msgstr "Nome utente"
-#: core/views/user.py:591 gym/templates/gym/new_user.html:34
+#: core/views/user.py:607 gym/templates/gym/new_user.html:34
#: gym/views/export.py:58 gym/views/gym.py:217
msgid "Gym"
msgstr "Palestra"
-#: core/views/user.py:650
+#: core/views/user.py:678
#, python-format
msgid "A verification email was sent to %(email)s"
msgstr "Un'email di verifica è stata inviata a %(email)s"
@@ -1246,16 +1271,16 @@ msgstr "Nome alternativo"
msgid "A more basic name for the muscle"
msgstr "Un nome più comune per il muscolo"
-#: exercises/models/video.py:50
+#: exercises/models/video.py:52
#, python-format
msgid "Maximum file size is %(size)sMB."
msgstr "La dimensione massima del file è %(size)sMB."
-#: exercises/models/video.py:57 exercises/models/video.py:65
+#: exercises/models/video.py:59 exercises/models/video.py:67
msgid "File type is not supported"
msgstr "Il tipo di file non è supportato"
-#: exercises/models/video.py:70
+#: exercises/models/video.py:72
msgid "File is not a valid video"
msgstr "Il file non è un video valido"
@@ -1326,7 +1351,11 @@ msgstr "Cancella attrezzatura?"
msgid "Add muscle"
msgstr "Aggiungi muscolo"
-#: gallery/templates/images/overview.html:72
+#: gallery/forms.py:35
+msgid "If date is left empty, it will be read from the image instead"
+msgstr ""
+
+#: gallery/templates/images/overview.html:69
msgid "Add image"
msgstr "Aggiungi immagine"
@@ -1392,7 +1421,7 @@ msgid "Contract type"
msgstr "Tipo di contratto"
#: gym/models/contract.py:211 gym/templates/contract/view.html:59
-#: nutrition/forms.py:58
+#: nutrition/forms.py:67
msgid "Amount"
msgstr "Quantità"
@@ -1572,7 +1601,7 @@ msgstr "E-mail"
msgid "Add member"
msgstr "Aggiungi membro"
-#: gym/templates/gym/new_user.html:48 nutrition/templates/rate/form.html:120
+#: gym/templates/gym/new_user.html:48 nutrition/templates/rate/form.html:121
msgid "Info"
msgstr "Info"
@@ -1745,10 +1774,6 @@ msgstr "Spalliera"
msgid "Quads"
msgstr "Quadricipiti"
-#: i18n.tpl:30
-msgid "Repetitions"
-msgstr "Ripetizioni"
-
#: i18n.tpl:31
msgid "Resistance band"
msgstr ""
@@ -1777,198 +1802,204 @@ msgstr "Tricipiti"
msgid "Until Failure"
msgstr "Fino al Fallimento"
-#: i18n.tpl:40
+#: i18n.tpl:38
+#, fuzzy
+#| msgid "Kilometers"
+msgid "Meters"
+msgstr "Chilometri"
+
+#: i18n.tpl:41
msgid "none (bodyweight exercise)"
msgstr "nessuno (esercizio a corpo libero)"
-#: i18n.tpl:41
+#: i18n.tpl:42
msgid "Beginner"
msgstr ""
-#: i18n.tpl:42
+#: i18n.tpl:43
#, fuzzy
#| msgctxt "As in \"content of an email\""
#| msgid "Content"
msgid "Consistent"
msgstr "Contenuto"
-#: i18n.tpl:43
+#: i18n.tpl:44
msgid "Dedicated"
msgstr ""
-#: i18n.tpl:44
+#: i18n.tpl:45
msgid "Obsessed"
msgstr ""
-#: i18n.tpl:45
+#: i18n.tpl:46
msgid "Legend"
msgstr "Leggenda"
-#: i18n.tpl:46
+#: i18n.tpl:47
msgid "Veteran"
msgstr ""
-#: i18n.tpl:47
+#: i18n.tpl:48
msgid "Titan"
msgstr ""
-#: i18n.tpl:48
+#: i18n.tpl:49
msgid "Unstoppable"
msgstr ""
-#: i18n.tpl:49
+#: i18n.tpl:50
msgid "Weekend Warrior"
msgstr ""
-#: i18n.tpl:50
+#: i18n.tpl:51
msgid "Elephant lifter"
msgstr ""
-#: i18n.tpl:51
+#: i18n.tpl:52
msgid "Bus lifter"
msgstr ""
-#: i18n.tpl:52
+#: i18n.tpl:53
msgid "Plane lifter"
msgstr ""
-#: i18n.tpl:53
+#: i18n.tpl:54
msgid "Blue whale lifter"
msgstr ""
-#: i18n.tpl:54
+#: i18n.tpl:55
msgid "Space Station lifter"
msgstr ""
-#: i18n.tpl:55
+#: i18n.tpl:56
msgid "Millionaire"
msgstr ""
-#: i18n.tpl:56
+#: i18n.tpl:57
msgid "Atlas"
msgstr ""
-#: i18n.tpl:57
+#: i18n.tpl:58
msgid "Early Bird"
msgstr ""
-#: i18n.tpl:58
+#: i18n.tpl:59
#, fuzzy
#| msgid "Weight log"
msgid "Night Owl"
msgstr "Diario dei pesi"
-#: i18n.tpl:59
+#: i18n.tpl:60
msgid "New Year, New Me"
msgstr ""
-#: i18n.tpl:60
+#: i18n.tpl:61
msgid "Phoenix"
msgstr ""
-#: i18n.tpl:61
+#: i18n.tpl:62
#, fuzzy
#| msgid "Personal data"
msgid "Personal Record"
msgstr "Dati personali"
-#: i18n.tpl:62
+#: i18n.tpl:63
#, fuzzy
#| msgid "Copy workout"
msgid "Complete your first workout"
msgstr "Copia allenamento"
-#: i18n.tpl:63
+#: i18n.tpl:64
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 10 workouts"
msgstr "Esempio di allenamento"
-#: i18n.tpl:64
+#: i18n.tpl:65
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 50 workouts"
msgstr "Esempio di allenamento"
-#: i18n.tpl:65
+#: i18n.tpl:66
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 100 workouts"
msgstr "Esempio di allenamento"
-#: i18n.tpl:66
+#: i18n.tpl:67
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 200 workouts"
msgstr "Esempio di allenamento"
-#: i18n.tpl:67
+#: i18n.tpl:68
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 500 workouts"
msgstr "Esempio di allenamento"
-#: i18n.tpl:68
+#: i18n.tpl:69
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 1000 workouts"
msgstr "Esempio di allenamento"
-#: i18n.tpl:69
+#: i18n.tpl:70
msgid "Maintain a 30-day workout streak"
msgstr ""
-#: i18n.tpl:70
+#: i18n.tpl:71
msgid "Work out on Saturday and Sunday for 4 consecutive weekends"
msgstr ""
-#: i18n.tpl:71
+#: i18n.tpl:72
msgid "Lift a cumulative total of 5.000 kg"
msgstr ""
-#: i18n.tpl:72
+#: i18n.tpl:73
msgid "Lift a cumulative total of 20.000 kg"
msgstr ""
-#: i18n.tpl:73
+#: i18n.tpl:74
msgid "Lift a cumulative total of 50.000 kg"
msgstr ""
-#: i18n.tpl:74
+#: i18n.tpl:75
msgid "Lift a cumulative total of 150.000 kg"
msgstr ""
-#: i18n.tpl:75
+#: i18n.tpl:76
msgid "Lift a cumulative total of 450.000 kg"
msgstr ""
-#: i18n.tpl:76
+#: i18n.tpl:77
msgid "Lift a cumulative total of 1.000.000 kg"
msgstr ""
-#: i18n.tpl:77
+#: i18n.tpl:78
msgid "Lift a cumulative total of 10.000.000 kg"
msgstr ""
-#: i18n.tpl:78
+#: i18n.tpl:79
msgid "Complete a workout before 6:00 AM"
msgstr ""
-#: i18n.tpl:79
+#: i18n.tpl:80
msgid "Complete a workout after 9:00 PM"
msgstr ""
-#: i18n.tpl:80
+#: i18n.tpl:81
#, fuzzy
#| msgid "Workout for %s"
msgid "Work out on January 1st"
msgstr "Allenamento per %s"
-#: i18n.tpl:81
+#: i18n.tpl:82
msgid "Return to training after being inactive for 30 days"
msgstr ""
-#: i18n.tpl:82
+#: i18n.tpl:83
msgid "Achieve a new Personal Record on any exercise"
msgstr ""
@@ -2052,7 +2083,7 @@ msgstr "Esercizio"
msgid "Routine will expire soon"
msgstr "Il programma scadrà presto"
-#: manager/models/routine.py:153 manager/models/session.py:145
+#: manager/models/routine.py:154 manager/models/session.py:145
msgid "The start time cannot be after the end time."
msgstr "L'ora di inizio non può essere successiva all'ora di fine."
@@ -2136,23 +2167,27 @@ msgstr "Allenamento"
msgid "Workout for %s"
msgstr "Allenamento per %s"
-#: nutrition/forms.py:62
+#: nutrition/extract_info/off.py:72 nutrition/extract_info/off.py:91
+msgid "Serving"
+msgstr ""
+
+#: nutrition/forms.py:71 nutrition/forms.py:208
msgid "Unit"
msgstr "Unità"
-#: nutrition/forms.py:170 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:179 nutrition/templates/rate/form.html:77
msgid "Basic caloric intake"
msgstr "Assunzione calorica di base"
-#: nutrition/forms.py:171
+#: nutrition/forms.py:180
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:176
+#: nutrition/forms.py:185
msgid "Additional calories"
msgstr "Calorie aggiuntive"
-#: nutrition/forms.py:178
+#: nutrition/forms.py:187
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
@@ -2161,13 +2196,31 @@ msgstr ""
"un numero negativo)"
#: nutrition/forms.py:209
+msgid "grams (g)"
+msgstr ""
+
+#: nutrition/forms.py:219
msgid "Ingredient"
msgstr "Alimenti"
-#: nutrition/forms.py:213
+#: nutrition/forms.py:223
msgid "Also search for names in English"
msgstr "Usa anche i nomi in inglese"
+#: nutrition/forms.py:239
+msgid "Quantity"
+msgstr ""
+
+#: nutrition/forms.py:241
+msgid "Enter a quantity and choose grams (g) or one of the serving units."
+msgstr ""
+
+#: nutrition/models/ingredient.py:526
+#, fuzzy
+#| msgid "Correction"
+msgid "Portion"
+msgstr "Correzione"
+
#: nutrition/templates/ingredient/email_new.tpl:1
#, python-format
msgid ""
@@ -2219,59 +2272,92 @@ msgstr ""
"ti verrà inviata una notifica quando il processo sarà completato con "
"successo."
-#: nutrition/templates/ingredient/overview.html:38
+#: nutrition/templates/ingredient/overview.html:32
+#: nutrition/templates/ingredient/overview.html:68
+#: nutrition/templates/ingredient/view.html:143
+msgid "Vegan"
+msgstr ""
+
+#: nutrition/templates/ingredient/overview.html:34
+#: nutrition/templates/ingredient/overview.html:79
+#: nutrition/templates/ingredient/view.html:155
+#, fuzzy
+#| msgid "Variations"
+msgid "Vegetarian"
+msgstr "Variazioni"
+
+#: nutrition/templates/ingredient/overview.html:43
msgid "No ingredients."
msgstr "Nessun ingrediente."
-#: nutrition/templates/ingredient/overview.html:49
+#: nutrition/templates/ingredient/overview.html:54
msgid "Search"
msgstr "Ricerca"
-#: nutrition/templates/ingredient/view.html:45 nutrition/views/plan.py:237
+#: nutrition/templates/ingredient/overview.html:57
+#, fuzzy
+#| msgid "No filter"
+msgid "Filter"
+msgstr "Nessun filtro"
+
+#: nutrition/templates/ingredient/overview.html:83
+msgid "Apply"
+msgstr ""
+
+#: nutrition/templates/ingredient/overview.html:85
+msgid "Reset"
+msgstr ""
+
+#: nutrition/templates/ingredient/view.html:46 nutrition/views/plan.py:236
msgid "Macronutrients"
msgstr "Macronutrienti"
-#: nutrition/templates/ingredient/view.html:54
+#: nutrition/templates/ingredient/view.html:55
msgid "kJ"
msgstr "kJ"
-#: nutrition/templates/ingredient/view.html:70 nutrition/views/plan.py:267
+#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:266
msgid "Sugar content in carbohydrates"
msgstr "Zuccheri contenuti nei carboidrati"
-#: nutrition/templates/ingredient/view.html:75
-#: nutrition/templates/ingredient/view.html:91
-#: nutrition/templates/ingredient/view.html:113
-#: nutrition/templates/ingredient/view.html:123
+#: nutrition/templates/ingredient/view.html:76
+#: nutrition/templates/ingredient/view.html:92
+#: nutrition/templates/ingredient/view.html:114
+#: nutrition/templates/ingredient/view.html:124
msgid "n.A."
msgstr "n.D."
-#: nutrition/templates/ingredient/view.html:86 nutrition/views/plan.py:281
+#: nutrition/templates/ingredient/view.html:87 nutrition/views/plan.py:280
msgid "Saturated fat content in fats"
msgstr "Grassi saturi contenuti nei grassi"
-#: nutrition/templates/ingredient/view.html:102
+#: nutrition/templates/ingredient/view.html:103
msgid "Others"
msgstr "Altri"
-#: nutrition/templates/ingredient/view.html:108 nutrition/views/plan.py:287
+#: nutrition/templates/ingredient/view.html:109 nutrition/views/plan.py:286
msgid "Fiber"
msgstr "Fibra"
-#: nutrition/templates/ingredient/view.html:118 nutrition/views/plan.py:293
+#: nutrition/templates/ingredient/view.html:119 nutrition/views/plan.py:292
msgid "Sodium"
msgstr "Sodio"
-#: nutrition/templates/ingredient/view.html:143
-#: nutrition/templates/units/list.html:50 nutrition/views/unit.py:86
+#: nutrition/templates/ingredient/view.html:136
+#, fuzzy
+#| msgid "Click here for more information"
+msgid "Dietary information"
+msgstr "Clicca qui per avere più informazioni"
+
+#: nutrition/templates/ingredient/view.html:184
msgid "Add new weight unit"
msgstr "Aggiungi una nuova unità di peso"
-#: nutrition/templates/rate/form.html:25
+#: nutrition/templates/rate/form.html:26
msgid "Basal metabolic rate"
msgstr "Metabolismo basale"
-#: nutrition/templates/rate/form.html:26
+#: nutrition/templates/rate/form.html:27
msgid ""
"The basal metabolic rate is the amount of energy expended daily\n"
"at rest. This is the minimum energy needed for the body to function, without "
@@ -2283,15 +2369,15 @@ msgstr ""
"senza alcuna\n"
"attività fisica aggiuntiva."
-#: nutrition/templates/rate/form.html:37
+#: nutrition/templates/rate/form.html:38
msgid "Your basic metabolic rate is: "
msgstr "Il tuo metabolismo basale è: "
-#: nutrition/templates/rate/form.html:47
+#: nutrition/templates/rate/form.html:48
msgid "Physical activities"
msgstr "Attività fisiche"
-#: nutrition/templates/rate/form.html:48
+#: nutrition/templates/rate/form.html:49
msgid ""
"The physical activity level (PAL) is a factor used to to express\n"
"the additional physical activity and is used to calculate the total energy\n"
@@ -2302,11 +2388,11 @@ msgstr ""
"totale\n"
"richiesta al giorno."
-#: nutrition/templates/rate/form.html:59
+#: nutrition/templates/rate/form.html:60
msgid "Factor for daily activities: "
msgstr "Fattore per le attività quotidiane: "
-#: nutrition/templates/rate/form.html:67
+#: nutrition/templates/rate/form.html:68
msgid ""
"The base caloric intake is the amount of calories your metabolism\n"
"needs based on your level of physical activity."
@@ -2314,11 +2400,11 @@ msgstr ""
"L'apporto calorico di base è la quantità di calorie del tuo bisogno\n"
"metabolico in base al tuo livello di attività fisica."
-#: nutrition/templates/rate/form.html:81
+#: nutrition/templates/rate/form.html:82
msgid "Calculate basic caloric intake"
msgstr "Calcola l'apporto calorico di base"
-#: nutrition/templates/rate/form.html:88
+#: nutrition/templates/rate/form.html:89
msgid ""
"The total calories are the actual total calories per day. This\n"
"might include e.g. a surplus or deficit if you are bulking or cutting. "
@@ -2331,19 +2417,19 @@ msgstr ""
"potresti semplicemente inserire te stesso la quantità di calorie se conosci "
"il valore."
-#: nutrition/templates/rate/form.html:102
+#: nutrition/templates/rate/form.html:103
msgid "Transfer basic intake to total daily calories"
msgstr "Trasferire l'assunzione di base al totale delle calorie giornaliere"
-#: nutrition/templates/rate/form.html:106
+#: nutrition/templates/rate/form.html:107
msgid "Add additional calories to total daily calories"
msgstr "Aggiungere ulteriori calorie al totale delle calorie giornaliere"
-#: nutrition/templates/rate/form.html:110
+#: nutrition/templates/rate/form.html:111
msgid "Save total calories to profile"
msgstr "Salva le calorie totali nel profilo"
-#: nutrition/templates/rate/form.html:121
+#: nutrition/templates/rate/form.html:122
msgid ""
"Please note that these calculations can only be an\n"
"approximation. If you base your nutrition plan on these values, observe\n"
@@ -2354,48 +2440,48 @@ msgstr ""
"osserva\n"
"te stesso per alcune settimane e modificare l'importo totale, se necessario."
-#: nutrition/views/ingredient.py:158
+#: nutrition/views/ingredient.py:163
msgid "Add a new ingredient"
msgstr "Aggiungi un nuovo ingrediente"
-#: nutrition/views/plan.py:128
+#: nutrition/views/plan.py:127
msgid "Nutritional plan"
msgstr "Piano nutrizionale"
-#: nutrition/views/plan.py:130
+#: nutrition/views/plan.py:129
#, python-format
msgid "Nutritional plan for %s"
msgstr "Piano nutrizionale per %s"
-#: nutrition/views/plan.py:202
+#: nutrition/views/plan.py:201
msgid "<i>This is an empty plan, what did you expect on the PDF?</i>"
msgstr "<i>Questo è un piano vuoto, cosa ti aspettavi dal PDF?</i>"
-#: nutrition/views/plan.py:230
+#: nutrition/views/plan.py:229
msgid "Nutritional data"
msgstr "Dati nutrizionali"
-#: nutrition/views/plan.py:238
+#: nutrition/views/plan.py:237
msgid "Total"
msgstr "Totale"
-#: nutrition/views/plan.py:239
+#: nutrition/views/plan.py:238
msgid "Percent of energy"
msgstr "Percentuale di energia"
-#: nutrition/views/plan.py:240
+#: nutrition/views/plan.py:239
msgid "g per body kg"
msgstr "g per peso in kg"
-#: nutrition/views/unit_ingredient.py:69
+#: nutrition/views/unit_ingredient.py:64
msgid "Add a new weight unit"
msgstr "Aggiungi una nuova unità di peso"
-#: nutrition/views/unit_ingredient.py:106
+#: nutrition/views/unit_ingredient.py:99
msgid "Edit a weight unit to ingredient connection"
msgstr "Modifica un'unità di peso collegato all'ingrediente"
-#: nutrition/views/unit_ingredient.py:138
+#: nutrition/views/unit_ingredient.py:129
msgid "Delete?"
msgstr "Elimina?"
@@ -2798,7 +2884,7 @@ msgstr "Codice Sorgente"
msgid "Translation"
msgstr "Traduzione"
-#: utils/generic_views.py:263
+#: utils/generic_views.py:246
msgid "Yes, delete"
msgstr "Sì, elimina"
@@ -2852,10 +2938,6 @@ msgstr "Devi inserire il tuo peso"
msgid "Import weight logs"
msgstr "Importa i registri del peso"
-#: weight/templates/import_csv_form.html:9
-msgid "Submit"
-msgstr "Invia"
-
#: weight/templates/import_csv_form.html:15
msgid ""
"Use this import field to import your weight logs into Workout\n"
@@ -2977,6 +3059,35 @@ msgstr ""
msgid "Re-Submit"
msgstr "Re-Invia"
+#~ msgid "Email verification"
+#~ msgstr "Verifica email"
+
+#, python-format
+#~ msgid "%(username)s, your email was verified"
+#~ msgstr "%(username)s, la tua email è stata verificata"
+
+#~ msgid "Error, invalid verification token"
+#~ msgstr "Errore, token di verifica non valido"
+
+#~ msgid "Email Confirmation"
+#~ msgstr "Conferma email"
+
+#, python-format
+#~ msgid "You are almost there, %(username)s!"
+#~ msgstr "Ci sei quasi, %(username)s!"
+
+#, python-format
+#~ msgid "Please click <a href=\"%(link)s\">here</a> to confirm your email"
+#~ msgstr ""
+#~ "Per favore clicca <a href=\"%(link)s\">qui</a> per confermare la tua email"
+
+#, python-format
+#~ msgid "The token expires on %(time)s"
+#~ msgstr "Il token scade il %(time)s"
+
+#~ msgid "Ingredient weight units"
+#~ msgstr "Unità di peso ingrediente"
+
#~ msgid "Image"
#~ msgstr "Immagine"
@@ -3007,9 +3118,6 @@ msgstr "Re-Invia"
#~ msgid "Secondary muscles"
#~ msgstr "Muscoli secondari"
-#~ msgid "Variations"
-#~ msgstr "Variazioni"
-
#~ msgid "Exercise Categories"
#~ msgstr "Categorie esercizi"
@@ -4070,9 +4178,6 @@ msgstr "Re-Invia"
#~ msgid "This content is available under the following license:"
#~ msgstr "Questo contenuto è disponibile attraverso la seguente licenza:"
-#~ msgid "Click here for more information"
-#~ msgstr "Clicca qui per avere più informazioni"
-
#, fuzzy, python-format
#~| msgid ""
#~| "%(name_original)s is too similar to existing exercise "
@@ -4795,9 +4900,6 @@ msgstr "Re-Invia"
#~ msgid "Last 12 months"
#~ msgstr "Ultimi 12 mesi"
-#~ msgid "No filter"
-#~ msgstr "Nessun filtro"
-
#~ msgid "Days"
#~ msgstr "Giorni"
diff --git a/wger/locale/ja/LC_MESSAGES/django.po b/wger/locale/ja/LC_MESSAGES/django.po
index b64ad484f..a890ff07a 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: 2026-01-17 14:03+0000\n"
+"POT-Creation-Date: 2026-04-10 10:20+0000\n"
"PO-Revision-Date: 2026-01-22 02:01+0000\n"
"Last-Translator: heppocogne <[email protected]>\n"
"Language-Team: Japanese <https://hosted.weblate.org/projects/wger/web/ja/>\n"
@@ -38,7 +38,7 @@ msgstr ""
#: config/views/gym_config.py:42 core/templates/language/view.html:64
#: core/templates/license/list.html:17
#: core/templates/repetition_unit/list.html:18
-#: core/templates/user/overview.html:204 core/templates/user/overview.html:467
+#: core/templates/user/overview.html:207 core/templates/user/overview.html:470
#: core/templates/weight_unit/list.html:18
#: exercises/templates/categories/admin-overview.html:17
#: exercises/templates/equipment/admin-overview.html:17
@@ -50,30 +50,29 @@ msgstr ""
#: gym/templates/gym/list.html:19 gym/templates/gym/list.html:48
#: gym/templates/gym/member_list.html:94 gym/templates/gym/member_list.html:152
#: gym/templates/gym/member_list.html:190
-#: nutrition/templates/ingredient/view.html:164
-#: nutrition/templates/ingredient/view.html:209
-#: nutrition/templates/units/list.html:19
+#: nutrition/templates/ingredient/view.html:205
+#: nutrition/templates/ingredient/view.html:248
msgid "Edit"
msgstr "編集"
-#: core/forms.py:91 core/templates/navigation.html:271
-#: core/templates/navigation.html:278 core/templates/user/login.html:4
+#: core/forms.py:89 core/templates/navigation.html:268
+#: core/templates/navigation.html:275 core/templates/user/login.html:4
#: core/templates/user/registration_sidebar.html:12
#: software/templates/features.html:82 software/templates/features.html:448
msgid "Login"
msgstr "ログイン"
-#: core/forms.py:130 core/forms.py:244 gym/views/export.py:61
+#: core/forms.py:128 core/forms.py:242 gym/views/export.py:61
#: gym/views/gym.py:217
msgid "First name"
msgstr "名前"
-#: core/forms.py:131 core/forms.py:245 core/templates/user/overview.html:284
+#: core/forms.py:129 core/forms.py:243 core/templates/user/overview.html:287
#: gym/views/export.py:62 gym/views/gym.py:217
msgid "Last name"
msgstr "姓"
-#: core/forms.py:133 core/forms.py:210 core/templates/user/overview.html:288
+#: core/forms.py:131 core/forms.py:208 core/templates/user/overview.html:291
#: gym/models/contract.py:256 gym/models/gym.py:58
#: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:116
#: gym/templates/gym/new_user.html:30 gym/views/export.py:60
@@ -83,57 +82,57 @@ msgstr "姓"
msgid "Email"
msgstr "メール"
-#: core/forms.py:134
+#: core/forms.py:132
msgid "Used for password resets and, optionally, e-mail reminders."
msgstr ""
"パスワードの再設定、またはオプションとしてメールのリマインダー通知に使用され"
"ます。"
-#: core/forms.py:138 core/models/profile.py:222
+#: core/forms.py:136 core/models/profile.py:222
#: gym/templates/gym/new_user.html:38
msgid "Date of Birth"
msgstr "生年月日"
-#: core/forms.py:177
+#: core/forms.py:175
msgid "Personal data"
msgstr "パーソナルデータ"
-#: core/forms.py:189
+#: core/forms.py:187
msgid "Workout reminders"
msgstr "ワークアウトリマインダー通知"
-#: core/forms.py:196
+#: core/forms.py:194
msgid "Other settings"
msgstr "その他の設定"
-#: core/forms.py:204 core/views/user.py:614 core/views/user.py:629
-#: core/views/user.py:641 gym/forms.py:73 utils/generic_views.py:143
+#: core/forms.py:202 core/views/user.py:630 core/views/user.py:654
+#: core/views/user.py:668 gym/forms.py:73 utils/generic_views.py:137
msgid "Save"
msgstr "保存"
-#: core/forms.py:211
+#: core/forms.py:209
msgid "Used for password resets and, optionally, email reminders."
msgstr "パスワードのリセットと、メールでのリマインドに使われます。"
-#: core/forms.py:240
+#: core/forms.py:238
#, fuzzy
#| msgid "This email is already used."
msgid "This e-mail address is already in use."
msgstr "このメールアドレスは既に登録済みです。"
-#: core/forms.py:261 gym/templates/gym/new_user.html:26
+#: core/forms.py:259 gym/templates/gym/new_user.html:26
#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:217
msgid "Password"
msgstr "パスワード"
-#: core/forms.py:263
+#: core/forms.py:261
msgid "Please enter your current password."
msgstr "現在のパスワードを入力してください。"
-#: core/forms.py:272 core/templates/language/view.html:70
+#: core/forms.py:270 core/templates/language/view.html:70
#: core/templates/license/list.html:21
#: core/templates/repetition_unit/list.html:22
-#: core/templates/user/overview.html:233
+#: core/templates/user/overview.html:236
#: core/templates/weight_unit/list.html:22
#: exercises/templates/categories/admin-overview.html:21
#: exercises/templates/equipment/admin-overview.html:21
@@ -141,27 +140,30 @@ msgstr "現在のパスワードを入力してください。"
#: gym/templates/admin_notes/list.html:37
#: gym/templates/contract_option/list.html:35
#: gym/templates/contract_type/list.html:36 gym/templates/document/list.html:46
-#: gym/templates/gym/list.html:23 nutrition/templates/ingredient/view.html:168
-#: nutrition/templates/ingredient/view.html:215
-#: nutrition/templates/units/list.html:25
+#: gym/templates/gym/list.html:23 nutrition/templates/ingredient/view.html:209
+#: nutrition/templates/ingredient/view.html:254
msgid "Delete"
msgstr "削除"
-#: core/forms.py:281
+#: core/forms.py:279
msgid "Invalid password"
msgstr "パスワードは無効です。"
-#: core/forms.py:293
+#: core/forms.py:291 core/forms.py:349
msgid "The form is secured with reCAPTCHA"
msgstr "このフォームはreCAPTCHAによって保護されています"
-#: core/forms.py:314 core/forms.py:341 core/templates/navigation.html:272
-#: core/templates/navigation.html:285 core/templates/template.html:123
-#: core/templates/user/login.html:21 core/views/user.py:285
+#: core/forms.py:312 core/forms.py:339 core/templates/navigation.html:269
+#: core/templates/navigation.html:282 core/templates/template.html:113
+#: core/templates/user/login.html:21 core/views/user.py:293
#: software/templates/features.html:87 software/templates/features.html:442
msgid "Register"
msgstr "登録"
+#: core/forms.py:360 weight/templates/import_csv_form.html:9
+msgid "Submit"
+msgstr ""
+
#: core/models/language.py:31 core/templates/language/view.html:21
msgid "Language short name"
msgstr "言語省略名"
@@ -198,36 +200,36 @@ msgstr "リンク"
msgid "Link to license text or other information"
msgstr "ライセンスやその他情報へのリンク"
-#: core/models/profile.py:57
+#: core/models/profile.py:60
#, python-format
msgid "%(birthdate)s is not a valid birthdate"
msgstr ""
-#: core/models/profile.py:66
+#: core/models/profile.py:69
msgid "Male"
msgstr "男性"
-#: core/models/profile.py:67
+#: core/models/profile.py:70
msgid "Female"
msgstr "女性"
-#: core/models/profile.py:74
+#: core/models/profile.py:77
msgid "Low"
msgstr "小"
-#: core/models/profile.py:75
+#: core/models/profile.py:78
msgid "Medium"
msgstr "中"
-#: core/models/profile.py:76
+#: core/models/profile.py:79
msgid "High"
msgstr "高"
-#: core/models/profile.py:82
+#: core/models/profile.py:85
msgid "Metric (kilogram)"
msgstr "メートル法 (キログラム)"
-#: core/models/profile.py:83
+#: core/models/profile.py:86
msgid "Imperial (pound)"
msgstr "ヤード・ポンド法(ポンド)"
@@ -335,7 +337,7 @@ msgstr ""
msgid "Free time"
msgstr ""
-#: core/models/profile.py:320 nutrition/templates/rate/form.html:66
+#: core/models/profile.py:320 nutrition/templates/rate/form.html:67
msgid "Total daily calories"
msgstr ""
@@ -373,20 +375,43 @@ msgstr ""
msgid "Enable or disable the trophy system for this user"
msgstr ""
-#: core/models/profile.py:446
+#: core/models/profile.py:457
msgid "The sum of all hours has to be 24"
msgstr ""
-#: core/models/rep_unit.py:36 core/models/weight_unit.py:42
-#: core/templates/user/overview.html:280 core/views/user.py:589
+#: core/models/rep_unit.py:32 i18n.tpl:30
+msgid "Repetitions"
+msgstr "回数"
+
+#: core/models/rep_unit.py:33 core/templates/user/overview.html:82
+#: exercises/templates/history/overview.html:30
+msgid "Time"
+msgstr ""
+
+#: core/models/rep_unit.py:34
+msgid "Distance"
+msgstr ""
+
+#: core/models/rep_unit.py:47 core/models/weight_unit.py:42
+#: core/templates/user/overview.html:283 core/views/user.py:605
#: exercises/models/muscle.py:36 gym/models/contract.py:52
#: gym/models/contract.py:103 gym/models/gym.py:46
#: gym/models/user_document.py:84 gym/templates/contract/view.html:50
#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:108
-#: gym/views/gym.py:158 nutrition/templates/ingredient/view.html:151
+#: gym/views/gym.py:158 nutrition/templates/ingredient/view.html:192
msgid "Name"
msgstr ""
+#: core/models/rep_unit.py:53
+#, fuzzy
+#| msgid "Unit"
+msgid "Unit Type"
+msgstr "単位"
+
+#: core/models/rep_unit.py:54
+msgid "The type of unit (repetitions, time, or distance)"
+msgstr ""
+
#: core/templates/403.html:4
msgid "Forbidden!"
msgstr ""
@@ -414,81 +439,75 @@ msgid ""
"later time. If the problem persists, you can seek help in ways listed below:"
msgstr ""
-#: core/templates/base.html:10
-#, python-format
-msgid ""
-"You are browsing the site as the user \"%(current_user)s\", all actions are "
-"performed on their data."
+#: core/templates/account/email/email_confirmation_message.html:81
+msgid "Almost there!"
msgstr ""
-#: core/templates/base.html:15 core/templates/base_wide.html:12
+#: core/templates/account/email/email_confirmation_message.html:85
#, python-format
-msgid "Back to \"%(target)s\""
+msgid ""
+"You're receiving this email because the user \"%(user_display)s\" has given "
+"your email address to register an account on %(site_domain)s."
msgstr ""
-#: core/templates/base_wide.html:7
-#, python-format
+#: core/templates/account/email/email_confirmation_message.html:93
msgid ""
-"You are\n"
-" browsing the site as the user \"%(current_user)s\", all "
-"actions are performed on\n"
-" their data.\n"
-" "
+"Your email verification code is listed below. Please enter it in your open "
+"browser window."
msgstr ""
-#: core/templates/delete.html:4
-msgid "Are you sure you want to delete this? This action cannot be undone."
+#: core/templates/account/email/email_confirmation_message.html:100
+msgid "Please click the button below to confirm your email address."
msgstr ""
-#: core/templates/email_verification/confirm_template.html:4
+#: core/templates/account/email/email_confirmation_message.html:106
#, fuzzy
#| msgid "Configuration"
-msgid "Email verification"
+msgid "Confirm email"
msgstr "設定"
-#: core/templates/email_verification/confirm_template.html:18
+#: core/templates/account/email/email_confirmation_message.html:110
#, python-format
-msgid "%(username)s, your email was verified"
+msgid ""
+"The link is valid for %(expire_hours)s hours (until %(date)s, %(time)s). You "
+"can request a new one from your profile settings."
msgstr ""
-#: core/templates/email_verification/confirm_template.html:22
-msgid "Error, invalid verification token"
+#: core/templates/account/email/email_confirmation_message.html:116
+msgid "If the button doesn't work, copy and paste this link into your browser:"
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!"
+#: core/templates/account/email/email_confirmation_message.html:125
+msgid "the wger Team"
msgstr ""
-#: core/templates/email_verification/email_body_html.tpl:11
+#: core/templates/base.html:10
#, python-format
-msgid "Please click <a href=\"%(link)s\">here</a> to confirm your email"
+msgid ""
+"You are browsing the site as the user \"%(current_user)s\", all actions are "
+"performed on their data."
msgstr ""
-#: core/templates/email_verification/email_body_html.tpl:12
-#: core/templates/email_verification/email_body_txt.tpl:5
+#: core/templates/base.html:15 core/templates/base_wide.html:12
#, python-format
-msgid "The token expires on %(time)s"
+msgid "Back to \"%(target)s\""
msgstr ""
-#: core/templates/email_verification/email_body_html.tpl:14
-#: core/templates/email_verification/email_body_txt.tpl:8
-msgid "the wger Team"
+#: core/templates/base_wide.html:7
+#, python-format
+msgid ""
+"You are\n"
+" browsing the site as the user \"%(current_user)s\", all "
+"actions are performed on\n"
+" their data.\n"
+" "
msgstr ""
-#: core/templates/email_verification/email_body_txt.tpl:4
-#, python-format
-msgid "Please click the following link to confirm your email: %(link)s"
+#: core/templates/delete.html:4
+msgid "Are you sure you want to delete this? This action cannot be undone."
msgstr ""
-#: core/templates/language/overview.html:4 core/templates/navigation.html:344
+#: core/templates/language/overview.html:4 core/templates/navigation.html:341
msgid "Languages"
msgstr "言語"
@@ -497,16 +516,16 @@ msgid "Nothing found."
msgstr ""
#: core/templates/language/overview.html:22
-#: nutrition/templates/ingredient/overview.html:38
+#: nutrition/templates/ingredient/overview.html:43
msgid "Add one now."
msgstr "今すぐ追加する"
#: core/templates/language/overview.html:34 core/templates/license/list.html:43
-#: core/templates/repetition_unit/list.html:46
-#: core/templates/user/overview.html:344 core/templates/user/overview.html:384
-#: core/templates/user/overview.html:422
-#: core/templates/weight_unit/list.html:46 core/views/languages.py:74
-#: core/views/license.py:66 core/views/repetition_units.py:66
+#: core/templates/repetition_unit/list.html:44
+#: core/templates/user/overview.html:347 core/templates/user/overview.html:387
+#: core/templates/user/overview.html:425
+#: core/templates/weight_unit/list.html:46 core/views/languages.py:77
+#: core/views/license.py:66 core/views/repetition_units.py:76
#: core/views/weight_units.py:66
#: exercises/templates/categories/admin-overview.html:40
#: exercises/templates/equipment/admin-overview.html:39
@@ -519,14 +538,14 @@ msgstr "今すぐ追加する"
#: gym/templates/gym/member_list.html:264
#: gym/templates/gym/member_list.html:303
#: mailer/templates/mailer/gym/overview.html:43
-#: nutrition/templates/ingredient/overview.html:60
+#: nutrition/templates/ingredient/overview.html:97
msgid "Add"
msgstr "追加"
#: core/templates/language/view.html:61 core/templates/user/api_key.html:41
#: core/templates/user/preferences.html:50 gym/models/contract.py:203
#: gym/templates/contract/view.html:41 gym/templates/gym/member_list.html:270
-#: nutrition/templates/ingredient/view.html:206
+#: nutrition/templates/ingredient/view.html:245
msgid "Options"
msgstr "オプション"
@@ -536,9 +555,9 @@ msgstr ""
#: core/templates/license/list.html:30
#: core/templates/repetition_unit/list.html:32
-#: core/templates/user/overview.html:104 core/templates/user/overview.html:136
-#: core/templates/user/overview.html:185 core/templates/user/overview.html:365
-#: core/templates/user/overview.html:404 core/templates/user/overview.html:448
+#: core/templates/user/overview.html:107 core/templates/user/overview.html:139
+#: core/templates/user/overview.html:188 core/templates/user/overview.html:368
+#: core/templates/user/overview.html:407 core/templates/user/overview.html:451
#: core/templates/weight_unit/list.html:32
#: exercises/templates/categories/admin-overview.html:30
#: exercises/templates/equipment/admin-overview.html:30
@@ -550,11 +569,10 @@ msgstr ""
#: gym/templates/gym/member_list.html:284
#: gym/templates/gym/member_list.html:321
#: mailer/templates/mailer/gym/overview.html:30
-#: nutrition/templates/units/list.html:34
msgid "Nothing found"
msgstr ""
-#: core/templates/misc/about.html:4 core/templates/template.html:160
+#: core/templates/misc/about.html:4 core/templates/template.html:150
msgid "Imprint"
msgstr ""
@@ -562,164 +580,159 @@ msgstr ""
msgid "Training"
msgstr ""
-#: core/templates/navigation.html:37 core/templates/user/overview.html:25
+#: core/templates/navigation.html:36 core/templates/user/overview.html:28
msgid "Routines"
msgstr ""
-#: core/templates/navigation.html:45 core/templates/user/overview.html:70
+#: core/templates/navigation.html:44 core/templates/user/overview.html:73
msgid "Calendar"
msgstr "カレンダー"
-#: core/templates/navigation.html:55
+#: core/templates/navigation.html:53
msgid "Measurements"
msgstr ""
-#: core/templates/navigation.html:66 gallery/templates/images/overview.html:6
+#: core/templates/navigation.html:64 gallery/templates/images/overview.html:6
msgid "Gallery"
msgstr ""
-#: core/templates/navigation.html:72
-msgid "Workout templates"
+#: core/templates/navigation.html:74 core/templates/navigation.html:400
+#: trophies/templates/trophies/overview.html:7
+msgid "Trophies"
msgstr ""
#: core/templates/navigation.html:79
+msgid "Workout templates"
+msgstr ""
+
+#: core/templates/navigation.html:86
msgid "Your templates"
msgstr ""
-#: core/templates/navigation.html:88
+#: core/templates/navigation.html:95
msgid "Public templates"
msgstr ""
-#: core/templates/navigation.html:96 software/templates/features.html:51
+#: core/templates/navigation.html:103 software/templates/features.html:51
#: software/templates/features.html:480
msgid "Exercises"
msgstr "運動"
-#: core/templates/navigation.html:102 core/templates/navigation.html:176
-#: core/templates/navigation.html:339
+#: core/templates/navigation.html:109 core/templates/navigation.html:336
msgid "Administration"
msgstr ""
-#: core/templates/navigation.html:106
+#: core/templates/navigation.html:113
#, fuzzy
#| msgid "Exercises"
msgid "Exercise edit history"
msgstr "運動"
-#: core/templates/navigation.html:112
+#: core/templates/navigation.html:119
msgid "Equipment"
msgstr ""
-#: core/templates/navigation.html:118
+#: core/templates/navigation.html:125
msgid "Muscles"
msgstr "筋肉"
-#: core/templates/navigation.html:124
+#: core/templates/navigation.html:131
#: exercises/templates/categories/admin-overview.html:4
msgid "Categories"
msgstr ""
-#: core/templates/navigation.html:139 software/templates/features.html:468
+#: core/templates/navigation.html:146 software/templates/features.html:468
msgid "Nutrition"
msgstr ""
-#: core/templates/navigation.html:147 core/templates/user/overview.html:144
+#: core/templates/navigation.html:154 core/templates/user/overview.html:147
msgid "Nutrition plans"
msgstr ""
-#: core/templates/navigation.html:156
+#: core/templates/navigation.html:163
msgid "BMI calculator"
msgstr "BMI計算"
-#: core/templates/navigation.html:165 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:172 nutrition/templates/rate/form.html:18
msgid "Daily calories calculator"
msgstr ""
-#: core/templates/navigation.html:171
+#: core/templates/navigation.html:178
#: nutrition/templates/ingredient/overview.html:10
msgid "Ingredient overview"
msgstr ""
-#: core/templates/navigation.html:180 nutrition/templates/units/list.html:6
-msgid "Ingredient weight units"
-msgstr ""
-
-#: core/templates/navigation.html:196 software/templates/features.html:463
+#: core/templates/navigation.html:193 software/templates/features.html:463
msgid "Body weight"
msgstr ""
-#: core/templates/navigation.html:203 core/templates/user/overview.html:114
+#: core/templates/navigation.html:200 core/templates/user/overview.html:117
msgid "Weight overview"
msgstr ""
-#: core/templates/navigation.html:217
+#: core/templates/navigation.html:214
msgid "About this software"
msgstr ""
-#: core/templates/navigation.html:223 software/templates/about_us.html:5
+#: core/templates/navigation.html:220 software/templates/about_us.html:5
msgid "Support & Get Involved"
msgstr ""
-#: core/templates/navigation.html:229 software/templates/features.html:528
+#: core/templates/navigation.html:226 software/templates/features.html:528
msgid "REST API"
msgstr ""
-#: core/templates/navigation.html:235 utils/models.py:45
+#: core/templates/navigation.html:232 utils/models.py:45
msgid "License"
msgstr "ライセンス"
-#: core/templates/navigation.html:241
+#: core/templates/navigation.html:238
msgid "Developer documentation"
msgstr ""
-#: core/templates/navigation.html:248
+#: core/templates/navigation.html:245
msgid "Get the code"
msgstr ""
-#: core/templates/navigation.html:255 core/templates/template.html:199
-#: software/templates/features.html:603
+#: core/templates/navigation.html:252 core/templates/template.html:202
+#: software/templates/features.html:614
msgid "Translate"
msgstr "翻訳"
-#: core/templates/navigation.html:292 core/templates/user/login.html:30
+#: core/templates/navigation.html:289 core/templates/user/login.html:30
msgid "Reset password"
msgstr "パスワード再設定"
-#: core/templates/navigation.html:301 core/templates/navigation.html:329
+#: core/templates/navigation.html:298 core/templates/navigation.html:326
msgid "Logout"
msgstr "ロッグアウト"
-#: core/templates/navigation.html:320
+#: core/templates/navigation.html:317
msgid "My preferences"
msgstr ""
-#: core/templates/navigation.html:352
+#: core/templates/navigation.html:349
msgid "Licenses"
msgstr ""
-#: core/templates/navigation.html:360
+#: core/templates/navigation.html:357
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr ""
-#: core/templates/navigation.html:368 core/templates/weight_unit/list.html:4
-#: nutrition/templates/ingredient/view.html:141
+#: core/templates/navigation.html:365 core/templates/weight_unit/list.html:4
+#: nutrition/templates/ingredient/view.html:182
msgid "Weight units"
msgstr ""
-#: core/templates/navigation.html:376 core/templates/user/list.html:4
+#: core/templates/navigation.html:373 core/templates/user/list.html:4
msgid "User list"
msgstr ""
-#: core/templates/navigation.html:382
+#: core/templates/navigation.html:379
msgid "Gyms"
msgstr ""
-#: core/templates/navigation.html:403
-#: trophies/templates/trophies/overview.html:7
-msgid "Trophies"
-msgstr ""
-
#: core/templates/registration/password_reset_complete.html:4
msgid "Password reset complete"
msgstr ""
@@ -775,25 +788,29 @@ msgstr ""
msgid "next"
msgstr ""
-#: core/templates/template.html:96
+#: core/templates/template.html:86
msgid "Close"
msgstr "閉じる"
-#: core/templates/template.html:112
+#: core/templates/template.html:102
msgid ""
"You are using a guest account, data entered will be deleted after a week."
msgstr ""
-#: core/templates/template.html:117
+#: core/templates/template.html:107
msgid "Create some demo entries"
msgstr ""
-#: core/templates/template.html:165 software/templates/features.html:568
+#: core/templates/template.html:155 software/templates/features.html:568
#: software/templates/tos.html:7
msgid "Terms of service"
msgstr "使用条件"
-#: core/templates/template_features.html:53 software/templates/features.html:9
+#: core/templates/template.html:181 software/templates/features.html:595
+msgid "Browser language"
+msgstr ""
+
+#: core/templates/template_features.html:46 software/templates/features.html:9
msgid "Features"
msgstr ""
@@ -848,99 +865,94 @@ msgstr ""
msgid "Forgot password?"
msgstr ""
-#: core/templates/user/overview.html:25 core/templates/user/overview.html:68
-#: core/templates/user/overview.html:112 core/templates/user/overview.html:144
-#: core/templates/user/overview.html:348 core/templates/user/overview.html:390
-#: core/templates/user/overview.html:426
+#: core/templates/user/overview.html:28 core/templates/user/overview.html:71
+#: core/templates/user/overview.html:115 core/templates/user/overview.html:147
+#: core/templates/user/overview.html:351 core/templates/user/overview.html:393
+#: core/templates/user/overview.html:429
#, python-format
msgid "last %(number)s"
msgstr ""
-#: core/templates/user/overview.html:27 core/templates/user/overview.html:146
-#: core/templates/user/overview.html:343 core/templates/user/overview.html:382
-#: core/templates/user/overview.html:421 gym/templates/gym/member_list.html:226
+#: core/templates/user/overview.html:30 core/templates/user/overview.html:149
+#: core/templates/user/overview.html:346 core/templates/user/overview.html:385
+#: core/templates/user/overview.html:424 gym/templates/gym/member_list.html:226
#: gym/templates/gym/member_list.html:262
#: gym/templates/gym/member_list.html:302
msgid "Overview"
msgstr ""
-#: core/templates/user/overview.html:34 core/templates/user/overview.html:76
-#: core/templates/user/overview.html:120 core/templates/user/overview.html:152
+#: core/templates/user/overview.html:37 core/templates/user/overview.html:79
+#: core/templates/user/overview.html:123 core/templates/user/overview.html:155
#: manager/helpers.py:88 software/templates/about_us.html:170
#: weight/templates/import_csv_preview.html:13
#: weight/templates/import_csv_preview.html:42 weight/views.py:54
msgid "Date"
msgstr "日付"
-#: core/templates/user/overview.html:35 core/templates/user/overview.html:153
+#: core/templates/user/overview.html:38 core/templates/user/overview.html:156
#: gym/models/contract.py:58 gym/models/contract.py:109
msgid "Description"
msgstr ""
-#: core/templates/user/overview.html:36
+#: core/templates/user/overview.html:39
msgid "Number of logs (days)"
msgstr ""
-#: core/templates/user/overview.html:37 core/views/user.py:590
+#: core/templates/user/overview.html:40 core/views/user.py:606
#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:158
msgid "Last activity"
msgstr ""
-#: core/templates/user/overview.html:58
+#: core/templates/user/overview.html:61
msgid "No workouts found."
msgstr ""
-#: core/templates/user/overview.html:68
+#: core/templates/user/overview.html:71
msgid "Log"
msgstr ""
-#: core/templates/user/overview.html:77
+#: core/templates/user/overview.html:80
msgid "General impression"
msgstr ""
-#: core/templates/user/overview.html:78 core/templates/user/overview.html:390
+#: core/templates/user/overview.html:81 core/templates/user/overview.html:393
msgid "Notes"
msgstr ""
-#: core/templates/user/overview.html:79
-#: exercises/templates/history/overview.html:30
-msgid "Time"
-msgstr ""
-
-#: core/templates/user/overview.html:112 core/templates/user/overview.html:121
+#: core/templates/user/overview.html:115 core/templates/user/overview.html:124
#: manager/helpers.py:89 weight/templates/import_csv_preview.html:14
#: weight/templates/import_csv_preview.html:43 weight/views.py:54
msgid "Weight"
msgstr "体重"
-#: core/templates/user/overview.html:154
-#: nutrition/templates/ingredient/view.html:51 nutrition/views/plan.py:245
+#: core/templates/user/overview.html:157
+#: nutrition/templates/ingredient/view.html:52 nutrition/views/plan.py:244
msgid "Energy"
msgstr "エネルギー"
-#: core/templates/user/overview.html:155
-#: nutrition/templates/ingredient/view.html:58 nutrition/views/plan.py:251
+#: core/templates/user/overview.html:158
+#: nutrition/templates/ingredient/view.html:59 nutrition/views/plan.py:250
msgid "Protein"
msgstr "タンパク質"
-#: core/templates/user/overview.html:156
-#: nutrition/templates/ingredient/view.html:64 nutrition/views/plan.py:259
+#: core/templates/user/overview.html:159
+#: nutrition/templates/ingredient/view.html:65 nutrition/views/plan.py:258
msgid "Carbohydrates"
msgstr "炭水化物"
-#: core/templates/user/overview.html:157
-#: nutrition/templates/ingredient/view.html:80 nutrition/views/plan.py:273
+#: core/templates/user/overview.html:160
+#: nutrition/templates/ingredient/view.html:81 nutrition/views/plan.py:272
msgid "Fat"
msgstr "脂肪質"
-#: core/templates/user/overview.html:170
-#: nutrition/templates/ingredient/view.html:53
+#: core/templates/user/overview.html:173
+#: nutrition/templates/ingredient/view.html:54
msgid "kcal"
msgstr "kcal"
-#: core/templates/user/overview.html:201 core/templates/user/overview.html:340
-#: core/templates/user/overview.html:379 core/templates/user/overview.html:418
-#: core/templates/user/overview.html:463 gym/templates/gym/list.html:45
+#: core/templates/user/overview.html:204 core/templates/user/overview.html:343
+#: core/templates/user/overview.html:382 core/templates/user/overview.html:421
+#: core/templates/user/overview.html:466 gym/templates/gym/list.html:45
#: gym/templates/gym/member_list.html:91 gym/templates/gym/member_list.html:149
#: gym/templates/gym/member_list.html:187
#: gym/templates/gym/member_list.html:223
@@ -949,109 +961,113 @@ msgstr "kcal"
msgid "Actions"
msgstr ""
-#: core/templates/user/overview.html:210
+#: core/templates/user/overview.html:213
msgid "Deactivate user"
msgstr ""
-#: core/templates/user/overview.html:214
+#: core/templates/user/overview.html:217
msgid "Activate user"
msgstr ""
-#: core/templates/user/overview.html:223
+#: core/templates/user/overview.html:226
msgid "Reset user password"
msgstr ""
-#: core/templates/user/overview.html:227 gym/templates/gym/member_list.html:30
+#: core/templates/user/overview.html:230 gym/templates/gym/member_list.html:30
msgid "Roles"
msgstr ""
-#: core/templates/user/overview.html:243
+#: core/templates/user/overview.html:246
msgid "Password reset confirmation"
msgstr ""
-#: core/templates/user/overview.html:247
+#: core/templates/user/overview.html:250
msgid "Do you really want to change this user&#39;s password?"
msgstr ""
-#: core/templates/user/overview.html:250
+#: core/templates/user/overview.html:253
#: exercises/templates/history/overview.html:106
+#: nutrition/templates/ingredient/view.html:148
+#: nutrition/templates/ingredient/view.html:160
msgid "No"
msgstr ""
-#: core/templates/user/overview.html:251
+#: core/templates/user/overview.html:254
#: exercises/templates/history/overview.html:99
+#: nutrition/templates/ingredient/view.html:146
+#: nutrition/templates/ingredient/view.html:158
msgid "Yes"
msgstr ""
-#: core/templates/user/overview.html:272 gym/templates/gym/member_list.html:105
+#: core/templates/user/overview.html:275 gym/templates/gym/member_list.html:105
msgid "Details"
msgstr ""
-#: core/templates/user/overview.html:276 gym/views/export.py:57
-#: manager/helpers.py:89 nutrition/views/plan.py:151
-#: nutrition/views/plan.py:157
+#: core/templates/user/overview.html:279 gym/views/export.py:57
+#: manager/helpers.py:89 nutrition/views/plan.py:150
+#: nutrition/views/plan.py:156
msgid "Nr."
msgstr ""
-#: core/templates/user/overview.html:298 gym/models/contract.py:287
+#: core/templates/user/overview.html:301 gym/models/contract.py:287
#: gym/models/gym.py:50 gym/templates/contract/view.html:75
#: gym/templates/gym/member_list.html:112 gym/views/export.py:68
msgid "Phone"
msgstr ""
-#: core/templates/user/overview.html:302 gym/templates/contract/view.html:87
+#: core/templates/user/overview.html:305 gym/templates/contract/view.html:87
#: gym/templates/gym/member_list.html:130
msgid "Address"
msgstr ""
-#: core/templates/user/overview.html:313
+#: core/templates/user/overview.html:316
msgid "Registered"
msgstr ""
-#: core/templates/user/overview.html:317
+#: core/templates/user/overview.html:320
msgid "Last login"
msgstr ""
-#: core/templates/user/overview.html:322
+#: core/templates/user/overview.html:325
msgid "Status"
msgstr ""
-#: core/templates/user/overview.html:325
+#: core/templates/user/overview.html:328
msgid "Active"
msgstr ""
-#: core/templates/user/overview.html:327
+#: core/templates/user/overview.html:330
msgid "Inactive"
msgstr ""
-#: core/templates/user/overview.html:348 gym/templates/contract/list.html:4
+#: core/templates/user/overview.html:351 gym/templates/contract/list.html:4
#: gym/templates/gym/member_list.html:218
msgid "Contracts"
msgstr ""
-#: core/templates/user/overview.html:426 gym/templates/document/list.html:4
+#: core/templates/user/overview.html:429 gym/templates/document/list.html:4
msgid "Documents"
msgstr ""
-#: core/templates/user/overview.html:433 gym/templates/document/list.html:33
+#: core/templates/user/overview.html:436 gym/templates/document/list.html:33
msgid "Download"
msgstr "ダウンロード"
-#: core/templates/user/overview.html:474 gym/views/admin_config.py:44
+#: core/templates/user/overview.html:477 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:477 gym/models/user_config.py:92
+#: core/templates/user/overview.html:480 gym/models/user_config.py:92
msgid "Include in inactive overview"
msgstr ""
-#: core/templates/user/overview.html:510
+#: core/templates/user/overview.html:513
#, python-format
msgid "Admin login is only available for users in %(gym_name)s"
msgstr ""
-#: core/templates/user/overview.html:514
+#: core/templates/user/overview.html:517
msgid "Log in as this user"
msgstr ""
@@ -1075,7 +1091,7 @@ msgstr ""
msgid "You need to verify your email to contribute exercises"
msgstr ""
-#: core/templates/user/preferences.html:55 core/views/user.py:601
+#: core/templates/user/preferences.html:55 core/views/user.py:617
msgid "Change password"
msgstr ""
@@ -1083,23 +1099,23 @@ msgstr ""
msgid "Already have an account?"
msgstr ""
-#: core/templatetags/wger_extras.py:142 i18n.tpl:38
+#: core/templatetags/wger_extras.py:142 i18n.tpl:39
msgid "kg"
msgstr "kg"
#: core/templatetags/wger_extras.py:144
-#: nutrition/templates/ingredient/view.html:60
-#: nutrition/templates/ingredient/view.html:66
-#: nutrition/templates/ingredient/view.html:73
-#: nutrition/templates/ingredient/view.html:82
-#: nutrition/templates/ingredient/view.html:89
-#: nutrition/templates/ingredient/view.html:111
-#: nutrition/templates/ingredient/view.html:121
+#: nutrition/templates/ingredient/view.html:61
+#: nutrition/templates/ingredient/view.html:67
+#: nutrition/templates/ingredient/view.html:74
+#: nutrition/templates/ingredient/view.html:83
+#: nutrition/templates/ingredient/view.html:90
+#: nutrition/templates/ingredient/view.html:112
+#: nutrition/templates/ingredient/view.html:122
msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr "g"
-#: core/templatetags/wger_extras.py:147 i18n.tpl:39
+#: core/templatetags/wger_extras.py:147 i18n.tpl:40
msgid "lb"
msgstr "lb"
@@ -1108,84 +1124,83 @@ msgctxt "weight unit, i.e. ounces"
msgid "oz"
msgstr "oz"
-#: core/views/languages.py:85 exercises/views/categories.py:122
+#: core/views/languages.py:88 exercises/views/categories.py:122
#: exercises/views/equipment.py:103 exercises/views/muscles.py:99
-#: nutrition/views/ingredient.py:120 nutrition/views/unit.py:110
+#: nutrition/views/ingredient.py:125
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
+#: core/views/languages.py:96 core/views/license.py:103
+#: core/views/repetition_units.py:114 core/views/weight_units.py:115
#: exercises/views/categories.py:128 exercises/views/muscles.py:106
#: gallery/views/images.py:124 gym/views/admin_notes.py:196
#: gym/views/document.py:206 gym/views/gym.py:481
-#: nutrition/views/ingredient.py:127 nutrition/views/unit.py:117
+#: nutrition/views/ingredient.py:132
#, python-brace-format
msgid "Delete {0}?"
msgstr ""
-#: core/views/languages.py:111 core/views/license.py:85
-#: core/views/repetition_units.py:86 core/views/user.py:464
+#: core/views/languages.py:114 core/views/license.py:85
+#: core/views/repetition_units.py:96 core/views/user.py:480
#: core/views/weight_units.py:86 exercises/views/categories.py:98
#: exercises/views/equipment.py:81 exercises/views/muscles.py:87
#: gym/views/admin_notes.py:161 gym/views/config.py:68
#: gym/views/contract.py:186 gym/views/contract_option.py:123
#: gym/views/contract_type.py:123 gym/views/document.py:171
-#: gym/views/gym.py:463 nutrition/views/ingredient.py:146
-#: nutrition/views/unit.py:143
+#: gym/views/gym.py:463 nutrition/views/ingredient.py:151
#, python-brace-format
msgid "Edit {0}"
msgstr ""
-#: core/views/misc.py:74
+#: core/views/misc.py:73
msgid ""
"We have created sample workout, workout schedules, weight logs, (body) "
"weight and nutrition plan entries so you can better see what this site can "
"do. Feel free to edit or delete them!"
msgstr ""
-#: core/views/user.py:143
+#: core/views/user.py:145
#, python-brace-format
msgid "Account \"{0}\" was successfully deleted"
msgstr ""
-#: core/views/user.py:279
+#: core/views/user.py:287
msgid "You were successfully registered"
msgstr ""
-#: core/views/user.py:341
+#: core/views/user.py:357
msgid "Settings successfully updated"
msgstr ""
-#: core/views/user.py:380
+#: core/views/user.py:396
msgid "The user was successfully deactivated"
msgstr ""
-#: core/views/user.py:417
+#: core/views/user.py:433
msgid "The user was successfully activated"
msgstr ""
-#: core/views/user.py:432
+#: core/views/user.py:448
msgid "Edit user"
msgstr ""
-#: core/views/user.py:587 gym/templates/gym/member_list.html:26
+#: core/views/user.py:603 gym/templates/gym/member_list.html:26
#: gym/views/gym.py:158
msgid "ID"
msgstr ""
-#: core/views/user.py:588 gym/forms.py:95 gym/templates/contract/view.html:55
+#: core/views/user.py:604 gym/forms.py:95 gym/templates/contract/view.html:55
#: gym/templates/gym/member_list.html:27 gym/views/export.py:59
#: gym/views/gym.py:158 gym/views/gym.py:217
msgid "Username"
msgstr ""
-#: core/views/user.py:591 gym/templates/gym/new_user.html:34
+#: core/views/user.py:607 gym/templates/gym/new_user.html:34
#: gym/views/export.py:58 gym/views/gym.py:217
msgid "Gym"
msgstr ""
-#: core/views/user.py:650
+#: core/views/user.py:678
#, python-format
msgid "A verification email was sent to %(email)s"
msgstr ""
@@ -1202,16 +1217,16 @@ msgstr ""
msgid "A more basic name for the muscle"
msgstr ""
-#: exercises/models/video.py:50
+#: exercises/models/video.py:52
#, python-format
msgid "Maximum file size is %(size)sMB."
msgstr ""
-#: exercises/models/video.py:57 exercises/models/video.py:65
+#: exercises/models/video.py:59 exercises/models/video.py:67
msgid "File type is not supported"
msgstr ""
-#: exercises/models/video.py:70
+#: exercises/models/video.py:72
msgid "File is not a valid video"
msgstr ""
@@ -1284,7 +1299,11 @@ msgstr ""
msgid "Add muscle"
msgstr ""
-#: gallery/templates/images/overview.html:72
+#: gallery/forms.py:35
+msgid "If date is left empty, it will be read from the image instead"
+msgstr ""
+
+#: gallery/templates/images/overview.html:69
#, fuzzy
#| msgid "Add member"
msgid "Add image"
@@ -1352,7 +1371,7 @@ msgid "Contract type"
msgstr ""
#: gym/models/contract.py:211 gym/templates/contract/view.html:59
-#: nutrition/forms.py:58
+#: nutrition/forms.py:67
msgid "Amount"
msgstr ""
@@ -1528,7 +1547,7 @@ msgstr ""
msgid "Add member"
msgstr "メンバーを追加"
-#: gym/templates/gym/new_user.html:48 nutrition/templates/rate/form.html:120
+#: gym/templates/gym/new_user.html:48 nutrition/templates/rate/form.html:121
msgid "Info"
msgstr "情報"
@@ -1701,10 +1720,6 @@ msgstr "プルアップ・バー"
msgid "Quads"
msgstr ""
-#: i18n.tpl:30
-msgid "Repetitions"
-msgstr "回数"
-
#: i18n.tpl:31
msgid "Resistance band"
msgstr ""
@@ -1735,177 +1750,181 @@ msgstr "上腕三頭筋"
msgid "Until Failure"
msgstr ""
-#: i18n.tpl:40
-msgid "none (bodyweight exercise)"
+#: i18n.tpl:38
+msgid "Meters"
msgstr ""
#: i18n.tpl:41
-msgid "Beginner"
+msgid "none (bodyweight exercise)"
msgstr ""
#: i18n.tpl:42
-msgid "Consistent"
+msgid "Beginner"
msgstr ""
#: i18n.tpl:43
-msgid "Dedicated"
+msgid "Consistent"
msgstr ""
#: i18n.tpl:44
-msgid "Obsessed"
+msgid "Dedicated"
msgstr ""
#: i18n.tpl:45
-msgid "Legend"
+msgid "Obsessed"
msgstr ""
#: i18n.tpl:46
-msgid "Veteran"
+msgid "Legend"
msgstr ""
#: i18n.tpl:47
-msgid "Titan"
+msgid "Veteran"
msgstr ""
#: i18n.tpl:48
-msgid "Unstoppable"
+msgid "Titan"
msgstr ""
#: i18n.tpl:49
-msgid "Weekend Warrior"
+msgid "Unstoppable"
msgstr ""
#: i18n.tpl:50
-msgid "Elephant lifter"
+msgid "Weekend Warrior"
msgstr ""
#: i18n.tpl:51
-msgid "Bus lifter"
+msgid "Elephant lifter"
msgstr ""
#: i18n.tpl:52
-msgid "Plane lifter"
+msgid "Bus lifter"
msgstr ""
#: i18n.tpl:53
-msgid "Blue whale lifter"
+msgid "Plane lifter"
msgstr ""
#: i18n.tpl:54
-msgid "Space Station lifter"
+msgid "Blue whale lifter"
msgstr ""
#: i18n.tpl:55
-msgid "Millionaire"
+msgid "Space Station lifter"
msgstr ""
#: i18n.tpl:56
-msgid "Atlas"
+msgid "Millionaire"
msgstr ""
#: i18n.tpl:57
-msgid "Early Bird"
+msgid "Atlas"
msgstr ""
#: i18n.tpl:58
-msgid "Night Owl"
+msgid "Early Bird"
msgstr ""
#: i18n.tpl:59
-msgid "New Year, New Me"
+msgid "Night Owl"
msgstr ""
#: i18n.tpl:60
-msgid "Phoenix"
+msgid "New Year, New Me"
msgstr ""
#: i18n.tpl:61
+msgid "Phoenix"
+msgstr ""
+
+#: i18n.tpl:62
#, fuzzy
#| msgid "Personal data"
msgid "Personal Record"
msgstr "パーソナルデータ"
-#: i18n.tpl:62
+#: i18n.tpl:63
msgid "Complete your first workout"
msgstr ""
-#: i18n.tpl:63
+#: i18n.tpl:64
msgid "Complete 10 workouts"
msgstr ""
-#: i18n.tpl:64
+#: i18n.tpl:65
msgid "Complete 50 workouts"
msgstr ""
-#: i18n.tpl:65
+#: i18n.tpl:66
msgid "Complete 100 workouts"
msgstr ""
-#: i18n.tpl:66
+#: i18n.tpl:67
msgid "Complete 200 workouts"
msgstr ""
-#: i18n.tpl:67
+#: i18n.tpl:68
msgid "Complete 500 workouts"
msgstr ""
-#: i18n.tpl:68
+#: i18n.tpl:69
msgid "Complete 1000 workouts"
msgstr ""
-#: i18n.tpl:69
+#: i18n.tpl:70
msgid "Maintain a 30-day workout streak"
msgstr ""
-#: i18n.tpl:70
+#: i18n.tpl:71
msgid "Work out on Saturday and Sunday for 4 consecutive weekends"
msgstr ""
-#: i18n.tpl:71
+#: i18n.tpl:72
msgid "Lift a cumulative total of 5.000 kg"
msgstr ""
-#: i18n.tpl:72
+#: i18n.tpl:73
msgid "Lift a cumulative total of 20.000 kg"
msgstr ""
-#: i18n.tpl:73
+#: i18n.tpl:74
msgid "Lift a cumulative total of 50.000 kg"
msgstr ""
-#: i18n.tpl:74
+#: i18n.tpl:75
msgid "Lift a cumulative total of 150.000 kg"
msgstr ""
-#: i18n.tpl:75
+#: i18n.tpl:76
msgid "Lift a cumulative total of 450.000 kg"
msgstr ""
-#: i18n.tpl:76
+#: i18n.tpl:77
msgid "Lift a cumulative total of 1.000.000 kg"
msgstr ""
-#: i18n.tpl:77
+#: i18n.tpl:78
msgid "Lift a cumulative total of 10.000.000 kg"
msgstr ""
-#: i18n.tpl:78
+#: i18n.tpl:79
msgid "Complete a workout before 6:00 AM"
msgstr ""
-#: i18n.tpl:79
+#: i18n.tpl:80
msgid "Complete a workout after 9:00 PM"
msgstr ""
-#: i18n.tpl:80
+#: i18n.tpl:81
msgid "Work out on January 1st"
msgstr ""
-#: i18n.tpl:81
+#: i18n.tpl:82
msgid "Return to training after being inactive for 30 days"
msgstr ""
-#: i18n.tpl:82
+#: i18n.tpl:83
msgid "Achieve a new Personal Record on any exercise"
msgstr ""
@@ -1987,7 +2006,7 @@ msgstr ""
msgid "Routine will expire soon"
msgstr ""
-#: manager/models/routine.py:153 manager/models/session.py:145
+#: manager/models/routine.py:154 manager/models/session.py:145
msgid "The start time cannot be after the end time."
msgstr ""
@@ -2059,36 +2078,58 @@ msgstr ""
msgid "Workout for %s"
msgstr ""
-#: nutrition/forms.py:62
+#: nutrition/extract_info/off.py:72 nutrition/extract_info/off.py:91
+msgid "Serving"
+msgstr ""
+
+#: nutrition/forms.py:71 nutrition/forms.py:208
msgid "Unit"
msgstr "単位"
-#: nutrition/forms.py:170 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:179 nutrition/templates/rate/form.html:77
msgid "Basic caloric intake"
msgstr "基礎カロリー摂取量"
-#: nutrition/forms.py:171
+#: nutrition/forms.py:180
msgid "Your basic caloric intake as calculated for your data"
msgstr ""
-#: nutrition/forms.py:176
+#: nutrition/forms.py:185
msgid "Additional calories"
msgstr ""
-#: nutrition/forms.py:178
+#: nutrition/forms.py:187
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
msgstr ""
#: nutrition/forms.py:209
+msgid "grams (g)"
+msgstr ""
+
+#: nutrition/forms.py:219
msgid "Ingredient"
msgstr "材料"
-#: nutrition/forms.py:213
+#: nutrition/forms.py:223
msgid "Also search for names in English"
msgstr ""
+#: nutrition/forms.py:239
+msgid "Quantity"
+msgstr ""
+
+#: nutrition/forms.py:241
+msgid "Enter a quantity and choose grams (g) or one of the serving units."
+msgstr ""
+
+#: nutrition/models/ingredient.py:526
+#, fuzzy
+#| msgid "Options"
+msgid "Portion"
+msgstr "オプション"
+
#: nutrition/templates/ingredient/email_new.tpl:1
#, python-format
msgid ""
@@ -2126,59 +2167,86 @@ msgid ""
"sucessfully."
msgstr ""
-#: nutrition/templates/ingredient/overview.html:38
+#: nutrition/templates/ingredient/overview.html:32
+#: nutrition/templates/ingredient/overview.html:68
+#: nutrition/templates/ingredient/view.html:143
+msgid "Vegan"
+msgstr ""
+
+#: nutrition/templates/ingredient/overview.html:34
+#: nutrition/templates/ingredient/overview.html:79
+#: nutrition/templates/ingredient/view.html:155
+msgid "Vegetarian"
+msgstr ""
+
+#: nutrition/templates/ingredient/overview.html:43
msgid "No ingredients."
msgstr ""
-#: nutrition/templates/ingredient/overview.html:49
+#: nutrition/templates/ingredient/overview.html:54
msgid "Search"
msgstr ""
-#: nutrition/templates/ingredient/view.html:45 nutrition/views/plan.py:237
+#: nutrition/templates/ingredient/overview.html:57
+msgid "Filter"
+msgstr ""
+
+#: nutrition/templates/ingredient/overview.html:83
+msgid "Apply"
+msgstr ""
+
+#: nutrition/templates/ingredient/overview.html:85
+msgid "Reset"
+msgstr ""
+
+#: nutrition/templates/ingredient/view.html:46 nutrition/views/plan.py:236
msgid "Macronutrients"
msgstr ""
-#: nutrition/templates/ingredient/view.html:54
+#: nutrition/templates/ingredient/view.html:55
msgid "kJ"
msgstr ""
-#: nutrition/templates/ingredient/view.html:70 nutrition/views/plan.py:267
+#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:266
msgid "Sugar content in carbohydrates"
msgstr ""
-#: nutrition/templates/ingredient/view.html:75
-#: nutrition/templates/ingredient/view.html:91
-#: nutrition/templates/ingredient/view.html:113
-#: nutrition/templates/ingredient/view.html:123
+#: nutrition/templates/ingredient/view.html:76
+#: nutrition/templates/ingredient/view.html:92
+#: nutrition/templates/ingredient/view.html:114
+#: nutrition/templates/ingredient/view.html:124
msgid "n.A."
msgstr ""
-#: nutrition/templates/ingredient/view.html:86 nutrition/views/plan.py:281
+#: nutrition/templates/ingredient/view.html:87 nutrition/views/plan.py:280
msgid "Saturated fat content in fats"
msgstr ""
-#: nutrition/templates/ingredient/view.html:102
+#: nutrition/templates/ingredient/view.html:103
msgid "Others"
msgstr ""
-#: nutrition/templates/ingredient/view.html:108 nutrition/views/plan.py:287
+#: nutrition/templates/ingredient/view.html:109 nutrition/views/plan.py:286
msgid "Fiber"
msgstr ""
-#: nutrition/templates/ingredient/view.html:118 nutrition/views/plan.py:293
+#: nutrition/templates/ingredient/view.html:119 nutrition/views/plan.py:292
msgid "Sodium"
msgstr "ナトリウム"
-#: nutrition/templates/ingredient/view.html:143
-#: nutrition/templates/units/list.html:50 nutrition/views/unit.py:86
+#: nutrition/templates/ingredient/view.html:136
+msgid "Dietary information"
+msgstr ""
+
+#: nutrition/templates/ingredient/view.html:184
msgid "Add new weight unit"
msgstr ""
-#: nutrition/templates/rate/form.html:25
+#: nutrition/templates/rate/form.html:26
msgid "Basal metabolic rate"
msgstr ""
-#: nutrition/templates/rate/form.html:26
+#: nutrition/templates/rate/form.html:27
msgid ""
"The basal metabolic rate is the amount of energy expended daily\n"
"at rest. This is the minimum energy needed for the body to function, without "
@@ -2186,36 +2254,36 @@ msgid ""
"additional physical activity."
msgstr ""
-#: nutrition/templates/rate/form.html:37
+#: nutrition/templates/rate/form.html:38
msgid "Your basic metabolic rate is: "
msgstr ""
-#: nutrition/templates/rate/form.html:47
+#: nutrition/templates/rate/form.html:48
msgid "Physical activities"
msgstr ""
-#: nutrition/templates/rate/form.html:48
+#: nutrition/templates/rate/form.html:49
msgid ""
"The physical activity level (PAL) is a factor used to to express\n"
"the additional physical activity and is used to calculate the total energy\n"
"required per day."
msgstr ""
-#: nutrition/templates/rate/form.html:59
+#: nutrition/templates/rate/form.html:60
msgid "Factor for daily activities: "
msgstr ""
-#: nutrition/templates/rate/form.html:67
+#: nutrition/templates/rate/form.html:68
msgid ""
"The base caloric intake is the amount of calories your metabolism\n"
"needs based on your level of physical activity."
msgstr ""
-#: nutrition/templates/rate/form.html:81
+#: nutrition/templates/rate/form.html:82
msgid "Calculate basic caloric intake"
msgstr ""
-#: nutrition/templates/rate/form.html:88
+#: nutrition/templates/rate/form.html:89
msgid ""
"The total calories are the actual total calories per day. This\n"
"might include e.g. a surplus or deficit if you are bulking or cutting. "
@@ -2223,69 +2291,69 @@ msgid ""
"you might just enter yourself the amount of calories if you know the value."
msgstr ""
-#: nutrition/templates/rate/form.html:102
+#: nutrition/templates/rate/form.html:103
msgid "Transfer basic intake to total daily calories"
msgstr ""
-#: nutrition/templates/rate/form.html:106
+#: nutrition/templates/rate/form.html:107
msgid "Add additional calories to total daily calories"
msgstr ""
-#: nutrition/templates/rate/form.html:110
+#: nutrition/templates/rate/form.html:111
msgid "Save total calories to profile"
msgstr ""
-#: nutrition/templates/rate/form.html:121
+#: nutrition/templates/rate/form.html:122
msgid ""
"Please note that these calculations can only be an\n"
"approximation. If you base your nutrition plan on these values, observe\n"
"yourself for some weeks and change the total amount if needed."
msgstr ""
-#: nutrition/views/ingredient.py:158
+#: nutrition/views/ingredient.py:163
msgid "Add a new ingredient"
msgstr ""
-#: nutrition/views/plan.py:128
+#: nutrition/views/plan.py:127
msgid "Nutritional plan"
msgstr ""
-#: nutrition/views/plan.py:130
+#: nutrition/views/plan.py:129
#, python-format
msgid "Nutritional plan for %s"
msgstr ""
-#: nutrition/views/plan.py:202
+#: nutrition/views/plan.py:201
msgid "<i>This is an empty plan, what did you expect on the PDF?</i>"
msgstr ""
-#: nutrition/views/plan.py:230
+#: nutrition/views/plan.py:229
#, fuzzy
#| msgid "Personal data"
msgid "Nutritional data"
msgstr "パーソナルデータ"
-#: nutrition/views/plan.py:238
+#: nutrition/views/plan.py:237
msgid "Total"
msgstr ""
-#: nutrition/views/plan.py:239
+#: nutrition/views/plan.py:238
msgid "Percent of energy"
msgstr ""
-#: nutrition/views/plan.py:240
+#: nutrition/views/plan.py:239
msgid "g per body kg"
msgstr ""
-#: nutrition/views/unit_ingredient.py:69
+#: nutrition/views/unit_ingredient.py:64
msgid "Add a new weight unit"
msgstr ""
-#: nutrition/views/unit_ingredient.py:106
+#: nutrition/views/unit_ingredient.py:99
msgid "Edit a weight unit to ingredient connection"
msgstr ""
-#: nutrition/views/unit_ingredient.py:138
+#: nutrition/views/unit_ingredient.py:129
msgid "Delete?"
msgstr ""
@@ -2642,7 +2710,7 @@ msgstr ""
msgid "Translation"
msgstr "翻訳"
-#: utils/generic_views.py:263
+#: utils/generic_views.py:246
msgid "Yes, delete"
msgstr ""
@@ -2693,10 +2761,6 @@ msgstr ""
msgid "Import weight logs"
msgstr ""
-#: weight/templates/import_csv_form.html:9
-msgid "Submit"
-msgstr ""
-
#: weight/templates/import_csv_form.html:15
msgid ""
"Use this import field to import your weight logs into Workout\n"
@@ -2792,6 +2856,16 @@ msgstr ""
msgid "Re-Submit"
msgstr ""
+#, fuzzy
+#~| msgid "Configuration"
+#~ msgid "Email verification"
+#~ msgstr "設定"
+
+#, fuzzy
+#~| msgid "Configuration"
+#~ msgid "Email Confirmation"
+#~ msgstr "設定"
+
#~ msgid "Comment"
#~ msgstr "コメント"
diff --git a/wger/locale/ko/LC_MESSAGES/django.po b/wger/locale/ko/LC_MESSAGES/django.po
index 35514c201..34cb22dd6 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: 2026-01-17 14:03+0000\n"
+"POT-Creation-Date: 2026-04-10 10:20+0000\n"
"PO-Revision-Date: 2026-03-22 19:09+0000\n"
"Last-Translator: Hosted Weblate user 141821 "
@@ -35,7 +35,7 @@ msgstr ""
#: config/views/gym_config.py:42 core/templates/language/view.html:64
#: core/templates/license/list.html:17
#: core/templates/repetition_unit/list.html:18
-#: core/templates/user/overview.html:204 core/templates/user/overview.html:467
+#: core/templates/user/overview.html:207 core/templates/user/overview.html:470
#: core/templates/weight_unit/list.html:18
#: exercises/templates/categories/admin-overview.html:17
#: exercises/templates/equipment/admin-overview.html:17
@@ -47,30 +47,29 @@ msgstr ""
#: gym/templates/gym/list.html:19 gym/templates/gym/list.html:48
#: gym/templates/gym/member_list.html:94 gym/templates/gym/member_list.html:152
#: gym/templates/gym/member_list.html:190
-#: nutrition/templates/ingredient/view.html:164
-#: nutrition/templates/ingredient/view.html:209
-#: nutrition/templates/units/list.html:19
+#: nutrition/templates/ingredient/view.html:205
+#: nutrition/templates/ingredient/view.html:248
msgid "Edit"
msgstr "편집"
-#: core/forms.py:91 core/templates/navigation.html:271
-#: core/templates/navigation.html:278 core/templates/user/login.html:4
+#: core/forms.py:89 core/templates/navigation.html:268
+#: core/templates/navigation.html:275 core/templates/user/login.html:4
#: core/templates/user/registration_sidebar.html:12
#: software/templates/features.html:82 software/templates/features.html:448
msgid "Login"
msgstr "로그인"
-#: core/forms.py:130 core/forms.py:244 gym/views/export.py:61
+#: core/forms.py:128 core/forms.py:242 gym/views/export.py:61
#: gym/views/gym.py:217
msgid "First name"
msgstr "이름"
-#: core/forms.py:131 core/forms.py:245 core/templates/user/overview.html:284
+#: core/forms.py:129 core/forms.py:243 core/templates/user/overview.html:287
#: gym/views/export.py:62 gym/views/gym.py:217
msgid "Last name"
msgstr "성"
-#: core/forms.py:133 core/forms.py:210 core/templates/user/overview.html:288
+#: core/forms.py:131 core/forms.py:208 core/templates/user/overview.html:291
#: gym/models/contract.py:256 gym/models/gym.py:58
#: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:116
#: gym/templates/gym/new_user.html:30 gym/views/export.py:60
@@ -80,53 +79,53 @@ msgstr "성"
msgid "Email"
msgstr "이메일"
-#: core/forms.py:134
+#: core/forms.py:132
msgid "Used for password resets and, optionally, e-mail reminders."
msgstr "비밀번호 재설정 및 이메일 알람(option)에 사용됩니다."
-#: core/forms.py:138 core/models/profile.py:222
+#: core/forms.py:136 core/models/profile.py:222
#: gym/templates/gym/new_user.html:38
msgid "Date of Birth"
msgstr "생일"
-#: core/forms.py:177
+#: core/forms.py:175
msgid "Personal data"
msgstr "개인 정보"
-#: core/forms.py:189
+#: core/forms.py:187
msgid "Workout reminders"
msgstr "Workout 리마인더"
-#: core/forms.py:196
+#: core/forms.py:194
msgid "Other settings"
msgstr "기타 설정"
-#: core/forms.py:204 core/views/user.py:614 core/views/user.py:629
-#: core/views/user.py:641 gym/forms.py:73 utils/generic_views.py:143
+#: core/forms.py:202 core/views/user.py:630 core/views/user.py:654
+#: core/views/user.py:668 gym/forms.py:73 utils/generic_views.py:137
msgid "Save"
msgstr "저장"
-#: core/forms.py:211
+#: core/forms.py:209
msgid "Used for password resets and, optionally, email reminders."
msgstr "비밀번호 재설정 및 이메일 알람(option)에 사용됩니다."
-#: core/forms.py:240
+#: core/forms.py:238
msgid "This e-mail address is already in use."
msgstr "이 이메일 주소는 이미 사용중입니다."
-#: core/forms.py:261 gym/templates/gym/new_user.html:26
+#: core/forms.py:259 gym/templates/gym/new_user.html:26
#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:217
msgid "Password"
msgstr "비밀번호"
-#: core/forms.py:263
+#: core/forms.py:261
msgid "Please enter your current password."
msgstr "현재 비밀번호를 입력해주세요."
-#: core/forms.py:272 core/templates/language/view.html:70
+#: core/forms.py:270 core/templates/language/view.html:70
#: core/templates/license/list.html:21
#: core/templates/repetition_unit/list.html:22
-#: core/templates/user/overview.html:233
+#: core/templates/user/overview.html:236
#: core/templates/weight_unit/list.html:22
#: exercises/templates/categories/admin-overview.html:21
#: exercises/templates/equipment/admin-overview.html:21
@@ -134,27 +133,30 @@ msgstr "현재 비밀번호를 입력해주세요."
#: gym/templates/admin_notes/list.html:37
#: gym/templates/contract_option/list.html:35
#: gym/templates/contract_type/list.html:36 gym/templates/document/list.html:46
-#: gym/templates/gym/list.html:23 nutrition/templates/ingredient/view.html:168
-#: nutrition/templates/ingredient/view.html:215
-#: nutrition/templates/units/list.html:25
+#: gym/templates/gym/list.html:23 nutrition/templates/ingredient/view.html:209
+#: nutrition/templates/ingredient/view.html:254
msgid "Delete"
msgstr "삭제"
-#: core/forms.py:281
+#: core/forms.py:279
msgid "Invalid password"
msgstr "유효하지 않은 비밀번호"
-#: core/forms.py:293
+#: core/forms.py:291 core/forms.py:349
msgid "The form is secured with reCAPTCHA"
msgstr "양식은 reCAPTCHA로 보호됩니다"
-#: core/forms.py:314 core/forms.py:341 core/templates/navigation.html:272
-#: core/templates/navigation.html:285 core/templates/template.html:123
-#: core/templates/user/login.html:21 core/views/user.py:285
+#: core/forms.py:312 core/forms.py:339 core/templates/navigation.html:269
+#: core/templates/navigation.html:282 core/templates/template.html:113
+#: core/templates/user/login.html:21 core/views/user.py:293
#: software/templates/features.html:87 software/templates/features.html:442
msgid "Register"
msgstr "등록"
+#: core/forms.py:360 weight/templates/import_csv_form.html:9
+msgid "Submit"
+msgstr "보내기"
+
#: core/models/language.py:31 core/templates/language/view.html:21
msgid "Language short name"
msgstr "언어 코드"
@@ -191,36 +193,36 @@ msgstr "링크"
msgid "Link to license text or other information"
msgstr "라이선스 문서 또는 기타 정보 링크"
-#: core/models/profile.py:57
+#: core/models/profile.py:60
#, python-format
msgid "%(birthdate)s is not a valid birthdate"
msgstr "%(birthdate)s은 유효하지 않은 생년월일입니다"
-#: core/models/profile.py:66
+#: core/models/profile.py:69
msgid "Male"
msgstr "남성"
-#: core/models/profile.py:67
+#: core/models/profile.py:70
msgid "Female"
msgstr "여성"
-#: core/models/profile.py:74
+#: core/models/profile.py:77
msgid "Low"
msgstr "낮음"
-#: core/models/profile.py:75
+#: core/models/profile.py:78
msgid "Medium"
msgstr "중간"
-#: core/models/profile.py:76
+#: core/models/profile.py:79
msgid "High"
msgstr "높음"
-#: core/models/profile.py:82
+#: core/models/profile.py:85
msgid "Metric (kilogram)"
msgstr "미터법 (kg)"
-#: core/models/profile.py:83
+#: core/models/profile.py:86
msgid "Imperial (pound)"
msgstr "야드파운드법 (pound)"
@@ -336,7 +338,7 @@ msgstr "주당 평균 시간"
msgid "Free time"
msgstr "자유 시간"
-#: core/models/profile.py:320 nutrition/templates/rate/form.html:66
+#: core/models/profile.py:320 nutrition/templates/rate/form.html:67
msgid "Total daily calories"
msgstr "총 일일 칼로리"
@@ -376,20 +378,43 @@ msgstr ""
msgid "Enable or disable the trophy system for this user"
msgstr ""
-#: core/models/profile.py:446
+#: core/models/profile.py:457
msgid "The sum of all hours has to be 24"
msgstr "모든 시간의 합은 24이어야 합니다"
-#: core/models/rep_unit.py:36 core/models/weight_unit.py:42
-#: core/templates/user/overview.html:280 core/views/user.py:589
+#: core/models/rep_unit.py:32 i18n.tpl:30
+msgid "Repetitions"
+msgstr "반복"
+
+#: core/models/rep_unit.py:33 core/templates/user/overview.html:82
+#: exercises/templates/history/overview.html:30
+msgid "Time"
+msgstr "시간"
+
+#: core/models/rep_unit.py:34
+msgid "Distance"
+msgstr ""
+
+#: core/models/rep_unit.py:47 core/models/weight_unit.py:42
+#: core/templates/user/overview.html:283 core/views/user.py:605
#: exercises/models/muscle.py:36 gym/models/contract.py:52
#: gym/models/contract.py:103 gym/models/gym.py:46
#: gym/models/user_document.py:84 gym/templates/contract/view.html:50
#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:108
-#: gym/views/gym.py:158 nutrition/templates/ingredient/view.html:151
+#: gym/views/gym.py:158 nutrition/templates/ingredient/view.html:192
msgid "Name"
msgstr "이름"
+#: core/models/rep_unit.py:53
+#, fuzzy
+#| msgid "Unit"
+msgid "Unit Type"
+msgstr "단위"
+
+#: core/models/rep_unit.py:54
+msgid "The type of unit (repetitions, time, or distance)"
+msgstr ""
+
#: core/templates/403.html:4
msgid "Forbidden!"
msgstr "금지!"
@@ -420,6 +445,55 @@ msgstr ""
"고, 그래도 문제가 해결되지 않으면 나중에 다시 시도해 보세요. 문제가 지속되면 "
"아래 방법으로 도움을 받으실 수 있습니다."
+#: core/templates/account/email/email_confirmation_message.html:81
+msgid "Almost there!"
+msgstr ""
+
+#: core/templates/account/email/email_confirmation_message.html:85
+#, fuzzy, python-format
+#| msgid ""
+#| "You're receiving this e-mail because you requested a password reset for "
+#| "your user account at %(site_name)s."
+msgid ""
+"You're receiving this email because the user \"%(user_display)s\" has given "
+"your email address to register an account on %(site_domain)s."
+msgstr ""
+"%(site_name)s 사용자 계정에 대한 비밀번호 재설정을 요청하셨기 때문에 이 이메"
+"일을 보내드립니다."
+
+#: core/templates/account/email/email_confirmation_message.html:93
+msgid ""
+"Your email verification code is listed below. Please enter it in your open "
+"browser window."
+msgstr ""
+
+#: core/templates/account/email/email_confirmation_message.html:100
+#, fuzzy
+#| msgid "Please click the following link to confirm your email: %(link)s"
+msgid "Please click the button below to confirm your email address."
+msgstr "다음 링크를 클릭하여 이메일을 확인하세요: %(link)s"
+
+#: core/templates/account/email/email_confirmation_message.html:106
+#, fuzzy
+#| msgid "Unverified email"
+msgid "Confirm email"
+msgstr "확인되지 않은 이메일"
+
+#: core/templates/account/email/email_confirmation_message.html:110
+#, python-format
+msgid ""
+"The link is valid for %(expire_hours)s hours (until %(date)s, %(time)s). You "
+"can request a new one from your profile settings."
+msgstr ""
+
+#: core/templates/account/email/email_confirmation_message.html:116
+msgid "If the button doesn't work, copy and paste this link into your browser:"
+msgstr ""
+
+#: core/templates/account/email/email_confirmation_message.html:125
+msgid "the wger Team"
+msgstr "wger 팀"
+
#: core/templates/base.html:10
#, python-format
msgid ""
@@ -452,51 +526,7 @@ 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 verification"
-msgstr "이메일 인증 설정"
-
-#: core/templates/email_verification/confirm_template.html:18
-#, python-format
-msgid "%(username)s, your email was verified"
-msgstr "%(username)s, 이메일 인증 완료"
-
-#: 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 "%(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 "이메일 인증을 위해 <a href=\"%(link)s\">여기</a>를 클릭해 주세요"
-
-#: 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 "%(time)s 후 인증토큰이 만료됨"
-
-#: core/templates/email_verification/email_body_html.tpl:14
-#: core/templates/email_verification/email_body_txt.tpl:8
-msgid "the wger Team"
-msgstr "wger 팀"
-
-#: core/templates/email_verification/email_body_txt.tpl:4
-#, python-format
-msgid "Please click the following link to confirm your email: %(link)s"
-msgstr "다음 링크를 클릭하여 이메일을 확인하세요: %(link)s"
-
-#: core/templates/language/overview.html:4 core/templates/navigation.html:344
+#: core/templates/language/overview.html:4 core/templates/navigation.html:341
msgid "Languages"
msgstr "언어"
@@ -505,16 +535,16 @@ msgid "Nothing found."
msgstr "찾을 수 없음."
#: core/templates/language/overview.html:22
-#: nutrition/templates/ingredient/overview.html:38
+#: nutrition/templates/ingredient/overview.html:43
msgid "Add one now."
msgstr "추가하세요."
#: core/templates/language/overview.html:34 core/templates/license/list.html:43
-#: core/templates/repetition_unit/list.html:46
-#: core/templates/user/overview.html:344 core/templates/user/overview.html:384
-#: core/templates/user/overview.html:422
-#: core/templates/weight_unit/list.html:46 core/views/languages.py:74
-#: core/views/license.py:66 core/views/repetition_units.py:66
+#: core/templates/repetition_unit/list.html:44
+#: core/templates/user/overview.html:347 core/templates/user/overview.html:387
+#: core/templates/user/overview.html:425
+#: core/templates/weight_unit/list.html:46 core/views/languages.py:77
+#: core/views/license.py:66 core/views/repetition_units.py:76
#: core/views/weight_units.py:66
#: exercises/templates/categories/admin-overview.html:40
#: exercises/templates/equipment/admin-overview.html:39
@@ -527,14 +557,14 @@ msgstr "추가하세요."
#: gym/templates/gym/member_list.html:264
#: gym/templates/gym/member_list.html:303
#: mailer/templates/mailer/gym/overview.html:43
-#: nutrition/templates/ingredient/overview.html:60
+#: nutrition/templates/ingredient/overview.html:97
msgid "Add"
msgstr "추가"
#: core/templates/language/view.html:61 core/templates/user/api_key.html:41
#: core/templates/user/preferences.html:50 gym/models/contract.py:203
#: gym/templates/contract/view.html:41 gym/templates/gym/member_list.html:270
-#: nutrition/templates/ingredient/view.html:206
+#: nutrition/templates/ingredient/view.html:245
msgid "Options"
msgstr "옵션"
@@ -544,9 +574,9 @@ msgstr "라이센스 리스트"
#: core/templates/license/list.html:30
#: core/templates/repetition_unit/list.html:32
-#: core/templates/user/overview.html:104 core/templates/user/overview.html:136
-#: core/templates/user/overview.html:185 core/templates/user/overview.html:365
-#: core/templates/user/overview.html:404 core/templates/user/overview.html:448
+#: core/templates/user/overview.html:107 core/templates/user/overview.html:139
+#: core/templates/user/overview.html:188 core/templates/user/overview.html:368
+#: core/templates/user/overview.html:407 core/templates/user/overview.html:451
#: core/templates/weight_unit/list.html:32
#: exercises/templates/categories/admin-overview.html:30
#: exercises/templates/equipment/admin-overview.html:30
@@ -558,11 +588,10 @@ msgstr "라이센스 리스트"
#: gym/templates/gym/member_list.html:284
#: gym/templates/gym/member_list.html:321
#: mailer/templates/mailer/gym/overview.html:30
-#: nutrition/templates/units/list.html:34
msgid "Nothing found"
msgstr "데이터가 없습니다"
-#: core/templates/misc/about.html:4 core/templates/template.html:160
+#: core/templates/misc/about.html:4 core/templates/template.html:150
msgid "Imprint"
msgstr "날인"
@@ -570,162 +599,157 @@ msgstr "날인"
msgid "Training"
msgstr "트레이닝"
-#: core/templates/navigation.html:37 core/templates/user/overview.html:25
+#: core/templates/navigation.html:36 core/templates/user/overview.html:28
msgid "Routines"
msgstr "루틴"
-#: core/templates/navigation.html:45 core/templates/user/overview.html:70
+#: core/templates/navigation.html:44 core/templates/user/overview.html:73
msgid "Calendar"
msgstr "달력"
-#: core/templates/navigation.html:55
+#: core/templates/navigation.html:53
msgid "Measurements"
msgstr "측정"
-#: core/templates/navigation.html:66 gallery/templates/images/overview.html:6
+#: core/templates/navigation.html:64 gallery/templates/images/overview.html:6
msgid "Gallery"
msgstr "갤러리"
-#: core/templates/navigation.html:72
+#: core/templates/navigation.html:74 core/templates/navigation.html:400
+#: trophies/templates/trophies/overview.html:7
+msgid "Trophies"
+msgstr ""
+
+#: core/templates/navigation.html:79
msgid "Workout templates"
msgstr "운동 표본"
-#: core/templates/navigation.html:79
+#: core/templates/navigation.html:86
msgid "Your templates"
msgstr "일정 표본"
-#: core/templates/navigation.html:88
+#: core/templates/navigation.html:95
msgid "Public templates"
msgstr "공용 템플릿"
-#: core/templates/navigation.html:96 software/templates/features.html:51
+#: core/templates/navigation.html:103 software/templates/features.html:51
#: software/templates/features.html:480
msgid "Exercises"
msgstr "운동"
-#: core/templates/navigation.html:102 core/templates/navigation.html:176
-#: core/templates/navigation.html:339
+#: core/templates/navigation.html:109 core/templates/navigation.html:336
msgid "Administration"
msgstr "관리"
-#: core/templates/navigation.html:106
+#: core/templates/navigation.html:113
msgid "Exercise edit history"
msgstr "운동 편집 이력"
-#: core/templates/navigation.html:112
+#: core/templates/navigation.html:119
msgid "Equipment"
msgstr "장비"
-#: core/templates/navigation.html:118
+#: core/templates/navigation.html:125
msgid "Muscles"
msgstr "근육"
-#: core/templates/navigation.html:124
+#: core/templates/navigation.html:131
#: exercises/templates/categories/admin-overview.html:4
msgid "Categories"
msgstr "카테고리"
-#: core/templates/navigation.html:139 software/templates/features.html:468
+#: core/templates/navigation.html:146 software/templates/features.html:468
msgid "Nutrition"
msgstr "영양"
-#: core/templates/navigation.html:147 core/templates/user/overview.html:144
+#: core/templates/navigation.html:154 core/templates/user/overview.html:147
msgid "Nutrition plans"
msgstr "영양소 섭취 계획"
-#: core/templates/navigation.html:156
+#: core/templates/navigation.html:163
msgid "BMI calculator"
msgstr "BMI 계산기"
-#: core/templates/navigation.html:165 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:172 nutrition/templates/rate/form.html:18
msgid "Daily calories calculator"
msgstr "일일 칼로기 계산기"
-#: core/templates/navigation.html:171
+#: core/templates/navigation.html:178
#: nutrition/templates/ingredient/overview.html:10
msgid "Ingredient overview"
msgstr "성분 개요"
-#: core/templates/navigation.html:180 nutrition/templates/units/list.html:6
-msgid "Ingredient weight units"
-msgstr "몸무게 성분 단위"
-
-#: core/templates/navigation.html:196 software/templates/features.html:463
+#: core/templates/navigation.html:193 software/templates/features.html:463
msgid "Body weight"
msgstr "체중"
-#: core/templates/navigation.html:203 core/templates/user/overview.html:114
+#: core/templates/navigation.html:200 core/templates/user/overview.html:117
msgid "Weight overview"
msgstr "체중 개요"
-#: core/templates/navigation.html:217
+#: core/templates/navigation.html:214
msgid "About this software"
msgstr "이 소프트웨어는"
-#: core/templates/navigation.html:223 software/templates/about_us.html:5
+#: core/templates/navigation.html:220 software/templates/about_us.html:5
msgid "Support & Get Involved"
msgstr "지원 및 참여"
-#: core/templates/navigation.html:229 software/templates/features.html:528
+#: core/templates/navigation.html:226 software/templates/features.html:528
msgid "REST API"
msgstr "REST API"
-#: core/templates/navigation.html:235 utils/models.py:45
+#: core/templates/navigation.html:232 utils/models.py:45
msgid "License"
msgstr "라이선스"
-#: core/templates/navigation.html:241
+#: core/templates/navigation.html:238
msgid "Developer documentation"
msgstr "개발 가이드"
-#: core/templates/navigation.html:248
+#: core/templates/navigation.html:245
msgid "Get the code"
msgstr "코드 정보"
-#: core/templates/navigation.html:255 core/templates/template.html:199
-#: software/templates/features.html:603
+#: core/templates/navigation.html:252 core/templates/template.html:202
+#: software/templates/features.html:614
msgid "Translate"
msgstr "번역"
-#: core/templates/navigation.html:292 core/templates/user/login.html:30
+#: core/templates/navigation.html:289 core/templates/user/login.html:30
msgid "Reset password"
msgstr "비밀번호 변경"
-#: core/templates/navigation.html:301 core/templates/navigation.html:329
+#: core/templates/navigation.html:298 core/templates/navigation.html:326
msgid "Logout"
msgstr "로그아웃"
-#: core/templates/navigation.html:320
+#: core/templates/navigation.html:317
msgid "My preferences"
msgstr "내 환경설정"
-#: core/templates/navigation.html:352
+#: core/templates/navigation.html:349
msgid "Licenses"
msgstr "라이선스"
-#: core/templates/navigation.html:360
+#: core/templates/navigation.html:357
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr "반복 단위"
-#: core/templates/navigation.html:368 core/templates/weight_unit/list.html:4
-#: nutrition/templates/ingredient/view.html:141
+#: core/templates/navigation.html:365 core/templates/weight_unit/list.html:4
+#: nutrition/templates/ingredient/view.html:182
msgid "Weight units"
msgstr "무게 단위"
-#: core/templates/navigation.html:376 core/templates/user/list.html:4
+#: core/templates/navigation.html:373 core/templates/user/list.html:4
msgid "User list"
msgstr "사용자 리스트"
-#: core/templates/navigation.html:382
+#: core/templates/navigation.html:379
msgid "Gyms"
msgstr "체육관"
-#: core/templates/navigation.html:403
-#: trophies/templates/trophies/overview.html:7
-msgid "Trophies"
-msgstr ""
-
#: core/templates/registration/password_reset_complete.html:4
msgid "Password reset complete"
msgstr "비밀번호 변경 완료"
@@ -785,27 +809,31 @@ msgstr "이전"
msgid "next"
msgstr "다음"
-#: core/templates/template.html:96
+#: core/templates/template.html:86
msgid "Close"
msgstr "닫기"
-#: core/templates/template.html:112
+#: core/templates/template.html:102
msgid ""
"You are using a guest account, data entered will be deleted after a week."
msgstr ""
"귀하는 게스트 계정을 사용하고 계시므로, 입력하신 데이터는 일주일 후 삭제됩니"
"다."
-#: core/templates/template.html:117
+#: core/templates/template.html:107
msgid "Create some demo entries"
msgstr "데모용 계정 만들기"
-#: core/templates/template.html:165 software/templates/features.html:568
+#: core/templates/template.html:155 software/templates/features.html:568
#: software/templates/tos.html:7
msgid "Terms of service"
msgstr "서비스 약관"
-#: core/templates/template_features.html:53 software/templates/features.html:9
+#: core/templates/template.html:181 software/templates/features.html:595
+msgid "Browser language"
+msgstr ""
+
+#: core/templates/template_features.html:46 software/templates/features.html:9
msgid "Features"
msgstr "특징"
@@ -863,99 +891,94 @@ msgstr "계정이 없나요?"
msgid "Forgot password?"
msgstr "비밀번호를 잊었나요?"
-#: core/templates/user/overview.html:25 core/templates/user/overview.html:68
-#: core/templates/user/overview.html:112 core/templates/user/overview.html:144
-#: core/templates/user/overview.html:348 core/templates/user/overview.html:390
-#: core/templates/user/overview.html:426
+#: core/templates/user/overview.html:28 core/templates/user/overview.html:71
+#: core/templates/user/overview.html:115 core/templates/user/overview.html:147
+#: core/templates/user/overview.html:351 core/templates/user/overview.html:393
+#: core/templates/user/overview.html:429
#, python-format
msgid "last %(number)s"
msgstr "마지막 %(number)s 개"
-#: core/templates/user/overview.html:27 core/templates/user/overview.html:146
-#: core/templates/user/overview.html:343 core/templates/user/overview.html:382
-#: core/templates/user/overview.html:421 gym/templates/gym/member_list.html:226
+#: core/templates/user/overview.html:30 core/templates/user/overview.html:149
+#: core/templates/user/overview.html:346 core/templates/user/overview.html:385
+#: core/templates/user/overview.html:424 gym/templates/gym/member_list.html:226
#: gym/templates/gym/member_list.html:262
#: gym/templates/gym/member_list.html:302
msgid "Overview"
msgstr "개요"
-#: core/templates/user/overview.html:34 core/templates/user/overview.html:76
-#: core/templates/user/overview.html:120 core/templates/user/overview.html:152
+#: core/templates/user/overview.html:37 core/templates/user/overview.html:79
+#: core/templates/user/overview.html:123 core/templates/user/overview.html:155
#: manager/helpers.py:88 software/templates/about_us.html:170
#: weight/templates/import_csv_preview.html:13
#: weight/templates/import_csv_preview.html:42 weight/views.py:54
msgid "Date"
msgstr "일자"
-#: core/templates/user/overview.html:35 core/templates/user/overview.html:153
+#: core/templates/user/overview.html:38 core/templates/user/overview.html:156
#: gym/models/contract.py:58 gym/models/contract.py:109
msgid "Description"
msgstr "설명"
-#: core/templates/user/overview.html:36
+#: core/templates/user/overview.html:39
msgid "Number of logs (days)"
msgstr "로그 수(일)"
-#: core/templates/user/overview.html:37 core/views/user.py:590
+#: core/templates/user/overview.html:40 core/views/user.py:606
#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:158
msgid "Last activity"
msgstr "최종 활동"
-#: core/templates/user/overview.html:58
+#: core/templates/user/overview.html:61
msgid "No workouts found."
msgstr "Workout을 찾을 수 없음."
-#: core/templates/user/overview.html:68
+#: core/templates/user/overview.html:71
msgid "Log"
msgstr "로그"
-#: core/templates/user/overview.html:77
+#: core/templates/user/overview.html:80
msgid "General impression"
msgstr "일반적인 인상"
-#: core/templates/user/overview.html:78 core/templates/user/overview.html:390
+#: core/templates/user/overview.html:81 core/templates/user/overview.html:393
msgid "Notes"
msgstr "메모"
-#: core/templates/user/overview.html:79
-#: exercises/templates/history/overview.html:30
-msgid "Time"
-msgstr "시간"
-
-#: core/templates/user/overview.html:112 core/templates/user/overview.html:121
+#: core/templates/user/overview.html:115 core/templates/user/overview.html:124
#: manager/helpers.py:89 weight/templates/import_csv_preview.html:14
#: weight/templates/import_csv_preview.html:43 weight/views.py:54
msgid "Weight"
msgstr "몸무게"
-#: core/templates/user/overview.html:154
-#: nutrition/templates/ingredient/view.html:51 nutrition/views/plan.py:245
+#: core/templates/user/overview.html:157
+#: nutrition/templates/ingredient/view.html:52 nutrition/views/plan.py:244
msgid "Energy"
msgstr "에너지"
-#: core/templates/user/overview.html:155
-#: nutrition/templates/ingredient/view.html:58 nutrition/views/plan.py:251
+#: core/templates/user/overview.html:158
+#: nutrition/templates/ingredient/view.html:59 nutrition/views/plan.py:250
msgid "Protein"
msgstr "단백질"
-#: core/templates/user/overview.html:156
-#: nutrition/templates/ingredient/view.html:64 nutrition/views/plan.py:259
+#: core/templates/user/overview.html:159
+#: nutrition/templates/ingredient/view.html:65 nutrition/views/plan.py:258
msgid "Carbohydrates"
msgstr "탄수화물"
-#: core/templates/user/overview.html:157
-#: nutrition/templates/ingredient/view.html:80 nutrition/views/plan.py:273
+#: core/templates/user/overview.html:160
+#: nutrition/templates/ingredient/view.html:81 nutrition/views/plan.py:272
msgid "Fat"
msgstr "지방"
-#: core/templates/user/overview.html:170
-#: nutrition/templates/ingredient/view.html:53
+#: core/templates/user/overview.html:173
+#: nutrition/templates/ingredient/view.html:54
msgid "kcal"
msgstr "kcal"
-#: core/templates/user/overview.html:201 core/templates/user/overview.html:340
-#: core/templates/user/overview.html:379 core/templates/user/overview.html:418
-#: core/templates/user/overview.html:463 gym/templates/gym/list.html:45
+#: core/templates/user/overview.html:204 core/templates/user/overview.html:343
+#: core/templates/user/overview.html:382 core/templates/user/overview.html:421
+#: core/templates/user/overview.html:466 gym/templates/gym/list.html:45
#: gym/templates/gym/member_list.html:91 gym/templates/gym/member_list.html:149
#: gym/templates/gym/member_list.html:187
#: gym/templates/gym/member_list.html:223
@@ -964,109 +987,113 @@ msgstr "kcal"
msgid "Actions"
msgstr "활동"
-#: core/templates/user/overview.html:210
+#: core/templates/user/overview.html:213
msgid "Deactivate user"
msgstr "사용자 비활성화"
-#: core/templates/user/overview.html:214
+#: core/templates/user/overview.html:217
msgid "Activate user"
msgstr "사용자 활성화"
-#: core/templates/user/overview.html:223
+#: core/templates/user/overview.html:226
msgid "Reset user password"
msgstr "사용자 비밀번호 변경"
-#: core/templates/user/overview.html:227 gym/templates/gym/member_list.html:30
+#: core/templates/user/overview.html:230 gym/templates/gym/member_list.html:30
msgid "Roles"
msgstr "권한"
-#: core/templates/user/overview.html:243
+#: core/templates/user/overview.html:246
msgid "Password reset confirmation"
msgstr "비밀번호 변경 확인"
-#: core/templates/user/overview.html:247
+#: core/templates/user/overview.html:250
msgid "Do you really want to change this user&#39;s password?"
msgstr "정말로 이 사용자의 비밀번호를 변경하시겠습니까?"
-#: core/templates/user/overview.html:250
+#: core/templates/user/overview.html:253
#: exercises/templates/history/overview.html:106
+#: nutrition/templates/ingredient/view.html:148
+#: nutrition/templates/ingredient/view.html:160
msgid "No"
msgstr "아니요"
-#: core/templates/user/overview.html:251
+#: core/templates/user/overview.html:254
#: exercises/templates/history/overview.html:99
+#: nutrition/templates/ingredient/view.html:146
+#: nutrition/templates/ingredient/view.html:158
msgid "Yes"
msgstr "예"
-#: core/templates/user/overview.html:272 gym/templates/gym/member_list.html:105
+#: core/templates/user/overview.html:275 gym/templates/gym/member_list.html:105
msgid "Details"
msgstr "세부정보"
-#: core/templates/user/overview.html:276 gym/views/export.py:57
-#: manager/helpers.py:89 nutrition/views/plan.py:151
-#: nutrition/views/plan.py:157
+#: core/templates/user/overview.html:279 gym/views/export.py:57
+#: manager/helpers.py:89 nutrition/views/plan.py:150
+#: nutrition/views/plan.py:156
msgid "Nr."
msgstr "Nr."
-#: core/templates/user/overview.html:298 gym/models/contract.py:287
+#: core/templates/user/overview.html:301 gym/models/contract.py:287
#: gym/models/gym.py:50 gym/templates/contract/view.html:75
#: gym/templates/gym/member_list.html:112 gym/views/export.py:68
msgid "Phone"
msgstr "핸드폰"
-#: core/templates/user/overview.html:302 gym/templates/contract/view.html:87
+#: core/templates/user/overview.html:305 gym/templates/contract/view.html:87
#: gym/templates/gym/member_list.html:130
msgid "Address"
msgstr "주소"
-#: core/templates/user/overview.html:313
+#: core/templates/user/overview.html:316
msgid "Registered"
msgstr "등록"
-#: core/templates/user/overview.html:317
+#: core/templates/user/overview.html:320
msgid "Last login"
msgstr "최종 로그인"
-#: core/templates/user/overview.html:322
+#: core/templates/user/overview.html:325
msgid "Status"
msgstr "상태"
-#: core/templates/user/overview.html:325
+#: core/templates/user/overview.html:328
msgid "Active"
msgstr "활성"
-#: core/templates/user/overview.html:327
+#: core/templates/user/overview.html:330
msgid "Inactive"
msgstr "비활성"
-#: core/templates/user/overview.html:348 gym/templates/contract/list.html:4
+#: core/templates/user/overview.html:351 gym/templates/contract/list.html:4
#: gym/templates/gym/member_list.html:218
msgid "Contracts"
msgstr "계약"
-#: core/templates/user/overview.html:426 gym/templates/document/list.html:4
+#: core/templates/user/overview.html:429 gym/templates/document/list.html:4
msgid "Documents"
msgstr "문서"
-#: core/templates/user/overview.html:433 gym/templates/document/list.html:33
+#: core/templates/user/overview.html:436 gym/templates/document/list.html:33
msgid "Download"
msgstr "다운로드"
-#: core/templates/user/overview.html:474 gym/views/admin_config.py:44
+#: core/templates/user/overview.html:477 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:477 gym/models/user_config.py:92
+#: core/templates/user/overview.html:480 gym/models/user_config.py:92
msgid "Include in inactive overview"
msgstr "비활성 개요에 포함"
-#: core/templates/user/overview.html:510
+#: core/templates/user/overview.html:513
#, python-format
msgid "Admin login is only available for users in %(gym_name)s"
msgstr "관리자 로그인은 %(gym_name)s의 사용자만 사용할 수 있습니다"
-#: core/templates/user/overview.html:514
+#: core/templates/user/overview.html:517
msgid "Log in as this user"
msgstr "이 사용자로 로그인하세요"
@@ -1090,7 +1117,7 @@ msgstr "확인 이메일 보내기"
msgid "You need to verify your email to contribute exercises"
msgstr "운동에 참여하려면 이메일을 확인해야 합니다"
-#: core/templates/user/preferences.html:55 core/views/user.py:601
+#: core/templates/user/preferences.html:55 core/views/user.py:617
msgid "Change password"
msgstr "비밀번호 변경"
@@ -1098,23 +1125,23 @@ msgstr "비밀번호 변경"
msgid "Already have an account?"
msgstr ""
-#: core/templatetags/wger_extras.py:142 i18n.tpl:38
+#: core/templatetags/wger_extras.py:142 i18n.tpl:39
msgid "kg"
msgstr "kg"
#: core/templatetags/wger_extras.py:144
-#: nutrition/templates/ingredient/view.html:60
-#: nutrition/templates/ingredient/view.html:66
-#: nutrition/templates/ingredient/view.html:73
-#: nutrition/templates/ingredient/view.html:82
-#: nutrition/templates/ingredient/view.html:89
-#: nutrition/templates/ingredient/view.html:111
-#: nutrition/templates/ingredient/view.html:121
+#: nutrition/templates/ingredient/view.html:61
+#: nutrition/templates/ingredient/view.html:67
+#: nutrition/templates/ingredient/view.html:74
+#: nutrition/templates/ingredient/view.html:83
+#: nutrition/templates/ingredient/view.html:90
+#: nutrition/templates/ingredient/view.html:112
+#: nutrition/templates/ingredient/view.html:122
msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr "g"
-#: core/templatetags/wger_extras.py:147 i18n.tpl:39
+#: core/templatetags/wger_extras.py:147 i18n.tpl:40
msgid "lb"
msgstr "lb"
@@ -1123,36 +1150,35 @@ msgctxt "weight unit, i.e. ounces"
msgid "oz"
msgstr "oz"
-#: core/views/languages.py:85 exercises/views/categories.py:122
+#: core/views/languages.py:88 exercises/views/categories.py:122
#: exercises/views/equipment.py:103 exercises/views/muscles.py:99
-#: nutrition/views/ingredient.py:120 nutrition/views/unit.py:110
+#: nutrition/views/ingredient.py:125
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
+#: core/views/languages.py:96 core/views/license.py:103
+#: core/views/repetition_units.py:114 core/views/weight_units.py:115
#: exercises/views/categories.py:128 exercises/views/muscles.py:106
#: gallery/views/images.py:124 gym/views/admin_notes.py:196
#: gym/views/document.py:206 gym/views/gym.py:481
-#: nutrition/views/ingredient.py:127 nutrition/views/unit.py:117
+#: nutrition/views/ingredient.py:132
#, python-brace-format
msgid "Delete {0}?"
msgstr "{0} 삭제하시겠어요?"
-#: core/views/languages.py:111 core/views/license.py:85
-#: core/views/repetition_units.py:86 core/views/user.py:464
+#: core/views/languages.py:114 core/views/license.py:85
+#: core/views/repetition_units.py:96 core/views/user.py:480
#: core/views/weight_units.py:86 exercises/views/categories.py:98
#: exercises/views/equipment.py:81 exercises/views/muscles.py:87
#: gym/views/admin_notes.py:161 gym/views/config.py:68
#: gym/views/contract.py:186 gym/views/contract_option.py:123
#: gym/views/contract_type.py:123 gym/views/document.py:171
-#: gym/views/gym.py:463 nutrition/views/ingredient.py:146
-#: nutrition/views/unit.py:143
+#: gym/views/gym.py:463 nutrition/views/ingredient.py:151
#, python-brace-format
msgid "Edit {0}"
msgstr "{0} 편집"
-#: core/views/misc.py:74
+#: core/views/misc.py:73
msgid ""
"We have created sample workout, workout schedules, weight logs, (body) "
"weight and nutrition plan entries so you can better see what this site can "
@@ -1161,48 +1187,48 @@ msgstr ""
"이 사이트의 기능을 더 잘 확인하실 수 있도록 샘플 운동, 운동 일정, 체중 기록, "
"(신체) 체중 및 영양 계획 항목을 만들었습니다. 자유롭게 수정하거나 삭제하세요!"
-#: core/views/user.py:143
+#: core/views/user.py:145
#, python-brace-format
msgid "Account \"{0}\" was successfully deleted"
msgstr "계정 \"{0}\"이 성공적으로 삭제되었습니다"
-#: core/views/user.py:279
+#: core/views/user.py:287
msgid "You were successfully registered"
msgstr "성공적으로 등록되었습니다"
-#: core/views/user.py:341
+#: core/views/user.py:357
msgid "Settings successfully updated"
msgstr "설정이 업데이트 되었습니다"
-#: core/views/user.py:380
+#: core/views/user.py:396
msgid "The user was successfully deactivated"
msgstr "사용자가 성공적으로 비활성화되었습니다"
-#: core/views/user.py:417
+#: core/views/user.py:433
msgid "The user was successfully activated"
msgstr "사용자가 성공적으로 활성화되었습니다"
-#: core/views/user.py:432
+#: core/views/user.py:448
msgid "Edit user"
msgstr "사용자 편집"
-#: core/views/user.py:587 gym/templates/gym/member_list.html:26
+#: core/views/user.py:603 gym/templates/gym/member_list.html:26
#: gym/views/gym.py:158
msgid "ID"
msgstr "ID"
-#: core/views/user.py:588 gym/forms.py:95 gym/templates/contract/view.html:55
+#: core/views/user.py:604 gym/forms.py:95 gym/templates/contract/view.html:55
#: gym/templates/gym/member_list.html:27 gym/views/export.py:59
#: gym/views/gym.py:158 gym/views/gym.py:217
msgid "Username"
msgstr "사용자이름"
-#: core/views/user.py:591 gym/templates/gym/new_user.html:34
+#: core/views/user.py:607 gym/templates/gym/new_user.html:34
#: gym/views/export.py:58 gym/views/gym.py:217
msgid "Gym"
msgstr "짐"
-#: core/views/user.py:650
+#: core/views/user.py:678
#, python-format
msgid "A verification email was sent to %(email)s"
msgstr "%(email)s로 확인 이메일이 전송되었습니다"
@@ -1219,16 +1245,16 @@ msgstr "대체명"
msgid "A more basic name for the muscle"
msgstr "근육에 대한 보다 기본적인 이름"
-#: exercises/models/video.py:50
+#: exercises/models/video.py:52
#, python-format
msgid "Maximum file size is %(size)sMB."
msgstr "최대 파일 크기는 %(size)sMB입니다."
-#: exercises/models/video.py:57 exercises/models/video.py:65
+#: exercises/models/video.py:59 exercises/models/video.py:67
msgid "File type is not supported"
msgstr "파일 유형이 지원되지 않습니다"
-#: exercises/models/video.py:70
+#: exercises/models/video.py:72
msgid "File is not a valid video"
msgstr "파일이 유효한 비디오가 아닙니다"
@@ -1299,7 +1325,11 @@ msgstr "장비를 삭제하시겠습니까?"
msgid "Add muscle"
msgstr "근육 추가"
-#: gallery/templates/images/overview.html:72
+#: gallery/forms.py:35
+msgid "If date is left empty, it will be read from the image instead"
+msgstr ""
+
+#: gallery/templates/images/overview.html:69
msgid "Add image"
msgstr "이미지 추가"
@@ -1365,7 +1395,7 @@ msgid "Contract type"
msgstr "계약 유형"
#: gym/models/contract.py:211 gym/templates/contract/view.html:59
-#: nutrition/forms.py:58
+#: nutrition/forms.py:67
msgid "Amount"
msgstr "양"
@@ -1543,7 +1573,7 @@ msgstr "이메일"
msgid "Add member"
msgstr "멤버 추가"
-#: gym/templates/gym/new_user.html:48 nutrition/templates/rate/form.html:120
+#: gym/templates/gym/new_user.html:48 nutrition/templates/rate/form.html:121
msgid "Info"
msgstr "정보"
@@ -1715,10 +1745,6 @@ msgstr "풀업바"
msgid "Quads"
msgstr "쿼드"
-#: i18n.tpl:30
-msgid "Repetitions"
-msgstr "반복"
-
#: i18n.tpl:31
msgid "Resistance band"
msgstr ""
@@ -1747,194 +1773,200 @@ msgstr "삼두근"
msgid "Until Failure"
msgstr "실패 전까지"
-#: i18n.tpl:40
+#: i18n.tpl:38
+#, fuzzy
+#| msgid "Kilometers"
+msgid "Meters"
+msgstr "킬로미터"
+
+#: i18n.tpl:41
msgid "none (bodyweight exercise)"
msgstr "없음(체중 운동)"
-#: i18n.tpl:41
+#: i18n.tpl:42
msgid "Beginner"
msgstr ""
-#: i18n.tpl:42
+#: i18n.tpl:43
#, fuzzy
#| msgctxt "As in \"content of an email\""
#| msgid "Content"
msgid "Consistent"
msgstr "내용"
-#: i18n.tpl:43
+#: i18n.tpl:44
msgid "Dedicated"
msgstr ""
-#: i18n.tpl:44
+#: i18n.tpl:45
msgid "Obsessed"
msgstr ""
-#: i18n.tpl:45
+#: i18n.tpl:46
msgid "Legend"
msgstr ""
-#: i18n.tpl:46
+#: i18n.tpl:47
msgid "Veteran"
msgstr ""
-#: i18n.tpl:47
+#: i18n.tpl:48
msgid "Titan"
msgstr ""
-#: i18n.tpl:48
+#: i18n.tpl:49
msgid "Unstoppable"
msgstr ""
-#: i18n.tpl:49
+#: i18n.tpl:50
msgid "Weekend Warrior"
msgstr ""
-#: i18n.tpl:50
+#: i18n.tpl:51
msgid "Elephant lifter"
msgstr ""
-#: i18n.tpl:51
+#: i18n.tpl:52
msgid "Bus lifter"
msgstr ""
-#: i18n.tpl:52
+#: i18n.tpl:53
msgid "Plane lifter"
msgstr ""
-#: i18n.tpl:53
+#: i18n.tpl:54
msgid "Blue whale lifter"
msgstr ""
-#: i18n.tpl:54
+#: i18n.tpl:55
msgid "Space Station lifter"
msgstr ""
-#: i18n.tpl:55
+#: i18n.tpl:56
msgid "Millionaire"
msgstr ""
-#: i18n.tpl:56
+#: i18n.tpl:57
msgid "Atlas"
msgstr ""
-#: i18n.tpl:57
+#: i18n.tpl:58
msgid "Early Bird"
msgstr ""
-#: i18n.tpl:58
+#: i18n.tpl:59
msgid "Night Owl"
msgstr ""
-#: i18n.tpl:59
+#: i18n.tpl:60
msgid "New Year, New Me"
msgstr ""
-#: i18n.tpl:60
+#: i18n.tpl:61
msgid "Phoenix"
msgstr ""
-#: i18n.tpl:61
+#: i18n.tpl:62
#, fuzzy
#| msgid "Personal data"
msgid "Personal Record"
msgstr "개인 정보"
-#: i18n.tpl:62
+#: i18n.tpl:63
msgid "Complete your first workout"
msgstr ""
-#: i18n.tpl:63
+#: i18n.tpl:64
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 10 workouts"
msgstr "샘플 Workout"
-#: i18n.tpl:64
+#: i18n.tpl:65
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 50 workouts"
msgstr "샘플 Workout"
-#: i18n.tpl:65
+#: i18n.tpl:66
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 100 workouts"
msgstr "샘플 Workout"
-#: i18n.tpl:66
+#: i18n.tpl:67
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 200 workouts"
msgstr "샘플 Workout"
-#: i18n.tpl:67
+#: i18n.tpl:68
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 500 workouts"
msgstr "샘플 Workout"
-#: i18n.tpl:68
+#: i18n.tpl:69
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 1000 workouts"
msgstr "샘플 Workout"
-#: i18n.tpl:69
+#: i18n.tpl:70
msgid "Maintain a 30-day workout streak"
msgstr ""
-#: i18n.tpl:70
+#: i18n.tpl:71
msgid "Work out on Saturday and Sunday for 4 consecutive weekends"
msgstr "토요일과 일요일에 4 연속 주말에 일하다"
-#: i18n.tpl:71
+#: i18n.tpl:72
msgid "Lift a cumulative total of 5.000 kg"
msgstr "5.000 kg의 누적 총을 들어 올리십시오"
-#: i18n.tpl:72
+#: i18n.tpl:73
msgid "Lift a cumulative total of 20.000 kg"
msgstr ""
-#: i18n.tpl:73
+#: i18n.tpl:74
msgid "Lift a cumulative total of 50.000 kg"
msgstr ""
-#: i18n.tpl:74
+#: i18n.tpl:75
msgid "Lift a cumulative total of 150.000 kg"
msgstr ""
-#: i18n.tpl:75
+#: i18n.tpl:76
msgid "Lift a cumulative total of 450.000 kg"
msgstr ""
-#: i18n.tpl:76
+#: i18n.tpl:77
msgid "Lift a cumulative total of 1.000.000 kg"
msgstr ""
-#: i18n.tpl:77
+#: i18n.tpl:78
msgid "Lift a cumulative total of 10.000.000 kg"
msgstr ""
-#: i18n.tpl:78
+#: i18n.tpl:79
msgid "Complete a workout before 6:00 AM"
msgstr ""
-#: i18n.tpl:79
+#: i18n.tpl:80
msgid "Complete a workout after 9:00 PM"
msgstr ""
-#: i18n.tpl:80
+#: i18n.tpl:81
#, fuzzy
#| msgid "Workout for %s"
msgid "Work out on January 1st"
msgstr "%s 를 위한 운동"
-#: i18n.tpl:81
+#: i18n.tpl:82
msgid "Return to training after being inactive for 30 days"
msgstr "30 일 동안 비활성 후 훈련에 반환"
-#: i18n.tpl:82
+#: i18n.tpl:83
msgid "Achieve a new Personal Record on any exercise"
msgstr "어떤 운동에 새로운 개인 기록 달성"
@@ -2017,7 +2049,7 @@ msgstr "예시"
msgid "Routine will expire soon"
msgstr "루틴이 곧 만료됩니다"
-#: manager/models/routine.py:153 manager/models/session.py:145
+#: manager/models/routine.py:154 manager/models/session.py:145
msgid "The start time cannot be after the end time."
msgstr "시작 시간은 종료 시간 이후일 수 없습니다."
@@ -2096,36 +2128,58 @@ msgstr "운동"
msgid "Workout for %s"
msgstr "%s 를 위한 운동"
-#: nutrition/forms.py:62
+#: nutrition/extract_info/off.py:72 nutrition/extract_info/off.py:91
+msgid "Serving"
+msgstr ""
+
+#: nutrition/forms.py:71 nutrition/forms.py:208
msgid "Unit"
msgstr "단위"
-#: nutrition/forms.py:170 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:179 nutrition/templates/rate/form.html:77
msgid "Basic caloric intake"
msgstr "기본 칼로리 섭취량"
-#: nutrition/forms.py:171
+#: nutrition/forms.py:180
msgid "Your basic caloric intake as calculated for your data"
msgstr "귀하의 데이터에 따라 계산된 기본 칼로리 섭취량"
-#: nutrition/forms.py:176
+#: nutrition/forms.py:185
msgid "Additional calories"
msgstr "추가적인 칼로리"
-#: nutrition/forms.py:178
+#: nutrition/forms.py:187
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
msgstr "기본에 추가할 칼로리 (빼려면 음수 입력)"
#: nutrition/forms.py:209
+msgid "grams (g)"
+msgstr ""
+
+#: nutrition/forms.py:219
msgid "Ingredient"
msgstr "성분"
-#: nutrition/forms.py:213
+#: nutrition/forms.py:223
msgid "Also search for names in English"
msgstr "영어 이름도 검색해 보세요"
+#: nutrition/forms.py:239
+msgid "Quantity"
+msgstr ""
+
+#: nutrition/forms.py:241
+msgid "Enter a quantity and choose grams (g) or one of the serving units."
+msgstr ""
+
+#: nutrition/models/ingredient.py:526
+#, fuzzy
+#| msgid "Correction"
+msgid "Portion"
+msgstr "보정"
+
#: nutrition/templates/ingredient/email_new.tpl:1
#, python-format
msgid ""
@@ -2173,59 +2227,92 @@ msgstr ""
"추가 완료 전까지는 개요 또는 검색에 표시되지 않습니다. \n"
"등록할 때 이메일을 추가한 경우, 성공적으로 완료되면 알림을 받습니다."
-#: nutrition/templates/ingredient/overview.html:38
+#: nutrition/templates/ingredient/overview.html:32
+#: nutrition/templates/ingredient/overview.html:68
+#: nutrition/templates/ingredient/view.html:143
+msgid "Vegan"
+msgstr ""
+
+#: nutrition/templates/ingredient/overview.html:34
+#: nutrition/templates/ingredient/overview.html:79
+#: nutrition/templates/ingredient/view.html:155
+#, fuzzy
+#| msgid "Variations"
+msgid "Vegetarian"
+msgstr "변형"
+
+#: nutrition/templates/ingredient/overview.html:43
msgid "No ingredients."
msgstr "성분이 없습니다."
-#: nutrition/templates/ingredient/overview.html:49
+#: nutrition/templates/ingredient/overview.html:54
msgid "Search"
msgstr "검색"
-#: nutrition/templates/ingredient/view.html:45 nutrition/views/plan.py:237
+#: nutrition/templates/ingredient/overview.html:57
+#, fuzzy
+#| msgid "No filter"
+msgid "Filter"
+msgstr "필터 없음"
+
+#: nutrition/templates/ingredient/overview.html:83
+msgid "Apply"
+msgstr ""
+
+#: nutrition/templates/ingredient/overview.html:85
+msgid "Reset"
+msgstr ""
+
+#: nutrition/templates/ingredient/view.html:46 nutrition/views/plan.py:236
msgid "Macronutrients"
msgstr "다량 영양소"
-#: nutrition/templates/ingredient/view.html:54
+#: nutrition/templates/ingredient/view.html:55
msgid "kJ"
msgstr "kJ"
-#: nutrition/templates/ingredient/view.html:70 nutrition/views/plan.py:267
+#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:266
msgid "Sugar content in carbohydrates"
msgstr "탄수화물의 당 함량"
-#: nutrition/templates/ingredient/view.html:75
-#: nutrition/templates/ingredient/view.html:91
-#: nutrition/templates/ingredient/view.html:113
-#: nutrition/templates/ingredient/view.html:123
+#: nutrition/templates/ingredient/view.html:76
+#: nutrition/templates/ingredient/view.html:92
+#: nutrition/templates/ingredient/view.html:114
+#: nutrition/templates/ingredient/view.html:124
msgid "n.A."
msgstr "n.A."
-#: nutrition/templates/ingredient/view.html:86 nutrition/views/plan.py:281
+#: nutrition/templates/ingredient/view.html:87 nutrition/views/plan.py:280
msgid "Saturated fat content in fats"
msgstr "지방의 포화지방 함량"
-#: nutrition/templates/ingredient/view.html:102
+#: nutrition/templates/ingredient/view.html:103
msgid "Others"
msgstr "기타"
-#: nutrition/templates/ingredient/view.html:108 nutrition/views/plan.py:287
+#: nutrition/templates/ingredient/view.html:109 nutrition/views/plan.py:286
msgid "Fiber"
msgstr "섬유질"
-#: nutrition/templates/ingredient/view.html:118 nutrition/views/plan.py:293
+#: nutrition/templates/ingredient/view.html:119 nutrition/views/plan.py:292
msgid "Sodium"
msgstr "나트륨"
-#: nutrition/templates/ingredient/view.html:143
-#: nutrition/templates/units/list.html:50 nutrition/views/unit.py:86
+#: nutrition/templates/ingredient/view.html:136
+#, fuzzy
+#| msgid "Date format"
+msgid "Dietary information"
+msgstr "날짜 포맷"
+
+#: nutrition/templates/ingredient/view.html:184
msgid "Add new weight unit"
msgstr "새로운 체중 단위 추가"
-#: nutrition/templates/rate/form.html:25
+#: nutrition/templates/rate/form.html:26
msgid "Basal metabolic rate"
msgstr "기초대사량"
-#: nutrition/templates/rate/form.html:26
+#: nutrition/templates/rate/form.html:27
msgid ""
"The basal metabolic rate is the amount of energy expended daily\n"
"at rest. This is the minimum energy needed for the body to function, without "
@@ -2236,15 +2323,15 @@ msgstr ""
"이는 추가적인 신체 활동 없이 신체가 기능하는 데 \n"
"필요한 최소 에너지입니다."
-#: nutrition/templates/rate/form.html:37
+#: nutrition/templates/rate/form.html:38
msgid "Your basic metabolic rate is: "
msgstr "기본 대사율은 다음과 같습니다: "
-#: nutrition/templates/rate/form.html:47
+#: nutrition/templates/rate/form.html:48
msgid "Physical activities"
msgstr "신체 활동"
-#: nutrition/templates/rate/form.html:48
+#: nutrition/templates/rate/form.html:49
msgid ""
"The physical activity level (PAL) is a factor used to to express\n"
"the additional physical activity and is used to calculate the total energy\n"
@@ -2254,11 +2341,11 @@ msgstr ""
"하루에 필요한 총 에너지를 계산하는 데\n"
"사용됩니다."
-#: nutrition/templates/rate/form.html:59
+#: nutrition/templates/rate/form.html:60
msgid "Factor for daily activities: "
msgstr "일상 활동 요소: "
-#: nutrition/templates/rate/form.html:67
+#: nutrition/templates/rate/form.html:68
msgid ""
"The base caloric intake is the amount of calories your metabolism\n"
"needs based on your level of physical activity."
@@ -2266,11 +2353,11 @@ msgstr ""
"기본 칼로리 섭취량은 신체 활동 수준에 따라 \n"
"신진대사에 필요한 칼로리 양입니다."
-#: nutrition/templates/rate/form.html:81
+#: nutrition/templates/rate/form.html:82
msgid "Calculate basic caloric intake"
msgstr "기본 칼로리 섭취량 계산"
-#: nutrition/templates/rate/form.html:88
+#: nutrition/templates/rate/form.html:89
msgid ""
"The total calories are the actual total calories per day. This\n"
"might include e.g. a surplus or deficit if you are bulking or cutting. "
@@ -2282,19 +2369,19 @@ msgstr ""
"는\n"
"칼로리 값을 알고 있다면 직접 입력할 수도 있습니다."
-#: nutrition/templates/rate/form.html:102
+#: nutrition/templates/rate/form.html:103
msgid "Transfer basic intake to total daily calories"
msgstr "기본 섭취량을 총 일일 칼로리로 전환"
-#: nutrition/templates/rate/form.html:106
+#: nutrition/templates/rate/form.html:107
msgid "Add additional calories to total daily calories"
msgstr "총 일일 칼로리에 추가 칼로리를 추가하세요"
-#: nutrition/templates/rate/form.html:110
+#: nutrition/templates/rate/form.html:111
msgid "Save total calories to profile"
msgstr "프로필에 총 칼로리 저장"
-#: nutrition/templates/rate/form.html:121
+#: nutrition/templates/rate/form.html:122
msgid ""
"Please note that these calculations can only be an\n"
"approximation. If you base your nutrition plan on these values, observe\n"
@@ -2304,48 +2391,48 @@ msgstr ""
"이 값을 기준으로 영양 계획을 세우는 경우, 몇 주 동안 자신의 상태를 관찰하고\n"
"필요에 따라 총량을 변경하세요."
-#: nutrition/views/ingredient.py:158
+#: nutrition/views/ingredient.py:163
msgid "Add a new ingredient"
msgstr "새로운 성분 추가"
-#: nutrition/views/plan.py:128
+#: nutrition/views/plan.py:127
msgid "Nutritional plan"
msgstr "영양 계획"
-#: nutrition/views/plan.py:130
+#: nutrition/views/plan.py:129
#, python-format
msgid "Nutritional plan for %s"
msgstr "%s의 영양 계획"
-#: nutrition/views/plan.py:202
+#: nutrition/views/plan.py:201
msgid "<i>This is an empty plan, what did you expect on the PDF?</i>"
msgstr "<i>이건 빈 계획인데, PDF에서 무엇을 기대하셨나요?</i>"
-#: nutrition/views/plan.py:230
+#: nutrition/views/plan.py:229
msgid "Nutritional data"
msgstr "영양 데이터"
-#: nutrition/views/plan.py:238
+#: nutrition/views/plan.py:237
msgid "Total"
msgstr "총"
-#: nutrition/views/plan.py:239
+#: nutrition/views/plan.py:238
msgid "Percent of energy"
msgstr "에너지 비율"
-#: nutrition/views/plan.py:240
+#: nutrition/views/plan.py:239
msgid "g per body kg"
msgstr "g 몸당 kg"
-#: nutrition/views/unit_ingredient.py:69
+#: nutrition/views/unit_ingredient.py:64
msgid "Add a new weight unit"
msgstr "새 무게 단위 추가"
-#: nutrition/views/unit_ingredient.py:106
+#: nutrition/views/unit_ingredient.py:99
msgid "Edit a weight unit to ingredient connection"
msgstr "무게 단위를 재료 연결에 맞게 편집하세요"
-#: nutrition/views/unit_ingredient.py:138
+#: nutrition/views/unit_ingredient.py:129
msgid "Delete?"
msgstr "삭제?"
@@ -2731,7 +2818,7 @@ msgstr "소스코드"
msgid "Translation"
msgstr "번역"
-#: utils/generic_views.py:263
+#: utils/generic_views.py:246
msgid "Yes, delete"
msgstr "예, 삭제합니다"
@@ -2784,10 +2871,6 @@ msgstr "체중을 입력해야 합니다"
msgid "Import weight logs"
msgstr "체중 기록 가져오기"
-#: weight/templates/import_csv_form.html:9
-msgid "Submit"
-msgstr "보내기"
-
#: weight/templates/import_csv_form.html:15
msgid ""
"Use this import field to import your weight logs into Workout\n"
@@ -2906,6 +2989,34 @@ msgstr ""
msgid "Re-Submit"
msgstr "다시 제출"
+#~ msgid "Email verification"
+#~ msgstr "이메일 인증 설정"
+
+#, python-format
+#~ msgid "%(username)s, your email was verified"
+#~ msgstr "%(username)s, 이메일 인증 완료"
+
+#~ msgid "Error, invalid verification token"
+#~ msgstr "오류, 유효하지 않은 검증 토큰입니다"
+
+#~ msgid "Email Confirmation"
+#~ msgstr "이메일 확인"
+
+#, python-format
+#~ msgid "You are almost there, %(username)s!"
+#~ msgstr "%(username)s!, 거의 다 왔어요!"
+
+#, python-format
+#~ msgid "Please click <a href=\"%(link)s\">here</a> to confirm your email"
+#~ msgstr "이메일 인증을 위해 <a href=\"%(link)s\">여기</a>를 클릭해 주세요"
+
+#, python-format
+#~ msgid "The token expires on %(time)s"
+#~ msgstr "%(time)s 후 인증토큰이 만료됨"
+
+#~ msgid "Ingredient weight units"
+#~ msgstr "몸무게 성분 단위"
+
#~ msgid "Image"
#~ msgstr "이미지"
@@ -2936,9 +3047,6 @@ msgstr "다시 제출"
#~ msgid "Secondary muscles"
#~ msgstr "이차 근육"
-#~ msgid "Variations"
-#~ msgstr "변형"
-
#~ msgid "Exercise Categories"
#~ msgstr "예시 카테고리"
@@ -3438,6 +3546,3 @@ msgstr "다시 제출"
#~ msgid "Last 12 months"
#~ msgstr "지난 12개월"
-
-#~ msgid "No filter"
-#~ msgstr "필터 없음"
diff --git a/wger/locale/nl/LC_MESSAGES/django.po b/wger/locale/nl/LC_MESSAGES/django.po
index b4a4dde9a..9f68f59e9 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: 2026-01-17 14:03+0000\n"
+"POT-Creation-Date: 2026-04-10 10:20+0000\n"
"PO-Revision-Date: 2025-12-20 11:00+0000\n"
"Last-Translator: Floris C <[email protected]>\n"
"Language-Team: Dutch <https://hosted.weblate.org/projects/wger/web/nl/>\n"
@@ -41,7 +41,7 @@ msgstr ""
#: config/views/gym_config.py:42 core/templates/language/view.html:64
#: core/templates/license/list.html:17
#: core/templates/repetition_unit/list.html:18
-#: core/templates/user/overview.html:204 core/templates/user/overview.html:467
+#: core/templates/user/overview.html:207 core/templates/user/overview.html:470
#: core/templates/weight_unit/list.html:18
#: exercises/templates/categories/admin-overview.html:17
#: exercises/templates/equipment/admin-overview.html:17
@@ -53,30 +53,29 @@ msgstr ""
#: gym/templates/gym/list.html:19 gym/templates/gym/list.html:48
#: gym/templates/gym/member_list.html:94 gym/templates/gym/member_list.html:152
#: gym/templates/gym/member_list.html:190
-#: nutrition/templates/ingredient/view.html:164
-#: nutrition/templates/ingredient/view.html:209
-#: nutrition/templates/units/list.html:19
+#: nutrition/templates/ingredient/view.html:205
+#: nutrition/templates/ingredient/view.html:248
msgid "Edit"
msgstr "Bewerk"
-#: core/forms.py:91 core/templates/navigation.html:271
-#: core/templates/navigation.html:278 core/templates/user/login.html:4
+#: core/forms.py:89 core/templates/navigation.html:268
+#: core/templates/navigation.html:275 core/templates/user/login.html:4
#: core/templates/user/registration_sidebar.html:12
#: software/templates/features.html:82 software/templates/features.html:448
msgid "Login"
msgstr "Aanmelden"
-#: core/forms.py:130 core/forms.py:244 gym/views/export.py:61
+#: core/forms.py:128 core/forms.py:242 gym/views/export.py:61
#: gym/views/gym.py:217
msgid "First name"
msgstr "Voornaam"
-#: core/forms.py:131 core/forms.py:245 core/templates/user/overview.html:284
+#: core/forms.py:129 core/forms.py:243 core/templates/user/overview.html:287
#: gym/views/export.py:62 gym/views/gym.py:217
msgid "Last name"
msgstr "Achternaam"
-#: core/forms.py:133 core/forms.py:210 core/templates/user/overview.html:288
+#: core/forms.py:131 core/forms.py:208 core/templates/user/overview.html:291
#: gym/models/contract.py:256 gym/models/gym.py:58
#: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:116
#: gym/templates/gym/new_user.html:30 gym/views/export.py:60
@@ -86,57 +85,57 @@ msgstr "Achternaam"
msgid "Email"
msgstr "E-mail"
-#: core/forms.py:134
+#: core/forms.py:132
msgid "Used for password resets and, optionally, e-mail reminders."
msgstr ""
"Gebruikt voor het opnieuw-instellen van wachtwoorden en, optioneel, e-"
"mailherinneringen."
-#: core/forms.py:138 core/models/profile.py:222
+#: core/forms.py:136 core/models/profile.py:222
#: gym/templates/gym/new_user.html:38
msgid "Date of Birth"
msgstr "Geboortedatum"
-#: core/forms.py:177
+#: core/forms.py:175
msgid "Personal data"
msgstr "Persoonlijke gegevens"
-#: core/forms.py:189
+#: core/forms.py:187
msgid "Workout reminders"
msgstr "Workout-herinneringen"
-#: core/forms.py:196
+#: core/forms.py:194
msgid "Other settings"
msgstr "Overige instellingen"
-#: core/forms.py:204 core/views/user.py:614 core/views/user.py:629
-#: core/views/user.py:641 gym/forms.py:73 utils/generic_views.py:143
+#: core/forms.py:202 core/views/user.py:630 core/views/user.py:654
+#: core/views/user.py:668 gym/forms.py:73 utils/generic_views.py:137
msgid "Save"
msgstr "Opslaan"
-#: core/forms.py:211
+#: core/forms.py:209
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:240
+#: core/forms.py:238
msgid "This e-mail address is already in use."
msgstr "Dit e-mailadres wordt al gebruikt."
-#: core/forms.py:261 gym/templates/gym/new_user.html:26
+#: core/forms.py:259 gym/templates/gym/new_user.html:26
#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:217
msgid "Password"
msgstr "Wachtwoord"
-#: core/forms.py:263
+#: core/forms.py:261
msgid "Please enter your current password."
msgstr "Gelieve je huidige wachtwoord in te geven."
-#: core/forms.py:272 core/templates/language/view.html:70
+#: core/forms.py:270 core/templates/language/view.html:70
#: core/templates/license/list.html:21
#: core/templates/repetition_unit/list.html:22
-#: core/templates/user/overview.html:233
+#: core/templates/user/overview.html:236
#: core/templates/weight_unit/list.html:22
#: exercises/templates/categories/admin-overview.html:21
#: exercises/templates/equipment/admin-overview.html:21
@@ -144,27 +143,30 @@ msgstr "Gelieve je huidige wachtwoord in te geven."
#: gym/templates/admin_notes/list.html:37
#: gym/templates/contract_option/list.html:35
#: gym/templates/contract_type/list.html:36 gym/templates/document/list.html:46
-#: gym/templates/gym/list.html:23 nutrition/templates/ingredient/view.html:168
-#: nutrition/templates/ingredient/view.html:215
-#: nutrition/templates/units/list.html:25
+#: gym/templates/gym/list.html:23 nutrition/templates/ingredient/view.html:209
+#: nutrition/templates/ingredient/view.html:254
msgid "Delete"
msgstr "Verwijder"
-#: core/forms.py:281
+#: core/forms.py:279
msgid "Invalid password"
msgstr "Ongeldig wachtwoord"
-#: core/forms.py:293
+#: core/forms.py:291 core/forms.py:349
msgid "The form is secured with reCAPTCHA"
msgstr "Dit formulier is beveiligd met reCAPTCHA"
-#: core/forms.py:314 core/forms.py:341 core/templates/navigation.html:272
-#: core/templates/navigation.html:285 core/templates/template.html:123
-#: core/templates/user/login.html:21 core/views/user.py:285
+#: core/forms.py:312 core/forms.py:339 core/templates/navigation.html:269
+#: core/templates/navigation.html:282 core/templates/template.html:113
+#: core/templates/user/login.html:21 core/views/user.py:293
#: software/templates/features.html:87 software/templates/features.html:442
msgid "Register"
msgstr "Registreer"
+#: core/forms.py:360 weight/templates/import_csv_form.html:9
+msgid "Submit"
+msgstr "Insturen"
+
#: core/models/language.py:31 core/templates/language/view.html:21
msgid "Language short name"
msgstr "Taal korte notatie"
@@ -202,36 +204,36 @@ msgstr "Link"
msgid "Link to license text or other information"
msgstr "Link naar licentietekst of andere informatie"
-#: core/models/profile.py:57
+#: core/models/profile.py:60
#, python-format
msgid "%(birthdate)s is not a valid birthdate"
msgstr "%(birthdate)sis geen geldige geboortedatum"
-#: core/models/profile.py:66
+#: core/models/profile.py:69
msgid "Male"
msgstr "Man"
-#: core/models/profile.py:67
+#: core/models/profile.py:70
msgid "Female"
msgstr "Vrouw"
-#: core/models/profile.py:74
+#: core/models/profile.py:77
msgid "Low"
msgstr "Laag"
-#: core/models/profile.py:75
+#: core/models/profile.py:78
msgid "Medium"
msgstr "Gemiddeld"
-#: core/models/profile.py:76
+#: core/models/profile.py:79
msgid "High"
msgstr "Hoog"
-#: core/models/profile.py:82
+#: core/models/profile.py:85
msgid "Metric (kilogram)"
msgstr "Metrisch (kilogram)"
-#: core/models/profile.py:83
+#: core/models/profile.py:86
msgid "Imperial (pound)"
msgstr "Imperiaal (pond)"
@@ -354,7 +356,7 @@ msgstr "Gemiddeld aantal uren per week"
msgid "Free time"
msgstr "Vrije tijd"
-#: core/models/profile.py:320 nutrition/templates/rate/form.html:66
+#: core/models/profile.py:320 nutrition/templates/rate/form.html:67
msgid "Total daily calories"
msgstr "Totale dagelijkse calorieën"
@@ -396,20 +398,45 @@ msgstr ""
msgid "Enable or disable the trophy system for this user"
msgstr ""
-#: core/models/profile.py:446
+#: core/models/profile.py:457
msgid "The sum of all hours has to be 24"
msgstr "Het toaal van alle uren moet 24 zijn"
-#: core/models/rep_unit.py:36 core/models/weight_unit.py:42
-#: core/templates/user/overview.html:280 core/views/user.py:589
+#: core/models/rep_unit.py:32 i18n.tpl:30
+msgid "Repetitions"
+msgstr "Herhalingen"
+
+#: core/models/rep_unit.py:33 core/templates/user/overview.html:82
+#: exercises/templates/history/overview.html:30
+msgid "Time"
+msgstr "Tijd"
+
+#: core/models/rep_unit.py:34
+#, fuzzy
+#| msgid "Resistance band"
+msgid "Distance"
+msgstr "Weerstandsband"
+
+#: core/models/rep_unit.py:47 core/models/weight_unit.py:42
+#: core/templates/user/overview.html:283 core/views/user.py:605
#: exercises/models/muscle.py:36 gym/models/contract.py:52
#: gym/models/contract.py:103 gym/models/gym.py:46
#: gym/models/user_document.py:84 gym/templates/contract/view.html:50
#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:108
-#: gym/views/gym.py:158 nutrition/templates/ingredient/view.html:151
+#: gym/views/gym.py:158 nutrition/templates/ingredient/view.html:192
msgid "Name"
msgstr "Naam"
+#: core/models/rep_unit.py:53
+#, fuzzy
+#| msgid "Unit"
+msgid "Unit Type"
+msgstr "Eenheid"
+
+#: core/models/rep_unit.py:54
+msgid "The type of unit (repetitions, time, or distance)"
+msgstr ""
+
#: core/templates/403.html:4
msgid "Forbidden!"
msgstr "Verboden!"
@@ -440,6 +467,55 @@ msgstr ""
"Als dat niet helpt, probeer het dan later nog eens. Als het probleem blijft "
"voorkomen, bezoek een van de onderstaande links:"
+#: core/templates/account/email/email_confirmation_message.html:81
+msgid "Almost there!"
+msgstr ""
+
+#: core/templates/account/email/email_confirmation_message.html:85
+#, fuzzy, python-format
+#| msgid ""
+#| "You're receiving this e-mail because you requested a password reset for "
+#| "your user account at %(site_name)s."
+msgid ""
+"You're receiving this email because the user \"%(user_display)s\" has given "
+"your email address to register an account on %(site_domain)s."
+msgstr ""
+"Je ontvangt deze e-mail omdat je een wachtwoord-reset voor je "
+"gebruikersaccount aanvroeg op %(site_name)s."
+
+#: core/templates/account/email/email_confirmation_message.html:93
+msgid ""
+"Your email verification code is listed below. Please enter it in your open "
+"browser window."
+msgstr ""
+
+#: core/templates/account/email/email_confirmation_message.html:100
+#, fuzzy
+#| msgid "Please click the following link to confirm your email: %(link)s"
+msgid "Please click the button below to confirm your email address."
+msgstr "Aub, klik op de volgende link om je email te bevestigen %(link)s"
+
+#: core/templates/account/email/email_confirmation_message.html:106
+#, fuzzy
+#| msgid "Unverified email"
+msgid "Confirm email"
+msgstr "Niet geverifieerde email"
+
+#: core/templates/account/email/email_confirmation_message.html:110
+#, python-format
+msgid ""
+"The link is valid for %(expire_hours)s hours (until %(date)s, %(time)s). You "
+"can request a new one from your profile settings."
+msgstr ""
+
+#: core/templates/account/email/email_confirmation_message.html:116
+msgid "If the button doesn't work, copy and paste this link into your browser:"
+msgstr ""
+
+#: core/templates/account/email/email_confirmation_message.html:125
+msgid "the wger Team"
+msgstr "het wger Team"
+
#: core/templates/base.html:10
#, python-format
msgid ""
@@ -475,51 +551,7 @@ msgstr ""
"Weet je zeker dit je d wil verwijderen? Deze actie kan niet ongedaan worden "
"gemaakt."
-#: core/templates/email_verification/confirm_template.html:4
-msgid "Email verification"
-msgstr "Email verificatie"
-
-#: core/templates/email_verification/confirm_template.html:18
-#, python-format
-msgid "%(username)s, your email was verified"
-msgstr "%(username)s, je email is geverifeerd"
-
-#: core/templates/email_verification/confirm_template.html:22
-msgid "Error, invalid verification token"
-msgstr "Foutmelding, foutieve verificatie token"
-
-#: core/templates/email_verification/email_body_html.tpl:6
-msgid "Email Confirmation"
-msgstr "Email Bevestiging"
-
-#: 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 "Je bent er bijna, %(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 "Klik <a href=\"%(link)s\">hier</a> om je e-mail te bevestigen"
-
-#: 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 "Het token verloopt op %(time)s"
-
-#: core/templates/email_verification/email_body_html.tpl:14
-#: core/templates/email_verification/email_body_txt.tpl:8
-msgid "the wger Team"
-msgstr "het wger Team"
-
-#: core/templates/email_verification/email_body_txt.tpl:4
-#, python-format
-msgid "Please click the following link to confirm your email: %(link)s"
-msgstr "Aub, klik op de volgende link om je email te bevestigen %(link)s"
-
-#: core/templates/language/overview.html:4 core/templates/navigation.html:344
+#: core/templates/language/overview.html:4 core/templates/navigation.html:341
msgid "Languages"
msgstr "Talen"
@@ -528,16 +560,16 @@ msgid "Nothing found."
msgstr "Niets gevonden."
#: core/templates/language/overview.html:22
-#: nutrition/templates/ingredient/overview.html:38
+#: nutrition/templates/ingredient/overview.html:43
msgid "Add one now."
msgstr "Voeg er een toe."
#: core/templates/language/overview.html:34 core/templates/license/list.html:43
-#: core/templates/repetition_unit/list.html:46
-#: core/templates/user/overview.html:344 core/templates/user/overview.html:384
-#: core/templates/user/overview.html:422
-#: core/templates/weight_unit/list.html:46 core/views/languages.py:74
-#: core/views/license.py:66 core/views/repetition_units.py:66
+#: core/templates/repetition_unit/list.html:44
+#: core/templates/user/overview.html:347 core/templates/user/overview.html:387
+#: core/templates/user/overview.html:425
+#: core/templates/weight_unit/list.html:46 core/views/languages.py:77
+#: core/views/license.py:66 core/views/repetition_units.py:76
#: core/views/weight_units.py:66
#: exercises/templates/categories/admin-overview.html:40
#: exercises/templates/equipment/admin-overview.html:39
@@ -550,14 +582,14 @@ msgstr "Voeg er een toe."
#: gym/templates/gym/member_list.html:264
#: gym/templates/gym/member_list.html:303
#: mailer/templates/mailer/gym/overview.html:43
-#: nutrition/templates/ingredient/overview.html:60
+#: nutrition/templates/ingredient/overview.html:97
msgid "Add"
msgstr "Toevoegen"
#: core/templates/language/view.html:61 core/templates/user/api_key.html:41
#: core/templates/user/preferences.html:50 gym/models/contract.py:203
#: gym/templates/contract/view.html:41 gym/templates/gym/member_list.html:270
-#: nutrition/templates/ingredient/view.html:206
+#: nutrition/templates/ingredient/view.html:245
msgid "Options"
msgstr "Opties"
@@ -567,9 +599,9 @@ msgstr "Licentielijst"
#: core/templates/license/list.html:30
#: core/templates/repetition_unit/list.html:32
-#: core/templates/user/overview.html:104 core/templates/user/overview.html:136
-#: core/templates/user/overview.html:185 core/templates/user/overview.html:365
-#: core/templates/user/overview.html:404 core/templates/user/overview.html:448
+#: core/templates/user/overview.html:107 core/templates/user/overview.html:139
+#: core/templates/user/overview.html:188 core/templates/user/overview.html:368
+#: core/templates/user/overview.html:407 core/templates/user/overview.html:451
#: core/templates/weight_unit/list.html:32
#: exercises/templates/categories/admin-overview.html:30
#: exercises/templates/equipment/admin-overview.html:30
@@ -581,11 +613,10 @@ msgstr "Licentielijst"
#: gym/templates/gym/member_list.html:284
#: gym/templates/gym/member_list.html:321
#: mailer/templates/mailer/gym/overview.html:30
-#: nutrition/templates/units/list.html:34
msgid "Nothing found"
msgstr "Niets gevonden"
-#: core/templates/misc/about.html:4 core/templates/template.html:160
+#: core/templates/misc/about.html:4 core/templates/template.html:150
msgid "Imprint"
msgstr "Afdruk"
@@ -593,162 +624,157 @@ msgstr "Afdruk"
msgid "Training"
msgstr "Training"
-#: core/templates/navigation.html:37 core/templates/user/overview.html:25
+#: core/templates/navigation.html:36 core/templates/user/overview.html:28
msgid "Routines"
msgstr "Routines"
-#: core/templates/navigation.html:45 core/templates/user/overview.html:70
+#: core/templates/navigation.html:44 core/templates/user/overview.html:73
msgid "Calendar"
msgstr "Kalender"
-#: core/templates/navigation.html:55
+#: core/templates/navigation.html:53
msgid "Measurements"
msgstr "Metingen"
-#: core/templates/navigation.html:66 gallery/templates/images/overview.html:6
+#: core/templates/navigation.html:64 gallery/templates/images/overview.html:6
msgid "Gallery"
msgstr "Gallerij"
-#: core/templates/navigation.html:72
+#: core/templates/navigation.html:74 core/templates/navigation.html:400
+#: trophies/templates/trophies/overview.html:7
+msgid "Trophies"
+msgstr ""
+
+#: core/templates/navigation.html:79
msgid "Workout templates"
msgstr "Training schema's"
-#: core/templates/navigation.html:79
+#: core/templates/navigation.html:86
msgid "Your templates"
msgstr "Je templates"
-#: core/templates/navigation.html:88
+#: core/templates/navigation.html:95
msgid "Public templates"
msgstr "Publieke schemas"
-#: core/templates/navigation.html:96 software/templates/features.html:51
+#: core/templates/navigation.html:103 software/templates/features.html:51
#: software/templates/features.html:480
msgid "Exercises"
msgstr "Oefeningen"
-#: core/templates/navigation.html:102 core/templates/navigation.html:176
-#: core/templates/navigation.html:339
+#: core/templates/navigation.html:109 core/templates/navigation.html:336
msgid "Administration"
msgstr "Administratie"
-#: core/templates/navigation.html:106
+#: core/templates/navigation.html:113
msgid "Exercise edit history"
msgstr "Oefening bewerkings historie"
-#: core/templates/navigation.html:112
+#: core/templates/navigation.html:119
msgid "Equipment"
msgstr "Materiaal"
-#: core/templates/navigation.html:118
+#: core/templates/navigation.html:125
msgid "Muscles"
msgstr "Spieren"
-#: core/templates/navigation.html:124
+#: core/templates/navigation.html:131
#: exercises/templates/categories/admin-overview.html:4
msgid "Categories"
msgstr "Categorieën"
-#: core/templates/navigation.html:139 software/templates/features.html:468
+#: core/templates/navigation.html:146 software/templates/features.html:468
msgid "Nutrition"
msgstr "Voeding"
-#: core/templates/navigation.html:147 core/templates/user/overview.html:144
+#: core/templates/navigation.html:154 core/templates/user/overview.html:147
msgid "Nutrition plans"
msgstr "Voedingsplannen"
-#: core/templates/navigation.html:156
+#: core/templates/navigation.html:163
msgid "BMI calculator"
msgstr "BMI-calculator"
-#: core/templates/navigation.html:165 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:172 nutrition/templates/rate/form.html:18
msgid "Daily calories calculator"
msgstr "Dagelijkse calorieëncalculator"
-#: core/templates/navigation.html:171
+#: core/templates/navigation.html:178
#: nutrition/templates/ingredient/overview.html:10
msgid "Ingredient overview"
msgstr "Ingrediëntenoverzicht"
-#: core/templates/navigation.html:180 nutrition/templates/units/list.html:6
-msgid "Ingredient weight units"
-msgstr "Gewichteenheden ingrediënt"
-
-#: core/templates/navigation.html:196 software/templates/features.html:463
+#: core/templates/navigation.html:193 software/templates/features.html:463
msgid "Body weight"
msgstr "Lichaamsgewicht"
-#: core/templates/navigation.html:203 core/templates/user/overview.html:114
+#: core/templates/navigation.html:200 core/templates/user/overview.html:117
msgid "Weight overview"
msgstr "Gewichtsoverzicht"
-#: core/templates/navigation.html:217
+#: core/templates/navigation.html:214
msgid "About this software"
msgstr "Over deze software"
-#: core/templates/navigation.html:223 software/templates/about_us.html:5
+#: core/templates/navigation.html:220 software/templates/about_us.html:5
msgid "Support & Get Involved"
msgstr "Help & doe mee"
-#: core/templates/navigation.html:229 software/templates/features.html:528
+#: core/templates/navigation.html:226 software/templates/features.html:528
msgid "REST API"
msgstr "REST API"
-#: core/templates/navigation.html:235 utils/models.py:45
+#: core/templates/navigation.html:232 utils/models.py:45
msgid "License"
msgstr "Licentie"
-#: core/templates/navigation.html:241
+#: core/templates/navigation.html:238
msgid "Developer documentation"
msgstr "Developer documentatie"
-#: core/templates/navigation.html:248
+#: core/templates/navigation.html:245
msgid "Get the code"
msgstr "Download de code"
-#: core/templates/navigation.html:255 core/templates/template.html:199
-#: software/templates/features.html:603
+#: core/templates/navigation.html:252 core/templates/template.html:202
+#: software/templates/features.html:614
msgid "Translate"
msgstr "Vertaal"
-#: core/templates/navigation.html:292 core/templates/user/login.html:30
+#: core/templates/navigation.html:289 core/templates/user/login.html:30
msgid "Reset password"
msgstr "Reset wachtwoord"
-#: core/templates/navigation.html:301 core/templates/navigation.html:329
+#: core/templates/navigation.html:298 core/templates/navigation.html:326
msgid "Logout"
msgstr "Afmelden"
-#: core/templates/navigation.html:320
+#: core/templates/navigation.html:317
msgid "My preferences"
msgstr "Mijn voorkeuren"
-#: core/templates/navigation.html:352
+#: core/templates/navigation.html:349
msgid "Licenses"
msgstr "Licenties"
-#: core/templates/navigation.html:360
+#: core/templates/navigation.html:357
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr "Herhalingen"
-#: core/templates/navigation.html:368 core/templates/weight_unit/list.html:4
-#: nutrition/templates/ingredient/view.html:141
+#: core/templates/navigation.html:365 core/templates/weight_unit/list.html:4
+#: nutrition/templates/ingredient/view.html:182
msgid "Weight units"
msgstr "Gewichteenheden"
-#: core/templates/navigation.html:376 core/templates/user/list.html:4
+#: core/templates/navigation.html:373 core/templates/user/list.html:4
msgid "User list"
msgstr "Gebruikerslijst"
-#: core/templates/navigation.html:382
+#: core/templates/navigation.html:379
msgid "Gyms"
msgstr "Gyms"
-#: core/templates/navigation.html:403
-#: trophies/templates/trophies/overview.html:7
-msgid "Trophies"
-msgstr ""
-
#: core/templates/registration/password_reset_complete.html:4
msgid "Password reset complete"
msgstr "Wachtwoord-reset voltooid"
@@ -809,26 +835,30 @@ msgstr "vorige"
msgid "next"
msgstr "volgende"
-#: core/templates/template.html:96
+#: core/templates/template.html:86
msgid "Close"
msgstr "Sluit"
-#: core/templates/template.html:112
+#: core/templates/template.html:102
msgid ""
"You are using a guest account, data entered will be deleted after a week."
msgstr ""
"Je gebruikt een gastaccount, ingevoerde data wordt verwijderd na een week."
-#: core/templates/template.html:117
+#: core/templates/template.html:107
msgid "Create some demo entries"
msgstr "Maak wat demo-ingaven aan"
-#: core/templates/template.html:165 software/templates/features.html:568
+#: core/templates/template.html:155 software/templates/features.html:568
#: software/templates/tos.html:7
msgid "Terms of service"
msgstr "Algemene voorwaarden"
-#: core/templates/template_features.html:53 software/templates/features.html:9
+#: core/templates/template.html:181 software/templates/features.html:595
+msgid "Browser language"
+msgstr ""
+
+#: core/templates/template_features.html:46 software/templates/features.html:9
msgid "Features"
msgstr "Functies"
@@ -885,99 +915,94 @@ msgstr "Geen account?"
msgid "Forgot password?"
msgstr "Wachtwoord vergeten?"
-#: core/templates/user/overview.html:25 core/templates/user/overview.html:68
-#: core/templates/user/overview.html:112 core/templates/user/overview.html:144
-#: core/templates/user/overview.html:348 core/templates/user/overview.html:390
-#: core/templates/user/overview.html:426
+#: core/templates/user/overview.html:28 core/templates/user/overview.html:71
+#: core/templates/user/overview.html:115 core/templates/user/overview.html:147
+#: core/templates/user/overview.html:351 core/templates/user/overview.html:393
+#: core/templates/user/overview.html:429
#, python-format
msgid "last %(number)s"
msgstr "laatste %(number)s"
-#: core/templates/user/overview.html:27 core/templates/user/overview.html:146
-#: core/templates/user/overview.html:343 core/templates/user/overview.html:382
-#: core/templates/user/overview.html:421 gym/templates/gym/member_list.html:226
+#: core/templates/user/overview.html:30 core/templates/user/overview.html:149
+#: core/templates/user/overview.html:346 core/templates/user/overview.html:385
+#: core/templates/user/overview.html:424 gym/templates/gym/member_list.html:226
#: gym/templates/gym/member_list.html:262
#: gym/templates/gym/member_list.html:302
msgid "Overview"
msgstr "Overzicht"
-#: core/templates/user/overview.html:34 core/templates/user/overview.html:76
-#: core/templates/user/overview.html:120 core/templates/user/overview.html:152
+#: core/templates/user/overview.html:37 core/templates/user/overview.html:79
+#: core/templates/user/overview.html:123 core/templates/user/overview.html:155
#: manager/helpers.py:88 software/templates/about_us.html:170
#: weight/templates/import_csv_preview.html:13
#: weight/templates/import_csv_preview.html:42 weight/views.py:54
msgid "Date"
msgstr "Datum"
-#: core/templates/user/overview.html:35 core/templates/user/overview.html:153
+#: core/templates/user/overview.html:38 core/templates/user/overview.html:156
#: gym/models/contract.py:58 gym/models/contract.py:109
msgid "Description"
msgstr "Beschrijving"
-#: core/templates/user/overview.html:36
+#: core/templates/user/overview.html:39
msgid "Number of logs (days)"
msgstr "Aantal logs (dagen)"
-#: core/templates/user/overview.html:37 core/views/user.py:590
+#: core/templates/user/overview.html:40 core/views/user.py:606
#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:158
msgid "Last activity"
msgstr "Laatste activiteit"
-#: core/templates/user/overview.html:58
+#: core/templates/user/overview.html:61
msgid "No workouts found."
msgstr "Geen workouts gevonden."
-#: core/templates/user/overview.html:68
+#: core/templates/user/overview.html:71
msgid "Log"
msgstr "Log"
-#: core/templates/user/overview.html:77
+#: core/templates/user/overview.html:80
msgid "General impression"
msgstr "Algemene indruk"
-#: core/templates/user/overview.html:78 core/templates/user/overview.html:390
+#: core/templates/user/overview.html:81 core/templates/user/overview.html:393
msgid "Notes"
msgstr "Notities"
-#: core/templates/user/overview.html:79
-#: exercises/templates/history/overview.html:30
-msgid "Time"
-msgstr "Tijd"
-
-#: core/templates/user/overview.html:112 core/templates/user/overview.html:121
+#: core/templates/user/overview.html:115 core/templates/user/overview.html:124
#: manager/helpers.py:89 weight/templates/import_csv_preview.html:14
#: weight/templates/import_csv_preview.html:43 weight/views.py:54
msgid "Weight"
msgstr "Gewicht"
-#: core/templates/user/overview.html:154
-#: nutrition/templates/ingredient/view.html:51 nutrition/views/plan.py:245
+#: core/templates/user/overview.html:157
+#: nutrition/templates/ingredient/view.html:52 nutrition/views/plan.py:244
msgid "Energy"
msgstr "Energie"
-#: core/templates/user/overview.html:155
-#: nutrition/templates/ingredient/view.html:58 nutrition/views/plan.py:251
+#: core/templates/user/overview.html:158
+#: nutrition/templates/ingredient/view.html:59 nutrition/views/plan.py:250
msgid "Protein"
msgstr "Proteïnen"
-#: core/templates/user/overview.html:156
-#: nutrition/templates/ingredient/view.html:64 nutrition/views/plan.py:259
+#: core/templates/user/overview.html:159
+#: nutrition/templates/ingredient/view.html:65 nutrition/views/plan.py:258
msgid "Carbohydrates"
msgstr "Koolhydraten"
-#: core/templates/user/overview.html:157
-#: nutrition/templates/ingredient/view.html:80 nutrition/views/plan.py:273
+#: core/templates/user/overview.html:160
+#: nutrition/templates/ingredient/view.html:81 nutrition/views/plan.py:272
msgid "Fat"
msgstr "Vet"
-#: core/templates/user/overview.html:170
-#: nutrition/templates/ingredient/view.html:53
+#: core/templates/user/overview.html:173
+#: nutrition/templates/ingredient/view.html:54
msgid "kcal"
msgstr "kcal"
-#: core/templates/user/overview.html:201 core/templates/user/overview.html:340
-#: core/templates/user/overview.html:379 core/templates/user/overview.html:418
-#: core/templates/user/overview.html:463 gym/templates/gym/list.html:45
+#: core/templates/user/overview.html:204 core/templates/user/overview.html:343
+#: core/templates/user/overview.html:382 core/templates/user/overview.html:421
+#: core/templates/user/overview.html:466 gym/templates/gym/list.html:45
#: gym/templates/gym/member_list.html:91 gym/templates/gym/member_list.html:149
#: gym/templates/gym/member_list.html:187
#: gym/templates/gym/member_list.html:223
@@ -986,109 +1011,113 @@ msgstr "kcal"
msgid "Actions"
msgstr "Acties"
-#: core/templates/user/overview.html:210
+#: core/templates/user/overview.html:213
msgid "Deactivate user"
msgstr "Gebruiker deactiveren"
-#: core/templates/user/overview.html:214
+#: core/templates/user/overview.html:217
msgid "Activate user"
msgstr "Activeer gebruiker"
-#: core/templates/user/overview.html:223
+#: core/templates/user/overview.html:226
msgid "Reset user password"
msgstr "Reset gebruikers wachtwoord"
-#: core/templates/user/overview.html:227 gym/templates/gym/member_list.html:30
+#: core/templates/user/overview.html:230 gym/templates/gym/member_list.html:30
msgid "Roles"
msgstr "Rollen"
-#: core/templates/user/overview.html:243
+#: core/templates/user/overview.html:246
msgid "Password reset confirmation"
msgstr "Bevestiging wachtwoord-reset"
-#: core/templates/user/overview.html:247
+#: core/templates/user/overview.html:250
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:250
+#: core/templates/user/overview.html:253
#: exercises/templates/history/overview.html:106
+#: nutrition/templates/ingredient/view.html:148
+#: nutrition/templates/ingredient/view.html:160
msgid "No"
msgstr "Nee"
-#: core/templates/user/overview.html:251
+#: core/templates/user/overview.html:254
#: exercises/templates/history/overview.html:99
+#: nutrition/templates/ingredient/view.html:146
+#: nutrition/templates/ingredient/view.html:158
msgid "Yes"
msgstr "Ja"
-#: core/templates/user/overview.html:272 gym/templates/gym/member_list.html:105
+#: core/templates/user/overview.html:275 gym/templates/gym/member_list.html:105
msgid "Details"
msgstr "Details"
-#: core/templates/user/overview.html:276 gym/views/export.py:57
-#: manager/helpers.py:89 nutrition/views/plan.py:151
-#: nutrition/views/plan.py:157
+#: core/templates/user/overview.html:279 gym/views/export.py:57
+#: manager/helpers.py:89 nutrition/views/plan.py:150
+#: nutrition/views/plan.py:156
msgid "Nr."
msgstr "Nr."
-#: core/templates/user/overview.html:298 gym/models/contract.py:287
+#: core/templates/user/overview.html:301 gym/models/contract.py:287
#: gym/models/gym.py:50 gym/templates/contract/view.html:75
#: gym/templates/gym/member_list.html:112 gym/views/export.py:68
msgid "Phone"
msgstr "Telefoon"
-#: core/templates/user/overview.html:302 gym/templates/contract/view.html:87
+#: core/templates/user/overview.html:305 gym/templates/contract/view.html:87
#: gym/templates/gym/member_list.html:130
msgid "Address"
msgstr "Adres"
-#: core/templates/user/overview.html:313
+#: core/templates/user/overview.html:316
msgid "Registered"
msgstr "Geregistreerd"
-#: core/templates/user/overview.html:317
+#: core/templates/user/overview.html:320
msgid "Last login"
msgstr "Laatste aanmelding"
-#: core/templates/user/overview.html:322
+#: core/templates/user/overview.html:325
msgid "Status"
msgstr "Status"
-#: core/templates/user/overview.html:325
+#: core/templates/user/overview.html:328
msgid "Active"
msgstr "Actief"
-#: core/templates/user/overview.html:327
+#: core/templates/user/overview.html:330
msgid "Inactive"
msgstr "Inactief"
-#: core/templates/user/overview.html:348 gym/templates/contract/list.html:4
+#: core/templates/user/overview.html:351 gym/templates/contract/list.html:4
#: gym/templates/gym/member_list.html:218
msgid "Contracts"
msgstr "Contracten"
-#: core/templates/user/overview.html:426 gym/templates/document/list.html:4
+#: core/templates/user/overview.html:429 gym/templates/document/list.html:4
msgid "Documents"
msgstr "Documenten"
-#: core/templates/user/overview.html:433 gym/templates/document/list.html:33
+#: core/templates/user/overview.html:436 gym/templates/document/list.html:33
msgid "Download"
msgstr "Download"
-#: core/templates/user/overview.html:474 gym/views/admin_config.py:44
+#: core/templates/user/overview.html:477 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:477 gym/models/user_config.py:92
+#: core/templates/user/overview.html:480 gym/models/user_config.py:92
msgid "Include in inactive overview"
msgstr "Opnemen in inactief overzicht"
-#: core/templates/user/overview.html:510
+#: core/templates/user/overview.html:513
#, python-format
msgid "Admin login is only available for users in %(gym_name)s"
msgstr "Admin login is alleen beschikbaar voor gebruikers %(gym_name)s"
-#: core/templates/user/overview.html:514
+#: core/templates/user/overview.html:517
msgid "Log in as this user"
msgstr "Aanmelden als deze gebruiker"
@@ -1112,7 +1141,7 @@ msgstr "Verzend verificatie email"
msgid "You need to verify your email to contribute exercises"
msgstr "Je moet jouw email nog bevestigen om oefeningen te plaatsen"
-#: core/templates/user/preferences.html:55 core/views/user.py:601
+#: core/templates/user/preferences.html:55 core/views/user.py:617
msgid "Change password"
msgstr "Verander wachtwoord"
@@ -1120,23 +1149,23 @@ msgstr "Verander wachtwoord"
msgid "Already have an account?"
msgstr ""
-#: core/templatetags/wger_extras.py:142 i18n.tpl:38
+#: core/templatetags/wger_extras.py:142 i18n.tpl:39
msgid "kg"
msgstr "kg"
#: core/templatetags/wger_extras.py:144
-#: nutrition/templates/ingredient/view.html:60
-#: nutrition/templates/ingredient/view.html:66
-#: nutrition/templates/ingredient/view.html:73
-#: nutrition/templates/ingredient/view.html:82
-#: nutrition/templates/ingredient/view.html:89
-#: nutrition/templates/ingredient/view.html:111
-#: nutrition/templates/ingredient/view.html:121
+#: nutrition/templates/ingredient/view.html:61
+#: nutrition/templates/ingredient/view.html:67
+#: nutrition/templates/ingredient/view.html:74
+#: nutrition/templates/ingredient/view.html:83
+#: nutrition/templates/ingredient/view.html:90
+#: nutrition/templates/ingredient/view.html:112
+#: nutrition/templates/ingredient/view.html:122
msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr "g"
-#: core/templatetags/wger_extras.py:147 i18n.tpl:39
+#: core/templatetags/wger_extras.py:147 i18n.tpl:40
msgid "lb"
msgstr "lb"
@@ -1145,36 +1174,35 @@ msgctxt "weight unit, i.e. ounces"
msgid "oz"
msgstr "oz"
-#: core/views/languages.py:85 exercises/views/categories.py:122
+#: core/views/languages.py:88 exercises/views/categories.py:122
#: exercises/views/equipment.py:103 exercises/views/muscles.py:99
-#: nutrition/views/ingredient.py:120 nutrition/views/unit.py:110
+#: nutrition/views/ingredient.py:125
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
+#: core/views/languages.py:96 core/views/license.py:103
+#: core/views/repetition_units.py:114 core/views/weight_units.py:115
#: exercises/views/categories.py:128 exercises/views/muscles.py:106
#: gallery/views/images.py:124 gym/views/admin_notes.py:196
#: gym/views/document.py:206 gym/views/gym.py:481
-#: nutrition/views/ingredient.py:127 nutrition/views/unit.py:117
+#: nutrition/views/ingredient.py:132
#, python-brace-format
msgid "Delete {0}?"
msgstr "Verwijder {0}?"
-#: core/views/languages.py:111 core/views/license.py:85
-#: core/views/repetition_units.py:86 core/views/user.py:464
+#: core/views/languages.py:114 core/views/license.py:85
+#: core/views/repetition_units.py:96 core/views/user.py:480
#: core/views/weight_units.py:86 exercises/views/categories.py:98
#: exercises/views/equipment.py:81 exercises/views/muscles.py:87
#: gym/views/admin_notes.py:161 gym/views/config.py:68
#: gym/views/contract.py:186 gym/views/contract_option.py:123
#: gym/views/contract_type.py:123 gym/views/document.py:171
-#: gym/views/gym.py:463 nutrition/views/ingredient.py:146
-#: nutrition/views/unit.py:143
+#: gym/views/gym.py:463 nutrition/views/ingredient.py:151
#, python-brace-format
msgid "Edit {0}"
msgstr "Bewerk {0}"
-#: core/views/misc.py:74
+#: core/views/misc.py:73
msgid ""
"We have created sample workout, workout schedules, weight logs, (body) "
"weight and nutrition plan entries so you can better see what this site can "
@@ -1184,48 +1212,48 @@ msgstr ""
"(lichaam)gewicht en voedingsplannen aangemaakt zodat je beter kan zien wat "
"deze site allemaal kan. Voel je vrij om ze te bewerken of verwijderen!"
-#: core/views/user.py:143
+#: core/views/user.py:145
#, python-brace-format
msgid "Account \"{0}\" was successfully deleted"
msgstr "Account \"{0}\" werd met succes verwijderd"
-#: core/views/user.py:279
+#: core/views/user.py:287
msgid "You were successfully registered"
msgstr "Je bent met succes geregistreerd"
-#: core/views/user.py:341
+#: core/views/user.py:357
msgid "Settings successfully updated"
msgstr "Instellingen met succes aangepast"
-#: core/views/user.py:380
+#: core/views/user.py:396
msgid "The user was successfully deactivated"
msgstr "De gebruiker werd met succes gedeactiveerd"
-#: core/views/user.py:417
+#: core/views/user.py:433
msgid "The user was successfully activated"
msgstr "De gebruiker werd met succes geactiveerd"
-#: core/views/user.py:432
+#: core/views/user.py:448
msgid "Edit user"
msgstr "Bewerk gebruiker"
-#: core/views/user.py:587 gym/templates/gym/member_list.html:26
+#: core/views/user.py:603 gym/templates/gym/member_list.html:26
#: gym/views/gym.py:158
msgid "ID"
msgstr "ID"
-#: core/views/user.py:588 gym/forms.py:95 gym/templates/contract/view.html:55
+#: core/views/user.py:604 gym/forms.py:95 gym/templates/contract/view.html:55
#: gym/templates/gym/member_list.html:27 gym/views/export.py:59
#: gym/views/gym.py:158 gym/views/gym.py:217
msgid "Username"
msgstr "Gebruikersnaam"
-#: core/views/user.py:591 gym/templates/gym/new_user.html:34
+#: core/views/user.py:607 gym/templates/gym/new_user.html:34
#: gym/views/export.py:58 gym/views/gym.py:217
msgid "Gym"
msgstr "Gym"
-#: core/views/user.py:650
+#: core/views/user.py:678
#, python-format
msgid "A verification email was sent to %(email)s"
msgstr "Een verificatie email is verstuurd naar %(email)s"
@@ -1242,16 +1270,16 @@ msgstr "Alternatieve naam"
msgid "A more basic name for the muscle"
msgstr "Een vereenvoudigde naam voor de spier"
-#: exercises/models/video.py:50
+#: exercises/models/video.py:52
#, python-format
msgid "Maximum file size is %(size)sMB."
msgstr "Maximale bestandsgrootte is %(size)sMB."
-#: exercises/models/video.py:57 exercises/models/video.py:65
+#: exercises/models/video.py:59 exercises/models/video.py:67
msgid "File type is not supported"
msgstr "Bestandstype wordt niet ondersteund"
-#: exercises/models/video.py:70
+#: exercises/models/video.py:72
msgid "File is not a valid video"
msgstr "Bestand is geen geldige video"
@@ -1322,7 +1350,11 @@ msgstr "Materiaal verwijderen?"
msgid "Add muscle"
msgstr "Creëer spier"
-#: gallery/templates/images/overview.html:72
+#: gallery/forms.py:35
+msgid "If date is left empty, it will be read from the image instead"
+msgstr ""
+
+#: gallery/templates/images/overview.html:69
msgid "Add image"
msgstr "Voeg afbeelding toe"
@@ -1389,7 +1421,7 @@ msgid "Contract type"
msgstr "Contracttype"
#: gym/models/contract.py:211 gym/templates/contract/view.html:59
-#: nutrition/forms.py:58
+#: nutrition/forms.py:67
msgid "Amount"
msgstr "Hoeveelheid"
@@ -1567,7 +1599,7 @@ msgstr "E-mails"
msgid "Add member"
msgstr "Lid toevoegen"
-#: gym/templates/gym/new_user.html:48 nutrition/templates/rate/form.html:120
+#: gym/templates/gym/new_user.html:48 nutrition/templates/rate/form.html:121
msgid "Info"
msgstr "Info"
@@ -1740,10 +1772,6 @@ msgstr "Optrekstaaf"
msgid "Quads"
msgstr "Quads"
-#: i18n.tpl:30
-msgid "Repetitions"
-msgstr "Herhalingen"
-
#: i18n.tpl:31
msgid "Resistance band"
msgstr "Weerstandsband"
@@ -1772,198 +1800,204 @@ msgstr "Triceps"
msgid "Until Failure"
msgstr "Tot je faalt"
-#: i18n.tpl:40
+#: i18n.tpl:38
+#, fuzzy
+#| msgid "Kilometers"
+msgid "Meters"
+msgstr "Kilometer"
+
+#: i18n.tpl:41
msgid "none (bodyweight exercise)"
msgstr "Geen (oefening met lichaamsgewicht)"
-#: i18n.tpl:41
+#: i18n.tpl:42
msgid "Beginner"
msgstr ""
-#: i18n.tpl:42
+#: i18n.tpl:43
#, fuzzy
#| msgctxt "As in \"content of an email\""
#| msgid "Content"
msgid "Consistent"
msgstr "Inhoud"
-#: i18n.tpl:43
+#: i18n.tpl:44
msgid "Dedicated"
msgstr ""
-#: i18n.tpl:44
+#: i18n.tpl:45
msgid "Obsessed"
msgstr ""
-#: i18n.tpl:45
+#: i18n.tpl:46
msgid "Legend"
msgstr "Legende"
-#: i18n.tpl:46
+#: i18n.tpl:47
msgid "Veteran"
msgstr ""
-#: i18n.tpl:47
+#: i18n.tpl:48
msgid "Titan"
msgstr ""
-#: i18n.tpl:48
+#: i18n.tpl:49
msgid "Unstoppable"
msgstr ""
-#: i18n.tpl:49
+#: i18n.tpl:50
msgid "Weekend Warrior"
msgstr ""
-#: i18n.tpl:50
+#: i18n.tpl:51
msgid "Elephant lifter"
msgstr ""
-#: i18n.tpl:51
+#: i18n.tpl:52
msgid "Bus lifter"
msgstr ""
-#: i18n.tpl:52
+#: i18n.tpl:53
msgid "Plane lifter"
msgstr ""
-#: i18n.tpl:53
+#: i18n.tpl:54
msgid "Blue whale lifter"
msgstr ""
-#: i18n.tpl:54
+#: i18n.tpl:55
msgid "Space Station lifter"
msgstr ""
-#: i18n.tpl:55
+#: i18n.tpl:56
msgid "Millionaire"
msgstr ""
-#: i18n.tpl:56
+#: i18n.tpl:57
msgid "Atlas"
msgstr ""
-#: i18n.tpl:57
+#: i18n.tpl:58
msgid "Early Bird"
msgstr ""
-#: i18n.tpl:58
+#: i18n.tpl:59
#, fuzzy
#| msgid "Weight log"
msgid "Night Owl"
msgstr "Gewichtlog"
-#: i18n.tpl:59
+#: i18n.tpl:60
msgid "New Year, New Me"
msgstr ""
-#: i18n.tpl:60
+#: i18n.tpl:61
msgid "Phoenix"
msgstr ""
-#: i18n.tpl:61
+#: i18n.tpl:62
#, fuzzy
#| msgid "Personal data"
msgid "Personal Record"
msgstr "Persoonlijke gegevens"
-#: i18n.tpl:62
+#: i18n.tpl:63
#, fuzzy
#| msgid "Copy workout"
msgid "Complete your first workout"
msgstr "Kopieer workout"
-#: i18n.tpl:63
+#: i18n.tpl:64
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 10 workouts"
msgstr "Voorbeeldworkout"
-#: i18n.tpl:64
+#: i18n.tpl:65
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 50 workouts"
msgstr "Voorbeeldworkout"
-#: i18n.tpl:65
+#: i18n.tpl:66
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 100 workouts"
msgstr "Voorbeeldworkout"
-#: i18n.tpl:66
+#: i18n.tpl:67
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 200 workouts"
msgstr "Voorbeeldworkout"
-#: i18n.tpl:67
+#: i18n.tpl:68
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 500 workouts"
msgstr "Voorbeeldworkout"
-#: i18n.tpl:68
+#: i18n.tpl:69
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 1000 workouts"
msgstr "Voorbeeldworkout"
-#: i18n.tpl:69
+#: i18n.tpl:70
msgid "Maintain a 30-day workout streak"
msgstr ""
-#: i18n.tpl:70
+#: i18n.tpl:71
msgid "Work out on Saturday and Sunday for 4 consecutive weekends"
msgstr ""
-#: i18n.tpl:71
+#: i18n.tpl:72
msgid "Lift a cumulative total of 5.000 kg"
msgstr ""
-#: i18n.tpl:72
+#: i18n.tpl:73
msgid "Lift a cumulative total of 20.000 kg"
msgstr ""
-#: i18n.tpl:73
+#: i18n.tpl:74
msgid "Lift a cumulative total of 50.000 kg"
msgstr ""
-#: i18n.tpl:74
+#: i18n.tpl:75
msgid "Lift a cumulative total of 150.000 kg"
msgstr ""
-#: i18n.tpl:75
+#: i18n.tpl:76
msgid "Lift a cumulative total of 450.000 kg"
msgstr ""
-#: i18n.tpl:76
+#: i18n.tpl:77
msgid "Lift a cumulative total of 1.000.000 kg"
msgstr ""
-#: i18n.tpl:77
+#: i18n.tpl:78
msgid "Lift a cumulative total of 10.000.000 kg"
msgstr ""
-#: i18n.tpl:78
+#: i18n.tpl:79
msgid "Complete a workout before 6:00 AM"
msgstr ""
-#: i18n.tpl:79
+#: i18n.tpl:80
msgid "Complete a workout after 9:00 PM"
msgstr ""
-#: i18n.tpl:80
+#: i18n.tpl:81
#, fuzzy
#| msgid "Workout for %s"
msgid "Work out on January 1st"
msgstr "Workout voor %s"
-#: i18n.tpl:81
+#: i18n.tpl:82
msgid "Return to training after being inactive for 30 days"
msgstr ""
-#: i18n.tpl:82
+#: i18n.tpl:83
msgid "Achieve a new Personal Record on any exercise"
msgstr ""
@@ -2047,7 +2081,7 @@ msgstr "Oefening"
msgid "Routine will expire soon"
msgstr "Routine zal spoedig vervallen"
-#: manager/models/routine.py:153 manager/models/session.py:145
+#: manager/models/routine.py:154 manager/models/session.py:145
msgid "The start time cannot be after the end time."
msgstr "De startijd kan niet na de eindtijd liggen."
@@ -2130,23 +2164,27 @@ msgstr "Workout"
msgid "Workout for %s"
msgstr "Workout voor %s"
-#: nutrition/forms.py:62
+#: nutrition/extract_info/off.py:72 nutrition/extract_info/off.py:91
+msgid "Serving"
+msgstr ""
+
+#: nutrition/forms.py:71 nutrition/forms.py:208
msgid "Unit"
msgstr "Eenheid"
-#: nutrition/forms.py:170 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:179 nutrition/templates/rate/form.html:77
msgid "Basic caloric intake"
msgstr "Basis calorie-inname"
-#: nutrition/forms.py:171
+#: nutrition/forms.py:180
msgid "Your basic caloric intake as calculated for your data"
msgstr "Je basis calorie-inname zoals berekend voor je data"
-#: nutrition/forms.py:176
+#: nutrition/forms.py:185
msgid "Additional calories"
msgstr "Bijkomende calorieën"
-#: nutrition/forms.py:178
+#: nutrition/forms.py:187
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
@@ -2155,13 +2193,31 @@ msgstr ""
"voer een negatief cijfer in)"
#: nutrition/forms.py:209
+msgid "grams (g)"
+msgstr ""
+
+#: nutrition/forms.py:219
msgid "Ingredient"
msgstr "Ingrediënt"
-#: nutrition/forms.py:213
+#: nutrition/forms.py:223
msgid "Also search for names in English"
msgstr "Zoek ook in Engelse namen"
+#: nutrition/forms.py:239
+msgid "Quantity"
+msgstr ""
+
+#: nutrition/forms.py:241
+msgid "Enter a quantity and choose grams (g) or one of the serving units."
+msgstr ""
+
+#: nutrition/models/ingredient.py:526
+#, fuzzy
+#| msgid "Correction"
+msgid "Portion"
+msgstr "Verbetering"
+
#: nutrition/templates/ingredient/email_new.tpl:1
#, python-format
msgid ""
@@ -2213,59 +2269,92 @@ msgstr ""
"hebt toegevoegd toen je je registreerde krijg je een melding als het proces "
"succesvol is afgerond."
-#: nutrition/templates/ingredient/overview.html:38
+#: nutrition/templates/ingredient/overview.html:32
+#: nutrition/templates/ingredient/overview.html:68
+#: nutrition/templates/ingredient/view.html:143
+msgid "Vegan"
+msgstr ""
+
+#: nutrition/templates/ingredient/overview.html:34
+#: nutrition/templates/ingredient/overview.html:79
+#: nutrition/templates/ingredient/view.html:155
+#, fuzzy
+#| msgid "Variations"
+msgid "Vegetarian"
+msgstr "Variaties"
+
+#: nutrition/templates/ingredient/overview.html:43
msgid "No ingredients."
msgstr "Geen ingrediënten."
-#: nutrition/templates/ingredient/overview.html:49
+#: nutrition/templates/ingredient/overview.html:54
msgid "Search"
msgstr "Zoek"
-#: nutrition/templates/ingredient/view.html:45 nutrition/views/plan.py:237
+#: nutrition/templates/ingredient/overview.html:57
+#, fuzzy
+#| msgid "No filter"
+msgid "Filter"
+msgstr "Geen filter"
+
+#: nutrition/templates/ingredient/overview.html:83
+msgid "Apply"
+msgstr ""
+
+#: nutrition/templates/ingredient/overview.html:85
+msgid "Reset"
+msgstr ""
+
+#: nutrition/templates/ingredient/view.html:46 nutrition/views/plan.py:236
msgid "Macronutrients"
msgstr "Macrovoedingstoffen"
-#: nutrition/templates/ingredient/view.html:54
+#: nutrition/templates/ingredient/view.html:55
msgid "kJ"
msgstr "kJ"
-#: nutrition/templates/ingredient/view.html:70 nutrition/views/plan.py:267
+#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:266
msgid "Sugar content in carbohydrates"
msgstr "Suikerinhoud in koolhydraten"
-#: nutrition/templates/ingredient/view.html:75
-#: nutrition/templates/ingredient/view.html:91
-#: nutrition/templates/ingredient/view.html:113
-#: nutrition/templates/ingredient/view.html:123
+#: nutrition/templates/ingredient/view.html:76
+#: nutrition/templates/ingredient/view.html:92
+#: nutrition/templates/ingredient/view.html:114
+#: nutrition/templates/ingredient/view.html:124
msgid "n.A."
msgstr "Nvt."
-#: nutrition/templates/ingredient/view.html:86 nutrition/views/plan.py:281
+#: nutrition/templates/ingredient/view.html:87 nutrition/views/plan.py:280
msgid "Saturated fat content in fats"
msgstr "Verzadigde vetinhoud in vetten"
-#: nutrition/templates/ingredient/view.html:102
+#: nutrition/templates/ingredient/view.html:103
msgid "Others"
msgstr "Anderen"
-#: nutrition/templates/ingredient/view.html:108 nutrition/views/plan.py:287
+#: nutrition/templates/ingredient/view.html:109 nutrition/views/plan.py:286
msgid "Fiber"
msgstr "Vezels"
-#: nutrition/templates/ingredient/view.html:118 nutrition/views/plan.py:293
+#: nutrition/templates/ingredient/view.html:119 nutrition/views/plan.py:292
msgid "Sodium"
msgstr "Natrium"
-#: nutrition/templates/ingredient/view.html:143
-#: nutrition/templates/units/list.html:50 nutrition/views/unit.py:86
+#: nutrition/templates/ingredient/view.html:136
+#, fuzzy
+#| msgid "Click here for more information"
+msgid "Dietary information"
+msgstr "Klik hier voor meer informatie"
+
+#: nutrition/templates/ingredient/view.html:184
msgid "Add new weight unit"
msgstr "Voeg gewichteenheid toe"
-#: nutrition/templates/rate/form.html:25
+#: nutrition/templates/rate/form.html:26
msgid "Basal metabolic rate"
msgstr "Basaal metabolisme"
-#: nutrition/templates/rate/form.html:26
+#: nutrition/templates/rate/form.html:27
msgid ""
"The basal metabolic rate is the amount of energy expended daily\n"
"at rest. This is the minimum energy needed for the body to function, without "
@@ -2277,15 +2366,15 @@ msgstr ""
"lichaam nodig\n"
"heeft om te functioneren, zonder enige bijkomende fysieke activiteit."
-#: nutrition/templates/rate/form.html:37
+#: nutrition/templates/rate/form.html:38
msgid "Your basic metabolic rate is: "
msgstr "Je basaal metabolisme is: "
-#: nutrition/templates/rate/form.html:47
+#: nutrition/templates/rate/form.html:48
msgid "Physical activities"
msgstr "Fysieke activiteiten"
-#: nutrition/templates/rate/form.html:48
+#: nutrition/templates/rate/form.html:49
msgid ""
"The physical activity level (PAL) is a factor used to to express\n"
"the additional physical activity and is used to calculate the total energy\n"
@@ -2295,11 +2384,11 @@ msgstr ""
"aan te duiden welke additionele fysieke activiteit je uitoefent en die\n"
"gebruikt wordt om de totale vereiste energie per dag te berekenen."
-#: nutrition/templates/rate/form.html:59
+#: nutrition/templates/rate/form.html:60
msgid "Factor for daily activities: "
msgstr "Factor voor dagelijkse activiteiten: "
-#: nutrition/templates/rate/form.html:67
+#: nutrition/templates/rate/form.html:68
msgid ""
"The base caloric intake is the amount of calories your metabolism\n"
"needs based on your level of physical activity."
@@ -2307,11 +2396,11 @@ msgstr ""
"De basis calorie-inname is de hoeveelheid calorieën die je metabolisme\n"
"nodig heeft op basis van je dagelijkse hoeveelheid fysieke activiteit."
-#: nutrition/templates/rate/form.html:81
+#: nutrition/templates/rate/form.html:82
msgid "Calculate basic caloric intake"
msgstr "Bereken basis calorie-inname"
-#: nutrition/templates/rate/form.html:88
+#: nutrition/templates/rate/form.html:89
msgid ""
"The total calories are the actual total calories per day. This\n"
"might include e.g. a surplus or deficit if you are bulking or cutting. "
@@ -2324,19 +2413,19 @@ msgstr ""
"ook gewoon zelf de hoeveelheid calorieën ingeven als je de waarde wilt "
"kennen."
-#: nutrition/templates/rate/form.html:102
+#: nutrition/templates/rate/form.html:103
msgid "Transfer basic intake to total daily calories"
msgstr "Verplaats basisinname naar dagelijks calorietotaal"
-#: nutrition/templates/rate/form.html:106
+#: nutrition/templates/rate/form.html:107
msgid "Add additional calories to total daily calories"
msgstr "Voeg bijkomende calorieën toe aan totale dagelijkse calorieën"
-#: nutrition/templates/rate/form.html:110
+#: nutrition/templates/rate/form.html:111
msgid "Save total calories to profile"
msgstr "Calorieëntotaal naar je profiel opslaan"
-#: nutrition/templates/rate/form.html:121
+#: nutrition/templates/rate/form.html:122
msgid ""
"Please note that these calculations can only be an\n"
"approximation. If you base your nutrition plan on these values, observe\n"
@@ -2347,48 +2436,48 @@ msgstr ""
"observeer jezelf dan voor enkele weken en verander de totale hoeveelheid "
"indien nodig."
-#: nutrition/views/ingredient.py:158
+#: nutrition/views/ingredient.py:163
msgid "Add a new ingredient"
msgstr "Nieuw ingrediënt toevoegen"
-#: nutrition/views/plan.py:128
+#: nutrition/views/plan.py:127
msgid "Nutritional plan"
msgstr "Voedingsplan"
-#: nutrition/views/plan.py:130
+#: nutrition/views/plan.py:129
#, python-format
msgid "Nutritional plan for %s"
msgstr "Voedingsplan voor %s"
-#: nutrition/views/plan.py:202
+#: nutrition/views/plan.py:201
msgid "<i>This is an empty plan, what did you expect on the PDF?</i>"
msgstr "<i>Dit is een leeg plan, wat had je verwacht op de PDF?</i>"
-#: nutrition/views/plan.py:230
+#: nutrition/views/plan.py:229
msgid "Nutritional data"
msgstr "Voedingsgegevens"
-#: nutrition/views/plan.py:238
+#: nutrition/views/plan.py:237
msgid "Total"
msgstr "Taal"
-#: nutrition/views/plan.py:239
+#: nutrition/views/plan.py:238
msgid "Percent of energy"
msgstr "Percentage energie"
-#: nutrition/views/plan.py:240
+#: nutrition/views/plan.py:239
msgid "g per body kg"
msgstr "g per kg lichaamsgewicht"
-#: nutrition/views/unit_ingredient.py:69
+#: nutrition/views/unit_ingredient.py:64
msgid "Add a new weight unit"
msgstr "Voeg gewichteenheid toe"
-#: nutrition/views/unit_ingredient.py:106
+#: nutrition/views/unit_ingredient.py:99
msgid "Edit a weight unit to ingredient connection"
msgstr "Bewerk verbinding gewichteenheid en ingrediënt"
-#: nutrition/views/unit_ingredient.py:138
+#: nutrition/views/unit_ingredient.py:129
msgid "Delete?"
msgstr "Verwijderen?"
@@ -2785,7 +2874,7 @@ msgstr "Broncode"
msgid "Translation"
msgstr "Vertaling"
-#: utils/generic_views.py:263
+#: utils/generic_views.py:246
msgid "Yes, delete"
msgstr "Ja, verwijder"
@@ -2839,10 +2928,6 @@ msgstr "U moet uw gewicht ingeven"
msgid "Import weight logs"
msgstr "Importeer gewichtlogs"
-#: weight/templates/import_csv_form.html:9
-msgid "Submit"
-msgstr "Insturen"
-
#: weight/templates/import_csv_form.html:15
msgid ""
"Use this import field to import your weight logs into Workout\n"
@@ -2962,6 +3047,34 @@ msgstr ""
msgid "Re-Submit"
msgstr "Her-indienen"
+#~ msgid "Email verification"
+#~ msgstr "Email verificatie"
+
+#, python-format
+#~ msgid "%(username)s, your email was verified"
+#~ msgstr "%(username)s, je email is geverifeerd"
+
+#~ msgid "Error, invalid verification token"
+#~ msgstr "Foutmelding, foutieve verificatie token"
+
+#~ msgid "Email Confirmation"
+#~ msgstr "Email Bevestiging"
+
+#, python-format
+#~ msgid "You are almost there, %(username)s!"
+#~ msgstr "Je bent er bijna, %(username)s!"
+
+#, python-format
+#~ msgid "Please click <a href=\"%(link)s\">here</a> to confirm your email"
+#~ msgstr "Klik <a href=\"%(link)s\">hier</a> om je e-mail te bevestigen"
+
+#, python-format
+#~ msgid "The token expires on %(time)s"
+#~ msgstr "Het token verloopt op %(time)s"
+
+#~ msgid "Ingredient weight units"
+#~ msgstr "Gewichteenheden ingrediënt"
+
#~ msgid "Image"
#~ msgstr "Afbeelding"
@@ -2992,9 +3105,6 @@ msgstr "Her-indienen"
#~ msgid "Secondary muscles"
#~ msgstr "Secundaire spieren"
-#~ msgid "Variations"
-#~ msgstr "Variaties"
-
#~ msgid "Exercise Categories"
#~ msgstr "Oefeningcategorieën"
@@ -3942,9 +4052,6 @@ msgstr "Her-indienen"
#~ msgid "This content is available under the following license:"
#~ msgstr "Deze inhoud is beschikbaar onder de volgende licentie:"
-#~ msgid "Click here for more information"
-#~ msgstr "Klik hier voor meer informatie"
-
#, python-format
#~ msgid "%(name)s is too similar to existing exercise \"%(exercise_name)s\""
#~ msgstr "%(name)s lijkt teveel op %(exercise_name)s"
@@ -4548,9 +4655,6 @@ msgstr "Her-indienen"
#~ msgid "Last 12 months"
#~ msgstr "Laatste 12 maanden"
-#~ msgid "No filter"
-#~ msgstr "Geen filter"
-
#~ msgid "Days"
#~ msgstr "Dag"
diff --git a/wger/locale/no/LC_MESSAGES/django.po b/wger/locale/no/LC_MESSAGES/django.po
index f728524ba..7b1e0ee6a 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: 2026-01-17 14:03+0000\n"
+"POT-Creation-Date: 2026-04-10 10:20+0000\n"
"PO-Revision-Date: 2024-08-20 18:09+0000\n"
"Last-Translator: GS Bacon <[email protected]>\n"
"Language-Team: Norwegian Bokmål <https://hosted.weblate.org/projects/wger/"
@@ -40,7 +40,7 @@ msgstr ""
#: config/views/gym_config.py:42 core/templates/language/view.html:64
#: core/templates/license/list.html:17
#: core/templates/repetition_unit/list.html:18
-#: core/templates/user/overview.html:204 core/templates/user/overview.html:467
+#: core/templates/user/overview.html:207 core/templates/user/overview.html:470
#: core/templates/weight_unit/list.html:18
#: exercises/templates/categories/admin-overview.html:17
#: exercises/templates/equipment/admin-overview.html:17
@@ -52,30 +52,29 @@ msgstr ""
#: gym/templates/gym/list.html:19 gym/templates/gym/list.html:48
#: gym/templates/gym/member_list.html:94 gym/templates/gym/member_list.html:152
#: gym/templates/gym/member_list.html:190
-#: nutrition/templates/ingredient/view.html:164
-#: nutrition/templates/ingredient/view.html:209
-#: nutrition/templates/units/list.html:19
+#: nutrition/templates/ingredient/view.html:205
+#: nutrition/templates/ingredient/view.html:248
msgid "Edit"
msgstr "Rediger"
-#: core/forms.py:91 core/templates/navigation.html:271
-#: core/templates/navigation.html:278 core/templates/user/login.html:4
+#: core/forms.py:89 core/templates/navigation.html:268
+#: core/templates/navigation.html:275 core/templates/user/login.html:4
#: core/templates/user/registration_sidebar.html:12
#: software/templates/features.html:82 software/templates/features.html:448
msgid "Login"
msgstr "Logg inn"
-#: core/forms.py:130 core/forms.py:244 gym/views/export.py:61
+#: core/forms.py:128 core/forms.py:242 gym/views/export.py:61
#: gym/views/gym.py:217
msgid "First name"
msgstr "Fornavn"
-#: core/forms.py:131 core/forms.py:245 core/templates/user/overview.html:284
+#: core/forms.py:129 core/forms.py:243 core/templates/user/overview.html:287
#: gym/views/export.py:62 gym/views/gym.py:217
msgid "Last name"
msgstr "Etternavn"
-#: core/forms.py:133 core/forms.py:210 core/templates/user/overview.html:288
+#: core/forms.py:131 core/forms.py:208 core/templates/user/overview.html:291
#: gym/models/contract.py:256 gym/models/gym.py:58
#: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:116
#: gym/templates/gym/new_user.html:30 gym/views/export.py:60
@@ -85,53 +84,53 @@ msgstr "Etternavn"
msgid "Email"
msgstr "E-post"
-#: core/forms.py:134
+#: core/forms.py:132
msgid "Used for password resets and, optionally, e-mail reminders."
msgstr "Brukes for passordtilbakestillinger og eventuelt e-postpåminnelser."
-#: core/forms.py:138 core/models/profile.py:222
+#: core/forms.py:136 core/models/profile.py:222
#: gym/templates/gym/new_user.html:38
msgid "Date of Birth"
msgstr "Fødselsdato"
-#: core/forms.py:177
+#: core/forms.py:175
msgid "Personal data"
msgstr "Personlig data"
-#: core/forms.py:189
+#: core/forms.py:187
msgid "Workout reminders"
msgstr "Treningsvarsler"
-#: core/forms.py:196
+#: core/forms.py:194
msgid "Other settings"
msgstr "Andre innstillinger"
-#: core/forms.py:204 core/views/user.py:614 core/views/user.py:629
-#: core/views/user.py:641 gym/forms.py:73 utils/generic_views.py:143
+#: core/forms.py:202 core/views/user.py:630 core/views/user.py:654
+#: core/views/user.py:668 gym/forms.py:73 utils/generic_views.py:137
msgid "Save"
msgstr "Lagre"
-#: core/forms.py:211
+#: core/forms.py:209
msgid "Used for password resets and, optionally, email reminders."
msgstr "Brukes for passordtilbakestillinger og eventuelt e-postpåminnelser."
-#: core/forms.py:240
+#: core/forms.py:238
msgid "This e-mail address is already in use."
msgstr "Denne e-posten er allerede i bruk."
-#: core/forms.py:261 gym/templates/gym/new_user.html:26
+#: core/forms.py:259 gym/templates/gym/new_user.html:26
#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:217
msgid "Password"
msgstr "Passord"
-#: core/forms.py:263
+#: core/forms.py:261
msgid "Please enter your current password."
msgstr "Skriv inn ditt nåværende passord."
-#: core/forms.py:272 core/templates/language/view.html:70
+#: core/forms.py:270 core/templates/language/view.html:70
#: core/templates/license/list.html:21
#: core/templates/repetition_unit/list.html:22
-#: core/templates/user/overview.html:233
+#: core/templates/user/overview.html:236
#: core/templates/weight_unit/list.html:22
#: exercises/templates/categories/admin-overview.html:21
#: exercises/templates/equipment/admin-overview.html:21
@@ -139,27 +138,30 @@ msgstr "Skriv inn ditt nåværende passord."
#: gym/templates/admin_notes/list.html:37
#: gym/templates/contract_option/list.html:35
#: gym/templates/contract_type/list.html:36 gym/templates/document/list.html:46
-#: gym/templates/gym/list.html:23 nutrition/templates/ingredient/view.html:168
-#: nutrition/templates/ingredient/view.html:215
-#: nutrition/templates/units/list.html:25
+#: gym/templates/gym/list.html:23 nutrition/templates/ingredient/view.html:209
+#: nutrition/templates/ingredient/view.html:254
msgid "Delete"
msgstr "Slett"
-#: core/forms.py:281
+#: core/forms.py:279
msgid "Invalid password"
msgstr "Ugyldig passord"
-#: core/forms.py:293
+#: core/forms.py:291 core/forms.py:349
msgid "The form is secured with reCAPTCHA"
msgstr "Skjemaet er sikret med reCAPTCHA"
-#: core/forms.py:314 core/forms.py:341 core/templates/navigation.html:272
-#: core/templates/navigation.html:285 core/templates/template.html:123
-#: core/templates/user/login.html:21 core/views/user.py:285
+#: core/forms.py:312 core/forms.py:339 core/templates/navigation.html:269
+#: core/templates/navigation.html:282 core/templates/template.html:113
+#: core/templates/user/login.html:21 core/views/user.py:293
#: software/templates/features.html:87 software/templates/features.html:442
msgid "Register"
msgstr "Registrer"
+#: core/forms.py:360 weight/templates/import_csv_form.html:9
+msgid "Submit"
+msgstr "Send"
+
#: core/models/language.py:31 core/templates/language/view.html:21
msgid "Language short name"
msgstr "Språk, forkortet navn"
@@ -196,36 +198,36 @@ msgstr "Link"
msgid "Link to license text or other information"
msgstr "Link til lisenstekst eller annen informasjon"
-#: core/models/profile.py:57
+#: core/models/profile.py:60
#, python-format
msgid "%(birthdate)s is not a valid birthdate"
msgstr "%(birthdate)s er ikke en gyldig fødselsdato"
-#: core/models/profile.py:66
+#: core/models/profile.py:69
msgid "Male"
msgstr "Mann"
-#: core/models/profile.py:67
+#: core/models/profile.py:70
msgid "Female"
msgstr "Kvinne"
-#: core/models/profile.py:74
+#: core/models/profile.py:77
msgid "Low"
msgstr "Lav"
-#: core/models/profile.py:75
+#: core/models/profile.py:78
msgid "Medium"
msgstr "Middels"
-#: core/models/profile.py:76
+#: core/models/profile.py:79
msgid "High"
msgstr "Høy"
-#: core/models/profile.py:82
+#: core/models/profile.py:85
msgid "Metric (kilogram)"
msgstr "Metrisk (kg)"
-#: core/models/profile.py:83
+#: core/models/profile.py:86
msgid "Imperial (pound)"
msgstr "Britisk enhetssystem (pund)"
@@ -344,7 +346,7 @@ msgstr "Gjennomsnittstimer per uke"
msgid "Free time"
msgstr "Ledig tid"
-#: core/models/profile.py:320 nutrition/templates/rate/form.html:66
+#: core/models/profile.py:320 nutrition/templates/rate/form.html:67
msgid "Total daily calories"
msgstr "Antall kalorier daglig"
@@ -386,20 +388,43 @@ msgstr ""
msgid "Enable or disable the trophy system for this user"
msgstr ""
-#: core/models/profile.py:446
+#: core/models/profile.py:457
msgid "The sum of all hours has to be 24"
msgstr "Summen av antall timer må bli 24"
-#: core/models/rep_unit.py:36 core/models/weight_unit.py:42
-#: core/templates/user/overview.html:280 core/views/user.py:589
+#: core/models/rep_unit.py:32 i18n.tpl:30
+msgid "Repetitions"
+msgstr "Repetisjoner"
+
+#: core/models/rep_unit.py:33 core/templates/user/overview.html:82
+#: exercises/templates/history/overview.html:30
+msgid "Time"
+msgstr "Tid"
+
+#: core/models/rep_unit.py:34
+msgid "Distance"
+msgstr ""
+
+#: core/models/rep_unit.py:47 core/models/weight_unit.py:42
+#: core/templates/user/overview.html:283 core/views/user.py:605
#: exercises/models/muscle.py:36 gym/models/contract.py:52
#: gym/models/contract.py:103 gym/models/gym.py:46
#: gym/models/user_document.py:84 gym/templates/contract/view.html:50
#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:108
-#: gym/views/gym.py:158 nutrition/templates/ingredient/view.html:151
+#: gym/views/gym.py:158 nutrition/templates/ingredient/view.html:192
msgid "Name"
msgstr "Navn"
+#: core/models/rep_unit.py:53
+#, fuzzy
+#| msgid "Unit"
+msgid "Unit Type"
+msgstr "Enhet"
+
+#: core/models/rep_unit.py:54
+msgid "The type of unit (repetitions, time, or distance)"
+msgstr ""
+
#: core/templates/403.html:4
msgid "Forbidden!"
msgstr "Forbudt!"
@@ -431,6 +456,55 @@ msgstr ""
"igjen på et senere tidspunkt. Hvis problemet vedvarerer kan du oppsøke hjelp "
"på følgende måter nedenfor:"
+#: core/templates/account/email/email_confirmation_message.html:81
+msgid "Almost there!"
+msgstr ""
+
+#: core/templates/account/email/email_confirmation_message.html:85
+#, fuzzy, python-format
+#| msgid ""
+#| "You're receiving this e-mail because you requested a password reset for "
+#| "your user account at %(site_name)s."
+msgid ""
+"You're receiving this email because the user \"%(user_display)s\" has given "
+"your email address to register an account on %(site_domain)s."
+msgstr ""
+"Du mottar denne e-posten fordi du har bedt om tilbakestilling av passord for "
+"brukerkontoen din ved %(site_name)s."
+
+#: core/templates/account/email/email_confirmation_message.html:93
+msgid ""
+"Your email verification code is listed below. Please enter it in your open "
+"browser window."
+msgstr ""
+
+#: core/templates/account/email/email_confirmation_message.html:100
+#, fuzzy
+#| msgid "Please click <a href=\"%(link)s\">here</a> to confirm your email"
+msgid "Please click the button below to confirm your email address."
+msgstr "Vennligst klikk <a href=\"%(link)s\">her</a> for å bekrefte din epost"
+
+#: core/templates/account/email/email_confirmation_message.html:106
+#, fuzzy
+#| msgid "Configuration"
+msgid "Confirm email"
+msgstr "Konfiguarsjon"
+
+#: core/templates/account/email/email_confirmation_message.html:110
+#, python-format
+msgid ""
+"The link is valid for %(expire_hours)s hours (until %(date)s, %(time)s). You "
+"can request a new one from your profile settings."
+msgstr ""
+
+#: core/templates/account/email/email_confirmation_message.html:116
+msgid "If the button doesn't work, copy and paste this link into your browser:"
+msgstr ""
+
+#: core/templates/account/email/email_confirmation_message.html:125
+msgid "the wger Team"
+msgstr ""
+
#: core/templates/base.html:10
#, fuzzy, python-format
#| msgid ""
@@ -476,51 +550,7 @@ 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 verification"
-msgstr "Epost verifisering"
-
-#: core/templates/email_verification/confirm_template.html:18
-#, python-format
-msgid "%(username)s, your email was verified"
-msgstr "%(username)s, din epost ble verifisert"
-
-#: core/templates/email_verification/confirm_template.html:22
-msgid "Error, invalid verification token"
-msgstr "Feil, ugyldig verifikasjonstoken"
-
-#: core/templates/email_verification/email_body_html.tpl:6
-msgid "Email Confirmation"
-msgstr "Epost Bekreftelse"
-
-#: 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 "Du er nesten der, %(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 "Vennligst klikk <a href=\"%(link)s\">her</a> for å bekrefte din epost"
-
-#: 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/language/overview.html:4 core/templates/navigation.html:344
+#: core/templates/language/overview.html:4 core/templates/navigation.html:341
msgid "Languages"
msgstr "Språk"
@@ -529,16 +559,16 @@ msgid "Nothing found."
msgstr "Resultatløst."
#: core/templates/language/overview.html:22
-#: nutrition/templates/ingredient/overview.html:38
+#: nutrition/templates/ingredient/overview.html:43
msgid "Add one now."
msgstr "Legg til en nå."
#: core/templates/language/overview.html:34 core/templates/license/list.html:43
-#: core/templates/repetition_unit/list.html:46
-#: core/templates/user/overview.html:344 core/templates/user/overview.html:384
-#: core/templates/user/overview.html:422
-#: core/templates/weight_unit/list.html:46 core/views/languages.py:74
-#: core/views/license.py:66 core/views/repetition_units.py:66
+#: core/templates/repetition_unit/list.html:44
+#: core/templates/user/overview.html:347 core/templates/user/overview.html:387
+#: core/templates/user/overview.html:425
+#: core/templates/weight_unit/list.html:46 core/views/languages.py:77
+#: core/views/license.py:66 core/views/repetition_units.py:76
#: core/views/weight_units.py:66
#: exercises/templates/categories/admin-overview.html:40
#: exercises/templates/equipment/admin-overview.html:39
@@ -551,14 +581,14 @@ msgstr "Legg til en nå."
#: gym/templates/gym/member_list.html:264
#: gym/templates/gym/member_list.html:303
#: mailer/templates/mailer/gym/overview.html:43
-#: nutrition/templates/ingredient/overview.html:60
+#: nutrition/templates/ingredient/overview.html:97
msgid "Add"
msgstr "Legg til"
#: core/templates/language/view.html:61 core/templates/user/api_key.html:41
#: core/templates/user/preferences.html:50 gym/models/contract.py:203
#: gym/templates/contract/view.html:41 gym/templates/gym/member_list.html:270
-#: nutrition/templates/ingredient/view.html:206
+#: nutrition/templates/ingredient/view.html:245
msgid "Options"
msgstr "Alternativer"
@@ -568,9 +598,9 @@ msgstr "Lisensliste"
#: core/templates/license/list.html:30
#: core/templates/repetition_unit/list.html:32
-#: core/templates/user/overview.html:104 core/templates/user/overview.html:136
-#: core/templates/user/overview.html:185 core/templates/user/overview.html:365
-#: core/templates/user/overview.html:404 core/templates/user/overview.html:448
+#: core/templates/user/overview.html:107 core/templates/user/overview.html:139
+#: core/templates/user/overview.html:188 core/templates/user/overview.html:368
+#: core/templates/user/overview.html:407 core/templates/user/overview.html:451
#: core/templates/weight_unit/list.html:32
#: exercises/templates/categories/admin-overview.html:30
#: exercises/templates/equipment/admin-overview.html:30
@@ -582,11 +612,10 @@ msgstr "Lisensliste"
#: gym/templates/gym/member_list.html:284
#: gym/templates/gym/member_list.html:321
#: mailer/templates/mailer/gym/overview.html:30
-#: nutrition/templates/units/list.html:34
msgid "Nothing found"
msgstr "Ingenting funnet"
-#: core/templates/misc/about.html:4 core/templates/template.html:160
+#: core/templates/misc/about.html:4 core/templates/template.html:150
msgid "Imprint"
msgstr "Inntrykk"
@@ -594,170 +623,165 @@ msgstr "Inntrykk"
msgid "Training"
msgstr "Trening"
-#: core/templates/navigation.html:37 core/templates/user/overview.html:25
+#: core/templates/navigation.html:36 core/templates/user/overview.html:28
msgid "Routines"
msgstr ""
-#: core/templates/navigation.html:45 core/templates/user/overview.html:70
+#: core/templates/navigation.html:44 core/templates/user/overview.html:73
msgid "Calendar"
msgstr "Kalender"
-#: core/templates/navigation.html:55
+#: core/templates/navigation.html:53
#, fuzzy
#| msgid "Macronutrients"
msgid "Measurements"
msgstr "Makronæringsstoffer"
-#: core/templates/navigation.html:66 gallery/templates/images/overview.html:6
+#: core/templates/navigation.html:64 gallery/templates/images/overview.html:6
msgid "Gallery"
msgstr "Galleri"
-#: core/templates/navigation.html:72
+#: core/templates/navigation.html:74 core/templates/navigation.html:400
+#: trophies/templates/trophies/overview.html:7
+msgid "Trophies"
+msgstr ""
+
+#: core/templates/navigation.html:79
#, fuzzy
#| msgid "Workout complete!"
msgid "Workout templates"
msgstr "Treningsøkt fullført!"
-#: core/templates/navigation.html:79
+#: core/templates/navigation.html:86
#, fuzzy
#| msgid "Your schedules"
msgid "Your templates"
msgstr "Dine timeplaner"
-#: core/templates/navigation.html:88
+#: core/templates/navigation.html:95
msgid "Public templates"
msgstr "Offentlige maler"
-#: core/templates/navigation.html:96 software/templates/features.html:51
+#: core/templates/navigation.html:103 software/templates/features.html:51
#: software/templates/features.html:480
msgid "Exercises"
msgstr "Øvelser"
-#: core/templates/navigation.html:102 core/templates/navigation.html:176
-#: core/templates/navigation.html:339
+#: core/templates/navigation.html:109 core/templates/navigation.html:336
msgid "Administration"
msgstr "Administrasjon"
-#: core/templates/navigation.html:106
+#: core/templates/navigation.html:113
#, fuzzy
#| msgid "Exercise day"
msgid "Exercise edit history"
msgstr "Treningsdag"
-#: core/templates/navigation.html:112
+#: core/templates/navigation.html:119
msgid "Equipment"
msgstr "Utstyr"
-#: core/templates/navigation.html:118
+#: core/templates/navigation.html:125
msgid "Muscles"
msgstr "Muskler"
-#: core/templates/navigation.html:124
+#: core/templates/navigation.html:131
#: exercises/templates/categories/admin-overview.html:4
msgid "Categories"
msgstr "Kategorier"
-#: core/templates/navigation.html:139 software/templates/features.html:468
+#: core/templates/navigation.html:146 software/templates/features.html:468
msgid "Nutrition"
msgstr "Ernæring"
-#: core/templates/navigation.html:147 core/templates/user/overview.html:144
+#: core/templates/navigation.html:154 core/templates/user/overview.html:147
msgid "Nutrition plans"
msgstr "Ernæringsplaner"
-#: core/templates/navigation.html:156
+#: core/templates/navigation.html:163
msgid "BMI calculator"
msgstr "BMI-kalkulator"
-#: core/templates/navigation.html:165 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:172 nutrition/templates/rate/form.html:18
msgid "Daily calories calculator"
msgstr "Daglig kalorikalkulator"
-#: core/templates/navigation.html:171
+#: core/templates/navigation.html:178
#: nutrition/templates/ingredient/overview.html:10
msgid "Ingredient overview"
msgstr "Ingrediensoversikt"
-#: core/templates/navigation.html:180 nutrition/templates/units/list.html:6
-msgid "Ingredient weight units"
-msgstr "Vektenheter for ingredienser"
-
-#: core/templates/navigation.html:196 software/templates/features.html:463
+#: core/templates/navigation.html:193 software/templates/features.html:463
msgid "Body weight"
msgstr "Kropsvekt"
-#: core/templates/navigation.html:203 core/templates/user/overview.html:114
+#: core/templates/navigation.html:200 core/templates/user/overview.html:117
msgid "Weight overview"
msgstr "Vektoversikt"
-#: core/templates/navigation.html:217
+#: core/templates/navigation.html:214
msgid "About this software"
msgstr "Om denne programvaren"
-#: core/templates/navigation.html:223 software/templates/about_us.html:5
+#: core/templates/navigation.html:220 software/templates/about_us.html:5
msgid "Support & Get Involved"
msgstr ""
-#: core/templates/navigation.html:229 software/templates/features.html:528
+#: core/templates/navigation.html:226 software/templates/features.html:528
msgid "REST API"
msgstr "REST API"
-#: core/templates/navigation.html:235 utils/models.py:45
+#: core/templates/navigation.html:232 utils/models.py:45
msgid "License"
msgstr "Lisens"
-#: core/templates/navigation.html:241
+#: core/templates/navigation.html:238
msgid "Developer documentation"
msgstr "Utvikler dokumentasjon"
-#: core/templates/navigation.html:248
+#: core/templates/navigation.html:245
msgid "Get the code"
msgstr "Få koden"
-#: core/templates/navigation.html:255 core/templates/template.html:199
-#: software/templates/features.html:603
+#: core/templates/navigation.html:252 core/templates/template.html:202
+#: software/templates/features.html:614
msgid "Translate"
msgstr "Oversett"
-#: core/templates/navigation.html:292 core/templates/user/login.html:30
+#: core/templates/navigation.html:289 core/templates/user/login.html:30
msgid "Reset password"
msgstr "Tilbakestill passord"
-#: core/templates/navigation.html:301 core/templates/navigation.html:329
+#: core/templates/navigation.html:298 core/templates/navigation.html:326
msgid "Logout"
msgstr "Logg ut"
-#: core/templates/navigation.html:320
+#: core/templates/navigation.html:317
msgid "My preferences"
msgstr "Mine innstillinger"
-#: core/templates/navigation.html:352
+#: core/templates/navigation.html:349
msgid "Licenses"
msgstr "Lisenser"
-#: core/templates/navigation.html:360
+#: core/templates/navigation.html:357
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr "Repetisjonsenheter"
-#: core/templates/navigation.html:368 core/templates/weight_unit/list.html:4
-#: nutrition/templates/ingredient/view.html:141
+#: core/templates/navigation.html:365 core/templates/weight_unit/list.html:4
+#: nutrition/templates/ingredient/view.html:182
msgid "Weight units"
msgstr "Vektenheter"
-#: core/templates/navigation.html:376 core/templates/user/list.html:4
+#: core/templates/navigation.html:373 core/templates/user/list.html:4
msgid "User list"
msgstr "Brukerliste"
-#: core/templates/navigation.html:382
+#: core/templates/navigation.html:379
msgid "Gyms"
msgstr "Treningsstudioer"
-#: core/templates/navigation.html:403
-#: trophies/templates/trophies/overview.html:7
-msgid "Trophies"
-msgstr ""
-
#: core/templates/registration/password_reset_complete.html:4
msgid "Password reset complete"
msgstr "Tilbakestilling av passord fullført"
@@ -817,25 +841,29 @@ msgstr "forrige"
msgid "next"
msgstr "neste"
-#: core/templates/template.html:96
+#: core/templates/template.html:86
msgid "Close"
msgstr "Lukk"
-#: core/templates/template.html:112
+#: core/templates/template.html:102
msgid ""
"You are using a guest account, data entered will be deleted after a week."
msgstr "Du bruker en gjestekonto, data du fyller ut vil slettes etter en uke."
-#: core/templates/template.html:117
+#: core/templates/template.html:107
msgid "Create some demo entries"
msgstr "Lag noen demo oppføringer"
-#: core/templates/template.html:165 software/templates/features.html:568
+#: core/templates/template.html:155 software/templates/features.html:568
#: software/templates/tos.html:7
msgid "Terms of service"
msgstr "Vilkår for bruk"
-#: core/templates/template_features.html:53 software/templates/features.html:9
+#: core/templates/template.html:181 software/templates/features.html:595
+msgid "Browser language"
+msgstr ""
+
+#: core/templates/template_features.html:46 software/templates/features.html:9
msgid "Features"
msgstr "Funksjoner"
@@ -893,99 +921,94 @@ msgstr "Ingen konto?"
msgid "Forgot password?"
msgstr "Glemt passord?"
-#: core/templates/user/overview.html:25 core/templates/user/overview.html:68
-#: core/templates/user/overview.html:112 core/templates/user/overview.html:144
-#: core/templates/user/overview.html:348 core/templates/user/overview.html:390
-#: core/templates/user/overview.html:426
+#: core/templates/user/overview.html:28 core/templates/user/overview.html:71
+#: core/templates/user/overview.html:115 core/templates/user/overview.html:147
+#: core/templates/user/overview.html:351 core/templates/user/overview.html:393
+#: core/templates/user/overview.html:429
#, python-format
msgid "last %(number)s"
msgstr "sist %(number)s"
-#: core/templates/user/overview.html:27 core/templates/user/overview.html:146
-#: core/templates/user/overview.html:343 core/templates/user/overview.html:382
-#: core/templates/user/overview.html:421 gym/templates/gym/member_list.html:226
+#: core/templates/user/overview.html:30 core/templates/user/overview.html:149
+#: core/templates/user/overview.html:346 core/templates/user/overview.html:385
+#: core/templates/user/overview.html:424 gym/templates/gym/member_list.html:226
#: gym/templates/gym/member_list.html:262
#: gym/templates/gym/member_list.html:302
msgid "Overview"
msgstr "Oversikt"
-#: core/templates/user/overview.html:34 core/templates/user/overview.html:76
-#: core/templates/user/overview.html:120 core/templates/user/overview.html:152
+#: core/templates/user/overview.html:37 core/templates/user/overview.html:79
+#: core/templates/user/overview.html:123 core/templates/user/overview.html:155
#: manager/helpers.py:88 software/templates/about_us.html:170
#: weight/templates/import_csv_preview.html:13
#: weight/templates/import_csv_preview.html:42 weight/views.py:54
msgid "Date"
msgstr "Dato"
-#: core/templates/user/overview.html:35 core/templates/user/overview.html:153
+#: core/templates/user/overview.html:38 core/templates/user/overview.html:156
#: gym/models/contract.py:58 gym/models/contract.py:109
msgid "Description"
msgstr "Beskrivelse"
-#: core/templates/user/overview.html:36
+#: core/templates/user/overview.html:39
msgid "Number of logs (days)"
msgstr "Antall logger (dager)"
-#: core/templates/user/overview.html:37 core/views/user.py:590
+#: core/templates/user/overview.html:40 core/views/user.py:606
#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:158
msgid "Last activity"
msgstr "Siste aktivitet"
-#: core/templates/user/overview.html:58
+#: core/templates/user/overview.html:61
msgid "No workouts found."
msgstr "Ingen treningsøkter funnet."
-#: core/templates/user/overview.html:68
+#: core/templates/user/overview.html:71
msgid "Log"
msgstr "Logg"
-#: core/templates/user/overview.html:77
+#: core/templates/user/overview.html:80
msgid "General impression"
msgstr "Generelt inntrykk"
-#: core/templates/user/overview.html:78 core/templates/user/overview.html:390
+#: core/templates/user/overview.html:81 core/templates/user/overview.html:393
msgid "Notes"
msgstr "Notater"
-#: core/templates/user/overview.html:79
-#: exercises/templates/history/overview.html:30
-msgid "Time"
-msgstr "Tid"
-
-#: core/templates/user/overview.html:112 core/templates/user/overview.html:121
+#: core/templates/user/overview.html:115 core/templates/user/overview.html:124
#: manager/helpers.py:89 weight/templates/import_csv_preview.html:14
#: weight/templates/import_csv_preview.html:43 weight/views.py:54
msgid "Weight"
msgstr "Vekt"
-#: core/templates/user/overview.html:154
-#: nutrition/templates/ingredient/view.html:51 nutrition/views/plan.py:245
+#: core/templates/user/overview.html:157
+#: nutrition/templates/ingredient/view.html:52 nutrition/views/plan.py:244
msgid "Energy"
msgstr "Energi"
-#: core/templates/user/overview.html:155
-#: nutrition/templates/ingredient/view.html:58 nutrition/views/plan.py:251
+#: core/templates/user/overview.html:158
+#: nutrition/templates/ingredient/view.html:59 nutrition/views/plan.py:250
msgid "Protein"
msgstr "Protein"
-#: core/templates/user/overview.html:156
-#: nutrition/templates/ingredient/view.html:64 nutrition/views/plan.py:259
+#: core/templates/user/overview.html:159
+#: nutrition/templates/ingredient/view.html:65 nutrition/views/plan.py:258
msgid "Carbohydrates"
msgstr "Karbohydrater"
-#: core/templates/user/overview.html:157
-#: nutrition/templates/ingredient/view.html:80 nutrition/views/plan.py:273
+#: core/templates/user/overview.html:160
+#: nutrition/templates/ingredient/view.html:81 nutrition/views/plan.py:272
msgid "Fat"
msgstr "Fett"
-#: core/templates/user/overview.html:170
-#: nutrition/templates/ingredient/view.html:53
+#: core/templates/user/overview.html:173
+#: nutrition/templates/ingredient/view.html:54
msgid "kcal"
msgstr "kcal"
-#: core/templates/user/overview.html:201 core/templates/user/overview.html:340
-#: core/templates/user/overview.html:379 core/templates/user/overview.html:418
-#: core/templates/user/overview.html:463 gym/templates/gym/list.html:45
+#: core/templates/user/overview.html:204 core/templates/user/overview.html:343
+#: core/templates/user/overview.html:382 core/templates/user/overview.html:421
+#: core/templates/user/overview.html:466 gym/templates/gym/list.html:45
#: gym/templates/gym/member_list.html:91 gym/templates/gym/member_list.html:149
#: gym/templates/gym/member_list.html:187
#: gym/templates/gym/member_list.html:223
@@ -994,109 +1017,113 @@ msgstr "kcal"
msgid "Actions"
msgstr "Handlinger"
-#: core/templates/user/overview.html:210
+#: core/templates/user/overview.html:213
msgid "Deactivate user"
msgstr "Deaktiver bruker"
-#: core/templates/user/overview.html:214
+#: core/templates/user/overview.html:217
msgid "Activate user"
msgstr "Aktiver bruker"
-#: core/templates/user/overview.html:223
+#: core/templates/user/overview.html:226
msgid "Reset user password"
msgstr "Tilbakestill brukerpassord"
-#: core/templates/user/overview.html:227 gym/templates/gym/member_list.html:30
+#: core/templates/user/overview.html:230 gym/templates/gym/member_list.html:30
msgid "Roles"
msgstr "Roller"
-#: core/templates/user/overview.html:243
+#: core/templates/user/overview.html:246
msgid "Password reset confirmation"
msgstr "Bekreftelse av tilbakestilling av passord"
-#: core/templates/user/overview.html:247
+#: core/templates/user/overview.html:250
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:250
+#: core/templates/user/overview.html:253
#: exercises/templates/history/overview.html:106
+#: nutrition/templates/ingredient/view.html:148
+#: nutrition/templates/ingredient/view.html:160
msgid "No"
msgstr "Nei"
-#: core/templates/user/overview.html:251
+#: core/templates/user/overview.html:254
#: exercises/templates/history/overview.html:99
+#: nutrition/templates/ingredient/view.html:146
+#: nutrition/templates/ingredient/view.html:158
msgid "Yes"
msgstr "Ja"
-#: core/templates/user/overview.html:272 gym/templates/gym/member_list.html:105
+#: core/templates/user/overview.html:275 gym/templates/gym/member_list.html:105
msgid "Details"
msgstr "Detaljer"
-#: core/templates/user/overview.html:276 gym/views/export.py:57
-#: manager/helpers.py:89 nutrition/views/plan.py:151
-#: nutrition/views/plan.py:157
+#: core/templates/user/overview.html:279 gym/views/export.py:57
+#: manager/helpers.py:89 nutrition/views/plan.py:150
+#: nutrition/views/plan.py:156
msgid "Nr."
msgstr "Nr."
-#: core/templates/user/overview.html:298 gym/models/contract.py:287
+#: core/templates/user/overview.html:301 gym/models/contract.py:287
#: gym/models/gym.py:50 gym/templates/contract/view.html:75
#: gym/templates/gym/member_list.html:112 gym/views/export.py:68
msgid "Phone"
msgstr "Telefon"
-#: core/templates/user/overview.html:302 gym/templates/contract/view.html:87
+#: core/templates/user/overview.html:305 gym/templates/contract/view.html:87
#: gym/templates/gym/member_list.html:130
msgid "Address"
msgstr "Adresse"
-#: core/templates/user/overview.html:313
+#: core/templates/user/overview.html:316
msgid "Registered"
msgstr "Registrert"
-#: core/templates/user/overview.html:317
+#: core/templates/user/overview.html:320
msgid "Last login"
msgstr "Sist innlogget"
-#: core/templates/user/overview.html:322
+#: core/templates/user/overview.html:325
msgid "Status"
msgstr "Status"
-#: core/templates/user/overview.html:325
+#: core/templates/user/overview.html:328
msgid "Active"
msgstr "Aktiv"
-#: core/templates/user/overview.html:327
+#: core/templates/user/overview.html:330
msgid "Inactive"
msgstr "Inaktiv"
-#: core/templates/user/overview.html:348 gym/templates/contract/list.html:4
+#: core/templates/user/overview.html:351 gym/templates/contract/list.html:4
#: gym/templates/gym/member_list.html:218
msgid "Contracts"
msgstr "Kontrakter"
-#: core/templates/user/overview.html:426 gym/templates/document/list.html:4
+#: core/templates/user/overview.html:429 gym/templates/document/list.html:4
msgid "Documents"
msgstr "Dokumenter"
-#: core/templates/user/overview.html:433 gym/templates/document/list.html:33
+#: core/templates/user/overview.html:436 gym/templates/document/list.html:33
msgid "Download"
msgstr "Last ned"
-#: core/templates/user/overview.html:474 gym/views/admin_config.py:44
+#: core/templates/user/overview.html:477 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:477 gym/models/user_config.py:92
+#: core/templates/user/overview.html:480 gym/models/user_config.py:92
msgid "Include in inactive overview"
msgstr "Inkluder i inaktiv oversikt"
-#: core/templates/user/overview.html:510
+#: core/templates/user/overview.html:513
#, python-format
msgid "Admin login is only available for users in %(gym_name)s"
msgstr "Administratorinnlogging er kun tilgjengelig for brukere i %(gym_name)s"
-#: core/templates/user/overview.html:514
+#: core/templates/user/overview.html:517
msgid "Log in as this user"
msgstr "Logg inn som denne brukeren"
@@ -1122,7 +1149,7 @@ msgstr ""
msgid "You need to verify your email to contribute exercises"
msgstr ""
-#: core/templates/user/preferences.html:55 core/views/user.py:601
+#: core/templates/user/preferences.html:55 core/views/user.py:617
msgid "Change password"
msgstr "Endre passord"
@@ -1130,23 +1157,23 @@ msgstr "Endre passord"
msgid "Already have an account?"
msgstr ""
-#: core/templatetags/wger_extras.py:142 i18n.tpl:38
+#: core/templatetags/wger_extras.py:142 i18n.tpl:39
msgid "kg"
msgstr "kg"
#: core/templatetags/wger_extras.py:144
-#: nutrition/templates/ingredient/view.html:60
-#: nutrition/templates/ingredient/view.html:66
-#: nutrition/templates/ingredient/view.html:73
-#: nutrition/templates/ingredient/view.html:82
-#: nutrition/templates/ingredient/view.html:89
-#: nutrition/templates/ingredient/view.html:111
-#: nutrition/templates/ingredient/view.html:121
+#: nutrition/templates/ingredient/view.html:61
+#: nutrition/templates/ingredient/view.html:67
+#: nutrition/templates/ingredient/view.html:74
+#: nutrition/templates/ingredient/view.html:83
+#: nutrition/templates/ingredient/view.html:90
+#: nutrition/templates/ingredient/view.html:112
+#: nutrition/templates/ingredient/view.html:122
msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr "g"
-#: core/templatetags/wger_extras.py:147 i18n.tpl:39
+#: core/templatetags/wger_extras.py:147 i18n.tpl:40
msgid "lb"
msgstr "lb"
@@ -1155,36 +1182,35 @@ msgctxt "weight unit, i.e. ounces"
msgid "oz"
msgstr "oz"
-#: core/views/languages.py:85 exercises/views/categories.py:122
+#: core/views/languages.py:88 exercises/views/categories.py:122
#: exercises/views/equipment.py:103 exercises/views/muscles.py:99
-#: nutrition/views/ingredient.py:120 nutrition/views/unit.py:110
+#: nutrition/views/ingredient.py:125
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
+#: core/views/languages.py:96 core/views/license.py:103
+#: core/views/repetition_units.py:114 core/views/weight_units.py:115
#: exercises/views/categories.py:128 exercises/views/muscles.py:106
#: gallery/views/images.py:124 gym/views/admin_notes.py:196
#: gym/views/document.py:206 gym/views/gym.py:481
-#: nutrition/views/ingredient.py:127 nutrition/views/unit.py:117
+#: nutrition/views/ingredient.py:132
#, python-brace-format
msgid "Delete {0}?"
msgstr "Slett {0}?"
-#: core/views/languages.py:111 core/views/license.py:85
-#: core/views/repetition_units.py:86 core/views/user.py:464
+#: core/views/languages.py:114 core/views/license.py:85
+#: core/views/repetition_units.py:96 core/views/user.py:480
#: core/views/weight_units.py:86 exercises/views/categories.py:98
#: exercises/views/equipment.py:81 exercises/views/muscles.py:87
#: gym/views/admin_notes.py:161 gym/views/config.py:68
#: gym/views/contract.py:186 gym/views/contract_option.py:123
#: gym/views/contract_type.py:123 gym/views/document.py:171
-#: gym/views/gym.py:463 nutrition/views/ingredient.py:146
-#: nutrition/views/unit.py:143
+#: gym/views/gym.py:463 nutrition/views/ingredient.py:151
#, python-brace-format
msgid "Edit {0}"
msgstr "Rediger {0}"
-#: core/views/misc.py:74
+#: core/views/misc.py:73
msgid ""
"We have created sample workout, workout schedules, weight logs, (body) "
"weight and nutrition plan entries so you can better see what this site can "
@@ -1194,48 +1220,48 @@ msgstr ""
"vekt og ernæringsplaner, slik at du bedre kan se hva dette nettstedet kan "
"gjøre. Føl deg fri til å redigere eller slette dem!"
-#: core/views/user.py:143
+#: core/views/user.py:145
#, python-brace-format
msgid "Account \"{0}\" was successfully deleted"
msgstr "Slettingen av konto \"{0}\" var vellykket"
-#: core/views/user.py:279
+#: core/views/user.py:287
msgid "You were successfully registered"
msgstr "Din registrering var vellykket"
-#: core/views/user.py:341
+#: core/views/user.py:357
msgid "Settings successfully updated"
msgstr "Innstillinger ble vellykket oppdatert"
-#: core/views/user.py:380
+#: core/views/user.py:396
msgid "The user was successfully deactivated"
msgstr "Brukeren ble vellykket deaktivert"
-#: core/views/user.py:417
+#: core/views/user.py:433
msgid "The user was successfully activated"
msgstr "Brukeren ble vellykket aktivert"
-#: core/views/user.py:432
+#: core/views/user.py:448
msgid "Edit user"
msgstr "Rediger bruker"
-#: core/views/user.py:587 gym/templates/gym/member_list.html:26
+#: core/views/user.py:603 gym/templates/gym/member_list.html:26
#: gym/views/gym.py:158
msgid "ID"
msgstr "ID"
-#: core/views/user.py:588 gym/forms.py:95 gym/templates/contract/view.html:55
+#: core/views/user.py:604 gym/forms.py:95 gym/templates/contract/view.html:55
#: gym/templates/gym/member_list.html:27 gym/views/export.py:59
#: gym/views/gym.py:158 gym/views/gym.py:217
msgid "Username"
msgstr "Brukernavn"
-#: core/views/user.py:591 gym/templates/gym/new_user.html:34
+#: core/views/user.py:607 gym/templates/gym/new_user.html:34
#: gym/views/export.py:58 gym/views/gym.py:217
msgid "Gym"
msgstr "treningsstudio"
-#: core/views/user.py:650
+#: core/views/user.py:678
#, python-format
msgid "A verification email was sent to %(email)s"
msgstr ""
@@ -1254,16 +1280,16 @@ msgstr "Navn på øvelsen"
msgid "A more basic name for the muscle"
msgstr ""
-#: exercises/models/video.py:50
+#: exercises/models/video.py:52
#, python-format
msgid "Maximum file size is %(size)sMB."
msgstr ""
-#: exercises/models/video.py:57 exercises/models/video.py:65
+#: exercises/models/video.py:59 exercises/models/video.py:67
msgid "File type is not supported"
msgstr ""
-#: exercises/models/video.py:70
+#: exercises/models/video.py:72
#, fuzzy
#| msgid "%(birthdate)s is not a valid birthdate"
msgid "File is not a valid video"
@@ -1348,7 +1374,11 @@ msgstr "Slett utstyr?"
msgid "Add muscle"
msgstr "Legg til muskel"
-#: gallery/templates/images/overview.html:72
+#: gallery/forms.py:35
+msgid "If date is left empty, it will be read from the image instead"
+msgstr ""
+
+#: gallery/templates/images/overview.html:69
msgid "Add image"
msgstr "Legg til bilde"
@@ -1414,7 +1444,7 @@ msgid "Contract type"
msgstr "Kontraktstype"
#: gym/models/contract.py:211 gym/templates/contract/view.html:59
-#: nutrition/forms.py:58
+#: nutrition/forms.py:67
msgid "Amount"
msgstr "Beløp"
@@ -1593,7 +1623,7 @@ msgstr "E-poster"
msgid "Add member"
msgstr "Legg til medlem"
-#: gym/templates/gym/new_user.html:48 nutrition/templates/rate/form.html:120
+#: gym/templates/gym/new_user.html:48 nutrition/templates/rate/form.html:121
msgid "Info"
msgstr "Info"
@@ -1774,10 +1804,6 @@ msgstr "Pull-up stang"
msgid "Quads"
msgstr ""
-#: i18n.tpl:30
-msgid "Repetitions"
-msgstr "Repetisjoner"
-
#: i18n.tpl:31
msgid "Resistance band"
msgstr ""
@@ -1808,198 +1834,204 @@ msgstr "Triceps brachii"
msgid "Until Failure"
msgstr "Til Utmattelse"
-#: i18n.tpl:40
+#: i18n.tpl:38
+#, fuzzy
+#| msgid "Kilometers"
+msgid "Meters"
+msgstr "Kilometer"
+
+#: i18n.tpl:41
msgid "none (bodyweight exercise)"
msgstr "ingen (kroppsvekt øvelse)"
-#: i18n.tpl:41
+#: i18n.tpl:42
msgid "Beginner"
msgstr ""
-#: i18n.tpl:42
+#: i18n.tpl:43
#, fuzzy
#| msgctxt "As in \"content of an email\""
#| msgid "Content"
msgid "Consistent"
msgstr "Innhold"
-#: i18n.tpl:43
+#: i18n.tpl:44
msgid "Dedicated"
msgstr ""
-#: i18n.tpl:44
+#: i18n.tpl:45
msgid "Obsessed"
msgstr ""
-#: i18n.tpl:45
+#: i18n.tpl:46
msgid "Legend"
msgstr "Forklaring"
-#: i18n.tpl:46
+#: i18n.tpl:47
msgid "Veteran"
msgstr ""
-#: i18n.tpl:47
+#: i18n.tpl:48
msgid "Titan"
msgstr ""
-#: i18n.tpl:48
+#: i18n.tpl:49
msgid "Unstoppable"
msgstr ""
-#: i18n.tpl:49
+#: i18n.tpl:50
msgid "Weekend Warrior"
msgstr ""
-#: i18n.tpl:50
+#: i18n.tpl:51
msgid "Elephant lifter"
msgstr ""
-#: i18n.tpl:51
+#: i18n.tpl:52
msgid "Bus lifter"
msgstr ""
-#: i18n.tpl:52
+#: i18n.tpl:53
msgid "Plane lifter"
msgstr ""
-#: i18n.tpl:53
+#: i18n.tpl:54
msgid "Blue whale lifter"
msgstr ""
-#: i18n.tpl:54
+#: i18n.tpl:55
msgid "Space Station lifter"
msgstr ""
-#: i18n.tpl:55
+#: i18n.tpl:56
msgid "Millionaire"
msgstr ""
-#: i18n.tpl:56
+#: i18n.tpl:57
msgid "Atlas"
msgstr ""
-#: i18n.tpl:57
+#: i18n.tpl:58
msgid "Early Bird"
msgstr ""
-#: i18n.tpl:58
+#: i18n.tpl:59
#, fuzzy
#| msgid "Weight log"
msgid "Night Owl"
msgstr "Vektlogg"
-#: i18n.tpl:59
+#: i18n.tpl:60
msgid "New Year, New Me"
msgstr ""
-#: i18n.tpl:60
+#: i18n.tpl:61
msgid "Phoenix"
msgstr ""
-#: i18n.tpl:61
+#: i18n.tpl:62
#, fuzzy
#| msgid "Personal data"
msgid "Personal Record"
msgstr "Personlig data"
-#: i18n.tpl:62
+#: i18n.tpl:63
#, fuzzy
#| msgid "Copy workout"
msgid "Complete your first workout"
msgstr "Kopier treningsøkt"
-#: i18n.tpl:63
+#: i18n.tpl:64
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 10 workouts"
msgstr "Eksempel treningsøkt"
-#: i18n.tpl:64
+#: i18n.tpl:65
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 50 workouts"
msgstr "Eksempel treningsøkt"
-#: i18n.tpl:65
+#: i18n.tpl:66
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 100 workouts"
msgstr "Eksempel treningsøkt"
-#: i18n.tpl:66
+#: i18n.tpl:67
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 200 workouts"
msgstr "Eksempel treningsøkt"
-#: i18n.tpl:67
+#: i18n.tpl:68
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 500 workouts"
msgstr "Eksempel treningsøkt"
-#: i18n.tpl:68
+#: i18n.tpl:69
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 1000 workouts"
msgstr "Eksempel treningsøkt"
-#: i18n.tpl:69
+#: i18n.tpl:70
msgid "Maintain a 30-day workout streak"
msgstr ""
-#: i18n.tpl:70
+#: i18n.tpl:71
msgid "Work out on Saturday and Sunday for 4 consecutive weekends"
msgstr ""
-#: i18n.tpl:71
+#: i18n.tpl:72
msgid "Lift a cumulative total of 5.000 kg"
msgstr ""
-#: i18n.tpl:72
+#: i18n.tpl:73
msgid "Lift a cumulative total of 20.000 kg"
msgstr ""
-#: i18n.tpl:73
+#: i18n.tpl:74
msgid "Lift a cumulative total of 50.000 kg"
msgstr ""
-#: i18n.tpl:74
+#: i18n.tpl:75
msgid "Lift a cumulative total of 150.000 kg"
msgstr ""
-#: i18n.tpl:75
+#: i18n.tpl:76
msgid "Lift a cumulative total of 450.000 kg"
msgstr ""
-#: i18n.tpl:76
+#: i18n.tpl:77
msgid "Lift a cumulative total of 1.000.000 kg"
msgstr ""
-#: i18n.tpl:77
+#: i18n.tpl:78
msgid "Lift a cumulative total of 10.000.000 kg"
msgstr ""
-#: i18n.tpl:78
+#: i18n.tpl:79
msgid "Complete a workout before 6:00 AM"
msgstr ""
-#: i18n.tpl:79
+#: i18n.tpl:80
msgid "Complete a workout after 9:00 PM"
msgstr ""
-#: i18n.tpl:80
+#: i18n.tpl:81
#, fuzzy
#| msgid "Workout for %s"
msgid "Work out on January 1st"
msgstr "Treningsøkt for %s"
-#: i18n.tpl:81
+#: i18n.tpl:82
msgid "Return to training after being inactive for 30 days"
msgstr ""
-#: i18n.tpl:82
+#: i18n.tpl:83
msgid "Achieve a new Personal Record on any exercise"
msgstr ""
@@ -2085,7 +2117,7 @@ msgstr "Øvelse"
msgid "Routine will expire soon"
msgstr "Treningen vil utløpe snart"
-#: manager/models/routine.py:153 manager/models/session.py:145
+#: manager/models/routine.py:154 manager/models/session.py:145
msgid "The start time cannot be after the end time."
msgstr "Starttiden kan ikke være etter sluttiden."
@@ -2169,23 +2201,27 @@ msgstr "Treningsøkt"
msgid "Workout for %s"
msgstr "Treningsøkt for %s"
-#: nutrition/forms.py:62
+#: nutrition/extract_info/off.py:72 nutrition/extract_info/off.py:91
+msgid "Serving"
+msgstr ""
+
+#: nutrition/forms.py:71 nutrition/forms.py:208
msgid "Unit"
msgstr "Enhet"
-#: nutrition/forms.py:170 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:179 nutrition/templates/rate/form.html:77
msgid "Basic caloric intake"
msgstr "Grunnleggende kaloriinntak"
-#: nutrition/forms.py:171
+#: nutrition/forms.py:180
msgid "Your basic caloric intake as calculated for your data"
msgstr "Din grunnleggende kaloriinntak beregnet med din data"
-#: nutrition/forms.py:176
+#: nutrition/forms.py:185
msgid "Additional calories"
msgstr "Ekstra kalorier"
-#: nutrition/forms.py:178
+#: nutrition/forms.py:187
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
@@ -2194,15 +2230,33 @@ msgstr ""
"negativt tall)"
#: nutrition/forms.py:209
+msgid "grams (g)"
+msgstr ""
+
+#: nutrition/forms.py:219
msgid "Ingredient"
msgstr "Ingrediens"
-#: nutrition/forms.py:213
+#: nutrition/forms.py:223
#, fuzzy
#| msgid "Also use ingredients in English"
msgid "Also search for names in English"
msgstr "Bruk også ingredienser på engelsk"
+#: nutrition/forms.py:239
+msgid "Quantity"
+msgstr ""
+
+#: nutrition/forms.py:241
+msgid "Enter a quantity and choose grams (g) or one of the serving units."
+msgstr ""
+
+#: nutrition/models/ingredient.py:526
+#, fuzzy
+#| msgid "Correction"
+msgid "Portion"
+msgstr "Korreksjon"
+
#: nutrition/templates/ingredient/email_new.tpl:1
#, fuzzy, python-format
msgid ""
@@ -2251,59 +2305,92 @@ msgstr ""
"når du registrerte kontoen, vil du få beskjed når prosessen er fullført "
"vellykket."
-#: nutrition/templates/ingredient/overview.html:38
+#: nutrition/templates/ingredient/overview.html:32
+#: nutrition/templates/ingredient/overview.html:68
+#: nutrition/templates/ingredient/view.html:143
+msgid "Vegan"
+msgstr ""
+
+#: nutrition/templates/ingredient/overview.html:34
+#: nutrition/templates/ingredient/overview.html:79
+#: nutrition/templates/ingredient/view.html:155
+#, fuzzy
+#| msgid "Variations"
+msgid "Vegetarian"
+msgstr "Variasjoner"
+
+#: nutrition/templates/ingredient/overview.html:43
msgid "No ingredients."
msgstr "Ingen ingredienser."
-#: nutrition/templates/ingredient/overview.html:49
+#: nutrition/templates/ingredient/overview.html:54
msgid "Search"
msgstr "Søk"
-#: nutrition/templates/ingredient/view.html:45 nutrition/views/plan.py:237
+#: nutrition/templates/ingredient/overview.html:57
+#, fuzzy
+#| msgid "No filter"
+msgid "Filter"
+msgstr "Ingen filter"
+
+#: nutrition/templates/ingredient/overview.html:83
+msgid "Apply"
+msgstr ""
+
+#: nutrition/templates/ingredient/overview.html:85
+msgid "Reset"
+msgstr ""
+
+#: nutrition/templates/ingredient/view.html:46 nutrition/views/plan.py:236
msgid "Macronutrients"
msgstr "Makronæringsstoffer"
-#: nutrition/templates/ingredient/view.html:54
+#: nutrition/templates/ingredient/view.html:55
msgid "kJ"
msgstr "kJ"
-#: nutrition/templates/ingredient/view.html:70 nutrition/views/plan.py:267
+#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:266
msgid "Sugar content in carbohydrates"
msgstr "Sukkerinnholdet i karbohydrater"
-#: nutrition/templates/ingredient/view.html:75
-#: nutrition/templates/ingredient/view.html:91
-#: nutrition/templates/ingredient/view.html:113
-#: nutrition/templates/ingredient/view.html:123
+#: nutrition/templates/ingredient/view.html:76
+#: nutrition/templates/ingredient/view.html:92
+#: nutrition/templates/ingredient/view.html:114
+#: nutrition/templates/ingredient/view.html:124
msgid "n.A."
msgstr "n.A."
-#: nutrition/templates/ingredient/view.html:86 nutrition/views/plan.py:281
+#: nutrition/templates/ingredient/view.html:87 nutrition/views/plan.py:280
msgid "Saturated fat content in fats"
msgstr "Mettet fett i fett"
-#: nutrition/templates/ingredient/view.html:102
+#: nutrition/templates/ingredient/view.html:103
msgid "Others"
msgstr "Andre"
-#: nutrition/templates/ingredient/view.html:108 nutrition/views/plan.py:287
+#: nutrition/templates/ingredient/view.html:109 nutrition/views/plan.py:286
msgid "Fiber"
msgstr ""
-#: nutrition/templates/ingredient/view.html:118 nutrition/views/plan.py:293
+#: nutrition/templates/ingredient/view.html:119 nutrition/views/plan.py:292
msgid "Sodium"
msgstr "Natrium"
-#: nutrition/templates/ingredient/view.html:143
-#: nutrition/templates/units/list.html:50 nutrition/views/unit.py:86
+#: nutrition/templates/ingredient/view.html:136
+#, fuzzy
+#| msgid "Click here for more information"
+msgid "Dietary information"
+msgstr "Klikk her for mer informasjon"
+
+#: nutrition/templates/ingredient/view.html:184
msgid "Add new weight unit"
msgstr "Legg til vekt enhet"
-#: nutrition/templates/rate/form.html:25
+#: nutrition/templates/rate/form.html:26
msgid "Basal metabolic rate"
msgstr "Basal metabolic rate"
-#: nutrition/templates/rate/form.html:26
+#: nutrition/templates/rate/form.html:27
msgid ""
"The basal metabolic rate is the amount of energy expended daily\n"
"at rest. This is the minimum energy needed for the body to function, without "
@@ -2315,15 +2402,15 @@ msgstr ""
"uten noen\n"
"ekstra fysisk aktivitet."
-#: nutrition/templates/rate/form.html:37
+#: nutrition/templates/rate/form.html:38
msgid "Your basic metabolic rate is: "
msgstr "Din basal metabolic rate er:"
-#: nutrition/templates/rate/form.html:47
+#: nutrition/templates/rate/form.html:48
msgid "Physical activities"
msgstr "Fysiske aktiviteter"
-#: nutrition/templates/rate/form.html:48
+#: nutrition/templates/rate/form.html:49
msgid ""
"The physical activity level (PAL) is a factor used to to express\n"
"the additional physical activity and is used to calculate the total energy\n"
@@ -2333,11 +2420,11 @@ msgstr ""
"den ekstra fysisk aktiviteten, og brukes til å beregne den totale energien\n"
"som kreves per dag."
-#: nutrition/templates/rate/form.html:59
+#: nutrition/templates/rate/form.html:60
msgid "Factor for daily activities: "
msgstr "Faktor for daglige aktiviteter:"
-#: nutrition/templates/rate/form.html:67
+#: nutrition/templates/rate/form.html:68
msgid ""
"The base caloric intake is the amount of calories your metabolism\n"
"needs based on your level of physical activity."
@@ -2345,11 +2432,11 @@ msgstr ""
"Basen kaloriinntaket er mengden kalorier stoffskiftet ditt trenger\n"
"basert på ditt nivå av fysisk aktivitet."
-#: nutrition/templates/rate/form.html:81
+#: nutrition/templates/rate/form.html:82
msgid "Calculate basic caloric intake"
msgstr "Beregn grunnleggende kaloriinntak"
-#: nutrition/templates/rate/form.html:88
+#: nutrition/templates/rate/form.html:89
msgid ""
"The total calories are the actual total calories per day. This\n"
"might include e.g. a surplus or deficit if you are bulking or cutting. "
@@ -2361,19 +2448,19 @@ msgstr ""
"cutting\". Alternativt\n"
"kan du bare skrive inn selv hvor mye kalorier hvis du kjenner verdien."
-#: nutrition/templates/rate/form.html:102
+#: nutrition/templates/rate/form.html:103
msgid "Transfer basic intake to total daily calories"
msgstr "Overfør grunnleggende inntak til total daglige kalorier"
-#: nutrition/templates/rate/form.html:106
+#: nutrition/templates/rate/form.html:107
msgid "Add additional calories to total daily calories"
msgstr "Legg til ekstra kalorier til totale daglige kalorier"
-#: nutrition/templates/rate/form.html:110
+#: nutrition/templates/rate/form.html:111
msgid "Save total calories to profile"
msgstr "Lagre totale kalorier til profil"
-#: nutrition/templates/rate/form.html:121
+#: nutrition/templates/rate/form.html:122
msgid ""
"Please note that these calculations can only be an\n"
"approximation. If you base your nutrition plan on these values, observe\n"
@@ -2384,48 +2471,48 @@ msgstr ""
"nødvendig\n"
"selv i noen uker om det totale beløpet må endres."
-#: nutrition/views/ingredient.py:158
+#: nutrition/views/ingredient.py:163
msgid "Add a new ingredient"
msgstr "Legg til ny ingrediens"
-#: nutrition/views/plan.py:128
+#: nutrition/views/plan.py:127
msgid "Nutritional plan"
msgstr "Ernæringsplan"
-#: nutrition/views/plan.py:130
+#: nutrition/views/plan.py:129
#, python-format
msgid "Nutritional plan for %s"
msgstr "Ernæringsplan for %s"
-#: nutrition/views/plan.py:202
+#: nutrition/views/plan.py:201
msgid "<i>This is an empty plan, what did you expect on the PDF?</i>"
msgstr "<i>Dette er en tom plan, hva hadde du forventet i PDF dokumentet?</i>"
-#: nutrition/views/plan.py:230
+#: nutrition/views/plan.py:229
msgid "Nutritional data"
msgstr "Ernæringsmessige data"
-#: nutrition/views/plan.py:238
+#: nutrition/views/plan.py:237
msgid "Total"
msgstr "Totalt"
-#: nutrition/views/plan.py:239
+#: nutrition/views/plan.py:238
msgid "Percent of energy"
msgstr "Prosent av energien"
-#: nutrition/views/plan.py:240
+#: nutrition/views/plan.py:239
msgid "g per body kg"
msgstr "g per kropps kg"
-#: nutrition/views/unit_ingredient.py:69
+#: nutrition/views/unit_ingredient.py:64
msgid "Add a new weight unit"
msgstr "Legg til en ny vektenhet"
-#: nutrition/views/unit_ingredient.py:106
+#: nutrition/views/unit_ingredient.py:99
msgid "Edit a weight unit to ingredient connection"
msgstr "Endre en vektenhet til ingrediens tilkobling"
-#: nutrition/views/unit_ingredient.py:138
+#: nutrition/views/unit_ingredient.py:129
msgid "Delete?"
msgstr "Slett?"
@@ -2826,7 +2913,7 @@ msgstr "Kildekode"
msgid "Translation"
msgstr "Oversettelse"
-#: utils/generic_views.py:263
+#: utils/generic_views.py:246
msgid "Yes, delete"
msgstr "Ja, slett det"
@@ -2885,10 +2972,6 @@ msgstr "Du må angi vekten din"
msgid "Import weight logs"
msgstr "Importer vektlogger"
-#: weight/templates/import_csv_form.html:9
-msgid "Submit"
-msgstr "Send"
-
#: weight/templates/import_csv_form.html:15
msgid ""
"Use this import field to import your weight logs into Workout\n"
@@ -3010,6 +3093,26 @@ msgstr ""
msgid "Re-Submit"
msgstr "Send på nytt"
+#~ msgid "Email verification"
+#~ msgstr "Epost verifisering"
+
+#, python-format
+#~ msgid "%(username)s, your email was verified"
+#~ msgstr "%(username)s, din epost ble verifisert"
+
+#~ msgid "Error, invalid verification token"
+#~ msgstr "Feil, ugyldig verifikasjonstoken"
+
+#~ msgid "Email Confirmation"
+#~ msgstr "Epost Bekreftelse"
+
+#, python-format
+#~ msgid "You are almost there, %(username)s!"
+#~ msgstr "Du er nesten der, %(username)s!"
+
+#~ msgid "Ingredient weight units"
+#~ msgstr "Vektenheter for ingredienser"
+
#~ msgid "Image"
#~ msgstr "Bilde"
@@ -3040,9 +3143,6 @@ msgstr "Send på nytt"
#~ msgid "Secondary muscles"
#~ msgstr "Sekundære muskler"
-#~ msgid "Variations"
-#~ msgstr "Variasjoner"
-
#~ msgid "Exercise Categories"
#~ msgstr "Øvelses kategorier"
@@ -4068,9 +4168,6 @@ msgstr "Send på nytt"
#~ msgid "This content is available under the following license:"
#~ msgstr "Dette innholdet er tilgjengelig under følgende lisens:"
-#~ msgid "Click here for more information"
-#~ msgstr "Klikk her for mer informasjon"
-
#, fuzzy, python-format
#~ msgid "%(name)s is too similar to existing exercise \"%(exercise_name)s\""
#~ msgstr ""
@@ -4776,9 +4873,6 @@ msgstr "Send på nytt"
#~ msgid "Last 12 months"
#~ msgstr "Siste 12 måneder"
-#~ msgid "No filter"
-#~ msgstr "Ingen filter"
-
#~ msgid "Days"
#~ msgstr "Dager"
diff --git a/wger/locale/os/LC_MESSAGES/django.po b/wger/locale/os/LC_MESSAGES/django.po
index c755f4c71..f2219942d 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: 2026-01-17 14:03+0000\n"
+"POT-Creation-Date: 2026-04-10 10:20+0000\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/"
@@ -32,7 +32,7 @@ msgstr ""
#: config/views/gym_config.py:42 core/templates/language/view.html:64
#: core/templates/license/list.html:17
#: core/templates/repetition_unit/list.html:18
-#: core/templates/user/overview.html:204 core/templates/user/overview.html:467
+#: core/templates/user/overview.html:207 core/templates/user/overview.html:470
#: core/templates/weight_unit/list.html:18
#: exercises/templates/categories/admin-overview.html:17
#: exercises/templates/equipment/admin-overview.html:17
@@ -44,30 +44,29 @@ msgstr ""
#: gym/templates/gym/list.html:19 gym/templates/gym/list.html:48
#: gym/templates/gym/member_list.html:94 gym/templates/gym/member_list.html:152
#: gym/templates/gym/member_list.html:190
-#: nutrition/templates/ingredient/view.html:164
-#: nutrition/templates/ingredient/view.html:209
-#: nutrition/templates/units/list.html:19
+#: nutrition/templates/ingredient/view.html:205
+#: nutrition/templates/ingredient/view.html:248
msgid "Edit"
msgstr "Ивын"
-#: core/forms.py:91 core/templates/navigation.html:271
-#: core/templates/navigation.html:278 core/templates/user/login.html:4
+#: core/forms.py:89 core/templates/navigation.html:268
+#: core/templates/navigation.html:275 core/templates/user/login.html:4
#: core/templates/user/registration_sidebar.html:12
#: software/templates/features.html:82 software/templates/features.html:448
msgid "Login"
msgstr ""
-#: core/forms.py:130 core/forms.py:244 gym/views/export.py:61
+#: core/forms.py:128 core/forms.py:242 gym/views/export.py:61
#: gym/views/gym.py:217
msgid "First name"
msgstr ""
-#: core/forms.py:131 core/forms.py:245 core/templates/user/overview.html:284
+#: core/forms.py:129 core/forms.py:243 core/templates/user/overview.html:287
#: gym/views/export.py:62 gym/views/gym.py:217
msgid "Last name"
msgstr ""
-#: core/forms.py:133 core/forms.py:210 core/templates/user/overview.html:288
+#: core/forms.py:131 core/forms.py:208 core/templates/user/overview.html:291
#: gym/models/contract.py:256 gym/models/gym.py:58
#: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:116
#: gym/templates/gym/new_user.html:30 gym/views/export.py:60
@@ -77,53 +76,53 @@ msgstr ""
msgid "Email"
msgstr "Email"
-#: core/forms.py:134
+#: core/forms.py:132
msgid "Used for password resets and, optionally, e-mail reminders."
msgstr ""
-#: core/forms.py:138 core/models/profile.py:222
+#: core/forms.py:136 core/models/profile.py:222
#: gym/templates/gym/new_user.html:38
msgid "Date of Birth"
msgstr ""
-#: core/forms.py:177
+#: core/forms.py:175
msgid "Personal data"
msgstr ""
-#: core/forms.py:189
+#: core/forms.py:187
msgid "Workout reminders"
msgstr ""
-#: core/forms.py:196
+#: core/forms.py:194
msgid "Other settings"
msgstr ""
-#: core/forms.py:204 core/views/user.py:614 core/views/user.py:629
-#: core/views/user.py:641 gym/forms.py:73 utils/generic_views.py:143
+#: core/forms.py:202 core/views/user.py:630 core/views/user.py:654
+#: core/views/user.py:668 gym/forms.py:73 utils/generic_views.py:137
msgid "Save"
msgstr ""
-#: core/forms.py:211
+#: core/forms.py:209
msgid "Used for password resets and, optionally, email reminders."
msgstr ""
-#: core/forms.py:240
+#: core/forms.py:238
msgid "This e-mail address is already in use."
msgstr ""
-#: core/forms.py:261 gym/templates/gym/new_user.html:26
+#: core/forms.py:259 gym/templates/gym/new_user.html:26
#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:217
msgid "Password"
msgstr ""
-#: core/forms.py:263
+#: core/forms.py:261
msgid "Please enter your current password."
msgstr ""
-#: core/forms.py:272 core/templates/language/view.html:70
+#: core/forms.py:270 core/templates/language/view.html:70
#: core/templates/license/list.html:21
#: core/templates/repetition_unit/list.html:22
-#: core/templates/user/overview.html:233
+#: core/templates/user/overview.html:236
#: core/templates/weight_unit/list.html:22
#: exercises/templates/categories/admin-overview.html:21
#: exercises/templates/equipment/admin-overview.html:21
@@ -131,27 +130,30 @@ msgstr ""
#: gym/templates/admin_notes/list.html:37
#: gym/templates/contract_option/list.html:35
#: gym/templates/contract_type/list.html:36 gym/templates/document/list.html:46
-#: gym/templates/gym/list.html:23 nutrition/templates/ingredient/view.html:168
-#: nutrition/templates/ingredient/view.html:215
-#: nutrition/templates/units/list.html:25
+#: gym/templates/gym/list.html:23 nutrition/templates/ingredient/view.html:209
+#: nutrition/templates/ingredient/view.html:254
msgid "Delete"
msgstr "Схафын"
-#: core/forms.py:281
+#: core/forms.py:279
msgid "Invalid password"
msgstr ""
-#: core/forms.py:293
+#: core/forms.py:291 core/forms.py:349
msgid "The form is secured with reCAPTCHA"
msgstr ""
-#: core/forms.py:314 core/forms.py:341 core/templates/navigation.html:272
-#: core/templates/navigation.html:285 core/templates/template.html:123
-#: core/templates/user/login.html:21 core/views/user.py:285
+#: core/forms.py:312 core/forms.py:339 core/templates/navigation.html:269
+#: core/templates/navigation.html:282 core/templates/template.html:113
+#: core/templates/user/login.html:21 core/views/user.py:293
#: software/templates/features.html:87 software/templates/features.html:442
msgid "Register"
msgstr ""
+#: core/forms.py:360 weight/templates/import_csv_form.html:9
+msgid "Submit"
+msgstr ""
+
#: core/models/language.py:31 core/templates/language/view.html:21
msgid "Language short name"
msgstr "Ӕвзаджы цыбыр ном"
@@ -188,36 +190,36 @@ msgstr ""
msgid "Link to license text or other information"
msgstr ""
-#: core/models/profile.py:57
+#: core/models/profile.py:60
#, python-format
msgid "%(birthdate)s is not a valid birthdate"
msgstr ""
-#: core/models/profile.py:66
+#: core/models/profile.py:69
msgid "Male"
msgstr ""
-#: core/models/profile.py:67
+#: core/models/profile.py:70
msgid "Female"
msgstr ""
-#: core/models/profile.py:74
+#: core/models/profile.py:77
msgid "Low"
msgstr ""
-#: core/models/profile.py:75
+#: core/models/profile.py:78
msgid "Medium"
msgstr ""
-#: core/models/profile.py:76
+#: core/models/profile.py:79
msgid "High"
msgstr ""
-#: core/models/profile.py:82
+#: core/models/profile.py:85
msgid "Metric (kilogram)"
msgstr ""
-#: core/models/profile.py:83
+#: core/models/profile.py:86
msgid "Imperial (pound)"
msgstr ""
@@ -325,7 +327,7 @@ msgstr ""
msgid "Free time"
msgstr ""
-#: core/models/profile.py:320 nutrition/templates/rate/form.html:66
+#: core/models/profile.py:320 nutrition/templates/rate/form.html:67
msgid "Total daily calories"
msgstr ""
@@ -363,20 +365,41 @@ msgstr ""
msgid "Enable or disable the trophy system for this user"
msgstr ""
-#: core/models/profile.py:446
+#: core/models/profile.py:457
msgid "The sum of all hours has to be 24"
msgstr ""
-#: core/models/rep_unit.py:36 core/models/weight_unit.py:42
-#: core/templates/user/overview.html:280 core/views/user.py:589
+#: core/models/rep_unit.py:32 i18n.tpl:30
+msgid "Repetitions"
+msgstr ""
+
+#: core/models/rep_unit.py:33 core/templates/user/overview.html:82
+#: exercises/templates/history/overview.html:30
+msgid "Time"
+msgstr ""
+
+#: core/models/rep_unit.py:34
+msgid "Distance"
+msgstr ""
+
+#: core/models/rep_unit.py:47 core/models/weight_unit.py:42
+#: core/templates/user/overview.html:283 core/views/user.py:605
#: exercises/models/muscle.py:36 gym/models/contract.py:52
#: gym/models/contract.py:103 gym/models/gym.py:46
#: gym/models/user_document.py:84 gym/templates/contract/view.html:50
#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:108
-#: gym/views/gym.py:158 nutrition/templates/ingredient/view.html:151
+#: gym/views/gym.py:158 nutrition/templates/ingredient/view.html:192
msgid "Name"
msgstr "Ном"
+#: core/models/rep_unit.py:53
+msgid "Unit Type"
+msgstr ""
+
+#: core/models/rep_unit.py:54
+msgid "The type of unit (repetitions, time, or distance)"
+msgstr ""
+
#: core/templates/403.html:4
msgid "Forbidden!"
msgstr ""
@@ -404,81 +427,73 @@ msgid ""
"later time. If the problem persists, you can seek help in ways listed below:"
msgstr ""
-#: core/templates/base.html:10
-#, python-format
-msgid ""
-"You are browsing the site as the user \"%(current_user)s\", all actions are "
-"performed on their data."
+#: core/templates/account/email/email_confirmation_message.html:81
+msgid "Almost there!"
msgstr ""
-#: core/templates/base.html:15 core/templates/base_wide.html:12
+#: core/templates/account/email/email_confirmation_message.html:85
#, python-format
-msgid "Back to \"%(target)s\""
+msgid ""
+"You're receiving this email because the user \"%(user_display)s\" has given "
+"your email address to register an account on %(site_domain)s."
msgstr ""
-#: core/templates/base_wide.html:7
-#, python-format
+#: core/templates/account/email/email_confirmation_message.html:93
msgid ""
-"You are\n"
-" browsing the site as the user \"%(current_user)s\", all "
-"actions are performed on\n"
-" their data.\n"
-" "
+"Your email verification code is listed below. Please enter it in your open "
+"browser window."
msgstr ""
-#: core/templates/delete.html:4
-msgid "Are you sure you want to delete this? This action cannot be undone."
+#: core/templates/account/email/email_confirmation_message.html:100
+msgid "Please click the button below to confirm your email address."
msgstr ""
-#: core/templates/email_verification/confirm_template.html:4
-#, fuzzy
-#| msgid "Administration"
-msgid "Email verification"
-msgstr "Администраци"
+#: core/templates/account/email/email_confirmation_message.html:106
+msgid "Confirm email"
+msgstr ""
-#: core/templates/email_verification/confirm_template.html:18
+#: core/templates/account/email/email_confirmation_message.html:110
#, python-format
-msgid "%(username)s, your email was verified"
+msgid ""
+"The link is valid for %(expire_hours)s hours (until %(date)s, %(time)s). You "
+"can request a new one from your profile settings."
msgstr ""
-#: core/templates/email_verification/confirm_template.html:22
-msgid "Error, invalid verification token"
+#: core/templates/account/email/email_confirmation_message.html:116
+msgid "If the button doesn't work, copy and paste this link into your browser:"
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!"
+#: core/templates/account/email/email_confirmation_message.html:125
+msgid "the wger Team"
msgstr ""
-#: core/templates/email_verification/email_body_html.tpl:11
+#: core/templates/base.html:10
#, python-format
-msgid "Please click <a href=\"%(link)s\">here</a> to confirm your email"
+msgid ""
+"You are browsing the site as the user \"%(current_user)s\", all actions are "
+"performed on their data."
msgstr ""
-#: core/templates/email_verification/email_body_html.tpl:12
-#: core/templates/email_verification/email_body_txt.tpl:5
+#: core/templates/base.html:15 core/templates/base_wide.html:12
#, python-format
-msgid "The token expires on %(time)s"
+msgid "Back to \"%(target)s\""
msgstr ""
-#: core/templates/email_verification/email_body_html.tpl:14
-#: core/templates/email_verification/email_body_txt.tpl:8
-msgid "the wger Team"
+#: core/templates/base_wide.html:7
+#, python-format
+msgid ""
+"You are\n"
+" browsing the site as the user \"%(current_user)s\", all "
+"actions are performed on\n"
+" their data.\n"
+" "
msgstr ""
-#: core/templates/email_verification/email_body_txt.tpl:4
-#, python-format
-msgid "Please click the following link to confirm your email: %(link)s"
+#: core/templates/delete.html:4
+msgid "Are you sure you want to delete this? This action cannot be undone."
msgstr ""
-#: core/templates/language/overview.html:4 core/templates/navigation.html:344
+#: core/templates/language/overview.html:4 core/templates/navigation.html:341
msgid "Languages"
msgstr ""
@@ -487,16 +502,16 @@ msgid "Nothing found."
msgstr ""
#: core/templates/language/overview.html:22
-#: nutrition/templates/ingredient/overview.html:38
+#: nutrition/templates/ingredient/overview.html:43
msgid "Add one now."
msgstr ""
#: core/templates/language/overview.html:34 core/templates/license/list.html:43
-#: core/templates/repetition_unit/list.html:46
-#: core/templates/user/overview.html:344 core/templates/user/overview.html:384
-#: core/templates/user/overview.html:422
-#: core/templates/weight_unit/list.html:46 core/views/languages.py:74
-#: core/views/license.py:66 core/views/repetition_units.py:66
+#: core/templates/repetition_unit/list.html:44
+#: core/templates/user/overview.html:347 core/templates/user/overview.html:387
+#: core/templates/user/overview.html:425
+#: core/templates/weight_unit/list.html:46 core/views/languages.py:77
+#: core/views/license.py:66 core/views/repetition_units.py:76
#: core/views/weight_units.py:66
#: exercises/templates/categories/admin-overview.html:40
#: exercises/templates/equipment/admin-overview.html:39
@@ -509,14 +524,14 @@ msgstr ""
#: gym/templates/gym/member_list.html:264
#: gym/templates/gym/member_list.html:303
#: mailer/templates/mailer/gym/overview.html:43
-#: nutrition/templates/ingredient/overview.html:60
+#: nutrition/templates/ingredient/overview.html:97
msgid "Add"
msgstr "Бафтауын"
#: core/templates/language/view.html:61 core/templates/user/api_key.html:41
#: core/templates/user/preferences.html:50 gym/models/contract.py:203
#: gym/templates/contract/view.html:41 gym/templates/gym/member_list.html:270
-#: nutrition/templates/ingredient/view.html:206
+#: nutrition/templates/ingredient/view.html:245
msgid "Options"
msgstr "Фадӕттӕ"
@@ -526,9 +541,9 @@ msgstr ""
#: core/templates/license/list.html:30
#: core/templates/repetition_unit/list.html:32
-#: core/templates/user/overview.html:104 core/templates/user/overview.html:136
-#: core/templates/user/overview.html:185 core/templates/user/overview.html:365
-#: core/templates/user/overview.html:404 core/templates/user/overview.html:448
+#: core/templates/user/overview.html:107 core/templates/user/overview.html:139
+#: core/templates/user/overview.html:188 core/templates/user/overview.html:368
+#: core/templates/user/overview.html:407 core/templates/user/overview.html:451
#: core/templates/weight_unit/list.html:32
#: exercises/templates/categories/admin-overview.html:30
#: exercises/templates/equipment/admin-overview.html:30
@@ -540,11 +555,10 @@ msgstr ""
#: gym/templates/gym/member_list.html:284
#: gym/templates/gym/member_list.html:321
#: mailer/templates/mailer/gym/overview.html:30
-#: nutrition/templates/units/list.html:34
msgid "Nothing found"
msgstr ""
-#: core/templates/misc/about.html:4 core/templates/template.html:160
+#: core/templates/misc/about.html:4 core/templates/template.html:150
msgid "Imprint"
msgstr ""
@@ -552,164 +566,159 @@ msgstr ""
msgid "Training"
msgstr "Фӕлтӕрд"
-#: core/templates/navigation.html:37 core/templates/user/overview.html:25
+#: core/templates/navigation.html:36 core/templates/user/overview.html:28
msgid "Routines"
msgstr ""
-#: core/templates/navigation.html:45 core/templates/user/overview.html:70
+#: core/templates/navigation.html:44 core/templates/user/overview.html:73
msgid "Calendar"
msgstr ""
-#: core/templates/navigation.html:55
+#: core/templates/navigation.html:53
msgid "Measurements"
msgstr ""
-#: core/templates/navigation.html:66 gallery/templates/images/overview.html:6
+#: core/templates/navigation.html:64 gallery/templates/images/overview.html:6
msgid "Gallery"
msgstr ""
-#: core/templates/navigation.html:72
-msgid "Workout templates"
+#: core/templates/navigation.html:74 core/templates/navigation.html:400
+#: trophies/templates/trophies/overview.html:7
+msgid "Trophies"
msgstr ""
#: core/templates/navigation.html:79
+msgid "Workout templates"
+msgstr ""
+
+#: core/templates/navigation.html:86
msgid "Your templates"
msgstr ""
-#: core/templates/navigation.html:88
+#: core/templates/navigation.html:95
msgid "Public templates"
msgstr ""
-#: core/templates/navigation.html:96 software/templates/features.html:51
+#: core/templates/navigation.html:103 software/templates/features.html:51
#: software/templates/features.html:480
msgid "Exercises"
msgstr "Фӕлтӕрӕнтӕ"
-#: core/templates/navigation.html:102 core/templates/navigation.html:176
-#: core/templates/navigation.html:339
+#: core/templates/navigation.html:109 core/templates/navigation.html:336
msgid "Administration"
msgstr "Администраци"
-#: core/templates/navigation.html:106
+#: core/templates/navigation.html:113
#, fuzzy
#| msgid "Exercise Categories"
msgid "Exercise edit history"
msgstr "Фӕлтӕрӕнты ӕмбырд"
-#: core/templates/navigation.html:112
+#: core/templates/navigation.html:119
msgid "Equipment"
msgstr ""
-#: core/templates/navigation.html:118
+#: core/templates/navigation.html:125
msgid "Muscles"
msgstr "Мускултӕ"
-#: core/templates/navigation.html:124
+#: core/templates/navigation.html:131
#: exercises/templates/categories/admin-overview.html:4
msgid "Categories"
msgstr ""
-#: core/templates/navigation.html:139 software/templates/features.html:468
+#: core/templates/navigation.html:146 software/templates/features.html:468
msgid "Nutrition"
msgstr ""
-#: core/templates/navigation.html:147 core/templates/user/overview.html:144
+#: core/templates/navigation.html:154 core/templates/user/overview.html:147
msgid "Nutrition plans"
msgstr ""
-#: core/templates/navigation.html:156
+#: core/templates/navigation.html:163
msgid "BMI calculator"
msgstr ""
-#: core/templates/navigation.html:165 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:172 nutrition/templates/rate/form.html:18
msgid "Daily calories calculator"
msgstr ""
-#: core/templates/navigation.html:171
+#: core/templates/navigation.html:178
#: nutrition/templates/ingredient/overview.html:10
msgid "Ingredient overview"
msgstr ""
-#: core/templates/navigation.html:180 nutrition/templates/units/list.html:6
-msgid "Ingredient weight units"
-msgstr ""
-
-#: core/templates/navigation.html:196 software/templates/features.html:463
+#: core/templates/navigation.html:193 software/templates/features.html:463
msgid "Body weight"
msgstr ""
-#: core/templates/navigation.html:203 core/templates/user/overview.html:114
+#: core/templates/navigation.html:200 core/templates/user/overview.html:117
msgid "Weight overview"
msgstr ""
-#: core/templates/navigation.html:217
+#: core/templates/navigation.html:214
msgid "About this software"
msgstr ""
-#: core/templates/navigation.html:223 software/templates/about_us.html:5
+#: core/templates/navigation.html:220 software/templates/about_us.html:5
msgid "Support & Get Involved"
msgstr ""
-#: core/templates/navigation.html:229 software/templates/features.html:528
+#: core/templates/navigation.html:226 software/templates/features.html:528
msgid "REST API"
msgstr ""
-#: core/templates/navigation.html:235 utils/models.py:45
+#: core/templates/navigation.html:232 utils/models.py:45
msgid "License"
msgstr ""
-#: core/templates/navigation.html:241
+#: core/templates/navigation.html:238
msgid "Developer documentation"
msgstr ""
-#: core/templates/navigation.html:248
+#: core/templates/navigation.html:245
msgid "Get the code"
msgstr ""
-#: core/templates/navigation.html:255 core/templates/template.html:199
-#: software/templates/features.html:603
+#: core/templates/navigation.html:252 core/templates/template.html:202
+#: software/templates/features.html:614
msgid "Translate"
msgstr ""
-#: core/templates/navigation.html:292 core/templates/user/login.html:30
+#: core/templates/navigation.html:289 core/templates/user/login.html:30
msgid "Reset password"
msgstr ""
-#: core/templates/navigation.html:301 core/templates/navigation.html:329
+#: core/templates/navigation.html:298 core/templates/navigation.html:326
msgid "Logout"
msgstr ""
-#: core/templates/navigation.html:320
+#: core/templates/navigation.html:317
msgid "My preferences"
msgstr ""
-#: core/templates/navigation.html:352
+#: core/templates/navigation.html:349
msgid "Licenses"
msgstr ""
-#: core/templates/navigation.html:360
+#: core/templates/navigation.html:357
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr ""
-#: core/templates/navigation.html:368 core/templates/weight_unit/list.html:4
-#: nutrition/templates/ingredient/view.html:141
+#: core/templates/navigation.html:365 core/templates/weight_unit/list.html:4
+#: nutrition/templates/ingredient/view.html:182
msgid "Weight units"
msgstr ""
-#: core/templates/navigation.html:376 core/templates/user/list.html:4
+#: core/templates/navigation.html:373 core/templates/user/list.html:4
msgid "User list"
msgstr ""
-#: core/templates/navigation.html:382
+#: core/templates/navigation.html:379
msgid "Gyms"
msgstr ""
-#: core/templates/navigation.html:403
-#: trophies/templates/trophies/overview.html:7
-msgid "Trophies"
-msgstr ""
-
#: core/templates/registration/password_reset_complete.html:4
msgid "Password reset complete"
msgstr ""
@@ -765,25 +774,29 @@ msgstr ""
msgid "next"
msgstr ""
-#: core/templates/template.html:96
+#: core/templates/template.html:86
msgid "Close"
msgstr ""
-#: core/templates/template.html:112
+#: core/templates/template.html:102
msgid ""
"You are using a guest account, data entered will be deleted after a week."
msgstr ""
-#: core/templates/template.html:117
+#: core/templates/template.html:107
msgid "Create some demo entries"
msgstr ""
-#: core/templates/template.html:165 software/templates/features.html:568
+#: core/templates/template.html:155 software/templates/features.html:568
#: software/templates/tos.html:7
msgid "Terms of service"
msgstr ""
-#: core/templates/template_features.html:53 software/templates/features.html:9
+#: core/templates/template.html:181 software/templates/features.html:595
+msgid "Browser language"
+msgstr ""
+
+#: core/templates/template_features.html:46 software/templates/features.html:9
msgid "Features"
msgstr ""
@@ -838,99 +851,94 @@ msgstr ""
msgid "Forgot password?"
msgstr ""
-#: core/templates/user/overview.html:25 core/templates/user/overview.html:68
-#: core/templates/user/overview.html:112 core/templates/user/overview.html:144
-#: core/templates/user/overview.html:348 core/templates/user/overview.html:390
-#: core/templates/user/overview.html:426
+#: core/templates/user/overview.html:28 core/templates/user/overview.html:71
+#: core/templates/user/overview.html:115 core/templates/user/overview.html:147
+#: core/templates/user/overview.html:351 core/templates/user/overview.html:393
+#: core/templates/user/overview.html:429
#, python-format
msgid "last %(number)s"
msgstr ""
-#: core/templates/user/overview.html:27 core/templates/user/overview.html:146
-#: core/templates/user/overview.html:343 core/templates/user/overview.html:382
-#: core/templates/user/overview.html:421 gym/templates/gym/member_list.html:226
+#: core/templates/user/overview.html:30 core/templates/user/overview.html:149
+#: core/templates/user/overview.html:346 core/templates/user/overview.html:385
+#: core/templates/user/overview.html:424 gym/templates/gym/member_list.html:226
#: gym/templates/gym/member_list.html:262
#: gym/templates/gym/member_list.html:302
msgid "Overview"
msgstr ""
-#: core/templates/user/overview.html:34 core/templates/user/overview.html:76
-#: core/templates/user/overview.html:120 core/templates/user/overview.html:152
+#: core/templates/user/overview.html:37 core/templates/user/overview.html:79
+#: core/templates/user/overview.html:123 core/templates/user/overview.html:155
#: manager/helpers.py:88 software/templates/about_us.html:170
#: weight/templates/import_csv_preview.html:13
#: weight/templates/import_csv_preview.html:42 weight/views.py:54
msgid "Date"
msgstr "Бон"
-#: core/templates/user/overview.html:35 core/templates/user/overview.html:153
+#: core/templates/user/overview.html:38 core/templates/user/overview.html:156
#: gym/models/contract.py:58 gym/models/contract.py:109
msgid "Description"
msgstr "Ӕмбарынгӕнӕн"
-#: core/templates/user/overview.html:36
+#: core/templates/user/overview.html:39
msgid "Number of logs (days)"
msgstr ""
-#: core/templates/user/overview.html:37 core/views/user.py:590
+#: core/templates/user/overview.html:40 core/views/user.py:606
#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:158
msgid "Last activity"
msgstr ""
-#: core/templates/user/overview.html:58
+#: core/templates/user/overview.html:61
msgid "No workouts found."
msgstr ""
-#: core/templates/user/overview.html:68
+#: core/templates/user/overview.html:71
msgid "Log"
msgstr ""
-#: core/templates/user/overview.html:77
+#: core/templates/user/overview.html:80
msgid "General impression"
msgstr ""
-#: core/templates/user/overview.html:78 core/templates/user/overview.html:390
+#: core/templates/user/overview.html:81 core/templates/user/overview.html:393
msgid "Notes"
msgstr ""
-#: core/templates/user/overview.html:79
-#: exercises/templates/history/overview.html:30
-msgid "Time"
-msgstr ""
-
-#: core/templates/user/overview.html:112 core/templates/user/overview.html:121
+#: core/templates/user/overview.html:115 core/templates/user/overview.html:124
#: manager/helpers.py:89 weight/templates/import_csv_preview.html:14
#: weight/templates/import_csv_preview.html:43 weight/views.py:54
msgid "Weight"
msgstr ""
-#: core/templates/user/overview.html:154
-#: nutrition/templates/ingredient/view.html:51 nutrition/views/plan.py:245
+#: core/templates/user/overview.html:157
+#: nutrition/templates/ingredient/view.html:52 nutrition/views/plan.py:244
msgid "Energy"
msgstr ""
-#: core/templates/user/overview.html:155
-#: nutrition/templates/ingredient/view.html:58 nutrition/views/plan.py:251
+#: core/templates/user/overview.html:158
+#: nutrition/templates/ingredient/view.html:59 nutrition/views/plan.py:250
msgid "Protein"
msgstr ""
-#: core/templates/user/overview.html:156
-#: nutrition/templates/ingredient/view.html:64 nutrition/views/plan.py:259
+#: core/templates/user/overview.html:159
+#: nutrition/templates/ingredient/view.html:65 nutrition/views/plan.py:258
msgid "Carbohydrates"
msgstr ""
-#: core/templates/user/overview.html:157
-#: nutrition/templates/ingredient/view.html:80 nutrition/views/plan.py:273
+#: core/templates/user/overview.html:160
+#: nutrition/templates/ingredient/view.html:81 nutrition/views/plan.py:272
msgid "Fat"
msgstr ""
-#: core/templates/user/overview.html:170
-#: nutrition/templates/ingredient/view.html:53
+#: core/templates/user/overview.html:173
+#: nutrition/templates/ingredient/view.html:54
msgid "kcal"
msgstr ""
-#: core/templates/user/overview.html:201 core/templates/user/overview.html:340
-#: core/templates/user/overview.html:379 core/templates/user/overview.html:418
-#: core/templates/user/overview.html:463 gym/templates/gym/list.html:45
+#: core/templates/user/overview.html:204 core/templates/user/overview.html:343
+#: core/templates/user/overview.html:382 core/templates/user/overview.html:421
+#: core/templates/user/overview.html:466 gym/templates/gym/list.html:45
#: gym/templates/gym/member_list.html:91 gym/templates/gym/member_list.html:149
#: gym/templates/gym/member_list.html:187
#: gym/templates/gym/member_list.html:223
@@ -939,109 +947,113 @@ msgstr ""
msgid "Actions"
msgstr ""
-#: core/templates/user/overview.html:210
+#: core/templates/user/overview.html:213
msgid "Deactivate user"
msgstr ""
-#: core/templates/user/overview.html:214
+#: core/templates/user/overview.html:217
msgid "Activate user"
msgstr ""
-#: core/templates/user/overview.html:223
+#: core/templates/user/overview.html:226
msgid "Reset user password"
msgstr ""
-#: core/templates/user/overview.html:227 gym/templates/gym/member_list.html:30
+#: core/templates/user/overview.html:230 gym/templates/gym/member_list.html:30
msgid "Roles"
msgstr ""
-#: core/templates/user/overview.html:243
+#: core/templates/user/overview.html:246
msgid "Password reset confirmation"
msgstr ""
-#: core/templates/user/overview.html:247
+#: core/templates/user/overview.html:250
msgid "Do you really want to change this user&#39;s password?"
msgstr ""
-#: core/templates/user/overview.html:250
+#: core/templates/user/overview.html:253
#: exercises/templates/history/overview.html:106
+#: nutrition/templates/ingredient/view.html:148
+#: nutrition/templates/ingredient/view.html:160
msgid "No"
msgstr ""
-#: core/templates/user/overview.html:251
+#: core/templates/user/overview.html:254
#: exercises/templates/history/overview.html:99
+#: nutrition/templates/ingredient/view.html:146
+#: nutrition/templates/ingredient/view.html:158
msgid "Yes"
msgstr ""
-#: core/templates/user/overview.html:272 gym/templates/gym/member_list.html:105
+#: core/templates/user/overview.html:275 gym/templates/gym/member_list.html:105
msgid "Details"
msgstr ""
-#: core/templates/user/overview.html:276 gym/views/export.py:57
-#: manager/helpers.py:89 nutrition/views/plan.py:151
-#: nutrition/views/plan.py:157
+#: core/templates/user/overview.html:279 gym/views/export.py:57
+#: manager/helpers.py:89 nutrition/views/plan.py:150
+#: nutrition/views/plan.py:156
msgid "Nr."
msgstr "Н."
-#: core/templates/user/overview.html:298 gym/models/contract.py:287
+#: core/templates/user/overview.html:301 gym/models/contract.py:287
#: gym/models/gym.py:50 gym/templates/contract/view.html:75
#: gym/templates/gym/member_list.html:112 gym/views/export.py:68
msgid "Phone"
msgstr ""
-#: core/templates/user/overview.html:302 gym/templates/contract/view.html:87
+#: core/templates/user/overview.html:305 gym/templates/contract/view.html:87
#: gym/templates/gym/member_list.html:130
msgid "Address"
msgstr ""
-#: core/templates/user/overview.html:313
+#: core/templates/user/overview.html:316
msgid "Registered"
msgstr ""
-#: core/templates/user/overview.html:317
+#: core/templates/user/overview.html:320
msgid "Last login"
msgstr ""
-#: core/templates/user/overview.html:322
+#: core/templates/user/overview.html:325
msgid "Status"
msgstr ""
-#: core/templates/user/overview.html:325
+#: core/templates/user/overview.html:328
msgid "Active"
msgstr ""
-#: core/templates/user/overview.html:327
+#: core/templates/user/overview.html:330
msgid "Inactive"
msgstr ""
-#: core/templates/user/overview.html:348 gym/templates/contract/list.html:4
+#: core/templates/user/overview.html:351 gym/templates/contract/list.html:4
#: gym/templates/gym/member_list.html:218
msgid "Contracts"
msgstr ""
-#: core/templates/user/overview.html:426 gym/templates/document/list.html:4
+#: core/templates/user/overview.html:429 gym/templates/document/list.html:4
msgid "Documents"
msgstr ""
-#: core/templates/user/overview.html:433 gym/templates/document/list.html:33
+#: core/templates/user/overview.html:436 gym/templates/document/list.html:33
msgid "Download"
msgstr ""
-#: core/templates/user/overview.html:474 gym/views/admin_config.py:44
+#: core/templates/user/overview.html:477 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:477 gym/models/user_config.py:92
+#: core/templates/user/overview.html:480 gym/models/user_config.py:92
msgid "Include in inactive overview"
msgstr ""
-#: core/templates/user/overview.html:510
+#: core/templates/user/overview.html:513
#, python-format
msgid "Admin login is only available for users in %(gym_name)s"
msgstr ""
-#: core/templates/user/overview.html:514
+#: core/templates/user/overview.html:517
msgid "Log in as this user"
msgstr ""
@@ -1065,7 +1077,7 @@ msgstr ""
msgid "You need to verify your email to contribute exercises"
msgstr ""
-#: core/templates/user/preferences.html:55 core/views/user.py:601
+#: core/templates/user/preferences.html:55 core/views/user.py:617
msgid "Change password"
msgstr ""
@@ -1073,23 +1085,23 @@ msgstr ""
msgid "Already have an account?"
msgstr ""
-#: core/templatetags/wger_extras.py:142 i18n.tpl:38
+#: core/templatetags/wger_extras.py:142 i18n.tpl:39
msgid "kg"
msgstr ""
#: core/templatetags/wger_extras.py:144
-#: nutrition/templates/ingredient/view.html:60
-#: nutrition/templates/ingredient/view.html:66
-#: nutrition/templates/ingredient/view.html:73
-#: nutrition/templates/ingredient/view.html:82
-#: nutrition/templates/ingredient/view.html:89
-#: nutrition/templates/ingredient/view.html:111
-#: nutrition/templates/ingredient/view.html:121
+#: nutrition/templates/ingredient/view.html:61
+#: nutrition/templates/ingredient/view.html:67
+#: nutrition/templates/ingredient/view.html:74
+#: nutrition/templates/ingredient/view.html:83
+#: nutrition/templates/ingredient/view.html:90
+#: nutrition/templates/ingredient/view.html:112
+#: nutrition/templates/ingredient/view.html:122
msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr ""
-#: core/templatetags/wger_extras.py:147 i18n.tpl:39
+#: core/templatetags/wger_extras.py:147 i18n.tpl:40
msgid "lb"
msgstr ""
@@ -1098,84 +1110,83 @@ msgctxt "weight unit, i.e. ounces"
msgid "oz"
msgstr ""
-#: core/views/languages.py:85 exercises/views/categories.py:122
+#: core/views/languages.py:88 exercises/views/categories.py:122
#: exercises/views/equipment.py:103 exercises/views/muscles.py:99
-#: nutrition/views/ingredient.py:120 nutrition/views/unit.py:110
+#: nutrition/views/ingredient.py:125
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
+#: core/views/languages.py:96 core/views/license.py:103
+#: core/views/repetition_units.py:114 core/views/weight_units.py:115
#: exercises/views/categories.py:128 exercises/views/muscles.py:106
#: gallery/views/images.py:124 gym/views/admin_notes.py:196
#: gym/views/document.py:206 gym/views/gym.py:481
-#: nutrition/views/ingredient.py:127 nutrition/views/unit.py:117
+#: nutrition/views/ingredient.py:132
#, python-brace-format
msgid "Delete {0}?"
msgstr ""
-#: core/views/languages.py:111 core/views/license.py:85
-#: core/views/repetition_units.py:86 core/views/user.py:464
+#: core/views/languages.py:114 core/views/license.py:85
+#: core/views/repetition_units.py:96 core/views/user.py:480
#: core/views/weight_units.py:86 exercises/views/categories.py:98
#: exercises/views/equipment.py:81 exercises/views/muscles.py:87
#: gym/views/admin_notes.py:161 gym/views/config.py:68
#: gym/views/contract.py:186 gym/views/contract_option.py:123
#: gym/views/contract_type.py:123 gym/views/document.py:171
-#: gym/views/gym.py:463 nutrition/views/ingredient.py:146
-#: nutrition/views/unit.py:143
+#: gym/views/gym.py:463 nutrition/views/ingredient.py:151
#, python-brace-format
msgid "Edit {0}"
msgstr ""
-#: core/views/misc.py:74
+#: core/views/misc.py:73
msgid ""
"We have created sample workout, workout schedules, weight logs, (body) "
"weight and nutrition plan entries so you can better see what this site can "
"do. Feel free to edit or delete them!"
msgstr ""
-#: core/views/user.py:143
+#: core/views/user.py:145
#, python-brace-format
msgid "Account \"{0}\" was successfully deleted"
msgstr ""
-#: core/views/user.py:279
+#: core/views/user.py:287
msgid "You were successfully registered"
msgstr ""
-#: core/views/user.py:341
+#: core/views/user.py:357
msgid "Settings successfully updated"
msgstr ""
-#: core/views/user.py:380
+#: core/views/user.py:396
msgid "The user was successfully deactivated"
msgstr ""
-#: core/views/user.py:417
+#: core/views/user.py:433
msgid "The user was successfully activated"
msgstr ""
-#: core/views/user.py:432
+#: core/views/user.py:448
msgid "Edit user"
msgstr ""
-#: core/views/user.py:587 gym/templates/gym/member_list.html:26
+#: core/views/user.py:603 gym/templates/gym/member_list.html:26
#: gym/views/gym.py:158
msgid "ID"
msgstr ""
-#: core/views/user.py:588 gym/forms.py:95 gym/templates/contract/view.html:55
+#: core/views/user.py:604 gym/forms.py:95 gym/templates/contract/view.html:55
#: gym/templates/gym/member_list.html:27 gym/views/export.py:59
#: gym/views/gym.py:158 gym/views/gym.py:217
msgid "Username"
msgstr ""
-#: core/views/user.py:591 gym/templates/gym/new_user.html:34
+#: core/views/user.py:607 gym/templates/gym/new_user.html:34
#: gym/views/export.py:58 gym/views/gym.py:217
msgid "Gym"
msgstr ""
-#: core/views/user.py:650
+#: core/views/user.py:678
#, python-format
msgid "A verification email was sent to %(email)s"
msgstr ""
@@ -1194,16 +1205,16 @@ msgstr "фӕлтӕрӕны ном"
msgid "A more basic name for the muscle"
msgstr ""
-#: exercises/models/video.py:50
+#: exercises/models/video.py:52
#, python-format
msgid "Maximum file size is %(size)sMB."
msgstr ""
-#: exercises/models/video.py:57 exercises/models/video.py:65
+#: exercises/models/video.py:59 exercises/models/video.py:67
msgid "File type is not supported"
msgstr ""
-#: exercises/models/video.py:70
+#: exercises/models/video.py:72
msgid "File is not a valid video"
msgstr ""
@@ -1278,7 +1289,11 @@ msgstr ""
msgid "Add muscle"
msgstr "Мускул бафтауын"
-#: gallery/templates/images/overview.html:72
+#: gallery/forms.py:35
+msgid "If date is left empty, it will be read from the image instead"
+msgstr ""
+
+#: gallery/templates/images/overview.html:69
#, fuzzy
#| msgid "Add muscle"
msgid "Add image"
@@ -1346,7 +1361,7 @@ msgid "Contract type"
msgstr ""
#: gym/models/contract.py:211 gym/templates/contract/view.html:59
-#: nutrition/forms.py:58
+#: nutrition/forms.py:67
msgid "Amount"
msgstr ""
@@ -1522,7 +1537,7 @@ msgstr ""
msgid "Add member"
msgstr ""
-#: gym/templates/gym/new_user.html:48 nutrition/templates/rate/form.html:120
+#: gym/templates/gym/new_user.html:48 nutrition/templates/rate/form.html:121
msgid "Info"
msgstr "Инфо"
@@ -1689,10 +1704,6 @@ msgstr ""
msgid "Quads"
msgstr ""
-#: i18n.tpl:30
-msgid "Repetitions"
-msgstr ""
-
#: i18n.tpl:31
msgid "Resistance band"
msgstr ""
@@ -1721,175 +1732,179 @@ msgstr ""
msgid "Until Failure"
msgstr ""
-#: i18n.tpl:40
-msgid "none (bodyweight exercise)"
+#: i18n.tpl:38
+msgid "Meters"
msgstr ""
#: i18n.tpl:41
-msgid "Beginner"
+msgid "none (bodyweight exercise)"
msgstr ""
#: i18n.tpl:42
-msgid "Consistent"
+msgid "Beginner"
msgstr ""
#: i18n.tpl:43
-msgid "Dedicated"
+msgid "Consistent"
msgstr ""
#: i18n.tpl:44
-msgid "Obsessed"
+msgid "Dedicated"
msgstr ""
#: i18n.tpl:45
-msgid "Legend"
+msgid "Obsessed"
msgstr ""
#: i18n.tpl:46
-msgid "Veteran"
+msgid "Legend"
msgstr ""
#: i18n.tpl:47
-msgid "Titan"
+msgid "Veteran"
msgstr ""
#: i18n.tpl:48
-msgid "Unstoppable"
+msgid "Titan"
msgstr ""
#: i18n.tpl:49
-msgid "Weekend Warrior"
+msgid "Unstoppable"
msgstr ""
#: i18n.tpl:50
-msgid "Elephant lifter"
+msgid "Weekend Warrior"
msgstr ""
#: i18n.tpl:51
-msgid "Bus lifter"
+msgid "Elephant lifter"
msgstr ""
#: i18n.tpl:52
-msgid "Plane lifter"
+msgid "Bus lifter"
msgstr ""
#: i18n.tpl:53
-msgid "Blue whale lifter"
+msgid "Plane lifter"
msgstr ""
#: i18n.tpl:54
-msgid "Space Station lifter"
+msgid "Blue whale lifter"
msgstr ""
#: i18n.tpl:55
-msgid "Millionaire"
+msgid "Space Station lifter"
msgstr ""
#: i18n.tpl:56
-msgid "Atlas"
+msgid "Millionaire"
msgstr ""
#: i18n.tpl:57
-msgid "Early Bird"
+msgid "Atlas"
msgstr ""
#: i18n.tpl:58
-msgid "Night Owl"
+msgid "Early Bird"
msgstr ""
#: i18n.tpl:59
-msgid "New Year, New Me"
+msgid "Night Owl"
msgstr ""
#: i18n.tpl:60
-msgid "Phoenix"
+msgid "New Year, New Me"
msgstr ""
#: i18n.tpl:61
-msgid "Personal Record"
+msgid "Phoenix"
msgstr ""
#: i18n.tpl:62
-msgid "Complete your first workout"
+msgid "Personal Record"
msgstr ""
#: i18n.tpl:63
-msgid "Complete 10 workouts"
+msgid "Complete your first workout"
msgstr ""
#: i18n.tpl:64
-msgid "Complete 50 workouts"
+msgid "Complete 10 workouts"
msgstr ""
#: i18n.tpl:65
-msgid "Complete 100 workouts"
+msgid "Complete 50 workouts"
msgstr ""
#: i18n.tpl:66
-msgid "Complete 200 workouts"
+msgid "Complete 100 workouts"
msgstr ""
#: i18n.tpl:67
-msgid "Complete 500 workouts"
+msgid "Complete 200 workouts"
msgstr ""
#: i18n.tpl:68
-msgid "Complete 1000 workouts"
+msgid "Complete 500 workouts"
msgstr ""
#: i18n.tpl:69
-msgid "Maintain a 30-day workout streak"
+msgid "Complete 1000 workouts"
msgstr ""
#: i18n.tpl:70
-msgid "Work out on Saturday and Sunday for 4 consecutive weekends"
+msgid "Maintain a 30-day workout streak"
msgstr ""
#: i18n.tpl:71
-msgid "Lift a cumulative total of 5.000 kg"
+msgid "Work out on Saturday and Sunday for 4 consecutive weekends"
msgstr ""
#: i18n.tpl:72
-msgid "Lift a cumulative total of 20.000 kg"
+msgid "Lift a cumulative total of 5.000 kg"
msgstr ""
#: i18n.tpl:73
-msgid "Lift a cumulative total of 50.000 kg"
+msgid "Lift a cumulative total of 20.000 kg"
msgstr ""
#: i18n.tpl:74
-msgid "Lift a cumulative total of 150.000 kg"
+msgid "Lift a cumulative total of 50.000 kg"
msgstr ""
#: i18n.tpl:75
-msgid "Lift a cumulative total of 450.000 kg"
+msgid "Lift a cumulative total of 150.000 kg"
msgstr ""
#: i18n.tpl:76
-msgid "Lift a cumulative total of 1.000.000 kg"
+msgid "Lift a cumulative total of 450.000 kg"
msgstr ""
#: i18n.tpl:77
-msgid "Lift a cumulative total of 10.000.000 kg"
+msgid "Lift a cumulative total of 1.000.000 kg"
msgstr ""
#: i18n.tpl:78
-msgid "Complete a workout before 6:00 AM"
+msgid "Lift a cumulative total of 10.000.000 kg"
msgstr ""
#: i18n.tpl:79
-msgid "Complete a workout after 9:00 PM"
+msgid "Complete a workout before 6:00 AM"
msgstr ""
#: i18n.tpl:80
-msgid "Work out on January 1st"
+msgid "Complete a workout after 9:00 PM"
msgstr ""
#: i18n.tpl:81
-msgid "Return to training after being inactive for 30 days"
+msgid "Work out on January 1st"
msgstr ""
#: i18n.tpl:82
+msgid "Return to training after being inactive for 30 days"
+msgstr ""
+
+#: i18n.tpl:83
msgid "Achieve a new Personal Record on any exercise"
msgstr ""
@@ -1971,7 +1986,7 @@ msgstr "Фӕлтӕрӕн"
msgid "Routine will expire soon"
msgstr ""
-#: manager/models/routine.py:153 manager/models/session.py:145
+#: manager/models/routine.py:154 manager/models/session.py:145
msgid "The start time cannot be after the end time."
msgstr ""
@@ -2043,36 +2058,58 @@ msgstr ""
msgid "Workout for %s"
msgstr ""
-#: nutrition/forms.py:62
+#: nutrition/extract_info/off.py:72 nutrition/extract_info/off.py:91
+msgid "Serving"
+msgstr ""
+
+#: nutrition/forms.py:71 nutrition/forms.py:208
msgid "Unit"
msgstr ""
-#: nutrition/forms.py:170 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:179 nutrition/templates/rate/form.html:77
msgid "Basic caloric intake"
msgstr ""
-#: nutrition/forms.py:171
+#: nutrition/forms.py:180
msgid "Your basic caloric intake as calculated for your data"
msgstr ""
-#: nutrition/forms.py:176
+#: nutrition/forms.py:185
msgid "Additional calories"
msgstr ""
-#: nutrition/forms.py:178
+#: nutrition/forms.py:187
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
msgstr ""
#: nutrition/forms.py:209
+msgid "grams (g)"
+msgstr ""
+
+#: nutrition/forms.py:219
msgid "Ingredient"
msgstr ""
-#: nutrition/forms.py:213
+#: nutrition/forms.py:223
msgid "Also search for names in English"
msgstr ""
+#: nutrition/forms.py:239
+msgid "Quantity"
+msgstr ""
+
+#: nutrition/forms.py:241
+msgid "Enter a quantity and choose grams (g) or one of the serving units."
+msgstr ""
+
+#: nutrition/models/ingredient.py:526
+#, fuzzy
+#| msgid "Options"
+msgid "Portion"
+msgstr "Фадӕттӕ"
+
#: nutrition/templates/ingredient/email_new.tpl:1
#, python-format
msgid ""
@@ -2110,59 +2147,86 @@ msgid ""
"sucessfully."
msgstr ""
-#: nutrition/templates/ingredient/overview.html:38
+#: nutrition/templates/ingredient/overview.html:32
+#: nutrition/templates/ingredient/overview.html:68
+#: nutrition/templates/ingredient/view.html:143
+msgid "Vegan"
+msgstr ""
+
+#: nutrition/templates/ingredient/overview.html:34
+#: nutrition/templates/ingredient/overview.html:79
+#: nutrition/templates/ingredient/view.html:155
+msgid "Vegetarian"
+msgstr ""
+
+#: nutrition/templates/ingredient/overview.html:43
msgid "No ingredients."
msgstr ""
-#: nutrition/templates/ingredient/overview.html:49
+#: nutrition/templates/ingredient/overview.html:54
msgid "Search"
msgstr "Агурын"
-#: nutrition/templates/ingredient/view.html:45 nutrition/views/plan.py:237
+#: nutrition/templates/ingredient/overview.html:57
+msgid "Filter"
+msgstr ""
+
+#: nutrition/templates/ingredient/overview.html:83
+msgid "Apply"
+msgstr ""
+
+#: nutrition/templates/ingredient/overview.html:85
+msgid "Reset"
+msgstr ""
+
+#: nutrition/templates/ingredient/view.html:46 nutrition/views/plan.py:236
msgid "Macronutrients"
msgstr ""
-#: nutrition/templates/ingredient/view.html:54
+#: nutrition/templates/ingredient/view.html:55
msgid "kJ"
msgstr ""
-#: nutrition/templates/ingredient/view.html:70 nutrition/views/plan.py:267
+#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:266
msgid "Sugar content in carbohydrates"
msgstr ""
-#: nutrition/templates/ingredient/view.html:75
-#: nutrition/templates/ingredient/view.html:91
-#: nutrition/templates/ingredient/view.html:113
-#: nutrition/templates/ingredient/view.html:123
+#: nutrition/templates/ingredient/view.html:76
+#: nutrition/templates/ingredient/view.html:92
+#: nutrition/templates/ingredient/view.html:114
+#: nutrition/templates/ingredient/view.html:124
msgid "n.A."
msgstr ""
-#: nutrition/templates/ingredient/view.html:86 nutrition/views/plan.py:281
+#: nutrition/templates/ingredient/view.html:87 nutrition/views/plan.py:280
msgid "Saturated fat content in fats"
msgstr ""
-#: nutrition/templates/ingredient/view.html:102
+#: nutrition/templates/ingredient/view.html:103
msgid "Others"
msgstr ""
-#: nutrition/templates/ingredient/view.html:108 nutrition/views/plan.py:287
+#: nutrition/templates/ingredient/view.html:109 nutrition/views/plan.py:286
msgid "Fiber"
msgstr ""
-#: nutrition/templates/ingredient/view.html:118 nutrition/views/plan.py:293
+#: nutrition/templates/ingredient/view.html:119 nutrition/views/plan.py:292
msgid "Sodium"
msgstr ""
-#: nutrition/templates/ingredient/view.html:143
-#: nutrition/templates/units/list.html:50 nutrition/views/unit.py:86
+#: nutrition/templates/ingredient/view.html:136
+msgid "Dietary information"
+msgstr ""
+
+#: nutrition/templates/ingredient/view.html:184
msgid "Add new weight unit"
msgstr ""
-#: nutrition/templates/rate/form.html:25
+#: nutrition/templates/rate/form.html:26
msgid "Basal metabolic rate"
msgstr ""
-#: nutrition/templates/rate/form.html:26
+#: nutrition/templates/rate/form.html:27
msgid ""
"The basal metabolic rate is the amount of energy expended daily\n"
"at rest. This is the minimum energy needed for the body to function, without "
@@ -2170,36 +2234,36 @@ msgid ""
"additional physical activity."
msgstr ""
-#: nutrition/templates/rate/form.html:37
+#: nutrition/templates/rate/form.html:38
msgid "Your basic metabolic rate is: "
msgstr ""
-#: nutrition/templates/rate/form.html:47
+#: nutrition/templates/rate/form.html:48
msgid "Physical activities"
msgstr ""
-#: nutrition/templates/rate/form.html:48
+#: nutrition/templates/rate/form.html:49
msgid ""
"The physical activity level (PAL) is a factor used to to express\n"
"the additional physical activity and is used to calculate the total energy\n"
"required per day."
msgstr ""
-#: nutrition/templates/rate/form.html:59
+#: nutrition/templates/rate/form.html:60
msgid "Factor for daily activities: "
msgstr ""
-#: nutrition/templates/rate/form.html:67
+#: nutrition/templates/rate/form.html:68
msgid ""
"The base caloric intake is the amount of calories your metabolism\n"
"needs based on your level of physical activity."
msgstr ""
-#: nutrition/templates/rate/form.html:81
+#: nutrition/templates/rate/form.html:82
msgid "Calculate basic caloric intake"
msgstr ""
-#: nutrition/templates/rate/form.html:88
+#: nutrition/templates/rate/form.html:89
msgid ""
"The total calories are the actual total calories per day. This\n"
"might include e.g. a surplus or deficit if you are bulking or cutting. "
@@ -2207,67 +2271,67 @@ msgid ""
"you might just enter yourself the amount of calories if you know the value."
msgstr ""
-#: nutrition/templates/rate/form.html:102
+#: nutrition/templates/rate/form.html:103
msgid "Transfer basic intake to total daily calories"
msgstr ""
-#: nutrition/templates/rate/form.html:106
+#: nutrition/templates/rate/form.html:107
msgid "Add additional calories to total daily calories"
msgstr ""
-#: nutrition/templates/rate/form.html:110
+#: nutrition/templates/rate/form.html:111
msgid "Save total calories to profile"
msgstr ""
-#: nutrition/templates/rate/form.html:121
+#: nutrition/templates/rate/form.html:122
msgid ""
"Please note that these calculations can only be an\n"
"approximation. If you base your nutrition plan on these values, observe\n"
"yourself for some weeks and change the total amount if needed."
msgstr ""
-#: nutrition/views/ingredient.py:158
+#: nutrition/views/ingredient.py:163
msgid "Add a new ingredient"
msgstr ""
-#: nutrition/views/plan.py:128
+#: nutrition/views/plan.py:127
msgid "Nutritional plan"
msgstr ""
-#: nutrition/views/plan.py:130
+#: nutrition/views/plan.py:129
#, python-format
msgid "Nutritional plan for %s"
msgstr ""
-#: nutrition/views/plan.py:202
+#: nutrition/views/plan.py:201
msgid "<i>This is an empty plan, what did you expect on the PDF?</i>"
msgstr ""
-#: nutrition/views/plan.py:230
+#: nutrition/views/plan.py:229
msgid "Nutritional data"
msgstr ""
-#: nutrition/views/plan.py:238
+#: nutrition/views/plan.py:237
msgid "Total"
msgstr ""
-#: nutrition/views/plan.py:239
+#: nutrition/views/plan.py:238
msgid "Percent of energy"
msgstr ""
-#: nutrition/views/plan.py:240
+#: nutrition/views/plan.py:239
msgid "g per body kg"
msgstr ""
-#: nutrition/views/unit_ingredient.py:69
+#: nutrition/views/unit_ingredient.py:64
msgid "Add a new weight unit"
msgstr ""
-#: nutrition/views/unit_ingredient.py:106
+#: nutrition/views/unit_ingredient.py:99
msgid "Edit a weight unit to ingredient connection"
msgstr ""
-#: nutrition/views/unit_ingredient.py:138
+#: nutrition/views/unit_ingredient.py:129
msgid "Delete?"
msgstr ""
@@ -2618,7 +2682,7 @@ msgstr ""
msgid "Translation"
msgstr ""
-#: utils/generic_views.py:263
+#: utils/generic_views.py:246
msgid "Yes, delete"
msgstr ""
@@ -2669,10 +2733,6 @@ msgstr ""
msgid "Import weight logs"
msgstr ""
-#: weight/templates/import_csv_form.html:9
-msgid "Submit"
-msgstr ""
-
#: weight/templates/import_csv_form.html:15
msgid ""
"Use this import field to import your weight logs into Workout\n"
@@ -2768,6 +2828,16 @@ msgstr ""
msgid "Re-Submit"
msgstr ""
+#, fuzzy
+#~| msgid "Administration"
+#~ msgid "Email verification"
+#~ msgstr "Администраци"
+
+#, fuzzy
+#~| msgid "Administration"
+#~ msgid "Email Confirmation"
+#~ msgstr "Администраци"
+
#~ msgid "Comment"
#~ msgstr "Хъуыды"
diff --git a/wger/locale/pl/LC_MESSAGES/django.po b/wger/locale/pl/LC_MESSAGES/django.po
index 8a2188a13..46dd569ac 100644
--- a/wger/locale/pl/LC_MESSAGES/django.po
+++ b/wger/locale/pl/LC_MESSAGES/django.po
@@ -14,7 +14,7 @@ msgid ""
msgstr ""
"Project-Id-Version: wger Workout Manager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-01-17 14:03+0000\n"
+"POT-Creation-Date: 2026-04-10 10:20+0000\n"
"PO-Revision-Date: 2025-02-25 19:10+0000\n"
"Last-Translator: Karol Solecki <[email protected]>\n"
"Language-Team: Polish <https://hosted.weblate.org/projects/wger/web/pl/>\n"
@@ -43,7 +43,7 @@ msgstr ""
#: config/views/gym_config.py:42 core/templates/language/view.html:64
#: core/templates/license/list.html:17
#: core/templates/repetition_unit/list.html:18
-#: core/templates/user/overview.html:204 core/templates/user/overview.html:467
+#: core/templates/user/overview.html:207 core/templates/user/overview.html:470
#: core/templates/weight_unit/list.html:18
#: exercises/templates/categories/admin-overview.html:17
#: exercises/templates/equipment/admin-overview.html:17
@@ -55,30 +55,29 @@ msgstr ""
#: gym/templates/gym/list.html:19 gym/templates/gym/list.html:48
#: gym/templates/gym/member_list.html:94 gym/templates/gym/member_list.html:152
#: gym/templates/gym/member_list.html:190
-#: nutrition/templates/ingredient/view.html:164
-#: nutrition/templates/ingredient/view.html:209
-#: nutrition/templates/units/list.html:19
+#: nutrition/templates/ingredient/view.html:205
+#: nutrition/templates/ingredient/view.html:248
msgid "Edit"
msgstr "Edytuj"
-#: core/forms.py:91 core/templates/navigation.html:271
-#: core/templates/navigation.html:278 core/templates/user/login.html:4
+#: core/forms.py:89 core/templates/navigation.html:268
+#: core/templates/navigation.html:275 core/templates/user/login.html:4
#: core/templates/user/registration_sidebar.html:12
#: software/templates/features.html:82 software/templates/features.html:448
msgid "Login"
msgstr "Zaloguj"
-#: core/forms.py:130 core/forms.py:244 gym/views/export.py:61
+#: core/forms.py:128 core/forms.py:242 gym/views/export.py:61
#: gym/views/gym.py:217
msgid "First name"
msgstr "Imię"
-#: core/forms.py:131 core/forms.py:245 core/templates/user/overview.html:284
+#: core/forms.py:129 core/forms.py:243 core/templates/user/overview.html:287
#: gym/views/export.py:62 gym/views/gym.py:217
msgid "Last name"
msgstr "Nazwisko"
-#: core/forms.py:133 core/forms.py:210 core/templates/user/overview.html:288
+#: core/forms.py:131 core/forms.py:208 core/templates/user/overview.html:291
#: gym/models/contract.py:256 gym/models/gym.py:58
#: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:116
#: gym/templates/gym/new_user.html:30 gym/views/export.py:60
@@ -88,53 +87,53 @@ msgstr "Nazwisko"
msgid "Email"
msgstr "Email"
-#: core/forms.py:134
+#: core/forms.py:132
msgid "Used for password resets and, optionally, e-mail reminders."
msgstr "Używany do resetowania hasła i przypomnień e-mail."
-#: core/forms.py:138 core/models/profile.py:222
+#: core/forms.py:136 core/models/profile.py:222
#: gym/templates/gym/new_user.html:38
msgid "Date of Birth"
msgstr "Data urodzenia"
-#: core/forms.py:177
+#: core/forms.py:175
msgid "Personal data"
msgstr "Dane personalne"
-#: core/forms.py:189
+#: core/forms.py:187
msgid "Workout reminders"
msgstr "Przypomnienia treningowe"
-#: core/forms.py:196
+#: core/forms.py:194
msgid "Other settings"
msgstr "Inne ustawienia"
-#: core/forms.py:204 core/views/user.py:614 core/views/user.py:629
-#: core/views/user.py:641 gym/forms.py:73 utils/generic_views.py:143
+#: core/forms.py:202 core/views/user.py:630 core/views/user.py:654
+#: core/views/user.py:668 gym/forms.py:73 utils/generic_views.py:137
msgid "Save"
msgstr "Zapisz"
-#: core/forms.py:211
+#: core/forms.py:209
msgid "Used for password resets and, optionally, email reminders."
msgstr "Używany do resetowania hasła i przypomnień."
-#: core/forms.py:240
+#: core/forms.py:238
msgid "This e-mail address is already in use."
msgstr "Ten adres e-mail jest już zajęty."
-#: core/forms.py:261 gym/templates/gym/new_user.html:26
+#: core/forms.py:259 gym/templates/gym/new_user.html:26
#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:217
msgid "Password"
msgstr "Hasło"
-#: core/forms.py:263
+#: core/forms.py:261
msgid "Please enter your current password."
msgstr "Wprowadź swoje aktualne hasło."
-#: core/forms.py:272 core/templates/language/view.html:70
+#: core/forms.py:270 core/templates/language/view.html:70
#: core/templates/license/list.html:21
#: core/templates/repetition_unit/list.html:22
-#: core/templates/user/overview.html:233
+#: core/templates/user/overview.html:236
#: core/templates/weight_unit/list.html:22
#: exercises/templates/categories/admin-overview.html:21
#: exercises/templates/equipment/admin-overview.html:21
@@ -142,27 +141,30 @@ msgstr "Wprowadź swoje aktualne hasło."
#: gym/templates/admin_notes/list.html:37
#: gym/templates/contract_option/list.html:35
#: gym/templates/contract_type/list.html:36 gym/templates/document/list.html:46
-#: gym/templates/gym/list.html:23 nutrition/templates/ingredient/view.html:168
-#: nutrition/templates/ingredient/view.html:215
-#: nutrition/templates/units/list.html:25
+#: gym/templates/gym/list.html:23 nutrition/templates/ingredient/view.html:209
+#: nutrition/templates/ingredient/view.html:254
msgid "Delete"
msgstr "Usuń"
-#: core/forms.py:281
+#: core/forms.py:279
msgid "Invalid password"
msgstr "Hasło nieprawidłowe"
-#: core/forms.py:293
+#: core/forms.py:291 core/forms.py:349
msgid "The form is secured with reCAPTCHA"
msgstr "Formularz jest chroniony przez reCaptcha"
-#: core/forms.py:314 core/forms.py:341 core/templates/navigation.html:272
-#: core/templates/navigation.html:285 core/templates/template.html:123
-#: core/templates/user/login.html:21 core/views/user.py:285
+#: core/forms.py:312 core/forms.py:339 core/templates/navigation.html:269
+#: core/templates/navigation.html:282 core/templates/template.html:113
+#: core/templates/user/login.html:21 core/views/user.py:293
#: software/templates/features.html:87 software/templates/features.html:442
msgid "Register"
msgstr "Zarejestruj"
+#: core/forms.py:360 weight/templates/import_csv_form.html:9
+msgid "Submit"
+msgstr "Zapisz"
+
#: core/models/language.py:31 core/templates/language/view.html:21
msgid "Language short name"
msgstr "Skrócona nazwa języka"
@@ -199,36 +201,36 @@ msgstr "Link"
msgid "Link to license text or other information"
msgstr "Link do treści licencji lub innych informacji"
-#: core/models/profile.py:57
+#: core/models/profile.py:60
#, python-format
msgid "%(birthdate)s is not a valid birthdate"
msgstr "%(birthdate)s jest niepoprawną datą urodzenia"
-#: core/models/profile.py:66
+#: core/models/profile.py:69
msgid "Male"
msgstr "Męźczyzna"
-#: core/models/profile.py:67
+#: core/models/profile.py:70
msgid "Female"
msgstr "Kobieta"
-#: core/models/profile.py:74
+#: core/models/profile.py:77
msgid "Low"
msgstr "Niski"
-#: core/models/profile.py:75
+#: core/models/profile.py:78
msgid "Medium"
msgstr "Średni"
-#: core/models/profile.py:76
+#: core/models/profile.py:79
msgid "High"
msgstr "Wysoki"
-#: core/models/profile.py:82
+#: core/models/profile.py:85
msgid "Metric (kilogram)"
msgstr "Metryczny (kilogramy)"
-#: core/models/profile.py:83
+#: core/models/profile.py:86
msgid "Imperial (pound)"
msgstr "Imperialny (funty)"
@@ -348,7 +350,7 @@ msgstr "Średnia liczba godzin na tydzień"
msgid "Free time"
msgstr "Czas wolny"
-#: core/models/profile.py:320 nutrition/templates/rate/form.html:66
+#: core/models/profile.py:320 nutrition/templates/rate/form.html:67
msgid "Total daily calories"
msgstr "Dzienna całkowita liczba kalorii"
@@ -389,20 +391,43 @@ msgstr ""
msgid "Enable or disable the trophy system for this user"
msgstr ""
-#: core/models/profile.py:446
+#: core/models/profile.py:457
msgid "The sum of all hours has to be 24"
msgstr "Godziny muszą sumować się do wartości 24"
-#: core/models/rep_unit.py:36 core/models/weight_unit.py:42
-#: core/templates/user/overview.html:280 core/views/user.py:589
+#: core/models/rep_unit.py:32 i18n.tpl:30
+msgid "Repetitions"
+msgstr "Powtórzenia"
+
+#: core/models/rep_unit.py:33 core/templates/user/overview.html:82
+#: exercises/templates/history/overview.html:30
+msgid "Time"
+msgstr "Czas"
+
+#: core/models/rep_unit.py:34
+msgid "Distance"
+msgstr ""
+
+#: core/models/rep_unit.py:47 core/models/weight_unit.py:42
+#: core/templates/user/overview.html:283 core/views/user.py:605
#: exercises/models/muscle.py:36 gym/models/contract.py:52
#: gym/models/contract.py:103 gym/models/gym.py:46
#: gym/models/user_document.py:84 gym/templates/contract/view.html:50
#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:108
-#: gym/views/gym.py:158 nutrition/templates/ingredient/view.html:151
+#: gym/views/gym.py:158 nutrition/templates/ingredient/view.html:192
msgid "Name"
msgstr "Nazwa"
+#: core/models/rep_unit.py:53
+#, fuzzy
+#| msgid "Unit"
+msgid "Unit Type"
+msgstr "Jednostka"
+
+#: core/models/rep_unit.py:54
+msgid "The type of unit (repetitions, time, or distance)"
+msgstr ""
+
#: core/templates/403.html:4
msgid "Forbidden!"
msgstr "Zabrionione!"
@@ -434,6 +459,55 @@ msgstr ""
"Jeśli problem będzie się powtarzał, możesz zwrócić się o pomoc w następujący "
"sposób:"
+#: core/templates/account/email/email_confirmation_message.html:81
+msgid "Almost there!"
+msgstr ""
+
+#: core/templates/account/email/email_confirmation_message.html:85
+#, fuzzy, python-format
+#| msgid ""
+#| "You're receiving this e-mail because you requested a password reset for "
+#| "your user account at %(site_name)s."
+msgid ""
+"You're receiving this email because the user \"%(user_display)s\" has given "
+"your email address to register an account on %(site_domain)s."
+msgstr ""
+"Otrzymałeś tego e-maila, ponieważ poprosiłeś o zmianę hasła dla Twojego "
+"konta użytkownika na %(site_name)s."
+
+#: core/templates/account/email/email_confirmation_message.html:93
+msgid ""
+"Your email verification code is listed below. Please enter it in your open "
+"browser window."
+msgstr ""
+
+#: core/templates/account/email/email_confirmation_message.html:100
+#, fuzzy
+#| msgid "Please click the following link to confirm your email: %(link)s"
+msgid "Please click the button below to confirm your email address."
+msgstr "Kliknij poniższy link, aby potwierdzić swój adres e-mail: %(link)s"
+
+#: core/templates/account/email/email_confirmation_message.html:106
+#, fuzzy
+#| msgid "Unverified email"
+msgid "Confirm email"
+msgstr "Niezweryfikowany adres e-mail"
+
+#: core/templates/account/email/email_confirmation_message.html:110
+#, python-format
+msgid ""
+"The link is valid for %(expire_hours)s hours (until %(date)s, %(time)s). You "
+"can request a new one from your profile settings."
+msgstr ""
+
+#: core/templates/account/email/email_confirmation_message.html:116
+msgid "If the button doesn't work, copy and paste this link into your browser:"
+msgstr ""
+
+#: core/templates/account/email/email_confirmation_message.html:125
+msgid "the wger Team"
+msgstr "Drużyna Wger"
+
#: core/templates/base.html:10
#, fuzzy, python-format
#| msgid ""
@@ -478,51 +552,7 @@ msgstr ""
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 verification"
-msgstr "Weryfikacja E-mail"
-
-#: core/templates/email_verification/confirm_template.html:18
-#, python-format
-msgid "%(username)s, your email was verified"
-msgstr "%(username)s, twój adres e-mail został zweryfikowany"
-
-#: core/templates/email_verification/confirm_template.html:22
-msgid "Error, invalid verification token"
-msgstr "Błąd, nieprawidłowy token weryfikacyjny"
-
-#: core/templates/email_verification/email_body_html.tpl:6
-msgid "Email Confirmation"
-msgstr "Potwierdzenie e-mail"
-
-#: 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 "Już prawie jesteś, %(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 "Kliknij w <a href=\"%(link)s\">here</a> aby potwierdzić twój e-mail"
-
-#: 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 "Token wygasa %(time)s"
-
-#: core/templates/email_verification/email_body_html.tpl:14
-#: core/templates/email_verification/email_body_txt.tpl:8
-msgid "the wger Team"
-msgstr "Drużyna Wger"
-
-#: core/templates/email_verification/email_body_txt.tpl:4
-#, python-format
-msgid "Please click the following link to confirm your email: %(link)s"
-msgstr "Kliknij poniższy link, aby potwierdzić swój adres e-mail: %(link)s"
-
-#: core/templates/language/overview.html:4 core/templates/navigation.html:344
+#: core/templates/language/overview.html:4 core/templates/navigation.html:341
msgid "Languages"
msgstr "Języki"
@@ -531,16 +561,16 @@ msgid "Nothing found."
msgstr "Nie znaleziono."
#: core/templates/language/overview.html:22
-#: nutrition/templates/ingredient/overview.html:38
+#: nutrition/templates/ingredient/overview.html:43
msgid "Add one now."
msgstr "Dodaj jeden teraz."
#: core/templates/language/overview.html:34 core/templates/license/list.html:43
-#: core/templates/repetition_unit/list.html:46
-#: core/templates/user/overview.html:344 core/templates/user/overview.html:384
-#: core/templates/user/overview.html:422
-#: core/templates/weight_unit/list.html:46 core/views/languages.py:74
-#: core/views/license.py:66 core/views/repetition_units.py:66
+#: core/templates/repetition_unit/list.html:44
+#: core/templates/user/overview.html:347 core/templates/user/overview.html:387
+#: core/templates/user/overview.html:425
+#: core/templates/weight_unit/list.html:46 core/views/languages.py:77
+#: core/views/license.py:66 core/views/repetition_units.py:76
#: core/views/weight_units.py:66
#: exercises/templates/categories/admin-overview.html:40
#: exercises/templates/equipment/admin-overview.html:39
@@ -553,14 +583,14 @@ msgstr "Dodaj jeden teraz."
#: gym/templates/gym/member_list.html:264
#: gym/templates/gym/member_list.html:303
#: mailer/templates/mailer/gym/overview.html:43
-#: nutrition/templates/ingredient/overview.html:60
+#: nutrition/templates/ingredient/overview.html:97
msgid "Add"
msgstr "Dodaj"
#: core/templates/language/view.html:61 core/templates/user/api_key.html:41
#: core/templates/user/preferences.html:50 gym/models/contract.py:203
#: gym/templates/contract/view.html:41 gym/templates/gym/member_list.html:270
-#: nutrition/templates/ingredient/view.html:206
+#: nutrition/templates/ingredient/view.html:245
msgid "Options"
msgstr "Opcje"
@@ -570,9 +600,9 @@ msgstr "Lista licencji"
#: core/templates/license/list.html:30
#: core/templates/repetition_unit/list.html:32
-#: core/templates/user/overview.html:104 core/templates/user/overview.html:136
-#: core/templates/user/overview.html:185 core/templates/user/overview.html:365
-#: core/templates/user/overview.html:404 core/templates/user/overview.html:448
+#: core/templates/user/overview.html:107 core/templates/user/overview.html:139
+#: core/templates/user/overview.html:188 core/templates/user/overview.html:368
+#: core/templates/user/overview.html:407 core/templates/user/overview.html:451
#: core/templates/weight_unit/list.html:32
#: exercises/templates/categories/admin-overview.html:30
#: exercises/templates/equipment/admin-overview.html:30
@@ -584,11 +614,10 @@ msgstr "Lista licencji"
#: gym/templates/gym/member_list.html:284
#: gym/templates/gym/member_list.html:321
#: mailer/templates/mailer/gym/overview.html:30
-#: nutrition/templates/units/list.html:34
msgid "Nothing found"
msgstr "Nic nie znaleziono"
-#: core/templates/misc/about.html:4 core/templates/template.html:160
+#: core/templates/misc/about.html:4 core/templates/template.html:150
msgid "Imprint"
msgstr "Odcisk"
@@ -596,162 +625,157 @@ msgstr "Odcisk"
msgid "Training"
msgstr "Trening"
-#: core/templates/navigation.html:37 core/templates/user/overview.html:25
+#: core/templates/navigation.html:36 core/templates/user/overview.html:28
msgid "Routines"
msgstr ""
-#: core/templates/navigation.html:45 core/templates/user/overview.html:70
+#: core/templates/navigation.html:44 core/templates/user/overview.html:73
msgid "Calendar"
msgstr "Kalendarz"
-#: core/templates/navigation.html:55
+#: core/templates/navigation.html:53
msgid "Measurements"
msgstr "Pomiary"
-#: core/templates/navigation.html:66 gallery/templates/images/overview.html:6
+#: core/templates/navigation.html:64 gallery/templates/images/overview.html:6
msgid "Gallery"
msgstr "Galeria"
-#: core/templates/navigation.html:72
+#: core/templates/navigation.html:74 core/templates/navigation.html:400
+#: trophies/templates/trophies/overview.html:7
+msgid "Trophies"
+msgstr ""
+
+#: core/templates/navigation.html:79
msgid "Workout templates"
msgstr "Szablony treningu"
-#: core/templates/navigation.html:79
+#: core/templates/navigation.html:86
msgid "Your templates"
msgstr "Twoje schematy"
-#: core/templates/navigation.html:88
+#: core/templates/navigation.html:95
msgid "Public templates"
msgstr "Publiczne szablony"
-#: core/templates/navigation.html:96 software/templates/features.html:51
+#: core/templates/navigation.html:103 software/templates/features.html:51
#: software/templates/features.html:480
msgid "Exercises"
msgstr "Ćwiczenia"
-#: core/templates/navigation.html:102 core/templates/navigation.html:176
-#: core/templates/navigation.html:339
+#: core/templates/navigation.html:109 core/templates/navigation.html:336
msgid "Administration"
msgstr "Zarządzanie"
-#: core/templates/navigation.html:106
+#: core/templates/navigation.html:113
msgid "Exercise edit history"
msgstr "Historia edycji ćwiczeń"
-#: core/templates/navigation.html:112
+#: core/templates/navigation.html:119
msgid "Equipment"
msgstr "Sprzęt"
-#: core/templates/navigation.html:118
+#: core/templates/navigation.html:125
msgid "Muscles"
msgstr "Mięśnie"
-#: core/templates/navigation.html:124
+#: core/templates/navigation.html:131
#: exercises/templates/categories/admin-overview.html:4
msgid "Categories"
msgstr "Kategorie"
-#: core/templates/navigation.html:139 software/templates/features.html:468
+#: core/templates/navigation.html:146 software/templates/features.html:468
msgid "Nutrition"
msgstr "Żywienie"
-#: core/templates/navigation.html:147 core/templates/user/overview.html:144
+#: core/templates/navigation.html:154 core/templates/user/overview.html:147
msgid "Nutrition plans"
msgstr "Plany żywienia"
-#: core/templates/navigation.html:156
+#: core/templates/navigation.html:163
msgid "BMI calculator"
msgstr "Kalkulator BMI"
-#: core/templates/navigation.html:165 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:172 nutrition/templates/rate/form.html:18
msgid "Daily calories calculator"
msgstr "Kalkulator dziennych kalorii"
-#: core/templates/navigation.html:171
+#: core/templates/navigation.html:178
#: nutrition/templates/ingredient/overview.html:10
msgid "Ingredient overview"
msgstr "Rozpiska składników"
-#: core/templates/navigation.html:180 nutrition/templates/units/list.html:6
-msgid "Ingredient weight units"
-msgstr "Jednostka wagowa składników"
-
-#: core/templates/navigation.html:196 software/templates/features.html:463
+#: core/templates/navigation.html:193 software/templates/features.html:463
msgid "Body weight"
msgstr "Waga ciała"
-#: core/templates/navigation.html:203 core/templates/user/overview.html:114
+#: core/templates/navigation.html:200 core/templates/user/overview.html:117
msgid "Weight overview"
msgstr "Wykres masy ciała"
-#: core/templates/navigation.html:217
+#: core/templates/navigation.html:214
msgid "About this software"
msgstr "O tym programie"
-#: core/templates/navigation.html:223 software/templates/about_us.html:5
+#: core/templates/navigation.html:220 software/templates/about_us.html:5
msgid "Support & Get Involved"
msgstr ""
-#: core/templates/navigation.html:229 software/templates/features.html:528
+#: core/templates/navigation.html:226 software/templates/features.html:528
msgid "REST API"
msgstr "REST API"
-#: core/templates/navigation.html:235 utils/models.py:45
+#: core/templates/navigation.html:232 utils/models.py:45
msgid "License"
msgstr "Licencja"
-#: core/templates/navigation.html:241
+#: core/templates/navigation.html:238
msgid "Developer documentation"
msgstr "Dokumentacja"
-#: core/templates/navigation.html:248
+#: core/templates/navigation.html:245
msgid "Get the code"
msgstr "Pobierz kod źródłowy"
-#: core/templates/navigation.html:255 core/templates/template.html:199
-#: software/templates/features.html:603
+#: core/templates/navigation.html:252 core/templates/template.html:202
+#: software/templates/features.html:614
msgid "Translate"
msgstr "Tłumacz"
-#: core/templates/navigation.html:292 core/templates/user/login.html:30
+#: core/templates/navigation.html:289 core/templates/user/login.html:30
msgid "Reset password"
msgstr "Resetuj hasło"
-#: core/templates/navigation.html:301 core/templates/navigation.html:329
+#: core/templates/navigation.html:298 core/templates/navigation.html:326
msgid "Logout"
msgstr "Wyloguj"
-#: core/templates/navigation.html:320
+#: core/templates/navigation.html:317
msgid "My preferences"
msgstr "Moje preferencje"
-#: core/templates/navigation.html:352
+#: core/templates/navigation.html:349
msgid "Licenses"
msgstr "Licencje"
-#: core/templates/navigation.html:360
+#: core/templates/navigation.html:357
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr "Jednostki potwórzeń"
-#: core/templates/navigation.html:368 core/templates/weight_unit/list.html:4
-#: nutrition/templates/ingredient/view.html:141
+#: core/templates/navigation.html:365 core/templates/weight_unit/list.html:4
+#: nutrition/templates/ingredient/view.html:182
msgid "Weight units"
msgstr "Jednostki wagi"
-#: core/templates/navigation.html:376 core/templates/user/list.html:4
+#: core/templates/navigation.html:373 core/templates/user/list.html:4
msgid "User list"
msgstr "Lista użytkowników"
-#: core/templates/navigation.html:382
+#: core/templates/navigation.html:379
msgid "Gyms"
msgstr "Siłownie"
-#: core/templates/navigation.html:403
-#: trophies/templates/trophies/overview.html:7
-msgid "Trophies"
-msgstr ""
-
#: core/templates/registration/password_reset_complete.html:4
msgid "Password reset complete"
msgstr "Resetowanie hasła zakończone"
@@ -811,27 +835,31 @@ msgstr "poprzednie"
msgid "next"
msgstr "następne"
-#: core/templates/template.html:96
+#: core/templates/template.html:86
msgid "Close"
msgstr "Zamknij"
-#: core/templates/template.html:112
+#: core/templates/template.html:102
msgid ""
"You are using a guest account, data entered will be deleted after a week."
msgstr ""
"Korzystasz z konta gościa, dane wpisane w tym trybie będą skasowane po "
"tygodniu."
-#: core/templates/template.html:117
+#: core/templates/template.html:107
msgid "Create some demo entries"
msgstr "Utwórz kilka przykładowych wpisów"
-#: core/templates/template.html:165 software/templates/features.html:568
+#: core/templates/template.html:155 software/templates/features.html:568
#: software/templates/tos.html:7
msgid "Terms of service"
msgstr "Warunki świadczenia usługi"
-#: core/templates/template_features.html:53 software/templates/features.html:9
+#: core/templates/template.html:181 software/templates/features.html:595
+msgid "Browser language"
+msgstr ""
+
+#: core/templates/template_features.html:46 software/templates/features.html:9
msgid "Features"
msgstr "Cechy"
@@ -889,99 +917,94 @@ msgstr "Brak konta?"
msgid "Forgot password?"
msgstr "Zapomniałeś hasła?"
-#: core/templates/user/overview.html:25 core/templates/user/overview.html:68
-#: core/templates/user/overview.html:112 core/templates/user/overview.html:144
-#: core/templates/user/overview.html:348 core/templates/user/overview.html:390
-#: core/templates/user/overview.html:426
+#: core/templates/user/overview.html:28 core/templates/user/overview.html:71
+#: core/templates/user/overview.html:115 core/templates/user/overview.html:147
+#: core/templates/user/overview.html:351 core/templates/user/overview.html:393
+#: core/templates/user/overview.html:429
#, python-format
msgid "last %(number)s"
msgstr "ostatnie %(number)s"
-#: core/templates/user/overview.html:27 core/templates/user/overview.html:146
-#: core/templates/user/overview.html:343 core/templates/user/overview.html:382
-#: core/templates/user/overview.html:421 gym/templates/gym/member_list.html:226
+#: core/templates/user/overview.html:30 core/templates/user/overview.html:149
+#: core/templates/user/overview.html:346 core/templates/user/overview.html:385
+#: core/templates/user/overview.html:424 gym/templates/gym/member_list.html:226
#: gym/templates/gym/member_list.html:262
#: gym/templates/gym/member_list.html:302
msgid "Overview"
msgstr "Podsumowanie"
-#: core/templates/user/overview.html:34 core/templates/user/overview.html:76
-#: core/templates/user/overview.html:120 core/templates/user/overview.html:152
+#: core/templates/user/overview.html:37 core/templates/user/overview.html:79
+#: core/templates/user/overview.html:123 core/templates/user/overview.html:155
#: manager/helpers.py:88 software/templates/about_us.html:170
#: weight/templates/import_csv_preview.html:13
#: weight/templates/import_csv_preview.html:42 weight/views.py:54
msgid "Date"
msgstr "Data"
-#: core/templates/user/overview.html:35 core/templates/user/overview.html:153
+#: core/templates/user/overview.html:38 core/templates/user/overview.html:156
#: gym/models/contract.py:58 gym/models/contract.py:109
msgid "Description"
msgstr "Opis"
-#: core/templates/user/overview.html:36
+#: core/templates/user/overview.html:39
msgid "Number of logs (days)"
msgstr "Liczba logów (dni)"
-#: core/templates/user/overview.html:37 core/views/user.py:590
+#: core/templates/user/overview.html:40 core/views/user.py:606
#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:158
msgid "Last activity"
msgstr "Ostatnia aktywność"
-#: core/templates/user/overview.html:58
+#: core/templates/user/overview.html:61
msgid "No workouts found."
msgstr "Nie znaleziono treningu."
-#: core/templates/user/overview.html:68
+#: core/templates/user/overview.html:71
msgid "Log"
msgstr "Log"
-#: core/templates/user/overview.html:77
+#: core/templates/user/overview.html:80
msgid "General impression"
msgstr "Ogólna ocena"
-#: core/templates/user/overview.html:78 core/templates/user/overview.html:390
+#: core/templates/user/overview.html:81 core/templates/user/overview.html:393
msgid "Notes"
msgstr "Notatki"
-#: core/templates/user/overview.html:79
-#: exercises/templates/history/overview.html:30
-msgid "Time"
-msgstr "Czas"
-
-#: core/templates/user/overview.html:112 core/templates/user/overview.html:121
+#: core/templates/user/overview.html:115 core/templates/user/overview.html:124
#: manager/helpers.py:89 weight/templates/import_csv_preview.html:14
#: weight/templates/import_csv_preview.html:43 weight/views.py:54
msgid "Weight"
msgstr "Ciężar"
-#: core/templates/user/overview.html:154
-#: nutrition/templates/ingredient/view.html:51 nutrition/views/plan.py:245
+#: core/templates/user/overview.html:157
+#: nutrition/templates/ingredient/view.html:52 nutrition/views/plan.py:244
msgid "Energy"
msgstr "Energia"
-#: core/templates/user/overview.html:155
-#: nutrition/templates/ingredient/view.html:58 nutrition/views/plan.py:251
+#: core/templates/user/overview.html:158
+#: nutrition/templates/ingredient/view.html:59 nutrition/views/plan.py:250
msgid "Protein"
msgstr "Białko"
-#: core/templates/user/overview.html:156
-#: nutrition/templates/ingredient/view.html:64 nutrition/views/plan.py:259
+#: core/templates/user/overview.html:159
+#: nutrition/templates/ingredient/view.html:65 nutrition/views/plan.py:258
msgid "Carbohydrates"
msgstr "Węglowodany"
-#: core/templates/user/overview.html:157
-#: nutrition/templates/ingredient/view.html:80 nutrition/views/plan.py:273
+#: core/templates/user/overview.html:160
+#: nutrition/templates/ingredient/view.html:81 nutrition/views/plan.py:272
msgid "Fat"
msgstr "Tłuszcz"
-#: core/templates/user/overview.html:170
-#: nutrition/templates/ingredient/view.html:53
+#: core/templates/user/overview.html:173
+#: nutrition/templates/ingredient/view.html:54
msgid "kcal"
msgstr "kcal"
-#: core/templates/user/overview.html:201 core/templates/user/overview.html:340
-#: core/templates/user/overview.html:379 core/templates/user/overview.html:418
-#: core/templates/user/overview.html:463 gym/templates/gym/list.html:45
+#: core/templates/user/overview.html:204 core/templates/user/overview.html:343
+#: core/templates/user/overview.html:382 core/templates/user/overview.html:421
+#: core/templates/user/overview.html:466 gym/templates/gym/list.html:45
#: gym/templates/gym/member_list.html:91 gym/templates/gym/member_list.html:149
#: gym/templates/gym/member_list.html:187
#: gym/templates/gym/member_list.html:223
@@ -990,111 +1013,115 @@ msgstr "kcal"
msgid "Actions"
msgstr "Akcje"
-#: core/templates/user/overview.html:210
+#: core/templates/user/overview.html:213
msgid "Deactivate user"
msgstr "Deaktywuj użytkownika"
-#: core/templates/user/overview.html:214
+#: core/templates/user/overview.html:217
msgid "Activate user"
msgstr "Aktywuj użytkownika"
-#: core/templates/user/overview.html:223
+#: core/templates/user/overview.html:226
msgid "Reset user password"
msgstr "Resetuj hasło użytkownika"
-#: core/templates/user/overview.html:227 gym/templates/gym/member_list.html:30
+#: core/templates/user/overview.html:230 gym/templates/gym/member_list.html:30
msgid "Roles"
msgstr "Role"
-#: core/templates/user/overview.html:243
+#: core/templates/user/overview.html:246
msgid "Password reset confirmation"
msgstr "Potwierdzenie resetu hasła"
-#: core/templates/user/overview.html:247
+#: core/templates/user/overview.html:250
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:250
+#: core/templates/user/overview.html:253
#: exercises/templates/history/overview.html:106
+#: nutrition/templates/ingredient/view.html:148
+#: nutrition/templates/ingredient/view.html:160
msgid "No"
msgstr "Nie"
-#: core/templates/user/overview.html:251
+#: core/templates/user/overview.html:254
#: exercises/templates/history/overview.html:99
+#: nutrition/templates/ingredient/view.html:146
+#: nutrition/templates/ingredient/view.html:158
msgid "Yes"
msgstr "Tak"
-#: core/templates/user/overview.html:272 gym/templates/gym/member_list.html:105
+#: core/templates/user/overview.html:275 gym/templates/gym/member_list.html:105
msgid "Details"
msgstr "Szczegóły"
-#: core/templates/user/overview.html:276 gym/views/export.py:57
-#: manager/helpers.py:89 nutrition/views/plan.py:151
-#: nutrition/views/plan.py:157
+#: core/templates/user/overview.html:279 gym/views/export.py:57
+#: manager/helpers.py:89 nutrition/views/plan.py:150
+#: nutrition/views/plan.py:156
msgid "Nr."
msgstr "Nr."
-#: core/templates/user/overview.html:298 gym/models/contract.py:287
+#: core/templates/user/overview.html:301 gym/models/contract.py:287
#: gym/models/gym.py:50 gym/templates/contract/view.html:75
#: gym/templates/gym/member_list.html:112 gym/views/export.py:68
msgid "Phone"
msgstr "Telefon"
-#: core/templates/user/overview.html:302 gym/templates/contract/view.html:87
+#: core/templates/user/overview.html:305 gym/templates/contract/view.html:87
#: gym/templates/gym/member_list.html:130
msgid "Address"
msgstr "Adres"
-#: core/templates/user/overview.html:313
+#: core/templates/user/overview.html:316
msgid "Registered"
msgstr "Zarejestrowano"
-#: core/templates/user/overview.html:317
+#: core/templates/user/overview.html:320
msgid "Last login"
msgstr "Zalogowany ostatnio"
-#: core/templates/user/overview.html:322
+#: core/templates/user/overview.html:325
msgid "Status"
msgstr "Status"
-#: core/templates/user/overview.html:325
+#: core/templates/user/overview.html:328
msgid "Active"
msgstr "Aktywny"
-#: core/templates/user/overview.html:327
+#: core/templates/user/overview.html:330
msgid "Inactive"
msgstr "Nieaktywny"
-#: core/templates/user/overview.html:348 gym/templates/contract/list.html:4
+#: core/templates/user/overview.html:351 gym/templates/contract/list.html:4
#: gym/templates/gym/member_list.html:218
msgid "Contracts"
msgstr "Kontrakty"
-#: core/templates/user/overview.html:426 gym/templates/document/list.html:4
+#: core/templates/user/overview.html:429 gym/templates/document/list.html:4
msgid "Documents"
msgstr "Dokumenty"
-#: core/templates/user/overview.html:433 gym/templates/document/list.html:33
+#: core/templates/user/overview.html:436 gym/templates/document/list.html:33
msgid "Download"
msgstr "Pobierz"
-#: core/templates/user/overview.html:474 gym/views/admin_config.py:44
+#: core/templates/user/overview.html:477 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:477 gym/models/user_config.py:92
+#: core/templates/user/overview.html:480 gym/models/user_config.py:92
msgid "Include in inactive overview"
msgstr "Uwzględnij w podglądzie nieaktywnych"
-#: core/templates/user/overview.html:510
+#: core/templates/user/overview.html:513
#, python-format
msgid "Admin login is only available for users in %(gym_name)s"
msgstr ""
"Logowanie jako administrator dostępne jest tylko dla użytkowników w "
"%(gym_name)s"
-#: core/templates/user/overview.html:514
+#: core/templates/user/overview.html:517
msgid "Log in as this user"
msgstr "Zaloguj się jako ten użytkownik"
@@ -1118,7 +1145,7 @@ msgstr "Wyślij email weryfikacyjny"
msgid "You need to verify your email to contribute exercises"
msgstr "Aby przesyłać ćwiczenia, musisz zweryfikować swój adres e-mail"
-#: core/templates/user/preferences.html:55 core/views/user.py:601
+#: core/templates/user/preferences.html:55 core/views/user.py:617
msgid "Change password"
msgstr "Zmień hasło"
@@ -1126,23 +1153,23 @@ msgstr "Zmień hasło"
msgid "Already have an account?"
msgstr ""
-#: core/templatetags/wger_extras.py:142 i18n.tpl:38
+#: core/templatetags/wger_extras.py:142 i18n.tpl:39
msgid "kg"
msgstr "kg"
#: core/templatetags/wger_extras.py:144
-#: nutrition/templates/ingredient/view.html:60
-#: nutrition/templates/ingredient/view.html:66
-#: nutrition/templates/ingredient/view.html:73
-#: nutrition/templates/ingredient/view.html:82
-#: nutrition/templates/ingredient/view.html:89
-#: nutrition/templates/ingredient/view.html:111
-#: nutrition/templates/ingredient/view.html:121
+#: nutrition/templates/ingredient/view.html:61
+#: nutrition/templates/ingredient/view.html:67
+#: nutrition/templates/ingredient/view.html:74
+#: nutrition/templates/ingredient/view.html:83
+#: nutrition/templates/ingredient/view.html:90
+#: nutrition/templates/ingredient/view.html:112
+#: nutrition/templates/ingredient/view.html:122
msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr "g"
-#: core/templatetags/wger_extras.py:147 i18n.tpl:39
+#: core/templatetags/wger_extras.py:147 i18n.tpl:40
msgid "lb"
msgstr "lb"
@@ -1151,36 +1178,35 @@ msgctxt "weight unit, i.e. ounces"
msgid "oz"
msgstr "oz"
-#: core/views/languages.py:85 exercises/views/categories.py:122
+#: core/views/languages.py:88 exercises/views/categories.py:122
#: exercises/views/equipment.py:103 exercises/views/muscles.py:99
-#: nutrition/views/ingredient.py:120 nutrition/views/unit.py:110
+#: nutrition/views/ingredient.py:125
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
+#: core/views/languages.py:96 core/views/license.py:103
+#: core/views/repetition_units.py:114 core/views/weight_units.py:115
#: exercises/views/categories.py:128 exercises/views/muscles.py:106
#: gallery/views/images.py:124 gym/views/admin_notes.py:196
#: gym/views/document.py:206 gym/views/gym.py:481
-#: nutrition/views/ingredient.py:127 nutrition/views/unit.py:117
+#: nutrition/views/ingredient.py:132
#, python-brace-format
msgid "Delete {0}?"
msgstr "Usunąć {0}?"
-#: core/views/languages.py:111 core/views/license.py:85
-#: core/views/repetition_units.py:86 core/views/user.py:464
+#: core/views/languages.py:114 core/views/license.py:85
+#: core/views/repetition_units.py:96 core/views/user.py:480
#: core/views/weight_units.py:86 exercises/views/categories.py:98
#: exercises/views/equipment.py:81 exercises/views/muscles.py:87
#: gym/views/admin_notes.py:161 gym/views/config.py:68
#: gym/views/contract.py:186 gym/views/contract_option.py:123
#: gym/views/contract_type.py:123 gym/views/document.py:171
-#: gym/views/gym.py:463 nutrition/views/ingredient.py:146
-#: nutrition/views/unit.py:143
+#: gym/views/gym.py:463 nutrition/views/ingredient.py:151
#, python-brace-format
msgid "Edit {0}"
msgstr "Edytuj {0}"
-#: core/views/misc.py:74
+#: core/views/misc.py:73
msgid ""
"We have created sample workout, workout schedules, weight logs, (body) "
"weight and nutrition plan entries so you can better see what this site can "
@@ -1190,48 +1216,48 @@ msgstr ""
"oraz plany żywieniowe i wagowe, byś mógł lepiej zobaczyć co można zrobić na "
"stronie. Możesz je dowolnie edytować lub skasować!"
-#: core/views/user.py:143
+#: core/views/user.py:145
#, python-brace-format
msgid "Account \"{0}\" was successfully deleted"
msgstr "Konto \"{0}\" zostało poprawnie skasowane"
-#: core/views/user.py:279
+#: core/views/user.py:287
msgid "You were successfully registered"
msgstr "Zostałeś poprawnie zarejestrowany"
-#: core/views/user.py:341
+#: core/views/user.py:357
msgid "Settings successfully updated"
msgstr "Ustawienia pomyślnie zaktualizowane"
-#: core/views/user.py:380
+#: core/views/user.py:396
msgid "The user was successfully deactivated"
msgstr "Użytkownik pomyślnie zdezaktywowany"
-#: core/views/user.py:417
+#: core/views/user.py:433
msgid "The user was successfully activated"
msgstr "Użytkownik pomyślnie aktywowany"
-#: core/views/user.py:432
+#: core/views/user.py:448
msgid "Edit user"
msgstr "Edytuj użytkownika"
-#: core/views/user.py:587 gym/templates/gym/member_list.html:26
+#: core/views/user.py:603 gym/templates/gym/member_list.html:26
#: gym/views/gym.py:158
msgid "ID"
msgstr "ID"
-#: core/views/user.py:588 gym/forms.py:95 gym/templates/contract/view.html:55
+#: core/views/user.py:604 gym/forms.py:95 gym/templates/contract/view.html:55
#: gym/templates/gym/member_list.html:27 gym/views/export.py:59
#: gym/views/gym.py:158 gym/views/gym.py:217
msgid "Username"
msgstr "Nazwa użytkownika"
-#: core/views/user.py:591 gym/templates/gym/new_user.html:34
+#: core/views/user.py:607 gym/templates/gym/new_user.html:34
#: gym/views/export.py:58 gym/views/gym.py:217
msgid "Gym"
msgstr "Siłownia"
-#: core/views/user.py:650
+#: core/views/user.py:678
#, python-format
msgid "A verification email was sent to %(email)s"
msgstr "E-mail weryfikacyjny został wysłany na adres %(email)s"
@@ -1248,16 +1274,16 @@ msgstr "Alternatywna nazwa"
msgid "A more basic name for the muscle"
msgstr "Bardziej podstawowa nazwa mięśnia"
-#: exercises/models/video.py:50
+#: exercises/models/video.py:52
#, python-format
msgid "Maximum file size is %(size)sMB."
msgstr "Maksymalny rozmiar pliku wynosi %(size)sMB."
-#: exercises/models/video.py:57 exercises/models/video.py:65
+#: exercises/models/video.py:59 exercises/models/video.py:67
msgid "File type is not supported"
msgstr "Typ pliku nie jest obsługiwany"
-#: exercises/models/video.py:70
+#: exercises/models/video.py:72
msgid "File is not a valid video"
msgstr "Plik nie jest prawidłowym filmem"
@@ -1328,7 +1354,11 @@ msgstr "Usunąć sprzęt?"
msgid "Add muscle"
msgstr "Dodaj mięsień"
-#: gallery/templates/images/overview.html:72
+#: gallery/forms.py:35
+msgid "If date is left empty, it will be read from the image instead"
+msgstr ""
+
+#: gallery/templates/images/overview.html:69
msgid "Add image"
msgstr "Dodaj obraz"
@@ -1394,7 +1424,7 @@ msgid "Contract type"
msgstr "Typ kontraktu"
#: gym/models/contract.py:211 gym/templates/contract/view.html:59
-#: nutrition/forms.py:58
+#: nutrition/forms.py:67
msgid "Amount"
msgstr "Kwota"
@@ -1573,7 +1603,7 @@ msgstr "Emaile"
msgid "Add member"
msgstr "Dodaj członka"
-#: gym/templates/gym/new_user.html:48 nutrition/templates/rate/form.html:120
+#: gym/templates/gym/new_user.html:48 nutrition/templates/rate/form.html:121
msgid "Info"
msgstr "Informacje"
@@ -1745,10 +1775,6 @@ msgstr "Drążek"
msgid "Quads"
msgstr "Mięsień czworogłowy"
-#: i18n.tpl:30
-msgid "Repetitions"
-msgstr "Powtórzenia"
-
#: i18n.tpl:31
msgid "Resistance band"
msgstr ""
@@ -1777,198 +1803,204 @@ msgstr "Triceps"
msgid "Until Failure"
msgstr "Do porażki"
-#: i18n.tpl:40
+#: i18n.tpl:38
+#, fuzzy
+#| msgid "Kilometers"
+msgid "Meters"
+msgstr "Kilometry"
+
+#: i18n.tpl:41
msgid "none (bodyweight exercise)"
msgstr "żaden (własny ciężar ciała)"
-#: i18n.tpl:41
+#: i18n.tpl:42
msgid "Beginner"
msgstr ""
-#: i18n.tpl:42
+#: i18n.tpl:43
#, fuzzy
#| msgctxt "As in \"content of an email\""
#| msgid "Content"
msgid "Consistent"
msgstr "Treść"
-#: i18n.tpl:43
+#: i18n.tpl:44
msgid "Dedicated"
msgstr ""
-#: i18n.tpl:44
+#: i18n.tpl:45
msgid "Obsessed"
msgstr ""
-#: i18n.tpl:45
+#: i18n.tpl:46
msgid "Legend"
msgstr "Legenda"
-#: i18n.tpl:46
+#: i18n.tpl:47
msgid "Veteran"
msgstr ""
-#: i18n.tpl:47
+#: i18n.tpl:48
msgid "Titan"
msgstr ""
-#: i18n.tpl:48
+#: i18n.tpl:49
msgid "Unstoppable"
msgstr ""
-#: i18n.tpl:49
+#: i18n.tpl:50
msgid "Weekend Warrior"
msgstr ""
-#: i18n.tpl:50
+#: i18n.tpl:51
msgid "Elephant lifter"
msgstr ""
-#: i18n.tpl:51
+#: i18n.tpl:52
msgid "Bus lifter"
msgstr ""
-#: i18n.tpl:52
+#: i18n.tpl:53
msgid "Plane lifter"
msgstr ""
-#: i18n.tpl:53
+#: i18n.tpl:54
msgid "Blue whale lifter"
msgstr ""
-#: i18n.tpl:54
+#: i18n.tpl:55
msgid "Space Station lifter"
msgstr ""
-#: i18n.tpl:55
+#: i18n.tpl:56
msgid "Millionaire"
msgstr ""
-#: i18n.tpl:56
+#: i18n.tpl:57
msgid "Atlas"
msgstr ""
-#: i18n.tpl:57
+#: i18n.tpl:58
msgid "Early Bird"
msgstr ""
-#: i18n.tpl:58
+#: i18n.tpl:59
#, fuzzy
#| msgid "Weight log"
msgid "Night Owl"
msgstr "Wartości ciężarów"
-#: i18n.tpl:59
+#: i18n.tpl:60
msgid "New Year, New Me"
msgstr ""
-#: i18n.tpl:60
+#: i18n.tpl:61
msgid "Phoenix"
msgstr ""
-#: i18n.tpl:61
+#: i18n.tpl:62
#, fuzzy
#| msgid "Personal data"
msgid "Personal Record"
msgstr "Dane personalne"
-#: i18n.tpl:62
+#: i18n.tpl:63
#, fuzzy
#| msgid "Copy workout"
msgid "Complete your first workout"
msgstr "Kopiuj trening"
-#: i18n.tpl:63
+#: i18n.tpl:64
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 10 workouts"
msgstr "Przykładowy trening"
-#: i18n.tpl:64
+#: i18n.tpl:65
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 50 workouts"
msgstr "Przykładowy trening"
-#: i18n.tpl:65
+#: i18n.tpl:66
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 100 workouts"
msgstr "Przykładowy trening"
-#: i18n.tpl:66
+#: i18n.tpl:67
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 200 workouts"
msgstr "Przykładowy trening"
-#: i18n.tpl:67
+#: i18n.tpl:68
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 500 workouts"
msgstr "Przykładowy trening"
-#: i18n.tpl:68
+#: i18n.tpl:69
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 1000 workouts"
msgstr "Przykładowy trening"
-#: i18n.tpl:69
+#: i18n.tpl:70
msgid "Maintain a 30-day workout streak"
msgstr ""
-#: i18n.tpl:70
+#: i18n.tpl:71
msgid "Work out on Saturday and Sunday for 4 consecutive weekends"
msgstr ""
-#: i18n.tpl:71
+#: i18n.tpl:72
msgid "Lift a cumulative total of 5.000 kg"
msgstr ""
-#: i18n.tpl:72
+#: i18n.tpl:73
msgid "Lift a cumulative total of 20.000 kg"
msgstr ""
-#: i18n.tpl:73
+#: i18n.tpl:74
msgid "Lift a cumulative total of 50.000 kg"
msgstr ""
-#: i18n.tpl:74
+#: i18n.tpl:75
msgid "Lift a cumulative total of 150.000 kg"
msgstr ""
-#: i18n.tpl:75
+#: i18n.tpl:76
msgid "Lift a cumulative total of 450.000 kg"
msgstr ""
-#: i18n.tpl:76
+#: i18n.tpl:77
msgid "Lift a cumulative total of 1.000.000 kg"
msgstr ""
-#: i18n.tpl:77
+#: i18n.tpl:78
msgid "Lift a cumulative total of 10.000.000 kg"
msgstr ""
-#: i18n.tpl:78
+#: i18n.tpl:79
msgid "Complete a workout before 6:00 AM"
msgstr ""
-#: i18n.tpl:79
+#: i18n.tpl:80
msgid "Complete a workout after 9:00 PM"
msgstr ""
-#: i18n.tpl:80
+#: i18n.tpl:81
#, fuzzy
#| msgid "Workout for %s"
msgid "Work out on January 1st"
msgstr "Trening dla %s"
-#: i18n.tpl:81
+#: i18n.tpl:82
msgid "Return to training after being inactive for 30 days"
msgstr ""
-#: i18n.tpl:82
+#: i18n.tpl:83
msgid "Achieve a new Personal Record on any exercise"
msgstr ""
@@ -2052,7 +2084,7 @@ msgstr "Ćwiczenie"
msgid "Routine will expire soon"
msgstr "Trening wkrótce wygaśnie"
-#: manager/models/routine.py:153 manager/models/session.py:145
+#: manager/models/routine.py:154 manager/models/session.py:145
msgid "The start time cannot be after the end time."
msgstr "Czas rozpoczęcia nie może być po czasie zakończenia."
@@ -2139,23 +2171,27 @@ msgstr "Trening"
msgid "Workout for %s"
msgstr "Trening dla %s"
-#: nutrition/forms.py:62
+#: nutrition/extract_info/off.py:72 nutrition/extract_info/off.py:91
+msgid "Serving"
+msgstr ""
+
+#: nutrition/forms.py:71 nutrition/forms.py:208
msgid "Unit"
msgstr "Jednostka"
-#: nutrition/forms.py:170 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:179 nutrition/templates/rate/form.html:77
msgid "Basic caloric intake"
msgstr "Podstawowe spożycie kalorii"
-#: nutrition/forms.py:171
+#: nutrition/forms.py:180
msgid "Your basic caloric intake as calculated for your data"
msgstr "Twoje podstawowe spożycie kalorii obliczone na podstawie danych"
-#: nutrition/forms.py:176
+#: nutrition/forms.py:185
msgid "Additional calories"
msgstr "Dodatkowe kalorie"
-#: nutrition/forms.py:178
+#: nutrition/forms.py:187
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
@@ -2164,13 +2200,31 @@ msgstr ""
"wartość)"
#: nutrition/forms.py:209
+msgid "grams (g)"
+msgstr ""
+
+#: nutrition/forms.py:219
msgid "Ingredient"
msgstr "Składnik"
-#: nutrition/forms.py:213
+#: nutrition/forms.py:223
msgid "Also search for names in English"
msgstr "Szukaj również w języku angielskim"
+#: nutrition/forms.py:239
+msgid "Quantity"
+msgstr ""
+
+#: nutrition/forms.py:241
+msgid "Enter a quantity and choose grams (g) or one of the serving units."
+msgstr ""
+
+#: nutrition/models/ingredient.py:526
+#, fuzzy
+#| msgid "Correction"
+msgid "Portion"
+msgstr "Korekta"
+
#: nutrition/templates/ingredient/email_new.tpl:1
#, python-format
msgid ""
@@ -2219,59 +2273,92 @@ msgstr ""
"mail,\n"
"zostaniesz powiadomiony o zakończonej procedurze."
-#: nutrition/templates/ingredient/overview.html:38
+#: nutrition/templates/ingredient/overview.html:32
+#: nutrition/templates/ingredient/overview.html:68
+#: nutrition/templates/ingredient/view.html:143
+msgid "Vegan"
+msgstr ""
+
+#: nutrition/templates/ingredient/overview.html:34
+#: nutrition/templates/ingredient/overview.html:79
+#: nutrition/templates/ingredient/view.html:155
+#, fuzzy
+#| msgid "Variations"
+msgid "Vegetarian"
+msgstr "Możliwości"
+
+#: nutrition/templates/ingredient/overview.html:43
msgid "No ingredients."
msgstr "Brak składników."
-#: nutrition/templates/ingredient/overview.html:49
+#: nutrition/templates/ingredient/overview.html:54
msgid "Search"
msgstr "Szukaj"
-#: nutrition/templates/ingredient/view.html:45 nutrition/views/plan.py:237
+#: nutrition/templates/ingredient/overview.html:57
+#, fuzzy
+#| msgid "No filter"
+msgid "Filter"
+msgstr "Brak filta"
+
+#: nutrition/templates/ingredient/overview.html:83
+msgid "Apply"
+msgstr ""
+
+#: nutrition/templates/ingredient/overview.html:85
+msgid "Reset"
+msgstr ""
+
+#: nutrition/templates/ingredient/view.html:46 nutrition/views/plan.py:236
msgid "Macronutrients"
msgstr "Makroelementy"
-#: nutrition/templates/ingredient/view.html:54
+#: nutrition/templates/ingredient/view.html:55
msgid "kJ"
msgstr "kJ"
-#: nutrition/templates/ingredient/view.html:70 nutrition/views/plan.py:267
+#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:266
msgid "Sugar content in carbohydrates"
msgstr "Cukry proste"
-#: nutrition/templates/ingredient/view.html:75
-#: nutrition/templates/ingredient/view.html:91
-#: nutrition/templates/ingredient/view.html:113
-#: nutrition/templates/ingredient/view.html:123
+#: nutrition/templates/ingredient/view.html:76
+#: nutrition/templates/ingredient/view.html:92
+#: nutrition/templates/ingredient/view.html:114
+#: nutrition/templates/ingredient/view.html:124
msgid "n.A."
msgstr "N/A"
-#: nutrition/templates/ingredient/view.html:86 nutrition/views/plan.py:281
+#: nutrition/templates/ingredient/view.html:87 nutrition/views/plan.py:280
msgid "Saturated fat content in fats"
msgstr "Tłuszcze nasycone"
-#: nutrition/templates/ingredient/view.html:102
+#: nutrition/templates/ingredient/view.html:103
msgid "Others"
msgstr "Inne"
-#: nutrition/templates/ingredient/view.html:108 nutrition/views/plan.py:287
+#: nutrition/templates/ingredient/view.html:109 nutrition/views/plan.py:286
msgid "Fiber"
msgstr "Błonnik"
-#: nutrition/templates/ingredient/view.html:118 nutrition/views/plan.py:293
+#: nutrition/templates/ingredient/view.html:119 nutrition/views/plan.py:292
msgid "Sodium"
msgstr "Sód"
-#: nutrition/templates/ingredient/view.html:143
-#: nutrition/templates/units/list.html:50 nutrition/views/unit.py:86
+#: nutrition/templates/ingredient/view.html:136
+#, fuzzy
+#| msgid "Click here for more information"
+msgid "Dietary information"
+msgstr "Kliknij tutaj aby uzyskać więcej informacji"
+
+#: nutrition/templates/ingredient/view.html:184
msgid "Add new weight unit"
msgstr "Dodaj nową jednostkę wagi"
-#: nutrition/templates/rate/form.html:25
+#: nutrition/templates/rate/form.html:26
msgid "Basal metabolic rate"
msgstr "Podstawowy współczynnik metaboliczny"
-#: nutrition/templates/rate/form.html:26
+#: nutrition/templates/rate/form.html:27
msgid ""
"The basal metabolic rate is the amount of energy expended daily\n"
"at rest. This is the minimum energy needed for the body to function, without "
@@ -2283,15 +2370,15 @@ msgstr ""
"by funkcjonować, bez żadnego\n"
"dodatkowego wysiłku fizycznego."
-#: nutrition/templates/rate/form.html:37
+#: nutrition/templates/rate/form.html:38
msgid "Your basic metabolic rate is: "
msgstr "Twój podstawowy współczynnik metaboliczny to: "
-#: nutrition/templates/rate/form.html:47
+#: nutrition/templates/rate/form.html:48
msgid "Physical activities"
msgstr "Aktywności fizyczne"
-#: nutrition/templates/rate/form.html:48
+#: nutrition/templates/rate/form.html:49
msgid ""
"The physical activity level (PAL) is a factor used to to express\n"
"the additional physical activity and is used to calculate the total energy\n"
@@ -2302,11 +2389,11 @@ msgstr ""
"energii\n"
"potrzebnej w ciągu dnia."
-#: nutrition/templates/rate/form.html:59
+#: nutrition/templates/rate/form.html:60
msgid "Factor for daily activities: "
msgstr "Współczynnik dla codziennych aktywności: "
-#: nutrition/templates/rate/form.html:67
+#: nutrition/templates/rate/form.html:68
msgid ""
"The base caloric intake is the amount of calories your metabolism\n"
"needs based on your level of physical activity."
@@ -2314,11 +2401,11 @@ msgstr ""
"Podstawowe spożycie kalorii jest wartością określającą ile kalorii\n"
"jest wymaganych przez Twój organizm na podstawie Twojej aktywności fizycznej."
-#: nutrition/templates/rate/form.html:81
+#: nutrition/templates/rate/form.html:82
msgid "Calculate basic caloric intake"
msgstr "Oblicz podstawowe spożycie kalorii"
-#: nutrition/templates/rate/form.html:88
+#: nutrition/templates/rate/form.html:89
msgid ""
"The total calories are the actual total calories per day. This\n"
"might include e.g. a surplus or deficit if you are bulking or cutting. "
@@ -2330,19 +2417,19 @@ msgstr ""
"masy mięśniowej, czy utracić tkankę tłuszczową. Alternatywnie\n"
"możesz wpisać wartość samodzielnie."
-#: nutrition/templates/rate/form.html:102
+#: nutrition/templates/rate/form.html:103
msgid "Transfer basic intake to total daily calories"
msgstr "Przenieś podstawowe spożycia do sumy dziennych kalorii"
-#: nutrition/templates/rate/form.html:106
+#: nutrition/templates/rate/form.html:107
msgid "Add additional calories to total daily calories"
msgstr "Dodaj dodatkowe kalorie do sumy dziennego spożycia"
-#: nutrition/templates/rate/form.html:110
+#: nutrition/templates/rate/form.html:111
msgid "Save total calories to profile"
msgstr "Zapisz sumę kalorii na profil"
-#: nutrition/templates/rate/form.html:121
+#: nutrition/templates/rate/form.html:122
msgid ""
"Please note that these calculations can only be an\n"
"approximation. If you base your nutrition plan on these values, observe\n"
@@ -2354,48 +2441,48 @@ msgstr ""
"swój organizm przez kilka tygodni i w razie potrzeby dostosuj odpowiednie "
"wartości."
-#: nutrition/views/ingredient.py:158
+#: nutrition/views/ingredient.py:163
msgid "Add a new ingredient"
msgstr "Dodaj nowy składnik"
-#: nutrition/views/plan.py:128
+#: nutrition/views/plan.py:127
msgid "Nutritional plan"
msgstr "Plan diety"
-#: nutrition/views/plan.py:130
+#: nutrition/views/plan.py:129
#, python-format
msgid "Nutritional plan for %s"
msgstr "Plan dietetyczny dla %s"
-#: nutrition/views/plan.py:202
+#: nutrition/views/plan.py:201
msgid "<i>This is an empty plan, what did you expect on the PDF?</i>"
msgstr "<i>Pusty plan, czego się spodziewałeś w PDFie?</i>"
-#: nutrition/views/plan.py:230
+#: nutrition/views/plan.py:229
msgid "Nutritional data"
msgstr "Wartości odżywcze"
-#: nutrition/views/plan.py:238
+#: nutrition/views/plan.py:237
msgid "Total"
msgstr "Sumarycznie"
-#: nutrition/views/plan.py:239
+#: nutrition/views/plan.py:238
msgid "Percent of energy"
msgstr "Procent energii"
-#: nutrition/views/plan.py:240
+#: nutrition/views/plan.py:239
msgid "g per body kg"
msgstr "g na kg masy ciała"
-#: nutrition/views/unit_ingredient.py:69
+#: nutrition/views/unit_ingredient.py:64
msgid "Add a new weight unit"
msgstr "Dodaj nową jednostkę wagi"
-#: nutrition/views/unit_ingredient.py:106
+#: nutrition/views/unit_ingredient.py:99
msgid "Edit a weight unit to ingredient connection"
msgstr "Edytuj powiązanie jednostki wagi i skladnika"
-#: nutrition/views/unit_ingredient.py:138
+#: nutrition/views/unit_ingredient.py:129
msgid "Delete?"
msgstr "Usunąć?"
@@ -2794,7 +2881,7 @@ msgstr "Kod Źródłowy"
msgid "Translation"
msgstr "Tłumaczenie"
-#: utils/generic_views.py:263
+#: utils/generic_views.py:246
msgid "Yes, delete"
msgstr "Tak, usuń"
@@ -2848,10 +2935,6 @@ msgstr "Musisz wpisać swoją wagę"
msgid "Import weight logs"
msgstr "Importuj wartości ciężarów"
-#: weight/templates/import_csv_form.html:9
-msgid "Submit"
-msgstr "Zapisz"
-
#: weight/templates/import_csv_form.html:15
msgid ""
"Use this import field to import your weight logs into Workout\n"
@@ -2970,6 +3053,34 @@ msgstr ""
msgid "Re-Submit"
msgstr "Prześlij ponownie"
+#~ msgid "Email verification"
+#~ msgstr "Weryfikacja E-mail"
+
+#, python-format
+#~ msgid "%(username)s, your email was verified"
+#~ msgstr "%(username)s, twój adres e-mail został zweryfikowany"
+
+#~ msgid "Error, invalid verification token"
+#~ msgstr "Błąd, nieprawidłowy token weryfikacyjny"
+
+#~ msgid "Email Confirmation"
+#~ msgstr "Potwierdzenie e-mail"
+
+#, python-format
+#~ msgid "You are almost there, %(username)s!"
+#~ msgstr "Już prawie jesteś, %(username)s!"
+
+#, python-format
+#~ msgid "Please click <a href=\"%(link)s\">here</a> to confirm your email"
+#~ msgstr "Kliknij w <a href=\"%(link)s\">here</a> aby potwierdzić twój e-mail"
+
+#, python-format
+#~ msgid "The token expires on %(time)s"
+#~ msgstr "Token wygasa %(time)s"
+
+#~ msgid "Ingredient weight units"
+#~ msgstr "Jednostka wagowa składników"
+
#~ msgid "Image"
#~ msgstr "Obraz"
@@ -3000,9 +3111,6 @@ msgstr "Prześlij ponownie"
#~ msgid "Secondary muscles"
#~ msgstr "Mięśnie pomocnicze"
-#~ msgid "Variations"
-#~ msgstr "Możliwości"
-
#~ msgid "Exercise Categories"
#~ msgstr "Kategorie ćwiczeń"
@@ -4065,9 +4173,6 @@ msgstr "Prześlij ponownie"
#~ msgid "This content is available under the following license:"
#~ msgstr "Treść jest dostępna na następującej licencji:"
-#~ msgid "Click here for more information"
-#~ msgstr "Kliknij tutaj aby uzyskać więcej informacji"
-
#, python-format
#~ msgid "%(name)s is too similar to existing exercise \"%(exercise_name)s\""
#~ msgstr ""
@@ -4741,8 +4846,5 @@ msgstr "Prześlij ponownie"
#~ msgid "Last 12 months"
#~ msgstr "Ostatnie 12 miesięcy"
-#~ msgid "No filter"
-#~ msgstr "Brak filta"
-
#~ msgid "Days"
#~ msgstr "Dni"
diff --git a/wger/locale/pt/LC_MESSAGES/django.po b/wger/locale/pt/LC_MESSAGES/django.po
index f09b8a7b2..37dc3d0d2 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: 2026-01-17 14:03+0000\n"
+"POT-Creation-Date: 2026-04-10 10:20+0000\n"
"PO-Revision-Date: 2026-03-15 16:09+0000\n"
"Last-Translator: Edson Wolf <[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"
@@ -42,7 +42,7 @@ msgstr ""
#: config/views/gym_config.py:42 core/templates/language/view.html:64
#: core/templates/license/list.html:17
#: core/templates/repetition_unit/list.html:18
-#: core/templates/user/overview.html:204 core/templates/user/overview.html:467
+#: core/templates/user/overview.html:207 core/templates/user/overview.html:470
#: core/templates/weight_unit/list.html:18
#: exercises/templates/categories/admin-overview.html:17
#: exercises/templates/equipment/admin-overview.html:17
@@ -54,30 +54,29 @@ msgstr ""
#: gym/templates/gym/list.html:19 gym/templates/gym/list.html:48
#: gym/templates/gym/member_list.html:94 gym/templates/gym/member_list.html:152
#: gym/templates/gym/member_list.html:190
-#: nutrition/templates/ingredient/view.html:164
-#: nutrition/templates/ingredient/view.html:209
-#: nutrition/templates/units/list.html:19
+#: nutrition/templates/ingredient/view.html:205
+#: nutrition/templates/ingredient/view.html:248
msgid "Edit"
msgstr "Editar"
-#: core/forms.py:91 core/templates/navigation.html:271
-#: core/templates/navigation.html:278 core/templates/user/login.html:4
+#: core/forms.py:89 core/templates/navigation.html:268
+#: core/templates/navigation.html:275 core/templates/user/login.html:4
#: core/templates/user/registration_sidebar.html:12
#: software/templates/features.html:82 software/templates/features.html:448
msgid "Login"
msgstr "Login"
-#: core/forms.py:130 core/forms.py:244 gym/views/export.py:61
+#: core/forms.py:128 core/forms.py:242 gym/views/export.py:61
#: gym/views/gym.py:217
msgid "First name"
msgstr "Primeiro nome"
-#: core/forms.py:131 core/forms.py:245 core/templates/user/overview.html:284
+#: core/forms.py:129 core/forms.py:243 core/templates/user/overview.html:287
#: gym/views/export.py:62 gym/views/gym.py:217
msgid "Last name"
msgstr "Último nome"
-#: core/forms.py:133 core/forms.py:210 core/templates/user/overview.html:288
+#: core/forms.py:131 core/forms.py:208 core/templates/user/overview.html:291
#: gym/models/contract.py:256 gym/models/gym.py:58
#: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:116
#: gym/templates/gym/new_user.html:30 gym/views/export.py:60
@@ -87,55 +86,55 @@ msgstr "Último nome"
msgid "Email"
msgstr "Email"
-#: core/forms.py:134
+#: core/forms.py:132
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:138 core/models/profile.py:222
+#: core/forms.py:136 core/models/profile.py:222
#: gym/templates/gym/new_user.html:38
msgid "Date of Birth"
msgstr "Data de Nascimento"
-#: core/forms.py:177
+#: core/forms.py:175
msgid "Personal data"
msgstr "Dados pessoais"
-#: core/forms.py:189
+#: core/forms.py:187
msgid "Workout reminders"
msgstr "Lembretes de treino"
-#: core/forms.py:196
+#: core/forms.py:194
msgid "Other settings"
msgstr "Outras configurações"
-#: core/forms.py:204 core/views/user.py:614 core/views/user.py:629
-#: core/views/user.py:641 gym/forms.py:73 utils/generic_views.py:143
+#: core/forms.py:202 core/views/user.py:630 core/views/user.py:654
+#: core/views/user.py:668 gym/forms.py:73 utils/generic_views.py:137
msgid "Save"
msgstr "Salvar"
-#: core/forms.py:211
+#: core/forms.py:209
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:240
+#: core/forms.py:238
msgid "This e-mail address is already in use."
msgstr "Este endereço de e-mail já está sendo usado."
-#: core/forms.py:261 gym/templates/gym/new_user.html:26
+#: core/forms.py:259 gym/templates/gym/new_user.html:26
#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:217
msgid "Password"
msgstr "Senha"
-#: core/forms.py:263
+#: core/forms.py:261
msgid "Please enter your current password."
msgstr "Por favor informe a sua senha atual."
-#: core/forms.py:272 core/templates/language/view.html:70
+#: core/forms.py:270 core/templates/language/view.html:70
#: core/templates/license/list.html:21
#: core/templates/repetition_unit/list.html:22
-#: core/templates/user/overview.html:233
+#: core/templates/user/overview.html:236
#: core/templates/weight_unit/list.html:22
#: exercises/templates/categories/admin-overview.html:21
#: exercises/templates/equipment/admin-overview.html:21
@@ -143,27 +142,30 @@ msgstr "Por favor informe a sua senha atual."
#: gym/templates/admin_notes/list.html:37
#: gym/templates/contract_option/list.html:35
#: gym/templates/contract_type/list.html:36 gym/templates/document/list.html:46
-#: gym/templates/gym/list.html:23 nutrition/templates/ingredient/view.html:168
-#: nutrition/templates/ingredient/view.html:215
-#: nutrition/templates/units/list.html:25
+#: gym/templates/gym/list.html:23 nutrition/templates/ingredient/view.html:209
+#: nutrition/templates/ingredient/view.html:254
msgid "Delete"
msgstr "Remover"
-#: core/forms.py:281
+#: core/forms.py:279
msgid "Invalid password"
msgstr "Senha inválida"
-#: core/forms.py:293
+#: core/forms.py:291 core/forms.py:349
msgid "The form is secured with reCAPTCHA"
msgstr "O formulário está seguro com o reCAPTCHA"
-#: core/forms.py:314 core/forms.py:341 core/templates/navigation.html:272
-#: core/templates/navigation.html:285 core/templates/template.html:123
-#: core/templates/user/login.html:21 core/views/user.py:285
+#: core/forms.py:312 core/forms.py:339 core/templates/navigation.html:269
+#: core/templates/navigation.html:282 core/templates/template.html:113
+#: core/templates/user/login.html:21 core/views/user.py:293
#: software/templates/features.html:87 software/templates/features.html:442
msgid "Register"
msgstr "Cadastro"
+#: core/forms.py:360 weight/templates/import_csv_form.html:9
+msgid "Submit"
+msgstr "Submeter"
+
#: core/models/language.py:31 core/templates/language/view.html:21
msgid "Language short name"
msgstr "Abreviação do idioma"
@@ -200,36 +202,36 @@ msgstr "Link"
msgid "Link to license text or other information"
msgstr "Link para a licença ou outra informação"
-#: core/models/profile.py:57
+#: core/models/profile.py:60
#, python-format
msgid "%(birthdate)s is not a valid birthdate"
msgstr "%(birthdate)s não é uma data de aniversário válida"
-#: core/models/profile.py:66
+#: core/models/profile.py:69
msgid "Male"
msgstr "Masculino"
-#: core/models/profile.py:67
+#: core/models/profile.py:70
msgid "Female"
msgstr "Feminino"
-#: core/models/profile.py:74
+#: core/models/profile.py:77
msgid "Low"
msgstr "Baixa"
-#: core/models/profile.py:75
+#: core/models/profile.py:78
msgid "Medium"
msgstr "Médio"
-#: core/models/profile.py:76
+#: core/models/profile.py:79
msgid "High"
msgstr "Alto"
-#: core/models/profile.py:82
+#: core/models/profile.py:85
msgid "Metric (kilogram)"
msgstr "Métrico (kg)"
-#: core/models/profile.py:83
+#: core/models/profile.py:86
msgid "Imperial (pound)"
msgstr "Imperial (lb)"
@@ -351,7 +353,7 @@ msgstr "Média de horas por semana"
msgid "Free time"
msgstr "Tempo livre"
-#: core/models/profile.py:320 nutrition/templates/rate/form.html:66
+#: core/models/profile.py:320 nutrition/templates/rate/form.html:67
msgid "Total daily calories"
msgstr "Total calorias diária"
@@ -391,20 +393,45 @@ msgstr "Ativar troféus"
msgid "Enable or disable the trophy system for this user"
msgstr "Ative ou desative o sistema de troféus para este usuário"
-#: core/models/profile.py:446
+#: core/models/profile.py:457
msgid "The sum of all hours has to be 24"
msgstr "A soma de todas as horas deve ser 24"
-#: core/models/rep_unit.py:36 core/models/weight_unit.py:42
-#: core/templates/user/overview.html:280 core/views/user.py:589
+#: core/models/rep_unit.py:32 i18n.tpl:30
+msgid "Repetitions"
+msgstr "Repeticões"
+
+#: core/models/rep_unit.py:33 core/templates/user/overview.html:82
+#: exercises/templates/history/overview.html:30
+msgid "Time"
+msgstr "Tempo"
+
+#: core/models/rep_unit.py:34
+#, fuzzy
+#| msgid "Resistance band"
+msgid "Distance"
+msgstr "Elástico"
+
+#: core/models/rep_unit.py:47 core/models/weight_unit.py:42
+#: core/templates/user/overview.html:283 core/views/user.py:605
#: exercises/models/muscle.py:36 gym/models/contract.py:52
#: gym/models/contract.py:103 gym/models/gym.py:46
#: gym/models/user_document.py:84 gym/templates/contract/view.html:50
#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:108
-#: gym/views/gym.py:158 nutrition/templates/ingredient/view.html:151
+#: gym/views/gym.py:158 nutrition/templates/ingredient/view.html:192
msgid "Name"
msgstr "Nome"
+#: core/models/rep_unit.py:53
+#, fuzzy
+#| msgid "Unit"
+msgid "Unit Type"
+msgstr "Unidade"
+
+#: core/models/rep_unit.py:54
+msgid "The type of unit (repetitions, time, or distance)"
+msgstr ""
+
#: core/templates/403.html:4
msgid "Forbidden!"
msgstr "Proibido!"
@@ -435,6 +462,55 @@ msgstr ""
"navegador e, se isso não ajudar, por favor, tente novamente mais tarde. Se o "
"problema persistir, você pode buscar ajuda das maneiras listadas abaixo:"
+#: core/templates/account/email/email_confirmation_message.html:81
+msgid "Almost there!"
+msgstr ""
+
+#: core/templates/account/email/email_confirmation_message.html:85
+#, fuzzy, python-format
+#| msgid ""
+#| "You're receiving this e-mail because you requested a password reset for "
+#| "your user account at %(site_name)s."
+msgid ""
+"You're receiving this email because the user \"%(user_display)s\" has given "
+"your email address to register an account on %(site_domain)s."
+msgstr ""
+"Recebeu este e-mail por requisitar a redefinição da palavra-passe da sua "
+"conta de utilizador no %(site_name)s."
+
+#: core/templates/account/email/email_confirmation_message.html:93
+msgid ""
+"Your email verification code is listed below. Please enter it in your open "
+"browser window."
+msgstr ""
+
+#: core/templates/account/email/email_confirmation_message.html:100
+#, fuzzy
+#| msgid "Please click the following link to confirm your email: %(link)s"
+msgid "Please click the button below to confirm your email address."
+msgstr "Clique no seguinte link para confirmar seu e-mail: %(link)s"
+
+#: core/templates/account/email/email_confirmation_message.html:106
+#, fuzzy
+#| msgid "Unverified email"
+msgid "Confirm email"
+msgstr "E-mail não verificado"
+
+#: core/templates/account/email/email_confirmation_message.html:110
+#, python-format
+msgid ""
+"The link is valid for %(expire_hours)s hours (until %(date)s, %(time)s). You "
+"can request a new one from your profile settings."
+msgstr ""
+
+#: core/templates/account/email/email_confirmation_message.html:116
+msgid "If the button doesn't work, copy and paste this link into your browser:"
+msgstr ""
+
+#: core/templates/account/email/email_confirmation_message.html:125
+msgid "the wger Team"
+msgstr "Equipe wger"
+
#: core/templates/base.html:10
#, python-format
msgid ""
@@ -469,51 +545,7 @@ 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 verification"
-msgstr "Verificação de e-mail"
-
-#: core/templates/email_verification/confirm_template.html:18
-#, python-format
-msgid "%(username)s, your email was verified"
-msgstr "%(username)s, seu e-mail foi verificado"
-
-#: core/templates/email_verification/confirm_template.html:22
-msgid "Error, invalid verification token"
-msgstr "Erro, token de verificação inválido"
-
-#: core/templates/email_verification/email_body_html.tpl:6
-msgid "Email Confirmation"
-msgstr "Confirmação de e-mail"
-
-#: 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 "Você está quase lá, %(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 "Clique <a href=\"%(link)s\">aqui</a> para confirmar seu e-mail"
-
-#: 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 "O token expira em %(time)s"
-
-#: core/templates/email_verification/email_body_html.tpl:14
-#: core/templates/email_verification/email_body_txt.tpl:8
-msgid "the wger Team"
-msgstr "Equipe wger"
-
-#: core/templates/email_verification/email_body_txt.tpl:4
-#, python-format
-msgid "Please click the following link to confirm your email: %(link)s"
-msgstr "Clique no seguinte link para confirmar seu e-mail: %(link)s"
-
-#: core/templates/language/overview.html:4 core/templates/navigation.html:344
+#: core/templates/language/overview.html:4 core/templates/navigation.html:341
msgid "Languages"
msgstr "Idiomas"
@@ -522,16 +554,16 @@ msgid "Nothing found."
msgstr "Não encontrado."
#: core/templates/language/overview.html:22
-#: nutrition/templates/ingredient/overview.html:38
+#: nutrition/templates/ingredient/overview.html:43
msgid "Add one now."
msgstr "Adicionar um agora."
#: core/templates/language/overview.html:34 core/templates/license/list.html:43
-#: core/templates/repetition_unit/list.html:46
-#: core/templates/user/overview.html:344 core/templates/user/overview.html:384
-#: core/templates/user/overview.html:422
-#: core/templates/weight_unit/list.html:46 core/views/languages.py:74
-#: core/views/license.py:66 core/views/repetition_units.py:66
+#: core/templates/repetition_unit/list.html:44
+#: core/templates/user/overview.html:347 core/templates/user/overview.html:387
+#: core/templates/user/overview.html:425
+#: core/templates/weight_unit/list.html:46 core/views/languages.py:77
+#: core/views/license.py:66 core/views/repetition_units.py:76
#: core/views/weight_units.py:66
#: exercises/templates/categories/admin-overview.html:40
#: exercises/templates/equipment/admin-overview.html:39
@@ -544,14 +576,14 @@ msgstr "Adicionar um agora."
#: gym/templates/gym/member_list.html:264
#: gym/templates/gym/member_list.html:303
#: mailer/templates/mailer/gym/overview.html:43
-#: nutrition/templates/ingredient/overview.html:60
+#: nutrition/templates/ingredient/overview.html:97
msgid "Add"
msgstr "Adicionar"
#: core/templates/language/view.html:61 core/templates/user/api_key.html:41
#: core/templates/user/preferences.html:50 gym/models/contract.py:203
#: gym/templates/contract/view.html:41 gym/templates/gym/member_list.html:270
-#: nutrition/templates/ingredient/view.html:206
+#: nutrition/templates/ingredient/view.html:245
msgid "Options"
msgstr "Opções"
@@ -561,9 +593,9 @@ msgstr "Lista de licença"
#: core/templates/license/list.html:30
#: core/templates/repetition_unit/list.html:32
-#: core/templates/user/overview.html:104 core/templates/user/overview.html:136
-#: core/templates/user/overview.html:185 core/templates/user/overview.html:365
-#: core/templates/user/overview.html:404 core/templates/user/overview.html:448
+#: core/templates/user/overview.html:107 core/templates/user/overview.html:139
+#: core/templates/user/overview.html:188 core/templates/user/overview.html:368
+#: core/templates/user/overview.html:407 core/templates/user/overview.html:451
#: core/templates/weight_unit/list.html:32
#: exercises/templates/categories/admin-overview.html:30
#: exercises/templates/equipment/admin-overview.html:30
@@ -575,11 +607,10 @@ msgstr "Lista de licença"
#: gym/templates/gym/member_list.html:284
#: gym/templates/gym/member_list.html:321
#: mailer/templates/mailer/gym/overview.html:30
-#: nutrition/templates/units/list.html:34
msgid "Nothing found"
msgstr "Nada encontrado"
-#: core/templates/misc/about.html:4 core/templates/template.html:160
+#: core/templates/misc/about.html:4 core/templates/template.html:150
msgid "Imprint"
msgstr "Imprimir"
@@ -587,162 +618,157 @@ msgstr "Imprimir"
msgid "Training"
msgstr "Treinamento"
-#: core/templates/navigation.html:37 core/templates/user/overview.html:25
+#: core/templates/navigation.html:36 core/templates/user/overview.html:28
msgid "Routines"
msgstr "Rotinas"
-#: core/templates/navigation.html:45 core/templates/user/overview.html:70
+#: core/templates/navigation.html:44 core/templates/user/overview.html:73
msgid "Calendar"
msgstr "Calendário"
-#: core/templates/navigation.html:55
+#: core/templates/navigation.html:53
msgid "Measurements"
msgstr "Medições"
-#: core/templates/navigation.html:66 gallery/templates/images/overview.html:6
+#: core/templates/navigation.html:64 gallery/templates/images/overview.html:6
msgid "Gallery"
msgstr "Galeria"
-#: core/templates/navigation.html:72
+#: core/templates/navigation.html:74 core/templates/navigation.html:400
+#: trophies/templates/trophies/overview.html:7
+msgid "Trophies"
+msgstr "Troféus"
+
+#: core/templates/navigation.html:79
msgid "Workout templates"
msgstr "Modelos de treino"
-#: core/templates/navigation.html:79
+#: core/templates/navigation.html:86
msgid "Your templates"
msgstr "Seus modelos"
-#: core/templates/navigation.html:88
+#: core/templates/navigation.html:95
msgid "Public templates"
msgstr "Modelos públicos"
-#: core/templates/navigation.html:96 software/templates/features.html:51
+#: core/templates/navigation.html:103 software/templates/features.html:51
#: software/templates/features.html:480
msgid "Exercises"
msgstr "Exercícios"
-#: core/templates/navigation.html:102 core/templates/navigation.html:176
-#: core/templates/navigation.html:339
+#: core/templates/navigation.html:109 core/templates/navigation.html:336
msgid "Administration"
msgstr "Administração"
-#: core/templates/navigation.html:106
+#: core/templates/navigation.html:113
msgid "Exercise edit history"
msgstr "Histórico de edição do exercício"
-#: core/templates/navigation.html:112
+#: core/templates/navigation.html:119
msgid "Equipment"
msgstr "Equipamento"
-#: core/templates/navigation.html:118
+#: core/templates/navigation.html:125
msgid "Muscles"
msgstr "Músculos"
-#: core/templates/navigation.html:124
+#: core/templates/navigation.html:131
#: exercises/templates/categories/admin-overview.html:4
msgid "Categories"
msgstr "Categorias"
-#: core/templates/navigation.html:139 software/templates/features.html:468
+#: core/templates/navigation.html:146 software/templates/features.html:468
msgid "Nutrition"
msgstr "Nutrição"
-#: core/templates/navigation.html:147 core/templates/user/overview.html:144
+#: core/templates/navigation.html:154 core/templates/user/overview.html:147
msgid "Nutrition plans"
msgstr "Planos de nutrição"
-#: core/templates/navigation.html:156
+#: core/templates/navigation.html:163
msgid "BMI calculator"
msgstr "Calculadora IMC"
-#: core/templates/navigation.html:165 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:172 nutrition/templates/rate/form.html:18
msgid "Daily calories calculator"
msgstr "Calculador de calorias diárias"
-#: core/templates/navigation.html:171
+#: core/templates/navigation.html:178
#: nutrition/templates/ingredient/overview.html:10
msgid "Ingredient overview"
msgstr "Visão geral do ingrediente"
-#: core/templates/navigation.html:180 nutrition/templates/units/list.html:6
-msgid "Ingredient weight units"
-msgstr "Unidade de peso dos ingredientes"
-
-#: core/templates/navigation.html:196 software/templates/features.html:463
+#: core/templates/navigation.html:193 software/templates/features.html:463
msgid "Body weight"
msgstr "Peso Corporal"
-#: core/templates/navigation.html:203 core/templates/user/overview.html:114
+#: core/templates/navigation.html:200 core/templates/user/overview.html:117
msgid "Weight overview"
msgstr "Visão geral do peso"
-#: core/templates/navigation.html:217
+#: core/templates/navigation.html:214
msgid "About this software"
msgstr "Sobre este software"
-#: core/templates/navigation.html:223 software/templates/about_us.html:5
+#: core/templates/navigation.html:220 software/templates/about_us.html:5
msgid "Support & Get Involved"
msgstr "Suporte e envolver-se"
-#: core/templates/navigation.html:229 software/templates/features.html:528
+#: core/templates/navigation.html:226 software/templates/features.html:528
msgid "REST API"
msgstr "API REST"
-#: core/templates/navigation.html:235 utils/models.py:45
+#: core/templates/navigation.html:232 utils/models.py:45
msgid "License"
msgstr "Licença"
-#: core/templates/navigation.html:241
+#: core/templates/navigation.html:238
msgid "Developer documentation"
msgstr "Documentação do desenvolvedor"
-#: core/templates/navigation.html:248
+#: core/templates/navigation.html:245
msgid "Get the code"
msgstr "Obtenha o código fonte"
-#: core/templates/navigation.html:255 core/templates/template.html:199
-#: software/templates/features.html:603
+#: core/templates/navigation.html:252 core/templates/template.html:202
+#: software/templates/features.html:614
msgid "Translate"
msgstr "Traduzir"
-#: core/templates/navigation.html:292 core/templates/user/login.html:30
+#: core/templates/navigation.html:289 core/templates/user/login.html:30
msgid "Reset password"
msgstr "Redefinr a senha"
-#: core/templates/navigation.html:301 core/templates/navigation.html:329
+#: core/templates/navigation.html:298 core/templates/navigation.html:326
msgid "Logout"
msgstr "Sair"
-#: core/templates/navigation.html:320
+#: core/templates/navigation.html:317
msgid "My preferences"
msgstr "Minhas preferências"
-#: core/templates/navigation.html:352
+#: core/templates/navigation.html:349
msgid "Licenses"
msgstr "Licenças"
-#: core/templates/navigation.html:360
+#: core/templates/navigation.html:357
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr "Unidades de repetição"
-#: core/templates/navigation.html:368 core/templates/weight_unit/list.html:4
-#: nutrition/templates/ingredient/view.html:141
+#: core/templates/navigation.html:365 core/templates/weight_unit/list.html:4
+#: nutrition/templates/ingredient/view.html:182
msgid "Weight units"
msgstr "Unidades de peso"
-#: core/templates/navigation.html:376 core/templates/user/list.html:4
+#: core/templates/navigation.html:373 core/templates/user/list.html:4
msgid "User list"
msgstr "Lista de utilizadores"
-#: core/templates/navigation.html:382
+#: core/templates/navigation.html:379
msgid "Gyms"
msgstr "Academias"
-#: core/templates/navigation.html:403
-#: trophies/templates/trophies/overview.html:7
-msgid "Trophies"
-msgstr "Troféus"
-
#: core/templates/registration/password_reset_complete.html:4
msgid "Password reset complete"
msgstr "Redefinição da palavra-passe completa"
@@ -802,27 +828,31 @@ msgstr "Anterior"
msgid "next"
msgstr "Próximo"
-#: core/templates/template.html:96
+#: core/templates/template.html:86
msgid "Close"
msgstr "Fechar"
-#: core/templates/template.html:112
+#: core/templates/template.html:102
msgid ""
"You are using a guest account, data entered will be deleted after a week."
msgstr ""
"Você está usando uma conta de convidado, todos os dados cadastrados serão "
"apagados depois de uma semana."
-#: core/templates/template.html:117
+#: core/templates/template.html:107
msgid "Create some demo entries"
msgstr "Crie alguns registros de demonstração"
-#: core/templates/template.html:165 software/templates/features.html:568
+#: core/templates/template.html:155 software/templates/features.html:568
#: software/templates/tos.html:7
msgid "Terms of service"
msgstr "Termos de uso"
-#: core/templates/template_features.html:53 software/templates/features.html:9
+#: core/templates/template.html:181 software/templates/features.html:595
+msgid "Browser language"
+msgstr ""
+
+#: core/templates/template_features.html:46 software/templates/features.html:9
msgid "Features"
msgstr "Funcionalidades"
@@ -881,99 +911,94 @@ msgstr "Não cadastrado?"
msgid "Forgot password?"
msgstr "Esqueceu a senha?"
-#: core/templates/user/overview.html:25 core/templates/user/overview.html:68
-#: core/templates/user/overview.html:112 core/templates/user/overview.html:144
-#: core/templates/user/overview.html:348 core/templates/user/overview.html:390
-#: core/templates/user/overview.html:426
+#: core/templates/user/overview.html:28 core/templates/user/overview.html:71
+#: core/templates/user/overview.html:115 core/templates/user/overview.html:147
+#: core/templates/user/overview.html:351 core/templates/user/overview.html:393
+#: core/templates/user/overview.html:429
#, python-format
msgid "last %(number)s"
msgstr "último %(number)s"
-#: core/templates/user/overview.html:27 core/templates/user/overview.html:146
-#: core/templates/user/overview.html:343 core/templates/user/overview.html:382
-#: core/templates/user/overview.html:421 gym/templates/gym/member_list.html:226
+#: core/templates/user/overview.html:30 core/templates/user/overview.html:149
+#: core/templates/user/overview.html:346 core/templates/user/overview.html:385
+#: core/templates/user/overview.html:424 gym/templates/gym/member_list.html:226
#: gym/templates/gym/member_list.html:262
#: gym/templates/gym/member_list.html:302
msgid "Overview"
msgstr "Visão geral"
-#: core/templates/user/overview.html:34 core/templates/user/overview.html:76
-#: core/templates/user/overview.html:120 core/templates/user/overview.html:152
+#: core/templates/user/overview.html:37 core/templates/user/overview.html:79
+#: core/templates/user/overview.html:123 core/templates/user/overview.html:155
#: manager/helpers.py:88 software/templates/about_us.html:170
#: weight/templates/import_csv_preview.html:13
#: weight/templates/import_csv_preview.html:42 weight/views.py:54
msgid "Date"
msgstr "Data"
-#: core/templates/user/overview.html:35 core/templates/user/overview.html:153
+#: core/templates/user/overview.html:38 core/templates/user/overview.html:156
#: gym/models/contract.py:58 gym/models/contract.py:109
msgid "Description"
msgstr "descrição"
-#: core/templates/user/overview.html:36
+#: core/templates/user/overview.html:39
msgid "Number of logs (days)"
msgstr "Número de registros (dias)"
-#: core/templates/user/overview.html:37 core/views/user.py:590
+#: core/templates/user/overview.html:40 core/views/user.py:606
#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:158
msgid "Last activity"
msgstr "Última atividade"
-#: core/templates/user/overview.html:58
+#: core/templates/user/overview.html:61
msgid "No workouts found."
msgstr "Nenhum treino encontrado."
-#: core/templates/user/overview.html:68
+#: core/templates/user/overview.html:71
msgid "Log"
msgstr "Log"
-#: core/templates/user/overview.html:77
+#: core/templates/user/overview.html:80
msgid "General impression"
msgstr "Impressão geral"
-#: core/templates/user/overview.html:78 core/templates/user/overview.html:390
+#: core/templates/user/overview.html:81 core/templates/user/overview.html:393
msgid "Notes"
msgstr "Notas"
-#: core/templates/user/overview.html:79
-#: exercises/templates/history/overview.html:30
-msgid "Time"
-msgstr "Tempo"
-
-#: core/templates/user/overview.html:112 core/templates/user/overview.html:121
+#: core/templates/user/overview.html:115 core/templates/user/overview.html:124
#: manager/helpers.py:89 weight/templates/import_csv_preview.html:14
#: weight/templates/import_csv_preview.html:43 weight/views.py:54
msgid "Weight"
msgstr "Peso"
-#: core/templates/user/overview.html:154
-#: nutrition/templates/ingredient/view.html:51 nutrition/views/plan.py:245
+#: core/templates/user/overview.html:157
+#: nutrition/templates/ingredient/view.html:52 nutrition/views/plan.py:244
msgid "Energy"
msgstr "Energia"
-#: core/templates/user/overview.html:155
-#: nutrition/templates/ingredient/view.html:58 nutrition/views/plan.py:251
+#: core/templates/user/overview.html:158
+#: nutrition/templates/ingredient/view.html:59 nutrition/views/plan.py:250
msgid "Protein"
msgstr "Proteína"
-#: core/templates/user/overview.html:156
-#: nutrition/templates/ingredient/view.html:64 nutrition/views/plan.py:259
+#: core/templates/user/overview.html:159
+#: nutrition/templates/ingredient/view.html:65 nutrition/views/plan.py:258
msgid "Carbohydrates"
msgstr "Carboidratos"
-#: core/templates/user/overview.html:157
-#: nutrition/templates/ingredient/view.html:80 nutrition/views/plan.py:273
+#: core/templates/user/overview.html:160
+#: nutrition/templates/ingredient/view.html:81 nutrition/views/plan.py:272
msgid "Fat"
msgstr "Gordura"
-#: core/templates/user/overview.html:170
-#: nutrition/templates/ingredient/view.html:53
+#: core/templates/user/overview.html:173
+#: nutrition/templates/ingredient/view.html:54
msgid "kcal"
msgstr "kcal"
-#: core/templates/user/overview.html:201 core/templates/user/overview.html:340
-#: core/templates/user/overview.html:379 core/templates/user/overview.html:418
-#: core/templates/user/overview.html:463 gym/templates/gym/list.html:45
+#: core/templates/user/overview.html:204 core/templates/user/overview.html:343
+#: core/templates/user/overview.html:382 core/templates/user/overview.html:421
+#: core/templates/user/overview.html:466 gym/templates/gym/list.html:45
#: gym/templates/gym/member_list.html:91 gym/templates/gym/member_list.html:149
#: gym/templates/gym/member_list.html:187
#: gym/templates/gym/member_list.html:223
@@ -982,111 +1007,115 @@ msgstr "kcal"
msgid "Actions"
msgstr "Ações"
-#: core/templates/user/overview.html:210
+#: core/templates/user/overview.html:213
msgid "Deactivate user"
msgstr "Utilizador desativado"
-#: core/templates/user/overview.html:214
+#: core/templates/user/overview.html:217
msgid "Activate user"
msgstr "Utilizador ativo"
-#: core/templates/user/overview.html:223
+#: core/templates/user/overview.html:226
msgid "Reset user password"
msgstr "Redefinir a senha de utilizador"
-#: core/templates/user/overview.html:227 gym/templates/gym/member_list.html:30
+#: core/templates/user/overview.html:230 gym/templates/gym/member_list.html:30
msgid "Roles"
msgstr "Papéis"
-#: core/templates/user/overview.html:243
+#: core/templates/user/overview.html:246
msgid "Password reset confirmation"
msgstr "Confirmação de redefinição da palavra-passe"
-#: core/templates/user/overview.html:247
+#: core/templates/user/overview.html:250
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:250
+#: core/templates/user/overview.html:253
#: exercises/templates/history/overview.html:106
+#: nutrition/templates/ingredient/view.html:148
+#: nutrition/templates/ingredient/view.html:160
msgid "No"
msgstr "Não"
-#: core/templates/user/overview.html:251
+#: core/templates/user/overview.html:254
#: exercises/templates/history/overview.html:99
+#: nutrition/templates/ingredient/view.html:146
+#: nutrition/templates/ingredient/view.html:158
msgid "Yes"
msgstr "Sim"
-#: core/templates/user/overview.html:272 gym/templates/gym/member_list.html:105
+#: core/templates/user/overview.html:275 gym/templates/gym/member_list.html:105
msgid "Details"
msgstr "Detalhes"
-#: core/templates/user/overview.html:276 gym/views/export.py:57
-#: manager/helpers.py:89 nutrition/views/plan.py:151
-#: nutrition/views/plan.py:157
+#: core/templates/user/overview.html:279 gym/views/export.py:57
+#: manager/helpers.py:89 nutrition/views/plan.py:150
+#: nutrition/views/plan.py:156
msgid "Nr."
msgstr "Nr."
-#: core/templates/user/overview.html:298 gym/models/contract.py:287
+#: core/templates/user/overview.html:301 gym/models/contract.py:287
#: gym/models/gym.py:50 gym/templates/contract/view.html:75
#: gym/templates/gym/member_list.html:112 gym/views/export.py:68
msgid "Phone"
msgstr "Telefone"
-#: core/templates/user/overview.html:302 gym/templates/contract/view.html:87
+#: core/templates/user/overview.html:305 gym/templates/contract/view.html:87
#: gym/templates/gym/member_list.html:130
msgid "Address"
msgstr "Endereço"
-#: core/templates/user/overview.html:313
+#: core/templates/user/overview.html:316
msgid "Registered"
msgstr "Registrado"
-#: core/templates/user/overview.html:317
+#: core/templates/user/overview.html:320
msgid "Last login"
msgstr "Último Login"
-#: core/templates/user/overview.html:322
+#: core/templates/user/overview.html:325
msgid "Status"
msgstr "Estado"
-#: core/templates/user/overview.html:325
+#: core/templates/user/overview.html:328
msgid "Active"
msgstr "Ativo"
-#: core/templates/user/overview.html:327
+#: core/templates/user/overview.html:330
msgid "Inactive"
msgstr "Inativo"
-#: core/templates/user/overview.html:348 gym/templates/contract/list.html:4
+#: core/templates/user/overview.html:351 gym/templates/contract/list.html:4
#: gym/templates/gym/member_list.html:218
msgid "Contracts"
msgstr "Contratos"
-#: core/templates/user/overview.html:426 gym/templates/document/list.html:4
+#: core/templates/user/overview.html:429 gym/templates/document/list.html:4
msgid "Documents"
msgstr "Documentos"
-#: core/templates/user/overview.html:433 gym/templates/document/list.html:33
+#: core/templates/user/overview.html:436 gym/templates/document/list.html:33
msgid "Download"
msgstr "Descarregar"
-#: core/templates/user/overview.html:474 gym/views/admin_config.py:44
+#: core/templates/user/overview.html:477 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:477 gym/models/user_config.py:92
+#: core/templates/user/overview.html:480 gym/models/user_config.py:92
msgid "Include in inactive overview"
msgstr "Incluir na visão geral inativa"
-#: core/templates/user/overview.html:510
+#: core/templates/user/overview.html:513
#, python-format
msgid "Admin login is only available for users in %(gym_name)s"
msgstr ""
"A autenticação de administrador está disponível apenas para utilizadores no "
"%(gym_name)s"
-#: core/templates/user/overview.html:514
+#: core/templates/user/overview.html:517
msgid "Log in as this user"
msgstr "Autenticado como este utilizador"
@@ -1110,7 +1139,7 @@ msgstr "Enviar e-mail de verificação"
msgid "You need to verify your email to contribute exercises"
msgstr "É preciso verificar seu e-mail para contribuir com exercícios"
-#: core/templates/user/preferences.html:55 core/views/user.py:601
+#: core/templates/user/preferences.html:55 core/views/user.py:617
msgid "Change password"
msgstr "Mudar senha"
@@ -1118,23 +1147,23 @@ msgstr "Mudar senha"
msgid "Already have an account?"
msgstr "Já tem uma conta?"
-#: core/templatetags/wger_extras.py:142 i18n.tpl:38
+#: core/templatetags/wger_extras.py:142 i18n.tpl:39
msgid "kg"
msgstr "kg"
#: core/templatetags/wger_extras.py:144
-#: nutrition/templates/ingredient/view.html:60
-#: nutrition/templates/ingredient/view.html:66
-#: nutrition/templates/ingredient/view.html:73
-#: nutrition/templates/ingredient/view.html:82
-#: nutrition/templates/ingredient/view.html:89
-#: nutrition/templates/ingredient/view.html:111
-#: nutrition/templates/ingredient/view.html:121
+#: nutrition/templates/ingredient/view.html:61
+#: nutrition/templates/ingredient/view.html:67
+#: nutrition/templates/ingredient/view.html:74
+#: nutrition/templates/ingredient/view.html:83
+#: nutrition/templates/ingredient/view.html:90
+#: nutrition/templates/ingredient/view.html:112
+#: nutrition/templates/ingredient/view.html:122
msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr "g"
-#: core/templatetags/wger_extras.py:147 i18n.tpl:39
+#: core/templatetags/wger_extras.py:147 i18n.tpl:40
msgid "lb"
msgstr "lb"
@@ -1143,36 +1172,35 @@ msgctxt "weight unit, i.e. ounces"
msgid "oz"
msgstr "oz"
-#: core/views/languages.py:85 exercises/views/categories.py:122
+#: core/views/languages.py:88 exercises/views/categories.py:122
#: exercises/views/equipment.py:103 exercises/views/muscles.py:99
-#: nutrition/views/ingredient.py:120 nutrition/views/unit.py:110
+#: nutrition/views/ingredient.py:125
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
+#: core/views/languages.py:96 core/views/license.py:103
+#: core/views/repetition_units.py:114 core/views/weight_units.py:115
#: exercises/views/categories.py:128 exercises/views/muscles.py:106
#: gallery/views/images.py:124 gym/views/admin_notes.py:196
#: gym/views/document.py:206 gym/views/gym.py:481
-#: nutrition/views/ingredient.py:127 nutrition/views/unit.py:117
+#: nutrition/views/ingredient.py:132
#, python-brace-format
msgid "Delete {0}?"
msgstr "Remover {0}?"
-#: core/views/languages.py:111 core/views/license.py:85
-#: core/views/repetition_units.py:86 core/views/user.py:464
+#: core/views/languages.py:114 core/views/license.py:85
+#: core/views/repetition_units.py:96 core/views/user.py:480
#: core/views/weight_units.py:86 exercises/views/categories.py:98
#: exercises/views/equipment.py:81 exercises/views/muscles.py:87
#: gym/views/admin_notes.py:161 gym/views/config.py:68
#: gym/views/contract.py:186 gym/views/contract_option.py:123
#: gym/views/contract_type.py:123 gym/views/document.py:171
-#: gym/views/gym.py:463 nutrition/views/ingredient.py:146
-#: nutrition/views/unit.py:143
+#: gym/views/gym.py:463 nutrition/views/ingredient.py:151
#, python-brace-format
msgid "Edit {0}"
msgstr "Editar {0}"
-#: core/views/misc.py:74
+#: core/views/misc.py:73
msgid ""
"We have created sample workout, workout schedules, weight logs, (body) "
"weight and nutrition plan entries so you can better see what this site can "
@@ -1182,48 +1210,48 @@ msgstr ""
"(corporal) e plano de nutrição para que você possa ver melhor o que este "
"site pode fazer. Sinta-se à vontade para os editar ou apagá-los!"
-#: core/views/user.py:143
+#: core/views/user.py:145
#, python-brace-format
msgid "Account \"{0}\" was successfully deleted"
msgstr "Conta \"{0}\" deletada com sucesso"
-#: core/views/user.py:279
+#: core/views/user.py:287
msgid "You were successfully registered"
msgstr "Você foi registrado com sucesso"
-#: core/views/user.py:341
+#: core/views/user.py:357
msgid "Settings successfully updated"
msgstr "Configurações atualizadas com sucesso"
-#: core/views/user.py:380
+#: core/views/user.py:396
msgid "The user was successfully deactivated"
msgstr "O utilizador foi desativado com sucesso"
-#: core/views/user.py:417
+#: core/views/user.py:433
msgid "The user was successfully activated"
msgstr "O utilizador foi ativado com sucesso"
-#: core/views/user.py:432
+#: core/views/user.py:448
msgid "Edit user"
msgstr "Editar utilizador"
-#: core/views/user.py:587 gym/templates/gym/member_list.html:26
+#: core/views/user.py:603 gym/templates/gym/member_list.html:26
#: gym/views/gym.py:158
msgid "ID"
msgstr "Identificação"
-#: core/views/user.py:588 gym/forms.py:95 gym/templates/contract/view.html:55
+#: core/views/user.py:604 gym/forms.py:95 gym/templates/contract/view.html:55
#: gym/templates/gym/member_list.html:27 gym/views/export.py:59
#: gym/views/gym.py:158 gym/views/gym.py:217
msgid "Username"
msgstr "utilizador"
-#: core/views/user.py:591 gym/templates/gym/new_user.html:34
+#: core/views/user.py:607 gym/templates/gym/new_user.html:34
#: gym/views/export.py:58 gym/views/gym.py:217
msgid "Gym"
msgstr "Academia"
-#: core/views/user.py:650
+#: core/views/user.py:678
#, python-format
msgid "A verification email was sent to %(email)s"
msgstr "Um e-mail de verificação foi enviado para %(email)s"
@@ -1240,16 +1268,16 @@ 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:50
+#: exercises/models/video.py:52
#, python-format
msgid "Maximum file size is %(size)sMB."
msgstr "O tamanho máximo de arquivo é %(size)sMB."
-#: exercises/models/video.py:57 exercises/models/video.py:65
+#: exercises/models/video.py:59 exercises/models/video.py:67
msgid "File type is not supported"
msgstr "Tipo de arquivo não suportado"
-#: exercises/models/video.py:70
+#: exercises/models/video.py:72
msgid "File is not a valid video"
msgstr "O arquivo não é um vídeo válido"
@@ -1320,7 +1348,11 @@ msgstr "Apagar equipamento?"
msgid "Add muscle"
msgstr "Adicionar músculo"
-#: gallery/templates/images/overview.html:72
+#: gallery/forms.py:35
+msgid "If date is left empty, it will be read from the image instead"
+msgstr ""
+
+#: gallery/templates/images/overview.html:69
msgid "Add image"
msgstr "Adicionar imagem"
@@ -1387,7 +1419,7 @@ msgid "Contract type"
msgstr "Tipo de contrato"
#: gym/models/contract.py:211 gym/templates/contract/view.html:59
-#: nutrition/forms.py:58
+#: nutrition/forms.py:67
msgid "Amount"
msgstr "Quantidade"
@@ -1567,7 +1599,7 @@ msgstr "E-mails"
msgid "Add member"
msgstr "Adicionar membro"
-#: gym/templates/gym/new_user.html:48 nutrition/templates/rate/form.html:120
+#: gym/templates/gym/new_user.html:48 nutrition/templates/rate/form.html:121
msgid "Info"
msgstr "Informação"
@@ -1740,10 +1772,6 @@ msgstr "Barra de puxar"
msgid "Quads"
msgstr "Quadríceps"
-#: i18n.tpl:30
-msgid "Repetitions"
-msgstr "Repeticões"
-
#: i18n.tpl:31
msgid "Resistance band"
msgstr "Elástico"
@@ -1772,175 +1800,181 @@ msgstr "Tríceps"
msgid "Until Failure"
msgstr "Até falhar"
-#: i18n.tpl:40
+#: i18n.tpl:38
+#, fuzzy
+#| msgid "Kilometers"
+msgid "Meters"
+msgstr "Quilômetros"
+
+#: i18n.tpl:41
msgid "none (bodyweight exercise)"
msgstr "nenhum (exercício corporal)"
-#: i18n.tpl:41
+#: i18n.tpl:42
msgid "Beginner"
msgstr "Novato"
-#: i18n.tpl:42
+#: i18n.tpl:43
msgid "Consistent"
msgstr "Consistente"
-#: i18n.tpl:43
+#: i18n.tpl:44
msgid "Dedicated"
msgstr "Dedicado"
-#: i18n.tpl:44
+#: i18n.tpl:45
msgid "Obsessed"
msgstr "Obcecado"
-#: i18n.tpl:45
+#: i18n.tpl:46
msgid "Legend"
msgstr "Legenda"
-#: i18n.tpl:46
+#: i18n.tpl:47
msgid "Veteran"
msgstr "Veterano"
-#: i18n.tpl:47
+#: i18n.tpl:48
msgid "Titan"
msgstr "Titã"
-#: i18n.tpl:48
+#: i18n.tpl:49
msgid "Unstoppable"
msgstr "Imparável"
-#: i18n.tpl:49
+#: i18n.tpl:50
msgid "Weekend Warrior"
msgstr "Guerreiro de fim de semana"
-#: i18n.tpl:50
+#: i18n.tpl:51
msgid "Elephant lifter"
msgstr "Levantador de elefantes"
-#: i18n.tpl:51
+#: i18n.tpl:52
msgid "Bus lifter"
msgstr "Elevador de ônibus"
-#: i18n.tpl:52
+#: i18n.tpl:53
msgid "Plane lifter"
msgstr "Elevador de avião"
-#: i18n.tpl:53
+#: i18n.tpl:54
msgid "Blue whale lifter"
msgstr "Elevador de baleia azul"
-#: i18n.tpl:54
+#: i18n.tpl:55
msgid "Space Station lifter"
msgstr "Elevador da Estação Espacial"
-#: i18n.tpl:55
+#: i18n.tpl:56
msgid "Millionaire"
msgstr "Milionário"
-#: i18n.tpl:56
+#: i18n.tpl:57
msgid "Atlas"
msgstr "Atlas"
-#: i18n.tpl:57
+#: i18n.tpl:58
msgid "Early Bird"
msgstr "Passarinho matinal"
-#: i18n.tpl:58
+#: i18n.tpl:59
msgid "Night Owl"
msgstr "Coruja Noturna"
-#: i18n.tpl:59
+#: i18n.tpl:60
msgid "New Year, New Me"
msgstr "Novo ano, novo eu"
-#: i18n.tpl:60
+#: i18n.tpl:61
msgid "Phoenix"
msgstr "Fénix"
-#: i18n.tpl:61
+#: i18n.tpl:62
msgid "Personal Record"
msgstr "Recorde Pessoal"
-#: i18n.tpl:62
+#: i18n.tpl:63
msgid "Complete your first workout"
msgstr "Completa o teu primeiro treino"
-#: i18n.tpl:63
+#: i18n.tpl:64
msgid "Complete 10 workouts"
msgstr "Completa 10 treinos"
-#: i18n.tpl:64
+#: i18n.tpl:65
msgid "Complete 50 workouts"
msgstr "Completa 50 treinos"
-#: i18n.tpl:65
+#: i18n.tpl:66
msgid "Complete 100 workouts"
msgstr "Completa 100 treinos"
-#: i18n.tpl:66
+#: i18n.tpl:67
msgid "Complete 200 workouts"
msgstr "Completa 200 treinos"
-#: i18n.tpl:67
+#: i18n.tpl:68
msgid "Complete 500 workouts"
msgstr "Completa 500 treinos"
-#: i18n.tpl:68
+#: i18n.tpl:69
msgid "Complete 1000 workouts"
msgstr "Completa 1000 treinos"
-#: i18n.tpl:69
+#: i18n.tpl:70
msgid "Maintain a 30-day workout streak"
msgstr "Mantém uma sequência de treinos de 30 dias"
-#: i18n.tpl:70
+#: i18n.tpl:71
msgid "Work out on Saturday and Sunday for 4 consecutive weekends"
msgstr "Treina sábado e domingo por 4 semanas consecutivas"
-#: i18n.tpl:71
+#: i18n.tpl:72
msgid "Lift a cumulative total of 5.000 kg"
msgstr "Levanta um peso acumulado de 5000kg"
-#: i18n.tpl:72
+#: i18n.tpl:73
msgid "Lift a cumulative total of 20.000 kg"
msgstr "Levanta um peso acumulado de 20000kg"
-#: i18n.tpl:73
+#: i18n.tpl:74
msgid "Lift a cumulative total of 50.000 kg"
msgstr "Levanta um peso acumulado de 50000kg"
-#: i18n.tpl:74
+#: i18n.tpl:75
msgid "Lift a cumulative total of 150.000 kg"
msgstr "Levanta um peso acumulado de 150000kg"
-#: i18n.tpl:75
+#: i18n.tpl:76
msgid "Lift a cumulative total of 450.000 kg"
msgstr "Levanta um peso acumulado de 450000kg"
-#: i18n.tpl:76
+#: i18n.tpl:77
msgid "Lift a cumulative total of 1.000.000 kg"
msgstr "Levanta um peso acumulado de 1000000kg"
-#: i18n.tpl:77
+#: i18n.tpl:78
msgid "Lift a cumulative total of 10.000.000 kg"
msgstr "Levanta um peso acumulado de 10000000kg"
-#: i18n.tpl:78
+#: i18n.tpl:79
msgid "Complete a workout before 6:00 AM"
msgstr "Completa um treino antes das 6:00 da manhã"
-#: i18n.tpl:79
+#: i18n.tpl:80
msgid "Complete a workout after 9:00 PM"
msgstr "Completa um treino após as 21:00 horas"
-#: i18n.tpl:80
+#: i18n.tpl:81
msgid "Work out on January 1st"
msgstr "Treino em %s de janeiro"
-#: i18n.tpl:81
+#: i18n.tpl:82
msgid "Return to training after being inactive for 30 days"
msgstr "Volta a treinar após estar inativo por 30 dias"
-#: i18n.tpl:82
+#: i18n.tpl:83
msgid "Achieve a new Personal Record on any exercise"
msgstr "Alcança novo recorde pessoal em qualquer exercício"
@@ -2024,7 +2058,7 @@ msgstr "Exercício"
msgid "Routine will expire soon"
msgstr "Rotina expirará brevemente"
-#: manager/models/routine.py:153 manager/models/session.py:145
+#: manager/models/routine.py:154 manager/models/session.py:145
msgid "The start time cannot be after the end time."
msgstr "A hora de início não pode ser depois da hora de término."
@@ -2107,23 +2141,27 @@ msgstr "Treino"
msgid "Workout for %s"
msgstr "Treino para %s"
-#: nutrition/forms.py:62
+#: nutrition/extract_info/off.py:72 nutrition/extract_info/off.py:91
+msgid "Serving"
+msgstr ""
+
+#: nutrition/forms.py:71 nutrition/forms.py:208
msgid "Unit"
msgstr "Unidade"
-#: nutrition/forms.py:170 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:179 nutrition/templates/rate/form.html:77
msgid "Basic caloric intake"
msgstr "Ingestão básica de calorias"
-#: nutrition/forms.py:171
+#: nutrition/forms.py:180
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:176
+#: nutrition/forms.py:185
msgid "Additional calories"
msgstr "Calorias adicionais"
-#: nutrition/forms.py:178
+#: nutrition/forms.py:187
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
@@ -2132,13 +2170,31 @@ msgstr ""
"um número negativo)"
#: nutrition/forms.py:209
+msgid "grams (g)"
+msgstr ""
+
+#: nutrition/forms.py:219
msgid "Ingredient"
msgstr "Ingrediente"
-#: nutrition/forms.py:213
+#: nutrition/forms.py:223
msgid "Also search for names in English"
msgstr "Também buscar nomes em inglês"
+#: nutrition/forms.py:239
+msgid "Quantity"
+msgstr ""
+
+#: nutrition/forms.py:241
+msgid "Enter a quantity and choose grams (g) or one of the serving units."
+msgstr ""
+
+#: nutrition/models/ingredient.py:526
+#, fuzzy
+#| msgid "Correction"
+msgid "Portion"
+msgstr "Correção"
+
#: nutrition/templates/ingredient/email_new.tpl:1
#, python-format
msgid ""
@@ -2188,59 +2244,92 @@ msgstr ""
"o seu e-mail quando se cadastrou, você será notificado quando o processo for "
"completado com sucesso."
-#: nutrition/templates/ingredient/overview.html:38
+#: nutrition/templates/ingredient/overview.html:32
+#: nutrition/templates/ingredient/overview.html:68
+#: nutrition/templates/ingredient/view.html:143
+msgid "Vegan"
+msgstr ""
+
+#: nutrition/templates/ingredient/overview.html:34
+#: nutrition/templates/ingredient/overview.html:79
+#: nutrition/templates/ingredient/view.html:155
+#, fuzzy
+#| msgid "Variations"
+msgid "Vegetarian"
+msgstr "Variações"
+
+#: nutrition/templates/ingredient/overview.html:43
msgid "No ingredients."
msgstr "Nenhum ingrediente."
-#: nutrition/templates/ingredient/overview.html:49
+#: nutrition/templates/ingredient/overview.html:54
msgid "Search"
msgstr "Pesquisa"
-#: nutrition/templates/ingredient/view.html:45 nutrition/views/plan.py:237
+#: nutrition/templates/ingredient/overview.html:57
+#, fuzzy
+#| msgid "No filter"
+msgid "Filter"
+msgstr "Sem filtro"
+
+#: nutrition/templates/ingredient/overview.html:83
+msgid "Apply"
+msgstr ""
+
+#: nutrition/templates/ingredient/overview.html:85
+msgid "Reset"
+msgstr ""
+
+#: nutrition/templates/ingredient/view.html:46 nutrition/views/plan.py:236
msgid "Macronutrients"
msgstr "Macronutrientes"
-#: nutrition/templates/ingredient/view.html:54
+#: nutrition/templates/ingredient/view.html:55
msgid "kJ"
msgstr "Kj"
-#: nutrition/templates/ingredient/view.html:70 nutrition/views/plan.py:267
+#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:266
msgid "Sugar content in carbohydrates"
msgstr "Açúcar contido nos carboidratos"
-#: nutrition/templates/ingredient/view.html:75
-#: nutrition/templates/ingredient/view.html:91
-#: nutrition/templates/ingredient/view.html:113
-#: nutrition/templates/ingredient/view.html:123
+#: nutrition/templates/ingredient/view.html:76
+#: nutrition/templates/ingredient/view.html:92
+#: nutrition/templates/ingredient/view.html:114
+#: nutrition/templates/ingredient/view.html:124
msgid "n.A."
msgstr "n.d."
-#: nutrition/templates/ingredient/view.html:86 nutrition/views/plan.py:281
+#: nutrition/templates/ingredient/view.html:87 nutrition/views/plan.py:280
msgid "Saturated fat content in fats"
msgstr "Gordura saturada contida nas gorduras"
-#: nutrition/templates/ingredient/view.html:102
+#: nutrition/templates/ingredient/view.html:103
msgid "Others"
msgstr "Outros"
-#: nutrition/templates/ingredient/view.html:108 nutrition/views/plan.py:287
+#: nutrition/templates/ingredient/view.html:109 nutrition/views/plan.py:286
msgid "Fiber"
msgstr "Fibra"
-#: nutrition/templates/ingredient/view.html:118 nutrition/views/plan.py:293
+#: nutrition/templates/ingredient/view.html:119 nutrition/views/plan.py:292
msgid "Sodium"
msgstr "Sódio"
-#: nutrition/templates/ingredient/view.html:143
-#: nutrition/templates/units/list.html:50 nutrition/views/unit.py:86
+#: nutrition/templates/ingredient/view.html:136
+#, fuzzy
+#| msgid "Click here for more information"
+msgid "Dietary information"
+msgstr "Click aqui para mais informações"
+
+#: nutrition/templates/ingredient/view.html:184
msgid "Add new weight unit"
msgstr "Adicione nova unidade de peso"
-#: nutrition/templates/rate/form.html:25
+#: nutrition/templates/rate/form.html:26
msgid "Basal metabolic rate"
msgstr "Taxa metabólica basal"
-#: nutrition/templates/rate/form.html:26
+#: nutrition/templates/rate/form.html:27
msgid ""
"The basal metabolic rate is the amount of energy expended daily\n"
"at rest. This is the minimum energy needed for the body to function, without "
@@ -2251,15 +2340,15 @@ msgstr ""
"em descanso. Essa é a quantidade mínima de energia necessária para o corpo\n"
"funcionar, sem qualquer atividade física adicional."
-#: nutrition/templates/rate/form.html:37
+#: nutrition/templates/rate/form.html:38
msgid "Your basic metabolic rate is: "
msgstr "Sua taxa metabólica básica é: "
-#: nutrition/templates/rate/form.html:47
+#: nutrition/templates/rate/form.html:48
msgid "Physical activities"
msgstr "Atividades físicas"
-#: nutrition/templates/rate/form.html:48
+#: nutrition/templates/rate/form.html:49
msgid ""
"The physical activity level (PAL) is a factor used to to express\n"
"the additional physical activity and is used to calculate the total energy\n"
@@ -2269,11 +2358,11 @@ msgstr ""
"a atividade adicional física e é usado para calcular o total de energia\n"
"requerida por dia."
-#: nutrition/templates/rate/form.html:59
+#: nutrition/templates/rate/form.html:60
msgid "Factor for daily activities: "
msgstr "Fator para atividades diárias: "
-#: nutrition/templates/rate/form.html:67
+#: nutrition/templates/rate/form.html:68
msgid ""
"The base caloric intake is the amount of calories your metabolism\n"
"needs based on your level of physical activity."
@@ -2281,11 +2370,11 @@ msgstr ""
"A ingestão de calorias básicas é a quantidade de calorias que seu \n"
"metabolismo precisa baseado no seu nível de atividade física."
-#: nutrition/templates/rate/form.html:81
+#: nutrition/templates/rate/form.html:82
msgid "Calculate basic caloric intake"
msgstr "Calcular a ingestão de calorias básica"
-#: nutrition/templates/rate/form.html:88
+#: nutrition/templates/rate/form.html:89
msgid ""
"The total calories are the actual total calories per day. This\n"
"might include e.g. a surplus or deficit if you are bulking or cutting. "
@@ -2298,19 +2387,19 @@ msgstr ""
"ou cortando. Alternativament você pode informar a quantidade de calorias se "
"você souber o valor."
-#: nutrition/templates/rate/form.html:102
+#: nutrition/templates/rate/form.html:103
msgid "Transfer basic intake to total daily calories"
msgstr "Transferir a ingestão básica para o total de calorias diárias"
-#: nutrition/templates/rate/form.html:106
+#: nutrition/templates/rate/form.html:107
msgid "Add additional calories to total daily calories"
msgstr "Adicione calorias adicionais para o total de calorias diárias"
-#: nutrition/templates/rate/form.html:110
+#: nutrition/templates/rate/form.html:111
msgid "Save total calories to profile"
msgstr "Salvar o total de calorias ao perfil"
-#: nutrition/templates/rate/form.html:121
+#: nutrition/templates/rate/form.html:122
msgid ""
"Please note that these calculations can only be an\n"
"approximation. If you base your nutrition plan on these values, observe\n"
@@ -2320,48 +2409,48 @@ 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:158
+#: nutrition/views/ingredient.py:163
msgid "Add a new ingredient"
msgstr "Adicione um novo ingrediente"
-#: nutrition/views/plan.py:128
+#: nutrition/views/plan.py:127
msgid "Nutritional plan"
msgstr "Plano nutricional"
-#: nutrition/views/plan.py:130
+#: nutrition/views/plan.py:129
#, python-format
msgid "Nutritional plan for %s"
msgstr "Plano nutricional para %s"
-#: nutrition/views/plan.py:202
+#: nutrition/views/plan.py:201
msgid "<i>This is an empty plan, what did you expect on the PDF?</i>"
msgstr "<i>Este é um plano vazio, o quê você esperava no PDF?</i>"
-#: nutrition/views/plan.py:230
+#: nutrition/views/plan.py:229
msgid "Nutritional data"
msgstr "Dados nutricionais"
-#: nutrition/views/plan.py:238
+#: nutrition/views/plan.py:237
msgid "Total"
msgstr "Total"
-#: nutrition/views/plan.py:239
+#: nutrition/views/plan.py:238
msgid "Percent of energy"
msgstr "Percentagem de energia"
-#: nutrition/views/plan.py:240
+#: nutrition/views/plan.py:239
msgid "g per body kg"
msgstr "g por kg de corpo"
-#: nutrition/views/unit_ingredient.py:69
+#: nutrition/views/unit_ingredient.py:64
msgid "Add a new weight unit"
msgstr "Adicionar uma nova unidade de peso"
-#: nutrition/views/unit_ingredient.py:106
+#: nutrition/views/unit_ingredient.py:99
msgid "Edit a weight unit to ingredient connection"
msgstr "Edite uma unidade de peso para a conecção do ingrediente"
-#: nutrition/views/unit_ingredient.py:138
+#: nutrition/views/unit_ingredient.py:129
msgid "Delete?"
msgstr "Apagar?"
@@ -2759,7 +2848,7 @@ msgstr "Código Fonte"
msgid "Translation"
msgstr "Traduzir"
-#: utils/generic_views.py:263
+#: utils/generic_views.py:246
msgid "Yes, delete"
msgstr "Sim, apagar"
@@ -2813,10 +2902,6 @@ msgstr "Você precisa digitar seu peso"
msgid "Import weight logs"
msgstr "Importe logs de peso"
-#: weight/templates/import_csv_form.html:9
-msgid "Submit"
-msgstr "Submeter"
-
#: weight/templates/import_csv_form.html:15
msgid ""
"Use this import field to import your weight logs into Workout\n"
@@ -2940,6 +3025,34 @@ msgstr ""
msgid "Re-Submit"
msgstr "Re-submeter"
+#~ msgid "Email verification"
+#~ msgstr "Verificação de e-mail"
+
+#, python-format
+#~ msgid "%(username)s, your email was verified"
+#~ msgstr "%(username)s, seu e-mail foi verificado"
+
+#~ msgid "Error, invalid verification token"
+#~ msgstr "Erro, token de verificação inválido"
+
+#~ msgid "Email Confirmation"
+#~ msgstr "Confirmação de e-mail"
+
+#, python-format
+#~ msgid "You are almost there, %(username)s!"
+#~ msgstr "Você está quase lá, %(username)s!"
+
+#, python-format
+#~ msgid "Please click <a href=\"%(link)s\">here</a> to confirm your email"
+#~ msgstr "Clique <a href=\"%(link)s\">aqui</a> para confirmar seu e-mail"
+
+#, python-format
+#~ msgid "The token expires on %(time)s"
+#~ msgstr "O token expira em %(time)s"
+
+#~ msgid "Ingredient weight units"
+#~ msgstr "Unidade de peso dos ingredientes"
+
#~ msgid "Image"
#~ msgstr "Imagem"
@@ -2970,9 +3083,6 @@ msgstr "Re-submeter"
#~ msgid "Secondary muscles"
#~ msgstr "Músculos secundários"
-#~ msgid "Variations"
-#~ msgstr "Variações"
-
#~ msgid "Exercise Categories"
#~ msgstr "Categorias de exercício"
@@ -4035,9 +4145,6 @@ msgstr "Re-submeter"
#~ msgid "This content is available under the following license:"
#~ msgstr "Este conteúdo está disponível sob as seguintes licenças:"
-#~ msgid "Click here for more information"
-#~ msgstr "Click aqui para mais informações"
-
#, fuzzy, python-format
#~| msgid ""
#~| "%(name_original)s is too similar to existing exercise "
@@ -4733,8 +4840,5 @@ msgstr "Re-submeter"
#~ msgid "Last 12 months"
#~ msgstr "Últimos 12 meses"
-#~ msgid "No filter"
-#~ msgstr "Sem filtro"
-
#~ msgid "Days"
#~ msgstr "Dias"
diff --git a/wger/locale/ro/LC_MESSAGES/django.po b/wger/locale/ro/LC_MESSAGES/django.po
index 5b01595fb..72690a5ea 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: 2026-01-17 14:03+0000\n"
+"POT-Creation-Date: 2026-04-10 10:20+0000\n"
"PO-Revision-Date: 2026-03-05 10:09+0000\n"
"Last-Translator: Teodor Olteanu <[email protected]>\n"
"Language-Team: Romanian <https://hosted.weblate.org/projects/wger/web/ro/>\n"
@@ -39,7 +39,7 @@ msgstr ""
#: config/views/gym_config.py:42 core/templates/language/view.html:64
#: core/templates/license/list.html:17
#: core/templates/repetition_unit/list.html:18
-#: core/templates/user/overview.html:204 core/templates/user/overview.html:467
+#: core/templates/user/overview.html:207 core/templates/user/overview.html:470
#: core/templates/weight_unit/list.html:18
#: exercises/templates/categories/admin-overview.html:17
#: exercises/templates/equipment/admin-overview.html:17
@@ -51,30 +51,29 @@ msgstr ""
#: gym/templates/gym/list.html:19 gym/templates/gym/list.html:48
#: gym/templates/gym/member_list.html:94 gym/templates/gym/member_list.html:152
#: gym/templates/gym/member_list.html:190
-#: nutrition/templates/ingredient/view.html:164
-#: nutrition/templates/ingredient/view.html:209
-#: nutrition/templates/units/list.html:19
+#: nutrition/templates/ingredient/view.html:205
+#: nutrition/templates/ingredient/view.html:248
msgid "Edit"
msgstr "Editează"
-#: core/forms.py:91 core/templates/navigation.html:271
-#: core/templates/navigation.html:278 core/templates/user/login.html:4
+#: core/forms.py:89 core/templates/navigation.html:268
+#: core/templates/navigation.html:275 core/templates/user/login.html:4
#: core/templates/user/registration_sidebar.html:12
#: software/templates/features.html:82 software/templates/features.html:448
msgid "Login"
msgstr "Autentificare"
-#: core/forms.py:130 core/forms.py:244 gym/views/export.py:61
+#: core/forms.py:128 core/forms.py:242 gym/views/export.py:61
#: gym/views/gym.py:217
msgid "First name"
msgstr "Prenume"
-#: core/forms.py:131 core/forms.py:245 core/templates/user/overview.html:284
+#: core/forms.py:129 core/forms.py:243 core/templates/user/overview.html:287
#: gym/views/export.py:62 gym/views/gym.py:217
msgid "Last name"
msgstr "Nume de familie"
-#: core/forms.py:133 core/forms.py:210 core/templates/user/overview.html:288
+#: core/forms.py:131 core/forms.py:208 core/templates/user/overview.html:291
#: gym/models/contract.py:256 gym/models/gym.py:58
#: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:116
#: gym/templates/gym/new_user.html:30 gym/views/export.py:60
@@ -84,53 +83,53 @@ msgstr "Nume de familie"
msgid "Email"
msgstr "E-mail"
-#: core/forms.py:134
+#: core/forms.py:132
msgid "Used for password resets and, optionally, e-mail reminders."
msgstr "Folosit pentru resetarea parolei și, opțional, mementouri prin e-mail."
-#: core/forms.py:138 core/models/profile.py:222
+#: core/forms.py:136 core/models/profile.py:222
#: gym/templates/gym/new_user.html:38
msgid "Date of Birth"
msgstr "Data nașterii"
-#: core/forms.py:177
+#: core/forms.py:175
msgid "Personal data"
msgstr "Date personale"
-#: core/forms.py:189
+#: core/forms.py:187
msgid "Workout reminders"
msgstr "Mementouri antrenament"
-#: core/forms.py:196
+#: core/forms.py:194
msgid "Other settings"
msgstr "Alte setări"
-#: core/forms.py:204 core/views/user.py:614 core/views/user.py:629
-#: core/views/user.py:641 gym/forms.py:73 utils/generic_views.py:143
+#: core/forms.py:202 core/views/user.py:630 core/views/user.py:654
+#: core/views/user.py:668 gym/forms.py:73 utils/generic_views.py:137
msgid "Save"
msgstr "Salvează"
-#: core/forms.py:211
+#: core/forms.py:209
msgid "Used for password resets and, optionally, email reminders."
msgstr "Folosit pentru resetarea parolei și, opțional, mementouri prin e-mail."
-#: core/forms.py:240
+#: core/forms.py:238
msgid "This e-mail address is already in use."
msgstr "Această adresă de e-mail este deja folosită."
-#: core/forms.py:261 gym/templates/gym/new_user.html:26
+#: core/forms.py:259 gym/templates/gym/new_user.html:26
#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:217
msgid "Password"
msgstr "Parolă"
-#: core/forms.py:263
+#: core/forms.py:261
msgid "Please enter your current password."
msgstr "Te rugăm să introduci parola ta curentă."
-#: core/forms.py:272 core/templates/language/view.html:70
+#: core/forms.py:270 core/templates/language/view.html:70
#: core/templates/license/list.html:21
#: core/templates/repetition_unit/list.html:22
-#: core/templates/user/overview.html:233
+#: core/templates/user/overview.html:236
#: core/templates/weight_unit/list.html:22
#: exercises/templates/categories/admin-overview.html:21
#: exercises/templates/equipment/admin-overview.html:21
@@ -138,27 +137,30 @@ msgstr "Te rugăm să introduci parola ta curentă."
#: gym/templates/admin_notes/list.html:37
#: gym/templates/contract_option/list.html:35
#: gym/templates/contract_type/list.html:36 gym/templates/document/list.html:46
-#: gym/templates/gym/list.html:23 nutrition/templates/ingredient/view.html:168
-#: nutrition/templates/ingredient/view.html:215
-#: nutrition/templates/units/list.html:25
+#: gym/templates/gym/list.html:23 nutrition/templates/ingredient/view.html:209
+#: nutrition/templates/ingredient/view.html:254
msgid "Delete"
msgstr "Șterge"
-#: core/forms.py:281
+#: core/forms.py:279
msgid "Invalid password"
msgstr "Parolă invalidă"
-#: core/forms.py:293
+#: core/forms.py:291 core/forms.py:349
msgid "The form is secured with reCAPTCHA"
msgstr "Formularul este securizat cu reCAPTCHA"
-#: core/forms.py:314 core/forms.py:341 core/templates/navigation.html:272
-#: core/templates/navigation.html:285 core/templates/template.html:123
-#: core/templates/user/login.html:21 core/views/user.py:285
+#: core/forms.py:312 core/forms.py:339 core/templates/navigation.html:269
+#: core/templates/navigation.html:282 core/templates/template.html:113
+#: core/templates/user/login.html:21 core/views/user.py:293
#: software/templates/features.html:87 software/templates/features.html:442
msgid "Register"
msgstr "Înregistrare"
+#: core/forms.py:360 weight/templates/import_csv_form.html:9
+msgid "Submit"
+msgstr "Trimite"
+
#: core/models/language.py:31 core/templates/language/view.html:21
msgid "Language short name"
msgstr "Numele scurt al limbii"
@@ -195,36 +197,36 @@ msgstr "Link"
msgid "Link to license text or other information"
msgstr "Link către textul licenței sau alte informații"
-#: core/models/profile.py:57
+#: core/models/profile.py:60
#, python-format
msgid "%(birthdate)s is not a valid birthdate"
msgstr "%(birthdate)s nu este o dată de naștere validă"
-#: core/models/profile.py:66
+#: core/models/profile.py:69
msgid "Male"
msgstr "Bărbat"
-#: core/models/profile.py:67
+#: core/models/profile.py:70
msgid "Female"
msgstr "Femeie"
-#: core/models/profile.py:74
+#: core/models/profile.py:77
msgid "Low"
msgstr "Scăzut"
-#: core/models/profile.py:75
+#: core/models/profile.py:78
msgid "Medium"
msgstr "Mediu"
-#: core/models/profile.py:76
+#: core/models/profile.py:79
msgid "High"
msgstr "Ridicat"
-#: core/models/profile.py:82
+#: core/models/profile.py:85
msgid "Metric (kilogram)"
msgstr "Metric (kilograme)"
-#: core/models/profile.py:83
+#: core/models/profile.py:86
msgid "Imperial (pound)"
msgstr "Imperial (livre)"
@@ -347,7 +349,7 @@ msgstr "Ore medii pe săptămână"
msgid "Free time"
msgstr "Timp liber"
-#: core/models/profile.py:320 nutrition/templates/rate/form.html:66
+#: core/models/profile.py:320 nutrition/templates/rate/form.html:67
msgid "Total daily calories"
msgstr "Total calorii zilnice"
@@ -390,20 +392,45 @@ msgstr "Activează trofeele"
msgid "Enable or disable the trophy system for this user"
msgstr "Activează sau dezactivează sistemul de trofee pentru acest utilizator"
-#: core/models/profile.py:446
+#: core/models/profile.py:457
msgid "The sum of all hours has to be 24"
msgstr "Suma tuturor orelor trebuie să fie 24"
-#: core/models/rep_unit.py:36 core/models/weight_unit.py:42
-#: core/templates/user/overview.html:280 core/views/user.py:589
+#: core/models/rep_unit.py:32 i18n.tpl:30
+msgid "Repetitions"
+msgstr "Repetări"
+
+#: core/models/rep_unit.py:33 core/templates/user/overview.html:82
+#: exercises/templates/history/overview.html:30
+msgid "Time"
+msgstr "Timp"
+
+#: core/models/rep_unit.py:34
+#, fuzzy
+#| msgid "Resistance band"
+msgid "Distance"
+msgstr "Bandă de rezistență"
+
+#: core/models/rep_unit.py:47 core/models/weight_unit.py:42
+#: core/templates/user/overview.html:283 core/views/user.py:605
#: exercises/models/muscle.py:36 gym/models/contract.py:52
#: gym/models/contract.py:103 gym/models/gym.py:46
#: gym/models/user_document.py:84 gym/templates/contract/view.html:50
#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:108
-#: gym/views/gym.py:158 nutrition/templates/ingredient/view.html:151
+#: gym/views/gym.py:158 nutrition/templates/ingredient/view.html:192
msgid "Name"
msgstr "Nume"
+#: core/models/rep_unit.py:53
+#, fuzzy
+#| msgid "Unit"
+msgid "Unit Type"
+msgstr "Unitate"
+
+#: core/models/rep_unit.py:54
+msgid "The type of unit (repetitions, time, or distance)"
+msgstr ""
+
#: core/templates/403.html:4
msgid "Forbidden!"
msgstr "Interzis!"
@@ -435,6 +462,56 @@ msgstr ""
"rugăm să încerci din nou mai târziu. Dacă problema persistă, poți solicita "
"ajutor în modurile enumerate mai jos:"
+#: core/templates/account/email/email_confirmation_message.html:81
+msgid "Almost there!"
+msgstr ""
+
+#: core/templates/account/email/email_confirmation_message.html:85
+#, fuzzy, python-format
+#| msgid ""
+#| "You're receiving this e-mail because you requested a password reset for "
+#| "your user account at %(site_name)s."
+msgid ""
+"You're receiving this email because the user \"%(user_display)s\" has given "
+"your email address to register an account on %(site_domain)s."
+msgstr ""
+"Primești acest e-mail pentru că ai solicitat resetarea parolei pentru contul "
+"tău de utilizator pe %(site_name)s."
+
+#: core/templates/account/email/email_confirmation_message.html:93
+msgid ""
+"Your email verification code is listed below. Please enter it in your open "
+"browser window."
+msgstr ""
+
+#: core/templates/account/email/email_confirmation_message.html:100
+#, fuzzy
+#| msgid "Please click the following link to confirm your email: %(link)s"
+msgid "Please click the button below to confirm your email address."
+msgstr ""
+"Te rugăm să accesezi următorul link pentru a-ți confirma e-mailul: %(link)s"
+
+#: core/templates/account/email/email_confirmation_message.html:106
+#, fuzzy
+#| msgid "Unverified email"
+msgid "Confirm email"
+msgstr "E-mail neverificat"
+
+#: core/templates/account/email/email_confirmation_message.html:110
+#, python-format
+msgid ""
+"The link is valid for %(expire_hours)s hours (until %(date)s, %(time)s). You "
+"can request a new one from your profile settings."
+msgstr ""
+
+#: core/templates/account/email/email_confirmation_message.html:116
+msgid "If the button doesn't work, copy and paste this link into your browser:"
+msgstr ""
+
+#: core/templates/account/email/email_confirmation_message.html:125
+msgid "the wger Team"
+msgstr "Echipa wger"
+
#: core/templates/base.html:10
#, python-format
msgid ""
@@ -470,54 +547,7 @@ msgstr ""
msgid "Are you sure you want to delete this? This action cannot be undone."
msgstr "Ești sigur că vrei să ștergi asta? Această acțiune este ireversibilă."
-#: core/templates/email_verification/confirm_template.html:4
-msgid "Email verification"
-msgstr "Verificarea e-mailului"
-
-#: core/templates/email_verification/confirm_template.html:18
-#, python-format
-msgid "%(username)s, your email was verified"
-msgstr "%(username)s, e-mailul tău a fost verificat"
-
-#: core/templates/email_verification/confirm_template.html:22
-msgid "Error, invalid verification token"
-msgstr "Eroare, token de verificare invalid"
-
-#: core/templates/email_verification/email_body_html.tpl:6
-msgid "Email Confirmation"
-msgstr "Confirmarea e-mailului"
-
-#: 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 "Aproape ai terminat, %(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 ""
-"Te rugăm să dai click <a href=\"%(link)s\">aici</a> pentru a-ți confirma e-"
-"mailul"
-
-#: 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 "Token-ul expiră pe %(time)s"
-
-#: core/templates/email_verification/email_body_html.tpl:14
-#: core/templates/email_verification/email_body_txt.tpl:8
-msgid "the wger Team"
-msgstr "Echipa wger"
-
-#: core/templates/email_verification/email_body_txt.tpl:4
-#, python-format
-msgid "Please click the following link to confirm your email: %(link)s"
-msgstr ""
-"Te rugăm să accesezi următorul link pentru a-ți confirma e-mailul: %(link)s"
-
-#: core/templates/language/overview.html:4 core/templates/navigation.html:344
+#: core/templates/language/overview.html:4 core/templates/navigation.html:341
msgid "Languages"
msgstr "Limbi"
@@ -526,16 +556,16 @@ msgid "Nothing found."
msgstr "Nu am găsit nimic."
#: core/templates/language/overview.html:22
-#: nutrition/templates/ingredient/overview.html:38
+#: nutrition/templates/ingredient/overview.html:43
msgid "Add one now."
msgstr "Adaugă una acum."
#: core/templates/language/overview.html:34 core/templates/license/list.html:43
-#: core/templates/repetition_unit/list.html:46
-#: core/templates/user/overview.html:344 core/templates/user/overview.html:384
-#: core/templates/user/overview.html:422
-#: core/templates/weight_unit/list.html:46 core/views/languages.py:74
-#: core/views/license.py:66 core/views/repetition_units.py:66
+#: core/templates/repetition_unit/list.html:44
+#: core/templates/user/overview.html:347 core/templates/user/overview.html:387
+#: core/templates/user/overview.html:425
+#: core/templates/weight_unit/list.html:46 core/views/languages.py:77
+#: core/views/license.py:66 core/views/repetition_units.py:76
#: core/views/weight_units.py:66
#: exercises/templates/categories/admin-overview.html:40
#: exercises/templates/equipment/admin-overview.html:39
@@ -548,14 +578,14 @@ msgstr "Adaugă una acum."
#: gym/templates/gym/member_list.html:264
#: gym/templates/gym/member_list.html:303
#: mailer/templates/mailer/gym/overview.html:43
-#: nutrition/templates/ingredient/overview.html:60
+#: nutrition/templates/ingredient/overview.html:97
msgid "Add"
msgstr "Adaugă"
#: core/templates/language/view.html:61 core/templates/user/api_key.html:41
#: core/templates/user/preferences.html:50 gym/models/contract.py:203
#: gym/templates/contract/view.html:41 gym/templates/gym/member_list.html:270
-#: nutrition/templates/ingredient/view.html:206
+#: nutrition/templates/ingredient/view.html:245
msgid "Options"
msgstr "Opțiuni"
@@ -565,9 +595,9 @@ msgstr "Lista licențelor"
#: core/templates/license/list.html:30
#: core/templates/repetition_unit/list.html:32
-#: core/templates/user/overview.html:104 core/templates/user/overview.html:136
-#: core/templates/user/overview.html:185 core/templates/user/overview.html:365
-#: core/templates/user/overview.html:404 core/templates/user/overview.html:448
+#: core/templates/user/overview.html:107 core/templates/user/overview.html:139
+#: core/templates/user/overview.html:188 core/templates/user/overview.html:368
+#: core/templates/user/overview.html:407 core/templates/user/overview.html:451
#: core/templates/weight_unit/list.html:32
#: exercises/templates/categories/admin-overview.html:30
#: exercises/templates/equipment/admin-overview.html:30
@@ -579,11 +609,10 @@ msgstr "Lista licențelor"
#: gym/templates/gym/member_list.html:284
#: gym/templates/gym/member_list.html:321
#: mailer/templates/mailer/gym/overview.html:30
-#: nutrition/templates/units/list.html:34
msgid "Nothing found"
msgstr "Nu am găsit nimic"
-#: core/templates/misc/about.html:4 core/templates/template.html:160
+#: core/templates/misc/about.html:4 core/templates/template.html:150
msgid "Imprint"
msgstr "Informații legale"
@@ -591,162 +620,157 @@ msgstr "Informații legale"
msgid "Training"
msgstr "Antrenament"
-#: core/templates/navigation.html:37 core/templates/user/overview.html:25
+#: core/templates/navigation.html:36 core/templates/user/overview.html:28
msgid "Routines"
msgstr "Rutine"
-#: core/templates/navigation.html:45 core/templates/user/overview.html:70
+#: core/templates/navigation.html:44 core/templates/user/overview.html:73
msgid "Calendar"
msgstr "Calendar"
-#: core/templates/navigation.html:55
+#: core/templates/navigation.html:53
msgid "Measurements"
msgstr "Măsurători"
-#: core/templates/navigation.html:66 gallery/templates/images/overview.html:6
+#: core/templates/navigation.html:64 gallery/templates/images/overview.html:6
msgid "Gallery"
msgstr "Galerie"
-#: core/templates/navigation.html:72
+#: core/templates/navigation.html:74 core/templates/navigation.html:400
+#: trophies/templates/trophies/overview.html:7
+msgid "Trophies"
+msgstr "Trofee"
+
+#: core/templates/navigation.html:79
msgid "Workout templates"
msgstr "Șabloane de antrenament"
-#: core/templates/navigation.html:79
+#: core/templates/navigation.html:86
msgid "Your templates"
msgstr "Șabloanele tale"
-#: core/templates/navigation.html:88
+#: core/templates/navigation.html:95
msgid "Public templates"
msgstr "Șabloane publice"
-#: core/templates/navigation.html:96 software/templates/features.html:51
+#: core/templates/navigation.html:103 software/templates/features.html:51
#: software/templates/features.html:480
msgid "Exercises"
msgstr "Exerciții"
-#: core/templates/navigation.html:102 core/templates/navigation.html:176
-#: core/templates/navigation.html:339
+#: core/templates/navigation.html:109 core/templates/navigation.html:336
msgid "Administration"
msgstr "Administrare"
-#: core/templates/navigation.html:106
+#: core/templates/navigation.html:113
msgid "Exercise edit history"
msgstr "Istoricul editării exercițiilor"
-#: core/templates/navigation.html:112
+#: core/templates/navigation.html:119
msgid "Equipment"
msgstr "Echipament"
-#: core/templates/navigation.html:118
+#: core/templates/navigation.html:125
msgid "Muscles"
msgstr "Mușchi"
-#: core/templates/navigation.html:124
+#: core/templates/navigation.html:131
#: exercises/templates/categories/admin-overview.html:4
msgid "Categories"
msgstr "Categorii"
-#: core/templates/navigation.html:139 software/templates/features.html:468
+#: core/templates/navigation.html:146 software/templates/features.html:468
msgid "Nutrition"
msgstr "Nutriție"
-#: core/templates/navigation.html:147 core/templates/user/overview.html:144
+#: core/templates/navigation.html:154 core/templates/user/overview.html:147
msgid "Nutrition plans"
msgstr "Planuri nutriționale"
-#: core/templates/navigation.html:156
+#: core/templates/navigation.html:163
msgid "BMI calculator"
msgstr "Calculator IMC"
-#: core/templates/navigation.html:165 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:172 nutrition/templates/rate/form.html:18
msgid "Daily calories calculator"
msgstr "Calculator de calorii zilnice"
-#: core/templates/navigation.html:171
+#: core/templates/navigation.html:178
#: nutrition/templates/ingredient/overview.html:10
msgid "Ingredient overview"
msgstr "Prezentare generală ingrediente"
-#: core/templates/navigation.html:180 nutrition/templates/units/list.html:6
-msgid "Ingredient weight units"
-msgstr "Unități de greutate pentru ingrediente"
-
-#: core/templates/navigation.html:196 software/templates/features.html:463
+#: core/templates/navigation.html:193 software/templates/features.html:463
msgid "Body weight"
msgstr "Greutatea corpului"
-#: core/templates/navigation.html:203 core/templates/user/overview.html:114
+#: core/templates/navigation.html:200 core/templates/user/overview.html:117
msgid "Weight overview"
msgstr "Prezentare generală a greutății"
-#: core/templates/navigation.html:217
+#: core/templates/navigation.html:214
msgid "About this software"
msgstr "Despre această aplicație"
-#: core/templates/navigation.html:223 software/templates/about_us.html:5
+#: core/templates/navigation.html:220 software/templates/about_us.html:5
msgid "Support & Get Involved"
msgstr "Suport și implicare"
-#: core/templates/navigation.html:229 software/templates/features.html:528
+#: core/templates/navigation.html:226 software/templates/features.html:528
msgid "REST API"
msgstr "API REST"
-#: core/templates/navigation.html:235 utils/models.py:45
+#: core/templates/navigation.html:232 utils/models.py:45
msgid "License"
msgstr "Licență"
-#: core/templates/navigation.html:241
+#: core/templates/navigation.html:238
msgid "Developer documentation"
msgstr "Documentație pentru dezvoltatori"
-#: core/templates/navigation.html:248
+#: core/templates/navigation.html:245
msgid "Get the code"
msgstr "Obține codul sursă"
-#: core/templates/navigation.html:255 core/templates/template.html:199
-#: software/templates/features.html:603
+#: core/templates/navigation.html:252 core/templates/template.html:202
+#: software/templates/features.html:614
msgid "Translate"
msgstr "Traduceri"
-#: core/templates/navigation.html:292 core/templates/user/login.html:30
+#: core/templates/navigation.html:289 core/templates/user/login.html:30
msgid "Reset password"
msgstr "Resetează parola"
-#: core/templates/navigation.html:301 core/templates/navigation.html:329
+#: core/templates/navigation.html:298 core/templates/navigation.html:326
msgid "Logout"
msgstr "Deconectare"
-#: core/templates/navigation.html:320
+#: core/templates/navigation.html:317
msgid "My preferences"
msgstr "Preferințele mele"
-#: core/templates/navigation.html:352
+#: core/templates/navigation.html:349
msgid "Licenses"
msgstr "Licențe"
-#: core/templates/navigation.html:360
+#: core/templates/navigation.html:357
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr "Unități pentru repetări"
-#: core/templates/navigation.html:368 core/templates/weight_unit/list.html:4
-#: nutrition/templates/ingredient/view.html:141
+#: core/templates/navigation.html:365 core/templates/weight_unit/list.html:4
+#: nutrition/templates/ingredient/view.html:182
msgid "Weight units"
msgstr "Unități de greutate"
-#: core/templates/navigation.html:376 core/templates/user/list.html:4
+#: core/templates/navigation.html:373 core/templates/user/list.html:4
msgid "User list"
msgstr "Lista utilizatorilor"
-#: core/templates/navigation.html:382
+#: core/templates/navigation.html:379
msgid "Gyms"
msgstr "Săli de fitness"
-#: core/templates/navigation.html:403
-#: trophies/templates/trophies/overview.html:7
-msgid "Trophies"
-msgstr "Trofee"
-
#: core/templates/registration/password_reset_complete.html:4
msgid "Password reset complete"
msgstr "Resetarea parolei finalizată"
@@ -808,27 +832,31 @@ msgstr "anterior"
msgid "next"
msgstr "următorul"
-#: core/templates/template.html:96
+#: core/templates/template.html:86
msgid "Close"
msgstr "Închide"
-#: core/templates/template.html:112
+#: core/templates/template.html:102
msgid ""
"You are using a guest account, data entered will be deleted after a week."
msgstr ""
"Folosești un cont de vizitator (guest), datele introduse vor fi șterse după "
"o săptămână."
-#: core/templates/template.html:117
+#: core/templates/template.html:107
msgid "Create some demo entries"
msgstr "Creează câteva intrări demonstrative"
-#: core/templates/template.html:165 software/templates/features.html:568
+#: core/templates/template.html:155 software/templates/features.html:568
#: software/templates/tos.html:7
msgid "Terms of service"
msgstr "Termeni de utilizare"
-#: core/templates/template_features.html:53 software/templates/features.html:9
+#: core/templates/template.html:181 software/templates/features.html:595
+msgid "Browser language"
+msgstr ""
+
+#: core/templates/template_features.html:46 software/templates/features.html:9
msgid "Features"
msgstr "Funcționalități"
@@ -886,99 +914,94 @@ msgstr "Nu ai cont?"
msgid "Forgot password?"
msgstr "Ai uitat parola?"
-#: core/templates/user/overview.html:25 core/templates/user/overview.html:68
-#: core/templates/user/overview.html:112 core/templates/user/overview.html:144
-#: core/templates/user/overview.html:348 core/templates/user/overview.html:390
-#: core/templates/user/overview.html:426
+#: core/templates/user/overview.html:28 core/templates/user/overview.html:71
+#: core/templates/user/overview.html:115 core/templates/user/overview.html:147
+#: core/templates/user/overview.html:351 core/templates/user/overview.html:393
+#: core/templates/user/overview.html:429
#, python-format
msgid "last %(number)s"
msgstr "ultimele %(number)s"
-#: core/templates/user/overview.html:27 core/templates/user/overview.html:146
-#: core/templates/user/overview.html:343 core/templates/user/overview.html:382
-#: core/templates/user/overview.html:421 gym/templates/gym/member_list.html:226
+#: core/templates/user/overview.html:30 core/templates/user/overview.html:149
+#: core/templates/user/overview.html:346 core/templates/user/overview.html:385
+#: core/templates/user/overview.html:424 gym/templates/gym/member_list.html:226
#: gym/templates/gym/member_list.html:262
#: gym/templates/gym/member_list.html:302
msgid "Overview"
msgstr "Prezentare generală"
-#: core/templates/user/overview.html:34 core/templates/user/overview.html:76
-#: core/templates/user/overview.html:120 core/templates/user/overview.html:152
+#: core/templates/user/overview.html:37 core/templates/user/overview.html:79
+#: core/templates/user/overview.html:123 core/templates/user/overview.html:155
#: manager/helpers.py:88 software/templates/about_us.html:170
#: weight/templates/import_csv_preview.html:13
#: weight/templates/import_csv_preview.html:42 weight/views.py:54
msgid "Date"
msgstr "Dată"
-#: core/templates/user/overview.html:35 core/templates/user/overview.html:153
+#: core/templates/user/overview.html:38 core/templates/user/overview.html:156
#: gym/models/contract.py:58 gym/models/contract.py:109
msgid "Description"
msgstr "Descriere"
-#: core/templates/user/overview.html:36
+#: core/templates/user/overview.html:39
msgid "Number of logs (days)"
msgstr "Numărul jurnalelor (zile)"
-#: core/templates/user/overview.html:37 core/views/user.py:590
+#: core/templates/user/overview.html:40 core/views/user.py:606
#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:158
msgid "Last activity"
msgstr "Ultima activitate"
-#: core/templates/user/overview.html:58
+#: core/templates/user/overview.html:61
msgid "No workouts found."
msgstr "Nu am găsit antrenamente."
-#: core/templates/user/overview.html:68
+#: core/templates/user/overview.html:71
msgid "Log"
msgstr "Înregistrează"
-#: core/templates/user/overview.html:77
+#: core/templates/user/overview.html:80
msgid "General impression"
msgstr "Impresie generală"
-#: core/templates/user/overview.html:78 core/templates/user/overview.html:390
+#: core/templates/user/overview.html:81 core/templates/user/overview.html:393
msgid "Notes"
msgstr "Note"
-#: core/templates/user/overview.html:79
-#: exercises/templates/history/overview.html:30
-msgid "Time"
-msgstr "Timp"
-
-#: core/templates/user/overview.html:112 core/templates/user/overview.html:121
+#: core/templates/user/overview.html:115 core/templates/user/overview.html:124
#: manager/helpers.py:89 weight/templates/import_csv_preview.html:14
#: weight/templates/import_csv_preview.html:43 weight/views.py:54
msgid "Weight"
msgstr "Greutate"
-#: core/templates/user/overview.html:154
-#: nutrition/templates/ingredient/view.html:51 nutrition/views/plan.py:245
+#: core/templates/user/overview.html:157
+#: nutrition/templates/ingredient/view.html:52 nutrition/views/plan.py:244
msgid "Energy"
msgstr "Energie"
-#: core/templates/user/overview.html:155
-#: nutrition/templates/ingredient/view.html:58 nutrition/views/plan.py:251
+#: core/templates/user/overview.html:158
+#: nutrition/templates/ingredient/view.html:59 nutrition/views/plan.py:250
msgid "Protein"
msgstr "Proteine"
-#: core/templates/user/overview.html:156
-#: nutrition/templates/ingredient/view.html:64 nutrition/views/plan.py:259
+#: core/templates/user/overview.html:159
+#: nutrition/templates/ingredient/view.html:65 nutrition/views/plan.py:258
msgid "Carbohydrates"
msgstr "Carbohidrați"
-#: core/templates/user/overview.html:157
-#: nutrition/templates/ingredient/view.html:80 nutrition/views/plan.py:273
+#: core/templates/user/overview.html:160
+#: nutrition/templates/ingredient/view.html:81 nutrition/views/plan.py:272
msgid "Fat"
msgstr "Grăsimi"
-#: core/templates/user/overview.html:170
-#: nutrition/templates/ingredient/view.html:53
+#: core/templates/user/overview.html:173
+#: nutrition/templates/ingredient/view.html:54
msgid "kcal"
msgstr "kcal"
-#: core/templates/user/overview.html:201 core/templates/user/overview.html:340
-#: core/templates/user/overview.html:379 core/templates/user/overview.html:418
-#: core/templates/user/overview.html:463 gym/templates/gym/list.html:45
+#: core/templates/user/overview.html:204 core/templates/user/overview.html:343
+#: core/templates/user/overview.html:382 core/templates/user/overview.html:421
+#: core/templates/user/overview.html:466 gym/templates/gym/list.html:45
#: gym/templates/gym/member_list.html:91 gym/templates/gym/member_list.html:149
#: gym/templates/gym/member_list.html:187
#: gym/templates/gym/member_list.html:223
@@ -987,111 +1010,115 @@ msgstr "kcal"
msgid "Actions"
msgstr "Acțiuni"
-#: core/templates/user/overview.html:210
+#: core/templates/user/overview.html:213
msgid "Deactivate user"
msgstr "Dezactivează utilizatorul"
-#: core/templates/user/overview.html:214
+#: core/templates/user/overview.html:217
msgid "Activate user"
msgstr "Activează utilizatorul"
-#: core/templates/user/overview.html:223
+#: core/templates/user/overview.html:226
msgid "Reset user password"
msgstr "Resetează parola utilizatorului"
-#: core/templates/user/overview.html:227 gym/templates/gym/member_list.html:30
+#: core/templates/user/overview.html:230 gym/templates/gym/member_list.html:30
msgid "Roles"
msgstr "Roluri"
-#: core/templates/user/overview.html:243
+#: core/templates/user/overview.html:246
msgid "Password reset confirmation"
msgstr "Confirmarea resetării parolei"
-#: core/templates/user/overview.html:247
+#: core/templates/user/overview.html:250
msgid "Do you really want to change this user&#39;s password?"
msgstr "Ești sigur că vrei să schimbi parola acestui utilizator?"
-#: core/templates/user/overview.html:250
+#: core/templates/user/overview.html:253
#: exercises/templates/history/overview.html:106
+#: nutrition/templates/ingredient/view.html:148
+#: nutrition/templates/ingredient/view.html:160
msgid "No"
msgstr "Nu"
-#: core/templates/user/overview.html:251
+#: core/templates/user/overview.html:254
#: exercises/templates/history/overview.html:99
+#: nutrition/templates/ingredient/view.html:146
+#: nutrition/templates/ingredient/view.html:158
msgid "Yes"
msgstr "Da"
-#: core/templates/user/overview.html:272 gym/templates/gym/member_list.html:105
+#: core/templates/user/overview.html:275 gym/templates/gym/member_list.html:105
msgid "Details"
msgstr "Detalii"
-#: core/templates/user/overview.html:276 gym/views/export.py:57
-#: manager/helpers.py:89 nutrition/views/plan.py:151
-#: nutrition/views/plan.py:157
+#: core/templates/user/overview.html:279 gym/views/export.py:57
+#: manager/helpers.py:89 nutrition/views/plan.py:150
+#: nutrition/views/plan.py:156
msgid "Nr."
msgstr "Nr."
-#: core/templates/user/overview.html:298 gym/models/contract.py:287
+#: core/templates/user/overview.html:301 gym/models/contract.py:287
#: gym/models/gym.py:50 gym/templates/contract/view.html:75
#: gym/templates/gym/member_list.html:112 gym/views/export.py:68
msgid "Phone"
msgstr "Telefon"
-#: core/templates/user/overview.html:302 gym/templates/contract/view.html:87
+#: core/templates/user/overview.html:305 gym/templates/contract/view.html:87
#: gym/templates/gym/member_list.html:130
msgid "Address"
msgstr "Adresă"
-#: core/templates/user/overview.html:313
+#: core/templates/user/overview.html:316
msgid "Registered"
msgstr "Înregistrat"
-#: core/templates/user/overview.html:317
+#: core/templates/user/overview.html:320
msgid "Last login"
msgstr "Ultima autentificare"
-#: core/templates/user/overview.html:322
+#: core/templates/user/overview.html:325
msgid "Status"
msgstr "Status"
-#: core/templates/user/overview.html:325
+#: core/templates/user/overview.html:328
msgid "Active"
msgstr "Activ"
-#: core/templates/user/overview.html:327
+#: core/templates/user/overview.html:330
msgid "Inactive"
msgstr "Inactiv"
-#: core/templates/user/overview.html:348 gym/templates/contract/list.html:4
+#: core/templates/user/overview.html:351 gym/templates/contract/list.html:4
#: gym/templates/gym/member_list.html:218
msgid "Contracts"
msgstr "Contracte"
-#: core/templates/user/overview.html:426 gym/templates/document/list.html:4
+#: core/templates/user/overview.html:429 gym/templates/document/list.html:4
msgid "Documents"
msgstr "Documente"
-#: core/templates/user/overview.html:433 gym/templates/document/list.html:33
+#: core/templates/user/overview.html:436 gym/templates/document/list.html:33
msgid "Download"
msgstr "Descarcă"
-#: core/templates/user/overview.html:474 gym/views/admin_config.py:44
+#: core/templates/user/overview.html:477 gym/views/admin_config.py:44
#: gym/views/admin_config.py:58 gym/views/user_config.py:46
msgid "Configuration"
msgstr "Configurare"
-#: core/templates/user/overview.html:477 gym/models/user_config.py:92
+#: core/templates/user/overview.html:480 gym/models/user_config.py:92
msgid "Include in inactive overview"
msgstr "Include în prezentarea generală a inactivității"
-#: core/templates/user/overview.html:510
+#: core/templates/user/overview.html:513
#, python-format
msgid "Admin login is only available for users in %(gym_name)s"
msgstr ""
-"Autentificarea de admin este disponibilă doar pentru utilizatorii din %"
-"(gym_name)s"
+"Autentificarea de admin este disponibilă doar pentru utilizatorii din "
+"%(gym_name)s"
-#: core/templates/user/overview.html:514
+#: core/templates/user/overview.html:517
msgid "Log in as this user"
msgstr "Autentifică-te ca acest utilizator"
@@ -1116,7 +1143,7 @@ msgid "You need to verify your email to contribute exercises"
msgstr ""
"Trebuie să îți verifici adresa de e-mail pentru a contribui cu exerciții"
-#: core/templates/user/preferences.html:55 core/views/user.py:601
+#: core/templates/user/preferences.html:55 core/views/user.py:617
msgid "Change password"
msgstr "Schimbă parola"
@@ -1124,23 +1151,23 @@ msgstr "Schimbă parola"
msgid "Already have an account?"
msgstr "Ai deja un cont?"
-#: core/templatetags/wger_extras.py:142 i18n.tpl:38
+#: core/templatetags/wger_extras.py:142 i18n.tpl:39
msgid "kg"
msgstr "kg"
#: core/templatetags/wger_extras.py:144
-#: nutrition/templates/ingredient/view.html:60
-#: nutrition/templates/ingredient/view.html:66
-#: nutrition/templates/ingredient/view.html:73
-#: nutrition/templates/ingredient/view.html:82
-#: nutrition/templates/ingredient/view.html:89
-#: nutrition/templates/ingredient/view.html:111
-#: nutrition/templates/ingredient/view.html:121
+#: nutrition/templates/ingredient/view.html:61
+#: nutrition/templates/ingredient/view.html:67
+#: nutrition/templates/ingredient/view.html:74
+#: nutrition/templates/ingredient/view.html:83
+#: nutrition/templates/ingredient/view.html:90
+#: nutrition/templates/ingredient/view.html:112
+#: nutrition/templates/ingredient/view.html:122
msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr "g"
-#: core/templatetags/wger_extras.py:147 i18n.tpl:39
+#: core/templatetags/wger_extras.py:147 i18n.tpl:40
msgid "lb"
msgstr "lb"
@@ -1149,36 +1176,35 @@ msgctxt "weight unit, i.e. ounces"
msgid "oz"
msgstr "oz"
-#: core/views/languages.py:85 exercises/views/categories.py:122
+#: core/views/languages.py:88 exercises/views/categories.py:122
#: exercises/views/equipment.py:103 exercises/views/muscles.py:99
-#: nutrition/views/ingredient.py:120 nutrition/views/unit.py:110
+#: nutrition/views/ingredient.py:125
msgid "Successfully deleted"
msgstr "Șters cu succes"
-#: core/views/languages.py:93 core/views/license.py:103
-#: core/views/repetition_units.py:115 core/views/weight_units.py:115
+#: core/views/languages.py:96 core/views/license.py:103
+#: core/views/repetition_units.py:114 core/views/weight_units.py:115
#: exercises/views/categories.py:128 exercises/views/muscles.py:106
#: gallery/views/images.py:124 gym/views/admin_notes.py:196
#: gym/views/document.py:206 gym/views/gym.py:481
-#: nutrition/views/ingredient.py:127 nutrition/views/unit.py:117
+#: nutrition/views/ingredient.py:132
#, python-brace-format
msgid "Delete {0}?"
msgstr "Șterge {0}?"
-#: core/views/languages.py:111 core/views/license.py:85
-#: core/views/repetition_units.py:86 core/views/user.py:464
+#: core/views/languages.py:114 core/views/license.py:85
+#: core/views/repetition_units.py:96 core/views/user.py:480
#: core/views/weight_units.py:86 exercises/views/categories.py:98
#: exercises/views/equipment.py:81 exercises/views/muscles.py:87
#: gym/views/admin_notes.py:161 gym/views/config.py:68
#: gym/views/contract.py:186 gym/views/contract_option.py:123
#: gym/views/contract_type.py:123 gym/views/document.py:171
-#: gym/views/gym.py:463 nutrition/views/ingredient.py:146
-#: nutrition/views/unit.py:143
+#: gym/views/gym.py:463 nutrition/views/ingredient.py:151
#, python-brace-format
msgid "Edit {0}"
msgstr "Editează {0}"
-#: core/views/misc.py:74
+#: core/views/misc.py:73
msgid ""
"We have created sample workout, workout schedules, weight logs, (body) "
"weight and nutrition plan entries so you can better see what this site can "
@@ -1189,48 +1215,48 @@ msgstr ""
"astfel încât să poți vedea mai bine ce poate face acest site. Simte-te "
"liber să le editezi sau să le ștergi!"
-#: core/views/user.py:143
+#: core/views/user.py:145
#, python-brace-format
msgid "Account \"{0}\" was successfully deleted"
msgstr "Contul \"{0}\" a fost șters cu succes"
-#: core/views/user.py:279
+#: core/views/user.py:287
msgid "You were successfully registered"
msgstr "Te-ai înregistrat cu succes"
-#: core/views/user.py:341
+#: core/views/user.py:357
msgid "Settings successfully updated"
msgstr "Setările au fost actualizate cu succes"
-#: core/views/user.py:380
+#: core/views/user.py:396
msgid "The user was successfully deactivated"
msgstr "Utilizatorul a fost dezactivat cu succes"
-#: core/views/user.py:417
+#: core/views/user.py:433
msgid "The user was successfully activated"
msgstr "Utilizatorul a fost activat cu succes"
-#: core/views/user.py:432
+#: core/views/user.py:448
msgid "Edit user"
msgstr "Editează utilizatorul"
-#: core/views/user.py:587 gym/templates/gym/member_list.html:26
+#: core/views/user.py:603 gym/templates/gym/member_list.html:26
#: gym/views/gym.py:158
msgid "ID"
msgstr "ID"
-#: core/views/user.py:588 gym/forms.py:95 gym/templates/contract/view.html:55
+#: core/views/user.py:604 gym/forms.py:95 gym/templates/contract/view.html:55
#: gym/templates/gym/member_list.html:27 gym/views/export.py:59
#: gym/views/gym.py:158 gym/views/gym.py:217
msgid "Username"
msgstr "Nume de utilizator"
-#: core/views/user.py:591 gym/templates/gym/new_user.html:34
+#: core/views/user.py:607 gym/templates/gym/new_user.html:34
#: gym/views/export.py:58 gym/views/gym.py:217
msgid "Gym"
msgstr "Sală de fitness"
-#: core/views/user.py:650
+#: core/views/user.py:678
#, python-format
msgid "A verification email was sent to %(email)s"
msgstr "Un e-mail de verificare a fost trimis la %(email)s"
@@ -1247,16 +1273,16 @@ msgstr "Nume alternativ"
msgid "A more basic name for the muscle"
msgstr "Un nume mai simplu pentru mușchi"
-#: exercises/models/video.py:50
+#: exercises/models/video.py:52
#, python-format
msgid "Maximum file size is %(size)sMB."
msgstr "Dimensiunea maximă a fișierului este de %(size)sMB."
-#: exercises/models/video.py:57 exercises/models/video.py:65
+#: exercises/models/video.py:59 exercises/models/video.py:67
msgid "File type is not supported"
msgstr "Tipul de fișier nu este acceptat"
-#: exercises/models/video.py:70
+#: exercises/models/video.py:72
msgid "File is not a valid video"
msgstr "Fișierul nu este un videoclip valid"
@@ -1327,7 +1353,11 @@ msgstr "Șterge echipament?"
msgid "Add muscle"
msgstr "Adaugă mușchi"
-#: gallery/templates/images/overview.html:72
+#: gallery/forms.py:35
+msgid "If date is left empty, it will be read from the image instead"
+msgstr ""
+
+#: gallery/templates/images/overview.html:69
msgid "Add image"
msgstr "Adaugă imagine"
@@ -1395,7 +1425,7 @@ msgid "Contract type"
msgstr "Tip contract"
#: gym/models/contract.py:211 gym/templates/contract/view.html:59
-#: nutrition/forms.py:58
+#: nutrition/forms.py:67
msgid "Amount"
msgstr "Sumă"
@@ -1575,7 +1605,7 @@ msgstr "E-mailuri"
msgid "Add member"
msgstr "Adaugă membru"
-#: gym/templates/gym/new_user.html:48 nutrition/templates/rate/form.html:120
+#: gym/templates/gym/new_user.html:48 nutrition/templates/rate/form.html:121
msgid "Info"
msgstr "Informații"
@@ -1748,10 +1778,6 @@ msgstr "Bară de tracțiuni"
msgid "Quads"
msgstr "Cvadricepși"
-#: i18n.tpl:30
-msgid "Repetitions"
-msgstr "Repetări"
-
#: i18n.tpl:31
msgid "Resistance band"
msgstr "Bandă de rezistență"
@@ -1780,175 +1806,181 @@ msgstr "Triceps"
msgid "Until Failure"
msgstr "Până la epuizare"
-#: i18n.tpl:40
+#: i18n.tpl:38
+#, fuzzy
+#| msgid "Kilometers"
+msgid "Meters"
+msgstr "Kilometri"
+
+#: i18n.tpl:41
msgid "none (bodyweight exercise)"
msgstr "fără echipament (exercițiu cu greutatea corpului)"
-#: i18n.tpl:41
+#: i18n.tpl:42
msgid "Beginner"
msgstr "Începător"
-#: i18n.tpl:42
+#: i18n.tpl:43
msgid "Consistent"
msgstr "Consecvent"
-#: i18n.tpl:43
+#: i18n.tpl:44
msgid "Dedicated"
msgstr "Dedicat"
-#: i18n.tpl:44
+#: i18n.tpl:45
msgid "Obsessed"
msgstr "Obsedat"
-#: i18n.tpl:45
+#: i18n.tpl:46
msgid "Legend"
msgstr "Legendă"
-#: i18n.tpl:46
+#: i18n.tpl:47
msgid "Veteran"
msgstr "Veteran"
-#: i18n.tpl:47
+#: i18n.tpl:48
msgid "Titan"
msgstr "Titan"
-#: i18n.tpl:48
+#: i18n.tpl:49
msgid "Unstoppable"
msgstr "De neoprit"
-#: i18n.tpl:49
+#: i18n.tpl:50
msgid "Weekend Warrior"
msgstr "Luptător de weekend"
-#: i18n.tpl:50
+#: i18n.tpl:51
msgid "Elephant lifter"
msgstr "Ridicătoul de elefanți"
-#: i18n.tpl:51
+#: i18n.tpl:52
msgid "Bus lifter"
msgstr "Ridicătoul de autobuze"
-#: i18n.tpl:52
+#: i18n.tpl:53
msgid "Plane lifter"
msgstr "Ridicătoul de avioane"
-#: i18n.tpl:53
+#: i18n.tpl:54
msgid "Blue whale lifter"
msgstr "Ridicătoul de balene albastre"
-#: i18n.tpl:54
+#: i18n.tpl:55
msgid "Space Station lifter"
msgstr "Ridicătoul Stației Spațiale"
-#: i18n.tpl:55
+#: i18n.tpl:56
msgid "Millionaire"
msgstr "Milionar"
-#: i18n.tpl:56
+#: i18n.tpl:57
msgid "Atlas"
msgstr "Atlas"
-#: i18n.tpl:57
+#: i18n.tpl:58
msgid "Early Bird"
msgstr "Matinal"
-#: i18n.tpl:58
+#: i18n.tpl:59
msgid "Night Owl"
msgstr "Pasăre de noapte"
-#: i18n.tpl:59
+#: i18n.tpl:60
msgid "New Year, New Me"
msgstr "An Nou, Eu Nou"
-#: i18n.tpl:60
+#: i18n.tpl:61
msgid "Phoenix"
msgstr "Phoenix"
-#: i18n.tpl:61
+#: i18n.tpl:62
msgid "Personal Record"
msgstr "Record Personal"
-#: i18n.tpl:62
+#: i18n.tpl:63
msgid "Complete your first workout"
msgstr "Finalizează primul tău antrenament"
-#: i18n.tpl:63
+#: i18n.tpl:64
msgid "Complete 10 workouts"
msgstr "Finalizează 10 antrenamente"
-#: i18n.tpl:64
+#: i18n.tpl:65
msgid "Complete 50 workouts"
msgstr "Finalizează 50 de antrenamente"
-#: i18n.tpl:65
+#: i18n.tpl:66
msgid "Complete 100 workouts"
msgstr "Finalizează 100 de antrenamente"
-#: i18n.tpl:66
+#: i18n.tpl:67
msgid "Complete 200 workouts"
msgstr "Finalizează 200 de antrenamente"
-#: i18n.tpl:67
+#: i18n.tpl:68
msgid "Complete 500 workouts"
msgstr "Finalizează 500 de antrenamente"
-#: i18n.tpl:68
+#: i18n.tpl:69
msgid "Complete 1000 workouts"
msgstr "Finalizează 1000 de antrenamente"
-#: i18n.tpl:69
+#: i18n.tpl:70
msgid "Maintain a 30-day workout streak"
msgstr "Menține o serie de 30 de zile de antrenamente"
-#: i18n.tpl:70
+#: i18n.tpl:71
msgid "Work out on Saturday and Sunday for 4 consecutive weekends"
msgstr "Antrenează-te sâmbătă și duminică timp de 4 weekenduri consecutive"
-#: i18n.tpl:71
+#: i18n.tpl:72
msgid "Lift a cumulative total of 5.000 kg"
msgstr "Ridic un total cumulativ de 5.000 kg"
-#: i18n.tpl:72
+#: i18n.tpl:73
msgid "Lift a cumulative total of 20.000 kg"
msgstr "Ridic un total cumulativ de 20.000 kg"
-#: i18n.tpl:73
+#: i18n.tpl:74
msgid "Lift a cumulative total of 50.000 kg"
msgstr "Ridic un total cumulativ de 50.000 kg"
-#: i18n.tpl:74
+#: i18n.tpl:75
msgid "Lift a cumulative total of 150.000 kg"
msgstr "Ridic un total cumulativ de 150.000 kg"
-#: i18n.tpl:75
+#: i18n.tpl:76
msgid "Lift a cumulative total of 450.000 kg"
msgstr "Ridic un total cumulativ de 450.000 kg"
-#: i18n.tpl:76
+#: i18n.tpl:77
msgid "Lift a cumulative total of 1.000.000 kg"
msgstr "Ridic un total cumulativ de 1.000.000 kg"
-#: i18n.tpl:77
+#: i18n.tpl:78
msgid "Lift a cumulative total of 10.000.000 kg"
msgstr "Ridic un total cumulativ de 10.000.000 kg"
-#: i18n.tpl:78
+#: i18n.tpl:79
msgid "Complete a workout before 6:00 AM"
msgstr "Finalizează un antrenament înainte de 6:00 AM"
-#: i18n.tpl:79
+#: i18n.tpl:80
msgid "Complete a workout after 9:00 PM"
msgstr "Finalizează un antrenament după 9:00 PM"
-#: i18n.tpl:80
+#: i18n.tpl:81
msgid "Work out on January 1st"
msgstr "Antrenează-te pe 1 ianuarie"
-#: i18n.tpl:81
+#: i18n.tpl:82
msgid "Return to training after being inactive for 30 days"
msgstr "Revino la antrenamente după ce ai fost inactiv timp de 30 de zile"
-#: i18n.tpl:82
+#: i18n.tpl:83
msgid "Achieve a new Personal Record on any exercise"
msgstr "Atinge un nou Record Personal la orice exercițiu"
@@ -2032,7 +2064,7 @@ msgstr "Exercițiu"
msgid "Routine will expire soon"
msgstr "Rutina va expira în curând"
-#: manager/models/routine.py:153 manager/models/session.py:145
+#: manager/models/routine.py:154 manager/models/session.py:145
msgid "The start time cannot be after the end time."
msgstr "Ora de începere nu poate fi după ora de finalizare."
@@ -2118,23 +2150,27 @@ msgstr "Antrenament"
msgid "Workout for %s"
msgstr "Antrenament pentru %s"
-#: nutrition/forms.py:62
+#: nutrition/extract_info/off.py:72 nutrition/extract_info/off.py:91
+msgid "Serving"
+msgstr ""
+
+#: nutrition/forms.py:71 nutrition/forms.py:208
msgid "Unit"
msgstr "Unitate"
-#: nutrition/forms.py:170 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:179 nutrition/templates/rate/form.html:77
msgid "Basic caloric intake"
msgstr "Aportul caloric de bază"
-#: nutrition/forms.py:171
+#: nutrition/forms.py:180
msgid "Your basic caloric intake as calculated for your data"
msgstr "Aportul caloric de bază calculat pentru datele tale"
-#: nutrition/forms.py:176
+#: nutrition/forms.py:185
msgid "Additional calories"
msgstr "Calorii adiționale"
-#: nutrition/forms.py:178
+#: nutrition/forms.py:187
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
@@ -2143,13 +2179,31 @@ msgstr ""
"număr negativ)"
#: nutrition/forms.py:209
+msgid "grams (g)"
+msgstr ""
+
+#: nutrition/forms.py:219
msgid "Ingredient"
msgstr "Ingredient"
-#: nutrition/forms.py:213
+#: nutrition/forms.py:223
msgid "Also search for names in English"
msgstr "Caută nume și în engleză"
+#: nutrition/forms.py:239
+msgid "Quantity"
+msgstr ""
+
+#: nutrition/forms.py:241
+msgid "Enter a quantity and choose grams (g) or one of the serving units."
+msgstr ""
+
+#: nutrition/models/ingredient.py:526
+#, fuzzy
+#| msgid "Correction"
+msgid "Portion"
+msgstr "Corectare"
+
#: nutrition/templates/ingredient/email_new.tpl:1
#, python-format
msgid ""
@@ -2200,59 +2254,90 @@ msgstr ""
"când te-ai înregistrat, vei fi notificat când procesul este finalizat cu "
"succes."
-#: nutrition/templates/ingredient/overview.html:38
+#: nutrition/templates/ingredient/overview.html:32
+#: nutrition/templates/ingredient/overview.html:68
+#: nutrition/templates/ingredient/view.html:143
+msgid "Vegan"
+msgstr ""
+
+#: nutrition/templates/ingredient/overview.html:34
+#: nutrition/templates/ingredient/overview.html:79
+#: nutrition/templates/ingredient/view.html:155
+msgid "Vegetarian"
+msgstr ""
+
+#: nutrition/templates/ingredient/overview.html:43
msgid "No ingredients."
msgstr "Nu există ingrediente."
-#: nutrition/templates/ingredient/overview.html:49
+#: nutrition/templates/ingredient/overview.html:54
msgid "Search"
msgstr "Caută"
-#: nutrition/templates/ingredient/view.html:45 nutrition/views/plan.py:237
+#: nutrition/templates/ingredient/overview.html:57
+#, fuzzy
+#| msgid "No filter"
+msgid "Filter"
+msgstr "Fără filtru"
+
+#: nutrition/templates/ingredient/overview.html:83
+msgid "Apply"
+msgstr ""
+
+#: nutrition/templates/ingredient/overview.html:85
+msgid "Reset"
+msgstr ""
+
+#: nutrition/templates/ingredient/view.html:46 nutrition/views/plan.py:236
msgid "Macronutrients"
msgstr "Macronutrienți"
-#: nutrition/templates/ingredient/view.html:54
+#: nutrition/templates/ingredient/view.html:55
msgid "kJ"
msgstr "kJ"
-#: nutrition/templates/ingredient/view.html:70 nutrition/views/plan.py:267
+#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:266
msgid "Sugar content in carbohydrates"
msgstr "Conținutul de zahăr din carbohidrați"
-#: nutrition/templates/ingredient/view.html:75
-#: nutrition/templates/ingredient/view.html:91
-#: nutrition/templates/ingredient/view.html:113
-#: nutrition/templates/ingredient/view.html:123
+#: nutrition/templates/ingredient/view.html:76
+#: nutrition/templates/ingredient/view.html:92
+#: nutrition/templates/ingredient/view.html:114
+#: nutrition/templates/ingredient/view.html:124
msgid "n.A."
msgstr "N/A"
-#: nutrition/templates/ingredient/view.html:86 nutrition/views/plan.py:281
+#: nutrition/templates/ingredient/view.html:87 nutrition/views/plan.py:280
msgid "Saturated fat content in fats"
msgstr "Conținutul de grăsimi saturate din grăsimi"
-#: nutrition/templates/ingredient/view.html:102
+#: nutrition/templates/ingredient/view.html:103
msgid "Others"
msgstr "Altele"
-#: nutrition/templates/ingredient/view.html:108 nutrition/views/plan.py:287
+#: nutrition/templates/ingredient/view.html:109 nutrition/views/plan.py:286
msgid "Fiber"
msgstr "Fibre"
-#: nutrition/templates/ingredient/view.html:118 nutrition/views/plan.py:293
+#: nutrition/templates/ingredient/view.html:119 nutrition/views/plan.py:292
msgid "Sodium"
msgstr "Sodiu"
-#: nutrition/templates/ingredient/view.html:143
-#: nutrition/templates/units/list.html:50 nutrition/views/unit.py:86
+#: nutrition/templates/ingredient/view.html:136
+#, fuzzy
+#| msgid "Date format"
+msgid "Dietary information"
+msgstr "Formatul datei"
+
+#: nutrition/templates/ingredient/view.html:184
msgid "Add new weight unit"
msgstr "Adaugă o nouă unitate de greutate"
-#: nutrition/templates/rate/form.html:25
+#: nutrition/templates/rate/form.html:26
msgid "Basal metabolic rate"
msgstr "Rata metabolică bazală"
-#: nutrition/templates/rate/form.html:26
+#: nutrition/templates/rate/form.html:27
msgid ""
"The basal metabolic rate is the amount of energy expended daily\n"
"at rest. This is the minimum energy needed for the body to function, without "
@@ -2264,15 +2349,15 @@ msgstr ""
"funcționeze, fără\n"
"nicio activitate fizică suplimentară."
-#: nutrition/templates/rate/form.html:37
+#: nutrition/templates/rate/form.html:38
msgid "Your basic metabolic rate is: "
msgstr "Rata ta metabolică bazală este: "
-#: nutrition/templates/rate/form.html:47
+#: nutrition/templates/rate/form.html:48
msgid "Physical activities"
msgstr "Activități fizice"
-#: nutrition/templates/rate/form.html:48
+#: nutrition/templates/rate/form.html:49
msgid ""
"The physical activity level (PAL) is a factor used to to express\n"
"the additional physical activity and is used to calculate the total energy\n"
@@ -2283,11 +2368,11 @@ msgstr ""
"totală\n"
"necesară pe zi."
-#: nutrition/templates/rate/form.html:59
+#: nutrition/templates/rate/form.html:60
msgid "Factor for daily activities: "
msgstr "Factor pentru activitățile zilnice: "
-#: nutrition/templates/rate/form.html:67
+#: nutrition/templates/rate/form.html:68
msgid ""
"The base caloric intake is the amount of calories your metabolism\n"
"needs based on your level of physical activity."
@@ -2295,11 +2380,11 @@ msgstr ""
"Aportul caloric de bază este cantitatea de calorii de care metabolismul tău\n"
"are nevoie pe baza nivelului tău de activitate fizică."
-#: nutrition/templates/rate/form.html:81
+#: nutrition/templates/rate/form.html:82
msgid "Calculate basic caloric intake"
msgstr "Calculează aportul caloric de bază"
-#: nutrition/templates/rate/form.html:88
+#: nutrition/templates/rate/form.html:89
msgid ""
"The total calories are the actual total calories per day. This\n"
"might include e.g. a surplus or deficit if you are bulking or cutting. "
@@ -2311,19 +2396,19 @@ msgstr ""
"musculară sau de definire. Alternativ\n"
"poți introduce tu însuți cantitatea de calorii dacă cunoști valoarea."
-#: nutrition/templates/rate/form.html:102
+#: nutrition/templates/rate/form.html:103
msgid "Transfer basic intake to total daily calories"
msgstr "Transferă aportul de bază la totalul de calorii zilnice"
-#: nutrition/templates/rate/form.html:106
+#: nutrition/templates/rate/form.html:107
msgid "Add additional calories to total daily calories"
msgstr "Adaugă calorii suplimentare la totalul de calorii zilnice"
-#: nutrition/templates/rate/form.html:110
+#: nutrition/templates/rate/form.html:111
msgid "Save total calories to profile"
msgstr "Salvează caloriile totale în profil"
-#: nutrition/templates/rate/form.html:121
+#: nutrition/templates/rate/form.html:122
msgid ""
"Please note that these calculations can only be an\n"
"approximation. If you base your nutrition plan on these values, observe\n"
@@ -2334,48 +2419,48 @@ msgstr ""
"te\n"
"timp de câteva săptămâni și modifică cantitatea totală dacă este necesar."
-#: nutrition/views/ingredient.py:158
+#: nutrition/views/ingredient.py:163
msgid "Add a new ingredient"
msgstr "Adaugă un ingredient nou"
-#: nutrition/views/plan.py:128
+#: nutrition/views/plan.py:127
msgid "Nutritional plan"
msgstr "Plan nutrițional"
-#: nutrition/views/plan.py:130
+#: nutrition/views/plan.py:129
#, python-format
msgid "Nutritional plan for %s"
msgstr "Plan nutrițional pentru %s"
-#: nutrition/views/plan.py:202
+#: nutrition/views/plan.py:201
msgid "<i>This is an empty plan, what did you expect on the PDF?</i>"
msgstr "<i>Acesta este un plan gol, la ce te așteptai pe PDF?</i>"
-#: nutrition/views/plan.py:230
+#: nutrition/views/plan.py:229
msgid "Nutritional data"
msgstr "Date nutriționale"
-#: nutrition/views/plan.py:238
+#: nutrition/views/plan.py:237
msgid "Total"
msgstr "Total"
-#: nutrition/views/plan.py:239
+#: nutrition/views/plan.py:238
msgid "Percent of energy"
msgstr "Procentaj din energie"
-#: nutrition/views/plan.py:240
+#: nutrition/views/plan.py:239
msgid "g per body kg"
msgstr "g per kg-corp"
-#: nutrition/views/unit_ingredient.py:69
+#: nutrition/views/unit_ingredient.py:64
msgid "Add a new weight unit"
msgstr "Adaugă o nouă unitate de greutate"
-#: nutrition/views/unit_ingredient.py:106
+#: nutrition/views/unit_ingredient.py:99
msgid "Edit a weight unit to ingredient connection"
msgstr "Editează conexiunea dintre o unitate de greutate și un ingredient"
-#: nutrition/views/unit_ingredient.py:138
+#: nutrition/views/unit_ingredient.py:129
msgid "Delete?"
msgstr "Șterge?"
@@ -2774,7 +2859,7 @@ msgstr "Cod sursă"
msgid "Translation"
msgstr "Traducere"
-#: utils/generic_views.py:263
+#: utils/generic_views.py:246
msgid "Yes, delete"
msgstr "Da, șterge"
@@ -2828,10 +2913,6 @@ msgstr "Trebuie să introduci greutatea ta"
msgid "Import weight logs"
msgstr "Importă jurnale de greutate"
-#: weight/templates/import_csv_form.html:9
-msgid "Submit"
-msgstr "Trimite"
-
#: weight/templates/import_csv_form.html:15
msgid ""
"Use this import field to import your weight logs into Workout\n"
@@ -2853,8 +2934,8 @@ msgstr ""
"Poți copia și lipi din fișierul tău tabelar în câmpul de text,\n"
"sistemul va încerca să ghicească formatul pentru a-l importa. Singurele "
"lucruri de luat în considerare sunt\n"
-"că prima coloană este <strong>data</strong>, iar a doua este <strong>"
-"greutatea</strong>.\n"
+"că prima coloană este <strong>data</strong>, iar a doua este "
+"<strong>greutatea</strong>.\n"
"Toate celelalte coloane sunt ignorate. Există o limită de 1000 de rânduri.\n"
#: weight/templates/import_csv_form.html:24
@@ -2955,6 +3036,36 @@ msgstr ""
msgid "Re-Submit"
msgstr "Retrimite"
+#~ msgid "Email verification"
+#~ msgstr "Verificarea e-mailului"
+
+#, python-format
+#~ msgid "%(username)s, your email was verified"
+#~ msgstr "%(username)s, e-mailul tău a fost verificat"
+
+#~ msgid "Error, invalid verification token"
+#~ msgstr "Eroare, token de verificare invalid"
+
+#~ msgid "Email Confirmation"
+#~ msgstr "Confirmarea e-mailului"
+
+#, python-format
+#~ msgid "You are almost there, %(username)s!"
+#~ msgstr "Aproape ai terminat, %(username)s!"
+
+#, python-format
+#~ msgid "Please click <a href=\"%(link)s\">here</a> to confirm your email"
+#~ msgstr ""
+#~ "Te rugăm să dai click <a href=\"%(link)s\">aici</a> pentru a-ți confirma "
+#~ "e-mailul"
+
+#, python-format
+#~ msgid "The token expires on %(time)s"
+#~ msgstr "Token-ul expiră pe %(time)s"
+
+#~ msgid "Ingredient weight units"
+#~ msgstr "Unități de greutate pentru ingrediente"
+
#~ msgid "Some way of answering you (e-mail, etc.)"
#~ msgstr "Metodă de contactare (e-mail, etc.)"
@@ -3181,8 +3292,5 @@ msgstr "Retrimite"
#~ msgid "Last 12 months"
#~ msgstr "Ultimele 12 luni"
-#~ msgid "No filter"
-#~ msgstr "Fără filtru"
-
#~ msgid "Days"
#~ msgstr "Zile"
diff --git a/wger/locale/ru/LC_MESSAGES/django.po b/wger/locale/ru/LC_MESSAGES/django.po
index 4973a3055..596d0eb0b 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: 2026-01-17 14:03+0000\n"
+"POT-Creation-Date: 2026-04-10 10:20+0000\n"
"PO-Revision-Date: 2026-01-03 23:01+0000\n"
"Last-Translator: Gevorg Danielyan <[email protected]>\n"
"Language-Team: Russian <https://hosted.weblate.org/projects/wger/web/ru/>\n"
@@ -43,7 +43,7 @@ msgstr ""
#: config/views/gym_config.py:42 core/templates/language/view.html:64
#: core/templates/license/list.html:17
#: core/templates/repetition_unit/list.html:18
-#: core/templates/user/overview.html:204 core/templates/user/overview.html:467
+#: core/templates/user/overview.html:207 core/templates/user/overview.html:470
#: core/templates/weight_unit/list.html:18
#: exercises/templates/categories/admin-overview.html:17
#: exercises/templates/equipment/admin-overview.html:17
@@ -55,30 +55,29 @@ msgstr ""
#: gym/templates/gym/list.html:19 gym/templates/gym/list.html:48
#: gym/templates/gym/member_list.html:94 gym/templates/gym/member_list.html:152
#: gym/templates/gym/member_list.html:190
-#: nutrition/templates/ingredient/view.html:164
-#: nutrition/templates/ingredient/view.html:209
-#: nutrition/templates/units/list.html:19
+#: nutrition/templates/ingredient/view.html:205
+#: nutrition/templates/ingredient/view.html:248
msgid "Edit"
msgstr "Редактировать"
-#: core/forms.py:91 core/templates/navigation.html:271
-#: core/templates/navigation.html:278 core/templates/user/login.html:4
+#: core/forms.py:89 core/templates/navigation.html:268
+#: core/templates/navigation.html:275 core/templates/user/login.html:4
#: core/templates/user/registration_sidebar.html:12
#: software/templates/features.html:82 software/templates/features.html:448
msgid "Login"
msgstr "Войти"
-#: core/forms.py:130 core/forms.py:244 gym/views/export.py:61
+#: core/forms.py:128 core/forms.py:242 gym/views/export.py:61
#: gym/views/gym.py:217
msgid "First name"
msgstr "Имя"
-#: core/forms.py:131 core/forms.py:245 core/templates/user/overview.html:284
+#: core/forms.py:129 core/forms.py:243 core/templates/user/overview.html:287
#: gym/views/export.py:62 gym/views/gym.py:217
msgid "Last name"
msgstr "Фамилия"
-#: core/forms.py:133 core/forms.py:210 core/templates/user/overview.html:288
+#: core/forms.py:131 core/forms.py:208 core/templates/user/overview.html:291
#: gym/models/contract.py:256 gym/models/gym.py:58
#: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:116
#: gym/templates/gym/new_user.html:30 gym/views/export.py:60
@@ -88,55 +87,55 @@ msgstr "Фамилия"
msgid "Email"
msgstr "Электронный адрес"
-#: core/forms.py:134
+#: core/forms.py:132
msgid "Used for password resets and, optionally, e-mail reminders."
msgstr "Используется для сброса пароля и опциональных уведомлений по e-mail."
-#: core/forms.py:138 core/models/profile.py:222
+#: core/forms.py:136 core/models/profile.py:222
#: gym/templates/gym/new_user.html:38
msgid "Date of Birth"
msgstr "Дата рождения"
-#: core/forms.py:177
+#: core/forms.py:175
msgid "Personal data"
msgstr "Персональные данные"
-#: core/forms.py:189
+#: core/forms.py:187
msgid "Workout reminders"
msgstr "Напоминания тренировок"
-#: core/forms.py:196
+#: core/forms.py:194
msgid "Other settings"
msgstr "Другие настройки"
-#: core/forms.py:204 core/views/user.py:614 core/views/user.py:629
-#: core/views/user.py:641 gym/forms.py:73 utils/generic_views.py:143
+#: core/forms.py:202 core/views/user.py:630 core/views/user.py:654
+#: core/views/user.py:668 gym/forms.py:73 utils/generic_views.py:137
msgid "Save"
msgstr "Сохранить"
-#: core/forms.py:211
+#: core/forms.py:209
msgid "Used for password resets and, optionally, email reminders."
msgstr ""
"Необходимо для возобновлений пароля, и выборочно, напоминаний по электронной "
"почте."
-#: core/forms.py:240
+#: core/forms.py:238
msgid "This e-mail address is already in use."
msgstr "Этот электронный адрес уже используется."
-#: core/forms.py:261 gym/templates/gym/new_user.html:26
+#: core/forms.py:259 gym/templates/gym/new_user.html:26
#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:217
msgid "Password"
msgstr "Пароль"
-#: core/forms.py:263
+#: core/forms.py:261
msgid "Please enter your current password."
msgstr "Пожалуйста, введите ваш пароль."
-#: core/forms.py:272 core/templates/language/view.html:70
+#: core/forms.py:270 core/templates/language/view.html:70
#: core/templates/license/list.html:21
#: core/templates/repetition_unit/list.html:22
-#: core/templates/user/overview.html:233
+#: core/templates/user/overview.html:236
#: core/templates/weight_unit/list.html:22
#: exercises/templates/categories/admin-overview.html:21
#: exercises/templates/equipment/admin-overview.html:21
@@ -144,27 +143,30 @@ msgstr "Пожалуйста, введите ваш пароль."
#: gym/templates/admin_notes/list.html:37
#: gym/templates/contract_option/list.html:35
#: gym/templates/contract_type/list.html:36 gym/templates/document/list.html:46
-#: gym/templates/gym/list.html:23 nutrition/templates/ingredient/view.html:168
-#: nutrition/templates/ingredient/view.html:215
-#: nutrition/templates/units/list.html:25
+#: gym/templates/gym/list.html:23 nutrition/templates/ingredient/view.html:209
+#: nutrition/templates/ingredient/view.html:254
msgid "Delete"
msgstr "Удалить"
-#: core/forms.py:281
+#: core/forms.py:279
msgid "Invalid password"
msgstr "Неверный пароль"
-#: core/forms.py:293
+#: core/forms.py:291 core/forms.py:349
msgid "The form is secured with reCAPTCHA"
msgstr "Данная форма защищена reCAPTCHA"
-#: core/forms.py:314 core/forms.py:341 core/templates/navigation.html:272
-#: core/templates/navigation.html:285 core/templates/template.html:123
-#: core/templates/user/login.html:21 core/views/user.py:285
+#: core/forms.py:312 core/forms.py:339 core/templates/navigation.html:269
+#: core/templates/navigation.html:282 core/templates/template.html:113
+#: core/templates/user/login.html:21 core/views/user.py:293
#: software/templates/features.html:87 software/templates/features.html:442
msgid "Register"
msgstr "Зарегистрироваться"
+#: core/forms.py:360 weight/templates/import_csv_form.html:9
+msgid "Submit"
+msgstr "Отправить"
+
#: core/models/language.py:31 core/templates/language/view.html:21
msgid "Language short name"
msgstr "Короткое обозночение языка"
@@ -201,36 +203,36 @@ msgstr "Ссылка"
msgid "Link to license text or other information"
msgstr "Ссылка на текст лицензии или другую информацию"
-#: core/models/profile.py:57
+#: core/models/profile.py:60
#, python-format
msgid "%(birthdate)s is not a valid birthdate"
msgstr "%(birthdate)s это неверно указанная дата рождения"
-#: core/models/profile.py:66
+#: core/models/profile.py:69
msgid "Male"
msgstr "Мужской"
-#: core/models/profile.py:67
+#: core/models/profile.py:70
msgid "Female"
msgstr "Женский"
-#: core/models/profile.py:74
+#: core/models/profile.py:77
msgid "Low"
msgstr "Пониженный"
-#: core/models/profile.py:75
+#: core/models/profile.py:78
msgid "Medium"
msgstr "Средний"
-#: core/models/profile.py:76
+#: core/models/profile.py:79
msgid "High"
msgstr "Высший"
-#: core/models/profile.py:82
+#: core/models/profile.py:85
msgid "Metric (kilogram)"
msgstr "Метрика (килограммы)"
-#: core/models/profile.py:83
+#: core/models/profile.py:86
msgid "Imperial (pound)"
msgstr "Империал (фунты)"
@@ -353,7 +355,7 @@ msgstr "Среднее количество часов в неделю"
msgid "Free time"
msgstr "Свободное время"
-#: core/models/profile.py:320 nutrition/templates/rate/form.html:66
+#: core/models/profile.py:320 nutrition/templates/rate/form.html:67
msgid "Total daily calories"
msgstr "Общая суточная калорийность"
@@ -394,20 +396,45 @@ msgstr ""
msgid "Enable or disable the trophy system for this user"
msgstr ""
-#: core/models/profile.py:446
+#: core/models/profile.py:457
msgid "The sum of all hours has to be 24"
msgstr "Сумма всех часов должна быть 24"
-#: core/models/rep_unit.py:36 core/models/weight_unit.py:42
-#: core/templates/user/overview.html:280 core/views/user.py:589
+#: core/models/rep_unit.py:32 i18n.tpl:30
+msgid "Repetitions"
+msgstr "Повторений"
+
+#: core/models/rep_unit.py:33 core/templates/user/overview.html:82
+#: exercises/templates/history/overview.html:30
+msgid "Time"
+msgstr "Время"
+
+#: core/models/rep_unit.py:34
+#, fuzzy
+#| msgid "Resistance band"
+msgid "Distance"
+msgstr "Эластичная лента"
+
+#: core/models/rep_unit.py:47 core/models/weight_unit.py:42
+#: core/templates/user/overview.html:283 core/views/user.py:605
#: exercises/models/muscle.py:36 gym/models/contract.py:52
#: gym/models/contract.py:103 gym/models/gym.py:46
#: gym/models/user_document.py:84 gym/templates/contract/view.html:50
#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:108
-#: gym/views/gym.py:158 nutrition/templates/ingredient/view.html:151
+#: gym/views/gym.py:158 nutrition/templates/ingredient/view.html:192
msgid "Name"
msgstr "Имя"
+#: core/models/rep_unit.py:53
+#, fuzzy
+#| msgid "Unit"
+msgid "Unit Type"
+msgstr "Секция"
+
+#: core/models/rep_unit.py:54
+msgid "The type of unit (repetitions, time, or distance)"
+msgstr ""
+
#: core/templates/403.html:4
msgid "Forbidden!"
msgstr "Запрещено!"
@@ -439,6 +466,57 @@ msgstr ""
"проблема остается, вы можете обратиться за помощью способами, перечисленными "
"ниже:"
+#: core/templates/account/email/email_confirmation_message.html:81
+msgid "Almost there!"
+msgstr ""
+
+#: core/templates/account/email/email_confirmation_message.html:85
+#, fuzzy, python-format
+#| msgid ""
+#| "You're receiving this e-mail because you requested a password reset for "
+#| "your user account at %(site_name)s."
+msgid ""
+"You're receiving this email because the user \"%(user_display)s\" has given "
+"your email address to register an account on %(site_domain)s."
+msgstr ""
+"Вы получили это электронное письмо, так как Вы запрсили восстановление "
+"пароля для Вашего аккаунта на %(site_name)s."
+
+#: core/templates/account/email/email_confirmation_message.html:93
+msgid ""
+"Your email verification code is listed below. Please enter it in your open "
+"browser window."
+msgstr ""
+
+#: core/templates/account/email/email_confirmation_message.html:100
+#, fuzzy
+#| msgid "Please click the following link to confirm your email: %(link)s"
+msgid "Please click the button below to confirm your email address."
+msgstr ""
+"Пожалуйста, перейдите по ссылке, чтобы подтвердить вашу электронную почту: %"
+"(link)s"
+
+#: core/templates/account/email/email_confirmation_message.html:106
+#, fuzzy
+#| msgid "Unverified email"
+msgid "Confirm email"
+msgstr "Непроверенный адрес электронной почты"
+
+#: core/templates/account/email/email_confirmation_message.html:110
+#, python-format
+msgid ""
+"The link is valid for %(expire_hours)s hours (until %(date)s, %(time)s). You "
+"can request a new one from your profile settings."
+msgstr ""
+
+#: core/templates/account/email/email_confirmation_message.html:116
+msgid "If the button doesn't work, copy and paste this link into your browser:"
+msgstr ""
+
+#: core/templates/account/email/email_confirmation_message.html:125
+msgid "the wger Team"
+msgstr "Команда wger"
+
#: core/templates/base.html:10
#, python-format
msgid ""
@@ -472,55 +550,7 @@ 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 verification"
-msgstr "Подтверждение электронного адреса"
-
-#: core/templates/email_verification/confirm_template.html:18
-#, python-format
-msgid "%(username)s, your email was verified"
-msgstr "%(username)s, ваша почта была подтверждена"
-
-#: 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 "Календарь для %(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 ""
-"Пожалуйста, нажмите <a href=\"%(link)s\"> здесь </a>, чтобы подтвердить вашу "
-"электронную почту"
-
-#: 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 "Срок действия токена истекает через %(time)s"
-
-#: core/templates/email_verification/email_body_html.tpl:14
-#: core/templates/email_verification/email_body_txt.tpl:8
-msgid "the wger Team"
-msgstr "Команда wger"
-
-#: core/templates/email_verification/email_body_txt.tpl:4
-#, python-format
-msgid "Please click the following link to confirm your email: %(link)s"
-msgstr ""
-"Пожалуйста, перейдите по ссылке, чтобы подтвердить вашу электронную почту: "
-"%(link)s"
-
-#: core/templates/language/overview.html:4 core/templates/navigation.html:344
+#: core/templates/language/overview.html:4 core/templates/navigation.html:341
msgid "Languages"
msgstr "Языки"
@@ -529,16 +559,16 @@ msgid "Nothing found."
msgstr "Ничего не найдено."
#: core/templates/language/overview.html:22
-#: nutrition/templates/ingredient/overview.html:38
+#: nutrition/templates/ingredient/overview.html:43
msgid "Add one now."
msgstr "Добавить одну сейчас."
#: core/templates/language/overview.html:34 core/templates/license/list.html:43
-#: core/templates/repetition_unit/list.html:46
-#: core/templates/user/overview.html:344 core/templates/user/overview.html:384
-#: core/templates/user/overview.html:422
-#: core/templates/weight_unit/list.html:46 core/views/languages.py:74
-#: core/views/license.py:66 core/views/repetition_units.py:66
+#: core/templates/repetition_unit/list.html:44
+#: core/templates/user/overview.html:347 core/templates/user/overview.html:387
+#: core/templates/user/overview.html:425
+#: core/templates/weight_unit/list.html:46 core/views/languages.py:77
+#: core/views/license.py:66 core/views/repetition_units.py:76
#: core/views/weight_units.py:66
#: exercises/templates/categories/admin-overview.html:40
#: exercises/templates/equipment/admin-overview.html:39
@@ -551,14 +581,14 @@ msgstr "Добавить одну сейчас."
#: gym/templates/gym/member_list.html:264
#: gym/templates/gym/member_list.html:303
#: mailer/templates/mailer/gym/overview.html:43
-#: nutrition/templates/ingredient/overview.html:60
+#: nutrition/templates/ingredient/overview.html:97
msgid "Add"
msgstr "Добавить"
#: core/templates/language/view.html:61 core/templates/user/api_key.html:41
#: core/templates/user/preferences.html:50 gym/models/contract.py:203
#: gym/templates/contract/view.html:41 gym/templates/gym/member_list.html:270
-#: nutrition/templates/ingredient/view.html:206
+#: nutrition/templates/ingredient/view.html:245
msgid "Options"
msgstr "Опции"
@@ -568,9 +598,9 @@ msgstr "Список лицензий"
#: core/templates/license/list.html:30
#: core/templates/repetition_unit/list.html:32
-#: core/templates/user/overview.html:104 core/templates/user/overview.html:136
-#: core/templates/user/overview.html:185 core/templates/user/overview.html:365
-#: core/templates/user/overview.html:404 core/templates/user/overview.html:448
+#: core/templates/user/overview.html:107 core/templates/user/overview.html:139
+#: core/templates/user/overview.html:188 core/templates/user/overview.html:368
+#: core/templates/user/overview.html:407 core/templates/user/overview.html:451
#: core/templates/weight_unit/list.html:32
#: exercises/templates/categories/admin-overview.html:30
#: exercises/templates/equipment/admin-overview.html:30
@@ -582,11 +612,10 @@ msgstr "Список лицензий"
#: gym/templates/gym/member_list.html:284
#: gym/templates/gym/member_list.html:321
#: mailer/templates/mailer/gym/overview.html:30
-#: nutrition/templates/units/list.html:34
msgid "Nothing found"
msgstr "Ничего не найдено"
-#: core/templates/misc/about.html:4 core/templates/template.html:160
+#: core/templates/misc/about.html:4 core/templates/template.html:150
msgid "Imprint"
msgstr "Отпечаток"
@@ -594,162 +623,157 @@ msgstr "Отпечаток"
msgid "Training"
msgstr "Тренировка"
-#: core/templates/navigation.html:37 core/templates/user/overview.html:25
+#: core/templates/navigation.html:36 core/templates/user/overview.html:28
msgid "Routines"
msgstr "Рутина"
-#: core/templates/navigation.html:45 core/templates/user/overview.html:70
+#: core/templates/navigation.html:44 core/templates/user/overview.html:73
msgid "Calendar"
msgstr "Календарь"
-#: core/templates/navigation.html:55
+#: core/templates/navigation.html:53
msgid "Measurements"
msgstr "Макронутриенты"
-#: core/templates/navigation.html:66 gallery/templates/images/overview.html:6
+#: core/templates/navigation.html:64 gallery/templates/images/overview.html:6
msgid "Gallery"
msgstr "Галерея"
-#: core/templates/navigation.html:72
+#: core/templates/navigation.html:74 core/templates/navigation.html:400
+#: trophies/templates/trophies/overview.html:7
+msgid "Trophies"
+msgstr ""
+
+#: core/templates/navigation.html:79
msgid "Workout templates"
msgstr "Шаблоны тренировок"
-#: core/templates/navigation.html:79
+#: core/templates/navigation.html:86
msgid "Your templates"
msgstr "Ваши шаблоны"
-#: core/templates/navigation.html:88
+#: core/templates/navigation.html:95
msgid "Public templates"
msgstr "Общедоступные шаблоны"
-#: core/templates/navigation.html:96 software/templates/features.html:51
+#: core/templates/navigation.html:103 software/templates/features.html:51
#: software/templates/features.html:480
msgid "Exercises"
msgstr "Упражнения"
-#: core/templates/navigation.html:102 core/templates/navigation.html:176
-#: core/templates/navigation.html:339
+#: core/templates/navigation.html:109 core/templates/navigation.html:336
msgid "Administration"
msgstr "Администрация"
-#: core/templates/navigation.html:106
+#: core/templates/navigation.html:113
msgid "Exercise edit history"
msgstr "История редактирования упражнений"
-#: core/templates/navigation.html:112
+#: core/templates/navigation.html:119
msgid "Equipment"
msgstr "Спортивное оборудование"
-#: core/templates/navigation.html:118
+#: core/templates/navigation.html:125
msgid "Muscles"
msgstr "Мышцы"
-#: core/templates/navigation.html:124
+#: core/templates/navigation.html:131
#: exercises/templates/categories/admin-overview.html:4
msgid "Categories"
msgstr "Категории"
-#: core/templates/navigation.html:139 software/templates/features.html:468
+#: core/templates/navigation.html:146 software/templates/features.html:468
msgid "Nutrition"
msgstr "Питание"
-#: core/templates/navigation.html:147 core/templates/user/overview.html:144
+#: core/templates/navigation.html:154 core/templates/user/overview.html:147
msgid "Nutrition plans"
msgstr "Программы питания"
-#: core/templates/navigation.html:156
+#: core/templates/navigation.html:163
msgid "BMI calculator"
msgstr "Калькулятор индекса массы тела"
-#: core/templates/navigation.html:165 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:172 nutrition/templates/rate/form.html:18
msgid "Daily calories calculator"
msgstr "Калькулятор ежедневных калорий"
-#: core/templates/navigation.html:171
+#: core/templates/navigation.html:178
#: nutrition/templates/ingredient/overview.html:10
msgid "Ingredient overview"
msgstr "Обзор ингредиентов"
-#: core/templates/navigation.html:180 nutrition/templates/units/list.html:6
-msgid "Ingredient weight units"
-msgstr "Единицы веса ингредиентов"
-
-#: core/templates/navigation.html:196 software/templates/features.html:463
+#: core/templates/navigation.html:193 software/templates/features.html:463
msgid "Body weight"
msgstr "Вес тела"
-#: core/templates/navigation.html:203 core/templates/user/overview.html:114
+#: core/templates/navigation.html:200 core/templates/user/overview.html:117
msgid "Weight overview"
msgstr "Обзор веса"
-#: core/templates/navigation.html:217
+#: core/templates/navigation.html:214
msgid "About this software"
msgstr "Об этой программе"
-#: core/templates/navigation.html:223 software/templates/about_us.html:5
+#: core/templates/navigation.html:220 software/templates/about_us.html:5
msgid "Support & Get Involved"
msgstr "Поддерживайте и принимайте участие"
-#: core/templates/navigation.html:229 software/templates/features.html:528
+#: core/templates/navigation.html:226 software/templates/features.html:528
msgid "REST API"
msgstr "REST API"
-#: core/templates/navigation.html:235 utils/models.py:45
+#: core/templates/navigation.html:232 utils/models.py:45
msgid "License"
msgstr "Лицензия"
-#: core/templates/navigation.html:241
+#: core/templates/navigation.html:238
msgid "Developer documentation"
msgstr "Документация для разработчиков"
-#: core/templates/navigation.html:248
+#: core/templates/navigation.html:245
msgid "Get the code"
msgstr "Получить код"
-#: core/templates/navigation.html:255 core/templates/template.html:199
-#: software/templates/features.html:603
+#: core/templates/navigation.html:252 core/templates/template.html:202
+#: software/templates/features.html:614
msgid "Translate"
msgstr "Перевести"
-#: core/templates/navigation.html:292 core/templates/user/login.html:30
+#: core/templates/navigation.html:289 core/templates/user/login.html:30
msgid "Reset password"
msgstr "Восстановить пароль"
-#: core/templates/navigation.html:301 core/templates/navigation.html:329
+#: core/templates/navigation.html:298 core/templates/navigation.html:326
msgid "Logout"
msgstr "Выйти"
-#: core/templates/navigation.html:320
+#: core/templates/navigation.html:317
msgid "My preferences"
msgstr "Мои настройки"
-#: core/templates/navigation.html:352
+#: core/templates/navigation.html:349
msgid "Licenses"
msgstr "Лицензии"
-#: core/templates/navigation.html:360
+#: core/templates/navigation.html:357
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr "Единицы повторения"
-#: core/templates/navigation.html:368 core/templates/weight_unit/list.html:4
-#: nutrition/templates/ingredient/view.html:141
+#: core/templates/navigation.html:365 core/templates/weight_unit/list.html:4
+#: nutrition/templates/ingredient/view.html:182
msgid "Weight units"
msgstr "Единицы веса"
-#: core/templates/navigation.html:376 core/templates/user/list.html:4
+#: core/templates/navigation.html:373 core/templates/user/list.html:4
msgid "User list"
msgstr "Список пользователей"
-#: core/templates/navigation.html:382
+#: core/templates/navigation.html:379
msgid "Gyms"
msgstr "Тренажерные залы"
-#: core/templates/navigation.html:403
-#: trophies/templates/trophies/overview.html:7
-msgid "Trophies"
-msgstr ""
-
#: core/templates/registration/password_reset_complete.html:4
msgid "Password reset complete"
msgstr "Восстановления пароля завершено"
@@ -809,27 +833,31 @@ msgstr "предыдущий"
msgid "next"
msgstr "следующий"
-#: core/templates/template.html:96
+#: core/templates/template.html:86
msgid "Close"
msgstr "Закрыть"
-#: core/templates/template.html:112
+#: core/templates/template.html:102
msgid ""
"You are using a guest account, data entered will be deleted after a week."
msgstr ""
"Вы используете аккаунт для гостей, введенные данные будут удалены через "
"неделю."
-#: core/templates/template.html:117
+#: core/templates/template.html:107
msgid "Create some demo entries"
msgstr "Создайте демо-записи"
-#: core/templates/template.html:165 software/templates/features.html:568
+#: core/templates/template.html:155 software/templates/features.html:568
#: software/templates/tos.html:7
msgid "Terms of service"
msgstr "Условия обслуживания"
-#: core/templates/template_features.html:53 software/templates/features.html:9
+#: core/templates/template.html:181 software/templates/features.html:595
+msgid "Browser language"
+msgstr ""
+
+#: core/templates/template_features.html:46 software/templates/features.html:9
msgid "Features"
msgstr "Особенности"
@@ -889,99 +917,94 @@ msgstr "Нет аккаунта?"
msgid "Forgot password?"
msgstr "Забыли пароль?"
-#: core/templates/user/overview.html:25 core/templates/user/overview.html:68
-#: core/templates/user/overview.html:112 core/templates/user/overview.html:144
-#: core/templates/user/overview.html:348 core/templates/user/overview.html:390
-#: core/templates/user/overview.html:426
+#: core/templates/user/overview.html:28 core/templates/user/overview.html:71
+#: core/templates/user/overview.html:115 core/templates/user/overview.html:147
+#: core/templates/user/overview.html:351 core/templates/user/overview.html:393
+#: core/templates/user/overview.html:429
#, python-format
msgid "last %(number)s"
msgstr "Последние %(number)s"
-#: core/templates/user/overview.html:27 core/templates/user/overview.html:146
-#: core/templates/user/overview.html:343 core/templates/user/overview.html:382
-#: core/templates/user/overview.html:421 gym/templates/gym/member_list.html:226
+#: core/templates/user/overview.html:30 core/templates/user/overview.html:149
+#: core/templates/user/overview.html:346 core/templates/user/overview.html:385
+#: core/templates/user/overview.html:424 gym/templates/gym/member_list.html:226
#: gym/templates/gym/member_list.html:262
#: gym/templates/gym/member_list.html:302
msgid "Overview"
msgstr "Обзор"
-#: core/templates/user/overview.html:34 core/templates/user/overview.html:76
-#: core/templates/user/overview.html:120 core/templates/user/overview.html:152
+#: core/templates/user/overview.html:37 core/templates/user/overview.html:79
+#: core/templates/user/overview.html:123 core/templates/user/overview.html:155
#: manager/helpers.py:88 software/templates/about_us.html:170
#: weight/templates/import_csv_preview.html:13
#: weight/templates/import_csv_preview.html:42 weight/views.py:54
msgid "Date"
msgstr "Дата"
-#: core/templates/user/overview.html:35 core/templates/user/overview.html:153
+#: core/templates/user/overview.html:38 core/templates/user/overview.html:156
#: gym/models/contract.py:58 gym/models/contract.py:109
msgid "Description"
msgstr "Описание"
-#: core/templates/user/overview.html:36
+#: core/templates/user/overview.html:39
msgid "Number of logs (days)"
msgstr "Количество записей (дней)"
-#: core/templates/user/overview.html:37 core/views/user.py:590
+#: core/templates/user/overview.html:40 core/views/user.py:606
#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:158
msgid "Last activity"
msgstr "Последние действия"
-#: core/templates/user/overview.html:58
+#: core/templates/user/overview.html:61
msgid "No workouts found."
msgstr "Тренировок не найдено."
-#: core/templates/user/overview.html:68
+#: core/templates/user/overview.html:71
msgid "Log"
msgstr "Журнал"
-#: core/templates/user/overview.html:77
+#: core/templates/user/overview.html:80
msgid "General impression"
msgstr "Общее впечатление"
-#: core/templates/user/overview.html:78 core/templates/user/overview.html:390
+#: core/templates/user/overview.html:81 core/templates/user/overview.html:393
msgid "Notes"
msgstr "Заметки"
-#: core/templates/user/overview.html:79
-#: exercises/templates/history/overview.html:30
-msgid "Time"
-msgstr "Время"
-
-#: core/templates/user/overview.html:112 core/templates/user/overview.html:121
+#: core/templates/user/overview.html:115 core/templates/user/overview.html:124
#: manager/helpers.py:89 weight/templates/import_csv_preview.html:14
#: weight/templates/import_csv_preview.html:43 weight/views.py:54
msgid "Weight"
msgstr "Вес"
-#: core/templates/user/overview.html:154
-#: nutrition/templates/ingredient/view.html:51 nutrition/views/plan.py:245
+#: core/templates/user/overview.html:157
+#: nutrition/templates/ingredient/view.html:52 nutrition/views/plan.py:244
msgid "Energy"
msgstr "Энергия"
-#: core/templates/user/overview.html:155
-#: nutrition/templates/ingredient/view.html:58 nutrition/views/plan.py:251
+#: core/templates/user/overview.html:158
+#: nutrition/templates/ingredient/view.html:59 nutrition/views/plan.py:250
msgid "Protein"
msgstr "Белки"
-#: core/templates/user/overview.html:156
-#: nutrition/templates/ingredient/view.html:64 nutrition/views/plan.py:259
+#: core/templates/user/overview.html:159
+#: nutrition/templates/ingredient/view.html:65 nutrition/views/plan.py:258
msgid "Carbohydrates"
msgstr "Углеводы"
-#: core/templates/user/overview.html:157
-#: nutrition/templates/ingredient/view.html:80 nutrition/views/plan.py:273
+#: core/templates/user/overview.html:160
+#: nutrition/templates/ingredient/view.html:81 nutrition/views/plan.py:272
msgid "Fat"
msgstr "Жиры"
-#: core/templates/user/overview.html:170
-#: nutrition/templates/ingredient/view.html:53
+#: core/templates/user/overview.html:173
+#: nutrition/templates/ingredient/view.html:54
msgid "kcal"
msgstr "ккал"
-#: core/templates/user/overview.html:201 core/templates/user/overview.html:340
-#: core/templates/user/overview.html:379 core/templates/user/overview.html:418
-#: core/templates/user/overview.html:463 gym/templates/gym/list.html:45
+#: core/templates/user/overview.html:204 core/templates/user/overview.html:343
+#: core/templates/user/overview.html:382 core/templates/user/overview.html:421
+#: core/templates/user/overview.html:466 gym/templates/gym/list.html:45
#: gym/templates/gym/member_list.html:91 gym/templates/gym/member_list.html:149
#: gym/templates/gym/member_list.html:187
#: gym/templates/gym/member_list.html:223
@@ -990,109 +1013,113 @@ msgstr "ккал"
msgid "Actions"
msgstr "Действия"
-#: core/templates/user/overview.html:210
+#: core/templates/user/overview.html:213
msgid "Deactivate user"
msgstr "Деактивировать пользователя"
-#: core/templates/user/overview.html:214
+#: core/templates/user/overview.html:217
msgid "Activate user"
msgstr "Активировать пользователя"
-#: core/templates/user/overview.html:223
+#: core/templates/user/overview.html:226
msgid "Reset user password"
msgstr "Сброс пароля пользователя"
-#: core/templates/user/overview.html:227 gym/templates/gym/member_list.html:30
+#: core/templates/user/overview.html:230 gym/templates/gym/member_list.html:30
msgid "Roles"
msgstr "Роли"
-#: core/templates/user/overview.html:243
+#: core/templates/user/overview.html:246
msgid "Password reset confirmation"
msgstr "Подтверждение восстановления пароля"
-#: core/templates/user/overview.html:247
+#: core/templates/user/overview.html:250
msgid "Do you really want to change this user&#39;s password?"
msgstr "Вы действительно хотите изменить пароль этого пользователя?"
-#: core/templates/user/overview.html:250
+#: core/templates/user/overview.html:253
#: exercises/templates/history/overview.html:106
+#: nutrition/templates/ingredient/view.html:148
+#: nutrition/templates/ingredient/view.html:160
msgid "No"
msgstr "Нет"
-#: core/templates/user/overview.html:251
+#: core/templates/user/overview.html:254
#: exercises/templates/history/overview.html:99
+#: nutrition/templates/ingredient/view.html:146
+#: nutrition/templates/ingredient/view.html:158
msgid "Yes"
msgstr "Да"
-#: core/templates/user/overview.html:272 gym/templates/gym/member_list.html:105
+#: core/templates/user/overview.html:275 gym/templates/gym/member_list.html:105
msgid "Details"
msgstr "Детали"
-#: core/templates/user/overview.html:276 gym/views/export.py:57
-#: manager/helpers.py:89 nutrition/views/plan.py:151
-#: nutrition/views/plan.py:157
+#: core/templates/user/overview.html:279 gym/views/export.py:57
+#: manager/helpers.py:89 nutrition/views/plan.py:150
+#: nutrition/views/plan.py:156
msgid "Nr."
msgstr "№"
-#: core/templates/user/overview.html:298 gym/models/contract.py:287
+#: core/templates/user/overview.html:301 gym/models/contract.py:287
#: gym/models/gym.py:50 gym/templates/contract/view.html:75
#: gym/templates/gym/member_list.html:112 gym/views/export.py:68
msgid "Phone"
msgstr "Телефон"
-#: core/templates/user/overview.html:302 gym/templates/contract/view.html:87
+#: core/templates/user/overview.html:305 gym/templates/contract/view.html:87
#: gym/templates/gym/member_list.html:130
msgid "Address"
msgstr "Адрес"
-#: core/templates/user/overview.html:313
+#: core/templates/user/overview.html:316
msgid "Registered"
msgstr "Зарегистрировано"
-#: core/templates/user/overview.html:317
+#: core/templates/user/overview.html:320
msgid "Last login"
msgstr "Последний вход"
-#: core/templates/user/overview.html:322
+#: core/templates/user/overview.html:325
msgid "Status"
msgstr "Статус"
-#: core/templates/user/overview.html:325
+#: core/templates/user/overview.html:328
msgid "Active"
msgstr "Активные"
-#: core/templates/user/overview.html:327
+#: core/templates/user/overview.html:330
msgid "Inactive"
msgstr "Неактивные"
-#: core/templates/user/overview.html:348 gym/templates/contract/list.html:4
+#: core/templates/user/overview.html:351 gym/templates/contract/list.html:4
#: gym/templates/gym/member_list.html:218
msgid "Contracts"
msgstr "Контакты"
-#: core/templates/user/overview.html:426 gym/templates/document/list.html:4
+#: core/templates/user/overview.html:429 gym/templates/document/list.html:4
msgid "Documents"
msgstr "Документы"
-#: core/templates/user/overview.html:433 gym/templates/document/list.html:33
+#: core/templates/user/overview.html:436 gym/templates/document/list.html:33
msgid "Download"
msgstr "Загрузка"
-#: core/templates/user/overview.html:474 gym/views/admin_config.py:44
+#: core/templates/user/overview.html:477 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:477 gym/models/user_config.py:92
+#: core/templates/user/overview.html:480 gym/models/user_config.py:92
msgid "Include in inactive overview"
msgstr "Включить в обзор неактивных"
-#: core/templates/user/overview.html:510
+#: core/templates/user/overview.html:513
#, python-format
msgid "Admin login is only available for users in %(gym_name)s"
msgstr "Вход администратора доступен только для пользователей в %(gym_name)s"
-#: core/templates/user/overview.html:514
+#: core/templates/user/overview.html:517
msgid "Log in as this user"
msgstr "Войти в систему как этот пользователь"
@@ -1118,7 +1145,7 @@ msgstr ""
"Вам необходимо подтвердить свой адрес электронной почты, чтобы добавлять "
"упражнения"
-#: core/templates/user/preferences.html:55 core/views/user.py:601
+#: core/templates/user/preferences.html:55 core/views/user.py:617
msgid "Change password"
msgstr "Изменить"
@@ -1126,23 +1153,23 @@ msgstr "Изменить"
msgid "Already have an account?"
msgstr ""
-#: core/templatetags/wger_extras.py:142 i18n.tpl:38
+#: core/templatetags/wger_extras.py:142 i18n.tpl:39
msgid "kg"
msgstr "кг"
#: core/templatetags/wger_extras.py:144
-#: nutrition/templates/ingredient/view.html:60
-#: nutrition/templates/ingredient/view.html:66
-#: nutrition/templates/ingredient/view.html:73
-#: nutrition/templates/ingredient/view.html:82
-#: nutrition/templates/ingredient/view.html:89
-#: nutrition/templates/ingredient/view.html:111
-#: nutrition/templates/ingredient/view.html:121
+#: nutrition/templates/ingredient/view.html:61
+#: nutrition/templates/ingredient/view.html:67
+#: nutrition/templates/ingredient/view.html:74
+#: nutrition/templates/ingredient/view.html:83
+#: nutrition/templates/ingredient/view.html:90
+#: nutrition/templates/ingredient/view.html:112
+#: nutrition/templates/ingredient/view.html:122
msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr "г"
-#: core/templatetags/wger_extras.py:147 i18n.tpl:39
+#: core/templatetags/wger_extras.py:147 i18n.tpl:40
msgid "lb"
msgstr "lb"
@@ -1151,36 +1178,35 @@ msgctxt "weight unit, i.e. ounces"
msgid "oz"
msgstr "oz"
-#: core/views/languages.py:85 exercises/views/categories.py:122
+#: core/views/languages.py:88 exercises/views/categories.py:122
#: exercises/views/equipment.py:103 exercises/views/muscles.py:99
-#: nutrition/views/ingredient.py:120 nutrition/views/unit.py:110
+#: nutrition/views/ingredient.py:125
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
+#: core/views/languages.py:96 core/views/license.py:103
+#: core/views/repetition_units.py:114 core/views/weight_units.py:115
#: exercises/views/categories.py:128 exercises/views/muscles.py:106
#: gallery/views/images.py:124 gym/views/admin_notes.py:196
#: gym/views/document.py:206 gym/views/gym.py:481
-#: nutrition/views/ingredient.py:127 nutrition/views/unit.py:117
+#: nutrition/views/ingredient.py:132
#, python-brace-format
msgid "Delete {0}?"
msgstr "Удалить {0}?"
-#: core/views/languages.py:111 core/views/license.py:85
-#: core/views/repetition_units.py:86 core/views/user.py:464
+#: core/views/languages.py:114 core/views/license.py:85
+#: core/views/repetition_units.py:96 core/views/user.py:480
#: core/views/weight_units.py:86 exercises/views/categories.py:98
#: exercises/views/equipment.py:81 exercises/views/muscles.py:87
#: gym/views/admin_notes.py:161 gym/views/config.py:68
#: gym/views/contract.py:186 gym/views/contract_option.py:123
#: gym/views/contract_type.py:123 gym/views/document.py:171
-#: gym/views/gym.py:463 nutrition/views/ingredient.py:146
-#: nutrition/views/unit.py:143
+#: gym/views/gym.py:463 nutrition/views/ingredient.py:151
#, python-brace-format
msgid "Edit {0}"
msgstr "Редактировать {0}"
-#: core/views/misc.py:74
+#: core/views/misc.py:73
msgid ""
"We have created sample workout, workout schedules, weight logs, (body) "
"weight and nutrition plan entries so you can better see what this site can "
@@ -1190,48 +1216,48 @@ msgstr ""
"масс тела и плана питания для наглядного примера возможностей этого сайта. "
"Вы можете их изменить или удалить!"
-#: core/views/user.py:143
+#: core/views/user.py:145
#, python-brace-format
msgid "Account \"{0}\" was successfully deleted"
msgstr "Аккаунт \"{0}\" успешно удален"
-#: core/views/user.py:279
+#: core/views/user.py:287
msgid "You were successfully registered"
msgstr "Вы были успешно зарегистрированы"
-#: core/views/user.py:341
+#: core/views/user.py:357
msgid "Settings successfully updated"
msgstr "Настройки успешно обновлены"
-#: core/views/user.py:380
+#: core/views/user.py:396
msgid "The user was successfully deactivated"
msgstr "Пользователь был успешно отключен"
-#: core/views/user.py:417
+#: core/views/user.py:433
msgid "The user was successfully activated"
msgstr "Пользователь был успешно активирован"
-#: core/views/user.py:432
+#: core/views/user.py:448
msgid "Edit user"
msgstr "Редактирование пользователя"
-#: core/views/user.py:587 gym/templates/gym/member_list.html:26
+#: core/views/user.py:603 gym/templates/gym/member_list.html:26
#: gym/views/gym.py:158
msgid "ID"
msgstr "Идентификация"
-#: core/views/user.py:588 gym/forms.py:95 gym/templates/contract/view.html:55
+#: core/views/user.py:604 gym/forms.py:95 gym/templates/contract/view.html:55
#: gym/templates/gym/member_list.html:27 gym/views/export.py:59
#: gym/views/gym.py:158 gym/views/gym.py:217
msgid "Username"
msgstr "Имя пользователя"
-#: core/views/user.py:591 gym/templates/gym/new_user.html:34
+#: core/views/user.py:607 gym/templates/gym/new_user.html:34
#: gym/views/export.py:58 gym/views/gym.py:217
msgid "Gym"
msgstr "Тренажерный зал"
-#: core/views/user.py:650
+#: core/views/user.py:678
#, python-format
msgid "A verification email was sent to %(email)s"
msgstr "На адрес %(email)s было отправлено электронное письмо с подтверждением"
@@ -1248,16 +1274,16 @@ msgstr "Альтернативное название"
msgid "A more basic name for the muscle"
msgstr "Более простое название для мышцы"
-#: exercises/models/video.py:50
+#: exercises/models/video.py:52
#, python-format
msgid "Maximum file size is %(size)sMB."
msgstr "Максимальный размер файла - %(size)s МБ."
-#: exercises/models/video.py:57 exercises/models/video.py:65
+#: exercises/models/video.py:59 exercises/models/video.py:67
msgid "File type is not supported"
msgstr "Тип файла не поддерживается"
-#: exercises/models/video.py:70
+#: exercises/models/video.py:72
msgid "File is not a valid video"
msgstr "Файл не содержит видеодорожку"
@@ -1328,7 +1354,11 @@ msgstr "Удалить оборудование?"
msgid "Add muscle"
msgstr "Добавить мышцу"
-#: gallery/templates/images/overview.html:72
+#: gallery/forms.py:35
+msgid "If date is left empty, it will be read from the image instead"
+msgstr ""
+
+#: gallery/templates/images/overview.html:69
msgid "Add image"
msgstr "Добавить изображение"
@@ -1396,7 +1426,7 @@ msgid "Contract type"
msgstr "Форма контракта"
#: gym/models/contract.py:211 gym/templates/contract/view.html:59
-#: nutrition/forms.py:58
+#: nutrition/forms.py:67
msgid "Amount"
msgstr "Количество"
@@ -1576,7 +1606,7 @@ msgstr "Электронные почты"
msgid "Add member"
msgstr "Добавить члена"
-#: gym/templates/gym/new_user.html:48 nutrition/templates/rate/form.html:120
+#: gym/templates/gym/new_user.html:48 nutrition/templates/rate/form.html:121
msgid "Info"
msgstr "Информация"
@@ -1750,10 +1780,6 @@ msgstr "Брус для подтягивания"
msgid "Quads"
msgstr "Квадрицепсы"
-#: i18n.tpl:30
-msgid "Repetitions"
-msgstr "Повторений"
-
#: i18n.tpl:31
msgid "Resistance band"
msgstr "Эластичная лента"
@@ -1782,198 +1808,204 @@ msgstr "Трицепс"
msgid "Until Failure"
msgstr "До отказа"
-#: i18n.tpl:40
+#: i18n.tpl:38
+#, fuzzy
+#| msgid "Kilometers"
+msgid "Meters"
+msgstr "Километров"
+
+#: i18n.tpl:41
msgid "none (bodyweight exercise)"
msgstr "Никакое (упражнение с весом тела)"
-#: i18n.tpl:41
+#: i18n.tpl:42
msgid "Beginner"
msgstr ""
-#: i18n.tpl:42
+#: i18n.tpl:43
#, fuzzy
#| msgctxt "As in \"content of an email\""
#| msgid "Content"
msgid "Consistent"
msgstr "Содержание"
-#: i18n.tpl:43
+#: i18n.tpl:44
msgid "Dedicated"
msgstr ""
-#: i18n.tpl:44
+#: i18n.tpl:45
msgid "Obsessed"
msgstr ""
-#: i18n.tpl:45
+#: i18n.tpl:46
msgid "Legend"
msgstr "Условное обозначение"
-#: i18n.tpl:46
+#: i18n.tpl:47
msgid "Veteran"
msgstr ""
-#: i18n.tpl:47
+#: i18n.tpl:48
msgid "Titan"
msgstr ""
-#: i18n.tpl:48
+#: i18n.tpl:49
msgid "Unstoppable"
msgstr ""
-#: i18n.tpl:49
+#: i18n.tpl:50
msgid "Weekend Warrior"
msgstr ""
-#: i18n.tpl:50
+#: i18n.tpl:51
msgid "Elephant lifter"
msgstr ""
-#: i18n.tpl:51
+#: i18n.tpl:52
msgid "Bus lifter"
msgstr ""
-#: i18n.tpl:52
+#: i18n.tpl:53
msgid "Plane lifter"
msgstr ""
-#: i18n.tpl:53
+#: i18n.tpl:54
msgid "Blue whale lifter"
msgstr ""
-#: i18n.tpl:54
+#: i18n.tpl:55
msgid "Space Station lifter"
msgstr ""
-#: i18n.tpl:55
+#: i18n.tpl:56
msgid "Millionaire"
msgstr ""
-#: i18n.tpl:56
+#: i18n.tpl:57
msgid "Atlas"
msgstr ""
-#: i18n.tpl:57
+#: i18n.tpl:58
msgid "Early Bird"
msgstr ""
-#: i18n.tpl:58
+#: i18n.tpl:59
#, fuzzy
#| msgid "Weight log"
msgid "Night Owl"
msgstr "Регистрация веса"
-#: i18n.tpl:59
+#: i18n.tpl:60
msgid "New Year, New Me"
msgstr ""
-#: i18n.tpl:60
+#: i18n.tpl:61
msgid "Phoenix"
msgstr ""
-#: i18n.tpl:61
+#: i18n.tpl:62
#, fuzzy
#| msgid "Personal data"
msgid "Personal Record"
msgstr "Персональные данные"
-#: i18n.tpl:62
+#: i18n.tpl:63
#, fuzzy
#| msgid "Copy workout"
msgid "Complete your first workout"
msgstr "Копировать тренировку"
-#: i18n.tpl:63
+#: i18n.tpl:64
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 10 workouts"
msgstr "Пример тренировки"
-#: i18n.tpl:64
+#: i18n.tpl:65
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 50 workouts"
msgstr "Пример тренировки"
-#: i18n.tpl:65
+#: i18n.tpl:66
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 100 workouts"
msgstr "Пример тренировки"
-#: i18n.tpl:66
+#: i18n.tpl:67
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 200 workouts"
msgstr "Пример тренировки"
-#: i18n.tpl:67
+#: i18n.tpl:68
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 500 workouts"
msgstr "Пример тренировки"
-#: i18n.tpl:68
+#: i18n.tpl:69
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 1000 workouts"
msgstr "Пример тренировки"
-#: i18n.tpl:69
+#: i18n.tpl:70
msgid "Maintain a 30-day workout streak"
msgstr ""
-#: i18n.tpl:70
+#: i18n.tpl:71
msgid "Work out on Saturday and Sunday for 4 consecutive weekends"
msgstr ""
-#: i18n.tpl:71
+#: i18n.tpl:72
msgid "Lift a cumulative total of 5.000 kg"
msgstr ""
-#: i18n.tpl:72
+#: i18n.tpl:73
msgid "Lift a cumulative total of 20.000 kg"
msgstr ""
-#: i18n.tpl:73
+#: i18n.tpl:74
msgid "Lift a cumulative total of 50.000 kg"
msgstr ""
-#: i18n.tpl:74
+#: i18n.tpl:75
msgid "Lift a cumulative total of 150.000 kg"
msgstr ""
-#: i18n.tpl:75
+#: i18n.tpl:76
msgid "Lift a cumulative total of 450.000 kg"
msgstr ""
-#: i18n.tpl:76
+#: i18n.tpl:77
msgid "Lift a cumulative total of 1.000.000 kg"
msgstr ""
-#: i18n.tpl:77
+#: i18n.tpl:78
msgid "Lift a cumulative total of 10.000.000 kg"
msgstr ""
-#: i18n.tpl:78
+#: i18n.tpl:79
msgid "Complete a workout before 6:00 AM"
msgstr ""
-#: i18n.tpl:79
+#: i18n.tpl:80
msgid "Complete a workout after 9:00 PM"
msgstr ""
-#: i18n.tpl:80
+#: i18n.tpl:81
#, fuzzy
#| msgid "Workout for %s"
msgid "Work out on January 1st"
msgstr "Тренировка для %s"
-#: i18n.tpl:81
+#: i18n.tpl:82
msgid "Return to training after being inactive for 30 days"
msgstr ""
-#: i18n.tpl:82
+#: i18n.tpl:83
msgid "Achieve a new Personal Record on any exercise"
msgstr ""
@@ -2060,7 +2092,7 @@ msgstr "Упражнение"
msgid "Routine will expire soon"
msgstr "Срок этой тренировки скоро истечет"
-#: manager/models/routine.py:153 manager/models/session.py:145
+#: manager/models/routine.py:154 manager/models/session.py:145
msgid "The start time cannot be after the end time."
msgstr "Время начала не может быть после времени окончания."
@@ -2144,23 +2176,27 @@ msgstr "Тренировка"
msgid "Workout for %s"
msgstr "Тренировка для %s"
-#: nutrition/forms.py:62
+#: nutrition/extract_info/off.py:72 nutrition/extract_info/off.py:91
+msgid "Serving"
+msgstr ""
+
+#: nutrition/forms.py:71 nutrition/forms.py:208
msgid "Unit"
msgstr "Секция"
-#: nutrition/forms.py:170 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:179 nutrition/templates/rate/form.html:77
msgid "Basic caloric intake"
msgstr "Основное потребление калорий"
-#: nutrition/forms.py:171
+#: nutrition/forms.py:180
msgid "Your basic caloric intake as calculated for your data"
msgstr "Ваше основное потребление калорий, рассчитанное для ваших данных"
-#: nutrition/forms.py:176
+#: nutrition/forms.py:185
msgid "Additional calories"
msgstr "Дополнительные калории"
-#: nutrition/forms.py:178
+#: nutrition/forms.py:187
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
@@ -2169,13 +2205,31 @@ msgstr ""
"введите отрицательное число)"
#: nutrition/forms.py:209
+msgid "grams (g)"
+msgstr ""
+
+#: nutrition/forms.py:219
msgid "Ingredient"
msgstr "Ингредиент"
-#: nutrition/forms.py:213
+#: nutrition/forms.py:223
msgid "Also search for names in English"
msgstr "Также ищите названия на английском"
+#: nutrition/forms.py:239
+msgid "Quantity"
+msgstr ""
+
+#: nutrition/forms.py:241
+msgid "Enter a quantity and choose grams (g) or one of the serving units."
+msgstr ""
+
+#: nutrition/models/ingredient.py:526
+#, fuzzy
+#| msgid "Correction"
+msgid "Portion"
+msgstr "Исправление"
+
#: nutrition/templates/ingredient/email_new.tpl:1
#, python-format
msgid ""
@@ -2220,59 +2274,92 @@ msgstr ""
"не будет видно ни в обзоре, ни в поиске. Если Вы указали Ваш электронный "
"адрес при регистрации, Вы будете уведомлены о удачном завершении процесса."
-#: nutrition/templates/ingredient/overview.html:38
+#: nutrition/templates/ingredient/overview.html:32
+#: nutrition/templates/ingredient/overview.html:68
+#: nutrition/templates/ingredient/view.html:143
+msgid "Vegan"
+msgstr ""
+
+#: nutrition/templates/ingredient/overview.html:34
+#: nutrition/templates/ingredient/overview.html:79
+#: nutrition/templates/ingredient/view.html:155
+#, fuzzy
+#| msgid "Variations"
+msgid "Vegetarian"
+msgstr "Вариации"
+
+#: nutrition/templates/ingredient/overview.html:43
msgid "No ingredients."
msgstr "Ингредиентов нет."
-#: nutrition/templates/ingredient/overview.html:49
+#: nutrition/templates/ingredient/overview.html:54
msgid "Search"
msgstr "Поиск"
-#: nutrition/templates/ingredient/view.html:45 nutrition/views/plan.py:237
+#: nutrition/templates/ingredient/overview.html:57
+#, fuzzy
+#| msgid "No filter"
+msgid "Filter"
+msgstr "Без фильтров"
+
+#: nutrition/templates/ingredient/overview.html:83
+msgid "Apply"
+msgstr ""
+
+#: nutrition/templates/ingredient/overview.html:85
+msgid "Reset"
+msgstr ""
+
+#: nutrition/templates/ingredient/view.html:46 nutrition/views/plan.py:236
msgid "Macronutrients"
msgstr "Макронутриенты"
-#: nutrition/templates/ingredient/view.html:54
+#: nutrition/templates/ingredient/view.html:55
msgid "kJ"
msgstr "кДж"
-#: nutrition/templates/ingredient/view.html:70 nutrition/views/plan.py:267
+#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:266
msgid "Sugar content in carbohydrates"
msgstr "Содержание сахара в углеводах"
-#: nutrition/templates/ingredient/view.html:75
-#: nutrition/templates/ingredient/view.html:91
-#: nutrition/templates/ingredient/view.html:113
-#: nutrition/templates/ingredient/view.html:123
+#: nutrition/templates/ingredient/view.html:76
+#: nutrition/templates/ingredient/view.html:92
+#: nutrition/templates/ingredient/view.html:114
+#: nutrition/templates/ingredient/view.html:124
msgid "n.A."
msgstr "не имеется в наличии"
-#: nutrition/templates/ingredient/view.html:86 nutrition/views/plan.py:281
+#: nutrition/templates/ingredient/view.html:87 nutrition/views/plan.py:280
msgid "Saturated fat content in fats"
msgstr "Содержание насыщенных жиров в жирах"
-#: nutrition/templates/ingredient/view.html:102
+#: nutrition/templates/ingredient/view.html:103
msgid "Others"
msgstr "Другие"
-#: nutrition/templates/ingredient/view.html:108 nutrition/views/plan.py:287
+#: nutrition/templates/ingredient/view.html:109 nutrition/views/plan.py:286
msgid "Fiber"
msgstr "Волокно"
-#: nutrition/templates/ingredient/view.html:118 nutrition/views/plan.py:293
+#: nutrition/templates/ingredient/view.html:119 nutrition/views/plan.py:292
msgid "Sodium"
msgstr "Натрий"
-#: nutrition/templates/ingredient/view.html:143
-#: nutrition/templates/units/list.html:50 nutrition/views/unit.py:86
+#: nutrition/templates/ingredient/view.html:136
+#, fuzzy
+#| msgid "Click here for more information"
+msgid "Dietary information"
+msgstr "Для дополнительной информации жмите сюда"
+
+#: nutrition/templates/ingredient/view.html:184
msgid "Add new weight unit"
msgstr "Добавить новую единицу веса"
-#: nutrition/templates/rate/form.html:25
+#: nutrition/templates/rate/form.html:26
msgid "Basal metabolic rate"
msgstr "Уровень базального метаболизма"
-#: nutrition/templates/rate/form.html:26
+#: nutrition/templates/rate/form.html:27
msgid ""
"The basal metabolic rate is the amount of energy expended daily\n"
"at rest. This is the minimum energy needed for the body to function, without "
@@ -2284,15 +2371,15 @@ msgstr ""
"для функционирования организма , без каких-либо дополнительных физических "
"нагрузок."
-#: nutrition/templates/rate/form.html:37
+#: nutrition/templates/rate/form.html:38
msgid "Your basic metabolic rate is: "
msgstr "Ваша базовая скорость метаболизма: "
-#: nutrition/templates/rate/form.html:47
+#: nutrition/templates/rate/form.html:48
msgid "Physical activities"
msgstr "Физическая деятельность"
-#: nutrition/templates/rate/form.html:48
+#: nutrition/templates/rate/form.html:49
msgid ""
"The physical activity level (PAL) is a factor used to to express\n"
"the additional physical activity and is used to calculate the total energy\n"
@@ -2302,11 +2389,11 @@ msgstr ""
"для выражения дополнительней физической активности и используется для "
"расчета необходимой общей дневной энергии."
-#: nutrition/templates/rate/form.html:59
+#: nutrition/templates/rate/form.html:60
msgid "Factor for daily activities: "
msgstr "Фактор повседневной деятельности: "
-#: nutrition/templates/rate/form.html:67
+#: nutrition/templates/rate/form.html:68
msgid ""
"The base caloric intake is the amount of calories your metabolism\n"
"needs based on your level of physical activity."
@@ -2314,11 +2401,11 @@ msgstr ""
"Базовое потребление калорий - это количество калорий в которых ваш "
"метаболизм нуждается в зависимости от уровня вашей физической активности."
-#: nutrition/templates/rate/form.html:81
+#: nutrition/templates/rate/form.html:82
msgid "Calculate basic caloric intake"
msgstr "Рассчитать основные калорий"
-#: nutrition/templates/rate/form.html:88
+#: nutrition/templates/rate/form.html:89
msgid ""
"The total calories are the actual total calories per day. This\n"
"might include e.g. a surplus or deficit if you are bulking or cutting. "
@@ -2330,19 +2417,19 @@ msgstr ""
"набираете вес. В качестве альтернативы можно просто ввести количество "
"калорий, если оно вам известно."
-#: nutrition/templates/rate/form.html:102
+#: nutrition/templates/rate/form.html:103
msgid "Transfer basic intake to total daily calories"
msgstr "Перенести основное потребление в дневное количество калорий"
-#: nutrition/templates/rate/form.html:106
+#: nutrition/templates/rate/form.html:107
msgid "Add additional calories to total daily calories"
msgstr "Добавить дополнительные калории в суточное количество калорий"
-#: nutrition/templates/rate/form.html:110
+#: nutrition/templates/rate/form.html:111
msgid "Save total calories to profile"
msgstr "Сохранить общее количество калорий в профиль"
-#: nutrition/templates/rate/form.html:121
+#: nutrition/templates/rate/form.html:122
msgid ""
"Please note that these calculations can only be an\n"
"approximation. If you base your nutrition plan on these values, observe\n"
@@ -2352,48 +2439,48 @@ msgstr ""
"вы создаете ваш план питания на этих значениях, понаблюдайте за собой "
"несколько недель и при необходимости измените общее количество."
-#: nutrition/views/ingredient.py:158
+#: nutrition/views/ingredient.py:163
msgid "Add a new ingredient"
msgstr "Добавить новый ингредиент"
-#: nutrition/views/plan.py:128
+#: nutrition/views/plan.py:127
msgid "Nutritional plan"
msgstr "План питания"
-#: nutrition/views/plan.py:130
+#: nutrition/views/plan.py:129
#, python-format
msgid "Nutritional plan for %s"
msgstr "План питания для %s"
-#: nutrition/views/plan.py:202
+#: nutrition/views/plan.py:201
msgid "<i>This is an empty plan, what did you expect on the PDF?</i>"
msgstr "<i>Это пустой план, что Вы ожидали в PDF?</i>"
-#: nutrition/views/plan.py:230
+#: nutrition/views/plan.py:229
msgid "Nutritional data"
msgstr "Пищевые данные"
-#: nutrition/views/plan.py:238
+#: nutrition/views/plan.py:237
msgid "Total"
msgstr "Итого"
-#: nutrition/views/plan.py:239
+#: nutrition/views/plan.py:238
msgid "Percent of energy"
msgstr "Процент энергии"
-#: nutrition/views/plan.py:240
+#: nutrition/views/plan.py:239
msgid "g per body kg"
msgstr "г на кг тела"
-#: nutrition/views/unit_ingredient.py:69
+#: nutrition/views/unit_ingredient.py:64
msgid "Add a new weight unit"
msgstr "Добавить новую единицу веса"
-#: nutrition/views/unit_ingredient.py:106
+#: nutrition/views/unit_ingredient.py:99
msgid "Edit a weight unit to ingredient connection"
msgstr "Изменить единицу веса соединения ингредиентов"
-#: nutrition/views/unit_ingredient.py:138
+#: nutrition/views/unit_ingredient.py:129
msgid "Delete?"
msgstr "Удалить?"
@@ -2811,7 +2898,7 @@ msgstr "Исходный код"
msgid "Translation"
msgstr "Перевод"
-#: utils/generic_views.py:263
+#: utils/generic_views.py:246
msgid "Yes, delete"
msgstr "Да, удалить"
@@ -2872,10 +2959,6 @@ msgstr "Вы должны ввести свой вес"
msgid "Import weight logs"
msgstr "Импортировать журнал веса"
-#: weight/templates/import_csv_form.html:9
-msgid "Submit"
-msgstr "Отправить"
-
#: weight/templates/import_csv_form.html:15
msgid ""
"Use this import field to import your weight logs into Workout\n"
@@ -2996,6 +3079,36 @@ msgstr ""
msgid "Re-Submit"
msgstr "Повторно отправить"
+#~ msgid "Email verification"
+#~ msgstr "Подтверждение электронного адреса"
+
+#, python-format
+#~ msgid "%(username)s, your email was verified"
+#~ msgstr "%(username)s, ваша почта была подтверждена"
+
+#~ msgid "Error, invalid verification token"
+#~ msgstr "Ошибка, неверный токен"
+
+#~ msgid "Email Confirmation"
+#~ msgstr "Подтверждение по электронной почте"
+
+#, python-format
+#~ msgid "You are almost there, %(username)s!"
+#~ msgstr "Календарь для %(username)s"
+
+#, python-format
+#~ msgid "Please click <a href=\"%(link)s\">here</a> to confirm your email"
+#~ msgstr ""
+#~ "Пожалуйста, нажмите <a href=\"%(link)s\"> здесь </a>, чтобы подтвердить "
+#~ "вашу электронную почту"
+
+#, python-format
+#~ msgid "The token expires on %(time)s"
+#~ msgstr "Срок действия токена истекает через %(time)s"
+
+#~ msgid "Ingredient weight units"
+#~ msgstr "Единицы веса ингредиентов"
+
#~ msgid "Image"
#~ msgstr "Изображение"
@@ -3026,9 +3139,6 @@ msgstr "Повторно отправить"
#~ msgid "Secondary muscles"
#~ msgstr "Второстепенные мышцы"
-#~ msgid "Variations"
-#~ msgstr "Вариации"
-
#~ msgid "Exercise Categories"
#~ msgstr "Категории упражнений"
@@ -4089,9 +4199,6 @@ msgstr "Повторно отправить"
#~ msgid "This content is available under the following license:"
#~ msgstr "Это контент доступен в рамках следующей лицензии:"
-#~ msgid "Click here for more information"
-#~ msgstr "Для дополнительной информации жмите сюда"
-
#, fuzzy, python-format
#~| msgid ""
#~| "%(name_original)s is too similar to existing exercise "
@@ -4774,8 +4881,5 @@ msgstr "Повторно отправить"
#~ msgid "Last 12 months"
#~ msgstr "Последние 12 месяцев"
-#~ msgid "No filter"
-#~ msgstr "Без фильтров"
-
#~ msgid "Days"
#~ msgstr "Дни"
diff --git a/wger/locale/sk/LC_MESSAGES/django.po b/wger/locale/sk/LC_MESSAGES/django.po
index 3137de6b2..e4262db24 100644
--- a/wger/locale/sk/LC_MESSAGES/django.po
+++ b/wger/locale/sk/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-01-17 14:03+0000\n"
+"POT-Creation-Date: 2026-04-10 10:20+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
@@ -32,7 +32,7 @@ msgstr ""
#: config/views/gym_config.py:42 core/templates/language/view.html:64
#: core/templates/license/list.html:17
#: core/templates/repetition_unit/list.html:18
-#: core/templates/user/overview.html:204 core/templates/user/overview.html:467
+#: core/templates/user/overview.html:207 core/templates/user/overview.html:470
#: core/templates/weight_unit/list.html:18
#: exercises/templates/categories/admin-overview.html:17
#: exercises/templates/equipment/admin-overview.html:17
@@ -44,30 +44,29 @@ msgstr ""
#: gym/templates/gym/list.html:19 gym/templates/gym/list.html:48
#: gym/templates/gym/member_list.html:94 gym/templates/gym/member_list.html:152
#: gym/templates/gym/member_list.html:190
-#: nutrition/templates/ingredient/view.html:164
-#: nutrition/templates/ingredient/view.html:209
-#: nutrition/templates/units/list.html:19
+#: nutrition/templates/ingredient/view.html:205
+#: nutrition/templates/ingredient/view.html:248
msgid "Edit"
msgstr ""
-#: core/forms.py:91 core/templates/navigation.html:271
-#: core/templates/navigation.html:278 core/templates/user/login.html:4
+#: core/forms.py:89 core/templates/navigation.html:268
+#: core/templates/navigation.html:275 core/templates/user/login.html:4
#: core/templates/user/registration_sidebar.html:12
#: software/templates/features.html:82 software/templates/features.html:448
msgid "Login"
msgstr ""
-#: core/forms.py:130 core/forms.py:244 gym/views/export.py:61
+#: core/forms.py:128 core/forms.py:242 gym/views/export.py:61
#: gym/views/gym.py:217
msgid "First name"
msgstr ""
-#: core/forms.py:131 core/forms.py:245 core/templates/user/overview.html:284
+#: core/forms.py:129 core/forms.py:243 core/templates/user/overview.html:287
#: gym/views/export.py:62 gym/views/gym.py:217
msgid "Last name"
msgstr ""
-#: core/forms.py:133 core/forms.py:210 core/templates/user/overview.html:288
+#: core/forms.py:131 core/forms.py:208 core/templates/user/overview.html:291
#: gym/models/contract.py:256 gym/models/gym.py:58
#: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:116
#: gym/templates/gym/new_user.html:30 gym/views/export.py:60
@@ -77,53 +76,53 @@ msgstr ""
msgid "Email"
msgstr ""
-#: core/forms.py:134
+#: core/forms.py:132
msgid "Used for password resets and, optionally, e-mail reminders."
msgstr ""
-#: core/forms.py:138 core/models/profile.py:222
+#: core/forms.py:136 core/models/profile.py:222
#: gym/templates/gym/new_user.html:38
msgid "Date of Birth"
msgstr ""
-#: core/forms.py:177
+#: core/forms.py:175
msgid "Personal data"
msgstr ""
-#: core/forms.py:189
+#: core/forms.py:187
msgid "Workout reminders"
msgstr ""
-#: core/forms.py:196
+#: core/forms.py:194
msgid "Other settings"
msgstr ""
-#: core/forms.py:204 core/views/user.py:614 core/views/user.py:629
-#: core/views/user.py:641 gym/forms.py:73 utils/generic_views.py:143
+#: core/forms.py:202 core/views/user.py:630 core/views/user.py:654
+#: core/views/user.py:668 gym/forms.py:73 utils/generic_views.py:137
msgid "Save"
msgstr ""
-#: core/forms.py:211
+#: core/forms.py:209
msgid "Used for password resets and, optionally, email reminders."
msgstr ""
-#: core/forms.py:240
+#: core/forms.py:238
msgid "This e-mail address is already in use."
msgstr ""
-#: core/forms.py:261 gym/templates/gym/new_user.html:26
+#: core/forms.py:259 gym/templates/gym/new_user.html:26
#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:217
msgid "Password"
msgstr ""
-#: core/forms.py:263
+#: core/forms.py:261
msgid "Please enter your current password."
msgstr ""
-#: core/forms.py:272 core/templates/language/view.html:70
+#: core/forms.py:270 core/templates/language/view.html:70
#: core/templates/license/list.html:21
#: core/templates/repetition_unit/list.html:22
-#: core/templates/user/overview.html:233
+#: core/templates/user/overview.html:236
#: core/templates/weight_unit/list.html:22
#: exercises/templates/categories/admin-overview.html:21
#: exercises/templates/equipment/admin-overview.html:21
@@ -131,27 +130,30 @@ msgstr ""
#: gym/templates/admin_notes/list.html:37
#: gym/templates/contract_option/list.html:35
#: gym/templates/contract_type/list.html:36 gym/templates/document/list.html:46
-#: gym/templates/gym/list.html:23 nutrition/templates/ingredient/view.html:168
-#: nutrition/templates/ingredient/view.html:215
-#: nutrition/templates/units/list.html:25
+#: gym/templates/gym/list.html:23 nutrition/templates/ingredient/view.html:209
+#: nutrition/templates/ingredient/view.html:254
msgid "Delete"
msgstr ""
-#: core/forms.py:281
+#: core/forms.py:279
msgid "Invalid password"
msgstr ""
-#: core/forms.py:293
+#: core/forms.py:291 core/forms.py:349
msgid "The form is secured with reCAPTCHA"
msgstr ""
-#: core/forms.py:314 core/forms.py:341 core/templates/navigation.html:272
-#: core/templates/navigation.html:285 core/templates/template.html:123
-#: core/templates/user/login.html:21 core/views/user.py:285
+#: core/forms.py:312 core/forms.py:339 core/templates/navigation.html:269
+#: core/templates/navigation.html:282 core/templates/template.html:113
+#: core/templates/user/login.html:21 core/views/user.py:293
#: software/templates/features.html:87 software/templates/features.html:442
msgid "Register"
msgstr ""
+#: core/forms.py:360 weight/templates/import_csv_form.html:9
+msgid "Submit"
+msgstr ""
+
#: core/models/language.py:31 core/templates/language/view.html:21
msgid "Language short name"
msgstr ""
@@ -186,36 +188,36 @@ msgstr ""
msgid "Link to license text or other information"
msgstr ""
-#: core/models/profile.py:57
+#: core/models/profile.py:60
#, python-format
msgid "%(birthdate)s is not a valid birthdate"
msgstr ""
-#: core/models/profile.py:66
+#: core/models/profile.py:69
msgid "Male"
msgstr ""
-#: core/models/profile.py:67
+#: core/models/profile.py:70
msgid "Female"
msgstr ""
-#: core/models/profile.py:74
+#: core/models/profile.py:77
msgid "Low"
msgstr ""
-#: core/models/profile.py:75
+#: core/models/profile.py:78
msgid "Medium"
msgstr ""
-#: core/models/profile.py:76
+#: core/models/profile.py:79
msgid "High"
msgstr ""
-#: core/models/profile.py:82
+#: core/models/profile.py:85
msgid "Metric (kilogram)"
msgstr ""
-#: core/models/profile.py:83
+#: core/models/profile.py:86
msgid "Imperial (pound)"
msgstr ""
@@ -323,7 +325,7 @@ msgstr ""
msgid "Free time"
msgstr ""
-#: core/models/profile.py:320 nutrition/templates/rate/form.html:66
+#: core/models/profile.py:320 nutrition/templates/rate/form.html:67
msgid "Total daily calories"
msgstr ""
@@ -361,20 +363,41 @@ msgstr ""
msgid "Enable or disable the trophy system for this user"
msgstr ""
-#: core/models/profile.py:446
+#: core/models/profile.py:457
msgid "The sum of all hours has to be 24"
msgstr ""
-#: core/models/rep_unit.py:36 core/models/weight_unit.py:42
-#: core/templates/user/overview.html:280 core/views/user.py:589
+#: core/models/rep_unit.py:32 i18n.tpl:30
+msgid "Repetitions"
+msgstr ""
+
+#: core/models/rep_unit.py:33 core/templates/user/overview.html:82
+#: exercises/templates/history/overview.html:30
+msgid "Time"
+msgstr ""
+
+#: core/models/rep_unit.py:34
+msgid "Distance"
+msgstr ""
+
+#: core/models/rep_unit.py:47 core/models/weight_unit.py:42
+#: core/templates/user/overview.html:283 core/views/user.py:605
#: exercises/models/muscle.py:36 gym/models/contract.py:52
#: gym/models/contract.py:103 gym/models/gym.py:46
#: gym/models/user_document.py:84 gym/templates/contract/view.html:50
#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:108
-#: gym/views/gym.py:158 nutrition/templates/ingredient/view.html:151
+#: gym/views/gym.py:158 nutrition/templates/ingredient/view.html:192
msgid "Name"
msgstr ""
+#: core/models/rep_unit.py:53
+msgid "Unit Type"
+msgstr ""
+
+#: core/models/rep_unit.py:54
+msgid "The type of unit (repetitions, time, or distance)"
+msgstr ""
+
#: core/templates/403.html:4
msgid "Forbidden!"
msgstr ""
@@ -402,77 +425,73 @@ msgid ""
"later time. If the problem persists, you can seek help in ways listed below:"
msgstr ""
-#: core/templates/base.html:10
-#, python-format
-msgid ""
-"You are browsing the site as the user \"%(current_user)s\", all actions are "
-"performed on their data."
+#: core/templates/account/email/email_confirmation_message.html:81
+msgid "Almost there!"
msgstr ""
-#: core/templates/base.html:15 core/templates/base_wide.html:12
+#: core/templates/account/email/email_confirmation_message.html:85
#, python-format
-msgid "Back to \"%(target)s\""
+msgid ""
+"You're receiving this email because the user \"%(user_display)s\" has given "
+"your email address to register an account on %(site_domain)s."
msgstr ""
-#: core/templates/base_wide.html:7
-#, python-format
+#: core/templates/account/email/email_confirmation_message.html:93
msgid ""
-"You are\n"
-" browsing the site as the user \"%(current_user)s\", all "
-"actions are performed on\n"
-" their data.\n"
-" "
+"Your email verification code is listed below. Please enter it in your open "
+"browser window."
msgstr ""
-#: core/templates/delete.html:4
-msgid "Are you sure you want to delete this? This action cannot be undone."
+#: core/templates/account/email/email_confirmation_message.html:100
+msgid "Please click the button below to confirm your email address."
msgstr ""
-#: core/templates/email_verification/confirm_template.html:4
-msgid "Email verification"
+#: core/templates/account/email/email_confirmation_message.html:106
+msgid "Confirm email"
msgstr ""
-#: core/templates/email_verification/confirm_template.html:18
+#: core/templates/account/email/email_confirmation_message.html:110
#, python-format
-msgid "%(username)s, your email was verified"
+msgid ""
+"The link is valid for %(expire_hours)s hours (until %(date)s, %(time)s). You "
+"can request a new one from your profile settings."
msgstr ""
-#: core/templates/email_verification/confirm_template.html:22
-msgid "Error, invalid verification token"
+#: core/templates/account/email/email_confirmation_message.html:116
+msgid "If the button doesn't work, copy and paste this link into your browser:"
msgstr ""
-#: core/templates/email_verification/email_body_html.tpl:6
-msgid "Email Confirmation"
+#: core/templates/account/email/email_confirmation_message.html:125
+msgid "the wger Team"
msgstr ""
-#: core/templates/email_verification/email_body_html.tpl:9
-#: core/templates/email_verification/email_body_txt.tpl:3
+#: core/templates/base.html:10
#, python-format
-msgid "You are almost there, %(username)s!"
+msgid ""
+"You are browsing the site as the user \"%(current_user)s\", all actions are "
+"performed on their data."
msgstr ""
-#: core/templates/email_verification/email_body_html.tpl:11
+#: core/templates/base.html:15 core/templates/base_wide.html:12
#, python-format
-msgid "Please click <a href=\"%(link)s\">here</a> to confirm your email"
+msgid "Back to \"%(target)s\""
msgstr ""
-#: core/templates/email_verification/email_body_html.tpl:12
-#: core/templates/email_verification/email_body_txt.tpl:5
+#: core/templates/base_wide.html:7
#, 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"
+msgid ""
+"You are\n"
+" browsing the site as the user \"%(current_user)s\", all "
+"actions are performed on\n"
+" their data.\n"
+" "
msgstr ""
-#: core/templates/email_verification/email_body_txt.tpl:4
-#, python-format
-msgid "Please click the following link to confirm your email: %(link)s"
+#: core/templates/delete.html:4
+msgid "Are you sure you want to delete this? This action cannot be undone."
msgstr ""
-#: core/templates/language/overview.html:4 core/templates/navigation.html:344
+#: core/templates/language/overview.html:4 core/templates/navigation.html:341
msgid "Languages"
msgstr ""
@@ -481,16 +500,16 @@ msgid "Nothing found."
msgstr ""
#: core/templates/language/overview.html:22
-#: nutrition/templates/ingredient/overview.html:38
+#: nutrition/templates/ingredient/overview.html:43
msgid "Add one now."
msgstr ""
#: core/templates/language/overview.html:34 core/templates/license/list.html:43
-#: core/templates/repetition_unit/list.html:46
-#: core/templates/user/overview.html:344 core/templates/user/overview.html:384
-#: core/templates/user/overview.html:422
-#: core/templates/weight_unit/list.html:46 core/views/languages.py:74
-#: core/views/license.py:66 core/views/repetition_units.py:66
+#: core/templates/repetition_unit/list.html:44
+#: core/templates/user/overview.html:347 core/templates/user/overview.html:387
+#: core/templates/user/overview.html:425
+#: core/templates/weight_unit/list.html:46 core/views/languages.py:77
+#: core/views/license.py:66 core/views/repetition_units.py:76
#: core/views/weight_units.py:66
#: exercises/templates/categories/admin-overview.html:40
#: exercises/templates/equipment/admin-overview.html:39
@@ -503,14 +522,14 @@ msgstr ""
#: gym/templates/gym/member_list.html:264
#: gym/templates/gym/member_list.html:303
#: mailer/templates/mailer/gym/overview.html:43
-#: nutrition/templates/ingredient/overview.html:60
+#: nutrition/templates/ingredient/overview.html:97
msgid "Add"
msgstr ""
#: core/templates/language/view.html:61 core/templates/user/api_key.html:41
#: core/templates/user/preferences.html:50 gym/models/contract.py:203
#: gym/templates/contract/view.html:41 gym/templates/gym/member_list.html:270
-#: nutrition/templates/ingredient/view.html:206
+#: nutrition/templates/ingredient/view.html:245
msgid "Options"
msgstr ""
@@ -520,9 +539,9 @@ msgstr ""
#: core/templates/license/list.html:30
#: core/templates/repetition_unit/list.html:32
-#: core/templates/user/overview.html:104 core/templates/user/overview.html:136
-#: core/templates/user/overview.html:185 core/templates/user/overview.html:365
-#: core/templates/user/overview.html:404 core/templates/user/overview.html:448
+#: core/templates/user/overview.html:107 core/templates/user/overview.html:139
+#: core/templates/user/overview.html:188 core/templates/user/overview.html:368
+#: core/templates/user/overview.html:407 core/templates/user/overview.html:451
#: core/templates/weight_unit/list.html:32
#: exercises/templates/categories/admin-overview.html:30
#: exercises/templates/equipment/admin-overview.html:30
@@ -534,11 +553,10 @@ msgstr ""
#: gym/templates/gym/member_list.html:284
#: gym/templates/gym/member_list.html:321
#: mailer/templates/mailer/gym/overview.html:30
-#: nutrition/templates/units/list.html:34
msgid "Nothing found"
msgstr ""
-#: core/templates/misc/about.html:4 core/templates/template.html:160
+#: core/templates/misc/about.html:4 core/templates/template.html:150
msgid "Imprint"
msgstr ""
@@ -546,162 +564,157 @@ msgstr ""
msgid "Training"
msgstr ""
-#: core/templates/navigation.html:37 core/templates/user/overview.html:25
+#: core/templates/navigation.html:36 core/templates/user/overview.html:28
msgid "Routines"
msgstr ""
-#: core/templates/navigation.html:45 core/templates/user/overview.html:70
+#: core/templates/navigation.html:44 core/templates/user/overview.html:73
msgid "Calendar"
msgstr ""
-#: core/templates/navigation.html:55
+#: core/templates/navigation.html:53
msgid "Measurements"
msgstr ""
-#: core/templates/navigation.html:66 gallery/templates/images/overview.html:6
+#: core/templates/navigation.html:64 gallery/templates/images/overview.html:6
msgid "Gallery"
msgstr ""
-#: core/templates/navigation.html:72
-msgid "Workout templates"
+#: core/templates/navigation.html:74 core/templates/navigation.html:400
+#: trophies/templates/trophies/overview.html:7
+msgid "Trophies"
msgstr ""
#: core/templates/navigation.html:79
+msgid "Workout templates"
+msgstr ""
+
+#: core/templates/navigation.html:86
msgid "Your templates"
msgstr ""
-#: core/templates/navigation.html:88
+#: core/templates/navigation.html:95
msgid "Public templates"
msgstr ""
-#: core/templates/navigation.html:96 software/templates/features.html:51
+#: core/templates/navigation.html:103 software/templates/features.html:51
#: software/templates/features.html:480
msgid "Exercises"
msgstr ""
-#: core/templates/navigation.html:102 core/templates/navigation.html:176
-#: core/templates/navigation.html:339
+#: core/templates/navigation.html:109 core/templates/navigation.html:336
msgid "Administration"
msgstr ""
-#: core/templates/navigation.html:106
+#: core/templates/navigation.html:113
msgid "Exercise edit history"
msgstr ""
-#: core/templates/navigation.html:112
+#: core/templates/navigation.html:119
msgid "Equipment"
msgstr ""
-#: core/templates/navigation.html:118
+#: core/templates/navigation.html:125
msgid "Muscles"
msgstr ""
-#: core/templates/navigation.html:124
+#: core/templates/navigation.html:131
#: exercises/templates/categories/admin-overview.html:4
msgid "Categories"
msgstr ""
-#: core/templates/navigation.html:139 software/templates/features.html:468
+#: core/templates/navigation.html:146 software/templates/features.html:468
msgid "Nutrition"
msgstr ""
-#: core/templates/navigation.html:147 core/templates/user/overview.html:144
+#: core/templates/navigation.html:154 core/templates/user/overview.html:147
msgid "Nutrition plans"
msgstr ""
-#: core/templates/navigation.html:156
+#: core/templates/navigation.html:163
msgid "BMI calculator"
msgstr ""
-#: core/templates/navigation.html:165 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:172 nutrition/templates/rate/form.html:18
msgid "Daily calories calculator"
msgstr ""
-#: core/templates/navigation.html:171
+#: core/templates/navigation.html:178
#: nutrition/templates/ingredient/overview.html:10
msgid "Ingredient overview"
msgstr ""
-#: core/templates/navigation.html:180 nutrition/templates/units/list.html:6
-msgid "Ingredient weight units"
-msgstr ""
-
-#: core/templates/navigation.html:196 software/templates/features.html:463
+#: core/templates/navigation.html:193 software/templates/features.html:463
msgid "Body weight"
msgstr ""
-#: core/templates/navigation.html:203 core/templates/user/overview.html:114
+#: core/templates/navigation.html:200 core/templates/user/overview.html:117
msgid "Weight overview"
msgstr ""
-#: core/templates/navigation.html:217
+#: core/templates/navigation.html:214
msgid "About this software"
msgstr ""
-#: core/templates/navigation.html:223 software/templates/about_us.html:5
+#: core/templates/navigation.html:220 software/templates/about_us.html:5
msgid "Support & Get Involved"
msgstr ""
-#: core/templates/navigation.html:229 software/templates/features.html:528
+#: core/templates/navigation.html:226 software/templates/features.html:528
msgid "REST API"
msgstr ""
-#: core/templates/navigation.html:235 utils/models.py:45
+#: core/templates/navigation.html:232 utils/models.py:45
msgid "License"
msgstr ""
-#: core/templates/navigation.html:241
+#: core/templates/navigation.html:238
msgid "Developer documentation"
msgstr ""
-#: core/templates/navigation.html:248
+#: core/templates/navigation.html:245
msgid "Get the code"
msgstr ""
-#: core/templates/navigation.html:255 core/templates/template.html:199
-#: software/templates/features.html:603
+#: core/templates/navigation.html:252 core/templates/template.html:202
+#: software/templates/features.html:614
msgid "Translate"
msgstr ""
-#: core/templates/navigation.html:292 core/templates/user/login.html:30
+#: core/templates/navigation.html:289 core/templates/user/login.html:30
msgid "Reset password"
msgstr ""
-#: core/templates/navigation.html:301 core/templates/navigation.html:329
+#: core/templates/navigation.html:298 core/templates/navigation.html:326
msgid "Logout"
msgstr ""
-#: core/templates/navigation.html:320
+#: core/templates/navigation.html:317
msgid "My preferences"
msgstr ""
-#: core/templates/navigation.html:352
+#: core/templates/navigation.html:349
msgid "Licenses"
msgstr ""
-#: core/templates/navigation.html:360
+#: core/templates/navigation.html:357
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr ""
-#: core/templates/navigation.html:368 core/templates/weight_unit/list.html:4
-#: nutrition/templates/ingredient/view.html:141
+#: core/templates/navigation.html:365 core/templates/weight_unit/list.html:4
+#: nutrition/templates/ingredient/view.html:182
msgid "Weight units"
msgstr ""
-#: core/templates/navigation.html:376 core/templates/user/list.html:4
+#: core/templates/navigation.html:373 core/templates/user/list.html:4
msgid "User list"
msgstr ""
-#: core/templates/navigation.html:382
+#: core/templates/navigation.html:379
msgid "Gyms"
msgstr ""
-#: core/templates/navigation.html:403
-#: trophies/templates/trophies/overview.html:7
-msgid "Trophies"
-msgstr ""
-
#: core/templates/registration/password_reset_complete.html:4
msgid "Password reset complete"
msgstr ""
@@ -757,25 +770,29 @@ msgstr ""
msgid "next"
msgstr ""
-#: core/templates/template.html:96
+#: core/templates/template.html:86
msgid "Close"
msgstr ""
-#: core/templates/template.html:112
+#: core/templates/template.html:102
msgid ""
"You are using a guest account, data entered will be deleted after a week."
msgstr ""
-#: core/templates/template.html:117
+#: core/templates/template.html:107
msgid "Create some demo entries"
msgstr ""
-#: core/templates/template.html:165 software/templates/features.html:568
+#: core/templates/template.html:155 software/templates/features.html:568
#: software/templates/tos.html:7
msgid "Terms of service"
msgstr ""
-#: core/templates/template_features.html:53 software/templates/features.html:9
+#: core/templates/template.html:181 software/templates/features.html:595
+msgid "Browser language"
+msgstr ""
+
+#: core/templates/template_features.html:46 software/templates/features.html:9
msgid "Features"
msgstr ""
@@ -830,99 +847,94 @@ msgstr ""
msgid "Forgot password?"
msgstr ""
-#: core/templates/user/overview.html:25 core/templates/user/overview.html:68
-#: core/templates/user/overview.html:112 core/templates/user/overview.html:144
-#: core/templates/user/overview.html:348 core/templates/user/overview.html:390
-#: core/templates/user/overview.html:426
+#: core/templates/user/overview.html:28 core/templates/user/overview.html:71
+#: core/templates/user/overview.html:115 core/templates/user/overview.html:147
+#: core/templates/user/overview.html:351 core/templates/user/overview.html:393
+#: core/templates/user/overview.html:429
#, python-format
msgid "last %(number)s"
msgstr ""
-#: core/templates/user/overview.html:27 core/templates/user/overview.html:146
-#: core/templates/user/overview.html:343 core/templates/user/overview.html:382
-#: core/templates/user/overview.html:421 gym/templates/gym/member_list.html:226
+#: core/templates/user/overview.html:30 core/templates/user/overview.html:149
+#: core/templates/user/overview.html:346 core/templates/user/overview.html:385
+#: core/templates/user/overview.html:424 gym/templates/gym/member_list.html:226
#: gym/templates/gym/member_list.html:262
#: gym/templates/gym/member_list.html:302
msgid "Overview"
msgstr ""
-#: core/templates/user/overview.html:34 core/templates/user/overview.html:76
-#: core/templates/user/overview.html:120 core/templates/user/overview.html:152
+#: core/templates/user/overview.html:37 core/templates/user/overview.html:79
+#: core/templates/user/overview.html:123 core/templates/user/overview.html:155
#: manager/helpers.py:88 software/templates/about_us.html:170
#: weight/templates/import_csv_preview.html:13
#: weight/templates/import_csv_preview.html:42 weight/views.py:54
msgid "Date"
msgstr ""
-#: core/templates/user/overview.html:35 core/templates/user/overview.html:153
+#: core/templates/user/overview.html:38 core/templates/user/overview.html:156
#: gym/models/contract.py:58 gym/models/contract.py:109
msgid "Description"
msgstr ""
-#: core/templates/user/overview.html:36
+#: core/templates/user/overview.html:39
msgid "Number of logs (days)"
msgstr ""
-#: core/templates/user/overview.html:37 core/views/user.py:590
+#: core/templates/user/overview.html:40 core/views/user.py:606
#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:158
msgid "Last activity"
msgstr ""
-#: core/templates/user/overview.html:58
+#: core/templates/user/overview.html:61
msgid "No workouts found."
msgstr ""
-#: core/templates/user/overview.html:68
+#: core/templates/user/overview.html:71
msgid "Log"
msgstr ""
-#: core/templates/user/overview.html:77
+#: core/templates/user/overview.html:80
msgid "General impression"
msgstr ""
-#: core/templates/user/overview.html:78 core/templates/user/overview.html:390
+#: core/templates/user/overview.html:81 core/templates/user/overview.html:393
msgid "Notes"
msgstr ""
-#: core/templates/user/overview.html:79
-#: exercises/templates/history/overview.html:30
-msgid "Time"
-msgstr ""
-
-#: core/templates/user/overview.html:112 core/templates/user/overview.html:121
+#: core/templates/user/overview.html:115 core/templates/user/overview.html:124
#: manager/helpers.py:89 weight/templates/import_csv_preview.html:14
#: weight/templates/import_csv_preview.html:43 weight/views.py:54
msgid "Weight"
msgstr ""
-#: core/templates/user/overview.html:154
-#: nutrition/templates/ingredient/view.html:51 nutrition/views/plan.py:245
+#: core/templates/user/overview.html:157
+#: nutrition/templates/ingredient/view.html:52 nutrition/views/plan.py:244
msgid "Energy"
msgstr ""
-#: core/templates/user/overview.html:155
-#: nutrition/templates/ingredient/view.html:58 nutrition/views/plan.py:251
+#: core/templates/user/overview.html:158
+#: nutrition/templates/ingredient/view.html:59 nutrition/views/plan.py:250
msgid "Protein"
msgstr ""
-#: core/templates/user/overview.html:156
-#: nutrition/templates/ingredient/view.html:64 nutrition/views/plan.py:259
+#: core/templates/user/overview.html:159
+#: nutrition/templates/ingredient/view.html:65 nutrition/views/plan.py:258
msgid "Carbohydrates"
msgstr ""
-#: core/templates/user/overview.html:157
-#: nutrition/templates/ingredient/view.html:80 nutrition/views/plan.py:273
+#: core/templates/user/overview.html:160
+#: nutrition/templates/ingredient/view.html:81 nutrition/views/plan.py:272
msgid "Fat"
msgstr ""
-#: core/templates/user/overview.html:170
-#: nutrition/templates/ingredient/view.html:53
+#: core/templates/user/overview.html:173
+#: nutrition/templates/ingredient/view.html:54
msgid "kcal"
msgstr ""
-#: core/templates/user/overview.html:201 core/templates/user/overview.html:340
-#: core/templates/user/overview.html:379 core/templates/user/overview.html:418
-#: core/templates/user/overview.html:463 gym/templates/gym/list.html:45
+#: core/templates/user/overview.html:204 core/templates/user/overview.html:343
+#: core/templates/user/overview.html:382 core/templates/user/overview.html:421
+#: core/templates/user/overview.html:466 gym/templates/gym/list.html:45
#: gym/templates/gym/member_list.html:91 gym/templates/gym/member_list.html:149
#: gym/templates/gym/member_list.html:187
#: gym/templates/gym/member_list.html:223
@@ -931,109 +943,113 @@ msgstr ""
msgid "Actions"
msgstr ""
-#: core/templates/user/overview.html:210
+#: core/templates/user/overview.html:213
msgid "Deactivate user"
msgstr ""
-#: core/templates/user/overview.html:214
+#: core/templates/user/overview.html:217
msgid "Activate user"
msgstr ""
-#: core/templates/user/overview.html:223
+#: core/templates/user/overview.html:226
msgid "Reset user password"
msgstr ""
-#: core/templates/user/overview.html:227 gym/templates/gym/member_list.html:30
+#: core/templates/user/overview.html:230 gym/templates/gym/member_list.html:30
msgid "Roles"
msgstr ""
-#: core/templates/user/overview.html:243
+#: core/templates/user/overview.html:246
msgid "Password reset confirmation"
msgstr ""
-#: core/templates/user/overview.html:247
+#: core/templates/user/overview.html:250
msgid "Do you really want to change this user&#39;s password?"
msgstr ""
-#: core/templates/user/overview.html:250
+#: core/templates/user/overview.html:253
#: exercises/templates/history/overview.html:106
+#: nutrition/templates/ingredient/view.html:148
+#: nutrition/templates/ingredient/view.html:160
msgid "No"
msgstr ""
-#: core/templates/user/overview.html:251
+#: core/templates/user/overview.html:254
#: exercises/templates/history/overview.html:99
+#: nutrition/templates/ingredient/view.html:146
+#: nutrition/templates/ingredient/view.html:158
msgid "Yes"
msgstr ""
-#: core/templates/user/overview.html:272 gym/templates/gym/member_list.html:105
+#: core/templates/user/overview.html:275 gym/templates/gym/member_list.html:105
msgid "Details"
msgstr ""
-#: core/templates/user/overview.html:276 gym/views/export.py:57
-#: manager/helpers.py:89 nutrition/views/plan.py:151
-#: nutrition/views/plan.py:157
+#: core/templates/user/overview.html:279 gym/views/export.py:57
+#: manager/helpers.py:89 nutrition/views/plan.py:150
+#: nutrition/views/plan.py:156
msgid "Nr."
msgstr ""
-#: core/templates/user/overview.html:298 gym/models/contract.py:287
+#: core/templates/user/overview.html:301 gym/models/contract.py:287
#: gym/models/gym.py:50 gym/templates/contract/view.html:75
#: gym/templates/gym/member_list.html:112 gym/views/export.py:68
msgid "Phone"
msgstr ""
-#: core/templates/user/overview.html:302 gym/templates/contract/view.html:87
+#: core/templates/user/overview.html:305 gym/templates/contract/view.html:87
#: gym/templates/gym/member_list.html:130
msgid "Address"
msgstr ""
-#: core/templates/user/overview.html:313
+#: core/templates/user/overview.html:316
msgid "Registered"
msgstr ""
-#: core/templates/user/overview.html:317
+#: core/templates/user/overview.html:320
msgid "Last login"
msgstr ""
-#: core/templates/user/overview.html:322
+#: core/templates/user/overview.html:325
msgid "Status"
msgstr ""
-#: core/templates/user/overview.html:325
+#: core/templates/user/overview.html:328
msgid "Active"
msgstr ""
-#: core/templates/user/overview.html:327
+#: core/templates/user/overview.html:330
msgid "Inactive"
msgstr ""
-#: core/templates/user/overview.html:348 gym/templates/contract/list.html:4
+#: core/templates/user/overview.html:351 gym/templates/contract/list.html:4
#: gym/templates/gym/member_list.html:218
msgid "Contracts"
msgstr ""
-#: core/templates/user/overview.html:426 gym/templates/document/list.html:4
+#: core/templates/user/overview.html:429 gym/templates/document/list.html:4
msgid "Documents"
msgstr ""
-#: core/templates/user/overview.html:433 gym/templates/document/list.html:33
+#: core/templates/user/overview.html:436 gym/templates/document/list.html:33
msgid "Download"
msgstr ""
-#: core/templates/user/overview.html:474 gym/views/admin_config.py:44
+#: core/templates/user/overview.html:477 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:477 gym/models/user_config.py:92
+#: core/templates/user/overview.html:480 gym/models/user_config.py:92
msgid "Include in inactive overview"
msgstr ""
-#: core/templates/user/overview.html:510
+#: core/templates/user/overview.html:513
#, python-format
msgid "Admin login is only available for users in %(gym_name)s"
msgstr ""
-#: core/templates/user/overview.html:514
+#: core/templates/user/overview.html:517
msgid "Log in as this user"
msgstr ""
@@ -1057,7 +1073,7 @@ msgstr ""
msgid "You need to verify your email to contribute exercises"
msgstr ""
-#: core/templates/user/preferences.html:55 core/views/user.py:601
+#: core/templates/user/preferences.html:55 core/views/user.py:617
msgid "Change password"
msgstr ""
@@ -1065,23 +1081,23 @@ msgstr ""
msgid "Already have an account?"
msgstr ""
-#: core/templatetags/wger_extras.py:142 i18n.tpl:38
+#: core/templatetags/wger_extras.py:142 i18n.tpl:39
msgid "kg"
msgstr ""
#: core/templatetags/wger_extras.py:144
-#: nutrition/templates/ingredient/view.html:60
-#: nutrition/templates/ingredient/view.html:66
-#: nutrition/templates/ingredient/view.html:73
-#: nutrition/templates/ingredient/view.html:82
-#: nutrition/templates/ingredient/view.html:89
-#: nutrition/templates/ingredient/view.html:111
-#: nutrition/templates/ingredient/view.html:121
+#: nutrition/templates/ingredient/view.html:61
+#: nutrition/templates/ingredient/view.html:67
+#: nutrition/templates/ingredient/view.html:74
+#: nutrition/templates/ingredient/view.html:83
+#: nutrition/templates/ingredient/view.html:90
+#: nutrition/templates/ingredient/view.html:112
+#: nutrition/templates/ingredient/view.html:122
msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr ""
-#: core/templatetags/wger_extras.py:147 i18n.tpl:39
+#: core/templatetags/wger_extras.py:147 i18n.tpl:40
msgid "lb"
msgstr ""
@@ -1090,84 +1106,83 @@ msgctxt "weight unit, i.e. ounces"
msgid "oz"
msgstr ""
-#: core/views/languages.py:85 exercises/views/categories.py:122
+#: core/views/languages.py:88 exercises/views/categories.py:122
#: exercises/views/equipment.py:103 exercises/views/muscles.py:99
-#: nutrition/views/ingredient.py:120 nutrition/views/unit.py:110
+#: nutrition/views/ingredient.py:125
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
+#: core/views/languages.py:96 core/views/license.py:103
+#: core/views/repetition_units.py:114 core/views/weight_units.py:115
#: exercises/views/categories.py:128 exercises/views/muscles.py:106
#: gallery/views/images.py:124 gym/views/admin_notes.py:196
#: gym/views/document.py:206 gym/views/gym.py:481
-#: nutrition/views/ingredient.py:127 nutrition/views/unit.py:117
+#: nutrition/views/ingredient.py:132
#, python-brace-format
msgid "Delete {0}?"
msgstr ""
-#: core/views/languages.py:111 core/views/license.py:85
-#: core/views/repetition_units.py:86 core/views/user.py:464
+#: core/views/languages.py:114 core/views/license.py:85
+#: core/views/repetition_units.py:96 core/views/user.py:480
#: core/views/weight_units.py:86 exercises/views/categories.py:98
#: exercises/views/equipment.py:81 exercises/views/muscles.py:87
#: gym/views/admin_notes.py:161 gym/views/config.py:68
#: gym/views/contract.py:186 gym/views/contract_option.py:123
#: gym/views/contract_type.py:123 gym/views/document.py:171
-#: gym/views/gym.py:463 nutrition/views/ingredient.py:146
-#: nutrition/views/unit.py:143
+#: gym/views/gym.py:463 nutrition/views/ingredient.py:151
#, python-brace-format
msgid "Edit {0}"
msgstr ""
-#: core/views/misc.py:74
+#: core/views/misc.py:73
msgid ""
"We have created sample workout, workout schedules, weight logs, (body) "
"weight and nutrition plan entries so you can better see what this site can "
"do. Feel free to edit or delete them!"
msgstr ""
-#: core/views/user.py:143
+#: core/views/user.py:145
#, python-brace-format
msgid "Account \"{0}\" was successfully deleted"
msgstr ""
-#: core/views/user.py:279
+#: core/views/user.py:287
msgid "You were successfully registered"
msgstr ""
-#: core/views/user.py:341
+#: core/views/user.py:357
msgid "Settings successfully updated"
msgstr ""
-#: core/views/user.py:380
+#: core/views/user.py:396
msgid "The user was successfully deactivated"
msgstr ""
-#: core/views/user.py:417
+#: core/views/user.py:433
msgid "The user was successfully activated"
msgstr ""
-#: core/views/user.py:432
+#: core/views/user.py:448
msgid "Edit user"
msgstr ""
-#: core/views/user.py:587 gym/templates/gym/member_list.html:26
+#: core/views/user.py:603 gym/templates/gym/member_list.html:26
#: gym/views/gym.py:158
msgid "ID"
msgstr ""
-#: core/views/user.py:588 gym/forms.py:95 gym/templates/contract/view.html:55
+#: core/views/user.py:604 gym/forms.py:95 gym/templates/contract/view.html:55
#: gym/templates/gym/member_list.html:27 gym/views/export.py:59
#: gym/views/gym.py:158 gym/views/gym.py:217
msgid "Username"
msgstr ""
-#: core/views/user.py:591 gym/templates/gym/new_user.html:34
+#: core/views/user.py:607 gym/templates/gym/new_user.html:34
#: gym/views/export.py:58 gym/views/gym.py:217
msgid "Gym"
msgstr ""
-#: core/views/user.py:650
+#: core/views/user.py:678
#, python-format
msgid "A verification email was sent to %(email)s"
msgstr ""
@@ -1184,16 +1199,16 @@ msgstr ""
msgid "A more basic name for the muscle"
msgstr ""
-#: exercises/models/video.py:50
+#: exercises/models/video.py:52
#, python-format
msgid "Maximum file size is %(size)sMB."
msgstr ""
-#: exercises/models/video.py:57 exercises/models/video.py:65
+#: exercises/models/video.py:59 exercises/models/video.py:67
msgid "File type is not supported"
msgstr ""
-#: exercises/models/video.py:70
+#: exercises/models/video.py:72
msgid "File is not a valid video"
msgstr ""
@@ -1264,7 +1279,11 @@ msgstr ""
msgid "Add muscle"
msgstr ""
-#: gallery/templates/images/overview.html:72
+#: gallery/forms.py:35
+msgid "If date is left empty, it will be read from the image instead"
+msgstr ""
+
+#: gallery/templates/images/overview.html:69
msgid "Add image"
msgstr ""
@@ -1330,7 +1349,7 @@ msgid "Contract type"
msgstr ""
#: gym/models/contract.py:211 gym/templates/contract/view.html:59
-#: nutrition/forms.py:58
+#: nutrition/forms.py:67
msgid "Amount"
msgstr ""
@@ -1506,7 +1525,7 @@ msgstr ""
msgid "Add member"
msgstr ""
-#: gym/templates/gym/new_user.html:48 nutrition/templates/rate/form.html:120
+#: gym/templates/gym/new_user.html:48 nutrition/templates/rate/form.html:121
msgid "Info"
msgstr ""
@@ -1673,10 +1692,6 @@ msgstr ""
msgid "Quads"
msgstr ""
-#: i18n.tpl:30
-msgid "Repetitions"
-msgstr ""
-
#: i18n.tpl:31
msgid "Resistance band"
msgstr ""
@@ -1705,175 +1720,179 @@ msgstr ""
msgid "Until Failure"
msgstr ""
-#: i18n.tpl:40
-msgid "none (bodyweight exercise)"
+#: i18n.tpl:38
+msgid "Meters"
msgstr ""
#: i18n.tpl:41
-msgid "Beginner"
+msgid "none (bodyweight exercise)"
msgstr ""
#: i18n.tpl:42
-msgid "Consistent"
+msgid "Beginner"
msgstr ""
#: i18n.tpl:43
-msgid "Dedicated"
+msgid "Consistent"
msgstr ""
#: i18n.tpl:44
-msgid "Obsessed"
+msgid "Dedicated"
msgstr ""
#: i18n.tpl:45
-msgid "Legend"
+msgid "Obsessed"
msgstr ""
#: i18n.tpl:46
-msgid "Veteran"
+msgid "Legend"
msgstr ""
#: i18n.tpl:47
-msgid "Titan"
+msgid "Veteran"
msgstr ""
#: i18n.tpl:48
-msgid "Unstoppable"
+msgid "Titan"
msgstr ""
#: i18n.tpl:49
-msgid "Weekend Warrior"
+msgid "Unstoppable"
msgstr ""
#: i18n.tpl:50
-msgid "Elephant lifter"
+msgid "Weekend Warrior"
msgstr ""
#: i18n.tpl:51
-msgid "Bus lifter"
+msgid "Elephant lifter"
msgstr ""
#: i18n.tpl:52
-msgid "Plane lifter"
+msgid "Bus lifter"
msgstr ""
#: i18n.tpl:53
-msgid "Blue whale lifter"
+msgid "Plane lifter"
msgstr ""
#: i18n.tpl:54
-msgid "Space Station lifter"
+msgid "Blue whale lifter"
msgstr ""
#: i18n.tpl:55
-msgid "Millionaire"
+msgid "Space Station lifter"
msgstr ""
#: i18n.tpl:56
-msgid "Atlas"
+msgid "Millionaire"
msgstr ""
#: i18n.tpl:57
-msgid "Early Bird"
+msgid "Atlas"
msgstr ""
#: i18n.tpl:58
-msgid "Night Owl"
+msgid "Early Bird"
msgstr ""
#: i18n.tpl:59
-msgid "New Year, New Me"
+msgid "Night Owl"
msgstr ""
#: i18n.tpl:60
-msgid "Phoenix"
+msgid "New Year, New Me"
msgstr ""
#: i18n.tpl:61
-msgid "Personal Record"
+msgid "Phoenix"
msgstr ""
#: i18n.tpl:62
-msgid "Complete your first workout"
+msgid "Personal Record"
msgstr ""
#: i18n.tpl:63
-msgid "Complete 10 workouts"
+msgid "Complete your first workout"
msgstr ""
#: i18n.tpl:64
-msgid "Complete 50 workouts"
+msgid "Complete 10 workouts"
msgstr ""
#: i18n.tpl:65
-msgid "Complete 100 workouts"
+msgid "Complete 50 workouts"
msgstr ""
#: i18n.tpl:66
-msgid "Complete 200 workouts"
+msgid "Complete 100 workouts"
msgstr ""
#: i18n.tpl:67
-msgid "Complete 500 workouts"
+msgid "Complete 200 workouts"
msgstr ""
#: i18n.tpl:68
-msgid "Complete 1000 workouts"
+msgid "Complete 500 workouts"
msgstr ""
#: i18n.tpl:69
-msgid "Maintain a 30-day workout streak"
+msgid "Complete 1000 workouts"
msgstr ""
#: i18n.tpl:70
-msgid "Work out on Saturday and Sunday for 4 consecutive weekends"
+msgid "Maintain a 30-day workout streak"
msgstr ""
#: i18n.tpl:71
-msgid "Lift a cumulative total of 5.000 kg"
+msgid "Work out on Saturday and Sunday for 4 consecutive weekends"
msgstr ""
#: i18n.tpl:72
-msgid "Lift a cumulative total of 20.000 kg"
+msgid "Lift a cumulative total of 5.000 kg"
msgstr ""
#: i18n.tpl:73
-msgid "Lift a cumulative total of 50.000 kg"
+msgid "Lift a cumulative total of 20.000 kg"
msgstr ""
#: i18n.tpl:74
-msgid "Lift a cumulative total of 150.000 kg"
+msgid "Lift a cumulative total of 50.000 kg"
msgstr ""
#: i18n.tpl:75
-msgid "Lift a cumulative total of 450.000 kg"
+msgid "Lift a cumulative total of 150.000 kg"
msgstr ""
#: i18n.tpl:76
-msgid "Lift a cumulative total of 1.000.000 kg"
+msgid "Lift a cumulative total of 450.000 kg"
msgstr ""
#: i18n.tpl:77
-msgid "Lift a cumulative total of 10.000.000 kg"
+msgid "Lift a cumulative total of 1.000.000 kg"
msgstr ""
#: i18n.tpl:78
-msgid "Complete a workout before 6:00 AM"
+msgid "Lift a cumulative total of 10.000.000 kg"
msgstr ""
#: i18n.tpl:79
-msgid "Complete a workout after 9:00 PM"
+msgid "Complete a workout before 6:00 AM"
msgstr ""
#: i18n.tpl:80
-msgid "Work out on January 1st"
+msgid "Complete a workout after 9:00 PM"
msgstr ""
#: i18n.tpl:81
-msgid "Return to training after being inactive for 30 days"
+msgid "Work out on January 1st"
msgstr ""
#: i18n.tpl:82
+msgid "Return to training after being inactive for 30 days"
+msgstr ""
+
+#: i18n.tpl:83
msgid "Achieve a new Personal Record on any exercise"
msgstr ""
@@ -1955,7 +1974,7 @@ msgstr ""
msgid "Routine will expire soon"
msgstr ""
-#: manager/models/routine.py:153 manager/models/session.py:145
+#: manager/models/routine.py:154 manager/models/session.py:145
msgid "The start time cannot be after the end time."
msgstr ""
@@ -2027,36 +2046,56 @@ msgstr ""
msgid "Workout for %s"
msgstr ""
-#: nutrition/forms.py:62
+#: nutrition/extract_info/off.py:72 nutrition/extract_info/off.py:91
+msgid "Serving"
+msgstr ""
+
+#: nutrition/forms.py:71 nutrition/forms.py:208
msgid "Unit"
msgstr ""
-#: nutrition/forms.py:170 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:179 nutrition/templates/rate/form.html:77
msgid "Basic caloric intake"
msgstr ""
-#: nutrition/forms.py:171
+#: nutrition/forms.py:180
msgid "Your basic caloric intake as calculated for your data"
msgstr ""
-#: nutrition/forms.py:176
+#: nutrition/forms.py:185
msgid "Additional calories"
msgstr ""
-#: nutrition/forms.py:178
+#: nutrition/forms.py:187
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
msgstr ""
#: nutrition/forms.py:209
+msgid "grams (g)"
+msgstr ""
+
+#: nutrition/forms.py:219
msgid "Ingredient"
msgstr ""
-#: nutrition/forms.py:213
+#: nutrition/forms.py:223
msgid "Also search for names in English"
msgstr ""
+#: nutrition/forms.py:239
+msgid "Quantity"
+msgstr ""
+
+#: nutrition/forms.py:241
+msgid "Enter a quantity and choose grams (g) or one of the serving units."
+msgstr ""
+
+#: nutrition/models/ingredient.py:526
+msgid "Portion"
+msgstr ""
+
#: nutrition/templates/ingredient/email_new.tpl:1
#, python-format
msgid ""
@@ -2094,59 +2133,86 @@ msgid ""
"sucessfully."
msgstr ""
-#: nutrition/templates/ingredient/overview.html:38
+#: nutrition/templates/ingredient/overview.html:32
+#: nutrition/templates/ingredient/overview.html:68
+#: nutrition/templates/ingredient/view.html:143
+msgid "Vegan"
+msgstr ""
+
+#: nutrition/templates/ingredient/overview.html:34
+#: nutrition/templates/ingredient/overview.html:79
+#: nutrition/templates/ingredient/view.html:155
+msgid "Vegetarian"
+msgstr ""
+
+#: nutrition/templates/ingredient/overview.html:43
msgid "No ingredients."
msgstr ""
-#: nutrition/templates/ingredient/overview.html:49
+#: nutrition/templates/ingredient/overview.html:54
msgid "Search"
msgstr ""
-#: nutrition/templates/ingredient/view.html:45 nutrition/views/plan.py:237
+#: nutrition/templates/ingredient/overview.html:57
+msgid "Filter"
+msgstr ""
+
+#: nutrition/templates/ingredient/overview.html:83
+msgid "Apply"
+msgstr ""
+
+#: nutrition/templates/ingredient/overview.html:85
+msgid "Reset"
+msgstr ""
+
+#: nutrition/templates/ingredient/view.html:46 nutrition/views/plan.py:236
msgid "Macronutrients"
msgstr ""
-#: nutrition/templates/ingredient/view.html:54
+#: nutrition/templates/ingredient/view.html:55
msgid "kJ"
msgstr ""
-#: nutrition/templates/ingredient/view.html:70 nutrition/views/plan.py:267
+#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:266
msgid "Sugar content in carbohydrates"
msgstr ""
-#: nutrition/templates/ingredient/view.html:75
-#: nutrition/templates/ingredient/view.html:91
-#: nutrition/templates/ingredient/view.html:113
-#: nutrition/templates/ingredient/view.html:123
+#: nutrition/templates/ingredient/view.html:76
+#: nutrition/templates/ingredient/view.html:92
+#: nutrition/templates/ingredient/view.html:114
+#: nutrition/templates/ingredient/view.html:124
msgid "n.A."
msgstr ""
-#: nutrition/templates/ingredient/view.html:86 nutrition/views/plan.py:281
+#: nutrition/templates/ingredient/view.html:87 nutrition/views/plan.py:280
msgid "Saturated fat content in fats"
msgstr ""
-#: nutrition/templates/ingredient/view.html:102
+#: nutrition/templates/ingredient/view.html:103
msgid "Others"
msgstr ""
-#: nutrition/templates/ingredient/view.html:108 nutrition/views/plan.py:287
+#: nutrition/templates/ingredient/view.html:109 nutrition/views/plan.py:286
msgid "Fiber"
msgstr ""
-#: nutrition/templates/ingredient/view.html:118 nutrition/views/plan.py:293
+#: nutrition/templates/ingredient/view.html:119 nutrition/views/plan.py:292
msgid "Sodium"
msgstr ""
-#: nutrition/templates/ingredient/view.html:143
-#: nutrition/templates/units/list.html:50 nutrition/views/unit.py:86
+#: nutrition/templates/ingredient/view.html:136
+msgid "Dietary information"
+msgstr ""
+
+#: nutrition/templates/ingredient/view.html:184
msgid "Add new weight unit"
msgstr ""
-#: nutrition/templates/rate/form.html:25
+#: nutrition/templates/rate/form.html:26
msgid "Basal metabolic rate"
msgstr ""
-#: nutrition/templates/rate/form.html:26
+#: nutrition/templates/rate/form.html:27
msgid ""
"The basal metabolic rate is the amount of energy expended daily\n"
"at rest. This is the minimum energy needed for the body to function, without "
@@ -2154,36 +2220,36 @@ msgid ""
"additional physical activity."
msgstr ""
-#: nutrition/templates/rate/form.html:37
+#: nutrition/templates/rate/form.html:38
msgid "Your basic metabolic rate is: "
msgstr ""
-#: nutrition/templates/rate/form.html:47
+#: nutrition/templates/rate/form.html:48
msgid "Physical activities"
msgstr ""
-#: nutrition/templates/rate/form.html:48
+#: nutrition/templates/rate/form.html:49
msgid ""
"The physical activity level (PAL) is a factor used to to express\n"
"the additional physical activity and is used to calculate the total energy\n"
"required per day."
msgstr ""
-#: nutrition/templates/rate/form.html:59
+#: nutrition/templates/rate/form.html:60
msgid "Factor for daily activities: "
msgstr ""
-#: nutrition/templates/rate/form.html:67
+#: nutrition/templates/rate/form.html:68
msgid ""
"The base caloric intake is the amount of calories your metabolism\n"
"needs based on your level of physical activity."
msgstr ""
-#: nutrition/templates/rate/form.html:81
+#: nutrition/templates/rate/form.html:82
msgid "Calculate basic caloric intake"
msgstr ""
-#: nutrition/templates/rate/form.html:88
+#: nutrition/templates/rate/form.html:89
msgid ""
"The total calories are the actual total calories per day. This\n"
"might include e.g. a surplus or deficit if you are bulking or cutting. "
@@ -2191,67 +2257,67 @@ msgid ""
"you might just enter yourself the amount of calories if you know the value."
msgstr ""
-#: nutrition/templates/rate/form.html:102
+#: nutrition/templates/rate/form.html:103
msgid "Transfer basic intake to total daily calories"
msgstr ""
-#: nutrition/templates/rate/form.html:106
+#: nutrition/templates/rate/form.html:107
msgid "Add additional calories to total daily calories"
msgstr ""
-#: nutrition/templates/rate/form.html:110
+#: nutrition/templates/rate/form.html:111
msgid "Save total calories to profile"
msgstr ""
-#: nutrition/templates/rate/form.html:121
+#: nutrition/templates/rate/form.html:122
msgid ""
"Please note that these calculations can only be an\n"
"approximation. If you base your nutrition plan on these values, observe\n"
"yourself for some weeks and change the total amount if needed."
msgstr ""
-#: nutrition/views/ingredient.py:158
+#: nutrition/views/ingredient.py:163
msgid "Add a new ingredient"
msgstr ""
-#: nutrition/views/plan.py:128
+#: nutrition/views/plan.py:127
msgid "Nutritional plan"
msgstr ""
-#: nutrition/views/plan.py:130
+#: nutrition/views/plan.py:129
#, python-format
msgid "Nutritional plan for %s"
msgstr ""
-#: nutrition/views/plan.py:202
+#: nutrition/views/plan.py:201
msgid "<i>This is an empty plan, what did you expect on the PDF?</i>"
msgstr ""
-#: nutrition/views/plan.py:230
+#: nutrition/views/plan.py:229
msgid "Nutritional data"
msgstr ""
-#: nutrition/views/plan.py:238
+#: nutrition/views/plan.py:237
msgid "Total"
msgstr ""
-#: nutrition/views/plan.py:239
+#: nutrition/views/plan.py:238
msgid "Percent of energy"
msgstr ""
-#: nutrition/views/plan.py:240
+#: nutrition/views/plan.py:239
msgid "g per body kg"
msgstr ""
-#: nutrition/views/unit_ingredient.py:69
+#: nutrition/views/unit_ingredient.py:64
msgid "Add a new weight unit"
msgstr ""
-#: nutrition/views/unit_ingredient.py:106
+#: nutrition/views/unit_ingredient.py:99
msgid "Edit a weight unit to ingredient connection"
msgstr ""
-#: nutrition/views/unit_ingredient.py:138
+#: nutrition/views/unit_ingredient.py:129
msgid "Delete?"
msgstr ""
@@ -2598,7 +2664,7 @@ msgstr ""
msgid "Translation"
msgstr ""
-#: utils/generic_views.py:263
+#: utils/generic_views.py:246
msgid "Yes, delete"
msgstr ""
@@ -2649,10 +2715,6 @@ msgstr ""
msgid "Import weight logs"
msgstr ""
-#: weight/templates/import_csv_form.html:9
-msgid "Submit"
-msgstr ""
-
#: weight/templates/import_csv_form.html:15
msgid ""
"Use this import field to import your weight logs into Workout\n"
diff --git a/wger/locale/sl/LC_MESSAGES/django.po b/wger/locale/sl/LC_MESSAGES/django.po
index b6eaa1c29..d5f912d36 100644
--- a/wger/locale/sl/LC_MESSAGES/django.po
+++ b/wger/locale/sl/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-01-17 14:03+0000\n"
+"POT-Creation-Date: 2026-04-10 10:20+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
@@ -32,7 +32,7 @@ msgstr ""
#: config/views/gym_config.py:42 core/templates/language/view.html:64
#: core/templates/license/list.html:17
#: core/templates/repetition_unit/list.html:18
-#: core/templates/user/overview.html:204 core/templates/user/overview.html:467
+#: core/templates/user/overview.html:207 core/templates/user/overview.html:470
#: core/templates/weight_unit/list.html:18
#: exercises/templates/categories/admin-overview.html:17
#: exercises/templates/equipment/admin-overview.html:17
@@ -44,30 +44,29 @@ msgstr ""
#: gym/templates/gym/list.html:19 gym/templates/gym/list.html:48
#: gym/templates/gym/member_list.html:94 gym/templates/gym/member_list.html:152
#: gym/templates/gym/member_list.html:190
-#: nutrition/templates/ingredient/view.html:164
-#: nutrition/templates/ingredient/view.html:209
-#: nutrition/templates/units/list.html:19
+#: nutrition/templates/ingredient/view.html:205
+#: nutrition/templates/ingredient/view.html:248
msgid "Edit"
msgstr ""
-#: core/forms.py:91 core/templates/navigation.html:271
-#: core/templates/navigation.html:278 core/templates/user/login.html:4
+#: core/forms.py:89 core/templates/navigation.html:268
+#: core/templates/navigation.html:275 core/templates/user/login.html:4
#: core/templates/user/registration_sidebar.html:12
#: software/templates/features.html:82 software/templates/features.html:448
msgid "Login"
msgstr ""
-#: core/forms.py:130 core/forms.py:244 gym/views/export.py:61
+#: core/forms.py:128 core/forms.py:242 gym/views/export.py:61
#: gym/views/gym.py:217
msgid "First name"
msgstr ""
-#: core/forms.py:131 core/forms.py:245 core/templates/user/overview.html:284
+#: core/forms.py:129 core/forms.py:243 core/templates/user/overview.html:287
#: gym/views/export.py:62 gym/views/gym.py:217
msgid "Last name"
msgstr ""
-#: core/forms.py:133 core/forms.py:210 core/templates/user/overview.html:288
+#: core/forms.py:131 core/forms.py:208 core/templates/user/overview.html:291
#: gym/models/contract.py:256 gym/models/gym.py:58
#: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:116
#: gym/templates/gym/new_user.html:30 gym/views/export.py:60
@@ -77,53 +76,53 @@ msgstr ""
msgid "Email"
msgstr ""
-#: core/forms.py:134
+#: core/forms.py:132
msgid "Used for password resets and, optionally, e-mail reminders."
msgstr ""
-#: core/forms.py:138 core/models/profile.py:222
+#: core/forms.py:136 core/models/profile.py:222
#: gym/templates/gym/new_user.html:38
msgid "Date of Birth"
msgstr ""
-#: core/forms.py:177
+#: core/forms.py:175
msgid "Personal data"
msgstr ""
-#: core/forms.py:189
+#: core/forms.py:187
msgid "Workout reminders"
msgstr ""
-#: core/forms.py:196
+#: core/forms.py:194
msgid "Other settings"
msgstr ""
-#: core/forms.py:204 core/views/user.py:614 core/views/user.py:629
-#: core/views/user.py:641 gym/forms.py:73 utils/generic_views.py:143
+#: core/forms.py:202 core/views/user.py:630 core/views/user.py:654
+#: core/views/user.py:668 gym/forms.py:73 utils/generic_views.py:137
msgid "Save"
msgstr ""
-#: core/forms.py:211
+#: core/forms.py:209
msgid "Used for password resets and, optionally, email reminders."
msgstr ""
-#: core/forms.py:240
+#: core/forms.py:238
msgid "This e-mail address is already in use."
msgstr ""
-#: core/forms.py:261 gym/templates/gym/new_user.html:26
+#: core/forms.py:259 gym/templates/gym/new_user.html:26
#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:217
msgid "Password"
msgstr ""
-#: core/forms.py:263
+#: core/forms.py:261
msgid "Please enter your current password."
msgstr ""
-#: core/forms.py:272 core/templates/language/view.html:70
+#: core/forms.py:270 core/templates/language/view.html:70
#: core/templates/license/list.html:21
#: core/templates/repetition_unit/list.html:22
-#: core/templates/user/overview.html:233
+#: core/templates/user/overview.html:236
#: core/templates/weight_unit/list.html:22
#: exercises/templates/categories/admin-overview.html:21
#: exercises/templates/equipment/admin-overview.html:21
@@ -131,27 +130,30 @@ msgstr ""
#: gym/templates/admin_notes/list.html:37
#: gym/templates/contract_option/list.html:35
#: gym/templates/contract_type/list.html:36 gym/templates/document/list.html:46
-#: gym/templates/gym/list.html:23 nutrition/templates/ingredient/view.html:168
-#: nutrition/templates/ingredient/view.html:215
-#: nutrition/templates/units/list.html:25
+#: gym/templates/gym/list.html:23 nutrition/templates/ingredient/view.html:209
+#: nutrition/templates/ingredient/view.html:254
msgid "Delete"
msgstr ""
-#: core/forms.py:281
+#: core/forms.py:279
msgid "Invalid password"
msgstr ""
-#: core/forms.py:293
+#: core/forms.py:291 core/forms.py:349
msgid "The form is secured with reCAPTCHA"
msgstr ""
-#: core/forms.py:314 core/forms.py:341 core/templates/navigation.html:272
-#: core/templates/navigation.html:285 core/templates/template.html:123
-#: core/templates/user/login.html:21 core/views/user.py:285
+#: core/forms.py:312 core/forms.py:339 core/templates/navigation.html:269
+#: core/templates/navigation.html:282 core/templates/template.html:113
+#: core/templates/user/login.html:21 core/views/user.py:293
#: software/templates/features.html:87 software/templates/features.html:442
msgid "Register"
msgstr ""
+#: core/forms.py:360 weight/templates/import_csv_form.html:9
+msgid "Submit"
+msgstr ""
+
#: core/models/language.py:31 core/templates/language/view.html:21
msgid "Language short name"
msgstr ""
@@ -186,36 +188,36 @@ msgstr ""
msgid "Link to license text or other information"
msgstr ""
-#: core/models/profile.py:57
+#: core/models/profile.py:60
#, python-format
msgid "%(birthdate)s is not a valid birthdate"
msgstr ""
-#: core/models/profile.py:66
+#: core/models/profile.py:69
msgid "Male"
msgstr ""
-#: core/models/profile.py:67
+#: core/models/profile.py:70
msgid "Female"
msgstr ""
-#: core/models/profile.py:74
+#: core/models/profile.py:77
msgid "Low"
msgstr ""
-#: core/models/profile.py:75
+#: core/models/profile.py:78
msgid "Medium"
msgstr ""
-#: core/models/profile.py:76
+#: core/models/profile.py:79
msgid "High"
msgstr ""
-#: core/models/profile.py:82
+#: core/models/profile.py:85
msgid "Metric (kilogram)"
msgstr ""
-#: core/models/profile.py:83
+#: core/models/profile.py:86
msgid "Imperial (pound)"
msgstr ""
@@ -323,7 +325,7 @@ msgstr ""
msgid "Free time"
msgstr ""
-#: core/models/profile.py:320 nutrition/templates/rate/form.html:66
+#: core/models/profile.py:320 nutrition/templates/rate/form.html:67
msgid "Total daily calories"
msgstr ""
@@ -361,20 +363,41 @@ msgstr ""
msgid "Enable or disable the trophy system for this user"
msgstr ""
-#: core/models/profile.py:446
+#: core/models/profile.py:457
msgid "The sum of all hours has to be 24"
msgstr ""
-#: core/models/rep_unit.py:36 core/models/weight_unit.py:42
-#: core/templates/user/overview.html:280 core/views/user.py:589
+#: core/models/rep_unit.py:32 i18n.tpl:30
+msgid "Repetitions"
+msgstr ""
+
+#: core/models/rep_unit.py:33 core/templates/user/overview.html:82
+#: exercises/templates/history/overview.html:30
+msgid "Time"
+msgstr ""
+
+#: core/models/rep_unit.py:34
+msgid "Distance"
+msgstr ""
+
+#: core/models/rep_unit.py:47 core/models/weight_unit.py:42
+#: core/templates/user/overview.html:283 core/views/user.py:605
#: exercises/models/muscle.py:36 gym/models/contract.py:52
#: gym/models/contract.py:103 gym/models/gym.py:46
#: gym/models/user_document.py:84 gym/templates/contract/view.html:50
#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:108
-#: gym/views/gym.py:158 nutrition/templates/ingredient/view.html:151
+#: gym/views/gym.py:158 nutrition/templates/ingredient/view.html:192
msgid "Name"
msgstr ""
+#: core/models/rep_unit.py:53
+msgid "Unit Type"
+msgstr ""
+
+#: core/models/rep_unit.py:54
+msgid "The type of unit (repetitions, time, or distance)"
+msgstr ""
+
#: core/templates/403.html:4
msgid "Forbidden!"
msgstr ""
@@ -402,77 +425,73 @@ msgid ""
"later time. If the problem persists, you can seek help in ways listed below:"
msgstr ""
-#: core/templates/base.html:10
-#, python-format
-msgid ""
-"You are browsing the site as the user \"%(current_user)s\", all actions are "
-"performed on their data."
+#: core/templates/account/email/email_confirmation_message.html:81
+msgid "Almost there!"
msgstr ""
-#: core/templates/base.html:15 core/templates/base_wide.html:12
+#: core/templates/account/email/email_confirmation_message.html:85
#, python-format
-msgid "Back to \"%(target)s\""
+msgid ""
+"You're receiving this email because the user \"%(user_display)s\" has given "
+"your email address to register an account on %(site_domain)s."
msgstr ""
-#: core/templates/base_wide.html:7
-#, python-format
+#: core/templates/account/email/email_confirmation_message.html:93
msgid ""
-"You are\n"
-" browsing the site as the user \"%(current_user)s\", all "
-"actions are performed on\n"
-" their data.\n"
-" "
+"Your email verification code is listed below. Please enter it in your open "
+"browser window."
msgstr ""
-#: core/templates/delete.html:4
-msgid "Are you sure you want to delete this? This action cannot be undone."
+#: core/templates/account/email/email_confirmation_message.html:100
+msgid "Please click the button below to confirm your email address."
msgstr ""
-#: core/templates/email_verification/confirm_template.html:4
-msgid "Email verification"
+#: core/templates/account/email/email_confirmation_message.html:106
+msgid "Confirm email"
msgstr ""
-#: core/templates/email_verification/confirm_template.html:18
+#: core/templates/account/email/email_confirmation_message.html:110
#, python-format
-msgid "%(username)s, your email was verified"
+msgid ""
+"The link is valid for %(expire_hours)s hours (until %(date)s, %(time)s). You "
+"can request a new one from your profile settings."
msgstr ""
-#: core/templates/email_verification/confirm_template.html:22
-msgid "Error, invalid verification token"
+#: core/templates/account/email/email_confirmation_message.html:116
+msgid "If the button doesn't work, copy and paste this link into your browser:"
msgstr ""
-#: core/templates/email_verification/email_body_html.tpl:6
-msgid "Email Confirmation"
+#: core/templates/account/email/email_confirmation_message.html:125
+msgid "the wger Team"
msgstr ""
-#: core/templates/email_verification/email_body_html.tpl:9
-#: core/templates/email_verification/email_body_txt.tpl:3
+#: core/templates/base.html:10
#, python-format
-msgid "You are almost there, %(username)s!"
+msgid ""
+"You are browsing the site as the user \"%(current_user)s\", all actions are "
+"performed on their data."
msgstr ""
-#: core/templates/email_verification/email_body_html.tpl:11
+#: core/templates/base.html:15 core/templates/base_wide.html:12
#, python-format
-msgid "Please click <a href=\"%(link)s\">here</a> to confirm your email"
+msgid "Back to \"%(target)s\""
msgstr ""
-#: core/templates/email_verification/email_body_html.tpl:12
-#: core/templates/email_verification/email_body_txt.tpl:5
+#: core/templates/base_wide.html:7
#, 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"
+msgid ""
+"You are\n"
+" browsing the site as the user \"%(current_user)s\", all "
+"actions are performed on\n"
+" their data.\n"
+" "
msgstr ""
-#: core/templates/email_verification/email_body_txt.tpl:4
-#, python-format
-msgid "Please click the following link to confirm your email: %(link)s"
+#: core/templates/delete.html:4
+msgid "Are you sure you want to delete this? This action cannot be undone."
msgstr ""
-#: core/templates/language/overview.html:4 core/templates/navigation.html:344
+#: core/templates/language/overview.html:4 core/templates/navigation.html:341
msgid "Languages"
msgstr ""
@@ -481,16 +500,16 @@ msgid "Nothing found."
msgstr ""
#: core/templates/language/overview.html:22
-#: nutrition/templates/ingredient/overview.html:38
+#: nutrition/templates/ingredient/overview.html:43
msgid "Add one now."
msgstr ""
#: core/templates/language/overview.html:34 core/templates/license/list.html:43
-#: core/templates/repetition_unit/list.html:46
-#: core/templates/user/overview.html:344 core/templates/user/overview.html:384
-#: core/templates/user/overview.html:422
-#: core/templates/weight_unit/list.html:46 core/views/languages.py:74
-#: core/views/license.py:66 core/views/repetition_units.py:66
+#: core/templates/repetition_unit/list.html:44
+#: core/templates/user/overview.html:347 core/templates/user/overview.html:387
+#: core/templates/user/overview.html:425
+#: core/templates/weight_unit/list.html:46 core/views/languages.py:77
+#: core/views/license.py:66 core/views/repetition_units.py:76
#: core/views/weight_units.py:66
#: exercises/templates/categories/admin-overview.html:40
#: exercises/templates/equipment/admin-overview.html:39
@@ -503,14 +522,14 @@ msgstr ""
#: gym/templates/gym/member_list.html:264
#: gym/templates/gym/member_list.html:303
#: mailer/templates/mailer/gym/overview.html:43
-#: nutrition/templates/ingredient/overview.html:60
+#: nutrition/templates/ingredient/overview.html:97
msgid "Add"
msgstr ""
#: core/templates/language/view.html:61 core/templates/user/api_key.html:41
#: core/templates/user/preferences.html:50 gym/models/contract.py:203
#: gym/templates/contract/view.html:41 gym/templates/gym/member_list.html:270
-#: nutrition/templates/ingredient/view.html:206
+#: nutrition/templates/ingredient/view.html:245
msgid "Options"
msgstr ""
@@ -520,9 +539,9 @@ msgstr ""
#: core/templates/license/list.html:30
#: core/templates/repetition_unit/list.html:32
-#: core/templates/user/overview.html:104 core/templates/user/overview.html:136
-#: core/templates/user/overview.html:185 core/templates/user/overview.html:365
-#: core/templates/user/overview.html:404 core/templates/user/overview.html:448
+#: core/templates/user/overview.html:107 core/templates/user/overview.html:139
+#: core/templates/user/overview.html:188 core/templates/user/overview.html:368
+#: core/templates/user/overview.html:407 core/templates/user/overview.html:451
#: core/templates/weight_unit/list.html:32
#: exercises/templates/categories/admin-overview.html:30
#: exercises/templates/equipment/admin-overview.html:30
@@ -534,11 +553,10 @@ msgstr ""
#: gym/templates/gym/member_list.html:284
#: gym/templates/gym/member_list.html:321
#: mailer/templates/mailer/gym/overview.html:30
-#: nutrition/templates/units/list.html:34
msgid "Nothing found"
msgstr ""
-#: core/templates/misc/about.html:4 core/templates/template.html:160
+#: core/templates/misc/about.html:4 core/templates/template.html:150
msgid "Imprint"
msgstr ""
@@ -546,162 +564,157 @@ msgstr ""
msgid "Training"
msgstr ""
-#: core/templates/navigation.html:37 core/templates/user/overview.html:25
+#: core/templates/navigation.html:36 core/templates/user/overview.html:28
msgid "Routines"
msgstr ""
-#: core/templates/navigation.html:45 core/templates/user/overview.html:70
+#: core/templates/navigation.html:44 core/templates/user/overview.html:73
msgid "Calendar"
msgstr ""
-#: core/templates/navigation.html:55
+#: core/templates/navigation.html:53
msgid "Measurements"
msgstr ""
-#: core/templates/navigation.html:66 gallery/templates/images/overview.html:6
+#: core/templates/navigation.html:64 gallery/templates/images/overview.html:6
msgid "Gallery"
msgstr ""
-#: core/templates/navigation.html:72
-msgid "Workout templates"
+#: core/templates/navigation.html:74 core/templates/navigation.html:400
+#: trophies/templates/trophies/overview.html:7
+msgid "Trophies"
msgstr ""
#: core/templates/navigation.html:79
+msgid "Workout templates"
+msgstr ""
+
+#: core/templates/navigation.html:86
msgid "Your templates"
msgstr ""
-#: core/templates/navigation.html:88
+#: core/templates/navigation.html:95
msgid "Public templates"
msgstr ""
-#: core/templates/navigation.html:96 software/templates/features.html:51
+#: core/templates/navigation.html:103 software/templates/features.html:51
#: software/templates/features.html:480
msgid "Exercises"
msgstr ""
-#: core/templates/navigation.html:102 core/templates/navigation.html:176
-#: core/templates/navigation.html:339
+#: core/templates/navigation.html:109 core/templates/navigation.html:336
msgid "Administration"
msgstr ""
-#: core/templates/navigation.html:106
+#: core/templates/navigation.html:113
msgid "Exercise edit history"
msgstr ""
-#: core/templates/navigation.html:112
+#: core/templates/navigation.html:119
msgid "Equipment"
msgstr ""
-#: core/templates/navigation.html:118
+#: core/templates/navigation.html:125
msgid "Muscles"
msgstr ""
-#: core/templates/navigation.html:124
+#: core/templates/navigation.html:131
#: exercises/templates/categories/admin-overview.html:4
msgid "Categories"
msgstr ""
-#: core/templates/navigation.html:139 software/templates/features.html:468
+#: core/templates/navigation.html:146 software/templates/features.html:468
msgid "Nutrition"
msgstr ""
-#: core/templates/navigation.html:147 core/templates/user/overview.html:144
+#: core/templates/navigation.html:154 core/templates/user/overview.html:147
msgid "Nutrition plans"
msgstr ""
-#: core/templates/navigation.html:156
+#: core/templates/navigation.html:163
msgid "BMI calculator"
msgstr ""
-#: core/templates/navigation.html:165 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:172 nutrition/templates/rate/form.html:18
msgid "Daily calories calculator"
msgstr ""
-#: core/templates/navigation.html:171
+#: core/templates/navigation.html:178
#: nutrition/templates/ingredient/overview.html:10
msgid "Ingredient overview"
msgstr ""
-#: core/templates/navigation.html:180 nutrition/templates/units/list.html:6
-msgid "Ingredient weight units"
-msgstr ""
-
-#: core/templates/navigation.html:196 software/templates/features.html:463
+#: core/templates/navigation.html:193 software/templates/features.html:463
msgid "Body weight"
msgstr ""
-#: core/templates/navigation.html:203 core/templates/user/overview.html:114
+#: core/templates/navigation.html:200 core/templates/user/overview.html:117
msgid "Weight overview"
msgstr ""
-#: core/templates/navigation.html:217
+#: core/templates/navigation.html:214
msgid "About this software"
msgstr ""
-#: core/templates/navigation.html:223 software/templates/about_us.html:5
+#: core/templates/navigation.html:220 software/templates/about_us.html:5
msgid "Support & Get Involved"
msgstr ""
-#: core/templates/navigation.html:229 software/templates/features.html:528
+#: core/templates/navigation.html:226 software/templates/features.html:528
msgid "REST API"
msgstr ""
-#: core/templates/navigation.html:235 utils/models.py:45
+#: core/templates/navigation.html:232 utils/models.py:45
msgid "License"
msgstr ""
-#: core/templates/navigation.html:241
+#: core/templates/navigation.html:238
msgid "Developer documentation"
msgstr ""
-#: core/templates/navigation.html:248
+#: core/templates/navigation.html:245
msgid "Get the code"
msgstr ""
-#: core/templates/navigation.html:255 core/templates/template.html:199
-#: software/templates/features.html:603
+#: core/templates/navigation.html:252 core/templates/template.html:202
+#: software/templates/features.html:614
msgid "Translate"
msgstr ""
-#: core/templates/navigation.html:292 core/templates/user/login.html:30
+#: core/templates/navigation.html:289 core/templates/user/login.html:30
msgid "Reset password"
msgstr ""
-#: core/templates/navigation.html:301 core/templates/navigation.html:329
+#: core/templates/navigation.html:298 core/templates/navigation.html:326
msgid "Logout"
msgstr ""
-#: core/templates/navigation.html:320
+#: core/templates/navigation.html:317
msgid "My preferences"
msgstr ""
-#: core/templates/navigation.html:352
+#: core/templates/navigation.html:349
msgid "Licenses"
msgstr ""
-#: core/templates/navigation.html:360
+#: core/templates/navigation.html:357
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr ""
-#: core/templates/navigation.html:368 core/templates/weight_unit/list.html:4
-#: nutrition/templates/ingredient/view.html:141
+#: core/templates/navigation.html:365 core/templates/weight_unit/list.html:4
+#: nutrition/templates/ingredient/view.html:182
msgid "Weight units"
msgstr ""
-#: core/templates/navigation.html:376 core/templates/user/list.html:4
+#: core/templates/navigation.html:373 core/templates/user/list.html:4
msgid "User list"
msgstr ""
-#: core/templates/navigation.html:382
+#: core/templates/navigation.html:379
msgid "Gyms"
msgstr ""
-#: core/templates/navigation.html:403
-#: trophies/templates/trophies/overview.html:7
-msgid "Trophies"
-msgstr ""
-
#: core/templates/registration/password_reset_complete.html:4
msgid "Password reset complete"
msgstr ""
@@ -757,25 +770,29 @@ msgstr ""
msgid "next"
msgstr ""
-#: core/templates/template.html:96
+#: core/templates/template.html:86
msgid "Close"
msgstr ""
-#: core/templates/template.html:112
+#: core/templates/template.html:102
msgid ""
"You are using a guest account, data entered will be deleted after a week."
msgstr ""
-#: core/templates/template.html:117
+#: core/templates/template.html:107
msgid "Create some demo entries"
msgstr ""
-#: core/templates/template.html:165 software/templates/features.html:568
+#: core/templates/template.html:155 software/templates/features.html:568
#: software/templates/tos.html:7
msgid "Terms of service"
msgstr ""
-#: core/templates/template_features.html:53 software/templates/features.html:9
+#: core/templates/template.html:181 software/templates/features.html:595
+msgid "Browser language"
+msgstr ""
+
+#: core/templates/template_features.html:46 software/templates/features.html:9
msgid "Features"
msgstr ""
@@ -830,99 +847,94 @@ msgstr ""
msgid "Forgot password?"
msgstr ""
-#: core/templates/user/overview.html:25 core/templates/user/overview.html:68
-#: core/templates/user/overview.html:112 core/templates/user/overview.html:144
-#: core/templates/user/overview.html:348 core/templates/user/overview.html:390
-#: core/templates/user/overview.html:426
+#: core/templates/user/overview.html:28 core/templates/user/overview.html:71
+#: core/templates/user/overview.html:115 core/templates/user/overview.html:147
+#: core/templates/user/overview.html:351 core/templates/user/overview.html:393
+#: core/templates/user/overview.html:429
#, python-format
msgid "last %(number)s"
msgstr ""
-#: core/templates/user/overview.html:27 core/templates/user/overview.html:146
-#: core/templates/user/overview.html:343 core/templates/user/overview.html:382
-#: core/templates/user/overview.html:421 gym/templates/gym/member_list.html:226
+#: core/templates/user/overview.html:30 core/templates/user/overview.html:149
+#: core/templates/user/overview.html:346 core/templates/user/overview.html:385
+#: core/templates/user/overview.html:424 gym/templates/gym/member_list.html:226
#: gym/templates/gym/member_list.html:262
#: gym/templates/gym/member_list.html:302
msgid "Overview"
msgstr ""
-#: core/templates/user/overview.html:34 core/templates/user/overview.html:76
-#: core/templates/user/overview.html:120 core/templates/user/overview.html:152
+#: core/templates/user/overview.html:37 core/templates/user/overview.html:79
+#: core/templates/user/overview.html:123 core/templates/user/overview.html:155
#: manager/helpers.py:88 software/templates/about_us.html:170
#: weight/templates/import_csv_preview.html:13
#: weight/templates/import_csv_preview.html:42 weight/views.py:54
msgid "Date"
msgstr ""
-#: core/templates/user/overview.html:35 core/templates/user/overview.html:153
+#: core/templates/user/overview.html:38 core/templates/user/overview.html:156
#: gym/models/contract.py:58 gym/models/contract.py:109
msgid "Description"
msgstr ""
-#: core/templates/user/overview.html:36
+#: core/templates/user/overview.html:39
msgid "Number of logs (days)"
msgstr ""
-#: core/templates/user/overview.html:37 core/views/user.py:590
+#: core/templates/user/overview.html:40 core/views/user.py:606
#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:158
msgid "Last activity"
msgstr ""
-#: core/templates/user/overview.html:58
+#: core/templates/user/overview.html:61
msgid "No workouts found."
msgstr ""
-#: core/templates/user/overview.html:68
+#: core/templates/user/overview.html:71
msgid "Log"
msgstr ""
-#: core/templates/user/overview.html:77
+#: core/templates/user/overview.html:80
msgid "General impression"
msgstr ""
-#: core/templates/user/overview.html:78 core/templates/user/overview.html:390
+#: core/templates/user/overview.html:81 core/templates/user/overview.html:393
msgid "Notes"
msgstr ""
-#: core/templates/user/overview.html:79
-#: exercises/templates/history/overview.html:30
-msgid "Time"
-msgstr ""
-
-#: core/templates/user/overview.html:112 core/templates/user/overview.html:121
+#: core/templates/user/overview.html:115 core/templates/user/overview.html:124
#: manager/helpers.py:89 weight/templates/import_csv_preview.html:14
#: weight/templates/import_csv_preview.html:43 weight/views.py:54
msgid "Weight"
msgstr ""
-#: core/templates/user/overview.html:154
-#: nutrition/templates/ingredient/view.html:51 nutrition/views/plan.py:245
+#: core/templates/user/overview.html:157
+#: nutrition/templates/ingredient/view.html:52 nutrition/views/plan.py:244
msgid "Energy"
msgstr ""
-#: core/templates/user/overview.html:155
-#: nutrition/templates/ingredient/view.html:58 nutrition/views/plan.py:251
+#: core/templates/user/overview.html:158
+#: nutrition/templates/ingredient/view.html:59 nutrition/views/plan.py:250
msgid "Protein"
msgstr ""
-#: core/templates/user/overview.html:156
-#: nutrition/templates/ingredient/view.html:64 nutrition/views/plan.py:259
+#: core/templates/user/overview.html:159
+#: nutrition/templates/ingredient/view.html:65 nutrition/views/plan.py:258
msgid "Carbohydrates"
msgstr ""
-#: core/templates/user/overview.html:157
-#: nutrition/templates/ingredient/view.html:80 nutrition/views/plan.py:273
+#: core/templates/user/overview.html:160
+#: nutrition/templates/ingredient/view.html:81 nutrition/views/plan.py:272
msgid "Fat"
msgstr ""
-#: core/templates/user/overview.html:170
-#: nutrition/templates/ingredient/view.html:53
+#: core/templates/user/overview.html:173
+#: nutrition/templates/ingredient/view.html:54
msgid "kcal"
msgstr ""
-#: core/templates/user/overview.html:201 core/templates/user/overview.html:340
-#: core/templates/user/overview.html:379 core/templates/user/overview.html:418
-#: core/templates/user/overview.html:463 gym/templates/gym/list.html:45
+#: core/templates/user/overview.html:204 core/templates/user/overview.html:343
+#: core/templates/user/overview.html:382 core/templates/user/overview.html:421
+#: core/templates/user/overview.html:466 gym/templates/gym/list.html:45
#: gym/templates/gym/member_list.html:91 gym/templates/gym/member_list.html:149
#: gym/templates/gym/member_list.html:187
#: gym/templates/gym/member_list.html:223
@@ -931,109 +943,113 @@ msgstr ""
msgid "Actions"
msgstr ""
-#: core/templates/user/overview.html:210
+#: core/templates/user/overview.html:213
msgid "Deactivate user"
msgstr ""
-#: core/templates/user/overview.html:214
+#: core/templates/user/overview.html:217
msgid "Activate user"
msgstr ""
-#: core/templates/user/overview.html:223
+#: core/templates/user/overview.html:226
msgid "Reset user password"
msgstr ""
-#: core/templates/user/overview.html:227 gym/templates/gym/member_list.html:30
+#: core/templates/user/overview.html:230 gym/templates/gym/member_list.html:30
msgid "Roles"
msgstr ""
-#: core/templates/user/overview.html:243
+#: core/templates/user/overview.html:246
msgid "Password reset confirmation"
msgstr ""
-#: core/templates/user/overview.html:247
+#: core/templates/user/overview.html:250
msgid "Do you really want to change this user&#39;s password?"
msgstr ""
-#: core/templates/user/overview.html:250
+#: core/templates/user/overview.html:253
#: exercises/templates/history/overview.html:106
+#: nutrition/templates/ingredient/view.html:148
+#: nutrition/templates/ingredient/view.html:160
msgid "No"
msgstr ""
-#: core/templates/user/overview.html:251
+#: core/templates/user/overview.html:254
#: exercises/templates/history/overview.html:99
+#: nutrition/templates/ingredient/view.html:146
+#: nutrition/templates/ingredient/view.html:158
msgid "Yes"
msgstr ""
-#: core/templates/user/overview.html:272 gym/templates/gym/member_list.html:105
+#: core/templates/user/overview.html:275 gym/templates/gym/member_list.html:105
msgid "Details"
msgstr ""
-#: core/templates/user/overview.html:276 gym/views/export.py:57
-#: manager/helpers.py:89 nutrition/views/plan.py:151
-#: nutrition/views/plan.py:157
+#: core/templates/user/overview.html:279 gym/views/export.py:57
+#: manager/helpers.py:89 nutrition/views/plan.py:150
+#: nutrition/views/plan.py:156
msgid "Nr."
msgstr ""
-#: core/templates/user/overview.html:298 gym/models/contract.py:287
+#: core/templates/user/overview.html:301 gym/models/contract.py:287
#: gym/models/gym.py:50 gym/templates/contract/view.html:75
#: gym/templates/gym/member_list.html:112 gym/views/export.py:68
msgid "Phone"
msgstr ""
-#: core/templates/user/overview.html:302 gym/templates/contract/view.html:87
+#: core/templates/user/overview.html:305 gym/templates/contract/view.html:87
#: gym/templates/gym/member_list.html:130
msgid "Address"
msgstr ""
-#: core/templates/user/overview.html:313
+#: core/templates/user/overview.html:316
msgid "Registered"
msgstr ""
-#: core/templates/user/overview.html:317
+#: core/templates/user/overview.html:320
msgid "Last login"
msgstr ""
-#: core/templates/user/overview.html:322
+#: core/templates/user/overview.html:325
msgid "Status"
msgstr ""
-#: core/templates/user/overview.html:325
+#: core/templates/user/overview.html:328
msgid "Active"
msgstr ""
-#: core/templates/user/overview.html:327
+#: core/templates/user/overview.html:330
msgid "Inactive"
msgstr ""
-#: core/templates/user/overview.html:348 gym/templates/contract/list.html:4
+#: core/templates/user/overview.html:351 gym/templates/contract/list.html:4
#: gym/templates/gym/member_list.html:218
msgid "Contracts"
msgstr ""
-#: core/templates/user/overview.html:426 gym/templates/document/list.html:4
+#: core/templates/user/overview.html:429 gym/templates/document/list.html:4
msgid "Documents"
msgstr ""
-#: core/templates/user/overview.html:433 gym/templates/document/list.html:33
+#: core/templates/user/overview.html:436 gym/templates/document/list.html:33
msgid "Download"
msgstr ""
-#: core/templates/user/overview.html:474 gym/views/admin_config.py:44
+#: core/templates/user/overview.html:477 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:477 gym/models/user_config.py:92
+#: core/templates/user/overview.html:480 gym/models/user_config.py:92
msgid "Include in inactive overview"
msgstr ""
-#: core/templates/user/overview.html:510
+#: core/templates/user/overview.html:513
#, python-format
msgid "Admin login is only available for users in %(gym_name)s"
msgstr ""
-#: core/templates/user/overview.html:514
+#: core/templates/user/overview.html:517
msgid "Log in as this user"
msgstr ""
@@ -1057,7 +1073,7 @@ msgstr ""
msgid "You need to verify your email to contribute exercises"
msgstr ""
-#: core/templates/user/preferences.html:55 core/views/user.py:601
+#: core/templates/user/preferences.html:55 core/views/user.py:617
msgid "Change password"
msgstr ""
@@ -1065,23 +1081,23 @@ msgstr ""
msgid "Already have an account?"
msgstr ""
-#: core/templatetags/wger_extras.py:142 i18n.tpl:38
+#: core/templatetags/wger_extras.py:142 i18n.tpl:39
msgid "kg"
msgstr ""
#: core/templatetags/wger_extras.py:144
-#: nutrition/templates/ingredient/view.html:60
-#: nutrition/templates/ingredient/view.html:66
-#: nutrition/templates/ingredient/view.html:73
-#: nutrition/templates/ingredient/view.html:82
-#: nutrition/templates/ingredient/view.html:89
-#: nutrition/templates/ingredient/view.html:111
-#: nutrition/templates/ingredient/view.html:121
+#: nutrition/templates/ingredient/view.html:61
+#: nutrition/templates/ingredient/view.html:67
+#: nutrition/templates/ingredient/view.html:74
+#: nutrition/templates/ingredient/view.html:83
+#: nutrition/templates/ingredient/view.html:90
+#: nutrition/templates/ingredient/view.html:112
+#: nutrition/templates/ingredient/view.html:122
msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr ""
-#: core/templatetags/wger_extras.py:147 i18n.tpl:39
+#: core/templatetags/wger_extras.py:147 i18n.tpl:40
msgid "lb"
msgstr ""
@@ -1090,84 +1106,83 @@ msgctxt "weight unit, i.e. ounces"
msgid "oz"
msgstr ""
-#: core/views/languages.py:85 exercises/views/categories.py:122
+#: core/views/languages.py:88 exercises/views/categories.py:122
#: exercises/views/equipment.py:103 exercises/views/muscles.py:99
-#: nutrition/views/ingredient.py:120 nutrition/views/unit.py:110
+#: nutrition/views/ingredient.py:125
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
+#: core/views/languages.py:96 core/views/license.py:103
+#: core/views/repetition_units.py:114 core/views/weight_units.py:115
#: exercises/views/categories.py:128 exercises/views/muscles.py:106
#: gallery/views/images.py:124 gym/views/admin_notes.py:196
#: gym/views/document.py:206 gym/views/gym.py:481
-#: nutrition/views/ingredient.py:127 nutrition/views/unit.py:117
+#: nutrition/views/ingredient.py:132
#, python-brace-format
msgid "Delete {0}?"
msgstr ""
-#: core/views/languages.py:111 core/views/license.py:85
-#: core/views/repetition_units.py:86 core/views/user.py:464
+#: core/views/languages.py:114 core/views/license.py:85
+#: core/views/repetition_units.py:96 core/views/user.py:480
#: core/views/weight_units.py:86 exercises/views/categories.py:98
#: exercises/views/equipment.py:81 exercises/views/muscles.py:87
#: gym/views/admin_notes.py:161 gym/views/config.py:68
#: gym/views/contract.py:186 gym/views/contract_option.py:123
#: gym/views/contract_type.py:123 gym/views/document.py:171
-#: gym/views/gym.py:463 nutrition/views/ingredient.py:146
-#: nutrition/views/unit.py:143
+#: gym/views/gym.py:463 nutrition/views/ingredient.py:151
#, python-brace-format
msgid "Edit {0}"
msgstr ""
-#: core/views/misc.py:74
+#: core/views/misc.py:73
msgid ""
"We have created sample workout, workout schedules, weight logs, (body) "
"weight and nutrition plan entries so you can better see what this site can "
"do. Feel free to edit or delete them!"
msgstr ""
-#: core/views/user.py:143
+#: core/views/user.py:145
#, python-brace-format
msgid "Account \"{0}\" was successfully deleted"
msgstr ""
-#: core/views/user.py:279
+#: core/views/user.py:287
msgid "You were successfully registered"
msgstr ""
-#: core/views/user.py:341
+#: core/views/user.py:357
msgid "Settings successfully updated"
msgstr ""
-#: core/views/user.py:380
+#: core/views/user.py:396
msgid "The user was successfully deactivated"
msgstr ""
-#: core/views/user.py:417
+#: core/views/user.py:433
msgid "The user was successfully activated"
msgstr ""
-#: core/views/user.py:432
+#: core/views/user.py:448
msgid "Edit user"
msgstr ""
-#: core/views/user.py:587 gym/templates/gym/member_list.html:26
+#: core/views/user.py:603 gym/templates/gym/member_list.html:26
#: gym/views/gym.py:158
msgid "ID"
msgstr ""
-#: core/views/user.py:588 gym/forms.py:95 gym/templates/contract/view.html:55
+#: core/views/user.py:604 gym/forms.py:95 gym/templates/contract/view.html:55
#: gym/templates/gym/member_list.html:27 gym/views/export.py:59
#: gym/views/gym.py:158 gym/views/gym.py:217
msgid "Username"
msgstr ""
-#: core/views/user.py:591 gym/templates/gym/new_user.html:34
+#: core/views/user.py:607 gym/templates/gym/new_user.html:34
#: gym/views/export.py:58 gym/views/gym.py:217
msgid "Gym"
msgstr ""
-#: core/views/user.py:650
+#: core/views/user.py:678
#, python-format
msgid "A verification email was sent to %(email)s"
msgstr ""
@@ -1184,16 +1199,16 @@ msgstr ""
msgid "A more basic name for the muscle"
msgstr ""
-#: exercises/models/video.py:50
+#: exercises/models/video.py:52
#, python-format
msgid "Maximum file size is %(size)sMB."
msgstr ""
-#: exercises/models/video.py:57 exercises/models/video.py:65
+#: exercises/models/video.py:59 exercises/models/video.py:67
msgid "File type is not supported"
msgstr ""
-#: exercises/models/video.py:70
+#: exercises/models/video.py:72
msgid "File is not a valid video"
msgstr ""
@@ -1264,7 +1279,11 @@ msgstr ""
msgid "Add muscle"
msgstr ""
-#: gallery/templates/images/overview.html:72
+#: gallery/forms.py:35
+msgid "If date is left empty, it will be read from the image instead"
+msgstr ""
+
+#: gallery/templates/images/overview.html:69
msgid "Add image"
msgstr ""
@@ -1330,7 +1349,7 @@ msgid "Contract type"
msgstr ""
#: gym/models/contract.py:211 gym/templates/contract/view.html:59
-#: nutrition/forms.py:58
+#: nutrition/forms.py:67
msgid "Amount"
msgstr ""
@@ -1506,7 +1525,7 @@ msgstr ""
msgid "Add member"
msgstr ""
-#: gym/templates/gym/new_user.html:48 nutrition/templates/rate/form.html:120
+#: gym/templates/gym/new_user.html:48 nutrition/templates/rate/form.html:121
msgid "Info"
msgstr ""
@@ -1673,10 +1692,6 @@ msgstr ""
msgid "Quads"
msgstr ""
-#: i18n.tpl:30
-msgid "Repetitions"
-msgstr ""
-
#: i18n.tpl:31
msgid "Resistance band"
msgstr ""
@@ -1705,175 +1720,179 @@ msgstr ""
msgid "Until Failure"
msgstr ""
-#: i18n.tpl:40
-msgid "none (bodyweight exercise)"
+#: i18n.tpl:38
+msgid "Meters"
msgstr ""
#: i18n.tpl:41
-msgid "Beginner"
+msgid "none (bodyweight exercise)"
msgstr ""
#: i18n.tpl:42
-msgid "Consistent"
+msgid "Beginner"
msgstr ""
#: i18n.tpl:43
-msgid "Dedicated"
+msgid "Consistent"
msgstr ""
#: i18n.tpl:44
-msgid "Obsessed"
+msgid "Dedicated"
msgstr ""
#: i18n.tpl:45
-msgid "Legend"
+msgid "Obsessed"
msgstr ""
#: i18n.tpl:46
-msgid "Veteran"
+msgid "Legend"
msgstr ""
#: i18n.tpl:47
-msgid "Titan"
+msgid "Veteran"
msgstr ""
#: i18n.tpl:48
-msgid "Unstoppable"
+msgid "Titan"
msgstr ""
#: i18n.tpl:49
-msgid "Weekend Warrior"
+msgid "Unstoppable"
msgstr ""
#: i18n.tpl:50
-msgid "Elephant lifter"
+msgid "Weekend Warrior"
msgstr ""
#: i18n.tpl:51
-msgid "Bus lifter"
+msgid "Elephant lifter"
msgstr ""
#: i18n.tpl:52
-msgid "Plane lifter"
+msgid "Bus lifter"
msgstr ""
#: i18n.tpl:53
-msgid "Blue whale lifter"
+msgid "Plane lifter"
msgstr ""
#: i18n.tpl:54
-msgid "Space Station lifter"
+msgid "Blue whale lifter"
msgstr ""
#: i18n.tpl:55
-msgid "Millionaire"
+msgid "Space Station lifter"
msgstr ""
#: i18n.tpl:56
-msgid "Atlas"
+msgid "Millionaire"
msgstr ""
#: i18n.tpl:57
-msgid "Early Bird"
+msgid "Atlas"
msgstr ""
#: i18n.tpl:58
-msgid "Night Owl"
+msgid "Early Bird"
msgstr ""
#: i18n.tpl:59
-msgid "New Year, New Me"
+msgid "Night Owl"
msgstr ""
#: i18n.tpl:60
-msgid "Phoenix"
+msgid "New Year, New Me"
msgstr ""
#: i18n.tpl:61
-msgid "Personal Record"
+msgid "Phoenix"
msgstr ""
#: i18n.tpl:62
-msgid "Complete your first workout"
+msgid "Personal Record"
msgstr ""
#: i18n.tpl:63
-msgid "Complete 10 workouts"
+msgid "Complete your first workout"
msgstr ""
#: i18n.tpl:64
-msgid "Complete 50 workouts"
+msgid "Complete 10 workouts"
msgstr ""
#: i18n.tpl:65
-msgid "Complete 100 workouts"
+msgid "Complete 50 workouts"
msgstr ""
#: i18n.tpl:66
-msgid "Complete 200 workouts"
+msgid "Complete 100 workouts"
msgstr ""
#: i18n.tpl:67
-msgid "Complete 500 workouts"
+msgid "Complete 200 workouts"
msgstr ""
#: i18n.tpl:68
-msgid "Complete 1000 workouts"
+msgid "Complete 500 workouts"
msgstr ""
#: i18n.tpl:69
-msgid "Maintain a 30-day workout streak"
+msgid "Complete 1000 workouts"
msgstr ""
#: i18n.tpl:70
-msgid "Work out on Saturday and Sunday for 4 consecutive weekends"
+msgid "Maintain a 30-day workout streak"
msgstr ""
#: i18n.tpl:71
-msgid "Lift a cumulative total of 5.000 kg"
+msgid "Work out on Saturday and Sunday for 4 consecutive weekends"
msgstr ""
#: i18n.tpl:72
-msgid "Lift a cumulative total of 20.000 kg"
+msgid "Lift a cumulative total of 5.000 kg"
msgstr ""
#: i18n.tpl:73
-msgid "Lift a cumulative total of 50.000 kg"
+msgid "Lift a cumulative total of 20.000 kg"
msgstr ""
#: i18n.tpl:74
-msgid "Lift a cumulative total of 150.000 kg"
+msgid "Lift a cumulative total of 50.000 kg"
msgstr ""
#: i18n.tpl:75
-msgid "Lift a cumulative total of 450.000 kg"
+msgid "Lift a cumulative total of 150.000 kg"
msgstr ""
#: i18n.tpl:76
-msgid "Lift a cumulative total of 1.000.000 kg"
+msgid "Lift a cumulative total of 450.000 kg"
msgstr ""
#: i18n.tpl:77
-msgid "Lift a cumulative total of 10.000.000 kg"
+msgid "Lift a cumulative total of 1.000.000 kg"
msgstr ""
#: i18n.tpl:78
-msgid "Complete a workout before 6:00 AM"
+msgid "Lift a cumulative total of 10.000.000 kg"
msgstr ""
#: i18n.tpl:79
-msgid "Complete a workout after 9:00 PM"
+msgid "Complete a workout before 6:00 AM"
msgstr ""
#: i18n.tpl:80
-msgid "Work out on January 1st"
+msgid "Complete a workout after 9:00 PM"
msgstr ""
#: i18n.tpl:81
-msgid "Return to training after being inactive for 30 days"
+msgid "Work out on January 1st"
msgstr ""
#: i18n.tpl:82
+msgid "Return to training after being inactive for 30 days"
+msgstr ""
+
+#: i18n.tpl:83
msgid "Achieve a new Personal Record on any exercise"
msgstr ""
@@ -1955,7 +1974,7 @@ msgstr ""
msgid "Routine will expire soon"
msgstr ""
-#: manager/models/routine.py:153 manager/models/session.py:145
+#: manager/models/routine.py:154 manager/models/session.py:145
msgid "The start time cannot be after the end time."
msgstr ""
@@ -2027,36 +2046,56 @@ msgstr ""
msgid "Workout for %s"
msgstr ""
-#: nutrition/forms.py:62
+#: nutrition/extract_info/off.py:72 nutrition/extract_info/off.py:91
+msgid "Serving"
+msgstr ""
+
+#: nutrition/forms.py:71 nutrition/forms.py:208
msgid "Unit"
msgstr ""
-#: nutrition/forms.py:170 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:179 nutrition/templates/rate/form.html:77
msgid "Basic caloric intake"
msgstr ""
-#: nutrition/forms.py:171
+#: nutrition/forms.py:180
msgid "Your basic caloric intake as calculated for your data"
msgstr ""
-#: nutrition/forms.py:176
+#: nutrition/forms.py:185
msgid "Additional calories"
msgstr ""
-#: nutrition/forms.py:178
+#: nutrition/forms.py:187
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
msgstr ""
#: nutrition/forms.py:209
+msgid "grams (g)"
+msgstr ""
+
+#: nutrition/forms.py:219
msgid "Ingredient"
msgstr ""
-#: nutrition/forms.py:213
+#: nutrition/forms.py:223
msgid "Also search for names in English"
msgstr ""
+#: nutrition/forms.py:239
+msgid "Quantity"
+msgstr ""
+
+#: nutrition/forms.py:241
+msgid "Enter a quantity and choose grams (g) or one of the serving units."
+msgstr ""
+
+#: nutrition/models/ingredient.py:526
+msgid "Portion"
+msgstr ""
+
#: nutrition/templates/ingredient/email_new.tpl:1
#, python-format
msgid ""
@@ -2094,59 +2133,86 @@ msgid ""
"sucessfully."
msgstr ""
-#: nutrition/templates/ingredient/overview.html:38
+#: nutrition/templates/ingredient/overview.html:32
+#: nutrition/templates/ingredient/overview.html:68
+#: nutrition/templates/ingredient/view.html:143
+msgid "Vegan"
+msgstr ""
+
+#: nutrition/templates/ingredient/overview.html:34
+#: nutrition/templates/ingredient/overview.html:79
+#: nutrition/templates/ingredient/view.html:155
+msgid "Vegetarian"
+msgstr ""
+
+#: nutrition/templates/ingredient/overview.html:43
msgid "No ingredients."
msgstr ""
-#: nutrition/templates/ingredient/overview.html:49
+#: nutrition/templates/ingredient/overview.html:54
msgid "Search"
msgstr ""
-#: nutrition/templates/ingredient/view.html:45 nutrition/views/plan.py:237
+#: nutrition/templates/ingredient/overview.html:57
+msgid "Filter"
+msgstr ""
+
+#: nutrition/templates/ingredient/overview.html:83
+msgid "Apply"
+msgstr ""
+
+#: nutrition/templates/ingredient/overview.html:85
+msgid "Reset"
+msgstr ""
+
+#: nutrition/templates/ingredient/view.html:46 nutrition/views/plan.py:236
msgid "Macronutrients"
msgstr ""
-#: nutrition/templates/ingredient/view.html:54
+#: nutrition/templates/ingredient/view.html:55
msgid "kJ"
msgstr ""
-#: nutrition/templates/ingredient/view.html:70 nutrition/views/plan.py:267
+#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:266
msgid "Sugar content in carbohydrates"
msgstr ""
-#: nutrition/templates/ingredient/view.html:75
-#: nutrition/templates/ingredient/view.html:91
-#: nutrition/templates/ingredient/view.html:113
-#: nutrition/templates/ingredient/view.html:123
+#: nutrition/templates/ingredient/view.html:76
+#: nutrition/templates/ingredient/view.html:92
+#: nutrition/templates/ingredient/view.html:114
+#: nutrition/templates/ingredient/view.html:124
msgid "n.A."
msgstr ""
-#: nutrition/templates/ingredient/view.html:86 nutrition/views/plan.py:281
+#: nutrition/templates/ingredient/view.html:87 nutrition/views/plan.py:280
msgid "Saturated fat content in fats"
msgstr ""
-#: nutrition/templates/ingredient/view.html:102
+#: nutrition/templates/ingredient/view.html:103
msgid "Others"
msgstr ""
-#: nutrition/templates/ingredient/view.html:108 nutrition/views/plan.py:287
+#: nutrition/templates/ingredient/view.html:109 nutrition/views/plan.py:286
msgid "Fiber"
msgstr ""
-#: nutrition/templates/ingredient/view.html:118 nutrition/views/plan.py:293
+#: nutrition/templates/ingredient/view.html:119 nutrition/views/plan.py:292
msgid "Sodium"
msgstr ""
-#: nutrition/templates/ingredient/view.html:143
-#: nutrition/templates/units/list.html:50 nutrition/views/unit.py:86
+#: nutrition/templates/ingredient/view.html:136
+msgid "Dietary information"
+msgstr ""
+
+#: nutrition/templates/ingredient/view.html:184
msgid "Add new weight unit"
msgstr ""
-#: nutrition/templates/rate/form.html:25
+#: nutrition/templates/rate/form.html:26
msgid "Basal metabolic rate"
msgstr ""
-#: nutrition/templates/rate/form.html:26
+#: nutrition/templates/rate/form.html:27
msgid ""
"The basal metabolic rate is the amount of energy expended daily\n"
"at rest. This is the minimum energy needed for the body to function, without "
@@ -2154,36 +2220,36 @@ msgid ""
"additional physical activity."
msgstr ""
-#: nutrition/templates/rate/form.html:37
+#: nutrition/templates/rate/form.html:38
msgid "Your basic metabolic rate is: "
msgstr ""
-#: nutrition/templates/rate/form.html:47
+#: nutrition/templates/rate/form.html:48
msgid "Physical activities"
msgstr ""
-#: nutrition/templates/rate/form.html:48
+#: nutrition/templates/rate/form.html:49
msgid ""
"The physical activity level (PAL) is a factor used to to express\n"
"the additional physical activity and is used to calculate the total energy\n"
"required per day."
msgstr ""
-#: nutrition/templates/rate/form.html:59
+#: nutrition/templates/rate/form.html:60
msgid "Factor for daily activities: "
msgstr ""
-#: nutrition/templates/rate/form.html:67
+#: nutrition/templates/rate/form.html:68
msgid ""
"The base caloric intake is the amount of calories your metabolism\n"
"needs based on your level of physical activity."
msgstr ""
-#: nutrition/templates/rate/form.html:81
+#: nutrition/templates/rate/form.html:82
msgid "Calculate basic caloric intake"
msgstr ""
-#: nutrition/templates/rate/form.html:88
+#: nutrition/templates/rate/form.html:89
msgid ""
"The total calories are the actual total calories per day. This\n"
"might include e.g. a surplus or deficit if you are bulking or cutting. "
@@ -2191,67 +2257,67 @@ msgid ""
"you might just enter yourself the amount of calories if you know the value."
msgstr ""
-#: nutrition/templates/rate/form.html:102
+#: nutrition/templates/rate/form.html:103
msgid "Transfer basic intake to total daily calories"
msgstr ""
-#: nutrition/templates/rate/form.html:106
+#: nutrition/templates/rate/form.html:107
msgid "Add additional calories to total daily calories"
msgstr ""
-#: nutrition/templates/rate/form.html:110
+#: nutrition/templates/rate/form.html:111
msgid "Save total calories to profile"
msgstr ""
-#: nutrition/templates/rate/form.html:121
+#: nutrition/templates/rate/form.html:122
msgid ""
"Please note that these calculations can only be an\n"
"approximation. If you base your nutrition plan on these values, observe\n"
"yourself for some weeks and change the total amount if needed."
msgstr ""
-#: nutrition/views/ingredient.py:158
+#: nutrition/views/ingredient.py:163
msgid "Add a new ingredient"
msgstr ""
-#: nutrition/views/plan.py:128
+#: nutrition/views/plan.py:127
msgid "Nutritional plan"
msgstr ""
-#: nutrition/views/plan.py:130
+#: nutrition/views/plan.py:129
#, python-format
msgid "Nutritional plan for %s"
msgstr ""
-#: nutrition/views/plan.py:202
+#: nutrition/views/plan.py:201
msgid "<i>This is an empty plan, what did you expect on the PDF?</i>"
msgstr ""
-#: nutrition/views/plan.py:230
+#: nutrition/views/plan.py:229
msgid "Nutritional data"
msgstr ""
-#: nutrition/views/plan.py:238
+#: nutrition/views/plan.py:237
msgid "Total"
msgstr ""
-#: nutrition/views/plan.py:239
+#: nutrition/views/plan.py:238
msgid "Percent of energy"
msgstr ""
-#: nutrition/views/plan.py:240
+#: nutrition/views/plan.py:239
msgid "g per body kg"
msgstr ""
-#: nutrition/views/unit_ingredient.py:69
+#: nutrition/views/unit_ingredient.py:64
msgid "Add a new weight unit"
msgstr ""
-#: nutrition/views/unit_ingredient.py:106
+#: nutrition/views/unit_ingredient.py:99
msgid "Edit a weight unit to ingredient connection"
msgstr ""
-#: nutrition/views/unit_ingredient.py:138
+#: nutrition/views/unit_ingredient.py:129
msgid "Delete?"
msgstr ""
@@ -2598,7 +2664,7 @@ msgstr ""
msgid "Translation"
msgstr ""
-#: utils/generic_views.py:263
+#: utils/generic_views.py:246
msgid "Yes, delete"
msgstr ""
@@ -2649,10 +2715,6 @@ msgstr ""
msgid "Import weight logs"
msgstr ""
-#: weight/templates/import_csv_form.html:9
-msgid "Submit"
-msgstr ""
-
#: weight/templates/import_csv_form.html:15
msgid ""
"Use this import field to import your weight logs into Workout\n"
diff --git a/wger/locale/sr/LC_MESSAGES/django.po b/wger/locale/sr/LC_MESSAGES/django.po
index 34e1ddfda..193dd155a 100644
--- a/wger/locale/sr/LC_MESSAGES/django.po
+++ b/wger/locale/sr/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-01-17 14:03+0000\n"
+"POT-Creation-Date: 2026-04-10 10:20+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
@@ -32,7 +32,7 @@ msgstr ""
#: config/views/gym_config.py:42 core/templates/language/view.html:64
#: core/templates/license/list.html:17
#: core/templates/repetition_unit/list.html:18
-#: core/templates/user/overview.html:204 core/templates/user/overview.html:467
+#: core/templates/user/overview.html:207 core/templates/user/overview.html:470
#: core/templates/weight_unit/list.html:18
#: exercises/templates/categories/admin-overview.html:17
#: exercises/templates/equipment/admin-overview.html:17
@@ -44,30 +44,29 @@ msgstr ""
#: gym/templates/gym/list.html:19 gym/templates/gym/list.html:48
#: gym/templates/gym/member_list.html:94 gym/templates/gym/member_list.html:152
#: gym/templates/gym/member_list.html:190
-#: nutrition/templates/ingredient/view.html:164
-#: nutrition/templates/ingredient/view.html:209
-#: nutrition/templates/units/list.html:19
+#: nutrition/templates/ingredient/view.html:205
+#: nutrition/templates/ingredient/view.html:248
msgid "Edit"
msgstr ""
-#: core/forms.py:91 core/templates/navigation.html:271
-#: core/templates/navigation.html:278 core/templates/user/login.html:4
+#: core/forms.py:89 core/templates/navigation.html:268
+#: core/templates/navigation.html:275 core/templates/user/login.html:4
#: core/templates/user/registration_sidebar.html:12
#: software/templates/features.html:82 software/templates/features.html:448
msgid "Login"
msgstr ""
-#: core/forms.py:130 core/forms.py:244 gym/views/export.py:61
+#: core/forms.py:128 core/forms.py:242 gym/views/export.py:61
#: gym/views/gym.py:217
msgid "First name"
msgstr ""
-#: core/forms.py:131 core/forms.py:245 core/templates/user/overview.html:284
+#: core/forms.py:129 core/forms.py:243 core/templates/user/overview.html:287
#: gym/views/export.py:62 gym/views/gym.py:217
msgid "Last name"
msgstr ""
-#: core/forms.py:133 core/forms.py:210 core/templates/user/overview.html:288
+#: core/forms.py:131 core/forms.py:208 core/templates/user/overview.html:291
#: gym/models/contract.py:256 gym/models/gym.py:58
#: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:116
#: gym/templates/gym/new_user.html:30 gym/views/export.py:60
@@ -77,53 +76,53 @@ msgstr ""
msgid "Email"
msgstr ""
-#: core/forms.py:134
+#: core/forms.py:132
msgid "Used for password resets and, optionally, e-mail reminders."
msgstr ""
-#: core/forms.py:138 core/models/profile.py:222
+#: core/forms.py:136 core/models/profile.py:222
#: gym/templates/gym/new_user.html:38
msgid "Date of Birth"
msgstr ""
-#: core/forms.py:177
+#: core/forms.py:175
msgid "Personal data"
msgstr ""
-#: core/forms.py:189
+#: core/forms.py:187
msgid "Workout reminders"
msgstr ""
-#: core/forms.py:196
+#: core/forms.py:194
msgid "Other settings"
msgstr ""
-#: core/forms.py:204 core/views/user.py:614 core/views/user.py:629
-#: core/views/user.py:641 gym/forms.py:73 utils/generic_views.py:143
+#: core/forms.py:202 core/views/user.py:630 core/views/user.py:654
+#: core/views/user.py:668 gym/forms.py:73 utils/generic_views.py:137
msgid "Save"
msgstr ""
-#: core/forms.py:211
+#: core/forms.py:209
msgid "Used for password resets and, optionally, email reminders."
msgstr ""
-#: core/forms.py:240
+#: core/forms.py:238
msgid "This e-mail address is already in use."
msgstr ""
-#: core/forms.py:261 gym/templates/gym/new_user.html:26
+#: core/forms.py:259 gym/templates/gym/new_user.html:26
#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:217
msgid "Password"
msgstr ""
-#: core/forms.py:263
+#: core/forms.py:261
msgid "Please enter your current password."
msgstr ""
-#: core/forms.py:272 core/templates/language/view.html:70
+#: core/forms.py:270 core/templates/language/view.html:70
#: core/templates/license/list.html:21
#: core/templates/repetition_unit/list.html:22
-#: core/templates/user/overview.html:233
+#: core/templates/user/overview.html:236
#: core/templates/weight_unit/list.html:22
#: exercises/templates/categories/admin-overview.html:21
#: exercises/templates/equipment/admin-overview.html:21
@@ -131,27 +130,30 @@ msgstr ""
#: gym/templates/admin_notes/list.html:37
#: gym/templates/contract_option/list.html:35
#: gym/templates/contract_type/list.html:36 gym/templates/document/list.html:46
-#: gym/templates/gym/list.html:23 nutrition/templates/ingredient/view.html:168
-#: nutrition/templates/ingredient/view.html:215
-#: nutrition/templates/units/list.html:25
+#: gym/templates/gym/list.html:23 nutrition/templates/ingredient/view.html:209
+#: nutrition/templates/ingredient/view.html:254
msgid "Delete"
msgstr ""
-#: core/forms.py:281
+#: core/forms.py:279
msgid "Invalid password"
msgstr ""
-#: core/forms.py:293
+#: core/forms.py:291 core/forms.py:349
msgid "The form is secured with reCAPTCHA"
msgstr ""
-#: core/forms.py:314 core/forms.py:341 core/templates/navigation.html:272
-#: core/templates/navigation.html:285 core/templates/template.html:123
-#: core/templates/user/login.html:21 core/views/user.py:285
+#: core/forms.py:312 core/forms.py:339 core/templates/navigation.html:269
+#: core/templates/navigation.html:282 core/templates/template.html:113
+#: core/templates/user/login.html:21 core/views/user.py:293
#: software/templates/features.html:87 software/templates/features.html:442
msgid "Register"
msgstr ""
+#: core/forms.py:360 weight/templates/import_csv_form.html:9
+msgid "Submit"
+msgstr ""
+
#: core/models/language.py:31 core/templates/language/view.html:21
msgid "Language short name"
msgstr ""
@@ -186,36 +188,36 @@ msgstr ""
msgid "Link to license text or other information"
msgstr ""
-#: core/models/profile.py:57
+#: core/models/profile.py:60
#, python-format
msgid "%(birthdate)s is not a valid birthdate"
msgstr ""
-#: core/models/profile.py:66
+#: core/models/profile.py:69
msgid "Male"
msgstr ""
-#: core/models/profile.py:67
+#: core/models/profile.py:70
msgid "Female"
msgstr ""
-#: core/models/profile.py:74
+#: core/models/profile.py:77
msgid "Low"
msgstr ""
-#: core/models/profile.py:75
+#: core/models/profile.py:78
msgid "Medium"
msgstr ""
-#: core/models/profile.py:76
+#: core/models/profile.py:79
msgid "High"
msgstr ""
-#: core/models/profile.py:82
+#: core/models/profile.py:85
msgid "Metric (kilogram)"
msgstr ""
-#: core/models/profile.py:83
+#: core/models/profile.py:86
msgid "Imperial (pound)"
msgstr ""
@@ -323,7 +325,7 @@ msgstr ""
msgid "Free time"
msgstr ""
-#: core/models/profile.py:320 nutrition/templates/rate/form.html:66
+#: core/models/profile.py:320 nutrition/templates/rate/form.html:67
msgid "Total daily calories"
msgstr ""
@@ -361,20 +363,41 @@ msgstr ""
msgid "Enable or disable the trophy system for this user"
msgstr ""
-#: core/models/profile.py:446
+#: core/models/profile.py:457
msgid "The sum of all hours has to be 24"
msgstr ""
-#: core/models/rep_unit.py:36 core/models/weight_unit.py:42
-#: core/templates/user/overview.html:280 core/views/user.py:589
+#: core/models/rep_unit.py:32 i18n.tpl:30
+msgid "Repetitions"
+msgstr ""
+
+#: core/models/rep_unit.py:33 core/templates/user/overview.html:82
+#: exercises/templates/history/overview.html:30
+msgid "Time"
+msgstr ""
+
+#: core/models/rep_unit.py:34
+msgid "Distance"
+msgstr ""
+
+#: core/models/rep_unit.py:47 core/models/weight_unit.py:42
+#: core/templates/user/overview.html:283 core/views/user.py:605
#: exercises/models/muscle.py:36 gym/models/contract.py:52
#: gym/models/contract.py:103 gym/models/gym.py:46
#: gym/models/user_document.py:84 gym/templates/contract/view.html:50
#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:108
-#: gym/views/gym.py:158 nutrition/templates/ingredient/view.html:151
+#: gym/views/gym.py:158 nutrition/templates/ingredient/view.html:192
msgid "Name"
msgstr ""
+#: core/models/rep_unit.py:53
+msgid "Unit Type"
+msgstr ""
+
+#: core/models/rep_unit.py:54
+msgid "The type of unit (repetitions, time, or distance)"
+msgstr ""
+
#: core/templates/403.html:4
msgid "Forbidden!"
msgstr ""
@@ -402,77 +425,73 @@ msgid ""
"later time. If the problem persists, you can seek help in ways listed below:"
msgstr ""
-#: core/templates/base.html:10
-#, python-format
-msgid ""
-"You are browsing the site as the user \"%(current_user)s\", all actions are "
-"performed on their data."
+#: core/templates/account/email/email_confirmation_message.html:81
+msgid "Almost there!"
msgstr ""
-#: core/templates/base.html:15 core/templates/base_wide.html:12
+#: core/templates/account/email/email_confirmation_message.html:85
#, python-format
-msgid "Back to \"%(target)s\""
+msgid ""
+"You're receiving this email because the user \"%(user_display)s\" has given "
+"your email address to register an account on %(site_domain)s."
msgstr ""
-#: core/templates/base_wide.html:7
-#, python-format
+#: core/templates/account/email/email_confirmation_message.html:93
msgid ""
-"You are\n"
-" browsing the site as the user \"%(current_user)s\", all "
-"actions are performed on\n"
-" their data.\n"
-" "
+"Your email verification code is listed below. Please enter it in your open "
+"browser window."
msgstr ""
-#: core/templates/delete.html:4
-msgid "Are you sure you want to delete this? This action cannot be undone."
+#: core/templates/account/email/email_confirmation_message.html:100
+msgid "Please click the button below to confirm your email address."
msgstr ""
-#: core/templates/email_verification/confirm_template.html:4
-msgid "Email verification"
+#: core/templates/account/email/email_confirmation_message.html:106
+msgid "Confirm email"
msgstr ""
-#: core/templates/email_verification/confirm_template.html:18
+#: core/templates/account/email/email_confirmation_message.html:110
#, python-format
-msgid "%(username)s, your email was verified"
+msgid ""
+"The link is valid for %(expire_hours)s hours (until %(date)s, %(time)s). You "
+"can request a new one from your profile settings."
msgstr ""
-#: core/templates/email_verification/confirm_template.html:22
-msgid "Error, invalid verification token"
+#: core/templates/account/email/email_confirmation_message.html:116
+msgid "If the button doesn't work, copy and paste this link into your browser:"
msgstr ""
-#: core/templates/email_verification/email_body_html.tpl:6
-msgid "Email Confirmation"
+#: core/templates/account/email/email_confirmation_message.html:125
+msgid "the wger Team"
msgstr ""
-#: core/templates/email_verification/email_body_html.tpl:9
-#: core/templates/email_verification/email_body_txt.tpl:3
+#: core/templates/base.html:10
#, python-format
-msgid "You are almost there, %(username)s!"
+msgid ""
+"You are browsing the site as the user \"%(current_user)s\", all actions are "
+"performed on their data."
msgstr ""
-#: core/templates/email_verification/email_body_html.tpl:11
+#: core/templates/base.html:15 core/templates/base_wide.html:12
#, python-format
-msgid "Please click <a href=\"%(link)s\">here</a> to confirm your email"
+msgid "Back to \"%(target)s\""
msgstr ""
-#: core/templates/email_verification/email_body_html.tpl:12
-#: core/templates/email_verification/email_body_txt.tpl:5
+#: core/templates/base_wide.html:7
#, 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"
+msgid ""
+"You are\n"
+" browsing the site as the user \"%(current_user)s\", all "
+"actions are performed on\n"
+" their data.\n"
+" "
msgstr ""
-#: core/templates/email_verification/email_body_txt.tpl:4
-#, python-format
-msgid "Please click the following link to confirm your email: %(link)s"
+#: core/templates/delete.html:4
+msgid "Are you sure you want to delete this? This action cannot be undone."
msgstr ""
-#: core/templates/language/overview.html:4 core/templates/navigation.html:344
+#: core/templates/language/overview.html:4 core/templates/navigation.html:341
msgid "Languages"
msgstr ""
@@ -481,16 +500,16 @@ msgid "Nothing found."
msgstr ""
#: core/templates/language/overview.html:22
-#: nutrition/templates/ingredient/overview.html:38
+#: nutrition/templates/ingredient/overview.html:43
msgid "Add one now."
msgstr ""
#: core/templates/language/overview.html:34 core/templates/license/list.html:43
-#: core/templates/repetition_unit/list.html:46
-#: core/templates/user/overview.html:344 core/templates/user/overview.html:384
-#: core/templates/user/overview.html:422
-#: core/templates/weight_unit/list.html:46 core/views/languages.py:74
-#: core/views/license.py:66 core/views/repetition_units.py:66
+#: core/templates/repetition_unit/list.html:44
+#: core/templates/user/overview.html:347 core/templates/user/overview.html:387
+#: core/templates/user/overview.html:425
+#: core/templates/weight_unit/list.html:46 core/views/languages.py:77
+#: core/views/license.py:66 core/views/repetition_units.py:76
#: core/views/weight_units.py:66
#: exercises/templates/categories/admin-overview.html:40
#: exercises/templates/equipment/admin-overview.html:39
@@ -503,14 +522,14 @@ msgstr ""
#: gym/templates/gym/member_list.html:264
#: gym/templates/gym/member_list.html:303
#: mailer/templates/mailer/gym/overview.html:43
-#: nutrition/templates/ingredient/overview.html:60
+#: nutrition/templates/ingredient/overview.html:97
msgid "Add"
msgstr ""
#: core/templates/language/view.html:61 core/templates/user/api_key.html:41
#: core/templates/user/preferences.html:50 gym/models/contract.py:203
#: gym/templates/contract/view.html:41 gym/templates/gym/member_list.html:270
-#: nutrition/templates/ingredient/view.html:206
+#: nutrition/templates/ingredient/view.html:245
msgid "Options"
msgstr ""
@@ -520,9 +539,9 @@ msgstr ""
#: core/templates/license/list.html:30
#: core/templates/repetition_unit/list.html:32
-#: core/templates/user/overview.html:104 core/templates/user/overview.html:136
-#: core/templates/user/overview.html:185 core/templates/user/overview.html:365
-#: core/templates/user/overview.html:404 core/templates/user/overview.html:448
+#: core/templates/user/overview.html:107 core/templates/user/overview.html:139
+#: core/templates/user/overview.html:188 core/templates/user/overview.html:368
+#: core/templates/user/overview.html:407 core/templates/user/overview.html:451
#: core/templates/weight_unit/list.html:32
#: exercises/templates/categories/admin-overview.html:30
#: exercises/templates/equipment/admin-overview.html:30
@@ -534,11 +553,10 @@ msgstr ""
#: gym/templates/gym/member_list.html:284
#: gym/templates/gym/member_list.html:321
#: mailer/templates/mailer/gym/overview.html:30
-#: nutrition/templates/units/list.html:34
msgid "Nothing found"
msgstr ""
-#: core/templates/misc/about.html:4 core/templates/template.html:160
+#: core/templates/misc/about.html:4 core/templates/template.html:150
msgid "Imprint"
msgstr ""
@@ -546,162 +564,157 @@ msgstr ""
msgid "Training"
msgstr ""
-#: core/templates/navigation.html:37 core/templates/user/overview.html:25
+#: core/templates/navigation.html:36 core/templates/user/overview.html:28
msgid "Routines"
msgstr ""
-#: core/templates/navigation.html:45 core/templates/user/overview.html:70
+#: core/templates/navigation.html:44 core/templates/user/overview.html:73
msgid "Calendar"
msgstr ""
-#: core/templates/navigation.html:55
+#: core/templates/navigation.html:53
msgid "Measurements"
msgstr ""
-#: core/templates/navigation.html:66 gallery/templates/images/overview.html:6
+#: core/templates/navigation.html:64 gallery/templates/images/overview.html:6
msgid "Gallery"
msgstr ""
-#: core/templates/navigation.html:72
-msgid "Workout templates"
+#: core/templates/navigation.html:74 core/templates/navigation.html:400
+#: trophies/templates/trophies/overview.html:7
+msgid "Trophies"
msgstr ""
#: core/templates/navigation.html:79
+msgid "Workout templates"
+msgstr ""
+
+#: core/templates/navigation.html:86
msgid "Your templates"
msgstr ""
-#: core/templates/navigation.html:88
+#: core/templates/navigation.html:95
msgid "Public templates"
msgstr ""
-#: core/templates/navigation.html:96 software/templates/features.html:51
+#: core/templates/navigation.html:103 software/templates/features.html:51
#: software/templates/features.html:480
msgid "Exercises"
msgstr ""
-#: core/templates/navigation.html:102 core/templates/navigation.html:176
-#: core/templates/navigation.html:339
+#: core/templates/navigation.html:109 core/templates/navigation.html:336
msgid "Administration"
msgstr ""
-#: core/templates/navigation.html:106
+#: core/templates/navigation.html:113
msgid "Exercise edit history"
msgstr ""
-#: core/templates/navigation.html:112
+#: core/templates/navigation.html:119
msgid "Equipment"
msgstr ""
-#: core/templates/navigation.html:118
+#: core/templates/navigation.html:125
msgid "Muscles"
msgstr ""
-#: core/templates/navigation.html:124
+#: core/templates/navigation.html:131
#: exercises/templates/categories/admin-overview.html:4
msgid "Categories"
msgstr ""
-#: core/templates/navigation.html:139 software/templates/features.html:468
+#: core/templates/navigation.html:146 software/templates/features.html:468
msgid "Nutrition"
msgstr ""
-#: core/templates/navigation.html:147 core/templates/user/overview.html:144
+#: core/templates/navigation.html:154 core/templates/user/overview.html:147
msgid "Nutrition plans"
msgstr ""
-#: core/templates/navigation.html:156
+#: core/templates/navigation.html:163
msgid "BMI calculator"
msgstr ""
-#: core/templates/navigation.html:165 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:172 nutrition/templates/rate/form.html:18
msgid "Daily calories calculator"
msgstr ""
-#: core/templates/navigation.html:171
+#: core/templates/navigation.html:178
#: nutrition/templates/ingredient/overview.html:10
msgid "Ingredient overview"
msgstr ""
-#: core/templates/navigation.html:180 nutrition/templates/units/list.html:6
-msgid "Ingredient weight units"
-msgstr ""
-
-#: core/templates/navigation.html:196 software/templates/features.html:463
+#: core/templates/navigation.html:193 software/templates/features.html:463
msgid "Body weight"
msgstr ""
-#: core/templates/navigation.html:203 core/templates/user/overview.html:114
+#: core/templates/navigation.html:200 core/templates/user/overview.html:117
msgid "Weight overview"
msgstr ""
-#: core/templates/navigation.html:217
+#: core/templates/navigation.html:214
msgid "About this software"
msgstr ""
-#: core/templates/navigation.html:223 software/templates/about_us.html:5
+#: core/templates/navigation.html:220 software/templates/about_us.html:5
msgid "Support & Get Involved"
msgstr ""
-#: core/templates/navigation.html:229 software/templates/features.html:528
+#: core/templates/navigation.html:226 software/templates/features.html:528
msgid "REST API"
msgstr ""
-#: core/templates/navigation.html:235 utils/models.py:45
+#: core/templates/navigation.html:232 utils/models.py:45
msgid "License"
msgstr ""
-#: core/templates/navigation.html:241
+#: core/templates/navigation.html:238
msgid "Developer documentation"
msgstr ""
-#: core/templates/navigation.html:248
+#: core/templates/navigation.html:245
msgid "Get the code"
msgstr ""
-#: core/templates/navigation.html:255 core/templates/template.html:199
-#: software/templates/features.html:603
+#: core/templates/navigation.html:252 core/templates/template.html:202
+#: software/templates/features.html:614
msgid "Translate"
msgstr ""
-#: core/templates/navigation.html:292 core/templates/user/login.html:30
+#: core/templates/navigation.html:289 core/templates/user/login.html:30
msgid "Reset password"
msgstr ""
-#: core/templates/navigation.html:301 core/templates/navigation.html:329
+#: core/templates/navigation.html:298 core/templates/navigation.html:326
msgid "Logout"
msgstr ""
-#: core/templates/navigation.html:320
+#: core/templates/navigation.html:317
msgid "My preferences"
msgstr ""
-#: core/templates/navigation.html:352
+#: core/templates/navigation.html:349
msgid "Licenses"
msgstr ""
-#: core/templates/navigation.html:360
+#: core/templates/navigation.html:357
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr ""
-#: core/templates/navigation.html:368 core/templates/weight_unit/list.html:4
-#: nutrition/templates/ingredient/view.html:141
+#: core/templates/navigation.html:365 core/templates/weight_unit/list.html:4
+#: nutrition/templates/ingredient/view.html:182
msgid "Weight units"
msgstr ""
-#: core/templates/navigation.html:376 core/templates/user/list.html:4
+#: core/templates/navigation.html:373 core/templates/user/list.html:4
msgid "User list"
msgstr ""
-#: core/templates/navigation.html:382
+#: core/templates/navigation.html:379
msgid "Gyms"
msgstr ""
-#: core/templates/navigation.html:403
-#: trophies/templates/trophies/overview.html:7
-msgid "Trophies"
-msgstr ""
-
#: core/templates/registration/password_reset_complete.html:4
msgid "Password reset complete"
msgstr ""
@@ -757,25 +770,29 @@ msgstr ""
msgid "next"
msgstr ""
-#: core/templates/template.html:96
+#: core/templates/template.html:86
msgid "Close"
msgstr ""
-#: core/templates/template.html:112
+#: core/templates/template.html:102
msgid ""
"You are using a guest account, data entered will be deleted after a week."
msgstr ""
-#: core/templates/template.html:117
+#: core/templates/template.html:107
msgid "Create some demo entries"
msgstr ""
-#: core/templates/template.html:165 software/templates/features.html:568
+#: core/templates/template.html:155 software/templates/features.html:568
#: software/templates/tos.html:7
msgid "Terms of service"
msgstr ""
-#: core/templates/template_features.html:53 software/templates/features.html:9
+#: core/templates/template.html:181 software/templates/features.html:595
+msgid "Browser language"
+msgstr ""
+
+#: core/templates/template_features.html:46 software/templates/features.html:9
msgid "Features"
msgstr ""
@@ -830,99 +847,94 @@ msgstr ""
msgid "Forgot password?"
msgstr ""
-#: core/templates/user/overview.html:25 core/templates/user/overview.html:68
-#: core/templates/user/overview.html:112 core/templates/user/overview.html:144
-#: core/templates/user/overview.html:348 core/templates/user/overview.html:390
-#: core/templates/user/overview.html:426
+#: core/templates/user/overview.html:28 core/templates/user/overview.html:71
+#: core/templates/user/overview.html:115 core/templates/user/overview.html:147
+#: core/templates/user/overview.html:351 core/templates/user/overview.html:393
+#: core/templates/user/overview.html:429
#, python-format
msgid "last %(number)s"
msgstr ""
-#: core/templates/user/overview.html:27 core/templates/user/overview.html:146
-#: core/templates/user/overview.html:343 core/templates/user/overview.html:382
-#: core/templates/user/overview.html:421 gym/templates/gym/member_list.html:226
+#: core/templates/user/overview.html:30 core/templates/user/overview.html:149
+#: core/templates/user/overview.html:346 core/templates/user/overview.html:385
+#: core/templates/user/overview.html:424 gym/templates/gym/member_list.html:226
#: gym/templates/gym/member_list.html:262
#: gym/templates/gym/member_list.html:302
msgid "Overview"
msgstr ""
-#: core/templates/user/overview.html:34 core/templates/user/overview.html:76
-#: core/templates/user/overview.html:120 core/templates/user/overview.html:152
+#: core/templates/user/overview.html:37 core/templates/user/overview.html:79
+#: core/templates/user/overview.html:123 core/templates/user/overview.html:155
#: manager/helpers.py:88 software/templates/about_us.html:170
#: weight/templates/import_csv_preview.html:13
#: weight/templates/import_csv_preview.html:42 weight/views.py:54
msgid "Date"
msgstr ""
-#: core/templates/user/overview.html:35 core/templates/user/overview.html:153
+#: core/templates/user/overview.html:38 core/templates/user/overview.html:156
#: gym/models/contract.py:58 gym/models/contract.py:109
msgid "Description"
msgstr ""
-#: core/templates/user/overview.html:36
+#: core/templates/user/overview.html:39
msgid "Number of logs (days)"
msgstr ""
-#: core/templates/user/overview.html:37 core/views/user.py:590
+#: core/templates/user/overview.html:40 core/views/user.py:606
#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:158
msgid "Last activity"
msgstr ""
-#: core/templates/user/overview.html:58
+#: core/templates/user/overview.html:61
msgid "No workouts found."
msgstr ""
-#: core/templates/user/overview.html:68
+#: core/templates/user/overview.html:71
msgid "Log"
msgstr ""
-#: core/templates/user/overview.html:77
+#: core/templates/user/overview.html:80
msgid "General impression"
msgstr ""
-#: core/templates/user/overview.html:78 core/templates/user/overview.html:390
+#: core/templates/user/overview.html:81 core/templates/user/overview.html:393
msgid "Notes"
msgstr ""
-#: core/templates/user/overview.html:79
-#: exercises/templates/history/overview.html:30
-msgid "Time"
-msgstr ""
-
-#: core/templates/user/overview.html:112 core/templates/user/overview.html:121
+#: core/templates/user/overview.html:115 core/templates/user/overview.html:124
#: manager/helpers.py:89 weight/templates/import_csv_preview.html:14
#: weight/templates/import_csv_preview.html:43 weight/views.py:54
msgid "Weight"
msgstr ""
-#: core/templates/user/overview.html:154
-#: nutrition/templates/ingredient/view.html:51 nutrition/views/plan.py:245
+#: core/templates/user/overview.html:157
+#: nutrition/templates/ingredient/view.html:52 nutrition/views/plan.py:244
msgid "Energy"
msgstr ""
-#: core/templates/user/overview.html:155
-#: nutrition/templates/ingredient/view.html:58 nutrition/views/plan.py:251
+#: core/templates/user/overview.html:158
+#: nutrition/templates/ingredient/view.html:59 nutrition/views/plan.py:250
msgid "Protein"
msgstr ""
-#: core/templates/user/overview.html:156
-#: nutrition/templates/ingredient/view.html:64 nutrition/views/plan.py:259
+#: core/templates/user/overview.html:159
+#: nutrition/templates/ingredient/view.html:65 nutrition/views/plan.py:258
msgid "Carbohydrates"
msgstr ""
-#: core/templates/user/overview.html:157
-#: nutrition/templates/ingredient/view.html:80 nutrition/views/plan.py:273
+#: core/templates/user/overview.html:160
+#: nutrition/templates/ingredient/view.html:81 nutrition/views/plan.py:272
msgid "Fat"
msgstr ""
-#: core/templates/user/overview.html:170
-#: nutrition/templates/ingredient/view.html:53
+#: core/templates/user/overview.html:173
+#: nutrition/templates/ingredient/view.html:54
msgid "kcal"
msgstr ""
-#: core/templates/user/overview.html:201 core/templates/user/overview.html:340
-#: core/templates/user/overview.html:379 core/templates/user/overview.html:418
-#: core/templates/user/overview.html:463 gym/templates/gym/list.html:45
+#: core/templates/user/overview.html:204 core/templates/user/overview.html:343
+#: core/templates/user/overview.html:382 core/templates/user/overview.html:421
+#: core/templates/user/overview.html:466 gym/templates/gym/list.html:45
#: gym/templates/gym/member_list.html:91 gym/templates/gym/member_list.html:149
#: gym/templates/gym/member_list.html:187
#: gym/templates/gym/member_list.html:223
@@ -931,109 +943,113 @@ msgstr ""
msgid "Actions"
msgstr ""
-#: core/templates/user/overview.html:210
+#: core/templates/user/overview.html:213
msgid "Deactivate user"
msgstr ""
-#: core/templates/user/overview.html:214
+#: core/templates/user/overview.html:217
msgid "Activate user"
msgstr ""
-#: core/templates/user/overview.html:223
+#: core/templates/user/overview.html:226
msgid "Reset user password"
msgstr ""
-#: core/templates/user/overview.html:227 gym/templates/gym/member_list.html:30
+#: core/templates/user/overview.html:230 gym/templates/gym/member_list.html:30
msgid "Roles"
msgstr ""
-#: core/templates/user/overview.html:243
+#: core/templates/user/overview.html:246
msgid "Password reset confirmation"
msgstr ""
-#: core/templates/user/overview.html:247
+#: core/templates/user/overview.html:250
msgid "Do you really want to change this user&#39;s password?"
msgstr ""
-#: core/templates/user/overview.html:250
+#: core/templates/user/overview.html:253
#: exercises/templates/history/overview.html:106
+#: nutrition/templates/ingredient/view.html:148
+#: nutrition/templates/ingredient/view.html:160
msgid "No"
msgstr ""
-#: core/templates/user/overview.html:251
+#: core/templates/user/overview.html:254
#: exercises/templates/history/overview.html:99
+#: nutrition/templates/ingredient/view.html:146
+#: nutrition/templates/ingredient/view.html:158
msgid "Yes"
msgstr ""
-#: core/templates/user/overview.html:272 gym/templates/gym/member_list.html:105
+#: core/templates/user/overview.html:275 gym/templates/gym/member_list.html:105
msgid "Details"
msgstr ""
-#: core/templates/user/overview.html:276 gym/views/export.py:57
-#: manager/helpers.py:89 nutrition/views/plan.py:151
-#: nutrition/views/plan.py:157
+#: core/templates/user/overview.html:279 gym/views/export.py:57
+#: manager/helpers.py:89 nutrition/views/plan.py:150
+#: nutrition/views/plan.py:156
msgid "Nr."
msgstr ""
-#: core/templates/user/overview.html:298 gym/models/contract.py:287
+#: core/templates/user/overview.html:301 gym/models/contract.py:287
#: gym/models/gym.py:50 gym/templates/contract/view.html:75
#: gym/templates/gym/member_list.html:112 gym/views/export.py:68
msgid "Phone"
msgstr ""
-#: core/templates/user/overview.html:302 gym/templates/contract/view.html:87
+#: core/templates/user/overview.html:305 gym/templates/contract/view.html:87
#: gym/templates/gym/member_list.html:130
msgid "Address"
msgstr ""
-#: core/templates/user/overview.html:313
+#: core/templates/user/overview.html:316
msgid "Registered"
msgstr ""
-#: core/templates/user/overview.html:317
+#: core/templates/user/overview.html:320
msgid "Last login"
msgstr ""
-#: core/templates/user/overview.html:322
+#: core/templates/user/overview.html:325
msgid "Status"
msgstr ""
-#: core/templates/user/overview.html:325
+#: core/templates/user/overview.html:328
msgid "Active"
msgstr ""
-#: core/templates/user/overview.html:327
+#: core/templates/user/overview.html:330
msgid "Inactive"
msgstr ""
-#: core/templates/user/overview.html:348 gym/templates/contract/list.html:4
+#: core/templates/user/overview.html:351 gym/templates/contract/list.html:4
#: gym/templates/gym/member_list.html:218
msgid "Contracts"
msgstr ""
-#: core/templates/user/overview.html:426 gym/templates/document/list.html:4
+#: core/templates/user/overview.html:429 gym/templates/document/list.html:4
msgid "Documents"
msgstr ""
-#: core/templates/user/overview.html:433 gym/templates/document/list.html:33
+#: core/templates/user/overview.html:436 gym/templates/document/list.html:33
msgid "Download"
msgstr ""
-#: core/templates/user/overview.html:474 gym/views/admin_config.py:44
+#: core/templates/user/overview.html:477 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:477 gym/models/user_config.py:92
+#: core/templates/user/overview.html:480 gym/models/user_config.py:92
msgid "Include in inactive overview"
msgstr ""
-#: core/templates/user/overview.html:510
+#: core/templates/user/overview.html:513
#, python-format
msgid "Admin login is only available for users in %(gym_name)s"
msgstr ""
-#: core/templates/user/overview.html:514
+#: core/templates/user/overview.html:517
msgid "Log in as this user"
msgstr ""
@@ -1057,7 +1073,7 @@ msgstr ""
msgid "You need to verify your email to contribute exercises"
msgstr ""
-#: core/templates/user/preferences.html:55 core/views/user.py:601
+#: core/templates/user/preferences.html:55 core/views/user.py:617
msgid "Change password"
msgstr ""
@@ -1065,23 +1081,23 @@ msgstr ""
msgid "Already have an account?"
msgstr ""
-#: core/templatetags/wger_extras.py:142 i18n.tpl:38
+#: core/templatetags/wger_extras.py:142 i18n.tpl:39
msgid "kg"
msgstr ""
#: core/templatetags/wger_extras.py:144
-#: nutrition/templates/ingredient/view.html:60
-#: nutrition/templates/ingredient/view.html:66
-#: nutrition/templates/ingredient/view.html:73
-#: nutrition/templates/ingredient/view.html:82
-#: nutrition/templates/ingredient/view.html:89
-#: nutrition/templates/ingredient/view.html:111
-#: nutrition/templates/ingredient/view.html:121
+#: nutrition/templates/ingredient/view.html:61
+#: nutrition/templates/ingredient/view.html:67
+#: nutrition/templates/ingredient/view.html:74
+#: nutrition/templates/ingredient/view.html:83
+#: nutrition/templates/ingredient/view.html:90
+#: nutrition/templates/ingredient/view.html:112
+#: nutrition/templates/ingredient/view.html:122
msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr ""
-#: core/templatetags/wger_extras.py:147 i18n.tpl:39
+#: core/templatetags/wger_extras.py:147 i18n.tpl:40
msgid "lb"
msgstr ""
@@ -1090,84 +1106,83 @@ msgctxt "weight unit, i.e. ounces"
msgid "oz"
msgstr ""
-#: core/views/languages.py:85 exercises/views/categories.py:122
+#: core/views/languages.py:88 exercises/views/categories.py:122
#: exercises/views/equipment.py:103 exercises/views/muscles.py:99
-#: nutrition/views/ingredient.py:120 nutrition/views/unit.py:110
+#: nutrition/views/ingredient.py:125
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
+#: core/views/languages.py:96 core/views/license.py:103
+#: core/views/repetition_units.py:114 core/views/weight_units.py:115
#: exercises/views/categories.py:128 exercises/views/muscles.py:106
#: gallery/views/images.py:124 gym/views/admin_notes.py:196
#: gym/views/document.py:206 gym/views/gym.py:481
-#: nutrition/views/ingredient.py:127 nutrition/views/unit.py:117
+#: nutrition/views/ingredient.py:132
#, python-brace-format
msgid "Delete {0}?"
msgstr ""
-#: core/views/languages.py:111 core/views/license.py:85
-#: core/views/repetition_units.py:86 core/views/user.py:464
+#: core/views/languages.py:114 core/views/license.py:85
+#: core/views/repetition_units.py:96 core/views/user.py:480
#: core/views/weight_units.py:86 exercises/views/categories.py:98
#: exercises/views/equipment.py:81 exercises/views/muscles.py:87
#: gym/views/admin_notes.py:161 gym/views/config.py:68
#: gym/views/contract.py:186 gym/views/contract_option.py:123
#: gym/views/contract_type.py:123 gym/views/document.py:171
-#: gym/views/gym.py:463 nutrition/views/ingredient.py:146
-#: nutrition/views/unit.py:143
+#: gym/views/gym.py:463 nutrition/views/ingredient.py:151
#, python-brace-format
msgid "Edit {0}"
msgstr ""
-#: core/views/misc.py:74
+#: core/views/misc.py:73
msgid ""
"We have created sample workout, workout schedules, weight logs, (body) "
"weight and nutrition plan entries so you can better see what this site can "
"do. Feel free to edit or delete them!"
msgstr ""
-#: core/views/user.py:143
+#: core/views/user.py:145
#, python-brace-format
msgid "Account \"{0}\" was successfully deleted"
msgstr ""
-#: core/views/user.py:279
+#: core/views/user.py:287
msgid "You were successfully registered"
msgstr ""
-#: core/views/user.py:341
+#: core/views/user.py:357
msgid "Settings successfully updated"
msgstr ""
-#: core/views/user.py:380
+#: core/views/user.py:396
msgid "The user was successfully deactivated"
msgstr ""
-#: core/views/user.py:417
+#: core/views/user.py:433
msgid "The user was successfully activated"
msgstr ""
-#: core/views/user.py:432
+#: core/views/user.py:448
msgid "Edit user"
msgstr ""
-#: core/views/user.py:587 gym/templates/gym/member_list.html:26
+#: core/views/user.py:603 gym/templates/gym/member_list.html:26
#: gym/views/gym.py:158
msgid "ID"
msgstr ""
-#: core/views/user.py:588 gym/forms.py:95 gym/templates/contract/view.html:55
+#: core/views/user.py:604 gym/forms.py:95 gym/templates/contract/view.html:55
#: gym/templates/gym/member_list.html:27 gym/views/export.py:59
#: gym/views/gym.py:158 gym/views/gym.py:217
msgid "Username"
msgstr ""
-#: core/views/user.py:591 gym/templates/gym/new_user.html:34
+#: core/views/user.py:607 gym/templates/gym/new_user.html:34
#: gym/views/export.py:58 gym/views/gym.py:217
msgid "Gym"
msgstr ""
-#: core/views/user.py:650
+#: core/views/user.py:678
#, python-format
msgid "A verification email was sent to %(email)s"
msgstr ""
@@ -1184,16 +1199,16 @@ msgstr ""
msgid "A more basic name for the muscle"
msgstr ""
-#: exercises/models/video.py:50
+#: exercises/models/video.py:52
#, python-format
msgid "Maximum file size is %(size)sMB."
msgstr ""
-#: exercises/models/video.py:57 exercises/models/video.py:65
+#: exercises/models/video.py:59 exercises/models/video.py:67
msgid "File type is not supported"
msgstr ""
-#: exercises/models/video.py:70
+#: exercises/models/video.py:72
msgid "File is not a valid video"
msgstr ""
@@ -1264,7 +1279,11 @@ msgstr ""
msgid "Add muscle"
msgstr ""
-#: gallery/templates/images/overview.html:72
+#: gallery/forms.py:35
+msgid "If date is left empty, it will be read from the image instead"
+msgstr ""
+
+#: gallery/templates/images/overview.html:69
msgid "Add image"
msgstr ""
@@ -1330,7 +1349,7 @@ msgid "Contract type"
msgstr ""
#: gym/models/contract.py:211 gym/templates/contract/view.html:59
-#: nutrition/forms.py:58
+#: nutrition/forms.py:67
msgid "Amount"
msgstr ""
@@ -1506,7 +1525,7 @@ msgstr ""
msgid "Add member"
msgstr ""
-#: gym/templates/gym/new_user.html:48 nutrition/templates/rate/form.html:120
+#: gym/templates/gym/new_user.html:48 nutrition/templates/rate/form.html:121
msgid "Info"
msgstr ""
@@ -1673,10 +1692,6 @@ msgstr ""
msgid "Quads"
msgstr ""
-#: i18n.tpl:30
-msgid "Repetitions"
-msgstr ""
-
#: i18n.tpl:31
msgid "Resistance band"
msgstr ""
@@ -1705,175 +1720,179 @@ msgstr ""
msgid "Until Failure"
msgstr ""
-#: i18n.tpl:40
-msgid "none (bodyweight exercise)"
+#: i18n.tpl:38
+msgid "Meters"
msgstr ""
#: i18n.tpl:41
-msgid "Beginner"
+msgid "none (bodyweight exercise)"
msgstr ""
#: i18n.tpl:42
-msgid "Consistent"
+msgid "Beginner"
msgstr ""
#: i18n.tpl:43
-msgid "Dedicated"
+msgid "Consistent"
msgstr ""
#: i18n.tpl:44
-msgid "Obsessed"
+msgid "Dedicated"
msgstr ""
#: i18n.tpl:45
-msgid "Legend"
+msgid "Obsessed"
msgstr ""
#: i18n.tpl:46
-msgid "Veteran"
+msgid "Legend"
msgstr ""
#: i18n.tpl:47
-msgid "Titan"
+msgid "Veteran"
msgstr ""
#: i18n.tpl:48
-msgid "Unstoppable"
+msgid "Titan"
msgstr ""
#: i18n.tpl:49
-msgid "Weekend Warrior"
+msgid "Unstoppable"
msgstr ""
#: i18n.tpl:50
-msgid "Elephant lifter"
+msgid "Weekend Warrior"
msgstr ""
#: i18n.tpl:51
-msgid "Bus lifter"
+msgid "Elephant lifter"
msgstr ""
#: i18n.tpl:52
-msgid "Plane lifter"
+msgid "Bus lifter"
msgstr ""
#: i18n.tpl:53
-msgid "Blue whale lifter"
+msgid "Plane lifter"
msgstr ""
#: i18n.tpl:54
-msgid "Space Station lifter"
+msgid "Blue whale lifter"
msgstr ""
#: i18n.tpl:55
-msgid "Millionaire"
+msgid "Space Station lifter"
msgstr ""
#: i18n.tpl:56
-msgid "Atlas"
+msgid "Millionaire"
msgstr ""
#: i18n.tpl:57
-msgid "Early Bird"
+msgid "Atlas"
msgstr ""
#: i18n.tpl:58
-msgid "Night Owl"
+msgid "Early Bird"
msgstr ""
#: i18n.tpl:59
-msgid "New Year, New Me"
+msgid "Night Owl"
msgstr ""
#: i18n.tpl:60
-msgid "Phoenix"
+msgid "New Year, New Me"
msgstr ""
#: i18n.tpl:61
-msgid "Personal Record"
+msgid "Phoenix"
msgstr ""
#: i18n.tpl:62
-msgid "Complete your first workout"
+msgid "Personal Record"
msgstr ""
#: i18n.tpl:63
-msgid "Complete 10 workouts"
+msgid "Complete your first workout"
msgstr ""
#: i18n.tpl:64
-msgid "Complete 50 workouts"
+msgid "Complete 10 workouts"
msgstr ""
#: i18n.tpl:65
-msgid "Complete 100 workouts"
+msgid "Complete 50 workouts"
msgstr ""
#: i18n.tpl:66
-msgid "Complete 200 workouts"
+msgid "Complete 100 workouts"
msgstr ""
#: i18n.tpl:67
-msgid "Complete 500 workouts"
+msgid "Complete 200 workouts"
msgstr ""
#: i18n.tpl:68
-msgid "Complete 1000 workouts"
+msgid "Complete 500 workouts"
msgstr ""
#: i18n.tpl:69
-msgid "Maintain a 30-day workout streak"
+msgid "Complete 1000 workouts"
msgstr ""
#: i18n.tpl:70
-msgid "Work out on Saturday and Sunday for 4 consecutive weekends"
+msgid "Maintain a 30-day workout streak"
msgstr ""
#: i18n.tpl:71
-msgid "Lift a cumulative total of 5.000 kg"
+msgid "Work out on Saturday and Sunday for 4 consecutive weekends"
msgstr ""
#: i18n.tpl:72
-msgid "Lift a cumulative total of 20.000 kg"
+msgid "Lift a cumulative total of 5.000 kg"
msgstr ""
#: i18n.tpl:73
-msgid "Lift a cumulative total of 50.000 kg"
+msgid "Lift a cumulative total of 20.000 kg"
msgstr ""
#: i18n.tpl:74
-msgid "Lift a cumulative total of 150.000 kg"
+msgid "Lift a cumulative total of 50.000 kg"
msgstr ""
#: i18n.tpl:75
-msgid "Lift a cumulative total of 450.000 kg"
+msgid "Lift a cumulative total of 150.000 kg"
msgstr ""
#: i18n.tpl:76
-msgid "Lift a cumulative total of 1.000.000 kg"
+msgid "Lift a cumulative total of 450.000 kg"
msgstr ""
#: i18n.tpl:77
-msgid "Lift a cumulative total of 10.000.000 kg"
+msgid "Lift a cumulative total of 1.000.000 kg"
msgstr ""
#: i18n.tpl:78
-msgid "Complete a workout before 6:00 AM"
+msgid "Lift a cumulative total of 10.000.000 kg"
msgstr ""
#: i18n.tpl:79
-msgid "Complete a workout after 9:00 PM"
+msgid "Complete a workout before 6:00 AM"
msgstr ""
#: i18n.tpl:80
-msgid "Work out on January 1st"
+msgid "Complete a workout after 9:00 PM"
msgstr ""
#: i18n.tpl:81
-msgid "Return to training after being inactive for 30 days"
+msgid "Work out on January 1st"
msgstr ""
#: i18n.tpl:82
+msgid "Return to training after being inactive for 30 days"
+msgstr ""
+
+#: i18n.tpl:83
msgid "Achieve a new Personal Record on any exercise"
msgstr ""
@@ -1955,7 +1974,7 @@ msgstr ""
msgid "Routine will expire soon"
msgstr ""
-#: manager/models/routine.py:153 manager/models/session.py:145
+#: manager/models/routine.py:154 manager/models/session.py:145
msgid "The start time cannot be after the end time."
msgstr ""
@@ -2027,36 +2046,56 @@ msgstr ""
msgid "Workout for %s"
msgstr ""
-#: nutrition/forms.py:62
+#: nutrition/extract_info/off.py:72 nutrition/extract_info/off.py:91
+msgid "Serving"
+msgstr ""
+
+#: nutrition/forms.py:71 nutrition/forms.py:208
msgid "Unit"
msgstr ""
-#: nutrition/forms.py:170 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:179 nutrition/templates/rate/form.html:77
msgid "Basic caloric intake"
msgstr ""
-#: nutrition/forms.py:171
+#: nutrition/forms.py:180
msgid "Your basic caloric intake as calculated for your data"
msgstr ""
-#: nutrition/forms.py:176
+#: nutrition/forms.py:185
msgid "Additional calories"
msgstr ""
-#: nutrition/forms.py:178
+#: nutrition/forms.py:187
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
msgstr ""
#: nutrition/forms.py:209
+msgid "grams (g)"
+msgstr ""
+
+#: nutrition/forms.py:219
msgid "Ingredient"
msgstr ""
-#: nutrition/forms.py:213
+#: nutrition/forms.py:223
msgid "Also search for names in English"
msgstr ""
+#: nutrition/forms.py:239
+msgid "Quantity"
+msgstr ""
+
+#: nutrition/forms.py:241
+msgid "Enter a quantity and choose grams (g) or one of the serving units."
+msgstr ""
+
+#: nutrition/models/ingredient.py:526
+msgid "Portion"
+msgstr ""
+
#: nutrition/templates/ingredient/email_new.tpl:1
#, python-format
msgid ""
@@ -2094,59 +2133,86 @@ msgid ""
"sucessfully."
msgstr ""
-#: nutrition/templates/ingredient/overview.html:38
+#: nutrition/templates/ingredient/overview.html:32
+#: nutrition/templates/ingredient/overview.html:68
+#: nutrition/templates/ingredient/view.html:143
+msgid "Vegan"
+msgstr ""
+
+#: nutrition/templates/ingredient/overview.html:34
+#: nutrition/templates/ingredient/overview.html:79
+#: nutrition/templates/ingredient/view.html:155
+msgid "Vegetarian"
+msgstr ""
+
+#: nutrition/templates/ingredient/overview.html:43
msgid "No ingredients."
msgstr ""
-#: nutrition/templates/ingredient/overview.html:49
+#: nutrition/templates/ingredient/overview.html:54
msgid "Search"
msgstr ""
-#: nutrition/templates/ingredient/view.html:45 nutrition/views/plan.py:237
+#: nutrition/templates/ingredient/overview.html:57
+msgid "Filter"
+msgstr ""
+
+#: nutrition/templates/ingredient/overview.html:83
+msgid "Apply"
+msgstr ""
+
+#: nutrition/templates/ingredient/overview.html:85
+msgid "Reset"
+msgstr ""
+
+#: nutrition/templates/ingredient/view.html:46 nutrition/views/plan.py:236
msgid "Macronutrients"
msgstr ""
-#: nutrition/templates/ingredient/view.html:54
+#: nutrition/templates/ingredient/view.html:55
msgid "kJ"
msgstr ""
-#: nutrition/templates/ingredient/view.html:70 nutrition/views/plan.py:267
+#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:266
msgid "Sugar content in carbohydrates"
msgstr ""
-#: nutrition/templates/ingredient/view.html:75
-#: nutrition/templates/ingredient/view.html:91
-#: nutrition/templates/ingredient/view.html:113
-#: nutrition/templates/ingredient/view.html:123
+#: nutrition/templates/ingredient/view.html:76
+#: nutrition/templates/ingredient/view.html:92
+#: nutrition/templates/ingredient/view.html:114
+#: nutrition/templates/ingredient/view.html:124
msgid "n.A."
msgstr ""
-#: nutrition/templates/ingredient/view.html:86 nutrition/views/plan.py:281
+#: nutrition/templates/ingredient/view.html:87 nutrition/views/plan.py:280
msgid "Saturated fat content in fats"
msgstr ""
-#: nutrition/templates/ingredient/view.html:102
+#: nutrition/templates/ingredient/view.html:103
msgid "Others"
msgstr ""
-#: nutrition/templates/ingredient/view.html:108 nutrition/views/plan.py:287
+#: nutrition/templates/ingredient/view.html:109 nutrition/views/plan.py:286
msgid "Fiber"
msgstr ""
-#: nutrition/templates/ingredient/view.html:118 nutrition/views/plan.py:293
+#: nutrition/templates/ingredient/view.html:119 nutrition/views/plan.py:292
msgid "Sodium"
msgstr ""
-#: nutrition/templates/ingredient/view.html:143
-#: nutrition/templates/units/list.html:50 nutrition/views/unit.py:86
+#: nutrition/templates/ingredient/view.html:136
+msgid "Dietary information"
+msgstr ""
+
+#: nutrition/templates/ingredient/view.html:184
msgid "Add new weight unit"
msgstr ""
-#: nutrition/templates/rate/form.html:25
+#: nutrition/templates/rate/form.html:26
msgid "Basal metabolic rate"
msgstr ""
-#: nutrition/templates/rate/form.html:26
+#: nutrition/templates/rate/form.html:27
msgid ""
"The basal metabolic rate is the amount of energy expended daily\n"
"at rest. This is the minimum energy needed for the body to function, without "
@@ -2154,36 +2220,36 @@ msgid ""
"additional physical activity."
msgstr ""
-#: nutrition/templates/rate/form.html:37
+#: nutrition/templates/rate/form.html:38
msgid "Your basic metabolic rate is: "
msgstr ""
-#: nutrition/templates/rate/form.html:47
+#: nutrition/templates/rate/form.html:48
msgid "Physical activities"
msgstr ""
-#: nutrition/templates/rate/form.html:48
+#: nutrition/templates/rate/form.html:49
msgid ""
"The physical activity level (PAL) is a factor used to to express\n"
"the additional physical activity and is used to calculate the total energy\n"
"required per day."
msgstr ""
-#: nutrition/templates/rate/form.html:59
+#: nutrition/templates/rate/form.html:60
msgid "Factor for daily activities: "
msgstr ""
-#: nutrition/templates/rate/form.html:67
+#: nutrition/templates/rate/form.html:68
msgid ""
"The base caloric intake is the amount of calories your metabolism\n"
"needs based on your level of physical activity."
msgstr ""
-#: nutrition/templates/rate/form.html:81
+#: nutrition/templates/rate/form.html:82
msgid "Calculate basic caloric intake"
msgstr ""
-#: nutrition/templates/rate/form.html:88
+#: nutrition/templates/rate/form.html:89
msgid ""
"The total calories are the actual total calories per day. This\n"
"might include e.g. a surplus or deficit if you are bulking or cutting. "
@@ -2191,67 +2257,67 @@ msgid ""
"you might just enter yourself the amount of calories if you know the value."
msgstr ""
-#: nutrition/templates/rate/form.html:102
+#: nutrition/templates/rate/form.html:103
msgid "Transfer basic intake to total daily calories"
msgstr ""
-#: nutrition/templates/rate/form.html:106
+#: nutrition/templates/rate/form.html:107
msgid "Add additional calories to total daily calories"
msgstr ""
-#: nutrition/templates/rate/form.html:110
+#: nutrition/templates/rate/form.html:111
msgid "Save total calories to profile"
msgstr ""
-#: nutrition/templates/rate/form.html:121
+#: nutrition/templates/rate/form.html:122
msgid ""
"Please note that these calculations can only be an\n"
"approximation. If you base your nutrition plan on these values, observe\n"
"yourself for some weeks and change the total amount if needed."
msgstr ""
-#: nutrition/views/ingredient.py:158
+#: nutrition/views/ingredient.py:163
msgid "Add a new ingredient"
msgstr ""
-#: nutrition/views/plan.py:128
+#: nutrition/views/plan.py:127
msgid "Nutritional plan"
msgstr ""
-#: nutrition/views/plan.py:130
+#: nutrition/views/plan.py:129
#, python-format
msgid "Nutritional plan for %s"
msgstr ""
-#: nutrition/views/plan.py:202
+#: nutrition/views/plan.py:201
msgid "<i>This is an empty plan, what did you expect on the PDF?</i>"
msgstr ""
-#: nutrition/views/plan.py:230
+#: nutrition/views/plan.py:229
msgid "Nutritional data"
msgstr ""
-#: nutrition/views/plan.py:238
+#: nutrition/views/plan.py:237
msgid "Total"
msgstr ""
-#: nutrition/views/plan.py:239
+#: nutrition/views/plan.py:238
msgid "Percent of energy"
msgstr ""
-#: nutrition/views/plan.py:240
+#: nutrition/views/plan.py:239
msgid "g per body kg"
msgstr ""
-#: nutrition/views/unit_ingredient.py:69
+#: nutrition/views/unit_ingredient.py:64
msgid "Add a new weight unit"
msgstr ""
-#: nutrition/views/unit_ingredient.py:106
+#: nutrition/views/unit_ingredient.py:99
msgid "Edit a weight unit to ingredient connection"
msgstr ""
-#: nutrition/views/unit_ingredient.py:138
+#: nutrition/views/unit_ingredient.py:129
msgid "Delete?"
msgstr ""
@@ -2598,7 +2664,7 @@ msgstr ""
msgid "Translation"
msgstr ""
-#: utils/generic_views.py:263
+#: utils/generic_views.py:246
msgid "Yes, delete"
msgstr ""
@@ -2649,10 +2715,6 @@ msgstr ""
msgid "Import weight logs"
msgstr ""
-#: weight/templates/import_csv_form.html:9
-msgid "Submit"
-msgstr ""
-
#: weight/templates/import_csv_form.html:15
msgid ""
"Use this import field to import your weight logs into Workout\n"
diff --git a/wger/locale/sv/LC_MESSAGES/django.po b/wger/locale/sv/LC_MESSAGES/django.po
index d4bdcc2f2..d0d9f326b 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: 2026-01-17 14:03+0000\n"
+"POT-Creation-Date: 2026-04-10 10:20+0000\n"
"PO-Revision-Date: 2025-04-08 08:05+0000\n"
"Last-Translator: wonnock <[email protected]>\n"
"Language-Team: Swedish <https://hosted.weblate.org/projects/wger/web/sv/>\n"
@@ -38,7 +38,7 @@ msgstr ""
#: config/views/gym_config.py:42 core/templates/language/view.html:64
#: core/templates/license/list.html:17
#: core/templates/repetition_unit/list.html:18
-#: core/templates/user/overview.html:204 core/templates/user/overview.html:467
+#: core/templates/user/overview.html:207 core/templates/user/overview.html:470
#: core/templates/weight_unit/list.html:18
#: exercises/templates/categories/admin-overview.html:17
#: exercises/templates/equipment/admin-overview.html:17
@@ -50,30 +50,29 @@ msgstr ""
#: gym/templates/gym/list.html:19 gym/templates/gym/list.html:48
#: gym/templates/gym/member_list.html:94 gym/templates/gym/member_list.html:152
#: gym/templates/gym/member_list.html:190
-#: nutrition/templates/ingredient/view.html:164
-#: nutrition/templates/ingredient/view.html:209
-#: nutrition/templates/units/list.html:19
+#: nutrition/templates/ingredient/view.html:205
+#: nutrition/templates/ingredient/view.html:248
msgid "Edit"
msgstr "Redigera"
-#: core/forms.py:91 core/templates/navigation.html:271
-#: core/templates/navigation.html:278 core/templates/user/login.html:4
+#: core/forms.py:89 core/templates/navigation.html:268
+#: core/templates/navigation.html:275 core/templates/user/login.html:4
#: core/templates/user/registration_sidebar.html:12
#: software/templates/features.html:82 software/templates/features.html:448
msgid "Login"
msgstr "Logga in"
-#: core/forms.py:130 core/forms.py:244 gym/views/export.py:61
+#: core/forms.py:128 core/forms.py:242 gym/views/export.py:61
#: gym/views/gym.py:217
msgid "First name"
msgstr "Förnamn"
-#: core/forms.py:131 core/forms.py:245 core/templates/user/overview.html:284
+#: core/forms.py:129 core/forms.py:243 core/templates/user/overview.html:287
#: gym/views/export.py:62 gym/views/gym.py:217
msgid "Last name"
msgstr "Efternamn"
-#: core/forms.py:133 core/forms.py:210 core/templates/user/overview.html:288
+#: core/forms.py:131 core/forms.py:208 core/templates/user/overview.html:291
#: gym/models/contract.py:256 gym/models/gym.py:58
#: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:116
#: gym/templates/gym/new_user.html:30 gym/views/export.py:60
@@ -83,55 +82,55 @@ msgstr "Efternamn"
msgid "Email"
msgstr "E-post"
-#: core/forms.py:134
+#: core/forms.py:132
msgid "Used for password resets and, optionally, e-mail reminders."
msgstr ""
"Används för återställning av lösenord och e-postpåminnelser (Frivilligt)."
-#: core/forms.py:138 core/models/profile.py:222
+#: core/forms.py:136 core/models/profile.py:222
#: gym/templates/gym/new_user.html:38
msgid "Date of Birth"
msgstr "Födelsedatum"
-#: core/forms.py:177
+#: core/forms.py:175
msgid "Personal data"
msgstr "Personlig data"
-#: core/forms.py:189
+#: core/forms.py:187
msgid "Workout reminders"
msgstr "Träningspåminnelser"
-#: core/forms.py:196
+#: core/forms.py:194
msgid "Other settings"
msgstr "Andra inställningar"
-#: core/forms.py:204 core/views/user.py:614 core/views/user.py:629
-#: core/views/user.py:641 gym/forms.py:73 utils/generic_views.py:143
+#: core/forms.py:202 core/views/user.py:630 core/views/user.py:654
+#: core/views/user.py:668 gym/forms.py:73 utils/generic_views.py:137
msgid "Save"
msgstr "Spara"
-#: core/forms.py:211
+#: core/forms.py:209
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:240
+#: core/forms.py:238
msgid "This e-mail address is already in use."
msgstr "Denna mail används redan."
-#: core/forms.py:261 gym/templates/gym/new_user.html:26
+#: core/forms.py:259 gym/templates/gym/new_user.html:26
#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:217
msgid "Password"
msgstr "Lösenord"
-#: core/forms.py:263
+#: core/forms.py:261
msgid "Please enter your current password."
msgstr "Vänligen ange ditt nuvarande lösenord."
-#: core/forms.py:272 core/templates/language/view.html:70
+#: core/forms.py:270 core/templates/language/view.html:70
#: core/templates/license/list.html:21
#: core/templates/repetition_unit/list.html:22
-#: core/templates/user/overview.html:233
+#: core/templates/user/overview.html:236
#: core/templates/weight_unit/list.html:22
#: exercises/templates/categories/admin-overview.html:21
#: exercises/templates/equipment/admin-overview.html:21
@@ -139,27 +138,30 @@ msgstr "Vänligen ange ditt nuvarande lösenord."
#: gym/templates/admin_notes/list.html:37
#: gym/templates/contract_option/list.html:35
#: gym/templates/contract_type/list.html:36 gym/templates/document/list.html:46
-#: gym/templates/gym/list.html:23 nutrition/templates/ingredient/view.html:168
-#: nutrition/templates/ingredient/view.html:215
-#: nutrition/templates/units/list.html:25
+#: gym/templates/gym/list.html:23 nutrition/templates/ingredient/view.html:209
+#: nutrition/templates/ingredient/view.html:254
msgid "Delete"
msgstr "Ta bort"
-#: core/forms.py:281
+#: core/forms.py:279
msgid "Invalid password"
msgstr "Ogiltigt lösenord"
-#: core/forms.py:293
+#: core/forms.py:291 core/forms.py:349
msgid "The form is secured with reCAPTCHA"
msgstr "Formuläret är säkrat med reCAPTCHA"
-#: core/forms.py:314 core/forms.py:341 core/templates/navigation.html:272
-#: core/templates/navigation.html:285 core/templates/template.html:123
-#: core/templates/user/login.html:21 core/views/user.py:285
+#: core/forms.py:312 core/forms.py:339 core/templates/navigation.html:269
+#: core/templates/navigation.html:282 core/templates/template.html:113
+#: core/templates/user/login.html:21 core/views/user.py:293
#: software/templates/features.html:87 software/templates/features.html:442
msgid "Register"
msgstr "Registrera dig"
+#: core/forms.py:360 weight/templates/import_csv_form.html:9
+msgid "Submit"
+msgstr "Ladda upp"
+
#: core/models/language.py:31 core/templates/language/view.html:21
msgid "Language short name"
msgstr "Språk kort namn"
@@ -196,36 +198,36 @@ msgstr "Länk"
msgid "Link to license text or other information"
msgstr "Länk till licens text eller annan information"
-#: core/models/profile.py:57
+#: core/models/profile.py:60
#, python-format
msgid "%(birthdate)s is not a valid birthdate"
msgstr "%(birthdate)s är inte ett giltigt födelsedatum"
-#: core/models/profile.py:66
+#: core/models/profile.py:69
msgid "Male"
msgstr "Man"
-#: core/models/profile.py:67
+#: core/models/profile.py:70
msgid "Female"
msgstr "Kvinna"
-#: core/models/profile.py:74
+#: core/models/profile.py:77
msgid "Low"
msgstr "Låg"
-#: core/models/profile.py:75
+#: core/models/profile.py:78
msgid "Medium"
msgstr "Medium"
-#: core/models/profile.py:76
+#: core/models/profile.py:79
msgid "High"
msgstr "Hög"
-#: core/models/profile.py:82
+#: core/models/profile.py:85
msgid "Metric (kilogram)"
msgstr "Metriska (kg)"
-#: core/models/profile.py:83
+#: core/models/profile.py:86
msgid "Imperial (pound)"
msgstr "Imperial (pund)"
@@ -342,7 +344,7 @@ msgstr "Timmar per vecka i genomsnitt"
msgid "Free time"
msgstr "Fritid"
-#: core/models/profile.py:320 nutrition/templates/rate/form.html:66
+#: core/models/profile.py:320 nutrition/templates/rate/form.html:67
msgid "Total daily calories"
msgstr "Totala dagliga kalorier"
@@ -383,20 +385,43 @@ msgstr ""
msgid "Enable or disable the trophy system for this user"
msgstr ""
-#: core/models/profile.py:446
+#: core/models/profile.py:457
msgid "The sum of all hours has to be 24"
msgstr "Summan av alla timmar måste vara 24"
-#: core/models/rep_unit.py:36 core/models/weight_unit.py:42
-#: core/templates/user/overview.html:280 core/views/user.py:589
+#: core/models/rep_unit.py:32 i18n.tpl:30
+msgid "Repetitions"
+msgstr "Repetitioner"
+
+#: core/models/rep_unit.py:33 core/templates/user/overview.html:82
+#: exercises/templates/history/overview.html:30
+msgid "Time"
+msgstr "Tid"
+
+#: core/models/rep_unit.py:34
+msgid "Distance"
+msgstr ""
+
+#: core/models/rep_unit.py:47 core/models/weight_unit.py:42
+#: core/templates/user/overview.html:283 core/views/user.py:605
#: exercises/models/muscle.py:36 gym/models/contract.py:52
#: gym/models/contract.py:103 gym/models/gym.py:46
#: gym/models/user_document.py:84 gym/templates/contract/view.html:50
#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:108
-#: gym/views/gym.py:158 nutrition/templates/ingredient/view.html:151
+#: gym/views/gym.py:158 nutrition/templates/ingredient/view.html:192
msgid "Name"
msgstr "Namn"
+#: core/models/rep_unit.py:53
+#, fuzzy
+#| msgid "Unit"
+msgid "Unit Type"
+msgstr "Enhet"
+
+#: core/models/rep_unit.py:54
+msgid "The type of unit (repetitions, time, or distance)"
+msgstr ""
+
#: core/templates/403.html:4
msgid "Forbidden!"
msgstr "Förbjudet!"
@@ -424,6 +449,53 @@ msgid ""
"later time. If the problem persists, you can seek help in ways listed below:"
msgstr ""
+#: core/templates/account/email/email_confirmation_message.html:81
+msgid "Almost there!"
+msgstr ""
+
+#: core/templates/account/email/email_confirmation_message.html:85
+#, fuzzy, python-format
+#| msgid ""
+#| "You're receiving this e-mail because you requested a password reset for "
+#| "your user account at %(site_name)s."
+msgid ""
+"You're receiving this email because the user \"%(user_display)s\" has given "
+"your email address to register an account on %(site_domain)s."
+msgstr ""
+"Du får detta mail eftersom du begärt en lösenordsåterställning för ditt "
+"användarkonto på %(site_name)s."
+
+#: core/templates/account/email/email_confirmation_message.html:93
+msgid ""
+"Your email verification code is listed below. Please enter it in your open "
+"browser window."
+msgstr ""
+
+#: core/templates/account/email/email_confirmation_message.html:100
+msgid "Please click the button below to confirm your email address."
+msgstr ""
+
+#: core/templates/account/email/email_confirmation_message.html:106
+#, fuzzy
+#| msgid "Configuration"
+msgid "Confirm email"
+msgstr "Konfiguration"
+
+#: core/templates/account/email/email_confirmation_message.html:110
+#, python-format
+msgid ""
+"The link is valid for %(expire_hours)s hours (until %(date)s, %(time)s). You "
+"can request a new one from your profile settings."
+msgstr ""
+
+#: core/templates/account/email/email_confirmation_message.html:116
+msgid "If the button doesn't work, copy and paste this link into your browser:"
+msgstr ""
+
+#: core/templates/account/email/email_confirmation_message.html:125
+msgid "the wger Team"
+msgstr ""
+
#: core/templates/base.html:10
#, python-format
msgid ""
@@ -451,51 +523,7 @@ 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 verification"
-msgstr "E-post verifiering"
-
-#: core/templates/email_verification/confirm_template.html:18
-#, python-format
-msgid "%(username)s, your email was verified"
-msgstr "%(username)s, din e-post har verifierats"
-
-#: 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 "E-post Bekräftelse"
-
-#: 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 "Du är nästan dä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/language/overview.html:4 core/templates/navigation.html:344
+#: core/templates/language/overview.html:4 core/templates/navigation.html:341
msgid "Languages"
msgstr "Språk"
@@ -504,16 +532,16 @@ msgid "Nothing found."
msgstr "Ingenting hittades"
#: core/templates/language/overview.html:22
-#: nutrition/templates/ingredient/overview.html:38
+#: nutrition/templates/ingredient/overview.html:43
msgid "Add one now."
msgstr "Lägg till ett nu."
#: core/templates/language/overview.html:34 core/templates/license/list.html:43
-#: core/templates/repetition_unit/list.html:46
-#: core/templates/user/overview.html:344 core/templates/user/overview.html:384
-#: core/templates/user/overview.html:422
-#: core/templates/weight_unit/list.html:46 core/views/languages.py:74
-#: core/views/license.py:66 core/views/repetition_units.py:66
+#: core/templates/repetition_unit/list.html:44
+#: core/templates/user/overview.html:347 core/templates/user/overview.html:387
+#: core/templates/user/overview.html:425
+#: core/templates/weight_unit/list.html:46 core/views/languages.py:77
+#: core/views/license.py:66 core/views/repetition_units.py:76
#: core/views/weight_units.py:66
#: exercises/templates/categories/admin-overview.html:40
#: exercises/templates/equipment/admin-overview.html:39
@@ -526,14 +554,14 @@ msgstr "Lägg till ett nu."
#: gym/templates/gym/member_list.html:264
#: gym/templates/gym/member_list.html:303
#: mailer/templates/mailer/gym/overview.html:43
-#: nutrition/templates/ingredient/overview.html:60
+#: nutrition/templates/ingredient/overview.html:97
msgid "Add"
msgstr "Lägg till"
#: core/templates/language/view.html:61 core/templates/user/api_key.html:41
#: core/templates/user/preferences.html:50 gym/models/contract.py:203
#: gym/templates/contract/view.html:41 gym/templates/gym/member_list.html:270
-#: nutrition/templates/ingredient/view.html:206
+#: nutrition/templates/ingredient/view.html:245
msgid "Options"
msgstr "Alternativ"
@@ -543,9 +571,9 @@ msgstr "Licens lista"
#: core/templates/license/list.html:30
#: core/templates/repetition_unit/list.html:32
-#: core/templates/user/overview.html:104 core/templates/user/overview.html:136
-#: core/templates/user/overview.html:185 core/templates/user/overview.html:365
-#: core/templates/user/overview.html:404 core/templates/user/overview.html:448
+#: core/templates/user/overview.html:107 core/templates/user/overview.html:139
+#: core/templates/user/overview.html:188 core/templates/user/overview.html:368
+#: core/templates/user/overview.html:407 core/templates/user/overview.html:451
#: core/templates/weight_unit/list.html:32
#: exercises/templates/categories/admin-overview.html:30
#: exercises/templates/equipment/admin-overview.html:30
@@ -557,11 +585,10 @@ msgstr "Licens lista"
#: gym/templates/gym/member_list.html:284
#: gym/templates/gym/member_list.html:321
#: mailer/templates/mailer/gym/overview.html:30
-#: nutrition/templates/units/list.html:34
msgid "Nothing found"
msgstr "Ingenting hittades"
-#: core/templates/misc/about.html:4 core/templates/template.html:160
+#: core/templates/misc/about.html:4 core/templates/template.html:150
msgid "Imprint"
msgstr ""
@@ -569,168 +596,163 @@ msgstr ""
msgid "Training"
msgstr "Träning"
-#: core/templates/navigation.html:37 core/templates/user/overview.html:25
+#: core/templates/navigation.html:36 core/templates/user/overview.html:28
msgid "Routines"
msgstr "Rutiner"
-#: core/templates/navigation.html:45 core/templates/user/overview.html:70
+#: core/templates/navigation.html:44 core/templates/user/overview.html:73
msgid "Calendar"
msgstr "Kalender"
-#: core/templates/navigation.html:55
+#: core/templates/navigation.html:53
#, fuzzy
#| msgid "Macronutrients"
msgid "Measurements"
msgstr "Makronäringsämnen"
-#: core/templates/navigation.html:66 gallery/templates/images/overview.html:6
+#: core/templates/navigation.html:64 gallery/templates/images/overview.html:6
msgid "Gallery"
msgstr "Galleri"
-#: core/templates/navigation.html:72
+#: core/templates/navigation.html:74 core/templates/navigation.html:400
+#: trophies/templates/trophies/overview.html:7
+msgid "Trophies"
+msgstr ""
+
+#: core/templates/navigation.html:79
#, fuzzy
#| msgid "Workout complete!"
msgid "Workout templates"
msgstr "Träningsmallar"
-#: core/templates/navigation.html:79
+#: core/templates/navigation.html:86
msgid "Your templates"
msgstr "Dina mallar"
-#: core/templates/navigation.html:88
+#: core/templates/navigation.html:95
msgid "Public templates"
msgstr "Publika mallar"
-#: core/templates/navigation.html:96 software/templates/features.html:51
+#: core/templates/navigation.html:103 software/templates/features.html:51
#: software/templates/features.html:480
msgid "Exercises"
msgstr "Övningar"
-#: core/templates/navigation.html:102 core/templates/navigation.html:176
-#: core/templates/navigation.html:339
+#: core/templates/navigation.html:109 core/templates/navigation.html:336
msgid "Administration"
msgstr "Administration"
-#: core/templates/navigation.html:106
+#: core/templates/navigation.html:113
#, fuzzy
#| msgid "Exercise day"
msgid "Exercise edit history"
msgstr "Träningsdag"
-#: core/templates/navigation.html:112
+#: core/templates/navigation.html:119
msgid "Equipment"
msgstr "Utrustning"
-#: core/templates/navigation.html:118
+#: core/templates/navigation.html:125
msgid "Muscles"
msgstr "Muskler"
-#: core/templates/navigation.html:124
+#: core/templates/navigation.html:131
#: exercises/templates/categories/admin-overview.html:4
msgid "Categories"
msgstr "Kategorier"
-#: core/templates/navigation.html:139 software/templates/features.html:468
+#: core/templates/navigation.html:146 software/templates/features.html:468
msgid "Nutrition"
msgstr "Kost"
-#: core/templates/navigation.html:147 core/templates/user/overview.html:144
+#: core/templates/navigation.html:154 core/templates/user/overview.html:147
msgid "Nutrition plans"
msgstr "Kostplaner"
-#: core/templates/navigation.html:156
+#: core/templates/navigation.html:163
msgid "BMI calculator"
msgstr "BMI-kalkylator"
-#: core/templates/navigation.html:165 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:172 nutrition/templates/rate/form.html:18
msgid "Daily calories calculator"
msgstr "Dagliga-kalorier-kalkylator"
-#: core/templates/navigation.html:171
+#: core/templates/navigation.html:178
#: nutrition/templates/ingredient/overview.html:10
msgid "Ingredient overview"
msgstr "Ingrediensöversikt"
-#: core/templates/navigation.html:180 nutrition/templates/units/list.html:6
-msgid "Ingredient weight units"
-msgstr "Ingrediens viktenheter"
-
-#: core/templates/navigation.html:196 software/templates/features.html:463
+#: core/templates/navigation.html:193 software/templates/features.html:463
msgid "Body weight"
msgstr "Kroppsvikt"
-#: core/templates/navigation.html:203 core/templates/user/overview.html:114
+#: core/templates/navigation.html:200 core/templates/user/overview.html:117
msgid "Weight overview"
msgstr "Viktöversikt"
-#: core/templates/navigation.html:217
+#: core/templates/navigation.html:214
msgid "About this software"
msgstr "Om programvaran"
-#: core/templates/navigation.html:223 software/templates/about_us.html:5
+#: core/templates/navigation.html:220 software/templates/about_us.html:5
msgid "Support & Get Involved"
msgstr ""
-#: core/templates/navigation.html:229 software/templates/features.html:528
+#: core/templates/navigation.html:226 software/templates/features.html:528
msgid "REST API"
msgstr "REST API"
-#: core/templates/navigation.html:235 utils/models.py:45
+#: core/templates/navigation.html:232 utils/models.py:45
msgid "License"
msgstr "Licens"
-#: core/templates/navigation.html:241
+#: core/templates/navigation.html:238
msgid "Developer documentation"
msgstr "Dokument för utvecklare"
-#: core/templates/navigation.html:248
+#: core/templates/navigation.html:245
msgid "Get the code"
msgstr "Hämta koden"
-#: core/templates/navigation.html:255 core/templates/template.html:199
-#: software/templates/features.html:603
+#: core/templates/navigation.html:252 core/templates/template.html:202
+#: software/templates/features.html:614
msgid "Translate"
msgstr "Översätt"
-#: core/templates/navigation.html:292 core/templates/user/login.html:30
+#: core/templates/navigation.html:289 core/templates/user/login.html:30
msgid "Reset password"
msgstr "Återställ lösenord"
-#: core/templates/navigation.html:301 core/templates/navigation.html:329
+#: core/templates/navigation.html:298 core/templates/navigation.html:326
msgid "Logout"
msgstr "Logga ut"
-#: core/templates/navigation.html:320
+#: core/templates/navigation.html:317
msgid "My preferences"
msgstr "Mina preferenser"
-#: core/templates/navigation.html:352
+#: core/templates/navigation.html:349
msgid "Licenses"
msgstr "Licenser"
-#: core/templates/navigation.html:360
+#: core/templates/navigation.html:357
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr "Repetitioner"
-#: core/templates/navigation.html:368 core/templates/weight_unit/list.html:4
-#: nutrition/templates/ingredient/view.html:141
+#: core/templates/navigation.html:365 core/templates/weight_unit/list.html:4
+#: nutrition/templates/ingredient/view.html:182
msgid "Weight units"
msgstr "Viktenheter"
-#: core/templates/navigation.html:376 core/templates/user/list.html:4
+#: core/templates/navigation.html:373 core/templates/user/list.html:4
msgid "User list"
msgstr "Användarlista"
-#: core/templates/navigation.html:382
+#: core/templates/navigation.html:379
msgid "Gyms"
msgstr "Gym"
-#: core/templates/navigation.html:403
-#: trophies/templates/trophies/overview.html:7
-msgid "Trophies"
-msgstr ""
-
#: core/templates/registration/password_reset_complete.html:4
msgid "Password reset complete"
msgstr "Lösenordsåterställning fullbordad"
@@ -790,25 +812,29 @@ msgstr "tidigare"
msgid "next"
msgstr "nästa"
-#: core/templates/template.html:96
+#: core/templates/template.html:86
msgid "Close"
msgstr "Stäng"
-#: core/templates/template.html:112
+#: core/templates/template.html:102
msgid ""
"You are using a guest account, data entered will be deleted after a week."
msgstr "Du använder ett gästkonto, data som anges tas bort efter en vecka."
-#: core/templates/template.html:117
+#: core/templates/template.html:107
msgid "Create some demo entries"
msgstr "Skapa några demoposter"
-#: core/templates/template.html:165 software/templates/features.html:568
+#: core/templates/template.html:155 software/templates/features.html:568
#: software/templates/tos.html:7
msgid "Terms of service"
msgstr "Villkor för tjänsten"
-#: core/templates/template_features.html:53 software/templates/features.html:9
+#: core/templates/template.html:181 software/templates/features.html:595
+msgid "Browser language"
+msgstr ""
+
+#: core/templates/template_features.html:46 software/templates/features.html:9
msgid "Features"
msgstr "Funktioner"
@@ -867,99 +893,94 @@ msgstr "Inget konto?"
msgid "Forgot password?"
msgstr "Glömt ditt lösenord?"
-#: core/templates/user/overview.html:25 core/templates/user/overview.html:68
-#: core/templates/user/overview.html:112 core/templates/user/overview.html:144
-#: core/templates/user/overview.html:348 core/templates/user/overview.html:390
-#: core/templates/user/overview.html:426
+#: core/templates/user/overview.html:28 core/templates/user/overview.html:71
+#: core/templates/user/overview.html:115 core/templates/user/overview.html:147
+#: core/templates/user/overview.html:351 core/templates/user/overview.html:393
+#: core/templates/user/overview.html:429
#, python-format
msgid "last %(number)s"
msgstr "sista %(number)s"
-#: core/templates/user/overview.html:27 core/templates/user/overview.html:146
-#: core/templates/user/overview.html:343 core/templates/user/overview.html:382
-#: core/templates/user/overview.html:421 gym/templates/gym/member_list.html:226
+#: core/templates/user/overview.html:30 core/templates/user/overview.html:149
+#: core/templates/user/overview.html:346 core/templates/user/overview.html:385
+#: core/templates/user/overview.html:424 gym/templates/gym/member_list.html:226
#: gym/templates/gym/member_list.html:262
#: gym/templates/gym/member_list.html:302
msgid "Overview"
msgstr "Överblick"
-#: core/templates/user/overview.html:34 core/templates/user/overview.html:76
-#: core/templates/user/overview.html:120 core/templates/user/overview.html:152
+#: core/templates/user/overview.html:37 core/templates/user/overview.html:79
+#: core/templates/user/overview.html:123 core/templates/user/overview.html:155
#: manager/helpers.py:88 software/templates/about_us.html:170
#: weight/templates/import_csv_preview.html:13
#: weight/templates/import_csv_preview.html:42 weight/views.py:54
msgid "Date"
msgstr "Datum"
-#: core/templates/user/overview.html:35 core/templates/user/overview.html:153
+#: core/templates/user/overview.html:38 core/templates/user/overview.html:156
#: gym/models/contract.py:58 gym/models/contract.py:109
msgid "Description"
msgstr "Beskrivning"
-#: core/templates/user/overview.html:36
+#: core/templates/user/overview.html:39
msgid "Number of logs (days)"
msgstr "Antal loggar (dagar)"
-#: core/templates/user/overview.html:37 core/views/user.py:590
+#: core/templates/user/overview.html:40 core/views/user.py:606
#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:158
msgid "Last activity"
msgstr "Senaste aktiviteten"
-#: core/templates/user/overview.html:58
+#: core/templates/user/overview.html:61
msgid "No workouts found."
msgstr "Inga träningspass hittade."
-#: core/templates/user/overview.html:68
+#: core/templates/user/overview.html:71
msgid "Log"
msgstr "Log"
-#: core/templates/user/overview.html:77
+#: core/templates/user/overview.html:80
msgid "General impression"
msgstr "Generellt intryck"
-#: core/templates/user/overview.html:78 core/templates/user/overview.html:390
+#: core/templates/user/overview.html:81 core/templates/user/overview.html:393
msgid "Notes"
msgstr "Anteckningar"
-#: core/templates/user/overview.html:79
-#: exercises/templates/history/overview.html:30
-msgid "Time"
-msgstr "Tid"
-
-#: core/templates/user/overview.html:112 core/templates/user/overview.html:121
+#: core/templates/user/overview.html:115 core/templates/user/overview.html:124
#: manager/helpers.py:89 weight/templates/import_csv_preview.html:14
#: weight/templates/import_csv_preview.html:43 weight/views.py:54
msgid "Weight"
msgstr "Vikt"
-#: core/templates/user/overview.html:154
-#: nutrition/templates/ingredient/view.html:51 nutrition/views/plan.py:245
+#: core/templates/user/overview.html:157
+#: nutrition/templates/ingredient/view.html:52 nutrition/views/plan.py:244
msgid "Energy"
msgstr "Energi"
-#: core/templates/user/overview.html:155
-#: nutrition/templates/ingredient/view.html:58 nutrition/views/plan.py:251
+#: core/templates/user/overview.html:158
+#: nutrition/templates/ingredient/view.html:59 nutrition/views/plan.py:250
msgid "Protein"
msgstr "Protein"
-#: core/templates/user/overview.html:156
-#: nutrition/templates/ingredient/view.html:64 nutrition/views/plan.py:259
+#: core/templates/user/overview.html:159
+#: nutrition/templates/ingredient/view.html:65 nutrition/views/plan.py:258
msgid "Carbohydrates"
msgstr "Kolhydrater"
-#: core/templates/user/overview.html:157
-#: nutrition/templates/ingredient/view.html:80 nutrition/views/plan.py:273
+#: core/templates/user/overview.html:160
+#: nutrition/templates/ingredient/view.html:81 nutrition/views/plan.py:272
msgid "Fat"
msgstr "Fett"
-#: core/templates/user/overview.html:170
-#: nutrition/templates/ingredient/view.html:53
+#: core/templates/user/overview.html:173
+#: nutrition/templates/ingredient/view.html:54
msgid "kcal"
msgstr "kcal"
-#: core/templates/user/overview.html:201 core/templates/user/overview.html:340
-#: core/templates/user/overview.html:379 core/templates/user/overview.html:418
-#: core/templates/user/overview.html:463 gym/templates/gym/list.html:45
+#: core/templates/user/overview.html:204 core/templates/user/overview.html:343
+#: core/templates/user/overview.html:382 core/templates/user/overview.html:421
+#: core/templates/user/overview.html:466 gym/templates/gym/list.html:45
#: gym/templates/gym/member_list.html:91 gym/templates/gym/member_list.html:149
#: gym/templates/gym/member_list.html:187
#: gym/templates/gym/member_list.html:223
@@ -968,109 +989,113 @@ msgstr "kcal"
msgid "Actions"
msgstr "Åtgärder"
-#: core/templates/user/overview.html:210
+#: core/templates/user/overview.html:213
msgid "Deactivate user"
msgstr "Inaktivera användare"
-#: core/templates/user/overview.html:214
+#: core/templates/user/overview.html:217
msgid "Activate user"
msgstr "Aktivera användare"
-#: core/templates/user/overview.html:223
+#: core/templates/user/overview.html:226
msgid "Reset user password"
msgstr "Återställ användarlösenord"
-#: core/templates/user/overview.html:227 gym/templates/gym/member_list.html:30
+#: core/templates/user/overview.html:230 gym/templates/gym/member_list.html:30
msgid "Roles"
msgstr "Roller"
-#: core/templates/user/overview.html:243
+#: core/templates/user/overview.html:246
msgid "Password reset confirmation"
msgstr "Lösenordsåterställningsbekräftelse"
-#: core/templates/user/overview.html:247
+#: core/templates/user/overview.html:250
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:250
+#: core/templates/user/overview.html:253
#: exercises/templates/history/overview.html:106
+#: nutrition/templates/ingredient/view.html:148
+#: nutrition/templates/ingredient/view.html:160
msgid "No"
msgstr "Nej"
-#: core/templates/user/overview.html:251
+#: core/templates/user/overview.html:254
#: exercises/templates/history/overview.html:99
+#: nutrition/templates/ingredient/view.html:146
+#: nutrition/templates/ingredient/view.html:158
msgid "Yes"
msgstr "Ja"
-#: core/templates/user/overview.html:272 gym/templates/gym/member_list.html:105
+#: core/templates/user/overview.html:275 gym/templates/gym/member_list.html:105
msgid "Details"
msgstr "Detaljer"
-#: core/templates/user/overview.html:276 gym/views/export.py:57
-#: manager/helpers.py:89 nutrition/views/plan.py:151
-#: nutrition/views/plan.py:157
+#: core/templates/user/overview.html:279 gym/views/export.py:57
+#: manager/helpers.py:89 nutrition/views/plan.py:150
+#: nutrition/views/plan.py:156
msgid "Nr."
msgstr "Nr."
-#: core/templates/user/overview.html:298 gym/models/contract.py:287
+#: core/templates/user/overview.html:301 gym/models/contract.py:287
#: gym/models/gym.py:50 gym/templates/contract/view.html:75
#: gym/templates/gym/member_list.html:112 gym/views/export.py:68
msgid "Phone"
msgstr "Telefon"
-#: core/templates/user/overview.html:302 gym/templates/contract/view.html:87
+#: core/templates/user/overview.html:305 gym/templates/contract/view.html:87
#: gym/templates/gym/member_list.html:130
msgid "Address"
msgstr "Adress"
-#: core/templates/user/overview.html:313
+#: core/templates/user/overview.html:316
msgid "Registered"
msgstr "Registrerad"
-#: core/templates/user/overview.html:317
+#: core/templates/user/overview.html:320
msgid "Last login"
msgstr "Senaste inloggning"
-#: core/templates/user/overview.html:322
+#: core/templates/user/overview.html:325
msgid "Status"
msgstr "Status"
-#: core/templates/user/overview.html:325
+#: core/templates/user/overview.html:328
msgid "Active"
msgstr "Aktiv"
-#: core/templates/user/overview.html:327
+#: core/templates/user/overview.html:330
msgid "Inactive"
msgstr "Inaktiv"
-#: core/templates/user/overview.html:348 gym/templates/contract/list.html:4
+#: core/templates/user/overview.html:351 gym/templates/contract/list.html:4
#: gym/templates/gym/member_list.html:218
msgid "Contracts"
msgstr "Kontrakt"
-#: core/templates/user/overview.html:426 gym/templates/document/list.html:4
+#: core/templates/user/overview.html:429 gym/templates/document/list.html:4
msgid "Documents"
msgstr "Dokument"
-#: core/templates/user/overview.html:433 gym/templates/document/list.html:33
+#: core/templates/user/overview.html:436 gym/templates/document/list.html:33
msgid "Download"
msgstr "Hämta"
-#: core/templates/user/overview.html:474 gym/views/admin_config.py:44
+#: core/templates/user/overview.html:477 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:477 gym/models/user_config.py:92
+#: core/templates/user/overview.html:480 gym/models/user_config.py:92
msgid "Include in inactive overview"
msgstr "Inkludera i inaktiv överblick"
-#: core/templates/user/overview.html:510
+#: core/templates/user/overview.html:513
#, python-format
msgid "Admin login is only available for users in %(gym_name)s"
msgstr "Admininloggning är bara tillgängligt för använder i %(gym_name)s"
-#: core/templates/user/overview.html:514
+#: core/templates/user/overview.html:517
msgid "Log in as this user"
msgstr "Logga in som denna användare"
@@ -1094,7 +1119,7 @@ msgstr ""
msgid "You need to verify your email to contribute exercises"
msgstr ""
-#: core/templates/user/preferences.html:55 core/views/user.py:601
+#: core/templates/user/preferences.html:55 core/views/user.py:617
msgid "Change password"
msgstr "Ändra lösenord"
@@ -1102,23 +1127,23 @@ msgstr "Ändra lösenord"
msgid "Already have an account?"
msgstr ""
-#: core/templatetags/wger_extras.py:142 i18n.tpl:38
+#: core/templatetags/wger_extras.py:142 i18n.tpl:39
msgid "kg"
msgstr "kg"
#: core/templatetags/wger_extras.py:144
-#: nutrition/templates/ingredient/view.html:60
-#: nutrition/templates/ingredient/view.html:66
-#: nutrition/templates/ingredient/view.html:73
-#: nutrition/templates/ingredient/view.html:82
-#: nutrition/templates/ingredient/view.html:89
-#: nutrition/templates/ingredient/view.html:111
-#: nutrition/templates/ingredient/view.html:121
+#: nutrition/templates/ingredient/view.html:61
+#: nutrition/templates/ingredient/view.html:67
+#: nutrition/templates/ingredient/view.html:74
+#: nutrition/templates/ingredient/view.html:83
+#: nutrition/templates/ingredient/view.html:90
+#: nutrition/templates/ingredient/view.html:112
+#: nutrition/templates/ingredient/view.html:122
msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr "g"
-#: core/templatetags/wger_extras.py:147 i18n.tpl:39
+#: core/templatetags/wger_extras.py:147 i18n.tpl:40
msgid "lb"
msgstr "lb"
@@ -1127,36 +1152,35 @@ msgctxt "weight unit, i.e. ounces"
msgid "oz"
msgstr "oz"
-#: core/views/languages.py:85 exercises/views/categories.py:122
+#: core/views/languages.py:88 exercises/views/categories.py:122
#: exercises/views/equipment.py:103 exercises/views/muscles.py:99
-#: nutrition/views/ingredient.py:120 nutrition/views/unit.py:110
+#: nutrition/views/ingredient.py:125
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
+#: core/views/languages.py:96 core/views/license.py:103
+#: core/views/repetition_units.py:114 core/views/weight_units.py:115
#: exercises/views/categories.py:128 exercises/views/muscles.py:106
#: gallery/views/images.py:124 gym/views/admin_notes.py:196
#: gym/views/document.py:206 gym/views/gym.py:481
-#: nutrition/views/ingredient.py:127 nutrition/views/unit.py:117
+#: nutrition/views/ingredient.py:132
#, python-brace-format
msgid "Delete {0}?"
msgstr "Ta bort {0}?"
-#: core/views/languages.py:111 core/views/license.py:85
-#: core/views/repetition_units.py:86 core/views/user.py:464
+#: core/views/languages.py:114 core/views/license.py:85
+#: core/views/repetition_units.py:96 core/views/user.py:480
#: core/views/weight_units.py:86 exercises/views/categories.py:98
#: exercises/views/equipment.py:81 exercises/views/muscles.py:87
#: gym/views/admin_notes.py:161 gym/views/config.py:68
#: gym/views/contract.py:186 gym/views/contract_option.py:123
#: gym/views/contract_type.py:123 gym/views/document.py:171
-#: gym/views/gym.py:463 nutrition/views/ingredient.py:146
-#: nutrition/views/unit.py:143
+#: gym/views/gym.py:463 nutrition/views/ingredient.py:151
#, python-brace-format
msgid "Edit {0}"
msgstr "Redigera {0}"
-#: core/views/misc.py:74
+#: core/views/misc.py:73
msgid ""
"We have created sample workout, workout schedules, weight logs, (body) "
"weight and nutrition plan entries so you can better see what this site can "
@@ -1166,48 +1190,48 @@ msgstr ""
"så du kan lära dig hur sidan fungerar. Känn dig fri att ändra eller ta bort "
"dom!"
-#: core/views/user.py:143
+#: core/views/user.py:145
#, python-brace-format
msgid "Account \"{0}\" was successfully deleted"
msgstr "Konto \"{0}\" är nu borttaget"
-#: core/views/user.py:279
+#: core/views/user.py:287
msgid "You were successfully registered"
msgstr "Du är nu registrerad"
-#: core/views/user.py:341
+#: core/views/user.py:357
msgid "Settings successfully updated"
msgstr "Inställningar uppdaterade"
-#: core/views/user.py:380
+#: core/views/user.py:396
msgid "The user was successfully deactivated"
msgstr "Användaren har nu tagits bort"
-#: core/views/user.py:417
+#: core/views/user.py:433
msgid "The user was successfully activated"
msgstr "Användaren har nu aktiverats"
-#: core/views/user.py:432
+#: core/views/user.py:448
msgid "Edit user"
msgstr "Redigera användare"
-#: core/views/user.py:587 gym/templates/gym/member_list.html:26
+#: core/views/user.py:603 gym/templates/gym/member_list.html:26
#: gym/views/gym.py:158
msgid "ID"
msgstr "ID"
-#: core/views/user.py:588 gym/forms.py:95 gym/templates/contract/view.html:55
+#: core/views/user.py:604 gym/forms.py:95 gym/templates/contract/view.html:55
#: gym/templates/gym/member_list.html:27 gym/views/export.py:59
#: gym/views/gym.py:158 gym/views/gym.py:217
msgid "Username"
msgstr "Användarnamn"
-#: core/views/user.py:591 gym/templates/gym/new_user.html:34
+#: core/views/user.py:607 gym/templates/gym/new_user.html:34
#: gym/views/export.py:58 gym/views/gym.py:217
msgid "Gym"
msgstr "Gym"
-#: core/views/user.py:650
+#: core/views/user.py:678
#, python-format
msgid "A verification email was sent to %(email)s"
msgstr ""
@@ -1226,16 +1250,16 @@ msgstr "Övningsnamn"
msgid "A more basic name for the muscle"
msgstr ""
-#: exercises/models/video.py:50
+#: exercises/models/video.py:52
#, python-format
msgid "Maximum file size is %(size)sMB."
msgstr ""
-#: exercises/models/video.py:57 exercises/models/video.py:65
+#: exercises/models/video.py:59 exercises/models/video.py:67
msgid "File type is not supported"
msgstr ""
-#: exercises/models/video.py:70
+#: exercises/models/video.py:72
msgid "File is not a valid video"
msgstr ""
@@ -1316,7 +1340,11 @@ msgstr "Ta bort utrustning?"
msgid "Add muscle"
msgstr "Lägg till muskel"
-#: gallery/templates/images/overview.html:72
+#: gallery/forms.py:35
+msgid "If date is left empty, it will be read from the image instead"
+msgstr ""
+
+#: gallery/templates/images/overview.html:69
#, fuzzy
#| msgid "Add new image"
msgid "Add image"
@@ -1387,7 +1415,7 @@ msgid "Contract type"
msgstr "Kontrakttyp"
#: gym/models/contract.py:211 gym/templates/contract/view.html:59
-#: nutrition/forms.py:58
+#: nutrition/forms.py:67
msgid "Amount"
msgstr "Mängd"
@@ -1565,7 +1593,7 @@ msgstr "E-postmeddelanden"
msgid "Add member"
msgstr "Lägg till medlem"
-#: gym/templates/gym/new_user.html:48 nutrition/templates/rate/form.html:120
+#: gym/templates/gym/new_user.html:48 nutrition/templates/rate/form.html:121
msgid "Info"
msgstr "Info"
@@ -1745,10 +1773,6 @@ msgstr "Pull-up bar"
msgid "Quads"
msgstr ""
-#: i18n.tpl:30
-msgid "Repetitions"
-msgstr "Repetitioner"
-
#: i18n.tpl:31
msgid "Resistance band"
msgstr ""
@@ -1779,198 +1803,204 @@ msgstr "Tricepsbrachii"
msgid "Until Failure"
msgstr "Tills Misslyckande"
-#: i18n.tpl:40
+#: i18n.tpl:38
+#, fuzzy
+#| msgid "Kilometers"
+msgid "Meters"
+msgstr "Kilometer"
+
+#: i18n.tpl:41
msgid "none (bodyweight exercise)"
msgstr "ingen (kroppsvikt träning)"
-#: i18n.tpl:41
+#: i18n.tpl:42
msgid "Beginner"
msgstr ""
-#: i18n.tpl:42
+#: i18n.tpl:43
#, fuzzy
#| msgctxt "As in \"content of an email\""
#| msgid "Content"
msgid "Consistent"
msgstr "Innehåll"
-#: i18n.tpl:43
+#: i18n.tpl:44
msgid "Dedicated"
msgstr ""
-#: i18n.tpl:44
+#: i18n.tpl:45
msgid "Obsessed"
msgstr ""
-#: i18n.tpl:45
+#: i18n.tpl:46
msgid "Legend"
msgstr "Legend"
-#: i18n.tpl:46
+#: i18n.tpl:47
msgid "Veteran"
msgstr ""
-#: i18n.tpl:47
+#: i18n.tpl:48
msgid "Titan"
msgstr ""
-#: i18n.tpl:48
+#: i18n.tpl:49
msgid "Unstoppable"
msgstr ""
-#: i18n.tpl:49
+#: i18n.tpl:50
msgid "Weekend Warrior"
msgstr ""
-#: i18n.tpl:50
+#: i18n.tpl:51
msgid "Elephant lifter"
msgstr ""
-#: i18n.tpl:51
+#: i18n.tpl:52
msgid "Bus lifter"
msgstr ""
-#: i18n.tpl:52
+#: i18n.tpl:53
msgid "Plane lifter"
msgstr ""
-#: i18n.tpl:53
+#: i18n.tpl:54
msgid "Blue whale lifter"
msgstr ""
-#: i18n.tpl:54
+#: i18n.tpl:55
msgid "Space Station lifter"
msgstr ""
-#: i18n.tpl:55
+#: i18n.tpl:56
msgid "Millionaire"
msgstr ""
-#: i18n.tpl:56
+#: i18n.tpl:57
msgid "Atlas"
msgstr ""
-#: i18n.tpl:57
+#: i18n.tpl:58
msgid "Early Bird"
msgstr ""
-#: i18n.tpl:58
+#: i18n.tpl:59
#, fuzzy
#| msgid "Weight log"
msgid "Night Owl"
msgstr "Viktlogg"
-#: i18n.tpl:59
+#: i18n.tpl:60
msgid "New Year, New Me"
msgstr ""
-#: i18n.tpl:60
+#: i18n.tpl:61
msgid "Phoenix"
msgstr ""
-#: i18n.tpl:61
+#: i18n.tpl:62
#, fuzzy
#| msgid "Personal data"
msgid "Personal Record"
msgstr "Personlig data"
-#: i18n.tpl:62
+#: i18n.tpl:63
#, fuzzy
#| msgid "Copy workout"
msgid "Complete your first workout"
msgstr "Kopiera träningspass"
-#: i18n.tpl:63
+#: i18n.tpl:64
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 10 workouts"
msgstr "Exempelpass"
-#: i18n.tpl:64
+#: i18n.tpl:65
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 50 workouts"
msgstr "Exempelpass"
-#: i18n.tpl:65
+#: i18n.tpl:66
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 100 workouts"
msgstr "Exempelpass"
-#: i18n.tpl:66
+#: i18n.tpl:67
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 200 workouts"
msgstr "Exempelpass"
-#: i18n.tpl:67
+#: i18n.tpl:68
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 500 workouts"
msgstr "Exempelpass"
-#: i18n.tpl:68
+#: i18n.tpl:69
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 1000 workouts"
msgstr "Exempelpass"
-#: i18n.tpl:69
+#: i18n.tpl:70
msgid "Maintain a 30-day workout streak"
msgstr ""
-#: i18n.tpl:70
+#: i18n.tpl:71
msgid "Work out on Saturday and Sunday for 4 consecutive weekends"
msgstr ""
-#: i18n.tpl:71
+#: i18n.tpl:72
msgid "Lift a cumulative total of 5.000 kg"
msgstr ""
-#: i18n.tpl:72
+#: i18n.tpl:73
msgid "Lift a cumulative total of 20.000 kg"
msgstr ""
-#: i18n.tpl:73
+#: i18n.tpl:74
msgid "Lift a cumulative total of 50.000 kg"
msgstr ""
-#: i18n.tpl:74
+#: i18n.tpl:75
msgid "Lift a cumulative total of 150.000 kg"
msgstr ""
-#: i18n.tpl:75
+#: i18n.tpl:76
msgid "Lift a cumulative total of 450.000 kg"
msgstr ""
-#: i18n.tpl:76
+#: i18n.tpl:77
msgid "Lift a cumulative total of 1.000.000 kg"
msgstr ""
-#: i18n.tpl:77
+#: i18n.tpl:78
msgid "Lift a cumulative total of 10.000.000 kg"
msgstr ""
-#: i18n.tpl:78
+#: i18n.tpl:79
msgid "Complete a workout before 6:00 AM"
msgstr ""
-#: i18n.tpl:79
+#: i18n.tpl:80
msgid "Complete a workout after 9:00 PM"
msgstr ""
-#: i18n.tpl:80
+#: i18n.tpl:81
#, fuzzy
#| msgid "Workout for %s"
msgid "Work out on January 1st"
msgstr "Träning för %s"
-#: i18n.tpl:81
+#: i18n.tpl:82
msgid "Return to training after being inactive for 30 days"
msgstr ""
-#: i18n.tpl:82
+#: i18n.tpl:83
msgid "Achieve a new Personal Record on any exercise"
msgstr ""
@@ -2056,7 +2086,7 @@ msgstr "Träning"
msgid "Routine will expire soon"
msgstr "Träningspass snart löper ut"
-#: manager/models/routine.py:153 manager/models/session.py:145
+#: manager/models/routine.py:154 manager/models/session.py:145
msgid "The start time cannot be after the end time."
msgstr "Starttiden kan inte vara efter sluttiden."
@@ -2142,23 +2172,27 @@ msgstr "Träning"
msgid "Workout for %s"
msgstr "Träning för %s"
-#: nutrition/forms.py:62
+#: nutrition/extract_info/off.py:72 nutrition/extract_info/off.py:91
+msgid "Serving"
+msgstr ""
+
+#: nutrition/forms.py:71 nutrition/forms.py:208
msgid "Unit"
msgstr "Enhet"
-#: nutrition/forms.py:170 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:179 nutrition/templates/rate/form.html:77
msgid "Basic caloric intake"
msgstr "Grundläggande kaloriintag"
-#: nutrition/forms.py:171
+#: nutrition/forms.py:180
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:176
+#: nutrition/forms.py:185
msgid "Additional calories"
msgstr "Extra kalorier"
-#: nutrition/forms.py:178
+#: nutrition/forms.py:187
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
@@ -2167,15 +2201,33 @@ msgstr ""
"tal)"
#: nutrition/forms.py:209
+msgid "grams (g)"
+msgstr ""
+
+#: nutrition/forms.py:219
msgid "Ingredient"
msgstr "Ingrediens"
-#: nutrition/forms.py:213
+#: nutrition/forms.py:223
#, fuzzy
#| msgid "Also use ingredients in English"
msgid "Also search for names in English"
msgstr "Också använda ingredienser i Svenska"
+#: nutrition/forms.py:239
+msgid "Quantity"
+msgstr ""
+
+#: nutrition/forms.py:241
+msgid "Enter a quantity and choose grams (g) or one of the serving units."
+msgstr ""
+
+#: nutrition/models/ingredient.py:526
+#, fuzzy
+#| msgid "Correction"
+msgid "Portion"
+msgstr "Korrigering"
+
#: nutrition/templates/ingredient/email_new.tpl:1
#, python-format
msgid ""
@@ -2220,59 +2272,92 @@ msgstr ""
"postadress när du registrerade dig kommer du bli meddelad när processen är "
"slutförd."
-#: nutrition/templates/ingredient/overview.html:38
+#: nutrition/templates/ingredient/overview.html:32
+#: nutrition/templates/ingredient/overview.html:68
+#: nutrition/templates/ingredient/view.html:143
+msgid "Vegan"
+msgstr ""
+
+#: nutrition/templates/ingredient/overview.html:34
+#: nutrition/templates/ingredient/overview.html:79
+#: nutrition/templates/ingredient/view.html:155
+#, fuzzy
+#| msgid "Variations"
+msgid "Vegetarian"
+msgstr "Variationer"
+
+#: nutrition/templates/ingredient/overview.html:43
msgid "No ingredients."
msgstr "Inga ingredienser."
-#: nutrition/templates/ingredient/overview.html:49
+#: nutrition/templates/ingredient/overview.html:54
msgid "Search"
msgstr "Sök"
-#: nutrition/templates/ingredient/view.html:45 nutrition/views/plan.py:237
+#: nutrition/templates/ingredient/overview.html:57
+#, fuzzy
+#| msgid "No filter"
+msgid "Filter"
+msgstr "Ingen filter"
+
+#: nutrition/templates/ingredient/overview.html:83
+msgid "Apply"
+msgstr ""
+
+#: nutrition/templates/ingredient/overview.html:85
+msgid "Reset"
+msgstr ""
+
+#: nutrition/templates/ingredient/view.html:46 nutrition/views/plan.py:236
msgid "Macronutrients"
msgstr "Makronäringsämnen"
-#: nutrition/templates/ingredient/view.html:54
+#: nutrition/templates/ingredient/view.html:55
msgid "kJ"
msgstr ""
-#: nutrition/templates/ingredient/view.html:70 nutrition/views/plan.py:267
+#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:266
msgid "Sugar content in carbohydrates"
msgstr "Sockerinehåll i kolhydraterna"
-#: nutrition/templates/ingredient/view.html:75
-#: nutrition/templates/ingredient/view.html:91
-#: nutrition/templates/ingredient/view.html:113
-#: nutrition/templates/ingredient/view.html:123
+#: nutrition/templates/ingredient/view.html:76
+#: nutrition/templates/ingredient/view.html:92
+#: nutrition/templates/ingredient/view.html:114
+#: nutrition/templates/ingredient/view.html:124
msgid "n.A."
msgstr "n.A."
-#: nutrition/templates/ingredient/view.html:86 nutrition/views/plan.py:281
+#: nutrition/templates/ingredient/view.html:87 nutrition/views/plan.py:280
msgid "Saturated fat content in fats"
msgstr "Mättat-fett innehåll i fettet"
-#: nutrition/templates/ingredient/view.html:102
+#: nutrition/templates/ingredient/view.html:103
msgid "Others"
msgstr "Andra"
-#: nutrition/templates/ingredient/view.html:108 nutrition/views/plan.py:287
+#: nutrition/templates/ingredient/view.html:109 nutrition/views/plan.py:286
msgid "Fiber"
msgstr ""
-#: nutrition/templates/ingredient/view.html:118 nutrition/views/plan.py:293
+#: nutrition/templates/ingredient/view.html:119 nutrition/views/plan.py:292
msgid "Sodium"
msgstr "Natrium"
-#: nutrition/templates/ingredient/view.html:143
-#: nutrition/templates/units/list.html:50 nutrition/views/unit.py:86
+#: nutrition/templates/ingredient/view.html:136
+#, fuzzy
+#| msgid "Click here for more information"
+msgid "Dietary information"
+msgstr "Klicka här för mer information"
+
+#: nutrition/templates/ingredient/view.html:184
msgid "Add new weight unit"
msgstr "Lägg till ny viktenhet"
-#: nutrition/templates/rate/form.html:25
+#: nutrition/templates/rate/form.html:26
msgid "Basal metabolic rate"
msgstr "Basal ämnesomsättning"
-#: nutrition/templates/rate/form.html:26
+#: nutrition/templates/rate/form.html:27
msgid ""
"The basal metabolic rate is the amount of energy expended daily\n"
"at rest. This is the minimum energy needed for the body to function, without "
@@ -2283,15 +2368,15 @@ msgstr ""
"vila. Detta är den minsta mängden energi som behövs för att kroppen ska "
"fungera, utan någon ytterligare fysisk aktivitet."
-#: nutrition/templates/rate/form.html:37
+#: nutrition/templates/rate/form.html:38
msgid "Your basic metabolic rate is: "
msgstr "Din basala ämnesomsättning är: "
-#: nutrition/templates/rate/form.html:47
+#: nutrition/templates/rate/form.html:48
msgid "Physical activities"
msgstr "Fysiska aktiviteter"
-#: nutrition/templates/rate/form.html:48
+#: nutrition/templates/rate/form.html:49
msgid ""
"The physical activity level (PAL) is a factor used to to express\n"
"the additional physical activity and is used to calculate the total energy\n"
@@ -2301,11 +2386,11 @@ msgstr ""
"den extra fysiska aktiviteten och används för att beräkna den totala energi "
"som krävs per dag."
-#: nutrition/templates/rate/form.html:59
+#: nutrition/templates/rate/form.html:60
msgid "Factor for daily activities: "
msgstr "Faktorer för dagliga aktiviteter: "
-#: nutrition/templates/rate/form.html:67
+#: nutrition/templates/rate/form.html:68
msgid ""
"The base caloric intake is the amount of calories your metabolism\n"
"needs based on your level of physical activity."
@@ -2313,11 +2398,11 @@ msgstr ""
"Det grundläggande kaloriintaget är mängden kalorier din ämnesomsättning "
"behöver baserat på din nivå av fysisk aktivitet."
-#: nutrition/templates/rate/form.html:81
+#: nutrition/templates/rate/form.html:82
msgid "Calculate basic caloric intake"
msgstr "Beräkna grundläggande kaloriintag"
-#: nutrition/templates/rate/form.html:88
+#: nutrition/templates/rate/form.html:89
msgid ""
"The total calories are the actual total calories per day. This\n"
"might include e.g. a surplus or deficit if you are bulking or cutting. "
@@ -2329,19 +2414,19 @@ msgstr ""
"\"cuttar\". Alternativt kan du själv ange mängden kalorier om du känner till "
"värdet."
-#: nutrition/templates/rate/form.html:102
+#: nutrition/templates/rate/form.html:103
msgid "Transfer basic intake to total daily calories"
msgstr "Överför grundläggande intag till totala dagliga kalorier"
-#: nutrition/templates/rate/form.html:106
+#: nutrition/templates/rate/form.html:107
msgid "Add additional calories to total daily calories"
msgstr "Lägg till extra kalorier till totala dagliga kalorier"
-#: nutrition/templates/rate/form.html:110
+#: nutrition/templates/rate/form.html:111
msgid "Save total calories to profile"
msgstr "Spara totala mängd kalorier till profil"
-#: nutrition/templates/rate/form.html:121
+#: nutrition/templates/rate/form.html:122
msgid ""
"Please note that these calculations can only be an\n"
"approximation. If you base your nutrition plan on these values, observe\n"
@@ -2351,48 +2436,48 @@ 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:158
+#: nutrition/views/ingredient.py:163
msgid "Add a new ingredient"
msgstr "Lägg till en ny ingrediens"
-#: nutrition/views/plan.py:128
+#: nutrition/views/plan.py:127
msgid "Nutritional plan"
msgstr ""
-#: nutrition/views/plan.py:130
+#: nutrition/views/plan.py:129
#, python-format
msgid "Nutritional plan for %s"
msgstr ""
-#: nutrition/views/plan.py:202
+#: nutrition/views/plan.py:201
msgid "<i>This is an empty plan, what did you expect on the PDF?</i>"
msgstr "<i>Detta är en tom plan, vad förväntade du dig på PDFen?</i>"
-#: nutrition/views/plan.py:230
+#: nutrition/views/plan.py:229
msgid "Nutritional data"
msgstr "Näringsdata"
-#: nutrition/views/plan.py:238
+#: nutrition/views/plan.py:237
msgid "Total"
msgstr "Totalt"
-#: nutrition/views/plan.py:239
+#: nutrition/views/plan.py:238
msgid "Percent of energy"
msgstr "Procent av energi"
-#: nutrition/views/plan.py:240
+#: nutrition/views/plan.py:239
msgid "g per body kg"
msgstr "g / kroppsvikt (kg)"
-#: nutrition/views/unit_ingredient.py:69
+#: nutrition/views/unit_ingredient.py:64
msgid "Add a new weight unit"
msgstr "Lägg till en ny viktenhet"
-#: nutrition/views/unit_ingredient.py:106
+#: nutrition/views/unit_ingredient.py:99
msgid "Edit a weight unit to ingredient connection"
msgstr "Redigera en viktenhet- till ingrediens anslutning"
-#: nutrition/views/unit_ingredient.py:138
+#: nutrition/views/unit_ingredient.py:129
msgid "Delete?"
msgstr "Ta bort?"
@@ -2788,7 +2873,7 @@ msgstr ""
msgid "Translation"
msgstr "Översätt"
-#: utils/generic_views.py:263
+#: utils/generic_views.py:246
msgid "Yes, delete"
msgstr "Ja, ta bort"
@@ -2847,10 +2932,6 @@ msgstr "Du måste ange din vikt"
msgid "Import weight logs"
msgstr "Importera viktloggarna"
-#: weight/templates/import_csv_form.html:9
-msgid "Submit"
-msgstr "Ladda upp"
-
#: weight/templates/import_csv_form.html:15
msgid ""
"Use this import field to import your weight logs into Workout\n"
@@ -2963,6 +3044,23 @@ msgstr "Du kan korrigera listan här och skicka om den så ofta du vill."
msgid "Re-Submit"
msgstr "Skicka igen"
+#~ msgid "Email verification"
+#~ msgstr "E-post verifiering"
+
+#, python-format
+#~ msgid "%(username)s, your email was verified"
+#~ msgstr "%(username)s, din e-post har verifierats"
+
+#~ msgid "Email Confirmation"
+#~ msgstr "E-post Bekräftelse"
+
+#, python-format
+#~ msgid "You are almost there, %(username)s!"
+#~ msgstr "Du är nästan där, %(username)s!"
+
+#~ msgid "Ingredient weight units"
+#~ msgstr "Ingrediens viktenheter"
+
#~ msgid "Image"
#~ msgstr "Bild"
@@ -2993,9 +3091,6 @@ msgstr "Skicka igen"
#~ msgid "Secondary muscles"
#~ msgstr "Sekundära muskler"
-#~ msgid "Variations"
-#~ msgstr "Variationer"
-
#~ msgid "Exercise Categories"
#~ msgstr "Övningskategorier"
@@ -3868,9 +3963,6 @@ msgstr "Skicka igen"
#~ msgid "This content is available under the following license:"
#~ msgstr "Denna text är tillgänglig under följande licens:"
-#~ msgid "Click here for more information"
-#~ msgstr "Klicka här för mer information"
-
#~ msgid "Add training day"
#~ msgstr "Lägg till träningsdag"
@@ -4502,8 +4594,5 @@ msgstr "Skicka igen"
#~ msgid "Last 12 months"
#~ msgstr "senaste 12 månader"
-#~ msgid "No filter"
-#~ msgstr "Ingen filter"
-
#~ msgid "Days"
#~ msgstr "Dagar"
diff --git a/wger/locale/ta/LC_MESSAGES/django.po b/wger/locale/ta/LC_MESSAGES/django.po
index 227d54373..ccb9720f9 100644
--- a/wger/locale/ta/LC_MESSAGES/django.po
+++ b/wger/locale/ta/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-01-17 14:03+0000\n"
+"POT-Creation-Date: 2026-04-10 10:20+0000\n"
"PO-Revision-Date: 2026-02-19 21:09+0000\n"
"Last-Translator: saraswathi <[email protected]>\n"
"Language-Team: Tamil <https://hosted.weblate.org/projects/wger/web/ta/>\n"
@@ -31,7 +31,7 @@ msgstr ""
#: config/views/gym_config.py:42 core/templates/language/view.html:64
#: core/templates/license/list.html:17
#: core/templates/repetition_unit/list.html:18
-#: core/templates/user/overview.html:204 core/templates/user/overview.html:467
+#: core/templates/user/overview.html:207 core/templates/user/overview.html:470
#: core/templates/weight_unit/list.html:18
#: exercises/templates/categories/admin-overview.html:17
#: exercises/templates/equipment/admin-overview.html:17
@@ -43,30 +43,29 @@ msgstr ""
#: gym/templates/gym/list.html:19 gym/templates/gym/list.html:48
#: gym/templates/gym/member_list.html:94 gym/templates/gym/member_list.html:152
#: gym/templates/gym/member_list.html:190
-#: nutrition/templates/ingredient/view.html:164
-#: nutrition/templates/ingredient/view.html:209
-#: nutrition/templates/units/list.html:19
+#: nutrition/templates/ingredient/view.html:205
+#: nutrition/templates/ingredient/view.html:248
msgid "Edit"
msgstr ""
-#: core/forms.py:91 core/templates/navigation.html:271
-#: core/templates/navigation.html:278 core/templates/user/login.html:4
+#: core/forms.py:89 core/templates/navigation.html:268
+#: core/templates/navigation.html:275 core/templates/user/login.html:4
#: core/templates/user/registration_sidebar.html:12
#: software/templates/features.html:82 software/templates/features.html:448
msgid "Login"
msgstr "உள்நுழை"
-#: core/forms.py:130 core/forms.py:244 gym/views/export.py:61
+#: core/forms.py:128 core/forms.py:242 gym/views/export.py:61
#: gym/views/gym.py:217
msgid "First name"
msgstr "முதல் பெயர்"
-#: core/forms.py:131 core/forms.py:245 core/templates/user/overview.html:284
+#: core/forms.py:129 core/forms.py:243 core/templates/user/overview.html:287
#: gym/views/export.py:62 gym/views/gym.py:217
msgid "Last name"
msgstr "கடைசி பெயர்"
-#: core/forms.py:133 core/forms.py:210 core/templates/user/overview.html:288
+#: core/forms.py:131 core/forms.py:208 core/templates/user/overview.html:291
#: gym/models/contract.py:256 gym/models/gym.py:58
#: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:116
#: gym/templates/gym/new_user.html:30 gym/views/export.py:60
@@ -76,54 +75,54 @@ msgstr "கடைசி பெயர்"
msgid "Email"
msgstr "மின்னஞ்சல்"
-#: core/forms.py:134
+#: core/forms.py:132
msgid "Used for password resets and, optionally, e-mail reminders."
msgstr ""
-#: core/forms.py:138 core/models/profile.py:222
+#: core/forms.py:136 core/models/profile.py:222
#: gym/templates/gym/new_user.html:38
msgid "Date of Birth"
msgstr "பிறந்த தேதி"
-#: core/forms.py:177
+#: core/forms.py:175
msgid "Personal data"
msgstr "தனிப்பட்ட விவரங்கள்"
-#: core/forms.py:189
+#: core/forms.py:187
msgid "Workout reminders"
msgstr "பயிற்சி நினைவூட்டல்"
-#: core/forms.py:196
+#: core/forms.py:194
msgid "Other settings"
msgstr ""
-#: core/forms.py:204 core/views/user.py:614 core/views/user.py:629
-#: core/views/user.py:641 gym/forms.py:73 utils/generic_views.py:143
+#: core/forms.py:202 core/views/user.py:630 core/views/user.py:654
+#: core/views/user.py:668 gym/forms.py:73 utils/generic_views.py:137
msgid "Save"
msgstr ""
-#: core/forms.py:211
+#: core/forms.py:209
msgid "Used for password resets and, optionally, email reminders."
msgstr ""
"கடவுச்சொல் மீட்பு மற்றும் விருப்பமான மின்னஞ்சல் நினைவூட்டல்களுக்குப் பயன்படுத்தப்படுகிறது."
-#: core/forms.py:240
+#: core/forms.py:238
msgid "This e-mail address is already in use."
msgstr "மின்னஞ்சல் ஏற்கனவே பதிவு செய்யப்பட்டுள்ளது."
-#: core/forms.py:261 gym/templates/gym/new_user.html:26
+#: core/forms.py:259 gym/templates/gym/new_user.html:26
#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:217
msgid "Password"
msgstr "கடவுச்சொல்"
-#: core/forms.py:263
+#: core/forms.py:261
msgid "Please enter your current password."
msgstr "உங்கள் தற்போதைய கடவுச்சொல்லை உள்ளிடவும்."
-#: core/forms.py:272 core/templates/language/view.html:70
+#: core/forms.py:270 core/templates/language/view.html:70
#: core/templates/license/list.html:21
#: core/templates/repetition_unit/list.html:22
-#: core/templates/user/overview.html:233
+#: core/templates/user/overview.html:236
#: core/templates/weight_unit/list.html:22
#: exercises/templates/categories/admin-overview.html:21
#: exercises/templates/equipment/admin-overview.html:21
@@ -131,27 +130,30 @@ msgstr "உங்கள் தற்போதைய கடவுச்சொல
#: gym/templates/admin_notes/list.html:37
#: gym/templates/contract_option/list.html:35
#: gym/templates/contract_type/list.html:36 gym/templates/document/list.html:46
-#: gym/templates/gym/list.html:23 nutrition/templates/ingredient/view.html:168
-#: nutrition/templates/ingredient/view.html:215
-#: nutrition/templates/units/list.html:25
+#: gym/templates/gym/list.html:23 nutrition/templates/ingredient/view.html:209
+#: nutrition/templates/ingredient/view.html:254
msgid "Delete"
msgstr "நீக்கு"
-#: core/forms.py:281
+#: core/forms.py:279
msgid "Invalid password"
msgstr "தவறான கடவுச்சொல்"
-#: core/forms.py:293
+#: core/forms.py:291 core/forms.py:349
msgid "The form is secured with reCAPTCHA"
msgstr ""
-#: core/forms.py:314 core/forms.py:341 core/templates/navigation.html:272
-#: core/templates/navigation.html:285 core/templates/template.html:123
-#: core/templates/user/login.html:21 core/views/user.py:285
+#: core/forms.py:312 core/forms.py:339 core/templates/navigation.html:269
+#: core/templates/navigation.html:282 core/templates/template.html:113
+#: core/templates/user/login.html:21 core/views/user.py:293
#: software/templates/features.html:87 software/templates/features.html:442
msgid "Register"
msgstr "பதிவு செய்"
+#: core/forms.py:360 weight/templates/import_csv_form.html:9
+msgid "Submit"
+msgstr ""
+
#: core/models/language.py:31 core/templates/language/view.html:21
msgid "Language short name"
msgstr ""
@@ -186,36 +188,36 @@ msgstr ""
msgid "Link to license text or other information"
msgstr ""
-#: core/models/profile.py:57
+#: core/models/profile.py:60
#, python-format
msgid "%(birthdate)s is not a valid birthdate"
msgstr ""
-#: core/models/profile.py:66
+#: core/models/profile.py:69
msgid "Male"
msgstr "ஆண்"
-#: core/models/profile.py:67
+#: core/models/profile.py:70
msgid "Female"
msgstr "பெண்"
-#: core/models/profile.py:74
+#: core/models/profile.py:77
msgid "Low"
msgstr ""
-#: core/models/profile.py:75
+#: core/models/profile.py:78
msgid "Medium"
msgstr ""
-#: core/models/profile.py:76
+#: core/models/profile.py:79
msgid "High"
msgstr ""
-#: core/models/profile.py:82
+#: core/models/profile.py:85
msgid "Metric (kilogram)"
msgstr ""
-#: core/models/profile.py:83
+#: core/models/profile.py:86
msgid "Imperial (pound)"
msgstr ""
@@ -323,7 +325,7 @@ msgstr ""
msgid "Free time"
msgstr ""
-#: core/models/profile.py:320 nutrition/templates/rate/form.html:66
+#: core/models/profile.py:320 nutrition/templates/rate/form.html:67
msgid "Total daily calories"
msgstr ""
@@ -361,20 +363,41 @@ msgstr ""
msgid "Enable or disable the trophy system for this user"
msgstr ""
-#: core/models/profile.py:446
+#: core/models/profile.py:457
msgid "The sum of all hours has to be 24"
msgstr ""
-#: core/models/rep_unit.py:36 core/models/weight_unit.py:42
-#: core/templates/user/overview.html:280 core/views/user.py:589
+#: core/models/rep_unit.py:32 i18n.tpl:30
+msgid "Repetitions"
+msgstr ""
+
+#: core/models/rep_unit.py:33 core/templates/user/overview.html:82
+#: exercises/templates/history/overview.html:30
+msgid "Time"
+msgstr ""
+
+#: core/models/rep_unit.py:34
+msgid "Distance"
+msgstr ""
+
+#: core/models/rep_unit.py:47 core/models/weight_unit.py:42
+#: core/templates/user/overview.html:283 core/views/user.py:605
#: exercises/models/muscle.py:36 gym/models/contract.py:52
#: gym/models/contract.py:103 gym/models/gym.py:46
#: gym/models/user_document.py:84 gym/templates/contract/view.html:50
#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:108
-#: gym/views/gym.py:158 nutrition/templates/ingredient/view.html:151
+#: gym/views/gym.py:158 nutrition/templates/ingredient/view.html:192
msgid "Name"
msgstr ""
+#: core/models/rep_unit.py:53
+msgid "Unit Type"
+msgstr ""
+
+#: core/models/rep_unit.py:54
+msgid "The type of unit (repetitions, time, or distance)"
+msgstr ""
+
#: core/templates/403.html:4
msgid "Forbidden!"
msgstr ""
@@ -402,77 +425,73 @@ msgid ""
"later time. If the problem persists, you can seek help in ways listed below:"
msgstr ""
-#: core/templates/base.html:10
-#, python-format
-msgid ""
-"You are browsing the site as the user \"%(current_user)s\", all actions are "
-"performed on their data."
+#: core/templates/account/email/email_confirmation_message.html:81
+msgid "Almost there!"
msgstr ""
-#: core/templates/base.html:15 core/templates/base_wide.html:12
+#: core/templates/account/email/email_confirmation_message.html:85
#, python-format
-msgid "Back to \"%(target)s\""
+msgid ""
+"You're receiving this email because the user \"%(user_display)s\" has given "
+"your email address to register an account on %(site_domain)s."
msgstr ""
-#: core/templates/base_wide.html:7
-#, python-format
+#: core/templates/account/email/email_confirmation_message.html:93
msgid ""
-"You are\n"
-" browsing the site as the user \"%(current_user)s\", all "
-"actions are performed on\n"
-" their data.\n"
-" "
+"Your email verification code is listed below. Please enter it in your open "
+"browser window."
msgstr ""
-#: core/templates/delete.html:4
-msgid "Are you sure you want to delete this? This action cannot be undone."
+#: core/templates/account/email/email_confirmation_message.html:100
+msgid "Please click the button below to confirm your email address."
msgstr ""
-#: core/templates/email_verification/confirm_template.html:4
-msgid "Email verification"
+#: core/templates/account/email/email_confirmation_message.html:106
+msgid "Confirm email"
msgstr ""
-#: core/templates/email_verification/confirm_template.html:18
+#: core/templates/account/email/email_confirmation_message.html:110
#, python-format
-msgid "%(username)s, your email was verified"
+msgid ""
+"The link is valid for %(expire_hours)s hours (until %(date)s, %(time)s). You "
+"can request a new one from your profile settings."
msgstr ""
-#: core/templates/email_verification/confirm_template.html:22
-msgid "Error, invalid verification token"
+#: core/templates/account/email/email_confirmation_message.html:116
+msgid "If the button doesn't work, copy and paste this link into your browser:"
msgstr ""
-#: core/templates/email_verification/email_body_html.tpl:6
-msgid "Email Confirmation"
+#: core/templates/account/email/email_confirmation_message.html:125
+msgid "the wger Team"
msgstr ""
-#: core/templates/email_verification/email_body_html.tpl:9
-#: core/templates/email_verification/email_body_txt.tpl:3
+#: core/templates/base.html:10
#, python-format
-msgid "You are almost there, %(username)s!"
+msgid ""
+"You are browsing the site as the user \"%(current_user)s\", all actions are "
+"performed on their data."
msgstr ""
-#: core/templates/email_verification/email_body_html.tpl:11
+#: core/templates/base.html:15 core/templates/base_wide.html:12
#, python-format
-msgid "Please click <a href=\"%(link)s\">here</a> to confirm your email"
+msgid "Back to \"%(target)s\""
msgstr ""
-#: core/templates/email_verification/email_body_html.tpl:12
-#: core/templates/email_verification/email_body_txt.tpl:5
+#: core/templates/base_wide.html:7
#, 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"
+msgid ""
+"You are\n"
+" browsing the site as the user \"%(current_user)s\", all "
+"actions are performed on\n"
+" their data.\n"
+" "
msgstr ""
-#: core/templates/email_verification/email_body_txt.tpl:4
-#, python-format
-msgid "Please click the following link to confirm your email: %(link)s"
+#: core/templates/delete.html:4
+msgid "Are you sure you want to delete this? This action cannot be undone."
msgstr ""
-#: core/templates/language/overview.html:4 core/templates/navigation.html:344
+#: core/templates/language/overview.html:4 core/templates/navigation.html:341
msgid "Languages"
msgstr ""
@@ -481,16 +500,16 @@ msgid "Nothing found."
msgstr ""
#: core/templates/language/overview.html:22
-#: nutrition/templates/ingredient/overview.html:38
+#: nutrition/templates/ingredient/overview.html:43
msgid "Add one now."
msgstr ""
#: core/templates/language/overview.html:34 core/templates/license/list.html:43
-#: core/templates/repetition_unit/list.html:46
-#: core/templates/user/overview.html:344 core/templates/user/overview.html:384
-#: core/templates/user/overview.html:422
-#: core/templates/weight_unit/list.html:46 core/views/languages.py:74
-#: core/views/license.py:66 core/views/repetition_units.py:66
+#: core/templates/repetition_unit/list.html:44
+#: core/templates/user/overview.html:347 core/templates/user/overview.html:387
+#: core/templates/user/overview.html:425
+#: core/templates/weight_unit/list.html:46 core/views/languages.py:77
+#: core/views/license.py:66 core/views/repetition_units.py:76
#: core/views/weight_units.py:66
#: exercises/templates/categories/admin-overview.html:40
#: exercises/templates/equipment/admin-overview.html:39
@@ -503,14 +522,14 @@ msgstr ""
#: gym/templates/gym/member_list.html:264
#: gym/templates/gym/member_list.html:303
#: mailer/templates/mailer/gym/overview.html:43
-#: nutrition/templates/ingredient/overview.html:60
+#: nutrition/templates/ingredient/overview.html:97
msgid "Add"
msgstr ""
#: core/templates/language/view.html:61 core/templates/user/api_key.html:41
#: core/templates/user/preferences.html:50 gym/models/contract.py:203
#: gym/templates/contract/view.html:41 gym/templates/gym/member_list.html:270
-#: nutrition/templates/ingredient/view.html:206
+#: nutrition/templates/ingredient/view.html:245
msgid "Options"
msgstr ""
@@ -520,9 +539,9 @@ msgstr ""
#: core/templates/license/list.html:30
#: core/templates/repetition_unit/list.html:32
-#: core/templates/user/overview.html:104 core/templates/user/overview.html:136
-#: core/templates/user/overview.html:185 core/templates/user/overview.html:365
-#: core/templates/user/overview.html:404 core/templates/user/overview.html:448
+#: core/templates/user/overview.html:107 core/templates/user/overview.html:139
+#: core/templates/user/overview.html:188 core/templates/user/overview.html:368
+#: core/templates/user/overview.html:407 core/templates/user/overview.html:451
#: core/templates/weight_unit/list.html:32
#: exercises/templates/categories/admin-overview.html:30
#: exercises/templates/equipment/admin-overview.html:30
@@ -534,11 +553,10 @@ msgstr ""
#: gym/templates/gym/member_list.html:284
#: gym/templates/gym/member_list.html:321
#: mailer/templates/mailer/gym/overview.html:30
-#: nutrition/templates/units/list.html:34
msgid "Nothing found"
msgstr ""
-#: core/templates/misc/about.html:4 core/templates/template.html:160
+#: core/templates/misc/about.html:4 core/templates/template.html:150
msgid "Imprint"
msgstr ""
@@ -546,162 +564,157 @@ msgstr ""
msgid "Training"
msgstr ""
-#: core/templates/navigation.html:37 core/templates/user/overview.html:25
+#: core/templates/navigation.html:36 core/templates/user/overview.html:28
msgid "Routines"
msgstr ""
-#: core/templates/navigation.html:45 core/templates/user/overview.html:70
+#: core/templates/navigation.html:44 core/templates/user/overview.html:73
msgid "Calendar"
msgstr ""
-#: core/templates/navigation.html:55
+#: core/templates/navigation.html:53
msgid "Measurements"
msgstr ""
-#: core/templates/navigation.html:66 gallery/templates/images/overview.html:6
+#: core/templates/navigation.html:64 gallery/templates/images/overview.html:6
msgid "Gallery"
msgstr ""
-#: core/templates/navigation.html:72
-msgid "Workout templates"
+#: core/templates/navigation.html:74 core/templates/navigation.html:400
+#: trophies/templates/trophies/overview.html:7
+msgid "Trophies"
msgstr ""
#: core/templates/navigation.html:79
+msgid "Workout templates"
+msgstr ""
+
+#: core/templates/navigation.html:86
msgid "Your templates"
msgstr ""
-#: core/templates/navigation.html:88
+#: core/templates/navigation.html:95
msgid "Public templates"
msgstr ""
-#: core/templates/navigation.html:96 software/templates/features.html:51
+#: core/templates/navigation.html:103 software/templates/features.html:51
#: software/templates/features.html:480
msgid "Exercises"
msgstr ""
-#: core/templates/navigation.html:102 core/templates/navigation.html:176
-#: core/templates/navigation.html:339
+#: core/templates/navigation.html:109 core/templates/navigation.html:336
msgid "Administration"
msgstr ""
-#: core/templates/navigation.html:106
+#: core/templates/navigation.html:113
msgid "Exercise edit history"
msgstr ""
-#: core/templates/navigation.html:112
+#: core/templates/navigation.html:119
msgid "Equipment"
msgstr ""
-#: core/templates/navigation.html:118
+#: core/templates/navigation.html:125
msgid "Muscles"
msgstr ""
-#: core/templates/navigation.html:124
+#: core/templates/navigation.html:131
#: exercises/templates/categories/admin-overview.html:4
msgid "Categories"
msgstr ""
-#: core/templates/navigation.html:139 software/templates/features.html:468
+#: core/templates/navigation.html:146 software/templates/features.html:468
msgid "Nutrition"
msgstr ""
-#: core/templates/navigation.html:147 core/templates/user/overview.html:144
+#: core/templates/navigation.html:154 core/templates/user/overview.html:147
msgid "Nutrition plans"
msgstr ""
-#: core/templates/navigation.html:156
+#: core/templates/navigation.html:163
msgid "BMI calculator"
msgstr ""
-#: core/templates/navigation.html:165 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:172 nutrition/templates/rate/form.html:18
msgid "Daily calories calculator"
msgstr ""
-#: core/templates/navigation.html:171
+#: core/templates/navigation.html:178
#: nutrition/templates/ingredient/overview.html:10
msgid "Ingredient overview"
msgstr ""
-#: core/templates/navigation.html:180 nutrition/templates/units/list.html:6
-msgid "Ingredient weight units"
-msgstr ""
-
-#: core/templates/navigation.html:196 software/templates/features.html:463
+#: core/templates/navigation.html:193 software/templates/features.html:463
msgid "Body weight"
msgstr ""
-#: core/templates/navigation.html:203 core/templates/user/overview.html:114
+#: core/templates/navigation.html:200 core/templates/user/overview.html:117
msgid "Weight overview"
msgstr ""
-#: core/templates/navigation.html:217
+#: core/templates/navigation.html:214
msgid "About this software"
msgstr ""
-#: core/templates/navigation.html:223 software/templates/about_us.html:5
+#: core/templates/navigation.html:220 software/templates/about_us.html:5
msgid "Support & Get Involved"
msgstr ""
-#: core/templates/navigation.html:229 software/templates/features.html:528
+#: core/templates/navigation.html:226 software/templates/features.html:528
msgid "REST API"
msgstr ""
-#: core/templates/navigation.html:235 utils/models.py:45
+#: core/templates/navigation.html:232 utils/models.py:45
msgid "License"
msgstr ""
-#: core/templates/navigation.html:241
+#: core/templates/navigation.html:238
msgid "Developer documentation"
msgstr ""
-#: core/templates/navigation.html:248
+#: core/templates/navigation.html:245
msgid "Get the code"
msgstr ""
-#: core/templates/navigation.html:255 core/templates/template.html:199
-#: software/templates/features.html:603
+#: core/templates/navigation.html:252 core/templates/template.html:202
+#: software/templates/features.html:614
msgid "Translate"
msgstr ""
-#: core/templates/navigation.html:292 core/templates/user/login.html:30
+#: core/templates/navigation.html:289 core/templates/user/login.html:30
msgid "Reset password"
msgstr ""
-#: core/templates/navigation.html:301 core/templates/navigation.html:329
+#: core/templates/navigation.html:298 core/templates/navigation.html:326
msgid "Logout"
msgstr ""
-#: core/templates/navigation.html:320
+#: core/templates/navigation.html:317
msgid "My preferences"
msgstr ""
-#: core/templates/navigation.html:352
+#: core/templates/navigation.html:349
msgid "Licenses"
msgstr ""
-#: core/templates/navigation.html:360
+#: core/templates/navigation.html:357
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr ""
-#: core/templates/navigation.html:368 core/templates/weight_unit/list.html:4
-#: nutrition/templates/ingredient/view.html:141
+#: core/templates/navigation.html:365 core/templates/weight_unit/list.html:4
+#: nutrition/templates/ingredient/view.html:182
msgid "Weight units"
msgstr ""
-#: core/templates/navigation.html:376 core/templates/user/list.html:4
+#: core/templates/navigation.html:373 core/templates/user/list.html:4
msgid "User list"
msgstr ""
-#: core/templates/navigation.html:382
+#: core/templates/navigation.html:379
msgid "Gyms"
msgstr ""
-#: core/templates/navigation.html:403
-#: trophies/templates/trophies/overview.html:7
-msgid "Trophies"
-msgstr ""
-
#: core/templates/registration/password_reset_complete.html:4
msgid "Password reset complete"
msgstr ""
@@ -757,25 +770,29 @@ msgstr ""
msgid "next"
msgstr ""
-#: core/templates/template.html:96
+#: core/templates/template.html:86
msgid "Close"
msgstr ""
-#: core/templates/template.html:112
+#: core/templates/template.html:102
msgid ""
"You are using a guest account, data entered will be deleted after a week."
msgstr ""
-#: core/templates/template.html:117
+#: core/templates/template.html:107
msgid "Create some demo entries"
msgstr ""
-#: core/templates/template.html:165 software/templates/features.html:568
+#: core/templates/template.html:155 software/templates/features.html:568
#: software/templates/tos.html:7
msgid "Terms of service"
msgstr ""
-#: core/templates/template_features.html:53 software/templates/features.html:9
+#: core/templates/template.html:181 software/templates/features.html:595
+msgid "Browser language"
+msgstr ""
+
+#: core/templates/template_features.html:46 software/templates/features.html:9
msgid "Features"
msgstr ""
@@ -830,99 +847,94 @@ msgstr ""
msgid "Forgot password?"
msgstr ""
-#: core/templates/user/overview.html:25 core/templates/user/overview.html:68
-#: core/templates/user/overview.html:112 core/templates/user/overview.html:144
-#: core/templates/user/overview.html:348 core/templates/user/overview.html:390
-#: core/templates/user/overview.html:426
+#: core/templates/user/overview.html:28 core/templates/user/overview.html:71
+#: core/templates/user/overview.html:115 core/templates/user/overview.html:147
+#: core/templates/user/overview.html:351 core/templates/user/overview.html:393
+#: core/templates/user/overview.html:429
#, python-format
msgid "last %(number)s"
msgstr ""
-#: core/templates/user/overview.html:27 core/templates/user/overview.html:146
-#: core/templates/user/overview.html:343 core/templates/user/overview.html:382
-#: core/templates/user/overview.html:421 gym/templates/gym/member_list.html:226
+#: core/templates/user/overview.html:30 core/templates/user/overview.html:149
+#: core/templates/user/overview.html:346 core/templates/user/overview.html:385
+#: core/templates/user/overview.html:424 gym/templates/gym/member_list.html:226
#: gym/templates/gym/member_list.html:262
#: gym/templates/gym/member_list.html:302
msgid "Overview"
msgstr ""
-#: core/templates/user/overview.html:34 core/templates/user/overview.html:76
-#: core/templates/user/overview.html:120 core/templates/user/overview.html:152
+#: core/templates/user/overview.html:37 core/templates/user/overview.html:79
+#: core/templates/user/overview.html:123 core/templates/user/overview.html:155
#: manager/helpers.py:88 software/templates/about_us.html:170
#: weight/templates/import_csv_preview.html:13
#: weight/templates/import_csv_preview.html:42 weight/views.py:54
msgid "Date"
msgstr ""
-#: core/templates/user/overview.html:35 core/templates/user/overview.html:153
+#: core/templates/user/overview.html:38 core/templates/user/overview.html:156
#: gym/models/contract.py:58 gym/models/contract.py:109
msgid "Description"
msgstr ""
-#: core/templates/user/overview.html:36
+#: core/templates/user/overview.html:39
msgid "Number of logs (days)"
msgstr ""
-#: core/templates/user/overview.html:37 core/views/user.py:590
+#: core/templates/user/overview.html:40 core/views/user.py:606
#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:158
msgid "Last activity"
msgstr ""
-#: core/templates/user/overview.html:58
+#: core/templates/user/overview.html:61
msgid "No workouts found."
msgstr ""
-#: core/templates/user/overview.html:68
+#: core/templates/user/overview.html:71
msgid "Log"
msgstr ""
-#: core/templates/user/overview.html:77
+#: core/templates/user/overview.html:80
msgid "General impression"
msgstr ""
-#: core/templates/user/overview.html:78 core/templates/user/overview.html:390
+#: core/templates/user/overview.html:81 core/templates/user/overview.html:393
msgid "Notes"
msgstr ""
-#: core/templates/user/overview.html:79
-#: exercises/templates/history/overview.html:30
-msgid "Time"
-msgstr ""
-
-#: core/templates/user/overview.html:112 core/templates/user/overview.html:121
+#: core/templates/user/overview.html:115 core/templates/user/overview.html:124
#: manager/helpers.py:89 weight/templates/import_csv_preview.html:14
#: weight/templates/import_csv_preview.html:43 weight/views.py:54
msgid "Weight"
msgstr ""
-#: core/templates/user/overview.html:154
-#: nutrition/templates/ingredient/view.html:51 nutrition/views/plan.py:245
+#: core/templates/user/overview.html:157
+#: nutrition/templates/ingredient/view.html:52 nutrition/views/plan.py:244
msgid "Energy"
msgstr ""
-#: core/templates/user/overview.html:155
-#: nutrition/templates/ingredient/view.html:58 nutrition/views/plan.py:251
+#: core/templates/user/overview.html:158
+#: nutrition/templates/ingredient/view.html:59 nutrition/views/plan.py:250
msgid "Protein"
msgstr ""
-#: core/templates/user/overview.html:156
-#: nutrition/templates/ingredient/view.html:64 nutrition/views/plan.py:259
+#: core/templates/user/overview.html:159
+#: nutrition/templates/ingredient/view.html:65 nutrition/views/plan.py:258
msgid "Carbohydrates"
msgstr ""
-#: core/templates/user/overview.html:157
-#: nutrition/templates/ingredient/view.html:80 nutrition/views/plan.py:273
+#: core/templates/user/overview.html:160
+#: nutrition/templates/ingredient/view.html:81 nutrition/views/plan.py:272
msgid "Fat"
msgstr ""
-#: core/templates/user/overview.html:170
-#: nutrition/templates/ingredient/view.html:53
+#: core/templates/user/overview.html:173
+#: nutrition/templates/ingredient/view.html:54
msgid "kcal"
msgstr ""
-#: core/templates/user/overview.html:201 core/templates/user/overview.html:340
-#: core/templates/user/overview.html:379 core/templates/user/overview.html:418
-#: core/templates/user/overview.html:463 gym/templates/gym/list.html:45
+#: core/templates/user/overview.html:204 core/templates/user/overview.html:343
+#: core/templates/user/overview.html:382 core/templates/user/overview.html:421
+#: core/templates/user/overview.html:466 gym/templates/gym/list.html:45
#: gym/templates/gym/member_list.html:91 gym/templates/gym/member_list.html:149
#: gym/templates/gym/member_list.html:187
#: gym/templates/gym/member_list.html:223
@@ -931,109 +943,113 @@ msgstr ""
msgid "Actions"
msgstr ""
-#: core/templates/user/overview.html:210
+#: core/templates/user/overview.html:213
msgid "Deactivate user"
msgstr ""
-#: core/templates/user/overview.html:214
+#: core/templates/user/overview.html:217
msgid "Activate user"
msgstr ""
-#: core/templates/user/overview.html:223
+#: core/templates/user/overview.html:226
msgid "Reset user password"
msgstr ""
-#: core/templates/user/overview.html:227 gym/templates/gym/member_list.html:30
+#: core/templates/user/overview.html:230 gym/templates/gym/member_list.html:30
msgid "Roles"
msgstr ""
-#: core/templates/user/overview.html:243
+#: core/templates/user/overview.html:246
msgid "Password reset confirmation"
msgstr ""
-#: core/templates/user/overview.html:247
+#: core/templates/user/overview.html:250
msgid "Do you really want to change this user&#39;s password?"
msgstr ""
-#: core/templates/user/overview.html:250
+#: core/templates/user/overview.html:253
#: exercises/templates/history/overview.html:106
+#: nutrition/templates/ingredient/view.html:148
+#: nutrition/templates/ingredient/view.html:160
msgid "No"
msgstr ""
-#: core/templates/user/overview.html:251
+#: core/templates/user/overview.html:254
#: exercises/templates/history/overview.html:99
+#: nutrition/templates/ingredient/view.html:146
+#: nutrition/templates/ingredient/view.html:158
msgid "Yes"
msgstr ""
-#: core/templates/user/overview.html:272 gym/templates/gym/member_list.html:105
+#: core/templates/user/overview.html:275 gym/templates/gym/member_list.html:105
msgid "Details"
msgstr ""
-#: core/templates/user/overview.html:276 gym/views/export.py:57
-#: manager/helpers.py:89 nutrition/views/plan.py:151
-#: nutrition/views/plan.py:157
+#: core/templates/user/overview.html:279 gym/views/export.py:57
+#: manager/helpers.py:89 nutrition/views/plan.py:150
+#: nutrition/views/plan.py:156
msgid "Nr."
msgstr ""
-#: core/templates/user/overview.html:298 gym/models/contract.py:287
+#: core/templates/user/overview.html:301 gym/models/contract.py:287
#: gym/models/gym.py:50 gym/templates/contract/view.html:75
#: gym/templates/gym/member_list.html:112 gym/views/export.py:68
msgid "Phone"
msgstr ""
-#: core/templates/user/overview.html:302 gym/templates/contract/view.html:87
+#: core/templates/user/overview.html:305 gym/templates/contract/view.html:87
#: gym/templates/gym/member_list.html:130
msgid "Address"
msgstr ""
-#: core/templates/user/overview.html:313
+#: core/templates/user/overview.html:316
msgid "Registered"
msgstr ""
-#: core/templates/user/overview.html:317
+#: core/templates/user/overview.html:320
msgid "Last login"
msgstr ""
-#: core/templates/user/overview.html:322
+#: core/templates/user/overview.html:325
msgid "Status"
msgstr ""
-#: core/templates/user/overview.html:325
+#: core/templates/user/overview.html:328
msgid "Active"
msgstr ""
-#: core/templates/user/overview.html:327
+#: core/templates/user/overview.html:330
msgid "Inactive"
msgstr ""
-#: core/templates/user/overview.html:348 gym/templates/contract/list.html:4
+#: core/templates/user/overview.html:351 gym/templates/contract/list.html:4
#: gym/templates/gym/member_list.html:218
msgid "Contracts"
msgstr ""
-#: core/templates/user/overview.html:426 gym/templates/document/list.html:4
+#: core/templates/user/overview.html:429 gym/templates/document/list.html:4
msgid "Documents"
msgstr ""
-#: core/templates/user/overview.html:433 gym/templates/document/list.html:33
+#: core/templates/user/overview.html:436 gym/templates/document/list.html:33
msgid "Download"
msgstr ""
-#: core/templates/user/overview.html:474 gym/views/admin_config.py:44
+#: core/templates/user/overview.html:477 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:477 gym/models/user_config.py:92
+#: core/templates/user/overview.html:480 gym/models/user_config.py:92
msgid "Include in inactive overview"
msgstr ""
-#: core/templates/user/overview.html:510
+#: core/templates/user/overview.html:513
#, python-format
msgid "Admin login is only available for users in %(gym_name)s"
msgstr ""
-#: core/templates/user/overview.html:514
+#: core/templates/user/overview.html:517
msgid "Log in as this user"
msgstr ""
@@ -1057,7 +1073,7 @@ msgstr ""
msgid "You need to verify your email to contribute exercises"
msgstr ""
-#: core/templates/user/preferences.html:55 core/views/user.py:601
+#: core/templates/user/preferences.html:55 core/views/user.py:617
msgid "Change password"
msgstr ""
@@ -1065,23 +1081,23 @@ msgstr ""
msgid "Already have an account?"
msgstr ""
-#: core/templatetags/wger_extras.py:142 i18n.tpl:38
+#: core/templatetags/wger_extras.py:142 i18n.tpl:39
msgid "kg"
msgstr ""
#: core/templatetags/wger_extras.py:144
-#: nutrition/templates/ingredient/view.html:60
-#: nutrition/templates/ingredient/view.html:66
-#: nutrition/templates/ingredient/view.html:73
-#: nutrition/templates/ingredient/view.html:82
-#: nutrition/templates/ingredient/view.html:89
-#: nutrition/templates/ingredient/view.html:111
-#: nutrition/templates/ingredient/view.html:121
+#: nutrition/templates/ingredient/view.html:61
+#: nutrition/templates/ingredient/view.html:67
+#: nutrition/templates/ingredient/view.html:74
+#: nutrition/templates/ingredient/view.html:83
+#: nutrition/templates/ingredient/view.html:90
+#: nutrition/templates/ingredient/view.html:112
+#: nutrition/templates/ingredient/view.html:122
msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr ""
-#: core/templatetags/wger_extras.py:147 i18n.tpl:39
+#: core/templatetags/wger_extras.py:147 i18n.tpl:40
msgid "lb"
msgstr ""
@@ -1090,84 +1106,83 @@ msgctxt "weight unit, i.e. ounces"
msgid "oz"
msgstr ""
-#: core/views/languages.py:85 exercises/views/categories.py:122
+#: core/views/languages.py:88 exercises/views/categories.py:122
#: exercises/views/equipment.py:103 exercises/views/muscles.py:99
-#: nutrition/views/ingredient.py:120 nutrition/views/unit.py:110
+#: nutrition/views/ingredient.py:125
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
+#: core/views/languages.py:96 core/views/license.py:103
+#: core/views/repetition_units.py:114 core/views/weight_units.py:115
#: exercises/views/categories.py:128 exercises/views/muscles.py:106
#: gallery/views/images.py:124 gym/views/admin_notes.py:196
#: gym/views/document.py:206 gym/views/gym.py:481
-#: nutrition/views/ingredient.py:127 nutrition/views/unit.py:117
+#: nutrition/views/ingredient.py:132
#, python-brace-format
msgid "Delete {0}?"
msgstr ""
-#: core/views/languages.py:111 core/views/license.py:85
-#: core/views/repetition_units.py:86 core/views/user.py:464
+#: core/views/languages.py:114 core/views/license.py:85
+#: core/views/repetition_units.py:96 core/views/user.py:480
#: core/views/weight_units.py:86 exercises/views/categories.py:98
#: exercises/views/equipment.py:81 exercises/views/muscles.py:87
#: gym/views/admin_notes.py:161 gym/views/config.py:68
#: gym/views/contract.py:186 gym/views/contract_option.py:123
#: gym/views/contract_type.py:123 gym/views/document.py:171
-#: gym/views/gym.py:463 nutrition/views/ingredient.py:146
-#: nutrition/views/unit.py:143
+#: gym/views/gym.py:463 nutrition/views/ingredient.py:151
#, python-brace-format
msgid "Edit {0}"
msgstr ""
-#: core/views/misc.py:74
+#: core/views/misc.py:73
msgid ""
"We have created sample workout, workout schedules, weight logs, (body) "
"weight and nutrition plan entries so you can better see what this site can "
"do. Feel free to edit or delete them!"
msgstr ""
-#: core/views/user.py:143
+#: core/views/user.py:145
#, python-brace-format
msgid "Account \"{0}\" was successfully deleted"
msgstr ""
-#: core/views/user.py:279
+#: core/views/user.py:287
msgid "You were successfully registered"
msgstr ""
-#: core/views/user.py:341
+#: core/views/user.py:357
msgid "Settings successfully updated"
msgstr ""
-#: core/views/user.py:380
+#: core/views/user.py:396
msgid "The user was successfully deactivated"
msgstr ""
-#: core/views/user.py:417
+#: core/views/user.py:433
msgid "The user was successfully activated"
msgstr ""
-#: core/views/user.py:432
+#: core/views/user.py:448
msgid "Edit user"
msgstr ""
-#: core/views/user.py:587 gym/templates/gym/member_list.html:26
+#: core/views/user.py:603 gym/templates/gym/member_list.html:26
#: gym/views/gym.py:158
msgid "ID"
msgstr ""
-#: core/views/user.py:588 gym/forms.py:95 gym/templates/contract/view.html:55
+#: core/views/user.py:604 gym/forms.py:95 gym/templates/contract/view.html:55
#: gym/templates/gym/member_list.html:27 gym/views/export.py:59
#: gym/views/gym.py:158 gym/views/gym.py:217
msgid "Username"
msgstr ""
-#: core/views/user.py:591 gym/templates/gym/new_user.html:34
+#: core/views/user.py:607 gym/templates/gym/new_user.html:34
#: gym/views/export.py:58 gym/views/gym.py:217
msgid "Gym"
msgstr ""
-#: core/views/user.py:650
+#: core/views/user.py:678
#, python-format
msgid "A verification email was sent to %(email)s"
msgstr ""
@@ -1184,16 +1199,16 @@ msgstr ""
msgid "A more basic name for the muscle"
msgstr ""
-#: exercises/models/video.py:50
+#: exercises/models/video.py:52
#, python-format
msgid "Maximum file size is %(size)sMB."
msgstr ""
-#: exercises/models/video.py:57 exercises/models/video.py:65
+#: exercises/models/video.py:59 exercises/models/video.py:67
msgid "File type is not supported"
msgstr ""
-#: exercises/models/video.py:70
+#: exercises/models/video.py:72
msgid "File is not a valid video"
msgstr ""
@@ -1264,7 +1279,11 @@ msgstr ""
msgid "Add muscle"
msgstr ""
-#: gallery/templates/images/overview.html:72
+#: gallery/forms.py:35
+msgid "If date is left empty, it will be read from the image instead"
+msgstr ""
+
+#: gallery/templates/images/overview.html:69
msgid "Add image"
msgstr ""
@@ -1330,7 +1349,7 @@ msgid "Contract type"
msgstr ""
#: gym/models/contract.py:211 gym/templates/contract/view.html:59
-#: nutrition/forms.py:58
+#: nutrition/forms.py:67
msgid "Amount"
msgstr ""
@@ -1506,7 +1525,7 @@ msgstr ""
msgid "Add member"
msgstr ""
-#: gym/templates/gym/new_user.html:48 nutrition/templates/rate/form.html:120
+#: gym/templates/gym/new_user.html:48 nutrition/templates/rate/form.html:121
msgid "Info"
msgstr ""
@@ -1673,10 +1692,6 @@ msgstr ""
msgid "Quads"
msgstr ""
-#: i18n.tpl:30
-msgid "Repetitions"
-msgstr ""
-
#: i18n.tpl:31
msgid "Resistance band"
msgstr ""
@@ -1705,175 +1720,179 @@ msgstr ""
msgid "Until Failure"
msgstr ""
-#: i18n.tpl:40
-msgid "none (bodyweight exercise)"
+#: i18n.tpl:38
+msgid "Meters"
msgstr ""
#: i18n.tpl:41
-msgid "Beginner"
+msgid "none (bodyweight exercise)"
msgstr ""
#: i18n.tpl:42
-msgid "Consistent"
+msgid "Beginner"
msgstr ""
#: i18n.tpl:43
-msgid "Dedicated"
+msgid "Consistent"
msgstr ""
#: i18n.tpl:44
-msgid "Obsessed"
+msgid "Dedicated"
msgstr ""
#: i18n.tpl:45
-msgid "Legend"
+msgid "Obsessed"
msgstr ""
#: i18n.tpl:46
-msgid "Veteran"
+msgid "Legend"
msgstr ""
#: i18n.tpl:47
-msgid "Titan"
+msgid "Veteran"
msgstr ""
#: i18n.tpl:48
-msgid "Unstoppable"
+msgid "Titan"
msgstr ""
#: i18n.tpl:49
-msgid "Weekend Warrior"
+msgid "Unstoppable"
msgstr ""
#: i18n.tpl:50
-msgid "Elephant lifter"
+msgid "Weekend Warrior"
msgstr ""
#: i18n.tpl:51
-msgid "Bus lifter"
+msgid "Elephant lifter"
msgstr ""
#: i18n.tpl:52
-msgid "Plane lifter"
+msgid "Bus lifter"
msgstr ""
#: i18n.tpl:53
-msgid "Blue whale lifter"
+msgid "Plane lifter"
msgstr ""
#: i18n.tpl:54
-msgid "Space Station lifter"
+msgid "Blue whale lifter"
msgstr ""
#: i18n.tpl:55
-msgid "Millionaire"
+msgid "Space Station lifter"
msgstr ""
#: i18n.tpl:56
-msgid "Atlas"
+msgid "Millionaire"
msgstr ""
#: i18n.tpl:57
-msgid "Early Bird"
+msgid "Atlas"
msgstr ""
#: i18n.tpl:58
-msgid "Night Owl"
+msgid "Early Bird"
msgstr ""
#: i18n.tpl:59
-msgid "New Year, New Me"
+msgid "Night Owl"
msgstr ""
#: i18n.tpl:60
-msgid "Phoenix"
+msgid "New Year, New Me"
msgstr ""
#: i18n.tpl:61
-msgid "Personal Record"
+msgid "Phoenix"
msgstr ""
#: i18n.tpl:62
-msgid "Complete your first workout"
+msgid "Personal Record"
msgstr ""
#: i18n.tpl:63
-msgid "Complete 10 workouts"
+msgid "Complete your first workout"
msgstr ""
#: i18n.tpl:64
-msgid "Complete 50 workouts"
+msgid "Complete 10 workouts"
msgstr ""
#: i18n.tpl:65
-msgid "Complete 100 workouts"
+msgid "Complete 50 workouts"
msgstr ""
#: i18n.tpl:66
-msgid "Complete 200 workouts"
+msgid "Complete 100 workouts"
msgstr ""
#: i18n.tpl:67
-msgid "Complete 500 workouts"
+msgid "Complete 200 workouts"
msgstr ""
#: i18n.tpl:68
-msgid "Complete 1000 workouts"
+msgid "Complete 500 workouts"
msgstr ""
#: i18n.tpl:69
-msgid "Maintain a 30-day workout streak"
+msgid "Complete 1000 workouts"
msgstr ""
#: i18n.tpl:70
-msgid "Work out on Saturday and Sunday for 4 consecutive weekends"
+msgid "Maintain a 30-day workout streak"
msgstr ""
#: i18n.tpl:71
-msgid "Lift a cumulative total of 5.000 kg"
+msgid "Work out on Saturday and Sunday for 4 consecutive weekends"
msgstr ""
#: i18n.tpl:72
-msgid "Lift a cumulative total of 20.000 kg"
+msgid "Lift a cumulative total of 5.000 kg"
msgstr ""
#: i18n.tpl:73
-msgid "Lift a cumulative total of 50.000 kg"
+msgid "Lift a cumulative total of 20.000 kg"
msgstr ""
#: i18n.tpl:74
-msgid "Lift a cumulative total of 150.000 kg"
+msgid "Lift a cumulative total of 50.000 kg"
msgstr ""
#: i18n.tpl:75
-msgid "Lift a cumulative total of 450.000 kg"
+msgid "Lift a cumulative total of 150.000 kg"
msgstr ""
#: i18n.tpl:76
-msgid "Lift a cumulative total of 1.000.000 kg"
+msgid "Lift a cumulative total of 450.000 kg"
msgstr ""
#: i18n.tpl:77
-msgid "Lift a cumulative total of 10.000.000 kg"
+msgid "Lift a cumulative total of 1.000.000 kg"
msgstr ""
#: i18n.tpl:78
-msgid "Complete a workout before 6:00 AM"
+msgid "Lift a cumulative total of 10.000.000 kg"
msgstr ""
#: i18n.tpl:79
-msgid "Complete a workout after 9:00 PM"
+msgid "Complete a workout before 6:00 AM"
msgstr ""
#: i18n.tpl:80
-msgid "Work out on January 1st"
+msgid "Complete a workout after 9:00 PM"
msgstr ""
#: i18n.tpl:81
-msgid "Return to training after being inactive for 30 days"
+msgid "Work out on January 1st"
msgstr ""
#: i18n.tpl:82
+msgid "Return to training after being inactive for 30 days"
+msgstr ""
+
+#: i18n.tpl:83
msgid "Achieve a new Personal Record on any exercise"
msgstr ""
@@ -1955,7 +1974,7 @@ msgstr ""
msgid "Routine will expire soon"
msgstr ""
-#: manager/models/routine.py:153 manager/models/session.py:145
+#: manager/models/routine.py:154 manager/models/session.py:145
msgid "The start time cannot be after the end time."
msgstr ""
@@ -2027,36 +2046,56 @@ msgstr ""
msgid "Workout for %s"
msgstr ""
-#: nutrition/forms.py:62
+#: nutrition/extract_info/off.py:72 nutrition/extract_info/off.py:91
+msgid "Serving"
+msgstr ""
+
+#: nutrition/forms.py:71 nutrition/forms.py:208
msgid "Unit"
msgstr ""
-#: nutrition/forms.py:170 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:179 nutrition/templates/rate/form.html:77
msgid "Basic caloric intake"
msgstr ""
-#: nutrition/forms.py:171
+#: nutrition/forms.py:180
msgid "Your basic caloric intake as calculated for your data"
msgstr ""
-#: nutrition/forms.py:176
+#: nutrition/forms.py:185
msgid "Additional calories"
msgstr ""
-#: nutrition/forms.py:178
+#: nutrition/forms.py:187
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
msgstr ""
#: nutrition/forms.py:209
+msgid "grams (g)"
+msgstr ""
+
+#: nutrition/forms.py:219
msgid "Ingredient"
msgstr ""
-#: nutrition/forms.py:213
+#: nutrition/forms.py:223
msgid "Also search for names in English"
msgstr ""
+#: nutrition/forms.py:239
+msgid "Quantity"
+msgstr ""
+
+#: nutrition/forms.py:241
+msgid "Enter a quantity and choose grams (g) or one of the serving units."
+msgstr ""
+
+#: nutrition/models/ingredient.py:526
+msgid "Portion"
+msgstr ""
+
#: nutrition/templates/ingredient/email_new.tpl:1
#, python-format
msgid ""
@@ -2094,59 +2133,86 @@ msgid ""
"sucessfully."
msgstr ""
-#: nutrition/templates/ingredient/overview.html:38
+#: nutrition/templates/ingredient/overview.html:32
+#: nutrition/templates/ingredient/overview.html:68
+#: nutrition/templates/ingredient/view.html:143
+msgid "Vegan"
+msgstr ""
+
+#: nutrition/templates/ingredient/overview.html:34
+#: nutrition/templates/ingredient/overview.html:79
+#: nutrition/templates/ingredient/view.html:155
+msgid "Vegetarian"
+msgstr ""
+
+#: nutrition/templates/ingredient/overview.html:43
msgid "No ingredients."
msgstr ""
-#: nutrition/templates/ingredient/overview.html:49
+#: nutrition/templates/ingredient/overview.html:54
msgid "Search"
msgstr ""
-#: nutrition/templates/ingredient/view.html:45 nutrition/views/plan.py:237
+#: nutrition/templates/ingredient/overview.html:57
+msgid "Filter"
+msgstr ""
+
+#: nutrition/templates/ingredient/overview.html:83
+msgid "Apply"
+msgstr ""
+
+#: nutrition/templates/ingredient/overview.html:85
+msgid "Reset"
+msgstr ""
+
+#: nutrition/templates/ingredient/view.html:46 nutrition/views/plan.py:236
msgid "Macronutrients"
msgstr ""
-#: nutrition/templates/ingredient/view.html:54
+#: nutrition/templates/ingredient/view.html:55
msgid "kJ"
msgstr ""
-#: nutrition/templates/ingredient/view.html:70 nutrition/views/plan.py:267
+#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:266
msgid "Sugar content in carbohydrates"
msgstr ""
-#: nutrition/templates/ingredient/view.html:75
-#: nutrition/templates/ingredient/view.html:91
-#: nutrition/templates/ingredient/view.html:113
-#: nutrition/templates/ingredient/view.html:123
+#: nutrition/templates/ingredient/view.html:76
+#: nutrition/templates/ingredient/view.html:92
+#: nutrition/templates/ingredient/view.html:114
+#: nutrition/templates/ingredient/view.html:124
msgid "n.A."
msgstr ""
-#: nutrition/templates/ingredient/view.html:86 nutrition/views/plan.py:281
+#: nutrition/templates/ingredient/view.html:87 nutrition/views/plan.py:280
msgid "Saturated fat content in fats"
msgstr ""
-#: nutrition/templates/ingredient/view.html:102
+#: nutrition/templates/ingredient/view.html:103
msgid "Others"
msgstr ""
-#: nutrition/templates/ingredient/view.html:108 nutrition/views/plan.py:287
+#: nutrition/templates/ingredient/view.html:109 nutrition/views/plan.py:286
msgid "Fiber"
msgstr ""
-#: nutrition/templates/ingredient/view.html:118 nutrition/views/plan.py:293
+#: nutrition/templates/ingredient/view.html:119 nutrition/views/plan.py:292
msgid "Sodium"
msgstr ""
-#: nutrition/templates/ingredient/view.html:143
-#: nutrition/templates/units/list.html:50 nutrition/views/unit.py:86
+#: nutrition/templates/ingredient/view.html:136
+msgid "Dietary information"
+msgstr ""
+
+#: nutrition/templates/ingredient/view.html:184
msgid "Add new weight unit"
msgstr ""
-#: nutrition/templates/rate/form.html:25
+#: nutrition/templates/rate/form.html:26
msgid "Basal metabolic rate"
msgstr ""
-#: nutrition/templates/rate/form.html:26
+#: nutrition/templates/rate/form.html:27
msgid ""
"The basal metabolic rate is the amount of energy expended daily\n"
"at rest. This is the minimum energy needed for the body to function, without "
@@ -2154,36 +2220,36 @@ msgid ""
"additional physical activity."
msgstr ""
-#: nutrition/templates/rate/form.html:37
+#: nutrition/templates/rate/form.html:38
msgid "Your basic metabolic rate is: "
msgstr ""
-#: nutrition/templates/rate/form.html:47
+#: nutrition/templates/rate/form.html:48
msgid "Physical activities"
msgstr ""
-#: nutrition/templates/rate/form.html:48
+#: nutrition/templates/rate/form.html:49
msgid ""
"The physical activity level (PAL) is a factor used to to express\n"
"the additional physical activity and is used to calculate the total energy\n"
"required per day."
msgstr ""
-#: nutrition/templates/rate/form.html:59
+#: nutrition/templates/rate/form.html:60
msgid "Factor for daily activities: "
msgstr ""
-#: nutrition/templates/rate/form.html:67
+#: nutrition/templates/rate/form.html:68
msgid ""
"The base caloric intake is the amount of calories your metabolism\n"
"needs based on your level of physical activity."
msgstr ""
-#: nutrition/templates/rate/form.html:81
+#: nutrition/templates/rate/form.html:82
msgid "Calculate basic caloric intake"
msgstr ""
-#: nutrition/templates/rate/form.html:88
+#: nutrition/templates/rate/form.html:89
msgid ""
"The total calories are the actual total calories per day. This\n"
"might include e.g. a surplus or deficit if you are bulking or cutting. "
@@ -2191,67 +2257,67 @@ msgid ""
"you might just enter yourself the amount of calories if you know the value."
msgstr ""
-#: nutrition/templates/rate/form.html:102
+#: nutrition/templates/rate/form.html:103
msgid "Transfer basic intake to total daily calories"
msgstr ""
-#: nutrition/templates/rate/form.html:106
+#: nutrition/templates/rate/form.html:107
msgid "Add additional calories to total daily calories"
msgstr ""
-#: nutrition/templates/rate/form.html:110
+#: nutrition/templates/rate/form.html:111
msgid "Save total calories to profile"
msgstr ""
-#: nutrition/templates/rate/form.html:121
+#: nutrition/templates/rate/form.html:122
msgid ""
"Please note that these calculations can only be an\n"
"approximation. If you base your nutrition plan on these values, observe\n"
"yourself for some weeks and change the total amount if needed."
msgstr ""
-#: nutrition/views/ingredient.py:158
+#: nutrition/views/ingredient.py:163
msgid "Add a new ingredient"
msgstr ""
-#: nutrition/views/plan.py:128
+#: nutrition/views/plan.py:127
msgid "Nutritional plan"
msgstr ""
-#: nutrition/views/plan.py:130
+#: nutrition/views/plan.py:129
#, python-format
msgid "Nutritional plan for %s"
msgstr ""
-#: nutrition/views/plan.py:202
+#: nutrition/views/plan.py:201
msgid "<i>This is an empty plan, what did you expect on the PDF?</i>"
msgstr ""
-#: nutrition/views/plan.py:230
+#: nutrition/views/plan.py:229
msgid "Nutritional data"
msgstr ""
-#: nutrition/views/plan.py:238
+#: nutrition/views/plan.py:237
msgid "Total"
msgstr ""
-#: nutrition/views/plan.py:239
+#: nutrition/views/plan.py:238
msgid "Percent of energy"
msgstr ""
-#: nutrition/views/plan.py:240
+#: nutrition/views/plan.py:239
msgid "g per body kg"
msgstr ""
-#: nutrition/views/unit_ingredient.py:69
+#: nutrition/views/unit_ingredient.py:64
msgid "Add a new weight unit"
msgstr ""
-#: nutrition/views/unit_ingredient.py:106
+#: nutrition/views/unit_ingredient.py:99
msgid "Edit a weight unit to ingredient connection"
msgstr ""
-#: nutrition/views/unit_ingredient.py:138
+#: nutrition/views/unit_ingredient.py:129
msgid "Delete?"
msgstr ""
@@ -2598,7 +2664,7 @@ msgstr ""
msgid "Translation"
msgstr ""
-#: utils/generic_views.py:263
+#: utils/generic_views.py:246
msgid "Yes, delete"
msgstr ""
@@ -2649,10 +2715,6 @@ msgstr ""
msgid "Import weight logs"
msgstr ""
-#: weight/templates/import_csv_form.html:9
-msgid "Submit"
-msgstr ""
-
#: weight/templates/import_csv_form.html:15
msgid ""
"Use this import field to import your weight logs into Workout\n"
diff --git a/wger/locale/th/LC_MESSAGES/django.po b/wger/locale/th/LC_MESSAGES/django.po
index b84f891d5..34136f914 100644
--- a/wger/locale/th/LC_MESSAGES/django.po
+++ b/wger/locale/th/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-01-17 14:03+0000\n"
+"POT-Creation-Date: 2026-04-10 10:20+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
@@ -31,7 +31,7 @@ msgstr ""
#: config/views/gym_config.py:42 core/templates/language/view.html:64
#: core/templates/license/list.html:17
#: core/templates/repetition_unit/list.html:18
-#: core/templates/user/overview.html:204 core/templates/user/overview.html:467
+#: core/templates/user/overview.html:207 core/templates/user/overview.html:470
#: core/templates/weight_unit/list.html:18
#: exercises/templates/categories/admin-overview.html:17
#: exercises/templates/equipment/admin-overview.html:17
@@ -43,30 +43,29 @@ msgstr ""
#: gym/templates/gym/list.html:19 gym/templates/gym/list.html:48
#: gym/templates/gym/member_list.html:94 gym/templates/gym/member_list.html:152
#: gym/templates/gym/member_list.html:190
-#: nutrition/templates/ingredient/view.html:164
-#: nutrition/templates/ingredient/view.html:209
-#: nutrition/templates/units/list.html:19
+#: nutrition/templates/ingredient/view.html:205
+#: nutrition/templates/ingredient/view.html:248
msgid "Edit"
msgstr ""
-#: core/forms.py:91 core/templates/navigation.html:271
-#: core/templates/navigation.html:278 core/templates/user/login.html:4
+#: core/forms.py:89 core/templates/navigation.html:268
+#: core/templates/navigation.html:275 core/templates/user/login.html:4
#: core/templates/user/registration_sidebar.html:12
#: software/templates/features.html:82 software/templates/features.html:448
msgid "Login"
msgstr ""
-#: core/forms.py:130 core/forms.py:244 gym/views/export.py:61
+#: core/forms.py:128 core/forms.py:242 gym/views/export.py:61
#: gym/views/gym.py:217
msgid "First name"
msgstr ""
-#: core/forms.py:131 core/forms.py:245 core/templates/user/overview.html:284
+#: core/forms.py:129 core/forms.py:243 core/templates/user/overview.html:287
#: gym/views/export.py:62 gym/views/gym.py:217
msgid "Last name"
msgstr ""
-#: core/forms.py:133 core/forms.py:210 core/templates/user/overview.html:288
+#: core/forms.py:131 core/forms.py:208 core/templates/user/overview.html:291
#: gym/models/contract.py:256 gym/models/gym.py:58
#: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:116
#: gym/templates/gym/new_user.html:30 gym/views/export.py:60
@@ -76,53 +75,53 @@ msgstr ""
msgid "Email"
msgstr ""
-#: core/forms.py:134
+#: core/forms.py:132
msgid "Used for password resets and, optionally, e-mail reminders."
msgstr ""
-#: core/forms.py:138 core/models/profile.py:222
+#: core/forms.py:136 core/models/profile.py:222
#: gym/templates/gym/new_user.html:38
msgid "Date of Birth"
msgstr ""
-#: core/forms.py:177
+#: core/forms.py:175
msgid "Personal data"
msgstr ""
-#: core/forms.py:189
+#: core/forms.py:187
msgid "Workout reminders"
msgstr ""
-#: core/forms.py:196
+#: core/forms.py:194
msgid "Other settings"
msgstr ""
-#: core/forms.py:204 core/views/user.py:614 core/views/user.py:629
-#: core/views/user.py:641 gym/forms.py:73 utils/generic_views.py:143
+#: core/forms.py:202 core/views/user.py:630 core/views/user.py:654
+#: core/views/user.py:668 gym/forms.py:73 utils/generic_views.py:137
msgid "Save"
msgstr ""
-#: core/forms.py:211
+#: core/forms.py:209
msgid "Used for password resets and, optionally, email reminders."
msgstr ""
-#: core/forms.py:240
+#: core/forms.py:238
msgid "This e-mail address is already in use."
msgstr ""
-#: core/forms.py:261 gym/templates/gym/new_user.html:26
+#: core/forms.py:259 gym/templates/gym/new_user.html:26
#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:217
msgid "Password"
msgstr ""
-#: core/forms.py:263
+#: core/forms.py:261
msgid "Please enter your current password."
msgstr ""
-#: core/forms.py:272 core/templates/language/view.html:70
+#: core/forms.py:270 core/templates/language/view.html:70
#: core/templates/license/list.html:21
#: core/templates/repetition_unit/list.html:22
-#: core/templates/user/overview.html:233
+#: core/templates/user/overview.html:236
#: core/templates/weight_unit/list.html:22
#: exercises/templates/categories/admin-overview.html:21
#: exercises/templates/equipment/admin-overview.html:21
@@ -130,27 +129,30 @@ msgstr ""
#: gym/templates/admin_notes/list.html:37
#: gym/templates/contract_option/list.html:35
#: gym/templates/contract_type/list.html:36 gym/templates/document/list.html:46
-#: gym/templates/gym/list.html:23 nutrition/templates/ingredient/view.html:168
-#: nutrition/templates/ingredient/view.html:215
-#: nutrition/templates/units/list.html:25
+#: gym/templates/gym/list.html:23 nutrition/templates/ingredient/view.html:209
+#: nutrition/templates/ingredient/view.html:254
msgid "Delete"
msgstr ""
-#: core/forms.py:281
+#: core/forms.py:279
msgid "Invalid password"
msgstr ""
-#: core/forms.py:293
+#: core/forms.py:291 core/forms.py:349
msgid "The form is secured with reCAPTCHA"
msgstr ""
-#: core/forms.py:314 core/forms.py:341 core/templates/navigation.html:272
-#: core/templates/navigation.html:285 core/templates/template.html:123
-#: core/templates/user/login.html:21 core/views/user.py:285
+#: core/forms.py:312 core/forms.py:339 core/templates/navigation.html:269
+#: core/templates/navigation.html:282 core/templates/template.html:113
+#: core/templates/user/login.html:21 core/views/user.py:293
#: software/templates/features.html:87 software/templates/features.html:442
msgid "Register"
msgstr ""
+#: core/forms.py:360 weight/templates/import_csv_form.html:9
+msgid "Submit"
+msgstr ""
+
#: core/models/language.py:31 core/templates/language/view.html:21
msgid "Language short name"
msgstr ""
@@ -185,36 +187,36 @@ msgstr ""
msgid "Link to license text or other information"
msgstr ""
-#: core/models/profile.py:57
+#: core/models/profile.py:60
#, python-format
msgid "%(birthdate)s is not a valid birthdate"
msgstr ""
-#: core/models/profile.py:66
+#: core/models/profile.py:69
msgid "Male"
msgstr ""
-#: core/models/profile.py:67
+#: core/models/profile.py:70
msgid "Female"
msgstr ""
-#: core/models/profile.py:74
+#: core/models/profile.py:77
msgid "Low"
msgstr ""
-#: core/models/profile.py:75
+#: core/models/profile.py:78
msgid "Medium"
msgstr ""
-#: core/models/profile.py:76
+#: core/models/profile.py:79
msgid "High"
msgstr ""
-#: core/models/profile.py:82
+#: core/models/profile.py:85
msgid "Metric (kilogram)"
msgstr ""
-#: core/models/profile.py:83
+#: core/models/profile.py:86
msgid "Imperial (pound)"
msgstr ""
@@ -322,7 +324,7 @@ msgstr ""
msgid "Free time"
msgstr ""
-#: core/models/profile.py:320 nutrition/templates/rate/form.html:66
+#: core/models/profile.py:320 nutrition/templates/rate/form.html:67
msgid "Total daily calories"
msgstr ""
@@ -360,20 +362,41 @@ msgstr ""
msgid "Enable or disable the trophy system for this user"
msgstr ""
-#: core/models/profile.py:446
+#: core/models/profile.py:457
msgid "The sum of all hours has to be 24"
msgstr ""
-#: core/models/rep_unit.py:36 core/models/weight_unit.py:42
-#: core/templates/user/overview.html:280 core/views/user.py:589
+#: core/models/rep_unit.py:32 i18n.tpl:30
+msgid "Repetitions"
+msgstr ""
+
+#: core/models/rep_unit.py:33 core/templates/user/overview.html:82
+#: exercises/templates/history/overview.html:30
+msgid "Time"
+msgstr ""
+
+#: core/models/rep_unit.py:34
+msgid "Distance"
+msgstr ""
+
+#: core/models/rep_unit.py:47 core/models/weight_unit.py:42
+#: core/templates/user/overview.html:283 core/views/user.py:605
#: exercises/models/muscle.py:36 gym/models/contract.py:52
#: gym/models/contract.py:103 gym/models/gym.py:46
#: gym/models/user_document.py:84 gym/templates/contract/view.html:50
#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:108
-#: gym/views/gym.py:158 nutrition/templates/ingredient/view.html:151
+#: gym/views/gym.py:158 nutrition/templates/ingredient/view.html:192
msgid "Name"
msgstr ""
+#: core/models/rep_unit.py:53
+msgid "Unit Type"
+msgstr ""
+
+#: core/models/rep_unit.py:54
+msgid "The type of unit (repetitions, time, or distance)"
+msgstr ""
+
#: core/templates/403.html:4
msgid "Forbidden!"
msgstr ""
@@ -401,77 +424,73 @@ msgid ""
"later time. If the problem persists, you can seek help in ways listed below:"
msgstr ""
-#: core/templates/base.html:10
-#, python-format
-msgid ""
-"You are browsing the site as the user \"%(current_user)s\", all actions are "
-"performed on their data."
+#: core/templates/account/email/email_confirmation_message.html:81
+msgid "Almost there!"
msgstr ""
-#: core/templates/base.html:15 core/templates/base_wide.html:12
+#: core/templates/account/email/email_confirmation_message.html:85
#, python-format
-msgid "Back to \"%(target)s\""
+msgid ""
+"You're receiving this email because the user \"%(user_display)s\" has given "
+"your email address to register an account on %(site_domain)s."
msgstr ""
-#: core/templates/base_wide.html:7
-#, python-format
+#: core/templates/account/email/email_confirmation_message.html:93
msgid ""
-"You are\n"
-" browsing the site as the user \"%(current_user)s\", all "
-"actions are performed on\n"
-" their data.\n"
-" "
+"Your email verification code is listed below. Please enter it in your open "
+"browser window."
msgstr ""
-#: core/templates/delete.html:4
-msgid "Are you sure you want to delete this? This action cannot be undone."
+#: core/templates/account/email/email_confirmation_message.html:100
+msgid "Please click the button below to confirm your email address."
msgstr ""
-#: core/templates/email_verification/confirm_template.html:4
-msgid "Email verification"
+#: core/templates/account/email/email_confirmation_message.html:106
+msgid "Confirm email"
msgstr ""
-#: core/templates/email_verification/confirm_template.html:18
+#: core/templates/account/email/email_confirmation_message.html:110
#, python-format
-msgid "%(username)s, your email was verified"
+msgid ""
+"The link is valid for %(expire_hours)s hours (until %(date)s, %(time)s). You "
+"can request a new one from your profile settings."
msgstr ""
-#: core/templates/email_verification/confirm_template.html:22
-msgid "Error, invalid verification token"
+#: core/templates/account/email/email_confirmation_message.html:116
+msgid "If the button doesn't work, copy and paste this link into your browser:"
msgstr ""
-#: core/templates/email_verification/email_body_html.tpl:6
-msgid "Email Confirmation"
+#: core/templates/account/email/email_confirmation_message.html:125
+msgid "the wger Team"
msgstr ""
-#: core/templates/email_verification/email_body_html.tpl:9
-#: core/templates/email_verification/email_body_txt.tpl:3
+#: core/templates/base.html:10
#, python-format
-msgid "You are almost there, %(username)s!"
+msgid ""
+"You are browsing the site as the user \"%(current_user)s\", all actions are "
+"performed on their data."
msgstr ""
-#: core/templates/email_verification/email_body_html.tpl:11
+#: core/templates/base.html:15 core/templates/base_wide.html:12
#, python-format
-msgid "Please click <a href=\"%(link)s\">here</a> to confirm your email"
+msgid "Back to \"%(target)s\""
msgstr ""
-#: core/templates/email_verification/email_body_html.tpl:12
-#: core/templates/email_verification/email_body_txt.tpl:5
+#: core/templates/base_wide.html:7
#, 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"
+msgid ""
+"You are\n"
+" browsing the site as the user \"%(current_user)s\", all "
+"actions are performed on\n"
+" their data.\n"
+" "
msgstr ""
-#: core/templates/email_verification/email_body_txt.tpl:4
-#, python-format
-msgid "Please click the following link to confirm your email: %(link)s"
+#: core/templates/delete.html:4
+msgid "Are you sure you want to delete this? This action cannot be undone."
msgstr ""
-#: core/templates/language/overview.html:4 core/templates/navigation.html:344
+#: core/templates/language/overview.html:4 core/templates/navigation.html:341
msgid "Languages"
msgstr ""
@@ -480,16 +499,16 @@ msgid "Nothing found."
msgstr ""
#: core/templates/language/overview.html:22
-#: nutrition/templates/ingredient/overview.html:38
+#: nutrition/templates/ingredient/overview.html:43
msgid "Add one now."
msgstr ""
#: core/templates/language/overview.html:34 core/templates/license/list.html:43
-#: core/templates/repetition_unit/list.html:46
-#: core/templates/user/overview.html:344 core/templates/user/overview.html:384
-#: core/templates/user/overview.html:422
-#: core/templates/weight_unit/list.html:46 core/views/languages.py:74
-#: core/views/license.py:66 core/views/repetition_units.py:66
+#: core/templates/repetition_unit/list.html:44
+#: core/templates/user/overview.html:347 core/templates/user/overview.html:387
+#: core/templates/user/overview.html:425
+#: core/templates/weight_unit/list.html:46 core/views/languages.py:77
+#: core/views/license.py:66 core/views/repetition_units.py:76
#: core/views/weight_units.py:66
#: exercises/templates/categories/admin-overview.html:40
#: exercises/templates/equipment/admin-overview.html:39
@@ -502,14 +521,14 @@ msgstr ""
#: gym/templates/gym/member_list.html:264
#: gym/templates/gym/member_list.html:303
#: mailer/templates/mailer/gym/overview.html:43
-#: nutrition/templates/ingredient/overview.html:60
+#: nutrition/templates/ingredient/overview.html:97
msgid "Add"
msgstr ""
#: core/templates/language/view.html:61 core/templates/user/api_key.html:41
#: core/templates/user/preferences.html:50 gym/models/contract.py:203
#: gym/templates/contract/view.html:41 gym/templates/gym/member_list.html:270
-#: nutrition/templates/ingredient/view.html:206
+#: nutrition/templates/ingredient/view.html:245
msgid "Options"
msgstr ""
@@ -519,9 +538,9 @@ msgstr ""
#: core/templates/license/list.html:30
#: core/templates/repetition_unit/list.html:32
-#: core/templates/user/overview.html:104 core/templates/user/overview.html:136
-#: core/templates/user/overview.html:185 core/templates/user/overview.html:365
-#: core/templates/user/overview.html:404 core/templates/user/overview.html:448
+#: core/templates/user/overview.html:107 core/templates/user/overview.html:139
+#: core/templates/user/overview.html:188 core/templates/user/overview.html:368
+#: core/templates/user/overview.html:407 core/templates/user/overview.html:451
#: core/templates/weight_unit/list.html:32
#: exercises/templates/categories/admin-overview.html:30
#: exercises/templates/equipment/admin-overview.html:30
@@ -533,11 +552,10 @@ msgstr ""
#: gym/templates/gym/member_list.html:284
#: gym/templates/gym/member_list.html:321
#: mailer/templates/mailer/gym/overview.html:30
-#: nutrition/templates/units/list.html:34
msgid "Nothing found"
msgstr ""
-#: core/templates/misc/about.html:4 core/templates/template.html:160
+#: core/templates/misc/about.html:4 core/templates/template.html:150
msgid "Imprint"
msgstr ""
@@ -545,162 +563,157 @@ msgstr ""
msgid "Training"
msgstr ""
-#: core/templates/navigation.html:37 core/templates/user/overview.html:25
+#: core/templates/navigation.html:36 core/templates/user/overview.html:28
msgid "Routines"
msgstr ""
-#: core/templates/navigation.html:45 core/templates/user/overview.html:70
+#: core/templates/navigation.html:44 core/templates/user/overview.html:73
msgid "Calendar"
msgstr ""
-#: core/templates/navigation.html:55
+#: core/templates/navigation.html:53
msgid "Measurements"
msgstr ""
-#: core/templates/navigation.html:66 gallery/templates/images/overview.html:6
+#: core/templates/navigation.html:64 gallery/templates/images/overview.html:6
msgid "Gallery"
msgstr ""
-#: core/templates/navigation.html:72
-msgid "Workout templates"
+#: core/templates/navigation.html:74 core/templates/navigation.html:400
+#: trophies/templates/trophies/overview.html:7
+msgid "Trophies"
msgstr ""
#: core/templates/navigation.html:79
+msgid "Workout templates"
+msgstr ""
+
+#: core/templates/navigation.html:86
msgid "Your templates"
msgstr ""
-#: core/templates/navigation.html:88
+#: core/templates/navigation.html:95
msgid "Public templates"
msgstr ""
-#: core/templates/navigation.html:96 software/templates/features.html:51
+#: core/templates/navigation.html:103 software/templates/features.html:51
#: software/templates/features.html:480
msgid "Exercises"
msgstr ""
-#: core/templates/navigation.html:102 core/templates/navigation.html:176
-#: core/templates/navigation.html:339
+#: core/templates/navigation.html:109 core/templates/navigation.html:336
msgid "Administration"
msgstr ""
-#: core/templates/navigation.html:106
+#: core/templates/navigation.html:113
msgid "Exercise edit history"
msgstr ""
-#: core/templates/navigation.html:112
+#: core/templates/navigation.html:119
msgid "Equipment"
msgstr ""
-#: core/templates/navigation.html:118
+#: core/templates/navigation.html:125
msgid "Muscles"
msgstr ""
-#: core/templates/navigation.html:124
+#: core/templates/navigation.html:131
#: exercises/templates/categories/admin-overview.html:4
msgid "Categories"
msgstr ""
-#: core/templates/navigation.html:139 software/templates/features.html:468
+#: core/templates/navigation.html:146 software/templates/features.html:468
msgid "Nutrition"
msgstr ""
-#: core/templates/navigation.html:147 core/templates/user/overview.html:144
+#: core/templates/navigation.html:154 core/templates/user/overview.html:147
msgid "Nutrition plans"
msgstr ""
-#: core/templates/navigation.html:156
+#: core/templates/navigation.html:163
msgid "BMI calculator"
msgstr ""
-#: core/templates/navigation.html:165 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:172 nutrition/templates/rate/form.html:18
msgid "Daily calories calculator"
msgstr ""
-#: core/templates/navigation.html:171
+#: core/templates/navigation.html:178
#: nutrition/templates/ingredient/overview.html:10
msgid "Ingredient overview"
msgstr ""
-#: core/templates/navigation.html:180 nutrition/templates/units/list.html:6
-msgid "Ingredient weight units"
-msgstr ""
-
-#: core/templates/navigation.html:196 software/templates/features.html:463
+#: core/templates/navigation.html:193 software/templates/features.html:463
msgid "Body weight"
msgstr ""
-#: core/templates/navigation.html:203 core/templates/user/overview.html:114
+#: core/templates/navigation.html:200 core/templates/user/overview.html:117
msgid "Weight overview"
msgstr ""
-#: core/templates/navigation.html:217
+#: core/templates/navigation.html:214
msgid "About this software"
msgstr ""
-#: core/templates/navigation.html:223 software/templates/about_us.html:5
+#: core/templates/navigation.html:220 software/templates/about_us.html:5
msgid "Support & Get Involved"
msgstr ""
-#: core/templates/navigation.html:229 software/templates/features.html:528
+#: core/templates/navigation.html:226 software/templates/features.html:528
msgid "REST API"
msgstr ""
-#: core/templates/navigation.html:235 utils/models.py:45
+#: core/templates/navigation.html:232 utils/models.py:45
msgid "License"
msgstr ""
-#: core/templates/navigation.html:241
+#: core/templates/navigation.html:238
msgid "Developer documentation"
msgstr ""
-#: core/templates/navigation.html:248
+#: core/templates/navigation.html:245
msgid "Get the code"
msgstr ""
-#: core/templates/navigation.html:255 core/templates/template.html:199
-#: software/templates/features.html:603
+#: core/templates/navigation.html:252 core/templates/template.html:202
+#: software/templates/features.html:614
msgid "Translate"
msgstr ""
-#: core/templates/navigation.html:292 core/templates/user/login.html:30
+#: core/templates/navigation.html:289 core/templates/user/login.html:30
msgid "Reset password"
msgstr ""
-#: core/templates/navigation.html:301 core/templates/navigation.html:329
+#: core/templates/navigation.html:298 core/templates/navigation.html:326
msgid "Logout"
msgstr ""
-#: core/templates/navigation.html:320
+#: core/templates/navigation.html:317
msgid "My preferences"
msgstr ""
-#: core/templates/navigation.html:352
+#: core/templates/navigation.html:349
msgid "Licenses"
msgstr ""
-#: core/templates/navigation.html:360
+#: core/templates/navigation.html:357
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr ""
-#: core/templates/navigation.html:368 core/templates/weight_unit/list.html:4
-#: nutrition/templates/ingredient/view.html:141
+#: core/templates/navigation.html:365 core/templates/weight_unit/list.html:4
+#: nutrition/templates/ingredient/view.html:182
msgid "Weight units"
msgstr ""
-#: core/templates/navigation.html:376 core/templates/user/list.html:4
+#: core/templates/navigation.html:373 core/templates/user/list.html:4
msgid "User list"
msgstr ""
-#: core/templates/navigation.html:382
+#: core/templates/navigation.html:379
msgid "Gyms"
msgstr ""
-#: core/templates/navigation.html:403
-#: trophies/templates/trophies/overview.html:7
-msgid "Trophies"
-msgstr ""
-
#: core/templates/registration/password_reset_complete.html:4
msgid "Password reset complete"
msgstr ""
@@ -756,25 +769,29 @@ msgstr ""
msgid "next"
msgstr ""
-#: core/templates/template.html:96
+#: core/templates/template.html:86
msgid "Close"
msgstr ""
-#: core/templates/template.html:112
+#: core/templates/template.html:102
msgid ""
"You are using a guest account, data entered will be deleted after a week."
msgstr ""
-#: core/templates/template.html:117
+#: core/templates/template.html:107
msgid "Create some demo entries"
msgstr ""
-#: core/templates/template.html:165 software/templates/features.html:568
+#: core/templates/template.html:155 software/templates/features.html:568
#: software/templates/tos.html:7
msgid "Terms of service"
msgstr ""
-#: core/templates/template_features.html:53 software/templates/features.html:9
+#: core/templates/template.html:181 software/templates/features.html:595
+msgid "Browser language"
+msgstr ""
+
+#: core/templates/template_features.html:46 software/templates/features.html:9
msgid "Features"
msgstr ""
@@ -829,99 +846,94 @@ msgstr ""
msgid "Forgot password?"
msgstr ""
-#: core/templates/user/overview.html:25 core/templates/user/overview.html:68
-#: core/templates/user/overview.html:112 core/templates/user/overview.html:144
-#: core/templates/user/overview.html:348 core/templates/user/overview.html:390
-#: core/templates/user/overview.html:426
+#: core/templates/user/overview.html:28 core/templates/user/overview.html:71
+#: core/templates/user/overview.html:115 core/templates/user/overview.html:147
+#: core/templates/user/overview.html:351 core/templates/user/overview.html:393
+#: core/templates/user/overview.html:429
#, python-format
msgid "last %(number)s"
msgstr ""
-#: core/templates/user/overview.html:27 core/templates/user/overview.html:146
-#: core/templates/user/overview.html:343 core/templates/user/overview.html:382
-#: core/templates/user/overview.html:421 gym/templates/gym/member_list.html:226
+#: core/templates/user/overview.html:30 core/templates/user/overview.html:149
+#: core/templates/user/overview.html:346 core/templates/user/overview.html:385
+#: core/templates/user/overview.html:424 gym/templates/gym/member_list.html:226
#: gym/templates/gym/member_list.html:262
#: gym/templates/gym/member_list.html:302
msgid "Overview"
msgstr ""
-#: core/templates/user/overview.html:34 core/templates/user/overview.html:76
-#: core/templates/user/overview.html:120 core/templates/user/overview.html:152
+#: core/templates/user/overview.html:37 core/templates/user/overview.html:79
+#: core/templates/user/overview.html:123 core/templates/user/overview.html:155
#: manager/helpers.py:88 software/templates/about_us.html:170
#: weight/templates/import_csv_preview.html:13
#: weight/templates/import_csv_preview.html:42 weight/views.py:54
msgid "Date"
msgstr ""
-#: core/templates/user/overview.html:35 core/templates/user/overview.html:153
+#: core/templates/user/overview.html:38 core/templates/user/overview.html:156
#: gym/models/contract.py:58 gym/models/contract.py:109
msgid "Description"
msgstr ""
-#: core/templates/user/overview.html:36
+#: core/templates/user/overview.html:39
msgid "Number of logs (days)"
msgstr ""
-#: core/templates/user/overview.html:37 core/views/user.py:590
+#: core/templates/user/overview.html:40 core/views/user.py:606
#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:158
msgid "Last activity"
msgstr ""
-#: core/templates/user/overview.html:58
+#: core/templates/user/overview.html:61
msgid "No workouts found."
msgstr ""
-#: core/templates/user/overview.html:68
+#: core/templates/user/overview.html:71
msgid "Log"
msgstr ""
-#: core/templates/user/overview.html:77
+#: core/templates/user/overview.html:80
msgid "General impression"
msgstr ""
-#: core/templates/user/overview.html:78 core/templates/user/overview.html:390
+#: core/templates/user/overview.html:81 core/templates/user/overview.html:393
msgid "Notes"
msgstr ""
-#: core/templates/user/overview.html:79
-#: exercises/templates/history/overview.html:30
-msgid "Time"
-msgstr ""
-
-#: core/templates/user/overview.html:112 core/templates/user/overview.html:121
+#: core/templates/user/overview.html:115 core/templates/user/overview.html:124
#: manager/helpers.py:89 weight/templates/import_csv_preview.html:14
#: weight/templates/import_csv_preview.html:43 weight/views.py:54
msgid "Weight"
msgstr ""
-#: core/templates/user/overview.html:154
-#: nutrition/templates/ingredient/view.html:51 nutrition/views/plan.py:245
+#: core/templates/user/overview.html:157
+#: nutrition/templates/ingredient/view.html:52 nutrition/views/plan.py:244
msgid "Energy"
msgstr ""
-#: core/templates/user/overview.html:155
-#: nutrition/templates/ingredient/view.html:58 nutrition/views/plan.py:251
+#: core/templates/user/overview.html:158
+#: nutrition/templates/ingredient/view.html:59 nutrition/views/plan.py:250
msgid "Protein"
msgstr ""
-#: core/templates/user/overview.html:156
-#: nutrition/templates/ingredient/view.html:64 nutrition/views/plan.py:259
+#: core/templates/user/overview.html:159
+#: nutrition/templates/ingredient/view.html:65 nutrition/views/plan.py:258
msgid "Carbohydrates"
msgstr ""
-#: core/templates/user/overview.html:157
-#: nutrition/templates/ingredient/view.html:80 nutrition/views/plan.py:273
+#: core/templates/user/overview.html:160
+#: nutrition/templates/ingredient/view.html:81 nutrition/views/plan.py:272
msgid "Fat"
msgstr ""
-#: core/templates/user/overview.html:170
-#: nutrition/templates/ingredient/view.html:53
+#: core/templates/user/overview.html:173
+#: nutrition/templates/ingredient/view.html:54
msgid "kcal"
msgstr ""
-#: core/templates/user/overview.html:201 core/templates/user/overview.html:340
-#: core/templates/user/overview.html:379 core/templates/user/overview.html:418
-#: core/templates/user/overview.html:463 gym/templates/gym/list.html:45
+#: core/templates/user/overview.html:204 core/templates/user/overview.html:343
+#: core/templates/user/overview.html:382 core/templates/user/overview.html:421
+#: core/templates/user/overview.html:466 gym/templates/gym/list.html:45
#: gym/templates/gym/member_list.html:91 gym/templates/gym/member_list.html:149
#: gym/templates/gym/member_list.html:187
#: gym/templates/gym/member_list.html:223
@@ -930,109 +942,113 @@ msgstr ""
msgid "Actions"
msgstr ""
-#: core/templates/user/overview.html:210
+#: core/templates/user/overview.html:213
msgid "Deactivate user"
msgstr ""
-#: core/templates/user/overview.html:214
+#: core/templates/user/overview.html:217
msgid "Activate user"
msgstr ""
-#: core/templates/user/overview.html:223
+#: core/templates/user/overview.html:226
msgid "Reset user password"
msgstr ""
-#: core/templates/user/overview.html:227 gym/templates/gym/member_list.html:30
+#: core/templates/user/overview.html:230 gym/templates/gym/member_list.html:30
msgid "Roles"
msgstr ""
-#: core/templates/user/overview.html:243
+#: core/templates/user/overview.html:246
msgid "Password reset confirmation"
msgstr ""
-#: core/templates/user/overview.html:247
+#: core/templates/user/overview.html:250
msgid "Do you really want to change this user&#39;s password?"
msgstr ""
-#: core/templates/user/overview.html:250
+#: core/templates/user/overview.html:253
#: exercises/templates/history/overview.html:106
+#: nutrition/templates/ingredient/view.html:148
+#: nutrition/templates/ingredient/view.html:160
msgid "No"
msgstr ""
-#: core/templates/user/overview.html:251
+#: core/templates/user/overview.html:254
#: exercises/templates/history/overview.html:99
+#: nutrition/templates/ingredient/view.html:146
+#: nutrition/templates/ingredient/view.html:158
msgid "Yes"
msgstr ""
-#: core/templates/user/overview.html:272 gym/templates/gym/member_list.html:105
+#: core/templates/user/overview.html:275 gym/templates/gym/member_list.html:105
msgid "Details"
msgstr ""
-#: core/templates/user/overview.html:276 gym/views/export.py:57
-#: manager/helpers.py:89 nutrition/views/plan.py:151
-#: nutrition/views/plan.py:157
+#: core/templates/user/overview.html:279 gym/views/export.py:57
+#: manager/helpers.py:89 nutrition/views/plan.py:150
+#: nutrition/views/plan.py:156
msgid "Nr."
msgstr ""
-#: core/templates/user/overview.html:298 gym/models/contract.py:287
+#: core/templates/user/overview.html:301 gym/models/contract.py:287
#: gym/models/gym.py:50 gym/templates/contract/view.html:75
#: gym/templates/gym/member_list.html:112 gym/views/export.py:68
msgid "Phone"
msgstr ""
-#: core/templates/user/overview.html:302 gym/templates/contract/view.html:87
+#: core/templates/user/overview.html:305 gym/templates/contract/view.html:87
#: gym/templates/gym/member_list.html:130
msgid "Address"
msgstr ""
-#: core/templates/user/overview.html:313
+#: core/templates/user/overview.html:316
msgid "Registered"
msgstr ""
-#: core/templates/user/overview.html:317
+#: core/templates/user/overview.html:320
msgid "Last login"
msgstr ""
-#: core/templates/user/overview.html:322
+#: core/templates/user/overview.html:325
msgid "Status"
msgstr ""
-#: core/templates/user/overview.html:325
+#: core/templates/user/overview.html:328
msgid "Active"
msgstr ""
-#: core/templates/user/overview.html:327
+#: core/templates/user/overview.html:330
msgid "Inactive"
msgstr ""
-#: core/templates/user/overview.html:348 gym/templates/contract/list.html:4
+#: core/templates/user/overview.html:351 gym/templates/contract/list.html:4
#: gym/templates/gym/member_list.html:218
msgid "Contracts"
msgstr ""
-#: core/templates/user/overview.html:426 gym/templates/document/list.html:4
+#: core/templates/user/overview.html:429 gym/templates/document/list.html:4
msgid "Documents"
msgstr ""
-#: core/templates/user/overview.html:433 gym/templates/document/list.html:33
+#: core/templates/user/overview.html:436 gym/templates/document/list.html:33
msgid "Download"
msgstr ""
-#: core/templates/user/overview.html:474 gym/views/admin_config.py:44
+#: core/templates/user/overview.html:477 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:477 gym/models/user_config.py:92
+#: core/templates/user/overview.html:480 gym/models/user_config.py:92
msgid "Include in inactive overview"
msgstr ""
-#: core/templates/user/overview.html:510
+#: core/templates/user/overview.html:513
#, python-format
msgid "Admin login is only available for users in %(gym_name)s"
msgstr ""
-#: core/templates/user/overview.html:514
+#: core/templates/user/overview.html:517
msgid "Log in as this user"
msgstr ""
@@ -1056,7 +1072,7 @@ msgstr ""
msgid "You need to verify your email to contribute exercises"
msgstr ""
-#: core/templates/user/preferences.html:55 core/views/user.py:601
+#: core/templates/user/preferences.html:55 core/views/user.py:617
msgid "Change password"
msgstr ""
@@ -1064,23 +1080,23 @@ msgstr ""
msgid "Already have an account?"
msgstr ""
-#: core/templatetags/wger_extras.py:142 i18n.tpl:38
+#: core/templatetags/wger_extras.py:142 i18n.tpl:39
msgid "kg"
msgstr ""
#: core/templatetags/wger_extras.py:144
-#: nutrition/templates/ingredient/view.html:60
-#: nutrition/templates/ingredient/view.html:66
-#: nutrition/templates/ingredient/view.html:73
-#: nutrition/templates/ingredient/view.html:82
-#: nutrition/templates/ingredient/view.html:89
-#: nutrition/templates/ingredient/view.html:111
-#: nutrition/templates/ingredient/view.html:121
+#: nutrition/templates/ingredient/view.html:61
+#: nutrition/templates/ingredient/view.html:67
+#: nutrition/templates/ingredient/view.html:74
+#: nutrition/templates/ingredient/view.html:83
+#: nutrition/templates/ingredient/view.html:90
+#: nutrition/templates/ingredient/view.html:112
+#: nutrition/templates/ingredient/view.html:122
msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr ""
-#: core/templatetags/wger_extras.py:147 i18n.tpl:39
+#: core/templatetags/wger_extras.py:147 i18n.tpl:40
msgid "lb"
msgstr ""
@@ -1089,84 +1105,83 @@ msgctxt "weight unit, i.e. ounces"
msgid "oz"
msgstr ""
-#: core/views/languages.py:85 exercises/views/categories.py:122
+#: core/views/languages.py:88 exercises/views/categories.py:122
#: exercises/views/equipment.py:103 exercises/views/muscles.py:99
-#: nutrition/views/ingredient.py:120 nutrition/views/unit.py:110
+#: nutrition/views/ingredient.py:125
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
+#: core/views/languages.py:96 core/views/license.py:103
+#: core/views/repetition_units.py:114 core/views/weight_units.py:115
#: exercises/views/categories.py:128 exercises/views/muscles.py:106
#: gallery/views/images.py:124 gym/views/admin_notes.py:196
#: gym/views/document.py:206 gym/views/gym.py:481
-#: nutrition/views/ingredient.py:127 nutrition/views/unit.py:117
+#: nutrition/views/ingredient.py:132
#, python-brace-format
msgid "Delete {0}?"
msgstr ""
-#: core/views/languages.py:111 core/views/license.py:85
-#: core/views/repetition_units.py:86 core/views/user.py:464
+#: core/views/languages.py:114 core/views/license.py:85
+#: core/views/repetition_units.py:96 core/views/user.py:480
#: core/views/weight_units.py:86 exercises/views/categories.py:98
#: exercises/views/equipment.py:81 exercises/views/muscles.py:87
#: gym/views/admin_notes.py:161 gym/views/config.py:68
#: gym/views/contract.py:186 gym/views/contract_option.py:123
#: gym/views/contract_type.py:123 gym/views/document.py:171
-#: gym/views/gym.py:463 nutrition/views/ingredient.py:146
-#: nutrition/views/unit.py:143
+#: gym/views/gym.py:463 nutrition/views/ingredient.py:151
#, python-brace-format
msgid "Edit {0}"
msgstr ""
-#: core/views/misc.py:74
+#: core/views/misc.py:73
msgid ""
"We have created sample workout, workout schedules, weight logs, (body) "
"weight and nutrition plan entries so you can better see what this site can "
"do. Feel free to edit or delete them!"
msgstr ""
-#: core/views/user.py:143
+#: core/views/user.py:145
#, python-brace-format
msgid "Account \"{0}\" was successfully deleted"
msgstr ""
-#: core/views/user.py:279
+#: core/views/user.py:287
msgid "You were successfully registered"
msgstr ""
-#: core/views/user.py:341
+#: core/views/user.py:357
msgid "Settings successfully updated"
msgstr ""
-#: core/views/user.py:380
+#: core/views/user.py:396
msgid "The user was successfully deactivated"
msgstr ""
-#: core/views/user.py:417
+#: core/views/user.py:433
msgid "The user was successfully activated"
msgstr ""
-#: core/views/user.py:432
+#: core/views/user.py:448
msgid "Edit user"
msgstr ""
-#: core/views/user.py:587 gym/templates/gym/member_list.html:26
+#: core/views/user.py:603 gym/templates/gym/member_list.html:26
#: gym/views/gym.py:158
msgid "ID"
msgstr ""
-#: core/views/user.py:588 gym/forms.py:95 gym/templates/contract/view.html:55
+#: core/views/user.py:604 gym/forms.py:95 gym/templates/contract/view.html:55
#: gym/templates/gym/member_list.html:27 gym/views/export.py:59
#: gym/views/gym.py:158 gym/views/gym.py:217
msgid "Username"
msgstr ""
-#: core/views/user.py:591 gym/templates/gym/new_user.html:34
+#: core/views/user.py:607 gym/templates/gym/new_user.html:34
#: gym/views/export.py:58 gym/views/gym.py:217
msgid "Gym"
msgstr ""
-#: core/views/user.py:650
+#: core/views/user.py:678
#, python-format
msgid "A verification email was sent to %(email)s"
msgstr ""
@@ -1183,16 +1198,16 @@ msgstr ""
msgid "A more basic name for the muscle"
msgstr ""
-#: exercises/models/video.py:50
+#: exercises/models/video.py:52
#, python-format
msgid "Maximum file size is %(size)sMB."
msgstr ""
-#: exercises/models/video.py:57 exercises/models/video.py:65
+#: exercises/models/video.py:59 exercises/models/video.py:67
msgid "File type is not supported"
msgstr ""
-#: exercises/models/video.py:70
+#: exercises/models/video.py:72
msgid "File is not a valid video"
msgstr ""
@@ -1263,7 +1278,11 @@ msgstr ""
msgid "Add muscle"
msgstr ""
-#: gallery/templates/images/overview.html:72
+#: gallery/forms.py:35
+msgid "If date is left empty, it will be read from the image instead"
+msgstr ""
+
+#: gallery/templates/images/overview.html:69
msgid "Add image"
msgstr ""
@@ -1329,7 +1348,7 @@ msgid "Contract type"
msgstr ""
#: gym/models/contract.py:211 gym/templates/contract/view.html:59
-#: nutrition/forms.py:58
+#: nutrition/forms.py:67
msgid "Amount"
msgstr ""
@@ -1505,7 +1524,7 @@ msgstr ""
msgid "Add member"
msgstr ""
-#: gym/templates/gym/new_user.html:48 nutrition/templates/rate/form.html:120
+#: gym/templates/gym/new_user.html:48 nutrition/templates/rate/form.html:121
msgid "Info"
msgstr ""
@@ -1672,10 +1691,6 @@ msgstr ""
msgid "Quads"
msgstr ""
-#: i18n.tpl:30
-msgid "Repetitions"
-msgstr ""
-
#: i18n.tpl:31
msgid "Resistance band"
msgstr ""
@@ -1704,175 +1719,179 @@ msgstr ""
msgid "Until Failure"
msgstr ""
-#: i18n.tpl:40
-msgid "none (bodyweight exercise)"
+#: i18n.tpl:38
+msgid "Meters"
msgstr ""
#: i18n.tpl:41
-msgid "Beginner"
+msgid "none (bodyweight exercise)"
msgstr ""
#: i18n.tpl:42
-msgid "Consistent"
+msgid "Beginner"
msgstr ""
#: i18n.tpl:43
-msgid "Dedicated"
+msgid "Consistent"
msgstr ""
#: i18n.tpl:44
-msgid "Obsessed"
+msgid "Dedicated"
msgstr ""
#: i18n.tpl:45
-msgid "Legend"
+msgid "Obsessed"
msgstr ""
#: i18n.tpl:46
-msgid "Veteran"
+msgid "Legend"
msgstr ""
#: i18n.tpl:47
-msgid "Titan"
+msgid "Veteran"
msgstr ""
#: i18n.tpl:48
-msgid "Unstoppable"
+msgid "Titan"
msgstr ""
#: i18n.tpl:49
-msgid "Weekend Warrior"
+msgid "Unstoppable"
msgstr ""
#: i18n.tpl:50
-msgid "Elephant lifter"
+msgid "Weekend Warrior"
msgstr ""
#: i18n.tpl:51
-msgid "Bus lifter"
+msgid "Elephant lifter"
msgstr ""
#: i18n.tpl:52
-msgid "Plane lifter"
+msgid "Bus lifter"
msgstr ""
#: i18n.tpl:53
-msgid "Blue whale lifter"
+msgid "Plane lifter"
msgstr ""
#: i18n.tpl:54
-msgid "Space Station lifter"
+msgid "Blue whale lifter"
msgstr ""
#: i18n.tpl:55
-msgid "Millionaire"
+msgid "Space Station lifter"
msgstr ""
#: i18n.tpl:56
-msgid "Atlas"
+msgid "Millionaire"
msgstr ""
#: i18n.tpl:57
-msgid "Early Bird"
+msgid "Atlas"
msgstr ""
#: i18n.tpl:58
-msgid "Night Owl"
+msgid "Early Bird"
msgstr ""
#: i18n.tpl:59
-msgid "New Year, New Me"
+msgid "Night Owl"
msgstr ""
#: i18n.tpl:60
-msgid "Phoenix"
+msgid "New Year, New Me"
msgstr ""
#: i18n.tpl:61
-msgid "Personal Record"
+msgid "Phoenix"
msgstr ""
#: i18n.tpl:62
-msgid "Complete your first workout"
+msgid "Personal Record"
msgstr ""
#: i18n.tpl:63
-msgid "Complete 10 workouts"
+msgid "Complete your first workout"
msgstr ""
#: i18n.tpl:64
-msgid "Complete 50 workouts"
+msgid "Complete 10 workouts"
msgstr ""
#: i18n.tpl:65
-msgid "Complete 100 workouts"
+msgid "Complete 50 workouts"
msgstr ""
#: i18n.tpl:66
-msgid "Complete 200 workouts"
+msgid "Complete 100 workouts"
msgstr ""
#: i18n.tpl:67
-msgid "Complete 500 workouts"
+msgid "Complete 200 workouts"
msgstr ""
#: i18n.tpl:68
-msgid "Complete 1000 workouts"
+msgid "Complete 500 workouts"
msgstr ""
#: i18n.tpl:69
-msgid "Maintain a 30-day workout streak"
+msgid "Complete 1000 workouts"
msgstr ""
#: i18n.tpl:70
-msgid "Work out on Saturday and Sunday for 4 consecutive weekends"
+msgid "Maintain a 30-day workout streak"
msgstr ""
#: i18n.tpl:71
-msgid "Lift a cumulative total of 5.000 kg"
+msgid "Work out on Saturday and Sunday for 4 consecutive weekends"
msgstr ""
#: i18n.tpl:72
-msgid "Lift a cumulative total of 20.000 kg"
+msgid "Lift a cumulative total of 5.000 kg"
msgstr ""
#: i18n.tpl:73
-msgid "Lift a cumulative total of 50.000 kg"
+msgid "Lift a cumulative total of 20.000 kg"
msgstr ""
#: i18n.tpl:74
-msgid "Lift a cumulative total of 150.000 kg"
+msgid "Lift a cumulative total of 50.000 kg"
msgstr ""
#: i18n.tpl:75
-msgid "Lift a cumulative total of 450.000 kg"
+msgid "Lift a cumulative total of 150.000 kg"
msgstr ""
#: i18n.tpl:76
-msgid "Lift a cumulative total of 1.000.000 kg"
+msgid "Lift a cumulative total of 450.000 kg"
msgstr ""
#: i18n.tpl:77
-msgid "Lift a cumulative total of 10.000.000 kg"
+msgid "Lift a cumulative total of 1.000.000 kg"
msgstr ""
#: i18n.tpl:78
-msgid "Complete a workout before 6:00 AM"
+msgid "Lift a cumulative total of 10.000.000 kg"
msgstr ""
#: i18n.tpl:79
-msgid "Complete a workout after 9:00 PM"
+msgid "Complete a workout before 6:00 AM"
msgstr ""
#: i18n.tpl:80
-msgid "Work out on January 1st"
+msgid "Complete a workout after 9:00 PM"
msgstr ""
#: i18n.tpl:81
-msgid "Return to training after being inactive for 30 days"
+msgid "Work out on January 1st"
msgstr ""
#: i18n.tpl:82
+msgid "Return to training after being inactive for 30 days"
+msgstr ""
+
+#: i18n.tpl:83
msgid "Achieve a new Personal Record on any exercise"
msgstr ""
@@ -1954,7 +1973,7 @@ msgstr ""
msgid "Routine will expire soon"
msgstr ""
-#: manager/models/routine.py:153 manager/models/session.py:145
+#: manager/models/routine.py:154 manager/models/session.py:145
msgid "The start time cannot be after the end time."
msgstr ""
@@ -2026,36 +2045,56 @@ msgstr ""
msgid "Workout for %s"
msgstr ""
-#: nutrition/forms.py:62
+#: nutrition/extract_info/off.py:72 nutrition/extract_info/off.py:91
+msgid "Serving"
+msgstr ""
+
+#: nutrition/forms.py:71 nutrition/forms.py:208
msgid "Unit"
msgstr ""
-#: nutrition/forms.py:170 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:179 nutrition/templates/rate/form.html:77
msgid "Basic caloric intake"
msgstr ""
-#: nutrition/forms.py:171
+#: nutrition/forms.py:180
msgid "Your basic caloric intake as calculated for your data"
msgstr ""
-#: nutrition/forms.py:176
+#: nutrition/forms.py:185
msgid "Additional calories"
msgstr ""
-#: nutrition/forms.py:178
+#: nutrition/forms.py:187
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
msgstr ""
#: nutrition/forms.py:209
+msgid "grams (g)"
+msgstr ""
+
+#: nutrition/forms.py:219
msgid "Ingredient"
msgstr ""
-#: nutrition/forms.py:213
+#: nutrition/forms.py:223
msgid "Also search for names in English"
msgstr ""
+#: nutrition/forms.py:239
+msgid "Quantity"
+msgstr ""
+
+#: nutrition/forms.py:241
+msgid "Enter a quantity and choose grams (g) or one of the serving units."
+msgstr ""
+
+#: nutrition/models/ingredient.py:526
+msgid "Portion"
+msgstr ""
+
#: nutrition/templates/ingredient/email_new.tpl:1
#, python-format
msgid ""
@@ -2093,59 +2132,86 @@ msgid ""
"sucessfully."
msgstr ""
-#: nutrition/templates/ingredient/overview.html:38
+#: nutrition/templates/ingredient/overview.html:32
+#: nutrition/templates/ingredient/overview.html:68
+#: nutrition/templates/ingredient/view.html:143
+msgid "Vegan"
+msgstr ""
+
+#: nutrition/templates/ingredient/overview.html:34
+#: nutrition/templates/ingredient/overview.html:79
+#: nutrition/templates/ingredient/view.html:155
+msgid "Vegetarian"
+msgstr ""
+
+#: nutrition/templates/ingredient/overview.html:43
msgid "No ingredients."
msgstr ""
-#: nutrition/templates/ingredient/overview.html:49
+#: nutrition/templates/ingredient/overview.html:54
msgid "Search"
msgstr ""
-#: nutrition/templates/ingredient/view.html:45 nutrition/views/plan.py:237
+#: nutrition/templates/ingredient/overview.html:57
+msgid "Filter"
+msgstr ""
+
+#: nutrition/templates/ingredient/overview.html:83
+msgid "Apply"
+msgstr ""
+
+#: nutrition/templates/ingredient/overview.html:85
+msgid "Reset"
+msgstr ""
+
+#: nutrition/templates/ingredient/view.html:46 nutrition/views/plan.py:236
msgid "Macronutrients"
msgstr ""
-#: nutrition/templates/ingredient/view.html:54
+#: nutrition/templates/ingredient/view.html:55
msgid "kJ"
msgstr ""
-#: nutrition/templates/ingredient/view.html:70 nutrition/views/plan.py:267
+#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:266
msgid "Sugar content in carbohydrates"
msgstr ""
-#: nutrition/templates/ingredient/view.html:75
-#: nutrition/templates/ingredient/view.html:91
-#: nutrition/templates/ingredient/view.html:113
-#: nutrition/templates/ingredient/view.html:123
+#: nutrition/templates/ingredient/view.html:76
+#: nutrition/templates/ingredient/view.html:92
+#: nutrition/templates/ingredient/view.html:114
+#: nutrition/templates/ingredient/view.html:124
msgid "n.A."
msgstr ""
-#: nutrition/templates/ingredient/view.html:86 nutrition/views/plan.py:281
+#: nutrition/templates/ingredient/view.html:87 nutrition/views/plan.py:280
msgid "Saturated fat content in fats"
msgstr ""
-#: nutrition/templates/ingredient/view.html:102
+#: nutrition/templates/ingredient/view.html:103
msgid "Others"
msgstr ""
-#: nutrition/templates/ingredient/view.html:108 nutrition/views/plan.py:287
+#: nutrition/templates/ingredient/view.html:109 nutrition/views/plan.py:286
msgid "Fiber"
msgstr ""
-#: nutrition/templates/ingredient/view.html:118 nutrition/views/plan.py:293
+#: nutrition/templates/ingredient/view.html:119 nutrition/views/plan.py:292
msgid "Sodium"
msgstr ""
-#: nutrition/templates/ingredient/view.html:143
-#: nutrition/templates/units/list.html:50 nutrition/views/unit.py:86
+#: nutrition/templates/ingredient/view.html:136
+msgid "Dietary information"
+msgstr ""
+
+#: nutrition/templates/ingredient/view.html:184
msgid "Add new weight unit"
msgstr ""
-#: nutrition/templates/rate/form.html:25
+#: nutrition/templates/rate/form.html:26
msgid "Basal metabolic rate"
msgstr ""
-#: nutrition/templates/rate/form.html:26
+#: nutrition/templates/rate/form.html:27
msgid ""
"The basal metabolic rate is the amount of energy expended daily\n"
"at rest. This is the minimum energy needed for the body to function, without "
@@ -2153,36 +2219,36 @@ msgid ""
"additional physical activity."
msgstr ""
-#: nutrition/templates/rate/form.html:37
+#: nutrition/templates/rate/form.html:38
msgid "Your basic metabolic rate is: "
msgstr ""
-#: nutrition/templates/rate/form.html:47
+#: nutrition/templates/rate/form.html:48
msgid "Physical activities"
msgstr ""
-#: nutrition/templates/rate/form.html:48
+#: nutrition/templates/rate/form.html:49
msgid ""
"The physical activity level (PAL) is a factor used to to express\n"
"the additional physical activity and is used to calculate the total energy\n"
"required per day."
msgstr ""
-#: nutrition/templates/rate/form.html:59
+#: nutrition/templates/rate/form.html:60
msgid "Factor for daily activities: "
msgstr ""
-#: nutrition/templates/rate/form.html:67
+#: nutrition/templates/rate/form.html:68
msgid ""
"The base caloric intake is the amount of calories your metabolism\n"
"needs based on your level of physical activity."
msgstr ""
-#: nutrition/templates/rate/form.html:81
+#: nutrition/templates/rate/form.html:82
msgid "Calculate basic caloric intake"
msgstr ""
-#: nutrition/templates/rate/form.html:88
+#: nutrition/templates/rate/form.html:89
msgid ""
"The total calories are the actual total calories per day. This\n"
"might include e.g. a surplus or deficit if you are bulking or cutting. "
@@ -2190,67 +2256,67 @@ msgid ""
"you might just enter yourself the amount of calories if you know the value."
msgstr ""
-#: nutrition/templates/rate/form.html:102
+#: nutrition/templates/rate/form.html:103
msgid "Transfer basic intake to total daily calories"
msgstr ""
-#: nutrition/templates/rate/form.html:106
+#: nutrition/templates/rate/form.html:107
msgid "Add additional calories to total daily calories"
msgstr ""
-#: nutrition/templates/rate/form.html:110
+#: nutrition/templates/rate/form.html:111
msgid "Save total calories to profile"
msgstr ""
-#: nutrition/templates/rate/form.html:121
+#: nutrition/templates/rate/form.html:122
msgid ""
"Please note that these calculations can only be an\n"
"approximation. If you base your nutrition plan on these values, observe\n"
"yourself for some weeks and change the total amount if needed."
msgstr ""
-#: nutrition/views/ingredient.py:158
+#: nutrition/views/ingredient.py:163
msgid "Add a new ingredient"
msgstr ""
-#: nutrition/views/plan.py:128
+#: nutrition/views/plan.py:127
msgid "Nutritional plan"
msgstr ""
-#: nutrition/views/plan.py:130
+#: nutrition/views/plan.py:129
#, python-format
msgid "Nutritional plan for %s"
msgstr ""
-#: nutrition/views/plan.py:202
+#: nutrition/views/plan.py:201
msgid "<i>This is an empty plan, what did you expect on the PDF?</i>"
msgstr ""
-#: nutrition/views/plan.py:230
+#: nutrition/views/plan.py:229
msgid "Nutritional data"
msgstr ""
-#: nutrition/views/plan.py:238
+#: nutrition/views/plan.py:237
msgid "Total"
msgstr ""
-#: nutrition/views/plan.py:239
+#: nutrition/views/plan.py:238
msgid "Percent of energy"
msgstr ""
-#: nutrition/views/plan.py:240
+#: nutrition/views/plan.py:239
msgid "g per body kg"
msgstr ""
-#: nutrition/views/unit_ingredient.py:69
+#: nutrition/views/unit_ingredient.py:64
msgid "Add a new weight unit"
msgstr ""
-#: nutrition/views/unit_ingredient.py:106
+#: nutrition/views/unit_ingredient.py:99
msgid "Edit a weight unit to ingredient connection"
msgstr ""
-#: nutrition/views/unit_ingredient.py:138
+#: nutrition/views/unit_ingredient.py:129
msgid "Delete?"
msgstr ""
@@ -2597,7 +2663,7 @@ msgstr ""
msgid "Translation"
msgstr ""
-#: utils/generic_views.py:263
+#: utils/generic_views.py:246
msgid "Yes, delete"
msgstr ""
@@ -2648,10 +2714,6 @@ msgstr ""
msgid "Import weight logs"
msgstr ""
-#: weight/templates/import_csv_form.html:9
-msgid "Submit"
-msgstr ""
-
#: weight/templates/import_csv_form.html:15
msgid ""
"Use this import field to import your weight logs into Workout\n"
diff --git a/wger/locale/tr/LC_MESSAGES/django.po b/wger/locale/tr/LC_MESSAGES/django.po
index bc17669df..7c4a742cd 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: 2026-01-17 14:03+0000\n"
+"POT-Creation-Date: 2026-04-10 10:20+0000\n"
"PO-Revision-Date: 2024-07-20 17:09+0000\n"
"Last-Translator: Oğuz Ersen <[email protected]>\n"
"Language-Team: Turkish <https://hosted.weblate.org/projects/wger/web/tr/>\n"
@@ -37,7 +37,7 @@ msgstr ""
#: config/views/gym_config.py:42 core/templates/language/view.html:64
#: core/templates/license/list.html:17
#: core/templates/repetition_unit/list.html:18
-#: core/templates/user/overview.html:204 core/templates/user/overview.html:467
+#: core/templates/user/overview.html:207 core/templates/user/overview.html:470
#: core/templates/weight_unit/list.html:18
#: exercises/templates/categories/admin-overview.html:17
#: exercises/templates/equipment/admin-overview.html:17
@@ -49,30 +49,29 @@ msgstr ""
#: gym/templates/gym/list.html:19 gym/templates/gym/list.html:48
#: gym/templates/gym/member_list.html:94 gym/templates/gym/member_list.html:152
#: gym/templates/gym/member_list.html:190
-#: nutrition/templates/ingredient/view.html:164
-#: nutrition/templates/ingredient/view.html:209
-#: nutrition/templates/units/list.html:19
+#: nutrition/templates/ingredient/view.html:205
+#: nutrition/templates/ingredient/view.html:248
msgid "Edit"
msgstr "Düzenle"
-#: core/forms.py:91 core/templates/navigation.html:271
-#: core/templates/navigation.html:278 core/templates/user/login.html:4
+#: core/forms.py:89 core/templates/navigation.html:268
+#: core/templates/navigation.html:275 core/templates/user/login.html:4
#: core/templates/user/registration_sidebar.html:12
#: software/templates/features.html:82 software/templates/features.html:448
msgid "Login"
msgstr "Oturum aç"
-#: core/forms.py:130 core/forms.py:244 gym/views/export.py:61
+#: core/forms.py:128 core/forms.py:242 gym/views/export.py:61
#: gym/views/gym.py:217
msgid "First name"
msgstr "İsim"
-#: core/forms.py:131 core/forms.py:245 core/templates/user/overview.html:284
+#: core/forms.py:129 core/forms.py:243 core/templates/user/overview.html:287
#: gym/views/export.py:62 gym/views/gym.py:217
msgid "Last name"
msgstr "Soyisim"
-#: core/forms.py:133 core/forms.py:210 core/templates/user/overview.html:288
+#: core/forms.py:131 core/forms.py:208 core/templates/user/overview.html:291
#: gym/models/contract.py:256 gym/models/gym.py:58
#: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:116
#: gym/templates/gym/new_user.html:30 gym/views/export.py:60
@@ -82,57 +81,57 @@ msgstr "Soyisim"
msgid "Email"
msgstr "E-posta"
-#: core/forms.py:134
+#: core/forms.py:132
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:138 core/models/profile.py:222
+#: core/forms.py:136 core/models/profile.py:222
#: gym/templates/gym/new_user.html:38
msgid "Date of Birth"
msgstr "Doğum tarihi"
-#: core/forms.py:177
+#: core/forms.py:175
msgid "Personal data"
msgstr "Kişisel bilgiler"
-#: core/forms.py:189
+#: core/forms.py:187
msgid "Workout reminders"
msgstr "Antrenman hatırlatıcıları"
-#: core/forms.py:196
+#: core/forms.py:194
msgid "Other settings"
msgstr "Diğer ayarlar"
-#: core/forms.py:204 core/views/user.py:614 core/views/user.py:629
-#: core/views/user.py:641 gym/forms.py:73 utils/generic_views.py:143
+#: core/forms.py:202 core/views/user.py:630 core/views/user.py:654
+#: core/views/user.py:668 gym/forms.py:73 utils/generic_views.py:137
msgid "Save"
msgstr "Kaydet"
-#: core/forms.py:211
+#: core/forms.py:209
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:240
+#: core/forms.py:238
msgid "This e-mail address is already in use."
msgstr "Bu e-posta adresi zaten kullanılıyor."
-#: core/forms.py:261 gym/templates/gym/new_user.html:26
+#: core/forms.py:259 gym/templates/gym/new_user.html:26
#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:217
msgid "Password"
msgstr "Parola"
-#: core/forms.py:263
+#: core/forms.py:261
msgid "Please enter your current password."
msgstr "Lütfen geçerli parolanızı girin."
-#: core/forms.py:272 core/templates/language/view.html:70
+#: core/forms.py:270 core/templates/language/view.html:70
#: core/templates/license/list.html:21
#: core/templates/repetition_unit/list.html:22
-#: core/templates/user/overview.html:233
+#: core/templates/user/overview.html:236
#: core/templates/weight_unit/list.html:22
#: exercises/templates/categories/admin-overview.html:21
#: exercises/templates/equipment/admin-overview.html:21
@@ -140,27 +139,30 @@ msgstr "Lütfen geçerli parolanızı girin."
#: gym/templates/admin_notes/list.html:37
#: gym/templates/contract_option/list.html:35
#: gym/templates/contract_type/list.html:36 gym/templates/document/list.html:46
-#: gym/templates/gym/list.html:23 nutrition/templates/ingredient/view.html:168
-#: nutrition/templates/ingredient/view.html:215
-#: nutrition/templates/units/list.html:25
+#: gym/templates/gym/list.html:23 nutrition/templates/ingredient/view.html:209
+#: nutrition/templates/ingredient/view.html:254
msgid "Delete"
msgstr "Sil"
-#: core/forms.py:281
+#: core/forms.py:279
msgid "Invalid password"
msgstr "Geçersiz parola"
-#: core/forms.py:293
+#: core/forms.py:291 core/forms.py:349
msgid "The form is secured with reCAPTCHA"
msgstr "Form reCAPTCHA ile güvence altına alındı"
-#: core/forms.py:314 core/forms.py:341 core/templates/navigation.html:272
-#: core/templates/navigation.html:285 core/templates/template.html:123
-#: core/templates/user/login.html:21 core/views/user.py:285
+#: core/forms.py:312 core/forms.py:339 core/templates/navigation.html:269
+#: core/templates/navigation.html:282 core/templates/template.html:113
+#: core/templates/user/login.html:21 core/views/user.py:293
#: software/templates/features.html:87 software/templates/features.html:442
msgid "Register"
msgstr "Kayıt ol"
+#: core/forms.py:360 weight/templates/import_csv_form.html:9
+msgid "Submit"
+msgstr "Sunmak"
+
#: core/models/language.py:31 core/templates/language/view.html:21
msgid "Language short name"
msgstr "Dilin kısa adı"
@@ -197,36 +199,36 @@ msgstr "Bağlantı"
msgid "Link to license text or other information"
msgstr "Lisans metnine veya diğer bilgilere bağlantı"
-#: core/models/profile.py:57
+#: core/models/profile.py:60
#, python-format
msgid "%(birthdate)s is not a valid birthdate"
msgstr "%(birthdate)s geçerli bir doğum tarihi değil"
-#: core/models/profile.py:66
+#: core/models/profile.py:69
msgid "Male"
msgstr "Erkek"
-#: core/models/profile.py:67
+#: core/models/profile.py:70
msgid "Female"
msgstr "Kadın"
-#: core/models/profile.py:74
+#: core/models/profile.py:77
msgid "Low"
msgstr "Hafif"
-#: core/models/profile.py:75
+#: core/models/profile.py:78
msgid "Medium"
msgstr "Orta"
-#: core/models/profile.py:76
+#: core/models/profile.py:79
msgid "High"
msgstr "Yüksek"
-#: core/models/profile.py:82
+#: core/models/profile.py:85
msgid "Metric (kilogram)"
msgstr "Metrik (kilogram)"
-#: core/models/profile.py:83
+#: core/models/profile.py:86
msgid "Imperial (pound)"
msgstr "İngiliz (paunt)"
@@ -345,7 +347,7 @@ msgstr "Haftalık ortalama saat"
msgid "Free time"
msgstr "Boş zaman"
-#: core/models/profile.py:320 nutrition/templates/rate/form.html:66
+#: core/models/profile.py:320 nutrition/templates/rate/form.html:67
msgid "Total daily calories"
msgstr "Toplam günlük kalori"
@@ -387,20 +389,43 @@ msgstr ""
msgid "Enable or disable the trophy system for this user"
msgstr ""
-#: core/models/profile.py:446
+#: core/models/profile.py:457
msgid "The sum of all hours has to be 24"
msgstr "Tüm saatlerin toplamı 24 olmalıdır"
-#: core/models/rep_unit.py:36 core/models/weight_unit.py:42
-#: core/templates/user/overview.html:280 core/views/user.py:589
+#: core/models/rep_unit.py:32 i18n.tpl:30
+msgid "Repetitions"
+msgstr "Tekrarlar"
+
+#: core/models/rep_unit.py:33 core/templates/user/overview.html:82
+#: exercises/templates/history/overview.html:30
+msgid "Time"
+msgstr "Zaman"
+
+#: core/models/rep_unit.py:34
+msgid "Distance"
+msgstr ""
+
+#: core/models/rep_unit.py:47 core/models/weight_unit.py:42
+#: core/templates/user/overview.html:283 core/views/user.py:605
#: exercises/models/muscle.py:36 gym/models/contract.py:52
#: gym/models/contract.py:103 gym/models/gym.py:46
#: gym/models/user_document.py:84 gym/templates/contract/view.html:50
#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:108
-#: gym/views/gym.py:158 nutrition/templates/ingredient/view.html:151
+#: gym/views/gym.py:158 nutrition/templates/ingredient/view.html:192
msgid "Name"
msgstr "İsim"
+#: core/models/rep_unit.py:53
+#, fuzzy
+#| msgid "Unit"
+msgid "Unit Type"
+msgstr "Birim"
+
+#: core/models/rep_unit.py:54
+msgid "The type of unit (repetitions, time, or distance)"
+msgstr ""
+
#: core/templates/403.html:4
msgid "Forbidden!"
msgstr "Yasak!"
@@ -431,6 +456,55 @@ msgstr ""
"deneyin ve bu işe yaramazsa lütfen daha sonra tekrar deneyin. Sorun devam "
"ederse, aşağıda listelenen yollarla yardım isteyebilirsiniz:"
+#: core/templates/account/email/email_confirmation_message.html:81
+msgid "Almost there!"
+msgstr ""
+
+#: core/templates/account/email/email_confirmation_message.html:85
+#, fuzzy, python-format
+#| msgid ""
+#| "You're receiving this e-mail because you requested a password reset for "
+#| "your user account at %(site_name)s."
+msgid ""
+"You're receiving this email because the user \"%(user_display)s\" has given "
+"your email address to register an account on %(site_domain)s."
+msgstr ""
+"Bu e-postayı, %(site_name)s adresindeki kullanıcı hesabınız için bir parola "
+"sıfırlama talep ettiğiniz için alıyorsunuz."
+
+#: core/templates/account/email/email_confirmation_message.html:93
+msgid ""
+"Your email verification code is listed below. Please enter it in your open "
+"browser window."
+msgstr ""
+
+#: core/templates/account/email/email_confirmation_message.html:100
+#, fuzzy
+#| msgid "Please click the following link to confirm your email: %(link)s"
+msgid "Please click the button below to confirm your email address."
+msgstr "E-posta adresinizi doğrulamak için lütfen tıklayın: %(link)s"
+
+#: core/templates/account/email/email_confirmation_message.html:106
+#, fuzzy
+#| msgid "Unverified email"
+msgid "Confirm email"
+msgstr "Doğrulanmamış e-posta adresi"
+
+#: core/templates/account/email/email_confirmation_message.html:110
+#, python-format
+msgid ""
+"The link is valid for %(expire_hours)s hours (until %(date)s, %(time)s). You "
+"can request a new one from your profile settings."
+msgstr ""
+
+#: core/templates/account/email/email_confirmation_message.html:116
+msgid "If the button doesn't work, copy and paste this link into your browser:"
+msgstr ""
+
+#: core/templates/account/email/email_confirmation_message.html:125
+msgid "the wger Team"
+msgstr "wger Ekibi"
+
#: core/templates/base.html:10
#, fuzzy, python-format
#| msgid ""
@@ -475,53 +549,7 @@ msgstr ""
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 verification"
-msgstr "E-posta doğrulaması"
-
-#: core/templates/email_verification/confirm_template.html:18
-#, python-format
-msgid "%(username)s, your email was verified"
-msgstr "%(username)s, e-posta adresiniz doğrulandı"
-
-#: core/templates/email_verification/confirm_template.html:22
-msgid "Error, invalid verification token"
-msgstr "Hata, geçersiz doğrulama belirteci"
-
-#: core/templates/email_verification/email_body_html.tpl:6
-msgid "Email Confirmation"
-msgstr "E-posta Doğrulaması"
-
-#: 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 "%(username)s, neredeyse bitirdiniz!"
-
-#: 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 ""
-"E-posta adresinizi doğrulamak için lütfen <a href=\"%(link)s\">buraya</a> "
-"tıklayın"
-
-#: 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 "Belirtecin süresi %(time)s tarihinde doluyor"
-
-#: core/templates/email_verification/email_body_html.tpl:14
-#: core/templates/email_verification/email_body_txt.tpl:8
-msgid "the wger Team"
-msgstr "wger Ekibi"
-
-#: core/templates/email_verification/email_body_txt.tpl:4
-#, python-format
-msgid "Please click the following link to confirm your email: %(link)s"
-msgstr "E-posta adresinizi doğrulamak için lütfen tıklayın: %(link)s"
-
-#: core/templates/language/overview.html:4 core/templates/navigation.html:344
+#: core/templates/language/overview.html:4 core/templates/navigation.html:341
msgid "Languages"
msgstr "Diller"
@@ -530,16 +558,16 @@ msgid "Nothing found."
msgstr "Bulunamadı."
#: core/templates/language/overview.html:22
-#: nutrition/templates/ingredient/overview.html:38
+#: nutrition/templates/ingredient/overview.html:43
msgid "Add one now."
msgstr "Yeni ekle."
#: core/templates/language/overview.html:34 core/templates/license/list.html:43
-#: core/templates/repetition_unit/list.html:46
-#: core/templates/user/overview.html:344 core/templates/user/overview.html:384
-#: core/templates/user/overview.html:422
-#: core/templates/weight_unit/list.html:46 core/views/languages.py:74
-#: core/views/license.py:66 core/views/repetition_units.py:66
+#: core/templates/repetition_unit/list.html:44
+#: core/templates/user/overview.html:347 core/templates/user/overview.html:387
+#: core/templates/user/overview.html:425
+#: core/templates/weight_unit/list.html:46 core/views/languages.py:77
+#: core/views/license.py:66 core/views/repetition_units.py:76
#: core/views/weight_units.py:66
#: exercises/templates/categories/admin-overview.html:40
#: exercises/templates/equipment/admin-overview.html:39
@@ -552,14 +580,14 @@ msgstr "Yeni ekle."
#: gym/templates/gym/member_list.html:264
#: gym/templates/gym/member_list.html:303
#: mailer/templates/mailer/gym/overview.html:43
-#: nutrition/templates/ingredient/overview.html:60
+#: nutrition/templates/ingredient/overview.html:97
msgid "Add"
msgstr "Ekle"
#: core/templates/language/view.html:61 core/templates/user/api_key.html:41
#: core/templates/user/preferences.html:50 gym/models/contract.py:203
#: gym/templates/contract/view.html:41 gym/templates/gym/member_list.html:270
-#: nutrition/templates/ingredient/view.html:206
+#: nutrition/templates/ingredient/view.html:245
msgid "Options"
msgstr "Seçenekler"
@@ -569,9 +597,9 @@ msgstr "Lisans listesi"
#: core/templates/license/list.html:30
#: core/templates/repetition_unit/list.html:32
-#: core/templates/user/overview.html:104 core/templates/user/overview.html:136
-#: core/templates/user/overview.html:185 core/templates/user/overview.html:365
-#: core/templates/user/overview.html:404 core/templates/user/overview.html:448
+#: core/templates/user/overview.html:107 core/templates/user/overview.html:139
+#: core/templates/user/overview.html:188 core/templates/user/overview.html:368
+#: core/templates/user/overview.html:407 core/templates/user/overview.html:451
#: core/templates/weight_unit/list.html:32
#: exercises/templates/categories/admin-overview.html:30
#: exercises/templates/equipment/admin-overview.html:30
@@ -583,11 +611,10 @@ msgstr "Lisans listesi"
#: gym/templates/gym/member_list.html:284
#: gym/templates/gym/member_list.html:321
#: mailer/templates/mailer/gym/overview.html:30
-#: nutrition/templates/units/list.html:34
msgid "Nothing found"
msgstr "Hiçbir şey Bulunamadı"
-#: core/templates/misc/about.html:4 core/templates/template.html:160
+#: core/templates/misc/about.html:4 core/templates/template.html:150
msgid "Imprint"
msgstr "Künye"
@@ -595,162 +622,157 @@ msgstr "Künye"
msgid "Training"
msgstr "Eğitim"
-#: core/templates/navigation.html:37 core/templates/user/overview.html:25
+#: core/templates/navigation.html:36 core/templates/user/overview.html:28
msgid "Routines"
msgstr ""
-#: core/templates/navigation.html:45 core/templates/user/overview.html:70
+#: core/templates/navigation.html:44 core/templates/user/overview.html:73
msgid "Calendar"
msgstr "Takvim"
-#: core/templates/navigation.html:55
+#: core/templates/navigation.html:53
msgid "Measurements"
msgstr "Ölçümler"
-#: core/templates/navigation.html:66 gallery/templates/images/overview.html:6
+#: core/templates/navigation.html:64 gallery/templates/images/overview.html:6
msgid "Gallery"
msgstr "Galeri"
-#: core/templates/navigation.html:72
+#: core/templates/navigation.html:74 core/templates/navigation.html:400
+#: trophies/templates/trophies/overview.html:7
+msgid "Trophies"
+msgstr ""
+
+#: core/templates/navigation.html:79
msgid "Workout templates"
msgstr "Antrenman şablonları"
-#: core/templates/navigation.html:79
+#: core/templates/navigation.html:86
msgid "Your templates"
msgstr "Şablonlarınız"
-#: core/templates/navigation.html:88
+#: core/templates/navigation.html:95
msgid "Public templates"
msgstr "Herkese açık şablonlar"
-#: core/templates/navigation.html:96 software/templates/features.html:51
+#: core/templates/navigation.html:103 software/templates/features.html:51
#: software/templates/features.html:480
msgid "Exercises"
msgstr "Egzersizler"
-#: core/templates/navigation.html:102 core/templates/navigation.html:176
-#: core/templates/navigation.html:339
+#: core/templates/navigation.html:109 core/templates/navigation.html:336
msgid "Administration"
msgstr "Yönetim"
-#: core/templates/navigation.html:106
+#: core/templates/navigation.html:113
msgid "Exercise edit history"
msgstr "Egzersiz düzenleme geçmişi"
-#: core/templates/navigation.html:112
+#: core/templates/navigation.html:119
msgid "Equipment"
msgstr "Ekipman"
-#: core/templates/navigation.html:118
+#: core/templates/navigation.html:125
msgid "Muscles"
msgstr "Kaslar"
-#: core/templates/navigation.html:124
+#: core/templates/navigation.html:131
#: exercises/templates/categories/admin-overview.html:4
msgid "Categories"
msgstr "Kategoriler"
-#: core/templates/navigation.html:139 software/templates/features.html:468
+#: core/templates/navigation.html:146 software/templates/features.html:468
msgid "Nutrition"
msgstr "Beslenme"
-#: core/templates/navigation.html:147 core/templates/user/overview.html:144
+#: core/templates/navigation.html:154 core/templates/user/overview.html:147
msgid "Nutrition plans"
msgstr "Beslenme planları"
-#: core/templates/navigation.html:156
+#: core/templates/navigation.html:163
msgid "BMI calculator"
msgstr "BMI hesaplayıcı"
-#: core/templates/navigation.html:165 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:172 nutrition/templates/rate/form.html:18
msgid "Daily calories calculator"
msgstr "Günlük kalori hesaplayıcı"
-#: core/templates/navigation.html:171
+#: core/templates/navigation.html:178
#: nutrition/templates/ingredient/overview.html:10
msgid "Ingredient overview"
msgstr "İçeriğe genel bakış"
-#: core/templates/navigation.html:180 nutrition/templates/units/list.html:6
-msgid "Ingredient weight units"
-msgstr "İçerik ağırlık birimleri"
-
-#: core/templates/navigation.html:196 software/templates/features.html:463
+#: core/templates/navigation.html:193 software/templates/features.html:463
msgid "Body weight"
msgstr "Vücut ağırlığı"
-#: core/templates/navigation.html:203 core/templates/user/overview.html:114
+#: core/templates/navigation.html:200 core/templates/user/overview.html:117
msgid "Weight overview"
msgstr "Ağırlığa genel bakış"
-#: core/templates/navigation.html:217
+#: core/templates/navigation.html:214
msgid "About this software"
msgstr "Bu yazılım hakkında"
-#: core/templates/navigation.html:223 software/templates/about_us.html:5
+#: core/templates/navigation.html:220 software/templates/about_us.html:5
msgid "Support & Get Involved"
msgstr ""
-#: core/templates/navigation.html:229 software/templates/features.html:528
+#: core/templates/navigation.html:226 software/templates/features.html:528
msgid "REST API"
msgstr "REST API"
-#: core/templates/navigation.html:235 utils/models.py:45
+#: core/templates/navigation.html:232 utils/models.py:45
msgid "License"
msgstr "Lisans"
-#: core/templates/navigation.html:241
+#: core/templates/navigation.html:238
msgid "Developer documentation"
msgstr "Geliştirici belgeleri"
-#: core/templates/navigation.html:248
+#: core/templates/navigation.html:245
msgid "Get the code"
msgstr "Kodu alın"
-#: core/templates/navigation.html:255 core/templates/template.html:199
-#: software/templates/features.html:603
+#: core/templates/navigation.html:252 core/templates/template.html:202
+#: software/templates/features.html:614
msgid "Translate"
msgstr "Çevir"
-#: core/templates/navigation.html:292 core/templates/user/login.html:30
+#: core/templates/navigation.html:289 core/templates/user/login.html:30
msgid "Reset password"
msgstr "Parolayı sıfırla"
-#: core/templates/navigation.html:301 core/templates/navigation.html:329
+#: core/templates/navigation.html:298 core/templates/navigation.html:326
msgid "Logout"
msgstr "Çıkış"
-#: core/templates/navigation.html:320
+#: core/templates/navigation.html:317
msgid "My preferences"
msgstr "Benim tercihlerim"
-#: core/templates/navigation.html:352
+#: core/templates/navigation.html:349
msgid "Licenses"
msgstr "Lisanslar"
-#: core/templates/navigation.html:360
+#: core/templates/navigation.html:357
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr "Tekrarlama birimleri"
-#: core/templates/navigation.html:368 core/templates/weight_unit/list.html:4
-#: nutrition/templates/ingredient/view.html:141
+#: core/templates/navigation.html:365 core/templates/weight_unit/list.html:4
+#: nutrition/templates/ingredient/view.html:182
msgid "Weight units"
msgstr "Ağırlık birimleri"
-#: core/templates/navigation.html:376 core/templates/user/list.html:4
+#: core/templates/navigation.html:373 core/templates/user/list.html:4
msgid "User list"
msgstr "Kullanıcı listesi"
-#: core/templates/navigation.html:382
+#: core/templates/navigation.html:379
msgid "Gyms"
msgstr "Spor salonları"
-#: core/templates/navigation.html:403
-#: trophies/templates/trophies/overview.html:7
-msgid "Trophies"
-msgstr ""
-
#: core/templates/registration/password_reset_complete.html:4
msgid "Password reset complete"
msgstr "Parola sıfırlama tamamlandı"
@@ -810,26 +832,30 @@ msgstr "önceki"
msgid "next"
msgstr "Sonraki"
-#: core/templates/template.html:96
+#: core/templates/template.html:86
msgid "Close"
msgstr "Kapat"
-#: core/templates/template.html:112
+#: core/templates/template.html:102
msgid ""
"You are using a guest account, data entered will be deleted after a week."
msgstr ""
"Misafir hesabı kullanıyorsunuz, girilen veriler bir hafta sonra silinecek."
-#: core/templates/template.html:117
+#: core/templates/template.html:107
msgid "Create some demo entries"
msgstr "Bazı demo girişleri oluşturun"
-#: core/templates/template.html:165 software/templates/features.html:568
+#: core/templates/template.html:155 software/templates/features.html:568
#: software/templates/tos.html:7
msgid "Terms of service"
msgstr "Kullanım Şartları"
-#: core/templates/template_features.html:53 software/templates/features.html:9
+#: core/templates/template.html:181 software/templates/features.html:595
+msgid "Browser language"
+msgstr ""
+
+#: core/templates/template_features.html:46 software/templates/features.html:9
msgid "Features"
msgstr "Özellikleri"
@@ -888,99 +914,94 @@ msgstr "Hesap yok?"
msgid "Forgot password?"
msgstr "Parolanızı mı unuttunuz?"
-#: core/templates/user/overview.html:25 core/templates/user/overview.html:68
-#: core/templates/user/overview.html:112 core/templates/user/overview.html:144
-#: core/templates/user/overview.html:348 core/templates/user/overview.html:390
-#: core/templates/user/overview.html:426
+#: core/templates/user/overview.html:28 core/templates/user/overview.html:71
+#: core/templates/user/overview.html:115 core/templates/user/overview.html:147
+#: core/templates/user/overview.html:351 core/templates/user/overview.html:393
+#: core/templates/user/overview.html:429
#, python-format
msgid "last %(number)s"
msgstr "son %(number)s"
-#: core/templates/user/overview.html:27 core/templates/user/overview.html:146
-#: core/templates/user/overview.html:343 core/templates/user/overview.html:382
-#: core/templates/user/overview.html:421 gym/templates/gym/member_list.html:226
+#: core/templates/user/overview.html:30 core/templates/user/overview.html:149
+#: core/templates/user/overview.html:346 core/templates/user/overview.html:385
+#: core/templates/user/overview.html:424 gym/templates/gym/member_list.html:226
#: gym/templates/gym/member_list.html:262
#: gym/templates/gym/member_list.html:302
msgid "Overview"
msgstr "Genel Bakış"
-#: core/templates/user/overview.html:34 core/templates/user/overview.html:76
-#: core/templates/user/overview.html:120 core/templates/user/overview.html:152
+#: core/templates/user/overview.html:37 core/templates/user/overview.html:79
+#: core/templates/user/overview.html:123 core/templates/user/overview.html:155
#: manager/helpers.py:88 software/templates/about_us.html:170
#: weight/templates/import_csv_preview.html:13
#: weight/templates/import_csv_preview.html:42 weight/views.py:54
msgid "Date"
msgstr "Tarih"
-#: core/templates/user/overview.html:35 core/templates/user/overview.html:153
+#: core/templates/user/overview.html:38 core/templates/user/overview.html:156
#: gym/models/contract.py:58 gym/models/contract.py:109
msgid "Description"
msgstr "Açıklama"
-#: core/templates/user/overview.html:36
+#: core/templates/user/overview.html:39
msgid "Number of logs (days)"
msgstr "Günlük sayısı (gün)"
-#: core/templates/user/overview.html:37 core/views/user.py:590
+#: core/templates/user/overview.html:40 core/views/user.py:606
#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:158
msgid "Last activity"
msgstr "Son Aktivite"
-#: core/templates/user/overview.html:58
+#: core/templates/user/overview.html:61
msgid "No workouts found."
msgstr "Antrenman bulunamadı."
-#: core/templates/user/overview.html:68
+#: core/templates/user/overview.html:71
msgid "Log"
msgstr "Kayıt"
-#: core/templates/user/overview.html:77
+#: core/templates/user/overview.html:80
msgid "General impression"
msgstr "Genel izlenim"
-#: core/templates/user/overview.html:78 core/templates/user/overview.html:390
+#: core/templates/user/overview.html:81 core/templates/user/overview.html:393
msgid "Notes"
msgstr "Notlar"
-#: core/templates/user/overview.html:79
-#: exercises/templates/history/overview.html:30
-msgid "Time"
-msgstr "Zaman"
-
-#: core/templates/user/overview.html:112 core/templates/user/overview.html:121
+#: core/templates/user/overview.html:115 core/templates/user/overview.html:124
#: manager/helpers.py:89 weight/templates/import_csv_preview.html:14
#: weight/templates/import_csv_preview.html:43 weight/views.py:54
msgid "Weight"
msgstr "Kilo"
-#: core/templates/user/overview.html:154
-#: nutrition/templates/ingredient/view.html:51 nutrition/views/plan.py:245
+#: core/templates/user/overview.html:157
+#: nutrition/templates/ingredient/view.html:52 nutrition/views/plan.py:244
msgid "Energy"
msgstr "Enerji"
-#: core/templates/user/overview.html:155
-#: nutrition/templates/ingredient/view.html:58 nutrition/views/plan.py:251
+#: core/templates/user/overview.html:158
+#: nutrition/templates/ingredient/view.html:59 nutrition/views/plan.py:250
msgid "Protein"
msgstr "Protein"
-#: core/templates/user/overview.html:156
-#: nutrition/templates/ingredient/view.html:64 nutrition/views/plan.py:259
+#: core/templates/user/overview.html:159
+#: nutrition/templates/ingredient/view.html:65 nutrition/views/plan.py:258
msgid "Carbohydrates"
msgstr "Karbonhidratlar"
-#: core/templates/user/overview.html:157
-#: nutrition/templates/ingredient/view.html:80 nutrition/views/plan.py:273
+#: core/templates/user/overview.html:160
+#: nutrition/templates/ingredient/view.html:81 nutrition/views/plan.py:272
msgid "Fat"
msgstr "Yağ"
-#: core/templates/user/overview.html:170
-#: nutrition/templates/ingredient/view.html:53
+#: core/templates/user/overview.html:173
+#: nutrition/templates/ingredient/view.html:54
msgid "kcal"
msgstr "kilokalori"
-#: core/templates/user/overview.html:201 core/templates/user/overview.html:340
-#: core/templates/user/overview.html:379 core/templates/user/overview.html:418
-#: core/templates/user/overview.html:463 gym/templates/gym/list.html:45
+#: core/templates/user/overview.html:204 core/templates/user/overview.html:343
+#: core/templates/user/overview.html:382 core/templates/user/overview.html:421
+#: core/templates/user/overview.html:466 gym/templates/gym/list.html:45
#: gym/templates/gym/member_list.html:91 gym/templates/gym/member_list.html:149
#: gym/templates/gym/member_list.html:187
#: gym/templates/gym/member_list.html:223
@@ -989,111 +1010,115 @@ msgstr "kilokalori"
msgid "Actions"
msgstr "Hareketler"
-#: core/templates/user/overview.html:210
+#: core/templates/user/overview.html:213
msgid "Deactivate user"
msgstr "Kullanıcıyı devre dışı bırak"
-#: core/templates/user/overview.html:214
+#: core/templates/user/overview.html:217
msgid "Activate user"
msgstr "Kullanıcıyı etkinleştir"
-#: core/templates/user/overview.html:223
+#: core/templates/user/overview.html:226
msgid "Reset user password"
msgstr "Kullanıcı parolasını sıfırla"
-#: core/templates/user/overview.html:227 gym/templates/gym/member_list.html:30
+#: core/templates/user/overview.html:230 gym/templates/gym/member_list.html:30
msgid "Roles"
msgstr "Roller"
-#: core/templates/user/overview.html:243
+#: core/templates/user/overview.html:246
msgid "Password reset confirmation"
msgstr "Parola sıfırlama onayı"
-#: core/templates/user/overview.html:247
+#: core/templates/user/overview.html:250
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:250
+#: core/templates/user/overview.html:253
#: exercises/templates/history/overview.html:106
+#: nutrition/templates/ingredient/view.html:148
+#: nutrition/templates/ingredient/view.html:160
msgid "No"
msgstr "Hayır"
-#: core/templates/user/overview.html:251
+#: core/templates/user/overview.html:254
#: exercises/templates/history/overview.html:99
+#: nutrition/templates/ingredient/view.html:146
+#: nutrition/templates/ingredient/view.html:158
msgid "Yes"
msgstr "Evet"
-#: core/templates/user/overview.html:272 gym/templates/gym/member_list.html:105
+#: core/templates/user/overview.html:275 gym/templates/gym/member_list.html:105
msgid "Details"
msgstr "Detaylar"
-#: core/templates/user/overview.html:276 gym/views/export.py:57
-#: manager/helpers.py:89 nutrition/views/plan.py:151
-#: nutrition/views/plan.py:157
+#: core/templates/user/overview.html:279 gym/views/export.py:57
+#: manager/helpers.py:89 nutrition/views/plan.py:150
+#: nutrition/views/plan.py:156
msgid "Nr."
msgstr "Nr."
-#: core/templates/user/overview.html:298 gym/models/contract.py:287
+#: core/templates/user/overview.html:301 gym/models/contract.py:287
#: gym/models/gym.py:50 gym/templates/contract/view.html:75
#: gym/templates/gym/member_list.html:112 gym/views/export.py:68
msgid "Phone"
msgstr "Telefon"
-#: core/templates/user/overview.html:302 gym/templates/contract/view.html:87
+#: core/templates/user/overview.html:305 gym/templates/contract/view.html:87
#: gym/templates/gym/member_list.html:130
msgid "Address"
msgstr "Adres"
-#: core/templates/user/overview.html:313
+#: core/templates/user/overview.html:316
msgid "Registered"
msgstr "Kayıtlı"
-#: core/templates/user/overview.html:317
+#: core/templates/user/overview.html:320
msgid "Last login"
msgstr "Son giriş"
-#: core/templates/user/overview.html:322
+#: core/templates/user/overview.html:325
msgid "Status"
msgstr "Durum"
-#: core/templates/user/overview.html:325
+#: core/templates/user/overview.html:328
msgid "Active"
msgstr "Aktif"
-#: core/templates/user/overview.html:327
+#: core/templates/user/overview.html:330
msgid "Inactive"
msgstr "Etkin değil"
-#: core/templates/user/overview.html:348 gym/templates/contract/list.html:4
+#: core/templates/user/overview.html:351 gym/templates/contract/list.html:4
#: gym/templates/gym/member_list.html:218
msgid "Contracts"
msgstr "Sözleşmeler"
-#: core/templates/user/overview.html:426 gym/templates/document/list.html:4
+#: core/templates/user/overview.html:429 gym/templates/document/list.html:4
msgid "Documents"
msgstr "Belgeler"
-#: core/templates/user/overview.html:433 gym/templates/document/list.html:33
+#: core/templates/user/overview.html:436 gym/templates/document/list.html:33
msgid "Download"
msgstr "İndir"
-#: core/templates/user/overview.html:474 gym/views/admin_config.py:44
+#: core/templates/user/overview.html:477 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:477 gym/models/user_config.py:92
+#: core/templates/user/overview.html:480 gym/models/user_config.py:92
msgid "Include in inactive overview"
msgstr "Etkin olmayan genel bakışa ekle"
-#: core/templates/user/overview.html:510
+#: core/templates/user/overview.html:513
#, python-format
msgid "Admin login is only available for users in %(gym_name)s"
msgstr ""
"Yönetici oturumu yalnızca %(gym_name)s içindeki kullanıcılar tarafından "
"kullanılabilir"
-#: core/templates/user/overview.html:514
+#: core/templates/user/overview.html:517
msgid "Log in as this user"
msgstr "Bu kullanıcı olarak oturum açın"
@@ -1118,7 +1143,7 @@ msgid "You need to verify your email to contribute exercises"
msgstr ""
"Egzersizlere katkıda bulunmak için e-posta adresinizi doğrulamanız gerekiyor"
-#: core/templates/user/preferences.html:55 core/views/user.py:601
+#: core/templates/user/preferences.html:55 core/views/user.py:617
msgid "Change password"
msgstr "Parola değiştir"
@@ -1126,23 +1151,23 @@ msgstr "Parola değiştir"
msgid "Already have an account?"
msgstr ""
-#: core/templatetags/wger_extras.py:142 i18n.tpl:38
+#: core/templatetags/wger_extras.py:142 i18n.tpl:39
msgid "kg"
msgstr "kilogram"
#: core/templatetags/wger_extras.py:144
-#: nutrition/templates/ingredient/view.html:60
-#: nutrition/templates/ingredient/view.html:66
-#: nutrition/templates/ingredient/view.html:73
-#: nutrition/templates/ingredient/view.html:82
-#: nutrition/templates/ingredient/view.html:89
-#: nutrition/templates/ingredient/view.html:111
-#: nutrition/templates/ingredient/view.html:121
+#: nutrition/templates/ingredient/view.html:61
+#: nutrition/templates/ingredient/view.html:67
+#: nutrition/templates/ingredient/view.html:74
+#: nutrition/templates/ingredient/view.html:83
+#: nutrition/templates/ingredient/view.html:90
+#: nutrition/templates/ingredient/view.html:112
+#: nutrition/templates/ingredient/view.html:122
msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr "g"
-#: core/templatetags/wger_extras.py:147 i18n.tpl:39
+#: core/templatetags/wger_extras.py:147 i18n.tpl:40
msgid "lb"
msgstr "1 pound = 0.45 kg"
@@ -1151,36 +1176,35 @@ msgctxt "weight unit, i.e. ounces"
msgid "oz"
msgstr "oz"
-#: core/views/languages.py:85 exercises/views/categories.py:122
+#: core/views/languages.py:88 exercises/views/categories.py:122
#: exercises/views/equipment.py:103 exercises/views/muscles.py:99
-#: nutrition/views/ingredient.py:120 nutrition/views/unit.py:110
+#: nutrition/views/ingredient.py:125
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
+#: core/views/languages.py:96 core/views/license.py:103
+#: core/views/repetition_units.py:114 core/views/weight_units.py:115
#: exercises/views/categories.py:128 exercises/views/muscles.py:106
#: gallery/views/images.py:124 gym/views/admin_notes.py:196
#: gym/views/document.py:206 gym/views/gym.py:481
-#: nutrition/views/ingredient.py:127 nutrition/views/unit.py:117
+#: nutrition/views/ingredient.py:132
#, python-brace-format
msgid "Delete {0}?"
msgstr "{0} silinsin mi?"
-#: core/views/languages.py:111 core/views/license.py:85
-#: core/views/repetition_units.py:86 core/views/user.py:464
+#: core/views/languages.py:114 core/views/license.py:85
+#: core/views/repetition_units.py:96 core/views/user.py:480
#: core/views/weight_units.py:86 exercises/views/categories.py:98
#: exercises/views/equipment.py:81 exercises/views/muscles.py:87
#: gym/views/admin_notes.py:161 gym/views/config.py:68
#: gym/views/contract.py:186 gym/views/contract_option.py:123
#: gym/views/contract_type.py:123 gym/views/document.py:171
-#: gym/views/gym.py:463 nutrition/views/ingredient.py:146
-#: nutrition/views/unit.py:143
+#: gym/views/gym.py:463 nutrition/views/ingredient.py:151
#, python-brace-format
msgid "Edit {0}"
msgstr "{0} düzenleyin"
-#: core/views/misc.py:74
+#: core/views/misc.py:73
msgid ""
"We have created sample workout, workout schedules, weight logs, (body) "
"weight and nutrition plan entries so you can better see what this site can "
@@ -1190,48 +1214,48 @@ msgstr ""
"egzersiz programları, ağırlık kayıtları, (vücut) ağırlık ve beslenme planı "
"girişleri oluşturduk. Düzenlemekten veya silmekten çekinmeyin!"
-#: core/views/user.py:143
+#: core/views/user.py:145
#, python-brace-format
msgid "Account \"{0}\" was successfully deleted"
msgstr "\"{0}\" hesabı başarıyla silindi"
-#: core/views/user.py:279
+#: core/views/user.py:287
msgid "You were successfully registered"
msgstr "Başarıyla kaydoldunuz"
-#: core/views/user.py:341
+#: core/views/user.py:357
msgid "Settings successfully updated"
msgstr "Ayarlar başarıyla güncellendi"
-#: core/views/user.py:380
+#: core/views/user.py:396
msgid "The user was successfully deactivated"
msgstr "Kullanıcı başarıyla devre dışı bırakıldı"
-#: core/views/user.py:417
+#: core/views/user.py:433
msgid "The user was successfully activated"
msgstr "Kullanıcı başarıyla etkinleştirildi"
-#: core/views/user.py:432
+#: core/views/user.py:448
msgid "Edit user"
msgstr "Kullanıcıyı düzenle"
-#: core/views/user.py:587 gym/templates/gym/member_list.html:26
+#: core/views/user.py:603 gym/templates/gym/member_list.html:26
#: gym/views/gym.py:158
msgid "ID"
msgstr "İD"
-#: core/views/user.py:588 gym/forms.py:95 gym/templates/contract/view.html:55
+#: core/views/user.py:604 gym/forms.py:95 gym/templates/contract/view.html:55
#: gym/templates/gym/member_list.html:27 gym/views/export.py:59
#: gym/views/gym.py:158 gym/views/gym.py:217
msgid "Username"
msgstr "Kullanıcı adı"
-#: core/views/user.py:591 gym/templates/gym/new_user.html:34
+#: core/views/user.py:607 gym/templates/gym/new_user.html:34
#: gym/views/export.py:58 gym/views/gym.py:217
msgid "Gym"
msgstr "Jimnastik"
-#: core/views/user.py:650
+#: core/views/user.py:678
#, python-format
msgid "A verification email was sent to %(email)s"
msgstr "%(email)s adresine bir doğrulama e-postası gönderildi"
@@ -1248,16 +1272,16 @@ msgstr "Alternatif ad"
msgid "A more basic name for the muscle"
msgstr "Kas için daha temel bir isim"
-#: exercises/models/video.py:50
+#: exercises/models/video.py:52
#, python-format
msgid "Maximum file size is %(size)sMB."
msgstr "Azami dosya boyutu %(size)sMB'dir."
-#: exercises/models/video.py:57 exercises/models/video.py:65
+#: exercises/models/video.py:59 exercises/models/video.py:67
msgid "File type is not supported"
msgstr "Dosya türü desteklenmiyor"
-#: exercises/models/video.py:70
+#: exercises/models/video.py:72
msgid "File is not a valid video"
msgstr "Dosya geçerli bir video değil"
@@ -1328,7 +1352,11 @@ msgstr "Ekipman silinsin mi?"
msgid "Add muscle"
msgstr "Kas ekleyin"
-#: gallery/templates/images/overview.html:72
+#: gallery/forms.py:35
+msgid "If date is left empty, it will be read from the image instead"
+msgstr ""
+
+#: gallery/templates/images/overview.html:69
msgid "Add image"
msgstr "Resim ekle"
@@ -1397,7 +1425,7 @@ msgid "Contract type"
msgstr "Sözleşme tipi"
#: gym/models/contract.py:211 gym/templates/contract/view.html:59
-#: nutrition/forms.py:58
+#: nutrition/forms.py:67
msgid "Amount"
msgstr "Miktar"
@@ -1577,7 +1605,7 @@ msgstr "E-postalar"
msgid "Add member"
msgstr "Üye ekle"
-#: gym/templates/gym/new_user.html:48 nutrition/templates/rate/form.html:120
+#: gym/templates/gym/new_user.html:48 nutrition/templates/rate/form.html:121
msgid "Info"
msgstr "Bilgi"
@@ -1750,10 +1778,6 @@ msgstr "Barfiks çubuğu"
msgid "Quads"
msgstr "Quads kasları"
-#: i18n.tpl:30
-msgid "Repetitions"
-msgstr "Tekrarlar"
-
#: i18n.tpl:31
msgid "Resistance band"
msgstr ""
@@ -1782,198 +1806,204 @@ msgstr "Triceps kasları"
msgid "Until Failure"
msgstr "Başarısızlığa Kadar"
-#: i18n.tpl:40
+#: i18n.tpl:38
+#, fuzzy
+#| msgid "Kilometers"
+msgid "Meters"
+msgstr "Kilometre"
+
+#: i18n.tpl:41
msgid "none (bodyweight exercise)"
msgstr "yok (vücut ağırlığı egzersizi)"
-#: i18n.tpl:41
+#: i18n.tpl:42
msgid "Beginner"
msgstr ""
-#: i18n.tpl:42
+#: i18n.tpl:43
#, fuzzy
#| msgctxt "As in \"content of an email\""
#| msgid "Content"
msgid "Consistent"
msgstr "İçerik"
-#: i18n.tpl:43
+#: i18n.tpl:44
msgid "Dedicated"
msgstr ""
-#: i18n.tpl:44
+#: i18n.tpl:45
msgid "Obsessed"
msgstr ""
-#: i18n.tpl:45
+#: i18n.tpl:46
msgid "Legend"
msgstr "Efsane"
-#: i18n.tpl:46
+#: i18n.tpl:47
msgid "Veteran"
msgstr ""
-#: i18n.tpl:47
+#: i18n.tpl:48
msgid "Titan"
msgstr ""
-#: i18n.tpl:48
+#: i18n.tpl:49
msgid "Unstoppable"
msgstr ""
-#: i18n.tpl:49
+#: i18n.tpl:50
msgid "Weekend Warrior"
msgstr ""
-#: i18n.tpl:50
+#: i18n.tpl:51
msgid "Elephant lifter"
msgstr ""
-#: i18n.tpl:51
+#: i18n.tpl:52
msgid "Bus lifter"
msgstr ""
-#: i18n.tpl:52
+#: i18n.tpl:53
msgid "Plane lifter"
msgstr ""
-#: i18n.tpl:53
+#: i18n.tpl:54
msgid "Blue whale lifter"
msgstr ""
-#: i18n.tpl:54
+#: i18n.tpl:55
msgid "Space Station lifter"
msgstr ""
-#: i18n.tpl:55
+#: i18n.tpl:56
msgid "Millionaire"
msgstr ""
-#: i18n.tpl:56
+#: i18n.tpl:57
msgid "Atlas"
msgstr ""
-#: i18n.tpl:57
+#: i18n.tpl:58
msgid "Early Bird"
msgstr ""
-#: i18n.tpl:58
+#: i18n.tpl:59
#, fuzzy
#| msgid "Weight log"
msgid "Night Owl"
msgstr "Ağırlık günlüğü"
-#: i18n.tpl:59
+#: i18n.tpl:60
msgid "New Year, New Me"
msgstr ""
-#: i18n.tpl:60
+#: i18n.tpl:61
msgid "Phoenix"
msgstr ""
-#: i18n.tpl:61
+#: i18n.tpl:62
#, fuzzy
#| msgid "Personal data"
msgid "Personal Record"
msgstr "Kişisel bilgiler"
-#: i18n.tpl:62
+#: i18n.tpl:63
#, fuzzy
#| msgid "Copy workout"
msgid "Complete your first workout"
msgstr "Antrenmanı kopyala"
-#: i18n.tpl:63
+#: i18n.tpl:64
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 10 workouts"
msgstr "Örnek antrenman"
-#: i18n.tpl:64
+#: i18n.tpl:65
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 50 workouts"
msgstr "Örnek antrenman"
-#: i18n.tpl:65
+#: i18n.tpl:66
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 100 workouts"
msgstr "Örnek antrenman"
-#: i18n.tpl:66
+#: i18n.tpl:67
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 200 workouts"
msgstr "Örnek antrenman"
-#: i18n.tpl:67
+#: i18n.tpl:68
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 500 workouts"
msgstr "Örnek antrenman"
-#: i18n.tpl:68
+#: i18n.tpl:69
#, fuzzy
#| msgid "Sample workout"
msgid "Complete 1000 workouts"
msgstr "Örnek antrenman"
-#: i18n.tpl:69
+#: i18n.tpl:70
msgid "Maintain a 30-day workout streak"
msgstr ""
-#: i18n.tpl:70
+#: i18n.tpl:71
msgid "Work out on Saturday and Sunday for 4 consecutive weekends"
msgstr ""
-#: i18n.tpl:71
+#: i18n.tpl:72
msgid "Lift a cumulative total of 5.000 kg"
msgstr ""
-#: i18n.tpl:72
+#: i18n.tpl:73
msgid "Lift a cumulative total of 20.000 kg"
msgstr ""
-#: i18n.tpl:73
+#: i18n.tpl:74
msgid "Lift a cumulative total of 50.000 kg"
msgstr ""
-#: i18n.tpl:74
+#: i18n.tpl:75
msgid "Lift a cumulative total of 150.000 kg"
msgstr ""
-#: i18n.tpl:75
+#: i18n.tpl:76
msgid "Lift a cumulative total of 450.000 kg"
msgstr ""
-#: i18n.tpl:76
+#: i18n.tpl:77
msgid "Lift a cumulative total of 1.000.000 kg"
msgstr ""
-#: i18n.tpl:77
+#: i18n.tpl:78
msgid "Lift a cumulative total of 10.000.000 kg"
msgstr ""
-#: i18n.tpl:78
+#: i18n.tpl:79
msgid "Complete a workout before 6:00 AM"
msgstr ""
-#: i18n.tpl:79
+#: i18n.tpl:80
msgid "Complete a workout after 9:00 PM"
msgstr ""
-#: i18n.tpl:80
+#: i18n.tpl:81
#, fuzzy
#| msgid "Workout for %s"
msgid "Work out on January 1st"
msgstr "%s için egzersiz"
-#: i18n.tpl:81
+#: i18n.tpl:82
msgid "Return to training after being inactive for 30 days"
msgstr ""
-#: i18n.tpl:82
+#: i18n.tpl:83
msgid "Achieve a new Personal Record on any exercise"
msgstr ""
@@ -2059,7 +2089,7 @@ msgstr "Egzersiz"
msgid "Routine will expire soon"
msgstr "Antrenman yakında sona erecek"
-#: manager/models/routine.py:153 manager/models/session.py:145
+#: manager/models/routine.py:154 manager/models/session.py:145
msgid "The start time cannot be after the end time."
msgstr "Başlangıç zamanı, bitiş zamanından sonra olamaz."
@@ -2146,23 +2176,27 @@ msgstr "Antrenman"
msgid "Workout for %s"
msgstr "%s için egzersiz"
-#: nutrition/forms.py:62
+#: nutrition/extract_info/off.py:72 nutrition/extract_info/off.py:91
+msgid "Serving"
+msgstr ""
+
+#: nutrition/forms.py:71 nutrition/forms.py:208
msgid "Unit"
msgstr "Birim"
-#: nutrition/forms.py:170 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:179 nutrition/templates/rate/form.html:77
msgid "Basic caloric intake"
msgstr "Temel kalori alımı"
-#: nutrition/forms.py:171
+#: nutrition/forms.py:180
msgid "Your basic caloric intake as calculated for your data"
msgstr "Verileriniz için hesaplanan temel kalori alımınız"
-#: nutrition/forms.py:176
+#: nutrition/forms.py:185
msgid "Additional calories"
msgstr "Ek kaloriler"
-#: nutrition/forms.py:178
+#: nutrition/forms.py:187
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
@@ -2170,13 +2204,31 @@ msgstr ""
"Baz orana eklenecek ek kaloriler (çıkarmak için negatif bir sayı girin)"
#: nutrition/forms.py:209
+msgid "grams (g)"
+msgstr ""
+
+#: nutrition/forms.py:219
msgid "Ingredient"
msgstr "Bileşen"
-#: nutrition/forms.py:213
+#: nutrition/forms.py:223
msgid "Also search for names in English"
msgstr "Ayrıca İngilizce adları da arayın"
+#: nutrition/forms.py:239
+msgid "Quantity"
+msgstr ""
+
+#: nutrition/forms.py:241
+msgid "Enter a quantity and choose grams (g) or one of the serving units."
+msgstr ""
+
+#: nutrition/models/ingredient.py:526
+#, fuzzy
+#| msgid "Correction"
+msgid "Portion"
+msgstr "Düzeltme"
+
#: nutrition/templates/ingredient/email_new.tpl:1
#, python-format
msgid ""
@@ -2227,59 +2279,92 @@ msgstr ""
"adresinizi\n"
"eklemeniz durumunda, işlem başarıyla tamamlandığında size haber verilecektir."
-#: nutrition/templates/ingredient/overview.html:38
+#: nutrition/templates/ingredient/overview.html:32
+#: nutrition/templates/ingredient/overview.html:68
+#: nutrition/templates/ingredient/view.html:143
+msgid "Vegan"
+msgstr ""
+
+#: nutrition/templates/ingredient/overview.html:34
+#: nutrition/templates/ingredient/overview.html:79
+#: nutrition/templates/ingredient/view.html:155
+#, fuzzy
+#| msgid "Variations"
+msgid "Vegetarian"
+msgstr "Varyasyonlar"
+
+#: nutrition/templates/ingredient/overview.html:43
msgid "No ingredients."
msgstr "İçerik yok."
-#: nutrition/templates/ingredient/overview.html:49
+#: nutrition/templates/ingredient/overview.html:54
msgid "Search"
msgstr "Ara"
-#: nutrition/templates/ingredient/view.html:45 nutrition/views/plan.py:237
+#: nutrition/templates/ingredient/overview.html:57
+#, fuzzy
+#| msgid "No filter"
+msgid "Filter"
+msgstr "Filtresiz"
+
+#: nutrition/templates/ingredient/overview.html:83
+msgid "Apply"
+msgstr ""
+
+#: nutrition/templates/ingredient/overview.html:85
+msgid "Reset"
+msgstr ""
+
+#: nutrition/templates/ingredient/view.html:46 nutrition/views/plan.py:236
msgid "Macronutrients"
msgstr "Makrobesinler"
-#: nutrition/templates/ingredient/view.html:54
+#: nutrition/templates/ingredient/view.html:55
msgid "kJ"
msgstr "kJ"
-#: nutrition/templates/ingredient/view.html:70 nutrition/views/plan.py:267
+#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:266
msgid "Sugar content in carbohydrates"
msgstr "Karbonhidratlardaki şeker içeriği"
-#: nutrition/templates/ingredient/view.html:75
-#: nutrition/templates/ingredient/view.html:91
-#: nutrition/templates/ingredient/view.html:113
-#: nutrition/templates/ingredient/view.html:123
+#: nutrition/templates/ingredient/view.html:76
+#: nutrition/templates/ingredient/view.html:92
+#: nutrition/templates/ingredient/view.html:114
+#: nutrition/templates/ingredient/view.html:124
msgid "n.A."
msgstr "n.A."
-#: nutrition/templates/ingredient/view.html:86 nutrition/views/plan.py:281
+#: nutrition/templates/ingredient/view.html:87 nutrition/views/plan.py:280
msgid "Saturated fat content in fats"
msgstr "Yağlarda doymuş yağ içeriği"
-#: nutrition/templates/ingredient/view.html:102
+#: nutrition/templates/ingredient/view.html:103
msgid "Others"
msgstr "Diğerleri"
-#: nutrition/templates/ingredient/view.html:108 nutrition/views/plan.py:287
+#: nutrition/templates/ingredient/view.html:109 nutrition/views/plan.py:286
msgid "Fiber"
msgstr "Lif"
-#: nutrition/templates/ingredient/view.html:118 nutrition/views/plan.py:293
+#: nutrition/templates/ingredient/view.html:119 nutrition/views/plan.py:292
msgid "Sodium"
msgstr "Sodyum"
-#: nutrition/templates/ingredient/view.html:143
-#: nutrition/templates/units/list.html:50 nutrition/views/unit.py:86
+#: nutrition/templates/ingredient/view.html:136
+#, fuzzy
+#| msgid "Click here for more information"
+msgid "Dietary information"
+msgstr "Daha fazla bilgi için buraya tıklayın"
+
+#: nutrition/templates/ingredient/view.html:184
msgid "Add new weight unit"
msgstr "Yeni ağırlık birimi ekle"
-#: nutrition/templates/rate/form.html:25
+#: nutrition/templates/rate/form.html:26
msgid "Basal metabolic rate"
msgstr "Bazal metabolik oran"
-#: nutrition/templates/rate/form.html:26
+#: nutrition/templates/rate/form.html:27
msgid ""
"The basal metabolic rate is the amount of energy expended daily\n"
"at rest. This is the minimum energy needed for the body to function, without "
@@ -2291,15 +2376,15 @@ msgstr ""
"minimum enerjidir.\n"
"ek fiziksel aktivite."
-#: nutrition/templates/rate/form.html:37
+#: nutrition/templates/rate/form.html:38
msgid "Your basic metabolic rate is: "
msgstr "Temel metabolizma hızınız: "
-#: nutrition/templates/rate/form.html:47
+#: nutrition/templates/rate/form.html:48
msgid "Physical activities"
msgstr "Fiziksel aktiviteler"
-#: nutrition/templates/rate/form.html:48
+#: nutrition/templates/rate/form.html:49
msgid ""
"The physical activity level (PAL) is a factor used to to express\n"
"the additional physical activity and is used to calculate the total energy\n"
@@ -2309,11 +2394,11 @@ msgstr ""
"ek fiziksel aktivite ve toplam enerjiyi hesaplamak için kullanılır\n"
"günlük gerekli."
-#: nutrition/templates/rate/form.html:59
+#: nutrition/templates/rate/form.html:60
msgid "Factor for daily activities: "
msgstr "Günlük aktiviteler için faktör: "
-#: nutrition/templates/rate/form.html:67
+#: nutrition/templates/rate/form.html:68
msgid ""
"The base caloric intake is the amount of calories your metabolism\n"
"needs based on your level of physical activity."
@@ -2321,11 +2406,11 @@ msgstr ""
"Temel kalori alımı metabolizmanızın kalori miktarıdır.\n"
"fiziksel aktivite seviyenize göre ihtiyaçlar."
-#: nutrition/templates/rate/form.html:81
+#: nutrition/templates/rate/form.html:82
msgid "Calculate basic caloric intake"
msgstr "Temel kalori alımını hesaplayın"
-#: nutrition/templates/rate/form.html:88
+#: nutrition/templates/rate/form.html:89
msgid ""
"The total calories are the actual total calories per day. This\n"
"might include e.g. a surplus or deficit if you are bulking or cutting. "
@@ -2337,19 +2422,19 @@ msgstr ""
"Alternatif olarak\n"
"Değeri biliyorsanız, kendinize kalori miktarını girebilirsiniz."
-#: nutrition/templates/rate/form.html:102
+#: nutrition/templates/rate/form.html:103
msgid "Transfer basic intake to total daily calories"
msgstr "Temel alımı toplam günlük kaloriye aktarın"
-#: nutrition/templates/rate/form.html:106
+#: nutrition/templates/rate/form.html:107
msgid "Add additional calories to total daily calories"
msgstr "Toplam günlük kaloriye ek kalori ekleyin"
-#: nutrition/templates/rate/form.html:110
+#: nutrition/templates/rate/form.html:111
msgid "Save total calories to profile"
msgstr "Toplam kaloriyi profile kaydedin"
-#: nutrition/templates/rate/form.html:121
+#: nutrition/templates/rate/form.html:122
msgid ""
"Please note that these calculations can only be an\n"
"approximation. If you base your nutrition plan on these values, observe\n"
@@ -2359,48 +2444,48 @@ 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:158
+#: nutrition/views/ingredient.py:163
msgid "Add a new ingredient"
msgstr "Yeni bir malzeme ekle"
-#: nutrition/views/plan.py:128
+#: nutrition/views/plan.py:127
msgid "Nutritional plan"
msgstr "Beslenme planı"
-#: nutrition/views/plan.py:130
+#: nutrition/views/plan.py:129
#, python-format
msgid "Nutritional plan for %s"
msgstr "%s için beslenme planı"
-#: nutrition/views/plan.py:202
+#: nutrition/views/plan.py:201
msgid "<i>This is an empty plan, what did you expect on the PDF?</i>"
msgstr "<i>Bu boş bir plan, PDF'den ne bekliyordunuz?</i>"
-#: nutrition/views/plan.py:230
+#: nutrition/views/plan.py:229
msgid "Nutritional data"
msgstr "Beslenme verileri"
-#: nutrition/views/plan.py:238
+#: nutrition/views/plan.py:237
msgid "Total"
msgstr "Toplamda"
-#: nutrition/views/plan.py:239
+#: nutrition/views/plan.py:238
msgid "Percent of energy"
msgstr "Enerji yüzdesi"
-#: nutrition/views/plan.py:240
+#: nutrition/views/plan.py:239
msgid "g per body kg"
msgstr "g vücut kg"
-#: nutrition/views/unit_ingredient.py:69
+#: nutrition/views/unit_ingredient.py:64
msgid "Add a new weight unit"
msgstr "Yeni bir ağırlık birimi ekleyin"
-#: nutrition/views/unit_ingredient.py:106
+#: nutrition/views/unit_ingredient.py:99
msgid "Edit a weight unit to ingredient connection"
msgstr "Ağırlık birimini bileşen bağlantısına göre düzenleyin"
-#: nutrition/views/unit_ingredient.py:138
+#: nutrition/views/unit_ingredient.py:129
msgid "Delete?"
msgstr "Sil?"
@@ -2799,7 +2884,7 @@ msgstr "Kaynak Kodları"
msgid "Translation"
msgstr "Çeviri"
-#: utils/generic_views.py:263
+#: utils/generic_views.py:246
msgid "Yes, delete"
msgstr "Evet, sil"
@@ -2853,10 +2938,6 @@ msgstr "Kilonuzu girmelisiniz"
msgid "Import weight logs"
msgstr "Kilo günlüklerini içe aktar"
-#: weight/templates/import_csv_form.html:9
-msgid "Submit"
-msgstr "Sunmak"
-
#: weight/templates/import_csv_form.html:15
msgid ""
"Use this import field to import your weight logs into Workout\n"
@@ -2980,6 +3061,36 @@ msgstr ""
msgid "Re-Submit"
msgstr "Yeniden Gönder"
+#~ msgid "Email verification"
+#~ msgstr "E-posta doğrulaması"
+
+#, python-format
+#~ msgid "%(username)s, your email was verified"
+#~ msgstr "%(username)s, e-posta adresiniz doğrulandı"
+
+#~ msgid "Error, invalid verification token"
+#~ msgstr "Hata, geçersiz doğrulama belirteci"
+
+#~ msgid "Email Confirmation"
+#~ msgstr "E-posta Doğrulaması"
+
+#, python-format
+#~ msgid "You are almost there, %(username)s!"
+#~ msgstr "%(username)s, neredeyse bitirdiniz!"
+
+#, python-format
+#~ msgid "Please click <a href=\"%(link)s\">here</a> to confirm your email"
+#~ msgstr ""
+#~ "E-posta adresinizi doğrulamak için lütfen <a href=\"%(link)s\">buraya</a> "
+#~ "tıklayın"
+
+#, python-format
+#~ msgid "The token expires on %(time)s"
+#~ msgstr "Belirtecin süresi %(time)s tarihinde doluyor"
+
+#~ msgid "Ingredient weight units"
+#~ msgstr "İçerik ağırlık birimleri"
+
#~ msgid "Image"
#~ msgstr "Resim"
@@ -3010,9 +3121,6 @@ msgstr "Yeniden Gönder"
#~ msgid "Secondary muscles"
#~ msgstr "İkincil kaslar"
-#~ msgid "Variations"
-#~ msgstr "Varyasyonlar"
-
#~ msgid "Exercise Categories"
#~ msgstr "Egzersiz Kategorileri"
@@ -4083,9 +4191,6 @@ msgstr "Yeniden Gönder"
#~ msgid "This content is available under the following license:"
#~ msgstr "Bu içerik aşağıdaki lisans altında mevcuttur:"
-#~ msgid "Click here for more information"
-#~ msgstr "Daha fazla bilgi için buraya tıklayın"
-
#, python-format
#~ msgid "%(name)s is too similar to existing exercise \"%(exercise_name)s\""
#~ msgstr "%(name)s, mevcut \"%(exercise_name)s\" egzersizine çok benziyor"
@@ -4798,9 +4903,6 @@ msgstr "Yeniden Gönder"
#~ msgid "Last 12 months"
#~ msgstr "Son 12 ay"
-#~ msgid "No filter"
-#~ msgstr "Filtresiz"
-
#~ msgid "Days"
#~ msgstr "Günler"
diff --git a/wger/locale/uk/LC_MESSAGES/django.po b/wger/locale/uk/LC_MESSAGES/django.po
index 3a52cfb5c..9c88beef2 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: 2026-01-17 14:03+0000\n"
+"POT-Creation-Date: 2026-04-10 10:20+0000\n"
"PO-Revision-Date: 2026-01-19 13:01+0000\n"
"Last-Translator: Максим Горпиніч <[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 5.16-dev\n"
#: config/models/gym_config.py:46 gym/templates/gym/list.html:56
@@ -42,7 +42,7 @@ msgstr ""
#: config/views/gym_config.py:42 core/templates/language/view.html:64
#: core/templates/license/list.html:17
#: core/templates/repetition_unit/list.html:18
-#: core/templates/user/overview.html:204 core/templates/user/overview.html:467
+#: core/templates/user/overview.html:207 core/templates/user/overview.html:470
#: core/templates/weight_unit/list.html:18
#: exercises/templates/categories/admin-overview.html:17
#: exercises/templates/equipment/admin-overview.html:17
@@ -54,30 +54,29 @@ msgstr ""
#: gym/templates/gym/list.html:19 gym/templates/gym/list.html:48
#: gym/templates/gym/member_list.html:94 gym/templates/gym/member_list.html:152
#: gym/templates/gym/member_list.html:190
-#: nutrition/templates/ingredient/view.html:164
-#: nutrition/templates/ingredient/view.html:209
-#: nutrition/templates/units/list.html:19
+#: nutrition/templates/ingredient/view.html:205
+#: nutrition/templates/ingredient/view.html:248
msgid "Edit"
msgstr "Змінити"
-#: core/forms.py:91 core/templates/navigation.html:271
-#: core/templates/navigation.html:278 core/templates/user/login.html:4
+#: core/forms.py:89 core/templates/navigation.html:268
+#: core/templates/navigation.html:275 core/templates/user/login.html:4
#: core/templates/user/registration_sidebar.html:12
#: software/templates/features.html:82 software/templates/features.html:448
msgid "Login"
msgstr "Вхід"
-#: core/forms.py:130 core/forms.py:244 gym/views/export.py:61
+#: core/forms.py:128 core/forms.py:242 gym/views/export.py:61
#: gym/views/gym.py:217
msgid "First name"
msgstr "Ім'я"
-#: core/forms.py:131 core/forms.py:245 core/templates/user/overview.html:284
+#: core/forms.py:129 core/forms.py:243 core/templates/user/overview.html:287
#: gym/views/export.py:62 gym/views/gym.py:217
msgid "Last name"
msgstr "Прізвище"
-#: core/forms.py:133 core/forms.py:210 core/templates/user/overview.html:288
+#: core/forms.py:131 core/forms.py:208 core/templates/user/overview.html:291
#: gym/models/contract.py:256 gym/models/gym.py:58
#: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:116
#: gym/templates/gym/new_user.html:30 gym/views/export.py:60
@@ -87,57 +86,57 @@ msgstr "Прізвище"
msgid "Email"
msgstr "Адреса електронної пошти"
-#: core/forms.py:134
+#: core/forms.py:132
msgid "Used for password resets and, optionally, e-mail reminders."
msgstr ""
"Використовується для скидання пароля і, і за необхідності, нагадування "
"електронною поштою."
-#: core/forms.py:138 core/models/profile.py:222
+#: core/forms.py:136 core/models/profile.py:222
#: gym/templates/gym/new_user.html:38
msgid "Date of Birth"
msgstr "Дата народження"
-#: core/forms.py:177
+#: core/forms.py:175
msgid "Personal data"
msgstr "Особисті дані"
-#: core/forms.py:189
+#: core/forms.py:187
msgid "Workout reminders"
msgstr "Нагадування про тренування"
-#: core/forms.py:196
+#: core/forms.py:194
msgid "Other settings"
msgstr "Інші параметри"
-#: core/forms.py:204 core/views/user.py:614 core/views/user.py:629
-#: core/views/user.py:641 gym/forms.py:73 utils/generic_views.py:143
+#: core/forms.py:202 core/views/user.py:630 core/views/user.py:654
+#: core/views/user.py:668 gym/forms.py:73 utils/generic_views.py:137
msgid "Save"
msgstr "Зберегти"
-#: core/forms.py:211
+#: core/forms.py:209
msgid "Used for password resets and, optionally, email reminders."
msgstr ""
"Використовується для скидання пароля і, при необхідності, нагадування "
"електронною поштою."
-#: core/forms.py:240
+#: core/forms.py:238
msgid "This e-mail address is already in use."
msgstr "Ця адреса електронної пошти вже використовується."
-#: core/forms.py:261 gym/templates/gym/new_user.html:26
+#: core/forms.py:259 gym/templates/gym/new_user.html:26
#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:217
msgid "Password"
msgstr "Пароль"
-#: core/forms.py:263
+#: core/forms.py:261
msgid "Please enter your current password."
msgstr "Введіть свій поточний пароль."
-#: core/forms.py:272 core/templates/language/view.html:70
+#: core/forms.py:270 core/templates/language/view.html:70
#: core/templates/license/list.html:21
#: core/templates/repetition_unit/list.html:22
-#: core/templates/user/overview.html:233
+#: core/templates/user/overview.html:236
#: core/templates/weight_unit/list.html:22
#: exercises/templates/categories/admin-overview.html:21
#: exercises/templates/equipment/admin-overview.html:21
@@ -145,27 +144,30 @@ msgstr "Введіть свій поточний пароль."
#: gym/templates/admin_notes/list.html:37
#: gym/templates/contract_option/list.html:35
#: gym/templates/contract_type/list.html:36 gym/templates/document/list.html:46
-#: gym/templates/gym/list.html:23 nutrition/templates/ingredient/view.html:168
-#: nutrition/templates/ingredient/view.html:215
-#: nutrition/templates/units/list.html:25
+#: gym/templates/gym/list.html:23 nutrition/templates/ingredient/view.html:209
+#: nutrition/templates/ingredient/view.html:254
msgid "Delete"
msgstr "Вилучити"
-#: core/forms.py:281
+#: core/forms.py:279
msgid "Invalid password"
msgstr "Неправильний пароль"
-#: core/forms.py:293
+#: core/forms.py:291 core/forms.py:349
msgid "The form is secured with reCAPTCHA"
msgstr "Форма захищена reCAPTCHA"
-#: core/forms.py:314 core/forms.py:341 core/templates/navigation.html:272
-#: core/templates/navigation.html:285 core/templates/template.html:123
-#: core/templates/user/login.html:21 core/views/user.py:285
+#: core/forms.py:312 core/forms.py:339 core/templates/navigation.html:269
+#: core/templates/navigation.html:282 core/templates/template.html:113
+#: core/templates/user/login.html:21 core/views/user.py:293
#: software/templates/features.html:87 software/templates/features.html:442
msgid "Register"
msgstr "Зареєструватись"
+#: core/forms.py:360 weight/templates/import_csv_form.html:9
+msgid "Submit"
+msgstr "Надіслати"
+
#: core/models/language.py:31 core/templates/language/view.html:21
msgid "Language short name"
msgstr "Коротке позначення мови"
@@ -202,36 +204,36 @@ msgstr "Посилання"
msgid "Link to license text or other information"
msgstr "Посилання на текст ліцензії чи іншу інформацію"
-#: core/models/profile.py:57
+#: core/models/profile.py:60
#, python-format
msgid "%(birthdate)s is not a valid birthdate"
msgstr "%(birthdate)s це недійсно вказана дата народження"
-#: core/models/profile.py:66
+#: core/models/profile.py:69
msgid "Male"
msgstr "Чоловік"
-#: core/models/profile.py:67
+#: core/models/profile.py:70
msgid "Female"
msgstr "Жінка"
-#: core/models/profile.py:74
+#: core/models/profile.py:77
msgid "Low"
msgstr "Низький"
-#: core/models/profile.py:75
+#: core/models/profile.py:78
msgid "Medium"
msgstr "Середній"
-#: core/models/profile.py:76
+#: core/models/profile.py:79
msgid "High"
msgstr "Високий"
-#: core/models/profile.py:82
+#: core/models/profile.py:85
msgid "Metric (kilogram)"
msgstr "Метричні (кілограм)"
-#: core/models/profile.py:83
+#: core/models/profile.py:86
msgid "Imperial (pound)"
msgstr "Імперичні (фунт)"
@@ -349,7 +351,7 @@ msgstr "Середня кількість годин на тиждень"
msgid "Free time"
msgstr "Вільний час"
-#: core/models/profile.py:320 nutrition/templates/rate/form.html:66
+#: core/models/profile.py:320 nutrition/templates/rate/form.html:67
msgid "Total daily calories"
msgstr "Денна кількість калорій"
@@ -391,20 +393,45 @@ msgstr "Увімкнути трофеї"
msgid "Enable or disable the trophy system for this user"
msgstr "Увімкнути або вимкнути систему трофеїв для цього користувача"
-#: core/models/profile.py:446
+#: core/models/profile.py:457
msgid "The sum of all hours has to be 24"
msgstr "Сума всіх годин повинна дорівнювати 24"
-#: core/models/rep_unit.py:36 core/models/weight_unit.py:42
-#: core/templates/user/overview.html:280 core/views/user.py:589
+#: core/models/rep_unit.py:32 i18n.tpl:30
+msgid "Repetitions"
+msgstr "Повтори"
+
+#: core/models/rep_unit.py:33 core/templates/user/overview.html:82
+#: exercises/templates/history/overview.html:30
+msgid "Time"
+msgstr "Час"
+
+#: core/models/rep_unit.py:34
+#, fuzzy
+#| msgid "Resistance band"
+msgid "Distance"
+msgstr "Еспандер"
+
+#: core/models/rep_unit.py:47 core/models/weight_unit.py:42
+#: core/templates/user/overview.html:283 core/views/user.py:605
#: exercises/models/muscle.py:36 gym/models/contract.py:52
#: gym/models/contract.py:103 gym/models/gym.py:46
#: gym/models/user_document.py:84 gym/templates/contract/view.html:50
#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:108
-#: gym/views/gym.py:158 nutrition/templates/ingredient/view.html:151
+#: gym/views/gym.py:158 nutrition/templates/ingredient/view.html:192
msgid "Name"
msgstr "Ім'я"
+#: core/models/rep_unit.py:53
+#, fuzzy
+#| msgid "Unit"
+msgid "Unit Type"
+msgstr "Одиниця"
+
+#: core/models/rep_unit.py:54
+msgid "The type of unit (repetitions, time, or distance)"
+msgstr ""
+
#: core/templates/403.html:4
msgid "Forbidden!"
msgstr "Заборонено!"
@@ -435,6 +462,57 @@ msgstr ""
"веб-переглядач. Якщо це не допоможе, повторіть спробу пізніше. Якщо проблема "
"не зникає, Ви можете звернутися за допомогою зазначеними нижче способами:"
+#: core/templates/account/email/email_confirmation_message.html:81
+msgid "Almost there!"
+msgstr ""
+
+#: core/templates/account/email/email_confirmation_message.html:85
+#, fuzzy, python-format
+#| msgid ""
+#| "You're receiving this e-mail because you requested a password reset for "
+#| "your user account at %(site_name)s."
+msgid ""
+"You're receiving this email because the user \"%(user_display)s\" has given "
+"your email address to register an account on %(site_domain)s."
+msgstr ""
+"Ви отримали цей лист, тому що ви зробили запит на відновлення пароля для "
+"облікового запису користувача на %(site_name)s."
+
+#: core/templates/account/email/email_confirmation_message.html:93
+msgid ""
+"Your email verification code is listed below. Please enter it in your open "
+"browser window."
+msgstr ""
+
+#: core/templates/account/email/email_confirmation_message.html:100
+#, fuzzy
+#| msgid "Please click the following link to confirm your email: %(link)s"
+msgid "Please click the button below to confirm your email address."
+msgstr ""
+"Будь ласка, перейдіть за наступним посиланням, щоб підтвердити свою "
+"електронну пошту: %(link)s"
+
+#: core/templates/account/email/email_confirmation_message.html:106
+#, fuzzy
+#| msgid "Unverified email"
+msgid "Confirm email"
+msgstr "Непідтверджена електронна пошта"
+
+#: core/templates/account/email/email_confirmation_message.html:110
+#, python-format
+msgid ""
+"The link is valid for %(expire_hours)s hours (until %(date)s, %(time)s). You "
+"can request a new one from your profile settings."
+msgstr ""
+
+#: core/templates/account/email/email_confirmation_message.html:116
+msgid "If the button doesn't work, copy and paste this link into your browser:"
+msgstr ""
+
+#: core/templates/account/email/email_confirmation_message.html:125
+msgid "the wger Team"
+msgstr "Команда wger"
+
#: core/templates/base.html:10
#, python-format
msgid ""
@@ -468,55 +546,7 @@ 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 verification"
-msgstr "Підтвердження E-mail"
-
-#: core/templates/email_verification/confirm_template.html:18
-#, python-format
-msgid "%(username)s, your email was verified"
-msgstr "%(username)s, ваша електронна пошта була підтверджена"
-
-#: 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 "Ви вже майже на місці, %(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 ""
-"Будь ласка, натисніть <a href=\"%(link)s\">тут</a>, щоб підтвердити свою "
-"електронну пошту"
-
-#: 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 "Строк дії токена спливає %(time)s"
-
-#: core/templates/email_verification/email_body_html.tpl:14
-#: core/templates/email_verification/email_body_txt.tpl:8
-msgid "the wger Team"
-msgstr "Команда wger"
-
-#: core/templates/email_verification/email_body_txt.tpl:4
-#, python-format
-msgid "Please click the following link to confirm your email: %(link)s"
-msgstr ""
-"Будь ласка, перейдіть за наступним посиланням, щоб підтвердити свою "
-"електронну пошту: %(link)s"
-
-#: core/templates/language/overview.html:4 core/templates/navigation.html:344
+#: core/templates/language/overview.html:4 core/templates/navigation.html:341
msgid "Languages"
msgstr "Мови"
@@ -525,16 +555,16 @@ msgid "Nothing found."
msgstr "Нічого не знайдено."
#: core/templates/language/overview.html:22
-#: nutrition/templates/ingredient/overview.html:38
+#: nutrition/templates/ingredient/overview.html:43
msgid "Add one now."
msgstr "Додати зараз."
#: core/templates/language/overview.html:34 core/templates/license/list.html:43
-#: core/templates/repetition_unit/list.html:46
-#: core/templates/user/overview.html:344 core/templates/user/overview.html:384
-#: core/templates/user/overview.html:422
-#: core/templates/weight_unit/list.html:46 core/views/languages.py:74
-#: core/views/license.py:66 core/views/repetition_units.py:66
+#: core/templates/repetition_unit/list.html:44
+#: core/templates/user/overview.html:347 core/templates/user/overview.html:387
+#: core/templates/user/overview.html:425
+#: core/templates/weight_unit/list.html:46 core/views/languages.py:77
+#: core/views/license.py:66 core/views/repetition_units.py:76
#: core/views/weight_units.py:66
#: exercises/templates/categories/admin-overview.html:40
#: exercises/templates/equipment/admin-overview.html:39
@@ -547,14 +577,14 @@ msgstr "Додати зараз."
#: gym/templates/gym/member_list.html:264
#: gym/templates/gym/member_list.html:303
#: mailer/templates/mailer/gym/overview.html:43
-#: nutrition/templates/ingredient/overview.html:60
+#: nutrition/templates/ingredient/overview.html:97
msgid "Add"
msgstr "Додати"
#: core/templates/language/view.html:61 core/templates/user/api_key.html:41
#: core/templates/user/preferences.html:50 gym/models/contract.py:203
#: gym/templates/contract/view.html:41 gym/templates/gym/member_list.html:270
-#: nutrition/templates/ingredient/view.html:206
+#: nutrition/templates/ingredient/view.html:245
msgid "Options"
msgstr "Параметри"
@@ -564,9 +594,9 @@ msgstr "Список ліцензій"
#: core/templates/license/list.html:30
#: core/templates/repetition_unit/list.html:32
-#: core/templates/user/overview.html:104 core/templates/user/overview.html:136
-#: core/templates/user/overview.html:185 core/templates/user/overview.html:365
-#: core/templates/user/overview.html:404 core/templates/user/overview.html:448
+#: core/templates/user/overview.html:107 core/templates/user/overview.html:139
+#: core/templates/user/overview.html:188 core/templates/user/overview.html:368
+#: core/templates/user/overview.html:407 core/templates/user/overview.html:451
#: core/templates/weight_unit/list.html:32
#: exercises/templates/categories/admin-overview.html:30
#: exercises/templates/equipment/admin-overview.html:30
@@ -578,11 +608,10 @@ msgstr "Список ліцензій"
#: gym/templates/gym/member_list.html:284
#: gym/templates/gym/member_list.html:321
#: mailer/templates/mailer/gym/overview.html:30
-#: nutrition/templates/units/list.html:34
msgid "Nothing found"
msgstr "Нічого не знайдено"
-#: core/templates/misc/about.html:4 core/templates/template.html:160
+#: core/templates/misc/about.html:4 core/templates/template.html:150
msgid "Imprint"
msgstr "Відбиток"
@@ -590,162 +619,157 @@ msgstr "Відбиток"
msgid "Training"
msgstr "Тренування"
-#: core/templates/navigation.html:37 core/templates/user/overview.html:25
+#: core/templates/navigation.html:36 core/templates/user/overview.html:28
msgid "Routines"
msgstr "Рутини"
-#: core/templates/navigation.html:45 core/templates/user/overview.html:70
+#: core/templates/navigation.html:44 core/templates/user/overview.html:73
msgid "Calendar"
msgstr "Календар"
-#: core/templates/navigation.html:55
+#: core/templates/navigation.html:53
msgid "Measurements"
msgstr "Вимірювання"
-#: core/templates/navigation.html:66 gallery/templates/images/overview.html:6
+#: core/templates/navigation.html:64 gallery/templates/images/overview.html:6
msgid "Gallery"
msgstr "Галерея"
-#: core/templates/navigation.html:72
+#: core/templates/navigation.html:74 core/templates/navigation.html:400
+#: trophies/templates/trophies/overview.html:7
+msgid "Trophies"
+msgstr "Трофеї"
+
+#: core/templates/navigation.html:79
msgid "Workout templates"
msgstr "Шаблони тренувань"
-#: core/templates/navigation.html:79
+#: core/templates/navigation.html:86
msgid "Your templates"
msgstr "Ваші шаблони"
-#: core/templates/navigation.html:88
+#: core/templates/navigation.html:95
msgid "Public templates"
msgstr "Загальнодоступні шаблони"
-#: core/templates/navigation.html:96 software/templates/features.html:51
+#: core/templates/navigation.html:103 software/templates/features.html:51
#: software/templates/features.html:480
msgid "Exercises"
msgstr "Вправи"
-#: core/templates/navigation.html:102 core/templates/navigation.html:176
-#: core/templates/navigation.html:339
+#: core/templates/navigation.html:109 core/templates/navigation.html:336
msgid "Administration"
msgstr "Адміністрація"
-#: core/templates/navigation.html:106
+#: core/templates/navigation.html:113
msgid "Exercise edit history"
msgstr "Історія редагування вправи"
-#: core/templates/navigation.html:112
+#: core/templates/navigation.html:119
msgid "Equipment"
msgstr "Обладнання"
-#: core/templates/navigation.html:118
+#: core/templates/navigation.html:125
msgid "Muscles"
msgstr "М'язи"
-#: core/templates/navigation.html:124
+#: core/templates/navigation.html:131
#: exercises/templates/categories/admin-overview.html:4
msgid "Categories"
msgstr "Категорії"
-#: core/templates/navigation.html:139 software/templates/features.html:468
+#: core/templates/navigation.html:146 software/templates/features.html:468
msgid "Nutrition"
msgstr "Харчування"
-#: core/templates/navigation.html:147 core/templates/user/overview.html:144
+#: core/templates/navigation.html:154 core/templates/user/overview.html:147
msgid "Nutrition plans"
msgstr "Плани харчування"
-#: core/templates/navigation.html:156
+#: core/templates/navigation.html:163
msgid "BMI calculator"
msgstr "Калькулятор індексу маси тіла"
-#: core/templates/navigation.html:165 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:172 nutrition/templates/rate/form.html:18
msgid "Daily calories calculator"
msgstr "Калькулятор щоденних калорій"
-#: core/templates/navigation.html:171
+#: core/templates/navigation.html:178
#: nutrition/templates/ingredient/overview.html:10
msgid "Ingredient overview"
msgstr "Огляд інгредієнтів"
-#: core/templates/navigation.html:180 nutrition/templates/units/list.html:6
-msgid "Ingredient weight units"
-msgstr "Одиниці ваги інгредієнтів"
-
-#: core/templates/navigation.html:196 software/templates/features.html:463
+#: core/templates/navigation.html:193 software/templates/features.html:463
msgid "Body weight"
msgstr "Вага тіла"
-#: core/templates/navigation.html:203 core/templates/user/overview.html:114
+#: core/templates/navigation.html:200 core/templates/user/overview.html:117
msgid "Weight overview"
msgstr "Огляд ваги"
-#: core/templates/navigation.html:217
+#: core/templates/navigation.html:214
msgid "About this software"
msgstr "Про це програмне забезпечення"
-#: core/templates/navigation.html:223 software/templates/about_us.html:5
+#: core/templates/navigation.html:220 software/templates/about_us.html:5
msgid "Support & Get Involved"
msgstr "Підтримайте та долучайтеся"
-#: core/templates/navigation.html:229 software/templates/features.html:528
+#: core/templates/navigation.html:226 software/templates/features.html:528
msgid "REST API"
msgstr "REST API"
-#: core/templates/navigation.html:235 utils/models.py:45
+#: core/templates/navigation.html:232 utils/models.py:45
msgid "License"
msgstr "Ліцензія"
-#: core/templates/navigation.html:241
+#: core/templates/navigation.html:238
msgid "Developer documentation"
msgstr "Документація для розробників"
-#: core/templates/navigation.html:248
+#: core/templates/navigation.html:245
msgid "Get the code"
msgstr "Отримати код"
-#: core/templates/navigation.html:255 core/templates/template.html:199
-#: software/templates/features.html:603
+#: core/templates/navigation.html:252 core/templates/template.html:202
+#: software/templates/features.html:614
msgid "Translate"
msgstr "Перекласти"
-#: core/templates/navigation.html:292 core/templates/user/login.html:30
+#: core/templates/navigation.html:289 core/templates/user/login.html:30
msgid "Reset password"
msgstr "Скинути пароль"
-#: core/templates/navigation.html:301 core/templates/navigation.html:329
+#: core/templates/navigation.html:298 core/templates/navigation.html:326
msgid "Logout"
msgstr "Вийти"
-#: core/templates/navigation.html:320
+#: core/templates/navigation.html:317
msgid "My preferences"
msgstr "Мої налаштування"
-#: core/templates/navigation.html:352
+#: core/templates/navigation.html:349
msgid "Licenses"
msgstr "Ліцензії"
-#: core/templates/navigation.html:360
+#: core/templates/navigation.html:357
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr "Одиниці повторень"
-#: core/templates/navigation.html:368 core/templates/weight_unit/list.html:4
-#: nutrition/templates/ingredient/view.html:141
+#: core/templates/navigation.html:365 core/templates/weight_unit/list.html:4
+#: nutrition/templates/ingredient/view.html:182
msgid "Weight units"
msgstr "Одиниця ваги"
-#: core/templates/navigation.html:376 core/templates/user/list.html:4
+#: core/templates/navigation.html:373 core/templates/user/list.html:4
msgid "User list"
msgstr "Список користувачів"
-#: core/templates/navigation.html:382
+#: core/templates/navigation.html:379
msgid "Gyms"
msgstr "Тренажерні зали"
-#: core/templates/navigation.html:403
-#: trophies/templates/trophies/overview.html:7
-msgid "Trophies"
-msgstr "Трофеї"
-
#: core/templates/registration/password_reset_complete.html:4
msgid "Password reset complete"
msgstr "Відновлення пароля завершено"
@@ -805,27 +829,31 @@ msgstr "назад"
msgid "next"
msgstr "вперед"
-#: core/templates/template.html:96
+#: core/templates/template.html:86
msgid "Close"
msgstr "Закрити"
-#: core/templates/template.html:112
+#: core/templates/template.html:102
msgid ""
"You are using a guest account, data entered will be deleted after a week."
msgstr ""
"Ви використовуєте обліковий запис гостя, введені дані будуть видалені через "
"тиждень."
-#: core/templates/template.html:117
+#: core/templates/template.html:107
msgid "Create some demo entries"
msgstr "Створіть деякі демонстраційні записи"
-#: core/templates/template.html:165 software/templates/features.html:568
+#: core/templates/template.html:155 software/templates/features.html:568
#: software/templates/tos.html:7
msgid "Terms of service"
msgstr "Умови надання послуг"
-#: core/templates/template_features.html:53 software/templates/features.html:9
+#: core/templates/template.html:181 software/templates/features.html:595
+msgid "Browser language"
+msgstr ""
+
+#: core/templates/template_features.html:46 software/templates/features.html:9
msgid "Features"
msgstr "Особливості"
@@ -884,99 +912,94 @@ msgstr "Немає облікового запису?"
msgid "Forgot password?"
msgstr "Забули пароль?"
-#: core/templates/user/overview.html:25 core/templates/user/overview.html:68
-#: core/templates/user/overview.html:112 core/templates/user/overview.html:144
-#: core/templates/user/overview.html:348 core/templates/user/overview.html:390
-#: core/templates/user/overview.html:426
+#: core/templates/user/overview.html:28 core/templates/user/overview.html:71
+#: core/templates/user/overview.html:115 core/templates/user/overview.html:147
+#: core/templates/user/overview.html:351 core/templates/user/overview.html:393
+#: core/templates/user/overview.html:429
#, python-format
msgid "last %(number)s"
msgstr "останні %(number)s"
-#: core/templates/user/overview.html:27 core/templates/user/overview.html:146
-#: core/templates/user/overview.html:343 core/templates/user/overview.html:382
-#: core/templates/user/overview.html:421 gym/templates/gym/member_list.html:226
+#: core/templates/user/overview.html:30 core/templates/user/overview.html:149
+#: core/templates/user/overview.html:346 core/templates/user/overview.html:385
+#: core/templates/user/overview.html:424 gym/templates/gym/member_list.html:226
#: gym/templates/gym/member_list.html:262
#: gym/templates/gym/member_list.html:302
msgid "Overview"
msgstr "Огляд"
-#: core/templates/user/overview.html:34 core/templates/user/overview.html:76
-#: core/templates/user/overview.html:120 core/templates/user/overview.html:152
+#: core/templates/user/overview.html:37 core/templates/user/overview.html:79
+#: core/templates/user/overview.html:123 core/templates/user/overview.html:155
#: manager/helpers.py:88 software/templates/about_us.html:170
#: weight/templates/import_csv_preview.html:13
#: weight/templates/import_csv_preview.html:42 weight/views.py:54
msgid "Date"
msgstr "Дата"
-#: core/templates/user/overview.html:35 core/templates/user/overview.html:153
+#: core/templates/user/overview.html:38 core/templates/user/overview.html:156
#: gym/models/contract.py:58 gym/models/contract.py:109
msgid "Description"
msgstr "Опис"
-#: core/templates/user/overview.html:36
+#: core/templates/user/overview.html:39
msgid "Number of logs (days)"
msgstr "Кількість записів (днів)"
-#: core/templates/user/overview.html:37 core/views/user.py:590
+#: core/templates/user/overview.html:40 core/views/user.py:606
#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:158
msgid "Last activity"
msgstr "Остання активність"
-#: core/templates/user/overview.html:58
+#: core/templates/user/overview.html:61
msgid "No workouts found."
msgstr "Не знайдено жодних тренувань."
-#: core/templates/user/overview.html:68
+#: core/templates/user/overview.html:71
msgid "Log"
msgstr "Журнал"
-#: core/templates/user/overview.html:77
+#: core/templates/user/overview.html:80
msgid "General impression"
msgstr "Загальне враження"
-#: core/templates/user/overview.html:78 core/templates/user/overview.html:390
+#: core/templates/user/overview.html:81 core/templates/user/overview.html:393
msgid "Notes"
msgstr "Примітки"
-#: core/templates/user/overview.html:79
-#: exercises/templates/history/overview.html:30
-msgid "Time"
-msgstr "Час"
-
-#: core/templates/user/overview.html:112 core/templates/user/overview.html:121
+#: core/templates/user/overview.html:115 core/templates/user/overview.html:124
#: manager/helpers.py:89 weight/templates/import_csv_preview.html:14
#: weight/templates/import_csv_preview.html:43 weight/views.py:54
msgid "Weight"
msgstr "Вага"
-#: core/templates/user/overview.html:154
-#: nutrition/templates/ingredient/view.html:51 nutrition/views/plan.py:245
+#: core/templates/user/overview.html:157
+#: nutrition/templates/ingredient/view.html:52 nutrition/views/plan.py:244
msgid "Energy"
msgstr "Енергія"
-#: core/templates/user/overview.html:155
-#: nutrition/templates/ingredient/view.html:58 nutrition/views/plan.py:251
+#: core/templates/user/overview.html:158
+#: nutrition/templates/ingredient/view.html:59 nutrition/views/plan.py:250
msgid "Protein"
msgstr "Білок"
-#: core/templates/user/overview.html:156
-#: nutrition/templates/ingredient/view.html:64 nutrition/views/plan.py:259
+#: core/templates/user/overview.html:159
+#: nutrition/templates/ingredient/view.html:65 nutrition/views/plan.py:258
msgid "Carbohydrates"
msgstr "Вуглеводи"
-#: core/templates/user/overview.html:157
-#: nutrition/templates/ingredient/view.html:80 nutrition/views/plan.py:273
+#: core/templates/user/overview.html:160
+#: nutrition/templates/ingredient/view.html:81 nutrition/views/plan.py:272
msgid "Fat"
msgstr "Жири"
-#: core/templates/user/overview.html:170
-#: nutrition/templates/ingredient/view.html:53
+#: core/templates/user/overview.html:173
+#: nutrition/templates/ingredient/view.html:54
msgid "kcal"
msgstr "ккал"
-#: core/templates/user/overview.html:201 core/templates/user/overview.html:340
-#: core/templates/user/overview.html:379 core/templates/user/overview.html:418
-#: core/templates/user/overview.html:463 gym/templates/gym/list.html:45
+#: core/templates/user/overview.html:204 core/templates/user/overview.html:343
+#: core/templates/user/overview.html:382 core/templates/user/overview.html:421
+#: core/templates/user/overview.html:466 gym/templates/gym/list.html:45
#: gym/templates/gym/member_list.html:91 gym/templates/gym/member_list.html:149
#: gym/templates/gym/member_list.html:187
#: gym/templates/gym/member_list.html:223
@@ -985,109 +1008,113 @@ msgstr "ккал"
msgid "Actions"
msgstr "Дії"
-#: core/templates/user/overview.html:210
+#: core/templates/user/overview.html:213
msgid "Deactivate user"
msgstr "Деактивувати користувача"
-#: core/templates/user/overview.html:214
+#: core/templates/user/overview.html:217
msgid "Activate user"
msgstr "Активувати користувача"
-#: core/templates/user/overview.html:223
+#: core/templates/user/overview.html:226
msgid "Reset user password"
msgstr "Скинути пароль користувача"
-#: core/templates/user/overview.html:227 gym/templates/gym/member_list.html:30
+#: core/templates/user/overview.html:230 gym/templates/gym/member_list.html:30
msgid "Roles"
msgstr "Ролі"
-#: core/templates/user/overview.html:243
+#: core/templates/user/overview.html:246
msgid "Password reset confirmation"
msgstr "Підтвердження відновлення пароля"
-#: core/templates/user/overview.html:247
+#: core/templates/user/overview.html:250
msgid "Do you really want to change this user&#39;s password?"
msgstr "Ви дійсно бажаєте змінити пароль цього користувача?"
-#: core/templates/user/overview.html:250
+#: core/templates/user/overview.html:253
#: exercises/templates/history/overview.html:106
+#: nutrition/templates/ingredient/view.html:148
+#: nutrition/templates/ingredient/view.html:160
msgid "No"
msgstr "Ні"
-#: core/templates/user/overview.html:251
+#: core/templates/user/overview.html:254
#: exercises/templates/history/overview.html:99
+#: nutrition/templates/ingredient/view.html:146
+#: nutrition/templates/ingredient/view.html:158
msgid "Yes"
msgstr "Так"
-#: core/templates/user/overview.html:272 gym/templates/gym/member_list.html:105
+#: core/templates/user/overview.html:275 gym/templates/gym/member_list.html:105
msgid "Details"
msgstr "Деталі"
-#: core/templates/user/overview.html:276 gym/views/export.py:57
-#: manager/helpers.py:89 nutrition/views/plan.py:151
-#: nutrition/views/plan.py:157
+#: core/templates/user/overview.html:279 gym/views/export.py:57
+#: manager/helpers.py:89 nutrition/views/plan.py:150
+#: nutrition/views/plan.py:156
msgid "Nr."
msgstr "№"
-#: core/templates/user/overview.html:298 gym/models/contract.py:287
+#: core/templates/user/overview.html:301 gym/models/contract.py:287
#: gym/models/gym.py:50 gym/templates/contract/view.html:75
#: gym/templates/gym/member_list.html:112 gym/views/export.py:68
msgid "Phone"
msgstr "Телефон"
-#: core/templates/user/overview.html:302 gym/templates/contract/view.html:87
+#: core/templates/user/overview.html:305 gym/templates/contract/view.html:87
#: gym/templates/gym/member_list.html:130
msgid "Address"
msgstr "Адреса"
-#: core/templates/user/overview.html:313
+#: core/templates/user/overview.html:316
msgid "Registered"
msgstr "Зареєстрований"
-#: core/templates/user/overview.html:317
+#: core/templates/user/overview.html:320
msgid "Last login"
msgstr "Останній вхід"
-#: core/templates/user/overview.html:322
+#: core/templates/user/overview.html:325
msgid "Status"
msgstr "Статус"
-#: core/templates/user/overview.html:325
+#: core/templates/user/overview.html:328
msgid "Active"
msgstr "Активний"
-#: core/templates/user/overview.html:327
+#: core/templates/user/overview.html:330
msgid "Inactive"
msgstr "Неактивний"
-#: core/templates/user/overview.html:348 gym/templates/contract/list.html:4
+#: core/templates/user/overview.html:351 gym/templates/contract/list.html:4
#: gym/templates/gym/member_list.html:218
msgid "Contracts"
msgstr "Контракти"
-#: core/templates/user/overview.html:426 gym/templates/document/list.html:4
+#: core/templates/user/overview.html:429 gym/templates/document/list.html:4
msgid "Documents"
msgstr "Документи"
-#: core/templates/user/overview.html:433 gym/templates/document/list.html:33
+#: core/templates/user/overview.html:436 gym/templates/document/list.html:33
msgid "Download"
msgstr "Завантажити"
-#: core/templates/user/overview.html:474 gym/views/admin_config.py:44
+#: core/templates/user/overview.html:477 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:477 gym/models/user_config.py:92
+#: core/templates/user/overview.html:480 gym/models/user_config.py:92
msgid "Include in inactive overview"
msgstr "Включити в огляд неактивних"
-#: core/templates/user/overview.html:510
+#: core/templates/user/overview.html:513
#, python-format
msgid "Admin login is only available for users in %(gym_name)s"
msgstr "Вхід адміністратора доступний лише для користувачів у %(gym_name)s"
-#: core/templates/user/overview.html:514
+#: core/templates/user/overview.html:517
msgid "Log in as this user"
msgstr "Увійти як цей користувач"
@@ -1111,7 +1138,7 @@ msgstr "Надіслати електронний лист для підтвер
msgid "You need to verify your email to contribute exercises"
msgstr "Вам необхідно підтвердити свою електронну пошту, щоб надсилати вправи"
-#: core/templates/user/preferences.html:55 core/views/user.py:601
+#: core/templates/user/preferences.html:55 core/views/user.py:617
msgid "Change password"
msgstr "Змінити пароль"
@@ -1119,23 +1146,23 @@ msgstr "Змінити пароль"
msgid "Already have an account?"
msgstr "Вже маєте обліковий запис?"
-#: core/templatetags/wger_extras.py:142 i18n.tpl:38
+#: core/templatetags/wger_extras.py:142 i18n.tpl:39
msgid "kg"
msgstr "кг"
#: core/templatetags/wger_extras.py:144
-#: nutrition/templates/ingredient/view.html:60
-#: nutrition/templates/ingredient/view.html:66
-#: nutrition/templates/ingredient/view.html:73
-#: nutrition/templates/ingredient/view.html:82
-#: nutrition/templates/ingredient/view.html:89
-#: nutrition/templates/ingredient/view.html:111
-#: nutrition/templates/ingredient/view.html:121
+#: nutrition/templates/ingredient/view.html:61
+#: nutrition/templates/ingredient/view.html:67
+#: nutrition/templates/ingredient/view.html:74
+#: nutrition/templates/ingredient/view.html:83
+#: nutrition/templates/ingredient/view.html:90
+#: nutrition/templates/ingredient/view.html:112
+#: nutrition/templates/ingredient/view.html:122
msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr "г"
-#: core/templatetags/wger_extras.py:147 i18n.tpl:39
+#: core/templatetags/wger_extras.py:147 i18n.tpl:40
msgid "lb"
msgstr "фунт"
@@ -1144,36 +1171,35 @@ msgctxt "weight unit, i.e. ounces"
msgid "oz"
msgstr "унцій"
-#: core/views/languages.py:85 exercises/views/categories.py:122
+#: core/views/languages.py:88 exercises/views/categories.py:122
#: exercises/views/equipment.py:103 exercises/views/muscles.py:99
-#: nutrition/views/ingredient.py:120 nutrition/views/unit.py:110
+#: nutrition/views/ingredient.py:125
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
+#: core/views/languages.py:96 core/views/license.py:103
+#: core/views/repetition_units.py:114 core/views/weight_units.py:115
#: exercises/views/categories.py:128 exercises/views/muscles.py:106
#: gallery/views/images.py:124 gym/views/admin_notes.py:196
#: gym/views/document.py:206 gym/views/gym.py:481
-#: nutrition/views/ingredient.py:127 nutrition/views/unit.py:117
+#: nutrition/views/ingredient.py:132
#, python-brace-format
msgid "Delete {0}?"
msgstr "Вилучити {0}?"
-#: core/views/languages.py:111 core/views/license.py:85
-#: core/views/repetition_units.py:86 core/views/user.py:464
+#: core/views/languages.py:114 core/views/license.py:85
+#: core/views/repetition_units.py:96 core/views/user.py:480
#: core/views/weight_units.py:86 exercises/views/categories.py:98
#: exercises/views/equipment.py:81 exercises/views/muscles.py:87
#: gym/views/admin_notes.py:161 gym/views/config.py:68
#: gym/views/contract.py:186 gym/views/contract_option.py:123
#: gym/views/contract_type.py:123 gym/views/document.py:171
-#: gym/views/gym.py:463 nutrition/views/ingredient.py:146
-#: nutrition/views/unit.py:143
+#: gym/views/gym.py:463 nutrition/views/ingredient.py:151
#, python-brace-format
msgid "Edit {0}"
msgstr "Змінити {0}"
-#: core/views/misc.py:74
+#: core/views/misc.py:73
msgid ""
"We have created sample workout, workout schedules, weight logs, (body) "
"weight and nutrition plan entries so you can better see what this site can "
@@ -1183,48 +1209,48 @@ msgstr ""
"тіла та плани харчування, щоб ви могли краще побачити, що може зробити цей "
"сайт. Ви можете редагувати або видаляти їх!"
-#: core/views/user.py:143
+#: core/views/user.py:145
#, python-brace-format
msgid "Account \"{0}\" was successfully deleted"
msgstr "Обліковий запис \"{0}\" успішно видалено"
-#: core/views/user.py:279
+#: core/views/user.py:287
msgid "You were successfully registered"
msgstr "Ви успішно зареєстровані"
-#: core/views/user.py:341
+#: core/views/user.py:357
msgid "Settings successfully updated"
msgstr "Налаштування успішно оновлено"
-#: core/views/user.py:380
+#: core/views/user.py:396
msgid "The user was successfully deactivated"
msgstr "Користувач був успішно деактивований"
-#: core/views/user.py:417
+#: core/views/user.py:433
msgid "The user was successfully activated"
msgstr "Користувач успішно активований"
-#: core/views/user.py:432
+#: core/views/user.py:448
msgid "Edit user"
msgstr "Редагувати користувача"
-#: core/views/user.py:587 gym/templates/gym/member_list.html:26
+#: core/views/user.py:603 gym/templates/gym/member_list.html:26
#: gym/views/gym.py:158
msgid "ID"
msgstr "ID"
-#: core/views/user.py:588 gym/forms.py:95 gym/templates/contract/view.html:55
+#: core/views/user.py:604 gym/forms.py:95 gym/templates/contract/view.html:55
#: gym/templates/gym/member_list.html:27 gym/views/export.py:59
#: gym/views/gym.py:158 gym/views/gym.py:217
msgid "Username"
msgstr "Ім'я користувача"
-#: core/views/user.py:591 gym/templates/gym/new_user.html:34
+#: core/views/user.py:607 gym/templates/gym/new_user.html:34
#: gym/views/export.py:58 gym/views/gym.py:217
msgid "Gym"
msgstr "Тренажерний зал"
-#: core/views/user.py:650
+#: core/views/user.py:678
#, python-format
msgid "A verification email was sent to %(email)s"
msgstr "Підтверджувальний лист було надіслано на електронну адресу %(email)s"
@@ -1241,16 +1267,16 @@ msgstr "Альтернативна назва"
msgid "A more basic name for the muscle"
msgstr "Більш основна назва м'язів"
-#: exercises/models/video.py:50
+#: exercises/models/video.py:52
#, python-format
msgid "Maximum file size is %(size)sMB."
msgstr "Максимальний розмір файлу - %(size)sМБ."
-#: exercises/models/video.py:57 exercises/models/video.py:65
+#: exercises/models/video.py:59 exercises/models/video.py:67
msgid "File type is not supported"
msgstr "Тип файлу не підтримується"
-#: exercises/models/video.py:70
+#: exercises/models/video.py:72
msgid "File is not a valid video"
msgstr "Файл не є припустимим відеофайлом"
@@ -1321,7 +1347,11 @@ msgstr "Видалити обладнання?"
msgid "Add muscle"
msgstr "Додати м'язи"
-#: gallery/templates/images/overview.html:72
+#: gallery/forms.py:35
+msgid "If date is left empty, it will be read from the image instead"
+msgstr ""
+
+#: gallery/templates/images/overview.html:69
msgid "Add image"
msgstr "Додати зображення"
@@ -1387,7 +1417,7 @@ msgid "Contract type"
msgstr "Тип контракту"
#: gym/models/contract.py:211 gym/templates/contract/view.html:59
-#: nutrition/forms.py:58
+#: nutrition/forms.py:67
msgid "Amount"
msgstr "Сума"
@@ -1567,7 +1597,7 @@ msgstr "Електронні листи"
msgid "Add member"
msgstr "Додати учасника"
-#: gym/templates/gym/new_user.html:48 nutrition/templates/rate/form.html:120
+#: gym/templates/gym/new_user.html:48 nutrition/templates/rate/form.html:121
msgid "Info"
msgstr "Інформація"
@@ -1739,10 +1769,6 @@ msgstr "Перекладина"
msgid "Quads"
msgstr "Квадрицепс"
-#: i18n.tpl:30
-msgid "Repetitions"
-msgstr "Повтори"
-
#: i18n.tpl:31
msgid "Resistance band"
msgstr "Еспандер"
@@ -1771,175 +1797,181 @@ msgstr "Трицепси"
msgid "Until Failure"
msgstr "До відмови"
-#: i18n.tpl:40
+#: i18n.tpl:38
+#, fuzzy
+#| msgid "Kilometers"
+msgid "Meters"
+msgstr "Кілометри"
+
+#: i18n.tpl:41
msgid "none (bodyweight exercise)"
msgstr "немає (вправа з вагою тіла)"
-#: i18n.tpl:41
+#: i18n.tpl:42
msgid "Beginner"
msgstr "Початківець"
-#: i18n.tpl:42
+#: i18n.tpl:43
msgid "Consistent"
msgstr "Послідовний"
-#: i18n.tpl:43
+#: i18n.tpl:44
msgid "Dedicated"
msgstr "Присвячений"
-#: i18n.tpl:44
+#: i18n.tpl:45
msgid "Obsessed"
msgstr "Одержимий"
-#: i18n.tpl:45
+#: i18n.tpl:46
msgid "Legend"
msgstr "Умовне позначення"
-#: i18n.tpl:46
+#: i18n.tpl:47
msgid "Veteran"
msgstr "Ветеран"
-#: i18n.tpl:47
+#: i18n.tpl:48
msgid "Titan"
msgstr "Титан"
-#: i18n.tpl:48
+#: i18n.tpl:49
msgid "Unstoppable"
msgstr "Непереможний"
-#: i18n.tpl:49
+#: i18n.tpl:50
msgid "Weekend Warrior"
msgstr "Воїн вихідного дня"
-#: i18n.tpl:50
+#: i18n.tpl:51
msgid "Elephant lifter"
msgstr "Підйомник слонів"
-#: i18n.tpl:51
+#: i18n.tpl:52
msgid "Bus lifter"
msgstr "Підйомник автобуса"
-#: i18n.tpl:52
+#: i18n.tpl:53
msgid "Plane lifter"
msgstr "Літак-підйомник"
-#: i18n.tpl:53
+#: i18n.tpl:54
msgid "Blue whale lifter"
msgstr "Підйомник синього кита"
-#: i18n.tpl:54
+#: i18n.tpl:55
msgid "Space Station lifter"
msgstr "Підйомник космічної станції"
-#: i18n.tpl:55
+#: i18n.tpl:56
msgid "Millionaire"
msgstr "Мільйонер"
-#: i18n.tpl:56
+#: i18n.tpl:57
msgid "Atlas"
msgstr "Атлас"
-#: i18n.tpl:57
+#: i18n.tpl:58
msgid "Early Bird"
msgstr "Рання пташка"
-#: i18n.tpl:58
+#: i18n.tpl:59
msgid "Night Owl"
msgstr "Нічна сова"
-#: i18n.tpl:59
+#: i18n.tpl:60
msgid "New Year, New Me"
msgstr "Новий рік, нова я"
-#: i18n.tpl:60
+#: i18n.tpl:61
msgid "Phoenix"
msgstr "Фенікс"
-#: i18n.tpl:61
+#: i18n.tpl:62
msgid "Personal Record"
msgstr "Особистий рекорд"
-#: i18n.tpl:62
+#: i18n.tpl:63
msgid "Complete your first workout"
msgstr "Завершіть своє перше тренування"
-#: i18n.tpl:63
+#: i18n.tpl:64
msgid "Complete 10 workouts"
msgstr "Виконайте 10 тренувань"
-#: i18n.tpl:64
+#: i18n.tpl:65
msgid "Complete 50 workouts"
msgstr "Виконайте 50 тренувань"
-#: i18n.tpl:65
+#: i18n.tpl:66
msgid "Complete 100 workouts"
msgstr "Виконайте 100 тренувань"
-#: i18n.tpl:66
+#: i18n.tpl:67
msgid "Complete 200 workouts"
msgstr "Виконайте 200 тренувань"
-#: i18n.tpl:67
+#: i18n.tpl:68
msgid "Complete 500 workouts"
msgstr "Виконайте 500 тренувань"
-#: i18n.tpl:68
+#: i18n.tpl:69
msgid "Complete 1000 workouts"
msgstr "Виконайте 1000 тренувань"
-#: i18n.tpl:69
+#: i18n.tpl:70
msgid "Maintain a 30-day workout streak"
msgstr "Підтримуйте 30-денну серію тренувань"
-#: i18n.tpl:70
+#: i18n.tpl:71
msgid "Work out on Saturday and Sunday for 4 consecutive weekends"
msgstr "Тренуйтеся в суботу та неділю протягом 4 вихідних поспіль"
-#: i18n.tpl:71
+#: i18n.tpl:72
msgid "Lift a cumulative total of 5.000 kg"
msgstr "Підняти загальну вагу 5.000 кг"
-#: i18n.tpl:72
+#: i18n.tpl:73
msgid "Lift a cumulative total of 20.000 kg"
msgstr "Підняти загальну вагу 20 000 кг"
-#: i18n.tpl:73
+#: i18n.tpl:74
msgid "Lift a cumulative total of 50.000 kg"
msgstr "Підняти загальну вагу 50 000 кг"
-#: i18n.tpl:74
+#: i18n.tpl:75
msgid "Lift a cumulative total of 150.000 kg"
msgstr "Підняти загальну вагу 150 000 кг"
-#: i18n.tpl:75
+#: i18n.tpl:76
msgid "Lift a cumulative total of 450.000 kg"
msgstr "Підняти загальну вагу 450 000 кг"
-#: i18n.tpl:76
+#: i18n.tpl:77
msgid "Lift a cumulative total of 1.000.000 kg"
msgstr "Підняти загальну вагу 1.000.000 кг"
-#: i18n.tpl:77
+#: i18n.tpl:78
msgid "Lift a cumulative total of 10.000.000 kg"
msgstr "Підняти загальну вагу 10 000.000 кг"
-#: i18n.tpl:78
+#: i18n.tpl:79
msgid "Complete a workout before 6:00 AM"
msgstr "Завершіть тренування до 6:00 ранку"
-#: i18n.tpl:79
+#: i18n.tpl:80
msgid "Complete a workout after 9:00 PM"
msgstr "Завершіть тренування після 21:00"
-#: i18n.tpl:80
+#: i18n.tpl:81
msgid "Work out on January 1st"
msgstr "Тренуйтеся 1 січня"
-#: i18n.tpl:81
+#: i18n.tpl:82
msgid "Return to training after being inactive for 30 days"
msgstr "Повернення до тренувань після 30 днів бездіяльності"
-#: i18n.tpl:82
+#: i18n.tpl:83
msgid "Achieve a new Personal Record on any exercise"
msgstr "Досягніть нового особистого рекорду в будь-якій вправі"
@@ -2023,7 +2055,7 @@ msgstr "Вправа"
msgid "Routine will expire soon"
msgstr "Термін дії процедури скоро закінчиться"
-#: manager/models/routine.py:153 manager/models/session.py:145
+#: manager/models/routine.py:154 manager/models/session.py:145
msgid "The start time cannot be after the end time."
msgstr "Час початку не може бути після часу закінчення."
@@ -2109,23 +2141,27 @@ msgstr "Тренування"
msgid "Workout for %s"
msgstr "Тренування для %s"
-#: nutrition/forms.py:62
+#: nutrition/extract_info/off.py:72 nutrition/extract_info/off.py:91
+msgid "Serving"
+msgstr ""
+
+#: nutrition/forms.py:71 nutrition/forms.py:208
msgid "Unit"
msgstr "Одиниця"
-#: nutrition/forms.py:170 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:179 nutrition/templates/rate/form.html:77
msgid "Basic caloric intake"
msgstr "Основне споживання калорій"
-#: nutrition/forms.py:171
+#: nutrition/forms.py:180
msgid "Your basic caloric intake as calculated for your data"
msgstr "Ваше основне споживання калорій, розраховане для ваших даних"
-#: nutrition/forms.py:176
+#: nutrition/forms.py:185
msgid "Additional calories"
msgstr "Додаткові калорії"
-#: nutrition/forms.py:178
+#: nutrition/forms.py:187
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
@@ -2134,13 +2170,31 @@ msgstr ""
"від'ємне число)"
#: nutrition/forms.py:209
+msgid "grams (g)"
+msgstr ""
+
+#: nutrition/forms.py:219
msgid "Ingredient"
msgstr "Інгредієнт"
-#: nutrition/forms.py:213
+#: nutrition/forms.py:223
msgid "Also search for names in English"
msgstr "Також шукайте імена англійською мовою"
+#: nutrition/forms.py:239
+msgid "Quantity"
+msgstr ""
+
+#: nutrition/forms.py:241
+msgid "Enter a quantity and choose grams (g) or one of the serving units."
+msgstr ""
+
+#: nutrition/models/ingredient.py:526
+#, fuzzy
+#| msgid "Correction"
+msgid "Portion"
+msgstr "Виправлення"
+
#: nutrition/templates/ingredient/email_new.tpl:1
#, python-format
msgid ""
@@ -2190,59 +2244,92 @@ msgstr ""
"Якщо ви додали електронну пошту при реєстрації, ви отримаєте сповіщення про "
"успішне завершення процесу."
-#: nutrition/templates/ingredient/overview.html:38
+#: nutrition/templates/ingredient/overview.html:32
+#: nutrition/templates/ingredient/overview.html:68
+#: nutrition/templates/ingredient/view.html:143
+msgid "Vegan"
+msgstr ""
+
+#: nutrition/templates/ingredient/overview.html:34
+#: nutrition/templates/ingredient/overview.html:79
+#: nutrition/templates/ingredient/view.html:155
+#, fuzzy
+#| msgid "Variations"
+msgid "Vegetarian"
+msgstr "Варіації"
+
+#: nutrition/templates/ingredient/overview.html:43
msgid "No ingredients."
msgstr "Немає інгредієнтів."
-#: nutrition/templates/ingredient/overview.html:49
+#: nutrition/templates/ingredient/overview.html:54
msgid "Search"
msgstr "Пошук"
-#: nutrition/templates/ingredient/view.html:45 nutrition/views/plan.py:237
+#: nutrition/templates/ingredient/overview.html:57
+#, fuzzy
+#| msgid "No filter"
+msgid "Filter"
+msgstr "Без фільтру"
+
+#: nutrition/templates/ingredient/overview.html:83
+msgid "Apply"
+msgstr ""
+
+#: nutrition/templates/ingredient/overview.html:85
+msgid "Reset"
+msgstr ""
+
+#: nutrition/templates/ingredient/view.html:46 nutrition/views/plan.py:236
msgid "Macronutrients"
msgstr "Макроелементи"
-#: nutrition/templates/ingredient/view.html:54
+#: nutrition/templates/ingredient/view.html:55
msgid "kJ"
msgstr "кДж"
-#: nutrition/templates/ingredient/view.html:70 nutrition/views/plan.py:267
+#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:266
msgid "Sugar content in carbohydrates"
msgstr "Вміст цукру в вуглеводах"
-#: nutrition/templates/ingredient/view.html:75
-#: nutrition/templates/ingredient/view.html:91
-#: nutrition/templates/ingredient/view.html:113
-#: nutrition/templates/ingredient/view.html:123
+#: nutrition/templates/ingredient/view.html:76
+#: nutrition/templates/ingredient/view.html:92
+#: nutrition/templates/ingredient/view.html:114
+#: nutrition/templates/ingredient/view.html:124
msgid "n.A."
msgstr "немає в наявності"
-#: nutrition/templates/ingredient/view.html:86 nutrition/views/plan.py:281
+#: nutrition/templates/ingredient/view.html:87 nutrition/views/plan.py:280
msgid "Saturated fat content in fats"
msgstr "Вміст жиру у жирах"
-#: nutrition/templates/ingredient/view.html:102
+#: nutrition/templates/ingredient/view.html:103
msgid "Others"
msgstr "Інші"
-#: nutrition/templates/ingredient/view.html:108 nutrition/views/plan.py:287
+#: nutrition/templates/ingredient/view.html:109 nutrition/views/plan.py:286
msgid "Fiber"
msgstr "Волокна"
-#: nutrition/templates/ingredient/view.html:118 nutrition/views/plan.py:293
+#: nutrition/templates/ingredient/view.html:119 nutrition/views/plan.py:292
msgid "Sodium"
msgstr "Натрій"
-#: nutrition/templates/ingredient/view.html:143
-#: nutrition/templates/units/list.html:50 nutrition/views/unit.py:86
+#: nutrition/templates/ingredient/view.html:136
+#, fuzzy
+#| msgid "Click here for more information"
+msgid "Dietary information"
+msgstr "Натисніть тут для отримання додаткової інформації"
+
+#: nutrition/templates/ingredient/view.html:184
msgid "Add new weight unit"
msgstr "Додати нову одиницю ваги"
-#: nutrition/templates/rate/form.html:25
+#: nutrition/templates/rate/form.html:26
msgid "Basal metabolic rate"
msgstr "Базальний рівень метаболізму"
-#: nutrition/templates/rate/form.html:26
+#: nutrition/templates/rate/form.html:27
msgid ""
"The basal metabolic rate is the amount of energy expended daily\n"
"at rest. This is the minimum energy needed for the body to function, without "
@@ -2254,15 +2341,15 @@ msgstr ""
"функціонування\n"
"організму, без будь-яких додаткових фізичних навантажень."
-#: nutrition/templates/rate/form.html:37
+#: nutrition/templates/rate/form.html:38
msgid "Your basic metabolic rate is: "
msgstr "Ваша основна метаболічна норма: "
-#: nutrition/templates/rate/form.html:47
+#: nutrition/templates/rate/form.html:48
msgid "Physical activities"
msgstr "Фізична активність"
-#: nutrition/templates/rate/form.html:48
+#: nutrition/templates/rate/form.html:49
msgid ""
"The physical activity level (PAL) is a factor used to to express\n"
"the additional physical activity and is used to calculate the total energy\n"
@@ -2272,11 +2359,11 @@ msgstr ""
"вираження додаткової фізичної активності та для розрахунку необхідної\n"
"загальної денної енергії."
-#: nutrition/templates/rate/form.html:59
+#: nutrition/templates/rate/form.html:60
msgid "Factor for daily activities: "
msgstr "Фактор для щоденної активності: "
-#: nutrition/templates/rate/form.html:67
+#: nutrition/templates/rate/form.html:68
msgid ""
"The base caloric intake is the amount of calories your metabolism\n"
"needs based on your level of physical activity."
@@ -2284,11 +2371,11 @@ msgstr ""
"Базове споживання калорій - це кількість калорій яку потребує Ваш\n"
"метаболізм залежно від рівня вашої фізичної активності."
-#: nutrition/templates/rate/form.html:81
+#: nutrition/templates/rate/form.html:82
msgid "Calculate basic caloric intake"
msgstr "Розрахувати основне споживання калорій"
-#: nutrition/templates/rate/form.html:88
+#: nutrition/templates/rate/form.html:89
msgid ""
"The total calories are the actual total calories per day. This\n"
"might include e.g. a surplus or deficit if you are bulking or cutting. "
@@ -2302,19 +2389,19 @@ msgstr ""
"В якості альтернативи можна просто ввести кількість калорій, якщо вона вам "
"відома."
-#: nutrition/templates/rate/form.html:102
+#: nutrition/templates/rate/form.html:103
msgid "Transfer basic intake to total daily calories"
msgstr "Перенести основне споживання в денну кількість калорій"
-#: nutrition/templates/rate/form.html:106
+#: nutrition/templates/rate/form.html:107
msgid "Add additional calories to total daily calories"
msgstr "Додати додаткові калорії в добову кількість калорій"
-#: nutrition/templates/rate/form.html:110
+#: nutrition/templates/rate/form.html:111
msgid "Save total calories to profile"
msgstr "Зберегти загальну кількість калорій в профайл"
-#: nutrition/templates/rate/form.html:121
+#: nutrition/templates/rate/form.html:122
msgid ""
"Please note that these calculations can only be an\n"
"approximation. If you base your nutrition plan on these values, observe\n"
@@ -2325,48 +2412,48 @@ msgstr ""
"свій план харчування на цих значеннях, поспостерігайте за собою кілька\n"
"тижнів і при необхідності змініть загальну кількість."
-#: nutrition/views/ingredient.py:158
+#: nutrition/views/ingredient.py:163
msgid "Add a new ingredient"
msgstr "Додати новий інгредієнт"
-#: nutrition/views/plan.py:128
+#: nutrition/views/plan.py:127
msgid "Nutritional plan"
msgstr "План харчування"
-#: nutrition/views/plan.py:130
+#: nutrition/views/plan.py:129
#, python-format
msgid "Nutritional plan for %s"
msgstr "План харчування для %s"
-#: nutrition/views/plan.py:202
+#: nutrition/views/plan.py:201
msgid "<i>This is an empty plan, what did you expect on the PDF?</i>"
msgstr "<i>Це порожній план, що ви очікували на PDF?</i>"
-#: nutrition/views/plan.py:230
+#: nutrition/views/plan.py:229
msgid "Nutritional data"
msgstr "Харчові дані"
-#: nutrition/views/plan.py:238
+#: nutrition/views/plan.py:237
msgid "Total"
msgstr "Разом"
-#: nutrition/views/plan.py:239
+#: nutrition/views/plan.py:238
msgid "Percent of energy"
msgstr "Відсоток енергії"
-#: nutrition/views/plan.py:240
+#: nutrition/views/plan.py:239
msgid "g per body kg"
msgstr "г на кг маси тіли"
-#: nutrition/views/unit_ingredient.py:69
+#: nutrition/views/unit_ingredient.py:64
msgid "Add a new weight unit"
msgstr "Додати нову одиницю ваги"
-#: nutrition/views/unit_ingredient.py:106
+#: nutrition/views/unit_ingredient.py:99
msgid "Edit a weight unit to ingredient connection"
msgstr "Змінити одиницю ваги з'єднання інгредієнтів"
-#: nutrition/views/unit_ingredient.py:138
+#: nutrition/views/unit_ingredient.py:129
msgid "Delete?"
msgstr "Видалити?"
@@ -2764,7 +2851,7 @@ msgstr "Вихідний код"
msgid "Translation"
msgstr "Перекладання"
-#: utils/generic_views.py:263
+#: utils/generic_views.py:246
msgid "Yes, delete"
msgstr "Так, вилучити"
@@ -2818,10 +2905,6 @@ msgstr "Ви повинні ввести свою вагу"
msgid "Import weight logs"
msgstr "Імпортувати журнал ваги"
-#: weight/templates/import_csv_form.html:9
-msgid "Submit"
-msgstr "Надіслати"
-
#: weight/templates/import_csv_form.html:15
msgid ""
"Use this import field to import your weight logs into Workout\n"
@@ -2943,6 +3026,36 @@ msgstr ""
msgid "Re-Submit"
msgstr "Повторно подати"
+#~ msgid "Email verification"
+#~ msgstr "Підтвердження E-mail"
+
+#, python-format
+#~ msgid "%(username)s, your email was verified"
+#~ msgstr "%(username)s, ваша електронна пошта була підтверджена"
+
+#~ msgid "Error, invalid verification token"
+#~ msgstr "Помилка, недійсний токен верифікації"
+
+#~ msgid "Email Confirmation"
+#~ msgstr "Підтвердження електронною поштою"
+
+#, python-format
+#~ msgid "You are almost there, %(username)s!"
+#~ msgstr "Ви вже майже на місці, %(username)s!"
+
+#, python-format
+#~ msgid "Please click <a href=\"%(link)s\">here</a> to confirm your email"
+#~ msgstr ""
+#~ "Будь ласка, натисніть <a href=\"%(link)s\">тут</a>, щоб підтвердити свою "
+#~ "електронну пошту"
+
+#, python-format
+#~ msgid "The token expires on %(time)s"
+#~ msgstr "Строк дії токена спливає %(time)s"
+
+#~ msgid "Ingredient weight units"
+#~ msgstr "Одиниці ваги інгредієнтів"
+
#~ msgid "Image"
#~ msgstr "Зображення"
@@ -2973,9 +3086,6 @@ msgstr "Повторно подати"
#~ msgid "Secondary muscles"
#~ msgstr "Другорядні м'язи"
-#~ msgid "Variations"
-#~ msgstr "Варіації"
-
#~ msgid "Exercise Categories"
#~ msgstr "Категорії вправ"
@@ -4027,9 +4137,6 @@ msgstr "Повторно подати"
#~ msgid "This content is available under the following license:"
#~ msgstr "Цей вміст доступний за такою ліцензією:"
-#~ msgid "Click here for more information"
-#~ msgstr "Натисніть тут для отримання додаткової інформації"
-
#, python-format
#~ msgid "%(name)s is too similar to existing exercise \"%(exercise_name)s\""
#~ msgstr "%(name)s занадто схоже на наявну вправу \"%(exercise_name)s\""
@@ -4700,8 +4807,5 @@ msgstr "Повторно подати"
#~ msgid "Last 12 months"
#~ msgstr "Останні 12 місяців"
-#~ msgid "No filter"
-#~ msgstr "Без фільтру"
-
#~ msgid "Days"
#~ msgstr "Дні"
diff --git a/wger/locale/zh_Hans/LC_MESSAGES/django.po b/wger/locale/zh_Hans/LC_MESSAGES/django.po
index 04796a844..024d89978 100644
--- a/wger/locale/zh_Hans/LC_MESSAGES/django.po
+++ b/wger/locale/zh_Hans/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: 2026-01-17 14:03+0000\n"
+"POT-Creation-Date: 2026-04-10 10:20+0000\n"
"PO-Revision-Date: 2026-01-31 16:01+0000\n"
"Last-Translator: youkarin <[email protected]>\n"
"Language-Team: Chinese (Simplified Han script) <https://hosted.weblate.org/"
@@ -41,7 +41,7 @@ msgstr ""
#: config/views/gym_config.py:42 core/templates/language/view.html:64
#: core/templates/license/list.html:17
#: core/templates/repetition_unit/list.html:18
-#: core/templates/user/overview.html:204 core/templates/user/overview.html:467
+#: core/templates/user/overview.html:207 core/templates/user/overview.html:470
#: core/templates/weight_unit/list.html:18
#: exercises/templates/categories/admin-overview.html:17
#: exercises/templates/equipment/admin-overview.html:17
@@ -53,30 +53,29 @@ msgstr ""
#: gym/templates/gym/list.html:19 gym/templates/gym/list.html:48
#: gym/templates/gym/member_list.html:94 gym/templates/gym/member_list.html:152
#: gym/templates/gym/member_list.html:190
-#: nutrition/templates/ingredient/view.html:164
-#: nutrition/templates/ingredient/view.html:209
-#: nutrition/templates/units/list.html:19
+#: nutrition/templates/ingredient/view.html:205
+#: nutrition/templates/ingredient/view.html:248
msgid "Edit"
msgstr "编辑"
-#: core/forms.py:91 core/templates/navigation.html:271
-#: core/templates/navigation.html:278 core/templates/user/login.html:4
+#: core/forms.py:89 core/templates/navigation.html:268
+#: core/templates/navigation.html:275 core/templates/user/login.html:4
#: core/templates/user/registration_sidebar.html:12
#: software/templates/features.html:82 software/templates/features.html:448
msgid "Login"
msgstr "登录"
-#: core/forms.py:130 core/forms.py:244 gym/views/export.py:61
+#: core/forms.py:128 core/forms.py:242 gym/views/export.py:61
#: gym/views/gym.py:217
msgid "First name"
msgstr "名字"
-#: core/forms.py:131 core/forms.py:245 core/templates/user/overview.html:284
+#: core/forms.py:129 core/forms.py:243 core/templates/user/overview.html:287
#: gym/views/export.py:62 gym/views/gym.py:217
msgid "Last name"
msgstr "姓氏"
-#: core/forms.py:133 core/forms.py:210 core/templates/user/overview.html:288
+#: core/forms.py:131 core/forms.py:208 core/templates/user/overview.html:291
#: gym/models/contract.py:256 gym/models/gym.py:58
#: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:116
#: gym/templates/gym/new_user.html:30 gym/views/export.py:60
@@ -86,53 +85,53 @@ msgstr "姓氏"
msgid "Email"
msgstr "邮件"
-#: core/forms.py:134
+#: core/forms.py:132
msgid "Used for password resets and, optionally, e-mail reminders."
msgstr "用来重设密码和邮件提醒,如果你选择了邮件提醒。"
-#: core/forms.py:138 core/models/profile.py:222
+#: core/forms.py:136 core/models/profile.py:222
#: gym/templates/gym/new_user.html:38
msgid "Date of Birth"
msgstr "生日"
-#: core/forms.py:177
+#: core/forms.py:175
msgid "Personal data"
msgstr "个人数据"
-#: core/forms.py:189
+#: core/forms.py:187
msgid "Workout reminders"
msgstr "健身提醒"
-#: core/forms.py:196
+#: core/forms.py:194
msgid "Other settings"
msgstr "其它设置"
-#: core/forms.py:204 core/views/user.py:614 core/views/user.py:629
-#: core/views/user.py:641 gym/forms.py:73 utils/generic_views.py:143
+#: core/forms.py:202 core/views/user.py:630 core/views/user.py:654
+#: core/views/user.py:668 gym/forms.py:73 utils/generic_views.py:137
msgid "Save"
msgstr "保存"
-#: core/forms.py:211
+#: core/forms.py:209
msgid "Used for password resets and, optionally, email reminders."
msgstr "用来重设密码和邮件提醒,如果你选择了邮件提醒。"
-#: core/forms.py:240
+#: core/forms.py:238
msgid "This e-mail address is already in use."
msgstr "这个邮件地址已经被注册过了。"
-#: core/forms.py:261 gym/templates/gym/new_user.html:26
+#: core/forms.py:259 gym/templates/gym/new_user.html:26
#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:217
msgid "Password"
msgstr "密码"
-#: core/forms.py:263
+#: core/forms.py:261
msgid "Please enter your current password."
msgstr "请输入你的原密码。"
-#: core/forms.py:272 core/templates/language/view.html:70
+#: core/forms.py:270 core/templates/language/view.html:70
#: core/templates/license/list.html:21
#: core/templates/repetition_unit/list.html:22
-#: core/templates/user/overview.html:233
+#: core/templates/user/overview.html:236
#: core/templates/weight_unit/list.html:22
#: exercises/templates/categories/admin-overview.html:21
#: exercises/templates/equipment/admin-overview.html:21
@@ -140,27 +139,30 @@ msgstr "请输入你的原密码。"
#: gym/templates/admin_notes/list.html:37
#: gym/templates/contract_option/list.html:35
#: gym/templates/contract_type/list.html:36 gym/templates/document/list.html:46
-#: gym/templates/gym/list.html:23 nutrition/templates/ingredient/view.html:168
-#: nutrition/templates/ingredient/view.html:215
-#: nutrition/templates/units/list.html:25
+#: gym/templates/gym/list.html:23 nutrition/templates/ingredient/view.html:209
+#: nutrition/templates/ingredient/view.html:254
msgid "Delete"
msgstr "删除"
-#: core/forms.py:281
+#: core/forms.py:279
msgid "Invalid password"
msgstr "密码无效"
-#: core/forms.py:293
+#: core/forms.py:291 core/forms.py:349
msgid "The form is secured with reCAPTCHA"
msgstr "该表格由 reCAPTCHA 保护"
-#: core/forms.py:314 core/forms.py:341 core/templates/navigation.html:272
-#: core/templates/navigation.html:285 core/templates/template.html:123
-#: core/templates/user/login.html:21 core/views/user.py:285
+#: core/forms.py:312 core/forms.py:339 core/templates/navigation.html:269
+#: core/templates/navigation.html:282 core/templates/template.html:113
+#: core/templates/user/login.html:21 core/views/user.py:293
#: software/templates/features.html:87 software/templates/features.html:442
msgid "Register"
msgstr "注册"
+#: core/forms.py:360 weight/templates/import_csv_form.html:9
+msgid "Submit"
+msgstr "提交"
+
#: core/models/language.py:31 core/templates/language/view.html:21
msgid "Language short name"
msgstr "语言缩写"
@@ -197,36 +199,36 @@ msgstr "链接"
msgid "Link to license text or other information"
msgstr "指向许可协议文本和其他信息的链接"
-#: core/models/profile.py:57
+#: core/models/profile.py:60
#, python-format
msgid "%(birthdate)s is not a valid birthdate"
msgstr "%(birthdate)s不是一个有效的出生日期"
-#: core/models/profile.py:66
+#: core/models/profile.py:69
msgid "Male"
msgstr "男"
-#: core/models/profile.py:67
+#: core/models/profile.py:70
msgid "Female"
msgstr "女"
-#: core/models/profile.py:74
+#: core/models/profile.py:77
msgid "Low"
msgstr "低"
-#: core/models/profile.py:75
+#: core/models/profile.py:78
msgid "Medium"
msgstr "中"
-#: core/models/profile.py:76
+#: core/models/profile.py:79
msgid "High"
msgstr "高"
-#: core/models/profile.py:82
+#: core/models/profile.py:85
msgid "Metric (kilogram)"
msgstr "公制(千克)"
-#: core/models/profile.py:83
+#: core/models/profile.py:86
msgid "Imperial (pound)"
msgstr "英制(磅)"
@@ -342,7 +344,7 @@ msgstr "每周平均时长"
msgid "Free time"
msgstr "自由时间"
-#: core/models/profile.py:320 nutrition/templates/rate/form.html:66
+#: core/models/profile.py:320 nutrition/templates/rate/form.html:67
msgid "Total daily calories"
msgstr "每日总卡路里"
@@ -382,20 +384,45 @@ msgstr "开启奖杯"
msgid "Enable or disable the trophy system for this user"
msgstr "启用或禁用此用户的奖杯系统"
-#: core/models/profile.py:446
+#: core/models/profile.py:457
msgid "The sum of all hours has to be 24"
msgstr "所有时长的和应该是24"
-#: core/models/rep_unit.py:36 core/models/weight_unit.py:42
-#: core/templates/user/overview.html:280 core/views/user.py:589
+#: core/models/rep_unit.py:32 i18n.tpl:30
+msgid "Repetitions"
+msgstr "重复次数"
+
+#: core/models/rep_unit.py:33 core/templates/user/overview.html:82
+#: exercises/templates/history/overview.html:30
+msgid "Time"
+msgstr "时间"
+
+#: core/models/rep_unit.py:34
+#, fuzzy
+#| msgid "Resistance band"
+msgid "Distance"
+msgstr "弹力带"
+
+#: core/models/rep_unit.py:47 core/models/weight_unit.py:42
+#: core/templates/user/overview.html:283 core/views/user.py:605
#: exercises/models/muscle.py:36 gym/models/contract.py:52
#: gym/models/contract.py:103 gym/models/gym.py:46
#: gym/models/user_document.py:84 gym/templates/contract/view.html:50
#: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:108
-#: gym/views/gym.py:158 nutrition/templates/ingredient/view.html:151
+#: gym/views/gym.py:158 nutrition/templates/ingredient/view.html:192
msgid "Name"
msgstr "名称"
+#: core/models/rep_unit.py:53
+#, fuzzy
+#| msgid "Unit"
+msgid "Unit Type"
+msgstr "单元"
+
+#: core/models/rep_unit.py:54
+msgid "The type of unit (repetitions, time, or distance)"
+msgstr ""
+
#: core/templates/403.html:4
msgid "Forbidden!"
msgstr "禁止!"
@@ -425,6 +452,54 @@ msgstr ""
"服务器在处理您的请求时出现错误。尝试刷新您的浏览器,如果没有帮助,请稍后再"
"试。如果问题仍然存在,您可以通过以下方式寻求帮助:"
+#: core/templates/account/email/email_confirmation_message.html:81
+msgid "Almost there!"
+msgstr ""
+
+#: core/templates/account/email/email_confirmation_message.html:85
+#, fuzzy, python-format
+#| msgid ""
+#| "You're receiving this e-mail because you requested a password reset for "
+#| "your user account at %(site_name)s."
+msgid ""
+"You're receiving this email because the user \"%(user_display)s\" has given "
+"your email address to register an account on %(site_domain)s."
+msgstr ""
+"你收到这封邮件是因为你在%(site_name)s站点为你的账户提交了重置密码的请求。"
+
+#: core/templates/account/email/email_confirmation_message.html:93
+msgid ""
+"Your email verification code is listed below. Please enter it in your open "
+"browser window."
+msgstr ""
+
+#: core/templates/account/email/email_confirmation_message.html:100
+#, fuzzy
+#| msgid "Please click the following link to confirm your email: %(link)s"
+msgid "Please click the button below to confirm your email address."
+msgstr "请点击以下连接以确认您的邮箱:%(link)s"
+
+#: core/templates/account/email/email_confirmation_message.html:106
+#, fuzzy
+#| msgid "Unverified email"
+msgid "Confirm email"
+msgstr "未验证的邮箱"
+
+#: core/templates/account/email/email_confirmation_message.html:110
+#, python-format
+msgid ""
+"The link is valid for %(expire_hours)s hours (until %(date)s, %(time)s). You "
+"can request a new one from your profile settings."
+msgstr ""
+
+#: core/templates/account/email/email_confirmation_message.html:116
+msgid "If the button doesn't work, copy and paste this link into your browser:"
+msgstr ""
+
+#: core/templates/account/email/email_confirmation_message.html:125
+msgid "the wger Team"
+msgstr "维格小组"
+
#: core/templates/base.html:10
#, python-format
msgid ""
@@ -457,51 +532,7 @@ 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 verification"
-msgstr "邮箱验证"
-
-#: core/templates/email_verification/confirm_template.html:18
-#, python-format
-msgid "%(username)s, your email was verified"
-msgstr "%(username)s, 您的电子邮件已验证"
-
-#: core/templates/email_verification/confirm_template.html:22
-msgid "Error, invalid verification token"
-msgstr "错误,无效的验证Token"
-
-#: 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 "你即将完成,%(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 "请点击 <a href=\"%(link)s\">这里</a> 来验证你的邮箱"
-
-#: 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 "此token将在 %(time)s过期"
-
-#: 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 "请点击以下连接以确认您的邮箱:%(link)s"
-
-#: core/templates/language/overview.html:4 core/templates/navigation.html:344
+#: core/templates/language/overview.html:4 core/templates/navigation.html:341
msgid "Languages"
msgstr "语言"
@@ -510,16 +541,16 @@ msgid "Nothing found."
msgstr "未找到匹配项。"
#: core/templates/language/overview.html:22
-#: nutrition/templates/ingredient/overview.html:38
+#: nutrition/templates/ingredient/overview.html:43
msgid "Add one now."
msgstr "现在就新增一个。"
#: core/templates/language/overview.html:34 core/templates/license/list.html:43
-#: core/templates/repetition_unit/list.html:46
-#: core/templates/user/overview.html:344 core/templates/user/overview.html:384
-#: core/templates/user/overview.html:422
-#: core/templates/weight_unit/list.html:46 core/views/languages.py:74
-#: core/views/license.py:66 core/views/repetition_units.py:66
+#: core/templates/repetition_unit/list.html:44
+#: core/templates/user/overview.html:347 core/templates/user/overview.html:387
+#: core/templates/user/overview.html:425
+#: core/templates/weight_unit/list.html:46 core/views/languages.py:77
+#: core/views/license.py:66 core/views/repetition_units.py:76
#: core/views/weight_units.py:66
#: exercises/templates/categories/admin-overview.html:40
#: exercises/templates/equipment/admin-overview.html:39
@@ -532,14 +563,14 @@ msgstr "现在就新增一个。"
#: gym/templates/gym/member_list.html:264
#: gym/templates/gym/member_list.html:303
#: mailer/templates/mailer/gym/overview.html:43
-#: nutrition/templates/ingredient/overview.html:60
+#: nutrition/templates/ingredient/overview.html:97
msgid "Add"
msgstr "新增"
#: core/templates/language/view.html:61 core/templates/user/api_key.html:41
#: core/templates/user/preferences.html:50 gym/models/contract.py:203
#: gym/templates/contract/view.html:41 gym/templates/gym/member_list.html:270
-#: nutrition/templates/ingredient/view.html:206
+#: nutrition/templates/ingredient/view.html:245
msgid "Options"
msgstr "选项"
@@ -549,9 +580,9 @@ msgstr "许可协议列表"
#: core/templates/license/list.html:30
#: core/templates/repetition_unit/list.html:32
-#: core/templates/user/overview.html:104 core/templates/user/overview.html:136
-#: core/templates/user/overview.html:185 core/templates/user/overview.html:365
-#: core/templates/user/overview.html:404 core/templates/user/overview.html:448
+#: core/templates/user/overview.html:107 core/templates/user/overview.html:139
+#: core/templates/user/overview.html:188 core/templates/user/overview.html:368
+#: core/templates/user/overview.html:407 core/templates/user/overview.html:451
#: core/templates/weight_unit/list.html:32
#: exercises/templates/categories/admin-overview.html:30
#: exercises/templates/equipment/admin-overview.html:30
@@ -563,11 +594,10 @@ msgstr "许可协议列表"
#: gym/templates/gym/member_list.html:284
#: gym/templates/gym/member_list.html:321
#: mailer/templates/mailer/gym/overview.html:30
-#: nutrition/templates/units/list.html:34
msgid "Nothing found"
msgstr "没有找到任何内容"
-#: core/templates/misc/about.html:4 core/templates/template.html:160
+#: core/templates/misc/about.html:4 core/templates/template.html:150
msgid "Imprint"
msgstr "版本说明"
@@ -575,162 +605,157 @@ msgstr "版本说明"
msgid "Training"
msgstr "训练"
-#: core/templates/navigation.html:37 core/templates/user/overview.html:25
+#: core/templates/navigation.html:36 core/templates/user/overview.html:28
msgid "Routines"
msgstr "训练计划"
-#: core/templates/navigation.html:45 core/templates/user/overview.html:70
+#: core/templates/navigation.html:44 core/templates/user/overview.html:73
msgid "Calendar"
msgstr "日历"
-#: core/templates/navigation.html:55
+#: core/templates/navigation.html:53
msgid "Measurements"
msgstr "测量"
-#: core/templates/navigation.html:66 gallery/templates/images/overview.html:6
+#: core/templates/navigation.html:64 gallery/templates/images/overview.html:6
msgid "Gallery"
msgstr "画廊"
-#: core/templates/navigation.html:72
+#: core/templates/navigation.html:74 core/templates/navigation.html:400
+#: trophies/templates/trophies/overview.html:7
+msgid "Trophies"
+msgstr "奖杯"
+
+#: core/templates/navigation.html:79
msgid "Workout templates"
msgstr "健身模板"
-#: core/templates/navigation.html:79
+#: core/templates/navigation.html:86
msgid "Your templates"
msgstr "你的模板"
-#: core/templates/navigation.html:88
+#: core/templates/navigation.html:95
msgid "Public templates"
msgstr "公共模板"
-#: core/templates/navigation.html:96 software/templates/features.html:51
+#: core/templates/navigation.html:103 software/templates/features.html:51
#: software/templates/features.html:480
msgid "Exercises"
msgstr "练习"
-#: core/templates/navigation.html:102 core/templates/navigation.html:176
-#: core/templates/navigation.html:339
+#: core/templates/navigation.html:109 core/templates/navigation.html:336
msgid "Administration"
msgstr "管理"
-#: core/templates/navigation.html:106
+#: core/templates/navigation.html:113
msgid "Exercise edit history"
msgstr "训练变更记录"
-#: core/templates/navigation.html:112
+#: core/templates/navigation.html:119
msgid "Equipment"
msgstr "器材"
-#: core/templates/navigation.html:118
+#: core/templates/navigation.html:125
msgid "Muscles"
msgstr "肌肉"
-#: core/templates/navigation.html:124
+#: core/templates/navigation.html:131
#: exercises/templates/categories/admin-overview.html:4
msgid "Categories"
msgstr "类别"
-#: core/templates/navigation.html:139 software/templates/features.html:468
+#: core/templates/navigation.html:146 software/templates/features.html:468
msgid "Nutrition"
msgstr "营养"
-#: core/templates/navigation.html:147 core/templates/user/overview.html:144
+#: core/templates/navigation.html:154 core/templates/user/overview.html:147
msgid "Nutrition plans"
msgstr "营养计划"
-#: core/templates/navigation.html:156
+#: core/templates/navigation.html:163
msgid "BMI calculator"
msgstr "体重指数计算器"
-#: core/templates/navigation.html:165 nutrition/templates/rate/form.html:17
+#: core/templates/navigation.html:172 nutrition/templates/rate/form.html:18
msgid "Daily calories calculator"
msgstr "每日卡路里计算器"
-#: core/templates/navigation.html:171
+#: core/templates/navigation.html:178
#: nutrition/templates/ingredient/overview.html:10
msgid "Ingredient overview"
msgstr "食谱总览"
-#: core/templates/navigation.html:180 nutrition/templates/units/list.html:6
-msgid "Ingredient weight units"
-msgstr "食谱计量单位"
-
-#: core/templates/navigation.html:196 software/templates/features.html:463
+#: core/templates/navigation.html:193 software/templates/features.html:463
msgid "Body weight"
msgstr "体重"
-#: core/templates/navigation.html:203 core/templates/user/overview.html:114
+#: core/templates/navigation.html:200 core/templates/user/overview.html:117
msgid "Weight overview"
msgstr "体重总览"
-#: core/templates/navigation.html:217
+#: core/templates/navigation.html:214
msgid "About this software"
msgstr "关于软件"
-#: core/templates/navigation.html:223 software/templates/about_us.html:5
+#: core/templates/navigation.html:220 software/templates/about_us.html:5
msgid "Support & Get Involved"
msgstr "支持与参与"
-#: core/templates/navigation.html:229 software/templates/features.html:528
+#: core/templates/navigation.html:226 software/templates/features.html:528
msgid "REST API"
msgstr "REST API"
-#: core/templates/navigation.html:235 utils/models.py:45
+#: core/templates/navigation.html:232 utils/models.py:45
msgid "License"
msgstr "许可协议"
-#: core/templates/navigation.html:241
+#: core/templates/navigation.html:238
msgid "Developer documentation"
msgstr "开发者文档"
-#: core/templates/navigation.html:248
+#: core/templates/navigation.html:245
msgid "Get the code"
msgstr "获取源码"
-#: core/templates/navigation.html:255 core/templates/template.html:199
-#: software/templates/features.html:603
+#: core/templates/navigation.html:252 core/templates/template.html:202
+#: software/templates/features.html:614
msgid "Translate"
msgstr "翻译"
-#: core/templates/navigation.html:292 core/templates/user/login.html:30
+#: core/templates/navigation.html:289 core/templates/user/login.html:30
msgid "Reset password"
msgstr "重设密码"
-#: core/templates/navigation.html:301 core/templates/navigation.html:329
+#: core/templates/navigation.html:298 core/templates/navigation.html:326
msgid "Logout"
msgstr "退出"
-#: core/templates/navigation.html:320
+#: core/templates/navigation.html:317
msgid "My preferences"
msgstr "我的首选项"
-#: core/templates/navigation.html:352
+#: core/templates/navigation.html:349
msgid "Licenses"
msgstr "许可协议"
-#: core/templates/navigation.html:360
+#: core/templates/navigation.html:357
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr "重复单元"
-#: core/templates/navigation.html:368 core/templates/weight_unit/list.html:4
-#: nutrition/templates/ingredient/view.html:141
+#: core/templates/navigation.html:365 core/templates/weight_unit/list.html:4
+#: nutrition/templates/ingredient/view.html:182
msgid "Weight units"
msgstr "重量单位"
-#: core/templates/navigation.html:376 core/templates/user/list.html:4
+#: core/templates/navigation.html:373 core/templates/user/list.html:4
msgid "User list"
msgstr "用户列表"
-#: core/templates/navigation.html:382
+#: core/templates/navigation.html:379
msgid "Gyms"
msgstr "健身房"
-#: core/templates/navigation.html:403
-#: trophies/templates/trophies/overview.html:7
-msgid "Trophies"
-msgstr "奖杯"
-
#: core/templates/registration/password_reset_complete.html:4
msgid "Password reset complete"
msgstr "密码重置完成"
@@ -788,25 +813,29 @@ msgstr "前"
msgid "next"
msgstr "后"
-#: core/templates/template.html:96
+#: core/templates/template.html:86
msgid "Close"
msgstr "关闭"
-#: core/templates/template.html:112
+#: core/templates/template.html:102
msgid ""
"You are using a guest account, data entered will be deleted after a week."
msgstr "你正在以访客模式浏览,输入的数据会在一周后删除."
-#: core/templates/template.html:117
+#: core/templates/template.html:107
msgid "Create some demo entries"
msgstr "创建一些示例项"
-#: core/templates/template.html:165 software/templates/features.html:568
+#: core/templates/template.html:155 software/templates/features.html:568
#: software/templates/tos.html:7
msgid "Terms of service"
msgstr "服务条款"
-#: core/templates/template_features.html:53 software/templates/features.html:9
+#: core/templates/template.html:181 software/templates/features.html:595
+msgid "Browser language"
+msgstr ""
+
+#: core/templates/template_features.html:46 software/templates/features.html:9
msgid "Features"
msgstr "特色"
@@ -864,99 +893,94 @@ msgstr "没有账户?"
msgid "Forgot password?"
msgstr "忘记密码?"
-#: core/templates/user/overview.html:25 core/templates/user/overview.html:68
-#: core/templates/user/overview.html:112 core/templates/user/overview.html:144
-#: core/templates/user/overview.html:348 core/templates/user/overview.html:390
-#: core/templates/user/overview.html:426
+#: core/templates/user/overview.html:28 core/templates/user/overview.html:71
+#: core/templates/user/overview.html:115 core/templates/user/overview.html:147
+#: core/templates/user/overview.html:351 core/templates/user/overview.html:393
+#: core/templates/user/overview.html:429
#, python-format
msgid "last %(number)s"
msgstr "最后%(number)s"
-#: core/templates/user/overview.html:27 core/templates/user/overview.html:146
-#: core/templates/user/overview.html:343 core/templates/user/overview.html:382
-#: core/templates/user/overview.html:421 gym/templates/gym/member_list.html:226
+#: core/templates/user/overview.html:30 core/templates/user/overview.html:149
+#: core/templates/user/overview.html:346 core/templates/user/overview.html:385
+#: core/templates/user/overview.html:424 gym/templates/gym/member_list.html:226
#: gym/templates/gym/member_list.html:262
#: gym/templates/gym/member_list.html:302
msgid "Overview"
msgstr "总览"
-#: core/templates/user/overview.html:34 core/templates/user/overview.html:76
-#: core/templates/user/overview.html:120 core/templates/user/overview.html:152
+#: core/templates/user/overview.html:37 core/templates/user/overview.html:79
+#: core/templates/user/overview.html:123 core/templates/user/overview.html:155
#: manager/helpers.py:88 software/templates/about_us.html:170
#: weight/templates/import_csv_preview.html:13
#: weight/templates/import_csv_preview.html:42 weight/views.py:54
msgid "Date"
msgstr "日期"
-#: core/templates/user/overview.html:35 core/templates/user/overview.html:153
+#: core/templates/user/overview.html:38 core/templates/user/overview.html:156
#: gym/models/contract.py:58 gym/models/contract.py:109
msgid "Description"
msgstr "目标"
-#: core/templates/user/overview.html:36
+#: core/templates/user/overview.html:39
msgid "Number of logs (days)"
msgstr "日志数(天)"
-#: core/templates/user/overview.html:37 core/views/user.py:590
+#: core/templates/user/overview.html:40 core/views/user.py:606
#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:158
msgid "Last activity"
msgstr "最后一次活动"
-#: core/templates/user/overview.html:58
+#: core/templates/user/overview.html:61
msgid "No workouts found."
msgstr "没有健身记录。"
-#: core/templates/user/overview.html:68
+#: core/templates/user/overview.html:71
msgid "Log"
msgstr "日志"
-#: core/templates/user/overview.html:77
+#: core/templates/user/overview.html:80
msgid "General impression"
msgstr "总体印象"
-#: core/templates/user/overview.html:78 core/templates/user/overview.html:390
+#: core/templates/user/overview.html:81 core/templates/user/overview.html:393
msgid "Notes"
msgstr "备注"
-#: core/templates/user/overview.html:79
-#: exercises/templates/history/overview.html:30
-msgid "Time"
-msgstr "时间"
-
-#: core/templates/user/overview.html:112 core/templates/user/overview.html:121
+#: core/templates/user/overview.html:115 core/templates/user/overview.html:124
#: manager/helpers.py:89 weight/templates/import_csv_preview.html:14
#: weight/templates/import_csv_preview.html:43 weight/views.py:54
msgid "Weight"
msgstr "重量"
-#: core/templates/user/overview.html:154
-#: nutrition/templates/ingredient/view.html:51 nutrition/views/plan.py:245
+#: core/templates/user/overview.html:157
+#: nutrition/templates/ingredient/view.html:52 nutrition/views/plan.py:244
msgid "Energy"
msgstr "能量"
-#: core/templates/user/overview.html:155
-#: nutrition/templates/ingredient/view.html:58 nutrition/views/plan.py:251
+#: core/templates/user/overview.html:158
+#: nutrition/templates/ingredient/view.html:59 nutrition/views/plan.py:250
msgid "Protein"
msgstr "蛋白质"
-#: core/templates/user/overview.html:156
-#: nutrition/templates/ingredient/view.html:64 nutrition/views/plan.py:259
+#: core/templates/user/overview.html:159
+#: nutrition/templates/ingredient/view.html:65 nutrition/views/plan.py:258
msgid "Carbohydrates"
msgstr "碳水化合物"
-#: core/templates/user/overview.html:157
-#: nutrition/templates/ingredient/view.html:80 nutrition/views/plan.py:273
+#: core/templates/user/overview.html:160
+#: nutrition/templates/ingredient/view.html:81 nutrition/views/plan.py:272
msgid "Fat"
msgstr "脂肪"
-#: core/templates/user/overview.html:170
-#: nutrition/templates/ingredient/view.html:53
+#: core/templates/user/overview.html:173
+#: nutrition/templates/ingredient/view.html:54
msgid "kcal"
msgstr "千卡"
-#: core/templates/user/overview.html:201 core/templates/user/overview.html:340
-#: core/templates/user/overview.html:379 core/templates/user/overview.html:418
-#: core/templates/user/overview.html:463 gym/templates/gym/list.html:45
+#: core/templates/user/overview.html:204 core/templates/user/overview.html:343
+#: core/templates/user/overview.html:382 core/templates/user/overview.html:421
+#: core/templates/user/overview.html:466 gym/templates/gym/list.html:45
#: gym/templates/gym/member_list.html:91 gym/templates/gym/member_list.html:149
#: gym/templates/gym/member_list.html:187
#: gym/templates/gym/member_list.html:223
@@ -965,109 +989,113 @@ msgstr "千卡"
msgid "Actions"
msgstr "操作"
-#: core/templates/user/overview.html:210
+#: core/templates/user/overview.html:213
msgid "Deactivate user"
msgstr "非活跃用户"
-#: core/templates/user/overview.html:214
+#: core/templates/user/overview.html:217
msgid "Activate user"
msgstr "活跃用户"
-#: core/templates/user/overview.html:223
+#: core/templates/user/overview.html:226
msgid "Reset user password"
msgstr "重置用户密码"
-#: core/templates/user/overview.html:227 gym/templates/gym/member_list.html:30
+#: core/templates/user/overview.html:230 gym/templates/gym/member_list.html:30
msgid "Roles"
msgstr "角色"
-#: core/templates/user/overview.html:243
+#: core/templates/user/overview.html:246
msgid "Password reset confirmation"
msgstr "密码重置确认"
-#: core/templates/user/overview.html:247
+#: core/templates/user/overview.html:250
msgid "Do you really want to change this user&#39;s password?"
msgstr "真的要修改用户&#39;的密码?"
-#: core/templates/user/overview.html:250
+#: core/templates/user/overview.html:253
#: exercises/templates/history/overview.html:106
+#: nutrition/templates/ingredient/view.html:148
+#: nutrition/templates/ingredient/view.html:160
msgid "No"
msgstr "否"
-#: core/templates/user/overview.html:251
+#: core/templates/user/overview.html:254
#: exercises/templates/history/overview.html:99
+#: nutrition/templates/ingredient/view.html:146
+#: nutrition/templates/ingredient/view.html:158
msgid "Yes"
msgstr "是"
-#: core/templates/user/overview.html:272 gym/templates/gym/member_list.html:105
+#: core/templates/user/overview.html:275 gym/templates/gym/member_list.html:105
msgid "Details"
msgstr "详细"
-#: core/templates/user/overview.html:276 gym/views/export.py:57
-#: manager/helpers.py:89 nutrition/views/plan.py:151
-#: nutrition/views/plan.py:157
+#: core/templates/user/overview.html:279 gym/views/export.py:57
+#: manager/helpers.py:89 nutrition/views/plan.py:150
+#: nutrition/views/plan.py:156
msgid "Nr."
msgstr "序号"
-#: core/templates/user/overview.html:298 gym/models/contract.py:287
+#: core/templates/user/overview.html:301 gym/models/contract.py:287
#: gym/models/gym.py:50 gym/templates/contract/view.html:75
#: gym/templates/gym/member_list.html:112 gym/views/export.py:68
msgid "Phone"
msgstr "手机"
-#: core/templates/user/overview.html:302 gym/templates/contract/view.html:87
+#: core/templates/user/overview.html:305 gym/templates/contract/view.html:87
#: gym/templates/gym/member_list.html:130
msgid "Address"
msgstr "地址"
-#: core/templates/user/overview.html:313
+#: core/templates/user/overview.html:316
msgid "Registered"
msgstr "注册时间"
-#: core/templates/user/overview.html:317
+#: core/templates/user/overview.html:320
msgid "Last login"
msgstr "最后登录"
-#: core/templates/user/overview.html:322
+#: core/templates/user/overview.html:325
msgid "Status"
msgstr "状态"
-#: core/templates/user/overview.html:325
+#: core/templates/user/overview.html:328
msgid "Active"
msgstr "活跃"
-#: core/templates/user/overview.html:327
+#: core/templates/user/overview.html:330
msgid "Inactive"
msgstr "非活跃"
-#: core/templates/user/overview.html:348 gym/templates/contract/list.html:4
+#: core/templates/user/overview.html:351 gym/templates/contract/list.html:4
#: gym/templates/gym/member_list.html:218
msgid "Contracts"
msgstr "合同"
-#: core/templates/user/overview.html:426 gym/templates/document/list.html:4
+#: core/templates/user/overview.html:429 gym/templates/document/list.html:4
msgid "Documents"
msgstr "文档"
-#: core/templates/user/overview.html:433 gym/templates/document/list.html:33
+#: core/templates/user/overview.html:436 gym/templates/document/list.html:33
msgid "Download"
msgstr "下载"
-#: core/templates/user/overview.html:474 gym/views/admin_config.py:44
+#: core/templates/user/overview.html:477 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:477 gym/models/user_config.py:92
+#: core/templates/user/overview.html:480 gym/models/user_config.py:92
msgid "Include in inactive overview"
msgstr "包含在非活动概览中"
-#: core/templates/user/overview.html:510
+#: core/templates/user/overview.html:513
#, python-format
msgid "Admin login is only available for users in %(gym_name)s"
msgstr "管理员登录权限只对%(gym_name)s的用户开放"
-#: core/templates/user/overview.html:514
+#: core/templates/user/overview.html:517
msgid "Log in as this user"
msgstr "以该用户登录"
@@ -1091,7 +1119,7 @@ msgstr "发送验证邮件"
msgid "You need to verify your email to contribute exercises"
msgstr "您需要验证您的邮箱来添加锻炼项目"
-#: core/templates/user/preferences.html:55 core/views/user.py:601
+#: core/templates/user/preferences.html:55 core/views/user.py:617
msgid "Change password"
msgstr "修改密码"
@@ -1099,23 +1127,23 @@ msgstr "修改密码"
msgid "Already have an account?"
msgstr "已有账户?"
-#: core/templatetags/wger_extras.py:142 i18n.tpl:38
+#: core/templatetags/wger_extras.py:142 i18n.tpl:39
msgid "kg"
msgstr "千克"
#: core/templatetags/wger_extras.py:144
-#: nutrition/templates/ingredient/view.html:60
-#: nutrition/templates/ingredient/view.html:66
-#: nutrition/templates/ingredient/view.html:73
-#: nutrition/templates/ingredient/view.html:82
-#: nutrition/templates/ingredient/view.html:89
-#: nutrition/templates/ingredient/view.html:111
-#: nutrition/templates/ingredient/view.html:121
+#: nutrition/templates/ingredient/view.html:61
+#: nutrition/templates/ingredient/view.html:67
+#: nutrition/templates/ingredient/view.html:74
+#: nutrition/templates/ingredient/view.html:83
+#: nutrition/templates/ingredient/view.html:90
+#: nutrition/templates/ingredient/view.html:112
+#: nutrition/templates/ingredient/view.html:122
msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr "克"
-#: core/templatetags/wger_extras.py:147 i18n.tpl:39
+#: core/templatetags/wger_extras.py:147 i18n.tpl:40
msgid "lb"
msgstr "磅"
@@ -1124,36 +1152,35 @@ msgctxt "weight unit, i.e. ounces"
msgid "oz"
msgstr "盎司"
-#: core/views/languages.py:85 exercises/views/categories.py:122
+#: core/views/languages.py:88 exercises/views/categories.py:122
#: exercises/views/equipment.py:103 exercises/views/muscles.py:99
-#: nutrition/views/ingredient.py:120 nutrition/views/unit.py:110
+#: nutrition/views/ingredient.py:125
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
+#: core/views/languages.py:96 core/views/license.py:103
+#: core/views/repetition_units.py:114 core/views/weight_units.py:115
#: exercises/views/categories.py:128 exercises/views/muscles.py:106
#: gallery/views/images.py:124 gym/views/admin_notes.py:196
#: gym/views/document.py:206 gym/views/gym.py:481
-#: nutrition/views/ingredient.py:127 nutrition/views/unit.py:117
+#: nutrition/views/ingredient.py:132
#, python-brace-format
msgid "Delete {0}?"
msgstr "删除 {0}?"
-#: core/views/languages.py:111 core/views/license.py:85
-#: core/views/repetition_units.py:86 core/views/user.py:464
+#: core/views/languages.py:114 core/views/license.py:85
+#: core/views/repetition_units.py:96 core/views/user.py:480
#: core/views/weight_units.py:86 exercises/views/categories.py:98
#: exercises/views/equipment.py:81 exercises/views/muscles.py:87
#: gym/views/admin_notes.py:161 gym/views/config.py:68
#: gym/views/contract.py:186 gym/views/contract_option.py:123
#: gym/views/contract_type.py:123 gym/views/document.py:171
-#: gym/views/gym.py:463 nutrition/views/ingredient.py:146
-#: nutrition/views/unit.py:143
+#: gym/views/gym.py:463 nutrition/views/ingredient.py:151
#, python-brace-format
msgid "Edit {0}"
msgstr "编辑 {0}"
-#: core/views/misc.py:74
+#: core/views/misc.py:73
msgid ""
"We have created sample workout, workout schedules, weight logs, (body) "
"weight and nutrition plan entries so you can better see what this site can "
@@ -1163,48 +1190,48 @@ msgstr ""
"些,你可以更加深入了解到这个网站可以做到什么 你可以随意编辑或者删除这些数"
"据!"
-#: core/views/user.py:143
+#: core/views/user.py:145
#, python-brace-format
msgid "Account \"{0}\" was successfully deleted"
msgstr "账户\"{0}\"已经被成功删除"
-#: core/views/user.py:279
+#: core/views/user.py:287
msgid "You were successfully registered"
msgstr "你已成功注册"
-#: core/views/user.py:341
+#: core/views/user.py:357
msgid "Settings successfully updated"
msgstr "设置更新成功"
-#: core/views/user.py:380
+#: core/views/user.py:396
msgid "The user was successfully deactivated"
msgstr "该用户已经被成功置为非活跃"
-#: core/views/user.py:417
+#: core/views/user.py:433
msgid "The user was successfully activated"
msgstr "该用户已经被成功置为活跃"
-#: core/views/user.py:432
+#: core/views/user.py:448
msgid "Edit user"
msgstr "编辑用户"
-#: core/views/user.py:587 gym/templates/gym/member_list.html:26
+#: core/views/user.py:603 gym/templates/gym/member_list.html:26
#: gym/views/gym.py:158
msgid "ID"
msgstr "ID"
-#: core/views/user.py:588 gym/forms.py:95 gym/templates/contract/view.html:55
+#: core/views/user.py:604 gym/forms.py:95 gym/templates/contract/view.html:55
#: gym/templates/gym/member_list.html:27 gym/views/export.py:59
#: gym/views/gym.py:158 gym/views/gym.py:217
msgid "Username"
msgstr "用户名"
-#: core/views/user.py:591 gym/templates/gym/new_user.html:34
+#: core/views/user.py:607 gym/templates/gym/new_user.html:34
#: gym/views/export.py:58 gym/views/gym.py:217
msgid "Gym"
msgstr "健身房"
-#: core/views/user.py:650
+#: core/views/user.py:678
#, python-format
msgid "A verification email was sent to %(email)s"
msgstr "一封验证邮箱已发送至 %(email)s"
@@ -1221,16 +1248,16 @@ msgstr "別称"
msgid "A more basic name for the muscle"
msgstr "肌肉的基本名称"
-#: exercises/models/video.py:50
+#: exercises/models/video.py:52
#, python-format
msgid "Maximum file size is %(size)sMB."
msgstr "最大文件尺寸为 %(size)sMB."
-#: exercises/models/video.py:57 exercises/models/video.py:65
+#: exercises/models/video.py:59 exercises/models/video.py:67
msgid "File type is not supported"
msgstr "不支持文件类型"
-#: exercises/models/video.py:70
+#: exercises/models/video.py:72
msgid "File is not a valid video"
msgstr "这不是一个有效的视频文件"
@@ -1301,7 +1328,11 @@ msgstr "删除器材?"
msgid "Add muscle"
msgstr "新增肌肉"
-#: gallery/templates/images/overview.html:72
+#: gallery/forms.py:35
+msgid "If date is left empty, it will be read from the image instead"
+msgstr ""
+
+#: gallery/templates/images/overview.html:69
msgid "Add image"
msgstr "添加图片"
@@ -1367,7 +1398,7 @@ msgid "Contract type"
msgstr "合同类型"
#: gym/models/contract.py:211 gym/templates/contract/view.html:59
-#: nutrition/forms.py:58
+#: nutrition/forms.py:67
msgid "Amount"
msgstr "数量"
@@ -1543,7 +1574,7 @@ msgstr "邮件"
msgid "Add member"
msgstr "新增会员"
-#: gym/templates/gym/new_user.html:48 nutrition/templates/rate/form.html:120
+#: gym/templates/gym/new_user.html:48 nutrition/templates/rate/form.html:121
msgid "Info"
msgstr "提示"
@@ -1713,10 +1744,6 @@ msgstr "上拉杆"
msgid "Quads"
msgstr "股四頭肌"
-#: i18n.tpl:30
-msgid "Repetitions"
-msgstr "重复次数"
-
#: i18n.tpl:31
msgid "Resistance band"
msgstr "弹力带"
@@ -1745,178 +1772,184 @@ msgstr "肱三头肌"
msgid "Until Failure"
msgstr "直到力竭"
-#: i18n.tpl:40
+#: i18n.tpl:38
+#, fuzzy
+#| msgid "Kilometers"
+msgid "Meters"
+msgstr "公里"
+
+#: i18n.tpl:41
msgid "none (bodyweight exercise)"
msgstr "无(体重锻炼)"
-#: i18n.tpl:41
+#: i18n.tpl:42
msgid "Beginner"
msgstr "入门"
-#: i18n.tpl:42
+#: i18n.tpl:43
msgid "Consistent"
msgstr "规律"
-#: i18n.tpl:43
+#: i18n.tpl:44
msgid "Dedicated"
msgstr "资深"
-#: i18n.tpl:44
+#: i18n.tpl:45
msgid "Obsessed"
msgstr "狂热"
-#: i18n.tpl:45
+#: i18n.tpl:46
msgid "Legend"
msgstr "说明"
-#: i18n.tpl:46
+#: i18n.tpl:47
msgid "Veteran"
msgstr "大神"
-#: i18n.tpl:47
+#: i18n.tpl:48
msgid "Titan"
msgstr "泰坦"
-#: i18n.tpl:48
+#: i18n.tpl:49
msgid "Unstoppable"
msgstr "战神"
-#: i18n.tpl:49
+#: i18n.tpl:50
msgid "Weekend Warrior"
msgstr "周末运动达人"
-#: i18n.tpl:50
+#: i18n.tpl:51
msgid "Elephant lifter"
msgstr "力量怪兽"
-#: i18n.tpl:51
+#: i18n.tpl:52
msgid "Bus lifter"
msgstr "人力起重机"
-#: i18n.tpl:52
+#: i18n.tpl:53
msgid "Plane lifter"
msgstr "撼天者"
-#: i18n.tpl:53
+#: i18n.tpl:54
msgid "Blue whale lifter"
msgstr "深海巨兽"
-#: i18n.tpl:54
+#: i18n.tpl:55
msgid "Space Station lifter"
msgstr "星环使者"
-#: i18n.tpl:55
+#: i18n.tpl:56
msgid "Millionaire"
msgstr "百万量级"
-#: i18n.tpl:56
+#: i18n.tpl:57
msgid "Atlas"
msgstr "阿特拉斯"
-#: i18n.tpl:57
+#: i18n.tpl:58
msgid "Early Bird"
msgstr "早鸟"
-#: i18n.tpl:58
+#: i18n.tpl:59
msgid "Night Owl"
msgstr "夜猫子"
-#: i18n.tpl:59
+#: i18n.tpl:60
msgid "New Year, New Me"
msgstr "新年,蜕变"
-#: i18n.tpl:60
+#: i18n.tpl:61
msgid "Phoenix"
msgstr "不死鸟"
-#: i18n.tpl:61
+#: i18n.tpl:62
#, fuzzy
#| msgid "Personal data"
msgid "Personal Record"
msgstr "个人数据"
-#: i18n.tpl:62
+#: i18n.tpl:63
msgid "Complete your first workout"
msgstr "完成你的首次训练"
-#: i18n.tpl:63
+#: i18n.tpl:64
msgid "Complete 10 workouts"
msgstr "完成10次训练"
-#: i18n.tpl:64
+#: i18n.tpl:65
msgid "Complete 50 workouts"
msgstr "完成50次训练"
-#: i18n.tpl:65
+#: i18n.tpl:66
msgid "Complete 100 workouts"
msgstr "完成100次训练"
-#: i18n.tpl:66
+#: i18n.tpl:67
msgid "Complete 200 workouts"
msgstr "完成200次训练"
-#: i18n.tpl:67
+#: i18n.tpl:68
msgid "Complete 500 workouts"
msgstr "完成500次训练"
-#: i18n.tpl:68
+#: i18n.tpl:69
msgid "Complete 1000 workouts"
msgstr "完成1000次训练"
-#: i18n.tpl:69
+#: i18n.tpl:70
msgid "Maintain a 30-day workout streak"
msgstr "保持连续 30 天训练记录"
-#: i18n.tpl:70
+#: i18n.tpl:71
msgid "Work out on Saturday and Sunday for 4 consecutive weekends"
msgstr "连续 4 周在周六和周日完成训练"
-#: i18n.tpl:71
+#: i18n.tpl:72
#, fuzzy
msgid "Lift a cumulative total of 5.000 kg"
msgstr "累计负重达到 5,000 kg"
-#: i18n.tpl:72
+#: i18n.tpl:73
msgid "Lift a cumulative total of 20.000 kg"
msgstr "累计负重达到 20,000 kg"
-#: i18n.tpl:73
+#: i18n.tpl:74
msgid "Lift a cumulative total of 50.000 kg"
msgstr "累计负重达到 50,000 kg"
-#: i18n.tpl:74
+#: i18n.tpl:75
msgid "Lift a cumulative total of 150.000 kg"
msgstr "累计负重达到 150,000 kg"
-#: i18n.tpl:75
+#: i18n.tpl:76
msgid "Lift a cumulative total of 450.000 kg"
msgstr "累计负重达到 450,000 kg"
-#: i18n.tpl:76
+#: i18n.tpl:77
msgid "Lift a cumulative total of 1.000.000 kg"
msgstr "累计负重达到 1,000,000 kg"
-#: i18n.tpl:77
+#: i18n.tpl:78
msgid "Lift a cumulative total of 10.000.000 kg"
msgstr "累计负重达到 10,000,000 kg"
-#: i18n.tpl:78
+#: i18n.tpl:79
msgid "Complete a workout before 6:00 AM"
msgstr "在凌晨 6:00 前完成一次训练"
-#: i18n.tpl:79
+#: i18n.tpl:80
msgid "Complete a workout after 9:00 PM"
msgstr "在晚上 9:00 后完成一次训练"
-#: i18n.tpl:80
+#: i18n.tpl:81
msgid "Work out on January 1st"
msgstr "在 1 月 1 日完成一次训练"
-#: i18n.tpl:81
+#: i18n.tpl:82
msgid "Return to training after being inactive for 30 days"
msgstr "在中断 30 天后重返训练"
-#: i18n.tpl:82
+#: i18n.tpl:83
msgid "Achieve a new Personal Record on any exercise"
msgstr "在任何练习中创造新的个人纪录"
@@ -1998,7 +2031,7 @@ msgstr "训练"
msgid "Routine will expire soon"
msgstr "训练计划即将过期"
-#: manager/models/routine.py:153 manager/models/session.py:145
+#: manager/models/routine.py:154 manager/models/session.py:145
msgid "The start time cannot be after the end time."
msgstr "开始时间不能晚于结束时间。"
@@ -2077,36 +2110,58 @@ msgstr "健身"
msgid "Workout for %s"
msgstr "训练%s"
-#: nutrition/forms.py:62
+#: nutrition/extract_info/off.py:72 nutrition/extract_info/off.py:91
+msgid "Serving"
+msgstr ""
+
+#: nutrition/forms.py:71 nutrition/forms.py:208
msgid "Unit"
msgstr "单元"
-#: nutrition/forms.py:170 nutrition/templates/rate/form.html:76
+#: nutrition/forms.py:179 nutrition/templates/rate/form.html:77
msgid "Basic caloric intake"
msgstr "基础热量摄入"
-#: nutrition/forms.py:171
+#: nutrition/forms.py:180
msgid "Your basic caloric intake as calculated for your data"
msgstr "根据你的数据算得的基础热量摄入"
-#: nutrition/forms.py:176
+#: nutrition/forms.py:185
msgid "Additional calories"
msgstr "额外卡路里"
-#: nutrition/forms.py:178
+#: nutrition/forms.py:187
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
msgstr "基础热量外额外的卡路里(若有缺口,则输入负数)"
#: nutrition/forms.py:209
+msgid "grams (g)"
+msgstr ""
+
+#: nutrition/forms.py:219
msgid "Ingredient"
msgstr "食谱"
-#: nutrition/forms.py:213
+#: nutrition/forms.py:223
msgid "Also search for names in English"
msgstr "且以英文名字搜索"
+#: nutrition/forms.py:239
+msgid "Quantity"
+msgstr ""
+
+#: nutrition/forms.py:241
+msgid "Enter a quantity and choose grams (g) or one of the serving units."
+msgstr ""
+
+#: nutrition/models/ingredient.py:526
+#, fuzzy
+#| msgid "Correction"
+msgid "Portion"
+msgstr "修正"
+
#: nutrition/templates/ingredient/email_new.tpl:1
#, python-format
msgid ""
@@ -2154,59 +2209,90 @@ msgstr ""
"它在概览或搜索中都是不可见的。如果你注册\n"
"的时候留了邮箱,流程结束后,你会收到提醒。"
-#: nutrition/templates/ingredient/overview.html:38
+#: nutrition/templates/ingredient/overview.html:32
+#: nutrition/templates/ingredient/overview.html:68
+#: nutrition/templates/ingredient/view.html:143
+msgid "Vegan"
+msgstr ""
+
+#: nutrition/templates/ingredient/overview.html:34
+#: nutrition/templates/ingredient/overview.html:79
+#: nutrition/templates/ingredient/view.html:155
+#, fuzzy
+#| msgid "Variations"
+msgid "Vegetarian"
+msgstr "变体"
+
+#: nutrition/templates/ingredient/overview.html:43
msgid "No ingredients."
msgstr "没有成分。"
-#: nutrition/templates/ingredient/overview.html:49
+#: nutrition/templates/ingredient/overview.html:54
msgid "Search"
msgstr "搜索"
-#: nutrition/templates/ingredient/view.html:45 nutrition/views/plan.py:237
+#: nutrition/templates/ingredient/overview.html:57
+msgid "Filter"
+msgstr ""
+
+#: nutrition/templates/ingredient/overview.html:83
+msgid "Apply"
+msgstr ""
+
+#: nutrition/templates/ingredient/overview.html:85
+msgid "Reset"
+msgstr ""
+
+#: nutrition/templates/ingredient/view.html:46 nutrition/views/plan.py:236
msgid "Macronutrients"
msgstr "常量营养物"
-#: nutrition/templates/ingredient/view.html:54
+#: nutrition/templates/ingredient/view.html:55
msgid "kJ"
msgstr "千焦"
-#: nutrition/templates/ingredient/view.html:70 nutrition/views/plan.py:267
+#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:266
msgid "Sugar content in carbohydrates"
msgstr "碳水中的糖含量"
-#: nutrition/templates/ingredient/view.html:75
-#: nutrition/templates/ingredient/view.html:91
-#: nutrition/templates/ingredient/view.html:113
-#: nutrition/templates/ingredient/view.html:123
+#: nutrition/templates/ingredient/view.html:76
+#: nutrition/templates/ingredient/view.html:92
+#: nutrition/templates/ingredient/view.html:114
+#: nutrition/templates/ingredient/view.html:124
msgid "n.A."
msgstr "不可用"
-#: nutrition/templates/ingredient/view.html:86 nutrition/views/plan.py:281
+#: nutrition/templates/ingredient/view.html:87 nutrition/views/plan.py:280
msgid "Saturated fat content in fats"
msgstr "脂肪中的饱和脂肪含量"
-#: nutrition/templates/ingredient/view.html:102
+#: nutrition/templates/ingredient/view.html:103
msgid "Others"
msgstr "其它"
-#: nutrition/templates/ingredient/view.html:108 nutrition/views/plan.py:287
+#: nutrition/templates/ingredient/view.html:109 nutrition/views/plan.py:286
msgid "Fiber"
msgstr "纤维素"
-#: nutrition/templates/ingredient/view.html:118 nutrition/views/plan.py:293
+#: nutrition/templates/ingredient/view.html:119 nutrition/views/plan.py:292
msgid "Sodium"
msgstr "钠"
-#: nutrition/templates/ingredient/view.html:143
-#: nutrition/templates/units/list.html:50 nutrition/views/unit.py:86
+#: nutrition/templates/ingredient/view.html:136
+#, fuzzy
+#| msgid "Click here for more information"
+msgid "Dietary information"
+msgstr "点击获取更多信息"
+
+#: nutrition/templates/ingredient/view.html:184
msgid "Add new weight unit"
msgstr "新增计量单位"
-#: nutrition/templates/rate/form.html:25
+#: nutrition/templates/rate/form.html:26
msgid "Basal metabolic rate"
msgstr "基础代谢率"
-#: nutrition/templates/rate/form.html:26
+#: nutrition/templates/rate/form.html:27
msgid ""
"The basal metabolic rate is the amount of energy expended daily\n"
"at rest. This is the minimum energy needed for the body to function, without "
@@ -2217,15 +2303,15 @@ msgstr ""
"这个量用以维持你最基础的身体需要,不包含\n"
"任何额外的身体活动。"
-#: nutrition/templates/rate/form.html:37
+#: nutrition/templates/rate/form.html:38
msgid "Your basic metabolic rate is: "
msgstr "你的基础代谢率是: "
-#: nutrition/templates/rate/form.html:47
+#: nutrition/templates/rate/form.html:48
msgid "Physical activities"
msgstr "身体活动"
-#: nutrition/templates/rate/form.html:48
+#: nutrition/templates/rate/form.html:49
msgid ""
"The physical activity level (PAL) is a factor used to to express\n"
"the additional physical activity and is used to calculate the total energy\n"
@@ -2235,11 +2321,11 @@ msgstr ""
"额外身体活动的因素,并且会被用来\n"
"计算每日所需的总能量。"
-#: nutrition/templates/rate/form.html:59
+#: nutrition/templates/rate/form.html:60
msgid "Factor for daily activities: "
msgstr "每日身体活动指数: "
-#: nutrition/templates/rate/form.html:67
+#: nutrition/templates/rate/form.html:68
msgid ""
"The base caloric intake is the amount of calories your metabolism\n"
"needs based on your level of physical activity."
@@ -2247,11 +2333,11 @@ msgstr ""
"基础热量摄入是你不同运动\n"
"水平下代谢所需的热量。"
-#: nutrition/templates/rate/form.html:81
+#: nutrition/templates/rate/form.html:82
msgid "Calculate basic caloric intake"
msgstr "计算基础热量摄入"
-#: nutrition/templates/rate/form.html:88
+#: nutrition/templates/rate/form.html:89
msgid ""
"The total calories are the actual total calories per day. This\n"
"might include e.g. a surplus or deficit if you are bulking or cutting. "
@@ -2262,19 +2348,19 @@ msgstr ""
"大于摄入,那么它就是盈余的,相反,它就是赤字的。相应地,\n"
"如果你知道某些卡路里值,你或许需要手动输入它们。"
-#: nutrition/templates/rate/form.html:102
+#: nutrition/templates/rate/form.html:103
msgid "Transfer basic intake to total daily calories"
msgstr "转移基本摄入量到每日总卡路里"
-#: nutrition/templates/rate/form.html:106
+#: nutrition/templates/rate/form.html:107
msgid "Add additional calories to total daily calories"
msgstr "增加额外卡路里到每日总卡路里"
-#: nutrition/templates/rate/form.html:110
+#: nutrition/templates/rate/form.html:111
msgid "Save total calories to profile"
msgstr "保存总热量到资料"
-#: nutrition/templates/rate/form.html:121
+#: nutrition/templates/rate/form.html:122
msgid ""
"Please note that these calculations can only be an\n"
"approximation. If you base your nutrition plan on these values, observe\n"
@@ -2284,48 +2370,48 @@ msgstr ""
"如果你要参考你的热量计划,请一定\n"
"观察自己几个星期,按需变更。"
-#: nutrition/views/ingredient.py:158
+#: nutrition/views/ingredient.py:163
msgid "Add a new ingredient"
msgstr "新增一个食谱"
-#: nutrition/views/plan.py:128
+#: nutrition/views/plan.py:127
msgid "Nutritional plan"
msgstr "营养计划"
-#: nutrition/views/plan.py:130
+#: nutrition/views/plan.py:129
#, python-format
msgid "Nutritional plan for %s"
msgstr "%s的计划"
-#: nutrition/views/plan.py:202
+#: nutrition/views/plan.py:201
msgid "<i>This is an empty plan, what did you expect on the PDF?</i>"
msgstr "<i>这是一个空的计划,你希望在 PDF 上有什么?</i>"
-#: nutrition/views/plan.py:230
+#: nutrition/views/plan.py:229
msgid "Nutritional data"
msgstr "营养数据"
-#: nutrition/views/plan.py:238
+#: nutrition/views/plan.py:237
msgid "Total"
msgstr "总量"
-#: nutrition/views/plan.py:239
+#: nutrition/views/plan.py:238
msgid "Percent of energy"
msgstr "能量比例"
-#: nutrition/views/plan.py:240
+#: nutrition/views/plan.py:239
msgid "g per body kg"
msgstr "克(以每1千克体重记)"
-#: nutrition/views/unit_ingredient.py:69
+#: nutrition/views/unit_ingredient.py:64
msgid "Add a new weight unit"
msgstr "新增计量单位"
-#: nutrition/views/unit_ingredient.py:106
+#: nutrition/views/unit_ingredient.py:99
msgid "Edit a weight unit to ingredient connection"
msgstr "关联计量单位与食谱"
-#: nutrition/views/unit_ingredient.py:138
+#: nutrition/views/unit_ingredient.py:129
msgid "Delete?"
msgstr "删除?"
@@ -2692,7 +2778,7 @@ msgstr "源代码"
msgid "Translation"
msgstr "翻译"
-#: utils/generic_views.py:263
+#: utils/generic_views.py:246
msgid "Yes, delete"
msgstr "是,删除"
@@ -2745,10 +2831,6 @@ msgstr "您必须输入您的体重"
msgid "Import weight logs"
msgstr "导入体重日志"
-#: weight/templates/import_csv_form.html:9
-msgid "Submit"
-msgstr "提交"
-
#: weight/templates/import_csv_form.html:15
msgid ""
"Use this import field to import your weight logs into Workout\n"
@@ -2865,6 +2947,34 @@ msgstr ""
msgid "Re-Submit"
msgstr "重新提交"
+#~ msgid "Email verification"
+#~ msgstr "邮箱验证"
+
+#, python-format
+#~ msgid "%(username)s, your email was verified"
+#~ msgstr "%(username)s, 您的电子邮件已验证"
+
+#~ msgid "Error, invalid verification token"
+#~ msgstr "错误,无效的验证Token"
+
+#~ msgid "Email Confirmation"
+#~ msgstr "邮箱确认"
+
+#, python-format
+#~ msgid "You are almost there, %(username)s!"
+#~ msgstr "你即将完成,%(username)s!"
+
+#, python-format
+#~ msgid "Please click <a href=\"%(link)s\">here</a> to confirm your email"
+#~ msgstr "请点击 <a href=\"%(link)s\">这里</a> 来验证你的邮箱"
+
+#, python-format
+#~ msgid "The token expires on %(time)s"
+#~ msgstr "此token将在 %(time)s过期"
+
+#~ msgid "Ingredient weight units"
+#~ msgstr "食谱计量单位"
+
#~ msgid "Image"
#~ msgstr "图片"
@@ -2895,9 +3005,6 @@ msgstr "重新提交"
#~ msgid "Secondary muscles"
#~ msgstr "次要肌肉"
-#~ msgid "Variations"
-#~ msgstr "变体"
-
#~ msgid "Exercise Categories"
#~ msgstr "训练类别"
@@ -3757,9 +3864,6 @@ msgstr "重新提交"
#~ msgid "This content is available under the following license:"
#~ msgstr "此内容是根据以下许可协议可用:"
-#~ msgid "Click here for more information"
-#~ msgstr "点击获取更多信息"
-
#~ msgid "Your workouts"
#~ msgstr "你的健身"